Merge releng 0.5.1
diff --git a/profiling/.classpath b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/.classpath
similarity index 100%
copy from profiling/.classpath
copy to autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/.classpath
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/.project b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/.project
new file mode 100644
index 0000000..76fdbef
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.cdt.autotools-docs</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+                <buildCommand>
+                        <name>org.eclipse.jdt.core.javabuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+                <nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/ChangeLog b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/ChangeLog
new file mode 100644
index 0000000..c7a15ae
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/ChangeLog
@@ -0,0 +1,157 @@
+2010-04-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Change J2SE level to 1.5.
+
+2010-04-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #309117
+	* .classpath: New file.
+	* build-helper.xml: New file.
+	* doc/notices.html: New file.
+	* extract-markup.xsl: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/doc/anttask/MediaWikiImageFetcher.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/doc/anttask/tasks.properties: New file.
+	* userguide/Autotools\ Plugin-in\ User\ Guide-toc.xml: New file.
+	* userguide/Autotools\ Plugin-in\ User\ Guide.html: New file.
+	* userguide/Building.html: New file.
+	* userguide/Configuration.html: New file.
+	* userguide/Creating-an-Autotools-Project.html: New file.
+	* userguide/images/Linuxtool-AutotoolsMakeTargetsMenu.png: New file.
+	* userguide/images/Linuxtools-AutotoolsAclocal.png: New file.
+	* userguide/images/Linuxtools-AutotoolsAutoconfEditor.png: New file.
+	* userguide/images/Linuxtools-AutotoolsAutoconfEditorPrefs.png: New file.
+	* userguide/images/Linuxtools-AutotoolsAutoheader.png: New file.
+	* userguide/images/Linuxtools-AutotoolsAutomake.png: New file.
+	* userguide/images/Linuxtools-AutotoolsAutomakeEditor.png: New file.
+	* userguide/images/Linuxtools-AutotoolsAutoreconf.png: New file.
+	* userguide/images/Linuxtools-AutotoolsAutotools.png: New file.
+	* userguide/images/Linuxtools-AutotoolsAutotoolsConsole.png: New file.
+	* userguide/images/Linuxtools-AutotoolsBuilders.png: New file.
+	* userguide/images/Linuxtools-AutotoolsBuildLocation.png: New file.
+	* userguide/images/Linuxtools-AutotoolsCheckout.png: New file.
+	* userguide/images/Linuxtools-AutotoolsConfsettings.png: New file.
+	* userguide/images/Linuxtools-AutotoolsConsolePrefs.png: New file.
+	* userguide/images/Linuxtools-AutotoolsConsoleSelect.png: New file.
+	* userguide/images/Linuxtools-AutotoolsConvAutotoolsWizard.png: New file.
+	* userguide/images/Linuxtools-AutotoolsConvertWizard.png: New file.
+	* userguide/images/Linuxtools-AutotoolsCProjectWizard.png: New file.
+	* userguide/images/Linuxtools-AutotoolsCreateConf.png: New file.
+	* userguide/images/Linuxtools-AutotoolsEditorsTab.png: New file.
+	* userguide/images/Linuxtools-AutotoolsLibtoolize.png: New file.
+	* userguide/images/Linuxtools-AutotoolsMakeTargetBuild.png: New file.
+	* userguide/images/Linuxtools-AutotoolsMakeTargetCreate.png: New file.
+	* userguide/images/Linuxtools-AutotoolsMakeTargetEdit.png: New file.
+	* userguide/images/Linuxtools-AutotoolsManageConfs.png: New file.
+	* userguide/images/Linuxtools-AutotoolsNewOther.png: New file.
+	* userguide/images/Linuxtools-AutotoolsToolSettings.png: New file.
+	* userguide/Invoking-Autotools.html: New file.
+	* userguide/Make-Targets.html: New file.
+	* userguide/Special-Editors.html: New file.
+	* userguide/Supported-Environments.html: New file.
+	* userguide/Updating-This-Document.html: New file.
+	* .project: Change to be Java project.
+	* build.properties: Add new binary files.
+	* META-INF/MANIFEST.MF: Dependency added.
+	* plugin.xml: Add additional toc for Autotools User Guide.
+
+2009-11-16  Andrew Overholt  <overholt@redhat.com>
+
+	* plugin.properties: Fix bundle name.  Fix provider.
+
+2009-10-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* cheatsheets/autotools.xml: Revised for Autotools rewrite.
+
+2009-10-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* build.properties: Add build.properties to bin list.
+	* META-INF/MANIFEST.MF: Bump up version to 2.0.0.
+
+2009-01-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add .qualifier to id.
+
+2008-11-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* build.properties: Add cheatsheets directory to binary list and remove
+	doc.zip which no longer exists in project.
+
+2008-10-31  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Use translated BundleName and provider. Add
+	"(Incubation)".
+	* plugin.properties: Initial import.
+
+2008-10-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* toc.xml: Add anchor id so other gnu tools can be added to Gnu Tools list.
+
+2008-09-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Update version number to 1.0.0.
+
+2008-09-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* toc.xml: Add http references for all of the GNU tools documentation.
+
+2007-10-04  jjohnstn  <jjohnstn@vermillion>
+
+	* META-INF/MANIFEST.MF: Update release to 0.0.5.
+	* cheatsheets/autotools.xml: Add sub-step after pushing finish for GNU Autotools
+	project wizard to handle the possibility of the workspace asking to go to the
+	C/C++ perspective.  Remove separate "changing to C/C++ perspective" step.
+
+2007-10-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* cheatsheets/autotools.xml: New File.
+	* plugin.xml: Add cheatsheets extension for autotools project.
+	* META-INF/MANIFEST.MF: Add dependency on org.eclipse.ui.cheatsheets.
+
+2007-08-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Change release to 0.0.4 and specify minimum java runtime
+	as 1.4.
+	* build.xml: Removed.
+
+2007-02-02  Andrew Overholt  <overholt@redhat.com>
+
+	* toc.xml:  Add "and Other" to the toc entry.
+	* doc.zip:  Add pkg-config/index.html (created using PolyglotMan
+	<http://polyglotman.sourceforge.net/>).
+
+2007-01-22  Andrew Overholt  <overholt@redhat.com>
+
+	* toc.xml:  Gnu -> GNU.
+
+2007-01-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* about.html: New license file.
+
+2006-08-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* build.xml: Update release to 0.0.3.
+
+2006-07-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* Manifest.MF: Change release to 0.0.3.
+	* getdocs.sh: Update to current FC6 releases of tools help.
+	* doc.zip: Updated.
+
+2006-07-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* Manifest.MF: Change release to 0.0.2.
+	* build.properties: Add doc.zip and toc.xml to bin files.
+
+2006-06-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Make provider Red Hat.
+
+2006-04-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* getdocs.sh: New file to generate doc.zip.
+
+2006-04-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* toc.xml: New file.
+	* doc.zip: Ditto.
+	* plugin.xml: Ditto.
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/META-INF/MANIFEST.MF b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..27ed55b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.cdt.autotools_docs;singleton:=true
+Bundle-Version: 2.0.1.qualifier
+Bundle-Vendor: %provider
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.help,
+ org.eclipse.ui.cheatsheets,
+ org.apache.ant;bundle-version="1.7.1"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/about.html b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/about.html
new file mode 100644
index 0000000..44e2290
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

+<html>

+<head>

+<title>About</title>

+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>8th September, 2004</p>	

+<h3>License</h3>

+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<h3>Contributions</h3>

+

+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise

+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such

+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or

+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the

+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available

+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also

+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+</body>

+</html>
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/build-helper.xml b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/build-helper.xml
new file mode 100644
index 0000000..3a53e29
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/build-helper.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="org.eclipse.linuxtools.autotools.docs" default="all">
+    <description>
+            Generate Eclipse help content for the Linux Tools autotools user guide
+    </description>
+
+	<property name="autotools.help.doc.url.base" value="http://wiki.eclipse.org"/>
+	<property name="autotools.wiki.url.base" value="${autotools.help.doc.url.base}/Linux_Tools_Project/Autotools"/>
+	<property name="imageFolder" value="images"/>
+	
+	<path id="tasks.classpath" path="bin"/>
+	<path id="wikitext.tasks.classpath">
+		<pathelement location="../org.eclipse.mylyn.wikitext.core/@dot"/>
+		<pathelement location="../org.eclipse.mylyn.wikitext.core/bin"/>
+		<pathelement location="../org.eclipse.mylyn.wikitext.mediawiki.core/@dot"/>
+		<pathelement location="../org.eclipse.mylyn.wikitext.mediawiki.core/bin"/>
+	</path>
+	
+	<taskdef classpathref="tasks.classpath" resource="org/eclipse/linuxtools/internal/cdt/autotools/doc/anttask/tasks.properties"/>
+	<taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/util/anttask/tasks.properties"/>
+	
+	<target name="init">
+		<mkdir dir="tmp"/>
+	</target>
+	
+	<target name="clean" depends="init">
+		<delete includeemptydirs="true" failonerror="false">
+			<fileset dir="tmp"/>
+		</delete>
+	</target>
+
+    <target name="all" depends="init" description="Generate Eclipse help content for the Linux Tools autotools user guide">
+        <eclipse-wiki-to-help
+        	help.doc.filenamenoextension="Autotools Plugin-in User Guide"
+        	help.doc.url.base="${autotools.help.doc.url.base}"
+        	help.doc.url.html="${autotools.wiki.url.base}/User_Guide"
+        	help.doc.url.xml="${autotools.help.doc.url.base}/Special:Export/Linux_Tools_Project/Autotools/User_Guide"
+        	help.imagefolder="${imageFolder}"
+        	targetfolder="userguide"
+        	wiki.url.base="${autotools.help.doc.url.base}/Linux_Tools_Project"/>
+    </target>
+	
+	<macrodef name="eclipse-wiki-to-help">
+		<attribute name="help.doc.url.base"/>
+		<attribute name="wiki.url.base"/>
+		<attribute name="help.doc.url.html"/>
+		<attribute name="help.doc.url.xml"/>
+		<attribute name="help.doc.filenameNoExtension"/>
+		<attribute name="help.imageFolder"/>
+		<attribute name="targetFolder"/>
+		<sequential>
+			<get dest="tmp/help.doc.xml" src="@{help.doc.url.xml}"/>
+	    	<get dest="tmp/help.doc.html" src="@{help.doc.url.html}"/>
+	    	
+			<!--
+	    	<copy todir="tmp">
+	    		<fileset dir="images"/>
+	    	</copy>
+	    	-->
+	    	<mediawiki-fetch-images src="tmp/help.doc.html" dest="tmp" base="@{help.doc.url.base}"/>
+	    	
+	    	<xslt style="extract-markup.xsl" in="tmp/help.doc.xml" out="tmp/@{help.doc.filenameNoExtension}.mediawiki"/>
+			<echo append="true" file="tmp/@{help.doc.filenameNoExtension}.mediawiki">
+
+= Updating This Document =
+
+This document is maintained in a collaborative wiki.  If you wish to update or modify this document please visit 
+@{help.doc.url.html}
+			</echo>
+			
+			<!-- Removing Phoenix extensions -->
+			<replaceregexp match="\{\{\#eclipseproject.*" replace="" flags="g" byline="true">
+				<fileset dir="tmp" includes="**/*.mediawiki"/>
+			</replaceregexp>
+			
+			<wikitext-to-eclipse-help markupLanguage="org.eclipse.mylyn.wikitext.mediawiki.core.MediaWikiLanguage" 
+				multipleOutputFiles="true"
+				navigationImages="true"
+				helpPrefix="@{targetFolder}"
+				internallinkpattern="@{wiki.url.base}/{0}"
+				validate="true"
+				failonvalidationerror="true"
+				prependImagePrefix="${imageFolder}"
+				formatoutput="true">
+				<fileset dir="tmp" includes="**/*.mediawiki"/>
+				<stylesheet url="book.css"/>
+			</wikitext-to-eclipse-help>
+	    	
+	    	<mkdir dir="@{targetFolder}/${imageFolder}"/>
+			<copy todir="@{targetFolder}/${imageFolder}" overwrite="true">
+				<fileset dir="tmp">
+					<include name="*.gif"/>
+					<include name="*.png"/>
+				</fileset>
+			</copy>
+	    	<copy todir="@{targetFolder}" overwrite="true">
+				<fileset dir="tmp">
+					<include name="*.html"/>
+					<include name="*toc.xml"/>
+					<exclude name="help.doc.html"/>
+				</fileset>
+			</copy>
+	    	<antcall target="test"/>
+		</sequential>			
+	</macrodef>
+	
+
+	<target name="test" depends="init" description="verify that all of the HTML files are well-formed XML">
+		<echo level="info">
+Validating help content XML and HTML files: The Eclipse help system expects well-formed XML
+			
+If validation fails it is because either:
+			
+* the userguide source code is poorly formed, or
+* the WikiText MediaWiki parser has a bug
+			
+Problems with userguide source are usually caused by improper use of HTML markup in the MediaWiki source,
+or inadvertently starting a line with a space character (in MediaWiki this starts a preformatted block)
+		</echo>
+
+		<!-- 
+		Don't bother with DTD validation: we only care if the files are well-formed.
+		We therefore provide an empty DTD 
+		-->
+		<echo file="tmp/__empty.dtd" message=""/>
+		<xmlvalidate lenient="true">
+			<fileset dir="userguide">
+				<include name="**/*.xml"/>
+			</fileset>
+			<fileset dir="userguide">
+				<include name="**/*.html"/>
+			</fileset>
+			<dtd publicid="-//W3C//DTD XHTML 1.0 Transitional//EN" location="${basedir}/tmp/__empty.dtd"/>
+		</xmlvalidate>
+	</target>
+</project>
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/build.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/build.properties
new file mode 100644
index 0000000..7f286fb
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/build.properties
@@ -0,0 +1,12 @@
+bin.includes = META-INF/,\
+               plugin.xml,\
+               toc.xml,\
+               cheatsheets/,\
+               about.html,\
+               plugin.properties,\
+               doc/,\
+               userguide/
+jars.compile.order = .
+source.. = src/
+output.. = bin/
+source.. = src/
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/cheatsheets/autotools.xml b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/cheatsheets/autotools.xml
new file mode 100644
index 0000000..f7d9c00
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/cheatsheets/autotools.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cheatsheet title="GNU Autotools Project">
+   <intro>
+      <description>
+         This cheatsheet will introduce the GNU Autotools plugin by importing an existing project that uses Autotools.
+      </description>
+   </intro>
+   <item title="Check out the test project" dialog="true" skip="false">
+      <description>
+      </description>
+      <subitem label="From the main menu, select File -&gt; Import ... -&gt; Projects from CVS." skip="false">
+         <command serialization="org.eclipse.ui.file.import(importWizardId=org.eclipse.team.cvs.ui.newProjectCheckout)" confirm="false">
+         </command>
+      </subitem>
+      <subitem label="If the following repository does not already exist, create it by selecting &quot;Create a new repository location&quot;, pressing &quot;Next&quot;, and filling in the following information:  Host:  sourceware.org Repository path:  /cvs/eclipse User: &lt;anonymous&gt; Connection type:  pserver" skip="true">
+      </subitem>
+      <subitem label="Press Next to advance to CVS module selection." skip="false">
+      </subitem>
+      <subitem label="Choose &quot;Use an existing module&quot; and open &quot;autotools&quot; and select &quot;sources&quot; in the populated list of projects." skip="false">
+      </subitem>
+      <subitem label="Press Next." skip="false">
+      </subitem>
+      <subitem label="Ensure &quot;Check out as a project configured using the New Project wizard&quot; is selected." skip="false">
+      </subitem>
+      <subitem label="Press Finish." skip="false">
+      </subitem>
+      <subitem label="Select C/C++ -&gt; C Project" skip="false">
+      </subitem>
+      <subitem
+            label="Within the C Project dialog, open the GNU Autotools category in the tree view and select &quot;Empty Project&quot;">
+      </subitem>
+      <subitem label="Give the project a name.  For this example, choose &quot;sources&quot;." skip="false">
+      </subitem>
+      <subitem label="Press Next." skip="false">
+      </subitem>
+      <subitem label="Press Finish." skip="false">
+      </subitem>
+      <subitem label="If asked to switch to C/C++ Perspective, select ok and choose to default this behavior" skip="false">
+      </subitem>
+   </item>
+   <item title="Build Project">
+      <description>
+      </description>
+      <subitem
+            label="Navigate to the project in the Project Explorer view by selecting the &quot;sources&quot; project you just created.">
+      </subitem>
+      <subitem
+            label="Open the Project pull-down from the main menu">
+      </subitem>
+      <subitem
+            label="If &quot;Build Automatically&quot; is not checked, select &quot;Build Project&quot;">
+      </subitem>
+   </item>
+   <item title="View build output" dialog="true" skip="false">
+      <description>
+         In the Console view, there is a button entitled &quot;Display Selected Console&quot;.  Its icon depicts a monitor with two lines of text on it.  Pressing this button will drop down to show all available consoles.  At this point, you should have three consoles:  one for configure output (&quot;Configure&quot;), one for build output (&quot;C-Build&quot;), and one for the binary output that you just ran (&quot;&lt;terminated&gt; sources ...&quot;).
+      </description>
+      <subitem label="View configure output by selecting the Configure console in the drop-down list.  The configure console" skip="false">
+      </subitem>
+      <subitem label="View build output by selecting the &quot;C-Build&quot; console in the drop-down list." skip="false">
+      </subitem>
+   </item>
+   <item title="Run the Hello World binary" dialog="true" skip="false">
+      <description>
+      </description>
+      <subitem label="Navigate to the project in the Project Explorer view by selecting the &quot;sources&quot; project you just created." skip="false">
+      </subitem>
+      <subitem label="Open the project by toggling the arrow to the left of the project name if it is not already open." skip="true">
+      </subitem>
+      <subitem label="Expand the &quot;Binaries&quot; virtual folder under the project." skip="false">
+      </subitem>
+      <subitem label="Select the binary itself.  This will be called &quot;a.out&quot; if you followed the example." skip="false">
+      </subitem>
+      <subitem label="Right-click on the binary itself and select &quot;Run As&quot; -&gt; &quot;Local C/C++ Application&quot;." skip="false">
+      </subitem>
+      <subitem label="Select &quot;gdb Debugger&quot; (the default) in the &quot;Launch Debug Configuration Selection&quot; dialog." skip="false">
+      </subitem>
+      <subitem label="Press OK." skip="false">
+      </subitem>
+   </item>
+   <item title="View output" dialog="true" skip="false">
+      <description>
+         The output of the program should be displayed in the Console view which should be one of the tabs visible in the bottom of the IDE.  If you made no modifications, it should read &quot;hello world&quot;.
+      </description>
+   </item>
+   <item title="Modify configure options" dialog="true" skip="false">
+      <description>
+      </description>
+      <subitem label="Select the project &quot;sources&quot; if it is not already selected in the Project Explorer." skip="false">
+      </subitem>
+      <subitem label="From the main menu, select Project -&gt; Properties." skip="false">
+      </subitem>
+      <subitem label="Expand &quot;Autotools&quot; and select &quot;Configure Settings&quot;." skip="false">
+      </subitem>
+      <subitem label="Under &quot;configure&quot;, select &quot;Advanced&quot;." skip="false">
+      </subitem>
+      <subitem label="In the &quot;Additional command-line options&quot; text box, enter &quot;--enable-option-x&quot;." skip="false">
+      </subitem>
+      <subitem label="Press OK." skip="false">
+      </subitem>
+   </item>
+   <item title="Finished!" dialog="true" skip="false">
+      <description>
+         <b>Congratulations!</b>
+You now have a simple GNU autotools project.
+      </description>
+   </item>
+</cheatsheet>
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/doc/notices.html b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/doc/notices.html
new file mode 100644
index 0000000..5773de5
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/doc/notices.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+
+<meta name="copyright" content="&#169; Copyright 2010 Eclipse Linux Tools project committers and others. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+
+   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+   <LINK REL="STYLESHEET" HREF="book.css" CHARSET="ISO-8859-1" TYPE="text/css">
+   <title>Legal Notices</title>
+</head>
+<body>
+
+<h3>
+<a NAME="Notices"></a>Notices</h3>
+<p>
+The material in this guide is &#169; Copyright 2010 Eclipse Linux Tools project committers and others.
+</p>
+<p>
+<a href="../about.html">Terms and conditions regarding the use of this guide.</a>
+</p>
+</body>
+</html>
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/extract-markup.xsl b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/extract-markup.xsl
new file mode 100644
index 0000000..4c4e731
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/extract-markup.xsl
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:mw="http://www.mediawiki.org/xml/export-0.3/">
+	<xsl:output  method="text"/>
+	
+	<xsl:template match="/">
+		<xsl:value-of select="//mw:text"/>
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/plugin.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/plugin.properties
new file mode 100644
index 0000000..bdc76a6
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+#  Copyright (c) 2008 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+bundleName=Autotools Documentation (Incubation)
+provider=Eclipse
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/plugin.xml b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/plugin.xml
new file mode 100644
index 0000000..57f82d8
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/plugin.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+   <extension
+         point="org.eclipse.help.toc">
+      <toc
+            file="toc.xml"
+            primary="true"/>
+      <toc
+            file="userguide/Autotools Plugin-in User Guide-toc.xml"
+            primary="true">
+      </toc>
+   </extension>
+   <extension
+         id="com.redhat.eclipse.cdt.autotools.docs.cheatsheets"
+         point="org.eclipse.ui.cheatsheets.cheatSheetContent">
+      <cheatsheet
+            category="org.eclipse.cdt-doc.category.tutorials"
+            contentFile="cheatsheets/autotools.xml"
+            id="com.redhat.eclipse.cdt.autotools-docs.cheatsheet3"
+            name="Creating a GNU Autotools Project">
+      </cheatsheet>
+   </extension>
+
+</plugin>
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/src/org/eclipse/linuxtools/internal/cdt/autotools/doc/anttask/MediaWikiImageFetcher.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/src/org/eclipse/linuxtools/internal/cdt/autotools/doc/anttask/MediaWikiImageFetcher.java
new file mode 100644
index 0000000..36e9965
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/src/org/eclipse/linuxtools/internal/cdt/autotools/doc/anttask/MediaWikiImageFetcher.java
@@ -0,0 +1,150 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008 David Green and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     David Green - initial API and implementation
+ * 
+ * Re-namespaced 2009-04-14 without changes from org.eclipse.mylyn.help.ui.
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.doc.anttask;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.Get;
+
+
+/**
+ * Fetch images from a MediaWiki-generated HTML page source
+ * 
+ * @author David Green
+ */
+public class MediaWikiImageFetcher extends Task {
+
+	private String base;
+
+	private File dest;
+
+	private File src;
+
+	@Override
+	public void execute() throws BuildException {
+		if (dest == null) {
+			throw new BuildException("Must specify @dest"); //$NON-NLS-1$
+		}
+		if (!dest.exists()) {
+			throw new BuildException("@dest does not exist: " + dest); //$NON-NLS-1$
+		}
+		if (!dest.isDirectory()) {
+			throw new BuildException("@dest is not a directory: " + dest); //$NON-NLS-1$
+		}
+		if (src == null) {
+			throw new BuildException("Must specify @src"); //$NON-NLS-1$
+		}
+		if (!src.exists()) {
+			throw new BuildException("@src does not exist: " + src); //$NON-NLS-1$
+		}
+		if (!src.isFile()) {
+			throw new BuildException("@src is not a file: " + src); //$NON-NLS-1$
+		}
+		if (base == null) {
+			throw new BuildException("Must specify @base"); //$NON-NLS-1$
+		}
+		if (base.endsWith("/")) { //$NON-NLS-1$
+			base = base.substring(0, base.length() - 1);
+		}
+		Pattern fragmentUrlPattern = Pattern.compile("src=\"([^\"]+)\""); //$NON-NLS-1$
+		Pattern imagePattern = Pattern.compile("alt=\"Image:([^\"]*)\"([^>]+)", Pattern.MULTILINE); //$NON-NLS-1$
+		String htmlSrc;
+		try {
+			htmlSrc = readSrc();
+		} catch (IOException e) {
+			throw new BuildException("Cannot read src: " + src + ": " + e.getMessage(), e); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		log("Parsing " + src, Project.MSG_INFO); //$NON-NLS-1$
+		int fileCount = 0;
+		Matcher imagePatternMatcher = imagePattern.matcher(htmlSrc);
+		while (imagePatternMatcher.find()) {
+			String alt = imagePatternMatcher.group(1);
+			String imageFragment = imagePatternMatcher.group(2);
+			if (imageFragment != null) {
+				Matcher fragmentUrlMatcher = fragmentUrlPattern.matcher(imageFragment);
+				if (fragmentUrlMatcher.find()) {
+					String url = fragmentUrlMatcher.group(1);
+					String qualifiedUrl = base + url;
+					log("Fetching " + qualifiedUrl, Project.MSG_INFO); //$NON-NLS-1$
+					Get get = new Get();
+					get.setProject(getProject());
+					get.setLocation(getLocation());
+					try {
+						get.setSrc(new URL(qualifiedUrl));
+					} catch (MalformedURLException e) {
+						log("Skipping " + url + ": " + e.getMessage(), Project.MSG_WARN); //$NON-NLS-1$ //$NON-NLS-2$
+						continue;
+					}
+					// note: we use the alt text for the name since for some files there is a case-difference between
+					//       the server URL and the text used in the image src of the markup
+					String name = alt == null ? url.substring(url.lastIndexOf('/')) : alt;
+					get.setDest(new File(dest, name));
+					get.execute();
+					++fileCount;
+				}
+			}
+		}
+		log("Fetched " + fileCount + " image files for " + src, Project.MSG_INFO); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	public String getBase() {
+		return base;
+	}
+
+	public File getDest() {
+		return dest;
+	}
+
+	public File getSrc() {
+		return src;
+	}
+
+	private String readSrc() throws IOException {
+		StringBuilder buf = new StringBuilder((int) src.length());
+		Reader reader = new BufferedReader(new FileReader(src));
+		try {
+			int i;
+			while ((i = reader.read()) != -1) {
+				buf.append((char) i);
+			}
+		} finally {
+			reader.close();
+		}
+		return buf.toString();
+	}
+
+	public void setBase(String base) {
+		this.base = base;
+	}
+
+	public void setDest(File dest) {
+		this.dest = dest;
+	}
+
+	public void setSrc(File src) {
+		this.src = src;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/src/org/eclipse/linuxtools/internal/cdt/autotools/doc/anttask/tasks.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/src/org/eclipse/linuxtools/internal/cdt/autotools/doc/anttask/tasks.properties
new file mode 100644
index 0000000..82f303b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/src/org/eclipse/linuxtools/internal/cdt/autotools/doc/anttask/tasks.properties
@@ -0,0 +1 @@
+mediawiki-fetch-images=org.eclipse.linuxtools.internal.cdt.autotools.doc.anttask.MediaWikiImageFetcher
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/toc.xml b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/toc.xml
new file mode 100644
index 0000000..7fc15cf
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/toc.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="GNU Tools">
+	<topic label="gcc"  href="http://gcc.gnu.org/onlinedocs/gcc-4.3.2/gcc/"/> 
+	<topic label="binutils" href="http://sourceware.org/binutils/docs/"/>
+	<topic label="autoconf" href="http://www.gnu.org/software/autoconf/manual/html_node/index.html"/>
+	<topic label="automake" href="http://www.gnu.org/software/automake/manual/html_node/index.html"/>
+	<topic label="pkg-config" href="http://hpux.ewi.tudelft.nl/ftp/hpux/Development/Tools/pkgconfig-0.23/pkgconfig-0.23.man.html"/>
+ <anchor id="moregnutools"/>
+</toc>
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Autotools Plugin-in User Guide-toc.xml b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Autotools Plugin-in User Guide-toc.xml
new file mode 100644
index 0000000..8e59f9d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Autotools Plugin-in User Guide-toc.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<toc topic="userguide/Autotools Plugin-in User Guide.html" label="Autotools Plugin-in User Guide">
+	<topic href="userguide/Autotools Plugin-in User Guide.html" label="Introduction"></topic>
+	<topic href="userguide/Supported-Environments.html" label="Supported Environments"></topic>
+	<topic href="userguide/Creating-an-Autotools-Project.html" label="Creating an Autotools Project"></topic>
+	<topic href="userguide/Configuration.html" label="Configuration"></topic>
+	<topic href="userguide/Invoking-Autotools.html" label="Invoking Autotools"></topic>
+	<topic href="userguide/Special-Editors.html" label="Special Editors"></topic>
+	<topic href="userguide/Building.html" label="Building"></topic>
+	<topic href="userguide/Make-Targets.html" label="Make Targets"></topic>
+	<topic href="userguide/Updating-This-Document.html" label="Updating This Document"></topic>
+</toc>
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Autotools Plugin-in User Guide.html b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Autotools Plugin-in User Guide.html
new file mode 100644
index 0000000..22fb5a3
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Autotools Plugin-in User Guide.html
@@ -0,0 +1,61 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>Autotools Plugin-in User Guide</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Autotools Plugin-in User Guide</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Supported-Environments.html" title="Supported Environments">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Supported Environments</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Introduction">Introduction</h1>
+		<p>The Autotools plug-in for Eclipse extends the CDT (C/C++ Development Tools) to add support for maintaining and
+			building C/C++ projects that use GNU Autotools.</p>
+		<p>The GNU Autotools are a set of tools used to make a project portable to multiple systems or build environments.  The tools aid the developer to create
+			a configure script which is meant to be invoked prior to performing the build.  The configure script may perform tests such as testing the current platform, the OS, what is locally installed, or any number of things.  Parameters can be passed as well to provide information that is not calculable (e.g. what will be the target platform the project will be run on).  Results of tests and parameters are used to create the Makefiles for the build or in some cases, additional files such as header files or code sequences. </p>
+		<p>What gets tested is fully controllable by the developer by way of special input files which
+			are fed to the Autotools.  Typically, the most commonly used Autotools are 'autoconf', 'automake', and 'aclocal'.  The 'autoconf' tool takes a 'configure.in' or 'configure.ac' input file and creates the 'configure' script previously discussed.  It is possible to have multiple configure scripts in various subdirectories, but a project should be designed so there is one top-level configure script that calls any lower-level ones automatically.</p>
+		<p>The 'automake' tool takes a 'Makefile.am' input file and creates a 'Makefile.in' file which is used at configuration time by the configure script as a template for creating a Makefile.  Each Makefile will have its own corresponding Makefile.in file.  There may be if/else logic used to determine what ends up in the Makefile or there may be requests to directly substitute variables calculated in the configure step.</p>
+		<p>The 'aclocal' tool creates a repository of macros that are specified directly or indirectly in the 'autoconf' input files.  Such macros are provided to perform commonly used tests or actions (e.g. test that a certain header file
+			exists or find the C compiler).  The macros are written in a language called m4 and the developer is free to create their own macros to add to the repository.  </p>
+		<p>The Autotools plug-in adds support for running the configure script prior to the build.  As well, support is added for invoking the Autotools themselves as well as maintaining the files they use.  An Autotools project extends a CDT Makefile project.  Therefore, functionality in the CDT for supporting such a project applies to an Autotools project as well (e.g. C/C++ Property pages).</p>
+		<p>For more details on the GNU Autotools, see 
+			<a href="http://www.gnu.org/software/autoconf/">http://www.gnu.org/software/autoconf/</a> and
+
+			<a href="http://www.gnu.org/software/automake/">http://www.gnu.org/software/automake/</a>
+		</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Supported-Environments.html" title="Supported Environments">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Supported Environments</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Building.html b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Building.html
new file mode 100644
index 0000000..057bab0
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Building.html
@@ -0,0 +1,112 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>Autotools Plugin-in User Guide - Building</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Building</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Special-Editors.html" title="Special Editors">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Make-Targets.html" title="Make Targets">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Special Editors</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Make Targets</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Building">Building</h1>
+		<p>As mentioned, an Autotools project is an extended CDT Makefile project.  Building the project is done the same as for any Makefile project.  You can kick off a build manually by clicking on the Project -> Build Project menu item or if you choose, you can set up builds to occur automatically when resources are changed by checking off the Project -> Build Automatically menu item.  The former build option is disabled when automatic builds are selected.  By default, a 
+			<b>make all</b> is performed following the Autotools configure step.
+		</p>
+		<p>The build is performed on the active build configuration.  A build configuration is a CDT construct which is a group of settings for a particular build.  This is not to be confused with an Autotools configuration which is just the settings passed to the configure script.  The CDT build configuration is saved across Eclipse sessions and includes environment variable settings, build macros, build location, tool settings, etc... used to perform a build.  A project may have multiple build configurations.  For example, a build with debugging info and a regular optimized build.  As such, one configuration is designated the active configuration and as previously stated, is the one used for the build.</p>
+		<p>The Autotools configure script parameters and the autogen.sh script parameters are treated as part of the CDT build configuration.  While CDT settings are stored in the .cproject file within the project, the Autotools parameters are stored in a special file: .autotools.  There is a one-to-one mapping of Autotools configuration parameters to a build configuration.  By default, each Autotools project starts with a base build configuration named 
+			<b>Build (GNU)</b> which configures and builds in the top-level project directory.  This is common for Autotools projects to have the user configure and build directly in the top-level source directory.  The location of the build can be changed in the C/C++ Build properties:
+		</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsBuildLocation.png"/>
+		</p>
+		<p>Notice how the default is ${workspace_loc:/xxxx} where xxxx is the project name.  This represents the project's location which may or may not be physically under the workspace root directory.  To change the build location, it is recommended that you add a directory following the project location: e.g. ${workspace_loc:/xxxx}/yyyy.  </p>
+		<p>It should be noted that the configure script automatically checks to see if a configuration has been performed in the source directory.  It does so by looking for the 
+			<b>config.status</b> file existing in the same directory as the configure script.  If configuring in a different directory and the configure script finds 
+			<b>config.status</b> in the source directories, it will stop and report a failure.  Such is the case if you originally configure and build the default configuration and either change the build location or add a new configuration later and try to build it.  The second configuration fails and recommends running 
+			<b>make distclean</b> first.  A 
+			<b>make distclean</b> performs a clean and in addition removes configuration files such as 
+			<b>config.status</b>.  The Autotools plug-in recognizes when this situation is about to occur during the configure step and will automatically issue a 
+			<b>make distclean</b> on your behalf to avoid the failure.  The cleaning operation is recorded in the Configure console.  Since it also removes build artefacts for the default configuration, these may have to be regenerated by a future configure/build with the default configuration marked active.  If you know you will be creating multiple configurations for the project, you can either specify the default build location to something other than the top-level project directory or else you can avoid using the default configuration and only build configurations you have added yourself.
+		</p>
+		<p>CDT build configurations are managed via the Managed Configurations dialog.  The dialog is accessed via a button that can be found on any property page that alters data that is part of the build configuration.  This includes the Project -> Properties -> Autotools -> Configure Settings page.  Pressing the button results in the Manage Configurations dialog:</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsManageConfs.png"/>
+		</p>
+		<p>From the dialog, it is possible to create a new configuration, rename a configuration, delete a configuration, or set a particular configuration as being the active one.  Deletion is disabled when there is only one configuration.  Likewise, if there is only one configuration, it is active by default.  When you choose to create a new configuration (hit the New... button), you are given a number of choices.  You can:</p>
+		<ol>
+			<li>create a new one based on the default configuration
+				<ul>
+					<li>In the case of Autotools this is the default Build (GNU) configuration before any modifications were made.</li>
+				</ul>
+			</li>
+			<li>copy from an existing configuration
+				<ul>
+					<li>This copies all settings made.</li>
+				</ul>
+			</li>
+			<li>import from an existing project
+				<ul>
+					<li>This is unsupported if the project is not also an Autotools project in which case undefined behavior occurs.</li>
+				</ul>
+			</li>
+			<li>import a predefined configuration
+				<ul>
+					<li>This is not supported as it offers non-Autotools configurations.  Undefined behavior will result if one of these are chosen.</li>
+				</ul>
+			</li>
+		</ol>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsCreateConf.png"/>
+		</p>
+		<p>Copying a configuration copies all of its settings, including the Autotools configuration parameters.  Copying all settings would normally include the build location (the directory where the build will be performed), but the Autotools plug-in, by default, intercedes and for every new configuration subsequent to the initial one, it sets the build location to build-xxxx where xxxx is the unique configuration name.  The Autotools plug-in replaces any white-space in the configuration name with underscores so it is possible if you have named two configurations similarly with different white-space characters or one with underscores that you might result in a build location collision.  The replacement of white-space is done because the build directory will get placed in the generated Makefile where white-space is used as delimiters and undefined behaviour would therefore occur.  The automatic build directory naming behaviour can be turned off from the Project -> Properties -> Autotools page, but it is discouraged since switching between different configurations and building in the same directory can cause undefined behaviour.</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsAutotools.png"/>
+		</p>
+		<p>Note: changes to configurations are not performed unless the Ok or Apply buttons are pressed from a Property page with the Manage Configurations button on it.  That is, pressing Ok from the Manage Configurations dialog does not make the changes permanent.  You could add new configurations, delete others, and then hit the Cancel button from the corresponding property page and the changes would be reverted.</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Special-Editors.html" title="Special Editors">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="Autotools Plugin-in User Guide.html" title="Autotools Plugin-in User Guide">
+						<img alt="Autotools Plugin-in User Guide" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right">
+					<a href="Make-Targets.html" title="Make Targets">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Special Editors</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Make Targets</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Configuration.html b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Configuration.html
new file mode 100644
index 0000000..8a4b1d9
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Configuration.html
@@ -0,0 +1,125 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>Autotools Plugin-in User Guide - Configuration</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Configuration</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Creating-an-Autotools-Project.html" title="Creating an Autotools Project">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Invoking-Autotools.html" title="Invoking Autotools">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Creating an Autotools Project</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Invoking Autotools</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Configuration">Configuration</h1>
+		<p>Prior to running a build, the Autotools plug-in runs the configure script.  Parameters to be passed to configure may be
+			entered via the Project -> Properties -> Autotools -> Configure Settings UI shown below:</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsConfsettings.png"/>
+		</p>
+		<p>You will notice how the actual configure script name is editable.  It is not recommended you change the name of the configure script as this is standard for Autotool projects.  However, one use of this text input is to add environment variables to set prior to invoking the configure script.  For example, you might want to set the command to: 
+			<b>CFLAGS="-g -debug" configure</b> to have the CFLAGS environment variable overridden while configuring.  The same applies to the autogen.sh script settings.
+		</p>
+		<p>For configure, there are a number of standard parameters that apply to generated configure scripts.  Each parameter has its command line name presented so you can look it up in Autotools documentation.  In addition, tool-tip hover help is provided.</p>
+		<p>Under the Advanced category, there is a free-form line called "Additional command-line options" where you may enter any options in their command-line format.  This is useful for entering custom options that your configure script supports (e.g. --enable-feature-x or --with-lib-y).  It can also be used for any of the standard parameters as well if that is more familiar tor you.  Parameters in this list are appended to the end of parameters derived from the standard option entries (i.e. you could get two specifications of a parameter).  In the case of multiple specification, behaviour is the same as it is on the command line.  You can optionally check off the "Display help contents (--help)" option under the General category to see all the standard and custom options the configure script accepts.  As the configure script help is a product of how it is written, it is sometimes possible that the help is out of date with regards to added features.</p>
+		<p>In some cases, a project may choose not to invoke the Autotools ahead of time and instead
+			require this be done prior to configuration.  The input files that are fed to the Autotools are provided, but the output of
+			the Autotools are not.  This may be
+			done to lower the download size and additionally to avoid having to constantly regenerate the output files as the Autotools are
+			updated.  In such cases, an autogen.sh script may be provided which is simply a script that runs the various Autotools
+			required.  This script may or may not run the configure script at the end.  Alternatively, there is also the 
+			<i>autoreconf</i>
+			tool which can be invoked to recursively run through the source tree and run all Autotools where the input files are newer than
+			the output files (this includes the case where no output file is present).  Any options required when invoking the Autotools
+			can be encoded within the input files themselves.
+		</p>
+		<p>The following defines a priority list of scenarios that the Autotools plug-in checks for when performing the configure step and how each one is handled.</p>
+		<ol>
+			<li>A config.status file exists and configure script options have not changed since the last configuration
+				<ul>
+					<li>The config.status file is created as part of running a generated configure script.  It itself is a script file and indicates a configuration has already been performed.  If the configure options have not changed since that configuration, there is no need to do a full reconfigure.  A simple check is performed by calling the config.status script with the --recheck option.  This will verify that the generated Makefile exists and is up to date.</li>
+				</ul>
+			</li>
+			<li>A configure script exists
+				<ul>
+					<li>In this case, the configure script is run with any configuration options specified in the project properties.</li>
+				</ul>
+			</li>
+			<li>An autogen script exists
+				<ul>
+					<li>In this case, the autogen.sh script is run and following that, a check is made to see if config.status has been created, indicating that the configure script was run.  If has not configured, the configure script is run automatically if it was successfully created.</li>
+				</ul>
+			</li>
+			<li>A Makefile.cvs file exists
+				<ul>
+					<li>A Makefile.cvs is an alternate form of autogen.sh/configure script.  In this case, the file is fed to the make command.  If a configure script is created and not run as part of this process, it is run automatically.</li>
+				</ul>
+			</li>
+			<li>default case
+				<ul>
+					<li>At this point, there is no configure script or autogen.sh script and configure has not been run previously.  A last resort is to run the autoreconf command with -i to recursively search the source tree and invoke Autotools for any input file that is older than its output target (or if the target is missing).  If this generates a configure script, it is run automatically.</li>
+				</ul>
+			</li>
+		</ol>
+		<p>If after all of this, the top-level Makefile is not created, an error is generated and building stops.  </p>
+		<p>The configure process can be manually forced for a project via the Project -> Reconfigure Project menu item.  A reconfigure runs the configure script even if a config.status file is found indicating a prior configuration was successful.</p>
+		<p>The entire configuration step is performed by a special builder that is added when an Autotools project is created or converted from another project.  The special builder runs the configure step and is positioned to run prior to the Makefile builder.</p>
+		<p>From the Project -> Properties -> Builders tab for a project you will see:</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsBuilders.png"/>
+		</p>
+		<p>Do not un-check the Autotools Makefile builder nor change the order of the builders.  Modifying this will result in undefined behaviour.</p>
+		<p>The configure step is run in a special Configuration console added by the Autotools plug-in.  This console is separate from the C-Build console which is used to display the results of the make command invocation.</p>
+		<p>To see the Configure console, click on the console selector button (icon looks like a T.V.) found in the Console View as follows:</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsConsoleSelect.png"/>
+		</p>
+		<p>Note that the configure console output is per project and shows configuration output for the last build of the project.  It is not saved between Eclipse sessions.</p>
+		<p>The Autotools console is an instance of a CDT Build console so the console preferences set in Window -> Preferences -> C/C++ -> Build Console apply as well.</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsConsolePrefs.png"/>
+		</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Creating-an-Autotools-Project.html" title="Creating an Autotools Project">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="Autotools Plugin-in User Guide.html" title="Autotools Plugin-in User Guide">
+						<img alt="Autotools Plugin-in User Guide" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right">
+					<a href="Invoking-Autotools.html" title="Invoking Autotools">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Creating an Autotools Project</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Invoking Autotools</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Creating-an-Autotools-Project.html b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Creating-an-Autotools-Project.html
new file mode 100644
index 0000000..04fec39
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Creating-an-Autotools-Project.html
@@ -0,0 +1,87 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>Autotools Plugin-in User Guide - Creating an Autotools Project</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Creating an Autotools Project</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Supported-Environments.html" title="Supported Environments">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Configuration.html" title="Configuration">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Supported Environments</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Configuration</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Creating_an_Autotools_Project">Creating an Autotools Project</h1>
+		<p>There a number of ways to create an Autotools project.  The first method is through the CDT C and C++ Project wizards which can be activated from the File -> New -> C Project and File -> New -> C++ Project menu items, respectively, which are available while in the C/C++ Perspective.  These two wizards can also be located by clicking on the File -> New -> Project... menu item and then opening the C/C++ folder found there.</p>
+		<p>Looking at the C Wizard, we see that there is a GNU Autotools category.</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsCProjectWizard.png"/>
+		</p>
+		<p>Opening the category, there are two choices: Empty Project or Hello World Ansi C Autotools Project.  The Empty Project template means that no files will be supplied to the new project while the Hello World project will supply a sample hello world program that uses Autotools for configuring the build.  The C++ Project Wizard also has the same GNU Autotools category and two project templates: an Empty Project and a Hello World C++ Autotools sample program.  If you are creating a project from scratch, it is recommended that you use the Hello World sample project and make modifications.  Otherwise, you will need to create a configure script for the Autotools plug-in to invoke at build time or provide a Makefile so the configuration step does not fail.</p>
+		<p>The C and C++ Wizards can also be used when importing an existing Autotools project.  For example, when importing a project from CVS using File -> Import... -> CVS -> you are given the choice to "Check out as a project configured by the new project wizard".</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsCheckout.png"/>
+		</p>
+		<p>From the New Project menu, open the C/C++ category and choose either a C Project or C++ Project, depending on the type of project being imported.  If the code is both C and C++, choose C++ Project.</p>
+		<p>Let's say you have a C application using Autotools and select C Project.  This will bring up the C Project Wizard as displayed earlier.  In this case, choose the Empty Project from the GNU Autotools category as you already have all the configuration files in place.</p>
+		<p>Another method to create an Autotools project is to convert an existing project.  For example, if we import a project from SVN or CVS and do not configure using the new project wizard, the project will simply be downloaded into the workspace.  At this point, it cannot be built or access various tools from the CDT.</p>
+		<p>To convert it, select the project in the Project Explorer and open the File -> New -> Convert to C/C++ Project menu item as found in the C/C++ Perspective.  If in another perspective, this same wizard can be found by selecting File -> New -> Other... -> C/C++ -> Convert to a C/C++ Project.  This brings up the C/C++ Conversion wizard.</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsConvertWizard.png"/>
+		</p>
+		<p>Note how there is a set of projects that are candidates for conversion.  This list contains any projects that are not already C or C++ projects.  A C or C++ project includes regular CDT Managed Make and Makefile projects.  Also note that the project you selected is automatically selected when the wizard opens.</p>
+		<p>There is a choice of C or C++ project and a set of project types to choose from.  For Autotools, select the GNU Autotools category and this will convert to an Autotools project.  Once converted, this project will not show up as a candidate project in the conversion wizard.</p>
+		<p>The final way to create an Autotools project is to use the Autotools Conversion wizard.  This wizard allows one to convert from any form of project to an Autotools project.  Obviously, converting a project that isn't actually C or C++ and using Autotools will result in undefined behaviour.  You need to first select the project you wish to convert.  After selecting, go to File -> New -> Other... -> C/C++, open the category, select "Convert to a C/C++ Autotools Project" and hit the Next button.  </p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsNewOther.png"/>
+		</p>
+		<p>This brings up the following dialog:</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsConvAutotoolsWizard.png"/>
+		</p>
+		<p>Again, there are candidates for conversion.  This list contains all projects that are not currently C or C++ Autotool projects.  You are given the choice of C or C++ as with the standard C/C++ conversion wizard.  Hitting the Finish button is all that is needed, but if you hit the Next button and continue on you can select referenced projects, if desired.  </p>
+		<p>Once converted to an Autotools project, there is no UI method to convert back to a regular C/C++ project.  If this is desired, you need to manually remove the .project, .cproject, and .autotools files from the project directory.  This will effectively remove the natures and CDT settings for the project, allowing you to convert it again however you want.</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Supported-Environments.html" title="Supported Environments">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="Autotools Plugin-in User Guide.html" title="Autotools Plugin-in User Guide">
+						<img alt="Autotools Plugin-in User Guide" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right">
+					<a href="Configuration.html" title="Configuration">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Supported Environments</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Configuration</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Invoking-Autotools.html b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Invoking-Autotools.html
new file mode 100644
index 0000000..1200a00
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Invoking-Autotools.html
@@ -0,0 +1,121 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>Autotools Plugin-in User Guide - Invoking Autotools</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Invoking Autotools</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Configuration.html" title="Configuration">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Special-Editors.html" title="Special Editors">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Configuration</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Special Editors</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Invoking_Autotools">Invoking Autotools</h1>
+		<p>To invoke the Autotools, a special menu item has been added to the Project menu.  Under Project -> Invoke Autotools there are a set of menu items to invoke the various Autotools for your project.  The output of the tool invocation is presented in a special Autotools Console.  Like the Configure and C-Build Consoles, the Autotools console is per-project and is not saved across Eclipse sessions.  The console, if present, can be accessed via the "Display Selected Console" button in the Console View.</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsAutotoolsConsole.png"/>
+		</p>
+		<p>The tools provided are:</p>
+		<ol>
+			<li>Invoke Autoconf
+				<ul>
+					<li>The autoconf tool is run in the current directory for the current file or folder selected for the project.  There are no parameters.  Autoconf can also be run by right-clicking a configure.in or configure.ac file and selected Invoke Autoconf.
+						<br/>
+					</li>
+				</ul>
+			</li>
+			<li>Invoke Automake
+				<ul>
+					<li>The automake tool is run from the current directory for the file or folder selected in the project.  A dialog is presented to allow specification of options. 
+						<img border="0" src="images/Linuxtools-AutotoolsAutomake.png"/>  
+						<br/>The first text entry is for options while the 2nd text window is for Makefiles targets to generate.  The automake tool should be invoked where the configure script is found that will generate the Makefile(s).  There may be multiple Makefiles to generate in the current directory or lower.  Each target location should be a Makefile and should have a corresponding Makefile.am file at the relative location specified.  For example, automake x/Makefile y/Makefile Makefile specifies three targets.  It is expected that there is an x/Makefile.am, y/Makefile.am, and a Makefile.am relative to the current directory.  For details on automake, enter --help as an option.
+						<br/>
+					</li>
+				</ul>
+			</li>
+			<li>Invoke Aclocal
+				<ul>
+					<li>The aclocal tool is run from the current directory for the file or folder selected in the project.  A dialog is presented to allow specification of options.  
+						<img border="0" src="images/Linuxtools-AutotoolsAclocal.png"/>  
+						<br/>The first text entry is for options while the 2nd text window is for directories to search for m4 macros.  The directories can also be specified directly in the options parameters using the -I option.  For details, enter --help as an option.
+						<br/>
+					</li>
+				</ul>
+			</li>
+			<li>Invoke Autoheader
+				<ul>
+					<li>The autoheader tool is run from the current directory for the file or folder selected in the project.  A dialog is presented to allow specification of options.  
+						<img border="0" src="images/Linuxtools-AutotoolsAutoheader.png"/>  
+						<br/>The tool is used to create a template for generated header files.  It should be run in a directory containing a configure script as it gets its information from there.  For details, enter --help as an option.
+						<br/>
+					</li>
+				</ul>
+			</li>
+			<li>Invoke Autoreconf
+				<ul>
+					<li>The autoreconf tool is run from the current directory for the file or folder selected in the project.  A dialog is presented to allow specification of options.  
+						<img border="0" src="images/Linuxtools-AutotoolsAutoreconf.png"/>  
+						<br/>The most useful option is the -i option to recursively call Autotools for all input files out of date with respect to their outputs.  For details, enter --help as an option.
+						<br/>
+					</li>
+				</ul>
+			</li>
+			<li>Invoke Libtoolize
+				<ul>
+					<li>The libtoolize tool is run from the current directory for the file or folder selected in the project.  The tool is used to add libtool support to a package.  Libtool provides macros to allow a package to create a shared library without having to know all the details required for the current platform.  This might include special compiler flags or linker options or special tools.  A dialog is presented to allow specification of options. 
+						<img border="0" src="images/Linuxtools-AutotoolsLibtoolize.png"/> 
+						<br/>For details on libtoolize, enter --help as an option.
+						<br/>
+					</li>
+				</ul>
+			</li>
+		</ol>
+		<p>By default, the autotools are invoked simply by their names; expecting that the path has been set up appropriately.  In some instances, you might want to specify a specific location for the autotools.  For example, your project may require old versions of the tools which you have installed locally, but do not wish to be on your path.  To set these for your project, select your project or a file/folder within it and go to Project -> Properties -> Autotools -> General and select the Tool Settings tab.</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsToolSettings.png"/>
+		</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Configuration.html" title="Configuration">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="Autotools Plugin-in User Guide.html" title="Autotools Plugin-in User Guide">
+						<img alt="Autotools Plugin-in User Guide" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right">
+					<a href="Special-Editors.html" title="Special Editors">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Configuration</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Special Editors</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Make-Targets.html b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Make-Targets.html
new file mode 100644
index 0000000..9339475
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Make-Targets.html
@@ -0,0 +1,102 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>Autotools Plugin-in User Guide - Make Targets</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Make Targets</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Building.html" title="Building">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Updating-This-Document.html" title="Updating This Document">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Building</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Updating This Document</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Make_Targets">Make Targets</h1>
+		<p>A Makefile has a set of targets that can be built.  Typically, every Makefile has an 
+			<b>all</b> target which builds all targets, but there may be optional targets as well.  A CDT Makefile project enables one to invoke the various make targets via the Make Targets dialog.  Since an Autotools project is a form of Makefile project, it too supports the Make Targets dialog.
+			Make Targets are important for an Autotool project because there are a large number of make targets added to the Makefile automatically by configuration.  Typically, a project is built by running 
+			<b>make all</b>, but it is installed by invoking 
+			<b>make install</b>.  The install target places files in standard locations; usually system directories on a Linux system.  For example, header files would be installed in /usr/include and made available to all users of the system.  The install prefix (/usr) can be overridden using the configure --prefix parameter or else by specifying prefix=xxxx on the call to make (e.g. make install prefix=/my/local/directory) so that testing can be performed without modifying the whole system.
+		</p>
+		<p>A regular CDT Makefile project requires users to add their own Make Targets, however, the Autotools plug-in analyzes the top-level Makefile for you and creates top-level Make Targets for the project.  As mentioned, these automatically added targets can be numerous.  If you wish to create targets to run in sub-directories of the main build directory, you must add these manually.  For example, you might wish to build docs in a lower-level sub-directory, but not for the entire project.</p>
+		<p>The Make Targets dialog can be displayed in two ways:</p>
+		<ol>
+			<li>Selecting a file or folder in a project and clicking on the Project -> Make Target menu item</li>
+			<li>Right clicking on a file or folder in a project and selecting Make Target</li>
+		</ol>
+		<p>This brings up a sub-menu containing Create... and Build.... to either create a new Make Target or build an existing Make Target, respectively.</p>
+		<p>
+			<img border="0" src="images/Linuxtool-AutotoolsMakeTargetsMenu.png"/>
+		</p>
+		<p>Creating a Make Target is relatively straight-forward:</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsMakeTargetCreate.png"/>
+		</p>
+		<p>There is nothing different in the Make Target dialog for Autotools, however, a few concepts need to be clarified.</p>
+		<p>For Make Targets added as part of the Project -> Make Target menu item, the target is for the top-level Makefile for the current build.  This means that if you add a Make Target this way, it will persist across configurations and will try and run the 
+			<b>make</b> command in the top-level build location specified for the active configuration.
+		</p>
+		<p>Make Targets added by using the right-click Make Target menu are location sensitive.  This means that the 
+			<b>make</b> command will attempt to run in that directory where the right-click was performed, regardless of whether there is a Makefile present there.  Let's say you want to add your own Make Target that performed a 
+			<b>make all install</b> (i.e. you want to group multiple targets together into one).  If you are in configuration X with build directory build-X, you want to right-click in a directory that is build-X or a sub-directory of build-X.  This target will issue a 
+			<b>make all install</b> in that particular directory.  If you wanted the same target for another configuration, you would have to right-click in its build directory or lower and add another Make Target.  Obviously, for top-level Make Targets, using the Project -> Make Target menu item makes the most sense since it applies to all configurations.  If you add a Make Target to a source directory, it will likely fail when run because it will try and run 
+			<b>make</b> in that directory which will probably only contain a Makefile.in or Makefile.am file and not a Makefile which is only generated at configure time.
+		</p>
+		<p>The Make Target dialog can be used to override various flags within the Makefile.  For example, to perform a 
+			<b>make install</b> and reset the prefix to /my/local/directory, you would first select the 
+			<b>install</b> target from the Build... dialog.
+		</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsMakeTargetBuild.png"/>
+		</p>
+		<p>Then, you would click the Edit button to edit the Make Target.  You can then override the prefix by specifying its value after the 
+			<b>make</b> command.  You edit the build command by first un-checking "Use Builder Settings" which enables text entry.
+		</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsMakeTargetEdit.png"/>
+		</p>
+		<p>The check-box that says "Run all project builders" should be left un-checked.  By default, we only want the CDT Makefile builder to run and not the Autotools configure builder or any other builder.</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Building.html" title="Building">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="Autotools Plugin-in User Guide.html" title="Autotools Plugin-in User Guide">
+						<img alt="Autotools Plugin-in User Guide" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right">
+					<a href="Updating-This-Document.html" title="Updating This Document">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Building</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Updating This Document</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Special-Editors.html b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Special-Editors.html
new file mode 100644
index 0000000..0938d6b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Special-Editors.html
@@ -0,0 +1,78 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>Autotools Plugin-in User Guide - Special Editors</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Special Editors</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Invoking-Autotools.html" title="Invoking Autotools">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Building.html" title="Building">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Invoking Autotools</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Building</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Special_Editors">Special Editors</h1>
+		<p>The Autotools plug-in provides two special editors for editing Autotool input files.  The first is the Autoconf Editor.  This editor is invoked when opening configure.in, configure.ac files as well as the resultant configure scripts that autoconf creates.  Support includes full colourization, outline view, rudimentary error parsing, and hover help/completion.</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsAutoconfEditor.png"/>
+		</p>
+		<p>The outline view shows macro references and program control statements such as if, else, for, etc...  Hover help with text completion is provided for the various AC-prefixed and AM-prefixed macros that are provided as standard.  As the macros vary from release to release of autoconf and automake, the editor uses an autoconf and automake version property to determine which set of macros it should adhere to.  The versions selected affect the parsing which will issue warnings for macros that do not have enough parameters or too many parameters.  To set the autoconf and automake versions for the Autoconf Editor, go to the Project -> Properties -> Autotools -> General page and select the Editors tab.</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsEditorsTab.png"/>
+		</p>
+		<p>There you will find a pull-down of the various versions supported.  Future releases may add new versions.</p>
+		<p>The default autoconf and automake versions to use for editing can be set as a preference.  Go to Window -> Preferences -> C/C++ -> Autotools -> Autoconf Editor and click on the Versions tab.</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsAutoconfEditorPrefs.png"/>
+		</p>
+		<p>Under the Syntax tab of the same preference page, you can change the colours used for the various elements shown in the editor.</p>
+		<p>A second editor, the Automake Editor is also provided by the Autotools plug-in.  This editor is invoked when opening a Makefile.am or Makefile.in file.  Support includes full colourization, outline view, rudimentary error parsing, and hover help.</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsAutomakeEditor.png"/>
+		</p>
+		<p>In the example shown, one can see the $ variable references are displayed when hovered over.  This is particularly useful for $&lt; and $@ in make targets to understand what is being referenced.  In some instances, you will see reference to variables surrounded by the @ symbol (e.g. @srcdir@).  This represents a variable that is to be substituted by the configure script.</p>
+		<p>Rudimentary error parsing looks for syntax errors.  As with the Autoconf editor, colourization can be controlled by preferences.  Go to Window -> Preferences -> C/C++ -> Autotools -> Automake Editor and click on the Syntax tab.</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Invoking-Autotools.html" title="Invoking Autotools">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="Autotools Plugin-in User Guide.html" title="Autotools Plugin-in User Guide">
+						<img alt="Autotools Plugin-in User Guide" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right">
+					<a href="Building.html" title="Building">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Invoking Autotools</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Building</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Supported-Environments.html b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Supported-Environments.html
new file mode 100644
index 0000000..b3ac355
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Supported-Environments.html
@@ -0,0 +1,60 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>Autotools Plugin-in User Guide - Supported Environments</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Supported Environments</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Autotools Plugin-in User Guide.html" title="Introduction">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Creating-an-Autotools-Project.html" title="Creating an Autotools Project">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Introduction</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Creating an Autotools Project</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Supported_Environments">Supported Environments</h1>
+		<p>While the Autotools should work on any Unix-based system, it has only been tested on Linux (note that it is part of the Linux Tools project).  OS-specific bugs or problems that are not reproducible on Linux may require a user work-around.  For example, users of Cygwin or MinGW may require setting modifications to get the plug-in working for their project.  The Autotools plug-in is not supported under a regular Windows environment (i.e. without Cygwin or MinGW).</p>
+		<p>To use the Autotools plug-in, it is required that you have the CDT (C/C++ Development Tools) already installed in Eclipse, the GNU Autotools installed on your system, and the "sh" (shell) command must be available. The "sh" command is required to invoke the configure script.</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Autotools Plugin-in User Guide.html" title="Introduction">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="Autotools Plugin-in User Guide.html" title="Autotools Plugin-in User Guide">
+						<img alt="Autotools Plugin-in User Guide" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right">
+					<a href="Creating-an-Autotools-Project.html" title="Creating an Autotools Project">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Introduction</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Creating an Autotools Project</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Updating-This-Document.html b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Updating-This-Document.html
new file mode 100644
index 0000000..67acc85
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Updating-This-Document.html
@@ -0,0 +1,54 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>Autotools Plugin-in User Guide - Updating This Document</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Updating This Document</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Make-Targets.html" title="Make Targets">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right"></td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Make Targets</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top"></td>
+			</tr>
+		</table><hr/>
+		<h1 id="Updating_This_Document">Updating This Document</h1>
+		<p>This document is maintained in a collaborative wiki.  If you wish to update or modify this document please visit 
+
+			<a href="http://wiki.eclipse.org/Linux_Tools_Project/Autotools/User_Guide">http://wiki.eclipse.org/Linux_Tools_Project/Autotools/User_Guide</a>
+		</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Make-Targets.html" title="Make Targets">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="Autotools Plugin-in User Guide.html" title="Autotools Plugin-in User Guide">
+						<img alt="Autotools Plugin-in User Guide" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right"></td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Make Targets</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top"></td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtool-AutotoolsMakeTargetsMenu.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtool-AutotoolsMakeTargetsMenu.png
new file mode 100644
index 0000000..92cff7e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtool-AutotoolsMakeTargetsMenu.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAclocal.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAclocal.png
new file mode 100644
index 0000000..97c80f2
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAclocal.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutoconfEditor.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutoconfEditor.png
new file mode 100644
index 0000000..fa9b650
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutoconfEditor.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutoconfEditorPrefs.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutoconfEditorPrefs.png
new file mode 100644
index 0000000..ae132b1
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutoconfEditorPrefs.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutoheader.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutoheader.png
new file mode 100644
index 0000000..151d88b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutoheader.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutomake.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutomake.png
new file mode 100644
index 0000000..7b293bf
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutomake.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutomakeEditor.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutomakeEditor.png
new file mode 100644
index 0000000..e47af3b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutomakeEditor.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutoreconf.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutoreconf.png
new file mode 100644
index 0000000..6c54060
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutoreconf.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutotools.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutotools.png
new file mode 100644
index 0000000..b5d6ee7
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutotools.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutotoolsConsole.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutotoolsConsole.png
new file mode 100644
index 0000000..ee0ae59
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutotoolsConsole.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsBuildLocation.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsBuildLocation.png
new file mode 100644
index 0000000..e64cd4c
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsBuildLocation.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsBuilders.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsBuilders.png
new file mode 100644
index 0000000..de96459
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsBuilders.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsCProjectWizard.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsCProjectWizard.png
new file mode 100644
index 0000000..622690c
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsCProjectWizard.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsCheckout.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsCheckout.png
new file mode 100644
index 0000000..d502223
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsCheckout.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConfsettings.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConfsettings.png
new file mode 100644
index 0000000..70065fe
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConfsettings.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConsolePrefs.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConsolePrefs.png
new file mode 100644
index 0000000..2534bd1
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConsolePrefs.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConsoleSelect.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConsoleSelect.png
new file mode 100644
index 0000000..8b6df0d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConsoleSelect.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConvAutotoolsWizard.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConvAutotoolsWizard.png
new file mode 100644
index 0000000..fe8c69d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConvAutotoolsWizard.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConvertWizard.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConvertWizard.png
new file mode 100644
index 0000000..c7ad60e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConvertWizard.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsCreateConf.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsCreateConf.png
new file mode 100644
index 0000000..5e26d74
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsCreateConf.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsEditorsTab.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsEditorsTab.png
new file mode 100644
index 0000000..40dd5a0
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsEditorsTab.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsLibtoolize.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsLibtoolize.png
new file mode 100644
index 0000000..75b932b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsLibtoolize.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsMakeTargetBuild.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsMakeTargetBuild.png
new file mode 100644
index 0000000..befd0a2
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsMakeTargetBuild.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsMakeTargetCreate.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsMakeTargetCreate.png
new file mode 100644
index 0000000..25913c9
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsMakeTargetCreate.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsMakeTargetEdit.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsMakeTargetEdit.png
new file mode 100644
index 0000000..1f2de55
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsMakeTargetEdit.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsManageConfs.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsManageConfs.png
new file mode 100644
index 0000000..c66cc3d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsManageConfs.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsNewOther.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsNewOther.png
new file mode 100644
index 0000000..b7865b2
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsNewOther.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsToolSettings.png b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsToolSettings.png
new file mode 100644
index 0000000..0e4bdb4
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsToolSettings.png
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-feature/.project b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-feature/.project
new file mode 100644
index 0000000..9418b45
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.cdt.autotools-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-feature/ChangeLog b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-feature/ChangeLog
new file mode 100644
index 0000000..7954d04
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-feature/ChangeLog
@@ -0,0 +1,96 @@
+2009-11-10  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.properties: Make featureName a bit more user-friendly.
+
+2009-11-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Fix dependencies to support CDT 6.0.0 and up.
+
+2009-11-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Fix feature id.
+
+2009-10-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Add revised org.eclipse.linuxtools.cdt.autotools plug-in that has been
+	set up for compatbility mode to build older projects.
+
+2009-10-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Bump to 2.0.0.  Refer to new org.eclipse.linuxtools.cdt.autotools.core and
+	org.eclipse.linuxtools.cdt.autotools.ui plug-ins.
+
+2009-04-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Fix dependencies to not require 6.0.0 CDT plugins as they
+	aren't in the CDT Master zip yet for Galileo builds.
+
+2009-04-23  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Use 6.0.0 CDT requirements on Galileo branch.
+
+2009-01-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Bump up version to 1.0.2.
+
+2009-01-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fixes #260436
+	
+	* feature.xml: Add .qualifier to version id.
+
+2009-01-06  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Add update site information.
+	* build.properties: Add feature.properties and epl-v10.html.
+
+2008-10-31  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Use %featureName, %provider, %copyright, and %description from
+	feature.properties.  Add "(Incubation)".
+	* feature.properties: Initial import.
+	* epl-v10.html: Likewise.
+
+2008-10-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Update release to 1.0.1.
+
+2008-08-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Update release to 1.0.0.
+
+2008-01-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Update release to 0.9.6.
+
+2007-12-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Update release to 0.9.5.3.
+
+2007-11-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Update release to 0.9.5.2.
+
+2007-10-23  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Update release to 0.9.5.1.
+
+2007-10-04  jjohnstn  <jjohnstn@vermillion>
+
+	* feature.xml: Update release to 0.9.5.
+
+2007-09-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Update release to 0.9.4.
+
+2007-09-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Update release to 0.9.3.
+
+2007-08-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Fix up release number.
+
+2007-07-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Fix up description to not reference sample url.
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-feature/about.html b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-feature/about.html
new file mode 100644
index 0000000..44e2290
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-feature/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

+<html>

+<head>

+<title>About</title>

+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>8th September, 2004</p>	

+<h3>License</h3>

+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<h3>Contributions</h3>

+

+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise

+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such

+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or

+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the

+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available

+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also

+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+</body>

+</html>
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-feature/build.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-feature/build.properties
new file mode 100644
index 0000000..d361ddb
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-feature/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+               about.html,\
+               epl-v10.html,\
+               feature.properties
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-feature/epl-v10.html b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-feature/epl-v10.html
new file mode 100644
index 0000000..9320c9f
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-feature/epl-v10.html
@@ -0,0 +1,320 @@
+<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
+
+
+<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
+<meta name="ProgId" content="Word.Document">
+<meta name="Generator" content="Microsoft Word 9">
+<meta name="Originator" content="Microsoft Word 9">
+<link rel="File-List" href="http://www.eclipse.org/legal/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
+<title>Eclipse Public License - Version 1.0</title>
+<!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+  <o:Revision>2</o:Revision>
+  <o:TotalTime>3</o:TotalTime>
+  <o:Created>2004-03-05T23:03:00Z</o:Created>
+  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
+  <o:Pages>4</o:Pages>
+  <o:Words>1626</o:Words>
+  <o:Characters>9270</o:Characters>
+   <o:Lines>77</o:Lines>
+  <o:Paragraphs>18</o:Paragraphs>
+  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
+  <o:Version>9.4402</o:Version>
+ </o:DocumentProperties>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <w:WordDocument>
+  <w:TrackRevisions/>
+ </w:WordDocument>
+</xml><![endif]-->
+<style>
+<!--
+ /* Font Definitions */
+@font-face
+	{font-family:Tahoma;
+	panose-1:2 11 6 4 3 5 4 4 2 4;
+	mso-font-charset:0;
+	mso-generic-font-family:swiss;
+	mso-font-pitch:variable;
+	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
+ /* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{mso-style-parent:"";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p
+	{margin-right:0in;
+	mso-margin-top-alt:auto;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p.BalloonText, li.BalloonText, div.BalloonText
+	{mso-style-name:"Balloon Text";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:8.0pt;
+	font-family:Tahoma;
+	mso-fareast-font-family:"Times New Roman";}
+@page Section1
+	{size:8.5in 11.0in;
+	margin:1.0in 1.25in 1.0in 1.25in;
+	mso-header-margin:.5in;
+	mso-footer-margin:.5in;
+	mso-paper-source:0;}
+div.Section1
+	{page:Section1;}
+-->
+</style>
+</head><body style="" lang="EN-US">
+
+<div class="Section1">
+
+<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
+</p>
+
+<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
+THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
+REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+OF THIS AGREEMENT.</span> </p>
+
+<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
+
+<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
+in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and<br clear="left">
+b) in the case of each subsequent Contributor:</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
+changes to the Program, and</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
+additions to the Program;</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
+such changes and/or additions to the Program originate from and are distributed
+by that particular Contributor. A Contribution 'originates' from a Contributor
+if it was added to the Program by such Contributor itself or anyone acting on
+such Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in conjunction
+with the Program under their own license agreement, and (ii) are not derivative
+works of the Program. </span></p>
+
+<p><span style="font-size: 10pt;">"Contributor" means any person or
+entity that distributes the Program.</span> </p>
+
+<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
+claims licensable by a Contributor which are necessarily infringed by the use
+or sale of its Contribution alone or when combined with the Program. </span></p>
+
+<p><span style="font-size: 10pt;">"Program" means the Contributions
+distributed in accordance with this Agreement.</span> </p>
+
+<p><span style="font-size: 10pt;">"Recipient" means anyone who
+receives the Program under this Agreement, including all Contributors.</span> </p>
+
+<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
+Subject to the terms of this Agreement, each Contributor hereby grants Recipient
+a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
+display, publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and object code
+form.</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
+Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
+patent license under Licensed Patents to make, use, sell, offer to sell, import
+and otherwise transfer the Contribution of such Contributor, if any, in source
+code and object code form. This patent license shall apply to the combination
+of the Contribution and the Program if, at the time the Contribution is added
+by the Contributor, such addition of the Contribution causes such combination
+to be covered by the Licensed Patents. The patent license shall not apply to
+any other combinations which include the Contribution. No hardware per se is
+licensed hereunder. </span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
+Recipient understands that although each Contributor grants the licenses to its
+Contributions set forth herein, no assurances are provided by any Contributor
+that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient
+for claims brought by any other entity based on infringement of intellectual
+property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility
+to secure any other intellectual property rights needed, if any. For example,
+if a third party patent license is required to allow Recipient to distribute
+the Program, it is Recipient's responsibility to acquire that license before
+distributing the Program.</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
+Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement. </span></p>
+
+<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
+
+<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
+Program in object code form under its own license agreement, provided that:</span>
+</p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
+it complies with the terms and conditions of this Agreement; and</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
+its license agreement:</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
+effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; </span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
+effectively excludes on behalf of all Contributors all liability for damages,
+including direct, indirect, special, incidental and consequential damages, such
+as lost profits; </span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
+states that any provisions which differ from this Agreement are offered by that
+Contributor alone and not by any other party; and</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
+states that source code for the Program is available from such Contributor, and
+informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
+
+<p><span style="font-size: 10pt;">When the Program is made available in source
+code form:</span> </p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
+it must be made available under this Agreement; and </span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
+copy of this Agreement must be included with each copy of the Program. </span></p>
+
+<p><span style="font-size: 10pt;">Contributors may not remove or alter any
+copyright notices contained within the Program. </span></p>
+
+<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
+originator of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution. </span></p>
+
+<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
+
+<p><span style="font-size: 10pt;">Commercial distributors of software may
+accept certain responsibilities with respect to end users, business partners
+and the like. While this license is intended to facilitate the commercial use
+of the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes the
+Program in a commercial product offering, such Contributor ("Commercial
+Contributor") hereby agrees to defend and indemnify every other
+Contributor ("Indemnified Contributor") against any losses, damages and
+costs (collectively "Losses") arising from claims, lawsuits and other
+legal actions brought by a third party against the Indemnified Contributor to
+the extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may participate
+in any such claim at its own expense.</span> </p>
+
+<p><span style="font-size: 10pt;">For example, a Contributor might include the
+Program in a commercial product offering, Product X. That Contributor is then a
+Commercial Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance claims and
+warranties are such Commercial Contributor's responsibility alone. Under this
+section, the Commercial Contributor would have to defend claims against the
+other Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.</span> </p>
+
+<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
+
+<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and distributing the
+Program and assumes all risks associated with its exercise of rights under this
+Agreement , including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs or
+equipment, and unavailability or interruption of operations. </span></p>
+
+<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
+
+<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
+THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
+
+<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
+
+<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
+or unenforceable under applicable law, it shall not affect the validity or
+enforceability of the remainder of the terms of this Agreement, and without
+further action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.</span> </p>
+
+<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
+against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with
+other software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the date
+such litigation is filed. </span></p>
+
+<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
+shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable
+period of time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive. </span></p>
+
+<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
+copies of this Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The Agreement
+Steward reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement Steward has
+the right to modify this Agreement. The Eclipse Foundation is the initial
+Agreement Steward. The Eclipse Foundation may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.</span> </p>
+
+<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
+State of New York and the intellectual property laws of the United States of
+America. No party to this Agreement will bring a legal action under this
+Agreement more than one year after the cause of action arose. Each party waives
+its rights to a jury trial in any resulting litigation.</span> </p>
+
+<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
+
+</div>
+
+</body></html>
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-feature/feature.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-feature/feature.properties
new file mode 100644
index 0000000..9717e8b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-feature/feature.properties
@@ -0,0 +1,112 @@
+#################################################################################
+#  Copyright (c) 2008 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+featureName=Autotools support for CDT (Incubation)
+description=Plugins for maintaining C/C++ projects that use Autotools (autoconf and automake).
+provider=Eclipse
+copyright=Copyright 2006, 2007, 2008, 2009 Red Hat, Inc.
+licenseURL=epl-v10.html
+license=\
+ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
+March 17, 2005\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse.org CVS\n\
+repository ("Repository") in CVS modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+Features may also include other Features ("Included Features"). Files named\n\
+"feature.xml" may contain a list of the names and version numbers of\n\
+Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+   - The top-level (root) directory\n\
+   - Plug-in and Fragment directories\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
+   - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Eclipse Update Manager, you must agree to a license ("Feature Update\n\
+License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties". Such Abouts,\n\
+Feature Licenses and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
+    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-feature/feature.xml b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-feature/feature.xml
new file mode 100644
index 0000000..8f26e37
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools-feature/feature.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.linuxtools.cdt.autotools"
+      label="%featureName"
+      version="2.0.0.qualifier"
+      provider-name="%provider">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="epl-v10.php">
+      %license
+   </license>
+
+   <url>
+      <update label="Linux Tools Update Site" url="http://download.eclipse.org/technology/linuxtools/update"/>
+   </url>
+
+   <requires>
+      <import plugin="org.eclipse.cdt.managedbuilder.core" version="5.0.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.cdt.core" version="5.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.cdt.ui" version="5.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.cdt.managedbuilder.ui" version="5.0.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.cdt.managedbuilder.gnu.ui" version="5.0.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.cheatsheets"/>
+      <import plugin="org.eclipse.ui" version="3.4.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime" version="3.4.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jface.text" version="3.4.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.editors" version="3.4.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.4.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.resources" version="3.4.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.ide" version="3.4.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.cdt.make.core" version="5.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.cdt.make.ui" version="5.0.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.console" version="3.3.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.help" version="3.3.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.variables" version="3.2.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.views" version="3.3.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.filesystem" version="1.2.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.linuxtools.cdt.autotools.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.cdt.autotools.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.cdt.autotools_docs"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.cdt.autotools"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/profiling/.classpath b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/.classpath
similarity index 100%
copy from profiling/.classpath
copy to autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/.classpath
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/.cvsignore b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/.cvsignore
new file mode 100644
index 0000000..50c1b30
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/.cvsignore
@@ -0,0 +1,4 @@
+bin
+@dot
+javaCompiler...args
+build.xml
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/.project b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/.project
new file mode 100644
index 0000000..3cb23d3
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.cdt.autotools.core</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/.settings/org.eclipse.jdt.core.prefs b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..43deb75
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Wed Feb 18 16:59:38 EST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/.settings/org.eclipse.jdt.ui.prefs b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..4c71318
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,3 @@
+#Tue Jan 02 14:11:13 EST 2007
+eclipse.preferences.version=1
+internal.default.compliance=default
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/ChangeLog b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/ChangeLog
new file mode 100644
index 0000000..2569225
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/ChangeLog
@@ -0,0 +1,4082 @@
+2010-04-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #308261
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsConfiguration.java (copy): Only set
+	the isDirty flag to true if we are cloning a configuration to a new id.  A straight copy should not change the isDirty
+	flag.
+
+2010-03-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #306406
+	* src/org/eclipse/linuxtools/cdt/autotools/core/AutotoolsNewProjectNature.java (addAutotoolsBuilder): Don't save
+	project description unless builder list has been modified.  To save the project description, use a Job so it is
+	done asynchronously. 
+
+2010-03-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java (regenerateMakefiles): Use the
+	id of the IConfiguration not the name to fetch the IAConfiguration for it.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsOptionValueHandler.java (handleValue): Make
+	sure ICConfigurationDescription exists before accessing it.
+
+2010-03-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #304005
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsConfigurationBuilder.java (build): Add logic to
+	check for dirty configuration.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java (runScript): Change to use getId
+	instead of getName method for IAConfiguration.
+	(runCommand): Ditto.
+	(regenerateMakefiles): Add call to sync configurations. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsConfiguration.java (getId): New
+	method. 
+	(copy): Changed to two separate methods, one which takes an id and the other which takes no parameter
+	and expects the id to be copied.
+	(AutotoolsConfiguration): Changed to accept an id rather than a name. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsConfigurationManager.java: Change to keep
+	track of temporary configuration list for a project.  This is needed when performing configuration settings and the
+	user has not yet confirmed.  In addition, store all configurations by id and not name since the id does not change.
+	(resourceChanged): Logic changed to rename both saved and temporary configuration lists which are now Map structures.
+	(AutotoolsConfigurationManager): Add hash maps for saved and temporary configuration lists.
+	(syncConfigurations): New method. 
+	(applyConfigs): Ditto.
+	(saveConfigs): Changed to take the project as parameter.  A second private
+	version of the function also has been added which takes an array of Configuration
+	Descriptions.  The option value "Name" for configure tool is resolved for saved configurations.
+	(getConfigs): Renamed to getSavedConfigs.
+	(getSavedConfigs): New method renamed from getConfigs.
+	(getConfigurations): Renamed to getSavedConfigs.
+	(isConfigurationAlreadySaved): Modified calls. 
+	(setSyncing): New method.
+	(createDefaultConfiguration): Pass id instead of name to constructor.
+	(isSyncing): New method.
+	(addConfiguration): No longer need to check for existence because we are adding to a Map.
+	(replaceConfiguration): Removed.
+	(saveAllConfigs): Ditto.
+	(replaceProjectConfigurations): Split into two versions.  The new version takes an additional
+	parameter which is an array of Configuration descriptions.
+	(getTmpConfigs): New method.
+	(syncNameField): New method.
+	(clearTmpConfigurations): New method.
+	(findCfg): Find by id and not name.
+	(getTmpConfiguration): New method.
+	(getConfiguration): Try and find configuration by id before creating default.
+	(cloneCfg): New method taken out of AutotoolsConfigurationPropertyPage and added here to perform cloning of an Autotools configuration.
+	Logic has been added to not perform cloning if the target configuration already has been saved and to return a boolean regarding this.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsOptionValueHandler.java (handleValue): Changed to
+	call new cloneCfg interface in AutotoolsConfigurationManager.  Logic to check for an Autotools Clone listener is removed.  The return
+	code of cloneCfg is checked to see if the configuration has already been saved.  If not saved and we are not doing a sync
+	then it returns without resolving the Name option field.  The Name option field is now the Configuration Description id
+	which does not change on a rename operation. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/IAConfiguration.java: Add new getId method.  Remove name methods
+	which are no longer used. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/wizards/NewAutotoolsProject.java (process): Modified call to
+	saveConfigs. 
+	(process): Ditto.
+
+2010-02-25  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java (getAutogenPath): Fix typo
+	so we split tokens on white-space, not non-white-space. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsConfigurationManager.java (saveConfigs): 
+	Since we base ourselves on hashing by name, do not save multiple configurations with same name. 
+	(getConfigs): Do not load multiple configurations with same name, just the first.
+
+2010-02-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #303616
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java (runScript): Use
+	unresolved default if environment variable is uninitialized.
+	(initializeBuildConfigDirs): Ditto. 
+	(runCommand): Ditto.
+	
+2010-02-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #303613
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureMessages.properties: Fix tooltip
+	for config tool directory.
+
+2010-02-23  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #303616
+	* src/org/eclipse/inuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java (getAutogenArgs):
+	Add additional parameter of arguments found in the command itself. 
+	(getConfigArgs): Ditto. 
+	(getAutogenPath): Fix to split out additional arguments specified with the command.
+	(getConfigurePath): Ditto. 
+	(runScript): Fix to resolve build macros for arguments.
+	(runCommand): Ditto. 
+	(regenerateMakefiles): Fix references to functions above to pass additional parms.
+
+2010-02-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java (addMakeTargetsToManager): Add
+	code to use reflection to look for new MakeTargetManager setTargets method which will set the entire list
+	of MakeTargets at one time. 
+
+2009-12-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #296616
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/MakeTarget.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/MakeTargetManager.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/ProjectTargets.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/core/AutotoolsNewProjectNature.java: 
+	(removeOldAutotoolsNature): New Method.
+	(addAutotoolsBuilder): Compensate for case where we are dealing with old Autotools project.
+
+2009-11-16  Andrew Overholt  <overholt@redhat.com>
+
+	* plugin.properties: Fix provider name.
+
+2009-11-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Change dependencies to handle CDT 6.0.0 and up.
+
+2009-11-02  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Make special source content types for configure and autogen.sh and have each tool
+	reference their proper input scripts.  Add a discovery profile id for the inputs to each tool
+	and have neither support managed build. Add the gcc and g++ compiler directly to the set of 
+	tools for the GNU Autotools toolchain.
+	* src/org/eclipse/linuxtools/cdt/autotools/core/Resources.properties: New message for running
+	distclean in top-level directory. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java (addMakeTargetsToManager):
+	Try and find an old MakeTarget to use instead of always creating one from scratch. 
+	(regenerateMakefiles): When a full configure is required and the top-level source directory has
+	already been configured in, a make distclean to the top-level source directory is required before
+	a configuration can be performed in an alternate directory.  Do this automatically, but let the
+	user know what happened.  In addition, change the console for Autotools configuration so that
+	the console is not cleared within one build.
+
+2009-10-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/DefaultNoDependencyCalculator.java: New file.
+	* plugin.properties: Add required messages.
+	* plugin.xml: Add gcc and g++ tools to GNU toolchain.  Add content types for configure and autogen.sh
+	scripts and make these the source content types for configure and autogen.sh respectively.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsPropertyConstants.java: Add
+	compat constants for use with older projects.
+
+2009-10-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/wizards/NewAutotoolsProject.java: Clean
+	up unused imports.
+	* plugin.xml: Add gcc and g++ to toolchain.  Specify GCCStdMakePerFile discovery profile
+	for toolchain and for configure tool inputs.
+
+2009-10-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/wizards/NewAutotoolsProject.java (process): Add
+	creation of default Autotools configuration.
+
+2009-10-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* build.properties: Remove icons.
+	* icons/ac16/acmacro_arg_obj.gif: Removed.
+	* icons/ac16/acmacro_obj.gif: Removed.
+	* icons/ac16/ammacro_obj.gif: Removed.
+	* icons/ac16/case_obj.gif: Removed.
+	* icons/ac16/condition_obj.gif: Removed.
+	* icons/ac16/convert_normal.gif: Removed.
+	* icons/ac16/elif_obj.gif: Removed.
+	* icons/ac16/else_obj.gif: Removed.
+	* icons/ac16/for_obj.gif: Removed.
+	* icons/ac16/if_obj.gif: Removed.
+	* icons/ac16/while_obj.gif: Removed.
+	* icons/autoconf.gif: Removed.
+	* icons/automake.gif: Removed.
+	* icons/dlcl16/build_configs.gif: Removed.
+	* icons/dlcl16/config_category.gif: Removed.
+	* icons/dlcl16/config_tool.gif: Removed.
+	* icons/dlcl16/newc_app.gif: Removed.
+	* icons/dlcl16/newcc_app.gif: Removed.
+	* icons/dlcl16/open_include.gif: Removed.
+	* icons/dtool16/alphab_sort_co.gif: Removed.
+	* icons/dtool16/build_menu.gif: Removed.
+	* icons/dtool16/convert-normal.gif: Removed.
+	* icons/dtool16/make.gif: Removed.
+	* icons/dtool16/makefile.gif: Removed.
+	* icons/dtool16/newc_app.gif: Removed.
+	* icons/dtool16/newcc_app.gif: Removed.
+	* icons/dtool16/segment_edit.gif: Removed.
+	* icons/dtool16/target_add.gif: Removed.
+	* icons/dtool16/target_build.gif: Removed.
+	* icons/dtool16/target_delete.gif: Removed.
+	* icons/dtool16/target_edit.gif: Removed.
+	* icons/dtool16/update_old.gif: Removed.
+	* icons/elcl16/build_configs.gif: Removed.
+	* icons/elcl16/config_category.gif: Removed.
+	* icons/elcl16/config_tool.gif: Removed.
+	* icons/elcl16/newc_app.gif: Removed.
+	* icons/elcl16/newcc_app.gif: Removed.
+	* icons/elcl16/open_include.gif: Removed.
+	* icons/etool16/alphab_sort_co.gif: Removed.
+	* icons/etool16/build_menu.gif: Removed.
+	* icons/etool16/convert_normal.gif: Removed.
+	* icons/etool16/make.gif: Removed.
+	* icons/etool16/makefile.gif: Removed.
+	* icons/etool16/newc_app.gif: Removed.
+	* icons/etool16/newcc_app.gif: Removed.
+	* icons/etool16/segment_edit.gif: Removed.
+	* icons/etool16/target_add.gif: Removed.
+	* icons/etool16/target_build.gif: Removed.
+	* icons/etool16/target_delete.gif: Removed.
+	* icons/etool16/target_edit.gif: Removed.
+	* icons/etool16/target_filter.gif: Removed.
+	* icons/etool16/update_old.gif: Removed.
+	* icons/obj16/acmacro_obj.gif: Removed.
+	* icons/obj16/command_obj.gif: Removed.
+	* icons/obj16/define_obj.gif: Removed.
+	* icons/obj16/environment_obj.gif: Removed.
+	* icons/obj16/envvar_obj.gif: Removed.
+	* icons/obj16/error_obj.gif: Removed.
+	* icons/obj16/fatalerror_obj.gif: Removed.
+	* icons/obj16/hfolder_obj.gif: Removed.
+	* icons/obj16/include_obj.gif: Removed.
+	* icons/obj16/info_obj.gif: Removed.
+	* icons/obj16/irule_obj.gif: Removed.
+	* icons/obj16/lib_obj.gif: Removed.
+	* icons/obj16/macro_obj.gif: Removed.
+	* icons/obj16/relation_obj.gif: Removed.
+	* icons/obj16/target_obj.gif: Removed.
+	* icons/obj16/trule_obj.gif: Removed.
+	* icons/obj16/warning_obj.gif: Removed.
+	* icons/sample.gif: 
+
+2009-10-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Refactoring of org.eclipse.linuxtools.cdt.autotools into org.eclipse.linuxtools.cdt.autotools.core
+	and org.eclipse.linuxtools.cdt.autotools.ui.
+
+	* .settings/org.eclipse.core.resources.prefs: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractAutotoolsHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractTargetAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AclocalHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoconfHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoheaderHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutomakeHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoreconfHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoconfAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoheaderAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoreconfAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeLibtoolizeAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/LibtoolizeHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/SingleInputDialog.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/TwoInputDialog.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsBuilder.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsConfigurationBuilder.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakeTargetManager.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewProjectNature.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsOptionValueHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsProjectNature.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsProjectPropertyTester.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfoProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutoconfSubstRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeCompletionProcessor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeConfigMacro.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeDocumentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeEditor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeEditorFactory.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeErrorHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/Automakefile.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileCodeScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileUtil.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeIfElse.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeMacroDefinitionRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeMacroReferenceRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeTextHover.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeWordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AbstractConfigurationOption.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfiguration.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfigurationManager.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/BinConfigureOption.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureOptionCategory.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureTool.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/IAConfiguration.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/IConfigureOption.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/InternalConfigureOption.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/MultiArgConfigureOption.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/StringConfigureOption.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AbstractElementListSelectionDialog.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AbstractMakefile.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AbstractMakefileCodeScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AddBuildTargetAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ArchiveTarget.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/BadDirective.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Command.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Comment.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/CompletionProposalComparator.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Conditional.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/DefaultRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/DefineVariable.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/DeleteOnErrorRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Directive.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/EditorUtility.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ElementListSelectionDialog.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Else.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/EmptyLine.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Endef.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Endif.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ExportAllVariablesRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ExportVariable.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ExternalEditorInput.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ExternalEditorInputFactory.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/GNUAutomakefile.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/GNUMakefileConstants.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/GNUMakefileUtil.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/GNUTargetRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/GNUVariableDef.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/IAutomakeConditional.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/If.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Ifdef.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Ifeq.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Ifndef.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Ifneq.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/IgnoreRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/IMakefileDocumentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/IMakefileEditorActionDefinitionIds.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Include.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/InferenceRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/IntermediateRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/IReconcilingParticipant.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ISelectionValidator.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ITranslationUnitEditorInput.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/LexicalSortingAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/LowResolutionTimeRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MacroDefinition.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MacroDefinitionRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MacroReferenceRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileAnnotationHover.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileCodeScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileCompletionProcessor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakeFileConstants.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileContentOutlinePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileDocumentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileDocumentSetupParticipant.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileEditor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileEditorActionContributor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileEditorPreferenceConstants.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileEditorTogglePresentationAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefilePartitionScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileReader.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileReconcilingStrategy.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakeFileResources.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileSourceConfiguration.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileStorageDocumentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileTextHover.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileWordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MessageLine.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/NotParallelRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/NullMakefile.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/OpenDeclarationAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/OpenIncludeAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/OverrideDefine.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/OverrideVariable.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Parent.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/PhonyRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/PosixMakefileUtil.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/PosixRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/PreciousRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ProjectionMakefileUpdater.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Rule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SccsGetRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SecondaryRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SelectionList.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SelectionStatusDialog.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SilentRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SpecialRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/StaticTargetRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/StatusInfo.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/StatusTool.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/StringMatcher.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SuffixesRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Target.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/TargetRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/TargetVariable.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Terminal.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/TwoArrayQuickSort.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/UnExport.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Util.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/VariableDefinition.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/VPath.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/WordPartDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/WorkingCopyManager.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/MakeMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/MakeTarget.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/MakeTargetManager.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/MarkerGenerator.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ProjectTargets.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/AutoconfPrototype.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/AutoconfTextHover.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/HoverMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/HoverMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AbstractAutotoolsCPropertyTab.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AutotoolsConsole.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AutotoolsPluginImages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/CBuildStepsConsole.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/CConfigureConsole.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/Console.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ConsoleMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ConsoleMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/CWordFinder.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/editors/autoconf/ProjectionFileUpdater.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ErrorParserBlock.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/FileRelevance.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/HTML2TextReader.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/HTMLPrinter.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/HTMLTextPresenter.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/LineBreakingReader.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/LocationAdapter.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/MakeResources.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/MakeUIImages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/MakeUIMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/MessageLine.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/OptionalMessageDialog.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AbstractEditorPreferencePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferencePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutotoolsEditorPreferenceConstants.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutotoolsPreferencePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/ColorEditor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/ColorManager.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/OverlayPreferenceStore.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/StatusInfo.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/TabFolderLayout.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AbstractConfigurePropertyOptionsPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsBuildPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsCategoryPropertyOptionPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsConfigurePrefStore.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsConfigurePropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsConfigurePropertyTab.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsEditorPropertyTab.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsGeneralPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsHeadPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyConstants.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyManager.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsToolPropertyOptionPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsToolsPropertyTab.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/IProjectPropertyListener.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/IPropertyChangeManager.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/ToolListContentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/ToolListElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/ToolListLabelProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ResourceLookup.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ResourceLookupTree.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/SingleCharReader.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/SubstitutionTextReader.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/AutotoolsWizardMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/AutotoolsWizardMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/ConfigurationContentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/ConfigurationLabelProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/ManagedProjectOptionBlock.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/NewAutotoolsProject.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/popup/actions/GetDefinedSymbolsAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/popup/actions/GetIncludePathAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfAnnotationHover.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfCodeScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentSetupParticipant.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMacroValidator.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfErrorHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfIdentifierRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfKeywordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfM4WordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacro.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroCodeScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroParameterListValidator.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroPartitionRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroProposalContextInformation.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroWordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitioner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitionScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPKGWordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfReconcilingStrategy.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfWhitespaceDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfWordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolEditorActionDefinitionIds.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolHelpContextIds.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolsEditor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/InlineDataRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/MultilineRuleDamagerRepairer.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/ParseException.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseConditionElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElifElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElseElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfForElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfIfElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroArgumentElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfParser.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfRootElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfSelectElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfTokenizer.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfUntilElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfWhileElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfErrorHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroValidator.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IMacroDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ITokenConstants.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ParseException.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/Token.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RecursiveSingleLineRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RestrictedEndOfLineRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/AutotoolsBuildWizard.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/AutotoolsNewCProjectWizardV2.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/ConvertToAutotoolsProjectWizard.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/CProjectPlatformPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCCProjectWizard.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCProjectWizard.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsProjectOptionPage.java: Removed.
+	* templates/projecttemplates/EmptyProject/template.properties: Removed.
+	* templates/projecttemplates/EmptyProject/template.xml: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/AUTHORS: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/Basename.c: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/configure.ac.top: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/COPYING: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/Makefile.am.src: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/Makefile.am.top: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/NEWS: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/README: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/template.properties: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/AUTHORS: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Basename.cpp: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/configure.ac.top: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/COPYING: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Makefile.am.src: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Makefile.am.top: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/NEWS: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/README: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.properties: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/core/AutotoolsNewProjectNature.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/core/AutotoolsPlugin.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/core/Resources.properties: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsConfigurationBuilder.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsPropertyConstants.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsOptionValueHandler.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/IConfigurationCloneListener.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/MakeMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/MakeTarget.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/MakeTargetManager.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/MarkerGenerator.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/ProjectTargets.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/wizards/NewAutotoolsProject.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AbstractConfigurationOption.java: New file. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsConfiguration.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsConfigurationManager.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/BinConfigureOption.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureOptionCategory.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureTool.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/IAConfiguration.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/IConfigureOption.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/InternalConfigureOption.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/MultiArgConfigureOption.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/StringConfigureOption.java: New file.
+	* .project: Changed due to refactoring.
+	* META-INF/MANIFEST.MF: Refactored.
+	* plugin.xml: Refactored.  Moving UI elements to org.eclipse.linuxtools.cdt.autotools.ui plug-in.
+
+2009-10-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfigurationManager.java (saveConfigs): Store
+	configuration data into .autotools file stored in project rather than using project working location. 
+	(getConfigs): Get configs from .autotools file stored in the project rather than using project working
+	location.
+
+2009-10-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Fix category for Autotools C++ wizard.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsOptionValueHandler.java (fixName): New method.
+	(handleValue): Add support to generate build directory if property option is on or defaulted.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsBuildPropertyPage.java (createControls): 
+	Add support for automatic build name generation option.
+	(initialize): Ditto.
+	(performDefaults): Ditto.
+	(performOK): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyConstants.java: 
+	Add support for auto build-name generation option.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyMessages.properties: Add
+	messages for new property for automatically naming the build directory. 
+
+2009-09-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsEditorPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsToolsPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsConfigurePropertyTab.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsEditorPropertyTab.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsGeneralPropertyPage.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsHeadPropertyPage.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsToolsPropertyTab.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/NewAutotoolsProject.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/AutotoolsBuildWizard.java: New file.
+	* templates/projecttemplates/EmptyProject/template.properties: New file.
+	* templates/projecttemplates/EmptyProject/template.xml: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/AUTHORS: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/Basename.c: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/configure.ac.top: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/COPYING: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/Makefile.am.src: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/Makefile.am.top: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/NEWS: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/README: New file. 	
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/template.properties: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/AUTHORS: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Basename.cpp: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/configure.ac.top: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/COPYING: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Makefile.am.src: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Makefile.am.top: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/NEWS: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/README: New file. 	
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.properties: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml: New file.
+	* plugin.properties: Add strings to support additions to plugin.xml.
+	* plugin.xml: Add a new template process for creating an Autotools project.  Add templates for
+	an empty project, a helloworld C project, and a helloworld C++ project.  Add a CDT wizard for
+	creating a new Autotools project.  Remove project type name from Autotools project type so that
+	it does not get added by MBSWizard and instead is added as part of the new AutotoolsBuildWizard.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator.java (regenerateMakefiles): When forced to
+	autoreconf missing files, do not restart the console for the subsequent configuration.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsOptionValueHandler.java (handleValue): Handle class rename.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfiguration.java (setDefaultOptions): New
+	method. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/IAConfiguration.java: Add setDefaultOptions method.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsCategoryPropertyOptionPage.java (updateFields): Add
+	call to set the values. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsConfigurePropertyPage.java: 
+	(performSave): Deal with AutotoolsPropertyPage being renamed AutotoolsConfigurePropertyPage.
+	(isSingle): Add override to specify this is a single page.
+	(AutotoolsConfigurePropertyPage): New.
+
+2009-09-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Make configure source tool directory use our shared applicability calculator.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator.java (createDirectory): 
+	Change to return boolean and to use Java File logic.
+	(regenerateMakefiles): Fail if createDirectory fails for build directory.  Change over to not
+	use Root or Workspace for file management.  Use Java File instead.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/ToolListLabelProvider.java: 
+	Remove compiler warning.
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Add new failure message if the
+	build directory cannot be created.
+
+2009-09-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsDefaultBuildDirHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakefileBuilder.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AbstractAutotoolsPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsOptionValueHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/IAConfiguration.java: New file.
+	* plugin.properties: Add configure name string.
+	* plugin.xml: Add configure name to configure options for build definition and set its option value handler and
+	calculator to be AutotoolsOptionValueHandler.  Add back a builder for toolchain to prevent errror when displaying
+	toolChain editor property page.  Add new AutotoolsNatureV2.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsConfigurationBuilder.java (performMakefileGeneration): Add
+	multiconfiguration support. 
+	(clean): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator.java (addMakeTargetsToManager): 
+	(createDirectory): Use Java File interface to perform mkdirs.
+	(regenerateMakefiles): Add configuration parameter to support multiconfiguration.
+	(initializeBuildConfigDirs): Use build location from ManagedBuild.
+	(generateMakefiles): Call new regenerateMakefile interface.
+	(reconfigure): Use new regenerateMakefiles interface.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfiguration.java (setConfigToolDirectory): 
+	(setActive): Remove.
+	(isActive): Remove.
+	(configOpts): Remove builddir.
+	(copy): Change output to be IAConfiguration.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfigurationManager.java: Remove active
+	configuration tracking.
+	(resourceChanged): Remove active configuration logic.
+	(saveConfigs): Fix bug with adding header information in loop.
+	(replaceConfiguration): Use IAConfiguration interface.
+	(getConfigs): Remove active configuration logic.
+	(configurationAlreadyExists): Use IAConfiguration interface.
+	(getConfigurations): Don't add a configuration to project automatically.
+	(AutotoolsConfigurationManager): Remove active configuration management set up.
+	(createDefaultConfiguration): Do not default configuration name now that we are syncing up with build configurations.
+	(addConfiguration): Use IAConfiguration interface.  Remove active configuration management.
+	(replaceProjectConfigurations): New method.
+	(findCfg): New method.
+	(getConfiguration): New method.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AbstractAutotoolsCPropertyTab.java: Extend AbstractCBuildPropertyTab.
+	(isIndexerAffected): New method. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsCategoryPropertyOptionPage.java (AutotoolsCategoryPropertyOptionPage):
+	Use IAConfiguration interface. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsConfigurePrefStore.java (setSelection): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsConfigurePropertyPage.java: Remove configuration
+	tracking.  Let AutotoolsPropertyPage do it.
+	(handleOptionSelection): Use AbstractPage cast.
+	(setValues): Disable for multiconfiguration.  Get current configuration using getAutotoolsCfg method.
+	(createControls): Don't bother getting current Autotools configuration.  Don't call setValues().
+	(canBeVisible): Check for project.
+	(updateData): Get ManagedBuild configuration from input to use later to find syncing AutotoolsConfiguration with
+	same name.
+	(getAutotoolsCfg): New Method.
+	(performCancel): Do nothing.
+	(displayPageForElement): Set selection based on current Autotools configuration from getAutotoolsCfg().
+	(performDefaults): Do nothing.
+	(performOK): Replace Autotools configurations for project.
+	(createSelectionArea): Use a temporary AutotoolsConfiguration for a tree label provider.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsEditorPropertyPage.java (createControls): 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyPage.java: Rewritten to extend
+	AbstractPage and to replace content with AbstractPage.java as well since the majority of methods in AbstractPage
+	are private and manipulate private data.  Add AutotoolsConfiguration tracking and a call-back mechanism for registering
+	cloned configurations from AutotoolsOptionValueHandler.  When needed, call the super methods so they may access
+	private methods.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsToolPropertyOptionPage.java (AutotoolsToolPropertyOptionPage):
+	Use IAConfiguration interface. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/ToolListLabelProvider.java (ToolListLabelProvider): Ditto. 
+	(getCfg): Ditto.
+	(setCfg): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/AutotoolsNewCProjectWizardV2.java (doRun): Remove AutotoolsConfiguration
+	logic and defer to when needed.
+
+2009-09-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Switching to use CommonBuilder.
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsConfigurationBuilder.java: New file.
+	* META-INF/MANIFEST.MF: Update dependencies.
+	* plugin.xml: Change build configuration to non-managed-build.  Add AutotoolsConfigurationBuilder
+	as separate builder and remove AutotoolsNewMakeGenerator as Managed Build Makefile generator.  Make
+	Autotools Nature require Managed Build Nature.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator.java (addMakeTargetsToManager): 
+	Specify CDT common builder as target builder and also specify build directory as container.
+	(regenerateMakefiles): Add build directory to console messages.  Make full configure default to false.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewProjectNature.java (addAutotoolsBuilder): Change
+	to put new Configuration builder ahead of Common Builder.
+	(configure): Remove Std Make bits.
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Add new messages and add build directory
+	specification to Makefile generator messages. 
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/AutotoolsNewCProjectWizardV2.java (addNature): Refer
+	to Managed Nature rather than Make Nature.  
+
+2009-08-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator.java (getPathString): New
+	method.
+	(runScript): Call getPathString method on command path.  Use CCorePlugin to get
+	environment variable manager instead of ManagedBuildManager.
+	(runCommand): Ditto.
+	(initializeBuildConfigDirs): Remove code to set build location in builder.
+	(initialize): Get the C Configuration description for the active configuration.
+
+2009-07-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AutotoolsConsole.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/Console.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/CBuildStepsConsole.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/CConfigureConsole.java: Inherit from
+	Console class.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/MakeResources.properties: ADd newline
+	at end of file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ConsoleMessages.properties: Add console
+	names.
+	* plugin.xml: Add CBuildConsole extensions for Autotools console and BuildSteps console.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java: 
+	(executeConsoleCommand): New method to execute commands in a special console.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java: (run): Use 
+	new executeConsoleCommand method from InvokeAction which this class now inherits from. 
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoconfAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoheaderAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoreconfAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeLibtoolizeAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.properties: Add CWD message.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator.java (stripEnvVars): Make
+	public static.
+	
+2009-07-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureHandler.java: New file.
+	* plugin.properties: Add strings for Reconfigure menu item.
+	* plugin.xml: Add Reconfigure project menu item.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator.java (regenerateMakefiles): 
+	(reconfigure): New method.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfigurationManager.java (resourceChanged):
+	Now that plugin working area is used, no need to manage the files there for project deletion or
+	renaming. 
+	(addConfiguration): If this is first configuration for project, call setActiveConfiguration. 
+	(replaceConfiguration): Ditto.
+	(saveConfigs): Use plugin working area for project.
+	(getConfigs): New method which gets configs for single project.
+	(loadConfigs): Removed. 
+	(getActiveConfiguration): Call getConfigurations internally.
+	(getConfigurations): Call getconfigs method and create default configuration if needed. 
+	(setActiveConfiguration): 
+	(getInstance): Remove loadConfigs call.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureMessages.properties: Add save
+	config error message. 
+
+2009-07-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfiguration.java (getToolArgs): Add
+	support for caching parameters. 
+	(getToolParameters): Clean up warnings.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/BinConfigureOption.java (setValue): Set configuration
+	dirty on value change. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/AutoconfPrototype.java: Clean
+	up compiler warnings. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/AutoconfTextHover.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AbstractAutotoolsPage.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsConfigurePropertyPage.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsEditorPropertyPage.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsToolsPropertyPage.java: Ditto.
+
+2009-07-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* icons/obj16/fatalerror_obj.gif: New file.
+	* icons/obj16/info_obj.gif: New file.
+	* icons/obj16/warning_obj.gif: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AbstractAutotoolsCPropertyTab.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AbstractAutotoolsPage.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/FileRelevance.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/LocationAdapter.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/OptionalMessageDialog.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ResourceLookup.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ResourceLookupTree.java: New file.
+	* plugin.xml: Fix new MakefileGenerator id and nature references.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakefileBuilder.java (clean): New override method.
+	(getTargets): New override method.
+	(removeBuildDir): New method.
+	(build): Minor format change.
+	(AutotoolsNewMakefileBuilder): 
+	(makeArray): New method.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator.java (getAutogenPath): New method
+	that calls stripEnvVars. 
+	(runScript): Add additional enviornment variables specified on command line.
+	(stripEnvVars): New method to strip env vars from a command string.
+	(getConfigurePath): Changed to use stripEnvVars.
+	(regenerateMakefiles): Fix deletion logic to not delete build directory.
+	(makeArray): New method.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewProjectNature.java: Change id. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AbstractConfigurationOption.java (getParameters): 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfiguration.java (Option): Add
+	defaultValue field. 
+	(Option.getDefaultValue): New method.
+	(Option.Option): Added constructor.
+	(initConfigOptions): Fix autogen to not have id with dot in name.
+	(configOpts): Add default value processing.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureMessages.properties: Change name of autogen
+	tool name message. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/MakeResources.properties: Added messages.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/MakeUIImages.java: Add new image. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsConfigurePropertyPage.java (handleOptionSelection):
+	Change cast. 
+	(cfgChanged): Add comment.
+	(getProject): Changed to get project from page.
+	(createControls): Remove configuration combo which is no longer used.
+	(updateData): Update comment. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsEditorPropertyPage.java (updateButtons): 
+	Update comment.
+	(cfgChanged): Added comment.
+	(getProject): Changed to get project from page.
+	(updateData): Update comment.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyMessages.java: Added messages. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyPage.java: Changed to inherit from
+	AbstractAutotoolsPage.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsToolPropertyOptionPage.java (createFieldEditors): 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsToolsPropertyPage.java (updateButtons): 
+	Update comment.
+	(cfgChanged): Added comment.
+	(getProject): Changed to get project from page.
+	(updateData): Update comment.
+
+2009-06-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #280509
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator.java (regenerateMakefiles): Add
+	logic to use autoreconf if no configure script and no autogen.sh. 
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Add messages. 
+
+2009-06-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #280696, #280504, #280505, #280506
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java (showSuccess):
+	Changed to issue a information dialog that does not have a cancel button. 
+	(executeCommand): Changed to create a ProgressMonitorDialog that is issued
+	until the command completes successfully or with failure.
+	(ExecuteProgressDialog): New private internal class that implements IRunnableWithProgress
+	which is used to run the command for a ProgressMonitorDialog.
+	(simpleParseOptions): New method to parse options and account for quoted strings.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoheaderHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoreconfHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoheaderAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoreconfAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeLibtoolizeAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/LibtoolizeHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/SingleInputDialog.java: New file.
+	* plugin.properties: Add new messages for additional tools/commands added.
+	* plugin.xml: Change invoking autotools to be a single menu item in Project menu which
+	expands to show all tools available, including aclocal, autoconf, autoheader, automake,
+	autoreconf, and libtoolize.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.properties: Add support
+	for autoheader, autoreconf, and libtoolize. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyConstants.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyMessages.properties: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsToolsPropertyPage.java 
+	(createControls): Ditto. 
+	(initialize): Ditto. 
+	(performDefaults): Ditto.
+	(performOK): Ditto.
+
+2009-06-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator.java (toolsCfg):
+	New AutotoolsConfiguration acquired from AutotoolsConfigurationManager.
+	(runScript): Use new toolsCfg instead of cfg. 
+	(getConfigArgs): Ditto.
+	(initializeBuildConfigDirs): Ditto. 
+	(autogenExists): Ditto.
+	(runCommand): Ditto.
+	(getAutogenArgs): Ditto.
+	(configureExists): Ditto.
+	(regenerateMakefiles): Ditto.
+	(getConfigurePath): Ditto.
+	(getMakefileName): Ditto.
+	(initialize): Initialize toolsCfg to active Autotools configuration for project.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AbstractConfigurationOption.java (getParameters):
+	New method. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfiguration.java (getToolArgs): New
+	method. 
+	(getConfigArgs): Removed. 
+	(configOpts): Add autogen.sh support.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureMessages.properties: Add autogen.sh
+	stuff. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureOptionCategory.java (getParameters): New
+	method. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureTool.java (getParameters): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/IConfigureOption.java (getParameters): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/MultiArgConfigureOption.java (getParameters): Fix
+	to properly separate options of all kinds and not just for configure.
+	 
+2009-06-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #281582, #281583
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (clean): Do not
+	use ManagedBuildManager to get a Makefile generator.  Just create a new Autotools Makefile
+	generator. 
+	(removeBuildDir): Ditto. 
+	(build): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java (getCompilationString):
+	Fix to support g++, top-level building, and compilation strings that span multiple lines. 
+
+2009-06-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #280117
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java (buildFile): Fix so we don't
+	leave loop early before finding build directory.
+
+2009-06-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* icons/ac16/convert-normal.gif: Removed.
+	* icons/etool16/convert-normal.gif: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsEditorPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyConstants.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyManager.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsToolsPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/IProjectPropertyListener.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/IPropertyChangeManager.java: Removed.
+	* icons/ac16/convert_normal.gif: New file.
+	* icons/dlcl16/config_category.gif: New file.
+	* icons/dlcl16/config_tool.gif: New file.
+	* icons/elcl16/config_category.gif: New file.
+	* icons/elcl16/config_tool.gif: New file.
+	* icons/etool16/convert_normal.gif: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureTool.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/InternalConfigureOption.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/MultiArgConfigureOption.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AbstractConfigurePropertyOptionsPage.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsCategoryPropertyOptionPage.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsConfigurePrefStore.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsConfigurePropertyPage.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsToolPropertyOptionPage.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/ToolListContentProvider.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/ToolListElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/ToolListLabelProvider.java: New file.
+	* plugin.properties: Change messages. 
+	* plugin.xml: Remove warnings.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java: Changed due to refactoring. 
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoconfAction.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsBuilder.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfoProvider.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AbstractConfigurationOption.java (isMultiArg): 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfiguration.java (getConfigToolDirectory):
+	Rewritten to use option. 
+	(setConfigToolDirectory): Ditto. 
+	(setDirty): Rewritten.
+	(Option): Add public methods to get name, description, type, and tooltip.
+	(setBuildDirectory): Rewritten to use option. 
+	(getConfigArgs): New method.
+	(initConfigOptions): Set options for everything including tools.
+	(getOption): New method.
+	(getOptionList): Ditto.
+	(AutotoolsConfiguration): Keep track of parms dirty vs config dirty. 
+	(getChildOptions): Add support for both categories and tools.
+	(setOption): Alter dirty flag.
+	(getToolParameters): New method.
+	(getTools): Ditto.
+	(configOpts): New internal map.
+	(getBuildDirectory): Rewrite to use simple option.
+	(copy): Copy using option copy methods and add internal variables as well.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfigurationManager.java (ConfigureFileFilter):
+	New class to make it easy to find configuration data for project.  
+	(resourceChanged): Added internal map changes as well.
+	(addConfigurationHeader): New method.
+	(saveConfigs): Changed to use IFile.
+	(replaceConfiguration): New method. 
+	(setActiveConfiguration): Ditto.
+	(getConfigurations): If default configuration created, mark it active.
+	(AutotoolsConfigurationManager): Create active configs map.
+	(getInstance): Fixed to only load configs the one time.
+	(loadConfigs): Fixed to properly load configuration files and use xml parsing.
+	(getActiveConfiguration): New method. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/BinConfigureOption.java (getType): 
+	(copy): New method.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureMessages.java: 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureMessages.properties: 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureOptionCategory.java (getValue): 
+	(getType): New method.
+	(isMultiArg): Ditto.
+	(copy): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/IConfigureOption.java: 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/StringConfigureOption.java (getType): 
+	(copy): New method.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/AutoconfTextHover.java: Changed due to
+	refactoring of properties. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AutotoolsPluginImages.java: Add new images for
+	Autotools configuration property page.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsBuildPropertyPage.java: Changed due to
+	refactoring of properties. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsEditorPropertyPage.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyConstants.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyManager.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyMessages.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyMessages.properties: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyPage.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsToolsPropertyPage.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/IProjectPropertyListener.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/IPropertyChangeManager.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditor.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/AutotoolsNewCProjectWizardV2.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCCProjectWizard.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCProjectWizard.java: Ditto.
+
+2009-05-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AbstractConfigurationOption.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfiguration.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfigurationManager.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/BinConfigureOption.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureMessages.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureMessages.properties: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureOptionCategory.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/IConfigureOption.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/StringConfigureOption.java: New file.
+	* .classpath: Checking in.
+	* plugin.xml: Fix compiler warnings.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java (separateTargets): Ditto. 
+	(separateOptions): Ditto.
+	(executeCommand): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoconfAction.java (run): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/TwoInputDialog.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsBuilder.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsDefaultBuildDirHandler.java (handleValue): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (clean): Ditto.
+	(build): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakefileBuilder.java (performMakefileGeneration): Ditto.
+	(build): Ditto.
+	(AutotoolsNewMakefileBuilder): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator.java (runScript): Ditto. 
+	(saveTargets): Ditto.
+	(runCommand): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewProjectNature.java (configure): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsProjectNature.java (removeNature): Ditto. 
+	(addAutotoolsBuilder): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java (buildFile): Ditto. 
+	(getDefinedSymbols): Ditto.
+	(getIncludePaths): Ditto.
+	(definedSymbols): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfoProvider.java (setDirty): Ditto. 
+	(getScannerInformation): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutoconfSubstRule.java (DecreasingCharArrayLengthComparator): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeCompletionProcessor.java (DirectiveComparator): Ditto.
+	(computeContextInformation): Ditto.
+	(computeCompletionProposals): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeDocumentProvider.java (connect): Ditto. 
+	(shutdown): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeEditor.java (getAdapter): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeErrorHandler.java (AutomakeMarker): Ditto. 
+	(checkChildren): Ditto.
+	(AutomakeMarker.setAttributes): Ditto. 
+	(AutomakeMarker.getAttributes): Ditto.
+	(createMarker): Ditto.
+	(AutomakeMarker.AutomakeMarker): Ditto. 
+	(AutomakeMarker.getAdapter): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileCodeScanner.java (createRules): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java (AutomakefileContentProvider.getElements): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AbstractElementListSelectionDialog.java (setSelectionListElements): Ditto.
+	(getWidgetSelection): Ditto.
+	(verifyCurrentSelection): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AbstractMakefile.java (getMacroDefinitions): Ditto. 
+	(getBuiltinInferenceRules): Ditto.
+	(getRules): Ditto.
+	(getInferenceRules): Ditto. 
+	(getTargetRules): Ditto.
+	(getBuiltinMacroDefinitions): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AddBuildTargetAction.java (getTargetRules): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/CompletionProposalComparator.java (compare): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/EditorUtility.java (getWorkspaceFileAtLocation): Ditto.
+	(isLinked): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ElementListSelectionDialog.java (open): Ditto. 
+	(setElements): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ExternalEditorInput.java (getAdapter): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/GNUAutomakefile.java (getBuiltins): Ditto.
+	(addDirective): Ditto.
+	(parseVPath): Ditto.
+	(getDirectives): Ditto.
+	(parse): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/LexicalSortingAction.java (LexicalCSorter.isSorterProperty): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileCompletionProcessor.java (DirectiveComparator): Ditto.
+	(computeContextInformation): Ditto.
+	(computeCompletionProposals): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileContentOutlinePage.java (MakefileContentProvider.getElements): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileDocumentProvider.java (shutdown): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileEditor.java (getAdapter): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileMessages.java (getFormattedString): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefilePartitionScanner.java (MakefilePartitionScanner): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/NullMakefile.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/OpenIncludeAction.java (resolveIncludeLink): Ditto. 
+	(findFile): Ditto.
+	(getIncludeStatement): Ditto. 
+	(chooseFile): Ditto.
+	(run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Parent.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/PosixMakefileUtil.java (findTargets): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ProjectionMakefileUpdater.java (createAnnotationMap): Ditto. 
+	(fCollapseConditional): Ditto.
+	(fCollapseRule): Ditto.
+	(fCollapseMacroDef): Ditto.
+	(match): Ditto.
+	(processReconcile): Ditto. 
+	(computeAdditions): Ditto.
+	(initialize): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Rule.java (getCommands): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SelectionList.java (getSelection): Ditto. 
+	(setElements): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SelectionStatusDialog.java (setInitialSelection): Ditto. 
+	(getPrimaryInitialSelection): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/StringMatcher.java (parseWildCards): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/WorkingCopyManager.java (setWorkingCopy): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/MakeTarget.java (getAdapter): Ditto.
+	(getEnvironment): Ditto.
+	(setEnvironment): Ditto.
+	(build): Ditto.
+	(getExpandedEnvironment): Ditto. 
+	(getAttributeMap): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/MakeTargetManager.java (initializeBuilders): Ditto. 
+	(getTargetBuilders): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ProjectTargets.java (findTarget): Ditto. 
+	(remove): Ditto.
+	(get): Ditto.
+	(getAsXML): Ditto. 
+	(contains): Ditto.
+	(add): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/editors/autoconf/ProjectionFileUpdater.java (createAnnotationMap): Ditto. 
+	(match): Ditto.
+	(processReconcile): Ditto. 
+	(computeAdditions): Ditto.
+	(initialize): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ErrorParserBlock.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/HTML2TextReader.java (static initializer): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/HTMLTextPresenter.java (updatePresentation): Ditto.
+	(adaptTextPresentation): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java (ColorListContentProvider.getElements): Ditto. 
+	(addTextKeyToCover): Ditto.
+	(createSyntaxPage): Ditto.
+	(createOverlayStore): Ditto.
+	(HighlightingColorListItem): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferencePage.java (ColorListContentProvider.getElements): Ditto. 
+	(addTextKeyToCover): Ditto.
+	(createSyntaxPage): Ditto.
+	(createOverlayStore): Ditto.
+	(HighlightingColorListItem): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/ColorManager.java (dispose): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/StatusInfo.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (addMakeTargetsToManager): Ditto.
+	(runScript): Ditto.
+	(regenerateMakefiles): Ditto. 
+	(runCommand): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfAnnotationHover.java (getMarkersForLine): Ditto. 
+	(select): Ditto.
+	(getHoverInfo): Ditto.
+	(formatMultipleMessages): Ditto. 
+	(.createInformationControl): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfCodeScanner.java (AutoconfCodeScanner): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditor.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfErrorHandler.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfIdentifierRule.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacro.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroCodeScanner.java (AutoconfMacroCodeScanner): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java (computeCompletionProposals): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroParameterListValidator.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitionScanner.java (AutoconfPartitionScanner): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolsEditor.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/InlineDataRule.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java (updateSelection): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElement.java (AutoconfElement): Ditto. 
+	(toString): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfParser.java (ExprEndCondition): Ditto.
+	(ExprEndCondition.serialVersionUID): Ditto.
+	(BlockEndCondition): Ditto.
+	(checkBlockValidity): Ditto.
+	(BlockEndCondition.serialVersionUID): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RecursiveSingleLineRule.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RestrictedEndOfLineRule.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyManager.java (AutotoolsPropertyManager): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsToolsPropertyPage.java (performOK): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/AutotoolsNewCProjectWizardV2.java (doRun): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/CProjectPlatformPage.java (handleConfigurationSelectionChange): Ditto. 
+	(CProjectPlatformPage): Ditto.
+	(filterSupportedConfigurations): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCCProjectWizard.java (doRun): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCProjectWizard.java (doRun): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsProjectOptionPage.java (ManagedWizardOptionBlock.setupHelpContextIds): Ditto. 
+
+2009-05-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Add new Autotools nature for time-being.  Specify new builder which is based
+	on MakefileBuilder and specify new project wizard.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder: Move hastTargetBuilder
+	to AutotoolsPlugin.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakeTargetManager: Use AutotoolsPlugin
+	hasTargetBuilder method.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage: Ditto.	
+	* src/org/eclipse.linuxtools/cdt/autotools/AutotoolsProjectPropertyTester.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfoProvider.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakefileBuilder: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewProjectNature: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java: Move hasTargetBuilder
+	method here.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java: Apply fix for stopping
+	build on failure to generate Makefile.
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Change message for no
+	makefile generated.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/AutotoolsNewCProjectWizardV2.java: New file.
+
+2009-04-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #249199
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractAutotoolsHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoconfHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutomakeHandler.java: New file.
+	* plugin.properties: Add messages for invoking autotools.
+	* plugin.xml: Change invoke autotools actions from Actions in an ActionSet to instead
+	use org.eclipse.ui.menus, org.eclipse.ui.commands, and org.eclipse.ui.handlers and
+	do not add these actions to project menu if not an Autotools project.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AclocalHandler.java (execute): Implemented. 
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java (run): Add check
+	for null container.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoconfAction.java (run): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java (run): Ditto.
+	
+2009-04-21  Jeff Johnston  <jjohnstn@redhat.com>
+2009-05-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Add new Autotools nature for time-being.  Specify new builder which is based
+	on MakefileBuilder and specify new project wizard.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder: Move hastTargetBuilder
+	to AutotoolsPlugin.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakeTargetManager: Use AutotoolsPlugin
+	hasTargetBuilder method.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage: Ditto.	
+	* src/org/eclipse.linuxtools/cdt/autotools/AutotoolsProjectPropertyTester.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfoProvider.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakefileBuilder: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewProjectNature: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java: Move hasTargetBuilder
+	method here.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java: Apply fix for stopping
+	build on failure to generate Makefile.
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Change message for no
+	makefile generated.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/AutotoolsNewCProjectWizardV2.java: New file.
+
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/OpenIncludeAction.java
+	(run): Fix compiler warnings.
+	(getIncludeStatement): Ditto.
+	(chooseFile): Ditto.
+	(.visit): Ditto.
+	(findFile): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileMessages.java
+	(getFormattedString): Fix compiler warnings.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java
+	(getAutogenArgs): Fix compiler warnings.
+	(runScript): Ditto.
+	(getConfigArgs): Ditto.
+	(MakeTargetComparator): Ditto.
+	(makeArray): Ditto.
+	(runCommand): Ditto.
+	(addMakeTargetsToManager): Ditto plus do not start/stop MakeTargetManager
+	anymore.
+	(saveTargets): New method.
+	(translateDocumenttoCDTProject): Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.java
+	(getFormattedString): Cast 2nd argument for message fomatting to avoid compile
+	warnings.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/AutotoolsWizardMessages.java
+	(getFormattedString): Cast 2nd argument for message formatting to avoid compiler
+	warnings.
+	(getFormattedString): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AutotoolsPluginImages.java
+	(makeIconFileURL): Fix static member reference to avoid compiler warning.
+	2009-05-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Add new Autotools nature for time-being.  Specify new builder which is based
+	on MakefileBuilder and specify new project wizard.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder: Move hastTargetBuilder
+	to AutotoolsPlugin.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakeTargetManager: Use AutotoolsPlugin
+	hasTargetBuilder method.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage: Ditto.	
+	* src/org/eclipse.linuxtools/cdt/autotools/AutotoolsProjectPropertyTester.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfoProvider.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakefileBuilder: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewProjectNature: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java: Move hasTargetBuilder
+	method here.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java: Apply fix for stopping
+	build on failure to generate Makefile.
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Change message for no
+	makefile generated.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/AutotoolsNewCProjectWizardV2.java: New file.
+	(static initializer): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java
+	(getFormattedString): Cast 2nd argument to avoid compiler warning.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AbstractEditorPreferencePage.java
+	(validatePositiveNumber): Properly template containers.
+	(getTextFields): Ditto.
+	(initializeFields): Ditto.
+	(updateStatus): Ditto.
+	(getCheckBoxes): Ditto.
+	(getNumberFields): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileCodeScanner.java
+	(createRules): Use templated List.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileCodeScanner.java
+	(createRules): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AbstractMakefileCodeScanner.java
+	(createTextAttribute): Correctly access static member function.
+	(initializeRules): Use templated List.
+	
+2009-04-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Allow org.eclipse.cdt.make.core and org.eclipse.cdt.make.ui version numbers
+	to start pre-6.0.0 and exclude 6.1.0.
+
+2009-04-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Update dependencies to not put upper sealing for version numbers as 6.0.0.
+	
+2009-03-31  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Set expected value to true for Autotools property page enablement.
+
+2009-02-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* .settings/org.eclipse.jdt.core.prefs: Specify Java 1.5.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsBuilder.java: Inherit from Builder. 
+	(AutotoolsBuilder): Change to take ToolChain parameter and call super constructor.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (clean): Change
+	to set the Builder for the ToolChain and call different super.build method that does not
+	take new private MyBoolean argument.
+	(build): Ditto.
+	(getTargets): Fix Java 1.5 warnings.
+	(makeArrayList): Ditto.
+
+2009-01-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #261717
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/AutoconfTextHover.java (getMacroList): 
+	Don't bother processing macros if the macro document turns out to be null.
+
+2009-01-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #261257
+	
+	* META-INF/MANIFEST.MF: Update plug-in to add .qualifier to id and update
+	to 1.0.2.qualifier.
+	* plugin.xml: Update invoke autotools action set to set visible to true.
+
+2009-01-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (getConfigArgs): If there
+	are no -- args in the user arguments, still pass them on to configure.
+
+2008-11-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #472731
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (hasTargetBuilder): 
+	Add check for ManagedProject being null which is apparently possible.
+
+2008-11-25  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeDocumentProvider.java: Change
+	Copyright to make Red Hat a contributor to the copyright of the original file modified to make
+	this new class.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeEditor.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/Automakefile.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileCodeScanner.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeMacroDefinitionRule.java: Ditto.
+
+2008-11-03  Andrew Overholt  <overholt@redhat.com>
+
+	* build.properties: Remove libhoverdocs/.
+
+2008-10-31  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Use plugin.properties for provider.
+	* plugin.properties: Add "(Incubation)" to Bundle-Name.
+
+2008-10-28  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Update BREE to J2SE-1.5.
+
+2008-10-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump up release to 1.0.1.
+
+2008-10-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (build): Add check for default
+	configuration coming back null from buildinfo.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java (performDefaults):
+	Set make -w default to be true.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject):
+	Set make -w project property to true and don't turn off indexer.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCCProjectWizard.java (doRun): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCProjectWizard.java (doRun): Ditto.
+
+2008-10-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for #249416
+
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java: Fix addition of MakeTargets to run faster.
+	(addMakeTargetsToManager): Rewritten to not use MakeTargetManager addTarget or removeTarget methods which
+	cause a rewrite of the .cproject file each time.
+	(isValidTarget): Remove checking MakeTargetManager existing target.
+	(translateDocumentToCDTProject): New method which outputs the MakeTargets to the .cproject file.
+	(MakeTargetComparator): New Comparator for sorting MakeTargets.
+	(createTargetElement): New method.
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Add subtask message for refreshing Make Targets
+	which might take some time.
+
+2008-10-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for #249231
+
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (getAutogenArgs): Add
+	support to resolve build macros.
+	(getConfigArgs): Ditto.
+	(initializeBuildConfigDirs): Ditto.
+
+2008-10-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for #249644.
+
+	* plugin.xml: Change visible to true for invoke autotools action set.  Also add
+	new popupmenus for running autoconf directly on configure.ac or configure.in.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java (run): Use
+	getCWD to get the relative current working directory and pass a string to the new
+	TwoInputDialog constructor.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java (getCWD): New method
+	to get the relative CWD for an autotools action.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/TwoInputDialog.java (createDialogArea):
+	Use CLabel instead of Label for first label (the CWD).
+	(TwoInputDialog): Change to accept a String for the first message instead of an IPath.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (addMakeTargetsToManager):
+	Temporarily disable.
+
+2008-10-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java (getIncludePaths): Fix bug that
+	was properly resolving relative paths.  Also add support for parsing -isystem specifiers and putting
+	the paths on the include path list.
+
+2008-09-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Change Eclipse-AutoStart over to Bundle-ActivationPolicy.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/LibHover.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/LibHoverMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/LibHoverMessages.properties: Removed.
+	* plugin.xml: Remove CHelpProvider library hover extension as this functionality
+	has been moved into its own plugin.
+
+2008-09-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileCodeScanner.java (createRules):
+	Specify Token.UNDEFINED for WordRules default token.  Otherwise, just getting the first possible
+	character of a word detector will result in default token being returned and no further parsing.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfCodeScanner.java (AutoconfCodeScanner):
+	Ditto.
+
+2008-09-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfoProvider.java (getScannerInformation):
+	Return null if project is not an Autotools project.
+	(unsubscribe): Check scanner info for null before accessing.
+
+2008-09-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Refactored from com.redhat.eclipse.cdt.autotools to org.eclipse.linuxtools.cdt.autotools
+
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/AutoconfTextHover.java:
+	(AUTOCONF_MACROS_DOC_NAME): Change to use default URL pointing to sourceware.org.
+	(AUTOMAKE_MACROS_DOC_NAME): Ditto.
+	(getHoverDoc): Remove unused variable.
+	(getAMDoc): Modify to handle either a file or URL.
+	(getACDoc): Ditto.
+	(.createInformationControl): Switch to use non-deprecated constructor.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/LibHover.java (getLibHoverDocs): Modify to handle
+	either an external file name or URL.
+	(getLibHoverDocName): New method that returns default URL pointing to sourceware.org.
+	(HelpResource.getHref): Change to return URL.
+	(getFunctionInfo): Remove unread variable.
+
+2008-09-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder(hasTargetBuilder): Change logic
+	to look for ProjectType id rather than looking at builder id of configuration since ManagedProject
+	might have had configuration removed.  Resolves #461647.
+	* plugin.xml: Fix typo in referenced nature of autoolsNature.  Resolves #461201.
+
+2008-08-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Update version number to 1.0.0 and specify minimum/maximum versions
+	for all dependencies now that CDT 5.0 and Eclipse 3.4 must be used.
+
+2008-07-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* icons/ac16/acmacro_arg_obj.gif: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsEditorPropertyPage.java:
+	(getproject): Remove.
+	* META-INF/MANIFEST.MF: Add org.eclipse.core.filesystem as dependency.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java: Update imports.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java (getImage):
+	Use special image for acmacro argument.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java:
+	Update imports.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/AutotoolsPluginImages.java: Add image for
+	acmacro argument.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java: Update imports.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java (reconcile):
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java: Update imports.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileReconcilingStrategy.java (reconcile):
+	Call new form of parse method.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Directive.java:
+	(getMakefile): New required method.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUAutomakefile.java:
+	(parse): New required method.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/AbstractMakefile.java:
+	(getFileURI): New required method.
+	(getMakefile): Ditto.
+	(setFileURI): Ditto.
+	(getMakefileReaderProvider): Ditto.
+	(parse): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/OpenDeclarationAction.java:
+	(openInEditor): Use URI instead of File.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/NullMakefile.java:
+	(parse): New required method to implement.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileDocumentProvider.java (createMakefile):
+	Add throws modifier.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroCodeScanner.java: Update imports.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java: Ditto.
+
+2008-07-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump release to 0.9.7.
+
+2008-04-17 14:12  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/:
+	  internal/ui/editors/autoconf/ProjectionFileUpdater.java,
+	  ui/editors/AutoconfCodeScanner.java,
+	  ui/editors/AutoconfPKGWordDetector.java,
+	  ui/editors/outline/AutoconfLabelProvider.java: Collapse and
+	  decorate long macro arguments, and notice PKG_ macros
+
+2008-04-17 13:13  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/:
+	  internal/ui/editors/autoconf/ProjectionFileUpdater.java,
+	  ui/editors/AutoconfEditorMacroValidator.java,
+	  ui/editors/parser/AutoconfElement.java,
+	  ui/editors/parser/AutoconfParser.java: Fix editor collapsing and
+	  remove line number metadata from AutoconfElement, since the "end
+	  line" is only meaningful in the context of the client.
+
+2008-04-17 10:43  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/:
+	  AutoconfEditorMessages.properties,
+	  outline/AutoconfContentOutlinePage.java,
+	  parser/AutoconfCaseConditionElement.java,
+	  parser/AutoconfCaseElement.java, parser/AutoconfElement.java,
+	  parser/AutoconfElifElement.java, parser/AutoconfElseElement.java,
+	  parser/AutoconfForElement.java, parser/AutoconfIfElement.java,
+	  parser/AutoconfMacroDetector.java,
+	  parser/AutoconfMacroElement.java,
+	  parser/AutoconfOutlineErrorHandler.java,
+	  parser/AutoconfParser.java, parser/AutoconfRootElement.java,
+	  parser/AutoconfTokenizer.java, parser/AutoconfWhileElement.java,
+	  parser/OldAutoconfParser.java, parser/Token.java: More autoconf
+	  parser work.	Remove old parser and standardize AST node
+	  constructors.  Add more tests and fix some bugs.
+
+2008-04-10 15:40  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/:
+	  internal/ui/editors/autoconf/ProjectionFileUpdater.java,
+	  ui/editors/AutoconfEditor.java,
+	  ui/editors/AutoconfEditorMacroValidator.java,
+	  ui/editors/AutoconfEditorMessages.properties,
+	  ui/editors/AutoconfErrorHandler.java,
+	  ui/editors/AutoconfReconcilingStrategy.java,
+	  ui/editors/outline/AutoconfLabelProvider.java,
+	  ui/editors/parser/AutoconfElement.java,
+	  ui/editors/parser/AutoconfMacroArgumentElement.java,
+	  ui/editors/parser/AutoconfMacroElement.java,
+	  ui/editors/parser/AutoconfParser.java,
+	  ui/editors/parser/AutoconfParser2.java,
+	  ui/editors/parser/AutoconfSelectElement.java,
+	  ui/editors/parser/AutoconfTokenizer.java,
+	  ui/editors/parser/AutoconfUntilElement.java,
+	  ui/editors/parser/AutoconfWhileElement.java,
+	  ui/editors/parser/ITokenConstants.java,
+	  ui/editors/parser/OldAutoconfParser.java,
+	  ui/editors/parser/ParseException.java: More autoconf parser work.
+
+2008-04-09 14:38  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/:
+	  AutoconfEditorMacroValidator.java,
+	  AutoconfEditorMessages.properties, AutoconfErrorHandler.java,
+	  parser/AutoconfCaseConditionElement.java,
+	  parser/AutoconfElement.java,
+	  parser/AutoconfMacroArgumentElement.java,
+	  parser/AutoconfMacroDetector.java, parser/AutoconfParser.java,
+	  parser/AutoconfParser2.java, parser/AutoconfTokenizer.java,
+	  parser/IAutoconfErrorHandler.java,
+	  parser/IAutoconfMacroDetector.java, parser/IMacroDetector.java,
+	  parser/ITokenConstants.java, parser/Token.java: New autoconf
+	  parser work in progress
+
+2008-04-07 14:06  Ed Swartz <ed.swartz@nokia.com>
+
+	* META-INF/MANIFEST.MF,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMacroValidator.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfErrorHandler.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroPartitionRule.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroWordDetector.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfReconcilingStrategy.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/ParseException.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElement.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfMacroArgumentElement.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/IAutoconfErrorHandler.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/IAutoconfMacroValidator.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/ParseException.java:
+	  Initial checkpoint for autotools parser changes
+
+
+2008-01-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/AclocalHandler.java: New file for
+	future menu support.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsProjectNature.java: New file.
+	* META-INF/MANIFEST.MF: Release updated.
+	* plugin.properties: Add some new messages for autotools tool invocation.
+	* plugin.xml: Update release to 0.9.6.  Add autotools project nature.  Make
+	autotools commands enablement dependent on autotools project nature.
+	Specify enablesFor 1 for all autotools tool actions.
+	* src/com/redhat/eclipse/cdt/autotools/actions/AbstractTargetAction.java (setSelectedContainer): New
+	method for future menu support.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java (hasTargetBuilder): Use
+	AutotoolsProjectNature static addAutotoolsBuilder method.
+	(addAutotoolsBuilder): Moved to AutotoolsProjectNature.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (runScript): New method to
+	run scripts.
+	(regenerateMakefiles): Use runScript method to run configuration scripts. Use
+	runCommand for executables like "make".
+	(runCommand): Added comments.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject):
+	Add new autotools project nature.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsCCProjectWizard.java (addNature):
+	Ditto plus set up autotools builder.
+	(doRun): Don't set up autotools builder since it is done in addNature.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsCProjectWizard.java (addNature):
+	Add new autotools project nature and set up autotools builder.
+	(doRun): Don't set up autotools builder since it is done in addNature.
+
+2007-12-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Update release to 0.9.5.3.
+
+2007-12-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #412651, #412661
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (getConfigurePath): Fetch tool command
+	name instead of hard-wiring to "configure".
+	(autogenExists): Fetch command name from autogen.sh options.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java: (removeBuildDir): New method.
+	(clean): If user has specified remove build directory, then use removeBuildDir method.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: New messages for supporting
+	build directory removal operation.
+
+2007-11-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHoverMessages.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHoverMessages.properties: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java: Add references to
+	LibHoverMessages instead of hard-coded strings.
+	* libhoverdocs/glibc-2.7-2.xml: Regenerated.
+
+2007-11-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java
+	(HelpResource.getHref): Use latest glibc doc version.
+	(getLibHoverDocs): Ditto.
+	* libhoverdocs/glibc-2.7-2.xml: New C library docs based on glibc-2.7-2 manual.
+	* libhoverdocs/glibc.xml: Old glibc docs removed.
+
+2007-11-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Update release to 0.9.5.2.  Also clear all OS lists for build definitions to
+	default to "all" OSes.
+
+2007-11-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #385991
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java (getMatchingFunctions): New method.
+	(FunctionSummary.compareTo): New method to support Comparable interface.
+	(FunctionSummary.getIncludes): Fix to avoid type cast exception/
+	(getFunctionInfo): Revised to call getFunctionSummaryFromNode method.
+	(FunctionSummary): Add Comparable interface.
+	(getFunctionSummaryFromNode): New method.
+	(FunctionSummary.FunctionPrototypeSummary.getPrototypeString): Add NLS
+	comments.
+
+
+2007-11-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsToolsPropertyPage.java: New File for
+	setting tool paths for the various autotools.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAclocalAction.java (run): Use the
+	project properties setting to determine what tools to use.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutoconfAction.java (run): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutomakeAction.java (run): Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties: New
+	messages.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyConstants.java: Add new
+	constants for setting the tool paths for aclocal, automake, and autoconf.
+	* plugin.xml: Add tools settings property page for Autotools.
+	* plugin.properties: New message for added property page.
+
+2007-10-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #359311, #359301, #359321
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacro.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyManager.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/IProjectPropertyListener.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsProjectPropertyTester.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/IPropertyChangeManager.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java:
+	(getAMDoc): New method.
+	(fBindingService):
+	(getAutomakeMacrosDocName): Modified to take a version parameter.
+	(getAutoconfMacrosDocName): Ditto.
+	(getPrototype): Changed to take an editor input.
+	(getAutoconfMacrosDocName): Ditto.
+	(AutotoolsHoverDoc): New internal class.
+	(getMacroList): New method to merge AC and AM macros together based on version
+	properties.
+	(getACDoc): New method.
+	(getIndexedInfo): Changed to take editor input.
+	(getHoverDoc): New metohd.
+	(getIndexedInfoFromDocument): New method that will parse the given document.
+	(getDefaultAutoconfMacrosDocName): New method to get the default preference
+	Autoconf macros doc name.
+	(getHoverRegion): Modified to get editor from elsewhere.
+	(getDefaultAutomakeMacrosDocName): New method to get the default preference
+	Autoconf AM macros doc name.
+	(getHoverInfo): Changed to take an editor input.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroParser.java: Removed.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/editors/autoconf/ProjectionFileUpdater.java (initialize):
+	(processReconcile): Use stored editor.
+	(install): Change input parameter to AutoconfEditor.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java (parseMacro):
+	(parse): Modified to take IEditorInput argument and pass that on to AutoconfErrorHandler.
+	(AutoconfParser): Modified to take an editor parameter.
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsDefaultBuildDirHandler.java: Updated
+	copyright to just Red Hat Inc.
+	* plugin.properties: New messages.
+	* plugin.xml: Add ICPropertyTab extension for editor properties.  Add properties
+	page for Autotools properties.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsEditorPropertyPage.java: New file.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyPage.java: Rewritten.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java:
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyConstants.java:
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfErrorHandler.java (AutoconfErrorHandler):
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java
+	(AutoconfSourceViewerConfiguration): Take editor as parameter.
+	(getPresentationReconciler): Pass along or use editor passed in.
+	(getContentAssistant): Ditto.
+	(getReconciler): Ditto.
+	(getTextHover): Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java (connect):
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java:
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java (computeCompletionProposals):
+	(AutoconfMacroContentAssistProcessor): Take editor input.
+	(computeMacroStart): Use editor.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfReconcilingStrategy.java (reconcile):
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java: Make this implement
+	IProjectPropertyListener
+	(handlePreferenceStoreChanged): Modified to call handleVersionChange method if a
+	autoconf or automake macro version preference change has occurred.
+	(doSetInput): Deregister editor as property listener if editor was for a project
+	file previously and register editor as property listener if editor is now for a
+	project.
+	(getAutoconfDocumentProvider): Make static.
+	(getAutoconfCodeScanner): Pass this to constructor.
+	(handleVersionChange): New method.
+	(handleProjectPropertyChanged): New IProjectPropertyListener method.
+	(initializeEditor): Pass this to source viewer configuration constructor.
+	(getAutoconfParser): Pass this to constructor.
+	(dispose): Deregister editor as property listener for a project if applicable.
+	(getAutoconfMacroCodeScanner): Pass this to constructor.
+
+2007-10-23  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroCodeScanner.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/RestrictedEndOfLineRule.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitionScanner.java (AutoconfPartitionScanner):
+	Move macro partitioning ahead of comments.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java (getPresentationReconciler):
+	Use AutoconfMacroCodeScanner for macro damager repairer.
+	(getContentAssistant): Use AutoconfMacroCodeScanner for macro content assist.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java (nextToken):
+	New method that simply defaults to super.nextToken to be used for debugging purposes.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java (getAutoconfMacroCodeScanner):
+
+	* plugin.xml: Update to release 0.9.5.1.
+
+2007-10-23  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #330701
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java: New File to
+	add property settings for how to clean an Autotools project and whether or not to use the
+	current Autotools info scanner.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyMessages.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyConstants.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java (parseLines):
+	Process macros ahead of stripping out comments as this prevents removing quotes inside the
+	macro which have precedence over # (e.g. used to specify #include and not meaning a
+	comment to end of line).
+	(parseWhile): Change comment typo.
+	(parseFor): Ditto.
+	* plugin.properties: Add new messages regarding property pages.
+	* plugin.xml: Add Autotools build IcPropertyTab (AutotoolsBuildPropertyPage).  Also
+	specify that AutotoolsDefaultBuildDirHandler is also an option applicability tester.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.properties:
+	Change the message for autoconf and automake versions to include the word "Default".
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitioner.java (computePartitioning):
+	Add override method as way to print out partitions.  Cannot compute and print out partitions at
+	connect time as in 4.0.1 we initially are given an empty document that is later filled.
+	(printPartitions): Change argument to be an array of partition regions.
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java (build):
+	(clean): New method.  Pay attention to user clean method preference.
+	(getTargets): Pay attention to user clean target preference.
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java (getCompilationString):
+	Pay attention to user preference on scanner info retrieval and disable if need be.
+	(createIncludeChain): Use AutotoolsPropertyConstants to get property names to use.
+	(followIncludeChain): Ditto.
+	(getMakefile): Add nls comments.
+	(AutotoolsScannerInfo): Ditto.
+	(getDefinedSymbols): Ditto.
+	(buildFile): Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (regenerateMakefiles): Don't
+	call AutotoolsScannerInfoProvider.setDirty method anymore.  Instead, set a project property
+	to indicate the scanner info is dirty.
+	(addMakeTargetsToManager): Add a try/catch statement to prevent duplicate entries from
+	stopping loop that adds make targets.
+	(initializeBuildConfigDirs): Formatting change.
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfoProvider.java (getScannerInformation):
+	Add a check for project property indicating the scanner info is dirty in which case call
+	setDirty method.
+	(setDirty): Make private.
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsDefaultBuildDirHandler.java: Now implements
+	IOptionApplicability.
+	(isOptionEnabled): New interface method to implement.
+	(isOptionVisible): Ditto.
+	(isOptionUsedInCommandLine): Ditto (set to false).
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsBuilder.java (getProject): New method.
+	(AutotoolsBuilder): Add project argument.
+	(getCleanBuildTarget): Implemented using new Autotools CLEAN_MAKE_TARGET property.
+
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new message.
+
+2007-10-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #323641
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java (getDefinedSymbols): Use
+	the patch provided by Jose Fonseca to provide a proper regular expression for parsing
+	the defined symbols from the make output.
+
+2007-10-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Ensure the ids for InvokeAutoconf and InvokeAutomake actions are unique.
+
+2007-10-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsDefaultBuildDirHandler.java (handleValue):
+	Add some place holders for supporting the user manually setting the build directory.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add some dialog messages for
+	future usage.
+	* plugin.xml: Update version to 0.9.5.
+
+2007-10-02  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #315811
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsDefaultBuildDirHandler.java: New File.
+	* plugin.xml: Change build definition to version 4.0.0.  Remove unused project converter
+	extension.  For build directory, specify an option handler which is implemented by
+	AutotoolsDefaultBuildDirHandler.
+
+2007-09-24  Andrew Overholt  <overholt@redhat.com>
+
+	* plugin.xml: Update version to 0.9.4.
+
+2007-09-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutoconfAction.java (run):
+	Fix array indexing.
+
+2007-09-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Add ELF and GNU_ELF binary parsers as default for an Autotools project.
+
+2007-09-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #274551
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java (getCompilationString): Support
+	the case where the file isn't part of the build and there is no scanner info to gather.
+	(buildFile): Minor cosmetic changes.
+
+	* META-INF/MANIFEST.MF: Update release.
+
+2007-09-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (regenerateMakefiles): Add a
+	clause to check for the case whereby there was no way to generate the Makefile and one
+	didn't already exist.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties (Makegenerator.didnt.generate):
+	New message.
+
+2007-08-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #254248
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java (selectionChanged):
+	Make call to editor.selectAndReveal method to focus editor page on selected outline item.
+
+2007-08-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #254246
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/CWordFinder.java (findWord): Fix
+	to handle being in the first word of the file.
+
+2007-08-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #253331
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java (build): Enable
+	autobuilding.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (regenerateMakefiles):  If
+	the configuration options change, clean the previous build directory so a full rebuild
+	will occur.
+
+2007-08-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Change release to 0.9.2 and specify minimum java runtime as
+	1.4.
+
+2007-08-15 Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #251412
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java (addAutotoolsBuilder):
+	When calling IProject.setDescription(), pass a NullProgressMonitor instead of
+	null, despite what the function API says because an isCancelled() call may occur
+	and will result in an exception thrown.  Also, use a try/catch block to handle any
+	of the legitimate exceptions that might occur in this operation.
+
+2007-08-15 Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new messages
+	for new C and C++ project wizards.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectWizard.java: Renamed...
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsCProjectWizard.java: ..to this.
+	(doRun): Rewritten based on conversion wizard to properly set up project.
+	(getProjectType): New method.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsCCProjectWizard.java:  New file
+	copied from NewAutotoolsCProjectWizard but inherits from NewCCProjectWizard.
+
+	* icons/dlcl16/newc_app.gif: New gif.
+	* icons/dlcl16/newcc_app.gif: Ditto.
+	* icons/elcl16/newc_app.gif: Ditto.
+	* icons/elcl16/newcc_app.gif: Ditto.
+
+	* plugin.properties: Add new strings for new C and C++ project wizards.
+	* plugin.xml: Add new C and C++ project wizards.
+
+2007-08-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #251604
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (getAutogenArgs): New method.
+	(regenerateMakefiles): Pass user-specified autogen.sh options when invoking autogen.sh.
+	* plugin.xml: Add autogen.sh tool support with user options.
+	* plugin.properties: Add new autogen tool message strings.
+
+2007-07-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java
+	(handlePreferenceStoreChanged): Add support for changing automake macros version.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java
+	(getAutomakeMacrosDocument):
+	New method.
+	(getIndexInfo, getPrototype): Create private versions of these that take a document
+	as an input parameter.  Change the public static methods to call the private
+	versions with the autoconf macro document and the automake macro document, if
+	the macro isn't found yet.
+	(init): Set up the autoconf macro document and automake macro document.
+	(reinit): Reset both the autoconf and automake macro documents.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java
+	(LATEST_VERSION): Replace with LATEST_AC_VERSION and LATEST_AM_VERSION.
+	(createOverlayStore): Add automake version setting.
+	(initializeVersion): Replace with initializeACVersion and initializeAMVersion.
+	(initialize): Call the two replacements of initializeVersion.
+	(createVersionTabContent): Add automake version support.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsEditorPreferenceConstants.java
+	Add automake version support.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.properties:
+	Add messages used in automake version preference.
+
+	* libhoverdocs/ammacros-1.4-p6.xml: New automake macro docs for 1.4-p6.
+	* libhoverdocs/ammacros-1.9.5.xml: New automake macro docs for 1.9.5.
+	* libhoverdocs/ammacros-1.9.6.xml: New automake macro docs for 1.9.6.
+
+2007-07-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* MANIFEST.MF: Bump up release to 0.9.1.
+
+2007-07-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUAutomakefile.java
+	(parse): Fix Automake if/else constructs to be child/parent directives as appropriate.
+	(bypassIf, bypassElse, isTrue): Removed.
+	(parseIf): Add rules parameter.
+	(addDirective): Remove caveat when dealing with automake if/else.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IAutomakeConditional.java
+	(getRules, setRules): New methods for the interface.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Else.java: Add ICommand
+	interface and implement required methods including new ones add to IAutomakeConditional.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/If.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeErrorHandler.java
+	(update): Change to call checkChildren for makefile.
+	(checkChildren): New recursive method to check for bad directives.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java
+	(AutomakefileLabelProvider.getImage): Add support for IAutomakeConditional elements and
+	remove reference to AutomakeIfElse class.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeMacroDefinitionRule.java
+	(isValidCharacter): Add support for "+-$()@" chars.
+
+2007-07-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUAutomakefile.java
+	(parseIf): Add @if support.
+	(isTrue): Default to true for if conditions.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUMakefileConstants.java:
+	Add @if and @endif macros.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUMakefileUtil.java
+	(isIf): Add @if support.
+	(isEndif): Add @endif support.
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java:
+	Add support for @if and @endif keywords.
+	(createRules): Add support for whitespace and simple identifiers.
+
+2007-07-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #247518
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java
+	(createRules): Use new AutoconfSubstRule class for identifying autoconf substituitions.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileUtil.java (isConfigMacro):
+	Refine so that macro must start and end with @ and contain at least one valid char.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutoconfSubstRule.java: New file.
+
+2007-07-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #246153
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java (createFileInfo):
+	Rewrite to handle workspace files as well as external ones.
+	(createMakefile): Change to accept a file name rather than an IFile.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor
+	(getDefault): New method.
+	(doSetInput): Ditto.
+	(initializeEditor): Add a few lines that would have been performed by
+	base class initializeEditor.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeErrorHandler
+	(AutomakeMarker): New internal class for error marking.
+	(update): Switch to using internal markers and directly updating the
+	Annotation model.
+	(removeExistingMarkers): Directly reference the annotation model.
+	(AutomakeErrorHandler): Fetch and store the annotation model for the input.
+	Change prototype.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java
+	(AutomakefileReconcilingStrategy): Change to store an IEditorInput.  Use new
+	AutomakeErrorHandler interface.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileEditor.java
+	(initializeEditor): Remove fixme comment.
+
+2007-07-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #246783
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java:
+	(initializeEditor): Call AutotoolsEditorPreferenceConstants.initializeDefaultValues
+	to ensure the editor default values are set.
+
+2007-06-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #246154
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsBuilder.java: New proxy
+	class to wrap an existing IBuilder and override build path functionality.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java:
+	(build): Wrap the builder using the new AutotoolsBuilder class so the
+	build path will work properly.
+
+2007-06-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #246134
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfErrorHandler.java:
+	(AutoconfErrorHandler): Change constructor to just take IDocument input.
+	(AutoconfMarker): New private class for marking autoconf document.
+	(createMarker): New private method to create AutoconfMarker in document.
+	(handleError): Create a marker and add it to annotation model durectly
+	instead of using MarkerUtilities.
+	(removeAllMarkers): Remove directly from annotation model instead of using file.
+	(removeExistingMarkers): Ditto.
+	(getDocument): New method.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java:
+	(connect): Change constructor call to AutoconfErrorHandler.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java:
+	(getViewer): New method to return the source viewer for the editor.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroParser.java:
+	(AutoconfMacroParser): Change constructor call to AutoconfErrorHandler.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java:
+	Change all uses of AutoconfOutlineErrorHandler to AutoconfErrorHandler.
+
+2007-06-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #245820
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileUtil.java (isAutomakeCommand):
+	New method.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Conditional.java (isIf): New
+	method.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IAutomakeConditional.java:
+	New interface.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Else.java: Changed to
+	implement new IAutomakeConditional interface.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/If.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUAutomakefile.java
+	(parse): Add Automake if/else parsing and support for Makefile.in processed if/else blocks.
+	(bypassIf, bypassElse, parseIf): New private methods.
+	(addDirective): Don't add directives to an Automake if or else construct.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUMakefileConstants.java:
+	Add CONDITIONAL_IF constant.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUMakefileUtil.java
+	(isIf): New method.
+
+2007-06-25  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileEditorTogglePresentationAction.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileEditorActionContributor.java: Ditto.
+
+	* icons/etool16/alphab_sort_co.gif: New icon.
+	* icons/etool16/build_menu.gif: Ditto.
+	* icons/etool16/convert_normal.gif: Ditto.
+	* icons/etool16/make.gif: Ditto.
+	* icons/etool16/makefile.gif: Ditto.
+	* icons/etool16/newc_app.gif: Ditto.
+	* icons/etool16/newcc_app.gif: Ditto.
+	* icons/etool16/segment_edit.gif: Ditto.
+	* icons/etool16/target_add.gif: Ditto.
+	* icons/etool16/target_build.gif: Ditto.
+	* icons/etool16/target_delete.gif: Ditto.
+	* icons/etool16/target_edit.gif: Ditto.
+	* icons/etool16/target_filter.gif: Ditto.
+	* icons/etool16/update_old.gif: Ditto.
+
+	* plugin.xml: Change Automake editor to use new internal MakefileEditorActionContributor
+	class rather than point to the internal one in internal CDT make.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentSetupParticipant.java:
+	(setup): Don't bother registering this as document listener.
+	(documentAboutToBeChanged): Remove body of method as this is no longer needed.
+
+2007-06-25  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #245611
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java
+	(getMacroList): Change to call AutoconfTextHover to get the name of the macros
+	document since it will depend on current preferences.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java
+	(getAutoconfMacrosDocName): New static method.
+
+2007-06-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* libhoverdocs/acmacros-2.59.xml: New autoconf hover text and syntax info
+	for autoconf 2.59.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java:
+	Add 2.59 support.
+
+2007-06-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* libhoverdocs/acmacros-2.13.xml: New autoconf hover text and syntax info
+	for autoconf 2.13.
+	* libhoverdocs/acmacros-2.61.xml: New autoconf hover text and syntax info
+	for autoconf 2.61.
+	* libhoverdocs/acmacros.xml: Replaced with files above.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover (init): Change document
+	to be dependent on autoconf version preference.
+	(reinit): New method to force reinitialization of help document.
+	(getPrototype): Fix to allow for earlier versions which specify multiple
+	prototypes in one using "[,", for example.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java:
+	Add version preference support.
+	(createOverlayStore): Add version support.
+	(createContents): Add version tab.
+	(initializeVersion): New method.
+	(createVersionTabContents): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsEditorPreferenceConstants.java:
+	Add AUTOCONF_VERSION and initialize the default autoconf version value to be the
+	highest possible.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.properties:
+	Add new messages pertaining to autoconf version.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java (handlePreferenceStoreChanged):
+	If the autoconf version is changed, invalidate the document and force a reparse.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.java (getFormattedString):
+	Add new method which takes 3 replacement strings.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.properties:
+	Change macro error messages to take the autoconf version as a parameter.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java: Fix
+	typo for too many args message id.
+	(parseMacro): For wrong number of argument messages, get the current autoconf version preference
+	and pass it in to the message.
+
+2007-06-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java: Rebase on
+	GNUAutomakefile class.  Remove all parsing methods.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java: Fix
+	comments to refer to internal Autotools classes as appropriate.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Conditional.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/DefineVariable.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/DeleteOnErrorRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Else.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Endef.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Endif.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ExportAllVariablesRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ExternalEditorInput.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUAutomakefile.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUTargetRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUVariableDef.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Ifdef.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Ifeq.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Ifndef.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Ifneq.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Include.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IntermediateRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/LowResolutionTimeRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/NotParallelRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/OverrideDefine.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/OverrideVariable.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/PhonyRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/SecondaryRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/StaticTargetRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/TargetVariable.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Terminal.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/UnExport.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/VPath.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/ExternalEditorInput.java: Update comments
+	that should refer to internal Autotools classes.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/MakefileDocumentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/ProjectionMakefileUpdater.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/WorkingCopyManager.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/editors/autoconf/ProjectionFileUpdater.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferencePage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Ditto.
+
+2007-06-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #243184
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeConfigMacro.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java (parse): Add
+	support for autoconf macros.
+	(parseConfigMacro): New method.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java
+	(createRules): Add rule for configure macros.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java
+	(getImage): Add support for AutomakeConfigMacro.
+	(getText): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileUtil.java (isConfigMacro):
+	New method.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeUIImages.java: Add acmacro_obj image.
+	* icons/obj16/acmacro_obj.gif: New icon.
+
+2007-06-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java: Removed.  No
+	longer used now that MakeTargets work.
+	* src/com/redhat/eclipse/cdt/autotools/actions/CheckboxTablePart.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeContentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeTargetDialog.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/SharedPart.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/SharedPartWithButtons.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/StructuredViewerPart.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/TargetListViewerPart.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/editors/autoconf/ProjectionFileUpdater.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsEditorPreferenceConstants.java:
+	Add new constants for Autoconf editor folding.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/IAutotoolsEditor.java: New interface.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java: Make class
+	implement IAutotoolsEditor interface.  This allows ProjectionFileUpdater class to
+	work.  Add folding support based on MakefileEditor class.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElement.java
+	(getStartOffset, setStartOffset, getEndLineNumber, setEndLineNumber): New methods.
+	(getEndOffset, setEndOffset, getLastChild): Ditto.
+	(AutoconfElement): New constructor which takes start offset.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfCaseElement.java:
+	Add new constructor to match that of AutoconfElement.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElifElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElseElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfForElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfIfElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfWhileElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java:
+	(AutoconfLineReader): New internal class to replace LineNumberReader class.  Change
+	all internal parse routines to use this class instead of LineNumberReader.
+	(parseLines): When a semicolon is found that denotes a multistatement line, update the end
+	offset of the previous construct and set the start offset for the next construct to be after
+	the semicolon and additional whitespace.
+	(parseMacro, parseIf, parseElif, parseElse, parseCase, parseFor, parseWhile): Construct with
+	start offset based on previous mark.  After processing, set the end line number for the
+	element.
+
+2007-06-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java:
+	Refactor AutomakeEditorPreferenceConstants to AutotoolsEditorPreferenceConstants.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ColorManager.java:  Moved from here to..
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/ColorManager.java: ...here
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditorFactory.java:
+	Changed due to movement of ColorManager class.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/AbstractMakefileCodeScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileCodeScanner.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileSourceConfiguration.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AbstractAutomakeEditorPreferencePaga.java:
+	Refactored to be...
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AbstractEditorPreferencePage.java:
+	...this.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferenceConstants.java:
+	Refactored to be...
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsEditorPreferenceConstants.java:
+	...this.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakePreferencesMessages.java:
+	Refactored to be...
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.java:
+	...this.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakePreferencesMessages.properties:
+	Refactored to be...
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.properties:
+	...this.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferencePage.java:
+	Use new refactored classes.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java:  Add color preference
+	support.
+	(AutoconfCodeScanner): A color provider is no longer needed as input.
+	(getToken, getTokenProperties, addToken, indexOf, affectsBehavior): New methods.
+	(adaptToPreferenceChange, adaptToColorChange, adaptToStyleChange); Ditto.
+	(createTextAttribute, initialize): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfColorProvider.java: Removed and replaced
+	with ColorManager.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java: Change to use
+	ColorManager.
+	(initializeEditor): Set the preference change store and initialize the editor preferences.
+	(getAutoconfCodeScanner): Changed to match new AutoconfCodeScanner constructor.
+	(getPreferenceColor): New method.
+	(getColorProvider): Removed.
+	(handlePreferenceStoreChanged): New method.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java:
+	Inherit from TextSourceViewerConfiguration.  Store the preference store.
+	* plugin.properties: Add new internationalized string for Autoconf editor preferences.
+	* plugin.xml: Add Autoconf editor preference page.
+
+2007-05-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #241908
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (addMakeTargetsToManager):
+	Change builder id used to one used in plugin.xml.
+
+2007-05-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #241782
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new message
+	for Autotools preference page.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java
+	(initializeEditor): Initialize color and folding preference defaults.
+	(handlePreferenceStoreChanges): Call super method to refresh editor.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ColorManager.java:
+	Change constants to be in Autotools domain.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AbstractAutomakeEditorPreferencePage.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferenceConstants.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferencePage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakePreferencesMessages.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakePreferencesMessages.properties:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsPreferencePage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/ColorEditor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/OverlayPreferenceStore.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/StatusInfo.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/TabFolderLayout.java: Ditto.
+
+	* plugin.properties: Add new internationalized strings from plugin.xml.
+	* plugin.xml: Add Autotools and Automake Editor preference pages.  Also
+	clean up some extensions to use internationalized strings.
+
+2007-05-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #241612
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java:
+	Add utility methods from MakeUIPlugin to log messages and
+	issue error dialogs, etc..
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeTargetDialog.java:
+	Use MakeUIMessages instead of MakeUIPlugin for messages.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeCompletionProcessor.java:
+	Replace internal CDT classes with internal Autotools classes.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java:  Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditorFactory.java:
+	Ditto.
+	(getPreferenceColor): New method.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeErrorHandler.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java:	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeIfElse.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeMacroDefinitionRule.java:
+	Ditto.
+	(evaluate): Remove unused local variable ch.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeTextHover.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/AbstractElementListSelectionDialog.java:
+	New file transported from CDT internals.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/AbstractMakefile.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/AbstractMakefileCodeScanner.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/AddBuildTargetAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ArchiveTarget.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/BadDirective.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ColorManager.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Command.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Comment.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/CompletionProposalComparator.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/DefaultRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Directive.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/EditorUtility.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ElementListSelectionDialog.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/EmptyLine.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ExternalEditorInput.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ExternalEditorInputFactory: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUMakefileConstants.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IgnoreRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IMakefileDocumentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IMakefileEditorActionDefinitionIds.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/InferenceRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IReconcilingParticipant.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ISelectionValidator.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ITranslationUnitEditorInput.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/LexicalSortingAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MacroDefinition.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MacroDefinitionRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MacroReferenceRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileAnnotationHover.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileCodeScanner.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileCompletionProcessor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileConstants.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileContentOutlinePage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileDocumentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileDocumentSetupParticipant.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileEditor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileEditorPreferenceConstants.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileMessages.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefilePartitionScanner.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileReader.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileReconcilingStrategy.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakeFileResources.properties: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileSourceConfiguration.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileStorageDocumentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileTextHover.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileWordDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MessageLine.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/NullMakefile.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/OpenDeclarationAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/OpenIncludeAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Parent.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/PosixMakefileUtil.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/PosixRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/PreciousRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ProjectionMakefileUpdater.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Rule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/SccsGetRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/SelectionList.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/SilentRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/SpecialRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/StatusInfo.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/StringMatcher.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/SuffixesRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Target.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/TargetRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/TwoArrayQuickSort.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Util.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/VariableDefinition.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/WordPartDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/WorkingCopyManager.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/AutotoolsPluginImages.java: Switch to
+	use new ac16 icon directory instead of etools16.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ErrorParserBlock.java: Use
+	MakeUIMessages instead of MakeUIPlugin for messages.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeUIImages.java: Use
+	AutotoolsPlugin for error dialogs.  Add new images.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeUIMessages.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeUIPlugin.java: Removed.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MessageLine.java: Fix typo.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/AutotoolsWizardMessages.java:
+	Fix bundle id for messages.
+
+	* plugin.xml: Fix icon references.
+
+	* icons/ac16: New folder containing icons that used to be in etool16.
+	* icons/dlcl16/build_configs.gif: New icon.
+	* icons/dlcl16/open_include.gif: Ditto.
+	* icons/elcl16/build_configs.gif: Ditto.
+	* icons/elcl16/open_include.gif: Ditto.
+	* icons/dtool16/alphab_sort_co.gif: Ditto.
+	* icons/dtool16/build_menu.gif: Ditto.
+	* icons/dtool16/convert-normal.gif: Ditto.
+	* icons/dtool16/make.gif: Ditto.
+	* icons/dtool16/makefile.gif: Ditto.
+	* icons/dtool16/newc_app.gif: Ditto.
+	* icons/dtool16/newcc_app.gif: Ditto.
+	* icons/dtool16/segment_edit.gif: Ditto.
+	* icons/dtool16/target_add.gif: Ditto.
+	* icons/dtool16/target_build.gif: Ditto.
+	* icons/dtool16/target_delete.gif: Ditto.
+	* icons/dtool16/target_edit.gif: Ditto.
+	* icons/dtool16/update_old.gif: Ditto.
+	* icons/etool16: Move autoconf editor icons to ac16 folder.
+	* icons/obj16/command_obj.gif: New icon.
+	* icons/obj16/define_obj.gif: Ditto.
+	* icons/obj16/environment_obj.gif: Ditto.
+	* icons/obj16/envvar_obj.gif: Ditto.
+	* icons/obj16/error_obj.gif: Ditto.
+	* icons/obj16/hfolder_obj.gif: Ditto.
+	* icons/obj16/include_obj.gif: Ditto.
+	* icons/obj16/irule_obj.gif: Ditto.
+	* icons/obj16/lib_obj.gif: Ditto.
+	* icons/obj16/macro_obj.gif: Ditto.
+	* icons/obj16/relation_obj.gif: Ditto.
+	* icons/obj16/target_obj.gif: Ditto.
+	* icons/obj16/trule_obj.gif: Ditto.
+
+2007-05-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java:
+	(addMakeTargetsToManager): Use MakeCorePlugin to get an IMakefile
+	rather than use the internal PosixMakefile class directly.
+
+2007-05-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java:
+	(initialize): Store the configuration for later usage.
+	(getConfigSettingsPath): Use stored configuration instead of fetching
+	it each time.
+	(runCommand): Ditto.
+	(addMakeTargetsToManager): Use the real MakeTargetManager to store
+	targets.  Mark targets added by parsing the Makefile with special
+	tag.  Delete all MakeTargets with special tag before adding the
+	new targets.
+	(initializeBuildConfigDirs): Use stored configuration to get the
+	tool options rather than the ManagedBuildInfo.
+	(getConfigArgs): Ditto.
+	(addMakeTargetsToManager):
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java:
+	Inherit from CommonBuilder.
+	(build): Change to fetch make target name from args map and store for
+	later use.
+	(getTargets): Change to get make target from stored make target name.
+
+	* plugin.xml: Remove Build Special Targets menu item as it is no longer
+	needed.  Add MakeTargetBuilder extension so we can use MakeTargets.
+
+2007-05-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #239886
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAclocalAction.java (run):
+	Pass the CWD to TwoInputDialog and use it when executing the command.  On
+	success, show a success dialog.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutoconfAction.java (run):
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/TwoInputDialog.java (TwoInputDialog):
+	Take the CWD as a parameter.
+	(createDialogArea): Add label with CWD.
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutomakeAction.java (run):
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeMessages.java (getString):
+	Add comments.
+	(getFormattedString): New method.
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAction.java (getExecDir):
+	New method to return the CWD.
+	(showSuccess): New method to display a success dialog.
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeMessages.properties: Add new
+	messages.
+
+2007-05-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #238173
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfIdentifierRule.java (evaluate):
+	Cast read character to char before invoking Character methods to avoid gcj bug.
+
+2007-04-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #238493
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/RecursiveSingleLineRule.java (evaluate):
+	Add check for scanner column < 0 which means we are already at EOF.
+
+2007-04-25  jjohnstn  <jjohnstn@toocool.toronto.redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectOptionPage.java (ManagedWizardOptionBlock.setupHelpContextIds):
+	Switch to use CDTHelpContextIds for static help context id.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/CProjectPlatformPage.java (createControl):
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/ManagedProjectOptionBlock.java (createContents):
+	Ditto.
+
+2007-04-25  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Bugzilla #182821
+
+	2007-04-25  Mikhail Sennikovsky
+	* plugin.xml: Add plugin extensions which let the CDT know that includes and
+	defined symbols are supported for the Autotools tool-chain.
+
+2007-04-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #236304
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (runCommand): Use the
+	job description as a message in the console.
+	(regenerateMakefiles): Fix autogen.sh logic to run configure after invoking
+	autogen.sh if config.status doesn't exist.  Make sure console is reused for
+	2nd step.  Change some of the status messages with new ones.
+	(autogenExists): Fix bug where path to autogen.sh wasn't being set on return.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new MakeGenerator messages.
+
+2007-04-11  jjohnstn  <jjohnstn@toocool.toronto.redhat.com>
+
+	Bugzilla #236077
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/CWordFinder.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java: Replace
+	CDT internal classes with Autotools internal classes.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/ManagedProjectOptionBlock.java (createContents):
+	Replace WorkbenchHelp reference with non-deprecated alternative.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakeTargetManager.java: Fix
+	imports.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (runCommand): Replace
+	deprecated environmental variable method being used.
+	(createFile): Make protected instead of private.
+	(getInvalidDirList): Remove.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject):
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java (getWorkingCopyManager):
+	Moved into AutomakeEditorFactory.
+	(getAutomakefileDocumentProvider): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditorFactory.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeCompletionProcessor.java:
+	Change all calls to getWorkingCopyManager and getAutomakefileDocumentProvider to use
+	new AutomakeEditorFactory class.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeCompletionProcessor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.java (getResourceBundle):
+	New method.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.properties: Add
+	new messages that were formerly fetched internally from CDT.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java: Comment out unused
+	projectSupport.
+	(createActions): Use AutoconfEditorMessages.
+	(InformationDispatchAction.makeAnnotationHoverFocusable): Ditto.
+	(fProjectionModelUpdater): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfAnnotationHover.java (formatMultipleMessages):
+	Use AutoconfEditorMessages instead of CUIMessages.
+	* src/com/redhat/eclipse/cdt/autotools/interenal/ui/ErrorParserBlock.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/CProjectPlatformPage.java (createControl): Remove
+	usage of WorkbenchHelp class which is deprecated.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectOptionPage.java (ManagedWizardOptionBlock.setupHelpContextIds):
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject):
+	Remove unused code.  Switch to use non-deprecated interface for getting
+	indexer.
+
+2007-04-10  jjohnstn  <jjohnstn@toocool.toronto.redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectWizard.java:
+	Removed.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectOptionPage.java:
+	Use new internal ManagedProjectOptionBlock class.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/CProjectPlatformPage.java:
+	Switch to use new AutotoolsWizardMessages internal class.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java:
+	Fix imports.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizard.java (doRunEpilogue):
+	Switch to new IRunnableWithProgress interface.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/AutotoolsWizardMessages.java:
+	New file to support old wizard code.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/AutotoolsWizardMessages.properties:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/ConfigurationContentProvider.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/ConfigurationLabelProvider.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/ManagedProjectOptionBlock:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/AutotoolsPluginImages.java:
+	Add build_configs.gif for Wizard support.
+	* src/com/redhat/eclipse/cdt/autotools/internal/MarkerGenerator.java (addMarker):
+	New method required by IMarkerGenerator interface.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (getProject):
+	New method.
+	(initializeBuildConfigDirs): Change the default build directory
+	for the configuration's builder.
+	Add support for CDT 4.0 M6.
+	* cdtpatches/*: Removed.
+	* icons/eclcl16: New icon directory.
+	* icons/eclcl16/build_configs.gif: New icon.
+	* plugin.properties: Add new strings used in plugin.xml.
+	* plugin.xml: Add buildType and buildArtefactType extensions.  Add
+	toolchain to Autotools project buildDefinitions extension.
+
+2007-04-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #235076
+	* src/com/redhat/eclipse/cdt/autotools/wizards/CProjectPlatformPage.java (CProjectPlatformPage):
+	Add missing NLS comment.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (makefileCvsExists): Use
+	getMakefileCVSPath method.
+	(configureExists): Use getConfigurePath method.
+	(getConfigurePath): New method.
+	(getMakefileCVSPath): New method.
+	(regenerateMakefiles): Use getConfigurePath and getMakefileCVSPath to get the
+	command to use when either of these is found to exist.
+	(autogenExists): Change to protected method.
+
+2007-03-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java (createPresentation):
+	Comment out macro parsing as this is now done by the reconciler and overall parsing.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java (getPrototype):
+	Fix so it is properly setting minimum and maximum parm counts for a macro.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfPrototype.java (setMaxParms):
+	Fix typo.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java (matchParentheses):
+	Update logic.
+	(parseMacro):  Add error checking for minimum and maximum parameters as well as unmatched
+	parentheses or square-brackets.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java (setParmCount):
+	New method.
+	(setQuoteDepth): Ditto.
+	(getParmCount): Ditto.
+	(getQuoteDepth): Ditto.
+	(setDepth): Ditto.
+	(getDepth): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.properties: Add
+	new error messages for parsing of macros.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage (update):
+	Use viewer refresh instead of redraw when updating.
+	(updateSelection): New method.
+
+2007-03-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/Makegenerator.java (regenerateMakefiles):
+	Refine algorithm so we don't cause a reconfigure if the configuration settings
+	file doesn't contain the project name.  If the configuration arguments are
+	unchanged and the settings file is the old style, rewrite with project
+	name.
+
+2007-03-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #230128
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (saveConfigArgs): Add
+	the project name as first argument saved.
+	(regenerateMakefiles): Read off first argument and verify that it matches the
+	current project name.
+
+2007-03-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #232965
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (runCommand):
+	Change prototype to accept a console and a boolean which when true
+	means to restart the console which may possibly clear the console.
+	(regenerateMakefiles): Change calls to runCommand.  For multiple
+	actions (e.g. autogen.sh then configure), opt for the 2nd, 3rd, etc...
+	calls to not clear the console.  Don't run config.status unless
+	the top-level Makefile is missing.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new
+	MakeGenerator.unsupportedConfig message.
+
+2007-03-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (regenerateMakefiles):
+	If configuration parameters have changed, mark all Scanner Info as dirty.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfoProvider.java (getCollectionName):
+	Make synchronized to avoid concurrent access of the infoCollection.
+	(getScannerInformation): Ditto.
+	(setDirty): New method.
+
+2007-03-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #230493
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java (getDefinedSymbols):
+	Recalculate each time if compilation string is null.
+	(getIncludePaths): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfoProvider.java (getScannerInformation):
+	Use a map of configurations to keep ScannerInfo seperate per configuration.  Use
+	current configuration to fetch scanner info.
+
+2007-02-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Bump up release to 0.0.8.1.
+
+2007-02-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzillas #230253, #205310.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakeTargetManager.java (addTargets):
+	New method to do mass add of MakeTargets for performance improvement.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java:
+	(addMakeTargetsToManager): Use new AutotoolsMakeTargetManager addTargets method.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectWizard.java (doRun):
+	Set indexer to NullIndexer before applying options.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject):
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizard.java:
+	Add new NULL_INDEXER_ID.
+	* src/com/redhat/eclipse/cdt/autotools/internal/MakeTargetManager.java: Expose
+	projectTargetMap to inheriting classes.
+
+2007-02-23  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 229891.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java (getMakeTargets):
+	Use Make Target info to find the real build target which may have been set by the
+	Build Special Targets action.
+	(build): Set up the IMakeBuildInfo needed to fetch Make Target from.
+
+2007-02-22  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeMessages.properties: Fix a few
+	typos.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentSetupParticipant.java (setup):
+	Use IDocumentExtension3 version of setDocumentParitioner if document is an instance of
+	IDocumentExtension3.
+
+2007-02-22  Andrew Overholt  <overholt@redhat.com>
+
+	* icons/automake.gif: New craptacular icon for automake editor.
+	* icons/autoconf.gif: Another manifestation of my poor artistic skills.
+	* plugin.xml: Use new icons.
+
+2007-02-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 229893.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Switch
+	to superclass TextFileDocumentProvider instead of FileDocumentProvider so as to fix
+	undo support.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentSetupParticipant.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.properties:  Fix typo.
+	* plugin.xml: Add extension for document setup that ties document setup for configuration
+	files to AutoconfDocumentSetupParticipant.
+
+2007-02-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java (findDelimeter): Ignore
+	escaped character.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitionScanner.java (AutoconfPartitionScanner):
+	Add escape character for # format comment and eat "\#" as character.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java (AutoconfCodeScanner):
+	Ditto.
+	* plugin.xml: Update release to 0.0.8.
+
+2007-02-20  Andrew Overholt  <overholt@redhat.com>
+
+	Patch from Jordy Potman
+	http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=229352
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java
+	(AutomakefileSourceConfiguration): Update super constructor call to reflect
+	change in CDT 3.1.2.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java
+	(initializeEditor): Likewise.
+
+2007-02-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElement.java: New class.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElifElement: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElseElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfIfElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfRootElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfWhileElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfCaseElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfForElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfCaseConditionElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java (AutoconfCodeScanner):
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java: New class to
+	do Autoconf file parsing and error marking.
+	Add AutoconfIdentifierRule and InlineDataRule.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java (createDocument):
+	Changed to use new AutoconfErrorHandler interface.
+	(documentAboutToBeChanged): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfErrorHandler.java (removeExistingMarkers):
+	Add verification that file exists.
+	(removeAllExistingMarkers): Ditto.
+	(handleError): Ditto.
+	(getCharOffset): Reformatted.
+	(AutoconfErrorHandler): Change constructor to take an IStorageEditorInput rather than
+	an IFile.  This allows external files to be edited without error handling.
+	* src/com/redhat/eclipse/cdt/autotools/editors/AutoconfEditorMessages.properties: New messages
+	added for outline parsing.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitionScanner.java (AutoconfPartitionScanner):
+	Use new AutoconfIdentifierRule.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java (getPresentationReconciler):
+	Change default partition to use MultilineRuleDamagerRepairer.
+	(getReconciler): New method.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java (createPresentation):
+	Change to use new AutoconfErrorHandler constructor.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroParser.java (AutoconfMacroParser): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java (doSetInput): New.
+	(getInputDocument): Ditto.
+	(getRootElement): Ditto.
+	(getAutoconfParser): Ditto.
+	(getAdapter): Ditto.
+	(InformationProvider): Ditto.
+	(getOutlinePage): Ditto.
+	(setRootElement): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfContentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfIdentifierRule.java: New class to
+	prevent matches of other strings that happen to be inside common identifiers.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/InlineDataRule.java: New class to
+	recognize inline data files.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/MultilineRuleDamagerRepairer.java: New class
+	to handle damage/repair when multiline rules are used.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfReconciliingStrategy.java: New class
+	for delayed document-change parsing.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/AutotoolsPluginImages.java: New class
+	to handle image repository.
+	* icons/etool16/acmacro_obj.gif: New image for Autoconf outline view.
+	* icons/etool16/ammacro_obj.gif: Ditto.
+	* icons/etool16/case_obj.gif: Ditto.
+	* icons/etool16/condition_obj.gif: Ditto.
+	* icons/etool16/elif_obj.gif: Ditto.
+	* icons/etool16/for_obj.gif: Ditto.
+	* icons/etool16/if_obj.gif: Ditto.
+	* icons/etool16/while_obj.gif: Ditto.
+	* plugin.xml: Add new error marker extension for outline view.
+
+2007-02-02  Andrew Overholt  <overholt@redhat.com>
+
+	* cdtpatches/README: Fix CVS location of managedbuilder.
+
+2007-02-02  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeCompletionProcessor.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java (getBuiltins):
+	Add $<, $@, and $?.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java
+	(getContentAssistant): Make use of AutomakeCompletionProcessor.
+
+2007-01-31  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* cdtpatches/cdt.ui.buildconsole.patch: New file that contains the
+	3.1.1 version of the patch for Bugzilla 153816 which adds multiple
+	build console support to CDT 4.0.
+	* cdtpatches/cdt.ui.patch: Altered to remove any build console patches.
+	* cdtpatches/README: Updated to include the new patch.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/CConfigureConsole.java (CConfigureConsole):
+	Modified to use new CUIPlugin build console manager interface.
+
+2007-01-31  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeErrorHandler.java: New class.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Remove unnecessary import.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java
+	(connect): New method.  Update error markers at document load time.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java
+	(reconcile): Update error markers.
+	(AutomakefileReconcilingStrategy): Set class-wide variables.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java
+	(getAutomakeErrorHandler): New method.
+
+2007-01-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 224644.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java (getMakeTargets):
+	Don't add "clean" for fullbuild anymore.  It causes unnecessary extra building to occur.
+	(build): Set a flag that build was called.
+	(clean): Only clean if this method is called directly and via a call to build method.
+	Clean by doing a make clean rather than calling super.clean.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (runCommand): When an
+	error occurs in configure, we want to set the status of the project to "needs rebuild".
+	(getConfigSettingsPath): New method to generate name of config settings file.
+	(saveConfigArgs): Use new getConfigSettingsPath method.
+	(regenerateMakefiles): Ditto, when checking if config options have changed.
+	(autogenExists): Clean up unused variables.
+	(getMakefileName): Return "Makefile" instead of "makefile".
+
+2007-01-22  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java:
+	Update copyright.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeIfElse.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileUtil.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java
+	(getAutomakeSourceViewer): New method. Update copyright.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java:
+	Update copyright.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeTextHover.java
+	(getHoverInfo): Remove debugging println. Update copyright.
+
+2007-01-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 214624.
+	* src/com/redhat/eclipse/cdt/autotools/internal/MarkerGenerator.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (runCommand): Add check
+	for return code being 0 or 1 to reveal whether command ran correctly.
+	(regenerateMakefiles): Add boolean checking for runCmd calls and also quit
+	if runCmd fails.  For autogen.sh cases, check if configure is run by autogen.sh
+	and don't bother calling configure afterwards if true.  Add error checking to
+	ensure a second command is not run if the first fails.
+	(PathVar): New private class.
+	(autogenExists): Fixed to take a path parameter to fill in.  It also looks for
+	any file that ends in autogen.sh to handle projects like Gnome.
+	* Resources.properties: Add new messages used by MakeGenerator.
+	* cdtpatches/managedbuilder.core.patch: New patch to cause ManagedMake build
+	to stop if an error occurs generating Makefile.
+	* cdtpatches/README: Add details on how to install new patch.
+
+2007-01-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroParser.java: New code
+	to parse an Autoconf macro.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java (createPresentation):
+	Use new AutoconfMacroParser.parse method instead of embedding the code.  Remove
+	all corresponding parse methods.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java (documentAboutToBeChanged):
+	Add checks for whether we should remove the error markers in an autoconf_macro
+	partition.
+
+2007-01-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* about.html: New EPL license file.
+
+2007-01-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/ParseException.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfErrorHandler.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfPrototype.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfAnnotationHover.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java: Add
+	copyright info.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfColorProvider.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Ditto.
+	(createDocument): New method.
+	(documentChanged): Ditto.
+	(documentAboutToBeChanged): Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfKeywordDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfM4WordDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroPartitionRule.java : Ditto.
+	(matchParentheses): Fix up logic.
+	(evaluate):
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroWordDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitioner.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitionScanner.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java: Ditto.
+	(getPresentationReconciler): Use AutoconfMacroDamagerRepairer for macro partition.
+	(getAnnotationHover): New method.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfWhitespaceDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfWordDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/IAutotoolEditorActionDefinitionIds.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/IAutotoolHelpContextIds.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/RecursiveSingleLineRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions/GetDefinedSymbolsAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions/GetIncludePathAction.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java: Ditto.
+	(getIndexedInfo): New method.
+	(getPrototype): Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/HoverMessages.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeWordDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAclocalAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutoconfAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutomakeAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeMessages.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/TwoInputDialog.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfoProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java: Ditto.
+
+2007-01-12  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeTextHover.java: New class.  Hover help provider for automake editor.
+	(getHoverControlCreator): New method.  Return null for now.
+	(AutomakeTextHover): New method.
+	(getHoverRegion): New method.  Return an IRegion from an offset in the document.
+	(findWord): New method.  Return an IRegion of the hover region.
+	(getHoverInfo): New method.  Return the hover information for a particular region.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java (getTextHover): New method.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java (getDirectiveContainingLine): Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java (getMakefile): Likewise.
+
+2007-01-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Revert
+	to version 1.2 prior to 2006-11-27.  This reversion is required because the previous
+	fix causes a regression in autoconf partitioning.
+
+2007-01-08  Andrew Overholt  <overholt@redhat.com>
+
+ 	* libhoverdocs/acmacros.xml: Add PKG_* macros from pkgconfig.
+
+2007-01-05  Andrew Overholt  <overholt@redhat.com>
+
+ 	* libhoverdocs/acmacros.xml: Add AM_* macros from automake's Public-macros.html.
+
+2007-01-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (regenerateMakefiles):
+	Add check for Makefile.cvs ahead of configure check.  Use resource strings
+	for runCommand descriptions.
+	(makefileCvsExists): New internal method.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new
+	resource strings.
+
+2007-01-02  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java
+	(automaticVariables): New $<, etc. variables.
+	(createRules): Add automatic variables as keywords. Also add @AC_SUBST_VAR@
+	highlighting.
+	(nextToken): New method.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java
+	(getDocument): New method.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeWordDetector.java:
+	New file.
+
+2006-12-15  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java
+	(getAutomakeCodeScanner): New method.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java
+	(getAutomakeSourceViewerConfiguration): Likewise.
+	(getAutomakefileDocumentProvider): Likewise
+	(initializeEditor): Set up field variables.
+
+2006-12-12  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add package visibility for tests.
+	* plugin.xml: Add filename associations for AutomakeEditor.
+
+2006-12-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* MANIFEST.MF: Update release to 0.0.6.
+
+2006-12-11  Kyu Lee  <klee@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/TwoInputDialog.java: New class
+	for getting 2 text field inputs.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeMessages.java: New class
+	for NLS strings.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutomakeAction.java: New
+	class for handling invoke automake.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutoconfAction.java: New
+	class for handling invoke autoconf.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAction.java: New super
+	class for invoking autotools classes.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAclocalAction.java: New
+	class for handling invoke aclocal.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeMessages.properties:
+	Property file for NLS strings.
+	* plugin.xml: Added menu options for invoking autotools under project menu.
+
+2006-12-11  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java
+	(getWorkingCopyManager): New method.
+	(getAutomakefileDocumentProvider): Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java
+	(initializeEditor): New method.
+	(getAutomakeOutlinePage): Likewise.
+	(createPartControl): Likewise.
+	(getAdapter): Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeMacroReferenceRule.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeMacroDefinitionRule.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeIfElse.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileUtil.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java:
+	Likewise.
+
+2006-12-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizard.java
+	(setCurrentProject): Make protected to allow subclasses to use.
+	* MANIFEST.MF: Export org.eclipse.linuxtools.cdt.autotools.wizards classes to the
+	autotools.tests plug-in.
+
+2006-12-01  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake: New directory.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java: New
+	file. Simple extension of MakefileEditor for now.
+	* plugin.xml: Add automake editor.
+
+2006-11-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Add .m4 file support to the Autoconf editor.
+
+2006-11-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java
+	(performRevert): Method copied from CDT and JDT editors.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java:
+	Change base class to be TextFileDocumentProvider. This means no longer providing
+	a createDocument() method.
+	(createDocument): Deleted.
+	(AutoconfStorageDocumentProvider.AutoconfStorageDocumentProvider): New internal
+	class based on StorageDocumentProvider.
+	(AutoconfStorageDocumentProvider.setupDocument): New method of internal class.
+	(AutoconfDocumentProvider): New constructor which sets up a
+	TextFileDocumentProvider that takes the internal AutoconfStorageDocumentProvider
+	class as parent DocumentProvider. This emulates what the CDT CEditor does and is
+	done to provide proper edit reversion support.
+
+2006-11-22  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/IAutotoolHelpContextIds.java:
+	Add CONTENT_ASSIST string.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java
+	(getContentAssistant): New routine to add content assist support.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java
+	(createActions): Add action for content assist.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java
+	(getIndexedInfo):
+	(getInformationControlCreator): New method.
+	(getTooltipAffordanceString): Make static.
+	(init): Ditto.
+	(getIndexedInfo): Ditto plus add call to init.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java:
+	New class for macro content assist.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroParameterListValidator.java:
+	New class for content assist to help with macro call parameters.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroProposalContextInformation.java:
+	New file for parameter context assist information.
+
+2006-11-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitionScanner.java
+	(AutoconfPartitionScanner): Change partitions to be comments, macros, and
+	default.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java
+	(getPresentationReconciler): Change to match new paritioning. Use a special new
+	MultiLineDamagerRepairer for macros.
+	(getConfiguredContentTypes): Change to list of new partitions.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java
+	(createPartControl): Specify new AUTOCONF_MACRO partition.
+	(InformationDispatchAction.makeAnnotationHoverFocusable): Ditto.
+	(InformationDispatchAction.makeTextHoverFocusable): Ditto.
+	(getAutoconfInlineCodeScanner, getAutoconfStringScanner): Removed.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfInlineCodeScanner.java:
+	Removed.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSectionRule.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfStringScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java
+	(AutoconfCodeScanner): Change rules to add a recursive single line rule for
+	strings and a multiline rule for inlined code. Also add a rule to discover m4
+	macros.
+	* src/com/redhat/eclipse.cdt/autotools/ui/editors/AutoconfM4WordDetector.java:
+	New file.
+	* src/com/redhat/eclipse.cdt/autotools/ui/editors/AutoconfMacroPartitionRule.java:
+	Ditto.
+	* src/com/redhat/eclipse.cdt/autotools/ui/editors/MultiLineDamagerRepairer.java:
+	Ditto.
+	* src/com/redhat/eclipse.cdt/autotools/ui/editors/RecursiveSingleLineRule.java:
+	Ditto.
+
+2006-10-31  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java
+	(init): Turn off parser validation.
+	* libhoverdocs/acmacros.xml: Update including m4 macros.
+
+2006-10-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java:
+	Remove unneeded import.
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java
+	(getLibHoverDocs): Specify no xml validation since there may be duplicate
+	function ids due to multiple standard definitions used in glibc.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java
+	(getTextHover): New method to add text hover for autoconf editor.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitioner.java
+	(connect): Remove calls to print debug messages.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java
+	(isFoldingEnabled):
+	(InformationDispatchAction.InformationDispatchAction): New for scrollable
+	tooltip support.
+	(createPartControl): Ditto.
+	(fProjectionModelUpdater): Ditto.
+	(InformationProvider.getInformation): Ditto.
+	(InformationDispatchAction): Ditto.
+	(initializeKeyBindingScopes): Ditto.
+	(InformationDispatchAction.makeTextHoverFocusable): Ditto.
+	(InformationProvider.getInformation2): Ditto.
+	(InformationProvider): Ditto.
+	(InformationDispatchAction.computeOffsetAtLocation): Ditto.
+	(fInformationPresenter): Ditto.
+	(.createInformationControl): Ditto.
+	(InformationProvider.getInformationPresenterControlCreator): Ditto.
+	(createActions): Ditto.
+	(InformationDispatchAction..createInformationControl): Ditto.
+	(InformationDispatchAction.run): Ditto.
+	(InformationDispatchAction.fTextOperationAction): Ditto.
+	(InformationDispatchAction.makeAnnotationHoverFocusable): Ditto.
+	(fProjectionSupport): Ditto.
+	(InformationProvider.getSubject): Ditto.
+	(InformationProvider.InformationProvider): Ditto.
+	* src/libhoverdocs/acmacros.xml: New file containing autoconf hover help.
+	* src/libhoverdocs/glibc.xml: Updated.
+	* src/libhoverdocs/LIBHOVERDOCS.LICENSE: New file with licensing info.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/IAutotoolEditorActionDefinitionIds.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editoros/IAutotoolHelpContextIds.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/HoverMessages.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/HoverMessages.properties:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/HTML2TextReader.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/HTMLPrinter.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/HTMLTextPresenter.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/LineBreakingReader.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/SingleCharReader.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/SubstitutionTextReader.java:
+	Ditto.
+	* plugin.xml: Fix autoconf editor to look for configure.in or configure.ac. Add
+	hover help for autoconf editor and set up F2 key binding for scrollable tooltips.
+	* plugin.properties: Add autoconf editor strings.
+
+2006-10-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java: New
+	file.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfWordDetector.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfWhitespaceDetector.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfStringScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSectionRule.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitionScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitioner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroWordDetector.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfKeywordDetector.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfInlineCodeScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfColorProvider.java:
+	Ditto.
+	* plugin.properties: Add Autoconf editor name.
+	* plugin.xml: Add Autoconf editor.
+
+2006-10-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 209161.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(initializeBuildConfigDirs): New method.
+	(initialize): Call initializeBuildConfigDirs().
+	(regenerateMakefiles): Ditto if configuration parameters have changed.
+	(createDirectory): Return project path if input directory is empty string or
+	".".
+
+2006-09-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* build.properties: Update so plugin.properties built into binary.
+	* build.xml: New file.
+
+2006-09-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Bump up release number to 0.0.5.
+
+2006-09-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 206719
+	* plugin.xml: Comment out deprecated ManagedBuildInfo extension and replace with
+	new org.eclipse.cdt.managedbuilder.core.buildDefinitions extension point.
+	* plugin.properties: Add new strings from new build definition.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/CProjectPlatformPage.java
+	(CProjectPlatformPage): Fix project type reference to refer to new project type
+	id in build definition.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(initialize): Switch over to new option ids in new build definition.
+	(getConfigArgs): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java
+	(getCompilationString): Don't bother if input resource isn't a file.
+	(buildFile): Fix how build directory is fetched to work with new build
+	definition.
+	(AutotoolsScannerInfo): Save the original resource reference.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
+	(AUTOTOOLS_CONFIG_ID): Change to match new build definition.
+
+2006-09-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 206359
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java
+	(verifyScannerInfoProvider): New method to check ScannerInfoProvider and set it
+	only if necessary.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
+	(hasTargetBuilder): Call verifyScannerInfoProvider instead of
+	setScannerInfoProvider to prevent changing the project file every time the
+	hasTargetBuilder check is made.
+
+2006-09-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 206164.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java
+	(followIncludeChain): Follow the session property as far as possible. When it
+	ends try looking for the new OPEN_INCLUDE_P persistent property to re-establish
+	the chain.
+	(createIncludeChain): Set a new persistent property OPEN_INCLUDE_P that is the
+	location of the resource.
+
+2006-09-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* cdtpatches/cdt.ui.patch: Update patch to include defined symbol hover help.
+
+2006-09-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java
+	(getDefinedSymbols): Prepare code for failure to get compilation string.
+
+2006-09-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* cdtpatches/README: New file to instruct how to apply patches to the CDT.
+	* cdtpatches/cdt.core.patch: Patch for org.eclipse.cdt.core.
+	* cdtpatches/cdt.ui.patch: Patch for org.eclipse.cdt.ui.
+
+2006-08-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Replace DynamicScannerInfo extension hack with existing CDT
+	ScannerInfoProvider extension. Change version to 0.0.4.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/CConfigureConsole.java
+	(CConfigureConsole): Use new getSubConsoleManager method of CUIPlugin.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsole.java: No
+	longer needed, so removed.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleDocument.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleManager.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsolePage.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsolePartition.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsolePartitioner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleStream.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleViewer.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConsoleEvent.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConsoleOutputTextStore.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ScrollLockAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java
+	(convertProject): Set scanner info provider for project.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfoProvider.java: Extend
+	AbstractCExtension.
+	(getScannerInformation): Call AutotoolsScannerInfo.followIncludeChain method to
+	get real underlying resource to get dynamic build info from.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java: Implement new
+	interface IScannerInfoPlus.
+	(followIncludeChain): New method to adhere to new interface.
+	(createIncludeChain): New method.
+	(getDefinedSymbols): Add defined symbols found by ManagedBuildManager.
+	(getIncludePaths): Append include path found by ManagedBuildManager.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java
+	(setScannerInfoProvider): New method.
+	(getConsoleManager): Removed.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java:
+	(hasTargetBuilder): Replace the default scanner provider for Managed Make
+	projects with AutotoolsScannerInfoProvider.
+
+2006-08-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java
+	(run): If there are no targets yet
+	(i.e. no makefile), try and regenerate the makefile.* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (getConfigArgs):
+	Make sure there is an "other" string to process rather than adding an empty
+	argument.
+
+2006-08-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(regenerateMakefiles): Add logic to check if the configuration arguments have
+	changed since the last configuration and reconfigure if they have.
+	(saveConfigArgs): New method.
+
+2006-08-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
+	(addAutotoolsBuilder): Check for ManagedMake's genmakebuilder and remove if
+	found.
+	(hasTargetBuilder): Look for Autotools default configuration and if found, add
+	the Autotools Makefile builder.
+
+2006-07-31  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java
+	(getLibHoverDocs): New method which replaces buildDocPath and fetches libhover
+	base data file from the plugin's jar.
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java
+	(buildDocPath): Replaced by getLibHoverDocs. Change all callers.
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java
+	(getDocument): Removed.
+
+2006-07-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Remove unused sample extensions.
+	* src/com/redhat/eclipse/cdt/autotools/editors/*: Remove all files.
+	* src/com/redhat/eclipse/cdt/autotools/preferences/*: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/properties/*: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/views/*: Ditto.
+
+2006-07-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Update release.
+	* META-INF/MANIFEST.MF: Export libhoverdocs.
+
+2006-07-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Update release.
+
+2006-07-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
+	(getMakeTargets): Use IMakeBuildInfo.BUILD_TARGET_INCREMENTAL instead of
+	IMakeBuildInfo.BUILD_TARGET_FULL which is now obsoleted and not set by the
+	MakeTargets.
+	(clean): Ditto.
+
+2006-07-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Add new "other" option which allows the end-user to specify any
+	configuration option manually.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(getConfigArgs): New function to get configure arguments from preferences.
+	(runCommand): Change prototype to take an argument array.
+	(regenerateMakefiles): Only when running full configure, pass args to runCommand
+	and get these from getConfigArgs method.
+
+2006-07-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java
+	(getCompilationString): Don't use previous compilation string if we have marked
+	the scanner info as dirty.
+	(getIncludePaths): Don't continue processing if the compilation string is null.
+
+2006-06-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions/GetDefinedSymbolsAction.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java
+	(getDefinedSymbols): Fill in function details to fetch flags used in dynamic
+	compilation info.
+	(getCompilationString): New function to get and save the actual compilation
+	string from the make invocation.
+	(getIncludePaths): Move logic into getCompilationString.
+	(compilationString): New field to store compilation string.
+	(definedSymbols): New field to store map of defined symbols.
+	* plugin.xml: Add defined symbols menu item.
+
+2006-06-20  jjohnstn  <jjohnstn@toy.toronto.redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions/GetIncludePathAction.java:
+	Remove unused imports.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeUIImages.java: New class
+	copied from Std Make internal packages to local internal package.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MessageLine.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeUIPlugin.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeResources.properties: New
+	properties message file used by MakeUIPlugin.
+	* src/com/redhat/eclipse/cdt/autotools/actions/TargetListViewerPart.java: Use
+	Autotools StructureViewPart instead of internal one from Std Make plugin.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeTargetDialog.java: Use new
+	Autotools internal classes rather than internal ones from Std Make plugin.
+	* src/com/redhat/eclipse/cdt/autotools/actions/AbstractTargetAction.java
+	(getShell): Use new AutotoolsPlugin getActiveWorkbenchShell method instead of
+	the one in internal MakeUIPlugin.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java: Remove
+	unused imports.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java
+	(getActiveWorkbenchShell): New method.
+
+2006-06-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Add dependency on org.eclipse.core.variables.
+	* src/com/redhat/eclipse/cdt/autotools/internal/MakeTargetManager: New internal
+	class copied from Std Make projects.
+	* src/com/redhat/eclipse/cdt/autotools/internal/MakeTarget: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ProjectTargets: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/MakeMessages: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakeTargetManager: Base on local
+	internal MakeTargetManager class rather than unpublished Std Make internal class.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator: Remove reference to Std
+	Make MakeMessages internal class.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new message
+	about invoking make for the project.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java
+	(getFormattedString): New method to get resource string with arguments.
+
+2006-06-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Added "org.eclipse.cdt.core.DynamicScannerInfoProvider" extension.
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions/GetIncludePathAction.java
+	(run): Altered to use new AutotoolsScannerInfo class.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfoProvider.java: New
+	class used to hook up to added extension point:
+	org.eclipse.cdt.core.DynamicScannerInfoProvider.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java: New file based
+	on AutotoolsMakefileMiner.java. Class implements IScannerInfo interface.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileMiner.java: Transformed
+	into AutotoolsScannerInfo.java.
+
+2006-06-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions/GetIncludePathAction.java:
+	Fix up imports.
+
+2006-06-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Make provider Red Hat.
+
+2006-06-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileMiner.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions: GetIncludePathAction.java:
+	Ditto.
+	* plugin.xml: Add extensions to create menu for source files that will grab the
+	dynamic include path for the build and display it in a message dialog. This is
+	just a temporary test.
+
+2006-05-19  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java
+	(run): Create our target selection dialog in-line. Make this dialog have a
+	filter for selection of make target.
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildTargetDialog.java: Remove:
+	no longer necessary.
+
+2006-05-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
+	(clean): Overriding method to check for MakeTargets in which case we don't want
+	to clean out directory.
+	* plugin.xml: Remove unneeded extension.
+
+2006-04-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java
+	(getHref): Change to reference the glibc book rather than the Gnu help.
+
+2006-04-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java: New file based on Chris
+	Moller's hover help, using ICHelpProvider interface.
+	* plugin.xml: Add CHelpProvider extension to supply hover help.
+	* libhoverdocs/glibc.xml: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutoconfPlugin.java: Refactored.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java: Refactored from
+	AutoconfPlugin.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/CConfigureConsole.java:
+	Refactor AutoconfPlugin to AutotoolsPlugin.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/CProjectPlatformPage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizard.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/preferences/PreferenceInitializer.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/TargetListViewerPart.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeTargetDialog.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeContentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildTargetDialog.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java: Ditto.
+
+2006-04-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Remove toc extension since we have moved docs to a separate
+	plug-in.
+	* getdocs.sh: Moved to autotools-doc plugin.
+	* doc.zip: Ditto.
+	* toc.xml: Ditto.
+	* testToc.xml: Removed.
+
+2006-04-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* toc.xml: Add references for Gnu Tools documents.
+	* doc.zip: New file containing zipped up html files for Gnu tools.
+	* getdocs.sh: Shell script to get html files from the web and build doc.zip.
+	* plugin.xml: Connect toc extension to toc.xml so that Gnu tools help is
+	provided with Autotools plugin.
+
+2006-03-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutoconfPlugin.java
+	(getConsoleManager): New method.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(runCommand): Specify the Autotools configure console to use for configuration
+	output.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/CConfigureConsole.java: New
+	file stodified from ManagedBuild Project internal directory.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleDocument.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleManager.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsolePage.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsolePartitioner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsolePartition.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleStream.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleViewer.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsole.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConsoleEvent.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConsoleMessages.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConsoleMessages.properties:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ScrollLockAction.java: Ditto.
+	* plugin.xml: Set up CBuildConsole extension to be CConfigureConsole.
+
+2006-03-15  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(addMakeTargetsToManager): New method.
+	(regenerateMakefiles): Call addMakeTargetsToManager after Makefile is generated.
+
+2006-03-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectOptionPage.java
+	(getProject): If dealing with a ConvertToAutotoolsProjectWizard, use it's
+	getProject method.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizard.java
+	(setCurrentProject): New method.
+	(applyOptions): Change prototype to accept project as input. Call
+	setCurrentProject method using the project variable before getting the optionPage
+	to performApply.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java
+	(applyOptions): Add project as input variable and pass this on call.
+	(convertProject): Pass project when calling applyOptions method.
+
+2006-03-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
+	(getMakeTargets): When doing a full build, we don't want to do a "clean" if the
+	target is not "all".
+
+2006-03-09  Andrew Overholt  <overholt@redhat.com>
+
+	* .cvsignore: Initial checkin. Ignore bin.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(regenerateMakefiles): Rename CONFIG_STATUS_NAME to CONFIG_STATUS. Call
+	autogen.sh first if configure does not exist.
+	(configureExists): New method.
+	(autogenExists): New method.
+	(runCommand): New method. Run configure or autogen and report success.
+	* plugin.properties: Change "CVS Autotools" to Autotools.
+	* plugin.xml: Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectWizard.java
+	(NewAutotoolsProjectWizard): Likewise.
+
+2006-03-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Set up default gcc scanner in our ManagedMakeProject target
+	extension -
+	org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java
+	(convertProject): Remove commented code about setting ScannerConfig as we now
+	set the default GCC scanner collector in our ManagedMakeProject extension.
+
+2006-03-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutoconfPlugin.java
+	(ftargetManager): New field.
+	(getUniqueIdentifier): New method.
+	(getTargetManager): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java: New
+	builder that extends ManagedMakeProject's GeneratedMakefileBuilder and allows us
+	to override behavior.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakeTargetManager.java: New
+	class that extends a Std MakeProject's MakeTargetManager and allows us to
+	override behavior.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: New strings added
+	to support BuildSpecial functionality.
+	* src/com/redhat/eclipse/cdt/autotools/AbstractTargetAction.java: New file based
+	on Std MakeProject class.
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java: Rewritten to
+	extend AbstractTargetAction and to create a dialog rather than print out hello
+	world.
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildTargetDialog.java: New file
+	that implements the Build Special Targets dialog. Based on a Std Make Project's
+	BuildTargetDialog.
+	* src/com/redhat/eclipse/cdt/autotools/actions/CheckboxTablePart.java: New file
+	to support new dialogs.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeContentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeTargetDialog.java: New file
+	that implements the Make Target dialog allowing management of make targets. Based
+	on Std Make Project's MakeTargetDialog.
+	* src/com/redhat/eclipse/cdt/autotools/actions/SharedPartWithButtons.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/StructuredViewerPart.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/TargetListViewerPart.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java:
+	Instead of adding a ManagedProject builder, add our new AutotoolsMakefileBuilder.
+	* plugin.xml: Add our new AutotoolsMakefileBuilder as an official builder.
+
+2006-02-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java: Remove some warnings.
+	* plugin.xml: Fix duplicate target configuration options and re-add in --build
+	option.
+
+2006-02-23  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* Initial import.
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/META-INF/MANIFEST.MF b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..a7069db
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/META-INF/MANIFEST.MF
@@ -0,0 +1,32 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name.0
+Bundle-SymbolicName: org.eclipse.linuxtools.cdt.autotools.core;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.ui;bundle-version="3.4.0",
+ org.eclipse.core.runtime;bundle-version="3.4.0",
+ org.eclipse.jface.text;bundle-version="3.4.0",
+ org.eclipse.ui.editors;bundle-version="3.4.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.4.0",
+ org.eclipse.core.resources;bundle-version="3.4.0",
+ org.eclipse.ui.ide;bundle-version="3.4.0",
+ org.eclipse.cdt.managedbuilder.core;bundle-version="5.0.100",
+ org.eclipse.cdt.core;bundle-version="5.1.0",
+ org.eclipse.cdt.ui;bundle-version="5.1.0",
+ org.eclipse.cdt.managedbuilder.ui;bundle-version="5.0.100",
+ org.eclipse.cdt.managedbuilder.gnu.ui;bundle-version="5.0.100",
+ org.eclipse.cdt.make.core;bundle-version="5.1.0",
+ org.eclipse.cdt.make.ui;bundle-version="5.0.100",
+ org.eclipse.ui.console;bundle-version="3.3.0",
+ org.eclipse.help;bundle-version="3.3.100",
+ org.eclipse.core.variables;bundle-version="3.2.100",
+ org.eclipse.ui.views;bundle-version="3.3.0",
+ org.eclipse.core.filesystem;bundle-version="1.2.0"
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %provider
+Export-Package: org.eclipse.linuxtools.cdt.autotools.core;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests,org.eclipse.linuxtools.cdt.autotools.ui",
+ org.eclipse.linuxtools.internal.cdt.autotools.core;x-friends:="org.eclipse.linuxtools.cdt.autotools.ui,org.eclipse.linuxtools.cdt.autotools.tests",
+ org.eclipse.linuxtools.internal.cdt.autotools.core.configure;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests,org.eclipse.linuxtools.cdt.autotools.ui"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/about.html b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/about.html
new file mode 100644
index 0000000..44e2290
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

+<html>

+<head>

+<title>About</title>

+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>8th September, 2004</p>	

+<h3>License</h3>

+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<h3>Contributions</h3>

+

+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise

+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such

+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or

+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the

+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available

+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also

+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+</body>

+</html>
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/build.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/build.properties
new file mode 100644
index 0000000..7cbd1d3
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/build.properties
@@ -0,0 +1,7 @@
+source.. = src/
+output.. = bin/
+bin.includes = plugin.xml,\
+               META-INF/,\
+               .,\
+               html/,\
+               plugin.properties
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/html/maintopic.html b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/html/maintopic.html
new file mode 100644
index 0000000..a476078
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/html/maintopic.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Main Topic</title>
+</head>
+
+<body>
+<h1>Main Topic</h1>
+Please enter your text here.
+</body>
+</html>
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/html/subtopic.html b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/html/subtopic.html
new file mode 100644
index 0000000..8a61c50
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/html/subtopic.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Sub Topic</title>
+</head>
+
+<body>
+<h1>Sub Topic</h1>
+Please enter your text here.
+</body>
+</html>
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/html/toc.html b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/html/toc.html
new file mode 100644
index 0000000..326f0a9
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/html/toc.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Table of Contents</title>
+</head>
+
+<body>
+<h1>Table of Contents</h1>
+Please enter your text here.
+</body>
+</html>
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/plugin.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/plugin.properties
new file mode 100644
index 0000000..5eeed01
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/plugin.properties
@@ -0,0 +1,177 @@
+#################################################################################
+#  Copyright (c) 2006, 2008, 2009 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+ConvertWizard.description=Convert to C/C++ Autotools Project
+NewCProject.description=GNU C Autotools Project
+NewCProjectV2.description=GNU C Autootols Project V2
+NewCCProject.description=GNU C++ Autotools Project
+NewCWizard.name=GNU C Autotools Project
+NewCWizardV2.name=GNU C Autotools Project V2
+NewCCWizard.name=GNU C++ Autotools Project
+
+Autotools.wizard.name=GNU Autotools Build Wizard
+
+Autoconf.editor.name=Autoconf Editor
+
+BuildProperty.value.name.default=Default;
+BuildProperty.type.name.autotools=GNU Autotools
+
+PreferenceAutotools.name=Autotools
+PreferenceAutomakeEditor.name=Automake Editor
+PreferenceAutoconfEditor.name=Autoconf Editor
+
+PropertyAutotools.name=Autotools
+PropertyAutotools.general.name=General
+PropertyAutotools.configure.name=Configure Settings
+PropertyTabEditor.name=Editors
+AutotoolsBuildPropertyTab.name=Behaviour
+AutotoolsEditorsPropertyTab.name=Editors
+AutotoolsToolsPropertyTab.name=Tools Settings
+AutotoolsConfigurePropertyTab.name=Configure Settings
+
+PropertyTabEditor.tooltip=Set options for Autotools-specific editors
+PropertyTabBuild.tooltip=Set additional Autotools build options
+
+Makefile.builder.name=Autotools Makefile Generator
+Autotools.projecttype.name=GNU Autotools
+AutotoolsNature.name=Autotools Project Nature
+AutotoolsNewNature.name=Autotools Project Nature V2
+Configuration.build.name=Build (GNU)
+Autotools.targetplatform.name=GNU Autotools Target Platform
+Autotools.gnu.toolchain.name=GNU Autotools Toolchain
+Configure.outputType=Configure Output (config.status)
+Autogen.outputType=Autogen Output (configure)
+
+CommandCategorySource.name=Source
+CommandCategorySource.description=Source commands
+CommandCategoryTools.name=Tools
+CommandCategoryTools.description=Autotool tools
+ShowTooltip.name=Show Tooltip Description
+ShowTooltip.description=Shows the tooltip description for the element at the cursor
+
+# Scope and Key Commands
+ACeditor.scope.name=Autoconf Editor
+ACeditor.scope.description=Editor for Autoconf Configuration Source Files
+
+Tool.configure=configure
+
+OptionCategory.configure.general=General
+Option.configure.name=Name
+Option.configure.builddir=Build directory
+Option.configure.builddir.tip=Subdirectory off of project where build will occur
+Option.configure.configdir=Configure tool directory
+Option.configure.configdir.tip=Subdirectory off of project containing configure scripts
+Option.configure.cache_file=Name of configuration cache file (--cache-file)
+Option.configure.cache_file.tip=Specify the name of the configuration cache file [config.cache]
+Option.configure.no_create=Turn off file creation <not advised> (--no-create)
+Option.configure.no_create.tip=This tells configuration not to generate the output files as part of configuration
+Option.configure.quiet=Turn off checking messages (--quiet)
+Option.configure.quiet.tip=This turns off "checking ..." style messages from the configuration console output
+Option.configure.help=Display help contents of top-level configuration (--help)
+Option.configure.help.tip=Ask configuration file to display its help documentation
+Option.configure.version=Display version of autotools used to create configuration (--version)
+Option.configure.version.tip=This outputs the version of the Autotools used to create the configuration files
+
+OptionCategory.configure.platform=Platform Specifiers
+Option.configure.host=Host platform (--host)
+Option.configure.host.tip=Platform that project will run on
+Option.configure.target=Target platform (--target)
+Option.configure.target.tip=Platform that project will target output for
+Option.configure.build=Build platform (--build)
+Option.configure.build.tip=Platform where project is being built
+
+OptionCategory.configure.directories=Directory specifiers
+Option.configure.prefix=Arch-independent install directory (--prefix)
+Option.configure.prefix.tip=Place where architecture-independent files are installed [/usr/local]
+Option.configure.exec_prefix=Arch-dependent install directory (--exec-prefix)
+Option.configure.exec_prefix.tip=Place where architecture-dependent files are installed [PREFIX]
+Option.configure.libdir=Object code library directory (--libdir)
+Option.configure.libdir.tip=Place where object code libraries are installed [EPREFIX/lib]
+Option.configure.bindir=User executable directory (--bindir)
+Option.configure.bindir.tip=Place where binary executables are installed [EPREFIX/bin]
+Option.configure.sbindir=System admin executable directory (--sbindir)
+Option.configure.sbindir.tip=Place where system admin executables are installed [EPREFIX/sbin]
+Option.configure.includedir=C Header file directory (--includdir)
+Option.configure.includedir.tip=Place where header files will be installed [PREFIX/include]
+Option.configure.datadir=Read-only architecture-independent data (--datadir)
+Option.configure.datadir.tip=Place where read-only architecture-independent data is installed [PREFIX/share]
+Option.configure.sysconfdir=Read-only single-machine data directory (--syconfdir)
+Option.configure.sysconfdir.tip=Place where read-only single-machine data is stored [PREFIX/etc]
+Option.configure.infodir=Info file documentation directory (--infodir)
+Option.configure.infodir.tip=Place where info files are installed [PREFIX/info]
+Option.configure.mandir=Man file documentation directory (--mandir)
+Option.configure.mandir.tip=Place where man file documentation is installed [PREFIX/man]
+Option.configure.srcdir=Sources directory (--srcdir)
+Option.configure.srcdir.tip=Place where configure can find sources [configure directory or ..]
+Option.configure.localstatedir=Modifiable single-machine data directory (--localstatedir)
+Option.configure.localstatedir.tip=Place where modifiable single-machine data is installed [PREFIX/var]
+Option.configure.sharedstatedir=Modifiable architecture-independent data directory (--sharedstatedir)
+Option.configure.sharedstatedir.tip=Place where modifiable architecture-independent data is installed [PREFIX/com}
+Option.configure.libexecdir=Program executable directory (--libexecdir)
+Option.configure.libexecdir=Place where program executables will be installed [EPREFIX/libexec]
+Option.configure.oldincludedir=Non-gcc C header file directory (--oldincludedir)
+Option.configure.oldincludedir.tip=Place where non-gcc C header files are installed [/usr/include]
+
+OptionCategory.configure.filenames=File-name transformations
+Option.configure.program_prefix=Installed program prefix (--program-prefix)
+Option.configure.program_prefix.tip=Prepend PREFIX to the beginning of installed program names
+Option.configure.program_suffix=Installed program suffix (--program-suffix)
+Option.configure.program_suffix.tip=Append SUFFIX to the end of installed program names
+Option.configure.program_transform_name=Installed program name transform (--program-transform-name)
+Option.configure.program_transform_name.tip=A sed string used to transform installed program names
+
+OptionCategory.configure.features=Features and packages
+Option.configure.enable_maintainer_mode=Enable maintainer mode (--enable-maintainer-mode)
+Option.configure.enable_maintainer_mode.tip=Specify this to have Makefiles generated with checks for Autotool configuration file changes
+Option.configure.user=User-specified configuration options
+Option.configure.user.tip=Specify one or more configuration options (e.g. --enable-FEATURE, --disable-FEATURE, or --with-PACKAGE)
+
+Tool.autogen = autogen.sh
+
+OptionCategory.autogen.general=Options
+Option.autogen.user=Command line options
+Option.autogen.user.tip=Specify options to pass to the top-level autogen.sh script
+
+RedHatVendor.name = Red Hat
+Bundle-Name.0 = Autotools Plug-in (Incubation)
+provider=Eclipse
+ConvertWizard.name = Convert to a C/C++ Autotools Project
+InvokeAutotools.label = Invoke Autotools
+InvokeAutotools.mnemonic = I
+InvokeAutoconf.label = Invoke Autoconf
+InvokeAutoconf.mnemonic = c
+InvokeAutoconf.description = Run autoconf in the selected directory
+InvokeAutoheader.label = Invoke Autoheader
+InvokeAutoheader.mnemonic = h
+InvokeAutoheader.description = Run autoheader from the selected directory
+InvokeAutomake.label = Invoke Automake
+InvokeAutomake.mnemonic = m
+InvokeAutomake.description = Run automake from the selected directory
+InvokeAutoreconf.label = Invoke Autoreconf
+InvokeAutoreconf.mnemonic = r
+InvokeAutoreconf.description = Run autoreconf from the selected directory
+InvokeAclocal.label = Invoke Aclocal
+InvokeAclocal.mnemonic = l
+InvokeAclocal.description = Run aclocal from the selected directory
+InvokeLibtoolize.label = Invoke Libtoolize
+InvokeLibtoolize.mnemonic = t
+InvokeLibtoolize.description = Run libtoolize in the selected directory
+Reconfigure.label = Reconfigure Project
+Reconfigure.mnemonic = f
+Reconfigure.description = Run configuration scripts for project
+DynamicBuild.label = Dynamic Build Info
+GetIncludePath.label = Get Include Path
+GetDefinedSymbols.label = Get Defined Symbols
+IncludesOption.name = includes
+SymbolsOption.name = symbols
+AutomakeEditor.name = AutomakeEditor
+Automake.name = automake
+ConfigureScript.name=Configure Script
+AutogenScript.name=Autogen Script
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/plugin.xml b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/plugin.xml
new file mode 100644
index 0000000..af9fbf5
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/plugin.xml
@@ -0,0 +1,517 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+     <extension
+           id="autotoolsProperties"
+           name="Autotools Build Properties"
+           point="org.eclipse.cdt.managedbuilder.core.buildProperties">
+           <propertyValue 
+              	property="org.eclipse.cdt.build.core.buildType" 
+              	id="org.eclipse.linuxtools.cdt.autotools.core.buildType.default" 
+              	name="%BuildProperty.value.name.default"/>
+           <propertyValue 
+            	property="org.eclipse.cdt.build.core.buildArtefactType" 
+            	id="org.eclipse.linuxtools.cdt.autotools.core.buildArtefactType.autotools" 
+            	name="%BuildProperty.type.name.autotools"/>
+     </extension>
+   <extension
+         id="cdt.autotools.core.managed.build.info"
+         name="Autotools Managed Build Info"
+         point="org.eclipse.cdt.managedbuilder.core.buildDefinitions">
+      <managedBuildRevision fileVersion="4.0.0"/>
+      <tool
+            command="configure"
+            id="org.eclipse.linuxtools.cdt.autotools.core.tool.configure"
+            isAbstract="false"
+            name="%Tool.configure"
+            natureFilter="both"
+            supportsManagedBuild="false">
+         <optionCategory
+               id="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.general"
+               name="%OptionCategory.configure.general"
+               owner="org.eclipse.linuxtools.cdt.autotools.core.tool.configure"/>
+         <option
+               applicabilityCalculator="org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsOptionValueHandler"
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.general"
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.name"
+               isAbstract="false"
+               name="%Option.configure.name"
+               resourceFilter="all"
+               valueHandler="org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsOptionValueHandler"
+               valueType="string">
+         </option>
+         <option
+               applicabilityCalculator="org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsOptionValueHandler"
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.general"
+               defaultValue="build"
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.builddir"
+               isAbstract="false"
+               name="%Option.configure.builddir"
+               resourceFilter="all"
+               tip="%Option.configure.builddir.tip"
+               valueHandler="org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsOptionValueHandler"
+               valueType="string"/>
+         <option
+               applicabilityCalculator="org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsOptionValueHandler"
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.general"
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.configdir"
+               isAbstract="false"
+               name="%Option.configure.configdir"
+               resourceFilter="all"
+               tip="%Option.configure.configdir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.general"
+               command="--cache-file="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.cache_file"
+               isAbstract="false"
+               name="%Option.configure.cache_file"
+               resourceFilter="all"
+               tip="%Option.configure.cache_file.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.general"
+               command="--help"
+               defaultValue="false"
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.help"
+               isAbstract="false"
+               name="%Option.configure.help"
+               resourceFilter="all"
+               tip="%Option.configure.help.tip"
+               valueType="boolean"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.general"
+               command="--no-create"
+               defaultValue="false"
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.no_create"
+               isAbstract="false"
+               name="%Option.configure.no_create"
+               resourceFilter="all"
+               tip="%Option.configure.no_create.tip"
+               valueType="boolean"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.general"
+               command="--quiet"
+               defaultValue="false"
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.quiet"
+               isAbstract="false"
+               name="%Option.configure.quiet"
+               resourceFilter="all"
+               tip="%Option.configure.quiet.tip"
+               valueType="boolean"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.general"
+               command="--version"
+               defaultValue="false"
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.version"
+               isAbstract="false"
+               name="%Option.configure.version"
+               resourceFilter="all"
+               tip="%Option.configure.version.tip"
+               valueType="boolean"/>
+         <optionCategory
+               id="org.eclipse.linuxtools.cdt.autotools.core.configure.optionCategory.configure.platform"
+               name="%OptionCategory.configure.platform"
+               owner="org.eclipse.linuxtools.cdt.autotools.core.tool.configure"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.configure.optionCategory.configure.platform"
+               command="--host="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.host"
+               isAbstract="false"
+               name="%Option.configure.host"
+               resourceFilter="all"
+               tip="%Option.configure.host.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.configure.optionCategory.configure.platform"
+               command="--target="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.target"
+               isAbstract="false"
+               name="%Option.configure.target"
+               resourceFilter="all"
+               tip="%Option.configure.target.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.configure.optionCategory.configure.platform"
+               command="--build="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.build"
+               isAbstract="false"
+               name="%Option.configure.build"
+               resourceFilter="all"
+               tip="%Option.configure.build.tip"
+               valueType="string"/>
+         <optionCategory
+               id="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               name="%OptionCategory.configure.directories"
+               owner="org.eclipse.linuxtools.cdt.autotools.core.tool.configure"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--prefix="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.prefix"
+               isAbstract="false"
+               name="%Option.configure.prefix"
+               resourceFilter="all"
+               tip="%Option.configure.prefix.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--exec-prefix="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.exec_prefix"
+               isAbstract="false"
+               name="%Option.configure.exec_prefix"
+               resourceFilter="all"
+               tip="%Option.configure.exec_prefix.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--libdir="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.libdir"
+               isAbstract="false"
+               name="%Option.configure.libdir"
+               resourceFilter="all"
+               tip="%Option.configure.libdir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--bindir="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.bindir"
+               isAbstract="false"
+               name="%Option.configure.bindir"
+               resourceFilter="all"
+               tip="%Option.configure.bindir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--sbindir="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.sbindir"
+               isAbstract="false"
+               name="%Option.configure.sbindir"
+               resourceFilter="all"
+               tip="%Option.configure.sbindir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--includedir="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.includedir"
+               isAbstract="false"
+               name="%Option.configure.includedir"
+               resourceFilter="all"
+               tip="%Option.configure.includedir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--datadir="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.datadir"
+               isAbstract="false"
+               name="%Option.configure.datadir"
+               resourceFilter="all"
+               tip="%Option.configure.datadir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--sysconfdir="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.sysconfdir"
+               isAbstract="false"
+               name="%Option.configure.sysconfdir"
+               resourceFilter="all"
+               tip="%Option.configure.sysconfdir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--infodir="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.infodir"
+               isAbstract="false"
+               name="%Option.configure.infodir"
+               resourceFilter="all"
+               tip="%Option.configure.infodir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--mandir="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.mandir"
+               isAbstract="false"
+               name="%Option.configure.mandir"
+               resourceFilter="all"
+               tip="%Option.configure.mandir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--srcdir="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.srcdir"
+               isAbstract="false"
+               name="%Option.configure.srcdir"
+               resourceFilter="all"
+               tip="%Option.configure.srcdir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--localstatedir="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.localstatedir"
+               isAbstract="false"
+               name="%Option.configure.localstatedir"
+               resourceFilter="all"
+               tip="%Option.configure.localstatedir"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--sharedstatedir="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.sharedstatedir"
+               isAbstract="false"
+               name="%Option.configure.sharedstatedir"
+               resourceFilter="all"
+               tip="%Option.configure.sharedstatedir"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--libexecdir="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.libexecdir"
+               isAbstract="false"
+               name="%Option.configure.libexecdir"
+               resourceFilter="all"
+               tip="%Option.configure.libexecdir"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--oldincludedir="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.oldincludedir"
+               isAbstract="false"
+               name="%Option.configure.oldincludedir"
+               resourceFilter="all"
+               tip="%Option.configure.oldincludedir.tip"
+               valueType="string"/>
+         <optionCategory
+               id="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.filenames"
+               name="%OptionCategory.configure.filenames"
+               owner="org.eclipse.linuxtools.cdt.autotools.core.tool.configure"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.filenames"
+               command="--program-prefix="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.program_prefix"
+               isAbstract="false"
+               name="%Option.configure.program_prefix"
+               resourceFilter="all"
+               tip="%Option.configure.program_prefix.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.filenames"
+               command="--program-suffix="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.program_suffix"
+               isAbstract="false"
+               name="%Option.configure.program_suffix"
+               resourceFilter="all"
+               tip="%Option.configure.program_suffix.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.filenames"
+               command="--program-transform-name="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.program_transform_name"
+               isAbstract="false"
+               name="%Option.configure.program_transform_name"
+               resourceFilter="all"
+               tip="%Option.configure.program_transform_name.tip"
+               valueType="string"/>
+         <optionCategory
+               id="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.features"
+               name="%OptionCategory.configure.features"
+               owner="org.eclipse.linuxtools.cdt.autotools.core.tool.configure"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.features"
+               command="--enable-maintainer-mode"
+               defaultValue="false"
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.enable_maintainer_mode"
+               isAbstract="false"
+               name="%Option.configure.enable_maintainer_mode"
+               resourceFilter="all"
+               tip="%Option.configure.enable_maintainer_mode.tip"
+               valueType="boolean"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.features"
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.user"
+               isAbstract="false"
+               name="%Option.configure.user"
+               resourceFilter="all"
+               tip="%Option.configure.user.tip"
+               valueType="string"/>
+         <outputType
+               id="org.eclipse.linuxtools.cdt.autotools.core.outputType.configure"
+               name="%Configure.outputType"
+               outputs="status"
+               primaryOutput="true"/>
+         <inputType
+               id="org.eclipse.linuxtools.cdt.autotools.core.inputType.configure"
+               multipleOfType="false"
+               sourceContentType="org.eclipse.linuxtools.cdt.autotools.core.configureScript">
+         </inputType>
+      </tool>
+      <tool
+            command="autogen.sh"
+            id="org.eclipse.linuxtools.cdt.autotools.core.tool.autogen"
+            isAbstract="false"
+            name="%Tool.autogen"
+            natureFilter="both"
+            supportsManagedBuild="false">
+         <optionCategory
+               id="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.autogen.general"
+               name="%OptionCategory.autogen.general"
+               owner="org.eclipse.linuxtools.cdt.autotools.core.tool.autogen">
+         </optionCategory>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.autogen.general"
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.autogen.user"
+               isAbstract="false"
+               name="%Option.autogen.user"
+               resourceFilter="all"
+               tip="%Option.autogen.user.tip"
+               valueType="string">
+         </option>
+         <outputType
+               id="org.eclipse.linuxtools.cdt.autotools.core.outputType.autogen"
+               name="%Autogen.outputType"
+               outputNames="configure"
+               primaryOutput="true">
+         </outputType>
+         <inputType
+               id="org.eclipse.linuxtools.cdt.autotools.core.inputType.autogen"
+               multipleOfType="false"
+               sourceContentType="org.eclipse.linuxtools.cdt.autotools.core.autogenScript">
+         </inputType>
+      </tool>
+      <targetPlatform
+            archList="all"
+            binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.GNU_ELF"
+            id="org.eclipse.linuxtools.cdt.autotools.core.targetPlatform"
+            isAbstract="false"
+            name="%Autotools.targetplatform.name"/>
+      <projectType
+            buildArtefactType="org.eclipse.linuxtools.cdt.autotools.core.buildArtefactType.autotools"
+            id="org.eclipse.linuxtools.cdt.autotools.core.projectType"
+            isAbstract="false">
+         <configuration
+               buildProperties="org.eclipse.linuxtools.cdt.autotools.core.buildType.default"
+               cleanCommand="rm -rf"
+               errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser"
+               id="org.eclipse.linuxtools.cdt.autotools.core.configuration.build"
+               name="%Configuration.build.name">
+            <toolChain
+                  archList="all"
+                  id="org.eclipse.linuxtools.cdt.autotools.core.toolChain"
+                  name="%Autotools.gnu.toolchain.name"
+                  scannerConfigDiscoveryProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"
+                  supportsManagedBuild="false"
+                  targetTool="org.eclipse.linuxtools.cdt.autotools.core.tool.configure">
+               <tool
+                     id="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure"
+                     isAbstract="false"
+                     natureFilter="both"
+                     superClass="org.eclipse.linuxtools.cdt.autotools.core.tool.configure"/>
+               <tool
+                     id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.autogen"
+                     isAbstract="false"
+                     natureFilter="both"
+                     superClass="org.eclipse.linuxtools.cdt.autotools.core.tool.autogen">
+               </tool>
+               <tool
+                     id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc"
+                     isAbstract="false"
+                     superClass="cdt.managedbuild.tool.gnu.c.compiler">
+               </tool>
+               <tool
+                     id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gpp"
+                     isAbstract="false"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.compiler">
+               </tool>
+               <targetPlatform
+                     id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.targetPlatform"
+                     isAbstract="false"
+                     name="%Autotools.targetplatform.name"
+                     superClass="org.eclipse.linuxtools.cdt.autotools.core.targetPlatform">
+               </targetPlatform>
+               <builder
+                     id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder"
+                     isAbstract="false"
+                     isVariableCaseSensitive="false">
+               </builder>
+               <supportedProperties>
+                  <property
+                        id="org.eclipse.cdt.build.core.buildArtefactType">
+                     <value
+                           id="org.eclipse.linuxtools.cdt.autotools.core.buildArtefactType.autotools">
+                     </value>
+                  </property>
+               </supportedProperties>
+            </toolChain>
+         </configuration>
+      </projectType>
+   </extension>
+   <extension
+         id="autotoolsNatureV2"
+         name="%AutotoolsNewNature.name"
+         point="org.eclipse.core.resources.natures">
+      <requires-nature
+            id="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
+      </requires-nature>
+      <runtime>
+         <run
+               class="org.eclipse.linuxtools.cdt.autotools.core.AutotoolsNewProjectNature">
+         </run>
+      </runtime>
+      <builder
+            id="org.eclipse.linuxtools.cdt.autotools.core.genmakebuilderV2">
+      </builder>
+   </extension>
+   <extension
+         id="genmakebuilderV2"
+         name="%Makefile.builder.name"
+         point="org.eclipse.core.resources.builders">
+      <builder
+            hasNature="true">
+         <run
+               class="org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsConfigurationBuilder">
+         </run>
+      </builder>
+   </extension>
+    <extension
+          point="org.eclipse.cdt.core.templateProcessTypes">
+       <processType
+             name="NewAutotoolsProject"
+             processRunner="org.eclipse.linuxtools.internal.cdt.autotools.core.wizards.NewAutotoolsProject">
+          <simple
+                name="name">
+          </simple>
+          <simple
+                external="true"
+                name="location"
+                nullable="true">
+          </simple>
+          <simple
+                name="artifactExtension">
+          </simple>
+          <simple
+                external="true"
+                name="isCProject">
+          </simple>
+       </processType>
+    </extension>
+    <extension
+          point="org.eclipse.core.contenttype.contentTypes">
+       <content-type
+             id="org.eclipse.linuxtools.cdt.autotools.core.configureScript"
+             name="%ConfigureScript.name"
+             priority="high">
+       </content-type>
+       <content-type
+             id="org.eclipse.linuxtools.cdt.autotools.core.autogenScript"
+             name="%AutogenScript.name"
+             priority="high">
+       </content-type>
+       <file-association
+             content-type="org.eclipse.linuxtools.cdt.autotools.core.configureScript"
+             file-names="configure">
+       </file-association>
+       <file-association
+             content-type="org.eclipse.linuxtools.cdt.autotools.core.autogenScript"
+             file-names="autogen.sh">
+       </file-association>
+    </extension>
+</plugin>
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/cdt/autotools/core/AutotoolsNewProjectNature.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/cdt/autotools/core/AutotoolsNewProjectNature.java
new file mode 100644
index 0000000..995fba1
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/cdt/autotools/core/AutotoolsNewProjectNature.java
@@ -0,0 +1,219 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 Red Hat Inc.. and others
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial implementation
+ *     IBM Rational Software - add and remove nature static methods
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.core;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
+import org.eclipse.core.resources.ICommand;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IProjectNature;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.ISchedulingRule;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsConfigurationBuilder;
+
+public class AutotoolsNewProjectNature implements IProjectNature {
+
+	public static final String AUTOTOOLS_NATURE_ID = AutotoolsPlugin.getUniqueIdentifier() + ".autotoolsNatureV2";  //$NON-NLS-1$
+	public static final String OLD_AUTOTOOLS_NATURE_ID = "org.eclipse.linuxtools.cdt.autotools.autotoolsNature"; //$NON-NLS-1$
+	public final static String BUILDER_ID = ManagedBuilderCorePlugin.getUniqueIdentifier() + ".genmakebuilder"; //$NON-NLS-1$
+	public final static String OLD_AUTOTOOLS_BUILDER_ID = "org.eclipse.linuxtools.cdt.autotools.genmakebuilder"; //$NON-NLS-1$
+
+	private IProject project;
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.resources.IProjectNature#configure()
+	 */
+	public void configure() throws CoreException {
+		addAutotoolsBuilder(project, new NullProgressMonitor());
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.resources.IProjectNature#deconfigure()
+	 */
+	public void deconfigure() throws CoreException {
+		// TODO remove builder from here
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.resources.IProjectNature#getProject()
+	 */
+	public IProject getProject() {
+		return project;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.resources.IProjectNature#setProject(org.eclipse.core.resources.IProject)
+	 */
+	public void setProject(IProject project) {
+		this.project = project;
+	}
+	
+	/**
+	 * Add the Autotools builder to the project
+	 * @param project
+	 * @param monitor
+	 * @throws CoreException
+	 */
+	public static void addAutotoolsBuilder(IProject project, IProgressMonitor monitor) throws CoreException {
+		// Add the builder to the project
+		IProjectDescription description = project.getDescription();
+		ICommand[] commands = description.getBuildSpec();
+		ArrayList<ICommand> commandList = new ArrayList<ICommand>();
+	
+		// Make sure the Autotools Configuration builder just precedes the Common Builder
+		for (int i = 0; i < commands.length; i++) {
+			ICommand command = commands[i];
+			if (command.getBuilderName().equals(AutotoolsConfigurationBuilder.BUILDER_ID)) {
+				// ignore it
+			} else {
+				if (command.getBuilderName().equals(OLD_AUTOTOOLS_BUILDER_ID)) {
+					ICommand newCommand = description.newCommand();
+					newCommand.setBuilderName(BUILDER_ID);
+					command = newCommand;
+				}
+				if (command.getBuilderName().equals(BUILDER_ID)) {
+					// add Autotools Configuration builder just before builder
+					ICommand newCommand = description.newCommand();
+					newCommand.setBuilderName(AutotoolsConfigurationBuilder.BUILDER_ID);
+					commandList.add(newCommand);
+				}
+				commandList.add(command);
+			}
+		}
+		final ICommand[] newCommands = commandList.toArray(new ICommand[commandList.size()]);
+		if (newCommands.length == commands.length) {
+			boolean hasCorrectBuilderCommands = true;
+			for (int j = 0; j < commands.length; ++j) {
+				if (!commands[j].getBuilderName().equals(newCommands[j])) {
+					hasCorrectBuilderCommands = false;
+					break;
+				}
+			}
+			if (hasCorrectBuilderCommands)
+				return;
+		}
+		final ISchedulingRule rule = ResourcesPlugin.getWorkspace().getRoot();
+		final IProject proj = project;
+
+		Job backgroundJob = new Job("Autotools Set Project Description") {
+			/* (non-Javadoc)
+			 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
+			 */
+			protected IStatus run(IProgressMonitor monitor) {
+				try {
+					ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
+
+						public void run(IProgressMonitor monitor) throws CoreException {
+
+							IProjectDescription description = proj.getDescription();
+							description.setBuildSpec(newCommands);
+							proj.setDescription(description, new NullProgressMonitor());
+						}
+					}, rule, IWorkspace.AVOID_UPDATE, monitor);
+				} catch (CoreException e) {
+					return e.getStatus();
+				}
+				IStatus returnStatus = Status.OK_STATUS;
+				return returnStatus;
+			}
+		};
+		backgroundJob.setRule(rule);
+		backgroundJob.schedule();
+	}
+
+	/**
+	 * Utility method for adding an autotools nature to a project.
+	 * 
+	 * @param proj the project to add the autotools nature to.
+	 * @param monitor a progress monitor to indicate the duration of the operation, or
+	 * <code>null</code> if progress reporting is not required.
+	 */
+	public static void addAutotoolsNature(IProject project, IProgressMonitor monitor) throws CoreException {
+		addNature(project, AUTOTOOLS_NATURE_ID, monitor);
+	}
+
+	/**
+	 * Utility method for adding a nature to a project.
+	 * 
+	 * @param proj the project to add the nature to.
+	 * @param natureId the id of the nature to assign to the project
+	 * @param monitor a progress monitor to indicate the duration of the operation, or
+	 * <code>null</code> if progress reporting is not required.
+	 */
+	public static void addNature(IProject project, String natureId, IProgressMonitor monitor) throws CoreException {
+		IProjectDescription description = project.getDescription();
+		String[] prevNatures = description.getNatureIds();
+		for (int i = 0; i < prevNatures.length; i++) {
+			if (natureId.equals(prevNatures[i]))
+				return;
+		}
+		String[] newNatures = new String[prevNatures.length + 1];
+		System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
+		newNatures[prevNatures.length] = natureId;
+		description.setNatureIds(newNatures);
+		project.setDescription(description, monitor);
+	}
+	
+	/**
+	 * Utility method to remove the autotools nature from a project.
+	 * 
+	 * @param project to remove the autotools nature from
+	 * @param mon progress monitor to indicate the duration of the operation, or 
+	 * <code>null</code> if progress reporting is not required. 
+	 * @throws CoreException
+	 */
+	public static void removeAutotoolsNature(IProject project, IProgressMonitor mon) throws CoreException {
+		removeNature(project, AUTOTOOLS_NATURE_ID, mon);
+	}
+
+	/**
+	 * Utility method to remove the old autotools nature from a project.
+	 * 
+	 * @param project to remove the old autotools nature from
+	 * @param mon progress monitor to indicate the duration of the operation, or 
+	 * <code>null</code> if progress reporting is not required. 
+	 * @throws CoreException
+	 */
+	public static void removeOldAutotoolsNature(IProject project, IProgressMonitor mon) throws CoreException {
+		removeNature(project, OLD_AUTOTOOLS_NATURE_ID, mon);
+	}
+
+	/**
+	 * Utility method for removing a project nature from a project.
+	 * 
+	 * @param proj the project to remove the nature from
+	 * @param natureId the nature id to remove
+	 * @param monitor a progress monitor to indicate the duration of the operation, or
+	 * <code>null</code> if progress reporting is not required.
+	 */
+	public static void removeNature(IProject project, String natureId, IProgressMonitor monitor) throws CoreException {
+		IProjectDescription description = project.getDescription();
+		String[] prevNatures = description.getNatureIds();
+		List<String> newNatures = new ArrayList<String>(Arrays.asList(prevNatures));
+		newNatures.remove(natureId);
+		description.setNatureIds((String[])newNatures.toArray(new String[newNatures.size()]));
+		project.setDescription(description, monitor);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/cdt/autotools/core/AutotoolsPlugin.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/cdt/autotools/core/AutotoolsPlugin.java
new file mode 100644
index 0000000..87ce42e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/cdt/autotools/core/AutotoolsPlugin.java
@@ -0,0 +1,291 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.core;
+
+import java.lang.reflect.InvocationTargetException;
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.IManagedProject;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The main plugin class to be used in the desktop.
+ */
+
+public class AutotoolsPlugin extends AbstractUIPlugin {
+
+	//The shared instance.
+	private static AutotoolsPlugin plugin;
+	private ResourceBundle resourceBundle;
+	
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.cdt.autotools.core"; //$NON-NLS-1$
+	public static final String AUTOTOOLS_PROJECT_TYPE_ID = PLUGIN_ID + ".projectType"; //$NON-NLS-1$
+
+	/**
+	 * The constructor.
+	 */
+	public AutotoolsPlugin() {
+		plugin = this;
+		try {
+			resourceBundle = ResourceBundle.getBundle(PLUGIN_ID + ".Resources"); //$NON-NLS-1$
+		} catch (MissingResourceException x) {
+			resourceBundle = null;
+		}
+
+	}
+
+	public static String getPluginId() {
+		return PLUGIN_ID;
+	}
+	
+	public static String getUniqueIdentifier() {
+		if (getDefault() == null) {
+			// If the default instance is not yet initialized,
+			// return a static identifier. This identifier must
+			// match the plugin id defined in plugin.xml
+			return PLUGIN_ID;
+		}
+		return getDefault().getBundle().getSymbolicName();
+	}
+
+	/**
+	 * This method is called upon plug-in activation
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+	}
+
+	/**
+	 * This method is called when the plug-in is stopped
+	 */
+	public void stop(BundleContext context) throws Exception {
+		super.stop(context);
+		plugin = null;
+	}
+
+	/**
+	 * Returns the shared instance.
+	 */
+	public static AutotoolsPlugin getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Returns active shell.
+	 */
+	public static Shell getActiveWorkbenchShell() {
+		IWorkbenchWindow window = getDefault().getWorkbench().getActiveWorkbenchWindow();
+		if (window != null) {
+			return window.getShell();
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the string from the plugin's resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @return the resource bundle message
+	 */
+	public static String getResourceString(String key) {
+		ResourceBundle bundle = AutotoolsPlugin.getDefault().getResourceBundle();
+		try {
+			return bundle.getString(key);
+		} catch (MissingResourceException e) {
+			return key;
+		}
+	}
+
+	/**
+	 * Returns the string from the plugin's resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @param args an array of substituition strings
+	 * @return the resource bundle message
+	 */
+	public static String getFormattedString(String key, String[] args) {
+		return MessageFormat.format(getResourceString(key), (Object[])args);
+	}
+
+	/**
+	 * Returns the plugin's resource bundle,
+	 */
+	public ResourceBundle getResourceBundle() {
+		return resourceBundle;
+	}
+
+	public static boolean hasTargetBuilder(IProject project) {
+		try {
+			// When a project is converted to an Autotools project, we
+			// replace the ManagedMake builder with a special one that
+			// handles MakeTargets.  If a project is brought into Eclipse and
+			// uses the New Project Wizard to create a ManagedMake project that
+			// is of type: Autotools, this added step is not done.  If we know
+			// we have an Autotools project from the configuration id, then
+			// we should add the builder now.  We also should replace the
+			// default ManagedMake scanner provider with the Autotools one,
+			// then return true.
+			if (project.getNature(ManagedCProjectNature.MNG_NATURE_ID) != null) {
+				IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+				IManagedProject m = info.getManagedProject();
+				if (m != null && m.getProjectType().getId().equals(AUTOTOOLS_PROJECT_TYPE_ID)) {
+					AutotoolsNewProjectNature.addAutotoolsBuilder(project, new NullProgressMonitor());
+					return true;
+				}
+			}
+		} catch (CoreException e) {
+			// Don't care...fall through to not found.
+		} catch (Exception f) {
+			// Don't care...fall through to not found.
+		}
+		// Otherwise not found.
+		return false;
+	}
+
+	/**
+	 * Returns an image descriptor for the image file at the given
+	 * plug-in relative path.
+	 *
+	 * @param path the path
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
+	}
+	
+	public static void log(IStatus status) {
+		ResourcesPlugin.getPlugin().getLog().log(status);
+	}
+
+	public static void logErrorMessage(String message) {
+		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, message, null));
+	}
+
+	public static void logException(Throwable e, final String title, String message) {
+		if (e instanceof InvocationTargetException) {
+			e = ((InvocationTargetException) e).getTargetException();
+		}
+		IStatus status = null;
+		if (e instanceof CoreException)
+			status = ((CoreException) e).getStatus();
+		else {
+			if (message == null)
+				message = e.getMessage();
+			if (message == null)
+				message = e.toString();
+			status = new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.OK, message, e);
+		}
+		ResourcesPlugin.getPlugin().getLog().log(status);
+		Display display;
+		display = Display.getCurrent();
+		if (display == null)
+			display = Display.getDefault();
+		final IStatus fstatus = status;
+		display.asyncExec(new Runnable() {
+			public void run() {
+				ErrorDialog.openError(null, title, null, fstatus);
+			}
+		});
+	}
+
+	public static void logException(Throwable e) {
+		logException(e, null, null);
+	}
+
+	public static void log(Throwable e) {
+		if (e instanceof InvocationTargetException)
+			e = ((InvocationTargetException) e).getTargetException();
+		IStatus status = null;
+		if (e instanceof CoreException)
+			status = ((CoreException) e).getStatus();
+		else
+			status = new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.OK, e.getMessage(), e);
+		log(status);
+	}
+
+	/**
+	* Utility method with conventions
+	*/
+	public static void errorDialog(Shell shell, String title, String message, IStatus s) {
+		log(s);
+		// if the 'message' resource string and the IStatus' message are the same,
+		// don't show both in the dialog
+		if (s != null && message.equals(s.getMessage())) {
+			message = null;
+		}
+		ErrorDialog.openError(shell, title, message, s);
+	}
+
+	/**
+	* Utility method with conventions
+	*/
+	public static void errorDialog(Shell shell, String title, String message, Throwable t) {
+		log(t);
+		IStatus status;
+		if (t instanceof CoreException) {
+			status = ((CoreException) t).getStatus();
+			// if the 'message' resource string and the IStatus' message are the same,
+			// don't show both in the dialog
+			if (status != null && message.equals(status.getMessage())) {
+				message = null;
+			}
+		} else {
+			status = new Status(IStatus.ERROR, AutotoolsPlugin.getUniqueIdentifier(), -1, "Internal Error: ", t); //$NON-NLS-1$	
+		}
+		ErrorDialog.openError(shell, title, message, status);
+	}
+	
+	/**
+	 * Returns the workspace instance.
+	 */
+	public static IWorkspace getWorkspace() {
+		return ResourcesPlugin.getWorkspace();
+	}
+
+	/**
+	 * Returns the active workbench window or <code>null</code> if none
+	 */
+	public static IWorkbenchWindow getActiveWorkbenchWindow() {
+		return getDefault().getWorkbench().getActiveWorkbenchWindow();
+	}
+
+	/**
+	 * Returns the active workbench page or <code>null</code> if none.
+	 */
+	public static IWorkbenchPage getActivePage() {
+		IWorkbenchWindow window= getActiveWorkbenchWindow();
+		if (window != null) {
+			return window.getActivePage();
+		}
+		return null;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/cdt/autotools/core/Resources.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/cdt/autotools/core/Resources.properties
new file mode 100644
index 0000000..ee20f59
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/cdt/autotools/core/Resources.properties
@@ -0,0 +1,106 @@
+#################################################################################
+#  Copyright (c) 2006, 2007, 2009 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+# 
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#      IBM Rational Software - ManagedMakeMessages copied to AutotoolsMakefileBuilder
+#################################################################################
+MakeCWizard.title=C/Make Project
+MakeCWizard.description=Create a New C Project using 'make' to build it
+
+WARNING_UNSUPPORTED_CONFIGURATION=Warning: unsupported configuration
+
+AutotoolsMakefileBuilder.message.finished=Build complete for project {0}
+AutotoolsMakefileBuilder.message.stopped=Build stopped
+AutotoolsMakefileBuilder.type.clean=Clean-only build
+AutotoolsMakefileBuilder.message.clean.deleting.output=Removing build artifacts from {0}
+AutotoolsMakefileBuilder.message.console.header=**** {0} of configuration {1} for project {2} ****
+
+MakeGenerator.makefile.built=Makefile built
+MakeGenerator.refresh=Refresh
+MakeGenerator.refresh.error=Refresh error
+MakeGenerator.generation.error=Configuration failed with error
+MakeGenerator.configuring=Configuring
+MakeGenerator.make.message=Invoking {0} for project {1}
+MakeGenerator.config.error=Error {0} occurred while running {1}
+MakeGenerator.createdir.error=Error creating build directory: {0}
+MakeGenerator.run.config.status=Running config.status in build directory: {0}
+MakeGenerator.makefile.cvs=Invoking Makefile.cvs in build directory: {0}
+MakeGenerator.autogen.sh=Invoking autogen.sh in build directory: {0}
+MakeGenerator.autoreconf=Invoking autoreconf in build directory: {0}
+MakeGenerator.gen.makefile=Generating Makefile in build directory: {0}
+MakeGenerator.clean.builddir=Cleaning build directory: {0}
+MakeGenerator.clean.topdir=Cleaning top-level source directory to allow other configuration to run
+MakeGenerator.gen.configure=Generating configure
+MakeGenerator.unsupportedConfig=Warning: unsupported configuration {0}
+MakeGenerator.success=[Operation successful]
+MakeGenerator.didnt.generate=No Makefile generated
+MakeGenerator.refresh.MakeTargets=Refreshing Make Targets
+
+BuildDir.apply=Build directory already in use
+BuildDir.default=Default build directory to unused value?
+BuildDir.yes=Yes
+BuildDir.no=No
+
+WizardAutotoolsProjectConversion.title=Convert to CVS C/C++ Autotools Project
+WizardAutotoolsProjectConversion.description=Convert a CVS source repository to C/C++ Autotools Project
+WizardAutotoolsProjectConversion.message.add_nature=Adding C/C++ Autotools Managed Project Nature
+WizardAutotoolsProjectConversion.message.add_builder=Adding C/C++ Autotools Managed Project Builder
+WizardMakeProjectConversion.monitor.convertingToMakeProject=Converting Project...
+WizardAutotoolsConversion=CVS C/C++ Autotools Conversion
+WizardAutotoolsConversion.windowTitle=Conversion to CVS C/C++ Autotools Project
+WizardAutotoolsConversion.config.title=Select a configuration
+WizardAutotoolsConversion.config.desc=Select the configuration you wish to deploy on
+WizardAutotoolsConversion.options.title=Additional Project Settings
+WizardAutotoolsConversion.options.desc=Define the inter-project dependencies, if any.
+WizardAutotoolsConversion.message.save=Saving new build options
+
+WizardAutotoolsNewCProject.title=Autotools C Project
+WizardAutotoolsNewCProject.description=Create a new C Autotools project
+WizardAutotoolsNewCProject.monitor.creatingProject=Creating Project...
+WizardAutotoolsNewCProject.windowTitle=GNU Autotools C Project
+WizardAutotoolsNewCProject.config.title=Select a configuration
+WizardAutotoolsNewCProject.config.desc=Select the configuration you wish to deploy on
+WizardAutotoolsNewCProject.options.title=Additional Project Settings
+WizardAutotoolsNewCProject.options.desc=Define the inter-project dependencies, if any.
+WizardAutotoolsNewCProject.message.save=Saving new build options
+
+WizardAutotoolsNewCProjectV2.title=Autotools C Project V2
+WizardAutotoolsNewCProjectV2.description=Create a new C Autotools project
+WizardAutotoolsNewCProjectV2.monitor.creatingProject=Creating Project...
+WizardAutotoolsNewCProjectV2.windowTitle=GNU Autotools C Project V2
+WizardAutotoolsNewCProjectV2.config.title=Select a configuration
+WizardAutotoolsNewCProjectV2.config.desc=Select the configuration you wish to deploy on
+WizardAutotoolsNewCProjectV2.options.title=Additional Project Settings
+WizardAutotoolsNewCProjectV2.options.desc=Define the inter-project dependencies, if any.
+WizardAutotoolsNewCProjectV2.message.save=Saving new build options
+
+WizardAutotoolsNewCCProject.title=Autotools C++ Project
+WizardAutotoolsNewCCProject.description=Create a new C++ Autotools project
+WizardAutotoolsNewCCProject.monitor.creatingProject=Creating Project...
+WizardAutotoolsNewCCProject.windowTitle=GNU Autotools C++ Project
+WizardAutotoolsNewCCProject.config.title=Select a configuration
+WizardAutotoolsNewCCProject.config.desc=Select the configuration you wish to deploy on
+WizardAutotoolsNewCCProject.options.title=Additional Project Settings
+WizardAutotoolsNewCCProject.options.desc=Define the inter-project dependencies, if any.
+WizardAutotoolsNewCCProject.message.save=Saving new build options
+
+
+BuildTargetDialog.title.buildTarget=Build Special Targets
+BuildTargetDialog.title.makeTargetsFor=Make targets for 
+BuildTargetDialog.button.build=Build
+
+TargetListViewer.button.add=Add...
+TargetListViewer.button.remove=Remove
+TargetListViewer.button.edit=Edit...
+TargetListViewer.label.target=Target
+TargetListViewer.label.location=Location
+TargetListViewer.exception.error=Error
+TargetListViewer.exception.message=An error occurred performing the selected action
+
+AutotoolsPreferencePage.useAutotoolsFileScanner.label=Use make -w for includepath scanning
+MakeTargetPreferencePage.buildTargetInBackground.label=Build target in background
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsConfigurationBuilder.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsConfigurationBuilder.java
new file mode 100644
index 0000000..fce7c29
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsConfigurationBuilder.java
@@ -0,0 +1,159 @@
+package org.eclipse.linuxtools.internal.cdt.autotools.core;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Map;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.resources.ACBuilder;
+import org.eclipse.cdt.core.resources.IConsole;
+import org.eclipse.cdt.managedbuilder.core.IBuilder;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.IMultiConfiguration;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsConfigurationManager;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IAConfiguration;
+
+public class AutotoolsConfigurationBuilder extends ACBuilder {
+
+	public static final String BUILDER_NAME = "genmakebuilderV2"; //$NON-NLS-1$
+	public static final String BUILDER_ID = AutotoolsPlugin.getUniqueIdentifier() + "." + BUILDER_NAME; //$NON-NLS-1$
+
+	private static final String BUILD_STOPPED="AutotoolsMakefileBuilder.message.stopped"; //$NON-NLS-1$
+	private AutotoolsNewMakeGenerator generator;
+
+	public AutotoolsConfigurationBuilder() {
+		super();
+		generator = new AutotoolsNewMakeGenerator();
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	protected IProject[] build(int kind, Map args, IProgressMonitor monitor)
+	throws CoreException {
+		IProject project = getProject();
+
+		boolean bPerformBuild = true;
+		IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+		if (!shouldBuild(kind, info)) {
+			return new IProject[0];
+		}
+		if (kind == IncrementalProjectBuilder.AUTO_BUILD) {
+			IResourceDelta delta = getDelta(getProject());
+			if (delta != null) {
+				IResource res = delta.getResource();
+				if (res != null) {
+					bPerformBuild = res.getProject().equals(getProject());
+				}
+			} else {
+				bPerformBuild = false;
+			}
+			IConfiguration cfg = info.getDefaultConfiguration();
+			if (cfg != null) {
+				IAConfiguration acfg = AutotoolsConfigurationManager.getInstance().findCfg(project, cfg.getName());
+				if (acfg == null || acfg.isDirty())
+					bPerformBuild = true;
+			}
+		}
+		if (bPerformBuild) {
+			MultiStatus result = performMakefileGeneration(project, info, monitor);
+			if (result.getSeverity() == IStatus.ERROR) {
+				// Failure to create Makefile, output error message to console.
+				IConsole console = CCorePlugin.getDefault().getConsole();
+				console.start(project);
+
+				OutputStream cos = console.getOutputStream();
+				String errormsg = AutotoolsPlugin.getResourceString(BUILD_STOPPED);
+				StringBuffer buf = new StringBuffer(errormsg);
+				buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$
+				buf.append("(").append(result.getMessage()).append(")"); //$NON-NLS-1$ //$NON-NLS-2$
+
+				try {
+					cos.write(buf.toString().getBytes());
+					cos.flush();
+					cos.close();
+				} catch (IOException e) {
+					// TODO Auto-generated catch block
+					AutotoolsPlugin.log(e);
+				}
+			}
+		}
+		checkCancel(monitor);
+		return getProject().getReferencedProjects();
+	}
+	
+	@Override
+	protected void clean(IProgressMonitor monitor) throws CoreException {
+		IProject project = getProject();
+		final IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(getProject());
+		if (shouldBuild(CLEAN_BUILD, info)) {
+			IConfiguration icfg = info.getDefaultConfiguration();
+			if (icfg instanceof IMultiConfiguration) {
+				IMultiConfiguration mcfg = (IMultiConfiguration)icfg;
+				IConfiguration[] cfgs = (IConfiguration[])mcfg.getItems();
+				for (int i = 0; i < cfgs.length; ++i) {
+					IAConfiguration cfg = AutotoolsConfigurationManager.getInstance().getConfiguration(project, icfg.getName());
+					cfg.setDirty(true);
+				}
+			} else {
+				IAConfiguration cfg = AutotoolsConfigurationManager.getInstance().getConfiguration(project, icfg.getName());
+				cfg.setDirty(true);  // Mark Configuration dirty so next build will do full reconfigure
+			}
+		}
+	}
+
+	protected MultiStatus performMakefileGeneration(IProject project, IManagedBuildInfo info,
+			IProgressMonitor monitor) throws CoreException {
+		MultiStatus result;
+		
+		try {
+			generator.initialize(project, info, monitor);
+			result = generator.regenerateMakefiles(false);
+		} catch (CoreException e) {
+			String errMsg = AutotoolsPlugin.getResourceString("MakeGenerator.didnt.generate"); //$NON-NLS-1$
+			result = new MultiStatus(AutotoolsPlugin.getUniqueIdentifier(), IStatus.ERROR,
+					errMsg, e);
+		}
+		
+		return result;
+	}
+
+	/**
+	 * Check whether the build has been canceled.
+	 */
+	public void checkCancel(IProgressMonitor monitor) {
+		if (monitor != null && monitor.isCanceled())
+			throw new OperationCanceledException();
+	}
+
+	protected boolean shouldBuild(int kind, IManagedBuildInfo info) {
+		IConfiguration cfg = info.getDefaultConfiguration();
+		IBuilder builder = null;
+		if (cfg != null) {
+			builder = cfg.getEditableBuilder();
+		switch (kind) {
+		case IncrementalProjectBuilder.AUTO_BUILD :
+			return builder.isAutoBuildEnable();
+		case IncrementalProjectBuilder.INCREMENTAL_BUILD : // now treated as the same!
+		case IncrementalProjectBuilder.FULL_BUILD :
+			return builder.isFullBuildEnabled() | builder.isIncrementalBuildEnabled() ;
+		case IncrementalProjectBuilder.CLEAN_BUILD :
+			return builder.isCleanBuildEnabled();
+		}
+		}
+		return true;
+	}
+
+}
+		
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java
new file mode 100644
index 0000000..1cb552d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java
@@ -0,0 +1,1273 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.CommandLauncher;
+import org.eclipse.cdt.core.ConsoleOutputStream;
+import org.eclipse.cdt.core.ICDescriptor;
+import org.eclipse.cdt.core.envvar.IEnvironmentVariable;
+import org.eclipse.cdt.core.resources.IConsole;
+import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
+import org.eclipse.cdt.core.settings.model.ICProjectDescription;
+import org.eclipse.cdt.core.settings.model.ICStorageElement;
+import org.eclipse.cdt.make.core.IMakeBuilderInfo;
+import org.eclipse.cdt.make.core.IMakeTarget;
+import org.eclipse.cdt.make.core.IMakeTargetManager;
+import org.eclipse.cdt.make.core.MakeCorePlugin;
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.core.makefile.ITarget;
+import org.eclipse.cdt.make.core.makefile.ITargetRule;
+import org.eclipse.cdt.managedbuilder.core.BuildException;
+import org.eclipse.cdt.managedbuilder.core.IBuilder;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.IMultiConfiguration;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
+import org.eclipse.cdt.managedbuilder.macros.BuildMacroException;
+import org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider;
+import org.eclipse.cdt.newmake.core.IMakeCommonBuildInfo;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceStatus;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsConfigurationManager;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IAConfiguration;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IConfigureOption;
+
+
+@SuppressWarnings("deprecation")
+public class AutotoolsNewMakeGenerator extends MarkerGenerator {
+
+	public final String CONFIG_STATUS = "config.status"; //$NON-NLS-1$
+	public final String MAKEFILE = "Makefile"; //$NON-NLS-1$
+	public final String MAKEFILE_CVS = "Makefile.cvs"; //$NON-NLS-1$
+	public final String SETTINGS_FILE_NAME = ".cdtconfigure"; //$NON-NLS-1$
+	public final String SHELL_COMMAND = "sh"; //$NON-NLS-1$
+	
+	public final String AUTOGEN_TOOL_ID = "autogen"; //$NON-NLS-1$
+	public final String CONFIGURE_TOOL_ID = "configure"; //$NON-NLS-1$
+	
+	public final String GENERATED_TARGET = AutotoolsPlugin.PLUGIN_ID + ".generated.MakeTarget"; //$NON-NLS-1$
+
+	private static final String MAKE_TARGET_KEY = MakeCorePlugin.getUniqueIdentifier() + ".buildtargets"; //$NON-NLS-1$
+	private static final String BUILD_TARGET_ELEMENT = "buildTargets"; //$NON-NLS-1$
+	private static final String TARGET_ELEMENT = "target"; //$NON-NLS-1$
+	private static final String TARGET_ATTR_ID = "targetID"; //$NON-NLS-1$
+	private static final String TARGET_ATTR_PATH = "path"; //$NON-NLS-1$
+	private static final String TARGET_ATTR_NAME = "name"; //$NON-NLS-1$
+	private static final String TARGET_STOP_ON_ERROR = "stopOnError"; //$NON-NLS-1$
+	private static final String TARGET_USE_DEFAULT_CMD = "useDefaultCommand"; //$NON-NLS-1$
+	private static final String TARGET_ARGUMENTS = "buildArguments"; //$NON-NLS-1$
+	private static final String TARGET_COMMAND = "buildCommand"; //$NON-NLS-1$
+	private static final String TARGET_RUN_ALL_BUILDERS = "runAllBuilders";
+	private static final String TARGET = "buildTarget"; //$NON-NLS-1$
+	private static final String DEFAULT_AUTORECONF = "autoreconf"; //$NON-NLS-1$
+
+	private IProject project;
+
+	private IProgressMonitor monitor;
+
+	private IPath buildLocation;
+	private String buildDir;
+	private String srcDir;
+
+	private IConfiguration cfg;
+	private ICConfigurationDescription cdesc;
+	private IAConfiguration toolsCfg;
+	private IBuilder builder;
+
+	public void generateDependencies() throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	public MultiStatus generateMakefiles(IResourceDelta delta)
+			throws CoreException {
+		return regenerateMakefiles(false);
+	}
+
+	private void initializeBuildConfigDirs(IConfiguration c, IAConfiguration a) {
+		IBuilder b = c.getBuilder();
+		IPath buildDirectory = b.getBuildLocation();
+		if (buildDirectory == null || buildDirectory.isEmpty()) {
+			// default build directory to project directory
+			buildDirectory = project.getLocation();
+		}
+		buildLocation = buildDirectory;
+		buildDir = buildDirectory.toString();
+		srcDir = a.getConfigToolDirectory();
+		try {
+			String resolved = ManagedBuildManager.getBuildMacroProvider().resolveValue(srcDir, "", null, 
+					IBuildMacroProvider.CONTEXT_CONFIGURATION, c);
+			srcDir = resolved;
+		} catch (BuildMacroException e) {
+			// do nothing
+		}
+	}
+	
+	public void initialize(IProject project, IManagedBuildInfo info,
+			IProgressMonitor monitor) {
+		this.project = project;
+		ICProjectDescription pdesc = CCorePlugin.getDefault().getProjectDescription(project);
+		this.cdesc = pdesc.getActiveConfiguration();
+		this.cfg = info.getDefaultConfiguration();
+		this.builder = cfg.getBuilder();
+		this.monitor = monitor;
+	}
+
+	public IProject getProject() {
+		return project;
+	}
+	
+	public boolean isGeneratedResource(IResource resource) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public void regenerateDependencies(boolean force) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	/*
+	 * (non-Javadoc) Check whether the build has been cancelled. Cancellation
+	 * requests propagated to the caller by throwing <code>OperationCanceledException</code>.
+	 * 
+	 * @see org.eclipse.core.runtime.OperationCanceledException#OperationCanceledException()
+	 */
+	protected void checkCancel() {
+		if (monitor != null && monitor.isCanceled()) {
+			throw new OperationCanceledException();
+		}
+	}
+
+	/*
+	 * (non-Javadoc) Return or create the makefile needed for the build. If we
+	 * are creating the resource, set the derived bit to true so the CM system
+	 * ignores the contents. If the resource exists, respect the existing
+	 * derived setting.
+	 * 
+	 * @param makefilePath @return IFile
+	 */
+	protected IFile createFile(IPath makefilePath) throws CoreException {
+		// Create or get the handle for the makefile
+		IWorkspaceRoot root = CCorePlugin.getWorkspace().getRoot();
+		IFile newFile = root.getFileForLocation(makefilePath);
+		if (newFile == null) {
+			newFile = root.getFile(makefilePath);
+		}
+		// Create the file if it does not exist
+		ByteArrayInputStream contents = new ByteArrayInputStream(new byte[0]);
+		try {
+			newFile.create(contents, false, new SubProgressMonitor(monitor, 1));
+			// Make sure the new file is marked as derived
+			if (!newFile.isDerived()) {
+				newFile.setDerived(true);
+			}
+
+		} catch (CoreException e) {
+			// If the file already existed locally, just refresh to get contents
+			if (e.getStatus().getCode() == IResourceStatus.PATH_OCCUPIED)
+				newFile.refreshLocal(IResource.DEPTH_ZERO, null);
+			else
+				throw e;
+		}
+
+		return newFile;
+	}
+
+	/*
+	 * Create a directory
+	 * 
+	 * @param boolean @return whether the directory was created
+	 */
+	private boolean createDirectory(String dirName) throws CoreException {
+		// Create or get the handle for the build directory
+		IPath path = new Path(dirName);
+		boolean rc = true;
+		if (dirName.length() == 0 || dirName.equals("."))
+			path = project.getLocation().append(dirName);
+		File f = path.toFile();
+		if (!f.exists())
+			rc = f.mkdirs();
+
+		return rc;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator#getMakefileName()
+	 */
+	public String getMakefileName() {
+		return new String(MAKEFILE);
+	}
+
+	/**
+	 * Reconfigure the project.
+	 * @return MultiStatus status of regeneration operation
+	 * @throws CoreException
+	 */
+	public MultiStatus reconfigure() throws CoreException {
+		return regenerateMakefiles(true);
+	}
+	
+	public MultiStatus regenerateMakefiles(boolean reconfigure) throws CoreException {
+		MultiStatus status = null;
+		if (cfg instanceof IMultiConfiguration) {
+			IMultiConfiguration mfcg = (IMultiConfiguration)cfg;
+			Object[] objs = mfcg.getItems();
+			for (int i = 0; i < objs.length; ++i) {
+				IConfiguration icfg = (IConfiguration)objs[i];
+				Status rc = regenerateMakefiles(icfg, reconfigure);
+				if (!rc.isOK()) {
+					if(status == null){
+						status = new MultiStatus(
+								AutotoolsPlugin.getUniqueIdentifier(),
+								IStatus.ERROR,
+								new String(),
+								null);
+					}
+					status.add(rc);	
+				}
+			}
+		} else {
+			Status rc = regenerateMakefiles(cfg, reconfigure);
+			if (!rc.isOK()) {
+				if(status == null){
+					status = new MultiStatus(
+							AutotoolsPlugin.getUniqueIdentifier(),
+							IStatus.ERROR,
+							new String(),
+							null);
+				}
+				status.add(rc);	
+			}
+		}
+		if(status == null){
+			status = new MultiStatus(
+					ManagedBuilderCorePlugin.getUniqueIdentifier(),
+					IStatus.OK,
+					new String(),
+					null);
+		}
+		return status;
+	}
+	
+	private Status regenerateMakefiles(IConfiguration icfg, boolean reconfigure) throws CoreException {
+		Status status;
+		int rc = IStatus.OK;
+		String errMsg = new String();
+		boolean needFullConfigure = false;
+
+		// See if the user has cancelled the build
+		checkCancel();
+
+		// Synchronize the Autotools configurations with the Project Description
+		AutotoolsConfigurationManager.getInstance().syncConfigurations(getProject());	
+		toolsCfg = AutotoolsConfigurationManager.getInstance().getConfiguration(getProject(), icfg.getId());
+			
+		initializeBuildConfigDirs(icfg, toolsCfg);
+		// Create the top-level directory for the build output
+		if (!createDirectory(buildDir)) {
+			rc = IStatus.ERROR;
+			errMsg = AutotoolsPlugin.getFormattedString("MakeGenerator.createdir.error", //$NON-NLS-1$
+					new String[] {buildDir});
+			status = new MultiStatus(AutotoolsPlugin
+						.getUniqueIdentifier(), rc, errMsg, null);
+		}
+		checkCancel();
+
+		// // How did we do
+		// if (!getInvalidDirList().isEmpty()) {
+		// status = new MultiStatus (
+		// ManagedBuilderCorePlugin.getUniqueIdentifier(),
+		// IStatus.WARNING,
+		// new String(),
+		// null);
+		// // Add a new status for each of the bad folders
+		// iter = getInvalidDirList().iterator();
+		// while (iter.hasNext()) {
+		// status.add(new Status (
+		// IStatus.WARNING,
+		// ManagedBuilderCorePlugin.getUniqueIdentifier(),
+		// SPACES_IN_PATH,
+		// ((IContainer)iter.next()).getFullPath().toString(),
+		// null));
+		// }
+		// } else {
+		// status = new MultiStatus(
+		// ManagedBuilderCorePlugin.getUniqueIdentifier(),
+		// IStatus.OK,
+		// new String(),
+		// null);
+		// }
+
+		// Get a build console for the project
+		IConsole console = CCorePlugin.getDefault().getConsole("org.eclipse.linuxtools.cdt.autotools.ui.configureConsole"); //$NON-NLS-1$
+		boolean consoleStart = true;
+		
+		// Make sure there's a monitor to cancel the build
+		if (monitor == null) {
+			monitor = new NullProgressMonitor();
+		}
+
+		try {
+			// If a config.status file exists in the build directory, we call it
+			// to
+			// regenerate the makefile
+			IPath configfile = buildLocation.append(CONFIG_STATUS);
+			IPath topConfigFile = project.getLocation().append(CONFIG_STATUS);
+			IPath makefilePath = buildLocation.append(MAKEFILE);
+			IPath topMakefilePath = project.getLocation().append(MAKEFILE);
+			File configStatus = configfile.toFile();
+			File topConfigStatus = topConfigFile.toFile();
+			File makefile = makefilePath.toFile();
+			File topMakefile = topMakefilePath.toFile();
+
+			// Check if a configure has been done in the top-level source directory
+			if (!(configfile.equals(topConfigFile)) && topConfigStatus.exists()) {
+				// Must perform distclean on source directory because 2nd configuration
+				// cannot occur otherwise
+				// There is a make target for cleaning.
+				if (topMakefile != null && topMakefile.exists()) {
+					String[] makeargs = new String[1];
+					IPath makeCmd = new Path("make"); //$NON-NLS-1$
+					String target = null;
+					try {
+						target = getProject().getPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET);
+					} catch (CoreException ce) {
+						// do nothing
+					}
+					if (target == null)
+						target = AutotoolsPropertyConstants.CLEAN_MAKE_TARGET_DEFAULT;
+					String args = builder.getBuildArguments();
+					if (args != null && !(args = args.trim()).equals("")) { //$NON-NLS-1$
+						String[] newArgs = makeArray(args);
+						makeargs = new String[newArgs.length + 1];
+						System.arraycopy(newArgs, 0, makeargs, 0, newArgs.length);
+					}
+					makeargs[makeargs.length - 1] = target;
+					rc = runCommand(makeCmd,
+							project.getLocation(),
+							makeargs,
+							AutotoolsPlugin.getResourceString("MakeGenerator.clean.topdir"), //$NON-NLS-1$
+							errMsg, console, consoleStart);
+					consoleStart = false;
+				}
+			}
+			// If the active configuration is dirty, then we need to do a full
+			// reconfigure.
+			if (toolsCfg.isDirty() || reconfigure) {
+				needFullConfigure = true;
+				// If we are going to do a full reconfigure, then if the current
+				// build directory exists, we should clean it out first.  This is
+				// because the reconfiguration could change compile flags, etc..
+				// and the Makefile might not detect a rebuild is required.  In
+				// addition, the build directory itself could have been changed and
+				// we should remove the previous build.
+				if (buildLocation != null && buildLocation.toFile().exists()) {
+					// See what type of cleaning the user has set up in the
+					// build properties dialog.
+					String cleanDelete = null;
+					try {
+						cleanDelete = getProject().getPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE);
+					} catch (CoreException ce) {
+						// do nothing
+					}
+					
+					if (cleanDelete != null && cleanDelete.equals(AutotoolsPropertyConstants.TRUE))
+						buildLocation.toFile().delete();
+					else {
+						// There is a make target for cleaning.
+						if (makefile != null && makefile.exists()) {
+							String[] makeargs = new String[1];
+							IPath makeCmd = new Path("make"); //$NON-NLS-1$
+							String target = null;
+							try {
+								target = getProject().getPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET);
+							} catch (CoreException ce) {
+								// do nothing
+							}
+							if (target == null)
+								target = AutotoolsPropertyConstants.CLEAN_MAKE_TARGET_DEFAULT;
+							String args = builder.getBuildArguments();
+							if (args != null && !(args = args.trim()).equals("")) { //$NON-NLS-1$
+								String[] newArgs = makeArray(args);
+								makeargs = new String[newArgs.length + 1];
+								System.arraycopy(newArgs, 0, makeargs, 0, newArgs.length);
+							}
+							makeargs[makeargs.length - 1] = target;
+							rc = runCommand(makeCmd,
+									buildLocation,
+									makeargs,
+									AutotoolsPlugin.getFormattedString("MakeGenerator.clean.builddir", new String[]{buildDir}), //$NON-NLS-1$
+									errMsg, console, consoleStart);
+							consoleStart = false;
+						}
+					}
+				}
+				// Mark the scanner info as dirty.
+				try {
+					project.setSessionProperty(AutotoolsPropertyConstants.SCANNER_INFO_DIRTY, Boolean.TRUE);
+				} catch (CoreException ce) {
+					// do nothing
+				}
+			}
+			
+			ArrayList<String> configureEnvs = new ArrayList<String>();
+			ArrayList<String> configureCmdParms = new ArrayList<String>();
+			IPath configurePath = getConfigurePath(configureEnvs, configureCmdParms);
+			String[] configArgs = getConfigArgs(configureCmdParms);
+			ArrayList<String> autogenEnvs = new ArrayList<String>();
+			ArrayList<String> autogenCmdParms = new ArrayList<String>();
+			IPath autogenPath = getAutogenPath(autogenEnvs, autogenCmdParms);
+			
+			// Check if we have a config.status (meaning configure has already run).
+    		if (!needFullConfigure && configStatus != null && configStatus.exists()) {
+			    // If no corresponding Makefile in the same build location, then we
+	            // can simply run config.status again to ensure the top level Makefile has been
+				// created.
+				if (makefile == null || !makefile.exists()) {
+					rc = runScript(configfile, buildLocation, null, 
+							AutotoolsPlugin.getFormattedString("MakeGenerator.run.config.status", new String[]{buildDir}), //$NON-NLS-1$
+							errMsg, console, null, consoleStart);
+					consoleStart = false;
+				}
+			}
+			// Look for configure and configure from scratch
+			else if (configurePath.toFile().exists()) {
+				rc = runScript(configurePath, 
+						buildLocation,
+						configArgs, 
+						AutotoolsPlugin.getFormattedString("MakeGenerator.gen.makefile", new String[]{buildDir}), //$NON-NLS-1$
+						errMsg, console, configureEnvs, consoleStart);
+				consoleStart = false;
+				if (rc != IStatus.ERROR) {
+					File makefileFile = buildLocation.append(MAKEFILE).toFile();
+					addMakeTargetsToManager(makefileFile);
+					// TODO: should we do something special if configure doesn't
+					// return ok?
+					toolsCfg.setDirty(false);
+				}
+			}
+			// If no configure, look for autogen.sh which may create configure and
+    		// possibly even run it.
+			else if (autogenPath.toFile().exists()) {
+				// Remove the existing config.status file since we use it
+				// to figure out if configure was run.
+				if (configStatus.exists())
+					configStatus.delete();
+				// Get any user-specified arguments for autogen.
+				String[] autogenArgs = getAutogenArgs(autogenCmdParms);
+				rc = runScript(autogenPath,
+						autogenPath.removeLastSegments(1), autogenArgs,
+						AutotoolsPlugin.getFormattedString("MakeGenerator.autogen.sh", new String[]{buildDir}), //$NON-NLS-1$
+						errMsg, console, autogenEnvs, consoleStart);
+				consoleStart = false;
+				if (rc != IStatus.ERROR) {
+					configStatus = configfile.toFile();
+					// Check for config.status.  If it is created, then
+					// autogen.sh ran configure and we should not run it
+					// ourselves.
+					if (configStatus == null || !configStatus.exists()) {
+						rc = runScript(configurePath, 
+								buildLocation,
+								configArgs, 
+								AutotoolsPlugin.getFormattedString("MakeGenerator.gen.makefile", new String[]{buildDir}), //$NON-NLS-1$
+								errMsg, console, configureEnvs, false);
+						if (rc != IStatus.ERROR) {
+							File makefileFile = buildLocation.append(MAKEFILE).toFile();
+							addMakeTargetsToManager(makefileFile);
+							toolsCfg.setDirty(false);
+						}
+					} else {
+						File makefileFile = buildLocation.append(MAKEFILE).toFile();
+						addMakeTargetsToManager(makefileFile);
+						toolsCfg.setDirty(false);
+					}
+				}
+			}
+			// If nothing this far, look for a Makefile.cvs file which needs to be run. 
+			else if (makefileCvsExists()) {
+				String[] makeargs = new String[1];
+				IPath makeCmd = new Path("make"); //$NON-NLS-1$
+				makeargs[0] = "-f" + getMakefileCVSPath().toOSString(); //$NON-NLS-1$
+				rc = runCommand(makeCmd,
+						project.getLocation().append(buildDir),
+						makeargs,
+						AutotoolsPlugin.getFormattedString("MakeGenerator.makefile.cvs", new String[]{buildDir}), //$NON-NLS-1$
+						errMsg, console, consoleStart);
+				consoleStart = false;
+				if (rc != IStatus.ERROR) {
+					File makefileFile = project.getLocation().append(buildDir)
+					.append(MAKEFILE).toFile();
+					addMakeTargetsToManager(makefileFile);
+					toolsCfg.setDirty(false);
+				}
+			}
+			// If nothing this far, try running autoreconf -i
+			else {
+				String[] reconfArgs = new String[1];
+				String reconfCmd = project.getPersistentProperty(AutotoolsPropertyConstants.AUTORECONF_TOOL);
+				if (reconfCmd == null)
+					reconfCmd = DEFAULT_AUTORECONF;
+				IPath reconfCmdPath = new Path(reconfCmd);
+				reconfArgs[0] = "-i"; //$NON-NLS-1$
+				rc = runCommand(reconfCmdPath,
+						project.getLocation().append(srcDir),
+						reconfArgs,
+						AutotoolsPlugin.getFormattedString("MakeGenerator.autoreconf", new String[]{buildDir}), //$NON-NLS-1$
+						errMsg, console, consoleStart);
+				consoleStart = false;
+				// Check if configure generated and if yes, run it.
+				if (rc != IStatus.ERROR) {
+					if (configurePath.toFile().exists()) {
+						rc = runScript(configurePath, 
+								buildLocation,
+								configArgs, 
+								AutotoolsPlugin.getFormattedString("MakeGenerator.gen.makefile", new String[]{buildDir}), //$NON-NLS-1$
+								errMsg, console, configureEnvs, false);
+						if (rc != IStatus.ERROR) {
+							File makefileFile = buildLocation.append(MAKEFILE).toFile();
+							addMakeTargetsToManager(makefileFile);
+							// TODO: should we do something special if configure doesn't
+							// return ok?
+							toolsCfg.setDirty(false);
+						}
+					}
+				}
+			}
+    		// If we didn't create a Makefile, consider that an error.
+			if (makefile == null || !makefile.exists()) {
+				rc = IStatus.ERROR;
+				errMsg = AutotoolsPlugin.getResourceString("MakeGenerator.didnt.generate"); //$NON-NLS-1$
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			// forgetLastBuiltState();
+			rc = IStatus.ERROR;
+		} finally {
+			// getGenerationProblems().clear();
+			status = new MultiStatus(AutotoolsPlugin
+						.getUniqueIdentifier(), rc, errMsg, null);
+		}
+		return status;
+	}
+
+	/**
+	 * Strip a command of VAR=VALUE pairs that appear ahead of the command and add
+	 * them to a list of environment variables.
+	 *
+	 * @param command - command to strip
+	 * @param envVars - ArrayList to add environment variables to
+	 * @return stripped command
+	 */
+	public static String stripEnvVars(String command, ArrayList<String> envVars) {
+		Pattern p = Pattern.compile("(\\w+[=]([$]?\\w+[:;]?)+\\s+)\\w+.*");
+		Pattern p2 = Pattern.compile("(\\w+[=]\\\".*?\\\"\\s+)\\w+.*");
+		Pattern p3 = Pattern.compile("(\\w+[=]'.*?'\\s+)\\w+.*");
+		boolean finished = false;
+		while (!finished) {
+			Matcher m = p.matcher(command);
+			if (m.matches()) {
+				command = command.replaceFirst("\\w+[=]([$]?\\w+[:;]?)+", "").trim();
+				envVars.add(m.group(1).trim());
+			} else {
+				Matcher m2 = p2.matcher(command);
+				if (m2.matches()) {
+					command = command.replaceFirst("\\w+[=]\\\".*?\\\"","").trim();
+					String s = m2.group(1).trim();
+					envVars.add(s.replaceAll("\\\"", ""));
+				} else {
+					Matcher m3 = p3.matcher(command);
+					if (m3.matches()) {
+						command = command.replaceFirst("\\w+[=]'.*?'", "").trim();
+						String s = m3.group(1).trim();
+						envVars.add(s.replaceAll("'", ""));
+					} else {
+						finished = true;
+					}
+				}
+			}
+		}
+		return command;
+	}
+	
+	protected IPath getConfigurePath(ArrayList<String> envVars, ArrayList<String> cmdParms) {
+		IPath configPath;
+		IConfigureOption configOption = toolsCfg.getOption(CONFIGURE_TOOL_ID);
+		String command = "configure"; // $NON-NLS-1$
+		if (configOption != null)
+			command = stripEnvVars(configOption.getValue().trim(), envVars);
+			
+		String[] tokens = command.split("\\s");
+		if (tokens.length > 1) {
+			command = tokens[0];
+			for (int i = 1; i < tokens.length; ++i)
+				cmdParms.add(tokens[i]);
+		}
+		if (srcDir.equals(""))
+			configPath = project.getLocation().append(command);
+		else
+			configPath = project.getLocation().append(srcDir).append(command);
+		return configPath;
+	}
+
+	protected IPath getMakefileCVSPath() {
+		IPath makefileCVSPath;
+		if (srcDir.equals(""))
+			makefileCVSPath = project.getLocation().append(MAKEFILE_CVS);
+		else
+			makefileCVSPath= project.getLocation().append(srcDir).append(
+					MAKEFILE_CVS);
+		return makefileCVSPath;
+	}
+	
+	protected boolean makefileCvsExists() {
+		IPath makefileCVSPath = getMakefileCVSPath();
+		return makefileCVSPath.toFile().exists();
+	}
+
+	protected IPath getAutogenPath(ArrayList<String> envVars, ArrayList<String> cmdParms) {
+		IPath autogenPath;
+		IConfigureOption autogenOption = toolsCfg.getOption(AUTOGEN_TOOL_ID);
+		String command = "autogen.sh"; // $NON-NLS-1$
+		if (autogenOption != null)
+			command = stripEnvVars(autogenOption.getValue().trim(), envVars);
+
+		String[] tokens = command.split("\\s");
+		if (tokens.length > 1) {
+			command = tokens[0];
+			for (int i = 1; i < tokens.length; ++i)
+				cmdParms.add(tokens[i]);
+		}
+			
+		if (srcDir.equals(""))
+			autogenPath = project.getLocation().append(command);
+		else
+			autogenPath = project.getLocation().append(srcDir).append(command);
+		return autogenPath;
+	}
+	
+	private String[] getAutogenArgs(ArrayList<String> cmdParms) {
+		// Get the arguments to be passed to config from build model
+		ArrayList<String> autogenArgs = toolsCfg.getToolArgs(AUTOGEN_TOOL_ID);
+		cmdParms.addAll(autogenArgs);
+		return cmdParms.toArray(new String[cmdParms.size()]);
+	}
+
+	private String[] getConfigArgs(ArrayList<String> cmdParms) {
+		// Get the arguments to be passed to config from build model
+		ArrayList<String> configArgs = toolsCfg.getToolArgs(CONFIGURE_TOOL_ID);
+		cmdParms.addAll(configArgs);
+		return cmdParms.toArray(new String[cmdParms.size()]);
+	}
+
+	// Run a command or executable (e.g. make).
+	private int runCommand(IPath commandPath, IPath runPath, String[] args,
+			String jobDescription, String errMsg, IConsole console, 
+			boolean consoleStart) throws BuildException, CoreException,
+			NullPointerException, IOException {
+
+		int rc = IStatus.OK;
+		
+		removeAllMarkers(project);
+		
+		String[] configTargets = args;
+		if (args == null)
+			configTargets = new String[0];
+		
+		for (int i = 0; i < configTargets.length; ++i) {
+			// try to resolve the build macros in any argument
+			try{
+				String resolved =
+					ManagedBuildManager.getBuildMacroProvider().resolveValueToMakefileFormat(
+							configTargets[i],
+							"", //$NON-NLS-1$
+							" ", //$NON-NLS-1$
+							IBuildMacroProvider.CONTEXT_CONFIGURATION,
+							cfg);
+				configTargets[i] = resolved;
+			} catch (BuildMacroException e) {
+			}
+		}
+	
+		String[] msgs = new String[2];
+		msgs[0] = commandPath.toString();
+		msgs[1] = project.getName();
+		monitor.subTask(AutotoolsPlugin.getFormattedString(
+				"MakeGenerator.make.message", msgs)); //$NON-NLS-1$
+
+
+		ConsoleOutputStream consoleOutStream = null;
+		StringBuffer buf = new StringBuffer();
+
+		// Launch command - main invocation
+		if (consoleStart)
+			console.start(project);
+		consoleOutStream = console.getOutputStream();
+		String[] consoleHeader = new String[3];
+
+		consoleHeader[0] = jobDescription;
+		consoleHeader[1] = toolsCfg.getId();
+		consoleHeader[2] = project.getName();
+		buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+		buf.append(jobDescription);
+		buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+		buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+
+		consoleOutStream.write(buf.toString().getBytes());
+		consoleOutStream.flush();
+
+		// Get a launcher for the config command
+		CommandLauncher launcher = new CommandLauncher();
+		// Set the environment
+		IEnvironmentVariable variables[] = 
+			CCorePlugin.getDefault().getBuildEnvironmentManager().getVariables(cdesc, true);
+		String[] env = null;
+		ArrayList<String> envList = new ArrayList<String>();
+		if (variables != null) {
+			for (int i = 0; i < variables.length; i++) {
+				envList.add(variables[i].getName()
+						+ "=" + variables[i].getValue()); //$NON-NLS-1$
+			}
+			env = (String[]) envList.toArray(new String[envList.size()]);
+		}
+
+		// // Hook up an error parser manager
+		// String[] errorParsers =
+		// info.getDefaultConfiguration().getErrorParserList();
+		// ErrorParserManager epm = new ErrorParserManager(project, topBuildDir,
+		// this, errorParsers);
+		// epm.setOutputStream(consoleOutStream);
+		OutputStream stdout = consoleOutStream;
+		OutputStream stderr = consoleOutStream;
+
+		launcher.showCommand(true);
+		Process proc = launcher.execute(commandPath, configTargets, env,
+				runPath, new NullProgressMonitor());
+		if (proc != null) {
+			try {
+				// Close the input of the process since we will never write to
+				// it
+				proc.getOutputStream().close();
+			} catch (IOException e) {
+			}
+
+			if (launcher.waitAndRead(stdout, stderr, new SubProgressMonitor(
+					monitor, IProgressMonitor.UNKNOWN)) != CommandLauncher.OK) {
+				errMsg = launcher.getErrorMessage();
+			}
+
+			// Force a resync of the projects without allowing the user to
+			// cancel.
+			// This is probably unkind, but short of this there is no way to
+			// ensure
+			// the UI is up-to-date with the build results
+			// monitor.subTask(ManagedMakeMessages
+			// .getResourceString(REFRESH));
+			monitor.subTask(AutotoolsPlugin.getResourceString("MakeGenerator.refresh")); //$NON-NLS-1$
+			try {
+				project.refreshLocal(IResource.DEPTH_INFINITE, null);
+			} catch (CoreException e) {
+				monitor.subTask(AutotoolsPlugin
+						.getResourceString("MakeGenerator.refresh.error")); //$NON-NLS-1$
+			}
+		} else {
+			errMsg = launcher.getErrorMessage();
+		}
+
+		// Report either the success or failure of our mission
+		buf = new StringBuffer();
+		if (errMsg != null && errMsg.length() > 0) {
+			String errorDesc = AutotoolsPlugin
+					.getResourceString("MakeGenerator.generation.error"); //$NON-NLS-1$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			buf.append(errorDesc);
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			buf.append("(").append(errMsg).append(")"); //$NON-NLS-1$ //$NON-NLS-2$
+			rc = IStatus.ERROR;
+		} else if (proc.exitValue() >= 1 || proc.exitValue() < 0) {
+			// We have an invalid return code from configuration.
+			String[] errArg = new String[2];
+			errArg[0] = Integer.toString(proc.exitValue());
+			errArg[1] = commandPath.toString();
+			errMsg = AutotoolsPlugin.getFormattedString(
+					"MakeGenerator.config.error", errArg); //$NON-NLS-1$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			buf.append(AutotoolsPlugin.getResourceString("MakeGenerator.generation.error")); //$NON-NLS-1$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			if (proc.exitValue() == 1)
+				rc = IStatus.WARNING;
+			else
+			    rc = IStatus.ERROR;
+		} else {
+			// Report a successful build
+			String successMsg = 
+				AutotoolsPlugin.getResourceString("MakeGenerator.success"); //$NON-NLS-1$
+			buf.append(successMsg);
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			rc = IStatus.OK;
+		}
+
+		// Write message on the console
+		consoleOutStream.write(buf.toString().getBytes());
+		consoleOutStream.flush();
+
+		// // Generate any error markers that the build has discovered
+		// monitor.subTask(ManagedMakeMessages
+		// .getResourceString(MARKERS));
+		// epm.reportProblems();
+		consoleOutStream.close();
+		
+		// TODO: For now, add a marker with our generated error message.
+		// In the future, we might add an error parser to do this properly
+		// and give the actual error line, etc..
+		if (rc == IStatus.ERROR) {
+			addMarker(project, -1, errMsg, SEVERITY_ERROR_BUILD, null);
+		}
+		
+		return rc;
+	}
+
+    // Get the path string.  We add a Win check to handle MingW.
+    // For MingW, we would rather represent C:\a\b as /C/a/b which
+    // doesn't cause Makefile to choke.
+    // TODO: further logic would be needed to handle cygwin if desired
+    private String getPathString(IPath path) {
+            String s = path.toString();
+            if (Platform.getOS().equals(Platform.OS_WIN32))
+                    s = s.replaceAll("^([A-Z])(:)", "/$1");
+            return s;
+    }
+
+	// Run an autotools script (e.g. configure, autogen.sh, config.status).
+	private int runScript(IPath commandPath, IPath runPath, String[] args,
+			String jobDescription, String errMsg, IConsole console,
+			ArrayList<String> additionalEnvs, 
+			boolean consoleStart) throws BuildException, CoreException,
+			NullPointerException, IOException {
+
+		int rc = IStatus.OK;
+		
+		removeAllMarkers(project);
+		
+		// We want to run the script via the shell command.  So, we add the command
+		// script as the first argument and expect "sh" to be on the runtime path.
+		// Any other arguments are placed after the script name.
+		String[] configTargets = null;
+		if (args == null)
+			configTargets = new String[1];
+		else {
+			configTargets = new String[args.length+1];
+			System.arraycopy(args, 0, configTargets, 1, args.length);
+		}
+        configTargets[0] = getPathString(commandPath);
+
+        for (int i = 0; i < configTargets.length; ++i) {
+			// try to resolve the build macros in any argument
+			try{
+				String resolved =
+					ManagedBuildManager.getBuildMacroProvider().resolveValueToMakefileFormat(
+							configTargets[i],
+							"", //$NON-NLS-1$
+							" ", //$NON-NLS-1$
+							IBuildMacroProvider.CONTEXT_CONFIGURATION,
+							cfg);
+				configTargets[i] = resolved;
+			} catch (BuildMacroException e) {
+			}
+		}
+		
+		String[] msgs = new String[2];
+		msgs[0] = commandPath.toString();
+		msgs[1] = project.getName();
+		monitor.subTask(AutotoolsPlugin.getFormattedString(
+				"MakeGenerator.make.message", msgs)); //$NON-NLS-1$
+
+
+		ConsoleOutputStream consoleOutStream = null;
+		StringBuffer buf = new StringBuffer();
+
+		// Launch command - main invocation
+		if (consoleStart)
+			console.start(project);
+		consoleOutStream = console.getOutputStream();
+		String[] consoleHeader = new String[3];
+
+		consoleHeader[0] = jobDescription;
+		consoleHeader[1] = toolsCfg.getId();
+		consoleHeader[2] = project.getName();
+		buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+		buf.append(jobDescription);
+		buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+		buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+
+		consoleOutStream.write(buf.toString().getBytes());
+		consoleOutStream.flush();
+
+		// Get a launcher for the config command
+		CommandLauncher launcher = new CommandLauncher();
+		// Set the environment
+		IEnvironmentVariable variables[] = 
+			CCorePlugin.getDefault().getBuildEnvironmentManager().getVariables(cdesc, true);
+		String[] env = null;
+		ArrayList<String> envList = new ArrayList<String>();
+		if (variables != null) {
+			for (int i = 0; i < variables.length; i++) {
+				envList.add(variables[i].getName()
+						+ "=" + variables[i].getValue()); //$NON-NLS-1$
+			}
+			if (additionalEnvs != null)
+				envList.addAll(additionalEnvs); // add any additional environment variables specified ahead of script
+			env = (String[]) envList.toArray(new String[envList.size()]);
+		}
+
+		// // Hook up an error parser manager
+		// String[] errorParsers =
+		// info.getDefaultConfiguration().getErrorParserList();
+		// ErrorParserManager epm = new ErrorParserManager(project, topBuildDir,
+		// this, errorParsers);
+		// epm.setOutputStream(consoleOutStream);
+		OutputStream stdout = consoleOutStream;
+		OutputStream stderr = consoleOutStream;
+
+		launcher.showCommand(true);
+		// Run the shell script via shell command.
+		Process proc = launcher.execute(new Path(SHELL_COMMAND), configTargets, env,
+				runPath, new NullProgressMonitor());
+		if (proc != null) {
+			try {
+				// Close the input of the process since we will never write to
+				// it
+				proc.getOutputStream().close();
+			} catch (IOException e) {
+			}
+
+			if (launcher.waitAndRead(stdout, stderr, new SubProgressMonitor(
+					monitor, IProgressMonitor.UNKNOWN)) != CommandLauncher.OK) {
+				errMsg = launcher.getErrorMessage();
+			}
+
+			// Force a resync of the projects without allowing the user to
+			// cancel.
+			// This is probably unkind, but short of this there is no way to
+			// ensure
+			// the UI is up-to-date with the build results
+			// monitor.subTask(ManagedMakeMessages
+			// .getResourceString(REFRESH));
+			monitor.subTask(AutotoolsPlugin.getResourceString("MakeGenerator.refresh")); //$NON-NLS-1$
+			try {
+				project.refreshLocal(IResource.DEPTH_INFINITE, null);
+			} catch (CoreException e) {
+				monitor.subTask(AutotoolsPlugin
+						.getResourceString("MakeGenerator.refresh.error")); //$NON-NLS-1$
+			}
+		} else {
+			errMsg = launcher.getErrorMessage();
+		}
+
+		// Report either the success or failure of our mission
+		buf = new StringBuffer();
+		if (errMsg != null && errMsg.length() > 0) {
+			String errorDesc = AutotoolsPlugin
+					.getResourceString("MakeGenerator.generation.error"); //$NON-NLS-1$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			buf.append(errorDesc);
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			buf.append("(").append(errMsg).append(")"); //$NON-NLS-1$ //$NON-NLS-2$
+			rc = IStatus.ERROR;
+		} else if (proc.exitValue() >= 1 || proc.exitValue() < 0) {
+			// We have an invalid return code from configuration.
+			String[] errArg = new String[2];
+			errArg[0] = Integer.toString(proc.exitValue());
+			errArg[1] = commandPath.toString();
+			errMsg = AutotoolsPlugin.getFormattedString(
+					"MakeGenerator.config.error", errArg); //$NON-NLS-1$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			buf.append(AutotoolsPlugin.getResourceString("MakeGenerator.generation.error")); //$NON-NLS-1$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			if (proc.exitValue() == 1)
+				rc = IStatus.WARNING;
+			else
+			    rc = IStatus.ERROR;
+		} else {
+			// Report a successful build
+			String successMsg = 
+				AutotoolsPlugin.getResourceString("MakeGenerator.success"); //$NON-NLS-1$
+			buf.append(successMsg);
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			rc = IStatus.OK;
+		}
+
+		// Write message on the console
+		consoleOutStream.write(buf.toString().getBytes());
+		consoleOutStream.flush();
+
+		// // Generate any error markers that the build has discovered
+		// monitor.subTask(ManagedMakeMessages
+		// .getResourceString(MARKERS));
+		// epm.reportProblems();
+		consoleOutStream.close();
+		
+		// TODO: For now, add a marker with our generated error message.
+		// In the future, we might add an error parser to do this properly
+		// and give the actual error line, etc..
+		if (rc == IStatus.ERROR) {
+			addMarker(project, -1, errMsg, SEVERITY_ERROR_BUILD, null);
+		}
+		
+		return rc;
+	}
+	
+	private ICStorageElement createTargetElement(ICStorageElement parent, IMakeTarget target) {
+		ICStorageElement targetElem = parent.createChild(TARGET_ELEMENT);
+		targetElem.setAttribute(TARGET_ATTR_NAME, target.getName());
+		targetElem.setAttribute(TARGET_ATTR_ID, target.getTargetBuilderID());
+		targetElem.setAttribute(TARGET_ATTR_PATH, target.getContainer().getProjectRelativePath().toString());
+		ICStorageElement elem = targetElem.createChild(TARGET_COMMAND);
+		elem.setValue(target.getBuildAttribute(IMakeCommonBuildInfo.BUILD_COMMAND, "make")); //$NON-NLS-1$
+
+		String targetAttr = target.getBuildAttribute(IMakeCommonBuildInfo.BUILD_ARGUMENTS, null);
+		if ( targetAttr != null) {
+			elem = targetElem.createChild(TARGET_ARGUMENTS);
+			elem.setValue(targetAttr);
+		}
+
+		targetAttr = target.getBuildAttribute(IMakeTarget.BUILD_TARGET, null);
+		if (targetAttr != null) {
+			elem = targetElem.createChild(TARGET);
+			elem.setValue(targetAttr);
+		}
+
+		elem = targetElem.createChild(TARGET_STOP_ON_ERROR);
+		elem.setValue(new Boolean(target.isStopOnError()).toString());
+
+		elem = targetElem.createChild(TARGET_USE_DEFAULT_CMD);
+		elem.setValue(new Boolean(target.isDefaultBuildCmd()).toString());
+
+		elem = targetElem.createChild(TARGET_RUN_ALL_BUILDERS);
+		elem.setValue(new Boolean(target.runAllBuilders()).toString());
+
+		return targetElem;
+	}
+	
+	/**
+	 * This output method saves the information into the .cdtproject metadata file.
+	 * 
+	 * @param doc
+	 * @throws CoreException
+	 */
+	private void saveTargets(IMakeTarget[] makeTargets) throws CoreException {
+		// FIXME: fix this when MakeTargetManager fixes its code.
+		ICDescriptor descriptor = CCorePlugin.getDefault().getCProjectDescription(getProject(), true);
+		ICStorageElement rootElement = descriptor.getProjectStorageElement(MAKE_TARGET_KEY);
+
+		//Nuke the children since we are going to write out new ones
+		rootElement.clear();
+
+		// Fetch the ProjectTargets as ICStorageElements
+		rootElement = rootElement.createChild(BUILD_TARGET_ELEMENT);
+		for (int i = 0; i < makeTargets.length; ++i)
+			createTargetElement(rootElement, makeTargets[i]);
+
+		//Save the results
+		descriptor.saveProjectData();
+	}
+	
+	protected class MakeTargetComparator implements Comparator<Object> {
+		public int compare(Object a, Object b) {
+			IMakeTarget make1 = (IMakeTarget)a;
+			IMakeTarget make2 = (IMakeTarget)b;
+			return make1.getName().compareToIgnoreCase(make2.getName());
+		}
+		
+	}
+
+	/**
+	 * This method parses the given Makefile and produces MakeTargets for all targets so the
+	 * end-user can access them from the MakeTargets popup-menu.
+	 * 
+	 * @param makefileFile the Makefile to parse
+	 * @throws CoreException
+	 */
+	private void addMakeTargetsToManager(File makefileFile) throws CoreException {
+		// We don't bother if the Makefile wasn't created.
+		if (makefileFile == null || !makefileFile.exists())
+			return;
+		
+		checkCancel();
+		if (monitor == null)
+			monitor = new NullProgressMonitor();
+		String statusMsg = AutotoolsPlugin.getResourceString("MakeGenerator.refresh.MakeTargets");	//$NON-NLS-1$
+		monitor.subTask(statusMsg);
+		
+		IMakeTargetManager makeTargetManager = 
+			MakeCorePlugin.getDefault().getTargetManager();
+		
+		IMakefile makefile = MakeCorePlugin.createMakefile(makefileFile.toURI(), false, null);
+		ITargetRule[] targets = makefile.getTargetRules();
+		ITarget target = null;
+		Map<String, IMakeTarget> makeTargets = new HashMap<String, IMakeTarget>(); // use a HashMap so duplicate names are handled
+		String[] id = makeTargetManager.getTargetBuilders(getProject());
+		if (id.length == 0) {
+			return;
+		}
+		String targetBuildID = id[0];
+		IMakeBuilderInfo buildInfo = MakeCorePlugin.createBuildInfo(getProject(),
+				makeTargetManager.getBuilderID(targetBuildID));
+		boolean isStopOnError = buildInfo.isStopOnError();
+		IPath buildCommand = buildInfo.getBuildCommand();
+		String defaultBuildCommand = buildCommand.toString();
+		String buildArguments = buildInfo.getBuildArguments();
+		for (int i = 0; i < targets.length; i++) {
+			target = targets[i].getTarget();
+			String targetName = target.toString();
+			if (!isValidTarget(targetName, makeTargetManager))
+				continue;
+			try {
+				IMakeTarget makeTarget = makeTargetManager.findTarget(project, targetName);
+				if (makeTarget == null)
+					makeTarget = makeTargetManager.createTarget(
+						project, targetName, targetBuildID);
+				makeTarget.setContainer(project);
+				makeTarget.setStopOnError(isStopOnError);
+				makeTarget.setRunAllBuilders(false);
+				makeTarget.setUseDefaultBuildCmd(true);
+				makeTarget.setBuildAttribute(IMakeTarget.BUILD_ARGUMENTS, buildArguments);
+				makeTarget.setBuildAttribute(IMakeTarget.BUILD_COMMAND, defaultBuildCommand);
+
+				makeTarget.setBuildAttribute(GENERATED_TARGET, "true");
+				makeTarget.setBuildAttribute(IMakeTarget.BUILD_TARGET,
+						targetName);
+
+				//TODO: should this be raw build directory in macro form?
+				makeTarget.setBuildAttribute(IMakeTarget.BUILD_LOCATION,
+						buildDir);
+				makeTargets.put(makeTarget.getName(), makeTarget);
+			} catch (CoreException e) {
+				// Duplicate target.  Ignore.
+			}
+		}
+		
+		IMakeTarget[] makeTargetArray = new IMakeTarget[makeTargets.size()];
+		Collection<IMakeTarget> values = makeTargets.values();
+		ArrayList<IMakeTarget> valueList = new ArrayList<IMakeTarget>(values);
+		valueList.toArray(makeTargetArray);
+		MakeTargetComparator compareMakeTargets = new MakeTargetComparator();
+		Arrays.sort(makeTargetArray, compareMakeTargets);
+
+		// Check if we have MakeTargetManager patch which adds the ability
+		// to save multiple targets at once.  If yes, use it as it updates
+		// the MakeTargets now.  Otherwise, fall back to old method which
+		// saves the targets externally..requiring closing the project and
+		// reopening to see them.
+		Class<? extends IMakeTargetManager> c = makeTargetManager.getClass();
+		boolean targetsAdded = false;
+		try {
+			Method m = c.getMethod("setTargets", IContainer.class, IMakeTarget[].class);
+			m.invoke(makeTargetManager, project, makeTargetArray);
+			targetsAdded = true;
+		} catch (NoSuchMethodException e) {
+			// ignore and use fail-safe saveTargets method
+		} catch (IllegalArgumentException e) {
+			// ignore and use fail-safe saveTargets method
+		} catch (IllegalAccessException e) {
+			// ignore and use fail-safe saveTargets method
+		} catch (InvocationTargetException e) {
+			// ignore and use fail-safe saveTargets method
+		}
+		if (!targetsAdded)
+			saveTargets(makeTargetArray);
+	}
+
+	private boolean isValidTarget(String targetName, IMakeTargetManager makeTargetManager) {
+		return !(targetName.endsWith("-am") //$NON-NLS-1$
+				|| targetName.endsWith("PROGRAMS") //$NON-NLS-1$
+				|| targetName.endsWith("-generic") //$NON-NLS-1$
+				|| (targetName.indexOf('$') >= 0)
+				|| (targetName.charAt(0) == '.')
+				|| targetName.equals(targetName.toUpperCase()));
+	}
+	
+	// Turn the string into an array.
+	private String[] makeArray(String string) {
+		string = string.trim();
+		char[] array = string.toCharArray();
+		ArrayList<String> aList = new ArrayList<String>();
+		StringBuilder buffer = new StringBuilder();
+		boolean inComment = false;
+		for (int i = 0; i < array.length; i++) {
+			char c = array[i];
+			boolean needsToAdd = true;
+			if (array[i] == '"' || array[i] == '\'') {
+				if (i > 0 && array[i - 1] == '\\') {
+					inComment = false;
+				} else {
+					inComment = !inComment;
+					needsToAdd = false; // skip it
+				}
+			}
+			if (c == ' ' && !inComment) {
+				if (buffer.length() > 0){
+					String str = buffer.toString().trim();
+					if(str.length() > 0){
+						aList.add(str);
+					}
+				}
+				buffer = new StringBuilder();
+			} else {
+				if (needsToAdd)
+					buffer.append(c);
+			}
+		}
+		if (buffer.length() > 0){
+			String str = buffer.toString().trim();
+			if(str.length() > 0){
+				aList.add(str);
+			}
+		}
+		return (String[])aList.toArray(new String[aList.size()]);
+	}
+}
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsPropertyConstants.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsPropertyConstants.java
new file mode 100644
index 0000000..af3aac2
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsPropertyConstants.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core;
+
+import org.eclipse.core.runtime.QualifiedName;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+
+
+public class AutotoolsPropertyConstants {
+	
+	static final String PREFIX = AutotoolsPlugin.getUniqueIdentifier() + "."; // $NON-NLS-1$
+	static final String PREFIX_COMPAT = "org.eclipse.linuxtools.cdt.autotools."; // $NON-NLS-1$
+	public static final String AUTOMAKE_VERSION_STRING = "AutoconfEditorAutomakeVersion"; // $NON-NLS-1$
+	public static final QualifiedName AUTOMAKE_VERSION = new QualifiedName(PREFIX, AUTOMAKE_VERSION_STRING);
+	public static final QualifiedName AUTOMAKE_VERSION_COMPAT = new QualifiedName(PREFIX_COMPAT, AUTOMAKE_VERSION_STRING);
+	public static final String AUTOCONF_VERSION_STRING = "AutoconfEditorAutoconfVersion"; // $NON-NLS-1$
+	public static final QualifiedName AUTOCONF_VERSION = new QualifiedName(PREFIX, AUTOCONF_VERSION_STRING);
+	public static final QualifiedName AUTOCONF_VERSION_COMPAT = new QualifiedName(PREFIX_COMPAT, AUTOCONF_VERSION_STRING);
+	public static final String AUTOCONF_MACRO_VERSIONING = "AutoconfEditorMacroVersioning"; // $NON-NLS-1$
+	public static final QualifiedName AUTOCONF_TOOL = new QualifiedName(PREFIX, "AutoconfToolPath"); // $NON-NLS-1$
+	public static final QualifiedName AUTOMAKE_TOOL = new QualifiedName(PREFIX, "AutomakeToolPath"); // $NON-NLS-1$
+	public static final QualifiedName ACLOCAL_TOOL = new QualifiedName(PREFIX, "AclocalToolPath");  // $NON-NLS-1$
+	public static final QualifiedName AUTOHEADER_TOOL = new QualifiedName(PREFIX, "AutoheaderToolPath");  // $NON-NLS-1$
+	public static final QualifiedName AUTORECONF_TOOL = new QualifiedName(PREFIX, "AutoreconfToolPath");  // $NON-NLS-1$
+	public static final QualifiedName LIBTOOLIZE_TOOL = new QualifiedName(PREFIX, "LibtoolizePath");  // $NON-NLS-1$
+	public static final QualifiedName CLEAN_DELETE = new QualifiedName(PREFIX, "CleanDelete"); // $NON-NLS-1$
+	public static final QualifiedName CLEAN_MAKE_TARGET = new QualifiedName(PREFIX, "CleanMakeTarget"); // $NON-NLS-1$
+	public static final QualifiedName SCANNER_USE_MAKE_W = new QualifiedName(PREFIX, "ScannerUseMakeW");
+	public static final QualifiedName AUTO_BUILD_NAME = new QualifiedName(PREFIX, "AutoBuildName"); // $NON-NLS-1$
+	public static final QualifiedName OPEN_INCLUDE = new QualifiedName(PREFIX, "IncludeResourceMapping"); // $NON-NLS-1$
+	public static final QualifiedName OPEN_INCLUDE_P = new QualifiedName(PREFIX, "PersistentIncludeResourceMapping"); //$NON-NLS-1$
+	public static final QualifiedName SCANNER_INFO_DIRTY = new QualifiedName(PREFIX, "ScannerInfoDirty"); // $NON-NLSp-1$
+	
+	public static String[] fACVersions = {"2.13", "2.59", "2.61"}; // $NON-NLS-1$
+	public static final String LATEST_AC_VERSION = fACVersions[fACVersions.length - 1];
+	
+	public static String[] fAMVersions = {"1.4-p6", "1.9.5", "1.9.6"}; // $NON-NLS-1$
+	public static final String LATEST_AM_VERSION = fAMVersions[fAMVersions.length - 1];
+	
+	public static final String CLEAN_MAKE_TARGET_DEFAULT = "distclean"; // $NON-NLS-1$
+	
+	public static final String TRUE = "true"; // $NON-NLS-1$
+	public static final String FALSE = "false"; // $NON-NLS-1$
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/DefaultNoDependencyCalculator.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/DefaultNoDependencyCalculator.java
new file mode 100644
index 0000000..1eed38f
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/DefaultNoDependencyCalculator.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.core;
+
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyGenerator;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+
+/**
+ * This is the dependency calculator used by the makefile generation system when 
+ * nothing is defined for a tool.
+ *  
+ * @since 2.0
+ */
+@SuppressWarnings("deprecation")
+public class DefaultNoDependencyCalculator implements IManagedDependencyGenerator {
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderDependencyCalculator#findDependencies(org.eclipse.core.resources.IResource, org.eclipse.core.resources.IProject)
+	 */
+	public IResource[] findDependencies(IResource resource, IProject project) {
+		// Never answers any dependencies
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderDependencyCalculator#getCalculatorType()
+	 */
+	public int getCalculatorType() {
+		return TYPE_NODEPS;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderDependencyCalculator#getDependencyCommand(org.eclipse.core.resources.IResource)
+	 */
+	public String getDependencyCommand(IResource resource, IManagedBuildInfo info) {
+		// Never answers this call with an actual value
+		return null;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/IConfigurationCloneListener.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/IConfigurationCloneListener.java
new file mode 100644
index 0000000..34ce837
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/IConfigurationCloneListener.java
@@ -0,0 +1,12 @@
+package org.eclipse.linuxtools.internal.cdt.autotools.core;
+
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+
+public interface IConfigurationCloneListener {
+	/**
+	 * Notified when a configuration gets cloned.
+	 * @param cloneName - name of the cloned configuration
+	 * @param c - the clone
+	 */
+	public void cloneCfg(String cloneName, IConfiguration c);
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/MakeMessages.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/MakeMessages.java
new file mode 100644
index 0000000..05cfe3c
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/MakeMessages.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2004 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core;
+
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class MakeMessages {
+
+	private static final String RESOURCE_BUNDLE= MakeMessages.class.getName();
+	private static ResourceBundle fgResourceBundle;
+	static {
+		try {
+			fgResourceBundle = ResourceBundle.getBundle(RESOURCE_BUNDLE);
+		} catch (MissingResourceException x) {
+			fgResourceBundle = null;
+		}
+	}
+	
+	private MakeMessages() {
+	}
+		
+	public static String getString(String key) {
+		try {
+			return fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		} catch (NullPointerException e) {
+			return "#" + key + "#"; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+	
+	/**
+	 * Gets a string from the resource bundle and formats it with the argument
+	 * 
+	 * @param key	the string used to get the bundle value, must not be null
+	 */
+	public static String getFormattedString(String key, Object arg) {
+		return MessageFormat.format(getString(key), new Object[] { arg });
+	}
+
+	/**
+	 * Gets a string from the resource bundle and formats it with arguments
+	 */	
+	public static String getFormattedString(String key, Object[] args) {
+		return MessageFormat.format(getString(key), args);
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/MarkerGenerator.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/MarkerGenerator.java
new file mode 100644
index 0000000..3e6982a
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/MarkerGenerator.java
@@ -0,0 +1,155 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.IMarkerGenerator;
+import org.eclipse.cdt.core.ProblemMarkerInfo;
+import org.eclipse.cdt.core.model.ICModelMarker;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.runtime.CoreException;
+
+public abstract class MarkerGenerator implements IMarkerGenerator {
+
+	/**
+	 * Constructor for MarkerGenerator
+	 */
+	public MarkerGenerator() {
+		super();
+	}
+
+	/*
+	 * callback from Output Parser
+	 */
+	public void addMarker(IResource file, int lineNumber, String errorDesc, int severity, String errorVar) {
+
+		try {
+			IMarker[] cur = file.findMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, false, IResource.DEPTH_ONE);
+			/*
+			 * Try to find matching markers and don't put in duplicates
+			 */
+			if ((cur != null) && (cur.length > 0)) {
+				for (int i = 0; i < cur.length; i++) {
+					int line = ((Integer) cur[i].getAttribute(IMarker.LOCATION)).intValue();
+					int sev = ((Integer) cur[i].getAttribute(IMarker.SEVERITY)).intValue();
+					String mesg = (String) cur[i].getAttribute(IMarker.MESSAGE);
+					if (line == lineNumber && sev == mapMarkerSeverity(severity) && mesg.equals(errorDesc)) {
+						return;
+					}
+				}
+			}
+
+			IMarker marker = file.createMarker(ICModelMarker.C_MODEL_PROBLEM_MARKER);
+			marker.setAttribute(IMarker.LOCATION, lineNumber);
+			marker.setAttribute(IMarker.MESSAGE, errorDesc);
+			marker.setAttribute(IMarker.SEVERITY, mapMarkerSeverity(severity));
+			marker.setAttribute(IMarker.LINE_NUMBER, lineNumber);
+			marker.setAttribute(IMarker.CHAR_START, -1);
+			marker.setAttribute(IMarker.CHAR_END, -1);
+			if (errorVar != null) {
+				marker.setAttribute(ICModelMarker.C_MODEL_MARKER_VARIABLE, errorVar);
+			}
+		}
+		catch (CoreException e) {
+			CCorePlugin.log(e.getStatus());
+		}
+
+	}
+	
+	public abstract IProject getProject();
+
+	/*
+	 * callback from Output Parser
+	 */
+	public void addMarker(ProblemMarkerInfo problemMarkerInfo) {
+		try {
+			IResource markerResource = problemMarkerInfo.file ;
+			if (markerResource==null)  {
+				markerResource = getProject();
+			}
+			IMarker[] cur = markerResource.findMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, true, IResource.DEPTH_ONE);
+			/*
+			 * Try to find matching markers and don't put in duplicates
+			 */
+			if ((cur != null) && (cur.length > 0)) {
+				for (int i = 0; i < cur.length; i++) {
+					int line = ((Integer) cur[i].getAttribute(IMarker.LOCATION)).intValue();
+					int sev = ((Integer) cur[i].getAttribute(IMarker.SEVERITY)).intValue();
+					String mesg = (String) cur[i].getAttribute(IMarker.MESSAGE);
+					if (line == problemMarkerInfo.lineNumber && sev == mapMarkerSeverity(problemMarkerInfo.severity) && mesg.equals(problemMarkerInfo.description)) {
+						return;
+					}
+				}
+			}
+
+			IMarker marker = markerResource.createMarker(ICModelMarker.C_MODEL_PROBLEM_MARKER);
+			marker.setAttribute(IMarker.LOCATION, problemMarkerInfo.lineNumber);
+			marker.setAttribute(IMarker.MESSAGE, problemMarkerInfo.description);
+			marker.setAttribute(IMarker.SEVERITY, mapMarkerSeverity(problemMarkerInfo.severity));
+			marker.setAttribute(IMarker.LINE_NUMBER, problemMarkerInfo.lineNumber);
+			marker.setAttribute(IMarker.CHAR_START, -1);
+			marker.setAttribute(IMarker.CHAR_END, -1);
+			if (problemMarkerInfo.variableName != null) {
+				marker.setAttribute(ICModelMarker.C_MODEL_MARKER_VARIABLE, problemMarkerInfo.variableName);
+			}
+			if (problemMarkerInfo.externalPath != null) {
+				marker.setAttribute(ICModelMarker.C_MODEL_MARKER_EXTERNAL_LOCATION, problemMarkerInfo.externalPath.toOSString());
+			}
+		}
+		catch (CoreException e) {
+			CCorePlugin.log(e.getStatus());
+		}
+	}
+
+	private int mapMarkerSeverity(int severity) {
+		switch (severity) {
+			case SEVERITY_ERROR_BUILD :
+			case SEVERITY_ERROR_RESOURCE :
+				return IMarker.SEVERITY_ERROR;
+			case SEVERITY_INFO :
+				return IMarker.SEVERITY_INFO;
+			case SEVERITY_WARNING :
+				return IMarker.SEVERITY_WARNING;
+		}
+		return IMarker.SEVERITY_ERROR;
+	}
+	
+	/* (non-Javadoc)
+	 * Removes the IMarkers for the project specified in the argument if the
+	 * project exists, and is open. 
+	 * 
+	 * @param project
+	 */
+	public void removeAllMarkers(IProject project) {
+		if (project == null || !project.isAccessible()) return;
+
+		// Clear out the problem markers
+		IWorkspace workspace = project.getWorkspace();
+		IMarker[] markers;
+		try {
+			markers = project.findMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE);
+		} catch (CoreException e) {
+			// Handled just about every case in the sanity check
+			return;
+		}
+		if (markers != null) {
+			try {
+				workspace.deleteMarkers(markers);
+			} catch (CoreException e) {
+				// The only situation that might cause this is some sort of resource change event
+				return;
+			}
+		}
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AbstractConfigurationOption.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AbstractConfigurationOption.java
new file mode 100644
index 0000000..3fcf840
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AbstractConfigurationOption.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.configure;
+
+import java.util.ArrayList;
+
+public abstract class AbstractConfigurationOption implements IConfigureOption {
+
+	protected String name;
+	private String msgName;
+	protected AutotoolsConfiguration cfg;
+
+	public AbstractConfigurationOption(String name, AutotoolsConfiguration cfg) {
+		this(name, name, cfg);
+	}
+	
+	public AbstractConfigurationOption(String name, String msgName, AutotoolsConfiguration cfg) {
+		this.name = name;
+		this.msgName = msgName;
+		this.cfg = cfg;
+	}
+	
+	public String getDescription() {
+		return ConfigureMessages.getConfigureDescription(msgName);
+	}
+
+	public String getToolTip() {
+		return ConfigureMessages.getConfigureTip(msgName);
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public AutotoolsConfiguration getCfg() {
+		return cfg;
+	}
+	
+	public ArrayList<String> getParameters() {
+		ArrayList<String> parameters = new ArrayList<String>();
+		if (isParmSet())
+			parameters.add(getParameter());
+		return parameters;
+	}
+	
+	public String getParameterName() {
+		return "--" + getName();
+	}
+
+	public boolean isCategory() {
+		return false;
+	}
+
+	public boolean isMultiArg() {
+		return false;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsConfiguration.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsConfiguration.java
new file mode 100644
index 0000000..f6e1625
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsConfiguration.java
@@ -0,0 +1,320 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.configure;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+
+public class AutotoolsConfiguration implements IAConfiguration {
+
+	public static class Option {
+		private String name;
+		private String transformedName;
+		private int type;
+		private String defaultValue;
+		
+		public Option(String name, int type) {
+			this(name, name, type);
+		}
+		
+		public Option(String name, String transformedName, int type) {
+			this.name = name;
+			this.transformedName = transformedName;
+			this.type = type;
+		}
+		
+		public Option(String name, String transformedName, String defaultValue, int type) {
+			this.name = name;
+			this.transformedName = transformedName;
+			this.type = type;
+			this.defaultValue = defaultValue;
+		}
+		
+		public String getName() {
+			return name;
+		}
+		
+		public int getType() {
+			return type;
+		}
+		
+		public String getDefaultValue() {
+			return defaultValue;
+		}
+		
+		public String getDescription() {
+			return ConfigureMessages.getConfigureDescription(transformedName);
+		}
+		
+		public String getToolTip() {
+			return ConfigureMessages.getConfigureTip(transformedName);
+		}
+	}
+	
+	// Configure options and categories.  List below is ordered.
+	// All options following a category are children of that category
+	// in a tree view, up to the next category.
+	private static Option[] configOpts = new Option[] {
+		new Option("configure", IConfigureOption.TOOL), // $NON-NLS-1$
+		new Option("general", IConfigureOption.CATEGORY), // $NON-NLS-1$
+		new Option("configdir", IConfigureOption.INTERNAL), // $NON-NLS-1$
+		new Option("cache-file", "cache_file", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("help", IConfigureOption.BIN), // $NON-NLS-1$
+		new Option("no-create", "no_create", IConfigureOption.BIN), // $NON-NLS-1$
+		new Option("quiet", IConfigureOption.BIN), // $NON-NLS-1$
+		new Option("version", IConfigureOption.BIN), // $NON-NLS-1$
+		new Option("platform", IConfigureOption.CATEGORY), // $NON-NLS-1$
+		new Option("host", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("build", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("target", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("directories", IConfigureOption.CATEGORY), // $NON-NLS-1$
+		new Option("prefix", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("exec-prefix", "exec_prefix", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("libdir", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("bindir", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("sbindir", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("includedir", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("datadir", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("sysconfdir", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("infodir", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("mandir", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("srcdir", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("localstatedir", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("sharedstatedir", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("libexecdir", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("oldincludedir", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("filenames", IConfigureOption.CATEGORY), // $NON-NLS-1$
+		new Option("program-prefix", "program_prefix", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("program-suffix", "program_suffix", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("program-transform-name", "program_transform_name", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("features", IConfigureOption.CATEGORY), // $NON-NLS-1$
+		new Option("enable-maintainer-mode", "enable_maintainer_mode", IConfigureOption.BIN), // $NON-NLS-1$
+		new Option("user", IConfigureOption.MULTIARG), // $NON-NLS-1$
+		new Option("autogen", "autogen", "autogen.sh", IConfigureOption.TOOL), // $NON-NLS-1$
+		new Option("options", IConfigureOption.CATEGORY), // $NON-NLS-1$
+		new Option("autogenOpts", IConfigureOption.MULTIARG), // $NON-NLS-1$
+	};
+	
+	private static Option[] toolList;
+	
+	private String id;
+	private boolean isDirty;
+	private boolean isParmsDirty;
+	private Map<String, IConfigureOption> configOptions;
+	private ArrayList<String> configParms = new ArrayList<String>();
+
+	public AutotoolsConfiguration(String name) {
+		this(name, true);
+	}
+		
+	private AutotoolsConfiguration(String name, boolean initialize) {
+		this.id = name;
+		configOptions = new HashMap<String, IConfigureOption>();
+		if (initialize)
+			initConfigOptions();
+		isParmsDirty = true;
+	}
+	
+	private void initConfigOptions() {
+		// Put configure options in hash map.  Ignore categories.
+		ArrayList<Option> tools = new ArrayList<Option>();
+		for (int i = 0; i < configOpts.length; ++i) {
+			Option opt = configOpts[i];
+			String defaultValue = opt.getDefaultValue();
+			int type = opt.type;
+			switch (type) {
+			case IConfigureOption.BIN:
+				BinConfigureOption b = new BinConfigureOption(opt.name, opt.transformedName, this);
+				if (defaultValue != null)
+					b.setValue(defaultValue);
+				configOptions.put(opt.name, b);
+				break;
+			case IConfigureOption.STRING:
+				StringConfigureOption s = new StringConfigureOption(opt.name, opt.transformedName, this);
+				if (defaultValue != null)
+					s.setValue(defaultValue);
+				configOptions.put(opt.name, s);
+				break;
+			case IConfigureOption.INTERNAL:
+				InternalConfigureOption io = new InternalConfigureOption(opt.name, opt.transformedName, this);
+				if (defaultValue != null)
+					io.setValue(defaultValue);
+				configOptions.put(opt.name, io);
+				break;
+			case IConfigureOption.MULTIARG:
+				MultiArgConfigureOption m = new MultiArgConfigureOption(opt.name, opt.transformedName, this);
+				if (defaultValue != null)
+					m.setValue(defaultValue);
+				configOptions.put(opt.name, m);
+				break;
+			case IConfigureOption.TOOL:
+				tools.add(opt);
+				ConfigureTool t = new ConfigureTool(opt.name, opt.transformedName, this);
+				if (defaultValue != null)
+					t.setValue(defaultValue);
+				configOptions.put(opt.name, t);
+				break;
+			case IConfigureOption.CATEGORY:
+				configOptions.put(opt.name, new ConfigureOptionCategory(opt.name));
+			}
+		}
+		toolList = tools.toArray(new Option[tools.size()]);
+	}
+	
+	public static Option[] getOptionList() {
+		return configOpts;
+	}
+
+	public static Option[] getChildOptions(String name) {
+		ArrayList<Option> options = new ArrayList<Option>();
+		for (int i = 0; i < configOpts.length; ++i) {
+			Option opt = configOpts[i];
+			if (opt.getName().equals(name)) {
+				if (opt.getType() == IConfigureOption.CATEGORY) {
+					for (int j = i + 1; j < configOpts.length; ++j) {
+						Option o = configOpts[j];
+						int type = o.getType();
+						if (type != IConfigureOption.CATEGORY &&
+								type != IConfigureOption.TOOL)
+							options.add(o);
+						else
+							return options.toArray(new Option[options.size()]);
+					}
+				} else if (opt.getType() == IConfigureOption.TOOL) {
+					for (int j = i + 1; j < configOpts.length; ++j) {
+						Option o = configOpts[j];
+						int type = o.getType();
+						if (type == IConfigureOption.CATEGORY)
+							options.add(o);
+						else if (type == IConfigureOption.TOOL)
+							return options.toArray(new Option[options.size()]);
+					}	
+				}
+			}
+		}
+		return options.toArray(new Option[options.size()]);
+	}
+	
+	public static Option[] getTools() {
+		return toolList;
+	}
+	
+	public IConfigureOption getOption(String name) {
+		return configOptions.get(name);
+	}
+
+	public IAConfiguration copy() {
+		return copy(id);
+	}
+	
+	public IAConfiguration copy(String newId) {
+		AutotoolsConfiguration cfg = new AutotoolsConfiguration(newId, false);
+		Collection<IConfigureOption> oldValues = configOptions.values();
+		for (Iterator<IConfigureOption> i = oldValues.iterator(); i.hasNext();) {
+			IConfigureOption opt = i.next();
+			cfg.configOptions.put(opt.getName(), opt.copy(cfg));
+		}
+		if (getId().equals(newId))
+			cfg.setDirty(isDirty()); // copying with same id, do not change dirty attribute
+		else
+			cfg.setDirty(true); // we are cloning with a new id, treat it as never built/dirty
+		return cfg;
+	}
+	
+	public String getId() {
+		return id;
+	}
+	
+	public boolean isDirty() {
+		return isDirty;
+	}
+	
+	public void setDirty(boolean value) {
+		isDirty = value;
+		if (isDirty)
+			isParmsDirty = true;
+	}
+	
+	public Map<String, IConfigureOption> getOptions() {
+		return configOptions;
+	}
+	
+	public String getToolParameters(String name) {
+		StringBuffer buf = new StringBuffer();
+		Option[] options = getChildOptions(name);
+		for (int i = 0; i < options.length; ++i) {
+			IConfigureOption option = getOption(options[i].getName());
+			if (option.getType() == IConfigureOption.CATEGORY) {
+				Option[] childOptions = getChildOptions(option.getName());
+				for (int j = 0; j < childOptions.length; ++j) {
+					IConfigureOption childOption = getOption(childOptions[j].getName());
+					String parameter = childOption.getParameter();
+					if (!parameter.equals(""))
+						buf.append(" " + parameter);
+				}
+			} else {
+				String parameter = option.getParameter();
+				if (!parameter.equals(""))
+					buf.append(" " + parameter);
+			}
+		}
+		return buf.toString();
+	}
+
+	public ArrayList<String> getToolArgs(String name) {
+		if (isParmsDirty) {
+			configParms = new ArrayList<String>();
+			Option[] options = getChildOptions(name);
+			for (int i = 0; i < options.length; ++i) {
+				IConfigureOption option = getOption(options[i].getName());
+				if (option.getType() == IConfigureOption.CATEGORY) {
+					Option[] childOptions = getChildOptions(option.getName());
+					for (int j = 0; j < childOptions.length; ++j) {
+						IConfigureOption childOption = getOption(childOptions[j].getName());
+						ArrayList<String> parameters = childOption.getParameters();
+						configParms.addAll(parameters);
+					}
+				} else {
+					ArrayList<String> parameters = option.getParameters();
+					configParms.addAll(parameters);
+				}
+			}
+		}
+		return configParms;
+	}
+
+	public void setOption(String name, String value) {
+		IConfigureOption option = configOptions.get(name);
+		if (option != null) {
+			if (!option.getValue().equals(value)) {
+				option.setValue(value);
+				setDirty(true);
+			}
+		}
+	}
+	
+	public void setConfigToolDirectory(String configToolDirectory) {
+		setOption("configdir", configToolDirectory);
+	}
+
+	public String getConfigToolDirectory() {
+		IConfigureOption option = configOptions.get("configdir");
+		return option.getValue();
+	}
+
+	public void setDefaultOptions() {
+		initConfigOptions();
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsConfigurationManager.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsConfigurationManager.java
new file mode 100644
index 0000000..161feaf
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsConfigurationManager.java
@@ -0,0 +1,486 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.configure;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.eclipse.cdt.core.model.CoreModel;
+import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
+import org.eclipse.cdt.core.settings.model.ICProjectDescription;
+import org.eclipse.cdt.core.settings.model.extension.CConfigurationData;
+import org.eclipse.cdt.managedbuilder.core.BuildException;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IHoldsOptions;
+import org.eclipse.cdt.managedbuilder.core.IOption;
+import org.eclipse.cdt.managedbuilder.core.ITool;
+import org.eclipse.cdt.managedbuilder.core.IToolChain;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsConfiguration.Option;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+public class AutotoolsConfigurationManager implements IResourceChangeListener {
+	
+	public final static String CFG_FILE_NAME = ".autotools"; //$NON-NLS-1$
+	private final static String CFG_CANT_SAVE = "Configure.Error.NoProjectToSave"; //$NON-NLS-1$
+	
+	
+	private static AutotoolsConfigurationManager instance;
+	
+	private boolean isSyncing;
+	
+	private static Map<String, Map<String, IAConfiguration>> configs;
+	private static Map<String, Map<String, IAConfiguration>> tmpConfigs;
+	
+	private AutotoolsConfigurationManager() {
+		configs = new HashMap<String, Map<String, IAConfiguration>>();
+		tmpConfigs = new HashMap<String, Map<String, IAConfiguration>>();
+		AutotoolsPlugin.getWorkspace().addResourceChangeListener(this);
+	}
+	
+	public static AutotoolsConfigurationManager getInstance() {
+		if (instance == null) {
+			instance = new AutotoolsConfigurationManager();
+		}
+		return instance;
+	}
+
+	public IAConfiguration createDefaultConfiguration(IProject project, String id) {
+		IAConfiguration cfg = new AutotoolsConfiguration(id);
+		return cfg;
+	}
+	
+	public IAConfiguration findCfg(IProject p, String id) {
+		Map<String, IAConfiguration> cfgs = getConfigurations(p);
+		return cfgs.get(id);
+	}
+
+	public IAConfiguration getConfiguration(IProject p, String cfgId) {
+		return getConfiguration(p, cfgId, true);
+	}
+
+	public IAConfiguration getConfiguration(IProject p, String cfgId, boolean persist) {
+		IAConfiguration cfg = findCfg(p, cfgId);
+		if (cfg == null) {
+			cfg = createDefaultConfiguration(p, cfgId);
+			if (persist) {
+				addConfiguration(p, cfg);
+			}
+		} else {
+			if (!persist) {
+				cfg = cfg.copy();
+			}
+		}
+		return cfg;
+	}
+	
+	
+	public boolean isConfigurationAlreadySaved(IProject project, ICConfigurationDescription cfgd) {
+		Map<String, IAConfiguration> cfgs = getSavedConfigs(project);
+		if (cfgs != null)
+			return cfgs.get(cfgd.getId()) != null;
+		return false;
+	}
+	
+	public void addConfiguration(IProject project, IAConfiguration cfg) {
+		String projectName = project.getName();
+		Map<String, IAConfiguration> cfgs = getSavedConfigs(project);
+		if (cfgs == null) {
+			cfgs = new HashMap<String, IAConfiguration>();
+			configs.put(projectName, cfgs);
+		}
+		cfgs.put(cfg.getId(), cfg);
+		saveConfigs(project);
+	}
+	
+	public boolean isSyncing() {
+		return isSyncing;
+	}
+
+	private void setSyncing(boolean value) {
+		isSyncing = value;
+	}
+	
+	/** 
+	 * Synchronize the current set of configurations for the project with the
+	 * Autotools saved configuration data.  This is required when configuration
+	 * management occurs outside of the Autotools Configure Settings page in the
+	 * Property menu.
+	 * 
+	 * @param project to synchronize configurations for
+	 * 
+	 */
+	public void syncConfigurations(IProject project) {
+		setSyncing(true);
+		clearTmpConfigurations(project);
+		ICProjectDescription pd = CoreModel.getDefault().getProjectDescription(project);
+		ICConfigurationDescription[] cfgs = pd.getConfigurations();
+		Map <String, IAConfiguration> newCfgList = new HashMap<String, IAConfiguration>();
+		for (int i = 0; i < cfgs.length; ++i) {
+			cfgs[i].getConfigurationData();
+			IAConfiguration acfg = getTmpConfiguration(project, cfgs[i]);
+			newCfgList.put(cfgs[i].getId(), acfg);
+		}
+		setSyncing(false);
+		clearTmpConfigurations(project);
+		replaceProjectConfigurations(project, newCfgList);
+	}
+	
+	public void replaceProjectConfigurations(IProject project, Map<String, IAConfiguration> cfgs) {
+		String projectName = project.getName();
+		configs.put(projectName, cfgs);
+		saveConfigs(project);
+	}
+
+	public void replaceProjectConfigurations(IProject project, Map<String, IAConfiguration> cfgs, ICConfigurationDescription[] cfgds) {
+		String projectName = project.getName();
+		configs.put(projectName, cfgs);
+		saveConfigs(project, cfgds);
+	}
+
+	private Map<String, IAConfiguration> getSavedConfigs(IProject project) {
+		String projectName = project.getName();
+		Map<String, IAConfiguration> list = configs.get(projectName);
+		if (list == null) {
+			try {
+				IPath fileLocation = project.getLocation().append(CFG_FILE_NAME);
+				File dirFile = fileLocation.toFile();
+				Map<String, IAConfiguration> cfgList = new HashMap<String, IAConfiguration>();
+				DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+				DocumentBuilder db = dbf.newDocumentBuilder();
+				if (dirFile.exists()) {
+					Document d = db.parse(dirFile);
+					Element e = d.getDocumentElement();
+					// Get the stored configuration data
+					NodeList cfgs = e.getElementsByTagName("configuration"); // $NON-NLS-1$
+					for (int x = 0; x < cfgs.getLength(); ++x) {
+						Node n = cfgs.item(x);
+						NamedNodeMap attrs = n.getAttributes();
+						// Originally we used the configuration name, but now we use
+						// the ConfigurationDescription id which is unique.  Check for
+						// id first, but fall back to name for older .autotools files.
+						Node nameNode = attrs.getNamedItem("name"); // $NON-NLS-1$
+						Node cfgIdNode = attrs.getNamedItem("id"); // $NON-NLS-1$
+						String cfgId = null;
+						if (cfgIdNode != null)
+							cfgId = cfgIdNode.getNodeValue();
+						else if (nameNode != null) {
+							String cfgName = nameNode.getNodeValue();
+							ICConfigurationDescription cfgd = 
+								CoreModel.getDefault().getProjectDescription(project).getConfigurationByName(cfgName);
+							if (cfgd != null)
+								cfgId = cfgd.getId();
+							else
+								continue; // have to punt, this doesn't map to real cfg
+						}
+						IAConfiguration cfg = new AutotoolsConfiguration(cfgId);
+						NodeList l = n.getChildNodes();
+						for (int y = 0; y < l.getLength(); ++y) {
+							Node child = l.item(y);
+							if (child.getNodeName().equals("option")) { // $NON-NLS-1$
+								NamedNodeMap optionAttrs = child.getAttributes();
+								Node id = optionAttrs.getNamedItem("id"); // $NON-NLS-1$
+								Node value = optionAttrs.getNamedItem("value"); // $NON-NLS-1$
+								if (id != null && value != null)
+									cfg.setOption(id.getNodeValue(), value.getNodeValue());
+							}
+						}
+						cfg.setDirty(false);
+						cfgList.put(cfg.getId(), cfg);
+					}
+					if (cfgList.size() > 0) {
+						configs.put(projectName, cfgList);
+						list = cfgList;
+					}
+				}
+			} catch (ParserConfigurationException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (SAXException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		return list;
+	}
+
+	public IAConfiguration getTmpConfiguration(IProject p, ICConfigurationDescription cfgd) {
+		Map <String, IAConfiguration> list = getTmpConfigs(p);
+		IAConfiguration acfg = list.get(cfgd.getId());
+		if (acfg != null) {
+			return acfg;
+		}
+		IAConfiguration oldCfg = getConfiguration(p, cfgd.getId(), false);
+		list.put(cfgd.getId(), oldCfg);
+		return oldCfg;
+	}
+
+	/**
+	 * Clone a configuration and put it on the tmp list if it is not already a saved configuration
+	 * and not already on the tmp list.
+	 * 
+	 * @param p project
+	 * @param oldId the id of the old configuration to clone
+	 * @param cfgd the configuration descriptor for the clone
+	 * @return true if the configuration is already saved, false otherwise
+	 */
+	public boolean cloneCfg(IProject p, String oldId, ICConfigurationDescription cfgd) {
+		if (isConfigurationAlreadySaved(p, cfgd))
+			return true;
+		Map <String, IAConfiguration> tmpList = getTmpConfigs(p);
+		String newId = cfgd.getId();
+		// Don't bother if the new configuration is already on the tmp list
+		IAConfiguration cfg = tmpList.get(newId);
+		if (cfg != null)
+			return false;
+		// Otherwise, try and find the old id to copy the configuration from
+		// or punt if not found
+		Map <String, IAConfiguration> savedList = getSavedConfigs(p);
+		IAConfiguration oldCfg = savedList.get(oldId);
+		if (oldCfg != null) {
+			IAConfiguration newCfg = oldCfg.copy(cfgd.getId());
+			tmpList.put(cfgd.getId(), newCfg);
+			// Check to see if the new configuration is already stored as part of the project description.
+			// If yes, it should already be saved.  This can occur if the configuration was added as part of
+			// another CDT Property page and the Autotools Property page was never opened.
+			if (CoreModel.getDefault().getProjectDescription(p).getConfigurationById(newId) != null) {
+				addConfiguration(p, newCfg);
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private Map<String, IAConfiguration> getTmpConfigs(IProject p) {
+		Map <String, IAConfiguration> tmpList = tmpConfigs.get(p.getName());
+		if (tmpList == null) {
+			tmpList = new HashMap<String, IAConfiguration>();
+			tmpConfigs.put(p.getName(), tmpList);
+		}
+		return tmpList;
+	}
+	
+	public void clearTmpConfigurations(IProject p) {
+		tmpConfigs.remove(p.getName());
+	}
+
+	public void saveConfigs(IProject project) {
+		ICConfigurationDescription[] cfgds = CoreModel.getDefault().getProjectDescription(project).getConfigurations();
+		saveConfigs(project, cfgds);
+	}
+	
+	private void syncNameField(ICConfigurationDescription cfgd) {
+		IConfiguration icfg = ManagedBuildManager.getConfigurationForDescription(cfgd);
+		String id = cfgd.getId();
+		if (icfg != null) {
+			IToolChain toolchain = icfg.getToolChain();
+			ITool[] tools = toolchain.getTools();
+			for (int j = 0; j < tools.length; ++j) {
+				ITool tool = tools[j];
+				if (tool.getName().equals("configure")) { //$NON-NLS-1$
+					IOption option = 
+						tool.getOptionBySuperClassId("org.eclipse.linuxtools.cdt.autotools.core.option.configure.name"); // $NON-NLS-1$
+					IHoldsOptions h = (IHoldsOptions)tool;
+					try {
+						IOption optionToSet = h.getOptionToSet(option, false);
+						optionToSet.setValue(id);
+					} catch (BuildException e) {
+					}
+				}
+			}
+		}
+	}
+	
+	
+	private void saveConfigs(IProject project, ICConfigurationDescription[] cfgds) {
+		try {
+			String projectName = project.getName();
+			IPath output = project.getLocation().append(CFG_FILE_NAME);
+			File f = output.toFile();
+			if (!f.exists())
+				f.createNewFile();
+			if (f.exists()) {
+				PrintWriter p = new PrintWriter(new BufferedWriter(new FileWriter(f)));
+				Map<String, IAConfiguration> cfgs = configs.get(projectName);
+				p.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); //$NON-NLS-1$
+				p.println("<configurations>"); // $NON-NLS-1$
+				Option[] optionList = AutotoolsConfiguration.getOptionList();
+				// Before saving, force any cloning to occur via the option value handler.
+				setSyncing(true);
+				for (int i = 0; i < cfgds.length; ++i) {
+					@SuppressWarnings("unused")
+					CConfigurationData data = cfgds[i].getConfigurationData();
+				}
+				setSyncing(false);
+				for (int i = 0; i < cfgds.length; ++i) {
+					ICConfigurationDescription cfgd = cfgds[i];
+					String id = cfgd.getId();
+					IAConfiguration cfg = cfgs.get(id);
+					if (cfg == null) {
+						cfg = createDefaultConfiguration(project, id);
+					}
+					p.println("<configuration id=\"" + cfg.getId() + "\">"); //$NON-NLS-1$ //$NON-NLS-2$ 
+					for (int j = 0; j < optionList.length; ++j) {
+						Option option = optionList[j];
+						IConfigureOption opt = cfg.getOption(option.getName());
+						if (!opt.isCategory())
+							p.println("<option id=\"" + option.getName() + "\" value=\"" + opt.getValue() + "\"/>"); //$NON-NLS-1$ //$NON-NLS-2$ // $NON-NLS-3$
+					}
+					p.println("</configuration>"); //$NON-NLS-1$
+					// Sync name field as this configuration is now officially saved
+					syncNameField(cfgd);
+				}
+				p.println("</configurations>");
+				p.close();
+			}
+		} catch (IOException e) {
+			AutotoolsPlugin.log(e);
+		}
+	}
+	
+	// Perform apply of configuration changes.  This rewrites out the current known list of configurations
+	// with any changes currently that have been made to them.  If a configuration has been renamed, but this
+	// has not yet been confirmed by the end-user, then only the changes to the configuration are made.  The
+	// name currently remains the same in the output file.
+	public void applyConfigs(String projectName, ICConfigurationDescription[] cfgds) {
+		try {
+			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+			IResource res = (IProject)root.findMember(projectName, false);
+			if (res == null || res.getType() != IResource.PROJECT) {
+				AutotoolsPlugin.logErrorMessage(ConfigureMessages.getFormattedString(CFG_CANT_SAVE,
+						new String[]{projectName}));
+				return;
+			}
+			IProject project = (IProject)res;
+			IPath output = project.getLocation().append(CFG_FILE_NAME);
+			File f = output.toFile();
+			if (!f.exists())
+				f.createNewFile();
+			if (f.exists()) {
+				PrintWriter p = new PrintWriter(new BufferedWriter(new FileWriter(f)));
+				Map<String, IAConfiguration> cfgs = getSavedConfigs(project);
+				if (cfgs == null)
+					return;
+				p.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); //$NON-NLS-1$
+				p.println("<configurations>"); // $NON-NLS-1$
+				Option[] optionList = AutotoolsConfiguration.getOptionList();
+				HashSet<String> savedIds = new HashSet<String>();
+				setSyncing(true);
+				for (int x = 0; x < cfgds.length; ++x) {
+					ICConfigurationDescription cfgd = cfgds[x];
+					@SuppressWarnings("unused")
+					CConfigurationData data = cfgd.getConfigurationData();
+					String id = cfgd.getId();
+					savedIds.add(id);
+					IAConfiguration cfg = getTmpConfiguration(project, cfgd);
+					cfgs.put(id, cfg); // add to list in case we have a new configuration not yet added to Project Description
+					p.println("<configuration id=\"" + id + "\">"); //$NON-NLS-1$ //$NON-NLS-2$ 
+					for (int j = 0; j < optionList.length; ++j) {
+						Option option = optionList[j];
+						IConfigureOption opt = cfg.getOption(option.getName());
+						if (!opt.isCategory())
+							p.println("<option id=\"" + option.getName() + "\" value=\"" + opt.getValue() + "\"/>"); //$NON-NLS-1$ //$NON-NLS-2$ // $NON-NLS-3$
+					}
+					p.println("</configuration>"); //$NON-NLS-1$
+					syncNameField(cfgd);
+				}
+				setSyncing(false);
+
+				// Put all the remaining configurations already saved back into the file.
+				// These represent deleted configurations, but confirmation has not occurred.
+				for (Iterator<String> i = cfgs.keySet().iterator(); i.hasNext(); ) {
+					String id = i.next();
+					// A remaining id won't appear in our savedIds list.
+					if (!savedIds.contains(id)) {
+						IAConfiguration cfg = cfgs.get(id);
+						p.println("<configuration id=\"" + id + "\">"); //$NON-NLS-1$ //$NON-NLS-2$ 
+						for (int j = 0; j < optionList.length; ++j) {
+							Option option = optionList[j];
+							IConfigureOption opt = cfg.getOption(option.getName());
+							if (!opt.isCategory())
+								p.println("<option id=\"" + option.getName() + "\" value=\"" + opt.getValue() + "\"/>"); //$NON-NLS-1$ //$NON-NLS-2$ // $NON-NLS-3$
+						}
+						p.println("</configuration>"); //$NON-NLS-1$
+					}
+				}
+				p.println("</configurations>");
+				p.close();
+			}
+		} catch (IOException e) {
+			AutotoolsPlugin.log(e);
+		}
+	}
+	
+	public Map<String, IAConfiguration> getConfigurations(IProject project) {
+		Map<String, IAConfiguration> list = getSavedConfigs(project);
+		if (list == null) {
+			list = new HashMap<String, IAConfiguration>();
+			configs.put(project.getName(), list);
+		}
+		return list;
+	}
+	
+	public void resourceChanged(IResourceChangeEvent event) {
+		IResource res = event.getResource();
+		if (!(res instanceof IProject))
+			return;
+		String name = res.getName();
+		IResourceDelta delta = event.getDelta();
+		int kind = delta.getKind();
+		if (configs.containsKey(name)) {
+			if (kind == IResourceDelta.REMOVED) {
+				configs.remove(name);
+				tmpConfigs.remove(name);
+			} else if (kind == IResourceDelta.CHANGED) {
+				int flags = delta.getFlags();
+				if ((flags & IResourceDelta.MOVED_TO) != 0) {
+					IPath path = delta.getMovedToPath();
+					Map<String, IAConfiguration> cfgs = configs.get(name);
+					String newName = path.lastSegment();
+					configs.remove(name);
+					configs.put(newName, cfgs);
+					Map<String, IAConfiguration> tmpcfgs = tmpConfigs.get(name);
+					tmpConfigs.remove(name);
+					tmpConfigs.put(newName, tmpcfgs);
+				}
+			}
+		}
+	}
+	
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsOptionValueHandler.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsOptionValueHandler.java
new file mode 100644
index 0000000..b707d3e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsOptionValueHandler.java
@@ -0,0 +1,124 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.configure;
+
+import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
+import org.eclipse.cdt.managedbuilder.core.BuildException;
+import org.eclipse.cdt.managedbuilder.core.IBuildObject;
+import org.eclipse.cdt.managedbuilder.core.IBuilder;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IHoldsOptions;
+import org.eclipse.cdt.managedbuilder.core.IManagedOptionValueHandler;
+import org.eclipse.cdt.managedbuilder.core.IOption;
+import org.eclipse.cdt.managedbuilder.core.IOptionApplicability;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.managedbuilder.core.ManagedOptionValueHandler;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+
+public class AutotoolsOptionValueHandler extends ManagedOptionValueHandler 
+	implements IOptionApplicability {
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.managedbuilder.core.IManagedOptionValueHandler#handleValue(IConfiguration,IToolChain,IOption,String,int)
+	 */
+	
+	public final static String DEFAULT_BUILD_DIR = "build"; //$NON-NLS-1$
+	public final static String CONFIGURE_TOOL_ID = AutotoolsPlugin.PLUGIN_ID + ".gnu.toolchain.tool.configure"; //$NON-NLS-1$
+	public final static String BUILD_DIR_OPTION_ID = AutotoolsPlugin.PLUGIN_ID + ".option.configure.builddir"; //$NON-NLS-1$
+	public final static String BUILD_DIR_APPLY = "BuildDir.apply"; //$NON-NLS-1$
+	public final static String BUILD_DIR_DEFAULT_QUESTION = "BuildDir.default"; //$NON-NLS-1$
+	public final static String BUILD_DIR_YES = "BuildDir.yes"; //$NON-NLS-1$
+	public final static String BUILD_DIR_NO = "BuildDir.no"; //$NON-NLS-1$
+
+	//FIXME: Use holder to set option value, not the "option" parameter
+	public boolean handleValue(IBuildObject buildObject, 
+                   IHoldsOptions holder, 
+                   IOption option,
+                   String extraArgument, int event)
+	{
+		// Get the current value of the build dir option.
+		String value = (String)option.getValue();
+
+		if (buildObject instanceof IConfiguration &&
+				(event == IManagedOptionValueHandler.EVENT_OPEN)) {
+//			SortedSet<Integer> nums = new TreeSet<Integer>();
+			IConfiguration configuration = (IConfiguration)buildObject;
+			ICConfigurationDescription cfgd = ManagedBuildManager.getDescriptionForConfiguration(configuration);
+			if (option.getName().equals("Name") && cfgd != null) {
+				String cfgId = cfgd.getId();
+				if (!value.equals("") && !value.equals(cfgId)) {
+					// we have a cloned configuration and we know that the
+					// clonee's name is the value of the option
+					IProject project = (IProject)configuration.getManagedProject().getOwner();
+					String autoName = null;
+					String autoNameTemplate = null;
+					// Check if we are supposed to automatically name the build directory for any
+					// new configuration.  If yes, generate a build directory under the project using
+					// the configuration name which must be unique.
+					try {
+						autoName = project.getPersistentProperty(AutotoolsPropertyConstants.AUTO_BUILD_NAME);
+					} catch (CoreException e) {
+						// ignore
+					}
+					if (autoName == null || autoName.equals(AutotoolsPropertyConstants.TRUE)) {
+						autoNameTemplate = "${workspace_loc:/" + project.getName() + // $NON-NLS-1$ 
+							"}/build-" + fixName(configuration.getName()); // $NON-NLS-1$
+						IBuilder cfgBuilder = configuration.getEditableBuilder();
+						cfgBuilder.setBuildPath(autoNameTemplate);
+					}
+					// Clone old configuration to tmp configuration list
+					boolean isSaved = AutotoolsConfigurationManager.getInstance().cloneCfg(project, value, cfgd);
+					// Check to see if we should patch up the name option.  If we aren't synchronizing
+					// configurations or the configuration isn't already saved, we leave the name field alone
+					// so we will trigger this again when the clone will get used.
+					if (!isSaved && !AutotoolsConfigurationManager.getInstance().isSyncing()) {
+						return true;
+					}
+				}
+				try {
+					IOption optionToSet = holder.getOptionToSet(option, false);
+					optionToSet.setValue(cfgId);
+				} catch (BuildException e) {
+					return false;
+				}
+			}
+		}
+		
+		// The event was not handled, thus return false
+		return true;
+	}
+	
+	private String fixName(String cfgName) {
+		// Replace whitespace with underscores.
+		return cfgName.replaceAll("\\s", "_");
+	}
+	
+	// IOptionApplicability methods
+	
+	public boolean isOptionEnabled(IBuildObject configuration,
+			IHoldsOptions holder, IOption option) {
+		return true;
+	}
+
+	public boolean isOptionUsedInCommandLine(IBuildObject configuration,
+			IHoldsOptions holder, IOption option) {
+		return false;
+	}
+
+	public boolean isOptionVisible(IBuildObject configuration,
+			IHoldsOptions holder, IOption option) {
+		return true;
+	}
+
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/BinConfigureOption.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/BinConfigureOption.java
new file mode 100644
index 0000000..fb885bd
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/BinConfigureOption.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.configure;
+
+public class BinConfigureOption extends AbstractConfigurationOption {
+
+	private boolean value;
+	
+	public BinConfigureOption(String name, AutotoolsConfiguration cfg) {
+		super(name, cfg);
+	}
+
+	public BinConfigureOption(String name, String msgName, AutotoolsConfiguration cfg) {
+		super(name, msgName, cfg);
+	}
+
+	private BinConfigureOption(String name, AutotoolsConfiguration cfg, boolean value) {
+		super(name, cfg);
+		this.value = value;
+	}
+	
+	public boolean isParmSet() {
+		return value;
+	}
+	
+	public String getParameter() {
+	   if (isParmSet())
+		   return getParameterName();
+	   else
+		   return ""; // $NON-NLS-1$
+	}
+
+	public String getValue() {
+		return Boolean.toString(value);
+	}
+	
+	public void setValue(String value) {
+		boolean oldValue = this.value;
+		if (value.equals("true")) // $NON-NLS-1$
+			this.value = true;
+		else
+			this.value = false;
+		if (this.value != oldValue)
+			cfg.setDirty(true);
+	}
+	
+	public IConfigureOption copy(AutotoolsConfiguration config) {
+		return new BinConfigureOption(name, config, value);
+	}
+
+	public int getType() {
+		return BIN;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureMessages.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureMessages.java
new file mode 100644
index 0000000..f51e5ff
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureMessages.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007, 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.configure;
+
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class ConfigureMessages {
+	private static final String BUNDLE_NAME = ConfigureMessages.class.getName();
+
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
+			.getBundle(BUNDLE_NAME);
+
+	private ConfigureMessages() {
+	}
+
+	public static String getConfigureDescription(String name) {
+		return getString("Option.configure." + name); //$NON-NLS-11$
+	}
+	
+	public static String getConfigureTip(String name) {
+		return getString("Option.configure." + name + ".tip"); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+	/**
+	 * Returns the string from the resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @return the resource bundle message
+	 */
+	public static String getString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+	
+	/**
+	 * Returns the formatted string from the resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @param args an array of substituition strings
+	 * @return the resource bundle message
+	 */
+	public static String getFormattedString(String key, String[] args) {
+		return MessageFormat.format(getString(key), (Object[])args);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureMessages.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureMessages.properties
new file mode 100644
index 0000000..32c745e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureMessages.properties
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+Option.configure.configure=configure
+Option.configure.general=General
+Option.configure.builddir=Build directory
+Option.configure.builddir.tip=Subdirectory off of project where build will occur
+Option.configure.configdir=Configure tool directory
+Option.configure.configdir.tip=Subdirectory off of project where configure script resides
+Option.configure.cache_file=Name of cache file (--cache-file)
+Option.configure.cache_file.tip=Specify the name of the configuration cache file [config.cache]
+Option.configure.no_create=Turn off file creation <not advised> (--no-create)
+Option.configure.no_create.tip=This tells configuration not to generate the output files as part of configuration
+Option.configure.quiet=Turn off checking messages (--quiet)
+Option.configure.quiet.tip=This turns off "checking ..." style messages from the configuration console output
+Option.configure.help=Display help contents (--help)
+Option.configure.help.tip=Ask configuration file to display its help documentation
+Option.configure.version=Display version of autotools used (--version)
+Option.configure.version.tip=This outputs the version of the Autotools used to create the configuration files
+
+Option.configure.platform=Platform specifiers
+Option.configure.host=Host platform (--host)
+Option.configure.host.tip=Platform that project will run on
+Option.configure.target=Target platform (--target)
+Option.configure.target.tip=Platform that project will target output for
+Option.configure.build=Build platform (--build)
+Option.configure.build.tip=Platform where project is being built
+
+Option.configure.directories=Directory specifiers
+Option.configure.prefix=Arch-independent install directory (--prefix)
+Option.configure.prefix.tip=Place where architecture-independent files are installed [/usr/local]
+Option.configure.exec_prefix=Arch-dependent install directory (--exec-prefix)
+Option.configure.exec_prefix.tip=Place where architecture-dependent files are installed [PREFIX]
+Option.configure.libdir=Object code library directory (--libdir)
+Option.configure.libdir.tip=Place where object code libraries are installed [EPREFIX/lib]
+Option.configure.bindir=User executable directory (--bindir)
+Option.configure.bindir.tip=Place where binary executables are installed [EPREFIX/bin]
+Option.configure.sbindir=System admin executable directory (--sbindir)
+Option.configure.sbindir.tip=Place where system admin executables are installed [EPREFIX/sbin]
+Option.configure.includedir=C Header file directory (--includdir)
+Option.configure.includedir.tip=Place where header files will be installed [PREFIX/include]
+Option.configure.datadir=Read-only arch-independent data (--datadir)
+Option.configure.datadir.tip=Place where read-only architecture-independent data is installed [PREFIX/share]
+Option.configure.sysconfdir=Read-only single-machine data directory (--sysconfdir)
+Option.configure.sysconfdir.tip=Place where read-only single-machine data is stored [PREFIX/etc]
+Option.configure.infodir=Info file directory (--infodir)
+Option.configure.infodir.tip=Place where info files are installed [PREFIX/info]
+Option.configure.mandir=Man file documentation directory (--mandir)
+Option.configure.mandir.tip=Place where man file documentation is installed [PREFIX/man]
+Option.configure.srcdir=Sources directory (--srcdir)
+Option.configure.srcdir.tip=Place where configure can find sources [configure directory or ..]
+Option.configure.localstatedir=Single-machine data directory (--localstatedir)
+Option.configure.localstatedir.tip=Place where modifiable single-machine data is installed [PREFIX/var]
+Option.configure.sharedstatedir=Arch-independent data directory (--sharedstatedir)
+Option.configure.sharedstatedir.tip=Place where modifiable architecture-independent data is installed [PREFIX/com}
+Option.configure.libexecdir=Program executable directory (--libexecdir)
+Option.configure.libexecdir.tip=Place where program executables will be installed [EPREFIX/libexec]
+Option.configure.oldincludedir=Non-gcc C header file directory (--oldincludedir)
+Option.configure.oldincludedir.tip=Place where non-gcc C header files are installed [/usr/include]
+
+Option.configure.filenames=File-name transformations
+Option.configure.program_prefix=Program prefix (--program-prefix)
+Option.configure.program_prefix.tip=Prepend PREFIX to the beginning of installed program names
+Option.configure.program_suffix=Program suffix (--program-suffix)
+Option.configure.program_suffix.tip=Append SUFFIX to the end of installed program names
+Option.configure.program_transform_name=Program name transform (--program-transform-name)
+Option.configure.program_transform_name.tip=A sed string used to transform installed program names
+
+Option.configure.features=Advanced
+Option.configure.enable_maintainer_mode=Enable maintainer mode (--enable-maintainer-mode)
+Option.configure.enable_maintainer_mode.tip=Specify this to have Makefiles generated with checks for Autotool configuration file changes
+Option.configure.user=Additional command-line options
+Option.configure.user.tip=Specify one or more configuration options (e.g. --enable-FEATURE, --disable-FEATURE, or --with-PACKAGE)
+
+Option.configure.autogen=autogen
+Option.configure.options=Options
+Option.configure.autogenOpts=Additional command-line options
+Option.configure.autogenOpts.tip=Specify any additional options required
+
+Tool.command=Command
+Tool.allopts=All Options
+ 
+Configure.Error.AlreadyExists="A configuration named {0} already exists"
+Configure.Error.NoProjectToSave="Project: {0} does not exist at time of saving configuration"
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureOptionCategory.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureOptionCategory.java
new file mode 100644
index 0000000..90e6cb7
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureOptionCategory.java
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.configure;
+
+import java.util.ArrayList;
+
+public class ConfigureOptionCategory implements IConfigureOption {
+
+	private String name;
+	
+	public ConfigureOptionCategory(String name) {
+		this.name = name;
+	}
+	
+	public IConfigureOption copy(AutotoolsConfiguration config) {
+		return new ConfigureOptionCategory(name);
+	}
+
+	public String getDescription() {
+		return ConfigureMessages.getConfigureDescription(name);
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public String getParameter() {
+		return "";
+	}
+
+	public ArrayList<String> getParameters() {
+		return new ArrayList<String>();
+	}
+	
+	public String getToolTip() {
+		return "";
+	}
+
+	public String getValue() {
+		return "null";
+	}
+
+	public boolean isCategory() {
+		return true;
+	}
+
+	public boolean isParmSet() {
+		return false;
+	}
+
+	public void setValue(String value) {
+		// Do nothing..nothing to set
+	}
+
+	public boolean isMultiArg() {
+		return false;
+	}
+
+	public int getType() {
+		return CATEGORY;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureTool.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureTool.java
new file mode 100644
index 0000000..a082a62
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureTool.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.configure;
+
+import java.util.ArrayList;
+
+public class ConfigureTool extends AbstractConfigurationOption {
+
+	private String value;
+	
+	public ConfigureTool(String name, AutotoolsConfiguration cfg) {
+		super(name, cfg);
+		this.value = name;
+	}
+
+	public ConfigureTool(String name, String transformedName, AutotoolsConfiguration cfg) {
+		super(name, transformedName, cfg);
+		this.value = name;
+	}
+
+	private ConfigureTool(String name, AutotoolsConfiguration cfg, String value) {
+		super(name, cfg);
+		this.value = value;
+	}
+	
+	public String getValue() {
+		return value;
+	}
+	
+	public void setValue(String newValue) {
+		if (!newValue.equals(value)) {
+			cfg.setDirty(true);
+			value = newValue;
+		}
+	}
+
+	public boolean isParmSet() {
+		return false;
+	}
+	
+	public String getParameter() {
+		return ""; // $NON-NLS-1$
+	}
+	
+	public ArrayList<String> getParameters() {
+		return new ArrayList<String>();
+	}
+	
+	public IConfigureOption copy(AutotoolsConfiguration config) {
+		return new ConfigureTool(name, config, value);
+	}
+
+	public int getType() {
+		return TOOL;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/IAConfiguration.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/IAConfiguration.java
new file mode 100644
index 0000000..e1cc0e4
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/IAConfiguration.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.configure;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+public interface IAConfiguration {
+	public IConfigureOption getOption(String name);
+	public String getId();
+	public boolean isDirty();
+	public void setDirty(boolean value);
+	public Map<String, IConfigureOption> getOptions();
+	public String getToolParameters(String name);
+	public ArrayList<String> getToolArgs(String name);
+	public void setOption(String name, String value);
+	public void setConfigToolDirectory(String configToolDirectory);
+	public String getConfigToolDirectory();
+	public IAConfiguration copy();
+	public IAConfiguration copy(String id);
+	public void setDefaultOptions();
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/IConfigureOption.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/IConfigureOption.java
new file mode 100644
index 0000000..310d4b4
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/IConfigureOption.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.configure;
+
+import java.util.ArrayList;
+
+public interface IConfigureOption {
+	
+	public final static int CATEGORY = 0;
+	public final static int BIN = 1;
+	public final static int STRING = 2;
+	public final static int INTERNAL = 3;
+	public final static int MULTIARG = 4;
+	public final static int TOOL = 5;
+	public String getName();
+	public String getParameter();
+	public ArrayList<String> getParameters();
+	public boolean isParmSet();
+	public String getDescription();
+	public String getToolTip();
+	public void setValue(String value);
+	public IConfigureOption copy(AutotoolsConfiguration cfg);
+	public String getValue();
+	public boolean isCategory();
+	public boolean isMultiArg();
+	public int getType();
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/InternalConfigureOption.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/InternalConfigureOption.java
new file mode 100644
index 0000000..d42739b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/InternalConfigureOption.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.configure;
+
+public class InternalConfigureOption extends AbstractConfigurationOption {
+
+	private String value;
+	
+	public InternalConfigureOption(String name, AutotoolsConfiguration cfg) {
+		super(name, cfg);
+		this.value = ""; // $NON-NLS-1$
+	}
+	
+	public InternalConfigureOption(String name, String msgName, AutotoolsConfiguration cfg) {
+		super(name, msgName, cfg);
+		this.value = ""; // $NON-NLS-1$
+	}
+	
+	private InternalConfigureOption(String name, AutotoolsConfiguration cfg,
+			String value) {
+		super(name, cfg);
+		this.value = value;
+	}
+	
+	public String getValue() {
+		return value;
+	}
+	
+	public void setValue(String newValue) {
+		if (!newValue.equals(value)) {
+			cfg.setDirty(true);
+			value = newValue;
+		}
+	}
+
+	public boolean isParmSet() {
+		return false;
+	}
+	
+	public String getParameter() {
+		return "";
+	}
+	
+	public IConfigureOption copy(AutotoolsConfiguration config) {
+		return new InternalConfigureOption(name, config, value);
+	}
+
+	public int getType() {
+		return INTERNAL;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/MultiArgConfigureOption.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/MultiArgConfigureOption.java
new file mode 100644
index 0000000..1d17702
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/MultiArgConfigureOption.java
@@ -0,0 +1,119 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.configure;
+
+import java.util.ArrayList;
+
+
+public class MultiArgConfigureOption extends AbstractConfigurationOption {
+
+	private String value;
+	private ArrayList<String> userArgs;
+	private boolean isDirty;
+	
+	public MultiArgConfigureOption(String name, AutotoolsConfiguration cfg) {
+		super(name, cfg);
+		this.value = ""; // $NON-NLS-1$
+	}
+	
+	public MultiArgConfigureOption(String name, String msgName, AutotoolsConfiguration cfg) {
+		super(name, msgName, cfg);
+		this.value = ""; // $NON-NLS-1$
+	}
+	
+	private MultiArgConfigureOption(String name, AutotoolsConfiguration cfg,
+			String value) {
+		super(name, cfg);
+		this.value = value;
+	}
+	
+	public String getValue() {
+		return value;
+	}
+	
+	public void setValue(String newValue) {
+		if (!newValue.equals(value)) {
+			cfg.setDirty(true);
+			isDirty = true;
+			value = newValue;
+		}
+	}
+
+	public boolean isParmSet() {
+		return value.length() > 0;
+	}
+	
+	public boolean isMultiArg() {
+		return true;
+	}
+	
+	public String getParameter() {
+		return value;
+	}
+	
+	public ArrayList<String> getParameters() {
+		// May be multiple user-specified options in which case we
+		// need to split them up into individual options
+		if (!isDirty && userArgs != null)
+			return userArgs;
+		// Otherwise, we need to calculate userArgs
+		userArgs = new ArrayList<String>();
+		isDirty = false;
+		int lastArgIndex = -1;
+		int i = 0;
+		while (i < value.length()) {
+			char ch = value.charAt(i);
+			// Skip white-space
+			while (Character.isWhitespace(ch)) {
+				++i;
+				if (i < value.length())
+					ch = value.charAt(i);
+				else // Otherwise we are done
+					return userArgs;
+			}
+
+			// Simplistic parser.  We break up into strings delimited
+			// by blanks.  If quotes are used, we ignore blanks within.
+			// If a backslash is used, we ignore the next character and
+			// pass it through.
+			lastArgIndex = i;
+			boolean inString = false;
+			while (i < value.length()) {
+				ch = value.charAt(i);
+				if (ch == '\\') // escape character
+					++i; // skip over the next character
+				else if (ch == '\"') { // double quotes
+					inString = !inString;
+				} else if (Character.isWhitespace(ch)) {
+					if (!inString) {
+						userArgs.add(value.substring(lastArgIndex, i));
+						break;
+					}
+				}
+				++i;
+			}
+			// Look for the case where we ran out of chars for the last
+			// token.
+			if (i >= value.length())
+				userArgs.add(value.substring(lastArgIndex));
+			++i;
+		}
+		return userArgs;
+	}
+
+	public IConfigureOption copy(AutotoolsConfiguration config) {
+		return new MultiArgConfigureOption(name, config, value);
+	}
+
+	public int getType() {
+		return MULTIARG;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/StringConfigureOption.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/StringConfigureOption.java
new file mode 100644
index 0000000..4c9a117
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/StringConfigureOption.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.configure;
+
+
+public class StringConfigureOption extends AbstractConfigurationOption {
+
+	private String value;
+	
+	public StringConfigureOption(String name, AutotoolsConfiguration cfg) {
+		super(name, cfg);
+		this.value = ""; // $NON-NLS-1$
+	}
+	
+	public StringConfigureOption(String name, String msgName, AutotoolsConfiguration cfg) {
+		super(name, msgName, cfg);
+		this.value = ""; // $NON-NLS-1$
+	}
+	
+	private StringConfigureOption(String name, AutotoolsConfiguration cfg,
+			String value) {
+		super(name, cfg);
+		this.value = value;
+	}
+	
+	public String getValue() {
+		return value;
+	}
+	
+	public void setValue(String newValue) {
+		if (!newValue.equals(value)) {
+			cfg.setDirty(true);
+			value = newValue;
+		}
+	}
+
+	public boolean isParmSet() {
+		return value.length() > 0;
+	}
+	
+	public String getParameter() {
+		if (isParmSet())
+			return getParameterName() + "=" + getValue(); // $NON-NLS-1$
+		return "";
+	}
+	
+	public IConfigureOption copy(AutotoolsConfiguration config) {
+		return new StringConfigureOption(name, config, value);
+	}
+
+	public int getType() {
+		return STRING;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/wizards/NewAutotoolsProject.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/wizards/NewAutotoolsProject.java
new file mode 100644
index 0000000..ef8eb78
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/wizards/NewAutotoolsProject.java
@@ -0,0 +1,143 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Symbian Software Limited and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Bala Torati (Symbian) - Initial API and implementation
+ * Red Hat Inc - Modification to use with Autotools project
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.wizards;
+
+import java.util.List;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
+import org.eclipse.cdt.core.templateengine.TemplateCore;
+import org.eclipse.cdt.core.templateengine.process.ProcessArgument;
+import org.eclipse.cdt.core.templateengine.process.ProcessFailureException;
+import org.eclipse.cdt.core.templateengine.process.ProcessRunner;
+import org.eclipse.cdt.core.templateengine.process.processes.Messages;
+import org.eclipse.cdt.managedbuilder.core.BuildException;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.IOption;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.managedbuilder.templateengine.ProjectCreatedActions;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceDescription;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsNewProjectNature;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsConfigurationManager;
+
+
+/**
+ * Creates a new Project in the workspace.
+ */
+public class NewAutotoolsProject extends ProcessRunner {
+	protected boolean savedAutoBuildingValue;
+	protected ProjectCreatedActions pca;
+	protected IManagedBuildInfo info;
+	
+	public NewAutotoolsProject() {
+		pca = new ProjectCreatedActions();
+	}
+	
+	public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException {
+		String projectName = args[0].getSimpleValue();
+		String location = args[1].getSimpleValue();
+		String artifactExtension = args[2].getSimpleValue();
+		String isCProjectValue = args[3].getSimpleValue();
+		boolean isCProject = Boolean.valueOf(isCProjectValue).booleanValue();
+				
+		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+
+		try {
+			if (!project.exists()) {
+				IWorkspace workspace = ResourcesPlugin.getWorkspace();
+				turnOffAutoBuild(workspace);
+
+				IPath locationPath = null;
+				if (location != null && !location.trim().equals("")) { //$NON-NLS-1$
+					locationPath = Path.fromPortableString(location);
+				}
+
+				List<?> configs = template.getTemplateInfo().getConfigurations();
+				if (configs == null || configs.size() == 0) {
+					throw new ProcessFailureException(Messages.getString("NewManagedProject.4") + projectName); //$NON-NLS-1$
+				}
+
+				pca.setProject(project);
+				pca.setProjectLocation(locationPath);
+				pca.setConfigs((IConfiguration[]) configs.toArray(new IConfiguration[configs.size()]));
+				pca.setArtifactExtension(artifactExtension);
+				info = pca.createProject(monitor, CCorePlugin.DEFAULT_INDEXER, isCProject);
+
+				AutotoolsNewProjectNature.addAutotoolsNature(project, monitor);
+				
+				// For each IConfiguration, create a corresponding Autotools Configuration
+				IConfiguration[] cfgs = pca.getConfigs();
+				for (int i = 0; i < cfgs.length; ++i) {
+					IConfiguration cfg = cfgs[i];
+					ICConfigurationDescription cfgd = ManagedBuildManager.getDescriptionForConfiguration(cfg);
+					String id = cfgd.getId();
+					AutotoolsConfigurationManager.getInstance().getConfiguration(project, id, true);
+				}
+				AutotoolsConfigurationManager.getInstance().saveConfigs(project);
+
+				info.setValid(true);
+				ManagedBuildManager.saveBuildInfo(project, true);
+
+				restoreAutoBuild(workspace);
+
+			}
+			else {
+				AutotoolsNewProjectNature.addAutotoolsNature(project, monitor);
+				//			throw new ProcessFailureException(Messages.getString("NewAutotoolsProject.5") + projectName); //$NON-NLS-1$
+			}
+		} catch (CoreException e) {
+			throw new ProcessFailureException(Messages.getString("NewManagedProject.3") + e.getMessage(), e); //$NON-NLS-1$
+		} catch (BuildException e) {
+			throw new ProcessFailureException(Messages.getString("NewManagedProject.3") + e.getMessage(), e); //$NON-NLS-1$
+		}
+	}
+
+	protected final void turnOffAutoBuild(IWorkspace workspace) throws CoreException {
+		IWorkspaceDescription workspaceDesc = workspace.getDescription();
+		savedAutoBuildingValue = workspaceDesc.isAutoBuilding();
+		workspaceDesc.setAutoBuilding(false);
+		workspace.setDescription(workspaceDesc);
+	}
+	
+	protected final void restoreAutoBuild(IWorkspace workspace) throws CoreException {
+		IWorkspaceDescription workspaceDesc = workspace.getDescription();
+		workspaceDesc.setAutoBuilding(savedAutoBuildingValue);
+		workspace.setDescription(workspaceDesc);
+	}
+	
+	/**
+	 * setOptionValue
+	 * @param config
+	 * @param option
+	 * @param val
+	 * @throws BuildException
+	 */
+	protected void setOptionValue(IConfiguration config, IOption option, String val) throws BuildException {
+		if (val != null) {
+			if (!option.isExtensionElement()) {
+				option.setValue(val);
+			} else {
+				IOption newOption = config.getToolChain().createOption(option, option.getId() + "." + ManagedBuildManager.getRandomNumber(), option.getName(), false); //$NON-NLS-1$
+				newOption.setValue(val);
+			}
+		}
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/.classpath b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/.classpath
new file mode 100644
index 0000000..751c8f2
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/.project b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/.project
new file mode 100644
index 0000000..e6edf23
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.cdt.autotools.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/.settings/org.eclipse.jdt.core.prefs b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..b8bcab4
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Mon Dec 11 11:40:26 EST 2006
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/.settings/org.eclipse.jdt.ui.prefs b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..1e28f05
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,3 @@
+#Mon Dec 11 11:40:26 EST 2006
+eclipse.preferences.version=1
+internal.default.compliance=default
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/ChangeLog b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/ChangeLog
new file mode 100644
index 0000000..7f40324
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/ChangeLog
@@ -0,0 +1,242 @@
+2010-03-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/ProjectTools.java (setConfigDir): Fix up how
+	configuration is allocated.  Use id instead of name.
+
+2009-11-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Make singleton.
+
+2009-11-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/ProjectTools.java: Remove warnings.
+
+2009-10-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest0.java (testAutotoolsProject0): Fix to
+	handle fact that default build directory is now project directory.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest1.java (testAutotoolsProject1): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest2.java (testAutotoolsProject2): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/ProjectTools.java (setConfigDir): Fix to use new
+	AutotoolsConfigurationManager logic.
+
+2009-10-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump up release to 2.0.0.
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/AllAutotoolsTests.java (suite): Modified to use
+	new core and ui plug-ins. 
+	(suite): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/AutoconfTests.java (suite): Ditto. 
+	(suite): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsTestsPlugin.java (AutotoolsTestsPlugin): Ditto. 
+	(AutotoolsTestsPlugin): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeColourizationTests.java: Ditto. 
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeEditorTests.java: Ditto.
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeTextHoverTest.java: Ditto.
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/editors/EditorTests.java (suite): Ditto.
+	(suite): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/ProjectTools.java (ConvertToAutotoolsProjectWizardTest.getSelectedConfigurations): Ditto. 
+	(generateFiles): Ditto.
+	(markExecutable): Ditto.
+	(ConvertToAutotoolsProjectWizardTest.getSelectedConfigurations): Ditto. 
+	(generateFiles): Ditto.
+	(markExecutable): Ditto.
+
+2009-04-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/CoreUtility.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/ProjectTools.java: Use local CoreUtility
+	class to avoid internal class access warnings.
+
+2009-03-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/ProjectTools.java (generateFiles): Call
+	genfiles.sh instead of issuing aclocal, autoconf, and automake which might not exist on
+	test system.
+	* zip/project1.zip: Add generated files into special genfiles directory and add EPL. 
+	* zip/project2.zip: Ditto.
+	
+2009-03-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* build.properties: Add zip directory to binary build.
+
+2009-01-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add .qualifier to id.
+
+2008-12-09  Andrew Overholt  <overholt@redhat.com>
+
+	* test.xml: Debugging statement.
+
+2008-12-08  Andrew Overholt  <overholt@redhat.com>
+
+	* test.xml: Clean up some typos.
+
+2008-12-04  Andrew Overholt  <overholt@redhat.com>
+
+	* build.properties: Add test.xml to bin.includes.
+
+2008-11-05  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Update BREE to 1.5.
+
+2008-11-05  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/AllAutotoolsTests.java: New test suite.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/AutoconfTests.java: New test suite.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/editors/EditorTests.java: New test suite.
+	* test.xml: New file to drive tests on build.eclipse.org.
+
+2008-11-03  Andrew Overholt  <overholt@redhat.com>
+
+	* build.properties: Remove plugin.xml, add plugin.properties.
+
+2008-10-31  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Use plugin.properties for %bundleName and %provider.
+	Add "(Incubation)".
+	* plugin.properties: Initial import.
+
+2008-10-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump release to 1.0.3.
+
+2008-09-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Change Eclipse-AutoStart to Bundle-ActivationPolicy.
+
+2008-09-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeColourizationTests.java (setUp): Make sure
+	test project has unique name since JUNIT tests are run multithread.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeEditorTests.java (testAutomakeEditorAssociation):
+	Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeTextHoverTest.java (setUp): Ditto.
+
+2008-09-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+    Refactored com.redhat.eclipse.cdt.autotools.tests to org.eclipse.linuxtools.cdt.autotools.tests.
+
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/AllTests.java: Removed since must run as Junit
+	plugin and default is to run all tests in plugin which causes duplicate test runs.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/AllTests.java: Removed. Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest0.java (testAutotoolsProject0):
+	Add new generate configuration files parameter and set to true.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest1.java (testAutotoolsProject1):
+	Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest2.java (testAutotoolsProject2):
+	Add new generate configuration files parameter and set to false.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/ProjectTools.java (addSourceContainerWithImport):
+	Add new parameter which states whether configuration files require generation after
+	import.
+	(importFilesFromZipAndGenerate): New method which imports project files and performs
+	generation of configuration files.
+	(generateFiles): New method.
+
+2008-07-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump to 1.0.2.
+
+2008-04-17 10:43  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tests/autoconf/:
+	  TestMacroParser.java, TestShellParser.java: More autoconf parser
+	  work.  Remove old parser and standardize AST node constructors.
+	  Add more tests and fix some bugs.
+
+2008-04-10 15:40  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tests/autoconf/:
+	  BaseParserTest.java, TestMacroParser.java, TestShellParser.java,
+	  TestTokenizer.java: More autoconf parser work.
+
+2008-04-09 14:38  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tests/: AllTests.java,
+	  autoconf/AllTests.java, autoconf/BaseParserTest.java,
+	  autoconf/TestMacroParser.java, autoconf/TestParser.java,
+	  autoconf/TestShellParser.java, autoconf/TestSourceInfo.java,
+	  autoconf/TestTokenizer.java: New autoconf parser work in progress
+
+2008-04-07 14:06  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tests/: AllTests.java,
+	  autoconf/AllTests.java, autoconf/TestParser.java,
+	  autoconf/TestSourceInfo.java: Initial checkpoint for autotools
+	  parser changes
+
+
+2007-08-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Change release to 1.0.1 and specify minimum java runtime as
+	1.4.
+
+2007-04-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tests/AutotoolsProjectTest0.java: New
+	test to test simple project with configure in top-level directory.
+	* src/com/redhat/eclipse/cdt/autotools/tests/AllTests.java: Add
+	new AutotoolsProjectTest0 test.
+
+2007-04-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Verifies fix for #236304
+	* src/com/redhat/eclipse/cdt/autotools/tests/AutotoolsProjectTest1.java (tearDown):
+	Add try catch around project delete.
+	* src/com/redhat/eclipse/cdt/autotools/tests/AutotoolsProjectTest2.java: New test
+	for autogen.sh.
+	* src/com/redhat/eclipse/cdt/autotools/tests/AllTests.java (suite): Add
+	new AutotoolsProjectTest2 test.
+	* zip/project2.zip: New autogen.sh test project.
+
+2007-04-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Verifies fix for #235076
+	* src/com/redhat/eclipse/cdt/autotools/tests/ProjectTools.java (createFile): Add comments.
+	(setup): Ditto.
+	(getMonitor): Ditto.
+	(createEmptyFile): Ditto.
+	(addSourceContainer): Ditto.
+	(createProject): Ditto.
+	(addSourceContainerWithImport): Ditto.
+	(ConvertToAutotoolsProjectWizardTest): Ditto.
+	(ConvertToAutotoolsProjectWizardTest.getSelectedConfigurations): Ditto.
+	(build): New method.
+	(setConfigDir): Ditto.
+	(markExecutable): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/tests/AutotoolsProjectTest1.java: New test.
+	* src/com/redhat/eclipse/cdt/autotools/tests/AllTests.java (suite): Add
+	AutotoolsProjectTest1 test.
+	* zip/project1.zip: New sample project file for testing.
+
+2007-01-22  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tests/editors/AutomakeEditorTests.java:
+	Add copyright.
+	* src/com/redhat/eclipse/cdt/autotools/tests/editors/AutomakeColourizationTests.java:
+	Add copyright.
+	* src/com/redhat/eclipse/cdt/autotools/tests/editors/AutomakeTextHoverTest.java:
+	New file.
+
+
+2006-12-15  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tests/editors/AutomakeColourizationTests.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/tests/ProjectTools.java
+	(createFile): New method.
+	* src/com/redhat/eclipse/cdt/autotools/tests/AllTests.java
+	(suite): Add AutomakeColourizationTests.
+
+2006-12-12  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tests/editors/AutomakeEditorTests.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/tests/ProjectTools.java
+	(createEmptyFile): New method.
+	* src/com/redhat/eclipse/cdt/autotools/tests/AutotoolsProjectNatureTest.java:
+	Clean up imports.
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/META-INF/MANIFEST.MF b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..9d3aa1e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.cdt.autotools.tests;singleton:=true
+Bundle-Version: 2.0.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.cdt.autotools.tests.AutotoolsTestsPlugin
+Bundle-Vendor: %provider
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.linuxtools.cdt.autotools.core,
+ org.eclipse.core.resources,
+ org.eclipse.cdt.managedbuilder.core,
+ org.eclipse.cdt.ui,
+ org.junit,
+ org.eclipse.ui.ide,
+ org.eclipse.jface.text,
+ org.eclipse.ui.editors,
+ org.eclipse.cdt.make.core,
+ org.eclipse.cdt.make.ui,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.cdt.core,
+ org.eclipse.linuxtools.cdt.autotools.ui;bundle-version="1.0.0"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/about.html b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/about.html
new file mode 100644
index 0000000..44e2290
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

+<html>

+<head>

+<title>About</title>

+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>8th September, 2004</p>	

+<h3>License</h3>

+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<h3>Contributions</h3>

+

+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise

+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such

+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or

+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the

+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available

+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also

+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+</body>

+</html>
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/build.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/build.properties
new file mode 100644
index 0000000..5c6ae50
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/build.properties
@@ -0,0 +1,7 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.properties,\
+               test.xml,\
+               zip/
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/plugin.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/plugin.properties
new file mode 100644
index 0000000..ea28acf
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+#  Copyright (c) 2008 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+bundleName=Autotools Tests Plug-in (Incubation)
+provider=Eclipse.org
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AllAutotoolsTests.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AllAutotoolsTests.java
new file mode 100644
index 0000000..5064f51
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AllAutotoolsTests.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.tests;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllAutotoolsTests {
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite(
+				"Test for org.eclipse.linuxtools.cdt.autotools.core.tests");
+		//$JUnit-BEGIN$
+		suite.addTestSuite(AutotoolsProjectTest0.class);
+		suite.addTestSuite(AutotoolsProjectNatureTest.class);
+		suite.addTestSuite(AutotoolsProjectTest1.class);
+		suite.addTestSuite(AutotoolsProjectTest2.class);
+		//$JUnit-END$
+		return suite;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectNatureTest.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectNatureTest.java
new file mode 100644
index 0000000..dc1f46a
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectNatureTest.java
@@ -0,0 +1,27 @@
+package org.eclipse.linuxtools.cdt.autotools.tests;
+
+import junit.framework.TestCase;
+
+import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
+import org.eclipse.core.resources.IProject;
+
+public class AutotoolsProjectNatureTest extends TestCase {
+    
+    /*
+     * @see TestCase#setUp()
+     */
+    protected void setUp() throws Exception {
+        super.setUp();
+        if (!ProjectTools.setup())
+        	fail("could not perform basic project workspace setup");
+     }
+	
+	public void testAutotoolsProjectNature() throws Exception {
+		IProject testProject = ProjectTools.createProject("testProject");
+		if(testProject == null) {
+            fail("Unable to create test project");
+        }
+		assertTrue(testProject.hasNature(ManagedCProjectNature.MNG_NATURE_ID));
+		testProject.delete(true, false, ProjectTools.getMonitor());
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest0.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest0.java
new file mode 100644
index 0000000..ce63dcc
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest0.java
@@ -0,0 +1,68 @@
+package org.eclipse.linuxtools.cdt.autotools.tests;
+
+import junit.framework.TestCase;
+
+import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+
+public class AutotoolsProjectTest0 extends TestCase {
+    
+	private IProject testProject;
+	
+    /*
+     * @see TestCase#setUp()
+     */
+    protected void setUp() throws Exception {
+        super.setUp();
+        if (!ProjectTools.setup())
+        	fail("could not perform basic project workspace setup");
+		testProject = ProjectTools.createProject("testProject0");
+		if (testProject == null) {
+            fail("Unable to create test project");
+        }
+		testProject.open(new NullProgressMonitor());
+    }
+	
+    /**
+     * Test sample project which has a hello world program. The top-level 
+     * configure is found in the top-level directory.  The hello world source
+     * is found in sample/hello.c.
+     * @throws Exception
+     */
+	public void testAutotoolsProject0() throws Exception {
+		Path p = new Path("zip/project1.zip");
+		ProjectTools.addSourceContainerWithImport(testProject, null, p, null, true);
+		assertTrue(testProject.hasNature(ManagedCProjectNature.MNG_NATURE_ID));
+		org.eclipse.core.runtime.Path x = new org.eclipse.core.runtime.Path("ChangeLog");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("configure");
+		ProjectTools.markExecutable(testProject, "configure");
+		ProjectTools.markExecutable(testProject, "config.guess");
+		ProjectTools.markExecutable(testProject, "config.sub");
+		ProjectTools.markExecutable(testProject, "missing");
+		ProjectTools.markExecutable(testProject, "mkinstalldirs");
+		ProjectTools.markExecutable(testProject, "install-sh");
+		assertTrue(ProjectTools.build());
+		x = new org.eclipse.core.runtime.Path("config.status");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("Makefile");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("sample/a.out");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("sample/Makefile");
+		assertTrue(testProject.exists(x));
+	}
+	
+	protected void tearDown() throws Exception {
+		testProject.refreshLocal(IResource.DEPTH_INFINITE, null);
+		try {
+			testProject.delete(true, true, null);
+		} catch (Exception e) {
+			//FIXME: Why does a ResourceException occur when deleting the project??
+		}
+		super.tearDown();
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest1.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest1.java
new file mode 100644
index 0000000..7355493
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest1.java
@@ -0,0 +1,71 @@
+package org.eclipse.linuxtools.cdt.autotools.tests;
+
+import junit.framework.TestCase;
+
+import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+
+public class AutotoolsProjectTest1 extends TestCase {
+    
+	private IProject testProject;
+	
+    /*
+     * @see TestCase#setUp()
+     */
+    protected void setUp() throws Exception {
+        super.setUp();
+        if (!ProjectTools.setup())
+        	fail("could not perform basic project workspace setup");
+		testProject = ProjectTools.createProject("testProject1");
+		if (testProject == null) {
+            fail("Unable to create test project");
+        }
+		testProject.open(new NullProgressMonitor());
+    }
+	
+    /**
+     * Test sample project which has a hello world program. The top-level 
+     * configure is found in the subdirectory src which also contains the 
+     * subdirectory sample.  The hello world source is found in
+     * src/sample/hello.c so configuration must create multiple
+     * Makefiles.
+     * @throws Exception
+     */
+	public void testAutotoolsProject1() throws Exception {
+		Path p = new Path("zip/project1.zip");
+		ProjectTools.addSourceContainerWithImport(testProject, "src", p, null, true);
+		assertTrue(testProject.hasNature(ManagedCProjectNature.MNG_NATURE_ID));
+		org.eclipse.core.runtime.Path x = new org.eclipse.core.runtime.Path("src/ChangeLog");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("src/configure");
+		ProjectTools.setConfigDir(testProject, "src");
+		ProjectTools.markExecutable(testProject, "src/configure");
+		ProjectTools.markExecutable(testProject, "src/config.guess");
+		ProjectTools.markExecutable(testProject, "src/config.sub");
+		ProjectTools.markExecutable(testProject, "src/missing");
+		ProjectTools.markExecutable(testProject, "src/mkinstalldirs");
+		ProjectTools.markExecutable(testProject, "src/install-sh");
+		assertTrue(ProjectTools.build());
+		x = new org.eclipse.core.runtime.Path("config.status");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("Makefile");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("sample/a.out");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("sample/Makefile");
+		assertTrue(testProject.exists(x));
+	}
+	
+	protected void tearDown() throws Exception {
+		testProject.refreshLocal(IResource.DEPTH_INFINITE, null);
+		try {
+			testProject.delete(true, true, null);
+		} catch (Exception e) {
+			//FIXME: Why does a ResourceException occur when deleting the project??
+		}
+		super.tearDown();
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest2.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest2.java
new file mode 100644
index 0000000..85f9d4b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest2.java
@@ -0,0 +1,85 @@
+package org.eclipse.linuxtools.cdt.autotools.tests;
+
+import junit.framework.TestCase;
+
+import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+
+// This test verifies an autogen.sh project that builds configure, but
+// does not run it.
+public class AutotoolsProjectTest2 extends TestCase {
+    
+	private IProject testProject;
+	
+    /*
+     * @see TestCase#setUp()
+     */
+    protected void setUp() throws Exception {
+        super.setUp();
+        if (!ProjectTools.setup())
+        	fail("could not perform basic project workspace setup");
+		testProject = ProjectTools.createProject("testProject2");
+		if (testProject == null) {
+            fail("Unable to create test project");
+        }
+		testProject.open(new NullProgressMonitor());
+    }
+	
+    /**
+     * Test sample project which has a hello world program. The top-level 
+     * contains autogen.sh which will build configure, but not run it.
+     * The hello world source is found in
+     * src/sample/hello.c so configuration must create multiple
+     * Makefiles.
+     * @throws Exception
+     */
+	public void testAutotoolsProject2() throws Exception {
+		Path p = new Path("zip/project2.zip");
+		ProjectTools.addSourceContainerWithImport(testProject, "src", p, null);
+		assertTrue(testProject.hasNature(ManagedCProjectNature.MNG_NATURE_ID));
+		org.eclipse.core.runtime.Path x = new org.eclipse.core.runtime.Path("src/ChangeLog");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("src/configure");
+		ProjectTools.setConfigDir(testProject, "src");
+		ProjectTools.markExecutable(testProject, "src/autogen.sh");
+		x = new org.eclipse.core.runtime.Path("src/configure");
+		assertFalse(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("src/Makefile.in");
+		assertFalse(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("src/sample/Makefile.in");
+		assertFalse(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("src/aclocal.m4");
+		assertFalse(testProject.exists(x));
+		assertTrue(ProjectTools.build());
+		x = new org.eclipse.core.runtime.Path("src/configure");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("src/Makefile.in");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("src/sample/Makefile.in");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("src/aclocal.m4");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("config.status");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("Makefile");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("sample/a.out");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("sample/Makefile");
+		assertTrue(testProject.exists(x));
+	}
+	
+	protected void tearDown() throws Exception {
+		testProject.refreshLocal(IResource.DEPTH_INFINITE, null);
+		try {
+			testProject.delete(true, true, null);
+		} catch (Exception e) {
+			//FIXME: Why does a ResourceException occur when deleting the project??
+		}
+		super.tearDown();
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsTestsPlugin.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsTestsPlugin.java
new file mode 100644
index 0000000..533bd44
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsTestsPlugin.java
@@ -0,0 +1,103 @@
+package org.eclipse.linuxtools.cdt.autotools.tests;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class AutotoolsTestsPlugin extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.cdt.autotools.core.tests";
+
+	// The shared instance
+	private static AutotoolsTestsPlugin plugin;
+	private ResourceBundle resourceBundle;
+	
+	/**
+	 * The constructor
+	 */
+	public AutotoolsTestsPlugin() {
+		plugin = this;
+		try {
+			resourceBundle = ResourceBundle.getBundle("org.eclipse.linuxtools.cdt.autotools.core.tests.Resources");
+		} catch (MissingResourceException x) {
+			resourceBundle = null;
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static AutotoolsTestsPlugin getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Returns an image descriptor for the image file at the given
+	 * plug-in relative path
+	 *
+	 * @param path the path
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return imageDescriptorFromPlugin(PLUGIN_ID, path);
+	}
+	
+	/**
+	 * Returns active shell.
+	 */
+	public static Shell getActiveWorkbenchShell() {
+		IWorkbenchWindow window = getDefault().getWorkbench().getActiveWorkbenchWindow();
+		if (window != null) {
+			return window.getShell();
+		}
+		return null;
+	}
+	
+	/**
+	 * Returns the string from the plugin's resource bundle,
+	 * or 'key' if not found.
+	 */
+	public static String getResourceString(String key) {
+		ResourceBundle bundle = AutotoolsTestsPlugin.getDefault().getResourceBundle();
+		try {
+			return (bundle != null) ? bundle.getString(key) : key;
+		} catch (MissingResourceException e) {
+			return key;
+		}
+	}
+
+	/**
+	 * Returns the plugin's resource bundle,
+	 */
+	public ResourceBundle getResourceBundle() {
+		return resourceBundle;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/CoreUtility.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/CoreUtility.java
new file mode 100644
index 0000000..67b1b87
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/CoreUtility.java
@@ -0,0 +1,108 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - initial API and implementation
+ *     Markus Schorn (Wind River Systems)
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.tests;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.osgi.framework.Bundle;
+
+public class CoreUtility {
+	
+	/**
+	 * Creates a folder and all parent folders if not existing.
+	 * Project must exist.
+	 * <code> org.eclipse.ui.dialogs.ContainerGenerator</code> is too heavy
+	 * (creates a runnable)
+	 */
+	public static void createFolder(IFolder folder, boolean force, boolean local, IProgressMonitor monitor) throws CoreException {
+		if (!folder.exists()) {
+			IContainer parent= folder.getParent();
+			if (parent instanceof IFolder) {
+				createFolder((IFolder)parent, force, local, null);
+			}
+			folder.create(force, local, monitor);
+		}
+	}
+	
+	/**
+	 * Creates an extension.  If the extension plugin has not
+	 * been loaded a busy cursor will be activated during the duration of
+	 * the load.
+	 *
+	 * @param element the config element defining the extension
+	 * @param classAttribute the name of the attribute carrying the class
+	 * @return the extension object
+	 */
+	public static Object createExtension(final IConfigurationElement element, final String classAttribute) throws CoreException {
+		// If plugin has been loaded create extension.
+		// Otherwise, show busy cursor then create extension.
+		
+		String id= element.getContributor().getName();
+		Bundle bundle = Platform.getBundle(id);
+		if(bundle.getState() == org.osgi.framework.Bundle.ACTIVE) {
+			return element.createExecutableExtension(classAttribute);
+		}
+		final Object[] ret = new Object[1];
+		final CoreException[] exc = new CoreException[1];
+		BusyIndicator.showWhile(null, new Runnable() {
+			public void run() {
+				try {
+					ret[0] = element.createExecutableExtension(classAttribute);
+				} catch (CoreException e) {
+					exc[0] = e;
+				}
+			}
+		});
+		if (exc[0] != null)
+			throw exc[0];
+		return ret[0];
+	}
+
+	/**
+	 * Calls equals after checking for nulls
+	 */
+	public static boolean safeEquals(Object lhs, Object rhs) {
+	    if (lhs==rhs) {
+	        return true;
+	    }
+	    if (lhs == null || rhs == null) {
+	        return false;
+	    }
+	    return lhs.equals(rhs);
+	}
+
+	/**
+	 * Calls hashCode after checking for null
+	 */
+	public static int safeHashcode(Object o) {
+		return o == null ? 0 : o.hashCode();
+	}
+
+	/**
+	 * Comparse two integers.
+	 */
+	public static int compare(int lhs, int rhs) {
+		if (lhs < rhs) {
+			return -1;
+		}
+		if (lhs > rhs) {
+			return 1;
+		}
+		return 0;
+	}
+}	
+
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/ProjectTools.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/ProjectTools.java
new file mode 100644
index 0000000..c78eca1
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/ProjectTools.java
@@ -0,0 +1,418 @@
+package org.eclipse.linuxtools.cdt.autotools.tests;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.util.zip.ZipFile;
+
+import org.eclipse.cdt.core.CommandLauncher;
+import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.IProjectType;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.ui.wizards.conversion.ConvertProjectWizardPage;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceDescription;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsConfigurationManager;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IAConfiguration;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards.ConvertToAutotoolsProjectWizard;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards.ConvertToAutotoolsProjectWizardPage;
+import org.eclipse.ui.dialogs.IOverwriteQuery;
+import org.eclipse.ui.wizards.datatransfer.ImportOperation;
+import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider;
+
+
+public class ProjectTools {
+
+	static IWorkspace workspace;
+    static IWorkspaceRoot root;
+    static NullProgressMonitor monitor;
+    static String pluginRoot;
+    static ConvertProjectWizardPage page;
+    static boolean setupComplete;
+
+    /**
+     * Setup routine for tests.
+     * @return true if setup successful, false otherwise
+     * @throws Exception
+     */
+	public static boolean setup() throws Exception {
+		if (!setupComplete) {
+        IWorkspaceDescription desc;
+        workspace = ResourcesPlugin.getWorkspace();
+        root = workspace.getRoot();
+        monitor = new NullProgressMonitor();
+        if(workspace == null) {
+        	return false;
+        }
+        if(root == null) {
+        	return false;
+        }
+        desc = workspace.getDescription();
+        desc.setAutoBuilding(false);
+        workspace.setDescription(desc);
+		}
+		setupComplete = true;
+		return true;
+	}
+	
+	/**
+	 * Build the project.
+	 * @return true if build started successfully or false otherwise
+	 */
+	public static boolean build() {
+		try {
+			workspace.build(IncrementalProjectBuilder.FULL_BUILD, getMonitor());
+		} catch (CoreException e) {
+		    return false;	
+		}
+		return true;
+	}
+	
+	/**
+	 * Get the default monitor.
+	 * @return The current monitor
+	 */
+	public static IProgressMonitor getMonitor() {
+		return monitor;
+	}
+
+	/**
+	 * Mark a specified file in a project as executable.
+	 * @param project The project that the file is found in
+	 * @param filePath The relative path to the file
+	 * @return true if the change was successful, false otherwise
+	 */
+	public static boolean markExecutable(IProject project, String filePath) {
+		// Get a launcher for the config command
+		CommandLauncher launcher = new CommandLauncher();
+		OutputStream stdout = new ByteArrayOutputStream();
+		OutputStream stderr = new ByteArrayOutputStream();
+
+		launcher.showCommand(true);
+		IPath commandPath = new Path("chmod");
+		IPath runPath = project.getLocation().append(filePath).removeLastSegments(1);
+		String[] args = new String[2];
+		args[0] = "+x";
+		args[1] = project.getLocation().append(filePath).toOSString();
+		try {
+			Process proc = launcher.execute(commandPath, args, new String[0],
+					runPath, new NullProgressMonitor());
+			if (proc != null) {
+				try {
+					// Close the input of the process since we will never write to
+					// it
+					proc.getOutputStream().close();
+				} catch (IOException e) {
+				}
+
+				if (launcher.waitAndRead(stdout, stderr, new SubProgressMonitor(
+						monitor, IProgressMonitor.UNKNOWN)) != CommandLauncher.OK) {
+					return false;
+				}
+			} else
+				return false;
+		} catch (CoreException e) {
+			return false;
+		}
+		return true;
+	}
+	
+	// Inner class to allow us to fake a project wizard without starting up
+	// the UI for it.
+	protected static class ConvertToAutotoolsProjectWizardTest extends ConvertToAutotoolsProjectWizard {
+		ConvertToAutotoolsProjectWizardTest() {
+			super();
+		}
+
+		// The following is a kludge to allow testing to occur for the
+		// wizard code.  The regular applyOptions() method would also attempt
+		// to call performApply() for the optionPage.  This doesn't work in
+		// the test scenario because the UI display logic is needed to
+		// initialize some things.  The performApply() call is only needed
+		// to check out referenced projects.  In our test scenario, this is
+		// not required.
+		public void applyOptions(IProject project, IProgressMonitor monitor) {
+			setCurrentProject(project);
+	    }
+		
+		public IConfiguration[] getSelectedConfigurations() {
+			IProjectType projectType = ManagedBuildManager.getExtensionProjectType("org.eclipse.linuxtools.cdt.autotools.core.projectType"); //$NON-NLS-1$
+			IConfiguration[] cfgs = projectType.getConfigurations();
+			return cfgs;
+		}
+	}
+	
+	/**
+	 * Creates an empty Autotools project.
+	 * @param name The name of the new project
+	 * @return The newly created project or null
+	 */		
+	public static IProject createProject(String name) {
+		IProject testProject = root.getProject(name);
+		if (testProject == null) {
+			return null;
+        }
+		try {
+			testProject.create(monitor);
+			testProject.open(monitor);
+			ConvertToAutotoolsProjectWizardTest wizard = new ConvertToAutotoolsProjectWizardTest();
+			wizard.addPages();
+			ConvertToAutotoolsProjectWizardPage page = new ConvertToAutotoolsProjectWizardPage("test", wizard);
+			page.convertProject(testProject, monitor, wizard.getProjectID());
+		} catch (CoreException e) {
+			testProject = null;
+		}
+		return testProject;
+	}
+	
+	/**
+	 * Set the configuration source directory for an Autotools project.
+	 * @param project The Autotools project to modify
+	 * @param dir The relative project directory to use
+	 */
+	public static void setConfigDir(IProject project, String dir) {
+		IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+		IConfiguration c = info.getDefaultConfiguration();
+		ICConfigurationDescription cfgd = ManagedBuildManager.getDescriptionForConfiguration(c);
+		String id = cfgd.getId();
+		IAConfiguration cfg = AutotoolsConfigurationManager.getInstance().getConfiguration(project, id, true);
+		cfg.setConfigToolDirectory(dir);
+//		IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+//		ITool tool = info.getToolFromOutputExtension("status"); //$NON-NLS-1$
+//		IOption[] options = tool.getOptions();
+//		try {
+//		for (int i = 0; i < options.length; ++i) {
+//			if (options[i].getValueType() == IOption.STRING) {
+//				String id = options[i].getId();
+//				if (id.indexOf("configdir") > 0) { //$NON-NLS-1$
+//					options[i].setValue(dir);
+//					break;
+//				}
+//			}
+//		}
+//		} catch (BuildException e) {
+//			// do nothing
+//		}
+	}
+	
+	private static void importFilesFromZip(ZipFile srcZipFile, IPath destPath, IProgressMonitor monitor) throws InvocationTargetException {		
+		ZipFileStructureProvider structureProvider=	new ZipFileStructureProvider(srcZipFile);
+		try {
+			ImportOperation op= new ImportOperation(destPath, structureProvider.getRoot(), structureProvider, new ImportOverwriteQuery());
+			op.run(monitor);
+		} catch (InterruptedException e) {
+			// should not happen
+		}
+	}
+
+	private static boolean generateFiles(IPath destPath) {
+		// Get a launcher for the config command
+		CommandLauncher launcher = new CommandLauncher();
+		OutputStream stdout = new ByteArrayOutputStream();
+		OutputStream stderr = new ByteArrayOutputStream();
+		
+		IPath runPath = root.getLocation().append(destPath);
+
+		// Run the genfiles.sh shell script which will simulate
+		// running aclocal, autoconf, and automake
+		launcher.showCommand(true);
+		IPath commandPath = new Path("sh");
+		String[] cmdargs = new String[]{"genfiles.sh"};
+		try {
+			Process proc = launcher.execute(commandPath, cmdargs, new String[0],
+					runPath, new NullProgressMonitor());
+			if (proc != null) {
+				try {
+					// Close the input of the process since we will never write to
+					// it
+					proc.getOutputStream().close();
+				} catch (IOException e) {
+				}
+
+				if (launcher.waitAndRead(stdout, stderr, new SubProgressMonitor(
+						monitor, IProgressMonitor.UNKNOWN)) != CommandLauncher.OK) {
+					return false;
+				}
+			} else
+				return false;
+		} catch (CoreException e) {
+			return false;
+		}
+
+		return true;
+	}
+
+	private static void importFilesFromZipAndGenerate(ZipFile srcZipFile, IPath destPath, IProgressMonitor monitor) throws InvocationTargetException {
+		importFilesFromZip(srcZipFile, destPath, monitor);
+		if (!generateFiles(destPath))
+			throw new InvocationTargetException(new Exception("Unsuccessful test file generation"));
+	}
+	
+	private static class ImportOverwriteQuery implements IOverwriteQuery {
+		public String queryOverwrite(String file) {
+			return ALL;
+		}	
+	}		
+	
+	/**
+	 * Adds a source container to a IProject.
+	 * @param jproject The parent project
+	 * @param containerName The name of the new source container
+	 * @return The handle to the new source container
+	 * @throws CoreException Creation failed
+	 */		
+	public static IContainer addSourceContainer(IProject jproject, String containerName) throws CoreException {
+		return addSourceContainer(jproject, containerName, new Path[0]);
+	}
+
+	/**
+	 * Adds a source container to a IProject.
+	 * @param jproject The parent project
+	 * @param containerName The name of the new source container
+	 * @param exclusionFilters Exclusion filters to set
+	 * @return The handle to the new source container
+	 * @throws CoreException Creation failed
+	 */		
+	public static IContainer addSourceContainer(IProject jproject, String containerName, IPath[] exclusionFilters) throws CoreException {
+		return addSourceContainer(jproject, containerName, new Path[0], exclusionFilters);
+	}
+	
+	/**
+	 * Adds a source container to a IProject.
+	 * @param jproject The parent project
+	 * @param containerName The name of the new source container
+	 * @param inclusionFilters Inclusion filters to set
+	 * @param exclusionFilters Exclusion filters to set
+	 * @return The handle to the new source container
+	 * @throws CoreException Creation failed
+	 */				
+	public static IContainer addSourceContainer(IProject jproject, String containerName, IPath[] inclusionFilters, IPath[] exclusionFilters) throws CoreException {
+		IProject project= jproject.getProject();
+		IContainer container= null;
+		if (containerName == null || containerName.length() == 0) {
+			container= project;
+		} else {
+			IFolder folder= project.getFolder(containerName);
+			if (!folder.exists()) {
+				CoreUtility.createFolder(folder, false, true, null);
+			}
+			container= folder;
+		}
+	
+		return container;
+	}
+	
+	/**
+	 * Adds a source container to a IProject and imports all files contained
+	 * in the given ZIP file.
+	 * @param project The parent project
+	 * @param containerName Name of the source container
+	 * @param zipFile Archive to import
+	 * @param containerEncoding encoding for the generated source container
+	 * @param generate true if configuration files need to be pre-generated
+	 * @param exclusionFilters Exclusion filters to set
+	 * @return The handle to the new source container
+	 * @throws InvocationTargetException Creation failed
+	 * @throws CoreException Creation failed
+	 * @throws IOException Creation failed
+	 */		
+	public static IContainer addSourceContainerWithImport(IProject project, String containerName, File zipFile, String containerEncoding, boolean generate, IPath[] exclusionFilters) throws InvocationTargetException, CoreException, IOException {
+		ZipFile file= new ZipFile(zipFile);
+		try {
+//			IPackageFragmentRoot root= addSourceContainer(jproject, containerName, exclusionFilters);
+//			((IContainer) root.getCorrespondingResource()).setDefaultCharset(containerEncoding, null);
+			IContainer root= addSourceContainer(project, containerName, exclusionFilters);
+			if (generate)
+				importFilesFromZipAndGenerate(file, root.getFullPath(), null);
+			else
+				importFilesFromZip(file, root.getFullPath(), null);
+			return root;
+		} finally {
+			if (file != null) {
+				file.close();
+			}
+		}
+	}
+
+	/**
+	 * Adds a source container to a IProject and imports all files contained
+	 * in the given ZIP file and generates configuration files if needed.
+	 * @param project The parent project
+	 * @param containerName Name of the source container
+	 * @param path path of zipFile Archive to import
+	 * @param containerEncoding encoding for the generated source container
+	 * @param generate true if configuration files need to be pre-generated
+	 * @return The handle to the new source container
+	 * @throws InvocationTargetException Creation failed
+	 * @throws CoreException Creation failed
+	 * @throws IOException Creation failed
+	 */		
+	public static IContainer addSourceContainerWithImport(IProject project, String containerName, Path zipFilePath, String containerEncoding, boolean generate) throws InvocationTargetException, CoreException, IOException {
+		File zipFile = new File(FileLocator.toFileURL(FileLocator.find(AutotoolsTestsPlugin.getDefault().getBundle(), zipFilePath, null)).getFile());
+		return addSourceContainerWithImport(project, containerName, zipFile, containerEncoding, generate, null);
+	}
+	
+	/**
+	 * Adds a source container to a IProject and imports all files contained
+	 * in the given ZIP file.
+	 * @param project The parent project
+	 * @param containerName Name of the source container
+	 * @param path path of zipFile Archive to import
+	 * @param containerEncoding encoding for the generated source container
+	 * @return The handle to the new source container
+	 * @throws InvocationTargetException Creation failed
+	 * @throws CoreException Creation failed
+	 * @throws IOException Creation failed
+	 */		
+	public static IContainer addSourceContainerWithImport(IProject project, String containerName, Path zipFilePath, String containerEncoding) throws InvocationTargetException, CoreException, IOException {
+		return addSourceContainerWithImport(project, containerName, zipFilePath, containerEncoding, false);
+	}
+
+	/**
+	 * Create an empty file for a project.
+	 * @param project The project to create the file for
+	 * @param filename The name of the new file
+	 * @return the created file
+	 * @throws CoreException
+	 */
+	public IFile createEmptyFile(IProject project, String filename) throws CoreException {
+		IFile emptyFile = project.getFile(filename);
+		emptyFile.create(null, false, null);
+		return emptyFile;
+	}
+
+	/**
+	 * Create a file for a project and initialize the contents.
+	 * @param project The project to create a file for
+	 * @param filename Name of the new file
+	 * @param contents String containing the initial contents of the file
+	 * @return the created file
+	 * @throws CoreException
+	 */
+	public IFile createFile(IProject project, String filename, String contents) throws CoreException {
+		IFile file = project.getFile(filename);
+		file.create(null, false, null);
+		file.setContents(new ByteArrayInputStream(contents.getBytes()), false, false, null);
+		return file;
+	}
+	
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/Resources.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/Resources.properties
new file mode 100644
index 0000000..72d197e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/Resources.properties
@@ -0,0 +1,2 @@
+ProjectTools.ErrorDialog.Title="Project Creation Error"
+ProjectTools.Exist.Error="Project already exists"
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/AutoconfTests.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/AutoconfTests.java
new file mode 100644
index 0000000..566b866
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/AutoconfTests.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.tests.autoconf;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AutoconfTests {
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite(
+				"Test for org.eclipse.linuxtools.cdt.autotools.core.tests.autoconf");
+		//$JUnit-BEGIN$
+		suite.addTestSuite(TestMacroParser.class);
+		suite.addTestSuite(TestTokenizer.class);
+		suite.addTestSuite(TestShellParser.class);
+		//$JUnit-END$
+		return suite;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/BaseParserTest.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/BaseParserTest.java
new file mode 100644
index 0000000..d61e810
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/BaseParserTest.java
@@ -0,0 +1,268 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.tests.autoconf;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.jface.text.Document;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfMacroDetector;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfMacroElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfParser;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.IAutoconfErrorHandler;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.IAutoconfMacroValidator;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.ParseException;
+
+
+import junit.framework.TestCase;
+
+public abstract class BaseParserTest extends TestCase {
+
+	private IAutoconfErrorHandler errorHandler;
+	protected List errors;
+	private IAutoconfMacroValidator macroValidator;
+	private Set macroNames;
+	private AutoconfMacroDetector macroDetector;
+
+	public BaseParserTest() {
+		super();
+	}
+
+	public BaseParserTest(String name) {
+		super(name);
+	}
+
+	protected void setUp() throws Exception {
+		errors = new ArrayList();
+		this.errorHandler = new IAutoconfErrorHandler() {
+	
+			public void handleError(ParseException exception) {
+				assertNotNull(exception);
+				errors.add(exception);
+			}
+			
+		};
+	
+		this.macroDetector = new AutoconfMacroDetector();
+		
+		macroNames = new HashSet/*<String>*/();
+		this.macroValidator = new IAutoconfMacroValidator() {
+	
+			public void validateMacroCall(AutoconfMacroElement element)
+					throws ParseException {
+				assertNotNull(element);
+				assertNotNull(element.getName());
+				assertNotNull(element.getChildren());
+				macroNames.add(element.getName());
+			}
+			
+		};
+	}
+
+	protected void tearDown() throws Exception {
+	}
+
+	protected IDocument createDocument(String text) {
+		return new Document(text);
+	}
+
+	/**
+	 * Parse the document with no error or macro handlers
+	 * @param parser
+	 * @param document
+	 * @return root
+	 */
+	protected AutoconfElement parseNoHandlers(IDocument document) {
+		AutoconfParser parser = new AutoconfParser(null, null, null);
+		AutoconfElement root = parser.parse(document);
+		assertNotNull(root);
+		return root;
+	}
+
+	/**
+	 * Parse the document with the standard error or macro handlers,
+	 * cleared out before use
+	 * @param parser
+	 * @param document
+	 * @return root 
+	 */
+	protected AutoconfElement parseWithHandlers(IDocument document) {
+		AutoconfParser parser = new AutoconfParser(errorHandler, macroDetector, macroValidator);
+		
+		errors.clear();
+		macroNames.clear();
+		
+		AutoconfElement root = parser.parse(document);
+		assertNotNull(root);
+		return root;
+	}
+
+	/**
+	 * Parse the document in 'string' twice, once without any handlers and once with the standard error or macro handlers,
+	 * cleared out before use
+	 * @param string
+	 * @return root 
+	 */
+	protected AutoconfElement parse(String string) {
+		AutoconfElement tree = parse(string, false);
+		return tree;
+	}
+
+	protected AutoconfElement parse(String string, boolean allowErrors) {
+		IDocument document = createDocument(string);
+		AutoconfElement root1 = parseNoHandlers(document);
+		assertNotNull(root1);
+		AutoconfElement root2 = parseWithHandlers(document);
+		assertNotNull(root2);
+	
+		validateSourceTree(root1);
+		validateSourceTree(root2);
+	
+		// TODO: check root1 == root2
+		
+		// ensure the doc wasn't changed (sanity)
+		assertEquals(string, document.get());
+	
+		if (!allowErrors) {
+			if (errors.size() > 0)
+				fail("got errors" + errors.get(0));
+		}
+		else
+			assertTrue(errors.size() > 0);
+		
+		return root2;
+	}
+
+	protected void checkError(String msgKey) {
+		for (Iterator iter = errors.iterator(); iter.hasNext(); ) {
+			ParseException exc = (ParseException) iter.next();
+			if (exc.getMessage().contains(msgKey))
+				return;
+		}
+		String any = "";
+		if (errors.size() > 0)
+			any = ", but saw " + errors.get(0).toString();
+		fail("did not find error: " + msgKey + any );
+	}
+
+	protected void checkError(String msgKey, int line) {
+		ParseException possible = null;
+		int distance = 999;
+		for (Iterator iter = errors.iterator(); iter.hasNext(); ) {
+			ParseException exc = (ParseException) iter.next();
+			if (exc.getMessage().contains(msgKey)) {
+				int curDistance = Math.abs(possible.getLineNumber() - line);
+				if (possible == null || curDistance < distance) {
+					possible = exc;
+					distance = curDistance;
+				}
+				if (exc.getLineNumber() == line)
+					return;
+			}
+		}
+		if (possible == null)
+			fail("did not find any error: " + msgKey);
+		else
+			fail("did not find error: " + msgKey + " on line: " + line +", but found one at " + possible.getLineNumber());
+	}
+
+	/**
+	 * Make sure the source ranges for the tree are sane:
+	 * <p>
+	 * <li>document set
+	 * <li>line numbers, columns valid
+	 * <li>children encompassed in parent
+	 * <li>siblings non-overlapping
+	 * @param element
+	 */
+	protected void validateSourceTree(AutoconfElement element) {
+		validateSourceElement(element);
+		AutoconfElement[] kids = element.getChildren();
+		for (int i = 0; i < kids.length; i++) {
+			if (kids[i].getStartOffset() < element.getStartOffset() 
+					|| kids[i].getEndOffset() > element.getEndOffset())
+				fail(describeElement(kids[i]) + " not inside parent " + describeElement(element));
+			validateSourceTree(kids[i]);
+		}
+		for (int i = 0; i < kids.length - 1; i++) {
+			AutoconfElement kid1 = kids[i];
+			AutoconfElement kid2 = kids[i + 1];
+			if (kid1.getEndOffset() > kid2.getStartOffset())
+				fail(describeElement(kid1) + " overlaps " + describeElement(kid2));
+		}
+	}
+
+	/**
+	 * Make sure the source ranges for the element are sane:
+	 * <p>
+	 * <li>document set
+	 * <li>line numbers, columns valid
+	 * @param element
+	 */
+	private void validateSourceElement(AutoconfElement element) {
+		if (element.getDocument() == null)
+			fail("no document for " + describeElement(element));
+		if (element.getStartOffset() < 0)
+			fail("no start offset for " + describeElement(element));
+		if (element.getEndOffset() < 0)
+			fail("no end offset for " + describeElement(element));
+		if (element.getStartOffset() > element.getEndOffset())
+			fail("invalid range (start > end) for " + describeElement(element));
+	}
+
+	private String describeElement(AutoconfElement element) {
+		return element.getClass().getSimpleName() + " <<" + element.getSource() + ">>";
+	}
+
+	protected void assertEqualSource(String text, AutoconfElement element) {
+		assertEquals(text, element.getSource());
+	}
+
+	/** Check that a tree has the given structure.  'elements' is a flattened
+	 * representation of the tree, where each node represents one level deeper
+	 * in the tree, except for 'null' which backs out one level.
+	 * @param tree
+	 * @param elements
+	 */
+	protected void assertTreeStructure(AutoconfElement tree, String[] elements) {
+		// if fails, the elements[] array is missing final nulls
+		assertEquals(elements.length, assertTreeStructure(tree, elements, 0));
+	}
+
+	private int assertTreeStructure(AutoconfElement tree, String[] elements,
+			int elementIdx) {
+		AutoconfElement[] kids = tree.getChildren();
+		for (int j = 0; j < kids.length; j++) {
+			if (elementIdx >= elements.length  || elements[elementIdx] == null) {
+				fail("extra children in " + tree + " at " + kids[j]);
+			}
+			if (!kids[j].getName().equals(elements[elementIdx])) 
+				fail("did not match " + elements[elementIdx] + ", instead got " + kids[j].getClass().getSimpleName() + "=" + kids[j].getName());
+			
+			elementIdx++;
+			if (kids[j].getChildren().length > 0) {
+				elementIdx = assertTreeStructure(kids[j], elements, elementIdx);
+				if (elementIdx >= elements.length)
+					fail("Missing null in elements list, or invalid tree hierarchy");
+				if (elements[elementIdx] != null) {
+					fail("not enough children in " + tree);
+				}
+				elementIdx++;
+			}
+		}
+		return elementIdx;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/TestMacroParser.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/TestMacroParser.java
new file mode 100644
index 0000000..7bcf950
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/TestMacroParser.java
@@ -0,0 +1,266 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.tests.autoconf;
+
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.AutoconfEditorMessages;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfIfElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfMacroArgumentElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfMacroElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfParser;
+
+
+/**
+ * Test parsing with macros
+ * @author eswartz
+ *
+ */
+public class TestMacroParser extends BaseParserTest {
+
+	public void testEmpty() throws Exception {
+		parse("");
+	}
+	
+	public void testComments() throws Exception {
+		// 
+		String text = 
+			"dnl first line\n" +
+			"dnl second line\n";
+		AutoconfElement root = parse(text);
+		Object[] kids = root.getChildren();
+		// these are stripped
+		assertEquals(0, kids.length);
+		assertTreeStructure(root, new String[] {});
+	}
+	
+	public void testMacroParsing1() throws Exception {
+		// 
+		String text =
+			"AC_REQUIRE([AM_SANITY_CHECK])\n" + 
+			"";
+		AutoconfElement root = parse(text);
+		assertTreeStructure(root, new String[] { "AC_REQUIRE", "AM_SANITY_CHECK", null });
+		
+		AutoconfElement[] kids = root.getChildren();
+		assertEquals(1, kids.length);
+		assertTrue(kids[0] instanceof AutoconfMacroElement);
+		AutoconfMacroElement macro = (AutoconfMacroElement) kids[0];
+		assertEquals("AC_REQUIRE", macro.getName());
+		assertEquals(1, macro.getParameterCount());
+		
+		AutoconfElement[] args = macro.getChildren();
+		assertEquals(1, args.length);
+		assertTrue(args[0] instanceof AutoconfMacroArgumentElement);
+		
+		assertEquals("AM_SANITY_CHECK", ((AutoconfMacroArgumentElement)args[0]).getName());
+		assertEquals("AM_SANITY_CHECK", macro.getParameter(0));
+		
+		// keep quotes in source
+		assertEqualSource("[AM_SANITY_CHECK]", args[0]);
+		assertEqualSource("AC_REQUIRE([AM_SANITY_CHECK])", macro);
+	}
+	
+	public void testMacroParsing2() throws Exception {
+		// 
+		String text =
+			"AC_TWO_ARGS(first,second)\n" + 
+			"";
+		AutoconfElement root = parse(text);
+		assertTreeStructure(root, new String[] { "AC_TWO_ARGS", "first", "second", null });
+		
+		AutoconfElement[] kids = root.getChildren();
+		assertEquals(1, kids.length);
+		assertTrue(kids[0] instanceof AutoconfMacroElement);
+		AutoconfMacroElement macro = (AutoconfMacroElement) kids[0];
+		assertEquals("AC_TWO_ARGS", macro.getName());
+		assertEquals(2, macro.getParameterCount());
+		
+		AutoconfElement[] args = macro.getChildren();
+		assertEquals(2, args.length);
+		assertTrue(args[0] instanceof AutoconfMacroArgumentElement);
+		assertEquals("first", ((AutoconfMacroArgumentElement)args[0]).getName());
+		assertTrue(args[1] instanceof AutoconfMacroArgumentElement);
+		assertEquals("second", ((AutoconfMacroArgumentElement)args[1]).getName());
+		assertEquals("first", macro.getParameter(0));
+		assertEquals("second", macro.getParameter(1));
+		
+		assertEqualSource("first", args[0]);
+		assertEqualSource("second", args[1]);
+		assertEqualSource("AC_TWO_ARGS(first,second)", macro);
+	}
+	
+	public void testMacroParsing3() throws Exception {
+		// 
+		String text =
+			"AC_ONE_ARG( [quoted( arg ), second] )\n" + 
+			"";
+		AutoconfElement root = parse(text);
+		assertTreeStructure(root, new String[] { "AC_ONE_ARG", "quoted( arg ), second", null });
+		
+		AutoconfElement[] kids = root.getChildren();
+		assertEquals(1, kids.length);
+		assertTrue(kids[0] instanceof AutoconfMacroElement);
+		AutoconfMacroElement macro = (AutoconfMacroElement) kids[0];
+		assertEquals("AC_ONE_ARG", macro.getName());
+		
+		AutoconfElement[] args = macro.getChildren();
+		assertEquals(1, macro.getParameterCount());
+		assertEquals(1, args.length);
+		assertTrue(args[0] instanceof AutoconfMacroArgumentElement);
+		
+		// spaces removed from outermost arguments, but not inner
+		assertEquals("quoted( arg ), second", ((AutoconfMacroArgumentElement)args[0]).getName());
+		assertEquals("quoted( arg ), second", macro.getParameter(0));
+		
+		assertEqualSource("[quoted( arg ), second]", args[0]);
+		assertEqualSource("AC_ONE_ARG( [quoted( arg ), second] )", macro);
+	}
+
+	public void testMacroParsing4() throws Exception {
+		// 
+		String text =
+			"AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],\r\n" + 
+			"         [AM_AUTOMAKE_VERSION([1.4-p6])])\r\n" + 
+			"\r\n" + 
+			"";
+		AutoconfElement root = parse(text);
+		AutoconfElement[] kids = root.getChildren();
+		assertEquals(1, kids.length);
+		assertTrue(kids[0] instanceof AutoconfMacroElement);
+		AutoconfMacroElement macro = (AutoconfMacroElement) kids[0];
+		assertEquals("AC_DEFUN", macro.getName());
+
+		// spaces and quotes dropped
+		assertEquals(2, macro.getParameterCount());
+		assertEquals("AM_SET_CURRENT_AUTOMAKE_VERSION", macro.getParameter(0));
+		assertEquals("AM_AUTOMAKE_VERSION([1.4-p6])", macro.getParameter(1));
+		
+		// no spaces in source either, but quotes kept
+		assertEqualSource("[AM_SET_CURRENT_AUTOMAKE_VERSION]", macro.getChildren()[0]);
+		assertEqualSource("[AM_AUTOMAKE_VERSION([1.4-p6])]", macro.getChildren()[1]);
+	}
+
+	public void testMacroParsing5() throws Exception {
+		// check that complex shell constructs don't throw off the
+		// parser, and also that we don't mistake shell tokens in a macro argument
+		String arg2 =
+			"AC_MSG_CHECKING(for working $2)\n" + 
+			"# Run test in a subshell; some versions of sh will print an error if\n" + 
+			"# an executable is not found, even if stderr is redirected.\n" + 
+			"# Redirect stdin to placate older versions of autoconf.  Sigh.\n" + 
+			"if ($2 --version) < /dev/null > /dev/null 2>&1; then\n" + 
+			"   $1=$2\n" + 
+			"   AC_MSG_RESULT(found)\n" + 
+			"else\n" + 
+			"   $1=\"$3/missing $2\"\n" + 
+			"   AC_MSG_RESULT(missing)\n" + 
+			"fi\n" + 
+			"AC_SUBST($1)";
+		String text =
+			"AC_DEFUN([AM_MISSING_PROG],\n" + 
+			"[" + arg2 + "])\n" + 
+			"";
+		AutoconfElement root = parse(text);
+		assertTreeStructure(root, new String[] {
+				"AC_DEFUN", 
+					"AM_MISSING_PROG", 
+					arg2, 
+					null,
+		});
+		AutoconfElement[] kids = root.getChildren();
+		assertEquals(1, kids.length);
+		assertTrue(kids[0] instanceof AutoconfMacroElement);
+		AutoconfMacroElement macro = (AutoconfMacroElement) kids[0];
+		assertEquals("AC_DEFUN", macro.getName());
+		assertEquals("AM_MISSING_PROG", macro.getVar());
+
+		// spaces dropped
+		assertEquals(2, macro.getParameterCount());
+		assertEquals("AM_MISSING_PROG", macro.getParameter(0));
+		
+		// be sure complex arguments aren't mangled
+		assertEquals(arg2, macro.getParameter(1));
+		assertEqualSource("[" + arg2 + "]", macro.getChildren()[1]);
+		
+	}
+
+	public void testMacroParsing6() throws Exception {
+		// empty arguments
+		String text =
+			"AC_DEFUN( ,\n" +
+			")\n"; 
+		AutoconfElement root = parse(text);
+		AutoconfElement[] kids = root.getChildren();
+		assertEquals(1, kids.length);
+		assertTrue(kids[0] instanceof AutoconfMacroElement);
+		AutoconfMacroElement macro = (AutoconfMacroElement) kids[0];
+		assertEquals("AC_DEFUN", macro.getName());
+		assertEquals("", macro.getVar());
+
+		// spaces dropped
+		assertEquals(2, macro.getParameterCount());
+		assertEquals("", macro.getParameter(0));
+		assertEquals("", macro.getParameter(1));
+
+		assertEqualSource("", macro.getChildren()[0]);
+		assertEqualSource("", macro.getChildren()[1]);
+	}
+
+	public void testWithErrorUnmatchedLeftParen() {
+		String text =
+			"AC_BAD_MACRO(\n";
+		
+		AutoconfElement root = parse(text, true);
+		assertEquals(1, root.getChildren().length);
+		assertTrue(root.getChildren()[0] instanceof AutoconfMacroElement);
+		checkError(AutoconfEditorMessages.getString(AutoconfParser.UNMATCHED_LEFT_PARENTHESIS));
+	}
+	public void testWithErrorUnmatchedRightParen() {
+		String text =
+			"AC_BAD_MACRO())\n";
+		
+		AutoconfElement root = parse(text, true);
+		assertEquals(1, root.getChildren().length);
+		assertTrue(root.getChildren()[0] instanceof AutoconfMacroElement);
+		checkError(AutoconfEditorMessages.getString(AutoconfParser.UNMATCHED_RIGHT_PARENTHESIS));
+	}
+	public void testNoFalseUnmatchedRightParen() {
+		String text =
+			"AC_BAD_MACRO()\n" +
+			"(\n"+
+			"cd foo;\n"+
+			"if test -f myfile; then exit 1; fi\n"+
+			")\n";
+		
+		// nothing but the macro and 'if' is detected as meaningful 
+		AutoconfElement root = parse(text);
+		assertEquals(2, root.getChildren().length);
+		assertTrue(root.getChildren()[0] instanceof AutoconfMacroElement);
+		assertTrue(root.getChildren()[1] instanceof AutoconfIfElement);
+	}
+
+	public void testNestedMacro() {
+		String text =
+			"AC_1(AC_2())\n";
+		
+		AutoconfElement root = parse(text);
+		assertEquals(1, root.getChildren().length);
+		assertTrue(root.getChildren()[0] instanceof AutoconfMacroElement);
+		AutoconfMacroElement ac1 = (AutoconfMacroElement) root.getChildren()[0];
+		assertEquals(1, ac1.getChildren().length);
+		assertTrue(ac1.getChildren()[0] instanceof AutoconfMacroArgumentElement);
+		AutoconfMacroArgumentElement ac2 = (AutoconfMacroArgumentElement) ac1.getChildren()[0];
+		// one empty argument
+		assertEquals(1, ac2.getChildren().length);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/TestShellParser.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/TestShellParser.java
new file mode 100644
index 0000000..764e239
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/TestShellParser.java
@@ -0,0 +1,437 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.tests.autoconf;
+
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.AutoconfEditorMessages;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfCaseConditionElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfCaseElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfParser;
+
+/**
+ * @author eswartz
+ *
+ */
+public class TestShellParser extends BaseParserTest {
+
+	public void testHERE() {
+		String HERE_TEXT = 
+			"\n"+
+			"while true; do \n"+
+			"AM_INIT_AUTOMAKE([confusion], [$2], EOF)\n"+
+			"done\n";
+		String text = "cat <<EOF"+
+			HERE_TEXT +
+			"EOF\n" +
+			"blah";
+		AutoconfElement tree = parse(text);
+		
+		// only see a macro call, not a loop
+		assertTreeStructure(tree, new String[] { "AM_INIT_AUTOMAKE", "confusion", "$2", "EOF", null });
+	}
+
+	public void testHERE2() {
+		String HERE_TEXT = 
+			"\n"+
+			"while true; do \n"+
+			"AM_INIT_AUTOMAKE([confusion], [$2], EOF)\n"+
+			"done\n";
+		String text = "cat <<-EOF"+
+			HERE_TEXT +
+			"EOF\n" +
+			"blah";
+		AutoconfElement tree = parse(text);
+
+		// only see a macro call, not a loop
+		assertTreeStructure(tree, new String[] { "AM_INIT_AUTOMAKE", "confusion", "$2", "EOF", null });
+	}
+	
+
+	public void testIf0() {
+		String text = "# comment\n"+
+		"\tif true; then\n" +
+		"\t\tfoo;\n"+
+		"\tfi\n";
+		AutoconfElement tree = parse(text);
+		assertTreeStructure(tree, new String[] { "if" });
+	}
+
+	public void testIf1() {
+		String text = "# comment\n"+
+		"\tif true; then\n" +
+		"\t\tAC_SOMETHING();\n"+
+		"\tfi\n";
+		AutoconfElement tree = parse(text);
+		assertTreeStructure(tree, new String[] { "if", "AC_SOMETHING", "", null, null });
+	}
+	
+
+	public void testIfElse0() {
+		String text = "# comment\n"+
+		"\tif true; then\n" +
+		"\t\tfoo;\n"+
+		"\telse\n"+
+		"\t\tbar;\n"+
+		"\tfi\n";
+		AutoconfElement tree = parse(text);
+		assertTreeStructure(tree, new String[] { "if", "else", null });
+	}
+
+	public void testIfElse1() {
+		String text = "# comment\n"+
+		"\tif true; then\n" +
+		"\t\tAC_ONE(...);\n"+
+		"\telse\n"+
+		"\t\tAC_TWO(AC_THREE());\n"+
+		"\tfi\n";
+		AutoconfElement tree = parse(text);
+		assertTreeStructure(tree, new String[] {
+				"if", 
+					"AC_ONE", 
+						"...", 
+					null,
+					"else", 
+						"AC_TWO", 
+							"AC_THREE",
+								"AC_THREE", 
+									"",
+								null,
+							null,  
+						null, 
+					null,
+				null});
+
+		AutoconfElement[] kids = tree.getChildren();
+		assertEqualSource("AC_ONE(...)", kids[0].getChildren()[0]);
+		assertEqualSource("AC_TWO(AC_THREE())", kids[0].getChildren()[1].getChildren()[0]);
+	}
+	public void testIf2() {
+		String text =
+		"if blah\n" +
+		"then fi\n";
+		AutoconfElement tree = parse(text);
+		assertTreeStructure(tree, new String[] { "if" });
+	}
+	
+	public void testIfElif() {
+		String text = "# comment\n"+
+		"\tif true; then\n" +
+		"\t\tAC_ONE(...);\n"+
+		"\telif false; then \n"+
+		"\t\tAC_TWO(...);\n"+
+		"\tfi\n";
+		AutoconfElement tree = parse(text);
+		assertTreeStructure(tree, new String[] { 
+				"if", 
+					"AC_ONE", 
+						"...", 
+					null, 
+					"elif", 
+						"AC_TWO", 
+							"...", 
+						null, 
+					null, 
+				null });
+	}
+	
+	public void testIfErr1() {
+		String text =
+		"if then fi\n";
+		AutoconfElement tree = parse(text, true);
+		assertEquals(1, errors.size());
+		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.INVALID_SPECIFIER, "then"));
+		assertTreeStructure(tree, new String[] { "if" });
+	}
+	public void testIfErr2() {
+		String text =
+		"if true; do fi\n";
+		AutoconfElement tree = parse(text, true);
+		assertEquals(1, errors.size());
+		checkError(AutoconfEditorMessages.getString(AutoconfParser.INVALID_DO));
+		assertTreeStructure(tree, new String[] { "if" });
+	}
+	public void testIfErr3() {
+		String text =
+		"if; else bar; fi\n";
+		AutoconfElement tree = parse(text, true);
+		assertEquals(1, errors.size());
+		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.MISSING_SPECIFIER, "then"));
+		assertTreeStructure(tree, new String[] { "if", "else", null });
+	}
+	public void testIfErr4() {
+		String text =
+		"if true; then stmt fi\n";
+		AutoconfElement tree = parse(text, true);
+		assertEquals(1, errors.size());
+		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.INVALID_TERMINATION, "fi"));
+		assertTreeStructure(tree, new String[] { "if" });
+	}
+	public void testIfErr5() {
+		String text =
+		"if true; then\n";
+		AutoconfElement tree = parse(text, true);
+		assertEquals(1, errors.size());
+		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.UNTERMINATED_CONSTRUCT, "if"));
+		assertTreeStructure(tree, new String[] { "if" });
+	}
+	public void testIfErr6() {
+		String text =
+		"if true; then foo; else\n";
+		AutoconfElement tree = parse(text, true);
+		assertEquals(2, errors.size());
+		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.UNTERMINATED_CONSTRUCT, "if"));
+		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.UNTERMINATED_CONSTRUCT, "else"));
+		assertTreeStructure(tree, new String[] { "if", "else", null });
+	}
+	public void testWhile() {
+		String text =
+			"while true; do foo; done\n";
+		AutoconfElement tree = parse(text);
+		assertTreeStructure(tree, new String[] { "while" });
+	}
+	public void testWhile2() {
+		String text =
+			"while true\n" +
+			"do\n"+
+			"AC_SOMETHING(...); done\n";
+		AutoconfElement tree = parse(text);
+		assertTreeStructure(tree, new String[] { "while", "AC_SOMETHING", "...", null, null });
+	}
+	public void testWhileErr() {
+		String text =
+			"while; AC_SOMETHING(...) done\n";
+		AutoconfElement tree = parse(text, true);
+		assertEquals(2, errors.size());
+		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.MISSING_SPECIFIER, "do"));
+		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.INVALID_TERMINATION, "done"));
+		assertTreeStructure(tree, new String[] { "while", "AC_SOMETHING", "...", null, null });
+	}
+	public void testWhileErr2() {
+		String text =
+			"while true; do AC_SOMETHING(...)\n";
+		AutoconfElement tree = parse(text, true);
+		assertEquals(1, errors.size());
+		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.UNTERMINATED_CONSTRUCT, "while"));
+		assertTreeStructure(tree, new String[] { "while", "AC_SOMETHING", "...", null, null });
+	}
+	
+	public void testCase() {
+		String text = 
+			"case $VAL in\n"+
+			"linux-*-*) AC_FIRST($VAL) ; true ;;\n"+
+			"bsd-* | macosx-*) : ;;\n"+
+			"*) echo \"I dunno $VAL\";;\n"+
+			"esac\n";
+		AutoconfElement tree = parse(text, false);
+		assertTreeStructure(tree, new String[] { 
+				"case", 
+					"linux-*-*", 
+						"AC_FIRST", 
+							"$VAL",
+							null,
+						null,
+					"bsd-* | macosx-*",
+					"*",
+					null
+					});
+
+		AutoconfElement[] kids = tree.getChildren();
+		assertEquals(1, kids.length);
+		assertTrue(kids[0] instanceof AutoconfCaseElement);
+		
+		AutoconfCaseElement caseEl = (AutoconfCaseElement) kids[0];
+		assertEqualSource(text.substring(0, text.length()-1), caseEl);
+		
+		assertEquals(3, caseEl.getChildren().length);
+		
+		assertTrue(caseEl.getChildren()[0] instanceof AutoconfCaseConditionElement);
+		assertTrue(caseEl.getChildren()[1] instanceof AutoconfCaseConditionElement);
+		assertTrue(caseEl.getChildren()[2] instanceof AutoconfCaseConditionElement);
+		
+		AutoconfCaseConditionElement caseCond = (AutoconfCaseConditionElement) caseEl.getChildren()[0];
+		assertEquals("linux-*-*) AC_FIRST($VAL) ; true ;;", caseCond.getSource());
+		assertEquals(1, caseCond.getChildren().length);
+		assertEqualSource("AC_FIRST($VAL)", caseCond.getChildren()[0]);
+
+		caseCond = (AutoconfCaseConditionElement) caseEl.getChildren()[1];
+		assertEquals("bsd-* | macosx-*) : ;;", caseCond.getSource());
+		assertEquals(0, caseCond.getChildren().length);
+
+		caseCond = (AutoconfCaseConditionElement) caseEl.getChildren()[2];
+		assertEquals("*) echo \"I dunno $VAL\";;", caseCond.getSource());
+		assertEquals(0, caseCond.getChildren().length);
+		
+	}
+	
+	public void testCaseErr() {
+		String text = 
+			"case $VAL; linux-*-*) AC_FIRST($VAL) ; true esac\n";
+		AutoconfElement tree = parse(text, true);
+		assertEquals(2, errors.size());
+		checkError(AutoconfEditorMessages.getString(AutoconfParser.INVALID_IN));
+		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.INVALID_TERMINATION, "esac"));
+		
+		assertTreeStructure(tree, new String[] { "case", "linux-*-*", "AC_FIRST", "$VAL", null, null, null });
+		
+		AutoconfElement[] kids = tree.getChildren();
+		AutoconfCaseElement caseEl = (AutoconfCaseElement) kids[0];
+		AutoconfCaseConditionElement caseCond = (AutoconfCaseConditionElement) caseEl.getChildren()[0];
+		// goofed up, but ok
+		assertEquals("linux-*-*) AC_FIRST($VAL) ; true esac", caseCond.getSource());
+		assertEqualSource("AC_FIRST($VAL)", caseCond.getChildren()[0]);
+
+	}
+	public void testCaseErr2() {
+		String text = 
+			"case $VAL in\n";
+		AutoconfElement tree = parse(text, true);
+		assertEquals(1, errors.size());
+		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.UNTERMINATED_CONSTRUCT, "case"));
+		
+		assertTreeStructure(tree, new String[] { "case" });
+
+	}
+
+	public void testForIn() {
+		// don't get upset by 'in'
+		String text = 
+			"for VAL in 1 2 3 4; do echo $VAL; done\n";
+		AutoconfElement tree = parse(text, false);
+		
+		assertTreeStructure(tree, new String[] { "for" });
+		AutoconfElement[] kids = tree.getChildren();
+		
+		AutoconfElement forEl = kids[0];
+		assertEqualSource(text.substring(0, text.length()-1), forEl);
+		
+	}
+	
+	public void testForDo() {
+		// don't get upset by parentheses
+		String text = 
+			"for (( AC_1; AC_2(); AC_3(...) )); do echo $VAL; done\n";
+		AutoconfElement tree = parse(text, false);
+		
+		assertTreeStructure(tree, new String[] { "for", "AC_1", "AC_2", "", null, "AC_3", "...", null, null });
+		
+	}
+	
+	public void testUntil() {
+		String text = 
+			"until false; do AC_SOMETHING(...); done\n";
+		AutoconfElement tree = parse(text, false);
+		assertTreeStructure(tree, new String[] { "until", "AC_SOMETHING", "...", null, null });
+
+		
+	}
+	public void testSelect() {
+		String text = 
+			"select VAR in 1 2 3; do AC_SOMETHING(...); done\n"+
+			"select VAR; do AC_SOMETHING; done\n";
+			
+		AutoconfElement tree = parse(text, false);
+		assertTreeStructure(tree, new String[] { 
+				"select", 
+					"AC_SOMETHING", 
+						"...", 
+					null, 
+				null,
+				"select", 
+					"AC_SOMETHING", 
+				null
+		});
+	}
+	
+	public void testComplex1() {
+		String text =
+			"AM_INIT_AUTOMAKE([foo1], 1.96)\n" +
+			"while true; do \n" +
+			"	var=shift;\n" +
+			"	if [ test -f \"$var\"] ; then\n"+
+			"		AC_SOMETHING($var);\n"+
+			"	fi\n"+
+			"done;\n"+
+			"AM_GENERATE(Makefile)\n";
+		AutoconfElement tree = parse(text, false);
+		assertTreeStructure(tree, new String[] { 
+				"AM_INIT_AUTOMAKE",
+					"foo1",
+					"1.96",
+				null,
+				"while",
+					"if",
+						"AC_SOMETHING",
+							"$var",
+						null,
+					null,
+				null,
+				"AM_GENERATE",
+					"Makefile",
+				null
+		});
+	}
+	
+	public void testComplex2() {
+		String text = 
+			"if true; then\n" + 
+			"AC_CANONICAL_HOST\n" + 
+			"else\n" + 
+			"case foo in \n" + 
+			"	3) 1 ;;\n" + 
+			"esac;\n" + 
+			"fi\n";
+		AutoconfElement tree = parse(text, false);
+		assertTreeStructure(tree, new String[] {
+				"if",
+					"AC_CANONICAL_HOST",
+					"else",
+						"case",
+							"3",
+						null,
+					null,
+				null
+		});
+	}
+
+	public void testEarlyClose() {
+		String text = 
+			"if true; then foo ; fi\n"+
+			"fi\n"+
+			"while true; do done;\n";
+		AutoconfElement tree = parse(text, true);
+		assertTreeStructure(tree, new String[] {
+				"if",
+				"while"
+		});
+	}
+	
+	public void testOverlapping() {
+		String text =
+			"for foo\n"+
+			"if bar\n";
+		AutoconfElement tree = parse(text, true);
+		assertTreeStructure(tree, new String[] {
+				"for",
+				"if"
+		});
+	}
+	
+	public void testDollar() {
+		// dollars guard keywords
+		String text =
+			"if [ $if == 3 ] ; then $for; fi\n";
+		AutoconfElement tree = parse(text);
+		assertTreeStructure(tree, new String[] {
+				"if"
+		});
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/TestTokenizer.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/TestTokenizer.java
new file mode 100644
index 0000000..03f4d63
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/TestTokenizer.java
@@ -0,0 +1,486 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.tests.autoconf;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.eclipse.jface.text.Document;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfTokenizer;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.IAutoconfErrorHandler;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.ITokenConstants;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.ParseException;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.Token;
+
+
+/**
+ * Test autoconf tokenizer.  The tokenizer mainly is used to detect boundaries and keywords
+ * and is not a full shell tokenizer.
+ * @author eswartz
+ *
+ */
+public class TestTokenizer extends TestCase {
+
+	private ArrayList tokenizerErrors;
+
+	/* (non-Javadoc)
+	 * @see junit.framework.TestCase#setUp()
+	 */
+	protected void setUp() throws Exception {
+	}
+
+	/* (non-Javadoc)
+	 * @see junit.framework.TestCase#tearDown()
+	 */
+	protected void tearDown() throws Exception {
+	}
+
+	protected IDocument createDocument(String text) {
+		return new Document(text);
+	}
+
+	protected List/*<Token>*/tokenize(IDocument document) {
+		return tokenize(document, false);
+	}
+
+	protected List/*<Token>*/tokenize(IDocument document, boolean isM4Mode) {
+		tokenizerErrors = new ArrayList();
+		AutoconfTokenizer tokenizer = new AutoconfTokenizer(document, new IAutoconfErrorHandler() {
+
+			public void handleError(ParseException exception) {
+				tokenizerErrors.add(exception);
+			}
+			
+		});
+		tokenizer.setM4Context(isM4Mode);
+		
+		List/*<Token>*/ tokens = tokenize(tokenizer);
+		return tokens;
+	}
+
+	protected List/*<Token>*/tokenize(AutoconfTokenizer tokenizer) {
+		List/*<Token>*/tokens = new ArrayList();
+		while (true) {
+			Token token = tokenizer.readToken();
+			if (token.getType() == ITokenConstants.EOF)
+				break;
+			tokens.add(token);
+		}
+		return tokens;
+	}
+
+	protected void checkNoErrors() {
+		assertEquals(0, tokenizerErrors.size());
+	}
+	public void testEmpty() {
+		IDocument document = createDocument("");
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(0, tokens.size());
+	}
+
+	public void testEOL1() {
+		IDocument document = createDocument("\n");
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(1, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.EOL, "\n");
+	}
+
+	public void testEOL2() {
+		IDocument document = createDocument("\r\n");
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(1, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.EOL, "\r\n");
+	}
+
+	public void testEOL3() {
+		IDocument document = createDocument("\n\r\n\n");
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(3, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.EOL, "\n");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.EOL, "\r\n");
+		checkToken((Token) tokens.get(2), document, ITokenConstants.EOL, "\n");
+	}
+
+	public void testShellText() {
+		// default mode is shell
+		String text = "random\nstuff\n";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(4, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.WORD,
+				"random");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.EOL, "\n");
+		checkToken((Token) tokens.get(2), document, ITokenConstants.WORD,
+				"stuff");
+		checkToken((Token) tokens.get(3), document, ITokenConstants.EOL, "\n");
+	}
+
+	public void testShellTokens() {
+		// default mode is shell
+		String text = "while true; do ls; done\n";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(8, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.SH_WHILE,
+				"while");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.WORD,
+				"true");
+		checkToken((Token) tokens.get(2), document, ITokenConstants.SEMI, ";");
+		checkToken((Token) tokens.get(3), document, ITokenConstants.SH_DO, "do");
+		checkToken((Token) tokens.get(4), document, ITokenConstants.WORD, "ls");
+		checkToken((Token) tokens.get(5), document, ITokenConstants.SEMI, ";");
+		checkToken((Token) tokens.get(6), document, ITokenConstants.SH_DONE,
+				"done");
+		checkToken((Token) tokens.get(7), document, ITokenConstants.EOL, "\n");
+	}
+
+	public void testShellTokens2() {
+		// don't misread partial tokens
+		String text = "while_stuff incase";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(2, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.WORD,
+				"while_stuff");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.WORD,
+				"incase");
+	}
+
+	public void testShellTokens3() {
+		// don't interpret m4 strings in shell mode
+		String text = "`foo'";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, false);
+		assertEquals(1, tokenizerErrors.size());
+		assertEquals(1, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.SH_STRING_BACKTICK, "foo'", 5);
+	}
+
+	public void testShellTokens4() {
+		String text = "echo $if $((foo)) $\n";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(11, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.WORD, "echo");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.SH_DOLLAR, "$");
+		// dollar guards keywords, but the tokenizer doesn't know this
+		checkToken((Token) tokens.get(2), document, ITokenConstants.SH_IF, "if");
+		checkToken((Token) tokens.get(3), document, ITokenConstants.SH_DOLLAR, "$");
+		checkToken((Token) tokens.get(4), document, ITokenConstants.LPAREN, "(");
+		checkToken((Token) tokens.get(5), document, ITokenConstants.LPAREN, "(");
+		checkToken((Token) tokens.get(6), document, ITokenConstants.WORD, "foo");
+		checkToken((Token) tokens.get(7), document, ITokenConstants.RPAREN, ")");
+		checkToken((Token) tokens.get(8), document, ITokenConstants.RPAREN, ")");
+		checkToken((Token) tokens.get(9), document, ITokenConstants.SH_DOLLAR, "$");
+		checkToken((Token) tokens.get(10), document, ITokenConstants.EOL, "\n");
+
+	}
+
+	public void testShellTokens5() {
+		String text = "while do select for until done\n";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(7, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.SH_WHILE, "while");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.SH_DO, "do");
+		checkToken((Token) tokens.get(2), document, ITokenConstants.SH_SELECT, "select");
+		checkToken((Token) tokens.get(3), document, ITokenConstants.SH_FOR, "for");
+		checkToken((Token) tokens.get(4), document, ITokenConstants.SH_UNTIL, "until");
+		checkToken((Token) tokens.get(5), document, ITokenConstants.SH_DONE, "done");
+		checkToken((Token) tokens.get(6), document, ITokenConstants.EOL, "\n");
+
+	}
+
+	public void testShellComments() {
+		// comments are stripped and ignored in the shell mode
+		String text = "for # while case\n";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(2, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.SH_FOR,
+				"for");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.EOL, "\n");
+	}
+
+	public void testShellComments2() {
+		// comments are stripped and ignored in the shell mode
+		String text = "# while case\n" + "#for x in 3\n" + "\n";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(3, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.EOL, "\n");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.EOL, "\n");
+		checkToken((Token) tokens.get(2), document, ITokenConstants.EOL, "\n");
+	}
+
+	public void testM4Tokens0() {
+		String text = "while_stuff incase";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, true);
+		checkNoErrors();
+		assertEquals(2, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.WORD,
+				"while_stuff");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.WORD,
+				"incase");
+	}
+	
+	public void testShellStrings() {
+		String QUOTED = 
+			"ls -la \"*.c\"";
+		String text = "echo `" + QUOTED + "`\n";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(3, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.WORD,
+				"echo");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.SH_STRING_BACKTICK,
+				QUOTED, QUOTED.length() + 2);
+		checkToken((Token) tokens.get(2), document, ITokenConstants.EOL, "\n");
+	}
+	public void testShellStrings2() {
+		String QUOTED = 
+			"ls -la 'space file'";
+		String text = "echo \"" + QUOTED + "\"\n";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(3, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.WORD,
+				"echo");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.SH_STRING_DOUBLE,
+				QUOTED, QUOTED.length() + 2);
+		checkToken((Token) tokens.get(2), document, ITokenConstants.EOL, "\n");
+	}
+	public void testShellStrings3() {
+		String QUOTED = 
+			"echo \"*.c\" | sed s/[a-z]/[A-Z]/g";
+		String text = "echo '" + QUOTED + "'\n";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(3, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.WORD,
+				"echo");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.SH_STRING_SINGLE,
+				QUOTED, QUOTED.length() + 2);
+		checkToken((Token) tokens.get(2), document, ITokenConstants.EOL, "\n");
+	}
+	public void testM4Tokens1() {
+		String text = "define(`hi\', `HI\')\n";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, true);
+		checkNoErrors();
+		assertEquals(7, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.WORD,
+				"define");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.LPAREN, "(");
+		// strings are unquoted in token text
+		checkToken((Token) tokens.get(2), document, ITokenConstants.M4_STRING,
+				"hi", 4);
+		checkToken((Token) tokens.get(3), document, ITokenConstants.COMMA, ",");
+		checkToken((Token) tokens.get(4), document, ITokenConstants.M4_STRING,
+				"HI", 4);
+		checkToken((Token) tokens.get(5), document, ITokenConstants.RPAREN, ")");
+		checkToken((Token) tokens.get(6), document, ITokenConstants.EOL, "\n");
+	}
+
+	public void testM4Comments() {
+		String text = "dnl # comment\n";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, true);
+		checkNoErrors();
+		assertEquals(2, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.WORD, "dnl");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.M4_COMMENT,
+				"# comment\n");
+	}
+
+	public void testM4Comments2() {
+		String text = "dnl /* word(`quoted')\n" + "*/\n";
+		IDocument document = createDocument(text);
+		AutoconfTokenizer tokenizer = createTokenizer(document);
+		tokenizer.setM4Context(true);
+		tokenizer.setM4Comment("/*", "*/");
+
+		List tokens = tokenize(tokenizer);
+		assertEquals(3, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.WORD, "dnl");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.M4_COMMENT,
+				"/* word(`quoted')\n*/");
+		checkToken((Token) tokens.get(2), document, ITokenConstants.EOL, "\n");
+	}
+
+	public void testM4Strings1() {
+		// double quotes only removes one level of quotes
+		String text = "``double''\n";
+		IDocument document = createDocument(text);
+		AutoconfTokenizer tokenizer = createTokenizer(document);
+		tokenizer.setM4Context(true);
+
+		List tokens = tokenize(tokenizer);
+		assertEquals(2, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.M4_STRING,
+				"`double'", 8 + 1 + 1);
+		checkToken((Token) tokens.get(1), document, ITokenConstants.EOL, "\n");
+	}
+
+	public void testM4Strings2() {
+		String text = "myword(!!boundary==)\n";
+		IDocument document = createDocument(text);
+		AutoconfTokenizer tokenizer = createTokenizer(document);
+		tokenizer.setM4Context(true);
+		tokenizer.setM4Quote("!!", "==");
+
+		List tokens = tokenize(tokenizer);
+		assertEquals(5, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.WORD,
+				"myword");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.LPAREN, "(");
+		checkToken((Token) tokens.get(2), document, ITokenConstants.M4_STRING,
+				"boundary", 8 + 2 + 2);
+		checkToken((Token) tokens.get(3), document, ITokenConstants.RPAREN, ")");
+		checkToken((Token) tokens.get(4), document, ITokenConstants.EOL, "\n");
+	}
+
+	public void testM4Tokens2() {
+		// dollar is not seen in m4 mode (only important when expanding)
+		String text = "define(foo,$1)\n";
+		IDocument document = createDocument(text);
+		AutoconfTokenizer tokenizer = createTokenizer(document);
+		tokenizer.setM4Context(true);
+
+		List tokens = tokenize(tokenizer);
+		assertEquals(8, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.WORD,
+				"define");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.LPAREN, "(");
+		checkToken((Token) tokens.get(2), document, ITokenConstants.WORD, "foo");
+		checkToken((Token) tokens.get(3), document, ITokenConstants.COMMA, ",");
+		checkToken((Token) tokens.get(4), document, ITokenConstants.TEXT, "$");
+		checkToken((Token) tokens.get(5), document, ITokenConstants.TEXT, "1");
+		checkToken((Token) tokens.get(6), document, ITokenConstants.RPAREN, ")");
+		checkToken((Token) tokens.get(7), document, ITokenConstants.EOL, "\n");
+	}
+	
+	public void testM4QuoteNesting() {
+		String quote = "this is `nested\'!";
+		String text = "`" + quote +"'\n";
+		IDocument document = createDocument(text);
+		AutoconfTokenizer tokenizer = createTokenizer(document);
+		tokenizer.setM4Context(true);
+
+		List tokens = tokenize(tokenizer);
+		assertEquals(2, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.M4_STRING,
+				quote, quote.length() + 2);
+		checkToken((Token) tokens.get(1), document, ITokenConstants.EOL, "\n");
+		
+	}
+
+	public void testMixedContext() {
+		String text = "AM_INIT([arg])if true\n";
+		IDocument document = createDocument(text);
+		AutoconfTokenizer tokenizer = createTokenizer(document);
+		tokenizer.setM4Context(false);
+		tokenizer.setM4Quote("[", "]");
+
+		Token token;
+		token = tokenizer.readToken();
+		checkToken(token, document, ITokenConstants.WORD, "AM_INIT");
+
+		// "hey, that's a macro"
+		tokenizer.setM4Context(true);
+
+		token = tokenizer.readToken();
+		checkToken(token, document, ITokenConstants.LPAREN, "(");
+		token = tokenizer.readToken();
+		checkToken(token, document, ITokenConstants.M4_STRING, "arg", 5);
+		token = tokenizer.readToken();
+		checkToken(token, document, ITokenConstants.RPAREN, ")");
+
+		// "check it's not a dangling paren"
+		// it'll still be an m4 word
+		token = tokenizer.readToken();
+		checkToken(token, document, ITokenConstants.WORD, "if");
+
+		// push back token
+		tokenizer.unreadToken(token);
+
+		// "done reading macro"
+		tokenizer.setM4Context(false);
+
+		// "get shell stuff"
+		token = tokenizer.readToken();
+		checkToken(token, document, ITokenConstants.SH_IF, "if");
+		token = tokenizer.readToken();
+		checkToken(token, document, ITokenConstants.WORD, "true");
+
+		token = tokenizer.readToken();
+		checkToken(token, document, ITokenConstants.EOL, "\n");
+
+		checkToken(tokenizer.readToken(), document, ITokenConstants.EOF);
+
+	}
+
+	private AutoconfTokenizer createTokenizer(IDocument document) {
+		return new AutoconfTokenizer(document, new IAutoconfErrorHandler() {
+
+			public void handleError(ParseException exception) {
+				fail(exception.toString());
+			}
+			
+		});
+	}
+	
+	private void checkToken(Token token, IDocument document, int type) {
+		assertEquals(type, token.getType());
+		assertSame(document, token.getDocument());
+		assertTrue(token.getOffset() >= 0);
+		assertTrue(token.getType() == ITokenConstants.EOF || token.getLength() > 0);
+		assertEquals(document.get().substring(token.getOffset(),
+				token.getOffset() + token.getLength()), token.getText());
+	}
+
+	private void checkToken(Token token, IDocument document, int type,
+			String text) {
+		assertEquals(type, token.getType());
+		assertSame(document, token.getDocument());
+		assertTrue(token.getOffset() >= 0);
+		assertEquals(text, token.getText());
+		assertEquals(text.length(), token.getLength());
+	}
+
+	private void checkToken(Token token, IDocument document, int type,
+			String text, int length) {
+		assertEquals(type, token.getType());
+		assertSame(document, token.getDocument());
+		assertTrue(token.getOffset() >= 0);
+		assertEquals(text, token.getText());
+		assertEquals(length, token.getLength());
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeColourizationTests.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeColourizationTests.java
new file mode 100644
index 0000000..4bc8017
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeColourizationTests.java
@@ -0,0 +1,215 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.tests.editors;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITypedRegion;
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.linuxtools.cdt.autotools.tests.AutotoolsTestsPlugin;
+import org.eclipse.linuxtools.cdt.autotools.tests.ProjectTools;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.AutomakeDocumentProvider;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.AutomakeEditor;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.AutomakefileCodeScanner;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.AutomakefileSourceConfiguration;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.ColorManager;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbench;
+
+
+public class AutomakeColourizationTests extends TestCase {
+	
+	ProjectTools tools;
+	private IProject project;
+	private IFile makefileAmFile;
+	
+	static String makefileAmContents =
+		"# This is a comment" + "\n" +
+		"if CONDITION" + "\n" +
+		"MACRO = case1" + "\n" +
+		"else" + "\n" +
+		"MACRO = case2" + "\n" +
+		"$(MACRO)" + "\n" +
+		"${MACRO}" + "\n" +
+		"";
+	private IWorkbench workbench;
+	private AutomakefileCodeScanner codeScanner;
+	
+    protected void setUp() throws Exception {
+        super.setUp();
+        tools = new ProjectTools();
+        if (!ProjectTools.setup())
+        	fail("could not perform basic project workspace setup");
+        
+        project = ProjectTools.createProject("testProjectACT");
+        
+        if(project == null) {
+        	fail("Unable to create test project");
+        }
+        
+        project.open(new NullProgressMonitor());
+        
+        makefileAmFile = tools.createFile(project, "Makefile.am", makefileAmContents);
+		workbench = AutotoolsTestsPlugin.getDefault().getWorkbench();
+		
+		IEditorPart openEditor = org.eclipse.ui.ide.IDE.openEditor(workbench
+				.getActiveWorkbenchWindow().getActivePage(), makefileAmFile,
+				true);
+		
+		AutomakeEditor automakeEditor = (AutomakeEditor) openEditor;
+		AutomakeDocumentProvider docProvider = automakeEditor.getAutomakefileDocumentProvider();
+		IDocument automakeDocument = docProvider.getDocument(openEditor.getEditorInput());
+		AutomakefileSourceConfiguration automakeSourceViewerConfig = automakeEditor.getAutomakeSourceViewerConfiguration();
+		
+		ITypedRegion region = automakeDocument.getPartition(0);
+		
+		codeScanner = automakeSourceViewerConfig.getAutomakeCodeScanner();
+		codeScanner.setRange(automakeDocument, region.getOffset(), region.getLength());
+    }
+    
+    IToken getNextToken() {
+    	return codeScanner.nextToken();
+    }
+	
+	public void testAutomakeEditorColourization() throws Exception {
+		// # This is a comment
+		IToken token0 = getNextToken();
+		assertTrue(token0 instanceof Token);
+		assertEquals(codeScanner.getTokenLength(), 20);
+		assertEquals(codeScanner.getTokenOffset(), 0);
+
+		Token token = (Token) token0;
+		TextAttribute ta = (TextAttribute) token.getData();
+		assertEquals(ColorManager.MAKE_COMMENT_RGB, ((Color) ta.getForeground()).getRGB());
+
+		// if CONDITION
+		token0 = getNextToken();
+		assertTrue(token0 instanceof Token);
+		assertEquals(codeScanner.getTokenLength(), 2);
+		assertEquals(codeScanner.getTokenOffset(), 20);
+
+		token = (Token) token0;
+		TextAttribute attribute = (TextAttribute) token.getData();
+		assertEquals(ColorManager.MAKE_KEYWORD_RGB, ((Color) attribute.getForeground()).getRGB());
+
+		// blank space between "if" and "CONDITION"
+		token0 = getNextToken();
+		assertTrue(token0 instanceof Token);
+		assertEquals(codeScanner.getTokenLength(), 1);
+		assertEquals(codeScanner.getTokenOffset(), 22);
+
+		token = (Token) token0;
+		attribute = (TextAttribute) token.getData();
+		assertNull(attribute);
+
+		// if CONDITION
+		token0 = getNextToken();
+		assertTrue(token0 instanceof Token);
+		assertEquals(codeScanner.getTokenLength(), 9);
+		assertEquals(codeScanner.getTokenOffset(), 23);
+
+		token = (Token) token0;
+		attribute = (TextAttribute) token.getData();
+		assertEquals(ColorManager.MAKE_DEFAULT_RGB, ((Color) attribute.getForeground()).getRGB());
+
+		// line break
+		token0 = getNextToken();
+		assertTrue(token0 instanceof Token);
+		assertEquals(codeScanner.getTokenLength(), 1);
+		assertEquals(codeScanner.getTokenOffset(), 32);
+
+		token = (Token) token0;
+		attribute = (TextAttribute) token.getData();
+		assertNull(attribute);
+
+		// MACRO = case1
+		token0 = getNextToken();
+		assertTrue(token0 instanceof Token);
+		assertEquals(codeScanner.getTokenLength(), 14);
+		assertEquals(codeScanner.getTokenOffset(), 33);
+
+		token = (Token) token0;
+		attribute = (TextAttribute) token.getData();
+		assertEquals(ColorManager.MAKE_MACRO_DEF_RGB, ((Color) attribute.getForeground()).getRGB());
+
+		// else
+		token0 = getNextToken();
+		assertTrue(token0 instanceof Token);
+		assertEquals(codeScanner.getTokenLength(), 4);
+		assertEquals(codeScanner.getTokenOffset(), 47);
+
+		token = (Token) token0;
+		attribute = (TextAttribute) token.getData();
+		assertEquals(ColorManager.MAKE_KEYWORD_RGB, ((Color) attribute.getForeground()).getRGB());
+
+		// line break
+		token0 = getNextToken();
+		assertTrue(token0 instanceof Token);
+		assertEquals(codeScanner.getTokenLength(), 1);
+		assertEquals(codeScanner.getTokenOffset(), 51);
+
+		token = (Token) token0;
+		attribute = (TextAttribute) token.getData();
+		assertNull(attribute);
+
+		// MACRO = case2
+		token0 = getNextToken();
+		assertTrue(token0 instanceof Token);
+		assertEquals(codeScanner.getTokenLength(), 14);
+		assertEquals(codeScanner.getTokenOffset(), 52);
+
+		token = (Token) token0;
+		attribute = (TextAttribute) token.getData();
+		assertEquals(ColorManager.MAKE_MACRO_DEF_RGB, ((Color) attribute.getForeground()).getRGB());
+
+		// $(MACRO)
+		token0 = getNextToken();
+		assertTrue(token0 instanceof Token);
+		assertEquals(codeScanner.getTokenLength(), 8);
+		assertEquals(codeScanner.getTokenOffset(), 66);
+
+		token = (Token) token0;
+		attribute = (TextAttribute) token.getData();
+		assertEquals(ColorManager.MAKE_MACRO_REF_RGB, ((Color) attribute.getForeground()).getRGB());
+
+		// line break
+		token0 = getNextToken();
+		assertTrue(token0 instanceof Token);
+		assertEquals(codeScanner.getTokenLength(), 1);
+		assertEquals(codeScanner.getTokenOffset(), 74);
+
+		token = (Token) token0;
+		attribute = (TextAttribute) token.getData();
+		assertNull(attribute);
+		
+		// ${MACRO}
+		token0 = getNextToken();
+		assertTrue(token0 instanceof Token);
+		assertEquals(codeScanner.getTokenLength(), 8);
+		assertEquals(codeScanner.getTokenOffset(), 75);
+
+		token = (Token) token0;
+		attribute = (TextAttribute) token.getData();
+		assertEquals(ColorManager.MAKE_MACRO_REF_RGB, ((Color) attribute.getForeground()).getRGB());
+	}
+	
+	protected void tearDown() throws Exception {
+		super.tearDown();
+		project.delete(true, false, ProjectTools.getMonitor());
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeEditorTests.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeEditorTests.java
new file mode 100644
index 0000000..01ee1fb
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeEditorTests.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.tests.editors;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.linuxtools.cdt.autotools.tests.AutotoolsTestsPlugin;
+import org.eclipse.linuxtools.cdt.autotools.tests.ProjectTools;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.AutomakeEditor;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbench;
+
+
+public class AutomakeEditorTests extends TestCase {
+	
+	ProjectTools tools;
+	private IProject project;
+	
+    protected void setUp() throws Exception {
+        super.setUp();
+        tools = new ProjectTools();
+        if (!ProjectTools.setup())
+        	fail("could not perform basic project workspace setup");
+    }
+	  
+	public void testAutomakeEditorAssociation() throws Exception {
+		project = ProjectTools.createProject("testProjectAET");
+		
+		if(project == null) {
+            fail("Unable to create test project");
+        }
+		
+		project.open(new NullProgressMonitor());
+		
+		IFile makefileAmFile = tools.createEmptyFile(project, "Makefile.am");
+		
+		IWorkbench workbench = AutotoolsTestsPlugin.getDefault().getWorkbench();
+
+		IEditorPart openEditor = org.eclipse.ui.ide.IDE.openEditor(workbench
+					.getActiveWorkbenchWindow().getActivePage(), makefileAmFile,
+					true);
+		assertTrue(openEditor instanceof AutomakeEditor);
+		
+		project.delete(true, false, ProjectTools.getMonitor());
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeTextHoverTest.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeTextHoverTest.java
new file mode 100644
index 0000000..5f86843
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeTextHoverTest.java
@@ -0,0 +1,210 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.tests.editors;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.linuxtools.cdt.autotools.tests.AutotoolsTestsPlugin;
+import org.eclipse.linuxtools.cdt.autotools.tests.ProjectTools;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.AutomakeDocumentProvider;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.AutomakeEditor;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.AutomakeTextHover;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.AutomakefileSourceConfiguration;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbench;
+
+
+public class AutomakeTextHoverTest extends TestCase {
+
+	ProjectTools tools;
+	private IProject project;
+	private IFile makefileAmFile;
+	private AutomakeTextHover textHover;
+	private AutomakeEditor automakeEditor;
+	private IDocument automakeDocument;
+	
+	static String makefileAmContents =
+		// There are 6 characters from line beginning to
+		// the space after the echo
+		// ie. '\techo ' == 6 characters
+		"MACRO = case1" + "\n" +
+		// 14
+		"target1:" + "\n" +
+		// 23 (before the tab)
+		// 32 is after the M in MACRO
+		"\t" + "echo $(MACRO)" + "\n" +
+		// 38 (before the tab)
+		"\t" + "echo $@" + "\n" +
+		"\n" +
+		// 48
+		"target2: target1" + "\n" +
+		// 65 (before the tab)
+		"\t" + "echo ${MACRO}" + "\n" +
+		// 80 (before the tab)
+		"\t" + "echo $@" + "\n" +
+		// 89 (before the tab)
+		"\t" + "echo $<" + "\n" +
+		"\n" +
+		// 99
+		"target3: target1 target2" + "\n" +
+		// 124 (before the tab)
+		"\t" + "echo $?" + "\n" +
+		"";
+	private IWorkbench workbench;
+	
+	protected void setUp() throws Exception {
+        super.setUp();
+        tools = new ProjectTools();
+        if (!ProjectTools.setup())
+        	fail("could not perform basic project workspace setup");
+        
+        project = ProjectTools.createProject("testProjectATHT");
+        
+        if(project == null) {
+        	fail("Unable to create test project");
+        }
+        
+        project.open(new NullProgressMonitor());
+        
+        makefileAmFile = tools.createFile(project, "Makefile.am", makefileAmContents);
+		workbench = AutotoolsTestsPlugin.getDefault().getWorkbench();
+		
+		IEditorPart openEditor = org.eclipse.ui.ide.IDE.openEditor(workbench
+				.getActiveWorkbenchWindow().getActivePage(), makefileAmFile,
+				true);
+		
+		automakeEditor = (AutomakeEditor) openEditor;
+		AutomakeDocumentProvider docProvider = automakeEditor.getAutomakefileDocumentProvider();
+		automakeDocument = docProvider.getDocument(openEditor.getEditorInput());
+		AutomakefileSourceConfiguration automakeSourceViewerConfig = automakeEditor.getAutomakeSourceViewerConfiguration();
+		textHover = (AutomakeTextHover) automakeSourceViewerConfig.getTextHover(null, "");
+	}
+	
+	protected void tearDown() throws Exception {
+		super.tearDown();
+		project.delete(true, false, ProjectTools.getMonitor());
+	}
+	
+	public void testGetHoverInfoTargetName1() {
+		IRegion hoverRegion = textHover.getHoverRegion(automakeEditor.getAutomakeSourceViewer(), 45);
+		if (hoverRegion == null)
+			fail("Null hoverRegion");
+		// hover between the $ and the @ in target1
+		assertEquals(44, hoverRegion.getOffset());
+		assertEquals(2, hoverRegion.getLength());
+		try {
+			assertEquals("$@", automakeDocument.get(hoverRegion.getOffset(),
+					hoverRegion.getLength()));
+		} catch (BadLocationException e) {
+			fail("BadLocationException");
+			e.printStackTrace();
+		}
+		assertEquals("target1", textHover.getHoverInfo(
+				automakeEditor.getAutomakeSourceViewer(), hoverRegion));
+	}
+	
+	public void testGetHoverInfoTargetName2() {
+		// hover between the $ and the @ in target2
+		IRegion hoverRegion = textHover.getHoverRegion(automakeEditor.getAutomakeSourceViewer(), 87);
+		if (hoverRegion == null)
+			fail("Null hoverRegion");
+		assertEquals(86, hoverRegion.getOffset());
+		assertEquals(2, hoverRegion.getLength());
+		try {
+			assertEquals("$@", automakeDocument.get(hoverRegion.getOffset(),
+					hoverRegion.getLength()));
+		} catch (BadLocationException e) {
+			fail("BadLocationException");
+			e.printStackTrace();
+		}
+		assertEquals("target2", textHover.getHoverInfo(
+				automakeEditor.getAutomakeSourceViewer(), hoverRegion));
+	}
+	
+	public void testGetHoverInfoForTargetDependency() {
+		// hover between the $ and the < in target2
+		IRegion hoverRegion = textHover.getHoverRegion(automakeEditor.getAutomakeSourceViewer(), 96);
+		if (hoverRegion == null)
+			fail("Null hoverRegion");
+		assertEquals(95, hoverRegion.getOffset());
+		assertEquals(2, hoverRegion.getLength());
+		try {
+			assertEquals("$<", automakeDocument.get(hoverRegion.getOffset(),
+					hoverRegion.getLength()));
+		} catch (BadLocationException e) {
+			fail("BadLocationException");
+			e.printStackTrace();
+		}
+		assertEquals("target1", textHover.getHoverInfo(
+				automakeEditor.getAutomakeSourceViewer(), hoverRegion));
+	}
+	
+	public void testGetHoverInfoForTargetDependencies() {
+		// hover between the $ and the ? in target3
+		IRegion hoverRegion = textHover.getHoverRegion(automakeEditor.getAutomakeSourceViewer(), 131);
+		if (hoverRegion == null)
+			fail("Null hoverRegion");
+		assertEquals(130, hoverRegion.getOffset());
+		assertEquals(2, hoverRegion.getLength());
+		try {
+			assertEquals("$?", automakeDocument.get(hoverRegion.getOffset(),
+					hoverRegion.getLength()));
+		} catch (BadLocationException e) {
+			fail("BadLocationException");
+			e.printStackTrace();
+		}
+		assertEquals("target1 target2", textHover.getHoverInfo(
+				automakeEditor.getAutomakeSourceViewer(), hoverRegion));
+	}
+
+	public void testGetHoverForMacro1() {
+		IRegion hoverRegion = textHover.getHoverRegion(automakeEditor.getAutomakeSourceViewer(), 32);
+		if (hoverRegion == null)
+			fail("Null hoverRegion");
+		// hover between the M and the A in the first $(MACRO) reference
+		assertEquals(31, hoverRegion.getOffset());
+		assertEquals(5, hoverRegion.getLength());
+		try {
+			assertEquals("MACRO", automakeDocument.get(hoverRegion.getOffset(),
+					hoverRegion.getLength()));
+		} catch (BadLocationException e) {
+			fail("BadLocationException");
+			e.printStackTrace();
+		}
+		assertEquals("case1", textHover.getHoverInfo(
+				automakeEditor.getAutomakeSourceViewer(), hoverRegion));
+	}
+	
+	public void testGetHoverForMacro2() {
+		// hover between the M and the A in the ${MACRO} reference in target2
+		IRegion hoverRegion = textHover.getHoverRegion(automakeEditor.getAutomakeSourceViewer(), 74);
+		if (hoverRegion == null)
+			fail("Null hoverRegion");
+		assertEquals(73, hoverRegion.getOffset());
+		assertEquals(5, hoverRegion.getLength());
+		try {
+			assertEquals("MACRO", automakeDocument.get(hoverRegion.getOffset(),
+					hoverRegion.getLength()));
+		} catch (BadLocationException e) {
+			fail("BadLocationException");
+			e.printStackTrace();
+		}
+		assertEquals("case1", textHover.getHoverInfo(
+				automakeEditor.getAutomakeSourceViewer(), hoverRegion));
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/editors/EditorTests.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/editors/EditorTests.java
new file mode 100644
index 0000000..308129f
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/editors/EditorTests.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.tests.editors;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class EditorTests {
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite(
+				"Test for org.eclipse.linuxtools.cdt.autotools.core.tests.editors");
+		//$JUnit-BEGIN$
+		suite.addTestSuite(AutomakeColourizationTests.class);
+		suite.addTestSuite(AutomakeTextHoverTest.class);
+		suite.addTestSuite(AutomakeEditorTests.class);
+		//$JUnit-END$
+		return suite;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/test.xml b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/test.xml
new file mode 100644
index 0000000..2cdb85d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/test.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+
+<project name="testsuite" default="run" basedir=".">
+	<property name="classname" value="org.eclipse.linuxtools.cdt.autotools.tests.AllAutotoolsTests" />
+	<property name="autoconf_classname" value="org.eclipse.linuxtools.cdt.autotools.tests.autoconf.AutoconfTests" />
+	<property name="editors_classname" value="org.eclipse.linuxtools.cdt.autotools.tests.editors.EditorTests" />
+
+	<!-- The property ${eclipse-home} should be passed into this script -->
+	<!-- Set a meaningful default value for when it is not. -->
+	<property name="eclipse-home" value="${basedir}/../.." />
+
+	<!-- sets the properties eclipse-home, and library-file -->
+	<property name="plugin-name" value="org.eclipse.linuxtools.cdt.autotools.tests" />
+	<property name="library-file" value="${eclipse-home}/dropins/${subProjectName2}/plugins/org.eclipse.test/library.xml" />
+
+	<!-- This target holds all initialization code that needs to be done for -->
+	<!-- all tests that are to be run. Initialization for individual tests -->
+	<!-- should be done within the body of the suite target. -->
+	<target name="init">
+		<tstamp />
+		<delete>
+			<fileset dir="${eclipse-home}" includes="org*.xml" />
+		</delete>
+	</target>
+
+	<!-- This target defines the tests that need to be run. -->
+	<target name="suite">
+		<property name="autotools-folder" value="${eclipse-home}/autotools_folder" />
+		<delete dir="${autotools-folder}" quiet="true" />
+		<echo message="Calling ui-test in ${library-file} with eclipse-home = ${eclipse-home} and library-file = ${library-file}"/>
+		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="data-dir" value="${autotools-folder}" />
+			<property name="plugin-name" value="${plugin-name}" />
+			<property name="classname" value="${classname}" />
+		</ant>
+	</target>
+
+	<target name="autoconf_suite">
+		<property name="autoconf-folder" value="${eclipse-home}/autoconf_folder" />
+		<delete dir="${autoconf-folder}" quiet="true" />
+		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="data-dir" value="${autoconf-folder}" />
+			<property name="plugin-name" value="${plugin-name}" />
+			<property name="classname" value="${autoconf_classname}" />
+		</ant>
+	</target>
+
+	<target name="editors_suite">
+		<property name="editors-folder" value="${eclipse-home}/editors_folder" />
+		<delete dir="${editors-folder}" quiet="true" />
+		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="data-dir" value="${editors-folder}" />
+			<property name="plugin-name" value="${plugin-name}" />
+			<property name="classname" value="${editors_classname}" />
+		</ant>
+	</target>
+
+	<!-- This target holds code to cleanup the testing environment after -->
+	<!-- after all of the tests have been run. You can use this target to -->
+	<!-- delete temporary files that have been created. -->
+	<target name="cleanup">
+		<mkdir dir="${results}/consolelogs" />
+		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
+	</target>
+
+	<!-- This target runs the test suite. Any actions that need to happen -->
+	<!-- after all the tests have been run should go here. -->
+	<target name="run" depends="init,suite,autoconf_suite,editors_suite,cleanup">
+		<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="includes" value="org*.xml" />
+			<property name="output-file" value="${plugin-name}.xml" />
+		</ant>
+	</target>
+
+</project>
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/zip/project1.zip b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/zip/project1.zip
new file mode 100644
index 0000000..4a51e51
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/zip/project1.zip
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/zip/project2.zip b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/zip/project2.zip
new file mode 100644
index 0000000..98319d4
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests/zip/project2.zip
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/.classpath b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/.classpath
new file mode 100644
index 0000000..ad32c83
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/.project b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/.project
new file mode 100644
index 0000000..256be3d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.cdt.autotools.ui.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/.settings/org.eclipse.jdt.core.prefs b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..7dd8708
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Thu Mar 25 17:32:29 EDT 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/ChangeLog b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/ChangeLog
new file mode 100644
index 0000000..9f4d158
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/ChangeLog
@@ -0,0 +1,60 @@
+2010-05-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* build.properties: Remove non-existent test.xml references.
+	* META-INF/MANIFEST.MF: Mark plug-in as singleton.
+
+2010-05-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/tests/SetConfigurationParameter.java (canBuildWithConfigParm): Wait until
+	a.out is created before looking at config.status as we could end up looking at config.status while it is being created. 
+	(newConfigCopiesParms): Don't assume that active configuration will be set in configuration list.
+
+2010-04-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/tests/SetConfigurationParameter.java (canBuildWithConfigParm): Add
+	waiting period before testing existence of created file to ensure action has run on a slower system. 
+	(newConfigCopiesParms): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/tests/TestToolActions.java (canAccessAutoconf): Ditto. 
+	(canAccessAutomake): Ditto.
+	(canReconfigureProject): Ditto.
+	(canAccessAutoreconf): Ditto.
+	(canAccessAclocal): Ditto.
+	* plugin.properties: Change provider to Eclipse instead of Eclipse.org.
+	* META-INF/MANIFEST.MF: Add BundleLocalization statement so plugin.properties gets
+    used.
+
+2010-04-22  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.properties: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/tests/AllTests.java: New file.
+	* build.properties: Make plugin.properties part of binary build.
+	* META-INF/MANIFEST.MF: Change Java requirement to 1.5.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/tests/Activator.java: Add copyright notice. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/tests/SetConfigurationParameter.java (beforeClass): Close
+	Welcome view optionally if it exists.  Also hard-wire keyboard to EN_US. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/tests/TestToolActions.java (beforeClass): Ditto.
+	(sleep): Close Eclipse.
+
+2010-04-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/tests/TestToolActions.java (canAccessAutoheader): New test. 
+	(canAccessAutomake): Ditto.
+	(canReconfigureProject): Ditto.
+	(canAccessLibtoolize): Ditto.
+	(canAccessAutoreconf): Ditto.
+
+2010-04-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/tests/TestToolActions.java: New file.
+	(canAccessAutomake): New test.
+
+2010-04-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Initial check-in.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/tests/Activator.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/tests/SetConfigurationParameter.java: New file.
+	* build.properties: New file.
+	* .project: New file.
+	* .classpath: New file.
+	* .settings: New file.
+	* META-INF/MANIFEST.MF: New file.
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/META-INF/MANIFEST.MF b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..976e1e1
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,30 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.cdt.autotools.ui.tests;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.cdt.autotools.ui.tests.Activator
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.swtbot.eclipse.core;bundle-version="2.0.0",
+ org.eclipse.swtbot.eclipse.finder;bundle-version="2.0.0",
+ org.eclipse.swtbot.junit4_x;bundle-version="2.0.0",
+ org.eclipse.swtbot.swt.finder;bundle-version="2.0.0",
+ org.hamcrest;bundle-version="1.1.0",
+ org.junit4;bundle-version="4.5.0",
+ org.apache.log4j;bundle-version="1.2.13",
+ org.eclipse.core.resources;bundle-version="3.5.1",
+ org.eclipse.linuxtools.cdt.autotools.core;bundle-version="1.0.0",
+ org.eclipse.linuxtools.cdt.autotools.ui;bundle-version="1.0.0",
+ org.eclipse.cdt.core;bundle-version="5.1.1",
+ org.eclipse.cdt.launch;bundle-version="6.0.0",
+ org.eclipse.cdt.make.core;bundle-version="6.0.0",
+ org.eclipse.cdt.make.ui;bundle-version="6.0.1",
+ org.eclipse.cdt.managedbuilder.core;bundle-version="6.0.0",
+ org.eclipse.cdt.managedbuilder.gnu.ui;bundle-version="5.0.100",
+ org.eclipse.cdt.managedbuilder.ui;bundle-version="5.1.0",
+ org.eclipse.cdt.ui;bundle-version="5.1.1"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Vendor: %provider
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/build.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/build.properties
new file mode 100644
index 0000000..aa10a0e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/build.properties
@@ -0,0 +1,9 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.properties
+src.includes = src/,\
+               META-INF/,\
+               plugin.properties
+individualSourceBundles=true
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/plugin.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/plugin.properties
new file mode 100644
index 0000000..ed7fdac
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+#  Copyright (c) 2010 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+bundleName=Autotools UI Tests Plug-in (Incubation)
+provider=Eclipse
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/src/org/eclipse/linuxtools/cdt/autotools/ui/tests/Activator.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/src/org/eclipse/linuxtools/cdt/autotools/ui/tests/Activator.java
new file mode 100644
index 0000000..6f0b5ff
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/src/org/eclipse/linuxtools/cdt/autotools/ui/tests/Activator.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.tests;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.cdt.autotools.ui.tests";
+
+	// The shared instance
+	private static Activator plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/src/org/eclipse/linuxtools/cdt/autotools/ui/tests/AllTests.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/src/org/eclipse/linuxtools/cdt/autotools/ui/tests/AllTests.java
new file mode 100644
index 0000000..0b2b6e0
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/src/org/eclipse/linuxtools/cdt/autotools/ui/tests/AllTests.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.tests;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+  SetConfigurationParameter.class,
+  TestToolActions.class,
+})
+public class AllTests {
+    // needed for this class to compile
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/src/org/eclipse/linuxtools/cdt/autotools/ui/tests/SetConfigurationParameter.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/src/org/eclipse/linuxtools/cdt/autotools/ui/tests/SetConfigurationParameter.java
new file mode 100644
index 0000000..d1aa9ec
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/src/org/eclipse/linuxtools/cdt/autotools/ui/tests/SetConfigurationParameter.java
@@ -0,0 +1,515 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.eclipse.cdt.ui.newui.UIMessages;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectNature;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
+import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
+import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotCombo;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotRadio;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotText;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+@RunWith(SWTBotJunit4ClassRunner.class)
+public class SetConfigurationParameter {
+	
+	private static SWTWorkbenchBot	bot;
+
+	@BeforeClass
+	public static void beforeClass() throws Exception {
+		SWTBotPreferences.KEYBOARD_LAYOUT = "EN_US";
+		bot = new SWTWorkbenchBot();
+		// Close the Welcome view if it exists
+		try {
+		bot.viewByTitle("Welcome").close();
+		// Turn off automatic building by default
+		} catch (Exception e) {
+			// do nothing
+		}
+		// Turn off automatic building by default
+		bot.menu("Window").menu("Preferences").click();
+		SWTBotShell shell = bot.shell("Preferences");
+		shell.activate();
+		bot.tree().expandNode("General").select("Workspace");
+		SWTBotCheckBox buildAuto = bot.checkBox("Build automatically");
+		if (buildAuto != null && buildAuto.isChecked())
+			buildAuto.click();
+		bot.button("Apply").click();
+		// Ensure that the C/C++ perspective is chosen automatically
+		// and doesn't require user intervention
+		bot.tree().expandNode("General").select("Perspectives");
+		SWTBotRadio radio = bot.radio("Always open");
+		if (radio != null && !radio.isSelected())
+			radio.click();
+		bot.button("OK").click();
+	}
+ 
+	@Test
+	// Verify we can create a sample Autotools project using the New C Project UI
+	public void canCreateANewAutotoolsProject() throws Exception {
+		bot.menu("File").menu("New").menu("Project...").click();
+ 
+		SWTBotShell shell = bot.shell("New Project");
+		shell.activate();
+		bot.tree().expandNode("C/C++").select("C Project");
+		bot.button("Next >").click();
+ 
+		bot.textWithLabel("Project name:").setText("GnuProject0");
+		bot.tree().expandNode("GNU Autotools").select("Hello World ANSI C Autotools Project");
+ 
+		bot.button("Finish").click();
+		
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		assertTrue(workspace != null);
+		IWorkspaceRoot root = workspace.getRoot();
+		assertTrue(root != null);
+		IProject project = root.getProject("GnuProject0");
+		assertTrue(project != null);
+		IProjectNature nature = project.getNature("org.eclipse.linuxtools.cdt.autotools.core.autotoolsNatureV2");
+		assertTrue(nature != null);
+	}
+	
+	@Test
+	// Verify we can set a configuration parameter and that it is recorded in
+	// the .autotools file for the project
+	public void canSetConfigParm() throws Exception {
+		SWTBotView view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject0");
+		bot.menu("Project", 1).menu("Properties").click();
+		SWTBotShell shell = bot.shell("Properties for GnuProject0");
+		shell.activate();
+		bot.tree().expandNode("Autotools").select("Configure Settings");
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
+		// Set the configure parameters to be --enable-jeff via user-defined options
+		SWTBotText text = bot.textWithLabel("Additional command-line options");
+		text.typeText("--enable-jeff");
+		bot.button("OK").click();
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		assertTrue(workspace != null);
+		IWorkspaceRoot root = workspace.getRoot();
+		assertTrue(root != null);
+		IProject project = root.getProject("GnuProject0");
+		assertTrue(project != null);
+		IPath path = project.getLocation();
+		path = path.append(".autotools");
+		File f = new File(path.toOSString());
+		assertTrue(f.exists());
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder db = dbf.newDocumentBuilder();
+		Document d = db.parse(f);
+		Element e = d.getDocumentElement();
+		// Get the stored configuration data
+		NodeList cfgs = e.getElementsByTagName("configuration"); // $NON-NLS-1$
+		assertEquals(1, cfgs.getLength());
+		Node n = cfgs.item(0);
+		NodeList l = n.getChildNodes();
+		// Verify user field in .autotools file is set to --enable-jeff
+		boolean foundUser = false;
+		for (int y = 0; y < l.getLength(); ++y) {
+			Node child = l.item(y);
+			if (child.getNodeName().equals("option")) { // $NON-NLS-1$
+				NamedNodeMap optionAttrs = child.getAttributes();
+				Node idNode = optionAttrs.getNamedItem("id"); // $NON-NLS-1$
+				Node valueNode = optionAttrs.getNamedItem("value"); // $NON-NLS-1$
+				assertTrue(idNode != null);
+				assertTrue(valueNode != null);
+				String id = idNode.getNodeValue();
+				String value = valueNode.getNodeValue();
+				if (id.equals("user")) {
+					foundUser = true;
+					assertEquals(value, "--enable-jeff");
+				}
+			}
+		}
+		assertTrue(foundUser);
+	}
+
+	@Test
+	// Verify we can build the project with a configuration parameter and that
+	// the configuration parameter can be found in the config.status file.
+	public void canBuildWithConfigParm() throws Exception {
+		SWTBotView view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject0");
+		bot.menu("Project", 1).menu("Build Project").click();
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		assertTrue(workspace != null);
+		IWorkspaceRoot root = workspace.getRoot();
+		assertTrue(root != null);
+		IProject project = root.getProject("GnuProject0");
+		assertTrue(project != null);
+		IPath path = project.getLocation();
+		// We need to wait until the a.out file is created so
+		// sleep a bit and look for it...give up after 120 seconds
+		for (int i = 0; i < 240; ++i) {
+			bot.sleep(500);
+			File f = new File(path.append("src/a.out").toOSString());
+			if (f.exists())
+				break;
+		}
+		File f = new File(path.append("config.status").toOSString());
+		assertTrue(f.exists());
+		BufferedReader r = new BufferedReader(new FileReader(f));
+		int ch;
+		boolean optionFound = false;
+		// Read config.status and look for the string --enable-jeff
+		// which is a simple verification that the option was used in the 
+		// configure step.
+		while ((ch = r.read()) != -1) {
+			if (ch == '-') {
+				char[] buf = new char[12];
+				r.mark(100);
+				int count = r.read(buf);
+				if (count < 12)
+					break;
+				String s = new String(buf);
+				if (s.equals("-enable-jeff")) {
+					optionFound = true;
+					break;
+				} else {
+					r.reset();
+				}
+			}
+		}
+		assertTrue(optionFound);
+	}
+
+	@Test
+	// Verify a new configuration will copy the configuration parameters
+	// of its base configuration.
+	public void newConfigCopiesParms() throws Exception {
+		SWTBotView view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject0");
+		bot.menu("Project", 1).menu("Build Configurations").menu("Manage...").click();
+		SWTBotShell shell = bot.shell("GnuProject0: Manage Configurations");
+		shell.activate();
+		bot.button("New...").click();
+		shell = bot.shell("Create New Configuration");
+		shell.activate();
+		SWTBotText t = bot.textWithLabel("Name:");
+		t.typeText("debug");
+		SWTBotRadio radio = bot.radio("Existing configuration");
+		if (!radio.isSelected())
+			radio.click();
+		bot.button("OK").click();
+		shell = bot.shell("GnuProject0: Manage Configurations");
+		shell.activate();
+		bot.button("New...").click();
+		shell = bot.shell("Create New Configuration");
+		shell.activate();
+		t = bot.textWithLabel("Name:");
+		t.typeText("default");
+		radio = bot.radio("Default configuration");
+		if (!radio.isSelected())
+			radio.click();
+		bot.button("OK").click();
+		shell = bot.shell("GnuProject0: Manage Configurations");
+		shell.activate();
+		SWTBotTable table = bot.table();
+		assertTrue(table.containsItem("debug"));
+		table.getTableItem("debug").select();
+		bot.button("Set Active").click();
+		bot.button("OK").click();
+		// Verify the debug configuration is active and has a user parameter: --enable-jeff
+		view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject0");
+		bot.menu("Project", 1).menu("Properties").click();
+		shell = bot.shell("Properties for GnuProject0");
+		shell.activate();
+		bot.tree().expandNode("Autotools").select("Configure Settings");
+		SWTBotCombo configs = bot.comboBoxWithLabel(UIMessages.getString("AbstractPage.6"));
+		configs.setFocus();
+		String[] items = configs.items();
+		for (int i = 0; i < items.length; ++i) {
+			if (items[i].contains("debug") && items[i].contains("Active"))
+				configs.setSelection(i);
+		}
+		assertTrue(configs.getText().contains("debug"));
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
+		SWTBotText text = bot.textWithLabel("Additional command-line options");
+		String val = text.getText();
+		assertEquals(val, "--enable-jeff");
+		// Verify that the build directory for the new configuration has been
+		// switched to build-debug
+		bot.tree().expandNode("C/C++ Build").select();
+		String buildDir = bot.textWithLabel("Build directory:").getText();
+		assertTrue(buildDir.endsWith("build-debug"));
+		// Verify the default configuration has no user setting
+		bot.tree().expandNode("Autotools").select("Configure Settings");
+		configs = bot.comboBoxWithLabel(UIMessages.getString("AbstractPage.6"));
+		configs.setSelection("default");
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
+		text = bot.textWithLabel("Additional command-line options");
+		val = text.getText();
+		assertEquals(val, "");
+		bot.button("OK").click();
+		// Build the project again and verify we get a build-debug directory
+		view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject0");
+		bot.menu("Project", 1).menu("Build Project").click();
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		assertTrue(workspace != null);
+		IWorkspaceRoot root = workspace.getRoot();
+		assertTrue(root != null);
+		IProject project = root.getProject("GnuProject0");
+		assertTrue(project != null);
+		IPath path = project.getLocation();
+		// We need to wait until the config.status file is created so
+		// sleep a bit and look for it...give up after 20 seconds
+		for (int i = 0; i < 40; ++i) {
+			bot.sleep(500);
+			File f = new File(path.append("build-debug/src/a.out").toOSString());
+			if (f.exists())
+				break;
+		}
+		File f = new File(path.append("build-debug/config.status").toOSString());
+		assertTrue(f.exists());
+		BufferedReader r = new BufferedReader(new FileReader(f));
+		int ch;
+		boolean optionFound = false;
+		// Read config.status and look for the string --enable-jeff
+		// which is a simple verification that the option was used in the 
+		// configure step.
+		while ((ch = r.read()) != -1) {
+			if (ch == '-') {
+				char[] buf = new char[12];
+				r.mark(100);
+				int count = r.read(buf);
+				if (count < 12)
+					break;
+				String s = new String(buf);
+				if (s.equals("-enable-jeff")) {
+					optionFound = true;
+					break;
+				} else {
+					r.reset();
+				}
+			}
+		}
+		assertTrue(optionFound);
+		// Verify we cleaned out the top-level build directory (i.e. that there
+		// is no config.status there anymore).
+		path = project.getLocation().append("config.status");
+		f = new File(path.toOSString());
+		assertTrue(!f.exists());
+		path = project.getLocation().append(".autotools");
+		f = new File(path.toOSString());
+		assertTrue(f.exists());
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder db = dbf.newDocumentBuilder();
+		Document d = db.parse(f);
+		Element e = d.getDocumentElement();
+		// Get the stored configuration data
+		NodeList cfgs = e.getElementsByTagName("configuration"); // $NON-NLS-1$
+		assertEquals(3, cfgs.getLength());
+		int foundUser = 0;
+		for (int x = 0; x < cfgs.getLength(); ++x) {
+			Node n = cfgs.item(x);
+			NodeList l = n.getChildNodes();
+			// Verify two of the user fields in .autotools file are set to --enable-jeff
+			for (int y = 0; y < l.getLength(); ++y) {
+				Node child = l.item(y);
+				if (child.getNodeName().equals("option")) { // $NON-NLS-1$
+					NamedNodeMap optionAttrs = child.getAttributes();
+					Node idNode = optionAttrs.getNamedItem("id"); // $NON-NLS-1$
+					Node valueNode = optionAttrs.getNamedItem("value"); // $NON-NLS-1$
+					assertTrue(idNode != null);
+					assertTrue(valueNode != null);
+					String id = idNode.getNodeValue();
+					String value = valueNode.getNodeValue();
+					if (id.equals("user")) {
+						if (value.equals("--enable-jeff"))
+							++foundUser;
+					}
+				}
+			}
+		}
+		assertEquals(foundUser, 2);
+	}
+
+	@Test
+	// Verify we can do a double rename of configurations, renaming one configuration to
+	// another and then cancel without changing configuration settings.
+	public void doubleRenameCancel() throws Exception {
+		SWTBotView view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject0");
+		bot.menu("Project", 1).menu("Properties").click();
+		SWTBotShell shell = bot.shell("Properties for GnuProject0");
+		shell.activate();
+		bot.tree().expandNode("Autotools").select("Configure Settings");
+		SWTBotCombo configs = bot.comboBoxWithLabel(UIMessages.getString("AbstractPage.6"));
+		assertTrue(configs.getText().contains("debug"));
+		bot.button("Manage Configurations...").click();
+		shell = bot.shell("GnuProject0: Manage Configurations");
+		shell.activate();
+		bot.table().select("debug");
+		// Rename "debug" to "release" and rename "default" to "debug".
+		// The settings should follow the rename operation.
+		bot.button("Rename...").click();
+		shell = bot.shell("Rename Configuration");
+		shell.activate();
+		SWTBotText text = bot.textWithLabel("Name:");
+		text.setText("");
+		text.typeText("release");
+		bot.button("OK").click();
+		shell = bot.shell("GnuProject0: Manage Configurations");
+		shell.activate();
+		bot.table().select("default");
+		bot.button("Rename...").click();
+		shell = bot.shell("Rename Configuration");
+		shell.activate();
+		text = bot.textWithLabel("Name:");
+		text.setText("");
+		text.typeText("debug");
+		bot.button("OK").click();
+		shell = bot.shell("GnuProject0: Manage Configurations");
+		shell.activate();
+		bot.button("OK").click();
+		// Verify that "release" has --enable-jeff set and that
+		// the new "debug" configuration has no user setting.
+		shell = bot.shell("Properties for GnuProject0");
+		shell.activate();
+		configs = bot.comboBoxWithLabel(UIMessages.getString("AbstractPage.6"));
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
+		text = bot.textWithLabel("Additional command-line options");
+		String setting = text.getText();
+		assertEquals("--enable-jeff", setting);
+		configs.setFocus();
+		configs.setSelection("debug");
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
+		text = bot.textWithLabel("Additional command-line options");
+		setting = text.getText();
+		assertEquals("", setting);
+		bot.button("Cancel").click();
+		// Cancel and then verify that "debug" is back to normal with
+		// --enable-jeff set and that "default" is back to normal with
+		// no user setting.
+		view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject0");
+		bot.menu("Project", 1).menu("Properties").click();
+		shell = bot.shell("Properties for GnuProject0");
+		shell.activate();
+		bot.tree().expandNode("Autotools").select("Configure Settings");
+		configs = bot.comboBoxWithLabel(UIMessages.getString("AbstractPage.6"));
+		assertTrue(configs.getText().contains("debug"));
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
+		text = bot.textWithLabel("Additional command-line options");
+		setting = text.getText();
+		assertEquals("--enable-jeff", setting);
+		configs.setFocus();
+		configs.setSelection("default");
+		assertTrue(configs.getText().contains("default"));
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
+		text = bot.textWithLabel("Additional command-line options");
+		setting = text.getText();
+		assertEquals("", setting);
+		bot.button("OK").click();
+	}
+
+	@Test
+	// Verify we can do a double rename of configurations, renaming one configuration to
+	// another and inheriting the settings properly.
+	public void doubleRenameOk() throws Exception {
+		SWTBotView view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject0");
+		bot.menu("Project", 1).menu("Properties").click();
+		SWTBotShell shell = bot.shell("Properties for GnuProject0");
+		shell.activate();
+		bot.tree().expandNode("Autotools").select("Configure Settings");
+		SWTBotCombo configs = bot.comboBoxWithLabel(UIMessages.getString("AbstractPage.6"));
+		assertTrue(configs.getText().contains("debug"));
+		bot.button("Manage Configurations...").click();
+		shell = bot.shell("GnuProject0: Manage Configurations");
+		shell.activate();
+		bot.table().select("debug");
+		// Rename "debug" to "release" and rename "default" to "debug".
+		// The settings should follow the rename operation.
+		bot.button("Rename...").click();
+		shell = bot.shell("Rename Configuration");
+		shell.activate();
+		SWTBotText text = bot.textWithLabel("Name:");
+		text.setText("");
+		text.typeText("release");
+		bot.button("OK").click();
+		shell = bot.shell("GnuProject0: Manage Configurations");
+		shell.activate();
+		bot.table().select("default");
+		bot.button("Rename...").click();
+		shell = bot.shell("Rename Configuration");
+		shell.activate();
+		text = bot.textWithLabel("Name:");
+		text.setText("");
+		text.typeText("debug");
+		bot.button("OK").click();
+		shell = bot.shell("GnuProject0: Manage Configurations");
+		shell.activate();
+		bot.button("OK").click();
+		shell = bot.shell("Properties for GnuProject0");
+		shell.activate();
+		bot.button("OK").click();
+		// Verify changes have taken effect permanently
+		view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject0");
+		bot.menu("Project", 1).menu("Properties").click();
+		shell = bot.shell("Properties for GnuProject0");
+		shell.activate();
+		bot.tree().expandNode("Autotools").select("Configure Settings");
+		configs = bot.comboBoxWithLabel(UIMessages.getString("AbstractPage.6"));
+		assertTrue(configs.getText().contains("release"));
+		assertTrue(configs.getText().contains("Active"));
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
+		text = bot.textWithLabel("Additional command-line options");
+		String setting = text.getText();
+		assertEquals("--enable-jeff", setting);
+		configs.setFocus();
+		configs.setSelection("debug");
+		assertTrue(configs.getText().contains("debug"));
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
+		text = bot.textWithLabel("Additional command-line options");
+		setting = text.getText();
+		assertEquals("", setting);
+		bot.button("OK").click();
+	}
+
+	@AfterClass
+	public static void sleep() {
+		bot.sleep(4000);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/src/org/eclipse/linuxtools/cdt/autotools/ui/tests/TestToolActions.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/src/org/eclipse/linuxtools/cdt/autotools/ui/tests/TestToolActions.java
new file mode 100644
index 0000000..7c1a111
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui.tests/src/org/eclipse/linuxtools/cdt/autotools/ui/tests/TestToolActions.java
@@ -0,0 +1,449 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.tests;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
+import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
+import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotRadio;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(SWTBotJunit4ClassRunner.class)
+public class TestToolActions {
+	private static SWTWorkbenchBot	bot;
+
+	@BeforeClass
+	public static void beforeClass() throws Exception {
+		SWTBotPreferences.KEYBOARD_LAYOUT = "EN_US";
+		bot = new SWTWorkbenchBot();
+		// Close the Welcome view if it exists
+		try {
+		bot.viewByTitle("Welcome").close();
+		// Turn off automatic building by default
+		} catch (Exception e) {
+			// do nothing
+		}
+		bot.menu("Window").menu("Preferences").click();
+		SWTBotShell shell = bot.shell("Preferences");
+		shell.activate();
+		bot.tree().expandNode("General").select("Workspace");
+		SWTBotCheckBox buildAuto = bot.checkBox("Build automatically");
+		if (buildAuto != null && buildAuto.isChecked())
+			buildAuto.click();
+		bot.button("Apply").click();
+		// Ensure that the C/C++ perspective is chosen automatically
+		// and doesn't require user intervention
+		bot.tree().expandNode("General").select("Perspectives");
+		SWTBotRadio radio = bot.radio("Always open");
+		if (radio != null && !radio.isSelected())
+			radio.click();
+		bot.button("OK").click();
+		bot.menu("File").menu("New").menu("Project...").click();
+		 
+		shell = bot.shell("New Project");
+		shell.activate();
+		bot.tree().expandNode("C/C++").select("C Project");
+		bot.button("Next >").click();
+ 
+		bot.textWithLabel("Project name:").setText("GnuProject1");
+		bot.tree().expandNode("GNU Autotools").select("Hello World ANSI C Autotools Project");
+ 
+		bot.button("Finish").click();
+	}
+ 
+	@Test
+	// Verify we can access the aclocal tool
+	public void canAccessAclocal() throws Exception {
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		assertTrue(workspace != null);
+		IWorkspaceRoot root = workspace.getRoot();
+		assertTrue(root != null);
+		IProject project = root.getProject("GnuProject1");
+		assertTrue(project != null);
+		IPath path = project.getLocation();
+		// Verify configure does not exist initially
+		path = path.append("aclocal.m4");
+		File f = new File(path.toOSString());
+		assertTrue(!f.exists());
+		SWTBotView view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject1");
+		bot.menu("Project", 1).menu("Invoke Autotools").menu("Invoke Aclocal").click();
+		SWTBotShell shell = bot.shell("Aclocal Options");
+		shell.activate();
+		bot.text(0).typeText("--help");
+		bot.button("OK").click();
+		bot.sleep(1000);
+		SWTBotView consoleView = bot.viewByTitle("Console");
+		consoleView.setFocus();
+		String output = consoleView.bot().styledText().getText();
+		// Verify we got some help output to the console
+		Pattern p = Pattern.compile(".*Invoking aclocal in.*GnuProject1.*aclocal --help.*Usage: aclocal.*", Pattern.DOTALL);
+		Matcher m = p.matcher(output);
+		assertTrue(m.matches());
+		// Verify we still don't have an aclocal.m4 file yet
+		f = new File(path.toOSString());
+		assertTrue(!f.exists());
+		// Now lets run aclocal for our hello world project which hasn't had any
+		// autotool files generated yet.
+		view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject1");
+		bot.menu("Project", 1).menu("Invoke Autotools").menu("Invoke Aclocal").click();
+		shell = bot.shell("Aclocal Options");
+		shell.activate();
+		bot.button("OK").click();
+		bot.sleep(1000);
+		consoleView = bot.viewByTitle("Console");
+		consoleView.setFocus();
+		output = consoleView.bot().styledText().getText();
+		p = Pattern.compile(".*Invoking aclocal in.*GnuProject1.*aclocal.*", Pattern.DOTALL);
+		m = p.matcher(output);
+		assertTrue(m.matches());
+		// We need to wait until the aclocal.m4 file is created so
+		// sleep a bit and look for it...give up after 20 seconds
+		for (int i = 0; i < 40; ++i) {
+			bot.sleep(500);
+			f = new File(path.toOSString());
+			if (f.exists())
+				break;
+		}
+		// Verify we now have an aclocal.m4 file created
+		assertTrue(f.exists());
+	}
+
+	@Test
+	// Verify we can access the autoconf tool
+	public void canAccessAutoconf() throws Exception {
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		assertTrue(workspace != null);
+		IWorkspaceRoot root = workspace.getRoot();
+		assertTrue(root != null);
+		IProject project = root.getProject("GnuProject1");
+		assertTrue(project != null);
+		IPath path = project.getLocation();
+		// Verify configure does not exist initially
+		path = path.append("configure");
+		File f = new File(path.toOSString());
+		assertTrue(!f.exists());
+		SWTBotView view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject1");
+		bot.menu("Project", 1).menu("Invoke Autotools").menu("Invoke Autoconf").click();
+		bot.sleep(1000);
+		SWTBotView consoleView = bot.viewByTitle("Console");
+		consoleView.setFocus();
+		String output = consoleView.bot().styledText().getText();
+		// Verify we got some help output to the console
+		Pattern p = Pattern.compile(".*Invoking autoconf in.*GnuProject1.*autoconf.*", Pattern.DOTALL);
+		Matcher m = p.matcher(output);
+		assertTrue(m.matches());
+		// We need to wait until the configure file is created so
+		// sleep a bit and look for it...give up after 20 seconds
+		for (int i = 0; i < 40; ++i) {
+			bot.sleep(500);
+			f = new File(path.toOSString());
+			if (f.exists())
+				break;
+		}
+		// Verify we now have a configure script
+		f = new File(path.toOSString());
+		assertTrue(f.exists());
+		// Now lets delete the configure file and run autoconf from the project explorer
+		// menu directly from the configure.ac file.
+		assertTrue(f.delete());
+		view = bot.viewByTitle("Project Explorer");
+		SWTBotTreeItem node = view.bot().tree().expandNode("GnuProject1").getNode("configure.ac");
+		node.setFocus();
+		node.select().contextMenu("Invoke Autoconf").click();
+		bot.sleep(1000);
+		consoleView = bot.viewByTitle("Console");
+		consoleView.setFocus();
+		output = consoleView.bot().styledText().getText();
+		p = Pattern.compile(".*Invoking autoconf in.*GnuProject1.*autoconf.*", Pattern.DOTALL);
+		m = p.matcher(output);
+		assertTrue(m.matches());
+		// We need to wait until the configure file is created so
+		// sleep a bit and look for it...give up after 20 seconds
+		for (int i = 0; i < 40; ++i) {
+			bot.sleep(500);
+			f = new File(path.toOSString());
+			if (f.exists())
+				break;
+		}
+		// Verify we now have a configure script again
+		f = new File(path.toOSString());
+		assertTrue(f.exists());
+	}
+	
+	@Test
+	// Verify we can access the automake tool
+	public void canAccessAutomake() throws Exception {
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		assertTrue(workspace != null);
+		IWorkspaceRoot root = workspace.getRoot();
+		assertTrue(root != null);
+		IProject project = root.getProject("GnuProject1");
+		assertTrue(project != null);
+		IPath path = project.getLocation();
+		// Verify configure does not exist initially
+		IPath path2 = path.append("src/Makefile.in");
+		path = path.append("Makefile.in");
+		File f = new File(path.toOSString());
+		assertTrue(!f.exists());
+		File f2 = new File(path2.toOSString());
+		assertTrue(!f2.exists());
+		SWTBotView view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject1");
+		bot.menu("Project", 1).menu("Invoke Autotools").menu("Invoke Automake").click();
+		SWTBotShell shell = bot.shell("Automake Options");
+		shell.activate();
+		bot.text(0).typeText("--help");
+		bot.button("OK").click();
+		bot.sleep(1000);
+		SWTBotView consoleView = bot.viewByTitle("Console");
+		consoleView.setFocus();
+		String output = consoleView.bot().styledText().getText();
+		// Verify we got some help output to the console
+		Pattern p = Pattern.compile(".*Invoking automake in.*GnuProject1.*automake --help.*Usage:.*", Pattern.DOTALL);
+		Matcher m = p.matcher(output);
+		assertTrue(m.matches());
+		// Verify we still don't have Makefile.in files yet
+		f = new File(path.toOSString());
+		assertTrue(!f.exists());
+		f2 = new File(path2.toOSString());
+		assertTrue(!f2.exists());
+		// Now lets run automake for our hello world project which hasn't had any
+		// Makefile.in files generated yet.
+		view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject1");
+		bot.menu("Project", 1).menu("Invoke Autotools").menu("Invoke Automake").click();
+		shell = bot.shell("Automake Options");
+		shell.activate();
+		bot.text(0).typeText("--add-missing"); // need this to successfully run here
+		bot.text(1).typeText("Makefile src/Makefile");
+		bot.button("OK").click();
+		bot.sleep(2000);
+		consoleView = bot.viewByTitle("Console");
+		consoleView.setFocus();
+		output = consoleView.bot().styledText().getText();
+		p = Pattern.compile(".*Invoking automake in.*GnuProject1.*automake --add-missing Makefile src/Makefile.*", Pattern.DOTALL);
+		m = p.matcher(output);
+		assertTrue(m.matches());
+		// We need to wait until the Makefile.in files are created so
+		// sleep a bit and look for it...give up after 20 seconds
+		for (int i = 0; i < 40; ++i) {
+			bot.sleep(500);
+			f = new File(path.toOSString());
+			f2 = new File(path2.toOSString());
+			if (f.exists() && f2.exists())
+				break;
+		}
+		// Verify we now have Makefile.in files created
+		f = new File(path.toOSString());
+		assertTrue(f.exists());
+		f2 = new File(path2.toOSString());
+		assertTrue(f2.exists());
+	}
+	
+	@Test
+	// Verify we can access the libtoolize tool
+	public void canAccessLibtoolize() throws Exception {
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		assertTrue(workspace != null);
+		IWorkspaceRoot root = workspace.getRoot();
+		assertTrue(root != null);
+		IProject project = root.getProject("GnuProject1");
+		assertTrue(project != null);
+		SWTBotView view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject1");
+		bot.menu("Project", 1).menu("Invoke Autotools").menu("Invoke Libtoolize").click();
+		SWTBotShell shell = bot.shell("Libtoolize Options");
+		shell.activate();
+		bot.text(0).typeText("--help");
+		bot.button("OK").click();
+		bot.sleep(1000);
+		SWTBotView consoleView = bot.viewByTitle("Console");
+		consoleView.setFocus();
+		String output = consoleView.bot().styledText().getText();
+		// Verify we got some help output to the console
+		Pattern p = Pattern.compile(".*Invoking libtoolize in.*GnuProject1.*libtoolize --help.*Usage: libtoolize.*", Pattern.DOTALL);
+		Matcher m = p.matcher(output);
+		assertTrue(m.matches());
+	}
+
+	@Test
+	// Verify we can access the libtoolize tool
+	public void canAccessAutoheader() throws Exception {
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		assertTrue(workspace != null);
+		IWorkspaceRoot root = workspace.getRoot();
+		assertTrue(root != null);
+		IProject project = root.getProject("GnuProject1");
+		assertTrue(project != null);
+		SWTBotView view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject1");
+		bot.menu("Project", 1).menu("Invoke Autotools").menu("Invoke Autoheader").click();
+		SWTBotShell shell = bot.shell("Autoheader Options");
+		shell.activate();
+		bot.text(0).typeText("--help");
+		bot.button("OK").click();
+		bot.sleep(1000);
+		SWTBotView consoleView = bot.viewByTitle("Console");
+		consoleView.setFocus();
+		String output = consoleView.bot().styledText().getText();
+		// Verify we got some help output to the console
+		Pattern p = Pattern.compile(".*Invoking autoheader in.*GnuProject1.*autoheader --help.*Usage:.*autoheader.*", Pattern.DOTALL);
+		Matcher m = p.matcher(output);
+		assertTrue(m.matches());
+	}
+
+	@Test
+	// Verify we can access the autoreconf tool
+	public void canAccessAutoreconf() throws Exception {
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		assertTrue(workspace != null);
+		IWorkspaceRoot root = workspace.getRoot();
+		assertTrue(root != null);
+		IProject project = root.getProject("GnuProject1");
+		assertTrue(project != null);
+		IPath path = project.getLocation();
+		// Remove a number of generated files
+		File f = new File(path.append("src/Makefile.in").toOSString());
+		if (f.exists())
+			f.delete();
+		f = new File(path.append("Makefile.in").toOSString());
+		if (f.exists())
+			f.delete();
+		f = new File(path.append("configure").toOSString());
+		if (f.exists())
+			f.delete();
+		f = new File(path.append("config.status").toOSString());
+		if (f.exists())
+			f.delete();
+		f = new File(path.append("config.sub").toOSString());
+		if (f.exists())
+			f.delete();
+		SWTBotView view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject1");
+		bot.menu("Project", 1).menu("Invoke Autotools").menu("Invoke Autoreconf").click();
+		SWTBotShell shell = bot.shell("Autoreconf Options");
+		shell.activate();
+		bot.text(0).typeText("--help");
+		bot.button("OK").click();
+		bot.sleep(1000);
+		SWTBotView consoleView = bot.viewByTitle("Console");
+		consoleView.setFocus();
+		String output = consoleView.bot().styledText().getText();
+		// Verify we got some help output to the console
+		Pattern p = Pattern.compile(".*Invoking autoreconf in.*GnuProject1.*autoreconf --help.*Usage: .*autoreconf.*", Pattern.DOTALL);
+		Matcher m = p.matcher(output);
+		assertTrue(m.matches());
+		view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject1");
+		bot.menu("Project", 1).menu("Invoke Autotools").menu("Invoke Autoreconf").click();
+		shell = bot.shell("Autoreconf Options");
+		shell.activate();
+		bot.text(0).typeText("-i");
+		bot.button("OK").click();
+		// We need to wait until the Makefile.in file is created so
+		// sleep a bit and look for it...give up after 20 seconds
+		for (int i = 0; i < 40; ++i) {
+			bot.sleep(500);
+			f = new File(path.append("Makefile.in").toOSString());
+			if (f.exists())
+				break;
+		}
+		// Verify a number of generated files now exist
+		f = new File(path.append("src/Makefile.in").toOSString());
+		assertTrue(f.exists());
+		f = new File(path.append("Makefile.in").toOSString());
+		assertTrue(f.exists());
+		f = new File(path.append("configure").toOSString());
+		assertTrue(f.exists());
+		f = new File(path.append("config.status").toOSString());
+		assertTrue(!f.exists()); //shouldn't have run configure
+		f = new File(path.append("config.sub").toOSString());
+		assertTrue(f.exists());
+	}
+
+	@Test
+	// Verify we can access the autoreconf tool
+	public void canReconfigureProject() throws Exception {
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		assertTrue(workspace != null);
+		IWorkspaceRoot root = workspace.getRoot();
+		assertTrue(root != null);
+		IProject project = root.getProject("GnuProject1");
+		assertTrue(project != null);
+		IPath path = project.getLocation();
+		// Remove a number of generated files
+		File f = new File(path.append("src/Makefile.in").toOSString());
+		if (f.exists())
+			f.delete();
+		f = new File(path.append("Makefile.in").toOSString());
+		if (f.exists())
+			f.delete();
+		f = new File(path.append("configure").toOSString());
+		if (f.exists())
+			f.delete();
+		f = new File(path.append("config.status").toOSString());
+		if (f.exists())
+			f.delete();
+		f = new File(path.append("config.sub").toOSString());
+		if (f.exists())
+			f.delete();
+		SWTBotView view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject1");
+		bot.menu("Project", 1).menu("Reconfigure Project").click();
+		// We need to wait until the config.status file is created so
+		// sleep a bit and look for it...give up after 40 seconds
+		for (int i = 0; i < 40; ++i) {
+			bot.sleep(500);
+			f = new File(path.append("config.status").toOSString());
+			if (f.exists())
+				break;
+		}
+		// Verify a number of generated files now exist
+		f = new File(path.append("src/Makefile.in").toOSString());
+		assertTrue(f.exists());
+		f = new File(path.append("Makefile.in").toOSString());
+		assertTrue(f.exists());
+		f = new File(path.append("configure").toOSString());
+		assertTrue(f.exists());
+		f = new File(path.append("config.status").toOSString());
+		assertTrue(f.exists());
+		f = new File(path.append("config.sub").toOSString());
+		assertTrue(f.exists());
+	}
+
+	@AfterClass
+	public static void sleep() {
+		bot.sleep(2000);
+		bot.menu("File").menu("Exit").click();
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/.classpath b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/.classpath
new file mode 100644
index 0000000..ad32c83
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/.project b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/.project
new file mode 100644
index 0000000..7356f52
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.cdt.autotools.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/.settings/org.eclipse.jdt.core.prefs b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..137c164
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Tue Oct 06 15:50:25 EDT 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/ChangeLog b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/ChangeLog
new file mode 100644
index 0000000..4803f83
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/ChangeLog
@@ -0,0 +1,543 @@
+2010-04-22  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Switch to J2SE-1.5.
+
+2010-04-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #307258
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditor.java (isTabsToSpacesConversionEnabled): 
+	Add override method so tabs are not converted within the Automake editor.
+
+2010-03-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject): Move
+	creation of Autotools configuration to bottom as we must ensure that an ICConfigurationDescription
+	has been set up for the default configuration and we can't do this manually ourselves.
+
+2010-03-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #304005
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsCategoryPropertyOptionPage.java (createFieldEditors): 
+	Specify minimum length of 20 for text entry windows. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyPage.java (cfgChanged): Store configuration
+	descriptor for possible later usage.
+	(getConfiguration): Changed to use id rather than name.
+	(getAllConfigurationData): New method. 
+	(getCfgd): New method.
+	(AutotoolsConfigurePropertyPage): No longer implement ICloneCfgListener interface.  No longer keep track of temporary configuration
+	list.  This is now done by AutotoolsConfigurationManager.
+	(cloneCfg): Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyTab.java (createEditArea): Comment out
+	minimum size setting.
+	(setValues): Remove resizing.
+	(syncClones): New method.
+	(createControls): Sync all clones and clear the temporary configuration list.
+	(updateData): Get configuration description.
+	(performApply): Call AutotoolsConfigurationManager to do apply passing the Configuration Description list for
+	the page instead of calling performOk.
+	(getAutotoolsCfg): Change to use id rather than name. 
+	(performCancel): Call AutotoolsConfigurationManager to clear temporary configuration list.
+	(performOK): Changed to use new calls to AutotoolsConfigurationManager.
+	(specificResize): Removed.
+	(calcExtra): Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsBuildWizardHandler.java (convertProject): Create
+	configuration by id not name. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject): Ditto. 
+
+2010-02-25  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyPage.java (cloneCfg): If
+	clonee is null, assign new configuration to clonee variable to avoid NPE.
+
+2010-02-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #303613
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/Resources.properties: Fix message
+	issued for autoreconf.
+
+2009-12-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #296616
+	* META-INF/MANIFEST.MF: Revert dependency on org.eclipse.linuxtools.cdt.autotools plugin which
+	causes a dependency loop.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject): 
+	Change code to use new removeOldAutotoolsNature method in AutotoolsNewProjectNature class.
+
+2009-12-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #296616
+	* META-INF/MANIFEST.MF: Add dependency on org.eclipse.linuxtools.cdt.autotools plugin.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject): 
+	Remove old Autotools nature from existing project.
+
+2009-11-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml: Make sure COPYING file
+	is copied over as part of template.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml: Ditto. 
+
+2009-11-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/Resources.properties: Fix conversion wizard messages
+	to not mention CVS or repository.
+
+2009-11-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Fix dependencies to support CDT 6.0.0 and up.
+
+2009-11-02  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/AutoconfTextHover.java: Clean up warning.
+	* plugin.xml: Add back conversion wizard which is needed to convert from old Autotools project
+	to new as well as convert a Std Makefile project over.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyPage.java: Remove
+	the override logic and use the base AbstractPage plus some additions.
+	(cfgChanged):  Change this to be a place-holder for future usage. 
+	(getConfiguration): Add any configuration we create to the cfgs list.
+	(isSingle): Return true.
+	(AutotoolsConfigurePropertyPage): Changed to only set cfgs.
+	(cloneCfg): Changed to only access cfgs local variable.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyTab.java (performOK): 
+	Change to get IConfiguration list and then for each IConfiguration, get the IAConfiguration from
+	the parent page.  This allows the parent page to only have to track cloned and special Autotools
+	configurations as opposed to knowing the entire list.
+
+2009-10-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/EditorUtility.java (getWorkingCopy): Clean up.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsPropertyMessages.java: Change to reference
+	bundle using class name rather than by string.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/AutoconfTextHover.java (getHoverDoc): Add compatibility
+	support for old projects which use compatiblity plugin. 
+	(getDefaultAutomakeMacrosVer): New method.
+	(getDefaultAutoconfMacrosVer): Ditto.
+	(getLocalAutoconfMacrosDocName): Ditto.
+	(getLocalAutomakeMacrosDocName): Ditto.
+	(getHoverDoc): Change to use new interfaces.
+	(getAMDoc): Change to try local files.
+	(getACDoc): Ditto.
+
+2009-10-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsBuildWizardHandler.java: New file.
+	* META-INF/MANIFEST.MF: Change dependencies to match CDT 6.0.1.
+	* plugin.properties: Add new strings as needed.
+	* plugin.xml: Fix Autotools sub-pages which had been removed.  Also comment out GNU Autotools-specific
+	project wizards and conversion wizards.  These are all done under the C/C++ Wizards now.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsUIPluginImages.java: Clean up AutotoolsPlugin reference.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIImages.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/EditorUtility.java (getWorkingCopy): Change to
+	use new findSharedWorkingCopy API since old public one has been removed from the CDT.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyPage.java (handleConfigSelection): 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsBuildWizard.java (createItems): Use the new
+	AutotoolsBuildWizardHandler so we get proper project conversion in the CDT C and C++ Conversion Wizards. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsWizardMessages.properties: Add new message.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizard.java: Clean up unused
+	imports.
+
+2009-10-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizard.java (doRun): Remove
+	commented section. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject): Add
+	creation of default Autotools configuration.
+	 
+2009-10-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java (createControls): Remove
+	scanner discovery option which is no longer pertinent. 
+	(initialize): Ditto. 
+	(performOK): Ditto.
+
+2009-10-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsUIPluginImages.java (static initializer): Make sure
+	we are referencing icons folder for this plug-in, not AutotoolsPlugin. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLTextPresenter.java (updatePresentation): Fix references to
+	AutotoolsPlugin that should be AutotoolsUIPlugin. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIImages.java (static initializer): Ditto. 
+	(makeIconFileURL): Ditto.
+
+2009-10-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Fix Automake editor content-type typo.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizard.java (doRun): Put
+	back code to do conversion.
+
+2009-10-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add export of packages and allow org.eclipse.linuxtools.cdt.autotools.tests
+	plug-in to see them.
+
+2009-10-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Refactoring of org.eclipse.linuxtools.cdt.autotools into org.eclipse.linuxtools.cdt.autotools.core
+	and org.eclipse.linuxtools.cdt.autotools.ui.
+	
+	* .classpath: New file.
+	* .project: New file.
+	* .settings/org.eclipse.jdt.core.prefs: New file.
+	* build.properties: New file.
+	* icons/ac16/acmacro_arg_obj.gif: New file.
+	* icons/ac16/acmacro_obj.gif: New file.
+	* icons/ac16/ammacro_obj.gif: New file.
+	* icons/ac16/case_obj.gif: New file.
+	* icons/ac16/condition_obj.gif: New file.
+	* icons/ac16/convert_normal.gif: New file.
+	* icons/ac16/elif_obj.gif: New file.
+	* icons/ac16/else_obj.gif: New file.
+	* icons/ac16/for_obj.gif: New file.
+	* icons/ac16/if_obj.gif: New file.
+	* icons/ac16/while_obj.gif: New file.
+	* icons/autoconf.gif: New file.
+	* icons/automake.gif: New file.
+	* icons/dlcl16/build_configs.gif: New file.
+	* icons/dlcl16/config_category.gif: New file.
+	* icons/dlcl16/config_tool.gif: New file.
+	* icons/dlcl16/newc_app.gif: New file.
+	* icons/dlcl16/newcc_app.gif: New file.
+	* icons/dlcl16/open_include.gif: New file.
+	* icons/dtool16/alphab_sort_co.gif: New file.
+	* icons/dtool16/build_menu.gif: New file.
+	* icons/dtool16/convert-normal.gif: New file.
+	* icons/dtool16/make.gif: New file.
+	* icons/dtool16/makefile.gif: New file.
+	* icons/dtool16/newc_app.gif: New file.
+	* icons/dtool16/newcc_app.gif: New file.
+	* icons/dtool16/segment_edit.gif: New file.
+	* icons/dtool16/target_add.gif: New file.
+	* icons/dtool16/target_build.gif: New file.
+	* icons/dtool16/target_delete.gif: New file.
+	* icons/dtool16/target_edit.gif: New file.
+	* icons/dtool16/update_old.gif: New file.
+	* icons/elcl16/build_configs.gif: New file.
+	* icons/elcl16/config_category.gif: New file.
+	* icons/elcl16/config_tool.gif: New file.
+	* icons/elcl16/newc_app.gif: New file.
+	* icons/elcl16/newcc_app.gif: New file.
+	* icons/elcl16/open_include.gif: New file.
+	* icons/etool16/alphab_sort_co.gif: New file.
+	* icons/etool16/build_menu.gif: New file.
+	* icons/etool16/convert_normal.gif: New file.
+	* icons/etool16/make.gif: New file.
+	* icons/etool16/makefile.gif: New file.
+	* icons/etool16/newc_app.gif: New file.
+	* icons/etool16/newcc_app.gif: New file.
+	* icons/etool16/segment_edit.gif: New file.
+	* icons/etool16/target_add.gif: New file.
+	* icons/etool16/target_build.gif: New file.
+	* icons/etool16/target_delete.gif: New file.
+	* icons/etool16/target_edit.gif: New file.
+	* icons/etool16/target_filter.gif: New file.
+	* icons/etool16/update_old.gif: New file.
+	* icons/obj16/acmacro_obj.gif: New file.
+	* icons/obj16/command_obj.gif: New file.
+	* icons/obj16/define_obj.gif: New file.
+	* icons/obj16/environment_obj.gif: New file.
+	* icons/obj16/envvar_obj.gif: New file.
+	* icons/obj16/error_obj.gif: New file.
+	* icons/obj16/fatalerror_obj.gif: New file.
+	* icons/obj16/hfolder_obj.gif: New file.
+	* icons/obj16/include_obj.gif: New file.
+	* icons/obj16/info_obj.gif: New file.
+	* icons/obj16/irule_obj.gif: New file.
+	* icons/obj16/lib_obj.gif: New file.
+	* icons/obj16/macro_obj.gif: New file.
+	* icons/obj16/relation_obj.gif: New file.
+	* icons/obj16/target_obj.gif: New file.
+	* icons/obj16/trule_obj.gif: New file.
+	* icons/obj16/warning_obj.gif: New file.
+	* icons/sample.gif: New file.
+	* META-INF/MANIFEST.MF: New file.
+	* plugin.properties: New file.
+	* plugin.xml: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/AutotoolsUIPlugin.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfAnnotationHover.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfCodeScanner.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentSetupParticipant.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditor.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMacroValidator.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMessages.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMessages.properties: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfErrorHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfIdentifierRule.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfKeywordDetector.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfM4WordDetector.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacro.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroCodeScanner.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroParameterListValidator.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroPartitionRule.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroProposalContextInformation.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroRule.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroWordDetector.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitioner.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitionScanner.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPKGWordDetector.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfReconcilingStrategy.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfWhitespaceDetector.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfWordDetector.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolEditorActionDefinitionIds.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolHelpContextIds.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolsEditor.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/InlineDataRule.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/MultilineRuleDamagerRepairer.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentProvider.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/ParseException.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseConditionElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElifElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElseElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfForElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfIfElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroArgumentElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroDetector.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfParser.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfRootElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfSelectElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfTokenizer.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfUntilElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfWhileElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfErrorHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroDetector.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroValidator.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IMacroDetector.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ITokenConstants.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ParseException.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/Token.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RecursiveSingleLineRule.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RestrictedEndOfLineRule.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/Resources.properties: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AbstractAutotoolsCPropertyTab.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AbstractAutotoolsHandler.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AbstractTargetAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AclocalHandler.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutoconfHandler.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutoheaderHandler.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutomakeHandler.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutoreconfHandler.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAclocalAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutoconfAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutoheaderAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutomakeAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutoreconfAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeLibtoolizeAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeMessages.properties: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/LibtoolizeHandler.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/ReconfigureAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/ReconfigureHandler.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/SingleInputDialog.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/TwoInputDialog.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsConsole.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsUIPluginImages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CBuildStepsConsole.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CConfigureConsole.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/Console.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.properties: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CWordFinder.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/autoconf/ProjectionFileUpdater.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AbstractElementListSelectionDialog.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AbstractMakefile.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AbstractMakefileCodeScanner.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AddBuildTargetAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ArchiveTarget.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutoconfSubstRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeCompletionProcessor.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeConfigMacro.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeDocumentProvider.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeEditor.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeEditorFactory.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeErrorHandler.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Automakefile.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileCodeScanner.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileContentOutlinePage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileReconcilingStrategy.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileSourceConfiguration.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileUtil.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeIfElse.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeMacroDefinitionRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeMacroReferenceRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeTextHover.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeWordDetector.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/BadDirective.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Command.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Comment.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/CompletionProposalComparator.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Conditional.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/DefaultRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/DefineVariable.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/DeleteOnErrorRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Directive.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/EditorUtility.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ElementListSelectionDialog.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Else.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/EmptyLine.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Endef.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Endif.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExportAllVariablesRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExportVariable.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExternalEditorInput.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExternalEditorInputFactory.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUAutomakefile.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUMakefileConstants.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUMakefileUtil.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUTargetRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUVariableDef.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IAutomakeConditional.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/If.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifdef.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifeq.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifndef.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifneq.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IgnoreRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IMakefileDocumentProvider.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IMakefileEditorActionDefinitionIds.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Include.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/InferenceRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IntermediateRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IReconcilingParticipant.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ISelectionValidator.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ITranslationUnitEditorInput.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/LexicalSortingAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/LowResolutionTimeRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MacroDefinition.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MacroDefinitionRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MacroReferenceRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileAnnotationHover.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileCodeScanner.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileCompletionProcessor.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakeFileConstants.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileContentOutlinePage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileDocumentProvider.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileDocumentSetupParticipant.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditor.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditorActionContributor.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditorPreferenceConstants.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditorTogglePresentationAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakeFileMessages.properties: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefilePartitionScanner.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileReader.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileReconcilingStrategy.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileSourceConfiguration.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileStorageDocumentProvider.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileTextHover.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileWordDetector.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MessageLine.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/NotParallelRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/NullMakefile.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OpenDeclarationAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OpenIncludeAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OverrideDefine.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OverrideVariable.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Parent.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PhonyRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PosixMakefileUtil.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PosixRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PreciousRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ProjectionMakefileUpdater.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Rule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SccsGetRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SecondaryRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SelectionList.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SelectionStatusDialog.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SilentRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SpecialRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StaticTargetRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StatusInfo.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StatusTool.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StringMatcher.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SuffixesRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Target.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/TargetRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/TargetVariable.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Terminal.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/TwoArrayQuickSort.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/UnExport.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Util.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/VariableDefinition.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/VPath.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/WordPartDetector.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/WorkingCopyManager.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ErrorParserBlock.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/FileRelevance.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTML2TextReader.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLPrinter.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLTextPresenter.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/LineBreakingReader.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/LocationAdapter.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIImages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIMessages.properties: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MessageLine.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/OptionalMessageDialog.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AbstractEditorPreferencePage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutoconfEditorPreferencePage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutomakeEditorPreferencePage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsEditorPreferenceConstants.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencePage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencesMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencesMessages.properties: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/ColorEditor.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/ColorManager.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/OverlayPreferenceStore.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/StatusInfo.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/TabFolderLayout.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AbstractConfigurePropertyOptionsPage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsCategoryPropertyOptionPage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePrefStore.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyPage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyTab.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsEditorPropertyTab.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsGeneralPropertyPage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsHeadPropertyPage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsPropertyManager.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsPropertyMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsToolPropertyOptionPage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsToolsPropertyTab.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/IProjectPropertyListener.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/IPropertyChangeManager.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/ToolListContentProvider.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/ToolListElement.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/ToolListLabelProvider.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ResourceLookup.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ResourceLookupTree.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SingleCharReader.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SubstitutionTextReader.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/AutoconfPrototype.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/AutoconfTextHover.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/HoverMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/HoverMessages.properties: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsBuildWizard.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsNewCCProjectWizardV2.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsNewCProjectWizardV2.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsWizardMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsWizardMessages.properties: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConfigurationContentProvider.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConfigurationLabelProvider.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizard.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizardPage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/CProjectPlatformPage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ManagedProjectOptionBlock.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/NewAutotoolsProjectOptionPage.java: New file.
+	* templates/projecttemplates/EmptyProject/template.properties: New file.
+	* templates/projecttemplates/EmptyProject/template.xml: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/template.properties: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.properties: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml: 
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/META-INF/MANIFEST.MF b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..7ec9cd2
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,38 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name.0
+Bundle-SymbolicName: org.eclipse.linuxtools.cdt.autotools.ui;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin
+Bundle-Localization: plugin
+Bundle-Vendor: %provider
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.linuxtools.cdt.autotools.core;bundle-version="1.0.0",
+ org.eclipse.cdt.make.core;bundle-version="6.0.0",
+ org.eclipse.cdt.core;bundle-version="5.1.0",
+ org.eclipse.core.resources;bundle-version="3.5.0",
+ org.eclipse.cdt.managedbuilder.core;bundle-version="6.0.0",
+ org.eclipse.jface.text;bundle-version="3.5.0",
+ org.eclipse.ui.editors;bundle-version="3.5.0",
+ org.eclipse.cdt.ui;bundle-version="5.1.0",
+ org.eclipse.help;bundle-version="3.4.0",
+ org.eclipse.ui.ide;bundle-version="3.5.0",
+ org.eclipse.cdt.managedbuilder.ui;bundle-version="5.1.0",
+ org.eclipse.core.filesystem;bundle-version="1.2.0",
+ org.eclipse.cdt.make.ui;bundle-version="6.0.0",
+ org.eclipse.ui.views;bundle-version="3.4.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.linuxtools.cdt.autotools.ui,
+ org.eclipse.linuxtools.cdt.autotools.ui.editors,
+ org.eclipse.linuxtools.cdt.autotools.ui.editors.outline,
+ org.eclipse.linuxtools.cdt.autotools.ui.editors.parser,
+ org.eclipse.linuxtools.internal.cdt.autotools.ui;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests",
+ org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests",
+ org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.autoconf;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests",
+ org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests",
+ org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests",
+ org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests",
+ org.eclipse.linuxtools.internal.cdt.autotools.ui.text.hover;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests",
+ org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests"
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/build.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/build.properties
new file mode 100644
index 0000000..b5179fa
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/build.properties
@@ -0,0 +1,8 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               plugin.properties,\
+               templates/,\
+               icons/
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/acmacro_arg_obj.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/acmacro_arg_obj.gif
new file mode 100644
index 0000000..fa1765e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/acmacro_arg_obj.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/acmacro_obj.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/acmacro_obj.gif
new file mode 100644
index 0000000..d90a51c
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/acmacro_obj.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/ammacro_obj.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/ammacro_obj.gif
new file mode 100644
index 0000000..91c4c93
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/ammacro_obj.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/case_obj.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/case_obj.gif
new file mode 100644
index 0000000..5a15a79
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/case_obj.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/condition_obj.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/condition_obj.gif
new file mode 100644
index 0000000..1be9094
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/condition_obj.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/convert_normal.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/convert_normal.gif
new file mode 100644
index 0000000..0b693cb
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/convert_normal.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/elif_obj.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/elif_obj.gif
new file mode 100644
index 0000000..f34581a
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/elif_obj.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/else_obj.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/else_obj.gif
new file mode 100644
index 0000000..a441bef
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/else_obj.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/for_obj.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/for_obj.gif
new file mode 100644
index 0000000..11d3d8d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/for_obj.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/if_obj.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/if_obj.gif
new file mode 100644
index 0000000..86550fe
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/if_obj.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/while_obj.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/while_obj.gif
new file mode 100644
index 0000000..2407494
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/while_obj.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/autoconf.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/autoconf.gif
new file mode 100644
index 0000000..98afb3e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/autoconf.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/automake.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/automake.gif
new file mode 100644
index 0000000..57df70e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/automake.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/build_configs.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/build_configs.gif
new file mode 100644
index 0000000..f040465
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/build_configs.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/config_category.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/config_category.gif
new file mode 100644
index 0000000..cd837b1
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/config_category.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/config_tool.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/config_tool.gif
new file mode 100644
index 0000000..4539ebd
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/config_tool.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/newc_app.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/newc_app.gif
new file mode 100644
index 0000000..a8353f6
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/newc_app.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/newcc_app.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/newcc_app.gif
new file mode 100644
index 0000000..9ed7487
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/newcc_app.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/open_include.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/open_include.gif
new file mode 100644
index 0000000..b902fca
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/open_include.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/alphab_sort_co.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/alphab_sort_co.gif
new file mode 100644
index 0000000..a024548
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/alphab_sort_co.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/build_menu.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/build_menu.gif
new file mode 100644
index 0000000..825d4c1
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/build_menu.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/convert-normal.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/convert-normal.gif
new file mode 100644
index 0000000..580eac5
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/convert-normal.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/make.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/make.gif
new file mode 100644
index 0000000..496f46b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/make.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/makefile.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/makefile.gif
new file mode 100644
index 0000000..a66cba4
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/makefile.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/newc_app.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/newc_app.gif
new file mode 100644
index 0000000..a8353f6
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/newc_app.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/newcc_app.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/newcc_app.gif
new file mode 100644
index 0000000..9ed7487
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/newcc_app.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/segment_edit.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/segment_edit.gif
new file mode 100644
index 0000000..8cbaa85
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/segment_edit.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/target_add.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/target_add.gif
new file mode 100644
index 0000000..92003c4
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/target_add.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/target_build.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/target_build.gif
new file mode 100644
index 0000000..f545148
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/target_build.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/target_delete.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/target_delete.gif
new file mode 100644
index 0000000..5bff522
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/target_delete.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/target_edit.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/target_edit.gif
new file mode 100644
index 0000000..5e4b501
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/target_edit.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/update_old.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/update_old.gif
new file mode 100644
index 0000000..1f37827
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/update_old.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/build_configs.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/build_configs.gif
new file mode 100644
index 0000000..c4c76d0
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/build_configs.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/config_category.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/config_category.gif
new file mode 100644
index 0000000..ee7c485
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/config_category.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/config_tool.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/config_tool.gif
new file mode 100644
index 0000000..c984fba
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/config_tool.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/newc_app.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/newc_app.gif
new file mode 100644
index 0000000..23b0284
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/newc_app.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/newcc_app.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/newcc_app.gif
new file mode 100644
index 0000000..4b39411
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/newcc_app.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/open_include.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/open_include.gif
new file mode 100644
index 0000000..b902fca
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/open_include.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/alphab_sort_co.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/alphab_sort_co.gif
new file mode 100644
index 0000000..7d27529
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/alphab_sort_co.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/build_menu.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/build_menu.gif
new file mode 100644
index 0000000..ab543f4
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/build_menu.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/convert_normal.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/convert_normal.gif
new file mode 100644
index 0000000..0b693cb
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/convert_normal.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/make.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/make.gif
new file mode 100644
index 0000000..def312a
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/make.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/makefile.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/makefile.gif
new file mode 100644
index 0000000..7afb494
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/makefile.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/newc_app.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/newc_app.gif
new file mode 100644
index 0000000..23b0284
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/newc_app.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/newcc_app.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/newcc_app.gif
new file mode 100644
index 0000000..4b39411
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/newcc_app.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/segment_edit.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/segment_edit.gif
new file mode 100644
index 0000000..1b50ff8
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/segment_edit.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_add.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_add.gif
new file mode 100644
index 0000000..7fe9625
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_add.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_build.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_build.gif
new file mode 100644
index 0000000..174965f
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_build.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_delete.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_delete.gif
new file mode 100644
index 0000000..b853d62
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_delete.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_edit.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_edit.gif
new file mode 100644
index 0000000..65b97a5
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_edit.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_filter.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_filter.gif
new file mode 100644
index 0000000..5340ec9
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_filter.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/update_old.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/update_old.gif
new file mode 100644
index 0000000..c40724d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/update_old.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/acmacro_obj.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/acmacro_obj.gif
new file mode 100644
index 0000000..98afb3e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/acmacro_obj.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/command_obj.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/command_obj.gif
new file mode 100644
index 0000000..7b3a92e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/command_obj.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/define_obj.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/define_obj.gif
new file mode 100644
index 0000000..87d583e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/define_obj.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/environment_obj.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/environment_obj.gif
new file mode 100644
index 0000000..3150162
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/environment_obj.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/envvar_obj.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/envvar_obj.gif
new file mode 100644
index 0000000..0f07692
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/envvar_obj.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/error_obj.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/error_obj.gif
new file mode 100644
index 0000000..0bc6068
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/error_obj.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/fatalerror_obj.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/fatalerror_obj.gif
new file mode 100644
index 0000000..75a9275
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/fatalerror_obj.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/hfolder_obj.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/hfolder_obj.gif
new file mode 100644
index 0000000..b98b817
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/hfolder_obj.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/include_obj.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/include_obj.gif
new file mode 100644
index 0000000..612067c
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/include_obj.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/info_obj.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/info_obj.gif
new file mode 100644
index 0000000..745b884
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/info_obj.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/irule_obj.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/irule_obj.gif
new file mode 100644
index 0000000..975d789
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/irule_obj.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/lib_obj.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/lib_obj.gif
new file mode 100644
index 0000000..cb55e33
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/lib_obj.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/macro_obj.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/macro_obj.gif
new file mode 100644
index 0000000..fdde5fb
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/macro_obj.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/relation_obj.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/relation_obj.gif
new file mode 100644
index 0000000..edbd8a3
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/relation_obj.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/target_obj.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/target_obj.gif
new file mode 100644
index 0000000..def312a
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/target_obj.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/trule_obj.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/trule_obj.gif
new file mode 100644
index 0000000..dd26112
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/trule_obj.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/warning_obj.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/warning_obj.gif
new file mode 100644
index 0000000..1e5f5eb
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/warning_obj.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/sample.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/sample.gif
new file mode 100644
index 0000000..34fb3c9
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/icons/sample.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/plugin.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/plugin.properties
new file mode 100644
index 0000000..6a64207
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/plugin.properties
@@ -0,0 +1,174 @@
+#################################################################################
+#  Copyright (c) 2006, 2008, 2009 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+ConvertWizard.description=Convert to C/C++ Autotools Project
+ConvertWizard.name = Convert to a C/C++ Autotools Project
+
+NewCProjectV2.description=GNU C Autotools Project
+NewCCProjectV2.description=GNU C++ Autotools Project
+NewCWizardV2.name=GNU C Autotools Project
+NewCCWizardV2.name=GNU C++ Autotools Project
+
+Autotools.wizard.name=GNU Autotools Build Wizard
+
+Autoconf.editor.name=Autoconf Editor
+
+BuildProperty.value.name.default=Default;
+BuildProperty.type.name.autotools=GNU Autotools
+
+PreferenceAutotools.name=Autotools
+PreferenceAutomakeEditor.name=Automake Editor
+PreferenceAutoconfEditor.name=Autoconf Editor
+
+PropertyAutotools.name=Autotools
+PropertyAutotools.general.name=General
+PropertyAutotools.configure.name=Configure Settings
+PropertyTabEditor.name=Editors
+AutotoolsBuildPropertyTab.name=Behaviour
+AutotoolsEditorsPropertyTab.name=Editors
+AutotoolsToolsPropertyTab.name=Tools Settings
+AutotoolsConfigurePropertyTab.name=Configure Settings
+
+PropertyTabEditor.tooltip=Set options for Autotools-specific editors
+PropertyTabBuild.tooltip=Set additional Autotools build options
+
+Makefile.builder.name=Autotools Makefile Generator
+Autotools.projecttype.name=GNU Autotools
+AutotoolsNature.name=Autotools Project Nature
+AutotoolsNewNature.name=Autotools Project Nature V2
+Configuration.build.name=Build (GNU)
+Autotools.targetplatform.name=GNU Autotools Target Platform
+Autotools.gnu.toolchain.name=GNU Autotools Toolchain
+Configure.outputType=Configure Output (config.status)
+Autogen.outputType=Autogen Output (configure)
+
+CommandCategorySource.name=Source
+CommandCategorySource.description=Source commands
+CommandCategoryTools.name=Tools
+CommandCategoryTools.description=Autotool tools
+ShowTooltip.name=Show Tooltip Description
+ShowTooltip.description=Shows the tooltip description for the element at the cursor
+
+# Scope and Key Commands
+ACeditor.scope.name=Autoconf Editor
+ACeditor.scope.description=Editor for Autoconf Configuration Source Files
+
+Tool.configure=configure
+
+OptionCategory.configure.general=General
+Option.configure.name=Name
+Option.configure.builddir=Build directory
+Option.configure.builddir.tip=Subdirectory off of project where build will occur
+Option.configure.configdir=Configure tool directory
+Option.configure.configdir.tip=Subdirectory off of project containing configure scripts
+Option.configure.cache_file=Name of configuration cache file (--cache-file)
+Option.configure.cache_file.tip=Specify the name of the configuration cache file [config.cache]
+Option.configure.no_create=Turn off file creation <not advised> (--no-create)
+Option.configure.no_create.tip=This tells configuration not to generate the output files as part of configuration
+Option.configure.quiet=Turn off checking messages (--quiet)
+Option.configure.quiet.tip=This turns off "checking ..." style messages from the configuration console output
+Option.configure.help=Display help contents of top-level configuration (--help)
+Option.configure.help.tip=Ask configuration file to display its help documentation
+Option.configure.version=Display version of autotools used to create configuration (--version)
+Option.configure.version.tip=This outputs the version of the Autotools used to create the configuration files
+
+OptionCategory.configure.platform=Platform Specifiers
+Option.configure.host=Host platform (--host)
+Option.configure.host.tip=Platform that project will run on
+Option.configure.target=Target platform (--target)
+Option.configure.target.tip=Platform that project will target output for
+Option.configure.build=Build platform (--build)
+Option.configure.build.tip=Platform where project is being built
+
+OptionCategory.configure.directories=Directory specifiers
+Option.configure.prefix=Arch-independent install directory (--prefix)
+Option.configure.prefix.tip=Place where architecture-independent files are installed [/usr/local]
+Option.configure.exec_prefix=Arch-dependent install directory (--exec-prefix)
+Option.configure.exec_prefix.tip=Place where architecture-dependent files are installed [PREFIX]
+Option.configure.libdir=Object code library directory (--libdir)
+Option.configure.libdir.tip=Place where object code libraries are installed [EPREFIX/lib]
+Option.configure.bindir=User executable directory (--bindir)
+Option.configure.bindir.tip=Place where binary executables are installed [EPREFIX/bin]
+Option.configure.sbindir=System admin executable directory (--sbindir)
+Option.configure.sbindir.tip=Place where system admin executables are installed [EPREFIX/sbin]
+Option.configure.includedir=C Header file directory (--includdir)
+Option.configure.includedir.tip=Place where header files will be installed [PREFIX/include]
+Option.configure.datadir=Read-only architecture-independent data (--datadir)
+Option.configure.datadir.tip=Place where read-only architecture-independent data is installed [PREFIX/share]
+Option.configure.sysconfdir=Read-only single-machine data directory (--syconfdir)
+Option.configure.sysconfdir.tip=Place where read-only single-machine data is stored [PREFIX/etc]
+Option.configure.infodir=Info file documentation directory (--infodir)
+Option.configure.infodir.tip=Place where info files are installed [PREFIX/info]
+Option.configure.mandir=Man file documentation directory (--mandir)
+Option.configure.mandir.tip=Place where man file documentation is installed [PREFIX/man]
+Option.configure.srcdir=Sources directory (--srcdir)
+Option.configure.srcdir.tip=Place where configure can find sources [configure directory or ..]
+Option.configure.localstatedir=Modifiable single-machine data directory (--localstatedir)
+Option.configure.localstatedir.tip=Place where modifiable single-machine data is installed [PREFIX/var]
+Option.configure.sharedstatedir=Modifiable architecture-independent data directory (--sharedstatedir)
+Option.configure.sharedstatedir.tip=Place where modifiable architecture-independent data is installed [PREFIX/com}
+Option.configure.libexecdir=Program executable directory (--libexecdir)
+Option.configure.libexecdir=Place where program executables will be installed [EPREFIX/libexec]
+Option.configure.oldincludedir=Non-gcc C header file directory (--oldincludedir)
+Option.configure.oldincludedir.tip=Place where non-gcc C header files are installed [/usr/include]
+
+OptionCategory.configure.filenames=File-name transformations
+Option.configure.program_prefix=Installed program prefix (--program-prefix)
+Option.configure.program_prefix.tip=Prepend PREFIX to the beginning of installed program names
+Option.configure.program_suffix=Installed program suffix (--program-suffix)
+Option.configure.program_suffix.tip=Append SUFFIX to the end of installed program names
+Option.configure.program_transform_name=Installed program name transform (--program-transform-name)
+Option.configure.program_transform_name.tip=A sed string used to transform installed program names
+
+OptionCategory.configure.features=Features and packages
+Option.configure.enable_maintainer_mode=Enable maintainer mode (--enable-maintainer-mode)
+Option.configure.enable_maintainer_mode.tip=Specify this to have Makefiles generated with checks for Autotool configuration file changes
+Option.configure.user=User-specified configuration options
+Option.configure.user.tip=Specify one or more configuration options (e.g. --enable-FEATURE, --disable-FEATURE, or --with-PACKAGE)
+
+Tool.autogen = autogen.sh
+
+OptionCategory.autogen.general=Options
+Option.autogen.user=Command line options
+Option.autogen.user.tip=Specify options to pass to the top-level autogen.sh script
+
+RedHatVendor.name = Red Hat
+Bundle-Name.0 = Autotools UI Plug-in (Incubation)
+provider=Eclipse
+InvokeAutotools.label = Invoke Autotools
+InvokeAutotools.mnemonic = I
+InvokeAutoconf.label = Invoke Autoconf
+InvokeAutoconf.mnemonic = c
+InvokeAutoconf.description = Run autoconf in the selected directory
+InvokeAutoheader.label = Invoke Autoheader
+InvokeAutoheader.mnemonic = h
+InvokeAutoheader.description = Run autoheader from the selected directory
+InvokeAutomake.label = Invoke Automake
+InvokeAutomake.mnemonic = m
+InvokeAutomake.description = Run automake from the selected directory
+InvokeAutoreconf.label = Invoke Autoreconf
+InvokeAutoreconf.mnemonic = r
+InvokeAutoreconf.description = Run autoreconf from the selected directory
+InvokeAclocal.label = Invoke Aclocal
+InvokeAclocal.mnemonic = l
+InvokeAclocal.description = Run aclocal from the selected directory
+InvokeLibtoolize.label = Invoke Libtoolize
+InvokeLibtoolize.mnemonic = t
+InvokeLibtoolize.description = Run libtoolize in the selected directory
+Reconfigure.label = Reconfigure Project
+Reconfigure.mnemonic = f
+Reconfigure.description = Run configuration scripts for project
+DynamicBuild.label = Dynamic Build Info
+GetIncludePath.label = Get Include Path
+GetDefinedSymbols.label = Get Defined Symbols
+IncludesOption.name = includes
+SymbolsOption.name = symbols
+AutomakeEditor.name = AutomakeEditor
+Automake.name = automake
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/plugin.xml b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/plugin.xml
new file mode 100644
index 0000000..5dbeb1d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/plugin.xml
@@ -0,0 +1,740 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+   <extension
+         point="org.eclipse.ui.newWizards">
+      <wizard
+            category="org.eclipse.cdt.ui.newCWizards"
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards.ConvertToAutotoolsProjectWizard"
+            finalPerspective="org.eclipse.cdt.ui.CPerspective"
+            hasPages="true"
+            icon="icons/ac16/convert_normal.gif"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.wizards.conversionWizard"
+            name="%ConvertWizard.name">
+         <description>
+            %ConvertWizard.description
+         </description>
+         <selection class="org.eclipse.core.resources.IProject"/>
+      </wizard>
+    <!--
+      <wizard
+            category="org.eclipse.cdt.ui.newCWizards"
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards.AutotoolsNewCProjectWizardV2"
+            finalPerspective="org.eclipse.cdt.ui.CPerspective"
+            hasPages="true"
+            icon="icons/elcl16/newc_app.gif"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.wizard.c.v2"
+            name="%NewCWizardV2.name"
+            project="true">
+         <description>
+            %NewCProjectV2.description
+         </description>
+         <selection
+               class="org.eclipse.core.resources.IProject">
+         </selection>
+      </wizard>
+      <wizard
+            category="org.eclipse.cdt.ui.newCWizards"
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards.AutotoolsNewCCProjectWizardV2"
+            finalPerspective="org.eclipse.cdt.ui.CPerspective"
+            hasPages="true"
+            icon="icons/elcl16/newcc_app.gif"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.wizard.cc.v2"
+            name="%NewCCWizardV2.name"
+            project="true">
+         <description>
+            %NewCCProjectV2.description
+         </description>
+         <selection
+               class="org.eclipse.core.resources.IProject">
+         </selection>
+      </wizard>
+    -->
+   </extension>
+   <!--
+  <extension
+        point="org.eclipse.ui.navigator.navigatorContent">
+     <commonWizard
+           associatedExtensionId="org.eclipse.cdt.ui.navigator.content"
+           menuGroupId="org.eclipse.cdt.ui.newProject"
+           type="new"
+           wizardId="org.eclipse.linuxtools.cdt.autotools.ui.wizards.conversionWizard">
+		 <enablement>
+		 	<and>
+	            <adapt type="org.eclipse.core.resources.IProject" />
+				<not>
+		            <adapt type="org.eclipse.core.resources.IProject" >
+		               <test
+		                     property="org.eclipse.core.resources.projectNature"
+		                     value="org.eclipse.linuxtools.cdt.autotools.core.autotoolsNatureV2"/>
+		            </adapt>
+				</not>
+		 	</and>
+         </enablement>
+      </commonWizard>
+  </extension>
+  <extension
+        point="org.eclipse.ui.navigator.viewer">
+     <viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
+        <includes>
+           <contentExtension pattern="org.eclipse.linuxtools.cdt.autotools.ui.wizards.*"/>
+        </includes>
+     </viewerContentBinding>
+  </extension> 
+  -->
+   <extension
+         id="org.eclipse.linuxtools.cdt.autotools.ui.popup1"
+         point="org.eclipse.ui.popupMenus">
+      <objectContribution
+            adaptable="true"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.objectContribution.autoconf"
+            nameFilter="configure.ac"
+            objectClass="org.eclipse.core.resources.IResource">
+         <action
+               class="org.eclipse.linuxtools.internal.cdt.autotools.ui.actions.InvokeAutoconfAction"
+               enablesFor="1"
+               id="org.eclipse.linuxtools.cdt.autotools.ui.action.autoconf1"
+               label="%InvokeAutoconf.label"
+               menubarPath="additions">
+         </action>
+      </objectContribution>
+      <objectContribution
+            adaptable="true"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.objectContribution.autoconf2"
+            nameFilter="configure.in"
+            objectClass="org.eclipse.core.resources.IResource">
+         <action
+               class="org.eclipse.linuxtools.internal.cdt.autotools.ui.actions.InvokeAutoconfAction"
+               enablesFor="1"
+               id="org.eclipse.linuxtools.cdt.autotools.ui.action2"
+               label="%InvokeAutoconf.label"
+               menubarPath="additions">
+         </action>
+      </objectContribution>
+   </extension>
+   <extension
+         point="org.eclipse.cdt.core.CBuildConsole">
+      <CBuildConsole
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.CConfigureConsole"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.configureConsole"/>
+      <CBuildConsole
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.CBuildStepsConsole"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.buildStepsConsole">
+      </CBuildConsole>
+      <CBuildConsole
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.AutotoolsConsole"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.autotoolsConsole">
+      </CBuildConsole>
+   </extension>
+   <extension point="org.eclipse.core.contenttype.contentTypes">
+	  <!-- declares a content type for automake files -->
+	  <content-type id="org.eclipse.linuxtools.cdt.autotools.ui.automake" name="%Automake.name" 
+		  base-type="org.eclipse.core.runtime.text"
+		  priority="high"/>
+  </extension>
+   <extension point="org.eclipse.core.contenttype.contentTypes"> 
+      <file-association 
+       content-type="org.eclipse.linuxtools.cdt.autotools.ui.automake"
+       file-names="Makefile.am"
+       file-extensions="am"/>
+   </extension>
+   <extension
+         point="org.eclipse.ui.editors">
+      <editor
+            class="org.eclipse.linuxtools.cdt.autotools.ui.editors.AutoconfEditor"
+            contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor"
+            default="true"
+            extensions="m4"
+            filenames="configure.in,configure.ac"
+            icon="icons/autoconf.gif"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.editor.autoconf"
+            name="%Autoconf.editor.name"/>
+   </extension>
+      <extension
+         id="org.eclipse.cdt.make.editor"
+         name="MakefileEditor"
+         point="org.eclipse.ui.editors">
+      <editor
+            name="%AutomakeEditor.name"
+            icon="icons/automake.gif"
+            contributorClass="org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.MakefileEditorActionContributor"
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.AutomakeEditor"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.editors.AutomakeEditor"
+            filenames="Makefile.am,Makefile.in">
+            <contentTypeBinding contentTypeId="org.eclipse.linuxtools.cdt.autotools.ui.automake"/>
+      </editor>
+   </extension>
+   <extension
+         point="org.eclipse.ui.contexts">
+      <context
+            description="%ACeditor.scope.description"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.editor.scope"
+            name="%ACeditor.scope.name"
+            parentId="org.eclipse.ui.textEditorScope"/>
+   </extension>
+   <extension
+         point="org.eclipse.ui.bindings">
+      <key
+            commandId="org.eclipse.linuxtools.cdt.autotools.ui.editors.text.show.tooltip"
+            contextId="org.eclipse.linuxtools.cdt.autotools.ui.editor.scope"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+            sequence="F2"/>
+   </extension>
+   <extension
+         point="org.eclipse.ui.commands">
+      <category
+            description="%CommandCategorySource.description"
+            id="org.eclipse.linuxtools.cdt.ui.category.source"
+            name="%CommandCategorySource.name"/>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.ui.category.source"
+            description="%ShowTooltip.description"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.editors.text.show.tooltip"
+            name="%ShowTooltip.name"/>
+   </extension>
+   <extension
+         id="parsefileerror"
+         name="Autotools Parse Error Marker"
+         point="org.eclipse.core.resources.markers">
+      <super type="org.eclipse.core.resources.problemmarker"/>
+      <super type="org.eclipse.core.resources.textmarker"/>
+      <persistent value="true"/>
+   </extension>
+   <extension
+         id="outlineparsefileerror"
+         name="Autotools Outline Page Parse Error"
+         point="org.eclipse.core.resources.markers">
+      <super type="org.eclipse.core.resources.problemmarker"/>
+      <super type="org.eclipse.core.resources.textmarker"/>
+      <persistent value="true"/>
+   </extension>
+   <extension
+         id="org.eclipse.linuxtools.cdt.autoconf.docsetup"
+         name="Autoconf Editor Setup"
+         point="org.eclipse.core.filebuffers.documentSetup">
+      <participant
+            class="org.eclipse.linuxtools.cdt.autotools.ui.editors.AutoconfDocumentSetupParticipant"
+            extensions="m4"
+            fileNames="configure.in,configure.ac"/>
+   </extension>
+   <extension
+         point="org.eclipse.ui.preferencePages">
+      <page
+            category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutotoolsPreferencePage"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.preferences1"
+            name="%PreferenceAutotools.name">
+      </page>
+      <page
+            category="org.eclipse.linuxtools.cdt.autotools.ui.preferences1"
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutomakeEditorPreferencePage"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.preferences.automake.editor1"
+            name="%PreferenceAutomakeEditor.name">
+      </page>
+      <page
+            category="org.eclipse.linuxtools.cdt.autotools.ui.preferences1"
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutoconfEditorPreferencePage"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.preferences.autoconf.editor1"
+            name="%PreferenceAutoconfEditor.name">
+      </page>
+   </extension>
+   <extension
+         point="org.eclipse.cdt.ui.cPropertyTab">
+      <tab
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.properties.AutotoolsBuildPropertyPage"
+            icon="icons/autoconf.gif"
+            name="%AutotoolsBuildPropertyTab.name"
+            parent="org.eclipse.linuxtools.internal.cdt.autotools.ui.properties.AutotoolsHeadPropertyPage"
+            tooltip="%PropertyTabBuild.tooltip"
+            weight="002">
+      </tab>
+      <tab
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.properties.AutotoolsEditorPropertyTab"
+            name="%AutotoolsEditorsPropertyTab.name"
+            parent="org.eclipse.linuxtools.internal.cdt.autotools.ui.properties.AutotoolsGeneralPropertyPage">
+      </tab>
+      <tab
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.properties.AutotoolsToolsPropertyTab"
+            name="%AutotoolsToolsPropertyTab.name"
+            parent="org.eclipse.linuxtools.internal.cdt.autotools.ui.properties.AutotoolsGeneralPropertyPage">
+      </tab>
+      <tab
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.properties.AutotoolsConfigurePropertyTab"
+            name="%AutotoolsConfigurePropertyTab.name"
+            parent="org.eclipse.linuxtools.internal.cdt.autotools.ui.properties.AutotoolsConfigurePropertyPage">
+      </tab>
+   </extension>
+   <extension
+         point="org.eclipse.ui.propertyPages">
+       <page
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.properties.AutotoolsHeadPropertyPage"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.propertypage"
+            name="%PropertyAutotools.name"
+            >
+          <filter
+               name="projectNature"
+               value="org.eclipse.linuxtools.cdt.autotools.core.autotoolsNatureV2">
+          </filter>
+          <enabledWhen>
+             <or>
+		       <instanceof value="org.eclipse.core.resources.IProject"/>
+		       <instanceof value="org.eclipse.cdt.core.model.ICProject"/>
+		     
+		       <instanceof value="org.eclipse.core.resources.IFolder"/>
+		       <instanceof value="org.eclipse.cdt.core.model.ICContainer"/>
+
+         	   <instanceof value="org.eclipse.cdt.core.model.ITranslationUnit"/>
+	           <instanceof value="org.eclipse.core.resources.IFile"/>
+		     </or>          
+          </enabledWhen>
+       </page>
+       <page
+            category="org.eclipse.linuxtools.cdt.autotools.ui.propertypage"
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.properties.AutotoolsGeneralPropertyPage"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.propertypage2"
+            name="%PropertyAutotools.general.name">
+          <filter
+               name="projectNature"
+               value="org.eclipse.linuxtools.cdt.autotools.core.autotoolsNatureV2">
+          </filter>
+       </page>
+       <page
+            category="org.eclipse.linuxtools.cdt.autotools.ui.propertypage"
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.properties.AutotoolsConfigurePropertyPage"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.propertypage3"
+            name="%PropertyAutotools.configure.name">
+          <filter
+               name="projectNature"
+               value="org.eclipse.linuxtools.cdt.autotools.core.autotoolsNatureV2">
+          </filter>
+      </page>
+    </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            locationURI="menu:project?after=additions">
+         <menu
+               id="invokeAutotools"
+               label="%InvokeAutotools.label"
+               mnemonic="%InvokeAutotools.mnemonic">
+            <visibleWhen
+                  checkEnabled="false">
+               <and>
+                  <count
+                        value="1">
+                  </count>
+                  <iterate
+                        ifEmpty="false"
+                        operator="and">
+                     <adapt
+                           type="org.eclipse.core.resources.IResource">
+                        <test
+                              property="org.eclipse.core.resources.projectNature"
+                              value="org.eclipse.linuxtools.cdt.autotools.core.autotoolsNatureV2">
+                        </test>
+                     </adapt>
+                  </iterate>
+               </and>
+            </visibleWhen>
+         </menu>
+      </menuContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            locationURI="menu:project?after=additions">
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.reconfigure"
+               id="reconfigure"
+               label="%Reconfigure.label"
+               mnemonic="%Reconfigure.mnemonic"
+               style="push">
+            <visibleWhen
+                  checkEnabled="false">
+               <and>
+                  <count
+                        value="1">
+                  </count>
+                  <iterate
+                        ifEmpty="false"
+                        operator="and">
+                     <adapt
+                           type="org.eclipse.core.resources.IResource">
+                        <test
+                              property="org.eclipse.core.resources.projectNature"
+                              value="org.eclipse.linuxtools.cdt.autotools.core.autotoolsNatureV2">
+                        </test>
+                     </adapt>
+                  </iterate>
+               </and>
+            </visibleWhen>
+         </command>
+       </menuContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            locationURI="menu:invokeAutotools">
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.autoconf"
+               id="autoconf"
+               label="%InvokeAutoconf.label"
+               mnemonic="%InvokeAutoconf.mnemonic"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.autoheader"
+               id="autoheader"
+               label="%InvokeAutoheader.label"
+               mnemonic="%InvokeAutoheader.mnemonic"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.automake"
+               id="automake"
+               label="%InvokeAutomake.label"
+               mnemonic="%InvokeAutomake.mnemonic"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.autoreconf"
+               id="autoreconf"
+               label="%InvokeAutoreconf.label"
+               mnemonic="%InvokeAutoreconf.mnemonic"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.aclocal"
+               id="aclocal"
+               label="%InvokeAclocal.label"
+               mnemonic="%InvokeAclocal.mnemonic"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.libtoolize"
+               id="libtoolize"
+               label="%InvokeLibtoolize.label"
+               mnemonic="%InvokeLibtoolize.mnemonic"
+               style="push">
+         </command>
+      </menuContribution>
+   </extension>
+   <extension
+         id="org.eclipse.linuxtools.cdt.autotools.ui.commands"
+         name="Autoconf"
+         point="org.eclipse.ui.commands">
+      <category
+            id="org.eclipse.linuxtools.cdt.autotools.ui.category.invokeAutotools"
+            name="%InvokeAutotools.label">
+      </category>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.ui.category.invokeAutotools"
+            description="%InvokeAutoconf.description"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.command.autoconf"
+            name="%InvokeAutoconf.label">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.ui.category.invokeAutotools"
+            description="%InvokeAutoheader.description"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.command.autoheader"
+            name="%InvokeAutoheader.label">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.ui.category.invokeAutotools"
+            description="%InvokeAutomake.description"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.command.automake"
+            name="%InvokeAutomake.label">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.ui.category.invokeAutotools"
+            description="%InvokeAutoreconf.description"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.command.autoreconf"
+            name="%InvokeAutoreconf.label">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.ui.category.invokeAutotools"
+            description="%InvokeAclocal.description"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.command.aclocal"
+            name="%InvokeAclocal.label">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.ui.category.invokeAutotools"
+            description="%InvokeLibtoolize.description"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.command.libtoolize"
+            name="%InvokeLibtoolize.label">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.ui.category.invokeAutotools"
+            description="%Reconfigure.description"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.command.reconfigure"
+            name="%Reconfigure.label">
+      </command>
+   </extension>
+    <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.actions.AutoconfHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.autoconf">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.actions.AutoheaderHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.autoheader">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.actions.AutomakeHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.automake">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.actions.AutoreconfHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.autoreconf">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.actions.AclocalHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.aclocal">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.actions.LibtoolizeHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.libtoolize">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.actions.ReconfigureHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.reconfigure">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+   </extension>
+    <extension
+          point="org.eclipse.cdt.core.templates">
+       <template
+             id="org.eclipse.linuxtools.cdt.autotools.ui.template.emptyProject"
+             location="templates/projecttemplates/EmptyProject/template.xml"
+             projectType="org.eclipse.linuxtools.cdt.autotools.core.projectType">
+       </template>
+       <template
+             filterPattern=".*gcc"
+             id="org.eclipse.linuxtools.cdt.autotools.ui.template.helloWorldCProject"
+             location="templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml"
+             projectType="org.eclipse.linuxtools.cdt.autotools.core.projectType">
+       </template>
+       <template
+             filterPattern=".*g\+\+"
+             id="org.eclipse.linuxtools.cdt.autotools.ui.template.helloWorldCPPProject"
+             location="templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml"
+             projectType="org.eclipse.linuxtools.cdt.autotools.core.projectType">
+       </template>
+    </extension>
+    <extension
+          point="org.eclipse.cdt.ui.CDTWizard">
+       <wizard
+             class="org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards.AutotoolsBuildWizard"
+             name="%Autotools.wizard.name">
+       </wizard>
+    </extension>
+</plugin>
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/AutotoolsUIPlugin.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/AutotoolsUIPlugin.java
new file mode 100644
index 0000000..0f80cee
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/AutotoolsUIPlugin.java
@@ -0,0 +1,257 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui;
+
+import java.lang.reflect.InvocationTargetException;
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class AutotoolsUIPlugin extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.cdt.autotools.ui"; //$NON-NLS-1$
+
+	// The shared instance
+	private static AutotoolsUIPlugin plugin;
+	
+	private ResourceBundle resourceBundle;
+	
+	/**
+	 * The constructor.
+	 */
+	public AutotoolsUIPlugin() {
+		plugin = this;
+		try {
+			resourceBundle = ResourceBundle.getBundle(PLUGIN_ID + ".Resources"); //$NON-NLS-1$
+		} catch (MissingResourceException x) {
+			resourceBundle = null;
+		}
+
+	}
+
+	public static String getPluginId() {
+		return PLUGIN_ID;
+	}
+	
+	public static String getUniqueIdentifier() {
+		if (getDefault() == null) {
+			// If the default instance is not yet initialized,
+			// return a static identifier. This identifier must
+			// match the plugin id defined in plugin.xml
+			return PLUGIN_ID;
+		}
+		return getDefault().getBundle().getSymbolicName();
+	}
+
+	/**
+	 * This method is called upon plug-in activation
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+	}
+
+	/**
+	 * This method is called when the plug-in is stopped
+	 */
+	public void stop(BundleContext context) throws Exception {
+		super.stop(context);
+		plugin = null;
+	}
+
+	/**
+	 * Returns the shared instance.
+	 */
+	public static AutotoolsUIPlugin getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Returns active shell.
+	 */
+	public static Shell getActiveWorkbenchShell() {
+		IWorkbenchWindow window = getDefault().getWorkbench().getActiveWorkbenchWindow();
+		if (window != null) {
+			return window.getShell();
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the string from the plugin's resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @return the resource bundle message
+	 */
+	public static String getResourceString(String key) {
+		ResourceBundle bundle = AutotoolsUIPlugin.getDefault().getResourceBundle();
+		try {
+			return bundle.getString(key);
+		} catch (MissingResourceException e) {
+			return key;
+		}
+	}
+
+	/**
+	 * Returns the string from the plugin's resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @param args an array of substituition strings
+	 * @return the resource bundle message
+	 */
+	public static String getFormattedString(String key, String[] args) {
+		return MessageFormat.format(getResourceString(key), (Object[])args);
+	}
+
+	/**
+	 * Returns the plugin's resource bundle,
+	 */
+	public ResourceBundle getResourceBundle() {
+		return resourceBundle;
+	}
+
+	/**
+	 * Returns an image descriptor for the image file at the given
+	 * plug-in relative path.
+	 *
+	 * @param path the path
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
+	}
+	
+	public static void log(IStatus status) {
+		ResourcesPlugin.getPlugin().getLog().log(status);
+	}
+
+	public static void logErrorMessage(String message) {
+		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, message, null));
+	}
+
+	public static void logException(Throwable e, final String title, String message) {
+		if (e instanceof InvocationTargetException) {
+			e = ((InvocationTargetException) e).getTargetException();
+		}
+		IStatus status = null;
+		if (e instanceof CoreException)
+			status = ((CoreException) e).getStatus();
+		else {
+			if (message == null)
+				message = e.getMessage();
+			if (message == null)
+				message = e.toString();
+			status = new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.OK, message, e);
+		}
+		ResourcesPlugin.getPlugin().getLog().log(status);
+		Display display;
+		display = Display.getCurrent();
+		if (display == null)
+			display = Display.getDefault();
+		final IStatus fstatus = status;
+		display.asyncExec(new Runnable() {
+			public void run() {
+				ErrorDialog.openError(null, title, null, fstatus);
+			}
+		});
+	}
+
+	public static void logException(Throwable e) {
+		logException(e, null, null);
+	}
+
+	public static void log(Throwable e) {
+		if (e instanceof InvocationTargetException)
+			e = ((InvocationTargetException) e).getTargetException();
+		IStatus status = null;
+		if (e instanceof CoreException)
+			status = ((CoreException) e).getStatus();
+		else
+			status = new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.OK, e.getMessage(), e);
+		log(status);
+	}
+
+	/**
+	* Utility method with conventions
+	*/
+	public static void errorDialog(Shell shell, String title, String message, IStatus s) {
+		log(s);
+		// if the 'message' resource string and the IStatus' message are the same,
+		// don't show both in the dialog
+		if (s != null && message.equals(s.getMessage())) {
+			message = null;
+		}
+		ErrorDialog.openError(shell, title, message, s);
+	}
+
+	/**
+	* Utility method with conventions
+	*/
+	public static void errorDialog(Shell shell, String title, String message, Throwable t) {
+		log(t);
+		IStatus status;
+		if (t instanceof CoreException) {
+			status = ((CoreException) t).getStatus();
+			// if the 'message' resource string and the IStatus' message are the same,
+			// don't show both in the dialog
+			if (status != null && message.equals(status.getMessage())) {
+				message = null;
+			}
+		} else {
+			status = new Status(IStatus.ERROR, AutotoolsUIPlugin.getUniqueIdentifier(), -1, "Internal Error: ", t); //$NON-NLS-1$	
+		}
+		ErrorDialog.openError(shell, title, message, status);
+	}
+	
+	/**
+	 * Returns the workspace instance.
+	 */
+	public static IWorkspace getWorkspace() {
+		return ResourcesPlugin.getWorkspace();
+	}
+
+	/**
+	 * Returns the active workbench window or <code>null</code> if none
+	 */
+	public static IWorkbenchWindow getActiveWorkbenchWindow() {
+		return getDefault().getWorkbench().getActiveWorkbenchWindow();
+	}
+
+	/**
+	 * Returns the active workbench page or <code>null</code> if none.
+	 */
+	public static IWorkbenchPage getActivePage() {
+		IWorkbenchWindow window= getActiveWorkbenchWindow();
+		if (window != null) {
+			return window.getActivePage();
+		}
+		return null;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/Resources.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/Resources.properties
new file mode 100644
index 0000000..84ce7c0
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/Resources.properties
@@ -0,0 +1,105 @@
+#################################################################################
+#  Copyright (c) 2006, 2007, 2009 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+# 
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#      IBM Rational Software - ManagedMakeMessages copied to AutotoolsMakefileBuilder
+#################################################################################
+MakeCWizard.title=C/Make Project
+MakeCWizard.description=Create a New C Project using 'make' to build it
+
+WARNING_UNSUPPORTED_CONFIGURATION=Warning: unsupported configuration
+
+AutotoolsMakefileBuilder.message.finished=Build complete for project {0}
+AutotoolsMakefileBuilder.message.stopped=Build stopped
+AutotoolsMakefileBuilder.type.clean=Clean-only build
+AutotoolsMakefileBuilder.message.clean.deleting.output=Removing build artifacts from {0}
+AutotoolsMakefileBuilder.message.console.header=**** {0} of configuration {1} for project {2} ****
+
+MakeGenerator.makefile.built=Makefile built
+MakeGenerator.refresh=Refresh
+MakeGenerator.refresh.error=Refresh error
+MakeGenerator.generation.error=Configuration failed with error
+MakeGenerator.configuring=Configuring
+MakeGenerator.make.message=Invoking {0} for project {1}
+MakeGenerator.config.error=Error {0} occurred while running {1}
+MakeGenerator.createdir.error=Error creating build directory: {0}
+MakeGenerator.run.config.status=Running config.status in build directory: {0}
+MakeGenerator.makefile.cvs=Invoking Makefile.cvs in build directory: {0}
+MakeGenerator.autogen.sh=Invoking autogen.sh in build directory: {0}
+MakeGenerator.autoreconf=Invoking autoreconf in directory: {0}
+MakeGenerator.gen.makefile=Generating Makefile in build directory: {0}
+MakeGenerator.clean.builddir=Cleaning build directory: {0}
+MakeGenerator.gen.configure=Generating configure
+MakeGenerator.unsupportedConfig=Warning: unsupported configuration {0}
+MakeGenerator.success=[Operation successful]
+MakeGenerator.didnt.generate=No Makefile generated
+MakeGenerator.refresh.MakeTargets=Refreshing Make Targets
+
+BuildDir.apply=Build directory already in use
+BuildDir.default=Default build directory to unused value?
+BuildDir.yes=Yes
+BuildDir.no=No
+
+WizardAutotoolsProjectConversion.title=Convert to C/C++ Autotools Project
+WizardAutotoolsProjectConversion.description=Convert an existing Project to a C/C++ Autotools Project
+WizardAutotoolsProjectConversion.message.add_nature=Adding C/C++ Autotools Managed Project Nature
+WizardAutotoolsProjectConversion.message.add_builder=Adding C/C++ Autotools Managed Project Builder
+WizardMakeProjectConversion.monitor.convertingToMakeProject=Converting Project...
+WizardAutotoolsConversion=C/C++ Autotools Conversion
+WizardAutotoolsConversion.windowTitle=Conversion to a C/C++ Autotools Project
+WizardAutotoolsConversion.config.title=Select a configuration
+WizardAutotoolsConversion.config.desc=Select the configuration you wish to deploy on
+WizardAutotoolsConversion.options.title=Additional Project Settings
+WizardAutotoolsConversion.options.desc=Define the inter-project dependencies, if any.
+WizardAutotoolsConversion.message.save=Saving new build options
+
+WizardAutotoolsNewCProject.title=Autotools C Project
+WizardAutotoolsNewCProject.description=Create a new C Autotools project
+WizardAutotoolsNewCProject.monitor.creatingProject=Creating Project...
+WizardAutotoolsNewCProject.windowTitle=GNU Autotools C Project
+WizardAutotoolsNewCProject.config.title=Select a configuration
+WizardAutotoolsNewCProject.config.desc=Select the configuration you wish to deploy on
+WizardAutotoolsNewCProject.options.title=Additional Project Settings
+WizardAutotoolsNewCProject.options.desc=Define the inter-project dependencies, if any.
+WizardAutotoolsNewCProject.message.save=Saving new build options
+
+WizardAutotoolsNewCProjectV2.title=Autotools C Project V2
+WizardAutotoolsNewCProjectV2.description=Create a new C Autotools project
+WizardAutotoolsNewCProjectV2.monitor.creatingProject=Creating Project...
+WizardAutotoolsNewCProjectV2.windowTitle=GNU Autotools C Project V2
+WizardAutotoolsNewCProjectV2.config.title=Select a configuration
+WizardAutotoolsNewCProjectV2.config.desc=Select the configuration you wish to deploy on
+WizardAutotoolsNewCProjectV2.options.title=Additional Project Settings
+WizardAutotoolsNewCProjectV2.options.desc=Define the inter-project dependencies, if any.
+WizardAutotoolsNewCProjectV2.message.save=Saving new build options
+
+WizardAutotoolsNewCCProject.title=Autotools C++ Project
+WizardAutotoolsNewCCProject.description=Create a new C++ Autotools project
+WizardAutotoolsNewCCProject.monitor.creatingProject=Creating Project...
+WizardAutotoolsNewCCProject.windowTitle=GNU Autotools C++ Project
+WizardAutotoolsNewCCProject.config.title=Select a configuration
+WizardAutotoolsNewCCProject.config.desc=Select the configuration you wish to deploy on
+WizardAutotoolsNewCCProject.options.title=Additional Project Settings
+WizardAutotoolsNewCCProject.options.desc=Define the inter-project dependencies, if any.
+WizardAutotoolsNewCCProject.message.save=Saving new build options
+
+
+BuildTargetDialog.title.buildTarget=Build Special Targets
+BuildTargetDialog.title.makeTargetsFor=Make targets for 
+BuildTargetDialog.button.build=Build
+
+TargetListViewer.button.add=Add...
+TargetListViewer.button.remove=Remove
+TargetListViewer.button.edit=Edit...
+TargetListViewer.label.target=Target
+TargetListViewer.label.location=Location
+TargetListViewer.exception.error=Error
+TargetListViewer.exception.message=An error occurred performing the selected action
+
+AutotoolsPreferencePage.useAutotoolsFileScanner.label=Use make -w for includepath scanning
+MakeTargetPreferencePage.buildTargetInBackground.label=Build target in background
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfAnnotationHover.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfAnnotationHover.java
new file mode 100644
index 0000000..444cef3
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfAnnotationHover.java
@@ -0,0 +1,202 @@
+/*******************************************************************************
+ * Copyright (c) 2000 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.DefaultInformationControl;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IInformationControl;
+import org.eclipse.jface.text.IInformationControlCreator;
+import org.eclipse.jface.text.Position;
+import org.eclipse.jface.text.source.IAnnotationHover;
+import org.eclipse.jface.text.source.IAnnotationHoverExtension;
+import org.eclipse.jface.text.source.IAnnotationModel;
+import org.eclipse.jface.text.source.ILineRange;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.LineRange;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.HTMLPrinter;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.texteditor.MarkerAnnotation;
+
+
+public class AutoconfAnnotationHover implements IAnnotationHover, IAnnotationHoverExtension {
+	
+	/**
+	 * Returns the distance to the ruler line.
+	 */
+	protected int compareRulerLine(Position position, IDocument document, int line) {
+		
+		if (position.getOffset() > -1 && position.getLength() > -1) {
+			try {
+				int markerLine= document.getLineOfOffset(position.getOffset());
+				if (line == markerLine)
+					return 1;
+				if (markerLine <= line && line <= document.getLineOfOffset(position.getOffset() + position.getLength()))
+					return 2;
+			} catch (BadLocationException x) {
+			}
+		}
+		
+		return 0;
+	}
+	
+	/**
+	 * Selects a set of markers from the two lists. By default, it just returns
+	 * the set of exact matches.
+	 */
+	protected List<IMarker> select(List<IMarker> exactMatch, List<IMarker> including) {
+		return exactMatch;
+	}
+
+	/**
+	 * Returns one marker which includes the ruler's line of activity.
+	 */
+	@SuppressWarnings("unchecked")
+	protected List<IMarker> getMarkersForLine(ISourceViewer viewer, int line) {
+		
+		IDocument document= viewer.getDocument();
+		IAnnotationModel model= viewer.getAnnotationModel();
+		
+		if (model == null)
+			return null;
+			
+		List<IMarker> exact= new ArrayList<IMarker>();
+		List<IMarker> including= new ArrayList<IMarker>();
+		
+		Iterator e= model.getAnnotationIterator();
+		while (e.hasNext()) {
+			Object o= e.next();
+			if (o instanceof MarkerAnnotation) {
+				MarkerAnnotation a= (MarkerAnnotation) o;
+				switch (compareRulerLine(model.getPosition(a), document, line)) {
+					case 1:
+						exact.add(a.getMarker());
+						break;
+					case 2:
+						including.add(a.getMarker());
+						break;
+				}
+			}
+		}
+		
+		return select(exact, including);
+	}
+
+	/*
+	 * @see IVerticalRulerHover#getHoverInfo(ISourceViewer, int)
+	 */
+	public String getHoverInfo(ISourceViewer sourceViewer, int lineNumber) {
+		List<IMarker> markers= getMarkersForLine(sourceViewer, lineNumber);
+		if (markers != null && markers.size() > 0) {
+			
+			if (markers.size() == 1) {
+				
+				// optimization
+				IMarker marker= (IMarker) markers.get(0);
+				String message= marker.getAttribute(IMarker.MESSAGE, (String) null);
+				if (message != null && message.trim().length() > 0)
+					return formatSingleMessage(message);
+					
+			} else {
+					
+				List<String> messages= new ArrayList<String>();
+				
+				Iterator<IMarker> e= markers.iterator();
+				while (e.hasNext()) {
+					IMarker marker= (IMarker) e.next();
+					String message= marker.getAttribute(IMarker.MESSAGE, (String) null);
+					if (message != null && message.trim().length() > 0)
+						messages.add(message.trim());
+				}
+				
+				if (messages.size() == 1)
+					return formatSingleMessage((String) messages.get(0));
+					
+				if (messages.size() > 1)
+					return formatMultipleMessages(messages);
+			}
+		}
+		
+		return null;
+	}
+		
+	
+//	private int getHoverWidth(Display display) {
+//		Rectangle displayBounds= display.getBounds();
+//		int hoverWidth= displayBounds.width - (display.getCursorLocation().x - displayBounds.x);
+//		hoverWidth-= 12; // XXX: Add some space to the border, Revisit
+//		if (hoverWidth < 200) {
+//			hoverWidth= 200;
+//		}
+//		return hoverWidth;
+//	}	
+	
+	/*
+	 * Formats a message as HTML text.
+	 */
+	private String formatSingleMessage(String message) {
+		StringBuffer buffer= new StringBuffer();
+		HTMLPrinter.addPageProlog(buffer);
+		HTMLPrinter.addParagraph(buffer, HTMLPrinter.convertToHTMLContent(message));
+		HTMLPrinter.addPageEpilog(buffer);
+		return buffer.toString();
+	}
+	
+	/*
+	 * Formats several message as HTML text.
+	 */
+	private String formatMultipleMessages(List<String> messages) {
+		StringBuffer buffer= new StringBuffer();
+		HTMLPrinter.addPageProlog(buffer);
+		HTMLPrinter.addParagraph(buffer, HTMLPrinter.convertToHTMLContent(AutoconfEditorMessages.getString("AutoconfAnnotationHover.multipleMarkers"))); //$NON-NLS-1$
+		
+		HTMLPrinter.startBulletList(buffer);
+		Iterator<String> e= messages.iterator();
+		while (e.hasNext())
+			HTMLPrinter.addBullet(buffer, HTMLPrinter.convertToHTMLContent((String) e.next()));
+		HTMLPrinter.endBulletList(buffer);	
+		
+		HTMLPrinter.addPageEpilog(buffer);
+		return buffer.toString();
+	}
+	
+	// IAnnotationHoverExtension members
+	// We need to use the extension to get a Hover Control Creator which
+	// handles html.
+	
+	
+	public IInformationControlCreator getHoverControlCreator() {
+		return new IInformationControlCreator() {
+			public IInformationControl createInformationControl(Shell parent) {
+				return new DefaultInformationControl(parent, false);
+			}
+		};
+	}
+	
+	public boolean canHandleMouseCursor() {
+		return false;
+	}
+	
+	public ILineRange getHoverLineRange(ISourceViewer viewer, int lineNumber) {
+		return new LineRange(lineNumber, 1);
+	}
+	
+	public Object getHoverInfo(ISourceViewer sourceViewer, ILineRange lineRange, int visibleNumberOfLines) {
+		return getHoverInfo(sourceViewer, lineRange.getStartLine());
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfCodeScanner.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfCodeScanner.java
new file mode 100644
index 0000000..51e7e9e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfCodeScanner.java
@@ -0,0 +1,256 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat, Inc., (c) 2008 NOKIA Inc
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *     Ed Swartz (NOKIA) - updates
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.resource.StringConverter;
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.rules.EndOfLineRule;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
+import org.eclipse.jface.text.rules.SingleLineRule;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.jface.text.rules.WhitespaceRule;
+import org.eclipse.jface.text.rules.WordRule;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutotoolsEditorPreferenceConstants;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.ColorManager;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+
+
+public class AutoconfCodeScanner extends RuleBasedScanner {
+
+	private Map<String, IToken> fTokenMap= new HashMap<String, IToken>();
+	private String[] fPropertyNamesColor;
+	
+	/**
+	 * Preference keys for boolean preferences which are <code>true</code>,
+	 * iff the corresponding token should be rendered bold. 
+	 */
+	private String[] fPropertyNamesBold;
+	/**
+	 * Preference keys for boolean preferences which are <code>true</code>,
+	 * iff the corresponding token should be rendered italic.
+	 */
+	private String[] fPropertyNamesItalic;
+
+	private static String[] keywords = { 
+		"case", "do", "done", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
+		"esac",	"if", "elif", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		"else",	"fi", "for",  //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		"in", "then" };       //$NON-NLS-1$ //$NON-NLS-2$
+
+	public static final String[] fTokenProperties = new String[] {
+		ColorManager.AUTOCONF_COMMENT_COLOR,
+		ColorManager.AUTOCONF_KEYWORD_COLOR,
+		ColorManager.AUTOCONF_ACMACRO_COLOR,
+		ColorManager.AUTOCONF_AMMACRO_COLOR,
+		ColorManager.AUTOCONF_VAR_REF_COLOR,
+		ColorManager.AUTOCONF_VAR_SET_COLOR,
+		ColorManager.AUTOCONF_CODESEQ_COLOR,
+		ColorManager.AUTOCONF_DEFAULT_COLOR,
+	};
+
+	public AutoconfCodeScanner() {
+		
+		initialize();
+		
+		IToken other= getToken(ColorManager.AUTOCONF_DEFAULT_COLOR);
+		IToken keyword = getToken(ColorManager.AUTOCONF_KEYWORD_COLOR);
+		IToken comment= getToken(ColorManager.AUTOCONF_COMMENT_COLOR);
+		IToken string = getToken(ColorManager.AUTOCONF_DEFAULT_COLOR);
+		IToken varRef = getToken(ColorManager.AUTOCONF_VAR_REF_COLOR);
+		IToken acmacro = getToken(ColorManager.AUTOCONF_ACMACRO_COLOR);
+		IToken ammacro = getToken(ColorManager.AUTOCONF_AMMACRO_COLOR);
+		IToken code = getToken(ColorManager.AUTOCONF_CODESEQ_COLOR);
+		
+		List<IRule> rules= new ArrayList<IRule>();
+
+		// Add rule for single line comments.
+		rules.add(new EndOfLineRule("dnl", comment)); //$NON-NLS-1$
+		rules.add(new EndOfLineRule("#", comment, '\\')); //$NON-NLS-1$
+		
+		// Add special recursive rule for strings which allows variable
+		// references to be internally tokenized.
+		RecursiveSingleLineRule stringRule =
+			new RecursiveSingleLineRule("\"", "\"", string, '\\'); //$NON-NLS-1$ //$NON-NLS-2$
+		stringRule.addRule(new SingleLineRule("${", "}", varRef)); //$NON-NLS-1$ //$NON-NLS-2$
+		rules.add(stringRule);
+		
+		// Add rule for variable references
+		rules.add(new SingleLineRule("${", "}", varRef)); //$NON-NLS-1$ //$NON-NLS-2$
+		// Add rule for strings
+		rules.add(new SingleLineRule("\"", "\"", string, '\\')); //$NON-NLS-1$ //$NON-NLS-2$
+
+		// Add rule for PKG_ macros
+		rules.add(new AutoconfMacroRule("PKG_", new AutoconfPKGWordDetector(), acmacro)); //$NON-NLS-1$
+
+		// Add rule for AC_ macros
+		rules.add(new AutoconfMacroRule("AC_", new AutoconfMacroWordDetector(), acmacro)); //$NON-NLS-1$
+
+		// Add rule for AM_ macros
+		rules.add(new AutoconfMacroRule("AM_", new AutoconfMacroWordDetector(), ammacro)); //$NON-NLS-1$
+
+		// Add rule for m4_ macros
+		rules.add(new AutoconfMacroRule("m4_", new AutoconfM4WordDetector(), acmacro)); //$NON-NLS-1$
+		
+		// Add rule for code sequences starting with <<EOF and ending with EOF
+		rules.add(new InlineDataRule(code));
+		
+		// Add word rule for keywords.
+		WordRule wordRule= new WordRule(new AutoconfWordDetector(), Token.UNDEFINED);
+		for (int i= 0; i < keywords.length; i++)
+			wordRule.addWord(keywords[i], keyword);
+		rules.add(wordRule);
+		
+		// Add word rule for identifier.
+		rules.add(new AutoconfIdentifierRule(other));
+		
+		// Make sure we don't treat "\#" as comment start.
+		rules.add(new SingleLineRule("\\#", null, Token.UNDEFINED));
+		
+		rules.add(new WhitespaceRule(new AutoconfWhitespaceDetector()));
+		
+		setDefaultReturnToken(other);
+
+		IRule[] result= new IRule[rules.size()];
+		rules.toArray(result);
+		setRules(result);
+	}
+	
+	protected Token getToken(String key) {
+		return (Token) fTokenMap.get(key);
+	}
+
+	private void addToken(String colorKey, String boldKey, String italicKey) {
+		fTokenMap.put(colorKey, new Token(createTextAttribute(colorKey, boldKey, italicKey)));
+	}
+
+	protected String[] getTokenProperties() {
+		return fTokenProperties;
+	}
+	
+	private int indexOf(String property) {
+		if (property != null) {
+			int length= fPropertyNamesColor.length;
+			for (int i= 0; i < length; i++) {
+				if (property.equals(fPropertyNamesColor[i]) || property.equals(fPropertyNamesBold[i]) || property.equals(fPropertyNamesItalic[i]))
+					return i;
+			}
+		}
+		return -1;
+	}
+	
+	/*
+	 * @see ITokenScanner#nextToken()
+	 */
+	public IToken nextToken() {
+		return super.nextToken();
+	}
+
+	public boolean affectsBehavior(PropertyChangeEvent event) {
+		return indexOf(event.getProperty()) >= 0;
+	}
+	
+	public void adaptToPreferenceChange(PropertyChangeEvent event) {
+		String p= event.getProperty();
+		int index= indexOf(p);
+		Token token= getToken(fPropertyNamesColor[index]);
+		if (fPropertyNamesColor[index].equals(p))
+			adaptToColorChange(event, token);
+		else if (fPropertyNamesBold[index].equals(p))
+			adaptToStyleChange(event, token, SWT.BOLD);
+		else if (fPropertyNamesItalic[index].equals(p))
+			adaptToStyleChange(event, token, SWT.ITALIC);
+	}
+
+	protected void adaptToColorChange(PropertyChangeEvent event, Token token) {
+		RGB rgb= null;
+		Object value= event.getNewValue();
+		if (value instanceof RGB) {
+			rgb= (RGB) value;
+		} else if (value instanceof String) {
+			rgb= StringConverter.asRGB((String) value);
+		}
+			
+		if (rgb != null) {
+			TextAttribute attr= (TextAttribute) token.getData();
+			token.setData(new TextAttribute(ColorManager.getDefault().getColor(rgb), attr.getBackground(), attr.getStyle()));
+		}
+	}
+
+	protected void adaptToStyleChange(PropertyChangeEvent event, Token token, int styleAttribute) {
+	 	if (token == null) {
+			return;
+		}
+		boolean eventValue= false;
+		Object value= event.getNewValue();
+		if (value instanceof Boolean) {
+			eventValue= ((Boolean) value).booleanValue();
+		} else if (IPreferenceStore.TRUE.equals(value)) {
+			eventValue= true;
+		}
+		
+		TextAttribute attr= (TextAttribute) token.getData();
+		boolean activeValue= (attr.getStyle() & styleAttribute) == styleAttribute;
+		if (activeValue != eventValue) { 
+			token.setData(new TextAttribute(attr.getForeground(), attr.getBackground(), eventValue ? attr.getStyle() | styleAttribute : attr.getStyle() & ~styleAttribute));
+		}
+	}
+
+	protected TextAttribute createTextAttribute(String colorID, String boldKey, String italicKey) {
+		Color color= null;
+		if (colorID != null) {
+			color= AutoconfEditor.getPreferenceColor(colorID);
+		}
+		IPreferenceStore store= AutotoolsPlugin.getDefault().getPreferenceStore();
+		int style= store.getBoolean(boldKey) ? SWT.BOLD : SWT.NORMAL;
+		if (store.getBoolean(italicKey)) {
+			style |= SWT.ITALIC;
+		}		
+		return new TextAttribute(color, null, style);
+	}
+	
+	/**
+	 * Must be called after the constructor has been called.
+	 */
+	public final void initialize() {
+		
+		fPropertyNamesColor= getTokenProperties();
+		int length= fPropertyNamesColor.length;
+		fPropertyNamesBold= new String[length];
+		fPropertyNamesItalic= new String[length];
+
+		for (int i= 0; i < length; i++) {
+			fPropertyNamesBold[i]= fPropertyNamesColor[i] + AutotoolsEditorPreferenceConstants.EDITOR_BOLD_SUFFIX;
+			fPropertyNamesItalic[i]= fPropertyNamesColor[i] + AutotoolsEditorPreferenceConstants.EDITOR_ITALIC_SUFFIX;
+			addToken(fPropertyNamesColor[i], fPropertyNamesBold[i], fPropertyNamesItalic[i]);
+		}
+	}
+
+	/*
+	 * @see ICharacterScanner#unread()
+	 */
+	public void unread() {
+	    	--fOffset;
+	    	fColumn = UNDEFINED;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentProvider.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentProvider.java
new file mode 100644
index 0000000..dd7c38c
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentProvider.java
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import java.util.Iterator;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.ui.editors.text.TextFileDocumentProvider;
+
+public class AutoconfDocumentProvider extends TextFileDocumentProvider {
+	
+	@SuppressWarnings("unchecked")
+	public void shutdown() {
+		Iterator e= getConnectedElementsIterator();
+		while (e.hasNext())
+			disconnect(e.next());
+	}
+	
+	public void connect(Object element) throws CoreException {
+		super.connect(element);
+		// Remove all error markers for file as we will parse
+		// from scratch.
+//		AutoconfErrorHandler h = new AutoconfErrorHandler(getDocument(element));
+//		h.removeAllExistingMarkers();
+	}
+	
+	public IDocument getDocument(Object element) {
+		FileInfo info= (FileInfo) getFileInfo(element);
+		if (info != null)
+			return info.fTextFileBuffer.getDocument();
+		return getParentProvider().getDocument(element);
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentSetupParticipant.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentSetupParticipant.java
new file mode 100644
index 0000000..a3d0b1b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentSetupParticipant.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.core.filebuffers.IDocumentSetupParticipant;
+import org.eclipse.jface.text.DocumentEvent;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IDocumentExtension3;
+import org.eclipse.jface.text.IDocumentListener;
+
+public class AutoconfDocumentSetupParticipant implements
+		IDocumentSetupParticipant, IDocumentListener {
+
+	public void setup(IDocument document) {
+		AutoconfPartitioner partitioner =
+			new AutoconfPartitioner(
+				new AutoconfPartitionScanner(),
+				AutoconfPartitionScanner.AUTOCONF_PARTITION_TYPES);
+		partitioner.connect(document, 1);
+		if (document instanceof IDocumentExtension3) {
+			IDocumentExtension3 extension3= (IDocumentExtension3) document;
+			extension3.setDocumentPartitioner(AutoconfEditor.AUTOCONF_PARTITIONING, partitioner);
+		} else {
+			document.setDocumentPartitioner(partitioner);
+		}
+//		document.addDocumentListener(this);
+	}
+	
+	/*
+	 * @see IDocumentListener#documentAboutToBeChanged(DocumentEvent)
+	 */
+
+	public void documentAboutToBeChanged(DocumentEvent e) {
+		// do nothing
+	}
+	
+	/*
+	 * @see IDocumentListener#documentChanged(DocumentEvent)
+	 */
+	public void documentChanged(DocumentEvent e) {
+		// do nothing
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditor.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditor.java
new file mode 100644
index 0000000..a65cb24
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditor.java
@@ -0,0 +1,787 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import java.util.ResourceBundle;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.ListenerList;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.jface.text.AbstractInformationControlManager;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.DefaultInformationControl;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IInformationControl;
+import org.eclipse.jface.text.IInformationControlCreator;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextHover;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.ITextViewerExtension;
+import org.eclipse.jface.text.ITextViewerExtension2;
+import org.eclipse.jface.text.ITextViewerExtension4;
+import org.eclipse.jface.text.ITextViewerExtension5;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.TextUtilities;
+import org.eclipse.jface.text.information.IInformationProvider;
+import org.eclipse.jface.text.information.IInformationProviderExtension;
+import org.eclipse.jface.text.information.IInformationProviderExtension2;
+import org.eclipse.jface.text.information.InformationPresenter;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
+import org.eclipse.jface.text.source.IAnnotationHover;
+import org.eclipse.jface.text.source.IAnnotationHoverExtension;
+import org.eclipse.jface.text.source.ILineRange;
+import org.eclipse.jface.text.source.IOverviewRuler;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.ISourceViewerExtension3;
+import org.eclipse.jface.text.source.IVerticalRuler;
+import org.eclipse.jface.text.source.IVerticalRulerInfo;
+import org.eclipse.jface.text.source.projection.ProjectionAnnotationModel;
+import org.eclipse.jface.text.source.projection.ProjectionSupport;
+import org.eclipse.jface.text.source.projection.ProjectionViewer;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.outline.AutoconfContentOutlinePage;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfMacroDetector;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfParser;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.IAutoconfMacroValidator;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.autoconf.ProjectionFileUpdater;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.IReconcilingParticipant;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.MakefileEditorPreferenceConstants;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutoconfEditorPreferencePage;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutotoolsEditorPreferenceConstants;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.ColorManager;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.properties.AutotoolsPropertyManager;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.properties.IProjectPropertyListener;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.editors.text.EditorsUI;
+import org.eclipse.ui.editors.text.TextEditor;
+import org.eclipse.ui.texteditor.ChainedPreferenceStore;
+import org.eclipse.ui.texteditor.ContentAssistAction;
+import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
+import org.eclipse.ui.texteditor.ResourceAction;
+import org.eclipse.ui.texteditor.TextEditorAction;
+import org.eclipse.ui.texteditor.TextOperationAction;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+
+
+public class AutoconfEditor extends TextEditor implements IAutotoolsEditor, IProjectPropertyListener {
+
+	public final static String AUTOCONF_PARTITIONING= "autoconf_partitioning";  //$NON-NLS-1$
+
+
+    private AutoconfPartitionScanner fPartitionScanner;
+    private RuleBasedScanner fCodeScanner;
+    private RuleBasedScanner fMacroCodeScanner;
+    private static AutoconfDocumentProvider fDocumentProvider;
+    private AutoconfElement rootElement;
+    private AutoconfContentOutlinePage outlinePage;
+    private AutoconfParser fParser;
+    private IEditorInput input;
+    private IProject fProject;
+	
+    /** The information provider used to present focusable information shells. */
+    private InformationPresenter fInformationPresenter;
+	/** 
+	 * This editor's projection support 
+	 */
+    
+	ProjectionSupport fProjectionSupport;
+	ProjectionFileUpdater fProjectionFileUpdater;
+
+	/**
+	 * Reconciling listeners
+	 */
+	private ListenerList fReconcilingListeners= new ListenerList(ListenerList.IDENTITY);
+
+
+    public AutoconfEditor() {
+    	super();
+    }
+
+	/**
+	 * Adapted source viewer for CEditor
+	 */
+
+	public class AdaptedSourceViewer extends ProjectionViewer implements ITextViewerExtension {
+
+
+		public AdaptedSourceViewer(Composite parent, IVerticalRuler ruler,
+			IOverviewRuler overviewRuler, boolean showsAnnotation, int styles) {
+			super(parent, ruler, overviewRuler, showsAnnotation, styles);
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.text.source.ISourceViewer#setRangeIndication(int, int, boolean)
+		 */
+		public void setRangeIndication(int offset, int length, boolean moveCursor) {
+			// Fixin a bug in the ProjectViewer implemenation
+			// PR: https://bugs.eclipse.org/bugs/show_bug.cgi?id=72914
+			if (isProjectionMode()) {
+				super.setRangeIndication(offset, length, moveCursor);
+			} else {
+				super.setRangeIndication(offset, length, false);
+			}
+		}
+	}
+
+    protected void initializeEditor() {
+    	super.initializeEditor();
+    	setDocumentProvider(getAutoconfDocumentProvider());
+		IPreferenceStore[] stores = new IPreferenceStore[2];
+		stores[0] = AutotoolsPlugin.getDefault().getPreferenceStore();
+		stores[1] = EditorsUI.getPreferenceStore();
+		ChainedPreferenceStore chainedStore = new ChainedPreferenceStore(stores);
+		setPreferenceStore(chainedStore);    	
+		setSourceViewerConfiguration(new AutoconfSourceViewerConfiguration(chainedStore, this));
+		AutotoolsEditorPreferenceConstants.initializeDefaultValues(stores[0]);
+    	AutoconfEditorPreferencePage.initDefaults(stores[0]);
+    }
+
+    public static AutoconfDocumentProvider getAutoconfDocumentProvider() {
+    	if (fDocumentProvider == null)
+    		fDocumentProvider= new AutoconfDocumentProvider();
+    	return fDocumentProvider;
+    }
+
+    public AutoconfElement getRootElement() {
+    	return rootElement;
+    }
+    
+    public void setRootElement(AutoconfElement element) {
+    	rootElement = element;
+    }
+
+    public ISourceViewer getViewer() {
+    	return getSourceViewer();
+    }
+    
+    protected IDocument getInputDocument()
+	{
+		IDocument document = getDocumentProvider().getDocument(input);
+		return document;
+	}
+
+    protected void doSetInput(IEditorInput newInput) throws CoreException
+	{
+    	// If this editor is for a project file, remove this editor as a property
+    	// change listener.
+    	if (fProject != null)
+    		AutotoolsPropertyManager.getDefault().removeProjectPropertyListener(fProject, this);
+    	this.fProject = null;
+		super.doSetInput(newInput);
+		this.input = newInput;
+
+		if (input instanceof IFileEditorInput) {
+			IFile f = ((IFileEditorInput)input).getFile();
+			fProject = f.getProject();
+			// This is a project file.  We want to be notified if the Autoconf editor
+			// properties are changed such that the macro versions are changed.
+			AutotoolsPropertyManager.getDefault().addProjectPropertyListener(fProject, this);
+		}
+		getOutlinePage().setInput(input);
+		try
+		{
+			IDocument document = getInputDocument();
+
+			setRootElement(reparseDocument(document, newInput));
+		}
+		catch (Exception e)
+		{
+			e.printStackTrace();
+		}
+	}
+
+    @SuppressWarnings("unchecked")
+	public Object getAdapter(Class required) {
+		if (ProjectionAnnotationModel.class.equals(required)) {
+			if (fProjectionSupport != null) {
+				Object result = fProjectionSupport.getAdapter(getSourceViewer(), required);
+				if (result != null) {
+					return result;
+				}
+			}
+		} else if (IContentOutlinePage.class.equals(required)) {
+			return getOutlinePage();
+		}
+		return super.getAdapter(required);
+	}
+	
+
+    public AutoconfContentOutlinePage getOutlinePage() {
+		if (outlinePage == null) {
+			outlinePage= new AutoconfContentOutlinePage(this);
+			if (getEditorInput() != null)
+				outlinePage.setInput(getEditorInput());
+		}
+		return outlinePage;
+	}
+
+    /**
+     * Return a scanner for creating Autoconf partitions.
+     *
+     * @return a scanner for creating Autoconf partitions
+     */
+    public AutoconfParser getAutoconfParser() {
+    	if (fParser == null) {
+    		AutoconfErrorHandler errorHandler = new AutoconfErrorHandler(input);
+    		IAutoconfMacroValidator macroValidator = new AutoconfEditorMacroValidator(this);
+    		fParser = new AutoconfParser(errorHandler, new AutoconfMacroDetector(), macroValidator);
+    	}
+    	return fParser;
+    }
+ 
+	/**
+     * Return a scanner for creating Autoconf partitions.
+     *
+     * @return a scanner for creating Autoconf partitions
+     */
+    public AutoconfPartitionScanner getAutoconfPartitionScanner() {
+    	if (fPartitionScanner == null)
+    		fPartitionScanner= new AutoconfPartitionScanner();
+    	return fPartitionScanner;
+    }
+    
+    /**
+     * Returns the Autoconf code scanner.
+     *
+     * @return the Autoconf code scanner
+     */
+    public RuleBasedScanner getAutoconfCodeScanner() {
+    	if (fCodeScanner == null)
+    		fCodeScanner= new AutoconfCodeScanner();
+    	return fCodeScanner;
+    }
+    
+    /**
+     * Returns the Autoconf code scanner.
+     *
+     * @return the Autoconf code scanner
+     */
+    public RuleBasedScanner getAutoconfMacroCodeScanner() {
+    	if (fMacroCodeScanner == null)
+    		fMacroCodeScanner= new AutoconfMacroCodeScanner();
+    	return fMacroCodeScanner;
+    }
+    
+	/**
+	 * Returns the preference color, identified by the given preference.
+	 */
+	public static Color getPreferenceColor(String key) {
+		return ColorManager.getDefault().getColor(PreferenceConverter.getColor(AutotoolsPlugin.getDefault().getPreferenceStore(), key));
+	}
+
+	public void handleProjectPropertyChanged(IProject project, String property) {
+		if (property.equals(AutotoolsPropertyConstants.AUTOCONF_MACRO_VERSIONING)) {
+			ISourceViewer sourceViewer= getSourceViewer();
+			if (sourceViewer == null)
+				return;
+			handleVersionChange(sourceViewer);
+		}
+	}
+
+	/**
+	 * Handle the case whereby the Autoconf or Automake macro versions to use
+	 * for this project are changed in which case we want to invalidate and reparse 
+	 * the document.
+	 * 
+	 * @param sourceViewer
+	 */
+	protected void handleVersionChange(ISourceViewer sourceViewer) {
+		sourceViewer.invalidateTextPresentation();
+		try {
+			IDocument document = getInputDocument();
+
+			setRootElement(reparseDocument(document, getEditorInput()));
+		}
+		catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+	
+	private AutoconfElement reparseDocument(IDocument document,
+			IEditorInput editorInput) {
+		AutoconfParser parser = getAutoconfParser();
+		((AutoconfErrorHandler)parser.getErrorHandler()).removeAllExistingMarkers();
+		return parser.parse(document);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#handlePreferenceStoreChanged(org.eclipse.jface.util.PropertyChangeEvent)
+	 */
+	protected void handlePreferenceStoreChanged(PropertyChangeEvent event) {
+		ISourceViewer sourceViewer= getSourceViewer();
+		if (sourceViewer == null)
+			return;
+
+        String property = event.getProperty();
+
+        AutoconfCodeScanner scanner = (AutoconfCodeScanner)getAutoconfCodeScanner();
+        if (scanner != null) {
+        	if (scanner.affectsBehavior(event)) {
+        		scanner.adaptToPreferenceChange(event);
+        		sourceViewer.invalidateTextPresentation();
+        	}
+        }
+
+        if (AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION.equals(property) ||
+        		AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION.equals(property)) {
+        	handleVersionChange(sourceViewer);
+        } else if (AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_ENABLED.equals(property)) {
+			if (sourceViewer instanceof ProjectionViewer) {
+				ProjectionViewer projectionViewer= (ProjectionViewer) sourceViewer;
+				if (fProjectionFileUpdater != null)
+					fProjectionFileUpdater.uninstall();
+				// either freshly enabled or provider changed
+				fProjectionFileUpdater= new ProjectionFileUpdater();
+				if (fProjectionFileUpdater != null) {
+					fProjectionFileUpdater.install(this, projectionViewer);
+				}
+			}
+			return;
+		}
+
+		super.handlePreferenceStoreChanged(event);
+	}
+
+    /**
+     * Information provider used to present focusable information shells.
+     *
+     * @since 3.1.1
+     */
+    private static final class InformationProvider implements IInformationProvider, IInformationProviderExtension, IInformationProviderExtension2 {
+
+    	private IRegion fHoverRegion;
+    	private Object fHoverInfo;
+    	private IInformationControlCreator fControlCreator;
+
+    	InformationProvider(IRegion hoverRegion, Object hoverInfo, IInformationControlCreator controlCreator) {
+    		fHoverRegion= hoverRegion;
+    		fHoverInfo= hoverInfo;
+    		fControlCreator= controlCreator;
+    	}
+    	/*
+    	 * @see org.eclipse.jface.text.information.IInformationProvider#getSubject(org.eclipse.jface.text.ITextViewer, int)
+    	 */
+    	public IRegion getSubject(ITextViewer textViewer, int invocationOffset) {
+    		return fHoverRegion;
+    	}
+    	/*
+    	 * @see org.eclipse.jface.text.information.IInformationProvider#getInformation(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion)
+    	 */
+    	public String getInformation(ITextViewer textViewer, IRegion subject) {
+    		return fHoverInfo.toString();
+    	}
+    	
+    	/*
+    	 * @see org.eclipse.jface.text.information.IInformationProviderExtension#getInformation2(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion)
+    	 * @since 3.2
+    	 */
+    	public Object getInformation2(ITextViewer textViewer, IRegion subject) {
+    		return fHoverInfo;
+    	}
+    	/*
+    	 * @see org.eclipse.jface.text.information.IInformationProviderExtension2#getInformationPresenterControlCreator()
+    	 */
+    	public IInformationControlCreator getInformationPresenterControlCreator() {
+    		return fControlCreator;
+    	}
+    }
+
+    /**
+     * This action behaves in two different ways: If there is no current text
+     * hover, the tooltip is displayed using information presenter. If there is
+     * a current text hover, it is converted into a information presenter in
+     * order to make it sticky.
+     * @since 3.1.1
+     */
+    class InformationDispatchAction extends TextEditorAction {
+
+    	/** The wrapped text operation action. */
+    	private final TextOperationAction fTextOperationAction;
+
+    	/**
+    	 * Creates a dispatch action.
+    	 *
+    	 * @param resourceBundle the resource bundle
+    	 * @param prefix the prefix
+    	 * @param textOperationAction the text operation action
+    	 */
+    	public InformationDispatchAction(ResourceBundle resourceBundle, String prefix, final TextOperationAction textOperationAction) {
+    		super(resourceBundle, prefix, AutoconfEditor.this);
+    		if (textOperationAction == null)
+    			throw new IllegalArgumentException();
+    		fTextOperationAction= textOperationAction;
+    	}
+
+    	/*
+    	 * @see org.eclipse.jface.action.IAction#run()
+    	 */
+    	public void run() {
+
+    		ISourceViewer sourceViewer= getSourceViewer();
+    		if (sourceViewer == null) {
+    			fTextOperationAction.run();
+    			return;
+    		}
+
+    		if (sourceViewer instanceof ITextViewerExtension4)  {
+    			ITextViewerExtension4 extension4= (ITextViewerExtension4) sourceViewer;
+    			if (extension4.moveFocusToWidgetToken())
+    				return;
+    		}
+
+    		if (sourceViewer instanceof ITextViewerExtension2) {
+    			// does a text hover exist?
+    			ITextHover textHover= ((ITextViewerExtension2) sourceViewer).getCurrentTextHover();
+    			if (textHover != null && makeTextHoverFocusable(sourceViewer, textHover))
+    				return;
+    		}
+
+    		if (sourceViewer instanceof ISourceViewerExtension3) {
+    			// does an annotation hover exist?
+    			IAnnotationHover annotationHover= ((ISourceViewerExtension3) sourceViewer).getCurrentAnnotationHover();
+    			if (annotationHover != null && makeAnnotationHoverFocusable(sourceViewer, annotationHover))
+    				return;
+    		}
+
+    		// otherwise, just display the tooltip
+    		//fTextOperationAction.run();
+    	}
+
+    	/**
+    	 * Tries to make a text hover focusable (or "sticky").
+    	 * 
+    	 * @param sourceViewer the source viewer to display the hover over
+    	 * @param textHover the hover to make focusable
+    	 * @return <code>true</code> if successful, <code>false</code> otherwise
+    	 */
+    	@SuppressWarnings("deprecation")
+		private boolean makeTextHoverFocusable(ISourceViewer sourceViewer, ITextHover textHover) {
+    		Point hoverEventLocation= ((ITextViewerExtension2) sourceViewer).getHoverEventLocation();
+    		int offset= computeOffsetAtLocation(sourceViewer, hoverEventLocation.x, hoverEventLocation.y);
+    		if (offset == -1)
+    			return false;
+
+    		try {
+    			IRegion hoverRegion= textHover.getHoverRegion(sourceViewer, offset);
+    			if (hoverRegion == null)
+    				return false;
+
+    			String hoverInfo= textHover.getHoverInfo(sourceViewer, hoverRegion);
+
+    			IInformationControlCreator controlCreator= null;
+    			if (textHover instanceof IInformationProviderExtension2)
+    				controlCreator= ((IInformationProviderExtension2)textHover).getInformationPresenterControlCreator();
+
+    			IInformationProvider informationProvider= new InformationProvider(hoverRegion, hoverInfo, controlCreator);
+
+    			fInformationPresenter.setOffset(offset);
+    			fInformationPresenter.setAnchor(AbstractInformationControlManager.ANCHOR_BOTTOM);
+    			fInformationPresenter.setMargins(6, 6); // default values from AbstractInformationControlManager
+    			String contentType= TextUtilities.getContentType(sourceViewer.getDocument(), AutoconfPartitionScanner.AUTOCONF_MACRO, offset, true);
+    			fInformationPresenter.setInformationProvider(informationProvider, contentType);
+    			fInformationPresenter.showInformation();
+
+    			return true;
+
+    		} catch (BadLocationException e) {
+    			return false;
+    		}
+    	}
+
+    	/**
+    	 * Tries to make an annotation hover focusable (or "sticky").
+    	 * 
+    	 * @param sourceViewer the source viewer to display the hover over
+    	 * @param annotationHover the hover to make focusable
+    	 * @return <code>true</code> if successful, <code>false</code> otherwise
+    	 */
+    	private boolean makeAnnotationHoverFocusable(ISourceViewer sourceViewer, IAnnotationHover annotationHover) {
+    		IVerticalRulerInfo info= getVerticalRuler();
+    		int line= info.getLineOfLastMouseButtonActivity();
+    		if (line == -1)
+    			return false;
+
+    		try {
+
+    			// compute the hover information
+    			Object hoverInfo;
+    			if (annotationHover instanceof IAnnotationHoverExtension) {
+    				IAnnotationHoverExtension extension= (IAnnotationHoverExtension) annotationHover;
+    				ILineRange hoverLineRange= extension.getHoverLineRange(sourceViewer, line);
+    				if (hoverLineRange == null)
+    					return false;
+    				final int maxVisibleLines= Integer.MAX_VALUE; // allow any number of lines being displayed, as we support scrolling
+    				hoverInfo= extension.getHoverInfo(sourceViewer, hoverLineRange, maxVisibleLines);
+    			} else {
+    				hoverInfo= annotationHover.getHoverInfo(sourceViewer, line);
+    			}
+
+    			// hover region: the beginning of the concerned line to place the control right over the line
+    			IDocument document= sourceViewer.getDocument();
+    			int offset= document.getLineOffset(line);
+    			String contentType= TextUtilities.getContentType(document, AutoconfPartitionScanner.AUTOCONF_MACRO, offset, true);
+
+    			IInformationControlCreator controlCreator= null;
+
+//    			/* 
+//    			 * XXX: This is a hack to avoid API changes at the end of 3.2,
+//    			 * and should be fixed for 3.3, see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=137967
+//    			 */
+//    			if ("org.eclipse.jface.text.source.projection.ProjectionAnnotationHover".equals(annotationHover.getClass().getName())) { //$NON-NLS-1$
+//    				controlCreator= new IInformationControlCreator() {
+//    					public IInformationControl createInformationControl(Shell shell) {
+//    						int shellStyle= SWT.RESIZE | SWT.TOOL | getOrientation();
+//    						int style= SWT.V_SCROLL | SWT.H_SCROLL;
+//    						return new SourceViewerInformationControl(shell, shellStyle, style);
+//    					}
+//    				};
+//
+//    			} else {
+    			if (annotationHover instanceof IInformationProviderExtension2)
+    				controlCreator= ((IInformationProviderExtension2) annotationHover).getInformationPresenterControlCreator();
+    			else if (annotationHover instanceof IAnnotationHoverExtension)
+    				controlCreator= ((IAnnotationHoverExtension) annotationHover).getHoverControlCreator();
+//    			}
+
+    			IInformationProvider informationProvider= new InformationProvider(new Region(offset, 0), hoverInfo, controlCreator);
+
+    			fInformationPresenter.setOffset(offset);
+    			fInformationPresenter.setAnchor(AbstractInformationControlManager.ANCHOR_RIGHT);
+    			fInformationPresenter.setMargins(4, 0); // AnnotationBarHoverManager sets (5,0), minus SourceViewer.GAP_SIZE_1
+    			fInformationPresenter.setInformationProvider(informationProvider, contentType);
+    			fInformationPresenter.showInformation();
+
+    			return true;
+
+    		} catch (BadLocationException e) {
+    			return false;
+    		}
+    	}
+
+    	// modified version from TextViewer
+    	private int computeOffsetAtLocation(ITextViewer textViewer, int x, int y) {
+
+    		StyledText styledText= textViewer.getTextWidget();
+    		IDocument document= textViewer.getDocument();
+
+    		if (document == null)
+    			return -1;
+
+    		try {
+    			int widgetOffset= styledText.getOffsetAtLocation(new Point(x, y));
+    			Point p= styledText.getLocationAtOffset(widgetOffset);
+    			if (p.x > x)
+    				widgetOffset--;
+
+    			if (textViewer instanceof ITextViewerExtension5) {
+    				ITextViewerExtension5 extension= (ITextViewerExtension5) textViewer;
+    				return extension.widgetOffset2ModelOffset(widgetOffset);
+    			} else {
+    				IRegion visibleRegion= textViewer.getVisibleRegion();
+    				return widgetOffset + visibleRegion.getOffset();
+    			}
+    		} catch (IllegalArgumentException e) {
+    			return -1;
+    		}
+
+    	}
+    }
+
+	/**
+	 * Adds the given listener.
+	 * Has no effect if an identical listener was not already registered.
+	 * 
+	 * @param listener	The reconcile listener to be added
+	 */
+	public final void addReconcilingParticipant(IReconcilingParticipant listener) {
+		synchronized (fReconcilingListeners) {
+			fReconcilingListeners.add(listener);
+		}
+	}
+	
+	/**
+	 * Removes the given listener.
+	 * Has no effect if an identical listener was not already registered.
+	 * 
+	 * @param listener	the reconcile listener to be removed
+	 */
+	final void removeReconcilingParticipant(IReconcilingParticipant listener) {
+		synchronized (fReconcilingListeners) {
+			fReconcilingListeners.remove(listener);
+		}
+	}
+	
+	/*
+	 */
+	public void reconciled() {
+		// Notify listeners
+		Object[] listeners = fReconcilingListeners.getListeners();
+		for (int i = 0, length= listeners.length; i < length; ++i) {
+			((IReconcilingParticipant)listeners[i]).reconciled();
+		}
+	}
+
+    /**
+     * Determines is folding enabled.
+     * @return <code>true</code> if folding is enabled, <code>false</code> otherwise.
+     */
+	boolean isFoldingEnabled() {
+		return AutotoolsPlugin.getDefault().getPreferenceStore().getBoolean(MakefileEditorPreferenceConstants.EDITOR_FOLDING_ENABLED);
+	}
+
+    /* (non-Javadoc)
+	 * @see org.eclipse.ui.editors.text.TextEditor#initializeKeyBindingScopes()
+	 */
+	protected void initializeKeyBindingScopes() {
+		setKeyBindingScopes(new String [] { AutotoolsUIPlugin.getUniqueIdentifier() + ".editor.scope" } ); //$NON-NLS-1$
+	}
+
+
+    /**
+     * @see org.eclipse.ui.texteditor.AbstractTextEditor#createActions()
+     */
+    protected void createActions() {
+    	super.createActions();
+    	// TODO: Figure out how to do this later. 		
+//  	fFoldingGroup= new FoldingActionGroup(this, getSourceViewer());
+
+    	// Sticky hover support
+    	ResourceAction resAction= new TextOperationAction(AutoconfEditorMessages.getResourceBundle(), "ShowToolTip.", this, ISourceViewer.INFORMATION, true); //$NON-NLS-1$
+    	resAction= new InformationDispatchAction(AutoconfEditorMessages.getResourceBundle(), "ShowToolTip.", (TextOperationAction) resAction); //$NON-NLS-1$
+    	resAction.setActionDefinitionId(IAutotoolEditorActionDefinitionIds.SHOW_TOOLTIP);
+    	setAction("ShowToolTip", resAction); //$NON-NLS-1$
+    	PlatformUI.getWorkbench().getHelpSystem().setHelp(resAction, IAutotoolHelpContextIds.SHOW_TOOLTIP_ACTION);
+
+    	// Content assist
+    	Action action = new ContentAssistAction(AutoconfEditorMessages.getResourceBundle(), "ContentAssistProposal.", this); //$NON-NLS-1$
+		action.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
+		setAction("ContentAssistProposal", action); //$NON-NLS-1$
+		markAsStateDependentAction("ContentAssistProposal", true); //$NON-NLS-1$
+    	PlatformUI.getWorkbench().getHelpSystem().setHelp(action, IAutotoolHelpContextIds.CONTENT_ASSIST);
+   }
+
+    /**
+     * The <code>AbstractTextEditor</code> implementation of this 
+     * <code>IWorkbenchPart</code> method creates the vertical ruler and
+     * source viewer. Subclasses may extend.
+     * 
+     * We attach our own mouseDown listener on the menu bar, 
+     * and our own listener for cursor/key/selection events to update cursor position in
+     * status bar.
+
+     * @param parent Parent composite of the control.
+     */
+    public void createPartControl(Composite parent) {
+    	super.createPartControl(parent);
+
+    	// Sticky hover support
+    	IInformationControlCreator informationControlCreator= new IInformationControlCreator() {
+    		public IInformationControl createInformationControl(Shell shell) {
+       			return new DefaultInformationControl(shell, true);
+    		}
+    	};
+
+    	fInformationPresenter= new InformationPresenter(informationControlCreator);
+    	fInformationPresenter.setSizeConstraints(60, 10, true, true);
+    	fInformationPresenter.install(getSourceViewer());
+    	fInformationPresenter.setDocumentPartitioning(AutoconfPartitionScanner.AUTOCONF_MACRO);
+
+    	ProjectionViewer projectionViewer= (ProjectionViewer) getSourceViewer();
+
+    	fProjectionSupport= new ProjectionSupport(projectionViewer, getAnnotationAccess(), getSharedColors());
+    	fProjectionSupport.addSummarizableAnnotationType("org.eclipse.ui.workbench.texteditor.error"); //$NON-NLS-1$
+    	fProjectionSupport.addSummarizableAnnotationType("org.eclipse.ui.workbench.texteditor.warning"); //$NON-NLS-1$
+    	fProjectionSupport.install();
+
+    	if (isFoldingEnabled())
+    		projectionViewer.doOperation(ProjectionViewer.TOGGLE);
+    	
+		fProjectionFileUpdater= new ProjectionFileUpdater();
+		if (fProjectionFileUpdater != null) {
+			fProjectionFileUpdater.install(this, projectionViewer);
+			fProjectionFileUpdater.initialize();
+		}
+
+    	PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IAutotoolHelpContextIds.AC_EDITOR_VIEW);
+
+    	// TODO: Do we need the following two lines?
+//  	fEditorSelectionChangedListener= new EditorSelectionChangedListener();
+//  	fEditorSelectionChangedListener.install(getSelectionProvider());
+    }
+
+    protected ISourceViewer createSourceViewer(Composite parent, IVerticalRuler ruler, int styles) {
+    	ISourceViewer viewer = new AdaptedSourceViewer(parent, ruler, getOverviewRuler(), isOverviewRulerVisible(), styles);
+
+    	// ensure decoration support has been created and configured.
+    	getSourceViewerDecorationSupport(viewer);
+
+    	return viewer;
+    }
+    
+    
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IWorkbenchPart#dispose()
+	 */
+	public void dispose() {
+		if (fProjectionFileUpdater != null) {
+			fProjectionFileUpdater.uninstall();
+			fProjectionFileUpdater= null;
+		}
+		if (fProject != null) {
+			AutotoolsPropertyManager.getDefault().removeProjectPropertyListener(fProject, this);
+		}
+		super.dispose();
+	}
+
+	/*
+	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#performRevert()
+	 */
+	protected void performRevert() {
+		ProjectionViewer projectionViewer= (ProjectionViewer) getSourceViewer();
+		projectionViewer.setRedraw(false);
+		try {
+
+			boolean projectionMode= projectionViewer.isProjectionMode();
+			if (projectionMode) {
+				projectionViewer.disableProjection();
+				if (fProjectionFileUpdater != null)
+					fProjectionFileUpdater.uninstall();
+			}
+
+			super.performRevert();
+
+			if (projectionMode) {
+				if (fProjectionFileUpdater != null)
+					fProjectionFileUpdater.install(this, projectionViewer);
+				projectionViewer.enableProjection();
+			}
+
+		} finally {
+			projectionViewer.setRedraw(true);
+		}
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMacroValidator.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMacroValidator.java
new file mode 100644
index 0000000..bae46a9
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMacroValidator.java
@@ -0,0 +1,101 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Corporation, (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	  Red Hat Incorporated - initial API and implementation
+ *    Ed Swartz (Nokia) - refactoring
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfMacroElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.IAutoconfMacroValidator;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.ParseException;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutotoolsEditorPreferenceConstants;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.text.hover.AutoconfPrototype;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.text.hover.AutoconfTextHover;
+
+
+/**
+ *	Validate a macro call by checking against the stored macro prototypes
+ */
+public class AutoconfEditorMacroValidator implements IAutoconfMacroValidator {
+	public final String AUTOCONF_MACRO_ARGS_TOO_FEW = "AutoconfMacroArgsTooFew"; //$NON-NLS-1$
+	public final String AUTOCONF_MACRO_ARGS_TOO_MANY = "AutoconfMacroArgsTooMany"; //$NON-NLS-1$
+
+	private AutoconfEditor fEditor;
+
+	public AutoconfEditorMacroValidator(AutoconfEditor autoconfEditor) {
+		fEditor = autoconfEditor;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.IAutoconfMacroValidator#validateMacroCall(org.eclipse.linuxtools.cdt.autotools.core.ui.editors.parser.AutoconfMacroElement)
+	 */
+	public void validateMacroCall(AutoconfMacroElement macro)
+			throws ParseException {
+		AutoconfPrototype p = AutoconfTextHover.getPrototype(macro.getName(), fEditor);
+		if (p != null) {
+			boolean tooFew = false;
+			boolean tooMany = false;
+			boolean justRight = false;
+			int parms = macro.getParameterCount();
+			int numPrototypes = p.getNumPrototypes();
+			int minParms = 0;
+			int maxParms = 0;
+			for (int i = 0; i < numPrototypes; ++i) {
+				if (parms < p.getMinParms(i)) {
+					tooFew = true;
+					minParms = p.getMinParms(i);
+				} else if (parms > p.getMaxParms(i)) {
+					tooMany = true;
+					maxParms = p.getMaxParms(i);
+				} else {
+					justRight = true;
+					break;
+				}
+			}
+			
+			int length = macro.getEndOffset() - macro.getStartOffset();
+			int start = macro.getStartOffset();
+			int end = macro.getEndOffset();
+			int lineNumber = 0;
+			try {
+				lineNumber = macro.getDocument().getLineOfOffset(start);
+			} catch (BadLocationException e) {
+				
+			}
+			
+			if (!justRight) {
+				if (tooFew) {
+					String formatString = AutoconfEditorMessages.getFormattedString(AUTOCONF_MACRO_ARGS_TOO_FEW, 
+							AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION),
+							p.getName(), Integer.toString(minParms));
+					throw new ParseException(
+							formatString,
+							start, end,
+							lineNumber, 0, length,
+							IMarker.SEVERITY_WARNING);
+				} else if (tooMany) {
+					String formatString = AutoconfEditorMessages.getFormattedString(AUTOCONF_MACRO_ARGS_TOO_MANY,
+							AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION),
+							p.getName(), Integer.toString(maxParms));
+					throw new ParseException(
+							formatString,
+							start, end,
+							lineNumber, 0, length,
+							IMarker.SEVERITY_WARNING);
+				}
+			}
+		}
+
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMessages.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMessages.java
new file mode 100644
index 0000000..d1f6f14
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMessages.java
@@ -0,0 +1,117 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+
+/**
+ * AutoconfEditorMessages
+ */
+public class AutoconfEditorMessages {
+
+	private static final String RESOURCE_BUNDLE= AutoconfEditorMessages.class.getName();
+
+	private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);
+
+	private AutoconfEditorMessages() {
+	}
+
+	public static ResourceBundle getResourceBundle() {
+		return fgResourceBundle;
+	}
+	
+	public static String getString(String key) {
+		try {
+			return fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+	}
+	/**
+	 * Gets a string from the resource bundle and formats it with the argument
+	 * 
+	 * @param key	the string used to get the bundle value, must not be null
+	 * @since 3.0
+	 */
+	public static String getFormattedString(String key, Object arg) {
+		String format= null;
+		try {
+			format= fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+		if (arg == null)
+			arg= ""; //$NON-NLS-1$
+		return MessageFormat.format(format, new Object[] { arg });
+	}
+	/**
+	 * Gets a string from the resource bundle and formats it with the arguments
+	 * 
+	 * @param key	the string used to get the bundle value, must not be null
+	 * @since 3.0
+	 */
+	public static String getFormattedString(String key, Object arg1, Object arg2) {
+		String format= null;
+		try {
+			format= fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+		if (arg1 == null)
+			arg1= ""; //$NON-NLS-1$
+		if (arg2 == null)
+			arg2= ""; //$NON-NLS-1$
+		return MessageFormat.format(format, new Object[] { arg1, arg2 });
+	}
+	
+	/**
+	 * Gets a string from the resource bundle and formats it with the arguments
+	 * 
+	 * @param key	the string used to get the bundle value, must not be null
+	 * @since 3.0
+	 */
+	public static String getFormattedString(String key, Object arg1, Object arg2, Object arg3) {
+		String format= null;
+		try {
+			format= fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+		if (arg1 == null)
+			arg1= ""; //$NON-NLS-1$
+		if (arg2 == null)
+			arg2= ""; //$NON-NLS-1$
+		if (arg3 == null)
+			arg3= ""; //$NON-NLS-1$
+		return MessageFormat.format(format, new Object[] { arg1, arg2, arg3 });
+	}
+	
+	/**
+	 * Gets a string from the resource bundle and formats it with the argument
+	 * 
+	 * @param key	the string used to get the bundle value, must not be null
+	 * @since 3.0
+	 */
+	public static String getFormattedString(String key, boolean arg) {
+		String format= null;
+		try {
+			format= fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+		return MessageFormat.format(format, new Object[] { new Boolean(arg) });
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMessages.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMessages.properties
new file mode 100644
index 0000000..692d064
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMessages.properties
@@ -0,0 +1,47 @@
+#################################################################################
+#  Copyright (c) 2007 Red Hat, Inc., (c) 2008 Nokia Inc
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+# 
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#      Nokia Inc - refactoring
+#################################################################################
+UnmatchedRightParenthesis=Unmatched right parenthesis
+UnmatchedLeftParenthesis=Unmatched left parenthesis
+UnmatchedRightQuote=Unmatched right quote, expected {0}
+UnmatchedLeftQuote=Unmatched left quote, expected {0}
+UnmatchedCloseComment=Unmatched end of comment, expected {0}
+UnterminatedString=Unterminated string, expected {0}
+
+AutoconfMacroArgsTooFew=The autoconf version {0} definition of macro "{1}" requires at least {2} arguments
+AutoconfMacroArgsTooMany=The autoconf version {0} definition of macro "{1}" may have a maximum of {2} arguments
+M4MacroArgsTooFew=The m4 macro "{0}" requires at least {1} arguments
+M4MacroArgsTooMany=The m4 macro "{0}" may have a maximum of {1} arguments
+MissingSpecifier=Missing "{0}" specifier
+InvalidSpecifier=The specifier "{0}" should be separated from condition by semicolon or newline
+InvalidTermination=The specifier "{0}" should appear after semicolon or newline
+UnterminatedConstruct=This "{0}" construct is unterminated
+MissingCondition=Missing condition for {0} specifier
+InvalidElif=The "elif" keyword should appear in an "if" or "elif" construct
+InvalidElse=The "else" keyword should appear in an "if" or "elif" construct
+InvalidFi=The "fi" keyword should terminate an "if", "elif", or "else" construct
+InvalidEsac=The "esac" keyword should terminate a "case" statement
+InvalidDone=The "done" keyword should terminate a "for", "while", "until", or "select" statement
+InvalidDo=The "do" keyword should appear in a "for", "while", "until", or "select" statement
+InvalidThen=The "then" keyword should appear in an "if" or "elif" statement
+InvalidIn=The "in" keyword should appear in a "case" statement
+UnterminatedCaseCondition=Case condition is not terminated before "esac" keyword
+ImproperCaseCondition=Case condition expected to end with ")"
+UnterminatedInlineDocument=Inline document started with "<<" is unterminated
+IncompleteInlineMarker=Inline document marker has incomplete quote
+MissingInlineMarker=Inline document specification is missing end marker
+AutoconfAnnotationHover.multipleMarkers=Multiple markers at this line
+
+ShowToolTip.label=Show T&ooltip Description
+ContentAssistProposal.label=Co&ntent Assist
+ContentAssistProposal.tooltip=Content Assist
+ContentAssistProposal.description=Content Assist
+
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfErrorHandler.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfErrorHandler.java
new file mode 100644
index 0000000..14ea7f8
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfErrorHandler.java
@@ -0,0 +1,213 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.eclipse.cdt.core.model.ICModelMarker;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.text.Position;
+import org.eclipse.jface.text.source.Annotation;
+import org.eclipse.jface.text.source.AnnotationModel;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.IAutoconfErrorHandler;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.ParseException;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.texteditor.MarkerAnnotation;
+import org.eclipse.ui.texteditor.MarkerUtilities;
+
+
+public class AutoconfErrorHandler implements IAutoconfErrorHandler {
+	
+	public static final String PARSE_ERROR_MARKER_ID = AutotoolsUIPlugin.PLUGIN_ID
+	+ ".parsefileerror"; //$NON-NLS-1$
+	
+	private Map<Position, MarkerAnnotation> annotations = new HashMap<Position, MarkerAnnotation>();
+	private AnnotationModel fAnnotationModel;
+	
+	public AutoconfErrorHandler(IEditorInput input) {
+		this.fAnnotationModel = (AnnotationModel)AutoconfEditor.getAutoconfDocumentProvider().getAnnotationModel(input);
+	}
+	
+	private class AutoconfMarker implements IMarker {
+		private Map<String, Object> attributes;
+		private String type;
+		private long id;
+		
+		public void delete() throws CoreException {
+			// TODO Auto-generated method stub
+			
+		}
+		public boolean equals(Object obj) {
+			// TODO Auto-generated method stub
+			return super.equals(obj);
+		}
+		public boolean exists() {
+			// TODO Auto-generated method stub
+			return true;
+		}
+		@SuppressWarnings("unchecked")
+		public Object getAdapter(Class adapter) {
+			// TODO Auto-generated method stub
+			return null;
+		}
+		public Object getAttribute(String attributeName) throws CoreException {
+			return attributes.get(attributeName);
+		}
+		public boolean getAttribute(String attributeName, boolean defaultValue) {
+			Object o = attributes.get(attributeName);
+			if (o != null && o instanceof Boolean)
+				return ((Boolean)o).booleanValue();
+			return defaultValue;
+		}
+		public int getAttribute(String attributeName, int defaultValue) {
+			Object o = attributes.get(attributeName);
+			if (o != null && o instanceof Integer)
+				return ((Integer)o).intValue();
+			return defaultValue;
+		}
+		public String getAttribute(String attributeName, String defaultValue) {
+			Object o = attributes.get(attributeName);
+			if (o != null && o instanceof String)
+				return (String)o;
+			return defaultValue;
+		}
+		public Map<String, Object> getAttributes() throws CoreException {
+			return attributes;
+		}
+		public Object[] getAttributes(String[] attributeNames)
+				throws CoreException {
+			Collection<Object> c = attributes.values();
+			return c.toArray();
+		}
+		public long getCreationTime() throws CoreException {
+			// TODO Auto-generated method stub
+			return 0;
+		}
+		public long getId() {
+			return id;
+		}
+		public IResource getResource() {
+			return null;
+		}
+		public String getType() throws CoreException {
+			return type;
+		}
+		public boolean isSubtypeOf(String superType) throws CoreException {
+			if (superType.equals(type))
+				return true;
+			return false;
+		}
+		public void setAttribute(String attributeName, boolean value)
+				throws CoreException {
+			Boolean b = new Boolean(value);
+			attributes.put(attributeName, b);
+		}
+		public void setAttribute(String attributeName, int value)
+				throws CoreException {
+			Integer i = new Integer(value);
+			attributes.put(attributeName, i);	
+		}
+		public void setAttribute(String attributeName, Object value)
+				throws CoreException {
+			attributes.put(attributeName, value);
+		}
+		@SuppressWarnings("unchecked")
+		public void setAttributes(Map map) throws CoreException {
+			attributes.putAll(map);
+		}
+		public void setAttributes(String[] attributeNames, Object[] values)
+				throws CoreException {
+			for (int i = 0; i < attributeNames.length; ++i) {
+				attributes.put(attributeNames[i], values[i]);
+			}
+		}
+		protected Object clone() throws CloneNotSupportedException {
+			// TODO Auto-generated method stub
+			return super.clone();
+		}
+		public AutoconfMarker(String type, long id) {
+			this.type = type;
+			this.id = id;
+			this.attributes = new HashMap<String, Object>();
+		}
+	}
+	private IMarker createMarker(Map<String, Object> attributes, String markerType) throws CoreException {
+		IMarker marker= new AutoconfMarker(markerType, -1);
+		marker.setAttributes(attributes);
+		return marker;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.cdt.autotools.ui.editors.IAutoconfErrorHandler#handleError(org.eclipse.linuxtools.cdt.autotools.core.ui.editors.parser.ParseException)
+	 */
+	public void handleError(ParseException e) {
+		
+		int lineNumber = e.getLineNumber();
+		
+		Map<String, Object> map = new HashMap<String, Object>();
+		MarkerUtilities.setLineNumber(map, lineNumber);
+		MarkerUtilities.setMessage(map, e.getMessage());
+		map.put(IMarker.MESSAGE, e.getMessage());
+		map.put(IMarker.LOCATION, Integer.valueOf(lineNumber));
+
+		Integer charStart = new Integer(e.getStartOffset());
+		if (charStart != null) {
+			map.put(IMarker.CHAR_START, charStart);
+		}
+		Integer charEnd = new Integer(e.getEndOffset());
+		if (charEnd != null) {
+			map.put(IMarker.CHAR_END, charEnd);
+		}
+		
+		// FIXME:  add severity level
+		map.put(IMarker.SEVERITY, new Integer(e.getSeverity()));
+		
+		try {
+			IMarker marker = createMarker(map, ICModelMarker.C_MODEL_PROBLEM_MARKER);
+
+			MarkerAnnotation annotation = new MarkerAnnotation(marker);
+			Position p = new Position(charStart.intValue(),charEnd.intValue() - charStart.intValue());
+			fAnnotationModel.addAnnotation(annotation, p);
+			annotations.put(p, annotation);
+		} catch (CoreException ce) {
+			// do nothing
+		}
+		return;
+	}
+	
+	public void removeAllExistingMarkers()
+	{
+		fAnnotationModel.removeAllAnnotations();
+		annotations.clear();
+	}
+
+	@SuppressWarnings("unchecked")
+	public void removeExistingMarkers(int offset, int length)
+	{	
+		Iterator i = fAnnotationModel.getAnnotationIterator();
+		while (i.hasNext()) {
+			Annotation annotation = (Annotation)i.next();
+			Position p = fAnnotationModel.getPosition(annotation);
+			int pStart = p.getOffset();
+			if (pStart >= offset && pStart < (offset + length)) {
+				// Remove directly from model instead of using
+				// iterator so position will be removed from document.
+				fAnnotationModel.removeAnnotation(annotation);
+			}
+		}
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfIdentifierRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfIdentifierRule.java
new file mode 100644
index 0000000..4306541
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfIdentifierRule.java
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 20009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IPredicateRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.Token;
+
+public class AutoconfIdentifierRule implements IPredicateRule {
+
+	private IToken fToken;
+	private String fExtraChars = "_${@"; //$NON-NLS-1$
+	
+	public AutoconfIdentifierRule(IToken token) {
+		Assert.isNotNull(token);
+		fToken = token;
+	}
+
+	public IToken getSuccessToken() {
+		return fToken;
+	}
+
+	/*
+	 * @see IRule#evaluate(ICharacterScanner)
+	 */
+	public IToken evaluate(ICharacterScanner scanner) {
+		return evaluate(scanner, false);
+	}
+	
+	/*
+	 * @see IPredicateRule#evaluate(ICharacterScanner, resume)
+	 */
+	public IToken evaluate(ICharacterScanner scanner, boolean resume) {
+		int c = scanner.read();
+		if (Character.isLetterOrDigit((char)c) || fExtraChars.indexOf((char)c) >= 0) {
+			do {
+				c = scanner.read();
+			} while (Character.isLetterOrDigit((char)c) || fExtraChars.indexOf((char)c) >= 0);
+			scanner.unread();
+			return fToken;
+		}
+		scanner.unread();
+		return Token.UNDEFINED;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfKeywordDetector.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfKeywordDetector.java
new file mode 100644
index 0000000..4007042
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfKeywordDetector.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.rules.IWordDetector;
+
+public class AutoconfKeywordDetector implements IWordDetector {
+
+	/**
+	 * @see IWordDetector#isWordPart(character)
+	 */
+	public boolean isWordPart(char character) {
+		return (Character.isLetter(character) && Character.isLowerCase(character));
+	}
+
+	/**
+	 * @see IWordDetector#isWordStart(char)
+	 */
+	public boolean isWordStart(char character) {
+		return (Character.isLetter(character) && Character.isLowerCase(character));
+	}
+
+}
+
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfM4WordDetector.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfM4WordDetector.java
new file mode 100644
index 0000000..2d4059d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfM4WordDetector.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.rules.IWordDetector;
+
+public class AutoconfM4WordDetector implements IWordDetector {
+
+	public boolean isWordPart(char c) {
+		// TODO Auto-generated method stub
+		return (Character.isLetter(c) || 
+				Character.isDigit(c) ||	c == '_');
+	}
+
+	public boolean isWordStart(char c) {
+		// TODO Auto-generated method stub
+		return (c == 'm');
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacro.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacro.java
new file mode 100644
index 0000000..ced0c88
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacro.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+public class AutoconfMacro implements Comparable<Object> {
+		protected String name;
+		protected String parms;
+		
+		public AutoconfMacro(String name, String parms) {
+			this.name = name;
+			this.parms = parms;
+		}
+		public String getName() {
+			return name;
+		}
+		public String getTemplate() {
+			return name + (hasParms() ? "()" : ""); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		public String getParms() {
+			return parms;
+		}
+		public boolean hasParms() {
+			return (parms.length() > 0);
+		}
+		public int compareTo (Object x) {
+			AutoconfMacro y = (AutoconfMacro)x;
+			return getName().compareTo(y.getName());
+		}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroCodeScanner.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroCodeScanner.java
new file mode 100644
index 0000000..f0a088b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroCodeScanner.java
@@ -0,0 +1,277 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.resource.StringConverter;
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
+import org.eclipse.jface.text.rules.SingleLineRule;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.jface.text.rules.WhitespaceRule;
+import org.eclipse.jface.text.rules.WordRule;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutotoolsEditorPreferenceConstants;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.ColorManager;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+
+
+public class AutoconfMacroCodeScanner extends RuleBasedScanner {
+
+	private Map<String, IToken> fTokenMap= new HashMap<String, IToken>();
+	private String[] fPropertyNamesColor;
+	
+	private int quoteLevel;
+	
+	/**
+	 * Preference keys for boolean preferences which are <code>true</code>,
+	 * iff the corresponding token should be rendered bold. 
+	 */
+	private String[] fPropertyNamesBold;
+	/**
+	 * Preference keys for boolean preferences which are <code>true</code>,
+	 * iff the corresponding token should be rendered italic.
+	 */
+	private String[] fPropertyNamesItalic;
+
+	private static String[] keywords = { 
+		"case", "do", "done", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
+		"esac",	"if", "elif", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		"else",	"fi", "for",  //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		"in", "then" };       //$NON-NLS-1$ //$NON-NLS-2$
+
+	public static final String[] fTokenProperties = new String[] {
+		ColorManager.AUTOCONF_COMMENT_COLOR,
+		ColorManager.AUTOCONF_KEYWORD_COLOR,
+		ColorManager.AUTOCONF_ACMACRO_COLOR,
+		ColorManager.AUTOCONF_AMMACRO_COLOR,
+		ColorManager.AUTOCONF_VAR_REF_COLOR,
+		ColorManager.AUTOCONF_VAR_SET_COLOR,
+		ColorManager.AUTOCONF_CODESEQ_COLOR,
+		ColorManager.AUTOCONF_DEFAULT_COLOR,
+	};
+
+	public AutoconfMacroCodeScanner() {
+		
+		initialize();
+		
+		IToken other= getToken(ColorManager.AUTOCONF_DEFAULT_COLOR);
+		IToken keyword = getToken(ColorManager.AUTOCONF_KEYWORD_COLOR);
+		IToken comment= getToken(ColorManager.AUTOCONF_COMMENT_COLOR);
+		IToken string = getToken(ColorManager.AUTOCONF_DEFAULT_COLOR);
+		IToken varRef = getToken(ColorManager.AUTOCONF_VAR_REF_COLOR);
+		IToken acmacro = getToken(ColorManager.AUTOCONF_ACMACRO_COLOR);
+		IToken ammacro = getToken(ColorManager.AUTOCONF_AMMACRO_COLOR);
+		IToken code = getToken(ColorManager.AUTOCONF_CODESEQ_COLOR);
+		
+		List<IRule> rules= new ArrayList<IRule>();
+
+		// Add rule for single line comments.
+		rules.add(new RestrictedEndOfLineRule("dnl", "[]", comment)); //$NON-NLS-1$
+		rules.add(new RestrictedEndOfLineRule("#", "[]", comment, '\\')); //$NON-NLS-1$
+		
+		// Add special recursive rule for strings which allows variable
+		// references to be internally tokenized.
+		RecursiveSingleLineRule stringRule =
+			new RecursiveSingleLineRule("\"", "\"", string, '\\'); //$NON-NLS-1$ //$NON-NLS-2$
+		stringRule.addRule(new SingleLineRule("${", "}", varRef)); //$NON-NLS-1$ //$NON-NLS-2$
+		rules.add(stringRule);
+		
+		// Add rule for variable references
+		rules.add(new SingleLineRule("${", "}", varRef)); //$NON-NLS-1$ //$NON-NLS-2$
+		// Add rule for strings
+		rules.add(new SingleLineRule("\"", "\"", string, '\\')); //$NON-NLS-1$ //$NON-NLS-2$
+
+		// Add rule for AC_ macros
+		rules.add(new AutoconfMacroRule("AC_", new AutoconfMacroWordDetector(), acmacro)); //$NON-NLS-1$
+
+		// Add rule for AM_ macros
+		rules.add(new AutoconfMacroRule("AM_", new AutoconfMacroWordDetector(), ammacro)); //$NON-NLS-1$
+
+		// Add rule for m4_ macros
+		rules.add(new AutoconfMacroRule("m4_", new AutoconfM4WordDetector(), acmacro)); //$NON-NLS-1$
+		
+		// Add rule for code sequences starting with <<EOF and ending with EOF
+		rules.add(new InlineDataRule(code));
+		
+		// Add word rule for keywords.
+		WordRule wordRule= new WordRule(new AutoconfWordDetector(), other);
+		for (int i= 0; i < keywords.length; i++)
+			wordRule.addWord(keywords[i], keyword);
+		rules.add(wordRule);
+		
+		// Add word rule for identifier.
+		rules.add(new AutoconfIdentifierRule(other));
+		
+		// Make sure we don't treat "\#" as comment start.
+		rules.add(new SingleLineRule("\\#", null, Token.UNDEFINED));
+		
+		rules.add(new WhitespaceRule(new AutoconfWhitespaceDetector()));
+		
+		IRule[] result= new IRule[rules.size()];
+		rules.toArray(result);
+		setRules(result);
+	}
+	
+	/*
+	 * @see ITokenScanner#nextToken()
+	 */
+	public IToken nextToken() {
+		int ch = read();
+		if (ch == '[') {
+			incQuoteLevel();
+			return getToken(ColorManager.AUTOCONF_DEFAULT_COLOR);
+		} else if (ch == ']') {
+			decQuoteLevel();
+			return getToken(ColorManager.AUTOCONF_DEFAULT_COLOR);
+		}
+		unread();
+		return super.nextToken();
+	}
+
+	protected Token getToken(String key) {
+		return (Token) fTokenMap.get(key);
+	}
+
+	private void addToken(String colorKey, String boldKey, String italicKey) {
+		fTokenMap.put(colorKey, new Token(createTextAttribute(colorKey, boldKey, italicKey)));
+	}
+
+	protected String[] getTokenProperties() {
+		return fTokenProperties;
+	}
+	
+	private int indexOf(String property) {
+		if (property != null) {
+			int length= fPropertyNamesColor.length;
+			for (int i= 0; i < length; i++) {
+				if (property.equals(fPropertyNamesColor[i]) || property.equals(fPropertyNamesBold[i]) || property.equals(fPropertyNamesItalic[i]))
+					return i;
+			}
+		}
+		return -1;
+	}
+	
+	public void incQuoteLevel() {
+		++quoteLevel;
+	}
+	
+	public void decQuoteLevel() {
+		--quoteLevel;
+	}
+	
+	public void resetQuoteLevel() {
+		quoteLevel = 0;
+	}
+	
+	public int getQuoteLevel() {
+		return quoteLevel;
+	}
+
+	public boolean affectsBehavior(PropertyChangeEvent event) {
+		return indexOf(event.getProperty()) >= 0;
+	}
+	
+	public void adaptToPreferenceChange(PropertyChangeEvent event) {
+		String p= event.getProperty();
+		int index= indexOf(p);
+		Token token= getToken(fPropertyNamesColor[index]);
+		if (fPropertyNamesColor[index].equals(p))
+			adaptToColorChange(event, token);
+		else if (fPropertyNamesBold[index].equals(p))
+			adaptToStyleChange(event, token, SWT.BOLD);
+		else if (fPropertyNamesItalic[index].equals(p))
+			adaptToStyleChange(event, token, SWT.ITALIC);
+	}
+
+	protected void adaptToColorChange(PropertyChangeEvent event, Token token) {
+		RGB rgb= null;
+		Object value= event.getNewValue();
+		if (value instanceof RGB) {
+			rgb= (RGB) value;
+		} else if (value instanceof String) {
+			rgb= StringConverter.asRGB((String) value);
+		}
+			
+		if (rgb != null) {
+			TextAttribute attr= (TextAttribute) token.getData();
+			token.setData(new TextAttribute(ColorManager.getDefault().getColor(rgb), attr.getBackground(), attr.getStyle()));
+		}
+	}
+
+	protected void adaptToStyleChange(PropertyChangeEvent event, Token token, int styleAttribute) {
+	 	if (token == null) {
+			return;
+		}
+		boolean eventValue= false;
+		Object value= event.getNewValue();
+		if (value instanceof Boolean) {
+			eventValue= ((Boolean) value).booleanValue();
+		} else if (IPreferenceStore.TRUE.equals(value)) {
+			eventValue= true;
+		}
+		
+		TextAttribute attr= (TextAttribute) token.getData();
+		boolean activeValue= (attr.getStyle() & styleAttribute) == styleAttribute;
+		if (activeValue != eventValue) { 
+			token.setData(new TextAttribute(attr.getForeground(), attr.getBackground(), eventValue ? attr.getStyle() | styleAttribute : attr.getStyle() & ~styleAttribute));
+		}
+	}
+
+	protected TextAttribute createTextAttribute(String colorID, String boldKey, String italicKey) {
+		Color color= null;
+		if (colorID != null) {
+			color= AutoconfEditor.getPreferenceColor(colorID);
+		}
+		IPreferenceStore store= AutotoolsPlugin.getDefault().getPreferenceStore();
+		int style= store.getBoolean(boldKey) ? SWT.BOLD : SWT.NORMAL;
+		if (store.getBoolean(italicKey)) {
+			style |= SWT.ITALIC;
+		}		
+		return new TextAttribute(color, null, style);
+	}
+	
+	/**
+	 * Must be called after the constructor has been called.
+	 */
+	public final void initialize() {
+	
+		resetQuoteLevel();
+		fPropertyNamesColor= getTokenProperties();
+		int length= fPropertyNamesColor.length;
+		fPropertyNamesBold= new String[length];
+		fPropertyNamesItalic= new String[length];
+
+		for (int i= 0; i < length; i++) {
+			fPropertyNamesBold[i]= fPropertyNamesColor[i] + AutotoolsEditorPreferenceConstants.EDITOR_BOLD_SUFFIX;
+			fPropertyNamesItalic[i]= fPropertyNamesColor[i] + AutotoolsEditorPreferenceConstants.EDITOR_ITALIC_SUFFIX;
+			addToken(fPropertyNamesColor[i], fPropertyNamesBold[i], fPropertyNamesItalic[i]);
+		}
+	}
+
+	/*
+	 * @see ICharacterScanner#unread()
+	 */
+	public void unread() {
+	    	--fOffset;
+	    	fColumn = UNDEFINED;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java
new file mode 100644
index 0000000..b1c9590
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java
@@ -0,0 +1,120 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import java.util.ArrayList;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.contentassist.CompletionProposal;
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.text.contentassist.IContextInformation;
+import org.eclipse.jface.text.contentassist.IContextInformationValidator;
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.text.hover.AutoconfTextHover;
+
+
+public class AutoconfMacroContentAssistProcessor implements
+		IContentAssistProcessor {
+	
+	protected ICharacterScanner scanner;
+	protected AutoconfEditor editor;
+	
+	public AutoconfMacroContentAssistProcessor(ICharacterScanner scanner, AutoconfEditor editor) {
+		this.scanner = scanner;
+		this.editor = editor;
+	}
+
+	private int computeMacroStart(IDocument document, int offset) {
+		try {
+			while (Character.isJavaIdentifierPart(document.getChar(offset - 1))) {
+				--offset;
+			}
+		} catch (BadLocationException e) {
+			// Do nothing
+		}
+		return offset;
+	}
+	
+	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer,
+			int offset) {
+		
+		IDocument document = viewer.getDocument();
+		String prefix = ""; //$NON-NLS-1$
+		AutoconfMacro[] macros = AutoconfTextHover.getMacroList(editor);
+		try {
+			int macroStart = computeMacroStart(document, offset);
+			if (macroStart < offset) {
+				prefix = prefix + document.get(macroStart, offset - macroStart);
+			}
+		} catch (BadLocationException e) {
+			// Do nothing.  Leave prefix empty.
+		}
+		ICompletionProposal[] result = null;
+		if (macros != null) {
+			ArrayList<ICompletionProposal> validList = new ArrayList<ICompletionProposal>();
+			for (int i = 0; i < macros.length; ++i) {
+				String name = macros[i].getName();
+				if (name.length() >= prefix.length()) {
+					if (name.startsWith(prefix)) {
+						String template = macros[i].getTemplate();
+						int cursorPos = template.length();
+						int prefixLen = prefix.length();
+						if (template.charAt(template.length() - 1) == ')')
+							cursorPos -= 1;
+						AutoconfMacroProposalContextInformation ci = null;
+						if (macros[i].hasParms()) {
+							// Provide parameter info as context information that
+							// is tied to the completion proposal.
+							ci = new AutoconfMacroProposalContextInformation(macros[i].getParms(), macros[i].getParms());
+							ci.setContextInformationPosition(offset - prefixLen + cursorPos - 1);
+						}
+						ICompletionProposal cp = new CompletionProposal(template, offset - prefixLen, prefixLen, cursorPos, null, 
+								name, ci, AutoconfTextHover.getIndexedInfo(name, editor));
+						validList.add(cp);
+					}
+				}
+			}
+			result = new ICompletionProposal[validList.size()];
+			result = (ICompletionProposal[])validList.toArray(result);
+		}
+		return result;
+	}
+
+	public IContextInformation[] computeContextInformation(ITextViewer viewer,
+			int offset) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public char[] getCompletionProposalAutoActivationCharacters() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public char[] getContextInformationAutoActivationCharacters() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public IContextInformationValidator getContextInformationValidator() {
+		// TODO Auto-generated method stub
+		return new AutoconfMacroParameterListValidator();
+	}
+
+	public String getErrorMessage() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java
new file mode 100644
index 0000000..c6ead68
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.DocumentEvent;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITypedRegion;
+import org.eclipse.jface.text.TextPresentation;
+import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
+import org.eclipse.jface.text.rules.ITokenScanner;
+
+public class AutoconfMacroDamagerRepairer extends DefaultDamagerRepairer {
+	
+	public final static String UNMATCHED_RIGHT_PARENTHESIS = "UnmatchedRightParenthesis"; //$NON-NLS-1$
+	public final static String UNMATCHED_LEFT_PARENTHESIS = "UnmatchedLeftParenthesis"; //$NON-NLS-1$
+	public final static String UNMATCHED_RIGHT_QUOTE = "UnmatchedRightQuote"; //$NON-NLS-1$
+	public final static String UNMATCHED_LEFT_QUOTE = "UnmatchedLeftQuote"; //$NON-NLS-1$
+	
+	/**
+	 * Creates a damager/repairer that uses the given scanner. The scanner may not be <code>null</code>
+	 * and is assumed to return only token that carry text attributes.
+	 *
+	 * @param scanner the token scanner to be used, may not be <code>null</code>
+	 */
+	public AutoconfMacroDamagerRepairer(ITokenScanner scanner) {
+		super(scanner);
+	}
+
+	/*
+	 * @see IPresentationDamager#getDamageRegion(ITypedRegion, DocumentEvent, boolean)
+	 */
+	public IRegion getDamageRegion(ITypedRegion partition, DocumentEvent e, boolean documentPartitioningChanged) {
+		// In the case of a partition with multiline rules, we will punt to
+		// reparse the entire partition because we don't know if the line being
+		// edited is in the middle of an area covered by a multiline rule.  In
+		// such a case, we need to back up and find the start sequence of the
+		// rule.  It is easiest to just reparse the whole partition.
+		return partition;
+	}
+	
+	/*
+	 * @see IPresentationRepairer#createPresentation(TextPresentation, ITypedRegion)
+	 */
+	public void createPresentation(TextPresentation presentation, ITypedRegion region) {
+
+//		int offset = region.getOffset();
+//		int length = region.getLength();
+		
+		super.createPresentation(presentation, region);
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroParameterListValidator.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroParameterListValidator.java
new file mode 100644
index 0000000..f59fbc5
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroParameterListValidator.java
@@ -0,0 +1,215 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2005 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.TextPresentation;
+import org.eclipse.jface.text.contentassist.IContextInformation;
+import org.eclipse.jface.text.contentassist.IContextInformationPresenter;
+import org.eclipse.jface.text.contentassist.IContextInformationValidator;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyleRange;
+
+/**
+ * This class provides the macro call parameter parsing for the Autoconf Editor hover
+ * It is modified from the CDT class CParameterListValidator
+ * 
+ * @author jjohnstn
+ *
+ */
+public class AutoconfMacroParameterListValidator implements IContextInformationValidator, IContextInformationPresenter {
+	private int fPosition;
+	private ITextViewer fViewer;
+	private IContextInformation fInformation;
+	
+	private int fCurrentParameter;
+	
+	public AutoconfMacroParameterListValidator() {
+	}
+	
+	/**
+	 * @see IContextInformationValidator#install(IContextInformation, ITextViewer, int)
+	 * @see IContextInformationPresenter#install(IContextInformation, ITextViewer, int)
+	 */
+	public void install(IContextInformation info, ITextViewer viewer, int documentPosition) {
+		
+		fPosition= documentPosition;
+		fViewer= viewer;
+		fInformation= info;
+		
+		fCurrentParameter= -1;
+	}
+	
+	private int getStringEnd(IDocument d, int pos, int end, char ch) throws BadLocationException {
+		while (pos < end) {
+			char curr= d.getChar(pos);
+			pos++;
+			if (curr == '\\') {
+				// ignore escaped characters
+				pos++;
+			} else if (curr == ch) {
+				return pos;
+			}
+		}
+		return end;
+	}
+	
+	private int getCharCount(IDocument document, int start, int end, 
+							 char increment, char decrement, boolean considerNesting) throws BadLocationException {
+		
+		Assert.isTrue((increment != 0 || decrement != 0) && increment != decrement);
+		
+		// There are two nesting levels to worry about.  Arguments can be
+		// quoted with [] which means to treat the contents as one arg.
+		// As well, macro calls can be nested within macro calls so we
+		// have to handle parentheses.
+		int macroQuotingLevel = 0; // Pertaining to '[' and ']' quoted args.
+		int macroNestingLevel = -1; // Set to -1 to take into account first ( for function call
+		int charCount = 0;
+		while (start < end) {
+			char curr = document.getChar(start++);
+			switch (curr) {
+				case 'd':
+					if (start < end - 2) {
+						char next= document.getChar(start);
+						if (next == 'n') {
+							// a comment starts, advance to the comment end
+							next = document.getChar(start + 1);
+							if (next == 'l')
+							// dnl-comment: nothing to do anymore on this line 
+								start= end;
+						}
+					}
+					break;
+				case '"':
+				case '\'':
+					start= getStringEnd(document, start, end, curr);
+					break;
+				default:
+					if ('[' == curr)
+						++ macroQuotingLevel;
+					else if (']' == curr)
+						-- macroQuotingLevel;
+					if (macroQuotingLevel != 0)
+						break;
+					if (considerNesting) {
+						if ('(' == curr)
+							++ macroNestingLevel;
+						else if (')' == curr) {
+							-- macroNestingLevel;
+						}
+						if (macroNestingLevel != 0)
+							break;
+					}
+					if (increment != 0) {
+						if (curr == increment) {
+							++charCount;
+						}
+					}
+					
+					if (decrement != 0) {
+						if (curr == decrement) {
+							-- charCount;
+						}
+					}
+			}
+		}
+		
+		return charCount;
+	}
+	
+	/**
+	 * @see IContextInformationValidator#isContextInformationValid(int)
+	 */
+	public boolean isContextInformationValid(int position) {		
+		
+		try {
+			if (position < fPosition)
+				return false;
+				
+			IDocument document= fViewer.getDocument();
+			IRegion line= document.getLineInformationOfOffset(fPosition);
+			
+			if (position > line.getOffset() + line.getLength())
+				return false;
+				
+			return (getCharCount(document, fPosition, position, '(', ')', false) >= 0);
+			
+		} catch (BadLocationException x) {
+			return false;
+		}
+	}
+	
+	/**
+	 * @see IContextInformationPresenter#updatePresentation(int, TextPresentation)
+	 */
+	public boolean updatePresentation(int position, TextPresentation presentation) {
+
+		int currentParameter= -1;
+		try {
+			currentParameter= getCharCount(fViewer.getDocument(), fPosition, position, ',', (char) 0, true);
+		} catch (BadLocationException x) {
+			return false;
+		}
+		
+		if (fCurrentParameter != -1) {
+			if (currentParameter == fCurrentParameter)
+				return false;
+		}
+		
+		presentation.clear();
+		fCurrentParameter= currentParameter;
+		
+		//Don't presume what has been done to the string, rather use as is
+		String s= fInformation.getInformationDisplayString();
+		
+		//@@@ This is obviously going to have problems with functions such
+		//int myfunction(int (*function_argument)(void * extra, int param), void * extra)
+		//int myfunction(/*A comment, indeed */int a);
+		int start= 0;
+		int occurrences= 0;
+		while (occurrences < fCurrentParameter) {
+			int found= s.indexOf(',', start);
+			if (found == -1)
+				break;
+			start= found + 1;
+			++ occurrences;
+		}
+		
+		if (occurrences < fCurrentParameter) {
+			presentation.addStyleRange(new StyleRange(0, s.length(), null, null, SWT.NORMAL));
+			return true;
+		}
+		
+		if (start == -1)
+			start= 0;
+		
+		int end= s.indexOf(',', start);
+		if (end == -1)
+			end= s.length();
+			
+		if (start > 0)	
+			presentation.addStyleRange(new StyleRange(0, start, null, null, SWT.NORMAL));
+		
+		if (end > start)
+			presentation.addStyleRange(new StyleRange(start, end - start, null, null, SWT.BOLD));
+		
+		if (end < s.length())
+			presentation.addStyleRange(new StyleRange(end, s.length() - end, null, null, SWT.NORMAL));
+			
+		return true;
+	}
+}
+
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroPartitionRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroPartitionRule.java
new file mode 100644
index 0000000..49b0566
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroPartitionRule.java
@@ -0,0 +1,148 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IPredicateRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.IWhitespaceDetector;
+import org.eclipse.jface.text.rules.IWordDetector;
+import org.eclipse.jface.text.rules.Token;
+
+
+public class AutoconfMacroPartitionRule implements IPredicateRule {
+	/**
+	 * The default token to be returned on success and if nothing else has been
+	 * specified.
+	 */
+	protected IToken token;
+
+	private IWordDetector generalMacroWordDetector;
+	private IWordDetector m4MacroWordDetector;
+	protected IWordDetector fDetector;
+	protected IWhitespaceDetector fWsDetector = new AutoconfWhitespaceDetector();
+
+	/** The column constraint */
+	protected int fColumn = UNDEFINED;
+
+	/** Internal setting for the un-initialized column constraint */
+	protected static final int UNDEFINED = -1;
+
+	/** Buffer used for pattern detection */
+	private StringBuffer fBuffer = new StringBuffer();
+
+	public AutoconfMacroPartitionRule(IToken inToken) {
+		token = inToken;
+		generalMacroWordDetector = new AutoconfMacroWordDetector();
+		m4MacroWordDetector = new AutoconfM4WordDetector();
+	}
+
+	public IToken getSuccessToken() {
+		return token;
+	}
+	
+	protected void matchParentheses(ICharacterScanner scanner) {
+		boolean finished = false;
+		int depth = 1;
+		int quoteDepth = 0;
+		int c = scanner.read();
+		while (!finished && c != ICharacterScanner.EOF) {
+			if (c == '[') {
+				++quoteDepth;
+			}
+			else if (c == ']') {
+				--quoteDepth;
+				if (quoteDepth < 0)
+					finished = true;
+			}
+			if (quoteDepth == 0) {
+				if (c == ')') {
+				  --depth;
+				  if (depth <= 0)
+					  finished = true;
+				}
+				else if (c == '(') {
+					++depth;
+				}
+			}
+			c = scanner.read();
+		}
+	}
+	
+	public IToken evaluate(ICharacterScanner scanner, boolean resume) {
+//		if (resume)
+//			return Token.UNDEFINED;
+		return evaluate(scanner);
+	}
+	
+	public IToken evaluate(ICharacterScanner scanner) {
+		int c = scanner.read();
+		fBuffer.setLength(0);
+
+		fBuffer.append((char)c);
+		if (c == 'A') {
+			c = scanner.read();
+			fBuffer.append((char)c);
+			if (c != 'C' && c != 'H' && c != 'M') {
+				unreadBuffer(scanner);
+				return Token.UNDEFINED;	
+			}
+			fDetector = generalMacroWordDetector;
+		} else if (c == 'm') {
+			c = scanner.read();
+			fBuffer.append((char)c);
+			if (c != 4) {
+				unreadBuffer(scanner);
+				return Token.UNDEFINED;
+			}
+			fDetector = m4MacroWordDetector;
+		} else {
+			unreadBuffer(scanner);
+			return Token.UNDEFINED;
+		}
+		
+    	c = scanner.read();
+		while (c != ICharacterScanner.EOF
+				&& fDetector.isWordPart((char) c)) {
+			fBuffer.append((char) c);
+			c = scanner.read();
+		}
+
+		if (c != ICharacterScanner.EOF) {
+			if (c == ';' || fWsDetector.isWhitespace((char)c)) {
+				// We are done
+			}
+			else if (c == '(') {
+				matchParentheses(scanner);
+			}
+			else {
+				scanner.unread();
+				unreadBuffer(scanner);
+				return Token.UNDEFINED;
+			}
+		}
+
+		scanner.unread();
+		return token;
+	}
+
+	/**
+	 * Returns the characters in the buffer to the scanner.
+	 * 
+	 * @param scanner
+	 *            the scanner to be used
+	 */
+	protected void unreadBuffer(ICharacterScanner scanner) {
+		for (int i = fBuffer.length() - 1; i >= 0; i--)
+			scanner.unread();
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroProposalContextInformation.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroProposalContextInformation.java
new file mode 100644
index 0000000..e549af6
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroProposalContextInformation.java
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corp. - Rational Software - initial implementation
+ *******************************************************************************/
+/*
+ * Created on May 6, 2004
+ */
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.contentassist.IContextInformation;
+import org.eclipse.jface.text.contentassist.IContextInformationExtension;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * @author aniefer
+ */
+public class AutoconfMacroProposalContextInformation implements IContextInformation, IContextInformationExtension {
+	/** The name of the context */
+	private String fContextDisplayString;
+	/** The information to be displayed */
+	private String fInformationDisplayString;
+	/** The position to display the information */
+	private int fInformationPosition;
+	/** The image to be displayed */
+	private Image fImage;
+
+	/**
+	 * Creates a new context information without an image.
+	 *
+	 * @param contextDisplayString the string to be used when presenting the context
+	 * @param informationDisplayString the string to be displayed when presenting the context information
+	 */
+	public AutoconfMacroProposalContextInformation(String contextDisplayString, String informationDisplayString) {
+		this(null, contextDisplayString, informationDisplayString);
+	}
+
+	/**
+	 * Creates a new context information with an image.
+	 *
+	 * @param image the image to display when presenting the context information
+	 * @param contextDisplayString the string to be used when presenting the context
+	 * @param informationDisplayString the string to be displayed when presenting the context information,
+	 *		may not be <code>null</code>
+	 */
+	public AutoconfMacroProposalContextInformation(Image image, String contextDisplayString, String informationDisplayString) {
+		//Assert.isNotNull(informationDisplayString);
+		fImage= image;
+		fContextDisplayString= contextDisplayString;
+		fInformationDisplayString= informationDisplayString;
+	}
+
+	/*
+	 * @see IContextInformation#equals(Object)
+	 */
+	public boolean equals(Object object) {
+		if (object instanceof IContextInformation) {
+			IContextInformation contextInformation= (IContextInformation) object;
+			boolean equals= fInformationDisplayString.equalsIgnoreCase(contextInformation.getInformationDisplayString());
+			if (fContextDisplayString != null) 
+				equals= equals && fContextDisplayString.equalsIgnoreCase(contextInformation.getContextDisplayString());
+			return equals;
+		}
+		return false;
+	}
+	
+	/*
+	 * @see IContextInformation#getInformationDisplayString()
+	 */
+	public String getInformationDisplayString() {
+		return fInformationDisplayString;
+	}
+	
+	/*
+	 * @see IContextInformation#getImage()
+	 */
+	public Image getImage() {
+		return fImage;
+	}
+	
+	/*
+	 * @see IContextInformation#getContextDisplayString()
+	 */
+	public String getContextDisplayString() {
+		if (fContextDisplayString != null)
+			return fContextDisplayString;
+		return fInformationDisplayString;
+	}
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.contentassist.IContextInformationExtension#getContextInformationPosition()
+	 */
+	public int getContextInformationPosition() {
+		return fInformationPosition;
+	}
+	
+	public void setContextInformationPosition( int pos ){
+		fInformationPosition = pos;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroRule.java
new file mode 100644
index 0000000..caab3d6
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroRule.java
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.IWhitespaceDetector;
+import org.eclipse.jface.text.rules.IWordDetector;
+import org.eclipse.jface.text.rules.Token;
+
+public class AutoconfMacroRule implements IRule {
+	/**
+	 * The default token to be returned on success and if nothing else has been
+	 * specified.
+	 */
+	protected IToken token;
+
+	protected IWordDetector fDetector;
+	protected IWhitespaceDetector fWsDetector = new AutoconfWhitespaceDetector();
+
+	/** The column constraint */
+	protected int fColumn = UNDEFINED;
+
+	/** Internal setting for the un-initialized column constraint */
+	protected static final int UNDEFINED = -1;
+
+	/** Buffer used for pattern detection */
+	private StringBuffer fBuffer = new StringBuffer();
+
+	private String fStartingSequence;
+
+	public AutoconfMacroRule(String startingSequence,
+			IWordDetector detector, IToken inToken) {
+		token = inToken;
+		fDetector = detector;
+		fStartingSequence = startingSequence;
+	}
+
+	public IToken evaluate(ICharacterScanner scanner) {
+		int c = scanner.read();
+		fBuffer.setLength(0);
+
+		for (int i = 0; i < fStartingSequence.length(); i++) {
+			fBuffer.append((char) c);
+			if (fStartingSequence.charAt(i) != c) {
+				unreadBuffer(scanner);
+				return Token.UNDEFINED;
+			}
+			c = scanner.read();
+		}
+
+		while (c != ICharacterScanner.EOF
+				&& fDetector.isWordPart((char) c)) {
+			fBuffer.append((char) c);
+			c = scanner.read();
+		}
+
+		if (c != ICharacterScanner.EOF && c != '(' && c != ';'
+			&& !fWsDetector.isWhitespace((char)c)) {
+			unreadBuffer(scanner);
+			return Token.UNDEFINED;
+		}
+
+		scanner.unread();
+		return token;
+	}
+
+	/**
+	 * Returns the characters in the buffer to the scanner.
+	 * 
+	 * @param scanner
+	 *            the scanner to be used
+	 */
+	protected void unreadBuffer(ICharacterScanner scanner) {
+		for (int i = fBuffer.length() - 1; i >= 0; i--)
+			scanner.unread();
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroWordDetector.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroWordDetector.java
new file mode 100644
index 0000000..2a0e0f8
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroWordDetector.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.rules.IWordDetector;
+
+public class AutoconfMacroWordDetector implements IWordDetector {
+
+	public boolean isWordPart(char c) {
+		return ((Character.isLetter(c) && Character.isUpperCase(c)) || 
+				Character.isDigit(c) ||	c == '_');
+	}
+
+	public boolean isWordStart(char c) {
+		return (c == 'A');
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPKGWordDetector.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPKGWordDetector.java
new file mode 100644
index 0000000..49c923d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPKGWordDetector.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2008 NOKIA Inc
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.rules.IWordDetector;
+
+public class AutoconfPKGWordDetector implements IWordDetector {
+
+	public boolean isWordPart(char c) {
+		return ((Character.isLetter(c) && Character.isUpperCase(c)) || 
+				Character.isDigit(c) ||	c == '_');
+	}
+
+	public boolean isWordStart(char c) {
+		return (c == 'P');
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitionScanner.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitionScanner.java
new file mode 100644
index 0000000..7dd8f70
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitionScanner.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jface.text.rules.EndOfLineRule;
+import org.eclipse.jface.text.rules.IPredicateRule;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
+import org.eclipse.jface.text.rules.SingleLineRule;
+import org.eclipse.jface.text.rules.Token;
+
+public class AutoconfPartitionScanner extends RuleBasedPartitionScanner {
+	
+	public final static String AUTOCONF_MACRO = "autoconf_macro"; //$NON-NLS-1$
+	public final static String AUTOCONF_COMMENT = "autoconf_comment"; //$NON-NLS-1$
+	public final static String[] AUTOCONF_PARTITION_TYPES= 
+		new String[] { AUTOCONF_MACRO, AUTOCONF_COMMENT };
+	
+	/**
+	 * Creates the partitioner and sets up the appropriate rules.
+	 */
+	public AutoconfPartitionScanner() {
+		super();
+		
+		List<IRule> rules= new ArrayList<IRule>();
+		Token macro = new Token(AUTOCONF_MACRO);
+		Token comment = new Token(AUTOCONF_COMMENT);
+
+		// Add rule for target bodies.
+		rules.add(new AutoconfMacroPartitionRule(macro));
+		
+
+		rules.add(new EndOfLineRule("dnl", comment)); //$NON-NLS-1$
+		rules.add(new SingleLineRule("\\#", null, Token.UNDEFINED));
+		rules.add(new EndOfLineRule("#", comment, '\\')); //$NON-NLS-1$
+		
+		// We want to process identifiers that might have macro
+		// names inside them.
+		rules.add(new AutoconfIdentifierRule(Token.UNDEFINED));
+
+		IPredicateRule[] result= new IPredicateRule[rules.size()];
+		rules.toArray(result);
+		setPredicateRules(result);
+	}
+	
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitioner.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitioner.java
new file mode 100644
index 0000000..c449f42
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitioner.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITypedRegion;
+import org.eclipse.jface.text.rules.FastPartitioner;
+import org.eclipse.jface.text.rules.IPartitionTokenScanner;
+
+public class AutoconfPartitioner extends FastPartitioner {
+
+	public AutoconfPartitioner(IPartitionTokenScanner scanner, String[] legalContentTypes) {
+		// TODO Auto-generated constructor stub
+		super(scanner, legalContentTypes);
+	}
+			
+	public void connect(IDocument document, int blah) {
+		super.connect(document);
+	}
+	
+	// To optionally show partitions, we must do so by overriding the computePartitioning
+	// method.  We cannot do it at connect time because the document may be zero length
+	// at the time and we will end up getting default partitioning from then on.
+	public ITypedRegion[] computePartitioning(int offset, int length, 
+			boolean includeZeroLength) {
+		ITypedRegion[] regions = super.computePartitioning(offset, length, includeZeroLength);
+		// Uncomment the following line to see partitioning.
+//		printPartitions(regions);
+		return regions;
+	}
+	
+	public void printPartitions(ITypedRegion[] partitions)
+	{
+		StringBuffer buffer = new StringBuffer();
+
+		for (int i = 0; i < partitions.length; i++)
+		{
+			try
+			{
+				buffer.append("Partition type: " + partitions[i].getType() //$NON-NLS-1$
+						+ ", offset: " + partitions[i].getOffset() //$NON-NLS-1$
+						+ ", length: " + partitions[i].getLength()); //$NON-NLS-1$
+				buffer.append("\n"); //$NON-NLS-1$
+				buffer.append("Text:\n"); //$NON-NLS-1$
+				buffer.append(super.fDocument.get(partitions[i].getOffset(), partitions[i].getLength()));
+				buffer.append("\n---------------------------\n\n\n"); //$NON-NLS-1$
+			}
+			catch (BadLocationException e)
+			{
+				e.printStackTrace();
+			}
+		}
+		System.out.print(buffer);
+	}
+}
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfReconcilingStrategy.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfReconcilingStrategy.java
new file mode 100644
index 0000000..b81aead
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfReconcilingStrategy.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.reconciler.DirtyRegion;
+import org.eclipse.jface.text.reconciler.IReconcilingStrategy;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.outline.AutoconfContentOutlinePage;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfParser;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+
+
+public class AutoconfReconcilingStrategy implements IReconcilingStrategy {
+
+	AutoconfContentOutlinePage outline;
+	int lastRegionOffset;
+	AutoconfEditor editor;
+	IDocumentProvider documentProvider;
+	
+	public AutoconfReconcilingStrategy(AutoconfEditor editor) {
+		outline= editor.getOutlinePage();
+		lastRegionOffset = Integer.MAX_VALUE;
+		this.editor = editor;
+		documentProvider = editor.getDocumentProvider();
+	}
+	
+	public void reconcile(IRegion partition) {
+		try {
+			AutoconfParser parser = editor.getAutoconfParser();
+			((AutoconfErrorHandler)parser.getErrorHandler()).removeAllExistingMarkers();
+			editor.setRootElement(parser.parse(documentProvider.getDocument(editor.getEditorInput())));
+			outline.update();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void reconcile(DirtyRegion dirtyRegion, IRegion subRegion) {
+		// TODO Auto-generated method stub
+
+	}
+
+	public void setDocument(IDocument document) {
+		// TODO Auto-generated method stub
+
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java
new file mode 100644
index 0000000..958cf70
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java
@@ -0,0 +1,119 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITextHover;
+import org.eclipse.jface.text.contentassist.ContentAssistant;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.text.contentassist.IContentAssistant;
+import org.eclipse.jface.text.presentation.IPresentationReconciler;
+import org.eclipse.jface.text.presentation.PresentationReconciler;
+import org.eclipse.jface.text.reconciler.IReconciler;
+import org.eclipse.jface.text.reconciler.MonoReconciler;
+import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
+import org.eclipse.jface.text.source.IAnnotationHover;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.text.hover.AutoconfTextHover;
+import org.eclipse.ui.editors.text.TextSourceViewerConfiguration;
+
+
+public class AutoconfSourceViewerConfiguration extends
+		TextSourceViewerConfiguration {
+
+	private ITextHover acHover;
+	private IAnnotationHover aaHover;
+	private AutoconfEditor fEditor;
+	
+	public AutoconfSourceViewerConfiguration(IPreferenceStore prefs, AutoconfEditor editor) {
+		super(prefs);
+		fEditor = editor;
+	}
+	
+	/*
+	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getConfiguredDocumentPartitioning(org.eclipse.jface.text.source.ISourceViewer)
+	 */
+	public String getConfiguredDocumentPartitioning(ISourceViewer sourceViewer) {
+		return AutoconfEditor.AUTOCONF_PARTITIONING;
+	}
+
+	/*
+	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getContentAssistant(org.eclipse.jface.text.source.ISourceViewer)
+	 */
+	public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
+		ContentAssistant assistant = new ContentAssistant();
+		
+		IContentAssistProcessor macroContentAssistProcessor =
+			new AutoconfMacroContentAssistProcessor(new AutoconfMacroCodeScanner(), fEditor);
+		assistant.setContentAssistProcessor(macroContentAssistProcessor, AutoconfPartitionScanner.AUTOCONF_MACRO);
+		assistant.setContentAssistProcessor(macroContentAssistProcessor, IDocument.DEFAULT_CONTENT_TYPE);
+		assistant.enableAutoActivation(true);
+		assistant.setAutoActivationDelay(500);
+		assistant.setProposalPopupOrientation(IContentAssistant.PROPOSAL_OVERLAY);
+		assistant.setContextInformationPopupOrientation(IContentAssistant.CONTEXT_INFO_ABOVE);
+		assistant.setInformationControlCreator(AutoconfTextHover.getInformationControlCreator());
+		
+		return assistant;
+	}
+	
+	/* (non-Javadoc)
+	 * Method declared on SourceViewerConfiguration
+	 */
+	public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
+		return new String[] { IDocument.DEFAULT_CONTENT_TYPE,
+							  AutoconfPartitionScanner.AUTOCONF_MACRO,
+							  AutoconfPartitionScanner.AUTOCONF_COMMENT};
+	}
+	
+	public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) {
+		if (acHover == null)
+			acHover = new AutoconfTextHover(fEditor);
+		return acHover;
+	}
+	
+	public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) {
+		if (aaHover == null)
+			aaHover = new AutoconfAnnotationHover();
+		return aaHover;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getReconciler(org.eclipse.jface.text.source.ISourceViewer)
+	 */
+	public IReconciler getReconciler(ISourceViewer sourceViewer) {
+		MonoReconciler reconciler= new MonoReconciler(new AutoconfReconcilingStrategy(fEditor), false);
+		reconciler.setDelay(1000);
+		reconciler.setProgressMonitor(new NullProgressMonitor());
+		return reconciler;
+	}
+	/* (non-Javadoc)
+	 * Method declared on SourceViewerConfiguration
+	 */
+	public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
+		PresentationReconciler reconciler = new PresentationReconciler();
+
+		DefaultDamagerRepairer dr= new AutoconfMacroDamagerRepairer(new AutoconfMacroCodeScanner());
+		reconciler.setDamager(dr, AutoconfPartitionScanner.AUTOCONF_MACRO);
+		reconciler.setRepairer(dr, AutoconfPartitionScanner.AUTOCONF_MACRO);
+		
+		dr= new DefaultDamagerRepairer(new AutoconfCodeScanner());
+		reconciler.setDamager(dr, AutoconfPartitionScanner.AUTOCONF_COMMENT);
+		reconciler.setRepairer(dr, AutoconfPartitionScanner.AUTOCONF_COMMENT);
+		
+		dr= new MultilineRuleDamagerRepairer(new AutoconfCodeScanner());
+		reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
+		reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
+		
+		return reconciler;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfWhitespaceDetector.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfWhitespaceDetector.java
new file mode 100644
index 0000000..1219c8d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfWhitespaceDetector.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.rules.IWhitespaceDetector;
+
+public class AutoconfWhitespaceDetector implements IWhitespaceDetector {
+
+	public boolean isWhitespace(char c) {
+		return (c == ' ' || c == '\t' || c == '\n' || c == '\r');
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfWordDetector.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfWordDetector.java
new file mode 100644
index 0000000..1017f97
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfWordDetector.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.rules.IWordDetector;
+
+public class AutoconfWordDetector implements IWordDetector {
+
+	private static final String correctStartSpecChars = "%*().><"; //$NON-NLS-1$
+	private static final String correctSpecChars = "@$/\\><"; //$NON-NLS-1$
+
+	/**
+	 * @see IWordDetector#isWordPart(character)
+	 */
+	public boolean isWordPart(char character) {
+		return Character.isLetterOrDigit(character) || (correctSpecChars.indexOf(character) >= 0);
+	}
+
+	/**
+	 * @see IWordDetector#isWordStart(char)
+	 */
+	public boolean isWordStart(char character) {
+		return Character.isLetterOrDigit(character) || (correctStartSpecChars.indexOf(character) >= 0);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolEditorActionDefinitionIds.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolEditorActionDefinitionIds.java
new file mode 100644
index 0000000..74d4f16
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolEditorActionDefinitionIds.java
@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+
+public interface IAutotoolEditorActionDefinitionIds {
+	public static final String SHOW_TOOLTIP = AutotoolsUIPlugin.getUniqueIdentifier() + ".editors.text.show.tooltip"; //$NON-NLS-1$
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolHelpContextIds.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolHelpContextIds.java
new file mode 100644
index 0000000..cd822f4
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolHelpContextIds.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+
+public interface IAutotoolHelpContextIds {
+	public static final String PREFIX = AutotoolsUIPlugin.getUniqueIdentifier();
+	public static final String AC_EDITOR_VIEW = PREFIX + "autoconf_editor"; //$NON-NLS-1$
+	public static final String SHOW_TOOLTIP_ACTION = PREFIX + "show_tooltip_action"; //$NON-NLS-1$
+	public static final String CONTENT_ASSIST = PREFIX + "content_assist"; //$NON-NLS-1$
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolsEditor.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolsEditor.java
new file mode 100644
index 0000000..0a2c730
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolsEditor.java
@@ -0,0 +1,18 @@
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.IReconcilingParticipant;
+import org.eclipse.ui.texteditor.ITextEditor;
+
+
+public interface IAutotoolsEditor extends ITextEditor {
+	
+	public Object getAdapter(Class<?> key);
+	
+	/**
+	 * Adds the given listener.
+	 * Has no effect if an identical listener was not already registered.
+	 * 
+	 * @param listener	The reconcile listener to be added
+	 */
+	public void addReconcilingParticipant(IReconcilingParticipant listener);
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/InlineDataRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/InlineDataRule.java
new file mode 100644
index 0000000..658bae4
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/InlineDataRule.java
@@ -0,0 +1,165 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.IWhitespaceDetector;
+import org.eclipse.jface.text.rules.IWordDetector;
+import org.eclipse.jface.text.rules.Token;
+
+public class InlineDataRule implements IRule {
+	/**
+	 * The default token to be returned on success and if nothing else has been
+	 * specified.
+	 */
+	protected IToken token;
+
+	protected IWordDetector fDetector;
+	protected IWhitespaceDetector fWsDetector = new AutoconfWhitespaceDetector();
+
+	/** The column constraint */
+	protected int fColumn = UNDEFINED;
+
+	/** Internal setting for the un-initialized column constraint */
+	protected static final int UNDEFINED = -1;
+
+	/** Buffer used for pattern detection */
+	private StringBuffer fBuffer = new StringBuffer();
+
+	private String fStartingSequence = "<<";
+
+	public InlineDataRule(IToken inToken) {
+		token = inToken;
+	}
+
+	// Confirm an EOL delimeter after already matching first delimeter character.
+	protected boolean confirmDelimeter(ICharacterScanner scanner, char[] delimeter) {
+		int c = scanner.read();
+		StringBuffer buffer = new StringBuffer();
+		buffer.append((char)c);
+		for (int i = 1; i < delimeter.length; ++i) {
+			if (c == delimeter[i]) {
+				c = scanner.read();
+				buffer.append((char)c);
+			} else {
+				for (int j = buffer.length() - 1; j >= 0; j--)
+					scanner.unread();
+				return false;
+			}
+		}
+		scanner.unread();
+		return true;
+	}
+	public IToken evaluate(ICharacterScanner scanner) {
+		int c = scanner.read();
+		fBuffer.setLength(0);
+
+		// Looking for <<WORD or <<-WORD or <<'WORD' at end of line.
+		for (int i = 0; i < fStartingSequence.length(); i++) {
+			fBuffer.append((char) c);
+			if (fStartingSequence.charAt(i) != c) {
+				unreadBuffer(scanner);
+				return Token.UNDEFINED;
+			}
+			c = scanner.read();
+		}
+
+		char[][] lineDelimeters = scanner.getLegalLineDelimiters();
+		StringBuffer endMarkerBuffer = new StringBuffer();
+		if (c == '-') {
+			fBuffer.append((char)c);
+			c = scanner.read();
+		} else if (c == '\'') {
+			fBuffer.append((char)c);
+			c = scanner.read();
+		}
+		
+		while (c != ICharacterScanner.EOF &&
+				Character.isJavaIdentifierPart((char)c) &&
+				c != '\'') {
+			fBuffer.append((char)c);
+			endMarkerBuffer.append((char)c);
+			c = scanner.read();
+		}
+		
+		if (c == '\'') {
+			fBuffer.append((char)c);
+			c = scanner.read();
+		}
+		
+		if (endMarkerBuffer.length() == 0) {
+			unreadBuffer(scanner);
+			return Token.UNDEFINED;
+		}
+			
+		// At this point we read until we find id by itself on its own line
+		boolean eol = false;
+		boolean finished = false;
+		boolean foundMarker = false;
+		String endMarker = endMarkerBuffer.toString();
+		while (!finished && c != ICharacterScanner.EOF) {
+			for (int i = 0; i < lineDelimeters.length; ++i) {
+				if (c == lineDelimeters[i][0]) {
+					if (confirmDelimeter(scanner, lineDelimeters[i])) {
+						c = scanner.read();
+						eol = true;
+						break;
+					}
+				}
+			}
+			if (eol) {
+				eol = false;
+				if (foundMarker) {
+					// We get here if we have found the marker by itself
+					// on the line
+					finished = true;
+				} else {
+					foundMarker = false;
+					int j = 0;
+					while (j < endMarker.length()) {
+						if (c == endMarker.charAt(j)) {
+							c = scanner.read();
+							++j;
+						} else {
+							break;
+						}
+					}
+					if (j == endMarker.length()) {
+						foundMarker = true;
+					}
+				}
+			} else {
+				// otherwise ignore all other characters
+				eol = false;
+				foundMarker = false;
+				c = scanner.read();
+			}
+		}
+
+		// unread last character
+		scanner.unread();
+		return token;
+	}
+
+	/**
+	 * Returns the characters in the buffer to the scanner.
+	 * 
+	 * @param scanner
+	 *            the scanner to be used
+	 */
+	protected void unreadBuffer(ICharacterScanner scanner) {
+		for (int i = fBuffer.length() - 1; i >= 0; i--)
+			scanner.unread();
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/MultilineRuleDamagerRepairer.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/MultilineRuleDamagerRepairer.java
new file mode 100644
index 0000000..7f9329f
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/MultilineRuleDamagerRepairer.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.DocumentEvent;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITypedRegion;
+import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
+import org.eclipse.jface.text.rules.ITokenScanner;
+
+public class MultilineRuleDamagerRepairer extends DefaultDamagerRepairer {
+	
+	
+	/**
+	 * Creates a damager/repairer that uses the given scanner. The scanner may not be <code>null</code>
+	 * and is assumed to return only token that carry text attributes.
+	 *
+	 * @param scanner the token scanner to be used, may not be <code>null</code>
+	 */
+	public MultilineRuleDamagerRepairer(ITokenScanner scanner) {
+		super(scanner);
+	}
+
+	/*
+	 * @see IPresentationDamager#getDamageRegion(ITypedRegion, DocumentEvent, boolean)
+	 */
+	public IRegion getDamageRegion(ITypedRegion partition, DocumentEvent e, boolean documentPartitioningChanged) {
+		// In the case of a partition with multiline rules, we will punt to
+		// reparse the entire partition because we don't know if the line being
+		// edited is in the middle of an area covered by a multiline rule.  In
+		// such a case, we need to back up and find the start sequence of the
+		// rule.  It is easiest to just reparse the whole partition.
+		return partition;
+	}
+	
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/ParseException.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/ParseException.java
new file mode 100644
index 0000000..d3787eb
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/ParseException.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+public class ParseException extends Exception {
+	
+	static final long serialVersionUID = 1;
+	String message;
+	int severity;
+	int lineNumber;
+	int startColumn;
+	int endColumn;
+	public int getEndColumn() {
+		return endColumn;
+	}
+	public void setEndColumn(int endColumn) {
+		this.endColumn = endColumn;
+	}
+	public int getLineNumber() {
+		return lineNumber;
+	}
+	public void setLineNumber(int lineNumber) {
+		this.lineNumber = lineNumber;
+	}
+	public String getMessage() {
+		return message;
+	}
+	public void setMessage(String message) {
+		this.message = message;
+	}
+	public int getStartColumn() {
+		return startColumn;
+	}
+	public void setStartColumn(int startColumn) {
+		this.startColumn = startColumn;
+	}
+	public ParseException(String message, int lineNumber, int startColumn, int endColumn, int severity) {
+		super();
+		this.message = message;
+		this.lineNumber = lineNumber;
+		this.startColumn = startColumn;
+		this.endColumn = endColumn;
+		this.severity = severity;
+	}
+	public int getSeverity() {
+		return severity;
+	}
+	public void setSeverity(int severity) {
+		this.severity = severity;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RecursiveSingleLineRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RecursiveSingleLineRule.java
new file mode 100644
index 0000000..f5818ab
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RecursiveSingleLineRule.java
@@ -0,0 +1,196 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import java.util.ArrayList;
+
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.SingleLineRule;
+import org.eclipse.jface.text.rules.Token;
+
+public class RecursiveSingleLineRule extends SingleLineRule {
+	
+	private ArrayList<IRule> rules;
+	private int evalIndex;
+	private int startIndex;
+	private int endIndex;
+	private int endBoundary;
+	private String startSequence;
+	private String endSequence;
+	/**
+	 * Creates a rule for the given starting and ending sequence
+	 * which, if detected, will return the specified token.
+	 *
+	 * @param startSequence the pattern's start sequence
+	 * @param endSequence the pattern's end sequence
+	 * @param token the token to be returned on success
+	 */
+	public RecursiveSingleLineRule(String startSequence, String endSequence, IToken token) {
+		this(startSequence, endSequence, token, (char) 0);
+	}
+
+	/**
+	 * Creates a rule for the given starting and ending sequence
+	 * which, if detected, will return the specified token.
+	 * Any character which follows the given escape character
+	 * will be ignored.
+	 *
+	 * @param startSequence the pattern's start sequence
+	 * @param endSequence the pattern's end sequence
+	 * @param token the token to be returned on success
+	 * @param escapeCharacter the escape character
+	 */
+	public RecursiveSingleLineRule(String startSequence, String endSequence, IToken token, char escapeCharacter) {
+		this(startSequence, endSequence, token, escapeCharacter, false);
+	}
+
+	/**
+	 * Creates a rule for the given starting and ending sequence
+	 * which, if detected, will return the specified token. Alternatively, the
+	 * line can also be ended with the end of the file.
+	 * Any character which follows the given escape character
+	 * will be ignored.
+	 *
+	 * @param startSequence the pattern's start sequence
+	 * @param endSequence the pattern's end sequence
+	 * @param token the token to be returned on success
+	 * @param escapeCharacter the escape character
+	 * @param breaksOnEOF indicates whether the end of the file successfully terminates this rule
+	 * @since 2.1
+	 */
+	public RecursiveSingleLineRule(String startSequence, String endSequence, IToken token, char escapeCharacter, boolean breaksOnEOF) {
+		super(startSequence, endSequence, token, escapeCharacter, breaksOnEOF);
+		this.startSequence = startSequence;
+		this.endSequence = endSequence;
+		rules = new ArrayList<IRule>();
+		startIndex = 0;
+		endIndex = 0;
+	}
+
+	/**
+	 * Creates a rule for the given starting and ending sequence
+	 * which, if detected, will return the specified token. Alternatively, the
+	 * line can also be ended with the end of the file.
+	 * Any character which follows the given escape character
+	 * will be ignored. In addition, an escape character immediately before an
+	 * end of line can be set to continue the line.
+	 *
+	 * @param startSequence the pattern's start sequence
+	 * @param endSequence the pattern's end sequence
+	 * @param token the token to be returned on success
+	 * @param escapeCharacter the escape character
+	 * @param breaksOnEOF indicates whether the end of the file successfully terminates this rule
+	 * @param escapeContinuesLine indicates whether the specified escape character is used for line
+	 *        continuation, so that an end of line immediately after the escape character does not
+	 *        terminate the line, even if <code>breakOnEOL</code> is true
+	 * @since 3.0
+	 */
+	public RecursiveSingleLineRule(String startSequence, String endSequence, IToken token, char escapeCharacter, boolean breaksOnEOF, boolean escapeContinuesLine) {
+		super(startSequence, endSequence, token, escapeCharacter, breaksOnEOF, escapeContinuesLine);
+		this.startSequence = startSequence;
+		this.endSequence = endSequence;
+		rules = new ArrayList<IRule>();
+		startIndex = 0;
+		endIndex = 0;
+	}
+	
+	public void addRule(SingleLineRule rule) {
+		rules.add(rule);
+	}
+	
+	public IToken getSuccessToken() {
+		// We need to be aware of what success token we are referring to.
+		// The current internal rule index will help us determine which
+		// one.
+		if (evalIndex < rules.size()) {
+			SingleLineRule x = (SingleLineRule)rules.get(evalIndex);
+			return x.getSuccessToken();
+		}
+		return super.getSuccessToken();
+	}
+	
+	protected void backupScanner(ICharacterScanner scanner, int position) {
+		int count = scanner.getColumn() - position;
+		while (count-- > 0)
+			scanner.unread();
+	}
+	
+	public IToken evaluate(ICharacterScanner scanner, boolean resume) {
+		int column = scanner.getColumn();
+		// Check if we are at EOF, in which case rules don't hold
+		if (column < 0)
+			return Token.UNDEFINED;
+		if (!resume) {
+			evalIndex = 0;
+			// Check if we are within outer rule boundaries.
+			if (column >= endIndex || column < startIndex) {
+				// If not, then we should evaluate to see if the
+				// outer rule is true starting at the current position.
+				startIndex = scanner.getColumn();
+				if (super.evaluate(scanner, false) != Token.UNDEFINED) {
+					// Outer rule is true for a section.  Now we can
+					// set the boundaries for the internal rules.
+					// End boundary for internal rules is the start of
+					// the end sequence.
+					endIndex = scanner.getColumn();
+					endBoundary = endIndex - endSequence.length();
+					// Back up scanner to just after start sequence.
+					backupScanner(scanner, startIndex + startSequence.length());
+					return super.getSuccessToken();
+				}
+				else
+					// Outer rule doesn't hold.
+					return Token.UNDEFINED;
+			}
+		}
+
+		// At this point, we want to subdivide up the area covered by the
+		// outer rule into success tokens for internal areas separated by
+		// areas of the outer rule.
+		
+		int start = scanner.getColumn();
+		column = start;
+		while (column < endBoundary) {
+			while (evalIndex < rules.size()) {
+				SingleLineRule x = (SingleLineRule)rules.get(evalIndex);
+				IToken token = x.evaluate(scanner, false);
+				if (!token.isUndefined()) {
+					// Found internal token.  If we had to read to get
+					// to the start of the internal token, then back up
+					// the scanner to the start of the internal token and
+					// return the initial read area as part of an outer token.
+					// Otherwise, return the internal token.
+					if (column == start) {
+						evalIndex = 0;
+						return token;
+					} else {
+						backupScanner(scanner, column);
+						return super.getSuccessToken();
+					}
+				}
+				++evalIndex;
+			}
+			evalIndex = 0;
+			scanner.read();
+			++column;
+		}
+		
+		// Outside internal area.  Read until end of outer area and return
+		// outer token.
+		while (column++ < endIndex)
+			scanner.read();
+		startIndex = 0;
+		endIndex = 0;
+		return super.getSuccessToken();
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RestrictedEndOfLineRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RestrictedEndOfLineRule.java
new file mode 100644
index 0000000..80f7904
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RestrictedEndOfLineRule.java
@@ -0,0 +1,130 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import java.util.ArrayList;
+
+import org.eclipse.jface.text.rules.EndOfLineRule;
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.SingleLineRule;
+import org.eclipse.jface.text.rules.Token;
+
+public class RestrictedEndOfLineRule extends EndOfLineRule {
+	
+	private ArrayList<IRule> rules;
+	private int startIndex;
+	private int endIndex;
+	private String startSequence;
+	private String restrictedChars;
+	/**
+	 * Creates a rule for the given starting and ending sequence
+	 * which, if detected, will return the specified token.
+	 *
+	 * @param startSequence the pattern's start sequence
+	 * @param restrictedChars chars that stop the sequence
+	 * @param token the token to be returned on success
+	 */
+	public RestrictedEndOfLineRule(String startSequence, String restrictedChars, IToken token) {
+		this(startSequence, restrictedChars, token, (char) 0);
+	}
+
+	/**
+	 * Creates a rule for the given starting and ending sequence
+	 * which, if detected, will return the specified token.
+	 * Any character which follows the given escape character
+	 * will be ignored.
+	 *
+	 * @param startSequence the pattern's start sequence
+	 * @param restrictedChars chars that stop the sequence
+	 * @param token the token to be returned on success
+	 * @param escapeCharacter the escape character
+	 */
+	public RestrictedEndOfLineRule(String startSequence, String restrictedChars, IToken token, char escapeCharacter) {
+		this(startSequence, restrictedChars, token, escapeCharacter, false);
+	}
+
+	/**
+	 * Creates a rule for the given starting and ending sequence
+	 * which, if detected, will return the specified token. Alternatively, the
+	 * line can also be ended with the end of the file.
+	 * Any character which follows the given escape character
+	 * will be ignored.
+	 *
+	 * @param startSequence the pattern's start sequence
+	 * @param restrictedChars chars that stop the sequence
+	 * @param token the token to be returned on success
+	 * @param escapeCharacter the escape character
+	 * @param breaksOnEOF indicates whether the end of the file successfully terminates this rule
+	 * @since 2.1
+	 */
+	public RestrictedEndOfLineRule(String startSequence, String restrictedChars, IToken token, char escapeCharacter, boolean breaksOnEOF) {
+		super(startSequence, token, escapeCharacter, breaksOnEOF);
+		this.startSequence = startSequence;
+		this.restrictedChars = restrictedChars;
+		rules = new ArrayList<IRule>();
+		startIndex = 0;
+		endIndex = 0;
+	}
+
+	
+	public void addRule(SingleLineRule rule) {
+		rules.add(rule);
+	}
+	
+	
+	protected void backupScanner(ICharacterScanner scanner, int position) {
+		int count = scanner.getColumn() - position;
+		while (count-- > 0)
+			scanner.unread();
+	}
+	
+	public IToken evaluate(ICharacterScanner scanner, boolean resume) {
+		int column = scanner.getColumn();
+		// Check if we are at EOF, in which case rules don't hold
+		if (column < 0)
+			return Token.UNDEFINED;
+		if (!resume) {
+			startIndex = scanner.getColumn();
+			if (super.evaluate(scanner, false) != Token.UNDEFINED) {
+				// Outer rule is true for a section.  Now we can
+				// set the boundaries for the internal rules.
+				// End boundary for internal rules is the start of
+				// the end sequence.
+				endIndex = scanner.getColumn();
+				// Back up scanner to just after start sequence.
+				backupScanner(scanner, startIndex + startSequence.length());
+			}
+			else
+				// Base rule doesn't hold.
+				return Token.UNDEFINED;
+		}
+
+		// At this point, we want to check for restricted chars in the
+		// token.  If we find them, we stop there.
+		
+		int start = scanner.getColumn();
+		column = start;
+		while (column < endIndex) {
+			int ch = scanner.read();
+			if (ch == ICharacterScanner.EOF
+					|| restrictedChars.indexOf(ch) >= 0) {
+				scanner.unread();
+				return getSuccessToken();
+			}
+			++column;
+		}
+		startIndex = 0;
+		endIndex = 0;
+		return getSuccessToken();
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java
new file mode 100644
index 0000000..1b1d792
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java
@@ -0,0 +1,128 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.outline;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.AutoconfEditor;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfElement;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.texteditor.ITextEditor;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+
+
+public class AutoconfContentOutlinePage extends ContentOutlinePage {
+
+	private ITextEditor editor;
+	private IEditorInput input;
+	
+	public AutoconfContentOutlinePage(AutoconfEditor editor) {
+		super();
+		this.editor = editor;
+	}
+
+	public void setInput(IEditorInput editorInput) {
+		this.input = editorInput;
+		update();
+	}
+
+	@SuppressWarnings("unchecked")
+	protected ISelection updateSelection(ISelection sel) {
+		ArrayList<AutoconfElement> newSelection= new ArrayList<AutoconfElement>();
+		if (sel instanceof IStructuredSelection) {
+			Iterator iter= ((IStructuredSelection)sel).iterator();
+			for (;iter.hasNext();) {
+				//ICElement elem= fInput.findEqualMember((ICElement)iter.next());
+				Object o = iter.next();
+				if (o instanceof AutoconfElement) {
+					newSelection.add((AutoconfElement)o);
+				}
+			}
+		}
+		return new StructuredSelection(newSelection);
+	}
+
+	public void update() {
+		//set the input so that the outlines parse can be called
+		//update the tree viewer state
+		final TreeViewer viewer = getTreeViewer();
+
+		if (viewer != null)
+		{
+			final Control control = viewer.getControl();
+			if (control != null && !control.isDisposed())
+			{
+				control.getDisplay().asyncExec(new Runnable() {
+					public void run() {
+						if (!control.isDisposed()) {
+//							control.setRedraw(false);
+//							if (input != null)
+//								viewer.setInput(input);
+//							viewer.expandAll();
+//							control.setRedraw(true);
+							ISelection sel= viewer.getSelection();
+							viewer.setSelection(updateSelection(sel));		
+							viewer.refresh();
+						}
+					}
+				});
+			}
+		}
+	}
+	
+	public void createControl(Composite parent) {
+
+		super.createControl(parent);
+
+		TreeViewer viewer= getTreeViewer();
+		viewer.setContentProvider(new AutoconfContentProvider(editor));
+		viewer.setLabelProvider(new AutoconfLabelProvider());
+		viewer.addSelectionChangedListener(this);
+
+		if (input != null)
+			viewer.setInput(input);
+	}
+	
+	/*
+	 * Change in selection
+	 */
+	public void selectionChanged(SelectionChangedEvent event)
+	{
+		super.selectionChanged(event);
+		
+		//find out which item in tree viewer we have selected, and set highlight range accordingly
+		ISelection selection = event.getSelection();
+		if (selection.isEmpty()) {
+			editor.resetHighlightRange();
+		} else {
+			AutoconfElement element = (AutoconfElement) ((IStructuredSelection) selection)
+					.getFirstElement();		
+			
+			try {
+				int offset = element.getStartOffset();
+				int length = element.getEndOffset() - offset;
+				editor.setHighlightRange(offset, length, true);
+				editor.selectAndReveal(offset, length);
+			} catch (IllegalArgumentException x) {
+				editor.resetHighlightRange();
+			}
+		}
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentProvider.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentProvider.java
new file mode 100644
index 0000000..ea2e4db
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentProvider.java
@@ -0,0 +1,94 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.outline;
+
+import org.eclipse.jface.text.BadPositionCategoryException;
+import org.eclipse.jface.text.DefaultPositionUpdater;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IPositionUpdater;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.AutoconfEditor;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfElement;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+import org.eclipse.ui.texteditor.ITextEditor;
+
+
+public class AutoconfContentProvider implements ITreeContentProvider {
+
+	private IDocumentProvider documentProvider;
+	private AutoconfEditor editor;
+	protected final static String SECTION_POSITIONS = "section_positions";
+	protected IPositionUpdater positionUpdater = new DefaultPositionUpdater(SECTION_POSITIONS);
+	
+	public AutoconfContentProvider(ITextEditor editor) {
+		if (editor instanceof AutoconfEditor) {
+			this.editor = (AutoconfEditor) editor;
+		}
+		this.documentProvider = editor.getDocumentProvider();
+	}
+	
+	public void dispose() {
+		// TODO Auto-generated method stub
+
+	}
+
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		if (oldInput != null)
+		{
+			IDocument document = documentProvider.getDocument(oldInput);
+			if (document != null)
+			{
+				try
+				{
+					document.removePositionCategory(SECTION_POSITIONS);
+				}
+				catch (BadPositionCategoryException x)
+				{
+				}
+				document.removePositionUpdater(positionUpdater);
+			}
+		}
+
+		if (newInput != null)
+		{
+			IDocument document = documentProvider.getDocument(newInput);
+			if (document != null)
+			{
+				document.addPositionCategory(SECTION_POSITIONS);
+				document.addPositionUpdater(positionUpdater);
+			}
+		}
+	}
+
+	public Object[] getChildren(Object parentElement) {
+		if (parentElement instanceof AutoconfElement) {
+			AutoconfElement element = (AutoconfElement)parentElement;
+			return element.getChildren();
+		}
+		return new Object[0];
+	}
+
+	public Object getParent(Object element) {
+		return null;
+	}
+
+	public boolean hasChildren(Object element) {
+		if (element instanceof AutoconfElement) {
+			return ((AutoconfElement)element).hasChildren();
+		} 
+		return false;
+	}
+
+	public Object[] getElements(Object inputElement) {
+		return this.getChildren(editor.getRootElement());
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java
new file mode 100644
index 0000000..944718e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java
@@ -0,0 +1,100 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc., (c) 2008 NOKIA Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *     Ed Swartz (NOKIA) - refactoring
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.outline;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfCaseConditionElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfCaseElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfElifElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfElseElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfForElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfIfElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfMacroArgumentElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfMacroElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfSelectElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfUntilElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfWhileElement;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.AutotoolsUIPluginImages;
+import org.eclipse.swt.graphics.Image;
+
+
+public class AutoconfLabelProvider implements ILabelProvider {
+
+	public AutoconfLabelProvider() {
+		super();
+	}
+	
+	public void addListener(ILabelProviderListener listener) {
+	}
+
+	public void dispose() {
+	}
+
+	public boolean isLabelProperty(Object element, String property) {
+		return false;
+	}
+
+	public void removeListener(ILabelProviderListener listener) {
+	}
+
+	public Image getImage(Object element) {
+		if (element instanceof AutoconfIfElement)
+			return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_IF);
+		else if (element instanceof AutoconfElseElement)
+			return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_ELSE);
+		else if (element instanceof AutoconfElifElement)
+			return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_ELIF);
+		else if (element instanceof AutoconfCaseElement)
+			return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_CASE);
+		else if (element instanceof AutoconfCaseConditionElement)
+			return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_CONDITION);
+		else if (element instanceof AutoconfForElement)
+			return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_FOR);
+		else if (element instanceof AutoconfWhileElement)
+			return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_WHILE);
+		else if (element instanceof AutoconfUntilElement)
+			return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_WHILE);	// TODO
+		else if (element instanceof AutoconfSelectElement)
+			return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_WHILE);	// TODO
+		else if (element instanceof AutoconfMacroElement)
+			return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_ACMACRO);
+		else if (element instanceof AutoconfMacroArgumentElement)
+			return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_ACMACRO_ARG); // TODO
+		return null;
+	}
+
+	public String getText(Object element) {
+		if (element instanceof AutoconfElement) {
+			AutoconfElement e = (AutoconfElement)element;
+			String result;
+			String name = e.getName();
+			if (name.length() > 31)
+				name = name.substring(0, 31) + "...";
+			String var = e.getVar();
+			if (var != null) {
+				if (var.length() > 15)
+					var = var.substring(0, 15) + "...";
+				var = " " + var; //$NON-NLS-1$
+			} else {
+				var = "";
+			}
+			result = (name + var).replaceAll("(\r|\n| |\t|\f)+", " ");
+			return result;
+		} else if (element instanceof String) {
+			return (String) element;
+		}
+		return "";
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseConditionElement.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseConditionElement.java
new file mode 100644
index 0000000..d06e73d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseConditionElement.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfCaseConditionElement extends AutoconfElement {
+	
+	public AutoconfCaseConditionElement() {
+		super("");
+	}
+	
+	public AutoconfCaseConditionElement(String name) {
+		super(name);
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseElement.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseElement.java
new file mode 100644
index 0000000..c8ad284
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfCaseElement extends AutoconfElement {
+	
+	public AutoconfCaseElement() {
+		super("case"); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElement.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElement.java
new file mode 100644
index 0000000..4a804cb
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElement.java
@@ -0,0 +1,138 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+
+public class AutoconfElement {
+	
+	protected String name;
+	protected String var;
+	protected int startOffset;
+	protected int endOffset;
+	protected ArrayList<AutoconfElement> children;
+	protected AutoconfElement parent;
+	private IDocument document;
+	
+	public AutoconfElement(String name) {
+		this(name, null);
+	}
+	
+	public AutoconfElement(String name, String var) {
+		this.name = name;
+		this.var = var;
+		this.startOffset = 0;
+		this.children = new ArrayList<AutoconfElement>();
+	}
+	
+
+	public String toString() {
+		String source = getSource();
+		if (source == null) {
+			StringBuffer kids = new StringBuffer();
+			for (Iterator<AutoconfElement> iterator = children.iterator(); iterator.hasNext();) {
+				AutoconfElement kid = (AutoconfElement) iterator.next();
+				kids.append(kid.toString());
+				kids.append(","); //$NON-NLS-1$
+			}
+			source = kids.toString();
+		}
+		return getClass().getSimpleName() + ": '" + source + "'"; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+	
+	public void addChild(AutoconfElement element) {
+		children.add(element);
+		if (element.getParent() == null)
+			element.setParent(this);
+	}
+	
+	public void addSibling(AutoconfElement element) {
+		parent.addChild(element);
+	}
+	
+	public AutoconfElement getLastChild() {
+		if (hasChildren())
+			return (AutoconfElement)children.get(children.size() - 1);
+		return null;
+	}
+	
+	public AutoconfElement getParent() {
+		return parent;
+	}
+	
+	public void setParent(AutoconfElement parent) {
+		this.parent = parent;
+	}
+	
+	public AutoconfElement[] getChildren() {
+		return (AutoconfElement[]) children.toArray(new AutoconfElement[children.size()]);
+	}
+	
+	public boolean hasChildren() {
+		return !children.isEmpty();
+	}
+
+	public String getName() {
+		return name;
+	}
+	 
+	public void setName(String string) {
+		this.name = string;
+	}
+
+	
+	public String getVar() {
+		return var;
+	}
+	
+	public void setVar(String value) {
+		var = value;
+	}
+	
+	public void setDocument(IDocument document) {
+		this.document = document;
+	}
+	
+	public IDocument getDocument() {
+		return document;
+	}
+	
+	public void setStartOffset(int offset) {
+		this.startOffset = offset;
+	}
+	
+	public int getStartOffset() {
+		return startOffset;
+	}
+	
+	public void setEndOffset(int offset) {
+		this.endOffset = offset;
+	}
+	
+	public int getEndOffset() {
+		return endOffset;
+	}
+
+	public String getSource() {
+		if (document != null && startOffset >= 0 && endOffset >= startOffset) {
+			try {
+				return document.get(startOffset, endOffset - startOffset);
+			} catch (BadLocationException e) {
+				return null;
+			}
+		}
+		return null;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElifElement.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElifElement.java
new file mode 100644
index 0000000..a990ea8
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElifElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfElifElement extends AutoconfElement {
+	
+	public AutoconfElifElement() {
+		super("elif"); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElseElement.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElseElement.java
new file mode 100644
index 0000000..bbaa2c2
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElseElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfElseElement extends AutoconfElement {
+	
+	public AutoconfElseElement() {
+		super("else"); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfForElement.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfForElement.java
new file mode 100644
index 0000000..6b0ffcc
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfForElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfForElement extends AutoconfElement {
+	
+	public AutoconfForElement() {
+		super("for"); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfIfElement.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfIfElement.java
new file mode 100644
index 0000000..6ad6589
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfIfElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfIfElement extends AutoconfElement {
+	
+	public AutoconfIfElement() {
+		super("if"); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroArgumentElement.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroArgumentElement.java
new file mode 100644
index 0000000..96e3e3d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroArgumentElement.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+/**
+ * This is a macro argument node.  It may also hold
+ * other AutoconfMacroElements.  The source range includes any quotes around an argument
+ * but the #getName() has them stripped.
+ * @author eswartz
+ *
+ */
+public class AutoconfMacroArgumentElement extends AutoconfElement {
+
+	public AutoconfMacroArgumentElement() {
+		super(""); // //$NON-NLS-N$
+	}
+	public AutoconfMacroArgumentElement(String name) {
+		super(name);
+	}
+	public String getVar() {
+		return super.getVar();
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroDetector.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroDetector.java
new file mode 100644
index 0000000..b5c1373
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroDetector.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc., (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat Incorporated - initial API and implementation
+ *    Ed Swartz (Nokia) - refactoring
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+import java.util.regex.Pattern;
+
+/**
+ *
+ */
+public class AutoconfMacroDetector implements IAutoconfMacroDetector {
+
+	private static final Pattern AUTOCONF_MACRO_PATTERN = Pattern.compile("PKG_.*|AC_.*|AM_.*|m4.*"); //$NON-NLS-1$
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.cdt.autotools.core.ui.editors.parser.IAutoconfMacroDetector#isMacroIdentifier(java.lang.String)
+	 */
+	public boolean isMacroIdentifier(String name) {
+		return AUTOCONF_MACRO_PATTERN.matcher(name).matches();
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java
new file mode 100644
index 0000000..1168f91
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *     Ed Swartz (NOKIA Inc) - support standalone parser
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+/**
+ * A call to a macro.
+ * <p>
+ * Macro element now stores arguments as AutoconfMacroElement or AutoconfMacroArgument children 
+ *
+ */
+public class AutoconfMacroElement extends AutoconfElement {
+
+	public AutoconfMacroElement(String name) {
+		super(name);
+	}
+
+	public String getVar() {
+		if (children.size() > 0)
+			return getParameter(0);
+		else
+			return null;
+	}
+	public int getParameterCount() {
+		return children.size();
+	}
+
+	public String getParameter(int num) {
+		return ((AutoconfElement) children.get(num)).getName();
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java
new file mode 100644
index 0000000..e684ab2
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java
@@ -0,0 +1,136 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.ui.IStorageEditorInput;
+import org.eclipse.ui.texteditor.MarkerUtilities;
+
+
+public class AutoconfOutlineErrorHandler {
+	
+	public static final String PARSE_ERROR_MARKER_ID = AutotoolsUIPlugin.PLUGIN_ID
+	+ ".outlineparsefileerror"; //$NON-NLS-1$
+	
+	private IFile file;
+	private IDocument document;
+	
+	public AutoconfOutlineErrorHandler(IStorageEditorInput input, IDocument document)
+	{
+		this.document = document;
+		IWorkspaceRoot root = CCorePlugin.getWorkspace().getRoot();
+		try {
+			IPath absPath = input.getStorage().getFullPath();
+			IPath rootPath = root.getLocation();
+			IPath relPath = new Path("");
+
+			for (int i = 0; i < rootPath.segmentCount(); ++i) {
+				relPath = relPath.append("../"); //$NON-NLS-1$
+			}
+			relPath = relPath.append(absPath);
+			this.file = root.getFileForLocation(relPath);
+			if (this.file == null) {
+				this.file = root.getFile(relPath);
+			}
+		} catch (CoreException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	public IDocument getDocument() {
+		return document;
+	}
+	
+	public void handleError(ParseException e) {
+		if (!file.exists())
+			return;
+		
+		int lineNumber = e.getLineNumber();
+		
+		Map<String, Object> map = new HashMap<String, Object>();
+		MarkerUtilities.setLineNumber(map, lineNumber);
+		MarkerUtilities.setMessage(map, e.getMessage());
+		map.put(IMarker.MESSAGE, e.getMessage());
+		map.put(IMarker.LOCATION, file.getFullPath().toString());
+
+		Integer charStart = getCharOffset(lineNumber, e.getStartColumn());
+		if (charStart != null) {
+			map.put(IMarker.CHAR_START, charStart);
+		}
+		Integer charEnd = getCharOffset(lineNumber, e.getEndColumn());
+		if (charEnd != null) {
+			map.put(IMarker.CHAR_END, charEnd);
+		}
+		
+		// FIXME:  add severity level
+		map.put(IMarker.SEVERITY, new Integer(e.getSeverity()));
+		
+		try {
+			MarkerUtilities.createMarker(file, map, PARSE_ERROR_MARKER_ID);
+		} catch (CoreException ee) {
+			ee.printStackTrace();
+		}
+		return;
+	}
+	
+	public void removeAllExistingMarkers() {
+		if (!file.exists())
+			return;
+		
+		try	{
+			file.deleteMarkers(PARSE_ERROR_MARKER_ID, true, IResource.DEPTH_ZERO);
+		} catch (CoreException e1) {
+			e1.printStackTrace();
+		}
+	}
+
+	public void removeExistingMarkers(int offset, int length) {
+		if (!file.exists())
+			return;
+		
+		try	{
+			IMarker[] markers = file.findMarkers(PARSE_ERROR_MARKER_ID, true, IResource.DEPTH_ZERO);
+			// Delete all markers that start in the given document range.
+			for (int i = 0; i < markers.length; ++i) {
+				IMarker marker = markers[i];
+				int charEnd = MarkerUtilities.getCharEnd(marker);
+				int charStart = MarkerUtilities.getCharStart(marker);
+				if (charStart >= offset && charEnd <= (offset + length))
+					marker.delete();
+			}
+		} catch (CoreException e1) {
+			e1.printStackTrace();
+		}
+	}
+	
+	private Integer getCharOffset(int lineNumber, int columnNumber)	{
+		try	{
+			return new Integer(document.getLineOffset(lineNumber) + columnNumber);
+		} catch (BadLocationException e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfParser.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfParser.java
new file mode 100644
index 0000000..76963f3
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfParser.java
@@ -0,0 +1,1042 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc., (c) 2008 Nokia
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *     Ed Swartz (Nokia) - refactoring
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.AutoconfEditorMessages;
+
+
+/**
+ * Tokenizing autoconf parser, based on original work by Jeff Johnston 
+ * @author eswartz
+ */
+public class AutoconfParser {
+	
+	public static final String MISSING_SPECIFIER = "MissingSpecifier"; //$NON-NLS-1$
+	public static final String INVALID_SPECIFIER = "InvalidSpecifier"; //$NON-NLS-1$
+	public static final String INVALID_TERMINATION = "InvalidTermination"; //$NON-NLS-1$
+	public static final String UNTERMINATED_CONSTRUCT = "UnterminatedConstruct"; //$NON-NLS-1$
+	public static final String MISSING_CONDITION = "MissingCondition"; //$NON-NLS-1$
+	public static final String INVALID_ELIF = "InvalidElif"; //$NON-NLS-1$
+	public static final String INVALID_ELSE = "InvalidElse"; //$NON-NLS-1$
+	public static final String INVALID_FI = "InvalidFi"; //$NON-NLS-1$
+	public static final String INVALID_DONE = "InvalidDone"; //$NON-NLS-1$
+	public static final String INVALID_ESAC = "InvalidEsac"; //$NON-NLS-1$
+	public static final String INVALID_DO = "InvalidDo"; //$NON-NLS-1$
+	public static final String INVALID_THEN = "InvalidThen"; //$NON-NLS-1$
+	public static final String INVALID_IN = "InvalidIn"; //$NON-NLS-1$
+	public static final String IMPROPER_CASE_CONDITION = "ImproperCaseCondition"; //$NON-NLS-1$
+	public static final String UNTERMINATED_CASE_CONDITION = "UnterminatedCaseCondition"; //$NON-NLS-1$
+	public static final String UNTERMINATED_INLINE_DOCUMENT = "UnterminatedInlineDocument"; //$NON-NLS-1$
+	public static final String INCOMPLETE_INLINE_MARKER="IncompleteInlineMarker"; //$NON-NLS-1$
+	public static final String MISSING_INLINE_MARKER="MissingInlineMarker"; //$NON-NLS-1$
+	public static final String UNMATCHED_RIGHT_PARENTHESIS = "UnmatchedRightParenthesis"; //$NON-NLS-1$
+	public static final String UNMATCHED_LEFT_PARENTHESIS = "UnmatchedLeftParenthesis"; //$NON-NLS-1$
+	
+	private IAutoconfErrorHandler errorHandler;
+	private IAutoconfMacroValidator macroValidator;
+	private AutoconfTokenizer tokenizer;
+	private IAutoconfMacroDetector macroDetector;
+	
+	private static final String M4_BUILTINS =
+		"define undefine defn pushdef popdef indir builtin ifdef ifelse shift reverse cond " + //$NON-NLS-1$
+		"dumpdef traceon traceoff debugmode debugfile dnl changequote changecom changeword " + //$NON-NLS-1$
+		"m4wrap " + //$NON-NLS-1$
+		"include sinclude divert undivert divnum len index regexp substr translit patsubst " + //$NON-NLS-1$
+		"format incr decr eval syscmd esyscmd sysval mkstemp maketemp errprint m4exit " + //$NON-NLS-1$
+		"__file__ __line__ __program__ "; //$NON-NLS-1$
+	
+	private static List<String> m4builtins = new ArrayList<String>();
+	static {
+		m4builtins.addAll(Arrays.asList(M4_BUILTINS.split(" "))); //$NON-NLS-1$
+	}
+	
+	/**
+	 * Create a parser for autoconf-style sources.  
+	 * @param errorHandler
+	 * @param macroDetector
+	 * @param macroValidator
+	 */
+	public AutoconfParser(IAutoconfErrorHandler errorHandler,
+			IAutoconfMacroDetector macroDetector,
+			IAutoconfMacroValidator macroValidator) {
+		this.errorHandler = errorHandler;
+		this.macroDetector = macroDetector;
+		this.macroValidator = macroValidator;
+	}
+
+	/**
+	 * Parse the given document and produce an AutoconfElement tree
+	 * @param errorHandler
+	 * @param macroValidator
+	 * @param document
+	 * @return element tree
+	 */
+	public AutoconfElement parse(IDocument document) {
+		return parse(document, true);
+	}
+	
+	/**
+	 * Parse the given document and produce an AutoconfElement tree,
+	 * and control whether the initial quoting style is m4 style (`...')
+	 * or autoconf style ([ ... ]).
+	 * @param errorHandler
+	 * @param macroValidator
+	 * @param document
+	 * @param useAutoconfQuotes
+	 * @return element tree
+	 */
+	public AutoconfElement parse(IDocument document, boolean useAutoconfQuotes) {
+		this.tokenizer = new AutoconfTokenizer(document, errorHandler);
+		if (useAutoconfQuotes)
+			tokenizer.setM4Quote("[", "]"); //$NON-NLS-1$ //$NON-NLS-2$
+		
+		AutoconfElement root = new AutoconfRootElement();
+		Token eof = parseTopLevel(root);
+		
+		root.setStartOffset(0);
+		root.setDocument(document);
+		
+		setSourceEnd(root, eof);
+		
+		return root;
+	}
+
+
+	static class BlockEndCondition extends Exception {
+		/**
+		 * 
+		 */
+		private static final long serialVersionUID = 1L;
+		private Token token;
+
+		public BlockEndCondition(Token token) {
+			this.token = token;
+		}
+		
+		public Token getToken() {
+			return token;
+		}
+		
+	}
+
+	static class ExprEndCondition extends Exception {
+		/**
+		 * 
+		 */
+		private static final long serialVersionUID = 1L;
+		private Token token;
+
+		public ExprEndCondition(Token token) {
+			this.token = token;
+		}
+		
+		public Token getToken() {
+			return token;
+		}
+		
+	}
+
+	/**
+	 * Parse individual top-level nodes: divide text into macro calls
+	 * and recognized shell constructs.  Anything else is not accounted for.
+	 * @param parent
+	 * @return
+	 */
+	protected Token parseTopLevel(AutoconfElement parent) {
+		while (true) {
+			try {
+				parseStatement(parent);
+			} catch (BlockEndCondition e) {
+				// don't terminate here; we may have constructs closed too early
+				Token token = tokenizer.peekToken();
+				if (token.getType() == ITokenConstants.EOF)
+					return token; 
+			}
+		}
+	}
+	
+	/**
+	 * Parse a block of nodes, which starts with an expression and contains
+	 * subnodes.  Divide text into macro calls and recognized shell constructs.  
+	 * Anything else is not accounted for.
+	 * @param parent
+	 */
+	protected void parseBlock(AutoconfElement parent, Token open, AutoconfElement block) throws BlockEndCondition {
+		parent.addChild(block);
+		
+		setSourceStart(block, open);
+		
+		// get the expression part
+		Token token;
+		try {
+			token = parseBlockExpression(open, block);
+		} catch (BlockEndCondition e) {
+			setSourceEndBefore(block, e.getToken());
+			throw e;
+		}
+		
+		// parse the block proper
+		if (token.getType() != ITokenConstants.EOF) {
+			while (true) {
+				try {
+					parseStatement(block);
+				} catch (BlockEndCondition e) {
+					setSourceEnd(block, e.getToken());
+					return;
+				}
+			}
+		} else {
+			setSourceEnd(block, token);
+		}
+	}
+
+	private Token parseBlockExpression(Token open, AutoconfElement block) throws BlockEndCondition {
+		Token token;
+		try {
+			if (block instanceof AutoconfIfElement 
+					|| block instanceof AutoconfElifElement 
+					|| block instanceof AutoconfCaseElement 
+					|| block instanceof AutoconfWhileElement) {
+				token = parseExpression(block);
+			} else if (block instanceof AutoconfForElement) {
+				token = parseForExpression(block);
+			} else {
+				// no expression
+				return open;
+			}
+			block.setVar(getTokenSpanTextBetween(open, token));
+		} catch (BlockEndCondition e) {
+			// oops, premature end
+			setSourceEnd(block, e.getToken());
+			throw e;
+		}
+	
+		// check for expected token
+		while (true) {
+			token = tokenizer.readToken();
+			if (token.getType() == ITokenConstants.EOF)
+				break;
+			if (token.getType() != ITokenConstants.EOL)
+				break;
+		}
+		
+		if (token.getType() == ITokenConstants.SH_DO) {
+			checkBlockValidity(block, token, 
+					new Class[] { AutoconfForElement.class, AutoconfWhileElement.class },
+					INVALID_DO);
+		}
+		else if (token.getType() == ITokenConstants.SH_THEN) {
+			checkBlockValidity(block, token, 
+					new Class[] { AutoconfIfElement.class, AutoconfElifElement.class },
+					INVALID_THEN);
+		} 
+		else {
+			String exp;
+			if (block instanceof AutoconfIfElement || block instanceof AutoconfElifElement)
+				exp = "then";
+			else
+				exp = "do";
+			
+			handleError(block, token, AutoconfEditorMessages.getFormattedString(MISSING_SPECIFIER, exp));
+
+			// assume we're still in the block...
+			tokenizer.unreadToken(token);
+		}
+		return token;
+	}
+	
+	/**
+	 * Parse a case statement.  Scoop up statements into case conditional blocks.
+	 * <pre>
+	 * 'case' EXPR 'in' 
+	 * 		{ EXPR ')'  { STMTS } ';;' }
+	 * 'esac'
+	 * </pre>
+	 * @param parent
+	 * @return
+	 */
+	protected void parseCaseBlock(AutoconfElement parent, Token open, AutoconfElement block) throws BlockEndCondition {
+		parent.addChild(block);
+		
+		setSourceStart(block, open);
+		
+		// get the case expression, terminating at 'in'
+		Token token;
+		try {
+			token = parseCaseExpression(block);
+		} catch (BlockEndCondition e) {
+			// oops, premature end
+			setSourceEnd(block, e.getToken());
+			throw e;
+		}
+		
+		block.setVar(getTokenSpanTextBetween(open, token));
+		
+		// now get the statements, which are themselves blocks... just read statements
+		// that terminate with ';;' and stuff those into blocks.
+		
+		while (true) {
+			AutoconfCaseConditionElement condition = new AutoconfCaseConditionElement();
+
+			// skip EOLs and get the first "real" token
+			while (true) {
+				token = tokenizer.readToken();
+				setSourceStart(condition, token);
+				if (token.getType() == ITokenConstants.EOF)
+					break;
+				if (token.getType() == ITokenConstants.EOL)
+					continue;
+				break;
+			}
+			
+			if (token.getType() == ITokenConstants.SH_ESAC) {
+				break;
+			}
+			
+			try {
+				Token start = token;
+				token = parseCaseExpression(condition);
+				condition.setName(getTokenSpanTextFromUpTo(start, token));
+				
+				while (true) {
+					parseStatement(condition);
+				}
+			} catch (BlockEndCondition e) {
+				setSourceEnd(condition, e.getToken());
+				
+				if (condition.getSource().length() > 0)
+					block.addChild(condition);
+				
+				if (e.getToken().getType() != ITokenConstants.SH_CASE_CONDITION_END) {
+					token = e.getToken();
+					break;
+				}
+			}
+		}
+		
+		setSourceEnd(block, token);
+		
+		if (token.getType() != ITokenConstants.SH_ESAC) {
+			handleError(parent, token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, block.getName()));
+		}
+	}
+
+	private String getTokenSpanTextBetween(Token open, Token close) {
+		int startOffset = open.getOffset() + open.getLength();
+		int endOffset = close.getOffset();
+		if (open.getDocument() != close.getDocument())
+			return open.getText();
+		
+		String text;
+		try {
+			text = open.getDocument().get(startOffset, endOffset - startOffset).trim();
+		} catch (BadLocationException e) {
+			text = open.getText();
+			// TODO: error
+		}
+		
+		return text;
+	}
+
+	private String getTokenSpanTextFromUpTo(Token open, Token close) {
+		int startOffset = open.getOffset();
+		int endOffset = close.getOffset();
+		if (open.getDocument() != close.getDocument())
+			return open.getText();
+		
+		String text;
+		try {
+			text = open.getDocument().get(startOffset, endOffset - startOffset).trim();
+		} catch (BadLocationException e) {
+			text = open.getText();
+			// TODO: error
+		}
+		
+		return text;
+	}
+	private void setSourceStart(AutoconfElement block, Token open) {
+		int offset = open.getOffset();
+		block.setDocument(open.getDocument());
+		block.setStartOffset(offset);
+	}
+
+	private void setSourceEnd(AutoconfElement block, Token close) {
+		int offset = close.getOffset() + close.getLength();
+		if (block.getDocument() != null && block.getDocument() != close.getDocument())
+			throw new IllegalStateException();
+		block.setDocument(close.getDocument());
+		block.setEndOffset(offset);
+	}
+
+	private void setSourceEndBefore(AutoconfElement block, Token close) {
+		int offset = close.getOffset();
+		if (block.getDocument() != null && block.getDocument() != close.getDocument())
+			throw new IllegalStateException();
+		block.setDocument(close.getDocument());
+		block.setEndOffset(offset);
+	}
+
+	/**
+	 * Parse a single statement (macro call or a shell construct).
+	 * This can recursively invoke parseBlock() or parseStatement() to populate the tree.
+	 * Whenever a token terminates a block, we check its validity and then throw BlockEndCondition.
+	 * @param parent the parent into which to add statements.  The type of this element is used
+	 * to validate the legality of block closing tokens.
+	 */
+	protected void parseStatement(AutoconfElement parent) throws BlockEndCondition {
+	
+		boolean atStart = true;
+		
+		while (true) {
+			Token token = tokenizer.readToken();
+			
+			switch (token.getType()) {
+			// 0. Check EOF
+			case ITokenConstants.EOF:
+				AutoconfElement element = parent;
+				while (element != null && !(element instanceof AutoconfRootElement)) {
+					handleError(element, token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, element.getName()));
+					element = element.getParent();
+				}
+				throw new BlockEndCondition(token);
+			
+			
+			// 1. Check for end of statement
+			case ITokenConstants.EOL:
+			case ITokenConstants.SEMI:
+				return;
+			
+			
+			// 2. Check macro expansions
+			case ITokenConstants.WORD:
+				checkMacro(parent, token);
+				atStart = false;
+				break;
+			
+			// Check for shell constructs.  These should appear at the start of a line
+			// or after a semicolon.  If they don't,  just report an error and continue, 
+			// to be tolerant of our own lax parsing.
+			
+			// 3.a) Check dollar variables
+			case ITokenConstants.SH_DOLLAR:
+				// skip the next token
+				atStart = false;
+				token = tokenizer.readToken();
+				continue;
+				
+			// 3.b) Look for if/else/elif/fi constructs,
+			// being tolerant of nesting problems by allowing
+			// stranded else/elif nodes but reporting errors.
+			case ITokenConstants.SH_IF:
+				checkLineStart(parent, token, atStart);
+				parseBlock(parent, token, new AutoconfIfElement());
+				break;
+				
+			case ITokenConstants.SH_ELIF:
+				checkLineStart(parent, token, atStart);
+				checkBlockValidity(
+						parent, token, 
+						new Class[] { AutoconfIfElement.class, AutoconfElifElement.class },
+						INVALID_ELIF);
+				parseBlock(parent, token, new AutoconfElifElement());
+				token = tokenizer.peekToken();
+				throw new BlockEndCondition(token);
+			
+			case ITokenConstants.SH_ELSE:
+				checkLineStart(parent, token, atStart);
+				checkBlockValidity(
+						parent, token, 
+						new Class[] { AutoconfIfElement.class, AutoconfElifElement.class },
+						INVALID_ELSE);
+				parseBlock(parent, token, new AutoconfElseElement());
+				token = tokenizer.peekToken();
+				throw new BlockEndCondition(token);
+			
+			case ITokenConstants.SH_FI:
+				checkLineStart(parent, token, atStart);
+				checkBlockValidity(
+						parent, token, 
+						new Class[] { AutoconfIfElement.class, AutoconfElifElement.class, AutoconfElseElement.class },
+						INVALID_FI);
+				throw new BlockEndCondition(token);
+			
+				
+			// 4. Look for for/while loops
+			case ITokenConstants.SH_FOR:
+				checkLineStart(parent, token, atStart);
+				parseBlock(parent, token, new AutoconfForElement());
+				break;
+				
+			case ITokenConstants.SH_WHILE:
+				checkLineStart(parent, token, atStart);
+				parseBlock(parent, token, new AutoconfWhileElement());
+				break;
+				
+			case ITokenConstants.SH_UNTIL:
+				checkLineStart(parent, token, atStart);
+				parseBlock(parent, token, new AutoconfUntilElement());
+				break;
+				
+			case ITokenConstants.SH_SELECT:
+				checkLineStart(parent, token, atStart);
+				parseBlock(parent, token, new AutoconfSelectElement());
+				break;
+				
+			case ITokenConstants.SH_DONE:
+				checkLineStart(parent, token, atStart);
+				checkBlockValidity(
+						parent, token, 
+						new Class[] { AutoconfForElement.class, AutoconfWhileElement.class,
+								AutoconfUntilElement.class, AutoconfSelectElement.class },
+						INVALID_DONE);
+				throw new BlockEndCondition(token);
+			
+			// 5. Look for case statements
+			case ITokenConstants.SH_CASE:
+				checkLineStart(parent, token, atStart);
+				parseCaseBlock(parent, token, new AutoconfCaseElement());
+				break;
+				
+			case ITokenConstants.SH_CASE_CONDITION_END:
+				checkBlockValidity(
+						parent, token, 
+						new Class[] { AutoconfCaseConditionElement.class },
+						IMPROPER_CASE_CONDITION);
+				throw new BlockEndCondition(token);
+			
+			case ITokenConstants.SH_ESAC:
+				checkLineStart(parent, token, atStart);
+				checkBlockValidity(
+						parent, token, 
+						// note: we don't strictly recurse here, so accept either parent
+						new Class[] { AutoconfCaseElement.class, AutoconfCaseConditionElement.class },
+						INVALID_ESAC);
+				throw new BlockEndCondition(token);
+			
+			
+			// 6. Check for HERE documents
+			case ITokenConstants.SH_HERE:
+			case ITokenConstants.SH_HERE_DASH:
+
+				parseHERE(parent, token);
+				break;
+			}
+		}
+	}
+
+	private void checkLineStart(AutoconfElement parent, Token token, boolean atStart) {
+		if (!atStart) {
+			handleError(parent, token, AutoconfEditorMessages.getFormattedString(INVALID_TERMINATION, token.getText()));
+		}
+	}
+
+	/**
+	 * Parse the Here document, whose control token is provided (SH_HERE or SH_HERE_DASH).
+	 * Contents are thrown away except for any macro calls.
+	 * @param parent
+	 * @param controlToken
+	 */
+	private void parseHERE(AutoconfElement parent, Token controlToken) {
+		Token token = tokenizer.readToken();
+		if (token.getType() == ITokenConstants.EOL || token.getType() == ITokenConstants.EOF) {
+			handleError(parent, token,
+					AutoconfEditorMessages.getString(INCOMPLETE_INLINE_MARKER));
+			
+		} else {
+			String hereTag = token.getText();
+		
+			boolean atEOL = false;
+			while (true) {
+				token = tokenizer.readToken();
+				if (token.getType() == ITokenConstants.EOF) {
+					handleError(parent, token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, parent.getName()));
+					break;
+				} else if (token.getType() == ITokenConstants.EOL) {
+					atEOL = true;
+				} else {
+					if (atEOL && token.getText().equals(hereTag)) {
+						// only the end if it is also followed by EOL without any whitespace
+						Token eol = tokenizer.readToken();
+						if (eol.getType() == ITokenConstants.EOL && eol.getOffset() == token.getOffset() + token.getLength()) {
+							break;
+						}
+					}
+					if (token.getType() == ITokenConstants.WORD) {
+						checkMacro(parent, token);
+					}
+					atEOL = false;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Parse through a single expression up to a semicolon or newline.
+	 * Add a macro call to the element or just return upon finding the desired token.
+	 * Whenever a token terminates the expression, we check its validity and return the final token
+	 * Throw {@link BlockEndCondition} if an unexpected token was found.
+	 * @param parent the parent into which to add statements.  The type of this element is used
+	 * to validate the legality of block closing tokens.
+	 */
+	protected Token parseExpression(AutoconfElement parent) throws BlockEndCondition {
+	
+		while (true) {
+			Token token = tokenizer.readToken();
+			
+			// 0. Ignore comments (tokenizer skipped them!)
+			
+			switch (token.getType()) {
+			// 1. Check EOF
+			case ITokenConstants.EOF:
+				throw new BlockEndCondition(token);
+		
+			// 2. Check macro expansions
+			case ITokenConstants.WORD:
+				token = checkMacro(parent, token);
+				break;
+			
+			// 3. Check expression terminators
+			case ITokenConstants.SEMI:
+			case ITokenConstants.EOL:
+				return token;
+
+			// 4. Handle variables
+			case ITokenConstants.SH_DOLLAR:
+				token = tokenizer.readToken();
+				break;
+				
+			case ITokenConstants.SH_IN:
+				// in 'for' or 'select, an 'in' may occur before 'do'
+				if (!(parent instanceof AutoconfForElement)
+						&& !(parent instanceof AutoconfSelectElement)) 
+					return token;
+				// fall through
+				
+			// 5. Abort on unexpected tokens
+			case ITokenConstants.SH_DO:
+			case ITokenConstants.SH_THEN:
+				handleError(parent, token, AutoconfEditorMessages.getFormattedString(INVALID_SPECIFIER, token.getText()));
+				tokenizer.unreadToken(token);
+				// close enough...
+				return token;
+				
+			case ITokenConstants.SH_ESAC:
+			case ITokenConstants.SH_CASE:
+			case ITokenConstants.SH_CASE_CONDITION_END:
+			case ITokenConstants.SH_FOR:
+			case ITokenConstants.SH_IF:
+			case ITokenConstants.SH_ELIF:
+			case ITokenConstants.SH_ELSE:
+			case ITokenConstants.SH_FI:
+			case ITokenConstants.SH_DONE:
+				handleError(parent, token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, parent.getName()));
+				tokenizer.unreadToken(token);
+				throw new BlockEndCondition(token);
+			}
+		}
+	}
+
+	/**
+	 * Parse through a single expression up to 'do'.
+	 * Add a macro call to the element or just return upon finding the desired token.
+	 * Whenever a token terminates the expression, we check its validity and then throw ExprEndCondition.
+	 * Throw {@link BlockEndCondition} if an unexpected token was found.
+	 * @param parent the parent into which to add statements.  The type of this element is used
+	 * to validate the legality of block closing tokens.
+	 */
+	protected Token parseForExpression(AutoconfElement parent) throws BlockEndCondition {
+		while (true) {
+			Token token = tokenizer.readToken();
+			
+			// 0. Ignore comments (tokenizer skipped them!)
+			
+			// 1. Check EOF
+			if (token.getType() == ITokenConstants.EOF) {
+				throw new BlockEndCondition(token);
+			}
+		
+			// 2. Check macro expansions
+			else if (token.getType() == ITokenConstants.WORD) {
+				token = checkMacro(parent, token);
+			}
+			
+			// 3. Check expression terminators -- not ';' here, but 'do'
+			else if (token.getType() == ITokenConstants.SH_DO) {
+				tokenizer.unreadToken(token);
+				return tokenizer.peekToken();
+			}
+			
+			// 4. Abort on unexpected tokens
+			else switch (token.getType()) {
+			case ITokenConstants.SH_THEN:
+				handleError(parent, token, AutoconfEditorMessages.getFormattedString(INVALID_SPECIFIER, token.getText()));
+				tokenizer.unreadToken(token);
+				// close enough...
+				//throw new ExprEndCondition(token);
+				return token;
+				
+			case ITokenConstants.SH_ESAC:
+			case ITokenConstants.SH_CASE:
+			case ITokenConstants.SH_CASE_CONDITION_END:
+			case ITokenConstants.SH_FOR:
+			case ITokenConstants.SH_IF:
+			case ITokenConstants.SH_ELIF:
+			case ITokenConstants.SH_ELSE:
+			case ITokenConstants.SH_FI:
+			case ITokenConstants.SH_DONE:
+				handleError(parent, token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, parent.getName()));
+				tokenizer.unreadToken(token);
+				throw new BlockEndCondition(token);
+			}
+		}
+	}
+
+	/**
+	 * Parse through a single expression up to 'in'.
+	 * Add a macro call to the element or just return upon finding the desired token.
+	 * Whenever a token terminates the expression, we check its validity and then throw ExprEndCondition.
+	 * Throw {@link BlockEndCondition} if an unexpected token was found.
+	 * @param parent the parent into which to add statements.  The type of this element is used
+	 * to validate the legality of block closing tokens.
+	 */
+	protected Token parseCaseExpression(AutoconfElement parent) throws BlockEndCondition {
+		while (true) {
+			Token token = tokenizer.readToken();
+			
+			// 0. Ignore comments (tokenizer skipped them!)
+			
+			// 1. Check EOF
+			if (token.getType() == ITokenConstants.EOF) {
+				throw new BlockEndCondition(token);
+			}
+		
+			// 2. Check macro expansions
+			else if (token.getType() == ITokenConstants.WORD) {
+				token = checkMacro(parent, token);
+			}
+			
+			// 3. Check expression terminators
+			else if (parent instanceof AutoconfCaseElement && token.getType() == ITokenConstants.SH_IN) {
+				return token;
+			}
+			else if (parent instanceof AutoconfCaseConditionElement && token.getType() == ITokenConstants.RPAREN) {
+				return token;
+			}
+			
+			// 4. Abort on unexpected tokens
+			else switch (token.getType()) {
+			case ITokenConstants.SEMI:
+			case ITokenConstants.SH_IN:
+			case ITokenConstants.RPAREN:
+			case ITokenConstants.SH_DO:
+			case ITokenConstants.SH_THEN:
+				if (parent instanceof AutoconfCaseElement)
+					handleError(parent, token, AutoconfEditorMessages.getString(INVALID_IN));
+				else
+					handleError(parent, token, AutoconfEditorMessages.getString(IMPROPER_CASE_CONDITION));
+				// close enough...
+				return token;
+				
+			case ITokenConstants.SH_ESAC:
+			case ITokenConstants.SH_CASE:
+			case ITokenConstants.SH_CASE_CONDITION_END:
+			case ITokenConstants.SH_FOR:
+			case ITokenConstants.SH_IF:
+			case ITokenConstants.SH_ELIF:
+			case ITokenConstants.SH_ELSE:
+			case ITokenConstants.SH_FI:
+			case ITokenConstants.SH_DONE:
+				handleError(parent, token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, parent.getName()));
+				tokenizer.unreadToken(token);
+				throw new BlockEndCondition(token);
+			}
+		}
+	}
+	
+	/**
+	 * Check a given close block token against the current parent by checking that
+	 * the parent's class is one of classes,  If a match happens,
+	 * optionally push back the token if it will be used to parse new statements in the parent.
+	 * Report an error if the parent is not one of the expected kinds.
+	 * @param parent
+	 * @param token
+	 * @param classes
+	 */
+	private void checkBlockValidity(
+			AutoconfElement parent, 
+			Token token,
+			Class<?>[] classes,
+			String errorMessage) {
+		for (int i = 0; i < classes.length; i++) {
+			if (classes[i].isInstance(parent)) {
+				return;
+			}
+		}
+		
+		// not a match
+		handleError(parent, token, 
+				AutoconfEditorMessages.getFormattedString(errorMessage, parent.getName(), token.getText()));
+	}
+
+	/**
+	 * Check whether the given token is part of a macro, and parse it as such
+	 * if necessary.  
+	 * @param parent
+	 * @param token
+	 * @return Token last read for the macro call
+	 */
+	private Token checkMacro(AutoconfElement parent, Token token) {
+		String name = token.getText();
+		
+		boolean hasArguments = tokenizer.peekToken().getType() == ITokenConstants.LPAREN;
+		if (macroDetector != null && macroDetector.isMacroIdentifier(name)) {
+			// ok
+		} else if (m4builtins.contains(name)) {
+			// all of these except dnl take arguments
+			if (!name.equals("dnl") && !hasArguments) //$NON-NLS-1$
+				return token;
+		} else {
+			return token;
+		}
+		
+		AutoconfMacroElement macro = new AutoconfMacroElement(name);
+		token = parseMacro(macro, token);
+		
+		// handle special macros here
+		if ("dnl".equals(name)) { //$NON-NLS-1$
+			// consume to EOL
+			while (true) {
+				token = tokenizer.readToken();
+				if (token.getType() == ITokenConstants.EOF || token.getType() == ITokenConstants.EOL)
+					break;
+			}
+			
+			// ignore macro entirely
+			macro = null;
+		} else if ("changequote".equals(name)) { //$NON-NLS-1$
+			// change quote delimiters
+			validateMacroParameterCount(macro, token, 2);
+			
+			// GNU behavior for invalid argument count
+			String parm0 = "`"; //$NON-NLS-1$
+			String parm1 = "'"; //$NON-NLS-1$
+			if (macro.getParameterCount() >= 1)
+				parm0 = macro.getParameter(0);
+			if (macro.getParameterCount() >= 2)
+				parm1 = macro.getParameter(1);
+			
+			tokenizer.setM4Quote(parm0, parm1);
+		}  else if ("changecom".equals(name)) { //$NON-NLS-1$
+			// change comment delimiters
+			validateMacroParameterCount(macro, token, 2);
+			
+			// GNU behavior for invalid argument count
+			String parm0 = "#"; //$NON-NLS-1$
+			String parm1 = "\n"; //$NON-NLS-1$
+			if (macro.getParameterCount() >= 1)
+				parm0 = macro.getParameter(0);
+			if (macro.getParameterCount() >= 2)
+				parm1 = macro.getParameter(1);
+			
+			tokenizer.setM4Comment(parm0, parm1);
+		}
+		
+		if (macro != null) {
+			parent.addChild(macro);
+		}
+		
+		// now validate that the macro is properly terminated
+		if (!(parent instanceof AutoconfMacroArgumentElement) 
+				&& !(parent instanceof AutoconfMacroElement)
+				&& !(parent instanceof AutoconfForElement)) {
+			Token peek = tokenizer.peekToken();
+			if (peek.getType() == ITokenConstants.RPAREN) {
+				handleError(macro, peek, AutoconfEditorMessages.getString(UNMATCHED_RIGHT_PARENTHESIS)); 
+			}
+		}
+		
+		return token;
+	}
+
+	private void validateMacroParameterCount(AutoconfMacroElement macro, Token token, int count) {
+		if (macro.getParameterCount() < count) {
+			handleError(macro, token, AutoconfEditorMessages.getFormattedString("M4MacroArgsTooFew", macro.getName(), new Integer(2))); //$NON-NLS-1$ 
+		} else if (macro.getParameterCount() > count) {
+			handleError(macro, token, AutoconfEditorMessages.getFormattedString("M4MacroArgsTooMany", macro.getName(), new Integer(2))); //$NON-NLS-1$
+		}
+	}
+
+	/**
+	 * Start parsing a macro call at a suspected macro expansion location.
+	 * @param macro
+	 * @param line the line containing the start of the 
+	 * @param parent
+	 * @return last token parsed
+	 */
+	protected Token parseMacro(AutoconfMacroElement macro, Token macroName) {
+		setSourceStart(macro, macroName);
+		
+		// parse any arguments
+		tokenizer.setM4Context(true);
+		
+		Token token = tokenizer.readToken();
+		if (token.getType() == ITokenConstants.LPAREN) {
+			token = parseMacroArguments(macro, token);
+			setSourceEnd(macro, token);
+		} else {
+			tokenizer.unreadToken(token);
+			setSourceEnd(macro, macroName);
+		}
+		
+		tokenizer.setM4Context(false);
+		
+		// validate macro arguments?
+		if (macroValidator != null) {
+			try {
+				macroValidator.validateMacroCall(macro);
+			} catch (ParseException e) {
+				errorHandler.handleError(e);
+			}
+		}
+		
+		return token;
+	}
+
+	/**
+	 * Parse the arguments for the given macro.  These are not interpreted as shell
+	 * constructs but just as text with possibly more macro expansions inside.
+	 * @param macro
+	 * @return final token (')')
+	 */
+	protected Token parseMacroArguments(AutoconfMacroElement macro, Token lparen) {
+		Token argStart = null;
+		Token argEnd = null;
+		Token token;
+		
+		// When parsing, we want to ignore the whitespace around the arguments.
+		// So, instead of taking the source range "between" a parenthesis and a comma,
+		// track the exact tokens forming the start and end of an argument, defaulting
+		// to the borders of the parentheses and commas if no text is included.
+		
+		StringBuffer argBuffer = new StringBuffer();
+		AutoconfMacroArgumentElement arg = new AutoconfMacroArgumentElement();
+
+		while (true) {
+			token = tokenizer.readToken();
+			
+			if (token.getType() == ITokenConstants.EOL) {
+				if (argBuffer.length() > 0)
+					argBuffer.append(token.getText());
+				continue;
+			}
+			
+			if (token.getType() == ITokenConstants.COMMA 
+					|| token.getType() == ITokenConstants.RPAREN
+					|| token.getType() == ITokenConstants.EOF) {
+
+				arg.setName(argBuffer.toString());
+				argBuffer.setLength(0);
+				
+				if (argStart != null && argEnd != null) {
+					setSourceStart(arg, argStart);
+					setSourceEnd(arg, argEnd);
+				} else if (argEnd != null) {
+					setSourceStart(arg, argStart);
+					setSourceEndBefore(arg, token);
+				} else {
+					// empty argument
+					setSourceStart(arg, token);
+					setSourceEndBefore(arg, token);
+				}
+				
+				macro.addChild(arg);
+				
+				if (token.getType() != ITokenConstants.COMMA)
+					break;
+				
+				argStart = null;
+				argEnd = null;
+				
+				arg = new AutoconfMacroArgumentElement();
+
+			} else {
+				if (argStart == null) {
+					argStart = token;
+				}
+				argEnd = token;
+				
+				if (argBuffer.length() > 0 && token.followsSpace())
+					argBuffer.append(' ');
+				argBuffer.append(token.getText());
+				
+				// handle nested macro calls in arguments
+				if (token.getType() == ITokenConstants.WORD) {
+					argEnd = checkMacro(arg, token);
+				}
+			}
+		}
+		
+		if (token.getType() != ITokenConstants.RPAREN) {
+			handleError(macro, token, AutoconfEditorMessages.getString(UNMATCHED_LEFT_PARENTHESIS)); 
+		}
+		
+		// note: moved 15-char truncation to AutoconfLabelProvider
+		AutoconfElement[] children = macro.getChildren();
+		if (children.length > 0)
+			macro.setVar(children[0].getVar());
+		
+		return token;
+	}
+	
+
+	
+	protected void handleError(AutoconfElement element, Token token, String message) {
+		handleMessage(element, token, message, IMarker.SEVERITY_ERROR);
+	}
+	protected void handleWarning(AutoconfElement element, Token token, String message) {
+		handleMessage(element, token, message, IMarker.SEVERITY_WARNING);
+	}
+	protected void handleMessage(AutoconfElement element, Token token, String message, int severity) {
+		if (errorHandler != null) {
+			int lineNumber = 0;
+			int startColumn = 0;
+			int endColumn = 0;
+			try {
+				lineNumber = token.getDocument().getLineOfOffset(token.getOffset());
+				int lineOffs = token.getDocument().getLineOffset(lineNumber);
+				startColumn = token.getOffset() - lineOffs;
+				endColumn = startColumn + token.getLength();
+			} catch (BadLocationException e) {
+				// Don't care if we blow up trying to issue marker
+			}
+			errorHandler.handleError(new ParseException(
+					message,
+					token.getOffset(),
+					token.getOffset() + token.getLength(),
+					lineNumber, 
+					startColumn, endColumn,
+					severity));
+		}
+	}
+
+	public IAutoconfErrorHandler getErrorHandler() {
+		return errorHandler;
+	}
+}
+
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfRootElement.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfRootElement.java
new file mode 100644
index 0000000..105d00b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfRootElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfRootElement extends AutoconfElement {
+	
+	public AutoconfRootElement() {
+		super(""); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfSelectElement.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfSelectElement.java
new file mode 100644
index 0000000..204a459
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfSelectElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfSelectElement extends AutoconfElement {
+	
+	public AutoconfSelectElement() {
+		super("select"); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfTokenizer.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfTokenizer.java
new file mode 100644
index 0000000..6063be4
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfTokenizer.java
@@ -0,0 +1,435 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.AutoconfEditorMessages;
+
+
+/**
+ * This tokenizer traverses autotools-style text (m4 or configure.ac) to support the
+ * autoconf parser.  It tracks the current context (m4 macro call or shell commands)
+ * to detect appropriate tokens, and tracks the m4 current quote style as well.
+ * <p>
+ * In m4 mode, its primary purpose is to find word boundaries, detect comments and quoted
+ * strings, and to find the macro punctuation tokens.  It will not interpret anything
+ * (e.g. '$1' inside a macro) -- this is up to the parser.
+ * <p>
+ * In shell script mode, its primary purpose is to identify enough
+ * tokens to get a general picture of the structure of source for use by the autoconf
+ * parser.  This isn't intended to be used for full shell script parsing.  In fact,
+ * aside from the known tokens and identifiers, only individual characters will be returned.
+ * <p>
+ * Both modes know about "words" or identifiers and use the same syntax to detect these.
+ * It's expected that the parser will detect a word as a macro or possible macro and
+ * switch the mode of the tokenizer to fit.  The parser should invoke "setM4Context(...)"
+ * (and "unreadToken" if necessary) to switch modes.
+ * @author eswartz
+ *
+ */
+public class AutoconfTokenizer {
+
+	private static final String UNTERMINATED_STRING = "UnterminatedString"; //$NON-NLS-1$
+	public static final String UNMATCHED_RIGHT_QUOTE = "UnmatchedRightQuote"; //$NON-NLS-1$
+	public static final String UNMATCHED_LEFT_QUOTE = "UnmatchedLeftQuote"; //$NON-NLS-1$
+	public static final String UNMATCHED_CLOSE_COMMENT = "UnmatchedCloseComment"; //$NON-NLS-1$
+	
+	private IDocument document;
+	private int offset;
+	private String m4OpenQuote;
+	private String m4CloseQuote;
+	private String m4OpenComment;
+	private String m4CloseComment;
+	private char[] chars;
+	private int startOffset;
+	private boolean isM4Context;
+	private Token eofToken;
+	private IAutoconfErrorHandler errorHandler;
+
+	/** Create a tokenizer for a document. */
+	public AutoconfTokenizer(IDocument document, IAutoconfErrorHandler errorHandler) {
+		if (document == null /* || macroDetector == null*/)
+			throw new IllegalArgumentException();
+		this.document = document;
+		this.errorHandler = errorHandler;
+		
+		this.chars = document.get().toCharArray();
+		this.offset = 0;
+		
+		this.eofToken = new Token(ITokenConstants.EOF, "", document, chars.length, 0);
+		
+		this.m4OpenQuote = "`"; //$NON-NLS-1$
+		this.m4CloseQuote = "'"; //$NON-NLS-1$
+		this.m4OpenComment = "#"; //$NON-NLS-1$
+		this.m4CloseComment = "\n"; //$NON-NLS-1$
+	}
+	
+	/**
+	 * Tell whether the tokenizer considers itself to be in an m4 context.
+	 * This determines what kinds of tokens it returns.
+	 * @return
+	 */
+	public boolean isM4Context() {
+		return isM4Context;
+	}
+	
+	/**
+	 * Switch the tokenizer into or out of m4 context.
+	 * @return
+	 */
+	public void setM4Context(boolean flag) {
+		isM4Context = flag;
+	}
+	
+	/** 
+	 * Set the m4 quote delimiters
+	 */
+	public void setM4Quote(String open, String close) {
+		this.m4OpenQuote = open;
+		this.m4CloseQuote = close;
+	}
+
+	/** 
+	 * Set the m4 comment delimiters
+	 */
+	public void setM4Comment(String open, String close) {
+		this.m4OpenComment = open;
+		this.m4CloseComment = close;
+	}
+	
+	/** Push back the given token.  This allows the tokenizer to restart from its start position,
+	 * potentially in a different context. */
+	public void unreadToken(Token token) {
+		if (token.getLength() > 0 && offset == token.getOffset())
+			throw new IllegalStateException();
+		offset = token.getOffset();
+	}
+	
+	/** Read the next token. Returns an EOF token at EOF. */
+	public Token readToken() {
+		if (offset >= chars.length)
+			return eofToken;
+		
+		char ch = chars[offset];
+		
+		// skip whitespace (but not EOL)
+		while (isWhitespace(ch)) {
+			offset++;
+			if (offset >= chars.length)
+				return eofToken;
+			ch = chars[offset];
+		}
+
+		// in shell mode, strip comments up to eol 
+		if (!isM4Context && ch == '#') {
+			while (offset < chars.length) {
+				ch = chars[offset];
+				if (ch == '\n')
+					break;
+				offset++;
+			}
+			
+			// keep inside doc if we didn't find that EOL
+			if (offset >= chars.length)
+				offset--;
+		}
+
+		startOffset = offset;
+		StringBuffer buffer = new StringBuffer();
+		
+		// check EOL
+		if (ch == '\r' || ch == '\n') {
+			buffer.append(ch);
+			offset++;
+			if (ch == '\r' && offset < chars.length && chars[offset] == '\n') {
+				buffer.append(chars[offset++]);
+			}
+			return makeToken(ITokenConstants.EOL, buffer.toString());
+		}
+		
+		// TODO: this parser always uses fixed logic for identifier reading, ignoring m4's "changeword"
+		if (isLeadIdentifierChar(ch)) {
+			return parseWord(ch);
+		}
+		
+		// check comments and quotes
+		if (isM4Context) {
+			if (lookAhead(m4OpenComment)) {
+				boolean found = false;
+				// keep reading until the close comment (these are NOT nested)
+				while (offset < chars.length) {
+					if (lookAhead(m4CloseComment)) {
+						found = true;
+						break;
+					}
+					offset++;
+				}
+				if (!found) {
+					handleError(startOffset, offset, AutoconfEditorMessages.getFormattedString(UNMATCHED_CLOSE_COMMENT, 
+							m4CloseComment.equals("\n") ? "newline" : m4CloseComment)); //$NON-NLS-1$
+				}
+				return makeToken(ITokenConstants.M4_COMMENT);
+			}
+			
+			if (lookAhead(m4OpenQuote)) {
+				return parseQuote();
+			}
+		}
+		
+		// check shell punctuation
+		if (!isM4Context) {
+			if (ch == ';' && offset + 1 < chars.length && chars[offset + 1] == ';') {
+				offset += 2;
+				return makeToken(ITokenConstants.SH_CASE_CONDITION_END);
+			}
+			if (ch == '<' && offset + 1 < chars.length && chars[offset + 1] == '<') {
+				offset += 2;
+				if (offset < chars.length && chars[offset] == '-') {
+					offset++;
+					return makeToken(ITokenConstants.SH_HERE_DASH);
+				} else {
+					return makeToken(ITokenConstants.SH_HERE);
+				}
+			}
+			switch (ch) {
+			case '$':
+				offset++;
+				return makeToken(ITokenConstants.SH_DOLLAR);
+			case '[':
+				offset++;
+				return makeToken(ITokenConstants.SH_LBRACKET);
+			case ']':
+				offset++;
+				return makeToken(ITokenConstants.SH_RBRACKET);
+			case '{':
+				offset++;
+				return makeToken(ITokenConstants.SH_LBRACE);
+			case '}':
+				offset++;
+				return makeToken(ITokenConstants.SH_RBRACE);
+			case '\'':
+				return parseString(ITokenConstants.SH_STRING_SINGLE, ch);
+			case '\"':
+				return parseString(ITokenConstants.SH_STRING_DOUBLE, ch);
+			case '`':
+				return parseString(ITokenConstants.SH_STRING_BACKTICK, ch);
+			}
+		}
+		
+		// check common punctuation
+		if (ch == ';') {
+			offset++;
+			return makeToken(ITokenConstants.SEMI);
+		}
+		if (ch == ',') {
+			offset++;
+			return makeToken(ITokenConstants.COMMA);
+		}
+		if (ch == '(') {
+			offset++;
+			return makeToken(ITokenConstants.LPAREN);
+		}
+		if (ch == ')') {
+			offset++;
+			return makeToken(ITokenConstants.RPAREN);
+		}
+		
+		// unknown text
+		offset++;
+		return makeToken(ITokenConstants.TEXT);
+	}
+
+	private Token parseWord(char ch) {
+		StringBuffer buffer = new StringBuffer();
+		
+		buffer.append(ch);
+		offset++;
+		do {
+			if (offset >= chars.length)
+				break;
+			ch = chars[offset];
+			if (!isIdentifierChar(ch))
+				break;
+			buffer.append(ch);
+			offset++;
+		} while (true);
+		
+		String text = buffer.toString();
+		
+		if (!isM4Context) {
+			// detect sh tokens
+			if ("case".equals(text))
+				return makeToken(ITokenConstants.SH_CASE, text);
+			if ("in".equals(text))
+				return makeToken(ITokenConstants.SH_IN, text);
+			if ("esac".equals(text))
+				return makeToken(ITokenConstants.SH_ESAC, text);
+			if ("while".equals(text))
+				return makeToken(ITokenConstants.SH_WHILE, text);
+			if ("select".equals(text))
+				return makeToken(ITokenConstants.SH_SELECT, text);
+			if ("until".equals(text))
+				return makeToken(ITokenConstants.SH_UNTIL, text);
+			if ("for".equals(text))
+				return makeToken(ITokenConstants.SH_FOR, text);
+			if ("do".equals(text))
+				return makeToken(ITokenConstants.SH_DO, text);
+			if ("done".equals(text))
+				return makeToken(ITokenConstants.SH_DONE, text);
+			if ("if".equals(text))
+				return makeToken(ITokenConstants.SH_IF, text);
+			if ("then".equals(text))
+				return makeToken(ITokenConstants.SH_THEN, text);
+			if ("else".equals(text))
+				return makeToken(ITokenConstants.SH_ELSE, text);
+			if ("elif".equals(text))
+				return makeToken(ITokenConstants.SH_ELIF, text);
+			if ("fi".equals(text))
+				return makeToken(ITokenConstants.SH_FI, text);
+		}
+		
+		// other identifier-looking word
+		return makeToken(ITokenConstants.WORD, text);
+	}
+	
+	private Token parseQuote() {
+		// read text, honoring nested quotes, but don't put the outermost quotes in the token  
+		
+		StringBuffer buffer = new StringBuffer();
+		
+		int quoteLevel = 1;
+		// keep reading until the close quote
+		while (offset < chars.length) {
+			if (lookAhead(m4CloseQuote)) {
+				quoteLevel--;
+				if (quoteLevel == 0)
+					break;
+				buffer.append(m4CloseQuote);
+			} else if (lookAhead(m4OpenQuote)) {
+				buffer.append(m4OpenQuote);
+				quoteLevel++;
+			} else {
+				buffer.append(chars[offset]);
+				offset++;
+			}
+		}
+		
+		if (quoteLevel > 0) {
+			handleError(startOffset, offset, AutoconfEditorMessages.getFormattedString(UNMATCHED_LEFT_QUOTE, m4CloseQuote));
+		} else if (quoteLevel < 0) {
+			handleError(startOffset, offset, AutoconfEditorMessages.getFormattedString(UNMATCHED_RIGHT_QUOTE, m4OpenQuote));
+		}
+		
+		return makeToken(ITokenConstants.M4_STRING, buffer.toString());
+	}
+
+	private Token parseString(int type, char terminal) {
+		startOffset = offset;
+		offset++;
+		
+		StringBuffer buffer = new StringBuffer();
+		
+		char ch = 0;
+		while (offset < chars.length) {
+			ch = chars[offset++];
+			if (ch == '\\') {
+				if (offset < chars.length)
+					buffer.append(chars[offset++]);
+				else
+					buffer.append(ch);
+			} else if (ch == terminal) {
+				break;
+			} else {
+				buffer.append(ch);
+			}
+		}
+
+		if (ch != terminal) {
+			handleError(startOffset, offset, AutoconfEditorMessages.getFormattedString(UNTERMINATED_STRING, "" + ch));
+		}
+		
+		return makeToken(type, buffer.toString());
+	}
+
+	private void handleError(int start, int end,
+			String message) {
+		if (errorHandler != null) {
+			int lineNumber = 0;
+			int startColumn = 0;
+			int endColumn = 0;
+			try {
+				lineNumber = document.getLineOfOffset(start);
+				int lineOffs = document.getLineOffset(lineNumber);
+				startColumn = start - lineOffs;
+				endColumn = end - lineOffs;
+			} catch (BadLocationException e) {
+				// Don't care if we blow up trying to issue marker
+			}
+			errorHandler.handleError(new ParseException(
+					message,
+					start, end,
+					lineNumber, 
+					startColumn, endColumn,
+					IMarker.SEVERITY_ERROR));
+		}
+	}
+
+	/** 
+	 * Look ahead for the given string.  If found, return true, and have
+	 * offset updated.  Otherwise, return false with offset unchanged.
+	 * @param keyword
+	 * @param text
+	 * @return
+	 */
+	private boolean lookAhead(String keyword) {
+		int length = keyword.length();
+		if (offset + length > chars.length) {
+			return false;
+		}
+		for (int idx = 0; idx < length; idx++) {
+			if (chars[offset + idx] != keyword.charAt(idx))
+				return false;
+		}
+		offset += length;
+		return true;
+	}
+
+	private boolean isWhitespace(char ch) {
+		return ch == ' ' || ch == '\t' || ch == '\f';
+	}
+
+	private Token makeToken(int type) {
+		return new Token(type,
+				new String(chars, startOffset, offset - startOffset),
+				document, startOffset, offset - startOffset);
+	}
+
+	private Token makeToken(int type, String text) {
+		return new Token(type, text, document, startOffset, offset - startOffset);
+	}
+
+	private boolean isIdentifierChar(char ch) {
+		return isLeadIdentifierChar(ch) || (ch >= '0' && ch <= '9');
+	}
+
+	private boolean isLeadIdentifierChar(char ch) {
+		return (ch >= 'A' &&  ch <= 'Z') || (ch >= 'a' && ch <= 'z') || ch == '_';
+	}
+	
+	public Token peekToken() {
+		Token token = readToken();
+		unreadToken(token);
+		return token;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfUntilElement.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfUntilElement.java
new file mode 100644
index 0000000..979ffe4
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfUntilElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfUntilElement extends AutoconfElement {
+	
+	public AutoconfUntilElement() {
+		super("until"); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfWhileElement.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfWhileElement.java
new file mode 100644
index 0000000..169edd7
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfWhileElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfWhileElement extends AutoconfElement {
+	
+	public AutoconfWhileElement() {
+		super("while"); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfErrorHandler.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfErrorHandler.java
new file mode 100644
index 0000000..1363240
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfErrorHandler.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+
+/**
+ * Clients implement this interface to handle errors encountered while parsing.
+ * @author eswartz
+ *
+ */
+public interface IAutoconfErrorHandler {
+
+	/**
+	 * Handle an exception associated with the given element
+	 * @param exception the exception to handle; has a line number
+	 * at the time of call
+	 */
+	void handleError(ParseException exception);
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroDetector.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroDetector.java
new file mode 100644
index 0000000..e438731
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroDetector.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+
+/**
+ * Clients implement this interface to identify what identifiers represent 
+ * macros for the autoconf tree.
+ * @author eswartz
+ *
+ */
+public interface IAutoconfMacroDetector {
+
+	/**
+	 * Tell if this identifier should be treated as an m4 macro call.
+	 * The identifier has already been judged to be a valid candidate
+	 * (i.e. it's not quoted).
+	 * @param name the string to check
+	 */
+	boolean isMacroIdentifier(String name);
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroValidator.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroValidator.java
new file mode 100644
index 0000000..2a54ee4
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroValidator.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+
+/**
+ * Clients implement this interface to validate macro calls.
+ * @author eswartz
+ *
+ */
+public interface IAutoconfMacroValidator {
+
+	/**
+	 * Validate the given macro call.
+	 * @param element macro call, never <code>null</code>
+	 * @throws ParseException if the call doesn't match the expected number of elements 
+	 */
+	void validateMacroCall(AutoconfMacroElement element) throws ParseException;
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IMacroDetector.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IMacroDetector.java
new file mode 100644
index 0000000..b225942
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IMacroDetector.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+/**
+ * Clients implement this interface to detect whether a given identifier 
+ * represents a known or potential macro in m4 or configure.ac text.
+ * @author eswartz
+ *
+ */
+public interface IMacroDetector {
+	boolean isMacro(String identifier);
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ITokenConstants.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ITokenConstants.java
new file mode 100644
index 0000000..b665115
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ITokenConstants.java
@@ -0,0 +1,87 @@
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public interface ITokenConstants {
+
+	/** end of file */
+	public static final int EOF = 0;
+	/** end of line */
+	public static final int EOL = 1;
+	
+	/** an open parenthesis */
+	public static final int LPAREN = 2;
+	/** a close parenthesis */
+	public static final int RPAREN = 3;
+	/** a comma */
+	public static final int COMMA = 4;
+	/** a semicolon */
+	public static final int SEMI = 5;
+
+	/** a word (either m4 word or shell identifier-looking word) */
+	public static final int WORD = 6;
+
+	/** other text (usually punctuation or number, one char at a time) */
+	public static final int TEXT = 7;
+
+	/** an m4 string (the text does not contain the outermost quotes) */
+	public static final int M4_STRING = 21;
+	/** an m4 comment (as determined by changecomment, NOT dnl) */
+	public static final int M4_COMMENT = 22;
+	
+	/** the sh 'if' token */
+	public static final int SH_IF = 40;
+	/** the sh 'then' token */
+	public static final int SH_THEN = 41;
+	/** the sh 'else' token */
+	public static final int SH_ELSE = 42;
+	/** the sh 'elif' token */
+	public static final int SH_ELIF = 43;
+	/** the sh 'fi' token */
+	public static final int SH_FI = 44;
+	
+	/** the sh 'while' token */
+	public static final int SH_WHILE = 45;
+	/** the sh 'for' token */
+	public static final int SH_FOR = 46;
+	/** the sh 'select' token */
+	public static final int SH_SELECT = 47;
+	/** the sh 'until' token */
+	public static final int SH_UNTIL = 48;
+	/** the sh 'do' token */
+	public static final int SH_DO = 49;
+	/** the sh 'done' token */
+	public static final int SH_DONE = 50;
+	/** the sh 'case' token */
+	
+	public static final int SH_CASE = 51;
+	/** the sh 'in' token */
+	public static final int SH_IN = 52;
+	/** the sh ';;' token */
+	public static final int SH_CASE_CONDITION_END = 53;
+	/** the sh 'esac' token */
+	public static final int SH_ESAC = 54;
+
+	/** the sh '$' token */
+	public static final int SH_DOLLAR = 60;
+	
+	/** the sh '{' token */
+	public static final int SH_LBRACE = 61;
+	/** the sh '}' token */
+	public static final int SH_RBRACE = 62;
+	/** the sh '[' token */
+	public static final int SH_LBRACKET = 63;
+	/** the sh ']' token */
+	public static final int SH_RBRACKET = 64;
+	
+	/** the sh '<<' token */
+	public static final int SH_HERE = 65;
+	/** the sh '<<-' token */
+	public static final int SH_HERE_DASH = 66;
+	/** an sh double-quoted string */
+	public static final int SH_STRING_DOUBLE = 67;
+	/** an sh single-quoted string */
+	public static final int SH_STRING_SINGLE = 68;
+	/** an sh backtick-quoted string */
+	public static final int SH_STRING_BACKTICK = 69;
+
+
+}
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ParseException.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ParseException.java
new file mode 100644
index 0000000..f0bc442
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ParseException.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class ParseException extends Exception {
+	
+	static final long serialVersionUID = 1;
+	String message;
+	int severity;
+	int lineNumber;
+	int startColumn;
+	int endColumn;
+	private int startOffset;
+	private int endOffset;
+	public int getEndColumn() {
+		return endColumn;
+	}
+	public void setEndColumn(int endColumn) {
+		this.endColumn = endColumn;
+	}
+	public int getLineNumber() {
+		return lineNumber;
+	}
+	public void setLineNumber(int lineNumber) {
+		this.lineNumber = lineNumber;
+	}
+	public String getMessage() {
+		return message;
+	}
+	public void setMessage(String message) {
+		this.message = message;
+	}
+	public int getStartColumn() {
+		return startColumn;
+	}
+	public void setStartColumn(int startColumn) {
+		this.startColumn = startColumn;
+	}
+	public ParseException(String message,
+			int startOffset, int endOffset,
+			int lineNumber, int startColumn, int endColumn, int severity) {
+		super();
+		this.message = message;
+		this.startOffset = startOffset;
+		this.endOffset = endOffset;
+		this.lineNumber = lineNumber;
+		this.startColumn = startColumn;
+		this.endColumn = endColumn;
+		this.severity = severity;
+	}
+	public int getSeverity() {
+		return severity;
+	}
+	public void setSeverity(int severity) {
+		this.severity = severity;
+	}
+	public int getStartOffset() {
+		return startOffset;
+	}
+	public int getEndOffset() {
+		return endOffset;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/Token.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/Token.java
new file mode 100644
index 0000000..9690363
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/Token.java
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+import org.eclipse.jface.text.IDocument;
+
+/**
+ * A single token parsed from an autotools-style file.  This represents m4 and sh
+ * tokens.  Punctuation characters shared by both are not in a namespace.
+ * 
+ * @author eswartz
+ *
+ */
+public class Token implements ITokenConstants {
+	/** Type: 
+	 * @see ITokenConstants
+	 */
+	final int type;
+	/**
+	 * Text of token, possibly interpreted or reduced from original characters
+	 */
+	final String text;
+	/**
+	 * Offset of token before interpretation
+	 */
+	final int offset;
+	/**
+	 * Length of token before interpretation
+	 */
+	final int length;
+	/**
+	 * The document providing the text
+	 */
+	final IDocument document;
+
+	public Token(int type, String text, IDocument document, int offset, int length) {
+		this.type = type;
+		this.text = text;
+		this.document = document;
+		this.offset = offset;
+		this.length = length;
+	}
+	
+	public String toString() {
+		return text;
+	}
+
+	public int getType() {
+		return type;
+	}
+
+	public String getText() {
+		return text;
+	}
+
+	public IDocument getDocument() {
+		return document;
+	}
+
+	public int getOffset() {
+		return offset;
+	}
+	
+	public int getLength() {
+		return length;
+	}
+
+	public boolean followsSpace() {
+		char[] text = document.get().toCharArray();
+		if (offset == 0)
+			return false;
+		return (" \t\r\n\f".indexOf(text[offset - 1]) >= 0);
+	}
+	
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AbstractAutotoolsCPropertyTab.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AbstractAutotoolsCPropertyTab.java
new file mode 100644
index 0000000..3459ea0
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AbstractAutotoolsCPropertyTab.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.cdt.managedbuilder.ui.properties.AbstractCBuildPropertyTab;
+
+public abstract class AbstractAutotoolsCPropertyTab extends
+		AbstractCBuildPropertyTab {
+
+	public boolean isIndexerAffected() {
+		return false;
+	}
+	
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsConsole.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsConsole.java
new file mode 100644
index 0000000..982764a
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsConsole.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2004, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ * Red Hat Inc - Adapted for Autotools usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.cdt.ui.IBuildConsoleManager;
+import org.eclipse.core.resources.IProject;
+
+public class AutotoolsConsole extends Console {
+	IProject project;
+	IBuildConsoleManager fConsoleManager;
+	
+	private static final String CONTEXT_MENU_ID = "CAutotoolsConsole"; //$NON-NLS-1$
+	private static final String CONSOLE_NAME = ConsoleMessages.getString("AutotoolsConsole.name"); //$NON-NLS-1$
+	
+	public AutotoolsConsole() {
+		super(CONSOLE_NAME, CONTEXT_MENU_ID);
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsUIPluginImages.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsUIPluginImages.java
new file mode 100644
index 0000000..7314abc
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsUIPluginImages.java
@@ -0,0 +1,133 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2007, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *     Red Hat Inc. - completely modified for Autotools usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.cdt.ui.CUIPlugin;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.swt.graphics.Image;
+
+
+/**
+ * Bundle of all images used by the C plugin.
+ */
+public class AutotoolsUIPluginImages {
+	
+	// The plugin registry
+	private static ImageRegistry imageRegistry = new ImageRegistry(CUIPlugin.getStandardDisplay());
+
+	// Subdirectory (under the package containing this class) where 16 color images are
+	private static URL fgIconBaseURL;
+
+	static {
+		try {
+			fgIconBaseURL= new URL(AutotoolsUIPlugin.getDefault().getBundle().getEntry("/"), "icons/" ); //$NON-NLS-1$ //$NON-NLS-2$
+		} catch (MalformedURLException e) {
+			CUIPlugin.log(e);
+		}
+	}	
+	private static final String NAME_PREFIX= AutotoolsUIPlugin.PLUGIN_ID + '.';
+	private static final int NAME_PREFIX_LENGTH= NAME_PREFIX.length();
+
+	public static final String T_OBJ= "ac16/"; //$NON-NLS-1$
+	public static final String T_BUILD= "elcl16/"; //$NON-NLS-1$
+
+	public static final String IMG_OBJS_IF= NAME_PREFIX + "if_obj.gif"; //$NON-NLS-1$
+	public static final String IMG_OBJS_ELSE= NAME_PREFIX + "else_obj.gif"; //$NON-NLS-1$
+	public static final String IMG_OBJS_ELIF= NAME_PREFIX + "elif_obj.gif";	 //$NON-NLS-1$
+	public static final String IMG_OBJS_CASE= NAME_PREFIX + "case_obj.gif"; //$NON-NLS-1$
+	public static final String IMG_OBJS_CONDITION= NAME_PREFIX + "condition_obj.gif"; //$NON-NLS-1$
+	public static final String IMG_OBJS_FOR= NAME_PREFIX + "for_obj.gif"; //$NON-NLS-1$
+	public static final String IMG_OBJS_WHILE= NAME_PREFIX + "while_obj.gif"; //$NON-NLS-1$
+	public static final String IMG_OBJS_ACMACRO= NAME_PREFIX + "acmacro_obj.gif"; //$NON-NLS-1$
+	public static final String IMG_OBJS_AMMACRO= NAME_PREFIX + "ammacro_obj.gif"; //$NON-NLS-1$
+	public static final String IMG_OBJS_ACMACRO_ARG = NAME_PREFIX + "acmacro_arg_obj.gif"; // $NON-NLS-1$
+	public static final String IMG_BUILD_CONFIG = NAME_PREFIX + "build_configs.gif"; //$NON-NLS-1$
+	public static final String IMG_CFG_CATEGORY = NAME_PREFIX + "config_category.gif"; //$NON-NLS-1$
+	public static final String IMG_CFG_TOOL = NAME_PREFIX + "config_tool.gif"; //$NON-NLS-1$
+
+ 	public static final ImageDescriptor DESC_OBJS_IF= createManaged(T_OBJ, IMG_OBJS_IF);
+	public static final ImageDescriptor DESC_OBJS_ELSE= createManaged(T_OBJ, IMG_OBJS_ELSE);
+	public static final ImageDescriptor DESC_OBJS_ELIF= createManaged(T_OBJ, IMG_OBJS_ELIF);
+	public static final ImageDescriptor DESC_OBJS_CASE= createManaged(T_OBJ, IMG_OBJS_CASE);
+	public static final ImageDescriptor DESC_OBJS_CONDITION = createManaged(T_OBJ, IMG_OBJS_CONDITION);
+	public static final ImageDescriptor DESC_OBJS_FOR= createManaged(T_OBJ, IMG_OBJS_FOR);
+	public static final ImageDescriptor DESC_OBJS_WHILE= createManaged(T_OBJ, IMG_OBJS_WHILE);
+	public static final ImageDescriptor DESC_OBJS_ACMACRO= createManaged(T_OBJ, IMG_OBJS_ACMACRO);
+	public static final ImageDescriptor DESC_OBJS_AMMACRO= createManaged(T_OBJ, IMG_OBJS_AMMACRO);
+	public static final ImageDescriptor DESC_OBJS_ACMACRO_ARG= createManaged(T_OBJ, IMG_OBJS_ACMACRO_ARG);
+	public static final ImageDescriptor DESC_BUILD_CONFIG = createManaged(T_BUILD, IMG_BUILD_CONFIG);
+	public static final ImageDescriptor DESC_CFG_CATEGORY = createManaged(T_BUILD, IMG_CFG_CATEGORY);
+	public static final ImageDescriptor DESC_CFG_TOOL = createManaged(T_BUILD, IMG_CFG_TOOL);
+
+	private static ImageDescriptor createManaged(String prefix, String name) {
+		return createManaged(imageRegistry, prefix, name);
+	}
+	
+	private static ImageDescriptor createManaged(ImageRegistry registry, String prefix, String name) {
+		ImageDescriptor result= ImageDescriptor.createFromURL(makeIconFileURL(prefix, name.substring(NAME_PREFIX_LENGTH)));
+		registry.put(name, result);
+		return result;
+	}
+	
+	public static Image get(String key) {
+		return imageRegistry.get(key);
+	}
+	
+	private static ImageDescriptor create(String prefix, String name) {
+		return ImageDescriptor.createFromURL(makeIconFileURL(prefix, name));
+	}
+	
+	private static URL makeIconFileURL(String prefix, String name) {
+		StringBuffer buffer= new StringBuffer(prefix);
+		buffer.append(name);
+		try {
+			return new URL(fgIconBaseURL, buffer.toString());
+		} catch (MalformedURLException e) {
+			CUIPlugin.log(e);
+			return null;
+		}
+	}
+	
+	/**
+	 * Sets all available image descriptors for the given action.
+	 */	
+	public static void setImageDescriptors(IAction action, String type, String relPath) {
+	    if (relPath.startsWith(NAME_PREFIX))
+	        relPath= relPath.substring(NAME_PREFIX_LENGTH);
+		action.setDisabledImageDescriptor(create("d" + type, relPath)); //$NON-NLS-1$
+//		action.setHoverImageDescriptor(create("c" + type, relPath)); //$NON-NLS-1$
+		action.setImageDescriptor(create("e" + type, relPath)); //$NON-NLS-1$
+
+		// We are still not sure about this, let see TF results first.
+		//		Use the managed version so that we ensure that there is no resource handle leaks
+		//		Let the widget itself manage the disabled/hover attribution.  This was a huge leak
+		//ImageDescriptor desc = getImageRegistry().getDescriptor(relPath);
+		//if(desc == null) {
+		//	desc = createManaged(T + "c" + type, relPath);
+		//}	
+		//action.setImageDescriptor(desc);
+	}
+	
+	/**
+	 * Helper method to access the image registry from the CUIPlugin class.
+	 */
+	static ImageRegistry getImageRegistry() {
+		return imageRegistry;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CBuildStepsConsole.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CBuildStepsConsole.java
new file mode 100644
index 0000000..5ba3259
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CBuildStepsConsole.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2004, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ * Red Hat Inc - Adapted for Autotools usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.cdt.ui.IBuildConsoleManager;
+import org.eclipse.core.resources.IProject;
+
+public class CBuildStepsConsole extends Console {
+	IProject project;
+	IBuildConsoleManager fConsoleManager;
+	
+	private static final String CONTEXT_MENU_ID = "CAutotoolsBuildStepsConsole"; //$NON-NLS-1$
+	private static final String CONSOLE_NAME = ConsoleMessages.getString("BuildStepsConsole.name"); //$NON-NLS-1$
+	
+	public CBuildStepsConsole() {
+		super(CONSOLE_NAME, CONTEXT_MENU_ID);
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CConfigureConsole.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CConfigureConsole.java
new file mode 100644
index 0000000..1925fcd
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CConfigureConsole.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2004, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.cdt.ui.IBuildConsoleManager;
+import org.eclipse.core.resources.IProject;
+
+public class CConfigureConsole extends Console {
+	IProject project;
+	IBuildConsoleManager fConsoleManager;
+	
+	private static final String CONTEXT_MENU_ID = "CAutotoolsConfigureConsole"; //$NON-NLS-1$
+	private static final String CONSOLE_NAME = ConsoleMessages.getString("ConfigureConsole.name"); //$NON-NLS-1$
+	
+	public CConfigureConsole() {
+		super(CONSOLE_NAME, CONTEXT_MENU_ID);
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CWordFinder.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CWordFinder.java
new file mode 100644
index 0000000..cc28694
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CWordFinder.java
@@ -0,0 +1,283 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.Region;
+
+
+/**
+ * This is a helper class for the text editor to be able to determine, given a
+ * particular offset in a document, various candidates segments for things like
+ * context help, proposals and hovering.
+ */
+public class CWordFinder {
+	
+	private static final char CBRACE_L = '{';
+	private static final char CBRACE_R = '}';
+	private static final char  BRACE_R = ')';
+	
+	/**
+	 * This method determines for a given offset into a given document what the
+	 * region is which defines the current word. A word is defined as the set of
+	 * non "C" identifiers. So assuming that ! indicated the current cursor
+	 * postion: !afunction(int a, int b) --> word = length 0 afunc!tion(int a,
+	 * int b) --> word = afunction afunction!(int a, int b) --> word = afunction
+	 * afunction(!int a, int b) --> word = length 0 afunction(int a,! int b) -->
+	 * word = length 0 afunction(!) --> word = length 0
+	 * 
+	 * @param document
+	 *            The document to be examined
+	 * @param offset
+	 *            The offset into the document where a word should be
+	 *            idendified.
+	 * @return The region defining the current word, which may be a region of
+	 *         length 0 if the offset is not in a word, or null if there is an
+	 *         error accessing the docment data.
+	 */
+	public static IRegion findWord(IDocument document, int offset) {
+		int start = -1;
+		int end = -1;
+
+		try {
+			int pos = offset;
+			char c;
+
+			while (pos >= 0) {
+				c = document.getChar(pos);
+				if (!Character.isJavaIdentifierPart(c))
+					break;
+				--pos;
+			}
+
+			start = pos + 1;
+
+			pos = offset;
+			int length = document.getLength();
+
+			while (pos < length) {
+				c = document.getChar(pos);
+				if (!Character.isJavaIdentifierPart(c))
+					break;
+				++pos;
+			}
+
+			end = pos;
+
+		} catch (BadLocationException x) {
+		}
+
+		if (start > -1 && end > -1) {
+			if (start >= offset && end == offset)
+				return new Region(offset, 0);
+			else
+				return new Region(start, end - start);
+		}
+
+		return null;
+	}
+
+	/**
+	 * This method will determine the region for the name of the function within
+	 * which the current offset is contained.
+	 * 
+	 * @param document
+	 *            The document to be examined
+	 * @param offset
+	 *            The offset into the document where a word should be
+	 *            idendified.
+	 * @return The region defining the current word, which may be a region of
+	 *         length 0 if the offset is not in a function, or null if there is
+	 *         an error accessing the docment data.
+	 */
+	public static IRegion findFunction(IDocument document, int offset) {
+		int leftbracket = -1;
+		int leftbracketcount = 0;
+		int rightbracket = -1;
+		int rightbracketcount = 0;
+		int functionstart = -1;
+		int functionend = -1;
+
+		try {
+			int length = document.getLength();
+			int pos;
+			char c;
+
+			//Find most relevant right bracket from our position
+			pos = offset;
+			rightbracketcount = leftbracketcount = 0;
+			while (pos < length) {
+				c = document.getChar(pos);
+
+				if (c == ')') {
+					rightbracketcount++;
+					if (rightbracketcount >= leftbracketcount) {
+						rightbracket = pos;
+						break;
+					}
+				}
+
+				if (c == '(') {
+					leftbracketcount++;
+				}
+
+				if (c == ';') {
+					break;
+				}
+
+				pos++;
+			}
+
+			if (rightbracket == -1) {
+				return new Region(offset, 0);
+			}
+
+			//Now backtrack our way from the rightbracket to the left
+			pos = rightbracket;
+			rightbracketcount = leftbracketcount = 0;
+			while (pos >= 0) {
+				c = document.getChar(pos);
+
+				if (c == ')') {
+					rightbracketcount++;
+				}
+
+				if (c == '(') {
+					leftbracketcount++;
+					if (leftbracketcount >= rightbracketcount) {
+						leftbracket = pos;
+						break;
+					}
+				}
+
+				if (c == ';') {
+					break;
+				}
+
+				pos--;
+			}
+
+			if (leftbracket == -1) {
+				return new Region(offset, 0);
+			}
+
+			//Now work our way to the function name
+			pos = leftbracket - 1;
+			while (pos >= 0) {
+				c = document.getChar(pos);
+				if (functionend == -1 && c == ' ') {
+					pos--;
+					continue;
+				}
+
+				if (!Character.isJavaIdentifierPart(c)) {
+					break;
+				}
+
+				functionstart = pos;
+				if (functionend == -1) {
+					functionend = pos;
+				}
+
+				pos--;
+			}
+		} catch (BadLocationException x) {
+			/* Ignore */
+		}
+
+		if (functionstart > -1 && functionend > -1) {
+			return new Region(functionstart, functionend - functionstart + 1);
+		}
+
+		return null;
+	}
+
+	/**
+	 * This method will determine whether current offset is contained 
+	 * in any function's body or it's outside it. 
+	 * 
+	 * @param document
+	 *            The document to be examined
+	 * @param offset
+	 *            The offset into the document
+	 * @return 
+	 *      <code>true</code> if there is no function body around offset 
+	 *      <code>false</code> otherwise 
+	 */
+	public static boolean isGlobal(IDocument document, int offset) {
+		try {
+			int pos = offset;
+			int bracketcount = 0;
+			char c;
+
+			//Find left curled bracket from our position
+			while (pos > 0) {
+				c = document.getChar(pos--);
+
+				if (c == CBRACE_R) {
+					bracketcount++; // take into account nested blocks
+				} else if (c == CBRACE_L) {
+					if (bracketcount-- == 0) {
+						do {
+							c = document.getChar(pos--);
+							if (c == BRACE_R) return false;
+						} while (Character.isWhitespace(c));
+						// container block seems to be not a function or statement body
+						pos++;             // step back one symbol
+						bracketcount = 0;  // let's search for upper block
+					}
+				}
+			}
+			
+		} catch (BadLocationException x) { /* Ignore */	}
+		// return true in case of unknown result or exception 
+		return true;
+	}
+	
+	/**
+	 * Searches for line feed symbols in string.
+	 * First met '\r' or '\n' is treated as LF symbol
+	 * 
+	 * @param s
+	 * 			string to search in.
+	 * @return  number of LFs met.
+	 */
+	public static int countLFs (String s) {
+		int counter = 0;
+		char lf = 0;
+		char c;
+		for (int i=0; i<s.length(); i++) {
+			c = s.charAt(i);
+			if (lf == 0) {
+				if (c == '\n' || c == '\r') {
+					lf = c;
+					counter++;
+				}
+			} else if (lf == c) counter++;
+		}
+		return counter;
+	}
+
+	/**
+	 * Checks whether the string contains any C-block delimiters ( { } ) 
+	 * 
+	 * @param s 
+	 * 			text to check
+	 * @return  true if curled brace found.
+	 */
+	public static boolean hasCBraces (String s) {
+		if (s.indexOf(CBRACE_L) > -1 || s.indexOf(CBRACE_R) > -1) return true;
+		else return false;
+	}
+}
+
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/Console.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/Console.java
new file mode 100644
index 0000000..695e489
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/Console.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2004 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.cdt.core.ConsoleOutputStream;
+import org.eclipse.cdt.core.resources.IConsole;
+import org.eclipse.cdt.ui.CUIPlugin;
+import org.eclipse.cdt.ui.IBuildConsoleManager;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+
+public class Console implements IConsole {
+	IProject project;
+	IBuildConsoleManager fConsoleManager;
+	
+	public Console(String consoleName, String contextId) {
+		fConsoleManager = CUIPlugin.getDefault().getConsoleManager(consoleName, 
+				contextId);
+	}
+	
+//	/**
+//	 * Constructor for ConfigureConsole.
+//	 */
+//	public CConfigureConsole() {
+//		fConsoleManager = AutotoolsPlugin.getDefault().getConsoleManager();
+//	}
+//
+
+	public void start(IProject project ) {
+		this.project = project;
+		fConsoleManager.getConsole(project).start(project);
+	}
+	
+	/**
+	 * @throws CoreException
+	 * @see org.eclipse.cdt.core.resources.IConsole#getOutputStream()
+	 */
+	public ConsoleOutputStream getOutputStream() throws CoreException {
+		return fConsoleManager.getConsole(project).getOutputStream();
+	}
+
+	public ConsoleOutputStream getInfoStream() throws CoreException {
+		return fConsoleManager.getConsole(project).getInfoStream();
+	}
+
+	public ConsoleOutputStream getErrorStream() throws CoreException {
+		return fConsoleManager.getConsole(project).getErrorStream();
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.java
new file mode 100644
index 0000000..a9b3d21
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2004 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class ConsoleMessages {
+
+	public static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.cdt.autotools.ui.ConsoleMessages";//$NON-NLS-1$
+
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+
+	private ConsoleMessages() {
+
+	}
+	public static String getString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.properties
new file mode 100644
index 0000000..7c4510d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.properties
@@ -0,0 +1,25 @@
+###############################################################################
+# Copyright (c) 2003, 2004 QNX Software Systems and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# QNX Software Systems - Initial API and implementation
+###############################################################################
+ConfigureConsole.name=Configure
+BuildStepsConsole.name=Build Steps
+AutotoolsConsole.name=Autotools
+
+find_replace_action.label=&Find/Replace...@Ctrl+F
+find_replace_action.tooltip=Find/Replace
+find_replace_action.image=
+find_replace_action.description=Find/Replace
+
+ConfigureConsolePage.&Copy@Ctrl+C_6=&Copy@Ctrl+C
+ConfigureConsolePage.Copy_7=Copy
+ConfigureConsolePage.Select_&All@Ctrl+A_12=Select &All@Ctrl+A
+ConfigureConsolePage.Select_All=Select All
+
+ScrollLockAction.Scroll_Lock_1=Scroll Lock
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ErrorParserBlock.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ErrorParserBlock.java
new file mode 100644
index 0000000..fd1ad86
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ErrorParserBlock.java
@@ -0,0 +1,119 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.cdt.make.core.IMakeBuilderInfo;
+import org.eclipse.cdt.make.core.MakeBuilder;
+import org.eclipse.cdt.make.core.MakeCorePlugin;
+import org.eclipse.cdt.ui.dialogs.AbstractErrorParserBlock;
+import org.eclipse.cdt.ui.dialogs.ICOptionContainer;
+import org.eclipse.cdt.utils.ui.controls.ControlFactory;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Preferences;
+import org.eclipse.swt.widgets.Composite;
+
+@SuppressWarnings("deprecation")
+public class ErrorParserBlock extends AbstractErrorParserBlock {
+
+	// make builder enabled
+	IMakeBuilderInfo fBuildInfo;
+	boolean useBuildInfo = false;
+	Preferences fPrefs;
+	
+	public ErrorParserBlock(Preferences preferences) {
+		super();
+		fPrefs = preferences;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
+	 */
+	public void createControl(Composite parent) {
+
+		if (useBuildInfo == true && fBuildInfo == null) {
+			Composite composite = ControlFactory.createComposite(parent, 1);
+			setControl(composite);
+			ControlFactory.createEmptySpace(composite);
+			ControlFactory.createLabel(composite, MakeUIMessages.getResourceString("ErrorParserBlock.label.missingBuilderInformation")); //$NON-NLS-1$
+			return;
+		}
+		super.createControl(parent);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.cdt.ui.dialogs.ErrorParserBlock#getErrorParserIDs(org.eclipse.core.resources.IProject)
+	 */
+	protected String[] getErrorParserIDs(IProject project) {
+		if (getContainer().getProject() != null && fBuildInfo == null) {
+			try {
+				fBuildInfo = MakeCorePlugin.createBuildInfo(getContainer().getProject(), MakeBuilder.BUILDER_ID);
+			} catch (CoreException e) {
+			}
+		}
+		if (fBuildInfo != null) {
+			return fBuildInfo.getErrorParsers();
+		}
+		return new String[0];
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.cdt.ui.dialogs.ErrorParserBlock#saveErrorParsers(org.eclipse.core.resources.IProject,
+	 *      java.lang.String[])
+	 */
+	public void saveErrorParsers(IProject project, String[] parserIDs) throws CoreException {
+		if (getContainer().getProject() != null) {
+			try {
+				fBuildInfo = MakeCorePlugin.createBuildInfo(getContainer().getProject(), MakeBuilder.BUILDER_ID);
+			} catch (CoreException e) {
+			}
+		}
+		if (fBuildInfo != null) {
+			fBuildInfo.setErrorParsers(parserIDs);
+		}
+	}
+
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.dialogs.AbstractErrorParserBlock#saveErrorParsers(java.lang.String[])
+	 */
+	protected void saveErrorParsers(String[] parserIDs) throws CoreException {
+		fBuildInfo = MakeCorePlugin.createBuildInfo(fPrefs, MakeBuilder.BUILDER_ID, false);
+		fBuildInfo.setErrorParsers(parserIDs);
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.dialogs.AbstractErrorParserBlock#getErrorParserIDs(boolean)
+	 */
+	protected String[] getErrorParserIDs(boolean defaults) {
+		fBuildInfo = MakeCorePlugin.createBuildInfo(fPrefs, MakeBuilder.BUILDER_ID, defaults);
+		return fBuildInfo.getErrorParsers();
+	}
+	
+	public void setContainer(ICOptionContainer container) {
+		super.setContainer(container);
+		if (getContainer().getProject() != null) {
+			try {
+				fBuildInfo = MakeCorePlugin.createBuildInfo(getContainer().getProject(), MakeBuilder.BUILDER_ID);
+			} catch (CoreException e) {
+			}
+			useBuildInfo = true; 
+		} else {
+		}
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/FileRelevance.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/FileRelevance.java
new file mode 100644
index 0000000..a360965
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/FileRelevance.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Broadcom and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     James Blackburn (Broadcom) - Initial API and implementation
+ *     Markus Schorn (Wind River Systems)
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.cdt.core.model.CoreModel;
+import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourceAttributes;
+
+/**
+ * This class computes a relevance for files in case we have to select
+ * from multiple files for the same file-system location.
+ */
+public class FileRelevance {
+	private static final int PREFERRED_PROJECT 		= 0x40;
+	private static final int CDT_PROJECT 			= 0x20;
+	private static final int ON_SOURCE_ROOT			= 0x10;
+
+	// Penalty for undesirable attributes
+	private static final int LINK_PENALTY			= 1;
+	private static final int INACCESSIBLE_SHIFT 	= 4;
+
+	/**
+	 * Compute a relevance for the given file. The higher the score the more relevant the
+	 * file. It is determined by the following criteria: <br>
+	 * - file belongs to preferred project <br>
+	 * - file belongs to a cdt-project <br>
+	 * - file belongs to a source folder of a cdt-project <br>
+	 * - file is accessible
+	 * - file is not a link
+	 * @param f the file to compute the relevance for
+	 * @return integer representing file relevance. Larger numbers are more relevant
+	 */
+	public static int getRelevance(IFile f, IProject preferredProject) {
+		int result= 0;
+		IProject p= f.getProject();
+		if (p.equals(preferredProject))
+			result+= PREFERRED_PROJECT;
+
+		if (CoreModel.hasCNature(p)) {
+			result+= CDT_PROJECT;
+			ICProject cproject= CoreModel.getDefault().create(p);
+			if (cproject.isOnSourceRoot(f))
+				result+= ON_SOURCE_ROOT;
+		}
+
+		if (!f.isAccessible())
+			result >>= INACCESSIBLE_SHIFT;
+		else {
+			ResourceAttributes ra = f.getResourceAttributes();
+			if (f.isLinked() || (ra != null && ra.isSymbolicLink()))
+				result -= LINK_PENALTY;
+		}
+
+		return result;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTML2TextReader.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTML2TextReader.java
new file mode 100644
index 0000000..c4adcba
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTML2TextReader.java
@@ -0,0 +1,260 @@
+/*******************************************************************************
+ * Copyright (c) 2000 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+
+import java.io.IOException;
+import java.io.PushbackReader;
+import java.io.Reader;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.jface.text.TextPresentation;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyleRange;
+
+
+/**
+ * Reads the text contents from a reader of HTML contents and translates 
+ * the tags or cut them out.
+ */
+public class HTML2TextReader extends SubstitutionTextReader {
+	
+	
+	private static final String LINE_DELIM= System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
+	private static final Map<String, String> fgEntityLookup;
+	private static final Set<String> fgTags;
+	
+	static {
+		
+		fgTags= new HashSet<String>();
+		fgTags.add("b"); //$NON-NLS-1$
+		fgTags.add("br"); //$NON-NLS-1$
+		fgTags.add("h5"); //$NON-NLS-1$
+		fgTags.add("p"); //$NON-NLS-1$
+		fgTags.add("dl"); //$NON-NLS-1$
+		fgTags.add("dt"); //$NON-NLS-1$
+		fgTags.add("dd"); //$NON-NLS-1$
+		fgTags.add("li"); //$NON-NLS-1$
+		fgTags.add("ul"); //$NON-NLS-1$
+		
+		fgEntityLookup= new HashMap<String, String>(7);
+		fgEntityLookup.put("lt", "<"); //$NON-NLS-1$ //$NON-NLS-2$
+		fgEntityLookup.put("gt", ">"); //$NON-NLS-1$ //$NON-NLS-2$
+		fgEntityLookup.put("nbsp", " "); //$NON-NLS-1$ //$NON-NLS-2$
+		fgEntityLookup.put("amp", "&"); //$NON-NLS-1$ //$NON-NLS-2$
+		fgEntityLookup.put("circ", "^"); //$NON-NLS-1$ //$NON-NLS-2$
+		fgEntityLookup.put("tilde", "~"); //$NON-NLS-2$ //$NON-NLS-1$
+		fgEntityLookup.put("quot", "\"");		 //$NON-NLS-1$ //$NON-NLS-2$
+	}
+	
+	private int fCounter= 0;
+	private TextPresentation fTextPresentation;
+	private int fBold= 0;
+	private int fStartOffset= -1;
+	private boolean fInParagraph= false;
+
+	/**
+	 * Transforms the html text from the reader to formatted text.
+	 * @param presentation If not <code>null</code>, formattings will be applied to 
+	 * the presentation.
+	*/
+	public HTML2TextReader(Reader reader, TextPresentation presentation) {
+		super(new PushbackReader(reader));
+		fTextPresentation= presentation;
+	}
+	
+	public int read() throws IOException {
+		int c= super.read();
+		if (c != -1)
+			++ fCounter;
+		return c;
+	}
+	
+	protected void startBold() {
+		if (fBold == 0)
+			fStartOffset= fCounter;
+		++ fBold;
+	}
+	
+	protected void stopBold() {
+		-- fBold;
+		if (fBold == 0) {
+			if (fTextPresentation != null) {
+				fTextPresentation.addStyleRange(new StyleRange(fStartOffset, fCounter - fStartOffset, null, null, SWT.BOLD));
+			}
+			fStartOffset= -1;
+		}
+	}
+	
+	/**
+	 * @see SubstitutionTextReader#computeSubstitution(char)
+	 */
+	protected String computeSubstitution(int c) throws IOException {
+		if (c == '<')
+			return  processHTMLTag();
+		else if (c == '&')
+			return processEntity();
+		
+		return null;
+	}
+
+	private String html2Text(String html) {
+		
+		String tag= html;
+		if ('/' == tag.charAt(0))
+			tag= tag.substring(1);
+			
+		if (!fgTags.contains(tag))
+			return ""; //$NON-NLS-1$
+
+		if ("b".equals(html)) { //$NON-NLS-1$
+			startBold();
+			return ""; //$NON-NLS-1$
+		}
+				
+		if ("h5".equals(html) || "dt".equals(html)) { //$NON-NLS-1$ //$NON-NLS-2$
+			startBold();
+			return ""; //$NON-NLS-1$
+		}
+		
+		if ("dl".equals(html)) //$NON-NLS-1$
+			return LINE_DELIM;
+		
+		if ("dd".equals(html)) //$NON-NLS-1$
+			return "\t"; //$NON-NLS-1$
+		
+		if ("li".equals(html)) //$NON-NLS-1$
+			return LINE_DELIM + "\t" + "-"; //$NON-NLS-1$ //$NON-NLS-2$
+					
+		if ("/b".equals(html)) { //$NON-NLS-1$
+			stopBold();
+			return ""; //$NON-NLS-1$
+		}
+
+		if ("p".equals(html))  { //$NON-NLS-1$
+			fInParagraph= true;
+			return LINE_DELIM;
+		}
+
+		if ("br".equals(html)) //$NON-NLS-1$
+			return LINE_DELIM;
+		
+		if ("/p".equals(html))  { //$NON-NLS-1$
+			boolean inParagraph= fInParagraph;
+			fInParagraph= false;
+			return inParagraph ? "" : LINE_DELIM; //$NON-NLS-1$
+		}
+			
+		if ("/h5".equals(html) || "/dt".equals(html)) { //$NON-NLS-1$ //$NON-NLS-2$
+			stopBold();
+			return LINE_DELIM;
+		}
+		
+		if ("/dd".equals(html)) //$NON-NLS-1$
+			return LINE_DELIM;
+				
+		return ""; //$NON-NLS-1$
+	}
+	
+	/*
+	 * A '<' has been read. Process a html tag
+	 */ 
+	private String processHTMLTag() throws IOException {
+		
+		StringBuffer buf= new StringBuffer();
+		int ch;
+		do {		
+			
+			ch= nextChar();
+			
+			while (ch != -1 && ch != '>') {
+				buf.append(Character.toLowerCase((char) ch));
+				ch= nextChar();
+				if (ch == '"'){
+					buf.append(Character.toLowerCase((char) ch));
+					ch= nextChar();
+					while (ch != -1 && ch != '"'){
+						buf.append(Character.toLowerCase((char) ch));
+						ch= nextChar();
+					}	
+				}
+				if (ch == '<'){
+					unread(ch);
+					return '<' + buf.toString();
+				}	
+			}
+			
+			if (ch == -1)
+				return null;
+			
+			int tagLen= buf.length();
+			// needs special treatment for comments 
+			if ((tagLen >= 3 && "!--".equals(buf.substring(0, 3))) //$NON-NLS-1$
+				&& !(tagLen >= 5 && "--!".equals(buf.substring(tagLen - 3)))) { //$NON-NLS-1$
+				// unfinished comment
+				buf.append(ch);
+			} else {
+				break;
+			}
+		} while (true);
+		 
+		return html2Text(buf.toString());
+	}
+	
+	private void unread(int ch) throws IOException {
+		((PushbackReader) getReader()).unread(ch);
+	}
+	
+	protected String entity2Text(String symbol) {
+		if (symbol.length() > 1 && symbol.charAt(0) == '#') {
+			int ch;
+			try {
+				if (symbol.charAt(1) == 'x') {
+					ch= Integer.parseInt(symbol.substring(2), 16);
+				} else {
+					ch= Integer.parseInt(symbol.substring(1), 10);
+				}
+				return "" + (char)ch; //$NON-NLS-1$
+			} catch (NumberFormatException e) {
+			}
+		} else {
+			String str= (String) fgEntityLookup.get(symbol);
+			if (str != null) {
+				return str;
+			}
+		}
+		return "&" + symbol; // not found //$NON-NLS-1$
+	}
+	
+	/*
+	 * A '&' has been read. Process a entity
+	 */ 	
+	private String processEntity() throws IOException {
+		StringBuffer buf= new StringBuffer();
+		int ch= nextChar();
+		while (Character.isLetterOrDigit((char)ch) || ch == '#') {
+			buf.append((char) ch);
+			ch= nextChar();
+		}
+		
+		if (ch == ';') 
+			return entity2Text(buf.toString());
+		
+		buf.insert(0, '&');
+		if (ch != -1)
+			buf.append((char) ch);
+		return buf.toString();
+	}
+}
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLPrinter.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLPrinter.java
new file mode 100644
index 0000000..a9de7d1
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLPrinter.java
@@ -0,0 +1,116 @@
+/*******************************************************************************
+ * Copyright (c) 2000 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.io.IOException;
+import java.io.Reader;
+
+
+/**
+ * Provides a set of convenience methods for creating HTML pages.
+ */
+public class HTMLPrinter {
+			
+	private HTMLPrinter() {
+	}
+	
+	private static String replace(String text, char c, String s) {
+				
+		int previous= 0;
+		int current= text.indexOf(c, previous);
+		
+		if (current == -1)
+			return text;
+		
+		StringBuffer buffer= new StringBuffer();	
+		while (current > -1) {
+			buffer.append(text.substring(previous, current));
+			buffer.append(s);
+			previous= current + 1;
+			current= text.indexOf(c, previous);
+		}
+		buffer.append(text.substring(previous));
+		
+		return buffer.toString();
+	}
+	
+	public static String convertToHTMLContent(String content) {
+		content= replace(content, '<', "&lt;"); //$NON-NLS-1$
+		return replace(content, '>', "&gt;"); //$NON-NLS-1$
+	}
+	
+	public static String read(Reader rd) {
+		
+		StringBuffer buffer= new StringBuffer();
+		char[] readBuffer= new char[2048];
+		
+		try {
+			int n= rd.read(readBuffer);
+			while (n > 0) {
+				buffer.append(readBuffer, 0, n);
+				n= rd.read(readBuffer);
+			}
+			return buffer.toString();
+		} catch (IOException x) {
+		}
+		
+		return null;
+	}
+
+	public static void insertPageProlog(StringBuffer buffer, int position) {
+		buffer.insert(position, "<html><body text=\"#000000\" bgcolor=\"#FFFF88\"><font size=-1>"); //$NON-NLS-1$
+	}
+	
+	public static void addPageProlog(StringBuffer buffer) {
+		insertPageProlog(buffer, buffer.length());
+	}
+	
+	public static void addPageEpilog(StringBuffer buffer) {
+		buffer.append("</font></body></html>"); //$NON-NLS-1$
+	}
+	
+	public static void startBulletList(StringBuffer buffer) {
+		buffer.append("<ul>"); //$NON-NLS-1$
+	}
+	
+	public static void endBulletList(StringBuffer buffer) {
+		buffer.append("</ul>"); //$NON-NLS-1$
+	}
+	
+	public static void addBullet(StringBuffer buffer, String bullet) {
+		if (bullet != null) {
+			buffer.append("<li>"); //$NON-NLS-1$
+			buffer.append(bullet);
+			buffer.append("</li>"); //$NON-NLS-1$
+		}
+	}
+	
+	public static void addSmallHeader(StringBuffer buffer, String header) {
+		if (header != null) {
+			buffer.append("<h5>"); //$NON-NLS-1$
+			buffer.append(header);
+			buffer.append("</h5>"); //$NON-NLS-1$
+		}
+	}
+	
+	public static void addParagraph(StringBuffer buffer, String paragraph) {
+		if (paragraph != null) {
+			buffer.append("<p>"); //$NON-NLS-1$
+			buffer.append(paragraph);
+		}
+	}
+	
+	public static void addParagraph(StringBuffer buffer, Reader paragraphReader) {
+		if (paragraphReader != null)
+			addParagraph(buffer, read(paragraphReader));
+	}
+}
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLTextPresenter.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLTextPresenter.java
new file mode 100644
index 0000000..233112b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLTextPresenter.java
@@ -0,0 +1,190 @@
+/*******************************************************************************
+ * Copyright (c) 2000 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.util.Iterator;
+
+import org.eclipse.jface.text.DefaultInformationControl;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.TextPresentation;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.swt.custom.StyleRange;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.widgets.Display;
+
+
+public class HTMLTextPresenter implements DefaultInformationControl.IInformationPresenter {
+	
+	private static final String LINE_DELIM= System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
+	
+	private int fCounter;
+	private boolean fEnforceUpperLineLimit;
+	
+	public HTMLTextPresenter(boolean enforceUpperLineLimit) {
+		super();
+		fEnforceUpperLineLimit= enforceUpperLineLimit;
+	}
+	
+	public HTMLTextPresenter() {
+		this(true);
+	}
+	
+	protected Reader createReader(String hoverInfo, TextPresentation presentation) {
+		return new HTML2TextReader(new StringReader(hoverInfo), presentation);
+	}
+	
+	@SuppressWarnings("unchecked")
+	protected void adaptTextPresentation(TextPresentation presentation, int offset, int insertLength) {
+				
+		int yoursStart= offset;
+		int yoursEnd=   offset + insertLength -1;
+		yoursEnd= Math.max(yoursStart, yoursEnd);
+		
+		Iterator e= presentation.getAllStyleRangeIterator();
+		while (e.hasNext()) {
+			
+			StyleRange range= (StyleRange) e.next();
+		
+			int myStart= range.start;
+			int myEnd=   range.start + range.length -1;
+			myEnd= Math.max(myStart, myEnd);
+			
+			if (myEnd < yoursStart)
+				continue;
+			
+			if (myStart < yoursStart)
+				range.length += insertLength;
+			else
+				range.start += insertLength;
+		}
+	}
+	
+	private void append(StringBuffer buffer, String string, TextPresentation presentation) {
+		
+		int length= string.length();
+		buffer.append(string);
+		
+		if (presentation != null)
+			adaptTextPresentation(presentation, fCounter, length);
+			
+		fCounter += length;
+	}
+	
+	private String getIndent(String line) {
+		int length= line.length();
+		
+		int i= 0;
+		while (i < length && Character.isWhitespace(line.charAt(i))) ++i;
+		
+		return (i == length ? line : line.substring(0, i)) + " "; //$NON-NLS-1$
+	}
+	
+	/*
+	 * @see IHoverInformationPresenter#updatePresentation(Display display, String, TextPresentation, int, int)
+	 */
+	public String updatePresentation(Display display, String hoverInfo, TextPresentation presentation, int maxWidth, int maxHeight) {
+		
+		if (hoverInfo == null)
+			return null;
+			
+		GC gc= new GC(display);
+		try {
+			
+			StringBuffer buffer= new StringBuffer();
+			int maxNumberOfLines= Math.round(maxHeight / gc.getFontMetrics().getHeight());
+			
+			fCounter= 0;
+			LineBreakingReader reader= new LineBreakingReader(createReader(hoverInfo, presentation), gc, maxWidth);
+			
+			boolean lastLineFormatted= false;
+			String lastLineIndent= null;
+			
+			String line=reader.readLine();
+			boolean lineFormatted= reader.isFormattedLine();
+			boolean firstLineProcessed= false;
+			
+			while (line != null) {
+				
+				if (fEnforceUpperLineLimit && maxNumberOfLines <= 0)
+					break;
+				
+				if (firstLineProcessed) {
+					if (!lastLineFormatted)
+						append(buffer, LINE_DELIM, null);
+					else {
+						append(buffer, LINE_DELIM, presentation);
+						if (lastLineIndent != null)
+							append(buffer, lastLineIndent, presentation);
+					}
+				}
+				
+				append(buffer, line, null);
+				firstLineProcessed= true;
+				
+				lastLineFormatted= lineFormatted;
+				if (!lineFormatted)
+					lastLineIndent= null;
+				else if (lastLineIndent == null)
+					lastLineIndent= getIndent(line);
+					
+				line= reader.readLine();
+				lineFormatted= reader.isFormattedLine();
+				
+				maxNumberOfLines--;
+			}
+			
+			if (line != null) {
+				append(buffer, LINE_DELIM, lineFormatted ? presentation : null);
+				append(buffer, (""), presentation); //$NON-NLS-1$
+			}
+			
+			return trim(buffer, presentation);
+			
+		} catch (IOException e) {
+			
+			AutotoolsUIPlugin.log(e);
+			return null;
+			
+		} finally {
+			gc.dispose();
+		}
+	}
+	
+	private String trim(StringBuffer buffer, TextPresentation presentation) {
+		
+		int length= buffer.length();
+				
+		int end= length -1;
+		while (end >= 0 && Character.isWhitespace(buffer.charAt(end)))
+			-- end;
+		
+		if (end == -1)
+			return ""; //$NON-NLS-1$
+			
+		if (end < length -1)
+			buffer.delete(end + 1, length);
+		else
+			end= length;
+			
+		int start= 0;
+		while (start < end && Character.isWhitespace(buffer.charAt(start)))
+			++ start;
+			
+		buffer.delete(0, start);
+		presentation.setResultWindow(new Region(start, buffer.length()));
+		return buffer.toString();
+	}
+}
+
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/LineBreakingReader.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/LineBreakingReader.java
new file mode 100644
index 0000000..52fb3e3
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/LineBreakingReader.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2000 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.Reader;
+
+import java.text.BreakIterator;
+import org.eclipse.swt.graphics.GC;
+
+/*
+ * Not a real reader. Could change if requested
+ */
+public class LineBreakingReader {
+	
+	private BufferedReader fReader;
+	private GC fGC;
+	private int fMaxWidth;
+	
+	private String fLine;
+	private int fOffset;
+	
+	private BreakIterator fLineBreakIterator;
+	private int findNextBreakOffset(int currOffset) {
+		int currWidth= 0;
+		int nextOffset= fLineBreakIterator.following(currOffset);
+		while (nextOffset != BreakIterator.DONE) {
+			String word= fLine.substring(currOffset, nextOffset);
+			int wordWidth= fGC.textExtent(word).x;
+			int nextWidth= wordWidth + currWidth;
+			if (nextWidth > fMaxWidth) {
+				if (currWidth > 0) {
+					return currOffset;
+				}
+				return nextOffset;
+			}
+			currWidth= nextWidth;
+			currOffset= nextOffset;
+			nextOffset= fLineBreakIterator.next();
+		}
+		return nextOffset;
+	}
+	private int findWordBegin(int idx) {
+		while (idx < fLine.length() && Character.isWhitespace(fLine.charAt(idx))) {
+			idx++;
+		}
+		return idx;
+	}
+	/**
+	 * Creates a reader that breaks an input text to fit in a given width.
+	 * @param reader Reader of the input text
+	 * @param gc The graphic context that defines the currently used font sizes
+	 * @param maxLineWidth The max width (pixes) where the text has to fit in 
+	 */
+	public LineBreakingReader(Reader reader, GC gc, int maxLineWidth) {
+		fReader= new BufferedReader(reader);
+		fGC= gc;
+		fMaxWidth= maxLineWidth;
+		fOffset= 0;
+		fLine= null;
+		fLineBreakIterator= BreakIterator.getLineInstance();
+	}
+	
+	public boolean isFormattedLine() {
+		return fLine != null;
+	}
+	
+	/**
+	 * Reads the next line. The lengths of the line will not exceed the gived maximum
+	 * width.
+	 */
+	public String readLine() throws IOException {
+		if (fLine == null) {
+			String line= fReader.readLine();
+			if (line == null) {
+				return null;
+			}
+								
+			int lineLen= fGC.textExtent(line).x;
+			if (lineLen < fMaxWidth) {
+				return line;
+			}
+			fLine= line;
+			fLineBreakIterator.setText(line);
+			fOffset= 0;
+		}
+		int breakOffset= findNextBreakOffset(fOffset);
+		String res;
+		if (breakOffset != BreakIterator.DONE) {
+			res= fLine.substring(fOffset, breakOffset);
+			fOffset= findWordBegin(breakOffset);
+			if (fOffset == fLine.length()) {
+				fLine= null;
+			}
+		} else {
+			res= fLine.substring(fOffset);
+			fLine= null;
+		}
+		return res;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/LocationAdapter.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/LocationAdapter.java
new file mode 100644
index 0000000..22b5584
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/LocationAdapter.java
@@ -0,0 +1,97 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Wind River Systems, Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Markus Schorn - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+
+import org.eclipse.core.filesystem.URIUtil;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+
+/**
+ * Provides common functionality for URI and IPath
+ */
+abstract class LocationAdapter<T> {
+	
+	public abstract String extractName(T location);
+	public abstract IFile[] platformsFindFilesForLocation(T location);
+	public abstract String getCanonicalPath(T location);
+	public abstract T getLocation(IFile file);
+
+	public static final LocationAdapter<IPath> PATH = new LocationAdapter<IPath>() {
+		@Override
+		public String extractName(IPath location) {
+			String name = location.lastSegment();
+			if (name != null)
+				return name;
+			return location.toString();
+		}
+
+		@Override
+		public IFile[] platformsFindFilesForLocation(IPath location) {
+			final IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+			return root.findFilesForLocationURI(URIUtil.toURI(location.makeAbsolute()));
+		}
+
+		@Override
+		public String getCanonicalPath(IPath location) {
+			final File file= location.toFile();
+			try {
+				return file.getCanonicalPath();
+			} catch (IOException e) {
+				// use non-canonical version
+				return file.getAbsolutePath();
+			}
+		}
+
+		@Override
+		public IPath getLocation(IFile file) {
+			return file.getLocation();
+		}
+	};
+
+	public static final LocationAdapter<URI> URI = new LocationAdapter<URI>() {
+		@Override
+		public String extractName(URI location) {
+			String path= location.getPath();
+			int idx= path.lastIndexOf('/');
+			return path.substring(idx+1);
+		}
+
+		@Override
+		public IFile[] platformsFindFilesForLocation(URI location) {
+			return ResourcesPlugin.getWorkspace().getRoot().findFilesForLocationURI(location);
+		}
+
+		@Override
+		public String getCanonicalPath(URI location) {
+			if (!"file".equals(location.getScheme()))  //$NON-NLS-1$
+				return null;
+
+			String path= location.getPath();
+			try {
+				return new File(path).getCanonicalPath();
+			} catch (IOException e) {
+				// use non-canonical version
+				return path;
+			}
+		}
+
+		@Override
+		public URI getLocation(IFile file) {
+			return file.getLocationURI();
+		}
+	};
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIImages.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIImages.java
new file mode 100644
index 0000000..68bff55
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIImages.java
@@ -0,0 +1,140 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2005, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.swt.graphics.Image;
+
+
+
+public class MakeUIImages {
+
+	/**
+	 * Bundle of all images used by the Make plugin.
+	 */
+	// The plugin registry
+	private static ImageRegistry imageRegistry = new ImageRegistry();
+
+	// Subdirectory (under the package containing this class) where 16 color images are
+	private static URL fgIconBaseURL;
+	static {
+		try {
+			fgIconBaseURL = new URL(AutotoolsUIPlugin.getDefault().getBundle().getEntry("/"), "icons/"); //$NON-NLS-1$ //$NON-NLS-2$
+		} catch (MalformedURLException e) {
+			AutotoolsUIPlugin.log(e);
+		}
+	}
+	private static final String NAME_PREFIX = AutotoolsUIPlugin.getUniqueIdentifier() + '.';
+	private static final int NAME_PREFIX_LENGTH = NAME_PREFIX.length();
+
+	public static final String OBJ = "obj16/"; //$NON-NLS-1$
+	public static final String T_TOOL= "tool16/"; //$NON-NLS-1$
+	public static final String T_LCL = "lcl16/"; //$NON-NLS-1$
+
+	// For the build image
+	public static final String IMG_OBJS_BUILD_TARGET = NAME_PREFIX + "target_obj.gif"; //$NON-NLS-1$
+	public static final ImageDescriptor DESC_BUILD_TARGET = createManaged(OBJ, IMG_OBJS_BUILD_TARGET);
+
+	public static final String IMG_OBJS_ERROR = NAME_PREFIX + "error_obj.gif"; //$NON-NLS-1$
+	public static final ImageDescriptor DESC_OBJ_ERROR = createManaged(OBJ, IMG_OBJS_ERROR);
+	public static final String IMG_OBJS_WARNING = NAME_PREFIX + "warning_obj.gif"; //$NON-NLS-1$
+	public static final ImageDescriptor DESC_OBJ_WARNING = createManaged(OBJ, IMG_OBJS_WARNING);
+
+	public static final String IMG_TOOLS_MAKE_TARGET_BUILD = NAME_PREFIX + "target_build.gif"; //$NON-NLS-1$
+	public static final String IMG_TOOLS_MAKE_TARGET_ADD = NAME_PREFIX + "target_add.gif"; //$NON-NLS-1$
+	public static final String IMG_TOOLS_MAKE_TARGET_DELETE = NAME_PREFIX + "target_delete.gif"; //$NON-NLS-1$
+	public static final String IMG_TOOLS_MAKE_TARGET_EDIT = NAME_PREFIX + "target_edit.gif"; //$NON-NLS-1$
+	public static final String IMG_TOOLS_MAKE_TARGET_FILTER = NAME_PREFIX + "target_filter.gif"; //$NON-NLS-1$
+
+	public static final String IMG_OBJS_MAKEFILE_MACRO = NAME_PREFIX + "macro_obj.gif"; //$NON-NLS-1$
+	public static final ImageDescriptor DESC_MAKEFILE_MACRO = createManaged(OBJ, IMG_OBJS_MAKEFILE_MACRO);
+
+	public static final String IMG_OBJS_MAKEFILE_ACMACRO = NAME_PREFIX + "acmacro_obj.gif"; //$NON-NLS-1$
+	public static final ImageDescriptor DESC_MAKEFILE_ACMACRO = createManaged(OBJ, IMG_OBJS_MAKEFILE_ACMACRO);
+
+	public static final String IMG_OBJS_MAKEFILE_TARGET_RULE = NAME_PREFIX + "trule_obj.gif"; //$NON-NLS-1$
+	public static final ImageDescriptor DESC_MAKEFILE_TARGET_RULE = createManaged(OBJ, IMG_OBJS_MAKEFILE_TARGET_RULE);
+
+	public static final String IMG_OBJS_MAKEFILE_INFERENCE_RULE = NAME_PREFIX + "irule_obj.gif"; //$NON-NLS-1$
+	public static final ImageDescriptor DESC_MAKEFILE_INFERENCE_RULE = createManaged(OBJ, IMG_OBJS_MAKEFILE_INFERENCE_RULE);
+
+	public static final String IMG_OBJS_MAKEFILE_RELATION = NAME_PREFIX + "relation_obj.gif"; //$NON-NLS-1$
+	public static final ImageDescriptor DESC_MAKEFILE_RELATION = createManaged(OBJ, IMG_OBJS_MAKEFILE_RELATION);
+
+	public static final String IMG_OBJS_MAKEFILE_COMMAND = NAME_PREFIX + "command_obj.gif"; //$NON-NLS-1$
+	public static final ImageDescriptor DESC_MAKEFILE_COMMAND = createManaged(OBJ, IMG_OBJS_MAKEFILE_COMMAND);
+
+	public static final String IMG_OBJS_MAKEFILE_INCLUDE = NAME_PREFIX + "include_obj.gif"; //$NON-NLS-1$
+	public static final ImageDescriptor DESC_MAKEFILE_INCLUDE = createManaged(OBJ, IMG_OBJS_MAKEFILE_INCLUDE);
+
+	public static final String IMG_OBJS_ENVIRONMNET = NAME_PREFIX + "environment_obj.gif"; //$NON-NLS-1$
+	public static final ImageDescriptor DESC_ENVIRONMENT = createManaged(OBJ, IMG_OBJS_ENVIRONMNET);
+
+	public static final String IMG_OBJS_ENV_VAR = NAME_PREFIX + "envvar_obj.gif"; //$NON-NLS-1$
+	public static final ImageDescriptor DESC_ENV_VAR = createManaged(OBJ, IMG_OBJS_ENV_VAR);
+
+	public static final String IMG_TOOLS_ALPHA_SORTING= NAME_PREFIX + "alphab_sort_co.gif"; //$NON-NLS-1$
+	public static final String IMG_TOOLS_MAKEFILE_SEGMENT_EDIT= NAME_PREFIX + "segment_edit.gif"; //$NON-NLS-1$
+
+	public static final String IMG_MENU_OPEN_INCLUDE= NAME_PREFIX + "open_include.gif"; //$NON-NLS-1$
+
+	private static ImageDescriptor createManaged(String prefix, String name) {
+		return createManaged(imageRegistry, prefix, name);
+	}
+
+	private static ImageDescriptor createManaged(ImageRegistry registry, String prefix, String name) {
+		ImageDescriptor result = ImageDescriptor.createFromURL(makeIconFileURL(prefix, name.substring(NAME_PREFIX_LENGTH)));
+		registry.put(name, result);
+		return result;
+	}
+
+	public static Image getImage(String key) {
+		return imageRegistry.get(key);
+	}
+
+	private static ImageDescriptor create(String prefix, String name) {
+		return ImageDescriptor.createFromURL(makeIconFileURL(prefix, name));
+	}
+
+	private static URL makeIconFileURL(String prefix, String name) {
+		StringBuffer buffer = new StringBuffer(prefix);
+		buffer.append(name);
+		try {
+			return new URL(fgIconBaseURL, buffer.toString());
+		} catch (MalformedURLException e) {
+			AutotoolsUIPlugin.log(e);
+			return null;
+		}
+	}
+
+	/**
+	 * Sets all available image descriptors for the given action.
+	 */
+	public static void setImageDescriptors(IAction action, String type, String relPath) {
+		relPath = relPath.substring(NAME_PREFIX_LENGTH);
+		action.setDisabledImageDescriptor(create("d" + type + "/", relPath)); //$NON-NLS-1$ //$NON-NLS-2$
+//		action.setHoverImageDescriptor(create("e" + type + "/", relPath)); //$NON-NLS-1$ //$NON-NLS-2$
+		action.setImageDescriptor(create("e" + type + "/", relPath)); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * Helper method to access the image registry from the JavaPlugin class.
+	 */
+	static ImageRegistry getImageRegistry() {
+		return imageRegistry;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIMessages.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIMessages.java
new file mode 100644
index 0000000..a4ecd91
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIMessages.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2004, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class MakeUIMessages {
+
+	public static final String BUNDLE_NAME = MakeUIMessages.class.getName();
+
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+
+	private MakeUIMessages() {
+
+	}
+	public static String getResourceString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+	
+	/**
+	 * Returns the plugin's resource bundle,
+	 */
+	public static ResourceBundle getResourceBundle() {
+		return RESOURCE_BUNDLE;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIMessages.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIMessages.properties
new file mode 100644
index 0000000..4f49ba8
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIMessages.properties
@@ -0,0 +1,283 @@
+###############################################################################
+# Copyright (c) 2003, 2005, 2009 QNX Software Systems and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     QNX Software Systems - initial API and implementation
+#     Wind River Systems - fix for bugzilla 135150
+#     Tianchao Li (tianchao.li@gmail.com) - arbitrary build directory (bug #136136)
+###############################################################################
+
+MakeCWizard.title=C/Make Project
+MakeCWizard.description=Create a New C Project using 'make' to build it
+MakeEnvironmentBlock.10=&Remove
+MakeEnvironmentBlock.11=New Environment Variable
+MakeEnvironmentBlock.12=Overwrite variable?
+MakeEnvironmentBlock.13=A variable named {0} already exists. Overwrite?
+MakeEnvironmentBlock.14=Select &environment variables to add:
+MakeEnvironmentBlock.15=Select Environment Variables
+MakeEnvironmentBlock.16=Edit Environment Variable
+MakeEnvironmentBlock.17=&Append environment to native environment
+MakeEnvironmentBlock.18=Re&place native environment with specified environment
+MakeCWizard.task_name=Creating C project with Make builder...
+
+MakeCCWizard.title=C++/Make Project
+MakeCCWizard.description=Create a New C++ Project using 'make' to build it
+MakeCCWizard.task_name=Creating C++ project with Make builder...
+MakeEnvironmentBlock.0=Variable
+MakeEnvironmentBlock.1=Value
+MakeEnvironmentBlock.2=&Name:
+MakeEnvironmentBlock.3=&Value:
+MakeEnvironmentBlock.4=Environment
+MakeEnvironmentBlock.5=Environment used for make builder
+MakeEnvironmentBlock.6=Environment variables to set
+MakeEnvironmentBlock.7=N&ew...
+MakeEnvironmentBlock.8=Se&lect...
+MakeEnvironmentBlock.9=E&dit...
+
+MakeCWizardSettings.title=C/Make Project Settings
+MakeCWizardSettings.description=Define the project and 'make' builder settings
+
+MakeCCWizardSettings.title=C++/Make Project Settings
+MakeCCWizardSettings.description=Define the project and 'make' builder settings
+
+WizardMakeProjectConversion.title=Convert to C/C++ Make project
+WizardMakeProjectConversion.description=Convert a project to a C/C++ project which uses 'make' to build it.
+WizardMakeProjectConversion.monitor.convertingToMakeProject=Converting to Make Project...
+
+MakeWizardUpdate.window_title=Make Project Migration
+MakeWizardUpdatePage.title=Make Project Migration
+MakeWizardUpdatePage.description=Migrate older make projects to new make builder.
+MakeWizardUpdatePage.projectList=Project list
+MakeWizardUpdatePage.status.noProjectsToUpdate=No projects to update
+MakeWizardUpdatePage.status.noProjectsSelected=No projects selected
+
+WizardCheckboxTablePart.WizardCheckboxTablePart.selectAll=Select All
+WizardCheckboxTablePart.WizardCheckboxTablePart.deselectAll=Deselect All
+WizardCheckboxTablePart.WizardCheckboxTablePart.counter={0} of {1} Selected
+
+SettingsBlock.label=Make Builder
+SettingsBlock.message=Make builder settings.
+SettingsBlock.makeSetting.group_label=Build Setting
+SettingsBlock.makeSetting.stopOnError=Stop on first build error.
+SettingsBlock.makeSetting.runAllBuilders=Run all project builders.
+SettingsBlock.makeCmd.group_label=Build command
+SettingsBlock.makeCmd.use_default=Use default
+SettingsBlock.makeCmd.label=Build command:
+SettingsBlock.makeLoc.group_label=Build Location
+SettingsBlock.makeDir.label=Build directory:
+SettingsBlock.makeDir.browseWorkspace=Workspace...
+SettingsBlock.makeDir.browseFilesystem=Filesystem...
+SettingsBlock.makeWorkbench.group_label=Workbench Build Behavior
+SettingsBlock.makeWorkbench.type=Workbench build type:
+SettingsBlock.makeWorkbench.target=Make build target:
+SettingsBlock.makeWorkbench.auto=Build on resource save (Auto Build)
+SettingsBlock.makeWorkbench.note=Note:
+SettingsBlock.makeWorkbench.autobuildMessage=See Workbench automatic build preference.
+SettingsBlock.makeWorkbench.incremental=Build (Incremental Build)
+SettingsBlock.makeWorkbench.clean=Clean
+SettingsBlock.makeWorkbench.autoBuildTarget=Auto Build Target
+SettingsBlock.makeWorkbench.incrementalBuildTarget=Incremental Build Target
+SettingsBlock.makeWorkbench.cleanTarget=Clean Target
+SettingsBlock.variables=Variables...
+TargetBlock.target.group_label=Target
+TargetBlock.target.label=Target Name:
+
+ErrorParserBlock.label.missingBuilderInformation=Builder is missing or disabled on project.
+
+BuildTarget.target.group_label=Make Target
+BuildTarget.target.label=Make Target:
+
+MakeTargetsPreferencePage.buildTargetInBackground.label=Build make targets in background.
+
+MakeDocumentProvider.exception.createElementInfo=Error creating element.
+
+AddBuildTargetAction.title=Add make Target
+AddBuildTargetAction.description=Add make Target
+AddBuildTargetAction.tooltip= Add make Target
+AddBuildTargetAction.exception.internal=Internal Error
+
+OpenIncludeAction.title=Open include directive
+OpenIncludeAction.description=Open an include directive
+OpenIncludeAction.tooltip= Include Directive
+OpenIncludeAction.exception.internal=Internal Error
+
+TargetBuild.execption.message=Target Build Error
+TargetBuild.monitor.beginTask=Building Targets...
+TargetBuild.backgroundTask.name=Building Targets.
+
+TargetListViewer.button.add=Add...
+TargetListViewer.button.remove=Remove
+TargetListViewer.button.edit=Edit...
+TargetListViewer.lable.target=Target
+TargetListViewer.lable.location=Location
+TargetListViewer.exception.error=Error
+TargetListViewer.exception.message=An error occurred performing the selected action
+
+UpdateMakeProjectAction.exception.error=Error
+UpdateMakeProjectAction.eception.message=Error updating Make Projects
+UpdateMakeProjectAction.monitor.convert=Converting Make Targets...
+UpdateMakeProjectAction.monitor.update=Updating make Projects...
+
+BuildPathInfoBlock.button.browse=Browse...
+BuildPathInfoBlock.description=Set the include paths and preprocessor symbols for this project
+BuildPathInfoBlock.monitor.settingScannerInfo=Setting Scanner Info
+
+BuildTargetDialog.title.buildTarget=Make Targets
+BuildTargetDialog.button.build=Build
+BuildTargetDialog.title.makeTargetsFor=Make Targets for: 
+
+MakeTargetDialog.exception.noTargetBuilderOnProject=Not target builders on the project
+MakeTargetDialog.title.createMakeTarget=Create a new Make target
+MakeTargetDialog.title.modifyMakeTarget=Modify a Make target
+MakeTargetDialog.message.mustSpecifyName=Must specify a target name.
+MakeTargetDialog.message.targetWithNameExists=Target with that name already exits.
+MakeTargetDialog.message.mustSpecifyBuildCommand=Must specify a build command
+MakeTargetDialog.button.update=Update
+MakeTargetDialog.button.create=Create
+MakeTargetDialog.exception.makeTargetError=Make Target Error
+MakeTargetDialog.exception.errorAddingTarget=Error adding target
+
+SettingsBlock.title.selectLocationToBuildFrom=Selection Location to build from.
+SettingsBlock.label.missingBuilderInformation=Builder is missing or disabled on project.
+SettingsBlock.monitor.applyingSettings=Applying Settings...
+SettingsBlock.message.mustEnterBuildCommand=Must enter a build command
+
+DeleteTargetAction.label=Delete Make Target
+DeleteTargetAction.tooltip=Delete Make Target
+DeleteTargetAction.title.confirmDeletion=Confirm Target Deletion
+DeleteTargetAction.message.confirmDeleteion=Are you sure you want to delete  ''{0}''?
+DeleteTargetAction.title.confirmMultipleDeletion=Confirm Multiple Target Deletion
+DeleteTargetAction.message.confirmMultipleDeletion=Are you sure you want to delete these {0} targets?
+DeleteTargetAction.exception.removeError=Make Target Remove Error
+DeleteTargetAction.exception.errorDeletingBuildTarget=Error deleting Make target
+
+BuildTargetAction.label=Build Make Target
+BuildTargetAction.tooltip=Build Make Target
+
+EditTargetAction.label=Edit Make Target
+EditTargetAction.tooltip=Edit Make Target
+EditTargetAction.exception.internalError=Internal Error
+EditTargetAction.exception.errorEditingTarget=Error editing target.
+
+AddTargetAction.label=Add Make Target
+AddTargetAction.tooltip=Add Make Target
+AddTargetAction.exception.internalError=Internal Error
+AddTargetAction.=Internal Error
+
+FilterEmptyFolderAction.label=Hide Empty Folders
+FilterEmptyFolderAction.tooltip=Hide Empty Folders
+
+# Startup messages
+MakeUIPlugin.update_project=Update make projects
+MakeUIPlugin.update_project_message=Older \'make\' projects have been detected in your workspace. \n These projects are no longer supported, would you like to convert these now?
+
+# Prefernece Page
+MakePreferencePage.description=Specify the settings used as defaults by the New Standard Make Project creation wizard.
+MakeTargetPreferencePage.buildTargetInBackground.label=Build Make target in the background.
+
+#Property Page
+MakeProjectPropertyPage.closedproject=Project Closed
+MakeProjectPropertyPage.internalError=An Internal error has occur please check error log.
+
+#-------------- Makefile Editor messages
+ContentAssistProposal.label=Content Assist@Ctrl+SPACE
+ContentAssistProposal.tooltip=Content Assist
+ContentAssistProposal.image=
+ContentAssistProposal.description=Content Assist
+ 
+ContentAssistTip.label=Content Tip@Ctrl+SHIFT+SPACE
+ContentAssistTip.tooltip=Content Tip
+ContentAssistTip.image=
+ContentAssistTip.description=Content Tip
+ 
+TogglePresentation.label=Show Source of Selected Element Only
+TogglePresentation.tooltip=Show Source of Selected Element Only
+TogglePresentation.description=Enable/Disable Segmented Source Viewer
+ 
+Comment.label=&Comment
+Comment.tooltip=Comment the Selected Lines
+Comment.description=Turn the selected lines into # style comments
+
+Uncomment.label=Uncommen&t
+Uncomment.tooltip=Uncomment the Selected # comment Lines
+Uncomment.description=Uncomment the selected # comment lines
+
+OpenDeclarationAction.label=&Open Declaration@F3
+OpenDeclarationAction.description=Open an editor on the referenced element
+OpenDeclarationAction.tooltip=Open an editor on the referenced element
+
+# ------- LexicalSortingAction------------
+ 
+LexicalSortingAction.label=Sort
+LexicalSortingAction.description=Sorts the elements in the outliner
+LexicalSortingAction.tooltip=Sort
+LexicalSortingAction.tooltip.on=Do Not Sort
+LexicalSortingAction.tooltip.off=Sort
+
+# --- ManageIncludePathsDialog dialog ---
+ManageIncludePathsDialog.title=Manage include paths
+ManageIncludePathsDialog.userGroup.title=User specified include paths
+ManageIncludePathsDialog.discoveredGroup.title=Discovered include paths
+
+ManageScannerConfigDialogCommon.discoveredGroup.selected.label=Selected:
+ManageScannerConfigDialogCommon.discoveredGroup.removed.label=Removed:
+ManageScannerConfigDialogCommon.discoveredGroup.buttons.up.label=Up
+ManageScannerConfigDialogCommon.discoveredGroup.buttons.down.label=Down
+ManageScannerConfigDialogCommon.discoveredGroup.buttons.disable.label=Disable
+ManageScannerConfigDialogCommon.discoveredGroup.buttons.enable.label=Enable
+ManageScannerConfigDialogCommon.discoveredGroup.buttons.delete.label=Delete
+ManageScannerConfigDialogCommon.discoveredGroup.buttons.deleteAll.label=Delete all
+ManageScannerConfigDialogCommon.discoveredGroup.annotation.disabled=disabled
+
+# --- ManageDefinedSymbolsDialog dialog ---
+ManageDefinedSymbolsDialog.title=Manage defined symbols
+ManageDefinedSymbolsDialog.userGroup.title=User specified symbol definitions
+ManageDefinedSymbolsDialog.discoveredGroup.title=Discovered symbol definitions
+
+# --- ScannerConfigOptionsDialog ---
+ScannerConfigOptionsDialog.title=Discovery Options
+ScannerConfigOptionsDialog.description=Set the scanner configuration discovery options for this project
+ScannerConfigOptionsDialog.scGroup.label=Automated discovery of paths and symbols
+ScannerConfigOptionsDialog.scGroup.enabled.button=Automate discovery of paths and symbols
+ScannerConfigOptionsDialog.scGroup.problemReporting.enabled.button=Report path detection problems
+ScannerConfigOptionsDialog.scGroup.selectedProfile.combo=Discovery profile:
+ScannerConfigOptionsDialog.profile.group.label=Discovery profile options
+ScannerConfigOptionsDialog.boProvider.parser.enabled.button=Enable build output scanner info discovery
+ScannerConfigOptionsDialog.boProvider.open.label=Load build output from file
+ScannerConfigOptionsDialog.boProvider.browse.button=Browse...
+ScannerConfigOptionsDialog.boProvider.browse.openFileDialog=Build output file:
+ScannerConfigOptionsDialog.boProvider.load.button=Load
+ScannerConfigOptionsDialog.siProvider.parser.enabled.button=Enable generate scanner info command
+ScannerConfigOptionsDialog.siProvider.command.label=Compiler invocation command  
+ScannerConfigOptionsDialog.siProvider.browse.button=Browse...
+ScannerConfigOptionsDialog.siProvider.browse.runCommandDialog='gcc' command:
+ScannerConfigOptionsDialog.siProvider.command.errorMessage=Must enter compiler invocation command
+ScannerConfigOptionsDialog.apply.progressMessage=Setting scanner configuration discovery options...
+ScannerConfigOptionsDialog.common.variables.button=Variables...
+
+ScannerConfigOptionsDialog.unsavedchanges.title=Setting C/C++ Make Project Discovery Options 
+ScannerConfigOptionsDialog.unsavedchanges.message=The C/C++ Make Project Discovery Options property page contains unsaved modifications. Do you want to save changes so that other discovery related settings can be updated?
+ScannerConfigOptionsDialog.unsavedchanges.button.save=Apply
+ScannerConfigOptionsDialog.unsavedchanges.button.cancel=Cancel
+
+ScannerConfigOptionsDialog.error.title=Error Setting Project Discovery options
+ScannerConfigOptionsDialog.error.message=An error occurred while setting the project discovery options
+
+# --- DiscoveredScannerConfigurationContainerPage ---
+DiscoveredScannerConfigurationContainerPage.title=Edit container
+DiscoveredScannerConfigurationContainerPage.description=Manage discovered scanner configuration
+DiscoveredScannerConfigurationContainerPage.list.title=Discovered include paths and symbol definitions
+DiscoveredScannerConfigurationContainerPage.initialization.error.message=Error initializing Discovered paths container
+
+CopyDiscoveredPathAction.title=Copy
+CopyDiscoveredPathAction.description=Copy as text
+CopyDiscoveredPathAction.tooltip=Copy as text
+MultipleInputDialog.0=&Browse...
+MultipleInputDialog.1=Select a file:
+MultipleInputDialog.2=Varia&bles...
+
+OptionalMessageDialog_dontShowAgain= Do not show this &message again
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MessageLine.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MessageLine.java
new file mode 100644
index 0000000..f909063
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MessageLine.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.jface.resource.JFaceColors;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.widgets.Composite;
+
+
+/**
+ * A message line. It distinguishes between "normal" messages and errors. 
+ * Setting an error message hides a currently displayed message until 
+ * <code>clearErrorMessage</code> is called.
+ */
+public class MessageLine extends CLabel {
+
+	private String fMessage;
+
+	private Color fNormalMsgAreaBackground;
+
+	private boolean hasErrorMessage;
+
+	/**
+	 * Creates a new message line as a child of the given parent.
+	 */
+	public MessageLine(Composite parent) {
+		this(parent, SWT.LEFT);
+	}
+
+	/**
+	 * Creates a new message line as a child of the parent and with the given SWT stylebits.
+	 */
+	public MessageLine(Composite parent, int style) {
+		super(parent, style);
+		fNormalMsgAreaBackground= getBackground();
+	}
+
+	
+	/**
+     * Display the given error message. A currently displayed message
+     * is saved and will be redisplayed when the error message is cleared.
+     */
+	public void setErrorMessage(String message) {
+		if (message != null && message.length() > 0) {
+			hasErrorMessage = true;
+			setText(message);
+			setImage(MakeUIImages.getImage(MakeUIImages.IMG_OBJS_ERROR));
+			setBackground(JFaceColors.getErrorBackground(getDisplay()));
+			return;
+		}
+		hasErrorMessage = false;
+		setText(fMessage);	
+		setImage(null);
+		setBackground(fNormalMsgAreaBackground);	
+	}
+
+	public void setMessage(String message) {
+		fMessage = message;
+		setText(message);
+	}
+	
+	public boolean hasErrorMessage() {
+		return hasErrorMessage;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/OptionalMessageDialog.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/OptionalMessageDialog.java
new file mode 100644
index 0000000..a8e5781
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/OptionalMessageDialog.java
@@ -0,0 +1,144 @@
+/*******************************************************************************
+ *  Copyright (c) 2000, 2009 IBM Corporation and others.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ * 
+ *  Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     Anton Leherbauer (Wind River Systems)
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.cdt.ui.CUIPlugin;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * This is a <code>MessageDialog</code> which allows the user
+ * to choose that the dialog isn't shown again the next time.
+ */ 
+public class OptionalMessageDialog extends MessageDialog {
+	// String constants for widgets
+	private static final String CHECKBOX_TEXT= MakeUIMessages.getResourceString("OptionalMessageDialog_dontShowAgain"); // $NON-NLS-1$  
+
+	// Dialog store id constants
+	private static final String STORE_ID= "OptionalMessageDialog.hide."; //$NON-NLS-1$
+	private static final String KEY_DETAIL = ".detail"; //$NON-NLS-1$
+
+	public static final int NOT_SHOWN= IDialogConstants.CLIENT_ID + 1;
+	public static final int NO_DETAIL= -1;
+	
+	private Button fHideDialogCheckBox;
+	private String fId;
+
+	/**
+	 * Opens the dialog but only if the user hasn't choosen to hide it.
+	 * Returns <code>NOT_SHOWN</code> if the dialog was not shown.
+	 */
+	public static int open(String id, Shell parent, String title, Image titleImage, String message, int dialogType, String[] buttonLabels, int defaultButtonIndex) {
+		if (!isDialogEnabled(id))
+			return OptionalMessageDialog.NOT_SHOWN;
+		
+		MessageDialog dialog= new OptionalMessageDialog(id, parent, title, titleImage, message, dialogType, buttonLabels, defaultButtonIndex);
+		return dialog.open();
+	}
+
+	protected OptionalMessageDialog(String id, Shell parent, String title, Image titleImage, String message, int dialogType, String[] buttonLabels, int defaultButtonIndex) {
+		super(parent, title, titleImage, message, dialogType, buttonLabels, defaultButtonIndex);
+		fId= id;
+	}
+
+	@Override
+	protected Control createCustomArea(Composite parent) {
+		Composite composite= new Composite(parent, SWT.NONE);
+		GridLayout layout= new GridLayout();
+		layout.marginHeight= convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
+		layout.marginWidth= convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
+		layout.horizontalSpacing= convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
+		composite.setLayout(layout);
+		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+		
+		fHideDialogCheckBox= new Button(composite, SWT.CHECK | SWT.LEFT);
+		fHideDialogCheckBox.setText(CHECKBOX_TEXT);
+		fHideDialogCheckBox.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				setDialogEnabled(fId, !((Button)e.widget).getSelection());
+			}
+		});
+		applyDialogFont(fHideDialogCheckBox);
+		return fHideDialogCheckBox;
+	}
+	
+	//--------------- Configuration handling --------------
+	
+	/**
+	 * Returns this dialog
+	 * 
+	 * @return the settings to be used
+	 */
+	private static IDialogSettings getDialogSettings() {
+		IDialogSettings settings= CUIPlugin.getDefault().getDialogSettings();
+		settings= settings.getSection(STORE_ID);
+		if (settings == null)
+			settings= CUIPlugin.getDefault().getDialogSettings().addNewSection(STORE_ID);
+		return settings;
+	}
+		
+	/**
+	 * Answers whether the optional dialog is enabled and should be shown.
+	 */
+	public static boolean isDialogEnabled(String key) {
+		IDialogSettings settings= getDialogSettings();
+		return !settings.getBoolean(key);
+	}
+	
+	/**
+	 * Sets a detail for the dialog.
+	 */
+	public static void setDialogDetail(String key, int detail) {
+		IDialogSettings settings= getDialogSettings();
+		settings.put(key+KEY_DETAIL, detail);
+	}
+
+	/**
+	 * Returns the detail for this dialog, or NO_DETAIL, if none.
+	 */
+	public static int getDialogDetail(String key) {
+		IDialogSettings settings= getDialogSettings();
+		try {
+			return settings.getInt(key+KEY_DETAIL);
+		} catch (NumberFormatException e) {
+			return NO_DETAIL;
+		}
+	}
+	
+	/**
+	 * Sets whether the optional dialog is enabled and should be shown.
+	 */
+	public static void setDialogEnabled(String key, boolean isEnabled) {
+		IDialogSettings settings= getDialogSettings();
+		settings.put(key, !isEnabled);
+	}
+
+	/**
+	 * Clears all remembered information about hidden dialogs
+	 */
+	public static void clearAllRememberedStates() {
+		IDialogSettings settings= CUIPlugin.getDefault().getDialogSettings();
+		settings.addNewSection(STORE_ID);
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ResourceLookup.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ResourceLookup.java
new file mode 100644
index 0000000..0479466
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ResourceLookup.java
@@ -0,0 +1,159 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Wind River Systems, Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Markus Schorn - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.net.URI;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IPath;
+
+/**
+ * Allows for looking up resources by location or name.
+ */
+public class ResourceLookup {
+	private static ResourceLookupTree lookupTree= new ResourceLookupTree();
+
+	public static void startup() {
+		lookupTree.startup();
+	}
+	
+	public static void shutdown() {
+		lookupTree.shutdown();
+	}
+	
+	/**
+	 * Searches for files with the given location suffix. 
+	 * 
+	 * At this point the method works for sources and headers (no other content types), only. 
+	 * This is done to use less memory and can be changed if necessary. 
+	 * For linked resource files, the name of the link target is relevant.
+	 * 
+	 * @param locationSuffix the suffix to match, always used as relative path.
+	 * @param projects the projects to search
+	 * @param ignoreCase whether or not to ignore case when comparing the suffix.
+	 */
+	public static IFile[] findFilesByName(IPath locationSuffix, IProject[] projects, boolean ignoreCase) {
+		return lookupTree.findFilesByName(locationSuffix, projects, ignoreCase);
+	}
+	
+	/**
+	 * Uses a lookup-tree that finds resources for locations using the canonical representation
+	 * of the path. 
+	 */
+	public static IFile[] findFilesForLocationURI(URI location) {
+		return lookupTree.findFilesForLocationURI(location);
+	}
+
+	/**
+	 * Uses a lookup-tree that finds resources for locations using the canonical representation
+	 * of the path. The method does not work for files where the name (last segment) of the 
+	 * resources differs from the name of the location.
+	 */
+	public static IFile[] findFilesForLocation(IPath location) {
+		return lookupTree.findFilesForLocation(location);
+	}
+
+	/**
+	 * Uses {@link #findFilesForLocationURI(URI)} and selects the most relevant file
+	 * from the result. Files form the first project, from cdt-projects and those on source
+	 * roots are preferred, see {@link FileRelevance}. 
+	 * @param location an URI for the location of the files to search for.
+	 * @param preferredProject a project to be preferred over others, or <code>null</code>.
+	 * @return a file for the location in one of the given projects, or <code>null</code>.
+	 * 			NB the returned IFile may not exist
+	 */
+	public static IFile selectFileForLocationURI(URI location, IProject preferredProject) {
+		return selectFile(findFilesForLocationURI(location), preferredProject);
+	}
+
+	/**
+	 * Uses {@link #findFilesForLocation(IPath)} and selects the most relevant file
+	 * from the result. Files form the preferred project, from cdt-projects and those on source
+	 * roots are preferred, see {@link FileRelevance}. 
+	 * @param location a path for the location of the files to search for.
+	 * @param preferredProject a project to be preferred over others, or <code>null</code>.
+	 * @return a file for the location or <code>null</code>.
+	 * 			NB the returned IFile may not exist
+	 */
+	public static IFile selectFileForLocation(IPath location, IProject preferredProject) {
+		return selectFile(findFilesForLocation(location), preferredProject);
+	}
+
+	private static IFile selectFile(IFile[] files, IProject preferredProject) {
+		if (files.length == 0)
+			return null;
+
+		if (files.length == 1)
+			return files[0];
+
+		IFile best= null;
+		int bestRelevance= -1;
+
+		for (int i = 0; i < files.length; i++) {
+			IFile file = files[i];
+			int relevance= FileRelevance.getRelevance(file, preferredProject);
+			if (best == null || relevance > bestRelevance ||
+					(relevance == bestRelevance && 
+							best.getFullPath().toString().compareTo(file.getFullPath().toString()) > 0)) {
+				bestRelevance= relevance;
+				best= file;
+			}
+		}
+		return best;
+	}
+
+	/**
+	 * Sorts files by relevance for CDT, by the criteria listed below. The most relevant files
+	 * is listed first.
+	 * <br> Accessible files
+	 * <br> Files of preferred project
+	 * <br> Files of CDT projects
+	 * <br> Files on a source root of a CDT project
+	 */
+	public static void sortFilesByRelevance(IFile[] filesToSort, final IProject preferredProject) {
+		Collections.sort(Arrays.asList(filesToSort), new Comparator<IFile>() {
+			public int compare(IFile f1, IFile f2) {
+				int r1= FileRelevance.getRelevance(f1, preferredProject);
+				int r2= FileRelevance.getRelevance(f2, preferredProject);
+				
+				if (r1 > r2)
+					return -1;
+				if (r1 < r2)
+					return 1;
+				
+				return f1.getFullPath().toString().compareTo(f2.getFullPath().toString());
+			}
+		});
+	}
+
+	/** 
+	 * For testing, only.
+	 */
+	public static void dump() {
+		lookupTree.dump();
+	}
+	/** 
+	 * For testing, only.
+	 */
+	public static void unrefNodeMap() {
+		lookupTree.unrefNodeMap();
+	}
+	/** 
+	 * For testing, only.
+	 */
+	public static void simulateNodeMapCollection() {
+		lookupTree.simulateNodeMapCollection();
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ResourceLookupTree.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ResourceLookupTree.java
new file mode 100644
index 0000000..5644f98
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ResourceLookupTree.java
@@ -0,0 +1,861 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Wind River Systems, Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Markus Schorn - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.lang.ref.SoftReference;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.CProjectNature;
+import org.eclipse.cdt.core.model.CoreModel;
+import org.eclipse.cdt.core.parser.util.CharArrayUtils;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.IResourceProxy;
+import org.eclipse.core.resources.IResourceProxyVisitor;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.core.runtime.content.IContentTypeManager;
+import org.eclipse.core.runtime.jobs.Job;
+
+/**
+ * Allows for looking up resources by location or name. When using this class 100 bytes per resource
+ * are needed. Therefore the support is limited to header-files int non-cdt projects and all files 
+ * except non-cdt-files in CDT projects.
+ *
+ * The information for a project is initialized when first requested and then it is kept up to date
+ * using a resource change listener. No memory is used, as long as the class is not used.
+ * When information is not used for more than 10 minutes, the data-structures will be held via a weak
+ * reference, only and are subject to garbage collection.
+ * 
+ * The node map stores a map from hash-code of file-names to nodes.
+ * A node contains the name of a file plus a link to the parent resource. From that we can compute
+ * the resource path and obtain further information via the resource.
+ */
+class ResourceLookupTree implements IResourceChangeListener, IResourceDeltaVisitor, IResourceProxyVisitor {
+	private static final int UNREF_DELAY = 10 * 60000; // 10 min
+	
+	private static final boolean VISIT_CHILDREN = true;
+	private static final boolean SKIP_CHILDREN = false;
+	private static final IFile[] NO_FILES = new IFile[0];
+	private static final int TRIGGER_RECALC= 
+		IResourceDelta.TYPE | IResourceDelta.REPLACED | 
+		IResourceDelta.LOCAL_CHANGED | IResourceDelta.OPEN;
+	
+	private static class Extensions {
+		private final boolean fInvert;
+		private final Set<String> fExtensions;
+		Extensions(Set<String> extensions, boolean invert) {
+			fInvert= invert;
+			fExtensions= extensions;
+		}
+		boolean isRelevant(String filename) {
+			// accept all files without extension
+			final int idx= filename.lastIndexOf('.');
+			if (idx < 0)
+				return true;
+			
+			return fExtensions.contains(filename.substring(idx+1).toUpperCase()) != fInvert;
+		}
+	}
+	
+	private static class Node {
+		final Node fParent;
+		final char[] fResourceName;
+		final boolean fHasFileLocationName;
+		final boolean fIsFileLinkTarget;
+		
+		boolean fDeleted;
+		boolean fHasChildren;
+		int fCanonicHash;
+		
+		Node(Node parent, char[] name, boolean hasFileLocationName, boolean isFileLinkTarget) {
+			fParent= parent;
+			fResourceName= name;
+			fHasFileLocationName= hasFileLocationName;
+			fIsFileLinkTarget= isFileLinkTarget;
+			if (parent != null)
+				parent.fHasChildren= true;
+		}
+	}
+	
+	private final Object fLock= new Object();
+	private final Job fUnrefJob;
+	private SoftReference<Map<Integer, Object>> fNodeMapRef;
+	private Map<Integer, Object> fNodeMap;
+	private final Map<String, Extensions> fFileExtensions;
+	private Extensions fCDTProjectExtensions;
+	private Extensions fDefaultExtensions;
+	private Extensions fCurrentExtensions;
+	private Node fRootNode;
+	private boolean fNeedCleanup;
+	private Node fLastFolderNode;
+	
+	public ResourceLookupTree() {
+		fRootNode= new Node(null, CharArrayUtils.EMPTY, false, false) {};
+		fFileExtensions= new HashMap<String, Extensions>();
+		fUnrefJob= new Job("Timer") { //$NON-NLS-1$
+			@Override
+			protected IStatus run(IProgressMonitor monitor) {
+				unrefNodeMap();
+				return Status.OK_STATUS;
+			}
+		};
+		fUnrefJob.setSystem(true);
+	}
+
+	public void startup() {
+		final IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		workspace.addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
+	}
+
+	public void shutdown() {
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
+		synchronized (fLock) {
+			fNodeMap= null;
+			fNodeMapRef= null;
+			fFileExtensions.clear();
+		}
+	}
+
+	/**
+	 * Handle resource change notifications.
+	 */
+	public void resourceChanged(IResourceChangeEvent event) {
+		IResourceDelta delta= event.getDelta();
+		synchronized (fLock) {
+			if (fNodeMapRef == null)
+				return;
+			boolean unsetMap= false;
+			if (fNodeMap == null) {
+				fNodeMap= fNodeMapRef.get();
+				if (fNodeMap == null)
+					return;
+				unsetMap= true;
+			}
+			try {
+				delta.accept(this);
+			} catch (CoreException e) {
+				CCorePlugin.log(e);
+			} finally {
+				if (fNeedCleanup)
+					cleanup();
+				fCurrentExtensions= null;
+				fNeedCleanup= false;
+				if (unsetMap)
+					fNodeMap= null;
+			}
+		}
+	}
+	
+	/**
+	 * Handles resource change notifications by visiting the delta.
+	 */
+	public boolean visit(IResourceDelta delta) throws CoreException {
+		assert Thread.holdsLock(fLock);
+		
+		final IResource res= delta.getResource();
+		if (res instanceof IWorkspaceRoot)
+			return VISIT_CHILDREN;
+		
+		if (res instanceof IProject) {
+			// project not yet handled
+			final String name = res.getName();
+			final Extensions exts= fFileExtensions.get(name);
+			if (exts == null)
+				return SKIP_CHILDREN;
+			
+			switch (delta.getKind()) {
+			case IResourceDelta.ADDED:	// new projects should not yet be part of the tree
+			case IResourceDelta.REMOVED:
+				fFileExtensions.remove(name);
+				remove(res);
+				return SKIP_CHILDREN;
+				
+			case IResourceDelta.CHANGED:
+				if ((delta.getFlags() & (TRIGGER_RECALC | IResourceDelta.DESCRIPTION)) != 0) {
+					fFileExtensions.remove(name);
+					remove(res);
+					return SKIP_CHILDREN;
+				}
+				break;
+			}
+			fCurrentExtensions= exts;
+			return VISIT_CHILDREN;
+		}
+				
+		// file or folder
+		switch (delta.getKind()) {
+		case IResourceDelta.ADDED:
+			add(res);
+			return SKIP_CHILDREN;
+			
+		case IResourceDelta.CHANGED:
+			if ((delta.getFlags() & TRIGGER_RECALC) != 0) {
+				remove(res);
+				add(res);
+				return SKIP_CHILDREN;
+			}
+			return VISIT_CHILDREN;
+			
+		case IResourceDelta.REMOVED:
+			
+			remove(res);
+			return SKIP_CHILDREN;
+		}
+		return VISIT_CHILDREN;
+	}
+
+
+	/**
+	 * Add a resource to the tree.
+	 */
+	private void add(IResource res) {
+		assert Thread.holdsLock(fLock);
+		
+		if (res instanceof IFile) {
+			final String resName = res.getName();
+			String linkedName= null;
+			if (res.isLinked()) {
+				URI uri= res.getLocationURI();
+				if (uri != null) {
+					linkedName= LocationAdapter.URI.extractName(uri);
+					if (linkedName.length() > 0 && fCurrentExtensions.isRelevant(linkedName)) {
+						if (linkedName.equals(resName)) {
+							createFileNode(res.getFullPath(), null);
+						} else {
+							createFileNode(res.getFullPath(), linkedName);
+						}
+					}			
+				}
+			} else if (fCurrentExtensions.isRelevant(resName)) {
+				createFileNode(res.getFullPath(), null);
+			}
+		} else {
+			try {
+				res.accept(this, 0);
+			} catch (CoreException e) {
+				CCorePlugin.log(e);
+			}
+		}
+	}
+	
+	/**
+	 * Add a resource tree by using a resource proxy visitor.
+	 */
+	public boolean visit(IResourceProxy proxy) throws CoreException {
+		if (proxy.getType() == IResource.FILE) {
+			if (fCurrentExtensions.isRelevant(proxy.getName())) {
+				if (proxy.isLinked()) {
+					IResource res= proxy.requestResource();
+					if (res instanceof IFile) { 
+						add(res);
+					}
+					return true;
+				}
+				createFileNode(proxy.requestFullPath(), null);
+			}
+		}
+		return true;
+	}
+
+	
+	public void unrefNodeMap() {
+		synchronized (fLock) {
+			fNodeMap= null;
+		}
+	}
+
+	public void simulateNodeMapCollection() {
+		synchronized (fLock) {
+			fNodeMap= null;
+			fNodeMapRef= new SoftReference<Map<Integer, Object>>(null);
+		}
+	}
+
+	/**
+	 * Initializes nodes for the given projects. Also creates the node map if it was collected.
+	 */
+	private void initializeProjects(IProject[] projects) {
+		assert Thread.holdsLock(fLock);
+		
+		if (fNodeMap == null) {
+			if (fNodeMapRef != null) {
+				fNodeMap= fNodeMapRef.get();
+			}
+
+			if (fNodeMap == null) {
+				fFileExtensions.clear();
+				fNodeMap= new HashMap<Integer, Object>();
+				fNodeMapRef= new SoftReference<Map<Integer, Object>>(fNodeMap);
+			}
+		}
+		fUnrefJob.cancel();
+		fUnrefJob.schedule(UNREF_DELAY); 
+
+		for (IProject project : projects) {
+			if (project.isOpen() && !fFileExtensions.containsKey(project.getName())) {
+				Extensions ext= fDefaultExtensions;
+				try {
+					if (project.hasNature(CProjectNature.C_NATURE_ID)) {
+						ext= fCDTProjectExtensions;
+					}
+				} catch (CoreException e) {
+					CCorePlugin.log(e);
+					// treat as non-cdt project
+				}
+				fCurrentExtensions= ext;
+				add(project);
+				fFileExtensions.put(project.getName(), ext);
+				fCurrentExtensions= null;
+			}
+		}
+	}
+
+	/**
+	 * Initializes file-extensions and node map
+	 */
+	private void initFileExtensions() {
+		
+		if (fDefaultExtensions == null) {
+			HashSet<String> cdtContentTypes= new HashSet<String>();
+			String[] registeredContentTypes= CoreModel.getRegistedContentTypeIds();
+			cdtContentTypes.addAll(Arrays.asList(registeredContentTypes));
+
+			final IContentTypeManager ctm= Platform.getContentTypeManager();
+			final IContentType[] ctts= ctm.getAllContentTypes();
+			Set<String> result= new HashSet<String>();
+			outer: for (IContentType ctt : ctts) {
+				IContentType basedOn= ctt;
+				while (basedOn != null) {
+					if (cdtContentTypes.contains(basedOn.getId())) 
+						continue outer;
+					basedOn= basedOn.getBaseType();
+				}
+				// this is a non-cdt content type
+				addFileSpecs(ctt, result);
+			}
+			fCDTProjectExtensions= new Extensions(result, true);
+
+			result= new HashSet<String>();
+			for (IContentType ctt : ctts) {
+				IContentType basedOn= ctt;
+				while (basedOn != null) {
+					if (cdtContentTypes.contains(basedOn.getId())) {
+						addFileSpecs(ctt, result);
+						break;
+					}
+					basedOn= basedOn.getBaseType();
+				}
+			}
+			fDefaultExtensions= new Extensions(result, false);
+		}
+	}
+
+	private void addFileSpecs(IContentType ctt, Set<String> result) {
+		String[] fspecs= ctt.getFileSpecs(IContentType.FILE_EXTENSION_SPEC);
+		for (String fspec : fspecs) {
+			result.add(fspec.toUpperCase());
+		}
+	}
+
+	/**
+	 * Inserts a node for the given path.
+	 */
+	private void createFileNode(IPath fullPath, String fileLink) {
+		final String[] segments= fullPath.segments();
+		final boolean isFileLinkTarget= fileLink != null;
+		final char[][] charArraySegments = toCharArrayArray(segments, fileLink);
+		createNode(charArraySegments, charArraySegments.length, true, isFileLinkTarget);
+	}
+
+	private char[][] toCharArrayArray(String[] segments, String fileLink) {
+		final int segmentLen = segments.length;
+		char[][] chsegs;
+		if (fileLink != null) {
+			chsegs= new char[segmentLen+1][];
+			chsegs[segmentLen]= fileLink.toCharArray();
+		} else {
+			chsegs= new char[segmentLen][];
+		}
+		for (int i = 0; i < segmentLen; i++) {
+			chsegs[i]= segments[i].toCharArray();
+		}
+		return chsegs;
+	}
+
+	/**
+	 * Inserts a node for the given path.
+	 */
+	private Node createNode(char[][] segments, int segmentCount, boolean hasFileLocationName, boolean isFileLinkTarget) {
+		assert Thread.holdsLock(fLock);
+		
+		if (segmentCount == 0)
+			return fRootNode;
+
+		if (!hasFileLocationName && fLastFolderNode != null) {
+			if (isNodeForSegments(fLastFolderNode, segments, segmentCount, isFileLinkTarget))
+				return fLastFolderNode;
+		}
+		
+		final char[] name= segments[segmentCount-1];
+		final int hash= hashCode(name);
+		
+		// search for existing node
+		Object obj= fNodeMap.get(hash);
+
+		Node[] nodes= null;
+		int len= 0;
+		if (obj != null) {
+			if (obj instanceof Node) {
+				Node node= (Node) obj;
+				if (isNodeForSegments(node, segments, segmentCount, isFileLinkTarget)) {
+					if (!hasFileLocationName)
+						fLastFolderNode= node;
+					return node;
+				}
+				nodes= new Node[]{node, null};
+				fNodeMap.put(hash, nodes);
+				len= 1;
+			} else {
+				nodes= (Node[]) obj;
+				for (len=0; len < nodes.length; len++) {
+					Node node = nodes[len];
+					if (node == null) 
+						break;
+					if (isNodeForSegments(node, segments, segmentCount, isFileLinkTarget)) {
+						if (!hasFileLocationName)
+							fLastFolderNode= node;
+						return node;
+					}
+				}
+			}
+		}		
+		final Node parent= createNode(segments, segmentCount-1, false, false);
+		Node node= new Node(parent, name, hasFileLocationName, isFileLinkTarget);
+		if (nodes == null) {
+			fNodeMap.put(hash, node);
+		} else { 
+			if (len == nodes.length) {
+				Node[] newNodes= new Node[len+2];
+				System.arraycopy(nodes, 0, newNodes, 0, len);
+				nodes= newNodes;
+				fNodeMap.put(hash, nodes);
+			}
+			nodes[len]= node;
+		}
+		
+		if (!hasFileLocationName)
+			fLastFolderNode= node;
+		return node;
+	}
+
+	/**
+	 * Checks whether the given node matches the given segments.
+	 */
+	private boolean isNodeForSegments(Node node, char[][] segments, int segmentLength, boolean isFileLinkTarget) {
+		assert Thread.holdsLock(fLock);
+		
+		if (node.fIsFileLinkTarget != isFileLinkTarget)
+			return false;
+		
+		while(segmentLength > 0 && node != null) {
+			if (!CharArrayUtils.equals(segments[--segmentLength], node.fResourceName))
+				return false;
+			node= node.fParent;
+		}
+		return node == fRootNode;
+	}
+	
+	/**
+	 * Remove a resource from the tree
+	 */
+	private void remove(IResource res) {
+		assert Thread.holdsLock(fLock);
+		
+		final char[] name= res.getName().toCharArray();
+		final int hash= hashCode(name);
+		
+		Object obj= fNodeMap.get(hash);
+		if (obj == null)
+			return;
+		
+		final IPath fullPath= res.getFullPath();
+		final int segmentCount= fullPath.segmentCount();
+		if (segmentCount == 0)
+			return;
+		
+		final char[][]segments= toCharArrayArray(fullPath.segments(), null);
+		if (obj instanceof Node) {
+			final Node node= (Node) obj;
+			if (!node.fDeleted && isNodeForSegments(node, segments, segmentCount, false)) {
+				node.fDeleted= true;
+				if (node.fHasChildren)
+					fNeedCleanup= true;
+				fNodeMap.remove(hash);
+			}
+		} else {
+			final Node[] nodes= (Node[]) obj;
+			for (int i= 0; i < nodes.length; i++) {
+				Node node = nodes[i];
+				if (node == null)
+					return;
+				if (!node.fDeleted && isNodeForSegments(node, segments, segmentCount, false)) {
+					remove(nodes, i);
+
+					if (nodes[0] == null) 
+						fNodeMap.remove(hash);
+
+					node.fDeleted= true;
+					if (node.fHasChildren)
+						fNeedCleanup= true;
+
+					return;
+				}
+			}
+		}
+	}
+
+	private void remove(Node[] nodes, int i) {
+    	int idx= lastValid(nodes, i);
+    	if (idx > 0) { 
+    		nodes[i]= nodes[idx];
+    		nodes[idx]= null;
+    	}
+	}
+
+	private int lastValid(Node[] nodes, int left) {
+		int right= nodes.length-1;
+    	while (left < right) {
+    		int mid= (left+right+1)/2;  // ==> mid > left
+    		if (nodes[mid] == null) 
+    			right= mid-1;
+    		else 
+    			left= mid;
+    	}
+		return right;
+	}
+
+	private void cleanup() {
+		assert Thread.holdsLock(fLock);
+		fLastFolderNode= null;
+		
+		for (Iterator<Object> iterator = fNodeMap.values().iterator(); iterator.hasNext();) {
+			Object obj= iterator.next();
+			if (obj instanceof Node) {
+				if (isDeleted((Node) obj)) {
+					iterator.remove();
+				}
+			} else {
+				Node[] nodes= (Node[]) obj;
+				int j= 0;
+				for (int i = 0; i < nodes.length; i++) {
+					final Node node = nodes[i];
+					if (node == null) {
+						if (j==0) {
+							iterator.remove();
+						} 
+						break;
+					}
+					if (!isDeleted(node)) {
+						if (i != j) {
+							nodes[j]= node;
+							nodes[i]= null;
+						}
+						j++;
+					} else {
+						nodes[i]= null;
+					}
+				}
+			}
+		}
+	}
+	
+	private boolean isDeleted(Node node) {
+		while(node != null) {
+			if (node.fDeleted)
+				return true;
+			node= node.fParent;
+		}
+		return false;
+	}
+
+	/**
+	 * Computes a case insensitive hash-code for file names.
+	 */
+	private int hashCode(char[] name) {
+		int h= 0;
+		final int len = name.length;
+		for (int i = 0; i < len; i++) {
+			h = 31*h + Character.toUpperCase(name[i]);
+		}
+		return h;
+	}
+
+	/**
+	 * Searches for all files with the given location. In case the name of the location is
+	 * a cdt-content type the lookup tree is consulted, otherwise as a fallback the platform's
+	 * method is called.
+	 */
+	public IFile[] findFilesForLocationURI(URI location) {
+		return findFilesForLocation(location, LocationAdapter.URI);
+	}
+
+	/**
+	 * Searches for all files with the given location. In case the name of the location is
+	 * a cdt-content type the lookup tree is consulted, otherwise as a fallback the platform's
+	 * method is called.
+	 */
+	public IFile[] findFilesForLocation(IPath location) {
+		return findFilesForLocation(location, LocationAdapter.PATH);
+	}
+
+	/**
+	 * Searches for all files with the given location. In case the name of the location is
+	 * a cdt-content type the lookup tree is consulted, otherwise as a fallback the platform's
+	 * method is called.
+	 */
+	public <T> IFile[] findFilesForLocation(T location, LocationAdapter<T> adapter) {
+		initFileExtensions();
+		String name= adapter.extractName(location);
+		Node[] candidates= null;
+		synchronized (fLock) {
+			initializeProjects(ResourcesPlugin.getWorkspace().getRoot().getProjects());
+			Object obj= fNodeMap.get(hashCode(name.toCharArray()));
+			if (obj != null) {
+				candidates= convert(obj);
+				IFile[] result= extractMatchesForLocation(candidates, location, adapter);
+				if (result.length > 0)
+					return result;
+			}
+		}	
+		
+		// fall back to platform functionality
+		return adapter.platformsFindFilesForLocation(location);
+	}
+
+	private Node[] convert(Object obj) {
+		if (obj instanceof Node)
+			return new Node[] {(Node) obj};
+
+		final Node[] nodes= (Node[]) obj;
+		final int len= lastValid(nodes, -1)+1;
+		final Node[] result= new Node[len];
+		System.arraycopy(nodes, 0, result, 0, len);
+		return result;
+	}
+
+	/**
+	 * Returns an array of files for the given name. Search is limited to the supplied projects.
+	 */
+	public IFile[] findFilesByName(IPath relativeLocation, IProject[] projects, boolean ignoreCase) {
+		final int segCount= relativeLocation.segmentCount();
+		if (segCount < 1)
+			return NO_FILES;
+		
+		final String name= relativeLocation.lastSegment();
+		Node[] candidates;
+
+		initFileExtensions();
+		synchronized (fLock) {
+			initializeProjects(projects);
+			Object obj= fNodeMap.get(hashCode(name.toCharArray()));
+			if (obj == null) {
+				return NO_FILES;
+			}
+			candidates= convert(obj);
+		}	
+		String suffix= relativeLocation.toString();
+		while(suffix.startsWith("../")) { //$NON-NLS-1$
+			suffix= suffix.substring(3);
+		}
+		Set<String> prjset= new HashSet<String>();
+		for (IProject prj : projects) {
+			prjset.add(prj.getName());
+		}
+		return extractMatchesForName(candidates, name, suffix, ignoreCase, prjset);
+	}
+	
+	/**
+	 * Selects the actual matches for the list of candidate nodes.
+	 */
+	private IFile[] extractMatchesForName(Node[] candidates, String name, String suffix, boolean ignoreCase, Set<String> prjSet) {
+		final char[] n1= name.toCharArray();
+		final int namelen = n1.length;
+		int resultIdx= 0;
+		
+		if (ignoreCase) {
+			for (int j = 0; j < namelen; j++) {
+				n1[j]= Character.toUpperCase(n1[j]);
+			}
+		}
+		final int suffixLen= suffix.length();
+		final IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();
+		IFile[] result= null;
+		outer: for (int i = 0; i < candidates.length; i++) {
+			final Node node = candidates[i];
+			if (node.fHasFileLocationName && checkProject(node, prjSet)) {
+				final char[] n2= node.fResourceName;
+				if (namelen == n2.length) {
+					for (int j = 0; j < n2.length; j++) {
+						final char c= ignoreCase ? Character.toUpperCase(n2[j]) : n2[j];
+						if (c != n1[j]) 
+							continue outer;
+					}
+					final IFile file= root.getFile(createPath(node));
+					final URI loc= file.getLocationURI();
+					if (loc != null) {
+						String path= loc.getPath();
+						final int len= path.length();
+						if (len >= suffixLen && 
+								suffix.regionMatches(ignoreCase, 0, path, len-suffixLen, suffixLen)) {
+							if (result == null) 
+								result= new IFile[candidates.length-i];
+							result[resultIdx++]= root.getFile(createPath(node));
+						} 
+					}
+				}
+			}
+		}
+		if (result==null)
+			return NO_FILES;
+		
+		if (resultIdx < result.length) {
+			IFile[] copy= new IFile[resultIdx];
+			System.arraycopy(result, 0, copy, 0, resultIdx);
+			return copy;
+		}
+		return result;
+	}
+
+	private boolean checkProject(Node node, Set<String> prjSet) {
+		while(true) {
+			final Node n= node.fParent;
+			if (n == fRootNode)
+				break;
+			if (n == null)
+				return false;
+			node= n;
+		}
+		return prjSet.contains(new String(node.fResourceName));
+	}
+
+	private IPath createPath(Node node) {
+		if (node == fRootNode)
+			return Path.ROOT;
+
+		if (node.fIsFileLinkTarget)
+			return createPath(node.fParent);
+
+		return createPath(node.fParent).append(new String(node.fResourceName));
+	}
+	
+	/**
+	 * Selects the actual matches from the list of candidates
+	 */
+	private <T> IFile[] extractMatchesForLocation(Node[] candidates, T location, LocationAdapter<T> adapter) {
+		final IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();
+		final String searchPath= adapter.getCanonicalPath(location);
+		IFile[] result= null;
+		int resultIdx= 0;
+		for (int i = 0; i < candidates.length; i++) {
+			final Node node = candidates[i];
+			if (node.fHasFileLocationName) {
+				final IFile file= root.getFile(createPath(node));
+				final T loc= adapter.getLocation(file);
+				if (loc != null) {
+					if (!loc.equals(location)) {
+						if (searchPath == null) 
+							continue;
+						
+						if (node.fCanonicHash != 0 && node.fCanonicHash != searchPath.hashCode())
+							continue;
+						
+						final String candPath= adapter.getCanonicalPath(loc);
+						if (candPath == null)
+							continue;
+						
+						node.fCanonicHash= candPath.hashCode();
+						if (!candPath.equals(searchPath))
+							continue;
+					}
+					if (result == null) 
+						result= new IFile[candidates.length-i];
+					result[resultIdx++]= root.getFile(createPath(node));
+				}
+			}
+		}
+		if (result==null)
+			return NO_FILES;
+		
+		if (resultIdx < result.length) {
+			IFile[] copy= new IFile[resultIdx];
+			System.arraycopy(result, 0, copy, 0, resultIdx);
+			return copy;
+		}
+		return result;
+	}
+
+	@SuppressWarnings("nls")
+	public void dump() {
+		List<String> lines= new ArrayList<String>();
+		synchronized (fLock) {
+			for (Iterator<Object> iterator = fNodeMap.values().iterator(); iterator.hasNext();) {
+				Node[] nodes= convert(iterator.next());	
+				for (int i = 0; i < nodes.length; i++) {
+					final Node node = nodes[i];
+					if (node == null) {
+						break;
+					}
+					lines.add(toString(node));
+				}
+			}
+		}
+		Collections.sort(lines);
+		System.out.println("Dumping files:");
+		for (Iterator<String> iterator = lines.iterator(); iterator.hasNext();) {
+			String line = iterator.next();
+			System.out.println(line);
+		}
+		System.out.flush();
+	}
+
+	@SuppressWarnings("nls")
+	private String toString(Node node) {
+		if (node == fRootNode)
+			return "";
+		
+		return toString(node.fParent) + "/" + new String(node.fResourceName);
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SingleCharReader.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SingleCharReader.java
new file mode 100644
index 0000000..1d48fcc
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SingleCharReader.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2000 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.io.IOException;
+import java.io.Reader;
+
+
+public abstract class SingleCharReader extends Reader {
+	
+	/**
+	 * @see Reader#read(char)
+	 */
+	public abstract int read() throws IOException;
+
+
+	/**
+	 * @see Reader#read(char[],int,int)
+	 */
+	public int read(char cbuf[], int off, int len) throws IOException {
+		int end= off + len;
+		for (int i= off; i < end; i++) {
+			int ch= read();
+			if (ch == -1) {
+				if (i == off) {
+					return -1;
+				}
+				return i - off;
+			}
+			cbuf[i]= (char)ch;
+		}
+		return len;
+	}		
+	
+	/**
+	 * @see Reader#ready()
+	 */		
+    public boolean ready() throws IOException {
+		return true;
+	}
+	
+	/**
+	 * Gets the content as a String
+	 */
+	public String getString() throws IOException {
+		StringBuffer buf= new StringBuffer();
+		int ch;
+		while ((ch= read()) != -1) {
+			buf.append((char)ch);
+		}
+		return buf.toString();
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SubstitutionTextReader.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SubstitutionTextReader.java
new file mode 100644
index 0000000..16d8400
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SubstitutionTextReader.java
@@ -0,0 +1,138 @@
+/*******************************************************************************
+ * Copyright (c) 2000 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+
+import java.io.IOException;
+import java.io.Reader;
+
+
+/**
+ * Reads the text contents from a reader and computes for each character
+ * a potential substitution. The substitution may eat more characters than 
+ * only the one passed into the computation routine.
+ */
+public abstract class SubstitutionTextReader extends SingleCharReader {
+	
+	protected static final String LINE_DELIM= System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
+	
+	private Reader fReader;
+	private boolean fWasWhiteSpace;
+	private int fCharAfterWhiteSpace;
+	
+	private boolean fReadFromBuffer;
+	private StringBuffer fBuffer;
+	private int fIndex;
+
+
+	protected SubstitutionTextReader(Reader reader) {
+		fReader= reader;
+		fBuffer= new StringBuffer();
+		fIndex= 0;
+		fReadFromBuffer= false;
+		fCharAfterWhiteSpace= -1;
+		fWasWhiteSpace= true;
+	}
+	
+	/**
+	 * Implement to compute the substitution for the given character and 
+	 * if necessary subsequent characters. Use <code>nextChar</code>
+	 * to read subsequent characters.
+	 */
+	protected abstract String computeSubstitution(int c) throws IOException;
+	
+	/**
+	 * Returns the internal reader.
+	 */
+	protected Reader getReader() {
+		return fReader;
+	}
+	 
+	/**
+	 * Returns the next character.
+	 */
+	protected int nextChar() throws IOException {
+		fReadFromBuffer= (fBuffer.length() > 0);
+		if (fReadFromBuffer) {
+			char ch= fBuffer.charAt(fIndex++);
+			if (fIndex >= fBuffer.length()) {
+				fBuffer.setLength(0);
+				fIndex= 0;
+			}
+			return ch;
+		}
+		int ch= fCharAfterWhiteSpace;
+		if (ch == -1) {
+			ch= fReader.read();
+		}
+		if (Character.isWhitespace((char)ch)) {
+			do {
+				ch= fReader.read();
+			} while (Character.isWhitespace((char)ch));
+			if (ch != -1) {
+				fCharAfterWhiteSpace= ch;
+				return ' ';
+			}
+		} else {
+			fCharAfterWhiteSpace= -1;
+		}
+		return ch;
+	}
+	
+	/**
+	 * @see Reader#read()
+	 */
+	public int read() throws IOException {
+		int c;
+		do {
+			
+			c= nextChar();
+			while (!fReadFromBuffer) {
+				String s= computeSubstitution(c);
+				if (s == null)
+					break;
+				if (s.length() > 0)
+					fBuffer.insert(0, s);
+				c= nextChar();
+			}
+			
+		} while (fWasWhiteSpace && (c == ' '));
+				
+		fWasWhiteSpace= (c == ' ' || c == '\r' || c == '\n');
+		return c;
+	}
+		
+	/**
+	 * @see Reader#ready()
+	 */		
+    public boolean ready() throws IOException {
+		return fReader.ready();
+	}
+		
+	/**
+	 * @see Reader#close()
+	 */		
+	public void close() throws IOException {
+		fReader.close();
+	}
+	
+	/**
+	 * @see Reader#reset()
+	 */		
+	public void reset() throws IOException {
+		fReader.reset();
+		fWasWhiteSpace= true;
+		fCharAfterWhiteSpace= -1;
+		fBuffer.setLength(0);
+		fIndex= 0;		
+	}
+}
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AbstractAutotoolsHandler.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AbstractAutotoolsHandler.java
new file mode 100644
index 0000000..f912af4
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AbstractAutotoolsHandler.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import java.util.Collection;
+
+import org.eclipse.cdt.core.model.ICContainer;
+import org.eclipse.cdt.core.model.ICElement;
+import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IResource;
+
+public abstract class AbstractAutotoolsHandler extends AbstractHandler {
+	
+	@SuppressWarnings("unchecked")
+	protected IContainer getContainer(IEvaluationContext e) {
+		IContainer fContainer = null;
+
+		Object obj = e.getDefaultVariable();
+		if (obj instanceof Collection) {
+			Collection<Object> c = (Collection<Object>)obj;
+			Object[] objArray = c.toArray();
+			if (objArray.length > 0)
+				obj = objArray[0];
+		}
+		if (obj instanceof ICElement) {
+			if ( obj instanceof ICContainer || obj instanceof ICProject) {
+				fContainer = (IContainer) ((ICElement) obj).getUnderlyingResource();
+			} else {
+				obj = ((ICElement)obj).getResource();
+				if ( obj != null) {
+					fContainer = ((IResource)obj).getParent();
+				}
+			}
+		} else if (obj instanceof IResource) {
+			if (obj instanceof IContainer) {
+				fContainer = (IContainer) obj;
+			} else {
+				fContainer = ((IResource)obj).getParent();
+			}
+		} else {
+			fContainer = null;
+		}
+		return fContainer;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AbstractTargetAction.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AbstractTargetAction.java
new file mode 100644
index 0000000..738faf0
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AbstractTargetAction.java
@@ -0,0 +1,92 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2004 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.cdt.core.model.ICContainer;
+import org.eclipse.cdt.core.model.ICElement;
+import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IObjectActionDelegate;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.eclipse.ui.actions.ActionDelegate;
+
+
+public abstract class AbstractTargetAction
+	extends ActionDelegate
+	implements IObjectActionDelegate, IWorkbenchWindowActionDelegate {
+	private IWorkbenchPart fPart;
+	private IWorkbenchWindow fWindow;
+	private IContainer fContainer;
+
+	protected Shell getShell() {
+		if (fPart != null) {
+			return fPart.getSite().getShell();
+		} else if (fWindow != null) {
+			return fWindow.getShell();
+		}
+		return AutotoolsPlugin.getActiveWorkbenchShell();
+	}
+
+	protected IContainer getSelectedContainer() {
+		return fContainer;
+	}
+
+	public void setSelectedContainer(IContainer container) {
+		fContainer = container;
+	}
+	
+	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
+		fPart = targetPart;
+	}
+
+	public void init(IWorkbenchWindow window) {
+		fWindow = window;
+	}
+
+	public void selectionChanged(IAction action, ISelection selection) {
+		boolean enabled = false;
+		if (selection instanceof IStructuredSelection) {
+			IStructuredSelection sel = (IStructuredSelection) selection;
+			Object obj = sel.getFirstElement();
+			if (obj instanceof ICElement) {
+				if ( obj instanceof ICContainer || obj instanceof ICProject) {
+					fContainer = (IContainer) ((ICElement) obj).getUnderlyingResource();
+				} else {
+					obj = ((ICElement)obj).getResource();
+					if ( obj != null) {
+						fContainer = ((IResource)obj).getParent();
+					}
+				}
+			} else if (obj instanceof IResource) {
+				if (obj instanceof IContainer) {
+					fContainer = (IContainer) obj;
+				} else {
+					fContainer = ((IResource)obj).getParent();
+				}
+			} else {
+				fContainer = null;
+			}
+			if (fContainer != null && AutotoolsPlugin.hasTargetBuilder(fContainer.getProject())) {
+				enabled = true;
+			}
+		}
+		action.setEnabled(enabled);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AclocalHandler.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AclocalHandler.java
new file mode 100644
index 0000000..e09ea26
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AclocalHandler.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+/**
+ * @author Jeff Johnston
+ *
+ */
+public class AclocalHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		InvokeAclocalAction a = new InvokeAclocalAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutoconfHandler.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutoconfHandler.java
new file mode 100644
index 0000000..7991a51
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutoconfHandler.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+public class AutoconfHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		InvokeAutoconfAction a = new InvokeAutoconfAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutoheaderHandler.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutoheaderHandler.java
new file mode 100644
index 0000000..473e71b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutoheaderHandler.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+/**
+ * @author Jeff Johnston
+ *
+ */
+public class AutoheaderHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		InvokeAutoheaderAction a = new InvokeAutoheaderAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutomakeHandler.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutomakeHandler.java
new file mode 100644
index 0000000..23b8050
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutomakeHandler.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+public class AutomakeHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		InvokeAutomakeAction a = new InvokeAutomakeAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutoreconfHandler.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutoreconfHandler.java
new file mode 100644
index 0000000..ae1923f
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutoreconfHandler.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+/**
+ * @author Jeff Johnston
+ *
+ */
+public class AutoreconfHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		InvokeAutoreconfAction a = new InvokeAutoreconfAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAclocalAction.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAclocalAction.java
new file mode 100644
index 0000000..1d03b33
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAclocalAction.java
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+import org.eclipse.swt.widgets.Shell;
+
+
+public class InvokeAclocalAction extends InvokeAction {
+
+	private static final String DEFAULT_OPTION = ""; //$NON-NLS-1$
+	private static final String DEFAULT_COMMAND = "aclocal"; //$NON-NLS-1$
+
+	public void run(IAction action) {
+
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+		
+		IPath execDir = getExecDir(container);
+		String cwd = InvokeMessages.getString("CWD") + getCWD(container); //$NON-NLS-1$
+
+		TwoInputDialog optionDialog = new TwoInputDialog(
+				new Shell(),
+				cwd,
+				InvokeMessages
+						.getString("InvokeAclocalAction.windowTitle.options"), //$NON-NLS-1$
+				InvokeMessages
+						.getString("InvokeAclocalAction.message.options.otherOptions"), //$NON-NLS-1$
+				InvokeMessages
+						.getString("InvokeAclocalAction.message.options.includeDir"), DEFAULT_OPTION, null); //$NON-NLS-1$
+
+		optionDialog.open();
+
+		// chop args into string array
+		String rawArgList = optionDialog.getValue();
+
+		String[] optionsList = separateOptions(rawArgList);
+
+		// chop args into string array
+		rawArgList = optionDialog.getSecondValue();
+
+		String[] targetList = separateTargets(rawArgList);
+
+		if (targetList == null) {
+
+			showError(InvokeMessages
+					.getString("InvokeAction.execute.windowTitle.error"), //$NON-NLS-1$
+					InvokeMessages
+							.getString("InvokeAction.windowTitle.quoteError")); //$NON-NLS-1$
+			return;
+		}
+
+		int iOption = 0;
+		if (targetList.length > 0)
+			iOption = 1;
+
+		String[] argumentList = new String[targetList.length
+				+ optionsList.length + iOption];
+
+		System.arraycopy(optionsList, 0, argumentList, 0, optionsList.length);
+
+		if (iOption == 1)
+			argumentList[optionsList.length] = "-I"; //$NON-NLS-1$
+
+		System.arraycopy(targetList, 0, argumentList, optionsList.length
+				+ iOption, targetList.length);
+
+		if (container != null) {
+			String aclocalCommand = null;
+			IProject project = getSelectedContainer().getProject();
+			try {
+				aclocalCommand = project.getPersistentProperty(AutotoolsPropertyConstants.ACLOCAL_TOOL);
+			} catch (CoreException e) {
+				// do nothing
+			}
+			
+			// If unset, use default system path
+			if (aclocalCommand == null)
+				aclocalCommand = DEFAULT_COMMAND;
+			
+			executeConsoleCommand(DEFAULT_COMMAND, aclocalCommand,
+					argumentList, execDir);
+		}
+	}
+
+	public void dispose() {
+
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAction.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAction.java
new file mode 100644
index 0000000..600eef7
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAction.java
@@ -0,0 +1,442 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007, 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.StringTokenizer;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.CommandLauncher;
+import org.eclipse.cdt.core.ConsoleOutputStream;
+import org.eclipse.cdt.core.envvar.IEnvironmentVariable;
+import org.eclipse.cdt.core.resources.IConsole;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.core.runtime.jobs.ISchedulingRule;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsNewMakeGenerator;
+import org.eclipse.swt.widgets.Shell;
+
+public abstract class InvokeAction extends AbstractTargetAction {
+
+	protected void showInformation(String title, String content) {
+
+		MessageDialog.openInformation(new Shell(), title, content);
+	}
+
+	protected void showError(String title, String content) {
+
+		MessageDialog.openError(new Shell(), title, content);
+	}
+
+	protected void showSuccess(String title) {
+		MessageDialog.openInformation(new Shell(), title, 
+				InvokeMessages.getString("InvokeAction.success")); //$NON-NLS-1$
+	}
+	
+	protected String showInput(String title, String content, String defaultTxt) {
+		InputDialog getOptionDialog = new InputDialog(new Shell(), title,
+				content, defaultTxt, null);
+
+		getOptionDialog.open();
+
+		return getOptionDialog.getValue();
+	}
+
+	/**
+	 * Separate targets to array from a string.
+	 * 
+	 * @param rawArgList
+	 * @return targets in string[] array. if targets are not formatted properly,
+	 *         returns null
+	 */
+	protected String[] separateTargets(String rawArgList) {
+
+		StringTokenizer st = new StringTokenizer(rawArgList, " "); //$NON-NLS-1$
+		ArrayList<String> targetList = new ArrayList<String>();
+
+		while (st.hasMoreTokens()) {
+			String currentWord = st.nextToken().trim();
+
+			if (currentWord.startsWith("'")) { //$NON-NLS-1$
+				String tmpTarget = ""; //$NON-NLS-1$
+				while (!currentWord.endsWith("'")) { //$NON-NLS-1$
+					tmpTarget += currentWord + " "; //$NON-NLS-1$
+					if (!st.hasMoreTokens()) {
+						// quote not closed properly, so return null
+						return null;
+					}
+					currentWord = st.nextToken().trim();
+				}
+
+				tmpTarget += currentWord;
+				targetList.add(tmpTarget);
+				continue;
+			}
+
+			if (currentWord.startsWith("\"")) { //$NON-NLS-1$
+				String tmpTarget = ""; //$NON-NLS-1$
+				while (!currentWord.endsWith("\"")) { //$NON-NLS-1$
+					tmpTarget += currentWord + " "; //$NON-NLS-1$
+					if (!st.hasMoreTokens()) {
+						// double quote not closed properly, so return null
+						return null;
+					}
+					currentWord = st.nextToken().trim();
+				}
+
+				tmpTarget += currentWord;
+				targetList.add(tmpTarget);
+				continue;
+			}
+
+			// for targets without quote/double quotes.
+			targetList.add(currentWord);
+
+		}
+
+		return (String[])targetList.toArray(new String[targetList.size()]);
+	}
+
+	protected String[] separateOptions(String rawArgList) {
+		ArrayList<String> argList = new ArrayList<String>();
+		// May be multiple user-specified options in which case we
+		// need to split them up into individual options
+		rawArgList = rawArgList.trim();
+		boolean finished = false;
+		int lastIndex = rawArgList.indexOf("--"); //$NON-NLS-1$
+		if (lastIndex != -1) {
+			while (!finished) {
+				int index = rawArgList.indexOf("--", lastIndex + 2); //$NON-NLS-1$
+				if (index != -1) {
+					String previous = rawArgList.substring(lastIndex, index)
+							.trim();
+					argList.add(previous);
+					rawArgList = rawArgList.substring(index);
+				} else {
+					argList.add(rawArgList);
+					finished = true;
+				}
+			}
+		}
+
+		return (String[])argList.toArray(new String[argList.size()]);
+
+	}
+
+	protected String[] simpleParseOptions(String rawArgList) {
+		ArrayList<String> argList = new ArrayList<String>();
+		int lastArgIndex = -1;
+		int i = 0;
+		while (i < rawArgList.length()) {
+			char ch = rawArgList.charAt(i);
+			// Skip white-space
+			while (Character.isWhitespace(ch)) {
+				++i;
+				if (i < rawArgList.length())
+					ch = rawArgList.charAt(i);
+				else // Otherwise we are done
+					return argList.toArray(new String[argList.size()]);
+			}
+
+			// Simplistic parser.  We break up into strings delimited
+			// by blanks.  If quotes are used, we ignore blanks within.
+			// If a backslash is used, we ignore the next character and
+			// pass it through.
+			lastArgIndex = i;
+			boolean inString = false;
+			while (i < rawArgList.length()) {
+				ch = rawArgList.charAt(i);
+				if (ch == '\\') // escape character
+					++i; // skip over the next character
+				else if (ch == '\"') { // double quotes
+					inString = !inString;
+				} else if (Character.isWhitespace(ch)) {
+					if (!inString) {
+						argList.add(rawArgList.substring(lastArgIndex, i));
+						break;
+					}
+				}
+				++i;
+			}
+			// Look for the case where we ran out of chars for the last
+			// token.
+			if (i >= rawArgList.length())
+				argList.add(rawArgList.substring(lastArgIndex));
+			++i;
+		}
+		return argList.toArray(new String[argList.size()]);
+	}
+
+	protected IPath getExecDir(IContainer container) {
+		int type = container.getType();
+		IPath execDir = null;
+		if (type == IContainer.FILE) {
+			execDir = container.getLocation().removeLastSegments(1);
+		} else {
+			execDir = container.getLocation();
+		}
+		return execDir;
+	}
+	
+	protected IPath getCWD(IContainer container) {
+		int type = container.getType();
+		IPath cwd = null;
+		if (type == IContainer.FILE) {
+			cwd = container.getFullPath().removeLastSegments(1);
+		} else {
+			cwd = container.getFullPath();
+		}
+		return cwd;
+	}
+	
+	private class ExecuteProgressDialog implements IRunnableWithProgress {
+		private IPath command;
+		private String[] argumentList;
+		private String[] envList;
+		private IPath execDir;
+		private int status;
+		private HashMap<String, String> outputs = null;
+		
+		public ExecuteProgressDialog(IPath command, String[] argumentList,
+				String[] envList, IPath execDir) {
+			this.command = command;
+			this.argumentList = argumentList;
+			this.envList = envList;
+			this.execDir = execDir;
+		}
+
+		public void run(IProgressMonitor monitor)
+		throws InvocationTargetException, InterruptedException {
+			ByteArrayOutputStream stdout = new ByteArrayOutputStream();
+			ByteArrayOutputStream stderr = new ByteArrayOutputStream();
+			CommandLauncher cmdL = new CommandLauncher();
+			outputs = null;
+
+			// invoke command
+			try {
+				monitor.beginTask(
+						InvokeMessages.getFormattedString("InvokeAction.progress.message", // $NON-NLS-1$
+								new String[]{command.toOSString()}), IProgressMonitor.UNKNOWN);
+				monitor.worked(1);
+				Process process = cmdL.execute(command, argumentList, envList,
+						execDir, new NullProgressMonitor());
+
+				if (cmdL.waitAndRead(stdout, stderr) == CommandLauncher.OK) {
+					try {
+						status = 0;
+						monitor.done();
+						process.getOutputStream().close();
+					} catch (IOException e) {
+						// ignore
+					}
+				} else {
+					// failed to execute command
+					status = -1;
+					monitor.done();
+					return;
+				}
+			} catch (CoreException e) {
+				monitor.done();
+				throw new InvocationTargetException(e);
+			}
+
+			outputs = new HashMap<String, String>();
+
+			outputs.put("stdout", stdout.toString()); //$NON-NLS-1$
+			outputs.put("stderr", stderr.toString()); //$NON-NLS-1$
+
+			try {
+				stdout.close();
+				stderr.close();
+			} catch (IOException e) {
+				// ignore
+			}
+		}
+			
+		public HashMap<String, String> getOutputs() {
+			return outputs;
+		}
+		
+		public int getStatus() {
+			return status;
+		}
+	}
+	
+	
+	protected HashMap<String, String> executeCommand(IPath command,
+			String[] argumentList, String[] envList, IPath execDir) {
+		try {
+			ExecuteProgressDialog d = new ExecuteProgressDialog(command,
+					argumentList, envList, execDir);
+			new ProgressMonitorDialog(new Shell()).run(false, false, d);
+			if (d.getStatus() == -1)
+				showError(InvokeMessages
+					.getString("InvokeAction.execute.windowTitle.error"), InvokeMessages //$NON-NLS-1$
+					.getString("InvokeAction.execute.message") //$NON-NLS-1$
+					+ command.toOSString()); //$NON-NLS-1$
+			return d.getOutputs();
+		} catch (InvocationTargetException e) {
+			showError(InvokeMessages
+					.getString("InvokeAction.execute.windowTitle.error"), InvokeMessages //$NON-NLS-1$
+					.getString("InvokeAction.execute.message") //$NON-NLS-1$
+					+ command.toOSString()); //$NON-NLS-1$
+			AutotoolsUIPlugin.logException(e);
+			return null;
+		} catch (InterruptedException e) {
+		    return null;
+		}
+	}
+
+	protected void executeConsoleCommand(final String actionName, final String command,
+			final String[] argumentList, final IPath execDir) {
+		// We need to use a workspace root scheduling rule because adding MakeTargets
+		// may end up saving the project description which runs under a workspace root rule.
+		final ISchedulingRule rule = ResourcesPlugin.getWorkspace().getRoot();
+
+		Job backgroundJob = new Job(actionName) {
+			/* (non-Javadoc)
+			 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
+			 */
+			protected IStatus run(IProgressMonitor monitor) {
+				try {
+					ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
+
+						public void run(IProgressMonitor monitor) throws CoreException {
+							try {
+								String errMsg = null;
+								IProject project = getSelectedContainer().getProject();
+								// Get a build console for the project
+								IConsole console = CCorePlugin.getDefault().getConsole("org.eclipse.linuxtools.cdt.autotools.ui.autotoolsConsole"); //$NON-NLS-1$
+								console.start(project);
+								ConsoleOutputStream consoleOutStream = console.getOutputStream();
+								// FIXME: we want to remove need for ManagedBuilderManager, but how do we
+								// get environment variables.
+								IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+								IConfiguration cfg = info.getDefaultConfiguration();
+
+								StringBuffer buf = new StringBuffer();
+								String[] consoleHeader = new String[3];
+
+								consoleHeader[0] = actionName;
+								consoleHeader[1] = cfg.getName();
+								consoleHeader[2] = project.getName();
+								buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+								String invokeMsg = InvokeMessages.getFormattedString("InvokeAction.console.message", //$NON-NLS-1$
+										new String[]{actionName, execDir.toString()}); //$NON-NLS-1$
+								buf.append(invokeMsg);
+								buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+								buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+								consoleOutStream.write(buf.toString().getBytes());
+								consoleOutStream.flush();
+								
+								ArrayList<String> additionalEnvs = new ArrayList<String>();
+								String strippedCommand = AutotoolsNewMakeGenerator.stripEnvVars(command, additionalEnvs);
+								// Get a launcher for the config command
+								CommandLauncher launcher = new CommandLauncher();
+								// Set the environment
+								IEnvironmentVariable variables[] = ManagedBuildManager
+										.getEnvironmentVariableProvider().getVariables(cfg, true);
+								String[] env = null;
+								ArrayList<String> envList = new ArrayList<String>();
+								if (variables != null) {
+									for (int i = 0; i < variables.length; i++) {
+										envList.add(variables[i].getName()
+												+ "=" + variables[i].getValue()); //$NON-NLS-1$
+									}
+									if (additionalEnvs.size() > 0)
+										envList.addAll(additionalEnvs); // add any additional environment variables specified ahead of script
+									env = (String[]) envList.toArray(new String[envList.size()]);
+								}
+								OutputStream stdout = consoleOutStream;
+								OutputStream stderr = consoleOutStream;
+
+								launcher.showCommand(true);
+								// Run the shell script via shell command.
+								Process proc = launcher.execute(new Path(strippedCommand), argumentList, env,
+										execDir, new NullProgressMonitor());
+								if (proc != null) {
+									try {
+										// Close the input of the process since we will never write to
+										// it
+										proc.getOutputStream().close();
+									} catch (IOException e) {
+									}
+
+									if (launcher.waitAndRead(stdout, stderr, new SubProgressMonitor(
+											monitor, IProgressMonitor.UNKNOWN)) != CommandLauncher.OK) {
+										errMsg = launcher.getErrorMessage();
+									}
+
+									// Force a resync of the projects without allowing the user to
+									// cancel.
+									// This is probably unkind, but short of this there is no way to
+									// ensure
+									// the UI is up-to-date with the build results
+									// monitor.subTask(ManagedMakeMessages
+									// .getResourceString(REFRESH));
+									monitor.subTask(AutotoolsUIPlugin.getResourceString("MakeGenerator.refresh")); //$NON-NLS-1$
+									try {
+										project.refreshLocal(IResource.DEPTH_INFINITE, null);
+									} catch (CoreException e) {
+										monitor.subTask(AutotoolsUIPlugin
+												.getResourceString("MakeGenerator.refresh.error")); //$NON-NLS-1$
+									}
+								} else {
+									errMsg = launcher.getErrorMessage();
+								}
+								
+								if (errMsg != null)
+									AutotoolsUIPlugin.logErrorMessage(errMsg);
+								
+							} catch (IOException e) {
+								AutotoolsUIPlugin.log(e);
+							}
+						}
+					}, rule, IWorkspace.AVOID_UPDATE, monitor);
+				} catch (CoreException e) {
+					return e.getStatus();
+				}
+				IStatus returnStatus = Status.OK_STATUS;
+				return returnStatus;
+			}
+		};
+
+		backgroundJob.setRule(rule);
+		backgroundJob.schedule();
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutoconfAction.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutoconfAction.java
new file mode 100644
index 0000000..81e323c
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutoconfAction.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+
+
+/**
+ * Class responsible for invoking autoconf.
+ * 
+ * @author klee
+ * 
+ */
+public class InvokeAutoconfAction extends InvokeAction {
+
+	private final static String DEFAULT_COMMAND = "autoconf"; //$NON-NLS-1$
+	public void run(IAction action) {
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+		
+		IPath execDir = getExecDir(container);
+
+		if (container != null) {
+			IProject project = container.getProject();
+			String autoconfCommand = null;
+			try {
+				autoconfCommand = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_TOOL);
+			} catch (CoreException e) {
+				// do nothing
+			}
+			
+			// If unset for the project, default to system path
+			if (autoconfCommand == null)
+				autoconfCommand = DEFAULT_COMMAND;
+			
+			executeConsoleCommand(DEFAULT_COMMAND, autoconfCommand, new String[]{}, execDir);
+		}
+	}
+
+
+	public void dispose() {
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutoheaderAction.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutoheaderAction.java
new file mode 100644
index 0000000..8c4e577
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutoheaderAction.java
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+import org.eclipse.swt.widgets.Shell;
+
+
+public class InvokeAutoheaderAction extends InvokeAction {
+
+	private static final String DEFAULT_OPTION = ""; //$NON-NLS-1$
+	private static final String DEFAULT_COMMAND = "autoheader"; //$NON-NLS-1$
+
+	public void run(IAction action) {
+
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+		
+		IPath execDir = getExecDir(container);
+		String cwd = InvokeMessages.getString("CWD") + getCWD(container); //$NON-NLS-1$
+
+		InputDialog optionDialog = new SingleInputDialog(
+				new Shell(),
+				cwd,
+				InvokeMessages
+						.getString("InvokeAutoheaderAction.windowTitle.options"), //$NON-NLS-1$
+				InvokeMessages
+						.getString("InvokeAutoheaderAction.message.options.otherOptions"), //$NON-NLS-1$
+				DEFAULT_OPTION, null);
+		optionDialog.open();
+
+		// chop args into string array
+		String rawArgList = optionDialog.getValue();
+
+		String[] optionsList = simpleParseOptions(rawArgList);
+
+		String[] argumentList = new String[optionsList.length];
+
+		System.arraycopy(optionsList, 0, argumentList, 0, optionsList.length);
+
+		if (container != null) {
+			String autoheaderCommand = null;
+			IProject project = getSelectedContainer().getProject();
+			try {
+				autoheaderCommand = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOHEADER_TOOL);
+			} catch (CoreException e) {
+				// do nothing
+			}
+			
+			// If unset, use default system path
+			if (autoheaderCommand == null)
+				autoheaderCommand = DEFAULT_COMMAND;
+			
+			executeConsoleCommand(DEFAULT_COMMAND, autoheaderCommand,
+					argumentList, execDir);
+		}
+
+	}
+
+	public void dispose() {
+
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutomakeAction.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutomakeAction.java
new file mode 100644
index 0000000..8210cd9
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutomakeAction.java
@@ -0,0 +1,98 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+import org.eclipse.swt.widgets.Shell;
+
+
+/**
+ * Class responsible for invoking automake.
+ * 
+ * @author klee
+ * 
+ */
+public class InvokeAutomakeAction extends InvokeAction {
+
+	private static final String DEFAULT_OPTION = ""; //$NON-NLS-1$
+	private static final String DEFAULT_COMMAND = "automake"; //$NON-NLS-1$
+
+	public void run(IAction action) {
+
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+		
+		IPath execDir = getExecDir(container);
+		String cwd = InvokeMessages.getString("CWD") + getCWD(container); //$NON-NLS-1$
+;
+		TwoInputDialog optionDialog = new TwoInputDialog(new Shell(), cwd,
+		InvokeMessages
+		.getString("InvokeAutomakeAction.windowTitle.options"), //$NON-NLS-1$
+InvokeMessages
+		.getString("InvokeAutomakeAction.message.options.otherOptions"),InvokeMessages //$NON-NLS-1$
+		.getString("InvokeAutomakeAction.message.options.makeTargets"), DEFAULT_OPTION, null); //$NON-NLS-1$
+		
+		optionDialog.open();
+		
+		// chop args into string array
+		String rawArgList = optionDialog.getValue();
+
+		String[] optionsList = separateOptions(rawArgList);
+
+
+		// chop args into string array
+		rawArgList = optionDialog.getSecondValue();
+
+		String[] targetList = separateTargets(rawArgList);
+		
+		if (targetList == null) {
+
+			showError(InvokeMessages.getString("InvokeAction.execute.windowTitle.error"), //$NON-NLS-1$
+					InvokeMessages.getString("InvokeAction.windowTitle.quoteError")); //$NON-NLS-1$
+			return;
+		}
+
+		String[] argumentList = new String[targetList.length
+				+ optionsList.length];
+
+		System.arraycopy(optionsList, 0, argumentList, 0, optionsList.length);
+		System.arraycopy(targetList, 0, argumentList, optionsList.length,
+				targetList.length);
+
+		if (container != null) {
+			IProject project = container.getProject();
+			String automakeCommand = null;
+			try {
+				automakeCommand = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_TOOL);
+			} catch (CoreException e) {
+				// do nothing
+			}
+			
+			// If automake path not set for the project, default to system path
+			if (automakeCommand == null)
+				automakeCommand = DEFAULT_COMMAND;
+
+			executeConsoleCommand(DEFAULT_COMMAND, automakeCommand,
+					argumentList, execDir);
+		}
+	}
+
+	public void dispose() {
+
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutoreconfAction.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutoreconfAction.java
new file mode 100644
index 0000000..ade71d9
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutoreconfAction.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+import org.eclipse.swt.widgets.Shell;
+
+
+public class InvokeAutoreconfAction extends InvokeAction {
+
+	private static final String DEFAULT_OPTION = ""; //$NON-NLS-1$
+	private static final String DEFAULT_COMMAND = "autoreconf"; //$NON-NLS-1$
+
+	public void run(IAction action) {
+
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+		
+		IPath execDir = getExecDir(container);
+		String cwd = InvokeMessages.getString("CWD") + getCWD(container); //$NON-NLS-1$
+
+		InputDialog optionDialog = new SingleInputDialog(
+				new Shell(),
+				cwd,
+				InvokeMessages
+						.getString("InvokeAutoreconfAction.windowTitle.options"), //$NON-NLS-1$
+				InvokeMessages
+						.getString("InvokeAutoreconfAction.message.options.otherOptions"), //$NON-NLS-1$
+				DEFAULT_OPTION, null);
+		optionDialog.open();
+
+		// chop args into string array
+		String rawArgList = optionDialog.getValue();
+
+		String[] optionsList = simpleParseOptions(rawArgList);
+
+		String[] argumentList = new String[optionsList.length];
+
+		System.arraycopy(optionsList, 0, argumentList, 0, optionsList.length);
+
+		if (container != null) {
+			String autoreconfCommand = null;
+			IProject project = getSelectedContainer().getProject();
+			try {
+				autoreconfCommand = project.getPersistentProperty(AutotoolsPropertyConstants.AUTORECONF_TOOL);
+			} catch (CoreException e) {
+				// do nothing
+			}
+			
+			// If unset, use default system path
+			if (autoreconfCommand == null)
+				autoreconfCommand = DEFAULT_COMMAND;
+			
+			executeConsoleCommand(DEFAULT_COMMAND, autoreconfCommand,
+					argumentList, execDir);
+		}
+	}
+
+	public void dispose() {
+
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeLibtoolizeAction.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeLibtoolizeAction.java
new file mode 100644
index 0000000..02ec65d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeLibtoolizeAction.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+import org.eclipse.swt.widgets.Shell;
+
+
+public class InvokeLibtoolizeAction extends InvokeAction {
+
+	private static final String DEFAULT_OPTION = ""; //$NON-NLS-1$
+	private static final String DEFAULT_COMMAND = "libtoolize"; //$NON-NLS-1$
+
+	public void run(IAction action) {
+
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+		
+		IPath execDir = getExecDir(container);
+		String cwd = InvokeMessages.getString("CWD") + getCWD(container); //$NON-NLS-1$
+
+		InputDialog optionDialog = new SingleInputDialog(
+				new Shell(),
+				cwd,
+				InvokeMessages
+						.getString("InvokeLibtoolizeAction.windowTitle.options"), //$NON-NLS-1$
+				InvokeMessages
+						.getString("InvokeLibtoolizeAction.message.options.otherOptions"), //$NON-NLS-1$
+				DEFAULT_OPTION, null);
+		optionDialog.open();
+
+		// chop args into string array
+		String rawArgList = optionDialog.getValue();
+
+		String[] optionsList = simpleParseOptions(rawArgList);
+
+		String[] argumentList = new String[optionsList.length];
+
+		System.arraycopy(optionsList, 0, argumentList, 0, optionsList.length);
+
+		if (container != null) {
+			String libtoolizeCommand = null;
+			IProject project = getSelectedContainer().getProject();
+			try {
+				libtoolizeCommand = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOHEADER_TOOL);
+			} catch (CoreException e) {
+				// do nothing
+			}
+			
+			// If unset, use default system path
+			if (libtoolizeCommand == null)
+				libtoolizeCommand = DEFAULT_COMMAND;
+			
+			executeConsoleCommand(DEFAULT_COMMAND, libtoolizeCommand,
+					argumentList, execDir);
+		}
+	}
+
+	public void dispose() {
+
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeMessages.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeMessages.java
new file mode 100644
index 0000000..5a3710c
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeMessages.java
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007, 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class InvokeMessages {
+	private static final String BUNDLE_NAME = InvokeMessages.class.getName();
+
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
+			.getBundle(BUNDLE_NAME);
+
+	private InvokeMessages() {
+	}
+
+	/**
+	 * Returns the string from the resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @return the resource bundle message
+	 */
+	public static String getString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+	
+	/**
+	 * Returns the formatted string from the resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @param args an array of substituition strings
+	 * @return the resource bundle message
+	 */
+	public static String getFormattedString(String key, String[] args) {
+		return MessageFormat.format(getString(key), (Object[])args);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeMessages.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeMessages.properties
new file mode 100644
index 0000000..b2da117
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeMessages.properties
@@ -0,0 +1,56 @@
+#################################################################################
+#  Copyright (c) 2006, 2007, 2009 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+# 
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+CWD=Working Directory:
+
+InvokeAction.windowTitle.quoteError=Quote/Double quote not correct
+InvokeAction.progress.message=Running {0}
+InvokeAction.execute.windowTitle.error=Invoke Action Error
+InvokeAction.execute.message=Couldn't execute command :
+InvokeAction.success=Command executed successfully
+InvokeAction.console.message=Invoking {0} in {1}
+
+
+InvokeAutoconfAction.command=Running autoconf in {0} 
+InvokeAutoconfAction.windowTitle.stdout=Invoke Autoconf - Output
+InvokeAutoconfAction.windowTitle.stderr=Invoke Autoconf - Error
+
+
+InvokeAutomakeAction.command=Running automake
+InvokeAutomakeAction.windowTitle.options=Automake Options
+InvokeAutomakeAction.message.options.makeTargets=Enter targets separated by space :
+InvokeAutomakeAction.message.options.otherOptions=Enter options separated by space :
+InvokeAutomakeAction.windowTitle.stdout=Invoke Automake - Output
+InvokeAutomakeAction.windowTitle.stderr=Invoke Automake - Error
+
+InvokeAutoheaderAction.command=Running autoheader
+InvokeAutoheaderAction.windowTitle.options=Autoheader Options
+InvokeAutoheaderAction.message.options.otherOptions=Enter options separated by space :
+InvokeAutoheaderAction.windowTitle.stdout=Invoke Autoheader - Output
+InvokeAutoheaderAction.windowTitle.stderr=Invoke Autoheader - Error
+
+InvokeAutoreconfAction.command=Running autoreconf
+InvokeAutoreconfAction.windowTitle.options=Autoreconf Options
+InvokeAutoreconfAction.message.options.otherOptions=Enter options separated by space :
+InvokeAutoreconfAction.windowTitle.stdout=Invoke Autoreconf - Output
+InvokeAutoreconfAction.windowTitle.stderr=Invoke Autoreconf - Error
+
+InvokeAclocalAction.command=Running aclocal
+InvokeAclocalAction.windowTitle.options=Aclocal Options
+InvokeAclocalAction.message.options.includeDir=Add directory to search list for .m4 files :
+InvokeAclocalAction.message.options.otherOptions=Enter options separated by space :
+InvokeAclocalAction.windowTitle.stdout=Invoke Automake - Output
+InvokeAclocalAction.windowTitle.stderr=Invoke Automake - Error
+
+InvokeLibtoolizeAction.command=Running libtoolize
+InvokeLibtoolizeAction.windowTitle.options=Libtoolize Options
+InvokeLibtoolizeAction.message.options.otherOptions=Enter options separated by space :
+InvokeLibtoolizeAction.windowTitle.stdout=Invoke Libtoolize - Output
+InvokeLibtoolizeAction.windowTitle.stderr=Invoke Libtoolize - Error
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/LibtoolizeHandler.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/LibtoolizeHandler.java
new file mode 100644
index 0000000..c2d6faf
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/LibtoolizeHandler.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+/**
+ * @author Jeff Johnston
+ *
+ */
+public class LibtoolizeHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		InvokeLibtoolizeAction a = new InvokeLibtoolizeAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/ReconfigureAction.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/ReconfigureAction.java
new file mode 100644
index 0000000..6ab2eb7
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/ReconfigureAction.java
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.ISchedulingRule;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsNewMakeGenerator;
+
+
+public class ReconfigureAction extends InvokeAction {
+
+	public void run(IAction action) {
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+
+		// We need to use a workspace root scheduling rule because adding MakeTargets
+		// may end up saving the project description which runs under a workspace root rule.
+		final ISchedulingRule rule = ResourcesPlugin.getWorkspace().getRoot();
+		
+		Job backgroundJob = new Job("Reconfigure Action"){  //$NON-NLS-1$
+			/* (non-Javadoc)
+			 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
+			 */
+			protected IStatus run(IProgressMonitor monitor) {
+				try {
+					ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
+
+						public void run(IProgressMonitor monitor) throws CoreException {
+							IProject project = getSelectedContainer().getProject();
+							AutotoolsNewMakeGenerator m = new AutotoolsNewMakeGenerator();
+							IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+							m.initialize(project, info, monitor);
+							try {
+								m.reconfigure();
+							} catch (CoreException e) {
+								// do nothing for now
+							}
+						}
+					}, rule, IWorkspace.AVOID_UPDATE, monitor);
+				} catch (CoreException e) {
+					return e.getStatus();
+				}
+				IStatus returnStatus = Status.OK_STATUS;
+				return returnStatus;
+			}
+		};
+
+		backgroundJob.setRule(rule);
+		backgroundJob.schedule();
+	}
+
+	public void dispose() {
+
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/ReconfigureHandler.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/ReconfigureHandler.java
new file mode 100644
index 0000000..586c5fa
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/ReconfigureHandler.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+/**
+ * @author Jeff Johnston
+ *
+ */
+public class ReconfigureHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		ReconfigureAction a = new ReconfigureAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/SingleInputDialog.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/SingleInputDialog.java
new file mode 100644
index 0000000..a7342f5
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/SingleInputDialog.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+
+public class SingleInputDialog extends InputDialog {
+	
+	private String firstMessage;
+
+	public SingleInputDialog(Shell parentShell, String firstMessage, String dialogTitle,
+			String dialogMessage, String initialValue,
+			IInputValidator validator) {
+		super(parentShell, dialogTitle, dialogMessage, initialValue, validator);
+
+		this.firstMessage = firstMessage;
+	}
+
+	/*
+	 * (non-Javadoc) Method declared on Dialog.
+	 */
+	protected void buttonPressed(int buttonId) {
+		super.buttonPressed(buttonId);
+	}
+
+	protected Control createDialogArea(Composite parent) {
+
+		// create composite
+		Composite composite = (Composite) super.createDialogArea(parent);
+
+		CLabel label0 = new CLabel(composite, SWT.WRAP);
+		label0.setText(firstMessage);
+		GridData data = new GridData(GridData.GRAB_HORIZONTAL
+				| GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL
+				| GridData.VERTICAL_ALIGN_CENTER);
+		data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
+		label0.setLayoutData(data);
+		label0.setFont(parent.getFont());
+
+		// remove error message dialog from focusing.
+		composite.getTabList()[2].setVisible(false);
+		composite.getTabList()[2].setEnabled(false);
+
+		return composite;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/TwoInputDialog.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/TwoInputDialog.java
new file mode 100644
index 0000000..5d1654c
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/TwoInputDialog.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+
+public class TwoInputDialog extends InputDialog {
+
+	private Text secondText;
+
+	private String secondValue;
+
+	private String secondMessage;
+	
+	private String firstMessage;
+
+	public TwoInputDialog(Shell parentShell, String firstMessage, String dialogTitle,
+			String dialogMessage, String secondMessage, String initialValue,
+			IInputValidator validator) {
+		super(parentShell, dialogTitle, dialogMessage, initialValue, validator);
+
+		this.firstMessage = firstMessage;
+		this.secondMessage = secondMessage;
+	}
+
+	/*
+	 * (non-Javadoc) Method declared on Dialog.
+	 */
+	protected void buttonPressed(int buttonId) {
+		if (buttonId == IDialogConstants.OK_ID) {
+			secondValue = secondText.getText();
+		} else {
+			secondValue = null;
+		}
+		super.buttonPressed(buttonId);
+	}
+
+	protected Control createDialogArea(Composite parent) {
+
+		// create composite
+		Composite composite = (Composite) super.createDialogArea(parent);
+
+		CLabel label0 = new CLabel(composite, SWT.WRAP);
+		label0.setText(firstMessage);
+		Label label = new Label(composite, SWT.WRAP);
+		label.setText(secondMessage);
+		GridData data = new GridData(GridData.GRAB_HORIZONTAL
+				| GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL
+				| GridData.VERTICAL_ALIGN_CENTER);
+		data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
+		label0.setLayoutData(data);
+		label0.setFont(parent.getFont());
+		label.setLayoutData(data);
+		label.setFont(parent.getFont());
+		
+
+		secondText = new Text(composite, SWT.SINGLE | SWT.BORDER);
+		secondText.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL
+				| GridData.HORIZONTAL_ALIGN_FILL));
+		secondText.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				validateInput();
+			}
+		});
+
+		// remove error message dialog from focusing.
+		composite.getTabList()[2].setVisible(false);
+		composite.getTabList()[2].setEnabled(false);
+
+		return composite;
+	}
+
+	/**
+	 * Returns the text area.
+	 * 
+	 * @return the text area
+	 */
+	protected Text getSecondText() {
+		return secondText;
+	}
+
+	/**
+	 * Returns the string typed into this input dialog.
+	 * 
+	 * @return the input string
+	 */
+	public String getSecondValue() {
+		return secondValue;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/autoconf/ProjectionFileUpdater.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/autoconf/ProjectionFileUpdater.java
new file mode 100644
index 0000000..0d55552
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/autoconf/ProjectionFileUpdater.java
@@ -0,0 +1,424 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ * Red Hat Inc. - convert to use with Autoconf Editor
+ * Ed Swartz (NOKIA) - refactoring
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.autoconf;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.Position;
+import org.eclipse.jface.text.source.Annotation;
+import org.eclipse.jface.text.source.IAnnotationModel;
+import org.eclipse.jface.text.source.projection.IProjectionListener;
+import org.eclipse.jface.text.source.projection.ProjectionAnnotation;
+import org.eclipse.jface.text.source.projection.ProjectionAnnotationModel;
+import org.eclipse.jface.text.source.projection.ProjectionViewer;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.AutoconfEditor;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfCaseElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfElifElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfElseElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfForElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfIfElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfMacroArgumentElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfMacroElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfRootElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfSelectElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfUntilElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfWhileElement;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.IReconcilingParticipant;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutotoolsEditorPreferenceConstants;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+
+
+/**
+ * ProjectionMakefileUpdater
+ */
+public class ProjectionFileUpdater implements IProjectionListener {
+
+	private static class AutoconfProjectionAnnotation extends ProjectionAnnotation {
+		
+		private AutoconfElement fElement;
+		private boolean fIsComment;
+		
+		public AutoconfProjectionAnnotation(AutoconfElement element, boolean isCollapsed, boolean isComment) {
+			super(isCollapsed);
+			fElement = element;
+			fIsComment = isComment;
+		}
+		
+		public AutoconfElement getElement() {
+			return fElement;
+		}
+		
+		public void setElement(AutoconfElement element) {
+			fElement = element;
+		}
+		
+		public boolean isComment() {
+			return fIsComment;
+		}
+		
+	}
+	
+
+	public void install(AutoconfEditor editor, ProjectionViewer viewer) {
+		fEditor= editor;
+		fViewer= viewer;
+		fViewer.addProjectionListener(this);
+	}
+	
+	public void uninstall() {
+		if (isInstalled()) {
+			projectionDisabled();
+			fViewer.removeProjectionListener(this);
+			fViewer= null;
+			fEditor= null;
+		}
+	}
+	
+	protected boolean isInstalled() {
+		return fEditor != null;
+	}
+
+	private class ReconcilerParticipant implements IReconcilingParticipant {
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.IReconcilingParticipant#reconciled()
+		 */
+		public void reconciled() {
+			processReconcile();
+		}
+	}
+
+	private IDocument fCachedDocument;
+	private AutoconfEditor fEditor;
+	private ProjectionViewer fViewer;
+	private IReconcilingParticipant fParticipant;
+
+	private boolean fAllowCollapsing = false;
+	private boolean fCollapseMacroDef = false;
+	private boolean fCollapseCase = false;
+	private boolean fCollapseConditional = false;
+	private boolean fCollapseLoop = false;
+
+	/*
+	 * @see org.eclipse.jface.text.source.projection.IProjectionListener#projectionEnabled()
+	 */
+	public void projectionEnabled() {
+		// http://home.ott.oti.com/teams/wswb/anon/out/vms/index.html
+		// projectionEnabled messages are not always paired with projectionDisabled
+		// i.e. multiple enabled messages may be sent out.
+		// we have to make sure that we disable first when getting an enable
+		// message.
+		projectionDisabled();
+		
+		initialize();			
+		fParticipant= new ReconcilerParticipant();
+		fEditor.addReconcilingParticipant(fParticipant);
+	}
+	
+	/*
+	 * @see org.eclipse.jface.text.source.projection.IProjectionListener#projectionDisabled()
+	 */
+	public void projectionDisabled() {
+		fCachedDocument= null;
+		if (fParticipant != null) {
+			fEditor.addReconcilingParticipant(fParticipant);
+			fParticipant= null;
+		}
+	}
+		
+	public void initialize() {
+		
+		if (!isInstalled())
+			return;
+		
+		initializePreferences();
+		
+		try {
+			
+			IDocumentProvider provider= fEditor.getDocumentProvider();
+			fCachedDocument= provider.getDocument(fEditor.getEditorInput());
+			fAllowCollapsing= true;
+			
+//			IWorkingCopyManager manager= AutomakeEditorFactory.getDefault().getWorkingCopyManager();
+			AutoconfElement fInput= fEditor.getRootElement();
+			
+			if (fInput != null) {
+				ProjectionAnnotationModel model= (ProjectionAnnotationModel) fEditor.getAdapter(ProjectionAnnotationModel.class);
+				if (model != null) {
+					Map<AutoconfProjectionAnnotation, Position> additions= computeAdditions(fInput);
+					model.removeAllAnnotations();
+					model.replaceAnnotations(null, additions);
+				}
+			}
+			
+		} finally {
+			fCachedDocument= null;
+			fAllowCollapsing= false;
+		}
+	}
+
+	private void initializePreferences() {
+		//FIXME: what to do with Makefile editor preferences
+		IPreferenceStore store = AutotoolsPlugin.getDefault().getPreferenceStore();
+		fCollapseMacroDef = store.getBoolean(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_MACRODEF);
+		fCollapseCase = store.getBoolean(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_CASE);
+		fCollapseConditional = store.getBoolean(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_CONDITIONAL);
+		fCollapseLoop = store.getBoolean(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_LOOP);
+	}
+
+	private Map<AutoconfProjectionAnnotation, Position> computeAdditions(AutoconfElement root) {
+		Map<AutoconfProjectionAnnotation, Position> map= new HashMap<AutoconfProjectionAnnotation, Position>();
+		if (root instanceof AutoconfRootElement)
+			computeAdditions(root.getChildren(), map);
+		return map;
+	}
+
+	private void computeAdditions(Object[] elements, Map<AutoconfProjectionAnnotation, Position> map) {
+		for (int i= 0; i < elements.length; i++) {
+			AutoconfElement element= (AutoconfElement)elements[i];
+			
+			computeAdditions(element, map);
+			
+			if (element.hasChildren()) {				
+				computeAdditions(element.getChildren(), map);
+			}
+		}
+	}
+
+	private void computeAdditions(AutoconfElement element, Map<AutoconfProjectionAnnotation, Position> map) {
+		
+		boolean createProjection= false;
+		
+		@SuppressWarnings("unused")
+		boolean collapse= false;
+			
+		if (element instanceof AutoconfIfElement ||
+				element instanceof AutoconfElseElement ||
+				element instanceof AutoconfElifElement) {
+			collapse= fAllowCollapsing && fCollapseConditional;
+			createProjection= true;
+		} else if (element instanceof AutoconfMacroElement) {
+			collapse= fAllowCollapsing && fCollapseMacroDef;
+			createProjection= true;
+		} else if (element instanceof AutoconfMacroArgumentElement) {
+			collapse= fAllowCollapsing && fCollapseMacroDef;
+			createProjection= true;
+		} else if (element instanceof AutoconfCaseElement) {
+			collapse= fAllowCollapsing && fCollapseCase;
+			createProjection= true;
+		} else if (element instanceof AutoconfForElement ||
+				element instanceof AutoconfWhileElement ||
+				element instanceof AutoconfUntilElement ||
+				element instanceof AutoconfSelectElement) {
+			collapse = fAllowCollapsing && fCollapseLoop;
+			createProjection = true;
+		}
+	
+		if (createProjection) {
+			Position position= createProjectionPosition(element);
+			if (position != null) {
+				map.put(new AutoconfProjectionAnnotation(element, fAllowCollapsing, true), position);
+			}
+		}
+	}
+
+	private Position createProjectionPosition(AutoconfElement element) {
+		if (fCachedDocument == null)
+			return null;
+		int offset = 0;
+		try {
+			int startLine = 0;
+			int endLine = 0;
+			startLine = fCachedDocument.getLineOfOffset(element.getStartOffset());
+			endLine = fCachedDocument.getLineOfOffset(element.getEndOffset());
+
+			if (startLine != endLine) {
+				offset= fCachedDocument.getLineOffset(startLine);
+				int endOffset = fCachedDocument.getLineOffset(endLine) + fCachedDocument.getLineLength(endLine);
+				return new Position(offset, endOffset - offset);
+			}
+		} catch (BadLocationException x) {
+			// We should only get here if we try and read the line past EOF
+			return new Position(offset, fCachedDocument.getLength() - 1);
+		}
+		return null;
+	}
+
+	public void processReconcile() {
+		if (!isInstalled())
+			return;
+		
+		ProjectionAnnotationModel model= (ProjectionAnnotationModel) fEditor.getAdapter(ProjectionAnnotationModel.class);
+		if (model == null)
+			return;
+		
+		try {
+			IDocumentProvider provider= fEditor.getDocumentProvider();
+			fCachedDocument= provider.getDocument(fEditor.getEditorInput());
+			fAllowCollapsing= false;
+			
+			Map<AutoconfProjectionAnnotation, Position> additions= new HashMap<AutoconfProjectionAnnotation, Position>();
+			List<AutoconfProjectionAnnotation> deletions= new ArrayList<AutoconfProjectionAnnotation>();
+			List<AutoconfProjectionAnnotation> updates = new ArrayList<AutoconfProjectionAnnotation>();
+			
+			Map<AutoconfProjectionAnnotation, Position> updated= computeAdditions(fEditor.getRootElement());
+			
+			Map<AutoconfElement, List<AutoconfProjectionAnnotation>> previous= createAnnotationMap(model);
+			
+			
+			Iterator<AutoconfProjectionAnnotation> e= updated.keySet().iterator();
+			while (e.hasNext()) {
+				AutoconfProjectionAnnotation annotation= (AutoconfProjectionAnnotation) e.next();
+				AutoconfElement element= annotation.getElement();
+				Position position= (Position) updated.get(annotation);
+				
+				List<AutoconfProjectionAnnotation> annotations= previous.get(element);
+				if (annotations == null) {
+					additions.put(annotation, position);
+				} else {
+					Iterator<AutoconfProjectionAnnotation> x= annotations.iterator();
+					while (x.hasNext()) {
+						AutoconfProjectionAnnotation a= (AutoconfProjectionAnnotation) x.next();
+						if (annotation.isComment() == a.isComment()) {
+							Position p= model.getPosition(a);
+							if (p != null && !position.equals(p)) {
+								p.setOffset(position.getOffset());
+								p.setLength(position.getLength());
+								updates.add(a);
+							}
+							x.remove();
+							break;
+						}
+					}
+										
+					if (annotations.isEmpty())
+						previous.remove(element);
+				}
+			}
+			
+			Iterator<List<AutoconfProjectionAnnotation>> e2 = previous.values().iterator();
+			while (e2.hasNext()) {
+				List<AutoconfProjectionAnnotation> list= e2.next();
+				int size= list.size();
+				for (int i= 0; i < size; i++)
+					deletions.add(list.get(i));
+			}
+
+			match(model, deletions, additions, updates);
+
+			Annotation[] removals= new Annotation[deletions.size()];
+			deletions.toArray(removals);
+			Annotation[] changes= new Annotation[updates.size()];
+			updates.toArray(changes);
+			model.modifyAnnotations(removals, additions, changes);
+			
+		} finally {
+			fCachedDocument= null;
+			fAllowCollapsing= true;
+		}
+	}
+
+	private void match(ProjectionAnnotationModel model, List<AutoconfProjectionAnnotation> deletions, Map<AutoconfProjectionAnnotation, Position> additions, List<AutoconfProjectionAnnotation> changes) {
+		if (deletions.isEmpty() || (additions.isEmpty() && changes.isEmpty()))
+			return;
+		
+		List<AutoconfProjectionAnnotation> newDeletions= new ArrayList<AutoconfProjectionAnnotation>();
+		List<AutoconfProjectionAnnotation> newChanges= new ArrayList<AutoconfProjectionAnnotation>();
+		
+		Iterator<AutoconfProjectionAnnotation> deletionIterator= deletions.iterator();
+		outer: while (deletionIterator.hasNext()) {
+			AutoconfProjectionAnnotation deleted= (AutoconfProjectionAnnotation) deletionIterator.next();
+			Position deletedPosition= model.getPosition(deleted);
+			if (deletedPosition == null)
+				continue;
+			
+			Iterator<AutoconfProjectionAnnotation> changesIterator= changes.iterator();
+			while (changesIterator.hasNext()) {
+				AutoconfProjectionAnnotation changed= (AutoconfProjectionAnnotation) changesIterator.next();
+				if (deleted.isComment() == changed.isComment()) {
+					Position changedPosition= model.getPosition(changed);
+					if (changedPosition == null)
+						continue;
+					
+					if (deletedPosition.getOffset() == changedPosition.getOffset()) {
+						
+						deletedPosition.setLength(changedPosition.getLength());
+						deleted.setElement(changed.getElement());
+						
+						deletionIterator.remove();
+						newChanges.add(deleted);
+						
+						changesIterator.remove();
+						newDeletions.add(changed);
+						
+						continue outer;
+					}
+				}
+			}
+			
+			Iterator<AutoconfProjectionAnnotation> additionsIterator= additions.keySet().iterator();
+			while (additionsIterator.hasNext()) {
+				AutoconfProjectionAnnotation added= (AutoconfProjectionAnnotation) additionsIterator.next();
+				if (deleted.isComment() == added.isComment()) {
+					Position addedPosition= (Position) additions.get(added);
+					
+					if (deletedPosition.getOffset() == addedPosition.getOffset()) {
+						
+						deletedPosition.setLength(addedPosition.getLength());
+						deleted.setElement(added.getElement());
+						
+						deletionIterator.remove();
+						newChanges.add(deleted);
+						
+						additionsIterator.remove();
+						
+						break;
+					}
+				}
+			}
+		}
+		
+		deletions.addAll(newDeletions);
+		changes.addAll(newChanges);
+	}
+
+	@SuppressWarnings("unchecked")
+	private Map<AutoconfElement, List<AutoconfProjectionAnnotation>> createAnnotationMap(IAnnotationModel model) {
+		Map<AutoconfElement, List<AutoconfProjectionAnnotation>> map= new HashMap<AutoconfElement, List<AutoconfProjectionAnnotation>>();
+		Iterator e= model.getAnnotationIterator();
+		while (e.hasNext()) {
+			Object annotation= e.next();
+			if (annotation instanceof AutoconfProjectionAnnotation) {
+				AutoconfProjectionAnnotation directive= (AutoconfProjectionAnnotation) annotation;
+				List<AutoconfProjectionAnnotation> list= map.get(directive.getElement());
+				if (list == null) {
+					list= new ArrayList<AutoconfProjectionAnnotation>(2);
+					map.put(directive.getElement(), list);
+				}
+				list.add(directive);
+			}
+		}
+		return map;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AbstractElementListSelectionDialog.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AbstractElementListSelectionDialog.java
new file mode 100644
index 0000000..f63da33
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AbstractElementListSelectionDialog.java
@@ -0,0 +1,283 @@
+/*******************************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+
+/**
+ * A class to select one or more elements out of an indexed property
+ */
+public abstract class AbstractElementListSelectionDialog extends SelectionStatusDialog {
+	
+	private ILabelProvider fRenderer;
+	private boolean fIgnoreCase;
+	private boolean fIsMultipleSelection;
+	
+	private SelectionList fSelectionList;
+	private Label fMessage;
+	private ISelectionValidator fValidator;	
+	
+	private String fMessageText;
+	private String fEmptyListMessage;
+	private String fNothingSelectedMessage;
+	
+	private StatusInfo fCurrStatus;
+	
+	/*
+	 * @private
+	 */
+	protected void access$superOpen() {
+		super.open();
+	}
+	/*
+	 * @private
+	 * @see Dialog#cancelPressed
+	 */
+	protected void cancelPressed() {
+		setResult(null);
+		super.cancelPressed();
+	}
+	protected Point computeInitialSize() {
+		return new Point(convertWidthInCharsToPixels(60), convertHeightInCharsToPixels(18));
+	}
+	/*
+	 * @private
+	 * @see Window#createDialogArea(Composite)
+	 */
+	protected Control createDialogArea(Composite parent) {
+		Composite contents= (Composite)super.createDialogArea(parent);
+		
+		fMessage= createMessage(contents);
+		
+		int flags= fIsMultipleSelection ? SWT.MULTI : SWT.SINGLE;			
+		fSelectionList= new SelectionList(contents, flags | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL,
+			fRenderer, fIgnoreCase);
+		
+		fSelectionList.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+				handleDoubleClick();
+			}
+			public void widgetSelected(SelectionEvent e) {
+				verifyCurrentSelection();
+			}
+		});
+
+		GridData spec= new GridData();
+		Point initialSize= computeInitialSize();
+		spec.widthHint= initialSize.x;
+		spec.heightHint= initialSize.y;
+		spec.grabExcessVerticalSpace= true;
+		spec.grabExcessHorizontalSpace= true;
+		spec.horizontalAlignment= GridData.FILL;
+		spec.verticalAlignment= GridData.FILL;
+		fSelectionList.setLayoutData(spec);
+				
+		return contents;
+	}
+	/**
+	 * Creates the message text widget and sets layout data.
+	 */
+	protected Label createMessage(Composite parent) {
+		Label text= new Label(parent, SWT.NULL);
+		text.setText(fMessageText);
+		GridData spec= new GridData();
+		spec.grabExcessVerticalSpace= false;
+		spec.grabExcessHorizontalSpace= true;
+		spec.horizontalAlignment= GridData.FILL;
+		spec.verticalAlignment= GridData.BEGINNING;
+		text.setLayoutData(spec);
+		return text;
+	}
+	/*
+	 * @private
+	 * @see Window#create(Shell)
+	 */
+	public void create() {
+		super.create();
+	     	if (isEmptyList()) {
+	     		fMessage.setEnabled(false);
+	     		fSelectionList.setEnabled(false);
+	     	} else {
+		     	verifyCurrentSelection();		
+			fSelectionList.selectFilterText();
+			fSelectionList.setFocus();
+	     	}	
+	}
+	/**
+	 * Returns the currently used filter text.
+	 */
+	protected String getFilter() {
+		return fSelectionList.getFilter();
+	}
+	/**
+	 * Returns the selection indices.
+	 */
+	protected int[] getSelectionIndices() {
+		return fSelectionList.getSelectionIndices();
+	}
+	/**
+	 * Returns the widget selection. Returns empty list when the widget is not
+	 * usable.
+	 */
+	protected List<Object> getWidgetSelection() {
+		if (fSelectionList == null || fSelectionList.isDisposed())
+			return new ArrayList<Object>(0);
+		return fSelectionList.getSelection();	
+	}
+	/**
+	 * An element as been selected in the list by double clicking on it.
+	 * Emulate a OK button pressed to close the dialog.
+	 */	
+	protected abstract void handleDoubleClick();
+	/**
+	 * Checks whether the list of elements is empty or not.
+	 */
+	protected boolean isEmptyList() {
+		if (fSelectionList == null)
+			return true;
+		return fSelectionList.isEmptyList();
+	}
+	/**
+	 * Constructs a list selection dialog.
+	 * @param renderer The label renderer used
+	 * @param ignoreCase Decides if the match string ignores lower/upppr case
+	 * @param multipleSelection Allow multiple selection	 
+	 */
+	protected AbstractElementListSelectionDialog(Shell parent, String title, Image image, ILabelProvider renderer, boolean ignoreCase, boolean multipleSelection) {
+		super(parent);
+		setTitle(title);
+		setImage(image);
+		fRenderer= renderer;
+		fIgnoreCase= ignoreCase;
+		fIsMultipleSelection= multipleSelection;
+		
+		fMessageText= ""; //$NON-NLS-1$
+		
+		fCurrStatus= new StatusInfo();
+		
+		fValidator= null;
+		fEmptyListMessage= ""; //$NON-NLS-1$
+		fNothingSelectedMessage= ""; //$NON-NLS-1$
+	}
+	/**
+	 * Constructs a list selection dialog.
+	 * @param renderer The label renderer used
+	 * @param ignoreCase Decides if the match string ignores lower/upppr case
+	 * @param multipleSelection Allow multiple selection	 
+	 */
+	protected AbstractElementListSelectionDialog(Shell parent, ILabelProvider renderer, boolean ignoreCase, boolean multipleSelection) {
+		this(parent, "", null, renderer, ignoreCase, multipleSelection); //$NON-NLS-1$
+	}
+	/*
+	 * @private
+	 */
+	public int open() {
+		BusyIndicator.showWhile(null, new Runnable() {
+			public void run() {
+				access$superOpen();
+			}
+		});
+		return getReturnCode() ;
+	}
+	/**
+	 * Refilters the current list according to the filter entered into the
+	 * text edit field.
+	 */
+	protected void refilter() {
+		fSelectionList.filter(true);
+	}
+	/**
+	 * If a empty-list message is set, a error message is shown
+	 * Must be set before widget creation
+	 */
+	public void setEmptyListMessage(String message) {
+		fEmptyListMessage= message;
+	}
+	/**
+	 * Sets the filter text to the given value.
+	 */
+	protected void setFilter(String text, boolean refilter) {
+		fSelectionList.setFilter(text, refilter);
+	}
+	/**
+	 * Sets the message to be shown above the match text field.
+	 * Must be set before widget creation
+	 */
+	public void setMessage(String message) {
+		fMessageText= message;
+	}
+	/**
+	 * If the selection is empty, this message is shown
+	 */
+	public void setNothingSelectedMessage(String message) {
+		fNothingSelectedMessage= message;
+	}
+	/**
+	 * Selects the elements in the list determined by the given
+	 * selection indices.
+	 */
+	protected void setSelection(int[] selection) {
+		fSelectionList.setSelection(selection);
+	}
+	/**
+	 * Initializes the selection list widget with the given list of
+	 * elements.
+	 */
+	protected void setSelectionListElements(List<Object> elements, boolean refilter) {
+		fSelectionList.setElements(elements, refilter);
+	}
+	/**
+	 * A validator can be set to check if the current selection
+	 * is valid
+	 */
+	public void setValidator(ISelectionValidator validator) {
+		fValidator= validator;
+	}
+	/**
+	 * Verifies the current selection and updates the status line
+	 * accordingly.
+	 */
+	protected boolean verifyCurrentSelection() {
+		List<Object> sel= getWidgetSelection();
+		int length= sel.size();
+		if (length > 0) {
+			if (fValidator != null) {
+				fValidator.isValid(sel.toArray(), fCurrStatus);
+			} else {
+				fCurrStatus.setOK();
+			}
+		} else {
+			if (isEmptyList()) {
+				fCurrStatus.setError(fEmptyListMessage);
+			} else {
+				fCurrStatus.setError(fNothingSelectedMessage);
+			}
+		}
+		updateStatus(fCurrStatus);
+		return fCurrStatus.isOK();
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AbstractMakefile.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AbstractMakefile.java
new file mode 100644
index 0000000..8edc6c9
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AbstractMakefile.java
@@ -0,0 +1,294 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.IInferenceRule;
+import org.eclipse.cdt.make.core.makefile.IMacroDefinition;
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.core.makefile.IMakefileReaderProvider;
+import org.eclipse.cdt.make.core.makefile.IRule;
+import org.eclipse.cdt.make.core.makefile.ITargetRule;
+
+/**
+ * Makefile : ( statement ) *
+ * statement :   rule | macro_definition | comments | empty
+ * rule :  inference_rule | target_rule
+ * inference_rule : target ':' <nl> ( <tab> command <nl> ) +
+ * target_rule : target [ ( target ) * ] ':' [ ( prerequisite ) * ] [ ';' command ] <nl> 
+                 [ ( command ) * ]
+ * macro_definition : string '=' (string)* 
+ * comments : ('#' (string) <nl>) *
+ * empty : <nl>
+ * command : <tab> prefix_command string <nl>
+ * target : string
+ * prefix_command : '-' | '@' | '+'
+ * internal_macro :  "$<" | "$*" | "$@" | "$?" | "$%" 
+ */
+
+public abstract class AbstractMakefile extends Parent implements IMakefile {
+
+	private URI filename;
+
+	public AbstractMakefile(Directive parent) {
+		super(parent);
+	}
+
+	public abstract IDirective[] getBuiltins();
+
+	public IRule[] getRules() {
+		IDirective[] stmts = getDirectives(true);
+		List<IRule> array = new ArrayList<IRule>(stmts.length);
+		for (int i = 0; i < stmts.length; i++) {
+			if (stmts[i] instanceof IRule) {
+				array.add((IRule)stmts[i]);
+			}
+		}
+		return (IRule[]) array.toArray(new IRule[0]);
+	}
+
+	public IRule[] getRules(String target) {
+		IRule[] rules = getRules();
+		List<IRule> array = new ArrayList<IRule>(rules.length);
+		for (int i = 0; i < rules.length; i++) {
+			if (rules[i].getTarget().equals(target)) {
+				array.add(rules[i]);
+			}
+		}
+		return (IRule[]) array.toArray(new IRule[0]);
+	}
+
+	public IInferenceRule[] getInferenceRules() {
+		IRule[] rules = getRules();
+		List<IInferenceRule> array = new ArrayList<IInferenceRule>(rules.length);
+		for (int i = 0; i < rules.length; i++) {
+			if (rules[i] instanceof IInferenceRule) {
+				array.add((IInferenceRule)rules[i]);
+			}
+		}
+		return (IInferenceRule[]) array.toArray(new IInferenceRule[0]);
+	}
+
+	public IInferenceRule[] getInferenceRules(String target) {
+		IInferenceRule[] irules = getInferenceRules();
+		List<IInferenceRule> array = new ArrayList<IInferenceRule>(irules.length);
+		for (int i = 0; i < irules.length; i++) {
+			if (irules[i].getTarget().equals(target)) {
+				array.add(irules[i]);
+			}
+		}
+		return (IInferenceRule[]) array.toArray(new IInferenceRule[0]);
+	}
+
+	public ITargetRule[] getTargetRules() {
+		IRule[] trules = getRules();
+		List<ITargetRule> array = new ArrayList<ITargetRule>(trules.length);
+		for (int i = 0; i < trules.length; i++) {
+			if (trules[i] instanceof ITargetRule) {
+				array.add((ITargetRule)trules[i]);
+			}
+		}
+		return (ITargetRule[]) array.toArray(new ITargetRule[0]);
+	}
+
+	public ITargetRule[] getTargetRules(String target) {
+		ITargetRule[] trules = getTargetRules();
+		List<ITargetRule> array = new ArrayList<ITargetRule>(trules.length);
+		for (int i = 0; i < trules.length; i++) {
+			if (trules[i].getTarget().equals(target)) {
+				array.add(trules[i]);
+			}
+		}
+		return (ITargetRule[]) array.toArray(new ITargetRule[0]);
+	}
+
+	public IMacroDefinition[] getMacroDefinitions() {
+		IDirective[] stmts = getDirectives(true);
+		List<IMacroDefinition> array = new ArrayList<IMacroDefinition>(stmts.length);
+		for (int i = 0; i < stmts.length; i++) {
+			if (stmts[i] instanceof IMacroDefinition) {
+				array.add((IMacroDefinition)stmts[i]);
+			}
+		}
+		return (IMacroDefinition[]) array.toArray(new IMacroDefinition[0]);
+	}
+
+	public IMacroDefinition[] getMacroDefinitions(String name) {
+		IMacroDefinition[] variables = getMacroDefinitions();
+		List<IMacroDefinition> array = new ArrayList<IMacroDefinition>(variables.length);
+		for (int i = 0; i < variables.length; i++) {
+			if (variables[i].getName().equals(name)) {
+				array.add(variables[i]);
+			}
+		}
+		return (IMacroDefinition[]) array.toArray(new IMacroDefinition[0]);
+	}
+
+	public IMacroDefinition[] getBuiltinMacroDefinitions() {
+		IDirective[] stmts = getBuiltins();
+		List<IMacroDefinition> array = new ArrayList<IMacroDefinition>(stmts.length);
+		for (int i = 0; i < stmts.length; i++) {
+			if (stmts[i] instanceof IMacroDefinition) {
+				array.add((IMacroDefinition)stmts[i]);
+			}
+		}
+		return (IMacroDefinition[]) array.toArray(new IMacroDefinition[0]);
+	}
+
+	public IMacroDefinition[] getBuiltinMacroDefinitions(String name) {
+		IMacroDefinition[] variables = getBuiltinMacroDefinitions();
+		List<IMacroDefinition> array = new ArrayList<IMacroDefinition>(variables.length);
+		for (int i = 0; i < variables.length; i++) {
+			if (variables[i].getName().equals(name)) {
+				array.add(variables[i]);
+			}
+		}
+		return (IMacroDefinition[]) array.toArray(new IMacroDefinition[0]);
+	}
+
+	public IInferenceRule[] getBuiltinInferenceRules() {
+		IDirective[] stmts = getBuiltins();
+		List<IInferenceRule> array = new ArrayList<IInferenceRule>(stmts.length);
+		for (int i = 0; i < stmts.length; i++) {
+			if (stmts[i] instanceof IInferenceRule) {
+				array.add((IInferenceRule)stmts[i]);
+			}
+		}
+		return (IInferenceRule[]) array.toArray(new IInferenceRule[0]);
+	}
+
+	public IInferenceRule[] getBuiltinInferenceRules(String target) {
+		IInferenceRule[] irules = getBuiltinInferenceRules();
+		List<IInferenceRule> array = new ArrayList<IInferenceRule>(irules.length);
+		for (int i = 0; i < irules.length; i++) {
+			if (irules[i].getTarget().equals(target)) {
+				array.add(irules[i]);
+			}
+		}
+		return (IInferenceRule[]) array.toArray(new IInferenceRule[0]);
+	}
+
+	public String expandString(String line) {
+		return expandString(line, false);
+	}
+
+	public String expandString(String line, boolean recursive) {
+		int len = line.length();
+		boolean foundDollar = false;
+		boolean inMacro = false;
+		StringBuffer buffer = new StringBuffer();
+		StringBuffer macroName = new StringBuffer();
+		for (int i = 0; i < len; i++) {
+			char c = line.charAt(i);
+			switch(c) {
+				case '$':
+					// '$$' --> '$'
+					if (foundDollar) {
+						buffer.append(c);
+						foundDollar = false;
+					} else {
+						foundDollar = true;
+					}
+					break;
+				case '(':
+				case '{':
+					if (foundDollar) {
+						inMacro = true;
+					} else {
+						buffer.append(c);
+					}
+					break;
+				case ')':
+				case '}':
+					if (inMacro) {
+						String name = macroName.toString();
+						if (name.length() > 0) {
+							IMacroDefinition[] defs = getMacroDefinitions(name);
+							if (defs.length == 0) {
+								defs = getBuiltinMacroDefinitions(name);
+							}
+							if (defs.length > 0) {
+								String result = defs[0].getValue().toString();
+								if (result.indexOf('$') != -1 && recursive) {
+									result = expandString(result, recursive);
+								}
+								buffer.append(result);
+							} else { // Do not expand
+								buffer.append('$').append('(').append(name).append(')');
+							}
+						}
+						macroName.setLength(0);
+						inMacro = false;
+					} else {
+						buffer.append(c);
+					}
+					break;
+				default:
+					if (inMacro) {
+						macroName.append(c);
+					} else if (foundDollar) {
+						String name = String.valueOf(c);
+						IMacroDefinition[] defs = getMacroDefinitions(name);
+						if (defs.length == 0) {
+							defs = getBuiltinMacroDefinitions(name);
+						}
+						if (defs.length > 0) {
+							String result = defs[0].getValue().toString();
+							if (result.indexOf('$') != -1 && recursive) {
+								result = expandString(result, recursive);
+							}
+							buffer.append(result);
+						} else {
+							// nothing found
+							buffer.append('$').append(c);
+						}
+						inMacro = false;
+					} else {
+						buffer.append(c);
+					}
+					foundDollar = false;
+					break;
+			}
+		}
+		return buffer.toString();
+	}
+	
+	public URI getFileURI() {
+		return filename;
+	}
+	
+	public void setFileURI(URI filename) {
+	    this.filename = filename;
+    }
+	
+
+	public IMakefile getMakefile() {
+		return this;
+	}
+	
+	public IMakefileReaderProvider getMakefileReaderProvider() {
+		return null;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.make.core.makefile.IMakefile#parse(java.net.URI, org.eclipse.cdt.make.core.makefile.IMakefileReaderProvider)
+	 */
+	public void parse(URI fileURI,
+			IMakefileReaderProvider makefileReaderProvider) throws IOException {
+		// not used
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AbstractMakefileCodeScanner.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AbstractMakefileCodeScanner.java
new file mode 100644
index 0000000..0bb70e2
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AbstractMakefileCodeScanner.java
@@ -0,0 +1,172 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ * Red Hat Inc. - convert to use with Automake editor
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.resource.StringConverter;
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.ColorManager;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+
+
+/**
+ * AbstractMakefileEditorScanner
+ */
+public abstract class AbstractMakefileCodeScanner extends RuleBasedScanner {
+
+	private Map<String, Token> fTokenMap= new HashMap<String, Token>();
+	private String[] fPropertyNamesColor;
+	/**
+	 * Preference keys for boolean preferences which are <code>true</code>,
+	 * iff the corresponding token should be rendered bold. 
+	 */
+	private String[] fPropertyNamesBold;
+	/**
+	 * Preference keys for boolean preferences which are <code>true</code>,
+	 * iff the corresponding token should be rendered italic.
+	 */
+	private String[] fPropertyNamesItalic;
+	
+
+	/** 
+	 * Returns the list of preference keys which define the tokens
+	 * used in the rules of this scanner.
+	 */
+	abstract protected String[] getTokenProperties();
+		
+	/**
+	 * Creates the list of rules controlling this scanner.
+	 */
+	abstract protected List<IRule> createRules();
+		
+	/**
+	 * Must be called after the constructor has been called.
+	 */
+	public final void initialize() {
+		
+		fPropertyNamesColor= getTokenProperties();
+		int length= fPropertyNamesColor.length;
+		fPropertyNamesBold= new String[length];
+		fPropertyNamesItalic= new String[length];
+
+		for (int i= 0; i < length; i++) {
+			fPropertyNamesBold[i]= fPropertyNamesColor[i] + MakefileEditorPreferenceConstants.EDITOR_BOLD_SUFFIX;
+			fPropertyNamesItalic[i]= fPropertyNamesColor[i] + MakefileEditorPreferenceConstants.EDITOR_ITALIC_SUFFIX;
+			addToken(fPropertyNamesColor[i], fPropertyNamesBold[i], fPropertyNamesItalic[i]);
+		}
+		
+		initializeRules();
+	}
+
+	private void initializeRules() {
+		List<IRule> rules= createRules();
+		if (rules != null) {
+			IRule[] result= new IRule[rules.size()];
+			rules.toArray(result);
+			setRules(result);
+		}
+	}
+
+	protected Token getToken(String key) {
+		return (Token) fTokenMap.get(key);
+	}
+
+	private void addToken(String colorKey, String boldKey, String italicKey) {
+		fTokenMap.put(colorKey, new Token(createTextAttribute(colorKey, boldKey, italicKey)));
+	}
+
+	private int indexOf(String property) {
+		if (property != null) {
+			int length= fPropertyNamesColor.length;
+			for (int i= 0; i < length; i++) {
+				if (property.equals(fPropertyNamesColor[i]) || property.equals(fPropertyNamesBold[i]) || property.equals(fPropertyNamesItalic[i]))
+					return i;
+			}
+		}
+		return -1;
+	}
+	
+	public boolean affectsBehavior(PropertyChangeEvent event) {
+		return indexOf(event.getProperty()) >= 0;
+	}
+	
+	public void adaptToPreferenceChange(PropertyChangeEvent event) {
+		String p= event.getProperty();
+		int index= indexOf(p);
+		Token token= getToken(fPropertyNamesColor[index]);
+		if (fPropertyNamesColor[index].equals(p))
+			adaptToColorChange(event, token);
+		else if (fPropertyNamesBold[index].equals(p))
+			adaptToStyleChange(event, token, SWT.BOLD);
+		else if (fPropertyNamesItalic[index].equals(p))
+			adaptToStyleChange(event, token, SWT.ITALIC);
+	}
+
+	protected void adaptToColorChange(PropertyChangeEvent event, Token token) {
+		RGB rgb= null;
+		Object value= event.getNewValue();
+		if (value instanceof RGB) {
+			rgb= (RGB) value;
+		} else if (value instanceof String) {
+			rgb= StringConverter.asRGB((String) value);
+		}
+			
+		if (rgb != null) {
+			TextAttribute attr= (TextAttribute) token.getData();
+			token.setData(new TextAttribute(ColorManager.getDefault().getColor(rgb), attr.getBackground(), attr.getStyle()));
+		}
+	}
+
+	protected void adaptToStyleChange(PropertyChangeEvent event, Token token, int styleAttribute) {
+	 	if (token == null) {
+			return;
+		}
+		boolean eventValue= false;
+		Object value= event.getNewValue();
+		if (value instanceof Boolean) {
+			eventValue= ((Boolean) value).booleanValue();
+		} else if (IPreferenceStore.TRUE.equals(value)) {
+			eventValue= true;
+		}
+		
+		TextAttribute attr= (TextAttribute) token.getData();
+		boolean activeValue= (attr.getStyle() & styleAttribute) == styleAttribute;
+		if (activeValue != eventValue) { 
+			token.setData(new TextAttribute(attr.getForeground(), attr.getBackground(), eventValue ? attr.getStyle() | styleAttribute : attr.getStyle() & ~styleAttribute));
+		}
+	}
+
+	protected TextAttribute createTextAttribute(String colorID, String boldKey, String italicKey) {
+		Color color= null;
+		if (colorID != null) {
+			color= AutomakeEditorFactory.getPreferenceColor(colorID);
+		}
+		IPreferenceStore store= AutotoolsPlugin.getDefault().getPreferenceStore();
+		int style= store.getBoolean(boldKey) ? SWT.BOLD : SWT.NORMAL;
+		if (store.getBoolean(italicKey)) {
+			style |= SWT.ITALIC;
+		}		
+		return new TextAttribute(color, null, style);
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AddBuildTargetAction.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AddBuildTargetAction.java
new file mode 100644
index 0000000..8e3c699
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AddBuildTargetAction.java
@@ -0,0 +1,155 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - convert to use with Automake editor
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.cdt.make.core.IMakeTarget;
+import org.eclipse.cdt.make.core.IMakeTargetManager;
+import org.eclipse.cdt.make.core.MakeCorePlugin;
+import org.eclipse.cdt.make.core.makefile.ITargetRule;
+import org.eclipse.cdt.make.ui.dialogs.MakeTargetDialog;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.MakeUIMessages;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IFileEditorInput;
+
+
+/**
+ */
+public class AddBuildTargetAction extends Action {
+
+	MakefileContentOutlinePage fOutliner;
+	static final ITargetRule[] EMPTY_TARGET_RULES = {
+	};
+
+	public AddBuildTargetAction(MakefileContentOutlinePage outliner) {
+		super(MakeUIMessages.getResourceString("AddBuildTargetAction.title")); //$NON-NLS-1$
+		setDescription(MakeUIMessages.getResourceString("AddBuildTargetAction.description")); //$NON-NLS-1$
+		setToolTipText(MakeUIMessages.getResourceString("AddBuildTargetAction.tooltip")); //$NON-NLS-1$
+		fOutliner = outliner;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jface.action.IAction#run()
+	 */
+	public void run() {
+		IMakeTargetManager manager = MakeCorePlugin.getDefault().getTargetManager();
+		IFile file = getFile();
+		Shell shell = fOutliner.getControl().getShell();
+		ITargetRule[] rules = getTargetRules(fOutliner.getSelection());
+		if (file != null && rules.length > 0 && shell != null) {
+			StringBuffer sbBuildName = new StringBuffer();
+			StringBuffer sbMakefileTarget = new StringBuffer();
+			for (int i = 0; i < rules.length; i++) {
+				String name = rules[i].getTarget().toString().trim();
+				if (sbBuildName.length() == 0) {
+					sbBuildName.append(name);
+				} else {
+					sbBuildName.append('_').append(name);
+				}
+				if (sbMakefileTarget.length() == 0) {
+					sbMakefileTarget.append(name);
+				} else {
+					sbMakefileTarget.append(' ').append(name);
+				}
+			}
+			String buildName = generateUniqueName(file.getParent(), sbBuildName.toString());
+			String makefileTarget = sbMakefileTarget.toString();
+			IMakeTarget target = null;
+			try {
+				String[] ids = manager.getTargetBuilders(file.getProject());
+				if (ids.length > 0) {
+					target = manager.createTarget(file.getProject(), buildName, ids[0]);
+					target.setBuildAttribute(IMakeTarget.BUILD_TARGET, makefileTarget);
+					target.setContainer(file.getParent());
+				}
+			} catch (CoreException e) {
+				AutotoolsUIPlugin.errorDialog(shell, MakeUIMessages.getResourceString("AddBuildTargetAction.exception.internal"), e.toString(), e); //$NON-NLS-1$
+				target = null;
+			}
+
+			// Always popup the dialog.
+			if (target != null) {
+				MakeTargetDialog dialog;
+				try {
+					dialog = new MakeTargetDialog(shell, target);
+					dialog.open();
+				} catch (CoreException e) {
+					AutotoolsUIPlugin.errorDialog(shell, MakeUIMessages.getResourceString("AddBuildTargetAction.exception.internal"), e.toString(), e); //$NON-NLS-1$
+				}
+			}
+		}
+	}
+
+	private String generateUniqueName(IContainer container, String targetString) {
+		String newName = targetString;
+		int i = 0;
+		IMakeTargetManager manager = MakeCorePlugin.getDefault().getTargetManager();
+		try {
+			while (manager.findTarget(container, newName) != null) {
+				i++;
+				newName = targetString + " (" + Integer.toString(i) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+			}
+		} catch (CoreException e) {
+		}
+		return newName;
+	}
+	
+	public boolean canActionBeAdded(ISelection selection) {
+		ITargetRule[] rules = getTargetRules(selection);
+		for (int i = 0; i < rules.length; i++) {
+			IFile file = getFile();
+			if (file == null)
+				return false;
+			if (!MakeCorePlugin.getDefault().getTargetManager().hasTargetBuilder(file.getProject()))
+				return false;
+		}
+		return true;
+	}
+
+	private IFile getFile() {
+		Object input = fOutliner.getInput();
+		if (input instanceof IFileEditorInput) {
+			return ((IFileEditorInput)input).getFile();
+		}
+		return null;
+	}
+
+	@SuppressWarnings("unchecked")
+	private ITargetRule[] getTargetRules(ISelection sel) {
+		if (!sel.isEmpty() && sel instanceof IStructuredSelection) {
+			List list = ((IStructuredSelection)sel).toList();
+			if (list.size() > 0) {
+				List<ITargetRule> targets = new ArrayList<ITargetRule>(list.size());
+				Object[] elements = list.toArray();
+				for (int i = 0; i < elements.length; i++) {
+					if (elements[i] instanceof ITargetRule) {
+						targets.add((ITargetRule)elements[i]);
+					}
+				}
+				return (ITargetRule[])targets.toArray(EMPTY_TARGET_RULES);
+			}
+		}
+		return EMPTY_TARGET_RULES;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ArchiveTarget.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ArchiveTarget.java
new file mode 100644
index 0000000..0b6cf7e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ArchiveTarget.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+/**
+ * IArchiveTarget
+ */
+public class ArchiveTarget extends Target {
+
+	String member;
+
+	public ArchiveTarget(String lib, String obj) {
+		super(lib);
+		member = obj;
+	}
+
+	public String getMember() {
+		return member;
+	}
+
+	public String getLibaryName() {
+		return toString();
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutoconfSubstRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutoconfSubstRule.java
new file mode 100644
index 0000000..c4f2e3f
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutoconfSubstRule.java
@@ -0,0 +1,92 @@
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.Arrays;
+import java.util.Comparator;
+
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IPredicateRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.Token;
+
+public class AutoconfSubstRule implements IPredicateRule {
+
+	private IToken token;
+	private char[][] fLineDelimiters;
+	private char[][] fSortedLineDelimiters;
+	
+	private static class DecreasingCharArrayLengthComparator implements Comparator<Object> {
+		public int compare(Object o1, Object o2) {
+			return ((char[]) o2).length - ((char[]) o1).length;
+		}
+	}
+
+	private Comparator<Object> fLineDelimiterComparator= new DecreasingCharArrayLengthComparator();
+
+	public AutoconfSubstRule(IToken token) {
+		this.token = token;
+	}
+	
+	public IToken evaluate(ICharacterScanner scanner, boolean resume) {
+		char[][] originalDelimiters= scanner.getLegalLineDelimiters();
+		int count= originalDelimiters.length;
+		if (fLineDelimiters == null || originalDelimiters.length != count) {
+			fSortedLineDelimiters= new char[count][];
+		} else {
+			while (count > 0 && fLineDelimiters[count-1] == originalDelimiters[count-1])
+				count--;
+		}
+		if (count != 0) {
+			fLineDelimiters= originalDelimiters;
+			System.arraycopy(fLineDelimiters, 0, fSortedLineDelimiters, 0, fLineDelimiters.length);
+			Arrays.sort(fSortedLineDelimiters, fLineDelimiterComparator);
+		}
+		
+		int c;
+		boolean okToScan = resume;
+		int charCount = 0;
+		
+		if (!resume) {
+			// Not resuming.  Verify first char is '@'.
+			c = scanner.read();
+			++charCount;
+			if (c == '@') {
+				okToScan = true;
+			}
+		}
+		
+		if (okToScan) {
+			// We want to make sure we have a valid id (not @@) or (@_@).  When
+			// we resume, we have no choice but to assume it is valid so far.
+			boolean isId = resume;
+			++charCount;
+			while ((c = scanner.read()) != ICharacterScanner.EOF) {
+				if (c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z') {
+					// A valid id has some alphabetic character in it.
+					isId = true;
+				}
+				else if (c >= '0' && c <= '9' || c == '_') {
+					; // continue
+				}
+				else if (c == '@' && isId)
+					return getSuccessToken();
+				else
+					break;
+				++charCount;
+			}
+		}
+		
+		for (int i = 0; i < charCount; ++i)
+			scanner.unread();
+		
+		return Token.UNDEFINED;
+	}
+
+	public IToken getSuccessToken() {
+		return token;
+	}
+
+	public IToken evaluate(ICharacterScanner scanner) {
+		return evaluate(scanner, false);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeCompletionProcessor.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeCompletionProcessor.java
new file mode 100644
index 0000000..94a608e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeCompletionProcessor.java
@@ -0,0 +1,241 @@
+/*******************************************************************************
+ * Mostly copied from makefileCompletionProcessor which has the following
+ * copyright notice:
+ * 
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.IMacroDefinition;
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.core.makefile.IRule;
+import org.eclipse.cdt.make.ui.IWorkingCopyManager;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.TextPresentation;
+import org.eclipse.jface.text.contentassist.CompletionProposal;
+import org.eclipse.jface.text.contentassist.ContextInformation;
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.text.contentassist.IContextInformation;
+import org.eclipse.jface.text.contentassist.IContextInformationPresenter;
+import org.eclipse.jface.text.contentassist.IContextInformationValidator;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.MakeUIImages;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.IEditorPart;
+
+
+public class AutomakeCompletionProcessor implements IContentAssistProcessor {
+
+		/**
+		 * Simple content assist tip closer. The tip is valid in a range
+		 * of 5 characters around its popup location.
+		 */
+		protected static class Validator implements IContextInformationValidator, IContextInformationPresenter {
+
+			protected int fInstallOffset;
+
+			/*
+			 * @see IContextInformationValidator#isContextInformationValid(int)
+			 */
+			public boolean isContextInformationValid(int offset) {
+				return Math.abs(fInstallOffset - offset) < 5;
+			}
+
+			/*
+			 * @see IContextInformationValidator#install(IContextInformation, ITextViewer, int)
+			 */
+			public void install(IContextInformation info, ITextViewer viewer, int offset) {
+				fInstallOffset = offset;
+			}
+
+			/*
+			 * @see org.eclipse.jface.text.contentassist.IContextInformationPresenter#updatePresentation(int, TextPresentation)
+			 */
+			public boolean updatePresentation(int documentPosition, TextPresentation presentation) {
+				return false;
+			}
+		}
+
+		public class DirectiveComparator implements Comparator<Object> {
+
+			/* (non-Javadoc)
+			 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+			 */
+			public int compare(Object o1, Object o2) {
+				String name1;
+				String name2;
+
+				if (o1 instanceof IMacroDefinition) {
+					name1 = ((IMacroDefinition)o1).getName();
+				} else if (o1 instanceof IRule) {
+					name1 = ((IRule)o1).getTarget().toString();
+				} else {
+					name1 =""; //$NON-NLS-1$
+				}
+
+				if (o2 instanceof IMacroDefinition) {
+					name2 = ((IMacroDefinition)o1).getName();
+				} else if (o2 instanceof IRule) {
+					name2 = ((IRule)o1).getTarget().toString();
+				} else {
+					name2 =""; //$NON-NLS-1$
+				}
+
+				//return String.CASE_INSENSITIVE_ORDER.compare(name1, name2);
+				return name1.compareToIgnoreCase(name2);
+			}
+			
+		}
+		protected IContextInformationValidator fValidator = new Validator();
+		protected Image imageMacro = MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_MACRO);
+		protected Image imageTarget = MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_TARGET_RULE);
+
+		protected CompletionProposalComparator comparator = new CompletionProposalComparator();
+		protected IEditorPart fEditor;
+		protected IWorkingCopyManager fManager;
+
+		public AutomakeCompletionProcessor(IEditorPart editor) {
+			fEditor = editor;
+			fManager =  AutomakeEditorFactory.getDefault().getWorkingCopyManager();
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeCompletionProposals(org.eclipse.jface.text.ITextViewer, int)
+		 */
+		public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int documentOffset) {
+			WordPartDetector wordPart = new WordPartDetector(viewer, documentOffset);
+			boolean macro = WordPartDetector.inMacro(viewer, documentOffset);
+			IMakefile makefile = fManager.getWorkingCopy(fEditor.getEditorInput());
+			IDirective[] statements = null;
+			if (macro) {
+				IDirective[] m1 = makefile.getMacroDefinitions();
+				IDirective[] m2 = makefile.getBuiltinMacroDefinitions();
+				statements = new IDirective[m1.length + m2.length];
+				System.arraycopy(m1, 0, statements, 0, m1.length);
+				System.arraycopy(m2, 0, statements, m1.length, m2.length);
+			} else {
+				statements = makefile.getTargetRules();
+			}
+
+			ArrayList<ICompletionProposal> proposalList = new ArrayList<ICompletionProposal>(statements.length);
+
+			// iterate over all the different categories
+			for (int i = 0; i < statements.length; i++) {
+				String name = null;
+				Image image = null;
+				String infoString = "";//getContentInfoString(name); //$NON-NLS-1$
+				if (statements[i] instanceof IMacroDefinition) {
+					name = ((IMacroDefinition) statements[i]).getName();
+					image = imageMacro;
+					infoString = ((IMacroDefinition)statements[i]).getValue().toString();
+				} else if (statements[i] instanceof IRule) {
+					name = ((IRule) statements[i]).getTarget().toString();
+					image = imageTarget;
+					infoString = name;
+				}
+				if (name != null && name.startsWith(wordPart.toString())) {
+					IContextInformation info = new ContextInformation(name, infoString);
+					String displayString = (name.equals(infoString) ? name : name + " - " + infoString); //$NON-NLS-1$
+					ICompletionProposal result =
+						new CompletionProposal(
+							name,
+							wordPart.getOffset(),
+							wordPart.toString().length(),
+							name.length(),
+							image,
+							displayString,
+							info,
+							infoString);
+					proposalList.add(result);
+				}
+			}
+			ICompletionProposal[] proposals = (ICompletionProposal[]) proposalList.toArray(new ICompletionProposal[0]);
+			Arrays.sort(proposals, comparator);
+			return proposals;
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeContextInformation(org.eclipse.jface.text.ITextViewer, int)
+		 */
+		public IContextInformation[] computeContextInformation(ITextViewer viewer, int documentOffset) {
+			WordPartDetector wordPart = new WordPartDetector(viewer, documentOffset);
+			boolean macro = WordPartDetector.inMacro(viewer, documentOffset);
+			IMakefile makefile = fManager.getWorkingCopy(fEditor.getEditorInput());
+			ArrayList<String> contextList = new ArrayList<String>();
+			if (macro) {
+				IDirective[] statements = makefile.getMacroDefinitions();
+				for (int i = 0; i < statements.length; i++) {
+					if (statements[i] instanceof IMacroDefinition) {
+						String name = ((IMacroDefinition) statements[i]).getName();
+						if (name != null && name.equals(wordPart.toString())) {
+							String value = ((IMacroDefinition) statements[i]).getValue().toString();
+							if (value != null && value.length() > 0) {
+								contextList.add(value);
+							}
+						}
+					}
+				}
+				statements = makefile.getBuiltinMacroDefinitions();
+				for (int i = 0; i < statements.length; i++) {
+					if (statements[i] instanceof IMacroDefinition) {
+						String name = ((IMacroDefinition) statements[i]).getName();
+						if (name != null && name.equals(wordPart.toString())) {
+							String value = ((IMacroDefinition) statements[i]).getValue().toString();
+							if (value != null && value.length() > 0) {
+								contextList.add(value);
+							}
+						}
+					}
+				}
+			}
+
+			IContextInformation[] result = new IContextInformation[contextList.size()];
+			for (int i = 0; i < result.length; i++) {
+				String context = (String)contextList.get(i);
+				result[i] = new ContextInformation(imageMacro, wordPart.toString(), context);
+			}
+			return result;
+
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getCompletionProposalAutoActivationCharacters()
+		 */
+		public char[] getCompletionProposalAutoActivationCharacters() {
+			return null;
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationAutoActivationCharacters()
+		 */
+		public char[] getContextInformationAutoActivationCharacters() {
+			return null;
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getErrorMessage()
+		 */
+		public String getErrorMessage() {
+			return null;
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationValidator()
+		 */
+		public IContextInformationValidator getContextInformationValidator() {
+			return fValidator;
+		}
+	
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeConfigMacro.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeConfigMacro.java
new file mode 100644
index 0000000..63c47d9
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeConfigMacro.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+
+public class AutomakeConfigMacro extends Directive {
+	String name;
+	
+	public AutomakeConfigMacro(Directive parent, String name) {
+		super(parent);
+		this.name = name;
+	}
+	
+	public String getName() {
+		return name;
+	}
+	
+	public String toString() {
+		return name + "\n";
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeDocumentProvider.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeDocumentProvider.java
new file mode 100644
index 0000000..92226f6
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeDocumentProvider.java
@@ -0,0 +1,121 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - Modified from MakefileDocumentProvider for Automake
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.IOException;
+import java.util.Iterator;
+
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.IURIEditorInput;
+import org.eclipse.ui.editors.text.TextFileDocumentProvider;
+
+
+public class AutomakeDocumentProvider extends TextFileDocumentProvider implements IMakefileDocumentProvider  {
+	
+	/**
+	 * Remembers a IMakefile for each element.
+	 */
+	protected class AutomakefileFileInfo extends FileInfo {		
+		public IMakefile fCopy;
+	}
+	
+    /*
+	 * @see org.eclipse.ui.editors.text.TextFileDocumentProvider#createEmptyFileInfo()
+	 */
+	protected FileInfo createEmptyFileInfo() {
+		return new AutomakefileFileInfo();
+	}
+	
+    /*
+	 * @see org.eclipse.ui.editors.text.TextFileDocumentProvider#createFileInfo(java.lang.Object)
+	 */
+	protected FileInfo createFileInfo(Object element) throws CoreException {
+		IMakefile original = null;
+		if (element instanceof IFileEditorInput) {	
+			IFileEditorInput input= (IFileEditorInput) element;
+			if (input.getFile().exists())
+				original= createMakefile(input.getFile().getLocation().toOSString());
+		} else if (element instanceof IURIEditorInput) {
+			IURIEditorInput input = (IURIEditorInput)element;
+			original = createMakefile(input.getURI().getPath().toString());
+		}
+		if (original == null)
+			return null;
+
+		FileInfo info= super.createFileInfo(element);
+		if (!(info instanceof AutomakefileFileInfo)) {
+			return null;
+		}
+
+		AutomakefileFileInfo makefileInfo= (AutomakefileFileInfo) info;
+		setUpSynchronization(makefileInfo);
+
+		makefileInfo.fCopy = original;
+
+		return makefileInfo;
+	}
+	
+	/**
+	 */
+	private IMakefile createMakefile(String fileName) {
+		IMakefile makefile = null;
+		Automakefile automakefile = new Automakefile();
+		try {
+			automakefile.parse(fileName);
+		} catch (IOException e) {
+		}
+		makefile = automakefile;
+		return makefile;
+	}
+	
+	/*
+	 * @see org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.IMakefileDocumentProvider#getWorkingCopy(java.lang.Object)
+	 */
+	public IMakefile getWorkingCopy(Object element) {
+		FileInfo fileInfo= getFileInfo(element);		
+		if (fileInfo instanceof AutomakefileFileInfo) {
+			AutomakefileFileInfo info= (AutomakefileFileInfo) fileInfo;
+			return info.fCopy;
+		}
+		return null;
+	}
+	
+	/*
+	 * @see org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.IMakefileDocumentProvider#shutdown()
+	 */
+	@SuppressWarnings("unchecked")
+	public void shutdown() {
+		Iterator e= getConnectedElementsIterator();
+		while (e.hasNext())
+			disconnect(e.next());
+	}
+	
+	public void connect(Object element) throws CoreException {
+		super.connect(element);
+		IMakefile makefile = getWorkingCopy(element);
+		IDocument document = getDocument(element);
+		AutomakeErrorHandler errorHandler = new AutomakeErrorHandler(document);
+		errorHandler.update(makefile);
+	}
+	
+	public IDocument getDocument(Object element) {
+		FileInfo info= (FileInfo) getFileInfo(element);
+		if (info != null)
+			return info.fTextFileBuffer.getDocument();
+		return getParentProvider().getDocument(element);
+	}
+	
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeEditor.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeEditor.java
new file mode 100644
index 0000000..644274c
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeEditor.java
@@ -0,0 +1,132 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - Modified from MakefileEditor to support Automake files
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutomakeEditorPreferencePage;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutotoolsEditorPreferenceConstants;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.editors.text.EditorsUI;
+import org.eclipse.ui.texteditor.ChainedPreferenceStore;
+import org.eclipse.ui.texteditor.DefaultRangeIndicator;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+
+
+public class AutomakeEditor extends MakefileEditor {
+	
+	protected AutomakefileContentOutlinePage page;
+	private AutomakefileSourceConfiguration sourceViewerConfiguration;
+	private AutomakeErrorHandler errorHandler;
+	private static AutomakeEditor fgInstance;
+	private IEditorInput input;
+	
+    public AutomakeEditor() {
+    	super();
+    	fgInstance = this;
+    }
+
+    /**
+     * Returns the default editor instance.
+     *
+     * @return the default editor instance
+     */
+    public static AutomakeEditor getDefault() {
+    	return fgInstance;
+    }
+
+    protected void doSetInput(IEditorInput newInput) throws CoreException
+	{
+		super.doSetInput(newInput);
+		this.input = newInput;
+
+		getOutlinePage().setInput(input);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#initializeEditor()
+	 */
+	protected void initializeEditor() {
+		setRangeIndicator(new DefaultRangeIndicator());
+		setEditorContextMenuId("#MakefileEditorContext"); //$NON-NLS-1$
+		setRulerContextMenuId("#MakefileRulerContext"); //$NON-NLS-1$
+		setDocumentProvider(AutomakeEditorFactory.getDefault().getAutomakefileDocumentProvider());
+		IPreferenceStore[] stores = new IPreferenceStore[2];
+		stores[0] = AutotoolsPlugin.getDefault().getPreferenceStore();
+		stores[1] = EditorsUI.getPreferenceStore();
+		ChainedPreferenceStore chainedStore = new ChainedPreferenceStore(stores);
+		setPreferenceStore(chainedStore);
+		sourceViewerConfiguration = new AutomakefileSourceConfiguration(chainedStore, this);
+		setSourceViewerConfiguration(sourceViewerConfiguration);
+		AutotoolsEditorPreferenceConstants.initializeDefaultValues(stores[0]);
+		AutomakeEditorPreferencePage.initDefaults(stores[0]);
+		configureInsertMode(SMART_INSERT, false);
+		setInsertMode(INSERT);
+	}
+	
+	public AutomakeDocumentProvider getAutomakefileDocumentProvider() {
+		return (AutomakeDocumentProvider) AutomakeEditorFactory.getDefault().getAutomakefileDocumentProvider();
+	}
+	
+	public AutomakefileContentOutlinePage getAutomakeOutlinePage() {
+		if (page == null) {
+			page = new AutomakefileContentOutlinePage(this);
+			page.addSelectionChangedListener(this);
+			page.setInput(getEditorInput());
+		}
+		return page;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
+	 */
+	public void createPartControl(Composite parent) {
+		super.createPartControl(parent);
+	}
+	
+	/* (non-Javadoc)
+	 * Method declared on IAdaptable
+	 */
+	@SuppressWarnings("unchecked")
+	public Object getAdapter(Class key) {
+		if (key.equals(IContentOutlinePage.class)) {
+			return getAutomakeOutlinePage();
+		}
+		return super.getAdapter(key);
+	}
+	
+	public AutomakefileSourceConfiguration getAutomakeSourceViewerConfiguration() {
+		return sourceViewerConfiguration;
+	}
+	
+	protected void handlePreferenceStoreChanged(PropertyChangeEvent event) {
+		super.handlePreferenceStoreChanged(event);
+	}
+	
+	public IMakefile getMakefile() {
+		return getAutomakefileDocumentProvider().getWorkingCopy(this.getEditorInput());
+	}
+	
+	public ISourceViewer getAutomakeSourceViewer() {
+		return getSourceViewer();
+	}
+	
+	public AutomakeErrorHandler getAutomakeErrorHandler() {
+		return errorHandler;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeEditorFactory.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeEditorFactory.java
new file mode 100644
index 0000000..8e47378
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeEditorFactory.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.ui.IWorkingCopyManager;
+import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.ColorManager;
+import org.eclipse.swt.graphics.Color;
+
+
+public class AutomakeEditorFactory {
+	private IWorkingCopyManager workingCopyManager;
+	private IMakefileDocumentProvider automakeFileDocumentProvider;
+	private static AutomakeEditorFactory factory;
+
+	/**
+	 * The constructor.
+	 */
+	private AutomakeEditorFactory() {
+		factory = this;
+	}
+	
+	public synchronized IMakefileDocumentProvider getAutomakefileDocumentProvider() {
+		if (automakeFileDocumentProvider == null) {
+			automakeFileDocumentProvider=  new AutomakeDocumentProvider();
+		}
+		return automakeFileDocumentProvider;
+	}
+
+	public synchronized IWorkingCopyManager getWorkingCopyManager() {
+		if (workingCopyManager == null) {
+			IMakefileDocumentProvider provider= getAutomakefileDocumentProvider();
+			workingCopyManager= new WorkingCopyManager(provider);
+		}
+		return workingCopyManager;
+	}
+
+	/**
+	 * Returns the preference color, identified by the given preference.
+	 */
+	public static Color getPreferenceColor(String key) {
+		//FIXME: what do we do with Makefile editor preferences?
+		return ColorManager.getDefault().getColor(PreferenceConverter.getColor(AutotoolsPlugin.getDefault().getPreferenceStore(), key));
+	}
+
+	public static AutomakeEditorFactory getDefault() {
+		if (factory == null)
+			factory = new AutomakeEditorFactory();
+		return factory;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeErrorHandler.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeErrorHandler.java
new file mode 100644
index 0000000..7862b20
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeErrorHandler.java
@@ -0,0 +1,229 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.core.makefile.IParent;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.Position;
+import org.eclipse.jface.text.source.AnnotationModel;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.texteditor.MarkerAnnotation;
+import org.eclipse.ui.texteditor.MarkerUtilities;
+
+
+public class AutomakeErrorHandler {
+	public static final String AUTOMAKE_ERROR_MARKER_ID = AutotoolsUIPlugin.PLUGIN_ID
+	+ ".parsefileerror";
+	
+	private IDocument document;
+	private AnnotationModel fAnnotationModel;
+
+	public AutomakeErrorHandler(IDocument document)
+	{
+		this.document = document;
+		IEditorInput input = AutomakeEditor.getDefault().getEditorInput();
+		this.fAnnotationModel = (AnnotationModel)AutomakeEditorFactory.getDefault().getAutomakefileDocumentProvider().getAnnotationModel(input);
+	}
+	
+	private class AutomakeMarker implements IMarker {
+		private Map<String, Object> attributes;
+		private String type;
+		private long id;
+		
+		public void delete() throws CoreException {
+			// TODO Auto-generated method stub
+			
+		}
+		public boolean equals(Object obj) {
+			// TODO Auto-generated method stub
+			return super.equals(obj);
+		}
+		public boolean exists() {
+			// TODO Auto-generated method stub
+			return true;
+		}
+		@SuppressWarnings("unchecked")
+		public Object getAdapter(Class adapter) {
+			// TODO Auto-generated method stub
+			return null;
+		}
+		public Object getAttribute(String attributeName) throws CoreException {
+			return attributes.get(attributeName);
+		}
+		public boolean getAttribute(String attributeName, boolean defaultValue) {
+			Object o = attributes.get(attributeName);
+			if (o != null && o instanceof Boolean)
+				return ((Boolean)o).booleanValue();
+			return defaultValue;
+		}
+		public int getAttribute(String attributeName, int defaultValue) {
+			Object o = attributes.get(attributeName);
+			if (o != null && o instanceof Integer)
+				return ((Integer)o).intValue();
+			return defaultValue;
+		}
+		public String getAttribute(String attributeName, String defaultValue) {
+			Object o = attributes.get(attributeName);
+			if (o != null && o instanceof String)
+				return (String)o;
+			return defaultValue;
+		}
+		@SuppressWarnings("unchecked")
+		public Map getAttributes() throws CoreException {
+			return attributes;
+		}
+		public Object[] getAttributes(String[] attributeNames)
+				throws CoreException {
+			Collection<Object> c = attributes.values();
+			return c.toArray();
+		}
+		public long getCreationTime() throws CoreException {
+			// TODO Auto-generated method stub
+			return 0;
+		}
+		public long getId() {
+			return id;
+		}
+		public IResource getResource() {
+			return null;
+		}
+		public String getType() throws CoreException {
+			return type;
+		}
+		public boolean isSubtypeOf(String superType) throws CoreException {
+			if (superType.equals(type))
+				return true;
+			return false;
+		}
+		public void setAttribute(String attributeName, boolean value)
+				throws CoreException {
+			Boolean b = new Boolean(value);
+			attributes.put(attributeName, b);
+		}
+		public void setAttribute(String attributeName, int value)
+				throws CoreException {
+			Integer i = new Integer(value);
+			attributes.put(attributeName, i);	
+		}
+		public void setAttribute(String attributeName, Object value)
+				throws CoreException {
+			attributes.put(attributeName, value);
+		}
+		@SuppressWarnings("unchecked")
+		public void setAttributes(Map map) throws CoreException {
+			attributes.putAll(map);
+		}
+		public void setAttributes(String[] attributeNames, Object[] values)
+				throws CoreException {
+			for (int i = 0; i < attributeNames.length; ++i) {
+				attributes.put(attributeNames[i], values[i]);
+			}
+		}
+		protected Object clone() throws CloneNotSupportedException {
+			// TODO Auto-generated method stub
+			return super.clone();
+		}
+		public AutomakeMarker(String type, long id) {
+			this.type = type;
+			this.id = id;
+			this.attributes = new HashMap<String, Object>();
+		}
+	}
+	
+	@SuppressWarnings("unchecked")
+	private IMarker createMarker(Map attributes, String markerType) throws CoreException {
+		IMarker marker= new AutomakeMarker(markerType, -1);
+		marker.setAttributes(attributes);
+		return marker;
+	}
+
+	public void update(IMakefile makefile) {
+		removeExistingMarkers();
+
+		// Recursively process all the directives in the Makefile
+		checkChildren(makefile);
+	}
+	
+	private void checkChildren(IParent parent) {
+		IDirective[] directives = parent.getDirectives();
+		for (int i = 0; i < directives.length; i++) {
+			IDirective directive = directives[i];
+			if (directive instanceof IParent) {
+				checkChildren((IParent)directive);
+			} else if (directive instanceof BadDirective) {
+				
+				int lineNumber = directive.getStartLine();
+				
+				Map<String, Object> map = new HashMap<String, Object>();
+				MarkerUtilities.setLineNumber(map, lineNumber);
+				// FIXME:  message
+				MarkerUtilities.setMessage(map, "Bad Directive");
+				map.put(IMarker.MESSAGE, "Bad Directive");
+				map.put(IMarker.LOCATION, Integer.valueOf(lineNumber));
+				
+				Integer charStart = getCharOffset(lineNumber - 1, 0);
+				if (charStart != null) {
+					map.put(IMarker.CHAR_START, charStart);
+				}
+				// FIXME:  probably a better way to do this
+				// This is the end character
+				Integer charEnd = new Integer(getCharOffset(directive.getEndLine(), 0).intValue() - 1);
+				if (charEnd != null) {
+					map.put(IMarker.CHAR_END, charEnd);
+				}
+				
+				// FIXME:  add severity level
+				map.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_ERROR));
+				
+				try {
+					IMarker marker = createMarker(map, AUTOMAKE_ERROR_MARKER_ID); // ICModelMarker.C_MODEL_PROBLEM_MARKER);
+
+					MarkerAnnotation annotation = new MarkerAnnotation(marker);
+					Position p = new Position(charStart.intValue(),charEnd.intValue() - charStart.intValue());
+					fAnnotationModel.addAnnotation(annotation, p);
+				} catch (CoreException ce) {
+					// do nothing
+				}
+			}
+		}
+		return;
+	}
+	
+	public void removeExistingMarkers()
+	{
+		fAnnotationModel.removeAllAnnotations();
+	}
+	
+	
+	private Integer getCharOffset(int lineNumber, int columnNumber)
+	{
+		try
+		{
+			return new Integer(document.getLineOffset(lineNumber) + columnNumber);
+		}
+		catch (BadLocationException e)
+		{
+			e.printStackTrace();
+			return null;
+		}
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeIfElse.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeIfElse.java
new file mode 100644
index 0000000..a0b7abe
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeIfElse.java
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+
+public class AutomakeIfElse extends Parent {
+	String condition;
+	int startLine;
+	int endLine;
+	String type;
+	public AutomakeIfElse(Directive parent, String type, String condition) {
+		super(parent);
+		this.type = type;
+		this.condition = condition;
+	}
+	public String getCondition() {
+		return condition;
+	}
+	public void setCondition(String condition) {
+		this.condition = condition;
+	}
+	public void setLines(int startLine, int endLine) {
+		this.startLine = startLine;
+		this.endLine = endLine;
+	}
+	public String getType() {
+		return type;
+	}
+	public void setType(String type) {
+		this.type = type;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeMacroDefinitionRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeMacroDefinitionRule.java
new file mode 100644
index 0000000..e4ef44d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeMacroDefinitionRule.java
@@ -0,0 +1,206 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - Modified from MacroDefinitionRule to support Automake files
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IPredicateRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.Token;
+
+class AutomakeMacroDefinitionRule implements IPredicateRule {
+	private static final int INIT_STATE = 0;
+	private static final int VAR_STATE = 1;
+	private static final int END_VAR_STATE = 2;
+	private static final int EQUAL_STATE = 3;
+	private static final int FINISH_STATE = 4;
+	private static final int ERROR_STATE = 5;
+
+	private IToken token;
+	private StringBuffer buffer = new StringBuffer();
+	protected IToken defaultToken;
+	
+	public AutomakeMacroDefinitionRule(IToken token, IToken defaultToken) {
+		this.token = token;
+		this.defaultToken = defaultToken;
+	}
+
+	public IToken getSuccessToken() {
+		return token;
+	}
+
+	public IToken evaluate(ICharacterScanner scanner, boolean resume) {
+		buffer.setLength(0);
+		int c;
+		int state = INIT_STATE;
+
+		if (resume)
+			scanToBeginOfLine(scanner);
+
+		for (c = scanner.read(); c != ICharacterScanner.EOF; c = scanner.read()) {
+			switch (state) {
+				case INIT_STATE :
+					if (c != '\n' && Character.isWhitespace((char) c)) {
+						break;
+					}
+					if (isValidCharacter(c)) {
+						state = VAR_STATE;
+					} else {
+						state = ERROR_STATE;
+					}
+					break;
+				case VAR_STATE :
+					if (isValidCharacter(c)) {
+						break;
+					}
+				case END_VAR_STATE :
+					if (Character.isWhitespace((char) c)) {
+						state = END_VAR_STATE;
+					} else if (c == ':' || c == '+') {
+						state = EQUAL_STATE;
+					} else if (c == '=') {
+						state = FINISH_STATE;
+					} else {
+//						if (state == END_VAR_STATE) {
+//							scanner.unread(); // Return back to the space
+//						}
+						state = ERROR_STATE;
+					}
+					break;
+				case EQUAL_STATE :
+					if (c == '=') {
+						state = FINISH_STATE;
+					} else {
+						state = ERROR_STATE;
+					}
+					break;
+				case FINISH_STATE :
+					break;
+				default :
+					break;
+			}
+			if (state >= FINISH_STATE) {
+				break;
+			}
+			buffer.append((char) c);
+		}
+
+		if (state == FINISH_STATE) {
+			scanToEndOfLine(scanner);
+			return token;
+		}
+
+        boolean debug = true;
+        if (debug) {
+//        	System.out.println("This should be a 'c':  " + peek(scanner));
+//                System.out.println("This is what's in the **REST OF** the buffer:");
+//                int count = 0;
+//                for (int c = scanner.read(); c != ICharacterScanner.EOF; c = scanner.read()) {
+//                        System.out.println((char) c);
+//                        count++;
+//                }
+//                // Unread what we just displayed
+//                for (int i = 0; i < count; i++) {
+//                        scanner.unread();
+//                }
+        }
+		
+		if (defaultToken.isUndefined()) {
+			// If c is EOF, we've read it and broken out of the for loop above,
+			// but we need to unread it since it got read but not put into the
+			// buffer
+			if (state == ERROR_STATE || c == ICharacterScanner.EOF)
+				scanner.unread();
+			unreadBuffer(scanner);
+            debug = true;
+            if (debug) {
+//            	System.out.println("This should be an 'i':  " + peek(scanner));
+//                    System.out.println("We've supposedly just unread the entire buffer.  Here it is:");
+//                    int count = 0;
+//                    for (int c = scanner.read(); c != ICharacterScanner.EOF; c = scanner.read()) {
+//                            System.out.println((char) c);
+//                            count++;
+//                    }
+//                    // Unread what we just displayed
+//                    for (int i = 0; i < count + 1; i++) {
+//                            scanner.unread();
+//                    }
+//                    System.out.println("... just to be safe, here's the first character:  " + peek(scanner));
+            }
+
+		}
+		
+		return Token.UNDEFINED;
+	}
+	
+	public char peek(ICharacterScanner scanner) {
+		char c = (char) scanner.read();
+		scanner.unread();
+		return c;
+	}
+
+	public IToken evaluate(ICharacterScanner scanner) {
+		return evaluate(scanner, false);
+	}
+
+	/**
+	 * Returns the characters in the buffer to the scanner.
+	 *
+	 * @param scanner the scanner to be used
+	 */
+	protected void unreadBuffer(ICharacterScanner scanner) {
+		for (int i = buffer.length() - 1; i >= 0; i--)
+			scanner.unread();
+	}
+
+	private void scanToEndOfLine(ICharacterScanner scanner) {
+		int c;
+		char[][] delimiters = scanner.getLegalLineDelimiters();
+		while ((c = scanner.read()) != ICharacterScanner.EOF) {
+			// Check for end of line since it can be used to terminate the pattern.
+			for (int i = 0; i < delimiters.length; i++) {
+				if (c == delimiters[i][0] && sequenceDetected(scanner, delimiters[i])) {
+					return;
+				}
+			}
+		}
+	}
+
+	private void scanToBeginOfLine(ICharacterScanner scanner) {
+		while(scanner.getColumn() != 0) {
+			scanner.unread();
+		}
+	}
+
+	private boolean sequenceDetected(ICharacterScanner scanner, char[] sequence) {
+		for (int i = 1; i < sequence.length; i++) {
+			int c = scanner.read();
+			if (c == ICharacterScanner.EOF) {
+				return true;
+			} else if (c != sequence[i]) {
+				// Non-matching character detected, rewind the scanner back to the start.
+				for (; i > 0; i--) {
+					scanner.unread();
+				}
+				return false;
+			}
+		}
+
+		return true;
+	}
+	protected boolean isValidCharacter(int c) {
+		char c0 = (char) c;
+		return Character.isLetterOrDigit(c0) || (c0 == '_') || (c0 == '-') || 
+		(c0 == '@') || (c0 == '+') || (c0 == '$') || (c0 == '(') || (c0 == ')');
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeMacroReferenceRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeMacroReferenceRule.java
new file mode 100644
index 0000000..678f506
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeMacroReferenceRule.java
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * Copyright (c) 2006, Red Hat, Inc.
+ * Based on MacroReferenceRule which has the following copyright notice
+ * 
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.PatternRule;
+
+public class AutomakeMacroReferenceRule extends PatternRule {
+
+	int nOfBrackets;
+	int fBracket;
+
+//	public MacroReferenceRule(IToken token) {
+//		super("$(", ")", token, (char) 0, true); //$NON-NLS-1$ //$NON-NLS-2$
+//	}
+
+	public AutomakeMacroReferenceRule(IToken token, String startSeq, String endSeq) {
+		super(startSeq, endSeq, token, (char)0, true);
+		if (endSeq.length() > 0 && endSeq.charAt(0) == '}') {
+			fBracket = '{';
+		} else {
+			fBracket = '(';
+		}
+	}
+	
+	protected IToken doEvaluate(ICharacterScanner scanner, boolean resume) {
+		nOfBrackets = 1;
+		return super.doEvaluate(scanner, resume);
+	}
+
+	protected boolean endSequenceDetected(ICharacterScanner scanner) {
+		int c;
+		char[][] delimiters = scanner.getLegalLineDelimiters();
+		while ((c = scanner.read()) != ICharacterScanner.EOF) {
+			if (fBracket == c) {
+				++nOfBrackets;
+			}
+			if (fEndSequence.length > 0 && c == fEndSequence[0]) {
+				// Check if the specified end sequence has been found.
+				if (sequenceDetected(scanner, fEndSequence, true)) {
+					if (0 == --nOfBrackets) {
+						return true;
+					}
+				}
+			} else if (fBreaksOnEOL) {
+				// Check for end of line since it can be used to terminate the pattern.
+				for (int i = 0; i < delimiters.length; i++) {
+					if (c == delimiters[i][0] && sequenceDetected(scanner, delimiters[i], false)) {
+						return true;
+					}
+				}
+			}
+		}
+		scanner.unread();
+		return false;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeTextHover.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeTextHover.java
new file mode 100644
index 0000000..483f630
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeTextHover.java
@@ -0,0 +1,187 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.IMacroDefinition;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IInformationControlCreator;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextHover;
+import org.eclipse.jface.text.ITextHoverExtension;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.Region;
+import org.eclipse.swt.graphics.Point;
+
+
+public class AutomakeTextHover implements ITextHover, ITextHoverExtension {
+
+	AutomakeEditor editor;
+	
+	public AutomakeTextHover(AutomakeEditor editor) {
+		this.editor = editor;
+	}
+	
+	public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
+		TargetRule target = null;
+		String[] preReqs = null;
+		
+		if (hoverRegion == null || hoverRegion.getLength() == 0)
+			return null;
+		Automakefile makefile = (Automakefile) editor.getMakefile();
+		if (makefile == null)
+			return null;
+		
+		String hoverText;
+		int hoverLine;
+		try {
+			hoverText = textViewer.getDocument().get(hoverRegion.getOffset(), hoverRegion.getLength());
+			hoverLine = textViewer.getDocument().getLineOfOffset(hoverRegion.getOffset());
+		} catch (BadLocationException e) {
+			return null;
+		}
+		
+		// Automatic variables
+		if (hoverText.startsWith("$")) {
+			IDirective containingDirective = makefile.getDirectiveContainingLine(hoverLine);
+			if (containingDirective instanceof TargetRule) {
+				target = (TargetRule) containingDirective;
+			}
+			if (target == null)
+				return "";
+			switch (hoverText.charAt(1)) {
+			case '@':
+				return target.getTarget().toString();
+			case '<':
+				preReqs = target.getPrerequisites();
+				if (preReqs != null && preReqs.length > 0)
+					return preReqs[0];
+				break;
+			// FIXME:  implement $* ?
+//			case '*':
+//				break;
+			case '?':
+				preReqs = target.getPrerequisites();
+				if (preReqs != null && preReqs.length > 0) {
+					String toReturn = "";
+					toReturn = preReqs[0];
+					for (int i = 1; i < preReqs.length; i++) {
+						toReturn += " " + preReqs[i];
+					}
+					return toReturn;
+				}
+				break;
+			case '%':
+//				if (target instanceOf ArchiveTarget) {
+//					return target.getMember();
+//				} else {
+//					error;
+//				}
+//				break;
+			default:
+				break;
+			}
+		} else {
+			// Macros
+			IMacroDefinition[] macroDefinitions = makefile.getMacroDefinitions(hoverText);
+			for (int i = 0; i < macroDefinitions.length; i++) {
+				IMacroDefinition definition = macroDefinitions[i];
+				if (definition.getName().equals(hoverText))
+					return definition.getValue().toString();
+			}
+		}
+		
+//		IRule[] rules = makefile.getRules();
+//		for (int i = 0; i < rules.length; i++) {
+//			rule = rules[i];
+//			System.out.println("rule:  " + rule);
+//			System.out.println("target:  " + rule.getTarget());
+//			ICommand[] commands = rule.getCommands();
+//			for (int j = 0; j < commands.length; j++) {
+//				ICommand command = commands[j];
+//				System.out.println("command:  " + command);
+//			}
+//		}
+		return "";
+	}
+
+	public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
+		
+		if (textViewer != null) {
+			/*
+			 * If the hover offset falls within the selection range return the
+			 * region for the whole selection.
+			 */
+			Point selectedRange = textViewer.getSelectedRange();
+			if (selectedRange.x >= 0 && selectedRange.y > 0
+					&& offset >= selectedRange.x
+					&& offset <= selectedRange.x + selectedRange.y)
+				return new Region(selectedRange.x, selectedRange.y);
+			else {
+				return findWord(textViewer.getDocument(), offset);
+			}
+		}
+		return null;
+	}
+
+	private IRegion findWord(IDocument document, int offset) {
+		int start = -1;
+		int end = -1;
+
+		try {
+			int pos = offset;
+			char c;
+
+			while (pos >= 0) {
+				c = document.getChar(pos);
+				if (!Character.isJavaIdentifierPart(c) &&
+						(c != '@') && (c != '<') && (c != '*') && (c != '?') && (c != '%'))
+					break;
+				--pos;
+			}
+
+			start = pos;
+
+			pos = offset;
+			int length = document.getLength();
+
+			while (pos < length) {
+				c = document.getChar(pos);
+				if (!Character.isJavaIdentifierPart(c) &&
+						(c != '@') && (c != '<') && (c != '*') && (c != '?') && (c != '%'))
+					break;
+				++pos;
+			}
+
+			end = pos;
+
+		} catch (BadLocationException x) {
+		}
+
+		if (start > -1 && end > -1) {
+			if (start == offset && end == offset)
+				return new Region(offset, 0);
+			else if (start == offset)
+				return new Region(start, end - start);
+			else
+				return new Region(start + 1, end - start - 1);
+		}
+
+		return null;
+	}
+
+	public IInformationControlCreator getHoverControlCreator() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeWordDetector.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeWordDetector.java
new file mode 100644
index 0000000..941e7d4
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeWordDetector.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.jface.text.rules.IWordDetector;
+
+public class AutomakeWordDetector implements IWordDetector {
+	
+	private static final String correctStartSpecChars = "$%*().><"; //$NON-NLS-1$
+	private static final String correctSpecChars = "?@$/\\<*%"; //$NON-NLS-1$
+	
+	public boolean isWordStart(char character) {
+		return Character.isLetterOrDigit(character) || (correctStartSpecChars.indexOf(character) >= 0);
+	}
+
+	public boolean isWordPart(char character) {
+		return Character.isLetterOrDigit(character) || (correctSpecChars.indexOf(character) >= 0);
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Automakefile.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Automakefile.java
new file mode 100644
index 0000000..2879c5b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Automakefile.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - Modified from PosixMakeFile to support Automake files
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.IOException;
+import org.eclipse.cdt.make.core.makefile.IDirective;
+
+
+public class Automakefile extends GNUAutomakefile {
+
+	public Automakefile() {
+		super();
+	}
+
+	protected IDirective getDirectiveContainingLine(int line) {
+		int startLine, endLine;
+		IDirective[] directives = this.getDirectives();
+		for (int i = 0; i < directives.length; i++) {
+			IDirective directive = directives[i];
+			startLine = directive.getStartLine();
+			endLine = directive.getEndLine();
+			if (startLine <= line && endLine >= line)
+				return directive;
+		}
+		return null;
+	}
+	
+	public static void main(String[] args) {
+		try {
+			String filename = "Makefile.am"; //$NON-NLS-1$
+			if (args.length == 1) {
+				filename = args[0];
+			}
+			Automakefile makefile = new Automakefile();
+			makefile.parse(filename);
+			IDirective[] directives = makefile.getDirectives();
+			//IDirective[] directives = makefile.getBuiltins();
+			for (int i = 0; i < directives.length; i++) {
+				//System.out.println("Rule[" + i +"]");
+				System.out.print(directives[i]);
+			}
+		} catch (IOException e) {
+			System.out.println(e);
+		}
+	}
+	
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileCodeScanner.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileCodeScanner.java
new file mode 100644
index 0000000..7bd336b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileCodeScanner.java
@@ -0,0 +1,150 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - Modified from MakefileCodeScanner to support Automake files
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jface.text.rules.EndOfLineRule;
+import org.eclipse.jface.text.rules.IPredicateRule;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.IWhitespaceDetector;
+import org.eclipse.jface.text.rules.MultiLineRule;
+import org.eclipse.jface.text.rules.SingleLineRule;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.jface.text.rules.WhitespaceRule;
+import org.eclipse.jface.text.rules.WordRule;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.AutoconfIdentifierRule;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.AutoconfWhitespaceDetector;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.ColorManager;
+
+
+public class AutomakefileCodeScanner extends AbstractMakefileCodeScanner {
+
+
+	private final static String[] keywords = { "define", "endef", "ifdef", "ifndef", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		"ifeq", "ifneq", "else", "endif", "include", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+		"-include", "sinclude", "override", "endef", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		"export", "unexport", "vpath", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		"if", "@if", "@endif" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+	private final static String[] functions = { "subst", "patsubst", "strip", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		"findstring", "filter", "sort", "dir", "notdir", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+		"suffix", "basename", "addsuffix", "addprefix", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		"join", "word", "words", "wordlist", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		"firstword", "wildcard", "error", "warning", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		"shell", "origin", "foreach", "call" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+	};
+	
+	private final static String[] automaticVariables = { "$<" , "$*" , "$@" , "$?" , "$%"
+	};
+
+	public static final String[] fTokenProperties = new String[] {
+			ColorManager.MAKE_COMMENT_COLOR,
+			ColorManager.MAKE_KEYWORD_COLOR,
+			ColorManager.MAKE_FUNCTION_COLOR,
+			ColorManager.MAKE_MACRO_REF_COLOR,
+			ColorManager.MAKE_MACRO_DEF_COLOR,
+			ColorManager.MAKE_DEFAULT_COLOR
+	};
+
+	/**
+	 * Constructor for AutomakefileCodeScanner
+	 */
+	public AutomakefileCodeScanner() {
+		super();
+		initialize();
+	}
+	
+	protected List<IRule> createRules() {
+		IToken keyword = getToken(ColorManager.MAKE_KEYWORD_COLOR);
+		IToken function = getToken(ColorManager.MAKE_FUNCTION_COLOR);
+		IToken comment = getToken(ColorManager.MAKE_COMMENT_COLOR);
+		IToken macroRef = getToken(ColorManager.MAKE_MACRO_REF_COLOR);
+		IToken macroDef = getToken(ColorManager.MAKE_MACRO_DEF_COLOR);
+		IToken other = getToken(ColorManager.MAKE_DEFAULT_COLOR);
+
+		List<IRule> rules = new ArrayList<IRule>();
+
+		// Add rule for single line comments.
+		rules.add(new EndOfLineRule("#", comment, '\\', true)); //$NON-NLS-1$
+
+		// Add generic whitespace rule.
+		rules.add(new WhitespaceRule(new IWhitespaceDetector() {
+			public boolean isWhitespace(char character) {
+				return Character.isWhitespace(character);
+			}
+		}));
+		
+		// Put before the the word rules
+		MultiLineRule defineRule = new MultiLineRule("define", "endef", macroDef); //$NON-NLS-1$ //$NON-NLS-2$
+		defineRule.setColumnConstraint(0);
+		rules.add(defineRule);
+		
+		rules.add(new AutomakeMacroDefinitionRule(macroDef, Token.UNDEFINED));
+		
+		// @AC_SUBST_VAR@
+		IPredicateRule substVarRule = new AutoconfSubstRule(macroRef);
+		rules.add(substVarRule);
+
+		// Add word rule for keywords, types, and constants.
+		// We restring the detection of the keywords to be the first column to be valid.
+		WordRule keyWordRule = new WordRule(new MakefileWordDetector(), Token.UNDEFINED);
+		for (int i = 0; i < keywords.length; i++) {
+			keyWordRule.addWord(keywords[i], keyword);
+		}
+		keyWordRule.setColumnConstraint(0);
+		rules.add(keyWordRule);
+
+
+		WordRule functionRule = new WordRule(new MakefileWordDetector(), Token.UNDEFINED);
+		for (int i = 0; i < functions.length; i++)
+			functionRule.addWord(functions[i], function);
+		rules.add(functionRule);
+		
+		WordRule automaticVarRule = new WordRule(new AutomakeWordDetector(), Token.UNDEFINED);
+		for (int i = 0; i < automaticVariables.length; i++)
+			automaticVarRule.addWord(automaticVariables[i], keyword);
+		rules.add(automaticVarRule);
+
+//		rules.add(new SingleLineRule("$(", ")", macroRef)); //$NON-NLS-1$ //$NON-NLS-2$
+//		rules.add(new SingleLineRule("${", "}", macroRef)); //$NON-NLS-1$ //$NON-NLS-2$
+		rules.add(new AutomakeMacroReferenceRule(macroRef, "$(", ")")); //$NON-NLS-1$ //$NON-NLS-2$
+		rules.add(new AutomakeMacroReferenceRule(macroRef, "${", "}")); //$NON-NLS-1$ //$NON-NLS-2$
+		// Add word rule for identifier.
+
+		rules.add(new AutoconfIdentifierRule(other));
+		
+		// Make sure we don't treat "\#" as comment start.
+		rules.add(new SingleLineRule("\\#", null, Token.UNDEFINED));
+		
+		rules.add(new WhitespaceRule(new AutoconfWhitespaceDetector()));
+
+		setDefaultReturnToken(other);
+
+		return rules;
+	}
+
+	public IToken nextToken() {
+		return super.nextToken();
+	}
+	
+	/*
+	 * @see AbstractMakefileCodeScanner#getTokenProperties()
+	 */
+	protected String[] getTokenProperties() {
+		return fTokenProperties;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileContentOutlinePage.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileContentOutlinePage.java
new file mode 100644
index 0000000..4c1fcac
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileContentOutlinePage.java
@@ -0,0 +1,322 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - Modified from MakefileContentOutlinePage for Automake files
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.cdt.make.core.makefile.IBadDirective;
+import org.eclipse.cdt.make.core.makefile.ICommand;
+import org.eclipse.cdt.make.core.makefile.IComment;
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.IEmptyLine;
+import org.eclipse.cdt.make.core.makefile.IInferenceRule;
+import org.eclipse.cdt.make.core.makefile.IMacroDefinition;
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.core.makefile.IParent;
+import org.eclipse.cdt.make.core.makefile.IRule;
+import org.eclipse.cdt.make.core.makefile.ITargetRule;
+import org.eclipse.cdt.make.core.makefile.gnu.IInclude;
+import org.eclipse.cdt.make.core.makefile.gnu.ITerminal;
+import org.eclipse.cdt.make.ui.IWorkingCopyManager;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.MakeUIImages;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+
+
+public class AutomakefileContentOutlinePage extends ContentOutlinePage implements IContentOutlinePage {
+	
+	protected IMakefile makefile;
+	protected IMakefile nullMakefile = new NullMakefile();
+
+	private class AutomakefileContentProvider implements ITreeContentProvider {
+
+		protected boolean showMacroDefinition = true;
+		protected boolean showTargetRule = true;
+		protected boolean showInferenceRule = true;
+		protected boolean showIncludeChildren = false;
+
+		protected IMakefile makefile;
+		protected IMakefile nullMakefile = new NullMakefile();
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
+		 */
+		public Object[] getChildren(Object element) {
+			if (element == fInput) {
+				return getElements(makefile);
+			} else if (element instanceof IDirective) {
+				return getElements(element);
+			}
+			return new Object[0];
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
+		 */
+		public Object getParent(Object element) {
+			if (element instanceof IMakefile) {
+				return fInput;
+			} else if (element instanceof IDirective) {
+				return ((IDirective)element).getParent();
+			}
+			return fInput;
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
+		 */
+		public boolean hasChildren(Object element) {
+			if (element == fInput) {
+				return true;
+			} else if (element instanceof IParent) {
+				// Do not drill down in includes.
+				if (element instanceof IInclude && !showIncludeChildren) {
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
+		 */
+		public Object[] getElements(Object inputElement) {
+			IDirective[] directives;
+			if (inputElement == fInput) {
+				directives = makefile.getDirectives();
+			} else if (inputElement instanceof IRule) {
+				directives = ((IRule)inputElement).getCommands();
+			} else if (inputElement instanceof IParent) {
+				if (inputElement instanceof IInclude && !showIncludeChildren) {
+					directives = new IDirective[0];
+				} else {
+					directives = ((IParent)inputElement).getDirectives();
+				}
+			} else {
+				directives = new IDirective[0];
+			}
+			List<IDirective> list = new ArrayList<IDirective>(directives.length);
+			for (int i = 0; i < directives.length; i++) {
+				if (showMacroDefinition && directives[i] instanceof IMacroDefinition) {
+					list.add(directives[i]);
+				} else if (showInferenceRule && directives[i] instanceof IInferenceRule) {
+					list.add(directives[i]);
+				} else if (showTargetRule && directives[i] instanceof ITargetRule) {
+					list.add(directives[i]);
+				} else if (showTargetRule && directives[i] instanceof AutomakeIfElse) {
+					list.add(directives[i]);
+				} else {
+					boolean irrelevant = (directives[i] instanceof IComment ||
+							directives[i] instanceof IEmptyLine ||
+							directives[i] instanceof ITerminal); 
+					if (!irrelevant) {
+						list.add(directives[i]);
+					}
+				}
+			}
+			return list.toArray();
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
+		 */
+		public void dispose() {
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+		 */
+		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+			if (oldInput != null) {
+				makefile = nullMakefile;
+			}
+
+			if (newInput != null) {
+				IWorkingCopyManager manager= AutomakeEditorFactory.getDefault().getWorkingCopyManager();
+				makefile = manager.getWorkingCopy((IEditorInput) newInput);
+				if (makefile == null) {
+					makefile = nullMakefile;
+				}
+			}
+		}
+	}
+
+	private class AutomakefileLabelProvider extends LabelProvider implements ILabelProvider {
+
+		/* (non-Javadoc)
+		* @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
+		*/
+		public Image getImage(Object element) {
+			if (element instanceof ITargetRule) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_TARGET_RULE);
+			} else if (element instanceof IInferenceRule) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_INFERENCE_RULE);
+			} else if (element instanceof IMacroDefinition) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_MACRO);
+			} else if (element instanceof IAutomakeConditional) {
+				// Must process this before ICommand because if/else are also ICommands
+				return super.getImage(element);
+			} else if (element instanceof ICommand) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_COMMAND);
+			} else if (element instanceof IInclude) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_INCLUDE);
+			} else if (element instanceof IBadDirective) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_ERROR);
+			} else if (element instanceof AutomakeConfigMacro) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_ACMACRO);
+			}
+
+			return super.getImage(element);
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
+		 */
+		public String getText(Object element) {
+			String name;
+			if (element instanceof IRule) {
+				name = ((IRule) element).getTarget().toString().trim();
+			} else if (element instanceof IMacroDefinition) {
+				name = ((IMacroDefinition) element).getName().trim();
+			} else if (element instanceof AutomakeIfElse) {
+				AutomakeIfElse ifelse = (AutomakeIfElse) element;
+				// FIXME:  make this not a string comparison
+				if (ifelse.getType().equals("if")) {
+					name = "if " + ifelse.getCondition();
+				} else
+					name = "else";
+			} else if (element instanceof AutomakeConfigMacro) {
+				AutomakeConfigMacro macro = (AutomakeConfigMacro)element;
+				name = macro.getName();
+			} else {
+				name = super.getText(element);
+			}
+			if (name != null) {
+				name = name.trim();
+				if (name.length() > 25) {
+					name = name.substring(0, 25) + " ..."; //$NON-NLS-1$
+				}
+			}
+			return name;
+		}
+
+	}
+	
+	protected AutomakeEditor fEditor;
+	protected Object fInput;
+	
+	public AutomakefileContentOutlinePage(AutomakeEditor editor) {
+		super();
+		fEditor = editor;
+	}
+	
+	/**
+	 * Sets the input of the outline page
+	 */
+	public void setInput(Object input) {
+		fInput = input;
+		update();
+	}
+	
+	/**
+	 * Updates the outline page.
+	 */
+	public void update() {
+		final TreeViewer viewer = getTreeViewer();
+
+		if (viewer != null) {
+			final Control control = viewer.getControl();
+			if (control != null && !control.isDisposed()) {
+				control.getDisplay().asyncExec(new Runnable() {
+					public void run() {
+						if (!control.isDisposed()) {
+							control.setRedraw(false);
+							viewer.setInput(fInput);
+							viewer.expandAll();
+							control.setRedraw(true);
+						}
+					}
+				});
+			}
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.part.IPage#createControl(org.eclipse.swt.widgets.Composite)
+	 */
+	public void createControl(Composite parent) {
+		super.createControl(parent);
+		TreeViewer viewer = getTreeViewer();
+		viewer.setContentProvider(new AutomakefileContentProvider());
+		viewer.setLabelProvider(new AutomakefileLabelProvider());
+		if (fInput != null) {
+			viewer.setInput(fInput);
+		}
+
+//		MenuManager manager= new MenuManager("#MakefileOutlinerContext"); //$NON-NLS-1$
+//		manager.setRemoveAllWhenShown(true);
+//		manager.addMenuListener(new IMenuListener() {
+//			public void menuAboutToShow(IMenuManager m) {
+//				contextMenuAboutToShow(m);
+//			}
+//		});
+//		Control tree = viewer.getControl();
+//		Menu menu = manager.createContextMenu(tree);
+//		tree.setMenu(menu);
+//
+//		viewer.addDoubleClickListener(new IDoubleClickListener() {
+//			/* (non-Javadoc)
+//			 * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)
+//			 */
+//			public void doubleClick(DoubleClickEvent event) {
+//				if (fOpenIncludeAction != null) {
+//					fOpenIncludeAction.run();
+//				}
+//			}
+//		});
+//
+//		IPageSite site= getSite();
+//		site.registerContextMenu(MakeUIPlugin.getPluginId() + ".outline", manager, viewer); //$NON-NLS-1$
+//		site.setSelectionProvider(viewer);
+
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+	 */
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		if (oldInput != null) {
+			makefile = nullMakefile;
+		}
+
+		if (newInput != null) {
+			IWorkingCopyManager manager= AutomakeEditorFactory.getDefault().getWorkingCopyManager();
+			makefile = manager.getWorkingCopy((IEditorInput)newInput);
+			if (makefile == null) {
+				makefile = nullMakefile;
+			}
+		}
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileReconcilingStrategy.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileReconcilingStrategy.java
new file mode 100644
index 0000000..7cae0e2
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileReconcilingStrategy.java
@@ -0,0 +1,108 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - Modified from MakefileReconcilingStrategy for Automake files
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.IOException;
+import java.io.StringReader;
+
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.ui.IWorkingCopyManager;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.reconciler.DirtyRegion;
+import org.eclipse.jface.text.reconciler.IReconcilingStrategy;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+import org.eclipse.ui.texteditor.ITextEditor;
+
+
+public class AutomakefileReconcilingStrategy implements IReconcilingStrategy {
+
+	private int fLastRegionOffset;
+	private ITextEditor fEditor;	
+	private IWorkingCopyManager fManager;
+	private IDocumentProvider fDocumentProvider;
+	private AutomakefileContentOutlinePage fOutliner;
+	private IReconcilingParticipant fMakefileReconcilingParticipant;
+	private AutomakeErrorHandler fErrorHandler;
+	private IEditorInput input;
+	
+	public AutomakefileReconcilingStrategy(AutomakeEditor editor) {
+		fOutliner= editor.getAutomakeOutlinePage();
+		fLastRegionOffset = Integer.MAX_VALUE;
+		fEditor= editor;
+		input = (IEditorInput) fEditor.getEditorInput();
+		fManager= AutomakeEditorFactory.getDefault().getWorkingCopyManager();
+		fDocumentProvider= AutomakeEditorFactory.getDefault().getAutomakefileDocumentProvider();
+		fErrorHandler= new AutomakeErrorHandler(fDocumentProvider.getDocument(input));
+		if (fEditor instanceof IReconcilingParticipant) {
+			fMakefileReconcilingParticipant= (IReconcilingParticipant)fEditor;
+		}
+	}
+	
+	/**
+	 * @see IReconcilingStrategy#reconcile(document)
+	 */
+	public void setDocument(IDocument document) {
+	}	
+
+
+	/**
+	 * @see IReconcilingStrategy#reconcile(region)
+	 */
+	public void reconcile(IRegion region) {
+		// We use a trick to avoid running the reconciler multiple times
+		// on a file when it gets changed. This is because this gets called
+		// multiple times with different regions of the file, we do a 
+		// complete parse on the first region.
+		if(region.getOffset() <= fLastRegionOffset) {
+			reconcile();
+		}
+		fLastRegionOffset = region.getOffset();
+	}
+
+	/**
+	 * @see IReconcilingStrategy#reconcile(dirtyRegion, region)
+	 */
+	public void reconcile(DirtyRegion dirtyRegion, IRegion region) {
+		// FIXME: This seems to generate too much flashing in
+		// the contentoutline viewer.
+		//reconcile();
+	}
+	
+	private void reconcile() {
+		try {
+			IMakefile makefile = fManager.getWorkingCopy(fEditor.getEditorInput());
+			if (makefile != null) {
+				String content = fDocumentProvider.getDocument(input).get();
+				StringReader reader = new StringReader(content);
+				try {
+					makefile.parse(makefile.getFileURI(), reader);
+				} catch (IOException e) {
+				}
+				
+				fOutliner.update();
+				fErrorHandler.update(makefile);
+			}
+		} finally {
+			try {
+				if (fMakefileReconcilingParticipant != null) {
+					fMakefileReconcilingParticipant.reconciled();
+				}
+			} finally {
+				//
+			}
+		}
+ 	}	
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileSourceConfiguration.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileSourceConfiguration.java
new file mode 100644
index 0000000..acffc5e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileSourceConfiguration.java
@@ -0,0 +1,148 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - Modified from MakefileSourceConfiguration to support Automake
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITextHover;
+import org.eclipse.jface.text.contentassist.ContentAssistant;
+import org.eclipse.jface.text.contentassist.IContentAssistant;
+import org.eclipse.jface.text.presentation.IPresentationReconciler;
+import org.eclipse.jface.text.presentation.PresentationReconciler;
+import org.eclipse.jface.text.reconciler.IReconciler;
+import org.eclipse.jface.text.reconciler.MonoReconciler;
+import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.SourceViewerConfiguration;
+import org.eclipse.jface.util.PropertyChangeEvent;
+
+
+public class AutomakefileSourceConfiguration extends
+		MakefileSourceConfiguration {
+	
+	AutomakeEditor editor;
+	AutomakefileCodeScanner codeScanner;
+	AutomakeTextHover amHover;
+	
+	/**
+	 * Constructor for MakeConfiguration
+	 */
+	public AutomakefileSourceConfiguration(IPreferenceStore preferenceStore) {
+		super(preferenceStore, null);
+	}
+	
+	public AutomakefileSourceConfiguration(IPreferenceStore preferenceStore, AutomakeEditor editor) {
+		super(preferenceStore, editor);
+		this.editor = editor;
+	}
+	
+	public AutomakefileCodeScanner getAutomakeCodeScanner() {
+		if (null == codeScanner)
+			codeScanner = new AutomakefileCodeScanner();
+		return codeScanner;
+
+	}
+	
+	public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) {
+		if (amHover == null)
+			amHover = new AutomakeTextHover(editor);
+		return amHover;
+	}
+	
+	/**
+	 * @param event
+	 */
+	public void adaptToPreferenceChange(PropertyChangeEvent event) {
+		AutomakefileCodeScanner scanner = getAutomakeCodeScanner();
+		scanner.adaptToPreferenceChange(event);
+	}
+	
+	/**
+	 * @param event
+	 * @return
+	 */
+	public boolean affectsBehavior(PropertyChangeEvent event) {
+		AutomakefileCodeScanner scanner = getAutomakeCodeScanner();
+		return scanner.affectsBehavior(event);
+	}
+	
+	public IPresentationReconciler getPresentationReconciler(ISourceViewer v) {
+
+		PresentationReconciler reconciler = new PresentationReconciler();
+
+		DefaultDamagerRepairer dr = new DefaultDamagerRepairer(getAutomakeCodeScanner());
+		reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
+		reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
+
+		dr = new DefaultDamagerRepairer(getAutomakeCodeScanner());
+		reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_COMMENT_PARTITION);
+		reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_COMMENT_PARTITION);
+
+		dr = new DefaultDamagerRepairer(getAutomakeCodeScanner());
+		reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_MACRO_ASSIGNEMENT_PARTITION);
+		reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_MACRO_ASSIGNEMENT_PARTITION);
+
+		dr = new DefaultDamagerRepairer(getAutomakeCodeScanner());
+		reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_INCLUDE_BLOCK_PARTITION);
+		reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_INCLUDE_BLOCK_PARTITION);
+
+		dr = new DefaultDamagerRepairer(getAutomakeCodeScanner());
+		reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_IF_BLOCK_PARTITION);
+		reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_IF_BLOCK_PARTITION);
+
+		dr = new DefaultDamagerRepairer(getAutomakeCodeScanner());
+		reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_DEF_BLOCK_PARTITION);
+		reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_DEF_BLOCK_PARTITION);
+
+		dr = new DefaultDamagerRepairer(getAutomakeCodeScanner());
+		reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_OTHER_PARTITION);
+		reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_OTHER_PARTITION);
+		return reconciler;
+	}
+
+	
+	/**
+	 * @see SourceViewerConfiguration#getReconciler(ISourceViewer)
+	 */
+	public IReconciler getReconciler(ISourceViewer sourceViewer) {
+		if (editor != null && editor.isEditable()) {
+			MonoReconciler reconciler= new MonoReconciler(new AutomakefileReconcilingStrategy(editor), false);
+			reconciler.setDelay(1000);
+			reconciler.setProgressMonitor(new NullProgressMonitor());
+			return reconciler;
+		}
+		return null;
+	}
+	
+	/**
+	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getContentAssistant(ISourceViewer)
+	 */
+	public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
+		ContentAssistant assistant = new ContentAssistant();
+		assistant.setContentAssistProcessor(new AutomakeCompletionProcessor(editor), IDocument.DEFAULT_CONTENT_TYPE);
+		assistant.setContentAssistProcessor(new AutomakeCompletionProcessor(editor), MakefilePartitionScanner.MAKEFILE_COMMENT_PARTITION);
+		assistant.setContentAssistProcessor(new AutomakeCompletionProcessor(editor), MakefilePartitionScanner.MAKEFILE_DEF_BLOCK_PARTITION);
+		assistant.setContentAssistProcessor(new AutomakeCompletionProcessor(editor), MakefilePartitionScanner.MAKEFILE_IF_BLOCK_PARTITION);
+		assistant.setContentAssistProcessor(new AutomakeCompletionProcessor(editor), MakefilePartitionScanner.MAKEFILE_INCLUDE_BLOCK_PARTITION);
+		assistant.setContentAssistProcessor(new AutomakeCompletionProcessor(editor), MakefilePartitionScanner.MAKEFILE_MACRO_ASSIGNEMENT_PARTITION);
+
+		assistant.enableAutoActivation(true);
+		assistant.setAutoActivationDelay(500);
+
+		assistant.setProposalPopupOrientation(IContentAssistant.CONTEXT_INFO_BELOW);
+		assistant.setContextInformationPopupOrientation(IContentAssistant.CONTEXT_INFO_BELOW);
+
+		return assistant;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileUtil.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileUtil.java
new file mode 100644
index 0000000..1cc1f62
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileUtil.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007, 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+public class AutomakefileUtil {
+
+	// Look for Automake conditionals which optionally
+	// activate or disable a Makefile rule command.
+	public static boolean isAutomakeCommand(String line) {
+		return line.matches("^@[a-z_A-Z0-9]+@\\t.*$"); //$NON-NLS-1$
+	}
+	
+	public static boolean isIfBlock(String line) {
+		return line.startsWith("if"); //$NON-NLS-1$
+	}
+
+	public static boolean isElseBlock(String line) {
+		return line.startsWith("else"); //$NON-NLS-1$
+	}
+	
+	public static boolean isElseIfBlock(String line) {
+		return line.startsWith("else if"); //$NON-NLS-1$
+	}
+
+	public static boolean isEndifBlock(String line) {
+		return line.startsWith("endif"); //$NON-NLS-1$
+	}
+	
+	public static boolean isConfigMacro(String line) {
+		return line.matches("\\s*@[a-z_A-Z0-9]+@"); //$NON-NLS-1$
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/BadDirective.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/BadDirective.java
new file mode 100644
index 0000000..2186b49
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/BadDirective.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IBadDirective;
+
+public class BadDirective extends Directive implements IBadDirective {
+
+	String line;
+
+	public BadDirective(Directive parent, String s) {
+		super(parent);
+		line = s;
+	}
+
+	public String toString() {
+		return line;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Command.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Command.java
new file mode 100644
index 0000000..3d76180
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Command.java
@@ -0,0 +1,115 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.eclipse.cdt.make.core.makefile.ICommand;
+
+/**
+ * Makefile : ( statement ) *
+ * statement : command | ..  
+ * command : <tab> prefix_command string <nl>
+ * prefix_command : '-' | '@' | '+'
+ */
+public class Command extends Directive implements ICommand {
+
+	final public static char NL = '\n';
+
+	String command = ""; //$NON-NLS-1$
+	char prefix = '\0';
+
+	public Command(Directive parent, String cmd) {
+		super(parent);
+		parse(cmd);
+	}
+
+	/**
+	 *   -    If the command prefix contains a hyphen, or the -i option is
+	 * present, or the special target .IGNORE has either the current
+	 * target as a prerequisite or has no prerequisites, any error
+	 * found while executing the command will be ignored.
+	 */
+	public boolean shouldIgnoreError() {
+		// Check for the prefix hyphen in the command.
+		if (getPrefix() == HYPHEN) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * @    If the command prefix contains an at sign and the
+	 * command-line -n option is not specified, or the -s option is
+	 * present, or the special target .SILENT has either the current
+	 * target as a prerequisite or has no prerequisites, the command
+	 * will not be written to standard output before it is executed.
+	 */
+	public boolean shouldBeSilent() {
+		// Check for the prefix at sign
+		if (getPrefix() == AT) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * +    If the command prefix contains a plus sign, this indicates a
+	 * command line that will be executed even if -n, -q or -t is
+	 * specified.
+	 */
+	public boolean shouldExecute() {
+		// Check for the prefix at sign
+		if (getPrefix() == PLUS) {
+			return true;
+		}
+		return false;
+	}
+
+	public String toString() {
+		StringBuffer cmd = new StringBuffer();
+		cmd.append( '\t');
+		if (getPrefix() != 0) {
+			cmd.append(getPrefix());
+		}
+		cmd.append(command).append('\n');
+		return cmd.toString();
+	}
+
+	public boolean equals(Command cmd) {
+		return cmd.toString().equals(toString());
+	}
+
+	char getPrefix() {
+		return prefix;
+	}
+
+	/**
+	* command : <tab> prefix_command string <nl>
+	*/
+	void parse(String cmd) {
+		command = cmd.trim();
+		if (command.startsWith(HYPHEN_STRING) || command.startsWith(AT_STRING) || command.startsWith(PLUS_STRING)) {
+			prefix = command.charAt(0);
+			command = command.substring(1).trim();
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.make.core.makefile.ICommand#execute(java.lang.String[], java.io.File)
+	 */
+	public Process execute(String shell, String[] envp, File dir) throws IOException {
+		String[] cmdArray = new String[] { shell, "-c", command}; //$NON-NLS-1$
+		return Runtime.getRuntime().exec(cmdArray, envp, dir);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Comment.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Comment.java
new file mode 100644
index 0000000..772105f
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Comment.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IComment;
+
+public class Comment extends Directive implements IComment {
+
+	String comment;
+
+	public Comment(Directive parent, String cmt) {
+		super(parent);
+		if (cmt.startsWith(POUND_STRING)) {
+			comment = cmt.substring(1);
+		} else {
+			comment = cmt;
+		}
+	}
+
+	public String toString() {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append(POUND_STRING).append(comment).append('\n');
+		return buffer.toString();
+	}
+
+	public boolean equals(Comment cmt) {
+		return cmt.toString().equals(toString());
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/CompletionProposalComparator.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/CompletionProposalComparator.java
new file mode 100644
index 0000000..a92415d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/CompletionProposalComparator.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+import java.util.Comparator;
+
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+
+public class CompletionProposalComparator implements Comparator<ICompletionProposal> {
+
+	/**
+	 * Constructor for CompletionProposalComparator.
+	 */
+	public CompletionProposalComparator() {
+	}
+	
+	/* (non-Javadoc)
+	 * @see Comparator#compare(Object, Object)
+	 */
+	public int compare(ICompletionProposal o1, ICompletionProposal o2) {
+		ICompletionProposal c1= (ICompletionProposal) o1;
+		ICompletionProposal c2= (ICompletionProposal) o2;
+		return c1.getDisplayString().compareToIgnoreCase(c2.getDisplayString());
+	}	
+	
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Conditional.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Conditional.java
new file mode 100644
index 0000000..90e5828
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Conditional.java
@@ -0,0 +1,170 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - modified for Automake editor usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.gnu.IConditional;
+
+
+public abstract class Conditional extends Parent implements IConditional {
+
+    private static final String EMPTY = ""; //$NON-NLS-1$
+	String cond;
+	String arg1;
+	String arg2;
+
+	public Conditional(Directive parent, String conditional) {
+		super(parent);
+		cond = conditional;
+		parse();
+	}
+
+	public Conditional(Directive parent) {
+		this(parent, EMPTY, EMPTY, EMPTY);
+	}
+
+	public Conditional(Directive parent, String conditional, String argument1, String argument2) {
+		super(parent);
+		arg1 = argument1;
+		arg2 = argument2;
+		cond = conditional;
+	}
+
+
+	public String getConditional() {
+		return cond;
+	}
+
+	public String getArg1() {
+		return arg1;
+	}
+
+	public String getArg2() {
+		return arg2;
+	}
+	
+	public boolean isIf() {
+		return false;
+	}
+
+	public boolean isIfdef() {
+		return false;
+	}
+
+	public boolean isIfndef() {
+		return false;
+	}
+
+	public boolean isIfeq() {
+		return false;
+	}
+
+	public boolean isIfneq() {
+		return false;
+	}
+
+	public boolean isElse() {
+		return false;
+	}
+
+	public boolean isEndif() {
+		return false;
+	}
+
+	/**
+	 * Formats of the conditional string.
+	 * ifeq (ARG1, ARG2)
+	 * ifeq 'ARG1' 'ARG2'
+	 * ifeq "ARG1" "ARG2"
+	 * ifeq "ARG1" 'ARG2'
+	 * ifeq 'ARG1' "ARG2"
+	 */
+	protected void parse() {
+		String line = getConditional().trim();
+
+		char terminal = line.charAt(0) == '(' ? ',' : line.charAt(0);
+ 
+		if (line.length() < 5 && terminal != ',' && terminal != '"' && terminal != '\'') {
+			arg1 = arg2 = EMPTY;
+			return;
+		}
+ 
+		// Find the end of the first string.
+		int count = 0;
+		// For the (ARG1, ARG2) format.
+
+		// get the first ARG1
+		if (terminal == ',') {
+			int paren = 0;
+			for (count = 1; count < line.length(); count++) {
+				char ch = line.charAt(count);
+				if (ch == '(') {
+					paren++;
+				} else if (ch == ')') {
+					paren--;
+				}
+				if (ch == terminal && paren <= 0) {
+					break;
+				}
+			}
+		} else {
+			for (count = 1; count < line.length(); count++) {
+				if (line.charAt(count) == terminal) {
+					break;
+				}
+			}
+		}
+
+		if (count >= line.length()) {
+			arg1 = arg2 = EMPTY;
+			return;			
+		}
+
+		arg1 = line.substring(1, count);
+ 
+		/* Find the start of the second string.  */
+		line = line.substring(count + 1).trim();
+ 
+		terminal = terminal == ',' ? ')' : line.charAt(0);
+		if (terminal != ')' && terminal != '"' && terminal != '\'') {
+			arg2 = EMPTY;
+			return;
+		}
+ 
+		count = 0;
+		/* Find the end of the second string.  */
+		if (terminal == ')') {
+			int paren = 0;
+			for (count = 0; count < line.length(); count++) {
+				char ch = line.charAt(count);
+				if (ch == '(') {
+					paren++;
+				} else if (ch == ')') {
+					paren--;
+				}
+				if (ch == terminal && paren <= 0) {
+					break;
+				}
+			}
+		} else {
+			for (count = 1; count < line.length(); count++) {
+				if (line.charAt(count) == terminal) {
+					break;
+				}
+			}
+		}
+		if (count > line.length()) {
+			arg2 = EMPTY;
+		} else {
+			arg2 = line.substring(0, count);
+		}
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/DefaultRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/DefaultRule.java
new file mode 100644
index 0000000..2967311
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/DefaultRule.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IDefaultRule;
+
+/**
+ * .DEFAULT
+ * If the makefile uses this special target, the application shall ensure that it is
+ * specified with commands, but without prerequisites.
+ */
+public class DefaultRule extends SpecialRule implements IDefaultRule {
+
+	public DefaultRule(Directive parent, Command[] cmds) {
+		super(parent, new Target(MakeFileConstants.RULE_DEFAULT), new String[0], cmds);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/DefineVariable.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/DefineVariable.java
new file mode 100644
index 0000000..b4bde3e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/DefineVariable.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+public class DefineVariable extends GNUVariableDef {
+
+	public DefineVariable(Directive parent, String name, StringBuffer value) {
+		super(parent, name, value);
+	}
+
+	public boolean isMultiLine() {
+		return true;
+	}
+
+	public String toString() {
+		StringBuffer sb = new StringBuffer(GNUMakefileConstants.VARIABLE_DEFINE);
+		sb.append(getName()).append('\n');
+		sb.append(getValue());
+		sb.append(GNUMakefileConstants.TERMINAL_ENDEF);
+		return sb.toString();
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/DeleteOnErrorRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/DeleteOnErrorRule.java
new file mode 100644
index 0000000..fc25fbb
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/DeleteOnErrorRule.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.gnu.IDeleteOnErrorRule;
+
+/**
+ * .DELETE_ON_ERROR
+ *  If `.DELETE_ON_ERROR' is mentioned as a target anywhere in the
+ *  makefile, then `make' will delete the target of a rule if it has
+ *  changed and its commands exit with a nonzero exit status, just as
+ *  it does when it receives a signal.
+ */
+public class DeleteOnErrorRule extends SpecialRule implements IDeleteOnErrorRule {
+
+	public DeleteOnErrorRule(Directive parent, String[] reqs) {
+		super(parent, new Target(GNUMakefileConstants.RULE_DELETE_ON_ERROR), reqs, new Command[0]);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Directive.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Directive.java
new file mode 100644
index 0000000..06f0826
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Directive.java
@@ -0,0 +1,100 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+
+public abstract class Directive implements IDirective {
+
+	int endLine;
+	int startLine;
+	String filename;
+	IMakefile makefile;
+	Directive parent;
+
+	public Directive(Directive owner) {
+		parent = owner;
+	}
+
+	public Directive(int start, int end) {
+		setLines(start, end);
+	}
+
+	public abstract String toString();
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.make.core.makefile.IDirective#getEndLine()
+	 */
+	public int getEndLine() {
+		return endLine;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.make.core.makefile.IDirective#getStartLine()
+	 */
+	public int getStartLine() {
+		return startLine;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.make.core.makefile.IDirective#getParent()
+	 */
+	public IDirective getParent() {
+		return parent;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.make.core.makefile.IDirective#getFileName()
+	 */
+	public String getFileName() {
+		if (filename == null) {
+			if (parent != null) {
+				filename = parent.getFileName();
+			}
+		}
+		return filename;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.make.core.makefile.IDirective#getMakefile()
+	 */
+	public IMakefile getMakefile() {
+		if (makefile == null) {
+			if (parent != null) {
+				makefile = parent.getMakefile();
+			}
+		}
+		return makefile;
+	}
+
+	public void setParent(Directive owner) {
+		parent = owner;
+	}
+
+	public void setStartLine(int lineno) {
+		startLine = lineno;
+	}
+
+	public void setEndLine(int lineno) {
+		endLine = lineno;
+	}
+
+	public void setLines(int start, int end) {
+		setStartLine(start);
+		setEndLine(end);
+	}
+
+	public void setFilename(String name) {
+		filename = name;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/EditorUtility.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/EditorUtility.java
new file mode 100644
index 0000000..ffb99a2
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/EditorUtility.java
@@ -0,0 +1,561 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Markus Schorn (Wind River Systems)
+ *     Norbert Ploett (Siemens AG)
+ *     Anton Leherbauer (Wind River Systems)
+ *     Ed Swartz (Nokia)
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.text.MessageFormat;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.model.CModelException;
+import org.eclipse.cdt.core.model.CoreModel;
+import org.eclipse.cdt.core.model.IBinary;
+import org.eclipse.cdt.core.model.IBuffer;
+import org.eclipse.cdt.core.model.ICElement;
+import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.cdt.core.model.IIncludeReference;
+import org.eclipse.cdt.core.model.ISourceReference;
+import org.eclipse.cdt.core.model.ITranslationUnit;
+import org.eclipse.cdt.core.model.IWorkingCopy;
+import org.eclipse.cdt.core.resources.FileStorage;
+import org.eclipse.cdt.ui.CUIPlugin;
+import org.eclipse.core.filebuffers.FileBuffers;
+import org.eclipse.core.filesystem.URIUtil;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IStorage;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.jface.action.Action;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.MessageBox;
+import org.eclipse.ui.IEditorDescriptor;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorRegistry;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.editors.text.EditorsUI;
+import org.eclipse.ui.part.FileEditorInput;
+
+public class EditorUtility {
+
+	/**
+	 * The ID of the default text editor
+	 */
+	public static final String DEFAULT_TEXT_EDITOR_ID = EditorsUI.DEFAULT_TEXT_EDITOR_ID;
+
+	private EditorUtility () {
+	}
+
+	/** 
+	 * Tests if a cu is currently shown in an editor
+	 * @return the IEditorPart if shown, null if element is not open in an editor
+	 */     
+	public static IEditorPart isOpenInEditor(Object inputElement) {
+		IEditorInput input = null;
+                
+		try {
+			input = getEditorInput(inputElement);
+		} catch (CModelException x) {
+			//CUIPlugin.log(x.getStatus());
+		}
+                
+		if (input != null) {
+			IWorkbenchPage p= CUIPlugin.getActivePage();
+			if (p != null) {
+				return p.findEditor(input);
+			}
+		}
+                
+		return null;
+	}
+
+	/**
+	 * Opens an editor for an element such as <code>ICElement</code>, 
+	 * <code>IFile</code>, or <code>IStorage</code>.
+	 * The editor is activated by default.
+	 * @return the IEditorPart or null if wrong element type or opening failed
+	 */
+	public static IEditorPart openInEditor(Object inputElement) throws CModelException, PartInitException {
+		return openInEditor(inputElement, true);
+	}
+
+	/**
+	 * Opens an editor for an element (ICElement, IFile, IStorage...)
+	 * @return the IEditorPart or null if wrong element type or opening failed
+	 */
+	public static IEditorPart openInEditor(Object inputElement, boolean activate) throws CModelException, PartInitException {
+                
+		if (inputElement instanceof IFile) {
+			return openInEditor((IFile) inputElement, activate);
+		}
+                
+		IEditorInput input = getEditorInput(inputElement);
+                
+		if (input != null) {
+			return openInEditor(input, getEditorID(input, inputElement), activate);
+		}
+		
+		return null;
+	}
+
+	// Following is not needed and drags in internal reference to CEditor.
+	
+//	/** 
+//	 * Selects a C Element in an editor
+//	 */     
+//	public static void revealInEditor(IEditorPart part, ICElement element) {
+//		if (element != null && part instanceof CEditor) {
+//			((CEditor) part).setSelection(element);
+//		}
+//	}
+
+	private static IEditorPart openInEditor(IFile file, boolean activate) throws PartInitException {
+		if (!file.getProject().isAccessible()){
+			closedProject(file.getProject());
+			return null;
+		}
+		
+		if (file != null) {
+		try {
+				if (!isLinked(file)) {
+					File tempFile = file.getRawLocation().toFile();
+				
+					if (tempFile != null){
+						String canonicalPath = null;
+						try {
+							canonicalPath = tempFile.getCanonicalPath();
+						} catch (IOException e1) {}
+						
+						if (canonicalPath != null){
+							IPath path = new Path(canonicalPath);
+							file = CUIPlugin.getWorkspace().getRoot().getFileForLocation(path);
+						}
+					}
+				}
+				
+				IEditorInput input = getEditorInput(file);
+				if (input != null) {
+					return openInEditor(input, getEditorID(input, file), activate);
+				}
+			} catch (CModelException e) {}
+		}
+		return null;
+	}
+	
+	@SuppressWarnings("deprecation")
+	public static boolean isLinked(IFile file) {
+		if (file.isLinked())
+			return true;
+		
+		IPath path = file.getLocation();
+		while (path.segmentCount() > 0) {
+			path = path.removeLastSegments(1);
+			IContainer[] containers = ResourcesPlugin.getWorkspace().getRoot().findContainersForLocation(path);
+			
+			for(int i=0; i<containers.length; i++) {
+				if (containers[i] instanceof IFolder && ((IFolder)containers[i]).isLinked()) {
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+
+	/**
+	 * Open error dialog about closed project.
+	 * @param project
+	 */
+	private static void closedProject(IProject project) {
+		MessageBox errorMsg = new MessageBox(CUIPlugin.getActiveWorkbenchShell(), SWT.ICON_ERROR | SWT.OK);
+		errorMsg.setText(CUIPlugin.getResourceString("EditorUtility.closedproject")); //$NON-NLS-1$
+		String desc= CUIPlugin.getResourceString("Editorutility.closedproject.description"); //$NON-NLS-1$
+		errorMsg.setMessage (MessageFormat.format(desc, new Object[]{project.getName()})); 
+		errorMsg.open();
+		
+	}
+
+	private static IEditorPart openInEditor(IEditorInput input, String editorID, boolean activate) throws PartInitException {
+		if (input != null) {
+			IWorkbenchPage p= CUIPlugin.getActivePage();
+			if (p != null) {
+				IEditorPart editorPart= p.openEditor(input, editorID, activate);
+				return editorPart;
+			}
+		}
+		return null;
+	}
+
+	private static IEditorInput getEditorInput(ICElement element) throws CModelException {
+		while (element != null) {
+ 			if (element instanceof ISourceReference) {
+ 				ITranslationUnit tu = ((ISourceReference)element).getTranslationUnit();
+ 				if (tu != null) {
+ 					element = tu;                    
+ 				}
+ 			}
+			if (element instanceof IWorkingCopy && ((IWorkingCopy) element).isWorkingCopy()) 
+				element= ((IWorkingCopy) element).getOriginalElement();
+ 
+			if (element instanceof ITranslationUnit) {
+				ITranslationUnit unit= (ITranslationUnit) element;
+				IResource resource= unit.getResource();
+				if (resource instanceof IFile) {
+					return new FileEditorInput((IFile) resource);
+				}
+				return new ExternalEditorInput(unit, new FileStorage(unit.getPath()));
+			}
+                        
+			if (element instanceof IBinary) {
+				return new ExternalEditorInput(getStorage((IBinary)element), (IPath)null);
+			}
+                        
+			element= element.getParent();
+		}
+                
+		return null;
+	}
+
+	public static IEditorInput getEditorInput(Object input) throws CModelException {
+		if (input instanceof ICElement) {
+			return getEditorInput((ICElement) input);
+		}
+		if (input instanceof IFile) { 
+			return new FileEditorInput((IFile) input);
+		}
+		if (input instanceof IStorage) { 
+			return new ExternalEditorInput((IStorage)input);
+		}
+		return null;
+	}
+
+	/**
+	 * Utility method to open an editor for the given file system location
+	 * using {@link #getEditorInputForLocation(IPath, ICElement)} to create
+	 * the editor input.
+	 * 
+	 * @param location  a file system location
+	 * @param element  an element related to the target file, may be <code>null</code>
+	 * @throws PartInitException 
+	 */
+	public static IEditorPart openInEditor(IPath location, ICElement element) throws PartInitException {
+		IEditorInput input= getEditorInputForLocation(location, element);
+		return EditorUtility.openInEditor(input, getEditorID(input, element), true);		
+	}
+
+	/**
+	 * Utility method to get an editor input for the given file system location.
+	 * If the location denotes a workspace file, a <code>FileEditorInput</code>
+	 * is returned, otherwise, the input is an <code>IStorageEditorInput</code>
+	 * assuming the location points to an existing file in the file system.
+	 * The <code>ICElement</code> is used to determine the associated project
+	 * in case the location can not be resolved to a workspace <code>IFile</code>.
+	 * 
+	 * @param location  a valid file system location
+	 * @param context  an element related to the target file, may be <code>null</code>
+	 * @return an editor input
+	 */
+	public static IEditorInput getEditorInputForLocation(IPath location, ICElement context) {
+		IFile resource= getWorkspaceFileAtLocation(location, context);
+		if (resource != null) {
+			return new FileEditorInput(resource);
+		} 
+		
+		if (context == null) {
+			// try to synthesize a context for a location appearing on a project's
+			// include paths
+			try {
+				ICProject[] projects = CCorePlugin.getDefault().getCoreModel().getCModel().getCProjects();
+				outerFor: for (int i = 0; i < projects.length; i++) {
+					IIncludeReference[] includeReferences = projects[i].getIncludeReferences();
+					for (int j = 0; j < includeReferences.length; j++) {
+						if (includeReferences[j].isOnIncludeEntry(location)) {
+							context = projects[i];
+							break outerFor;
+						}
+					}
+				}
+				if (context == null && projects.length > 0) {
+					// last resort: just take any of them
+					context= projects[0];
+				}
+			} catch (CModelException e) {
+			}
+		}
+		
+		if (context != null) {
+			// try to get a translation unit from the location and associated element
+			ICProject cproject= context.getCProject();
+			if (cproject != null) {
+				ITranslationUnit unit = CoreModel.getDefault().createTranslationUnitFrom(cproject, location);
+				if (unit != null) {
+					return new ExternalEditorInput(unit, new FileStorage(location));
+				}
+				// no translation unit - still try to get a sensible marker resource
+				// from the associated element
+				IResource markerResource= cproject.getProject();
+				return new ExternalEditorInput(new FileStorage(location), markerResource);
+			}
+		}
+		return new ExternalEditorInput(new FileStorage(location));
+	}
+
+
+	/**
+	 * Utility method to resolve a file system location to a workspace resource.
+	 * If a context element is given and there are multiple matches in the workspace,
+	 * a resource with the same project of the context element are preferred.
+	 * 
+	 * @param location  a valid file system location
+	 * @param context  an element related to the target file, may be <code>null</code>
+	 * @return an <code>IFile</code> or <code>null</code>
+	 */
+	private static IFile getWorkspaceFileAtLocation(IPath location, ICElement context) {
+		IFile file= FileBuffers.getWorkspaceFileAtLocation(location);
+		if (file == null) {
+			// try to find a linked resource
+			IProject project= null;
+			if (context != null) {
+				ICProject cProject= context.getCProject();
+				if (cProject != null) {
+					project= cProject.getProject();
+				}
+			}
+			IFile bestMatch= null;
+			IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();
+			IFile[] files= root.findFilesForLocationURI(URIUtil.toURI(location));
+			for (int i= 0; i < files.length; i++) {
+				file= files[i];
+				if (file.isAccessible()) {
+					if (project != null && file.getProject() == project) {
+						bestMatch= file;
+						break;
+					}
+					if (bestMatch == null) {
+						bestMatch= file;
+						if (project == null) {
+							break;
+						}
+					}
+				}
+			}
+			return bestMatch;
+		}
+		return file;
+	}
+
+	/**
+	 * If the current active editor edits a c element return it, else
+	 * return null
+	 */
+	public static ICElement getActiveEditorCInput() {
+		IWorkbenchPage page= CUIPlugin.getActivePage();
+		if (page != null) {
+			IEditorPart part= page.getActiveEditor();
+			if (part != null) {
+				IEditorInput editorInput= part.getEditorInput();
+				if (editorInput != null) {
+					return (ICElement)editorInput.getAdapter(ICElement.class);
+				}
+			}
+		}
+		return null;    
+	}
+        
+	/** 
+	 * Gets the working copy of an compilation unit opened in an editor
+	 * 
+	 * @param cu the original compilation unit (or another working copy)
+	 * @return the working copy of the compilation unit, or null if not found
+	*/     
+	public static ITranslationUnit getWorkingCopy(ITranslationUnit cu) {
+		if (cu == null)
+			return null;
+		if (cu.isWorkingCopy())
+			return cu;
+
+		return cu.findSharedWorkingCopy();
+	}
+
+	/**
+	 * Determine the editor id from the given file name using
+	 * the workspace-wide content-type definitions.
+	 * 
+	 * @param name  the file name
+	 * @return a valid editor id, never <code>null</code>
+	 */
+	public static String getEditorID(String name) {
+		IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
+		if (registry != null) {
+			IEditorDescriptor descriptor = registry.getDefaultEditor(name);
+			if (descriptor != null) {
+				return descriptor.getId();
+			}
+		}
+		return DEFAULT_TEXT_EDITOR_ID;
+	}
+
+	/**
+	 * Determine the editor id from the given editor input and optional input object.
+	 * When a translation unit can be obtained, the project-specific content-type
+	 * mechanism is used to determine the correct editor id.
+	 * If that fails, the editor id is determined by file name and extension using
+	 * the workspace-wide content-type definitions.
+	 * 
+	 * @param input  the editor input
+	 * @param inputObject  the input object (used to create the editor input) or <code>null</code>
+	 * @return a valid editor id, never <code>null</code>
+	 */
+	public static String getEditorID(IEditorInput input, Object inputObject) {
+
+		ITranslationUnit tunit = null;
+		if (inputObject instanceof ITranslationUnit) {
+			tunit= (ITranslationUnit)inputObject;
+		} else if (input instanceof IFileEditorInput) {
+			IFileEditorInput editorInput = (IFileEditorInput)input;
+			IFile file = editorInput.getFile();
+			ICElement celement = CoreModel.getDefault().create(file);
+			if (celement instanceof ITranslationUnit) {
+				tunit = (ITranslationUnit)celement;
+			}
+		} else if (input instanceof ITranslationUnitEditorInput) {
+			ITranslationUnitEditorInput editorInput = (ITranslationUnitEditorInput)input;
+			tunit = editorInput.getTranslationUnit();
+		}
+
+		if (tunit != null) {
+			// Choose an editor based on the content type
+			String contentTypeId= tunit.getContentTypeId();
+			if (contentTypeId != null) {
+				IContentType contentType= Platform.getContentTypeManager().getContentType(contentTypeId);
+				IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
+				IEditorDescriptor desc= registry.getDefaultEditor(input.getName(), contentType);
+				if (desc != null) {
+					return desc.getId();
+				}
+			}
+			// Choose an editor based on the language (obsolete?)
+			if (tunit.isCLanguage()) {
+				return CUIPlugin.EDITOR_ID;
+			} else if (tunit.isCXXLanguage()) {
+				return CUIPlugin.EDITOR_ID;
+			} else if (tunit.isASMLanguage()) {
+				return "org.eclipse.cdt.ui.editor.asm.AsmEditor"; //$NON-NLS-1$
+			}
+		}
+
+		// Choose an editor based on filename/extension
+		String editorId = getEditorID(input.getName());
+
+		return editorId;
+	}
+
+	/**
+	 * Maps the localized modifier name to a code in the same
+	 * manner as #findModifier.
+	 * 
+	 * @return the SWT modifier bit, or <code>0</code> if no match was found
+	 */
+	public static int findLocalizedModifier(String token) {
+		if (token == null)
+			return 0;
+		
+		if (token.equalsIgnoreCase(Action.findModifierString(SWT.CTRL)))
+			return SWT.CTRL;
+		if (token.equalsIgnoreCase(Action.findModifierString(SWT.SHIFT)))
+			return SWT.SHIFT;
+		if (token.equalsIgnoreCase(Action.findModifierString(SWT.ALT)))
+			return SWT.ALT;
+		if (token.equalsIgnoreCase(Action.findModifierString(SWT.COMMAND)))
+			return SWT.COMMAND;
+
+		return 0;
+	}
+
+	/**
+	 * Returns the modifier string for the given SWT modifier
+	 * modifier bits.
+	 * 
+	 * @param stateMask	the SWT modifier bits
+	 * @return the modifier string
+	 * @since 2.1.1
+	 */
+	public static String getModifierString(int stateMask) {
+		String modifierString= ""; //$NON-NLS-1$
+		if ((stateMask & SWT.CTRL) == SWT.CTRL)
+			modifierString= appendModifierString(modifierString, SWT.CTRL);
+		if ((stateMask & SWT.ALT) == SWT.ALT)
+			modifierString= appendModifierString(modifierString, SWT.ALT);
+		if ((stateMask & SWT.SHIFT) == SWT.SHIFT)
+			modifierString= appendModifierString(modifierString, SWT.SHIFT);
+		if ((stateMask & SWT.COMMAND) == SWT.COMMAND)
+			modifierString= appendModifierString(modifierString,  SWT.COMMAND);
+		
+		return modifierString;
+	}
+
+	/**
+	 * Appends to modifier string of the given SWT modifier bit
+	 * to the given modifierString.
+	 * 
+	 * @param modifierString	the modifier string
+	 * @param modifier			an int with SWT modifier bit
+	 * @return the concatenated modifier string
+	 * @since 2.1.1
+	 */
+	private static String appendModifierString(String modifierString, int modifier) {
+		if (modifierString == null)
+			modifierString= ""; //$NON-NLS-1$
+		String newModifierString= Action.findModifierString(modifier);
+		if (modifierString.length() == 0)
+			return newModifierString;
+		return MakefileMessages.getFormattedString("EditorUtility.concatModifierStrings", new String[] {modifierString, newModifierString}); //$NON-NLS-1$
+	}
+
+	public static IStorage getStorage(IBinary bin) {
+		IStorage store = null;
+		try {
+			IBuffer buffer = bin.getBuffer();
+			if (buffer != null) {
+				store = new FileStorage (new ByteArrayInputStream(buffer.getContents().getBytes()), bin.getPath());
+			}
+		} catch (CModelException e) {
+			// nothing;
+		}
+		return store;
+	}
+	
+	public static IStorage getStorage(ITranslationUnit tu) {
+		IStorage store = null;
+		try {
+			store = new FileStorage (new ByteArrayInputStream(tu.getBuffer().getContents().getBytes()), tu.getPath());
+		} catch (CModelException e) {
+			// nothing;
+		}
+		return store;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ElementListSelectionDialog.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ElementListSelectionDialog.java
new file mode 100644
index 0000000..82a7f71b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ElementListSelectionDialog.java
@@ -0,0 +1,120 @@
+/*******************************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.viewers.ILabelProvider;
+
+/**
+ * A class to select one or more elements out of an indexed property
+ */
+public class ElementListSelectionDialog extends AbstractElementListSelectionDialog {
+	
+	private List<Object> fElements;
+	
+	/*
+	 * @private
+	 */
+	protected void computeResult() {
+		setResult(getWidgetSelection());
+	}
+	/*
+	 * @private
+	 */	
+	protected Control createDialogArea(Composite parent) {
+		Control result= super.createDialogArea(parent);
+		
+		setSelectionListElements(fElements, false);
+	  	//a little trick to make the window come up faster
+	  	String initialFilter= null;
+	  	if (getPrimaryInitialSelection() instanceof String)
+			initialFilter= (String)getPrimaryInitialSelection();
+	  	if (initialFilter != null)
+	  		setFilter(initialFilter, true);
+	  	else
+	  		refilter();
+	  				
+		return result;
+	}
+	public Object getSelectedElement() {
+		return getPrimaryResult();
+	}
+	public Object[] getSelectedElements() {
+		return getResult();
+	}
+	/*
+	 * @private
+	 */	
+	protected void handleDoubleClick() {
+		if (verifyCurrentSelection()) {
+			buttonPressed(IDialogConstants.OK_ID);
+		}
+	}
+	/**
+	 * Constructs a list selection dialog.
+	 * @param renderer The label renderer used
+	 * @param ignoreCase Decides if the match string ignores lower/upper case
+	 * @param multipleSelection Allow multiple selection	 
+	 */
+	public ElementListSelectionDialog(Shell parent, String title, Image image, ILabelProvider renderer, boolean ignoreCase, boolean multipleSelection) {
+		super (parent, title, image, renderer, ignoreCase, multipleSelection);
+	}
+	/**
+	 * Constructs a list selection dialog.
+	 * @param renderer The label renderer used
+	 * @param ignoreCase Decides if the match string ignores lower/upppr case
+	 * @param multipleSelection Allow multiple selection	 
+	 */
+	public ElementListSelectionDialog(Shell parent, ILabelProvider renderer, boolean ignoreCase, boolean multipleSelection) {
+		this(parent, "", null, renderer, ignoreCase, multipleSelection); //$NON-NLS-1$
+	}
+	public int open(Object[] elements) {
+		return open(Arrays.asList(elements));
+	}
+	public int open(Object[] elements, String initialSelection) {
+		return open(Arrays.asList(elements), initialSelection);
+	}
+	/**
+	 * Open the dialog.
+	 * @param elements The elements to show in the list
+	 * @return Returns OK or CANCEL
+	 */	
+	public int open(List<Object> elements) {
+		setElements(elements);
+		return open();
+	}
+	/**
+	 * Open the dialog.
+	 * @param elements The elements to show in the list
+	 * @param initialSelection The initial content of the match text box.
+	 * @return Returns OK or CANCEL
+	 */
+	public int open(List<Object> elements, String initialSelection) {
+		setElements(elements);
+		setInitialSelection(initialSelection);
+		return open();
+	}
+	/**
+	 * Sets the elements presented by this dialog.
+	 */
+	public void setElements(List<Object> elements) {
+		fElements= elements;	
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Else.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Else.java
new file mode 100644
index 0000000..618ce90
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Else.java
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - modified for Automake editor usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.eclipse.cdt.make.core.makefile.ICommand;
+
+public class Else extends Conditional implements IAutomakeConditional, ICommand {
+
+	private boolean isAutomake;
+	private Rule[] rules;
+	
+	public Else(Directive parent) {
+		super(parent);
+	}
+
+	public boolean isAutomake() {
+		return isAutomake;
+	}
+	
+	public Rule[] getRules() {
+		return rules;
+	}
+
+	public void setRules(Rule[] rules) {
+		this.rules = rules;
+	}
+	
+	public void setAutomake(boolean value) {
+		isAutomake = value;
+	}
+	
+	public boolean isElse() {
+		return true;
+	}
+
+	public String toString() {
+		return GNUMakefileConstants.CONDITIONAL_ELSE;
+	}
+	
+	// ICommand methods so Automake else can be a child of an IRule
+	public Process execute(String shell, String[] envp, File dir)
+			throws IOException {
+		return null;
+	}
+	
+	public boolean shouldBeSilent() {
+		return false;
+	}
+	
+	public boolean shouldIgnoreError() {
+		return false;
+	}
+	
+	public boolean shouldExecute() {
+		return false;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/EmptyLine.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/EmptyLine.java
new file mode 100644
index 0000000..fa7aaee
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/EmptyLine.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IEmptyLine;
+
+public class EmptyLine extends Directive implements IEmptyLine {
+
+	final public static char NL = '\n';
+	final public static String NL_STRING = "\n"; //$NON-NLS-1$
+
+	public EmptyLine(Directive parent) {
+		super(parent);
+	}
+
+	public String toString() {
+		return NL_STRING;
+	}
+
+	public boolean equals(IEmptyLine stmt) {
+		return true;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Endef.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Endef.java
new file mode 100644
index 0000000..9bcc68b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Endef.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+public class Endef extends Terminal {
+
+
+	public Endef(Directive parent) {
+		super(parent);
+	}
+
+	public boolean isEndef() {
+		return true;
+	}
+	
+	public String toString() {
+       return GNUMakefileConstants.TERMINAL_ENDEF;
+    }
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Endif.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Endif.java
new file mode 100644
index 0000000..af77d40
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Endif.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+public class Endif extends Terminal {
+
+	public Endif(Directive parent) {
+		super(parent);
+	}
+
+	public boolean isEndif() {
+		return true;
+	}
+	
+    public String toString() {
+        return GNUMakefileConstants.TERMINAL_ENDIF;
+    }
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExportAllVariablesRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExportAllVariablesRule.java
new file mode 100644
index 0000000..0aa0a31
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExportAllVariablesRule.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.gnu.IExportAllVariablesRule;
+
+/**
+ * .EXPORT_ALL_VARIABLES
+ *  Simply by being mentioned as a target, this tells `make' to export
+ *  all variables to child processes by default.
+ */
+public class ExportAllVariablesRule extends SpecialRule implements IExportAllVariablesRule {
+
+	public ExportAllVariablesRule(Directive parent, String[] reqs) {
+		super(parent, new Target(GNUMakefileConstants.RULE_EXPORT_ALL_VARIABLES), reqs, new Command[0]);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExportVariable.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExportVariable.java
new file mode 100644
index 0000000..b98512d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExportVariable.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - Modified for Automake usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+public class ExportVariable extends GNUVariableDef {
+
+	public ExportVariable(Directive parent, String name, StringBuffer value, int type) {
+		super(parent, name, value, type);
+	}
+
+	public boolean isExport() {
+		return true;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExternalEditorInput.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExternalEditorInput.java
new file mode 100644
index 0000000..a7087de
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExternalEditorInput.java
@@ -0,0 +1,169 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Anton Leherbauer (Wind River Systems)
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+import org.eclipse.cdt.core.model.ITranslationUnit;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IStorage;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.IEditorRegistry;
+import org.eclipse.ui.IMemento;
+import org.eclipse.ui.IPersistableElement;
+import org.eclipse.ui.IStorageEditorInput;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.editors.text.ILocationProvider;
+
+
+/**
+ * An EditorInput for an external (non-workspace) file.
+ */
+public class ExternalEditorInput implements ITranslationUnitEditorInput, IPersistableElement {
+           
+	private IStorage externalFile;
+	private IResource markerResource;
+	private ITranslationUnit unit;
+	private IPath location;
+
+	/*
+	*/
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (!(obj instanceof IStorageEditorInput))
+			return false;
+		IStorageEditorInput other = (IStorageEditorInput)obj;
+		try {
+			return externalFile.equals(other.getStorage());
+		} catch (CoreException exc) {
+			return false;
+		}
+	}
+
+	/*
+	* @see IEditorInput#exists()
+	*/
+	public boolean exists() {
+		// External file can not be deleted
+		return true;
+	}
+
+	/*
+	* @see IAdaptable#getAdapter(Class)
+	*/
+	@SuppressWarnings("unchecked")
+	public Object getAdapter(Class adapter) {
+		if (ILocationProvider.class.equals(adapter)) {
+			return this;
+		}
+		return Platform.getAdapterManager().getAdapter(this, adapter);
+	}
+
+	/*
+	* @see IEditorInput#getImageDescriptor()
+	*/
+	public ImageDescriptor getImageDescriptor() {
+		IEditorRegistry registry= PlatformUI.getWorkbench().getEditorRegistry();
+		return registry.getImageDescriptor(externalFile.getFullPath().getFileExtension());
+	}
+
+	/*
+	* @see IEditorInput#getName()
+	*/
+	public String getName() {
+		return externalFile.getName();
+	}
+
+	/*
+	* @see IEditorInput#getPersistable()
+	*/
+	public IPersistableElement getPersistable() {
+		return this;
+	}
+
+	/*
+	* see IStorageEditorInput#getStorage()
+	*/
+	public IStorage getStorage() {
+		return externalFile;
+	}
+
+	/*
+	* @see IEditorInput#getToolTipText()
+	*/
+	public String getToolTipText() {
+		return externalFile.getFullPath().toString();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.ITranslationUnitEditorInput#getTranslationUnit()
+	 */
+	public ITranslationUnit getTranslationUnit() {
+		return unit;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.editors.text.ILocationProvider#getPath(java.lang.Object)
+	 */
+	public IPath getPath(Object element) {
+		return location;
+	}
+
+	public ExternalEditorInput(ITranslationUnit unit, IStorage exFile) {
+		this(exFile, exFile.getFullPath());
+		this.unit = unit;
+		markerResource= unit.getCProject().getProject();
+	}
+
+	public ExternalEditorInput(IStorage exFile) {
+		this(exFile, exFile.getFullPath());
+	}
+
+	public ExternalEditorInput(IStorage exFile, IPath location) {
+		externalFile = exFile;
+		this.location = location;
+	}
+	
+	/**
+	 * This constructor accepts the storage for the editor
+	 * and a reference to a resource which holds the markers for the external file.
+	 */
+	public ExternalEditorInput(IStorage exFile, IResource markerResource)  {
+		this(exFile, exFile.getFullPath());
+		this.markerResource = markerResource ;
+	}
+
+	/**
+	 * Return the resource where markers for this external editor input are stored
+	 */
+	public IResource getMarkerResource() {
+		return markerResource;
+	}
+
+	/*
+	 * @see org.eclipse.ui.IPersistableElement#getFactoryId()
+	 */
+	public String getFactoryId() {
+		return ExternalEditorInputFactory.ID;
+	}
+
+	/*
+	 * @see org.eclipse.ui.IPersistable#saveState(org.eclipse.ui.IMemento)
+	 */
+	public void saveState(IMemento memento) {
+		ExternalEditorInputFactory.saveState(memento, this);
+	}
+	
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExternalEditorInputFactory.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExternalEditorInputFactory.java
new file mode 100644
index 0000000..2e8ebf6
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExternalEditorInputFactory.java
@@ -0,0 +1,92 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Wind River Systems, Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Anton Leherbauer (Wind River Systems) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.ui.IElementFactory;
+import org.eclipse.ui.IMemento;
+import org.eclipse.ui.IPersistableElement;
+
+import org.eclipse.cdt.core.model.CoreModel;
+import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.cdt.core.model.ITranslationUnit;
+
+/**
+ * The ExternalEditorInputFactory is used to save and recreate an ExternalEditorInput object.
+ * As such, it implements the IPersistableElement interface for storage
+ * and the IElementFactory interface for recreation.
+ *
+ * @see IMemento
+ * @see IPersistableElement
+ * @see IElementFactory
+ *
+ * @since 4.0
+ */
+public class ExternalEditorInputFactory implements IElementFactory {
+
+	public static final String ID = "org.eclipse.cdt.ui.ExternalEditorInputFactory"; //$NON-NLS-1$
+
+    private static final String TAG_PATH = "path";//$NON-NLS-1$
+    private static final String TAG_PROJECT = "project";//$NON-NLS-1$
+
+	/*
+	 * @see org.eclipse.ui.IElementFactory#createElement(org.eclipse.ui.IMemento)
+	 */
+	public IAdaptable createElement(IMemento memento) {
+        // Get the file name.
+        String fileName = memento.getString(TAG_PATH);
+        if (fileName == null) {
+			return null;
+		}
+
+        IPath location= new Path(fileName);
+        ICProject cProject= null;
+        
+        String projectName= memento.getString(TAG_PROJECT);
+        if (projectName != null) {
+        	IProject project= ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+        	if (project.isAccessible() && CoreModel.hasCNature(project)) {
+        		cProject= CoreModel.getDefault().create(project);
+        	}
+        }
+		return EditorUtility.getEditorInputForLocation(location, cProject);
+	}
+
+	/**
+	 * Save the element state.
+	 * 
+	 * @param memento  the storage
+	 * @param input  the element
+	 */
+	static void saveState(IMemento memento, ExternalEditorInput input) {
+		IPath location= input.getPath(input);
+		if (location != null) {
+			memento.putString(TAG_PATH, location.toOSString());
+		}
+		IProject project= null;
+		ITranslationUnit unit= input.getTranslationUnit();
+		if (unit != null) {
+			project= unit.getCProject().getProject();
+		}
+		if (project == null && input.getMarkerResource() instanceof IProject) {
+			project= (IProject)input.getMarkerResource();
+		}
+		if (project != null) {
+			memento.putString(TAG_PROJECT, project.getName());
+		}
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUAutomakefile.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUAutomakefile.java
new file mode 100644
index 0000000..f71edd6
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUAutomakefile.java
@@ -0,0 +1,948 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - Modified for Automake editor usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.URI;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Stack;
+import java.util.StringTokenizer;
+
+import org.eclipse.cdt.make.core.MakeCorePlugin;
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.core.makefile.gnu.IGNUMakefile;
+import org.eclipse.core.filesystem.URIUtil;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+
+
+/**
+ * Makefile : ( statement ) *
+ * statement :   rule | macro_definition | comments | empty
+ * rule :  inference_rule | target_rule
+ * inference_rule : target ':' <nl> ( <tab> command <nl> ) +
+ * target_rule : target [ ( target ) * ] ':' [ ( prerequisite ) * ] [ ';' command ] <nl> 
+                 [ ( command ) * ]
+ * macro_definition : string '=' (string)* 
+ * comments : ('#' (string) <nl>) *
+ * empty : <nl>
+ * command : <tab> prefix_command string <nl>
+ * target : string
+ * prefix_command : '-' | '@' | '+'
+ * internal_macro :  "$<" | "$*" | "$@" | "$?" | "$%" 
+ */
+
+public class GNUAutomakefile extends AbstractMakefile implements IGNUMakefile {
+
+	public static String PATH_SEPARATOR = System.getProperty("path.separator", ":"); //$NON-NLS-1$ //$NON-NLS-2$
+	public static String FILE_SEPARATOR = System.getProperty("file.separator", "/"); //$NON-NLS-1$ //$NON-NLS-2$
+
+	String[] includeDirectories = new String[0];
+	IDirective[] builtins = null;
+
+	public GNUAutomakefile() {
+		super(null);
+	}
+
+	public void parse(String name) throws IOException {
+		FileReader stream = new FileReader(name);
+		parse(name, stream);
+		if (stream != null) {
+			try {
+				stream.close();
+			} catch (IOException e) {
+			}
+		}
+	}
+	
+	public void parse(String filePath, Reader reader) throws IOException {
+		parse(URIUtil.toURI(filePath), new MakefileReader(reader));
+	}
+
+	public void parse(URI fileURI, Reader reader) throws IOException {
+		parse(fileURI, new MakefileReader(reader));
+	}
+	
+
+	protected void parse(URI fileURI, MakefileReader reader) throws IOException {
+		String line;
+		Rule[] rules = null;
+		Stack<IDirective> conditions = new Stack<IDirective>();
+		Stack<GNUVariableDef> defines = new Stack<GNUVariableDef>();
+		int startLine = 0;
+		int endLine = 0;
+
+		// Clear any old directives.
+		clearDirectives();
+
+		setFileURI(fileURI);
+	
+		while ((line = reader.readLine()) != null) {
+			startLine = endLine + 1;
+			endLine = reader.getLineNumber();
+			
+			// Check if we enter in "define"
+			if (GNUMakefileUtil.isEndef(line)) {
+				// We should have a "define" for a "endef".
+				if (!defines.empty()) {
+					GNUVariableDef def = (GNUVariableDef) defines.pop();
+					def.setEndLine(endLine);
+				}
+				Endef endef = new Endef((Directive)this);
+				endef.setLines(startLine, endLine);
+				addDirective(conditions, endef);
+				continue;
+			} else if (GNUMakefileUtil.isDefine(line)) {
+				GNUVariableDef def = parseGNUVariableDef(line);
+				def.setLines(startLine, endLine);
+				addDirective(conditions, def);
+				defines.push(def);
+				continue;
+			} else if (GNUMakefileUtil.isOverrideDefine(line)) {
+				GNUVariableDef oDef = parseGNUVariableDef(line);
+				oDef.setLines(startLine, endLine);
+				addDirective(conditions, oDef);
+				defines.push(oDef);
+				continue;
+			}
+
+			// We still in a define.
+			if (!defines.empty()) {
+				GNUVariableDef def = (GNUVariableDef) defines.peek();
+				StringBuffer sb = def.getValue();
+				if (sb.length() > 0) {
+					sb.append('\n');
+				}
+				sb.append(line);
+				continue;
+			}
+
+			// 1- Try command first, since we can not strip '#' in command line
+			if (PosixMakefileUtil.isCommand(line) ||
+					AutomakefileUtil.isAutomakeCommand(line)) {
+				Command cmd = new Command(this, line);
+				cmd.setLines(startLine, endLine);
+				if (rules != null) {
+					// The command is added to the rules
+					for (int i = 0; i < rules.length; i++) {
+						rules[i].addDirective(cmd);
+						rules[i].setEndLine(endLine);
+					}
+					continue;
+				}
+				if (!conditions.isEmpty()) {
+					addDirective(conditions, cmd);
+					continue;
+				}
+				// If we have no rules/condition for the command,
+				// give the other directives a chance by falling through
+			}
+
+			// 2- Strip away any comments.
+			int pound = Util.indexOfComment(line);
+			if (pound != -1) {
+				Comment cmt = new Comment(this, line.substring(pound + 1));
+				cmt.setLines(startLine, endLine);
+				if (rules != null) {
+					// The comment is added to the rules.
+					for (int i = 0; i < rules.length; i++) {
+						rules[i].addDirective(cmt);
+						rules[i].setEndLine(endLine);
+					}
+				} else {
+					addDirective(conditions, cmt);
+				}
+				line = line.substring(0, pound);
+				// If all we have left are spaces continue
+				if (Util.isEmptyLine(line)) {
+					continue;
+				}
+				// The rest of the line maybe a valid directives.
+				// keep on trying by falling through.
+			}
+
+			// 3- Empty lines ?
+			if (Util.isEmptyLine(line)) {
+				Directive empty = new EmptyLine(this);
+				empty.setLines(startLine, endLine);
+				if (rules != null) {
+					// The EmptyLine is added to the rules.
+					for (int i = 0; i < rules.length; i++) {
+						rules[i].addDirective(empty);
+						rules[i].setEndLine(endLine);
+					}
+				} else {
+					addDirective(conditions, empty);
+				}
+				continue;
+			}
+
+			// 3b - look for if statement which is an Automake directive.
+			// These will be processed at configure time and all statements
+			// in-between are modified with a prefix.  We will treat these as
+			// standard conditionals even though they can affect the behavior
+			// of lines that follow the construct.  For
+			// example, an automake-if could start in the middle of a rule
+			// and the else might be outside a target.
+			if (GNUMakefileUtil.isIf(line)) {
+				// We cache the rules that were in effect at entry to the
+				// if/else block.  We treat the endif as restoring the
+				// state of the rules at this point.  It is possible for
+				// commands to follow the if/else that belong to different
+				// rules that start inside the if/else, but we are not
+				// prepared to handle that in an outline view and it is
+				// pretty bad Automake coding.
+				If ifDirective = parseIf(line, rules);
+				ifDirective.setLines(startLine, endLine);
+				if (rules != null) {
+					// The if statement is added to the rules.
+					for (int i = 0; i < rules.length; i++) {
+						rules[i].addDirective(ifDirective);
+						rules[i].setEndLine(endLine);
+					}
+				} else {
+					addDirective(conditions, ifDirective);
+				}
+				conditions.push(ifDirective);
+				rules = null;
+				continue;
+			}
+			
+			// 3c - Check for else or endif
+
+			if (GNUMakefileUtil.isElse(line)) {
+				Else elseDirective = (Else)parseConditional(line);
+				elseDirective.setLines(startLine, endLine);
+				Conditional cond = null;
+				// FIXME: Are we missing a if condition ?
+				if (!conditions.empty()) {
+					cond = (Conditional) conditions.pop();
+					cond.setEndLine(endLine - 1);
+				}
+				if (cond != null && cond.isIf()) {
+					// See 3b above for description on automake if/else handling.
+					elseDirective.setAutomake(true);
+					rules = ((If)cond).getRules();
+					// We cache the rules at the time of entry into the if/else block.
+					elseDirective.setRules(rules);
+					if (rules != null) {
+						// The else is added to the rules.
+						for (int i = 0; i < rules.length; i++) {
+							rules[i].addDirective(elseDirective);
+							rules[i].setEndLine(endLine);
+						}
+					} else {
+						addDirective(conditions, elseDirective);
+					}
+					rules = null;
+				} else {
+					addDirective(conditions, elseDirective);
+				}
+				conditions.push(elseDirective);
+				continue;
+			} else if (GNUMakefileUtil.isEndif(line)) {
+				Endif endif = new Endif(this);
+				endif.setLines(startLine, endLine);
+				Conditional cond = null;
+				// FIXME: Are we missing a if/else condition ?
+				if (!conditions.empty()) {
+					cond = (Conditional) conditions.pop();
+					cond.setEndLine(endLine);
+				}
+				if (cond != null && cond instanceof IAutomakeConditional) {
+				   rules = ((IAutomakeConditional)cond).getRules();
+				}
+				if (rules != null) {
+					// The endif is added to the rules.
+					for (int i = 0; i < rules.length; i++) {
+						rules[i].addDirective(endif);
+						rules[i].setEndLine(endLine);
+					}
+				} else {
+					addDirective(conditions, endif);
+				}
+				continue;
+			}
+			
+			// 4 - reset rules to null
+			// The first non empty line that does not begin with a <TAB> or '#'
+			// shall begin a new entry.
+			rules = null;
+
+			// 5- Check for the conditionals.
+			Directive directive = processConditions(line);
+			if (directive != null) {
+				directive.setLines(startLine, endLine);
+				addDirective(conditions, directive);
+				conditions.push(directive);
+				continue;
+			}
+
+			// 6- Check for other special gnu directives.
+			directive = processGNUDirectives(line);
+			if (directive != null) {
+				directive.setLines(startLine, endLine);
+				addDirective(conditions, directive);
+				continue;
+			}
+
+			// 7- Check for GNU special rules.
+			SpecialRule special = processSpecialRules(line);
+			if (special != null) {
+				rules = new Rule[] { special };
+				special.setLines(startLine, endLine);
+				addDirective(conditions, special);
+				continue;
+			}
+
+			// - Check for inference rule.
+			if (PosixMakefileUtil.isInferenceRule(line)) {
+				InferenceRule irule = parseInferenceRule(line);
+				irule.setLines(startLine, endLine);
+				addDirective(conditions, irule);
+				rules = new Rule[] { irule };
+				continue;
+			}
+
+			// - Variable Definiton ?
+			if (GNUMakefileUtil.isVariableDefinition(line)) {
+				GNUVariableDef vd = parseGNUVariableDef(line);
+				vd.setLines(startLine, endLine);
+				addDirective(conditions, vd);
+				if (!vd.isTargetSpecific()) {
+					continue;					
+				}
+			}
+
+			// - GNU Static Target rule ?
+			if (GNUMakefileUtil.isStaticTargetRule(line)) {
+				StaticTargetRule[] srules = parseStaticTargetRule(line);
+				for (int i = 0; i < srules.length; i++) {
+					srules[i].setLines(startLine, endLine);
+					addDirective(conditions, srules[i]);
+				}
+				rules = srules;
+				continue;
+			}
+
+			// - Target Rule ?
+			if (GNUMakefileUtil.isGNUTargetRule(line)) {
+				GNUTargetRule[] trules = parseGNUTargetRules(line);
+				for (int i = 0; i < trules.length; i++) {
+					trules[i].setLines(startLine, endLine);
+					addDirective(conditions, trules[i]);
+				}
+				rules = trules;
+				continue;
+			}
+			
+			// - Configure macro (@xxxx@)
+			if (AutomakefileUtil.isConfigMacro(line)) {
+				AutomakeConfigMacro macro = parseConfigMacro(line);
+				if (macro != null) {
+					macro.setLines(startLine, endLine);
+					addDirective(macro);
+					continue;
+				}
+			}
+
+			// XXX ?? Should not be here.
+			BadDirective stmt = new BadDirective(this, line);
+			stmt.setLines(startLine, endLine);
+			addDirective(conditions, stmt);
+
+		}
+		setLines(1, endLine);
+		// TEST please remove.
+		//GNUMakefileValidator validator = new GNUMakefileValidator();
+		//validator.validateDirectives(null, getDirectives());
+	}
+
+	private void addDirective(Stack<IDirective> conditions, Directive directive) {
+		if (conditions.empty()) {
+			addDirective(directive);
+		} else {
+			Conditional cond = (Conditional) conditions.peek();
+			cond.addDirective(directive);
+			cond.setEndLine(directive.getEndLine());
+		}
+	}
+
+	protected Conditional processConditions(String line) {
+		Conditional stmt = null;
+		if (GNUMakefileUtil.isIfdef(line)) {
+			stmt = parseConditional(line);
+		} else if (GNUMakefileUtil.isIfndef(line)) {
+			stmt = parseConditional(line);
+		} else if (GNUMakefileUtil.isIfeq(line)) {
+			stmt = parseConditional(line);
+		} else if (GNUMakefileUtil.isIfneq(line)) {
+			stmt = parseConditional(line);
+		}
+		return stmt;
+	}
+
+	protected Directive processGNUDirectives(String line) {
+		Directive stmt = null;
+		if (GNUMakefileUtil.isUnExport(line)) {
+			stmt = parseUnExport(line);
+		} else if (GNUMakefileUtil.isVPath(line)) {
+			stmt = parseVPath(line);
+		} else if (GNUMakefileUtil.isInclude(line)) {
+			stmt = parseInclude(line);
+		}
+		return stmt;
+	}
+
+	protected SpecialRule processSpecialRules(String line) {
+		SpecialRule stmt = null;
+		if (PosixMakefileUtil.isIgnoreRule(line)) {
+			stmt = parseSpecialRule(line);
+		} else if (PosixMakefileUtil.isPosixRule(line)) {
+			stmt = parseSpecialRule(line);
+		} else if (PosixMakefileUtil.isPreciousRule(line)) {
+			stmt = parseSpecialRule(line);
+		} else if (PosixMakefileUtil.isSilentRule(line)) {
+			stmt = parseSpecialRule(line);
+		} else if (PosixMakefileUtil.isSuffixesRule(line)) {
+			stmt = parseSpecialRule(line);
+		} else if (PosixMakefileUtil.isDefaultRule(line)) {
+			stmt = parseSpecialRule(line);
+		} else if (PosixMakefileUtil.isSccsGetRule(line)) {
+			stmt = parseSpecialRule(line);
+		} else if (GNUMakefileUtil.isPhonyRule(line)) {
+			stmt = parseSpecialRule(line);
+		} else if (GNUMakefileUtil.isIntermediateRule(line)) {
+			stmt = parseSpecialRule(line);
+		} else if (GNUMakefileUtil.isSecondaryRule(line)) {
+			stmt = parseSpecialRule(line);
+		} else if (GNUMakefileUtil.isDeleteOnErrorRule(line)) {
+			stmt = parseSpecialRule(line);
+		} else if (GNUMakefileUtil.isLowResolutionTimeRule(line)) {
+			stmt = parseSpecialRule(line);
+		} else if (GNUMakefileUtil.isExportAllVariablesRule(line)) {
+			stmt = parseSpecialRule(line);
+		} else if (GNUMakefileUtil.isNotParallelRule(line)) {
+			stmt = parseSpecialRule(line);
+		}
+		return stmt;
+	}
+
+	/**
+	 * @param line
+	 * @return
+	 */
+	protected SpecialRule parseSpecialRule(String line) {
+		line = line.trim();
+		String keyword =  null;
+		String[] reqs = null;
+		SpecialRule special = null;
+		int index = Util.indexOf(line, ':');
+		if (index != -1) {
+			keyword = line.substring(0, index).trim();
+			String req = line.substring(index + 1);
+			reqs = PosixMakefileUtil.findPrerequisites(req);
+		} else {
+			keyword = line;
+			reqs = new String[0];
+		}
+		if (keyword.equals(MakeFileConstants.RULE_IGNORE)) {
+			special = new IgnoreRule(this, reqs);
+		} else if (keyword.equals(MakeFileConstants.RULE_POSIX)) {
+			special = new PosixRule(this);
+		} else if (keyword.equals(MakeFileConstants.RULE_PRECIOUS)) {
+			special = new PreciousRule(this, reqs);
+		} else if (keyword.equals(MakeFileConstants.RULE_SILENT)) {
+			special = new SilentRule(this, reqs);
+		} else if (keyword.equals(MakeFileConstants.RULE_SUFFIXES)) {
+			special = new SuffixesRule(this, reqs);
+		} else if (keyword.equals(MakeFileConstants.RULE_DEFAULT)) {
+			special = new DefaultRule(this, new Command[0]);
+		} else if (keyword.equals(MakeFileConstants.RULE_SCCS_GET)) {
+			special = new SccsGetRule(this, new Command[0]);
+		} else if (keyword.equals(GNUMakefileConstants.RULE_PHONY)) {
+			special = new PhonyRule(this, reqs);
+		} else if (keyword.equals(GNUMakefileConstants.RULE_INTERMEDIATE)) {
+			special = new IntermediateRule(this, reqs);
+		} else if (keyword.equals(GNUMakefileConstants.RULE_SECONDARY)) {
+			special = new SecondaryRule(this, reqs);
+		} else if (keyword.equals(GNUMakefileConstants.RULE_DELETE_ON_ERROR)) {
+			special = new DeleteOnErrorRule(this, reqs);
+		} else if (keyword.equals(GNUMakefileConstants.RULE_LOW_RESOLUTION_TIME)) {
+			special = new LowResolutionTimeRule(this, reqs);
+		} else if (keyword.equals(GNUMakefileConstants.RULE_EXPORT_ALL_VARIABLES)) {
+			special = new ExportAllVariablesRule(this, reqs);
+		} else if (keyword.equals(GNUMakefileConstants.RULE_NOT_PARALLEL)) {
+			special = new NotParallelRule(this, reqs);
+		}
+		return special;
+	}
+	
+	/**
+	 * if CONDITIONAL
+	 *
+	 * @param line
+	 * @return
+	 */
+	protected If parseIf(String line, Rule[] rules) {
+		line = line.trim();
+		String keyword = null;
+		// Move pass the keyword
+		for (int i = 0; i < line.length(); i++) {
+			if (Util.isSpace(line.charAt(i))) {
+				keyword = line.substring(0, i);
+				line = line.substring(i).trim();
+				break;
+			}
+		}
+		if (keyword == null) {
+			keyword = line;
+		}
+		if (keyword.equals(GNUMakefileConstants.CONDITIONAL_IF) ||
+				keyword.equals(GNUMakefileConstants.AT_CONDITIONAL_IF)) {
+			return new If(this, rules, line);
+		}
+		return null;
+	}
+
+	/**
+	 * 
+	 * ifdef CONDITIONAL
+	 * ifeq CONDITIONAL
+	 * ifneq CONDITIONAL
+	 * else
+	 *
+	 * @param line
+	 * @return
+	 */
+	protected Conditional parseConditional(String line) {
+		Conditional condition = null;
+		line = line.trim();
+		String keyword = null;
+		// Move pass the keyword
+		for (int i = 0; i < line.length(); i++) {
+			if (Util.isSpace(line.charAt(i))) {
+				keyword = line.substring(0, i);
+				line = line.substring(i).trim();
+				break;
+			}
+		}
+		if (keyword == null) {
+			keyword = line;
+		}
+		if (keyword.equals(GNUMakefileConstants.CONDITIONAL_IFDEF)) {
+			condition = new Ifdef(this, line);
+		} else if (keyword.equals(GNUMakefileConstants.CONDITIONAL_IFNDEF)) {
+			condition = new Ifndef(this, line);
+		} else if (keyword.equals(GNUMakefileConstants.CONDITIONAL_IFEQ)) {
+			condition = new Ifeq(this, line);
+		} else if (keyword.equals(GNUMakefileConstants.CONDITIONAL_IFNEQ)) {
+			condition = new Ifneq(this, line);
+		} else if (keyword.equals(GNUMakefileConstants.CONDITIONAL_ELSE)) {
+			condition = new Else(this);
+		}
+		return condition;
+	}
+
+	/**
+	 * An Autoconf directive of the form @xxx@
+	 */
+	protected AutomakeConfigMacro parseConfigMacro(String line) {
+		String extraChars = "_-";
+		char[] ch = line.toCharArray();
+		int i = 1;
+		while (Character.isLetterOrDigit(ch[i]) ||
+				extraChars.indexOf(ch[i]) >= 0) {
+			++i;
+		}
+		if (i > 1 && ch[i] == '@')
+			return new AutomakeConfigMacro(this, line.substring(0, i+1));
+		return null;
+	}
+	/**
+	 *  Format of the include directive:
+	 *      include filename1 filename2 ...
+	 */
+	protected Include parseInclude(String line) {
+		String[] filenames;
+		StringTokenizer st = new StringTokenizer(line);
+		int count = st.countTokens();
+		if (count > 0) {
+			filenames = new String[count - 1];
+			for (int i = 0; i < count; i++) {
+				if (i == 0) {
+					st.nextToken();
+					// ignore the "include" keyword.
+					continue;
+				}
+				filenames[i - 1] = st.nextToken();
+			}
+		} else {
+			filenames = new String[0];
+		}
+		return new Include(this, filenames, getIncludeDirectories());
+	}
+
+	/**
+	   * There are three forms of the "vpath" directive:
+	   *      "vpath PATTERN DIRECTORIES"
+	   * Specify the search path DIRECTORIES for file names that match PATTERN.
+	   *
+	   * The search path, DIRECTORIES, is a list of directories to be
+	   * searched, separated by colons (semi-colons on MS-DOS and
+	   * MS-Windows) or blanks, just like the search path used in the `VPATH' variable.
+	   *
+	   *      "vpath PATTERN"
+	   * Clear out the search path associated with PATTERN.
+	   *
+	   *      "vpath"
+	   * Clear all search paths previously specified with `vpath' directives.
+	   */
+	protected VPath parseVPath(String line) {
+		String pattern = null;
+		String[] directories;
+		StringTokenizer st = new StringTokenizer(line);
+		int count = st.countTokens();
+		List<String> dirs = new ArrayList<String>(count);
+		if (count > 0) {
+			for (int i = 0; i < count; i++) {
+				if (count == 0) {
+					// ignore the "vpath" directive
+					st.nextToken();
+				} else if (count == 1) {
+					pattern = st.nextToken();
+				} else if (count == 3) {
+					String delim = " \t\n\r\f" + GNUAutomakefile.PATH_SEPARATOR; //$NON-NLS-1$
+					dirs.add(st.nextToken(delim));
+				} else {
+					dirs.add(st.nextToken());
+				}
+			}
+		}
+		directories = (String[]) dirs.toArray(new String[0]);
+		if (pattern == null) {
+			pattern = new String();
+		}
+		return new VPath(this, pattern, directories);
+	}
+
+	/**
+	 * @param line
+	 * @return
+	 */
+	protected UnExport parseUnExport(String line) {
+		// Pass over "unexport"
+		for (int i = 0; i < line.length(); i++) {
+			if (Util.isSpace(line.charAt(i))) {
+				line = line.substring(i).trim();
+				break;
+			}
+		}
+		return new UnExport(this, line);
+	}
+
+	protected GNUTargetRule[] parseGNUTargetRules(String line) {
+		String[] targetNames;
+		String[] normalReqs;
+		String[] orderReqs;
+		String cmd = null;
+		boolean doubleColon = false;
+		int index = Util.indexOf(line, ':');
+		if (index != -1) {
+			// Break the targets
+			String target = line.substring(0, index);
+			targetNames = PosixMakefileUtil.findTargets(target.trim());
+
+			// Some TargetRule have "::" for separator
+			String req = line.substring(index + 1);
+			doubleColon = req.startsWith(":"); //$NON-NLS-1$
+			if (doubleColon) {
+				// move pass the second ':'
+				req = req.substring(1);
+			}
+
+			// Check for command
+			int semicolon = Util.indexOf(req, ';');
+			if (semicolon != -1) {
+				cmd = req.substring(semicolon + 1);
+				req = req.substring(0, semicolon);
+			}
+
+			// Check for Normal and order prerequisites
+			String normalReq = null;
+			String orderReq = null;
+			int pipe = Util.indexOf(req, '|');
+			if (pipe != -1) {
+				normalReq = req.substring(0, pipe);
+				orderReq = req.substring(pipe + 1);
+			} else {
+				normalReq = req;
+				orderReq = ""; //$NON-NLS-1$
+			}
+
+			normalReqs = PosixMakefileUtil.findPrerequisites(normalReq.trim());
+			orderReqs = PosixMakefileUtil.findPrerequisites(orderReq.trim());
+		} else {
+			targetNames = PosixMakefileUtil.findTargets(line);
+			normalReqs = new String[0];
+			orderReqs = new String[0];
+		}
+
+		GNUTargetRule[] rules = new GNUTargetRule[targetNames.length];
+		for (int i = 0; i < targetNames.length; i++) {
+			rules[i] = new GNUTargetRule(this, new Target(targetNames[i]), doubleColon, normalReqs, orderReqs, new Command[0]);
+			if (cmd != null) {
+				rules[i].addDirective(new Command(this, cmd));
+			}
+		}
+		return rules;
+	}
+
+	protected GNUVariableDef parseGNUVariableDef(String line) {
+		line = line.trim();
+		GNUVariableDef vd;
+
+		// the default type.
+		int type = GNUVariableDef.TYPE_RECURSIVE_EXPAND;
+		boolean isDefine = false;
+		boolean isOverride = false;
+		boolean isTargetVariable = false;
+		boolean isExport = false;
+		String targetName = ""; //$NON-NLS-1$
+
+		String name;
+		StringBuffer value = new StringBuffer();
+
+		// Check for Target: Variable-assignment
+		isTargetVariable = GNUMakefileUtil.isTargetVariable(line);
+		if (isTargetVariable) {
+			// move to the first ':'
+			int colon = Util.indexOf(line, ':');
+			if (colon != -1) {
+				targetName = line.substring(0, colon).trim();
+				line = line.substring(colon + 1).trim();
+			} else {
+				targetName = ""; //$NON-NLS-1$
+			}
+		}
+
+		// Check for Override condition.
+		if (GNUMakefileUtil.isOverride(line)) {
+			isOverride = true;
+			// Move pass the keyword override.
+			for (int i = 0; i < line.length(); i++) {
+				if (Util.isSpace(line.charAt(i))) {
+					line = line.substring(i).trim();
+					break;
+				}
+			}
+		}
+
+		// Check for "define"
+		if (GNUMakefileUtil.isDefine(line)) {
+			isDefine = true;
+			// Move pass the keyword define.
+			for (int i = 0; i < line.length(); i++) {
+				if (Util.isSpace(line.charAt(i))) {
+					line = line.substring(i).trim();
+					break;
+				}
+			}
+		}
+
+		// Check for Override condition.
+		if (GNUMakefileUtil.isExport(line)) {
+			isExport = true;
+			// Move pass the keyword export.
+			for (int i = 0; i < line.length(); i++) {
+				if (Util.isSpace(line.charAt(i))) {
+					line = line.substring(i).trim();
+					break;
+				}
+			}
+		}
+
+		// Check for Target-variable
+
+		int index = line.indexOf('=');
+		if (index != -1) {
+			int separator = index;
+			// Check for "+=",  ":=", "?="
+			if (index > 0) {
+				type = line.charAt(index - 1);
+				if (type == GNUVariableDef.TYPE_SIMPLE_EXPAND
+					|| type == GNUVariableDef.TYPE_APPEND
+					|| type == GNUVariableDef.TYPE_CONDITIONAL) {
+					separator = index - 1;
+				} else {
+					type = GNUVariableDef.TYPE_RECURSIVE_EXPAND;
+				}
+			}
+			name = line.substring(0, separator).trim();
+			value.append(line.substring(index + 1).trim());
+		} else {
+			name = line;
+		}
+
+		if (isTargetVariable) {
+			vd = new TargetVariable(this, targetName, name, value, isOverride, type);
+		} else if (isOverride && isDefine) {
+			vd = new OverrideDefine(this, name, value);
+		} else if (isDefine) {
+			vd = new DefineVariable(this, name, value);
+		} else if (isOverride) {
+			vd = new OverrideVariable(this, name, value, type);
+		} else if (isExport) {
+			vd = new ExportVariable(this, name, value, type);
+		} else {
+			vd = new GNUVariableDef(this, name, value, type);
+		}
+		return vd;
+	}
+
+	protected StaticTargetRule[] parseStaticTargetRule(String line) {
+		// first colon: the Targets
+		String targetPattern;
+		String[] prereqPatterns;
+		String[] targets;
+		int colon = Util.indexOf(line, ':');
+		if (colon > 1) {
+			String targetLine = line.substring(0, colon).trim();
+			targets = PosixMakefileUtil.findTargets(targetLine);
+			// second colon: Target-Pattern
+			line = line.substring(colon + 1);
+			colon = Util.indexOf(line, ':');
+			if (colon != -1) {
+				targetPattern = line.substring(0, colon).trim();
+				line = line.substring(colon + 1);
+				StringTokenizer st = new StringTokenizer(line);
+				int count = st.countTokens();
+				prereqPatterns = new String[count];
+				for (int i = 0; i < count; i++) {
+					prereqPatterns[i] = st.nextToken();
+				}
+			} else {
+				targetPattern = ""; //$NON-NLS-1$
+				prereqPatterns = new String[0];
+			}
+		} else {
+			targets = new String[0];
+			targetPattern = ""; //$NON-NLS-1$
+			prereqPatterns = new String[0];
+		}
+
+		StaticTargetRule[] staticRules = new StaticTargetRule[targets.length];
+		for (int i = 0; i < targets.length; i++) {
+			staticRules[i] = new StaticTargetRule(this, new Target(targets[i]), targetPattern, prereqPatterns, new Command[0]);
+		}
+		return staticRules;
+	}
+
+	/**
+	 * @param line
+	 * @return
+	 */
+	protected InferenceRule parseInferenceRule(String line) {
+		String tgt;
+		int index = Util.indexOf(line, ':');
+		if (index != -1) {
+			tgt = line.substring(0, index);
+		} else {
+			tgt = line;
+		}
+		return new InferenceRule(this, new Target(tgt));
+	}
+
+	public IDirective[] getDirectives(boolean expand) {
+		if (!expand) {
+			return getDirectives();
+		}
+		IDirective[] dirs = getDirectives();
+		ArrayList<IDirective> list = new ArrayList<IDirective>(Arrays.asList(dirs));
+		for (int i = 0; i < dirs.length; ++i) {
+			if (dirs[i] instanceof Include) {
+				Include include = (Include)dirs[i];
+				IDirective[] includedMakefiles = include.getDirectives();
+				for (int j = 0; j < includedMakefiles.length; ++j) {
+					IMakefile includedMakefile = (IMakefile)includedMakefiles[j];
+					list.addAll(Arrays.asList(includedMakefile.getDirectives()));
+				}
+			}
+		}
+		return (IDirective[]) list.toArray(new IDirective[list.size()]);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.AbstractMakefile#getBuiltins()
+	 */
+	public IDirective[] getBuiltins() {
+		if (builtins == null) {
+			String location =  "builtin" + File.separator + "gnu.mk"; //$NON-NLS-1$ //$NON-NLS-2$
+			try {
+				InputStream stream = FileLocator.openStream(MakeCorePlugin.getDefault().getBundle(), new Path(location), false);
+				GNUAutomakefile gnu = new GNUAutomakefile();
+				URL url = FileLocator.find(MakeCorePlugin.getDefault().getBundle(), new Path(location), null);
+				url = FileLocator.resolve(url);
+				location = url.getFile();
+				gnu.parse(location, new InputStreamReader(stream));
+				builtins = gnu.getDirectives();
+				for (int i = 0; i < builtins.length; i++) {
+					if (builtins[i] instanceof MacroDefinition) {
+						((MacroDefinition)builtins[i]).setFromDefault(true);
+					}
+				}
+			} catch (Exception e) {
+				//e.printStackTrace();
+			}
+			if (builtins == null) {
+				builtins = new IDirective[0];
+			}
+		}
+		return builtins;
+	}
+
+	public void setIncludeDirectories(String[] dirs) {
+		includeDirectories = dirs;
+	}
+
+	public String[] getIncludeDirectories() {
+		return includeDirectories;
+	}
+
+	public static void main(String[] args) {
+		try {
+			String filename = "Makefile"; //$NON-NLS-1$
+			if (args.length == 1) {
+				filename = args[0];
+			}
+			GNUAutomakefile makefile = new GNUAutomakefile();
+			makefile.parse(filename);
+			IDirective[] directive = makefile.getDirectives();
+			for (int i = 0; i < directive.length; i++) {
+				//System.out.println("Rule[" + i +"]");
+				System.out.print(directive[i]);
+			}
+		} catch (IOException e) {
+			System.out.println(e);
+		}
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUMakefileConstants.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUMakefileConstants.java
new file mode 100644
index 0000000..a9ccdfb
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUMakefileConstants.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - modified for Automake editor usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+public class GNUMakefileConstants extends MakeFileConstants {
+    static final String CONDITIONAL_ELSE = "else"; //$NON-NLS-1$
+    static final String CONDITIONAL_IF = "if"; //$NON-NLS-1$
+    static final String AT_CONDITIONAL_IF = "@if"; //$NON-NLS-1$
+    static final String CONDITIONAL_IFNEQ = "ifneq";  //$NON-NLS-1$
+    static final String CONDITIONAL_IFNDEF = "ifndef"; //$NON-NLS-1$
+    static final String CONDITIONAL_IFEQ = "ifeq"; //$NON-NLS-1$
+    static final String CONDITIONAL_IFDEF = "ifdef"; //$NON-NLS-1$
+ 
+    static final String TERMINAL_ENDEF = "endef"; //$NON-NLS-1$
+    static final String TERMINAL_ENDIF = "endif"; //$NON-NLS-1$
+    static final String AT_TERMINAL_ENDIF = "@endif"; //$NON-NLS-1$
+
+    static final String DIRECTIVE_VPATH = "vpath"; //$NON-NLS-1$
+    static final String DIRECTIVE_UNEXPORT = "unexport"; //$NON-NLS-1$
+    
+    static final String VARIABLE_DEFINE = "define"; //$NON-NLS-1$
+    static final String VARIABLE_EXPORT = "export"; //$NON-NLS-1$
+    static final String VARIABLE_OVERRIDE = "override"; //$NON-NLS-1$
+    
+    static final String DIRECTIVE_INCLUDE =  "include"; //$NON-NLS-1$
+
+    static final String RULE_DELETE_ON_ERROR = ".DELETE_ON_ERROR";  //$NON-NLS-1$
+    static final String RULE_PHONY = ".PHONY"; //$NON-NLS-1$
+    static final String RULE_SECONDARY = ".SECONDARY"; //$NON-NLS-1$
+    static final String RULE_LOW_RESOLUTION_TIME = ".LOW_RESOLUTION_TIME"; //$NON-NLS-1$
+    static final String RULE_NOT_PARALLEL = ".NOTPARALLEL"; //$NON-NLS-1$
+    static final String RULE_EXPORT_ALL_VARIABLES = ".EXPORT_ALL_VARIABLES"; //$NON-NLS-1$
+    static final String RULE_INTERMEDIATE = ".INTERMEDIATE"; //$NON-NLS-1$
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUMakefileUtil.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUMakefileUtil.java
new file mode 100644
index 0000000..80a3c45
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUMakefileUtil.java
@@ -0,0 +1,233 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - modified for Automake editor usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+/**
+ * GNUMakefile
+ */
+public class GNUMakefileUtil extends PosixMakefileUtil {
+
+	public static boolean isInclude(String line) {
+		line = line.trim();
+		boolean isInclude = line.startsWith(GNUMakefileConstants.DIRECTIVE_INCLUDE) && line.length() > 7 && Character.isWhitespace(line.charAt(7));
+		boolean isDashInclude = line.startsWith("-" + GNUMakefileConstants.DIRECTIVE_INCLUDE) && line.length() > 8 && Character.isWhitespace(line.charAt(8)); //$NON-NLS-1$
+		boolean isSInclude = line.startsWith("s" + GNUMakefileConstants.DIRECTIVE_INCLUDE) && line.length() > 8 && Character.isWhitespace(line.charAt(8)); //$NON-NLS-1$
+		return isInclude || isDashInclude || isSInclude;
+	}
+
+	public static boolean isVPath(String line) {
+		line = line.trim();
+		return line.equals(GNUMakefileConstants.DIRECTIVE_VPATH) || line.startsWith(GNUMakefileConstants.DIRECTIVE_VPATH) && line.length() > 5 && Character.isWhitespace(line.charAt(5));
+	}
+
+	public static boolean isExport(String line) {
+		line = line.trim();
+		return line.equals(GNUMakefileConstants.VARIABLE_EXPORT) || line.startsWith(GNUMakefileConstants.VARIABLE_EXPORT) && line.length() > 6 && Character.isWhitespace(line.charAt(6));
+	}
+
+	public static boolean isUnExport(String line) {
+		line = line.trim();
+		return line.startsWith(GNUMakefileConstants.DIRECTIVE_UNEXPORT) && line.length() > 8 && Character.isWhitespace(line.charAt(8));
+	}
+
+	public static boolean isDefine(String line) {
+		line = line.trim();
+		return line.startsWith(GNUMakefileConstants.VARIABLE_DEFINE) && line.length() > 6 && Character.isWhitespace(line.charAt(6));
+	}
+
+	public static boolean isEndef(String line) {
+		return line.trim().equals(GNUMakefileConstants.TERMINAL_ENDEF);
+	}
+
+	public static boolean isOverride(String line) {
+		line = line.trim();
+		return line.startsWith(GNUMakefileConstants.VARIABLE_OVERRIDE) && line.length() > 8 && Character.isWhitespace(line.charAt(8));
+	}
+
+	public static boolean isIf(String line) {
+		line = line.trim();
+		return (line.startsWith(GNUMakefileConstants.CONDITIONAL_IF) && line.length() > 2 && Character.isWhitespace(line.charAt(2))) ||
+				(line.startsWith(GNUMakefileConstants.AT_CONDITIONAL_IF) && line.length() > 3 && Character.isWhitespace(line.charAt(3)));
+	}
+	
+	public static boolean isIfeq(String line) {
+		line = line.trim();
+		return line.startsWith(GNUMakefileConstants.CONDITIONAL_IFEQ) && line.length() > 4 && Character.isWhitespace(line.charAt(4));
+	}
+
+	public static boolean isIfneq(String line) {
+		line = line.trim();
+		return line.startsWith(GNUMakefileConstants.CONDITIONAL_IFNEQ) && line.length() > 5 && Character.isWhitespace(line.charAt(5));
+	}
+
+	public static boolean isIfdef(String line) {
+		line = line.trim();
+		return line.startsWith(GNUMakefileConstants.CONDITIONAL_IFDEF) && line.length() > 5 && Character.isWhitespace(line.charAt(5));
+	}
+
+	public static boolean isIfndef(String line) {
+		line = line.trim();
+		return line.startsWith(GNUMakefileConstants.CONDITIONAL_IFNDEF) && line.length() > 6 && Character.isWhitespace(line.charAt(6));
+	}
+
+	public static boolean isElse(String line) {
+		return line.trim().equals(GNUMakefileConstants.CONDITIONAL_ELSE);
+	}
+
+	public static boolean isEndif(String line) {
+		return line.trim().equals(GNUMakefileConstants.TERMINAL_ENDIF) ||
+		line.trim().startsWith(GNUMakefileConstants.AT_TERMINAL_ENDIF);
+	}
+
+	public static boolean isOverrideDefine(String line) {
+		line = line.trim();
+		if (line.startsWith(GNUMakefileConstants.VARIABLE_OVERRIDE)) {
+			int i = 8;
+			while(i < line.length() && Character.isWhitespace(line.charAt(i))) {
+				i++;
+			}
+			if (line.startsWith(GNUMakefileConstants.VARIABLE_DEFINE, i)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public static boolean isTargetVariable(String line) {
+		line = line.trim();
+		int index = Util.indexOf(line, ':');
+		if (index > 1) {
+			line = line.substring(index + 1).trim();
+			int equal = Util.indexOf(line, '=');
+			if (equal > 1) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public static boolean isVariableDefinition(String line) {
+		return isOverrideDefine(line)
+			|| isTargetVariable(line)
+			|| isDefine(line)
+			|| isOverride(line)
+			|| isExport(line)
+			|| isMacroDefinition(line);
+	}
+
+	/**
+	 * @param line
+	 * @return
+	 */
+	public static boolean isStaticTargetRule(String line) {
+		line = line.trim();
+		int colon1 = Util.indexOf(line, ':');
+		if (colon1 > 0) {
+			// move pass colon1
+			line = line.substring(colon1 + 1);
+			int colon2 =  Util.indexOf(line, ':');
+			// Catch operator "::" not a static pattern rule
+			return (colon2 > 0);
+		}
+		return false;
+	}
+
+	/**
+	 * @param line
+	 * @return
+	 */
+	public static boolean isGNUTargetRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			colon++;
+			// Catch VariableDefiniton with operator ":="
+			if (colon < line.length()) {
+				return line.charAt(colon) != '=';
+			}
+			return true;
+		}
+		return false;
+	}
+
+	public static boolean isPhonyRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(GNUMakefileConstants.RULE_PHONY);
+		}
+		return false;
+	}
+
+	public static boolean isIntermediateRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(GNUMakefileConstants.RULE_INTERMEDIATE);
+		}
+		return false;
+	}
+
+	public static boolean isSecondaryRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(GNUMakefileConstants.RULE_SECONDARY);
+		}
+		return false;
+	}
+
+	public static boolean isDeleteOnErrorRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(GNUMakefileConstants.RULE_DELETE_ON_ERROR);
+		}
+		return false;
+	}
+
+	public static boolean isLowResolutionTimeRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(GNUMakefileConstants.RULE_LOW_RESOLUTION_TIME);
+		}
+		return false;
+	}
+
+	public static boolean isExportAllVariablesRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(GNUMakefileConstants.RULE_EXPORT_ALL_VARIABLES);
+		}
+		return false;
+	}
+
+	public static boolean isNotParallelRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(GNUMakefileConstants.RULE_NOT_PARALLEL);
+		}
+		return false;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUTargetRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUTargetRule.java
new file mode 100644
index 0000000..a770e0c
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUTargetRule.java
@@ -0,0 +1,66 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.ICommand;
+
+/**
+ */
+public class GNUTargetRule extends TargetRule {
+
+	String[] orderOnlyPrerequisites;
+	boolean doubleColon;
+
+	public GNUTargetRule(Directive parent, Target target, boolean double_colon, String[] normal_prereqs, String[] order_prereqs, Command[] commands) {
+		super(parent, target, normal_prereqs, commands);
+		orderOnlyPrerequisites = order_prereqs;
+		doubleColon = double_colon;
+	}
+
+	public boolean isDoubleColon() {
+		return doubleColon;
+	}
+
+	public String[] getNormalPrerequisites() {
+		return getPrerequisites();
+	}
+
+	public String[] getOrderOnlyPrerequisites() {
+		return orderOnlyPrerequisites;
+	}
+
+
+	/**
+	 * @see java.lang.Object#toString()
+	 */
+	public String toString() {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append(getTarget().toString());
+		buffer.append(':');
+		String[] reqs = getNormalPrerequisites();
+		for (int i = 0; i < reqs.length; i++) {
+			buffer.append(' ').append(reqs[i]);
+		}
+		reqs = getOrderOnlyPrerequisites();
+		if (reqs.length > 0) {
+			buffer.append(" |"); //$NON-NLS-1$
+			for (int i = 0; i < reqs.length; i++) {
+				buffer.append(' ').append(reqs[i]);
+			}
+		}
+		buffer.append('\n');
+		ICommand[] cmds = getCommands();
+		for (int i = 0; i < cmds.length; i++) {
+			buffer.append(cmds[i].toString());
+		}
+		return buffer.toString();
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUVariableDef.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUVariableDef.java
new file mode 100644
index 0000000..9c0509e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUVariableDef.java
@@ -0,0 +1,132 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - Refactor name
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.gnu.IVariableDefinition;
+
+/**
+ */
+public class GNUVariableDef extends MacroDefinition implements IVariableDefinition  {
+
+	/**
+	 * ? is Conditional
+	 * : is Simply-expanded
+	 * + is append
+	 * 0 is recursively-expanded.
+	 */
+	final static int TYPE_RECURSIVE_EXPAND = 0;
+	final static int TYPE_SIMPLE_EXPAND = ':';
+	final static int TYPE_CONDITIONAL = '?';
+	final static int TYPE_APPEND = '+';
+	int type;
+	String varTarget;
+
+	public GNUVariableDef(Directive parent, String name, StringBuffer value) {
+		this(parent, name, value, TYPE_RECURSIVE_EXPAND);
+	}
+
+	public GNUVariableDef(Directive parent, String name, StringBuffer value, int type) {
+		this(parent,  "", name, value, type); //$NON-NLS-1$
+	}
+
+	public GNUVariableDef(Directive parent, String target, String name, StringBuffer value, int type) {
+		super(parent, name, value);
+		varTarget = target;
+		this.type = type;
+	}
+
+	/**
+	 * @see java.lang.Object#toString()
+	 */
+	public String toString() {
+		StringBuffer sb = new StringBuffer();
+		if (isTargetSpecific()) {
+			sb.append(getTarget()).append(": "); //$NON-NLS-1$
+		}
+		if (isOverride()) {
+			sb.append(GNUMakefileConstants.VARIABLE_OVERRIDE);
+		}
+		if (isMultiLine()) {
+			sb.append(GNUMakefileConstants.VARIABLE_DEFINE);
+			sb.append(' ');
+			sb.append(getName()).append('\n');
+			sb.append(getValue()).append('\n');
+			sb.append(GNUMakefileConstants.TERMINAL_ENDEF);
+			sb.append('\n');
+		} else {
+			if (isExport()) {
+				sb.append(GNUMakefileConstants.VARIABLE_EXPORT);
+				sb.append(' ');
+			}
+			sb.append(getName());
+			if (isRecursivelyExpanded()) {
+				sb.append(" = "); //$NON-NLS-1$
+			} else if (isSimplyExpanded()) {
+				sb.append(" := "); //$NON-NLS-1$
+			} else if (isConditional()) {
+				sb.append(" ?= "); //$NON-NLS-1$
+			} else if (isAppend()) {
+				sb.append(" += "); //$NON-NLS-1$
+			}
+			sb.append(getValue()).append('\n');
+		}
+		return sb.toString();
+	}
+
+	public boolean isRecursivelyExpanded() {
+		return type == TYPE_RECURSIVE_EXPAND;
+	}
+
+	public boolean isSimplyExpanded() {
+		return type == TYPE_SIMPLE_EXPAND;
+	}
+
+	public boolean isConditional() {
+		return type == TYPE_CONDITIONAL;
+	}
+
+	public boolean isAppend() {
+		return type == TYPE_APPEND;
+	}
+
+	public boolean isTargetSpecific() {
+		String t = getTarget();
+		return t != null && t.length() > 0;
+	}
+
+	public boolean isExport() {
+		return false;
+	}
+
+	public boolean isMultiLine() {
+		return false;
+	}
+
+	/**
+	 * Variable from an `override' directive.
+	 */
+	 public boolean isOverride() {
+		return false;
+	}
+
+	/**
+	 * Automatic variable -- cannot be set.
+	 */
+	 public boolean isAutomatic() {
+		return false;
+	}
+
+	public String getTarget() {
+		return varTarget;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IAutomakeConditional.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IAutomakeConditional.java
new file mode 100644
index 0000000..623d72b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IAutomakeConditional.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+public interface IAutomakeConditional {
+	
+	public boolean isAutomake();
+	public void setAutomake(boolean value);
+	public Rule[] getRules();
+	public void setRules(Rule[] rules);
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IMakefileDocumentProvider.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IMakefileDocumentProvider.java
new file mode 100644
index 0000000..22f1218
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IMakefileDocumentProvider.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+/*
+ */
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+
+/**
+ */
+public interface IMakefileDocumentProvider extends IDocumentProvider {
+
+	/**
+	 * Shuts down this provider.
+	 */
+	void shutdown();
+
+	/**
+	 * Returns the working copy for the given element.
+	 *
+	 * @param element the element
+	 * @return the working copy for the given element
+	 */
+	IMakefile getWorkingCopy(Object element);
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IMakefileEditorActionDefinitionIds.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IMakefileEditorActionDefinitionIds.java
new file mode 100644
index 0000000..dc0642c
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IMakefileEditorActionDefinitionIds.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2005 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
+
+/**
+ */
+public interface IMakefileEditorActionDefinitionIds extends ITextEditorActionDefinitionIds {
+
+	final String UNCOMMENT = "org.eclipse.cdt.make.ui.edit.text.makefile.uncomment"; //$NON-NLS-1$
+
+	final String COMMENT = "org.eclipse.cdt.make.ui.edit.text.makefile.comment"; //$NON-NLS-1$
+
+	final String OPEN_DECLARATION = "org.eclipse.cdt.make.ui.edit.text.makefile.opendcl"; //$NON-NLS-1$
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IReconcilingParticipant.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IReconcilingParticipant.java
new file mode 100644
index 0000000..783dff8
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IReconcilingParticipant.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+/**
+ * IReconcilingParticipant
+ * Interface of an object participating in reconciling.
+ */
+public interface IReconcilingParticipant {
+	
+	/**
+	 * Called after reconciling has been finished.
+	 */
+	void reconciled();
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ISelectionValidator.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ISelectionValidator.java
new file mode 100644
index 0000000..38984ea
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ISelectionValidator.java
@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+public interface ISelectionValidator {
+	void isValid(Object[] selection, StatusInfo res);
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ITranslationUnitEditorInput.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ITranslationUnitEditorInput.java
new file mode 100644
index 0000000..33db78b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ITranslationUnitEditorInput.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.core.model.ITranslationUnit;
+import org.eclipse.ui.IStorageEditorInput;
+import org.eclipse.ui.editors.text.ILocationProvider;
+
+/**
+ * ITranslationUnitEditorInput
+ */
+public interface ITranslationUnitEditorInput extends IStorageEditorInput, ILocationProvider {
+
+	ITranslationUnit getTranslationUnit();
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/If.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/If.java
new file mode 100644
index 0000000..83dd8d6
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/If.java
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - modified to be If class
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.eclipse.cdt.make.core.makefile.ICommand;
+
+
+public class If extends Conditional implements IAutomakeConditional, ICommand {
+    private static final String EMPTY = ""; //$NON-NLS-1$
+    private Rule rules[] = null;
+    
+	public If(Directive parent, Rule[] rules, String var) {
+		super(parent, var, EMPTY, EMPTY);
+		if (rules != null) {
+			this.rules = new Rule[rules.length];
+			System.arraycopy(rules, 0, this.rules, 0, rules.length);
+		}
+	}
+
+	public Rule[] getRules() {
+		return rules;
+	}
+	
+	public void setRules(Rule[] rules) {
+		this.rules = rules;
+	}
+	
+	public boolean isIf() {
+		return true;
+	}
+
+	public boolean isAutomake() {
+		return true;
+	}
+	
+	public void setAutomake(boolean value) {
+		// ignore value
+	}
+	
+	public String toString() {
+		StringBuffer sb = new StringBuffer(GNUMakefileConstants.CONDITIONAL_IF);
+		sb.append(' ').append(getVariable());
+		return sb.toString();
+	}
+
+	public String getVariable() {
+		return getConditional();
+	}
+	
+	// ICommand methods so Automake if can be a child of an IRule
+	public Process execute(String shell, String[] envp, File dir)
+			throws IOException {
+		return null;
+	}
+	
+	public boolean shouldBeSilent() {
+		return false;
+	}
+	
+	public boolean shouldIgnoreError() {
+		return false;
+	}
+	
+	public boolean shouldExecute() {
+		return false;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifdef.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifdef.java
new file mode 100644
index 0000000..f1e9dfb
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifdef.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+public class Ifdef extends Conditional {
+    private static final String EMPTY = ""; //$NON-NLS-1$
+    
+	public Ifdef(Directive parent, String var) {
+		super(parent, var, EMPTY, EMPTY);
+	}
+
+	public boolean isIfdef() {
+		return true;
+	}
+
+	public String toString() {
+		StringBuffer sb = new StringBuffer(GNUMakefileConstants.CONDITIONAL_IFDEF);
+		sb.append(' ').append(getVariable());
+		return sb.toString();
+	}
+
+	public String getVariable() {
+		return getConditional();
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifeq.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifeq.java
new file mode 100644
index 0000000..ea02665
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifeq.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+public class Ifeq extends Conditional {
+
+	public Ifeq(Directive parent, String cond) {
+		super(parent, cond);
+	}
+
+	public boolean isIfeq() {
+		return true;
+	}
+
+	public String toString() {
+		StringBuffer sb = new StringBuffer(GNUMakefileConstants.CONDITIONAL_IFEQ);
+		sb.append(' ').append(getConditional());
+		return sb.toString();
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifndef.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifndef.java
new file mode 100644
index 0000000..336765b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifndef.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+public class Ifndef extends Conditional {
+
+    private static final String EMPTY = ""; //$NON-NLS-1$
+	public Ifndef(Directive parent, String var) {
+		super(parent, var, EMPTY, EMPTY);
+	}
+
+	public boolean isIfndef() {
+		return true;
+	}
+
+	public String toString() {
+		StringBuffer sb = new StringBuffer(GNUMakefileConstants.CONDITIONAL_IFNDEF);
+		sb.append(' ').append(getVariable());
+		return sb.toString();
+	}
+
+	public String getVariable() {
+		return getConditional();
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifneq.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifneq.java
new file mode 100644
index 0000000..fa02a12
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifneq.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+public class Ifneq extends Conditional {
+
+	public Ifneq(Directive parent, String cond) {
+		super(parent, cond);
+	}
+
+	public boolean isIfneq() {
+		return true;
+	}
+
+	public String toString() {
+		StringBuffer sb = new StringBuffer(GNUMakefileConstants.CONDITIONAL_IFNEQ);
+		sb.append(' ').append(getConditional());
+		return sb.toString();
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IgnoreRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IgnoreRule.java
new file mode 100644
index 0000000..a962aea
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IgnoreRule.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IIgnoreRule;
+
+/**
+ * .IGNORE
+ * Prerequisites of this special target are targets themselves; this shall cause errors
+ * from commands associated with them to be ignored in the same manner as
+ * specified by the -i option.
+ */
+public class IgnoreRule extends SpecialRule implements IIgnoreRule {
+
+	public IgnoreRule(Directive parent, String[] reqs) {
+		super(parent, new Target(MakeFileConstants.RULE_IGNORE), reqs, new Command[0]);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Include.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Include.java
new file mode 100644
index 0000000..1110c13
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Include.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.IOException;
+
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.gnu.IInclude;
+
+public class Include extends Parent implements IInclude {
+
+	String[] filenames;
+	String[] dirs;
+
+	public Include(Directive parent, String[] files, String[] directories) {
+		super(parent);
+		filenames = files;
+		dirs = directories;
+	}
+
+	public String toString() {
+		StringBuffer sb = new StringBuffer(GNUMakefileConstants.DIRECTIVE_INCLUDE);
+		for (int i = 0; i < filenames.length; i++) {
+			sb.append(' ').append(filenames[i]);
+		}
+		return sb.toString();
+	}
+
+	public String[] getFilenames() {
+		return filenames;
+	}
+
+	public IDirective[] getDirectives() {
+		clearDirectives();
+		for (int i = 0; i < filenames.length; i++) {
+			// Try the current directory.
+			GNUAutomakefile gnu = new GNUAutomakefile();
+			try {
+				gnu.parse(filenames[i]);
+				addDirective(gnu);
+				continue;
+			} catch (IOException e) {
+			}
+			if (!filenames[i].startsWith(GNUAutomakefile.FILE_SEPARATOR) && dirs != null) {
+				for (int j = 0; j < dirs.length; j++) {
+					try {
+						String filename =  dirs[j] + GNUAutomakefile.FILE_SEPARATOR + filenames[i];
+						gnu = new GNUAutomakefile();
+						gnu.parse(filename);
+						addDirective(gnu);
+						break;
+					} catch (IOException e) {
+					}
+				}
+			}
+		}
+		return super.getDirectives();
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/InferenceRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/InferenceRule.java
new file mode 100644
index 0000000..308fdca
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/InferenceRule.java
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.ICommand;
+
+public class InferenceRule extends Rule {
+
+	public InferenceRule(Directive parent, Target target) {
+		this(parent, target, new Command[0]);
+	}
+
+	public InferenceRule(Directive parent, String tgt, Command[] cmds) {
+		this(parent, new Target(tgt), cmds);
+	}
+
+	public InferenceRule(Directive parent, Target target, Command[] cmds) {
+		super(parent, target, cmds);
+	}
+
+	/**
+	 * @see java.lang.Object#toString()
+	 */
+	public String toString() {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append(getTarget().toString()).append(":\n"); //$NON-NLS-1$
+		ICommand[] cmds = getCommands();
+		for (int i = 0; i < cmds.length; i++) {
+			buffer.append(cmds[i].toString());
+		}
+		return buffer.toString();
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IntermediateRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IntermediateRule.java
new file mode 100644
index 0000000..20dee49
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IntermediateRule.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.gnu.IIntermediateRule;
+
+
+/**
+ * .INTERMEDIATE
+ *   The targets which `.INTERMEDIATE' depends on are treated as intermediate files.
+ *   `.INTERMEDIATE' with no prerequisites has no effect.
+ */
+public class IntermediateRule extends SpecialRule implements IIntermediateRule {
+
+	public IntermediateRule(Directive parent, String[] reqs) {
+		super(parent, new Target(GNUMakefileConstants.RULE_INTERMEDIATE), reqs, new Command[0]);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/LexicalSortingAction.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/LexicalSortingAction.java
new file mode 100644
index 0000000..fc15565
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/LexicalSortingAction.java
@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *     Red Hat Inc. - convert to use with Automake editor
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.core.model.ICElement;
+import org.eclipse.cdt.ui.CUIPlugin;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.MakeUIImages;
+
+
+
+public class LexicalSortingAction extends Action {
+	
+	private static final String ACTION_NAME= "LexicalSortingAction"; //$NON-NLS-1$
+	private static final String DIALOG_STORE_KEY= ACTION_NAME + ".sort"; //$NON-NLS-1$
+	
+	private LexicalCSorter fSorter;
+	private TreeViewer fTreeViewer;
+	
+	public LexicalSortingAction(TreeViewer treeViewer) {
+		super(CUIPlugin.getResourceString(ACTION_NAME + ".label")); //$NON-NLS-1$
+		
+		setDescription(CUIPlugin.getResourceString(ACTION_NAME + ".description")); //$NON-NLS-1$
+		setToolTipText(CUIPlugin.getResourceString(ACTION_NAME + ".tooltip")); //$NON-NLS-1$
+	
+		MakeUIImages.setImageDescriptors(this, MakeUIImages.T_TOOL, MakeUIImages.IMG_TOOLS_ALPHA_SORTING);
+	
+		fTreeViewer= treeViewer;
+		fSorter= new LexicalCSorter();
+		
+		boolean checked= CUIPlugin.getDefault().getDialogSettings().getBoolean(DIALOG_STORE_KEY);
+		valueChanged(checked, false);
+	}
+	
+	public void run() {
+		valueChanged(isChecked(), true);
+	}
+	
+	private void valueChanged(boolean on, boolean store) {
+		setChecked(on);
+		fTreeViewer.setSorter(on ? fSorter : null);
+		
+		String key= ACTION_NAME + ".tooltip" + (on ? ".on" : ".off"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		setToolTipText(CUIPlugin.getResourceString(key));
+		
+		if (store) {
+			CUIPlugin.getDefault().getDialogSettings().put(DIALOG_STORE_KEY, on);
+		}
+	}
+	
+	private class LexicalCSorter extends ViewerSorter {		
+		@SuppressWarnings("unused")
+		public boolean isSorterProperty(Object element, Object property) {
+			return true;
+		}
+		
+		public int category(Object obj) {
+			if (obj instanceof ICElement) {
+				ICElement elem= (ICElement)obj;
+				switch (elem.getElementType()) {
+					case ICElement.C_MACRO: return 1;
+					case ICElement.C_INCLUDE: return 2;
+					
+					case ICElement.C_CLASS: return 3;
+					case ICElement.C_STRUCT: return 4;
+					case ICElement.C_UNION: return 5;
+					
+					case ICElement.C_FIELD: return 6;
+					case ICElement.C_FUNCTION: return 7;		
+				}
+				
+			}
+			return 0;
+		}
+	}
+	
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/LowResolutionTimeRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/LowResolutionTimeRule.java
new file mode 100644
index 0000000..e22225e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/LowResolutionTimeRule.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.gnu.ILowResolutionTimeRule;
+
+
+/**
+ * .LOW_RESOLUTION_TIME'
+ *  If you specify prerequisites for `.LOW_RESOLUTION_TIME', `make'
+ *  assumes that these files are created by commands that generate low
+ *  resolution time stamps.
+ */
+public class LowResolutionTimeRule extends SpecialRule implements ILowResolutionTimeRule {
+
+	public LowResolutionTimeRule(Directive parent, String[] reqs) {
+		super(parent, new Target(GNUMakefileConstants.RULE_LOW_RESOLUTION_TIME), reqs, new Command[0]);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MacroDefinition.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MacroDefinition.java
new file mode 100644
index 0000000..74859d2
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MacroDefinition.java
@@ -0,0 +1,112 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IMacroDefinition;
+
+/**
+ */
+public class MacroDefinition extends Directive implements IMacroDefinition {
+	String name;
+	StringBuffer value;
+	boolean fromCommand;
+	boolean fromDefault;
+	boolean fromMakefile;
+	boolean fromEnvironment;
+	boolean fromEnvironmentOverride;
+
+	public MacroDefinition(Directive parent, String n, StringBuffer v) {
+		super(parent);
+		name = n;
+		value = v;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String n) {
+		name = (n == null) ? "" : n.trim() ; //$NON-NLS-1$
+	}
+
+	public StringBuffer getValue() {
+		return value;
+	}
+
+	/**
+	 * @see java.lang.Object#toString()
+	 */
+	public String toString() {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append(getName()).append(" = ").append(getValue()).append('\n'); //$NON-NLS-1$
+		return buffer.toString();
+	}
+
+	public boolean equals(MacroDefinition v) {
+		return v.getName().equals(getName());
+	}
+
+	public void setFromCommand(boolean from) {
+		fromCommand = from;
+	}
+
+	public void setFromDefault(boolean from) {
+		fromDefault = from;
+	}
+
+	public void setFromEnviroment(boolean from) {
+		fromEnvironment = from;
+	}
+
+	public void setFromEnviromentOverride(boolean from) {
+		fromEnvironmentOverride = from;
+	}
+
+	public void setFromMakefile(boolean from) {
+		fromMakefile = from;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.make.core.makefile.IMacroDefinition#isFromCommand()
+	 */
+	public boolean isFromCommand() {
+		return fromCommand;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.make.core.makefile.IMacroDefinition#isFromDefault()
+	 */
+	public boolean isFromDefault() {
+		return fromDefault;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.make.core.makefile.IMacroDefinition#isFromEnviroment()
+	 */
+	public boolean isFromEnviroment() {
+		return fromEnvironment;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.make.core.makefile.IMacroDefinition#isFromEnviroment()
+	 */
+	public boolean isFromEnvironmentOverride() {
+		return fromEnvironmentOverride;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.make.core.makefile.IMacroDefinition#isFromMakefile()
+	 */
+	public boolean isFromMakefile() {
+		return fromMakefile;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MacroDefinitionRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MacroDefinitionRule.java
new file mode 100644
index 0000000..c1f86af
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MacroDefinitionRule.java
@@ -0,0 +1,164 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IPredicateRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.Token;
+
+class MacroDefinitionRule implements IPredicateRule {
+	private static final int INIT_STATE = 0;
+	private static final int VAR_STATE = 1;
+	private static final int END_VAR_STATE = 2;
+	private static final int EQUAL_STATE = 3;
+	private static final int FINISH_STATE = 4;
+	private static final int ERROR_STATE = 5;
+
+	private IToken token;
+	private StringBuffer buffer = new StringBuffer();
+	protected IToken defaultToken;
+	
+	public MacroDefinitionRule(IToken token, IToken defaultToken) {
+		this.token = token;
+		this.defaultToken = defaultToken;
+	}
+
+	public IToken getSuccessToken() {
+		return token;
+	}
+
+	public IToken evaluate(ICharacterScanner scanner, boolean resume) {
+		buffer.setLength(0);
+		int state = INIT_STATE;
+
+		if (resume)
+			scanToBeginOfLine(scanner);
+
+		for (int c = scanner.read(); c != ICharacterScanner.EOF; c = scanner.read()) {
+			switch (state) {
+				case INIT_STATE :
+					if (c != '\n' && Character.isWhitespace((char) c)) {
+						break;
+					}
+					if (isValidCharacter(c)) {
+						state = VAR_STATE;
+					} else {
+						state = ERROR_STATE;
+					}
+					break;
+				case VAR_STATE :
+					if (isValidCharacter(c)) {
+						break;
+					}
+				case END_VAR_STATE :
+					if (c != '\n' && Character.isWhitespace((char) c)) {
+						state = END_VAR_STATE;
+					} else if (c == ':' || c == '+') {
+						state = EQUAL_STATE;
+					} else if (c == '=') {
+						state = FINISH_STATE;
+					} else {
+						if (state == END_VAR_STATE) {
+							scanner.unread(); // Return back to the space
+						}
+						state = ERROR_STATE;
+					}
+					break;
+				case EQUAL_STATE :
+					if (c == '=') {
+						state = FINISH_STATE;
+					} else {
+						state = ERROR_STATE;
+					}
+					break;
+				case FINISH_STATE :
+					break;
+				default :
+					break;
+			}
+			if (state >= FINISH_STATE) {
+				break;
+			}
+			buffer.append((char) c);
+		}
+
+		scanner.unread();
+
+		if (state == FINISH_STATE) {
+			scanToEndOfLine(scanner);
+			return token;
+		}
+
+		if (defaultToken.isUndefined())
+			unreadBuffer(scanner);
+
+		return Token.UNDEFINED;
+
+	}
+
+	public IToken evaluate(ICharacterScanner scanner) {
+		return evaluate(scanner, false);
+	}
+
+	/**
+	 * Returns the characters in the buffer to the scanner.
+	 *
+	 * @param scanner the scanner to be used
+	 */
+	protected void unreadBuffer(ICharacterScanner scanner) {
+		for (int i = buffer.length() - 1; i >= 0; i--) {
+			scanner.unread();
+		}
+	}
+
+	private void scanToEndOfLine(ICharacterScanner scanner) {
+		int c;
+		char[][] delimiters = scanner.getLegalLineDelimiters();
+		while ((c = scanner.read()) != ICharacterScanner.EOF) {
+			// Check for end of line since it can be used to terminate the pattern.
+			for (int i = 0; i < delimiters.length; i++) {
+				if (c == delimiters[i][0] && sequenceDetected(scanner, delimiters[i])) {
+					return;
+				}
+			}
+		}
+	}
+
+	private void scanToBeginOfLine(ICharacterScanner scanner) {
+		while(scanner.getColumn() != 0) {
+			scanner.unread();
+		}
+	}
+
+	private boolean sequenceDetected(ICharacterScanner scanner, char[] sequence) {
+		for (int i = 1; i < sequence.length; i++) {
+			int c = scanner.read();
+			if (c == ICharacterScanner.EOF) {
+				return true;
+			} else if (c != sequence[i]) {
+				// Non-matching character detected, rewind the scanner back to the start.
+				for (; i > 0; i--) {
+					scanner.unread();
+				}
+				return false;
+			}
+		}
+
+		return true;
+	}
+	protected boolean isValidCharacter(int c) {
+		char c0 = (char) c;
+		return Character.isLetterOrDigit(c0) || (c0 == '_');
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MacroReferenceRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MacroReferenceRule.java
new file mode 100644
index 0000000..a2ca12e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MacroReferenceRule.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.PatternRule;
+
+public class MacroReferenceRule extends PatternRule {
+
+	int nOfBrackets;
+	int fBracket;
+
+//	public MacroReferenceRule(IToken token) {
+//		super("$(", ")", token, (char) 0, true); //$NON-NLS-1$ //$NON-NLS-2$
+//	}
+
+	public MacroReferenceRule(IToken token, String startSeq, String endSeq) {
+		super(startSeq, endSeq, token, (char)0, true);
+		if (endSeq.length() > 0 && endSeq.charAt(0) == '}') {
+			fBracket = '{';
+		} else {
+			fBracket = '(';
+		}
+	}
+	
+	protected IToken doEvaluate(ICharacterScanner scanner, boolean resume) {
+		nOfBrackets = 1;
+		return super.doEvaluate(scanner, resume);
+	}
+
+	protected boolean endSequenceDetected(ICharacterScanner scanner) {
+		int c;
+		char[][] delimiters = scanner.getLegalLineDelimiters();
+		while ((c = scanner.read()) != ICharacterScanner.EOF) {
+			if (fBracket == c) {
+				++nOfBrackets;
+			}
+			if (fEndSequence.length > 0 && c == fEndSequence[0]) {
+				// Check if the specified end sequence has been found.
+				if (sequenceDetected(scanner, fEndSequence, true)) {
+					if (0 == --nOfBrackets) {
+						return true;
+					}
+				}
+			} else if (fBreaksOnEOL) {
+				// Check for end of line since it can be used to terminate the pattern.
+				for (int i = 0; i < delimiters.length; i++) {
+					if (c == delimiters[i][0] && sequenceDetected(scanner, delimiters[i], false)) {
+						return true;
+					}
+				}
+			}
+		}
+		scanner.unread();
+		return true;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakeFileConstants.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakeFileConstants.java
new file mode 100644
index 0000000..0ed46c2
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakeFileConstants.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+public class MakeFileConstants {
+
+    public static final String RULE_DEFAULT = ".DEFAULT"; //$NON-NLS-1$
+    public static final String RULE_IGNORE =".IGNORE"; //$NON-NLS-1$
+    public static final String RULE_POSIX = ".POSIX"; //$NON-NLS-1$
+    public static final String RULE_PRECIOUS = ".PRECIOUS"; //$NON-NLS-1$
+    public static final String RULE_SCCS_GET = ".SCCS_GET"; //$NON-NLS-1$
+    public static final String RULE_SILENT = ".SILENT"; //$NON-NLS-1$
+    public static final String RULE_SUFFIXES = ".SUFFIXES"; //$NON-NLS-1$
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakeFileMessages.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakeFileMessages.properties
new file mode 100644
index 0000000..ae76283
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakeFileMessages.properties
@@ -0,0 +1,27 @@
+###############################################################################
+# Copyright (c) 2003, 2006, 2007 QNX Software Systems and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     QNX Software Systems - initial API and implementation
+#     Red Hat Inc. - convert to use with Automake editor
+###############################################################################
+
+MakefileValidator.errorBuild=Error Build
+MakefileValidator.errorResource=Error resource
+MakefileValidator.warningInfo=Warning info
+MakefileValidator.warning=Warning
+MakefileValidator.unknown=unknown
+MakefileValidator.checkingFile=Checking file : 
+MakefileValidator.fileChecked=File checked
+MakefileValidator.error.elseMissingIfCondition=else missing if condition
+MakefileValidator.error.endifMissingIfElseCondition=Endif missing if/else condition
+MakefileValidator.error.endefMissingOverrideDefine=endef missing [override] define
+MakefileValidator.error.unknownDirective=unknow directive
+MakefileValidator.error.noMatchingEndifForCondition=No matching endif for condition
+MakefileValidator.error.noMatchingEndefForOverrideDefine=No matching endef for [override] define
+
+EditorUtility.concatModifierStrings= {0} + {1}
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileAnnotationHover.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileAnnotationHover.java
new file mode 100644
index 0000000..198c603
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileAnnotationHover.java
@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - convert to use with Automake editor
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.ui.IWorkingCopyManager;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.source.IAnnotationHover;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.ui.IEditorPart;
+
+
+/**
+ * MakefileAnnotationHover
+ *  
+ */
+public class MakefileAnnotationHover implements IAnnotationHover {
+
+	private IEditorPart fEditor;
+                                                                                                                             
+	/**
+	 *  
+	 */
+	public MakefileAnnotationHover(IEditorPart editor) {
+                fEditor = editor;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jface.text.source.IAnnotationHover#getHoverInfo(org.eclipse.jface.text.source.ISourceViewer,
+	 *      int)
+	 */
+	public String getHoverInfo(ISourceViewer sourceViewer, int lineNumber) {
+		IDocument document = sourceViewer.getDocument();
+		try {
+			IRegion info = document.getLineInformation(lineNumber);
+			String line = document.get(info.getOffset(), info.getLength());
+			int numberOfLines = document.getNumberOfLines();
+			while (line != null && line.endsWith("\\")) { //$NON-NLS-1$
+				line = line.substring(0, line.length() - 1);
+				lineNumber++;
+				if (lineNumber < numberOfLines) {
+					info = document.getLineInformation(lineNumber);
+					String l = document.get(info.getOffset(), info.getLength());
+					line += "\n" + l; //$NON-NLS-1$
+				}
+			}
+			if (line != null && line.indexOf('$') != -1 && line.length() > 1) {
+				IWorkingCopyManager fManager = AutomakeEditorFactory.getDefault().getWorkingCopyManager();
+				IMakefile makefile = fManager.getWorkingCopy(fEditor.getEditorInput());
+				line = makefile.expandString(line);
+				return line;
+			}
+			return line;
+		} catch (BadLocationException x) {
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileCodeScanner.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileCodeScanner.java
new file mode 100644
index 0000000..c7f5526
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileCodeScanner.java
@@ -0,0 +1,114 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jface.text.rules.EndOfLineRule;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.IWhitespaceDetector;
+import org.eclipse.jface.text.rules.MultiLineRule;
+import org.eclipse.jface.text.rules.WhitespaceRule;
+import org.eclipse.jface.text.rules.WordRule;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.ColorManager;
+
+
+public class MakefileCodeScanner extends AbstractMakefileCodeScanner {
+
+	private final static String[] keywords = { "define", "endef", "ifdef", "ifndef", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		"ifeq", "ifneq", "else", "endif", "include", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+		"-include", "sinclude", "override", "endef", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		"export", "unexport", "vpath" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+	};
+
+	private final static String[] functions = { "subst", "patsubst", "strip", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		"findstring", "filter", "sort", "dir", "notdir", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+		"suffix", "basename", "addsuffix", "addprefix", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		"join", "word", "words", "wordlist", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		"firstword", "wildcard", "error", "warning", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		"shell", "origin", "foreach", "call" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+	};
+
+	public static final String[] fTokenProperties = new String[] {
+			ColorManager.MAKE_COMMENT_COLOR,
+			ColorManager.MAKE_KEYWORD_COLOR,
+			ColorManager.MAKE_FUNCTION_COLOR,
+			ColorManager.MAKE_MACRO_REF_COLOR,
+			ColorManager.MAKE_MACRO_DEF_COLOR,
+			ColorManager.MAKE_DEFAULT_COLOR
+	};
+
+	/**
+	 * Constructor for MakefileCodeScanner
+	 */
+	public MakefileCodeScanner() {
+		super();
+		initialize();
+	}
+	
+	protected List<IRule> createRules() {
+		IToken keyword = getToken(ColorManager.MAKE_KEYWORD_COLOR);
+		IToken function = getToken(ColorManager.MAKE_FUNCTION_COLOR);
+		IToken comment = getToken(ColorManager.MAKE_COMMENT_COLOR);
+		IToken macroRef = getToken(ColorManager.MAKE_MACRO_REF_COLOR);
+		IToken macroDef = getToken(ColorManager.MAKE_MACRO_DEF_COLOR);
+		IToken other = getToken(ColorManager.MAKE_DEFAULT_COLOR);
+
+		List<IRule> rules = new ArrayList<IRule>();
+
+		// Add rule for single line comments.
+		rules.add(new EndOfLineRule("#", comment, '\\', true)); //$NON-NLS-1$
+
+		// Add generic whitespace rule.
+		rules.add(new WhitespaceRule(new IWhitespaceDetector() {
+			public boolean isWhitespace(char character) {
+				return Character.isWhitespace(character);
+			}
+		}));
+
+		// Put before the the word rules
+		MultiLineRule defineRule = new MultiLineRule("define", "endef", macroDef); //$NON-NLS-1$ //$NON-NLS-2$
+		defineRule.setColumnConstraint(0);
+		rules.add(defineRule);
+		rules.add(new MacroDefinitionRule(macroDef, other));
+
+		// Add word rule for keywords, types, and constants.
+		// We restring the detection of the keywords to be the first column to be valid.
+		WordRule keyWordRule = new WordRule(new MakefileWordDetector(), other);
+		for (int i = 0; i < keywords.length; i++) {
+			keyWordRule.addWord(keywords[i], keyword);
+		}
+		keyWordRule.setColumnConstraint(0);
+		rules.add(keyWordRule);
+
+		WordRule functionRule = new WordRule(new MakefileWordDetector(), other);
+		for (int i = 0; i < functions.length; i++)
+			functionRule.addWord(functions[i], function);
+		rules.add(functionRule);
+
+		rules.add(new MacroReferenceRule(macroRef, "$(", ")")); //$NON-NLS-1$ //$NON-NLS-2$
+		rules.add(new MacroReferenceRule(macroRef, "${", "}")); //$NON-NLS-1$ //$NON-NLS-2$
+
+		setDefaultReturnToken(other);
+
+		return rules;
+	}
+
+	/*
+	 * @see AbstractMakefileCodeScanner#getTokenProperties()
+	 */
+	protected String[] getTokenProperties() {
+		return fTokenProperties;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileCompletionProcessor.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileCompletionProcessor.java
new file mode 100644
index 0000000..5237f17
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileCompletionProcessor.java
@@ -0,0 +1,242 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - convert to use with Automake editor
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.IMacroDefinition;
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.core.makefile.IRule;
+import org.eclipse.cdt.make.ui.IWorkingCopyManager;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.TextPresentation;
+import org.eclipse.jface.text.contentassist.CompletionProposal;
+import org.eclipse.jface.text.contentassist.ContextInformation;
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.text.contentassist.IContextInformation;
+import org.eclipse.jface.text.contentassist.IContextInformationPresenter;
+import org.eclipse.jface.text.contentassist.IContextInformationValidator;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.MakeUIImages;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.IEditorPart;
+
+
+/**
+ * MakefileCompletionProcessor
+ */
+public class MakefileCompletionProcessor implements IContentAssistProcessor {
+
+	/**
+	 * Simple content assist tip closer. The tip is valid in a range
+	 * of 5 characters around its popup location.
+	 */
+	protected static class Validator implements IContextInformationValidator, IContextInformationPresenter {
+
+		protected int fInstallOffset;
+
+		/*
+		 * @see IContextInformationValidator#isContextInformationValid(int)
+		 */
+		public boolean isContextInformationValid(int offset) {
+			return Math.abs(fInstallOffset - offset) < 5;
+		}
+
+		/*
+		 * @see IContextInformationValidator#install(IContextInformation, ITextViewer, int)
+		 */
+		public void install(IContextInformation info, ITextViewer viewer, int offset) {
+			fInstallOffset = offset;
+		}
+
+		/*
+		 * @see org.eclipse.jface.text.contentassist.IContextInformationPresenter#updatePresentation(int, TextPresentation)
+		 */
+		public boolean updatePresentation(int documentPosition, TextPresentation presentation) {
+			return false;
+		}
+	}
+
+	public class DirectiveComparator implements Comparator<Object>{
+
+		/* (non-Javadoc)
+		 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+		 */
+		public int compare(Object o1, Object o2) {
+			String name1;
+			String name2;
+
+			if (o1 instanceof IMacroDefinition) {
+				name1 = ((IMacroDefinition)o1).getName();
+			} else if (o1 instanceof IRule) {
+				name1 = ((IRule)o1).getTarget().toString();
+			} else {
+				name1 =""; //$NON-NLS-1$
+			}
+
+			if (o2 instanceof IMacroDefinition) {
+				name2 = ((IMacroDefinition)o1).getName();
+			} else if (o2 instanceof IRule) {
+				name2 = ((IRule)o1).getTarget().toString();
+			} else {
+				name2 =""; //$NON-NLS-1$
+			}
+
+			//return String.CASE_INSENSITIVE_ORDER.compare(name1, name2);
+			return name1.compareToIgnoreCase(name2);
+		}
+		
+	}
+	protected IContextInformationValidator fValidator = new Validator();
+	protected Image imageMacro = MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_MACRO);
+	protected Image imageTarget = MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_TARGET_RULE);
+
+	protected CompletionProposalComparator comparator = new CompletionProposalComparator();
+	protected IEditorPart fEditor;
+	protected IWorkingCopyManager fManager;
+
+	public MakefileCompletionProcessor(IEditorPart editor) {
+		fEditor = editor;
+		fManager =  AutomakeEditorFactory.getDefault().getWorkingCopyManager();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeCompletionProposals(org.eclipse.jface.text.ITextViewer, int)
+	 */
+	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int documentOffset) {
+		WordPartDetector wordPart = new WordPartDetector(viewer, documentOffset);
+		boolean macro = WordPartDetector.inMacro(viewer, documentOffset);
+		IMakefile makefile = fManager.getWorkingCopy(fEditor.getEditorInput());
+		IDirective[] statements = null;
+		if (macro) {
+			IDirective[] m1 = makefile.getMacroDefinitions();
+			IDirective[] m2 = makefile.getBuiltinMacroDefinitions();
+			statements = new IDirective[m1.length + m2.length];
+			System.arraycopy(m1, 0, statements, 0, m1.length);
+			System.arraycopy(m2, 0, statements, m1.length, m2.length);
+		} else {
+			statements = makefile.getTargetRules();
+		}
+
+		ArrayList<ICompletionProposal> proposalList = new ArrayList<ICompletionProposal>(statements.length);
+
+		// iterate over all the different categories
+		for (int i = 0; i < statements.length; i++) {
+			String name = null;
+			Image image = null;
+			String infoString = "";//getContentInfoString(name); //$NON-NLS-1$
+			if (statements[i] instanceof IMacroDefinition) {
+				name = ((IMacroDefinition) statements[i]).getName();
+				image = imageMacro;
+				infoString = ((IMacroDefinition)statements[i]).getValue().toString();
+			} else if (statements[i] instanceof IRule) {
+				name = ((IRule) statements[i]).getTarget().toString();
+				image = imageTarget;
+				infoString = name;
+			}
+			if (name != null && name.startsWith(wordPart.toString())) {
+				IContextInformation info = new ContextInformation(name, infoString);
+				String displayString = (name.equals(infoString) ? name : name + " - " + infoString); //$NON-NLS-1$
+				ICompletionProposal result =
+					new CompletionProposal(
+						name,
+						wordPart.getOffset(),
+						wordPart.toString().length(),
+						name.length(),
+						image,
+						displayString,
+						info,
+						infoString);
+				proposalList.add(result);
+			}
+		}
+		ICompletionProposal[] proposals = (ICompletionProposal[]) proposalList.toArray(new ICompletionProposal[0]);
+		Arrays.sort(proposals, comparator);
+		return proposals;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeContextInformation(org.eclipse.jface.text.ITextViewer, int)
+	 */
+	public IContextInformation[] computeContextInformation(ITextViewer viewer, int documentOffset) {
+		WordPartDetector wordPart = new WordPartDetector(viewer, documentOffset);
+		boolean macro = WordPartDetector.inMacro(viewer, documentOffset);
+		IMakefile makefile = fManager.getWorkingCopy(fEditor.getEditorInput());
+		ArrayList<String> contextList = new ArrayList<String>();
+		if (macro) {
+			IDirective[] statements = makefile.getMacroDefinitions();
+			for (int i = 0; i < statements.length; i++) {
+				if (statements[i] instanceof IMacroDefinition) {
+					String name = ((IMacroDefinition) statements[i]).getName();
+					if (name != null && name.equals(wordPart.toString())) {
+						String value = ((IMacroDefinition) statements[i]).getValue().toString();
+						if (value != null && value.length() > 0) {
+							contextList.add(value);
+						}
+					}
+				}
+			}
+			statements = makefile.getBuiltinMacroDefinitions();
+			for (int i = 0; i < statements.length; i++) {
+				if (statements[i] instanceof IMacroDefinition) {
+					String name = ((IMacroDefinition) statements[i]).getName();
+					if (name != null && name.equals(wordPart.toString())) {
+						String value = ((IMacroDefinition) statements[i]).getValue().toString();
+						if (value != null && value.length() > 0) {
+							contextList.add(value);
+						}
+					}
+				}
+			}
+		}
+
+		IContextInformation[] result = new IContextInformation[contextList.size()];
+		for (int i = 0; i < result.length; i++) {
+			String context = (String)contextList.get(i);
+			result[i] = new ContextInformation(imageMacro, wordPart.toString(), context);
+		}
+		return result;
+
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getCompletionProposalAutoActivationCharacters()
+	 */
+	public char[] getCompletionProposalAutoActivationCharacters() {
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationAutoActivationCharacters()
+	 */
+	public char[] getContextInformationAutoActivationCharacters() {
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getErrorMessage()
+	 */
+	public String getErrorMessage() {
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationValidator()
+	 */
+	public IContextInformationValidator getContextInformationValidator() {
+		return fValidator;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileContentOutlinePage.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileContentOutlinePage.java
new file mode 100644
index 0000000..098195c
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileContentOutlinePage.java
@@ -0,0 +1,335 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - convert to use with Automake editor
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.cdt.make.core.makefile.IBadDirective;
+import org.eclipse.cdt.make.core.makefile.ICommand;
+import org.eclipse.cdt.make.core.makefile.IComment;
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.IEmptyLine;
+import org.eclipse.cdt.make.core.makefile.IInferenceRule;
+import org.eclipse.cdt.make.core.makefile.IMacroDefinition;
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.core.makefile.IParent;
+import org.eclipse.cdt.make.core.makefile.IRule;
+import org.eclipse.cdt.make.core.makefile.ITargetRule;
+import org.eclipse.cdt.make.core.makefile.gnu.IInclude;
+import org.eclipse.cdt.make.core.makefile.gnu.ITerminal;
+import org.eclipse.cdt.make.ui.IWorkingCopyManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.MakeUIImages;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IWorkbenchActionConstants;
+import org.eclipse.ui.part.IPageSite;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+
+
+/**
+ * MakefileContentOutlinePage
+ */
+public class MakefileContentOutlinePage extends ContentOutlinePage implements IContentOutlinePage {
+
+	private class MakefileContentProvider implements ITreeContentProvider {
+
+		protected boolean showMacroDefinition = true;
+		protected boolean showTargetRule = true;
+		protected boolean showInferenceRule = true;
+		protected boolean showIncludeChildren = false;
+
+		protected IMakefile makefile;
+		protected IMakefile nullMakefile = new NullMakefile();
+
+		/* (non-Javadoc)
+		* @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
+		*/
+		public Object[] getChildren(Object element) {
+			if (element == fInput) {
+				return getElements(makefile);
+			} else if (element instanceof IDirective) {
+				return getElements(element);
+			}
+			return new Object[0];
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
+		 */
+		public Object getParent(Object element) {
+			if (element instanceof IMakefile) {
+				return fInput;
+			} else if (element instanceof IDirective) {
+				return ((IDirective)element).getParent();
+			}
+			return fInput;
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
+		 */
+		public boolean hasChildren(Object element) {
+			if (element == fInput) {
+				return true;
+			} else if (element instanceof IParent) {
+				// Do not drill down in includes.
+				if (element instanceof IInclude && !showIncludeChildren) {
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
+		 */
+		public Object[] getElements(Object inputElement) {
+			IDirective[] directives;
+			if (inputElement == fInput) {
+				directives = makefile.getDirectives();
+			} else if (inputElement instanceof IRule) {
+				directives = ((IRule)inputElement).getCommands();
+			} else if (inputElement instanceof IParent) {
+				if (inputElement instanceof IInclude && !showIncludeChildren) {
+					directives = new IDirective[0];
+				} else {
+					directives = ((IParent)inputElement).getDirectives();
+				}
+			} else {
+				directives = new IDirective[0];
+			}
+			List<Object> list = new ArrayList<Object>(directives.length);
+			for (int i = 0; i < directives.length; i++) {
+				if (showMacroDefinition && directives[i] instanceof IMacroDefinition) {
+					list.add(directives[i]);
+				} else if (showInferenceRule && directives[i] instanceof IInferenceRule) {
+					list.add(directives[i]);
+				} else if (showTargetRule && directives[i] instanceof ITargetRule) {
+					list.add(directives[i]);
+				} else {
+					boolean irrelevant = (directives[i] instanceof IComment ||
+						directives[i] instanceof IEmptyLine ||
+						directives[i] instanceof ITerminal); 
+					if (!irrelevant) {
+						list.add(directives[i]);
+					}
+				}
+			}
+			return list.toArray();
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
+		 */
+		public void dispose() {
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+		 */
+		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+			if (oldInput != null) {
+				makefile = nullMakefile;
+			}
+
+			if (newInput != null) {
+				IWorkingCopyManager manager= AutomakeEditorFactory.getDefault().getWorkingCopyManager();
+				makefile = manager.getWorkingCopy((IEditorInput)newInput);
+				if (makefile == null) {
+					makefile = nullMakefile;
+				}
+			}
+		}
+
+	}
+
+	private class MakefileLabelProvider extends LabelProvider implements ILabelProvider {
+
+		/* (non-Javadoc)
+		* @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
+		*/
+		public Image getImage(Object element) {
+			if (element instanceof ITargetRule) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_TARGET_RULE);
+			} else if (element instanceof IInferenceRule) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_INFERENCE_RULE);
+			} else if (element instanceof IMacroDefinition) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_MACRO);
+			} else if (element instanceof ICommand) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_COMMAND);
+			} else if (element instanceof IInclude) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_INCLUDE);
+			} else if (element instanceof IBadDirective) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_ERROR);
+			} else if (element instanceof IParent) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_RELATION);
+			}
+			return super.getImage(element);
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
+		 */
+		public String getText(Object element) {
+			String name;
+			if (element instanceof IRule) {
+				name = ((IRule) element).getTarget().toString().trim();
+			} else if (element instanceof IMacroDefinition) {
+				name = ((IMacroDefinition) element).getName().trim();
+			} else {
+				name = super.getText(element);
+			}
+			if (name != null) {
+				name = name.trim();
+				if (name.length() > 25) {
+					name = name.substring(0, 25) + " ..."; //$NON-NLS-1$
+				}
+			}
+			return name;
+		}
+
+	}
+
+	protected MakefileEditor fEditor;
+	protected Object fInput;
+	protected AddBuildTargetAction fAddBuildTargetAction;
+	protected OpenIncludeAction fOpenIncludeAction;
+
+	public MakefileContentOutlinePage(MakefileEditor editor) {
+		super();
+		fEditor = editor;
+		fAddBuildTargetAction = new AddBuildTargetAction(this);
+		fOpenIncludeAction = new OpenIncludeAction(this);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.part.IPage#createControl(org.eclipse.swt.widgets.Composite)
+	 */
+	public void createControl(Composite parent) {
+		super.createControl(parent);
+		TreeViewer viewer = getTreeViewer();
+		viewer.setContentProvider(new MakefileContentProvider());
+		viewer.setLabelProvider(new MakefileLabelProvider());
+		if (fInput != null) {
+			viewer.setInput(fInput);
+		}
+
+		MenuManager manager= new MenuManager("#MakefileOutlinerContext"); //$NON-NLS-1$
+		manager.setRemoveAllWhenShown(true);
+		manager.addMenuListener(new IMenuListener() {
+			public void menuAboutToShow(IMenuManager m) {
+				contextMenuAboutToShow(m);
+			}
+		});
+		Control tree = viewer.getControl();
+		Menu menu = manager.createContextMenu(tree);
+		tree.setMenu(menu);
+
+		viewer.addDoubleClickListener(new IDoubleClickListener() {
+			/* (non-Javadoc)
+			 * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)
+			 */
+			public void doubleClick(DoubleClickEvent event) {
+				if (fOpenIncludeAction != null) {
+					fOpenIncludeAction.run();
+				}
+			}
+		});
+
+		IPageSite site= getSite();
+		//FIXME: should pluginid below be MakeUIPlugin id?
+		site.registerContextMenu(AutotoolsUIPlugin.getPluginId() + ".outline", manager, viewer); //$NON-NLS-1$
+		site.setSelectionProvider(viewer);
+
+	}
+
+	/**
+	 * called to create the context menu of the outline
+	 */
+	protected void contextMenuAboutToShow(IMenuManager menu) {
+		if (OpenIncludeAction.canActionBeAdded(getSelection())) {
+			menu.add(fOpenIncludeAction);
+		}
+		if (fAddBuildTargetAction.canActionBeAdded(getSelection())) {
+			menu.add(fAddBuildTargetAction);
+		}
+		menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
+		menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS+"-end"));//$NON-NLS-1$
+	}
+
+	/**
+	 * Sets the input of the outline page
+	 */
+	public void setInput(Object input) {
+		fInput = input;
+		update();
+	}
+
+	public Object getInput() {
+		return fInput;
+	}
+
+	/**
+	 * Updates the outline page.
+	 */
+	public void update() {
+		final TreeViewer viewer = getTreeViewer();
+
+		if (viewer != null) {
+			final Control control = viewer.getControl();
+			if (control != null && !control.isDisposed()) {
+				control.getDisplay().asyncExec(new Runnable() {
+					public void run() {
+						if (!control.isDisposed()) {
+							control.setRedraw(false);
+							viewer.setInput(fInput);
+							viewer.expandAll();
+							control.setRedraw(true);
+						}
+					}
+				});
+			}
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.part.IPage#setActionBars(org.eclipse.ui.IActionBars)
+	 */
+	public void setActionBars(IActionBars actionBars) {
+		super.setActionBars(actionBars);
+		IToolBarManager toolBarManager= actionBars.getToolBarManager();
+
+		LexicalSortingAction action= new LexicalSortingAction(getTreeViewer());
+		toolBarManager.add(action);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileDocumentProvider.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileDocumentProvider.java
new file mode 100644
index 0000000..fc733b3
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileDocumentProvider.java
@@ -0,0 +1,148 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Anton Leherbauer (Wind River Systems) - Fixed bug 141295
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.Iterator;
+
+import org.eclipse.cdt.make.core.MakeCorePlugin;
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.text.source.IAnnotationModel;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.editors.text.ForwardingDocumentProvider;
+import org.eclipse.ui.editors.text.TextFileDocumentProvider;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+import org.eclipse.ui.texteditor.ResourceMarkerAnnotationModel;
+
+public class MakefileDocumentProvider extends TextFileDocumentProvider implements IMakefileDocumentProvider {
+	
+	IMakefile fMakefile;
+
+	protected class MakefileAnnotationModel extends ResourceMarkerAnnotationModel /*implements IProblemRequestor */{
+		/**
+		 * @param resource
+		 */
+		public MakefileAnnotationModel(IResource resource) {
+			super(resource);
+		}
+
+		/**
+		 * @param makefile
+		 */
+		public void setMakefile(IMakefile makefile) {
+			fMakefile = makefile;
+		}
+	}
+
+	/**
+	 * Remembers a IMakefile for each element.
+	 */
+	protected class MakefileFileInfo extends FileInfo {		
+		public IMakefile fCopy;
+	}
+
+	public MakefileDocumentProvider() {
+		IDocumentProvider provider= new TextFileDocumentProvider(new MakefileStorageDocumentProvider());
+		provider= new ForwardingDocumentProvider(MakefileDocumentSetupParticipant.MAKEFILE_PARTITIONING, new MakefileDocumentSetupParticipant(), provider);
+		setParentDocumentProvider(provider);
+	}
+
+	/**
+	 */
+	private IMakefile createMakefile(IFile file) throws CoreException {
+		if (file.exists()) {
+			return MakeCorePlugin.getDefault().createMakefile(file);
+		}
+		return null;
+	}
+
+    /* (non-Javadoc)
+     * @see org.eclipse.ui.editors.text.TextFileDocumentProvider#createAnnotationModel(org.eclipse.core.resources.IFile)
+     */
+    protected IAnnotationModel createAnnotationModel(IFile file) {
+    	return new MakefileAnnotationModel(file);
+    }
+
+    /*
+	 * @see org.eclipse.ui.editors.text.TextFileDocumentProvider#createFileInfo(java.lang.Object)
+	 */
+	protected FileInfo createFileInfo(Object element) throws CoreException {
+		if (!(element instanceof IFileEditorInput))
+			return null;
+			
+		IFileEditorInput input= (IFileEditorInput) element;
+		IMakefile original= createMakefile(input.getFile());
+		if (original == null)
+			return null;
+
+		FileInfo info= super.createFileInfo(element);
+		if (!(info instanceof MakefileFileInfo)) {
+			return null;
+		}
+	
+		MakefileFileInfo makefileInfo= (MakefileFileInfo) info;
+		setUpSynchronization(makefileInfo);
+
+		makefileInfo.fCopy = original;
+
+		if (makefileInfo.fModel instanceof MakefileAnnotationModel)   {
+			MakefileAnnotationModel model= (MakefileAnnotationModel) makefileInfo.fModel;
+			model.setMakefile(makefileInfo.fCopy);
+		} 		
+		return makefileInfo;
+	}
+	
+    /* (non-Javadoc)
+     * @see org.eclipse.ui.editors.text.TextFileDocumentProvider#disposeFileInfo(java.lang.Object, org.eclipse.ui.editors.text.TextFileDocumentProvider.FileInfo)
+     */
+    protected void disposeFileInfo(Object element, FileInfo info) {
+	    if (info instanceof MakefileFileInfo) {
+		    MakefileFileInfo makefileInfo= (MakefileFileInfo) info;
+		    if (makefileInfo.fCopy != null) {
+		    	makefileInfo.fCopy = null;
+		    }
+	    }
+	    super.disposeFileInfo(element, info);	
+    }
+    
+    /*
+	 * @see org.eclipse.ui.editors.text.TextFileDocumentProvider#createEmptyFileInfo()
+	 */
+	protected FileInfo createEmptyFileInfo() {
+		return new MakefileFileInfo();
+	}
+	
+	/*
+	 * @see org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.IMakefileDocumentProvider#getWorkingCopy(java.lang.Object)
+	 */
+	public IMakefile getWorkingCopy(Object element) {
+		FileInfo fileInfo= getFileInfo(element);		
+		if (fileInfo instanceof MakefileFileInfo) {
+			MakefileFileInfo info= (MakefileFileInfo) fileInfo;
+			return info.fCopy;
+		}
+		return null;
+	}
+
+	/*
+	 * @see org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.MakefileDocumentProvider#shutdown()
+	 */
+	@SuppressWarnings("unchecked")
+	public void shutdown() {
+		Iterator e= getConnectedElementsIterator();
+		while (e.hasNext())
+			disconnect(e.next());
+	}
+	
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileDocumentSetupParticipant.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileDocumentSetupParticipant.java
new file mode 100644
index 0000000..30bf900
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileDocumentSetupParticipant.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2005 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.core.filebuffers.IDocumentSetupParticipant;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IDocumentExtension3;
+import org.eclipse.jface.text.IDocumentPartitioner;
+import org.eclipse.jface.text.rules.FastPartitioner;
+
+/**
+ * MakefileDocumentSetupParticipant
+ * The document setup participant for Ant.
+ */
+public class MakefileDocumentSetupParticipant  implements IDocumentSetupParticipant {
+	
+	/**
+	 * The name of the Makefile partitioning.
+	 */
+	public final static String MAKEFILE_PARTITIONING= "___makefile_partitioning";  //$NON-NLS-1$
+	
+	public MakefileDocumentSetupParticipant() {
+	}
+	
+	/*
+	 * @see org.eclipse.core.filebuffers.IDocumentSetupParticipant#setup(org.eclipse.jface.text.IDocument)
+	 */
+	public void setup(IDocument document) {
+		if (document instanceof IDocumentExtension3) {
+			IDocumentExtension3 extension3= (IDocumentExtension3) document;
+			IDocumentPartitioner partitioner = createDocumentPartitioner();
+			extension3.setDocumentPartitioner(MAKEFILE_PARTITIONING, partitioner);
+			partitioner.connect(document);
+		} 
+	}
+	
+	private IDocumentPartitioner createDocumentPartitioner() {
+		return new FastPartitioner(
+				new MakefilePartitionScanner(), MakefilePartitionScanner.MAKE_PARTITIONS);
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditor.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditor.java
new file mode 100644
index 0000000..9fb54e8
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditor.java
@@ -0,0 +1,462 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Anton Leherbauer, Wind River Systems, Inc.
+ *     Red Hat Inc. - convert to use with Automake editor
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ResourceBundle;
+
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.ListenerList;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.FindReplaceDocumentAdapter;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextOperationTarget;
+import org.eclipse.jface.text.ITextViewerExtension;
+import org.eclipse.jface.text.rules.IWordDetector;
+import org.eclipse.jface.text.source.IOverviewRuler;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.IVerticalRuler;
+import org.eclipse.jface.text.source.SourceViewerConfiguration;
+import org.eclipse.jface.text.source.projection.ProjectionAnnotationModel;
+import org.eclipse.jface.text.source.projection.ProjectionSupport;
+import org.eclipse.jface.text.source.projection.ProjectionViewer;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.MakeUIMessages;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IPartService;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.editors.text.EditorsUI;
+import org.eclipse.ui.editors.text.TextEditor;
+import org.eclipse.ui.texteditor.ChainedPreferenceStore;
+import org.eclipse.ui.texteditor.DefaultRangeIndicator;
+import org.eclipse.ui.texteditor.ITextEditorActionConstants;
+import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
+import org.eclipse.ui.texteditor.TextOperationAction;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+
+
+public class MakefileEditor extends TextEditor implements ISelectionChangedListener, IReconcilingParticipant {
+
+	/**
+	 * The page that shows the outline.
+	 */
+	protected MakefileContentOutlinePage page;
+	ProjectionSupport projectionSupport;
+	ProjectionMakefileUpdater fProjectionMakefileUpdater;
+	private FindReplaceDocumentAdapter fFindReplaceDocumentAdapter;
+
+	/**
+	 * Reconciling listeners.
+	 * @since 3.0
+	 */
+	private ListenerList fReconcilingListeners= new ListenerList(ListenerList.IDENTITY);
+
+	/**
+	 * Adapted source viewer for CEditor
+	 */
+
+	public class AdaptedSourceViewer extends ProjectionViewer implements ITextViewerExtension {
+
+
+		public AdaptedSourceViewer(Composite parent, IVerticalRuler ruler,
+			IOverviewRuler overviewRuler, boolean showsAnnotation, int styles) {
+			super(parent, ruler, overviewRuler, showsAnnotation, styles);
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.text.source.ISourceViewer#setRangeIndication(int, int, boolean)
+		 */
+		public void setRangeIndication(int offset, int length, boolean moveCursor) {
+			// Fixin a bug in the ProjectViewer implemenation
+			// PR: https://bugs.eclipse.org/bugs/show_bug.cgi?id=72914
+			if (isProjectionMode()) {
+				super.setRangeIndication(offset, length, moveCursor);
+			} else {
+				super.setRangeIndication(offset, length, false);
+			}
+		}
+	}
+
+
+	MakefileSourceConfiguration getMakefileSourceConfiguration() {
+		SourceViewerConfiguration configuration = getSourceViewerConfiguration();
+		if (configuration instanceof MakefileSourceConfiguration) {
+			return (MakefileSourceConfiguration)configuration;
+		}
+		return null;
+	}
+
+	public MakefileContentOutlinePage getOutlinePage() {
+		if (page == null) {
+			page = new MakefileContentOutlinePage(this);
+			page.addSelectionChangedListener(this);
+			page.setInput(getEditorInput());
+		}
+		return page;
+	}
+
+	public MakefileEditor() {
+		super();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#initializeEditor()
+	 */
+	protected void initializeEditor() {
+		setRangeIndicator(new DefaultRangeIndicator());
+		setEditorContextMenuId("#MakefileEditorContext"); //$NON-NLS-1$
+		setRulerContextMenuId("#MakefileRulerContext"); //$NON-NLS-1$
+		setDocumentProvider(AutomakeEditorFactory.getDefault().getAutomakefileDocumentProvider());
+		IPreferenceStore[] stores = new IPreferenceStore[2];
+		stores[0] = AutotoolsPlugin.getDefault().getPreferenceStore();
+		stores[1] = EditorsUI.getPreferenceStore();
+		ChainedPreferenceStore chainedStore = new ChainedPreferenceStore(stores);
+		setPreferenceStore(chainedStore);
+		setSourceViewerConfiguration(new MakefileSourceConfiguration(chainedStore, this));
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IWorkbenchPart#dispose()
+	 */
+	public void dispose() {
+		if (fProjectionMakefileUpdater != null) {
+			fProjectionMakefileUpdater.uninstall();
+			fProjectionMakefileUpdater= null;
+		}
+		super.dispose();
+	}
+
+	boolean isFoldingEnabled() {
+		return AutotoolsPlugin.getDefault().getPreferenceStore().getBoolean(MakefileEditorPreferenceConstants.EDITOR_FOLDING_ENABLED);
+	}
+
+	/*
+	 * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#isTabsToSpacesConversionEnabled()
+	 */
+	protected boolean isTabsToSpacesConversionEnabled() {
+		// always false for Makefiles
+		// see http://bugs.eclipse.org/186106
+		return false;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
+	 */
+	public void createPartControl(Composite parent) {
+		super.createPartControl(parent);
+		ProjectionViewer projectionViewer = (ProjectionViewer) getSourceViewer();
+		projectionSupport = new ProjectionSupport(projectionViewer, getAnnotationAccess(), getSharedColors());
+		projectionSupport.addSummarizableAnnotationType("org.eclipse.ui.workbench.texteditor.error"); //$NON-NLS-1$
+		projectionSupport.addSummarizableAnnotationType("org.eclipse.ui.workbench.texteditor.warning"); //$NON-NLS-1$
+		projectionSupport.install();
+
+		if (isFoldingEnabled()) {
+			projectionViewer.doOperation(ProjectionViewer.TOGGLE);
+		}
+
+//		ProjectionAnnotationModel model= (ProjectionAnnotationModel) getAdapter(ProjectionAnnotationModel.class);
+
+		fProjectionMakefileUpdater= new ProjectionMakefileUpdater();
+		if (fProjectionMakefileUpdater != null) {
+			fProjectionMakefileUpdater.install(this, projectionViewer);
+			fProjectionMakefileUpdater.initialize();
+		}
+	}
+
+	protected ISourceViewer createSourceViewer(Composite parent, IVerticalRuler ruler, int styles) {
+		ISourceViewer viewer = new AdaptedSourceViewer(parent, ruler, getOverviewRuler(), isOverviewRulerVisible(), styles);
+
+		// ensure decoration support has been created and configured.
+		getSourceViewerDecorationSupport(viewer);
+		
+		return viewer;
+	}
+
+	/* (non-Javadoc)
+	 * Method declared on IAdaptable
+	 */
+	@SuppressWarnings("unchecked")
+	public Object getAdapter(Class key) {
+		if (ProjectionAnnotationModel.class.equals(key)) {
+			if (projectionSupport != null) {
+				Object result = projectionSupport.getAdapter(getSourceViewer(), key);
+				if (result != null) {
+					return result;
+				}
+			}
+		} else if (key.equals(IContentOutlinePage.class)) {
+			return getOutlinePage();
+		}
+		return super.getAdapter(key);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.ISaveablePart#doSave(org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	public void doSave(IProgressMonitor monitor) {
+		super.doSave(monitor);
+		if (page != null) {
+			page.update();
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#createActions()
+	 */
+	protected void createActions() {
+		super.createActions();
+
+		ResourceBundle bundle = MakeUIMessages.getResourceBundle();
+
+		IAction a = new TextOperationAction(bundle, "ContentAssistProposal.", this, ISourceViewer.CONTENTASSIST_PROPOSALS); //$NON-NLS-1$
+		a.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
+		setAction("ContentAssistProposal", a); //$NON-NLS-1$
+
+		a = new TextOperationAction(bundle, "ContentAssistTip.", this, ISourceViewer.CONTENTASSIST_CONTEXT_INFORMATION); //$NON-NLS-1$
+		a.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_CONTEXT_INFORMATION);
+		setAction("ContentAssistTip", a); //$NON-NLS-1$
+
+		a = new TextOperationAction(bundle, "Comment.", this, ITextOperationTarget.PREFIX); //$NON-NLS-1$
+		a.setActionDefinitionId(IMakefileEditorActionDefinitionIds.COMMENT);
+		setAction("Comment", a); //$NON-NLS-1$
+		markAsStateDependentAction("Comment", true); //$NON-NLS-1$
+ 
+		a = new TextOperationAction(bundle, "Uncomment.", this, ITextOperationTarget.STRIP_PREFIX); //$NON-NLS-1$
+		a.setActionDefinitionId(IMakefileEditorActionDefinitionIds.UNCOMMENT);
+		setAction("Uncomment", a); //$NON-NLS-1$
+		markAsStateDependentAction("Uncomment", true); //$NON-NLS-1$
+
+		a = new OpenDeclarationAction(this);
+		a.setActionDefinitionId(IMakefileEditorActionDefinitionIds.OPEN_DECLARATION);
+		setAction("OpenDeclarationAction", a); //$NON-NLS-1$
+		markAsStateDependentAction("OpenDeclarationAction", true); //$NON-NLS-1$
+
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
+	 */
+	public void selectionChanged(SelectionChangedEvent event) {
+		ISelection selection = event.getSelection();
+		if (selection.isEmpty()) {
+			resetHighlightRange();
+		} else if (selection instanceof IStructuredSelection){                                                                                                                         
+			if (!isActivePart() && AutotoolsPlugin.getActivePage() != null) {
+				AutotoolsPlugin.getActivePage().bringToTop(this);
+			}                                                                                                                 
+			Object element =  ((IStructuredSelection) selection).getFirstElement();
+			if (element instanceof IDirective) {
+				IDirective statement = (IDirective)element;
+				setSelection(statement, !isActivePart());
+			}
+		}
+	}
+
+	/**
+	 * Returns whether the editor is active.
+	 */
+	private boolean isActivePart() {
+		IWorkbenchWindow window= getSite().getWorkbenchWindow();
+		IPartService service= window.getPartService();
+		IWorkbenchPart part= service.getActivePart();
+		return part != null && part.equals(this);
+	}
+
+	/**
+	 * Returns the find/replace document adapter.
+	 * 
+	 * @return the find/replace document adapter.
+	 */
+	private FindReplaceDocumentAdapter getFindRepalceDocumentAdapter() {
+		if (fFindReplaceDocumentAdapter == null) {
+			IDocument doc = getDocumentProvider().getDocument(getEditorInput());
+			fFindReplaceDocumentAdapter= new FindReplaceDocumentAdapter(doc);
+		}
+		return fFindReplaceDocumentAdapter;
+	}
+
+	public void setSelection(IDirective directive, boolean moveCursor) {
+		int startLine = directive.getStartLine() - 1;
+		int endLine = directive.getEndLine() - 1;
+		try {
+			IDocument doc = getDocumentProvider().getDocument(getEditorInput());
+			int start = doc.getLineOffset(startLine);
+			int len = doc.getLineLength(endLine) - 1;
+			int length = (doc.getLineOffset(endLine) + len) - start;
+			setHighlightRange(start, length, true);
+			if (moveCursor) {
+				// Let see if we can move the cursor at the position also
+				String var = directive.toString().trim();
+				IWordDetector detector = new MakefileWordDetector();
+				for (len = 0; len < var.length(); len++) {
+					char c = var.charAt(len);
+					//if (! (Character.isLetterOrDigit(c) || c == '.' || c == '_')) {
+					if (!(detector.isWordPart(c) || detector.isWordStart(c) || c == '-' || c == '_')) {
+						break;
+					}
+				}
+				if (len > 0) {
+					var = var.substring(0, len);
+				}
+				IRegion region = getFindRepalceDocumentAdapter().find(start, var, true, true, true, false);
+
+				if (region != null) {
+					len = region.getOffset();
+					length = region.getLength();
+					getSourceViewer().revealRange(len, length);
+					// Selected region begins one index after offset
+					getSourceViewer().setSelectedRange(len, length);
+				}
+
+			}
+		} catch (IllegalArgumentException x) {
+			resetHighlightRange();
+		} catch (BadLocationException e) {
+			resetHighlightRange();
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#editorContextMenuAboutToShow(org.eclipse.jface.action.IMenuManager)
+	 */
+	protected void editorContextMenuAboutToShow(IMenuManager menu) {
+		super.editorContextMenuAboutToShow(menu);
+		addAction(menu, ITextEditorActionConstants.GROUP_EDIT, "Comment"); //$NON-NLS-1$
+		addAction(menu, ITextEditorActionConstants.GROUP_EDIT, "Uncomment"); //$NON-NLS-1$
+		//addAction(menu, ITextEditorActionConstants.GROUP_EDIT, "OpenDeclarationAction"); //$NON-NLS-1$
+	}
+
+	/**
+	 * Adds the given listener.
+	 * Has no effect if an identical listener was not already registered.
+	 * 
+	 * @param listener	The reconcile listener to be added
+	 * @since 3.0
+	 */
+	final void addReconcilingParticipant(IReconcilingParticipant listener) {
+		synchronized (fReconcilingListeners) {
+			fReconcilingListeners.add(listener);
+		}
+	}
+	
+	/**
+	 * Removes the given listener.
+	 * Has no effect if an identical listener was not already registered.
+	 * 
+	 * @param listener	the reconcile listener to be removed
+	 * @since 3.0
+	 */
+	final void removeReconcilingParticipant(IReconcilingParticipant listener) {
+		synchronized (fReconcilingListeners) {
+			fReconcilingListeners.remove(listener);
+		}
+	}
+	
+	/*
+	 */
+	public void reconciled() {		
+		// Notify listeners
+		Object[] listeners = fReconcilingListeners.getListeners();
+		for (int i = 0, length= listeners.length; i < length; ++i) {
+			((IReconcilingParticipant)listeners[i]).reconciled();
+		}
+	}
+
+	/*
+	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#performRevert()
+	 */
+	protected void performRevert() {
+		ProjectionViewer projectionViewer= (ProjectionViewer) getSourceViewer();
+		projectionViewer.setRedraw(false);
+		try {
+			
+			boolean projectionMode= projectionViewer.isProjectionMode();
+			if (projectionMode) {
+				projectionViewer.disableProjection();				
+				if (fProjectionMakefileUpdater != null)
+					fProjectionMakefileUpdater.uninstall();
+			}
+			
+			super.performRevert();
+			
+			if (projectionMode) {
+				if (fProjectionMakefileUpdater != null)
+					fProjectionMakefileUpdater.install(this, projectionViewer);	
+				projectionViewer.enableProjection();
+			}
+			
+		} finally {
+			projectionViewer.setRedraw(true);
+		}
+	}
+
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#handlePreferenceStoreChanged(org.eclipse.jface.util.PropertyChangeEvent)
+	 */
+	protected void handlePreferenceStoreChanged(PropertyChangeEvent event) {
+		ISourceViewer sourceViewer= getSourceViewer();
+		if (sourceViewer == null)
+			return;
+
+        String property = event.getProperty();
+
+        MakefileSourceConfiguration makeConf = getMakefileSourceConfiguration();
+        if (makeConf != null) {
+        	if (makeConf.affectsBehavior(event)) {
+        		makeConf.adaptToPreferenceChange(event);
+        		sourceViewer.invalidateTextPresentation();
+        	}
+        }
+
+        if (MakefileEditorPreferenceConstants.EDITOR_FOLDING_ENABLED.equals(property)) {
+			if (sourceViewer instanceof ProjectionViewer) {
+				ProjectionViewer projectionViewer= (ProjectionViewer) sourceViewer;
+				if (fProjectionMakefileUpdater != null)
+					fProjectionMakefileUpdater.uninstall();
+				// either freshly enabled or provider changed
+				fProjectionMakefileUpdater= new ProjectionMakefileUpdater();
+				if (fProjectionMakefileUpdater != null) {
+					fProjectionMakefileUpdater.install(this, projectionViewer);
+				}
+			}
+			return;
+		}
+
+		super.handlePreferenceStoreChanged(event);
+	}
+
+	/*
+	 * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#collectContextMenuPreferencePages()
+	 */
+	protected String[] collectContextMenuPreferencePages() {
+		// Add Makefile Editor relevant pages
+		String[] parentPrefPageIds = super.collectContextMenuPreferencePages();
+		String[] prefPageIds = new String[parentPrefPageIds.length + 2];
+		int nIds = 0;
+		prefPageIds[nIds++] = "org.eclipse.cdt.make.ui.preferences.MakeFileEditorPreferencePage"; //$NON-NLS-1$
+		prefPageIds[nIds++] = "org.eclipse.cdt.make.ui.preferences.MakefileSettingPreferencePage"; //$NON-NLS-1$
+		System.arraycopy(parentPrefPageIds, 0, prefPageIds, nIds, parentPrefPageIds.length);
+		return prefPageIds;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditorActionContributor.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditorActionContributor.java
new file mode 100644
index 0000000..d86e087
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditorActionContributor.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Wind River Systems - fix for bugzilla 135150
+ *     Red Hat Inc. - modify for usage with Automake editor
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ResourceBundle;
+
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.MakeUIMessages;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchActionConstants;
+import org.eclipse.ui.texteditor.BasicTextEditorActionContributor;
+import org.eclipse.ui.texteditor.ITextEditor;
+import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
+import org.eclipse.ui.texteditor.RetargetTextEditorAction;
+
+
+/**
+ */
+public class MakefileEditorActionContributor extends BasicTextEditorActionContributor {
+
+	private MakefileEditorTogglePresentationAction fTogglePresentation;
+	private OpenDeclarationAction fOpenDeclarationAction;
+	protected RetargetTextEditorAction fContentAssistProposal;
+	protected RetargetTextEditorAction fContentAssistTip;
+
+	/**
+	 * Constructor for MakefileEditorActionContributor.
+	 */
+	public MakefileEditorActionContributor() {
+		super();
+		ResourceBundle bundle = MakeUIMessages.getResourceBundle();
+		fContentAssistProposal = new RetargetTextEditorAction(bundle, "ContentAssistProposal."); //$NON-NLS-1$
+		fContentAssistProposal.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
+		fContentAssistTip = new RetargetTextEditorAction(bundle, "ContentAssistTip."); //$NON-NLS-1$
+		fContentAssistTip.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_CONTEXT_INFORMATION);
+		fTogglePresentation = new MakefileEditorTogglePresentationAction();
+		fOpenDeclarationAction = new OpenDeclarationAction();
+		
+	}
+
+	/**
+	 * @see org.eclipse.ui.IEditorActionBarContributor#setActiveEditor(IEditorPart)
+	 */
+	public void setActiveEditor(IEditorPart targetEditor) {
+		super.setActiveEditor(targetEditor);
+		doSetActiveEditor(targetEditor);
+	}
+
+	private void doSetActiveEditor(IEditorPart part) {
+		super.setActiveEditor(part);
+
+		ITextEditor editor = null;
+		if (part instanceof ITextEditor) {
+			editor = (ITextEditor) part;
+		}
+
+		fContentAssistProposal.setAction(getAction(editor, "ContentAssistProposal")); //$NON-NLS-1$
+		fContentAssistTip.setAction(getAction(editor, "ContentAssistTip")); //$NON-NLS-1$
+
+		fTogglePresentation.setEditor(editor);
+		fTogglePresentation.update();
+		
+		fOpenDeclarationAction.setEditor(editor);
+		fOpenDeclarationAction.update();
+	}
+
+	/*
+	 * @see IEditorActionBarContributor#dispose()
+	 */
+	public void dispose() {
+		doSetActiveEditor(null);
+		super.dispose();
+	}
+
+	/**
+	 * @see org.eclipse.ui.part.EditorActionBarContributor#init(IActionBars)
+	 */
+	public void init(IActionBars bars) {
+		super.init(bars);
+		IMenuManager menuManager = bars.getMenuManager();
+		IMenuManager editMenu = menuManager.findMenuUsingPath(IWorkbenchActionConstants.M_EDIT);
+		if (editMenu != null) {
+			editMenu.add(new Separator());
+			editMenu.add(fContentAssistProposal);
+			editMenu.add(fContentAssistTip);
+			editMenu.add(fOpenDeclarationAction);
+		}
+
+		bars.setGlobalActionHandler(ITextEditorActionDefinitionIds.TOGGLE_SHOW_SELECTED_ELEMENT_ONLY, fTogglePresentation);
+		// there is a global action in the toolbar, that is retargeted,
+		// there is no need to add another one.
+//		IToolBarManager toolBarManager = bars.getToolBarManager();
+//		if (toolBarManager != null) {
+//			toolBarManager.add(new Separator());
+//			toolBarManager.add(fTogglePresentation);
+//		}
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditorPreferenceConstants.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditorPreferenceConstants.java
new file mode 100644
index 0000000..169d791
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditorPreferenceConstants.java
@@ -0,0 +1,66 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2005 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+
+/**
+ * MakefileEditorPreferenceConstants
+ */
+public class MakefileEditorPreferenceConstants {
+
+	/**
+	 * 
+	 */
+	private MakefileEditorPreferenceConstants() {
+	}
+
+	/**
+	 * The symbolic names for colors for displaying code assist proposals
+	 * @see org.eclipse.jface.resource.ColorRegistry
+	 */
+	public static final String CURRENT_LINE_COLOR = "org.eclipse.cdt.make.ui.currentLineHightlightColor"; //$NON-NLS-1$
+	public static final String LINE_NUMBER_RULER_COLOR = "org.eclipse.cdt.make.ui.lineNumberForegroundColor"; //$NON-NLS-1$
+	public static final String PRINT_MARGIN_COLOR = "org.eclipse.cdt.make.ui.printMarginColor"; //$NON-NLS-1$	
+	
+	/**
+	 * Preference key suffix for bold text style preference keys.
+	 * 
+	 */
+	public static final String EDITOR_BOLD_SUFFIX= "_bold"; //$NON-NLS-1$
+
+	/**
+	 * Preference key suffix for italic text style preference keys.
+	 */
+	public static final String EDITOR_ITALIC_SUFFIX= "_italic"; //$NON-NLS-1$
+
+
+	public static final String EDITOR_FOLDING_MACRODEF = "editor_folding_default_macrodef"; //$NON-NLS-1$
+
+
+	public static final String EDITOR_FOLDING_RULE = "editor_folding_default_rule"; //$NON-NLS-1$
+
+
+	public static final String EDITOR_FOLDING_CONDITIONAL = "editor_folding_default_conditional"; //$NON-NLS-1$
+
+	public static final String EDITOR_FOLDING_ENABLED = "editor_folding_enabled"; //$NON-NLS-1$
+	
+	public static void initializeDefaultValues(IPreferenceStore store) {
+
+		store.setDefault(MakefileEditorPreferenceConstants.EDITOR_FOLDING_ENABLED, false);
+		store.setDefault(MakefileEditorPreferenceConstants.EDITOR_FOLDING_MACRODEF, false);
+		store.setDefault(MakefileEditorPreferenceConstants.EDITOR_FOLDING_RULE, true);
+		store.setDefault(MakefileEditorPreferenceConstants.EDITOR_FOLDING_CONDITIONAL, true);
+
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditorTogglePresentationAction.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditorTogglePresentationAction.java
new file mode 100644
index 0000000..cd9f159
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditorTogglePresentationAction.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - modified for Automake editor usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.MakeUIImages;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.MakeUIMessages;
+import org.eclipse.ui.texteditor.ITextEditor;
+import org.eclipse.ui.texteditor.TextEditorAction;
+
+
+/**
+ */
+public class MakefileEditorTogglePresentationAction extends TextEditorAction {
+
+	/**
+	 * Constructor for MakefileEditorTogglePresentationAction.
+	 */
+	public MakefileEditorTogglePresentationAction() {
+		super(MakeUIMessages.getResourceBundle(), "TogglePresentation.", null); //$NON-NLS-1$
+		MakeUIImages.setImageDescriptors(this, MakeUIImages.T_TOOL, MakeUIImages.IMG_TOOLS_MAKEFILE_SEGMENT_EDIT);
+		update();
+	}
+
+	/**
+	 * @see org.eclipse.jface.action.IAction#run()
+	 */
+	public void run() {
+		ITextEditor editor= getTextEditor();
+		editor.resetHighlightRange();
+		boolean show = editor.showsHighlightRangeOnly();
+		setChecked(!show);
+		editor.showHighlightRangeOnly(!show);
+	}
+
+	/**
+	 * @see org.eclipse.ui.texteditor.IUpdate#update()
+	 */
+	public void update() {
+		setChecked(getTextEditor() != null && getTextEditor().showsHighlightRangeOnly());
+		setEnabled(true);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileMessages.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileMessages.java
new file mode 100644
index 0000000..c8decc4
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileMessages.java
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class MakefileMessages {
+
+    private static final String BUNDLE_NAME = MakefileMessages.class.getName();
+
+    private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
+            .getBundle(BUNDLE_NAME);
+
+    private MakefileMessages() {
+    }
+
+	/**
+	 * Returns the string from the plugin's resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @return the resource bundle message
+	 */
+    public static String getString(String key) {
+        try {
+            return RESOURCE_BUNDLE.getString(key);
+        } catch (MissingResourceException e) {
+            return '!' + key + '!';
+        }
+    }
+    
+	/**
+	 * Returns the string from the plugin's resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @param args an array of substitution strings
+	 * @return the resource bundle message
+	 */
+	public static String getFormattedString(String key, String[] args) {
+		return MessageFormat.format(getString(key), (Object[])args);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefilePartitionScanner.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefilePartitionScanner.java
new file mode 100644
index 0000000..fc99758
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefilePartitionScanner.java
@@ -0,0 +1,96 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jface.text.rules.EndOfLineRule;
+import org.eclipse.jface.text.rules.IPredicateRule;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.MultiLineRule;
+import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
+import org.eclipse.jface.text.rules.Token;
+
+public class MakefilePartitionScanner extends RuleBasedPartitionScanner {
+	// Partition types
+	public final static String MAKEFILE_COMMENT_PARTITION = "makefile_comment"; //$NON-NLS-1$
+	public final static String MAKEFILE_MACRO_ASSIGNEMENT_PARTITION = "makefile_macro_assignement"; //$NON-NLS-1$
+	public final static String MAKEFILE_INCLUDE_BLOCK_PARTITION = "makefile_include_block"; //$NON-NLS-1$
+	public final static String MAKEFILE_IF_BLOCK_PARTITION = "makefile_if_block"; //$NON-NLS-1$
+	public final static String MAKEFILE_DEF_BLOCK_PARTITION = "makefile_def_block"; //$NON-NLS-1$
+	public final static String MAKEFILE_OTHER_PARTITION = "makefile_other"; //$NON-NLS-1$
+
+	public final static String[] MAKE_PARTITIONS =
+		new String[] {
+			MAKEFILE_COMMENT_PARTITION,
+			MAKEFILE_MACRO_ASSIGNEMENT_PARTITION,
+			MAKEFILE_INCLUDE_BLOCK_PARTITION,
+			MAKEFILE_IF_BLOCK_PARTITION,
+			MAKEFILE_DEF_BLOCK_PARTITION,
+			MAKEFILE_OTHER_PARTITION,
+	};
+
+	/** The predefined delimiters of this tracker */
+	private char[][] fModDelimiters = { { '\r', '\n' }, { '\r' }, { '\n' } };
+
+	/**
+	 * Constructor for MakefilePartitionScanner
+	 */
+	public MakefilePartitionScanner() {
+		super();
+
+		IToken tComment = new Token(MAKEFILE_COMMENT_PARTITION);
+		IToken tMacro = new Token(MAKEFILE_MACRO_ASSIGNEMENT_PARTITION);
+		IToken tInclude = new Token(MAKEFILE_INCLUDE_BLOCK_PARTITION);
+		IToken tIf = new Token(MAKEFILE_IF_BLOCK_PARTITION);
+		IToken tDef = new Token(MAKEFILE_DEF_BLOCK_PARTITION);
+		IToken tOther = new Token(MAKEFILE_OTHER_PARTITION);
+
+		List<IRule> rules = new ArrayList<IRule>();
+
+		// Add rule for single line comments.
+
+		rules.add(new EndOfLineRule("#", tComment, '\\', true)); //$NON-NLS-1$
+
+		rules.add(new EndOfLineRule("include", tInclude)); //$NON-NLS-1$
+
+		rules.add(new EndOfLineRule("export", tDef)); //$NON-NLS-1$
+		rules.add(new EndOfLineRule("unexport", tDef)); //$NON-NLS-1$
+		rules.add(new EndOfLineRule("vpath", tDef)); //$NON-NLS-1$
+		rules.add(new EndOfLineRule("override", tDef)); //$NON-NLS-1$
+		rules.add(new MultiLineRule("define", "endef", tDef)); //$NON-NLS-1$ //$NON-NLS-2$
+		rules.add(new MultiLineRule("override define", "endef", tDef)); //$NON-NLS-1$ //$NON-NLS-2$
+
+		// Add rules for multi-line comments and javadoc.
+		rules.add(new MultiLineRule("ifdef", "endif", tIf)); //$NON-NLS-1$ //$NON-NLS-2$
+		rules.add(new MultiLineRule("ifndef", "endif", tIf)); //$NON-NLS-1$ //$NON-NLS-2$
+		rules.add(new MultiLineRule("ifeq", "endif", tIf)); //$NON-NLS-1$ //$NON-NLS-2$
+		rules.add(new MultiLineRule("ifnneq", "endif", tIf)); //$NON-NLS-1$ //$NON-NLS-2$
+
+		// Last rule must be supplied with default token!
+		rules.add(new MacroDefinitionRule(tMacro, tOther)); //$NON-NLS-1$
+
+		IPredicateRule[] result = new IPredicateRule[rules.size()];
+		rules.toArray(result);
+		setPredicateRules(result);
+
+	}
+
+	/*
+	 * @see ICharacterScanner#getLegalLineDelimiters
+	 */
+	public char[][] getLegalLineDelimiters() {
+		return fModDelimiters;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileReader.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileReader.java
new file mode 100644
index 0000000..d06c014
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileReader.java
@@ -0,0 +1,86 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.IOException;
+import java.io.LineNumberReader;
+import java.io.Reader;
+
+/**
+ */
+public class MakefileReader extends LineNumberReader {
+
+
+	public MakefileReader(Reader reader) {
+		super(reader);
+	}
+
+	public MakefileReader(Reader reader, int sz) {
+		super(reader, sz);
+	}
+
+
+	public String readLine() throws IOException {
+		boolean done = false;
+		StringBuffer buffer = new StringBuffer();
+		boolean escapedLine = false;
+		boolean escapedCommand = false;
+		while (!done) {
+			String line = super.readLine();
+			if (line == null) {
+				return null;
+			}
+
+			if (escapedLine && line.length() > 0) {
+				// Eat the spaces at the beginning.
+				int i = 0;
+				while (i < line.length() && (Util.isSpace(line.charAt(i)))) {
+					i++ ;
+				}
+				line = line.substring(i);
+			} else if (escapedCommand && line.length() > 0) {
+				// Only eat the first tab
+				if (line.charAt(0) == '\t') {
+					line.substring(1);
+				}
+			}
+
+			// According to POSIX rules:
+			// When an escaped <newline>(one preceded by a backslash) is found
+			// anywhere in the makefile except in a command line, it shall be replaced,
+			// along with any leading white space on the following line, with a single <space>
+			//
+			// When an escaped <newline> is found in a command line in a makefile,
+			// the command line shall contain the backslash, the <newline>, and  the next line,
+			// except that the first character of the next line shall not be included if it is a <tab>
+			if (Util.isEscapedLine(line)) {
+				int index = line.lastIndexOf('\\');
+				if (index > 0) {
+					if (!escapedLine && Util.isCommand(line)) {
+						escapedCommand = true;
+						buffer.append(line);
+					} else {
+						escapedLine = true;
+						buffer.append(line.substring(0, index));
+						buffer.append(' ');
+					}
+				}
+			} else {
+				done = true;
+				escapedLine = false;
+				escapedCommand = false;
+				buffer.append(line);
+			}
+		}
+		return buffer.toString();
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileReconcilingStrategy.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileReconcilingStrategy.java
new file mode 100644
index 0000000..8c654d8
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileReconcilingStrategy.java
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - convert to use with Automake editor
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.IOException;
+import java.io.StringReader;
+
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.ui.IWorkingCopyManager;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.reconciler.DirtyRegion;
+import org.eclipse.jface.text.reconciler.IReconcilingStrategy;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+import org.eclipse.ui.texteditor.ITextEditor;
+
+
+
+public class MakefileReconcilingStrategy implements IReconcilingStrategy {
+
+
+	private int fLastRegionOffset;
+	private ITextEditor fEditor;	
+	private IWorkingCopyManager fManager;
+	private IDocumentProvider fDocumentProvider;
+	private MakefileContentOutlinePage fOutliner;
+	private IReconcilingParticipant fMakefileReconcilingParticipant;
+
+	public MakefileReconcilingStrategy(MakefileEditor editor) {
+		fOutliner= editor.getOutlinePage();
+		fLastRegionOffset = Integer.MAX_VALUE;
+		fEditor= editor;
+		fManager= AutomakeEditorFactory.getDefault().getWorkingCopyManager();
+		fDocumentProvider= AutomakeEditorFactory.getDefault().getAutomakefileDocumentProvider();
+		if (fEditor instanceof IReconcilingParticipant) {
+			fMakefileReconcilingParticipant= (IReconcilingParticipant)fEditor;
+		}
+
+	}
+	
+	/**
+	 * @see IReconcilingStrategy#reconcile(document)
+	 */
+	public void setDocument(IDocument document) {
+	}	
+
+
+	/**
+	 * @see IReconcilingStrategy#reconcile(region)
+	 */
+	public void reconcile(IRegion region) {
+		// We use a trick to avoid running the reconciler multiple times
+		// on a file when it gets changed. This is because this gets called
+		// multiple times with different regions of the file, we do a 
+		// complete parse on the first region.
+		if(region.getOffset() <= fLastRegionOffset) {
+			reconcile();
+		}
+		fLastRegionOffset = region.getOffset();
+	}
+
+	/**
+	 * @see IReconcilingStrategy#reconcile(dirtyRegion, region)
+	 */
+	public void reconcile(DirtyRegion dirtyRegion, IRegion region) {
+		// FIXME: This seems to generate to much flashing in
+		// the contentouline viewer.
+		//reconcile();
+	}
+	
+	private void reconcile() {
+		try {
+			IMakefile makefile = fManager.getWorkingCopy(fEditor.getEditorInput());
+			if (makefile != null) {
+				String content = fDocumentProvider.getDocument(fEditor.getEditorInput()).get();
+				StringReader reader = new StringReader(content);
+				try {
+					makefile.parse(makefile.getFileURI(), reader);
+				} catch (IOException e) {
+				}
+				
+				fOutliner.update();
+			}
+		} finally {
+			try {
+				if (fMakefileReconcilingParticipant != null) {
+					fMakefileReconcilingParticipant.reconciled();
+				}
+			} finally {
+				//
+			}
+		}
+ 	}	
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileSourceConfiguration.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileSourceConfiguration.java
new file mode 100644
index 0000000..76b7f03
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileSourceConfiguration.java
@@ -0,0 +1,191 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Anton Leherbauer (Wind River Systems)
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITextHover;
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.contentassist.ContentAssistant;
+import org.eclipse.jface.text.contentassist.IContentAssistant;
+import org.eclipse.jface.text.presentation.IPresentationReconciler;
+import org.eclipse.jface.text.presentation.PresentationReconciler;
+import org.eclipse.jface.text.reconciler.IReconciler;
+import org.eclipse.jface.text.reconciler.MonoReconciler;
+import org.eclipse.jface.text.rules.BufferedRuleBasedScanner;
+import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.jface.text.source.IAnnotationHover;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.SourceViewerConfiguration;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.ColorManager;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.ui.editors.text.TextSourceViewerConfiguration;
+
+
+public class MakefileSourceConfiguration extends TextSourceViewerConfiguration {
+
+	private ColorManager colorManager;
+	MakefileCodeScanner codeScanner;
+	private MakefileEditor fEditor;
+
+	/**
+	 * Single token scanner.
+	 */
+	static class SingleTokenScanner extends BufferedRuleBasedScanner {
+		public SingleTokenScanner(TextAttribute attribute) {
+			setDefaultReturnToken(new Token(attribute));
+		}
+	}
+
+	/**
+	 * Constructor for MakeConfiguration
+	 */
+	public MakefileSourceConfiguration(IPreferenceStore preferenceStore, MakefileEditor editor) {
+		super(preferenceStore);
+		fEditor = editor;
+		colorManager = ColorManager.getDefault();
+	}
+
+	/**
+	 * @see SourceViewerConfiguration#getConfiguredContentTypes(ISourceViewer)
+	 */
+	public String[] getConfiguredContentTypes(ISourceViewer v) {
+		return new String[] {
+			IDocument.DEFAULT_CONTENT_TYPE,
+			MakefilePartitionScanner.MAKEFILE_COMMENT_PARTITION,
+			MakefilePartitionScanner.MAKEFILE_IF_BLOCK_PARTITION,
+			MakefilePartitionScanner.MAKEFILE_DEF_BLOCK_PARTITION,
+			MakefilePartitionScanner.MAKEFILE_INCLUDE_BLOCK_PARTITION,
+			MakefilePartitionScanner.MAKEFILE_MACRO_ASSIGNEMENT_PARTITION,
+		};
+
+	}
+
+	/**
+	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getContentAssistant(ISourceViewer)
+	 */
+	public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
+		ContentAssistant assistant = new ContentAssistant();
+		assistant.setContentAssistProcessor(new MakefileCompletionProcessor(fEditor), IDocument.DEFAULT_CONTENT_TYPE);
+		assistant.setContentAssistProcessor(new MakefileCompletionProcessor(fEditor), MakefilePartitionScanner.MAKEFILE_COMMENT_PARTITION);
+		assistant.setContentAssistProcessor(new MakefileCompletionProcessor(fEditor), MakefilePartitionScanner.MAKEFILE_DEF_BLOCK_PARTITION);
+		assistant.setContentAssistProcessor(new MakefileCompletionProcessor(fEditor), MakefilePartitionScanner.MAKEFILE_IF_BLOCK_PARTITION);
+		assistant.setContentAssistProcessor(new MakefileCompletionProcessor(fEditor), MakefilePartitionScanner.MAKEFILE_INCLUDE_BLOCK_PARTITION);
+		assistant.setContentAssistProcessor(new MakefileCompletionProcessor(fEditor), MakefilePartitionScanner.MAKEFILE_MACRO_ASSIGNEMENT_PARTITION);
+
+		assistant.enableAutoActivation(true);
+		assistant.setAutoActivationDelay(500);
+
+		assistant.setProposalPopupOrientation(IContentAssistant.CONTEXT_INFO_BELOW);
+		assistant.setContextInformationPopupOrientation(IContentAssistant.CONTEXT_INFO_BELOW);
+		//Set to Carolina blue
+		assistant.setContextInformationPopupBackground(colorManager.getColor(new RGB(0, 191, 255)));
+
+		return assistant;
+	}
+
+	protected MakefileCodeScanner getCodeScanner() {
+		if (null == codeScanner)
+			codeScanner = new MakefileCodeScanner();
+		return codeScanner;
+
+	}
+
+	public IPresentationReconciler getPresentationReconciler(ISourceViewer v) {
+
+		PresentationReconciler reconciler = new PresentationReconciler();
+
+		DefaultDamagerRepairer dr = new DefaultDamagerRepairer(getCodeScanner());
+		reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
+		reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
+
+		dr = new DefaultDamagerRepairer(getCodeScanner());
+		dr = new DefaultDamagerRepairer(getCodeScanner());
+		reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_COMMENT_PARTITION);
+		reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_COMMENT_PARTITION);
+
+		dr = new DefaultDamagerRepairer(getCodeScanner());
+		reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_MACRO_ASSIGNEMENT_PARTITION);
+		reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_MACRO_ASSIGNEMENT_PARTITION);
+
+		dr = new DefaultDamagerRepairer(getCodeScanner());
+		reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_INCLUDE_BLOCK_PARTITION);
+		reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_INCLUDE_BLOCK_PARTITION);
+
+		dr = new DefaultDamagerRepairer(getCodeScanner());
+		reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_IF_BLOCK_PARTITION);
+		reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_IF_BLOCK_PARTITION);
+
+		dr = new DefaultDamagerRepairer(getCodeScanner());
+		reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_DEF_BLOCK_PARTITION);
+		reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_DEF_BLOCK_PARTITION);
+
+		dr = new DefaultDamagerRepairer(getCodeScanner());
+		reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_OTHER_PARTITION);
+		reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_OTHER_PARTITION);
+		return reconciler;
+	}
+
+	/**
+	 * @see SourceViewerConfiguration#getReconciler(ISourceViewer)
+	 */
+	public IReconciler getReconciler(ISourceViewer sourceViewer) {
+		if (fEditor != null && fEditor.isEditable()) {
+			MonoReconciler reconciler= new MonoReconciler(new MakefileReconcilingStrategy(fEditor), false);
+			reconciler.setDelay(1000);
+			reconciler.setProgressMonitor(new NullProgressMonitor());
+			return reconciler;
+		}
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getDefaultPrefixes(org.eclipse.jface.text.source.ISourceViewer, java.lang.String)
+	 */
+	public String[] getDefaultPrefixes(ISourceViewer sourceViewer, String contentType) {
+		return new String[]{"#"}; //$NON-NLS-1$
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getTextHover(org.eclipse.jface.text.source.ISourceViewer, java.lang.String)
+	 */
+	public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) {
+		return new MakefileTextHover(fEditor);
+	}
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getAnnotationHover(org.eclipse.jface.text.source.ISourceViewer)
+	 */
+	public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) {
+		return new MakefileAnnotationHover(fEditor);
+	}
+
+	/**
+	 * @param event
+	 * @return
+	 */
+	public boolean affectsBehavior(PropertyChangeEvent event) {
+		MakefileCodeScanner scanner = getCodeScanner();
+		return scanner.affectsBehavior(event);
+	}
+
+	/**
+	 * @param event
+	 */
+	public void adaptToPreferenceChange(PropertyChangeEvent event) {
+		MakefileCodeScanner scanner = getCodeScanner();
+		scanner.adaptToPreferenceChange(event);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileStorageDocumentProvider.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileStorageDocumentProvider.java
new file mode 100644
index 0000000..cbcd643
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileStorageDocumentProvider.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2005 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IDocumentExtension3;
+import org.eclipse.jface.text.IDocumentPartitioner;
+import org.eclipse.jface.text.rules.FastPartitioner;
+import org.eclipse.ui.editors.text.StorageDocumentProvider;
+
+/**
+ * MakefileStorageDocumentProvider
+ */
+public class MakefileStorageDocumentProvider extends StorageDocumentProvider {
+
+	/*
+	 * @see org.eclipse.ui.editors.text.StorageDocumentProvider#setupDocument(java.lang.Object,
+	 *      org.eclipse.jface.text.IDocument)
+	 */
+	protected void setupDocument(Object element, IDocument document) {
+		if (document != null) {
+			IDocumentPartitioner partitioner= createDocumentPartitioner();
+			if (document instanceof IDocumentExtension3) {
+				IDocumentExtension3 extension3= (IDocumentExtension3) document;
+				extension3.setDocumentPartitioner(MakefileDocumentSetupParticipant.MAKEFILE_PARTITIONING, partitioner);
+			} else {
+				document.setDocumentPartitioner(partitioner);
+			}
+			partitioner.connect(document);
+		}
+	}
+	
+	private IDocumentPartitioner createDocumentPartitioner() {
+		return new FastPartitioner(
+				new MakefilePartitionScanner(), MakefilePartitionScanner.MAKE_PARTITIONS);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileTextHover.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileTextHover.java
new file mode 100644
index 0000000..c2b9a6f
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileTextHover.java
@@ -0,0 +1,105 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - convert to use with Automake editor
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IMacroDefinition;
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.ui.IWorkingCopyManager;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextHover;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.Region;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.ui.IEditorPart;
+
+
+/**
+ * MakefileTextHover
+ *  
+ */
+public class MakefileTextHover implements ITextHover {
+
+	private IEditorPart fEditor;
+
+	/**
+	 *  
+	 */
+	public MakefileTextHover(IEditorPart editor) {
+		fEditor = editor;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jface.text.ITextHover#getHoverInfo(org.eclipse.jface.text.ITextViewer,
+	 *      org.eclipse.jface.text.IRegion)
+	 */
+	public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
+		if (hoverRegion != null) {
+			try {
+				int len = hoverRegion.getLength();
+				int offset = hoverRegion.getOffset();
+				textViewer.getDocument().get(offset, len); // check off/len validity
+				if (fEditor != null && len > -1) {
+					IWorkingCopyManager fManager = AutomakeEditorFactory.getDefault().getWorkingCopyManager();
+					IMakefile makefile = fManager.getWorkingCopy(fEditor.getEditorInput());
+					if (makefile != null) {
+						WordPartDetector wordPart = new WordPartDetector(textViewer, offset);
+						String name = wordPart.toString();
+						IMacroDefinition[] statements = null;
+						if (WordPartDetector.inMacro(textViewer, offset)) {
+							statements = makefile.getMacroDefinitions(name);
+							if (statements == null || statements.length == 0) {
+								statements = makefile.getBuiltinMacroDefinitions(name);
+							}
+						}
+						
+						if (statements == null) {
+							statements = new IMacroDefinition[0];
+						}
+						// iterate over all the different categories
+						StringBuffer buffer = new StringBuffer();
+						for (int i = 0; i < statements.length; i++) {
+							if (i > 0) {
+								buffer.append("\n"); //$NON-NLS-1$
+							}
+							String infoString = statements[i].getValue().toString();
+							buffer.append(name);
+							buffer.append(" - "); //$NON-NLS-1$
+							buffer.append(infoString);			
+						}
+						return buffer.toString();
+					}
+				}
+			} catch (BadLocationException e) {
+			}
+		}
+		return ""; //$NON-NLS-1$
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jface.text.ITextHover#getHoverRegion(org.eclipse.jface.text.ITextViewer,
+	 *      int)
+	 */
+	public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
+		Point selection = textViewer.getSelectedRange();
+		if (selection.x <= offset && offset < selection.x + selection.y) {
+			return new Region(selection.x, selection.y);
+		}
+		return new Region(offset, 0);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileWordDetector.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileWordDetector.java
new file mode 100644
index 0000000..3008721
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileWordDetector.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.jface.text.rules.IWordDetector;
+
+public class MakefileWordDetector implements IWordDetector {
+
+	private static final String correctStartSpecChars = "%*().><"; //$NON-NLS-1$
+	private static final String correctSpecChars = "@$/\\"; //$NON-NLS-1$
+
+	/**
+	 * @see IWordDetector#isWordPart(character)
+	 */
+	public boolean isWordPart(char character) {
+		return Character.isLetterOrDigit(character) || (correctSpecChars.indexOf(character) >= 0);
+	}
+
+	/**
+	 * @see IWordDetector#isWordStart(char)
+	 */
+	public boolean isWordStart(char character) {
+		return Character.isLetterOrDigit(character) || (correctStartSpecChars.indexOf(character) >= 0);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MessageLine.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MessageLine.java
new file mode 100644
index 0000000..367c9ed
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MessageLine.java
@@ -0,0 +1,132 @@
+/*******************************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A message line. It distinguishs between "normal" messages and errors. 
+ * Setting an error message hides a currently displayed message until 
+ * <code>clearErrorMessage</code> is called.
+ */
+public class MessageLine extends CLabel {
+
+	private String fMessageText;
+	private String fErrorText;
+
+	private Color fDefaultColor;
+	private RGB fErrorRGB;
+	protected Color fErrorColor;
+
+	private static RGB fgErrorRGB= new RGB(200, 0, 0);
+
+	/**
+	 * Clears the currently displayed error message and redisplayes
+	 * the message which was active before the error message was set.
+	 */
+	public void clearErrorMessage() {
+		setErrorMessage(null);
+	}
+	/**
+	 * Clears the currently displayed message.
+	 */
+	public void clearMessage() {
+		setMessage(null);
+	}
+	/**
+	 * Get the currently displayed error text.
+	 * @return The error message. If no error message is displayed <code>null</code> is returned.
+	 */
+	public String getErrorMessage() {
+		return fErrorText;
+	}
+	/**
+	 * Get the currently displayed message.
+	 * @return The message. If no message is displayed <code>null<code> is returned.
+	 */
+	public String getMessage() {
+		return fMessageText;
+	}
+	/**
+	 * Creates a new message line as a child of the parent and with the given SWT stylebits.
+	 * Error message will be shown with in the given rgb color.
+	 */
+	public MessageLine(Composite parent, int style, RGB errorRGB) {
+		super(parent, style);
+		fDefaultColor= getForeground();
+		fErrorRGB= errorRGB;
+	}
+	/**
+	 * Creates a new message line as a child of the parent and with the given SWT stylebits.
+	 * Error message will be shown with in the rgb color 200,0,0.
+	 */
+	public MessageLine(Composite parent, int style) {
+		super(parent, style);
+		fDefaultColor= getForeground();
+		fErrorRGB= fgErrorRGB;
+	}
+	/**
+	 * Creates a new message line as a child of the given parent.
+	 * Error message will be shown with in the rgb color 200,0,0.
+	 */
+	public MessageLine(Composite parent) {
+		this(parent, SWT.LEFT);
+	}
+	/**
+	 * Sets the default error color used by all message lines.
+	 * Note: a call to this method only affects newly created MessageLines not existing ones. 
+	 */
+	public static void setErrorColor(RGB color) {
+		fgErrorRGB= color;
+	}
+	/**
+	     * Display the given error message. A currently displayed message
+	     * is saved and will be redisplayed when the error message is cleared.
+	     */
+	public void setErrorMessage(String message) {
+		fErrorText= message;
+
+		if (message == null) {
+			setMessage(fMessageText);
+		} else {
+			if (fErrorColor == null) {
+				fErrorColor= new Color(getDisplay(), fErrorRGB);
+				addDisposeListener(new DisposeListener() {
+					public void widgetDisposed(DisposeEvent e) {
+						fErrorColor.dispose();
+					}
+				});
+			}
+			setForeground(fErrorColor);
+			setText(message);
+		}
+	}
+	/**
+	     * Set the message text. If the message line currently displays an error,
+	     * the message is stored and will be shown after a call to clearErrorMessage
+	     */
+	public void setMessage(String message) {
+		fMessageText= message;
+		if (message == null)
+			message= ""; //$NON-NLS-1$
+		if (fErrorText == null) {
+			setForeground(fDefaultColor);
+			setText(message);
+		}
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/NotParallelRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/NotParallelRule.java
new file mode 100644
index 0000000..5650725
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/NotParallelRule.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.gnu.INotParallelRule;
+
+
+/**
+ * .NOTPARALLEL
+ *  If `.NOTPARALLEL' is mentioned as a target, then this invocation of
+ *  `make' will be run serially, even if the `-j' option is given.
+ *  Any recursively invoked `make' command will still be run in
+ *  parallel (unless its makefile contains this target).  Any
+ *  prerequisites on this target are ignored.
+ */
+public class NotParallelRule extends SpecialRule implements INotParallelRule {
+
+	public NotParallelRule(Directive parent, String[] reqs) {
+		super(parent, new Target(GNUMakefileConstants.RULE_NOT_PARALLEL), reqs, new Command[0]);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/NullMakefile.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/NullMakefile.java
new file mode 100644
index 0000000..6a5acba
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/NullMakefile.java
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.net.URI;
+
+import org.eclipse.cdt.make.core.makefile.IDirective;
+
+/**
+ * Makefile : ( statement ) *
+ * statement :   rule | macro_definition | comments | empty
+ * rule :  inference_rule | target_rule
+ * inference_rule : target ':' <nl> ( <tab> command <nl> ) +
+ * target_rule : target [ ( target ) * ] ':' [ ( prerequisite ) * ] [ ';' command ] <nl> 
+                 [ ( command ) * ]
+ * macro_definition : string '=' (string)* 
+ * comments : ('#' (string) <nl>) *
+ * empty : <nl>
+ * command : <tab> prefix_command string <nl>
+ * target : string
+ * prefix_command : '-' | '@' | '+'
+ * internal_macro :  "$<" | "$*" | "$@" | "$?" | "$%" 
+ */
+
+public class NullMakefile extends AbstractMakefile {
+
+	public final static IDirective[] EMPTY_DIRECTIVES = new IDirective[0];
+
+	public NullMakefile() {
+		super(null);
+	}
+
+	public IDirective[] getDirectives() {
+		return EMPTY_DIRECTIVES;
+	}
+
+	public IDirective[] getBuiltins() {
+		return EMPTY_DIRECTIVES;
+	}
+
+	public void addDirective(IDirective directive) {
+	}
+
+	public String toString() {
+		return new String();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.make.core.makefile.IMakefile#parse(java.io.Reader)
+	 */
+	public void parse(String name, Reader makefile) throws IOException {
+	}
+	
+	public void parse(URI fileURI, Reader reader) throws IOException {
+	}
+	
+	protected void parse(URI fileURI, MakefileReader reader) throws IOException {
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OpenDeclarationAction.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OpenDeclarationAction.java
new file mode 100644
index 0000000..aaeab02
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OpenDeclarationAction.java
@@ -0,0 +1,130 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     Red Hat Inc. - convert to use with Automake editor
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.net.URI;
+
+import org.eclipse.cdt.core.resources.FileStorage;
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.ui.IWorkingCopyManager;
+import org.eclipse.core.filesystem.URIUtil;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IStorage;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITextSelection;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.MakeUIMessages;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IStorageEditorInput;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.ide.IDE;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+import org.eclipse.ui.texteditor.ITextEditor;
+import org.eclipse.ui.texteditor.TextEditorAction;
+
+
+public class OpenDeclarationAction extends TextEditorAction {
+
+	public OpenDeclarationAction() {
+		this(null);
+	}
+
+	public OpenDeclarationAction(ITextEditor editor) {
+		super(MakeUIMessages.getResourceBundle(), "OpenDeclarationAction.", editor); //$NON-NLS-1$
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jface.action.IAction#run()
+	 */
+	public void run() {
+		ITextEditor editor = getTextEditor();
+		if (editor == null) {
+			return;
+		}
+		ISelectionProvider provider = editor.getSelectionProvider();
+		if (provider == null) {
+			return;
+		}
+		IDirective[] directives = null;
+		IWorkingCopyManager fManager = AutomakeEditorFactory.getDefault().getWorkingCopyManager();
+		IMakefile makefile = fManager.getWorkingCopy(editor.getEditorInput());
+		if (makefile != null) {
+			IDocumentProvider prov = editor.getDocumentProvider();
+			IDocument doc = prov.getDocument(editor.getEditorInput());
+			try {
+				ITextSelection textSelection = (ITextSelection) provider.getSelection();
+				int offset = textSelection.getOffset();
+				WordPartDetector wordPart = new WordPartDetector(doc, textSelection.getOffset());
+				String name = wordPart.toString();
+				if (WordPartDetector.inMacro(doc, offset)) {
+					directives = makefile.getMacroDefinitions(name);
+					if (directives.length == 0) {
+						directives = makefile.getBuiltinMacroDefinitions(name);
+					}
+				} else {
+					directives = makefile.getTargetRules(name);
+				}
+				if (directives != null && directives.length > 0) {
+					openInEditor(directives[0]);
+				}
+			} catch (Exception x) {
+				//
+			}
+		}
+	}
+
+	private static IEditorPart openInEditor(IDirective directive) throws PartInitException {
+		URI fileURI = directive.getMakefile().getFileURI();
+		IPath path = URIUtil.toPath(fileURI);
+		IFile file = AutotoolsUIPlugin.getWorkspace().getRoot().getFileForLocation(path);
+		if (file != null) {
+			IWorkbenchPage p = AutotoolsUIPlugin.getActivePage();
+			if (p != null) {
+				IEditorPart editorPart = IDE.openEditor(p, file, true);
+				if (editorPart instanceof MakefileEditor) {
+					((MakefileEditor)editorPart).setSelection(directive, true);
+				}
+				return editorPart;
+			}
+		} else {
+			// External file
+			IStorage storage = new FileStorage(path);
+			IStorageEditorInput input = new ExternalEditorInput(storage);
+			IWorkbenchPage p = AutotoolsUIPlugin.getActivePage();
+			if (p != null) {
+				String editorID = "org.eclipse.cdt.make.editor"; //$NON-NLS-1$
+				IEditorPart editorPart = IDE.openEditor(p, input, editorID, true);
+				if (editorPart instanceof MakefileEditor) {
+					((MakefileEditor)editorPart).setSelection(directive, true);
+				}
+				return editorPart;
+			}
+			
+		}
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jdt.ui.actions.SelectionDispatchAction#selectionChanged(org.eclipse.jface.text.ITextSelection)
+	 */
+	//public void selectionChanged(ITextSelection selection) {
+		//setEnabled(fEditor != null);
+	//}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OpenIncludeAction.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OpenIncludeAction.java
new file mode 100644
index 0000000..eabaa06
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OpenIncludeAction.java
@@ -0,0 +1,303 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *     Sergey Prigogin, Google - https://bugs.eclipse.org/bugs/show_bug.cgi?id=13221
+ *     Ed Swartz (Nokia)
+ *     Anton Leherbauer (Wind River Systems)
+ *     Red Hat Inc. - convert to use with Automake editor
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.model.CModelException;
+import org.eclipse.cdt.core.model.ICElement;
+import org.eclipse.cdt.core.model.IInclude;
+import org.eclipse.cdt.core.parser.ExtendedScannerInfo;
+import org.eclipse.cdt.core.parser.IExtendedScannerInfo;
+import org.eclipse.cdt.core.parser.IScannerInfo;
+import org.eclipse.cdt.core.parser.IScannerInfoProvider;
+import org.eclipse.cdt.ui.CUIPlugin;
+import org.eclipse.cdt.utils.PathUtil;
+import org.eclipse.core.filesystem.URIUtil;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceProxy;
+import org.eclipse.core.resources.IResourceProxyVisitor;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.window.Window;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.MakeUIImages;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.MessageBox;
+
+
+
+public class OpenIncludeAction extends Action {
+
+
+	private static final String PREFIX= "OpenIncludeAction."; //$NON-NLS-1$
+	
+	private static final String DIALOG_TITLE= PREFIX + "dialog.title"; //$NON-NLS-1$
+	private static final String DIALOG_MESSAGE= PREFIX + "dialog.message"; //$NON-NLS-1$
+	
+	private ISelectionProvider fSelectionProvider;
+
+
+	public OpenIncludeAction(ISelectionProvider provider) {
+		super(CUIPlugin.getResourceString(PREFIX + "label")); //$NON-NLS-1$
+		setDescription(CUIPlugin.getResourceString(PREFIX + "description")); //$NON-NLS-1$
+		setToolTipText(CUIPlugin.getResourceString(PREFIX + "tooltip")); //$NON-NLS-1$
+		
+		MakeUIImages.setImageDescriptors(this, MakeUIImages.T_LCL, MakeUIImages.IMG_MENU_OPEN_INCLUDE);
+		
+		fSelectionProvider= provider;
+	}
+			
+	public void run() {
+		IInclude include= getIncludeStatement(fSelectionProvider.getSelection());
+		if (include == null) {
+			return;
+		}
+		
+		try {
+			IResource res = include.getUnderlyingResource();
+			ArrayList<Object> filesFound = new ArrayList<Object>(4);
+			String fullFileName= include.getFullFileName();
+			if (fullFileName != null) {
+				IPath fullPath= new Path(fullFileName);
+				if (fullPath.isAbsolute() && fullPath.toFile().exists()) {
+					filesFound.add(fullPath);
+				}
+			}
+			if (filesFound.isEmpty() && res != null) {
+				IProject proj = res.getProject();
+				String includeName = include.getElementName();
+				// Search in the scannerInfo information
+				IScannerInfoProvider provider =  CCorePlugin.getDefault().getScannerInfoProvider(proj);
+				if (provider != null) {
+					IScannerInfo info = provider.getScannerInformation(res);
+					// XXXX this should fall back to project by itself
+					if (info == null) {
+						info = provider.getScannerInformation(proj);
+					}
+					if (info != null) {
+						IExtendedScannerInfo scanInfo = new ExtendedScannerInfo(info);
+						
+						boolean isSystemInclude = include.isStandard();
+						
+						if (!isSystemInclude) {
+							// search in current directory
+							IPath location= include.getTranslationUnit().getLocation();
+							if (location != null) {
+								String currentDir= location.removeLastSegments(1).toOSString();
+								findFile(new String[] { currentDir }, includeName, filesFound);
+							}
+							if (filesFound.isEmpty()) {
+								// search in "..." include directories
+								String[] localIncludePaths = scanInfo.getLocalIncludePath();
+								findFile(localIncludePaths, includeName, filesFound);
+							}
+						}
+	
+						if (filesFound.isEmpty()) {
+							// search in <...> include directories
+							String[] includePaths = scanInfo.getIncludePaths();
+							findFile(includePaths, includeName, filesFound);
+						}
+					}
+					
+					if (filesFound.isEmpty()) {
+						// Fall back and search the project
+						findFile(proj, new Path(includeName), filesFound);
+					}
+				}
+			}
+			IPath fileToOpen;
+			int nElementsFound= filesFound.size();
+			if (nElementsFound == 0) {
+				noElementsFound();
+				fileToOpen= null;
+			} else if (nElementsFound == 1) {
+				fileToOpen= (IPath) filesFound.get(0);
+			} else {
+				fileToOpen= chooseFile(filesFound);
+			}
+			
+			if (fileToOpen != null) {
+				EditorUtility.openInEditor(fileToOpen, include);
+			} 
+		} catch (CModelException e) {
+			CUIPlugin.log(e.getStatus());
+		} catch (CoreException e) {
+			CUIPlugin.log(e.getStatus());
+		}
+	}
+
+	/**
+	 * 
+	 */
+	private void noElementsFound() {
+		MessageBox errorMsg = new MessageBox(CUIPlugin.getActiveWorkbenchShell(), SWT.ICON_ERROR | SWT.OK);
+		errorMsg.setText(CUIPlugin.getResourceString("OpenIncludeAction.error")); //$NON-NLS-1$
+		errorMsg.setMessage (CUIPlugin.getResourceString("OpenIncludeAction.error.description")); //$NON-NLS-1$
+		errorMsg.open();
+	}
+	
+	private boolean isInProject(IPath path) {
+		return getWorkspaceRoot().getFileForLocation(path) != null;		
+	}
+	
+	/**
+	 * Returns the path as is, if it points to a workspace resource. If the path
+	 * does not point to a workspace resource, but there are linked workspace
+	 * resources pointing to it, returns the paths of these resources.
+	 * Othervise, returns the path as is. 
+	 */
+	private IPath[] resolveIncludeLink(IPath path) {
+		if (!isInProject(path)) {
+			IFile[] files = getWorkspaceRoot().findFilesForLocationURI(URIUtil.toURI(path));
+			if (files.length > 0) {
+				IPath[] paths = new IPath[files.length];
+				for (int i = 0; i < files.length; i++) {
+					paths[i] = files[i].getFullPath(); 
+				}
+				return paths;
+			}
+		}
+		
+		return new IPath[] { path };
+	}
+
+	private IWorkspaceRoot getWorkspaceRoot() {
+		return ResourcesPlugin.getWorkspace().getRoot();
+	}
+	
+	private void findFile(String[] includePaths, String name, ArrayList<Object> list)
+			throws CoreException {
+		// in case it is an absolute path
+		IPath includeFile= new Path(name);		
+		if (includeFile.isAbsolute()) {
+			includeFile = PathUtil.getCanonicalPath(includeFile);
+			if (includeFile.toFile().exists()) {
+				list.add(includeFile);
+				return;
+			}
+		}
+		HashSet<IPath> foundSet = new HashSet<IPath>();
+		for (int i = 0; i < includePaths.length; i++) {
+			IPath path = PathUtil.getCanonicalPath(new Path(includePaths[i]).append(includeFile));
+			File file = path.toFile();
+			if (file.exists()) {
+				IPath[] paths = resolveIncludeLink(path);
+				for (int j = 0; j < paths.length; j++) {
+					IPath p = paths[j];
+					if (foundSet.add(p)) {
+						list.add(p);
+					}
+				}
+			} 
+		}
+	}
+
+	/**
+	 * Recuse in the project.
+	 * @param parent
+	 * @param name
+	 * @param list
+	 * @throws CoreException
+	 */
+	private void findFile(IContainer parent, final IPath name, final ArrayList<Object> list) throws CoreException {
+		parent.accept(new IResourceProxyVisitor() {
+
+			public boolean visit(IResourceProxy proxy) throws CoreException {
+				if (proxy.getType() == IResource.FILE && proxy.getName().equalsIgnoreCase(name.lastSegment())) {
+					IPath rPath = proxy.requestResource().getLocation();
+					int numSegToRemove = rPath.segmentCount() - name.segmentCount();
+					IPath sPath = rPath.removeFirstSegments(numSegToRemove);
+					sPath = sPath.setDevice(name.getDevice());
+					if (Platform.getOS().equals(Platform.OS_WIN32) ?
+							sPath.toOSString().equalsIgnoreCase(name.toOSString()) :
+							sPath.equals(name)) {
+						list.add(rPath);
+					}
+					return false;
+				}
+				return true;
+			}
+		}, 0);
+	}
+
+
+	private IPath chooseFile(ArrayList<Object> filesFound) {
+		ILabelProvider renderer= new LabelProvider() {
+			public String getText(Object element) {
+				if (element instanceof IPath) {
+					IPath file= (IPath)element;
+					return file.lastSegment() + " - "  + file.toString(); //$NON-NLS-1$
+				}
+				return super.getText(element);
+			}
+		};
+		
+		ElementListSelectionDialog dialog= new ElementListSelectionDialog(CUIPlugin.getActiveWorkbenchShell(), renderer, false, false);
+		dialog.setTitle(CUIPlugin.getResourceString(DIALOG_TITLE));
+		dialog.setMessage(CUIPlugin.getResourceString(DIALOG_MESSAGE));
+		dialog.setElements(filesFound);
+		
+		if (dialog.open() == Window.OK) {
+			return (IPath) dialog.getSelectedElement();
+		}
+		return null;
+	}
+
+
+	@SuppressWarnings("unchecked")
+	private static IInclude getIncludeStatement(ISelection sel) {
+		if (!sel.isEmpty() && sel instanceof IStructuredSelection) {
+			List list= ((IStructuredSelection)sel).toList();
+			if (list.size() == 1) {
+				Object element= list.get(0);
+				if (element instanceof IInclude) {
+					return (IInclude)element;
+				}
+			}
+		}
+		return null;
+	}
+	
+	public static boolean canActionBeAdded(ISelection selection) {
+		ICElement include = getIncludeStatement(selection);
+		if (include != null) {
+			IResource res = include.getUnderlyingResource();
+			if (res != null) {
+				return true; 
+			}
+		}
+		return false;
+	}	
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OverrideDefine.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OverrideDefine.java
new file mode 100644
index 0000000..ff0ed3c
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OverrideDefine.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+public class OverrideDefine extends DefineVariable {
+
+	public OverrideDefine(Directive parent, String name, StringBuffer value) {
+		super(parent, name, value);
+	}
+
+	public String toString() {
+		StringBuffer sb = new StringBuffer(GNUMakefileConstants.VARIABLE_OVERRIDE + " " + GNUMakefileConstants.VARIABLE_DEFINE); //$NON-NLS-1$
+		sb.append(getName()).append('\n');
+		sb.append(getValue());
+		sb.append(GNUMakefileConstants.TERMINAL_ENDEF);
+		return sb.toString();
+	}
+
+	public boolean isOverride() {
+		return true;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OverrideVariable.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OverrideVariable.java
new file mode 100644
index 0000000..5fcfe6f
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OverrideVariable.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - Modified for Automake usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+public class OverrideVariable extends GNUVariableDef {
+
+	public OverrideVariable(Directive parent, String name, StringBuffer value, int type) {
+		super(parent, name, value, type);
+	}
+
+	public boolean isOverride() {
+		return true;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Parent.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Parent.java
new file mode 100644
index 0000000..e9f4d38
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Parent.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import org.eclipse.cdt.make.core.makefile.IParent;
+import org.eclipse.cdt.make.core.makefile.IDirective;
+
+/**
+ * IParent
+ */
+
+public abstract class Parent extends Directive implements IParent {
+
+	ArrayList<IDirective> children = new ArrayList<IDirective>();
+
+	public Parent(Directive parent) {
+		super(parent);
+	}
+
+	public IDirective[] getDirectives(boolean expand) {
+		return getDirectives();
+	}
+
+	public IDirective[] getDirectives() {
+		children.trimToSize();
+		return (IDirective[]) children.toArray(new IDirective[0]);
+	}
+
+	public void addDirective(Directive directive) {
+		children.add(directive);
+		// reparent
+		directive.setParent(this);
+	}
+
+	public void addDirectives(Directive[] directives) {
+		children.addAll(Arrays.asList(directives));
+		// reparent
+		for (int i = 0; i < directives.length; i++) {
+			directives[i].setParent(this);
+		}
+	}
+
+	public void clearDirectives() {
+		children.clear();
+	}
+
+	public Directive[] getStatements() {
+		children.trimToSize();
+		return (Directive[]) children.toArray(new Directive[0]);		
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	public String toString() {
+		StringBuffer sb = new StringBuffer();
+		IDirective[] directives = getDirectives();
+		for (int i = 0; i < directives.length; i++) {
+			sb.append(directives[i]);
+		}
+		return sb.toString();
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PhonyRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PhonyRule.java
new file mode 100644
index 0000000..999c9e0
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PhonyRule.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.gnu.IPhonyRule;
+
+
+/**
+ * .PHONY
+ *     The prerequisites of the special target `.PHONY' are considered to be phony targets.
+ *     When it is time to consider such a target, `make' will run its commands unconditionally, regardless of
+ *     whether a file with that name exists or what its last-modification time is.
+ */
+public class PhonyRule extends SpecialRule implements IPhonyRule {
+
+	public PhonyRule(Directive parent, String[] reqs) {
+		super(parent, new Target(GNUMakefileConstants.RULE_PHONY), reqs, new Command[0]);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PosixMakefileUtil.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PosixMakefileUtil.java
new file mode 100644
index 0000000..9932c01
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PosixMakefileUtil.java
@@ -0,0 +1,159 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ */
+public class PosixMakefileUtil {
+
+	public static String[] findPrerequisites(String line) {
+		return findTargets(line);
+	}
+
+	public static String[] findTargets(String line) {
+		List<String> aList = new ArrayList<String>();
+		int space;
+		// Trim away trailing and prepending spaces.
+		line = line.trim();
+		while ((space = Util.indexOf(line, " \t")) != -1) { //$NON-NLS-1$
+			aList.add(line.substring(0, space).trim());
+			line = line.substring(space + 1).trim();
+		}
+		// The last target.
+		if (line.length() > 0) {
+			aList.add(line);
+		}
+		return (String[]) aList.toArray(new String[0]);
+	}
+
+	public static boolean isMacroDefinition(String line) {
+		return Util.indexOf(line, '=') != -1;
+	}
+
+	public static boolean isTargetRule(String line) {
+		return Util.indexOf(line, ':') != -1;
+	}
+
+	public static boolean isCommand(String line) {
+		return line.length() > 1 && line.charAt(0) == '\t';
+	}
+
+	public static boolean isEmptyLine(String line) {
+		return line.trim().length() == 0;
+	}
+
+	public static boolean isInferenceRule(String line) {
+		line = line.trim();
+		if (line.startsWith(".")) { //$NON-NLS-1$
+			int index = Util.indexOf(line, ':');
+			if (index > 1) {
+				line = line.substring(index + 1).trim();
+				if (line.length() == 0 || line.equals(";")) { //$NON-NLS-1$
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	public static boolean isDefaultRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(MakeFileConstants.RULE_DEFAULT);
+		}
+		return false;
+	}
+
+	public static boolean isIgnoreRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(MakeFileConstants.RULE_IGNORE);
+		}
+		return false;
+	}
+
+	public static boolean isPosixRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(MakeFileConstants.RULE_POSIX);
+		}
+		return false;
+	}
+
+	public static boolean isPreciousRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(MakeFileConstants.RULE_PRECIOUS);
+		}
+		return false;
+	}
+
+	public static boolean isSccsGetRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(MakeFileConstants.RULE_SCCS_GET);
+		}
+		return false;
+	}
+
+	public static boolean isSilentRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(MakeFileConstants.RULE_SILENT);
+		}
+		return false;
+	}
+
+	public static boolean isSuffixesRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(MakeFileConstants.RULE_SUFFIXES);
+		}
+		return false;
+	}
+
+	public static boolean isLibraryTarget(String line) {
+		char prev = 0;
+		int paren = 0;
+
+		for (int i = 0; i < line.length(); i++) {
+			char ch = line.charAt(i);
+			if (ch == '(' && prev != '$' && prev != '\\') {
+				paren++;
+			} else if (ch == ')' && prev != '\\') {
+				if (paren > 0) {
+					return true;
+				}
+			}
+			prev = ch;
+		}
+		return false;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PosixRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PosixRule.java
new file mode 100644
index 0000000..0114479
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PosixRule.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IPosixRule;
+
+/**
+ * .POSIX
+ * The appliation shall ensure that this special target is specified without
+ * prerequisites or commands.
+ */
+public class PosixRule extends SpecialRule implements IPosixRule {
+
+	public PosixRule(Directive parent) {
+		super(parent, new Target(MakeFileConstants.RULE_POSIX), new String[0], new Command[0]);
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PreciousRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PreciousRule.java
new file mode 100644
index 0000000..ef72f6d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PreciousRule.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IPreciousRule;
+
+/**
+ * .PRECIOUS
+ * Prerequisites of this special target shall not be removed if make recieves an
+ * asynchronous events.
+ */
+public class PreciousRule extends SpecialRule implements IPreciousRule {
+
+	public PreciousRule(Directive parent, String[] reqs) {
+		super(parent, new Target(MakeFileConstants.RULE_PRECIOUS), reqs, new Command[0]);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ProjectionMakefileUpdater.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ProjectionMakefileUpdater.java
new file mode 100644
index 0000000..61418d3
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ProjectionMakefileUpdater.java
@@ -0,0 +1,397 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ * Red Hat Inc. - convert to use with Automake editor
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.IMacroDefinition;
+import org.eclipse.cdt.make.core.makefile.IParent;
+import org.eclipse.cdt.make.core.makefile.IRule;
+import org.eclipse.cdt.make.core.makefile.gnu.IConditional;
+import org.eclipse.cdt.make.ui.IWorkingCopyManager;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.Position;
+import org.eclipse.jface.text.source.Annotation;
+import org.eclipse.jface.text.source.IAnnotationModel;
+import org.eclipse.jface.text.source.projection.IProjectionListener;
+import org.eclipse.jface.text.source.projection.ProjectionAnnotation;
+import org.eclipse.jface.text.source.projection.ProjectionAnnotationModel;
+import org.eclipse.jface.text.source.projection.ProjectionViewer;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+
+
+/**
+ * ProjectionMakefileUpdater
+ */
+public class ProjectionMakefileUpdater implements IProjectionListener {
+
+	private static class MakefileProjectionAnnotation extends ProjectionAnnotation {
+		
+		private IDirective fDirective;
+		private boolean fIsComment;
+		
+		public MakefileProjectionAnnotation(IDirective element, boolean isCollapsed, boolean isComment) {
+			super(isCollapsed);
+			fDirective = element;
+			fIsComment = isComment;
+		}
+		
+		public IDirective getElement() {
+			return fDirective;
+		}
+		
+		public void setElement(IDirective element) {
+			fDirective = element;
+		}
+		
+		public boolean isComment() {
+			return fIsComment;
+		}
+	}
+	
+
+	public void install(MakefileEditor editor, ProjectionViewer viewer) {
+		fEditor= editor;
+		fViewer= viewer;
+		fViewer.addProjectionListener(this);
+	}
+	
+	public void uninstall() {
+		if (isInstalled()) {
+			projectionDisabled();
+			fViewer.removeProjectionListener(this);
+			fViewer= null;
+			fEditor= null;
+		}
+	}
+	
+	protected boolean isInstalled() {
+		return fEditor != null;
+	}
+
+	private class ReconcilerParticipant implements IReconcilingParticipant {
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.IReconcilingParticipant#reconciled()
+		 */
+		public void reconciled() {
+			processReconcile();
+		}
+	}
+
+	private IDocument fCachedDocument;
+	private MakefileEditor fEditor;
+	private IDirective fInput;
+	private ProjectionViewer fViewer;
+	private IReconcilingParticipant fParticipant;
+
+	private boolean fAllowCollapsing = false;
+	@SuppressWarnings("unused")
+	private boolean fCollapseMacroDef = false;
+	@SuppressWarnings("unused")
+	private boolean fCollapseRule = false;
+	@SuppressWarnings("unused")
+	private boolean fCollapseConditional = false;
+
+	/*
+	 * @see org.eclipse.jface.text.source.projection.IProjectionListener#projectionEnabled()
+	 */
+	public void projectionEnabled() {
+		// http://home.ott.oti.com/teams/wswb/anon/out/vms/index.html
+		// projectionEnabled messages are not always paired with projectionDisabled
+		// i.e. multiple enabled messages may be sent out.
+		// we have to make sure that we disable first when getting an enable
+		// message.
+		projectionDisabled();
+		
+		initialize();			
+		fParticipant= new ReconcilerParticipant();
+		fEditor.addReconcilingParticipant(fParticipant);
+	}
+	
+	/*
+	 * @see org.eclipse.jface.text.source.projection.IProjectionListener#projectionDisabled()
+	 */
+	public void projectionDisabled() {
+		fCachedDocument= null;
+		if (fParticipant != null) {
+			fEditor.addReconcilingParticipant(fParticipant);
+			fParticipant= null;
+		}
+	}
+		
+	@SuppressWarnings("unchecked")
+	public void initialize() {
+		
+		if (!isInstalled())
+			return;
+		
+		initializePreferences();
+		
+		try {
+			
+			IDocumentProvider provider= fEditor.getDocumentProvider();
+			fCachedDocument= provider.getDocument(fEditor.getEditorInput());
+			fAllowCollapsing= true;
+			
+			IWorkingCopyManager manager= AutomakeEditorFactory.getDefault().getWorkingCopyManager();
+			fInput= manager.getWorkingCopy(fEditor.getEditorInput());
+			
+			if (fInput != null) {
+				ProjectionAnnotationModel model= (ProjectionAnnotationModel) fEditor.getAdapter(ProjectionAnnotationModel.class);
+				if (model != null) {
+					Map additions= computeAdditions((IParent) fInput);
+					model.removeAllAnnotations();
+					model.replaceAnnotations(null, additions);
+				}
+			}
+			
+		} finally {
+			fCachedDocument= null;
+			fAllowCollapsing= false;
+		}
+	}
+
+	private void initializePreferences() {
+		//FIXME: what to do with Makefile editor preferences
+		IPreferenceStore store = AutotoolsPlugin.getDefault().getPreferenceStore();
+		fCollapseMacroDef = store.getBoolean(MakefileEditorPreferenceConstants.EDITOR_FOLDING_MACRODEF);
+		fCollapseRule = store.getBoolean(MakefileEditorPreferenceConstants.EDITOR_FOLDING_RULE);
+		fCollapseConditional = store.getBoolean(MakefileEditorPreferenceConstants.EDITOR_FOLDING_CONDITIONAL);
+	}
+
+	private Map<MakefileProjectionAnnotation, Position> computeAdditions(IParent parent) {
+		Map<MakefileProjectionAnnotation, Position> map= new HashMap<MakefileProjectionAnnotation, Position>();
+		computeAdditions(parent.getDirectives(), map);
+		return map;
+	}
+
+	private void computeAdditions(IDirective[] elements, Map<MakefileProjectionAnnotation, Position> map) {
+		for (int i= 0; i < elements.length; i++) {
+			IDirective element= elements[i];
+			
+			computeAdditions(element, map);
+			
+			if (element instanceof IParent) {
+				IParent parent= (IParent) element;
+				computeAdditions(parent.getDirectives(), map);
+			}
+		}
+	}
+
+	private void computeAdditions(IDirective element, Map<MakefileProjectionAnnotation, Position> map) {
+		
+		boolean createProjection= false;
+		
+		if (element instanceof IConditional) {
+			createProjection= true;
+		} else if (element instanceof IMacroDefinition) {
+			createProjection= true;
+		} else if (element instanceof IRule) {
+			createProjection= true;
+		}
+	
+		if (createProjection) {
+			Position position= createProjectionPosition(element);
+			if (position != null) {
+				map.put(new MakefileProjectionAnnotation(element, fAllowCollapsing, true), position);
+			}
+		}
+	}
+
+	private Position createProjectionPosition(IDirective element) {
+		
+		if (fCachedDocument == null)
+			return null;
+		
+		try {			
+			int startLine= element.getStartLine() - 1;
+			int endLine= element.getEndLine() - 1;
+			if (startLine != endLine) {
+				int offset= fCachedDocument.getLineOffset(startLine);
+				int endOffset= fCachedDocument.getLineOffset(endLine + 1);
+				return new Position(offset, endOffset - offset);
+			}
+			
+		} catch (BadLocationException x) {
+		}
+		
+		return null;
+	}
+
+	public void processReconcile() {
+		if (!isInstalled())
+			return;
+		
+		ProjectionAnnotationModel model= (ProjectionAnnotationModel) fEditor.getAdapter(ProjectionAnnotationModel.class);
+		if (model == null)
+			return;
+		
+		try {
+			IDocumentProvider provider= fEditor.getDocumentProvider();
+			fCachedDocument= provider.getDocument(fEditor.getEditorInput());
+			fAllowCollapsing= false;
+			
+			Map<MakefileProjectionAnnotation, Position> additions= new HashMap<MakefileProjectionAnnotation, Position>();
+			List<MakefileProjectionAnnotation> deletions= new ArrayList<MakefileProjectionAnnotation>();
+			List<MakefileProjectionAnnotation> updates= new ArrayList<MakefileProjectionAnnotation>();
+			
+			Map<MakefileProjectionAnnotation, Position> updated= computeAdditions((IParent) fInput);
+			Map<IDirective, List<MakefileProjectionAnnotation>> previous= createAnnotationMap(model);
+			
+			
+			Iterator<MakefileProjectionAnnotation> e= updated.keySet().iterator();
+			while (e.hasNext()) {
+				MakefileProjectionAnnotation annotation= (MakefileProjectionAnnotation) e.next();
+				IDirective element= annotation.getElement();
+				Position position= (Position) updated.get(annotation);
+				
+				List<MakefileProjectionAnnotation> annotations= previous.get(element);
+				if (annotations == null) {
+					additions.put(annotation, position);
+				} else {
+					Iterator<MakefileProjectionAnnotation> x= annotations.iterator();
+					while (x.hasNext()) {
+						MakefileProjectionAnnotation a= (MakefileProjectionAnnotation) x.next();
+						if (annotation.isComment() == a.isComment()) {
+							Position p= model.getPosition(a);
+							if (p != null && !position.equals(p)) {
+								p.setOffset(position.getOffset());
+								p.setLength(position.getLength());
+								updates.add(a);
+							}
+							x.remove();
+							break;
+						}
+					}
+										
+					if (annotations.isEmpty())
+						previous.remove(element);
+				}
+			}
+			
+			Iterator<List<MakefileProjectionAnnotation>> e2 = previous.values().iterator();
+			while (e.hasNext()) {
+				List<MakefileProjectionAnnotation> list= e2.next();
+				int size= list.size();
+				for (int i= 0; i < size; i++)
+					deletions.add(list.get(i));
+			}
+
+			match(model, deletions, additions, updates);
+
+			Annotation[] removals= new Annotation[deletions.size()];
+			deletions.toArray(removals);
+			Annotation[] changes= new Annotation[updates.size()];
+			updates.toArray(changes);
+			model.modifyAnnotations(removals, additions, changes);
+			
+		} finally {
+			fCachedDocument= null;
+			fAllowCollapsing= true;
+		}
+	}
+
+	private void match(ProjectionAnnotationModel model, List<MakefileProjectionAnnotation> deletions, 
+			Map<MakefileProjectionAnnotation, Position> additions, List<MakefileProjectionAnnotation> changes) {
+		if (deletions.isEmpty() || (additions.isEmpty() && changes.isEmpty()))
+			return;
+		
+		List<MakefileProjectionAnnotation> newDeletions= new ArrayList<MakefileProjectionAnnotation>();
+		List<MakefileProjectionAnnotation> newChanges= new ArrayList<MakefileProjectionAnnotation>();
+		
+		Iterator<MakefileProjectionAnnotation> deletionIterator= deletions.iterator();
+		outer: while (deletionIterator.hasNext()) {
+			MakefileProjectionAnnotation deleted= (MakefileProjectionAnnotation) deletionIterator.next();
+			Position deletedPosition= model.getPosition(deleted);
+			if (deletedPosition == null)
+				continue;
+			
+			Iterator<MakefileProjectionAnnotation> changesIterator= changes.iterator();
+			while (changesIterator.hasNext()) {
+				MakefileProjectionAnnotation changed= (MakefileProjectionAnnotation) changesIterator.next();
+				if (deleted.isComment() == changed.isComment()) {
+					Position changedPosition= model.getPosition(changed);
+					if (changedPosition == null)
+						continue;
+					
+					if (deletedPosition.getOffset() == changedPosition.getOffset()) {
+						
+						deletedPosition.setLength(changedPosition.getLength());
+						deleted.setElement(changed.getElement());
+						
+						deletionIterator.remove();
+						newChanges.add(deleted);
+						
+						changesIterator.remove();
+						newDeletions.add(changed);
+						
+						continue outer;
+					}
+				}
+			}
+			
+			Iterator<MakefileProjectionAnnotation> additionsIterator= additions.keySet().iterator();
+			while (additionsIterator.hasNext()) {
+				MakefileProjectionAnnotation added= (MakefileProjectionAnnotation) additionsIterator.next();
+				if (deleted.isComment() == added.isComment()) {
+					Position addedPosition= (Position) additions.get(added);
+					
+					if (deletedPosition.getOffset() == addedPosition.getOffset()) {
+						
+						deletedPosition.setLength(addedPosition.getLength());
+						deleted.setElement(added.getElement());
+						
+						deletionIterator.remove();
+						newChanges.add(deleted);
+						
+						additionsIterator.remove();
+						
+						break;
+					}
+				}
+			}
+		}
+		
+		deletions.addAll(newDeletions);
+		changes.addAll(newChanges);
+	}
+
+	@SuppressWarnings("unchecked")
+	private Map<IDirective, List<MakefileProjectionAnnotation>> createAnnotationMap(IAnnotationModel model) {
+		Map<IDirective, List<MakefileProjectionAnnotation>> map= new HashMap<IDirective, List<MakefileProjectionAnnotation>>();
+		Iterator e= model.getAnnotationIterator();
+		while (e.hasNext()) {
+			Object annotation= e.next();
+			if (annotation instanceof MakefileProjectionAnnotation) {
+				MakefileProjectionAnnotation directive= (MakefileProjectionAnnotation) annotation;
+				List<MakefileProjectionAnnotation> list= map.get(directive.getElement());
+				if (list == null) {
+					list= new ArrayList<MakefileProjectionAnnotation>(2);
+					map.put(directive.getElement(), list);
+				}
+				list.add(directive);
+			}
+		}
+		return map;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Rule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Rule.java
new file mode 100644
index 0000000..44b281a
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Rule.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+
+import org.eclipse.cdt.make.core.makefile.ICommand;
+import org.eclipse.cdt.make.core.makefile.IRule;
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.ITarget;
+
+public abstract class Rule extends Parent implements IRule {
+
+	Target target;
+
+	public Rule(Directive parent, Target tgt) {
+		this(parent, tgt, new Command[0]);
+	}
+
+	public Rule(Directive parent, Target tgt, Command[] cmds) {
+		super(parent);
+		target = tgt;
+		addDirectives(cmds);
+	}
+
+	public ICommand[] getCommands() {
+		IDirective[] directives = getDirectives();
+		ArrayList<IDirective> cmds = new ArrayList<IDirective>(directives.length);
+		for (int i = 0; i < directives.length; i++) {
+			if (directives[i] instanceof ICommand) {
+				cmds.add(directives[i]);
+			}
+		}
+		return (ICommand[])cmds.toArray(new ICommand[0]);
+	}
+
+	public ITarget getTarget() {
+		return target;
+	}
+
+	public void setTarget(Target tgt) {
+		target = tgt;
+	}
+
+	public boolean equals(Rule r) {
+		return r.getTarget().equals(getTarget());
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SccsGetRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SccsGetRule.java
new file mode 100644
index 0000000..c98f8c2
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SccsGetRule.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.ISccsGetRule;
+
+/**
+ * .SCCS_GET
+ * The application shall ensure that this special target is specified without
+ * prerequesites.
+ * The commands specifeied with this target shall replace the default
+ * commands associated with this special target.
+ */
+public class SccsGetRule extends SpecialRule implements ISccsGetRule {
+
+	public SccsGetRule(Directive parent, Command[] cmds) {
+		super(parent, new Target(MakeFileConstants.RULE_SCCS_GET), new String[0], cmds);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SecondaryRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SecondaryRule.java
new file mode 100644
index 0000000..c99a770
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SecondaryRule.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.gnu.ISecondaryRule;
+
+
+/**
+ * .SECONDARY
+ *  The targets which `.SECONDARY' depends on are treated as
+ *  intermediate files, except that they are never automatically deleted.
+ *
+ *  `.SECONDARY' with no prerequisites causes all targets to be treated
+ *  as secondary (i.e., no target is removed because it is considered intermediate).
+ */
+public class SecondaryRule extends SpecialRule implements ISecondaryRule {
+
+	public SecondaryRule(Directive parent, String[] reqs) {
+		super(parent, new Target(GNUMakefileConstants.RULE_SECONDARY), reqs, new Command[0]);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SelectionList.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SelectionList.java
new file mode 100644
index 0000000..c282883
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SelectionList.java
@@ -0,0 +1,252 @@
+/*******************************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * A selection widget that consists of a list and a text entry field. The list
+ * of elements presented are limited to the pattern entered into the text entry
+ * field.
+ */
+public class SelectionList extends Composite {
+
+	// State
+	private Object[] fElements;
+	protected ILabelProvider fRenderer;
+	private boolean fIgnoreCase;
+	
+	// Implementation details
+	private String[] fRenderedStrings;
+	private int[] fFilteredElements;	
+	private String fRememberedMatchText;
+
+	// SWT widgets
+	private Table fList;
+	private Text fText;
+	
+	/**
+	 * Adds a selection change listener to this widget.
+	 */
+	public void addSelectionListener(SelectionListener listener) {
+		fList.addSelectionListener(listener);
+	}
+	private void createList(int style) {
+		fList= new Table(this, style);
+		fList.setLayoutData(new GridData(GridData.FILL_BOTH));
+		fList.addDisposeListener(new DisposeListener() {
+			public void widgetDisposed(DisposeEvent e) {
+				fRenderer.dispose();
+			}
+		});
+	}
+	private void createText() {
+		fText= new Text(this, SWT.BORDER);
+		GridData spec= new GridData();
+		spec.grabExcessVerticalSpace= false;
+		spec.grabExcessHorizontalSpace= true;
+		spec.horizontalAlignment= GridData.FILL;
+		spec.verticalAlignment= GridData.BEGINNING;
+		fText.setLayoutData(spec);
+		Listener l= new Listener() {
+			public void handleEvent(Event evt) {
+				filter(false);
+			}
+		};
+		fText.addListener(SWT.Modify, l);
+	}
+	/**
+	 * Filters the list of elements according to the pattern entered
+	 * into the text entry field.
+	 */
+	public void filter(boolean forceUpdate) {
+		int k= 0;
+		String text= fText.getText();
+		if (!forceUpdate && text.equals(fRememberedMatchText))
+			return;
+		fRememberedMatchText= text;
+		StringMatcher matcher= new StringMatcher(text+"*", fIgnoreCase, false); //$NON-NLS-1$
+		for (int i= 0; i < fElements.length; i++) {
+			if (matcher.match(fRenderedStrings[i])) {
+				fFilteredElements[k]= i;
+				k++;
+			}
+		}
+		fFilteredElements[k]= -1;
+		updateListWidget(fFilteredElements, k);
+	}
+	/**
+	 * Returns the currently used filter text.
+	 */
+	public String getFilter() {
+		return fText.getText();
+	}
+	/**
+	 * Returns the selection indices.
+	 */
+	public int[] getSelectionIndices() {
+		return fList.getSelectionIndices();
+	}
+	/**
+	 * Returns a list of selected elements. Note that the type of the elements
+	 * returned in the list are the same as the ones passed to the selection list
+	 * via <code>setElements</code>. The list doesn't contain the rendered strings.
+	 */
+	public List<Object> getSelection() {
+		if (fList == null || fList.isDisposed() || fList.getSelectionCount() == 0)
+			return new ArrayList<Object>(0);
+		int[] listSelection= fList.getSelectionIndices();
+		List<Object> selected= new ArrayList<Object>(listSelection.length);
+		for (int i= 0; i < listSelection.length; i++) {
+			selected.add(fElements[fFilteredElements[listSelection[i]]]);
+		}
+		return selected;
+	}
+	/**
+	 * Returns <code>true</code> when the list of elements is empty.
+	 */
+	public boolean isEmptyList() {
+		return fElements == null || fElements.length == 0;
+	}
+	/**
+	 * Creates new instance of the widget.
+	 */
+	public SelectionList(Composite parent, int style, ILabelProvider renderer, boolean ignoreCase) {
+		super(parent, SWT.NONE);
+		fRenderer= renderer;
+		fIgnoreCase= ignoreCase;
+		GridLayout layout= new GridLayout();
+		layout.marginHeight= 0; layout.marginWidth= 0;
+		//XXX: 1G9V58A: ITPUI:WIN2000 - Dialog.convert* methods should be static
+		setLayout(layout);
+		createText();
+		createList(style);
+	}
+	/**
+	 * Removes a selection change listener to this widget.
+	 */
+	public void removeSelectionListener(SelectionListener listener) {
+		fList.removeSelectionListener(listener);
+	}
+	private String[] renderStrings() {
+		String[] strings= new String[fElements.length];
+		for (int i= 0; i < strings.length; i++) {
+			strings[i]= fRenderer.getText(fElements[i]);
+		}
+		TwoArrayQuickSort.sort(strings, fElements, fIgnoreCase);
+		return strings;
+	}
+	/**
+	 * Select the pattern text.
+	 */
+	public void selectFilterText() {
+		fText.selectAll();
+	}
+	/**
+	 * Sets the list of elements presented in the widget.
+	 */
+	public void setElements(List<Object> elements, boolean refilter) {
+		// We copy the list since we sort it.
+		if (elements == null)
+			fElements= new Object[0];
+		else 
+			fElements= elements.toArray();
+		fFilteredElements= new int[fElements.length+1];
+		fRenderedStrings= renderStrings();
+		if (refilter)
+			filter(true);		
+	}
+	/* 
+	 * Non Java-doc
+	 */
+	public void setEnabled(boolean enable) {
+		super.setEnabled(enable);
+		fText.setEnabled(enable);
+		fList.setEnabled(enable);
+	}
+	/**
+	 * Sets the filter pattern. Current only prefix filter pattern are supported.
+	 */
+	public void setFilter(String pattern, boolean refilter) {
+		fText.setText(pattern);
+		if (refilter)
+			filter(true);
+	}
+	/*
+	 * Non Java-doc
+	 */
+	public boolean setFocus() {
+		return fText.setFocus();
+	}
+	/*
+	 * Non Java-doc
+	 */
+	public void setFont(Font font) {
+		super.setFont(font);
+		fText.setFont(font);
+		fList.setFont(font);
+	}
+	/**
+	 * Selects the elements in the list determined by the given
+	 * selection indices.
+	 */
+	protected void setSelection(int[] selection) {
+		fList.setSelection(selection);
+	}
+	private void updateListWidget(int[] indices, int size) {
+		if (fList == null || fList.isDisposed())
+			return;
+		fList.setRedraw(false);
+		int itemCount= fList.getItemCount();
+		if (size < itemCount) {
+			fList.remove(0, itemCount-size-1);
+		}
+
+		TableItem[] items= fList.getItems();
+		for (int i= 0; i < size; i++) {
+			TableItem ti= null;
+			if (i < itemCount) {
+				ti= items[i];
+			} else {
+				ti= new TableItem(fList, i);
+			}
+			ti.setText(fRenderedStrings[indices[i]]);
+			Image img= fRenderer.getImage(fElements[indices[i]]);
+			if (img != null)
+				ti.setImage(img);
+		}
+		if (fList.getItemCount() > 0) {
+			fList.setSelection(0);
+		}
+					
+		fList.setRedraw(true);
+		Event event= new Event();
+		fList.notifyListeners(SWT.Selection, event);
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SelectionStatusDialog.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SelectionStatusDialog.java
new file mode 100644
index 0000000..f480531
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SelectionStatusDialog.java
@@ -0,0 +1,195 @@
+/*******************************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+
+import org.eclipse.ui.dialogs.SelectionDialog;
+
+import org.eclipse.core.runtime.IStatus;
+
+/**
+ * An abstract base class for dialogs with a status bar and ok/cancel buttons.
+ * The status message must be passed over as StatusInfo object and can be
+ * an error, warning or ok. The OK button is enabled / disabled depending
+ * on the status.
+ */ 
+public abstract class SelectionStatusDialog extends SelectionDialog {
+	
+	private MessageLine fStatusLine;
+	private IStatus fLastStatus;
+	private Image fImage;
+	private boolean fInitialSelectionSet;
+	private boolean fStatusLineAboveButtons= false;
+	
+	
+	/**
+	 * Compute the result and return it.
+	 */
+	protected abstract void computeResult();
+	/* (non-Javadoc)
+	 * Method declared in Window.
+	 */
+	protected void configureShell(Shell shell) {
+		super.configureShell(shell);
+		if (fImage != null)
+			shell.setImage(fImage);
+	}
+	/* (non-Javadoc)
+	 * Method declared in Dialog.
+	 */
+	protected Control createButtonBar(Composite parent) {
+		Composite composite= new Composite(parent, SWT.NULL);
+		GridLayout layout= new GridLayout();
+		if (fStatusLineAboveButtons) {
+			layout.verticalSpacing= 0;
+		} else {
+			layout.numColumns= 2;
+		}
+		layout.marginHeight= 0; layout.marginWidth= 0;
+		composite.setLayout(layout);
+		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		
+		fStatusLine= new MessageLine(composite);
+		fStatusLine.setAlignment(SWT.LEFT);
+		fStatusLine.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		fStatusLine.setMessage(""); //$NON-NLS-1$
+
+		super.createButtonBar(composite);
+		return composite;
+	}
+	/* (non-Javadoc)
+	 * Method declared in Dialog.
+	 */
+	public void create() {
+		super.create();
+		if (fLastStatus != null) {
+			updateStatus(fLastStatus);
+		}
+	}
+	/**
+	 * Returns the first element of the initial selection or <code>null<code>
+	 * if there isn't any initial selection.
+	 * @return the first element of the initial selection.
+	 */
+	@SuppressWarnings("unchecked")
+	protected Object getPrimaryInitialSelection() {
+		List result= getInitialElementSelections();
+		if (result == null || result.size() == 0)
+			return null;
+		return result.get(0);	
+	}
+	/**
+	 * Returns the first element from the list of results. Returns <code>null</code>
+	 * if no element has been selected.
+	 *
+	 * @return the first result element if one exists. Otherwise <code>null</code> is
+	 *  returned.
+	 */
+	public Object getPrimaryResult() {
+		Object[] result= getResult();
+		if (result == null || result.length == 0)
+			return null;
+		return result[0];	
+	}
+	public SelectionStatusDialog(Shell parent) {
+		super(parent);
+		fInitialSelectionSet= false;
+	}
+	/* (non-Javadoc)
+	 * Method declared in Dialog.
+	 */
+	protected void okPressed() {
+		computeResult();
+		super.okPressed();
+	}
+	/**
+	 * Sets the image for this dialog.
+	 *
+	 * @param image the dialog's image
+	 */
+	public void setImage(Image image) {
+		fImage= image;
+	}
+	@SuppressWarnings("unchecked")
+	protected void setInitialSelection(int position, Object element) {
+		List l= getInitialElementSelections();
+		l.set(position, element);
+		fInitialSelectionSet= true;
+	}
+	/**
+	 * Sets the initial selection to the given element.
+	 */
+	public void setInitialSelection(Object element) {
+		// Allow clients to use set their own initial selection(s)
+		if (fInitialSelectionSet && element != null && element.equals("A")) //$NON-NLS-1$
+			return;
+
+		if (element != null) {
+			setInitialSelections(new Object[] { element });
+		} else {
+			setInitialSelections(new Object[0]);
+		}
+	}
+	public void setInitialSelections(Object[] selectedElements) {
+		super.setInitialSelections(selectedElements);
+		fInitialSelectionSet= true;
+	}
+	/**
+	 * Sets a result element at the given position.
+	 */
+	protected void setResult(int position, Object element) {
+		Object[] result= getResult();
+		result[position]= element;
+		setResult(Arrays.asList(result));
+	}
+	/**
+	 * Controls whether status line appears to the left of the buttons (default)
+	 * or above them.
+	 *
+	 * @param aboveButtons if <code>true</code> status line is placed above buttons; if
+	 * 	<code>false</code> to the right
+	 */
+	public void setStatusLineAboveButtons(boolean aboveButtons) {
+		fStatusLineAboveButtons= aboveButtons;
+	}
+	/**
+	 * Update the status of the ok button to reflect the given status. Subclasses
+	 * may override this method to update additional buttons.
+	 */
+	protected void updateButtonsEnableState(IStatus status) {
+		Button okButton= getOkButton();
+		if (okButton != null && !okButton.isDisposed())
+			okButton.setEnabled(!status.matches(IStatus.ERROR));
+	}
+	/**
+	 * Update the dialog's status line to reflect the given status. It is safe to call
+	 * this method before the dialog has been opened.
+	 */
+	protected void updateStatus(IStatus status) {
+		fLastStatus= status;
+		if (fStatusLine != null && !fStatusLine.isDisposed()) {
+		    updateButtonsEnableState(status);
+		    StatusTool.applyToStatusLine(fStatusLine, status);			
+		}
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SilentRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SilentRule.java
new file mode 100644
index 0000000..91c7d01
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SilentRule.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.ISilentRule;
+
+/**
+ * .SILENT
+ * Prerequisties of this special target are targets themselves; this shall cause
+ * commands associated with them not to be written to the standard output before
+ * they are executed.
+ */
+public class SilentRule extends SpecialRule implements ISilentRule {
+
+	public SilentRule(Directive parent, String[] reqs) {
+		super(parent, new Target(MakeFileConstants.RULE_SILENT), reqs, new Command[0]);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SpecialRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SpecialRule.java
new file mode 100644
index 0000000..079605c
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SpecialRule.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.ISpecialRule;
+import org.eclipse.cdt.make.core.makefile.ICommand;
+
+/**
+ * Targets that have special meaning for Make.
+ */
+public abstract class SpecialRule extends Rule implements ISpecialRule {
+
+	String[] prerequisites;
+
+	public SpecialRule(Directive parent, Target target, String[] reqs, Command[] cmds) {
+		super(parent, target, cmds);
+		prerequisites = reqs;
+	}
+
+	public String[] getPrerequisites() {
+		return prerequisites;
+	}
+
+	public String toString() {
+		StringBuffer sb = new StringBuffer();
+		sb.append(target).append(':');
+		String[] reqs = getPrerequisites();
+		for (int i = 0; i < reqs.length; i++) {
+			sb.append(' ').append(reqs[i]);
+		}
+		sb.append('\n');
+		ICommand[] cmds = getCommands();
+		for (int i = 0; i < cmds.length; i++) {
+			sb.append(cmds[i]);
+		}
+		return sb.toString();
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StaticTargetRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StaticTargetRule.java
new file mode 100644
index 0000000..21877de
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StaticTargetRule.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.ICommand;
+import org.eclipse.cdt.make.core.makefile.IInferenceRule;
+
+
+/**
+ *   Here is the syntax of a static pattern rule:
+ *
+ *    TARGETS ...: TARGET-PATTERN: DEP-PATTERNS ...
+ *            COMMANDS
+ *            ...
+ */
+public class StaticTargetRule extends InferenceRule implements IInferenceRule {
+
+	String targetPattern;
+	String[] prereqPatterns;
+
+	public StaticTargetRule(Directive parent, Target target, String target_pattern, String[] prereq_patterns, Command[] commands) {
+		super(parent, target, commands);
+		targetPattern = target_pattern;
+		prereqPatterns = prereq_patterns;
+	}
+
+	public String[] getPrerequisitePatterns() {
+		return prereqPatterns;
+	}
+
+	public void setPrerequesitePatterns(String[] prereqs) {
+		prereqPatterns = prereqs;
+	}
+
+	public String getTargetPattern() {
+		return targetPattern;
+	}
+
+	public void setTargetPattern(String target_pattern) {
+		targetPattern = target_pattern;
+	}
+
+	/**
+	 * @see java.lang.Object#toString()
+	 */
+	public String toString() {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append(getTarget()).append(':');
+		String pattern = getTargetPattern();
+		if (pattern != null && pattern.length() > 0) {
+			buffer.append(' ').append(targetPattern);
+		}
+		buffer.append(':');
+		for (int i = 0; i < prereqPatterns.length; i++) {
+			buffer.append(' ').append(prereqPatterns[i]);
+		}
+		buffer.append('\n');
+		ICommand[] cmds = getCommands();
+		for (int i = 0; i < cmds.length; i++) {
+			buffer.append(cmds[i].toString());
+		}
+		return buffer.toString();
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StatusInfo.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StatusInfo.java
new file mode 100644
index 0000000..b73de94
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StatusInfo.java
@@ -0,0 +1,148 @@
+/*******************************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.core.runtime.IStatus;
+
+import org.eclipse.cdt.ui.CUIPlugin;
+
+/**
+ * A settable IStatus
+ * Can be an error, warning, info or ok. For error, info and warning states,
+ * a message describes the problem
+ */
+public class StatusInfo implements IStatus {
+	
+	public static final IStatus OK_STATUS= new StatusInfo();
+
+	private String fStatusMessage;
+	private int fSeverity;
+
+	/**
+	 * Creates a status set to OK (no message)
+	 */
+	public StatusInfo() {
+		this(OK, null);
+	}
+
+	/**
+	 * Creates a status .
+	 * @param severity The status severity: ERROR, WARNING, INFO and OK.
+	 * @param message The message of the status. Applies only for ERROR,
+	 * WARNING and INFO.
+	 */	
+	public StatusInfo(int severity, String message) {
+		fStatusMessage= message;
+		fSeverity= severity;
+	}		
+
+	/**
+	 * @see IStatus#getChildren()
+	 */
+	public IStatus[] getChildren() {
+		return new IStatus[0];
+	}
+	/**
+	 * @see IStatus#getCode()
+	 */
+	public int getCode() {
+		return fSeverity;
+	}
+	/**
+	 * @see IStatus#getException()
+	 */
+	public Throwable getException() {
+		return null;
+	}
+	/**
+	 * @see IStatus#getMessage
+	 */
+	public String getMessage() {
+		return fStatusMessage;
+	}
+	/**
+	 * @see IStatus#getPlugin()
+	 */
+	public String getPlugin() {
+		return CUIPlugin.PLUGIN_ID;
+	}
+	/**
+	 * @see IStatus#getSeverity()
+	 */
+	public int getSeverity() {
+		return fSeverity;
+	}
+	public boolean isError() {
+		return fSeverity == IStatus.ERROR;
+	}
+	public boolean isInfo() {
+		return fSeverity == IStatus.INFO;
+	}
+	/**
+	 * @see IStatus#isMultiStatus()
+	 */
+	public boolean isMultiStatus() {
+		return false;
+	}
+	public boolean isOK() {
+		return fSeverity == IStatus.OK;
+	}
+	public boolean isWarning() {
+		return fSeverity == IStatus.WARNING;
+	}
+	/**
+	 * @see IStatus#matches(int)
+	 */
+	public boolean matches(int severityMask) {
+		return (fSeverity & severityMask) != 0;
+	}
+	public void setError(String errorMessage) {
+		fStatusMessage= errorMessage;
+		fSeverity= IStatus.ERROR;
+	}
+	public void setInfo(String infoMessage) {
+		fStatusMessage= infoMessage;
+		fSeverity= IStatus.INFO;
+	}
+	public void setOK() {
+		fStatusMessage= null;
+		fSeverity= IStatus.OK;
+	}
+	public void setWarning(String warningMessage) {
+		fStatusMessage= warningMessage;
+		fSeverity= IStatus.WARNING;
+	}
+
+	/**
+	 * Returns a string representation of the status, suitable 
+	 * for debugging purposes only.
+	 */
+	public String toString() {
+		StringBuffer buf = new StringBuffer();
+		buf.append("StatusInfo "); //$NON-NLS-1$
+		if (fSeverity == OK) {
+			buf.append("OK"); //$NON-NLS-1$
+		} else if (fSeverity == ERROR) {
+			buf.append("ERROR"); //$NON-NLS-1$
+		} else if (fSeverity == WARNING) {
+			buf.append("WARNING"); //$NON-NLS-1$
+		} else if (fSeverity == INFO) {
+			buf.append("INFO"); //$NON-NLS-1$
+		} else {
+			buf.append("severity="); //$NON-NLS-1$
+			buf.append(fSeverity);
+		}
+		buf.append(": "); //$NON-NLS-1$
+		buf.append(fStatusMessage);
+		return buf.toString();
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StatusTool.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StatusTool.java
new file mode 100644
index 0000000..0d849c9
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StatusTool.java
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.core.runtime.IStatus;
+
+import org.eclipse.jface.dialogs.DialogPage;
+
+public class StatusTool {
+
+	/**
+	 * Applies the status to the status line of a dialog page
+	 */
+	public static void applyToStatusLine(MessageLine messageLine, IStatus status) {
+		String[] messages= getErrorMessages(status);
+		messageLine.setErrorMessage(messages[0]);
+		messageLine.setMessage(messages[1]);
+	}
+	/**
+	 * Applies the status to the status line of a dialog page
+	 */
+	public static void applyToStatusLine(DialogPage page, IStatus status) {
+		String[] messages= getErrorMessages(status);
+		page.setErrorMessage(messages[0]);
+		page.setMessage(messages[1]);
+	}
+	/**
+	 * Returns error-message / warning-message for a status
+	 */
+	public static String[] getErrorMessages(IStatus status) {
+		String message= status.getMessage();
+		if (status.matches(IStatus.ERROR) && !"".equals(message)) { //$NON-NLS-1$
+			return new String[] { message, null };
+		} else if (status.matches(IStatus.WARNING | IStatus.INFO)) {
+			return new String[] { null, message };
+		} else {
+			return new String[] { null, null };
+		}
+	}
+	/**
+	 * Compare two IStatus. The more severe is returned:
+	 * An error is more severe than a warning, and a warning is more severe
+	 * than ok.
+	 */
+	public static IStatus getMoreSevere(IStatus s1, IStatus s2) {
+		if (s1.getSeverity() > s2.getSeverity()) {
+			return s1;
+		}
+		return s2;
+	}
+	/**
+	 * Finds the most severe status from a array of status
+	 * An error is more severe than a warning, and a warning is more severe
+	 * than ok.
+	 */
+	public static IStatus getMostSevere(IStatus[] status) {
+		IStatus max= null;
+		for (int i= 0; i < status.length; i++) {
+			IStatus curr= status[i];
+			if (curr.matches(IStatus.ERROR)) {
+				return curr;
+			}
+			if (max == null || curr.getSeverity() > max.getSeverity()) {
+				max= curr;
+			}
+		}
+		return max;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StringMatcher.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StringMatcher.java
new file mode 100644
index 0000000..880f3a4
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StringMatcher.java
@@ -0,0 +1,389 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *     Markus Schorn (Wind River Systems)
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.Vector;
+
+public class StringMatcher {
+	protected String fPattern;
+	protected int fLength; // pattern length
+	protected boolean fIgnoreWildCards;
+	protected boolean fIgnoreCase;
+	protected boolean fHasLeadingStar;
+	protected boolean fHasTrailingStar;
+	protected String fSegments[]; //the given pattern is split into * separated segments
+
+	/* boundary value beyond which we don't need to search in the text */
+	protected int fBound= 0;
+
+	protected static final char fSingleWildCard= '\u0000';
+
+	public static class Position {
+		int start; //inclusive
+		int end; //exclusive
+		public Position(int start, int end) {
+			this.start= start;
+			this.end= end;
+		}
+		public int getStart() {
+			return start;
+		}
+		public int getEnd() {
+			return end;
+		}
+	}
+
+	/**
+	 * Find the first occurrence of the pattern between <code>start</code)(inclusive) 
+	 * and <code>end</code>(exclusive).  
+	 * @param text the String object to search in 
+	 * @param start the starting index of the search range, inclusive
+	 * @param end the ending index of the search range, exclusive
+	 * @return an <code>StringMatcher.Position</code> object that keeps the starting 
+	 * (inclusive) and ending positions (exclusive) of the first occurrence of the 
+	 * pattern in the specified range of the text; return null if not found or subtext
+	 * is empty (start==end). A pair of zeros is returned if pattern is empty string
+	 * Note that for pattern like "*abc*" with leading and trailing stars, position of "abc"
+	 * is returned. For a pattern like"*??*" in text "abcdf", (1,3) is returned
+	 */
+
+	public StringMatcher.Position find(String text, int start, int end) {
+		if (fPattern == null || text == null)
+			throw new IllegalArgumentException();
+
+		int tlen= text.length();
+		if (start < 0)
+			start= 0;
+		if (end > tlen)
+			end= tlen;
+		if (end < 0 || start >= end)
+			return null;
+		if (fLength == 0)
+			return new Position(start, start);
+		if (fIgnoreWildCards) {
+			int x= posIn(text, start, end);
+			if (x < 0)
+				return null;
+			return new Position(x, x + fLength);
+		}
+
+		int segCount= fSegments.length;
+		if (segCount == 0) //pattern contains only '*'(s)
+			return new Position(start, end);
+
+		int curPos= start;
+		int matchStart= -1;
+		for (int i= 0; i < segCount && curPos < end; ++i) {
+			String current= fSegments[i];
+			int nextMatch= regExpPosIn(text, curPos, end, current);
+			if (nextMatch < 0)
+				return null;
+			if (i == 0)
+				matchStart= nextMatch;
+			curPos= nextMatch + current.length();
+		}
+		return new Position(matchStart, curPos);
+	}
+	/**
+	 * StringMatcher constructor takes in a String object that is a simple 
+	 * pattern which may contain  *  for 0 and many characters and
+	 *  ?  for exactly one character. Also takes as parameter a boolean object
+	 * specifying if case should be ignored
+	 * @deprecated Use StringMatcher(pattern, ignoreCase, ignoreWildCards).
+	 */
+	public StringMatcher(String aPattern, boolean ignoreCase) {
+		this(aPattern, ignoreCase, false);
+	}
+	/**
+	 * StringMatcher constructor takes in a String object that is a simple 
+	 * pattern which may contain  *  for 0 and many characters and
+	 *  ?  for exactly one character.  
+	 *
+	 * Literal '*' and '?' characters must be escaped in the pattern 
+	 * e.g., "\*" means literal "*", etc.
+	 *
+	 * Escaping any other character (including the escape character itself), 
+	 * just results in that character in the pattern.
+	 * e.g., "\a" means "a" and "\\" means "\"
+	 *
+	 * If invoking the StringMatcher with string literals in Java, don't forget
+	 * escape characters are represented by "\\".
+	 *
+	 * @param aPattern the pattern to match text against
+	 * @param ignoreCase if true, case is ignored
+	 * @param ignoreWildCards if true, wild cards and their escape sequences are ignored
+	 * 		  (everything is taken literally).
+	 */
+	public StringMatcher(String aPattern, boolean ignoreCase, boolean ignoreWildCards) {
+		fIgnoreCase= ignoreCase;
+		fIgnoreWildCards= ignoreWildCards;
+		fLength= aPattern.length();
+
+		/* convert case */
+		if (fIgnoreCase) {
+			char[] chars= aPattern.toCharArray();
+			for (int i = 0; i < chars.length; i++) {
+				chars[i]= Character.toUpperCase(chars[i]);
+			}
+			fPattern= new String(chars);
+		} else {
+			fPattern= aPattern;
+		}
+
+		if (fIgnoreWildCards) {
+			parseNoWildCards();
+		} else {
+			parseWildCards();
+		}
+	}
+	/**
+	 * Given the starting (inclusive) and the ending (exclusive) poisitions in the   
+	 * <code>text</code>, determine if the given substring matches with aPattern  
+	 * @return true if the specified portion of the text matches the pattern
+	 * @param text  a String object that contains the substring to match 
+	 * @param start marks the starting position (inclusive) of the substring
+	 * @param end marks the ending index (exclusive) of the substring 
+	 */
+	public boolean match(String text, int start, int end) {
+		if (null == fPattern || null == text)
+			throw new IllegalArgumentException();
+
+		if (start > end)
+			return false;
+
+		if (fIgnoreWildCards)
+			return fPattern.regionMatches(fIgnoreCase, 0, text, start, fLength);
+		int segCount= fSegments.length;
+		if (segCount == 0) //pattern contains only '*'(s) or empty pattern
+			return true;
+		if (start == end)
+			return fLength == 0;
+		if (fLength == 0)
+			return start == end;
+
+		int tlen= text.length();
+		if (start < 0)
+			start= 0;
+		if (end > tlen)
+			end= tlen;
+
+		int tCurPos= start;
+		int bound= end - fBound;
+		if (bound < 0)
+			return false;
+		int i= 0;
+		String current= fSegments[i];
+		int segLength= current.length();
+
+		/* process first segment */
+		if (!fHasLeadingStar) {
+			if (!regExpRegionMatches(text, start, current, 0, segLength)) {
+				return false;
+			}
+			++i;
+			tCurPos= tCurPos + segLength;
+		}
+
+		/* process middle segments */
+		for (; i < segCount && tCurPos <= bound; ++i) {
+			current= fSegments[i];
+			int currentMatch;
+			int k= current.indexOf(fSingleWildCard);
+			if (k < 0) {
+				currentMatch= textPosIn(text, tCurPos, end, current);
+				if (currentMatch < 0)
+					return false;
+			} else {
+				currentMatch= regExpPosIn(text, tCurPos, end, current);
+				if (currentMatch < 0)
+					return false;
+			}
+			tCurPos= currentMatch + current.length();
+		}
+
+		/* process final segment */
+		if (!fHasTrailingStar && tCurPos != end) {
+			int clen= current.length();
+			return regExpRegionMatches(text, end - clen, current, 0, clen);
+		}
+		return i == segCount;
+	}
+	/**
+	 * match the given <code>text</code> with the pattern 
+	 * @return true if matched eitherwise false
+	 * @param text a String object 
+	 */
+	public boolean match(String text) {
+		return match(text, 0, text.length());
+	}
+	/**
+	 * This method parses the given pattern into segments seperated by wildcard '*' characters.
+	 * Since wildcards are not being used in this case, the pattern consists of a single segment.
+	 */
+	private void parseNoWildCards() {
+		fSegments= new String[1];
+		fSegments[0]= fPattern;
+		fBound= fLength;
+	}
+	/**
+	 *  This method parses the given pattern into segments seperated by wildcard '*' characters.
+	 */
+	private void parseWildCards() {
+		if (fPattern.startsWith("*")) //$NON-NLS-1$
+			fHasLeadingStar= true;
+		if (fPattern.endsWith("*")) { //$NON-NLS-1$
+			/* make sure it's not an escaped wildcard */
+			if (fLength > 1 && fPattern.charAt(fLength - 2) != '\\') {
+				fHasTrailingStar= true;
+			}
+		}
+
+		Vector<String> temp= new Vector<String>();
+
+		int pos= 0;
+		StringBuffer buf= new StringBuffer();
+		while (pos < fLength) {
+			char c= fPattern.charAt(pos++);
+			switch (c) {
+				case '\\' :
+					if (pos >= fLength) {
+						buf.append(c);
+					} else {
+						char next= fPattern.charAt(pos++);
+						/* if it's an escape sequence */
+						if (next == '*' || next == '?' || next == '\\') {
+							buf.append(next);
+						} else {
+							/* not an escape sequence, just insert literally */
+							buf.append(c);
+							buf.append(next);
+						}
+					}
+					break;
+				case '*' :
+					if (buf.length() > 0) {
+						/* new segment */
+						temp.addElement(buf.toString());
+						fBound += buf.length();
+						buf.setLength(0);
+					}
+					break;
+				case '?' :
+					/* append special character representing single match wildcard */
+					buf.append(fSingleWildCard);
+					break;
+				default :
+					buf.append(c);
+			}
+		}
+
+		/* add last buffer to segment list */
+		if (buf.length() > 0) {
+			temp.addElement(buf.toString());
+			fBound += buf.length();
+		}
+
+		fSegments= new String[temp.size()];
+		temp.copyInto(fSegments);
+	}
+	/** 
+	 * @param text a string which contains no wildcard
+	 * @param start the starting index in the text for search, inclusive
+	 * @param end the stopping point of search, exclusive
+	 * @return the starting index in the text of the pattern , or -1 if not found 
+	 */
+	protected int posIn(String text, int start, int end) { //no wild card in pattern
+		int max= end - fLength;
+
+		if (!fIgnoreCase) {
+			int i= text.indexOf(fPattern, start);
+			if (i == -1 || i > max)
+				return -1;
+			return i;
+		}
+
+		for (int i= start; i <= max; ++i) {
+			if (text.regionMatches(true, i, fPattern, 0, fLength))
+				return i;
+		}
+
+		return -1;
+	}
+	/** 
+	 * @param text a simple regular expression that may only contain '?'(s)
+	 * @param start the starting index in the text for search, inclusive
+	 * @param end the stopping point of search, exclusive
+	 * @param p a simple regular expression that may contains '?'
+	 * @return the starting index in the text of the pattern , or -1 if not found 
+	 */
+	protected int regExpPosIn(String text, int start, int end, String p) {
+		int plen= p.length();
+
+		int max= end - plen;
+		for (int i= start; i <= max; ++i) {
+			if (regExpRegionMatches(text, i, p, 0, plen))
+				return i;
+		}
+		return -1;
+	}
+
+	protected boolean regExpRegionMatches(String text, int tStart, String p, int pStart, int plen) {
+		while (plen-- > 0) {
+			char tchar= text.charAt(tStart++);
+			char pchar= p.charAt(pStart++);
+
+			/* process wild cards */
+			if (!fIgnoreWildCards) {
+				/* skip single wild cards */
+				if (pchar == fSingleWildCard) {
+					continue;
+				}
+			}
+			if (pchar == tchar)
+				continue;
+			if (fIgnoreCase) {
+				char tc= Character.toUpperCase(tchar);
+				if (tc == pchar)
+					continue;
+			}
+			return false;
+		}
+		return true;
+	}
+	/** 
+	 * @param text the string to match
+	 * @param start the starting index in the text for search, inclusive
+	 * @param end the stopping point of search, exclusive
+	 * @param p a string that has no wildcard
+	 * @return the starting index in the text of the pattern , or -1 if not found 
+	 */
+	protected int textPosIn(String text, int start, int end, String p) {
+
+		int plen= p.length();
+		int max= end - plen;
+
+		if (!fIgnoreCase) {
+			int i= text.indexOf(p, start);
+			if (i == -1 || i > max)
+				return -1;
+			return i;
+		}
+
+		for (int i= 0; i <= max; ++i) {
+			if (text.regionMatches(true, i, p, 0, plen))
+				return i;
+		}
+
+		return -1;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SuffixesRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SuffixesRule.java
new file mode 100644
index 0000000..c942842
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SuffixesRule.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.ISuffixesRule;
+
+/**
+ * .SUFFIXES
+ * Prerequisites of .SUFFIXES shall be appended to the list of known suffixes and are
+ * used in conjunction with the inference rules.
+ *
+ */
+public class SuffixesRule extends SpecialRule implements ISuffixesRule {
+
+	public SuffixesRule(Directive parent, String[] suffixes) {
+		super(parent, new Target(MakeFileConstants.RULE_SUFFIXES), suffixes, new Command[0]);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Target.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Target.java
new file mode 100644
index 0000000..1c56cca
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Target.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.File;
+
+import org.eclipse.cdt.make.core.makefile.ITarget;
+
+public class Target implements ITarget {
+
+	String target;
+
+	public Target(String t) {
+		target = t;
+	}
+
+	public String toString() {
+		return target;
+	}
+
+	public boolean exits() {
+		return new File(target).exists();
+	}
+
+	public long lastModified() {
+		return new File(target).lastModified();
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/TargetRule.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/TargetRule.java
new file mode 100644
index 0000000..76452a6
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/TargetRule.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.ICommand;
+import org.eclipse.cdt.make.core.makefile.ITargetRule;
+
+/**
+ * Makefile : ( statement ) *
+ * statement :   rule | macro_definition | comments | empty
+ * rule :  inference_rule | target_rule
+ * inference_rule : target ':' <nl> ( <tab> command <nl> ) +
+ * target_rule : target [ ( target ) * ] ':' [ ( prerequisite ) * ] [ ';' command ] <nl> 
+                 [ ( <tab> prefix_command command ) * ]
+ * macro_definition : string '=' (string)* 
+ * comments : '#' (string) *
+ * empty : <nl>
+ * command : string <nl>
+ * target : string
+ * prefix_command : '-' | '@' | '+'
+ * internal_macro :  "$<" | "$*" | "$@" | "$?" | "$%" 
+ */
+
+public class TargetRule extends Rule implements ITargetRule {
+
+	String[] prerequisites;
+
+	public TargetRule(Directive parent, Target target) {
+		this(parent, target, new String[0], new Command[0]);
+	}
+
+	public TargetRule(Directive parent, Target target, String[] deps) {
+		this(parent, target, deps, new Command[0]);
+	}
+
+	public TargetRule(Directive parent, Target target, String[] reqs, Command[] commands) {
+		super(parent, target, commands);
+		prerequisites = reqs;
+	}
+
+	public String[] getPrerequisites() {
+		return prerequisites;
+	}
+
+	public void setDependecies(String[] reqs) {
+		prerequisites = reqs;
+	}
+
+	/**
+	 * @see java.lang.Object#toString()
+	 */
+	public String toString() {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append(getTarget().toString());
+		buffer.append(':');
+		String[] reqs = getPrerequisites();
+		for (int i = 0; i < reqs.length; i++) {
+			buffer.append(' ').append(reqs[i]);
+		}
+		buffer.append('\n');
+		ICommand[] cmds = getCommands();
+		for (int i = 0; i < cmds.length; i++) {
+			buffer.append(cmds[i].toString());
+		}
+		return buffer.toString();
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/TargetVariable.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/TargetVariable.java
new file mode 100644
index 0000000..0e393e9
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/TargetVariable.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - modified for Automake usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+/**
+ *   Here is the syntax of a static pattern rule:
+ *
+ *    TARGETS ...: VARIABLE-ASSIGNMENT
+ *    TARGETS ...: override VARIABLE-ASSIGNMENT
+ */
+public class TargetVariable extends GNUVariableDef {
+
+	boolean override;
+
+	public TargetVariable(Directive parent, String target, String name, StringBuffer value, boolean override, int type) {
+		super(parent, target, name, value, type);
+		this.override = override;
+	}
+
+	public boolean isOverride() {
+		return override;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Terminal.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Terminal.java
new file mode 100644
index 0000000..17eca37
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Terminal.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.gnu.ITerminal;
+
+public abstract class Terminal extends Directive implements ITerminal {
+
+	public Terminal(Directive parent) {
+		super(parent);
+	}
+
+	public boolean isEndif() {
+		return false;
+	}
+
+	public boolean isEndef() {
+		return false;
+	}
+
+	public String toString() {
+		return "\n"; //$NON-NLS-1$
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/TwoArrayQuickSort.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/TwoArrayQuickSort.java
new file mode 100644
index 0000000..96049ba
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/TwoArrayQuickSort.java
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright (c) 2000 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.core.runtime.Assert;
+
+
+/**
+ * Quick sort to sort two arrays in parallel.
+ */
+public class TwoArrayQuickSort {
+
+	private static void internalSort(String[] keys, Object[] values, int left, int right, boolean ignoreCase) { 
+	
+		int original_left= left;
+		int original_right= right;
+		
+		String mid= keys[(left + right) / 2]; 
+		do { 
+			while (smaller(keys[left], mid, ignoreCase)) { 
+				left++; 
+			} 
+			while (smaller(mid, keys[right], ignoreCase)) { 
+				right--; 
+			} 
+			if (left <= right) { 
+				String tmp= keys[left]; 
+				keys[left]= keys[right]; 
+				keys[right]= tmp;
+				
+				Object tmp2= values[left]; 
+				values[left]= values[right]; 
+				values[right]= tmp2;
+				
+				left++; 
+				right--; 
+			} 
+		} while (left <= right);
+		
+		if (original_left < right) {
+			internalSort(keys , values, original_left, right, ignoreCase); 
+		}	
+		if (left < original_right) {
+			 internalSort(keys, values, left, original_right, ignoreCase); 
+		} 
+	}
+	private static boolean smaller(String left, String right, boolean ignoreCase) {
+		if (ignoreCase)
+			return left.compareToIgnoreCase(right) < 0;
+		return left.compareTo(right) < 0;	
+	}
+	/**
+	 * Sorts keys and values in parallel.
+	 */
+	public static void sort(String[] keys, Object[] values, boolean ignoreCase) { 
+		if (keys != null && values != null) {
+			Assert.isTrue(keys.length == values.length);
+			if (keys.length > 1)
+				internalSort(keys, values, 0, keys.length - 1, ignoreCase);	
+		} else {
+			if (keys != null || values != null)
+				Assert.isTrue(false, "Either keys or values in null"); //$NON-NLS-1$
+		}
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/UnExport.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/UnExport.java
new file mode 100644
index 0000000..d51301e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/UnExport.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.gnu.IUnExport;
+
+public class UnExport extends Directive implements IUnExport {
+
+	String variable;
+
+	public UnExport(Directive parent, String var) {
+		super(parent);
+		variable = var;
+	}
+
+	public String toString() {
+		StringBuffer sb = new StringBuffer(GNUMakefileConstants.DIRECTIVE_UNEXPORT);
+		sb.append(' ').append(variable);
+		return sb.toString();
+	}
+
+	public String getVariable() {
+		return variable;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Util.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Util.java
new file mode 100644
index 0000000..be70536
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Util.java
@@ -0,0 +1,86 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+/**
+ * Utility methods.
+ */
+public class Util {
+
+	private Util() {
+	}
+
+	public static boolean isCommand(String line) {
+		return line.length() > 1 && line.startsWith("\t"); //$NON-NLS-1$
+	}
+
+	public static boolean isEscapedLine(String line) {
+		return (line.endsWith("\\") && !line.endsWith("\\\\")); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	public static boolean isEmptyLine(String line) {
+		return line.trim().length() == 0;
+	}
+
+	public static int indexOfComment(String line) {
+		boolean escaped = false;
+		for (int i = 0; i < line.length(); i++) {
+			if (line.charAt(i) == '#' && !escaped) {
+				return i;
+			}
+			escaped = line.charAt(i) == '\\';
+		}
+		return -1;
+	}
+
+	public static boolean isSpace(char c) {
+		return (c == ' '  || c == '\t' || c == '\r' || c == '\n');
+	}
+
+	public static int indexOf(String line, char c) {
+		return indexOf(line, new Character(c).toString());
+	}
+
+	/**
+	 * Special indexOf() method that makes sure that what we are searching
+	 * is not between parentheses and brackets like a macro $(foo) ${bar}
+	 */
+	public static int indexOf(String line, String tokens) {
+		int paren = 0;
+		int bracket = 0;
+		char prev = 0;
+		char pprev = 0;
+		for (int i = 0; i < line.length(); i++) {
+			char ch = line.charAt(i);
+			if (ch == '(' && prev == '$' && pprev != '\\') {
+				paren++;
+			} else if (ch == '{' && prev == '$'  && pprev != '\\') {
+				bracket++;
+			} else if (ch == ')' && prev != '\\') {
+				if (paren > 0) {
+					paren--;
+				}
+			} else if (ch == '}' && prev != '\\') {
+				if (bracket > 0) {
+					bracket--;
+				}
+			} else if (tokens.indexOf(ch) != -1) {
+				if (paren == 0 && bracket == 0) {
+					return i;
+				}
+			}
+			pprev = prev;
+			prev = ch;
+		}
+		return -1;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/VPath.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/VPath.java
new file mode 100644
index 0000000..7a7f8f3
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/VPath.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.gnu.IVPath;
+
+public class VPath extends Directive implements IVPath {
+
+	String pattern;
+	String[] directories;
+
+	public VPath(Directive parent, String pat, String[] dirs) {
+		super(parent);
+		pattern = pat;
+		directories = dirs;
+	}
+
+	public String toString() {
+		StringBuffer sb = new StringBuffer(GNUMakefileConstants.DIRECTIVE_VPATH);
+		if (pattern != null && pattern.length() > 0) {
+			sb.append(' ').append(pattern);
+		}
+		for (int i = 0; i < directories.length; i++) {
+			sb.append(' ').append(directories[i]);
+		}
+		return sb.toString();
+	}
+
+	public String[] getDirectories() {
+		return directories;
+	}
+
+	public String getPattern() {
+		return pattern;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/VariableDefinition.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/VariableDefinition.java
new file mode 100644
index 0000000..d23236c
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/VariableDefinition.java
@@ -0,0 +1,131 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.gnu.IVariableDefinition;
+
+/**
+ */
+public class VariableDefinition extends MacroDefinition implements IVariableDefinition  {
+
+	/**
+	 * ? is Conditional
+	 * : is Simply-expanded
+	 * + is append
+	 * 0 is recursively-expanded.
+	 */
+	final static int TYPE_RECURSIVE_EXPAND = 0;
+	final static int TYPE_SIMPLE_EXPAND = ':';
+	final static int TYPE_CONDITIONAL = '?';
+	final static int TYPE_APPEND = '+';
+	int type;
+	String varTarget;
+
+	public VariableDefinition(Directive parent, String name, StringBuffer value) {
+		this(parent, name, value, TYPE_RECURSIVE_EXPAND);
+	}
+
+	public VariableDefinition(Directive parent, String name, StringBuffer value, int type) {
+		this(parent,  "", name, value, type); //$NON-NLS-1$
+	}
+
+	public VariableDefinition(Directive parent, String target, String name, StringBuffer value, int type) {
+		super(parent, name, value);
+		varTarget = target;
+		this.type = type;
+	}
+
+	/**
+	 * @see java.lang.Object#toString()
+	 */
+	public String toString() {
+		StringBuffer sb = new StringBuffer();
+		if (isTargetSpecific()) {
+			sb.append(getTarget()).append(": "); //$NON-NLS-1$
+		}
+		if (isOverride()) {
+			sb.append(GNUMakefileConstants.VARIABLE_OVERRIDE);
+		}
+		if (isMultiLine()) {
+			sb.append(GNUMakefileConstants.VARIABLE_DEFINE);
+			sb.append(' ');
+			sb.append(getName()).append('\n');
+			sb.append(getValue()).append('\n');
+			sb.append(GNUMakefileConstants.TERMINAL_ENDEF);
+			sb.append('\n');
+		} else {
+			if (isExport()) {
+				sb.append(GNUMakefileConstants.VARIABLE_EXPORT);
+				sb.append(' ');
+			}
+			sb.append(getName());
+			if (isRecursivelyExpanded()) {
+				sb.append(" = "); //$NON-NLS-1$
+			} else if (isSimplyExpanded()) {
+				sb.append(" := "); //$NON-NLS-1$
+			} else if (isConditional()) {
+				sb.append(" ?= "); //$NON-NLS-1$
+			} else if (isAppend()) {
+				sb.append(" += "); //$NON-NLS-1$
+			}
+			sb.append(getValue()).append('\n');
+		}
+		return sb.toString();
+	}
+
+	public boolean isRecursivelyExpanded() {
+		return type == TYPE_RECURSIVE_EXPAND;
+	}
+
+	public boolean isSimplyExpanded() {
+		return type == TYPE_SIMPLE_EXPAND;
+	}
+                                                                                                                             
+	public boolean isConditional() {
+		return type == TYPE_CONDITIONAL;
+	}
+                                                                                                                             
+	public boolean isAppend() {
+		return type == TYPE_APPEND;
+	}
+
+	public boolean isTargetSpecific() {
+		String t = getTarget();
+		return t != null && t.length() > 0;
+	}
+
+	public boolean isExport() {
+		return false;
+	}
+
+	public boolean isMultiLine() {
+		return false;
+	}
+
+	/**
+	 * Variable from an `override' directive.
+	 */
+	public boolean isOverride() {
+		return false;
+	}
+
+	/**
+	 * Automatic variable -- cannot be set.
+	 */
+	public boolean isAutomatic() {
+		return false;
+	}
+
+	public String getTarget() {
+		return varTarget;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/WordPartDetector.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/WordPartDetector.java
new file mode 100644
index 0000000..4075dc1
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/WordPartDetector.java
@@ -0,0 +1,99 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextViewer;
+ 
+/**
+ * Used to scan and detect for SQL keywords  
+ */
+public class WordPartDetector {
+	String wordPart = ""; //$NON-NLS-1$
+	int offset;
+
+	/**
+	 * WordPartDetector.
+	 * @param viewer is a text viewer 
+	 * @param documentOffset into the SQL document
+	 */
+	public WordPartDetector(ITextViewer viewer, int documentOffset) {
+		this(viewer.getDocument(), documentOffset);
+	}
+
+	/**
+	 * 
+	 * @param doc
+	 * @param documentOffset
+	 */
+	public WordPartDetector(IDocument doc, int documentOffset) {
+		offset = documentOffset - 1;
+		int endOffset = documentOffset;		
+		try {
+			IRegion region = doc.getLineInformationOfOffset(documentOffset);
+			int top = region.getOffset();
+			int bottom = region.getLength() + top;
+			while (offset >= top && isMakefileLetter(doc.getChar(offset))) {
+				offset--;
+			}
+			while (endOffset < bottom && isMakefileLetter(doc.getChar(endOffset))) {
+					endOffset++;
+			} 
+			//we've been one step too far : increase the offset
+			offset++;
+			wordPart = doc.get(offset, endOffset - offset);
+		} catch (BadLocationException e) {
+			// do nothing
+		}
+	}
+
+	public static boolean inMacro(ITextViewer viewer, int offset) {
+		return inMacro(viewer.getDocument(), offset);
+	}
+	
+	public static boolean inMacro(IDocument document, int offset) {
+		boolean isMacro = false;
+		// Try to figure out if we are in a Macro.
+		try {
+			for (int index = offset - 1; index >= 0; index--) {
+				char c;
+				c = document.getChar(index);
+				if (c == '$') {
+					isMacro = true;
+					break;
+				} else if (Character.isWhitespace(c)) {
+					break;
+				}
+			}
+		} catch (BadLocationException e) {
+		}
+		return isMacro;
+	}
+
+
+	/**
+	 * @return String
+	 */
+	public String toString() {
+		return wordPart;
+	}
+	
+	public int getOffset() {
+		return offset;
+	}
+
+	boolean isMakefileLetter(char c) {
+		return Character.isLetterOrDigit(c) || c == '_' || c == '.';
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/WorkingCopyManager.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/WorkingCopyManager.java
new file mode 100644
index 0000000..7136c4d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/WorkingCopyManager.java
@@ -0,0 +1,106 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.ui.IWorkingCopyManager;
+import org.eclipse.cdt.make.ui.IWorkingCopyManagerExtension;
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.ui.IEditorInput;
+
+
+/**
+ * This working copy manager works together with a given compilation unit document provider and
+ * additionally offers to "overwrite" the working copy provided by this document provider.
+ */
+public class WorkingCopyManager implements IWorkingCopyManager, IWorkingCopyManagerExtension {
+	
+	private IMakefileDocumentProvider fDocumentProvider;
+	private Map<IEditorInput, IMakefile> fMap;
+	private boolean fIsShuttingDown;
+
+	/**
+	 * Creates a new working copy manager that co-operates with the given
+	 * compilation unit document provider.
+	 * 
+	 * @param provider the provider
+	 */
+	public WorkingCopyManager(IMakefileDocumentProvider provider) {
+		Assert.isNotNull(provider);
+		fDocumentProvider= provider;
+	}
+
+	/*
+	 * @see org.eclipse.cdt.make.ui.IWorkingCopyManager#connect(org.eclipse.ui.IEditorInput)
+	 */
+	public void connect(IEditorInput input) throws CoreException {
+		fDocumentProvider.connect(input);
+	}
+	
+	/*
+	 * @see org.eclipse.cdt.make.ui.IWorkingCopyManager#disconnect(org.eclipse.ui.IEditorInput)
+	 */
+	public void disconnect(IEditorInput input) {
+		fDocumentProvider.disconnect(input);
+	}
+	
+	/*
+	 * @see org.eclipse.cdt.make.ui.IWorkingCopyManager#shutdown()
+	 */
+	public void shutdown() {
+		if (!fIsShuttingDown) {
+			fIsShuttingDown= true;
+			try {
+				if (fMap != null) {
+					fMap.clear();
+					fMap= null;
+				}
+				fDocumentProvider.shutdown();
+			} finally {
+				fIsShuttingDown= false;
+			}
+		}
+	}
+
+	/*
+	 * @see org.eclipse.cdt.make.ui.IWorkingCopyManager#getWorkingCopy(org.eclipse.ui.IEditorInput)
+	 */
+	public IMakefile getWorkingCopy(IEditorInput input) {
+		IMakefile unit= fMap == null ? null : (IMakefile) fMap.get(input);
+		return unit != null ? unit : fDocumentProvider.getWorkingCopy(input);
+	}
+	
+	/*
+	 * @see org.eclipse.cdt.make.ui.IWorkingCopyManagerExtension#setWorkingCopy(org.eclipse.ui.IEditorInput, org.eclipse.cdt.make.core.makefile.IMakefile)
+	 */
+	public void setWorkingCopy(IEditorInput input, IMakefile workingCopy) {
+		if (fDocumentProvider.getDocument(input) != null) {
+			if (fMap == null)
+				fMap= new HashMap<IEditorInput, IMakefile>();
+			fMap.put(input, workingCopy);
+		}
+	}
+	
+	/*
+	 * @see org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.IWorkingCopyManagerExtension#removeWorkingCopy(org.eclipse.ui.IEditorInput)
+	 */
+	public void removeWorkingCopy(IEditorInput input) {
+		fMap.remove(input);
+		if (fMap.isEmpty())
+			fMap= null;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AbstractEditorPreferencePage.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AbstractEditorPreferencePage.java
new file mode 100644
index 0000000..62c659c
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AbstractEditorPreferencePage.java
@@ -0,0 +1,328 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.jface.dialogs.IMessageProvider;
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.osgi.service.prefs.BackingStoreException;
+
+
+/**
+ * AbstraceMakeEditorPreferencePage
+ */
+public abstract class AbstractEditorPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
+	OverlayPreferenceStore fOverlayStore;
+	
+	Map<Button, String> fCheckBoxes= new HashMap<Button, String>();
+	private SelectionListener fCheckBoxListener= new SelectionListener() {
+		public void widgetDefaultSelected(SelectionEvent e) {
+		}
+		public void widgetSelected(SelectionEvent e) {
+			Button button= (Button) e.widget;
+			fOverlayStore.setValue((String) fCheckBoxes.get(button), button.getSelection());
+		}
+	};
+	
+	Map<Text, String> fTextFields= new HashMap<Text, String>();
+	private ModifyListener fTextFieldListener= new ModifyListener() {
+		public void modifyText(ModifyEvent e) {
+			Text text= (Text) e.widget;
+			fOverlayStore.setValue((String) fTextFields.get(text), text.getText());
+		}
+	};
+
+	private Map<Text, Object> fNumberFields= new HashMap<Text, Object>();
+	private ModifyListener fNumberFieldListener= new ModifyListener() {
+		public void modifyText(ModifyEvent e) {
+			numberFieldChanged((Text) e.widget);
+		}
+	};
+			
+	public AbstractEditorPreferencePage() {
+		super();
+		setPreferenceStore(AutotoolsPlugin.getDefault().getPreferenceStore());
+		fOverlayStore= createOverlayStore();
+	}
+	
+	protected abstract OverlayPreferenceStore createOverlayStore();
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
+	 */
+	public void init(IWorkbench workbench) {
+	}
+	
+	protected void initializeFields() {
+		Map<Button, String> checkBoxes= getCheckBoxes();
+		Map<Text, String> textFields= getTextFields();
+		Iterator<Button> e= checkBoxes.keySet().iterator();
+		while (e.hasNext()) {
+			Button b= (Button) e.next();
+			String key= (String) checkBoxes.get(b);
+			b.setSelection(getOverlayStore().getBoolean(key));
+		}
+		
+		Iterator<Text> e2 = textFields.keySet().iterator();
+		while (e.hasNext()) {
+			Text t= (Text) e2.next();
+			String key= (String) textFields.get(t);
+			t.setText(getOverlayStore().getString(key));
+		}		
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
+	 */
+	public boolean performOk() {
+		getOverlayStore().propagate();
+		InstanceScope scope = new InstanceScope();
+		try {
+			scope.getNode(AutotoolsPlugin.PLUGIN_ID).flush();
+		} catch (BackingStoreException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return true;
+	}
+	
+	protected OverlayPreferenceStore getOverlayStore() {
+		return fOverlayStore;
+	}
+	
+	protected OverlayPreferenceStore setOverlayStore() {
+		return fOverlayStore;
+	}
+	
+	protected Map<Button, String> getCheckBoxes() {
+		return fCheckBoxes;
+	}
+	
+	protected Map<Text, String> getTextFields() {
+		return fTextFields;
+	}
+	
+	protected Map<Text, Object> getNumberFields() {
+		return fNumberFields;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
+	 */
+	protected void performDefaults() {
+		getOverlayStore().loadDefaults();
+		initializeFields();
+		handleDefaults();
+		super.performDefaults();
+	}
+	
+	protected abstract void handleDefaults();
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.dialogs.IDialogPage#dispose()
+	 */
+	public void dispose() {
+		if (getOverlayStore() != null) {
+			getOverlayStore().stop();
+			fOverlayStore= null;
+		}
+		super.dispose();
+	}
+	
+	protected Button addCheckBox(Composite parent, String labelText, String key, int indentation) {		
+		Button checkBox= new Button(parent, SWT.CHECK);
+		checkBox.setText(labelText);
+		checkBox.setFont(parent.getFont());
+		
+		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
+		gd.horizontalIndent= indentation;
+		gd.horizontalSpan= 2;
+		checkBox.setLayoutData(gd);
+		checkBox.addSelectionListener(fCheckBoxListener);
+		
+		getCheckBoxes().put(checkBox, key);
+		
+		return checkBox;
+	}
+	
+	protected Control addTextField(Composite composite, String labelText, String key, int textLimit, int indentation, String[] errorMessages) {
+		Font font= composite.getFont();
+		
+		Label label= new Label(composite, SWT.NONE);
+		label.setText(labelText);
+		label.setFont(font);
+		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
+		gd.horizontalIndent= indentation;
+		label.setLayoutData(gd);
+		
+		Text textControl= new Text(composite, SWT.BORDER | SWT.SINGLE);
+		textControl.setFont(font);		
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
+		gd.widthHint= convertWidthInCharsToPixels(textLimit + 1);
+		textControl.setLayoutData(gd);
+		textControl.setTextLimit(textLimit);
+		getTextFields().put(textControl, key);
+		if (errorMessages != null) {
+			getNumberFields().put(textControl, errorMessages);
+			textControl.addModifyListener(fNumberFieldListener);
+		} else {
+			textControl.addModifyListener(fTextFieldListener);
+		}
+			
+		return textControl;
+	}
+	
+	void numberFieldChanged(Text textControl) {
+		String number= textControl.getText();
+		IStatus status= validatePositiveNumber(number, (String[])getNumberFields().get(textControl));
+		if (!status.matches(IStatus.ERROR)) {
+			getOverlayStore().setValue((String) getTextFields().get(textControl), number);
+		}
+		updateStatus(status);
+	}
+	
+	private IStatus validatePositiveNumber(String number, String[] errorMessages) {
+		StatusInfo status= new StatusInfo();
+		if (number.length() == 0) {
+			status.setError(errorMessages[0]);
+		} else {
+			try {
+				int value= Integer.parseInt(number);
+				if (value < 0)
+					status.setError(MessageFormat.format(errorMessages[1], new Object[]{number})); //$NON-NLS-1$
+			} catch (NumberFormatException e) {
+				status.setError(MessageFormat.format(errorMessages[1], new Object[]{number})); //$NON-NLS-1$
+			}
+		}
+		return status;
+	}
+	
+	private void updateStatus(IStatus status) {
+		if (!status.matches(IStatus.ERROR)) {
+			Set<Text> keys= getNumberFields().keySet();
+			for (Iterator<Text> iter = keys.iterator(); iter.hasNext();) {
+				Text text = (Text) iter.next();
+				IStatus s= validatePositiveNumber(text.getText(), (String[])getNumberFields().get(text));
+				status= s.getSeverity() > status.getSeverity() ? s : status;
+			}
+		}	
+		setValid(!status.matches(IStatus.ERROR));
+		applyToStatusLine(this, status);
+	}
+
+	/*
+	 * Applies the status to the status line of a dialog page.
+	 */
+	private void applyToStatusLine(DialogPage page, IStatus status) {
+		String message= status.getMessage();
+		switch (status.getSeverity()) {
+			case IStatus.OK:
+				page.setMessage(message, IMessageProvider.NONE);
+				page.setErrorMessage(null);
+				break;
+			case IStatus.WARNING:
+				page.setMessage(message, IMessageProvider.WARNING);
+				page.setErrorMessage(null);
+				break;				
+			case IStatus.INFO:
+				page.setMessage(message, IMessageProvider.INFORMATION);
+				page.setErrorMessage(null);
+				break;			
+			default:
+				if (message.length() == 0) {
+					message= null;
+				}
+				page.setMessage(null);
+				page.setErrorMessage(message);
+				break;		
+		}
+	}
+	
+	/**
+	 * Returns an array of size 2:
+	 *  - first element is of type <code>Label</code>
+	 *  - second element is of type <code>Text</code>
+	 * Use <code>getLabelControl</code> and <code>getTextControl</code> to get the 2 controls.
+	 */
+	protected Control[] addLabelledTextField(Composite composite, String label, String key, int textLimit, int indentation, String[] errorMessages) {
+		Label labelControl= new Label(composite, SWT.NONE);
+		labelControl.setText(label);
+		labelControl.setFont(composite.getFont());
+		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
+		gd.horizontalIndent= indentation;
+		labelControl.setLayoutData(gd);
+	
+		Text textControl= new Text(composite, SWT.BORDER | SWT.SINGLE);		
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
+		gd.widthHint= convertWidthInCharsToPixels(textLimit + 1);
+		textControl.setLayoutData(gd);
+		textControl.setTextLimit(textLimit);
+		textControl.setFont(composite.getFont());
+		fTextFields.put(textControl, key);
+		if (errorMessages != null) {
+			fNumberFields.put(textControl, errorMessages);
+			textControl.addModifyListener(fNumberFieldListener);
+		} else {
+			textControl.addModifyListener(fTextFieldListener);
+		}
+		
+		return new Control[]{labelControl, textControl};
+	}
+	
+	protected String loadPreviewContentFromFile(String filename) {
+		String line;
+		String separator= System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
+		StringBuffer buffer= new StringBuffer(512);
+		BufferedReader reader= null;
+		try {
+			reader= new BufferedReader(new InputStreamReader(getClass().getResourceAsStream(filename)));
+			while ((line= reader.readLine()) != null) {
+				buffer.append(line);
+				buffer.append(separator);
+			}
+		} catch (IOException io) {
+			AutotoolsUIPlugin.log(io);
+		} finally {
+			if (reader != null) {
+				try { reader.close(); } catch (IOException e) {}
+			}
+		}
+		return buffer.toString();
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutoconfEditorPreferencePage.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutoconfEditorPreferencePage.java
new file mode 100644
index 0000000..487537b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutoconfEditorPreferencePage.java
@@ -0,0 +1,591 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ * Red Hat Inc. - modification to use with Autoconf editor
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.cdt.make.ui.IMakeHelpContextIds;
+import org.eclipse.cdt.ui.PreferenceConstants;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.jface.viewers.IColorProvider;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.TabFolder;
+import org.eclipse.swt.widgets.TabItem;
+import org.eclipse.ui.model.WorkbenchViewerComparator;
+
+
+
+/**
+ * MakeEditorPreferencePage
+ * The page for setting the editor options.
+ */
+public class AutoconfEditorPreferencePage extends AbstractEditorPreferencePage {
+
+	private static String[] fACVersions = {"2.13", "2.59", "2.61"};
+	public static final String LATEST_AC_VERSION = fACVersions[fACVersions.length - 1];
+	
+	private static String[] fAMVersions = {"1.4-p6", "1.9.5", "1.9.6"};
+	public static final String LATEST_AM_VERSION = fAMVersions[fAMVersions.length - 1];
+	
+	/** The keys of the overlay store. */
+	private String[][] fSyntaxColorListModel;
+
+	private TableViewer fHighlightingColorListViewer;
+	private final List<HighlightingColorListItem> fHighlightingColorList= new ArrayList<HighlightingColorListItem>(5);
+
+	ColorEditor fAppearanceColorEditor;
+	Button fAppearanceColorDefault;
+	ColorEditor fSyntaxForegroundColorEditor;
+	ColorEditor fBackgroundColorEditor;
+	Button fBoldCheckBox;
+	Button fItalicCheckBox;
+	
+	// folding
+	protected Button fFoldingCheckbox;
+	
+	// version
+	protected Combo fACVersionCombo;
+	protected Combo fAMVersionCombo;
+	
+	/**
+	 * Item in the highlighting color list.
+	 * 
+	 * @since 3.0
+	 */
+	private class HighlightingColorListItem {
+		/** Display name */
+		private String fDisplayName;
+		/** Color preference key */
+		private String fColorKey;
+		/** Bold preference key */
+		private String fBoldKey;
+		/** Italic preference key */
+		private String fItalicKey;
+		/** Item color */
+		private Color fItemColor;
+		
+		/**
+		 * Initialize the item with the given values.
+		 * 
+		 * @param displayName the display name
+		 * @param colorKey the color preference key
+		 * @param boldKey the bold preference key
+		 * @param italicKey the italic preference key
+		 * @param itemColor the item color
+		 */
+		public HighlightingColorListItem(String displayName, String colorKey, String boldKey, String italicKey, Color itemColor) {
+			fDisplayName= displayName;
+			fColorKey= colorKey;
+			fBoldKey= boldKey;
+			fItalicKey= italicKey;
+			fItemColor= itemColor;
+		}
+		
+		/**
+		 * @return the bold preference key
+		 */
+		public String getBoldKey() {
+			return fBoldKey;
+		}
+		
+		/**
+		 * @return the bold preference key
+		 */
+		public String getItalicKey() {
+			return fItalicKey;
+		}
+		
+		/**
+		 * @return the color preference key
+		 */
+		public String getColorKey() {
+			return fColorKey;
+		}
+		
+		/**
+		 * @return the display name
+		 */
+		public String getDisplayName() {
+			return fDisplayName;
+		}
+		
+		/**
+		 * @return the item color
+		 */
+		public Color getItemColor() {
+			return fItemColor;
+		}
+	}
+
+	/**
+	 * Color list label provider.
+	 * 
+	 * @since 3.0
+	 */
+	private class ColorListLabelProvider extends LabelProvider implements IColorProvider {
+
+		/*
+		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
+		 */
+		public String getText(Object element) {
+			return ((HighlightingColorListItem)element).getDisplayName();
+		}
+		
+		/*
+		 * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
+		 */
+		public Color getForeground(Object element) {
+			return ((HighlightingColorListItem)element).getItemColor();
+		}
+
+		/*
+		 * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
+		 */
+		public Color getBackground(Object element) {
+			return null;
+		}
+	}
+	
+	/**
+	 * Color list content provider.
+	 * 
+	 * @since 3.0
+	 */
+	private class ColorListContentProvider implements IStructuredContentProvider {
+
+		/*
+		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
+		 */
+		@SuppressWarnings("unchecked")
+		public Object[] getElements(Object inputElement) {
+			return ((List<Object>)inputElement).toArray();
+		}
+
+		/*
+		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
+		 */
+		public void dispose() {
+		}
+
+		/*
+		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+		 */
+		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		}
+	}
+	
+
+
+	/**
+	 * 
+	 */
+	public AutoconfEditorPreferencePage() {
+		super();
+	}
+
+	protected OverlayPreferenceStore createOverlayStore() {
+		fSyntaxColorListModel= new String[][] {
+				{AutotoolsPreferencesMessages.getString("AutoconfEditorPreferencePage.autoconf_editor_comment"), ColorManager.AUTOCONF_COMMENT_COLOR, null}, //$NON-NLS-1$
+				{AutotoolsPreferencesMessages.getString("AutoconfEditorPreferencePage.autoconf_editor_acmacro"), ColorManager.AUTOCONF_ACMACRO_COLOR, null}, //$NON-NLS-1$
+				{AutotoolsPreferencesMessages.getString("AutoconfEditorPreferencePage.autoconf_editor_ammacro"), ColorManager.AUTOCONF_AMMACRO_COLOR, null}, //$NON-NLS-1$
+				{AutotoolsPreferencesMessages.getString("AutoconfEditorPreferencePage.autoconf_editor_code_seq"), ColorManager.AUTOCONF_CODESEQ_COLOR, null},  //$NON-NLS-1$
+				{AutotoolsPreferencesMessages.getString("AutoconfEditorPreferencePage.autoconf_editor_keyword"), ColorManager.AUTOCONF_KEYWORD_COLOR, null},  //$NON-NLS-1$
+				{AutotoolsPreferencesMessages.getString("AutoconfEditorPreferencePage.autoconf_editor_var_ref"), ColorManager.AUTOCONF_VAR_REF_COLOR, null},  //$NON-NLS-1$
+				{AutotoolsPreferencesMessages.getString("AutoconfEditorPreferencePage.autoconf_editor_var_set"), ColorManager.AUTOCONF_VAR_SET_COLOR, null},  //$NON-NLS-1$
+				{AutotoolsPreferencesMessages.getString("AutoconfEditorPreferencePage.autoconf_editor_default"), ColorManager.AUTOCONF_DEFAULT_COLOR, null},  //$NON-NLS-1$
+			};
+		ArrayList<OverlayPreferenceStore.OverlayKey> overlayKeys= new ArrayList<OverlayPreferenceStore.OverlayKey>();
+
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_ENABLED));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_CONDITIONAL));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_MACRODEF));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_RULE));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION));
+		
+		for (int i= 0; i < fSyntaxColorListModel.length; i++) {
+			String colorKey= fSyntaxColorListModel[i][1];
+			addTextKeyToCover(overlayKeys, colorKey);
+		}
+		
+		OverlayPreferenceStore.OverlayKey[] keys= new OverlayPreferenceStore.OverlayKey[overlayKeys.size()];
+		overlayKeys.toArray(keys);
+		return new OverlayPreferenceStore(getPreferenceStore(), keys);
+	}
+
+	private void addTextKeyToCover(ArrayList<OverlayPreferenceStore.OverlayKey> overlayKeys, String mainKey) {
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, mainKey));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, mainKey + AutotoolsEditorPreferenceConstants.EDITOR_BOLD_SUFFIX));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, mainKey + AutotoolsEditorPreferenceConstants.EDITOR_ITALIC_SUFFIX));
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
+	 */
+	protected Control createContents(Composite parent) {
+		AutotoolsUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(getControl(), IMakeHelpContextIds.MAKE_EDITOR_PREFERENCE_PAGE);
+		getOverlayStore().load();
+		getOverlayStore().start();
+		
+		TabFolder folder= new TabFolder(parent, SWT.NONE);
+		folder.setLayout(new TabFolderLayout());	
+		folder.setLayoutData(new GridData(GridData.FILL_BOTH));
+		
+		TabItem item= new TabItem(folder, SWT.NONE);
+		item.setText(AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.syntax")); //$NON-NLS-1$
+		item.setControl(createSyntaxPage(folder));
+		
+		item= new TabItem(folder, SWT.NONE);
+		item.setText(AutotoolsPreferencesMessages.getString("AutoconfEditorPreferencePage.folding")); //$NON-NLS-1$
+		item.setControl(createFoldingTabContent(folder));
+					
+		// Allow end-user to select which version of autoconf to use for hover help
+		// and syntax checking of macros.
+		item= new TabItem(folder, SWT.NONE);
+		item.setText(AutotoolsPreferencesMessages.getString("AutoconfEditorPreferencePage.version")); //$NON-NLS-1$
+		item.setControl(createVersionTabContent(folder));
+					
+		initialize();
+		
+		applyDialogFont(folder);
+		return folder;
+	}
+
+	private void initialize() {
+		
+		initializeFields();
+		
+		for (int i= 0, n= fSyntaxColorListModel.length; i < n; i++) {
+			fHighlightingColorList.add(
+				new HighlightingColorListItem (fSyntaxColorListModel[i][0], fSyntaxColorListModel[i][1],
+						fSyntaxColorListModel[i][1] + AutotoolsEditorPreferenceConstants.EDITOR_BOLD_SUFFIX, 
+						fSyntaxColorListModel[i][1] + AutotoolsEditorPreferenceConstants.EDITOR_ITALIC_SUFFIX, null));
+		}
+		fHighlightingColorListViewer.setInput(fHighlightingColorList);
+		fHighlightingColorListViewer.setSelection(new StructuredSelection(fHighlightingColorListViewer.getElementAt(0)));
+
+		for (int i=0, n= fACVersions.length; i < n; i++) {
+			fACVersionCombo.setItem(i, fACVersions[i]);
+		}
+		
+		initializeFolding();
+		initializeACVersion();
+		initializeAMVersion();
+	}
+
+	void initializeFolding() {
+		boolean enabled= getOverlayStore().getBoolean(PreferenceConstants.EDITOR_FOLDING_ENABLED);
+		fFoldingCheckbox.setSelection(enabled);		
+	}
+	
+	void initializeACVersion() {
+		// FIXME: What do we do here?  There is no PreferenceConstants value for this.
+		// Perhaps we should be using our own overlay store.
+		String version = getOverlayStore().getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION);
+		String[] items = fACVersionCombo.getItems();
+		// Try and find which list item matches the current preference stored and
+		// select it in the list.
+		int i;
+		for (i = 0; i < items.length; ++i) {
+			if (items[i].equals(version))
+				break;
+		}
+		if (i >= items.length)
+			i = items.length - 1;
+		fACVersionCombo.select(i);
+	}
+
+	void initializeAMVersion() {
+		// FIXME: What do we do here?  There is no PreferenceConstants value for this.
+		// Perhaps we should be using our own overlay store.
+		String version = getOverlayStore().getString(AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION);
+		String[] items = fAMVersionCombo.getItems();
+		// Try and find which list item matches the current preference stored and
+		// select it in the list.
+		int i;
+		for (i = 0; i < items.length; ++i) {
+			if (items[i].equals(version))
+				break;
+		}
+		if (i >= items.length)
+			i = items.length - 1;
+		fAMVersionCombo.select(i);
+	}
+
+	void initializeDefaultFolding() {
+		boolean enabled= getOverlayStore().getDefaultBoolean(PreferenceConstants.EDITOR_FOLDING_ENABLED);
+		fFoldingCheckbox.setSelection(enabled);		
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AbstractAutomakeEditorPreferencePage#handleDefaults()
+	 */
+	protected void handleDefaults() {
+		handleSyntaxColorListSelection();
+		initializeDefaultFolding();
+	}
+	
+	private Control createSyntaxPage(Composite parent) {
+		
+		Composite colorComposite= new Composite(parent, SWT.NONE);
+		colorComposite.setLayout(new GridLayout());
+
+		Label label= new Label(colorComposite, SWT.LEFT);
+		label.setText(AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.Foreground")); //$NON-NLS-1$
+		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+		Composite editorComposite= new Composite(colorComposite, SWT.NONE);
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 2;
+		layout.marginHeight= 0;
+		layout.marginWidth= 0;
+		editorComposite.setLayout(layout);
+		GridData gd= new GridData(GridData.FILL_BOTH);
+		editorComposite.setLayoutData(gd);		
+
+		fHighlightingColorListViewer= new TableViewer(editorComposite, SWT.SINGLE | SWT.V_SCROLL | SWT.BORDER | SWT.FULL_SELECTION);
+		fHighlightingColorListViewer.setLabelProvider(new ColorListLabelProvider());
+		fHighlightingColorListViewer.setContentProvider(new ColorListContentProvider());
+		fHighlightingColorListViewer.setComparator(new WorkbenchViewerComparator());
+		gd= new GridData(GridData.FILL_BOTH);
+		gd.heightHint= convertHeightInCharsToPixels(5);
+		fHighlightingColorListViewer.getControl().setLayoutData(gd);
+						
+		Composite stylesComposite= new Composite(editorComposite, SWT.NONE);
+		layout= new GridLayout();
+		layout.marginHeight= 0;
+		layout.marginWidth= 0;
+		layout.numColumns= 2;
+		stylesComposite.setLayout(layout);
+		stylesComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
+		
+		label= new Label(stylesComposite, SWT.LEFT);
+		label.setText(AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.color")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label.setLayoutData(gd);
+
+		fSyntaxForegroundColorEditor= new ColorEditor(stylesComposite);
+		Button foregroundColorButton= fSyntaxForegroundColorEditor.getButton();
+		gd= new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalAlignment= GridData.BEGINNING;
+		foregroundColorButton.setLayoutData(gd);
+		
+		fBoldCheckBox= new Button(stylesComposite, SWT.CHECK);
+		fBoldCheckBox.setText(AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.bold")); //$NON-NLS-1$
+		gd= new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalAlignment= GridData.BEGINNING;
+		gd.horizontalSpan= 2;
+		fBoldCheckBox.setLayoutData(gd);
+		
+		fItalicCheckBox= new Button(stylesComposite, SWT.CHECK);
+		fItalicCheckBox.setText(AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.italic")); //$NON-NLS-1$
+		gd= new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalAlignment= GridData.BEGINNING;
+		gd.horizontalSpan= 2;
+		fItalicCheckBox.setLayoutData(gd);
+
+		fHighlightingColorListViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+			public void selectionChanged(SelectionChangedEvent event) {
+				handleSyntaxColorListSelection();
+			}
+		});
+
+		foregroundColorButton.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// do nothing
+			}
+			public void widgetSelected(SelectionEvent e) {
+				HighlightingColorListItem item= getHighlightingColorListItem();
+				PreferenceConverter.setValue(getOverlayStore(), item.getColorKey(), fSyntaxForegroundColorEditor.getColorValue());
+			}
+		});
+
+		fBoldCheckBox.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// do nothing
+			}
+			public void widgetSelected(SelectionEvent e) {
+				HighlightingColorListItem item= getHighlightingColorListItem();
+				getOverlayStore().setValue(item.getBoldKey(), fBoldCheckBox.getSelection());
+			}
+		});
+				
+		fItalicCheckBox.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// do nothing
+			}
+			public void widgetSelected(SelectionEvent e) {
+				HighlightingColorListItem item= getHighlightingColorListItem();
+				getOverlayStore().setValue(item.getItalicKey(), fItalicCheckBox.getSelection());
+			}
+		});
+				
+		return colorComposite;
+	}
+	
+
+	private Composite createFoldingTabContent(TabFolder folder) {
+		Composite composite= new Composite(folder, SWT.NULL);
+		// assume parent page uses griddata
+		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_FILL);
+		composite.setLayoutData(gd);
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 2;
+		//PixelConverter pc= new PixelConverter(composite);
+		//layout.verticalSpacing= pc.convertHeightInCharsToPixels(1) / 2;
+		composite.setLayout(layout);
+		
+		
+		/* check box for new editors */
+		fFoldingCheckbox= new Button(composite, SWT.CHECK);
+		fFoldingCheckbox.setText(AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.foldingenable")); //$NON-NLS-1$
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+		fFoldingCheckbox.setLayoutData(gd);
+		fFoldingCheckbox.addSelectionListener(new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				boolean enabled= fFoldingCheckbox.getSelection(); 
+				getOverlayStore().setValue(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_ENABLED, enabled);
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+		});
+		
+		return composite;
+	}
+
+	private Composite createVersionTabContent(TabFolder folder) {
+		Composite composite= new Composite(folder, SWT.NULL);
+		// assume parent page uses griddata
+		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_FILL);
+		composite.setLayoutData(gd);
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 2;
+		//PixelConverter pc= new PixelConverter(composite);
+		//layout.verticalSpacing= pc.convertHeightInCharsToPixels(1) / 2;
+		composite.setLayout(layout);
+		
+		
+		/* check box for new editors */
+		fACVersionCombo= new Combo(composite, SWT.CHECK | SWT.DROP_DOWN | SWT.READ_ONLY);
+		fACVersionCombo.setItems(fACVersions);
+		fACVersionCombo.select(fACVersions.length - 1);
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+		fACVersionCombo.setLayoutData(gd);
+		fACVersionCombo.addSelectionListener(new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				int index = fACVersionCombo.getSelectionIndex(); 
+				getOverlayStore().setValue(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION, fACVersionCombo.getItem(index));
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+		});
+		
+		Label label= new Label(composite, SWT.LEFT);
+		label.setText(AutotoolsPreferencesMessages.getString("AutoconfEditorPreferencePage.autoconfVersion")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label.setLayoutData(gd);
+		
+		/* check box for new editors */
+		fAMVersionCombo= new Combo(composite, SWT.CHECK | SWT.DROP_DOWN | SWT.READ_ONLY);
+		fAMVersionCombo.setItems(fAMVersions);
+		fAMVersionCombo.select(fAMVersions.length - 1);
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+		fAMVersionCombo.setLayoutData(gd);
+		fAMVersionCombo.addSelectionListener(new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				int index = fAMVersionCombo.getSelectionIndex(); 
+				getOverlayStore().setValue(AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION, fAMVersionCombo.getItem(index));
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+		});
+		
+		Label label2= new Label(composite, SWT.LEFT);
+		label2.setText(AutotoolsPreferencesMessages.getString("AutoconfEditorPreferencePage.automakeVersion")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label2.setLayoutData(gd);
+
+		return composite;
+	}
+
+	void handleSyntaxColorListSelection() {
+		HighlightingColorListItem item= getHighlightingColorListItem();
+		RGB rgb= PreferenceConverter.getColor(getOverlayStore(), item.getColorKey());
+		fSyntaxForegroundColorEditor.setColorValue(rgb);		
+		fBoldCheckBox.setSelection(getOverlayStore().getBoolean(item.getBoldKey()));
+		fItalicCheckBox.setSelection(getOverlayStore().getBoolean(item.getItalicKey()));
+	}
+	
+	/**
+	 * Returns the current highlighting color list item.
+	 * 
+	 * @return the current highlighting color list item
+	 * @since 3.0
+	 */
+	HighlightingColorListItem getHighlightingColorListItem() {
+		IStructuredSelection selection= (IStructuredSelection) fHighlightingColorListViewer.getSelection();
+		return (HighlightingColorListItem) selection.getFirstElement();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
+	 */
+	public boolean performOk() {
+		return super.performOk();
+	}
+
+	/**
+	 * @param preferenceStore
+	 */
+	public static void initDefaults(IPreferenceStore prefs) {		
+		// Makefile Editor color preferences
+		PreferenceConverter.setDefault(prefs, ColorManager.AUTOCONF_COMMENT_COLOR, ColorManager.AUTOCONF_COMMENT_RGB);
+		PreferenceConverter.setDefault(prefs, ColorManager.AUTOCONF_DEFAULT_COLOR, ColorManager.AUTOCONF_DEFAULT_RGB);
+		PreferenceConverter.setDefault(prefs, ColorManager.AUTOCONF_KEYWORD_COLOR, ColorManager.AUTOCONF_KEYWORD_RGB);
+		PreferenceConverter.setDefault(prefs, ColorManager.AUTOCONF_VAR_REF_COLOR, ColorManager.AUTOCONF_VAR_REF_RGB);
+		PreferenceConverter.setDefault(prefs, ColorManager.AUTOCONF_VAR_SET_COLOR, ColorManager.AUTOCONF_VAR_SET_RGB);
+		PreferenceConverter.setDefault(prefs, ColorManager.AUTOCONF_ACMACRO_COLOR, ColorManager.AUTOCONF_ACMACRO_RGB);
+		PreferenceConverter.setDefault(prefs, ColorManager.AUTOCONF_AMMACRO_COLOR, ColorManager.AUTOCONF_AMMACRO_RGB);
+		PreferenceConverter.setDefault(prefs, ColorManager.AUTOCONF_CODESEQ_COLOR, ColorManager.AUTOCONF_CODESEQ_RGB);
+		prefs.setDefault(ColorManager.AUTOCONF_CODESEQ_COLOR + AutotoolsEditorPreferenceConstants.EDITOR_ITALIC_SUFFIX, true);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutomakeEditorPreferencePage.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutomakeEditorPreferencePage.java
new file mode 100644
index 0000000..3ef71c6
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutomakeEditorPreferencePage.java
@@ -0,0 +1,468 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ * Red Hat Inc. - modification to use with Automake editor
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.cdt.make.ui.IMakeHelpContextIds;
+import org.eclipse.cdt.ui.PreferenceConstants;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.jface.viewers.IColorProvider;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.TabFolder;
+import org.eclipse.swt.widgets.TabItem;
+import org.eclipse.ui.model.WorkbenchViewerComparator;
+
+
+
+/**
+ * MakeEditorPreferencePage
+ * The page for setting the editor options.
+ */
+public class AutomakeEditorPreferencePage extends AbstractEditorPreferencePage {
+
+	/** The keys of the overlay store. */
+	private String[][] fSyntaxColorListModel;
+
+	private TableViewer fHighlightingColorListViewer;
+	private final List<HighlightingColorListItem> fHighlightingColorList= new ArrayList<HighlightingColorListItem>(5);
+
+	ColorEditor fAppearanceColorEditor;
+	Button fAppearanceColorDefault;
+	ColorEditor fSyntaxForegroundColorEditor;
+	ColorEditor fBackgroundColorEditor;
+	Button fBoldCheckBox;
+	Button fItalicCheckBox;
+	
+	// folding
+	protected Button fFoldingCheckbox;
+	
+	/**
+	 * Item in the highlighting color list.
+	 * 
+	 * @since 3.0
+	 */
+	private class HighlightingColorListItem {
+		/** Display name */
+		private String fDisplayName;
+		/** Color preference key */
+		private String fColorKey;
+		/** Bold preference key */
+		private String fBoldKey;
+		/** Italic preference key */
+		private String fItalicKey;
+		/** Item color */
+		private Color fItemColor;
+		
+		/**
+		 * Initialize the item with the given values.
+		 * 
+		 * @param displayName the display name
+		 * @param colorKey the color preference key
+		 * @param boldKey the bold preference key
+		 * @param italicKey the italic preference key
+		 * @param itemColor the item color
+		 */
+		public HighlightingColorListItem(String displayName, String colorKey, String boldKey, String italicKey, Color itemColor) {
+			fDisplayName= displayName;
+			fColorKey= colorKey;
+			fBoldKey= boldKey;
+			fItalicKey= italicKey;
+			fItemColor= itemColor;
+		}
+		
+		/**
+		 * @return the bold preference key
+		 */
+		public String getBoldKey() {
+			return fBoldKey;
+		}
+		
+		/**
+		 * @return the bold preference key
+		 */
+		public String getItalicKey() {
+			return fItalicKey;
+		}
+		
+		/**
+		 * @return the color preference key
+		 */
+		public String getColorKey() {
+			return fColorKey;
+		}
+		
+		/**
+		 * @return the display name
+		 */
+		public String getDisplayName() {
+			return fDisplayName;
+		}
+		
+		/**
+		 * @return the item color
+		 */
+		public Color getItemColor() {
+			return fItemColor;
+		}
+	}
+
+	/**
+	 * Color list label provider.
+	 * 
+	 * @since 3.0
+	 */
+	private class ColorListLabelProvider extends LabelProvider implements IColorProvider {
+
+		/*
+		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
+		 */
+		public String getText(Object element) {
+			return ((HighlightingColorListItem)element).getDisplayName();
+		}
+		
+		/*
+		 * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
+		 */
+		public Color getForeground(Object element) {
+			return ((HighlightingColorListItem)element).getItemColor();
+		}
+
+		/*
+		 * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
+		 */
+		public Color getBackground(Object element) {
+			return null;
+		}
+	}
+	
+	/**
+	 * Color list content provider.
+	 * 
+	 * @since 3.0
+	 */
+	private class ColorListContentProvider implements IStructuredContentProvider {
+
+		/*
+		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
+		 */
+		@SuppressWarnings("unchecked")
+		public Object[] getElements(Object inputElement) {
+			return ((List<Object>)inputElement).toArray();
+		}
+
+		/*
+		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
+		 */
+		public void dispose() {
+		}
+
+		/*
+		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+		 */
+		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		}
+	}
+	
+
+
+	/**
+	 * 
+	 */
+	public AutomakeEditorPreferencePage() {
+		super();
+	}
+
+	protected OverlayPreferenceStore createOverlayStore() {
+		fSyntaxColorListModel= new String[][] {
+				{AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.makefile_editor_comment"), ColorManager.MAKE_COMMENT_COLOR, null}, //$NON-NLS-1$
+				{AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.makefile_editor_macro_ref"), ColorManager.MAKE_MACRO_REF_COLOR, null}, //$NON-NLS-1$
+				{AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.makefile_editor_macro_def"), ColorManager.MAKE_MACRO_DEF_COLOR, null}, //$NON-NLS-1$
+				{AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.makefile_editor_function"), ColorManager.MAKE_FUNCTION_COLOR, null},  //$NON-NLS-1$
+				{AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.makefile_editor_keyword"),  ColorManager.MAKE_KEYWORD_COLOR, null},  //$NON-NLS-1$
+				{AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.makefile_editor_default"),  ColorManager.MAKE_DEFAULT_COLOR, null},  //$NON-NLS-1$
+			};
+		ArrayList<OverlayPreferenceStore.OverlayKey> overlayKeys= new ArrayList<OverlayPreferenceStore.OverlayKey>();
+
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_ENABLED));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_CONDITIONAL));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_MACRODEF));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_RULE));
+		
+		for (int i= 0; i < fSyntaxColorListModel.length; i++) {
+			String colorKey= fSyntaxColorListModel[i][1];
+			addTextKeyToCover(overlayKeys, colorKey);
+		}
+		
+		OverlayPreferenceStore.OverlayKey[] keys= new OverlayPreferenceStore.OverlayKey[overlayKeys.size()];
+		overlayKeys.toArray(keys);
+		return new OverlayPreferenceStore(getPreferenceStore(), keys);
+	}
+
+	private void addTextKeyToCover(ArrayList<OverlayPreferenceStore.OverlayKey> overlayKeys, String mainKey) {
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, mainKey));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, mainKey + AutotoolsEditorPreferenceConstants.EDITOR_BOLD_SUFFIX));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, mainKey + AutotoolsEditorPreferenceConstants.EDITOR_ITALIC_SUFFIX));
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
+	 */
+	protected Control createContents(Composite parent) {
+		AutotoolsUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(getControl(), IMakeHelpContextIds.MAKE_EDITOR_PREFERENCE_PAGE);
+		getOverlayStore().load();
+		getOverlayStore().start();
+		
+		TabFolder folder= new TabFolder(parent, SWT.NONE);
+		folder.setLayout(new TabFolderLayout());	
+		folder.setLayoutData(new GridData(GridData.FILL_BOTH));
+		
+		TabItem item= new TabItem(folder, SWT.NONE);
+		item.setText(AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.syntax")); //$NON-NLS-1$
+		item.setControl(createSyntaxPage(folder));
+		
+		item= new TabItem(folder, SWT.NONE);
+		item.setText(AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.folding")); //$NON-NLS-1$
+		item.setControl(createFoldingTabContent(folder));
+					
+		initialize();
+		
+		applyDialogFont(folder);
+		return folder;
+	}
+
+	private void initialize() {
+		
+		initializeFields();
+		
+		for (int i= 0, n= fSyntaxColorListModel.length; i < n; i++) {
+			fHighlightingColorList.add(
+				new HighlightingColorListItem (fSyntaxColorListModel[i][0], fSyntaxColorListModel[i][1],
+						fSyntaxColorListModel[i][1] + AutotoolsEditorPreferenceConstants.EDITOR_BOLD_SUFFIX, 
+						fSyntaxColorListModel[i][1] + AutotoolsEditorPreferenceConstants.EDITOR_ITALIC_SUFFIX, null));
+		}
+		fHighlightingColorListViewer.setInput(fHighlightingColorList);
+		fHighlightingColorListViewer.setSelection(new StructuredSelection(fHighlightingColorListViewer.getElementAt(0)));
+
+		initializeFolding();
+	}
+
+	void initializeFolding() {
+		boolean enabled= getOverlayStore().getBoolean(PreferenceConstants.EDITOR_FOLDING_ENABLED);
+		fFoldingCheckbox.setSelection(enabled);		
+	}
+
+	void initializeDefaultFolding() {
+		boolean enabled= getOverlayStore().getDefaultBoolean(PreferenceConstants.EDITOR_FOLDING_ENABLED);
+		fFoldingCheckbox.setSelection(enabled);		
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AbstractAutomakeEditorPreferencePage#handleDefaults()
+	 */
+	protected void handleDefaults() {
+		handleSyntaxColorListSelection();
+		initializeDefaultFolding();
+	}
+	
+	private Control createSyntaxPage(Composite parent) {
+		
+		Composite colorComposite= new Composite(parent, SWT.NONE);
+		colorComposite.setLayout(new GridLayout());
+
+		Label label= new Label(colorComposite, SWT.LEFT);
+		label.setText(AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.Foreground")); //$NON-NLS-1$
+		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+		Composite editorComposite= new Composite(colorComposite, SWT.NONE);
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 2;
+		layout.marginHeight= 0;
+		layout.marginWidth= 0;
+		editorComposite.setLayout(layout);
+		GridData gd= new GridData(GridData.FILL_BOTH);
+		editorComposite.setLayoutData(gd);		
+
+		fHighlightingColorListViewer= new TableViewer(editorComposite, SWT.SINGLE | SWT.V_SCROLL | SWT.BORDER | SWT.FULL_SELECTION);
+		fHighlightingColorListViewer.setLabelProvider(new ColorListLabelProvider());
+		fHighlightingColorListViewer.setContentProvider(new ColorListContentProvider());
+		fHighlightingColorListViewer.setComparator(new WorkbenchViewerComparator());
+		gd= new GridData(GridData.FILL_BOTH);
+		gd.heightHint= convertHeightInCharsToPixels(5);
+		fHighlightingColorListViewer.getControl().setLayoutData(gd);
+						
+		Composite stylesComposite= new Composite(editorComposite, SWT.NONE);
+		layout= new GridLayout();
+		layout.marginHeight= 0;
+		layout.marginWidth= 0;
+		layout.numColumns= 2;
+		stylesComposite.setLayout(layout);
+		stylesComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
+		
+		label= new Label(stylesComposite, SWT.LEFT);
+		label.setText(AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.color")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label.setLayoutData(gd);
+
+		fSyntaxForegroundColorEditor= new ColorEditor(stylesComposite);
+		Button foregroundColorButton= fSyntaxForegroundColorEditor.getButton();
+		gd= new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalAlignment= GridData.BEGINNING;
+		foregroundColorButton.setLayoutData(gd);
+		
+		fBoldCheckBox= new Button(stylesComposite, SWT.CHECK);
+		fBoldCheckBox.setText(AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.bold")); //$NON-NLS-1$
+		gd= new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalAlignment= GridData.BEGINNING;
+		gd.horizontalSpan= 2;
+		fBoldCheckBox.setLayoutData(gd);
+		
+		fItalicCheckBox= new Button(stylesComposite, SWT.CHECK);
+		fItalicCheckBox.setText(AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.italic")); //$NON-NLS-1$
+		gd= new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalAlignment= GridData.BEGINNING;
+		gd.horizontalSpan= 2;
+		fItalicCheckBox.setLayoutData(gd);
+
+		fHighlightingColorListViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+			public void selectionChanged(SelectionChangedEvent event) {
+				handleSyntaxColorListSelection();
+			}
+		});
+
+		foregroundColorButton.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// do nothing
+			}
+			public void widgetSelected(SelectionEvent e) {
+				HighlightingColorListItem item= getHighlightingColorListItem();
+				PreferenceConverter.setValue(getOverlayStore(), item.getColorKey(), fSyntaxForegroundColorEditor.getColorValue());
+			}
+		});
+
+		fBoldCheckBox.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// do nothing
+			}
+			public void widgetSelected(SelectionEvent e) {
+				HighlightingColorListItem item= getHighlightingColorListItem();
+				getOverlayStore().setValue(item.getBoldKey(), fBoldCheckBox.getSelection());
+			}
+		});
+				
+		fItalicCheckBox.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// do nothing
+			}
+			public void widgetSelected(SelectionEvent e) {
+				HighlightingColorListItem item= getHighlightingColorListItem();
+				getOverlayStore().setValue(item.getItalicKey(), fItalicCheckBox.getSelection());
+			}
+		});
+				
+		return colorComposite;
+	}
+	
+
+	private Composite createFoldingTabContent(TabFolder folder) {
+		Composite composite= new Composite(folder, SWT.NULL);
+		// assume parent page uses griddata
+		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_FILL);
+		composite.setLayoutData(gd);
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 2;
+		//PixelConverter pc= new PixelConverter(composite);
+		//layout.verticalSpacing= pc.convertHeightInCharsToPixels(1) / 2;
+		composite.setLayout(layout);
+		
+		
+		/* check box for new editors */
+		fFoldingCheckbox= new Button(composite, SWT.CHECK);
+		fFoldingCheckbox.setText(AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.foldingenable")); //$NON-NLS-1$
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+		fFoldingCheckbox.setLayoutData(gd);
+		fFoldingCheckbox.addSelectionListener(new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				boolean enabled= fFoldingCheckbox.getSelection(); 
+				getOverlayStore().setValue(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_ENABLED, enabled);
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+		});
+		
+		return composite;
+	}
+
+	void handleSyntaxColorListSelection() {
+		HighlightingColorListItem item= getHighlightingColorListItem();
+		RGB rgb= PreferenceConverter.getColor(getOverlayStore(), item.getColorKey());
+		fSyntaxForegroundColorEditor.setColorValue(rgb);		
+		fBoldCheckBox.setSelection(getOverlayStore().getBoolean(item.getBoldKey()));
+		fItalicCheckBox.setSelection(getOverlayStore().getBoolean(item.getItalicKey()));
+	}
+	
+	/**
+	 * Returns the current highlighting color list item.
+	 * 
+	 * @return the current highlighting color list item
+	 * @since 3.0
+	 */
+	HighlightingColorListItem getHighlightingColorListItem() {
+		IStructuredSelection selection= (IStructuredSelection) fHighlightingColorListViewer.getSelection();
+		return (HighlightingColorListItem) selection.getFirstElement();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
+	 */
+	public boolean performOk() {
+		return super.performOk();
+	}
+
+	/**
+	 * @param preferenceStore
+	 */
+	public static void initDefaults(IPreferenceStore prefs) {		
+		// Makefile Editor color preferences
+		PreferenceConverter.setDefault(prefs, ColorManager.MAKE_COMMENT_COLOR, ColorManager.MAKE_COMMENT_RGB);
+		PreferenceConverter.setDefault(prefs, ColorManager.MAKE_DEFAULT_COLOR, ColorManager.MAKE_DEFAULT_RGB);
+		PreferenceConverter.setDefault(prefs, ColorManager.MAKE_FUNCTION_COLOR, ColorManager.MAKE_FUNCTION_RGB);
+		PreferenceConverter.setDefault(prefs, ColorManager.MAKE_KEYWORD_COLOR, ColorManager.MAKE_KEYWORD_RGB);
+		PreferenceConverter.setDefault(prefs, ColorManager.MAKE_MACRO_DEF_COLOR, ColorManager.MAKE_MACRO_DEF_RGB);
+		PreferenceConverter.setDefault(prefs, ColorManager.MAKE_MACRO_REF_COLOR, ColorManager.MAKE_MACRO_REF_RGB);		
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsEditorPreferenceConstants.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsEditorPreferenceConstants.java
new file mode 100644
index 0000000..ec329af
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsEditorPreferenceConstants.java
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2005, 2007, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ * Red Hat Inc. - rename to use with Autotools editors
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+
+/**
+ * MakefileEditorPreferenceConstants
+ */
+public class AutotoolsEditorPreferenceConstants {
+
+	/**
+	 * 
+	 */
+	private AutotoolsEditorPreferenceConstants() {
+	}
+
+	/**
+	 * The symbolic names for colors for displaying code assist proposals
+	 * @see org.eclipse.jface.resource.ColorRegistry
+	 */
+	public static final String CURRENT_LINE_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.automake.currentLineHightlightColor"; //$NON-NLS-1$
+	public static final String LINE_NUMBER_RULER_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.automake.lineNumberForegroundColor"; //$NON-NLS-1$
+	public static final String PRINT_MARGIN_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.automake.printMarginColor"; //$NON-NLS-1$	
+	
+	/**
+	 * Preference key suffix for bold text style preference keys.
+	 * 
+	 */
+	public static final String EDITOR_BOLD_SUFFIX= "_bold"; //$NON-NLS-1$
+
+	/**
+	 * Preference key suffix for italic text style preference keys.
+	 */
+	public static final String EDITOR_ITALIC_SUFFIX= "_italic"; //$NON-NLS-1$
+
+
+	public static final String EDITOR_FOLDING_MACRODEF = "editor_folding_default_macrodef"; //$NON-NLS-1$
+
+	public static final String EDITOR_FOLDING_RULE = "editor_folding_default_rule"; //$NON-NLS-1$
+
+	public static final String EDITOR_FOLDING_CASE = "editor_folding_default_case"; //$NON-NLS-1$
+
+	public static final String EDITOR_FOLDING_CONDITIONAL = "editor_folding_default_conditional"; //$NON-NLS-1$
+
+	public static final String EDITOR_FOLDING_LOOP = "editor_folding_default_loop"; //$NON-NLS-1$
+
+	public static final String EDITOR_FOLDING_ENABLED = "editor_folding_enabled"; //$NON-NLS-1$
+	
+	public static final String AUTOCONF_VERSION = "autoconf_version";
+	
+	public static final String AUTOMAKE_VERSION = "automake_version";
+	
+	public static void initializeDefaultValues(IPreferenceStore store) {
+
+		store.setDefault(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_ENABLED, false);
+		store.setDefault(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_MACRODEF, false);
+		store.setDefault(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_RULE, true);
+		store.setDefault(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_CASE, true);
+		store.setDefault(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_CONDITIONAL, true);
+		store.setDefault(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_LOOP, true);
+		store.setDefault(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION, AutoconfEditorPreferencePage.LATEST_AC_VERSION);
+		store.setDefault(AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION, AutoconfEditorPreferencePage.LATEST_AM_VERSION);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencePage.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencePage.java
new file mode 100644
index 0000000..525657f
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencePage.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2006, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import org.eclipse.jface.preference.BooleanFieldEditor;
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+
+public class AutotoolsPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
+
+	private static final String PREF_BUILD_TARGET_IN_BACKGROUND = "MakeTargetPrefs.buildTargetInBackground"; //$NON-NLS-1$
+	private static final String TARGET_BUILDS_IN_BACKGROUND = "MakeTargetPreferencePage.buildTargetInBackground.label"; //$NON-NLS-1$
+
+	public AutotoolsPreferencePage() {
+		super(GRID);
+		setPreferenceStore(AutotoolsPlugin.getDefault().getPreferenceStore());
+	}
+
+	/**
+	 * @see FieldEditorPreferencePage#createControl(Composite)
+	 */
+	protected void createFieldEditors() {
+		Composite parent = getFieldEditorParent();
+
+		BooleanFieldEditor targetBackgroundEditor = new BooleanFieldEditor(PREF_BUILD_TARGET_IN_BACKGROUND,
+				AutotoolsUIPlugin.getResourceString(TARGET_BUILDS_IN_BACKGROUND), parent);
+		addField(targetBackgroundEditor);
+	}
+
+	public static boolean isBuildTargetInBackground() {
+		return AutotoolsPlugin.getDefault().getPreferenceStore().getBoolean(PREF_BUILD_TARGET_IN_BACKGROUND);
+	}
+
+	public static void setBuildTargetInBackground(boolean enable) {
+		AutotoolsPlugin.getDefault().getPreferenceStore().setValue(PREF_BUILD_TARGET_IN_BACKGROUND, enable);
+	}
+
+	/**
+	 * Initializes the default values of this page in the preference bundle.
+	 */
+	public static void initDefaults(IPreferenceStore prefs) {
+		prefs.setDefault(PREF_BUILD_TARGET_IN_BACKGROUND, true);
+	}
+
+	public void init(IWorkbench workbench) {
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencesMessages.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencesMessages.java
new file mode 100644
index 0000000..3f24110
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencesMessages.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+/**
+ * MakefilePreferencesMessages
+ */
+public class AutotoolsPreferencesMessages {
+
+	/**
+	 * 
+	 */
+	private AutotoolsPreferencesMessages() {
+	}
+
+	private static final String BUNDLE_NAME = AutotoolsPreferencesMessages.class.getName();
+
+	public static String getString(String key) {
+		try {
+			return ResourceBundle.getBundle(BUNDLE_NAME).getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		} catch (NullPointerException e) {
+			return '#' + key + '#';
+		}
+	}	
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencesMessages.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencesMessages.properties
new file mode 100644
index 0000000..40b5380
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencesMessages.properties
@@ -0,0 +1,108 @@
+###############################################################################
+# Copyright (c) 2000, 2006, 2007 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+#     Red Hat Inc.    - convert for usage with Automake and Autoconf editors
+###############################################################################
+
+AutomakeEditorPreferencePage.description=Automake Editor settings:
+AutomakeEditorPreferencePage.invalid_input_print_margin= Invalid print margin column specified
+AutomakeEditorPreferencePage.empty_input_print_margin= No print margin column specified
+AutomakeEditorPreferencePage.appearance=Appeara&nce
+AutomakeEditorPreferencePage.printMarginColumn=Print margin col&umn:
+AutomakeEditorPreferencePage.showOverviewRuler=Show overview &ruler
+AutomakeEditorPreferencePage.showLineNumbers=Show lin&e numbers
+AutomakeEditorPreferencePage.highlightCurrentLine=Hi&ghlight current line
+AutomakeEditorPreferencePage.showPrintMargin=Sho&w print margin
+AutomakeEditorPreferencePage.color=C&olor:
+AutomakeEditorPreferencePage.appearanceOptions=Appearance co&lor options:
+AutomakeEditorPreferencePage.lineNumberForegroundColor=Line number foreground
+AutomakeEditorPreferencePage.currentLineHighlighColor=Current line highlight
+AutomakeEditorPreferencePage.printMarginColor=Print margin
+AutomakeEditorPreferencePage.Makefile_editor_text_1=Text
+AutomakeEditorPreferencePage.Makefile_editor_processing_instuctions_2=Processing instructions
+AutomakeEditorPreferencePage.Makefile_editor_constMakefile_strings_3=ConstMakefile strings
+AutomakeEditorPreferencePage.Makefile_editor_tags_4=Tags
+AutomakeEditorPreferencePage.Makefile_editor_comments_5=Comments
+AutomakeEditorPreferencePage.tabwidth=Displayed &tab width:
+AutomakeEditorPreferencePage.notabwidth=No tab width specified
+AutomakeEditorPreferencePage.39=Invalid tab width specified
+AutomakeEditorPreferencePage.systemdefault=System de&fault
+AutomakeEditorPreferencePage.spacetabs=&Insert spaces for tabs when typing
+AutomakeEditorPreferencePage.foreground= Selection foreground color
+AutomakeEditorPreferencePage.background= Selection background color
+AutomakeEditorPreferencePage.syntax=Synta&x
+AutomakeEditorPreferencePage.backcolor=Background color
+AutomakeEditorPreferencePage.custom=C&ustom:
+AutomakeEditorPreferencePage.Foreground=Fore&ground:
+AutomakeEditorPreferencePage.bold=&Bold
+AutomakeEditorPreferencePage.italic=I&talic
+
+AutomakeEditorPreferencePage.folding= &Folding
+AutomakeEditorPreferencePage.foldingenable= Enable folding when &opening a new editor
+
+AutomakeEditorPreferencePage.makefile_editor_comment=comment
+AutomakeEditorPreferencePage.makefile_editor_macro_def=macro definition
+AutomakeEditorPreferencePage.makefile_editor_macro_ref=macro reference
+AutomakeEditorPreferencePage.makefile_editor_function=function
+AutomakeEditorPreferencePage.makefile_editor_keyword=keyword
+AutomakeEditorPreferencePage.makefile_editor_target=target
+AutomakeEditorPreferencePage.makefile_editor_default=default
+
+
+AutomakeSettingsPreferencePage.style=Style of Makefile
+AutomakeSettingsPreferencePage.path.label=Makefile include directories
+AutomakeSettingsPreferencePage.path.browse=directory
+
+AutoconfEditorPreferencePage.description=Autoconf Editor settings:
+AutoconfEditorPreferencePage.invalid_input_print_margin= Invalid print margin column specified
+AutoconfEditorPreferencePage.empty_input_print_margin= No print margin column specified
+AutoconfEditorPreferencePage.appearance=Appeara&nce
+AutoconfEditorPreferencePage.printMarginColumn=Print margin col&umn:
+AutoconfEditorPreferencePage.showOverviewRuler=Show overview &ruler
+AutoconfEditorPreferencePage.showLineNumbers=Show lin&e numbers
+AutoconfEditorPreferencePage.highlightCurrentLine=Hi&ghlight current line
+AutoconfEditorPreferencePage.showPrintMargin=Sho&w print margin
+AutoconfEditorPreferencePage.color=C&olor:
+AutoconfEditorPreferencePage.appearanceOptions=Appearance co&lor options:
+AutoconfEditorPreferencePage.lineNumberForegroundColor=Line number foreground
+AutoconfEditorPreferencePage.currentLineHighlighColor=Current line highlight
+AutoconfEditorPreferencePage.printMarginColor=Print margin
+AutoconfEditorPreferencePage.Makefile_editor_text_1=Text
+AutoconfEditorPreferencePage.Makefile_editor_processing_instuctions_2=Processing instructions
+AutoconfEditorPreferencePage.Makefile_editor_constMakefile_strings_3=ConstMakefile strings
+AutoconfEditorPreferencePage.Makefile_editor_tags_4=Tags
+AutoconfEditorPreferencePage.Makefile_editor_comments_5=Comments
+AutoconfEditorPreferencePage.tabwidth=Displayed &tab width:
+AutoconfEditorPreferencePage.notabwidth=No tab width specified
+AutoconfEditorPreferencePage.39=Invalid tab width specified
+AutoconfEditorPreferencePage.systemdefault=System de&fault
+AutoconfEditorPreferencePage.spacetabs=&Insert spaces for tabs when typing
+AutoconfEditorPreferencePage.foreground= Selection foreground color
+AutoconfEditorPreferencePage.background= Selection background color
+AutoconfEditorPreferencePage.syntax=Synta&x
+AutoconfEditorPreferencePage.backcolor=Background color
+AutoconfEditorPreferencePage.custom=C&ustom:
+AutoconfEditorPreferencePage.Foreground=Fore&ground:
+AutoconfEditorPreferencePage.bold=&Bold
+AutoconfEditorPreferencePage.italic=I&talic
+
+AutoconfEditorPreferencePage.folding= &Folding
+AutoconfEditorPreferencePage.foldingenable= Enable folding when &opening a new editor
+
+AutoconfEditorPreferencePage.version= &Version
+AutoconfEditorPreferencePage.autoconfVersion = Default version of Autoconf to use for syntax checking
+AutoconfEditorPreferencePage.automakeVersion = Default version of Automake to use for syntax checking
+AutoconfEditorPreferencePage.autoconf_editor_comment=comment
+AutoconfEditorPreferencePage.autoconf_editor_acmacro=autoconf macro
+AutoconfEditorPreferencePage.autoconf_editor_ammacro=automake macro
+AutoconfEditorPreferencePage.autoconf_editor_var_ref=variable reference
+AutoconfEditorPreferencePage.autoconf_editor_keyword=keyword
+AutoconfEditorPreferencePage.autoconf_editor_var_set=variable set
+AutoconfEditorPreferencePage.autoconf_editor_code_seq=inlined code sequence
+AutoconfEditorPreferencePage.autoconf_editor_default=default
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/ColorEditor.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/ColorEditor.java
new file mode 100644
index 0000000..fb4ff10
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/ColorEditor.java
@@ -0,0 +1,122 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.ColorDialog;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * A "button" of a certain color determined by the color picker
+ */
+public class ColorEditor {
+	
+	private Point fExtent;
+	Image fImage;
+	RGB fColorValue;
+	Color fColor;
+	Button fButton;
+	
+	public ColorEditor(Composite parent) {
+		
+		fButton= new Button(parent, SWT.PUSH);
+		fExtent= computeImageSize(parent);
+		fImage= new Image(parent.getDisplay(), fExtent.x, fExtent.y);
+		
+		GC gc= new GC(fImage);
+		gc.setBackground(fButton.getBackground());
+		gc.fillRectangle(0, 0, fExtent.x, fExtent.y);
+		gc.dispose();
+		
+		fButton.setImage(fImage);
+		fButton.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent event) {
+				ColorDialog colorDialog= new ColorDialog(fButton.getShell());
+				colorDialog.setRGB(fColorValue);
+				RGB newColor = colorDialog.open();
+				if (newColor != null) {
+					fColorValue= newColor;
+					updateColorImage();
+				}
+			}
+		});
+		
+		fButton.addDisposeListener(new DisposeListener() {
+			public void widgetDisposed(DisposeEvent event) {
+				if (fImage != null)  {
+					fImage.dispose();
+					fImage= null;
+				}
+				if (fColor != null) {
+					fColor.dispose();
+					fColor= null;
+				}
+			}
+		});
+	}
+	
+	public RGB getColorValue() {
+		return fColorValue;
+	}
+	
+	public void setColorValue(RGB rgb) {
+		fColorValue= rgb;
+		updateColorImage();
+	}
+	
+	public Button getButton() {
+		return fButton;
+	}
+	
+	protected void updateColorImage() {
+		
+		Display display= fButton.getDisplay();
+		
+		GC gc= new GC(fImage);
+		gc.setForeground(display.getSystemColor(SWT.COLOR_BLACK));
+		gc.drawRectangle(0, 2, fExtent.x - 1, fExtent.y - 4);
+		
+		if (fColor != null)
+			fColor.dispose();
+			
+		fColor= new Color(display, fColorValue);
+		gc.setBackground(fColor);
+		gc.fillRectangle(1, 3, fExtent.x - 2, fExtent.y - 5);
+		gc.dispose();
+		
+		fButton.setImage(fImage);
+	}
+	
+	protected Point computeImageSize(Control window) {
+		GC gc= new GC(window);
+		Font f= JFaceResources.getFontRegistry().get(JFaceResources.DEFAULT_FONT);
+		gc.setFont(f);
+		int height= gc.getFontMetrics().getHeight();
+		gc.dispose();
+		Point p= new Point(height * 3 - 6, height);
+		return p;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/ColorManager.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/ColorManager.java
new file mode 100644
index 0000000..726af8d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/ColorManager.java
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.eclipse.jface.text.source.ISharedTextColors;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.widgets.Display;
+
+public class ColorManager implements ISharedTextColors {
+
+	public static final String MAKE_COMMENT_COLOR ="org.eclipse.linuxtools.cdt.autotools.ui.automake.editor.comment"; //$NON-NLS-1$
+	public static final String MAKE_KEYWORD_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.automake.editor.keyword"; //$NON-NLS-1$
+	public static final String MAKE_FUNCTION_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.automake.editor.function"; //$NON-NLS-1$
+	public static final String MAKE_MACRO_REF_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.automake.editor.macro_ref"; //$NON-NLS-1$
+	public static final String MAKE_MACRO_DEF_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.automake.editor.macro_def"; //$NON-NLS-1$
+	public static final String MAKE_DEFAULT_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.automake.editor.default"; //$NON-NLS-1$
+
+	public static final String AUTOCONF_COMMENT_COLOR ="org.eclipse.linuxtools.cdt.autotools.ui.autoconf.editor.comment"; //$NON-NLS-1$
+	public static final String AUTOCONF_KEYWORD_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.autoconf.editor.keyword"; //$NON-NLS-1$
+	public static final String AUTOCONF_VAR_REF_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.autoconf.editor.var_ref"; //$NON-NLS-1$
+	public static final String AUTOCONF_VAR_SET_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.autoconf.editor.var_set"; //$NON-NLS-1$
+	public static final String AUTOCONF_ACMACRO_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.autoconf.editor.acmacro"; //$NON-NLS-1$
+	public static final String AUTOCONF_AMMACRO_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.autoconf.editor.ammacro"; //$NON-NLS-1$
+	public static final String AUTOCONF_CODESEQ_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.autoconf.editor.codeseq"; //$NON-NLS-1$
+	public static final String AUTOCONF_DEFAULT_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.autoconf.editor.default"; //$NON-NLS-1$
+
+	public static final RGB MAKE_COMMENT_RGB = new RGB(128, 0, 0);
+	public static final RGB MAKE_KEYWORD_RGB = new RGB(128, 255, 0);
+	public static final RGB MAKE_FUNCTION_RGB = new RGB(128, 0, 128);
+	public static final RGB MAKE_MACRO_DEF_RGB = new RGB(0, 0, 128);
+	public static final RGB MAKE_MACRO_REF_RGB = new RGB(0, 128, 0);
+	public static final RGB MAKE_DEFAULT_RGB = new RGB(0, 0, 0);
+
+	public static final RGB AUTOCONF_COMMENT_RGB = new RGB(63, 95, 191);
+	public static final RGB AUTOCONF_KEYWORD_RGB = new RGB(127, 0, 85);
+	public static final RGB AUTOCONF_VAR_REF_RGB = new RGB(128, 0, 0);
+	public static final RGB AUTOCONF_VAR_SET_RGB = new RGB(255, 101, 52);
+	public static final RGB AUTOCONF_ACMACRO_RGB = new RGB(0, 0, 128);
+	public static final RGB AUTOCONF_AMMACRO_RGB = new RGB(0, 128, 0);
+	public static final RGB AUTOCONF_CODESEQ_RGB = new RGB(0, 100, 0);
+	public static final RGB AUTOCONF_DEFAULT_RGB = new RGB(0, 0, 0);
+
+	private static ColorManager fgColorManager;
+	
+	private ColorManager() {
+	}
+	
+	public static ColorManager getDefault() {
+		if (fgColorManager == null) {
+			fgColorManager= new ColorManager();
+		}
+		return fgColorManager;
+	}
+
+	protected Map<RGB, Color> fColorTable = new HashMap<RGB, Color>(10);
+
+	/**
+	 * @see IMakefileColorManager#dispose()
+	 */
+	public void dispose() {
+		Iterator<Color> e = fColorTable.values().iterator();
+		while (e.hasNext())
+			 ((Color) e.next()).dispose();
+	}
+
+	/**
+	 * @see IMakefileColorManager#getColor(RGB)
+	 */
+	public Color getColor(RGB rgb) {
+		Color color = (Color) fColorTable.get(rgb);
+		if (color == null) {
+			color = new Color(Display.getCurrent(), rgb);
+			fColorTable.put(rgb, color);
+		}
+		return color;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/OverlayPreferenceStore.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/OverlayPreferenceStore.java
new file mode 100644
index 0000000..3c6a672
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/OverlayPreferenceStore.java
@@ -0,0 +1,455 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferenceStore;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.PropertyChangeEvent;
+
+/**
+ * OverlayPreferenceStore
+ */
+/**
+ * An overlaying preference store.
+ */
+class OverlayPreferenceStore  implements IPreferenceStore {
+	
+	
+	public static final class TypeDescriptor {
+		TypeDescriptor() {
+		}
+	}
+	
+	public static final TypeDescriptor BOOLEAN= new TypeDescriptor();
+	public static final TypeDescriptor DOUBLE= new TypeDescriptor();
+	public static final TypeDescriptor FLOAT= new TypeDescriptor();
+	public static final TypeDescriptor INT= new TypeDescriptor();
+	public static final TypeDescriptor LONG= new TypeDescriptor();
+	public static final TypeDescriptor STRING= new TypeDescriptor();
+	
+	public static class OverlayKey {
+		
+		TypeDescriptor fDescriptor;
+		String fKey;
+		
+		public OverlayKey(TypeDescriptor descriptor, String key) {
+			fDescriptor= descriptor;
+			fKey= key;
+		}
+	}
+	
+	private class PropertyListener implements IPropertyChangeListener {
+				
+		/*
+		 * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent)
+		 */
+		public void propertyChange(PropertyChangeEvent event) {
+			OverlayKey key= findOverlayKey(event.getProperty());
+			if (key != null)
+				propagateProperty(fParent, key, fStore); 
+		}
+	}
+	
+	
+	IPreferenceStore fParent;
+	IPreferenceStore fStore;
+	private OverlayKey[] fOverlayKeys;
+	
+	private PropertyListener fPropertyListener;
+	
+	
+	public OverlayPreferenceStore(IPreferenceStore parent, OverlayKey[] overlayKeys) {
+		fParent= parent;
+		fOverlayKeys= overlayKeys;
+		fStore= new PreferenceStore();
+	}
+	
+	OverlayKey findOverlayKey(String key) {
+		for (int i= 0; i < fOverlayKeys.length; i++) {
+			if (fOverlayKeys[i].fKey.equals(key))
+				return fOverlayKeys[i];
+		}
+		return null;
+	}
+	
+	private boolean covers(String key) {
+		return (findOverlayKey(key) != null);
+	}
+	
+	void propagateProperty(IPreferenceStore orgin, OverlayKey key, IPreferenceStore target) {
+		
+		if (orgin.isDefault(key.fKey)) {
+			if (!target.isDefault(key.fKey))
+				target.setToDefault(key.fKey);
+			return;
+		}
+		
+		TypeDescriptor d= key.fDescriptor;
+		if (BOOLEAN == d) {
+			
+			boolean originValue= orgin.getBoolean(key.fKey);
+			boolean targetValue= target.getBoolean(key.fKey);
+			if (targetValue != originValue)
+				target.setValue(key.fKey, originValue);
+				
+		} else if (DOUBLE == d) {
+			
+			double originValue= orgin.getDouble(key.fKey);
+			double targetValue= target.getDouble(key.fKey);
+			if (targetValue != originValue)
+				target.setValue(key.fKey, originValue);
+		
+		} else if (FLOAT == d) {
+			
+			float originValue= orgin.getFloat(key.fKey);
+			float targetValue= target.getFloat(key.fKey);
+			if (targetValue != originValue)
+				target.setValue(key.fKey, originValue);
+				
+		} else if (INT == d) {
+
+			int originValue= orgin.getInt(key.fKey);
+			int targetValue= target.getInt(key.fKey);
+			if (targetValue != originValue)
+				target.setValue(key.fKey, originValue);
+
+		} else if (LONG == d) {
+
+			long originValue= orgin.getLong(key.fKey);
+			long targetValue= target.getLong(key.fKey);
+			if (targetValue != originValue)
+				target.setValue(key.fKey, originValue);
+
+		} else if (STRING == d) {
+
+			String originValue= orgin.getString(key.fKey);
+			String targetValue= target.getString(key.fKey);
+			if (targetValue != null && originValue != null && !targetValue.equals(originValue))
+				target.setValue(key.fKey, originValue);
+
+		}
+	}
+	
+	public void propagate() {
+		for (int i= 0; i < fOverlayKeys.length; i++)
+			propagateProperty(fStore, fOverlayKeys[i], fParent);
+	}
+	
+	private void loadProperty(IPreferenceStore orgin, OverlayKey key, IPreferenceStore target, boolean forceInitialization) {
+		TypeDescriptor d= key.fDescriptor;
+		if (BOOLEAN == d) {
+			
+			if (forceInitialization)
+				target.setValue(key.fKey, true);
+			target.setValue(key.fKey, orgin.getBoolean(key.fKey));
+			target.setDefault(key.fKey, orgin.getDefaultBoolean(key.fKey));
+			
+		} else if (DOUBLE == d) {
+			
+			if (forceInitialization)
+				target.setValue(key.fKey, 1.0D);
+			target.setValue(key.fKey, orgin.getDouble(key.fKey));
+			target.setDefault(key.fKey, orgin.getDefaultDouble(key.fKey));
+			
+		} else if (FLOAT == d) {
+			
+			if (forceInitialization)
+				target.setValue(key.fKey, 1.0F);
+			target.setValue(key.fKey, orgin.getFloat(key.fKey));
+			target.setDefault(key.fKey, orgin.getDefaultFloat(key.fKey));
+			
+		} else if (INT == d) {
+			
+			if (forceInitialization)
+				target.setValue(key.fKey, 1);
+			target.setValue(key.fKey, orgin.getInt(key.fKey));
+			target.setDefault(key.fKey, orgin.getDefaultInt(key.fKey));
+			
+		} else if (LONG == d) {
+			
+			if (forceInitialization)
+				target.setValue(key.fKey, 1L);
+			target.setValue(key.fKey, orgin.getLong(key.fKey));
+			target.setDefault(key.fKey, orgin.getDefaultLong(key.fKey));
+			
+		} else if (STRING == d) {
+			
+			if (forceInitialization)
+				target.setValue(key.fKey, "1"); //$NON-NLS-1$
+			target.setValue(key.fKey, orgin.getString(key.fKey));
+			target.setDefault(key.fKey, orgin.getDefaultString(key.fKey));
+			
+		}
+	}
+	
+	public void load() {
+		for (int i= 0; i < fOverlayKeys.length; i++)
+			loadProperty(fParent, fOverlayKeys[i], fStore, true);
+	}
+	
+	public void loadDefaults() {
+		for (int i= 0; i < fOverlayKeys.length; i++)
+			setToDefault(fOverlayKeys[i].fKey);
+	}
+	
+	public void start() {
+		if (fPropertyListener == null) {
+			fPropertyListener= new PropertyListener();
+			fParent.addPropertyChangeListener(fPropertyListener);
+		}
+	}
+	
+	public void stop() {
+		if (fPropertyListener != null)  {
+			fParent.removePropertyChangeListener(fPropertyListener);
+			fPropertyListener= null;
+		}
+	}
+	
+	/*
+	 * @see IPreferenceStore#addPropertyChangeListener(IPropertyChangeListener)
+	 */
+	public void addPropertyChangeListener(IPropertyChangeListener listener) {
+		fStore.addPropertyChangeListener(listener);
+	}
+	
+	/*
+	 * @see IPreferenceStore#removePropertyChangeListener(IPropertyChangeListener)
+	 */
+	public void removePropertyChangeListener(IPropertyChangeListener listener) {
+		fStore.removePropertyChangeListener(listener);
+	}
+	
+	/*
+	 * @see IPreferenceStore#firePropertyChangeEvent(String, Object, Object)
+	 */
+	public void firePropertyChangeEvent(String name, Object oldValue, Object newValue) {
+		fStore.firePropertyChangeEvent(name, oldValue, newValue);
+	}
+
+	/*
+	 * @see IPreferenceStore#contains(String)
+	 */
+	public boolean contains(String name) {
+		return fStore.contains(name);
+	}
+	
+	/*
+	 * @see IPreferenceStore#getBoolean(String)
+	 */
+	public boolean getBoolean(String name) {
+		return fStore.getBoolean(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDefaultBoolean(String)
+	 */
+	public boolean getDefaultBoolean(String name) {
+		return fStore.getDefaultBoolean(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDefaultDouble(String)
+	 */
+	public double getDefaultDouble(String name) {
+		return fStore.getDefaultDouble(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDefaultFloat(String)
+	 */
+	public float getDefaultFloat(String name) {
+		return fStore.getDefaultFloat(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDefaultInt(String)
+	 */
+	public int getDefaultInt(String name) {
+		return fStore.getDefaultInt(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDefaultLong(String)
+	 */
+	public long getDefaultLong(String name) {
+		return fStore.getDefaultLong(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDefaultString(String)
+	 */
+	public String getDefaultString(String name) {
+		return fStore.getDefaultString(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDouble(String)
+	 */
+	public double getDouble(String name) {
+		return fStore.getDouble(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getFloat(String)
+	 */
+	public float getFloat(String name) {
+		return fStore.getFloat(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getInt(String)
+	 */
+	public int getInt(String name) {
+		return fStore.getInt(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getLong(String)
+	 */
+	public long getLong(String name) {
+		return fStore.getLong(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getString(String)
+	 */
+	public String getString(String name) {
+		return fStore.getString(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#isDefault(String)
+	 */
+	public boolean isDefault(String name) {
+		return fStore.isDefault(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#needsSaving()
+	 */
+	public boolean needsSaving() {
+		return fStore.needsSaving();
+	}
+
+	/*
+	 * @see IPreferenceStore#putValue(String, String)
+	 */
+	public void putValue(String name, String value) {
+		if (covers(name))
+			fStore.putValue(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setDefault(String, double)
+	 */
+	public void setDefault(String name, double value) {
+		if (covers(name))
+			fStore.setDefault(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setDefault(String, float)
+	 */
+	public void setDefault(String name, float value) {
+		if (covers(name))
+			fStore.setDefault(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setDefault(String, int)
+	 */
+	public void setDefault(String name, int value) {
+		if (covers(name))
+			fStore.setDefault(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setDefault(String, long)
+	 */
+	public void setDefault(String name, long value) {
+		if (covers(name))
+			fStore.setDefault(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setDefault(String, String)
+	 */
+	public void setDefault(String name, String value) {
+		if (covers(name))
+			fStore.setDefault(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setDefault(String, boolean)
+	 */
+	public void setDefault(String name, boolean value) {
+		if (covers(name))
+			fStore.setDefault(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setToDefault(String)
+	 */
+	public void setToDefault(String name) {
+		fStore.setToDefault(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#setValue(String, double)
+	 */
+	public void setValue(String name, double value) {
+		if (covers(name))
+			fStore.setValue(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setValue(String, float)
+	 */
+	public void setValue(String name, float value) {
+		if (covers(name))
+			fStore.setValue(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setValue(String, int)
+	 */
+	public void setValue(String name, int value) {
+		if (covers(name))
+			fStore.setValue(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setValue(String, long)
+	 */
+	public void setValue(String name, long value) {
+		if (covers(name))
+			fStore.setValue(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setValue(String, String)
+	 */
+	public void setValue(String name, String value) {
+		if (covers(name))
+			fStore.setValue(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setValue(String, boolean)
+	 */
+	public void setValue(String name, boolean value) {
+		if (covers(name))
+			fStore.setValue(name, value);
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/StatusInfo.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/StatusInfo.java
new file mode 100644
index 0000000..d01fc66
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/StatusInfo.java
@@ -0,0 +1,173 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+
+
+/**
+ * A settable IStatus.
+ * Can be an error, warning, info or ok. For error, info and warning states,
+ * a message describes the problem.
+ */
+public class StatusInfo implements IStatus {
+
+	private String fStatusMessage;
+	private int fSeverity;
+
+	/**
+	 * Creates a status set to OK (no message)
+	 */
+	public StatusInfo() {
+		this(OK, null);
+	}
+
+	/**
+	 * Creates a status .
+	 * @param severity The status severity: ERROR, WARNING, INFO and OK.
+	 * @param message The message of the status. Applies only for ERROR,
+	 * WARNING and INFO.
+	 */
+	public StatusInfo(int severity, String message) {
+		fStatusMessage= message;
+		fSeverity= severity;
+	}
+
+	/**
+	 *  Returns if the status' severity is OK.
+	 */
+	public boolean isOK() {
+		return fSeverity == IStatus.OK;
+	}
+
+	/**
+	 *  Returns if the status' severity is WARNING.
+	 */
+	public boolean isWarning() {
+		return fSeverity == IStatus.WARNING;
+	}
+
+	/**
+	 *  Returns if the status' severity is INFO.
+	 */
+	public boolean isInfo() {
+		return fSeverity == IStatus.INFO;
+	}
+
+	/**
+	 *  Returns if the status' severity is ERROR.
+	 */
+	public boolean isError() {
+		return fSeverity == IStatus.ERROR;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.runtime.IStatus#getMessage()
+	 */
+	public String getMessage() {
+		return fStatusMessage;
+	}
+
+	/**
+	 * Sets the status to ERROR.
+	 * @param errorMessage The error message (can be empty, but not null)
+	 */
+	public void setError(String errorMessage) {
+		Assert.isNotNull(errorMessage);
+		fStatusMessage= errorMessage;
+		fSeverity= IStatus.ERROR;
+	}
+
+	/**
+	 * Sets the status to WARNING.
+	 * @param warningMessage The warning message (can be empty, but not null)
+	 */
+	public void setWarning(String warningMessage) {
+		Assert.isNotNull(warningMessage);
+		fStatusMessage= warningMessage;
+		fSeverity= IStatus.WARNING;
+	}
+
+	/**
+	 * Sets the status to INFO.
+	 * @param infoMessage The info message (can be empty, but not null)
+	 */
+	public void setInfo(String infoMessage) {
+		Assert.isNotNull(infoMessage);
+		fStatusMessage= infoMessage;
+		fSeverity= IStatus.INFO;
+	}
+
+	/**
+	 * Sets the status to OK.
+	 */
+	public void setOK() {
+		fStatusMessage= null;
+		fSeverity= IStatus.OK;
+	}
+
+	/*
+	 * @see IStatus#matches(int)
+	 */
+	public boolean matches(int severityMask) {
+		return (fSeverity & severityMask) != 0;
+	}
+
+	/**
+	 * Returns always <code>false</code>.
+	 * @see IStatus#isMultiStatus()
+	 */
+	public boolean isMultiStatus() {
+		return false;
+	}
+
+	/*
+	 * @see IStatus#getSeverity()
+	 */
+	public int getSeverity() {
+		return fSeverity;
+	}
+
+	/*
+	 * @see IStatus#getPlugin()
+	 */
+	public String getPlugin() {
+		return AutotoolsUIPlugin.getPluginId();
+	}
+
+	/**
+	 * Returns always <code>null</code>.
+	 * @see IStatus#getException()
+	 */
+	public Throwable getException() {
+		return null;
+	}
+
+	/**
+	 * Returns always the error severity.
+	 * @see IStatus#getCode()
+	 */
+	public int getCode() {
+		return fSeverity;
+	}
+
+	/**
+	 * Returns always <code>null</code>.
+	 * @see IStatus#getChildren()
+	 */
+	public IStatus[] getChildren() {
+		return new IStatus[0];
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/TabFolderLayout.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/TabFolderLayout.java
new file mode 100644
index 0000000..bda23b8
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/TabFolderLayout.java
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Layout;
+
+public class TabFolderLayout extends Layout {
+
+	protected Point computeSize (Composite composite, int wHint, int hHint, boolean flushCache) {
+		if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT)
+			return new Point(wHint, hHint);
+			
+		Control [] children = composite.getChildren ();
+		int count = children.length;
+		int maxWidth = 0, maxHeight = 0;
+		for (int i=0; i<count; i++) {
+			Control child = children [i];
+			Point pt = child.computeSize (SWT.DEFAULT, SWT.DEFAULT, flushCache);
+			maxWidth = Math.max (maxWidth, pt.x);
+			maxHeight = Math.max (maxHeight, pt.y);
+		}
+		
+		if (wHint != SWT.DEFAULT)
+			maxWidth= wHint;
+		if (hHint != SWT.DEFAULT)
+			maxHeight= hHint;
+		
+		return new Point(maxWidth, maxHeight);	
+		
+	}
+	
+	protected void layout (Composite composite, boolean flushCache) {
+		Rectangle rect= composite.getClientArea();
+	
+		Control[] children = composite.getChildren();
+		for (int i = 0; i < children.length; i++) {
+			children[i].setBounds(rect);
+		}
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AbstractConfigurePropertyOptionsPage.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AbstractConfigurePropertyOptionsPage.java
new file mode 100644
index 0000000..f844dd9
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AbstractConfigurePropertyOptionsPage.java
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import org.eclipse.jface.preference.FieldEditor;
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.util.PropertyChangeEvent;
+
+public abstract class AbstractConfigurePropertyOptionsPage extends
+		FieldEditorPreferencePage {
+
+	private boolean dirty = false;
+	private String name;
+
+	protected AbstractConfigurePropertyOptionsPage(String name) {
+		this(GRID);
+		this.name = name;
+	}
+	
+	protected String getName() {
+		return name;
+	}
+	
+	protected AbstractConfigurePropertyOptionsPage(int style) {
+		super(style);
+		noDefaultAndApplyButton();
+	}
+	
+	@Override
+	protected void createFieldEditors() {
+		// Get the preference store for the build settings
+		IPreferenceStore settings = getConfigurePrefStore();
+		setPreferenceStore(settings);
+	}
+
+	/**
+	 * Return the tool settings preference store
+	 */
+	protected AutotoolsConfigurePrefStore getConfigurePrefStore() {
+		return AutotoolsConfigurePrefStore.getInstance();	
+	}
+
+	/**
+	 * Method called when the value of a dialog field changes
+	 */
+	public void propertyChange(PropertyChangeEvent event) {
+	    super.propertyChange(event);
+		if (event.getProperty().equals(FieldEditor.VALUE)) {
+		    setDirty(true);
+		}
+	}
+
+	public void setDirty(boolean b) {  dirty = b; }
+	public boolean isDirty() { return dirty; }
+	public void storeSettings() { super.performOk(); }
+
+	public abstract void updateFields();
+	public abstract void setValues();
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java
new file mode 100644
index 0000000..3ec1077
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java
@@ -0,0 +1,241 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import org.eclipse.cdt.core.settings.model.ICResourceDescription;
+import org.eclipse.cdt.managedbuilder.ui.properties.AbstractCBuildPropertyTab;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+
+public class AutotoolsBuildPropertyPage extends AbstractCBuildPropertyTab {
+
+	private String TRUE = "true"; // $NON-NLS-1$
+	private String FALSE = "false"; // $NON-NLS-1$
+	private String CLEAN_DELETE_LABEL = "CleanDelete.label"; // $NON-NLS-1$
+	private String CLEAN_MAKE_LABEL = "CleanMake.label"; // $NON-NLS-1$
+	private String CLEAN_MAKETARGET_LABEL = "CleanMakeTarget.label"; // $NON-NLS-1$
+	private String CLEAN_MAKETARGET_TOOLTIP = "CleanMakeTarget.tooltip"; // $NON-NLS-1$
+	private String AUTO_BUILDNAME_LABEL = "AutoBuildName.label"; // $NON-NLS-1$
+	private String AUTO_BUILDNAME_TOOLTIP = "AutoBuildName.tooltip"; // $NON-NLS-1$
+	
+	protected Button fCleanDelete;
+	protected Button fCleanMake;
+	protected Button fAutoName;
+	protected Text   fCleanMakeTarget;
+
+	private IProject getProject() {
+		return (IProject)getCfg().getManagedProject().getOwner();
+	}
+
+	public boolean canBeVisible() {
+		return AutotoolsPlugin.hasTargetBuilder(getProject());
+	}
+
+	public void createControls(Composite parent) {
+		super.createControls(parent);
+		Composite composite= usercomp;
+		// assume parent page uses griddata
+		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_FILL | GridData.FILL_HORIZONTAL);
+		composite.setLayoutData(gd);
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 2;
+		//PixelConverter pc= new PixelConverter(composite);
+		//layout.verticalSpacing= pc.convertHeightInCharsToPixels(1) / 2;
+		composite.setLayout(layout);
+		
+		Group g = new Group(composite, SWT.SHADOW_ETCHED_IN);
+		g.setText(AutotoolsPropertyMessages.getString("CleanBehavior.title"));
+		gd = new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan = 2;
+		g.setLayoutData(gd);
+		layout= new GridLayout();
+		layout.numColumns= 2;
+		g.setLayout(layout);
+		
+		fCleanDelete = new Button(g, SWT.RADIO);
+		fCleanDelete.setText(AutotoolsPropertyMessages.getString(CLEAN_DELETE_LABEL));
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		gd.horizontalSpan = 2;
+		fCleanDelete.setLayoutData(gd);
+		fCleanMake = new Button(g, SWT.RADIO);
+		fCleanMake.setText(AutotoolsPropertyMessages.getString(CLEAN_MAKE_LABEL));
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		gd.horizontalSpan = 2;
+		fCleanMake.setLayoutData(gd);
+		
+		Label label = new Label(g, SWT.LEFT);
+		label.setText(AutotoolsPropertyMessages.getString(CLEAN_MAKETARGET_LABEL));
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label.setLayoutData(gd);
+		
+		fCleanMakeTarget = new Text(g, SWT.SINGLE | SWT.BORDER);
+		fCleanMakeTarget.setText(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET_DEFAULT);
+		fCleanMakeTarget.setToolTipText(AutotoolsPropertyMessages.getString(CLEAN_MAKETARGET_TOOLTIP));
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fCleanMakeTarget.setLayoutData(gd);
+		
+		fCleanDelete.addSelectionListener(new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				fCleanMake.setSelection(false);
+				fCleanDelete.setSelection(true);
+				fCleanMakeTarget.setEnabled(false);
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// do nothing
+			}
+		});
+		
+		fCleanMake.addSelectionListener(new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				fCleanDelete.setSelection(false);
+				fCleanMake.setSelection(true);
+				fCleanMakeTarget.setEnabled(true);
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// do nothing
+			}
+		});
+		
+		fCleanMakeTarget.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				if (fCleanMakeTarget.getText().equals("")) { // $NON-NLS-1$
+					// FIXME: should probably issue warning here, but how?
+				}
+			}
+		});
+		
+		fAutoName = new Button(composite, SWT.LEFT | SWT.CHECK);
+		fAutoName.setText(AutotoolsPropertyMessages.getString(AUTO_BUILDNAME_LABEL));
+		fAutoName.setToolTipText(AutotoolsPropertyMessages.getString(AUTO_BUILDNAME_TOOLTIP));
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		gd.horizontalSpan = 2;
+		fAutoName.setLayoutData(gd);
+		
+		initialize();
+	}
+
+	protected void performOK() {
+		IProject project = getProject();
+		if (fCleanDelete.getSelection()) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE, TRUE); 
+			} catch (CoreException ce) {
+				// FIXME: what can we do here?
+			}
+		} else {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE, FALSE);
+			} catch (CoreException ce) {
+				// FIXME: what can we do here?
+			}
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET, fCleanMakeTarget.getText());
+			} catch (CoreException ce) {
+				// FIXME: what can we do here?
+			}
+		}
+		
+		if (fAutoName.getSelection()) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTO_BUILD_NAME, TRUE); 
+			} catch (CoreException ce) {
+				// FIXME: what can we do here?
+			}
+		} else {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTO_BUILD_NAME, FALSE);
+			} catch (CoreException ce) {
+				// FIXME: what can we do here?
+			}
+		}
+
+	}
+
+	protected void performApply(ICResourceDescription src, ICResourceDescription dst) {
+		performOK();
+	}
+	
+	protected void performDefaults() {
+		fCleanDelete.setSelection(false);
+		fCleanMake.setSelection(true);
+		fCleanMakeTarget.setText(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET_DEFAULT);
+		fCleanMakeTarget.setEnabled(true);
+		fAutoName.setEnabled(true);
+	}
+	
+	public void updateData(ICResourceDescription cfgd) {
+		// what to do here?
+	}
+	
+	public void updateButtons() {
+		// what to do here?
+	}
+
+	public void setVisible (boolean b) {
+		super.setVisible(b);
+	}
+
+	private void initialize() {
+		IProject project = getProject();
+		String cleanDelete = null;
+		String autoName = null;
+		String cleanMakeTarget = null;
+		try {
+			cleanDelete = project.getPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE);
+			cleanMakeTarget = project.getPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET);
+			autoName = project.getPersistentProperty(AutotoolsPropertyConstants.AUTO_BUILD_NAME);
+		} catch (CoreException e) {
+			// do nothing
+		}
+
+		if (cleanMakeTarget == null) {
+			cleanMakeTarget = AutotoolsPropertyConstants.CLEAN_MAKE_TARGET_DEFAULT;
+		}
+		fCleanMakeTarget.setText(cleanMakeTarget);
+
+		if (cleanDelete == null || cleanDelete.equals(FALSE)) {
+			fCleanDelete.setSelection(false);
+			fCleanMake.setSelection(true);
+			fCleanMakeTarget.setEnabled(true);
+		} else {
+			fCleanDelete.setSelection(true);
+			fCleanMake.setSelection(false);
+			fCleanMakeTarget.setEnabled(false);
+		}
+		
+		if (autoName == null || autoName.equals(TRUE))
+			fAutoName.setSelection(true);
+		else
+			fAutoName.setSelection(false);
+	}
+	
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsCategoryPropertyOptionPage.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsCategoryPropertyOptionPage.java
new file mode 100644
index 0000000..452fa18
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsCategoryPropertyOptionPage.java
@@ -0,0 +1,139 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import java.util.ArrayList;
+
+import org.eclipse.jface.preference.BooleanFieldEditor;
+import org.eclipse.jface.preference.FieldEditor;
+import org.eclipse.jface.preference.StringFieldEditor;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsConfiguration;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IAConfiguration;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IConfigureOption;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+
+public class AutotoolsCategoryPropertyOptionPage extends
+		AbstractConfigurePropertyOptionsPage {
+
+	private String catName = "";
+	private IAConfiguration cfg;
+	//  Label class for a preference page.
+	class LabelFieldEditor extends FieldEditor {
+		private String fTitle;
+		private Label fTitleLabel;
+
+		public LabelFieldEditor( Composite parent, String title ) {
+			fTitle = title;
+			this.createControl( parent );
+		}
+
+		protected void adjustForNumColumns( int numColumns ) {
+			((GridData)fTitleLabel.getLayoutData()).horizontalSpan = 2;
+		}
+
+		protected void doFillIntoGrid( Composite parent, int numColumns ) {
+			fTitleLabel = new Label( parent, SWT.WRAP );
+			fTitleLabel.setText( fTitle );
+			GridData gd = new GridData();
+			gd.verticalAlignment = SWT.TOP;
+			gd.grabExcessHorizontalSpace = false;
+			gd.horizontalSpan = 2;
+			fTitleLabel.setLayoutData( gd );
+		}
+
+		public int getNumberOfControls() {	return 1; }
+		/**
+		 * The label field editor is only used to present a text label on a preference page.
+		 */
+		protected void doLoad() {}
+		protected void doLoadDefault() {}
+		protected void doStore() {}
+	}
+	
+	private ArrayList<FieldEditor> fieldEditors;
+	
+	public AutotoolsCategoryPropertyOptionPage(ToolListElement element, IAConfiguration cfg) {
+ 		super(element.getName());
+ 		this.catName = element.getName();
+ 		this.cfg = cfg;
+ 		fieldEditors = new ArrayList<FieldEditor>();
+	}
+
+	public String getName() {
+		return super.getName();
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors()
+	 */
+	protected void createFieldEditors() {
+		super.createFieldEditors();
+		Composite parent = getFieldEditorParent();
+//		FontMetrics fm = AbstractCPropertyTab.getFontMetrics(parent);
+		AutotoolsConfiguration.Option[] options = AutotoolsConfiguration.getChildOptions(catName);
+		for (int i = 0; i < options.length; ++i) {
+			AutotoolsConfiguration.Option option = options[i];
+			switch (option.getType()) {
+			case IConfigureOption.STRING:
+			case IConfigureOption.INTERNAL:
+			case IConfigureOption.MULTIARG:
+				parent = getFieldEditorParent();
+				StringFieldEditor f = new StringFieldEditor(option.getName(), option.getDescription(), 20, parent);
+				f.getLabelControl(parent).setToolTipText(option.getToolTip());
+				addField(f);
+				fieldEditors.add(f);
+				break;
+			case IConfigureOption.BIN:
+				parent = getFieldEditorParent();
+				BooleanFieldEditor b = new BooleanFieldEditor(option.getName(), option.getDescription(), parent);
+				b.getDescriptionControl(parent).setToolTipText(option.getToolTip());
+				addField(b);
+				fieldEditors.add(b);
+				break;
+			}
+		}
+	}
+
+	protected FieldEditor createLabelEditor( Composite parent, String title ) {
+		return new LabelFieldEditor( parent, title );
+	}
+
+	/**
+	 * Update the field editor that displays all the build options
+	 */
+	public void updateFields() {
+		setValues();
+	}
+	
+	public void setValues() {
+		for (int i = 0; i < fieldEditors.size(); ++i) {
+			fieldEditors.get(i).load();
+		}
+	}
+	
+	public void propertyChange(PropertyChangeEvent event) {
+		// allow superclass to handle as well
+		super.propertyChange(event);
+
+		if (event.getSource() instanceof StringFieldEditor) {
+			StringFieldEditor f = (StringFieldEditor)event.getSource();
+			cfg.setOption(f.getPreferenceName(), f.getStringValue());
+		} else if (event.getSource() instanceof BooleanFieldEditor) {
+			BooleanFieldEditor b = (BooleanFieldEditor)event.getSource();
+			cfg.setOption(b.getPreferenceName(), Boolean.toString(b.getBooleanValue()));
+		}
+	}
+	
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePrefStore.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePrefStore.java
new file mode 100644
index 0000000..6c3c667
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePrefStore.java
@@ -0,0 +1,283 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import org.eclipse.core.runtime.ListenerList;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IAConfiguration;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IConfigureOption;
+
+/**
+ * @author jjohnstn
+ *
+ */
+public class AutotoolsConfigurePrefStore implements IPreferenceStore {
+
+	public final static String EMPTY_STRING = new String();
+	public final static String ALL_OPTIONS_ID = EMPTY_STRING;
+	
+	private static AutotoolsConfigurePrefStore instance = null;
+	private ToolListElement selectedElement;
+	private IAConfiguration cfg;
+	private ListenerList listenerList;
+	private boolean isdirty;
+
+	private AutotoolsConfigurePrefStore() {
+		// private constructor
+	}
+	
+	public static AutotoolsConfigurePrefStore getInstance() {
+		if (instance == null)
+			instance = new AutotoolsConfigurePrefStore();
+		return instance;
+	}
+	
+	public void setSelection(IAConfiguration cfg, ToolListElement element) {
+		this.cfg = cfg;
+		selectedElement = element;
+	}
+	
+	/* (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jface.preference.IPreferenceStore#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener)
+	 */
+	public void addPropertyChangeListener(IPropertyChangeListener listener) {
+		listenerList.add(listener);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#contains(java.lang.String)
+	 */
+	public boolean contains(String name) {
+		return cfg.getOption(name) != null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#firePropertyChangeEvent(java.lang.String, java.lang.Object, java.lang.Object)
+	 */
+	public void firePropertyChangeEvent(String name, Object oldValue,
+			Object newValue) {
+		Object[] listeners = listenerList.getListeners();
+		if (listeners.length > 0 && (oldValue == null || !oldValue.equals(newValue))) 
+		{
+			PropertyChangeEvent pe = new PropertyChangeEvent(this, name, oldValue, newValue);
+			for (int i = 0; i < listeners.length; ++i) 
+			{
+				IPropertyChangeListener l = (IPropertyChangeListener)listeners[i];
+				l.propertyChange( pe );
+			}
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#getBoolean(java.lang.String)
+	 */
+	public boolean getBoolean(String name) {
+		IConfigureOption option = cfg.getOption(name);
+		if (option != null && option.getType() == IConfigureOption.BIN) {
+			return Boolean.parseBoolean(option.getValue());
+		}
+		// otherwise punt
+		return getDefaultBoolean(name);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultBoolean(java.lang.String)
+	 */
+	public boolean getDefaultBoolean(String name) {
+		return false;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultDouble(java.lang.String)
+	 */
+	public double getDefaultDouble(String name) {
+		return 0;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultFloat(java.lang.String)
+	 */
+	public float getDefaultFloat(String name) {
+		return 0;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultInt(java.lang.String)
+	 */
+	public int getDefaultInt(String name) {
+		return 0;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultLong(java.lang.String)
+	 */
+	public long getDefaultLong(String name) {
+		return 0;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultString(java.lang.String)
+	 */
+	public String getDefaultString(String name) {
+		return EMPTY_STRING;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#getDouble(java.lang.String)
+	 */
+	public double getDouble(String name) {
+		return 0;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#getFloat(java.lang.String)
+	 */
+	public float getFloat(String name) {
+		return 0;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#getInt(java.lang.String)
+	 */
+	public int getInt(String name) {
+		return 0;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#getLong(java.lang.String)
+	 */
+	public long getLong(String name) {
+		return 0;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#getString(java.lang.String)
+	 */
+	public String getString(String name) {
+		if (name.equals(ALL_OPTIONS_ID) && selectedElement.getType() == IConfigureOption.TOOL) {
+			return cfg.getToolParameters(selectedElement.getName());
+		}
+		IConfigureOption option = cfg.getOption(name);
+		if (option != null) {
+			return option.getValue();
+		}
+		// otherwise punt
+		return getDefaultString(name);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#isDefault(java.lang.String)
+	 */
+	public boolean isDefault(String name) {
+		return false;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#needsSaving()
+	 */
+	public boolean needsSaving() {
+		return isdirty;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#putValue(java.lang.String, java.lang.String)
+	 */
+	public void putValue(String name, String value) {
+		setValue(name, value);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener)
+	 */
+	public void removePropertyChangeListener(IPropertyChangeListener listener) {
+		listenerList.remove(listener);
+	}
+
+	protected void setDirty(boolean isdirty) {
+		this.isdirty = isdirty;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, double)
+	 */
+	public void setDefault(String name, double value) {}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, float)
+	 */
+	public void setDefault(String name, float value) {}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, int)
+	 */
+	public void setDefault(String name, int value) {}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, long)
+	 */
+	public void setDefault(String name, long value) {}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, java.lang.String)
+	 */
+	public void setDefault(String name, String defaultObject) {}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, boolean)
+	 */
+	public void setDefault(String name, boolean value) {}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#setToDefault(java.lang.String)
+	 */
+	public void setToDefault(String name) {}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, double)
+	 */
+	public void setValue(String name, double value) {}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, float)
+	 */
+	public void setValue(String name, float value) {}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, int)
+	 */
+	public void setValue(String name, int value) {}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, long)
+	 */
+	public void setValue(String name, long value) {}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, java.lang.String)
+	 */
+	public void setValue(String name, String value) {
+		IConfigureOption option = cfg.getOption(name);
+		if (option != null)
+			option.setValue(value);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, boolean)
+	 */
+	public void setValue(String name, boolean value) {
+		IConfigureOption option = cfg.getOption(name);
+		if (option != null)
+			option.setValue(Boolean.toString(value));
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyPage.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyPage.java
new file mode 100644
index 0000000..301a1d0
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyPage.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
+import org.eclipse.cdt.core.settings.model.extension.CConfigurationData;
+import org.eclipse.cdt.ui.newui.AbstractPage;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsConfigurationManager;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IAConfiguration;
+
+public class AutotoolsConfigurePropertyPage extends AbstractPage {
+
+	private ICConfigurationDescription cfgd;
+	
+	protected boolean isSingle() {
+		return true;
+	}
+	
+	/**
+	 * Default constructor
+	 */
+	public AutotoolsConfigurePropertyPage() {
+		super();
+	}
+
+	public ICConfigurationDescription getCfgd() {
+		return cfgd;
+	}
+	
+	public void getAllConfigurationData() {
+		ICConfigurationDescription[] cfgds = getCfgsEditable();
+		for (int i = 0; i < cfgds.length; ++i) {
+			@SuppressWarnings("unused")
+			// Following will trigger an option value handler check which will
+			// clone a configuration if necessary
+			CConfigurationData data = cfgds[i].getConfigurationData();
+		}
+	}
+	
+	public IAConfiguration getConfiguration(ICConfigurationDescription cfgd) {
+		IAConfiguration acfg = AutotoolsConfigurationManager.getInstance().getTmpConfiguration(getProject(), cfgd);
+		return acfg;
+	}
+	
+	protected void cfgChanged(ICConfigurationDescription _cfgd) {
+		cfgd = _cfgd;
+		// Let super update all pages
+		super.cfgChanged(_cfgd);
+	}
+}
+
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyTab.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyTab.java
new file mode 100644
index 0000000..06a3c74
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyTab.java
@@ -0,0 +1,390 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+
+import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
+import org.eclipse.cdt.core.settings.model.ICResourceDescription;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IMultiConfiguration;
+import org.eclipse.cdt.ui.newui.AbstractPage;
+import org.eclipse.cdt.ui.newui.PageLayout;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.jface.preference.IPreferencePageContainer;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsConfigurationManager;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IAConfiguration;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IConfigureOption;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.AbstractAutotoolsCPropertyTab;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.custom.ScrolledComposite;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.ScrollBar;
+
+public class AutotoolsConfigurePropertyTab extends AbstractAutotoolsCPropertyTab implements IPreferencePageContainer {
+
+	private TreeViewer fTree;
+	private SashForm sashForm;
+	private Composite settingsPageContainer;
+	private AutotoolsConfigurePrefStore settingsStore;
+	private AbstractConfigurePropertyOptionsPage currentSettingsPage;
+	private ScrolledComposite containerSC;
+	private ToolListContentProvider listprovider;
+	private ToolListElement selectedElement;
+	private ICConfigurationDescription icfgd;
+
+	private Map<String, List<AbstractConfigurePropertyOptionsPage>> configToPageListMap;
+
+	private IProject getProject() {
+		return page.getProject();
+	}
+	
+	public boolean canBeVisible() {
+		if (page.isForProject() || page.isForPrefs()) {
+			return true;
+		}
+		return false;
+	}
+
+	public IAConfiguration getAutotoolsCfg() {
+		AutotoolsConfigurePropertyPage ap = (AutotoolsConfigurePropertyPage)page;
+		// We call getConfigurationData() to get the name because if the configuration has been renamed,
+		// it will cause the option value handler to clone the IAConfiguration
+		return ap.getConfiguration(icfgd);
+	}
+
+	private void syncClones() {
+		AutotoolsConfigurePropertyPage ap = (AutotoolsConfigurePropertyPage)page;
+		// We call getConfigurationData() to get the name because if the configuration has been renamed,
+		// it will cause the option value handler to clone the IAConfiguration
+		ap.getAllConfigurationData();
+	}
+	
+	public IPreferenceStore getPreferenceStore() {
+		return settingsStore;
+	}
+	
+	public void createControls(Composite parent) {
+		AutotoolsConfigurationManager.getInstance().clearTmpConfigurations(getProject());
+		syncClones();
+		
+		super.createControls(parent);
+		Composite composite= usercomp;
+		
+		settingsStore = AutotoolsConfigurePrefStore.getInstance();
+		configToPageListMap = new HashMap<String, List<AbstractConfigurePropertyOptionsPage>>();
+		
+		// assume parent page uses griddata
+		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_FILL | GridData.FILL_HORIZONTAL
+				| GridData.FILL_VERTICAL);
+		composite.setLayoutData(gd);
+		GridLayout layout= new GridLayout();
+//		layout.numColumns= 2;
+		//PixelConverter pc= new PixelConverter(composite);
+		//layout.verticalSpacing= pc.convertHeightInCharsToPixels(1) / 2;
+		composite.setLayout(layout);
+		
+		// Create the sash form
+		sashForm = new SashForm(usercomp, SWT.NONE);
+		sashForm.setOrientation(SWT.HORIZONTAL);
+		sashForm.setLayoutData(new GridData(GridData.FILL_BOTH));
+		
+		layout = new GridLayout(2, true);
+		layout.marginHeight = 5;
+		sashForm.setLayout(layout);
+		createSelectionArea(sashForm);
+		createEditArea(sashForm);
+
+//		usercomp.addControlListener(new ControlAdapter() {
+//			@Override
+//			public void controlResized(ControlEvent e) {
+//				specificResize();
+//			}});
+		
+	}
+
+//	private void specificResize() {
+//		Point p1 = fTree.getTree().computeSize(-1, -1);
+//		Point p2 = fTree.getTree().getSize();
+//		Point p3 = usercomp.getSize();
+//		p1.x += calcExtra();
+//		if (p3.x >= p1.x && (p1.x < p2.x || (p2.x * 2 < p3.x))) {
+//			fTree.getTree().setSize(p1.x , p2.y);
+//			sashForm.setWeights(new int[] {p1.x, (p3.x - p1.x)});
+//		} 
+//	}
+//
+//	private int calcExtra() {
+//		int x = fTree.getTree().getBorderWidth() * 2;
+//		ScrollBar sb = fTree.getTree().getVerticalBar();
+//		if (sb != null) x += sb.getSize().x;
+//		return x;
+//	}
+	
+	protected void createSelectionArea (Composite parent) {
+		fTree = new TreeViewer(parent, SWT.SINGLE|SWT.H_SCROLL|SWT.V_SCROLL|SWT.BORDER);
+		fTree.addSelectionChangedListener(new ISelectionChangedListener() {
+			public void selectionChanged(SelectionChangedEvent event) {
+				handleOptionSelection();
+			}});
+		fTree.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+		// Create a temporary default AutotoolsConfiguration to use for label info
+		IAConfiguration tmp = AutotoolsConfigurationManager.getInstance().createDefaultConfiguration(getProject(), "");
+		fTree.setLabelProvider(new ToolListLabelProvider(tmp));
+	}
+
+	protected void createEditArea(Composite parent) {
+		containerSC = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
+		containerSC.setExpandHorizontal(true);
+		containerSC.setExpandVertical(true);
+		
+		// Add a container for the build settings page
+		settingsPageContainer = new Composite(containerSC, SWT.NONE);
+		settingsPageContainer.setLayout(new PageLayout());
+
+		containerSC.setContent(settingsPageContainer);
+//		containerSC.setMinSize(settingsPageContainer.computeSize(SWT.DEFAULT, SWT.DEFAULT));
+		settingsPageContainer.layout();
+	}
+	
+	protected void setValues() {
+		/*
+		 *  This method updates the context of the build property pages
+		 *   - Which configuration/resource configuration is selected
+		 *   - Which tool/option category is selected
+		 *    
+		 *  It is called:
+		 *   - When a property page becomes visible
+		 *   - When the user changes the configuration selection
+		 *   - When the user changes the "exclude" setting for a resource
+		 */
+		
+		
+		IConfiguration icfg = getCfg(icfgd.getConfiguration());
+		if (icfg instanceof IMultiConfiguration) {
+			fTree.setInput(null);
+			fTree.getControl().setEnabled(false);
+			currentSettingsPage.setVisible(false);
+			return;
+		}
+
+		IAConfiguration currCfg = getAutotoolsCfg();
+		
+		//  Create the Tree Viewer content provider if first time
+		if (listprovider == null) {
+			listprovider = new ToolListContentProvider();
+			fTree.setContentProvider(listprovider);
+		}
+
+		//  Update the selected configuration and the Tree Viewer
+		ToolListElement[] newElements;
+		
+		fTree.setInput(currCfg);
+		fTree.getControl().setEnabled(true);
+		newElements = (ToolListElement[])listprovider.getElements(currCfg);
+		fTree.expandAll();
+		
+		selectedElement = newElements[0];
+		fTree.setSelection(new StructuredSelection(selectedElement), true);
+		
+//		//  Determine what the selection in the tree should be
+//		//  If the saved selection is not null, try to match the saved selection
+//		//  with an object in the new element list.
+//		//  Otherwise, select the first tool in the tree
+//		Object primaryObject = null;
+//		if (selectedElement != null) {
+//			selectedElement = matchSelectionElement(selectedElement, newElements);
+//		}
+//			
+//		if (selectedElement == null) {
+//			selectedElement = (newElements != null && newElements.length > 0 ? newElements[0] : null);
+//		}
+//			
+//		if (selectedElement != null) {
+//			primaryObject = selectedElement.getTool();
+//			if (primaryObject == null) {
+//				primaryObject = selectedElement.getOptionCategory();
+//			}
+//			if (primaryObject != null) {
+//				if (primaryObject instanceof IOptionCategory) {
+//					((ToolSettingsPrefStore)settingsStore).setSelection(getResDesc(), selectedElement, (IOptionCategory)primaryObject);
+//				}
+//				optionList.setSelection(new StructuredSelection(selectedElement), true);
+//			}
+//		}
+//		specificResize();
+	}
+
+	private void handleOptionSelection() {
+		// Get the selection from the tree list
+		if (fTree == null) return;
+		IStructuredSelection selection = (IStructuredSelection) fTree.getSelection();
+		ToolListElement element = (ToolListElement)selection.getFirstElement();
+		if (element != null) {
+			displayPageForElement(element);
+		}
+
+		ScrollBar sb = containerSC.getHorizontalBar();
+		if (sb != null && sb.isVisible()) {
+			settingsPageContainer.pack(true);
+			containerSC.setMinSize(settingsPageContainer.getSize());
+			((AbstractPage)page).resize();
+		}
+	}
+
+	private void displayPageForElement(ToolListElement element) {
+		selectedElement = element;
+		settingsStore.setSelection(getAutotoolsCfg(), selectedElement);
+		
+		AbstractConfigurePropertyOptionsPage oldPage = currentSettingsPage;
+		currentSettingsPage = null;
+
+		// Create a new settings page if necessary
+		List<AbstractConfigurePropertyOptionsPage> pages = getPagesForConfig();
+		ListIterator<AbstractConfigurePropertyOptionsPage> iter = pages.listIterator();
+		
+		while (iter.hasNext()) {
+			AbstractConfigurePropertyOptionsPage page = iter.next();
+			if (page.getName().equals(element.getName())) {
+				currentSettingsPage = page;
+				break;
+			}
+		}
+		if (currentSettingsPage == null) {
+			if (element.getType() == IConfigureOption.TOOL) {
+				currentSettingsPage = new AutotoolsToolPropertyOptionPage(
+					element, getAutotoolsCfg());
+			}
+			else {
+				currentSettingsPage = new AutotoolsCategoryPropertyOptionPage(
+						element, getAutotoolsCfg());
+			}
+			pages.add(currentSettingsPage);
+			currentSettingsPage.setContainer(this);
+			if (currentSettingsPage.getControl() == null) {
+				currentSettingsPage.createControl(settingsPageContainer);
+			}
+		}
+		
+		// Make all the other pages invisible
+		Control[] children = settingsPageContainer.getChildren();
+		Control currentControl = currentSettingsPage.getControl();
+		for (int i = 0; i < children.length; i++) {
+			if (children[i] != currentControl)
+				children[i].setVisible(false);
+		}
+		currentSettingsPage.setVisible(true);
+		currentSettingsPage.updateFields();
+		
+		if (oldPage != null  && oldPage != currentSettingsPage)
+			oldPage.setVisible(false);
+
+		// Set the size of the scrolled area
+		containerSC.setMinSize(currentSettingsPage.computeSize());
+		settingsPageContainer.layout();
+	
+	}
+
+	/* (non-Javadoc)
+	 * Answers the list of settings pages for the selected configuration 
+	 */
+	private List<AbstractConfigurePropertyOptionsPage> getPagesForConfig() {
+		if (getCfg() == null) return null;
+		List<AbstractConfigurePropertyOptionsPage> pages = configToPageListMap.get(getCfg().getName());
+		if (pages == null) {
+			pages = new ArrayList<AbstractConfigurePropertyOptionsPage>();
+			configToPageListMap.put(getCfg().getName(), pages);	
+		}
+		return pages;
+	}
+	
+	/**
+	 * Returns the "dirty" state
+	 */
+	public boolean isDirty() {
+		// Check each settings page
+		List<AbstractConfigurePropertyOptionsPage> pages = getPagesForConfig();
+		// Make sure we have something to work on
+		if (pages == null) {
+			// Nothing to do
+			return false;
+		}
+		ListIterator<AbstractConfigurePropertyOptionsPage> iter = pages.listIterator();
+		while (iter.hasNext()) {
+			AbstractConfigurePropertyOptionsPage page = iter.next();
+			if (page == null) continue;
+			if (page.isDirty()) return true;
+		}
+		return false;
+	}
+	
+	protected void performOK() {
+		ICConfigurationDescription[] cfgs = page.getCfgsEditable();
+		AutotoolsConfigurePropertyPage ap = (AutotoolsConfigurePropertyPage)page;
+		Map<String, IAConfiguration> cfgList = new HashMap<String, IAConfiguration>();
+		for (int i = 0; i < cfgs.length; ++i) {
+			ICConfigurationDescription cd = cfgs[i];
+			IAConfiguration acfg = ap.getConfiguration(cd);
+			cfgList.put(cd.getId(), acfg);
+		}
+		IProject project = getProject();
+		AutotoolsConfigurationManager.getInstance().replaceProjectConfigurations(project, cfgList, cfgs);
+		AutotoolsConfigurationManager.getInstance().clearTmpConfigurations(project);
+	}
+	
+	protected void performCancel() {
+		AutotoolsConfigurationManager.getInstance().clearTmpConfigurations(getProject());
+	}
+	
+	protected void performApply(ICResourceDescription src, ICResourceDescription dst) {
+		IProject project = getProject();
+		ICConfigurationDescription[] cfgs = page.getCfgsEditable();
+		// Apply all changes to existing saved configurations and new configurations, but do not perform
+		// deletions.
+		AutotoolsConfigurationManager.getInstance().applyConfigs(project.getName(), cfgs);
+	}
+	
+	protected void performDefaults() {
+		IAConfiguration cfg = getAutotoolsCfg();
+		cfg.setDefaultOptions();
+		setValues();
+	}
+	
+	protected void updateData(ICResourceDescription rd) {
+		if (rd == null) return;
+		icfgd = rd.getConfiguration();
+		setValues();
+	}
+	
+	public void setVisible (boolean b) {
+		super.setVisible(b);
+	}
+
+	// IPreferencePageContainer methods
+	@Override
+	public void updateButtons() {}
+	public void updateMessage() {}
+	public void updateTitle() {}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsEditorPropertyTab.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsEditorPropertyTab.java
new file mode 100644
index 0000000..26d0443
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsEditorPropertyTab.java
@@ -0,0 +1,276 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import org.eclipse.cdt.core.settings.model.ICResourceDescription;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.AbstractAutotoolsCPropertyTab;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutotoolsEditorPreferenceConstants;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+
+
+public class AutotoolsEditorPropertyTab extends AbstractAutotoolsCPropertyTab {
+
+	protected Combo fACVersionCombo;
+	protected Combo fAMVersionCombo;
+	IProject project;
+
+//	private class ACVersionSelectionListener implements SelectionListener {
+//		ICPropertyProvider p;
+//		public ACVersionSelectionListener(ICPropertyProvider p) {
+//			this.p = p;
+//		}
+//		
+//		public void widgetSelected(SelectionEvent e) {
+//			int index = fACVersionCombo.getSelectionIndex();
+//			try {
+//				AutotoolsEditorPropertyTab.getProject(p).setPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_VERSION, fACVersionCombo.getItem(index));
+//			} catch (CoreException ce) {
+//				// FIXME: what can we do here?
+//			}
+//		}
+//
+//		public void widgetDefaultSelected(SelectionEvent e) {
+//			// do nothing
+//		}
+//	}
+//	
+//	private class AMVersionSelectionListener implements SelectionListener {
+//		ICPropertyProvider p;
+//		public AMVersionSelectionListener(ICPropertyProvider p) {
+//			this.p = p;
+//		}
+//		
+//		public void widgetSelected(SelectionEvent e) {
+//			int index = fAMVersionCombo.getSelectionIndex(); 
+//			try {
+//				AutotoolsEditorPropertyTab.getProject(p).setPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_VERSION, fAMVersionCombo.getItem(index));
+//			} catch (CoreException ce) {
+//				// FIXME: what can we do here?
+//			}
+//		}
+//
+//		public void widgetDefaultSelected(SelectionEvent e) {
+//			// do nothing
+//		}
+//	}
+	
+	private IProject getProject() {
+		return page.getProject();
+	}
+	
+	public boolean canBeVisible() {
+		return true;
+	}
+
+	public void createControls(Composite parent) {
+		// TODO Auto-generated method stub
+		super.createControls(parent);
+		Composite composite= usercomp;
+		
+		// assume parent page uses griddata
+		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_FILL);
+		composite.setLayoutData(gd);
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 2;
+		//PixelConverter pc= new PixelConverter(composite);
+		//layout.verticalSpacing= pc.convertHeightInCharsToPixels(1) / 2;
+		composite.setLayout(layout);
+		
+		project = getProject();
+		
+		/* check box for new editors */
+		fACVersionCombo= new Combo(composite, SWT.CHECK | SWT.DROP_DOWN | SWT.READ_ONLY);
+		fACVersionCombo.setItems(AutotoolsPropertyConstants.fACVersions);
+		fACVersionCombo.select(AutotoolsPropertyConstants.fACVersions.length - 1);
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+		fACVersionCombo.setLayoutData(gd);
+		
+		Label label= new Label(composite, SWT.LEFT);
+		label.setText(AutotoolsPropertyMessages.getString("ACEditor.autoconfVersion")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label.setLayoutData(gd);
+		
+		/* check box for new editors */
+		fAMVersionCombo= new Combo(composite, SWT.CHECK | SWT.DROP_DOWN | SWT.READ_ONLY);
+		fAMVersionCombo.setItems(AutotoolsPropertyConstants.fAMVersions);
+		fAMVersionCombo.select(AutotoolsPropertyConstants.fAMVersions.length - 1);
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+		fAMVersionCombo.setLayoutData(gd);
+		
+		Label label2= new Label(composite, SWT.LEFT);
+		label2.setText(AutotoolsPropertyMessages.getString("ACEditor.automakeVersion")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label2.setLayoutData(gd);
+
+		initialize();
+	}
+
+	public void performOK() {
+		String acVer = null;
+		String amVer = null;
+		boolean changed = false;
+		try {
+			acVer = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_VERSION);
+			amVer = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_VERSION);
+		} catch (CoreException e) {
+			acVer = "";
+			amVer = "";
+		}
+		int index = fACVersionCombo.getSelectionIndex();
+		String acVerSelected = fACVersionCombo.getItem(index);
+		if (!acVerSelected.equals(acVer)) {
+			changed = true;
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_VERSION, fACVersionCombo.getItem(index));
+			} catch (CoreException ce) {
+				// Not much we can do at this point
+			}
+		}
+
+		index = fAMVersionCombo.getSelectionIndex();
+		String amVerSelected = fAMVersionCombo.getItem(index);
+		if (!amVerSelected.equals(amVer)) {
+			changed = true;
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_VERSION, fAMVersionCombo.getItem(index));
+			} catch (CoreException ce) {
+				// Not much we can do here either
+			}
+		}
+
+		// Notify any Autoconf editors that are open for this project that macro versioning
+		// has changed.
+		if (changed)
+			AutotoolsPropertyManager.getDefault().notifyPropertyListeners(project, AutotoolsPropertyConstants.AUTOCONF_MACRO_VERSIONING);
+	}
+	
+	protected void performApply(ICResourceDescription src, ICResourceDescription dst) {
+		performOK();
+	}
+	
+	public void performDefaults() {
+		// For default Autoconf and Automake versions, use the setting from the
+		// Autotools preference dialog.
+		String version = AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION);
+		String[] items = fACVersionCombo.getItems();
+		// Try and find which list item matches the current preference stored and
+		// select it in the list.
+		int i;
+		for (i = 0; i < items.length; ++i) {
+			if (items[i].equals(version))
+				break;
+		}
+		if (i >= items.length)
+			i = items.length - 1;
+		fACVersionCombo.select(i);
+
+		version = AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION);
+		items = fAMVersionCombo.getItems();
+		// Try and find which list item matches the current preference stored and
+		// select it in the list
+		for (i = 0; i < items.length; ++i) {
+			if (items[i].equals(version))
+				break;
+		}
+		if (i >= items.length)
+			i = items.length - 1;
+		fAMVersionCombo.select(i);
+	}
+	
+	public void updateData(ICResourceDescription cfgd) {
+		// Nothing to do
+	}
+	
+	public void updateButtons() {
+		// Nothing to do
+	}
+
+	public void setVisible (boolean b) {
+		super.setVisible(b);
+	}
+	
+//	private IProject getProject(ICPropertyProvider provider) {
+//		Object element = provider.getElement();
+//		if (element != null) { 
+//			if (element instanceof IFile ||
+//				element instanceof IProject ||
+//				element instanceof IFolder)
+//				{
+//			IResource f = (IResource) element;
+//			return f.getProject();
+//				}
+//			else if (element instanceof ICProject)
+//				return ((ICProject)element).getProject();
+//		}
+//		return null;
+//	}
+
+	private void initialize() {
+		initializeACVersion();
+		initializeAMVersion();
+	}
+	
+	void initializeACVersion() {
+		String version = "";
+		try {
+			version = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_VERSION);
+			if (version == null)
+				version = AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION);
+		} catch (CoreException e) {
+			// do nothing
+		}
+		String[] items = fACVersionCombo.getItems();
+		// Try and find which list item matches the current preference stored and
+		// select it in the list.
+		int i;
+		for (i = 0; i < items.length; ++i) {
+			if (items[i].equals(version))
+				break;
+		}
+		if (i >= items.length)
+			i = items.length - 1;
+		fACVersionCombo.select(i);
+	}
+	
+	void initializeAMVersion() {
+		String version = "";
+		try {
+			version = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_VERSION);
+			if (version == null)
+				version = AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION);
+		} catch (CoreException e) {
+			// do nothing
+		}
+		String[] items = fAMVersionCombo.getItems();
+		// Try and find which list item matches the current preference stored and
+		// select it in the list.
+		int i;
+		for (i = 0; i < items.length; ++i) {
+			if (items[i].equals(version))
+				break;
+		}
+		if (i >= items.length)
+			i = items.length - 1;
+		fAMVersionCombo.select(i);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsGeneralPropertyPage.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsGeneralPropertyPage.java
new file mode 100644
index 0000000..b7f234d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsGeneralPropertyPage.java
@@ -0,0 +1,15 @@
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import org.eclipse.cdt.ui.newui.AbstractPage;
+
+public class AutotoolsGeneralPropertyPage extends AbstractPage {
+
+	@Override
+	protected boolean isSingle() {
+		return false;
+	}
+	
+	@Override
+	protected boolean showsConfig() { return false;	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsHeadPropertyPage.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsHeadPropertyPage.java
new file mode 100644
index 0000000..dfba7fc
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsHeadPropertyPage.java
@@ -0,0 +1,15 @@
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import org.eclipse.cdt.ui.newui.AbstractPage;
+
+public class AutotoolsHeadPropertyPage extends AbstractPage {
+
+	@Override
+	protected boolean isSingle() {
+		return true;
+	}
+
+	@Override
+	protected boolean showsConfig() { return false;	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsPropertyManager.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsPropertyManager.java
new file mode 100644
index 0000000..21f27d3
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsPropertyManager.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.ListenerList;
+
+public class AutotoolsPropertyManager implements IPropertyChangeManager {
+
+	private static AutotoolsPropertyManager fInstance;
+	private Map<IProject, ListenerList> projectList;
+	
+	private AutotoolsPropertyManager() {
+		projectList = new HashMap<IProject, ListenerList>();
+	}
+	
+	public static AutotoolsPropertyManager getDefault() {
+		if (fInstance == null)
+			fInstance = new AutotoolsPropertyManager();
+		return fInstance;
+	}
+	
+	public synchronized void addProjectPropertyListener(IProject project,
+			IProjectPropertyListener listener) {
+		ListenerList list = (ListenerList)projectList.get(project);
+		if (list == null) {
+			list = new ListenerList();
+			projectList.put(project, list);
+		}
+		list.add(listener);
+	}
+
+	public synchronized void notifyPropertyListeners(IProject project, String property) {
+		ListenerList list = (ListenerList)projectList.get(project);
+		if (list != null) {
+			Object[] listeners = list.getListeners();
+			for (int i = 0; i < listeners.length; ++i) {
+				((IProjectPropertyListener)listeners[i]).handleProjectPropertyChanged(project, property);
+			}
+		}
+	}
+
+	public synchronized void removeProjectPropertyListener(IProject project, 
+			IProjectPropertyListener listener) {
+		ListenerList list = (ListenerList)projectList.get(project);
+		if (list != null)
+			list.remove(listener);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsPropertyMessages.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsPropertyMessages.java
new file mode 100644
index 0000000..44f2174
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsPropertyMessages.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+/**
+ * MakefilePreferencesMessages
+ */
+public class AutotoolsPropertyMessages {
+
+	/**
+	 * 
+	 */
+	private AutotoolsPropertyMessages() {
+	}
+
+	private static final String BUNDLE_NAME = AutotoolsPropertyMessages.class.getName();
+
+	public static String getString(String key) {
+		try {
+			return ResourceBundle.getBundle(BUNDLE_NAME).getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		} catch (NullPointerException e) {
+			return '#' + key + '#';
+		}
+	}	
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties
new file mode 100644
index 0000000..a9c6125
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties
@@ -0,0 +1,44 @@
+###############################################################################
+# Copyright (c) 2007, 2009 Red Hat Inc. and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Red Hat Inc. - initial API and implementation
+###############################################################################
+
+Edit.name=Editors
+Build.name=Build
+
+Autotools.aclocalPath=aclocal
+Autotools.aclocalPath.tooltip=Specify desired aclocal to use for project
+Autotools.automakePath=automake
+Autotools.automakePath.tooltip=Specify desired automake to use for project
+Autotools.autoconfPath=autoconf
+Autotools.autoconfPath.tooltip=Specify desired autoconf to use for project
+Autotools.autoheaderPath=autoheader
+Autotools.autoheaderPath.tooltip=Specify desired autoheader to use for project
+Autotools.autoreconfPath=autoreconf
+Autotools.autoreconfPath.tooltip=Specify desired autoreconf to use for project
+Autotools.libtoolizePath=libtoolize
+Autotools.libtoolizePath.tooltip=Specify desired libtoolize to use for project
+
+ACEditor.version=&Version
+ACEditor.autoconfVersion=Version of Autoconf to use for syntax checking
+ACEditor.automakeVersion=Version of Automake to use for syntax checking
+
+ScannerMakeW.label=Use make -n -w per file to generate scanner info
+ScannerMakeW.tooltip=Use this option only if necessary to get correct include path
+
+CleanBehavior.title=Clean Build Behavior
+
+CleanDelete.label=Delete build directory on "clean" operation
+CleanMake.label=Use make target to clean
+CleanMakeTarget.label=Make target:
+CleanMakeTarget.default=distclean
+CleanMakeTarget.tooltip=Specify a top-level make target to clean build directory
+
+AutoBuildName.label=Automatically generate build directory names for additional configurations
+AutoBuildName.tooltip=When a configuration other than the first configuration is created, generate a unique build directory using the configuration name.
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsToolPropertyOptionPage.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsToolPropertyOptionPage.java
new file mode 100644
index 0000000..c7f5048
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsToolPropertyOptionPage.java
@@ -0,0 +1,142 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import org.eclipse.cdt.ui.newui.AbstractCPropertyTab;
+import org.eclipse.cdt.ui.newui.MultiLineTextFieldEditor;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.preference.FieldEditor;
+import org.eclipse.jface.preference.StringFieldEditor;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.ConfigureMessages;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IAConfiguration;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.FontMetrics;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+
+public class AutotoolsToolPropertyOptionPage extends
+		AbstractConfigurePropertyOptionsPage {
+
+	private ToolListElement element;
+	private String toolName = "";
+	private IAConfiguration cfg;
+	//  Label class for a preference page.
+	class LabelFieldEditor extends FieldEditor {
+		private String fTitle;
+		private Label fTitleLabel;
+
+		public LabelFieldEditor( Composite parent, String title ) {
+			fTitle = title;
+			this.createControl( parent );
+		}
+
+		protected void adjustForNumColumns( int numColumns ) {
+			((GridData)fTitleLabel.getLayoutData()).horizontalSpan = 2;
+		}
+
+		protected void doFillIntoGrid( Composite parent, int numColumns ) {
+			fTitleLabel = new Label( parent, SWT.WRAP );
+			fTitleLabel.setText( fTitle );
+			GridData gd = new GridData();
+			gd.verticalAlignment = SWT.TOP;
+			gd.grabExcessHorizontalSpace = false;
+			gd.horizontalSpan = 2;
+			fTitleLabel.setLayoutData( gd );
+		}
+
+		public int getNumberOfControls() {	return 1; }
+		/**
+		 * The label field editor is only used to present a text label on a preference page.
+		 */
+		protected void doLoad() {}
+		protected void doLoadDefault() {}
+		protected void doStore() {}
+	}
+	
+	public AutotoolsToolPropertyOptionPage(ToolListElement element, IAConfiguration cfg) {
+ 		super(element.getName());
+ 		this.element = element;
+ 		this.toolName = element.getName();
+ 		this.cfg = cfg;
+	}
+
+	public String getName() {
+		return super.getName();
+	}
+
+	public ToolListElement getElement() {
+		return element;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors()
+	 */
+	protected void createFieldEditors() {
+		super.createFieldEditors();
+		// Add a string editor to edit the tool command
+		Composite parent = getFieldEditorParent();
+		FontMetrics fm = AbstractCPropertyTab.getFontMetrics(parent);
+		commandStringField = new StringFieldEditor(toolName,
+				ConfigureMessages.getString(COMMAND),
+				parent);
+		commandStringField.setEmptyStringAllowed(false);
+		GridData gd = ((GridData)commandStringField.getTextControl(parent).getLayoutData());
+		gd.grabExcessHorizontalSpace = true;
+		gd.minimumWidth = Dialog.convertWidthInCharsToPixels(fm, 3);
+		addField(commandStringField);
+		// Add a field editor that displays overall build options
+		Composite par = getFieldEditorParent();
+		allOptionFieldEditor = new MultiLineTextFieldEditor(AutotoolsConfigurePrefStore.ALL_OPTIONS_ID,
+				ConfigureMessages.getString(ALL_OPTIONS), par);
+		allOptionFieldEditor.getTextControl(par).setEditable(false);
+//		gd = ((GridData)allOptionFieldEditor.getTextControl().getLayoutData());
+		gd.grabExcessHorizontalSpace = true;
+		gd.minimumWidth = Dialog.convertWidthInCharsToPixels(fm, 20);
+		addField(allOptionFieldEditor);
+	}
+
+	protected FieldEditor createLabelEditor( Composite parent, String title ) {
+		return new LabelFieldEditor( parent, title );
+	}
+
+	// field editor that displays all the build options for a particular tool
+	private MultiLineTextFieldEditor allOptionFieldEditor;
+	//tool command field
+	private StringFieldEditor commandStringField;
+	// all build options field editor label
+	private static final String ALL_OPTIONS = "Tool.allopts"; //$NON-NLS-1$
+	// Field editor label for tool command
+	private static final String COMMAND = "Tool.command"; //$NON-NLS-1$
+
+	/**
+	 * Update the field editor that displays all the build options
+	 */
+	public void updateFields() {
+		allOptionFieldEditor.load();
+	}
+	
+	public void setValues(){
+		commandStringField.load();
+		updateFields();
+	}
+	
+	public void propertyChange(PropertyChangeEvent event) {
+		// allow superclass to handle as well
+		super.propertyChange(event);
+
+		if(event.getSource() == commandStringField){
+			cfg.setOption(toolName, commandStringField.getStringValue());
+			updateFields();
+		}
+	}
+	
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsToolsPropertyTab.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsToolsPropertyTab.java
new file mode 100644
index 0000000..2d8268e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsToolsPropertyTab.java
@@ -0,0 +1,346 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import org.eclipse.cdt.core.settings.model.ICResourceDescription;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsConfiguration;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.AbstractAutotoolsCPropertyTab;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class AutotoolsToolsPropertyTab extends AbstractAutotoolsCPropertyTab {
+
+	public static final String DEFAULT_ACLOCAL = "aclocal"; // $NON-NLS-1$
+	public static final String DEFAULT_AUTOMAKE = "automake"; // $NON-NLS-1$
+	public static final String DEFAULT_AUTOCONF = "autoconf"; // $NON-NLS-1$
+	public static final String DEFAULT_AUTOHEADER = "autoheader"; // $NON-NLS-1$
+	public static final String DEFAULT_AUTORECONF = "autoreconf"; // $NON-NLS-1$
+	public static final String DEFAULT_LIBTOOLIZE = "libtoolize"; // $NON-NLS-1$
+	
+	protected Text fAclocalPath;
+	protected Text fAutomakePath;
+	protected Text fAutoconfPath;
+	protected Text fAutoheaderPath;
+	protected Text fAutoreconfPath;
+	protected Text fLibtoolizePath;
+	private IProject project;
+
+	
+	private IProject getProject() {
+		return page.getProject();
+	}
+	
+	public boolean canBeVisible() {
+		return true;
+	}
+
+	public void cfgChanged(AutotoolsConfiguration cfg) {
+		// Nothing to do
+	}
+	
+	public void createControls(Composite parent) {
+		// TODO Auto-generated method stub
+		super.createControls(parent);
+		Composite composite= usercomp;
+		
+		// assume parent page uses griddata
+		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_FILL | GridData.FILL_HORIZONTAL);
+		composite.setLayoutData(gd);
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 2;
+		//PixelConverter pc= new PixelConverter(composite);
+		//layout.verticalSpacing= pc.convertHeightInCharsToPixels(1) / 2;
+		composite.setLayout(layout);
+		
+		project = getProject();
+		
+		Label label= new Label(composite, SWT.LEFT);
+		label.setText(AutotoolsPropertyMessages.getString("Autotools.aclocalPath")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label.setLayoutData(gd);
+		
+		/* text window for aclocal path */
+		fAclocalPath = new Text(composite, SWT.BORDER | SWT.SINGLE);
+		fAclocalPath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.aclocalPath.tooltip")); // $NON-NLS-1$
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fAclocalPath.setLayoutData(gd);
+		
+		Label label2= new Label(composite, SWT.LEFT);
+		label2.setText(AutotoolsPropertyMessages.getString("Autotools.automakePath")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label2.setLayoutData(gd);
+		
+		/* text window for automake path */
+		fAutomakePath = new Text(composite, SWT.BORDER | SWT.SINGLE);
+		fAutomakePath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.automakePath.tooltip")); // $NON-NLS-1#
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fAutomakePath.setLayoutData(gd);
+		
+		Label label3 = new Label(composite, SWT.LEFT);
+		label3.setText(AutotoolsPropertyMessages.getString("Autotools.autoconfPath")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label3.setLayoutData(gd);
+		
+		/* text window for autoconf path */
+		fAutoconfPath = new Text(composite, SWT.BORDER | SWT.SINGLE);
+		fAutoconfPath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.autoconfPath.tooltip")); // $NON-NLS-1$
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fAutoconfPath.setLayoutData(gd);
+
+		Label label4= new Label(composite, SWT.LEFT);
+		label4.setText(AutotoolsPropertyMessages.getString("Autotools.autoheaderPath")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label4.setLayoutData(gd);
+		
+		/* text window for autoheader path */
+		fAutoheaderPath = new Text(composite, SWT.BORDER | SWT.SINGLE);
+		fAutoheaderPath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.autoheaderPath.tooltip")); // $NON-NLS-1$
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fAutoheaderPath.setLayoutData(gd);
+
+		Label label5= new Label(composite, SWT.LEFT);
+		label5.setText(AutotoolsPropertyMessages.getString("Autotools.autoreconfPath")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label5.setLayoutData(gd);
+		
+		/* text window for autoreconf path */
+		fAutoreconfPath = new Text(composite, SWT.BORDER | SWT.SINGLE);
+		fAutoreconfPath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.autoreconfPath.tooltip")); // $NON-NLS-1$
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fAutoreconfPath.setLayoutData(gd);
+
+		Label label6= new Label(composite, SWT.LEFT);
+		label6.setText(AutotoolsPropertyMessages.getString("Autotools.libtoolizePath")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label6.setLayoutData(gd);
+		
+		/* text window for libtoolize path */
+		fLibtoolizePath = new Text(composite, SWT.BORDER | SWT.SINGLE);
+		fLibtoolizePath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.libtoolizePath.tooltip")); // $NON-NLS-1$
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fLibtoolizePath.setLayoutData(gd);
+
+		initialize();
+	}
+
+	public void performOK() {
+		String aclocalPath = null;
+		String automakePath = null;
+		String autoconfPath = null;
+		String autoheaderPath = null;
+		String autoreconfPath = null;
+		String libtoolizePath = null;
+		try {
+			aclocalPath = project.getPersistentProperty(AutotoolsPropertyConstants.ACLOCAL_TOOL);
+		} catch (CoreException e1) {
+			aclocalPath = DEFAULT_ACLOCAL;
+		}
+
+		String newAclocalPath = fAclocalPath.getText().trim();
+		if (aclocalPath == null || !newAclocalPath.equals(aclocalPath)) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.ACLOCAL_TOOL, newAclocalPath);
+			} catch (CoreException e1) {
+				// Not much we can do at this point
+			}
+		}
+		
+		try {
+			automakePath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_TOOL);
+		} catch (CoreException e1) {
+			automakePath = DEFAULT_AUTOMAKE;
+		}
+
+		String newAutomakePath = fAutomakePath.getText().trim();
+		if (automakePath == null || !newAutomakePath.equals(automakePath)) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_TOOL, newAutomakePath);
+			} catch (CoreException e2) {
+				// Not much we can do at this point
+			}
+		}
+		
+		try {
+			autoconfPath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_TOOL);
+		} catch (CoreException e1) {
+			autoconfPath = DEFAULT_AUTOCONF;
+		}
+
+		String newAutoconfPath = fAutoconfPath.getText().trim();
+		if (autoconfPath == null || !newAutoconfPath.equals(autoconfPath)) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_TOOL, newAutoconfPath);
+			} catch (CoreException e2) {
+				// Not much we can do at this point
+			}
+		}
+
+		try {
+			autoheaderPath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOHEADER_TOOL);
+		} catch (CoreException e1) {
+			autoheaderPath = DEFAULT_AUTOHEADER;
+		}
+
+		String newAutoheaderPath = fAutoheaderPath.getText().trim();
+		if (autoheaderPath == null || !newAutoheaderPath.equals(autoheaderPath)) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTOHEADER_TOOL, newAutoheaderPath);
+			} catch (CoreException e2) {
+				// Not much we can do at this point
+			}
+		}
+
+		try {
+			autoreconfPath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTORECONF_TOOL);
+		} catch (CoreException e1) {
+			autoreconfPath = DEFAULT_AUTORECONF;
+		}
+
+		String newAutoreconfPath = fAutoreconfPath.getText().trim();
+		if (autoreconfPath == null || !newAutoreconfPath.equals(autoreconfPath)) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTORECONF_TOOL, newAutoreconfPath);
+			} catch (CoreException e2) {
+				// Not much we can do at this point
+			}
+		}
+	
+		try {
+			libtoolizePath = project.getPersistentProperty(AutotoolsPropertyConstants.LIBTOOLIZE_TOOL);
+		} catch (CoreException e1) {
+			libtoolizePath = DEFAULT_LIBTOOLIZE;
+		}
+
+		String newLibtoolizePath = fLibtoolizePath.getText().trim();
+		if (libtoolizePath == null || !newLibtoolizePath.equals(libtoolizePath)) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.LIBTOOLIZE_TOOL, newLibtoolizePath);
+			} catch (CoreException e2) {
+				// Not much we can do at this point
+			}
+		}
+	}
+	
+	protected void performApply(ICResourceDescription src, ICResourceDescription dst) {
+		performOK();
+	}
+	
+	public void performDefaults() {
+		// For default tool settings, simply default the base tool names
+		fAclocalPath.setText(DEFAULT_ACLOCAL);
+		fAutomakePath.setText(DEFAULT_AUTOMAKE);
+		fAutoconfPath.setText(DEFAULT_AUTOCONF);
+		fAutoheaderPath.setText(DEFAULT_AUTOHEADER);
+		fAutoreconfPath.setText(DEFAULT_AUTORECONF);
+		fLibtoolizePath.setText(DEFAULT_LIBTOOLIZE);
+	}
+	
+	public void updateData(ICResourceDescription cfgd) {
+		// Nothing to do
+	}
+	
+	public void updateButtons() {
+		// Nothing to do
+	}
+
+	public void setVisible (boolean b) {
+		super.setVisible(b);
+	}
+	
+	private void initialize() {
+		String aclocalPath = null;
+		String automakePath = null;
+		String autoconfPath = null;
+		String autoheaderPath = null;
+		String autoreconfPath = null;
+		String libtoolizePath = null;
+		
+		try {
+			aclocalPath = project.getPersistentProperty(AutotoolsPropertyConstants.ACLOCAL_TOOL);
+		} catch (CoreException e1) {
+			// do nothing
+		}
+		
+		if (aclocalPath == null)
+			aclocalPath = DEFAULT_ACLOCAL;
+		
+		fAclocalPath.setText(aclocalPath);
+		
+		try {
+			automakePath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_TOOL);
+		} catch (CoreException e1) {
+			// do nothing
+		}
+		
+		if (automakePath == null)
+			automakePath = DEFAULT_AUTOMAKE;
+		
+		fAutomakePath.setText(automakePath);
+		
+		try {
+			autoconfPath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_TOOL);
+		} catch (CoreException e1) {
+			// do nothing
+		}
+		
+		if (autoconfPath == null)
+			autoconfPath = DEFAULT_AUTOCONF;
+		
+		fAutoconfPath.setText(autoconfPath);
+
+		try {
+			autoheaderPath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOHEADER_TOOL);
+		} catch (CoreException e1) {
+			// do nothing
+		}
+		
+		if (autoheaderPath == null)
+			autoheaderPath = DEFAULT_AUTOHEADER;
+		
+		fAutoheaderPath.setText(autoheaderPath);
+
+		try {
+			autoreconfPath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTORECONF_TOOL);
+		} catch (CoreException e1) {
+			// do nothing
+		}
+		
+		if (autoreconfPath == null)
+			autoreconfPath = DEFAULT_AUTORECONF;
+		
+		fAutoreconfPath.setText(autoreconfPath);
+
+		try {
+			libtoolizePath = project.getPersistentProperty(AutotoolsPropertyConstants.LIBTOOLIZE_TOOL);
+		} catch (CoreException e1) {
+			// do nothing
+		}
+		
+		if (libtoolizePath == null)
+			libtoolizePath = DEFAULT_LIBTOOLIZE;
+		
+		fLibtoolizePath.setText(libtoolizePath);
+	}
+	
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/IProjectPropertyListener.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/IProjectPropertyListener.java
new file mode 100644
index 0000000..133b46e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/IProjectPropertyListener.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import org.eclipse.core.resources.IProject;
+
+public interface IProjectPropertyListener {
+
+	/**
+	 * Handler for property changes
+	 * 
+	 * @param project the project to which the property changed
+	 * @param property the name of the property changed
+	 */
+	void handleProjectPropertyChanged(IProject project, String property);
+	
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/IPropertyChangeManager.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/IPropertyChangeManager.java
new file mode 100644
index 0000000..5ae066b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/IPropertyChangeManager.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import org.eclipse.core.resources.IProject;
+
+public interface IPropertyChangeManager {
+
+	/**
+	 * Add a project property listener for given project.
+	 * 
+	 * @param project the project to which the listener is interested
+	 * @param listener the listener to notify
+	 */
+	void addProjectPropertyListener(IProject project, IProjectPropertyListener listener);
+	
+	/**
+	 * Remove a project property listener.
+	 * 
+	 * @param listener the listener to remove
+	 */
+	void removeProjectPropertyListener(IProject project, IProjectPropertyListener listener);
+	
+	/**
+	 * Notify all listeners of project that a property has changed.
+	 * 
+	 * @param project the project for which the property has changed
+	 * @param property the property that has changed
+	 */
+	void notifyPropertyListeners(IProject project, String property);
+	
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/ToolListContentProvider.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/ToolListContentProvider.java
new file mode 100644
index 0000000..2ca2281
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/ToolListContentProvider.java
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import java.util.ArrayList;
+
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsConfiguration;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IConfigureOption;
+
+public class ToolListContentProvider implements ITreeContentProvider {
+
+	private ToolListElement[] elements;
+	
+	private ToolListElement[] createElements() {
+		ArrayList<ToolListElement> toolList = new ArrayList<ToolListElement>();
+		AutotoolsConfiguration.Option[] options = AutotoolsConfiguration.getTools();
+		for (int i = 0; i < options.length; ++i) {
+			AutotoolsConfiguration.Option opt = options[i];
+			String optName = opt.getName();
+			ToolListElement tool = new ToolListElement(optName, IConfigureOption.TOOL);
+			toolList.add(tool);
+			AutotoolsConfiguration.Option[] categories = 
+				AutotoolsConfiguration.getChildOptions(optName);
+			for (int j = 0; j < categories.length; ++j) {
+				String catName = categories[j].getName();
+				ToolListElement newItem = new ToolListElement(catName, IConfigureOption.CATEGORY);
+				tool.addChild(newItem);
+			}
+		}
+		return toolList.toArray(new ToolListElement[toolList.size()]);
+	}
+	
+	public Object[] getChildren(Object parentElement) {
+		if (parentElement instanceof AutotoolsConfiguration) {
+			return elements;
+		}
+		return ((ToolListElement)parentElement).getChildren();	
+	}
+
+	public Object getParent(Object element) {
+		return ((ToolListElement)element).getParent();
+	}
+
+	public boolean hasChildren(Object element) {
+		return ((ToolListElement)element).hasChildren();
+	}
+
+	public Object[] getElements(Object inputElement) {
+		return elements;
+	}
+
+	public void dispose() {
+		// nothing needed
+	}
+
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		// TODO Auto-generated method stub
+		elements = createElements();
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/ToolListElement.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/ToolListElement.java
new file mode 100644
index 0000000..1c3e6be
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/ToolListElement.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import java.util.ArrayList;
+
+public class ToolListElement {
+	
+	private ArrayList<ToolListElement> children;
+	private ToolListElement parent;
+	private String name;
+	private int type;
+	
+	public ToolListElement(String name, int type) {
+		this.name = name;
+		this.type = type;
+		this.children = new ArrayList<ToolListElement>();
+	}
+	
+	public void setParent(ToolListElement p) {
+		parent = p;
+	}
+	
+	public ToolListElement getParent() {
+		return parent;
+	}
+	
+	public String getName() {
+		return name;
+	}
+	
+	public int getType() {
+		return type;
+	}
+	
+	public void addChild(ToolListElement e) {
+		children.add(e);
+		e.setParent(this);
+	}
+	
+	public boolean hasChildren() {
+		return children.size() > 0;
+	}
+	
+	public Object[] getChildren() {
+		return children.toArray();
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/ToolListLabelProvider.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/ToolListLabelProvider.java
new file mode 100644
index 0000000..07b8ce0
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/ToolListLabelProvider.java
@@ -0,0 +1,92 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2007, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Rational Software - Initial API and implementation
+ * Red Hat Inc. - Modification for Autotools usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import org.eclipse.cdt.ui.newui.UIMessages;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceManager;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IAConfiguration;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IConfigureOption;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.AutotoolsUIPluginImages;
+import org.eclipse.swt.graphics.Image;
+ 
+public class ToolListLabelProvider extends LabelProvider {
+	private final Image IMG_TOOL = AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_CFG_TOOL);
+	private final Image IMG_CAT = AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_CFG_CATEGORY);
+	private static final String ERROR_UNKNOWN_ELEMENT = "ConfigurePropertyPage.error.Unknown_tree_element";	//$NON-NLS-1$
+
+	private ImageDescriptor descriptor = null;
+	private ResourceManager manager = null;
+	private IAConfiguration cfg = null;
+	
+	public ToolListLabelProvider(IAConfiguration cfg) {
+		this.cfg = cfg;
+	}
+	
+	public IAConfiguration getCfg() {
+		return cfg;
+	}
+	
+	public void setCfg(IAConfiguration cfg) {
+		this.cfg = cfg;
+	}
+	
+	public Image getImage(Object element) {
+		if (!(element instanceof ToolListElement)) {
+			throw unknownElement(element);
+		}
+		Image defaultImage = IMG_CAT;
+		ToolListElement toolListElement = (ToolListElement)element;
+		IConfigureOption cat = cfg.getOption(toolListElement.getName());
+	
+		if (cat == null) {
+			defaultImage = IMG_TOOL;
+		}
+		
+		// Use default icon for display 
+		return defaultImage;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(Object)
+	 */
+	public String getText(Object element) {
+		if (!(element instanceof ToolListElement)) {
+			throw unknownElement(element);
+		}
+		ToolListElement toolListElement = (ToolListElement)element;
+		IConfigureOption cat = cfg.getOption(toolListElement.getName());
+	
+		if (cat == null) {
+			return toolListElement.getName();
+		}
+		else {
+			return cat.getDescription();
+		}
+	}
+
+	protected RuntimeException unknownElement(Object element) {
+		return new RuntimeException(UIMessages.getFormattedString(ERROR_UNKNOWN_ELEMENT, element.getClass().getName()));
+	}
+
+    /**
+     * Disposing any images that were allocated for it.
+     * 
+     * @since 3.0
+     */
+    public void dispose() {
+        if (descriptor != null && manager != null) {
+            manager.destroyImage(descriptor);
+        }
+    };
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/AutoconfPrototype.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/AutoconfPrototype.java
new file mode 100644
index 0000000..88b1702
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/AutoconfPrototype.java
@@ -0,0 +1,82 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.text.hover;
+
+import java.util.ArrayList;
+
+public class AutoconfPrototype {
+	protected String name;
+	protected int numPrototypes;
+	protected ArrayList<Integer> minParms;
+	protected ArrayList<Integer> maxParms;
+	protected ArrayList<ArrayList<String>> parmList;
+	
+	public AutoconfPrototype() {
+		numPrototypes = 0;
+		minParms = new ArrayList<Integer>();
+		maxParms = new ArrayList<Integer>();
+		parmList = new ArrayList<ArrayList<String>>();
+	}
+	
+	public String getName() {
+		return name;
+	}
+	
+	public void setName(String newName) {
+		name = newName;
+	}
+	
+	public int getNumPrototypes() {
+		return numPrototypes;
+	}
+	
+	public void setNumPrototypes(int num) {
+		numPrototypes = num;
+	}
+	
+	public int getMinParms(int prototypeNum) {
+		return ((Integer)minParms.get(prototypeNum)).intValue();
+	}
+	
+	public void setMinParms(int prototypeNum, int value) {
+		minParms.add(prototypeNum, new Integer(value));
+	}
+	
+	public int getMaxParms(int prototypeNum) {
+		return ((Integer)maxParms.get(prototypeNum)).intValue();
+	}
+	
+	public void setMaxParms(int prototypeNum, int value) {
+		maxParms.add(prototypeNum, new Integer(value));
+	}
+	
+	public String getParmName(int prototypeNum, int parmNum) {
+		ArrayList<String> parms = parmList.get(prototypeNum);
+		return (String)parms.get(parmNum);
+	}
+
+	// This function assumes that parms will be added in order starting
+	// with lowest prototype first.
+	public void setParmName(int prototypeNum, int parmNum, String value) {
+		ArrayList<String> parms;
+		if (parmList.size() == prototypeNum) {
+			parms = new ArrayList<String>();
+			parmList.add(parms);
+		}
+		else
+			parms = parmList.get(prototypeNum);
+		if (parms.size() == parmNum)
+			parms.add(value);	
+		else
+			parms.set(parmNum, value);
+	}
+	
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/AutoconfTextHover.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/AutoconfTextHover.java
new file mode 100644
index 0000000..624db19
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/AutoconfTextHover.java
@@ -0,0 +1,596 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.text.hover;
+
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.core.filesystem.URIUtil;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.DefaultInformationControl;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IInformationControl;
+import org.eclipse.jface.text.IInformationControlCreator;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextHover;
+import org.eclipse.jface.text.ITextHoverExtension;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.Region;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.AutoconfEditor;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.AutoconfMacro;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.IAutotoolEditorActionDefinitionIds;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.CWordFinder;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.HTMLPrinter;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.HTMLTextPresenter;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutotoolsEditorPreferenceConstants;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.keys.IBindingService;
+import org.osgi.framework.Bundle;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+
+public class AutoconfTextHover implements ITextHover, ITextHoverExtension {
+
+	public static String LOCAL_AUTOCONF_MACROS_DOC_NAME = "macros/acmacros";
+	public static String LOCAL_AUTOMAKE_MACROS_DOC_NAME = "macros/ammacros";
+	public static String AUTOCONF_MACROS_DOC_NAME = "http://www.sourceware.org/eclipse/autotools/acmacros"; //$NON-NLS-1$
+	public static String AUTOMAKE_MACROS_DOC_NAME = "http://www.sourceware.org/eclipse/autotools/ammacros"; //$NON-NLS-1$
+
+	private static class AutotoolsHoverDoc {
+		public Document[] documents = new Document[2];
+		public AutotoolsHoverDoc(Document ac_document, Document am_document) {
+			this.documents[0] = ac_document;
+			this.documents[1] = am_document;
+		}
+		public Document getAcDocument() {
+			return documents[0];
+		}
+		public Document getAmDocument() {
+			return documents[1];
+		}
+		public Document[] getDocuments() {
+			return documents;
+		}
+	};
+
+	private static Map<String, Document> acHoverDocs;
+	private static Map<String, Document> amHoverDocs;
+	private static Map<Document, ArrayList<AutoconfMacro>> acHoverMacros;
+	private static String fgStyleSheet;
+	private static AutoconfEditor fEditor;
+
+	/* Mapping key to action */
+	private static IBindingService fBindingService;
+	{
+		fBindingService= (IBindingService)PlatformUI.getWorkbench().getAdapter(IBindingService.class);
+	}
+
+	public static String getAutoconfMacrosDocName(String version) {
+		return AUTOCONF_MACROS_DOC_NAME + "-" //$NON-NLS-1$ 
+		+ version
+		+ ".xml"; //$NON-NLS-1$	
+	}
+
+	public static String getLocalAutoconfMacrosDocName(String version) {
+		return LOCAL_AUTOCONF_MACROS_DOC_NAME + "-" //$NON-NLS-1$ 
+		+ version
+		+ ".xml"; //$NON-NLS-1$	
+	}
+
+	/* Get the preferences default for the autoconf macros document name.  */
+	public static String getDefaultAutoconfMacrosVer() {
+		return AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION);
+	}
+
+	public static String getAutomakeMacrosDocName(String version) {
+		return AUTOMAKE_MACROS_DOC_NAME + "-" //$NON-NLS-1$ 
+		+ version
+		+ ".xml"; //$NON-NLS-1$	
+	}
+	
+	public static String getLocalAutomakeMacrosDocName(String version) {
+		return LOCAL_AUTOMAKE_MACROS_DOC_NAME + "-" //$NON-NLS-1$ 
+		+ version
+		+ ".xml"; //$NON-NLS-1$	
+	}
+	
+	/* Get the preferences default for the autoconf macros document name.  */
+	public static String getDefaultAutomakeMacrosVer() {
+		return AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION);
+	}
+
+	protected static Document getACDoc(String acDocVer) {
+		Document ac_document = null;
+		if (acHoverDocs == null) {
+			acHoverDocs = new HashMap<String, Document>();
+		}
+		ac_document = (Document)acHoverDocs.get(acDocVer);
+		if (ac_document == null) {
+			Document doc = null;
+			try {
+				// see comment in initialize()
+				try {
+					InputStream docStream = null;
+					try {
+						URI uri = new URI(getLocalAutoconfMacrosDocName(acDocVer));
+						IPath p = URIUtil.toPath(uri);
+						// Try to open the file as local to this plug-in.
+						docStream = FileLocator.openStream(AutotoolsPlugin.getDefault().getBundle(), p, false);
+					} catch (IOException e) {
+						// Local open failed.  Try normal external location.
+						URI acDoc = new URI(getAutoconfMacrosDocName(acDocVer));
+						IPath p = URIUtil.toPath(acDoc);
+						if (p == null) {
+							URL url = acDoc.toURL();
+							docStream = url.openStream();
+						} else {
+							docStream = new FileInputStream(p.toFile());
+						}
+					}
+					DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+					factory.setValidating(false);
+					try {
+						DocumentBuilder builder = factory.newDocumentBuilder();
+						doc = builder.parse(docStream);
+					}
+					catch (SAXParseException saxException) {
+						doc = null;
+					}
+					catch (SAXException saxEx) {
+						doc = null;
+					}
+					catch (ParserConfigurationException pce) {
+						doc = null;
+					}
+					catch (IOException ioe) {
+						doc = null;
+					}
+				} catch (FileNotFoundException e) {
+					AutotoolsPlugin.log(e);
+				} catch (MalformedURLException e) {
+					AutotoolsPlugin.log(e);
+				} catch (URISyntaxException e) {
+					AutotoolsPlugin.log(e);
+				}
+				ac_document = doc;
+			}
+			catch (IOException ioe) {
+			}
+		}
+		acHoverDocs.put(acDocVer, ac_document);
+		return ac_document;
+	}
+	
+	protected static Document getAMDoc(String amDocVer) {
+		Document am_document = null;
+		if (amHoverDocs == null) {
+			amHoverDocs = new HashMap<String, Document>();
+		}
+		am_document = (Document)amHoverDocs.get(amDocVer);
+		if (am_document == null) {
+			Document doc = null;
+			try {
+				// see comment in initialize()
+				try {
+					InputStream docStream = null;
+					try {
+						URI uri = new URI(getLocalAutomakeMacrosDocName(amDocVer));
+						IPath p = URIUtil.toPath(uri);
+						// Try to open the file as local to this plug-in.
+						docStream = FileLocator.openStream(AutotoolsPlugin.getDefault().getBundle(), p, false);
+					} catch (IOException e) {
+						// Local open failed.  Try normal external location.
+						URI acDoc = new URI(getAutomakeMacrosDocName(amDocVer));
+						IPath p = URIUtil.toPath(acDoc);
+						if (p == null) {
+							URL url = acDoc.toURL();
+							docStream = url.openStream();
+						} else {
+							docStream = new FileInputStream(p.toFile());
+						}
+					}
+					DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+					factory.setValidating(false);
+					try {
+						DocumentBuilder builder = factory.newDocumentBuilder();
+						doc = builder.parse(docStream);
+					}
+					catch (SAXParseException saxException) {
+						doc = null;
+					}
+					catch (SAXException saxEx) {
+						doc = null;
+					}
+					catch (ParserConfigurationException pce) {
+						doc = null;
+					}
+					catch (IOException ioe) {
+						doc = null;
+					}
+				} catch (FileNotFoundException e) {
+					AutotoolsPlugin.log(e);
+				} catch (MalformedURLException e) {
+					AutotoolsPlugin.log(e);
+				} catch (URISyntaxException e) {
+					AutotoolsPlugin.log(e);
+				}
+				am_document = doc;
+			}
+			catch (IOException ioe) {
+			}
+		}
+		amHoverDocs.put(amDocVer, am_document);
+		return am_document;
+	}
+
+	protected static AutotoolsHoverDoc getHoverDoc(IEditorInput input) {
+		String acDocVer = getDefaultAutoconfMacrosVer();
+		String amDocVer = getDefaultAutomakeMacrosVer();
+		if (input instanceof IFileEditorInput) {
+			IFileEditorInput fe = (IFileEditorInput)input;
+			IFile f = fe.getFile();
+			IProject p = f.getProject();
+			try {
+				String acVer = p.getPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_VERSION);
+				if (acVer != null)
+					acDocVer = acVer;
+				else { // look for compat project properties
+					acVer = p.getPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_VERSION_COMPAT);
+					if (acVer != null)
+						acDocVer = acVer;
+				}
+			} catch (CoreException ce1) {
+				// do nothing
+			}
+			try {
+				String amVer = p.getPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_VERSION);
+				if (amVer != null)
+					amDocVer = amVer;
+				else { // look for compat project properties
+					amVer = p.getPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_VERSION_COMPAT);
+					if (amVer != null)
+						amDocVer = amVer;
+				}
+			} catch (CoreException ce2) {
+				// do nothing
+			}
+		}
+		Document ac_document = getACDoc(acDocVer);
+		Document am_document = getAMDoc(amDocVer);
+		return new AutoconfTextHover.AutotoolsHoverDoc(ac_document, am_document);
+	}
+
+	public AutoconfTextHover(AutoconfEditor editor) {
+		fEditor = editor;
+	}
+
+	public static String getIndexedInfo(String name, AutoconfEditor editor) {
+		AutotoolsHoverDoc h = getHoverDoc(editor.getEditorInput());
+		String x = getIndexedInfoFromDocument(name, h.getAcDocument());
+		if (x == null)
+			x = getIndexedInfoFromDocument(name, h.getAmDocument());
+		return x;
+	}
+
+	private static String getIndexedInfoFromDocument(String name, Document document) {
+		StringBuffer buffer = new StringBuffer();
+
+		if (document != null && name != null) {
+			Element elem = document.getElementById(name);
+			if (null != elem) {
+				int prototypeCount = 0;
+				buffer.append("<B>Macro:</B> " + name);
+				NodeList nl = elem.getChildNodes();
+				for (int i = 0; i < nl.getLength(); ++i) {
+					Node n = nl.item(i);
+					String nodeName = n.getNodeName();
+					if (nodeName.equals("prototype")) { //$NON-NLS-1$
+						String prototype = "";
+						++prototypeCount;
+						if (prototypeCount == 1) {
+							buffer.append(" (");
+						} else
+							buffer.append("    <B>or</B> " + name + " (<I>"); //$NON-NLS-2$
+						NodeList varList = n.getChildNodes();
+						for (int j = 0; j < varList.getLength(); ++j) {
+							Node v = varList.item(j);
+							String vnodeName = v.getNodeName();
+							if (vnodeName.equals("parameter")) { //$NON-NLS-1$
+								NamedNodeMap parms = v.getAttributes();
+								Node parmNode = parms.item(0);
+								String parm = parmNode.getNodeValue();
+								prototype = (prototype.equals("")) 
+								? parm
+										: prototype + ", " + parm; 
+							}
+						}
+						buffer.append(prototype + "</I>)<br>"); //$NON-NLS-1$
+					}
+					if (nodeName.equals("synopsis")) {  //$NON-NLS-1$
+						Node textNode = n.getLastChild();
+						buffer.append("<br><B>Synopsis:</B> ");
+						buffer.append(textNode.getNodeValue());
+					}
+				}
+			}
+		}
+		if (buffer.length() > 0) {
+			HTMLPrinter.insertPageProlog(buffer, 0);
+			HTMLPrinter.addPageEpilog(buffer);
+			return buffer.toString();
+		}
+
+		return null;
+	}
+	
+	public static AutoconfMacro[] getMacroList(AutoconfEditor editor) {
+		IEditorInput input = editor.getEditorInput();
+		AutotoolsHoverDoc hoverdoc = getHoverDoc(input);
+		AutoconfMacro[] macros = getMacroList(hoverdoc);
+		return macros;
+	}
+	
+	private static AutoconfMacro[] getMacroList(AutotoolsHoverDoc hoverdoc) {
+		if (acHoverMacros == null) {
+			acHoverMacros = new HashMap<Document, ArrayList<AutoconfMacro>>();
+		}
+
+		ArrayList<AutoconfMacro> masterList = new ArrayList<AutoconfMacro>();
+		Document[] doc = hoverdoc.getDocuments();
+		for (int ix = 0; ix < doc.length; ++ix) {
+			Document macroDoc = doc[ix];
+			ArrayList<AutoconfMacro> list = acHoverMacros.get(macroDoc);
+			if (list == null && macroDoc != null) {
+				list = new ArrayList<AutoconfMacro>();
+				NodeList nl = macroDoc.getElementsByTagName("macro"); //$NON-NLS-1$
+				for (int i = 0; i < nl.getLength(); ++i) {
+					Node macro = nl.item(i);
+					NamedNodeMap macroAttrs = macro.getAttributes();
+					Node n2 = macroAttrs.getNamedItem("id"); //$NON-NLS-1$
+					if (n2 != null) {
+						String name = n2.getNodeValue();
+						String parms = "";
+						NodeList macroChildren = macro.getChildNodes();
+						for (int j = 0; j < macroChildren.getLength(); ++j) {
+							Node x = macroChildren.item(j);
+							if (x.getNodeName().equals("prototype")) { //$NON-NLS-1$
+								// Use parameters for context info.
+								NodeList parmList = x.getChildNodes();
+								int parmCount = 0;
+								for (int k = 0; k < parmList.getLength(); ++k) {
+									Node n3 = parmList.item(k);
+									if (n3.getNodeName() == "parameter") {  //$NON-NLS-1$
+										NamedNodeMap parmVals = n3.getAttributes();
+										Node parmVal = parmVals.item(0);
+										if (parmCount > 0)
+											parms = parms + ", "; //$NON-NLS-1$
+										parms = parms + parmVal.getNodeValue();
+										++parmCount;
+									}
+								}
+							}
+						}
+						AutoconfMacro m = new AutoconfMacro(name, parms);
+						list.add(m);
+					}
+				}
+				// Cache the arraylist of macros for later usage.
+				acHoverMacros.put(macroDoc, list);
+			}
+			masterList.addAll(list);
+		}
+		// Convert to a sorted array of macros and return result.
+		AutoconfMacro[] macros = new AutoconfMacro[masterList.size()];
+		masterList.toArray(macros);
+		Arrays.sort(macros);
+		return macros;
+	}
+
+	public static AutoconfPrototype getPrototype(String name, AutoconfEditor editor) {
+		IEditorInput input = editor.getEditorInput();
+		AutotoolsHoverDoc hoverdoc = getHoverDoc(input);
+		AutoconfPrototype x = getPrototype(name, hoverdoc.getAcDocument());
+		if (x == null)
+			x = getPrototype(name, hoverdoc.getAmDocument());
+		return x;
+	}
+
+	private static AutoconfPrototype getPrototype(String name, Document document) {
+		AutoconfPrototype p = null;
+		if (document != null && name != null) {
+			Element elem = document.getElementById(name);
+			if (null != elem) {
+				int prototypeCount = -1;
+				p = new AutoconfPrototype();
+				p.setName(name);
+				NodeList nl = elem.getChildNodes();
+				for (int i = 0; i < nl.getLength(); ++i) {
+					Node n = nl.item(i);
+					String nodeName = n.getNodeName();
+					if (nodeName.equals("prototype")) { //$NON-NLS-1$
+						++prototypeCount;
+						int parmCount = 0;
+						int minParmCount = -1;
+						p.setNumPrototypes(prototypeCount  + 1);
+						NodeList varList = n.getChildNodes();
+						for (int j = 0; j < varList.getLength(); ++j) {
+							Node v = varList.item(j);
+							String vnodeName = v.getNodeName();
+							if (vnodeName.equals("parameter")) { //$NON-NLS-1$
+								++parmCount;
+								NamedNodeMap parms = v.getAttributes();
+								Node parmNode = parms.item(0);
+								String parm = parmNode.getNodeValue();
+								// Check for first optional parameter which means
+								// we know the minimum number of parameters needed.
+								if (minParmCount < 0 && (parm.charAt(0) == '[' ||
+										parm.startsWith("...")))
+									minParmCount = parmCount  - 1;
+								// Old style documentation sometimes had '[' in
+								// prototypes so look for one at end of a parm too.
+								else if (minParmCount < 0 && parm.endsWith("["))
+									minParmCount = parmCount;
+								p.setParmName(prototypeCount, parmCount - 1, parm);
+							}
+						}
+						p.setMaxParms(prototypeCount, parmCount);
+						// If we see no evidence of optional parameters, then
+						// the min and max number of parameters are equal.
+						if (minParmCount < 0)
+							minParmCount = parmCount;
+						p.setMinParms(prototypeCount, minParmCount);
+					}
+				}
+			}
+		}
+		return p;
+	}
+
+	public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
+
+		String hoverInfo = null;
+
+		IDocument d = textViewer.getDocument();
+
+		try {
+			String name = d.get(hoverRegion.getOffset(), hoverRegion.getLength());
+			hoverInfo = getIndexedInfo(name, fEditor);
+		} catch (BadLocationException e) {
+			// do nothing
+		}
+		// TODO Auto-generated method stub
+		return hoverInfo;
+	}
+
+	/*
+	 * @see ITextHover#getHoverRegion(ITextViewer, int)
+	 */
+	public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
+
+		if (textViewer != null) {
+			/*
+			 * If the hover offset falls within the selection range return the
+			 * region for the whole selection.
+			 */
+			Point selectedRange = textViewer.getSelectedRange();
+			if (selectedRange.x >= 0 && selectedRange.y > 0
+					&& offset >= selectedRange.x
+					&& offset <= selectedRange.x + selectedRange.y)
+				return new Region(selectedRange.x, selectedRange.y);
+			else {
+				return CWordFinder.findWord(textViewer.getDocument(), offset);
+			}
+		}
+		return null;
+	}
+
+	/*
+	 * @see ITextHoverExtension#getHoverControlCreator()
+	 * @since 3.0
+	 */
+	public IInformationControlCreator getHoverControlCreator() {
+		return new IInformationControlCreator() {
+			public IInformationControl createInformationControl(Shell parent) {
+				return new DefaultInformationControl(parent, getTooltipAffordanceString(),
+						new HTMLTextPresenter(false));
+			}
+		};
+	}
+
+	/*
+	 * Static member function to allow content assist to add hover help.
+	 */
+	public static IInformationControlCreator getInformationControlCreator() {
+		return new IInformationControlCreator() {
+			public IInformationControl createInformationControl(Shell parent) {
+				return new DefaultInformationControl(parent, getTooltipAffordanceString(),
+						new HTMLTextPresenter(false));
+			}
+		};
+	}
+
+	protected static String getTooltipAffordanceString() {
+		if (fBindingService == null)
+			return null;
+
+		String keySequence= fBindingService.getBestActiveBindingFormattedFor(IAutotoolEditorActionDefinitionIds.SHOW_TOOLTIP);
+		if (keySequence == null)
+			return null;
+
+		return HoverMessages.getFormattedString("ToolTipFocus", keySequence == null ? "" : keySequence); //$NON-NLS-1$
+	}
+
+	/**
+	 * Returns the style sheet.
+	 *
+	 * @since 3.2
+	 */
+	protected static String getStyleSheet() {
+		if (fgStyleSheet == null) {
+			Bundle bundle= Platform.getBundle(AutotoolsUIPlugin.PLUGIN_ID);
+			URL styleSheetURL= bundle.getEntry("/AutoconfHoverStyleSheet.css"); //$NON-NLS-1$
+			if (styleSheetURL != null) {
+				try {
+					styleSheetURL= FileLocator.toFileURL(styleSheetURL);
+					BufferedReader reader= new BufferedReader(new InputStreamReader(styleSheetURL.openStream()));
+					StringBuffer buffer= new StringBuffer(200);
+					String line= reader.readLine();
+					while (line != null) {
+						buffer.append(line);
+						buffer.append('\n');
+						line= reader.readLine();
+					}
+					fgStyleSheet= buffer.toString();
+				} catch (IOException ex) {
+					CCorePlugin.log(ex);
+					fgStyleSheet= ""; //$NON-NLS-1$
+				}
+			}
+		}
+		return fgStyleSheet;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/HoverMessages.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/HoverMessages.java
new file mode 100644
index 0000000..e3757a4
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/HoverMessages.java
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.text.hover;
+
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+
+/**
+ * AutoconfEditorMessages
+ */
+public class HoverMessages {
+
+	private static final String RESOURCE_BUNDLE= HoverMessages.class.getName();
+
+	private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);
+
+	private HoverMessages() {
+	}
+
+	public static String getString(String key) {
+		try {
+			return fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+	}
+	/**
+	 * Gets a string from the resource bundle and formats it with the argument
+	 * 
+	 * @param key	the string used to get the bundle value, must not be null
+	 * @since 3.0
+	 */
+	public static String getFormattedString(String key, Object arg) {
+		String format= null;
+		try {
+			format= fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+		if (arg == null)
+			arg= ""; //$NON-NLS-1$
+		return MessageFormat.format(format, new Object[] { arg });
+	}
+	/**
+	 * Gets a string from the resource bundle and formats it with the arguments
+	 * 
+	 * @param key	the string used to get the bundle value, must not be null
+	 * @since 3.0
+	 */
+	public static String getFormattedString(String key, Object arg1, Object arg2) {
+		String format= null;
+		try {
+			format= fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+		if (arg1 == null)
+			arg1= ""; //$NON-NLS-1$
+		if (arg2 == null)
+			arg2= ""; //$NON-NLS-1$
+		return MessageFormat.format(format, new Object[] { arg1, arg2 });
+	}
+	
+	/**
+	 * Gets a string from the resource bundle and formats it with the argument
+	 * 
+	 * @param key	the string used to get the bundle value, must not be null
+	 * @since 3.0
+	 */
+	public static String getFormattedString(String key, boolean arg) {
+		String format= null;
+		try {
+			format= fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+		return MessageFormat.format(format, new Object[] { new Boolean(arg) });
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/HoverMessages.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/HoverMessages.properties
new file mode 100644
index 0000000..d9326d9
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/HoverMessages.properties
@@ -0,0 +1,11 @@
+#################################################################################
+#  Copyright (c) 2006 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+# 
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+ToolTipFocus="Press ''{0}'' for focus."
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsBuildWizard.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsBuildWizard.java
new file mode 100644
index 0000000..920d80b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsBuildWizard.java
@@ -0,0 +1,86 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2008, 2009 Intel Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Intel Corporation - initial API and implementation
+ *     Red Hat Inc - modification for Autotools project
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.SortedMap;
+
+import org.eclipse.cdt.managedbuilder.buildproperties.IBuildPropertyManager;
+import org.eclipse.cdt.managedbuilder.buildproperties.IBuildPropertyType;
+import org.eclipse.cdt.managedbuilder.buildproperties.IBuildPropertyValue;
+import org.eclipse.cdt.managedbuilder.core.BuildListComparator;
+import org.eclipse.cdt.managedbuilder.core.IProjectType;
+import org.eclipse.cdt.managedbuilder.core.IToolChain;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.managedbuilder.ui.properties.Messages;
+import org.eclipse.cdt.managedbuilder.ui.wizards.AbstractCWizard;
+import org.eclipse.cdt.managedbuilder.ui.wizards.MBSWizardHandler;
+import org.eclipse.cdt.ui.newui.CDTPrefUtil;
+import org.eclipse.cdt.ui.wizards.EntryDescriptor;
+import org.eclipse.jface.wizard.IWizard;
+
+/**
+ *
+ */
+public class AutotoolsBuildWizard extends AbstractCWizard {
+	public static final String OTHERS_LABEL = Messages.getString("CNewWizard.0");  //$NON-NLS-1$
+	public static final String AUTOTOOLS_PROJECTTYPE_ID = "org.eclipse.linuxtools.cdt.autotools.core.projectType"; //$NON-NLS-1$
+	
+	/**
+	 * @since 5.1
+	 */
+	public static final String EMPTY_PROJECT = Messages.getString("AbstractCWizard.0");  //$NON-NLS-1$
+	/**
+	 * Creates and returns an array of items to be displayed 
+	 */
+	public EntryDescriptor[] createItems(boolean supportedOnly, IWizard wizard) {
+		IBuildPropertyManager bpm = ManagedBuildManager.getBuildPropertyManager();
+		IBuildPropertyType bpt = bpm.getPropertyType(MBSWizardHandler.ARTIFACT);
+		IBuildPropertyValue[] vs = bpt.getSupportedValues();
+		Arrays.sort(vs, BuildListComparator.getInstance());
+		ArrayList<EntryDescriptor> items = new ArrayList<EntryDescriptor>();
+		
+		// look for Autotools project type
+		EntryDescriptor oldsRoot = null;
+		SortedMap<String, IProjectType> sm = ManagedBuildManager.getExtensionProjectTypeMap();
+		for (String s : sm.keySet()) {
+			IProjectType pt = (IProjectType)sm.get(s);
+			if (pt.getId().equals(AUTOTOOLS_PROJECTTYPE_ID)) {
+				AutotoolsBuildWizardHandler h = new AutotoolsBuildWizardHandler(pt, parent, wizard);
+				IToolChain[] tcs = ManagedBuildManager.getExtensionToolChains(pt);
+				for(int i = 0; i < tcs.length; i++){
+					IToolChain t = tcs[i];
+					if(t.isSystemObject()) 
+						continue;
+					if (!isValid(t, supportedOnly, wizard))
+						continue;
+
+					h.addTc(t);
+				}
+
+				String pId = null;
+				if (CDTPrefUtil.getBool(CDTPrefUtil.KEY_OTHERS)) {
+					if (oldsRoot == null) {
+						oldsRoot = new EntryDescriptor(OTHERS_LABEL, null, OTHERS_LABEL, true, null, null);
+						items.add(oldsRoot);
+					}
+					pId = oldsRoot.getId();
+				} else { // do not group to <Others>
+					pId = null;
+				}
+				items.add(new EntryDescriptor(pt.getId(), pId, pt.getName(), true, h, null));
+			}
+		}
+		return (EntryDescriptor[])items.toArray(new EntryDescriptor[items.size()]);
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsBuildWizardHandler.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsBuildWizardHandler.java
new file mode 100644
index 0000000..35f541a
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsBuildWizardHandler.java
@@ -0,0 +1,42 @@
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards;
+
+import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.IProjectType;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.managedbuilder.ui.wizards.MBSWizardHandler;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsNewProjectNature;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsConfigurationManager;
+import org.eclipse.swt.widgets.Composite;
+
+public class AutotoolsBuildWizardHandler extends MBSWizardHandler {
+	public AutotoolsBuildWizardHandler(Composite p, IWizard w) {
+		super(AutotoolsWizardMessages.getResourceString("AutotoolsBuildWizard.0"), p, w); //$NON-NLS-1$
+	}
+
+	public AutotoolsBuildWizardHandler(IProjectType pt, Composite parent, IWizard wizard) {
+		super(pt, parent, wizard);
+	}
+
+	@Override
+	public void convertProject(IProject proj, IProgressMonitor monitor) throws CoreException {
+	    super.convertProject(proj, monitor);
+		AutotoolsNewProjectNature.addAutotoolsNature(proj, monitor);
+		
+		// For each IConfiguration, create a corresponding Autotools Configuration
+		IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(proj);
+		IConfiguration[] cfgs = info.getManagedProject().getConfigurations();
+		for (int i = 0; i < cfgs.length; ++i) {
+			IConfiguration cfg = cfgs[i];
+			ICConfigurationDescription cfgd = ManagedBuildManager.getDescriptionForConfiguration(cfg);
+			String id = cfgd.getId();
+			AutotoolsConfigurationManager.getInstance().getConfiguration(proj, id, true);
+		}
+		AutotoolsConfigurationManager.getInstance().saveConfigs(proj);
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsNewCCProjectWizardV2.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsNewCCProjectWizardV2.java
new file mode 100644
index 0000000..9ab81be
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsNewCCProjectWizardV2.java
@@ -0,0 +1,340 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2005, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Rational Software - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.ICDescriptor;
+import org.eclipse.cdt.managedbuilder.core.BuildException;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.IManagedProject;
+import org.eclipse.cdt.managedbuilder.core.IProjectType;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
+import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
+import org.eclipse.cdt.managedbuilder.ui.wizards.MBSCustomPageManager;
+import org.eclipse.cdt.ui.newui.CDTHelpContextIds;
+import org.eclipse.cdt.ui.wizards.NewCCProjectWizard;
+import org.eclipse.cdt.ui.wizards.NewCProjectWizardPage;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.wizard.IWizardPage;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsNewProjectNature;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.PlatformUI;
+
+
+
+@SuppressWarnings("deprecation")
+public class AutotoolsNewCCProjectWizardV2 extends NewCCProjectWizard {
+
+	/* (non-Javadoc)
+	 * String constants
+	 */
+	protected static final String PREFIX = "WizardAutotoolsNewCCProjectV2";	//$NON-NLS-1$
+	protected static final String OP_ERROR = PREFIX + ".op_error";	//$NON-NLS-1$
+	protected static final String WZ_TITLE = PREFIX + ".title";	//$NON-NLS-1$
+	protected static final String WZ_DESC = PREFIX + ".description";	//$NON-NLS-1$
+	protected static final String WINDOW_TITLE = PREFIX + ".windowTitle";  //$NON-NLS-1$
+	protected static final String CONF_TITLE = PREFIX + ".config.title";	//$NON-NLS-1$
+	protected static final String CONF_DESC = PREFIX + ".config.desc";	//$NON-NLS-1$
+	protected static final String OPTIONS_TITLE = PREFIX + ".options.title";	//$NON-NLS-1$
+	protected static final String OPTIONS_DESC = PREFIX + ".options.desc";	//$NON-NLS-1$
+	protected static final String MSG_ADD_NATURE = PREFIX + ".message.add_nature";	//$NON-NLS-1$
+	protected static final String MSG_ADD_BUILDER = PREFIX + ".message.add_builder";	//$NON-NLS-1$
+	protected static final String MSG_SAVE = PREFIX + ".message.save";	//$NON-NLS-1$
+	
+	// Wizard pages
+	protected CProjectPlatformPage projectConfigurationPage;
+	protected NewAutotoolsProjectOptionPage optionPage;
+	protected IProjectType projectType;
+
+	public AutotoolsNewCCProjectWizardV2() {
+		this(AutotoolsUIPlugin.getResourceString(WZ_TITLE), AutotoolsUIPlugin.getResourceString(WZ_DESC));
+	}
+
+	public AutotoolsNewCCProjectWizardV2(String title, String description) {
+		super(title, description);
+	}
+	/**
+	 * Method getWzDescriptionResource,  allows Wizard description label value
+	 * to be changed by subclasses
+	 * 
+	 * @return String
+	 */
+	protected static String getWzDescriptionResource() {
+		return AutotoolsUIPlugin.getResourceString(WZ_DESC);
+	}
+
+	/**
+	 * Method getWzTitleResource,  allows Wizard description label value
+	 * to be changed by subclasses
+	 * 
+	 * @return String
+	 */
+	protected static String getWzTitleResource() {
+		return AutotoolsUIPlugin.getResourceString(WZ_TITLE);
+	}
+
+	/**
+	 * Method getWindowTitleResource, allows Wizard Title label value to be
+	 * changed by subclasses
+	 * 
+	 * @return String
+	 */
+	protected static String getWindowTitleResource() {
+		return AutotoolsUIPlugin.getResourceString(WINDOW_TITLE);
+	}
+
+	/**
+	  * Method getPrefix,  allows prefix value to be changed by subclasses
+	  * 
+	  * @return String
+	  */
+	protected static String getPrefix() {
+		return PREFIX;
+	}
+
+	public void addPages() {
+		// Add the default page for all new projects 
+		super.addPages();
+		
+		// Add the configuration selection page
+		projectConfigurationPage = new CProjectPlatformPage(PREFIX, this);
+		projectConfigurationPage.setTitle(AutotoolsUIPlugin.getResourceString(CONF_TITLE));
+		projectConfigurationPage.setDescription(AutotoolsUIPlugin.getResourceString(CONF_DESC));
+		addPage(projectConfigurationPage);
+		
+		// Add the options (tabbed) page
+		optionPage = new NewAutotoolsProjectOptionPage(PREFIX, this);
+		optionPage.setTitle(AutotoolsUIPlugin.getResourceString(OPTIONS_TITLE));
+		optionPage.setDescription(AutotoolsUIPlugin.getResourceString(OPTIONS_DESC));
+		addPage(optionPage);
+		
+		// add custom pages
+		MBSCustomPageManager.init();
+		
+		// add stock pages
+		MBSCustomPageManager.addStockPage(fMainPage, NewCProjectWizardPage.PAGE_ID);
+		MBSCustomPageManager.addStockPage(projectConfigurationPage, CProjectPlatformPage.PAGE_ID);
+		MBSCustomPageManager.addStockPage(optionPage, NewAutotoolsProjectOptionPage.PAGE_ID);
+		
+	}
+	
+	public void createPageControls(Composite pageContainer) {
+		super.createPageControls( pageContainer );
+		
+		IWizardPage [] pages = getPages();
+		
+		if (pages != null) {
+			for (int i = 0; i < pages.length; i++) {
+				IWizardPage page = pages[i];
+				if (page instanceof NewCProjectWizardPage) {
+					// Setup the help information
+					PlatformUI.getWorkbench().getHelpSystem().setHelp(pageContainer, CDTHelpContextIds.MAN_PROJ_WIZ_NAME_PAGE);
+				}
+				else if (page instanceof NewAutotoolsProjectOptionPage) {
+					NewAutotoolsProjectOptionPage optionPage = (NewAutotoolsProjectOptionPage) page;
+					optionPage.setupHelpContextIds();
+				}
+				//  The other built-in page is the CProjectPlatformPage which already has a help id.
+			} 
+		}
+	}
+	
+	public void updateProjectTypeProperties() {
+		//  Update the error parser list
+		optionPage.updateProjectTypeProperties();
+	}
+
+	protected void addNature(IProgressMonitor monitor) throws CoreException {
+		monitor.beginTask("", 4);
+		monitor.subTask(AutotoolsUIPlugin.getResourceString(MSG_ADD_NATURE));
+		ManagedCProjectNature.addManagedNature(newProject, new SubProgressMonitor(monitor, 1));
+		monitor.subTask(AutotoolsUIPlugin.getResourceString(MSG_ADD_BUILDER));
+		ManagedCProjectNature.addManagedBuilder(newProject, new SubProgressMonitor(monitor, 1));
+		monitor.subTask(AutotoolsUIPlugin.getResourceString(MSG_ADD_NATURE));
+		AutotoolsNewProjectNature.addAutotoolsNature(newProject, new SubProgressMonitor(monitor, 1));
+		monitor.subTask(AutotoolsUIPlugin.getResourceString(MSG_ADD_BUILDER));
+		AutotoolsNewProjectNature.addAutotoolsBuilder(newProject, new SubProgressMonitor(monitor, 1));
+		monitor.done();
+	}
+	
+	public IProjectType getProjectType() {
+		return projectConfigurationPage.getProjectType();
+	}
+
+	protected void doRun(IProgressMonitor monitor) throws CoreException {
+		if (monitor == null) {
+			monitor = new NullProgressMonitor();
+		}
+
+		// super.doRun() just creates the project and does not assign a builder to it.
+		super.doRun(new SubProgressMonitor(monitor, 5));
+
+		// Add the managed build nature and builder
+		try {
+			addNature(new SubProgressMonitor(monitor, 2));
+		} catch (CoreException e) {
+			AutotoolsUIPlugin.log(e);
+		}
+		// FIXME: Default scanner property: make -w - eventually we want to use Make core's build scanner
+		newProject.setPersistentProperty(AutotoolsPropertyConstants.SCANNER_USE_MAKE_W, AutotoolsPropertyConstants.TRUE);
+		
+		CCorePlugin.getDefault().mapCProjectOwner(newProject, getProjectID(), true);
+		
+		// Add the ManagedProject to the project
+		IManagedProject newManagedProject = null;
+		IManagedBuildInfo info = null;
+		try {
+			info = ManagedBuildManager.createBuildInfo(newProject);
+			IProjectType parent = getProjectType();
+			newManagedProject = ManagedBuildManager.createManagedProject(newProject, parent);
+			if (newManagedProject != null) {
+				IConfiguration [] selectedConfigs = getSelectedConfigurations();
+				for (int i = 0; i < selectedConfigs.length; i++) {
+					IConfiguration config = selectedConfigs[i];
+					int id = ManagedBuildManager.getRandomNumber();
+					IConfiguration newConfig = newManagedProject.createConfiguration(config, config.getId() + "." + id); //$NON-NLS-1$
+					newConfig.setArtifactName(newManagedProject.getDefaultArtifactName());
+				}
+				// Now add the first supported config in the list as the default
+				IConfiguration defaultCfg = null;
+				IConfiguration[] newConfigs = newManagedProject.getConfigurations();
+				for(int i = 0; i < newConfigs.length; i++) {
+					if(newConfigs[i].isSupported()){
+						defaultCfg = newConfigs[i];
+						break;
+					}
+				}
+				
+				if(defaultCfg == null && newConfigs.length > 0)
+					defaultCfg = newConfigs[0];
+				
+				if(defaultCfg != null) {
+					ManagedBuildManager.setDefaultConfiguration(newProject, defaultCfg);
+					ManagedBuildManager.setSelectedConfiguration(newProject, defaultCfg);
+				}
+				ManagedBuildManager.setNewProjectVersion(newProject);
+				ICDescriptor desc = null;
+				try {
+					desc = CCorePlugin.getDefault().getCProjectDescription(newProject, true);
+					desc.create(CCorePlugin.BUILD_SCANNER_INFO_UNIQ_ID, ManagedBuildManager.INTERFACE_IDENTITY);
+					//  TODO:  The binary parser setting is currently per-project in the rest of CDT.
+					//         In the MBS, it is per-coonfiguration.  For now, select the binary parsers of the
+					//         first configuration.
+//					if (newConfigs.length > 0) {
+//						IToolChain tc = newConfigs[0].getToolChain();
+//						ITargetPlatform targetPlatform = tc.getTargetPlatform();
+//					}
+				} catch (CoreException e) {
+					AutotoolsUIPlugin.log(e);
+				}
+			}
+		} catch (BuildException e) {
+			AutotoolsUIPlugin.log(e);
+		}
+
+		// Following is a bit of a hack because changing the project options
+		// causes a change event to be fired which will try to reindex the project.  
+		// We are in the middle of setting the project indexer which may end up 
+		// being the null indexer.  In that case, we don't want the default indexer 
+		// (Fast Indexer) to be invoked.
+		//IPDOMManager manager = CCorePlugin.getPDOMManager();
+		//ICProject cproject = CoreModel.getDefault().create(newProject);
+		//manager.setIndexerId(cproject, ConvertToAutotoolsProjectWizard.NULL_INDEXER_ID);
+
+		// Modify the project settings
+		if (newProject != null) {
+			optionPage.performApply(new SubProgressMonitor(monitor, 2));
+		}
+
+		// Save the build options
+		monitor.subTask(AutotoolsUIPlugin.getResourceString(MSG_SAVE));
+		if (info != null) {
+			info.setValid(true);
+			ManagedBuildManager.saveBuildInfo(newProject, true);
+		}
+		
+		IStatus initResult = ManagedBuildManager.initBuildInfoContainer(newProject);
+		if (initResult.getCode() != IStatus.OK) {
+			// At this point, I can live with a failure
+			AutotoolsUIPlugin.log(initResult);
+		}
+
+		monitor.done();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.wizards.NewCProjectWizard#doRunPrologue(org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	protected void doRunPrologue(IProgressMonitor monitor) {
+		// Auto-generated method stub
+
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.wizards.NewCProjectWizard#doRunEpilogue(org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	protected void doRunEpilogue(IProgressMonitor monitor) {
+		// Get my initializer to run
+		if(newProject == null)
+			return;
+
+		IStatus initResult = ManagedBuildManager.initBuildInfoContainer(newProject);
+		if (initResult.getCode() != IStatus.OK) {
+			// At this point, I can live with a failure
+			AutotoolsUIPlugin.log(initResult);
+		}
+		
+		// execute any operations specified by custom pages
+		// execute any operations specified by custom pages
+		IRunnableWithProgress operations[] = MBSCustomPageManager.getOperations();
+		
+		if (operations != null)
+		{
+			for(int k = 0; k < operations.length; k++)
+			{
+				try {
+				operations[k].run(monitor);
+				} catch(InvocationTargetException e) {
+					//TODO: what should we do?
+				} catch(InterruptedException e) {
+					//TODO: what should we do?
+				}
+			}
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.wizards.NewCProjectWizard#getProjectID()
+	 */
+	public String getProjectID() {
+//		return "org.eclipse.cdt.make.core.make"; //$NON-NLS-1$
+		return ManagedBuilderCorePlugin.MANAGED_MAKE_PROJECT_ID;
+	}
+	
+//	public IProjectType getSelectedProjectType() {
+//		return projectConfigurationPage.getSelectedProjectType();
+//	}
+
+	public IConfiguration[] getSelectedConfigurations() {
+		return projectConfigurationPage.getSelectedConfigurations();
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsNewCProjectWizardV2.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsNewCProjectWizardV2.java
new file mode 100644
index 0000000..3e647b2
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsNewCProjectWizardV2.java
@@ -0,0 +1,340 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2005, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Rational Software - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.ICDescriptor;
+import org.eclipse.cdt.managedbuilder.core.BuildException;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.IManagedProject;
+import org.eclipse.cdt.managedbuilder.core.IProjectType;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
+import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
+import org.eclipse.cdt.managedbuilder.ui.wizards.MBSCustomPageManager;
+import org.eclipse.cdt.ui.newui.CDTHelpContextIds;
+import org.eclipse.cdt.ui.wizards.NewCProjectWizard;
+import org.eclipse.cdt.ui.wizards.NewCProjectWizardPage;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.wizard.IWizardPage;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsNewProjectNature;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.PlatformUI;
+
+
+
+@SuppressWarnings("deprecation")
+public class AutotoolsNewCProjectWizardV2 extends NewCProjectWizard {
+
+	/* (non-Javadoc)
+	 * String constants
+	 */
+	protected static final String PREFIX = "WizardAutotoolsNewCProjectV2";	//$NON-NLS-1$
+	protected static final String OP_ERROR = PREFIX + ".op_error";	//$NON-NLS-1$
+	protected static final String WZ_TITLE = PREFIX + ".title";	//$NON-NLS-1$
+	protected static final String WZ_DESC = PREFIX + ".description";	//$NON-NLS-1$
+	protected static final String WINDOW_TITLE = PREFIX + ".windowTitle";  //$NON-NLS-1$
+	protected static final String CONF_TITLE = PREFIX + ".config.title";	//$NON-NLS-1$
+	protected static final String CONF_DESC = PREFIX + ".config.desc";	//$NON-NLS-1$
+	protected static final String OPTIONS_TITLE = PREFIX + ".options.title";	//$NON-NLS-1$
+	protected static final String OPTIONS_DESC = PREFIX + ".options.desc";	//$NON-NLS-1$
+	protected static final String MSG_ADD_NATURE = PREFIX + ".message.add_nature";	//$NON-NLS-1$
+	protected static final String MSG_ADD_BUILDER = PREFIX + ".message.add_builder";	//$NON-NLS-1$
+	protected static final String MSG_SAVE = PREFIX + ".message.save";	//$NON-NLS-1$
+	
+	// Wizard pages
+	protected CProjectPlatformPage projectConfigurationPage;
+	protected NewAutotoolsProjectOptionPage optionPage;
+	protected IProjectType projectType;
+
+	public AutotoolsNewCProjectWizardV2() {
+		this(AutotoolsUIPlugin.getResourceString(WZ_TITLE), AutotoolsUIPlugin.getResourceString(WZ_DESC));
+	}
+
+	public AutotoolsNewCProjectWizardV2(String title, String description) {
+		super(title, description);
+	}
+	/**
+	 * Method getWzDescriptionResource,  allows Wizard description label value
+	 * to be changed by subclasses
+	 * 
+	 * @return String
+	 */
+	protected static String getWzDescriptionResource() {
+		return AutotoolsUIPlugin.getResourceString(WZ_DESC);
+	}
+
+	/**
+	 * Method getWzTitleResource,  allows Wizard description label value
+	 * to be changed by subclasses
+	 * 
+	 * @return String
+	 */
+	protected static String getWzTitleResource() {
+		return AutotoolsUIPlugin.getResourceString(WZ_TITLE);
+	}
+
+	/**
+	 * Method getWindowTitleResource, allows Wizard Title label value to be
+	 * changed by subclasses
+	 * 
+	 * @return String
+	 */
+	protected static String getWindowTitleResource() {
+		return AutotoolsUIPlugin.getResourceString(WINDOW_TITLE);
+	}
+
+	/**
+	  * Method getPrefix,  allows prefix value to be changed by subclasses
+	  * 
+	  * @return String
+	  */
+	protected static String getPrefix() {
+		return PREFIX;
+	}
+
+	public void addPages() {
+		// Add the default page for all new projects 
+		super.addPages();
+		
+		// Add the configuration selection page
+		projectConfigurationPage = new CProjectPlatformPage(PREFIX, this);
+		projectConfigurationPage.setTitle(AutotoolsUIPlugin.getResourceString(CONF_TITLE));
+		projectConfigurationPage.setDescription(AutotoolsUIPlugin.getResourceString(CONF_DESC));
+		addPage(projectConfigurationPage);
+		
+		// Add the options (tabbed) page
+		optionPage = new NewAutotoolsProjectOptionPage(PREFIX, this);
+		optionPage.setTitle(AutotoolsUIPlugin.getResourceString(OPTIONS_TITLE));
+		optionPage.setDescription(AutotoolsUIPlugin.getResourceString(OPTIONS_DESC));
+		addPage(optionPage);
+		
+		// add custom pages
+		MBSCustomPageManager.init();
+		
+		// add stock pages
+		MBSCustomPageManager.addStockPage(fMainPage, NewCProjectWizardPage.PAGE_ID);
+		MBSCustomPageManager.addStockPage(projectConfigurationPage, CProjectPlatformPage.PAGE_ID);
+		MBSCustomPageManager.addStockPage(optionPage, NewAutotoolsProjectOptionPage.PAGE_ID);
+		
+	}
+	
+	public void createPageControls(Composite pageContainer) {
+		super.createPageControls( pageContainer );
+		
+		IWizardPage [] pages = getPages();
+		
+		if (pages != null) {
+			for (int i = 0; i < pages.length; i++) {
+				IWizardPage page = pages[i];
+				if (page instanceof NewCProjectWizardPage) {
+					// Setup the help information
+					PlatformUI.getWorkbench().getHelpSystem().setHelp(pageContainer, CDTHelpContextIds.MAN_PROJ_WIZ_NAME_PAGE);
+				}
+				else if (page instanceof NewAutotoolsProjectOptionPage) {
+					NewAutotoolsProjectOptionPage optionPage = (NewAutotoolsProjectOptionPage) page;
+					optionPage.setupHelpContextIds();
+				}
+				//  The other built-in page is the CProjectPlatformPage which already has a help id.
+			} 
+		}
+	}
+	
+	public void updateProjectTypeProperties() {
+		//  Update the error parser list
+		optionPage.updateProjectTypeProperties();
+	}
+
+	protected void addNature(IProgressMonitor monitor) throws CoreException {
+		monitor.beginTask("", 4);
+		monitor.subTask(AutotoolsUIPlugin.getResourceString(MSG_ADD_NATURE));
+		ManagedCProjectNature.addManagedNature(newProject, new SubProgressMonitor(monitor, 1));
+		monitor.subTask(AutotoolsUIPlugin.getResourceString(MSG_ADD_BUILDER));
+		ManagedCProjectNature.addManagedBuilder(newProject, new SubProgressMonitor(monitor, 1));
+		monitor.subTask(AutotoolsUIPlugin.getResourceString(MSG_ADD_NATURE));
+		AutotoolsNewProjectNature.addAutotoolsNature(newProject, new SubProgressMonitor(monitor, 1));
+		monitor.subTask(AutotoolsUIPlugin.getResourceString(MSG_ADD_BUILDER));
+		AutotoolsNewProjectNature.addAutotoolsBuilder(newProject, new SubProgressMonitor(monitor, 1));
+		monitor.done();
+	}
+	
+	public IProjectType getProjectType() {
+		return projectConfigurationPage.getProjectType();
+	}
+
+	protected void doRun(IProgressMonitor monitor) throws CoreException {
+		if (monitor == null) {
+			monitor = new NullProgressMonitor();
+		}
+
+		// super.doRun() just creates the project and does not assign a builder to it.
+		super.doRun(new SubProgressMonitor(monitor, 5));
+
+		// Add the managed build nature and builder
+		try {
+			addNature(new SubProgressMonitor(monitor, 2));
+		} catch (CoreException e) {
+			AutotoolsUIPlugin.log(e);
+		}
+		// FIXME: Default scanner property: make -w - eventually we want to use Make core's build scanner
+		newProject.setPersistentProperty(AutotoolsPropertyConstants.SCANNER_USE_MAKE_W, AutotoolsPropertyConstants.TRUE);
+		
+		CCorePlugin.getDefault().mapCProjectOwner(newProject, getProjectID(), true);
+		
+		// Add the ManagedProject to the project
+		IManagedProject newManagedProject = null;
+		IManagedBuildInfo info = null;
+		try {
+			info = ManagedBuildManager.createBuildInfo(newProject);
+			IProjectType parent = getProjectType();
+			newManagedProject = ManagedBuildManager.createManagedProject(newProject, parent);
+			if (newManagedProject != null) {
+				IConfiguration [] selectedConfigs = getSelectedConfigurations();
+				for (int i = 0; i < selectedConfigs.length; i++) {
+					IConfiguration config = selectedConfigs[i];
+					int id = ManagedBuildManager.getRandomNumber();
+					IConfiguration newConfig = newManagedProject.createConfiguration(config, config.getId() + "." + id); //$NON-NLS-1$
+					newConfig.setArtifactName(newManagedProject.getDefaultArtifactName());
+				}
+				// Now add the first supported config in the list as the default
+				IConfiguration defaultCfg = null;
+				IConfiguration[] newConfigs = newManagedProject.getConfigurations();
+				for(int i = 0; i < newConfigs.length; i++) {
+					if(newConfigs[i].isSupported()){
+						defaultCfg = newConfigs[i];
+						break;
+					}
+				}
+				
+				if(defaultCfg == null && newConfigs.length > 0)
+					defaultCfg = newConfigs[0];
+				
+				if(defaultCfg != null) {
+					ManagedBuildManager.setDefaultConfiguration(newProject, defaultCfg);
+					ManagedBuildManager.setSelectedConfiguration(newProject, defaultCfg);
+				}
+				ManagedBuildManager.setNewProjectVersion(newProject);
+				ICDescriptor desc = null;
+				try {
+					desc = CCorePlugin.getDefault().getCProjectDescription(newProject, true);
+					desc.create(CCorePlugin.BUILD_SCANNER_INFO_UNIQ_ID, ManagedBuildManager.INTERFACE_IDENTITY);
+					//  TODO:  The binary parser setting is currently per-project in the rest of CDT.
+					//         In the MBS, it is per-coonfiguration.  For now, select the binary parsers of the
+					//         first configuration.
+//					if (newConfigs.length > 0) {
+//						IToolChain tc = newConfigs[0].getToolChain();
+//						ITargetPlatform targetPlatform = tc.getTargetPlatform();
+//					}
+				} catch (CoreException e) {
+					AutotoolsUIPlugin.log(e);
+				}
+			}
+		} catch (BuildException e) {
+			AutotoolsUIPlugin.log(e);
+		}
+
+		// Following is a bit of a hack because changing the project options
+		// causes a change event to be fired which will try to reindex the project.  
+		// We are in the middle of setting the project indexer which may end up 
+		// being the null indexer.  In that case, we don't want the default indexer 
+		// (Fast Indexer) to be invoked.
+		//IPDOMManager manager = CCorePlugin.getPDOMManager();
+		//ICProject cproject = CoreModel.getDefault().create(newProject);
+		//manager.setIndexerId(cproject, ConvertToAutotoolsProjectWizard.NULL_INDEXER_ID);
+
+		// Modify the project settings
+		if (newProject != null) {
+			optionPage.performApply(new SubProgressMonitor(monitor, 2));
+		}
+
+		// Save the build options
+		monitor.subTask(AutotoolsUIPlugin.getResourceString(MSG_SAVE));
+		if (info != null) {
+			info.setValid(true);
+			ManagedBuildManager.saveBuildInfo(newProject, true);
+		}
+		
+		IStatus initResult = ManagedBuildManager.initBuildInfoContainer(newProject);
+		if (initResult.getCode() != IStatus.OK) {
+			// At this point, I can live with a failure
+			AutotoolsUIPlugin.log(initResult);
+		}
+
+		monitor.done();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.wizards.NewCProjectWizard#doRunPrologue(org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	protected void doRunPrologue(IProgressMonitor monitor) {
+		// Auto-generated method stub
+
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.wizards.NewCProjectWizard#doRunEpilogue(org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	protected void doRunEpilogue(IProgressMonitor monitor) {
+		// Get my initializer to run
+		if(newProject == null)
+			return;
+
+		IStatus initResult = ManagedBuildManager.initBuildInfoContainer(newProject);
+		if (initResult.getCode() != IStatus.OK) {
+			// At this point, I can live with a failure
+			AutotoolsUIPlugin.log(initResult);
+		}
+		
+		// execute any operations specified by custom pages
+		// execute any operations specified by custom pages
+		IRunnableWithProgress operations[] = MBSCustomPageManager.getOperations();
+		
+		if (operations != null)
+		{
+			for(int k = 0; k < operations.length; k++)
+			{
+				try {
+				operations[k].run(monitor);
+				} catch(InvocationTargetException e) {
+					//TODO: what should we do?
+				} catch(InterruptedException e) {
+					//TODO: what should we do?
+				}
+			}
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.wizards.NewCProjectWizard#getProjectID()
+	 */
+	public String getProjectID() {
+//		return "org.eclipse.cdt.make.core.make"; //$NON-NLS-1$
+		return ManagedBuilderCorePlugin.MANAGED_MAKE_PROJECT_ID;
+	}
+	
+//	public IProjectType getSelectedProjectType() {
+//		return projectConfigurationPage.getSelectedProjectType();
+//	}
+
+	public IConfiguration[] getSelectedConfigurations() {
+		return projectConfigurationPage.getSelectedConfigurations();
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsWizardMessages.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsWizardMessages.java
new file mode 100644
index 0000000..adccbfd
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsWizardMessages.java
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2007, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM - Initial API and implementation
+ * Red Hat - Copy from org.eclipse.cdt.wizards to here plus rename 
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards;
+
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+/**
+ * @since 2.0
+ */
+public class AutotoolsWizardMessages {
+	// Bundle ID
+	private static final String BUNDLE_ID = AutotoolsWizardMessages.class.getName();
+	//Resource bundle.
+	private static ResourceBundle resourceBundle;
+
+	static {
+		try {
+			resourceBundle = ResourceBundle.getBundle(BUNDLE_ID);
+		} catch (MissingResourceException x) {
+			resourceBundle = null;
+		}
+	}
+
+	public static String getFormattedString(String key, String arg) {
+		return MessageFormat.format(getResourceString(key), new Object[] { arg });
+	}
+
+	public static String getFormattedString(String key, String[] args) {
+		return MessageFormat.format(getResourceString(key), (Object[])args);
+	}
+
+	public static String getResourceString(String key) {
+		try {
+			return resourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!"; //$NON-NLS-1$ //$NON-NLS-2$
+		} catch (NullPointerException e) {
+			return "#" + key + "#"; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	private AutotoolsWizardMessages() {
+		// No constructor
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsWizardMessages.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsWizardMessages.properties
new file mode 100644
index 0000000..5583ca1
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsWizardMessages.properties
@@ -0,0 +1,364 @@
+###############################################################################
+# Copyright (c) 2000, 2006, 2007 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM - Initial API and implementation
+# Red Hat - Copy to AutotoolsWizardMessages.properties
+###############################################################################
+
+# ------- Project Update Messages ------- 
+ManagedBuilderStartup.update.20x.title=Update Managed Make Project
+ManagedBuilderStartup.update.20x.message=The project {0} has been detected in your workspace.\n Its build settings are stored in a format that is no longer supported.\n Would you like to convert them now?
+
+AutotoolsBuildWizard.0=GNU Autotools project
+
+# ------- NewProjectCreationPluginPage------- 
+MngMakeProjectWizard.op_error=Managed Make Error
+MngMakeProjectWizard.title=Managed Make Project
+MngMakeProjectWizard.description=Create a new Managed Make project.
+#MngMakeProjectWizardSettings.title=Managed Make Settings
+#MngMakeProjectWizardSettings.description=Define the Managed Make build settings.
+MngMakeProjectWizard.message.add_nature=Adding Managed Nature
+MngMakeProjectWizard.message.add_builder=Adding Makefile Generator
+MngMakeProjectWizard.message.save=Saving new build options
+
+MngCWizard.title=Managed Make C Project
+MngCWizard.description=Create a new Managed Make C project.
+MngCWizardSettings.title=Managed Make C Settings
+MngCWizardSettings.description=Define the Managed Make C build settings.
+
+MngCCWizard.title=Managed Make C++ Project
+MngCCWizard.description=Create a new Managed Make C++ Project.
+MngCCWizard.message.creating=Creating a new C++ Project with a makefile generator
+MngCCWizardSettings.title=Managed Make C++ Settings
+MngCCWizardSettings.description=Define the Managed Make C++ build settings.
+
+# -- Strings for the platform selection page --
+MngMakeProjectWizard.config.title=Select a type of project
+MngMakeProjectWizard.config.desc=Select the platform and configurations you wish to deploy on
+PlatformBlock.tip.platform=Select the type of project for the build goal
+PlatformBlock.tip.forcedconfigs=There are no buildable configurations on this platform for this project type.\n By default, all configurations selected.
+PlatformBlock.label.platform=Project Type:
+PlatformBlock.label.configs=Configurations:
+PlatformBlock.label.showall=Show All Project Types
+PlatformBlock.label.showall.config=Show All Configurations
+PlatformBlock.label.selectAll=Select All
+PlatformBlock.label.deselectAll=Deselect All
+PlatformBlock.message.error.noconfigs=You must select at least one configuration
+
+# -- Strings for the additional options tab
+MngMakeProjectWizard.options.title=Additional Project Settings
+MngMakeProjectWizard.options.desc=Define the inter-project dependencies, if any.
+
+# ----------- Configuration Selection Page -----------
+BuildPropertyPage.label.Platform=Project Type:
+BuildPropertyPage.label.Configuration=Configuration:
+BuildPropertyPage.label.Active=Active configuration
+BuildPropertyPage.label.Settings=Configuration Settings
+BuildPropertyPage.label.AddConfButton=Manage...
+BuildPropertyPage.selection.configuration.all=All configurations
+BuildPropertyPage.tip.platform=Select a platform for the project
+BuildPropertyPage.tip.config=Select the configuration to edit
+BuildPropertyPage.tip.addconf=Add configurations for the platform
+BuildPropertyPage.tip.remconf=Remove configurations for the platform
+BuildPropertyPage.manage.title=Manage
+BuildPropertyPage.error.Unknown_tree_element=Unknown type of element in tree of type {0}
+BuildPropertyPage.error.version_low=The Managed Make project settings for this project are not available.
+BuildPropertyPage.defaults.title=Reset Configuration Tools
+BuildPropertyPage.defaults.message=This action will reset all of the tools in the selected configuration to their default settings.\n\nDo you want to proceed? 
+BuildPropertyPage.changes.save.title=Apply Configuration Changes
+BuildPropertyPage.changes.save.question=You have made changes to the {0} configuration.\n\nDo you want to apply these changes before switching to the {1} configuration? 
+BuildPropertyPage.changes.save.error=The configuration changes could not be applied.
+BuildPropertyPage.unsupported.proj=The project support is not installed on the system
+BuildPropertyPage.unsupported.config=The configuration support is not installed on the system
+BuildPropertyPage.config.notselected=No configurations selected
+
+# ----------- Managed Build Custom Wizard Page Manager Error Strings -----------
+MBSCustomPageManager.error0=Unknown element type 
+MBSCustomPageManager.error1=\ for extension point 
+MBSCustomPageManager.error2=Unknown child element type 
+MBSCustomPageManager.error3=\ for wizardPage element in extension point 
+MBSCustomPageManager.error4=Missing projectType ID
+MBSCustomPageManager.error5=Missing projectType ID
+MBSCustomPageManager.error6=Missing nature ID
+
+
+# ----------- Managed Build Preference Page -----------
+BuildPreferencePage.label.Settings=Workspace Settings
+BuildPreferencePage.job.rebuild=Rebuilding the Managed Projects
+BuildPreferencePage.apply.internal.error=An Internal error has occured please check error log.
+
+#--------------- Resource Configuration Selection Page --------------
+ResourceBuildPropertyPage.defaults.title=Reset Resource Configuration Tool
+ResourceBuildPropertyPage.defaults.message=This action will reset all options of the tool in the current resource configuration to their default settings.\n\nDo you want to proceed? 
+
+# ----------- Tools Settings Block -----------
+ToolsSettingsBlock.label.Settings=Tool Settings
+ToolsSettingsBlock.label.ToolTree=Tools
+ToolsSettingsBlock.label.ToolOptions=Options
+
+# ----------- Build Settings Block -----------
+BuildSettingsBlock.label.Settings=Build Settings
+BuildSettingsBlock.label.makecmdgroup=Build command
+BuildSettingsBlock.label.makecmddef=Use default command
+BuildSettingsBlock.label.output.group=Build output
+BuildSettingsBlock.label.output.name=Artifact name:
+BuildSettingsBlock.label.output.extension=Artifact extension:
+BuildSettingsBlock.defaults.title=Reset Build Settings
+BuildSettingsBlock.defaults.message=This action will reset the build settings to their default settings.\n\nDo you want to proceed?
+BuildSettingsBlock.label.macros.group=Build Macros usage
+BuildSettingsBlock.label.macros.expand=Expand Build Environment Macros
+BuildSettingsBlock.label.internal.builder.group=Internal Builder
+BuildSettingsBlock.label.internal.builder.enable=Enable Internal Builder
+BuildSettingsBlock.label.internal.builder.ignore.err=Ignore build errorors
+BuildSettingsBlock.label.internal.builder.experimental.note=NOTE: This is experimental functionality
+
+
+# ----------- Build Steps Block -----------
+BuildStepSettingsBlock.label.Settings=Build Steps
+BuildStepSettingsBlock.label.prebuildstep.group=Pre-build step:
+BuildStepSettingsBlock.label.prebuildstep.cmd=Command:
+BuildStepSettingsBlock.label.prebuildstep.desc=Description:
+BuildStepSettingsBlock.label.postbuildstep.group=Post-build step:
+BuildStepSettingsBlock.label.postbuildstep.cmd=Command:
+BuildStepSettingsBlock.label.postbuildstep.desc=Description:
+BuildStepsSettingsBlock.defaults.title=Reset Build Steps
+BuildStepsSettingsBlock.defaults.message=This action will reset the pre-build and post-build steps to their default settings.\n\nDo you want to proceed?
+
+# ----------- Environment Set Block -----------
+EnvironmentSetBlock.label.environment=Environment
+EnvironmentSetBlock.label.environment.group=Environment variables
+EnvironmentSetBlock.label.tab.configuration=Configuration
+EnvironmentSetBlock.label.tab.project=Project
+EnvironmentSetBlock.label.tab.workspace=Workspace
+EnvironmentSetBlock.label.tab.eclipse=Eclipse Environment
+
+# ----------- Environment Block -----------
+EnvironmentBlock.label.header.name=Name
+EnvironmentBlock.label.header.value=Value
+EnvironmentBlock.label.button.new=New
+EnvironmentBlock.label.button.edit=Edit
+EnvironmentBlock.label.button.delete=Delete
+EnvironmentBlock.label.button.undef=Undefine
+EnvironmentBlock.label.value.undef=<UNDEFINED>
+EnvironmentBlock.label.button.check.chow.parent=Show parent level variables
+EnvironmentBlock.label.user.var=User Variables
+EnvironmentBlock.label.system.var=System Variables
+EnvironmentBlock.label.delete.confirm.title=Variable deletion confirmation
+EnvironmentBlock.label.delete.confirm.message=Are you sure you want to delete the selected user variable(s)? 
+EnvironmentBlock.label.delete.all.confirm.title=Variable deletion confirmation
+EnvironmentBlock.label.delete.all.confirm.message=Are you sure you want to delete all user variables? 
+
+# ----------- New Env Var Dialog -----------
+NewEnvVarDialog.label.name=Name
+NewEnvVarDialog.label.value=Value
+NewEnvVarDialog.label.delimiter=Delimiter
+NewEnvVarDialog.label.operation=Operation
+NewEnvVarDialog.label.operation.replace=Replace
+NewEnvVarDialog.label.operation.prepend=Prepend
+NewEnvVarDialog.label.operation.append=Append
+NewEnvVarDialog.label.operation.remove=Remove
+NewEnvVarDialog.label.value.prepend=Prepended Value
+NewEnvVarDialog.label.value.append=Appended Value
+NewEnvVarDialog.label.value.undef=<UNDEFINED>
+NewEnvVarDialog.label.title.new=Define a new variable
+NewEnvVarDialog.label.title.edit=Edit existing variable
+NewEnvVarDialog.label.status.cannot.create=The "{0}" Variable can not be created by user
+
+# ----------- Macros Set Block -----------
+MacrosSetBlock.label.macros=Macros
+MacrosSetBlock.label.macros.group=Macros
+MacrosSetBlock.label.tab.configuration=Configuration
+MacrosSetBlock.label.tab.project=Project
+MacrosSetBlock.label.tab.workspace=Workspace
+
+# ----------- Macros Block -----------
+MacrosBlock.label.header.name=Name
+MacrosBlock.label.header.type=Type
+MacrosBlock.label.header.value=Value
+MacrosBlock.label.button.new=New
+MacrosBlock.label.button.edit=Edit
+MacrosBlock.label.button.delete=Delete
+MacrosBlock.label.button.check.chow.parent=Show parent context macros
+MacrosBlock.label.user.macros=User Macros
+MacrosBlock.label.system.macros=System Macros
+MacrosBlock.label.delete.confirm.title=Macro deletion confirmation
+MacrosBlock.label.delete.confirm.message=Are you sure you want to delete the selected user Macro(s)? 
+MacrosBlock.label.delete.all.confirm.title=Macro deletion confirmation
+MacrosBlock.label.delete.all.confirm.message=Are you sure you want to delete all user macros?
+MacrosBlock.label.value.eclipse.dynamic=<ECLIPSE DYNAMIC VARIABLE>
+MacrosBlock.label.type.text=String
+MacrosBlock.label.type.text.list=StringList
+MacrosBlock.label.type.path.file=File
+MacrosBlock.label.type.path.dir=Dir
+MacrosBlock.label.type.path.file.list=FileList
+MacrosBlock.label.type.path.dir.list=DirList
+MacrosBlock.label.type.path.any=Path
+MacrosBlock.label.type.path.any.list=PathList
+
+
+# ----------- New Build Macro Dialog -----------
+NewBuildMacroDialog.label.name=Name
+NewBuildMacroDialog.label.value=Value
+NewBuildMacroDialog.label.type=Type
+NewBuildMacroDialog.label.type.text=String
+NewBuildMacroDialog.label.type.text.list=List of Strings
+NewBuildMacroDialog.label.type.path.file=File
+NewBuildMacroDialog.label.type.path.dir=Directory
+NewBuildMacroDialog.label.type.path.file.list=List of Files
+NewBuildMacroDialog.label.type.path.dir.list=List of Directories
+NewBuildMacroDialog.label.type.path.any=File or Directory
+NewBuildMacroDialog.label.type.path.any.list=List of Files or Directories
+NewBuildMacroDialog.label.browse=Browse
+NewBuildMacroDialog.label.title.new=Define a new macro
+NewBuildMacroDialog.label.title.edit=Edit existing macro
+NewBuildMacroDialog.label.list.title=Macro Value
+NewBuildMacroDialog.label.status.cannot.create=The "{0}" Macro can not be created by user
+
+# ------------Resource Configuration Selection Page
+ResourceBuildPropertyPage.label.ActiveResource=Active Resource configuration
+ResourceBuildPropertyPage.label.ResourceSettings=Resource Configuration settings
+ResourceBuildPropertyPage.label.Configuration=Configuration:
+ResourceBuildPropertyPage.label.ExcludeCheckBox= Exclude from build
+ResourceBuildPropertyPage.selection.configuration.all=All configurations
+ResourceBuildPropertyPage.label.ToolTree=Tools
+ResourceBuildPropertyPage.label.ToolOptions=Options
+ResourceBuildPropertyPage.label.NotMBSFile=The project is closed or the file is not contained within a Managed Make project.
+ResourceBuildPropertyPage.error.version_low=The Managed Make project settings for this project are not available.
+ResourceBuildPropertyPage.tip.excludecheck=Exclude the file from building in the selected configuration
+ResourceBuildPropertyPage.tip.config=Select the configuration to edit
+ResourceBuildPropertyPage.unsupported.proj=The project support is not installed on the system
+ResourceBuildPropertyPage.unsupported.config=The configuration support is not installed on the system
+ResourceBuildPropertyPage.config.notselected=No configurations selected
+ResourceBuildPropertyPage.rc.non.build=Managed Build settings for this resource are not available
+ResourceBuildPropertyPage.rc.generated=The selected resource is created by the buildfile generator
+
+# ----------- Resource Custom Build Step Block -----------
+ResourceCustomBuildStepBlock.label.settings=Custom Build Steps
+ResourceCustomBuildStepBlock.label.tool.group=Resource Custom Build Step
+ResourceCustomBuildStepBlock.label.applicability=Custom Build Step Applicability
+ResourceCustomBuildStepBlock.label.applicability.rule.before=Apply Custom Build Step Before Other Tools
+ResourceCustomBuildStepBlock.label.applicability.rule.after=Apply Custom Build Step After Other Tools
+ResourceCustomBuildStepBlock.label.applicability.rule.override=Apply Custom Build Step Overriding Other Tools
+ResourceCustomBuildStepBlock.label.applicability.rule.disable=Disable Custom Build Step
+ResourceCustomBuildStepBlock.label.input.filenames=Additional Input file name(s):
+ResourceCustomBuildStepBlock.label.output.filenames=Output file name(s):
+ResourceCustomBuildStepBlock.label.command.cmd=Command:
+ResourceCustomBuildStepBlock.label.description.desc=Description:
+ResourceCustomBuildStepBlock.tip.applicability=specifies how to apply the custom build step with respect to other resource configuration tools
+ResourceCustomBuildStepBlock.tip.inputs=a semicolon separated list of additional input files for this build step.  Paths are interpreted as relative to the Project directory.
+ResourceCustomBuildStepBlock.tip.outputs=a semicolon separated list of the output files produced by this build step.  Paths are interpreted as relative to the Build directory.
+ResourceCustomBuildStepBlock.tip.command=a semicolon separated list of commands or a single command to be executed by this build step.  Paths are interpreted as relative to the Build directory.
+ResourceCustomBuildStepBlock.tip.announcement=a message to be output in the build log upon execution of this build step
+ResourceCustomBuildStepBlock.defaults.title=Reset Resource Custom Build Step
+ResourceCustomBuildStepBlock.defaults.message=This action will reset the resource custom build step to the default settings.\n\nDo you want to proceed?
+
+# ----------- Entry Dialog -----------
+BrowseEntryDialog.error.Folder_name_invalid = Folder name invalid
+BrowseEntryDialog.message.file = File:
+BrowseEntryDialog.message.directory = Directory:
+BrowseEntryDialog.file.title.add=Add file path
+BrowseEntryDialog.dir.title.add=Add directory path
+BrowseEntryDialog.file.title.edit=Edit file path
+BrowseEntryDialog.dir.title.edit=Edit directory path
+BrowseEntryDialog.wsp.dir.dlg.title=Folder selection
+BrowseEntryDialog.wsp.file.dlg.title=File selection
+BrowseEntryDialog.wsp.dir.dlg.msg=Select a folder from workspace:
+BrowseEntryDialog.wsp.file.dlg.msg=Select a file from workspace:
+BrowseEntryDialog.wsp.file.dlg.err=The selected element is not a file.
+BrowseEntryDialog.fs.dir.dlg.msg=Select a folder from file system:
+
+# ----------- New Configuration -----------
+NewConfiguration.label.name=Name:
+NewConfiguration.label.description=Description:
+NewConfiguration.label.group=Copy settings from
+NewConfiguration.label.copy=Default configuration:
+NewConfiguration.label.clone=Existing configuration:
+NewConfiguration.label.showall=Show unsupported configurations 
+NewConfiguration.error.duplicateName=A configuration named "{0}" already exists.
+NewConfiguration.error.caseName=A configuration name that differs only in case to "{0}" exists.
+NewConfiguration.error.invalidName=The name "{0}" is invalid.
+
+# ----------- Rename Configuration -----------
+RenameConfiguration.label.name=Name:
+RenameConfiguration.label.description=Description:
+RenameConfiguration.error.duplicateName=A configuration named "{0}" already exists.
+RenameConfiguration.error.caseName=A configuration name that differs only in case to "{0}" exists.
+RenameConfiguration.error.invalidName=The name "{0}" is invalid.
+
+# ----------- Target/Config management dialog -----------------
+ManageConfig.label.configs=Manage configurations
+ManageConfig.label.rename=Rename
+ManageConfig.label.conversionTargetLabel=Tool chain conversion targets:
+ManageConfig.label.convertTarget=Convert
+ManageConfig.label.new.config.dialog=Create configuration
+ManageConfig.label.rename.config.dialog=Rename configuration
+ManageConfig.deletedialog.message=Are you sure you want to delete the "{0}" configuration?
+ManageConfig.deletedialog.title=Confirm Delete
+
+# Toolchain Conversion Target confirmation Dialog
+ConfigurationConvert.confirmdialog.message=Currently the "{0}" Configuration uses "{1}" tool-chain. After conversion it will use "{2}" tool-chain. Do you want to proceed?
+ConfigurationConvert.confirmdialog.title=Confirm Configuration Conversion
+
+# ----------- Build Property Common -----------
+BuildPropertyCommon.label.title=Enter Value
+BuildPropertyCommon.label.new=New...
+BuildPropertyCommon.label.remove=Remove
+BuildPropertyCommon.label.up=Up
+BuildPropertyCommon.label.down=Down
+BuildPropertyCommon.label.editVar=Edit...
+BuildPropertyCommon.label.addVar=Add
+BuildPropertyCommon.label.message=Value:
+BuildPropertyCommon.label.browse=Browse...
+BuildPropertyCommon.label.configs=Defined configurations:
+
+# ----------- Field Editors -----------
+Multiline.error.message=Please give correct input
+
+# ----------- Build Tool Settings -----------
+BuildToolSettingsPage.alloptions=All options:
+BuildToolSettingsPage.tool.command=Command:
+BuildToolSettingsPage.tool.commandLinePattern=Command\nline pattern:
+BuildToolSettingsPage.tool.advancedSettings=Expert settings:
+
+# ----------- File List Control -----------
+FileListControl.add=Add
+FileListControl.delete=Delete
+FileListControl.edit=Edit
+FileListControl.moveup=Move Up
+FileListControl.movedown=Move Down
+FileListControl.filedialog.title=Select File
+FileListControl.dirdialog.title=Select Include Directory
+FileListControl.dirdialog.desc=Select Include Paths
+FileListControl.deletedialog.message=Are you sure you want to delete the selected files or directories?
+FileListControl.deletedialog.title=Confirm Delete
+FileListControl.editdialog.title=Edit Dialog
+FileListControl.newdialog.title=New Dialog
+FileListControl.button.workspace=Workspace...
+FileListControl.button.fs=File system...
+
+# ----------- Property Page ----------
+MngMakeProjectPropertyPage.closedproject=Project Closed
+MngMakeProjectPropertyPage.internalError=An Internal error has occur please check error log.
+
+# Copies from org.eclipse.ui.workbench
+showAdvanced = &Advanced >>
+hideAdvanced = << &Advanced
+NewFolderDialog.folderNameEmpty = Folder name must be specified
+
+# Project Conversion Dialog messages
+ProjectConvert.confirmdialog.title=Confirm Project Conversion
+ProjectConvert.confirmdialog.message=The selected project {0} will be converted. Do you want to proceed ?
+
+ProjectConvert.conversionErrordialog.title=Project Conversion Error
+ProjectConvert.conversionErrordialog.message=Error has occured during the conversion of the project {0} .
+
+ProjectConvert.noConverterErrordialog.title=Project Conversion Error
+ProjectConvert.noConverterErrordialog.message=There are no converters available to convert the project {0} .
+
+ProjectConvert.title=Project Converters for {0}
+ProjectConvert.convertersList=Converters List
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/CProjectPlatformPage.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/CProjectPlatformPage.java
new file mode 100644
index 0000000..323349d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/CProjectPlatformPage.java
@@ -0,0 +1,319 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Rational Software - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.cdt.core.CProjectNature;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IProjectType;
+import org.eclipse.cdt.managedbuilder.core.IToolChain;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.managedbuilder.ui.wizards.MBSCustomPageManager;
+import org.eclipse.cdt.ui.newui.CDTHelpContextIds;
+import org.eclipse.cdt.ui.wizards.NewCProjectWizard;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.viewers.CheckboxTableViewer;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.PlatformUI;
+
+
+/**
+ * Class that implements the project type and configuration selection page in the new 
+ * project wizard for managed builder projects.
+ * 
+ * @since 1.2
+ */
+public class CProjectPlatformPage extends WizardPage {
+	/*
+	 * Dialog variables and string constants
+	 */
+	private static final String PREFIX = "PlatformBlock"; //$NON-NLS-1$
+	private static final String LABEL = PREFIX + ".label"; //$NON-NLS-1$
+	private static final String TIP = PREFIX + ".tip"; //$NON-NLS-1$
+	private static final String CONFIG_LABEL = LABEL + ".configs"; //$NON-NLS-1$
+	private static final String TARGET_LABEL = LABEL + ".platform"; //$NON-NLS-1$
+	private static final String TARGET_TIP = TIP + ".platform"; //$NON-NLS-1$
+	private static final String FORCEDCONFIG_TIP = TIP + ".forcedconfigs"; //$NON-NLS-1$
+	
+	// support for exporting data to custom wizard pages
+	public static final String PAGE_ID = "org.eclipse.cdt.managedbuilder.ui.wizard.platformPage"; //$NON-NLS-1$
+	public static final String PROJECT_TYPE = "projectType"; //$NON-NLS-1$
+	public static final String TOOLCHAIN = "toolchain"; //$NON-NLS-1$
+	public static final String NATURE = "nature"; //$NON-NLS-1$
+	
+	protected Wizard parentWizard;
+	protected Text platformSelection;
+	private ArrayList<Object> selectedConfigurations;
+	protected IProjectType projectType;
+	protected Button showAllConfigs;
+	protected boolean showAllConfigsForced;
+	protected CheckboxTableViewer tableViewer;
+	protected IConfiguration configurations[];
+
+	/**
+	 * Constructor.
+	 * @param pageName
+	 * @param wizard
+	 */
+	public CProjectPlatformPage(String pageName, Wizard parentWizard) {
+		super(pageName);
+		setPageComplete(false);
+		projectType = ManagedBuildManager.getExtensionProjectType("org.eclipse.linuxtools.cdt.autotools.core.projectType"); //$NON-NLS-1$
+		selectedConfigurations = new ArrayList<Object>(0);
+		this.parentWizard = parentWizard;
+		showAllConfigsForced = false;
+	}
+
+	/**
+	 * @see org.eclipse.jface.wizard.IWizardPage#canFlipToNextPage()
+	 */
+	public boolean canFlipToNextPage() {
+		return validatePage();
+	}
+
+	private void createConfigSelectionGroup (Composite parent) {
+		// Create the group composite
+		Composite composite = new Composite(parent, SWT.NULL);
+		composite.setFont(parent.getFont());
+		composite.setLayout(new GridLayout());
+		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+		// Create a check box table of valid configurations
+		final Label configLabel = new Label(composite, SWT.LEFT);
+		configLabel.setFont(composite.getFont());
+		configLabel.setText(AutotoolsWizardMessages.getResourceString(CONFIG_LABEL));
+
+		Table table = new Table(composite, SWT.CHECK | SWT.BORDER | SWT.MULTI
+								| SWT.SINGLE | SWT.H_SCROLL	| SWT.V_SCROLL);
+		table.setLayoutData(new GridData(GridData.FILL_BOTH));
+		table.setHeaderVisible(true);
+		table.setLinesVisible(false);
+
+		// Add a table layout to the table
+		TableLayout tableLayout = new TableLayout();
+		table.setHeaderVisible(false);
+		table.setLayout(tableLayout);
+
+		// Add the viewer
+		tableViewer = new CheckboxTableViewer(table);
+		tableViewer.setLabelProvider(new ConfigurationLabelProvider());
+		tableViewer.setContentProvider(new ConfigurationContentProvider());
+		tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+			public void selectionChanged(SelectionChangedEvent e) {
+				// will default to false until a selection is made
+				handleConfigurationSelectionChange();
+			}
+		});
+
+	}
+	
+	/**
+	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
+	 */
+	public void createControl(Composite parent) {
+		// Create the composite control for the tab
+		Composite composite = new Composite(parent, SWT.NULL);
+		composite.setFont(parent.getFont());
+		composite.setLayout(new GridLayout());
+		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+		// Setup the help information
+		PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, CDTHelpContextIds.MAN_PROJ_PLATFORM_HELP);
+
+		// Create the widgets
+		createTypeSelectGroup(composite);
+		createConfigSelectionGroup(composite);
+
+		// Publish which project type has been chosen with the custom wizard page manager
+		MBSCustomPageManager.addPageProperty(PAGE_ID, PROJECT_TYPE, projectType.getId());
+
+		// Select configuration
+		populateConfigurations();
+		setPageComplete(validatePage());
+		
+		// Do the nasty
+		setErrorMessage(null);
+		setMessage(null);
+		setControl(composite);
+	}
+
+	
+	private void createTypeSelectGroup(Composite parent) {
+		// Create the group composite
+		Composite composite = new Composite(parent, SWT.NULL);
+		composite.setFont(parent.getFont());
+		composite.setLayout(new GridLayout(2, false));
+		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+		// Create the platform selection label and combo widgets
+		final Label platformLabel = new Label(composite, SWT.LEFT);
+		platformLabel.setFont(composite.getFont());
+		platformLabel.setText(AutotoolsWizardMessages.getResourceString(TARGET_LABEL));
+
+		platformSelection = new Text(composite, SWT.READ_ONLY);
+//		platformSelection = new Combo(composite, SWT.READ_ONLY | SWT.BORDER);	
+		platformSelection.setFont(composite.getFont());
+		platformSelection.setToolTipText(AutotoolsWizardMessages.getResourceString(TARGET_TIP));
+		platformSelection.setText("GNU Autotools"); //$NON-NLS-1$
+		platformSelection.addDisposeListener(new DisposeListener() {
+			public void widgetDisposed(DisposeEvent e) {
+				platformSelection = null;
+			}
+		});
+		
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		// Make this the same as NewCProjectWizardPage.SIZING_TEXT_FIELD_WIDTH
+		gd.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH + 50;
+		platformSelection.setLayoutData(gd);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.dialogs.ICOptionContainer#getProject()
+	 */
+	public IProject getProject() {
+		return ((NewCProjectWizard)getWizard()).getNewProject();
+	}
+	
+	/**
+	 * @return
+	 */
+	public IConfiguration[] getSelectedConfigurations() {
+		return (IConfiguration[]) selectedConfigurations.toArray(new IConfiguration[selectedConfigurations.size()]);
+	}
+
+	/**
+	 * Returns the selected project type.
+	 * 
+	 * @return IProjectType Selected type or <code>null</code> if an invalid selection
+	 * has been made.
+	 */
+	public IProjectType getProjectType() {
+		return projectType;
+	}
+
+	private void handleConfigurationSelectionChange() {
+		// Get the selections from the table viewer
+		selectedConfigurations.clear();
+		selectedConfigurations.addAll(Arrays.asList(tableViewer.getCheckedElements()));
+		
+		// support for publishing the toolchains for the selected configs so that custom wizard
+		// pages will know which toolchains have been selected
+		
+		// get the toolchains from the selected configs and put them into a set
+		Set<IToolChain> toolchainSet = new LinkedHashSet<IToolChain>();
+		for(int k = 0; k < selectedConfigurations.size(); k++)
+		{
+			IConfiguration config = (IConfiguration) selectedConfigurations.get(k);
+			IToolChain toolchain = config.getToolChain();
+			toolchainSet.add(toolchain);
+		}
+		
+		// publish the set of selected toolchains with the custom page manager
+		MBSCustomPageManager.addPageProperty(PAGE_ID, TOOLCHAIN, toolchainSet);
+		
+		// TODO: Don't know where this goes and how to find true nature
+		MBSCustomPageManager.addPageProperty(CProjectPlatformPage.PAGE_ID, CProjectPlatformPage.NATURE, CProjectNature.C_NATURE_ID);
+		
+		setPageComplete(validatePage());
+	}
+
+	/**
+	 * Populate the table viewer with either all known configurations
+	 * or only with the supported configurations depending on whether a user
+	 * has chosen to display unsupported configurations or not 
+	 * By default, only supported configurations are selected.
+	 */
+	private void populateConfigurations() {
+		if (projectType == null)
+			return;
+		IConfiguration selected[] = null;
+		
+		configurations = filterSupportedConfigurations(projectType.getConfigurations());
+		selected = configurations;
+	
+		// Check for buildable configs on this platform
+		if (selected.length == 0) {
+			// Indicate that there are no buildable configurations on this platform for this project
+			// type and that all configurations will be selected
+			setMessage(AutotoolsWizardMessages.getResourceString(FORCEDCONFIG_TIP), WARNING);
+		}
+		else { 
+			setMessage(null, NONE);
+		}
+		
+		tableViewer.setInput(configurations);
+		tableViewer.setCheckedElements(selected);
+		handleConfigurationSelectionChange();
+	}
+
+	/**
+	 * Returns the array of supported configurations found in the configurations
+	 * passed to this method
+	 */
+	IConfiguration[] filterSupportedConfigurations(IConfiguration cfgs[]){
+		ArrayList<IConfiguration> supported = new ArrayList<IConfiguration>();
+		String os = Platform.getOS();
+		String arch = Platform.getOSArch();
+
+		for (int i = 0; i < cfgs.length; i++) {
+			// First, filter on supported state
+			if (cfgs[i].isSupported()) {				
+				// Now, apply the OS and ARCH filters to determine if the configuration should be shown
+				// Determine if the configuration's tool-chain supports this OS & Architecture.
+				IToolChain tc = cfgs[i].getToolChain();
+				List<String> osList = Arrays.asList(tc.getOSList());
+				if (osList.contains("all") || osList.contains(os)) {	//$NON-NLS-1$
+					List<String> archList = Arrays.asList(tc.getArchList());
+					if (archList.contains("all") || archList.contains(arch)) { //$NON-NLS-1$
+						supported.add(cfgs[i]);						
+					}
+				}		
+			}
+		}
+		return (IConfiguration[])supported.toArray(new IConfiguration[supported.size()]);
+	}
+	
+
+	/**
+	 * @return
+	 */
+	private boolean validatePage() {
+		// TODO some validation ... maybe
+		if ((tableViewer.getCheckedElements()).length > 0) {
+			setErrorMessage(null);
+			return true;
+		} else {
+			setErrorMessage(AutotoolsWizardMessages.getResourceString("PlatformBlock.message.error.noconfigs"));	//$NON-NLS-1$
+			return false;
+		}
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConfigurationContentProvider.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConfigurationContentProvider.java
new file mode 100644
index 0000000..7fc4b20
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConfigurationContentProvider.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2005, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Rational Software - Initial API and implementation
+ * Red Hat Inc. - Copy from CDT 3.1.2 to here
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards;
+
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+
+public class ConfigurationContentProvider implements IStructuredContentProvider {
+	// The contents of the parent of the table is a list of configurations
+	public Object[] getElements(Object parent) {
+		// The content is an array of configurations
+		Object array[] = (Object[])parent;
+		return (array == null || array.length == 0) ? new Object[0] : array;
+	}
+
+	public void dispose() {
+	}
+
+	public void inputChanged(
+		Viewer viewer,
+		Object oldInput,
+		Object newInput) {
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConfigurationLabelProvider.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConfigurationLabelProvider.java
new file mode 100644
index 0000000..3d7f3de
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConfigurationLabelProvider.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2005, 2007 Rational Software Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Rational Software - Initial API and implementation
+ * Red Hat Inc. - Copy from CDT 3.1.2 to here
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards;
+
+
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.AutotoolsUIPluginImages;
+import org.eclipse.swt.graphics.Image;
+
+
+public class ConfigurationLabelProvider	extends LabelProvider implements ITableLabelProvider {
+	private final Image IMG_CFG =
+		AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_BUILD_CONFIG);
+
+	// 
+	public String getColumnText(Object obj, int index) {
+		if (obj instanceof IConfiguration) {
+			IConfiguration tmpConfig = (IConfiguration) obj;
+			
+			if( (tmpConfig.getDescription() == null)|| (tmpConfig.getDescription().equals("")) )	//$NON-NLS-1$
+				return ((IConfiguration) obj).getName();
+			else
+				return ( tmpConfig.getName() + " ( " + tmpConfig.getDescription() + " )");	//$NON-NLS-1$	//$NON-NLS-2$
+		}
+		return new String();
+	}
+
+	public Image getColumnImage(Object obj, int index) {
+		return IMG_CFG;
+	}
+}
+
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizard.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizard.java
new file mode 100644
index 0000000..a917e47
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizard.java
@@ -0,0 +1,218 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2004, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards;
+
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IProjectType;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
+import org.eclipse.cdt.managedbuilder.ui.wizards.MBSCustomPageManager;
+import org.eclipse.cdt.ui.wizards.NewCProjectWizardPage;
+import org.eclipse.cdt.ui.wizards.conversion.ConversionWizard;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+
+
+/**
+ * This wizard provides a method by which the user can 
+ * add a C nature to a project that previously had no nature associated with it.
+ */
+public class ConvertToAutotoolsProjectWizard extends ConversionWizard {
+
+	private static final String WZ_TITLE = "WizardAutotoolsProjectConversion.title"; //$NON-NLS-1$
+	private static final String WZ_DESC = "WizardAutotoolsProjectConversion.description"; //$NON-NLS-1$
+	private static final String PREFIX = "WizardAutotoolsConversion"; //$NON-NLS-1$
+	private static final String WINDOW_TITLE = "WizardAutotoolsConversion.windowTitle"; //$NON-NLS-1$
+	protected static final String CONF_TITLE = PREFIX + ".config.title";	//$NON-NLS-1$
+	protected static final String CONF_DESC = PREFIX + ".config.desc";	//$NON-NLS-1$
+	protected static final String MSG_SAVE = PREFIX + ".message.save";	//$NON-NLS-1$
+	protected static final String OPTIONS_TITLE = PREFIX + ".options.title";	//$NON-NLS-1$
+	protected static final String OPTIONS_DESC = PREFIX + ".options.desc";	//$NON-NLS-1$
+
+	public static final String NULL_INDEXER_ID = "org.eclipse.cdt.core.nullindexer"; //$NON-NLS-1$
+	
+	protected CProjectPlatformPage projectConfigurationPage;
+	protected NewAutotoolsProjectOptionPage optionPage;
+
+	protected IProject curProject;
+	
+	/**
+	 * ConvertToAutotoolsConversionWizard Wizard constructor
+	 */
+	public ConvertToAutotoolsProjectWizard() {
+		this(getWindowTitleResource(), getWzDescriptionResource());
+	}
+	/**
+	 * ConvertToAutotoolsConversionWizard Wizard constructor
+	 * 
+	 * @param title
+	 * @param desc
+	 */
+	public ConvertToAutotoolsProjectWizard(String title, String desc) {
+		super(title, desc);
+	}
+
+	/**
+	 * Method getWzDescriptionResource,  allows Wizard description label value
+	 * to be changed by subclasses
+	 * 
+	 * @return String
+	 */
+	protected static String getWzDescriptionResource() {
+		return AutotoolsUIPlugin.getResourceString(WZ_DESC);
+	}
+
+	/**
+	 * Method getWzTitleResource,  allows Wizard description label value
+	 * to be changed by subclasses
+	 * 
+	 * @return String
+	 */
+	protected static String getWzTitleResource() {
+		return AutotoolsUIPlugin.getResourceString(WZ_TITLE);
+	}
+
+	/**
+	 * Method getWindowTitleResource, allows Wizard Title label value to be
+	 * changed by subclasses
+	 * 
+	 * @return String
+	 */
+	protected static String getWindowTitleResource() {
+		return AutotoolsUIPlugin.getResourceString(WINDOW_TITLE);
+	}
+
+	/**
+	  * Method getPrefix,  allows prefix value to be changed by subclasses
+	  * 
+	  * @return String
+	  */
+	protected static String getPrefix() {
+		return PREFIX;
+	}
+
+	/**
+	 * Method addPages adds our Simple to C conversion Wizard page.
+	 * 
+	 * @see Wizard#createPages
+	 */
+	public void addPages() {
+		addPage(mainPage = new ConvertToAutotoolsProjectWizardPage(getPrefix(), this));
+		
+		// Add the configuration selection page
+		projectConfigurationPage = new CProjectPlatformPage(PREFIX, this);
+		projectConfigurationPage.setTitle(AutotoolsUIPlugin.getResourceString(CONF_TITLE));
+		projectConfigurationPage.setDescription(AutotoolsUIPlugin.getResourceString(CONF_DESC));
+		addPage(projectConfigurationPage);
+
+		// Add the options (tabbed) page
+		optionPage = new NewAutotoolsProjectOptionPage(PREFIX, this);
+		optionPage.setTitle(AutotoolsUIPlugin.getResourceString(OPTIONS_TITLE));
+		optionPage.setDescription(AutotoolsUIPlugin.getResourceString(OPTIONS_DESC));
+		addPage(optionPage);
+		
+		// add custom pages
+		MBSCustomPageManager.init();
+		
+		// add stock pages
+		MBSCustomPageManager.addStockPage(fMainPage, NewCProjectWizardPage.PAGE_ID);
+		MBSCustomPageManager.addStockPage(projectConfigurationPage, CProjectPlatformPage.PAGE_ID);
+		MBSCustomPageManager.addStockPage(optionPage, NewAutotoolsProjectOptionPage.PAGE_ID);
+	}
+
+	public String getProjectID() {
+		return ManagedBuilderCorePlugin.MANAGED_MAKE_PROJECT_ID;
+	}
+
+	public IProjectType getProjectType() {
+		return projectConfigurationPage.getProjectType();
+	}
+
+	public IConfiguration[] getSelectedConfigurations() {
+		return projectConfigurationPage.getSelectedConfigurations();
+	}
+
+	protected void setCurrentProject (IProject project) {
+		curProject = project;
+	}
+	
+	public IProject getProject() {
+		return curProject;
+	}
+	
+	public void applyOptions(IProject project, IProgressMonitor monitor) {
+		// When applying the project options, we need to specify which
+		// project because the conversion wizard allows us to convert
+		// more than one project at once.  We accomplish this by setting
+		// the current project we are working on.  The optionPage when
+		// applying options will ask the wizard (us) to get the project which
+		// we will report is the current project being converted.
+		setCurrentProject(project);
+    	optionPage.performApply(monitor);
+    }
+	
+	protected void doRun(IProgressMonitor monitor) throws CoreException {
+		monitor.beginTask(AutotoolsUIPlugin.getResourceString("WizardAutotoolsProjectConversion.monitor.convertingToMakeProject"), 2); //$NON-NLS-1$
+		try {
+			super.doRun(new SubProgressMonitor(monitor, 5));
+		} finally {
+			monitor.done();
+		}
+		
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.wizards.NewCProjectWizard#doRunPrologue(org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	protected void doRunPrologue(IProgressMonitor monitor) {
+		// Auto-generated method stub
+
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.wizards.NewCProjectWizard#doRunEpilogue(org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	protected void doRunEpilogue(IProgressMonitor monitor) {
+		// Get my initializer to run
+//		if (project == null)
+//			return;
+//
+//		IStatus initResult = ManagedBuildManager.initBuildInfoContainer(project);
+//		if (initResult.getCode() != IStatus.OK) {
+//			// At this point, I can live with a failure
+//			ManagedBuilderUIPlugin.log(initResult);
+//		}
+		
+		// execute any operations specified by custom pages
+		IRunnableWithProgress operations[] = MBSCustomPageManager.getOperations();
+		
+		if (operations != null)
+		{
+			for(int k = 0; k < operations.length; k++)
+			{
+				try {
+				operations[k].run(monitor);
+				} catch(InvocationTargetException e) {
+					//TODO: what should we do?
+				} catch(InterruptedException e) {
+					//TODO: what should we do?
+				}
+			}
+		}
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizardPage.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizardPage.java
new file mode 100644
index 0000000..ab1c3e4
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizardPage.java
@@ -0,0 +1,224 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2004, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards;
+
+ 
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
+import org.eclipse.cdt.managedbuilder.core.BuildException;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.IManagedProject;
+import org.eclipse.cdt.managedbuilder.core.IProjectType;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
+import org.eclipse.cdt.ui.wizards.conversion.ConvertProjectWizardPage;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsNewProjectNature;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsConfigurationManager;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
+
+
+/**
+ *
+ * ConvertToAutotoolsProjectWizardPage
+ * Standard main page for a wizard that adds a Managed Make C project Nature to a project with no nature associated with it.
+ * This conversion is one way in that the project cannot be converted back (i.e have the nature removed).
+ *
+ * @author Jeff Johnston
+ * @since Feb 8, 2006
+ *<p>
+ * Example useage:
+ * <pre>
+ * mainPage = new ConvertToAutotoolsProjectWizardPage("ConvertProjectPage");
+ * mainPage.setTitle("Project Conversion");
+ * mainPage.setDescription("Add C or C++ Managed Make Nature to a project.");
+ * </pre>
+ * </p>
+ */
+public class ConvertToAutotoolsProjectWizardPage extends ConvertProjectWizardPage {
+    
+    private static final String WZ_TITLE = "WizardAutotoolsProjectConversion.title"; //$NON-NLS-1$
+    private static final String WZ_DESC = "WizardAutotoolsProjectConversion.description"; //$NON-NLS-1$
+    private static final String PREFIX = "WizardAutotoolsProjectConversion";
+	protected static final String MSG_ADD_NATURE = PREFIX + ".message.add_nature";	//$NON-NLS-1$
+	protected static final String MSG_ADD_BUILDER = PREFIX + ".message.add_builder";	//$NON-NLS-1$
+	protected static final String MSG_SAVE = PREFIX + ".message.save";	//$NON-NLS-1$
+    
+	/**
+	 * Constructor for ConvertToStdMakeProjectWizardPage.
+	 * @param pageName
+	 */
+	public ConvertToAutotoolsProjectWizardPage(String pageName, ConvertToAutotoolsProjectWizard wizard) {
+		super(pageName);
+		setWizard(wizard);
+	}
+    
+    /**
+     * Method getWzTitleResource returns the correct Title Label for this class
+     * overriding the default in the superclass.
+     */
+    protected String getWzTitleResource(){
+        return AutotoolsUIPlugin.getResourceString(WZ_TITLE);
+    }
+    
+    /**
+     * Method getWzDescriptionResource returns the correct description
+     * Label for this class overriding the default in the superclass.
+     */
+    protected String getWzDescriptionResource(){
+        return AutotoolsUIPlugin.getResourceString(WZ_DESC);
+    }
+       
+    /**
+     * Method isCandidate returns true for all projects.
+     * 
+     * @param project
+     * @return boolean
+     */
+    public boolean isCandidate(IProject project) { 
+		return true; // all 
+    }    
+    
+    protected IProjectType getProjectType() {
+    	return ((ConvertToAutotoolsProjectWizard)getWizard()).getProjectType();
+    }
+    
+    protected IConfiguration[] getSelectedConfigurations() {
+    	return ((ConvertToAutotoolsProjectWizard)getWizard()).getSelectedConfigurations();
+    }
+    
+    protected void applyOptions(IProject project, IProgressMonitor monitor) {
+    	((ConvertToAutotoolsProjectWizard)getWizard()).applyOptions(project, monitor);
+    }
+    
+	public void convertProject(IProject project, IProgressMonitor monitor, String projectID) throws CoreException {
+		monitor.beginTask(AutotoolsUIPlugin.getResourceString("WizardMakeProjectConversion.monitor.convertingToMakeProject"), 7); //$NON-NLS-1$
+		IConfiguration defaultCfg = null;
+		try {
+			super.convertProject(project, new SubProgressMonitor(monitor, 1), projectID);
+			monitor.subTask(AutotoolsUIPlugin.getResourceString(MSG_ADD_NATURE));
+			ManagedCProjectNature.addManagedNature(project, new SubProgressMonitor(monitor, 1));
+			AutotoolsNewProjectNature.addAutotoolsNature(project, new SubProgressMonitor(monitor, 1));
+			// We need to remove any old Autotools nature, if one exists.
+			AutotoolsNewProjectNature.removeOldAutotoolsNature(project, new SubProgressMonitor(monitor, 1));
+			monitor.subTask(AutotoolsUIPlugin.getResourceString(MSG_ADD_BUILDER));
+//			ManagedCProjectNature.addManagedBuilder(project, new SubProgressMonitor(monitor, 1));
+			AutotoolsNewProjectNature.addAutotoolsBuilder(project, new SubProgressMonitor(monitor,1));
+			// FIXME: Default scanner property: make -w - eventually we want to use Make core's build scanner
+			project.setPersistentProperty(AutotoolsPropertyConstants.SCANNER_USE_MAKE_W, AutotoolsPropertyConstants.TRUE);
+			CCorePlugin.getDefault().mapCProjectOwner(project, projectID, true);
+			// Add the ManagedProject to the project
+			IManagedProject newManagedProject = null;
+			IManagedBuildInfo info = null;
+			try {
+				info = ManagedBuildManager.createBuildInfo(project);
+				IProjectType parent = getProjectType();
+				newManagedProject = ManagedBuildManager.createManagedProject(project, parent);
+				if (newManagedProject != null) {
+					IConfiguration [] selectedConfigs = getSelectedConfigurations();
+					for (int i = 0; i < selectedConfigs.length; i++) {
+						IConfiguration config = selectedConfigs[i];
+						int id = ManagedBuildManager.getRandomNumber();
+						IConfiguration newConfig = newManagedProject.createConfiguration(config, config.getId() + "." + id); //$NON-NLS-1$
+						newConfig.setArtifactName(newManagedProject.getDefaultArtifactName());
+					}
+					// Now add the first supported config in the list as the default
+					IConfiguration[] newConfigs = newManagedProject.getConfigurations();
+					for(int i = 0; i < newConfigs.length; i++) {
+						if(newConfigs[i].isSupported()){
+							defaultCfg = newConfigs[i];
+							break;
+						}
+					}
+					
+					if(defaultCfg == null && newConfigs.length > 0)
+						defaultCfg = newConfigs[0];
+					
+					
+					if(defaultCfg != null) {
+						ManagedBuildManager.setDefaultConfiguration(project, defaultCfg);
+						ManagedBuildManager.setSelectedConfiguration(project, defaultCfg);
+					}
+					ManagedBuildManager.setNewProjectVersion(project);
+				}
+			} catch (BuildException e) {
+				AutotoolsUIPlugin.log(e);
+			}
+
+			// Following is a bit of a hack because changing the project options
+			// causes a change event to be fired which will try to reindex the project.  
+			// We are in the middle of setting the project indexer which may end up 
+			// being the null indexer.  In that case, we don't want the default indexer 
+			// (Fast Indexer) to be invoked.
+			//IIndexManager manager = CCorePlugin.getIndexManager();
+			//ICProject cproject = CoreModel.getDefault().create(project);
+			//manager.setIndexerId(cproject, ConvertToAutotoolsProjectWizard.NULL_INDEXER_ID);
+		
+			// Modify the project settings
+			if (project != null) {
+				applyOptions(project, new SubProgressMonitor(monitor, 2));
+			}
+
+//			 Set the ScannerInfoProvider.  We must do this after
+//			 applying the options because changing the ScannerInfoProvider
+//			 is considered a change to the project and a reindex will
+//			 occur.  One of the options being applied above is the indexer
+//			 selected by the user.  Thus, we wait until now.
+//			try {
+//				AutotoolsUIPlugin.setScannerInfoProvider(project);
+//			} catch (CoreException e) {
+//				ManagedBuilderUIPlugin.log(e);
+//			}
+
+			// Save the build options
+			monitor.subTask(AutotoolsUIPlugin.getResourceString(MSG_SAVE));
+			if (info != null) {
+				info.setValid(true);
+				ManagedBuildManager.saveBuildInfo(project, true);
+			}
+		} finally {
+			// Create a default Autotools configuration and save it.
+			// We must do this after the ManagedBuildManager does a save because
+			// we might not yet have a Configuration Description set up for the
+			// default configuration and we need the id to create our own form
+			// of configuration.
+			ICConfigurationDescription cfgd = ManagedBuildManager.getDescriptionForConfiguration(defaultCfg);
+			String id = cfgd.getId();
+			AutotoolsConfigurationManager.getInstance().getConfiguration(project, id, true);
+			AutotoolsConfigurationManager.getInstance().saveConfigs(project);
+			IStatus initResult = ManagedBuildManager.initBuildInfoContainer(project);
+			if (initResult.getCode() != IStatus.OK) {
+				// At this point, I can live with a failure
+				AutotoolsUIPlugin.log(initResult);
+			}
+			monitor.done();
+		}
+	}
+
+	public void createControl(Composite parent) {
+		super.createControl(parent);
+		IStructuredSelection sel = ((BasicNewResourceWizard)getWizard()).getSelection();
+		if ( sel != null) {
+			tableViewer.setCheckedElements(sel.toArray());
+			setPageComplete(validatePage());
+		}
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ManagedProjectOptionBlock.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ManagedProjectOptionBlock.java
new file mode 100644
index 0000000..5ea85f9
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ManagedProjectOptionBlock.java
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2005, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Rational Software - Initial API and implementation
+ * Red Hat - Copy from CDT 3.1.2
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards;
+
+import org.eclipse.cdt.ui.dialogs.BinaryParserBlock;
+import org.eclipse.cdt.ui.dialogs.ICOptionContainer;
+import org.eclipse.cdt.ui.dialogs.TabFolderOptionBlock;
+import org.eclipse.cdt.ui.newui.CDTHelpContextIds;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.ErrorParserBlock;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.PlatformUI;
+
+
+public class ManagedProjectOptionBlock extends TabFolderOptionBlock {
+
+	private ErrorParserBlock errParserBlock;
+	private BinaryParserBlock binaryParserBlock;
+	
+	/**
+	 * @param parent
+	 */
+	public ManagedProjectOptionBlock(ICOptionContainer parent) {
+		super(parent, false);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.dialogs.TabFolderOptionBlock#addTabs()
+	 */
+	protected void addTabs() {
+		errParserBlock = new ErrorParserBlock(null);
+		addTab(errParserBlock);
+		addTab(binaryParserBlock = new BinaryParserBlock());
+	}
+
+	public BinaryParserBlock getBinaryParserBlock() {
+		return binaryParserBlock;
+	}
+	
+	public ErrorParserBlock getErrorParserBlock() {
+		return errParserBlock;
+	}
+	
+	public Control createContents(Composite parent) {
+		Control control = super.createContents( parent );
+		((GridLayout)((Composite)control).getLayout()).marginWidth = 1;
+		GridData gd = new GridData(GridData.FILL_BOTH);
+		((Composite)control).setLayoutData(gd);
+
+		if (getErrorParserBlock()!= null)
+			PlatformUI.getWorkbench().getHelpSystem().setHelp(getErrorParserBlock().getControl(), CDTHelpContextIds.MAN_PROJ_ERROR_PARSER);
+
+		return control;
+	}	
+
+	public void updateValues() {
+		if (getErrorParserBlock()!= null) {
+			getErrorParserBlock().updateValues();
+		}
+		if (getBinaryParserBlock()!= null) {
+			// TODO
+			//getBinaryParserBlock().updateValues();
+		}
+	}
+
+	public void update() {
+		super.update();
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/NewAutotoolsProjectOptionPage.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/NewAutotoolsProjectOptionPage.java
new file mode 100644
index 0000000..866f7d8
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/NewAutotoolsProjectOptionPage.java
@@ -0,0 +1,156 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Rational Software - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.cdt.managedbuilder.ui.properties.ManagedBuilderUIPlugin;
+import org.eclipse.cdt.managedbuilder.ui.wizards.MBSCustomPageManager;
+import org.eclipse.cdt.ui.dialogs.ICOptionPage;
+import org.eclipse.cdt.ui.dialogs.IndexerBlock;
+import org.eclipse.cdt.ui.dialogs.ReferenceBlock;
+import org.eclipse.cdt.ui.dialogs.TabFolderOptionBlock;
+import org.eclipse.cdt.ui.newui.CDTHelpContextIds;
+import org.eclipse.cdt.ui.wizards.NewCProjectWizard;
+import org.eclipse.cdt.ui.wizards.NewCProjectWizardOptionPage;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Preferences;
+import org.eclipse.jface.wizard.IWizardPage;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.ErrorParserBlock;
+import org.eclipse.ui.PlatformUI;
+
+
+@SuppressWarnings("deprecation")
+public class NewAutotoolsProjectOptionPage extends NewCProjectWizardOptionPage {
+	
+	public static final String PAGE_ID = "org.eclipse.cdt.managedbuilder.ui.wizard.projectOptionsPage"; //$NON-NLS-1$
+	
+	public class ManagedWizardOptionBlock extends ManagedProjectOptionBlock {
+		
+		NewAutotoolsProjectOptionPage parent;
+		ErrorParserBlock errorParsers;
+		IndexerBlock indexBlock;
+		
+
+		public ManagedWizardOptionBlock(NewAutotoolsProjectOptionPage parentPage) {
+			super(parentPage);
+			parent = parentPage;
+		}
+
+		public class AutotoolsReferenceBlock extends ReferenceBlock {
+			AutotoolsReferenceBlock() {
+				super();
+			}
+			
+			public void performApply(IProgressMonitor monitor) throws CoreException {
+				try {
+					super.performApply(monitor);
+				} catch (RuntimeException e) {
+					// TODO: Fix ReferenceBlock not to generate NullPointerException
+					//       when no projects are referenced
+				}
+			}
+		}
+		public void updateProjectTypeProperties() {
+			//  Update the error parser list
+			if (errorParsers != null) {
+				errorParsers.updateValues();
+			}
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.cdt.ui.dialogs.TabFolderOptionBlock#addTabs()
+		 */
+		protected void addTabs() {
+			addTab(new AutotoolsReferenceBlock());
+			// NOTE: The setting of error parsers is commented out here
+			//       because they need to be set per-configuration.
+			//       The other tabs on this page are per-project.
+			//       Error parsers can be selected per configuration in the 
+			//        project properties
+			//errorParsers = new ErrorParserBlock();
+			//addTab(errorParsers);
+			addTab(indexBlock = new IndexerBlock());
+		}
+		
+		public void setupHelpContextIds(){
+			List<ICOptionPage> pages = getOptionPages();
+			
+			Iterator<ICOptionPage> iter = pages.iterator();
+			for( int i = 0; i < 3 && iter.hasNext(); i++ ) {
+				ICOptionPage page = (ICOptionPage) iter.next();
+				
+				String id = null;
+				if (page instanceof ReferenceBlock) {
+					id = CDTHelpContextIds.MAN_PROJ_WIZ_PROJECTS_TAB;
+				} else if (page instanceof ErrorParserBlock) {
+					id = CDTHelpContextIds.MAN_PROJ_WIZ_ERRORPARSERS_TAB;
+				} else if (page instanceof IndexerBlock) {
+					id = CDTHelpContextIds.MAN_PROJ_WIZ_INDEXER_TAB;
+				}
+				PlatformUI.getWorkbench().getHelpSystem().setHelp(page.getControl(), id);
+			}
+		}
+	}
+	
+	protected ManagedWizardOptionBlock optionBlock;
+	protected NewCProjectWizard parentWizard;
+
+	/**
+	 * @param pageName
+	 */
+	public NewAutotoolsProjectOptionPage(String pageName, NewCProjectWizard parentWizard) {
+		super(pageName);
+		this.parentWizard = parentWizard;
+		optionBlock = new ManagedWizardOptionBlock(this);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.wizards.NewCProjectWizardOptionPage#createOptionBlock()
+	 */
+	protected TabFolderOptionBlock createOptionBlock() {
+		return optionBlock;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.dialogs.ICOptionContainer#getProject()
+	 */
+	public IProject getProject() {
+		if (getWizard() instanceof ConvertToAutotoolsProjectWizard)
+			return ((ConvertToAutotoolsProjectWizard)getWizard()).getProject();
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.dialogs.ICOptionContainer#getPreferenceStore()
+	 */
+	public Preferences getPreferences() {
+		return ManagedBuilderUIPlugin.getDefault().getPluginPreferences();
+	}
+	
+	public void updateProjectTypeProperties() {
+		//  Update the error parser list
+		optionBlock.updateProjectTypeProperties();
+	}
+	
+	public void setupHelpContextIds(){
+		optionBlock.setupHelpContextIds();
+	}
+	
+	public IWizardPage getNextPage()
+	{
+		return MBSCustomPageManager.getNextPage(PAGE_ID); // get first custom page, if any
+	}
+	
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/EmptyProject/template.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/EmptyProject/template.properties
new file mode 100644
index 0000000..d7af2dc
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/EmptyProject/template.properties
@@ -0,0 +1,14 @@
+###############################################################################
+# Copyright (c) 2008 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+
+#Template Default Values
+EmptyProject.template.label=Empty Project
+EmptyProject.template.description=An empty project template
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/EmptyProject/template.xml b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/EmptyProject/template.xml
new file mode 100644
index 0000000..4ab9796
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/EmptyProject/template.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<template type="ProjTempl" version="1.0" supplier="Eclipse.org" revision="1.0" author="Intel Corporation"
+		copyright="Copyright (c) 2007 Intel Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html"
+		id="EmptyProject" label="%EmptyProject.template.label" description="%EmptyProject.template.description"
+		 help="help.html">
+
+	<process type="org.eclipse.linuxtools.cdt.autotools.core.NewAutotoolsProject">
+		<simple name="name" value="$(projectName)" /> 
+		<simple name="artifactExtension" value="exe" /> 
+		<simple name="isCProject" value="false" /> 
+	</process>
+
+</template>
+
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/AUTHORS b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/AUTHORS
new file mode 100644
index 0000000..9d38b85
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/AUTHORS
@@ -0,0 +1 @@
+$(author)
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/Basename.c b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/Basename.c
new file mode 100644
index 0000000..9f48078
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/Basename.c
@@ -0,0 +1,17 @@
+/*
+ ============================================================================
+ Name        : $(baseName).c
+ Author      : $(author)
+ Version     :
+ Copyright   : $(copyright)
+ Description : Hello World in C, Ansi-style
+ ============================================================================
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int main(void) {
+	puts("$(message)"); /* prints $(message) */
+	return EXIT_SUCCESS;
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/COPYING b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/COPYING
new file mode 100644
index 0000000..54c4590
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/COPYING
@@ -0,0 +1 @@
+<Place your desired license here.>
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/ChangeLog b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/ChangeLog
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/ChangeLog
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/Makefile.am.src b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/Makefile.am.src
new file mode 100644
index 0000000..727c953
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/Makefile.am.src
@@ -0,0 +1,3 @@
+bin_PROGRAMS=a.out
+a_out_SOURCES=$(projectName).c
+
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/Makefile.am.top b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/Makefile.am.top
new file mode 100644
index 0000000..3e024d5
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/Makefile.am.top
@@ -0,0 +1 @@
+SUBDIRS=$(sourceDir)
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/NEWS b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/NEWS
new file mode 100644
index 0000000..97e91a4
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/NEWS
@@ -0,0 +1 @@
+Sample NEWS file for $(projectName) project.
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/README b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/README
new file mode 100644
index 0000000..d791b0b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/README
@@ -0,0 +1 @@
+Sample readme file for $(projectName) project.
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/configure.ac.top b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/configure.ac.top
new file mode 100644
index 0000000..f272ccd
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/configure.ac.top
@@ -0,0 +1,14 @@
+dnl Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.59)
+AC_INIT($(projectName), 1.0)
+
+
+AC_CANONICAL_SYSTEM
+AM_INIT_AUTOMAKE()
+
+AC_PROG_CC
+
+AC_CONFIG_FILES(Makefile $(sourceDir)/Makefile)
+AC_OUTPUT
+
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/template.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/template.properties
new file mode 100644
index 0000000..ab982e4
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/template.properties
@@ -0,0 +1,30 @@
+###############################################################################
+# Copyright (c) 2007, 2009 Symbian Software Private Ltd. and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Bala Torati (Symbian) - initial API and implementation
+#     Red Hat Inc - modification to use with Autotools project
+###############################################################################
+
+#Template Default Values
+HelloWorld.CCtemplate.label=Hello World C++ Autotools Project
+HelloWorld.CCtemplate.description=A skeletal C++ Hello World Autotools project. Creates a folder for sources and another for include.
+HelloWorld.CAnsitemplate.label=Hello World ANSI C Autotools Project
+HelloWorld.CAnsitemplate.description=A skeletal C Hello World Autotools project. Creates a folder for sources and another for include.
+HelloWorld.basics.label=Basic Settings
+HelloWorld.basics.description=Basic properties of a project
+HelloWorld.author.label=Author
+HelloWorld.author.description=Name of the author
+HelloWorld.copyright.label=Copyright notice
+HelloWorld.copyright.description=Your copyright notice
+HelloWorld.copyright.default=Your copyright notice
+HelloWorld.message.default=Hello World
+HelloWorld.message.description=Your hello world greeting message
+HelloWorld.message.label=Hello world greeting
+HelloWorld.sourceDir.label=Source
+HelloWorld.sourceDir.description=Directory for hello world project source files
+HelloWorld.sourceDir.default=src
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml
new file mode 100644
index 0000000..a9a56a1
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<template type="ProjTempl" version="1.0" supplier="Eclipse.org" revision="1.0" author="Bala Torati (Symbian)"
+		copyright="Copyright (c) 2007,2009 Symbian Software Limited and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available athttp://www.eclipse.org/legal/epl-v10.html"
+		id="HelloWorldCAutotoolsProject" label="%HelloWorld.CAnsitemplate.label" description="%HelloWorld.CAnsitemplate.description"
+		 help="help.html">
+
+	<property-group id="basics" label="%HelloWorld.basics.label" description="%HelloWorld.basics.description" type="PAGES-ONLY" help="help.html">
+		<property id="author"
+			label="%HelloWorld.author.label"
+			description="%HelloWorld.author.description"
+			type="input"
+			pattern=".*"
+			default=""
+			hidden="false"
+			persist="true"/>
+		<property id="copyright"
+			label="%HelloWorld.copyright.label"
+			description="%HelloWorld.copyright.description"
+			type="input"
+			pattern=".*"
+			default="%HelloWorld.copyright.default"
+			hidden="false"
+			persist="true"/>
+		<property id="message"
+			label="%HelloWorld.message.label"
+			description="%HelloWorld.message.description"
+			type="input"
+			pattern=".*"
+			default="%HelloWorld.message.default"
+			hidden="false"
+			persist="true"/>
+		<property id="sourceDir"
+				label="%HelloWorld.sourceDir.label"
+				description="%HelloWorld.sourceDir.description"
+				type="input"
+				default="%HelloWorld.sourceDir.default"
+				pattern="[a-zA-Z0-9]+"
+				mandatory="false"
+				persist="true"/>
+	</property-group>
+
+	<process type="org.eclipse.linuxtools.cdt.autotools.core.NewAutotoolsProject">
+		<simple name="name" value="$(projectName)" /> 
+		<simple name="artifactExtension" value="exe" /> 
+		<simple name="isCProject" value="true" /> 
+	</process>
+
+	<process type="org.eclipse.cdt.core.CreateSourceFolder">
+		<simple name="projectName" value="$(projectName)"/>
+		<simple name="path" value="$(sourceDir)"/>
+	</process>
+
+	<process type="org.eclipse.cdt.core.AddFiles">
+		<simple name="projectName" value="$(projectName)"/>
+		<complex-array name="files">
+			<element>
+				<simple name="source" value="src/Basename.c"/>
+				<simple name="target" value="$(sourceDir)/$(projectName).c"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/configure.ac.top"/>
+				<simple name="target" value="configure.ac"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/AUTHORS"/>
+				<simple name="target" value="AUTHORS"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/NEWS"/>
+				<simple name="target" value="NEWS"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/README"/>
+				<simple name="target" value="README"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/ChangeLog"/>
+				<simple name="target" value="ChangeLog"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/COPYING"/>
+				<simple name="target" value="COPYING"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/Makefile.am.top"/>
+				<simple name="target" value="Makefile.am"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/Makefile.am.src"/>
+				<simple name="target" value="$(sourceDir)/Makefile.am"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+		</complex-array>
+	</process>
+
+</template>
+
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/AUTHORS b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/AUTHORS
new file mode 100644
index 0000000..9d38b85
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/AUTHORS
@@ -0,0 +1 @@
+$(author)
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Basename.cpp b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Basename.cpp
new file mode 100644
index 0000000..8e191ac
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Basename.cpp
@@ -0,0 +1,18 @@
+/*
+ ============================================================================
+ Name        : $(baseName).cpp
+ Author      : $(author)
+ Version     :
+ Copyright   : $(copyright)
+ Description : Hello World in C++,
+ ============================================================================
+ */
+
+#include <iostream>
+
+using namespace std;
+
+int main(void) {
+	cout << "$(message)" << endl; /* prints $(message) */
+	return 0;
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/COPYING b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/COPYING
new file mode 100644
index 0000000..54c4590
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/COPYING
@@ -0,0 +1 @@
+<Place your desired license here.>
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/ChangeLog b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/ChangeLog
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/ChangeLog
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Makefile.am.src b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Makefile.am.src
new file mode 100644
index 0000000..7b3125b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Makefile.am.src
@@ -0,0 +1,3 @@
+bin_PROGRAMS=a.out
+a_out_SOURCES=$(projectName).cpp
+
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Makefile.am.top b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Makefile.am.top
new file mode 100644
index 0000000..3e024d5
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Makefile.am.top
@@ -0,0 +1 @@
+SUBDIRS=$(sourceDir)
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/NEWS b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/NEWS
new file mode 100644
index 0000000..97e91a4
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/NEWS
@@ -0,0 +1 @@
+Sample NEWS file for $(projectName) project.
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/README b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/README
new file mode 100644
index 0000000..d791b0b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/README
@@ -0,0 +1 @@
+Sample readme file for $(projectName) project.
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/configure.ac.top b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/configure.ac.top
new file mode 100644
index 0000000..e58a4fe
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/configure.ac.top
@@ -0,0 +1,14 @@
+dnl Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.59)
+AC_INIT($(projectName), 1.0)
+
+
+AC_CANONICAL_SYSTEM
+AM_INIT_AUTOMAKE()
+
+AC_PROG_CXX
+
+AC_CONFIG_FILES(Makefile $(sourceDir)/Makefile)
+AC_OUTPUT
+
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.properties
new file mode 100644
index 0000000..ab982e4
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.properties
@@ -0,0 +1,30 @@
+###############################################################################
+# Copyright (c) 2007, 2009 Symbian Software Private Ltd. and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Bala Torati (Symbian) - initial API and implementation
+#     Red Hat Inc - modification to use with Autotools project
+###############################################################################
+
+#Template Default Values
+HelloWorld.CCtemplate.label=Hello World C++ Autotools Project
+HelloWorld.CCtemplate.description=A skeletal C++ Hello World Autotools project. Creates a folder for sources and another for include.
+HelloWorld.CAnsitemplate.label=Hello World ANSI C Autotools Project
+HelloWorld.CAnsitemplate.description=A skeletal C Hello World Autotools project. Creates a folder for sources and another for include.
+HelloWorld.basics.label=Basic Settings
+HelloWorld.basics.description=Basic properties of a project
+HelloWorld.author.label=Author
+HelloWorld.author.description=Name of the author
+HelloWorld.copyright.label=Copyright notice
+HelloWorld.copyright.description=Your copyright notice
+HelloWorld.copyright.default=Your copyright notice
+HelloWorld.message.default=Hello World
+HelloWorld.message.description=Your hello world greeting message
+HelloWorld.message.label=Hello world greeting
+HelloWorld.sourceDir.label=Source
+HelloWorld.sourceDir.description=Directory for hello world project source files
+HelloWorld.sourceDir.default=src
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml
new file mode 100644
index 0000000..38a4cc6
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<template type="ProjTempl" version="1.0" supplier="Eclipse.org" revision="1.0" author="Bala Torati (Symbian)"
+		copyright="Copyright (c) 2007,2009 Symbian Software Limited and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available athttp://www.eclipse.org/legal/epl-v10.html"
+		id="HelloWorldCPPAutotoolsProject" label="%HelloWorld.CCtemplate.label" description="%HelloWorld.CCtemplate.description"
+		 help="help.html">
+
+	<property-group id="basics" label="%HelloWorld.basics.label" description="%HelloWorld.basics.description" type="PAGES-ONLY" help="help.html">
+		<property id="author"
+			label="%HelloWorld.author.label"
+			description="%HelloWorld.author.description"
+			type="input"
+			pattern=".*"
+			default=""
+			hidden="false"
+			persist="true"/>
+		<property id="copyright"
+			label="%HelloWorld.copyright.label"
+			description="%HelloWorld.copyright.description"
+			type="input"
+			pattern=".*"
+			default="%HelloWorld.copyright.default"
+			hidden="false"
+			persist="true"/>
+		<property id="message"
+			label="%HelloWorld.message.label"
+			description="%HelloWorld.message.description"
+			type="input"
+			pattern=".*"
+			default="%HelloWorld.message.default"
+			hidden="false"
+			persist="true"/>
+		<property id="sourceDir"
+				label="%HelloWorld.sourceDir.label"
+				description="%HelloWorld.sourceDir.description"
+				type="input"
+				default="%HelloWorld.sourceDir.default"
+				pattern="[a-zA-Z0-9]+"
+				mandatory="false"
+				persist="true"/>
+	</property-group>
+
+	<process type="org.eclipse.linuxtools.cdt.autotools.core.NewAutotoolsProject">
+		<simple name="name" value="$(projectName)" /> 
+		<simple name="artifactExtension" value="exe" /> 
+		<simple name="isCProject" value="false" /> 
+	</process>
+
+	<process type="org.eclipse.cdt.core.CreateSourceFolder">
+		<simple name="projectName" value="$(projectName)"/>
+		<simple name="path" value="$(sourceDir)"/>
+	</process>
+
+	<process type="org.eclipse.cdt.core.AddFiles">
+		<simple name="projectName" value="$(projectName)"/>
+		<complex-array name="files">
+			<element>
+				<simple name="source" value="src/Basename.cpp"/>
+				<simple name="target" value="$(sourceDir)/$(projectName).cpp"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/configure.ac.top"/>
+				<simple name="target" value="configure.ac"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/AUTHORS"/>
+				<simple name="target" value="AUTHORS"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/NEWS"/>
+				<simple name="target" value="NEWS"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/README"/>
+				<simple name="target" value="README"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/ChangeLog"/>
+				<simple name="target" value="ChangeLog"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/COPYING"/>
+				<simple name="target" value="COPYING"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/Makefile.am.top"/>
+				<simple name="target" value="Makefile.am"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/Makefile.am.src"/>
+				<simple name="target" value="$(sourceDir)/Makefile.am"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+		</complex-array>
+	</process>
+
+</template>
+
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/.classpath b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/.classpath
new file mode 100644
index 0000000..751c8f2
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/.cvsignore b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/.cvsignore
new file mode 100644
index 0000000..50c1b30
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/.cvsignore
@@ -0,0 +1,4 @@
+bin
+@dot
+javaCompiler...args
+build.xml
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/.project b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/.project
new file mode 100644
index 0000000..dd372b3
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.cdt.autotools</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/.settings/org.eclipse.jdt.core.prefs b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..93e9280
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Wed Mar 18 16:28:06 EDT 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/.settings/org.eclipse.jdt.ui.prefs b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..4c71318
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,3 @@
+#Tue Jan 02 14:11:13 EST 2007
+eclipse.preferences.version=1
+internal.default.compliance=default
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/ChangeLog b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/ChangeLog
new file mode 100644
index 0000000..6e8cfd0
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/ChangeLog
@@ -0,0 +1,4046 @@
+2010-02-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #303616
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (getAutogenArgs): Fall
+	back to default value for uninitialized environment variable. 
+	(getConfigArgs): Ditto.
+	(initializeBuildConfigDirs): Ditto. 
+
+2009-12-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #297260
+	* plugin.xml: Make org.eclipse.linuxtools.cdt.autotools.builder abstract as it is used as
+	a superclass only.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsBuilder.java (getOutputEntries): Override
+	to ensure we don't use the Builder default for this method which returns an output entry
+	based on the configuration name.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (build): Set the
+	build location and makefile generator element for the old builder to ensure the build path
+	set by the configure settings will always be returned. 
+
+2009-11-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Fix dependencies to support CDT 6.0.0 and up.
+
+2009-11-02  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.properties: Add new messages.
+	* plugin.xml: Add GCCMakefilePerProjectProfile discovery profile ids to configure and
+	autogen.sh inputs.
+
+2009-10-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Add back some UI elements needed for compatibility.
+	
+	* icons/autoconf.gif: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractAutotoolsHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractTargetAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AclocalHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoconfHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoheaderHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutomakeHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoreconfHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoconfAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoheaderAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoreconfAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeLibtoolizeAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.properties: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/LibtoolizeHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/SingleInputDialog.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/TwoInputDialog.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsEditorPropertyPage.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyMessages.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyPage.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsToolsPropertyPage.java: New file.
+	* build.properties: Add icons directory to bin group. 
+	* META-INF/MANIFEST.MF: Add autotools.core and autotools.ui dependency and lower cdt.ui requirement.
+	* plugin.xml: Add menus for autotool invocation.  Add back old Autotools property page and
+	build settings tabs.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsDefaultBuildDirHandler.java (isOptionVisible): Add
+	a check for includes or symbols in which case return false. 
+
+2009-10-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Change org.eclipse.linuxtools.cdt.autotools to be a compatibility plug-in to
+	support building of old projects.  Remove all UI elements except for the Autoconf
+	parser code which was exposed as a public API.
+	
+	* .settings/org.eclipse.core.resources.prefs: Removed.
+	* html/maintopic.html: Removed.
+	* html/subtopic.html: Removed.
+	* html/toc.html: Removed.
+	* icons/ac16/acmacro_arg_obj.gif: Removed.
+	* icons/ac16/acmacro_obj.gif: Removed.
+	* icons/ac16/ammacro_obj.gif: Removed.
+	* icons/ac16/case_obj.gif: Removed.
+	* icons/ac16/condition_obj.gif: Removed.
+	* icons/ac16/convert-normal.gif: Removed.
+	* icons/ac16/elif_obj.gif: Removed.
+	* icons/ac16/else_obj.gif: Removed.
+	* icons/ac16/for_obj.gif: Removed.
+	* icons/ac16/if_obj.gif: Removed.
+	* icons/ac16/while_obj.gif: Removed.
+	* icons/autoconf.gif: Removed.
+	* icons/automake.gif: Removed.
+	* icons/dlcl16/build_configs.gif: Removed.
+	* icons/dlcl16/newc_app.gif: Removed.
+	* icons/dlcl16/newcc_app.gif: Removed.
+	* icons/dlcl16/open_include.gif: Removed.
+	* icons/dtool16/alphab_sort_co.gif: Removed.
+	* icons/dtool16/build_menu.gif: Removed.
+	* icons/dtool16/convert-normal.gif: Removed.
+	* icons/dtool16/make.gif: Removed.
+	* icons/dtool16/makefile.gif: Removed.
+	* icons/dtool16/newc_app.gif: Removed.
+	* icons/dtool16/newcc_app.gif: Removed.
+	* icons/dtool16/segment_edit.gif: Removed.
+	* icons/dtool16/target_add.gif: Removed.
+	* icons/dtool16/target_build.gif: Removed.
+	* icons/dtool16/target_delete.gif: Removed.
+	* icons/dtool16/target_edit.gif: Removed.
+	* icons/dtool16/update_old.gif: Removed.
+	* icons/elcl16/build_configs.gif: Removed.
+	* icons/elcl16/newc_app.gif: Removed.
+	* icons/elcl16/newcc_app.gif: Removed.
+	* icons/elcl16/open_include.gif: Removed.
+	* icons/etool16/alphab_sort_co.gif: Removed.
+	* icons/etool16/build_menu.gif: Removed.
+	* icons/etool16/convert-normal.gif: Removed.
+	* icons/etool16/make.gif: Removed.
+	* icons/etool16/makefile.gif: Removed.
+	* icons/etool16/newc_app.gif: Removed.
+	* icons/etool16/newcc_app.gif: Removed.
+	* icons/etool16/segment_edit.gif: Removed.
+	* icons/etool16/target_add.gif: Removed.
+	* icons/etool16/target_build.gif: Removed.
+	* icons/etool16/target_delete.gif: Removed.
+	* icons/etool16/target_edit.gif: Removed.
+	* icons/etool16/target_filter.gif: Removed.
+	* icons/etool16/update_old.gif: Removed.
+	* icons/obj16/acmacro_obj.gif: Removed.
+	* icons/obj16/command_obj.gif: Removed.
+	* icons/obj16/define_obj.gif: Removed.
+	* icons/obj16/environment_obj.gif: Removed.
+	* icons/obj16/envvar_obj.gif: Removed.
+	* icons/obj16/error_obj.gif: Removed.
+	* icons/obj16/hfolder_obj.gif: Removed.
+	* icons/obj16/include_obj.gif: Removed.
+	* icons/obj16/irule_obj.gif: Removed.
+	* icons/obj16/lib_obj.gif: Removed.
+	* icons/obj16/macro_obj.gif: Removed.
+	* icons/obj16/relation_obj.gif: Removed.
+	* icons/obj16/target_obj.gif: Removed.
+	* icons/obj16/trule_obj.gif: Removed.
+	* icons/sample.gif: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractAutotoolsHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractTargetAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AclocalHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoconfHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoheaderHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutomakeHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoreconfHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoconfAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoheaderAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoreconfAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeLibtoolizeAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/LibtoolizeHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/SingleInputDialog.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/TwoInputDialog.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakeTargetManager.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutoconfSubstRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeCompletionProcessor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeConfigMacro.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeDocumentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeEditor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeEditorFactory.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeErrorHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/Automakefile.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileCodeScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileUtil.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeIfElse.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeMacroDefinitionRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeMacroReferenceRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeTextHover.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeWordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/popup/actions/GetDefinedSymbolsAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/popup/actions/GetIncludePathAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfAnnotationHover.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfCodeScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentSetupParticipant.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMacroValidator.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfErrorHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfIdentifierRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfKeywordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfM4WordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacro.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroCodeScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroParameterListValidator.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroPartitionRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroProposalContextInformation.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroWordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitioner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitionScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPKGWordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfReconcilingStrategy.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfWhitespaceDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfWordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolEditorActionDefinitionIds.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolHelpContextIds.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolsEditor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/InlineDataRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/MultilineRuleDamagerRepairer.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/ParseException.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RecursiveSingleLineRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RestrictedEndOfLineRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsEditorPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsToolsPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/ConvertToAutotoolsProjectWizard.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/CProjectPlatformPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCCProjectWizard.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCProjectWizard.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsProjectOptionPage.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/AbstractElementListSelectionDialog.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/AbstractMakefile.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/AbstractMakefileCodeScanner.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/AddBuildTargetAction.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ArchiveTarget.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/BadDirective.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Command.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Comment.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/CompletionProposalComparator.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Conditional.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/DefaultRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/DefineVariable.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/DeleteOnErrorRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Directive.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/EditorUtility.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ElementListSelectionDialog.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Else.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/EmptyLine.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Endef.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Endif.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ExportAllVariablesRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ExportVariable.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ExternalEditorInput.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ExternalEditorInputFactory.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/GNUAutomakefile.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/GNUMakefileConstants.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/GNUMakefileUtil.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/GNUTargetRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/GNUVariableDef.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/IAutomakeConditional.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/If.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Ifdef.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Ifeq.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Ifndef.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Ifneq.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/IgnoreRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/IMakefileDocumentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/IMakefileEditorActionDefinitionIds.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Include.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/InferenceRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/IntermediateRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/IReconcilingParticipant.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ISelectionValidator.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ITranslationUnitEditorInput.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/LexicalSortingAction.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/LowResolutionTimeRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MacroDefinition.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MacroDefinitionRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MacroReferenceRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileAnnotationHover.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileCodeScanner.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileCompletionProcessor.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakeFileConstants.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileContentOutlinePage.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileDocumentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileDocumentSetupParticipant.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileEditor.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileEditorActionContributor.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileEditorPreferenceConstants.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileEditorTogglePresentationAction.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileMessages.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefilePartitionScanner.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileReader.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileReconcilingStrategy.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakeFileResources.properties: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileSourceConfiguration.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileStorageDocumentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileTextHover.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileWordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MessageLine.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/NotParallelRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/NullMakefile.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/OpenDeclarationAction.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/OpenIncludeAction.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/OverrideDefine.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/OverrideVariable.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Parent.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/PhonyRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/PosixMakefileUtil.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/PosixRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/PreciousRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ProjectionMakefileUpdater.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Rule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SccsGetRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SecondaryRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SelectionList.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SelectionStatusDialog.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SilentRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SpecialRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/StaticTargetRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/StatusInfo.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/StatusTool.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/StringMatcher.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SuffixesRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Target.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/TargetRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/TargetVariable.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Terminal.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/TwoArrayQuickSort.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/UnExport.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Util.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/VariableDefinition.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/VPath.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/WordPartDetector.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/WorkingCopyManager.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/MakeMessages.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/MakeTarget.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/MakeTargetManager.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ProjectTargets.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/text/hover/AutoconfPrototype.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/text/hover/AutoconfTextHover.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/text/hover/HoverMessages.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/text/hover/HoverMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsPluginImages.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/autoconf/ProjectionFileUpdater.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ErrorParserBlock.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTML2TextReader.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLTextPresenter.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeResources.properties: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIImages.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIMessages.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MessageLine.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AbstractEditorPreferencePage.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutoconfEditorPreferencePage.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutomakeEditorPreferencePage.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencePage.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencesMessages.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencesMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/ColorEditor.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/ColorManager.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/TabFolderLayout.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/wizards/AutotoolsBuildWizard.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/wizards/AutotoolsWizardMessages.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/wizards/AutotoolsWizardMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/wizards/ConfigurationContentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/wizards/ConfigurationLabelProvider.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/wizards/ManagedProjectOptionBlock.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/wizards/NewAutotoolsProject.java: Removed.
+	* templates/projecttemplates/EmptyProject/template.properties: Removed.
+	* templates/projecttemplates/EmptyProject/template.xml: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/AUTHORS: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/Basename.c: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/configure.ac.top: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/COPYING: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/Makefile.am.src: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/Makefile.am.top: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/NEWS: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/README: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/template.properties: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/AUTHORS: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Basename.cpp: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/configure.ac.top: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/COPYING: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Makefile.am.src: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Makefile.am.top: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/NEWS: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/README: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.properties: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfEditorMessages.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfEditorMessages.properties: New file.
+	* build.properties: Remove UI elements that are no longer used. 
+	* META-INF/MANIFEST.MF: Update exposed packages and required bundles. Bump to 2.0.0.
+	* plugin.xml: Remove all UI extensions.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java (getTargetManager): Removed. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfParser.java: Fixed to build. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfTokenizer.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsEditorPreferenceConstants.java (initializeDefaultValues):
+	Add latest AM and AC macro version constants as the initial source of these constants has been removed. 
+
+2009-10-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump version to 1.0.5.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/text/hover/AutoconfTextHover.java (getHoverDoc):
+	Change to get document versions and pass these to getACDoc and getAMDoc. 
+	(getDefaultAutomakeMacrosVer): New method.
+	(getAMDoc): Change to take doc version rather than name and to support document in local plugin.
+	(getDefaultAutoconfMacrosVer): New method.
+	(getLocalAutoconfMacrosDocName): New method.
+	(getACDoc): Change to take doc version rather than name and to support document in local plugin.
+	(getLocalAutomakeMacrosDocName): New method.
+
+2009-10-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCCProjectWizard.java (doRun): Fix warnings.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCProjectWizard.java (doRun): Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ProjectTargets.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java (setScannerInfoProvider): Fix
+	deprecated warnings. 
+	(verifyScannerInfoProvider): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java: Ditto. 
+	
+2009-10-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/wizards/AutotoolsBuildWizard.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/wizards/NewAutotoolsProject.java: New file.
+	* templates/projecttemplates/EmptyProject/template.properties: New file.
+	* templates/projecttemplates/EmptyProject/template.xml: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/template.properties: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.properties: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml: New file.
+	* build.properties: Add templates directory to binary contents.
+	* plugin.properties: Add new strings to support additions in plugin.xml.
+	* plugin.xml: Remove name from Autotools project type so it will get a category in the C/C++
+	new project wizard UI.  Connect the gcc and g++ tools to their proper parents in the CDT.
+	Add template and wizard support for Autotools.  Remove project conversion stuff that shouldn't
+	have been checked in.
+
+2009-10-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #292272
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsBuilder.java (AutotoolsBuilder): Use
+	a super copy constructor rather than a parent chained super constructor.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (clean): Save old
+	builder and replace back when build is complete. 
+	(build): Ditto.
+
+2009-09-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #289557
+	* plugin.xml: Add ApplicabilityCalculator for includes and symbols for
+	configure tool to prevent values from being added to the command line in the
+	Tool Settings tab.
+	
+2009-09-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #289558
+	* plugin.xml: Put GNU C++ Project Wizard under C/C++ project category.
+	
+2009-09-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #289555
+	* plugin.xml: Add back org.eclipse.linuxtools.cdt.autotools.toolchain.tool.gcc and
+	org.eclipse.linuxtools.cdt.autotools.toolchain.tool.gpp to Autotools toolchain to
+	prevent older projects from getting NPEs.  Do not tie these tools to the real
+	CDT core gcc and gpp tools and make them unused children of the toolchain so new
+	projects won't put them in the Settings UI nor the .cproject.
+
+2009-09-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #289819
+	* plugin.properties: Change convert message to match the same format as CDT's
+	convertor.
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (createDirectory): Changed
+	to use Java File and mkdirs method.
+	(regenerateMakefiles): Use Java File for existence checking and do not use Workspace
+	root because file may be external.  As well, share console if autoreconf required
+	prior to configuration.
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Add create dir error
+	message.
+	
+
+2009-08-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #286543
+	* plugin.xml: Add input types for configure tool so we
+	can specify CDT gcc and g++ language ids which are checked
+	for in the CDT New C/C++ Project Wizards.  Also add the
+	Autotools build artefact type as a supported property of the
+	Autotools tool chain.
+
+2009-08-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #285865
+	* plugin.properties: Change Provider to Eclipse instead of Eclipse.org.
+
+2009-08-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #267538
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (getAbsoluteDirectory):
+	Call getPathString to get the directory path instead of calling toOSString. 
+	(getPathString): New method that gets the path string and handles MingW paths.
+	(runScript): Call getPathString to convert the command path instead of
+	using toOSString.
+
+2009-08-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Make autotools.tests able to see internal classes.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/text/hover/AutoconfTextHover.java (getAMDoc): Remove
+	printlns and log errors with AutotoolsPlugin instead of CUIPlugin.
+	 
+2009-08-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #267197
+	(getACDoc): 
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsDefaultBuildDirHandler.java (handleValue): Continue
+	loop if no tool for config.status is found.
+
+2009-07-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump release to 1.0.4. 
+	
+2009-07-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Rename all internal classes to adhere to Eclipse naming conventions.  Change all references appropriately.
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AbstractElementListSelectionDialog.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AbstractMakefile.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AbstractMakefileCodeScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AddBuildTargetAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ArchiveTarget.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/BadDirective.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Command.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Comment.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/CompletionProposalComparator.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Conditional.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/DefaultRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/DefineVariable.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/DeleteOnErrorRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Directive.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/EditorUtility.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ElementListSelectionDialog.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Else.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/EmptyLine.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Endef.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Endif.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ExportAllVariablesRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ExportVariable.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ExternalEditorInput.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ExternalEditorInputFactory.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/GNUAutomakefile.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/GNUMakefileConstants.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/GNUMakefileUtil.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/GNUTargetRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/GNUVariableDef.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/IAutomakeConditional.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/If.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Ifdef.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Ifeq.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Ifndef.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Ifneq.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/IgnoreRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/IMakefileDocumentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/IMakefileEditorActionDefinitionIds.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Include.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/InferenceRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/IntermediateRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/IReconcilingParticipant.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ISelectionValidator.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ITranslationUnitEditorInput.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/LexicalSortingAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/LowResolutionTimeRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MacroDefinition.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MacroDefinitionRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MacroReferenceRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileAnnotationHover.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileCodeScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileCompletionProcessor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakeFileConstants.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileContentOutlinePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileDocumentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileDocumentSetupParticipant.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileEditor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileEditorActionContributor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileEditorPreferenceConstants.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileEditorTogglePresentationAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefilePartitionScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileReader.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileReconcilingStrategy.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakeFileResources.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileSourceConfiguration.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileStorageDocumentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileTextHover.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileWordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MessageLine.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/NotParallelRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/NullMakefile.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/OpenDeclarationAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/OpenIncludeAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/OverrideDefine.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/OverrideVariable.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Parent.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/PhonyRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/PosixMakefileUtil.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/PosixRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/PreciousRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ProjectionMakefileUpdater.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Rule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SccsGetRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SecondaryRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SelectionList.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SelectionStatusDialog.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SilentRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SpecialRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/StaticTargetRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/StatusInfo.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/StatusTool.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/StringMatcher.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SuffixesRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Target.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/TargetRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/TargetVariable.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Terminal.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/TwoArrayQuickSort.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/UnExport.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Util.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/VariableDefinition.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/VPath.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/WordPartDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/WorkingCopyManager.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/MakeMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/MakeTarget.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/MakeTargetManager.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/MarkerGenerator.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ProjectTargets.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/AutoconfPrototype.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/AutoconfTextHover.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/HoverMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/HoverMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AutotoolsConsole.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AutotoolsPluginImages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/CBuildStepsConsole.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/CConfigureConsole.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/Console.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ConsoleMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ConsoleMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/CWordFinder.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/editors/autoconf/ProjectionFileUpdater.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ErrorParserBlock.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/HTML2TextReader.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/HTMLPrinter.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/HTMLTextPresenter.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/LineBreakingReader.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/MakeResources.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/MakeUIImages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/MakeUIMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/MessageLine.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AbstractEditorPreferencePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferencePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutotoolsEditorPreferenceConstants.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutotoolsPreferencePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/ColorEditor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/ColorManager.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/OverlayPreferenceStore.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/StatusInfo.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/TabFolderLayout.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/SingleCharReader.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/SubstitutionTextReader.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/AutotoolsWizardMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/AutotoolsWizardMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/ConfigurationContentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/ConfigurationLabelProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/ManagedProjectOptionBlock.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/MakeMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/MakeTarget.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/MakeTargetManager.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/MarkerGenerator.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ProjectTargets.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsConsole.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsPluginImages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CBuildStepsConsole.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CConfigureConsole.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/Console.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.properties: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CWordFinder.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ErrorParserBlock.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTML2TextReader.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLPrinter.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLTextPresenter.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/LineBreakingReader.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeResources.properties: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIImages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MessageLine.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SingleCharReader.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SubstitutionTextReader.java: New file.
+	* plugin.xml: Change any internal class references to new naming convention.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakeTargetManager.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeCompletionProcessor.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeConfigMacro.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeDocumentProvider.java (getWorkingCopy): Ditto. 
+	(shutdown): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeEditor.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeEditorFactory.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeErrorHandler.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/Automakefile.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileCodeScanner.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeIfElse.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeTextHover.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfAnnotationHover.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfCodeScanner.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditor.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMacroValidator.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroCodeScanner.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolsEditor.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsEditorPropertyPage.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/CProjectPlatformPage.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsProjectOptionPage.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/AbstractElementListSelectionDialog.java:
+	Ditto. 
+	
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/AbstractMakefile.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/AbstractMakefileCodeScanner.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/AddBuildTargetAction.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ArchiveTarget.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/BadDirective.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Command.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Comment.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/CompletionProposalComparator.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Conditional.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/DefaultRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/DefineVariable.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/DeleteOnErrorRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Directive.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/EditorUtility.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ElementListSelectionDialog.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Else.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/EmptyLine.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Endef.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Endif.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ExportAllVariablesRule.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ExportVariable.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ExternalEditorInput.java (getTranslationUnit): Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ExternalEditorInputFactory.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/GNUAutomakefile.java (getBuiltins): Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/GNUMakefileConstants.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/GNUMakefileUtil.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/GNUTargetRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/GNUVariableDef.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/IAutomakeConditional.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/If.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Ifdef.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Ifeq.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Ifndef.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Ifneq.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/IgnoreRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/IMakefileDocumentProvider.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/IMakefileEditorActionDefinitionIds.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Include.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/InferenceRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/IntermediateRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/IReconcilingParticipant.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ISelectionValidator.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ITranslationUnitEditorInput.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/LexicalSortingAction.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/LowResolutionTimeRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MacroDefinition.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MacroDefinitionRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MacroReferenceRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileAnnotationHover.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileCodeScanner.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileCompletionProcessor.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakeFileConstants.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileContentOutlinePage.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileDocumentProvider.java (getWorkingCopy): Ditto. 
+	(shutdown): 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileDocumentSetupParticipant.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileEditor.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileEditorActionContributor.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileEditorPreferenceConstants.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileEditorTogglePresentationAction.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileMessages.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefilePartitionScanner.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileReader.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileReconcilingStrategy.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileSourceConfiguration.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileStorageDocumentProvider.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileTextHover.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileWordDetector.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MessageLine.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/NotParallelRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/NullMakefile.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/OpenDeclarationAction.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/OpenIncludeAction.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/OverrideDefine.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/OverrideVariable.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Parent.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/PhonyRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/PosixMakefileUtil.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/PosixRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/PreciousRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ProjectionMakefileUpdater.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Rule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SccsGetRule.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SecondaryRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SelectionList.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SelectionStatusDialog.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SilentRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SpecialRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/StaticTargetRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/StatusInfo.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/StatusTool.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/StringMatcher.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SuffixesRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Target.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/TargetRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/TargetVariable.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Terminal.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/TwoArrayQuickSort.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/UnExport.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Util.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/VariableDefinition.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/VPath.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/WordPartDetector.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/WorkingCopyManager.java (removeWorkingCopy): Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/text/hover/AutoconfPrototype.java: Ditto.
+	
+	
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/text/hover/AutoconfTextHover.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/text/hover/HoverMessages.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/autoconf/ProjectionFileUpdater.java: Ditto. 
+	
+	
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AbstractEditorPreferencePage.java: Ditto.
+	
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutoconfEditorPreferencePage.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutomakeEditorPreferencePage.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsEditorPreferenceConstants.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencePage.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencesMessages.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/ColorEditor.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/ColorManager.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/OverlayPreferenceStore.java: Ditto.l 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/StatusInfo.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/TabFolderLayout.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/wizards/AutotoolsWizardMessages.java: Ditto.
+	
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/wizards/ConfigurationContentProvider.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/wizards/ConfigurationLabelProvider.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/wizards/ManagedProjectOptionBlock.java: Ditto.
+
+2009-07-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Fix visibility of Reconfigure Project menu item.
+
+2009-07-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AutotoolsConsole.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/Console.java: New file.
+	* plugin.xml: Add build consoles for Autotools and Build Steps.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java: 
+	(executeConsoleCommand): New method to run commands in the console.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java (run):  Use
+	executeConsoleCommand. 
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoconfAction.java (run): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoheaderAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoreconfAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeLibtoolizeAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.properties: Add working directory
+	message and special message for invoking tools.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/CBuildStepsConsole.java (CBuildStepsConsole):
+	Changed to inherit from Console class. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/CConfigureConsole.java (CConfigureConsole): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ConsoleMessages.properties: Add messages
+	for build steps and autotools console names.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (stripEnvVars): Make public static. 
+
+2009-07-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #283828
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureAction.java (run): Use
+	workspace root scheduling rule instead of project modification rule because MakeTargets
+	may end up saving project description.
+
+2009-07-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureHandler.java: New file.
+	* plugin.properties: Add messages for new reconfigure action. 
+	* plugin.xml: Add new reconfigure command to Project menu.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (removeConfigSettings): New
+	method.
+	 
+2009-07-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (saveConfigArgs): Use toFile
+	method for config settings path.
+	(regenerateMakefiles): Ditto.
+
+2009-07-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #281850
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (getConfigSettingsPath): Save configure
+	settings file in project working directory for Autotools plugin.
+
+2009-07-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #269974
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (build):  Look for make target
+	arguments as any arguments added to the build command in a MakeTarget will be stripped off and given as
+	one of the fields in args.  Take any make arguments given and set them for the builder.
+
+2009-07-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (stripEnvVars): Add support for stripping off
+	recursive env var references even though they are not interpreted.  Also remove single and double quotes from
+	env var if variable value is quoted.
+
+2009-07-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #282696, #283084
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (getAutogenPath): Change to
+	strip off environment variable settings prior to command string using stripEnvVars method. 
+	(getConfigurePath): Ditto.
+	(runScript): Add additional environment variable parameters. 
+	(stripEnvVars): New method.
+	(regenerateMakefiles): Fix needs full reconfiguration to use designated clean method
+	instead of deleting build directory.
+	(makeArray): New method.
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Add cleaning build directory
+	message. 
+
+2009-07-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #281811
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (postBuildErrMsg): New. 
+	(preBuildErrMsg): Ditto.
+	(clean): Set the build generator element acquired from the AutotoolsPlugin.
+	(build): Add prebuild/postbuild step support.  Add sub-directory make target support and fix
+	problem with GNU Make Generator being used by setting the build generator element acquired from the
+	AutotoolsPlugin.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java (getImageDescriptor): 
+	(getGeneratorElement): New method.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (initializeBuildConfigDirs): Don't set
+	builder working directory since this is done by AutotoolsMakefileBuilder. 
+
+2009-07-02  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (clean): Don't ask
+	the ManagedBuildManager for the generator as it may default to the GnuMakefileGenerator. 
+	(removeBuildDir): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (regenerateMakefiles): Add
+	MakeTargets when autogen.sh runs configure successfully. 
+
+2009-06-25  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #281583, #281582
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (build): Don't ask the
+	ManagedBuildManager for the generator as it will default to the GnuMakefileGenerator until we tell
+	it otherwise.  Just get a new Autotools MakeGenerator.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java (getCompilationString): Add support
+	for g++, top-level builds, and compilation strings with continuation characters.
+
+2009-06-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #280696
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java (showSuccess):
+	Changed to issue a information dialog that does not have a cancel button. 
+	(executeCommand): Changed to create a ProgressMonitorDialog that is issued
+	until the command completes successfully or with failure.
+	(ExecuteProgressDialog): New private internal class that implements IRunnableWithProgress
+	which is used to run the command for a ProgressMonitorDialog.
+
+2009-06-17  Jeff Johnston  <jjohnstn@redhat.com>
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.properties: 
+	Resolves #280509
+	* META-INF/MANIFEST.MF: Bump version to 1.0.3. 
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsBuilder.java (getBuildFileGenerator): New
+	method to override Builder method so we get Autotools Makefile generator. 
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (regenerateMakefiles): Add
+	logic to use autoreconf if no configure script and no autogen.sh. 
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Add messages. 
+
+2009-06-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #280504, #280505, #280506.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoheaderHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoreconfHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoheaderAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoreconfAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeLibtoolizeAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/LibtoolizeHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/SingleInputDialog.java: New file.
+	* plugin.properties: Add new messages for additional tools/commands added.
+	* plugin.xml: Change invoking autotools to be a single menu item in Project menu which
+	expands to show all tools available, including aclocal, autoconf, autoheader, automake,
+	autoreconf, and libtoolize.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java (simpleParseOptions): New
+	method to parse options and account for quoted strings.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.properties: Add support
+	for autoheader, autoreconf, and libtoolize. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyConstants.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsToolsPropertyPage.java (createControls):
+	Ditto. 
+	(initialize): Ditto. 
+	(performDefaults): Ditto.
+	(performOK): Ditto.
+
+2009-06-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #280117
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java (buildFile): Fix so
+	loop doesn't exit early before finding build directory.
+
+2009-06-05  Andrew Overholt  <overholt@redhat.com>
+
+	* Fix up after erroneous SVN operation.
+
+2009-05-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* .classpath: Updated.
+
+2009-05-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #273830
+	* plugin.xml: Remove warnings.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java (executeCommand): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/TwoInputDialog.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsBuilder.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsDefaultBuildDirHandler.java (handleValue): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (clean): Ditto.
+	(build): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java (setScannerInfoProvider): Ditto. 
+	(verifyScannerInfoProvider): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java (buildFile): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfoProvider.java (setDirty): Ditto. 
+	(getScannerInformation): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutoconfSubstRule.java (DecreasingCharArrayLengthComparator): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeDocumentProvider.java (connect): Ditto.
+	(shutdown): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeEditor.java (getAdapter): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeErrorHandler.java (AutomakeMarker): Ditto. 
+	(checkChildren): Ditto. 
+	(AutomakeMarker.setAttributes): Ditto. 
+	(AutomakeMarker.getAttributes): Ditto.
+	(createMarker): Ditto.
+	(AutomakeMarker.AutomakeMarker): Ditto. 
+	(AutomakeMarker.getAdapter): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/EditorUtility.java (getWorkspaceFileAtLocation): Ditto. 
+	(isLinked): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ElementListSelectionDialog.java (open): Ditto. 
+	(setElements): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ExternalEditorInput.java (getAdapter): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/GNUAutomakefile.java (getBuiltins): Ditto.
+	(addDirective): Ditto. 
+	(parseVPath): Ditto.
+	(getDirectives): Ditto.
+	(parse): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/LexicalSortingAction.java (LexicalCSorter.isSorterProperty): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileCompletionProcessor.java (DirectiveComparator): Ditto.
+	(computeContextInformation): Ditto.
+	(computeCompletionProposals): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileContentOutlinePage.java (MakefileContentProvider.getElements): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileDocumentProvider.java (shutdown): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileEditor.java (getAdapter): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileMessages.java (getFormattedString): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefilePartitionScanner.java (MakefilePartitionScanner): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/NullMakefile.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/OpenIncludeAction.java (resolveIncludeLink): Ditto. 
+	(findFile): Ditto.
+	(getIncludeStatement): Ditto. 
+	(chooseFile): Ditto.
+	(run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Parent.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/PosixMakefileUtil.java (findTargets): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ProjectionMakefileUpdater.java (createAnnotationMap): Ditto. 
+	(fCollapseConditional): Ditto.
+	(fCollapseRule): Ditto.
+	(fCollapseMacroDef): Ditto.
+	(match): Ditto.
+	(processReconcile): Ditto. 
+	(computeAdditions): Ditto.
+	(initialize): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Rule.java (getCommands): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SelectionStatusDialog.java (setInitialSelection): Ditto. 
+	(getPrimaryInitialSelection): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/StringMatcher.java (parseWildCards): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/WorkingCopyManager.java (setWorkingCopy): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/MakeTarget.java (getAdapter): Ditto.
+	(getEnvironment): Ditto.
+	(setEnvironment): Ditto.
+	(build): Ditto.
+	(getExpandedEnvironment): Ditto. 
+	(getAttributeMap): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/MakeTargetManager.java (initializeBuilders): Ditto. 
+	(getTargetBuilders): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ProjectTargets.java (findTarget): Ditto. 
+	(remove): Ditto.
+	(get): Ditto.
+	(getAsXML): Ditto.
+	(translateCDTProjectToDocument): Ditto. 
+	(translateDocumentToCDTProject): Ditto.
+	(contains): Ditto.
+	(add): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/editors/autoconf/ProjectionFileUpdater.java (createAnnotationMap): Ditto.
+	(match): Ditto.
+	(processReconcile): Ditto. 
+	(computeAdditions): Ditto.
+	(initialize): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ErrorParserBlock.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/HTML2TextReader.java (static initializer): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/HTMLTextPresenter.java (updatePresentation): Ditto.
+	(adaptTextPresentation): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/ColorManager.java (dispose): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/StatusInfo.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (runScript): Ditto.
+	(runCommand): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/popup/actions/GetDefinedSymbolsAction.java (run): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentProvider.java (shutdown): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditor.java (getAdapter): Ditto.
+	(InformationDispatchAction.makeTextHoverFocusable): Ditto.
+	(.createInformationControl): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfErrorHandler.java (AutoconfMarker.getAttributes): Ditto. 
+	(handleError): Ditto.
+	(AutoconfMarker.getAdapter): Ditto. 
+	(createMarker): Ditto. 
+	(AutoconfMarker.setAttributes): Ditto. 
+	(removeExistingMarkers): Ditto.
+	(AutoconfMarker.AutoconfMarker): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfIdentifierRule.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacro.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java (createPresentation): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroParameterListValidator.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolsEditor.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/InlineDataRule.java (evaluate): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java (handleError): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RecursiveSingleLineRule.java (RecursiveSingleLineRule): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RestrictedEndOfLineRule.java (RestrictedEndOfLineRule): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyManager.java (AutotoolsPropertyManager): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsToolsPropertyPage.java (performOK): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/CProjectPlatformPage.java (handleConfigurationSelectionChange): Ditto. 
+	(CProjectPlatformPage): Ditto.
+	(filterSupportedConfigurations): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCCProjectWizard.java (doRun): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCProjectWizard.java (doRun): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsProjectOptionPage.java (ManagedWizardOptionBlock.setupHelpContextIds): Ditto. 
+
+2009-05-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #276204
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsProjectNature.java (removeNature): 
+	(addAutotoolsBuilder): Fix compiler warnings.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeCompletionProcessor.java (DirectiveComparator): Ditto. 
+	(computeContextInformation): Ditto. 
+	(computeCompletionProposals): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileCodeScanner.java (createRules): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java (AutomakefileContentProvider.getElements): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AbstractElementListSelectionDialog.java (setSelectionListElements): Ditto.
+	(getWidgetSelection): Ditto.
+	(verifyCurrentSelection): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AbstractMakefile.java (getMacroDefinitions): Ditto. 
+	(getBuiltinInferenceRules): Ditto. 
+	(getRules): Ditto.
+	(getInferenceRules): Ditto. 
+	(getTargetRules): Ditto.
+	(getBuiltinMacroDefinitions): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AddBuildTargetAction.java (getTargetRules): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/CompletionProposalComparator.java (compare): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SelectionList.java (getSelection): Ditto.
+	(setElements): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/AutoconfPrototype.java (AutoconfPrototype): Ditto. 
+	(getParmName): Ditto.
+	(setParmName): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/AutoconfTextHover.java (getAMDoc): Ditto. 
+	(getMacroList): Ditto.
+	(getACDoc): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java (fHighlightingColorList): Ditto. 
+	(ColorListContentProvider.getElements): Ditto. 
+	(addTextKeyToCover): Ditto.
+	(createSyntaxPage): Ditto.
+	(createOverlayStore): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferencePage.java (fHighlightingColorList): Ditto. 
+	(ColorListContentProvider.getElements): Ditto.
+	(addTextKeyToCover): Ditto.
+	(createSyntaxPage): Ditto.
+	(createOverlayStore): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfAnnotationHover.java (getMarkersForLine): Ditto. 
+	(select): Ditto.
+	(getHoverInfo): Ditto.
+	(formatMultipleMessages): Ditto. 
+	(.createInformationControl): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfCodeScanner.java (AutoconfCodeScanner): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java (computeCompletionProposals): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitionScanner.java (AutoconfPartitionScanner): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java (updateSelection): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElement.java (AutoconfElement): Ditto.
+	(toString): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfParser.java (ExprEndCondition): Ditto. 
+	(ExprEndCondition.serialVersionUID): Ditto.
+	(BlockEndCondition): Ditto.
+	(checkBlockValidity): Ditto.
+	(BlockEndCondition.serialVersionUID): Ditto. 
+
+2009-05-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java (run): Fix to
+	add type for result of InvokeAction.executeCommand call.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoconfAction.java (run): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java (separateTargets): Fix
+	compiler warnings. 
+	(separateOptions): Ditto.
+	(executeCommand): Add type for resulting Collection.  Regress previous fix until Galileo
+	build catches up to recent CDT changes.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java (buildFile): Regress
+	previous fix until Galileo build catches up to recent CDT changes.
+	(getDefinedSymbols): Fix compiler warnings.
+	(getIncludePaths): Ditto.
+	(definedSymbols): Ditto.
+
+2009-05-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java (executeCommand): Use new
+	launcher execute method which isn't deprecated and handle CoreException.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java (buildFile): Ditto. 
+
+2009-04-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #249199
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractAutotoolsHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoconfHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutomakeHandler.java: New file.
+	* plugin.properties: Add messages for invoking autotools.
+	* plugin.xml: Change invoke autotools actions from Actions in an ActionSet to instead
+	use org.eclipse.ui.menus, org.eclipse.ui.commands, and org.eclipse.ui.handlers and
+	do not add these actions to project menu if not an Autotools project.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AclocalHandler.java (execute): Implemented. 
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java (run): Add check
+	for null container.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoconfAction.java (run): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java (run): Ditto.
+
+2009-04-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #270518.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (getPostBuildErrMsg):
+	New method. 
+	(getPreBuildErrMsg): Ditto. 
+	(getTargets): Fix warnings.
+	(makeArrayList): Ditto.
+	(build): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (addMakeTargetsToManager): Add
+	check for non-existent Makefile.
+	(regenerateMakefiles): Check for Makefile at end and if not present, always return error.
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Change message for
+	non-generation of Makefile.
+
+2009-04-20  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/HTMLTextPresenter.java
+	(updatePresentation): Fix compiler warnings.
+
+2009-04-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #272924
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/OpenIncludeAction.java (run): 
+	Fix compiler warnings.
+	(getIncludeStatement): Ditto.
+	(chooseFile): Ditto.
+	(.visit): Ditto.
+	(findFile): Ditto.
+
+2009-04-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #272923
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileMessages.java (getFormattedString): Fix
+	compiler warnings.
+
+2009-04-20  Jeff Johnston  <jjohnstn@redhat.com>
+	
+	Resolves #272922
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (getAutogenArgs): Fix compiler
+	warnings. 
+	(addMakeTargetsToManager): Ditto. 
+	(runScript): Ditto.
+	(getConfigArgs): Ditto.
+	(MakeTargetComparator): Ditto.
+	(makeArray): Ditto.
+	(runCommand): Ditto.
+	
+2009-04-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #272921
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.java (getFormattedString): 
+	Cast 2nd argument for message fomatting to avoid compile warnings. 
+
+2009-04-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #272920
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/AutotoolsWizardMessages.java (getFormattedString):
+	Cast 2nd argument for message formatting to avoid compiler warnings. 
+	(getFormattedString): Ditto.
+
+2009-04-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #272919
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AutotoolsPluginImages.java (makeIconFileURL):
+	Fix static member reference to avoid compiler warning. 
+	(static initializer): Ditto.
+	
+2009-04-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #272918
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java (getFormattedString): Cast
+	2nd argument to avoid compiler warning.
+	
+2009-04-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #272917
+	* .settings: Updated.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AbstractEditorPreferencePage.java (validatePositiveNumber):
+	Properly template containers. 
+	(getTextFields): Ditto.
+	(initializeFields): Ditto.
+	(updateStatus): Ditto.
+	(getCheckBoxes): Ditto.
+	(getNumberFields): Ditto.
+	
+2009-04-20  Jeff Johnston  <jjohnstn@redhat.com>
+	
+	Resolves #272916.	
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileCodeScanner.java (createRules): Use templated
+	List.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileCodeScanner.java (createRules): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AbstractMakefileCodeScanner.java (createTextAttribute):
+	Correctly access static member function. 
+	(initializeRules): Use templated List.
+
+2009-04-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #270680
+	
+	* plugin.xml: Fix Autotools properties page to only show up for Autotools nature.
+	Add gcc and g++ to Toolchain so indexing will work.
+
+2009-03-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (build): Add
+	logic to also respect the makefile command being changed in the Makefile target.
+
+2009-03-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #269974
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (build): Add
+	logic to handle a makefile target being for a subdirectory Makefile as opposed to
+	the main Makefile.
+
+2009-03-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (build): Use
+	System.arraycopy rather than Arrays.copyOfRange because the latter is a 1.6 API.
+
+2009-03-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #265996
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (regenerateMakefiles): If we are
+	doing full reconfigure, use same cleaning method on build directory as "clean" build.
+	(makeArray): New method to convert String into array of Strings.
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Add message when cleaning
+	build directory prior to reconfigure. 
+
+2009-03-02  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #266451
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (build): Use
+	property "line.separator" instead of "lineSeparator".
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (initializeBuildConfigDirs):
+	Store a workspace-neutral builddir that can be moved to another workspace.
+	Use IBuilder.setBuildPath method instead of IBuilder.setBuildAttribute to set the new build
+	dir.  Also, check to see if the builddir has changed first. 
+	
+2009-03-02  Jeff Johnston  <jjohnstn@redhat.com>
+ 
+	Resolves #264935
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/CBuildStepsConsole.java: New file.
+	* plugin.xml: Add CBuildSteps console.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (build): Perform
+	prebuild and postbuild steps if present.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ConsoleMessages.properties: Add name
+	for Build Steps console. 
+
+2009-02-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #265873
+	
+	* META-INF/MANIFEST.MF: Add dependency on org.eclipse.core.net.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java (stop): Add call to
+	ServiceTracker close() method.
+	(start): Add ServiceTracker open() call for IProxyService.
+	(getProxyService): New method to get IProxyService. 
+
+2009-01-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #261717
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/AutoconfTextHover.java (getMacroList): 
+	Don't bother processing macros if the macro document turns out to be null.
+
+2009-01-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #261257
+	
+	* META-INF/MANIFEST.MF: Update plug-in to add .qualifier to id and update
+	to 1.0.2.qualifier.
+	* plugin.xml: Update invoke autotools action set to set visible to true.
+
+2009-01-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (getConfigArgs): If there
+	are no -- args in the user arguments, still pass them on to configure.
+
+2008-11-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #472731
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (hasTargetBuilder): 
+	Add check for ManagedProject being null which is apparently possible.
+
+2008-11-25  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeDocumentProvider.java: Change
+	Copyright to make Red Hat a contributor to the copyright of the original file modified to make
+	this new class.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeEditor.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/Automakefile.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileCodeScanner.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeMacroDefinitionRule.java: Ditto.
+
+2008-11-03  Andrew Overholt  <overholt@redhat.com>
+
+	* build.properties: Remove libhoverdocs/.
+
+2008-10-31  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Use plugin.properties for provider.
+	* plugin.properties: Add "(Incubation)" to Bundle-Name.
+
+2008-10-28  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Update BREE to J2SE-1.5.
+
+2008-10-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump up release to 1.0.1.
+
+2008-10-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (build): Add check for default
+	configuration coming back null from buildinfo.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java (performDefaults):
+	Set make -w default to be true.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject):
+	Set make -w project property to true and don't turn off indexer.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCCProjectWizard.java (doRun): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCProjectWizard.java (doRun): Ditto.
+
+2008-10-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for #249416
+
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java: Fix addition of MakeTargets to run faster.
+	(addMakeTargetsToManager): Rewritten to not use MakeTargetManager addTarget or removeTarget methods which
+	cause a rewrite of the .cproject file each time.
+	(isValidTarget): Remove checking MakeTargetManager existing target.
+	(translateDocumentToCDTProject): New method which outputs the MakeTargets to the .cproject file.
+	(MakeTargetComparator): New Comparator for sorting MakeTargets.
+	(createTargetElement): New method.
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Add subtask message for refreshing Make Targets
+	which might take some time.
+
+2008-10-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for #249231
+
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (getAutogenArgs): Add
+	support to resolve build macros.
+	(getConfigArgs): Ditto.
+	(initializeBuildConfigDirs): Ditto.
+
+2008-10-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for #249644.
+
+	* plugin.xml: Change visible to true for invoke autotools action set.  Also add
+	new popupmenus for running autoconf directly on configure.ac or configure.in.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java (run): Use
+	getCWD to get the relative current working directory and pass a string to the new
+	TwoInputDialog constructor.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java (getCWD): New method
+	to get the relative CWD for an autotools action.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/TwoInputDialog.java (createDialogArea):
+	Use CLabel instead of Label for first label (the CWD).
+	(TwoInputDialog): Change to accept a String for the first message instead of an IPath.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (addMakeTargetsToManager):
+	Temporarily disable.
+
+2008-10-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java (getIncludePaths): Fix bug that
+	was properly resolving relative paths.  Also add support for parsing -isystem specifiers and putting
+	the paths on the include path list.
+
+2008-09-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Change Eclipse-AutoStart over to Bundle-ActivationPolicy.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/LibHover.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/LibHoverMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/LibHoverMessages.properties: Removed.
+	* plugin.xml: Remove CHelpProvider library hover extension as this functionality
+	has been moved into its own plugin.
+
+2008-09-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileCodeScanner.java (createRules):
+	Specify Token.UNDEFINED for WordRules default token.  Otherwise, just getting the first possible
+	character of a word detector will result in default token being returned and no further parsing.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfCodeScanner.java (AutoconfCodeScanner):
+	Ditto.
+
+2008-09-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfoProvider.java (getScannerInformation):
+	Return null if project is not an Autotools project.
+	(unsubscribe): Check scanner info for null before accessing.
+
+2008-09-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Refactored from com.redhat.eclipse.cdt.autotools to org.eclipse.linuxtools.cdt.autotools
+
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/AutoconfTextHover.java:
+	(AUTOCONF_MACROS_DOC_NAME): Change to use default URL pointing to sourceware.org.
+	(AUTOMAKE_MACROS_DOC_NAME): Ditto.
+	(getHoverDoc): Remove unused variable.
+	(getAMDoc): Modify to handle either a file or URL.
+	(getACDoc): Ditto.
+	(.createInformationControl): Switch to use non-deprecated constructor.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/LibHover.java (getLibHoverDocs): Modify to handle
+	either an external file name or URL.
+	(getLibHoverDocName): New method that returns default URL pointing to sourceware.org.
+	(HelpResource.getHref): Change to return URL.
+	(getFunctionInfo): Remove unread variable.
+
+2008-09-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder(hasTargetBuilder): Change logic
+	to look for ProjectType id rather than looking at builder id of configuration since ManagedProject
+	might have had configuration removed.  Resolves #461647.
+	* plugin.xml: Fix typo in referenced nature of autoolsNature.  Resolves #461201.
+
+2008-08-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Update version number to 1.0.0 and specify minimum/maximum versions
+	for all dependencies now that CDT 5.0 and Eclipse 3.4 must be used.
+
+2008-07-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* icons/ac16/acmacro_arg_obj.gif: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsEditorPropertyPage.java:
+	(getproject): Remove.
+	* META-INF/MANIFEST.MF: Add org.eclipse.core.filesystem as dependency.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java: Update imports.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java (getImage):
+	Use special image for acmacro argument.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java:
+	Update imports.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/AutotoolsPluginImages.java: Add image for
+	acmacro argument.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java: Update imports.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java (reconcile):
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java: Update imports.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileReconcilingStrategy.java (reconcile):
+	Call new form of parse method.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Directive.java:
+	(getMakefile): New required method.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUAutomakefile.java:
+	(parse): New required method.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/AbstractMakefile.java:
+	(getFileURI): New required method.
+	(getMakefile): Ditto.
+	(setFileURI): Ditto.
+	(getMakefileReaderProvider): Ditto.
+	(parse): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/OpenDeclarationAction.java:
+	(openInEditor): Use URI instead of File.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/NullMakefile.java:
+	(parse): New required method to implement.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileDocumentProvider.java (createMakefile):
+	Add throws modifier.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroCodeScanner.java: Update imports.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java: Ditto.
+
+2008-07-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump release to 0.9.7.
+
+2008-04-17 14:12  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/:
+	  internal/ui/editors/autoconf/ProjectionFileUpdater.java,
+	  ui/editors/AutoconfCodeScanner.java,
+	  ui/editors/AutoconfPKGWordDetector.java,
+	  ui/editors/outline/AutoconfLabelProvider.java: Collapse and
+	  decorate long macro arguments, and notice PKG_ macros
+
+2008-04-17 13:13  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/:
+	  internal/ui/editors/autoconf/ProjectionFileUpdater.java,
+	  ui/editors/AutoconfEditorMacroValidator.java,
+	  ui/editors/parser/AutoconfElement.java,
+	  ui/editors/parser/AutoconfParser.java: Fix editor collapsing and
+	  remove line number metadata from AutoconfElement, since the "end
+	  line" is only meaningful in the context of the client.
+
+2008-04-17 10:43  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/:
+	  AutoconfEditorMessages.properties,
+	  outline/AutoconfContentOutlinePage.java,
+	  parser/AutoconfCaseConditionElement.java,
+	  parser/AutoconfCaseElement.java, parser/AutoconfElement.java,
+	  parser/AutoconfElifElement.java, parser/AutoconfElseElement.java,
+	  parser/AutoconfForElement.java, parser/AutoconfIfElement.java,
+	  parser/AutoconfMacroDetector.java,
+	  parser/AutoconfMacroElement.java,
+	  parser/AutoconfOutlineErrorHandler.java,
+	  parser/AutoconfParser.java, parser/AutoconfRootElement.java,
+	  parser/AutoconfTokenizer.java, parser/AutoconfWhileElement.java,
+	  parser/OldAutoconfParser.java, parser/Token.java: More autoconf
+	  parser work.	Remove old parser and standardize AST node
+	  constructors.  Add more tests and fix some bugs.
+
+2008-04-10 15:40  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/:
+	  internal/ui/editors/autoconf/ProjectionFileUpdater.java,
+	  ui/editors/AutoconfEditor.java,
+	  ui/editors/AutoconfEditorMacroValidator.java,
+	  ui/editors/AutoconfEditorMessages.properties,
+	  ui/editors/AutoconfErrorHandler.java,
+	  ui/editors/AutoconfReconcilingStrategy.java,
+	  ui/editors/outline/AutoconfLabelProvider.java,
+	  ui/editors/parser/AutoconfElement.java,
+	  ui/editors/parser/AutoconfMacroArgumentElement.java,
+	  ui/editors/parser/AutoconfMacroElement.java,
+	  ui/editors/parser/AutoconfParser.java,
+	  ui/editors/parser/AutoconfParser2.java,
+	  ui/editors/parser/AutoconfSelectElement.java,
+	  ui/editors/parser/AutoconfTokenizer.java,
+	  ui/editors/parser/AutoconfUntilElement.java,
+	  ui/editors/parser/AutoconfWhileElement.java,
+	  ui/editors/parser/ITokenConstants.java,
+	  ui/editors/parser/OldAutoconfParser.java,
+	  ui/editors/parser/ParseException.java: More autoconf parser work.
+
+2008-04-09 14:38  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/:
+	  AutoconfEditorMacroValidator.java,
+	  AutoconfEditorMessages.properties, AutoconfErrorHandler.java,
+	  parser/AutoconfCaseConditionElement.java,
+	  parser/AutoconfElement.java,
+	  parser/AutoconfMacroArgumentElement.java,
+	  parser/AutoconfMacroDetector.java, parser/AutoconfParser.java,
+	  parser/AutoconfParser2.java, parser/AutoconfTokenizer.java,
+	  parser/IAutoconfErrorHandler.java,
+	  parser/IAutoconfMacroDetector.java, parser/IMacroDetector.java,
+	  parser/ITokenConstants.java, parser/Token.java: New autoconf
+	  parser work in progress
+
+2008-04-07 14:06  Ed Swartz <ed.swartz@nokia.com>
+
+	* META-INF/MANIFEST.MF,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMacroValidator.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfErrorHandler.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroPartitionRule.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroWordDetector.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfReconcilingStrategy.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/ParseException.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElement.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfMacroArgumentElement.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/IAutoconfErrorHandler.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/IAutoconfMacroValidator.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/ParseException.java:
+	  Initial checkpoint for autotools parser changes
+
+
+2008-01-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/AclocalHandler.java: New file for
+	future menu support.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsProjectNature.java: New file.
+	* META-INF/MANIFEST.MF: Release updated.
+	* plugin.properties: Add some new messages for autotools tool invocation.
+	* plugin.xml: Update release to 0.9.6.  Add autotools project nature.  Make
+	autotools commands enablement dependent on autotools project nature.
+	Specify enablesFor 1 for all autotools tool actions.
+	* src/com/redhat/eclipse/cdt/autotools/actions/AbstractTargetAction.java (setSelectedContainer): New
+	method for future menu support.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java (hasTargetBuilder): Use
+	AutotoolsProjectNature static addAutotoolsBuilder method.
+	(addAutotoolsBuilder): Moved to AutotoolsProjectNature.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (runScript): New method to
+	run scripts.
+	(regenerateMakefiles): Use runScript method to run configuration scripts. Use
+	runCommand for executables like "make".
+	(runCommand): Added comments.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject):
+	Add new autotools project nature.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsCCProjectWizard.java (addNature):
+	Ditto plus set up autotools builder.
+	(doRun): Don't set up autotools builder since it is done in addNature.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsCProjectWizard.java (addNature):
+	Add new autotools project nature and set up autotools builder.
+	(doRun): Don't set up autotools builder since it is done in addNature.
+
+2007-12-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Update release to 0.9.5.3.
+
+2007-12-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #412651, #412661
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (getConfigurePath): Fetch tool command
+	name instead of hard-wiring to "configure".
+	(autogenExists): Fetch command name from autogen.sh options.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java: (removeBuildDir): New method.
+	(clean): If user has specified remove build directory, then use removeBuildDir method.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: New messages for supporting
+	build directory removal operation.
+
+2007-11-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHoverMessages.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHoverMessages.properties: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java: Add references to
+	LibHoverMessages instead of hard-coded strings.
+	* libhoverdocs/glibc-2.7-2.xml: Regenerated.
+
+2007-11-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java
+	(HelpResource.getHref): Use latest glibc doc version.
+	(getLibHoverDocs): Ditto.
+	* libhoverdocs/glibc-2.7-2.xml: New C library docs based on glibc-2.7-2 manual.
+	* libhoverdocs/glibc.xml: Old glibc docs removed.
+
+2007-11-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Update release to 0.9.5.2.  Also clear all OS lists for build definitions to
+	default to "all" OSes.
+
+2007-11-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #385991
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java (getMatchingFunctions): New method.
+	(FunctionSummary.compareTo): New method to support Comparable interface.
+	(FunctionSummary.getIncludes): Fix to avoid type cast exception/
+	(getFunctionInfo): Revised to call getFunctionSummaryFromNode method.
+	(FunctionSummary): Add Comparable interface.
+	(getFunctionSummaryFromNode): New method.
+	(FunctionSummary.FunctionPrototypeSummary.getPrototypeString): Add NLS
+	comments.
+
+
+2007-11-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsToolsPropertyPage.java: New File for
+	setting tool paths for the various autotools.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAclocalAction.java (run): Use the
+	project properties setting to determine what tools to use.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutoconfAction.java (run): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutomakeAction.java (run): Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties: New
+	messages.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyConstants.java: Add new
+	constants for setting the tool paths for aclocal, automake, and autoconf.
+	* plugin.xml: Add tools settings property page for Autotools.
+	* plugin.properties: New message for added property page.
+
+2007-10-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #359311, #359301, #359321
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacro.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyManager.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/IProjectPropertyListener.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsProjectPropertyTester.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/IPropertyChangeManager.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java:
+	(getAMDoc): New method.
+	(fBindingService):
+	(getAutomakeMacrosDocName): Modified to take a version parameter.
+	(getAutoconfMacrosDocName): Ditto.
+	(getPrototype): Changed to take an editor input.
+	(getAutoconfMacrosDocName): Ditto.
+	(AutotoolsHoverDoc): New internal class.
+	(getMacroList): New method to merge AC and AM macros together based on version
+	properties.
+	(getACDoc): New method.
+	(getIndexedInfo): Changed to take editor input.
+	(getHoverDoc): New metohd.
+	(getIndexedInfoFromDocument): New method that will parse the given document.
+	(getDefaultAutoconfMacrosDocName): New method to get the default preference
+	Autoconf macros doc name.
+	(getHoverRegion): Modified to get editor from elsewhere.
+	(getDefaultAutomakeMacrosDocName): New method to get the default preference
+	Autoconf AM macros doc name.
+	(getHoverInfo): Changed to take an editor input.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroParser.java: Removed.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/editors/autoconf/ProjectionFileUpdater.java (initialize):
+	(processReconcile): Use stored editor.
+	(install): Change input parameter to AutoconfEditor.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java (parseMacro):
+	(parse): Modified to take IEditorInput argument and pass that on to AutoconfErrorHandler.
+	(AutoconfParser): Modified to take an editor parameter.
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsDefaultBuildDirHandler.java: Updated
+	copyright to just Red Hat Inc.
+	* plugin.properties: New messages.
+	* plugin.xml: Add ICPropertyTab extension for editor properties.  Add properties
+	page for Autotools properties.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsEditorPropertyPage.java: New file.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyPage.java: Rewritten.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java:
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyConstants.java:
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfErrorHandler.java (AutoconfErrorHandler):
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java
+	(AutoconfSourceViewerConfiguration): Take editor as parameter.
+	(getPresentationReconciler): Pass along or use editor passed in.
+	(getContentAssistant): Ditto.
+	(getReconciler): Ditto.
+	(getTextHover): Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java (connect):
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java:
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java (computeCompletionProposals):
+	(AutoconfMacroContentAssistProcessor): Take editor input.
+	(computeMacroStart): Use editor.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfReconcilingStrategy.java (reconcile):
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java: Make this implement
+	IProjectPropertyListener
+	(handlePreferenceStoreChanged): Modified to call handleVersionChange method if a
+	autoconf or automake macro version preference change has occurred.
+	(doSetInput): Deregister editor as property listener if editor was for a project
+	file previously and register editor as property listener if editor is now for a
+	project.
+	(getAutoconfDocumentProvider): Make static.
+	(getAutoconfCodeScanner): Pass this to constructor.
+	(handleVersionChange): New method.
+	(handleProjectPropertyChanged): New IProjectPropertyListener method.
+	(initializeEditor): Pass this to source viewer configuration constructor.
+	(getAutoconfParser): Pass this to constructor.
+	(dispose): Deregister editor as property listener for a project if applicable.
+	(getAutoconfMacroCodeScanner): Pass this to constructor.
+
+2007-10-23  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroCodeScanner.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/RestrictedEndOfLineRule.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitionScanner.java (AutoconfPartitionScanner):
+	Move macro partitioning ahead of comments.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java (getPresentationReconciler):
+	Use AutoconfMacroCodeScanner for macro damager repairer.
+	(getContentAssistant): Use AutoconfMacroCodeScanner for macro content assist.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java (nextToken):
+	New method that simply defaults to super.nextToken to be used for debugging purposes.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java (getAutoconfMacroCodeScanner):
+
+	* plugin.xml: Update to release 0.9.5.1.
+
+2007-10-23  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #330701
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java: New File to
+	add property settings for how to clean an Autotools project and whether or not to use the
+	current Autotools info scanner.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyMessages.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyConstants.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java (parseLines):
+	Process macros ahead of stripping out comments as this prevents removing quotes inside the
+	macro which have precedence over # (e.g. used to specify #include and not meaning a
+	comment to end of line).
+	(parseWhile): Change comment typo.
+	(parseFor): Ditto.
+	* plugin.properties: Add new messages regarding property pages.
+	* plugin.xml: Add Autotools build IcPropertyTab (AutotoolsBuildPropertyPage).  Also
+	specify that AutotoolsDefaultBuildDirHandler is also an option applicability tester.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.properties:
+	Change the message for autoconf and automake versions to include the word "Default".
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitioner.java (computePartitioning):
+	Add override method as way to print out partitions.  Cannot compute and print out partitions at
+	connect time as in 4.0.1 we initially are given an empty document that is later filled.
+	(printPartitions): Change argument to be an array of partition regions.
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java (build):
+	(clean): New method.  Pay attention to user clean method preference.
+	(getTargets): Pay attention to user clean target preference.
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java (getCompilationString):
+	Pay attention to user preference on scanner info retrieval and disable if need be.
+	(createIncludeChain): Use AutotoolsPropertyConstants to get property names to use.
+	(followIncludeChain): Ditto.
+	(getMakefile): Add nls comments.
+	(AutotoolsScannerInfo): Ditto.
+	(getDefinedSymbols): Ditto.
+	(buildFile): Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (regenerateMakefiles): Don't
+	call AutotoolsScannerInfoProvider.setDirty method anymore.  Instead, set a project property
+	to indicate the scanner info is dirty.
+	(addMakeTargetsToManager): Add a try/catch statement to prevent duplicate entries from
+	stopping loop that adds make targets.
+	(initializeBuildConfigDirs): Formatting change.
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfoProvider.java (getScannerInformation):
+	Add a check for project property indicating the scanner info is dirty in which case call
+	setDirty method.
+	(setDirty): Make private.
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsDefaultBuildDirHandler.java: Now implements
+	IOptionApplicability.
+	(isOptionEnabled): New interface method to implement.
+	(isOptionVisible): Ditto.
+	(isOptionUsedInCommandLine): Ditto (set to false).
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsBuilder.java (getProject): New method.
+	(AutotoolsBuilder): Add project argument.
+	(getCleanBuildTarget): Implemented using new Autotools CLEAN_MAKE_TARGET property.
+
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new message.
+
+2007-10-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #323641
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java (getDefinedSymbols): Use
+	the patch provided by Jose Fonseca to provide a proper regular expression for parsing
+	the defined symbols from the make output.
+
+2007-10-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Ensure the ids for InvokeAutoconf and InvokeAutomake actions are unique.
+
+2007-10-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsDefaultBuildDirHandler.java (handleValue):
+	Add some place holders for supporting the user manually setting the build directory.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add some dialog messages for
+	future usage.
+	* plugin.xml: Update version to 0.9.5.
+
+2007-10-02  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #315811
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsDefaultBuildDirHandler.java: New File.
+	* plugin.xml: Change build definition to version 4.0.0.  Remove unused project converter
+	extension.  For build directory, specify an option handler which is implemented by
+	AutotoolsDefaultBuildDirHandler.
+
+2007-09-24  Andrew Overholt  <overholt@redhat.com>
+
+	* plugin.xml: Update version to 0.9.4.
+
+2007-09-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutoconfAction.java (run):
+	Fix array indexing.
+
+2007-09-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Add ELF and GNU_ELF binary parsers as default for an Autotools project.
+
+2007-09-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #274551
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java (getCompilationString): Support
+	the case where the file isn't part of the build and there is no scanner info to gather.
+	(buildFile): Minor cosmetic changes.
+
+	* META-INF/MANIFEST.MF: Update release.
+
+2007-09-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (regenerateMakefiles): Add a
+	clause to check for the case whereby there was no way to generate the Makefile and one
+	didn't already exist.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties (Makegenerator.didnt.generate):
+	New message.
+
+2007-08-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #254248
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java (selectionChanged):
+	Make call to editor.selectAndReveal method to focus editor page on selected outline item.
+
+2007-08-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #254246
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/CWordFinder.java (findWord): Fix
+	to handle being in the first word of the file.
+
+2007-08-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #253331
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java (build): Enable
+	autobuilding.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (regenerateMakefiles):  If
+	the configuration options change, clean the previous build directory so a full rebuild
+	will occur.
+
+2007-08-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Change release to 0.9.2 and specify minimum java runtime as
+	1.4.
+
+2007-08-15 Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #251412
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java (addAutotoolsBuilder):
+	When calling IProject.setDescription(), pass a NullProgressMonitor instead of
+	null, despite what the function API says because an isCancelled() call may occur
+	and will result in an exception thrown.  Also, use a try/catch block to handle any
+	of the legitimate exceptions that might occur in this operation.
+
+2007-08-15 Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new messages
+	for new C and C++ project wizards.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectWizard.java: Renamed...
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsCProjectWizard.java: ..to this.
+	(doRun): Rewritten based on conversion wizard to properly set up project.
+	(getProjectType): New method.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsCCProjectWizard.java:  New file
+	copied from NewAutotoolsCProjectWizard but inherits from NewCCProjectWizard.
+
+	* icons/dlcl16/newc_app.gif: New gif.
+	* icons/dlcl16/newcc_app.gif: Ditto.
+	* icons/elcl16/newc_app.gif: Ditto.
+	* icons/elcl16/newcc_app.gif: Ditto.
+
+	* plugin.properties: Add new strings for new C and C++ project wizards.
+	* plugin.xml: Add new C and C++ project wizards.
+
+2007-08-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #251604
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (getAutogenArgs): New method.
+	(regenerateMakefiles): Pass user-specified autogen.sh options when invoking autogen.sh.
+	* plugin.xml: Add autogen.sh tool support with user options.
+	* plugin.properties: Add new autogen tool message strings.
+
+2007-07-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java
+	(handlePreferenceStoreChanged): Add support for changing automake macros version.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java
+	(getAutomakeMacrosDocument):
+	New method.
+	(getIndexInfo, getPrototype): Create private versions of these that take a document
+	as an input parameter.  Change the public static methods to call the private
+	versions with the autoconf macro document and the automake macro document, if
+	the macro isn't found yet.
+	(init): Set up the autoconf macro document and automake macro document.
+	(reinit): Reset both the autoconf and automake macro documents.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java
+	(LATEST_VERSION): Replace with LATEST_AC_VERSION and LATEST_AM_VERSION.
+	(createOverlayStore): Add automake version setting.
+	(initializeVersion): Replace with initializeACVersion and initializeAMVersion.
+	(initialize): Call the two replacements of initializeVersion.
+	(createVersionTabContent): Add automake version support.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsEditorPreferenceConstants.java
+	Add automake version support.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.properties:
+	Add messages used in automake version preference.
+
+	* libhoverdocs/ammacros-1.4-p6.xml: New automake macro docs for 1.4-p6.
+	* libhoverdocs/ammacros-1.9.5.xml: New automake macro docs for 1.9.5.
+	* libhoverdocs/ammacros-1.9.6.xml: New automake macro docs for 1.9.6.
+
+2007-07-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* MANIFEST.MF: Bump up release to 0.9.1.
+
+2007-07-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUAutomakefile.java
+	(parse): Fix Automake if/else constructs to be child/parent directives as appropriate.
+	(bypassIf, bypassElse, isTrue): Removed.
+	(parseIf): Add rules parameter.
+	(addDirective): Remove caveat when dealing with automake if/else.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IAutomakeConditional.java
+	(getRules, setRules): New methods for the interface.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Else.java: Add ICommand
+	interface and implement required methods including new ones add to IAutomakeConditional.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/If.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeErrorHandler.java
+	(update): Change to call checkChildren for makefile.
+	(checkChildren): New recursive method to check for bad directives.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java
+	(AutomakefileLabelProvider.getImage): Add support for IAutomakeConditional elements and
+	remove reference to AutomakeIfElse class.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeMacroDefinitionRule.java
+	(isValidCharacter): Add support for "+-$()@" chars.
+
+2007-07-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUAutomakefile.java
+	(parseIf): Add @if support.
+	(isTrue): Default to true for if conditions.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUMakefileConstants.java:
+	Add @if and @endif macros.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUMakefileUtil.java
+	(isIf): Add @if support.
+	(isEndif): Add @endif support.
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java:
+	Add support for @if and @endif keywords.
+	(createRules): Add support for whitespace and simple identifiers.
+
+2007-07-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #247518
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java
+	(createRules): Use new AutoconfSubstRule class for identifying autoconf substituitions.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileUtil.java (isConfigMacro):
+	Refine so that macro must start and end with @ and contain at least one valid char.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutoconfSubstRule.java: New file.
+
+2007-07-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #246153
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java (createFileInfo):
+	Rewrite to handle workspace files as well as external ones.
+	(createMakefile): Change to accept a file name rather than an IFile.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor
+	(getDefault): New method.
+	(doSetInput): Ditto.
+	(initializeEditor): Add a few lines that would have been performed by
+	base class initializeEditor.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeErrorHandler
+	(AutomakeMarker): New internal class for error marking.
+	(update): Switch to using internal markers and directly updating the
+	Annotation model.
+	(removeExistingMarkers): Directly reference the annotation model.
+	(AutomakeErrorHandler): Fetch and store the annotation model for the input.
+	Change prototype.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java
+	(AutomakefileReconcilingStrategy): Change to store an IEditorInput.  Use new
+	AutomakeErrorHandler interface.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileEditor.java
+	(initializeEditor): Remove fixme comment.
+
+2007-07-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #246783
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java:
+	(initializeEditor): Call AutotoolsEditorPreferenceConstants.initializeDefaultValues
+	to ensure the editor default values are set.
+
+2007-06-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #246154
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsBuilder.java: New proxy
+	class to wrap an existing IBuilder and override build path functionality.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java:
+	(build): Wrap the builder using the new AutotoolsBuilder class so the
+	build path will work properly.
+
+2007-06-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #246134
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfErrorHandler.java:
+	(AutoconfErrorHandler): Change constructor to just take IDocument input.
+	(AutoconfMarker): New private class for marking autoconf document.
+	(createMarker): New private method to create AutoconfMarker in document.
+	(handleError): Create a marker and add it to annotation model durectly
+	instead of using MarkerUtilities.
+	(removeAllMarkers): Remove directly from annotation model instead of using file.
+	(removeExistingMarkers): Ditto.
+	(getDocument): New method.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java:
+	(connect): Change constructor call to AutoconfErrorHandler.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java:
+	(getViewer): New method to return the source viewer for the editor.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroParser.java:
+	(AutoconfMacroParser): Change constructor call to AutoconfErrorHandler.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java:
+	Change all uses of AutoconfOutlineErrorHandler to AutoconfErrorHandler.
+
+2007-06-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #245820
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileUtil.java (isAutomakeCommand):
+	New method.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Conditional.java (isIf): New
+	method.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IAutomakeConditional.java:
+	New interface.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Else.java: Changed to
+	implement new IAutomakeConditional interface.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/If.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUAutomakefile.java
+	(parse): Add Automake if/else parsing and support for Makefile.in processed if/else blocks.
+	(bypassIf, bypassElse, parseIf): New private methods.
+	(addDirective): Don't add directives to an Automake if or else construct.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUMakefileConstants.java:
+	Add CONDITIONAL_IF constant.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUMakefileUtil.java
+	(isIf): New method.
+
+2007-06-25  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileEditorTogglePresentationAction.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileEditorActionContributor.java: Ditto.
+
+	* icons/etool16/alphab_sort_co.gif: New icon.
+	* icons/etool16/build_menu.gif: Ditto.
+	* icons/etool16/convert_normal.gif: Ditto.
+	* icons/etool16/make.gif: Ditto.
+	* icons/etool16/makefile.gif: Ditto.
+	* icons/etool16/newc_app.gif: Ditto.
+	* icons/etool16/newcc_app.gif: Ditto.
+	* icons/etool16/segment_edit.gif: Ditto.
+	* icons/etool16/target_add.gif: Ditto.
+	* icons/etool16/target_build.gif: Ditto.
+	* icons/etool16/target_delete.gif: Ditto.
+	* icons/etool16/target_edit.gif: Ditto.
+	* icons/etool16/target_filter.gif: Ditto.
+	* icons/etool16/update_old.gif: Ditto.
+
+	* plugin.xml: Change Automake editor to use new internal MakefileEditorActionContributor
+	class rather than point to the internal one in internal CDT make.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentSetupParticipant.java:
+	(setup): Don't bother registering this as document listener.
+	(documentAboutToBeChanged): Remove body of method as this is no longer needed.
+
+2007-06-25  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #245611
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java
+	(getMacroList): Change to call AutoconfTextHover to get the name of the macros
+	document since it will depend on current preferences.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java
+	(getAutoconfMacrosDocName): New static method.
+
+2007-06-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* libhoverdocs/acmacros-2.59.xml: New autoconf hover text and syntax info
+	for autoconf 2.59.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java:
+	Add 2.59 support.
+
+2007-06-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* libhoverdocs/acmacros-2.13.xml: New autoconf hover text and syntax info
+	for autoconf 2.13.
+	* libhoverdocs/acmacros-2.61.xml: New autoconf hover text and syntax info
+	for autoconf 2.61.
+	* libhoverdocs/acmacros.xml: Replaced with files above.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover (init): Change document
+	to be dependent on autoconf version preference.
+	(reinit): New method to force reinitialization of help document.
+	(getPrototype): Fix to allow for earlier versions which specify multiple
+	prototypes in one using "[,", for example.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java:
+	Add version preference support.
+	(createOverlayStore): Add version support.
+	(createContents): Add version tab.
+	(initializeVersion): New method.
+	(createVersionTabContents): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsEditorPreferenceConstants.java:
+	Add AUTOCONF_VERSION and initialize the default autoconf version value to be the
+	highest possible.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.properties:
+	Add new messages pertaining to autoconf version.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java (handlePreferenceStoreChanged):
+	If the autoconf version is changed, invalidate the document and force a reparse.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.java (getFormattedString):
+	Add new method which takes 3 replacement strings.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.properties:
+	Change macro error messages to take the autoconf version as a parameter.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java: Fix
+	typo for too many args message id.
+	(parseMacro): For wrong number of argument messages, get the current autoconf version preference
+	and pass it in to the message.
+
+2007-06-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java: Rebase on
+	GNUAutomakefile class.  Remove all parsing methods.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java: Fix
+	comments to refer to internal Autotools classes as appropriate.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Conditional.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/DefineVariable.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/DeleteOnErrorRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Else.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Endef.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Endif.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ExportAllVariablesRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ExternalEditorInput.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUAutomakefile.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUTargetRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUVariableDef.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Ifdef.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Ifeq.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Ifndef.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Ifneq.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Include.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IntermediateRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/LowResolutionTimeRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/NotParallelRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/OverrideDefine.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/OverrideVariable.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/PhonyRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/SecondaryRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/StaticTargetRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/TargetVariable.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Terminal.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/UnExport.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/VPath.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/ExternalEditorInput.java: Update comments
+	that should refer to internal Autotools classes.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/MakefileDocumentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/ProjectionMakefileUpdater.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/WorkingCopyManager.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/editors/autoconf/ProjectionFileUpdater.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferencePage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Ditto.
+
+2007-06-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #243184
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeConfigMacro.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java (parse): Add
+	support for autoconf macros.
+	(parseConfigMacro): New method.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java
+	(createRules): Add rule for configure macros.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java
+	(getImage): Add support for AutomakeConfigMacro.
+	(getText): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileUtil.java (isConfigMacro):
+	New method.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeUIImages.java: Add acmacro_obj image.
+	* icons/obj16/acmacro_obj.gif: New icon.
+
+2007-06-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java: Removed.  No
+	longer used now that MakeTargets work.
+	* src/com/redhat/eclipse/cdt/autotools/actions/CheckboxTablePart.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeContentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeTargetDialog.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/SharedPart.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/SharedPartWithButtons.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/StructuredViewerPart.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/TargetListViewerPart.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/editors/autoconf/ProjectionFileUpdater.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsEditorPreferenceConstants.java:
+	Add new constants for Autoconf editor folding.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/IAutotoolsEditor.java: New interface.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java: Make class
+	implement IAutotoolsEditor interface.  This allows ProjectionFileUpdater class to
+	work.  Add folding support based on MakefileEditor class.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElement.java
+	(getStartOffset, setStartOffset, getEndLineNumber, setEndLineNumber): New methods.
+	(getEndOffset, setEndOffset, getLastChild): Ditto.
+	(AutoconfElement): New constructor which takes start offset.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfCaseElement.java:
+	Add new constructor to match that of AutoconfElement.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElifElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElseElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfForElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfIfElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfWhileElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java:
+	(AutoconfLineReader): New internal class to replace LineNumberReader class.  Change
+	all internal parse routines to use this class instead of LineNumberReader.
+	(parseLines): When a semicolon is found that denotes a multistatement line, update the end
+	offset of the previous construct and set the start offset for the next construct to be after
+	the semicolon and additional whitespace.
+	(parseMacro, parseIf, parseElif, parseElse, parseCase, parseFor, parseWhile): Construct with
+	start offset based on previous mark.  After processing, set the end line number for the
+	element.
+
+2007-06-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java:
+	Refactor AutomakeEditorPreferenceConstants to AutotoolsEditorPreferenceConstants.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ColorManager.java:  Moved from here to..
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/ColorManager.java: ...here
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditorFactory.java:
+	Changed due to movement of ColorManager class.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/AbstractMakefileCodeScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileCodeScanner.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileSourceConfiguration.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AbstractAutomakeEditorPreferencePaga.java:
+	Refactored to be...
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AbstractEditorPreferencePage.java:
+	...this.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferenceConstants.java:
+	Refactored to be...
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsEditorPreferenceConstants.java:
+	...this.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakePreferencesMessages.java:
+	Refactored to be...
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.java:
+	...this.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakePreferencesMessages.properties:
+	Refactored to be...
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.properties:
+	...this.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferencePage.java:
+	Use new refactored classes.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java:  Add color preference
+	support.
+	(AutoconfCodeScanner): A color provider is no longer needed as input.
+	(getToken, getTokenProperties, addToken, indexOf, affectsBehavior): New methods.
+	(adaptToPreferenceChange, adaptToColorChange, adaptToStyleChange); Ditto.
+	(createTextAttribute, initialize): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfColorProvider.java: Removed and replaced
+	with ColorManager.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java: Change to use
+	ColorManager.
+	(initializeEditor): Set the preference change store and initialize the editor preferences.
+	(getAutoconfCodeScanner): Changed to match new AutoconfCodeScanner constructor.
+	(getPreferenceColor): New method.
+	(getColorProvider): Removed.
+	(handlePreferenceStoreChanged): New method.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java:
+	Inherit from TextSourceViewerConfiguration.  Store the preference store.
+	* plugin.properties: Add new internationalized string for Autoconf editor preferences.
+	* plugin.xml: Add Autoconf editor preference page.
+
+2007-05-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #241908
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (addMakeTargetsToManager):
+	Change builder id used to one used in plugin.xml.
+
+2007-05-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #241782
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new message
+	for Autotools preference page.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java
+	(initializeEditor): Initialize color and folding preference defaults.
+	(handlePreferenceStoreChanges): Call super method to refresh editor.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ColorManager.java:
+	Change constants to be in Autotools domain.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AbstractAutomakeEditorPreferencePage.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferenceConstants.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferencePage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakePreferencesMessages.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakePreferencesMessages.properties:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsPreferencePage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/ColorEditor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/OverlayPreferenceStore.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/StatusInfo.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/TabFolderLayout.java: Ditto.
+
+	* plugin.properties: Add new internationalized strings from plugin.xml.
+	* plugin.xml: Add Autotools and Automake Editor preference pages.  Also
+	clean up some extensions to use internationalized strings.
+
+2007-05-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #241612
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java:
+	Add utility methods from MakeUIPlugin to log messages and
+	issue error dialogs, etc..
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeTargetDialog.java:
+	Use MakeUIMessages instead of MakeUIPlugin for messages.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeCompletionProcessor.java:
+	Replace internal CDT classes with internal Autotools classes.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java:  Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditorFactory.java:
+	Ditto.
+	(getPreferenceColor): New method.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeErrorHandler.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java:	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeIfElse.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeMacroDefinitionRule.java:
+	Ditto.
+	(evaluate): Remove unused local variable ch.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeTextHover.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/AbstractElementListSelectionDialog.java:
+	New file transported from CDT internals.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/AbstractMakefile.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/AbstractMakefileCodeScanner.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/AddBuildTargetAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ArchiveTarget.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/BadDirective.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ColorManager.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Command.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Comment.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/CompletionProposalComparator.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/DefaultRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Directive.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/EditorUtility.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ElementListSelectionDialog.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/EmptyLine.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ExternalEditorInput.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ExternalEditorInputFactory: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUMakefileConstants.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IgnoreRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IMakefileDocumentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IMakefileEditorActionDefinitionIds.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/InferenceRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IReconcilingParticipant.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ISelectionValidator.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ITranslationUnitEditorInput.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/LexicalSortingAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MacroDefinition.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MacroDefinitionRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MacroReferenceRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileAnnotationHover.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileCodeScanner.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileCompletionProcessor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileConstants.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileContentOutlinePage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileDocumentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileDocumentSetupParticipant.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileEditor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileEditorPreferenceConstants.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileMessages.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefilePartitionScanner.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileReader.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileReconcilingStrategy.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakeFileResources.properties: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileSourceConfiguration.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileStorageDocumentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileTextHover.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileWordDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MessageLine.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/NullMakefile.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/OpenDeclarationAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/OpenIncludeAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Parent.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/PosixMakefileUtil.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/PosixRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/PreciousRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ProjectionMakefileUpdater.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Rule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/SccsGetRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/SelectionList.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/SilentRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/SpecialRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/StatusInfo.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/StringMatcher.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/SuffixesRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Target.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/TargetRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/TwoArrayQuickSort.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Util.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/VariableDefinition.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/WordPartDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/WorkingCopyManager.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/AutotoolsPluginImages.java: Switch to
+	use new ac16 icon directory instead of etools16.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ErrorParserBlock.java: Use
+	MakeUIMessages instead of MakeUIPlugin for messages.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeUIImages.java: Use
+	AutotoolsPlugin for error dialogs.  Add new images.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeUIMessages.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeUIPlugin.java: Removed.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MessageLine.java: Fix typo.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/AutotoolsWizardMessages.java:
+	Fix bundle id for messages.
+
+	* plugin.xml: Fix icon references.
+
+	* icons/ac16: New folder containing icons that used to be in etool16.
+	* icons/dlcl16/build_configs.gif: New icon.
+	* icons/dlcl16/open_include.gif: Ditto.
+	* icons/elcl16/build_configs.gif: Ditto.
+	* icons/elcl16/open_include.gif: Ditto.
+	* icons/dtool16/alphab_sort_co.gif: Ditto.
+	* icons/dtool16/build_menu.gif: Ditto.
+	* icons/dtool16/convert-normal.gif: Ditto.
+	* icons/dtool16/make.gif: Ditto.
+	* icons/dtool16/makefile.gif: Ditto.
+	* icons/dtool16/newc_app.gif: Ditto.
+	* icons/dtool16/newcc_app.gif: Ditto.
+	* icons/dtool16/segment_edit.gif: Ditto.
+	* icons/dtool16/target_add.gif: Ditto.
+	* icons/dtool16/target_build.gif: Ditto.
+	* icons/dtool16/target_delete.gif: Ditto.
+	* icons/dtool16/target_edit.gif: Ditto.
+	* icons/dtool16/update_old.gif: Ditto.
+	* icons/etool16: Move autoconf editor icons to ac16 folder.
+	* icons/obj16/command_obj.gif: New icon.
+	* icons/obj16/define_obj.gif: Ditto.
+	* icons/obj16/environment_obj.gif: Ditto.
+	* icons/obj16/envvar_obj.gif: Ditto.
+	* icons/obj16/error_obj.gif: Ditto.
+	* icons/obj16/hfolder_obj.gif: Ditto.
+	* icons/obj16/include_obj.gif: Ditto.
+	* icons/obj16/irule_obj.gif: Ditto.
+	* icons/obj16/lib_obj.gif: Ditto.
+	* icons/obj16/macro_obj.gif: Ditto.
+	* icons/obj16/relation_obj.gif: Ditto.
+	* icons/obj16/target_obj.gif: Ditto.
+	* icons/obj16/trule_obj.gif: Ditto.
+
+2007-05-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java:
+	(addMakeTargetsToManager): Use MakeCorePlugin to get an IMakefile
+	rather than use the internal PosixMakefile class directly.
+
+2007-05-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java:
+	(initialize): Store the configuration for later usage.
+	(getConfigSettingsPath): Use stored configuration instead of fetching
+	it each time.
+	(runCommand): Ditto.
+	(addMakeTargetsToManager): Use the real MakeTargetManager to store
+	targets.  Mark targets added by parsing the Makefile with special
+	tag.  Delete all MakeTargets with special tag before adding the
+	new targets.
+	(initializeBuildConfigDirs): Use stored configuration to get the
+	tool options rather than the ManagedBuildInfo.
+	(getConfigArgs): Ditto.
+	(addMakeTargetsToManager):
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java:
+	Inherit from CommonBuilder.
+	(build): Change to fetch make target name from args map and store for
+	later use.
+	(getTargets): Change to get make target from stored make target name.
+
+	* plugin.xml: Remove Build Special Targets menu item as it is no longer
+	needed.  Add MakeTargetBuilder extension so we can use MakeTargets.
+
+2007-05-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #239886
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAclocalAction.java (run):
+	Pass the CWD to TwoInputDialog and use it when executing the command.  On
+	success, show a success dialog.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutoconfAction.java (run):
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/TwoInputDialog.java (TwoInputDialog):
+	Take the CWD as a parameter.
+	(createDialogArea): Add label with CWD.
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutomakeAction.java (run):
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeMessages.java (getString):
+	Add comments.
+	(getFormattedString): New method.
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAction.java (getExecDir):
+	New method to return the CWD.
+	(showSuccess): New method to display a success dialog.
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeMessages.properties: Add new
+	messages.
+
+2007-05-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #238173
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfIdentifierRule.java (evaluate):
+	Cast read character to char before invoking Character methods to avoid gcj bug.
+
+2007-04-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #238493
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/RecursiveSingleLineRule.java (evaluate):
+	Add check for scanner column < 0 which means we are already at EOF.
+
+2007-04-25  jjohnstn  <jjohnstn@toocool.toronto.redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectOptionPage.java (ManagedWizardOptionBlock.setupHelpContextIds):
+	Switch to use CDTHelpContextIds for static help context id.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/CProjectPlatformPage.java (createControl):
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/ManagedProjectOptionBlock.java (createContents):
+	Ditto.
+
+2007-04-25  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Bugzilla #182821
+
+	2007-04-25  Mikhail Sennikovsky
+	* plugin.xml: Add plugin extensions which let the CDT know that includes and
+	defined symbols are supported for the Autotools tool-chain.
+
+2007-04-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #236304
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (runCommand): Use the
+	job description as a message in the console.
+	(regenerateMakefiles): Fix autogen.sh logic to run configure after invoking
+	autogen.sh if config.status doesn't exist.  Make sure console is reused for
+	2nd step.  Change some of the status messages with new ones.
+	(autogenExists): Fix bug where path to autogen.sh wasn't being set on return.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new MakeGenerator messages.
+
+2007-04-11  jjohnstn  <jjohnstn@toocool.toronto.redhat.com>
+
+	Bugzilla #236077
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/CWordFinder.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java: Replace
+	CDT internal classes with Autotools internal classes.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/ManagedProjectOptionBlock.java (createContents):
+	Replace WorkbenchHelp reference with non-deprecated alternative.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakeTargetManager.java: Fix
+	imports.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (runCommand): Replace
+	deprecated environmental variable method being used.
+	(createFile): Make protected instead of private.
+	(getInvalidDirList): Remove.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject):
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java (getWorkingCopyManager):
+	Moved into AutomakeEditorFactory.
+	(getAutomakefileDocumentProvider): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditorFactory.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeCompletionProcessor.java:
+	Change all calls to getWorkingCopyManager and getAutomakefileDocumentProvider to use
+	new AutomakeEditorFactory class.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeCompletionProcessor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.java (getResourceBundle):
+	New method.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.properties: Add
+	new messages that were formerly fetched internally from CDT.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java: Comment out unused
+	projectSupport.
+	(createActions): Use AutoconfEditorMessages.
+	(InformationDispatchAction.makeAnnotationHoverFocusable): Ditto.
+	(fProjectionModelUpdater): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfAnnotationHover.java (formatMultipleMessages):
+	Use AutoconfEditorMessages instead of CUIMessages.
+	* src/com/redhat/eclipse/cdt/autotools/interenal/ui/ErrorParserBlock.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/CProjectPlatformPage.java (createControl): Remove
+	usage of WorkbenchHelp class which is deprecated.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectOptionPage.java (ManagedWizardOptionBlock.setupHelpContextIds):
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject):
+	Remove unused code.  Switch to use non-deprecated interface for getting
+	indexer.
+
+2007-04-10  jjohnstn  <jjohnstn@toocool.toronto.redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectWizard.java:
+	Removed.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectOptionPage.java:
+	Use new internal ManagedProjectOptionBlock class.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/CProjectPlatformPage.java:
+	Switch to use new AutotoolsWizardMessages internal class.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java:
+	Fix imports.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizard.java (doRunEpilogue):
+	Switch to new IRunnableWithProgress interface.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/AutotoolsWizardMessages.java:
+	New file to support old wizard code.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/AutotoolsWizardMessages.properties:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/ConfigurationContentProvider.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/ConfigurationLabelProvider.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/ManagedProjectOptionBlock:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/AutotoolsPluginImages.java:
+	Add build_configs.gif for Wizard support.
+	* src/com/redhat/eclipse/cdt/autotools/internal/MarkerGenerator.java (addMarker):
+	New method required by IMarkerGenerator interface.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (getProject):
+	New method.
+	(initializeBuildConfigDirs): Change the default build directory
+	for the configuration's builder.
+	Add support for CDT 4.0 M6.
+	* cdtpatches/*: Removed.
+	* icons/eclcl16: New icon directory.
+	* icons/eclcl16/build_configs.gif: New icon.
+	* plugin.properties: Add new strings used in plugin.xml.
+	* plugin.xml: Add buildType and buildArtefactType extensions.  Add
+	toolchain to Autotools project buildDefinitions extension.
+
+2007-04-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #235076
+	* src/com/redhat/eclipse/cdt/autotools/wizards/CProjectPlatformPage.java (CProjectPlatformPage):
+	Add missing NLS comment.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (makefileCvsExists): Use
+	getMakefileCVSPath method.
+	(configureExists): Use getConfigurePath method.
+	(getConfigurePath): New method.
+	(getMakefileCVSPath): New method.
+	(regenerateMakefiles): Use getConfigurePath and getMakefileCVSPath to get the
+	command to use when either of these is found to exist.
+	(autogenExists): Change to protected method.
+
+2007-03-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java (createPresentation):
+	Comment out macro parsing as this is now done by the reconciler and overall parsing.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java (getPrototype):
+	Fix so it is properly setting minimum and maximum parm counts for a macro.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfPrototype.java (setMaxParms):
+	Fix typo.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java (matchParentheses):
+	Update logic.
+	(parseMacro):  Add error checking for minimum and maximum parameters as well as unmatched
+	parentheses or square-brackets.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java (setParmCount):
+	New method.
+	(setQuoteDepth): Ditto.
+	(getParmCount): Ditto.
+	(getQuoteDepth): Ditto.
+	(setDepth): Ditto.
+	(getDepth): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.properties: Add
+	new error messages for parsing of macros.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage (update):
+	Use viewer refresh instead of redraw when updating.
+	(updateSelection): New method.
+
+2007-03-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/Makegenerator.java (regenerateMakefiles):
+	Refine algorithm so we don't cause a reconfigure if the configuration settings
+	file doesn't contain the project name.  If the configuration arguments are
+	unchanged and the settings file is the old style, rewrite with project
+	name.
+
+2007-03-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #230128
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (saveConfigArgs): Add
+	the project name as first argument saved.
+	(regenerateMakefiles): Read off first argument and verify that it matches the
+	current project name.
+
+2007-03-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #232965
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (runCommand):
+	Change prototype to accept a console and a boolean which when true
+	means to restart the console which may possibly clear the console.
+	(regenerateMakefiles): Change calls to runCommand.  For multiple
+	actions (e.g. autogen.sh then configure), opt for the 2nd, 3rd, etc...
+	calls to not clear the console.  Don't run config.status unless
+	the top-level Makefile is missing.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new
+	MakeGenerator.unsupportedConfig message.
+
+2007-03-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (regenerateMakefiles):
+	If configuration parameters have changed, mark all Scanner Info as dirty.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfoProvider.java (getCollectionName):
+	Make synchronized to avoid concurrent access of the infoCollection.
+	(getScannerInformation): Ditto.
+	(setDirty): New method.
+
+2007-03-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #230493
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java (getDefinedSymbols):
+	Recalculate each time if compilation string is null.
+	(getIncludePaths): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfoProvider.java (getScannerInformation):
+	Use a map of configurations to keep ScannerInfo seperate per configuration.  Use
+	current configuration to fetch scanner info.
+
+2007-02-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Bump up release to 0.0.8.1.
+
+2007-02-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzillas #230253, #205310.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakeTargetManager.java (addTargets):
+	New method to do mass add of MakeTargets for performance improvement.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java:
+	(addMakeTargetsToManager): Use new AutotoolsMakeTargetManager addTargets method.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectWizard.java (doRun):
+	Set indexer to NullIndexer before applying options.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject):
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizard.java:
+	Add new NULL_INDEXER_ID.
+	* src/com/redhat/eclipse/cdt/autotools/internal/MakeTargetManager.java: Expose
+	projectTargetMap to inheriting classes.
+
+2007-02-23  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 229891.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java (getMakeTargets):
+	Use Make Target info to find the real build target which may have been set by the
+	Build Special Targets action.
+	(build): Set up the IMakeBuildInfo needed to fetch Make Target from.
+
+2007-02-22  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeMessages.properties: Fix a few
+	typos.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentSetupParticipant.java (setup):
+	Use IDocumentExtension3 version of setDocumentParitioner if document is an instance of
+	IDocumentExtension3.
+
+2007-02-22  Andrew Overholt  <overholt@redhat.com>
+
+	* icons/automake.gif: New craptacular icon for automake editor.
+	* icons/autoconf.gif: Another manifestation of my poor artistic skills.
+	* plugin.xml: Use new icons.
+
+2007-02-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 229893.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Switch
+	to superclass TextFileDocumentProvider instead of FileDocumentProvider so as to fix
+	undo support.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentSetupParticipant.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.properties:  Fix typo.
+	* plugin.xml: Add extension for document setup that ties document setup for configuration
+	files to AutoconfDocumentSetupParticipant.
+
+2007-02-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java (findDelimeter): Ignore
+	escaped character.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitionScanner.java (AutoconfPartitionScanner):
+	Add escape character for # format comment and eat "\#" as character.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java (AutoconfCodeScanner):
+	Ditto.
+	* plugin.xml: Update release to 0.0.8.
+
+2007-02-20  Andrew Overholt  <overholt@redhat.com>
+
+	Patch from Jordy Potman
+	http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=229352
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java
+	(AutomakefileSourceConfiguration): Update super constructor call to reflect
+	change in CDT 3.1.2.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java
+	(initializeEditor): Likewise.
+
+2007-02-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElement.java: New class.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElifElement: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElseElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfIfElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfRootElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfWhileElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfCaseElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfForElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfCaseConditionElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java (AutoconfCodeScanner):
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java: New class to
+	do Autoconf file parsing and error marking.
+	Add AutoconfIdentifierRule and InlineDataRule.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java (createDocument):
+	Changed to use new AutoconfErrorHandler interface.
+	(documentAboutToBeChanged): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfErrorHandler.java (removeExistingMarkers):
+	Add verification that file exists.
+	(removeAllExistingMarkers): Ditto.
+	(handleError): Ditto.
+	(getCharOffset): Reformatted.
+	(AutoconfErrorHandler): Change constructor to take an IStorageEditorInput rather than
+	an IFile.  This allows external files to be edited without error handling.
+	* src/com/redhat/eclipse/cdt/autotools/editors/AutoconfEditorMessages.properties: New messages
+	added for outline parsing.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitionScanner.java (AutoconfPartitionScanner):
+	Use new AutoconfIdentifierRule.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java (getPresentationReconciler):
+	Change default partition to use MultilineRuleDamagerRepairer.
+	(getReconciler): New method.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java (createPresentation):
+	Change to use new AutoconfErrorHandler constructor.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroParser.java (AutoconfMacroParser): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java (doSetInput): New.
+	(getInputDocument): Ditto.
+	(getRootElement): Ditto.
+	(getAutoconfParser): Ditto.
+	(getAdapter): Ditto.
+	(InformationProvider): Ditto.
+	(getOutlinePage): Ditto.
+	(setRootElement): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfContentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfIdentifierRule.java: New class to
+	prevent matches of other strings that happen to be inside common identifiers.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/InlineDataRule.java: New class to
+	recognize inline data files.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/MultilineRuleDamagerRepairer.java: New class
+	to handle damage/repair when multiline rules are used.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfReconciliingStrategy.java: New class
+	for delayed document-change parsing.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/AutotoolsPluginImages.java: New class
+	to handle image repository.
+	* icons/etool16/acmacro_obj.gif: New image for Autoconf outline view.
+	* icons/etool16/ammacro_obj.gif: Ditto.
+	* icons/etool16/case_obj.gif: Ditto.
+	* icons/etool16/condition_obj.gif: Ditto.
+	* icons/etool16/elif_obj.gif: Ditto.
+	* icons/etool16/for_obj.gif: Ditto.
+	* icons/etool16/if_obj.gif: Ditto.
+	* icons/etool16/while_obj.gif: Ditto.
+	* plugin.xml: Add new error marker extension for outline view.
+
+2007-02-02  Andrew Overholt  <overholt@redhat.com>
+
+	* cdtpatches/README: Fix CVS location of managedbuilder.
+
+2007-02-02  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeCompletionProcessor.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java (getBuiltins):
+	Add $<, $@, and $?.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java
+	(getContentAssistant): Make use of AutomakeCompletionProcessor.
+
+2007-01-31  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* cdtpatches/cdt.ui.buildconsole.patch: New file that contains the
+	3.1.1 version of the patch for Bugzilla 153816 which adds multiple
+	build console support to CDT 4.0.
+	* cdtpatches/cdt.ui.patch: Altered to remove any build console patches.
+	* cdtpatches/README: Updated to include the new patch.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/CConfigureConsole.java (CConfigureConsole):
+	Modified to use new CUIPlugin build console manager interface.
+
+2007-01-31  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeErrorHandler.java: New class.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Remove unnecessary import.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java
+	(connect): New method.  Update error markers at document load time.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java
+	(reconcile): Update error markers.
+	(AutomakefileReconcilingStrategy): Set class-wide variables.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java
+	(getAutomakeErrorHandler): New method.
+
+2007-01-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 224644.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java (getMakeTargets):
+	Don't add "clean" for fullbuild anymore.  It causes unnecessary extra building to occur.
+	(build): Set a flag that build was called.
+	(clean): Only clean if this method is called directly and via a call to build method.
+	Clean by doing a make clean rather than calling super.clean.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (runCommand): When an
+	error occurs in configure, we want to set the status of the project to "needs rebuild".
+	(getConfigSettingsPath): New method to generate name of config settings file.
+	(saveConfigArgs): Use new getConfigSettingsPath method.
+	(regenerateMakefiles): Ditto, when checking if config options have changed.
+	(autogenExists): Clean up unused variables.
+	(getMakefileName): Return "Makefile" instead of "makefile".
+
+2007-01-22  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java:
+	Update copyright.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeIfElse.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileUtil.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java
+	(getAutomakeSourceViewer): New method. Update copyright.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java:
+	Update copyright.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeTextHover.java
+	(getHoverInfo): Remove debugging println. Update copyright.
+
+2007-01-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 214624.
+	* src/com/redhat/eclipse/cdt/autotools/internal/MarkerGenerator.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (runCommand): Add check
+	for return code being 0 or 1 to reveal whether command ran correctly.
+	(regenerateMakefiles): Add boolean checking for runCmd calls and also quit
+	if runCmd fails.  For autogen.sh cases, check if configure is run by autogen.sh
+	and don't bother calling configure afterwards if true.  Add error checking to
+	ensure a second command is not run if the first fails.
+	(PathVar): New private class.
+	(autogenExists): Fixed to take a path parameter to fill in.  It also looks for
+	any file that ends in autogen.sh to handle projects like Gnome.
+	* Resources.properties: Add new messages used by MakeGenerator.
+	* cdtpatches/managedbuilder.core.patch: New patch to cause ManagedMake build
+	to stop if an error occurs generating Makefile.
+	* cdtpatches/README: Add details on how to install new patch.
+
+2007-01-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroParser.java: New code
+	to parse an Autoconf macro.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java (createPresentation):
+	Use new AutoconfMacroParser.parse method instead of embedding the code.  Remove
+	all corresponding parse methods.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java (documentAboutToBeChanged):
+	Add checks for whether we should remove the error markers in an autoconf_macro
+	partition.
+
+2007-01-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* about.html: New EPL license file.
+
+2007-01-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/ParseException.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfErrorHandler.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfPrototype.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfAnnotationHover.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java: Add
+	copyright info.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfColorProvider.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Ditto.
+	(createDocument): New method.
+	(documentChanged): Ditto.
+	(documentAboutToBeChanged): Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfKeywordDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfM4WordDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroPartitionRule.java : Ditto.
+	(matchParentheses): Fix up logic.
+	(evaluate):
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroWordDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitioner.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitionScanner.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java: Ditto.
+	(getPresentationReconciler): Use AutoconfMacroDamagerRepairer for macro partition.
+	(getAnnotationHover): New method.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfWhitespaceDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfWordDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/IAutotoolEditorActionDefinitionIds.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/IAutotoolHelpContextIds.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/RecursiveSingleLineRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions/GetDefinedSymbolsAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions/GetIncludePathAction.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java: Ditto.
+	(getIndexedInfo): New method.
+	(getPrototype): Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/HoverMessages.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeWordDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAclocalAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutoconfAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutomakeAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeMessages.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/TwoInputDialog.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfoProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java: Ditto.
+
+2007-01-12  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeTextHover.java: New class.  Hover help provider for automake editor.
+	(getHoverControlCreator): New method.  Return null for now.
+	(AutomakeTextHover): New method.
+	(getHoverRegion): New method.  Return an IRegion from an offset in the document.
+	(findWord): New method.  Return an IRegion of the hover region.
+	(getHoverInfo): New method.  Return the hover information for a particular region.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java (getTextHover): New method.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java (getDirectiveContainingLine): Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java (getMakefile): Likewise.
+
+2007-01-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Revert
+	to version 1.2 prior to 2006-11-27.  This reversion is required because the previous
+	fix causes a regression in autoconf partitioning.
+
+2007-01-08  Andrew Overholt  <overholt@redhat.com>
+
+ 	* libhoverdocs/acmacros.xml: Add PKG_* macros from pkgconfig.
+
+2007-01-05  Andrew Overholt  <overholt@redhat.com>
+
+ 	* libhoverdocs/acmacros.xml: Add AM_* macros from automake's Public-macros.html.
+
+2007-01-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (regenerateMakefiles):
+	Add check for Makefile.cvs ahead of configure check.  Use resource strings
+	for runCommand descriptions.
+	(makefileCvsExists): New internal method.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new
+	resource strings.
+
+2007-01-02  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java
+	(automaticVariables): New $<, etc. variables.
+	(createRules): Add automatic variables as keywords. Also add @AC_SUBST_VAR@
+	highlighting.
+	(nextToken): New method.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java
+	(getDocument): New method.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeWordDetector.java:
+	New file.
+
+2006-12-15  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java
+	(getAutomakeCodeScanner): New method.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java
+	(getAutomakeSourceViewerConfiguration): Likewise.
+	(getAutomakefileDocumentProvider): Likewise
+	(initializeEditor): Set up field variables.
+
+2006-12-12  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add package visibility for tests.
+	* plugin.xml: Add filename associations for AutomakeEditor.
+
+2006-12-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* MANIFEST.MF: Update release to 0.0.6.
+
+2006-12-11  Kyu Lee  <klee@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/TwoInputDialog.java: New class
+	for getting 2 text field inputs.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeMessages.java: New class
+	for NLS strings.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutomakeAction.java: New
+	class for handling invoke automake.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutoconfAction.java: New
+	class for handling invoke autoconf.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAction.java: New super
+	class for invoking autotools classes.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAclocalAction.java: New
+	class for handling invoke aclocal.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeMessages.properties:
+	Property file for NLS strings.
+	* plugin.xml: Added menu options for invoking autotools under project menu.
+
+2006-12-11  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java
+	(getWorkingCopyManager): New method.
+	(getAutomakefileDocumentProvider): Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java
+	(initializeEditor): New method.
+	(getAutomakeOutlinePage): Likewise.
+	(createPartControl): Likewise.
+	(getAdapter): Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeMacroReferenceRule.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeMacroDefinitionRule.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeIfElse.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileUtil.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java:
+	Likewise.
+
+2006-12-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizard.java
+	(setCurrentProject): Make protected to allow subclasses to use.
+	* MANIFEST.MF: Export org.eclipse.linuxtools.cdt.autotools.wizards classes to the
+	autotools.tests plug-in.
+
+2006-12-01  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake: New directory.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java: New
+	file. Simple extension of MakefileEditor for now.
+	* plugin.xml: Add automake editor.
+
+2006-11-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Add .m4 file support to the Autoconf editor.
+
+2006-11-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java
+	(performRevert): Method copied from CDT and JDT editors.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java:
+	Change base class to be TextFileDocumentProvider. This means no longer providing
+	a createDocument() method.
+	(createDocument): Deleted.
+	(AutoconfStorageDocumentProvider.AutoconfStorageDocumentProvider): New internal
+	class based on StorageDocumentProvider.
+	(AutoconfStorageDocumentProvider.setupDocument): New method of internal class.
+	(AutoconfDocumentProvider): New constructor which sets up a
+	TextFileDocumentProvider that takes the internal AutoconfStorageDocumentProvider
+	class as parent DocumentProvider. This emulates what the CDT CEditor does and is
+	done to provide proper edit reversion support.
+
+2006-11-22  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/IAutotoolHelpContextIds.java:
+	Add CONTENT_ASSIST string.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java
+	(getContentAssistant): New routine to add content assist support.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java
+	(createActions): Add action for content assist.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java
+	(getIndexedInfo):
+	(getInformationControlCreator): New method.
+	(getTooltipAffordanceString): Make static.
+	(init): Ditto.
+	(getIndexedInfo): Ditto plus add call to init.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java:
+	New class for macro content assist.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroParameterListValidator.java:
+	New class for content assist to help with macro call parameters.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroProposalContextInformation.java:
+	New file for parameter context assist information.
+
+2006-11-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitionScanner.java
+	(AutoconfPartitionScanner): Change partitions to be comments, macros, and
+	default.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java
+	(getPresentationReconciler): Change to match new paritioning. Use a special new
+	MultiLineDamagerRepairer for macros.
+	(getConfiguredContentTypes): Change to list of new partitions.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java
+	(createPartControl): Specify new AUTOCONF_MACRO partition.
+	(InformationDispatchAction.makeAnnotationHoverFocusable): Ditto.
+	(InformationDispatchAction.makeTextHoverFocusable): Ditto.
+	(getAutoconfInlineCodeScanner, getAutoconfStringScanner): Removed.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfInlineCodeScanner.java:
+	Removed.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSectionRule.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfStringScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java
+	(AutoconfCodeScanner): Change rules to add a recursive single line rule for
+	strings and a multiline rule for inlined code. Also add a rule to discover m4
+	macros.
+	* src/com/redhat/eclipse.cdt/autotools/ui/editors/AutoconfM4WordDetector.java:
+	New file.
+	* src/com/redhat/eclipse.cdt/autotools/ui/editors/AutoconfMacroPartitionRule.java:
+	Ditto.
+	* src/com/redhat/eclipse.cdt/autotools/ui/editors/MultiLineDamagerRepairer.java:
+	Ditto.
+	* src/com/redhat/eclipse.cdt/autotools/ui/editors/RecursiveSingleLineRule.java:
+	Ditto.
+
+2006-10-31  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java
+	(init): Turn off parser validation.
+	* libhoverdocs/acmacros.xml: Update including m4 macros.
+
+2006-10-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java:
+	Remove unneeded import.
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java
+	(getLibHoverDocs): Specify no xml validation since there may be duplicate
+	function ids due to multiple standard definitions used in glibc.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java
+	(getTextHover): New method to add text hover for autoconf editor.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitioner.java
+	(connect): Remove calls to print debug messages.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java
+	(isFoldingEnabled):
+	(InformationDispatchAction.InformationDispatchAction): New for scrollable
+	tooltip support.
+	(createPartControl): Ditto.
+	(fProjectionModelUpdater): Ditto.
+	(InformationProvider.getInformation): Ditto.
+	(InformationDispatchAction): Ditto.
+	(initializeKeyBindingScopes): Ditto.
+	(InformationDispatchAction.makeTextHoverFocusable): Ditto.
+	(InformationProvider.getInformation2): Ditto.
+	(InformationProvider): Ditto.
+	(InformationDispatchAction.computeOffsetAtLocation): Ditto.
+	(fInformationPresenter): Ditto.
+	(.createInformationControl): Ditto.
+	(InformationProvider.getInformationPresenterControlCreator): Ditto.
+	(createActions): Ditto.
+	(InformationDispatchAction..createInformationControl): Ditto.
+	(InformationDispatchAction.run): Ditto.
+	(InformationDispatchAction.fTextOperationAction): Ditto.
+	(InformationDispatchAction.makeAnnotationHoverFocusable): Ditto.
+	(fProjectionSupport): Ditto.
+	(InformationProvider.getSubject): Ditto.
+	(InformationProvider.InformationProvider): Ditto.
+	* src/libhoverdocs/acmacros.xml: New file containing autoconf hover help.
+	* src/libhoverdocs/glibc.xml: Updated.
+	* src/libhoverdocs/LIBHOVERDOCS.LICENSE: New file with licensing info.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/IAutotoolEditorActionDefinitionIds.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editoros/IAutotoolHelpContextIds.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/HoverMessages.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/HoverMessages.properties:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/HTML2TextReader.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/HTMLPrinter.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/HTMLTextPresenter.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/LineBreakingReader.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/SingleCharReader.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/SubstitutionTextReader.java:
+	Ditto.
+	* plugin.xml: Fix autoconf editor to look for configure.in or configure.ac. Add
+	hover help for autoconf editor and set up F2 key binding for scrollable tooltips.
+	* plugin.properties: Add autoconf editor strings.
+
+2006-10-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java: New
+	file.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfWordDetector.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfWhitespaceDetector.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfStringScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSectionRule.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitionScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitioner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroWordDetector.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfKeywordDetector.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfInlineCodeScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfColorProvider.java:
+	Ditto.
+	* plugin.properties: Add Autoconf editor name.
+	* plugin.xml: Add Autoconf editor.
+
+2006-10-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 209161.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(initializeBuildConfigDirs): New method.
+	(initialize): Call initializeBuildConfigDirs().
+	(regenerateMakefiles): Ditto if configuration parameters have changed.
+	(createDirectory): Return project path if input directory is empty string or
+	".".
+
+2006-09-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* build.properties: Update so plugin.properties built into binary.
+	* build.xml: New file.
+
+2006-09-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Bump up release number to 0.0.5.
+
+2006-09-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 206719
+	* plugin.xml: Comment out deprecated ManagedBuildInfo extension and replace with
+	new org.eclipse.cdt.managedbuilder.core.buildDefinitions extension point.
+	* plugin.properties: Add new strings from new build definition.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/CProjectPlatformPage.java
+	(CProjectPlatformPage): Fix project type reference to refer to new project type
+	id in build definition.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(initialize): Switch over to new option ids in new build definition.
+	(getConfigArgs): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java
+	(getCompilationString): Don't bother if input resource isn't a file.
+	(buildFile): Fix how build directory is fetched to work with new build
+	definition.
+	(AutotoolsScannerInfo): Save the original resource reference.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
+	(AUTOTOOLS_CONFIG_ID): Change to match new build definition.
+
+2006-09-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 206359
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java
+	(verifyScannerInfoProvider): New method to check ScannerInfoProvider and set it
+	only if necessary.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
+	(hasTargetBuilder): Call verifyScannerInfoProvider instead of
+	setScannerInfoProvider to prevent changing the project file every time the
+	hasTargetBuilder check is made.
+
+2006-09-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 206164.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java
+	(followIncludeChain): Follow the session property as far as possible. When it
+	ends try looking for the new OPEN_INCLUDE_P persistent property to re-establish
+	the chain.
+	(createIncludeChain): Set a new persistent property OPEN_INCLUDE_P that is the
+	location of the resource.
+
+2006-09-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* cdtpatches/cdt.ui.patch: Update patch to include defined symbol hover help.
+
+2006-09-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java
+	(getDefinedSymbols): Prepare code for failure to get compilation string.
+
+2006-09-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* cdtpatches/README: New file to instruct how to apply patches to the CDT.
+	* cdtpatches/cdt.core.patch: Patch for org.eclipse.cdt.core.
+	* cdtpatches/cdt.ui.patch: Patch for org.eclipse.cdt.ui.
+
+2006-08-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Replace DynamicScannerInfo extension hack with existing CDT
+	ScannerInfoProvider extension. Change version to 0.0.4.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/CConfigureConsole.java
+	(CConfigureConsole): Use new getSubConsoleManager method of CUIPlugin.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsole.java: No
+	longer needed, so removed.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleDocument.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleManager.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsolePage.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsolePartition.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsolePartitioner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleStream.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleViewer.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConsoleEvent.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConsoleOutputTextStore.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ScrollLockAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java
+	(convertProject): Set scanner info provider for project.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfoProvider.java: Extend
+	AbstractCExtension.
+	(getScannerInformation): Call AutotoolsScannerInfo.followIncludeChain method to
+	get real underlying resource to get dynamic build info from.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java: Implement new
+	interface IScannerInfoPlus.
+	(followIncludeChain): New method to adhere to new interface.
+	(createIncludeChain): New method.
+	(getDefinedSymbols): Add defined symbols found by ManagedBuildManager.
+	(getIncludePaths): Append include path found by ManagedBuildManager.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java
+	(setScannerInfoProvider): New method.
+	(getConsoleManager): Removed.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java:
+	(hasTargetBuilder): Replace the default scanner provider for Managed Make
+	projects with AutotoolsScannerInfoProvider.
+
+2006-08-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java
+	(run): If there are no targets yet
+	(i.e. no makefile), try and regenerate the makefile.* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (getConfigArgs):
+	Make sure there is an "other" string to process rather than adding an empty
+	argument.
+
+2006-08-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(regenerateMakefiles): Add logic to check if the configuration arguments have
+	changed since the last configuration and reconfigure if they have.
+	(saveConfigArgs): New method.
+
+2006-08-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
+	(addAutotoolsBuilder): Check for ManagedMake's genmakebuilder and remove if
+	found.
+	(hasTargetBuilder): Look for Autotools default configuration and if found, add
+	the Autotools Makefile builder.
+
+2006-07-31  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java
+	(getLibHoverDocs): New method which replaces buildDocPath and fetches libhover
+	base data file from the plugin's jar.
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java
+	(buildDocPath): Replaced by getLibHoverDocs. Change all callers.
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java
+	(getDocument): Removed.
+
+2006-07-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Remove unused sample extensions.
+	* src/com/redhat/eclipse/cdt/autotools/editors/*: Remove all files.
+	* src/com/redhat/eclipse/cdt/autotools/preferences/*: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/properties/*: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/views/*: Ditto.
+
+2006-07-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Update release.
+	* META-INF/MANIFEST.MF: Export libhoverdocs.
+
+2006-07-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Update release.
+
+2006-07-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
+	(getMakeTargets): Use IMakeBuildInfo.BUILD_TARGET_INCREMENTAL instead of
+	IMakeBuildInfo.BUILD_TARGET_FULL which is now obsoleted and not set by the
+	MakeTargets.
+	(clean): Ditto.
+
+2006-07-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Add new "other" option which allows the end-user to specify any
+	configuration option manually.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(getConfigArgs): New function to get configure arguments from preferences.
+	(runCommand): Change prototype to take an argument array.
+	(regenerateMakefiles): Only when running full configure, pass args to runCommand
+	and get these from getConfigArgs method.
+
+2006-07-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java
+	(getCompilationString): Don't use previous compilation string if we have marked
+	the scanner info as dirty.
+	(getIncludePaths): Don't continue processing if the compilation string is null.
+
+2006-06-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions/GetDefinedSymbolsAction.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java
+	(getDefinedSymbols): Fill in function details to fetch flags used in dynamic
+	compilation info.
+	(getCompilationString): New function to get and save the actual compilation
+	string from the make invocation.
+	(getIncludePaths): Move logic into getCompilationString.
+	(compilationString): New field to store compilation string.
+	(definedSymbols): New field to store map of defined symbols.
+	* plugin.xml: Add defined symbols menu item.
+
+2006-06-20  jjohnstn  <jjohnstn@toy.toronto.redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions/GetIncludePathAction.java:
+	Remove unused imports.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeUIImages.java: New class
+	copied from Std Make internal packages to local internal package.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MessageLine.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeUIPlugin.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeResources.properties: New
+	properties message file used by MakeUIPlugin.
+	* src/com/redhat/eclipse/cdt/autotools/actions/TargetListViewerPart.java: Use
+	Autotools StructureViewPart instead of internal one from Std Make plugin.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeTargetDialog.java: Use new
+	Autotools internal classes rather than internal ones from Std Make plugin.
+	* src/com/redhat/eclipse/cdt/autotools/actions/AbstractTargetAction.java
+	(getShell): Use new AutotoolsPlugin getActiveWorkbenchShell method instead of
+	the one in internal MakeUIPlugin.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java: Remove
+	unused imports.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java
+	(getActiveWorkbenchShell): New method.
+
+2006-06-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Add dependency on org.eclipse.core.variables.
+	* src/com/redhat/eclipse/cdt/autotools/internal/MakeTargetManager: New internal
+	class copied from Std Make projects.
+	* src/com/redhat/eclipse/cdt/autotools/internal/MakeTarget: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ProjectTargets: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/MakeMessages: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakeTargetManager: Base on local
+	internal MakeTargetManager class rather than unpublished Std Make internal class.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator: Remove reference to Std
+	Make MakeMessages internal class.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new message
+	about invoking make for the project.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java
+	(getFormattedString): New method to get resource string with arguments.
+
+2006-06-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Added "org.eclipse.cdt.core.DynamicScannerInfoProvider" extension.
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions/GetIncludePathAction.java
+	(run): Altered to use new AutotoolsScannerInfo class.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfoProvider.java: New
+	class used to hook up to added extension point:
+	org.eclipse.cdt.core.DynamicScannerInfoProvider.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java: New file based
+	on AutotoolsMakefileMiner.java. Class implements IScannerInfo interface.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileMiner.java: Transformed
+	into AutotoolsScannerInfo.java.
+
+2006-06-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions/GetIncludePathAction.java:
+	Fix up imports.
+
+2006-06-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Make provider Red Hat.
+
+2006-06-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileMiner.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions: GetIncludePathAction.java:
+	Ditto.
+	* plugin.xml: Add extensions to create menu for source files that will grab the
+	dynamic include path for the build and display it in a message dialog. This is
+	just a temporary test.
+
+2006-05-19  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java
+	(run): Create our target selection dialog in-line. Make this dialog have a
+	filter for selection of make target.
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildTargetDialog.java: Remove:
+	no longer necessary.
+
+2006-05-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
+	(clean): Overriding method to check for MakeTargets in which case we don't want
+	to clean out directory.
+	* plugin.xml: Remove unneeded extension.
+
+2006-04-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java
+	(getHref): Change to reference the glibc book rather than the Gnu help.
+
+2006-04-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java: New file based on Chris
+	Moller's hover help, using ICHelpProvider interface.
+	* plugin.xml: Add CHelpProvider extension to supply hover help.
+	* libhoverdocs/glibc.xml: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutoconfPlugin.java: Refactored.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java: Refactored from
+	AutoconfPlugin.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/CConfigureConsole.java:
+	Refactor AutoconfPlugin to AutotoolsPlugin.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/CProjectPlatformPage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizard.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/preferences/PreferenceInitializer.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/TargetListViewerPart.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeTargetDialog.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeContentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildTargetDialog.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java: Ditto.
+
+2006-04-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Remove toc extension since we have moved docs to a separate
+	plug-in.
+	* getdocs.sh: Moved to autotools-doc plugin.
+	* doc.zip: Ditto.
+	* toc.xml: Ditto.
+	* testToc.xml: Removed.
+
+2006-04-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* toc.xml: Add references for Gnu Tools documents.
+	* doc.zip: New file containing zipped up html files for Gnu tools.
+	* getdocs.sh: Shell script to get html files from the web and build doc.zip.
+	* plugin.xml: Connect toc extension to toc.xml so that Gnu tools help is
+	provided with Autotools plugin.
+
+2006-03-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutoconfPlugin.java
+	(getConsoleManager): New method.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(runCommand): Specify the Autotools configure console to use for configuration
+	output.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/CConfigureConsole.java: New
+	file stodified from ManagedBuild Project internal directory.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleDocument.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleManager.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsolePage.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsolePartitioner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsolePartition.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleStream.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleViewer.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsole.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConsoleEvent.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConsoleMessages.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConsoleMessages.properties:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ScrollLockAction.java: Ditto.
+	* plugin.xml: Set up CBuildConsole extension to be CConfigureConsole.
+
+2006-03-15  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(addMakeTargetsToManager): New method.
+	(regenerateMakefiles): Call addMakeTargetsToManager after Makefile is generated.
+
+2006-03-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectOptionPage.java
+	(getProject): If dealing with a ConvertToAutotoolsProjectWizard, use it's
+	getProject method.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizard.java
+	(setCurrentProject): New method.
+	(applyOptions): Change prototype to accept project as input. Call
+	setCurrentProject method using the project variable before getting the optionPage
+	to performApply.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java
+	(applyOptions): Add project as input variable and pass this on call.
+	(convertProject): Pass project when calling applyOptions method.
+
+2006-03-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
+	(getMakeTargets): When doing a full build, we don't want to do a "clean" if the
+	target is not "all".
+
+2006-03-09  Andrew Overholt  <overholt@redhat.com>
+
+	* .cvsignore: Initial checkin. Ignore bin.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(regenerateMakefiles): Rename CONFIG_STATUS_NAME to CONFIG_STATUS. Call
+	autogen.sh first if configure does not exist.
+	(configureExists): New method.
+	(autogenExists): New method.
+	(runCommand): New method. Run configure or autogen and report success.
+	* plugin.properties: Change "CVS Autotools" to Autotools.
+	* plugin.xml: Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectWizard.java
+	(NewAutotoolsProjectWizard): Likewise.
+
+2006-03-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Set up default gcc scanner in our ManagedMakeProject target
+	extension -
+	org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java
+	(convertProject): Remove commented code about setting ScannerConfig as we now
+	set the default GCC scanner collector in our ManagedMakeProject extension.
+
+2006-03-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutoconfPlugin.java
+	(ftargetManager): New field.
+	(getUniqueIdentifier): New method.
+	(getTargetManager): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java: New
+	builder that extends ManagedMakeProject's GeneratedMakefileBuilder and allows us
+	to override behavior.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakeTargetManager.java: New
+	class that extends a Std MakeProject's MakeTargetManager and allows us to
+	override behavior.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: New strings added
+	to support BuildSpecial functionality.
+	* src/com/redhat/eclipse/cdt/autotools/AbstractTargetAction.java: New file based
+	on Std MakeProject class.
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java: Rewritten to
+	extend AbstractTargetAction and to create a dialog rather than print out hello
+	world.
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildTargetDialog.java: New file
+	that implements the Build Special Targets dialog. Based on a Std Make Project's
+	BuildTargetDialog.
+	* src/com/redhat/eclipse/cdt/autotools/actions/CheckboxTablePart.java: New file
+	to support new dialogs.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeContentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeTargetDialog.java: New file
+	that implements the Make Target dialog allowing management of make targets. Based
+	on Std Make Project's MakeTargetDialog.
+	* src/com/redhat/eclipse/cdt/autotools/actions/SharedPartWithButtons.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/StructuredViewerPart.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/TargetListViewerPart.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java:
+	Instead of adding a ManagedProject builder, add our new AutotoolsMakefileBuilder.
+	* plugin.xml: Add our new AutotoolsMakefileBuilder as an official builder.
+
+2006-02-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java: Remove some warnings.
+	* plugin.xml: Fix duplicate target configuration options and re-add in --build
+	option.
+
+2006-02-23  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* Initial import.
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/META-INF/MANIFEST.MF b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..a9de97b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/META-INF/MANIFEST.MF
@@ -0,0 +1,34 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name.0
+Bundle-SymbolicName: org.eclipse.linuxtools.cdt.autotools;singleton:=true
+Bundle-Version: 2.0.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.cdt.autotools.AutotoolsPlugin
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.4.0",
+ org.eclipse.jface.text;bundle-version="3.4.0",
+ org.eclipse.core.resources;bundle-version="3.4.0",
+ org.eclipse.cdt.managedbuilder.core;bundle-version="5.0.100",
+ org.eclipse.cdt.core;bundle-version="5.1.0",
+ org.eclipse.cdt.managedbuilder.ui;bundle-version="5.0.100",
+ org.eclipse.cdt.managedbuilder.gnu.ui;bundle-version="5.0.100",
+ org.eclipse.cdt.make.core;bundle-version="5.1.0",
+ org.eclipse.ui.console;bundle-version="3.3.0",
+ org.eclipse.help;bundle-version="3.3.100",
+ org.eclipse.core.variables;bundle-version="3.2.100",
+ org.eclipse.ui.views;bundle-version="3.3.0",
+ org.eclipse.core.filesystem;bundle-version="1.2.0",
+ org.eclipse.ui;bundle-version="3.5.0",
+ org.eclipse.cdt.ui;bundle-version="5.1.0",
+ org.eclipse.ui.ide;bundle-version="3.5.0",
+ org.eclipse.ui.editors;bundle-version="3.5.0",
+ org.eclipse.linuxtools.cdt.autotools.core;bundle-version="1.0.0",
+ org.eclipse.linuxtools.cdt.autotools.ui;bundle-version="1.0.0"
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %provider
+Export-Package: org.eclipse.linuxtools.cdt.autotools;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests",
+ org.eclipse.linuxtools.cdt.autotools.ui.properties;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests",
+ org.eclipse.linuxtools.internal.cdt.autotools;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests",
+ org.eclipse.linuxtools.internal.cdt.autotools.ui;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests",
+ org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/about.html b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/about.html
new file mode 100644
index 0000000..44e2290
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

+<html>

+<head>

+<title>About</title>

+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>8th September, 2004</p>	

+<h3>License</h3>

+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<h3>Contributions</h3>

+

+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise

+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such

+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or

+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the

+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available

+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also

+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+</body>

+</html>
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/build.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/build.properties
new file mode 100644
index 0000000..592910e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/build.properties
@@ -0,0 +1,8 @@
+source.. = src/
+output.. = bin/
+bin.includes = plugin.xml,\
+               META-INF/,\
+               .,\
+               plugin.properties,\
+               icons/
+
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/icons/autoconf.gif b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/icons/autoconf.gif
new file mode 100644
index 0000000..98afb3e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/icons/autoconf.gif
Binary files differ
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/plugin.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/plugin.properties
new file mode 100644
index 0000000..128cd2a
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/plugin.properties
@@ -0,0 +1,170 @@
+#################################################################################
+#  Copyright (c) 2006, 2008, 2009 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+ConvertWizard.description=Convert to C/C++ Autotools Project
+NewCProject.description=GNU C Autotools Project
+NewCCProject.description=GNU C++ Autotools Project
+NewCWizard.name=GNU C Autotools Project
+NewCCWizard.name=GNU C++ Autotools Project
+
+Autotools.wizard.name=GNU Autotools Build Wizard
+
+Autoconf.editor.name=Autoconf Editor
+
+BuildProperty.value.name.default=Default;
+BuildProperty.type.name.autotools=GNU Autotools
+
+PreferenceAutotools.name=Autotools
+PreferenceAutomakeEditor.name=Automake Editor
+PreferenceAutoconfEditor.name=Autoconf Editor
+
+PropertyAutotools.name=Autotools
+PropertyTabEditor.name=Editors
+AutotoolsBuildPropertyTab.name=Autotools
+AutotoolsEditorsPropertyTab.name=Editors
+AutotoolsToolsPropertyTab.name=Tools Settings
+
+PropertyTabEditor.tooltip=Set options for Autotools-specific editors
+PropertyTabBuild.tooltip=Set additional Autotools build options
+
+Makefile.builder.name=Autotools Makefile Generator
+Autotools.projecttype.name=GNU Autotools
+AutotoolsNature.name=Autotools Project Nature
+Configuration.build.name=Build (GNU)
+Autotools.targetplatform.name=GNU Autotools Target Platform
+Autotools.gnu.toolchain.name=GNU Autotools Toolchain
+Configure.outputType=Configure Output (config.status)
+Autogen.outputType=Autogen Output (configure)
+
+CommandCategorySource.name=Source
+CommandCategorySource.description=Source commands
+CommandCategoryTools.name=Tools
+CommandCategoryTools.description=Autotool tools
+ShowTooltip.name=Show Tooltip Description
+ShowTooltip.description=Shows the tooltip description for the element at the cursor
+
+# Scope and Key Commands
+ACeditor.scope.name=Autoconf Editor
+ACeditor.scope.description=Editor for Autoconf Configuration Source Files
+
+Tool.configure=configure
+
+OptionCategory.configure.general=General
+Option.configure.builddir=Build directory
+Option.configure.builddir.tip=Subdirectory off of project where build will occur
+Option.configure.configdir=Configure tool directory
+Option.configure.configdir.tip=Subdirectory to change to before invoking configure
+Option.configure.cache_file=Name of configuration cache file (--cache-file)
+Option.configure.cache_file.tip=Specify the name of the configuration cache file [config.cache]
+Option.configure.no_create=Turn off file creation <not advised> (--no-create)
+Option.configure.no_create.tip=This tells configuration not to generate the output files as part of configuration
+Option.configure.quiet=Turn off checking messages (--quiet)
+Option.configure.quiet.tip=This turns off "checking ..." style messages from the configuration console output
+Option.configure.help=Display help contents of top-level configuration (--help)
+Option.configure.help.tip=Ask configuration file to display its help documentation
+Option.configure.version=Display version of autotools used to create configuration (--version)
+Option.configure.version.tip=This outputs the version of the Autotools used to create the configuration files
+
+OptionCategory.configure.platform=Platform Specifiers
+Option.configure.host=Host platform (--host)
+Option.configure.host.tip=Platform that project will run on
+Option.configure.target=Target platform (--target)
+Option.configure.target.tip=Platform that project will target output for
+Option.configure.build=Build platform (--build)
+Option.configure.build.tip=Platform where project is being built
+
+OptionCategory.configure.directories=Directory specifiers
+Option.configure.prefix=Arch-independent install directory (--prefix)
+Option.configure.prefix.tip=Place where architecture-independent files are installed [/usr/local]
+Option.configure.exec_prefix=Arch-dependent install directory (--exec-prefix)
+Option.configure.exec_prefix.tip=Place where architecture-dependent files are installed [PREFIX]
+Option.configure.libdir=Object code library directory (--libdir)
+Option.configure.libdir.tip=Place where object code libraries are installed [EPREFIX/lib]
+Option.configure.bindir=User executable directory (--bindir)
+Option.configure.bindir.tip=Place where binary executables are installed [EPREFIX/bin]
+Option.configure.sbindir=System admin executable directory (--sbindir)
+Option.configure.sbindir.tip=Place where system admin executables are installed [EPREFIX/sbin]
+Option.configure.includedir=C Header file directory (--includdir)
+Option.configure.includedir.tip=Place where header files will be installed [PREFIX/include]
+Option.configure.datadir=Read-only architecture-independent data (--datadir)
+Option.configure.datadir.tip=Place where read-only architecture-independent data is installed [PREFIX/share]
+Option.configure.sysconfdir=Read-only single-machine data directory (--syconfdir)
+Option.configure.sysconfdir.tip=Place where read-only single-machine data is stored [PREFIX/etc]
+Option.configure.infodir=Info file documentation directory (--infodir)
+Option.configure.infodir.tip=Place where info files are installed [PREFIX/info]
+Option.configure.mandir=Man file documentation directory (--mandir)
+Option.configure.mandir.tip=Place where man file documentation is installed [PREFIX/man]
+Option.configure.srcdir=Sources directory (--srcdir)
+Option.configure.srcdir.tip=Place where configure can find sources [configure directory or ..]
+Option.configure.localstatedir=Modifiable single-machine data directory (--localstatedir)
+Option.configure.localstatedir.tip=Place where modifiable single-machine data is installed [PREFIX/var]
+Option.configure.sharedstatedir=Modifiable architecture-independent data directory (--sharedstatedir)
+Option.configure.sharedstatedir.tip=Place where modifiable architecture-independent data is installed [PREFIX/com}
+Option.configure.libexecdir=Program executable directory (--libexecdir)
+Option.configure.libexecdir=Place where program executables will be installed [EPREFIX/libexec]
+Option.configure.oldincludedir=Non-gcc C header file directory (--oldincludedir)
+Option.configure.oldincludedir.tip=Place where non-gcc C header files are installed [/usr/include]
+
+OptionCategory.configure.filenames=File-name transformations
+Option.configure.program_prefix=Installed program prefix (--program-prefix)
+Option.configure.program_prefix.tip=Prepend PREFIX to the beginning of installed program names
+Option.configure.program_suffix=Installed program suffix (--program-suffix)
+Option.configure.program_suffix.tip=Append SUFFIX to the end of installed program names
+Option.configure.program_transform_name=Installed program name transform (--program-transform-name)
+Option.configure.program_transform_name.tip=A sed string used to transform installed program names
+
+OptionCategory.configure.features=Features and packages
+Option.configure.enable_maintainer_mode=Enable maintainer mode (--enable-maintainer-mode)
+Option.configure.enable_maintainer_mode.tip=Specify this to have Makefiles generated with checks for Autotool configuration file changes
+Option.configure.user=User-specified configuration options
+Option.configure.user.tip=Specify one or more configuration options (e.g. --enable-FEATURE, --disable-FEATURE, or --with-PACKAGE)
+
+Tool.autogen = autogen.sh
+
+OptionCategory.autogen.general=Options
+Option.autogen.user=Command line options
+Option.autogen.user.tip=Specify options to pass to the top-level autogen.sh script
+
+RedHatVendor.name = Red Hat
+Bundle-Name.0 = Autotools Plug-in (Incubation)
+provider=Eclipse
+ConvertWizard.name = Convert to a C/C++ Autotools Project
+InvokeAutotools.label = Invoke Autotools
+InvokeAutotools.mnemonic = I
+InvokeAutoconf.label = Invoke Autoconf
+InvokeAutoconf.mnemonic = c
+InvokeAutoconf.description = Run autoconf in the selected directory
+InvokeAutoheader.label = Invoke Autoheader
+InvokeAutoheader.mnemonic = h
+InvokeAutoheader.description = Run autoheader from the selected directory
+InvokeAutomake.label = Invoke Automake
+InvokeAutomake.mnemonic = m
+InvokeAutomake.description = Run automake from the selected directory
+InvokeAutoreconf.label = Invoke Autoreconf
+InvokeAutoreconf.mnemonic = r
+InvokeAutoreconf.description = Run autoreconf from the selected directory
+InvokeAclocal.label = Invoke Aclocal
+InvokeAclocal.mnemonic = l
+InvokeAclocal.description = Run aclocal from the selected directory
+InvokeLibtoolize.label = Invoke Libtoolize
+InvokeLibtoolize.mnemonic = t
+InvokeLibtoolize.description = Run libtoolize in the selected directory
+Reconfigure.label = Reconfigure Project
+Reconfigure.mnemonic = f
+Reconfigure.description = Run configuration scripts for project
+DynamicBuild.label = Dynamic Build Info
+GetIncludePath.label = Get Include Path
+GetDefinedSymbols.label = Get Defined Symbols
+IncludesOption.name = includes
+SymbolsOption.name = symbols
+AutomakeEditor.name = AutomakeEditor
+Automake.name = automake
+ConfigureScript.name=Configure Script
+AutogenScript.name=Autogen Script
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/plugin.xml b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/plugin.xml
new file mode 100644
index 0000000..04c6fa3
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/plugin.xml
@@ -0,0 +1,1031 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+     <extension
+           id="autotoolsProperties"
+           name="Autotools Build Properties"
+           point="org.eclipse.cdt.managedbuilder.core.buildProperties">
+           <propertyValue 
+              	property="org.eclipse.cdt.build.core.buildType" 
+              	id="org.eclipse.linuxtools.cdt.autotools.buildType.default" 
+              	name="%BuildProperty.value.name.default"/>
+           <propertyValue 
+            	property="org.eclipse.cdt.build.core.buildArtefactType" 
+            	id="org.eclipse.linuxtools.cdt.autotools.buildArtefactType.autotools" 
+            	name="%BuildProperty.type.name.autotools"/>
+     </extension>
+   <extension
+         id="cdt.autootols.managed.build.info"
+         name="Autotools Managed Build Info"
+         point="org.eclipse.cdt.managedbuilder.core.buildDefinitions">
+      <managedBuildRevision fileVersion="4.0.0"/>
+      <tool
+            command="configure"
+            id="org.eclipse.linuxtools.cdt.autotools.tool.configure"
+            isAbstract="false"
+            name="%Tool.configure"
+            natureFilter="both">
+         <optionCategory
+               id="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.general"
+               name="%OptionCategory.configure.general"
+               owner="org.eclipse.linuxtools.cdt.autotools.tool.configure"/>
+         <option
+               applicabilityCalculator="org.eclipse.linuxtools.cdt.autotools.AutotoolsDefaultBuildDirHandler"
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.general"
+               defaultValue="build"
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.builddir"
+               isAbstract="false"
+               name="%Option.configure.builddir"
+               resourceFilter="all"
+               tip="%Option.configure.builddir.tip"
+               valueHandler="org.eclipse.linuxtools.cdt.autotools.AutotoolsDefaultBuildDirHandler"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.general"
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.configdir"
+               isAbstract="false"
+               name="%Option.configure.configdir"
+               resourceFilter="all"
+               tip="%Option.configure.configdir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.general"
+               command="--cache-file="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.cache_file"
+               isAbstract="false"
+               name="%Option.configure.cache_file"
+               resourceFilter="all"
+               tip="%Option.configure.cache_file.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.general"
+               command="--help"
+               defaultValue="false"
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.help"
+               isAbstract="false"
+               name="%Option.configure.help"
+               resourceFilter="all"
+               tip="%Option.configure.help.tip"
+               valueType="boolean"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.general"
+               command="--no-create"
+               defaultValue="false"
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.no_create"
+               isAbstract="false"
+               name="%Option.configure.no_create"
+               resourceFilter="all"
+               tip="%Option.configure.no_create.tip"
+               valueType="boolean"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.general"
+               command="--quiet"
+               defaultValue="false"
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.quiet"
+               isAbstract="false"
+               name="%Option.configure.quiet"
+               resourceFilter="all"
+               tip="%Option.configure.quiet.tip"
+               valueType="boolean"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.general"
+               command="--version"
+               defaultValue="false"
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.version"
+               isAbstract="false"
+               name="%Option.configure.version"
+               resourceFilter="all"
+               tip="%Option.configure.version.tip"
+               valueType="boolean"/>
+         <optionCategory
+               id="org.eclipse.linuxtools.cdt.autotools.configure.optionCategory.configure.platform"
+               name="%OptionCategory.configure.platform"
+               owner="org.eclipse.linuxtools.cdt.autotools.tool.configure"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.configure.optionCategory.configure.platform"
+               command="--host="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.host"
+               isAbstract="false"
+               name="%Option.configure.host"
+               resourceFilter="all"
+               tip="%Option.configure.host.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.configure.optionCategory.configure.platform"
+               command="--target="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.target"
+               isAbstract="false"
+               name="%Option.configure.target"
+               resourceFilter="all"
+               tip="%Option.configure.target.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.configure.optionCategory.configure.platform"
+               command="--build="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.build"
+               isAbstract="false"
+               name="%Option.configure.build"
+               resourceFilter="all"
+               tip="%Option.configure.build.tip"
+               valueType="string"/>
+         <optionCategory
+               id="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               name="%OptionCategory.configure.directories"
+               owner="org.eclipse.linuxtools.cdt.autotools.tool.configure"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--prefix="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.prefix"
+               isAbstract="false"
+               name="%Option.configure.prefix"
+               resourceFilter="all"
+               tip="%Option.configure.prefix.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--exec-prefix="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.exec_prefix"
+               isAbstract="false"
+               name="%Option.configure.exec_prefix"
+               resourceFilter="all"
+               tip="%Option.configure.exec_prefix.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--libdir="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.libdir"
+               isAbstract="false"
+               name="%Option.configure.libdir"
+               resourceFilter="all"
+               tip="%Option.configure.libdir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--bindir="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.bindir"
+               isAbstract="false"
+               name="%Option.configure.bindir"
+               resourceFilter="all"
+               tip="%Option.configure.bindir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--sbindir="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.sbindir"
+               isAbstract="false"
+               name="%Option.configure.sbindir"
+               resourceFilter="all"
+               tip="%Option.configure.sbindir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--includedir="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.includedir"
+               isAbstract="false"
+               name="%Option.configure.includedir"
+               resourceFilter="all"
+               tip="%Option.configure.includedir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--datadir="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.datadir"
+               isAbstract="false"
+               name="%Option.configure.datadir"
+               resourceFilter="all"
+               tip="%Option.configure.datadir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--sysconfdir="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.sysconfdir"
+               isAbstract="false"
+               name="%Option.configure.sysconfdir"
+               resourceFilter="all"
+               tip="%Option.configure.sysconfdir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--infodir="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.infodir"
+               isAbstract="false"
+               name="%Option.configure.infodir"
+               resourceFilter="all"
+               tip="%Option.configure.infodir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--mandir="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.mandir"
+               isAbstract="false"
+               name="%Option.configure.mandir"
+               resourceFilter="all"
+               tip="%Option.configure.mandir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--srcdir="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.srcdir"
+               isAbstract="false"
+               name="%Option.configure.srcdir"
+               resourceFilter="all"
+               tip="%Option.configure.srcdir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--localstatedir="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.localstatedir"
+               isAbstract="false"
+               name="%Option.configure.localstatedir"
+               resourceFilter="all"
+               tip="%Option.configure.localstatedir"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--sharedstatedir="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.sharedstatedir"
+               isAbstract="false"
+               name="%Option.configure.sharedstatedir"
+               resourceFilter="all"
+               tip="%Option.configure.sharedstatedir"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--libexecdir="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.libexecdir"
+               isAbstract="false"
+               name="%Option.configure.libexecdir"
+               resourceFilter="all"
+               tip="%Option.configure.libexecdir"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--oldincludedir="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.oldincludedir"
+               isAbstract="false"
+               name="%Option.configure.oldincludedir"
+               resourceFilter="all"
+               tip="%Option.configure.oldincludedir.tip"
+               valueType="string"/>
+         <optionCategory
+               id="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.filenames"
+               name="%OptionCategory.configure.filenames"
+               owner="org.eclipse.linuxtools.cdt.autotools.tool.configure"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.filenames"
+               command="--program-prefix="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.program_prefix"
+               isAbstract="false"
+               name="%Option.configure.program_prefix"
+               resourceFilter="all"
+               tip="%Option.configure.program_prefix.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.filenames"
+               command="--program-suffix="
+               id="org.eclipse.linuxtools.cdt.autotools.option.program_suffix"
+               isAbstract="false"
+               name="%Option.configure.program_suffix"
+               resourceFilter="all"
+               tip="%Option.configure.program_suffix.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.filenames"
+               command="--program-transform-name="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.program_transform_name"
+               isAbstract="false"
+               name="%Option.configure.program_transform_name"
+               resourceFilter="all"
+               tip="%Option.configure.program_transform_name.tip"
+               valueType="string"/>
+         <optionCategory
+               id="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.features"
+               name="%OptionCategory.configure.features"
+               owner="org.eclipse.linuxtools.cdt.autotools.tool.configure"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.features"
+               command="--enable-maintainer-mode"
+               defaultValue="false"
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.enable_maintainer_mode"
+               isAbstract="false"
+               name="%Option.configure.enable_maintainer_mode"
+               resourceFilter="all"
+               tip="%Option.configure.enable_maintainer_mode.tip"
+               valueType="boolean"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.features"
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.user"
+               isAbstract="false"
+               name="%Option.configure.user"
+               resourceFilter="all"
+               tip="%Option.configure.user.tip"
+               valueType="string"/>
+         <option
+               applicabilityCalculator="org.eclipse.linuxtools.cdt.autotools.AutotoolsDefaultBuildDirHandler"
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.general"
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.includes"
+               isAbstract="false"
+               name="%IncludesOption.name"
+               valueType="includePath">
+         <enablement type="UI_VISIBILITY|UI_ENABLEMENT">
+         <false/>
+         </enablement>
+         </option>
+         <option
+               applicabilityCalculator="org.eclipse.linuxtools.cdt.autotools.AutotoolsDefaultBuildDirHandler"
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.general"
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.symbols"
+               isAbstract="false"
+               name="%SymbolsOption.name"
+               valueType="definedSymbols">
+         <enablement type="UI_VISIBILITY|UI_ENABLEMENT">
+         <false/>
+         </enablement>
+         </option>
+         <outputType
+               id="org.eclipse.linuxtools.cdt.autotools.outputType.configure"
+               name="%Configure.outputType"
+               outputs="status"
+               primaryOutput="true"/>
+         <inputType
+               id="org.eclipse.linuxtools.cdt.autotools.inputType.configure"
+               scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
+               languageId="org.eclipse.cdt.core.gcc">
+         </inputType>
+         <inputType
+               id="org.eclipse.linuxtools.cdt.autotools.inputType.configure1"
+               scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
+               languageId="org.eclipse.cdt.core.g++">
+         </inputType>
+      </tool>
+      <tool
+            command="autogen.sh"
+            id="org.eclipse.linuxtools.cdt.autotools.tool.autogen"
+            isAbstract="false"
+            name="%Tool.autogen"
+            natureFilter="both">
+         <optionCategory
+               id="org.eclipse.linuxtools.cdt.autotools.optionCategory.autogen.general"
+               name="%OptionCategory.autogen.general"
+               owner="org.eclipse.linuxtools.cdt.autotools.tool.autogen">
+         </optionCategory>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.autogen.general"
+               id="org.eclipse.linuxtools.cdt.autotools.option.autogen.user"
+               isAbstract="false"
+               name="%Option.autogen.user"
+               resourceFilter="all"
+               tip="%Option.autogen.user.tip"
+               valueType="string">
+         </option>
+         <outputType
+               id="org.eclipse.linuxtools.cdt.autotools.autogen.outputType"
+               name="%Autogen.outputType"
+               outputNames="configure"
+               primaryOutput="true">
+         </outputType>
+         <inputType
+               id="org.eclipse.linuxtools.cdt.autotools.autogen.inputType"
+               multipleOfType="false"
+               name="autogenScript"
+               scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
+               sourceContentType="org.eclipse.linuxtools.cdt.autotools.autogenScript">
+         </inputType>
+      </tool>
+      <builder
+            arguments="-k"
+            buildfileGenerator="org.eclipse.linuxtools.cdt.autotools.MakeGenerator"
+            command="make"
+            id="org.eclipse.linuxtools.cdt.autotools.builder"
+            isAbstract="true"
+            isVariableCaseSensitive="false"
+            name="%Makefile.builder.name"/>
+      <targetPlatform
+            archList="all"
+            binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.GNU_ELF"
+            id="org.eclipse.linuxtools.cdt.autotools.targetPlatform"
+            isAbstract="false"
+            name="%Autotools.targetplatform.name"/>
+      <projectType
+            buildArtefactType="org.eclipse.linuxtools.cdt.autotools.buildArtefactType.autotools"
+            id="org.eclipse.linuxtools.cdt.autotools.projectType"
+            isAbstract="false">
+         <configuration
+               buildProperties="org.eclipse.linuxtools.cdt.autotools.buildType.default"
+               cleanCommand="rm -rf"
+               errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser"
+               id="org.eclipse.linuxtools.cdt.autotools.configuration.build"
+               name="%Configuration.build.name">
+            <toolChain
+                  archList="all"
+                  id="org.eclipse.linuxtools.cdt.autotools.toolChain"
+                  name="%Autotools.gnu.toolchain.name"
+                  scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProject"
+                  targetTool="org.eclipse.linuxtools.cdt.autotools.tool.configure"
+                  unusedChildren="org.eclipse.linuxtools.cdt.autotools.toolchain.tool.gcc;org.eclipse.linuxtools.cdt.autotools.toolchain.tool.gpp">
+               <tool
+                     id="org.eclipse.linuxtools.cdt.autotools.gnu.toolchain.tool.configure"
+                     isAbstract="false"
+                     natureFilter="both"
+                     superClass="org.eclipse.linuxtools.cdt.autotools.tool.configure"/>
+               <tool
+                     id="org.eclipse.linuxtools.cdt.autotools.toolchain.tool.autogen"
+                     isAbstract="false"
+                     natureFilter="both"
+                     superClass="org.eclipse.linuxtools.cdt.autotools.tool.autogen">
+               </tool>
+               <tool
+                     id="org.eclipse.linuxtools.cdt.autotools.toolchain.tool.gcc"
+                     isAbstract="false"
+                     superClass="cdt.managedbuild.tool.gnu.c.compiler">
+               </tool>
+               <tool
+                     id="org.eclipse.linuxtools.cdt.autotools.toolchain.tool.gpp"
+                     isAbstract="false"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.compiler">
+               </tool>
+               <builder
+                     id="org.eclipse.linuxtools.cdt.autotools.toolchain.builder"
+                     isAbstract="false"
+                     isVariableCaseSensitive="false"
+                     superClass="org.eclipse.linuxtools.cdt.autotools.builder"/>
+               <targetPlatform
+                     id="org.eclipse.linuxtools.cdt.autotools.toolchain.targetPlatform"
+                     isAbstract="false"
+                     name="%Autotools.targetplatform.name"
+                     superClass="org.eclipse.linuxtools.cdt.autotools.targetPlatform">
+               </targetPlatform>
+               <supportedProperties>
+                  <property
+                        id="org.eclipse.cdt.build.core.buildArtefactType">
+                     <value
+                           id="org.eclipse.linuxtools.cdt.autotools.buildArtefactType.autotools">
+                     </value>
+                  </property>
+               </supportedProperties>
+            </toolChain>
+         </configuration>
+      </projectType>
+   </extension>
+   <extension
+         id="genmakebuilder"
+         name="Autotools generated make builder"
+         point="org.eclipse.core.resources.builders">
+      <builder
+            callOnEmptyDelta="true"
+            hasNature="false">
+         <run class="org.eclipse.linuxtools.cdt.autotools.AutotoolsMakefileBuilder"/>
+      </builder>
+   </extension>
+   <extension
+         point="org.eclipse.cdt.core.CBuildConsole">
+      <CBuildConsole
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.CConfigureConsole"
+            id="org.eclipse.linuxtools.cdt.autotools.configureConsole"/>
+      <CBuildConsole
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.CBuildStepsConsole"
+            id="org.eclipse.linuxtools.cdt.autotools.buildStepsConsole">
+      </CBuildConsole>
+      <CBuildConsole
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.AutotoolsConsole"
+            id="org.eclipse.linuxtools.cdt.autotools.autotoolsConsole">
+      </CBuildConsole>
+   </extension>
+   <extension
+   	     id="AutotoolsScannerInfoProvider"
+         point="org.eclipse.cdt.core.ScannerInfoProvider">
+      <cextension>   
+        <run 
+             class="org.eclipse.linuxtools.cdt.autotools.AutotoolsScannerInfoProvider">
+        </run>
+      </cextension>
+   </extension>
+   <extension
+         id="parsefileerror"
+         name="Autotools Parse Error Marker"
+         point="org.eclipse.core.resources.markers">
+      <super type="org.eclipse.core.resources.problemmarker"/>
+      <super type="org.eclipse.core.resources.textmarker"/>
+      <persistent value="true"/>
+   </extension>
+   <extension
+         id="outlineparsefileerror"
+         name="Autotools Outline Page Parse Error"
+         point="org.eclipse.core.resources.markers">
+      <super type="org.eclipse.core.resources.problemmarker"/>
+      <super type="org.eclipse.core.resources.textmarker"/>
+      <persistent value="true"/>
+   </extension>
+   <extension
+         point="org.eclipse.cdt.make.core.MakeTargetBuilder">
+      <builder
+            builderID="org.eclipse.linuxtools.cdt.autotools.genmakebuilder"
+            id="org.eclipse.linuxtools.cdt.autotools.builder1">
+      </builder>
+   </extension>
+   <extension
+         point="org.eclipse.core.expressions.propertyTesters">
+      <propertyTester
+            class="org.eclipse.linuxtools.cdt.autotools.AutotoolsProjectPropertyTester"
+            id="org.eclipse.linuxtools.cdt.autotools.propertyTester.isAutotoolsProject"
+            namespace="org.eclipse.linuxtools.cdt.autotools"
+            properties="isAutotoolsProject"
+            type="org.eclipse.core.resources.IResource">
+      </propertyTester>
+   </extension>
+   <extension
+         id="autotoolsNature"
+         name="%AutotoolsNature.name"
+         point="org.eclipse.core.resources.natures">
+      <requires-nature
+            id="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
+      </requires-nature>
+      <runtime>
+         <run
+               class="org.eclipse.linuxtools.cdt.autotools.AutotoolsProjectNature">
+         </run>
+      </runtime>
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            locationURI="menu:project?after=additions">
+         <menu
+               id="invokeAutotoolsOld"
+               label="%InvokeAutotools.label"
+               mnemonic="%InvokeAutotools.mnemonic">
+            <visibleWhen
+                  checkEnabled="false">
+               <and>
+                  <count
+                        value="1">
+                  </count>
+                  <iterate
+                        ifEmpty="false"
+                        operator="and">
+                     <adapt
+                           type="org.eclipse.core.resources.IResource">
+                        <test
+                              property="org.eclipse.core.resources.projectNature"
+                              value="org.eclipse.linuxtools.cdt.autotools.autotoolsNature">
+                        </test>
+                     </adapt>
+                  </iterate>
+               </and>
+            </visibleWhen>
+         </menu>
+      </menuContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            locationURI="menu:project?after=additions">
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.command.reconfigure"
+               id="reconfigure"
+               label="%Reconfigure.label"
+               mnemonic="%Reconfigure.mnemonic"
+               style="push">
+            <visibleWhen
+                  checkEnabled="false">
+               <and>
+                  <count
+                        value="1">
+                  </count>
+                  <iterate
+                        ifEmpty="false"
+                        operator="and">
+                     <adapt
+                           type="org.eclipse.core.resources.IResource">
+                        <test
+                              property="org.eclipse.core.resources.projectNature"
+                              value="org.eclipse.linuxtools.cdt.autotools.autotoolsNature">
+                        </test>
+                     </adapt>
+                  </iterate>
+               </and>
+            </visibleWhen>
+         </command>
+       </menuContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            locationURI="menu:invokeAutotoolsOld">
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.command.autoconf"
+               id="autoconf"
+               label="%InvokeAutoconf.label"
+               mnemonic="%InvokeAutoconf.mnemonic"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.command.autoheader"
+               id="autoheader"
+               label="%InvokeAutoheader.label"
+               mnemonic="%InvokeAutoheader.mnemonic"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.command.automake"
+               id="automake"
+               label="%InvokeAutomake.label"
+               mnemonic="%InvokeAutomake.mnemonic"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.command.autoreconf"
+               id="autoreconf"
+               label="%InvokeAutoreconf.label"
+               mnemonic="%InvokeAutoreconf.mnemonic"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.command.aclocal"
+               id="aclocal"
+               label="%InvokeAclocal.label"
+               mnemonic="%InvokeAclocal.mnemonic"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.command.libtoolize"
+               id="libtoolize"
+               label="%InvokeLibtoolize.label"
+               mnemonic="%InvokeLibtoolize.mnemonic"
+               style="push">
+         </command>
+      </menuContribution>
+   </extension>
+   <extension
+         id="org.eclipse.linuxtools.cdt.autotools.commands"
+         name="Autoconf"
+         point="org.eclipse.ui.commands">
+      <category
+            id="org.eclipse.linuxtools.cdt.autotools.category.invokeAutotools"
+            name="%InvokeAutotools.label">
+      </category>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.category.invokeAutotools"
+            description="%InvokeAutoconf.description"
+            id="org.eclipse.linuxtools.cdt.autotools.command.autoconf"
+            name="%InvokeAutoconf.label">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.category.invokeAutotools"
+            description="%InvokeAutoheader.description"
+            id="org.eclipse.linuxtools.cdt.autotools.command.autoheader"
+            name="%InvokeAutoheader.label">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.category.invokeAutotools"
+            description="%InvokeAutomake.description"
+            id="org.eclipse.linuxtools.cdt.autotools.command.automake"
+            name="%InvokeAutomake.label">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.category.invokeAutotools"
+            description="%InvokeAutoreconf.description"
+            id="org.eclipse.linuxtools.cdt.autotools.command.autoreconf"
+            name="%InvokeAutoreconf.label">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.category.invokeAutotools"
+            description="%InvokeAclocal.description"
+            id="org.eclipse.linuxtools.cdt.autotools.command.aclocal"
+            name="%InvokeAclocal.label">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.category.invokeAutotools"
+            description="%InvokeLibtoolize.description"
+            id="org.eclipse.linuxtools.cdt.autotools.command.libtoolize"
+            name="%InvokeLibtoolize.label">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.category.invokeAutotools"
+            description="%Reconfigure.description"
+            id="org.eclipse.linuxtools.cdt.autotools.command.reconfigure"
+            name="%Reconfigure.label">
+      </command>
+   </extension>
+    <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.eclipse.linuxtools.cdt.autotools.actions.AutoconfHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.command.autoconf">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.cdt.autotools.actions.AutoheaderHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.command.autoheader">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.cdt.autotools.actions.AutomakeHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.command.automake">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.cdt.autotools.actions.AutoreconfHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.command.autoreconf">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.cdt.autotools.actions.AclocalHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.command.aclocal">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.cdt.autotools.actions.LibtoolizeHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.command.libtoolize">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.cdt.autotools.actions.ReconfigureHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.command.reconfigure">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+   </extension>
+   <extension
+         point="org.eclipse.cdt.core.CBuildConsole">
+      <CBuildConsole
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.CConfigureConsole"
+            id="org.eclipse.linuxtools.cdt.autotools.configureConsole"/>
+      <CBuildConsole
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.CBuildStepsConsole"
+            id="org.eclipse.linuxtools.cdt.autotools.buildStepsConsole">
+      </CBuildConsole>
+      <CBuildConsole
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.AutotoolsConsole"
+            id="org.eclipse.linuxtools.cdt.autotools.autotoolsConsole">
+      </CBuildConsole>
+   </extension>
+   <extension
+         point="org.eclipse.ui.propertyPages">
+      <page
+            class="org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyPage"
+            id="org.eclipse.linuxtools.cdt.autotools.propertypage"
+            name="%PropertyAutotools.name"
+            >
+         <filter
+               name="projectNature"
+               value="org.eclipse.linuxtools.cdt.autotools.autotoolsNature">
+         </filter>
+         <enabledWhen>
+            <or>
+		     <instanceof value="org.eclipse.core.resources.IProject"/>
+		     <instanceof value="org.eclipse.cdt.core.model.ICProject"/>
+		     
+		     <instanceof value="org.eclipse.core.resources.IFolder"/>
+		     <instanceof value="org.eclipse.cdt.core.model.ICContainer"/>
+
+             <instanceof value="org.eclipse.core.resources.IFile"/>
+          	 <instanceof value="org.eclipse.cdt.core.model.ITranslationUnit"/>
+		    </or>          
+         </enabledWhen>
+      </page>
+   </extension>
+   <extension
+         point="org.eclipse.cdt.ui.cPropertyTab">
+      <tab
+            class="org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsBuildPropertyPage"
+            icon="icons/autoconf.gif"
+            name="%AutotoolsBuildPropertyTab.name"
+            parent="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"
+            tooltip="%PropertyTabBuild.tooltip"
+            weight="002">
+      </tab>
+      <tab
+            class="org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsEditorPropertyPage"
+            name="%AutotoolsEditorsPropertyTab.name"
+            parent="org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyPage">
+      </tab>
+      <tab
+            class="org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsToolsPropertyPage"
+            name="%AutotoolsToolsPropertyTab.name"
+            parent="org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyPage">
+      </tab>
+   </extension>
+     <extension
+          point="org.eclipse.core.contenttype.contentTypes">
+       <content-type
+             id="org.eclipse.linuxtools.cdt.autotools.configureScript"
+             name="%ConfigureScript.name"
+             priority="high">
+       </content-type>
+       <content-type
+             id="org.eclipse.linuxtools.cdt.autotools.autogenScript"
+             name="%AutogenScript.name"
+             priority="high">
+       </content-type>
+       <file-association
+             content-type="org.eclipse.linuxtools.cdt.autotools.configureScript"
+             file-names="configure">
+       </file-association>
+       <file-association
+             content-type="org.eclipse.linuxtools.cdt.autotools.autogenScript"
+             file-names="autogen.sh">
+       </file-association>
+    </extension>
+ </plugin>
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsBuilder.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsBuilder.java
new file mode 100644
index 0000000..f51c2b6
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsBuilder.java
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools;
+
+import org.eclipse.cdt.core.settings.model.COutputEntry;
+import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
+import org.eclipse.cdt.core.settings.model.ICOutputEntry;
+import org.eclipse.cdt.managedbuilder.core.IBuilder;
+import org.eclipse.cdt.managedbuilder.internal.core.Builder;
+import org.eclipse.cdt.managedbuilder.internal.core.ToolChain;
+import org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyConstants;
+
+
+
+// Proxy class for IBuilder to allow overriding of getBuildLocation().
+
+@SuppressWarnings("restriction")
+public class AutotoolsBuilder extends Builder {
+
+	private String buildPath;
+	private IProject project;
+	
+	public AutotoolsBuilder(IBuilder builder, IProject project, ToolChain toolChain) {
+		super(toolChain, builder.getId(), builder.getName(), (Builder)builder);
+		this.project = project;
+	}
+	
+	protected IProject getProject() {
+		return project;
+	}
+	
+
+	public String getBuildPath() {
+		// TODO Auto-generated method stub
+		return buildPath;
+	}
+
+
+	public void setBuildPath(String path) {
+		// TODO Auto-generated method stub
+		this.buildPath = path;
+	}
+
+	public String getCleanBuildTarget() {
+		String target = null;
+		try {
+			target = getProject().getPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET);
+		} catch (CoreException ce) {
+			// do nothing
+		}
+		if (target == null)
+			target = AutotoolsPropertyConstants.CLEAN_MAKE_TARGET_DEFAULT;
+		return target;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.managedbuilder.core.IBuilder#getBuildFileGenerator()
+	 */
+	public IManagedBuilderMakefileGenerator getBuildFileGenerator() {
+		return new MakeGenerator();
+	}
+
+	/* @override */
+	public ICOutputEntry[] getOutputEntries() {
+		return new ICOutputEntry[]{new COutputEntry(buildPath, null, ICLanguageSettingEntry.VALUE_WORKSPACE_PATH | ICLanguageSettingEntry.RESOLVED)};
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsDefaultBuildDirHandler.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsDefaultBuildDirHandler.java
new file mode 100644
index 0000000..e1a3e5a
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsDefaultBuildDirHandler.java
@@ -0,0 +1,155 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools;
+
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.eclipse.cdt.managedbuilder.core.BuildException;
+import org.eclipse.cdt.managedbuilder.core.IBuildObject;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IHoldsOptions;
+import org.eclipse.cdt.managedbuilder.core.IManagedOptionValueHandler;
+import org.eclipse.cdt.managedbuilder.core.IOption;
+import org.eclipse.cdt.managedbuilder.core.IOptionApplicability;
+import org.eclipse.cdt.managedbuilder.core.ITool;
+import org.eclipse.cdt.managedbuilder.core.ManagedOptionValueHandler;
+
+public class AutotoolsDefaultBuildDirHandler extends ManagedOptionValueHandler 
+	implements IOptionApplicability {
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.managedbuilder.core.IManagedOptionValueHandler#handleValue(IConfiguration,IToolChain,IOption,String,int)
+	 */
+	
+	public final static String DEFAULT_BUILD_DIR = "build"; //$NON-NLS-1$
+	public final static String CONFIGURE_TOOL_ID = "org.eclipse.linuxtools.cdt.autotools.gnu.toolchain.tool.configure"; //$NON-NLS-1$
+	public final static String BUILD_DIR_OPTION_ID = "org.eclipse.linuxtools.cdt.autotools.option.configure.builddir"; //$NON-NLS-1$
+	public final static String BUILD_DIR_APPLY = "BuildDir.apply"; //$NON-NLS-1$
+	public final static String BUILD_DIR_DEFAULT_QUESTION = "BuildDir.default"; //$NON-NLS-1$
+	public final static String BUILD_DIR_YES = "BuildDir.yes"; //$NON-NLS-1$
+	public final static String BUILD_DIR_NO = "BuildDir.no"; //$NON-NLS-1$
+
+	//FIXME: Use holder to set option value, not the "option" parameter
+	public boolean handleValue(IBuildObject buildObject, 
+                   IHoldsOptions holder, 
+                   IOption option,
+                   String extraArgument, int event)
+	{
+		// Get the current value of the build dir option.
+		String value = (String)option.getValue();
+		String valueBase = value;
+
+		if (buildObject instanceof IConfiguration &&
+				(event == IManagedOptionValueHandler.EVENT_OPEN)) {
+//						|| event == IManagedOptionValueHandler.EVENT_APPLY)) {
+			SortedSet<Integer> nums = new TreeSet<Integer>();
+			IConfiguration configuration = (IConfiguration)buildObject;
+			IConfiguration[] cfgs = configuration.getManagedProject().getConfigurations();
+			int index = 1;
+			boolean valueFound = false;
+			for (int i = 0; i < cfgs.length; ++i) {
+				IConfiguration config = cfgs[i];
+				if (config == null || config.getName().equals(configuration.getName())) {
+					continue;
+				}
+				ITool tool = config.getToolFromOutputExtension("status");  //$NON-NLS-1$
+				if (tool == null) // can happen if user has purposely mixed autotools and non-autotools cfgs
+					continue;
+				
+				// We now want to get the builddir option for the tool.  If we use
+				// getOptionById(), we must know the full id which in our case has a generated
+				// numeric extension at the end.  Otherwise, the base builddir option id
+				// will get us the default option, not the one for the configuration we
+				// are currently looking at.  We use getOptionBySuperClassId() instead
+				// which will find us options that are based off the original builddir
+				// option which include those with generated extensions at the end.
+				IOption buildDirOption = tool.getOptionBySuperClassId(BUILD_DIR_OPTION_ID);
+				String buildDir = (String)buildDirOption.getValue();
+				if (buildDir.equals(value)) {
+					valueFound = true;
+				}
+				// For "buildXX" values, store the XX values in a list of used extensions.
+				if (buildDir.startsWith(DEFAULT_BUILD_DIR)) {
+					String numstr = buildDir.substring(DEFAULT_BUILD_DIR.length());
+					try {
+						Integer k = Integer.valueOf(numstr);
+						// Assume the value to start with is the last value in the list
+						// plus 1.
+						index = k.intValue() + 1;
+						nums.add(k);
+					} catch (NumberFormatException e) {
+						// ignore
+					}
+				}
+			}
+			
+			// If there is no name collision for the configurations, then we simply return.
+			if (!valueFound)
+				return true;
+			
+//			// If the user has applied a change and it matches an existing build directory,
+//			// then warn and ask if the user wants the value defaulted to a safe value.
+//			if (event == EVENT_APPLY) {
+//				String title = AutotoolsPlugin.getResourceString(BUILD_DIR_APPLY);
+//				String question = AutotoolsPlugin.getResourceString(BUILD_DIR_DEFAULT_QUESTION);
+//				String[] buttonLabels = new String[2];
+//				buttonLabels[0] = AutotoolsPlugin.getResourceString(BUILD_DIR_YES);
+//				buttonLabels[1] = AutotoolsPlugin.getResourceString(BUILD_DIR_NO);
+//				MessageDialog d = new MessageDialog(AutotoolsPlugin.getActiveWorkbenchShell(),
+//						title, null, question, MessageDialog.QUESTION, buttonLabels, 0);
+//				int result = d.open();
+//				if (result == 1)
+//					return true;
+//			}
+			
+			// For defaulted buildXX values, we support defaulting a unique XX value.
+			if (value.startsWith(DEFAULT_BUILD_DIR)) {
+				valueBase = DEFAULT_BUILD_DIR;
+				// Try and establish a unique "buildXX" name that hasn't been used yet.
+				while (nums.contains(Integer.valueOf(index))) {
+					++index;
+				}
+			}
+			
+			// Reset the default build directory for this opened configuration.
+			try {
+				IOption optionToSet = holder.getOptionToSet(option, false);
+				optionToSet.setValue(valueBase + index);
+			} catch (BuildException e) {
+				return false;
+			}
+		}
+		
+		// The event was not handled, thus return false
+		return true;
+	}
+	
+	// IOptionApplicability methods
+	
+	public boolean isOptionEnabled(IBuildObject configuration,
+			IHoldsOptions holder, IOption option) {
+		return true;
+	}
+
+	public boolean isOptionUsedInCommandLine(IBuildObject configuration,
+			IHoldsOptions holder, IOption option) {
+		return false;
+	}
+
+	public boolean isOptionVisible(IBuildObject configuration,
+			IHoldsOptions holder, IOption option) {
+		if (option.getName().equals("includes") || option.getName().equals("symbols"))
+			return false;
+		return true;
+	}
+
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java
new file mode 100644
index 0000000..198d89d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java
@@ -0,0 +1,512 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2005, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Rational Software - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.CommandLauncher;
+import org.eclipse.cdt.core.ConsoleOutputStream;
+import org.eclipse.cdt.core.envvar.IEnvironmentVariable;
+import org.eclipse.cdt.core.resources.IConsole;
+import org.eclipse.cdt.make.core.IMakeCommonBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.IBuilder;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.IManagedProject;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
+import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
+import org.eclipse.cdt.managedbuilder.internal.core.Builder;
+import org.eclipse.cdt.managedbuilder.internal.core.CommonBuilder;
+import org.eclipse.cdt.managedbuilder.internal.core.ToolChain;
+import org.eclipse.cdt.managedbuilder.macros.BuildMacroException;
+import org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider;
+import org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyConstants;
+
+
+/**
+ * This is the incremental builder associated with a managed build project. It dynamically 
+ * decides the makefile generator it wants to use for a specific target.
+ * 
+ * @since 1.2 
+ */
+@SuppressWarnings("restriction")
+public class AutotoolsMakefileBuilder extends CommonBuilder {
+	public static final String BUILDER_NAME = "genmakebuilder"; //$NON-NLS-1$
+	public static final String BUILDER_ID = AutotoolsPlugin.getUniqueIdentifier() + "." + BUILDER_NAME; //$NON-NLS-1$
+	public static final String MANAGED_BUILDER_ID = ManagedBuilderCorePlugin.getUniqueIdentifier() + "." + BUILDER_NAME; //$NON-NLS-1$
+	public static final String AUTOTOOLS_CONFIG_ID = AutotoolsPlugin.getUniqueIdentifier() + ".configuration.build"; //$NON-NLS-1$
+	public static final String AUTOTOOLS_PROJECT_TYPE_ID = AutotoolsPlugin.getUniqueIdentifier() + ".projectType"; //$NON-NLS-1$
+	
+	private static final String BUILD_FINISHED = "AutotoolsMakefileBuilder.message.finished";	//$NON-NLS-1$
+	private static final String TYPE_CLEAN = "AutotoolsMakefileBuilder.type.clean";	//$NON-NLS-1$
+	private static final String CONSOLE_HEADER = "AutotoolsMakefileBuilder.message.console.header";	//$NON-NLS-1$
+
+	private static final String EMPTY_STRING = new String();
+	public final String WHITESPACE = " ";	//$NON-NLS-1$
+
+	protected boolean buildCalled;
+	
+	private String makeTargetName;
+
+	@SuppressWarnings("unused")
+	private String preBuildErrMsg = new String();
+	@SuppressWarnings("unused")
+	private String postBuildErrMsg = new String();
+
+	public static String getBuilderId() {
+		return BUILDER_ID;
+	}
+	
+	public static boolean hasTargetBuilder(IProject project) {
+		try {
+			// When a project is converted to an Autotools project, we
+			// replace the ManagedMake builder with a special one that
+			// handles MakeTargets.  If a project is brought into Eclipse and
+			// uses the New Project Wizard to create a ManagedMake project that
+			// is of type: Autotools, this added step is not done.  If we know
+			// we have an Autotools project from the configuration id, then
+			// we should add the builder now.  We also should replace the
+			// default ManagedMake scanner provider with the Autotools one,
+			// then return true.
+			if (project.getNature(ManagedCProjectNature.MNG_NATURE_ID) != null) {
+				IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+				IManagedProject m = info.getManagedProject();
+				if (m != null && m.getProjectType().getId().equals(AUTOTOOLS_PROJECT_TYPE_ID)) {
+					AutotoolsProjectNature.addAutotoolsBuilder(project, new NullProgressMonitor());
+					AutotoolsPlugin.verifyScannerInfoProvider(project);
+					return true;
+				}
+			}
+		} catch (CoreException e) {
+			// Don't care...fall through to not found.
+		} catch (Exception f) {
+			// Don't care...fall through to not found.
+		}
+		// Otherwise not found.
+		return false;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.internal.events.InternalBuilder#build(int, java.util.Map, org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	@SuppressWarnings({ "unchecked", "deprecation" })
+	protected IProject[] build(int kind, Map args, IProgressMonitor monitor) throws CoreException {
+		IProject[] results = null;
+		IProject project = getProject();
+		IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+		IManagedBuilderMakefileGenerator generator = null;
+		try {
+			// Figure out the working directory for the build and make sure there is a makefile there
+			// If not, mark a rebuild is required so that configuration will get
+			// invoked.
+			IWorkspace workspace = project.getWorkspace();
+			if (workspace != null) {
+				IWorkspaceRoot root = workspace.getRoot();
+				if (root != null) {
+					if (info.getDefaultConfiguration() == null)
+						return null;
+					generator = new MakeGenerator();
+					generator.initialize(getProject(), info, monitor);
+					IPath buildDir = project.getLocation().append(generator.getBuildWorkingDir());
+					IPath makefilePath = buildDir.append(generator.getMakefileName());
+					IFile makefile = root.getFileForLocation(makefilePath);
+					if (makefile == null || !makefile.exists()) {
+						info.setRebuildState(true);
+					}
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			makeTargetName = (String)args.get("org.eclipse.cdt.make.core.build.target.inc"); //$NON-NLS-1$
+			
+			buildCalled = true;
+			/**
+			 * @see IncrementalProjectBuilder#build
+			 */
+//			fBuildSet.start(this);
+
+			// Hijack the build.  This is because the CommonBuilder code will
+			// try and create builders for a MakeTarget build.  We don't want
+			// that because this will default to using the GnuMakefileGenerator
+			// which fails.  We want to use our Autotools MakeGenerator and
+			// perform a make from the top-level.
+			if(VERBOSE)
+				outputTrace(project.getName(), ">>build requested, type = " + kind); //$NON-NLS-1$
+			
+			IConfiguration cfg = info.getDefaultConfiguration();
+
+			// Assemble the information needed to generate the targets
+			String prebuildStep = cfg.getPrebuildStep();
+			try{
+				//try to resolve the build macros in the prebuild step
+				prebuildStep = ManagedBuildManager.getBuildMacroProvider().resolveValueToMakefileFormat(
+						prebuildStep,
+						EMPTY_STRING,
+						WHITESPACE,
+						IBuildMacroProvider.CONTEXT_CONFIGURATION,
+						cfg);
+			} catch (BuildMacroException e){
+			}
+			prebuildStep = prebuildStep.trim(); // Remove leading and trailing whitespace (and control characters)
+
+			String postbuildStep = cfg.getPostbuildStep();
+			try{
+				//try to resolve the build macros in the postbuild step
+				postbuildStep = ManagedBuildManager.getBuildMacroProvider().resolveValueToMakefileFormat(
+						postbuildStep,
+						EMPTY_STRING,
+						WHITESPACE,
+						IBuildMacroProvider.CONTEXT_CONFIGURATION,
+						cfg);
+					
+			} catch (BuildMacroException e){
+			}
+			postbuildStep = postbuildStep.trim(); // Remove leading and trailing whitespace (and control characters)
+			String preannouncebuildStep = cfg.getPreannouncebuildStep();
+			String postannouncebuildStep = cfg.getPostannouncebuildStep();
+
+			IConsole console = null;
+			ConsoleOutputStream consoleOutStream = null;
+			CommandLauncher launcher = null;
+			String[] env = null;
+			Process proc = null;
+			OutputStream stdout = null;
+			OutputStream stderr = null;
+			
+			// If we have a prebuild or postbuild step, set up a command launcher to use.
+			if (!prebuildStep.equals("") || !postbuildStep.equals("")) {
+				console = CCorePlugin.getDefault().getConsole("org.eclipse.linuxtools.cdt.autotools.buildStepsConsole"); // $NON-NLS-1$
+				console.start(project);
+				consoleOutStream = console.getOutputStream();
+				stdout = consoleOutStream;
+				stderr = consoleOutStream;
+				launcher = new CommandLauncher();
+				// Set the environment
+				IEnvironmentVariable variables[] = ManagedBuildManager
+						.getEnvironmentVariableProvider().getVariables(cfg, true);
+				ArrayList<String> envList = new ArrayList<String>();
+				if (variables != null) {
+					for (int i = 0; i < variables.length; i++) {
+						envList.add(variables[i].getName()
+								+ "=" + variables[i].getValue()); //$NON-NLS-1$
+					}
+					env = (String[]) envList.toArray(new String[envList.size()]);
+				}
+			}
+			
+			// Check for a prebuild step and execute it if it exists.
+			if (!prebuildStep.equals("")) {
+				monitor.subTask(preannouncebuildStep);
+
+				StringBuffer buffer = new StringBuffer();
+				buffer.append(preannouncebuildStep);
+				buffer.append(System.getProperty("line.separator", "\n")); // $NON-NLS-1$ // $NON-NLS-2$
+
+				try {
+					consoleOutStream.write(buffer.toString().getBytes());
+					consoleOutStream.flush();
+				} catch (IOException e) {
+					// do nothing
+				}
+
+				launcher.showCommand(true);
+				String[] tmp = prebuildStep.split("\\s");
+				String[] cmdargs = new String[tmp.length - 1];
+				if (tmp.length > 1)
+					System.arraycopy(tmp, 1, cmdargs, 0, tmp.length - 1);
+				proc = launcher.execute(new Path(tmp[0]), cmdargs, env,
+						project.getLocation().append(generator.getBuildWorkingDir()), monitor);
+				if (proc != null) {
+					try {
+						// Close the input of the process since we will never write to
+						// it
+						proc.getOutputStream().close();
+					} catch (IOException e) {
+					}
+
+					if (launcher.waitAndRead(stdout, stderr, new SubProgressMonitor(
+							monitor, IProgressMonitor.UNKNOWN)) != CommandLauncher.OK) {
+						preBuildErrMsg = launcher.getErrorMessage();
+					}
+				}
+			}
+
+			// Perform build
+
+			ToolChain toolChain = (ToolChain)cfg.getToolChain();
+			IBuilder oldBuilder = cfg.getBuilder();
+			String workingDir = generator.getBuildWorkingDir().toString();
+			IPath location = project.getLocation().append(workingDir);
+			oldBuilder.setBuildPath(location.toString());	
+			oldBuilder.setBuildFileGeneratorElement(AutotoolsPlugin.getDefault().getGeneratorElement());
+			IBuilder builder = new AutotoolsBuilder(cfg.getEditableBuilder(), project, toolChain);
+			String buildLocation = null;
+			String buildCommand = null;
+			String buildArguments = null;
+			if (makeTargetName != null) {
+				// We have a MakeTarget.  Get the location and command.
+				buildLocation = (String)args.get("org.eclipse.cdt.make.core.build.location"); // $NON-NLS-1$
+				buildCommand = (String)args.get("org.eclipse.cdt.make.core.build.command"); // $NON-NLS-1$
+				buildArguments = (String)args.get("org.eclipse.cdt.make.core.build.arguments"); // $NON-NLS-1$
+			}
+			if (buildLocation == null) {
+				builder.setBuildPath(location.toString());
+			}
+			else {
+				IWorkspace workspace = project.getWorkspace();
+				builder.setBuildPath(workspace.getRoot().getLocation().append(buildLocation).toString());
+				builder.setManagedBuildOn(false); // needed to avoid ManagedBuild from defaulting directory of makefile.
+			}
+			if (buildCommand != null)
+				builder.setBuildAttribute(IMakeCommonBuildInfo.BUILD_COMMAND, buildCommand);
+			if (buildArguments != null)
+				builder.setBuildAttribute(IMakeCommonBuildInfo.BUILD_ARGUMENTS, buildArguments);
+			builder.setAutoBuildEnable(true);
+			builder.setCleanBuildEnable(false); // Don't want clean build done ahead of our build.
+			// Following is needed to circumvent the CommonBuilder from using the default
+			// GNUMakefileGenerator.
+			builder.setBuildFileGeneratorElement(AutotoolsPlugin.getDefault().getGeneratorElement());
+			toolChain.setBuilder((Builder)builder);
+			
+			IProject[] projects = null;
+			try {
+				projects = super.build(kind, args, monitor);
+			} finally {
+				// Must ensure we reset everything back so configuration will be run in future.
+				toolChain.setBuilder((Builder)oldBuilder);
+			}
+
+			if(VERBOSE)
+				outputTrace(project.getName(), "<<done build requested, type = " + kind); //$NON-NLS-1$
+
+			results = projects;
+			buildCalled = false;
+			// Check for a postbuild step and execute it if it exists.
+			if (!postbuildStep.equals("")) {
+				monitor.subTask(postannouncebuildStep);
+				StringBuffer buffer = new StringBuffer();
+				buffer.append(postannouncebuildStep);
+				buffer.append(System.getProperty("line.separator", "\n")); // $NON-NLS-1$ // $NON-NLS-2$
+
+				try {
+					consoleOutStream.write(buffer.toString().getBytes());
+					consoleOutStream.flush();
+				} catch (IOException e) {
+					// do nothing
+				}
+				String[] tmp = postbuildStep.split("\\s");
+				String[] cmdargs = new String[tmp.length - 1];
+				if (tmp.length > 1)
+					System.arraycopy(tmp, 1, cmdargs, 0, tmp.length - 1);
+				proc = launcher.execute(new Path(tmp[0]), cmdargs, env,
+						project.getLocation().append(generator.getBuildWorkingDir()), monitor);
+				if (proc != null) {
+					try {
+						// Close the input of the process since we will never write to
+						// it
+						proc.getOutputStream().close();
+					} catch (IOException e) {
+					}
+
+					if (launcher.waitAndRead(stdout, stderr, new SubProgressMonitor(
+							monitor, IProgressMonitor.UNKNOWN)) != CommandLauncher.OK) {
+						postBuildErrMsg = launcher.getErrorMessage();
+					}
+				}
+			}
+		}
+		return results;
+	}
+
+	@SuppressWarnings({ "unchecked", "deprecation" })
+	protected void clean(IProgressMonitor monitor) throws CoreException {
+		// See what type of cleaning the user has set up in the
+		// build properties dialog.
+		String cleanDelete = null;
+		try {
+			cleanDelete = getProject().getPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE);
+		} catch (CoreException ce) {
+			// do nothing
+		}
+		
+		if (cleanDelete != null && cleanDelete.equals(AutotoolsPropertyConstants.TRUE))
+			removeBuildDir(monitor);
+		else {
+			IProject project = getProject();
+			IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+			IConfiguration cfg = info.getDefaultConfiguration();
+			IManagedBuilderMakefileGenerator generator = new MakeGenerator();
+			generator.initialize(getProject(), info, monitor);
+
+//			// Hijack the builder itself so that instead of ManagedMake
+//			// policy of defaulting the build path to the configuration name,
+//			// we get the build occurring in the builddir configure tool setting.
+//			builders[0] = new AutotoolsBuilder(cfg.getEditableBuilder(), project);
+//			builders[0].setBuildPath(project.getLocation().append(generator.getBuildWorkingDir()).toOSString());
+//			builders[0].setAutoBuildEnable(true);
+//			builders[0].setCleanBuildEnable(true);
+//			builders[0].setManagedBuildOn(false);
+
+			ToolChain toolChain = (ToolChain)cfg.getToolChain();
+			IBuilder oldBuilder = cfg.getBuilder();
+			IBuilder builder = new AutotoolsBuilder(cfg.getEditableBuilder(), project, toolChain);
+			builder.setBuildPath(project.getLocation().append(generator.getBuildWorkingDir()).toOSString());
+			builder.setAutoBuildEnable(true);
+			builder.setCleanBuildEnable(true);
+			builder.setManagedBuildOn(false);
+			// Following is needed to circumvent the CommonBuilder from using the default
+			// GNUMakefileGenerator.
+			builder.setBuildFileGeneratorElement(AutotoolsPlugin.getDefault().getGeneratorElement());
+			toolChain.setBuilder((Builder)builder);
+			
+			try {
+				super.build(CLEAN_BUILD, (Map)null, monitor);
+			} finally {
+				toolChain.setBuilder((Builder)oldBuilder);
+			}
+		}
+	}
+
+	protected void removeBuildDir(IProgressMonitor monitor) {
+		try {
+			// use brute force approach
+			IProject project = getProject();
+			IWorkspace workspace = AutotoolsPlugin.getWorkspace();
+			IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+			IConfiguration cfg = info.getDefaultConfiguration();
+			IManagedBuilderMakefileGenerator generator = new MakeGenerator();
+			generator.initialize(getProject(), info, monitor);
+			String buildPath = project.getFullPath().append(generator.getBuildWorkingDir()).toOSString();
+			IResource rc = workspace.getRoot().findMember(buildPath);
+			if (rc == null || rc.getType() != IResource.FOLDER)
+				return;
+			IFolder buildDir = (IFolder)rc;
+			String status = AutotoolsPlugin.getFormattedString("AutotoolsMakefileBuilder.message.clean.deleting.output", new String[]{buildDir.getName()});	//$NON-NLS-1$
+			monitor.subTask(status);
+			workspace.delete(new IResource[]{buildDir}, true, monitor);
+			StringBuffer buf = new StringBuffer();
+			// write to the console
+
+//			IConsole console = CCorePlugin.getDefault().getConsole();
+//			console.start(getProject());
+			// Get a build console for the project
+			IConsole console = CCorePlugin.getDefault().getConsole();
+			console.start(project);
+//			IConsole console = bInfo.getConsole();
+			ConsoleOutputStream consoleOutStream = console.getOutputStream();
+			String[] consoleHeader = new String[3];
+			consoleHeader[0] = AutotoolsPlugin.getResourceString(TYPE_CLEAN);
+			consoleHeader[1] = cfg.getName();
+			consoleHeader[2] = project.getName();
+			buf.append(System.getProperty("line.separator", "\n"));	//$NON-NLS-1$	//$NON-NLS-2$
+			buf.append(AutotoolsPlugin.getFormattedString(CONSOLE_HEADER, consoleHeader));
+			buf.append(System.getProperty("line.separator", "\n"));	//$NON-NLS-1$	//$NON-NLS-2$
+			consoleOutStream.write(buf.toString().getBytes());
+			consoleOutStream.flush();
+			buf = new StringBuffer();
+			// Report a successful clean
+			String successMsg = AutotoolsPlugin.getFormattedString(BUILD_FINISHED, new String[]{project.getName()});
+			buf.append(successMsg);
+			buf.append(System.getProperty("line.separator", "\n"));  //$NON-NLS-1$//$NON-NLS-2$
+			consoleOutStream.write(buf.toString().getBytes());
+			consoleOutStream.flush();
+			consoleOutStream.close();
+		}  catch (IOException io) {
+			//  Ignore console failures...
+		}  catch (CoreException e) {
+			//  Ignore console failures...		
+		}
+	}
+
+	/* (non-javadoc)
+	 * Answers an array of strings with the proper make targets
+        * for a build with no custom prebuild/postbuild steps 
+	 * 
+	 * @param fullBuild
+	 * @return
+	 */
+	protected String[] getTargets(int kind, IBuilder builder) {
+		List<String> args = new ArrayList<String>();
+		String buildTarget = "all";
+		switch (kind) {
+			case CLEAN_BUILD:
+				// For a clean build, we use the clean make target set up by the user
+				// in the build properties dialog.  Otherwise, we use the default for
+				// an autotools project.
+				String target = null;
+				try {
+					target = getProject().getPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET);
+				} catch (CoreException ce) {
+					// do nothing
+				}
+				if (target == null)
+					target = AutotoolsPropertyConstants.CLEAN_MAKE_TARGET_DEFAULT;
+				args.add(target);
+				break;
+			case FULL_BUILD:
+				if (makeTargetName != null)
+					buildTarget = makeTargetName;
+			case AUTO_BUILD:
+			case INCREMENTAL_BUILD:
+				args.addAll(makeArrayList(buildTarget));
+				break;
+		}
+		return (String[])args.toArray(new String[args.size()]);
+	}
+
+	// Turn the string into an array.
+	ArrayList<String> makeArrayList(String string) {
+		string.trim();
+		char[] array = string.toCharArray();
+		ArrayList<String> aList = new ArrayList<String>();
+		StringBuffer buffer = new StringBuffer();
+		boolean inComment = false;
+		for (int i = 0; i < array.length; i++) {
+			char c = array[i];
+			if (array[i] == '"' || array[i] == '\'') {
+				if (i > 0 && array[i - 1] == '\\') {
+					inComment = false;
+				} else {
+					inComment = !inComment;
+				}
+			}
+			if (c == ' ' && !inComment) {
+				aList.add(buffer.toString());
+				buffer = new StringBuffer();
+			} else {
+				buffer.append(c);
+			}
+		}
+		if (buffer.length() > 0)
+			aList.add(buffer.toString());
+		return aList;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java
new file mode 100644
index 0000000..5e2e495
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java
@@ -0,0 +1,324 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools;
+
+import java.lang.reflect.InvocationTargetException;
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.ICDescriptor;
+import org.eclipse.cdt.core.ICExtensionReference;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The main plugin class to be used in the desktop.
+ */
+@SuppressWarnings("deprecation")
+public class AutotoolsPlugin extends AbstractUIPlugin {
+
+	//The shared instance.
+	private static AutotoolsPlugin plugin;
+	private ResourceBundle resourceBundle;
+	
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.cdt.autotools"; //$NON-NLS-1$
+
+	private IConfigurationElement generatorElement;
+
+	public static final String EXTENSION_POINT_ID = ManagedBuilderCorePlugin.getUniqueIdentifier() + ".buildDefinitions";		//$NON-NLS-1$
+	public static final String BUILDER = "builder";   //$NON-NLS-1$
+	public static final String ID_ELEMENT_NAME = "id"; // $NON-NLS-1$
+	public static final String AUTOTOOLS_BUILDER_ID = PLUGIN_ID + ".builder"; // $NON-NLS-1$
+	
+	/**
+	 * The constructor.
+	 */
+	public AutotoolsPlugin() {
+		plugin = this;
+		try {
+			resourceBundle = ResourceBundle.getBundle("org.eclipse.linuxtools.cdt.autotools.Resources"); //$NON-NLS-1$
+		} catch (MissingResourceException x) {
+			resourceBundle = null;
+		}
+
+	}
+
+	public static String getPluginId() {
+		return PLUGIN_ID;
+	}
+	
+	public static String getUniqueIdentifier() {
+		if (getDefault() == null) {
+			// If the default instance is not yet initialized,
+			// return a static identifier. This identifier must
+			// match the plugin id defined in plugin.xml
+			return PLUGIN_ID;
+		}
+		return getDefault().getBundle().getSymbolicName();
+	}
+
+	public static void verifyScannerInfoProvider(IProject project) throws CoreException {
+		boolean found = false;
+		ICDescriptor desc = CCorePlugin.getDefault().getCProjectDescription(project, true);
+        ICExtensionReference[] refs = desc.get(CCorePlugin.BUILD_SCANNER_INFO_UNIQ_ID);
+        for (int i = 0; i < refs.length; ++i) {
+        	if (refs[i].getID().equals(AutotoolsScannerInfoProvider.INTERFACE_IDENTITY))
+        		found = true;
+        }
+        if (!found) {
+        	setScannerInfoProvider(project);
+        }
+	}
+	
+	public static void setScannerInfoProvider(IProject project) throws CoreException {
+		ICDescriptor desc = CCorePlugin.getDefault().getCProjectDescription(project, true);
+		desc.remove(CCorePlugin.BUILD_SCANNER_INFO_UNIQ_ID);
+		desc.create(CCorePlugin.BUILD_SCANNER_INFO_UNIQ_ID, AutotoolsScannerInfoProvider.INTERFACE_IDENTITY);
+	}
+
+	/**
+	 * This method is called upon plug-in activation
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+	}
+
+	/**
+	 * This method is called when the plug-in is stopped
+	 */
+	public void stop(BundleContext context) throws Exception {
+		super.stop(context);
+		plugin = null;
+	}
+
+	/**
+	 * Returns the shared instance.
+	 */
+	public static AutotoolsPlugin getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Returns active shell.
+	 */
+	public static Shell getActiveWorkbenchShell() {
+		IWorkbenchWindow window = getDefault().getWorkbench().getActiveWorkbenchWindow();
+		if (window != null) {
+			return window.getShell();
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the string from the plugin's resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @return the resource bundle message
+	 */
+	public static String getResourceString(String key) {
+		ResourceBundle bundle = AutotoolsPlugin.getDefault().getResourceBundle();
+		try {
+			return bundle.getString(key);
+		} catch (MissingResourceException e) {
+			return key;
+		}
+	}
+
+	/**
+	 * Returns the string from the plugin's resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @param args an array of substituition strings
+	 * @return the resource bundle message
+	 */
+	public static String getFormattedString(String key, String[] args) {
+		return MessageFormat.format(getResourceString(key), (Object[])args);
+	}
+
+	/**
+	 * Returns the plugin's resource bundle,
+	 */
+	public ResourceBundle getResourceBundle() {
+		return resourceBundle;
+	}
+
+	/**
+	 * Get the configuration element for the Autotools Makefile generator
+	 * @return the generator element
+	 */
+	public IConfigurationElement getGeneratorElement() {
+		if (generatorElement == null) {
+			IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(EXTENSION_POINT_ID);
+			if( extensionPoint != null) {
+				IExtension[] extensions = extensionPoint.getExtensions();
+				if (extensions != null) {
+					for (int i = 0; i < extensions.length; ++i) {
+						IExtension extension = extensions[i];
+				
+						IConfigurationElement[] elements = extension.getConfigurationElements();
+						
+						// Get the managedBuildRevsion of the extension.
+						for (int j = 0; j < elements.length; j++) {
+							IConfigurationElement element = elements[j];
+							if (element.getName().equals(BUILDER)) {
+								String id = element.getAttribute(ID_ELEMENT_NAME);
+								if (id.equals(AUTOTOOLS_BUILDER_ID)) {
+									generatorElement = element;
+									break;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		return generatorElement;
+	}
+	
+	/**
+	 * Returns an image descriptor for the image file at the given
+	 * plug-in relative path.
+	 *
+	 * @param path the path
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.linuxtools.cdt.autotools", path);
+	}
+	
+	public static void log(IStatus status) {
+		ResourcesPlugin.getPlugin().getLog().log(status);
+	}
+
+	public static void logErrorMessage(String message) {
+		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, message, null));
+	}
+
+	public static void logException(Throwable e, final String title, String message) {
+		if (e instanceof InvocationTargetException) {
+			e = ((InvocationTargetException) e).getTargetException();
+		}
+		IStatus status = null;
+		if (e instanceof CoreException)
+			status = ((CoreException) e).getStatus();
+		else {
+			if (message == null)
+				message = e.getMessage();
+			if (message == null)
+				message = e.toString();
+			status = new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.OK, message, e);
+		}
+		ResourcesPlugin.getPlugin().getLog().log(status);
+		Display display;
+		display = Display.getCurrent();
+		if (display == null)
+			display = Display.getDefault();
+		final IStatus fstatus = status;
+		display.asyncExec(new Runnable() {
+			public void run() {
+				ErrorDialog.openError(null, title, null, fstatus);
+			}
+		});
+	}
+
+	public static void logException(Throwable e) {
+		logException(e, null, null);
+	}
+
+	public static void log(Throwable e) {
+		if (e instanceof InvocationTargetException)
+			e = ((InvocationTargetException) e).getTargetException();
+		IStatus status = null;
+		if (e instanceof CoreException)
+			status = ((CoreException) e).getStatus();
+		else
+			status = new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.OK, e.getMessage(), e);
+		log(status);
+	}
+
+	/**
+	* Utility method with conventions
+	*/
+	public static void errorDialog(Shell shell, String title, String message, IStatus s) {
+		log(s);
+		// if the 'message' resource string and the IStatus' message are the same,
+		// don't show both in the dialog
+		if (s != null && message.equals(s.getMessage())) {
+			message = null;
+		}
+		ErrorDialog.openError(shell, title, message, s);
+	}
+
+	/**
+	* Utility method with conventions
+	*/
+	public static void errorDialog(Shell shell, String title, String message, Throwable t) {
+		log(t);
+		IStatus status;
+		if (t instanceof CoreException) {
+			status = ((CoreException) t).getStatus();
+			// if the 'message' resource string and the IStatus' message are the same,
+			// don't show both in the dialog
+			if (status != null && message.equals(status.getMessage())) {
+				message = null;
+			}
+		} else {
+			status = new Status(IStatus.ERROR, AutotoolsPlugin.getUniqueIdentifier(), -1, "Internal Error: ", t); //$NON-NLS-1$	
+		}
+		ErrorDialog.openError(shell, title, message, status);
+	}
+	
+	/**
+	 * Returns the workspace instance.
+	 */
+	public static IWorkspace getWorkspace() {
+		return ResourcesPlugin.getWorkspace();
+	}
+
+	/**
+	 * Returns the active workbench window or <code>null</code> if none
+	 */
+	public static IWorkbenchWindow getActiveWorkbenchWindow() {
+		return getDefault().getWorkbench().getActiveWorkbenchWindow();
+	}
+
+	/**
+	 * Returns the active workbench page or <code>null</code> if none.
+	 */
+	public static IWorkbenchPage getActivePage() {
+		IWorkbenchWindow window= getActiveWorkbenchWindow();
+		if (window != null) {
+			return window.getActivePage();
+		}
+		return null;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsProjectNature.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsProjectNature.java
new file mode 100644
index 0000000..5a7f311
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsProjectNature.java
@@ -0,0 +1,175 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat Inc.. and others
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial implementation
+ *     IBM Rational Software - add and remove nature static methods
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Vector;
+
+import org.eclipse.core.resources.ICommand;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IProjectNature;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+
+public class AutotoolsProjectNature implements IProjectNature {
+
+	public static final String AUTOTOOLS_NATURE_ID = AutotoolsPlugin.getUniqueIdentifier() + ".autotoolsNature";  //$NON-NLS-1$
+
+	private IProject project;
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.resources.IProjectNature#configure()
+	 */
+	public void configure() throws CoreException {
+		addAutotoolsBuilder(project, new NullProgressMonitor());
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.resources.IProjectNature#deconfigure()
+	 */
+	public void deconfigure() throws CoreException {
+		// TODO remove builder from here
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.resources.IProjectNature#getProject()
+	 */
+	public IProject getProject() {
+		return project;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.resources.IProjectNature#setProject(org.eclipse.core.resources.IProject)
+	 */
+	public void setProject(IProject project) {
+		this.project = project;
+	}
+	
+	/**
+	 * Add the Autotools builder to the project
+	 * @param project
+	 * @param monitor
+	 * @throws CoreException
+	 */
+	public static void addAutotoolsBuilder(IProject project, IProgressMonitor monitor) throws CoreException {
+		// Add the builder to the project
+		IProjectDescription description = project.getDescription();
+		ICommand[] commands = description.getBuildSpec();
+	
+		// TODO Remove the cbuilder check when the new StandardBuild nature adds the cbuilder
+		for (int i = 0; i < commands.length; i++) {
+			ICommand command = commands[i];
+			String builderName = command.getBuilderName();
+			// If there is a ManagedMake makefile generator, remove it as it will
+			// cause an additional build "all" to occur when we are making any target.
+			if (builderName.equals("org.eclipse.cdt.core.cbuilder") ||
+					builderName.equals(AutotoolsMakefileBuilder.MANAGED_BUILDER_ID)) { //$NON-NLS-1$
+				// Remove the command
+				Vector<ICommand> vec = new Vector<ICommand>(Arrays.asList(commands));
+				vec.removeElementAt(i);
+				vec.trimToSize();
+				ICommand[] tempCommands = (ICommand[]) vec.toArray(new ICommand[commands.length-1]); 
+				description.setBuildSpec(tempCommands);
+				project.setDescription(description, new NullProgressMonitor());
+				break;
+			}
+		}
+		
+		commands = description.getBuildSpec();
+		boolean found = false;
+		// See if the builder is already there
+		for (int i = 0; i < commands.length; ++i) {
+		   if (commands[i].getBuilderName().equals(AutotoolsMakefileBuilder.BUILDER_ID)) {
+			  found = true;
+			  break;
+		   }
+		}
+		if (!found) { 
+		   //add builder to project
+		   ICommand command = description.newCommand();
+		   command.setBuilderName(AutotoolsMakefileBuilder.BUILDER_ID);
+		   ICommand[] newCommands = new ICommand[commands.length + 1];
+		   // Add it before other builders.
+		   System.arraycopy(commands, 0, newCommands, 1, commands.length);
+		   newCommands[0] = command;
+		   description.setBuildSpec(newCommands);
+		   project.setDescription(description, new NullProgressMonitor());
+		}		
+	}
+
+	/**
+	 * Utility method for adding an autotools nature to a project.
+	 * 
+	 * @param proj the project to add the autotools nature to.
+	 * @param monitor a progress monitor to indicate the duration of the operation, or
+	 * <code>null</code> if progress reporting is not required.
+	 */
+	public static void addAutotoolsNature(IProject project, IProgressMonitor monitor) throws CoreException {
+		addNature(project, AUTOTOOLS_NATURE_ID, monitor);
+	}
+
+	/**
+	 * Utility method for adding a nature to a project.
+	 * 
+	 * @param proj the project to add the nature to.
+	 * @param natureId the id of the nature to assign to the project
+	 * @param monitor a progress monitor to indicate the duration of the operation, or
+	 * <code>null</code> if progress reporting is not required.
+	 */
+	public static void addNature(IProject project, String natureId, IProgressMonitor monitor) throws CoreException {
+		IProjectDescription description = project.getDescription();
+		String[] prevNatures = description.getNatureIds();
+		for (int i = 0; i < prevNatures.length; i++) {
+			if (natureId.equals(prevNatures[i]))
+				return;
+		}
+		String[] newNatures = new String[prevNatures.length + 1];
+		System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
+		newNatures[prevNatures.length] = natureId;
+		description.setNatureIds(newNatures);
+		project.setDescription(description, monitor);
+	}
+	
+	/**
+	 * Utility method to remove the autotools nature from a project.
+	 * 
+	 * @param project to remove the autotools nature from
+	 * @param mon progress monitor to indicate the duration of the operation, or 
+	 * <code>null</code> if progress reporting is not required. 
+	 * @throws CoreException
+	 */
+	public static void removeAutotoolsNature(IProject project, IProgressMonitor mon) throws CoreException {
+		removeNature(project, AUTOTOOLS_NATURE_ID, mon);
+	}
+
+	/**
+	 * Utility method for removing a project nature from a project.
+	 * 
+	 * @param proj the project to remove the nature from
+	 * @param natureId the nature id to remove
+	 * @param monitor a progress monitor to indicate the duration of the operation, or
+	 * <code>null</code> if progress reporting is not required.
+	 */
+	public static void removeNature(IProject project, String natureId, IProgressMonitor monitor) throws CoreException {
+		IProjectDescription description = project.getDescription();
+		String[] prevNatures = description.getNatureIds();
+		List<String> newNatures = new ArrayList<String>(Arrays.asList(prevNatures));
+		newNatures.remove(natureId);
+		description.setNatureIds((String[])newNatures.toArray(new String[newNatures.size()]));
+		project.setDescription(description, monitor);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsProjectPropertyTester.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsProjectPropertyTester.java
new file mode 100644
index 0000000..a561d6a
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsProjectPropertyTester.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools;
+
+import org.eclipse.core.expressions.PropertyTester;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+
+public class AutotoolsProjectPropertyTester extends PropertyTester {
+
+	public AutotoolsProjectPropertyTester() {
+		// nothing needed
+	}
+
+	public boolean test(Object receiver, String property, Object[] args,
+			Object expectedValue) {
+		IProject project = null;
+		IResource resource = (IResource)receiver;
+		project = resource.getProject();
+		return AutotoolsMakefileBuilder.hasTargetBuilder(project);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java
new file mode 100644
index 0000000..83c331d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java
@@ -0,0 +1,431 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.CommandLauncher;
+import org.eclipse.cdt.core.parser.IScannerInfo;
+import org.eclipse.cdt.core.parser.IScannerInfoChangeListener;
+import org.eclipse.cdt.managedbuilder.core.BuildException;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.IOption;
+import org.eclipse.cdt.managedbuilder.core.ITool;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyConstants;
+
+
+// This class is used to get and store information from the Autotools
+// makefiles for a specific file in a specific Autotools project.
+// It gets information by invoking make with special options
+// to find out what occurs if the file in question has changed.
+public class AutotoolsScannerInfo implements IScannerInfo {
+	
+	private IResource res;
+	private IProject project;
+	private IPath filePath;
+	private String[] includePaths;
+	@SuppressWarnings("unchecked")
+	private HashMap definedSymbols;
+	private boolean isDirty;
+	private String compilationString;
+	private String dirName;
+	private HashSet<IScannerInfoChangeListener> listeners = new HashSet<IScannerInfoChangeListener>();
+	
+	public AutotoolsScannerInfo (IResource res) {
+		this.res = res;
+		this.project = res.getProject();
+		this.filePath = res.getFullPath();
+	}
+	
+	public void addListener(IScannerInfoChangeListener listener) {
+		if (!listeners.contains(listener)) {
+			listeners.add(listener);
+		}
+	}
+	
+	public void removeListener(IScannerInfoChangeListener listener) {
+		if (listeners.contains(listener)) {
+			listeners.remove(listener);
+		}
+	}
+	
+	// TODO: Should make a listener to watch all Makefiles up the
+	// tree from the resource.  If any change, the include
+	// paths and options passed to make the file in question
+	// could change.
+	public void setDirty (boolean isDirty) {
+		this.isDirty = isDirty;
+	}
+	
+	private String buildFile (IPath filePath, IFile makefile, IManagedBuildInfo info) {
+		String outString = "";
+		IPath dir = makefile.getFullPath().removeLastSegments(1);
+		IPath relFilePath = filePath.removeFirstSegments(dir.segmentCount());
+		CommandLauncher launcher = new CommandLauncher();
+		String[] env = null;
+		ByteArrayOutputStream stdout = new ByteArrayOutputStream();
+		ByteArrayOutputStream stderr = stdout;
+		IPath makeCommandPath = new Path(info.getBuildCommand());
+		ITool tool = info.getToolFromOutputExtension("status"); // $NON-NLS-1$
+		IOption[] options = tool.getOptions();
+		IPath runPath = null;
+		boolean done = false;
+
+		for (int i = 0; i < options.length && !done; ++i) {
+			try {
+				if (options[i].getValueType() == IOption.STRING) {
+					String value = (String) options[i].getValue();
+					String id = options[i].getId();
+					if (id.indexOf("builddir") > 0) { // $NON-NLS-1$
+						runPath = makefile.getProject().getLocation().append(value.trim());
+						done = true;
+					}
+				}
+			} catch (BuildException e) {
+				// do nothing
+			}
+		}
+
+		IProgressMonitor monitor = new NullProgressMonitor();
+		String errMsg = null;
+		String[] makeArgs = new String[3];
+		makeArgs[0] = "-n"; // $NON-NLS-1$
+		makeArgs[1] = "all"; // $NON-NLS-1$
+		makeArgs[2] = "MAKE=make -W " + relFilePath.toOSString(); //$NON-NLS-1$
+
+		try {
+			Process proc = launcher.execute(makeCommandPath, makeArgs, env,
+					runPath, new NullProgressMonitor());
+			if (proc != null) {
+				try {
+					// Close the input of the process since we will never write to
+					// it
+					proc.getOutputStream().close();
+				} catch (IOException e) {
+				}
+
+				if (launcher.waitAndRead(stdout, stderr, new SubProgressMonitor(
+						monitor, IProgressMonitor.UNKNOWN)) != CommandLauncher.OK) {
+					errMsg = launcher.getErrorMessage();
+				}
+				outString = stdout.toString();
+			} else {
+				errMsg = launcher.getErrorMessage();
+			}
+		} catch (CoreException e) {
+			errMsg = e.getLocalizedMessage();
+			AutotoolsPlugin.logErrorMessage(errMsg);
+		}
+		return outString;
+	}
+	
+	private IFile getMakefile (IManagedBuildInfo info, IPath filePath) {
+		IWorkspaceRoot root = CCorePlugin.getWorkspace().getRoot();
+		IPath dir = filePath.removeLastSegments(1);
+		IFile makefile = null;
+		boolean done = false;
+		IPath makefilePath = null;
+		// Look starting at source file directory for the
+		// Makefile.in or Makefile for the given file.
+		while (!done) {
+			makefilePath = dir.append("Makefile.in"); // $NON-NLS-1$
+			makefile = root.getFile(makefilePath);
+			if (makefile != null && makefile.exists()) {
+				done = true;
+				continue;
+			}
+			makefilePath = dir.append("Makefile"); // $NON-NLS-1$
+			makefile = root.getFile(makefilePath);
+			if (makefile != null && makefile.exists()) {
+				done = true;
+			}
+			else {
+				dir = dir.removeLastSegments(1);
+				if (dir.lastSegment() == null)
+					done = true;
+			}
+		}
+		return makefile;
+	}
+	
+	private String getCompilationString() {
+		if (compilationString != null && !isDirty)
+			return compilationString;
+		String makeWEnabled = null;
+		try {
+			makeWEnabled = project.getPersistentProperty(AutotoolsPropertyConstants.SCANNER_USE_MAKE_W);
+		} catch (CoreException e) {
+			// do nothing
+		}
+		if (!(res instanceof IFile) ||
+				makeWEnabled == null ||
+				makeWEnabled.equals("false")) // $NON-NLS-1$
+			return null;
+		isDirty = false;
+		IWorkspaceRoot root = CCorePlugin.getWorkspace().getRoot();
+		IFile file = root.getFile(filePath);
+		IFile makefile = null;
+		IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+		// If the given file exists and we have a ManagedBuild, we may have
+		// an Autotools project source file.
+		if (file != null && file.exists() && info != null) {
+			makefile = getMakefile(info, filePath);
+		}
+		// We now have the closest directory to the given path
+		// that contains a Makefile.in or Makefile.  This Makefile
+		// should contain a relative reference to the file in
+		// question.  We now want to try and extract the include
+		// path from the top-level make run with the assumption
+		// that the file in question has been altered.
+		if (makefile != null) {
+			IPath dir = makefile.getFullPath().removeLastSegments(1);
+			// Get relative name of file as we assume the Makefile will
+			// refer to it this way.
+			String out = buildFile(filePath, makefile, info);
+			try {
+				boolean topLevel = dir.equals(project.getFullPath());
+				Pattern p = null;
+				Matcher m = null;
+				if (!topLevel) {
+					String regex1 = "^Making.*in.*" + dir.lastSegment(); // $NON-NLS-1$
+					p = Pattern.compile(regex1, Pattern.MULTILINE);
+					m = p.matcher(out);
+				}
+				if (topLevel || m.find()) {
+					Pattern p2 = null;
+					Matcher m2 = null;
+					String substr2 = out;
+					if (!topLevel) {
+						substr2 = out.substring(m.end());
+						String regex2 = "^make.*Entering directory.*`(.*)'"; // $NON-NLS-1$
+						p2 = Pattern.compile(regex2, Pattern.MULTILINE);
+						m2 = p2.matcher(substr2);
+					}
+					if (topLevel || m2.find()) {
+						String substr3 = null;
+						if (!topLevel) {
+							dirName = m2.group(1);
+							substr3 = substr2.substring(m2.start());
+						} else {
+							dirName = "";
+							substr3 = out;
+						}
+						// We need to test for both gcc and g++ compilers.
+						String regex3 = "^.*gcc.*?-I.*?" + filePath.lastSegment(); // $NON-NLS-1$
+						String regex4 = "^.*g[+][+].*?-I.*?" + filePath.lastSegment(); // $NON-NLS-1$
+						// Replace all continuation markers so we don't have to worry about newlines in
+						// the middle of a compilation string.
+						substr3 = substr3.replaceAll("\\\\\\n", "");
+						Pattern p3 = Pattern.compile(regex3, Pattern.MULTILINE);
+						Matcher m3 = p3.matcher(substr3);
+						if (m3.find())
+							compilationString = substr3.substring(m3.start(),m3.end());
+						else {
+							String substr4 = substr3;
+							Pattern p4 = Pattern.compile(regex4, Pattern.MULTILINE);
+							Matcher m4 = p4.matcher(substr4);
+							if (m4.find())
+								compilationString = substr3.substring(m4.start(),m4.end());
+						}
+					}
+				} else if (!out.equals("")) {
+					compilationString = "";
+				}
+			} catch (IllegalStateException t) {
+				// Mark as dirty for next time.
+				isDirty = true;
+			}
+		}
+		return compilationString;
+	}
+	
+	public String[] getIncludePaths() {
+		String[] pathArray = new String[0];
+		if (project == null || filePath == null)
+			return pathArray;
+		if (includePaths != null && !isDirty && compilationString != null) {
+			return includePaths;
+		}
+		ArrayList<String> pathList = new ArrayList<String>();
+		String cs = getCompilationString();
+		if (cs != null) {
+			// Grab include paths specified via -I
+			Pattern p4 = Pattern.compile(" -I");
+			String[] tokens = p4.split(cs);
+			for (int j = 1; j < tokens.length; ++j) {
+				String x = tokens[j].trim();
+				int firstSpace = x.indexOf(' ');
+				if (firstSpace != -1) {
+					x = x.substring(0, firstSpace);
+				}
+				if (x.charAt(0) == '/') {
+					pathList.add(x);
+				} else {
+					IPath relPath = new Path(dirName);
+					relPath = relPath.append(x);
+					pathList.add(relPath.toOSString());
+				}
+			}
+			// Grab include paths that are specified via -isystem
+			Pattern p5 = Pattern.compile(" -isystem");
+			tokens = p5.split(cs);
+			for (int j = 1; j < tokens.length; ++j) {
+				String x = tokens[j].trim();
+				int firstSpace = x.indexOf(' ');
+				if (firstSpace != -1) {
+					x = x.substring(0, firstSpace);
+				}
+				if (x.charAt(0) == '/') {
+					pathList.add(x);
+				} else {
+					IPath relPath = new Path(dirName);
+					relPath = relPath.append(x);
+					pathList.add(relPath.toOSString());
+				}
+			}
+		}
+		
+		// The ManagedBuildManager is the normal default IScannerInfoProvider
+		// for Managed Projects.  It has the ability to check gcc for the
+		// default include paths and we don't want to lose that.  Append
+		// the include paths from it to the end of our list which is dynamically
+		// picking up the -I options.
+		
+		// TODO: Should we even allow the user-defined includePaths in settings?
+		//       These will be picked up by the ManagedBuildManager.
+		IScannerInfo info = (IScannerInfo)ManagedBuildManager.getBuildInfo(project);
+		if (info != null) {
+			String[] extraIncludePaths = info.getIncludePaths();
+			for (int i = 0; i < extraIncludePaths.length; ++i) {
+				pathList.add(extraIncludePaths[i]);
+			}
+		}
+
+		includePaths = (String[])pathList.toArray(pathArray);
+		
+		// FIXME: Info has been updated.  Is this the best place to notify listeners?
+		Iterator<IScannerInfoChangeListener> i = listeners.iterator();
+		while (i.hasNext()) {
+			IScannerInfoChangeListener listener = (IScannerInfoChangeListener)i.next();
+			listener.changeNotification(project, this);
+		}
+		return includePaths;
+	}
+	
+	@SuppressWarnings("unchecked")
+	public Map getDefinedSymbols () {
+		HashMap symbolMap = new HashMap();
+		if (project == null || filePath == null)
+			return symbolMap;
+		if (definedSymbols != null && !isDirty && compilationString != null) {
+			return definedSymbols;
+		}
+		// Extract -D directives from the compilation string.
+		// TODO: Handle -U directives as well.
+		String cs = getCompilationString();
+		if (cs != null) {
+			Pattern p4 = Pattern.compile("\\s-D([^\\s=]+)(?:=(\\\\\".*?\\\\\"|\\S*))?"); // $NON-NLS-1$
+			Matcher m = p4.matcher(cs);
+			while(m.find()) {
+				String name = m.group(1);
+				String value = m.group(2);
+				if(value != null)
+					symbolMap.put(name, value.replace("\\", "")); // $NON-NLS-1$ $NON-NLS-2$
+				else
+					symbolMap.put(name, "");
+			}
+		}
+		// Add the defined symbols from ManagedBuildManager.  This will include
+		// the builtin implicit defines from the compiler and the user-set
+		// defines from settings.  Since these are added last, they will overwrite
+		// existing defines fished out of the Makefiles above.  For the user-defined
+		// symbols, this is the correct behavior.  For the implicit defines,
+		// this is not; however, this is not valid programming behavior and
+		// the compiler definitely warns against it.
+		IScannerInfo info = (IScannerInfo)ManagedBuildManager.getBuildInfo(project);
+		if (info != null) {
+			Map builtinDefinedSymbols = info.getDefinedSymbols();
+			symbolMap.putAll(builtinDefinedSymbols);
+		}
+
+		definedSymbols = symbolMap;
+		return definedSymbols;
+	}
+	
+	public void createIncludeChain(IFile include, IResource res) {
+		try {
+			// We store two different values.  The first only lasts for the 
+			// the session and is the actual resource.  We prefer to work with
+			// this form as it is quicker.  To handle persistence across
+			// sessions, we also store a persistent copy of the resource's
+			// path.  When the session is brought back again, we will recreate
+			// the session chain again using the persistent data.
+			include.setSessionProperty(AutotoolsPropertyConstants.OPEN_INCLUDE, res);
+			include.setPersistentProperty(AutotoolsPropertyConstants.OPEN_INCLUDE_P, res.getLocation().toPortableString());
+		} catch (CoreException e) {
+			// Do nothing
+		}
+	}
+	
+	/**
+	 * 
+	 * @param resource the resource we are scanning
+	 * @return the final resource in the include chain if one exists
+	 * otherwise the resource itself
+	 */
+	public static IResource followIncludeChain(IResource resource) {
+		IResource res = resource;
+		try {
+			boolean done = false;
+			// In the case of include files, we chain to the file that
+			// included the header file.  This may end up ultimately as
+			// a source file which has build parameters such as flag
+			// defines and a separate include path.
+			while (!done) {
+				while (res.getSessionProperty(AutotoolsPropertyConstants.OPEN_INCLUDE) != null)
+					res = (IResource)res.getSessionProperty(AutotoolsPropertyConstants.OPEN_INCLUDE);
+				String chainPath = res.getPersistentProperty(AutotoolsPropertyConstants.OPEN_INCLUDE_P);
+				if (chainPath != null) {
+					IPath location = Path.fromPortableString(chainPath);
+					IResource next = res.getWorkspace().getRoot().getFileForLocation(location);
+					res.setSessionProperty(AutotoolsPropertyConstants.OPEN_INCLUDE, next);
+					res = next;
+				} else
+					done = true;
+			}
+		} catch (CoreException e) {
+			// Do nothing
+		} finally {
+			resource = res;
+		}
+		return resource;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfoProvider.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfoProvider.java
new file mode 100644
index 0000000..572ce76
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfoProvider.java
@@ -0,0 +1,112 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.eclipse.cdt.core.AbstractCExtension;
+import org.eclipse.cdt.core.parser.IScannerInfo;
+import org.eclipse.cdt.core.parser.IScannerInfoChangeListener;
+import org.eclipse.cdt.core.parser.IScannerInfoProvider;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyConstants;
+
+
+public class AutotoolsScannerInfoProvider extends AbstractCExtension implements IScannerInfoProvider {
+
+	static private Map<String, Map<IResource, AutotoolsScannerInfo>> infoCollections = new HashMap<String, Map<IResource, AutotoolsScannerInfo>>();
+	static public final String INTERFACE_IDENTITY = 
+		AutotoolsPlugin.PLUGIN_ID + "." + "AutotoolsScannerInfoProvider"; // $NON-NLS-1$
+
+	protected String getCollectionName(IProject project) {
+		IManagedBuildInfo buildInfo = ManagedBuildManager.getBuildInfo(project);
+		String config = project.getName() + "." + buildInfo.getConfigurationName();
+		return config;
+	}
+	
+	public synchronized IScannerInfo getScannerInformation(IResource resource) {
+		IResource res = AutotoolsScannerInfo.followIncludeChain(resource);
+		// We keep scanner info separate per configuration.
+		// This is because one configuration may result in a file being
+		// compiled with one include path while another configuration
+		// may change the include path / defined symbols.
+		IProject project = resource.getProject();
+		
+		// We punt for non-Autotools projects.  This ScannerInfoProvider is used for
+		// all C Projects and we might get called for a non-Autotools project (e.g.
+		// unsubscribe operation when converting to C project).
+		if (!AutotoolsMakefileBuilder.hasTargetBuilder(project))
+			return null;
+		
+		// Check if the scanner info has been marked dirty, in which case we need
+		// to mark all entries dirty.
+		Boolean isDirty = Boolean.FALSE;
+		try {
+			isDirty = (Boolean)project.getSessionProperty(AutotoolsPropertyConstants.SCANNER_INFO_DIRTY);
+		} catch (CoreException e) {
+			// do nothing
+		}
+		if (isDirty != null && isDirty.equals(Boolean.TRUE)) {
+			setDirty(project);
+			try {
+			project.setSessionProperty(AutotoolsPropertyConstants.SCANNER_INFO_DIRTY, Boolean.FALSE);
+			} catch (CoreException ce) {
+				// do nothing
+			}
+		}
+		String config = getCollectionName(project);
+		// Get the ScannerInfo collection for current configuration or else
+		// create an empty collection if one doesn't already exist.
+		Map<IResource, AutotoolsScannerInfo> infoCollection = infoCollections.get(config);
+		if (infoCollection == null) {
+			infoCollection = new HashMap<IResource, AutotoolsScannerInfo>();
+			infoCollections.put(config, infoCollection);
+		}
+		AutotoolsScannerInfo info = (AutotoolsScannerInfo)infoCollection.get(res);
+		if (info == null) {
+			info = new AutotoolsScannerInfo(res);
+			infoCollection.put(res, info);
+		}
+		return info; 
+	}
+
+	private void setDirty(IProject project) {
+		String config = getCollectionName(project);
+		Map<IResource, AutotoolsScannerInfo> infoCollection = infoCollections.get(config);
+		if (infoCollection != null) {
+			Collection<AutotoolsScannerInfo> s = infoCollection.values();
+			for (Iterator<AutotoolsScannerInfo> i = s.iterator(); i.hasNext();) {
+				AutotoolsScannerInfo info = (AutotoolsScannerInfo)i.next();
+				info.setDirty(true);
+			}
+		}
+	}
+	
+	public void subscribe(IResource resource,
+			IScannerInfoChangeListener listener) {
+		AutotoolsScannerInfo info = (AutotoolsScannerInfo)getScannerInformation(resource);
+		info.addListener(listener);
+	}
+
+	public void unsubscribe(IResource resource,
+			IScannerInfoChangeListener listener) {
+		AutotoolsScannerInfo info = (AutotoolsScannerInfo)getScannerInformation(resource);
+		if (info != null)
+			info.removeListener(listener);
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java
new file mode 100644
index 0000000..aca5677
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java
@@ -0,0 +1,1374 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.EOFException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.CommandLauncher;
+import org.eclipse.cdt.core.ConsoleOutputStream;
+import org.eclipse.cdt.core.ICDescriptor;
+import org.eclipse.cdt.core.envvar.IEnvironmentVariable;
+import org.eclipse.cdt.core.resources.IConsole;
+import org.eclipse.cdt.core.settings.model.ICStorageElement;
+import org.eclipse.cdt.make.core.IMakeTarget;
+import org.eclipse.cdt.make.core.IMakeTargetManager;
+import org.eclipse.cdt.make.core.MakeCorePlugin;
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.core.makefile.ITarget;
+import org.eclipse.cdt.make.core.makefile.ITargetRule;
+import org.eclipse.cdt.managedbuilder.core.BuildException;
+import org.eclipse.cdt.managedbuilder.core.IBuilder;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.IOption;
+import org.eclipse.cdt.managedbuilder.core.ITool;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.managedbuilder.macros.BuildMacroException;
+import org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider;
+import org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator;
+import org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator2;
+import org.eclipse.cdt.newmake.core.IMakeCommonBuildInfo;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceStatus;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyConstants;
+import org.eclipse.linuxtools.internal.cdt.autotools.MarkerGenerator;
+
+
+@SuppressWarnings("deprecation")
+public class MakeGenerator extends MarkerGenerator implements IManagedBuilderMakefileGenerator, IManagedBuilderMakefileGenerator2 {
+
+	public final String CONFIG_STATUS = "config.status"; //$NON-NLS-1$
+	public final String MAKEFILE = "Makefile"; //$NON-NLS-1$
+	public final String MAKEFILE_CVS = "Makefile.cvs"; //$NON-NLS-1$
+	public final String SETTINGS_FILE_NAME = ".cdtconfigure"; //$NON-NLS-1$
+	public final String SHELL_COMMAND = "sh"; //$NON-NLS-1$
+	
+	public final String AUTOGEN_TOOL_ID = "org.eclipse.linuxtools.cdt.autotools.tool.autogen"; //$NON-NLS-1$
+	public final String CONFIGURE_TOOL_ID = "org.eclipse.linuxtools.cdt.autotools.tool.configure"; //$NON-NLS-1$
+	
+	public final String GENERATED_TARGET = AutotoolsPlugin.PLUGIN_ID + ".generated.MakeTarget"; //$NON-NLS-1$
+
+	private static final String MAKE_TARGET_KEY = MakeCorePlugin.getUniqueIdentifier() + ".buildtargets"; //$NON-NLS-1$
+	private static final String BUILD_TARGET_ELEMENT = "buildTargets"; //$NON-NLS-1$
+	private static final String TARGET_ELEMENT = "target"; //$NON-NLS-1$
+	private static final String TARGET_ATTR_ID = "targetID"; //$NON-NLS-1$
+	private static final String TARGET_ATTR_PATH = "path"; //$NON-NLS-1$
+	private static final String TARGET_ATTR_NAME = "name"; //$NON-NLS-1$
+	private static final String TARGET_STOP_ON_ERROR = "stopOnError"; //$NON-NLS-1$
+	private static final String TARGET_USE_DEFAULT_CMD = "useDefaultCommand"; //$NON-NLS-1$
+	private static final String TARGET_ARGUMENTS = "buildArguments"; //$NON-NLS-1$
+	private static final String TARGET_COMMAND = "buildCommand"; //$NON-NLS-1$
+	private static final String TARGET_RUN_ALL_BUILDERS = "runAllBuilders";
+	private static final String TARGET = "buildTarget"; //$NON-NLS-1$
+
+	private IProject project;
+
+	private IProgressMonitor monitor;
+
+	private String buildDir;
+	private String srcDir;
+
+	private IConfiguration cfg;
+	private IBuilder builder;
+
+	public void generateDependencies() throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	public MultiStatus generateMakefiles(IResourceDelta delta)
+			throws CoreException {
+		return regenerateMakefiles();
+	}
+
+	private void initializeBuildConfigDirs() {
+		ITool tool = cfg.getToolFromOutputExtension("status"); //$NON-NLS-1$
+		IOption[] options = tool.getOptions();
+		for (int i = 0; i < options.length; ++i) {
+			String id = options[i].getId();
+			if (id.indexOf("builddir") > 0) { //$NON-NLS-1$
+				buildDir = (String) options[i].getValue();
+				try {
+					String resolved = ManagedBuildManager.getBuildMacroProvider().resolveValue(buildDir, "build", null, 
+							IBuildMacroProvider.CONTEXT_CONFIGURATION, cfg);
+					buildDir = resolved;
+				} catch (BuildMacroException e) {
+					// do nothing
+				}
+//				try {
+//					builder.setBuildAttribute(IMakeCommonBuildInfo.BUILD_LOCATION, 
+//							project.getLocation().append(buildDir).toOSString());
+//				} catch (CoreException e) {
+//					e.printStackTrace();
+//				}
+			} else if (id.indexOf("configdir") > 0) {  //$NON-NLS-1$
+				srcDir = (String) options[i].getValue();
+				try {
+					String resolved = ManagedBuildManager.getBuildMacroProvider().resolveValue(srcDir, "", null, 
+							IBuildMacroProvider.CONTEXT_CONFIGURATION, cfg);
+					srcDir = resolved;
+				} catch (BuildMacroException e) {
+					// do nothing
+				}
+			}
+		}
+	}
+	
+	public void initialize(IProject project, IManagedBuildInfo info,
+			IProgressMonitor monitor) {
+		this.project = project;
+		this.cfg = info.getDefaultConfiguration();
+		this.builder = cfg.getBuilder();
+		this.monitor = monitor;
+		initializeBuildConfigDirs();
+	}
+
+	public void initialize(int buildKind, IConfiguration cfg, IBuilder builder, 
+			IProgressMonitor monitor) {
+		this.cfg = cfg;
+		this.builder = builder;
+		this.monitor = monitor;
+		this.project = (IProject)cfg.getManagedProject().getOwner();
+		initializeBuildConfigDirs();
+	}
+
+	public IProject getProject() {
+		return project;
+	}
+	
+	public boolean isGeneratedResource(IResource resource) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public void regenerateDependencies(boolean force) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	/*
+	 * (non-Javadoc) Check whether the build has been cancelled. Cancellation
+	 * requests propagated to the caller by throwing <code>OperationCanceledException</code>.
+	 * 
+	 * @see org.eclipse.core.runtime.OperationCanceledException#OperationCanceledException()
+	 */
+	protected void checkCancel() {
+		if (monitor != null && monitor.isCanceled()) {
+			throw new OperationCanceledException();
+		}
+	}
+
+	/*
+	 * (non-Javadoc) Return or create the makefile needed for the build. If we
+	 * are creating the resource, set the derived bit to true so the CM system
+	 * ignores the contents. If the resource exists, respect the existing
+	 * derived setting.
+	 * 
+	 * @param makefilePath @return IFile
+	 */
+	protected IFile createFile(IPath makefilePath) throws CoreException {
+		// Create or get the handle for the makefile
+		IWorkspaceRoot root = CCorePlugin.getWorkspace().getRoot();
+		IFile newFile = root.getFileForLocation(makefilePath);
+		if (newFile == null) {
+			newFile = root.getFile(makefilePath);
+		}
+		// Create the file if it does not exist
+		ByteArrayInputStream contents = new ByteArrayInputStream(new byte[0]);
+		try {
+			newFile.create(contents, false, new SubProgressMonitor(monitor, 1));
+			// Make sure the new file is marked as derived
+			if (!newFile.isDerived()) {
+				newFile.setDerived(true);
+			}
+
+		} catch (CoreException e) {
+			// If the file already existed locally, just refresh to get contents
+			if (e.getStatus().getCode() == IResourceStatus.PATH_OCCUPIED)
+				newFile.refreshLocal(IResource.DEPTH_ZERO, null);
+			else
+				throw e;
+		}
+
+		return newFile;
+	}
+
+	/*
+	 * (non-Javadoc) Return or create the folder needed for the build output. If
+	 * we are creating the folder, set the derived bit to true so the CM system
+	 * ignores the contents. If the resource exists, respect the existing
+	 * derived setting.
+	 * 
+	 * @param string @return IPath
+	 */
+	private boolean createDirectory(String dirName) throws CoreException {
+		// Create or get the handle for the build directory
+		boolean rc = true;
+		IPath path = new Path(dirName);
+		if (dirName.length() == 0 || dirName.startsWith(".") || !dirName.startsWith("/"))
+			path = project.getLocation().append(dirName);
+		File f = path.toFile();
+		if (!f.exists())
+			rc = f.mkdirs();
+
+		return rc;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator#getBuildWorkingDir()
+	 */
+	public IPath getBuildWorkingDir() {
+		return new Path(buildDir);
+	}
+
+	/*
+	 * (non-Javadoc) Get the project's absolute path. @return IPath
+	 */
+	private IPath getProjectLocation() {
+		return project.getLocation();
+	}
+
+	private String getAbsoluteDirectory(String dir) {
+		IPath path = new Path(dir);
+		if (!path.isAbsolute()) {
+			IPath absPath = getProjectLocation().addTrailingSeparator().append(
+					path);
+			return getPathString(absPath);
+		}
+		return dir;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator#getMakefileName()
+	 */
+	public String getMakefileName() {
+		return new String(MAKEFILE);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @return the path to the configuration settings file
+	 */
+	protected IPath getConfigSettingsPath() {
+		IPath path = project.getWorkingLocation(AutotoolsPlugin.PLUGIN_ID).append(SETTINGS_FILE_NAME + "." + cfg.getName()); //$NON-NLS-1$
+		return path;
+	}
+	
+	public void removeConfigSettings() {
+		File f = getConfigSettingsPath().toFile();
+		try {
+			f.delete();
+		} catch (Exception e) {
+			// do nothing
+		}
+	}
+	
+	public MultiStatus regenerateMakefiles() throws CoreException {
+		MultiStatus status;
+		int rc = IStatus.OK;
+		String errMsg = new String();
+		boolean needFullConfigure = true;
+
+		// See if the user has cancelled the build
+		checkCancel();
+
+		// Create the top-level directory for the build output
+		if (!createDirectory(buildDir)) {
+			rc = IStatus.ERROR;
+			errMsg = AutotoolsPlugin.getFormattedString("MakeGenerator.createdir.error", //$NON-NLS-1$
+					new String[] {buildDir});
+			return new MultiStatus(AutotoolsPlugin.getUniqueIdentifier(), 
+					rc, errMsg, null);
+		}
+
+		checkCancel();
+
+		// // How did we do
+		// if (!getInvalidDirList().isEmpty()) {
+		// status = new MultiStatus (
+		// ManagedBuilderCorePlugin.getUniqueIdentifier(),
+		// IStatus.WARNING,
+		// new String(),
+		// null);
+		// // Add a new status for each of the bad folders
+		// iter = getInvalidDirList().iterator();
+		// while (iter.hasNext()) {
+		// status.add(new Status (
+		// IStatus.WARNING,
+		// ManagedBuilderCorePlugin.getUniqueIdentifier(),
+		// SPACES_IN_PATH,
+		// ((IContainer)iter.next()).getFullPath().toString(),
+		// null));
+		// }
+		// } else {
+		// status = new MultiStatus(
+		// ManagedBuilderCorePlugin.getUniqueIdentifier(),
+		// IStatus.OK,
+		// new String(),
+		// null);
+		// }
+
+		// Get a build console for the project
+		IConsole console = CCorePlugin.getDefault().getConsole("org.eclipse.linuxtools.cdt.autotools.configureConsole"); //$NON-NLS-1$
+
+		// Get the project and make sure there's a monitor to cancel the build
+		if (monitor == null) {
+			monitor = new NullProgressMonitor();
+		}
+
+		try {
+			// If a config.status file exists in the build directory, we call it
+			// to
+			// regenerate the makefile
+			IPath configfile = getProjectLocation().append(buildDir).append(
+					CONFIG_STATUS);
+			IPath makefilePath = getProjectLocation().append(buildDir).append(MAKEFILE);
+			File configStatus = configfile.toFile();
+			File makefile = makefilePath.toFile();
+			IPath configSettingsPath = getConfigSettingsPath();
+			File configSettings = configSettingsPath.toFile();
+			String[] configArgs = getConfigArgs();
+
+			// We need to figure out if the end-user has changed the configuration
+			// settings.  In such a case, we need to reconfigure from scratch
+			// regardless of whether config.status exists or not.
+			// We figure this out by saving the configuration settings to
+			// a special file and reading/comparing whenever we are asked to build.
+			if (configSettings.exists()) {
+				int i = 0;
+				boolean needSaveConfigArgs = false;
+				needFullConfigure = false;
+				try {
+					DataInputStream settings = new DataInputStream(
+							new BufferedInputStream(new FileInputStream(configSettings)));
+					// Get the first String in the configure settings file.
+					// Newer configure settings file start with the project name.  
+					// If the project name is present and doesn't match the
+					// current project name, the project has been refactored and
+					// we need to do a full reconfigure.
+					settings.mark(100);
+					String s = settings.readUTF();
+					if (s.startsWith("project=")) { //$NON-NLS-1$
+						if (!s.substring(8).equals(project.getName())) {
+							needFullConfigure = true;
+						}
+					} else {
+						// An older configure arguments file.  Reset
+						// to beginning and process as normal.
+						needSaveConfigArgs = true;
+						settings.reset();
+					}
+					while (i < configArgs.length) {
+						s = settings.readUTF();
+						if (!s.equals(configArgs[i])) {
+							i = configArgs.length;
+							needFullConfigure = true;
+						}
+						++i;
+					}
+					if (settings.available() > 0)
+						needFullConfigure = true;
+				} catch (EOFException e) {
+					needFullConfigure = true;
+				} catch (IOException e) {
+					needFullConfigure = true;
+				}
+				if (needFullConfigure) {
+					// If we are going to do a full reconfigure, then if the current
+					// build directory exists, we should clean it out first.  This is
+					// because the reconfiguration could change compile flags, etc..
+					// and the Makefile might not detect a rebuild is required.  In
+					// addition, the build directory itself could have been changed and
+					// we should remove the previous build.
+					File r = project.getLocation().append(buildDir).toFile();
+					if (r != null && r.exists()) {
+						// See what type of cleaning the user has set up in the
+						// build properties dialog.
+						String cleanDelete = null;
+						try {
+							cleanDelete = getProject().getPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE);
+						} catch (CoreException ce) {
+							// do nothing
+						}
+						
+						if (cleanDelete != null && cleanDelete.equals(AutotoolsPropertyConstants.TRUE)) {
+							SubProgressMonitor sub = new SubProgressMonitor(monitor, IProgressMonitor.UNKNOWN);
+							sub.beginTask(AutotoolsPlugin.getResourceString("MakeGenerator.clean.builddir"), IProgressMonitor.UNKNOWN);
+							try {
+								r.delete();
+							} finally {
+								sub.done();
+							}
+						}
+						else {
+							// There is a make target for cleaning.
+							if (makefile != null && makefile.exists()) {
+								String[] makeargs = new String[1];
+								IPath makeCmd = new Path("make"); //$NON-NLS-1$
+								String target = null;
+								try {
+									target = getProject().getPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET);
+								} catch (CoreException ce) {
+									// do nothing
+								}
+								if (target == null)
+									target = AutotoolsPropertyConstants.CLEAN_MAKE_TARGET_DEFAULT;
+								String args = builder.getBuildArguments();
+								if (args != null && !(args = args.trim()).equals("")) { //$NON-NLS-1$
+									String[] newArgs = makeArray(args);
+									makeargs = new String[newArgs.length + 1];
+									System.arraycopy(newArgs, 0, makeargs, 0, newArgs.length);
+								}
+								makeargs[makeargs.length - 1] = target;
+								rc = runCommand(makeCmd,
+										project.getLocation().append(buildDir),
+										makeargs,
+										AutotoolsPlugin.getResourceString("MakeGenerator.clean.builddir"), //$NON-NLS-1$
+										errMsg, console, true);
+							}
+						}
+					}
+					initializeBuildConfigDirs();
+					createDirectory(buildDir);
+					// Mark the scanner info as dirty.
+					try {
+						project.setSessionProperty(AutotoolsPropertyConstants.SCANNER_INFO_DIRTY, Boolean.TRUE);
+					} catch (CoreException ce) {
+						// do nothing
+					}
+				} else if (needSaveConfigArgs) {
+					// No change in configuration args, but we have old
+					// style settings format which can't determine if project has
+					// been renamed.  Refresh the settings file.
+					saveConfigArgs(configArgs);
+				}
+			}
+			
+			ArrayList<String> configureEnvs = new ArrayList<String>();
+			IPath configurePath = getConfigurePath(configureEnvs);
+			ArrayList<String> autogenEnvs = new ArrayList<String>();
+			IPath autogenPath = getAutogenPath(autogenEnvs);
+			
+			// Check if we have a config.status (meaning configure has already run).
+    		if (!needFullConfigure && configStatus != null && configStatus.exists()) {
+			    // If no corresponding Makefile in the same build location, then we
+	            // can simply run config.status again to ensure the top level Makefile has been
+				// created.
+				if (makefile == null || !makefile.exists()) {
+					rc = runScript(configfile, project.getLocation().append(
+							buildDir), null, 
+							AutotoolsPlugin.getResourceString("MakeGenerator.run.config.status"), //$NON-NLS-1$
+							errMsg, console, null, true);
+				}
+			}
+			// Look for configure and configure from scratch
+			else if (configurePath.toFile().exists()) {
+				rc = runScript(configurePath, 
+						project.getLocation().append(buildDir),
+						configArgs, 
+						AutotoolsPlugin.getResourceString("MakeGenerator.gen.makefile"), //$NON-NLS-1$
+						errMsg, console, configureEnvs, true);
+				if (rc != IStatus.ERROR) {
+					File makefileFile = project.getLocation().append(buildDir)
+					.append(MAKEFILE).toFile();
+					addMakeTargetsToManager(makefileFile);
+					// TODO: should we do something special if configure doesn't
+					// return ok?
+					saveConfigArgs(configArgs);
+				}
+			}
+			// If no configure, look for autogen.sh which may create configure and
+    		// possibly even run it.
+			else if (autogenPath.toFile().exists()) {
+				// Remove the existing config.status file since we use it
+				// to figure out if configure was run.
+				if (configStatus.exists())
+					configStatus.delete();
+				// Get any user-specified arguments for autogen.
+				String[] autogenArgs = getAutogenArgs();
+				rc = runScript(autogenPath,
+						autogenPath.removeLastSegments(1), autogenArgs,
+						AutotoolsPlugin.getResourceString("MakeGenerator.autogen.sh"), //$NON-NLS-1$
+						errMsg, console, autogenEnvs, true);
+				if (rc != IStatus.ERROR) {
+					configStatus =configfile.toFile();
+					// Check for config.status.  If it is created, then
+					// autogen.sh ran configure and we should not run it
+					// ourselves.
+					if (configStatus == null || !configStatus.exists()) {
+						rc = runScript(configurePath, 
+								project.getLocation().append(buildDir),
+								configArgs, 
+								AutotoolsPlugin.getResourceString("MakeGenerator.gen.makefile"), //$NON-NLS-1$
+								errMsg, console, configureEnvs, false);
+						if (rc != IStatus.ERROR) {
+							File makefileFile = project.getLocation().append(buildDir)
+							.append(MAKEFILE).toFile();
+							addMakeTargetsToManager(makefileFile);
+						}
+					} else {
+						File makefileFile = project.getLocation().append(buildDir)
+						.append(MAKEFILE).toFile();
+						addMakeTargetsToManager(makefileFile);						
+					}
+				}
+			}
+			// If nothing this far, look for a Makefile.cvs file which needs to be run. 
+			else if (makefileCvsExists()) {
+				String[] makeargs = new String[1];
+				IPath makeCmd = new Path("make"); //$NON-NLS-1$
+				makeargs[0] = "-f" + getMakefileCVSPath().toOSString(); //$NON-NLS-1$
+				rc = runCommand(makeCmd,
+						project.getLocation().append(buildDir),
+						makeargs,
+						AutotoolsPlugin.getResourceString("MakeGenerator.makefile.cvs"), //$NON-NLS-1$
+						errMsg, console, true);
+				if (rc != IStatus.ERROR) {
+					File makefileFile = project.getLocation().append(buildDir)
+					.append(MAKEFILE).toFile();
+					addMakeTargetsToManager(makefileFile);
+					saveConfigArgs(configArgs);
+				}
+			}
+			// If nothing this far, try running autoreconf -i
+			else {
+				String[] reconfArgs = new String[1];
+				String reconfCmd = project.getPersistentProperty(AutotoolsPropertyConstants.AUTORECONF_TOOL);
+				if (reconfCmd == null)
+					reconfCmd = "autoreconf"; // $NON-NLS-1$
+				IPath reconfCmdPath = new Path(reconfCmd);
+				reconfArgs[0] = "-i"; //$NON-NLS-1$
+				rc = runCommand(reconfCmdPath,
+						project.getLocation().append(srcDir),
+						reconfArgs,
+						AutotoolsPlugin.getResourceString("MakeGenerator.autoreconf"), //$NON-NLS-1$
+						errMsg, console, true);
+				// Check if configure generated and if yes, run it.
+				if (rc != IStatus.ERROR) {
+					if (configurePath.toFile().exists()) {
+						
+						rc = runScript(configurePath, 
+								project.getLocation().append(buildDir),
+								configArgs, 
+								AutotoolsPlugin.getResourceString("MakeGenerator.gen.makefile"), //$NON-NLS-1$
+								errMsg, console, configureEnvs, false);
+						if (rc != IStatus.ERROR) {
+							File makefileFile = project.getLocation().append(buildDir)
+							.append(MAKEFILE).toFile();
+							addMakeTargetsToManager(makefileFile);
+							// TODO: should we do something special if configure doesn't
+							// return ok?
+							saveConfigArgs(configArgs);
+						}
+					}
+				}
+			}
+    		
+    		// Treat no Makefile as generation error.
+			if (makefile == null || !makefile.exists()) {
+				rc = IStatus.ERROR;
+				errMsg = AutotoolsPlugin.getResourceString("MakeGenerator.didnt.generate"); //$NON-NLS-1$
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			// forgetLastBuiltState();
+			rc = IStatus.ERROR;
+		} finally {
+			// getGenerationProblems().clear();
+			status = new MultiStatus(AutotoolsPlugin
+						.getUniqueIdentifier(), rc, errMsg, null);
+		}
+		return status;
+	}
+
+	/**
+	 * Strip a command of VAR=VALUE pairs that appear ahead of the command and add
+	 * them to a list of environment variables.
+	 *
+	 * @param command - command to strip
+	 * @param envVars - ArrayList to add environment variables to
+	 * @return stripped command
+	 */
+	public static String stripEnvVars(String command, ArrayList<String> envVars) {
+		Pattern p = Pattern.compile("(\\w+[=]([$]?\\w+[:;]?)+\\s+)\\w+.*");
+		Pattern p2 = Pattern.compile("(\\w+[=]\\\".*?\\\"\\s+)\\w+.*");
+		Pattern p3 = Pattern.compile("(\\w+[=]'.*?'\\s+)\\w+.*");
+		boolean finished = false;
+		while (!finished) {
+			Matcher m = p.matcher(command);
+			if (m.matches()) {
+				command = command.replaceFirst("\\w+[=]([$]?\\w+[:;]?)+", "").trim();
+				envVars.add(m.group(1).trim());
+			} else {
+				Matcher m2 = p2.matcher(command);
+				if (m2.matches()) {
+					command = command.replaceFirst("\\w+[=]\\\".*?\\\"","").trim();
+					String s = m2.group(1).trim();
+					envVars.add(s.replaceAll("\\\"", ""));
+				} else {
+					Matcher m3 = p3.matcher(command);
+					if (m3.matches()) {
+						command = command.replaceFirst("\\w+[=]'.*?'", "").trim();
+						String s = m3.group(1).trim();
+						envVars.add(s.replaceAll("'", ""));
+					} else {
+						finished = true;
+					}
+				}
+			}
+		}
+		return command;
+	}
+	
+	protected IPath getConfigurePath(ArrayList<String> envVars) {
+		IPath configPath;
+		ITool[] tool = cfg.getToolsBySuperClassId(CONFIGURE_TOOL_ID);
+		String command = stripEnvVars(tool[0].getToolCommand().trim(), envVars);
+			
+		if (srcDir.equals(""))
+			configPath = project.getLocation().append(command);
+		else
+			configPath = project.getLocation().append(srcDir).append(command);
+		return configPath;
+	}
+	
+	protected IPath getMakefileCVSPath() {
+		IPath makefileCVSPath;
+		if (srcDir.equals(""))
+			makefileCVSPath = project.getLocation().append(MAKEFILE_CVS);
+		else
+			makefileCVSPath= project.getLocation().append(srcDir).append(
+					MAKEFILE_CVS);
+		return makefileCVSPath;
+	}
+	
+	protected boolean makefileCvsExists() {
+		IPath makefileCVSPath = getMakefileCVSPath();
+		return makefileCVSPath.toFile().exists();
+	}
+
+	protected IPath getAutogenPath(ArrayList<String> envVars) {
+		IPath autogenPath;
+		ITool[] tool = cfg.getToolsBySuperClassId(AUTOGEN_TOOL_ID);
+		String command = stripEnvVars(tool[0].getToolCommand().trim(), envVars);
+			
+		if (srcDir.equals(""))
+			autogenPath = project.getLocation().append(command);
+		else
+			autogenPath = project.getLocation().append(srcDir).append(command);
+		return autogenPath;
+	}
+	
+	private void saveConfigArgs(String[] args) {
+		IPath settingsPath = getConfigSettingsPath();
+		try {
+			File f = settingsPath.toFile();
+			DataOutputStream settings = new DataOutputStream(
+					new BufferedOutputStream(new FileOutputStream(f)));
+			// Write the project name in the configure arguments
+			// so we know if the project gets refactored.
+			settings.writeUTF("project=" + project.getName()); //$NON-NLS-1$
+			for (int i = 0; i < args.length; ++i) {
+				settings.writeUTF(args[i]);
+			}
+			settings.close();
+		} catch (IOException e) {
+			/* What should we do?  */
+		}
+	}
+	
+	private String[] getAutogenArgs() throws BuildException {
+		// Get the arguments to be passed to config from build model
+		ITool[] tool = cfg.getToolsBySuperClassId(AUTOGEN_TOOL_ID);
+		IOption[] options = tool[0].getOptions();
+		ArrayList<String> autogenArgs = new ArrayList<String>();
+		
+		for (int i = 0; i < options.length; ++i) {
+			if (options[i].getValueType() == IOption.STRING) {
+				String value = (String) options[i].getValue();
+				try {
+					String resolved = ManagedBuildManager.getBuildMacroProvider().resolveValue(value, "", null, 
+							IBuildMacroProvider.CONTEXT_CONFIGURATION, cfg);
+					value = resolved;
+				} catch (BuildMacroException e) {
+					// do nothing
+				}
+				String id = options[i].getId();
+				if (id.indexOf("user") > 0) { //$NON-NLS-1$
+					// May be multiple user-specified options in which case we
+					// need to split them up into individual options
+					value = value.trim();
+					boolean finished = false;
+					int lastIndex = value.indexOf("--"); //$NON-NLS-1$
+					if (lastIndex != -1) {
+						while (!finished) {
+							int index = value.indexOf("--",lastIndex+2); //$NON-NLS-1$
+							if (index != -1) {
+								String previous = value.substring(lastIndex, index).trim();
+								autogenArgs.add(previous);
+								value = value.substring(index);
+							} else {
+								autogenArgs.add(value);
+								finished = true;
+							}
+						}
+					}
+				}
+			}
+		}
+		return (String[]) autogenArgs.toArray(new String[autogenArgs.size()]);
+	}
+
+	private String[] getConfigArgs() throws BuildException {
+		// Get the arguments to be passed to config from build model
+		ITool tool = cfg.getToolFromOutputExtension("status"); //$NON-NLS-1$
+		IOption[] options = tool.getOptions();
+		ArrayList<String> configArgs = new ArrayList<String>();
+		for (int i = 0; i < options.length; ++i) {
+			if (options[i].getValueType() == IOption.STRING) {
+				String value = (String) options[i].getValue();
+				try {
+					String resolved = ManagedBuildManager.getBuildMacroProvider().resolveValue(value, "", null, 
+							IBuildMacroProvider.CONTEXT_CONFIGURATION, cfg);
+					value = resolved;
+				} catch (BuildMacroException e) {
+					// do nothing
+				}
+				String id = options[i].getId();
+				if (id.indexOf("configdir") > 0 || id.indexOf("builddir") > 0) //$NON-NLS-1$ $NON-NLS-2$
+					continue;
+				else if (id.indexOf("user") > 0) { //$NON-NLS-1$
+					// May be multiple user-specified options in which case we
+					// need to split them up into individual options
+					value = value.trim();
+					boolean finished = false;
+					int lastIndex = value.indexOf("--"); //$NON-NLS-1$
+					if (lastIndex != -1) {
+						while (!finished) {
+							int index = value.indexOf("--",lastIndex+2); //$NON-NLS-1$
+							if (index != -1) {
+								String previous = value.substring(lastIndex, index).trim();
+								configArgs.add(previous);
+								value = value.substring(index);
+							} else {
+								configArgs.add(value);
+								finished = true;
+							}
+						}
+					} else {
+						// No --xxx arguments, but there might still be some NAME=VALUE args
+						// and we should pass them on regardless
+						configArgs.add(value);
+					}
+				}
+				else if (value.trim().length() > 0) {
+					String categoryId = options[i].getCategory().getId();
+					if (categoryId.indexOf("directories") >= 0) //$NON-NLS-1$
+						value = getAbsoluteDirectory(value);
+					String cmd = options[i].getCommand().concat(value);
+					configArgs.add(cmd);
+				}
+			} else if (options[i].getValueType() == IOption.BOOLEAN) {
+				Boolean value = (Boolean) options[i].getValue();
+				if (value.booleanValue())
+					configArgs.add(options[i].getCommand());
+				else if (!options[i].getCommandFalse().equals(""))
+					configArgs.add(options[i].getCommandFalse());
+			}
+		}
+		return (String[]) configArgs.toArray(new String[configArgs.size()]);
+	}
+
+	// Run a command or executable (e.g. make).
+	private int runCommand(IPath commandPath, IPath runPath, String[] args,
+			String jobDescription, String errMsg, IConsole console, 
+			boolean consoleStart) throws BuildException, CoreException,
+			NullPointerException, IOException {
+		// TODO: Figure out what this next stuff is used for
+		// //try to resolve the build macros in the builder command
+		// try{
+		// String resolved =
+		// ManagedBuildManager.getBuildMacroProvider().resolveValueToMakefileFormat(
+		// configCmd,
+		// "", //$NON-NLS-1$
+		// " ", //$NON-NLS-1$
+		// IBuildMacroProvider.CONTEXT_CONFIGURATION,
+		// info.getDefaultConfiguration());
+		// if((resolved = resolved.trim()).length() > 0)
+		// configCmd = resolved;
+		// } catch (BuildMacroException e){
+		// }
+
+		int rc = IStatus.OK;
+		
+		removeAllMarkers(project);
+		
+		String[] configTargets = args;
+		if (args == null)
+			configTargets = new String[0];
+	
+		String[] msgs = new String[2];
+		msgs[0] = commandPath.toString();
+		msgs[1] = project.getName();
+		monitor.subTask(AutotoolsPlugin.getFormattedString(
+				"MakeGenerator.make.message", msgs)); //$NON-NLS-1$
+
+
+		ConsoleOutputStream consoleOutStream = null;
+		StringBuffer buf = new StringBuffer();
+
+		// Launch command - main invocation
+		if (consoleStart)
+			console.start(project);
+		consoleOutStream = console.getOutputStream();
+		String[] consoleHeader = new String[3];
+
+		consoleHeader[0] = jobDescription;
+		consoleHeader[1] = cfg.getName();
+		consoleHeader[2] = project.getName();
+		buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+		buf.append(jobDescription);
+		buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+		buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+
+		if (!cfg.isSupported()) {
+			String msgArgs[] = new String[1];
+			msgArgs[0] = cfg.getName();
+			buf.append(AutotoolsPlugin.getFormattedString("MakeGenerator.unsupportedConfig", msgArgs));
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+		}
+		consoleOutStream.write(buf.toString().getBytes());
+		consoleOutStream.flush();
+
+		// Get a launcher for the config command
+		CommandLauncher launcher = new CommandLauncher();
+		// Set the environment
+		IEnvironmentVariable variables[] = ManagedBuildManager
+				.getEnvironmentVariableProvider().getVariables(cfg, true);
+		String[] env = null;
+		ArrayList<String> envList = new ArrayList<String>();
+		if (variables != null) {
+			for (int i = 0; i < variables.length; i++) {
+				envList.add(variables[i].getName()
+						+ "=" + variables[i].getValue()); //$NON-NLS-1$
+			}
+			env = (String[]) envList.toArray(new String[envList.size()]);
+		}
+
+		// // Hook up an error parser manager
+		// String[] errorParsers =
+		// info.getDefaultConfiguration().getErrorParserList();
+		// ErrorParserManager epm = new ErrorParserManager(project, topBuildDir,
+		// this, errorParsers);
+		// epm.setOutputStream(consoleOutStream);
+		OutputStream stdout = consoleOutStream;
+		OutputStream stderr = consoleOutStream;
+
+		launcher.showCommand(true);
+		Process proc = launcher.execute(commandPath, configTargets, env,
+				runPath, new NullProgressMonitor());
+		if (proc != null) {
+			try {
+				// Close the input of the process since we will never write to
+				// it
+				proc.getOutputStream().close();
+			} catch (IOException e) {
+			}
+
+			if (launcher.waitAndRead(stdout, stderr, new SubProgressMonitor(
+					monitor, IProgressMonitor.UNKNOWN)) != CommandLauncher.OK) {
+				errMsg = launcher.getErrorMessage();
+			}
+
+			// Force a resync of the projects without allowing the user to
+			// cancel.
+			// This is probably unkind, but short of this there is no way to
+			// ensure
+			// the UI is up-to-date with the build results
+			// monitor.subTask(ManagedMakeMessages
+			// .getResourceString(REFRESH));
+			monitor.subTask(AutotoolsPlugin.getResourceString("MakeGenerator.refresh")); //$NON-NLS-1$
+			try {
+				project.refreshLocal(IResource.DEPTH_INFINITE, null);
+			} catch (CoreException e) {
+				monitor.subTask(AutotoolsPlugin
+						.getResourceString("MakeGenerator.refresh.error")); //$NON-NLS-1$
+			}
+		} else {
+			errMsg = launcher.getErrorMessage();
+		}
+
+		// Report either the success or failure of our mission
+		buf = new StringBuffer();
+		if (errMsg != null && errMsg.length() > 0) {
+			String errorDesc = AutotoolsPlugin
+					.getResourceString("MakeGenerator.generation.error"); //$NON-NLS-1$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			buf.append(errorDesc);
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			buf.append("(").append(errMsg).append(")"); //$NON-NLS-1$ //$NON-NLS-2$
+			rc = IStatus.ERROR;
+		} else if (proc.exitValue() >= 1 || proc.exitValue() < 0) {
+			// We have an invalid return code from configuration.
+			String[] errArg = new String[2];
+			errArg[0] = Integer.toString(proc.exitValue());
+			errArg[1] = commandPath.toString();
+			errMsg = AutotoolsPlugin.getFormattedString(
+					"MakeGenerator.config.error", errArg); //$NON-NLS-1$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			buf.append(AutotoolsPlugin.getResourceString("MakeGenerator.generation.error")); //$NON-NLS-1$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			if (proc.exitValue() == 1)
+				rc = IStatus.WARNING;
+			else
+			    rc = IStatus.ERROR;
+		} else {
+			// Report a successful build
+			String successMsg = 
+				AutotoolsPlugin.getResourceString("MakeGenerator.success"); //$NON-NLS-1$
+			buf.append(successMsg);
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			rc = IStatus.OK;
+		}
+
+		// Write message on the console
+		consoleOutStream.write(buf.toString().getBytes());
+		consoleOutStream.flush();
+
+		// // Generate any error markers that the build has discovered
+		// monitor.subTask(ManagedMakeMessages
+		// .getResourceString(MARKERS));
+		// epm.reportProblems();
+		consoleOutStream.close();
+		
+		// TODO: For now, add a marker with our generated error message.
+		// In the future, we might add an error parser to do this properly
+		// and give the actual error line, etc..
+		if (rc == IStatus.ERROR) {
+			addMarker(project, -1, errMsg, SEVERITY_ERROR_BUILD, null);
+			// Mark the configuration as needing a full rebuild.
+			cfg.setRebuildState(true);
+		}
+		
+		return rc;
+	}
+	
+	// Get the path string.  We add a Win check to handle MingW.
+	// For MingW, we would rather represent C:\a\b as /C/a/b which
+	// doesn't cause Makefile to choke.
+	// TODO: further logic would be needed to handle cygwin if desired
+	private String getPathString(IPath path) {
+		String s = path.toString();
+		if (Platform.getOS().equals(Platform.OS_WIN32))
+			s = s.replaceAll("^([A-Z])(:)", "/$1");
+		return s;
+	}
+	
+	// Run an autotools script (e.g. configure, autogen.sh, config.status).
+	private int runScript(IPath commandPath, IPath runPath, String[] args,
+			String jobDescription, String errMsg, IConsole console, 
+			ArrayList<String> additionalEnvs, 
+			boolean consoleStart) throws BuildException, CoreException,
+			NullPointerException, IOException {
+		// TODO: Figure out what this next stuff is used for
+		// //try to resolve the build macros in the builder command
+		// try{
+		// String resolved =
+		// ManagedBuildManager.getBuildMacroProvider().resolveValueToMakefileFormat(
+		// configCmd,
+		// "", //$NON-NLS-1$
+		// " ", //$NON-NLS-1$
+		// IBuildMacroProvider.CONTEXT_CONFIGURATION,
+		// info.getDefaultConfiguration());
+		// if((resolved = resolved.trim()).length() > 0)
+		// configCmd = resolved;
+		// } catch (BuildMacroException e){
+		// }
+
+		int rc = IStatus.OK;
+		
+		removeAllMarkers(project);
+		
+		// We want to run the script via the shell command.  So, we add the command
+		// script as the first argument and expect "sh" to be on the runtime path.
+		// Any other arguments are placed after the script name.
+		String[] configTargets = null;
+		if (args == null)
+			configTargets = new String[1];
+		else {
+			configTargets = new String[args.length+1];
+			System.arraycopy(args, 0, configTargets, 1, args.length);
+		}
+		configTargets[0] = getPathString(commandPath);
+		
+		String[] msgs = new String[2];
+		msgs[0] = commandPath.toString();
+		msgs[1] = project.getName();
+		monitor.subTask(AutotoolsPlugin.getFormattedString(
+				"MakeGenerator.make.message", msgs)); //$NON-NLS-1$
+
+
+		ConsoleOutputStream consoleOutStream = null;
+		StringBuffer buf = new StringBuffer();
+
+		// Launch command - main invocation
+		if (consoleStart)
+			console.start(project);
+		consoleOutStream = console.getOutputStream();
+		String[] consoleHeader = new String[3];
+
+		consoleHeader[0] = jobDescription;
+		consoleHeader[1] = cfg.getName();
+		consoleHeader[2] = project.getName();
+		buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+		buf.append(jobDescription);
+		buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+		buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+
+		if (!cfg.isSupported()) {
+			String msgArgs[] = new String[1];
+			msgArgs[0] = cfg.getName();
+			buf.append(AutotoolsPlugin.getFormattedString("MakeGenerator.unsupportedConfig", msgArgs)); // $NON-NLS-1$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+		}
+		consoleOutStream.write(buf.toString().getBytes());
+		consoleOutStream.flush();
+
+		// Get a launcher for the config command
+		CommandLauncher launcher = new CommandLauncher();
+		// Set the environment
+		IEnvironmentVariable variables[] = ManagedBuildManager
+				.getEnvironmentVariableProvider().getVariables(cfg, true);
+		String[] env = null;
+		ArrayList<String> envList = new ArrayList<String>();
+		if (variables != null) {
+			for (int i = 0; i < variables.length; i++) {
+				envList.add(variables[i].getName()
+						+ "=" + variables[i].getValue()); //$NON-NLS-1$
+			}
+			if (additionalEnvs != null)
+				envList.addAll(additionalEnvs); // add any additional environment variables specified ahead of script
+			env = (String[]) envList.toArray(new String[envList.size()]);
+		}
+
+		// // Hook up an error parser manager
+		// String[] errorParsers =
+		// info.getDefaultConfiguration().getErrorParserList();
+		// ErrorParserManager epm = new ErrorParserManager(project, topBuildDir,
+		// this, errorParsers);
+		// epm.setOutputStream(consoleOutStream);
+		OutputStream stdout = consoleOutStream;
+		OutputStream stderr = consoleOutStream;
+
+		launcher.showCommand(true);
+		// Run the shell script via shell command.
+		Process proc = launcher.execute(new Path(SHELL_COMMAND), configTargets, env,
+				runPath, new NullProgressMonitor());
+		if (proc != null) {
+			try {
+				// Close the input of the process since we will never write to
+				// it
+				proc.getOutputStream().close();
+			} catch (IOException e) {
+			}
+
+			if (launcher.waitAndRead(stdout, stderr, new SubProgressMonitor(
+					monitor, IProgressMonitor.UNKNOWN)) != CommandLauncher.OK) {
+				errMsg = launcher.getErrorMessage();
+			}
+
+			// Force a resync of the projects without allowing the user to
+			// cancel.
+			// This is probably unkind, but short of this there is no way to
+			// ensure
+			// the UI is up-to-date with the build results
+			// monitor.subTask(ManagedMakeMessages
+			// .getResourceString(REFRESH));
+			monitor.subTask(AutotoolsPlugin.getResourceString("MakeGenerator.refresh")); //$NON-NLS-1$
+			try {
+				project.refreshLocal(IResource.DEPTH_INFINITE, null);
+			} catch (CoreException e) {
+				monitor.subTask(AutotoolsPlugin
+						.getResourceString("MakeGenerator.refresh.error")); //$NON-NLS-1$
+			}
+		} else {
+			errMsg = launcher.getErrorMessage();
+		}
+
+		// Report either the success or failure of our mission
+		buf = new StringBuffer();
+		if (errMsg != null && errMsg.length() > 0) {
+			String errorDesc = AutotoolsPlugin
+					.getResourceString("MakeGenerator.generation.error"); //$NON-NLS-1$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			buf.append(errorDesc);
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			buf.append("(").append(errMsg).append(")"); //$NON-NLS-1$ //$NON-NLS-2$
+			rc = IStatus.ERROR;
+		} else if (proc.exitValue() >= 1 || proc.exitValue() < 0) {
+			// We have an invalid return code from configuration.
+			String[] errArg = new String[2];
+			errArg[0] = Integer.toString(proc.exitValue());
+			errArg[1] = commandPath.toString();
+			errMsg = AutotoolsPlugin.getFormattedString(
+					"MakeGenerator.config.error", errArg); //$NON-NLS-1$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			buf.append(AutotoolsPlugin.getResourceString("MakeGenerator.generation.error")); //$NON-NLS-1$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			if (proc.exitValue() == 1)
+				rc = IStatus.WARNING;
+			else
+			    rc = IStatus.ERROR;
+		} else {
+			// Report a successful build
+			String successMsg = 
+				AutotoolsPlugin.getResourceString("MakeGenerator.success"); //$NON-NLS-1$
+			buf.append(successMsg);
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			rc = IStatus.OK;
+		}
+
+		// Write message on the console
+		consoleOutStream.write(buf.toString().getBytes());
+		consoleOutStream.flush();
+
+		// // Generate any error markers that the build has discovered
+		// monitor.subTask(ManagedMakeMessages
+		// .getResourceString(MARKERS));
+		// epm.reportProblems();
+		consoleOutStream.close();
+		
+		// TODO: For now, add a marker with our generated error message.
+		// In the future, we might add an error parser to do this properly
+		// and give the actual error line, etc..
+		if (rc == IStatus.ERROR) {
+			addMarker(project, -1, errMsg, SEVERITY_ERROR_BUILD, null);
+			// Mark the configuration as needing a full rebuild.
+			cfg.setRebuildState(true);
+		}
+		
+		return rc;
+	}
+	
+	private ICStorageElement createTargetElement(ICStorageElement parent, IMakeTarget target) {
+		ICStorageElement targetElem = parent.createChild(TARGET_ELEMENT);
+		targetElem.setAttribute(TARGET_ATTR_NAME, target.getName());
+		targetElem.setAttribute(TARGET_ATTR_ID, target.getTargetBuilderID());
+		targetElem.setAttribute(TARGET_ATTR_PATH, target.getContainer().getProjectRelativePath().toString());
+		ICStorageElement elem = targetElem.createChild(TARGET_COMMAND);
+		elem.setValue(target.getBuildAttribute(IMakeCommonBuildInfo.BUILD_COMMAND, "make")); //$NON-NLS-1$
+
+		String targetAttr = target.getBuildAttribute(IMakeCommonBuildInfo.BUILD_ARGUMENTS, null);
+		if ( targetAttr != null) {
+			elem = targetElem.createChild(TARGET_ARGUMENTS);
+			elem.setValue(targetAttr);
+		}
+
+		targetAttr = target.getBuildAttribute(IMakeTarget.BUILD_TARGET, null);
+		if (targetAttr != null) {
+			elem = targetElem.createChild(TARGET);
+			elem.setValue(targetAttr);
+		}
+
+		elem = targetElem.createChild(TARGET_STOP_ON_ERROR);
+		elem.setValue(new Boolean(target.isStopOnError()).toString());
+
+		elem = targetElem.createChild(TARGET_USE_DEFAULT_CMD);
+		elem.setValue(new Boolean(target.isDefaultBuildCmd()).toString());
+
+		elem = targetElem.createChild(TARGET_RUN_ALL_BUILDERS);
+		elem.setValue(new Boolean(target.runAllBuilders()).toString());
+
+		return targetElem;
+	}
+
+	/**
+	 * This output method saves the information into the .cdtproject metadata file.
+	 * 
+	 * @param doc
+	 * @throws CoreException
+	 */
+	private void saveTargets(IMakeTarget[] makeTargets) throws CoreException {
+		ICDescriptor descriptor = CCorePlugin.getDefault().getCProjectDescription(getProject(), true);
+		ICStorageElement rootElement = descriptor.getProjectStorageElement(MAKE_TARGET_KEY);
+
+		//Nuke the children since we are going to write out new ones
+		rootElement.clear();
+
+		// Fetch the ProjectTargets as ICStorageElements
+		rootElement = rootElement.createChild(BUILD_TARGET_ELEMENT);
+		for (int i = 0; i < makeTargets.length; ++i)
+			createTargetElement(rootElement, makeTargets[i]);
+
+		//Save the results
+		descriptor.saveProjectData();
+	}
+	
+
+	protected class MakeTargetComparator implements Comparator<Object> {
+		public int compare(Object a, Object b) {
+			IMakeTarget make1 = (IMakeTarget)a;
+			IMakeTarget make2 = (IMakeTarget)b;
+			return make1.getName().compareToIgnoreCase(make2.getName());
+		}
+		
+	}
+
+	/**
+	 * This method parses the given Makefile and produces MakeTargets for all targets so the
+	 * end-user can access them from the MakeTargets popup-menu.
+	 * 
+	 * @param makefileFile the Makefile to parse
+	 * @throws CoreException
+	 */
+	private void addMakeTargetsToManager(File makefileFile) throws CoreException {
+		// Return immediately if no Makefile.
+		if (makefileFile == null || !makefileFile.exists())
+			return;
+		
+		checkCancel();
+		if (monitor == null)
+			monitor = new NullProgressMonitor();
+		String statusMsg = AutotoolsPlugin.getResourceString("MakeGenerator.refresh.MakeTargets");	//$NON-NLS-1$
+		monitor.subTask(statusMsg);
+		
+		IMakeTargetManager makeTargetManager = 
+			MakeCorePlugin.getDefault().getTargetManager();
+		
+		IMakefile makefile = MakeCorePlugin.createMakefile(makefileFile.toURI(), false, null);
+		ITargetRule[] targets = makefile.getTargetRules();
+		ITarget target = null;
+		Map<String, IMakeTarget> makeTargets = new HashMap<String, IMakeTarget>(); // use a HashMap so duplicate names are handled
+		for (int i = 0; i < targets.length; i++) {
+			target = targets[i].getTarget();
+			String targetName = target.toString();
+			if (!isValidTarget(targetName, makeTargetManager))
+				continue;
+			try {
+				IMakeTarget makeTarget = makeTargetManager.createTarget(
+						project, targetName, "org.eclipse.linuxtools.cdt.autotools.builder1"); //$NON-NLS-1$
+				makeTarget.setContainer(project);
+				makeTarget.setStopOnError(true);
+				makeTarget.setRunAllBuilders(false);
+				makeTarget.setUseDefaultBuildCmd(true);
+
+				makeTarget.setBuildAttribute(GENERATED_TARGET, "true");
+				makeTarget.setBuildAttribute(IMakeTarget.BUILD_TARGET,
+						targetName);
+
+				makeTarget.setBuildAttribute(IMakeTarget.BUILD_LOCATION,
+						buildDir);
+				makeTargets.put(makeTarget.getName(), makeTarget);
+			} catch (CoreException e) {
+				// Duplicate target.  Ignore.
+			}
+		}
+		
+		IMakeTarget[] makeTargetArray = new IMakeTarget[makeTargets.size()];
+		Collection<IMakeTarget> values = makeTargets.values();
+		ArrayList<IMakeTarget> valueList = new ArrayList<IMakeTarget>(values);
+		valueList.toArray(makeTargetArray);
+		MakeTargetComparator compareMakeTargets = new MakeTargetComparator();
+		Arrays.sort(makeTargetArray, compareMakeTargets);
+		
+		saveTargets(makeTargetArray);
+	}
+
+	private boolean isValidTarget(String targetName, IMakeTargetManager makeTargetManager) {
+		return !(targetName.endsWith("-am") //$NON-NLS-1$
+				|| targetName.endsWith("PROGRAMS") //$NON-NLS-1$
+				|| targetName.endsWith("-generic") //$NON-NLS-1$
+				|| (targetName.indexOf('$') >= 0)
+				|| (targetName.charAt(0) == '.')
+				|| targetName.equals(targetName.toUpperCase()));
+	}
+	
+	// Turn the string into an array.
+	private String[] makeArray(String string) {
+		string = string.trim();
+		char[] array = string.toCharArray();
+		ArrayList<String> aList = new ArrayList<String>();
+		StringBuilder buffer = new StringBuilder();
+		boolean inComment = false;
+		for (int i = 0; i < array.length; i++) {
+			char c = array[i];
+			boolean needsToAdd = true;
+			if (array[i] == '"' || array[i] == '\'') {
+				if (i > 0 && array[i - 1] == '\\') {
+					inComment = false;
+				} else {
+					inComment = !inComment;
+					needsToAdd = false; // skip it
+				}
+			}
+			if (c == ' ' && !inComment) {
+				if (buffer.length() > 0){
+					String str = buffer.toString().trim();
+					if(str.length() > 0){
+						aList.add(str);
+					}
+				}
+				buffer = new StringBuilder();
+			} else {
+				if (needsToAdd)
+					buffer.append(c);
+			}
+		}
+		if (buffer.length() > 0){
+			String str = buffer.toString().trim();
+			if(str.length() > 0){
+				aList.add(str);
+			}
+		}
+		return (String[])aList.toArray(new String[aList.size()]);
+	}
+
+}
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/Resources.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/Resources.properties
new file mode 100644
index 0000000..7b4c917
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/Resources.properties
@@ -0,0 +1,95 @@
+#################################################################################
+#  Copyright (c) 2006, 2007 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+# 
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#      IBM Rational Software - ManagedMakeMessages copied to AutotoolsMakefileBuilder
+#################################################################################
+MakeCWizard.title=C/Make Project
+MakeCWizard.description=Create a New C Project using 'make' to build it
+
+WARNING_UNSUPPORTED_CONFIGURATION=Warning: unsupported configuration
+
+AutotoolsMakefileBuilder.message.finished=Build complete for project {0}
+AutotoolsMakefileBuilder.type.clean=Clean-only build
+AutotoolsMakefileBuilder.message.clean.deleting.output=Removing build artifacts from {0}
+AutotoolsMakefileBuilder.message.console.header=**** {0} of configuration {1} for project {2} ****
+
+MakeGenerator.makefile.built=Makefile built
+MakeGenerator.refresh=Refresh
+MakeGenerator.refresh.error=Refresh error
+MakeGenerator.generation.error=Configuration failed with error
+MakeGenerator.configuring=Configuring
+MakeGenerator.createdir.error=Error creating build directory: {0}
+MakeGenerator.make.message=Invoking {0} for project {1}
+MakeGenerator.config.error=Error {0} occurred while running {1}
+MakeGenerator.run.config.status=Running config.status
+MakeGenerator.makefile.cvs=Invoking Makefile.cvs
+MakeGenerator.autogen.sh=Invoking autogen.sh
+MakeGenerator.autoreconf=Invoking autoreconf
+MakeGenerator.gen.makefile=Generating Makefile
+MakeGenerator.gen.configure=Generating configure
+MakeGenerator.unsupportedConfig=Warning: unsupported configuration {0}
+MakeGenerator.success=[Operation successful]
+MakeGenerator.didnt.generate=No Makefile generated
+MakeGenerator.refresh.MakeTargets=Refreshing Make Targets
+MakeGenerator.clean.builddir=Cleaning build directory before reconfiguring
+
+
+BuildDir.apply=Build directory already in use
+BuildDir.default=Default build directory to unused value?
+BuildDir.yes=Yes
+BuildDir.no=No
+
+WizardAutotoolsProjectConversion.title=Convert to a CVS C/C++ Autotools Project
+WizardAutotoolsProjectConversion.description=Convert a CVS source repository to C/C++ Autotools Project
+WizardAutotoolsProjectConversion.message.add_nature=Adding C/C++ Autotools Managed Project Nature
+WizardAutotoolsProjectConversion.message.add_builder=Adding C/C++ Autotools Managed Project Builder
+WizardMakeProjectConversion.monitor.convertingToMakeProject=Converting Project...
+WizardAutotoolsConversion=CVS C/C++ Autotools Conversion
+WizardAutotoolsConversion.windowTitle=Conversion to CVS C/C++ Autotools Project
+WizardAutotoolsConversion.config.title=Select a configuration
+WizardAutotoolsConversion.config.desc=Select the configuration you wish to deploy on
+WizardAutotoolsConversion.options.title=Additional Project Settings
+WizardAutotoolsConversion.options.desc=Define the inter-project dependencies, if any.
+WizardAutotoolsConversion.message.save=Saving new build options
+
+WizardAutotoolsNewCProject.title=Autotools C Project
+WizardAutotoolsNewCProject.description=Create a new C Autotools project
+WizardAutotoolsNewCProject.monitor.creatingProject=Creating Project...
+WizardAutotoolsNewCProject.windowTitle=GNU Autotools C Project
+WizardAutotoolsNewCProject.config.title=Select a configuration
+WizardAutotoolsNewCProject.config.desc=Select the configuration you wish to deploy on
+WizardAutotoolsNewCProject.options.title=Additional Project Settings
+WizardAutotoolsNewCProject.options.desc=Define the inter-project dependencies, if any.
+WizardAutotoolsNewCProject.message.save=Saving new build options
+
+WizardAutotoolsNewCCProject.title=Autotools C++ Project
+WizardAutotoolsNewCCProject.description=Create a new C++ Autotools project
+WizardAutotoolsNewCCProject.monitor.creatingProject=Creating Project...
+WizardAutotoolsNewCCProject.windowTitle=GNU Autotools C++ Project
+WizardAutotoolsNewCCProject.config.title=Select a configuration
+WizardAutotoolsNewCCProject.config.desc=Select the configuration you wish to deploy on
+WizardAutotoolsNewCCProject.options.title=Additional Project Settings
+WizardAutotoolsNewCCProject.options.desc=Define the inter-project dependencies, if any.
+WizardAutotoolsNewCCProject.message.save=Saving new build options
+
+
+BuildTargetDialog.title.buildTarget=Build Special Targets
+BuildTargetDialog.title.makeTargetsFor=Make targets for 
+BuildTargetDialog.button.build=Build
+
+TargetListViewer.button.add=Add...
+TargetListViewer.button.remove=Remove
+TargetListViewer.button.edit=Edit...
+TargetListViewer.label.target=Target
+TargetListViewer.label.location=Location
+TargetListViewer.exception.error=Error
+TargetListViewer.exception.message=An error occurred performing the selected action
+
+AutotoolsPreferencePage.useAutotoolsFileScanner.label=Use make -w for includepath scanning
+MakeTargetPreferencePage.buildTargetInBackground.label=Build target in background
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractAutotoolsHandler.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractAutotoolsHandler.java
new file mode 100644
index 0000000..be54ee8
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractAutotoolsHandler.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import java.util.Collection;
+
+import org.eclipse.cdt.core.model.ICContainer;
+import org.eclipse.cdt.core.model.ICElement;
+import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IResource;
+
+public abstract class AbstractAutotoolsHandler extends AbstractHandler {
+	
+	@SuppressWarnings("unchecked")
+	protected IContainer getContainer(IEvaluationContext e) {
+		IContainer fContainer = null;
+
+		Object obj = e.getDefaultVariable();
+		if (obj instanceof Collection) {
+			Collection<Object> c = (Collection<Object>)obj;
+			Object[] objArray = c.toArray();
+			if (objArray.length > 0)
+				obj = objArray[0];
+		}
+		if (obj instanceof ICElement) {
+			if ( obj instanceof ICContainer || obj instanceof ICProject) {
+				fContainer = (IContainer) ((ICElement) obj).getUnderlyingResource();
+			} else {
+				obj = ((ICElement)obj).getResource();
+				if ( obj != null) {
+					fContainer = ((IResource)obj).getParent();
+				}
+			}
+		} else if (obj instanceof IResource) {
+			if (obj instanceof IContainer) {
+				fContainer = (IContainer) obj;
+			} else {
+				fContainer = ((IResource)obj).getParent();
+			}
+		} else {
+			fContainer = null;
+		}
+		return fContainer;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractTargetAction.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractTargetAction.java
new file mode 100644
index 0000000..367d63a
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractTargetAction.java
@@ -0,0 +1,93 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2004 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.cdt.core.model.ICContainer;
+import org.eclipse.cdt.core.model.ICElement;
+import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.linuxtools.cdt.autotools.AutotoolsMakefileBuilder;
+import org.eclipse.linuxtools.cdt.autotools.AutotoolsPlugin;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IObjectActionDelegate;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.eclipse.ui.actions.ActionDelegate;
+
+
+public abstract class AbstractTargetAction
+	extends ActionDelegate
+	implements IObjectActionDelegate, IWorkbenchWindowActionDelegate {
+	private IWorkbenchPart fPart;
+	private IWorkbenchWindow fWindow;
+	private IContainer fContainer;
+
+	protected Shell getShell() {
+		if (fPart != null) {
+			return fPart.getSite().getShell();
+		} else if (fWindow != null) {
+			return fWindow.getShell();
+		}
+		return AutotoolsPlugin.getActiveWorkbenchShell();
+	}
+
+	protected IContainer getSelectedContainer() {
+		return fContainer;
+	}
+
+	public void setSelectedContainer(IContainer container) {
+		fContainer = container;
+	}
+	
+	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
+		fPart = targetPart;
+	}
+
+	public void init(IWorkbenchWindow window) {
+		fWindow = window;
+	}
+
+	public void selectionChanged(IAction action, ISelection selection) {
+		boolean enabled = false;
+		if (selection instanceof IStructuredSelection) {
+			IStructuredSelection sel = (IStructuredSelection) selection;
+			Object obj = sel.getFirstElement();
+			if (obj instanceof ICElement) {
+				if ( obj instanceof ICContainer || obj instanceof ICProject) {
+					fContainer = (IContainer) ((ICElement) obj).getUnderlyingResource();
+				} else {
+					obj = ((ICElement)obj).getResource();
+					if ( obj != null) {
+						fContainer = ((IResource)obj).getParent();
+					}
+				}
+			} else if (obj instanceof IResource) {
+				if (obj instanceof IContainer) {
+					fContainer = (IContainer) obj;
+				} else {
+					fContainer = ((IResource)obj).getParent();
+				}
+			} else {
+				fContainer = null;
+			}
+			if (fContainer != null && AutotoolsMakefileBuilder.hasTargetBuilder(fContainer.getProject())) {
+				enabled = true;
+			}
+		}
+		action.setEnabled(enabled);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AclocalHandler.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AclocalHandler.java
new file mode 100644
index 0000000..b534cfe
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AclocalHandler.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+/**
+ * @author Jeff Johnston
+ *
+ */
+public class AclocalHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		InvokeAclocalAction a = new InvokeAclocalAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AutoconfHandler.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AutoconfHandler.java
new file mode 100644
index 0000000..9dc28e2
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AutoconfHandler.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+public class AutoconfHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		InvokeAutoconfAction a = new InvokeAutoconfAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AutoheaderHandler.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AutoheaderHandler.java
new file mode 100644
index 0000000..e64ad41
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AutoheaderHandler.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+/**
+ * @author Jeff Johnston
+ *
+ */
+public class AutoheaderHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		InvokeAutoheaderAction a = new InvokeAutoheaderAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AutomakeHandler.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AutomakeHandler.java
new file mode 100644
index 0000000..c1bbcf4
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AutomakeHandler.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+public class AutomakeHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		InvokeAutomakeAction a = new InvokeAutomakeAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AutoreconfHandler.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AutoreconfHandler.java
new file mode 100644
index 0000000..d9b0c8c
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AutoreconfHandler.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+/**
+ * @author Jeff Johnston
+ *
+ */
+public class AutoreconfHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		InvokeAutoreconfAction a = new InvokeAutoreconfAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java
new file mode 100644
index 0000000..0834ef4
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyConstants;
+import org.eclipse.swt.widgets.Shell;
+
+
+public class InvokeAclocalAction extends InvokeAction {
+
+	private static final String DEFAULT_OPTION = ""; //$NON-NLS-1$
+	private static final String DEFAULT_COMMAND = "aclocal"; //$NON-NLS-1$
+
+	public void run(IAction action) {
+
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+		
+		IPath execDir = getExecDir(container);
+		String cwd = InvokeMessages.getString("CWD") + getCWD(container); //$NON-NLS-1$
+
+		TwoInputDialog optionDialog = new TwoInputDialog(
+				new Shell(),
+				cwd,
+				InvokeMessages
+						.getString("InvokeAclocalAction.windowTitle.options"), //$NON-NLS-1$
+				InvokeMessages
+						.getString("InvokeAclocalAction.message.options.otherOptions"), //$NON-NLS-1$
+				InvokeMessages
+						.getString("InvokeAclocalAction.message.options.includeDir"), DEFAULT_OPTION, null); //$NON-NLS-1$
+
+		optionDialog.open();
+
+		// chop args into string array
+		String rawArgList = optionDialog.getValue();
+
+		String[] optionsList = separateOptions(rawArgList);
+
+		// chop args into string array
+		rawArgList = optionDialog.getSecondValue();
+
+		String[] targetList = separateTargets(rawArgList);
+
+		if (targetList == null) {
+
+			showError(InvokeMessages
+					.getString("InvokeAction.execute.windowTitle.error"), //$NON-NLS-1$
+					InvokeMessages
+							.getString("InvokeAction.windowTitle.quoteError")); //$NON-NLS-1$
+			return;
+		}
+
+		int iOption = 0;
+		if (targetList.length > 0)
+			iOption = 1;
+
+		String[] argumentList = new String[targetList.length
+				+ optionsList.length + iOption];
+
+		System.arraycopy(optionsList, 0, argumentList, 0, optionsList.length);
+
+		if (iOption == 1)
+			argumentList[optionsList.length] = "-I"; //$NON-NLS-1$
+
+		System.arraycopy(targetList, 0, argumentList, optionsList.length
+				+ iOption, targetList.length);
+
+		if (container != null) {
+			String aclocalCommand = null;
+			IProject project = getSelectedContainer().getProject();
+			try {
+				aclocalCommand = project.getPersistentProperty(AutotoolsPropertyConstants.ACLOCAL_TOOL);
+			} catch (CoreException e) {
+				// do nothing
+			}
+			
+			// If unset, use default system path
+			if (aclocalCommand == null)
+				aclocalCommand = DEFAULT_COMMAND;
+			
+			executeConsoleCommand(DEFAULT_COMMAND, aclocalCommand,
+					argumentList, execDir);
+		}
+	}
+
+	public void dispose() {
+
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java
new file mode 100644
index 0000000..0197973
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java
@@ -0,0 +1,442 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007, 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.StringTokenizer;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.CommandLauncher;
+import org.eclipse.cdt.core.ConsoleOutputStream;
+import org.eclipse.cdt.core.envvar.IEnvironmentVariable;
+import org.eclipse.cdt.core.resources.IConsole;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.core.runtime.jobs.ISchedulingRule;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.linuxtools.cdt.autotools.AutotoolsPlugin;
+import org.eclipse.linuxtools.cdt.autotools.MakeGenerator;
+import org.eclipse.swt.widgets.Shell;
+
+public abstract class InvokeAction extends AbstractTargetAction {
+
+	protected void showInformation(String title, String content) {
+
+		MessageDialog.openInformation(new Shell(), title, content);
+	}
+
+	protected void showError(String title, String content) {
+
+		MessageDialog.openError(new Shell(), title, content);
+	}
+
+	protected void showSuccess(String title) {
+		MessageDialog.openInformation(new Shell(), title, 
+				InvokeMessages.getString("InvokeAction.success")); //$NON-NLS-1$
+	}
+	
+	protected String showInput(String title, String content, String defaultTxt) {
+		InputDialog getOptionDialog = new InputDialog(new Shell(), title,
+				content, defaultTxt, null);
+
+		getOptionDialog.open();
+
+		return getOptionDialog.getValue();
+	}
+
+	/**
+	 * Separate targets to array from a string.
+	 * 
+	 * @param rawArgList
+	 * @return targets in string[] array. if targets are not formatted properly,
+	 *         returns null
+	 */
+	protected String[] separateTargets(String rawArgList) {
+
+		StringTokenizer st = new StringTokenizer(rawArgList, " "); //$NON-NLS-1$
+		ArrayList<String> targetList = new ArrayList<String>();
+
+		while (st.hasMoreTokens()) {
+			String currentWord = st.nextToken().trim();
+
+			if (currentWord.startsWith("'")) { //$NON-NLS-1$
+				String tmpTarget = ""; //$NON-NLS-1$
+				while (!currentWord.endsWith("'")) { //$NON-NLS-1$
+					tmpTarget += currentWord + " "; //$NON-NLS-1$
+					if (!st.hasMoreTokens()) {
+						// quote not closed properly, so return null
+						return null;
+					}
+					currentWord = st.nextToken().trim();
+				}
+
+				tmpTarget += currentWord;
+				targetList.add(tmpTarget);
+				continue;
+			}
+
+			if (currentWord.startsWith("\"")) { //$NON-NLS-1$
+				String tmpTarget = ""; //$NON-NLS-1$
+				while (!currentWord.endsWith("\"")) { //$NON-NLS-1$
+					tmpTarget += currentWord + " "; //$NON-NLS-1$
+					if (!st.hasMoreTokens()) {
+						// double quote not closed properly, so return null
+						return null;
+					}
+					currentWord = st.nextToken().trim();
+				}
+
+				tmpTarget += currentWord;
+				targetList.add(tmpTarget);
+				continue;
+			}
+
+			// for targets without quote/double quotes.
+			targetList.add(currentWord);
+
+		}
+
+		return (String[])targetList.toArray(new String[targetList.size()]);
+	}
+
+	protected String[] separateOptions(String rawArgList) {
+		ArrayList<String> argList = new ArrayList<String>();
+		// May be multiple user-specified options in which case we
+		// need to split them up into individual options
+		rawArgList = rawArgList.trim();
+		boolean finished = false;
+		int lastIndex = rawArgList.indexOf("--"); //$NON-NLS-1$
+		if (lastIndex != -1) {
+			while (!finished) {
+				int index = rawArgList.indexOf("--", lastIndex + 2); //$NON-NLS-1$
+				if (index != -1) {
+					String previous = rawArgList.substring(lastIndex, index)
+							.trim();
+					argList.add(previous);
+					rawArgList = rawArgList.substring(index);
+				} else {
+					argList.add(rawArgList);
+					finished = true;
+				}
+			}
+		}
+
+		return (String[])argList.toArray(new String[argList.size()]);
+
+	}
+
+	protected String[] simpleParseOptions(String rawArgList) {
+		ArrayList<String> argList = new ArrayList<String>();
+		int lastArgIndex = -1;
+		int i = 0;
+		while (i < rawArgList.length()) {
+			char ch = rawArgList.charAt(i);
+			// Skip white-space
+			while (Character.isWhitespace(ch)) {
+				++i;
+				if (i < rawArgList.length())
+					ch = rawArgList.charAt(i);
+				else // Otherwise we are done
+					return argList.toArray(new String[argList.size()]);
+			}
+
+			// Simplistic parser.  We break up into strings delimited
+			// by blanks.  If quotes are used, we ignore blanks within.
+			// If a backslash is used, we ignore the next character and
+			// pass it through.
+			lastArgIndex = i;
+			boolean inString = false;
+			while (i < rawArgList.length()) {
+				ch = rawArgList.charAt(i);
+				if (ch == '\\') // escape character
+					++i; // skip over the next character
+				else if (ch == '\"') { // double quotes
+					inString = !inString;
+				} else if (Character.isWhitespace(ch)) {
+					if (!inString) {
+						argList.add(rawArgList.substring(lastArgIndex, i));
+						break;
+					}
+				}
+				++i;
+			}
+			// Look for the case where we ran out of chars for the last
+			// token.
+			if (i >= rawArgList.length())
+				argList.add(rawArgList.substring(lastArgIndex));
+			++i;
+		}
+		return argList.toArray(new String[argList.size()]);
+	}
+
+	protected IPath getExecDir(IContainer container) {
+		int type = container.getType();
+		IPath execDir = null;
+		if (type == IContainer.FILE) {
+			execDir = container.getLocation().removeLastSegments(1);
+		} else {
+			execDir = container.getLocation();
+		}
+		return execDir;
+	}
+	
+	protected IPath getCWD(IContainer container) {
+		int type = container.getType();
+		IPath cwd = null;
+		if (type == IContainer.FILE) {
+			cwd = container.getFullPath().removeLastSegments(1);
+		} else {
+			cwd = container.getFullPath();
+		}
+		return cwd;
+	}
+	
+	private class ExecuteProgressDialog implements IRunnableWithProgress {
+		private IPath command;
+		private String[] argumentList;
+		private String[] envList;
+		private IPath execDir;
+		private int status;
+		private HashMap<String, String> outputs = null;
+		
+		public ExecuteProgressDialog(IPath command, String[] argumentList,
+				String[] envList, IPath execDir) {
+			this.command = command;
+			this.argumentList = argumentList;
+			this.envList = envList;
+			this.execDir = execDir;
+		}
+
+		public void run(IProgressMonitor monitor)
+		throws InvocationTargetException, InterruptedException {
+			ByteArrayOutputStream stdout = new ByteArrayOutputStream();
+			ByteArrayOutputStream stderr = new ByteArrayOutputStream();
+			CommandLauncher cmdL = new CommandLauncher();
+			outputs = null;
+
+			// invoke command
+			try {
+				monitor.beginTask(
+						InvokeMessages.getFormattedString("InvokeAction.progress.message", // $NON-NLS-1$
+								new String[]{command.toOSString()}), IProgressMonitor.UNKNOWN);
+				monitor.worked(1);
+				Process process = cmdL.execute(command, argumentList, envList,
+						execDir, new NullProgressMonitor());
+
+				if (cmdL.waitAndRead(stdout, stderr) == CommandLauncher.OK) {
+					try {
+						status = 0;
+						monitor.done();
+						process.getOutputStream().close();
+					} catch (IOException e) {
+						// ignore
+					}
+				} else {
+					// failed to execute command
+					status = -1;
+					monitor.done();
+					return;
+				}
+			} catch (CoreException e) {
+				monitor.done();
+				throw new InvocationTargetException(e);
+			}
+
+			outputs = new HashMap<String, String>();
+
+			outputs.put("stdout", stdout.toString()); //$NON-NLS-1$
+			outputs.put("stderr", stderr.toString()); //$NON-NLS-1$
+
+			try {
+				stdout.close();
+				stderr.close();
+			} catch (IOException e) {
+				// ignore
+			}
+		}
+			
+		public HashMap<String, String> getOutputs() {
+			return outputs;
+		}
+		
+		public int getStatus() {
+			return status;
+		}
+	}
+	
+	
+	protected HashMap<String, String> executeCommand(IPath command,
+			String[] argumentList, String[] envList, IPath execDir) {
+		try {
+			ExecuteProgressDialog d = new ExecuteProgressDialog(command,
+					argumentList, envList, execDir);
+			new ProgressMonitorDialog(new Shell()).run(false, false, d);
+			if (d.getStatus() == -1)
+				showError(InvokeMessages
+					.getString("InvokeAction.execute.windowTitle.error"), InvokeMessages //$NON-NLS-1$
+					.getString("InvokeAction.execute.message") //$NON-NLS-1$
+					+ command.toOSString()); //$NON-NLS-1$
+			return d.getOutputs();
+		} catch (InvocationTargetException e) {
+			showError(InvokeMessages
+					.getString("InvokeAction.execute.windowTitle.error"), InvokeMessages //$NON-NLS-1$
+					.getString("InvokeAction.execute.message") //$NON-NLS-1$
+					+ command.toOSString()); //$NON-NLS-1$
+			AutotoolsPlugin.logException(e);
+			return null;
+		} catch (InterruptedException e) {
+		    return null;
+		}
+	}
+
+	protected void executeConsoleCommand(final String actionName, final String command,
+			final String[] argumentList, final IPath execDir) {
+		// We need to use a workspace root scheduling rule because adding MakeTargets
+		// may end up saving the project description which runs under a workspace root rule.
+		final ISchedulingRule rule = ResourcesPlugin.getWorkspace().getRoot();
+
+		Job backgroundJob = new Job(actionName) {
+			/* (non-Javadoc)
+			 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
+			 */
+			protected IStatus run(IProgressMonitor monitor) {
+				try {
+					ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
+
+						public void run(IProgressMonitor monitor) throws CoreException {
+							try {
+								String errMsg = null;
+								IProject project = getSelectedContainer().getProject();
+								// Get a build console for the project
+								IConsole console = CCorePlugin.getDefault().getConsole("org.eclipse.linuxtools.cdt.autotools.autotoolsConsole"); //$NON-NLS-1$
+								console.start(project);
+								ConsoleOutputStream consoleOutStream = console.getOutputStream();
+								// FIXME: we want to remove need for ManagedBuilderManager, but how do we
+								// get environment variables.
+								IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+								IConfiguration cfg = info.getDefaultConfiguration();
+
+								StringBuffer buf = new StringBuffer();
+								String[] consoleHeader = new String[3];
+
+								consoleHeader[0] = actionName;
+								consoleHeader[1] = cfg.getName();
+								consoleHeader[2] = project.getName();
+								buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+								String invokeMsg = InvokeMessages.getFormattedString("InvokeAction.console.message", //$NON-NLS-1$
+										new String[]{actionName, execDir.toString()}); //$NON-NLS-1$
+								buf.append(invokeMsg);
+								buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+								buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+								consoleOutStream.write(buf.toString().getBytes());
+								consoleOutStream.flush();
+								
+								ArrayList<String> additionalEnvs = new ArrayList<String>();
+								String strippedCommand = MakeGenerator.stripEnvVars(command, additionalEnvs);
+								// Get a launcher for the config command
+								CommandLauncher launcher = new CommandLauncher();
+								// Set the environment
+								IEnvironmentVariable variables[] = ManagedBuildManager
+										.getEnvironmentVariableProvider().getVariables(cfg, true);
+								String[] env = null;
+								ArrayList<String> envList = new ArrayList<String>();
+								if (variables != null) {
+									for (int i = 0; i < variables.length; i++) {
+										envList.add(variables[i].getName()
+												+ "=" + variables[i].getValue()); //$NON-NLS-1$
+									}
+									if (additionalEnvs.size() > 0)
+										envList.addAll(additionalEnvs); // add any additional environment variables specified ahead of script
+									env = (String[]) envList.toArray(new String[envList.size()]);
+								}
+								OutputStream stdout = consoleOutStream;
+								OutputStream stderr = consoleOutStream;
+
+								launcher.showCommand(true);
+								// Run the shell script via shell command.
+								Process proc = launcher.execute(new Path(strippedCommand), argumentList, env,
+										execDir, new NullProgressMonitor());
+								if (proc != null) {
+									try {
+										// Close the input of the process since we will never write to
+										// it
+										proc.getOutputStream().close();
+									} catch (IOException e) {
+									}
+
+									if (launcher.waitAndRead(stdout, stderr, new SubProgressMonitor(
+											monitor, IProgressMonitor.UNKNOWN)) != CommandLauncher.OK) {
+										errMsg = launcher.getErrorMessage();
+									}
+
+									// Force a resync of the projects without allowing the user to
+									// cancel.
+									// This is probably unkind, but short of this there is no way to
+									// ensure
+									// the UI is up-to-date with the build results
+									// monitor.subTask(ManagedMakeMessages
+									// .getResourceString(REFRESH));
+									monitor.subTask(AutotoolsPlugin.getResourceString("MakeGenerator.refresh")); //$NON-NLS-1$
+									try {
+										project.refreshLocal(IResource.DEPTH_INFINITE, null);
+									} catch (CoreException e) {
+										monitor.subTask(AutotoolsPlugin
+												.getResourceString("MakeGenerator.refresh.error")); //$NON-NLS-1$
+									}
+								} else {
+									errMsg = launcher.getErrorMessage();
+								}
+								
+								if (errMsg != null)
+									AutotoolsPlugin.logErrorMessage(errMsg);
+								
+							} catch (IOException e) {
+								AutotoolsPlugin.log(e);
+							}
+						}
+					}, rule, IWorkspace.AVOID_UPDATE, monitor);
+				} catch (CoreException e) {
+					return e.getStatus();
+				}
+				IStatus returnStatus = Status.OK_STATUS;
+				return returnStatus;
+			}
+		};
+
+		backgroundJob.setRule(rule);
+		backgroundJob.schedule();
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoconfAction.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoconfAction.java
new file mode 100644
index 0000000..6440dfa
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoconfAction.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyConstants;
+
+
+/**
+ * Class responsible for invoking autoconf.
+ * 
+ * @author klee
+ * 
+ */
+public class InvokeAutoconfAction extends InvokeAction {
+
+	private final static String DEFAULT_COMMAND = "autoconf"; //$NON-NLS-1$
+	public void run(IAction action) {
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+		
+		IPath execDir = getExecDir(container);
+
+		if (container != null) {
+			IProject project = container.getProject();
+			String autoconfCommand = null;
+			try {
+				autoconfCommand = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_TOOL);
+			} catch (CoreException e) {
+				// do nothing
+			}
+			
+			// If unset for the project, default to system path
+			if (autoconfCommand == null)
+				autoconfCommand = DEFAULT_COMMAND;
+			
+			executeConsoleCommand(DEFAULT_COMMAND, autoconfCommand, new String[]{}, execDir);
+		}
+	}
+
+
+	public void dispose() {
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoheaderAction.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoheaderAction.java
new file mode 100644
index 0000000..1057d45
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoheaderAction.java
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyConstants;
+import org.eclipse.swt.widgets.Shell;
+
+
+public class InvokeAutoheaderAction extends InvokeAction {
+
+	private static final String DEFAULT_OPTION = ""; //$NON-NLS-1$
+	private static final String DEFAULT_COMMAND = "autoheader"; //$NON-NLS-1$
+
+	public void run(IAction action) {
+
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+		
+		IPath execDir = getExecDir(container);
+		String cwd = InvokeMessages.getString("CWD") + getCWD(container); //$NON-NLS-1$
+
+		InputDialog optionDialog = new SingleInputDialog(
+				new Shell(),
+				cwd,
+				InvokeMessages
+						.getString("InvokeAutoheaderAction.windowTitle.options"), //$NON-NLS-1$
+				InvokeMessages
+						.getString("InvokeAutoheaderAction.message.options.otherOptions"), //$NON-NLS-1$
+				DEFAULT_OPTION, null);
+		optionDialog.open();
+
+		// chop args into string array
+		String rawArgList = optionDialog.getValue();
+
+		String[] optionsList = simpleParseOptions(rawArgList);
+
+		String[] argumentList = new String[optionsList.length];
+
+		System.arraycopy(optionsList, 0, argumentList, 0, optionsList.length);
+
+		if (container != null) {
+			String autoheaderCommand = null;
+			IProject project = getSelectedContainer().getProject();
+			try {
+				autoheaderCommand = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOHEADER_TOOL);
+			} catch (CoreException e) {
+				// do nothing
+			}
+			
+			// If unset, use default system path
+			if (autoheaderCommand == null)
+				autoheaderCommand = DEFAULT_COMMAND;
+			
+			executeConsoleCommand(DEFAULT_COMMAND, autoheaderCommand,
+					argumentList, execDir);
+		}
+
+	}
+
+	public void dispose() {
+
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java
new file mode 100644
index 0000000..2e97384
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java
@@ -0,0 +1,98 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyConstants;
+import org.eclipse.swt.widgets.Shell;
+
+
+/**
+ * Class responsible for invoking automake.
+ * 
+ * @author klee
+ * 
+ */
+public class InvokeAutomakeAction extends InvokeAction {
+
+	private static final String DEFAULT_OPTION = ""; //$NON-NLS-1$
+	private static final String DEFAULT_COMMAND = "automake"; //$NON-NLS-1$
+
+	public void run(IAction action) {
+
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+		
+		IPath execDir = getExecDir(container);
+		String cwd = InvokeMessages.getString("CWD") + getCWD(container); //$NON-NLS-1$
+;
+		TwoInputDialog optionDialog = new TwoInputDialog(new Shell(), cwd,
+		InvokeMessages
+		.getString("InvokeAutomakeAction.windowTitle.options"), //$NON-NLS-1$
+InvokeMessages
+		.getString("InvokeAutomakeAction.message.options.otherOptions"),InvokeMessages //$NON-NLS-1$
+		.getString("InvokeAutomakeAction.message.options.makeTargets"), DEFAULT_OPTION, null); //$NON-NLS-1$
+		
+		optionDialog.open();
+		
+		// chop args into string array
+		String rawArgList = optionDialog.getValue();
+
+		String[] optionsList = separateOptions(rawArgList);
+
+
+		// chop args into string array
+		rawArgList = optionDialog.getSecondValue();
+
+		String[] targetList = separateTargets(rawArgList);
+		
+		if (targetList == null) {
+
+			showError(InvokeMessages.getString("InvokeAction.execute.windowTitle.error"), //$NON-NLS-1$
+					InvokeMessages.getString("InvokeAction.windowTitle.quoteError")); //$NON-NLS-1$
+			return;
+		}
+
+		String[] argumentList = new String[targetList.length
+				+ optionsList.length];
+
+		System.arraycopy(optionsList, 0, argumentList, 0, optionsList.length);
+		System.arraycopy(targetList, 0, argumentList, optionsList.length,
+				targetList.length);
+
+		if (container != null) {
+			IProject project = container.getProject();
+			String automakeCommand = null;
+			try {
+				automakeCommand = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_TOOL);
+			} catch (CoreException e) {
+				// do nothing
+			}
+			
+			// If automake path not set for the project, default to system path
+			if (automakeCommand == null)
+				automakeCommand = DEFAULT_COMMAND;
+
+			executeConsoleCommand(DEFAULT_COMMAND, automakeCommand,
+					argumentList, execDir);
+		}
+	}
+
+	public void dispose() {
+
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoreconfAction.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoreconfAction.java
new file mode 100644
index 0000000..b16de91
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoreconfAction.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyConstants;
+import org.eclipse.swt.widgets.Shell;
+
+
+public class InvokeAutoreconfAction extends InvokeAction {
+
+	private static final String DEFAULT_OPTION = ""; //$NON-NLS-1$
+	private static final String DEFAULT_COMMAND = "autoreconf"; //$NON-NLS-1$
+
+	public void run(IAction action) {
+
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+		
+		IPath execDir = getExecDir(container);
+		String cwd = InvokeMessages.getString("CWD") + getCWD(container); //$NON-NLS-1$
+
+		InputDialog optionDialog = new SingleInputDialog(
+				new Shell(),
+				cwd,
+				InvokeMessages
+						.getString("InvokeAutoreconfAction.windowTitle.options"), //$NON-NLS-1$
+				InvokeMessages
+						.getString("InvokeAutoreconfAction.message.options.otherOptions"), //$NON-NLS-1$
+				DEFAULT_OPTION, null);
+		optionDialog.open();
+
+		// chop args into string array
+		String rawArgList = optionDialog.getValue();
+
+		String[] optionsList = simpleParseOptions(rawArgList);
+
+		String[] argumentList = new String[optionsList.length];
+
+		System.arraycopy(optionsList, 0, argumentList, 0, optionsList.length);
+
+		if (container != null) {
+			String autoreconfCommand = null;
+			IProject project = getSelectedContainer().getProject();
+			try {
+				autoreconfCommand = project.getPersistentProperty(AutotoolsPropertyConstants.AUTORECONF_TOOL);
+			} catch (CoreException e) {
+				// do nothing
+			}
+			
+			// If unset, use default system path
+			if (autoreconfCommand == null)
+				autoreconfCommand = DEFAULT_COMMAND;
+			
+			executeConsoleCommand(DEFAULT_COMMAND, autoreconfCommand,
+					argumentList, execDir);
+		}
+	}
+
+	public void dispose() {
+
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeLibtoolizeAction.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeLibtoolizeAction.java
new file mode 100644
index 0000000..03e0427
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeLibtoolizeAction.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyConstants;
+import org.eclipse.swt.widgets.Shell;
+
+
+public class InvokeLibtoolizeAction extends InvokeAction {
+
+	private static final String DEFAULT_OPTION = ""; //$NON-NLS-1$
+	private static final String DEFAULT_COMMAND = "libtoolize"; //$NON-NLS-1$
+
+	public void run(IAction action) {
+
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+		
+		IPath execDir = getExecDir(container);
+		String cwd = InvokeMessages.getString("CWD") + getCWD(container); //$NON-NLS-1$
+
+		InputDialog optionDialog = new SingleInputDialog(
+				new Shell(),
+				cwd,
+				InvokeMessages
+						.getString("InvokeLibtoolizeAction.windowTitle.options"), //$NON-NLS-1$
+				InvokeMessages
+						.getString("InvokeLibtoolizeAction.message.options.otherOptions"), //$NON-NLS-1$
+				DEFAULT_OPTION, null);
+		optionDialog.open();
+
+		// chop args into string array
+		String rawArgList = optionDialog.getValue();
+
+		String[] optionsList = simpleParseOptions(rawArgList);
+
+		String[] argumentList = new String[optionsList.length];
+
+		System.arraycopy(optionsList, 0, argumentList, 0, optionsList.length);
+
+		if (container != null) {
+			String libtoolizeCommand = null;
+			IProject project = getSelectedContainer().getProject();
+			try {
+				libtoolizeCommand = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOHEADER_TOOL);
+			} catch (CoreException e) {
+				// do nothing
+			}
+			
+			// If unset, use default system path
+			if (libtoolizeCommand == null)
+				libtoolizeCommand = DEFAULT_COMMAND;
+			
+			executeConsoleCommand(DEFAULT_COMMAND, libtoolizeCommand,
+					argumentList, execDir);
+		}
+	}
+
+	public void dispose() {
+
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.java
new file mode 100644
index 0000000..b62632a
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.java
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007, 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class InvokeMessages {
+	private static final String BUNDLE_NAME = InvokeMessages.class.getName();
+
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
+			.getBundle(BUNDLE_NAME);
+
+	private InvokeMessages() {
+	}
+
+	/**
+	 * Returns the string from the resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @return the resource bundle message
+	 */
+	public static String getString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+	
+	/**
+	 * Returns the formatted string from the resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @param args an array of substituition strings
+	 * @return the resource bundle message
+	 */
+	public static String getFormattedString(String key, String[] args) {
+		return MessageFormat.format(getString(key), (Object[])args);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.properties
new file mode 100644
index 0000000..b2da117
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.properties
@@ -0,0 +1,56 @@
+#################################################################################
+#  Copyright (c) 2006, 2007, 2009 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+# 
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+CWD=Working Directory:
+
+InvokeAction.windowTitle.quoteError=Quote/Double quote not correct
+InvokeAction.progress.message=Running {0}
+InvokeAction.execute.windowTitle.error=Invoke Action Error
+InvokeAction.execute.message=Couldn't execute command :
+InvokeAction.success=Command executed successfully
+InvokeAction.console.message=Invoking {0} in {1}
+
+
+InvokeAutoconfAction.command=Running autoconf in {0} 
+InvokeAutoconfAction.windowTitle.stdout=Invoke Autoconf - Output
+InvokeAutoconfAction.windowTitle.stderr=Invoke Autoconf - Error
+
+
+InvokeAutomakeAction.command=Running automake
+InvokeAutomakeAction.windowTitle.options=Automake Options
+InvokeAutomakeAction.message.options.makeTargets=Enter targets separated by space :
+InvokeAutomakeAction.message.options.otherOptions=Enter options separated by space :
+InvokeAutomakeAction.windowTitle.stdout=Invoke Automake - Output
+InvokeAutomakeAction.windowTitle.stderr=Invoke Automake - Error
+
+InvokeAutoheaderAction.command=Running autoheader
+InvokeAutoheaderAction.windowTitle.options=Autoheader Options
+InvokeAutoheaderAction.message.options.otherOptions=Enter options separated by space :
+InvokeAutoheaderAction.windowTitle.stdout=Invoke Autoheader - Output
+InvokeAutoheaderAction.windowTitle.stderr=Invoke Autoheader - Error
+
+InvokeAutoreconfAction.command=Running autoreconf
+InvokeAutoreconfAction.windowTitle.options=Autoreconf Options
+InvokeAutoreconfAction.message.options.otherOptions=Enter options separated by space :
+InvokeAutoreconfAction.windowTitle.stdout=Invoke Autoreconf - Output
+InvokeAutoreconfAction.windowTitle.stderr=Invoke Autoreconf - Error
+
+InvokeAclocalAction.command=Running aclocal
+InvokeAclocalAction.windowTitle.options=Aclocal Options
+InvokeAclocalAction.message.options.includeDir=Add directory to search list for .m4 files :
+InvokeAclocalAction.message.options.otherOptions=Enter options separated by space :
+InvokeAclocalAction.windowTitle.stdout=Invoke Automake - Output
+InvokeAclocalAction.windowTitle.stderr=Invoke Automake - Error
+
+InvokeLibtoolizeAction.command=Running libtoolize
+InvokeLibtoolizeAction.windowTitle.options=Libtoolize Options
+InvokeLibtoolizeAction.message.options.otherOptions=Enter options separated by space :
+InvokeLibtoolizeAction.windowTitle.stdout=Invoke Libtoolize - Output
+InvokeLibtoolizeAction.windowTitle.stderr=Invoke Libtoolize - Error
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/LibtoolizeHandler.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/LibtoolizeHandler.java
new file mode 100644
index 0000000..202f1b6
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/LibtoolizeHandler.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+/**
+ * @author Jeff Johnston
+ *
+ */
+public class LibtoolizeHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		InvokeLibtoolizeAction a = new InvokeLibtoolizeAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureAction.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureAction.java
new file mode 100644
index 0000000..96ef9a6
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureAction.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.ISchedulingRule;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.linuxtools.cdt.autotools.MakeGenerator;
+
+
+public class ReconfigureAction extends InvokeAction {
+
+	public void run(IAction action) {
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+
+		// We need to use a workspace root scheduling rule because adding MakeTargets
+		// may end up saving the project description which runs under a workspace root rule.
+		final ISchedulingRule rule = ResourcesPlugin.getWorkspace().getRoot();
+		
+		Job backgroundJob = new Job("Reconfigure Action"){  //$NON-NLS-1$
+			/* (non-Javadoc)
+			 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
+			 */
+			protected IStatus run(IProgressMonitor monitor) {
+				try {
+					ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
+
+						public void run(IProgressMonitor monitor) throws CoreException {
+							IProject project = getSelectedContainer().getProject();
+							MakeGenerator m = new MakeGenerator();
+							IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+							m.initialize(project, info, monitor);
+							m.removeConfigSettings();
+							try {
+								m.regenerateMakefiles();
+							} catch (CoreException e) {
+								// do nothing for now
+							}
+						}
+					}, rule, IWorkspace.AVOID_UPDATE, monitor);
+				} catch (CoreException e) {
+					return e.getStatus();
+				}
+				IStatus returnStatus = Status.OK_STATUS;
+				return returnStatus;
+			}
+		};
+
+		backgroundJob.setRule(rule);
+		backgroundJob.schedule();
+	}
+
+	public void dispose() {
+
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureHandler.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureHandler.java
new file mode 100644
index 0000000..843d7bb
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureHandler.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+/**
+ * @author Jeff Johnston
+ *
+ */
+public class ReconfigureHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		ReconfigureAction a = new ReconfigureAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/SingleInputDialog.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/SingleInputDialog.java
new file mode 100644
index 0000000..8a5f8bc
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/SingleInputDialog.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+
+public class SingleInputDialog extends InputDialog {
+	
+	private String firstMessage;
+
+	public SingleInputDialog(Shell parentShell, String firstMessage, String dialogTitle,
+			String dialogMessage, String initialValue,
+			IInputValidator validator) {
+		super(parentShell, dialogTitle, dialogMessage, initialValue, validator);
+
+		this.firstMessage = firstMessage;
+	}
+
+	/*
+	 * (non-Javadoc) Method declared on Dialog.
+	 */
+	protected void buttonPressed(int buttonId) {
+		super.buttonPressed(buttonId);
+	}
+
+	protected Control createDialogArea(Composite parent) {
+
+		// create composite
+		Composite composite = (Composite) super.createDialogArea(parent);
+
+		CLabel label0 = new CLabel(composite, SWT.WRAP);
+		label0.setText(firstMessage);
+		GridData data = new GridData(GridData.GRAB_HORIZONTAL
+				| GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL
+				| GridData.VERTICAL_ALIGN_CENTER);
+		data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
+		label0.setLayoutData(data);
+		label0.setFont(parent.getFont());
+
+		// remove error message dialog from focusing.
+		composite.getTabList()[2].setVisible(false);
+		composite.getTabList()[2].setEnabled(false);
+
+		return composite;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/TwoInputDialog.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/TwoInputDialog.java
new file mode 100644
index 0000000..f786e44
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/TwoInputDialog.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+
+public class TwoInputDialog extends InputDialog {
+
+	private Text secondText;
+
+	private String secondValue;
+
+	private String secondMessage;
+	
+	private String firstMessage;
+
+	public TwoInputDialog(Shell parentShell, String firstMessage, String dialogTitle,
+			String dialogMessage, String secondMessage, String initialValue,
+			IInputValidator validator) {
+		super(parentShell, dialogTitle, dialogMessage, initialValue, validator);
+
+		this.firstMessage = firstMessage;
+		this.secondMessage = secondMessage;
+	}
+
+	/*
+	 * (non-Javadoc) Method declared on Dialog.
+	 */
+	protected void buttonPressed(int buttonId) {
+		if (buttonId == IDialogConstants.OK_ID) {
+			secondValue = secondText.getText();
+		} else {
+			secondValue = null;
+		}
+		super.buttonPressed(buttonId);
+	}
+
+	protected Control createDialogArea(Composite parent) {
+
+		// create composite
+		Composite composite = (Composite) super.createDialogArea(parent);
+
+		CLabel label0 = new CLabel(composite, SWT.WRAP);
+		label0.setText(firstMessage);
+		Label label = new Label(composite, SWT.WRAP);
+		label.setText(secondMessage);
+		GridData data = new GridData(GridData.GRAB_HORIZONTAL
+				| GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL
+				| GridData.VERTICAL_ALIGN_CENTER);
+		data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
+		label0.setLayoutData(data);
+		label0.setFont(parent.getFont());
+		label.setLayoutData(data);
+		label.setFont(parent.getFont());
+		
+
+		secondText = new Text(composite, SWT.SINGLE | SWT.BORDER);
+		secondText.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL
+				| GridData.HORIZONTAL_ALIGN_FILL));
+		secondText.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				validateInput();
+			}
+		});
+
+		// remove error message dialog from focusing.
+		composite.getTabList()[2].setVisible(false);
+		composite.getTabList()[2].setEnabled(false);
+
+		return composite;
+	}
+
+	/**
+	 * Returns the text area.
+	 * 
+	 * @return the text area
+	 */
+	protected Text getSecondText() {
+		return secondText;
+	}
+
+	/**
+	 * Returns the string typed into this input dialog.
+	 * 
+	 * @return the input string
+	 */
+	public String getSecondValue() {
+		return secondValue;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseConditionElement.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseConditionElement.java
new file mode 100644
index 0000000..d06e73d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseConditionElement.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfCaseConditionElement extends AutoconfElement {
+	
+	public AutoconfCaseConditionElement() {
+		super("");
+	}
+	
+	public AutoconfCaseConditionElement(String name) {
+		super(name);
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseElement.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseElement.java
new file mode 100644
index 0000000..c8ad284
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfCaseElement extends AutoconfElement {
+	
+	public AutoconfCaseElement() {
+		super("case"); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfEditorMessages.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfEditorMessages.java
new file mode 100644
index 0000000..53c7a7d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfEditorMessages.java
@@ -0,0 +1,117 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+
+/**
+ * AutoconfEditorMessages
+ */
+public class AutoconfEditorMessages {
+
+	private static final String RESOURCE_BUNDLE= AutoconfEditorMessages.class.getName();
+
+	private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);
+
+	private AutoconfEditorMessages() {
+	}
+
+	public static ResourceBundle getResourceBundle() {
+		return fgResourceBundle;
+	}
+	
+	public static String getString(String key) {
+		try {
+			return fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+	}
+	/**
+	 * Gets a string from the resource bundle and formats it with the argument
+	 * 
+	 * @param key	the string used to get the bundle value, must not be null
+	 * @since 3.0
+	 */
+	public static String getFormattedString(String key, Object arg) {
+		String format= null;
+		try {
+			format= fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+		if (arg == null)
+			arg= ""; //$NON-NLS-1$
+		return MessageFormat.format(format, new Object[] { arg });
+	}
+	/**
+	 * Gets a string from the resource bundle and formats it with the arguments
+	 * 
+	 * @param key	the string used to get the bundle value, must not be null
+	 * @since 3.0
+	 */
+	public static String getFormattedString(String key, Object arg1, Object arg2) {
+		String format= null;
+		try {
+			format= fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+		if (arg1 == null)
+			arg1= ""; //$NON-NLS-1$
+		if (arg2 == null)
+			arg2= ""; //$NON-NLS-1$
+		return MessageFormat.format(format, new Object[] { arg1, arg2 });
+	}
+	
+	/**
+	 * Gets a string from the resource bundle and formats it with the arguments
+	 * 
+	 * @param key	the string used to get the bundle value, must not be null
+	 * @since 3.0
+	 */
+	public static String getFormattedString(String key, Object arg1, Object arg2, Object arg3) {
+		String format= null;
+		try {
+			format= fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+		if (arg1 == null)
+			arg1= ""; //$NON-NLS-1$
+		if (arg2 == null)
+			arg2= ""; //$NON-NLS-1$
+		if (arg3 == null)
+			arg3= ""; //$NON-NLS-1$
+		return MessageFormat.format(format, new Object[] { arg1, arg2, arg3 });
+	}
+	
+	/**
+	 * Gets a string from the resource bundle and formats it with the argument
+	 * 
+	 * @param key	the string used to get the bundle value, must not be null
+	 * @since 3.0
+	 */
+	public static String getFormattedString(String key, boolean arg) {
+		String format= null;
+		try {
+			format= fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+		return MessageFormat.format(format, new Object[] { new Boolean(arg) });
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfEditorMessages.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfEditorMessages.properties
new file mode 100644
index 0000000..692d064
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfEditorMessages.properties
@@ -0,0 +1,47 @@
+#################################################################################
+#  Copyright (c) 2007 Red Hat, Inc., (c) 2008 Nokia Inc
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+# 
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#      Nokia Inc - refactoring
+#################################################################################
+UnmatchedRightParenthesis=Unmatched right parenthesis
+UnmatchedLeftParenthesis=Unmatched left parenthesis
+UnmatchedRightQuote=Unmatched right quote, expected {0}
+UnmatchedLeftQuote=Unmatched left quote, expected {0}
+UnmatchedCloseComment=Unmatched end of comment, expected {0}
+UnterminatedString=Unterminated string, expected {0}
+
+AutoconfMacroArgsTooFew=The autoconf version {0} definition of macro "{1}" requires at least {2} arguments
+AutoconfMacroArgsTooMany=The autoconf version {0} definition of macro "{1}" may have a maximum of {2} arguments
+M4MacroArgsTooFew=The m4 macro "{0}" requires at least {1} arguments
+M4MacroArgsTooMany=The m4 macro "{0}" may have a maximum of {1} arguments
+MissingSpecifier=Missing "{0}" specifier
+InvalidSpecifier=The specifier "{0}" should be separated from condition by semicolon or newline
+InvalidTermination=The specifier "{0}" should appear after semicolon or newline
+UnterminatedConstruct=This "{0}" construct is unterminated
+MissingCondition=Missing condition for {0} specifier
+InvalidElif=The "elif" keyword should appear in an "if" or "elif" construct
+InvalidElse=The "else" keyword should appear in an "if" or "elif" construct
+InvalidFi=The "fi" keyword should terminate an "if", "elif", or "else" construct
+InvalidEsac=The "esac" keyword should terminate a "case" statement
+InvalidDone=The "done" keyword should terminate a "for", "while", "until", or "select" statement
+InvalidDo=The "do" keyword should appear in a "for", "while", "until", or "select" statement
+InvalidThen=The "then" keyword should appear in an "if" or "elif" statement
+InvalidIn=The "in" keyword should appear in a "case" statement
+UnterminatedCaseCondition=Case condition is not terminated before "esac" keyword
+ImproperCaseCondition=Case condition expected to end with ")"
+UnterminatedInlineDocument=Inline document started with "<<" is unterminated
+IncompleteInlineMarker=Inline document marker has incomplete quote
+MissingInlineMarker=Inline document specification is missing end marker
+AutoconfAnnotationHover.multipleMarkers=Multiple markers at this line
+
+ShowToolTip.label=Show T&ooltip Description
+ContentAssistProposal.label=Co&ntent Assist
+ContentAssistProposal.tooltip=Content Assist
+ContentAssistProposal.description=Content Assist
+
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElement.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElement.java
new file mode 100644
index 0000000..2bf2a28
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElement.java
@@ -0,0 +1,138 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+
+public class AutoconfElement {
+	
+	protected String name;
+	protected String var;
+	protected int startOffset;
+	protected int endOffset;
+	protected ArrayList<AutoconfElement> children;
+	protected AutoconfElement parent;
+	private IDocument document;
+	
+	public AutoconfElement(String name) {
+		this(name, null);
+	}
+	
+	public AutoconfElement(String name, String var) {
+		this.name = name;
+		this.var = var;
+		this.startOffset = 0;
+		this.children = new ArrayList<AutoconfElement>();
+	}
+	
+
+	public String toString() {
+		String source = getSource();
+		if (source == null) {
+			StringBuffer kids = new StringBuffer();
+			for (Iterator<AutoconfElement> iterator = children.iterator(); iterator.hasNext();) {
+				AutoconfElement kid = (AutoconfElement) iterator.next();
+				kids.append(kid.toString());
+				kids.append(",");
+			}
+			source = kids.toString();
+		}
+		return getClass().getSimpleName() + ": '" + source + "'";
+	}
+	
+	public void addChild(AutoconfElement element) {
+		children.add(element);
+		if (element.getParent() == null)
+			element.setParent(this);
+	}
+	
+	public void addSibling(AutoconfElement element) {
+		parent.addChild(element);
+	}
+	
+	public AutoconfElement getLastChild() {
+		if (hasChildren())
+			return (AutoconfElement)children.get(children.size() - 1);
+		return null;
+	}
+	
+	public AutoconfElement getParent() {
+		return parent;
+	}
+	
+	public void setParent(AutoconfElement parent) {
+		this.parent = parent;
+	}
+	
+	public AutoconfElement[] getChildren() {
+		return (AutoconfElement[]) children.toArray(new AutoconfElement[children.size()]);
+	}
+	
+	public boolean hasChildren() {
+		return !children.isEmpty();
+	}
+
+	public String getName() {
+		return name;
+	}
+	 
+	public void setName(String string) {
+		this.name = string;
+	}
+
+	
+	public String getVar() {
+		return var;
+	}
+	
+	public void setVar(String value) {
+		var = value;
+	}
+	
+	public void setDocument(IDocument document) {
+		this.document = document;
+	}
+	
+	public IDocument getDocument() {
+		return document;
+	}
+	
+	public void setStartOffset(int offset) {
+		this.startOffset = offset;
+	}
+	
+	public int getStartOffset() {
+		return startOffset;
+	}
+	
+	public void setEndOffset(int offset) {
+		this.endOffset = offset;
+	}
+	
+	public int getEndOffset() {
+		return endOffset;
+	}
+
+	public String getSource() {
+		if (document != null && startOffset >= 0 && endOffset >= startOffset) {
+			try {
+				return document.get(startOffset, endOffset - startOffset);
+			} catch (BadLocationException e) {
+				return null;
+			}
+		}
+		return null;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElifElement.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElifElement.java
new file mode 100644
index 0000000..a990ea8
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElifElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfElifElement extends AutoconfElement {
+	
+	public AutoconfElifElement() {
+		super("elif"); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElseElement.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElseElement.java
new file mode 100644
index 0000000..bbaa2c2
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElseElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfElseElement extends AutoconfElement {
+	
+	public AutoconfElseElement() {
+		super("else"); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfForElement.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfForElement.java
new file mode 100644
index 0000000..6b0ffcc
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfForElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfForElement extends AutoconfElement {
+	
+	public AutoconfForElement() {
+		super("for"); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfIfElement.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfIfElement.java
new file mode 100644
index 0000000..6ad6589
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfIfElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfIfElement extends AutoconfElement {
+	
+	public AutoconfIfElement() {
+		super("if"); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroArgumentElement.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroArgumentElement.java
new file mode 100644
index 0000000..24bf1d5
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroArgumentElement.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+/**
+ * This is a macro argument node.  It may also hold
+ * other AutoconfMacroElements.  The source range includes any quotes around an argument
+ * but the #getName() has them stripped.
+ * @author eswartz
+ *
+ */
+public class AutoconfMacroArgumentElement extends AutoconfElement {
+
+	public AutoconfMacroArgumentElement() {
+		super(""); // //$NON-NLS-N$
+	}
+	public AutoconfMacroArgumentElement(String name) {
+		super(name); // //$NON-NLS-N$
+	}
+	public String getVar() {
+		return super.getVar();
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroDetector.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroDetector.java
new file mode 100644
index 0000000..3635bcd
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroDetector.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc., (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat Incorporated - initial API and implementation
+ *    Ed Swartz (Nokia) - refactoring
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+import java.util.regex.Pattern;
+
+/**
+ *
+ */
+public class AutoconfMacroDetector implements IAutoconfMacroDetector {
+
+	private static final Pattern AUTOCONF_MACRO_PATTERN = Pattern.compile("PKG_.*|AC_.*|AM_.*|m4.*"); //$NON-NLS-1$
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.IAutoconfMacroDetector#isMacroIdentifier(java.lang.String)
+	 */
+	public boolean isMacroIdentifier(String name) {
+		return AUTOCONF_MACRO_PATTERN.matcher(name).matches();
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java
new file mode 100644
index 0000000..1168f91
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *     Ed Swartz (NOKIA Inc) - support standalone parser
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+/**
+ * A call to a macro.
+ * <p>
+ * Macro element now stores arguments as AutoconfMacroElement or AutoconfMacroArgument children 
+ *
+ */
+public class AutoconfMacroElement extends AutoconfElement {
+
+	public AutoconfMacroElement(String name) {
+		super(name);
+	}
+
+	public String getVar() {
+		if (children.size() > 0)
+			return getParameter(0);
+		else
+			return null;
+	}
+	public int getParameterCount() {
+		return children.size();
+	}
+
+	public String getParameter(int num) {
+		return ((AutoconfElement) children.get(num)).getName();
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java
new file mode 100644
index 0000000..9a5100e
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java
@@ -0,0 +1,136 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.linuxtools.cdt.autotools.AutotoolsPlugin;
+import org.eclipse.ui.IStorageEditorInput;
+import org.eclipse.ui.texteditor.MarkerUtilities;
+
+
+public class AutoconfOutlineErrorHandler {
+	
+	public static final String PARSE_ERROR_MARKER_ID = AutotoolsPlugin.PLUGIN_ID
+	+ ".outlineparsefileerror";
+	
+	private IFile file;
+	private IDocument document;
+	
+	public AutoconfOutlineErrorHandler(IStorageEditorInput input, IDocument document)
+	{
+		this.document = document;
+		IWorkspaceRoot root = CCorePlugin.getWorkspace().getRoot();
+		try {
+			IPath absPath = input.getStorage().getFullPath();
+			IPath rootPath = root.getLocation();
+			IPath relPath = new Path("");
+
+			for (int i = 0; i < rootPath.segmentCount(); ++i) {
+				relPath = relPath.append("../");
+			}
+			relPath = relPath.append(absPath);
+			this.file = root.getFileForLocation(relPath);
+			if (this.file == null) {
+				this.file = root.getFile(relPath);
+			}
+		} catch (CoreException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	public IDocument getDocument() {
+		return document;
+	}
+	
+	public void handleError(ParseException e) {
+		if (!file.exists())
+			return;
+		
+		int lineNumber = e.getLineNumber();
+		
+		Map<String, Object> map = new HashMap<String, Object>();
+		MarkerUtilities.setLineNumber(map, lineNumber);
+		MarkerUtilities.setMessage(map, e.getMessage());
+		map.put(IMarker.MESSAGE, e.getMessage());
+		map.put(IMarker.LOCATION, file.getFullPath().toString());
+
+		Integer charStart = getCharOffset(lineNumber, e.getStartColumn());
+		if (charStart != null) {
+			map.put(IMarker.CHAR_START, charStart);
+		}
+		Integer charEnd = getCharOffset(lineNumber, e.getEndColumn());
+		if (charEnd != null) {
+			map.put(IMarker.CHAR_END, charEnd);
+		}
+		
+		// FIXME:  add severity level
+		map.put(IMarker.SEVERITY, new Integer(e.getSeverity()));
+		
+		try {
+			MarkerUtilities.createMarker(file, map, PARSE_ERROR_MARKER_ID);
+		} catch (CoreException ee) {
+			ee.printStackTrace();
+		}
+		return;
+	}
+	
+	public void removeAllExistingMarkers() {
+		if (!file.exists())
+			return;
+		
+		try	{
+			file.deleteMarkers(PARSE_ERROR_MARKER_ID, true, IResource.DEPTH_ZERO);
+		} catch (CoreException e1) {
+			e1.printStackTrace();
+		}
+	}
+
+	public void removeExistingMarkers(int offset, int length) {
+		if (!file.exists())
+			return;
+		
+		try	{
+			IMarker[] markers = file.findMarkers(PARSE_ERROR_MARKER_ID, true, IResource.DEPTH_ZERO);
+			// Delete all markers that start in the given document range.
+			for (int i = 0; i < markers.length; ++i) {
+				IMarker marker = markers[i];
+				int charEnd = MarkerUtilities.getCharEnd(marker);
+				int charStart = MarkerUtilities.getCharStart(marker);
+				if (charStart >= offset && charEnd <= (offset + length))
+					marker.delete();
+			}
+		} catch (CoreException e1) {
+			e1.printStackTrace();
+		}
+	}
+	
+	private Integer getCharOffset(int lineNumber, int columnNumber)	{
+		try	{
+			return new Integer(document.getLineOffset(lineNumber) + columnNumber);
+		} catch (BadLocationException e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfParser.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfParser.java
new file mode 100644
index 0000000..e699603
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfParser.java
@@ -0,0 +1,1041 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc., (c) 2008 Nokia
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *     Ed Swartz (Nokia) - refactoring
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+
+
+/**
+ * Tokenizing autoconf parser, based on original work by Jeff Johnston 
+ * @author eswartz
+ */
+public class AutoconfParser {
+	
+	public static final String MISSING_SPECIFIER = "MissingSpecifier"; //$NON-NLS-1$
+	public static final String INVALID_SPECIFIER = "InvalidSpecifier"; //$NON-NLS-1$
+	public static final String INVALID_TERMINATION = "InvalidTermination"; //$NON-NLS-1$
+	public static final String UNTERMINATED_CONSTRUCT = "UnterminatedConstruct"; //$NON-NLS-1$
+	public static final String MISSING_CONDITION = "MissingCondition"; //$NON-NLS-1$
+	public static final String INVALID_ELIF = "InvalidElif"; //$NON-NLS-1$
+	public static final String INVALID_ELSE = "InvalidElse"; //$NON-NLS-1$
+	public static final String INVALID_FI = "InvalidFi"; //$NON-NLS-1$
+	public static final String INVALID_DONE = "InvalidDone"; //$NON-NLS-1$
+	public static final String INVALID_ESAC = "InvalidEsac"; //$NON-NLS-1$
+	public static final String INVALID_DO = "InvalidDo"; //$NON-NLS-1$
+	public static final String INVALID_THEN = "InvalidThen"; //$NON-NLS-1$
+	public static final String INVALID_IN = "InvalidIn"; //$NON-NLS-1$
+	public static final String IMPROPER_CASE_CONDITION = "ImproperCaseCondition"; //$NON-NLS-1$
+	public static final String UNTERMINATED_CASE_CONDITION = "UnterminatedCaseCondition"; //$NON-NLS-1$
+	public static final String UNTERMINATED_INLINE_DOCUMENT = "UnterminatedInlineDocument"; //$NON-NLS-1$
+	public static final String INCOMPLETE_INLINE_MARKER="IncompleteInlineMarker"; //$NON-NLS-1$
+	public static final String MISSING_INLINE_MARKER="MissingInlineMarker"; //$NON-NLS-1$
+	public static final String UNMATCHED_RIGHT_PARENTHESIS = "UnmatchedRightParenthesis"; //$NON-NLS-1$
+	public static final String UNMATCHED_LEFT_PARENTHESIS = "UnmatchedLeftParenthesis"; //$NON-NLS-1$
+	
+	private IAutoconfErrorHandler errorHandler;
+	private IAutoconfMacroValidator macroValidator;
+	private AutoconfTokenizer tokenizer;
+	private IAutoconfMacroDetector macroDetector;
+	
+	private static final String M4_BUILTINS =
+		"define undefine defn pushdef popdef indir builtin ifdef ifelse shift reverse cond " +
+		"dumpdef traceon traceoff debugmode debugfile dnl changequote changecom changeword " +
+		"m4wrap " +
+		"include sinclude divert undivert divnum len index regexp substr translit patsubst " +
+		"format incr decr eval syscmd esyscmd sysval mkstemp maketemp errprint m4exit " +
+		"__file__ __line__ __program__ ";
+	
+	private static List<String> m4builtins = new ArrayList<String>();
+	static {
+		m4builtins.addAll(Arrays.asList(M4_BUILTINS.split(" ")));
+	}
+	
+	/**
+	 * Create a parser for autoconf-style sources.  
+	 * @param errorHandler
+	 * @param macroDetector
+	 * @param macroValidator
+	 */
+	public AutoconfParser(IAutoconfErrorHandler errorHandler,
+			IAutoconfMacroDetector macroDetector,
+			IAutoconfMacroValidator macroValidator) {
+		this.errorHandler = errorHandler;
+		this.macroDetector = macroDetector;
+		this.macroValidator = macroValidator;
+	}
+
+	/**
+	 * Parse the given document and produce an AutoconfElement tree
+	 * @param errorHandler
+	 * @param macroValidator
+	 * @param document
+	 * @return element tree
+	 */
+	public AutoconfElement parse(IDocument document) {
+		return parse(document, true);
+	}
+	
+	/**
+	 * Parse the given document and produce an AutoconfElement tree,
+	 * and control whether the initial quoting style is m4 style (`...')
+	 * or autoconf style ([ ... ]).
+	 * @param errorHandler
+	 * @param macroValidator
+	 * @param document
+	 * @param useAutoconfQuotes
+	 * @return element tree
+	 */
+	public AutoconfElement parse(IDocument document, boolean useAutoconfQuotes) {
+		this.tokenizer = new AutoconfTokenizer(document, errorHandler);
+		if (useAutoconfQuotes)
+			tokenizer.setM4Quote("[", "]");
+		
+		AutoconfElement root = new AutoconfRootElement();
+		Token eof = parseTopLevel(root);
+		
+		root.setStartOffset(0);
+		root.setDocument(document);
+		
+		setSourceEnd(root, eof);
+		
+		return root;
+	}
+
+
+	static class BlockEndCondition extends Exception {
+		/**
+		 * 
+		 */
+		private static final long serialVersionUID = 1L;
+		private Token token;
+
+		public BlockEndCondition(Token token) {
+			this.token = token;
+		}
+		
+		public Token getToken() {
+			return token;
+		}
+		
+	}
+
+	static class ExprEndCondition extends Exception {
+		/**
+		 * 
+		 */
+		private static final long serialVersionUID = 1L;
+		private Token token;
+
+		public ExprEndCondition(Token token) {
+			this.token = token;
+		}
+		
+		public Token getToken() {
+			return token;
+		}
+		
+	}
+
+	/**
+	 * Parse individual top-level nodes: divide text into macro calls
+	 * and recognized shell constructs.  Anything else is not accounted for.
+	 * @param parent
+	 * @return
+	 */
+	protected Token parseTopLevel(AutoconfElement parent) {
+		while (true) {
+			try {
+				parseStatement(parent);
+			} catch (BlockEndCondition e) {
+				// don't terminate here; we may have constructs closed too early
+				Token token = tokenizer.peekToken();
+				if (token.getType() == ITokenConstants.EOF)
+					return token; 
+			}
+		}
+	}
+	
+	/**
+	 * Parse a block of nodes, which starts with an expression and contains
+	 * subnodes.  Divide text into macro calls and recognized shell constructs.  
+	 * Anything else is not accounted for.
+	 * @param parent
+	 */
+	protected void parseBlock(AutoconfElement parent, Token open, AutoconfElement block) throws BlockEndCondition {
+		parent.addChild(block);
+		
+		setSourceStart(block, open);
+		
+		// get the expression part
+		Token token;
+		try {
+			token = parseBlockExpression(open, block);
+		} catch (BlockEndCondition e) {
+			setSourceEndBefore(block, e.getToken());
+			throw e;
+		}
+		
+		// parse the block proper
+		if (token.getType() != ITokenConstants.EOF) {
+			while (true) {
+				try {
+					parseStatement(block);
+				} catch (BlockEndCondition e) {
+					setSourceEnd(block, e.getToken());
+					return;
+				}
+			}
+		} else {
+			setSourceEnd(block, token);
+		}
+	}
+
+	private Token parseBlockExpression(Token open, AutoconfElement block) throws BlockEndCondition {
+		Token token;
+		try {
+			if (block instanceof AutoconfIfElement 
+					|| block instanceof AutoconfElifElement 
+					|| block instanceof AutoconfCaseElement 
+					|| block instanceof AutoconfWhileElement) {
+				token = parseExpression(block);
+			} else if (block instanceof AutoconfForElement) {
+				token = parseForExpression(block);
+			} else {
+				// no expression
+				return open;
+			}
+			block.setVar(getTokenSpanTextBetween(open, token));
+		} catch (BlockEndCondition e) {
+			// oops, premature end
+			setSourceEnd(block, e.getToken());
+			throw e;
+		}
+	
+		// check for expected token
+		while (true) {
+			token = tokenizer.readToken();
+			if (token.getType() == ITokenConstants.EOF)
+				break;
+			if (token.getType() != ITokenConstants.EOL)
+				break;
+		}
+		
+		if (token.getType() == ITokenConstants.SH_DO) {
+			checkBlockValidity(block, token, 
+					new Class[] { AutoconfForElement.class, AutoconfWhileElement.class },
+					INVALID_DO);
+		}
+		else if (token.getType() == ITokenConstants.SH_THEN) {
+			checkBlockValidity(block, token, 
+					new Class[] { AutoconfIfElement.class, AutoconfElifElement.class },
+					INVALID_THEN);
+		} 
+		else {
+			String exp;
+			if (block instanceof AutoconfIfElement || block instanceof AutoconfElifElement)
+				exp = "then";
+			else
+				exp = "do";
+			
+			handleError(block, token, AutoconfEditorMessages.getFormattedString(MISSING_SPECIFIER, exp));
+
+			// assume we're still in the block...
+			tokenizer.unreadToken(token);
+		}
+		return token;
+	}
+	
+	/**
+	 * Parse a case statement.  Scoop up statements into case conditional blocks.
+	 * <pre>
+	 * 'case' EXPR 'in' 
+	 * 		{ EXPR ')'  { STMTS } ';;' }
+	 * 'esac'
+	 * </pre>
+	 * @param parent
+	 * @return
+	 */
+	protected void parseCaseBlock(AutoconfElement parent, Token open, AutoconfElement block) throws BlockEndCondition {
+		parent.addChild(block);
+		
+		setSourceStart(block, open);
+		
+		// get the case expression, terminating at 'in'
+		Token token;
+		try {
+			token = parseCaseExpression(block);
+		} catch (BlockEndCondition e) {
+			// oops, premature end
+			setSourceEnd(block, e.getToken());
+			throw e;
+		}
+		
+		block.setVar(getTokenSpanTextBetween(open, token));
+		
+		// now get the statements, which are themselves blocks... just read statements
+		// that terminate with ';;' and stuff those into blocks.
+		
+		while (true) {
+			AutoconfCaseConditionElement condition = new AutoconfCaseConditionElement();
+
+			// skip EOLs and get the first "real" token
+			while (true) {
+				token = tokenizer.readToken();
+				setSourceStart(condition, token);
+				if (token.getType() == ITokenConstants.EOF)
+					break;
+				if (token.getType() == ITokenConstants.EOL)
+					continue;
+				break;
+			}
+			
+			if (token.getType() == ITokenConstants.SH_ESAC) {
+				break;
+			}
+			
+			try {
+				Token start = token;
+				token = parseCaseExpression(condition);
+				condition.setName(getTokenSpanTextFromUpTo(start, token));
+				
+				while (true) {
+					parseStatement(condition);
+				}
+			} catch (BlockEndCondition e) {
+				setSourceEnd(condition, e.getToken());
+				
+				if (condition.getSource().length() > 0)
+					block.addChild(condition);
+				
+				if (e.getToken().getType() != ITokenConstants.SH_CASE_CONDITION_END) {
+					token = e.getToken();
+					break;
+				}
+			}
+		}
+		
+		setSourceEnd(block, token);
+		
+		if (token.getType() != ITokenConstants.SH_ESAC) {
+			handleError(parent, token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, block.getName()));
+		}
+	}
+
+	private String getTokenSpanTextBetween(Token open, Token close) {
+		int startOffset = open.getOffset() + open.getLength();
+		int endOffset = close.getOffset();
+		if (open.getDocument() != close.getDocument())
+			return open.getText();
+		
+		String text;
+		try {
+			text = open.getDocument().get(startOffset, endOffset - startOffset).trim();
+		} catch (BadLocationException e) {
+			text = open.getText();
+			// TODO: error
+		}
+		
+		return text;
+	}
+
+	private String getTokenSpanTextFromUpTo(Token open, Token close) {
+		int startOffset = open.getOffset();
+		int endOffset = close.getOffset();
+		if (open.getDocument() != close.getDocument())
+			return open.getText();
+		
+		String text;
+		try {
+			text = open.getDocument().get(startOffset, endOffset - startOffset).trim();
+		} catch (BadLocationException e) {
+			text = open.getText();
+			// TODO: error
+		}
+		
+		return text;
+	}
+	private void setSourceStart(AutoconfElement block, Token open) {
+		int offset = open.getOffset();
+		block.setDocument(open.getDocument());
+		block.setStartOffset(offset);
+	}
+
+	private void setSourceEnd(AutoconfElement block, Token close) {
+		int offset = close.getOffset() + close.getLength();
+		if (block.getDocument() != null && block.getDocument() != close.getDocument())
+			throw new IllegalStateException();
+		block.setDocument(close.getDocument());
+		block.setEndOffset(offset);
+	}
+
+	private void setSourceEndBefore(AutoconfElement block, Token close) {
+		int offset = close.getOffset();
+		if (block.getDocument() != null && block.getDocument() != close.getDocument())
+			throw new IllegalStateException();
+		block.setDocument(close.getDocument());
+		block.setEndOffset(offset);
+	}
+
+	/**
+	 * Parse a single statement (macro call or a shell construct).
+	 * This can recursively invoke parseBlock() or parseStatement() to populate the tree.
+	 * Whenever a token terminates a block, we check its validity and then throw BlockEndCondition.
+	 * @param parent the parent into which to add statements.  The type of this element is used
+	 * to validate the legality of block closing tokens.
+	 */
+	protected void parseStatement(AutoconfElement parent) throws BlockEndCondition {
+	
+		boolean atStart = true;
+		
+		while (true) {
+			Token token = tokenizer.readToken();
+			
+			switch (token.getType()) {
+			// 0. Check EOF
+			case ITokenConstants.EOF:
+				AutoconfElement element = parent;
+				while (element != null && !(element instanceof AutoconfRootElement)) {
+					handleError(element, token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, element.getName()));
+					element = element.getParent();
+				}
+				throw new BlockEndCondition(token);
+			
+			
+			// 1. Check for end of statement
+			case ITokenConstants.EOL:
+			case ITokenConstants.SEMI:
+				return;
+			
+			
+			// 2. Check macro expansions
+			case ITokenConstants.WORD:
+				checkMacro(parent, token);
+				atStart = false;
+				break;
+			
+			// Check for shell constructs.  These should appear at the start of a line
+			// or after a semicolon.  If they don't,  just report an error and continue, 
+			// to be tolerant of our own lax parsing.
+			
+			// 3.a) Check dollar variables
+			case ITokenConstants.SH_DOLLAR:
+				// skip the next token
+				atStart = false;
+				token = tokenizer.readToken();
+				continue;
+				
+			// 3.b) Look for if/else/elif/fi constructs,
+			// being tolerant of nesting problems by allowing
+			// stranded else/elif nodes but reporting errors.
+			case ITokenConstants.SH_IF:
+				checkLineStart(parent, token, atStart);
+				parseBlock(parent, token, new AutoconfIfElement());
+				break;
+				
+			case ITokenConstants.SH_ELIF:
+				checkLineStart(parent, token, atStart);
+				checkBlockValidity(
+						parent, token, 
+						new Class[] { AutoconfIfElement.class, AutoconfElifElement.class },
+						INVALID_ELIF);
+				parseBlock(parent, token, new AutoconfElifElement());
+				token = tokenizer.peekToken();
+				throw new BlockEndCondition(token);
+			
+			case ITokenConstants.SH_ELSE:
+				checkLineStart(parent, token, atStart);
+				checkBlockValidity(
+						parent, token, 
+						new Class[] { AutoconfIfElement.class, AutoconfElifElement.class },
+						INVALID_ELSE);
+				parseBlock(parent, token, new AutoconfElseElement());
+				token = tokenizer.peekToken();
+				throw new BlockEndCondition(token);
+			
+			case ITokenConstants.SH_FI:
+				checkLineStart(parent, token, atStart);
+				checkBlockValidity(
+						parent, token, 
+						new Class[] { AutoconfIfElement.class, AutoconfElifElement.class, AutoconfElseElement.class },
+						INVALID_FI);
+				throw new BlockEndCondition(token);
+			
+				
+			// 4. Look for for/while loops
+			case ITokenConstants.SH_FOR:
+				checkLineStart(parent, token, atStart);
+				parseBlock(parent, token, new AutoconfForElement());
+				break;
+				
+			case ITokenConstants.SH_WHILE:
+				checkLineStart(parent, token, atStart);
+				parseBlock(parent, token, new AutoconfWhileElement());
+				break;
+				
+			case ITokenConstants.SH_UNTIL:
+				checkLineStart(parent, token, atStart);
+				parseBlock(parent, token, new AutoconfUntilElement());
+				break;
+				
+			case ITokenConstants.SH_SELECT:
+				checkLineStart(parent, token, atStart);
+				parseBlock(parent, token, new AutoconfSelectElement());
+				break;
+				
+			case ITokenConstants.SH_DONE:
+				checkLineStart(parent, token, atStart);
+				checkBlockValidity(
+						parent, token, 
+						new Class[] { AutoconfForElement.class, AutoconfWhileElement.class,
+								AutoconfUntilElement.class, AutoconfSelectElement.class },
+						INVALID_DONE);
+				throw new BlockEndCondition(token);
+			
+			// 5. Look for case statements
+			case ITokenConstants.SH_CASE:
+				checkLineStart(parent, token, atStart);
+				parseCaseBlock(parent, token, new AutoconfCaseElement());
+				break;
+				
+			case ITokenConstants.SH_CASE_CONDITION_END:
+				checkBlockValidity(
+						parent, token, 
+						new Class[] { AutoconfCaseConditionElement.class },
+						IMPROPER_CASE_CONDITION);
+				throw new BlockEndCondition(token);
+			
+			case ITokenConstants.SH_ESAC:
+				checkLineStart(parent, token, atStart);
+				checkBlockValidity(
+						parent, token, 
+						// note: we don't strictly recurse here, so accept either parent
+						new Class[] { AutoconfCaseElement.class, AutoconfCaseConditionElement.class },
+						INVALID_ESAC);
+				throw new BlockEndCondition(token);
+			
+			
+			// 6. Check for HERE documents
+			case ITokenConstants.SH_HERE:
+			case ITokenConstants.SH_HERE_DASH:
+
+				parseHERE(parent, token);
+				break;
+			}
+		}
+	}
+
+	private void checkLineStart(AutoconfElement parent, Token token, boolean atStart) {
+		if (!atStart) {
+			handleError(parent, token, AutoconfEditorMessages.getFormattedString(INVALID_TERMINATION, token.getText()));
+		}
+	}
+
+	/**
+	 * Parse the Here document, whose control token is provided (SH_HERE or SH_HERE_DASH).
+	 * Contents are thrown away except for any macro calls.
+	 * @param parent
+	 * @param controlToken
+	 */
+	private void parseHERE(AutoconfElement parent, Token controlToken) {
+		Token token = tokenizer.readToken();
+		if (token.getType() == ITokenConstants.EOL || token.getType() == ITokenConstants.EOF) {
+			handleError(parent, token,
+					AutoconfEditorMessages.getString(INCOMPLETE_INLINE_MARKER));
+			
+		} else {
+			String hereTag = token.getText();
+		
+			boolean atEOL = false;
+			while (true) {
+				token = tokenizer.readToken();
+				if (token.getType() == ITokenConstants.EOF) {
+					handleError(parent, token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, parent.getName()));
+					break;
+				} else if (token.getType() == ITokenConstants.EOL) {
+					atEOL = true;
+				} else {
+					if (atEOL && token.getText().equals(hereTag)) {
+						// only the end if it is also followed by EOL without any whitespace
+						Token eol = tokenizer.readToken();
+						if (eol.getType() == ITokenConstants.EOL && eol.getOffset() == token.getOffset() + token.getLength()) {
+							break;
+						}
+					}
+					if (token.getType() == ITokenConstants.WORD) {
+						checkMacro(parent, token);
+					}
+					atEOL = false;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Parse through a single expression up to a semicolon or newline.
+	 * Add a macro call to the element or just return upon finding the desired token.
+	 * Whenever a token terminates the expression, we check its validity and return the final token
+	 * Throw {@link BlockEndCondition} if an unexpected token was found.
+	 * @param parent the parent into which to add statements.  The type of this element is used
+	 * to validate the legality of block closing tokens.
+	 */
+	protected Token parseExpression(AutoconfElement parent) throws BlockEndCondition {
+	
+		while (true) {
+			Token token = tokenizer.readToken();
+			
+			// 0. Ignore comments (tokenizer skipped them!)
+			
+			switch (token.getType()) {
+			// 1. Check EOF
+			case ITokenConstants.EOF:
+				throw new BlockEndCondition(token);
+		
+			// 2. Check macro expansions
+			case ITokenConstants.WORD:
+				token = checkMacro(parent, token);
+				break;
+			
+			// 3. Check expression terminators
+			case ITokenConstants.SEMI:
+			case ITokenConstants.EOL:
+				return token;
+
+			// 4. Handle variables
+			case ITokenConstants.SH_DOLLAR:
+				token = tokenizer.readToken();
+				break;
+				
+			case ITokenConstants.SH_IN:
+				// in 'for' or 'select, an 'in' may occur before 'do'
+				if (!(parent instanceof AutoconfForElement)
+						&& !(parent instanceof AutoconfSelectElement)) 
+					return token;
+				// fall through
+				
+			// 5. Abort on unexpected tokens
+			case ITokenConstants.SH_DO:
+			case ITokenConstants.SH_THEN:
+				handleError(parent, token, AutoconfEditorMessages.getFormattedString(INVALID_SPECIFIER, token.getText()));
+				tokenizer.unreadToken(token);
+				// close enough...
+				return token;
+				
+			case ITokenConstants.SH_ESAC:
+			case ITokenConstants.SH_CASE:
+			case ITokenConstants.SH_CASE_CONDITION_END:
+			case ITokenConstants.SH_FOR:
+			case ITokenConstants.SH_IF:
+			case ITokenConstants.SH_ELIF:
+			case ITokenConstants.SH_ELSE:
+			case ITokenConstants.SH_FI:
+			case ITokenConstants.SH_DONE:
+				handleError(parent, token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, parent.getName()));
+				tokenizer.unreadToken(token);
+				throw new BlockEndCondition(token);
+			}
+		}
+	}
+
+	/**
+	 * Parse through a single expression up to 'do'.
+	 * Add a macro call to the element or just return upon finding the desired token.
+	 * Whenever a token terminates the expression, we check its validity and then throw ExprEndCondition.
+	 * Throw {@link BlockEndCondition} if an unexpected token was found.
+	 * @param parent the parent into which to add statements.  The type of this element is used
+	 * to validate the legality of block closing tokens.
+	 */
+	protected Token parseForExpression(AutoconfElement parent) throws BlockEndCondition {
+		while (true) {
+			Token token = tokenizer.readToken();
+			
+			// 0. Ignore comments (tokenizer skipped them!)
+			
+			// 1. Check EOF
+			if (token.getType() == ITokenConstants.EOF) {
+				throw new BlockEndCondition(token);
+			}
+		
+			// 2. Check macro expansions
+			else if (token.getType() == ITokenConstants.WORD) {
+				token = checkMacro(parent, token);
+			}
+			
+			// 3. Check expression terminators -- not ';' here, but 'do'
+			else if (token.getType() == ITokenConstants.SH_DO) {
+				tokenizer.unreadToken(token);
+				return tokenizer.peekToken();
+			}
+			
+			// 4. Abort on unexpected tokens
+			else switch (token.getType()) {
+			case ITokenConstants.SH_THEN:
+				handleError(parent, token, AutoconfEditorMessages.getFormattedString(INVALID_SPECIFIER, token.getText()));
+				tokenizer.unreadToken(token);
+				// close enough...
+				//throw new ExprEndCondition(token);
+				return token;
+				
+			case ITokenConstants.SH_ESAC:
+			case ITokenConstants.SH_CASE:
+			case ITokenConstants.SH_CASE_CONDITION_END:
+			case ITokenConstants.SH_FOR:
+			case ITokenConstants.SH_IF:
+			case ITokenConstants.SH_ELIF:
+			case ITokenConstants.SH_ELSE:
+			case ITokenConstants.SH_FI:
+			case ITokenConstants.SH_DONE:
+				handleError(parent, token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, parent.getName()));
+				tokenizer.unreadToken(token);
+				throw new BlockEndCondition(token);
+			}
+		}
+	}
+
+	/**
+	 * Parse through a single expression up to 'in'.
+	 * Add a macro call to the element or just return upon finding the desired token.
+	 * Whenever a token terminates the expression, we check its validity and then throw ExprEndCondition.
+	 * Throw {@link BlockEndCondition} if an unexpected token was found.
+	 * @param parent the parent into which to add statements.  The type of this element is used
+	 * to validate the legality of block closing tokens.
+	 */
+	protected Token parseCaseExpression(AutoconfElement parent) throws BlockEndCondition {
+		while (true) {
+			Token token = tokenizer.readToken();
+			
+			// 0. Ignore comments (tokenizer skipped them!)
+			
+			// 1. Check EOF
+			if (token.getType() == ITokenConstants.EOF) {
+				throw new BlockEndCondition(token);
+			}
+		
+			// 2. Check macro expansions
+			else if (token.getType() == ITokenConstants.WORD) {
+				token = checkMacro(parent, token);
+			}
+			
+			// 3. Check expression terminators
+			else if (parent instanceof AutoconfCaseElement && token.getType() == ITokenConstants.SH_IN) {
+				return token;
+			}
+			else if (parent instanceof AutoconfCaseConditionElement && token.getType() == ITokenConstants.RPAREN) {
+				return token;
+			}
+			
+			// 4. Abort on unexpected tokens
+			else switch (token.getType()) {
+			case ITokenConstants.SEMI:
+			case ITokenConstants.SH_IN:
+			case ITokenConstants.RPAREN:
+			case ITokenConstants.SH_DO:
+			case ITokenConstants.SH_THEN:
+				if (parent instanceof AutoconfCaseElement)
+					handleError(parent, token, AutoconfEditorMessages.getString(INVALID_IN));
+				else
+					handleError(parent, token, AutoconfEditorMessages.getString(IMPROPER_CASE_CONDITION));
+				// close enough...
+				return token;
+				
+			case ITokenConstants.SH_ESAC:
+			case ITokenConstants.SH_CASE:
+			case ITokenConstants.SH_CASE_CONDITION_END:
+			case ITokenConstants.SH_FOR:
+			case ITokenConstants.SH_IF:
+			case ITokenConstants.SH_ELIF:
+			case ITokenConstants.SH_ELSE:
+			case ITokenConstants.SH_FI:
+			case ITokenConstants.SH_DONE:
+				handleError(parent, token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, parent.getName()));
+				tokenizer.unreadToken(token);
+				throw new BlockEndCondition(token);
+			}
+		}
+	}
+	
+	/**
+	 * Check a given close block token against the current parent by checking that
+	 * the parent's class is one of classes,  If a match happens,
+	 * optionally push back the token if it will be used to parse new statements in the parent.
+	 * Report an error if the parent is not one of the expected kinds.
+	 * @param parent
+	 * @param token
+	 * @param classes
+	 */
+	private void checkBlockValidity(
+			AutoconfElement parent, 
+			Token token,
+			Class<?>[] classes,
+			String errorMessage) {
+		for (int i = 0; i < classes.length; i++) {
+			if (classes[i].isInstance(parent)) {
+				return;
+			}
+		}
+		
+		// not a match
+		handleError(parent, token, 
+				AutoconfEditorMessages.getFormattedString(errorMessage, parent.getName(), token.getText()));
+	}
+
+	/**
+	 * Check whether the given token is part of a macro, and parse it as such
+	 * if necessary.  
+	 * @param parent
+	 * @param token
+	 * @return Token last read for the macro call
+	 */
+	private Token checkMacro(AutoconfElement parent, Token token) {
+		String name = token.getText();
+		
+		boolean hasArguments = tokenizer.peekToken().getType() == ITokenConstants.LPAREN;
+		if (macroDetector != null && macroDetector.isMacroIdentifier(name)) {
+			// ok
+		} else if (m4builtins.contains(name)) {
+			// all of these except dnl take arguments
+			if (!name.equals("dnl") && !hasArguments)
+				return token;
+		} else {
+			return token;
+		}
+		
+		AutoconfMacroElement macro = new AutoconfMacroElement(name);
+		token = parseMacro(macro, token);
+		
+		// handle special macros here
+		if ("dnl".equals(name)) {
+			// consume to EOL
+			while (true) {
+				token = tokenizer.readToken();
+				if (token.getType() == ITokenConstants.EOF || token.getType() == ITokenConstants.EOL)
+					break;
+			}
+			
+			// ignore macro entirely
+			macro = null;
+		} else if ("changequote".equals(name)) {
+			// change quote delimiters
+			validateMacroParameterCount(macro, token, 2);
+			
+			// GNU behavior for invalid argument count
+			String parm0 = "`";
+			String parm1 = "'";
+			if (macro.getParameterCount() >= 1)
+				parm0 = macro.getParameter(0);
+			if (macro.getParameterCount() >= 2)
+				parm1 = macro.getParameter(1);
+			
+			tokenizer.setM4Quote(parm0, parm1);
+		}  else if ("changecom".equals(name)) {
+			// change comment delimiters
+			validateMacroParameterCount(macro, token, 2);
+			
+			// GNU behavior for invalid argument count
+			String parm0 = "#";
+			String parm1 = "\n";
+			if (macro.getParameterCount() >= 1)
+				parm0 = macro.getParameter(0);
+			if (macro.getParameterCount() >= 2)
+				parm1 = macro.getParameter(1);
+			
+			tokenizer.setM4Comment(parm0, parm1);
+		}
+		
+		if (macro != null) {
+			parent.addChild(macro);
+		}
+		
+		// now validate that the macro is properly terminated
+		if (!(parent instanceof AutoconfMacroArgumentElement) 
+				&& !(parent instanceof AutoconfMacroElement)
+				&& !(parent instanceof AutoconfForElement)) {
+			Token peek = tokenizer.peekToken();
+			if (peek.getType() == ITokenConstants.RPAREN) {
+				handleError(macro, peek, AutoconfEditorMessages.getString(UNMATCHED_RIGHT_PARENTHESIS)); 
+			}
+		}
+		
+		return token;
+	}
+
+	private void validateMacroParameterCount(AutoconfMacroElement macro, Token token, int count) {
+		if (macro.getParameterCount() < count) {
+			handleError(macro, token, AutoconfEditorMessages.getFormattedString("M4MacroArgsTooFew", macro.getName(), new Integer(2))); 
+		} else if (macro.getParameterCount() > count) {
+			handleError(macro, token, AutoconfEditorMessages.getFormattedString("M4MacroArgsTooMany", macro.getName(), new Integer(2)));
+		}
+	}
+
+	/**
+	 * Start parsing a macro call at a suspected macro expansion location.
+	 * @param macro
+	 * @param line the line containing the start of the 
+	 * @param parent
+	 * @return last token parsed
+	 */
+	protected Token parseMacro(AutoconfMacroElement macro, Token macroName) {
+		setSourceStart(macro, macroName);
+		
+		// parse any arguments
+		tokenizer.setM4Context(true);
+		
+		Token token = tokenizer.readToken();
+		if (token.getType() == ITokenConstants.LPAREN) {
+			token = parseMacroArguments(macro, token);
+			setSourceEnd(macro, token);
+		} else {
+			tokenizer.unreadToken(token);
+			setSourceEnd(macro, macroName);
+		}
+		
+		tokenizer.setM4Context(false);
+		
+		// validate macro arguments?
+		if (macroValidator != null) {
+			try {
+				macroValidator.validateMacroCall(macro);
+			} catch (ParseException e) {
+				errorHandler.handleError(e);
+			}
+		}
+		
+		return token;
+	}
+
+	/**
+	 * Parse the arguments for the given macro.  These are not interpreted as shell
+	 * constructs but just as text with possibly more macro expansions inside.
+	 * @param macro
+	 * @return final token (')')
+	 */
+	protected Token parseMacroArguments(AutoconfMacroElement macro, Token lparen) {
+		Token argStart = null;
+		Token argEnd = null;
+		Token token;
+		
+		// When parsing, we want to ignore the whitespace around the arguments.
+		// So, instead of taking the source range "between" a parenthesis and a comma,
+		// track the exact tokens forming the start and end of an argument, defaulting
+		// to the borders of the parentheses and commas if no text is included.
+		
+		StringBuffer argBuffer = new StringBuffer();
+		AutoconfMacroArgumentElement arg = new AutoconfMacroArgumentElement();
+
+		while (true) {
+			token = tokenizer.readToken();
+			
+			if (token.getType() == ITokenConstants.EOL) {
+				if (argBuffer.length() > 0)
+					argBuffer.append(token.getText());
+				continue;
+			}
+			
+			if (token.getType() == ITokenConstants.COMMA 
+					|| token.getType() == ITokenConstants.RPAREN
+					|| token.getType() == ITokenConstants.EOF) {
+
+				arg.setName(argBuffer.toString());
+				argBuffer.setLength(0);
+				
+				if (argStart != null && argEnd != null) {
+					setSourceStart(arg, argStart);
+					setSourceEnd(arg, argEnd);
+				} else if (argEnd != null) {
+					setSourceStart(arg, argStart);
+					setSourceEndBefore(arg, token);
+				} else {
+					// empty argument
+					setSourceStart(arg, token);
+					setSourceEndBefore(arg, token);
+				}
+				
+				macro.addChild(arg);
+				
+				if (token.getType() != ITokenConstants.COMMA)
+					break;
+				
+				argStart = null;
+				argEnd = null;
+				
+				arg = new AutoconfMacroArgumentElement();
+
+			} else {
+				if (argStart == null) {
+					argStart = token;
+				}
+				argEnd = token;
+				
+				if (argBuffer.length() > 0 && token.followsSpace())
+					argBuffer.append(' ');
+				argBuffer.append(token.getText());
+				
+				// handle nested macro calls in arguments
+				if (token.getType() == ITokenConstants.WORD) {
+					argEnd = checkMacro(arg, token);
+				}
+			}
+		}
+		
+		if (token.getType() != ITokenConstants.RPAREN) {
+			handleError(macro, token, AutoconfEditorMessages.getString(UNMATCHED_LEFT_PARENTHESIS)); 
+		}
+		
+		// note: moved 15-char truncation to AutoconfLabelProvider
+		AutoconfElement[] children = macro.getChildren();
+		if (children.length > 0)
+			macro.setVar(children[0].getVar());
+		
+		return token;
+	}
+	
+
+	
+	protected void handleError(AutoconfElement element, Token token, String message) {
+		handleMessage(element, token, message, IMarker.SEVERITY_ERROR);
+	}
+	protected void handleWarning(AutoconfElement element, Token token, String message) {
+		handleMessage(element, token, message, IMarker.SEVERITY_WARNING);
+	}
+	protected void handleMessage(AutoconfElement element, Token token, String message, int severity) {
+		if (errorHandler != null) {
+			int lineNumber = 0;
+			int startColumn = 0;
+			int endColumn = 0;
+			try {
+				lineNumber = token.getDocument().getLineOfOffset(token.getOffset());
+				int lineOffs = token.getDocument().getLineOffset(lineNumber);
+				startColumn = token.getOffset() - lineOffs;
+				endColumn = startColumn + token.getLength();
+			} catch (BadLocationException e) {
+				// Don't care if we blow up trying to issue marker
+			}
+			errorHandler.handleError(new ParseException(
+					message,
+					token.getOffset(),
+					token.getOffset() + token.getLength(),
+					lineNumber, 
+					startColumn, endColumn,
+					severity));
+		}
+	}
+
+	public IAutoconfErrorHandler getErrorHandler() {
+		return errorHandler;
+	}
+}
+
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfRootElement.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfRootElement.java
new file mode 100644
index 0000000..105d00b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfRootElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfRootElement extends AutoconfElement {
+	
+	public AutoconfRootElement() {
+		super(""); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfSelectElement.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfSelectElement.java
new file mode 100644
index 0000000..aded97c
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfSelectElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfSelectElement extends AutoconfElement {
+	
+	public AutoconfSelectElement() {
+		super("select");
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfTokenizer.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfTokenizer.java
new file mode 100644
index 0000000..a34cbb2
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfTokenizer.java
@@ -0,0 +1,434 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+
+
+/**
+ * This tokenizer traverses autotools-style text (m4 or configure.ac) to support the
+ * autoconf parser.  It tracks the current context (m4 macro call or shell commands)
+ * to detect appropriate tokens, and tracks the m4 current quote style as well.
+ * <p>
+ * In m4 mode, its primary purpose is to find word boundaries, detect comments and quoted
+ * strings, and to find the macro punctuation tokens.  It will not interpret anything
+ * (e.g. '$1' inside a macro) -- this is up to the parser.
+ * <p>
+ * In shell script mode, its primary purpose is to identify enough
+ * tokens to get a general picture of the structure of source for use by the autoconf
+ * parser.  This isn't intended to be used for full shell script parsing.  In fact,
+ * aside from the known tokens and identifiers, only individual characters will be returned.
+ * <p>
+ * Both modes know about "words" or identifiers and use the same syntax to detect these.
+ * It's expected that the parser will detect a word as a macro or possible macro and
+ * switch the mode of the tokenizer to fit.  The parser should invoke "setM4Context(...)"
+ * (and "unreadToken" if necessary) to switch modes.
+ * @author eswartz
+ *
+ */
+public class AutoconfTokenizer {
+
+	private static final String UNTERMINATED_STRING = "UnterminatedString"; //$NON-NLS-1$
+	public static final String UNMATCHED_RIGHT_QUOTE = "UnmatchedRightQuote"; //$NON-NLS-1$
+	public static final String UNMATCHED_LEFT_QUOTE = "UnmatchedLeftQuote"; //$NON-NLS-1$
+	public static final String UNMATCHED_CLOSE_COMMENT = "UnmatchedCloseComment"; //$NON-NLS-1$
+	
+	private IDocument document;
+	private int offset;
+	private String m4OpenQuote;
+	private String m4CloseQuote;
+	private String m4OpenComment;
+	private String m4CloseComment;
+	private char[] chars;
+	private int startOffset;
+	private boolean isM4Context;
+	private Token eofToken;
+	private IAutoconfErrorHandler errorHandler;
+
+	/** Create a tokenizer for a document. */
+	public AutoconfTokenizer(IDocument document, IAutoconfErrorHandler errorHandler) {
+		if (document == null /* || macroDetector == null*/)
+			throw new IllegalArgumentException();
+		this.document = document;
+		this.errorHandler = errorHandler;
+		
+		this.chars = document.get().toCharArray();
+		this.offset = 0;
+		
+		this.eofToken = new Token(ITokenConstants.EOF, "", document, chars.length, 0);
+		
+		this.m4OpenQuote = "`";
+		this.m4CloseQuote = "'";
+		this.m4OpenComment = "#";
+		this.m4CloseComment = "\n";
+	}
+	
+	/**
+	 * Tell whether the tokenizer considers itself to be in an m4 context.
+	 * This determines what kinds of tokens it returns.
+	 * @return
+	 */
+	public boolean isM4Context() {
+		return isM4Context;
+	}
+	
+	/**
+	 * Switch the tokenizer into or out of m4 context.
+	 * @return
+	 */
+	public void setM4Context(boolean flag) {
+		isM4Context = flag;
+	}
+	
+	/** 
+	 * Set the m4 quote delimiters
+	 */
+	public void setM4Quote(String open, String close) {
+		this.m4OpenQuote = open;
+		this.m4CloseQuote = close;
+	}
+
+	/** 
+	 * Set the m4 comment delimiters
+	 */
+	public void setM4Comment(String open, String close) {
+		this.m4OpenComment = open;
+		this.m4CloseComment = close;
+	}
+	
+	/** Push back the given token.  This allows the tokenizer to restart from its start position,
+	 * potentially in a different context. */
+	public void unreadToken(Token token) {
+		if (token.getLength() > 0 && offset == token.getOffset())
+			throw new IllegalStateException();
+		offset = token.getOffset();
+	}
+	
+	/** Read the next token. Returns an EOF token at EOF. */
+	public Token readToken() {
+		if (offset >= chars.length)
+			return eofToken;
+		
+		char ch = chars[offset];
+		
+		// skip whitespace (but not EOL)
+		while (isWhitespace(ch)) {
+			offset++;
+			if (offset >= chars.length)
+				return eofToken;
+			ch = chars[offset];
+		}
+
+		// in shell mode, strip comments up to eol 
+		if (!isM4Context && ch == '#') {
+			while (offset < chars.length) {
+				ch = chars[offset];
+				if (ch == '\n')
+					break;
+				offset++;
+			}
+			
+			// keep inside doc if we didn't find that EOL
+			if (offset >= chars.length)
+				offset--;
+		}
+
+		startOffset = offset;
+		StringBuffer buffer = new StringBuffer();
+		
+		// check EOL
+		if (ch == '\r' || ch == '\n') {
+			buffer.append(ch);
+			offset++;
+			if (ch == '\r' && offset < chars.length && chars[offset] == '\n') {
+				buffer.append(chars[offset++]);
+			}
+			return makeToken(ITokenConstants.EOL, buffer.toString());
+		}
+		
+		// TODO: this parser always uses fixed logic for identifier reading, ignoring m4's "changeword"
+		if (isLeadIdentifierChar(ch)) {
+			return parseWord(ch);
+		}
+		
+		// check comments and quotes
+		if (isM4Context) {
+			if (lookAhead(m4OpenComment)) {
+				boolean found = false;
+				// keep reading until the close comment (these are NOT nested)
+				while (offset < chars.length) {
+					if (lookAhead(m4CloseComment)) {
+						found = true;
+						break;
+					}
+					offset++;
+				}
+				if (!found) {
+					handleError(startOffset, offset, AutoconfEditorMessages.getFormattedString(UNMATCHED_CLOSE_COMMENT, 
+							m4CloseComment.equals("\n") ? "newline" : m4CloseComment)); //$NON-NLS-1$
+				}
+				return makeToken(ITokenConstants.M4_COMMENT);
+			}
+			
+			if (lookAhead(m4OpenQuote)) {
+				return parseQuote();
+			}
+		}
+		
+		// check shell punctuation
+		if (!isM4Context) {
+			if (ch == ';' && offset + 1 < chars.length && chars[offset + 1] == ';') {
+				offset += 2;
+				return makeToken(ITokenConstants.SH_CASE_CONDITION_END);
+			}
+			if (ch == '<' && offset + 1 < chars.length && chars[offset + 1] == '<') {
+				offset += 2;
+				if (offset < chars.length && chars[offset] == '-') {
+					offset++;
+					return makeToken(ITokenConstants.SH_HERE_DASH);
+				} else {
+					return makeToken(ITokenConstants.SH_HERE);
+				}
+			}
+			switch (ch) {
+			case '$':
+				offset++;
+				return makeToken(ITokenConstants.SH_DOLLAR);
+			case '[':
+				offset++;
+				return makeToken(ITokenConstants.SH_LBRACKET);
+			case ']':
+				offset++;
+				return makeToken(ITokenConstants.SH_RBRACKET);
+			case '{':
+				offset++;
+				return makeToken(ITokenConstants.SH_LBRACE);
+			case '}':
+				offset++;
+				return makeToken(ITokenConstants.SH_RBRACE);
+			case '\'':
+				return parseString(ITokenConstants.SH_STRING_SINGLE, ch);
+			case '\"':
+				return parseString(ITokenConstants.SH_STRING_DOUBLE, ch);
+			case '`':
+				return parseString(ITokenConstants.SH_STRING_BACKTICK, ch);
+			}
+		}
+		
+		// check common punctuation
+		if (ch == ';') {
+			offset++;
+			return makeToken(ITokenConstants.SEMI);
+		}
+		if (ch == ',') {
+			offset++;
+			return makeToken(ITokenConstants.COMMA);
+		}
+		if (ch == '(') {
+			offset++;
+			return makeToken(ITokenConstants.LPAREN);
+		}
+		if (ch == ')') {
+			offset++;
+			return makeToken(ITokenConstants.RPAREN);
+		}
+		
+		// unknown text
+		offset++;
+		return makeToken(ITokenConstants.TEXT);
+	}
+
+	private Token parseWord(char ch) {
+		StringBuffer buffer = new StringBuffer();
+		
+		buffer.append(ch);
+		offset++;
+		do {
+			if (offset >= chars.length)
+				break;
+			ch = chars[offset];
+			if (!isIdentifierChar(ch))
+				break;
+			buffer.append(ch);
+			offset++;
+		} while (true);
+		
+		String text = buffer.toString();
+		
+		if (!isM4Context) {
+			// detect sh tokens
+			if ("case".equals(text))
+				return makeToken(ITokenConstants.SH_CASE, text);
+			if ("in".equals(text))
+				return makeToken(ITokenConstants.SH_IN, text);
+			if ("esac".equals(text))
+				return makeToken(ITokenConstants.SH_ESAC, text);
+			if ("while".equals(text))
+				return makeToken(ITokenConstants.SH_WHILE, text);
+			if ("select".equals(text))
+				return makeToken(ITokenConstants.SH_SELECT, text);
+			if ("until".equals(text))
+				return makeToken(ITokenConstants.SH_UNTIL, text);
+			if ("for".equals(text))
+				return makeToken(ITokenConstants.SH_FOR, text);
+			if ("do".equals(text))
+				return makeToken(ITokenConstants.SH_DO, text);
+			if ("done".equals(text))
+				return makeToken(ITokenConstants.SH_DONE, text);
+			if ("if".equals(text))
+				return makeToken(ITokenConstants.SH_IF, text);
+			if ("then".equals(text))
+				return makeToken(ITokenConstants.SH_THEN, text);
+			if ("else".equals(text))
+				return makeToken(ITokenConstants.SH_ELSE, text);
+			if ("elif".equals(text))
+				return makeToken(ITokenConstants.SH_ELIF, text);
+			if ("fi".equals(text))
+				return makeToken(ITokenConstants.SH_FI, text);
+		}
+		
+		// other identifier-looking word
+		return makeToken(ITokenConstants.WORD, text);
+	}
+	
+	private Token parseQuote() {
+		// read text, honoring nested quotes, but don't put the outermost quotes in the token  
+		
+		StringBuffer buffer = new StringBuffer();
+		
+		int quoteLevel = 1;
+		// keep reading until the close quote
+		while (offset < chars.length) {
+			if (lookAhead(m4CloseQuote)) {
+				quoteLevel--;
+				if (quoteLevel == 0)
+					break;
+				buffer.append(m4CloseQuote);
+			} else if (lookAhead(m4OpenQuote)) {
+				buffer.append(m4OpenQuote);
+				quoteLevel++;
+			} else {
+				buffer.append(chars[offset]);
+				offset++;
+			}
+		}
+		
+		if (quoteLevel > 0) {
+			handleError(startOffset, offset, AutoconfEditorMessages.getFormattedString(UNMATCHED_LEFT_QUOTE, m4CloseQuote));
+		} else if (quoteLevel < 0) {
+			handleError(startOffset, offset, AutoconfEditorMessages.getFormattedString(UNMATCHED_RIGHT_QUOTE, m4OpenQuote));
+		}
+		
+		return makeToken(ITokenConstants.M4_STRING, buffer.toString());
+	}
+
+	private Token parseString(int type, char terminal) {
+		startOffset = offset;
+		offset++;
+		
+		StringBuffer buffer = new StringBuffer();
+		
+		char ch = 0;
+		while (offset < chars.length) {
+			ch = chars[offset++];
+			if (ch == '\\') {
+				if (offset < chars.length)
+					buffer.append(chars[offset++]);
+				else
+					buffer.append(ch);
+			} else if (ch == terminal) {
+				break;
+			} else {
+				buffer.append(ch);
+			}
+		}
+
+		if (ch != terminal) {
+			handleError(startOffset, offset, AutoconfEditorMessages.getFormattedString(UNTERMINATED_STRING, "" + ch));
+		}
+		
+		return makeToken(type, buffer.toString());
+	}
+
+	private void handleError(int start, int end,
+			String message) {
+		if (errorHandler != null) {
+			int lineNumber = 0;
+			int startColumn = 0;
+			int endColumn = 0;
+			try {
+				lineNumber = document.getLineOfOffset(start);
+				int lineOffs = document.getLineOffset(lineNumber);
+				startColumn = start - lineOffs;
+				endColumn = end - lineOffs;
+			} catch (BadLocationException e) {
+				// Don't care if we blow up trying to issue marker
+			}
+			errorHandler.handleError(new ParseException(
+					message,
+					start, end,
+					lineNumber, 
+					startColumn, endColumn,
+					IMarker.SEVERITY_ERROR));
+		}
+	}
+
+	/** 
+	 * Look ahead for the given string.  If found, return true, and have
+	 * offset updated.  Otherwise, return false with offset unchanged.
+	 * @param keyword
+	 * @param text
+	 * @return
+	 */
+	private boolean lookAhead(String keyword) {
+		int length = keyword.length();
+		if (offset + length > chars.length) {
+			return false;
+		}
+		for (int idx = 0; idx < length; idx++) {
+			if (chars[offset + idx] != keyword.charAt(idx))
+				return false;
+		}
+		offset += length;
+		return true;
+	}
+
+	private boolean isWhitespace(char ch) {
+		return ch == ' ' || ch == '\t' || ch == '\f';
+	}
+
+	private Token makeToken(int type) {
+		return new Token(type,
+				new String(chars, startOffset, offset - startOffset),
+				document, startOffset, offset - startOffset);
+	}
+
+	private Token makeToken(int type, String text) {
+		return new Token(type, text, document, startOffset, offset - startOffset);
+	}
+
+	private boolean isIdentifierChar(char ch) {
+		return isLeadIdentifierChar(ch) || (ch >= '0' && ch <= '9');
+	}
+
+	private boolean isLeadIdentifierChar(char ch) {
+		return (ch >= 'A' &&  ch <= 'Z') || (ch >= 'a' && ch <= 'z') || ch == '_';
+	}
+	
+	public Token peekToken() {
+		Token token = readToken();
+		unreadToken(token);
+		return token;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfUntilElement.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfUntilElement.java
new file mode 100644
index 0000000..bf6eb59
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfUntilElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfUntilElement extends AutoconfElement {
+	
+	public AutoconfUntilElement() {
+		super("until");
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfWhileElement.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfWhileElement.java
new file mode 100644
index 0000000..8d247f7
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfWhileElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfWhileElement extends AutoconfElement {
+	
+	public AutoconfWhileElement() {
+		super("while");
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfErrorHandler.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfErrorHandler.java
new file mode 100644
index 0000000..1363240
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfErrorHandler.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+
+/**
+ * Clients implement this interface to handle errors encountered while parsing.
+ * @author eswartz
+ *
+ */
+public interface IAutoconfErrorHandler {
+
+	/**
+	 * Handle an exception associated with the given element
+	 * @param exception the exception to handle; has a line number
+	 * at the time of call
+	 */
+	void handleError(ParseException exception);
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroDetector.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroDetector.java
new file mode 100644
index 0000000..e438731
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroDetector.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+
+/**
+ * Clients implement this interface to identify what identifiers represent 
+ * macros for the autoconf tree.
+ * @author eswartz
+ *
+ */
+public interface IAutoconfMacroDetector {
+
+	/**
+	 * Tell if this identifier should be treated as an m4 macro call.
+	 * The identifier has already been judged to be a valid candidate
+	 * (i.e. it's not quoted).
+	 * @param name the string to check
+	 */
+	boolean isMacroIdentifier(String name);
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroValidator.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroValidator.java
new file mode 100644
index 0000000..2a54ee4
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroValidator.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+
+/**
+ * Clients implement this interface to validate macro calls.
+ * @author eswartz
+ *
+ */
+public interface IAutoconfMacroValidator {
+
+	/**
+	 * Validate the given macro call.
+	 * @param element macro call, never <code>null</code>
+	 * @throws ParseException if the call doesn't match the expected number of elements 
+	 */
+	void validateMacroCall(AutoconfMacroElement element) throws ParseException;
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IMacroDetector.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IMacroDetector.java
new file mode 100644
index 0000000..b225942
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IMacroDetector.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+/**
+ * Clients implement this interface to detect whether a given identifier 
+ * represents a known or potential macro in m4 or configure.ac text.
+ * @author eswartz
+ *
+ */
+public interface IMacroDetector {
+	boolean isMacro(String identifier);
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ITokenConstants.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ITokenConstants.java
new file mode 100644
index 0000000..b665115
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ITokenConstants.java
@@ -0,0 +1,87 @@
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public interface ITokenConstants {
+
+	/** end of file */
+	public static final int EOF = 0;
+	/** end of line */
+	public static final int EOL = 1;
+	
+	/** an open parenthesis */
+	public static final int LPAREN = 2;
+	/** a close parenthesis */
+	public static final int RPAREN = 3;
+	/** a comma */
+	public static final int COMMA = 4;
+	/** a semicolon */
+	public static final int SEMI = 5;
+
+	/** a word (either m4 word or shell identifier-looking word) */
+	public static final int WORD = 6;
+
+	/** other text (usually punctuation or number, one char at a time) */
+	public static final int TEXT = 7;
+
+	/** an m4 string (the text does not contain the outermost quotes) */
+	public static final int M4_STRING = 21;
+	/** an m4 comment (as determined by changecomment, NOT dnl) */
+	public static final int M4_COMMENT = 22;
+	
+	/** the sh 'if' token */
+	public static final int SH_IF = 40;
+	/** the sh 'then' token */
+	public static final int SH_THEN = 41;
+	/** the sh 'else' token */
+	public static final int SH_ELSE = 42;
+	/** the sh 'elif' token */
+	public static final int SH_ELIF = 43;
+	/** the sh 'fi' token */
+	public static final int SH_FI = 44;
+	
+	/** the sh 'while' token */
+	public static final int SH_WHILE = 45;
+	/** the sh 'for' token */
+	public static final int SH_FOR = 46;
+	/** the sh 'select' token */
+	public static final int SH_SELECT = 47;
+	/** the sh 'until' token */
+	public static final int SH_UNTIL = 48;
+	/** the sh 'do' token */
+	public static final int SH_DO = 49;
+	/** the sh 'done' token */
+	public static final int SH_DONE = 50;
+	/** the sh 'case' token */
+	
+	public static final int SH_CASE = 51;
+	/** the sh 'in' token */
+	public static final int SH_IN = 52;
+	/** the sh ';;' token */
+	public static final int SH_CASE_CONDITION_END = 53;
+	/** the sh 'esac' token */
+	public static final int SH_ESAC = 54;
+
+	/** the sh '$' token */
+	public static final int SH_DOLLAR = 60;
+	
+	/** the sh '{' token */
+	public static final int SH_LBRACE = 61;
+	/** the sh '}' token */
+	public static final int SH_RBRACE = 62;
+	/** the sh '[' token */
+	public static final int SH_LBRACKET = 63;
+	/** the sh ']' token */
+	public static final int SH_RBRACKET = 64;
+	
+	/** the sh '<<' token */
+	public static final int SH_HERE = 65;
+	/** the sh '<<-' token */
+	public static final int SH_HERE_DASH = 66;
+	/** an sh double-quoted string */
+	public static final int SH_STRING_DOUBLE = 67;
+	/** an sh single-quoted string */
+	public static final int SH_STRING_SINGLE = 68;
+	/** an sh backtick-quoted string */
+	public static final int SH_STRING_BACKTICK = 69;
+
+
+}
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ParseException.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ParseException.java
new file mode 100644
index 0000000..f0bc442
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ParseException.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class ParseException extends Exception {
+	
+	static final long serialVersionUID = 1;
+	String message;
+	int severity;
+	int lineNumber;
+	int startColumn;
+	int endColumn;
+	private int startOffset;
+	private int endOffset;
+	public int getEndColumn() {
+		return endColumn;
+	}
+	public void setEndColumn(int endColumn) {
+		this.endColumn = endColumn;
+	}
+	public int getLineNumber() {
+		return lineNumber;
+	}
+	public void setLineNumber(int lineNumber) {
+		this.lineNumber = lineNumber;
+	}
+	public String getMessage() {
+		return message;
+	}
+	public void setMessage(String message) {
+		this.message = message;
+	}
+	public int getStartColumn() {
+		return startColumn;
+	}
+	public void setStartColumn(int startColumn) {
+		this.startColumn = startColumn;
+	}
+	public ParseException(String message,
+			int startOffset, int endOffset,
+			int lineNumber, int startColumn, int endColumn, int severity) {
+		super();
+		this.message = message;
+		this.startOffset = startOffset;
+		this.endOffset = endOffset;
+		this.lineNumber = lineNumber;
+		this.startColumn = startColumn;
+		this.endColumn = endColumn;
+		this.severity = severity;
+	}
+	public int getSeverity() {
+		return severity;
+	}
+	public void setSeverity(int severity) {
+		this.severity = severity;
+	}
+	public int getStartOffset() {
+		return startOffset;
+	}
+	public int getEndOffset() {
+		return endOffset;
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/Token.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/Token.java
new file mode 100644
index 0000000..9690363
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/Token.java
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+import org.eclipse.jface.text.IDocument;
+
+/**
+ * A single token parsed from an autotools-style file.  This represents m4 and sh
+ * tokens.  Punctuation characters shared by both are not in a namespace.
+ * 
+ * @author eswartz
+ *
+ */
+public class Token implements ITokenConstants {
+	/** Type: 
+	 * @see ITokenConstants
+	 */
+	final int type;
+	/**
+	 * Text of token, possibly interpreted or reduced from original characters
+	 */
+	final String text;
+	/**
+	 * Offset of token before interpretation
+	 */
+	final int offset;
+	/**
+	 * Length of token before interpretation
+	 */
+	final int length;
+	/**
+	 * The document providing the text
+	 */
+	final IDocument document;
+
+	public Token(int type, String text, IDocument document, int offset, int length) {
+		this.type = type;
+		this.text = text;
+		this.document = document;
+		this.offset = offset;
+		this.length = length;
+	}
+	
+	public String toString() {
+		return text;
+	}
+
+	public int getType() {
+		return type;
+	}
+
+	public String getText() {
+		return text;
+	}
+
+	public IDocument getDocument() {
+		return document;
+	}
+
+	public int getOffset() {
+		return offset;
+	}
+	
+	public int getLength() {
+		return length;
+	}
+
+	public boolean followsSpace() {
+		char[] text = document.get().toCharArray();
+		if (offset == 0)
+			return false;
+		return (" \t\r\n\f".indexOf(text[offset - 1]) >= 0);
+	}
+	
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java
new file mode 100644
index 0000000..8bc173f
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java
@@ -0,0 +1,243 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.properties;
+
+import org.eclipse.cdt.core.settings.model.ICResourceDescription;
+import org.eclipse.cdt.managedbuilder.ui.properties.AbstractCBuildPropertyTab;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.linuxtools.cdt.autotools.AutotoolsMakefileBuilder;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+
+public class AutotoolsBuildPropertyPage extends AbstractCBuildPropertyTab {
+
+	private String TRUE = "true"; // $NON-NLS-1$
+	private String FALSE = "false"; // $NON-NLS-1$
+	private String SCANNERMAKEW_LABEL = "ScannerMakeW.label"; // $NON-NLS-1$
+	private String SCANNERMAKEW_TOOLTIP = "ScannerMakeW.tooltip"; // $NON-NLS-1$
+	
+	protected Button fCleanDelete;
+	protected Button fCleanMake;
+	protected Text   fCleanMakeTarget;
+	protected Button fScannerMakeW;
+
+	private IProject getProject() {
+		return (IProject)getCfg().getManagedProject().getOwner();
+	}
+
+	public boolean canBeVisible() {
+		return AutotoolsMakefileBuilder.hasTargetBuilder(getProject());
+	}
+
+	public void createControls(Composite parent) {
+		super.createControls(parent);
+		Composite composite= usercomp;
+		// assume parent page uses griddata
+		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_FILL | GridData.FILL_HORIZONTAL);
+		composite.setLayoutData(gd);
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 2;
+		//PixelConverter pc= new PixelConverter(composite);
+		//layout.verticalSpacing= pc.convertHeightInCharsToPixels(1) / 2;
+		composite.setLayout(layout);
+		
+		Group g = new Group(composite, SWT.SHADOW_ETCHED_IN);
+		g.setText(AutotoolsPropertyMessages.getString("CleanBehavior.title"));
+		gd = new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan = 2;
+		g.setLayoutData(gd);
+		layout= new GridLayout();
+		layout.numColumns= 2;
+		g.setLayout(layout);
+		
+		fCleanDelete = new Button(g, SWT.RADIO);
+		fCleanDelete.setText(AutotoolsPropertyMessages.getString("CleanDelete.label"));
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		gd.horizontalSpan = 2;
+		fCleanDelete.setLayoutData(gd);
+		fCleanMake = new Button(g, SWT.RADIO);
+		fCleanMake.setText(AutotoolsPropertyMessages.getString("CleanMake.label"));
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		gd.horizontalSpan = 2;
+		fCleanMake.setLayoutData(gd);
+		
+		Label label = new Label(g, SWT.LEFT);
+		label.setText(AutotoolsPropertyMessages.getString("CleanMakeTarget.label"));
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label.setLayoutData(gd);
+		
+		fCleanMakeTarget = new Text(g, SWT.SINGLE | SWT.BORDER);
+		fCleanMakeTarget.setText(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET_DEFAULT);
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fCleanMakeTarget.setLayoutData(gd);
+		
+		fCleanDelete.addSelectionListener(new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				fCleanMake.setSelection(false);
+				fCleanDelete.setSelection(true);
+				fCleanMakeTarget.setEnabled(false);
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// do nothing
+			}
+		});
+		
+		fCleanMake.addSelectionListener(new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				fCleanDelete.setSelection(false);
+				fCleanMake.setSelection(true);
+				fCleanMakeTarget.setEnabled(true);
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// do nothing
+			}
+		});
+		
+		fCleanMakeTarget.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				if (fCleanMakeTarget.getText().equals("")) { // $NON-NLS-1$
+					// FIXME: should probably issue warning here, but how?
+				}
+			}
+		});
+		
+		fScannerMakeW = new Button(composite, SWT.LEFT | SWT.CHECK); 
+		fScannerMakeW.setText(AutotoolsPropertyMessages.getString(SCANNERMAKEW_LABEL));
+		fScannerMakeW.setToolTipText(AutotoolsPropertyMessages.getString(SCANNERMAKEW_TOOLTIP));
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+		fScannerMakeW.setLayoutData(gd);
+		
+		initialize();
+	}
+
+	protected void performOK() {
+		IProject project = getProject();
+		if (fCleanDelete.getSelection()) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE, TRUE); 
+			} catch (CoreException ce) {
+				// FIXME: what can we do here?
+			}
+		} else {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE, FALSE);
+			} catch (CoreException ce) {
+				// FIXME: what can we do here?
+			}
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET, fCleanMakeTarget.getText());
+			} catch (CoreException ce) {
+				// FIXME: what can we do here?
+			}
+		}
+		boolean setScannerInfoDirty = false;
+		try {
+			// Get old scanner method setting to see if it has changed.
+			String oldScannerMakeW = project.getPersistentProperty(AutotoolsPropertyConstants.SCANNER_USE_MAKE_W);
+			if (fScannerMakeW.getSelection()) {
+				project.setPersistentProperty(AutotoolsPropertyConstants.SCANNER_USE_MAKE_W, TRUE);
+				if (oldScannerMakeW == null || !oldScannerMakeW.equals(TRUE))
+					setScannerInfoDirty = true;
+			} else {
+				project.setPersistentProperty(AutotoolsPropertyConstants.SCANNER_USE_MAKE_W, null);
+				if (oldScannerMakeW != null && oldScannerMakeW.equals(TRUE))
+					setScannerInfoDirty = true;
+			}
+		} catch (CoreException ce) {
+			ce.printStackTrace(); // FIXME: what can we do here?
+		}
+		// If the scanner info method changes, we must mark the current data as
+		// dirty so it will be recalculated.
+		if (setScannerInfoDirty) {
+			try {
+				project.setSessionProperty(AutotoolsPropertyConstants.SCANNER_INFO_DIRTY, Boolean.TRUE);
+			} catch (CoreException ce2) {
+				// FIXME: what can we do here?
+			}
+		}
+	}
+
+	protected void performApply(ICResourceDescription src, ICResourceDescription dst) {
+		performOK();
+	}
+	
+	protected void performDefaults() {
+		fCleanDelete.setSelection(false);
+		fCleanMake.setSelection(true);
+		fCleanMakeTarget.setText(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET_DEFAULT);
+		fCleanMakeTarget.setEnabled(true);
+		fScannerMakeW.setSelection(true);
+	}
+	
+	public void updateData(ICResourceDescription cfgd) {
+		// what to do here?
+	}
+	
+	public void updateButtons() {
+		// what to do here?
+	}
+
+	public void setVisible (boolean b) {
+		super.setVisible(b);
+	}
+
+	private void initialize() {
+		IProject project = getProject();
+		String cleanDelete = null;
+		String cleanMakeTarget = null;
+		String scannerMakeW = null;
+		try {
+			cleanDelete = project.getPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE);
+			cleanMakeTarget = project.getPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET);
+			scannerMakeW = project.getPersistentProperty(AutotoolsPropertyConstants.SCANNER_USE_MAKE_W);
+		} catch (CoreException e) {
+			// do nothing
+		}
+
+		if (cleanMakeTarget == null) {
+			cleanMakeTarget = AutotoolsPropertyConstants.CLEAN_MAKE_TARGET_DEFAULT;
+		}
+		fCleanMakeTarget.setText(cleanMakeTarget);
+
+		if (cleanDelete == null || cleanDelete.equals(FALSE)) {
+			fCleanDelete.setSelection(false);
+			fCleanMake.setSelection(true);
+			fCleanMakeTarget.setEnabled(true);
+		} else {
+			fCleanDelete.setSelection(true);
+			fCleanMake.setSelection(false);
+			fCleanMakeTarget.setEnabled(false);
+		}
+		
+		if (scannerMakeW == null || !scannerMakeW.equals(TRUE)) {
+			fScannerMakeW.setSelection(false);
+		} else
+			fScannerMakeW.setSelection(true);
+	}
+	
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsEditorPropertyPage.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsEditorPropertyPage.java
new file mode 100644
index 0000000..9ee6a4b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsEditorPropertyPage.java
@@ -0,0 +1,278 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.properties;
+
+import org.eclipse.cdt.core.settings.model.ICResourceDescription;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.ui.newui.AbstractCPropertyTab;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.linuxtools.cdt.autotools.AutotoolsPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutotoolsEditorPreferenceConstants;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+
+
+public class AutotoolsEditorPropertyPage extends AbstractCPropertyTab {
+
+	protected Combo fACVersionCombo;
+	protected Combo fAMVersionCombo;
+	IProject project;
+
+//	private class ACVersionSelectionListener implements SelectionListener {
+//		ICPropertyProvider p;
+//		public ACVersionSelectionListener(ICPropertyProvider p) {
+//			this.p = p;
+//		}
+//		
+//		public void widgetSelected(SelectionEvent e) {
+//			int index = fACVersionCombo.getSelectionIndex();
+//			try {
+//				AutotoolsEditorPropertyPage.getProject(p).setPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_VERSION, fACVersionCombo.getItem(index));
+//			} catch (CoreException ce) {
+//				// FIXME: what can we do here?
+//			}
+//		}
+//
+//		public void widgetDefaultSelected(SelectionEvent e) {
+//			// do nothing
+//		}
+//	}
+//	
+//	private class AMVersionSelectionListener implements SelectionListener {
+//		ICPropertyProvider p;
+//		public AMVersionSelectionListener(ICPropertyProvider p) {
+//			this.p = p;
+//		}
+//		
+//		public void widgetSelected(SelectionEvent e) {
+//			int index = fAMVersionCombo.getSelectionIndex(); 
+//			try {
+//				AutotoolsEditorPropertyPage.getProject(p).setPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_VERSION, fAMVersionCombo.getItem(index));
+//			} catch (CoreException ce) {
+//				// FIXME: what can we do here?
+//			}
+//		}
+//
+//		public void widgetDefaultSelected(SelectionEvent e) {
+//			// do nothing
+//		}
+//	}
+	
+	private IProject getProject() {
+		IConfiguration c = ManagedBuildManager.getConfigurationForDescription(getResDesc().getConfiguration());
+		return (IProject)c.getManagedProject().getOwner();
+	}
+	
+	public boolean canBeVisible() {
+		return true;
+	}
+
+	public void createControls(Composite parent) {
+		// TODO Auto-generated method stub
+		super.createControls(parent);
+		Composite composite= usercomp;
+		
+		// assume parent page uses griddata
+		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_FILL);
+		composite.setLayoutData(gd);
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 2;
+		//PixelConverter pc= new PixelConverter(composite);
+		//layout.verticalSpacing= pc.convertHeightInCharsToPixels(1) / 2;
+		composite.setLayout(layout);
+		
+		project = getProject();
+		
+		/* check box for new editors */
+		fACVersionCombo= new Combo(composite, SWT.CHECK | SWT.DROP_DOWN | SWT.READ_ONLY);
+		fACVersionCombo.setItems(AutotoolsPropertyConstants.fACVersions);
+		fACVersionCombo.select(AutotoolsPropertyConstants.fACVersions.length - 1);
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+		fACVersionCombo.setLayoutData(gd);
+		
+		Label label= new Label(composite, SWT.LEFT);
+		label.setText(AutotoolsPropertyMessages.getString("ACEditor.autoconfVersion")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label.setLayoutData(gd);
+		
+		/* check box for new editors */
+		fAMVersionCombo= new Combo(composite, SWT.CHECK | SWT.DROP_DOWN | SWT.READ_ONLY);
+		fAMVersionCombo.setItems(AutotoolsPropertyConstants.fAMVersions);
+		fAMVersionCombo.select(AutotoolsPropertyConstants.fAMVersions.length - 1);
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+		fAMVersionCombo.setLayoutData(gd);
+		
+		Label label2= new Label(composite, SWT.LEFT);
+		label2.setText(AutotoolsPropertyMessages.getString("ACEditor.automakeVersion")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label2.setLayoutData(gd);
+
+		initialize();
+	}
+
+	public void performOK() {
+		String acVer = null;
+		String amVer = null;
+		boolean changed = false;
+		try {
+			acVer = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_VERSION);
+			amVer = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_VERSION);
+		} catch (CoreException e) {
+			acVer = "";
+			amVer = "";
+		}
+		int index = fACVersionCombo.getSelectionIndex();
+		String acVerSelected = fACVersionCombo.getItem(index);
+		if (!acVerSelected.equals(acVer)) {
+			changed = true;
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_VERSION, fACVersionCombo.getItem(index));
+			} catch (CoreException ce) {
+				// Not much we can do at this point
+			}
+		}
+
+		index = fAMVersionCombo.getSelectionIndex();
+		String amVerSelected = fAMVersionCombo.getItem(index);
+		if (!amVerSelected.equals(amVer)) {
+			changed = true;
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_VERSION, fAMVersionCombo.getItem(index));
+			} catch (CoreException ce) {
+				// Not much we can do here either
+			}
+		}
+
+		// Notify any Autoconf editors that are open for this project that macro versioning
+		// has changed.
+		if (changed)
+			AutotoolsPropertyManager.getDefault().notifyPropertyListeners(project, AutotoolsPropertyConstants.AUTOCONF_MACRO_VERSIONING);
+	}
+	
+	protected void performApply(ICResourceDescription src, ICResourceDescription dst) {
+		performOK();
+	}
+	
+	public void performDefaults() {
+		// For default Autoconf and Automake versions, use the setting from the
+		// Autotools preference dialog.
+		String version = AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION);
+		String[] items = fACVersionCombo.getItems();
+		// Try and find which list item matches the current preference stored and
+		// select it in the list.
+		int i;
+		for (i = 0; i < items.length; ++i) {
+			if (items[i].equals(version))
+				break;
+		}
+		if (i >= items.length)
+			i = items.length - 1;
+		fACVersionCombo.select(i);
+
+		version = AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION);
+		items = fAMVersionCombo.getItems();
+		// Try and find which list item matches the current preference stored and
+		// select it in the list
+		for (i = 0; i < items.length; ++i) {
+			if (items[i].equals(version))
+				break;
+		}
+		if (i >= items.length)
+			i = items.length - 1;
+		fAMVersionCombo.select(i);
+	}
+	
+	public void updateData(ICResourceDescription cfgd) {
+		// what to do here?
+	}
+	
+	public void updateButtons() {
+		// what to do here?
+	}
+
+	public void setVisible (boolean b) {
+		super.setVisible(b);
+	}
+	
+//	private IProject getProject(ICPropertyProvider provider) {
+//		Object element = provider.getElement();
+//		if (element != null) { 
+//			if (element instanceof IFile ||
+//				element instanceof IProject ||
+//				element instanceof IFolder)
+//				{
+//			IResource f = (IResource) element;
+//			return f.getProject();
+//				}
+//			else if (element instanceof ICProject)
+//				return ((ICProject)element).getProject();
+//		}
+//		return null;
+//	}
+
+	private void initialize() {
+		initializeACVersion();
+		initializeAMVersion();
+	}
+	
+	void initializeACVersion() {
+		String version = "";
+		try {
+			version = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_VERSION);
+			if (version == null)
+				version = AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION);
+		} catch (CoreException e) {
+			// do nothing
+		}
+		String[] items = fACVersionCombo.getItems();
+		// Try and find which list item matches the current preference stored and
+		// select it in the list.
+		int i;
+		for (i = 0; i < items.length; ++i) {
+			if (items[i].equals(version))
+				break;
+		}
+		if (i >= items.length)
+			i = items.length - 1;
+		fACVersionCombo.select(i);
+	}
+	
+	void initializeAMVersion() {
+		String version = "";
+		try {
+			version = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_VERSION);
+			if (version == null)
+				version = AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION);
+		} catch (CoreException e) {
+			// do nothing
+		}
+		String[] items = fAMVersionCombo.getItems();
+		// Try and find which list item matches the current preference stored and
+		// select it in the list.
+		int i;
+		for (i = 0; i < items.length; ++i) {
+			if (items[i].equals(version))
+				break;
+		}
+		if (i >= items.length)
+			i = items.length - 1;
+		fAMVersionCombo.select(i);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyConstants.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyConstants.java
new file mode 100644
index 0000000..f020ce0
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyConstants.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.properties;
+
+import org.eclipse.core.runtime.QualifiedName;
+import org.eclipse.linuxtools.cdt.autotools.AutotoolsPlugin;
+
+
+public class AutotoolsPropertyConstants {
+	
+	static final String PREFIX = AutotoolsPlugin.getUniqueIdentifier() + "."; // $NON-NLS-1$
+	public static final String AUTOMAKE_VERSION_STRING = "AutoconfEditorAutomakeVersion"; // $NON-NLS-1$
+	public static final QualifiedName AUTOMAKE_VERSION = new QualifiedName(PREFIX, AUTOMAKE_VERSION_STRING);
+	public static final String AUTOCONF_VERSION_STRING = "AutoconfEditorAutoconfVersion"; // $NON-NLS-1$
+	public static final QualifiedName AUTOCONF_VERSION = new QualifiedName(PREFIX, AUTOCONF_VERSION_STRING);
+	public static final String AUTOCONF_MACRO_VERSIONING = "AutoconfEditorMacroVersioning"; // $NON-NLS-1$
+	public static final QualifiedName AUTOCONF_TOOL = new QualifiedName(PREFIX, "AutoconfToolPath"); // $NON-NLS-1$
+	public static final QualifiedName AUTOMAKE_TOOL = new QualifiedName(PREFIX, "AutomakeToolPath"); // $NON-NLS-1$
+	public static final QualifiedName ACLOCAL_TOOL = new QualifiedName(PREFIX, "AclocalToolPath");  // $NON-NLS-1$
+	public static final QualifiedName AUTOHEADER_TOOL = new QualifiedName(PREFIX, "AutoheaderToolPath");  // $NON-NLS-1$
+	public static final QualifiedName AUTORECONF_TOOL = new QualifiedName(PREFIX, "AutoreconfToolPath");  // $NON-NLS-1$
+	public static final QualifiedName LIBTOOLIZE_TOOL = new QualifiedName(PREFIX, "LibtoolizePath");  // $NON-NLS-1$
+	public static final QualifiedName CLEAN_DELETE = new QualifiedName(PREFIX, "CleanDelete"); // $NON-NLS-1$
+	public static final QualifiedName CLEAN_MAKE_TARGET = new QualifiedName(PREFIX, "CleanMakeTarget"); // $NON-NLS-1$
+	public static final QualifiedName SCANNER_USE_MAKE_W = new QualifiedName(PREFIX, "ScannerUseMakeW");
+	public static final QualifiedName OPEN_INCLUDE = new QualifiedName(PREFIX, "IncludeResourceMapping"); // $NON-NLS-1$
+	public static final QualifiedName OPEN_INCLUDE_P = new QualifiedName(PREFIX, "PersistentIncludeResourceMapping"); //$NON-NLS-1$
+	public static final QualifiedName SCANNER_INFO_DIRTY = new QualifiedName(PREFIX, "ScannerInfoDirty"); // $NON-NLSp-1$
+	
+	static String[] fACVersions = {"2.13", "2.59", "2.61"}; // $NON-NLS-1$
+	static final String LATEST_AC_VERSION = fACVersions[fACVersions.length - 1];
+	
+	static String[] fAMVersions = {"1.4-p6", "1.9.5", "1.9.6"}; // $NON-NLS-1$
+	static final String LATEST_AM_VERSION = fAMVersions[fAMVersions.length - 1];
+	
+	public static final String CLEAN_MAKE_TARGET_DEFAULT = "distclean"; // $NON-NLS-1$
+	public static final String TRUE = "true"; // $NON-NLS-1$
+	public static final String FALSE = "false"; // $NON-NLS-1$
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyManager.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyManager.java
new file mode 100644
index 0000000..1bdcca5
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyManager.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.properties;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.ListenerList;
+
+public class AutotoolsPropertyManager implements IPropertyChangeManager {
+
+	private static AutotoolsPropertyManager fInstance;
+	private Map<IProject, ListenerList> projectList;
+	
+	private AutotoolsPropertyManager() {
+		projectList = new HashMap<IProject, ListenerList>();
+	}
+	
+	public static AutotoolsPropertyManager getDefault() {
+		if (fInstance == null)
+			fInstance = new AutotoolsPropertyManager();
+		return fInstance;
+	}
+	
+	public synchronized void addProjectPropertyListener(IProject project,
+			IProjectPropertyListener listener) {
+		ListenerList list = (ListenerList)projectList.get(project);
+		if (list == null) {
+			list = new ListenerList();
+			projectList.put(project, list);
+		}
+		list.add(listener);
+	}
+
+	public synchronized void notifyPropertyListeners(IProject project, String property) {
+		ListenerList list = (ListenerList)projectList.get(project);
+		if (list != null) {
+			Object[] listeners = list.getListeners();
+			for (int i = 0; i < listeners.length; ++i) {
+				((IProjectPropertyListener)listeners[i]).handleProjectPropertyChanged(project, property);
+			}
+		}
+	}
+
+	public synchronized void removeProjectPropertyListener(IProject project, 
+			IProjectPropertyListener listener) {
+		ListenerList list = (ListenerList)projectList.get(project);
+		if (list != null)
+			list.remove(listener);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyMessages.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyMessages.java
new file mode 100644
index 0000000..8fb1bec
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyMessages.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.properties;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+/**
+ * MakefilePreferencesMessages
+ */
+public class AutotoolsPropertyMessages {
+
+	/**
+	 * 
+	 */
+	private AutotoolsPropertyMessages() {
+	}
+
+	private static final String BUNDLE_NAME = AutotoolsPropertyMessages.class.getName();
+
+	public static String getString(String key) {
+		try {
+			return ResourceBundle.getBundle(BUNDLE_NAME).getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		} catch (NullPointerException e) {
+			return '#' + key + '#';
+		}
+	}	
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties
new file mode 100644
index 0000000..d729559
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties
@@ -0,0 +1,41 @@
+###############################################################################
+# Copyright (c) 2007 Red Hat Inc. and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Red Hat Inc. - initial API and implementation
+###############################################################################
+
+Edit.name=Editors
+Build.name=Build
+
+Autotools.aclocalPath=aclocal
+Autotools.aclocalPath.tooltip=Specify desired aclocal to use for project
+Autotools.automakePath=automake
+Autotools.automakePath.tooltip=Specify desired automake to use for project
+Autotools.autoconfPath=autoconf
+Autotools.autoconfPath.tooltip=Specify desired autoconf to use for project
+Autotools.autoheaderPath=autoheader
+Autotools.autoheaderPath.tooltip=Specify desired autoheader to use for project
+Autotools.autoreconfPath=autoreconf
+Autotools.autoreconfPath.tooltip=Specify desired autoreconf to use for project
+Autotools.libtoolizePath=libtoolize
+Autotools.libtoolizePath.tooltip=Specify desired libtoolize to use for project
+
+ACEditor.version=&Version
+ACEditor.autoconfVersion=Version of Autoconf to use for syntax checking
+ACEditor.automakeVersion=Version of Automake to use for syntax checking
+
+ScannerMakeW.label=Use make -n -w per file to generate scanner info
+ScannerMakeW.tooltip=Use this option only if necessary to get correct include path
+
+CleanBehavior.title=Clean Build Behavior
+
+CleanDelete.label=Delete build directory on "clean" operation
+CleanMake.label=Use make target to clean
+CleanMakeTarget.label=Make target:
+CleanMakeTarget.default=distclean
+CleanMakeTarget.tooltip=Specify a top-level make target to clean build directory
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyPage.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyPage.java
new file mode 100644
index 0000000..95fb589
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyPage.java
@@ -0,0 +1,376 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.properties;
+
+import org.eclipse.cdt.ui.newui.AbstractPage;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+
+public class AutotoolsPropertyPage extends AbstractPage {
+	
+	public AutotoolsPropertyPage() {
+		super();
+	}
+	
+	protected boolean isSingle() {
+		return false;
+	}
+
+	protected Control createContents(Composite parent) {
+		return super.createContents(parent);
+	}
+	
+	protected boolean showsConfig() {
+		return false;
+	}
+	
+//	protected Combo fACVersionCombo;
+//	protected Combo fAMVersionCombo;
+//	
+//	protected Button fCleanDelete;
+//	protected Button fCleanMake;
+//	protected Combo  fCleanMakeTarget;
+//	protected Button fScannerMakeW;
+//
+//
+//	public boolean isApplicable() {
+//		IProject project = getProject();
+//		if (project != null && !AutotoolsMakefileBuilder.hasTargetBuilder(project))
+//			return false;
+//		else
+//			return super.isApplicable();
+//	}
+//	
+//	protected Control createContents(Composite parent) {
+//		
+//		TabFolder folder= new TabFolder(parent, SWT.NONE);
+//		folder.setLayout(new TabFolderLayout());	
+//		folder.setLayoutData(new GridData(GridData.FILL_BOTH));
+//		
+//		// Allow end-user to select which version of autoconf to use for hover help
+//		// and syntax checking of macros.
+//		TabItem item= new TabItem(folder, SWT.NONE);
+//		item.setText(AutotoolsPropertyMessages.getString("Edit.name")); //$NON-NLS-1$
+//		item.setControl(createEditTabContent(folder));
+//					
+//		// Build options.
+//		item= new TabItem(folder, SWT.NONE);
+//		item.setText(AutotoolsPropertyMessages.getString("Build.name")); //$NON-NLS-1$
+//		item.setControl(createBuildTabContent(folder));
+//					
+//		initialize();
+//		
+//		applyDialogFont(folder);
+//		return folder;
+//	}
+//
+//	private Composite createEditTabContent(TabFolder folder) {
+//		Composite composite= new Composite(folder, SWT.NULL);
+//		// assume parent page uses griddata
+//		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_FILL);
+//		composite.setLayoutData(gd);
+//		GridLayout layout= new GridLayout();
+//		layout.numColumns= 2;
+//		//PixelConverter pc= new PixelConverter(composite);
+//		//layout.verticalSpacing= pc.convertHeightInCharsToPixels(1) / 2;
+//		composite.setLayout(layout);
+//		
+//		
+//		/* check box for new editors */
+//		fACVersionCombo= new Combo(composite, SWT.CHECK | SWT.DROP_DOWN | SWT.READ_ONLY);
+//		fACVersionCombo.setItems(AutotoolsPropertyConstants.fACVersions);
+//		fACVersionCombo.select(AutotoolsPropertyConstants.fACVersions.length - 1);
+//		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+//		fACVersionCombo.setLayoutData(gd);
+//		fACVersionCombo.addSelectionListener(new SelectionListener() {
+//			public void widgetSelected(SelectionEvent e) {
+//				int index = fACVersionCombo.getSelectionIndex();
+//				try {
+//					getProject().setPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_VERSION, fACVersionCombo.getItem(index));
+//				} catch (CoreException ce) {
+//					// FIXME: what can we do here?
+//				}
+//			}
+//
+//			public void widgetDefaultSelected(SelectionEvent e) {
+//				String version = AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION);
+//				String[] items = fACVersionCombo.getItems();
+//				// Try and find which list item matches the current preference stored and
+//				// select it in the list.
+//				int i;
+//				for (i = 0; i < items.length; ++i) {
+//					if (items[i].equals(version))
+//						break;
+//				}
+//				if (i >= items.length)
+//					i = items.length - 1;
+//				fACVersionCombo.select(i);
+//			}
+//		});
+//		
+//		Label label= new Label(composite, SWT.LEFT);
+//		label.setText(AutotoolsPropertyMessages.getString("ACEditor.autoconfVersion")); //$NON-NLS-1$
+//		gd= new GridData();
+//		gd.horizontalAlignment= GridData.BEGINNING;
+//		label.setLayoutData(gd);
+//		
+//		/* check box for new editors */
+//		fAMVersionCombo= new Combo(composite, SWT.CHECK | SWT.DROP_DOWN | SWT.READ_ONLY);
+//		fAMVersionCombo.setItems(AutotoolsPropertyConstants.fAMVersions);
+//		fAMVersionCombo.select(AutotoolsPropertyConstants.fAMVersions.length - 1);
+//		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+//		fAMVersionCombo.setLayoutData(gd);
+//		fAMVersionCombo.addSelectionListener(new SelectionListener() {
+//			public void widgetSelected(SelectionEvent e) {
+//				int index = fAMVersionCombo.getSelectionIndex(); 
+//				try {
+//					getProject().setPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_VERSION, fAMVersionCombo.getItem(index));
+//				} catch (CoreException ce) {
+//					// FIXME: what can we do here?
+//				}
+//			}
+//
+//			public void widgetDefaultSelected(SelectionEvent e) {
+//				String version = AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION);
+//				String[] items = fAMVersionCombo.getItems();
+//				// Try and find which list item matches the current preference stored and
+//				// select it in the list.
+//				int i;
+//				for (i = 0; i < items.length; ++i) {
+//					if (items[i].equals(version))
+//						break;
+//				}
+//				if (i >= items.length)
+//					i = items.length - 1;
+//				fAMVersionCombo.select(i);
+//			}
+//		});
+//		
+//		Label label2= new Label(composite, SWT.LEFT);
+//		label2.setText(AutotoolsPropertyMessages.getString("ACEditor.automakeVersion")); //$NON-NLS-1$
+//		gd= new GridData();
+//		gd.horizontalAlignment= GridData.BEGINNING;
+//		label2.setLayoutData(gd);
+//
+//		return composite;
+//	}
+//	
+//	private Composite createBuildTabContent(TabFolder folder) {
+//		Composite composite= new Composite(folder, SWT.NULL);
+//		// assume parent page uses griddata
+//		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_FILL);
+//		composite.setLayoutData(gd);
+//		GridLayout layout= new GridLayout();
+//		layout.numColumns= 2;
+//		//PixelConverter pc= new PixelConverter(composite);
+//		//layout.verticalSpacing= pc.convertHeightInCharsToPixels(1) / 2;
+//		composite.setLayout(layout);
+//		
+//		
+//		Group g = new Group(composite, SWT.SHADOW_ETCHED_IN);
+//		g.setText(AutotoolsPropertyMessages.getString("CleanBehavior.title"));
+//		gd = new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+//		gd.horizontalSpan = 2;
+//		g.setLayoutData(gd);
+//		layout= new GridLayout();
+//		layout.numColumns= 2;
+//		g.setLayout(layout);
+//		
+//		fCleanDelete = new Button(g, SWT.RADIO);
+//		fCleanDelete.setText(AutotoolsPropertyMessages.getString("CleanDelete.label"));
+//		gd= new GridData();
+//		gd.horizontalAlignment= GridData.BEGINNING;
+//		gd.horizontalSpan = 2;
+//		fCleanDelete.setLayoutData(gd);
+//		fCleanMake = new Button(g, SWT.RADIO);
+//		fCleanMake.setText(AutotoolsPropertyMessages.getString("CleanMake.label"));
+//		gd= new GridData();
+//		gd.horizontalAlignment= GridData.BEGINNING;
+//		gd.horizontalSpan = 2;
+//		fCleanMake.setLayoutData(gd);
+//		
+//		Label label = new Label(g, SWT.LEFT);
+//		label.setText(AutotoolsPropertyMessages.getString("CleanMakeTarget.label"));
+//		gd= new GridData();
+//		gd.horizontalAlignment= GridData.BEGINNING;
+//		label.setLayoutData(gd);
+//		
+//		fCleanMakeTarget = new Combo(g, SWT.SIMPLE);
+//		fCleanMakeTarget.setText(AutotoolsPropertyMessages.getString("CleanMakeTarget.default"));
+//		fCleanMakeTarget.setTextLimit(40);
+//		fCleanMakeTarget.setVisibleItemCount(0);
+//		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+//		fCleanMakeTarget.setLayoutData(gd);
+//		
+//		fCleanDelete.addSelectionListener(new SelectionListener() {
+//			public void widgetSelected(SelectionEvent e) {
+//				fCleanMake.setSelection(false);
+//				fCleanDelete.setSelection(true);
+//				fCleanMakeTarget.setEnabled(false);
+//				try {
+//					getProject().setPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE, "true");
+//				} catch (CoreException ce) {
+//					// FIXME: what can we do here?
+//				}
+//			}
+//
+//			public void widgetDefaultSelected(SelectionEvent e) {
+//				fCleanDelete.setSelection(false);
+//				fCleanMake.setSelection(true);
+//				fCleanMakeTarget.setEnabled(true);
+//				try {
+//					getProject().setPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE, "false");
+//					getProject().setPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET, "distclean");
+//				} catch (CoreException ce) {
+//					// FIXME: what can we do here?
+//				}
+//			}
+//		});
+//		
+//		fCleanMake.addSelectionListener(new SelectionListener() {
+//			public void widgetSelected(SelectionEvent e) {
+//				fCleanDelete.setSelection(false);
+//				fCleanMake.setSelection(true);
+//				fCleanMakeTarget.setEnabled(true);
+//				try {
+//					getProject().setPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE, "false");
+//				} catch (CoreException ce) {
+//					// FIXME: what can we do here?
+//				}
+//			}
+//
+//			public void widgetDefaultSelected(SelectionEvent e) {
+////				fCleanDelete.setSelection(false);
+////				fCleanMake.setSelection(true);
+////				try {
+////					getProject().setPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE, "false");
+////					getProject().setPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET, "distclean");
+////				} catch (CoreException ce) {
+////					// FIXME: what can we do here?
+////				}
+//			}
+//		});
+//		
+//		fCleanMakeTarget.addModifyListener(new ModifyListener() {
+//			public void modifyText(ModifyEvent e) {
+//				try {
+//					getProject().setPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET, fCleanMakeTarget.getText());
+//				} catch (CoreException ce) {
+//					// FIXME: what can we do here?
+//				}
+//			}
+//		});
+//		
+//		fScannerMakeW = new Button(composite, SWT.LEFT | SWT.CHECK); 
+//		fScannerMakeW.setText(AutotoolsPropertyMessages.getString("ScannerMakeW.label"));
+//		fScannerMakeW.setToolTipText(AutotoolsPropertyMessages.getString("ScannerMakeW.tooltip"));
+//		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+//		fScannerMakeW.setLayoutData(gd);
+//		fScannerMakeW.addSelectionListener(new SelectionListener() {
+//			public void widgetSelected(SelectionEvent e) {
+//				try {
+//					getProject().setPersistentProperty(AutotoolsPropertyConstants.SCANNER_USE_MAKE_W, "true");
+//				} catch (CoreException ce) {
+//					// FIXME: what can we do here?
+//				}
+//			}
+//
+//			public void widgetDefaultSelected(SelectionEvent e) {
+//				fScannerMakeW.setSelection(false);
+//				try {
+//					// This is only a temporary work-around so we remove the property rather than set it false.
+//					getProject().setPersistentProperty(AutotoolsPropertyConstants.SCANNER_USE_MAKE_W, null);
+//				} catch (CoreException ce) {
+//					// FIXME: what can we do here?
+//				}
+//			}
+//		});
+//		
+//		return composite;
+//	}
+//	
+//	void initializeACVersion() {
+//		String version = "";
+//		try {
+//			version = getProject().getPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_VERSION);
+//			if (version == null)
+//				version = AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION);
+//		} catch (CoreException e) {
+//			// do nothing
+//		}
+//		String[] items = fACVersionCombo.getItems();
+//		// Try and find which list item matches the current preference stored and
+//		// select it in the list.
+//		int i;
+//		for (i = 0; i < items.length; ++i) {
+//			if (items[i].equals(version))
+//				break;
+//		}
+//		if (i >= items.length)
+//			i = items.length - 1;
+//		fACVersionCombo.select(i);
+//	}
+//	
+//	void initializeAMVersion() {
+//		String version = "";
+//		try {
+//			version = getProject().getPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_VERSION);
+//			if (version == null)
+//				version = AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION);
+//		} catch (CoreException e) {
+//			// do nothing
+//		}
+//		String[] items = fAMVersionCombo.getItems();
+//		// Try and find which list item matches the current preference stored and
+//		// select it in the list.
+//		int i;
+//		for (i = 0; i < items.length; ++i) {
+//			if (items[i].equals(version))
+//				break;
+//		}
+//		if (i >= items.length)
+//			i = items.length - 1;
+//		fAMVersionCombo.select(i);
+//	}
+//	
+//	void initializeBuild() {
+//		String cleanDelete = null;
+//		String cleanMakeTarget = null;
+//		try {
+//			cleanDelete = getProject().getPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE);
+//			cleanMakeTarget = getProject().getPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET);
+//		} catch (CoreException e) {
+//			// do nothing
+//		}
+//		
+//		if (cleanMakeTarget == null) {
+//			cleanMakeTarget = AutotoolsPropertyMessages.getString("CleanMakeTarget.default"); // $NON-NLS-1$
+//			fCleanMakeTarget.setText(cleanMakeTarget);
+//		}
+//		
+//		if (cleanDelete == null || cleanDelete.equals("false")) {
+//			fCleanDelete.setSelection(false);
+//			fCleanMake.setSelection(true);
+//			fCleanMakeTarget.setEnabled(true);
+//		} else {
+//			fCleanDelete.setSelection(true);
+//			fCleanMake.setSelection(false);
+//			fCleanMakeTarget.setEnabled(false);
+//		}
+//	}
+//	
+//	private void initialize() {
+//		initializeACVersion();
+//		initializeAMVersion();
+//		initializeBuild();
+//	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsToolsPropertyPage.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsToolsPropertyPage.java
new file mode 100644
index 0000000..7b56c2b
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsToolsPropertyPage.java
@@ -0,0 +1,343 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.properties;
+
+import org.eclipse.cdt.core.settings.model.ICResourceDescription;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.ui.newui.AbstractCPropertyTab;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class AutotoolsToolsPropertyPage extends AbstractCPropertyTab {
+
+	public static final String DEFAULT_ACLOCAL = "aclocal"; // $NON-NLS-1$
+	public static final String DEFAULT_AUTOMAKE = "automake"; // $NON-NLS-1$
+	public static final String DEFAULT_AUTOCONF = "autoconf"; // $NON-NLS-1$
+	public static final String DEFAULT_AUTOHEADER = "autoheader"; // $NON-NLS-1$
+	public static final String DEFAULT_AUTORECONF = "autoreconf"; // $NON-NLS-1$
+	public static final String DEFAULT_LIBTOOLIZE = "libtoolize"; // $NON-NLS-1$
+	
+	protected Text fAclocalPath;
+	protected Text fAutoheaderPath;
+	protected Text fAutomakePath;
+	protected Text fAutoreconfPath;
+	protected Text fAutoconfPath;
+	protected Text fLibtoolizePath;
+	private IProject project;
+
+	
+	private IProject getProject() {
+		IConfiguration c = ManagedBuildManager.getConfigurationForDescription(getResDesc().getConfiguration());
+		return (IProject)c.getManagedProject().getOwner();
+	}
+	
+	public boolean canBeVisible() {
+		return true;
+	}
+
+	public void createControls(Composite parent) {
+		// TODO Auto-generated method stub
+		super.createControls(parent);
+		Composite composite= usercomp;
+		
+		// assume parent page uses griddata
+		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_FILL | GridData.FILL_HORIZONTAL);
+		composite.setLayoutData(gd);
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 2;
+		//PixelConverter pc= new PixelConverter(composite);
+		//layout.verticalSpacing= pc.convertHeightInCharsToPixels(1) / 2;
+		composite.setLayout(layout);
+		
+		project = getProject();
+		
+		Label label= new Label(composite, SWT.LEFT);
+		label.setText(AutotoolsPropertyMessages.getString("Autotools.aclocalPath")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label.setLayoutData(gd);
+		
+		/* text window for aclocal path */
+		fAclocalPath = new Text(composite, SWT.BORDER | SWT.SINGLE);
+		fAclocalPath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.aclocalPath.tooltip")); // $NON-NLS-1$
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fAclocalPath.setLayoutData(gd);
+		
+		Label label2= new Label(composite, SWT.LEFT);
+		label2.setText(AutotoolsPropertyMessages.getString("Autotools.automakePath")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label2.setLayoutData(gd);
+		
+		/* text window for automake path */
+		fAutomakePath = new Text(composite, SWT.BORDER | SWT.SINGLE);
+		fAutomakePath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.automakePath.tooltip")); // $NON-NLS-1#
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fAutomakePath.setLayoutData(gd);
+		
+		Label label3 = new Label(composite, SWT.LEFT);
+		label3.setText(AutotoolsPropertyMessages.getString("Autotools.autoconfPath")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label3.setLayoutData(gd);
+		
+		/* text window for autoconf path */
+		fAutoconfPath = new Text(composite, SWT.BORDER | SWT.SINGLE);
+		fAutoconfPath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.autoconfPath.tooltip")); // $NON-NLS-1$
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fAutoconfPath.setLayoutData(gd);
+
+		Label label4= new Label(composite, SWT.LEFT);
+		label4.setText(AutotoolsPropertyMessages.getString("Autotools.autoheaderPath")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label4.setLayoutData(gd);
+		
+		/* text window for aclocal path */
+		fAutoheaderPath = new Text(composite, SWT.BORDER | SWT.SINGLE);
+		fAutoheaderPath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.autoheaderPath.tooltip")); // $NON-NLS-1$
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fAutoheaderPath.setLayoutData(gd);
+
+		Label label5= new Label(composite, SWT.LEFT);
+		label5.setText(AutotoolsPropertyMessages.getString("Autotools.autoreconfPath")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label5.setLayoutData(gd);
+		
+		/* text window for aclocal path */
+		fAutoreconfPath = new Text(composite, SWT.BORDER | SWT.SINGLE);
+		fAutoreconfPath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.autoreconfPath.tooltip")); // $NON-NLS-1$
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fAutoreconfPath.setLayoutData(gd);
+
+		Label label6= new Label(composite, SWT.LEFT);
+		label6.setText(AutotoolsPropertyMessages.getString("Autotools.libtoolizePath")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label6.setLayoutData(gd);
+		
+		/* text window for aclocal path */
+		fLibtoolizePath = new Text(composite, SWT.BORDER | SWT.SINGLE);
+		fLibtoolizePath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.libtoolizePath.tooltip")); // $NON-NLS-1$
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fLibtoolizePath.setLayoutData(gd);
+
+		initialize();
+	}
+
+	public void performOK() {
+		String aclocalPath = null;
+		String automakePath = null;
+		String autoconfPath = null;
+		String autoheaderPath = null;
+		String autoreconfPath = null;
+		String libtoolizePath = null;
+		try {
+			aclocalPath = project.getPersistentProperty(AutotoolsPropertyConstants.ACLOCAL_TOOL);
+		} catch (CoreException e1) {
+			aclocalPath = DEFAULT_ACLOCAL;
+		}
+
+		String newAclocalPath = fAclocalPath.getText().trim();
+		if (aclocalPath == null || !newAclocalPath.equals(aclocalPath)) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.ACLOCAL_TOOL, newAclocalPath);
+			} catch (CoreException e1) {
+				// Not much we can do at this point
+			}
+		}
+		
+		try {
+			automakePath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_TOOL);
+		} catch (CoreException e1) {
+			automakePath = DEFAULT_AUTOMAKE;
+		}
+
+		String newAutomakePath = fAutomakePath.getText().trim();
+		if (automakePath == null || !newAutomakePath.equals(automakePath)) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_TOOL, newAutomakePath);
+			} catch (CoreException e2) {
+				// Not much we can do at this point
+			}
+		}
+		
+		try {
+			autoconfPath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_TOOL);
+		} catch (CoreException e1) {
+			autoconfPath = DEFAULT_AUTOCONF;
+		}
+
+		String newAutoconfPath = fAutoconfPath.getText().trim();
+		if (autoconfPath == null || !newAutoconfPath.equals(autoconfPath)) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_TOOL, newAutoconfPath);
+			} catch (CoreException e2) {
+				// Not much we can do at this point
+			}
+		}
+
+		try {
+			autoheaderPath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOHEADER_TOOL);
+		} catch (CoreException e1) {
+			autoheaderPath = DEFAULT_AUTOHEADER;
+		}
+
+		String newAutoheaderPath = fAutoheaderPath.getText().trim();
+		if (autoheaderPath == null || !newAutoheaderPath.equals(autoheaderPath)) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTOHEADER_TOOL, newAutoheaderPath);
+			} catch (CoreException e2) {
+				// Not much we can do at this point
+			}
+		}
+
+		try {
+			autoreconfPath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTORECONF_TOOL);
+		} catch (CoreException e1) {
+			autoreconfPath = DEFAULT_AUTORECONF;
+		}
+
+		String newAutoreconfPath = fAutoreconfPath.getText().trim();
+		if (autoreconfPath == null || !newAutoreconfPath.equals(autoreconfPath)) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTORECONF_TOOL, newAutoreconfPath);
+			} catch (CoreException e2) {
+				// Not much we can do at this point
+			}
+		}
+
+		try {
+			libtoolizePath = project.getPersistentProperty(AutotoolsPropertyConstants.LIBTOOLIZE_TOOL);
+		} catch (CoreException e1) {
+			libtoolizePath = DEFAULT_LIBTOOLIZE;
+		}
+
+		String newLibtoolizePath = fLibtoolizePath.getText().trim();
+		if (libtoolizePath == null || !newLibtoolizePath.equals(libtoolizePath)) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.LIBTOOLIZE_TOOL, newLibtoolizePath);
+			} catch (CoreException e2) {
+				// Not much we can do at this point
+			}
+		}
+	}
+	
+	protected void performApply(ICResourceDescription src, ICResourceDescription dst) {
+		performOK();
+	}
+	
+	public void performDefaults() {
+		// For default tool settings, simply default the base tool names
+		fAclocalPath.setText(DEFAULT_ACLOCAL);
+		fAutomakePath.setText(DEFAULT_AUTOMAKE);
+		fAutoconfPath.setText(DEFAULT_AUTOCONF);
+		fAutoheaderPath.setText(DEFAULT_AUTOHEADER);
+		fAutoreconfPath.setText(DEFAULT_AUTORECONF);
+		fLibtoolizePath.setText(DEFAULT_LIBTOOLIZE);
+	}
+	
+	public void updateData(ICResourceDescription cfgd) {
+		// what to do here?
+	}
+	
+	public void updateButtons() {
+		// what to do here?
+	}
+
+	public void setVisible (boolean b) {
+		super.setVisible(b);
+	}
+	
+	private void initialize() {
+		String aclocalPath = null;
+		String automakePath = null;
+		String autoconfPath = null;
+		String autoheaderPath = null;
+		String autoreconfPath = null;
+		String libtoolizePath = null;
+		
+		try {
+			aclocalPath = project.getPersistentProperty(AutotoolsPropertyConstants.ACLOCAL_TOOL);
+		} catch (CoreException e1) {
+			// do nothing
+		}
+		
+		if (aclocalPath == null)
+			aclocalPath = DEFAULT_ACLOCAL;
+		
+		fAclocalPath.setText(aclocalPath);
+		
+		try {
+			automakePath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_TOOL);
+		} catch (CoreException e1) {
+			// do nothing
+		}
+		
+		if (automakePath == null)
+			automakePath = DEFAULT_AUTOMAKE;
+		
+		fAutomakePath.setText(automakePath);
+		
+		try {
+			autoconfPath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_TOOL);
+		} catch (CoreException e1) {
+			// do nothing
+		}
+		
+		if (autoconfPath == null)
+			autoconfPath = DEFAULT_AUTOCONF;
+		
+		fAutoconfPath.setText(autoconfPath);
+
+		try {
+			autoheaderPath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOHEADER_TOOL);
+		} catch (CoreException e1) {
+			// do nothing
+		}
+		
+		if (autoheaderPath == null)
+			autoheaderPath = DEFAULT_AUTOHEADER;
+		
+		fAutoheaderPath.setText(autoheaderPath);
+
+		try {
+			autoreconfPath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTORECONF_TOOL);
+		} catch (CoreException e1) {
+			// do nothing
+		}
+		
+		if (autoreconfPath == null)
+			autoreconfPath = DEFAULT_AUTORECONF;
+		
+		fAutoreconfPath.setText(autoreconfPath);
+		
+		try {
+			libtoolizePath = project.getPersistentProperty(AutotoolsPropertyConstants.LIBTOOLIZE_TOOL);
+		} catch (CoreException e1) {
+			// do nothing
+		}
+		
+		if (libtoolizePath == null)
+			libtoolizePath = DEFAULT_LIBTOOLIZE;
+		
+		fLibtoolizePath.setText(libtoolizePath);
+	}
+	
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/IProjectPropertyListener.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/IProjectPropertyListener.java
new file mode 100644
index 0000000..f975230
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/IProjectPropertyListener.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.properties;
+
+import org.eclipse.core.resources.IProject;
+
+public interface IProjectPropertyListener {
+
+	/**
+	 * Handler for property changes
+	 * 
+	 * @param project the project to which the property changed
+	 * @param property the name of the property changed
+	 */
+	void handleProjectPropertyChanged(IProject project, String property);
+	
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/IPropertyChangeManager.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/IPropertyChangeManager.java
new file mode 100644
index 0000000..65b4fad
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/IPropertyChangeManager.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.properties;
+
+import org.eclipse.core.resources.IProject;
+
+public interface IPropertyChangeManager {
+
+	/**
+	 * Add a project property listener for given project.
+	 * 
+	 * @param project the project to which the listener is interested
+	 * @param listener the listener to notify
+	 */
+	void addProjectPropertyListener(IProject project, IProjectPropertyListener listener);
+	
+	/**
+	 * Remove a project property listener.
+	 * 
+	 * @param listener the listener to remove
+	 */
+	void removeProjectPropertyListener(IProject project, IProjectPropertyListener listener);
+	
+	/**
+	 * Notify all listeners of project that a property has changed.
+	 * 
+	 * @param project the project for which the property has changed
+	 * @param property the property that has changed
+	 */
+	void notifyPropertyListeners(IProject project, String property);
+	
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/MarkerGenerator.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/MarkerGenerator.java
new file mode 100644
index 0000000..c43f040
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/MarkerGenerator.java
@@ -0,0 +1,155 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.IMarkerGenerator;
+import org.eclipse.cdt.core.ProblemMarkerInfo;
+import org.eclipse.cdt.core.model.ICModelMarker;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.runtime.CoreException;
+
+public abstract class MarkerGenerator implements IMarkerGenerator {
+
+	/**
+	 * Constructor for MarkerGenerator
+	 */
+	public MarkerGenerator() {
+		super();
+	}
+
+	/*
+	 * callback from Output Parser
+	 */
+	public void addMarker(IResource file, int lineNumber, String errorDesc, int severity, String errorVar) {
+
+		try {
+			IMarker[] cur = file.findMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, false, IResource.DEPTH_ONE);
+			/*
+			 * Try to find matching markers and don't put in duplicates
+			 */
+			if ((cur != null) && (cur.length > 0)) {
+				for (int i = 0; i < cur.length; i++) {
+					int line = ((Integer) cur[i].getAttribute(IMarker.LOCATION)).intValue();
+					int sev = ((Integer) cur[i].getAttribute(IMarker.SEVERITY)).intValue();
+					String mesg = (String) cur[i].getAttribute(IMarker.MESSAGE);
+					if (line == lineNumber && sev == mapMarkerSeverity(severity) && mesg.equals(errorDesc)) {
+						return;
+					}
+				}
+			}
+
+			IMarker marker = file.createMarker(ICModelMarker.C_MODEL_PROBLEM_MARKER);
+			marker.setAttribute(IMarker.LOCATION, lineNumber);
+			marker.setAttribute(IMarker.MESSAGE, errorDesc);
+			marker.setAttribute(IMarker.SEVERITY, mapMarkerSeverity(severity));
+			marker.setAttribute(IMarker.LINE_NUMBER, lineNumber);
+			marker.setAttribute(IMarker.CHAR_START, -1);
+			marker.setAttribute(IMarker.CHAR_END, -1);
+			if (errorVar != null) {
+				marker.setAttribute(ICModelMarker.C_MODEL_MARKER_VARIABLE, errorVar);
+			}
+		}
+		catch (CoreException e) {
+			CCorePlugin.log(e.getStatus());
+		}
+
+	}
+	
+	public abstract IProject getProject();
+
+	/*
+	 * callback from Output Parser
+	 */
+	public void addMarker(ProblemMarkerInfo problemMarkerInfo) {
+		try {
+			IResource markerResource = problemMarkerInfo.file ;
+			if (markerResource==null)  {
+				markerResource = getProject();
+			}
+			IMarker[] cur = markerResource.findMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, true, IResource.DEPTH_ONE);
+			/*
+			 * Try to find matching markers and don't put in duplicates
+			 */
+			if ((cur != null) && (cur.length > 0)) {
+				for (int i = 0; i < cur.length; i++) {
+					int line = ((Integer) cur[i].getAttribute(IMarker.LOCATION)).intValue();
+					int sev = ((Integer) cur[i].getAttribute(IMarker.SEVERITY)).intValue();
+					String mesg = (String) cur[i].getAttribute(IMarker.MESSAGE);
+					if (line == problemMarkerInfo.lineNumber && sev == mapMarkerSeverity(problemMarkerInfo.severity) && mesg.equals(problemMarkerInfo.description)) {
+						return;
+					}
+				}
+			}
+
+			IMarker marker = markerResource.createMarker(ICModelMarker.C_MODEL_PROBLEM_MARKER);
+			marker.setAttribute(IMarker.LOCATION, problemMarkerInfo.lineNumber);
+			marker.setAttribute(IMarker.MESSAGE, problemMarkerInfo.description);
+			marker.setAttribute(IMarker.SEVERITY, mapMarkerSeverity(problemMarkerInfo.severity));
+			marker.setAttribute(IMarker.LINE_NUMBER, problemMarkerInfo.lineNumber);
+			marker.setAttribute(IMarker.CHAR_START, -1);
+			marker.setAttribute(IMarker.CHAR_END, -1);
+			if (problemMarkerInfo.variableName != null) {
+				marker.setAttribute(ICModelMarker.C_MODEL_MARKER_VARIABLE, problemMarkerInfo.variableName);
+			}
+			if (problemMarkerInfo.externalPath != null) {
+				marker.setAttribute(ICModelMarker.C_MODEL_MARKER_EXTERNAL_LOCATION, problemMarkerInfo.externalPath.toOSString());
+			}
+		}
+		catch (CoreException e) {
+			CCorePlugin.log(e.getStatus());
+		}
+	}
+
+	private int mapMarkerSeverity(int severity) {
+		switch (severity) {
+			case SEVERITY_ERROR_BUILD :
+			case SEVERITY_ERROR_RESOURCE :
+				return IMarker.SEVERITY_ERROR;
+			case SEVERITY_INFO :
+				return IMarker.SEVERITY_INFO;
+			case SEVERITY_WARNING :
+				return IMarker.SEVERITY_WARNING;
+		}
+		return IMarker.SEVERITY_ERROR;
+	}
+	
+	/* (non-Javadoc)
+	 * Removes the IMarkers for the project specified in the argument if the
+	 * project exists, and is open. 
+	 * 
+	 * @param project
+	 */
+	public void removeAllMarkers(IProject project) {
+		if (project == null || !project.isAccessible()) return;
+
+		// Clear out the problem markers
+		IWorkspace workspace = project.getWorkspace();
+		IMarker[] markers;
+		try {
+			markers = project.findMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE);
+		} catch (CoreException e) {
+			// Handled just about every case in the sanity check
+			return;
+		}
+		if (markers != null) {
+			try {
+				workspace.deleteMarkers(markers);
+			} catch (CoreException e) {
+				// The only situation that might cause this is some sort of resource change event
+				return;
+			}
+		}
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsConsole.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsConsole.java
new file mode 100644
index 0000000..982764a
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsConsole.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2004, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ * Red Hat Inc - Adapted for Autotools usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.cdt.ui.IBuildConsoleManager;
+import org.eclipse.core.resources.IProject;
+
+public class AutotoolsConsole extends Console {
+	IProject project;
+	IBuildConsoleManager fConsoleManager;
+	
+	private static final String CONTEXT_MENU_ID = "CAutotoolsConsole"; //$NON-NLS-1$
+	private static final String CONSOLE_NAME = ConsoleMessages.getString("AutotoolsConsole.name"); //$NON-NLS-1$
+	
+	public AutotoolsConsole() {
+		super(CONSOLE_NAME, CONTEXT_MENU_ID);
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CBuildStepsConsole.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CBuildStepsConsole.java
new file mode 100644
index 0000000..5ba3259
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CBuildStepsConsole.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2004, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ * Red Hat Inc - Adapted for Autotools usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.cdt.ui.IBuildConsoleManager;
+import org.eclipse.core.resources.IProject;
+
+public class CBuildStepsConsole extends Console {
+	IProject project;
+	IBuildConsoleManager fConsoleManager;
+	
+	private static final String CONTEXT_MENU_ID = "CAutotoolsBuildStepsConsole"; //$NON-NLS-1$
+	private static final String CONSOLE_NAME = ConsoleMessages.getString("BuildStepsConsole.name"); //$NON-NLS-1$
+	
+	public CBuildStepsConsole() {
+		super(CONSOLE_NAME, CONTEXT_MENU_ID);
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CConfigureConsole.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CConfigureConsole.java
new file mode 100644
index 0000000..1925fcd
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CConfigureConsole.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2004, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.cdt.ui.IBuildConsoleManager;
+import org.eclipse.core.resources.IProject;
+
+public class CConfigureConsole extends Console {
+	IProject project;
+	IBuildConsoleManager fConsoleManager;
+	
+	private static final String CONTEXT_MENU_ID = "CAutotoolsConfigureConsole"; //$NON-NLS-1$
+	private static final String CONSOLE_NAME = ConsoleMessages.getString("ConfigureConsole.name"); //$NON-NLS-1$
+	
+	public CConfigureConsole() {
+		super(CONSOLE_NAME, CONTEXT_MENU_ID);
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CWordFinder.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CWordFinder.java
new file mode 100644
index 0000000..cc28694
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CWordFinder.java
@@ -0,0 +1,283 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.Region;
+
+
+/**
+ * This is a helper class for the text editor to be able to determine, given a
+ * particular offset in a document, various candidates segments for things like
+ * context help, proposals and hovering.
+ */
+public class CWordFinder {
+	
+	private static final char CBRACE_L = '{';
+	private static final char CBRACE_R = '}';
+	private static final char  BRACE_R = ')';
+	
+	/**
+	 * This method determines for a given offset into a given document what the
+	 * region is which defines the current word. A word is defined as the set of
+	 * non "C" identifiers. So assuming that ! indicated the current cursor
+	 * postion: !afunction(int a, int b) --> word = length 0 afunc!tion(int a,
+	 * int b) --> word = afunction afunction!(int a, int b) --> word = afunction
+	 * afunction(!int a, int b) --> word = length 0 afunction(int a,! int b) -->
+	 * word = length 0 afunction(!) --> word = length 0
+	 * 
+	 * @param document
+	 *            The document to be examined
+	 * @param offset
+	 *            The offset into the document where a word should be
+	 *            idendified.
+	 * @return The region defining the current word, which may be a region of
+	 *         length 0 if the offset is not in a word, or null if there is an
+	 *         error accessing the docment data.
+	 */
+	public static IRegion findWord(IDocument document, int offset) {
+		int start = -1;
+		int end = -1;
+
+		try {
+			int pos = offset;
+			char c;
+
+			while (pos >= 0) {
+				c = document.getChar(pos);
+				if (!Character.isJavaIdentifierPart(c))
+					break;
+				--pos;
+			}
+
+			start = pos + 1;
+
+			pos = offset;
+			int length = document.getLength();
+
+			while (pos < length) {
+				c = document.getChar(pos);
+				if (!Character.isJavaIdentifierPart(c))
+					break;
+				++pos;
+			}
+
+			end = pos;
+
+		} catch (BadLocationException x) {
+		}
+
+		if (start > -1 && end > -1) {
+			if (start >= offset && end == offset)
+				return new Region(offset, 0);
+			else
+				return new Region(start, end - start);
+		}
+
+		return null;
+	}
+
+	/**
+	 * This method will determine the region for the name of the function within
+	 * which the current offset is contained.
+	 * 
+	 * @param document
+	 *            The document to be examined
+	 * @param offset
+	 *            The offset into the document where a word should be
+	 *            idendified.
+	 * @return The region defining the current word, which may be a region of
+	 *         length 0 if the offset is not in a function, or null if there is
+	 *         an error accessing the docment data.
+	 */
+	public static IRegion findFunction(IDocument document, int offset) {
+		int leftbracket = -1;
+		int leftbracketcount = 0;
+		int rightbracket = -1;
+		int rightbracketcount = 0;
+		int functionstart = -1;
+		int functionend = -1;
+
+		try {
+			int length = document.getLength();
+			int pos;
+			char c;
+
+			//Find most relevant right bracket from our position
+			pos = offset;
+			rightbracketcount = leftbracketcount = 0;
+			while (pos < length) {
+				c = document.getChar(pos);
+
+				if (c == ')') {
+					rightbracketcount++;
+					if (rightbracketcount >= leftbracketcount) {
+						rightbracket = pos;
+						break;
+					}
+				}
+
+				if (c == '(') {
+					leftbracketcount++;
+				}
+
+				if (c == ';') {
+					break;
+				}
+
+				pos++;
+			}
+
+			if (rightbracket == -1) {
+				return new Region(offset, 0);
+			}
+
+			//Now backtrack our way from the rightbracket to the left
+			pos = rightbracket;
+			rightbracketcount = leftbracketcount = 0;
+			while (pos >= 0) {
+				c = document.getChar(pos);
+
+				if (c == ')') {
+					rightbracketcount++;
+				}
+
+				if (c == '(') {
+					leftbracketcount++;
+					if (leftbracketcount >= rightbracketcount) {
+						leftbracket = pos;
+						break;
+					}
+				}
+
+				if (c == ';') {
+					break;
+				}
+
+				pos--;
+			}
+
+			if (leftbracket == -1) {
+				return new Region(offset, 0);
+			}
+
+			//Now work our way to the function name
+			pos = leftbracket - 1;
+			while (pos >= 0) {
+				c = document.getChar(pos);
+				if (functionend == -1 && c == ' ') {
+					pos--;
+					continue;
+				}
+
+				if (!Character.isJavaIdentifierPart(c)) {
+					break;
+				}
+
+				functionstart = pos;
+				if (functionend == -1) {
+					functionend = pos;
+				}
+
+				pos--;
+			}
+		} catch (BadLocationException x) {
+			/* Ignore */
+		}
+
+		if (functionstart > -1 && functionend > -1) {
+			return new Region(functionstart, functionend - functionstart + 1);
+		}
+
+		return null;
+	}
+
+	/**
+	 * This method will determine whether current offset is contained 
+	 * in any function's body or it's outside it. 
+	 * 
+	 * @param document
+	 *            The document to be examined
+	 * @param offset
+	 *            The offset into the document
+	 * @return 
+	 *      <code>true</code> if there is no function body around offset 
+	 *      <code>false</code> otherwise 
+	 */
+	public static boolean isGlobal(IDocument document, int offset) {
+		try {
+			int pos = offset;
+			int bracketcount = 0;
+			char c;
+
+			//Find left curled bracket from our position
+			while (pos > 0) {
+				c = document.getChar(pos--);
+
+				if (c == CBRACE_R) {
+					bracketcount++; // take into account nested blocks
+				} else if (c == CBRACE_L) {
+					if (bracketcount-- == 0) {
+						do {
+							c = document.getChar(pos--);
+							if (c == BRACE_R) return false;
+						} while (Character.isWhitespace(c));
+						// container block seems to be not a function or statement body
+						pos++;             // step back one symbol
+						bracketcount = 0;  // let's search for upper block
+					}
+				}
+			}
+			
+		} catch (BadLocationException x) { /* Ignore */	}
+		// return true in case of unknown result or exception 
+		return true;
+	}
+	
+	/**
+	 * Searches for line feed symbols in string.
+	 * First met '\r' or '\n' is treated as LF symbol
+	 * 
+	 * @param s
+	 * 			string to search in.
+	 * @return  number of LFs met.
+	 */
+	public static int countLFs (String s) {
+		int counter = 0;
+		char lf = 0;
+		char c;
+		for (int i=0; i<s.length(); i++) {
+			c = s.charAt(i);
+			if (lf == 0) {
+				if (c == '\n' || c == '\r') {
+					lf = c;
+					counter++;
+				}
+			} else if (lf == c) counter++;
+		}
+		return counter;
+	}
+
+	/**
+	 * Checks whether the string contains any C-block delimiters ( { } ) 
+	 * 
+	 * @param s 
+	 * 			text to check
+	 * @return  true if curled brace found.
+	 */
+	public static boolean hasCBraces (String s) {
+		if (s.indexOf(CBRACE_L) > -1 || s.indexOf(CBRACE_R) > -1) return true;
+		else return false;
+	}
+}
+
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/Console.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/Console.java
new file mode 100644
index 0000000..695e489
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/Console.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2004 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.cdt.core.ConsoleOutputStream;
+import org.eclipse.cdt.core.resources.IConsole;
+import org.eclipse.cdt.ui.CUIPlugin;
+import org.eclipse.cdt.ui.IBuildConsoleManager;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+
+public class Console implements IConsole {
+	IProject project;
+	IBuildConsoleManager fConsoleManager;
+	
+	public Console(String consoleName, String contextId) {
+		fConsoleManager = CUIPlugin.getDefault().getConsoleManager(consoleName, 
+				contextId);
+	}
+	
+//	/**
+//	 * Constructor for ConfigureConsole.
+//	 */
+//	public CConfigureConsole() {
+//		fConsoleManager = AutotoolsPlugin.getDefault().getConsoleManager();
+//	}
+//
+
+	public void start(IProject project ) {
+		this.project = project;
+		fConsoleManager.getConsole(project).start(project);
+	}
+	
+	/**
+	 * @throws CoreException
+	 * @see org.eclipse.cdt.core.resources.IConsole#getOutputStream()
+	 */
+	public ConsoleOutputStream getOutputStream() throws CoreException {
+		return fConsoleManager.getConsole(project).getOutputStream();
+	}
+
+	public ConsoleOutputStream getInfoStream() throws CoreException {
+		return fConsoleManager.getConsole(project).getInfoStream();
+	}
+
+	public ConsoleOutputStream getErrorStream() throws CoreException {
+		return fConsoleManager.getConsole(project).getErrorStream();
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.java
new file mode 100644
index 0000000..a9b3d21
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2004 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class ConsoleMessages {
+
+	public static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.cdt.autotools.ui.ConsoleMessages";//$NON-NLS-1$
+
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+
+	private ConsoleMessages() {
+
+	}
+	public static String getString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.properties b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.properties
new file mode 100644
index 0000000..7c4510d
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.properties
@@ -0,0 +1,25 @@
+###############################################################################
+# Copyright (c) 2003, 2004 QNX Software Systems and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# QNX Software Systems - Initial API and implementation
+###############################################################################
+ConfigureConsole.name=Configure
+BuildStepsConsole.name=Build Steps
+AutotoolsConsole.name=Autotools
+
+find_replace_action.label=&Find/Replace...@Ctrl+F
+find_replace_action.tooltip=Find/Replace
+find_replace_action.image=
+find_replace_action.description=Find/Replace
+
+ConfigureConsolePage.&Copy@Ctrl+C_6=&Copy@Ctrl+C
+ConfigureConsolePage.Copy_7=Copy
+ConfigureConsolePage.Select_&All@Ctrl+A_12=Select &All@Ctrl+A
+ConfigureConsolePage.Select_All=Select All
+
+ScrollLockAction.Scroll_Lock_1=Scroll Lock
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLPrinter.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLPrinter.java
new file mode 100644
index 0000000..a9de7d1
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLPrinter.java
@@ -0,0 +1,116 @@
+/*******************************************************************************
+ * Copyright (c) 2000 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.io.IOException;
+import java.io.Reader;
+
+
+/**
+ * Provides a set of convenience methods for creating HTML pages.
+ */
+public class HTMLPrinter {
+			
+	private HTMLPrinter() {
+	}
+	
+	private static String replace(String text, char c, String s) {
+				
+		int previous= 0;
+		int current= text.indexOf(c, previous);
+		
+		if (current == -1)
+			return text;
+		
+		StringBuffer buffer= new StringBuffer();	
+		while (current > -1) {
+			buffer.append(text.substring(previous, current));
+			buffer.append(s);
+			previous= current + 1;
+			current= text.indexOf(c, previous);
+		}
+		buffer.append(text.substring(previous));
+		
+		return buffer.toString();
+	}
+	
+	public static String convertToHTMLContent(String content) {
+		content= replace(content, '<', "&lt;"); //$NON-NLS-1$
+		return replace(content, '>', "&gt;"); //$NON-NLS-1$
+	}
+	
+	public static String read(Reader rd) {
+		
+		StringBuffer buffer= new StringBuffer();
+		char[] readBuffer= new char[2048];
+		
+		try {
+			int n= rd.read(readBuffer);
+			while (n > 0) {
+				buffer.append(readBuffer, 0, n);
+				n= rd.read(readBuffer);
+			}
+			return buffer.toString();
+		} catch (IOException x) {
+		}
+		
+		return null;
+	}
+
+	public static void insertPageProlog(StringBuffer buffer, int position) {
+		buffer.insert(position, "<html><body text=\"#000000\" bgcolor=\"#FFFF88\"><font size=-1>"); //$NON-NLS-1$
+	}
+	
+	public static void addPageProlog(StringBuffer buffer) {
+		insertPageProlog(buffer, buffer.length());
+	}
+	
+	public static void addPageEpilog(StringBuffer buffer) {
+		buffer.append("</font></body></html>"); //$NON-NLS-1$
+	}
+	
+	public static void startBulletList(StringBuffer buffer) {
+		buffer.append("<ul>"); //$NON-NLS-1$
+	}
+	
+	public static void endBulletList(StringBuffer buffer) {
+		buffer.append("</ul>"); //$NON-NLS-1$
+	}
+	
+	public static void addBullet(StringBuffer buffer, String bullet) {
+		if (bullet != null) {
+			buffer.append("<li>"); //$NON-NLS-1$
+			buffer.append(bullet);
+			buffer.append("</li>"); //$NON-NLS-1$
+		}
+	}
+	
+	public static void addSmallHeader(StringBuffer buffer, String header) {
+		if (header != null) {
+			buffer.append("<h5>"); //$NON-NLS-1$
+			buffer.append(header);
+			buffer.append("</h5>"); //$NON-NLS-1$
+		}
+	}
+	
+	public static void addParagraph(StringBuffer buffer, String paragraph) {
+		if (paragraph != null) {
+			buffer.append("<p>"); //$NON-NLS-1$
+			buffer.append(paragraph);
+		}
+	}
+	
+	public static void addParagraph(StringBuffer buffer, Reader paragraphReader) {
+		if (paragraphReader != null)
+			addParagraph(buffer, read(paragraphReader));
+	}
+}
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/LineBreakingReader.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/LineBreakingReader.java
new file mode 100644
index 0000000..52fb3e3
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/LineBreakingReader.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2000 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.Reader;
+
+import java.text.BreakIterator;
+import org.eclipse.swt.graphics.GC;
+
+/*
+ * Not a real reader. Could change if requested
+ */
+public class LineBreakingReader {
+	
+	private BufferedReader fReader;
+	private GC fGC;
+	private int fMaxWidth;
+	
+	private String fLine;
+	private int fOffset;
+	
+	private BreakIterator fLineBreakIterator;
+	private int findNextBreakOffset(int currOffset) {
+		int currWidth= 0;
+		int nextOffset= fLineBreakIterator.following(currOffset);
+		while (nextOffset != BreakIterator.DONE) {
+			String word= fLine.substring(currOffset, nextOffset);
+			int wordWidth= fGC.textExtent(word).x;
+			int nextWidth= wordWidth + currWidth;
+			if (nextWidth > fMaxWidth) {
+				if (currWidth > 0) {
+					return currOffset;
+				}
+				return nextOffset;
+			}
+			currWidth= nextWidth;
+			currOffset= nextOffset;
+			nextOffset= fLineBreakIterator.next();
+		}
+		return nextOffset;
+	}
+	private int findWordBegin(int idx) {
+		while (idx < fLine.length() && Character.isWhitespace(fLine.charAt(idx))) {
+			idx++;
+		}
+		return idx;
+	}
+	/**
+	 * Creates a reader that breaks an input text to fit in a given width.
+	 * @param reader Reader of the input text
+	 * @param gc The graphic context that defines the currently used font sizes
+	 * @param maxLineWidth The max width (pixes) where the text has to fit in 
+	 */
+	public LineBreakingReader(Reader reader, GC gc, int maxLineWidth) {
+		fReader= new BufferedReader(reader);
+		fGC= gc;
+		fMaxWidth= maxLineWidth;
+		fOffset= 0;
+		fLine= null;
+		fLineBreakIterator= BreakIterator.getLineInstance();
+	}
+	
+	public boolean isFormattedLine() {
+		return fLine != null;
+	}
+	
+	/**
+	 * Reads the next line. The lengths of the line will not exceed the gived maximum
+	 * width.
+	 */
+	public String readLine() throws IOException {
+		if (fLine == null) {
+			String line= fReader.readLine();
+			if (line == null) {
+				return null;
+			}
+								
+			int lineLen= fGC.textExtent(line).x;
+			if (lineLen < fMaxWidth) {
+				return line;
+			}
+			fLine= line;
+			fLineBreakIterator.setText(line);
+			fOffset= 0;
+		}
+		int breakOffset= findNextBreakOffset(fOffset);
+		String res;
+		if (breakOffset != BreakIterator.DONE) {
+			res= fLine.substring(fOffset, breakOffset);
+			fOffset= findWordBegin(breakOffset);
+			if (fOffset == fLine.length()) {
+				fLine= null;
+			}
+		} else {
+			res= fLine.substring(fOffset);
+			fLine= null;
+		}
+		return res;
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SingleCharReader.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SingleCharReader.java
new file mode 100644
index 0000000..1d48fcc
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SingleCharReader.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2000 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.io.IOException;
+import java.io.Reader;
+
+
+public abstract class SingleCharReader extends Reader {
+	
+	/**
+	 * @see Reader#read(char)
+	 */
+	public abstract int read() throws IOException;
+
+
+	/**
+	 * @see Reader#read(char[],int,int)
+	 */
+	public int read(char cbuf[], int off, int len) throws IOException {
+		int end= off + len;
+		for (int i= off; i < end; i++) {
+			int ch= read();
+			if (ch == -1) {
+				if (i == off) {
+					return -1;
+				}
+				return i - off;
+			}
+			cbuf[i]= (char)ch;
+		}
+		return len;
+	}		
+	
+	/**
+	 * @see Reader#ready()
+	 */		
+    public boolean ready() throws IOException {
+		return true;
+	}
+	
+	/**
+	 * Gets the content as a String
+	 */
+	public String getString() throws IOException {
+		StringBuffer buf= new StringBuffer();
+		int ch;
+		while ((ch= read()) != -1) {
+			buf.append((char)ch);
+		}
+		return buf.toString();
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SubstitutionTextReader.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SubstitutionTextReader.java
new file mode 100644
index 0000000..16d8400
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SubstitutionTextReader.java
@@ -0,0 +1,138 @@
+/*******************************************************************************
+ * Copyright (c) 2000 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+
+import java.io.IOException;
+import java.io.Reader;
+
+
+/**
+ * Reads the text contents from a reader and computes for each character
+ * a potential substitution. The substitution may eat more characters than 
+ * only the one passed into the computation routine.
+ */
+public abstract class SubstitutionTextReader extends SingleCharReader {
+	
+	protected static final String LINE_DELIM= System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
+	
+	private Reader fReader;
+	private boolean fWasWhiteSpace;
+	private int fCharAfterWhiteSpace;
+	
+	private boolean fReadFromBuffer;
+	private StringBuffer fBuffer;
+	private int fIndex;
+
+
+	protected SubstitutionTextReader(Reader reader) {
+		fReader= reader;
+		fBuffer= new StringBuffer();
+		fIndex= 0;
+		fReadFromBuffer= false;
+		fCharAfterWhiteSpace= -1;
+		fWasWhiteSpace= true;
+	}
+	
+	/**
+	 * Implement to compute the substitution for the given character and 
+	 * if necessary subsequent characters. Use <code>nextChar</code>
+	 * to read subsequent characters.
+	 */
+	protected abstract String computeSubstitution(int c) throws IOException;
+	
+	/**
+	 * Returns the internal reader.
+	 */
+	protected Reader getReader() {
+		return fReader;
+	}
+	 
+	/**
+	 * Returns the next character.
+	 */
+	protected int nextChar() throws IOException {
+		fReadFromBuffer= (fBuffer.length() > 0);
+		if (fReadFromBuffer) {
+			char ch= fBuffer.charAt(fIndex++);
+			if (fIndex >= fBuffer.length()) {
+				fBuffer.setLength(0);
+				fIndex= 0;
+			}
+			return ch;
+		}
+		int ch= fCharAfterWhiteSpace;
+		if (ch == -1) {
+			ch= fReader.read();
+		}
+		if (Character.isWhitespace((char)ch)) {
+			do {
+				ch= fReader.read();
+			} while (Character.isWhitespace((char)ch));
+			if (ch != -1) {
+				fCharAfterWhiteSpace= ch;
+				return ' ';
+			}
+		} else {
+			fCharAfterWhiteSpace= -1;
+		}
+		return ch;
+	}
+	
+	/**
+	 * @see Reader#read()
+	 */
+	public int read() throws IOException {
+		int c;
+		do {
+			
+			c= nextChar();
+			while (!fReadFromBuffer) {
+				String s= computeSubstitution(c);
+				if (s == null)
+					break;
+				if (s.length() > 0)
+					fBuffer.insert(0, s);
+				c= nextChar();
+			}
+			
+		} while (fWasWhiteSpace && (c == ' '));
+				
+		fWasWhiteSpace= (c == ' ' || c == '\r' || c == '\n');
+		return c;
+	}
+		
+	/**
+	 * @see Reader#ready()
+	 */		
+    public boolean ready() throws IOException {
+		return fReader.ready();
+	}
+		
+	/**
+	 * @see Reader#close()
+	 */		
+	public void close() throws IOException {
+		fReader.close();
+	}
+	
+	/**
+	 * @see Reader#reset()
+	 */		
+	public void reset() throws IOException {
+		fReader.reset();
+		fWasWhiteSpace= true;
+		fCharAfterWhiteSpace= -1;
+		fBuffer.setLength(0);
+		fIndex= 0;		
+	}
+}
\ No newline at end of file
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsEditorPreferenceConstants.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsEditorPreferenceConstants.java
new file mode 100644
index 0000000..5fbd710
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsEditorPreferenceConstants.java
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2005, 2007, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ * Red Hat Inc. - rename to use with Autotools editors
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+
+/**
+ * MakefileEditorPreferenceConstants
+ */
+public class AutotoolsEditorPreferenceConstants {
+
+	/**
+	 * 
+	 */
+	private AutotoolsEditorPreferenceConstants() {
+	}
+
+	/**
+	 * The symbolic names for colors for displaying code assist proposals
+	 * @see org.eclipse.jface.resource.ColorRegistry
+	 */
+	public static final String CURRENT_LINE_COLOR = "org.eclipse.linuxtools.cdt.autotools.automake.ui.currentLineHightlightColor"; //$NON-NLS-1$
+	public static final String LINE_NUMBER_RULER_COLOR = "org.eclipse.linuxtools.cdt.autotools.automake.ui.lineNumberForegroundColor"; //$NON-NLS-1$
+	public static final String PRINT_MARGIN_COLOR = "org.eclipse.linuxtools.cdt.autotools.automake.ui.printMarginColor"; //$NON-NLS-1$	
+	
+	/**
+	 * Preference key suffix for bold text style preference keys.
+	 * 
+	 */
+	public static final String EDITOR_BOLD_SUFFIX= "_bold"; //$NON-NLS-1$
+
+	/**
+	 * Preference key suffix for italic text style preference keys.
+	 */
+	public static final String EDITOR_ITALIC_SUFFIX= "_italic"; //$NON-NLS-1$
+
+
+	public static final String EDITOR_FOLDING_MACRODEF = "editor_folding_default_macrodef"; //$NON-NLS-1$
+
+	public static final String EDITOR_FOLDING_RULE = "editor_folding_default_rule"; //$NON-NLS-1$
+
+	public static final String EDITOR_FOLDING_CASE = "editor_folding_default_case"; //$NON-NLS-1$
+
+	public static final String EDITOR_FOLDING_CONDITIONAL = "editor_folding_default_conditional"; //$NON-NLS-1$
+
+	public static final String EDITOR_FOLDING_LOOP = "editor_folding_default_loop"; //$NON-NLS-1$
+
+	public static final String EDITOR_FOLDING_ENABLED = "editor_folding_enabled"; //$NON-NLS-1$
+	
+	public static final String AUTOCONF_VERSION = "autoconf_version"; //$NON-NLS-1$
+	
+	public static final String AUTOMAKE_VERSION = "automake_version"; //$NON-NLS-1$
+	
+	public static final String LATEST_AC_VERSION = "2.61"; //$NON-NLS-1$
+	
+	public static final String LATEST_AM_VERSION = "1.9.6"; //$NON-NLS-1$
+	
+	public static void initializeDefaultValues(IPreferenceStore store) {
+
+		store.setDefault(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_ENABLED, false);
+		store.setDefault(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_MACRODEF, false);
+		store.setDefault(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_RULE, true);
+		store.setDefault(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_CASE, true);
+		store.setDefault(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_CONDITIONAL, true);
+		store.setDefault(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_LOOP, true);
+		store.setDefault(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION, LATEST_AC_VERSION);
+		store.setDefault(AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION, LATEST_AM_VERSION);
+	}
+
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/OverlayPreferenceStore.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/OverlayPreferenceStore.java
new file mode 100644
index 0000000..3c6a672
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/OverlayPreferenceStore.java
@@ -0,0 +1,455 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferenceStore;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.PropertyChangeEvent;
+
+/**
+ * OverlayPreferenceStore
+ */
+/**
+ * An overlaying preference store.
+ */
+class OverlayPreferenceStore  implements IPreferenceStore {
+	
+	
+	public static final class TypeDescriptor {
+		TypeDescriptor() {
+		}
+	}
+	
+	public static final TypeDescriptor BOOLEAN= new TypeDescriptor();
+	public static final TypeDescriptor DOUBLE= new TypeDescriptor();
+	public static final TypeDescriptor FLOAT= new TypeDescriptor();
+	public static final TypeDescriptor INT= new TypeDescriptor();
+	public static final TypeDescriptor LONG= new TypeDescriptor();
+	public static final TypeDescriptor STRING= new TypeDescriptor();
+	
+	public static class OverlayKey {
+		
+		TypeDescriptor fDescriptor;
+		String fKey;
+		
+		public OverlayKey(TypeDescriptor descriptor, String key) {
+			fDescriptor= descriptor;
+			fKey= key;
+		}
+	}
+	
+	private class PropertyListener implements IPropertyChangeListener {
+				
+		/*
+		 * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent)
+		 */
+		public void propertyChange(PropertyChangeEvent event) {
+			OverlayKey key= findOverlayKey(event.getProperty());
+			if (key != null)
+				propagateProperty(fParent, key, fStore); 
+		}
+	}
+	
+	
+	IPreferenceStore fParent;
+	IPreferenceStore fStore;
+	private OverlayKey[] fOverlayKeys;
+	
+	private PropertyListener fPropertyListener;
+	
+	
+	public OverlayPreferenceStore(IPreferenceStore parent, OverlayKey[] overlayKeys) {
+		fParent= parent;
+		fOverlayKeys= overlayKeys;
+		fStore= new PreferenceStore();
+	}
+	
+	OverlayKey findOverlayKey(String key) {
+		for (int i= 0; i < fOverlayKeys.length; i++) {
+			if (fOverlayKeys[i].fKey.equals(key))
+				return fOverlayKeys[i];
+		}
+		return null;
+	}
+	
+	private boolean covers(String key) {
+		return (findOverlayKey(key) != null);
+	}
+	
+	void propagateProperty(IPreferenceStore orgin, OverlayKey key, IPreferenceStore target) {
+		
+		if (orgin.isDefault(key.fKey)) {
+			if (!target.isDefault(key.fKey))
+				target.setToDefault(key.fKey);
+			return;
+		}
+		
+		TypeDescriptor d= key.fDescriptor;
+		if (BOOLEAN == d) {
+			
+			boolean originValue= orgin.getBoolean(key.fKey);
+			boolean targetValue= target.getBoolean(key.fKey);
+			if (targetValue != originValue)
+				target.setValue(key.fKey, originValue);
+				
+		} else if (DOUBLE == d) {
+			
+			double originValue= orgin.getDouble(key.fKey);
+			double targetValue= target.getDouble(key.fKey);
+			if (targetValue != originValue)
+				target.setValue(key.fKey, originValue);
+		
+		} else if (FLOAT == d) {
+			
+			float originValue= orgin.getFloat(key.fKey);
+			float targetValue= target.getFloat(key.fKey);
+			if (targetValue != originValue)
+				target.setValue(key.fKey, originValue);
+				
+		} else if (INT == d) {
+
+			int originValue= orgin.getInt(key.fKey);
+			int targetValue= target.getInt(key.fKey);
+			if (targetValue != originValue)
+				target.setValue(key.fKey, originValue);
+
+		} else if (LONG == d) {
+
+			long originValue= orgin.getLong(key.fKey);
+			long targetValue= target.getLong(key.fKey);
+			if (targetValue != originValue)
+				target.setValue(key.fKey, originValue);
+
+		} else if (STRING == d) {
+
+			String originValue= orgin.getString(key.fKey);
+			String targetValue= target.getString(key.fKey);
+			if (targetValue != null && originValue != null && !targetValue.equals(originValue))
+				target.setValue(key.fKey, originValue);
+
+		}
+	}
+	
+	public void propagate() {
+		for (int i= 0; i < fOverlayKeys.length; i++)
+			propagateProperty(fStore, fOverlayKeys[i], fParent);
+	}
+	
+	private void loadProperty(IPreferenceStore orgin, OverlayKey key, IPreferenceStore target, boolean forceInitialization) {
+		TypeDescriptor d= key.fDescriptor;
+		if (BOOLEAN == d) {
+			
+			if (forceInitialization)
+				target.setValue(key.fKey, true);
+			target.setValue(key.fKey, orgin.getBoolean(key.fKey));
+			target.setDefault(key.fKey, orgin.getDefaultBoolean(key.fKey));
+			
+		} else if (DOUBLE == d) {
+			
+			if (forceInitialization)
+				target.setValue(key.fKey, 1.0D);
+			target.setValue(key.fKey, orgin.getDouble(key.fKey));
+			target.setDefault(key.fKey, orgin.getDefaultDouble(key.fKey));
+			
+		} else if (FLOAT == d) {
+			
+			if (forceInitialization)
+				target.setValue(key.fKey, 1.0F);
+			target.setValue(key.fKey, orgin.getFloat(key.fKey));
+			target.setDefault(key.fKey, orgin.getDefaultFloat(key.fKey));
+			
+		} else if (INT == d) {
+			
+			if (forceInitialization)
+				target.setValue(key.fKey, 1);
+			target.setValue(key.fKey, orgin.getInt(key.fKey));
+			target.setDefault(key.fKey, orgin.getDefaultInt(key.fKey));
+			
+		} else if (LONG == d) {
+			
+			if (forceInitialization)
+				target.setValue(key.fKey, 1L);
+			target.setValue(key.fKey, orgin.getLong(key.fKey));
+			target.setDefault(key.fKey, orgin.getDefaultLong(key.fKey));
+			
+		} else if (STRING == d) {
+			
+			if (forceInitialization)
+				target.setValue(key.fKey, "1"); //$NON-NLS-1$
+			target.setValue(key.fKey, orgin.getString(key.fKey));
+			target.setDefault(key.fKey, orgin.getDefaultString(key.fKey));
+			
+		}
+	}
+	
+	public void load() {
+		for (int i= 0; i < fOverlayKeys.length; i++)
+			loadProperty(fParent, fOverlayKeys[i], fStore, true);
+	}
+	
+	public void loadDefaults() {
+		for (int i= 0; i < fOverlayKeys.length; i++)
+			setToDefault(fOverlayKeys[i].fKey);
+	}
+	
+	public void start() {
+		if (fPropertyListener == null) {
+			fPropertyListener= new PropertyListener();
+			fParent.addPropertyChangeListener(fPropertyListener);
+		}
+	}
+	
+	public void stop() {
+		if (fPropertyListener != null)  {
+			fParent.removePropertyChangeListener(fPropertyListener);
+			fPropertyListener= null;
+		}
+	}
+	
+	/*
+	 * @see IPreferenceStore#addPropertyChangeListener(IPropertyChangeListener)
+	 */
+	public void addPropertyChangeListener(IPropertyChangeListener listener) {
+		fStore.addPropertyChangeListener(listener);
+	}
+	
+	/*
+	 * @see IPreferenceStore#removePropertyChangeListener(IPropertyChangeListener)
+	 */
+	public void removePropertyChangeListener(IPropertyChangeListener listener) {
+		fStore.removePropertyChangeListener(listener);
+	}
+	
+	/*
+	 * @see IPreferenceStore#firePropertyChangeEvent(String, Object, Object)
+	 */
+	public void firePropertyChangeEvent(String name, Object oldValue, Object newValue) {
+		fStore.firePropertyChangeEvent(name, oldValue, newValue);
+	}
+
+	/*
+	 * @see IPreferenceStore#contains(String)
+	 */
+	public boolean contains(String name) {
+		return fStore.contains(name);
+	}
+	
+	/*
+	 * @see IPreferenceStore#getBoolean(String)
+	 */
+	public boolean getBoolean(String name) {
+		return fStore.getBoolean(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDefaultBoolean(String)
+	 */
+	public boolean getDefaultBoolean(String name) {
+		return fStore.getDefaultBoolean(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDefaultDouble(String)
+	 */
+	public double getDefaultDouble(String name) {
+		return fStore.getDefaultDouble(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDefaultFloat(String)
+	 */
+	public float getDefaultFloat(String name) {
+		return fStore.getDefaultFloat(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDefaultInt(String)
+	 */
+	public int getDefaultInt(String name) {
+		return fStore.getDefaultInt(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDefaultLong(String)
+	 */
+	public long getDefaultLong(String name) {
+		return fStore.getDefaultLong(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDefaultString(String)
+	 */
+	public String getDefaultString(String name) {
+		return fStore.getDefaultString(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDouble(String)
+	 */
+	public double getDouble(String name) {
+		return fStore.getDouble(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getFloat(String)
+	 */
+	public float getFloat(String name) {
+		return fStore.getFloat(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getInt(String)
+	 */
+	public int getInt(String name) {
+		return fStore.getInt(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getLong(String)
+	 */
+	public long getLong(String name) {
+		return fStore.getLong(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getString(String)
+	 */
+	public String getString(String name) {
+		return fStore.getString(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#isDefault(String)
+	 */
+	public boolean isDefault(String name) {
+		return fStore.isDefault(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#needsSaving()
+	 */
+	public boolean needsSaving() {
+		return fStore.needsSaving();
+	}
+
+	/*
+	 * @see IPreferenceStore#putValue(String, String)
+	 */
+	public void putValue(String name, String value) {
+		if (covers(name))
+			fStore.putValue(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setDefault(String, double)
+	 */
+	public void setDefault(String name, double value) {
+		if (covers(name))
+			fStore.setDefault(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setDefault(String, float)
+	 */
+	public void setDefault(String name, float value) {
+		if (covers(name))
+			fStore.setDefault(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setDefault(String, int)
+	 */
+	public void setDefault(String name, int value) {
+		if (covers(name))
+			fStore.setDefault(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setDefault(String, long)
+	 */
+	public void setDefault(String name, long value) {
+		if (covers(name))
+			fStore.setDefault(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setDefault(String, String)
+	 */
+	public void setDefault(String name, String value) {
+		if (covers(name))
+			fStore.setDefault(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setDefault(String, boolean)
+	 */
+	public void setDefault(String name, boolean value) {
+		if (covers(name))
+			fStore.setDefault(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setToDefault(String)
+	 */
+	public void setToDefault(String name) {
+		fStore.setToDefault(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#setValue(String, double)
+	 */
+	public void setValue(String name, double value) {
+		if (covers(name))
+			fStore.setValue(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setValue(String, float)
+	 */
+	public void setValue(String name, float value) {
+		if (covers(name))
+			fStore.setValue(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setValue(String, int)
+	 */
+	public void setValue(String name, int value) {
+		if (covers(name))
+			fStore.setValue(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setValue(String, long)
+	 */
+	public void setValue(String name, long value) {
+		if (covers(name))
+			fStore.setValue(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setValue(String, String)
+	 */
+	public void setValue(String name, String value) {
+		if (covers(name))
+			fStore.setValue(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setValue(String, boolean)
+	 */
+	public void setValue(String name, boolean value) {
+		if (covers(name))
+			fStore.setValue(name, value);
+	}
+}
diff --git a/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/StatusInfo.java b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/StatusInfo.java
new file mode 100644
index 0000000..3ae395a
--- /dev/null
+++ b/autotools/0.5.0/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/StatusInfo.java
@@ -0,0 +1,173 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.linuxtools.cdt.autotools.AutotoolsPlugin;
+
+
+/**
+ * A settable IStatus.
+ * Can be an error, warning, info or ok. For error, info and warning states,
+ * a message describes the problem.
+ */
+public class StatusInfo implements IStatus {
+
+	private String fStatusMessage;
+	private int fSeverity;
+
+	/**
+	 * Creates a status set to OK (no message)
+	 */
+	public StatusInfo() {
+		this(OK, null);
+	}
+
+	/**
+	 * Creates a status .
+	 * @param severity The status severity: ERROR, WARNING, INFO and OK.
+	 * @param message The message of the status. Applies only for ERROR,
+	 * WARNING and INFO.
+	 */
+	public StatusInfo(int severity, String message) {
+		fStatusMessage= message;
+		fSeverity= severity;
+	}
+
+	/**
+	 *  Returns if the status' severity is OK.
+	 */
+	public boolean isOK() {
+		return fSeverity == IStatus.OK;
+	}
+
+	/**
+	 *  Returns if the status' severity is WARNING.
+	 */
+	public boolean isWarning() {
+		return fSeverity == IStatus.WARNING;
+	}
+
+	/**
+	 *  Returns if the status' severity is INFO.
+	 */
+	public boolean isInfo() {
+		return fSeverity == IStatus.INFO;
+	}
+
+	/**
+	 *  Returns if the status' severity is ERROR.
+	 */
+	public boolean isError() {
+		return fSeverity == IStatus.ERROR;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.runtime.IStatus#getMessage()
+	 */
+	public String getMessage() {
+		return fStatusMessage;
+	}
+
+	/**
+	 * Sets the status to ERROR.
+	 * @param errorMessage The error message (can be empty, but not null)
+	 */
+	public void setError(String errorMessage) {
+		Assert.isNotNull(errorMessage);
+		fStatusMessage= errorMessage;
+		fSeverity= IStatus.ERROR;
+	}
+
+	/**
+	 * Sets the status to WARNING.
+	 * @param warningMessage The warning message (can be empty, but not null)
+	 */
+	public void setWarning(String warningMessage) {
+		Assert.isNotNull(warningMessage);
+		fStatusMessage= warningMessage;
+		fSeverity= IStatus.WARNING;
+	}
+
+	/**
+	 * Sets the status to INFO.
+	 * @param infoMessage The info message (can be empty, but not null)
+	 */
+	public void setInfo(String infoMessage) {
+		Assert.isNotNull(infoMessage);
+		fStatusMessage= infoMessage;
+		fSeverity= IStatus.INFO;
+	}
+
+	/**
+	 * Sets the status to OK.
+	 */
+	public void setOK() {
+		fStatusMessage= null;
+		fSeverity= IStatus.OK;
+	}
+
+	/*
+	 * @see IStatus#matches(int)
+	 */
+	public boolean matches(int severityMask) {
+		return (fSeverity & severityMask) != 0;
+	}
+
+	/**
+	 * Returns always <code>false</code>.
+	 * @see IStatus#isMultiStatus()
+	 */
+	public boolean isMultiStatus() {
+		return false;
+	}
+
+	/*
+	 * @see IStatus#getSeverity()
+	 */
+	public int getSeverity() {
+		return fSeverity;
+	}
+
+	/*
+	 * @see IStatus#getPlugin()
+	 */
+	public String getPlugin() {
+		return AutotoolsPlugin.getPluginId();
+	}
+
+	/**
+	 * Returns always <code>null</code>.
+	 * @see IStatus#getException()
+	 */
+	public Throwable getException() {
+		return null;
+	}
+
+	/**
+	 * Returns always the error severity.
+	 * @see IStatus#getCode()
+	 */
+	public int getCode() {
+		return fSeverity;
+	}
+
+	/**
+	 * Returns always <code>null</code>.
+	 * @see IStatus#getChildren()
+	 */
+	public IStatus[] getChildren() {
+		return new IStatus[0];
+	}
+
+}
diff --git a/profiling/.classpath b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/.classpath
similarity index 100%
copy from profiling/.classpath
copy to autotools/org.eclipse.linuxtools.cdt.autotools-docs/.classpath
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/.project b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/.project
new file mode 100644
index 0000000..76fdbef
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.cdt.autotools-docs</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+                <buildCommand>
+                        <name>org.eclipse.jdt.core.javabuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+                <nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/ChangeLog b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/ChangeLog
new file mode 100644
index 0000000..c7a15ae
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/ChangeLog
@@ -0,0 +1,157 @@
+2010-04-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Change J2SE level to 1.5.
+
+2010-04-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #309117
+	* .classpath: New file.
+	* build-helper.xml: New file.
+	* doc/notices.html: New file.
+	* extract-markup.xsl: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/doc/anttask/MediaWikiImageFetcher.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/doc/anttask/tasks.properties: New file.
+	* userguide/Autotools\ Plugin-in\ User\ Guide-toc.xml: New file.
+	* userguide/Autotools\ Plugin-in\ User\ Guide.html: New file.
+	* userguide/Building.html: New file.
+	* userguide/Configuration.html: New file.
+	* userguide/Creating-an-Autotools-Project.html: New file.
+	* userguide/images/Linuxtool-AutotoolsMakeTargetsMenu.png: New file.
+	* userguide/images/Linuxtools-AutotoolsAclocal.png: New file.
+	* userguide/images/Linuxtools-AutotoolsAutoconfEditor.png: New file.
+	* userguide/images/Linuxtools-AutotoolsAutoconfEditorPrefs.png: New file.
+	* userguide/images/Linuxtools-AutotoolsAutoheader.png: New file.
+	* userguide/images/Linuxtools-AutotoolsAutomake.png: New file.
+	* userguide/images/Linuxtools-AutotoolsAutomakeEditor.png: New file.
+	* userguide/images/Linuxtools-AutotoolsAutoreconf.png: New file.
+	* userguide/images/Linuxtools-AutotoolsAutotools.png: New file.
+	* userguide/images/Linuxtools-AutotoolsAutotoolsConsole.png: New file.
+	* userguide/images/Linuxtools-AutotoolsBuilders.png: New file.
+	* userguide/images/Linuxtools-AutotoolsBuildLocation.png: New file.
+	* userguide/images/Linuxtools-AutotoolsCheckout.png: New file.
+	* userguide/images/Linuxtools-AutotoolsConfsettings.png: New file.
+	* userguide/images/Linuxtools-AutotoolsConsolePrefs.png: New file.
+	* userguide/images/Linuxtools-AutotoolsConsoleSelect.png: New file.
+	* userguide/images/Linuxtools-AutotoolsConvAutotoolsWizard.png: New file.
+	* userguide/images/Linuxtools-AutotoolsConvertWizard.png: New file.
+	* userguide/images/Linuxtools-AutotoolsCProjectWizard.png: New file.
+	* userguide/images/Linuxtools-AutotoolsCreateConf.png: New file.
+	* userguide/images/Linuxtools-AutotoolsEditorsTab.png: New file.
+	* userguide/images/Linuxtools-AutotoolsLibtoolize.png: New file.
+	* userguide/images/Linuxtools-AutotoolsMakeTargetBuild.png: New file.
+	* userguide/images/Linuxtools-AutotoolsMakeTargetCreate.png: New file.
+	* userguide/images/Linuxtools-AutotoolsMakeTargetEdit.png: New file.
+	* userguide/images/Linuxtools-AutotoolsManageConfs.png: New file.
+	* userguide/images/Linuxtools-AutotoolsNewOther.png: New file.
+	* userguide/images/Linuxtools-AutotoolsToolSettings.png: New file.
+	* userguide/Invoking-Autotools.html: New file.
+	* userguide/Make-Targets.html: New file.
+	* userguide/Special-Editors.html: New file.
+	* userguide/Supported-Environments.html: New file.
+	* userguide/Updating-This-Document.html: New file.
+	* .project: Change to be Java project.
+	* build.properties: Add new binary files.
+	* META-INF/MANIFEST.MF: Dependency added.
+	* plugin.xml: Add additional toc for Autotools User Guide.
+
+2009-11-16  Andrew Overholt  <overholt@redhat.com>
+
+	* plugin.properties: Fix bundle name.  Fix provider.
+
+2009-10-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* cheatsheets/autotools.xml: Revised for Autotools rewrite.
+
+2009-10-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* build.properties: Add build.properties to bin list.
+	* META-INF/MANIFEST.MF: Bump up version to 2.0.0.
+
+2009-01-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add .qualifier to id.
+
+2008-11-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* build.properties: Add cheatsheets directory to binary list and remove
+	doc.zip which no longer exists in project.
+
+2008-10-31  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Use translated BundleName and provider. Add
+	"(Incubation)".
+	* plugin.properties: Initial import.
+
+2008-10-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* toc.xml: Add anchor id so other gnu tools can be added to Gnu Tools list.
+
+2008-09-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Update version number to 1.0.0.
+
+2008-09-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* toc.xml: Add http references for all of the GNU tools documentation.
+
+2007-10-04  jjohnstn  <jjohnstn@vermillion>
+
+	* META-INF/MANIFEST.MF: Update release to 0.0.5.
+	* cheatsheets/autotools.xml: Add sub-step after pushing finish for GNU Autotools
+	project wizard to handle the possibility of the workspace asking to go to the
+	C/C++ perspective.  Remove separate "changing to C/C++ perspective" step.
+
+2007-10-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* cheatsheets/autotools.xml: New File.
+	* plugin.xml: Add cheatsheets extension for autotools project.
+	* META-INF/MANIFEST.MF: Add dependency on org.eclipse.ui.cheatsheets.
+
+2007-08-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Change release to 0.0.4 and specify minimum java runtime
+	as 1.4.
+	* build.xml: Removed.
+
+2007-02-02  Andrew Overholt  <overholt@redhat.com>
+
+	* toc.xml:  Add "and Other" to the toc entry.
+	* doc.zip:  Add pkg-config/index.html (created using PolyglotMan
+	<http://polyglotman.sourceforge.net/>).
+
+2007-01-22  Andrew Overholt  <overholt@redhat.com>
+
+	* toc.xml:  Gnu -> GNU.
+
+2007-01-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* about.html: New license file.
+
+2006-08-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* build.xml: Update release to 0.0.3.
+
+2006-07-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* Manifest.MF: Change release to 0.0.3.
+	* getdocs.sh: Update to current FC6 releases of tools help.
+	* doc.zip: Updated.
+
+2006-07-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* Manifest.MF: Change release to 0.0.2.
+	* build.properties: Add doc.zip and toc.xml to bin files.
+
+2006-06-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Make provider Red Hat.
+
+2006-04-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* getdocs.sh: New file to generate doc.zip.
+
+2006-04-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* toc.xml: New file.
+	* doc.zip: Ditto.
+	* plugin.xml: Ditto.
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/META-INF/MANIFEST.MF b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..27ed55b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.cdt.autotools_docs;singleton:=true
+Bundle-Version: 2.0.1.qualifier
+Bundle-Vendor: %provider
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.help,
+ org.eclipse.ui.cheatsheets,
+ org.apache.ant;bundle-version="1.7.1"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/about.html b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/about.html
new file mode 100644
index 0000000..44e2290
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

+<html>

+<head>

+<title>About</title>

+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>8th September, 2004</p>	

+<h3>License</h3>

+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<h3>Contributions</h3>

+

+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise

+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such

+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or

+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the

+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available

+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also

+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+</body>

+</html>
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/build-helper.xml b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/build-helper.xml
new file mode 100644
index 0000000..3a53e29
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/build-helper.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="org.eclipse.linuxtools.autotools.docs" default="all">
+    <description>
+            Generate Eclipse help content for the Linux Tools autotools user guide
+    </description>
+
+	<property name="autotools.help.doc.url.base" value="http://wiki.eclipse.org"/>
+	<property name="autotools.wiki.url.base" value="${autotools.help.doc.url.base}/Linux_Tools_Project/Autotools"/>
+	<property name="imageFolder" value="images"/>
+	
+	<path id="tasks.classpath" path="bin"/>
+	<path id="wikitext.tasks.classpath">
+		<pathelement location="../org.eclipse.mylyn.wikitext.core/@dot"/>
+		<pathelement location="../org.eclipse.mylyn.wikitext.core/bin"/>
+		<pathelement location="../org.eclipse.mylyn.wikitext.mediawiki.core/@dot"/>
+		<pathelement location="../org.eclipse.mylyn.wikitext.mediawiki.core/bin"/>
+	</path>
+	
+	<taskdef classpathref="tasks.classpath" resource="org/eclipse/linuxtools/internal/cdt/autotools/doc/anttask/tasks.properties"/>
+	<taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/util/anttask/tasks.properties"/>
+	
+	<target name="init">
+		<mkdir dir="tmp"/>
+	</target>
+	
+	<target name="clean" depends="init">
+		<delete includeemptydirs="true" failonerror="false">
+			<fileset dir="tmp"/>
+		</delete>
+	</target>
+
+    <target name="all" depends="init" description="Generate Eclipse help content for the Linux Tools autotools user guide">
+        <eclipse-wiki-to-help
+        	help.doc.filenamenoextension="Autotools Plugin-in User Guide"
+        	help.doc.url.base="${autotools.help.doc.url.base}"
+        	help.doc.url.html="${autotools.wiki.url.base}/User_Guide"
+        	help.doc.url.xml="${autotools.help.doc.url.base}/Special:Export/Linux_Tools_Project/Autotools/User_Guide"
+        	help.imagefolder="${imageFolder}"
+        	targetfolder="userguide"
+        	wiki.url.base="${autotools.help.doc.url.base}/Linux_Tools_Project"/>
+    </target>
+	
+	<macrodef name="eclipse-wiki-to-help">
+		<attribute name="help.doc.url.base"/>
+		<attribute name="wiki.url.base"/>
+		<attribute name="help.doc.url.html"/>
+		<attribute name="help.doc.url.xml"/>
+		<attribute name="help.doc.filenameNoExtension"/>
+		<attribute name="help.imageFolder"/>
+		<attribute name="targetFolder"/>
+		<sequential>
+			<get dest="tmp/help.doc.xml" src="@{help.doc.url.xml}"/>
+	    	<get dest="tmp/help.doc.html" src="@{help.doc.url.html}"/>
+	    	
+			<!--
+	    	<copy todir="tmp">
+	    		<fileset dir="images"/>
+	    	</copy>
+	    	-->
+	    	<mediawiki-fetch-images src="tmp/help.doc.html" dest="tmp" base="@{help.doc.url.base}"/>
+	    	
+	    	<xslt style="extract-markup.xsl" in="tmp/help.doc.xml" out="tmp/@{help.doc.filenameNoExtension}.mediawiki"/>
+			<echo append="true" file="tmp/@{help.doc.filenameNoExtension}.mediawiki">
+
+= Updating This Document =
+
+This document is maintained in a collaborative wiki.  If you wish to update or modify this document please visit 
+@{help.doc.url.html}
+			</echo>
+			
+			<!-- Removing Phoenix extensions -->
+			<replaceregexp match="\{\{\#eclipseproject.*" replace="" flags="g" byline="true">
+				<fileset dir="tmp" includes="**/*.mediawiki"/>
+			</replaceregexp>
+			
+			<wikitext-to-eclipse-help markupLanguage="org.eclipse.mylyn.wikitext.mediawiki.core.MediaWikiLanguage" 
+				multipleOutputFiles="true"
+				navigationImages="true"
+				helpPrefix="@{targetFolder}"
+				internallinkpattern="@{wiki.url.base}/{0}"
+				validate="true"
+				failonvalidationerror="true"
+				prependImagePrefix="${imageFolder}"
+				formatoutput="true">
+				<fileset dir="tmp" includes="**/*.mediawiki"/>
+				<stylesheet url="book.css"/>
+			</wikitext-to-eclipse-help>
+	    	
+	    	<mkdir dir="@{targetFolder}/${imageFolder}"/>
+			<copy todir="@{targetFolder}/${imageFolder}" overwrite="true">
+				<fileset dir="tmp">
+					<include name="*.gif"/>
+					<include name="*.png"/>
+				</fileset>
+			</copy>
+	    	<copy todir="@{targetFolder}" overwrite="true">
+				<fileset dir="tmp">
+					<include name="*.html"/>
+					<include name="*toc.xml"/>
+					<exclude name="help.doc.html"/>
+				</fileset>
+			</copy>
+	    	<antcall target="test"/>
+		</sequential>			
+	</macrodef>
+	
+
+	<target name="test" depends="init" description="verify that all of the HTML files are well-formed XML">
+		<echo level="info">
+Validating help content XML and HTML files: The Eclipse help system expects well-formed XML
+			
+If validation fails it is because either:
+			
+* the userguide source code is poorly formed, or
+* the WikiText MediaWiki parser has a bug
+			
+Problems with userguide source are usually caused by improper use of HTML markup in the MediaWiki source,
+or inadvertently starting a line with a space character (in MediaWiki this starts a preformatted block)
+		</echo>
+
+		<!-- 
+		Don't bother with DTD validation: we only care if the files are well-formed.
+		We therefore provide an empty DTD 
+		-->
+		<echo file="tmp/__empty.dtd" message=""/>
+		<xmlvalidate lenient="true">
+			<fileset dir="userguide">
+				<include name="**/*.xml"/>
+			</fileset>
+			<fileset dir="userguide">
+				<include name="**/*.html"/>
+			</fileset>
+			<dtd publicid="-//W3C//DTD XHTML 1.0 Transitional//EN" location="${basedir}/tmp/__empty.dtd"/>
+		</xmlvalidate>
+	</target>
+</project>
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/build.properties b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/build.properties
new file mode 100644
index 0000000..7f286fb
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/build.properties
@@ -0,0 +1,12 @@
+bin.includes = META-INF/,\
+               plugin.xml,\
+               toc.xml,\
+               cheatsheets/,\
+               about.html,\
+               plugin.properties,\
+               doc/,\
+               userguide/
+jars.compile.order = .
+source.. = src/
+output.. = bin/
+source.. = src/
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/cheatsheets/autotools.xml b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/cheatsheets/autotools.xml
new file mode 100644
index 0000000..f7d9c00
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/cheatsheets/autotools.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cheatsheet title="GNU Autotools Project">
+   <intro>
+      <description>
+         This cheatsheet will introduce the GNU Autotools plugin by importing an existing project that uses Autotools.
+      </description>
+   </intro>
+   <item title="Check out the test project" dialog="true" skip="false">
+      <description>
+      </description>
+      <subitem label="From the main menu, select File -&gt; Import ... -&gt; Projects from CVS." skip="false">
+         <command serialization="org.eclipse.ui.file.import(importWizardId=org.eclipse.team.cvs.ui.newProjectCheckout)" confirm="false">
+         </command>
+      </subitem>
+      <subitem label="If the following repository does not already exist, create it by selecting &quot;Create a new repository location&quot;, pressing &quot;Next&quot;, and filling in the following information:  Host:  sourceware.org Repository path:  /cvs/eclipse User: &lt;anonymous&gt; Connection type:  pserver" skip="true">
+      </subitem>
+      <subitem label="Press Next to advance to CVS module selection." skip="false">
+      </subitem>
+      <subitem label="Choose &quot;Use an existing module&quot; and open &quot;autotools&quot; and select &quot;sources&quot; in the populated list of projects." skip="false">
+      </subitem>
+      <subitem label="Press Next." skip="false">
+      </subitem>
+      <subitem label="Ensure &quot;Check out as a project configured using the New Project wizard&quot; is selected." skip="false">
+      </subitem>
+      <subitem label="Press Finish." skip="false">
+      </subitem>
+      <subitem label="Select C/C++ -&gt; C Project" skip="false">
+      </subitem>
+      <subitem
+            label="Within the C Project dialog, open the GNU Autotools category in the tree view and select &quot;Empty Project&quot;">
+      </subitem>
+      <subitem label="Give the project a name.  For this example, choose &quot;sources&quot;." skip="false">
+      </subitem>
+      <subitem label="Press Next." skip="false">
+      </subitem>
+      <subitem label="Press Finish." skip="false">
+      </subitem>
+      <subitem label="If asked to switch to C/C++ Perspective, select ok and choose to default this behavior" skip="false">
+      </subitem>
+   </item>
+   <item title="Build Project">
+      <description>
+      </description>
+      <subitem
+            label="Navigate to the project in the Project Explorer view by selecting the &quot;sources&quot; project you just created.">
+      </subitem>
+      <subitem
+            label="Open the Project pull-down from the main menu">
+      </subitem>
+      <subitem
+            label="If &quot;Build Automatically&quot; is not checked, select &quot;Build Project&quot;">
+      </subitem>
+   </item>
+   <item title="View build output" dialog="true" skip="false">
+      <description>
+         In the Console view, there is a button entitled &quot;Display Selected Console&quot;.  Its icon depicts a monitor with two lines of text on it.  Pressing this button will drop down to show all available consoles.  At this point, you should have three consoles:  one for configure output (&quot;Configure&quot;), one for build output (&quot;C-Build&quot;), and one for the binary output that you just ran (&quot;&lt;terminated&gt; sources ...&quot;).
+      </description>
+      <subitem label="View configure output by selecting the Configure console in the drop-down list.  The configure console" skip="false">
+      </subitem>
+      <subitem label="View build output by selecting the &quot;C-Build&quot; console in the drop-down list." skip="false">
+      </subitem>
+   </item>
+   <item title="Run the Hello World binary" dialog="true" skip="false">
+      <description>
+      </description>
+      <subitem label="Navigate to the project in the Project Explorer view by selecting the &quot;sources&quot; project you just created." skip="false">
+      </subitem>
+      <subitem label="Open the project by toggling the arrow to the left of the project name if it is not already open." skip="true">
+      </subitem>
+      <subitem label="Expand the &quot;Binaries&quot; virtual folder under the project." skip="false">
+      </subitem>
+      <subitem label="Select the binary itself.  This will be called &quot;a.out&quot; if you followed the example." skip="false">
+      </subitem>
+      <subitem label="Right-click on the binary itself and select &quot;Run As&quot; -&gt; &quot;Local C/C++ Application&quot;." skip="false">
+      </subitem>
+      <subitem label="Select &quot;gdb Debugger&quot; (the default) in the &quot;Launch Debug Configuration Selection&quot; dialog." skip="false">
+      </subitem>
+      <subitem label="Press OK." skip="false">
+      </subitem>
+   </item>
+   <item title="View output" dialog="true" skip="false">
+      <description>
+         The output of the program should be displayed in the Console view which should be one of the tabs visible in the bottom of the IDE.  If you made no modifications, it should read &quot;hello world&quot;.
+      </description>
+   </item>
+   <item title="Modify configure options" dialog="true" skip="false">
+      <description>
+      </description>
+      <subitem label="Select the project &quot;sources&quot; if it is not already selected in the Project Explorer." skip="false">
+      </subitem>
+      <subitem label="From the main menu, select Project -&gt; Properties." skip="false">
+      </subitem>
+      <subitem label="Expand &quot;Autotools&quot; and select &quot;Configure Settings&quot;." skip="false">
+      </subitem>
+      <subitem label="Under &quot;configure&quot;, select &quot;Advanced&quot;." skip="false">
+      </subitem>
+      <subitem label="In the &quot;Additional command-line options&quot; text box, enter &quot;--enable-option-x&quot;." skip="false">
+      </subitem>
+      <subitem label="Press OK." skip="false">
+      </subitem>
+   </item>
+   <item title="Finished!" dialog="true" skip="false">
+      <description>
+         <b>Congratulations!</b>
+You now have a simple GNU autotools project.
+      </description>
+   </item>
+</cheatsheet>
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/doc/notices.html b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/doc/notices.html
new file mode 100644
index 0000000..5773de5
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/doc/notices.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+
+<meta name="copyright" content="&#169; Copyright 2010 Eclipse Linux Tools project committers and others. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+
+   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+   <LINK REL="STYLESHEET" HREF="book.css" CHARSET="ISO-8859-1" TYPE="text/css">
+   <title>Legal Notices</title>
+</head>
+<body>
+
+<h3>
+<a NAME="Notices"></a>Notices</h3>
+<p>
+The material in this guide is &#169; Copyright 2010 Eclipse Linux Tools project committers and others.
+</p>
+<p>
+<a href="../about.html">Terms and conditions regarding the use of this guide.</a>
+</p>
+</body>
+</html>
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/extract-markup.xsl b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/extract-markup.xsl
new file mode 100644
index 0000000..4c4e731
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/extract-markup.xsl
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:mw="http://www.mediawiki.org/xml/export-0.3/">
+	<xsl:output  method="text"/>
+	
+	<xsl:template match="/">
+		<xsl:value-of select="//mw:text"/>
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/plugin.properties b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/plugin.properties
new file mode 100644
index 0000000..bdc76a6
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+#  Copyright (c) 2008 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+bundleName=Autotools Documentation (Incubation)
+provider=Eclipse
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/plugin.xml b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/plugin.xml
new file mode 100644
index 0000000..57f82d8
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/plugin.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+   <extension
+         point="org.eclipse.help.toc">
+      <toc
+            file="toc.xml"
+            primary="true"/>
+      <toc
+            file="userguide/Autotools Plugin-in User Guide-toc.xml"
+            primary="true">
+      </toc>
+   </extension>
+   <extension
+         id="com.redhat.eclipse.cdt.autotools.docs.cheatsheets"
+         point="org.eclipse.ui.cheatsheets.cheatSheetContent">
+      <cheatsheet
+            category="org.eclipse.cdt-doc.category.tutorials"
+            contentFile="cheatsheets/autotools.xml"
+            id="com.redhat.eclipse.cdt.autotools-docs.cheatsheet3"
+            name="Creating a GNU Autotools Project">
+      </cheatsheet>
+   </extension>
+
+</plugin>
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/src/org/eclipse/linuxtools/internal/cdt/autotools/doc/anttask/MediaWikiImageFetcher.java b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/src/org/eclipse/linuxtools/internal/cdt/autotools/doc/anttask/MediaWikiImageFetcher.java
new file mode 100644
index 0000000..36e9965
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/src/org/eclipse/linuxtools/internal/cdt/autotools/doc/anttask/MediaWikiImageFetcher.java
@@ -0,0 +1,150 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008 David Green and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     David Green - initial API and implementation
+ * 
+ * Re-namespaced 2009-04-14 without changes from org.eclipse.mylyn.help.ui.
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.doc.anttask;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.Get;
+
+
+/**
+ * Fetch images from a MediaWiki-generated HTML page source
+ * 
+ * @author David Green
+ */
+public class MediaWikiImageFetcher extends Task {
+
+	private String base;
+
+	private File dest;
+
+	private File src;
+
+	@Override
+	public void execute() throws BuildException {
+		if (dest == null) {
+			throw new BuildException("Must specify @dest"); //$NON-NLS-1$
+		}
+		if (!dest.exists()) {
+			throw new BuildException("@dest does not exist: " + dest); //$NON-NLS-1$
+		}
+		if (!dest.isDirectory()) {
+			throw new BuildException("@dest is not a directory: " + dest); //$NON-NLS-1$
+		}
+		if (src == null) {
+			throw new BuildException("Must specify @src"); //$NON-NLS-1$
+		}
+		if (!src.exists()) {
+			throw new BuildException("@src does not exist: " + src); //$NON-NLS-1$
+		}
+		if (!src.isFile()) {
+			throw new BuildException("@src is not a file: " + src); //$NON-NLS-1$
+		}
+		if (base == null) {
+			throw new BuildException("Must specify @base"); //$NON-NLS-1$
+		}
+		if (base.endsWith("/")) { //$NON-NLS-1$
+			base = base.substring(0, base.length() - 1);
+		}
+		Pattern fragmentUrlPattern = Pattern.compile("src=\"([^\"]+)\""); //$NON-NLS-1$
+		Pattern imagePattern = Pattern.compile("alt=\"Image:([^\"]*)\"([^>]+)", Pattern.MULTILINE); //$NON-NLS-1$
+		String htmlSrc;
+		try {
+			htmlSrc = readSrc();
+		} catch (IOException e) {
+			throw new BuildException("Cannot read src: " + src + ": " + e.getMessage(), e); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		log("Parsing " + src, Project.MSG_INFO); //$NON-NLS-1$
+		int fileCount = 0;
+		Matcher imagePatternMatcher = imagePattern.matcher(htmlSrc);
+		while (imagePatternMatcher.find()) {
+			String alt = imagePatternMatcher.group(1);
+			String imageFragment = imagePatternMatcher.group(2);
+			if (imageFragment != null) {
+				Matcher fragmentUrlMatcher = fragmentUrlPattern.matcher(imageFragment);
+				if (fragmentUrlMatcher.find()) {
+					String url = fragmentUrlMatcher.group(1);
+					String qualifiedUrl = base + url;
+					log("Fetching " + qualifiedUrl, Project.MSG_INFO); //$NON-NLS-1$
+					Get get = new Get();
+					get.setProject(getProject());
+					get.setLocation(getLocation());
+					try {
+						get.setSrc(new URL(qualifiedUrl));
+					} catch (MalformedURLException e) {
+						log("Skipping " + url + ": " + e.getMessage(), Project.MSG_WARN); //$NON-NLS-1$ //$NON-NLS-2$
+						continue;
+					}
+					// note: we use the alt text for the name since for some files there is a case-difference between
+					//       the server URL and the text used in the image src of the markup
+					String name = alt == null ? url.substring(url.lastIndexOf('/')) : alt;
+					get.setDest(new File(dest, name));
+					get.execute();
+					++fileCount;
+				}
+			}
+		}
+		log("Fetched " + fileCount + " image files for " + src, Project.MSG_INFO); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	public String getBase() {
+		return base;
+	}
+
+	public File getDest() {
+		return dest;
+	}
+
+	public File getSrc() {
+		return src;
+	}
+
+	private String readSrc() throws IOException {
+		StringBuilder buf = new StringBuilder((int) src.length());
+		Reader reader = new BufferedReader(new FileReader(src));
+		try {
+			int i;
+			while ((i = reader.read()) != -1) {
+				buf.append((char) i);
+			}
+		} finally {
+			reader.close();
+		}
+		return buf.toString();
+	}
+
+	public void setBase(String base) {
+		this.base = base;
+	}
+
+	public void setDest(File dest) {
+		this.dest = dest;
+	}
+
+	public void setSrc(File src) {
+		this.src = src;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/src/org/eclipse/linuxtools/internal/cdt/autotools/doc/anttask/tasks.properties b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/src/org/eclipse/linuxtools/internal/cdt/autotools/doc/anttask/tasks.properties
new file mode 100644
index 0000000..82f303b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/src/org/eclipse/linuxtools/internal/cdt/autotools/doc/anttask/tasks.properties
@@ -0,0 +1 @@
+mediawiki-fetch-images=org.eclipse.linuxtools.internal.cdt.autotools.doc.anttask.MediaWikiImageFetcher
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/toc.xml b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/toc.xml
new file mode 100644
index 0000000..7fc15cf
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/toc.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="GNU Tools">
+	<topic label="gcc"  href="http://gcc.gnu.org/onlinedocs/gcc-4.3.2/gcc/"/> 
+	<topic label="binutils" href="http://sourceware.org/binutils/docs/"/>
+	<topic label="autoconf" href="http://www.gnu.org/software/autoconf/manual/html_node/index.html"/>
+	<topic label="automake" href="http://www.gnu.org/software/automake/manual/html_node/index.html"/>
+	<topic label="pkg-config" href="http://hpux.ewi.tudelft.nl/ftp/hpux/Development/Tools/pkgconfig-0.23/pkgconfig-0.23.man.html"/>
+ <anchor id="moregnutools"/>
+</toc>
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Autotools Plugin-in User Guide-toc.xml b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Autotools Plugin-in User Guide-toc.xml
new file mode 100644
index 0000000..8e59f9d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Autotools Plugin-in User Guide-toc.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<toc topic="userguide/Autotools Plugin-in User Guide.html" label="Autotools Plugin-in User Guide">
+	<topic href="userguide/Autotools Plugin-in User Guide.html" label="Introduction"></topic>
+	<topic href="userguide/Supported-Environments.html" label="Supported Environments"></topic>
+	<topic href="userguide/Creating-an-Autotools-Project.html" label="Creating an Autotools Project"></topic>
+	<topic href="userguide/Configuration.html" label="Configuration"></topic>
+	<topic href="userguide/Invoking-Autotools.html" label="Invoking Autotools"></topic>
+	<topic href="userguide/Special-Editors.html" label="Special Editors"></topic>
+	<topic href="userguide/Building.html" label="Building"></topic>
+	<topic href="userguide/Make-Targets.html" label="Make Targets"></topic>
+	<topic href="userguide/Updating-This-Document.html" label="Updating This Document"></topic>
+</toc>
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Autotools Plugin-in User Guide.html b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Autotools Plugin-in User Guide.html
new file mode 100644
index 0000000..22fb5a3
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Autotools Plugin-in User Guide.html
@@ -0,0 +1,61 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>Autotools Plugin-in User Guide</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Autotools Plugin-in User Guide</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Supported-Environments.html" title="Supported Environments">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Supported Environments</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Introduction">Introduction</h1>
+		<p>The Autotools plug-in for Eclipse extends the CDT (C/C++ Development Tools) to add support for maintaining and
+			building C/C++ projects that use GNU Autotools.</p>
+		<p>The GNU Autotools are a set of tools used to make a project portable to multiple systems or build environments.  The tools aid the developer to create
+			a configure script which is meant to be invoked prior to performing the build.  The configure script may perform tests such as testing the current platform, the OS, what is locally installed, or any number of things.  Parameters can be passed as well to provide information that is not calculable (e.g. what will be the target platform the project will be run on).  Results of tests and parameters are used to create the Makefiles for the build or in some cases, additional files such as header files or code sequences. </p>
+		<p>What gets tested is fully controllable by the developer by way of special input files which
+			are fed to the Autotools.  Typically, the most commonly used Autotools are 'autoconf', 'automake', and 'aclocal'.  The 'autoconf' tool takes a 'configure.in' or 'configure.ac' input file and creates the 'configure' script previously discussed.  It is possible to have multiple configure scripts in various subdirectories, but a project should be designed so there is one top-level configure script that calls any lower-level ones automatically.</p>
+		<p>The 'automake' tool takes a 'Makefile.am' input file and creates a 'Makefile.in' file which is used at configuration time by the configure script as a template for creating a Makefile.  Each Makefile will have its own corresponding Makefile.in file.  There may be if/else logic used to determine what ends up in the Makefile or there may be requests to directly substitute variables calculated in the configure step.</p>
+		<p>The 'aclocal' tool creates a repository of macros that are specified directly or indirectly in the 'autoconf' input files.  Such macros are provided to perform commonly used tests or actions (e.g. test that a certain header file
+			exists or find the C compiler).  The macros are written in a language called m4 and the developer is free to create their own macros to add to the repository.  </p>
+		<p>The Autotools plug-in adds support for running the configure script prior to the build.  As well, support is added for invoking the Autotools themselves as well as maintaining the files they use.  An Autotools project extends a CDT Makefile project.  Therefore, functionality in the CDT for supporting such a project applies to an Autotools project as well (e.g. C/C++ Property pages).</p>
+		<p>For more details on the GNU Autotools, see 
+			<a href="http://www.gnu.org/software/autoconf/">http://www.gnu.org/software/autoconf/</a> and
+
+			<a href="http://www.gnu.org/software/automake/">http://www.gnu.org/software/automake/</a>
+		</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Supported-Environments.html" title="Supported Environments">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Supported Environments</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Building.html b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Building.html
new file mode 100644
index 0000000..057bab0
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Building.html
@@ -0,0 +1,112 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>Autotools Plugin-in User Guide - Building</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Building</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Special-Editors.html" title="Special Editors">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Make-Targets.html" title="Make Targets">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Special Editors</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Make Targets</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Building">Building</h1>
+		<p>As mentioned, an Autotools project is an extended CDT Makefile project.  Building the project is done the same as for any Makefile project.  You can kick off a build manually by clicking on the Project -> Build Project menu item or if you choose, you can set up builds to occur automatically when resources are changed by checking off the Project -> Build Automatically menu item.  The former build option is disabled when automatic builds are selected.  By default, a 
+			<b>make all</b> is performed following the Autotools configure step.
+		</p>
+		<p>The build is performed on the active build configuration.  A build configuration is a CDT construct which is a group of settings for a particular build.  This is not to be confused with an Autotools configuration which is just the settings passed to the configure script.  The CDT build configuration is saved across Eclipse sessions and includes environment variable settings, build macros, build location, tool settings, etc... used to perform a build.  A project may have multiple build configurations.  For example, a build with debugging info and a regular optimized build.  As such, one configuration is designated the active configuration and as previously stated, is the one used for the build.</p>
+		<p>The Autotools configure script parameters and the autogen.sh script parameters are treated as part of the CDT build configuration.  While CDT settings are stored in the .cproject file within the project, the Autotools parameters are stored in a special file: .autotools.  There is a one-to-one mapping of Autotools configuration parameters to a build configuration.  By default, each Autotools project starts with a base build configuration named 
+			<b>Build (GNU)</b> which configures and builds in the top-level project directory.  This is common for Autotools projects to have the user configure and build directly in the top-level source directory.  The location of the build can be changed in the C/C++ Build properties:
+		</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsBuildLocation.png"/>
+		</p>
+		<p>Notice how the default is ${workspace_loc:/xxxx} where xxxx is the project name.  This represents the project's location which may or may not be physically under the workspace root directory.  To change the build location, it is recommended that you add a directory following the project location: e.g. ${workspace_loc:/xxxx}/yyyy.  </p>
+		<p>It should be noted that the configure script automatically checks to see if a configuration has been performed in the source directory.  It does so by looking for the 
+			<b>config.status</b> file existing in the same directory as the configure script.  If configuring in a different directory and the configure script finds 
+			<b>config.status</b> in the source directories, it will stop and report a failure.  Such is the case if you originally configure and build the default configuration and either change the build location or add a new configuration later and try to build it.  The second configuration fails and recommends running 
+			<b>make distclean</b> first.  A 
+			<b>make distclean</b> performs a clean and in addition removes configuration files such as 
+			<b>config.status</b>.  The Autotools plug-in recognizes when this situation is about to occur during the configure step and will automatically issue a 
+			<b>make distclean</b> on your behalf to avoid the failure.  The cleaning operation is recorded in the Configure console.  Since it also removes build artefacts for the default configuration, these may have to be regenerated by a future configure/build with the default configuration marked active.  If you know you will be creating multiple configurations for the project, you can either specify the default build location to something other than the top-level project directory or else you can avoid using the default configuration and only build configurations you have added yourself.
+		</p>
+		<p>CDT build configurations are managed via the Managed Configurations dialog.  The dialog is accessed via a button that can be found on any property page that alters data that is part of the build configuration.  This includes the Project -> Properties -> Autotools -> Configure Settings page.  Pressing the button results in the Manage Configurations dialog:</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsManageConfs.png"/>
+		</p>
+		<p>From the dialog, it is possible to create a new configuration, rename a configuration, delete a configuration, or set a particular configuration as being the active one.  Deletion is disabled when there is only one configuration.  Likewise, if there is only one configuration, it is active by default.  When you choose to create a new configuration (hit the New... button), you are given a number of choices.  You can:</p>
+		<ol>
+			<li>create a new one based on the default configuration
+				<ul>
+					<li>In the case of Autotools this is the default Build (GNU) configuration before any modifications were made.</li>
+				</ul>
+			</li>
+			<li>copy from an existing configuration
+				<ul>
+					<li>This copies all settings made.</li>
+				</ul>
+			</li>
+			<li>import from an existing project
+				<ul>
+					<li>This is unsupported if the project is not also an Autotools project in which case undefined behavior occurs.</li>
+				</ul>
+			</li>
+			<li>import a predefined configuration
+				<ul>
+					<li>This is not supported as it offers non-Autotools configurations.  Undefined behavior will result if one of these are chosen.</li>
+				</ul>
+			</li>
+		</ol>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsCreateConf.png"/>
+		</p>
+		<p>Copying a configuration copies all of its settings, including the Autotools configuration parameters.  Copying all settings would normally include the build location (the directory where the build will be performed), but the Autotools plug-in, by default, intercedes and for every new configuration subsequent to the initial one, it sets the build location to build-xxxx where xxxx is the unique configuration name.  The Autotools plug-in replaces any white-space in the configuration name with underscores so it is possible if you have named two configurations similarly with different white-space characters or one with underscores that you might result in a build location collision.  The replacement of white-space is done because the build directory will get placed in the generated Makefile where white-space is used as delimiters and undefined behaviour would therefore occur.  The automatic build directory naming behaviour can be turned off from the Project -> Properties -> Autotools page, but it is discouraged since switching between different configurations and building in the same directory can cause undefined behaviour.</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsAutotools.png"/>
+		</p>
+		<p>Note: changes to configurations are not performed unless the Ok or Apply buttons are pressed from a Property page with the Manage Configurations button on it.  That is, pressing Ok from the Manage Configurations dialog does not make the changes permanent.  You could add new configurations, delete others, and then hit the Cancel button from the corresponding property page and the changes would be reverted.</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Special-Editors.html" title="Special Editors">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="Autotools Plugin-in User Guide.html" title="Autotools Plugin-in User Guide">
+						<img alt="Autotools Plugin-in User Guide" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right">
+					<a href="Make-Targets.html" title="Make Targets">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Special Editors</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Make Targets</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Configuration.html b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Configuration.html
new file mode 100644
index 0000000..8a4b1d9
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Configuration.html
@@ -0,0 +1,125 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>Autotools Plugin-in User Guide - Configuration</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Configuration</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Creating-an-Autotools-Project.html" title="Creating an Autotools Project">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Invoking-Autotools.html" title="Invoking Autotools">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Creating an Autotools Project</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Invoking Autotools</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Configuration">Configuration</h1>
+		<p>Prior to running a build, the Autotools plug-in runs the configure script.  Parameters to be passed to configure may be
+			entered via the Project -> Properties -> Autotools -> Configure Settings UI shown below:</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsConfsettings.png"/>
+		</p>
+		<p>You will notice how the actual configure script name is editable.  It is not recommended you change the name of the configure script as this is standard for Autotool projects.  However, one use of this text input is to add environment variables to set prior to invoking the configure script.  For example, you might want to set the command to: 
+			<b>CFLAGS="-g -debug" configure</b> to have the CFLAGS environment variable overridden while configuring.  The same applies to the autogen.sh script settings.
+		</p>
+		<p>For configure, there are a number of standard parameters that apply to generated configure scripts.  Each parameter has its command line name presented so you can look it up in Autotools documentation.  In addition, tool-tip hover help is provided.</p>
+		<p>Under the Advanced category, there is a free-form line called "Additional command-line options" where you may enter any options in their command-line format.  This is useful for entering custom options that your configure script supports (e.g. --enable-feature-x or --with-lib-y).  It can also be used for any of the standard parameters as well if that is more familiar tor you.  Parameters in this list are appended to the end of parameters derived from the standard option entries (i.e. you could get two specifications of a parameter).  In the case of multiple specification, behaviour is the same as it is on the command line.  You can optionally check off the "Display help contents (--help)" option under the General category to see all the standard and custom options the configure script accepts.  As the configure script help is a product of how it is written, it is sometimes possible that the help is out of date with regards to added features.</p>
+		<p>In some cases, a project may choose not to invoke the Autotools ahead of time and instead
+			require this be done prior to configuration.  The input files that are fed to the Autotools are provided, but the output of
+			the Autotools are not.  This may be
+			done to lower the download size and additionally to avoid having to constantly regenerate the output files as the Autotools are
+			updated.  In such cases, an autogen.sh script may be provided which is simply a script that runs the various Autotools
+			required.  This script may or may not run the configure script at the end.  Alternatively, there is also the 
+			<i>autoreconf</i>
+			tool which can be invoked to recursively run through the source tree and run all Autotools where the input files are newer than
+			the output files (this includes the case where no output file is present).  Any options required when invoking the Autotools
+			can be encoded within the input files themselves.
+		</p>
+		<p>The following defines a priority list of scenarios that the Autotools plug-in checks for when performing the configure step and how each one is handled.</p>
+		<ol>
+			<li>A config.status file exists and configure script options have not changed since the last configuration
+				<ul>
+					<li>The config.status file is created as part of running a generated configure script.  It itself is a script file and indicates a configuration has already been performed.  If the configure options have not changed since that configuration, there is no need to do a full reconfigure.  A simple check is performed by calling the config.status script with the --recheck option.  This will verify that the generated Makefile exists and is up to date.</li>
+				</ul>
+			</li>
+			<li>A configure script exists
+				<ul>
+					<li>In this case, the configure script is run with any configuration options specified in the project properties.</li>
+				</ul>
+			</li>
+			<li>An autogen script exists
+				<ul>
+					<li>In this case, the autogen.sh script is run and following that, a check is made to see if config.status has been created, indicating that the configure script was run.  If has not configured, the configure script is run automatically if it was successfully created.</li>
+				</ul>
+			</li>
+			<li>A Makefile.cvs file exists
+				<ul>
+					<li>A Makefile.cvs is an alternate form of autogen.sh/configure script.  In this case, the file is fed to the make command.  If a configure script is created and not run as part of this process, it is run automatically.</li>
+				</ul>
+			</li>
+			<li>default case
+				<ul>
+					<li>At this point, there is no configure script or autogen.sh script and configure has not been run previously.  A last resort is to run the autoreconf command with -i to recursively search the source tree and invoke Autotools for any input file that is older than its output target (or if the target is missing).  If this generates a configure script, it is run automatically.</li>
+				</ul>
+			</li>
+		</ol>
+		<p>If after all of this, the top-level Makefile is not created, an error is generated and building stops.  </p>
+		<p>The configure process can be manually forced for a project via the Project -> Reconfigure Project menu item.  A reconfigure runs the configure script even if a config.status file is found indicating a prior configuration was successful.</p>
+		<p>The entire configuration step is performed by a special builder that is added when an Autotools project is created or converted from another project.  The special builder runs the configure step and is positioned to run prior to the Makefile builder.</p>
+		<p>From the Project -> Properties -> Builders tab for a project you will see:</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsBuilders.png"/>
+		</p>
+		<p>Do not un-check the Autotools Makefile builder nor change the order of the builders.  Modifying this will result in undefined behaviour.</p>
+		<p>The configure step is run in a special Configuration console added by the Autotools plug-in.  This console is separate from the C-Build console which is used to display the results of the make command invocation.</p>
+		<p>To see the Configure console, click on the console selector button (icon looks like a T.V.) found in the Console View as follows:</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsConsoleSelect.png"/>
+		</p>
+		<p>Note that the configure console output is per project and shows configuration output for the last build of the project.  It is not saved between Eclipse sessions.</p>
+		<p>The Autotools console is an instance of a CDT Build console so the console preferences set in Window -> Preferences -> C/C++ -> Build Console apply as well.</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsConsolePrefs.png"/>
+		</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Creating-an-Autotools-Project.html" title="Creating an Autotools Project">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="Autotools Plugin-in User Guide.html" title="Autotools Plugin-in User Guide">
+						<img alt="Autotools Plugin-in User Guide" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right">
+					<a href="Invoking-Autotools.html" title="Invoking Autotools">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Creating an Autotools Project</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Invoking Autotools</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Creating-an-Autotools-Project.html b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Creating-an-Autotools-Project.html
new file mode 100644
index 0000000..04fec39
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Creating-an-Autotools-Project.html
@@ -0,0 +1,87 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>Autotools Plugin-in User Guide - Creating an Autotools Project</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Creating an Autotools Project</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Supported-Environments.html" title="Supported Environments">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Configuration.html" title="Configuration">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Supported Environments</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Configuration</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Creating_an_Autotools_Project">Creating an Autotools Project</h1>
+		<p>There a number of ways to create an Autotools project.  The first method is through the CDT C and C++ Project wizards which can be activated from the File -> New -> C Project and File -> New -> C++ Project menu items, respectively, which are available while in the C/C++ Perspective.  These two wizards can also be located by clicking on the File -> New -> Project... menu item and then opening the C/C++ folder found there.</p>
+		<p>Looking at the C Wizard, we see that there is a GNU Autotools category.</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsCProjectWizard.png"/>
+		</p>
+		<p>Opening the category, there are two choices: Empty Project or Hello World Ansi C Autotools Project.  The Empty Project template means that no files will be supplied to the new project while the Hello World project will supply a sample hello world program that uses Autotools for configuring the build.  The C++ Project Wizard also has the same GNU Autotools category and two project templates: an Empty Project and a Hello World C++ Autotools sample program.  If you are creating a project from scratch, it is recommended that you use the Hello World sample project and make modifications.  Otherwise, you will need to create a configure script for the Autotools plug-in to invoke at build time or provide a Makefile so the configuration step does not fail.</p>
+		<p>The C and C++ Wizards can also be used when importing an existing Autotools project.  For example, when importing a project from CVS using File -> Import... -> CVS -> you are given the choice to "Check out as a project configured by the new project wizard".</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsCheckout.png"/>
+		</p>
+		<p>From the New Project menu, open the C/C++ category and choose either a C Project or C++ Project, depending on the type of project being imported.  If the code is both C and C++, choose C++ Project.</p>
+		<p>Let's say you have a C application using Autotools and select C Project.  This will bring up the C Project Wizard as displayed earlier.  In this case, choose the Empty Project from the GNU Autotools category as you already have all the configuration files in place.</p>
+		<p>Another method to create an Autotools project is to convert an existing project.  For example, if we import a project from SVN or CVS and do not configure using the new project wizard, the project will simply be downloaded into the workspace.  At this point, it cannot be built or access various tools from the CDT.</p>
+		<p>To convert it, select the project in the Project Explorer and open the File -> New -> Convert to C/C++ Project menu item as found in the C/C++ Perspective.  If in another perspective, this same wizard can be found by selecting File -> New -> Other... -> C/C++ -> Convert to a C/C++ Project.  This brings up the C/C++ Conversion wizard.</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsConvertWizard.png"/>
+		</p>
+		<p>Note how there is a set of projects that are candidates for conversion.  This list contains any projects that are not already C or C++ projects.  A C or C++ project includes regular CDT Managed Make and Makefile projects.  Also note that the project you selected is automatically selected when the wizard opens.</p>
+		<p>There is a choice of C or C++ project and a set of project types to choose from.  For Autotools, select the GNU Autotools category and this will convert to an Autotools project.  Once converted, this project will not show up as a candidate project in the conversion wizard.</p>
+		<p>The final way to create an Autotools project is to use the Autotools Conversion wizard.  This wizard allows one to convert from any form of project to an Autotools project.  Obviously, converting a project that isn't actually C or C++ and using Autotools will result in undefined behaviour.  You need to first select the project you wish to convert.  After selecting, go to File -> New -> Other... -> C/C++, open the category, select "Convert to a C/C++ Autotools Project" and hit the Next button.  </p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsNewOther.png"/>
+		</p>
+		<p>This brings up the following dialog:</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsConvAutotoolsWizard.png"/>
+		</p>
+		<p>Again, there are candidates for conversion.  This list contains all projects that are not currently C or C++ Autotool projects.  You are given the choice of C or C++ as with the standard C/C++ conversion wizard.  Hitting the Finish button is all that is needed, but if you hit the Next button and continue on you can select referenced projects, if desired.  </p>
+		<p>Once converted to an Autotools project, there is no UI method to convert back to a regular C/C++ project.  If this is desired, you need to manually remove the .project, .cproject, and .autotools files from the project directory.  This will effectively remove the natures and CDT settings for the project, allowing you to convert it again however you want.</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Supported-Environments.html" title="Supported Environments">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="Autotools Plugin-in User Guide.html" title="Autotools Plugin-in User Guide">
+						<img alt="Autotools Plugin-in User Guide" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right">
+					<a href="Configuration.html" title="Configuration">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Supported Environments</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Configuration</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Invoking-Autotools.html b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Invoking-Autotools.html
new file mode 100644
index 0000000..1200a00
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Invoking-Autotools.html
@@ -0,0 +1,121 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>Autotools Plugin-in User Guide - Invoking Autotools</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Invoking Autotools</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Configuration.html" title="Configuration">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Special-Editors.html" title="Special Editors">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Configuration</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Special Editors</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Invoking_Autotools">Invoking Autotools</h1>
+		<p>To invoke the Autotools, a special menu item has been added to the Project menu.  Under Project -> Invoke Autotools there are a set of menu items to invoke the various Autotools for your project.  The output of the tool invocation is presented in a special Autotools Console.  Like the Configure and C-Build Consoles, the Autotools console is per-project and is not saved across Eclipse sessions.  The console, if present, can be accessed via the "Display Selected Console" button in the Console View.</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsAutotoolsConsole.png"/>
+		</p>
+		<p>The tools provided are:</p>
+		<ol>
+			<li>Invoke Autoconf
+				<ul>
+					<li>The autoconf tool is run in the current directory for the current file or folder selected for the project.  There are no parameters.  Autoconf can also be run by right-clicking a configure.in or configure.ac file and selected Invoke Autoconf.
+						<br/>
+					</li>
+				</ul>
+			</li>
+			<li>Invoke Automake
+				<ul>
+					<li>The automake tool is run from the current directory for the file or folder selected in the project.  A dialog is presented to allow specification of options. 
+						<img border="0" src="images/Linuxtools-AutotoolsAutomake.png"/>  
+						<br/>The first text entry is for options while the 2nd text window is for Makefiles targets to generate.  The automake tool should be invoked where the configure script is found that will generate the Makefile(s).  There may be multiple Makefiles to generate in the current directory or lower.  Each target location should be a Makefile and should have a corresponding Makefile.am file at the relative location specified.  For example, automake x/Makefile y/Makefile Makefile specifies three targets.  It is expected that there is an x/Makefile.am, y/Makefile.am, and a Makefile.am relative to the current directory.  For details on automake, enter --help as an option.
+						<br/>
+					</li>
+				</ul>
+			</li>
+			<li>Invoke Aclocal
+				<ul>
+					<li>The aclocal tool is run from the current directory for the file or folder selected in the project.  A dialog is presented to allow specification of options.  
+						<img border="0" src="images/Linuxtools-AutotoolsAclocal.png"/>  
+						<br/>The first text entry is for options while the 2nd text window is for directories to search for m4 macros.  The directories can also be specified directly in the options parameters using the -I option.  For details, enter --help as an option.
+						<br/>
+					</li>
+				</ul>
+			</li>
+			<li>Invoke Autoheader
+				<ul>
+					<li>The autoheader tool is run from the current directory for the file or folder selected in the project.  A dialog is presented to allow specification of options.  
+						<img border="0" src="images/Linuxtools-AutotoolsAutoheader.png"/>  
+						<br/>The tool is used to create a template for generated header files.  It should be run in a directory containing a configure script as it gets its information from there.  For details, enter --help as an option.
+						<br/>
+					</li>
+				</ul>
+			</li>
+			<li>Invoke Autoreconf
+				<ul>
+					<li>The autoreconf tool is run from the current directory for the file or folder selected in the project.  A dialog is presented to allow specification of options.  
+						<img border="0" src="images/Linuxtools-AutotoolsAutoreconf.png"/>  
+						<br/>The most useful option is the -i option to recursively call Autotools for all input files out of date with respect to their outputs.  For details, enter --help as an option.
+						<br/>
+					</li>
+				</ul>
+			</li>
+			<li>Invoke Libtoolize
+				<ul>
+					<li>The libtoolize tool is run from the current directory for the file or folder selected in the project.  The tool is used to add libtool support to a package.  Libtool provides macros to allow a package to create a shared library without having to know all the details required for the current platform.  This might include special compiler flags or linker options or special tools.  A dialog is presented to allow specification of options. 
+						<img border="0" src="images/Linuxtools-AutotoolsLibtoolize.png"/> 
+						<br/>For details on libtoolize, enter --help as an option.
+						<br/>
+					</li>
+				</ul>
+			</li>
+		</ol>
+		<p>By default, the autotools are invoked simply by their names; expecting that the path has been set up appropriately.  In some instances, you might want to specify a specific location for the autotools.  For example, your project may require old versions of the tools which you have installed locally, but do not wish to be on your path.  To set these for your project, select your project or a file/folder within it and go to Project -> Properties -> Autotools -> General and select the Tool Settings tab.</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsToolSettings.png"/>
+		</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Configuration.html" title="Configuration">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="Autotools Plugin-in User Guide.html" title="Autotools Plugin-in User Guide">
+						<img alt="Autotools Plugin-in User Guide" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right">
+					<a href="Special-Editors.html" title="Special Editors">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Configuration</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Special Editors</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Make-Targets.html b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Make-Targets.html
new file mode 100644
index 0000000..9339475
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Make-Targets.html
@@ -0,0 +1,102 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>Autotools Plugin-in User Guide - Make Targets</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Make Targets</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Building.html" title="Building">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Updating-This-Document.html" title="Updating This Document">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Building</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Updating This Document</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Make_Targets">Make Targets</h1>
+		<p>A Makefile has a set of targets that can be built.  Typically, every Makefile has an 
+			<b>all</b> target which builds all targets, but there may be optional targets as well.  A CDT Makefile project enables one to invoke the various make targets via the Make Targets dialog.  Since an Autotools project is a form of Makefile project, it too supports the Make Targets dialog.
+			Make Targets are important for an Autotool project because there are a large number of make targets added to the Makefile automatically by configuration.  Typically, a project is built by running 
+			<b>make all</b>, but it is installed by invoking 
+			<b>make install</b>.  The install target places files in standard locations; usually system directories on a Linux system.  For example, header files would be installed in /usr/include and made available to all users of the system.  The install prefix (/usr) can be overridden using the configure --prefix parameter or else by specifying prefix=xxxx on the call to make (e.g. make install prefix=/my/local/directory) so that testing can be performed without modifying the whole system.
+		</p>
+		<p>A regular CDT Makefile project requires users to add their own Make Targets, however, the Autotools plug-in analyzes the top-level Makefile for you and creates top-level Make Targets for the project.  As mentioned, these automatically added targets can be numerous.  If you wish to create targets to run in sub-directories of the main build directory, you must add these manually.  For example, you might wish to build docs in a lower-level sub-directory, but not for the entire project.</p>
+		<p>The Make Targets dialog can be displayed in two ways:</p>
+		<ol>
+			<li>Selecting a file or folder in a project and clicking on the Project -> Make Target menu item</li>
+			<li>Right clicking on a file or folder in a project and selecting Make Target</li>
+		</ol>
+		<p>This brings up a sub-menu containing Create... and Build.... to either create a new Make Target or build an existing Make Target, respectively.</p>
+		<p>
+			<img border="0" src="images/Linuxtool-AutotoolsMakeTargetsMenu.png"/>
+		</p>
+		<p>Creating a Make Target is relatively straight-forward:</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsMakeTargetCreate.png"/>
+		</p>
+		<p>There is nothing different in the Make Target dialog for Autotools, however, a few concepts need to be clarified.</p>
+		<p>For Make Targets added as part of the Project -> Make Target menu item, the target is for the top-level Makefile for the current build.  This means that if you add a Make Target this way, it will persist across configurations and will try and run the 
+			<b>make</b> command in the top-level build location specified for the active configuration.
+		</p>
+		<p>Make Targets added by using the right-click Make Target menu are location sensitive.  This means that the 
+			<b>make</b> command will attempt to run in that directory where the right-click was performed, regardless of whether there is a Makefile present there.  Let's say you want to add your own Make Target that performed a 
+			<b>make all install</b> (i.e. you want to group multiple targets together into one).  If you are in configuration X with build directory build-X, you want to right-click in a directory that is build-X or a sub-directory of build-X.  This target will issue a 
+			<b>make all install</b> in that particular directory.  If you wanted the same target for another configuration, you would have to right-click in its build directory or lower and add another Make Target.  Obviously, for top-level Make Targets, using the Project -> Make Target menu item makes the most sense since it applies to all configurations.  If you add a Make Target to a source directory, it will likely fail when run because it will try and run 
+			<b>make</b> in that directory which will probably only contain a Makefile.in or Makefile.am file and not a Makefile which is only generated at configure time.
+		</p>
+		<p>The Make Target dialog can be used to override various flags within the Makefile.  For example, to perform a 
+			<b>make install</b> and reset the prefix to /my/local/directory, you would first select the 
+			<b>install</b> target from the Build... dialog.
+		</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsMakeTargetBuild.png"/>
+		</p>
+		<p>Then, you would click the Edit button to edit the Make Target.  You can then override the prefix by specifying its value after the 
+			<b>make</b> command.  You edit the build command by first un-checking "Use Builder Settings" which enables text entry.
+		</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsMakeTargetEdit.png"/>
+		</p>
+		<p>The check-box that says "Run all project builders" should be left un-checked.  By default, we only want the CDT Makefile builder to run and not the Autotools configure builder or any other builder.</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Building.html" title="Building">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="Autotools Plugin-in User Guide.html" title="Autotools Plugin-in User Guide">
+						<img alt="Autotools Plugin-in User Guide" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right">
+					<a href="Updating-This-Document.html" title="Updating This Document">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Building</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Updating This Document</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Special-Editors.html b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Special-Editors.html
new file mode 100644
index 0000000..0938d6b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Special-Editors.html
@@ -0,0 +1,78 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>Autotools Plugin-in User Guide - Special Editors</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Special Editors</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Invoking-Autotools.html" title="Invoking Autotools">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Building.html" title="Building">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Invoking Autotools</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Building</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Special_Editors">Special Editors</h1>
+		<p>The Autotools plug-in provides two special editors for editing Autotool input files.  The first is the Autoconf Editor.  This editor is invoked when opening configure.in, configure.ac files as well as the resultant configure scripts that autoconf creates.  Support includes full colourization, outline view, rudimentary error parsing, and hover help/completion.</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsAutoconfEditor.png"/>
+		</p>
+		<p>The outline view shows macro references and program control statements such as if, else, for, etc...  Hover help with text completion is provided for the various AC-prefixed and AM-prefixed macros that are provided as standard.  As the macros vary from release to release of autoconf and automake, the editor uses an autoconf and automake version property to determine which set of macros it should adhere to.  The versions selected affect the parsing which will issue warnings for macros that do not have enough parameters or too many parameters.  To set the autoconf and automake versions for the Autoconf Editor, go to the Project -> Properties -> Autotools -> General page and select the Editors tab.</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsEditorsTab.png"/>
+		</p>
+		<p>There you will find a pull-down of the various versions supported.  Future releases may add new versions.</p>
+		<p>The default autoconf and automake versions to use for editing can be set as a preference.  Go to Window -> Preferences -> C/C++ -> Autotools -> Autoconf Editor and click on the Versions tab.</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsAutoconfEditorPrefs.png"/>
+		</p>
+		<p>Under the Syntax tab of the same preference page, you can change the colours used for the various elements shown in the editor.</p>
+		<p>A second editor, the Automake Editor is also provided by the Autotools plug-in.  This editor is invoked when opening a Makefile.am or Makefile.in file.  Support includes full colourization, outline view, rudimentary error parsing, and hover help.</p>
+		<p>
+			<img border="0" src="images/Linuxtools-AutotoolsAutomakeEditor.png"/>
+		</p>
+		<p>In the example shown, one can see the $ variable references are displayed when hovered over.  This is particularly useful for $&lt; and $@ in make targets to understand what is being referenced.  In some instances, you will see reference to variables surrounded by the @ symbol (e.g. @srcdir@).  This represents a variable that is to be substituted by the configure script.</p>
+		<p>Rudimentary error parsing looks for syntax errors.  As with the Autoconf editor, colourization can be controlled by preferences.  Go to Window -> Preferences -> C/C++ -> Autotools -> Automake Editor and click on the Syntax tab.</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Invoking-Autotools.html" title="Invoking Autotools">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="Autotools Plugin-in User Guide.html" title="Autotools Plugin-in User Guide">
+						<img alt="Autotools Plugin-in User Guide" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right">
+					<a href="Building.html" title="Building">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Invoking Autotools</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Building</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Supported-Environments.html b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Supported-Environments.html
new file mode 100644
index 0000000..b3ac355
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Supported-Environments.html
@@ -0,0 +1,60 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>Autotools Plugin-in User Guide - Supported Environments</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Supported Environments</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Autotools Plugin-in User Guide.html" title="Introduction">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Creating-an-Autotools-Project.html" title="Creating an Autotools Project">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Introduction</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Creating an Autotools Project</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Supported_Environments">Supported Environments</h1>
+		<p>While the Autotools should work on any Unix-based system, it has only been tested on Linux (note that it is part of the Linux Tools project).  OS-specific bugs or problems that are not reproducible on Linux may require a user work-around.  For example, users of Cygwin or MinGW may require setting modifications to get the plug-in working for their project.  The Autotools plug-in is not supported under a regular Windows environment (i.e. without Cygwin or MinGW).</p>
+		<p>To use the Autotools plug-in, it is required that you have the CDT (C/C++ Development Tools) already installed in Eclipse, the GNU Autotools installed on your system, and the "sh" (shell) command must be available. The "sh" command is required to invoke the configure script.</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Autotools Plugin-in User Guide.html" title="Introduction">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="Autotools Plugin-in User Guide.html" title="Autotools Plugin-in User Guide">
+						<img alt="Autotools Plugin-in User Guide" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right">
+					<a href="Creating-an-Autotools-Project.html" title="Creating an Autotools Project">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Introduction</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Creating an Autotools Project</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Updating-This-Document.html b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Updating-This-Document.html
new file mode 100644
index 0000000..67acc85
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/Updating-This-Document.html
@@ -0,0 +1,54 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>Autotools Plugin-in User Guide - Updating This Document</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Updating This Document</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Make-Targets.html" title="Make Targets">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right"></td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Make Targets</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top"></td>
+			</tr>
+		</table><hr/>
+		<h1 id="Updating_This_Document">Updating This Document</h1>
+		<p>This document is maintained in a collaborative wiki.  If you wish to update or modify this document please visit 
+
+			<a href="http://wiki.eclipse.org/Linux_Tools_Project/Autotools/User_Guide">http://wiki.eclipse.org/Linux_Tools_Project/Autotools/User_Guide</a>
+		</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Make-Targets.html" title="Make Targets">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="Autotools Plugin-in User Guide.html" title="Autotools Plugin-in User Guide">
+						<img alt="Autotools Plugin-in User Guide" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right"></td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Make Targets</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top"></td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtool-AutotoolsMakeTargetsMenu.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtool-AutotoolsMakeTargetsMenu.png
new file mode 100644
index 0000000..92cff7e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtool-AutotoolsMakeTargetsMenu.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAclocal.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAclocal.png
new file mode 100644
index 0000000..97c80f2
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAclocal.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutoconfEditor.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutoconfEditor.png
new file mode 100644
index 0000000..fa9b650
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutoconfEditor.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutoconfEditorPrefs.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutoconfEditorPrefs.png
new file mode 100644
index 0000000..ae132b1
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutoconfEditorPrefs.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutoheader.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutoheader.png
new file mode 100644
index 0000000..151d88b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutoheader.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutomake.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutomake.png
new file mode 100644
index 0000000..7b293bf
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutomake.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutomakeEditor.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutomakeEditor.png
new file mode 100644
index 0000000..e47af3b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutomakeEditor.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutoreconf.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutoreconf.png
new file mode 100644
index 0000000..6c54060
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutoreconf.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutotools.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutotools.png
new file mode 100644
index 0000000..b5d6ee7
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutotools.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutotoolsConsole.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutotoolsConsole.png
new file mode 100644
index 0000000..ee0ae59
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsAutotoolsConsole.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsBuildLocation.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsBuildLocation.png
new file mode 100644
index 0000000..e64cd4c
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsBuildLocation.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsBuilders.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsBuilders.png
new file mode 100644
index 0000000..de96459
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsBuilders.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsCProjectWizard.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsCProjectWizard.png
new file mode 100644
index 0000000..622690c
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsCProjectWizard.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsCheckout.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsCheckout.png
new file mode 100644
index 0000000..d502223
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsCheckout.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConfsettings.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConfsettings.png
new file mode 100644
index 0000000..70065fe
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConfsettings.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConsolePrefs.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConsolePrefs.png
new file mode 100644
index 0000000..2534bd1
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConsolePrefs.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConsoleSelect.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConsoleSelect.png
new file mode 100644
index 0000000..8b6df0d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConsoleSelect.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConvAutotoolsWizard.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConvAutotoolsWizard.png
new file mode 100644
index 0000000..fe8c69d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConvAutotoolsWizard.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConvertWizard.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConvertWizard.png
new file mode 100644
index 0000000..c7ad60e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsConvertWizard.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsCreateConf.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsCreateConf.png
new file mode 100644
index 0000000..5e26d74
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsCreateConf.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsEditorsTab.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsEditorsTab.png
new file mode 100644
index 0000000..40dd5a0
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsEditorsTab.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsLibtoolize.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsLibtoolize.png
new file mode 100644
index 0000000..75b932b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsLibtoolize.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsMakeTargetBuild.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsMakeTargetBuild.png
new file mode 100644
index 0000000..befd0a2
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsMakeTargetBuild.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsMakeTargetCreate.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsMakeTargetCreate.png
new file mode 100644
index 0000000..25913c9
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsMakeTargetCreate.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsMakeTargetEdit.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsMakeTargetEdit.png
new file mode 100644
index 0000000..1f2de55
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsMakeTargetEdit.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsManageConfs.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsManageConfs.png
new file mode 100644
index 0000000..c66cc3d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsManageConfs.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsNewOther.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsNewOther.png
new file mode 100644
index 0000000..b7865b2
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsNewOther.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsToolSettings.png b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsToolSettings.png
new file mode 100644
index 0000000..0e4bdb4
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-docs/userguide/images/Linuxtools-AutotoolsToolSettings.png
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-feature/.project b/autotools/org.eclipse.linuxtools.cdt.autotools-feature/.project
new file mode 100644
index 0000000..9418b45
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.cdt.autotools-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-feature/ChangeLog b/autotools/org.eclipse.linuxtools.cdt.autotools-feature/ChangeLog
new file mode 100644
index 0000000..7954d04
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-feature/ChangeLog
@@ -0,0 +1,96 @@
+2009-11-10  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.properties: Make featureName a bit more user-friendly.
+
+2009-11-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Fix dependencies to support CDT 6.0.0 and up.
+
+2009-11-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Fix feature id.
+
+2009-10-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Add revised org.eclipse.linuxtools.cdt.autotools plug-in that has been
+	set up for compatbility mode to build older projects.
+
+2009-10-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Bump to 2.0.0.  Refer to new org.eclipse.linuxtools.cdt.autotools.core and
+	org.eclipse.linuxtools.cdt.autotools.ui plug-ins.
+
+2009-04-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Fix dependencies to not require 6.0.0 CDT plugins as they
+	aren't in the CDT Master zip yet for Galileo builds.
+
+2009-04-23  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Use 6.0.0 CDT requirements on Galileo branch.
+
+2009-01-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Bump up version to 1.0.2.
+
+2009-01-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fixes #260436
+	
+	* feature.xml: Add .qualifier to version id.
+
+2009-01-06  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Add update site information.
+	* build.properties: Add feature.properties and epl-v10.html.
+
+2008-10-31  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Use %featureName, %provider, %copyright, and %description from
+	feature.properties.  Add "(Incubation)".
+	* feature.properties: Initial import.
+	* epl-v10.html: Likewise.
+
+2008-10-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Update release to 1.0.1.
+
+2008-08-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Update release to 1.0.0.
+
+2008-01-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Update release to 0.9.6.
+
+2007-12-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Update release to 0.9.5.3.
+
+2007-11-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Update release to 0.9.5.2.
+
+2007-10-23  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Update release to 0.9.5.1.
+
+2007-10-04  jjohnstn  <jjohnstn@vermillion>
+
+	* feature.xml: Update release to 0.9.5.
+
+2007-09-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Update release to 0.9.4.
+
+2007-09-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Update release to 0.9.3.
+
+2007-08-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Fix up release number.
+
+2007-07-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Fix up description to not reference sample url.
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-feature/about.html b/autotools/org.eclipse.linuxtools.cdt.autotools-feature/about.html
new file mode 100644
index 0000000..44e2290
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-feature/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

+<html>

+<head>

+<title>About</title>

+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>8th September, 2004</p>	

+<h3>License</h3>

+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<h3>Contributions</h3>

+

+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise

+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such

+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or

+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the

+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available

+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also

+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+</body>

+</html>
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-feature/build.properties b/autotools/org.eclipse.linuxtools.cdt.autotools-feature/build.properties
new file mode 100644
index 0000000..d361ddb
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-feature/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+               about.html,\
+               epl-v10.html,\
+               feature.properties
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-feature/epl-v10.html b/autotools/org.eclipse.linuxtools.cdt.autotools-feature/epl-v10.html
new file mode 100644
index 0000000..9320c9f
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-feature/epl-v10.html
@@ -0,0 +1,320 @@
+<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
+
+
+<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
+<meta name="ProgId" content="Word.Document">
+<meta name="Generator" content="Microsoft Word 9">
+<meta name="Originator" content="Microsoft Word 9">
+<link rel="File-List" href="http://www.eclipse.org/legal/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
+<title>Eclipse Public License - Version 1.0</title>
+<!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+  <o:Revision>2</o:Revision>
+  <o:TotalTime>3</o:TotalTime>
+  <o:Created>2004-03-05T23:03:00Z</o:Created>
+  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
+  <o:Pages>4</o:Pages>
+  <o:Words>1626</o:Words>
+  <o:Characters>9270</o:Characters>
+   <o:Lines>77</o:Lines>
+  <o:Paragraphs>18</o:Paragraphs>
+  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
+  <o:Version>9.4402</o:Version>
+ </o:DocumentProperties>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <w:WordDocument>
+  <w:TrackRevisions/>
+ </w:WordDocument>
+</xml><![endif]-->
+<style>
+<!--
+ /* Font Definitions */
+@font-face
+	{font-family:Tahoma;
+	panose-1:2 11 6 4 3 5 4 4 2 4;
+	mso-font-charset:0;
+	mso-generic-font-family:swiss;
+	mso-font-pitch:variable;
+	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
+ /* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{mso-style-parent:"";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p
+	{margin-right:0in;
+	mso-margin-top-alt:auto;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p.BalloonText, li.BalloonText, div.BalloonText
+	{mso-style-name:"Balloon Text";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:8.0pt;
+	font-family:Tahoma;
+	mso-fareast-font-family:"Times New Roman";}
+@page Section1
+	{size:8.5in 11.0in;
+	margin:1.0in 1.25in 1.0in 1.25in;
+	mso-header-margin:.5in;
+	mso-footer-margin:.5in;
+	mso-paper-source:0;}
+div.Section1
+	{page:Section1;}
+-->
+</style>
+</head><body style="" lang="EN-US">
+
+<div class="Section1">
+
+<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
+</p>
+
+<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
+THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
+REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+OF THIS AGREEMENT.</span> </p>
+
+<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
+
+<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
+in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and<br clear="left">
+b) in the case of each subsequent Contributor:</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
+changes to the Program, and</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
+additions to the Program;</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
+such changes and/or additions to the Program originate from and are distributed
+by that particular Contributor. A Contribution 'originates' from a Contributor
+if it was added to the Program by such Contributor itself or anyone acting on
+such Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in conjunction
+with the Program under their own license agreement, and (ii) are not derivative
+works of the Program. </span></p>
+
+<p><span style="font-size: 10pt;">"Contributor" means any person or
+entity that distributes the Program.</span> </p>
+
+<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
+claims licensable by a Contributor which are necessarily infringed by the use
+or sale of its Contribution alone or when combined with the Program. </span></p>
+
+<p><span style="font-size: 10pt;">"Program" means the Contributions
+distributed in accordance with this Agreement.</span> </p>
+
+<p><span style="font-size: 10pt;">"Recipient" means anyone who
+receives the Program under this Agreement, including all Contributors.</span> </p>
+
+<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
+Subject to the terms of this Agreement, each Contributor hereby grants Recipient
+a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
+display, publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and object code
+form.</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
+Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
+patent license under Licensed Patents to make, use, sell, offer to sell, import
+and otherwise transfer the Contribution of such Contributor, if any, in source
+code and object code form. This patent license shall apply to the combination
+of the Contribution and the Program if, at the time the Contribution is added
+by the Contributor, such addition of the Contribution causes such combination
+to be covered by the Licensed Patents. The patent license shall not apply to
+any other combinations which include the Contribution. No hardware per se is
+licensed hereunder. </span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
+Recipient understands that although each Contributor grants the licenses to its
+Contributions set forth herein, no assurances are provided by any Contributor
+that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient
+for claims brought by any other entity based on infringement of intellectual
+property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility
+to secure any other intellectual property rights needed, if any. For example,
+if a third party patent license is required to allow Recipient to distribute
+the Program, it is Recipient's responsibility to acquire that license before
+distributing the Program.</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
+Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement. </span></p>
+
+<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
+
+<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
+Program in object code form under its own license agreement, provided that:</span>
+</p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
+it complies with the terms and conditions of this Agreement; and</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
+its license agreement:</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
+effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; </span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
+effectively excludes on behalf of all Contributors all liability for damages,
+including direct, indirect, special, incidental and consequential damages, such
+as lost profits; </span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
+states that any provisions which differ from this Agreement are offered by that
+Contributor alone and not by any other party; and</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
+states that source code for the Program is available from such Contributor, and
+informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
+
+<p><span style="font-size: 10pt;">When the Program is made available in source
+code form:</span> </p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
+it must be made available under this Agreement; and </span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
+copy of this Agreement must be included with each copy of the Program. </span></p>
+
+<p><span style="font-size: 10pt;">Contributors may not remove or alter any
+copyright notices contained within the Program. </span></p>
+
+<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
+originator of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution. </span></p>
+
+<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
+
+<p><span style="font-size: 10pt;">Commercial distributors of software may
+accept certain responsibilities with respect to end users, business partners
+and the like. While this license is intended to facilitate the commercial use
+of the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes the
+Program in a commercial product offering, such Contributor ("Commercial
+Contributor") hereby agrees to defend and indemnify every other
+Contributor ("Indemnified Contributor") against any losses, damages and
+costs (collectively "Losses") arising from claims, lawsuits and other
+legal actions brought by a third party against the Indemnified Contributor to
+the extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may participate
+in any such claim at its own expense.</span> </p>
+
+<p><span style="font-size: 10pt;">For example, a Contributor might include the
+Program in a commercial product offering, Product X. That Contributor is then a
+Commercial Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance claims and
+warranties are such Commercial Contributor's responsibility alone. Under this
+section, the Commercial Contributor would have to defend claims against the
+other Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.</span> </p>
+
+<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
+
+<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and distributing the
+Program and assumes all risks associated with its exercise of rights under this
+Agreement , including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs or
+equipment, and unavailability or interruption of operations. </span></p>
+
+<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
+
+<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
+THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
+
+<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
+
+<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
+or unenforceable under applicable law, it shall not affect the validity or
+enforceability of the remainder of the terms of this Agreement, and without
+further action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.</span> </p>
+
+<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
+against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with
+other software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the date
+such litigation is filed. </span></p>
+
+<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
+shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable
+period of time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive. </span></p>
+
+<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
+copies of this Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The Agreement
+Steward reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement Steward has
+the right to modify this Agreement. The Eclipse Foundation is the initial
+Agreement Steward. The Eclipse Foundation may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.</span> </p>
+
+<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
+State of New York and the intellectual property laws of the United States of
+America. No party to this Agreement will bring a legal action under this
+Agreement more than one year after the cause of action arose. Each party waives
+its rights to a jury trial in any resulting litigation.</span> </p>
+
+<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
+
+</div>
+
+</body></html>
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-feature/feature.properties b/autotools/org.eclipse.linuxtools.cdt.autotools-feature/feature.properties
new file mode 100644
index 0000000..9717e8b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-feature/feature.properties
@@ -0,0 +1,112 @@
+#################################################################################
+#  Copyright (c) 2008 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+featureName=Autotools support for CDT (Incubation)
+description=Plugins for maintaining C/C++ projects that use Autotools (autoconf and automake).
+provider=Eclipse
+copyright=Copyright 2006, 2007, 2008, 2009 Red Hat, Inc.
+licenseURL=epl-v10.html
+license=\
+ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
+March 17, 2005\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse.org CVS\n\
+repository ("Repository") in CVS modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+Features may also include other Features ("Included Features"). Files named\n\
+"feature.xml" may contain a list of the names and version numbers of\n\
+Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+   - The top-level (root) directory\n\
+   - Plug-in and Fragment directories\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
+   - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Eclipse Update Manager, you must agree to a license ("Feature Update\n\
+License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties". Such Abouts,\n\
+Feature Licenses and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
+    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools-feature/feature.xml b/autotools/org.eclipse.linuxtools.cdt.autotools-feature/feature.xml
new file mode 100644
index 0000000..8f26e37
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools-feature/feature.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.linuxtools.cdt.autotools"
+      label="%featureName"
+      version="2.0.0.qualifier"
+      provider-name="%provider">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="epl-v10.php">
+      %license
+   </license>
+
+   <url>
+      <update label="Linux Tools Update Site" url="http://download.eclipse.org/technology/linuxtools/update"/>
+   </url>
+
+   <requires>
+      <import plugin="org.eclipse.cdt.managedbuilder.core" version="5.0.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.cdt.core" version="5.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.cdt.ui" version="5.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.cdt.managedbuilder.ui" version="5.0.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.cdt.managedbuilder.gnu.ui" version="5.0.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.cheatsheets"/>
+      <import plugin="org.eclipse.ui" version="3.4.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime" version="3.4.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jface.text" version="3.4.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.editors" version="3.4.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.4.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.resources" version="3.4.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.ide" version="3.4.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.cdt.make.core" version="5.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.cdt.make.ui" version="5.0.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.console" version="3.3.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.help" version="3.3.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.variables" version="3.2.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.views" version="3.3.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.filesystem" version="1.2.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.linuxtools.cdt.autotools.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.cdt.autotools.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.cdt.autotools_docs"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.cdt.autotools"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/profiling/.classpath b/autotools/org.eclipse.linuxtools.cdt.autotools.core/.classpath
similarity index 100%
copy from profiling/.classpath
copy to autotools/org.eclipse.linuxtools.cdt.autotools.core/.classpath
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/.cvsignore b/autotools/org.eclipse.linuxtools.cdt.autotools.core/.cvsignore
new file mode 100644
index 0000000..50c1b30
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/.cvsignore
@@ -0,0 +1,4 @@
+bin
+@dot
+javaCompiler...args
+build.xml
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/.project b/autotools/org.eclipse.linuxtools.cdt.autotools.core/.project
new file mode 100644
index 0000000..3cb23d3
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.cdt.autotools.core</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/.settings/org.eclipse.jdt.core.prefs b/autotools/org.eclipse.linuxtools.cdt.autotools.core/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..43deb75
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Wed Feb 18 16:59:38 EST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/.settings/org.eclipse.jdt.ui.prefs b/autotools/org.eclipse.linuxtools.cdt.autotools.core/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..4c71318
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,3 @@
+#Tue Jan 02 14:11:13 EST 2007
+eclipse.preferences.version=1
+internal.default.compliance=default
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/ChangeLog b/autotools/org.eclipse.linuxtools.cdt.autotools.core/ChangeLog
new file mode 100644
index 0000000..2569225
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/ChangeLog
@@ -0,0 +1,4082 @@
+2010-04-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #308261
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsConfiguration.java (copy): Only set
+	the isDirty flag to true if we are cloning a configuration to a new id.  A straight copy should not change the isDirty
+	flag.
+
+2010-03-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #306406
+	* src/org/eclipse/linuxtools/cdt/autotools/core/AutotoolsNewProjectNature.java (addAutotoolsBuilder): Don't save
+	project description unless builder list has been modified.  To save the project description, use a Job so it is
+	done asynchronously. 
+
+2010-03-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java (regenerateMakefiles): Use the
+	id of the IConfiguration not the name to fetch the IAConfiguration for it.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsOptionValueHandler.java (handleValue): Make
+	sure ICConfigurationDescription exists before accessing it.
+
+2010-03-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #304005
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsConfigurationBuilder.java (build): Add logic to
+	check for dirty configuration.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java (runScript): Change to use getId
+	instead of getName method for IAConfiguration.
+	(runCommand): Ditto.
+	(regenerateMakefiles): Add call to sync configurations. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsConfiguration.java (getId): New
+	method. 
+	(copy): Changed to two separate methods, one which takes an id and the other which takes no parameter
+	and expects the id to be copied.
+	(AutotoolsConfiguration): Changed to accept an id rather than a name. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsConfigurationManager.java: Change to keep
+	track of temporary configuration list for a project.  This is needed when performing configuration settings and the
+	user has not yet confirmed.  In addition, store all configurations by id and not name since the id does not change.
+	(resourceChanged): Logic changed to rename both saved and temporary configuration lists which are now Map structures.
+	(AutotoolsConfigurationManager): Add hash maps for saved and temporary configuration lists.
+	(syncConfigurations): New method. 
+	(applyConfigs): Ditto.
+	(saveConfigs): Changed to take the project as parameter.  A second private
+	version of the function also has been added which takes an array of Configuration
+	Descriptions.  The option value "Name" for configure tool is resolved for saved configurations.
+	(getConfigs): Renamed to getSavedConfigs.
+	(getSavedConfigs): New method renamed from getConfigs.
+	(getConfigurations): Renamed to getSavedConfigs.
+	(isConfigurationAlreadySaved): Modified calls. 
+	(setSyncing): New method.
+	(createDefaultConfiguration): Pass id instead of name to constructor.
+	(isSyncing): New method.
+	(addConfiguration): No longer need to check for existence because we are adding to a Map.
+	(replaceConfiguration): Removed.
+	(saveAllConfigs): Ditto.
+	(replaceProjectConfigurations): Split into two versions.  The new version takes an additional
+	parameter which is an array of Configuration descriptions.
+	(getTmpConfigs): New method.
+	(syncNameField): New method.
+	(clearTmpConfigurations): New method.
+	(findCfg): Find by id and not name.
+	(getTmpConfiguration): New method.
+	(getConfiguration): Try and find configuration by id before creating default.
+	(cloneCfg): New method taken out of AutotoolsConfigurationPropertyPage and added here to perform cloning of an Autotools configuration.
+	Logic has been added to not perform cloning if the target configuration already has been saved and to return a boolean regarding this.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsOptionValueHandler.java (handleValue): Changed to
+	call new cloneCfg interface in AutotoolsConfigurationManager.  Logic to check for an Autotools Clone listener is removed.  The return
+	code of cloneCfg is checked to see if the configuration has already been saved.  If not saved and we are not doing a sync
+	then it returns without resolving the Name option field.  The Name option field is now the Configuration Description id
+	which does not change on a rename operation. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/IAConfiguration.java: Add new getId method.  Remove name methods
+	which are no longer used. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/wizards/NewAutotoolsProject.java (process): Modified call to
+	saveConfigs. 
+	(process): Ditto.
+
+2010-02-25  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java (getAutogenPath): Fix typo
+	so we split tokens on white-space, not non-white-space. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsConfigurationManager.java (saveConfigs): 
+	Since we base ourselves on hashing by name, do not save multiple configurations with same name. 
+	(getConfigs): Do not load multiple configurations with same name, just the first.
+
+2010-02-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #303616
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java (runScript): Use
+	unresolved default if environment variable is uninitialized.
+	(initializeBuildConfigDirs): Ditto. 
+	(runCommand): Ditto.
+	
+2010-02-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #303613
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureMessages.properties: Fix tooltip
+	for config tool directory.
+
+2010-02-23  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #303616
+	* src/org/eclipse/inuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java (getAutogenArgs):
+	Add additional parameter of arguments found in the command itself. 
+	(getConfigArgs): Ditto. 
+	(getAutogenPath): Fix to split out additional arguments specified with the command.
+	(getConfigurePath): Ditto. 
+	(runScript): Fix to resolve build macros for arguments.
+	(runCommand): Ditto. 
+	(regenerateMakefiles): Fix references to functions above to pass additional parms.
+
+2010-02-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java (addMakeTargetsToManager): Add
+	code to use reflection to look for new MakeTargetManager setTargets method which will set the entire list
+	of MakeTargets at one time. 
+
+2009-12-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #296616
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/MakeTarget.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/MakeTargetManager.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/ProjectTargets.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/core/AutotoolsNewProjectNature.java: 
+	(removeOldAutotoolsNature): New Method.
+	(addAutotoolsBuilder): Compensate for case where we are dealing with old Autotools project.
+
+2009-11-16  Andrew Overholt  <overholt@redhat.com>
+
+	* plugin.properties: Fix provider name.
+
+2009-11-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Change dependencies to handle CDT 6.0.0 and up.
+
+2009-11-02  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Make special source content types for configure and autogen.sh and have each tool
+	reference their proper input scripts.  Add a discovery profile id for the inputs to each tool
+	and have neither support managed build. Add the gcc and g++ compiler directly to the set of 
+	tools for the GNU Autotools toolchain.
+	* src/org/eclipse/linuxtools/cdt/autotools/core/Resources.properties: New message for running
+	distclean in top-level directory. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java (addMakeTargetsToManager):
+	Try and find an old MakeTarget to use instead of always creating one from scratch. 
+	(regenerateMakefiles): When a full configure is required and the top-level source directory has
+	already been configured in, a make distclean to the top-level source directory is required before
+	a configuration can be performed in an alternate directory.  Do this automatically, but let the
+	user know what happened.  In addition, change the console for Autotools configuration so that
+	the console is not cleared within one build.
+
+2009-10-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/DefaultNoDependencyCalculator.java: New file.
+	* plugin.properties: Add required messages.
+	* plugin.xml: Add gcc and g++ tools to GNU toolchain.  Add content types for configure and autogen.sh
+	scripts and make these the source content types for configure and autogen.sh respectively.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsPropertyConstants.java: Add
+	compat constants for use with older projects.
+
+2009-10-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/wizards/NewAutotoolsProject.java: Clean
+	up unused imports.
+	* plugin.xml: Add gcc and g++ to toolchain.  Specify GCCStdMakePerFile discovery profile
+	for toolchain and for configure tool inputs.
+
+2009-10-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/wizards/NewAutotoolsProject.java (process): Add
+	creation of default Autotools configuration.
+
+2009-10-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* build.properties: Remove icons.
+	* icons/ac16/acmacro_arg_obj.gif: Removed.
+	* icons/ac16/acmacro_obj.gif: Removed.
+	* icons/ac16/ammacro_obj.gif: Removed.
+	* icons/ac16/case_obj.gif: Removed.
+	* icons/ac16/condition_obj.gif: Removed.
+	* icons/ac16/convert_normal.gif: Removed.
+	* icons/ac16/elif_obj.gif: Removed.
+	* icons/ac16/else_obj.gif: Removed.
+	* icons/ac16/for_obj.gif: Removed.
+	* icons/ac16/if_obj.gif: Removed.
+	* icons/ac16/while_obj.gif: Removed.
+	* icons/autoconf.gif: Removed.
+	* icons/automake.gif: Removed.
+	* icons/dlcl16/build_configs.gif: Removed.
+	* icons/dlcl16/config_category.gif: Removed.
+	* icons/dlcl16/config_tool.gif: Removed.
+	* icons/dlcl16/newc_app.gif: Removed.
+	* icons/dlcl16/newcc_app.gif: Removed.
+	* icons/dlcl16/open_include.gif: Removed.
+	* icons/dtool16/alphab_sort_co.gif: Removed.
+	* icons/dtool16/build_menu.gif: Removed.
+	* icons/dtool16/convert-normal.gif: Removed.
+	* icons/dtool16/make.gif: Removed.
+	* icons/dtool16/makefile.gif: Removed.
+	* icons/dtool16/newc_app.gif: Removed.
+	* icons/dtool16/newcc_app.gif: Removed.
+	* icons/dtool16/segment_edit.gif: Removed.
+	* icons/dtool16/target_add.gif: Removed.
+	* icons/dtool16/target_build.gif: Removed.
+	* icons/dtool16/target_delete.gif: Removed.
+	* icons/dtool16/target_edit.gif: Removed.
+	* icons/dtool16/update_old.gif: Removed.
+	* icons/elcl16/build_configs.gif: Removed.
+	* icons/elcl16/config_category.gif: Removed.
+	* icons/elcl16/config_tool.gif: Removed.
+	* icons/elcl16/newc_app.gif: Removed.
+	* icons/elcl16/newcc_app.gif: Removed.
+	* icons/elcl16/open_include.gif: Removed.
+	* icons/etool16/alphab_sort_co.gif: Removed.
+	* icons/etool16/build_menu.gif: Removed.
+	* icons/etool16/convert_normal.gif: Removed.
+	* icons/etool16/make.gif: Removed.
+	* icons/etool16/makefile.gif: Removed.
+	* icons/etool16/newc_app.gif: Removed.
+	* icons/etool16/newcc_app.gif: Removed.
+	* icons/etool16/segment_edit.gif: Removed.
+	* icons/etool16/target_add.gif: Removed.
+	* icons/etool16/target_build.gif: Removed.
+	* icons/etool16/target_delete.gif: Removed.
+	* icons/etool16/target_edit.gif: Removed.
+	* icons/etool16/target_filter.gif: Removed.
+	* icons/etool16/update_old.gif: Removed.
+	* icons/obj16/acmacro_obj.gif: Removed.
+	* icons/obj16/command_obj.gif: Removed.
+	* icons/obj16/define_obj.gif: Removed.
+	* icons/obj16/environment_obj.gif: Removed.
+	* icons/obj16/envvar_obj.gif: Removed.
+	* icons/obj16/error_obj.gif: Removed.
+	* icons/obj16/fatalerror_obj.gif: Removed.
+	* icons/obj16/hfolder_obj.gif: Removed.
+	* icons/obj16/include_obj.gif: Removed.
+	* icons/obj16/info_obj.gif: Removed.
+	* icons/obj16/irule_obj.gif: Removed.
+	* icons/obj16/lib_obj.gif: Removed.
+	* icons/obj16/macro_obj.gif: Removed.
+	* icons/obj16/relation_obj.gif: Removed.
+	* icons/obj16/target_obj.gif: Removed.
+	* icons/obj16/trule_obj.gif: Removed.
+	* icons/obj16/warning_obj.gif: Removed.
+	* icons/sample.gif: 
+
+2009-10-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Refactoring of org.eclipse.linuxtools.cdt.autotools into org.eclipse.linuxtools.cdt.autotools.core
+	and org.eclipse.linuxtools.cdt.autotools.ui.
+
+	* .settings/org.eclipse.core.resources.prefs: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractAutotoolsHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractTargetAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AclocalHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoconfHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoheaderHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutomakeHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoreconfHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoconfAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoheaderAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoreconfAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeLibtoolizeAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/LibtoolizeHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/SingleInputDialog.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/TwoInputDialog.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsBuilder.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsConfigurationBuilder.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakeTargetManager.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewProjectNature.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsOptionValueHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsProjectNature.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsProjectPropertyTester.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfoProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutoconfSubstRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeCompletionProcessor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeConfigMacro.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeDocumentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeEditor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeEditorFactory.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeErrorHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/Automakefile.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileCodeScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileUtil.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeIfElse.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeMacroDefinitionRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeMacroReferenceRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeTextHover.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeWordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AbstractConfigurationOption.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfiguration.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfigurationManager.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/BinConfigureOption.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureOptionCategory.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureTool.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/IAConfiguration.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/IConfigureOption.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/InternalConfigureOption.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/MultiArgConfigureOption.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/StringConfigureOption.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AbstractElementListSelectionDialog.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AbstractMakefile.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AbstractMakefileCodeScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AddBuildTargetAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ArchiveTarget.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/BadDirective.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Command.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Comment.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/CompletionProposalComparator.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Conditional.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/DefaultRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/DefineVariable.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/DeleteOnErrorRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Directive.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/EditorUtility.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ElementListSelectionDialog.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Else.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/EmptyLine.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Endef.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Endif.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ExportAllVariablesRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ExportVariable.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ExternalEditorInput.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ExternalEditorInputFactory.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/GNUAutomakefile.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/GNUMakefileConstants.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/GNUMakefileUtil.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/GNUTargetRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/GNUVariableDef.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/IAutomakeConditional.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/If.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Ifdef.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Ifeq.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Ifndef.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Ifneq.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/IgnoreRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/IMakefileDocumentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/IMakefileEditorActionDefinitionIds.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Include.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/InferenceRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/IntermediateRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/IReconcilingParticipant.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ISelectionValidator.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ITranslationUnitEditorInput.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/LexicalSortingAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/LowResolutionTimeRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MacroDefinition.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MacroDefinitionRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MacroReferenceRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileAnnotationHover.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileCodeScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileCompletionProcessor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakeFileConstants.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileContentOutlinePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileDocumentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileDocumentSetupParticipant.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileEditor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileEditorActionContributor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileEditorPreferenceConstants.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileEditorTogglePresentationAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefilePartitionScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileReader.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileReconcilingStrategy.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakeFileResources.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileSourceConfiguration.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileStorageDocumentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileTextHover.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileWordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MessageLine.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/NotParallelRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/NullMakefile.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/OpenDeclarationAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/OpenIncludeAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/OverrideDefine.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/OverrideVariable.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Parent.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/PhonyRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/PosixMakefileUtil.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/PosixRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/PreciousRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ProjectionMakefileUpdater.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Rule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SccsGetRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SecondaryRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SelectionList.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SelectionStatusDialog.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SilentRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SpecialRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/StaticTargetRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/StatusInfo.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/StatusTool.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/StringMatcher.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SuffixesRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Target.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/TargetRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/TargetVariable.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Terminal.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/TwoArrayQuickSort.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/UnExport.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Util.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/VariableDefinition.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/VPath.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/WordPartDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/WorkingCopyManager.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/MakeMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/MakeTarget.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/MakeTargetManager.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/MarkerGenerator.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ProjectTargets.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/AutoconfPrototype.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/AutoconfTextHover.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/HoverMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/HoverMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AbstractAutotoolsCPropertyTab.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AutotoolsConsole.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AutotoolsPluginImages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/CBuildStepsConsole.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/CConfigureConsole.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/Console.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ConsoleMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ConsoleMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/CWordFinder.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/editors/autoconf/ProjectionFileUpdater.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ErrorParserBlock.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/FileRelevance.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/HTML2TextReader.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/HTMLPrinter.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/HTMLTextPresenter.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/LineBreakingReader.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/LocationAdapter.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/MakeResources.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/MakeUIImages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/MakeUIMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/MessageLine.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/OptionalMessageDialog.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AbstractEditorPreferencePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferencePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutotoolsEditorPreferenceConstants.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutotoolsPreferencePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/ColorEditor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/ColorManager.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/OverlayPreferenceStore.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/StatusInfo.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/TabFolderLayout.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AbstractConfigurePropertyOptionsPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsBuildPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsCategoryPropertyOptionPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsConfigurePrefStore.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsConfigurePropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsConfigurePropertyTab.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsEditorPropertyTab.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsGeneralPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsHeadPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyConstants.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyManager.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsToolPropertyOptionPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsToolsPropertyTab.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/IProjectPropertyListener.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/IPropertyChangeManager.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/ToolListContentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/ToolListElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/ToolListLabelProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ResourceLookup.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ResourceLookupTree.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/SingleCharReader.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/SubstitutionTextReader.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/AutotoolsWizardMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/AutotoolsWizardMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/ConfigurationContentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/ConfigurationLabelProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/ManagedProjectOptionBlock.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/NewAutotoolsProject.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/popup/actions/GetDefinedSymbolsAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/popup/actions/GetIncludePathAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfAnnotationHover.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfCodeScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentSetupParticipant.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMacroValidator.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfErrorHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfIdentifierRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfKeywordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfM4WordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacro.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroCodeScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroParameterListValidator.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroPartitionRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroProposalContextInformation.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroWordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitioner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitionScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPKGWordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfReconcilingStrategy.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfWhitespaceDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfWordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolEditorActionDefinitionIds.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolHelpContextIds.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolsEditor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/InlineDataRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/MultilineRuleDamagerRepairer.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/ParseException.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseConditionElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElifElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElseElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfForElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfIfElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroArgumentElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfParser.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfRootElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfSelectElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfTokenizer.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfUntilElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfWhileElement.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfErrorHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroValidator.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IMacroDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ITokenConstants.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ParseException.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/Token.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RecursiveSingleLineRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RestrictedEndOfLineRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/AutotoolsBuildWizard.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/AutotoolsNewCProjectWizardV2.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/ConvertToAutotoolsProjectWizard.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/CProjectPlatformPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCCProjectWizard.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCProjectWizard.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsProjectOptionPage.java: Removed.
+	* templates/projecttemplates/EmptyProject/template.properties: Removed.
+	* templates/projecttemplates/EmptyProject/template.xml: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/AUTHORS: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/Basename.c: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/configure.ac.top: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/COPYING: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/Makefile.am.src: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/Makefile.am.top: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/NEWS: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/README: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/template.properties: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/AUTHORS: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Basename.cpp: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/configure.ac.top: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/COPYING: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Makefile.am.src: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Makefile.am.top: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/NEWS: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/README: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.properties: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/core/AutotoolsNewProjectNature.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/core/AutotoolsPlugin.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/core/Resources.properties: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsConfigurationBuilder.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsPropertyConstants.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsOptionValueHandler.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/IConfigurationCloneListener.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/MakeMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/MakeTarget.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/MakeTargetManager.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/MarkerGenerator.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/ProjectTargets.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/wizards/NewAutotoolsProject.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AbstractConfigurationOption.java: New file. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsConfiguration.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsConfigurationManager.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/BinConfigureOption.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureOptionCategory.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureTool.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/IAConfiguration.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/IConfigureOption.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/InternalConfigureOption.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/MultiArgConfigureOption.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/StringConfigureOption.java: New file.
+	* .project: Changed due to refactoring.
+	* META-INF/MANIFEST.MF: Refactored.
+	* plugin.xml: Refactored.  Moving UI elements to org.eclipse.linuxtools.cdt.autotools.ui plug-in.
+
+2009-10-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfigurationManager.java (saveConfigs): Store
+	configuration data into .autotools file stored in project rather than using project working location. 
+	(getConfigs): Get configs from .autotools file stored in the project rather than using project working
+	location.
+
+2009-10-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Fix category for Autotools C++ wizard.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsOptionValueHandler.java (fixName): New method.
+	(handleValue): Add support to generate build directory if property option is on or defaulted.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsBuildPropertyPage.java (createControls): 
+	Add support for automatic build name generation option.
+	(initialize): Ditto.
+	(performDefaults): Ditto.
+	(performOK): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyConstants.java: 
+	Add support for auto build-name generation option.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyMessages.properties: Add
+	messages for new property for automatically naming the build directory. 
+
+2009-09-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsEditorPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsToolsPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsConfigurePropertyTab.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsEditorPropertyTab.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsGeneralPropertyPage.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsHeadPropertyPage.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsToolsPropertyTab.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/NewAutotoolsProject.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/AutotoolsBuildWizard.java: New file.
+	* templates/projecttemplates/EmptyProject/template.properties: New file.
+	* templates/projecttemplates/EmptyProject/template.xml: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/AUTHORS: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/Basename.c: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/configure.ac.top: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/COPYING: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/Makefile.am.src: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/Makefile.am.top: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/NEWS: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/README: New file. 	
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/template.properties: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/AUTHORS: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Basename.cpp: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/configure.ac.top: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/COPYING: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Makefile.am.src: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Makefile.am.top: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/NEWS: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/README: New file. 	
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.properties: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml: New file.
+	* plugin.properties: Add strings to support additions to plugin.xml.
+	* plugin.xml: Add a new template process for creating an Autotools project.  Add templates for
+	an empty project, a helloworld C project, and a helloworld C++ project.  Add a CDT wizard for
+	creating a new Autotools project.  Remove project type name from Autotools project type so that
+	it does not get added by MBSWizard and instead is added as part of the new AutotoolsBuildWizard.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator.java (regenerateMakefiles): When forced to
+	autoreconf missing files, do not restart the console for the subsequent configuration.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsOptionValueHandler.java (handleValue): Handle class rename.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfiguration.java (setDefaultOptions): New
+	method. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/IAConfiguration.java: Add setDefaultOptions method.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsCategoryPropertyOptionPage.java (updateFields): Add
+	call to set the values. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsConfigurePropertyPage.java: 
+	(performSave): Deal with AutotoolsPropertyPage being renamed AutotoolsConfigurePropertyPage.
+	(isSingle): Add override to specify this is a single page.
+	(AutotoolsConfigurePropertyPage): New.
+
+2009-09-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Make configure source tool directory use our shared applicability calculator.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator.java (createDirectory): 
+	Change to return boolean and to use Java File logic.
+	(regenerateMakefiles): Fail if createDirectory fails for build directory.  Change over to not
+	use Root or Workspace for file management.  Use Java File instead.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/ToolListLabelProvider.java: 
+	Remove compiler warning.
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Add new failure message if the
+	build directory cannot be created.
+
+2009-09-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsDefaultBuildDirHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakefileBuilder.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AbstractAutotoolsPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsOptionValueHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/IAConfiguration.java: New file.
+	* plugin.properties: Add configure name string.
+	* plugin.xml: Add configure name to configure options for build definition and set its option value handler and
+	calculator to be AutotoolsOptionValueHandler.  Add back a builder for toolchain to prevent errror when displaying
+	toolChain editor property page.  Add new AutotoolsNatureV2.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsConfigurationBuilder.java (performMakefileGeneration): Add
+	multiconfiguration support. 
+	(clean): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator.java (addMakeTargetsToManager): 
+	(createDirectory): Use Java File interface to perform mkdirs.
+	(regenerateMakefiles): Add configuration parameter to support multiconfiguration.
+	(initializeBuildConfigDirs): Use build location from ManagedBuild.
+	(generateMakefiles): Call new regenerateMakefile interface.
+	(reconfigure): Use new regenerateMakefiles interface.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfiguration.java (setConfigToolDirectory): 
+	(setActive): Remove.
+	(isActive): Remove.
+	(configOpts): Remove builddir.
+	(copy): Change output to be IAConfiguration.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfigurationManager.java: Remove active
+	configuration tracking.
+	(resourceChanged): Remove active configuration logic.
+	(saveConfigs): Fix bug with adding header information in loop.
+	(replaceConfiguration): Use IAConfiguration interface.
+	(getConfigs): Remove active configuration logic.
+	(configurationAlreadyExists): Use IAConfiguration interface.
+	(getConfigurations): Don't add a configuration to project automatically.
+	(AutotoolsConfigurationManager): Remove active configuration management set up.
+	(createDefaultConfiguration): Do not default configuration name now that we are syncing up with build configurations.
+	(addConfiguration): Use IAConfiguration interface.  Remove active configuration management.
+	(replaceProjectConfigurations): New method.
+	(findCfg): New method.
+	(getConfiguration): New method.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AbstractAutotoolsCPropertyTab.java: Extend AbstractCBuildPropertyTab.
+	(isIndexerAffected): New method. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsCategoryPropertyOptionPage.java (AutotoolsCategoryPropertyOptionPage):
+	Use IAConfiguration interface. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsConfigurePrefStore.java (setSelection): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsConfigurePropertyPage.java: Remove configuration
+	tracking.  Let AutotoolsPropertyPage do it.
+	(handleOptionSelection): Use AbstractPage cast.
+	(setValues): Disable for multiconfiguration.  Get current configuration using getAutotoolsCfg method.
+	(createControls): Don't bother getting current Autotools configuration.  Don't call setValues().
+	(canBeVisible): Check for project.
+	(updateData): Get ManagedBuild configuration from input to use later to find syncing AutotoolsConfiguration with
+	same name.
+	(getAutotoolsCfg): New Method.
+	(performCancel): Do nothing.
+	(displayPageForElement): Set selection based on current Autotools configuration from getAutotoolsCfg().
+	(performDefaults): Do nothing.
+	(performOK): Replace Autotools configurations for project.
+	(createSelectionArea): Use a temporary AutotoolsConfiguration for a tree label provider.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsEditorPropertyPage.java (createControls): 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyPage.java: Rewritten to extend
+	AbstractPage and to replace content with AbstractPage.java as well since the majority of methods in AbstractPage
+	are private and manipulate private data.  Add AutotoolsConfiguration tracking and a call-back mechanism for registering
+	cloned configurations from AutotoolsOptionValueHandler.  When needed, call the super methods so they may access
+	private methods.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsToolPropertyOptionPage.java (AutotoolsToolPropertyOptionPage):
+	Use IAConfiguration interface. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/ToolListLabelProvider.java (ToolListLabelProvider): Ditto. 
+	(getCfg): Ditto.
+	(setCfg): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/AutotoolsNewCProjectWizardV2.java (doRun): Remove AutotoolsConfiguration
+	logic and defer to when needed.
+
+2009-09-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Switching to use CommonBuilder.
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsConfigurationBuilder.java: New file.
+	* META-INF/MANIFEST.MF: Update dependencies.
+	* plugin.xml: Change build configuration to non-managed-build.  Add AutotoolsConfigurationBuilder
+	as separate builder and remove AutotoolsNewMakeGenerator as Managed Build Makefile generator.  Make
+	Autotools Nature require Managed Build Nature.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator.java (addMakeTargetsToManager): 
+	Specify CDT common builder as target builder and also specify build directory as container.
+	(regenerateMakefiles): Add build directory to console messages.  Make full configure default to false.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewProjectNature.java (addAutotoolsBuilder): Change
+	to put new Configuration builder ahead of Common Builder.
+	(configure): Remove Std Make bits.
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Add new messages and add build directory
+	specification to Makefile generator messages. 
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/AutotoolsNewCProjectWizardV2.java (addNature): Refer
+	to Managed Nature rather than Make Nature.  
+
+2009-08-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator.java (getPathString): New
+	method.
+	(runScript): Call getPathString method on command path.  Use CCorePlugin to get
+	environment variable manager instead of ManagedBuildManager.
+	(runCommand): Ditto.
+	(initializeBuildConfigDirs): Remove code to set build location in builder.
+	(initialize): Get the C Configuration description for the active configuration.
+
+2009-07-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AutotoolsConsole.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/Console.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/CBuildStepsConsole.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/CConfigureConsole.java: Inherit from
+	Console class.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/MakeResources.properties: ADd newline
+	at end of file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ConsoleMessages.properties: Add console
+	names.
+	* plugin.xml: Add CBuildConsole extensions for Autotools console and BuildSteps console.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java: 
+	(executeConsoleCommand): New method to execute commands in a special console.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java: (run): Use 
+	new executeConsoleCommand method from InvokeAction which this class now inherits from. 
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoconfAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoheaderAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoreconfAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeLibtoolizeAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.properties: Add CWD message.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator.java (stripEnvVars): Make
+	public static.
+	
+2009-07-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureHandler.java: New file.
+	* plugin.properties: Add strings for Reconfigure menu item.
+	* plugin.xml: Add Reconfigure project menu item.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator.java (regenerateMakefiles): 
+	(reconfigure): New method.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfigurationManager.java (resourceChanged):
+	Now that plugin working area is used, no need to manage the files there for project deletion or
+	renaming. 
+	(addConfiguration): If this is first configuration for project, call setActiveConfiguration. 
+	(replaceConfiguration): Ditto.
+	(saveConfigs): Use plugin working area for project.
+	(getConfigs): New method which gets configs for single project.
+	(loadConfigs): Removed. 
+	(getActiveConfiguration): Call getConfigurations internally.
+	(getConfigurations): Call getconfigs method and create default configuration if needed. 
+	(setActiveConfiguration): 
+	(getInstance): Remove loadConfigs call.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureMessages.properties: Add save
+	config error message. 
+
+2009-07-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfiguration.java (getToolArgs): Add
+	support for caching parameters. 
+	(getToolParameters): Clean up warnings.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/BinConfigureOption.java (setValue): Set configuration
+	dirty on value change. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/AutoconfPrototype.java: Clean
+	up compiler warnings. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/AutoconfTextHover.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AbstractAutotoolsPage.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsConfigurePropertyPage.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsEditorPropertyPage.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsToolsPropertyPage.java: Ditto.
+
+2009-07-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* icons/obj16/fatalerror_obj.gif: New file.
+	* icons/obj16/info_obj.gif: New file.
+	* icons/obj16/warning_obj.gif: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AbstractAutotoolsCPropertyTab.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AbstractAutotoolsPage.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/FileRelevance.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/LocationAdapter.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/OptionalMessageDialog.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ResourceLookup.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ResourceLookupTree.java: New file.
+	* plugin.xml: Fix new MakefileGenerator id and nature references.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakefileBuilder.java (clean): New override method.
+	(getTargets): New override method.
+	(removeBuildDir): New method.
+	(build): Minor format change.
+	(AutotoolsNewMakefileBuilder): 
+	(makeArray): New method.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator.java (getAutogenPath): New method
+	that calls stripEnvVars. 
+	(runScript): Add additional enviornment variables specified on command line.
+	(stripEnvVars): New method to strip env vars from a command string.
+	(getConfigurePath): Changed to use stripEnvVars.
+	(regenerateMakefiles): Fix deletion logic to not delete build directory.
+	(makeArray): New method.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewProjectNature.java: Change id. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AbstractConfigurationOption.java (getParameters): 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfiguration.java (Option): Add
+	defaultValue field. 
+	(Option.getDefaultValue): New method.
+	(Option.Option): Added constructor.
+	(initConfigOptions): Fix autogen to not have id with dot in name.
+	(configOpts): Add default value processing.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureMessages.properties: Change name of autogen
+	tool name message. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/MakeResources.properties: Added messages.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/MakeUIImages.java: Add new image. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsConfigurePropertyPage.java (handleOptionSelection):
+	Change cast. 
+	(cfgChanged): Add comment.
+	(getProject): Changed to get project from page.
+	(createControls): Remove configuration combo which is no longer used.
+	(updateData): Update comment. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsEditorPropertyPage.java (updateButtons): 
+	Update comment.
+	(cfgChanged): Added comment.
+	(getProject): Changed to get project from page.
+	(updateData): Update comment.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyMessages.java: Added messages. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyPage.java: Changed to inherit from
+	AbstractAutotoolsPage.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsToolPropertyOptionPage.java (createFieldEditors): 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsToolsPropertyPage.java (updateButtons): 
+	Update comment.
+	(cfgChanged): Added comment.
+	(getProject): Changed to get project from page.
+	(updateData): Update comment.
+
+2009-06-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #280509
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator.java (regenerateMakefiles): Add
+	logic to use autoreconf if no configure script and no autogen.sh. 
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Add messages. 
+
+2009-06-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #280696, #280504, #280505, #280506
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java (showSuccess):
+	Changed to issue a information dialog that does not have a cancel button. 
+	(executeCommand): Changed to create a ProgressMonitorDialog that is issued
+	until the command completes successfully or with failure.
+	(ExecuteProgressDialog): New private internal class that implements IRunnableWithProgress
+	which is used to run the command for a ProgressMonitorDialog.
+	(simpleParseOptions): New method to parse options and account for quoted strings.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoheaderHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoreconfHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoheaderAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoreconfAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeLibtoolizeAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/LibtoolizeHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/SingleInputDialog.java: New file.
+	* plugin.properties: Add new messages for additional tools/commands added.
+	* plugin.xml: Change invoking autotools to be a single menu item in Project menu which
+	expands to show all tools available, including aclocal, autoconf, autoheader, automake,
+	autoreconf, and libtoolize.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.properties: Add support
+	for autoheader, autoreconf, and libtoolize. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyConstants.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyMessages.properties: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsToolsPropertyPage.java 
+	(createControls): Ditto. 
+	(initialize): Ditto. 
+	(performDefaults): Ditto.
+	(performOK): Ditto.
+
+2009-06-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator.java (toolsCfg):
+	New AutotoolsConfiguration acquired from AutotoolsConfigurationManager.
+	(runScript): Use new toolsCfg instead of cfg. 
+	(getConfigArgs): Ditto.
+	(initializeBuildConfigDirs): Ditto. 
+	(autogenExists): Ditto.
+	(runCommand): Ditto.
+	(getAutogenArgs): Ditto.
+	(configureExists): Ditto.
+	(regenerateMakefiles): Ditto.
+	(getConfigurePath): Ditto.
+	(getMakefileName): Ditto.
+	(initialize): Initialize toolsCfg to active Autotools configuration for project.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AbstractConfigurationOption.java (getParameters):
+	New method. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfiguration.java (getToolArgs): New
+	method. 
+	(getConfigArgs): Removed. 
+	(configOpts): Add autogen.sh support.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureMessages.properties: Add autogen.sh
+	stuff. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureOptionCategory.java (getParameters): New
+	method. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureTool.java (getParameters): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/IConfigureOption.java (getParameters): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/MultiArgConfigureOption.java (getParameters): Fix
+	to properly separate options of all kinds and not just for configure.
+	 
+2009-06-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #281582, #281583
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (clean): Do not
+	use ManagedBuildManager to get a Makefile generator.  Just create a new Autotools Makefile
+	generator. 
+	(removeBuildDir): Ditto. 
+	(build): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java (getCompilationString):
+	Fix to support g++, top-level building, and compilation strings that span multiple lines. 
+
+2009-06-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #280117
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java (buildFile): Fix so we don't
+	leave loop early before finding build directory.
+
+2009-06-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* icons/ac16/convert-normal.gif: Removed.
+	* icons/etool16/convert-normal.gif: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsEditorPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyConstants.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyManager.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsToolsPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/IProjectPropertyListener.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/IPropertyChangeManager.java: Removed.
+	* icons/ac16/convert_normal.gif: New file.
+	* icons/dlcl16/config_category.gif: New file.
+	* icons/dlcl16/config_tool.gif: New file.
+	* icons/elcl16/config_category.gif: New file.
+	* icons/elcl16/config_tool.gif: New file.
+	* icons/etool16/convert_normal.gif: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureTool.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/InternalConfigureOption.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/MultiArgConfigureOption.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AbstractConfigurePropertyOptionsPage.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsCategoryPropertyOptionPage.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsConfigurePrefStore.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsConfigurePropertyPage.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsToolPropertyOptionPage.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/ToolListContentProvider.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/ToolListElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/ToolListLabelProvider.java: New file.
+	* plugin.properties: Change messages. 
+	* plugin.xml: Remove warnings.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java: Changed due to refactoring. 
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoconfAction.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsBuilder.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfoProvider.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AbstractConfigurationOption.java (isMultiArg): 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfiguration.java (getConfigToolDirectory):
+	Rewritten to use option. 
+	(setConfigToolDirectory): Ditto. 
+	(setDirty): Rewritten.
+	(Option): Add public methods to get name, description, type, and tooltip.
+	(setBuildDirectory): Rewritten to use option. 
+	(getConfigArgs): New method.
+	(initConfigOptions): Set options for everything including tools.
+	(getOption): New method.
+	(getOptionList): Ditto.
+	(AutotoolsConfiguration): Keep track of parms dirty vs config dirty. 
+	(getChildOptions): Add support for both categories and tools.
+	(setOption): Alter dirty flag.
+	(getToolParameters): New method.
+	(getTools): Ditto.
+	(configOpts): New internal map.
+	(getBuildDirectory): Rewrite to use simple option.
+	(copy): Copy using option copy methods and add internal variables as well.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfigurationManager.java (ConfigureFileFilter):
+	New class to make it easy to find configuration data for project.  
+	(resourceChanged): Added internal map changes as well.
+	(addConfigurationHeader): New method.
+	(saveConfigs): Changed to use IFile.
+	(replaceConfiguration): New method. 
+	(setActiveConfiguration): Ditto.
+	(getConfigurations): If default configuration created, mark it active.
+	(AutotoolsConfigurationManager): Create active configs map.
+	(getInstance): Fixed to only load configs the one time.
+	(loadConfigs): Fixed to properly load configuration files and use xml parsing.
+	(getActiveConfiguration): New method. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/BinConfigureOption.java (getType): 
+	(copy): New method.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureMessages.java: 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureMessages.properties: 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureOptionCategory.java (getValue): 
+	(getType): New method.
+	(isMultiArg): Ditto.
+	(copy): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/IConfigureOption.java: 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/StringConfigureOption.java (getType): 
+	(copy): New method.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/AutoconfTextHover.java: Changed due to
+	refactoring of properties. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AutotoolsPluginImages.java: Add new images for
+	Autotools configuration property page.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsBuildPropertyPage.java: Changed due to
+	refactoring of properties. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsEditorPropertyPage.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyConstants.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyManager.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyMessages.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyMessages.properties: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsPropertyPage.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/AutotoolsToolsPropertyPage.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/IProjectPropertyListener.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/properties/IPropertyChangeManager.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditor.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/AutotoolsNewCProjectWizardV2.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCCProjectWizard.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCProjectWizard.java: Ditto.
+
+2009-05-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AbstractConfigurationOption.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfiguration.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/AutotoolsConfigurationManager.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/BinConfigureOption.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureMessages.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureMessages.properties: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/ConfigureOptionCategory.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/IConfigureOption.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/configure/StringConfigureOption.java: New file.
+	* .classpath: Checking in.
+	* plugin.xml: Fix compiler warnings.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java (separateTargets): Ditto. 
+	(separateOptions): Ditto.
+	(executeCommand): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoconfAction.java (run): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/TwoInputDialog.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsBuilder.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsDefaultBuildDirHandler.java (handleValue): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (clean): Ditto.
+	(build): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakefileBuilder.java (performMakefileGeneration): Ditto.
+	(build): Ditto.
+	(AutotoolsNewMakefileBuilder): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator.java (runScript): Ditto. 
+	(saveTargets): Ditto.
+	(runCommand): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewProjectNature.java (configure): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsProjectNature.java (removeNature): Ditto. 
+	(addAutotoolsBuilder): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java (buildFile): Ditto. 
+	(getDefinedSymbols): Ditto.
+	(getIncludePaths): Ditto.
+	(definedSymbols): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfoProvider.java (setDirty): Ditto. 
+	(getScannerInformation): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutoconfSubstRule.java (DecreasingCharArrayLengthComparator): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeCompletionProcessor.java (DirectiveComparator): Ditto.
+	(computeContextInformation): Ditto.
+	(computeCompletionProposals): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeDocumentProvider.java (connect): Ditto. 
+	(shutdown): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeEditor.java (getAdapter): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeErrorHandler.java (AutomakeMarker): Ditto. 
+	(checkChildren): Ditto.
+	(AutomakeMarker.setAttributes): Ditto. 
+	(AutomakeMarker.getAttributes): Ditto.
+	(createMarker): Ditto.
+	(AutomakeMarker.AutomakeMarker): Ditto. 
+	(AutomakeMarker.getAdapter): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileCodeScanner.java (createRules): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java (AutomakefileContentProvider.getElements): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AbstractElementListSelectionDialog.java (setSelectionListElements): Ditto.
+	(getWidgetSelection): Ditto.
+	(verifyCurrentSelection): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AbstractMakefile.java (getMacroDefinitions): Ditto. 
+	(getBuiltinInferenceRules): Ditto.
+	(getRules): Ditto.
+	(getInferenceRules): Ditto. 
+	(getTargetRules): Ditto.
+	(getBuiltinMacroDefinitions): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AddBuildTargetAction.java (getTargetRules): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/CompletionProposalComparator.java (compare): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/EditorUtility.java (getWorkspaceFileAtLocation): Ditto.
+	(isLinked): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ElementListSelectionDialog.java (open): Ditto. 
+	(setElements): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ExternalEditorInput.java (getAdapter): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/GNUAutomakefile.java (getBuiltins): Ditto.
+	(addDirective): Ditto.
+	(parseVPath): Ditto.
+	(getDirectives): Ditto.
+	(parse): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/LexicalSortingAction.java (LexicalCSorter.isSorterProperty): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileCompletionProcessor.java (DirectiveComparator): Ditto.
+	(computeContextInformation): Ditto.
+	(computeCompletionProposals): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileContentOutlinePage.java (MakefileContentProvider.getElements): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileDocumentProvider.java (shutdown): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileEditor.java (getAdapter): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileMessages.java (getFormattedString): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefilePartitionScanner.java (MakefilePartitionScanner): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/NullMakefile.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/OpenIncludeAction.java (resolveIncludeLink): Ditto. 
+	(findFile): Ditto.
+	(getIncludeStatement): Ditto. 
+	(chooseFile): Ditto.
+	(run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Parent.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/PosixMakefileUtil.java (findTargets): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ProjectionMakefileUpdater.java (createAnnotationMap): Ditto. 
+	(fCollapseConditional): Ditto.
+	(fCollapseRule): Ditto.
+	(fCollapseMacroDef): Ditto.
+	(match): Ditto.
+	(processReconcile): Ditto. 
+	(computeAdditions): Ditto.
+	(initialize): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Rule.java (getCommands): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SelectionList.java (getSelection): Ditto. 
+	(setElements): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SelectionStatusDialog.java (setInitialSelection): Ditto. 
+	(getPrimaryInitialSelection): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/StringMatcher.java (parseWildCards): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/WorkingCopyManager.java (setWorkingCopy): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/MakeTarget.java (getAdapter): Ditto.
+	(getEnvironment): Ditto.
+	(setEnvironment): Ditto.
+	(build): Ditto.
+	(getExpandedEnvironment): Ditto. 
+	(getAttributeMap): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/MakeTargetManager.java (initializeBuilders): Ditto. 
+	(getTargetBuilders): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ProjectTargets.java (findTarget): Ditto. 
+	(remove): Ditto.
+	(get): Ditto.
+	(getAsXML): Ditto. 
+	(contains): Ditto.
+	(add): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/editors/autoconf/ProjectionFileUpdater.java (createAnnotationMap): Ditto. 
+	(match): Ditto.
+	(processReconcile): Ditto. 
+	(computeAdditions): Ditto.
+	(initialize): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ErrorParserBlock.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/HTML2TextReader.java (static initializer): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/HTMLTextPresenter.java (updatePresentation): Ditto.
+	(adaptTextPresentation): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java (ColorListContentProvider.getElements): Ditto. 
+	(addTextKeyToCover): Ditto.
+	(createSyntaxPage): Ditto.
+	(createOverlayStore): Ditto.
+	(HighlightingColorListItem): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferencePage.java (ColorListContentProvider.getElements): Ditto. 
+	(addTextKeyToCover): Ditto.
+	(createSyntaxPage): Ditto.
+	(createOverlayStore): Ditto.
+	(HighlightingColorListItem): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/ColorManager.java (dispose): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/StatusInfo.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (addMakeTargetsToManager): Ditto.
+	(runScript): Ditto.
+	(regenerateMakefiles): Ditto. 
+	(runCommand): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfAnnotationHover.java (getMarkersForLine): Ditto. 
+	(select): Ditto.
+	(getHoverInfo): Ditto.
+	(formatMultipleMessages): Ditto. 
+	(.createInformationControl): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfCodeScanner.java (AutoconfCodeScanner): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditor.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfErrorHandler.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfIdentifierRule.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacro.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroCodeScanner.java (AutoconfMacroCodeScanner): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java (computeCompletionProposals): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroParameterListValidator.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitionScanner.java (AutoconfPartitionScanner): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolsEditor.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/InlineDataRule.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java (updateSelection): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElement.java (AutoconfElement): Ditto. 
+	(toString): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfParser.java (ExprEndCondition): Ditto.
+	(ExprEndCondition.serialVersionUID): Ditto.
+	(BlockEndCondition): Ditto.
+	(checkBlockValidity): Ditto.
+	(BlockEndCondition.serialVersionUID): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RecursiveSingleLineRule.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RestrictedEndOfLineRule.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyManager.java (AutotoolsPropertyManager): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsToolsPropertyPage.java (performOK): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/AutotoolsNewCProjectWizardV2.java (doRun): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/CProjectPlatformPage.java (handleConfigurationSelectionChange): Ditto. 
+	(CProjectPlatformPage): Ditto.
+	(filterSupportedConfigurations): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCCProjectWizard.java (doRun): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCProjectWizard.java (doRun): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsProjectOptionPage.java (ManagedWizardOptionBlock.setupHelpContextIds): Ditto. 
+
+2009-05-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Add new Autotools nature for time-being.  Specify new builder which is based
+	on MakefileBuilder and specify new project wizard.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder: Move hastTargetBuilder
+	to AutotoolsPlugin.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakeTargetManager: Use AutotoolsPlugin
+	hasTargetBuilder method.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage: Ditto.	
+	* src/org/eclipse.linuxtools/cdt/autotools/AutotoolsProjectPropertyTester.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfoProvider.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakefileBuilder: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewProjectNature: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java: Move hasTargetBuilder
+	method here.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java: Apply fix for stopping
+	build on failure to generate Makefile.
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Change message for no
+	makefile generated.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/AutotoolsNewCProjectWizardV2.java: New file.
+
+2009-04-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #249199
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractAutotoolsHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoconfHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutomakeHandler.java: New file.
+	* plugin.properties: Add messages for invoking autotools.
+	* plugin.xml: Change invoke autotools actions from Actions in an ActionSet to instead
+	use org.eclipse.ui.menus, org.eclipse.ui.commands, and org.eclipse.ui.handlers and
+	do not add these actions to project menu if not an Autotools project.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AclocalHandler.java (execute): Implemented. 
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java (run): Add check
+	for null container.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoconfAction.java (run): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java (run): Ditto.
+	
+2009-04-21  Jeff Johnston  <jjohnstn@redhat.com>
+2009-05-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Add new Autotools nature for time-being.  Specify new builder which is based
+	on MakefileBuilder and specify new project wizard.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder: Move hastTargetBuilder
+	to AutotoolsPlugin.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakeTargetManager: Use AutotoolsPlugin
+	hasTargetBuilder method.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage: Ditto.	
+	* src/org/eclipse.linuxtools/cdt/autotools/AutotoolsProjectPropertyTester.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfoProvider.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakefileBuilder: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewProjectNature: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java: Move hasTargetBuilder
+	method here.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java: Apply fix for stopping
+	build on failure to generate Makefile.
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Change message for no
+	makefile generated.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/AutotoolsNewCProjectWizardV2.java: New file.
+
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/OpenIncludeAction.java
+	(run): Fix compiler warnings.
+	(getIncludeStatement): Ditto.
+	(chooseFile): Ditto.
+	(.visit): Ditto.
+	(findFile): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileMessages.java
+	(getFormattedString): Fix compiler warnings.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java
+	(getAutogenArgs): Fix compiler warnings.
+	(runScript): Ditto.
+	(getConfigArgs): Ditto.
+	(MakeTargetComparator): Ditto.
+	(makeArray): Ditto.
+	(runCommand): Ditto.
+	(addMakeTargetsToManager): Ditto plus do not start/stop MakeTargetManager
+	anymore.
+	(saveTargets): New method.
+	(translateDocumenttoCDTProject): Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.java
+	(getFormattedString): Cast 2nd argument for message fomatting to avoid compile
+	warnings.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/AutotoolsWizardMessages.java
+	(getFormattedString): Cast 2nd argument for message formatting to avoid compiler
+	warnings.
+	(getFormattedString): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AutotoolsPluginImages.java
+	(makeIconFileURL): Fix static member reference to avoid compiler warning.
+	2009-05-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Add new Autotools nature for time-being.  Specify new builder which is based
+	on MakefileBuilder and specify new project wizard.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder: Move hastTargetBuilder
+	to AutotoolsPlugin.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakeTargetManager: Use AutotoolsPlugin
+	hasTargetBuilder method.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage: Ditto.	
+	* src/org/eclipse.linuxtools/cdt/autotools/AutotoolsProjectPropertyTester.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfoProvider.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakefileBuilder: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewMakeGenerator: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsNewProjectNature: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java: Move hasTargetBuilder
+	method here.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java: Apply fix for stopping
+	build on failure to generate Makefile.
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Change message for no
+	makefile generated.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/AutotoolsNewCProjectWizardV2.java: New file.
+	(static initializer): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java
+	(getFormattedString): Cast 2nd argument to avoid compiler warning.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AbstractEditorPreferencePage.java
+	(validatePositiveNumber): Properly template containers.
+	(getTextFields): Ditto.
+	(initializeFields): Ditto.
+	(updateStatus): Ditto.
+	(getCheckBoxes): Ditto.
+	(getNumberFields): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileCodeScanner.java
+	(createRules): Use templated List.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileCodeScanner.java
+	(createRules): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AbstractMakefileCodeScanner.java
+	(createTextAttribute): Correctly access static member function.
+	(initializeRules): Use templated List.
+	
+2009-04-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Allow org.eclipse.cdt.make.core and org.eclipse.cdt.make.ui version numbers
+	to start pre-6.0.0 and exclude 6.1.0.
+
+2009-04-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Update dependencies to not put upper sealing for version numbers as 6.0.0.
+	
+2009-03-31  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Set expected value to true for Autotools property page enablement.
+
+2009-02-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* .settings/org.eclipse.jdt.core.prefs: Specify Java 1.5.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsBuilder.java: Inherit from Builder. 
+	(AutotoolsBuilder): Change to take ToolChain parameter and call super constructor.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (clean): Change
+	to set the Builder for the ToolChain and call different super.build method that does not
+	take new private MyBoolean argument.
+	(build): Ditto.
+	(getTargets): Fix Java 1.5 warnings.
+	(makeArrayList): Ditto.
+
+2009-01-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #261717
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/AutoconfTextHover.java (getMacroList): 
+	Don't bother processing macros if the macro document turns out to be null.
+
+2009-01-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #261257
+	
+	* META-INF/MANIFEST.MF: Update plug-in to add .qualifier to id and update
+	to 1.0.2.qualifier.
+	* plugin.xml: Update invoke autotools action set to set visible to true.
+
+2009-01-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (getConfigArgs): If there
+	are no -- args in the user arguments, still pass them on to configure.
+
+2008-11-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #472731
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (hasTargetBuilder): 
+	Add check for ManagedProject being null which is apparently possible.
+
+2008-11-25  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeDocumentProvider.java: Change
+	Copyright to make Red Hat a contributor to the copyright of the original file modified to make
+	this new class.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeEditor.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/Automakefile.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileCodeScanner.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeMacroDefinitionRule.java: Ditto.
+
+2008-11-03  Andrew Overholt  <overholt@redhat.com>
+
+	* build.properties: Remove libhoverdocs/.
+
+2008-10-31  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Use plugin.properties for provider.
+	* plugin.properties: Add "(Incubation)" to Bundle-Name.
+
+2008-10-28  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Update BREE to J2SE-1.5.
+
+2008-10-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump up release to 1.0.1.
+
+2008-10-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (build): Add check for default
+	configuration coming back null from buildinfo.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java (performDefaults):
+	Set make -w default to be true.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject):
+	Set make -w project property to true and don't turn off indexer.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCCProjectWizard.java (doRun): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCProjectWizard.java (doRun): Ditto.
+
+2008-10-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for #249416
+
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java: Fix addition of MakeTargets to run faster.
+	(addMakeTargetsToManager): Rewritten to not use MakeTargetManager addTarget or removeTarget methods which
+	cause a rewrite of the .cproject file each time.
+	(isValidTarget): Remove checking MakeTargetManager existing target.
+	(translateDocumentToCDTProject): New method which outputs the MakeTargets to the .cproject file.
+	(MakeTargetComparator): New Comparator for sorting MakeTargets.
+	(createTargetElement): New method.
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Add subtask message for refreshing Make Targets
+	which might take some time.
+
+2008-10-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for #249231
+
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (getAutogenArgs): Add
+	support to resolve build macros.
+	(getConfigArgs): Ditto.
+	(initializeBuildConfigDirs): Ditto.
+
+2008-10-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for #249644.
+
+	* plugin.xml: Change visible to true for invoke autotools action set.  Also add
+	new popupmenus for running autoconf directly on configure.ac or configure.in.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java (run): Use
+	getCWD to get the relative current working directory and pass a string to the new
+	TwoInputDialog constructor.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java (getCWD): New method
+	to get the relative CWD for an autotools action.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/TwoInputDialog.java (createDialogArea):
+	Use CLabel instead of Label for first label (the CWD).
+	(TwoInputDialog): Change to accept a String for the first message instead of an IPath.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (addMakeTargetsToManager):
+	Temporarily disable.
+
+2008-10-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java (getIncludePaths): Fix bug that
+	was properly resolving relative paths.  Also add support for parsing -isystem specifiers and putting
+	the paths on the include path list.
+
+2008-09-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Change Eclipse-AutoStart over to Bundle-ActivationPolicy.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/LibHover.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/LibHoverMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/LibHoverMessages.properties: Removed.
+	* plugin.xml: Remove CHelpProvider library hover extension as this functionality
+	has been moved into its own plugin.
+
+2008-09-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileCodeScanner.java (createRules):
+	Specify Token.UNDEFINED for WordRules default token.  Otherwise, just getting the first possible
+	character of a word detector will result in default token being returned and no further parsing.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfCodeScanner.java (AutoconfCodeScanner):
+	Ditto.
+
+2008-09-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfoProvider.java (getScannerInformation):
+	Return null if project is not an Autotools project.
+	(unsubscribe): Check scanner info for null before accessing.
+
+2008-09-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Refactored from com.redhat.eclipse.cdt.autotools to org.eclipse.linuxtools.cdt.autotools
+
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/AutoconfTextHover.java:
+	(AUTOCONF_MACROS_DOC_NAME): Change to use default URL pointing to sourceware.org.
+	(AUTOMAKE_MACROS_DOC_NAME): Ditto.
+	(getHoverDoc): Remove unused variable.
+	(getAMDoc): Modify to handle either a file or URL.
+	(getACDoc): Ditto.
+	(.createInformationControl): Switch to use non-deprecated constructor.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/LibHover.java (getLibHoverDocs): Modify to handle
+	either an external file name or URL.
+	(getLibHoverDocName): New method that returns default URL pointing to sourceware.org.
+	(HelpResource.getHref): Change to return URL.
+	(getFunctionInfo): Remove unread variable.
+
+2008-09-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder(hasTargetBuilder): Change logic
+	to look for ProjectType id rather than looking at builder id of configuration since ManagedProject
+	might have had configuration removed.  Resolves #461647.
+	* plugin.xml: Fix typo in referenced nature of autoolsNature.  Resolves #461201.
+
+2008-08-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Update version number to 1.0.0 and specify minimum/maximum versions
+	for all dependencies now that CDT 5.0 and Eclipse 3.4 must be used.
+
+2008-07-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* icons/ac16/acmacro_arg_obj.gif: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsEditorPropertyPage.java:
+	(getproject): Remove.
+	* META-INF/MANIFEST.MF: Add org.eclipse.core.filesystem as dependency.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java: Update imports.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java (getImage):
+	Use special image for acmacro argument.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java:
+	Update imports.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/AutotoolsPluginImages.java: Add image for
+	acmacro argument.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java: Update imports.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java (reconcile):
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java: Update imports.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileReconcilingStrategy.java (reconcile):
+	Call new form of parse method.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Directive.java:
+	(getMakefile): New required method.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUAutomakefile.java:
+	(parse): New required method.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/AbstractMakefile.java:
+	(getFileURI): New required method.
+	(getMakefile): Ditto.
+	(setFileURI): Ditto.
+	(getMakefileReaderProvider): Ditto.
+	(parse): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/OpenDeclarationAction.java:
+	(openInEditor): Use URI instead of File.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/NullMakefile.java:
+	(parse): New required method to implement.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileDocumentProvider.java (createMakefile):
+	Add throws modifier.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroCodeScanner.java: Update imports.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java: Ditto.
+
+2008-07-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump release to 0.9.7.
+
+2008-04-17 14:12  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/:
+	  internal/ui/editors/autoconf/ProjectionFileUpdater.java,
+	  ui/editors/AutoconfCodeScanner.java,
+	  ui/editors/AutoconfPKGWordDetector.java,
+	  ui/editors/outline/AutoconfLabelProvider.java: Collapse and
+	  decorate long macro arguments, and notice PKG_ macros
+
+2008-04-17 13:13  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/:
+	  internal/ui/editors/autoconf/ProjectionFileUpdater.java,
+	  ui/editors/AutoconfEditorMacroValidator.java,
+	  ui/editors/parser/AutoconfElement.java,
+	  ui/editors/parser/AutoconfParser.java: Fix editor collapsing and
+	  remove line number metadata from AutoconfElement, since the "end
+	  line" is only meaningful in the context of the client.
+
+2008-04-17 10:43  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/:
+	  AutoconfEditorMessages.properties,
+	  outline/AutoconfContentOutlinePage.java,
+	  parser/AutoconfCaseConditionElement.java,
+	  parser/AutoconfCaseElement.java, parser/AutoconfElement.java,
+	  parser/AutoconfElifElement.java, parser/AutoconfElseElement.java,
+	  parser/AutoconfForElement.java, parser/AutoconfIfElement.java,
+	  parser/AutoconfMacroDetector.java,
+	  parser/AutoconfMacroElement.java,
+	  parser/AutoconfOutlineErrorHandler.java,
+	  parser/AutoconfParser.java, parser/AutoconfRootElement.java,
+	  parser/AutoconfTokenizer.java, parser/AutoconfWhileElement.java,
+	  parser/OldAutoconfParser.java, parser/Token.java: More autoconf
+	  parser work.	Remove old parser and standardize AST node
+	  constructors.  Add more tests and fix some bugs.
+
+2008-04-10 15:40  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/:
+	  internal/ui/editors/autoconf/ProjectionFileUpdater.java,
+	  ui/editors/AutoconfEditor.java,
+	  ui/editors/AutoconfEditorMacroValidator.java,
+	  ui/editors/AutoconfEditorMessages.properties,
+	  ui/editors/AutoconfErrorHandler.java,
+	  ui/editors/AutoconfReconcilingStrategy.java,
+	  ui/editors/outline/AutoconfLabelProvider.java,
+	  ui/editors/parser/AutoconfElement.java,
+	  ui/editors/parser/AutoconfMacroArgumentElement.java,
+	  ui/editors/parser/AutoconfMacroElement.java,
+	  ui/editors/parser/AutoconfParser.java,
+	  ui/editors/parser/AutoconfParser2.java,
+	  ui/editors/parser/AutoconfSelectElement.java,
+	  ui/editors/parser/AutoconfTokenizer.java,
+	  ui/editors/parser/AutoconfUntilElement.java,
+	  ui/editors/parser/AutoconfWhileElement.java,
+	  ui/editors/parser/ITokenConstants.java,
+	  ui/editors/parser/OldAutoconfParser.java,
+	  ui/editors/parser/ParseException.java: More autoconf parser work.
+
+2008-04-09 14:38  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/:
+	  AutoconfEditorMacroValidator.java,
+	  AutoconfEditorMessages.properties, AutoconfErrorHandler.java,
+	  parser/AutoconfCaseConditionElement.java,
+	  parser/AutoconfElement.java,
+	  parser/AutoconfMacroArgumentElement.java,
+	  parser/AutoconfMacroDetector.java, parser/AutoconfParser.java,
+	  parser/AutoconfParser2.java, parser/AutoconfTokenizer.java,
+	  parser/IAutoconfErrorHandler.java,
+	  parser/IAutoconfMacroDetector.java, parser/IMacroDetector.java,
+	  parser/ITokenConstants.java, parser/Token.java: New autoconf
+	  parser work in progress
+
+2008-04-07 14:06  Ed Swartz <ed.swartz@nokia.com>
+
+	* META-INF/MANIFEST.MF,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMacroValidator.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfErrorHandler.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroPartitionRule.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroWordDetector.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfReconcilingStrategy.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/ParseException.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElement.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfMacroArgumentElement.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/IAutoconfErrorHandler.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/IAutoconfMacroValidator.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/ParseException.java:
+	  Initial checkpoint for autotools parser changes
+
+
+2008-01-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/AclocalHandler.java: New file for
+	future menu support.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsProjectNature.java: New file.
+	* META-INF/MANIFEST.MF: Release updated.
+	* plugin.properties: Add some new messages for autotools tool invocation.
+	* plugin.xml: Update release to 0.9.6.  Add autotools project nature.  Make
+	autotools commands enablement dependent on autotools project nature.
+	Specify enablesFor 1 for all autotools tool actions.
+	* src/com/redhat/eclipse/cdt/autotools/actions/AbstractTargetAction.java (setSelectedContainer): New
+	method for future menu support.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java (hasTargetBuilder): Use
+	AutotoolsProjectNature static addAutotoolsBuilder method.
+	(addAutotoolsBuilder): Moved to AutotoolsProjectNature.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (runScript): New method to
+	run scripts.
+	(regenerateMakefiles): Use runScript method to run configuration scripts. Use
+	runCommand for executables like "make".
+	(runCommand): Added comments.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject):
+	Add new autotools project nature.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsCCProjectWizard.java (addNature):
+	Ditto plus set up autotools builder.
+	(doRun): Don't set up autotools builder since it is done in addNature.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsCProjectWizard.java (addNature):
+	Add new autotools project nature and set up autotools builder.
+	(doRun): Don't set up autotools builder since it is done in addNature.
+
+2007-12-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Update release to 0.9.5.3.
+
+2007-12-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #412651, #412661
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (getConfigurePath): Fetch tool command
+	name instead of hard-wiring to "configure".
+	(autogenExists): Fetch command name from autogen.sh options.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java: (removeBuildDir): New method.
+	(clean): If user has specified remove build directory, then use removeBuildDir method.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: New messages for supporting
+	build directory removal operation.
+
+2007-11-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHoverMessages.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHoverMessages.properties: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java: Add references to
+	LibHoverMessages instead of hard-coded strings.
+	* libhoverdocs/glibc-2.7-2.xml: Regenerated.
+
+2007-11-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java
+	(HelpResource.getHref): Use latest glibc doc version.
+	(getLibHoverDocs): Ditto.
+	* libhoverdocs/glibc-2.7-2.xml: New C library docs based on glibc-2.7-2 manual.
+	* libhoverdocs/glibc.xml: Old glibc docs removed.
+
+2007-11-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Update release to 0.9.5.2.  Also clear all OS lists for build definitions to
+	default to "all" OSes.
+
+2007-11-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #385991
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java (getMatchingFunctions): New method.
+	(FunctionSummary.compareTo): New method to support Comparable interface.
+	(FunctionSummary.getIncludes): Fix to avoid type cast exception/
+	(getFunctionInfo): Revised to call getFunctionSummaryFromNode method.
+	(FunctionSummary): Add Comparable interface.
+	(getFunctionSummaryFromNode): New method.
+	(FunctionSummary.FunctionPrototypeSummary.getPrototypeString): Add NLS
+	comments.
+
+
+2007-11-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsToolsPropertyPage.java: New File for
+	setting tool paths for the various autotools.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAclocalAction.java (run): Use the
+	project properties setting to determine what tools to use.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutoconfAction.java (run): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutomakeAction.java (run): Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties: New
+	messages.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyConstants.java: Add new
+	constants for setting the tool paths for aclocal, automake, and autoconf.
+	* plugin.xml: Add tools settings property page for Autotools.
+	* plugin.properties: New message for added property page.
+
+2007-10-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #359311, #359301, #359321
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacro.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyManager.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/IProjectPropertyListener.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsProjectPropertyTester.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/IPropertyChangeManager.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java:
+	(getAMDoc): New method.
+	(fBindingService):
+	(getAutomakeMacrosDocName): Modified to take a version parameter.
+	(getAutoconfMacrosDocName): Ditto.
+	(getPrototype): Changed to take an editor input.
+	(getAutoconfMacrosDocName): Ditto.
+	(AutotoolsHoverDoc): New internal class.
+	(getMacroList): New method to merge AC and AM macros together based on version
+	properties.
+	(getACDoc): New method.
+	(getIndexedInfo): Changed to take editor input.
+	(getHoverDoc): New metohd.
+	(getIndexedInfoFromDocument): New method that will parse the given document.
+	(getDefaultAutoconfMacrosDocName): New method to get the default preference
+	Autoconf macros doc name.
+	(getHoverRegion): Modified to get editor from elsewhere.
+	(getDefaultAutomakeMacrosDocName): New method to get the default preference
+	Autoconf AM macros doc name.
+	(getHoverInfo): Changed to take an editor input.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroParser.java: Removed.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/editors/autoconf/ProjectionFileUpdater.java (initialize):
+	(processReconcile): Use stored editor.
+	(install): Change input parameter to AutoconfEditor.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java (parseMacro):
+	(parse): Modified to take IEditorInput argument and pass that on to AutoconfErrorHandler.
+	(AutoconfParser): Modified to take an editor parameter.
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsDefaultBuildDirHandler.java: Updated
+	copyright to just Red Hat Inc.
+	* plugin.properties: New messages.
+	* plugin.xml: Add ICPropertyTab extension for editor properties.  Add properties
+	page for Autotools properties.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsEditorPropertyPage.java: New file.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyPage.java: Rewritten.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java:
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyConstants.java:
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfErrorHandler.java (AutoconfErrorHandler):
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java
+	(AutoconfSourceViewerConfiguration): Take editor as parameter.
+	(getPresentationReconciler): Pass along or use editor passed in.
+	(getContentAssistant): Ditto.
+	(getReconciler): Ditto.
+	(getTextHover): Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java (connect):
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java:
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java (computeCompletionProposals):
+	(AutoconfMacroContentAssistProcessor): Take editor input.
+	(computeMacroStart): Use editor.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfReconcilingStrategy.java (reconcile):
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java: Make this implement
+	IProjectPropertyListener
+	(handlePreferenceStoreChanged): Modified to call handleVersionChange method if a
+	autoconf or automake macro version preference change has occurred.
+	(doSetInput): Deregister editor as property listener if editor was for a project
+	file previously and register editor as property listener if editor is now for a
+	project.
+	(getAutoconfDocumentProvider): Make static.
+	(getAutoconfCodeScanner): Pass this to constructor.
+	(handleVersionChange): New method.
+	(handleProjectPropertyChanged): New IProjectPropertyListener method.
+	(initializeEditor): Pass this to source viewer configuration constructor.
+	(getAutoconfParser): Pass this to constructor.
+	(dispose): Deregister editor as property listener for a project if applicable.
+	(getAutoconfMacroCodeScanner): Pass this to constructor.
+
+2007-10-23  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroCodeScanner.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/RestrictedEndOfLineRule.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitionScanner.java (AutoconfPartitionScanner):
+	Move macro partitioning ahead of comments.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java (getPresentationReconciler):
+	Use AutoconfMacroCodeScanner for macro damager repairer.
+	(getContentAssistant): Use AutoconfMacroCodeScanner for macro content assist.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java (nextToken):
+	New method that simply defaults to super.nextToken to be used for debugging purposes.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java (getAutoconfMacroCodeScanner):
+
+	* plugin.xml: Update to release 0.9.5.1.
+
+2007-10-23  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #330701
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java: New File to
+	add property settings for how to clean an Autotools project and whether or not to use the
+	current Autotools info scanner.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyMessages.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyConstants.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java (parseLines):
+	Process macros ahead of stripping out comments as this prevents removing quotes inside the
+	macro which have precedence over # (e.g. used to specify #include and not meaning a
+	comment to end of line).
+	(parseWhile): Change comment typo.
+	(parseFor): Ditto.
+	* plugin.properties: Add new messages regarding property pages.
+	* plugin.xml: Add Autotools build IcPropertyTab (AutotoolsBuildPropertyPage).  Also
+	specify that AutotoolsDefaultBuildDirHandler is also an option applicability tester.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.properties:
+	Change the message for autoconf and automake versions to include the word "Default".
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitioner.java (computePartitioning):
+	Add override method as way to print out partitions.  Cannot compute and print out partitions at
+	connect time as in 4.0.1 we initially are given an empty document that is later filled.
+	(printPartitions): Change argument to be an array of partition regions.
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java (build):
+	(clean): New method.  Pay attention to user clean method preference.
+	(getTargets): Pay attention to user clean target preference.
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java (getCompilationString):
+	Pay attention to user preference on scanner info retrieval and disable if need be.
+	(createIncludeChain): Use AutotoolsPropertyConstants to get property names to use.
+	(followIncludeChain): Ditto.
+	(getMakefile): Add nls comments.
+	(AutotoolsScannerInfo): Ditto.
+	(getDefinedSymbols): Ditto.
+	(buildFile): Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (regenerateMakefiles): Don't
+	call AutotoolsScannerInfoProvider.setDirty method anymore.  Instead, set a project property
+	to indicate the scanner info is dirty.
+	(addMakeTargetsToManager): Add a try/catch statement to prevent duplicate entries from
+	stopping loop that adds make targets.
+	(initializeBuildConfigDirs): Formatting change.
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfoProvider.java (getScannerInformation):
+	Add a check for project property indicating the scanner info is dirty in which case call
+	setDirty method.
+	(setDirty): Make private.
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsDefaultBuildDirHandler.java: Now implements
+	IOptionApplicability.
+	(isOptionEnabled): New interface method to implement.
+	(isOptionVisible): Ditto.
+	(isOptionUsedInCommandLine): Ditto (set to false).
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsBuilder.java (getProject): New method.
+	(AutotoolsBuilder): Add project argument.
+	(getCleanBuildTarget): Implemented using new Autotools CLEAN_MAKE_TARGET property.
+
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new message.
+
+2007-10-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #323641
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java (getDefinedSymbols): Use
+	the patch provided by Jose Fonseca to provide a proper regular expression for parsing
+	the defined symbols from the make output.
+
+2007-10-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Ensure the ids for InvokeAutoconf and InvokeAutomake actions are unique.
+
+2007-10-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsDefaultBuildDirHandler.java (handleValue):
+	Add some place holders for supporting the user manually setting the build directory.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add some dialog messages for
+	future usage.
+	* plugin.xml: Update version to 0.9.5.
+
+2007-10-02  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #315811
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsDefaultBuildDirHandler.java: New File.
+	* plugin.xml: Change build definition to version 4.0.0.  Remove unused project converter
+	extension.  For build directory, specify an option handler which is implemented by
+	AutotoolsDefaultBuildDirHandler.
+
+2007-09-24  Andrew Overholt  <overholt@redhat.com>
+
+	* plugin.xml: Update version to 0.9.4.
+
+2007-09-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutoconfAction.java (run):
+	Fix array indexing.
+
+2007-09-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Add ELF and GNU_ELF binary parsers as default for an Autotools project.
+
+2007-09-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #274551
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java (getCompilationString): Support
+	the case where the file isn't part of the build and there is no scanner info to gather.
+	(buildFile): Minor cosmetic changes.
+
+	* META-INF/MANIFEST.MF: Update release.
+
+2007-09-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (regenerateMakefiles): Add a
+	clause to check for the case whereby there was no way to generate the Makefile and one
+	didn't already exist.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties (Makegenerator.didnt.generate):
+	New message.
+
+2007-08-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #254248
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java (selectionChanged):
+	Make call to editor.selectAndReveal method to focus editor page on selected outline item.
+
+2007-08-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #254246
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/CWordFinder.java (findWord): Fix
+	to handle being in the first word of the file.
+
+2007-08-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #253331
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java (build): Enable
+	autobuilding.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (regenerateMakefiles):  If
+	the configuration options change, clean the previous build directory so a full rebuild
+	will occur.
+
+2007-08-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Change release to 0.9.2 and specify minimum java runtime as
+	1.4.
+
+2007-08-15 Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #251412
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java (addAutotoolsBuilder):
+	When calling IProject.setDescription(), pass a NullProgressMonitor instead of
+	null, despite what the function API says because an isCancelled() call may occur
+	and will result in an exception thrown.  Also, use a try/catch block to handle any
+	of the legitimate exceptions that might occur in this operation.
+
+2007-08-15 Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new messages
+	for new C and C++ project wizards.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectWizard.java: Renamed...
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsCProjectWizard.java: ..to this.
+	(doRun): Rewritten based on conversion wizard to properly set up project.
+	(getProjectType): New method.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsCCProjectWizard.java:  New file
+	copied from NewAutotoolsCProjectWizard but inherits from NewCCProjectWizard.
+
+	* icons/dlcl16/newc_app.gif: New gif.
+	* icons/dlcl16/newcc_app.gif: Ditto.
+	* icons/elcl16/newc_app.gif: Ditto.
+	* icons/elcl16/newcc_app.gif: Ditto.
+
+	* plugin.properties: Add new strings for new C and C++ project wizards.
+	* plugin.xml: Add new C and C++ project wizards.
+
+2007-08-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #251604
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (getAutogenArgs): New method.
+	(regenerateMakefiles): Pass user-specified autogen.sh options when invoking autogen.sh.
+	* plugin.xml: Add autogen.sh tool support with user options.
+	* plugin.properties: Add new autogen tool message strings.
+
+2007-07-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java
+	(handlePreferenceStoreChanged): Add support for changing automake macros version.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java
+	(getAutomakeMacrosDocument):
+	New method.
+	(getIndexInfo, getPrototype): Create private versions of these that take a document
+	as an input parameter.  Change the public static methods to call the private
+	versions with the autoconf macro document and the automake macro document, if
+	the macro isn't found yet.
+	(init): Set up the autoconf macro document and automake macro document.
+	(reinit): Reset both the autoconf and automake macro documents.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java
+	(LATEST_VERSION): Replace with LATEST_AC_VERSION and LATEST_AM_VERSION.
+	(createOverlayStore): Add automake version setting.
+	(initializeVersion): Replace with initializeACVersion and initializeAMVersion.
+	(initialize): Call the two replacements of initializeVersion.
+	(createVersionTabContent): Add automake version support.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsEditorPreferenceConstants.java
+	Add automake version support.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.properties:
+	Add messages used in automake version preference.
+
+	* libhoverdocs/ammacros-1.4-p6.xml: New automake macro docs for 1.4-p6.
+	* libhoverdocs/ammacros-1.9.5.xml: New automake macro docs for 1.9.5.
+	* libhoverdocs/ammacros-1.9.6.xml: New automake macro docs for 1.9.6.
+
+2007-07-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* MANIFEST.MF: Bump up release to 0.9.1.
+
+2007-07-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUAutomakefile.java
+	(parse): Fix Automake if/else constructs to be child/parent directives as appropriate.
+	(bypassIf, bypassElse, isTrue): Removed.
+	(parseIf): Add rules parameter.
+	(addDirective): Remove caveat when dealing with automake if/else.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IAutomakeConditional.java
+	(getRules, setRules): New methods for the interface.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Else.java: Add ICommand
+	interface and implement required methods including new ones add to IAutomakeConditional.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/If.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeErrorHandler.java
+	(update): Change to call checkChildren for makefile.
+	(checkChildren): New recursive method to check for bad directives.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java
+	(AutomakefileLabelProvider.getImage): Add support for IAutomakeConditional elements and
+	remove reference to AutomakeIfElse class.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeMacroDefinitionRule.java
+	(isValidCharacter): Add support for "+-$()@" chars.
+
+2007-07-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUAutomakefile.java
+	(parseIf): Add @if support.
+	(isTrue): Default to true for if conditions.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUMakefileConstants.java:
+	Add @if and @endif macros.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUMakefileUtil.java
+	(isIf): Add @if support.
+	(isEndif): Add @endif support.
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java:
+	Add support for @if and @endif keywords.
+	(createRules): Add support for whitespace and simple identifiers.
+
+2007-07-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #247518
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java
+	(createRules): Use new AutoconfSubstRule class for identifying autoconf substituitions.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileUtil.java (isConfigMacro):
+	Refine so that macro must start and end with @ and contain at least one valid char.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutoconfSubstRule.java: New file.
+
+2007-07-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #246153
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java (createFileInfo):
+	Rewrite to handle workspace files as well as external ones.
+	(createMakefile): Change to accept a file name rather than an IFile.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor
+	(getDefault): New method.
+	(doSetInput): Ditto.
+	(initializeEditor): Add a few lines that would have been performed by
+	base class initializeEditor.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeErrorHandler
+	(AutomakeMarker): New internal class for error marking.
+	(update): Switch to using internal markers and directly updating the
+	Annotation model.
+	(removeExistingMarkers): Directly reference the annotation model.
+	(AutomakeErrorHandler): Fetch and store the annotation model for the input.
+	Change prototype.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java
+	(AutomakefileReconcilingStrategy): Change to store an IEditorInput.  Use new
+	AutomakeErrorHandler interface.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileEditor.java
+	(initializeEditor): Remove fixme comment.
+
+2007-07-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #246783
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java:
+	(initializeEditor): Call AutotoolsEditorPreferenceConstants.initializeDefaultValues
+	to ensure the editor default values are set.
+
+2007-06-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #246154
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsBuilder.java: New proxy
+	class to wrap an existing IBuilder and override build path functionality.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java:
+	(build): Wrap the builder using the new AutotoolsBuilder class so the
+	build path will work properly.
+
+2007-06-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #246134
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfErrorHandler.java:
+	(AutoconfErrorHandler): Change constructor to just take IDocument input.
+	(AutoconfMarker): New private class for marking autoconf document.
+	(createMarker): New private method to create AutoconfMarker in document.
+	(handleError): Create a marker and add it to annotation model durectly
+	instead of using MarkerUtilities.
+	(removeAllMarkers): Remove directly from annotation model instead of using file.
+	(removeExistingMarkers): Ditto.
+	(getDocument): New method.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java:
+	(connect): Change constructor call to AutoconfErrorHandler.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java:
+	(getViewer): New method to return the source viewer for the editor.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroParser.java:
+	(AutoconfMacroParser): Change constructor call to AutoconfErrorHandler.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java:
+	Change all uses of AutoconfOutlineErrorHandler to AutoconfErrorHandler.
+
+2007-06-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #245820
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileUtil.java (isAutomakeCommand):
+	New method.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Conditional.java (isIf): New
+	method.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IAutomakeConditional.java:
+	New interface.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Else.java: Changed to
+	implement new IAutomakeConditional interface.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/If.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUAutomakefile.java
+	(parse): Add Automake if/else parsing and support for Makefile.in processed if/else blocks.
+	(bypassIf, bypassElse, parseIf): New private methods.
+	(addDirective): Don't add directives to an Automake if or else construct.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUMakefileConstants.java:
+	Add CONDITIONAL_IF constant.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUMakefileUtil.java
+	(isIf): New method.
+
+2007-06-25  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileEditorTogglePresentationAction.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileEditorActionContributor.java: Ditto.
+
+	* icons/etool16/alphab_sort_co.gif: New icon.
+	* icons/etool16/build_menu.gif: Ditto.
+	* icons/etool16/convert_normal.gif: Ditto.
+	* icons/etool16/make.gif: Ditto.
+	* icons/etool16/makefile.gif: Ditto.
+	* icons/etool16/newc_app.gif: Ditto.
+	* icons/etool16/newcc_app.gif: Ditto.
+	* icons/etool16/segment_edit.gif: Ditto.
+	* icons/etool16/target_add.gif: Ditto.
+	* icons/etool16/target_build.gif: Ditto.
+	* icons/etool16/target_delete.gif: Ditto.
+	* icons/etool16/target_edit.gif: Ditto.
+	* icons/etool16/target_filter.gif: Ditto.
+	* icons/etool16/update_old.gif: Ditto.
+
+	* plugin.xml: Change Automake editor to use new internal MakefileEditorActionContributor
+	class rather than point to the internal one in internal CDT make.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentSetupParticipant.java:
+	(setup): Don't bother registering this as document listener.
+	(documentAboutToBeChanged): Remove body of method as this is no longer needed.
+
+2007-06-25  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #245611
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java
+	(getMacroList): Change to call AutoconfTextHover to get the name of the macros
+	document since it will depend on current preferences.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java
+	(getAutoconfMacrosDocName): New static method.
+
+2007-06-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* libhoverdocs/acmacros-2.59.xml: New autoconf hover text and syntax info
+	for autoconf 2.59.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java:
+	Add 2.59 support.
+
+2007-06-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* libhoverdocs/acmacros-2.13.xml: New autoconf hover text and syntax info
+	for autoconf 2.13.
+	* libhoverdocs/acmacros-2.61.xml: New autoconf hover text and syntax info
+	for autoconf 2.61.
+	* libhoverdocs/acmacros.xml: Replaced with files above.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover (init): Change document
+	to be dependent on autoconf version preference.
+	(reinit): New method to force reinitialization of help document.
+	(getPrototype): Fix to allow for earlier versions which specify multiple
+	prototypes in one using "[,", for example.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java:
+	Add version preference support.
+	(createOverlayStore): Add version support.
+	(createContents): Add version tab.
+	(initializeVersion): New method.
+	(createVersionTabContents): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsEditorPreferenceConstants.java:
+	Add AUTOCONF_VERSION and initialize the default autoconf version value to be the
+	highest possible.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.properties:
+	Add new messages pertaining to autoconf version.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java (handlePreferenceStoreChanged):
+	If the autoconf version is changed, invalidate the document and force a reparse.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.java (getFormattedString):
+	Add new method which takes 3 replacement strings.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.properties:
+	Change macro error messages to take the autoconf version as a parameter.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java: Fix
+	typo for too many args message id.
+	(parseMacro): For wrong number of argument messages, get the current autoconf version preference
+	and pass it in to the message.
+
+2007-06-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java: Rebase on
+	GNUAutomakefile class.  Remove all parsing methods.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java: Fix
+	comments to refer to internal Autotools classes as appropriate.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Conditional.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/DefineVariable.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/DeleteOnErrorRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Else.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Endef.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Endif.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ExportAllVariablesRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ExternalEditorInput.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUAutomakefile.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUTargetRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUVariableDef.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Ifdef.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Ifeq.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Ifndef.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Ifneq.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Include.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IntermediateRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/LowResolutionTimeRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/NotParallelRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/OverrideDefine.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/OverrideVariable.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/PhonyRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/SecondaryRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/StaticTargetRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/TargetVariable.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Terminal.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/UnExport.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/VPath.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/ExternalEditorInput.java: Update comments
+	that should refer to internal Autotools classes.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/MakefileDocumentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/ProjectionMakefileUpdater.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/WorkingCopyManager.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/editors/autoconf/ProjectionFileUpdater.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferencePage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Ditto.
+
+2007-06-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #243184
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeConfigMacro.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java (parse): Add
+	support for autoconf macros.
+	(parseConfigMacro): New method.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java
+	(createRules): Add rule for configure macros.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java
+	(getImage): Add support for AutomakeConfigMacro.
+	(getText): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileUtil.java (isConfigMacro):
+	New method.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeUIImages.java: Add acmacro_obj image.
+	* icons/obj16/acmacro_obj.gif: New icon.
+
+2007-06-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java: Removed.  No
+	longer used now that MakeTargets work.
+	* src/com/redhat/eclipse/cdt/autotools/actions/CheckboxTablePart.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeContentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeTargetDialog.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/SharedPart.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/SharedPartWithButtons.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/StructuredViewerPart.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/TargetListViewerPart.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/editors/autoconf/ProjectionFileUpdater.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsEditorPreferenceConstants.java:
+	Add new constants for Autoconf editor folding.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/IAutotoolsEditor.java: New interface.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java: Make class
+	implement IAutotoolsEditor interface.  This allows ProjectionFileUpdater class to
+	work.  Add folding support based on MakefileEditor class.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElement.java
+	(getStartOffset, setStartOffset, getEndLineNumber, setEndLineNumber): New methods.
+	(getEndOffset, setEndOffset, getLastChild): Ditto.
+	(AutoconfElement): New constructor which takes start offset.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfCaseElement.java:
+	Add new constructor to match that of AutoconfElement.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElifElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElseElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfForElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfIfElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfWhileElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java:
+	(AutoconfLineReader): New internal class to replace LineNumberReader class.  Change
+	all internal parse routines to use this class instead of LineNumberReader.
+	(parseLines): When a semicolon is found that denotes a multistatement line, update the end
+	offset of the previous construct and set the start offset for the next construct to be after
+	the semicolon and additional whitespace.
+	(parseMacro, parseIf, parseElif, parseElse, parseCase, parseFor, parseWhile): Construct with
+	start offset based on previous mark.  After processing, set the end line number for the
+	element.
+
+2007-06-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java:
+	Refactor AutomakeEditorPreferenceConstants to AutotoolsEditorPreferenceConstants.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ColorManager.java:  Moved from here to..
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/ColorManager.java: ...here
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditorFactory.java:
+	Changed due to movement of ColorManager class.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/AbstractMakefileCodeScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileCodeScanner.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileSourceConfiguration.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AbstractAutomakeEditorPreferencePaga.java:
+	Refactored to be...
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AbstractEditorPreferencePage.java:
+	...this.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferenceConstants.java:
+	Refactored to be...
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsEditorPreferenceConstants.java:
+	...this.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakePreferencesMessages.java:
+	Refactored to be...
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.java:
+	...this.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakePreferencesMessages.properties:
+	Refactored to be...
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.properties:
+	...this.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferencePage.java:
+	Use new refactored classes.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java:  Add color preference
+	support.
+	(AutoconfCodeScanner): A color provider is no longer needed as input.
+	(getToken, getTokenProperties, addToken, indexOf, affectsBehavior): New methods.
+	(adaptToPreferenceChange, adaptToColorChange, adaptToStyleChange); Ditto.
+	(createTextAttribute, initialize): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfColorProvider.java: Removed and replaced
+	with ColorManager.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java: Change to use
+	ColorManager.
+	(initializeEditor): Set the preference change store and initialize the editor preferences.
+	(getAutoconfCodeScanner): Changed to match new AutoconfCodeScanner constructor.
+	(getPreferenceColor): New method.
+	(getColorProvider): Removed.
+	(handlePreferenceStoreChanged): New method.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java:
+	Inherit from TextSourceViewerConfiguration.  Store the preference store.
+	* plugin.properties: Add new internationalized string for Autoconf editor preferences.
+	* plugin.xml: Add Autoconf editor preference page.
+
+2007-05-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #241908
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (addMakeTargetsToManager):
+	Change builder id used to one used in plugin.xml.
+
+2007-05-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #241782
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new message
+	for Autotools preference page.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java
+	(initializeEditor): Initialize color and folding preference defaults.
+	(handlePreferenceStoreChanges): Call super method to refresh editor.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ColorManager.java:
+	Change constants to be in Autotools domain.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AbstractAutomakeEditorPreferencePage.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferenceConstants.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferencePage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakePreferencesMessages.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakePreferencesMessages.properties:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsPreferencePage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/ColorEditor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/OverlayPreferenceStore.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/StatusInfo.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/TabFolderLayout.java: Ditto.
+
+	* plugin.properties: Add new internationalized strings from plugin.xml.
+	* plugin.xml: Add Autotools and Automake Editor preference pages.  Also
+	clean up some extensions to use internationalized strings.
+
+2007-05-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #241612
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java:
+	Add utility methods from MakeUIPlugin to log messages and
+	issue error dialogs, etc..
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeTargetDialog.java:
+	Use MakeUIMessages instead of MakeUIPlugin for messages.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeCompletionProcessor.java:
+	Replace internal CDT classes with internal Autotools classes.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java:  Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditorFactory.java:
+	Ditto.
+	(getPreferenceColor): New method.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeErrorHandler.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java:	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeIfElse.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeMacroDefinitionRule.java:
+	Ditto.
+	(evaluate): Remove unused local variable ch.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeTextHover.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/AbstractElementListSelectionDialog.java:
+	New file transported from CDT internals.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/AbstractMakefile.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/AbstractMakefileCodeScanner.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/AddBuildTargetAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ArchiveTarget.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/BadDirective.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ColorManager.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Command.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Comment.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/CompletionProposalComparator.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/DefaultRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Directive.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/EditorUtility.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ElementListSelectionDialog.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/EmptyLine.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ExternalEditorInput.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ExternalEditorInputFactory: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUMakefileConstants.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IgnoreRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IMakefileDocumentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IMakefileEditorActionDefinitionIds.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/InferenceRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IReconcilingParticipant.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ISelectionValidator.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ITranslationUnitEditorInput.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/LexicalSortingAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MacroDefinition.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MacroDefinitionRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MacroReferenceRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileAnnotationHover.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileCodeScanner.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileCompletionProcessor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileConstants.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileContentOutlinePage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileDocumentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileDocumentSetupParticipant.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileEditor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileEditorPreferenceConstants.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileMessages.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefilePartitionScanner.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileReader.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileReconcilingStrategy.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakeFileResources.properties: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileSourceConfiguration.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileStorageDocumentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileTextHover.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileWordDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MessageLine.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/NullMakefile.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/OpenDeclarationAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/OpenIncludeAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Parent.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/PosixMakefileUtil.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/PosixRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/PreciousRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ProjectionMakefileUpdater.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Rule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/SccsGetRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/SelectionList.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/SilentRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/SpecialRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/StatusInfo.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/StringMatcher.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/SuffixesRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Target.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/TargetRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/TwoArrayQuickSort.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Util.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/VariableDefinition.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/WordPartDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/WorkingCopyManager.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/AutotoolsPluginImages.java: Switch to
+	use new ac16 icon directory instead of etools16.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ErrorParserBlock.java: Use
+	MakeUIMessages instead of MakeUIPlugin for messages.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeUIImages.java: Use
+	AutotoolsPlugin for error dialogs.  Add new images.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeUIMessages.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeUIPlugin.java: Removed.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MessageLine.java: Fix typo.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/AutotoolsWizardMessages.java:
+	Fix bundle id for messages.
+
+	* plugin.xml: Fix icon references.
+
+	* icons/ac16: New folder containing icons that used to be in etool16.
+	* icons/dlcl16/build_configs.gif: New icon.
+	* icons/dlcl16/open_include.gif: Ditto.
+	* icons/elcl16/build_configs.gif: Ditto.
+	* icons/elcl16/open_include.gif: Ditto.
+	* icons/dtool16/alphab_sort_co.gif: Ditto.
+	* icons/dtool16/build_menu.gif: Ditto.
+	* icons/dtool16/convert-normal.gif: Ditto.
+	* icons/dtool16/make.gif: Ditto.
+	* icons/dtool16/makefile.gif: Ditto.
+	* icons/dtool16/newc_app.gif: Ditto.
+	* icons/dtool16/newcc_app.gif: Ditto.
+	* icons/dtool16/segment_edit.gif: Ditto.
+	* icons/dtool16/target_add.gif: Ditto.
+	* icons/dtool16/target_build.gif: Ditto.
+	* icons/dtool16/target_delete.gif: Ditto.
+	* icons/dtool16/target_edit.gif: Ditto.
+	* icons/dtool16/update_old.gif: Ditto.
+	* icons/etool16: Move autoconf editor icons to ac16 folder.
+	* icons/obj16/command_obj.gif: New icon.
+	* icons/obj16/define_obj.gif: Ditto.
+	* icons/obj16/environment_obj.gif: Ditto.
+	* icons/obj16/envvar_obj.gif: Ditto.
+	* icons/obj16/error_obj.gif: Ditto.
+	* icons/obj16/hfolder_obj.gif: Ditto.
+	* icons/obj16/include_obj.gif: Ditto.
+	* icons/obj16/irule_obj.gif: Ditto.
+	* icons/obj16/lib_obj.gif: Ditto.
+	* icons/obj16/macro_obj.gif: Ditto.
+	* icons/obj16/relation_obj.gif: Ditto.
+	* icons/obj16/target_obj.gif: Ditto.
+	* icons/obj16/trule_obj.gif: Ditto.
+
+2007-05-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java:
+	(addMakeTargetsToManager): Use MakeCorePlugin to get an IMakefile
+	rather than use the internal PosixMakefile class directly.
+
+2007-05-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java:
+	(initialize): Store the configuration for later usage.
+	(getConfigSettingsPath): Use stored configuration instead of fetching
+	it each time.
+	(runCommand): Ditto.
+	(addMakeTargetsToManager): Use the real MakeTargetManager to store
+	targets.  Mark targets added by parsing the Makefile with special
+	tag.  Delete all MakeTargets with special tag before adding the
+	new targets.
+	(initializeBuildConfigDirs): Use stored configuration to get the
+	tool options rather than the ManagedBuildInfo.
+	(getConfigArgs): Ditto.
+	(addMakeTargetsToManager):
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java:
+	Inherit from CommonBuilder.
+	(build): Change to fetch make target name from args map and store for
+	later use.
+	(getTargets): Change to get make target from stored make target name.
+
+	* plugin.xml: Remove Build Special Targets menu item as it is no longer
+	needed.  Add MakeTargetBuilder extension so we can use MakeTargets.
+
+2007-05-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #239886
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAclocalAction.java (run):
+	Pass the CWD to TwoInputDialog and use it when executing the command.  On
+	success, show a success dialog.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutoconfAction.java (run):
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/TwoInputDialog.java (TwoInputDialog):
+	Take the CWD as a parameter.
+	(createDialogArea): Add label with CWD.
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutomakeAction.java (run):
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeMessages.java (getString):
+	Add comments.
+	(getFormattedString): New method.
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAction.java (getExecDir):
+	New method to return the CWD.
+	(showSuccess): New method to display a success dialog.
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeMessages.properties: Add new
+	messages.
+
+2007-05-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #238173
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfIdentifierRule.java (evaluate):
+	Cast read character to char before invoking Character methods to avoid gcj bug.
+
+2007-04-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #238493
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/RecursiveSingleLineRule.java (evaluate):
+	Add check for scanner column < 0 which means we are already at EOF.
+
+2007-04-25  jjohnstn  <jjohnstn@toocool.toronto.redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectOptionPage.java (ManagedWizardOptionBlock.setupHelpContextIds):
+	Switch to use CDTHelpContextIds for static help context id.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/CProjectPlatformPage.java (createControl):
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/ManagedProjectOptionBlock.java (createContents):
+	Ditto.
+
+2007-04-25  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Bugzilla #182821
+
+	2007-04-25  Mikhail Sennikovsky
+	* plugin.xml: Add plugin extensions which let the CDT know that includes and
+	defined symbols are supported for the Autotools tool-chain.
+
+2007-04-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #236304
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (runCommand): Use the
+	job description as a message in the console.
+	(regenerateMakefiles): Fix autogen.sh logic to run configure after invoking
+	autogen.sh if config.status doesn't exist.  Make sure console is reused for
+	2nd step.  Change some of the status messages with new ones.
+	(autogenExists): Fix bug where path to autogen.sh wasn't being set on return.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new MakeGenerator messages.
+
+2007-04-11  jjohnstn  <jjohnstn@toocool.toronto.redhat.com>
+
+	Bugzilla #236077
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/CWordFinder.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java: Replace
+	CDT internal classes with Autotools internal classes.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/ManagedProjectOptionBlock.java (createContents):
+	Replace WorkbenchHelp reference with non-deprecated alternative.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakeTargetManager.java: Fix
+	imports.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (runCommand): Replace
+	deprecated environmental variable method being used.
+	(createFile): Make protected instead of private.
+	(getInvalidDirList): Remove.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject):
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java (getWorkingCopyManager):
+	Moved into AutomakeEditorFactory.
+	(getAutomakefileDocumentProvider): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditorFactory.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeCompletionProcessor.java:
+	Change all calls to getWorkingCopyManager and getAutomakefileDocumentProvider to use
+	new AutomakeEditorFactory class.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeCompletionProcessor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.java (getResourceBundle):
+	New method.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.properties: Add
+	new messages that were formerly fetched internally from CDT.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java: Comment out unused
+	projectSupport.
+	(createActions): Use AutoconfEditorMessages.
+	(InformationDispatchAction.makeAnnotationHoverFocusable): Ditto.
+	(fProjectionModelUpdater): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfAnnotationHover.java (formatMultipleMessages):
+	Use AutoconfEditorMessages instead of CUIMessages.
+	* src/com/redhat/eclipse/cdt/autotools/interenal/ui/ErrorParserBlock.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/CProjectPlatformPage.java (createControl): Remove
+	usage of WorkbenchHelp class which is deprecated.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectOptionPage.java (ManagedWizardOptionBlock.setupHelpContextIds):
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject):
+	Remove unused code.  Switch to use non-deprecated interface for getting
+	indexer.
+
+2007-04-10  jjohnstn  <jjohnstn@toocool.toronto.redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectWizard.java:
+	Removed.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectOptionPage.java:
+	Use new internal ManagedProjectOptionBlock class.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/CProjectPlatformPage.java:
+	Switch to use new AutotoolsWizardMessages internal class.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java:
+	Fix imports.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizard.java (doRunEpilogue):
+	Switch to new IRunnableWithProgress interface.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/AutotoolsWizardMessages.java:
+	New file to support old wizard code.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/AutotoolsWizardMessages.properties:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/ConfigurationContentProvider.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/ConfigurationLabelProvider.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/ManagedProjectOptionBlock:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/AutotoolsPluginImages.java:
+	Add build_configs.gif for Wizard support.
+	* src/com/redhat/eclipse/cdt/autotools/internal/MarkerGenerator.java (addMarker):
+	New method required by IMarkerGenerator interface.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (getProject):
+	New method.
+	(initializeBuildConfigDirs): Change the default build directory
+	for the configuration's builder.
+	Add support for CDT 4.0 M6.
+	* cdtpatches/*: Removed.
+	* icons/eclcl16: New icon directory.
+	* icons/eclcl16/build_configs.gif: New icon.
+	* plugin.properties: Add new strings used in plugin.xml.
+	* plugin.xml: Add buildType and buildArtefactType extensions.  Add
+	toolchain to Autotools project buildDefinitions extension.
+
+2007-04-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #235076
+	* src/com/redhat/eclipse/cdt/autotools/wizards/CProjectPlatformPage.java (CProjectPlatformPage):
+	Add missing NLS comment.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (makefileCvsExists): Use
+	getMakefileCVSPath method.
+	(configureExists): Use getConfigurePath method.
+	(getConfigurePath): New method.
+	(getMakefileCVSPath): New method.
+	(regenerateMakefiles): Use getConfigurePath and getMakefileCVSPath to get the
+	command to use when either of these is found to exist.
+	(autogenExists): Change to protected method.
+
+2007-03-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java (createPresentation):
+	Comment out macro parsing as this is now done by the reconciler and overall parsing.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java (getPrototype):
+	Fix so it is properly setting minimum and maximum parm counts for a macro.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfPrototype.java (setMaxParms):
+	Fix typo.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java (matchParentheses):
+	Update logic.
+	(parseMacro):  Add error checking for minimum and maximum parameters as well as unmatched
+	parentheses or square-brackets.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java (setParmCount):
+	New method.
+	(setQuoteDepth): Ditto.
+	(getParmCount): Ditto.
+	(getQuoteDepth): Ditto.
+	(setDepth): Ditto.
+	(getDepth): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.properties: Add
+	new error messages for parsing of macros.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage (update):
+	Use viewer refresh instead of redraw when updating.
+	(updateSelection): New method.
+
+2007-03-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/Makegenerator.java (regenerateMakefiles):
+	Refine algorithm so we don't cause a reconfigure if the configuration settings
+	file doesn't contain the project name.  If the configuration arguments are
+	unchanged and the settings file is the old style, rewrite with project
+	name.
+
+2007-03-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #230128
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (saveConfigArgs): Add
+	the project name as first argument saved.
+	(regenerateMakefiles): Read off first argument and verify that it matches the
+	current project name.
+
+2007-03-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #232965
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (runCommand):
+	Change prototype to accept a console and a boolean which when true
+	means to restart the console which may possibly clear the console.
+	(regenerateMakefiles): Change calls to runCommand.  For multiple
+	actions (e.g. autogen.sh then configure), opt for the 2nd, 3rd, etc...
+	calls to not clear the console.  Don't run config.status unless
+	the top-level Makefile is missing.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new
+	MakeGenerator.unsupportedConfig message.
+
+2007-03-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (regenerateMakefiles):
+	If configuration parameters have changed, mark all Scanner Info as dirty.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfoProvider.java (getCollectionName):
+	Make synchronized to avoid concurrent access of the infoCollection.
+	(getScannerInformation): Ditto.
+	(setDirty): New method.
+
+2007-03-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #230493
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java (getDefinedSymbols):
+	Recalculate each time if compilation string is null.
+	(getIncludePaths): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfoProvider.java (getScannerInformation):
+	Use a map of configurations to keep ScannerInfo seperate per configuration.  Use
+	current configuration to fetch scanner info.
+
+2007-02-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Bump up release to 0.0.8.1.
+
+2007-02-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzillas #230253, #205310.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakeTargetManager.java (addTargets):
+	New method to do mass add of MakeTargets for performance improvement.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java:
+	(addMakeTargetsToManager): Use new AutotoolsMakeTargetManager addTargets method.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectWizard.java (doRun):
+	Set indexer to NullIndexer before applying options.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject):
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizard.java:
+	Add new NULL_INDEXER_ID.
+	* src/com/redhat/eclipse/cdt/autotools/internal/MakeTargetManager.java: Expose
+	projectTargetMap to inheriting classes.
+
+2007-02-23  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 229891.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java (getMakeTargets):
+	Use Make Target info to find the real build target which may have been set by the
+	Build Special Targets action.
+	(build): Set up the IMakeBuildInfo needed to fetch Make Target from.
+
+2007-02-22  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeMessages.properties: Fix a few
+	typos.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentSetupParticipant.java (setup):
+	Use IDocumentExtension3 version of setDocumentParitioner if document is an instance of
+	IDocumentExtension3.
+
+2007-02-22  Andrew Overholt  <overholt@redhat.com>
+
+	* icons/automake.gif: New craptacular icon for automake editor.
+	* icons/autoconf.gif: Another manifestation of my poor artistic skills.
+	* plugin.xml: Use new icons.
+
+2007-02-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 229893.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Switch
+	to superclass TextFileDocumentProvider instead of FileDocumentProvider so as to fix
+	undo support.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentSetupParticipant.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.properties:  Fix typo.
+	* plugin.xml: Add extension for document setup that ties document setup for configuration
+	files to AutoconfDocumentSetupParticipant.
+
+2007-02-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java (findDelimeter): Ignore
+	escaped character.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitionScanner.java (AutoconfPartitionScanner):
+	Add escape character for # format comment and eat "\#" as character.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java (AutoconfCodeScanner):
+	Ditto.
+	* plugin.xml: Update release to 0.0.8.
+
+2007-02-20  Andrew Overholt  <overholt@redhat.com>
+
+	Patch from Jordy Potman
+	http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=229352
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java
+	(AutomakefileSourceConfiguration): Update super constructor call to reflect
+	change in CDT 3.1.2.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java
+	(initializeEditor): Likewise.
+
+2007-02-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElement.java: New class.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElifElement: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElseElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfIfElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfRootElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfWhileElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfCaseElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfForElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfCaseConditionElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java (AutoconfCodeScanner):
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java: New class to
+	do Autoconf file parsing and error marking.
+	Add AutoconfIdentifierRule and InlineDataRule.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java (createDocument):
+	Changed to use new AutoconfErrorHandler interface.
+	(documentAboutToBeChanged): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfErrorHandler.java (removeExistingMarkers):
+	Add verification that file exists.
+	(removeAllExistingMarkers): Ditto.
+	(handleError): Ditto.
+	(getCharOffset): Reformatted.
+	(AutoconfErrorHandler): Change constructor to take an IStorageEditorInput rather than
+	an IFile.  This allows external files to be edited without error handling.
+	* src/com/redhat/eclipse/cdt/autotools/editors/AutoconfEditorMessages.properties: New messages
+	added for outline parsing.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitionScanner.java (AutoconfPartitionScanner):
+	Use new AutoconfIdentifierRule.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java (getPresentationReconciler):
+	Change default partition to use MultilineRuleDamagerRepairer.
+	(getReconciler): New method.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java (createPresentation):
+	Change to use new AutoconfErrorHandler constructor.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroParser.java (AutoconfMacroParser): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java (doSetInput): New.
+	(getInputDocument): Ditto.
+	(getRootElement): Ditto.
+	(getAutoconfParser): Ditto.
+	(getAdapter): Ditto.
+	(InformationProvider): Ditto.
+	(getOutlinePage): Ditto.
+	(setRootElement): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfContentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfIdentifierRule.java: New class to
+	prevent matches of other strings that happen to be inside common identifiers.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/InlineDataRule.java: New class to
+	recognize inline data files.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/MultilineRuleDamagerRepairer.java: New class
+	to handle damage/repair when multiline rules are used.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfReconciliingStrategy.java: New class
+	for delayed document-change parsing.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/AutotoolsPluginImages.java: New class
+	to handle image repository.
+	* icons/etool16/acmacro_obj.gif: New image for Autoconf outline view.
+	* icons/etool16/ammacro_obj.gif: Ditto.
+	* icons/etool16/case_obj.gif: Ditto.
+	* icons/etool16/condition_obj.gif: Ditto.
+	* icons/etool16/elif_obj.gif: Ditto.
+	* icons/etool16/for_obj.gif: Ditto.
+	* icons/etool16/if_obj.gif: Ditto.
+	* icons/etool16/while_obj.gif: Ditto.
+	* plugin.xml: Add new error marker extension for outline view.
+
+2007-02-02  Andrew Overholt  <overholt@redhat.com>
+
+	* cdtpatches/README: Fix CVS location of managedbuilder.
+
+2007-02-02  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeCompletionProcessor.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java (getBuiltins):
+	Add $<, $@, and $?.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java
+	(getContentAssistant): Make use of AutomakeCompletionProcessor.
+
+2007-01-31  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* cdtpatches/cdt.ui.buildconsole.patch: New file that contains the
+	3.1.1 version of the patch for Bugzilla 153816 which adds multiple
+	build console support to CDT 4.0.
+	* cdtpatches/cdt.ui.patch: Altered to remove any build console patches.
+	* cdtpatches/README: Updated to include the new patch.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/CConfigureConsole.java (CConfigureConsole):
+	Modified to use new CUIPlugin build console manager interface.
+
+2007-01-31  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeErrorHandler.java: New class.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Remove unnecessary import.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java
+	(connect): New method.  Update error markers at document load time.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java
+	(reconcile): Update error markers.
+	(AutomakefileReconcilingStrategy): Set class-wide variables.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java
+	(getAutomakeErrorHandler): New method.
+
+2007-01-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 224644.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java (getMakeTargets):
+	Don't add "clean" for fullbuild anymore.  It causes unnecessary extra building to occur.
+	(build): Set a flag that build was called.
+	(clean): Only clean if this method is called directly and via a call to build method.
+	Clean by doing a make clean rather than calling super.clean.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (runCommand): When an
+	error occurs in configure, we want to set the status of the project to "needs rebuild".
+	(getConfigSettingsPath): New method to generate name of config settings file.
+	(saveConfigArgs): Use new getConfigSettingsPath method.
+	(regenerateMakefiles): Ditto, when checking if config options have changed.
+	(autogenExists): Clean up unused variables.
+	(getMakefileName): Return "Makefile" instead of "makefile".
+
+2007-01-22  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java:
+	Update copyright.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeIfElse.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileUtil.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java
+	(getAutomakeSourceViewer): New method. Update copyright.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java:
+	Update copyright.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeTextHover.java
+	(getHoverInfo): Remove debugging println. Update copyright.
+
+2007-01-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 214624.
+	* src/com/redhat/eclipse/cdt/autotools/internal/MarkerGenerator.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (runCommand): Add check
+	for return code being 0 or 1 to reveal whether command ran correctly.
+	(regenerateMakefiles): Add boolean checking for runCmd calls and also quit
+	if runCmd fails.  For autogen.sh cases, check if configure is run by autogen.sh
+	and don't bother calling configure afterwards if true.  Add error checking to
+	ensure a second command is not run if the first fails.
+	(PathVar): New private class.
+	(autogenExists): Fixed to take a path parameter to fill in.  It also looks for
+	any file that ends in autogen.sh to handle projects like Gnome.
+	* Resources.properties: Add new messages used by MakeGenerator.
+	* cdtpatches/managedbuilder.core.patch: New patch to cause ManagedMake build
+	to stop if an error occurs generating Makefile.
+	* cdtpatches/README: Add details on how to install new patch.
+
+2007-01-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroParser.java: New code
+	to parse an Autoconf macro.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java (createPresentation):
+	Use new AutoconfMacroParser.parse method instead of embedding the code.  Remove
+	all corresponding parse methods.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java (documentAboutToBeChanged):
+	Add checks for whether we should remove the error markers in an autoconf_macro
+	partition.
+
+2007-01-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* about.html: New EPL license file.
+
+2007-01-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/ParseException.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfErrorHandler.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfPrototype.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfAnnotationHover.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java: Add
+	copyright info.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfColorProvider.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Ditto.
+	(createDocument): New method.
+	(documentChanged): Ditto.
+	(documentAboutToBeChanged): Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfKeywordDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfM4WordDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroPartitionRule.java : Ditto.
+	(matchParentheses): Fix up logic.
+	(evaluate):
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroWordDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitioner.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitionScanner.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java: Ditto.
+	(getPresentationReconciler): Use AutoconfMacroDamagerRepairer for macro partition.
+	(getAnnotationHover): New method.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfWhitespaceDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfWordDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/IAutotoolEditorActionDefinitionIds.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/IAutotoolHelpContextIds.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/RecursiveSingleLineRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions/GetDefinedSymbolsAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions/GetIncludePathAction.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java: Ditto.
+	(getIndexedInfo): New method.
+	(getPrototype): Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/HoverMessages.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeWordDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAclocalAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutoconfAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutomakeAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeMessages.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/TwoInputDialog.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfoProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java: Ditto.
+
+2007-01-12  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeTextHover.java: New class.  Hover help provider for automake editor.
+	(getHoverControlCreator): New method.  Return null for now.
+	(AutomakeTextHover): New method.
+	(getHoverRegion): New method.  Return an IRegion from an offset in the document.
+	(findWord): New method.  Return an IRegion of the hover region.
+	(getHoverInfo): New method.  Return the hover information for a particular region.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java (getTextHover): New method.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java (getDirectiveContainingLine): Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java (getMakefile): Likewise.
+
+2007-01-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Revert
+	to version 1.2 prior to 2006-11-27.  This reversion is required because the previous
+	fix causes a regression in autoconf partitioning.
+
+2007-01-08  Andrew Overholt  <overholt@redhat.com>
+
+ 	* libhoverdocs/acmacros.xml: Add PKG_* macros from pkgconfig.
+
+2007-01-05  Andrew Overholt  <overholt@redhat.com>
+
+ 	* libhoverdocs/acmacros.xml: Add AM_* macros from automake's Public-macros.html.
+
+2007-01-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (regenerateMakefiles):
+	Add check for Makefile.cvs ahead of configure check.  Use resource strings
+	for runCommand descriptions.
+	(makefileCvsExists): New internal method.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new
+	resource strings.
+
+2007-01-02  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java
+	(automaticVariables): New $<, etc. variables.
+	(createRules): Add automatic variables as keywords. Also add @AC_SUBST_VAR@
+	highlighting.
+	(nextToken): New method.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java
+	(getDocument): New method.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeWordDetector.java:
+	New file.
+
+2006-12-15  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java
+	(getAutomakeCodeScanner): New method.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java
+	(getAutomakeSourceViewerConfiguration): Likewise.
+	(getAutomakefileDocumentProvider): Likewise
+	(initializeEditor): Set up field variables.
+
+2006-12-12  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add package visibility for tests.
+	* plugin.xml: Add filename associations for AutomakeEditor.
+
+2006-12-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* MANIFEST.MF: Update release to 0.0.6.
+
+2006-12-11  Kyu Lee  <klee@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/TwoInputDialog.java: New class
+	for getting 2 text field inputs.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeMessages.java: New class
+	for NLS strings.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutomakeAction.java: New
+	class for handling invoke automake.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutoconfAction.java: New
+	class for handling invoke autoconf.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAction.java: New super
+	class for invoking autotools classes.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAclocalAction.java: New
+	class for handling invoke aclocal.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeMessages.properties:
+	Property file for NLS strings.
+	* plugin.xml: Added menu options for invoking autotools under project menu.
+
+2006-12-11  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java
+	(getWorkingCopyManager): New method.
+	(getAutomakefileDocumentProvider): Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java
+	(initializeEditor): New method.
+	(getAutomakeOutlinePage): Likewise.
+	(createPartControl): Likewise.
+	(getAdapter): Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeMacroReferenceRule.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeMacroDefinitionRule.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeIfElse.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileUtil.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java:
+	Likewise.
+
+2006-12-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizard.java
+	(setCurrentProject): Make protected to allow subclasses to use.
+	* MANIFEST.MF: Export org.eclipse.linuxtools.cdt.autotools.wizards classes to the
+	autotools.tests plug-in.
+
+2006-12-01  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake: New directory.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java: New
+	file. Simple extension of MakefileEditor for now.
+	* plugin.xml: Add automake editor.
+
+2006-11-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Add .m4 file support to the Autoconf editor.
+
+2006-11-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java
+	(performRevert): Method copied from CDT and JDT editors.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java:
+	Change base class to be TextFileDocumentProvider. This means no longer providing
+	a createDocument() method.
+	(createDocument): Deleted.
+	(AutoconfStorageDocumentProvider.AutoconfStorageDocumentProvider): New internal
+	class based on StorageDocumentProvider.
+	(AutoconfStorageDocumentProvider.setupDocument): New method of internal class.
+	(AutoconfDocumentProvider): New constructor which sets up a
+	TextFileDocumentProvider that takes the internal AutoconfStorageDocumentProvider
+	class as parent DocumentProvider. This emulates what the CDT CEditor does and is
+	done to provide proper edit reversion support.
+
+2006-11-22  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/IAutotoolHelpContextIds.java:
+	Add CONTENT_ASSIST string.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java
+	(getContentAssistant): New routine to add content assist support.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java
+	(createActions): Add action for content assist.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java
+	(getIndexedInfo):
+	(getInformationControlCreator): New method.
+	(getTooltipAffordanceString): Make static.
+	(init): Ditto.
+	(getIndexedInfo): Ditto plus add call to init.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java:
+	New class for macro content assist.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroParameterListValidator.java:
+	New class for content assist to help with macro call parameters.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroProposalContextInformation.java:
+	New file for parameter context assist information.
+
+2006-11-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitionScanner.java
+	(AutoconfPartitionScanner): Change partitions to be comments, macros, and
+	default.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java
+	(getPresentationReconciler): Change to match new paritioning. Use a special new
+	MultiLineDamagerRepairer for macros.
+	(getConfiguredContentTypes): Change to list of new partitions.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java
+	(createPartControl): Specify new AUTOCONF_MACRO partition.
+	(InformationDispatchAction.makeAnnotationHoverFocusable): Ditto.
+	(InformationDispatchAction.makeTextHoverFocusable): Ditto.
+	(getAutoconfInlineCodeScanner, getAutoconfStringScanner): Removed.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfInlineCodeScanner.java:
+	Removed.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSectionRule.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfStringScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java
+	(AutoconfCodeScanner): Change rules to add a recursive single line rule for
+	strings and a multiline rule for inlined code. Also add a rule to discover m4
+	macros.
+	* src/com/redhat/eclipse.cdt/autotools/ui/editors/AutoconfM4WordDetector.java:
+	New file.
+	* src/com/redhat/eclipse.cdt/autotools/ui/editors/AutoconfMacroPartitionRule.java:
+	Ditto.
+	* src/com/redhat/eclipse.cdt/autotools/ui/editors/MultiLineDamagerRepairer.java:
+	Ditto.
+	* src/com/redhat/eclipse.cdt/autotools/ui/editors/RecursiveSingleLineRule.java:
+	Ditto.
+
+2006-10-31  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java
+	(init): Turn off parser validation.
+	* libhoverdocs/acmacros.xml: Update including m4 macros.
+
+2006-10-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java:
+	Remove unneeded import.
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java
+	(getLibHoverDocs): Specify no xml validation since there may be duplicate
+	function ids due to multiple standard definitions used in glibc.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java
+	(getTextHover): New method to add text hover for autoconf editor.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitioner.java
+	(connect): Remove calls to print debug messages.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java
+	(isFoldingEnabled):
+	(InformationDispatchAction.InformationDispatchAction): New for scrollable
+	tooltip support.
+	(createPartControl): Ditto.
+	(fProjectionModelUpdater): Ditto.
+	(InformationProvider.getInformation): Ditto.
+	(InformationDispatchAction): Ditto.
+	(initializeKeyBindingScopes): Ditto.
+	(InformationDispatchAction.makeTextHoverFocusable): Ditto.
+	(InformationProvider.getInformation2): Ditto.
+	(InformationProvider): Ditto.
+	(InformationDispatchAction.computeOffsetAtLocation): Ditto.
+	(fInformationPresenter): Ditto.
+	(.createInformationControl): Ditto.
+	(InformationProvider.getInformationPresenterControlCreator): Ditto.
+	(createActions): Ditto.
+	(InformationDispatchAction..createInformationControl): Ditto.
+	(InformationDispatchAction.run): Ditto.
+	(InformationDispatchAction.fTextOperationAction): Ditto.
+	(InformationDispatchAction.makeAnnotationHoverFocusable): Ditto.
+	(fProjectionSupport): Ditto.
+	(InformationProvider.getSubject): Ditto.
+	(InformationProvider.InformationProvider): Ditto.
+	* src/libhoverdocs/acmacros.xml: New file containing autoconf hover help.
+	* src/libhoverdocs/glibc.xml: Updated.
+	* src/libhoverdocs/LIBHOVERDOCS.LICENSE: New file with licensing info.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/IAutotoolEditorActionDefinitionIds.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editoros/IAutotoolHelpContextIds.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/HoverMessages.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/HoverMessages.properties:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/HTML2TextReader.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/HTMLPrinter.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/HTMLTextPresenter.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/LineBreakingReader.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/SingleCharReader.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/SubstitutionTextReader.java:
+	Ditto.
+	* plugin.xml: Fix autoconf editor to look for configure.in or configure.ac. Add
+	hover help for autoconf editor and set up F2 key binding for scrollable tooltips.
+	* plugin.properties: Add autoconf editor strings.
+
+2006-10-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java: New
+	file.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfWordDetector.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfWhitespaceDetector.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfStringScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSectionRule.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitionScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitioner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroWordDetector.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfKeywordDetector.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfInlineCodeScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfColorProvider.java:
+	Ditto.
+	* plugin.properties: Add Autoconf editor name.
+	* plugin.xml: Add Autoconf editor.
+
+2006-10-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 209161.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(initializeBuildConfigDirs): New method.
+	(initialize): Call initializeBuildConfigDirs().
+	(regenerateMakefiles): Ditto if configuration parameters have changed.
+	(createDirectory): Return project path if input directory is empty string or
+	".".
+
+2006-09-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* build.properties: Update so plugin.properties built into binary.
+	* build.xml: New file.
+
+2006-09-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Bump up release number to 0.0.5.
+
+2006-09-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 206719
+	* plugin.xml: Comment out deprecated ManagedBuildInfo extension and replace with
+	new org.eclipse.cdt.managedbuilder.core.buildDefinitions extension point.
+	* plugin.properties: Add new strings from new build definition.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/CProjectPlatformPage.java
+	(CProjectPlatformPage): Fix project type reference to refer to new project type
+	id in build definition.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(initialize): Switch over to new option ids in new build definition.
+	(getConfigArgs): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java
+	(getCompilationString): Don't bother if input resource isn't a file.
+	(buildFile): Fix how build directory is fetched to work with new build
+	definition.
+	(AutotoolsScannerInfo): Save the original resource reference.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
+	(AUTOTOOLS_CONFIG_ID): Change to match new build definition.
+
+2006-09-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 206359
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java
+	(verifyScannerInfoProvider): New method to check ScannerInfoProvider and set it
+	only if necessary.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
+	(hasTargetBuilder): Call verifyScannerInfoProvider instead of
+	setScannerInfoProvider to prevent changing the project file every time the
+	hasTargetBuilder check is made.
+
+2006-09-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 206164.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java
+	(followIncludeChain): Follow the session property as far as possible. When it
+	ends try looking for the new OPEN_INCLUDE_P persistent property to re-establish
+	the chain.
+	(createIncludeChain): Set a new persistent property OPEN_INCLUDE_P that is the
+	location of the resource.
+
+2006-09-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* cdtpatches/cdt.ui.patch: Update patch to include defined symbol hover help.
+
+2006-09-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java
+	(getDefinedSymbols): Prepare code for failure to get compilation string.
+
+2006-09-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* cdtpatches/README: New file to instruct how to apply patches to the CDT.
+	* cdtpatches/cdt.core.patch: Patch for org.eclipse.cdt.core.
+	* cdtpatches/cdt.ui.patch: Patch for org.eclipse.cdt.ui.
+
+2006-08-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Replace DynamicScannerInfo extension hack with existing CDT
+	ScannerInfoProvider extension. Change version to 0.0.4.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/CConfigureConsole.java
+	(CConfigureConsole): Use new getSubConsoleManager method of CUIPlugin.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsole.java: No
+	longer needed, so removed.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleDocument.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleManager.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsolePage.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsolePartition.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsolePartitioner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleStream.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleViewer.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConsoleEvent.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConsoleOutputTextStore.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ScrollLockAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java
+	(convertProject): Set scanner info provider for project.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfoProvider.java: Extend
+	AbstractCExtension.
+	(getScannerInformation): Call AutotoolsScannerInfo.followIncludeChain method to
+	get real underlying resource to get dynamic build info from.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java: Implement new
+	interface IScannerInfoPlus.
+	(followIncludeChain): New method to adhere to new interface.
+	(createIncludeChain): New method.
+	(getDefinedSymbols): Add defined symbols found by ManagedBuildManager.
+	(getIncludePaths): Append include path found by ManagedBuildManager.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java
+	(setScannerInfoProvider): New method.
+	(getConsoleManager): Removed.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java:
+	(hasTargetBuilder): Replace the default scanner provider for Managed Make
+	projects with AutotoolsScannerInfoProvider.
+
+2006-08-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java
+	(run): If there are no targets yet
+	(i.e. no makefile), try and regenerate the makefile.* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (getConfigArgs):
+	Make sure there is an "other" string to process rather than adding an empty
+	argument.
+
+2006-08-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(regenerateMakefiles): Add logic to check if the configuration arguments have
+	changed since the last configuration and reconfigure if they have.
+	(saveConfigArgs): New method.
+
+2006-08-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
+	(addAutotoolsBuilder): Check for ManagedMake's genmakebuilder and remove if
+	found.
+	(hasTargetBuilder): Look for Autotools default configuration and if found, add
+	the Autotools Makefile builder.
+
+2006-07-31  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java
+	(getLibHoverDocs): New method which replaces buildDocPath and fetches libhover
+	base data file from the plugin's jar.
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java
+	(buildDocPath): Replaced by getLibHoverDocs. Change all callers.
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java
+	(getDocument): Removed.
+
+2006-07-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Remove unused sample extensions.
+	* src/com/redhat/eclipse/cdt/autotools/editors/*: Remove all files.
+	* src/com/redhat/eclipse/cdt/autotools/preferences/*: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/properties/*: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/views/*: Ditto.
+
+2006-07-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Update release.
+	* META-INF/MANIFEST.MF: Export libhoverdocs.
+
+2006-07-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Update release.
+
+2006-07-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
+	(getMakeTargets): Use IMakeBuildInfo.BUILD_TARGET_INCREMENTAL instead of
+	IMakeBuildInfo.BUILD_TARGET_FULL which is now obsoleted and not set by the
+	MakeTargets.
+	(clean): Ditto.
+
+2006-07-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Add new "other" option which allows the end-user to specify any
+	configuration option manually.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(getConfigArgs): New function to get configure arguments from preferences.
+	(runCommand): Change prototype to take an argument array.
+	(regenerateMakefiles): Only when running full configure, pass args to runCommand
+	and get these from getConfigArgs method.
+
+2006-07-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java
+	(getCompilationString): Don't use previous compilation string if we have marked
+	the scanner info as dirty.
+	(getIncludePaths): Don't continue processing if the compilation string is null.
+
+2006-06-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions/GetDefinedSymbolsAction.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java
+	(getDefinedSymbols): Fill in function details to fetch flags used in dynamic
+	compilation info.
+	(getCompilationString): New function to get and save the actual compilation
+	string from the make invocation.
+	(getIncludePaths): Move logic into getCompilationString.
+	(compilationString): New field to store compilation string.
+	(definedSymbols): New field to store map of defined symbols.
+	* plugin.xml: Add defined symbols menu item.
+
+2006-06-20  jjohnstn  <jjohnstn@toy.toronto.redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions/GetIncludePathAction.java:
+	Remove unused imports.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeUIImages.java: New class
+	copied from Std Make internal packages to local internal package.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MessageLine.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeUIPlugin.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeResources.properties: New
+	properties message file used by MakeUIPlugin.
+	* src/com/redhat/eclipse/cdt/autotools/actions/TargetListViewerPart.java: Use
+	Autotools StructureViewPart instead of internal one from Std Make plugin.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeTargetDialog.java: Use new
+	Autotools internal classes rather than internal ones from Std Make plugin.
+	* src/com/redhat/eclipse/cdt/autotools/actions/AbstractTargetAction.java
+	(getShell): Use new AutotoolsPlugin getActiveWorkbenchShell method instead of
+	the one in internal MakeUIPlugin.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java: Remove
+	unused imports.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java
+	(getActiveWorkbenchShell): New method.
+
+2006-06-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Add dependency on org.eclipse.core.variables.
+	* src/com/redhat/eclipse/cdt/autotools/internal/MakeTargetManager: New internal
+	class copied from Std Make projects.
+	* src/com/redhat/eclipse/cdt/autotools/internal/MakeTarget: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ProjectTargets: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/MakeMessages: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakeTargetManager: Base on local
+	internal MakeTargetManager class rather than unpublished Std Make internal class.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator: Remove reference to Std
+	Make MakeMessages internal class.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new message
+	about invoking make for the project.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java
+	(getFormattedString): New method to get resource string with arguments.
+
+2006-06-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Added "org.eclipse.cdt.core.DynamicScannerInfoProvider" extension.
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions/GetIncludePathAction.java
+	(run): Altered to use new AutotoolsScannerInfo class.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfoProvider.java: New
+	class used to hook up to added extension point:
+	org.eclipse.cdt.core.DynamicScannerInfoProvider.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java: New file based
+	on AutotoolsMakefileMiner.java. Class implements IScannerInfo interface.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileMiner.java: Transformed
+	into AutotoolsScannerInfo.java.
+
+2006-06-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions/GetIncludePathAction.java:
+	Fix up imports.
+
+2006-06-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Make provider Red Hat.
+
+2006-06-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileMiner.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions: GetIncludePathAction.java:
+	Ditto.
+	* plugin.xml: Add extensions to create menu for source files that will grab the
+	dynamic include path for the build and display it in a message dialog. This is
+	just a temporary test.
+
+2006-05-19  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java
+	(run): Create our target selection dialog in-line. Make this dialog have a
+	filter for selection of make target.
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildTargetDialog.java: Remove:
+	no longer necessary.
+
+2006-05-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
+	(clean): Overriding method to check for MakeTargets in which case we don't want
+	to clean out directory.
+	* plugin.xml: Remove unneeded extension.
+
+2006-04-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java
+	(getHref): Change to reference the glibc book rather than the Gnu help.
+
+2006-04-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java: New file based on Chris
+	Moller's hover help, using ICHelpProvider interface.
+	* plugin.xml: Add CHelpProvider extension to supply hover help.
+	* libhoverdocs/glibc.xml: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutoconfPlugin.java: Refactored.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java: Refactored from
+	AutoconfPlugin.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/CConfigureConsole.java:
+	Refactor AutoconfPlugin to AutotoolsPlugin.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/CProjectPlatformPage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizard.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/preferences/PreferenceInitializer.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/TargetListViewerPart.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeTargetDialog.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeContentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildTargetDialog.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java: Ditto.
+
+2006-04-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Remove toc extension since we have moved docs to a separate
+	plug-in.
+	* getdocs.sh: Moved to autotools-doc plugin.
+	* doc.zip: Ditto.
+	* toc.xml: Ditto.
+	* testToc.xml: Removed.
+
+2006-04-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* toc.xml: Add references for Gnu Tools documents.
+	* doc.zip: New file containing zipped up html files for Gnu tools.
+	* getdocs.sh: Shell script to get html files from the web and build doc.zip.
+	* plugin.xml: Connect toc extension to toc.xml so that Gnu tools help is
+	provided with Autotools plugin.
+
+2006-03-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutoconfPlugin.java
+	(getConsoleManager): New method.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(runCommand): Specify the Autotools configure console to use for configuration
+	output.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/CConfigureConsole.java: New
+	file stodified from ManagedBuild Project internal directory.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleDocument.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleManager.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsolePage.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsolePartitioner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsolePartition.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleStream.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleViewer.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsole.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConsoleEvent.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConsoleMessages.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConsoleMessages.properties:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ScrollLockAction.java: Ditto.
+	* plugin.xml: Set up CBuildConsole extension to be CConfigureConsole.
+
+2006-03-15  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(addMakeTargetsToManager): New method.
+	(regenerateMakefiles): Call addMakeTargetsToManager after Makefile is generated.
+
+2006-03-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectOptionPage.java
+	(getProject): If dealing with a ConvertToAutotoolsProjectWizard, use it's
+	getProject method.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizard.java
+	(setCurrentProject): New method.
+	(applyOptions): Change prototype to accept project as input. Call
+	setCurrentProject method using the project variable before getting the optionPage
+	to performApply.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java
+	(applyOptions): Add project as input variable and pass this on call.
+	(convertProject): Pass project when calling applyOptions method.
+
+2006-03-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
+	(getMakeTargets): When doing a full build, we don't want to do a "clean" if the
+	target is not "all".
+
+2006-03-09  Andrew Overholt  <overholt@redhat.com>
+
+	* .cvsignore: Initial checkin. Ignore bin.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(regenerateMakefiles): Rename CONFIG_STATUS_NAME to CONFIG_STATUS. Call
+	autogen.sh first if configure does not exist.
+	(configureExists): New method.
+	(autogenExists): New method.
+	(runCommand): New method. Run configure or autogen and report success.
+	* plugin.properties: Change "CVS Autotools" to Autotools.
+	* plugin.xml: Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectWizard.java
+	(NewAutotoolsProjectWizard): Likewise.
+
+2006-03-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Set up default gcc scanner in our ManagedMakeProject target
+	extension -
+	org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java
+	(convertProject): Remove commented code about setting ScannerConfig as we now
+	set the default GCC scanner collector in our ManagedMakeProject extension.
+
+2006-03-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutoconfPlugin.java
+	(ftargetManager): New field.
+	(getUniqueIdentifier): New method.
+	(getTargetManager): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java: New
+	builder that extends ManagedMakeProject's GeneratedMakefileBuilder and allows us
+	to override behavior.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakeTargetManager.java: New
+	class that extends a Std MakeProject's MakeTargetManager and allows us to
+	override behavior.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: New strings added
+	to support BuildSpecial functionality.
+	* src/com/redhat/eclipse/cdt/autotools/AbstractTargetAction.java: New file based
+	on Std MakeProject class.
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java: Rewritten to
+	extend AbstractTargetAction and to create a dialog rather than print out hello
+	world.
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildTargetDialog.java: New file
+	that implements the Build Special Targets dialog. Based on a Std Make Project's
+	BuildTargetDialog.
+	* src/com/redhat/eclipse/cdt/autotools/actions/CheckboxTablePart.java: New file
+	to support new dialogs.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeContentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeTargetDialog.java: New file
+	that implements the Make Target dialog allowing management of make targets. Based
+	on Std Make Project's MakeTargetDialog.
+	* src/com/redhat/eclipse/cdt/autotools/actions/SharedPartWithButtons.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/StructuredViewerPart.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/TargetListViewerPart.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java:
+	Instead of adding a ManagedProject builder, add our new AutotoolsMakefileBuilder.
+	* plugin.xml: Add our new AutotoolsMakefileBuilder as an official builder.
+
+2006-02-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java: Remove some warnings.
+	* plugin.xml: Fix duplicate target configuration options and re-add in --build
+	option.
+
+2006-02-23  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* Initial import.
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/META-INF/MANIFEST.MF b/autotools/org.eclipse.linuxtools.cdt.autotools.core/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..a7069db
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/META-INF/MANIFEST.MF
@@ -0,0 +1,32 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name.0
+Bundle-SymbolicName: org.eclipse.linuxtools.cdt.autotools.core;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.ui;bundle-version="3.4.0",
+ org.eclipse.core.runtime;bundle-version="3.4.0",
+ org.eclipse.jface.text;bundle-version="3.4.0",
+ org.eclipse.ui.editors;bundle-version="3.4.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.4.0",
+ org.eclipse.core.resources;bundle-version="3.4.0",
+ org.eclipse.ui.ide;bundle-version="3.4.0",
+ org.eclipse.cdt.managedbuilder.core;bundle-version="5.0.100",
+ org.eclipse.cdt.core;bundle-version="5.1.0",
+ org.eclipse.cdt.ui;bundle-version="5.1.0",
+ org.eclipse.cdt.managedbuilder.ui;bundle-version="5.0.100",
+ org.eclipse.cdt.managedbuilder.gnu.ui;bundle-version="5.0.100",
+ org.eclipse.cdt.make.core;bundle-version="5.1.0",
+ org.eclipse.cdt.make.ui;bundle-version="5.0.100",
+ org.eclipse.ui.console;bundle-version="3.3.0",
+ org.eclipse.help;bundle-version="3.3.100",
+ org.eclipse.core.variables;bundle-version="3.2.100",
+ org.eclipse.ui.views;bundle-version="3.3.0",
+ org.eclipse.core.filesystem;bundle-version="1.2.0"
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %provider
+Export-Package: org.eclipse.linuxtools.cdt.autotools.core;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests,org.eclipse.linuxtools.cdt.autotools.ui",
+ org.eclipse.linuxtools.internal.cdt.autotools.core;x-friends:="org.eclipse.linuxtools.cdt.autotools.ui,org.eclipse.linuxtools.cdt.autotools.tests",
+ org.eclipse.linuxtools.internal.cdt.autotools.core.configure;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests,org.eclipse.linuxtools.cdt.autotools.ui"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/about.html b/autotools/org.eclipse.linuxtools.cdt.autotools.core/about.html
new file mode 100644
index 0000000..44e2290
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

+<html>

+<head>

+<title>About</title>

+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>8th September, 2004</p>	

+<h3>License</h3>

+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<h3>Contributions</h3>

+

+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise

+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such

+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or

+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the

+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available

+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also

+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+</body>

+</html>
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/build.properties b/autotools/org.eclipse.linuxtools.cdt.autotools.core/build.properties
new file mode 100644
index 0000000..7cbd1d3
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/build.properties
@@ -0,0 +1,7 @@
+source.. = src/
+output.. = bin/
+bin.includes = plugin.xml,\
+               META-INF/,\
+               .,\
+               html/,\
+               plugin.properties
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/html/maintopic.html b/autotools/org.eclipse.linuxtools.cdt.autotools.core/html/maintopic.html
new file mode 100644
index 0000000..a476078
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/html/maintopic.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Main Topic</title>
+</head>
+
+<body>
+<h1>Main Topic</h1>
+Please enter your text here.
+</body>
+</html>
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/html/subtopic.html b/autotools/org.eclipse.linuxtools.cdt.autotools.core/html/subtopic.html
new file mode 100644
index 0000000..8a61c50
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/html/subtopic.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Sub Topic</title>
+</head>
+
+<body>
+<h1>Sub Topic</h1>
+Please enter your text here.
+</body>
+</html>
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/html/toc.html b/autotools/org.eclipse.linuxtools.cdt.autotools.core/html/toc.html
new file mode 100644
index 0000000..326f0a9
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/html/toc.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Table of Contents</title>
+</head>
+
+<body>
+<h1>Table of Contents</h1>
+Please enter your text here.
+</body>
+</html>
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/plugin.properties b/autotools/org.eclipse.linuxtools.cdt.autotools.core/plugin.properties
new file mode 100644
index 0000000..5eeed01
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/plugin.properties
@@ -0,0 +1,177 @@
+#################################################################################
+#  Copyright (c) 2006, 2008, 2009 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+ConvertWizard.description=Convert to C/C++ Autotools Project
+NewCProject.description=GNU C Autotools Project
+NewCProjectV2.description=GNU C Autootols Project V2
+NewCCProject.description=GNU C++ Autotools Project
+NewCWizard.name=GNU C Autotools Project
+NewCWizardV2.name=GNU C Autotools Project V2
+NewCCWizard.name=GNU C++ Autotools Project
+
+Autotools.wizard.name=GNU Autotools Build Wizard
+
+Autoconf.editor.name=Autoconf Editor
+
+BuildProperty.value.name.default=Default;
+BuildProperty.type.name.autotools=GNU Autotools
+
+PreferenceAutotools.name=Autotools
+PreferenceAutomakeEditor.name=Automake Editor
+PreferenceAutoconfEditor.name=Autoconf Editor
+
+PropertyAutotools.name=Autotools
+PropertyAutotools.general.name=General
+PropertyAutotools.configure.name=Configure Settings
+PropertyTabEditor.name=Editors
+AutotoolsBuildPropertyTab.name=Behaviour
+AutotoolsEditorsPropertyTab.name=Editors
+AutotoolsToolsPropertyTab.name=Tools Settings
+AutotoolsConfigurePropertyTab.name=Configure Settings
+
+PropertyTabEditor.tooltip=Set options for Autotools-specific editors
+PropertyTabBuild.tooltip=Set additional Autotools build options
+
+Makefile.builder.name=Autotools Makefile Generator
+Autotools.projecttype.name=GNU Autotools
+AutotoolsNature.name=Autotools Project Nature
+AutotoolsNewNature.name=Autotools Project Nature V2
+Configuration.build.name=Build (GNU)
+Autotools.targetplatform.name=GNU Autotools Target Platform
+Autotools.gnu.toolchain.name=GNU Autotools Toolchain
+Configure.outputType=Configure Output (config.status)
+Autogen.outputType=Autogen Output (configure)
+
+CommandCategorySource.name=Source
+CommandCategorySource.description=Source commands
+CommandCategoryTools.name=Tools
+CommandCategoryTools.description=Autotool tools
+ShowTooltip.name=Show Tooltip Description
+ShowTooltip.description=Shows the tooltip description for the element at the cursor
+
+# Scope and Key Commands
+ACeditor.scope.name=Autoconf Editor
+ACeditor.scope.description=Editor for Autoconf Configuration Source Files
+
+Tool.configure=configure
+
+OptionCategory.configure.general=General
+Option.configure.name=Name
+Option.configure.builddir=Build directory
+Option.configure.builddir.tip=Subdirectory off of project where build will occur
+Option.configure.configdir=Configure tool directory
+Option.configure.configdir.tip=Subdirectory off of project containing configure scripts
+Option.configure.cache_file=Name of configuration cache file (--cache-file)
+Option.configure.cache_file.tip=Specify the name of the configuration cache file [config.cache]
+Option.configure.no_create=Turn off file creation <not advised> (--no-create)
+Option.configure.no_create.tip=This tells configuration not to generate the output files as part of configuration
+Option.configure.quiet=Turn off checking messages (--quiet)
+Option.configure.quiet.tip=This turns off "checking ..." style messages from the configuration console output
+Option.configure.help=Display help contents of top-level configuration (--help)
+Option.configure.help.tip=Ask configuration file to display its help documentation
+Option.configure.version=Display version of autotools used to create configuration (--version)
+Option.configure.version.tip=This outputs the version of the Autotools used to create the configuration files
+
+OptionCategory.configure.platform=Platform Specifiers
+Option.configure.host=Host platform (--host)
+Option.configure.host.tip=Platform that project will run on
+Option.configure.target=Target platform (--target)
+Option.configure.target.tip=Platform that project will target output for
+Option.configure.build=Build platform (--build)
+Option.configure.build.tip=Platform where project is being built
+
+OptionCategory.configure.directories=Directory specifiers
+Option.configure.prefix=Arch-independent install directory (--prefix)
+Option.configure.prefix.tip=Place where architecture-independent files are installed [/usr/local]
+Option.configure.exec_prefix=Arch-dependent install directory (--exec-prefix)
+Option.configure.exec_prefix.tip=Place where architecture-dependent files are installed [PREFIX]
+Option.configure.libdir=Object code library directory (--libdir)
+Option.configure.libdir.tip=Place where object code libraries are installed [EPREFIX/lib]
+Option.configure.bindir=User executable directory (--bindir)
+Option.configure.bindir.tip=Place where binary executables are installed [EPREFIX/bin]
+Option.configure.sbindir=System admin executable directory (--sbindir)
+Option.configure.sbindir.tip=Place where system admin executables are installed [EPREFIX/sbin]
+Option.configure.includedir=C Header file directory (--includdir)
+Option.configure.includedir.tip=Place where header files will be installed [PREFIX/include]
+Option.configure.datadir=Read-only architecture-independent data (--datadir)
+Option.configure.datadir.tip=Place where read-only architecture-independent data is installed [PREFIX/share]
+Option.configure.sysconfdir=Read-only single-machine data directory (--syconfdir)
+Option.configure.sysconfdir.tip=Place where read-only single-machine data is stored [PREFIX/etc]
+Option.configure.infodir=Info file documentation directory (--infodir)
+Option.configure.infodir.tip=Place where info files are installed [PREFIX/info]
+Option.configure.mandir=Man file documentation directory (--mandir)
+Option.configure.mandir.tip=Place where man file documentation is installed [PREFIX/man]
+Option.configure.srcdir=Sources directory (--srcdir)
+Option.configure.srcdir.tip=Place where configure can find sources [configure directory or ..]
+Option.configure.localstatedir=Modifiable single-machine data directory (--localstatedir)
+Option.configure.localstatedir.tip=Place where modifiable single-machine data is installed [PREFIX/var]
+Option.configure.sharedstatedir=Modifiable architecture-independent data directory (--sharedstatedir)
+Option.configure.sharedstatedir.tip=Place where modifiable architecture-independent data is installed [PREFIX/com}
+Option.configure.libexecdir=Program executable directory (--libexecdir)
+Option.configure.libexecdir=Place where program executables will be installed [EPREFIX/libexec]
+Option.configure.oldincludedir=Non-gcc C header file directory (--oldincludedir)
+Option.configure.oldincludedir.tip=Place where non-gcc C header files are installed [/usr/include]
+
+OptionCategory.configure.filenames=File-name transformations
+Option.configure.program_prefix=Installed program prefix (--program-prefix)
+Option.configure.program_prefix.tip=Prepend PREFIX to the beginning of installed program names
+Option.configure.program_suffix=Installed program suffix (--program-suffix)
+Option.configure.program_suffix.tip=Append SUFFIX to the end of installed program names
+Option.configure.program_transform_name=Installed program name transform (--program-transform-name)
+Option.configure.program_transform_name.tip=A sed string used to transform installed program names
+
+OptionCategory.configure.features=Features and packages
+Option.configure.enable_maintainer_mode=Enable maintainer mode (--enable-maintainer-mode)
+Option.configure.enable_maintainer_mode.tip=Specify this to have Makefiles generated with checks for Autotool configuration file changes
+Option.configure.user=User-specified configuration options
+Option.configure.user.tip=Specify one or more configuration options (e.g. --enable-FEATURE, --disable-FEATURE, or --with-PACKAGE)
+
+Tool.autogen = autogen.sh
+
+OptionCategory.autogen.general=Options
+Option.autogen.user=Command line options
+Option.autogen.user.tip=Specify options to pass to the top-level autogen.sh script
+
+RedHatVendor.name = Red Hat
+Bundle-Name.0 = Autotools Plug-in (Incubation)
+provider=Eclipse
+ConvertWizard.name = Convert to a C/C++ Autotools Project
+InvokeAutotools.label = Invoke Autotools
+InvokeAutotools.mnemonic = I
+InvokeAutoconf.label = Invoke Autoconf
+InvokeAutoconf.mnemonic = c
+InvokeAutoconf.description = Run autoconf in the selected directory
+InvokeAutoheader.label = Invoke Autoheader
+InvokeAutoheader.mnemonic = h
+InvokeAutoheader.description = Run autoheader from the selected directory
+InvokeAutomake.label = Invoke Automake
+InvokeAutomake.mnemonic = m
+InvokeAutomake.description = Run automake from the selected directory
+InvokeAutoreconf.label = Invoke Autoreconf
+InvokeAutoreconf.mnemonic = r
+InvokeAutoreconf.description = Run autoreconf from the selected directory
+InvokeAclocal.label = Invoke Aclocal
+InvokeAclocal.mnemonic = l
+InvokeAclocal.description = Run aclocal from the selected directory
+InvokeLibtoolize.label = Invoke Libtoolize
+InvokeLibtoolize.mnemonic = t
+InvokeLibtoolize.description = Run libtoolize in the selected directory
+Reconfigure.label = Reconfigure Project
+Reconfigure.mnemonic = f
+Reconfigure.description = Run configuration scripts for project
+DynamicBuild.label = Dynamic Build Info
+GetIncludePath.label = Get Include Path
+GetDefinedSymbols.label = Get Defined Symbols
+IncludesOption.name = includes
+SymbolsOption.name = symbols
+AutomakeEditor.name = AutomakeEditor
+Automake.name = automake
+ConfigureScript.name=Configure Script
+AutogenScript.name=Autogen Script
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/plugin.xml b/autotools/org.eclipse.linuxtools.cdt.autotools.core/plugin.xml
new file mode 100644
index 0000000..af9fbf5
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/plugin.xml
@@ -0,0 +1,517 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+     <extension
+           id="autotoolsProperties"
+           name="Autotools Build Properties"
+           point="org.eclipse.cdt.managedbuilder.core.buildProperties">
+           <propertyValue 
+              	property="org.eclipse.cdt.build.core.buildType" 
+              	id="org.eclipse.linuxtools.cdt.autotools.core.buildType.default" 
+              	name="%BuildProperty.value.name.default"/>
+           <propertyValue 
+            	property="org.eclipse.cdt.build.core.buildArtefactType" 
+            	id="org.eclipse.linuxtools.cdt.autotools.core.buildArtefactType.autotools" 
+            	name="%BuildProperty.type.name.autotools"/>
+     </extension>
+   <extension
+         id="cdt.autotools.core.managed.build.info"
+         name="Autotools Managed Build Info"
+         point="org.eclipse.cdt.managedbuilder.core.buildDefinitions">
+      <managedBuildRevision fileVersion="4.0.0"/>
+      <tool
+            command="configure"
+            id="org.eclipse.linuxtools.cdt.autotools.core.tool.configure"
+            isAbstract="false"
+            name="%Tool.configure"
+            natureFilter="both"
+            supportsManagedBuild="false">
+         <optionCategory
+               id="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.general"
+               name="%OptionCategory.configure.general"
+               owner="org.eclipse.linuxtools.cdt.autotools.core.tool.configure"/>
+         <option
+               applicabilityCalculator="org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsOptionValueHandler"
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.general"
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.name"
+               isAbstract="false"
+               name="%Option.configure.name"
+               resourceFilter="all"
+               valueHandler="org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsOptionValueHandler"
+               valueType="string">
+         </option>
+         <option
+               applicabilityCalculator="org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsOptionValueHandler"
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.general"
+               defaultValue="build"
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.builddir"
+               isAbstract="false"
+               name="%Option.configure.builddir"
+               resourceFilter="all"
+               tip="%Option.configure.builddir.tip"
+               valueHandler="org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsOptionValueHandler"
+               valueType="string"/>
+         <option
+               applicabilityCalculator="org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsOptionValueHandler"
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.general"
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.configdir"
+               isAbstract="false"
+               name="%Option.configure.configdir"
+               resourceFilter="all"
+               tip="%Option.configure.configdir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.general"
+               command="--cache-file="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.cache_file"
+               isAbstract="false"
+               name="%Option.configure.cache_file"
+               resourceFilter="all"
+               tip="%Option.configure.cache_file.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.general"
+               command="--help"
+               defaultValue="false"
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.help"
+               isAbstract="false"
+               name="%Option.configure.help"
+               resourceFilter="all"
+               tip="%Option.configure.help.tip"
+               valueType="boolean"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.general"
+               command="--no-create"
+               defaultValue="false"
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.no_create"
+               isAbstract="false"
+               name="%Option.configure.no_create"
+               resourceFilter="all"
+               tip="%Option.configure.no_create.tip"
+               valueType="boolean"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.general"
+               command="--quiet"
+               defaultValue="false"
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.quiet"
+               isAbstract="false"
+               name="%Option.configure.quiet"
+               resourceFilter="all"
+               tip="%Option.configure.quiet.tip"
+               valueType="boolean"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.general"
+               command="--version"
+               defaultValue="false"
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.version"
+               isAbstract="false"
+               name="%Option.configure.version"
+               resourceFilter="all"
+               tip="%Option.configure.version.tip"
+               valueType="boolean"/>
+         <optionCategory
+               id="org.eclipse.linuxtools.cdt.autotools.core.configure.optionCategory.configure.platform"
+               name="%OptionCategory.configure.platform"
+               owner="org.eclipse.linuxtools.cdt.autotools.core.tool.configure"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.configure.optionCategory.configure.platform"
+               command="--host="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.host"
+               isAbstract="false"
+               name="%Option.configure.host"
+               resourceFilter="all"
+               tip="%Option.configure.host.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.configure.optionCategory.configure.platform"
+               command="--target="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.target"
+               isAbstract="false"
+               name="%Option.configure.target"
+               resourceFilter="all"
+               tip="%Option.configure.target.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.configure.optionCategory.configure.platform"
+               command="--build="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.build"
+               isAbstract="false"
+               name="%Option.configure.build"
+               resourceFilter="all"
+               tip="%Option.configure.build.tip"
+               valueType="string"/>
+         <optionCategory
+               id="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               name="%OptionCategory.configure.directories"
+               owner="org.eclipse.linuxtools.cdt.autotools.core.tool.configure"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--prefix="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.prefix"
+               isAbstract="false"
+               name="%Option.configure.prefix"
+               resourceFilter="all"
+               tip="%Option.configure.prefix.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--exec-prefix="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.exec_prefix"
+               isAbstract="false"
+               name="%Option.configure.exec_prefix"
+               resourceFilter="all"
+               tip="%Option.configure.exec_prefix.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--libdir="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.libdir"
+               isAbstract="false"
+               name="%Option.configure.libdir"
+               resourceFilter="all"
+               tip="%Option.configure.libdir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--bindir="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.bindir"
+               isAbstract="false"
+               name="%Option.configure.bindir"
+               resourceFilter="all"
+               tip="%Option.configure.bindir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--sbindir="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.sbindir"
+               isAbstract="false"
+               name="%Option.configure.sbindir"
+               resourceFilter="all"
+               tip="%Option.configure.sbindir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--includedir="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.includedir"
+               isAbstract="false"
+               name="%Option.configure.includedir"
+               resourceFilter="all"
+               tip="%Option.configure.includedir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--datadir="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.datadir"
+               isAbstract="false"
+               name="%Option.configure.datadir"
+               resourceFilter="all"
+               tip="%Option.configure.datadir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--sysconfdir="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.sysconfdir"
+               isAbstract="false"
+               name="%Option.configure.sysconfdir"
+               resourceFilter="all"
+               tip="%Option.configure.sysconfdir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--infodir="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.infodir"
+               isAbstract="false"
+               name="%Option.configure.infodir"
+               resourceFilter="all"
+               tip="%Option.configure.infodir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--mandir="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.mandir"
+               isAbstract="false"
+               name="%Option.configure.mandir"
+               resourceFilter="all"
+               tip="%Option.configure.mandir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--srcdir="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.srcdir"
+               isAbstract="false"
+               name="%Option.configure.srcdir"
+               resourceFilter="all"
+               tip="%Option.configure.srcdir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--localstatedir="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.localstatedir"
+               isAbstract="false"
+               name="%Option.configure.localstatedir"
+               resourceFilter="all"
+               tip="%Option.configure.localstatedir"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--sharedstatedir="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.sharedstatedir"
+               isAbstract="false"
+               name="%Option.configure.sharedstatedir"
+               resourceFilter="all"
+               tip="%Option.configure.sharedstatedir"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--libexecdir="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.libexecdir"
+               isAbstract="false"
+               name="%Option.configure.libexecdir"
+               resourceFilter="all"
+               tip="%Option.configure.libexecdir"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.directories"
+               command="--oldincludedir="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.oldincludedir"
+               isAbstract="false"
+               name="%Option.configure.oldincludedir"
+               resourceFilter="all"
+               tip="%Option.configure.oldincludedir.tip"
+               valueType="string"/>
+         <optionCategory
+               id="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.filenames"
+               name="%OptionCategory.configure.filenames"
+               owner="org.eclipse.linuxtools.cdt.autotools.core.tool.configure"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.filenames"
+               command="--program-prefix="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.program_prefix"
+               isAbstract="false"
+               name="%Option.configure.program_prefix"
+               resourceFilter="all"
+               tip="%Option.configure.program_prefix.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.filenames"
+               command="--program-suffix="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.program_suffix"
+               isAbstract="false"
+               name="%Option.configure.program_suffix"
+               resourceFilter="all"
+               tip="%Option.configure.program_suffix.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.filenames"
+               command="--program-transform-name="
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.program_transform_name"
+               isAbstract="false"
+               name="%Option.configure.program_transform_name"
+               resourceFilter="all"
+               tip="%Option.configure.program_transform_name.tip"
+               valueType="string"/>
+         <optionCategory
+               id="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.features"
+               name="%OptionCategory.configure.features"
+               owner="org.eclipse.linuxtools.cdt.autotools.core.tool.configure"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.features"
+               command="--enable-maintainer-mode"
+               defaultValue="false"
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.enable_maintainer_mode"
+               isAbstract="false"
+               name="%Option.configure.enable_maintainer_mode"
+               resourceFilter="all"
+               tip="%Option.configure.enable_maintainer_mode.tip"
+               valueType="boolean"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.configure.features"
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.user"
+               isAbstract="false"
+               name="%Option.configure.user"
+               resourceFilter="all"
+               tip="%Option.configure.user.tip"
+               valueType="string"/>
+         <outputType
+               id="org.eclipse.linuxtools.cdt.autotools.core.outputType.configure"
+               name="%Configure.outputType"
+               outputs="status"
+               primaryOutput="true"/>
+         <inputType
+               id="org.eclipse.linuxtools.cdt.autotools.core.inputType.configure"
+               multipleOfType="false"
+               sourceContentType="org.eclipse.linuxtools.cdt.autotools.core.configureScript">
+         </inputType>
+      </tool>
+      <tool
+            command="autogen.sh"
+            id="org.eclipse.linuxtools.cdt.autotools.core.tool.autogen"
+            isAbstract="false"
+            name="%Tool.autogen"
+            natureFilter="both"
+            supportsManagedBuild="false">
+         <optionCategory
+               id="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.autogen.general"
+               name="%OptionCategory.autogen.general"
+               owner="org.eclipse.linuxtools.cdt.autotools.core.tool.autogen">
+         </optionCategory>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.core.optionCategory.autogen.general"
+               id="org.eclipse.linuxtools.cdt.autotools.core.option.autogen.user"
+               isAbstract="false"
+               name="%Option.autogen.user"
+               resourceFilter="all"
+               tip="%Option.autogen.user.tip"
+               valueType="string">
+         </option>
+         <outputType
+               id="org.eclipse.linuxtools.cdt.autotools.core.outputType.autogen"
+               name="%Autogen.outputType"
+               outputNames="configure"
+               primaryOutput="true">
+         </outputType>
+         <inputType
+               id="org.eclipse.linuxtools.cdt.autotools.core.inputType.autogen"
+               multipleOfType="false"
+               sourceContentType="org.eclipse.linuxtools.cdt.autotools.core.autogenScript">
+         </inputType>
+      </tool>
+      <targetPlatform
+            archList="all"
+            binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.GNU_ELF"
+            id="org.eclipse.linuxtools.cdt.autotools.core.targetPlatform"
+            isAbstract="false"
+            name="%Autotools.targetplatform.name"/>
+      <projectType
+            buildArtefactType="org.eclipse.linuxtools.cdt.autotools.core.buildArtefactType.autotools"
+            id="org.eclipse.linuxtools.cdt.autotools.core.projectType"
+            isAbstract="false">
+         <configuration
+               buildProperties="org.eclipse.linuxtools.cdt.autotools.core.buildType.default"
+               cleanCommand="rm -rf"
+               errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser"
+               id="org.eclipse.linuxtools.cdt.autotools.core.configuration.build"
+               name="%Configuration.build.name">
+            <toolChain
+                  archList="all"
+                  id="org.eclipse.linuxtools.cdt.autotools.core.toolChain"
+                  name="%Autotools.gnu.toolchain.name"
+                  scannerConfigDiscoveryProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"
+                  supportsManagedBuild="false"
+                  targetTool="org.eclipse.linuxtools.cdt.autotools.core.tool.configure">
+               <tool
+                     id="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure"
+                     isAbstract="false"
+                     natureFilter="both"
+                     superClass="org.eclipse.linuxtools.cdt.autotools.core.tool.configure"/>
+               <tool
+                     id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.autogen"
+                     isAbstract="false"
+                     natureFilter="both"
+                     superClass="org.eclipse.linuxtools.cdt.autotools.core.tool.autogen">
+               </tool>
+               <tool
+                     id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc"
+                     isAbstract="false"
+                     superClass="cdt.managedbuild.tool.gnu.c.compiler">
+               </tool>
+               <tool
+                     id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gpp"
+                     isAbstract="false"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.compiler">
+               </tool>
+               <targetPlatform
+                     id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.targetPlatform"
+                     isAbstract="false"
+                     name="%Autotools.targetplatform.name"
+                     superClass="org.eclipse.linuxtools.cdt.autotools.core.targetPlatform">
+               </targetPlatform>
+               <builder
+                     id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder"
+                     isAbstract="false"
+                     isVariableCaseSensitive="false">
+               </builder>
+               <supportedProperties>
+                  <property
+                        id="org.eclipse.cdt.build.core.buildArtefactType">
+                     <value
+                           id="org.eclipse.linuxtools.cdt.autotools.core.buildArtefactType.autotools">
+                     </value>
+                  </property>
+               </supportedProperties>
+            </toolChain>
+         </configuration>
+      </projectType>
+   </extension>
+   <extension
+         id="autotoolsNatureV2"
+         name="%AutotoolsNewNature.name"
+         point="org.eclipse.core.resources.natures">
+      <requires-nature
+            id="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
+      </requires-nature>
+      <runtime>
+         <run
+               class="org.eclipse.linuxtools.cdt.autotools.core.AutotoolsNewProjectNature">
+         </run>
+      </runtime>
+      <builder
+            id="org.eclipse.linuxtools.cdt.autotools.core.genmakebuilderV2">
+      </builder>
+   </extension>
+   <extension
+         id="genmakebuilderV2"
+         name="%Makefile.builder.name"
+         point="org.eclipse.core.resources.builders">
+      <builder
+            hasNature="true">
+         <run
+               class="org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsConfigurationBuilder">
+         </run>
+      </builder>
+   </extension>
+    <extension
+          point="org.eclipse.cdt.core.templateProcessTypes">
+       <processType
+             name="NewAutotoolsProject"
+             processRunner="org.eclipse.linuxtools.internal.cdt.autotools.core.wizards.NewAutotoolsProject">
+          <simple
+                name="name">
+          </simple>
+          <simple
+                external="true"
+                name="location"
+                nullable="true">
+          </simple>
+          <simple
+                name="artifactExtension">
+          </simple>
+          <simple
+                external="true"
+                name="isCProject">
+          </simple>
+       </processType>
+    </extension>
+    <extension
+          point="org.eclipse.core.contenttype.contentTypes">
+       <content-type
+             id="org.eclipse.linuxtools.cdt.autotools.core.configureScript"
+             name="%ConfigureScript.name"
+             priority="high">
+       </content-type>
+       <content-type
+             id="org.eclipse.linuxtools.cdt.autotools.core.autogenScript"
+             name="%AutogenScript.name"
+             priority="high">
+       </content-type>
+       <file-association
+             content-type="org.eclipse.linuxtools.cdt.autotools.core.configureScript"
+             file-names="configure">
+       </file-association>
+       <file-association
+             content-type="org.eclipse.linuxtools.cdt.autotools.core.autogenScript"
+             file-names="autogen.sh">
+       </file-association>
+    </extension>
+</plugin>
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/cdt/autotools/core/AutotoolsNewProjectNature.java b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/cdt/autotools/core/AutotoolsNewProjectNature.java
new file mode 100644
index 0000000..995fba1
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/cdt/autotools/core/AutotoolsNewProjectNature.java
@@ -0,0 +1,219 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 Red Hat Inc.. and others
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial implementation
+ *     IBM Rational Software - add and remove nature static methods
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.core;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
+import org.eclipse.core.resources.ICommand;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IProjectNature;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.ISchedulingRule;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsConfigurationBuilder;
+
+public class AutotoolsNewProjectNature implements IProjectNature {
+
+	public static final String AUTOTOOLS_NATURE_ID = AutotoolsPlugin.getUniqueIdentifier() + ".autotoolsNatureV2";  //$NON-NLS-1$
+	public static final String OLD_AUTOTOOLS_NATURE_ID = "org.eclipse.linuxtools.cdt.autotools.autotoolsNature"; //$NON-NLS-1$
+	public final static String BUILDER_ID = ManagedBuilderCorePlugin.getUniqueIdentifier() + ".genmakebuilder"; //$NON-NLS-1$
+	public final static String OLD_AUTOTOOLS_BUILDER_ID = "org.eclipse.linuxtools.cdt.autotools.genmakebuilder"; //$NON-NLS-1$
+
+	private IProject project;
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.resources.IProjectNature#configure()
+	 */
+	public void configure() throws CoreException {
+		addAutotoolsBuilder(project, new NullProgressMonitor());
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.resources.IProjectNature#deconfigure()
+	 */
+	public void deconfigure() throws CoreException {
+		// TODO remove builder from here
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.resources.IProjectNature#getProject()
+	 */
+	public IProject getProject() {
+		return project;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.resources.IProjectNature#setProject(org.eclipse.core.resources.IProject)
+	 */
+	public void setProject(IProject project) {
+		this.project = project;
+	}
+	
+	/**
+	 * Add the Autotools builder to the project
+	 * @param project
+	 * @param monitor
+	 * @throws CoreException
+	 */
+	public static void addAutotoolsBuilder(IProject project, IProgressMonitor monitor) throws CoreException {
+		// Add the builder to the project
+		IProjectDescription description = project.getDescription();
+		ICommand[] commands = description.getBuildSpec();
+		ArrayList<ICommand> commandList = new ArrayList<ICommand>();
+	
+		// Make sure the Autotools Configuration builder just precedes the Common Builder
+		for (int i = 0; i < commands.length; i++) {
+			ICommand command = commands[i];
+			if (command.getBuilderName().equals(AutotoolsConfigurationBuilder.BUILDER_ID)) {
+				// ignore it
+			} else {
+				if (command.getBuilderName().equals(OLD_AUTOTOOLS_BUILDER_ID)) {
+					ICommand newCommand = description.newCommand();
+					newCommand.setBuilderName(BUILDER_ID);
+					command = newCommand;
+				}
+				if (command.getBuilderName().equals(BUILDER_ID)) {
+					// add Autotools Configuration builder just before builder
+					ICommand newCommand = description.newCommand();
+					newCommand.setBuilderName(AutotoolsConfigurationBuilder.BUILDER_ID);
+					commandList.add(newCommand);
+				}
+				commandList.add(command);
+			}
+		}
+		final ICommand[] newCommands = commandList.toArray(new ICommand[commandList.size()]);
+		if (newCommands.length == commands.length) {
+			boolean hasCorrectBuilderCommands = true;
+			for (int j = 0; j < commands.length; ++j) {
+				if (!commands[j].getBuilderName().equals(newCommands[j])) {
+					hasCorrectBuilderCommands = false;
+					break;
+				}
+			}
+			if (hasCorrectBuilderCommands)
+				return;
+		}
+		final ISchedulingRule rule = ResourcesPlugin.getWorkspace().getRoot();
+		final IProject proj = project;
+
+		Job backgroundJob = new Job("Autotools Set Project Description") {
+			/* (non-Javadoc)
+			 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
+			 */
+			protected IStatus run(IProgressMonitor monitor) {
+				try {
+					ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
+
+						public void run(IProgressMonitor monitor) throws CoreException {
+
+							IProjectDescription description = proj.getDescription();
+							description.setBuildSpec(newCommands);
+							proj.setDescription(description, new NullProgressMonitor());
+						}
+					}, rule, IWorkspace.AVOID_UPDATE, monitor);
+				} catch (CoreException e) {
+					return e.getStatus();
+				}
+				IStatus returnStatus = Status.OK_STATUS;
+				return returnStatus;
+			}
+		};
+		backgroundJob.setRule(rule);
+		backgroundJob.schedule();
+	}
+
+	/**
+	 * Utility method for adding an autotools nature to a project.
+	 * 
+	 * @param proj the project to add the autotools nature to.
+	 * @param monitor a progress monitor to indicate the duration of the operation, or
+	 * <code>null</code> if progress reporting is not required.
+	 */
+	public static void addAutotoolsNature(IProject project, IProgressMonitor monitor) throws CoreException {
+		addNature(project, AUTOTOOLS_NATURE_ID, monitor);
+	}
+
+	/**
+	 * Utility method for adding a nature to a project.
+	 * 
+	 * @param proj the project to add the nature to.
+	 * @param natureId the id of the nature to assign to the project
+	 * @param monitor a progress monitor to indicate the duration of the operation, or
+	 * <code>null</code> if progress reporting is not required.
+	 */
+	public static void addNature(IProject project, String natureId, IProgressMonitor monitor) throws CoreException {
+		IProjectDescription description = project.getDescription();
+		String[] prevNatures = description.getNatureIds();
+		for (int i = 0; i < prevNatures.length; i++) {
+			if (natureId.equals(prevNatures[i]))
+				return;
+		}
+		String[] newNatures = new String[prevNatures.length + 1];
+		System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
+		newNatures[prevNatures.length] = natureId;
+		description.setNatureIds(newNatures);
+		project.setDescription(description, monitor);
+	}
+	
+	/**
+	 * Utility method to remove the autotools nature from a project.
+	 * 
+	 * @param project to remove the autotools nature from
+	 * @param mon progress monitor to indicate the duration of the operation, or 
+	 * <code>null</code> if progress reporting is not required. 
+	 * @throws CoreException
+	 */
+	public static void removeAutotoolsNature(IProject project, IProgressMonitor mon) throws CoreException {
+		removeNature(project, AUTOTOOLS_NATURE_ID, mon);
+	}
+
+	/**
+	 * Utility method to remove the old autotools nature from a project.
+	 * 
+	 * @param project to remove the old autotools nature from
+	 * @param mon progress monitor to indicate the duration of the operation, or 
+	 * <code>null</code> if progress reporting is not required. 
+	 * @throws CoreException
+	 */
+	public static void removeOldAutotoolsNature(IProject project, IProgressMonitor mon) throws CoreException {
+		removeNature(project, OLD_AUTOTOOLS_NATURE_ID, mon);
+	}
+
+	/**
+	 * Utility method for removing a project nature from a project.
+	 * 
+	 * @param proj the project to remove the nature from
+	 * @param natureId the nature id to remove
+	 * @param monitor a progress monitor to indicate the duration of the operation, or
+	 * <code>null</code> if progress reporting is not required.
+	 */
+	public static void removeNature(IProject project, String natureId, IProgressMonitor monitor) throws CoreException {
+		IProjectDescription description = project.getDescription();
+		String[] prevNatures = description.getNatureIds();
+		List<String> newNatures = new ArrayList<String>(Arrays.asList(prevNatures));
+		newNatures.remove(natureId);
+		description.setNatureIds((String[])newNatures.toArray(new String[newNatures.size()]));
+		project.setDescription(description, monitor);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/cdt/autotools/core/AutotoolsPlugin.java b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/cdt/autotools/core/AutotoolsPlugin.java
new file mode 100644
index 0000000..87ce42e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/cdt/autotools/core/AutotoolsPlugin.java
@@ -0,0 +1,291 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.core;
+
+import java.lang.reflect.InvocationTargetException;
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.IManagedProject;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The main plugin class to be used in the desktop.
+ */
+
+public class AutotoolsPlugin extends AbstractUIPlugin {
+
+	//The shared instance.
+	private static AutotoolsPlugin plugin;
+	private ResourceBundle resourceBundle;
+	
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.cdt.autotools.core"; //$NON-NLS-1$
+	public static final String AUTOTOOLS_PROJECT_TYPE_ID = PLUGIN_ID + ".projectType"; //$NON-NLS-1$
+
+	/**
+	 * The constructor.
+	 */
+	public AutotoolsPlugin() {
+		plugin = this;
+		try {
+			resourceBundle = ResourceBundle.getBundle(PLUGIN_ID + ".Resources"); //$NON-NLS-1$
+		} catch (MissingResourceException x) {
+			resourceBundle = null;
+		}
+
+	}
+
+	public static String getPluginId() {
+		return PLUGIN_ID;
+	}
+	
+	public static String getUniqueIdentifier() {
+		if (getDefault() == null) {
+			// If the default instance is not yet initialized,
+			// return a static identifier. This identifier must
+			// match the plugin id defined in plugin.xml
+			return PLUGIN_ID;
+		}
+		return getDefault().getBundle().getSymbolicName();
+	}
+
+	/**
+	 * This method is called upon plug-in activation
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+	}
+
+	/**
+	 * This method is called when the plug-in is stopped
+	 */
+	public void stop(BundleContext context) throws Exception {
+		super.stop(context);
+		plugin = null;
+	}
+
+	/**
+	 * Returns the shared instance.
+	 */
+	public static AutotoolsPlugin getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Returns active shell.
+	 */
+	public static Shell getActiveWorkbenchShell() {
+		IWorkbenchWindow window = getDefault().getWorkbench().getActiveWorkbenchWindow();
+		if (window != null) {
+			return window.getShell();
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the string from the plugin's resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @return the resource bundle message
+	 */
+	public static String getResourceString(String key) {
+		ResourceBundle bundle = AutotoolsPlugin.getDefault().getResourceBundle();
+		try {
+			return bundle.getString(key);
+		} catch (MissingResourceException e) {
+			return key;
+		}
+	}
+
+	/**
+	 * Returns the string from the plugin's resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @param args an array of substituition strings
+	 * @return the resource bundle message
+	 */
+	public static String getFormattedString(String key, String[] args) {
+		return MessageFormat.format(getResourceString(key), (Object[])args);
+	}
+
+	/**
+	 * Returns the plugin's resource bundle,
+	 */
+	public ResourceBundle getResourceBundle() {
+		return resourceBundle;
+	}
+
+	public static boolean hasTargetBuilder(IProject project) {
+		try {
+			// When a project is converted to an Autotools project, we
+			// replace the ManagedMake builder with a special one that
+			// handles MakeTargets.  If a project is brought into Eclipse and
+			// uses the New Project Wizard to create a ManagedMake project that
+			// is of type: Autotools, this added step is not done.  If we know
+			// we have an Autotools project from the configuration id, then
+			// we should add the builder now.  We also should replace the
+			// default ManagedMake scanner provider with the Autotools one,
+			// then return true.
+			if (project.getNature(ManagedCProjectNature.MNG_NATURE_ID) != null) {
+				IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+				IManagedProject m = info.getManagedProject();
+				if (m != null && m.getProjectType().getId().equals(AUTOTOOLS_PROJECT_TYPE_ID)) {
+					AutotoolsNewProjectNature.addAutotoolsBuilder(project, new NullProgressMonitor());
+					return true;
+				}
+			}
+		} catch (CoreException e) {
+			// Don't care...fall through to not found.
+		} catch (Exception f) {
+			// Don't care...fall through to not found.
+		}
+		// Otherwise not found.
+		return false;
+	}
+
+	/**
+	 * Returns an image descriptor for the image file at the given
+	 * plug-in relative path.
+	 *
+	 * @param path the path
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
+	}
+	
+	public static void log(IStatus status) {
+		ResourcesPlugin.getPlugin().getLog().log(status);
+	}
+
+	public static void logErrorMessage(String message) {
+		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, message, null));
+	}
+
+	public static void logException(Throwable e, final String title, String message) {
+		if (e instanceof InvocationTargetException) {
+			e = ((InvocationTargetException) e).getTargetException();
+		}
+		IStatus status = null;
+		if (e instanceof CoreException)
+			status = ((CoreException) e).getStatus();
+		else {
+			if (message == null)
+				message = e.getMessage();
+			if (message == null)
+				message = e.toString();
+			status = new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.OK, message, e);
+		}
+		ResourcesPlugin.getPlugin().getLog().log(status);
+		Display display;
+		display = Display.getCurrent();
+		if (display == null)
+			display = Display.getDefault();
+		final IStatus fstatus = status;
+		display.asyncExec(new Runnable() {
+			public void run() {
+				ErrorDialog.openError(null, title, null, fstatus);
+			}
+		});
+	}
+
+	public static void logException(Throwable e) {
+		logException(e, null, null);
+	}
+
+	public static void log(Throwable e) {
+		if (e instanceof InvocationTargetException)
+			e = ((InvocationTargetException) e).getTargetException();
+		IStatus status = null;
+		if (e instanceof CoreException)
+			status = ((CoreException) e).getStatus();
+		else
+			status = new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.OK, e.getMessage(), e);
+		log(status);
+	}
+
+	/**
+	* Utility method with conventions
+	*/
+	public static void errorDialog(Shell shell, String title, String message, IStatus s) {
+		log(s);
+		// if the 'message' resource string and the IStatus' message are the same,
+		// don't show both in the dialog
+		if (s != null && message.equals(s.getMessage())) {
+			message = null;
+		}
+		ErrorDialog.openError(shell, title, message, s);
+	}
+
+	/**
+	* Utility method with conventions
+	*/
+	public static void errorDialog(Shell shell, String title, String message, Throwable t) {
+		log(t);
+		IStatus status;
+		if (t instanceof CoreException) {
+			status = ((CoreException) t).getStatus();
+			// if the 'message' resource string and the IStatus' message are the same,
+			// don't show both in the dialog
+			if (status != null && message.equals(status.getMessage())) {
+				message = null;
+			}
+		} else {
+			status = new Status(IStatus.ERROR, AutotoolsPlugin.getUniqueIdentifier(), -1, "Internal Error: ", t); //$NON-NLS-1$	
+		}
+		ErrorDialog.openError(shell, title, message, status);
+	}
+	
+	/**
+	 * Returns the workspace instance.
+	 */
+	public static IWorkspace getWorkspace() {
+		return ResourcesPlugin.getWorkspace();
+	}
+
+	/**
+	 * Returns the active workbench window or <code>null</code> if none
+	 */
+	public static IWorkbenchWindow getActiveWorkbenchWindow() {
+		return getDefault().getWorkbench().getActiveWorkbenchWindow();
+	}
+
+	/**
+	 * Returns the active workbench page or <code>null</code> if none.
+	 */
+	public static IWorkbenchPage getActivePage() {
+		IWorkbenchWindow window= getActiveWorkbenchWindow();
+		if (window != null) {
+			return window.getActivePage();
+		}
+		return null;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/cdt/autotools/core/Resources.properties b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/cdt/autotools/core/Resources.properties
new file mode 100644
index 0000000..ee20f59
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/cdt/autotools/core/Resources.properties
@@ -0,0 +1,106 @@
+#################################################################################
+#  Copyright (c) 2006, 2007, 2009 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+# 
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#      IBM Rational Software - ManagedMakeMessages copied to AutotoolsMakefileBuilder
+#################################################################################
+MakeCWizard.title=C/Make Project
+MakeCWizard.description=Create a New C Project using 'make' to build it
+
+WARNING_UNSUPPORTED_CONFIGURATION=Warning: unsupported configuration
+
+AutotoolsMakefileBuilder.message.finished=Build complete for project {0}
+AutotoolsMakefileBuilder.message.stopped=Build stopped
+AutotoolsMakefileBuilder.type.clean=Clean-only build
+AutotoolsMakefileBuilder.message.clean.deleting.output=Removing build artifacts from {0}
+AutotoolsMakefileBuilder.message.console.header=**** {0} of configuration {1} for project {2} ****
+
+MakeGenerator.makefile.built=Makefile built
+MakeGenerator.refresh=Refresh
+MakeGenerator.refresh.error=Refresh error
+MakeGenerator.generation.error=Configuration failed with error
+MakeGenerator.configuring=Configuring
+MakeGenerator.make.message=Invoking {0} for project {1}
+MakeGenerator.config.error=Error {0} occurred while running {1}
+MakeGenerator.createdir.error=Error creating build directory: {0}
+MakeGenerator.run.config.status=Running config.status in build directory: {0}
+MakeGenerator.makefile.cvs=Invoking Makefile.cvs in build directory: {0}
+MakeGenerator.autogen.sh=Invoking autogen.sh in build directory: {0}
+MakeGenerator.autoreconf=Invoking autoreconf in build directory: {0}
+MakeGenerator.gen.makefile=Generating Makefile in build directory: {0}
+MakeGenerator.clean.builddir=Cleaning build directory: {0}
+MakeGenerator.clean.topdir=Cleaning top-level source directory to allow other configuration to run
+MakeGenerator.gen.configure=Generating configure
+MakeGenerator.unsupportedConfig=Warning: unsupported configuration {0}
+MakeGenerator.success=[Operation successful]
+MakeGenerator.didnt.generate=No Makefile generated
+MakeGenerator.refresh.MakeTargets=Refreshing Make Targets
+
+BuildDir.apply=Build directory already in use
+BuildDir.default=Default build directory to unused value?
+BuildDir.yes=Yes
+BuildDir.no=No
+
+WizardAutotoolsProjectConversion.title=Convert to CVS C/C++ Autotools Project
+WizardAutotoolsProjectConversion.description=Convert a CVS source repository to C/C++ Autotools Project
+WizardAutotoolsProjectConversion.message.add_nature=Adding C/C++ Autotools Managed Project Nature
+WizardAutotoolsProjectConversion.message.add_builder=Adding C/C++ Autotools Managed Project Builder
+WizardMakeProjectConversion.monitor.convertingToMakeProject=Converting Project...
+WizardAutotoolsConversion=CVS C/C++ Autotools Conversion
+WizardAutotoolsConversion.windowTitle=Conversion to CVS C/C++ Autotools Project
+WizardAutotoolsConversion.config.title=Select a configuration
+WizardAutotoolsConversion.config.desc=Select the configuration you wish to deploy on
+WizardAutotoolsConversion.options.title=Additional Project Settings
+WizardAutotoolsConversion.options.desc=Define the inter-project dependencies, if any.
+WizardAutotoolsConversion.message.save=Saving new build options
+
+WizardAutotoolsNewCProject.title=Autotools C Project
+WizardAutotoolsNewCProject.description=Create a new C Autotools project
+WizardAutotoolsNewCProject.monitor.creatingProject=Creating Project...
+WizardAutotoolsNewCProject.windowTitle=GNU Autotools C Project
+WizardAutotoolsNewCProject.config.title=Select a configuration
+WizardAutotoolsNewCProject.config.desc=Select the configuration you wish to deploy on
+WizardAutotoolsNewCProject.options.title=Additional Project Settings
+WizardAutotoolsNewCProject.options.desc=Define the inter-project dependencies, if any.
+WizardAutotoolsNewCProject.message.save=Saving new build options
+
+WizardAutotoolsNewCProjectV2.title=Autotools C Project V2
+WizardAutotoolsNewCProjectV2.description=Create a new C Autotools project
+WizardAutotoolsNewCProjectV2.monitor.creatingProject=Creating Project...
+WizardAutotoolsNewCProjectV2.windowTitle=GNU Autotools C Project V2
+WizardAutotoolsNewCProjectV2.config.title=Select a configuration
+WizardAutotoolsNewCProjectV2.config.desc=Select the configuration you wish to deploy on
+WizardAutotoolsNewCProjectV2.options.title=Additional Project Settings
+WizardAutotoolsNewCProjectV2.options.desc=Define the inter-project dependencies, if any.
+WizardAutotoolsNewCProjectV2.message.save=Saving new build options
+
+WizardAutotoolsNewCCProject.title=Autotools C++ Project
+WizardAutotoolsNewCCProject.description=Create a new C++ Autotools project
+WizardAutotoolsNewCCProject.monitor.creatingProject=Creating Project...
+WizardAutotoolsNewCCProject.windowTitle=GNU Autotools C++ Project
+WizardAutotoolsNewCCProject.config.title=Select a configuration
+WizardAutotoolsNewCCProject.config.desc=Select the configuration you wish to deploy on
+WizardAutotoolsNewCCProject.options.title=Additional Project Settings
+WizardAutotoolsNewCCProject.options.desc=Define the inter-project dependencies, if any.
+WizardAutotoolsNewCCProject.message.save=Saving new build options
+
+
+BuildTargetDialog.title.buildTarget=Build Special Targets
+BuildTargetDialog.title.makeTargetsFor=Make targets for 
+BuildTargetDialog.button.build=Build
+
+TargetListViewer.button.add=Add...
+TargetListViewer.button.remove=Remove
+TargetListViewer.button.edit=Edit...
+TargetListViewer.label.target=Target
+TargetListViewer.label.location=Location
+TargetListViewer.exception.error=Error
+TargetListViewer.exception.message=An error occurred performing the selected action
+
+AutotoolsPreferencePage.useAutotoolsFileScanner.label=Use make -w for includepath scanning
+MakeTargetPreferencePage.buildTargetInBackground.label=Build target in background
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsConfigurationBuilder.java b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsConfigurationBuilder.java
new file mode 100644
index 0000000..fce7c29
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsConfigurationBuilder.java
@@ -0,0 +1,159 @@
+package org.eclipse.linuxtools.internal.cdt.autotools.core;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Map;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.resources.ACBuilder;
+import org.eclipse.cdt.core.resources.IConsole;
+import org.eclipse.cdt.managedbuilder.core.IBuilder;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.IMultiConfiguration;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsConfigurationManager;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IAConfiguration;
+
+public class AutotoolsConfigurationBuilder extends ACBuilder {
+
+	public static final String BUILDER_NAME = "genmakebuilderV2"; //$NON-NLS-1$
+	public static final String BUILDER_ID = AutotoolsPlugin.getUniqueIdentifier() + "." + BUILDER_NAME; //$NON-NLS-1$
+
+	private static final String BUILD_STOPPED="AutotoolsMakefileBuilder.message.stopped"; //$NON-NLS-1$
+	private AutotoolsNewMakeGenerator generator;
+
+	public AutotoolsConfigurationBuilder() {
+		super();
+		generator = new AutotoolsNewMakeGenerator();
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	protected IProject[] build(int kind, Map args, IProgressMonitor monitor)
+	throws CoreException {
+		IProject project = getProject();
+
+		boolean bPerformBuild = true;
+		IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+		if (!shouldBuild(kind, info)) {
+			return new IProject[0];
+		}
+		if (kind == IncrementalProjectBuilder.AUTO_BUILD) {
+			IResourceDelta delta = getDelta(getProject());
+			if (delta != null) {
+				IResource res = delta.getResource();
+				if (res != null) {
+					bPerformBuild = res.getProject().equals(getProject());
+				}
+			} else {
+				bPerformBuild = false;
+			}
+			IConfiguration cfg = info.getDefaultConfiguration();
+			if (cfg != null) {
+				IAConfiguration acfg = AutotoolsConfigurationManager.getInstance().findCfg(project, cfg.getName());
+				if (acfg == null || acfg.isDirty())
+					bPerformBuild = true;
+			}
+		}
+		if (bPerformBuild) {
+			MultiStatus result = performMakefileGeneration(project, info, monitor);
+			if (result.getSeverity() == IStatus.ERROR) {
+				// Failure to create Makefile, output error message to console.
+				IConsole console = CCorePlugin.getDefault().getConsole();
+				console.start(project);
+
+				OutputStream cos = console.getOutputStream();
+				String errormsg = AutotoolsPlugin.getResourceString(BUILD_STOPPED);
+				StringBuffer buf = new StringBuffer(errormsg);
+				buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$
+				buf.append("(").append(result.getMessage()).append(")"); //$NON-NLS-1$ //$NON-NLS-2$
+
+				try {
+					cos.write(buf.toString().getBytes());
+					cos.flush();
+					cos.close();
+				} catch (IOException e) {
+					// TODO Auto-generated catch block
+					AutotoolsPlugin.log(e);
+				}
+			}
+		}
+		checkCancel(monitor);
+		return getProject().getReferencedProjects();
+	}
+	
+	@Override
+	protected void clean(IProgressMonitor monitor) throws CoreException {
+		IProject project = getProject();
+		final IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(getProject());
+		if (shouldBuild(CLEAN_BUILD, info)) {
+			IConfiguration icfg = info.getDefaultConfiguration();
+			if (icfg instanceof IMultiConfiguration) {
+				IMultiConfiguration mcfg = (IMultiConfiguration)icfg;
+				IConfiguration[] cfgs = (IConfiguration[])mcfg.getItems();
+				for (int i = 0; i < cfgs.length; ++i) {
+					IAConfiguration cfg = AutotoolsConfigurationManager.getInstance().getConfiguration(project, icfg.getName());
+					cfg.setDirty(true);
+				}
+			} else {
+				IAConfiguration cfg = AutotoolsConfigurationManager.getInstance().getConfiguration(project, icfg.getName());
+				cfg.setDirty(true);  // Mark Configuration dirty so next build will do full reconfigure
+			}
+		}
+	}
+
+	protected MultiStatus performMakefileGeneration(IProject project, IManagedBuildInfo info,
+			IProgressMonitor monitor) throws CoreException {
+		MultiStatus result;
+		
+		try {
+			generator.initialize(project, info, monitor);
+			result = generator.regenerateMakefiles(false);
+		} catch (CoreException e) {
+			String errMsg = AutotoolsPlugin.getResourceString("MakeGenerator.didnt.generate"); //$NON-NLS-1$
+			result = new MultiStatus(AutotoolsPlugin.getUniqueIdentifier(), IStatus.ERROR,
+					errMsg, e);
+		}
+		
+		return result;
+	}
+
+	/**
+	 * Check whether the build has been canceled.
+	 */
+	public void checkCancel(IProgressMonitor monitor) {
+		if (monitor != null && monitor.isCanceled())
+			throw new OperationCanceledException();
+	}
+
+	protected boolean shouldBuild(int kind, IManagedBuildInfo info) {
+		IConfiguration cfg = info.getDefaultConfiguration();
+		IBuilder builder = null;
+		if (cfg != null) {
+			builder = cfg.getEditableBuilder();
+		switch (kind) {
+		case IncrementalProjectBuilder.AUTO_BUILD :
+			return builder.isAutoBuildEnable();
+		case IncrementalProjectBuilder.INCREMENTAL_BUILD : // now treated as the same!
+		case IncrementalProjectBuilder.FULL_BUILD :
+			return builder.isFullBuildEnabled() | builder.isIncrementalBuildEnabled() ;
+		case IncrementalProjectBuilder.CLEAN_BUILD :
+			return builder.isCleanBuildEnabled();
+		}
+		}
+		return true;
+	}
+
+}
+		
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java
new file mode 100644
index 0000000..1cb552d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java
@@ -0,0 +1,1273 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.CommandLauncher;
+import org.eclipse.cdt.core.ConsoleOutputStream;
+import org.eclipse.cdt.core.ICDescriptor;
+import org.eclipse.cdt.core.envvar.IEnvironmentVariable;
+import org.eclipse.cdt.core.resources.IConsole;
+import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
+import org.eclipse.cdt.core.settings.model.ICProjectDescription;
+import org.eclipse.cdt.core.settings.model.ICStorageElement;
+import org.eclipse.cdt.make.core.IMakeBuilderInfo;
+import org.eclipse.cdt.make.core.IMakeTarget;
+import org.eclipse.cdt.make.core.IMakeTargetManager;
+import org.eclipse.cdt.make.core.MakeCorePlugin;
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.core.makefile.ITarget;
+import org.eclipse.cdt.make.core.makefile.ITargetRule;
+import org.eclipse.cdt.managedbuilder.core.BuildException;
+import org.eclipse.cdt.managedbuilder.core.IBuilder;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.IMultiConfiguration;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
+import org.eclipse.cdt.managedbuilder.macros.BuildMacroException;
+import org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider;
+import org.eclipse.cdt.newmake.core.IMakeCommonBuildInfo;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceStatus;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsConfigurationManager;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IAConfiguration;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IConfigureOption;
+
+
+@SuppressWarnings("deprecation")
+public class AutotoolsNewMakeGenerator extends MarkerGenerator {
+
+	public final String CONFIG_STATUS = "config.status"; //$NON-NLS-1$
+	public final String MAKEFILE = "Makefile"; //$NON-NLS-1$
+	public final String MAKEFILE_CVS = "Makefile.cvs"; //$NON-NLS-1$
+	public final String SETTINGS_FILE_NAME = ".cdtconfigure"; //$NON-NLS-1$
+	public final String SHELL_COMMAND = "sh"; //$NON-NLS-1$
+	
+	public final String AUTOGEN_TOOL_ID = "autogen"; //$NON-NLS-1$
+	public final String CONFIGURE_TOOL_ID = "configure"; //$NON-NLS-1$
+	
+	public final String GENERATED_TARGET = AutotoolsPlugin.PLUGIN_ID + ".generated.MakeTarget"; //$NON-NLS-1$
+
+	private static final String MAKE_TARGET_KEY = MakeCorePlugin.getUniqueIdentifier() + ".buildtargets"; //$NON-NLS-1$
+	private static final String BUILD_TARGET_ELEMENT = "buildTargets"; //$NON-NLS-1$
+	private static final String TARGET_ELEMENT = "target"; //$NON-NLS-1$
+	private static final String TARGET_ATTR_ID = "targetID"; //$NON-NLS-1$
+	private static final String TARGET_ATTR_PATH = "path"; //$NON-NLS-1$
+	private static final String TARGET_ATTR_NAME = "name"; //$NON-NLS-1$
+	private static final String TARGET_STOP_ON_ERROR = "stopOnError"; //$NON-NLS-1$
+	private static final String TARGET_USE_DEFAULT_CMD = "useDefaultCommand"; //$NON-NLS-1$
+	private static final String TARGET_ARGUMENTS = "buildArguments"; //$NON-NLS-1$
+	private static final String TARGET_COMMAND = "buildCommand"; //$NON-NLS-1$
+	private static final String TARGET_RUN_ALL_BUILDERS = "runAllBuilders";
+	private static final String TARGET = "buildTarget"; //$NON-NLS-1$
+	private static final String DEFAULT_AUTORECONF = "autoreconf"; //$NON-NLS-1$
+
+	private IProject project;
+
+	private IProgressMonitor monitor;
+
+	private IPath buildLocation;
+	private String buildDir;
+	private String srcDir;
+
+	private IConfiguration cfg;
+	private ICConfigurationDescription cdesc;
+	private IAConfiguration toolsCfg;
+	private IBuilder builder;
+
+	public void generateDependencies() throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	public MultiStatus generateMakefiles(IResourceDelta delta)
+			throws CoreException {
+		return regenerateMakefiles(false);
+	}
+
+	private void initializeBuildConfigDirs(IConfiguration c, IAConfiguration a) {
+		IBuilder b = c.getBuilder();
+		IPath buildDirectory = b.getBuildLocation();
+		if (buildDirectory == null || buildDirectory.isEmpty()) {
+			// default build directory to project directory
+			buildDirectory = project.getLocation();
+		}
+		buildLocation = buildDirectory;
+		buildDir = buildDirectory.toString();
+		srcDir = a.getConfigToolDirectory();
+		try {
+			String resolved = ManagedBuildManager.getBuildMacroProvider().resolveValue(srcDir, "", null, 
+					IBuildMacroProvider.CONTEXT_CONFIGURATION, c);
+			srcDir = resolved;
+		} catch (BuildMacroException e) {
+			// do nothing
+		}
+	}
+	
+	public void initialize(IProject project, IManagedBuildInfo info,
+			IProgressMonitor monitor) {
+		this.project = project;
+		ICProjectDescription pdesc = CCorePlugin.getDefault().getProjectDescription(project);
+		this.cdesc = pdesc.getActiveConfiguration();
+		this.cfg = info.getDefaultConfiguration();
+		this.builder = cfg.getBuilder();
+		this.monitor = monitor;
+	}
+
+	public IProject getProject() {
+		return project;
+	}
+	
+	public boolean isGeneratedResource(IResource resource) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public void regenerateDependencies(boolean force) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	/*
+	 * (non-Javadoc) Check whether the build has been cancelled. Cancellation
+	 * requests propagated to the caller by throwing <code>OperationCanceledException</code>.
+	 * 
+	 * @see org.eclipse.core.runtime.OperationCanceledException#OperationCanceledException()
+	 */
+	protected void checkCancel() {
+		if (monitor != null && monitor.isCanceled()) {
+			throw new OperationCanceledException();
+		}
+	}
+
+	/*
+	 * (non-Javadoc) Return or create the makefile needed for the build. If we
+	 * are creating the resource, set the derived bit to true so the CM system
+	 * ignores the contents. If the resource exists, respect the existing
+	 * derived setting.
+	 * 
+	 * @param makefilePath @return IFile
+	 */
+	protected IFile createFile(IPath makefilePath) throws CoreException {
+		// Create or get the handle for the makefile
+		IWorkspaceRoot root = CCorePlugin.getWorkspace().getRoot();
+		IFile newFile = root.getFileForLocation(makefilePath);
+		if (newFile == null) {
+			newFile = root.getFile(makefilePath);
+		}
+		// Create the file if it does not exist
+		ByteArrayInputStream contents = new ByteArrayInputStream(new byte[0]);
+		try {
+			newFile.create(contents, false, new SubProgressMonitor(monitor, 1));
+			// Make sure the new file is marked as derived
+			if (!newFile.isDerived()) {
+				newFile.setDerived(true);
+			}
+
+		} catch (CoreException e) {
+			// If the file already existed locally, just refresh to get contents
+			if (e.getStatus().getCode() == IResourceStatus.PATH_OCCUPIED)
+				newFile.refreshLocal(IResource.DEPTH_ZERO, null);
+			else
+				throw e;
+		}
+
+		return newFile;
+	}
+
+	/*
+	 * Create a directory
+	 * 
+	 * @param boolean @return whether the directory was created
+	 */
+	private boolean createDirectory(String dirName) throws CoreException {
+		// Create or get the handle for the build directory
+		IPath path = new Path(dirName);
+		boolean rc = true;
+		if (dirName.length() == 0 || dirName.equals("."))
+			path = project.getLocation().append(dirName);
+		File f = path.toFile();
+		if (!f.exists())
+			rc = f.mkdirs();
+
+		return rc;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator#getMakefileName()
+	 */
+	public String getMakefileName() {
+		return new String(MAKEFILE);
+	}
+
+	/**
+	 * Reconfigure the project.
+	 * @return MultiStatus status of regeneration operation
+	 * @throws CoreException
+	 */
+	public MultiStatus reconfigure() throws CoreException {
+		return regenerateMakefiles(true);
+	}
+	
+	public MultiStatus regenerateMakefiles(boolean reconfigure) throws CoreException {
+		MultiStatus status = null;
+		if (cfg instanceof IMultiConfiguration) {
+			IMultiConfiguration mfcg = (IMultiConfiguration)cfg;
+			Object[] objs = mfcg.getItems();
+			for (int i = 0; i < objs.length; ++i) {
+				IConfiguration icfg = (IConfiguration)objs[i];
+				Status rc = regenerateMakefiles(icfg, reconfigure);
+				if (!rc.isOK()) {
+					if(status == null){
+						status = new MultiStatus(
+								AutotoolsPlugin.getUniqueIdentifier(),
+								IStatus.ERROR,
+								new String(),
+								null);
+					}
+					status.add(rc);	
+				}
+			}
+		} else {
+			Status rc = regenerateMakefiles(cfg, reconfigure);
+			if (!rc.isOK()) {
+				if(status == null){
+					status = new MultiStatus(
+							AutotoolsPlugin.getUniqueIdentifier(),
+							IStatus.ERROR,
+							new String(),
+							null);
+				}
+				status.add(rc);	
+			}
+		}
+		if(status == null){
+			status = new MultiStatus(
+					ManagedBuilderCorePlugin.getUniqueIdentifier(),
+					IStatus.OK,
+					new String(),
+					null);
+		}
+		return status;
+	}
+	
+	private Status regenerateMakefiles(IConfiguration icfg, boolean reconfigure) throws CoreException {
+		Status status;
+		int rc = IStatus.OK;
+		String errMsg = new String();
+		boolean needFullConfigure = false;
+
+		// See if the user has cancelled the build
+		checkCancel();
+
+		// Synchronize the Autotools configurations with the Project Description
+		AutotoolsConfigurationManager.getInstance().syncConfigurations(getProject());	
+		toolsCfg = AutotoolsConfigurationManager.getInstance().getConfiguration(getProject(), icfg.getId());
+			
+		initializeBuildConfigDirs(icfg, toolsCfg);
+		// Create the top-level directory for the build output
+		if (!createDirectory(buildDir)) {
+			rc = IStatus.ERROR;
+			errMsg = AutotoolsPlugin.getFormattedString("MakeGenerator.createdir.error", //$NON-NLS-1$
+					new String[] {buildDir});
+			status = new MultiStatus(AutotoolsPlugin
+						.getUniqueIdentifier(), rc, errMsg, null);
+		}
+		checkCancel();
+
+		// // How did we do
+		// if (!getInvalidDirList().isEmpty()) {
+		// status = new MultiStatus (
+		// ManagedBuilderCorePlugin.getUniqueIdentifier(),
+		// IStatus.WARNING,
+		// new String(),
+		// null);
+		// // Add a new status for each of the bad folders
+		// iter = getInvalidDirList().iterator();
+		// while (iter.hasNext()) {
+		// status.add(new Status (
+		// IStatus.WARNING,
+		// ManagedBuilderCorePlugin.getUniqueIdentifier(),
+		// SPACES_IN_PATH,
+		// ((IContainer)iter.next()).getFullPath().toString(),
+		// null));
+		// }
+		// } else {
+		// status = new MultiStatus(
+		// ManagedBuilderCorePlugin.getUniqueIdentifier(),
+		// IStatus.OK,
+		// new String(),
+		// null);
+		// }
+
+		// Get a build console for the project
+		IConsole console = CCorePlugin.getDefault().getConsole("org.eclipse.linuxtools.cdt.autotools.ui.configureConsole"); //$NON-NLS-1$
+		boolean consoleStart = true;
+		
+		// Make sure there's a monitor to cancel the build
+		if (monitor == null) {
+			monitor = new NullProgressMonitor();
+		}
+
+		try {
+			// If a config.status file exists in the build directory, we call it
+			// to
+			// regenerate the makefile
+			IPath configfile = buildLocation.append(CONFIG_STATUS);
+			IPath topConfigFile = project.getLocation().append(CONFIG_STATUS);
+			IPath makefilePath = buildLocation.append(MAKEFILE);
+			IPath topMakefilePath = project.getLocation().append(MAKEFILE);
+			File configStatus = configfile.toFile();
+			File topConfigStatus = topConfigFile.toFile();
+			File makefile = makefilePath.toFile();
+			File topMakefile = topMakefilePath.toFile();
+
+			// Check if a configure has been done in the top-level source directory
+			if (!(configfile.equals(topConfigFile)) && topConfigStatus.exists()) {
+				// Must perform distclean on source directory because 2nd configuration
+				// cannot occur otherwise
+				// There is a make target for cleaning.
+				if (topMakefile != null && topMakefile.exists()) {
+					String[] makeargs = new String[1];
+					IPath makeCmd = new Path("make"); //$NON-NLS-1$
+					String target = null;
+					try {
+						target = getProject().getPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET);
+					} catch (CoreException ce) {
+						// do nothing
+					}
+					if (target == null)
+						target = AutotoolsPropertyConstants.CLEAN_MAKE_TARGET_DEFAULT;
+					String args = builder.getBuildArguments();
+					if (args != null && !(args = args.trim()).equals("")) { //$NON-NLS-1$
+						String[] newArgs = makeArray(args);
+						makeargs = new String[newArgs.length + 1];
+						System.arraycopy(newArgs, 0, makeargs, 0, newArgs.length);
+					}
+					makeargs[makeargs.length - 1] = target;
+					rc = runCommand(makeCmd,
+							project.getLocation(),
+							makeargs,
+							AutotoolsPlugin.getResourceString("MakeGenerator.clean.topdir"), //$NON-NLS-1$
+							errMsg, console, consoleStart);
+					consoleStart = false;
+				}
+			}
+			// If the active configuration is dirty, then we need to do a full
+			// reconfigure.
+			if (toolsCfg.isDirty() || reconfigure) {
+				needFullConfigure = true;
+				// If we are going to do a full reconfigure, then if the current
+				// build directory exists, we should clean it out first.  This is
+				// because the reconfiguration could change compile flags, etc..
+				// and the Makefile might not detect a rebuild is required.  In
+				// addition, the build directory itself could have been changed and
+				// we should remove the previous build.
+				if (buildLocation != null && buildLocation.toFile().exists()) {
+					// See what type of cleaning the user has set up in the
+					// build properties dialog.
+					String cleanDelete = null;
+					try {
+						cleanDelete = getProject().getPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE);
+					} catch (CoreException ce) {
+						// do nothing
+					}
+					
+					if (cleanDelete != null && cleanDelete.equals(AutotoolsPropertyConstants.TRUE))
+						buildLocation.toFile().delete();
+					else {
+						// There is a make target for cleaning.
+						if (makefile != null && makefile.exists()) {
+							String[] makeargs = new String[1];
+							IPath makeCmd = new Path("make"); //$NON-NLS-1$
+							String target = null;
+							try {
+								target = getProject().getPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET);
+							} catch (CoreException ce) {
+								// do nothing
+							}
+							if (target == null)
+								target = AutotoolsPropertyConstants.CLEAN_MAKE_TARGET_DEFAULT;
+							String args = builder.getBuildArguments();
+							if (args != null && !(args = args.trim()).equals("")) { //$NON-NLS-1$
+								String[] newArgs = makeArray(args);
+								makeargs = new String[newArgs.length + 1];
+								System.arraycopy(newArgs, 0, makeargs, 0, newArgs.length);
+							}
+							makeargs[makeargs.length - 1] = target;
+							rc = runCommand(makeCmd,
+									buildLocation,
+									makeargs,
+									AutotoolsPlugin.getFormattedString("MakeGenerator.clean.builddir", new String[]{buildDir}), //$NON-NLS-1$
+									errMsg, console, consoleStart);
+							consoleStart = false;
+						}
+					}
+				}
+				// Mark the scanner info as dirty.
+				try {
+					project.setSessionProperty(AutotoolsPropertyConstants.SCANNER_INFO_DIRTY, Boolean.TRUE);
+				} catch (CoreException ce) {
+					// do nothing
+				}
+			}
+			
+			ArrayList<String> configureEnvs = new ArrayList<String>();
+			ArrayList<String> configureCmdParms = new ArrayList<String>();
+			IPath configurePath = getConfigurePath(configureEnvs, configureCmdParms);
+			String[] configArgs = getConfigArgs(configureCmdParms);
+			ArrayList<String> autogenEnvs = new ArrayList<String>();
+			ArrayList<String> autogenCmdParms = new ArrayList<String>();
+			IPath autogenPath = getAutogenPath(autogenEnvs, autogenCmdParms);
+			
+			// Check if we have a config.status (meaning configure has already run).
+    		if (!needFullConfigure && configStatus != null && configStatus.exists()) {
+			    // If no corresponding Makefile in the same build location, then we
+	            // can simply run config.status again to ensure the top level Makefile has been
+				// created.
+				if (makefile == null || !makefile.exists()) {
+					rc = runScript(configfile, buildLocation, null, 
+							AutotoolsPlugin.getFormattedString("MakeGenerator.run.config.status", new String[]{buildDir}), //$NON-NLS-1$
+							errMsg, console, null, consoleStart);
+					consoleStart = false;
+				}
+			}
+			// Look for configure and configure from scratch
+			else if (configurePath.toFile().exists()) {
+				rc = runScript(configurePath, 
+						buildLocation,
+						configArgs, 
+						AutotoolsPlugin.getFormattedString("MakeGenerator.gen.makefile", new String[]{buildDir}), //$NON-NLS-1$
+						errMsg, console, configureEnvs, consoleStart);
+				consoleStart = false;
+				if (rc != IStatus.ERROR) {
+					File makefileFile = buildLocation.append(MAKEFILE).toFile();
+					addMakeTargetsToManager(makefileFile);
+					// TODO: should we do something special if configure doesn't
+					// return ok?
+					toolsCfg.setDirty(false);
+				}
+			}
+			// If no configure, look for autogen.sh which may create configure and
+    		// possibly even run it.
+			else if (autogenPath.toFile().exists()) {
+				// Remove the existing config.status file since we use it
+				// to figure out if configure was run.
+				if (configStatus.exists())
+					configStatus.delete();
+				// Get any user-specified arguments for autogen.
+				String[] autogenArgs = getAutogenArgs(autogenCmdParms);
+				rc = runScript(autogenPath,
+						autogenPath.removeLastSegments(1), autogenArgs,
+						AutotoolsPlugin.getFormattedString("MakeGenerator.autogen.sh", new String[]{buildDir}), //$NON-NLS-1$
+						errMsg, console, autogenEnvs, consoleStart);
+				consoleStart = false;
+				if (rc != IStatus.ERROR) {
+					configStatus = configfile.toFile();
+					// Check for config.status.  If it is created, then
+					// autogen.sh ran configure and we should not run it
+					// ourselves.
+					if (configStatus == null || !configStatus.exists()) {
+						rc = runScript(configurePath, 
+								buildLocation,
+								configArgs, 
+								AutotoolsPlugin.getFormattedString("MakeGenerator.gen.makefile", new String[]{buildDir}), //$NON-NLS-1$
+								errMsg, console, configureEnvs, false);
+						if (rc != IStatus.ERROR) {
+							File makefileFile = buildLocation.append(MAKEFILE).toFile();
+							addMakeTargetsToManager(makefileFile);
+							toolsCfg.setDirty(false);
+						}
+					} else {
+						File makefileFile = buildLocation.append(MAKEFILE).toFile();
+						addMakeTargetsToManager(makefileFile);
+						toolsCfg.setDirty(false);
+					}
+				}
+			}
+			// If nothing this far, look for a Makefile.cvs file which needs to be run. 
+			else if (makefileCvsExists()) {
+				String[] makeargs = new String[1];
+				IPath makeCmd = new Path("make"); //$NON-NLS-1$
+				makeargs[0] = "-f" + getMakefileCVSPath().toOSString(); //$NON-NLS-1$
+				rc = runCommand(makeCmd,
+						project.getLocation().append(buildDir),
+						makeargs,
+						AutotoolsPlugin.getFormattedString("MakeGenerator.makefile.cvs", new String[]{buildDir}), //$NON-NLS-1$
+						errMsg, console, consoleStart);
+				consoleStart = false;
+				if (rc != IStatus.ERROR) {
+					File makefileFile = project.getLocation().append(buildDir)
+					.append(MAKEFILE).toFile();
+					addMakeTargetsToManager(makefileFile);
+					toolsCfg.setDirty(false);
+				}
+			}
+			// If nothing this far, try running autoreconf -i
+			else {
+				String[] reconfArgs = new String[1];
+				String reconfCmd = project.getPersistentProperty(AutotoolsPropertyConstants.AUTORECONF_TOOL);
+				if (reconfCmd == null)
+					reconfCmd = DEFAULT_AUTORECONF;
+				IPath reconfCmdPath = new Path(reconfCmd);
+				reconfArgs[0] = "-i"; //$NON-NLS-1$
+				rc = runCommand(reconfCmdPath,
+						project.getLocation().append(srcDir),
+						reconfArgs,
+						AutotoolsPlugin.getFormattedString("MakeGenerator.autoreconf", new String[]{buildDir}), //$NON-NLS-1$
+						errMsg, console, consoleStart);
+				consoleStart = false;
+				// Check if configure generated and if yes, run it.
+				if (rc != IStatus.ERROR) {
+					if (configurePath.toFile().exists()) {
+						rc = runScript(configurePath, 
+								buildLocation,
+								configArgs, 
+								AutotoolsPlugin.getFormattedString("MakeGenerator.gen.makefile", new String[]{buildDir}), //$NON-NLS-1$
+								errMsg, console, configureEnvs, false);
+						if (rc != IStatus.ERROR) {
+							File makefileFile = buildLocation.append(MAKEFILE).toFile();
+							addMakeTargetsToManager(makefileFile);
+							// TODO: should we do something special if configure doesn't
+							// return ok?
+							toolsCfg.setDirty(false);
+						}
+					}
+				}
+			}
+    		// If we didn't create a Makefile, consider that an error.
+			if (makefile == null || !makefile.exists()) {
+				rc = IStatus.ERROR;
+				errMsg = AutotoolsPlugin.getResourceString("MakeGenerator.didnt.generate"); //$NON-NLS-1$
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			// forgetLastBuiltState();
+			rc = IStatus.ERROR;
+		} finally {
+			// getGenerationProblems().clear();
+			status = new MultiStatus(AutotoolsPlugin
+						.getUniqueIdentifier(), rc, errMsg, null);
+		}
+		return status;
+	}
+
+	/**
+	 * Strip a command of VAR=VALUE pairs that appear ahead of the command and add
+	 * them to a list of environment variables.
+	 *
+	 * @param command - command to strip
+	 * @param envVars - ArrayList to add environment variables to
+	 * @return stripped command
+	 */
+	public static String stripEnvVars(String command, ArrayList<String> envVars) {
+		Pattern p = Pattern.compile("(\\w+[=]([$]?\\w+[:;]?)+\\s+)\\w+.*");
+		Pattern p2 = Pattern.compile("(\\w+[=]\\\".*?\\\"\\s+)\\w+.*");
+		Pattern p3 = Pattern.compile("(\\w+[=]'.*?'\\s+)\\w+.*");
+		boolean finished = false;
+		while (!finished) {
+			Matcher m = p.matcher(command);
+			if (m.matches()) {
+				command = command.replaceFirst("\\w+[=]([$]?\\w+[:;]?)+", "").trim();
+				envVars.add(m.group(1).trim());
+			} else {
+				Matcher m2 = p2.matcher(command);
+				if (m2.matches()) {
+					command = command.replaceFirst("\\w+[=]\\\".*?\\\"","").trim();
+					String s = m2.group(1).trim();
+					envVars.add(s.replaceAll("\\\"", ""));
+				} else {
+					Matcher m3 = p3.matcher(command);
+					if (m3.matches()) {
+						command = command.replaceFirst("\\w+[=]'.*?'", "").trim();
+						String s = m3.group(1).trim();
+						envVars.add(s.replaceAll("'", ""));
+					} else {
+						finished = true;
+					}
+				}
+			}
+		}
+		return command;
+	}
+	
+	protected IPath getConfigurePath(ArrayList<String> envVars, ArrayList<String> cmdParms) {
+		IPath configPath;
+		IConfigureOption configOption = toolsCfg.getOption(CONFIGURE_TOOL_ID);
+		String command = "configure"; // $NON-NLS-1$
+		if (configOption != null)
+			command = stripEnvVars(configOption.getValue().trim(), envVars);
+			
+		String[] tokens = command.split("\\s");
+		if (tokens.length > 1) {
+			command = tokens[0];
+			for (int i = 1; i < tokens.length; ++i)
+				cmdParms.add(tokens[i]);
+		}
+		if (srcDir.equals(""))
+			configPath = project.getLocation().append(command);
+		else
+			configPath = project.getLocation().append(srcDir).append(command);
+		return configPath;
+	}
+
+	protected IPath getMakefileCVSPath() {
+		IPath makefileCVSPath;
+		if (srcDir.equals(""))
+			makefileCVSPath = project.getLocation().append(MAKEFILE_CVS);
+		else
+			makefileCVSPath= project.getLocation().append(srcDir).append(
+					MAKEFILE_CVS);
+		return makefileCVSPath;
+	}
+	
+	protected boolean makefileCvsExists() {
+		IPath makefileCVSPath = getMakefileCVSPath();
+		return makefileCVSPath.toFile().exists();
+	}
+
+	protected IPath getAutogenPath(ArrayList<String> envVars, ArrayList<String> cmdParms) {
+		IPath autogenPath;
+		IConfigureOption autogenOption = toolsCfg.getOption(AUTOGEN_TOOL_ID);
+		String command = "autogen.sh"; // $NON-NLS-1$
+		if (autogenOption != null)
+			command = stripEnvVars(autogenOption.getValue().trim(), envVars);
+
+		String[] tokens = command.split("\\s");
+		if (tokens.length > 1) {
+			command = tokens[0];
+			for (int i = 1; i < tokens.length; ++i)
+				cmdParms.add(tokens[i]);
+		}
+			
+		if (srcDir.equals(""))
+			autogenPath = project.getLocation().append(command);
+		else
+			autogenPath = project.getLocation().append(srcDir).append(command);
+		return autogenPath;
+	}
+	
+	private String[] getAutogenArgs(ArrayList<String> cmdParms) {
+		// Get the arguments to be passed to config from build model
+		ArrayList<String> autogenArgs = toolsCfg.getToolArgs(AUTOGEN_TOOL_ID);
+		cmdParms.addAll(autogenArgs);
+		return cmdParms.toArray(new String[cmdParms.size()]);
+	}
+
+	private String[] getConfigArgs(ArrayList<String> cmdParms) {
+		// Get the arguments to be passed to config from build model
+		ArrayList<String> configArgs = toolsCfg.getToolArgs(CONFIGURE_TOOL_ID);
+		cmdParms.addAll(configArgs);
+		return cmdParms.toArray(new String[cmdParms.size()]);
+	}
+
+	// Run a command or executable (e.g. make).
+	private int runCommand(IPath commandPath, IPath runPath, String[] args,
+			String jobDescription, String errMsg, IConsole console, 
+			boolean consoleStart) throws BuildException, CoreException,
+			NullPointerException, IOException {
+
+		int rc = IStatus.OK;
+		
+		removeAllMarkers(project);
+		
+		String[] configTargets = args;
+		if (args == null)
+			configTargets = new String[0];
+		
+		for (int i = 0; i < configTargets.length; ++i) {
+			// try to resolve the build macros in any argument
+			try{
+				String resolved =
+					ManagedBuildManager.getBuildMacroProvider().resolveValueToMakefileFormat(
+							configTargets[i],
+							"", //$NON-NLS-1$
+							" ", //$NON-NLS-1$
+							IBuildMacroProvider.CONTEXT_CONFIGURATION,
+							cfg);
+				configTargets[i] = resolved;
+			} catch (BuildMacroException e) {
+			}
+		}
+	
+		String[] msgs = new String[2];
+		msgs[0] = commandPath.toString();
+		msgs[1] = project.getName();
+		monitor.subTask(AutotoolsPlugin.getFormattedString(
+				"MakeGenerator.make.message", msgs)); //$NON-NLS-1$
+
+
+		ConsoleOutputStream consoleOutStream = null;
+		StringBuffer buf = new StringBuffer();
+
+		// Launch command - main invocation
+		if (consoleStart)
+			console.start(project);
+		consoleOutStream = console.getOutputStream();
+		String[] consoleHeader = new String[3];
+
+		consoleHeader[0] = jobDescription;
+		consoleHeader[1] = toolsCfg.getId();
+		consoleHeader[2] = project.getName();
+		buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+		buf.append(jobDescription);
+		buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+		buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+
+		consoleOutStream.write(buf.toString().getBytes());
+		consoleOutStream.flush();
+
+		// Get a launcher for the config command
+		CommandLauncher launcher = new CommandLauncher();
+		// Set the environment
+		IEnvironmentVariable variables[] = 
+			CCorePlugin.getDefault().getBuildEnvironmentManager().getVariables(cdesc, true);
+		String[] env = null;
+		ArrayList<String> envList = new ArrayList<String>();
+		if (variables != null) {
+			for (int i = 0; i < variables.length; i++) {
+				envList.add(variables[i].getName()
+						+ "=" + variables[i].getValue()); //$NON-NLS-1$
+			}
+			env = (String[]) envList.toArray(new String[envList.size()]);
+		}
+
+		// // Hook up an error parser manager
+		// String[] errorParsers =
+		// info.getDefaultConfiguration().getErrorParserList();
+		// ErrorParserManager epm = new ErrorParserManager(project, topBuildDir,
+		// this, errorParsers);
+		// epm.setOutputStream(consoleOutStream);
+		OutputStream stdout = consoleOutStream;
+		OutputStream stderr = consoleOutStream;
+
+		launcher.showCommand(true);
+		Process proc = launcher.execute(commandPath, configTargets, env,
+				runPath, new NullProgressMonitor());
+		if (proc != null) {
+			try {
+				// Close the input of the process since we will never write to
+				// it
+				proc.getOutputStream().close();
+			} catch (IOException e) {
+			}
+
+			if (launcher.waitAndRead(stdout, stderr, new SubProgressMonitor(
+					monitor, IProgressMonitor.UNKNOWN)) != CommandLauncher.OK) {
+				errMsg = launcher.getErrorMessage();
+			}
+
+			// Force a resync of the projects without allowing the user to
+			// cancel.
+			// This is probably unkind, but short of this there is no way to
+			// ensure
+			// the UI is up-to-date with the build results
+			// monitor.subTask(ManagedMakeMessages
+			// .getResourceString(REFRESH));
+			monitor.subTask(AutotoolsPlugin.getResourceString("MakeGenerator.refresh")); //$NON-NLS-1$
+			try {
+				project.refreshLocal(IResource.DEPTH_INFINITE, null);
+			} catch (CoreException e) {
+				monitor.subTask(AutotoolsPlugin
+						.getResourceString("MakeGenerator.refresh.error")); //$NON-NLS-1$
+			}
+		} else {
+			errMsg = launcher.getErrorMessage();
+		}
+
+		// Report either the success or failure of our mission
+		buf = new StringBuffer();
+		if (errMsg != null && errMsg.length() > 0) {
+			String errorDesc = AutotoolsPlugin
+					.getResourceString("MakeGenerator.generation.error"); //$NON-NLS-1$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			buf.append(errorDesc);
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			buf.append("(").append(errMsg).append(")"); //$NON-NLS-1$ //$NON-NLS-2$
+			rc = IStatus.ERROR;
+		} else if (proc.exitValue() >= 1 || proc.exitValue() < 0) {
+			// We have an invalid return code from configuration.
+			String[] errArg = new String[2];
+			errArg[0] = Integer.toString(proc.exitValue());
+			errArg[1] = commandPath.toString();
+			errMsg = AutotoolsPlugin.getFormattedString(
+					"MakeGenerator.config.error", errArg); //$NON-NLS-1$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			buf.append(AutotoolsPlugin.getResourceString("MakeGenerator.generation.error")); //$NON-NLS-1$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			if (proc.exitValue() == 1)
+				rc = IStatus.WARNING;
+			else
+			    rc = IStatus.ERROR;
+		} else {
+			// Report a successful build
+			String successMsg = 
+				AutotoolsPlugin.getResourceString("MakeGenerator.success"); //$NON-NLS-1$
+			buf.append(successMsg);
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			rc = IStatus.OK;
+		}
+
+		// Write message on the console
+		consoleOutStream.write(buf.toString().getBytes());
+		consoleOutStream.flush();
+
+		// // Generate any error markers that the build has discovered
+		// monitor.subTask(ManagedMakeMessages
+		// .getResourceString(MARKERS));
+		// epm.reportProblems();
+		consoleOutStream.close();
+		
+		// TODO: For now, add a marker with our generated error message.
+		// In the future, we might add an error parser to do this properly
+		// and give the actual error line, etc..
+		if (rc == IStatus.ERROR) {
+			addMarker(project, -1, errMsg, SEVERITY_ERROR_BUILD, null);
+		}
+		
+		return rc;
+	}
+
+    // Get the path string.  We add a Win check to handle MingW.
+    // For MingW, we would rather represent C:\a\b as /C/a/b which
+    // doesn't cause Makefile to choke.
+    // TODO: further logic would be needed to handle cygwin if desired
+    private String getPathString(IPath path) {
+            String s = path.toString();
+            if (Platform.getOS().equals(Platform.OS_WIN32))
+                    s = s.replaceAll("^([A-Z])(:)", "/$1");
+            return s;
+    }
+
+	// Run an autotools script (e.g. configure, autogen.sh, config.status).
+	private int runScript(IPath commandPath, IPath runPath, String[] args,
+			String jobDescription, String errMsg, IConsole console,
+			ArrayList<String> additionalEnvs, 
+			boolean consoleStart) throws BuildException, CoreException,
+			NullPointerException, IOException {
+
+		int rc = IStatus.OK;
+		
+		removeAllMarkers(project);
+		
+		// We want to run the script via the shell command.  So, we add the command
+		// script as the first argument and expect "sh" to be on the runtime path.
+		// Any other arguments are placed after the script name.
+		String[] configTargets = null;
+		if (args == null)
+			configTargets = new String[1];
+		else {
+			configTargets = new String[args.length+1];
+			System.arraycopy(args, 0, configTargets, 1, args.length);
+		}
+        configTargets[0] = getPathString(commandPath);
+
+        for (int i = 0; i < configTargets.length; ++i) {
+			// try to resolve the build macros in any argument
+			try{
+				String resolved =
+					ManagedBuildManager.getBuildMacroProvider().resolveValueToMakefileFormat(
+							configTargets[i],
+							"", //$NON-NLS-1$
+							" ", //$NON-NLS-1$
+							IBuildMacroProvider.CONTEXT_CONFIGURATION,
+							cfg);
+				configTargets[i] = resolved;
+			} catch (BuildMacroException e) {
+			}
+		}
+		
+		String[] msgs = new String[2];
+		msgs[0] = commandPath.toString();
+		msgs[1] = project.getName();
+		monitor.subTask(AutotoolsPlugin.getFormattedString(
+				"MakeGenerator.make.message", msgs)); //$NON-NLS-1$
+
+
+		ConsoleOutputStream consoleOutStream = null;
+		StringBuffer buf = new StringBuffer();
+
+		// Launch command - main invocation
+		if (consoleStart)
+			console.start(project);
+		consoleOutStream = console.getOutputStream();
+		String[] consoleHeader = new String[3];
+
+		consoleHeader[0] = jobDescription;
+		consoleHeader[1] = toolsCfg.getId();
+		consoleHeader[2] = project.getName();
+		buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+		buf.append(jobDescription);
+		buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+		buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+
+		consoleOutStream.write(buf.toString().getBytes());
+		consoleOutStream.flush();
+
+		// Get a launcher for the config command
+		CommandLauncher launcher = new CommandLauncher();
+		// Set the environment
+		IEnvironmentVariable variables[] = 
+			CCorePlugin.getDefault().getBuildEnvironmentManager().getVariables(cdesc, true);
+		String[] env = null;
+		ArrayList<String> envList = new ArrayList<String>();
+		if (variables != null) {
+			for (int i = 0; i < variables.length; i++) {
+				envList.add(variables[i].getName()
+						+ "=" + variables[i].getValue()); //$NON-NLS-1$
+			}
+			if (additionalEnvs != null)
+				envList.addAll(additionalEnvs); // add any additional environment variables specified ahead of script
+			env = (String[]) envList.toArray(new String[envList.size()]);
+		}
+
+		// // Hook up an error parser manager
+		// String[] errorParsers =
+		// info.getDefaultConfiguration().getErrorParserList();
+		// ErrorParserManager epm = new ErrorParserManager(project, topBuildDir,
+		// this, errorParsers);
+		// epm.setOutputStream(consoleOutStream);
+		OutputStream stdout = consoleOutStream;
+		OutputStream stderr = consoleOutStream;
+
+		launcher.showCommand(true);
+		// Run the shell script via shell command.
+		Process proc = launcher.execute(new Path(SHELL_COMMAND), configTargets, env,
+				runPath, new NullProgressMonitor());
+		if (proc != null) {
+			try {
+				// Close the input of the process since we will never write to
+				// it
+				proc.getOutputStream().close();
+			} catch (IOException e) {
+			}
+
+			if (launcher.waitAndRead(stdout, stderr, new SubProgressMonitor(
+					monitor, IProgressMonitor.UNKNOWN)) != CommandLauncher.OK) {
+				errMsg = launcher.getErrorMessage();
+			}
+
+			// Force a resync of the projects without allowing the user to
+			// cancel.
+			// This is probably unkind, but short of this there is no way to
+			// ensure
+			// the UI is up-to-date with the build results
+			// monitor.subTask(ManagedMakeMessages
+			// .getResourceString(REFRESH));
+			monitor.subTask(AutotoolsPlugin.getResourceString("MakeGenerator.refresh")); //$NON-NLS-1$
+			try {
+				project.refreshLocal(IResource.DEPTH_INFINITE, null);
+			} catch (CoreException e) {
+				monitor.subTask(AutotoolsPlugin
+						.getResourceString("MakeGenerator.refresh.error")); //$NON-NLS-1$
+			}
+		} else {
+			errMsg = launcher.getErrorMessage();
+		}
+
+		// Report either the success or failure of our mission
+		buf = new StringBuffer();
+		if (errMsg != null && errMsg.length() > 0) {
+			String errorDesc = AutotoolsPlugin
+					.getResourceString("MakeGenerator.generation.error"); //$NON-NLS-1$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			buf.append(errorDesc);
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			buf.append("(").append(errMsg).append(")"); //$NON-NLS-1$ //$NON-NLS-2$
+			rc = IStatus.ERROR;
+		} else if (proc.exitValue() >= 1 || proc.exitValue() < 0) {
+			// We have an invalid return code from configuration.
+			String[] errArg = new String[2];
+			errArg[0] = Integer.toString(proc.exitValue());
+			errArg[1] = commandPath.toString();
+			errMsg = AutotoolsPlugin.getFormattedString(
+					"MakeGenerator.config.error", errArg); //$NON-NLS-1$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			buf.append(AutotoolsPlugin.getResourceString("MakeGenerator.generation.error")); //$NON-NLS-1$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			if (proc.exitValue() == 1)
+				rc = IStatus.WARNING;
+			else
+			    rc = IStatus.ERROR;
+		} else {
+			// Report a successful build
+			String successMsg = 
+				AutotoolsPlugin.getResourceString("MakeGenerator.success"); //$NON-NLS-1$
+			buf.append(successMsg);
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			rc = IStatus.OK;
+		}
+
+		// Write message on the console
+		consoleOutStream.write(buf.toString().getBytes());
+		consoleOutStream.flush();
+
+		// // Generate any error markers that the build has discovered
+		// monitor.subTask(ManagedMakeMessages
+		// .getResourceString(MARKERS));
+		// epm.reportProblems();
+		consoleOutStream.close();
+		
+		// TODO: For now, add a marker with our generated error message.
+		// In the future, we might add an error parser to do this properly
+		// and give the actual error line, etc..
+		if (rc == IStatus.ERROR) {
+			addMarker(project, -1, errMsg, SEVERITY_ERROR_BUILD, null);
+		}
+		
+		return rc;
+	}
+	
+	private ICStorageElement createTargetElement(ICStorageElement parent, IMakeTarget target) {
+		ICStorageElement targetElem = parent.createChild(TARGET_ELEMENT);
+		targetElem.setAttribute(TARGET_ATTR_NAME, target.getName());
+		targetElem.setAttribute(TARGET_ATTR_ID, target.getTargetBuilderID());
+		targetElem.setAttribute(TARGET_ATTR_PATH, target.getContainer().getProjectRelativePath().toString());
+		ICStorageElement elem = targetElem.createChild(TARGET_COMMAND);
+		elem.setValue(target.getBuildAttribute(IMakeCommonBuildInfo.BUILD_COMMAND, "make")); //$NON-NLS-1$
+
+		String targetAttr = target.getBuildAttribute(IMakeCommonBuildInfo.BUILD_ARGUMENTS, null);
+		if ( targetAttr != null) {
+			elem = targetElem.createChild(TARGET_ARGUMENTS);
+			elem.setValue(targetAttr);
+		}
+
+		targetAttr = target.getBuildAttribute(IMakeTarget.BUILD_TARGET, null);
+		if (targetAttr != null) {
+			elem = targetElem.createChild(TARGET);
+			elem.setValue(targetAttr);
+		}
+
+		elem = targetElem.createChild(TARGET_STOP_ON_ERROR);
+		elem.setValue(new Boolean(target.isStopOnError()).toString());
+
+		elem = targetElem.createChild(TARGET_USE_DEFAULT_CMD);
+		elem.setValue(new Boolean(target.isDefaultBuildCmd()).toString());
+
+		elem = targetElem.createChild(TARGET_RUN_ALL_BUILDERS);
+		elem.setValue(new Boolean(target.runAllBuilders()).toString());
+
+		return targetElem;
+	}
+	
+	/**
+	 * This output method saves the information into the .cdtproject metadata file.
+	 * 
+	 * @param doc
+	 * @throws CoreException
+	 */
+	private void saveTargets(IMakeTarget[] makeTargets) throws CoreException {
+		// FIXME: fix this when MakeTargetManager fixes its code.
+		ICDescriptor descriptor = CCorePlugin.getDefault().getCProjectDescription(getProject(), true);
+		ICStorageElement rootElement = descriptor.getProjectStorageElement(MAKE_TARGET_KEY);
+
+		//Nuke the children since we are going to write out new ones
+		rootElement.clear();
+
+		// Fetch the ProjectTargets as ICStorageElements
+		rootElement = rootElement.createChild(BUILD_TARGET_ELEMENT);
+		for (int i = 0; i < makeTargets.length; ++i)
+			createTargetElement(rootElement, makeTargets[i]);
+
+		//Save the results
+		descriptor.saveProjectData();
+	}
+	
+	protected class MakeTargetComparator implements Comparator<Object> {
+		public int compare(Object a, Object b) {
+			IMakeTarget make1 = (IMakeTarget)a;
+			IMakeTarget make2 = (IMakeTarget)b;
+			return make1.getName().compareToIgnoreCase(make2.getName());
+		}
+		
+	}
+
+	/**
+	 * This method parses the given Makefile and produces MakeTargets for all targets so the
+	 * end-user can access them from the MakeTargets popup-menu.
+	 * 
+	 * @param makefileFile the Makefile to parse
+	 * @throws CoreException
+	 */
+	private void addMakeTargetsToManager(File makefileFile) throws CoreException {
+		// We don't bother if the Makefile wasn't created.
+		if (makefileFile == null || !makefileFile.exists())
+			return;
+		
+		checkCancel();
+		if (monitor == null)
+			monitor = new NullProgressMonitor();
+		String statusMsg = AutotoolsPlugin.getResourceString("MakeGenerator.refresh.MakeTargets");	//$NON-NLS-1$
+		monitor.subTask(statusMsg);
+		
+		IMakeTargetManager makeTargetManager = 
+			MakeCorePlugin.getDefault().getTargetManager();
+		
+		IMakefile makefile = MakeCorePlugin.createMakefile(makefileFile.toURI(), false, null);
+		ITargetRule[] targets = makefile.getTargetRules();
+		ITarget target = null;
+		Map<String, IMakeTarget> makeTargets = new HashMap<String, IMakeTarget>(); // use a HashMap so duplicate names are handled
+		String[] id = makeTargetManager.getTargetBuilders(getProject());
+		if (id.length == 0) {
+			return;
+		}
+		String targetBuildID = id[0];
+		IMakeBuilderInfo buildInfo = MakeCorePlugin.createBuildInfo(getProject(),
+				makeTargetManager.getBuilderID(targetBuildID));
+		boolean isStopOnError = buildInfo.isStopOnError();
+		IPath buildCommand = buildInfo.getBuildCommand();
+		String defaultBuildCommand = buildCommand.toString();
+		String buildArguments = buildInfo.getBuildArguments();
+		for (int i = 0; i < targets.length; i++) {
+			target = targets[i].getTarget();
+			String targetName = target.toString();
+			if (!isValidTarget(targetName, makeTargetManager))
+				continue;
+			try {
+				IMakeTarget makeTarget = makeTargetManager.findTarget(project, targetName);
+				if (makeTarget == null)
+					makeTarget = makeTargetManager.createTarget(
+						project, targetName, targetBuildID);
+				makeTarget.setContainer(project);
+				makeTarget.setStopOnError(isStopOnError);
+				makeTarget.setRunAllBuilders(false);
+				makeTarget.setUseDefaultBuildCmd(true);
+				makeTarget.setBuildAttribute(IMakeTarget.BUILD_ARGUMENTS, buildArguments);
+				makeTarget.setBuildAttribute(IMakeTarget.BUILD_COMMAND, defaultBuildCommand);
+
+				makeTarget.setBuildAttribute(GENERATED_TARGET, "true");
+				makeTarget.setBuildAttribute(IMakeTarget.BUILD_TARGET,
+						targetName);
+
+				//TODO: should this be raw build directory in macro form?
+				makeTarget.setBuildAttribute(IMakeTarget.BUILD_LOCATION,
+						buildDir);
+				makeTargets.put(makeTarget.getName(), makeTarget);
+			} catch (CoreException e) {
+				// Duplicate target.  Ignore.
+			}
+		}
+		
+		IMakeTarget[] makeTargetArray = new IMakeTarget[makeTargets.size()];
+		Collection<IMakeTarget> values = makeTargets.values();
+		ArrayList<IMakeTarget> valueList = new ArrayList<IMakeTarget>(values);
+		valueList.toArray(makeTargetArray);
+		MakeTargetComparator compareMakeTargets = new MakeTargetComparator();
+		Arrays.sort(makeTargetArray, compareMakeTargets);
+
+		// Check if we have MakeTargetManager patch which adds the ability
+		// to save multiple targets at once.  If yes, use it as it updates
+		// the MakeTargets now.  Otherwise, fall back to old method which
+		// saves the targets externally..requiring closing the project and
+		// reopening to see them.
+		Class<? extends IMakeTargetManager> c = makeTargetManager.getClass();
+		boolean targetsAdded = false;
+		try {
+			Method m = c.getMethod("setTargets", IContainer.class, IMakeTarget[].class);
+			m.invoke(makeTargetManager, project, makeTargetArray);
+			targetsAdded = true;
+		} catch (NoSuchMethodException e) {
+			// ignore and use fail-safe saveTargets method
+		} catch (IllegalArgumentException e) {
+			// ignore and use fail-safe saveTargets method
+		} catch (IllegalAccessException e) {
+			// ignore and use fail-safe saveTargets method
+		} catch (InvocationTargetException e) {
+			// ignore and use fail-safe saveTargets method
+		}
+		if (!targetsAdded)
+			saveTargets(makeTargetArray);
+	}
+
+	private boolean isValidTarget(String targetName, IMakeTargetManager makeTargetManager) {
+		return !(targetName.endsWith("-am") //$NON-NLS-1$
+				|| targetName.endsWith("PROGRAMS") //$NON-NLS-1$
+				|| targetName.endsWith("-generic") //$NON-NLS-1$
+				|| (targetName.indexOf('$') >= 0)
+				|| (targetName.charAt(0) == '.')
+				|| targetName.equals(targetName.toUpperCase()));
+	}
+	
+	// Turn the string into an array.
+	private String[] makeArray(String string) {
+		string = string.trim();
+		char[] array = string.toCharArray();
+		ArrayList<String> aList = new ArrayList<String>();
+		StringBuilder buffer = new StringBuilder();
+		boolean inComment = false;
+		for (int i = 0; i < array.length; i++) {
+			char c = array[i];
+			boolean needsToAdd = true;
+			if (array[i] == '"' || array[i] == '\'') {
+				if (i > 0 && array[i - 1] == '\\') {
+					inComment = false;
+				} else {
+					inComment = !inComment;
+					needsToAdd = false; // skip it
+				}
+			}
+			if (c == ' ' && !inComment) {
+				if (buffer.length() > 0){
+					String str = buffer.toString().trim();
+					if(str.length() > 0){
+						aList.add(str);
+					}
+				}
+				buffer = new StringBuilder();
+			} else {
+				if (needsToAdd)
+					buffer.append(c);
+			}
+		}
+		if (buffer.length() > 0){
+			String str = buffer.toString().trim();
+			if(str.length() > 0){
+				aList.add(str);
+			}
+		}
+		return (String[])aList.toArray(new String[aList.size()]);
+	}
+}
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsPropertyConstants.java b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsPropertyConstants.java
new file mode 100644
index 0000000..af3aac2
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsPropertyConstants.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core;
+
+import org.eclipse.core.runtime.QualifiedName;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+
+
+public class AutotoolsPropertyConstants {
+	
+	static final String PREFIX = AutotoolsPlugin.getUniqueIdentifier() + "."; // $NON-NLS-1$
+	static final String PREFIX_COMPAT = "org.eclipse.linuxtools.cdt.autotools."; // $NON-NLS-1$
+	public static final String AUTOMAKE_VERSION_STRING = "AutoconfEditorAutomakeVersion"; // $NON-NLS-1$
+	public static final QualifiedName AUTOMAKE_VERSION = new QualifiedName(PREFIX, AUTOMAKE_VERSION_STRING);
+	public static final QualifiedName AUTOMAKE_VERSION_COMPAT = new QualifiedName(PREFIX_COMPAT, AUTOMAKE_VERSION_STRING);
+	public static final String AUTOCONF_VERSION_STRING = "AutoconfEditorAutoconfVersion"; // $NON-NLS-1$
+	public static final QualifiedName AUTOCONF_VERSION = new QualifiedName(PREFIX, AUTOCONF_VERSION_STRING);
+	public static final QualifiedName AUTOCONF_VERSION_COMPAT = new QualifiedName(PREFIX_COMPAT, AUTOCONF_VERSION_STRING);
+	public static final String AUTOCONF_MACRO_VERSIONING = "AutoconfEditorMacroVersioning"; // $NON-NLS-1$
+	public static final QualifiedName AUTOCONF_TOOL = new QualifiedName(PREFIX, "AutoconfToolPath"); // $NON-NLS-1$
+	public static final QualifiedName AUTOMAKE_TOOL = new QualifiedName(PREFIX, "AutomakeToolPath"); // $NON-NLS-1$
+	public static final QualifiedName ACLOCAL_TOOL = new QualifiedName(PREFIX, "AclocalToolPath");  // $NON-NLS-1$
+	public static final QualifiedName AUTOHEADER_TOOL = new QualifiedName(PREFIX, "AutoheaderToolPath");  // $NON-NLS-1$
+	public static final QualifiedName AUTORECONF_TOOL = new QualifiedName(PREFIX, "AutoreconfToolPath");  // $NON-NLS-1$
+	public static final QualifiedName LIBTOOLIZE_TOOL = new QualifiedName(PREFIX, "LibtoolizePath");  // $NON-NLS-1$
+	public static final QualifiedName CLEAN_DELETE = new QualifiedName(PREFIX, "CleanDelete"); // $NON-NLS-1$
+	public static final QualifiedName CLEAN_MAKE_TARGET = new QualifiedName(PREFIX, "CleanMakeTarget"); // $NON-NLS-1$
+	public static final QualifiedName SCANNER_USE_MAKE_W = new QualifiedName(PREFIX, "ScannerUseMakeW");
+	public static final QualifiedName AUTO_BUILD_NAME = new QualifiedName(PREFIX, "AutoBuildName"); // $NON-NLS-1$
+	public static final QualifiedName OPEN_INCLUDE = new QualifiedName(PREFIX, "IncludeResourceMapping"); // $NON-NLS-1$
+	public static final QualifiedName OPEN_INCLUDE_P = new QualifiedName(PREFIX, "PersistentIncludeResourceMapping"); //$NON-NLS-1$
+	public static final QualifiedName SCANNER_INFO_DIRTY = new QualifiedName(PREFIX, "ScannerInfoDirty"); // $NON-NLSp-1$
+	
+	public static String[] fACVersions = {"2.13", "2.59", "2.61"}; // $NON-NLS-1$
+	public static final String LATEST_AC_VERSION = fACVersions[fACVersions.length - 1];
+	
+	public static String[] fAMVersions = {"1.4-p6", "1.9.5", "1.9.6"}; // $NON-NLS-1$
+	public static final String LATEST_AM_VERSION = fAMVersions[fAMVersions.length - 1];
+	
+	public static final String CLEAN_MAKE_TARGET_DEFAULT = "distclean"; // $NON-NLS-1$
+	
+	public static final String TRUE = "true"; // $NON-NLS-1$
+	public static final String FALSE = "false"; // $NON-NLS-1$
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/DefaultNoDependencyCalculator.java b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/DefaultNoDependencyCalculator.java
new file mode 100644
index 0000000..1eed38f
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/DefaultNoDependencyCalculator.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.core;
+
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyGenerator;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+
+/**
+ * This is the dependency calculator used by the makefile generation system when 
+ * nothing is defined for a tool.
+ *  
+ * @since 2.0
+ */
+@SuppressWarnings("deprecation")
+public class DefaultNoDependencyCalculator implements IManagedDependencyGenerator {
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderDependencyCalculator#findDependencies(org.eclipse.core.resources.IResource, org.eclipse.core.resources.IProject)
+	 */
+	public IResource[] findDependencies(IResource resource, IProject project) {
+		// Never answers any dependencies
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderDependencyCalculator#getCalculatorType()
+	 */
+	public int getCalculatorType() {
+		return TYPE_NODEPS;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderDependencyCalculator#getDependencyCommand(org.eclipse.core.resources.IResource)
+	 */
+	public String getDependencyCommand(IResource resource, IManagedBuildInfo info) {
+		// Never answers this call with an actual value
+		return null;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/IConfigurationCloneListener.java b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/IConfigurationCloneListener.java
new file mode 100644
index 0000000..34ce837
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/IConfigurationCloneListener.java
@@ -0,0 +1,12 @@
+package org.eclipse.linuxtools.internal.cdt.autotools.core;
+
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+
+public interface IConfigurationCloneListener {
+	/**
+	 * Notified when a configuration gets cloned.
+	 * @param cloneName - name of the cloned configuration
+	 * @param c - the clone
+	 */
+	public void cloneCfg(String cloneName, IConfiguration c);
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/MakeMessages.java b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/MakeMessages.java
new file mode 100644
index 0000000..05cfe3c
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/MakeMessages.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2004 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core;
+
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class MakeMessages {
+
+	private static final String RESOURCE_BUNDLE= MakeMessages.class.getName();
+	private static ResourceBundle fgResourceBundle;
+	static {
+		try {
+			fgResourceBundle = ResourceBundle.getBundle(RESOURCE_BUNDLE);
+		} catch (MissingResourceException x) {
+			fgResourceBundle = null;
+		}
+	}
+	
+	private MakeMessages() {
+	}
+		
+	public static String getString(String key) {
+		try {
+			return fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		} catch (NullPointerException e) {
+			return "#" + key + "#"; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+	
+	/**
+	 * Gets a string from the resource bundle and formats it with the argument
+	 * 
+	 * @param key	the string used to get the bundle value, must not be null
+	 */
+	public static String getFormattedString(String key, Object arg) {
+		return MessageFormat.format(getString(key), new Object[] { arg });
+	}
+
+	/**
+	 * Gets a string from the resource bundle and formats it with arguments
+	 */	
+	public static String getFormattedString(String key, Object[] args) {
+		return MessageFormat.format(getString(key), args);
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/MarkerGenerator.java b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/MarkerGenerator.java
new file mode 100644
index 0000000..3e6982a
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/MarkerGenerator.java
@@ -0,0 +1,155 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.IMarkerGenerator;
+import org.eclipse.cdt.core.ProblemMarkerInfo;
+import org.eclipse.cdt.core.model.ICModelMarker;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.runtime.CoreException;
+
+public abstract class MarkerGenerator implements IMarkerGenerator {
+
+	/**
+	 * Constructor for MarkerGenerator
+	 */
+	public MarkerGenerator() {
+		super();
+	}
+
+	/*
+	 * callback from Output Parser
+	 */
+	public void addMarker(IResource file, int lineNumber, String errorDesc, int severity, String errorVar) {
+
+		try {
+			IMarker[] cur = file.findMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, false, IResource.DEPTH_ONE);
+			/*
+			 * Try to find matching markers and don't put in duplicates
+			 */
+			if ((cur != null) && (cur.length > 0)) {
+				for (int i = 0; i < cur.length; i++) {
+					int line = ((Integer) cur[i].getAttribute(IMarker.LOCATION)).intValue();
+					int sev = ((Integer) cur[i].getAttribute(IMarker.SEVERITY)).intValue();
+					String mesg = (String) cur[i].getAttribute(IMarker.MESSAGE);
+					if (line == lineNumber && sev == mapMarkerSeverity(severity) && mesg.equals(errorDesc)) {
+						return;
+					}
+				}
+			}
+
+			IMarker marker = file.createMarker(ICModelMarker.C_MODEL_PROBLEM_MARKER);
+			marker.setAttribute(IMarker.LOCATION, lineNumber);
+			marker.setAttribute(IMarker.MESSAGE, errorDesc);
+			marker.setAttribute(IMarker.SEVERITY, mapMarkerSeverity(severity));
+			marker.setAttribute(IMarker.LINE_NUMBER, lineNumber);
+			marker.setAttribute(IMarker.CHAR_START, -1);
+			marker.setAttribute(IMarker.CHAR_END, -1);
+			if (errorVar != null) {
+				marker.setAttribute(ICModelMarker.C_MODEL_MARKER_VARIABLE, errorVar);
+			}
+		}
+		catch (CoreException e) {
+			CCorePlugin.log(e.getStatus());
+		}
+
+	}
+	
+	public abstract IProject getProject();
+
+	/*
+	 * callback from Output Parser
+	 */
+	public void addMarker(ProblemMarkerInfo problemMarkerInfo) {
+		try {
+			IResource markerResource = problemMarkerInfo.file ;
+			if (markerResource==null)  {
+				markerResource = getProject();
+			}
+			IMarker[] cur = markerResource.findMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, true, IResource.DEPTH_ONE);
+			/*
+			 * Try to find matching markers and don't put in duplicates
+			 */
+			if ((cur != null) && (cur.length > 0)) {
+				for (int i = 0; i < cur.length; i++) {
+					int line = ((Integer) cur[i].getAttribute(IMarker.LOCATION)).intValue();
+					int sev = ((Integer) cur[i].getAttribute(IMarker.SEVERITY)).intValue();
+					String mesg = (String) cur[i].getAttribute(IMarker.MESSAGE);
+					if (line == problemMarkerInfo.lineNumber && sev == mapMarkerSeverity(problemMarkerInfo.severity) && mesg.equals(problemMarkerInfo.description)) {
+						return;
+					}
+				}
+			}
+
+			IMarker marker = markerResource.createMarker(ICModelMarker.C_MODEL_PROBLEM_MARKER);
+			marker.setAttribute(IMarker.LOCATION, problemMarkerInfo.lineNumber);
+			marker.setAttribute(IMarker.MESSAGE, problemMarkerInfo.description);
+			marker.setAttribute(IMarker.SEVERITY, mapMarkerSeverity(problemMarkerInfo.severity));
+			marker.setAttribute(IMarker.LINE_NUMBER, problemMarkerInfo.lineNumber);
+			marker.setAttribute(IMarker.CHAR_START, -1);
+			marker.setAttribute(IMarker.CHAR_END, -1);
+			if (problemMarkerInfo.variableName != null) {
+				marker.setAttribute(ICModelMarker.C_MODEL_MARKER_VARIABLE, problemMarkerInfo.variableName);
+			}
+			if (problemMarkerInfo.externalPath != null) {
+				marker.setAttribute(ICModelMarker.C_MODEL_MARKER_EXTERNAL_LOCATION, problemMarkerInfo.externalPath.toOSString());
+			}
+		}
+		catch (CoreException e) {
+			CCorePlugin.log(e.getStatus());
+		}
+	}
+
+	private int mapMarkerSeverity(int severity) {
+		switch (severity) {
+			case SEVERITY_ERROR_BUILD :
+			case SEVERITY_ERROR_RESOURCE :
+				return IMarker.SEVERITY_ERROR;
+			case SEVERITY_INFO :
+				return IMarker.SEVERITY_INFO;
+			case SEVERITY_WARNING :
+				return IMarker.SEVERITY_WARNING;
+		}
+		return IMarker.SEVERITY_ERROR;
+	}
+	
+	/* (non-Javadoc)
+	 * Removes the IMarkers for the project specified in the argument if the
+	 * project exists, and is open. 
+	 * 
+	 * @param project
+	 */
+	public void removeAllMarkers(IProject project) {
+		if (project == null || !project.isAccessible()) return;
+
+		// Clear out the problem markers
+		IWorkspace workspace = project.getWorkspace();
+		IMarker[] markers;
+		try {
+			markers = project.findMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE);
+		} catch (CoreException e) {
+			// Handled just about every case in the sanity check
+			return;
+		}
+		if (markers != null) {
+			try {
+				workspace.deleteMarkers(markers);
+			} catch (CoreException e) {
+				// The only situation that might cause this is some sort of resource change event
+				return;
+			}
+		}
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AbstractConfigurationOption.java b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AbstractConfigurationOption.java
new file mode 100644
index 0000000..3fcf840
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AbstractConfigurationOption.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.configure;
+
+import java.util.ArrayList;
+
+public abstract class AbstractConfigurationOption implements IConfigureOption {
+
+	protected String name;
+	private String msgName;
+	protected AutotoolsConfiguration cfg;
+
+	public AbstractConfigurationOption(String name, AutotoolsConfiguration cfg) {
+		this(name, name, cfg);
+	}
+	
+	public AbstractConfigurationOption(String name, String msgName, AutotoolsConfiguration cfg) {
+		this.name = name;
+		this.msgName = msgName;
+		this.cfg = cfg;
+	}
+	
+	public String getDescription() {
+		return ConfigureMessages.getConfigureDescription(msgName);
+	}
+
+	public String getToolTip() {
+		return ConfigureMessages.getConfigureTip(msgName);
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public AutotoolsConfiguration getCfg() {
+		return cfg;
+	}
+	
+	public ArrayList<String> getParameters() {
+		ArrayList<String> parameters = new ArrayList<String>();
+		if (isParmSet())
+			parameters.add(getParameter());
+		return parameters;
+	}
+	
+	public String getParameterName() {
+		return "--" + getName();
+	}
+
+	public boolean isCategory() {
+		return false;
+	}
+
+	public boolean isMultiArg() {
+		return false;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsConfiguration.java b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsConfiguration.java
new file mode 100644
index 0000000..f6e1625
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsConfiguration.java
@@ -0,0 +1,320 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.configure;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+
+public class AutotoolsConfiguration implements IAConfiguration {
+
+	public static class Option {
+		private String name;
+		private String transformedName;
+		private int type;
+		private String defaultValue;
+		
+		public Option(String name, int type) {
+			this(name, name, type);
+		}
+		
+		public Option(String name, String transformedName, int type) {
+			this.name = name;
+			this.transformedName = transformedName;
+			this.type = type;
+		}
+		
+		public Option(String name, String transformedName, String defaultValue, int type) {
+			this.name = name;
+			this.transformedName = transformedName;
+			this.type = type;
+			this.defaultValue = defaultValue;
+		}
+		
+		public String getName() {
+			return name;
+		}
+		
+		public int getType() {
+			return type;
+		}
+		
+		public String getDefaultValue() {
+			return defaultValue;
+		}
+		
+		public String getDescription() {
+			return ConfigureMessages.getConfigureDescription(transformedName);
+		}
+		
+		public String getToolTip() {
+			return ConfigureMessages.getConfigureTip(transformedName);
+		}
+	}
+	
+	// Configure options and categories.  List below is ordered.
+	// All options following a category are children of that category
+	// in a tree view, up to the next category.
+	private static Option[] configOpts = new Option[] {
+		new Option("configure", IConfigureOption.TOOL), // $NON-NLS-1$
+		new Option("general", IConfigureOption.CATEGORY), // $NON-NLS-1$
+		new Option("configdir", IConfigureOption.INTERNAL), // $NON-NLS-1$
+		new Option("cache-file", "cache_file", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("help", IConfigureOption.BIN), // $NON-NLS-1$
+		new Option("no-create", "no_create", IConfigureOption.BIN), // $NON-NLS-1$
+		new Option("quiet", IConfigureOption.BIN), // $NON-NLS-1$
+		new Option("version", IConfigureOption.BIN), // $NON-NLS-1$
+		new Option("platform", IConfigureOption.CATEGORY), // $NON-NLS-1$
+		new Option("host", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("build", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("target", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("directories", IConfigureOption.CATEGORY), // $NON-NLS-1$
+		new Option("prefix", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("exec-prefix", "exec_prefix", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("libdir", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("bindir", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("sbindir", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("includedir", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("datadir", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("sysconfdir", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("infodir", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("mandir", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("srcdir", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("localstatedir", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("sharedstatedir", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("libexecdir", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("oldincludedir", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("filenames", IConfigureOption.CATEGORY), // $NON-NLS-1$
+		new Option("program-prefix", "program_prefix", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("program-suffix", "program_suffix", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("program-transform-name", "program_transform_name", IConfigureOption.STRING), // $NON-NLS-1$
+		new Option("features", IConfigureOption.CATEGORY), // $NON-NLS-1$
+		new Option("enable-maintainer-mode", "enable_maintainer_mode", IConfigureOption.BIN), // $NON-NLS-1$
+		new Option("user", IConfigureOption.MULTIARG), // $NON-NLS-1$
+		new Option("autogen", "autogen", "autogen.sh", IConfigureOption.TOOL), // $NON-NLS-1$
+		new Option("options", IConfigureOption.CATEGORY), // $NON-NLS-1$
+		new Option("autogenOpts", IConfigureOption.MULTIARG), // $NON-NLS-1$
+	};
+	
+	private static Option[] toolList;
+	
+	private String id;
+	private boolean isDirty;
+	private boolean isParmsDirty;
+	private Map<String, IConfigureOption> configOptions;
+	private ArrayList<String> configParms = new ArrayList<String>();
+
+	public AutotoolsConfiguration(String name) {
+		this(name, true);
+	}
+		
+	private AutotoolsConfiguration(String name, boolean initialize) {
+		this.id = name;
+		configOptions = new HashMap<String, IConfigureOption>();
+		if (initialize)
+			initConfigOptions();
+		isParmsDirty = true;
+	}
+	
+	private void initConfigOptions() {
+		// Put configure options in hash map.  Ignore categories.
+		ArrayList<Option> tools = new ArrayList<Option>();
+		for (int i = 0; i < configOpts.length; ++i) {
+			Option opt = configOpts[i];
+			String defaultValue = opt.getDefaultValue();
+			int type = opt.type;
+			switch (type) {
+			case IConfigureOption.BIN:
+				BinConfigureOption b = new BinConfigureOption(opt.name, opt.transformedName, this);
+				if (defaultValue != null)
+					b.setValue(defaultValue);
+				configOptions.put(opt.name, b);
+				break;
+			case IConfigureOption.STRING:
+				StringConfigureOption s = new StringConfigureOption(opt.name, opt.transformedName, this);
+				if (defaultValue != null)
+					s.setValue(defaultValue);
+				configOptions.put(opt.name, s);
+				break;
+			case IConfigureOption.INTERNAL:
+				InternalConfigureOption io = new InternalConfigureOption(opt.name, opt.transformedName, this);
+				if (defaultValue != null)
+					io.setValue(defaultValue);
+				configOptions.put(opt.name, io);
+				break;
+			case IConfigureOption.MULTIARG:
+				MultiArgConfigureOption m = new MultiArgConfigureOption(opt.name, opt.transformedName, this);
+				if (defaultValue != null)
+					m.setValue(defaultValue);
+				configOptions.put(opt.name, m);
+				break;
+			case IConfigureOption.TOOL:
+				tools.add(opt);
+				ConfigureTool t = new ConfigureTool(opt.name, opt.transformedName, this);
+				if (defaultValue != null)
+					t.setValue(defaultValue);
+				configOptions.put(opt.name, t);
+				break;
+			case IConfigureOption.CATEGORY:
+				configOptions.put(opt.name, new ConfigureOptionCategory(opt.name));
+			}
+		}
+		toolList = tools.toArray(new Option[tools.size()]);
+	}
+	
+	public static Option[] getOptionList() {
+		return configOpts;
+	}
+
+	public static Option[] getChildOptions(String name) {
+		ArrayList<Option> options = new ArrayList<Option>();
+		for (int i = 0; i < configOpts.length; ++i) {
+			Option opt = configOpts[i];
+			if (opt.getName().equals(name)) {
+				if (opt.getType() == IConfigureOption.CATEGORY) {
+					for (int j = i + 1; j < configOpts.length; ++j) {
+						Option o = configOpts[j];
+						int type = o.getType();
+						if (type != IConfigureOption.CATEGORY &&
+								type != IConfigureOption.TOOL)
+							options.add(o);
+						else
+							return options.toArray(new Option[options.size()]);
+					}
+				} else if (opt.getType() == IConfigureOption.TOOL) {
+					for (int j = i + 1; j < configOpts.length; ++j) {
+						Option o = configOpts[j];
+						int type = o.getType();
+						if (type == IConfigureOption.CATEGORY)
+							options.add(o);
+						else if (type == IConfigureOption.TOOL)
+							return options.toArray(new Option[options.size()]);
+					}	
+				}
+			}
+		}
+		return options.toArray(new Option[options.size()]);
+	}
+	
+	public static Option[] getTools() {
+		return toolList;
+	}
+	
+	public IConfigureOption getOption(String name) {
+		return configOptions.get(name);
+	}
+
+	public IAConfiguration copy() {
+		return copy(id);
+	}
+	
+	public IAConfiguration copy(String newId) {
+		AutotoolsConfiguration cfg = new AutotoolsConfiguration(newId, false);
+		Collection<IConfigureOption> oldValues = configOptions.values();
+		for (Iterator<IConfigureOption> i = oldValues.iterator(); i.hasNext();) {
+			IConfigureOption opt = i.next();
+			cfg.configOptions.put(opt.getName(), opt.copy(cfg));
+		}
+		if (getId().equals(newId))
+			cfg.setDirty(isDirty()); // copying with same id, do not change dirty attribute
+		else
+			cfg.setDirty(true); // we are cloning with a new id, treat it as never built/dirty
+		return cfg;
+	}
+	
+	public String getId() {
+		return id;
+	}
+	
+	public boolean isDirty() {
+		return isDirty;
+	}
+	
+	public void setDirty(boolean value) {
+		isDirty = value;
+		if (isDirty)
+			isParmsDirty = true;
+	}
+	
+	public Map<String, IConfigureOption> getOptions() {
+		return configOptions;
+	}
+	
+	public String getToolParameters(String name) {
+		StringBuffer buf = new StringBuffer();
+		Option[] options = getChildOptions(name);
+		for (int i = 0; i < options.length; ++i) {
+			IConfigureOption option = getOption(options[i].getName());
+			if (option.getType() == IConfigureOption.CATEGORY) {
+				Option[] childOptions = getChildOptions(option.getName());
+				for (int j = 0; j < childOptions.length; ++j) {
+					IConfigureOption childOption = getOption(childOptions[j].getName());
+					String parameter = childOption.getParameter();
+					if (!parameter.equals(""))
+						buf.append(" " + parameter);
+				}
+			} else {
+				String parameter = option.getParameter();
+				if (!parameter.equals(""))
+					buf.append(" " + parameter);
+			}
+		}
+		return buf.toString();
+	}
+
+	public ArrayList<String> getToolArgs(String name) {
+		if (isParmsDirty) {
+			configParms = new ArrayList<String>();
+			Option[] options = getChildOptions(name);
+			for (int i = 0; i < options.length; ++i) {
+				IConfigureOption option = getOption(options[i].getName());
+				if (option.getType() == IConfigureOption.CATEGORY) {
+					Option[] childOptions = getChildOptions(option.getName());
+					for (int j = 0; j < childOptions.length; ++j) {
+						IConfigureOption childOption = getOption(childOptions[j].getName());
+						ArrayList<String> parameters = childOption.getParameters();
+						configParms.addAll(parameters);
+					}
+				} else {
+					ArrayList<String> parameters = option.getParameters();
+					configParms.addAll(parameters);
+				}
+			}
+		}
+		return configParms;
+	}
+
+	public void setOption(String name, String value) {
+		IConfigureOption option = configOptions.get(name);
+		if (option != null) {
+			if (!option.getValue().equals(value)) {
+				option.setValue(value);
+				setDirty(true);
+			}
+		}
+	}
+	
+	public void setConfigToolDirectory(String configToolDirectory) {
+		setOption("configdir", configToolDirectory);
+	}
+
+	public String getConfigToolDirectory() {
+		IConfigureOption option = configOptions.get("configdir");
+		return option.getValue();
+	}
+
+	public void setDefaultOptions() {
+		initConfigOptions();
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsConfigurationManager.java b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsConfigurationManager.java
new file mode 100644
index 0000000..161feaf
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsConfigurationManager.java
@@ -0,0 +1,486 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.configure;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.eclipse.cdt.core.model.CoreModel;
+import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
+import org.eclipse.cdt.core.settings.model.ICProjectDescription;
+import org.eclipse.cdt.core.settings.model.extension.CConfigurationData;
+import org.eclipse.cdt.managedbuilder.core.BuildException;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IHoldsOptions;
+import org.eclipse.cdt.managedbuilder.core.IOption;
+import org.eclipse.cdt.managedbuilder.core.ITool;
+import org.eclipse.cdt.managedbuilder.core.IToolChain;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsConfiguration.Option;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+public class AutotoolsConfigurationManager implements IResourceChangeListener {
+	
+	public final static String CFG_FILE_NAME = ".autotools"; //$NON-NLS-1$
+	private final static String CFG_CANT_SAVE = "Configure.Error.NoProjectToSave"; //$NON-NLS-1$
+	
+	
+	private static AutotoolsConfigurationManager instance;
+	
+	private boolean isSyncing;
+	
+	private static Map<String, Map<String, IAConfiguration>> configs;
+	private static Map<String, Map<String, IAConfiguration>> tmpConfigs;
+	
+	private AutotoolsConfigurationManager() {
+		configs = new HashMap<String, Map<String, IAConfiguration>>();
+		tmpConfigs = new HashMap<String, Map<String, IAConfiguration>>();
+		AutotoolsPlugin.getWorkspace().addResourceChangeListener(this);
+	}
+	
+	public static AutotoolsConfigurationManager getInstance() {
+		if (instance == null) {
+			instance = new AutotoolsConfigurationManager();
+		}
+		return instance;
+	}
+
+	public IAConfiguration createDefaultConfiguration(IProject project, String id) {
+		IAConfiguration cfg = new AutotoolsConfiguration(id);
+		return cfg;
+	}
+	
+	public IAConfiguration findCfg(IProject p, String id) {
+		Map<String, IAConfiguration> cfgs = getConfigurations(p);
+		return cfgs.get(id);
+	}
+
+	public IAConfiguration getConfiguration(IProject p, String cfgId) {
+		return getConfiguration(p, cfgId, true);
+	}
+
+	public IAConfiguration getConfiguration(IProject p, String cfgId, boolean persist) {
+		IAConfiguration cfg = findCfg(p, cfgId);
+		if (cfg == null) {
+			cfg = createDefaultConfiguration(p, cfgId);
+			if (persist) {
+				addConfiguration(p, cfg);
+			}
+		} else {
+			if (!persist) {
+				cfg = cfg.copy();
+			}
+		}
+		return cfg;
+	}
+	
+	
+	public boolean isConfigurationAlreadySaved(IProject project, ICConfigurationDescription cfgd) {
+		Map<String, IAConfiguration> cfgs = getSavedConfigs(project);
+		if (cfgs != null)
+			return cfgs.get(cfgd.getId()) != null;
+		return false;
+	}
+	
+	public void addConfiguration(IProject project, IAConfiguration cfg) {
+		String projectName = project.getName();
+		Map<String, IAConfiguration> cfgs = getSavedConfigs(project);
+		if (cfgs == null) {
+			cfgs = new HashMap<String, IAConfiguration>();
+			configs.put(projectName, cfgs);
+		}
+		cfgs.put(cfg.getId(), cfg);
+		saveConfigs(project);
+	}
+	
+	public boolean isSyncing() {
+		return isSyncing;
+	}
+
+	private void setSyncing(boolean value) {
+		isSyncing = value;
+	}
+	
+	/** 
+	 * Synchronize the current set of configurations for the project with the
+	 * Autotools saved configuration data.  This is required when configuration
+	 * management occurs outside of the Autotools Configure Settings page in the
+	 * Property menu.
+	 * 
+	 * @param project to synchronize configurations for
+	 * 
+	 */
+	public void syncConfigurations(IProject project) {
+		setSyncing(true);
+		clearTmpConfigurations(project);
+		ICProjectDescription pd = CoreModel.getDefault().getProjectDescription(project);
+		ICConfigurationDescription[] cfgs = pd.getConfigurations();
+		Map <String, IAConfiguration> newCfgList = new HashMap<String, IAConfiguration>();
+		for (int i = 0; i < cfgs.length; ++i) {
+			cfgs[i].getConfigurationData();
+			IAConfiguration acfg = getTmpConfiguration(project, cfgs[i]);
+			newCfgList.put(cfgs[i].getId(), acfg);
+		}
+		setSyncing(false);
+		clearTmpConfigurations(project);
+		replaceProjectConfigurations(project, newCfgList);
+	}
+	
+	public void replaceProjectConfigurations(IProject project, Map<String, IAConfiguration> cfgs) {
+		String projectName = project.getName();
+		configs.put(projectName, cfgs);
+		saveConfigs(project);
+	}
+
+	public void replaceProjectConfigurations(IProject project, Map<String, IAConfiguration> cfgs, ICConfigurationDescription[] cfgds) {
+		String projectName = project.getName();
+		configs.put(projectName, cfgs);
+		saveConfigs(project, cfgds);
+	}
+
+	private Map<String, IAConfiguration> getSavedConfigs(IProject project) {
+		String projectName = project.getName();
+		Map<String, IAConfiguration> list = configs.get(projectName);
+		if (list == null) {
+			try {
+				IPath fileLocation = project.getLocation().append(CFG_FILE_NAME);
+				File dirFile = fileLocation.toFile();
+				Map<String, IAConfiguration> cfgList = new HashMap<String, IAConfiguration>();
+				DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+				DocumentBuilder db = dbf.newDocumentBuilder();
+				if (dirFile.exists()) {
+					Document d = db.parse(dirFile);
+					Element e = d.getDocumentElement();
+					// Get the stored configuration data
+					NodeList cfgs = e.getElementsByTagName("configuration"); // $NON-NLS-1$
+					for (int x = 0; x < cfgs.getLength(); ++x) {
+						Node n = cfgs.item(x);
+						NamedNodeMap attrs = n.getAttributes();
+						// Originally we used the configuration name, but now we use
+						// the ConfigurationDescription id which is unique.  Check for
+						// id first, but fall back to name for older .autotools files.
+						Node nameNode = attrs.getNamedItem("name"); // $NON-NLS-1$
+						Node cfgIdNode = attrs.getNamedItem("id"); // $NON-NLS-1$
+						String cfgId = null;
+						if (cfgIdNode != null)
+							cfgId = cfgIdNode.getNodeValue();
+						else if (nameNode != null) {
+							String cfgName = nameNode.getNodeValue();
+							ICConfigurationDescription cfgd = 
+								CoreModel.getDefault().getProjectDescription(project).getConfigurationByName(cfgName);
+							if (cfgd != null)
+								cfgId = cfgd.getId();
+							else
+								continue; // have to punt, this doesn't map to real cfg
+						}
+						IAConfiguration cfg = new AutotoolsConfiguration(cfgId);
+						NodeList l = n.getChildNodes();
+						for (int y = 0; y < l.getLength(); ++y) {
+							Node child = l.item(y);
+							if (child.getNodeName().equals("option")) { // $NON-NLS-1$
+								NamedNodeMap optionAttrs = child.getAttributes();
+								Node id = optionAttrs.getNamedItem("id"); // $NON-NLS-1$
+								Node value = optionAttrs.getNamedItem("value"); // $NON-NLS-1$
+								if (id != null && value != null)
+									cfg.setOption(id.getNodeValue(), value.getNodeValue());
+							}
+						}
+						cfg.setDirty(false);
+						cfgList.put(cfg.getId(), cfg);
+					}
+					if (cfgList.size() > 0) {
+						configs.put(projectName, cfgList);
+						list = cfgList;
+					}
+				}
+			} catch (ParserConfigurationException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (SAXException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		return list;
+	}
+
+	public IAConfiguration getTmpConfiguration(IProject p, ICConfigurationDescription cfgd) {
+		Map <String, IAConfiguration> list = getTmpConfigs(p);
+		IAConfiguration acfg = list.get(cfgd.getId());
+		if (acfg != null) {
+			return acfg;
+		}
+		IAConfiguration oldCfg = getConfiguration(p, cfgd.getId(), false);
+		list.put(cfgd.getId(), oldCfg);
+		return oldCfg;
+	}
+
+	/**
+	 * Clone a configuration and put it on the tmp list if it is not already a saved configuration
+	 * and not already on the tmp list.
+	 * 
+	 * @param p project
+	 * @param oldId the id of the old configuration to clone
+	 * @param cfgd the configuration descriptor for the clone
+	 * @return true if the configuration is already saved, false otherwise
+	 */
+	public boolean cloneCfg(IProject p, String oldId, ICConfigurationDescription cfgd) {
+		if (isConfigurationAlreadySaved(p, cfgd))
+			return true;
+		Map <String, IAConfiguration> tmpList = getTmpConfigs(p);
+		String newId = cfgd.getId();
+		// Don't bother if the new configuration is already on the tmp list
+		IAConfiguration cfg = tmpList.get(newId);
+		if (cfg != null)
+			return false;
+		// Otherwise, try and find the old id to copy the configuration from
+		// or punt if not found
+		Map <String, IAConfiguration> savedList = getSavedConfigs(p);
+		IAConfiguration oldCfg = savedList.get(oldId);
+		if (oldCfg != null) {
+			IAConfiguration newCfg = oldCfg.copy(cfgd.getId());
+			tmpList.put(cfgd.getId(), newCfg);
+			// Check to see if the new configuration is already stored as part of the project description.
+			// If yes, it should already be saved.  This can occur if the configuration was added as part of
+			// another CDT Property page and the Autotools Property page was never opened.
+			if (CoreModel.getDefault().getProjectDescription(p).getConfigurationById(newId) != null) {
+				addConfiguration(p, newCfg);
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private Map<String, IAConfiguration> getTmpConfigs(IProject p) {
+		Map <String, IAConfiguration> tmpList = tmpConfigs.get(p.getName());
+		if (tmpList == null) {
+			tmpList = new HashMap<String, IAConfiguration>();
+			tmpConfigs.put(p.getName(), tmpList);
+		}
+		return tmpList;
+	}
+	
+	public void clearTmpConfigurations(IProject p) {
+		tmpConfigs.remove(p.getName());
+	}
+
+	public void saveConfigs(IProject project) {
+		ICConfigurationDescription[] cfgds = CoreModel.getDefault().getProjectDescription(project).getConfigurations();
+		saveConfigs(project, cfgds);
+	}
+	
+	private void syncNameField(ICConfigurationDescription cfgd) {
+		IConfiguration icfg = ManagedBuildManager.getConfigurationForDescription(cfgd);
+		String id = cfgd.getId();
+		if (icfg != null) {
+			IToolChain toolchain = icfg.getToolChain();
+			ITool[] tools = toolchain.getTools();
+			for (int j = 0; j < tools.length; ++j) {
+				ITool tool = tools[j];
+				if (tool.getName().equals("configure")) { //$NON-NLS-1$
+					IOption option = 
+						tool.getOptionBySuperClassId("org.eclipse.linuxtools.cdt.autotools.core.option.configure.name"); // $NON-NLS-1$
+					IHoldsOptions h = (IHoldsOptions)tool;
+					try {
+						IOption optionToSet = h.getOptionToSet(option, false);
+						optionToSet.setValue(id);
+					} catch (BuildException e) {
+					}
+				}
+			}
+		}
+	}
+	
+	
+	private void saveConfigs(IProject project, ICConfigurationDescription[] cfgds) {
+		try {
+			String projectName = project.getName();
+			IPath output = project.getLocation().append(CFG_FILE_NAME);
+			File f = output.toFile();
+			if (!f.exists())
+				f.createNewFile();
+			if (f.exists()) {
+				PrintWriter p = new PrintWriter(new BufferedWriter(new FileWriter(f)));
+				Map<String, IAConfiguration> cfgs = configs.get(projectName);
+				p.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); //$NON-NLS-1$
+				p.println("<configurations>"); // $NON-NLS-1$
+				Option[] optionList = AutotoolsConfiguration.getOptionList();
+				// Before saving, force any cloning to occur via the option value handler.
+				setSyncing(true);
+				for (int i = 0; i < cfgds.length; ++i) {
+					@SuppressWarnings("unused")
+					CConfigurationData data = cfgds[i].getConfigurationData();
+				}
+				setSyncing(false);
+				for (int i = 0; i < cfgds.length; ++i) {
+					ICConfigurationDescription cfgd = cfgds[i];
+					String id = cfgd.getId();
+					IAConfiguration cfg = cfgs.get(id);
+					if (cfg == null) {
+						cfg = createDefaultConfiguration(project, id);
+					}
+					p.println("<configuration id=\"" + cfg.getId() + "\">"); //$NON-NLS-1$ //$NON-NLS-2$ 
+					for (int j = 0; j < optionList.length; ++j) {
+						Option option = optionList[j];
+						IConfigureOption opt = cfg.getOption(option.getName());
+						if (!opt.isCategory())
+							p.println("<option id=\"" + option.getName() + "\" value=\"" + opt.getValue() + "\"/>"); //$NON-NLS-1$ //$NON-NLS-2$ // $NON-NLS-3$
+					}
+					p.println("</configuration>"); //$NON-NLS-1$
+					// Sync name field as this configuration is now officially saved
+					syncNameField(cfgd);
+				}
+				p.println("</configurations>");
+				p.close();
+			}
+		} catch (IOException e) {
+			AutotoolsPlugin.log(e);
+		}
+	}
+	
+	// Perform apply of configuration changes.  This rewrites out the current known list of configurations
+	// with any changes currently that have been made to them.  If a configuration has been renamed, but this
+	// has not yet been confirmed by the end-user, then only the changes to the configuration are made.  The
+	// name currently remains the same in the output file.
+	public void applyConfigs(String projectName, ICConfigurationDescription[] cfgds) {
+		try {
+			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+			IResource res = (IProject)root.findMember(projectName, false);
+			if (res == null || res.getType() != IResource.PROJECT) {
+				AutotoolsPlugin.logErrorMessage(ConfigureMessages.getFormattedString(CFG_CANT_SAVE,
+						new String[]{projectName}));
+				return;
+			}
+			IProject project = (IProject)res;
+			IPath output = project.getLocation().append(CFG_FILE_NAME);
+			File f = output.toFile();
+			if (!f.exists())
+				f.createNewFile();
+			if (f.exists()) {
+				PrintWriter p = new PrintWriter(new BufferedWriter(new FileWriter(f)));
+				Map<String, IAConfiguration> cfgs = getSavedConfigs(project);
+				if (cfgs == null)
+					return;
+				p.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); //$NON-NLS-1$
+				p.println("<configurations>"); // $NON-NLS-1$
+				Option[] optionList = AutotoolsConfiguration.getOptionList();
+				HashSet<String> savedIds = new HashSet<String>();
+				setSyncing(true);
+				for (int x = 0; x < cfgds.length; ++x) {
+					ICConfigurationDescription cfgd = cfgds[x];
+					@SuppressWarnings("unused")
+					CConfigurationData data = cfgd.getConfigurationData();
+					String id = cfgd.getId();
+					savedIds.add(id);
+					IAConfiguration cfg = getTmpConfiguration(project, cfgd);
+					cfgs.put(id, cfg); // add to list in case we have a new configuration not yet added to Project Description
+					p.println("<configuration id=\"" + id + "\">"); //$NON-NLS-1$ //$NON-NLS-2$ 
+					for (int j = 0; j < optionList.length; ++j) {
+						Option option = optionList[j];
+						IConfigureOption opt = cfg.getOption(option.getName());
+						if (!opt.isCategory())
+							p.println("<option id=\"" + option.getName() + "\" value=\"" + opt.getValue() + "\"/>"); //$NON-NLS-1$ //$NON-NLS-2$ // $NON-NLS-3$
+					}
+					p.println("</configuration>"); //$NON-NLS-1$
+					syncNameField(cfgd);
+				}
+				setSyncing(false);
+
+				// Put all the remaining configurations already saved back into the file.
+				// These represent deleted configurations, but confirmation has not occurred.
+				for (Iterator<String> i = cfgs.keySet().iterator(); i.hasNext(); ) {
+					String id = i.next();
+					// A remaining id won't appear in our savedIds list.
+					if (!savedIds.contains(id)) {
+						IAConfiguration cfg = cfgs.get(id);
+						p.println("<configuration id=\"" + id + "\">"); //$NON-NLS-1$ //$NON-NLS-2$ 
+						for (int j = 0; j < optionList.length; ++j) {
+							Option option = optionList[j];
+							IConfigureOption opt = cfg.getOption(option.getName());
+							if (!opt.isCategory())
+								p.println("<option id=\"" + option.getName() + "\" value=\"" + opt.getValue() + "\"/>"); //$NON-NLS-1$ //$NON-NLS-2$ // $NON-NLS-3$
+						}
+						p.println("</configuration>"); //$NON-NLS-1$
+					}
+				}
+				p.println("</configurations>");
+				p.close();
+			}
+		} catch (IOException e) {
+			AutotoolsPlugin.log(e);
+		}
+	}
+	
+	public Map<String, IAConfiguration> getConfigurations(IProject project) {
+		Map<String, IAConfiguration> list = getSavedConfigs(project);
+		if (list == null) {
+			list = new HashMap<String, IAConfiguration>();
+			configs.put(project.getName(), list);
+		}
+		return list;
+	}
+	
+	public void resourceChanged(IResourceChangeEvent event) {
+		IResource res = event.getResource();
+		if (!(res instanceof IProject))
+			return;
+		String name = res.getName();
+		IResourceDelta delta = event.getDelta();
+		int kind = delta.getKind();
+		if (configs.containsKey(name)) {
+			if (kind == IResourceDelta.REMOVED) {
+				configs.remove(name);
+				tmpConfigs.remove(name);
+			} else if (kind == IResourceDelta.CHANGED) {
+				int flags = delta.getFlags();
+				if ((flags & IResourceDelta.MOVED_TO) != 0) {
+					IPath path = delta.getMovedToPath();
+					Map<String, IAConfiguration> cfgs = configs.get(name);
+					String newName = path.lastSegment();
+					configs.remove(name);
+					configs.put(newName, cfgs);
+					Map<String, IAConfiguration> tmpcfgs = tmpConfigs.get(name);
+					tmpConfigs.remove(name);
+					tmpConfigs.put(newName, tmpcfgs);
+				}
+			}
+		}
+	}
+	
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsOptionValueHandler.java b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsOptionValueHandler.java
new file mode 100644
index 0000000..b707d3e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/AutotoolsOptionValueHandler.java
@@ -0,0 +1,124 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.configure;
+
+import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
+import org.eclipse.cdt.managedbuilder.core.BuildException;
+import org.eclipse.cdt.managedbuilder.core.IBuildObject;
+import org.eclipse.cdt.managedbuilder.core.IBuilder;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IHoldsOptions;
+import org.eclipse.cdt.managedbuilder.core.IManagedOptionValueHandler;
+import org.eclipse.cdt.managedbuilder.core.IOption;
+import org.eclipse.cdt.managedbuilder.core.IOptionApplicability;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.managedbuilder.core.ManagedOptionValueHandler;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+
+public class AutotoolsOptionValueHandler extends ManagedOptionValueHandler 
+	implements IOptionApplicability {
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.managedbuilder.core.IManagedOptionValueHandler#handleValue(IConfiguration,IToolChain,IOption,String,int)
+	 */
+	
+	public final static String DEFAULT_BUILD_DIR = "build"; //$NON-NLS-1$
+	public final static String CONFIGURE_TOOL_ID = AutotoolsPlugin.PLUGIN_ID + ".gnu.toolchain.tool.configure"; //$NON-NLS-1$
+	public final static String BUILD_DIR_OPTION_ID = AutotoolsPlugin.PLUGIN_ID + ".option.configure.builddir"; //$NON-NLS-1$
+	public final static String BUILD_DIR_APPLY = "BuildDir.apply"; //$NON-NLS-1$
+	public final static String BUILD_DIR_DEFAULT_QUESTION = "BuildDir.default"; //$NON-NLS-1$
+	public final static String BUILD_DIR_YES = "BuildDir.yes"; //$NON-NLS-1$
+	public final static String BUILD_DIR_NO = "BuildDir.no"; //$NON-NLS-1$
+
+	//FIXME: Use holder to set option value, not the "option" parameter
+	public boolean handleValue(IBuildObject buildObject, 
+                   IHoldsOptions holder, 
+                   IOption option,
+                   String extraArgument, int event)
+	{
+		// Get the current value of the build dir option.
+		String value = (String)option.getValue();
+
+		if (buildObject instanceof IConfiguration &&
+				(event == IManagedOptionValueHandler.EVENT_OPEN)) {
+//			SortedSet<Integer> nums = new TreeSet<Integer>();
+			IConfiguration configuration = (IConfiguration)buildObject;
+			ICConfigurationDescription cfgd = ManagedBuildManager.getDescriptionForConfiguration(configuration);
+			if (option.getName().equals("Name") && cfgd != null) {
+				String cfgId = cfgd.getId();
+				if (!value.equals("") && !value.equals(cfgId)) {
+					// we have a cloned configuration and we know that the
+					// clonee's name is the value of the option
+					IProject project = (IProject)configuration.getManagedProject().getOwner();
+					String autoName = null;
+					String autoNameTemplate = null;
+					// Check if we are supposed to automatically name the build directory for any
+					// new configuration.  If yes, generate a build directory under the project using
+					// the configuration name which must be unique.
+					try {
+						autoName = project.getPersistentProperty(AutotoolsPropertyConstants.AUTO_BUILD_NAME);
+					} catch (CoreException e) {
+						// ignore
+					}
+					if (autoName == null || autoName.equals(AutotoolsPropertyConstants.TRUE)) {
+						autoNameTemplate = "${workspace_loc:/" + project.getName() + // $NON-NLS-1$ 
+							"}/build-" + fixName(configuration.getName()); // $NON-NLS-1$
+						IBuilder cfgBuilder = configuration.getEditableBuilder();
+						cfgBuilder.setBuildPath(autoNameTemplate);
+					}
+					// Clone old configuration to tmp configuration list
+					boolean isSaved = AutotoolsConfigurationManager.getInstance().cloneCfg(project, value, cfgd);
+					// Check to see if we should patch up the name option.  If we aren't synchronizing
+					// configurations or the configuration isn't already saved, we leave the name field alone
+					// so we will trigger this again when the clone will get used.
+					if (!isSaved && !AutotoolsConfigurationManager.getInstance().isSyncing()) {
+						return true;
+					}
+				}
+				try {
+					IOption optionToSet = holder.getOptionToSet(option, false);
+					optionToSet.setValue(cfgId);
+				} catch (BuildException e) {
+					return false;
+				}
+			}
+		}
+		
+		// The event was not handled, thus return false
+		return true;
+	}
+	
+	private String fixName(String cfgName) {
+		// Replace whitespace with underscores.
+		return cfgName.replaceAll("\\s", "_");
+	}
+	
+	// IOptionApplicability methods
+	
+	public boolean isOptionEnabled(IBuildObject configuration,
+			IHoldsOptions holder, IOption option) {
+		return true;
+	}
+
+	public boolean isOptionUsedInCommandLine(IBuildObject configuration,
+			IHoldsOptions holder, IOption option) {
+		return false;
+	}
+
+	public boolean isOptionVisible(IBuildObject configuration,
+			IHoldsOptions holder, IOption option) {
+		return true;
+	}
+
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/BinConfigureOption.java b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/BinConfigureOption.java
new file mode 100644
index 0000000..fb885bd
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/BinConfigureOption.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.configure;
+
+public class BinConfigureOption extends AbstractConfigurationOption {
+
+	private boolean value;
+	
+	public BinConfigureOption(String name, AutotoolsConfiguration cfg) {
+		super(name, cfg);
+	}
+
+	public BinConfigureOption(String name, String msgName, AutotoolsConfiguration cfg) {
+		super(name, msgName, cfg);
+	}
+
+	private BinConfigureOption(String name, AutotoolsConfiguration cfg, boolean value) {
+		super(name, cfg);
+		this.value = value;
+	}
+	
+	public boolean isParmSet() {
+		return value;
+	}
+	
+	public String getParameter() {
+	   if (isParmSet())
+		   return getParameterName();
+	   else
+		   return ""; // $NON-NLS-1$
+	}
+
+	public String getValue() {
+		return Boolean.toString(value);
+	}
+	
+	public void setValue(String value) {
+		boolean oldValue = this.value;
+		if (value.equals("true")) // $NON-NLS-1$
+			this.value = true;
+		else
+			this.value = false;
+		if (this.value != oldValue)
+			cfg.setDirty(true);
+	}
+	
+	public IConfigureOption copy(AutotoolsConfiguration config) {
+		return new BinConfigureOption(name, config, value);
+	}
+
+	public int getType() {
+		return BIN;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureMessages.java b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureMessages.java
new file mode 100644
index 0000000..f51e5ff
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureMessages.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007, 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.configure;
+
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class ConfigureMessages {
+	private static final String BUNDLE_NAME = ConfigureMessages.class.getName();
+
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
+			.getBundle(BUNDLE_NAME);
+
+	private ConfigureMessages() {
+	}
+
+	public static String getConfigureDescription(String name) {
+		return getString("Option.configure." + name); //$NON-NLS-11$
+	}
+	
+	public static String getConfigureTip(String name) {
+		return getString("Option.configure." + name + ".tip"); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+	/**
+	 * Returns the string from the resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @return the resource bundle message
+	 */
+	public static String getString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+	
+	/**
+	 * Returns the formatted string from the resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @param args an array of substituition strings
+	 * @return the resource bundle message
+	 */
+	public static String getFormattedString(String key, String[] args) {
+		return MessageFormat.format(getString(key), (Object[])args);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureMessages.properties b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureMessages.properties
new file mode 100644
index 0000000..32c745e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureMessages.properties
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+Option.configure.configure=configure
+Option.configure.general=General
+Option.configure.builddir=Build directory
+Option.configure.builddir.tip=Subdirectory off of project where build will occur
+Option.configure.configdir=Configure tool directory
+Option.configure.configdir.tip=Subdirectory off of project where configure script resides
+Option.configure.cache_file=Name of cache file (--cache-file)
+Option.configure.cache_file.tip=Specify the name of the configuration cache file [config.cache]
+Option.configure.no_create=Turn off file creation <not advised> (--no-create)
+Option.configure.no_create.tip=This tells configuration not to generate the output files as part of configuration
+Option.configure.quiet=Turn off checking messages (--quiet)
+Option.configure.quiet.tip=This turns off "checking ..." style messages from the configuration console output
+Option.configure.help=Display help contents (--help)
+Option.configure.help.tip=Ask configuration file to display its help documentation
+Option.configure.version=Display version of autotools used (--version)
+Option.configure.version.tip=This outputs the version of the Autotools used to create the configuration files
+
+Option.configure.platform=Platform specifiers
+Option.configure.host=Host platform (--host)
+Option.configure.host.tip=Platform that project will run on
+Option.configure.target=Target platform (--target)
+Option.configure.target.tip=Platform that project will target output for
+Option.configure.build=Build platform (--build)
+Option.configure.build.tip=Platform where project is being built
+
+Option.configure.directories=Directory specifiers
+Option.configure.prefix=Arch-independent install directory (--prefix)
+Option.configure.prefix.tip=Place where architecture-independent files are installed [/usr/local]
+Option.configure.exec_prefix=Arch-dependent install directory (--exec-prefix)
+Option.configure.exec_prefix.tip=Place where architecture-dependent files are installed [PREFIX]
+Option.configure.libdir=Object code library directory (--libdir)
+Option.configure.libdir.tip=Place where object code libraries are installed [EPREFIX/lib]
+Option.configure.bindir=User executable directory (--bindir)
+Option.configure.bindir.tip=Place where binary executables are installed [EPREFIX/bin]
+Option.configure.sbindir=System admin executable directory (--sbindir)
+Option.configure.sbindir.tip=Place where system admin executables are installed [EPREFIX/sbin]
+Option.configure.includedir=C Header file directory (--includdir)
+Option.configure.includedir.tip=Place where header files will be installed [PREFIX/include]
+Option.configure.datadir=Read-only arch-independent data (--datadir)
+Option.configure.datadir.tip=Place where read-only architecture-independent data is installed [PREFIX/share]
+Option.configure.sysconfdir=Read-only single-machine data directory (--sysconfdir)
+Option.configure.sysconfdir.tip=Place where read-only single-machine data is stored [PREFIX/etc]
+Option.configure.infodir=Info file directory (--infodir)
+Option.configure.infodir.tip=Place where info files are installed [PREFIX/info]
+Option.configure.mandir=Man file documentation directory (--mandir)
+Option.configure.mandir.tip=Place where man file documentation is installed [PREFIX/man]
+Option.configure.srcdir=Sources directory (--srcdir)
+Option.configure.srcdir.tip=Place where configure can find sources [configure directory or ..]
+Option.configure.localstatedir=Single-machine data directory (--localstatedir)
+Option.configure.localstatedir.tip=Place where modifiable single-machine data is installed [PREFIX/var]
+Option.configure.sharedstatedir=Arch-independent data directory (--sharedstatedir)
+Option.configure.sharedstatedir.tip=Place where modifiable architecture-independent data is installed [PREFIX/com}
+Option.configure.libexecdir=Program executable directory (--libexecdir)
+Option.configure.libexecdir.tip=Place where program executables will be installed [EPREFIX/libexec]
+Option.configure.oldincludedir=Non-gcc C header file directory (--oldincludedir)
+Option.configure.oldincludedir.tip=Place where non-gcc C header files are installed [/usr/include]
+
+Option.configure.filenames=File-name transformations
+Option.configure.program_prefix=Program prefix (--program-prefix)
+Option.configure.program_prefix.tip=Prepend PREFIX to the beginning of installed program names
+Option.configure.program_suffix=Program suffix (--program-suffix)
+Option.configure.program_suffix.tip=Append SUFFIX to the end of installed program names
+Option.configure.program_transform_name=Program name transform (--program-transform-name)
+Option.configure.program_transform_name.tip=A sed string used to transform installed program names
+
+Option.configure.features=Advanced
+Option.configure.enable_maintainer_mode=Enable maintainer mode (--enable-maintainer-mode)
+Option.configure.enable_maintainer_mode.tip=Specify this to have Makefiles generated with checks for Autotool configuration file changes
+Option.configure.user=Additional command-line options
+Option.configure.user.tip=Specify one or more configuration options (e.g. --enable-FEATURE, --disable-FEATURE, or --with-PACKAGE)
+
+Option.configure.autogen=autogen
+Option.configure.options=Options
+Option.configure.autogenOpts=Additional command-line options
+Option.configure.autogenOpts.tip=Specify any additional options required
+
+Tool.command=Command
+Tool.allopts=All Options
+ 
+Configure.Error.AlreadyExists="A configuration named {0} already exists"
+Configure.Error.NoProjectToSave="Project: {0} does not exist at time of saving configuration"
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureOptionCategory.java b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureOptionCategory.java
new file mode 100644
index 0000000..90e6cb7
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureOptionCategory.java
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.configure;
+
+import java.util.ArrayList;
+
+public class ConfigureOptionCategory implements IConfigureOption {
+
+	private String name;
+	
+	public ConfigureOptionCategory(String name) {
+		this.name = name;
+	}
+	
+	public IConfigureOption copy(AutotoolsConfiguration config) {
+		return new ConfigureOptionCategory(name);
+	}
+
+	public String getDescription() {
+		return ConfigureMessages.getConfigureDescription(name);
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public String getParameter() {
+		return "";
+	}
+
+	public ArrayList<String> getParameters() {
+		return new ArrayList<String>();
+	}
+	
+	public String getToolTip() {
+		return "";
+	}
+
+	public String getValue() {
+		return "null";
+	}
+
+	public boolean isCategory() {
+		return true;
+	}
+
+	public boolean isParmSet() {
+		return false;
+	}
+
+	public void setValue(String value) {
+		// Do nothing..nothing to set
+	}
+
+	public boolean isMultiArg() {
+		return false;
+	}
+
+	public int getType() {
+		return CATEGORY;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureTool.java b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureTool.java
new file mode 100644
index 0000000..a082a62
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/ConfigureTool.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.configure;
+
+import java.util.ArrayList;
+
+public class ConfigureTool extends AbstractConfigurationOption {
+
+	private String value;
+	
+	public ConfigureTool(String name, AutotoolsConfiguration cfg) {
+		super(name, cfg);
+		this.value = name;
+	}
+
+	public ConfigureTool(String name, String transformedName, AutotoolsConfiguration cfg) {
+		super(name, transformedName, cfg);
+		this.value = name;
+	}
+
+	private ConfigureTool(String name, AutotoolsConfiguration cfg, String value) {
+		super(name, cfg);
+		this.value = value;
+	}
+	
+	public String getValue() {
+		return value;
+	}
+	
+	public void setValue(String newValue) {
+		if (!newValue.equals(value)) {
+			cfg.setDirty(true);
+			value = newValue;
+		}
+	}
+
+	public boolean isParmSet() {
+		return false;
+	}
+	
+	public String getParameter() {
+		return ""; // $NON-NLS-1$
+	}
+	
+	public ArrayList<String> getParameters() {
+		return new ArrayList<String>();
+	}
+	
+	public IConfigureOption copy(AutotoolsConfiguration config) {
+		return new ConfigureTool(name, config, value);
+	}
+
+	public int getType() {
+		return TOOL;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/IAConfiguration.java b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/IAConfiguration.java
new file mode 100644
index 0000000..e1cc0e4
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/IAConfiguration.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.configure;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+public interface IAConfiguration {
+	public IConfigureOption getOption(String name);
+	public String getId();
+	public boolean isDirty();
+	public void setDirty(boolean value);
+	public Map<String, IConfigureOption> getOptions();
+	public String getToolParameters(String name);
+	public ArrayList<String> getToolArgs(String name);
+	public void setOption(String name, String value);
+	public void setConfigToolDirectory(String configToolDirectory);
+	public String getConfigToolDirectory();
+	public IAConfiguration copy();
+	public IAConfiguration copy(String id);
+	public void setDefaultOptions();
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/IConfigureOption.java b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/IConfigureOption.java
new file mode 100644
index 0000000..310d4b4
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/IConfigureOption.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.configure;
+
+import java.util.ArrayList;
+
+public interface IConfigureOption {
+	
+	public final static int CATEGORY = 0;
+	public final static int BIN = 1;
+	public final static int STRING = 2;
+	public final static int INTERNAL = 3;
+	public final static int MULTIARG = 4;
+	public final static int TOOL = 5;
+	public String getName();
+	public String getParameter();
+	public ArrayList<String> getParameters();
+	public boolean isParmSet();
+	public String getDescription();
+	public String getToolTip();
+	public void setValue(String value);
+	public IConfigureOption copy(AutotoolsConfiguration cfg);
+	public String getValue();
+	public boolean isCategory();
+	public boolean isMultiArg();
+	public int getType();
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/InternalConfigureOption.java b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/InternalConfigureOption.java
new file mode 100644
index 0000000..d42739b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/InternalConfigureOption.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.configure;
+
+public class InternalConfigureOption extends AbstractConfigurationOption {
+
+	private String value;
+	
+	public InternalConfigureOption(String name, AutotoolsConfiguration cfg) {
+		super(name, cfg);
+		this.value = ""; // $NON-NLS-1$
+	}
+	
+	public InternalConfigureOption(String name, String msgName, AutotoolsConfiguration cfg) {
+		super(name, msgName, cfg);
+		this.value = ""; // $NON-NLS-1$
+	}
+	
+	private InternalConfigureOption(String name, AutotoolsConfiguration cfg,
+			String value) {
+		super(name, cfg);
+		this.value = value;
+	}
+	
+	public String getValue() {
+		return value;
+	}
+	
+	public void setValue(String newValue) {
+		if (!newValue.equals(value)) {
+			cfg.setDirty(true);
+			value = newValue;
+		}
+	}
+
+	public boolean isParmSet() {
+		return false;
+	}
+	
+	public String getParameter() {
+		return "";
+	}
+	
+	public IConfigureOption copy(AutotoolsConfiguration config) {
+		return new InternalConfigureOption(name, config, value);
+	}
+
+	public int getType() {
+		return INTERNAL;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/MultiArgConfigureOption.java b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/MultiArgConfigureOption.java
new file mode 100644
index 0000000..1d17702
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/MultiArgConfigureOption.java
@@ -0,0 +1,119 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.configure;
+
+import java.util.ArrayList;
+
+
+public class MultiArgConfigureOption extends AbstractConfigurationOption {
+
+	private String value;
+	private ArrayList<String> userArgs;
+	private boolean isDirty;
+	
+	public MultiArgConfigureOption(String name, AutotoolsConfiguration cfg) {
+		super(name, cfg);
+		this.value = ""; // $NON-NLS-1$
+	}
+	
+	public MultiArgConfigureOption(String name, String msgName, AutotoolsConfiguration cfg) {
+		super(name, msgName, cfg);
+		this.value = ""; // $NON-NLS-1$
+	}
+	
+	private MultiArgConfigureOption(String name, AutotoolsConfiguration cfg,
+			String value) {
+		super(name, cfg);
+		this.value = value;
+	}
+	
+	public String getValue() {
+		return value;
+	}
+	
+	public void setValue(String newValue) {
+		if (!newValue.equals(value)) {
+			cfg.setDirty(true);
+			isDirty = true;
+			value = newValue;
+		}
+	}
+
+	public boolean isParmSet() {
+		return value.length() > 0;
+	}
+	
+	public boolean isMultiArg() {
+		return true;
+	}
+	
+	public String getParameter() {
+		return value;
+	}
+	
+	public ArrayList<String> getParameters() {
+		// May be multiple user-specified options in which case we
+		// need to split them up into individual options
+		if (!isDirty && userArgs != null)
+			return userArgs;
+		// Otherwise, we need to calculate userArgs
+		userArgs = new ArrayList<String>();
+		isDirty = false;
+		int lastArgIndex = -1;
+		int i = 0;
+		while (i < value.length()) {
+			char ch = value.charAt(i);
+			// Skip white-space
+			while (Character.isWhitespace(ch)) {
+				++i;
+				if (i < value.length())
+					ch = value.charAt(i);
+				else // Otherwise we are done
+					return userArgs;
+			}
+
+			// Simplistic parser.  We break up into strings delimited
+			// by blanks.  If quotes are used, we ignore blanks within.
+			// If a backslash is used, we ignore the next character and
+			// pass it through.
+			lastArgIndex = i;
+			boolean inString = false;
+			while (i < value.length()) {
+				ch = value.charAt(i);
+				if (ch == '\\') // escape character
+					++i; // skip over the next character
+				else if (ch == '\"') { // double quotes
+					inString = !inString;
+				} else if (Character.isWhitespace(ch)) {
+					if (!inString) {
+						userArgs.add(value.substring(lastArgIndex, i));
+						break;
+					}
+				}
+				++i;
+			}
+			// Look for the case where we ran out of chars for the last
+			// token.
+			if (i >= value.length())
+				userArgs.add(value.substring(lastArgIndex));
+			++i;
+		}
+		return userArgs;
+	}
+
+	public IConfigureOption copy(AutotoolsConfiguration config) {
+		return new MultiArgConfigureOption(name, config, value);
+	}
+
+	public int getType() {
+		return MULTIARG;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/StringConfigureOption.java b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/StringConfigureOption.java
new file mode 100644
index 0000000..4c9a117
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/StringConfigureOption.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.configure;
+
+
+public class StringConfigureOption extends AbstractConfigurationOption {
+
+	private String value;
+	
+	public StringConfigureOption(String name, AutotoolsConfiguration cfg) {
+		super(name, cfg);
+		this.value = ""; // $NON-NLS-1$
+	}
+	
+	public StringConfigureOption(String name, String msgName, AutotoolsConfiguration cfg) {
+		super(name, msgName, cfg);
+		this.value = ""; // $NON-NLS-1$
+	}
+	
+	private StringConfigureOption(String name, AutotoolsConfiguration cfg,
+			String value) {
+		super(name, cfg);
+		this.value = value;
+	}
+	
+	public String getValue() {
+		return value;
+	}
+	
+	public void setValue(String newValue) {
+		if (!newValue.equals(value)) {
+			cfg.setDirty(true);
+			value = newValue;
+		}
+	}
+
+	public boolean isParmSet() {
+		return value.length() > 0;
+	}
+	
+	public String getParameter() {
+		if (isParmSet())
+			return getParameterName() + "=" + getValue(); // $NON-NLS-1$
+		return "";
+	}
+	
+	public IConfigureOption copy(AutotoolsConfiguration config) {
+		return new StringConfigureOption(name, config, value);
+	}
+
+	public int getType() {
+		return STRING;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/wizards/NewAutotoolsProject.java b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/wizards/NewAutotoolsProject.java
new file mode 100644
index 0000000..ef8eb78
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/wizards/NewAutotoolsProject.java
@@ -0,0 +1,143 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Symbian Software Limited and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Bala Torati (Symbian) - Initial API and implementation
+ * Red Hat Inc - Modification to use with Autotools project
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.core.wizards;
+
+import java.util.List;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
+import org.eclipse.cdt.core.templateengine.TemplateCore;
+import org.eclipse.cdt.core.templateengine.process.ProcessArgument;
+import org.eclipse.cdt.core.templateengine.process.ProcessFailureException;
+import org.eclipse.cdt.core.templateengine.process.ProcessRunner;
+import org.eclipse.cdt.core.templateengine.process.processes.Messages;
+import org.eclipse.cdt.managedbuilder.core.BuildException;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.IOption;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.managedbuilder.templateengine.ProjectCreatedActions;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceDescription;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsNewProjectNature;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsConfigurationManager;
+
+
+/**
+ * Creates a new Project in the workspace.
+ */
+public class NewAutotoolsProject extends ProcessRunner {
+	protected boolean savedAutoBuildingValue;
+	protected ProjectCreatedActions pca;
+	protected IManagedBuildInfo info;
+	
+	public NewAutotoolsProject() {
+		pca = new ProjectCreatedActions();
+	}
+	
+	public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException {
+		String projectName = args[0].getSimpleValue();
+		String location = args[1].getSimpleValue();
+		String artifactExtension = args[2].getSimpleValue();
+		String isCProjectValue = args[3].getSimpleValue();
+		boolean isCProject = Boolean.valueOf(isCProjectValue).booleanValue();
+				
+		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+
+		try {
+			if (!project.exists()) {
+				IWorkspace workspace = ResourcesPlugin.getWorkspace();
+				turnOffAutoBuild(workspace);
+
+				IPath locationPath = null;
+				if (location != null && !location.trim().equals("")) { //$NON-NLS-1$
+					locationPath = Path.fromPortableString(location);
+				}
+
+				List<?> configs = template.getTemplateInfo().getConfigurations();
+				if (configs == null || configs.size() == 0) {
+					throw new ProcessFailureException(Messages.getString("NewManagedProject.4") + projectName); //$NON-NLS-1$
+				}
+
+				pca.setProject(project);
+				pca.setProjectLocation(locationPath);
+				pca.setConfigs((IConfiguration[]) configs.toArray(new IConfiguration[configs.size()]));
+				pca.setArtifactExtension(artifactExtension);
+				info = pca.createProject(monitor, CCorePlugin.DEFAULT_INDEXER, isCProject);
+
+				AutotoolsNewProjectNature.addAutotoolsNature(project, monitor);
+				
+				// For each IConfiguration, create a corresponding Autotools Configuration
+				IConfiguration[] cfgs = pca.getConfigs();
+				for (int i = 0; i < cfgs.length; ++i) {
+					IConfiguration cfg = cfgs[i];
+					ICConfigurationDescription cfgd = ManagedBuildManager.getDescriptionForConfiguration(cfg);
+					String id = cfgd.getId();
+					AutotoolsConfigurationManager.getInstance().getConfiguration(project, id, true);
+				}
+				AutotoolsConfigurationManager.getInstance().saveConfigs(project);
+
+				info.setValid(true);
+				ManagedBuildManager.saveBuildInfo(project, true);
+
+				restoreAutoBuild(workspace);
+
+			}
+			else {
+				AutotoolsNewProjectNature.addAutotoolsNature(project, monitor);
+				//			throw new ProcessFailureException(Messages.getString("NewAutotoolsProject.5") + projectName); //$NON-NLS-1$
+			}
+		} catch (CoreException e) {
+			throw new ProcessFailureException(Messages.getString("NewManagedProject.3") + e.getMessage(), e); //$NON-NLS-1$
+		} catch (BuildException e) {
+			throw new ProcessFailureException(Messages.getString("NewManagedProject.3") + e.getMessage(), e); //$NON-NLS-1$
+		}
+	}
+
+	protected final void turnOffAutoBuild(IWorkspace workspace) throws CoreException {
+		IWorkspaceDescription workspaceDesc = workspace.getDescription();
+		savedAutoBuildingValue = workspaceDesc.isAutoBuilding();
+		workspaceDesc.setAutoBuilding(false);
+		workspace.setDescription(workspaceDesc);
+	}
+	
+	protected final void restoreAutoBuild(IWorkspace workspace) throws CoreException {
+		IWorkspaceDescription workspaceDesc = workspace.getDescription();
+		workspaceDesc.setAutoBuilding(savedAutoBuildingValue);
+		workspace.setDescription(workspaceDesc);
+	}
+	
+	/**
+	 * setOptionValue
+	 * @param config
+	 * @param option
+	 * @param val
+	 * @throws BuildException
+	 */
+	protected void setOptionValue(IConfiguration config, IOption option, String val) throws BuildException {
+		if (val != null) {
+			if (!option.isExtensionElement()) {
+				option.setValue(val);
+			} else {
+				IOption newOption = config.getToolChain().createOption(option, option.getId() + "." + ManagedBuildManager.getRandomNumber(), option.getName(), false); //$NON-NLS-1$
+				newOption.setValue(val);
+			}
+		}
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/.classpath b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/.classpath
new file mode 100644
index 0000000..751c8f2
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/.project b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/.project
new file mode 100644
index 0000000..e6edf23
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.cdt.autotools.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/.settings/org.eclipse.jdt.core.prefs b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..b8bcab4
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Mon Dec 11 11:40:26 EST 2006
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/.settings/org.eclipse.jdt.ui.prefs b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..1e28f05
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,3 @@
+#Mon Dec 11 11:40:26 EST 2006
+eclipse.preferences.version=1
+internal.default.compliance=default
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/ChangeLog b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/ChangeLog
new file mode 100644
index 0000000..7f40324
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/ChangeLog
@@ -0,0 +1,242 @@
+2010-03-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/ProjectTools.java (setConfigDir): Fix up how
+	configuration is allocated.  Use id instead of name.
+
+2009-11-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Make singleton.
+
+2009-11-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/ProjectTools.java: Remove warnings.
+
+2009-10-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest0.java (testAutotoolsProject0): Fix to
+	handle fact that default build directory is now project directory.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest1.java (testAutotoolsProject1): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest2.java (testAutotoolsProject2): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/ProjectTools.java (setConfigDir): Fix to use new
+	AutotoolsConfigurationManager logic.
+
+2009-10-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump up release to 2.0.0.
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/AllAutotoolsTests.java (suite): Modified to use
+	new core and ui plug-ins. 
+	(suite): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/AutoconfTests.java (suite): Ditto. 
+	(suite): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsTestsPlugin.java (AutotoolsTestsPlugin): Ditto. 
+	(AutotoolsTestsPlugin): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeColourizationTests.java: Ditto. 
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeEditorTests.java: Ditto.
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeTextHoverTest.java: Ditto.
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/editors/EditorTests.java (suite): Ditto.
+	(suite): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/ProjectTools.java (ConvertToAutotoolsProjectWizardTest.getSelectedConfigurations): Ditto. 
+	(generateFiles): Ditto.
+	(markExecutable): Ditto.
+	(ConvertToAutotoolsProjectWizardTest.getSelectedConfigurations): Ditto. 
+	(generateFiles): Ditto.
+	(markExecutable): Ditto.
+
+2009-04-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/CoreUtility.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/ProjectTools.java: Use local CoreUtility
+	class to avoid internal class access warnings.
+
+2009-03-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/ProjectTools.java (generateFiles): Call
+	genfiles.sh instead of issuing aclocal, autoconf, and automake which might not exist on
+	test system.
+	* zip/project1.zip: Add generated files into special genfiles directory and add EPL. 
+	* zip/project2.zip: Ditto.
+	
+2009-03-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* build.properties: Add zip directory to binary build.
+
+2009-01-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add .qualifier to id.
+
+2008-12-09  Andrew Overholt  <overholt@redhat.com>
+
+	* test.xml: Debugging statement.
+
+2008-12-08  Andrew Overholt  <overholt@redhat.com>
+
+	* test.xml: Clean up some typos.
+
+2008-12-04  Andrew Overholt  <overholt@redhat.com>
+
+	* build.properties: Add test.xml to bin.includes.
+
+2008-11-05  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Update BREE to 1.5.
+
+2008-11-05  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/AllAutotoolsTests.java: New test suite.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/AutoconfTests.java: New test suite.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/editors/EditorTests.java: New test suite.
+	* test.xml: New file to drive tests on build.eclipse.org.
+
+2008-11-03  Andrew Overholt  <overholt@redhat.com>
+
+	* build.properties: Remove plugin.xml, add plugin.properties.
+
+2008-10-31  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Use plugin.properties for %bundleName and %provider.
+	Add "(Incubation)".
+	* plugin.properties: Initial import.
+
+2008-10-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump release to 1.0.3.
+
+2008-09-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Change Eclipse-AutoStart to Bundle-ActivationPolicy.
+
+2008-09-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeColourizationTests.java (setUp): Make sure
+	test project has unique name since JUNIT tests are run multithread.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeEditorTests.java (testAutomakeEditorAssociation):
+	Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeTextHoverTest.java (setUp): Ditto.
+
+2008-09-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+    Refactored com.redhat.eclipse.cdt.autotools.tests to org.eclipse.linuxtools.cdt.autotools.tests.
+
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/AllTests.java: Removed since must run as Junit
+	plugin and default is to run all tests in plugin which causes duplicate test runs.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/AllTests.java: Removed. Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest0.java (testAutotoolsProject0):
+	Add new generate configuration files parameter and set to true.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest1.java (testAutotoolsProject1):
+	Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest2.java (testAutotoolsProject2):
+	Add new generate configuration files parameter and set to false.
+	* src/org/eclipse/linuxtools/cdt/autotools/tests/ProjectTools.java (addSourceContainerWithImport):
+	Add new parameter which states whether configuration files require generation after
+	import.
+	(importFilesFromZipAndGenerate): New method which imports project files and performs
+	generation of configuration files.
+	(generateFiles): New method.
+
+2008-07-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump to 1.0.2.
+
+2008-04-17 10:43  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tests/autoconf/:
+	  TestMacroParser.java, TestShellParser.java: More autoconf parser
+	  work.  Remove old parser and standardize AST node constructors.
+	  Add more tests and fix some bugs.
+
+2008-04-10 15:40  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tests/autoconf/:
+	  BaseParserTest.java, TestMacroParser.java, TestShellParser.java,
+	  TestTokenizer.java: More autoconf parser work.
+
+2008-04-09 14:38  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tests/: AllTests.java,
+	  autoconf/AllTests.java, autoconf/BaseParserTest.java,
+	  autoconf/TestMacroParser.java, autoconf/TestParser.java,
+	  autoconf/TestShellParser.java, autoconf/TestSourceInfo.java,
+	  autoconf/TestTokenizer.java: New autoconf parser work in progress
+
+2008-04-07 14:06  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tests/: AllTests.java,
+	  autoconf/AllTests.java, autoconf/TestParser.java,
+	  autoconf/TestSourceInfo.java: Initial checkpoint for autotools
+	  parser changes
+
+
+2007-08-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Change release to 1.0.1 and specify minimum java runtime as
+	1.4.
+
+2007-04-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tests/AutotoolsProjectTest0.java: New
+	test to test simple project with configure in top-level directory.
+	* src/com/redhat/eclipse/cdt/autotools/tests/AllTests.java: Add
+	new AutotoolsProjectTest0 test.
+
+2007-04-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Verifies fix for #236304
+	* src/com/redhat/eclipse/cdt/autotools/tests/AutotoolsProjectTest1.java (tearDown):
+	Add try catch around project delete.
+	* src/com/redhat/eclipse/cdt/autotools/tests/AutotoolsProjectTest2.java: New test
+	for autogen.sh.
+	* src/com/redhat/eclipse/cdt/autotools/tests/AllTests.java (suite): Add
+	new AutotoolsProjectTest2 test.
+	* zip/project2.zip: New autogen.sh test project.
+
+2007-04-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Verifies fix for #235076
+	* src/com/redhat/eclipse/cdt/autotools/tests/ProjectTools.java (createFile): Add comments.
+	(setup): Ditto.
+	(getMonitor): Ditto.
+	(createEmptyFile): Ditto.
+	(addSourceContainer): Ditto.
+	(createProject): Ditto.
+	(addSourceContainerWithImport): Ditto.
+	(ConvertToAutotoolsProjectWizardTest): Ditto.
+	(ConvertToAutotoolsProjectWizardTest.getSelectedConfigurations): Ditto.
+	(build): New method.
+	(setConfigDir): Ditto.
+	(markExecutable): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/tests/AutotoolsProjectTest1.java: New test.
+	* src/com/redhat/eclipse/cdt/autotools/tests/AllTests.java (suite): Add
+	AutotoolsProjectTest1 test.
+	* zip/project1.zip: New sample project file for testing.
+
+2007-01-22  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tests/editors/AutomakeEditorTests.java:
+	Add copyright.
+	* src/com/redhat/eclipse/cdt/autotools/tests/editors/AutomakeColourizationTests.java:
+	Add copyright.
+	* src/com/redhat/eclipse/cdt/autotools/tests/editors/AutomakeTextHoverTest.java:
+	New file.
+
+
+2006-12-15  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tests/editors/AutomakeColourizationTests.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/tests/ProjectTools.java
+	(createFile): New method.
+	* src/com/redhat/eclipse/cdt/autotools/tests/AllTests.java
+	(suite): Add AutomakeColourizationTests.
+
+2006-12-12  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tests/editors/AutomakeEditorTests.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/tests/ProjectTools.java
+	(createEmptyFile): New method.
+	* src/com/redhat/eclipse/cdt/autotools/tests/AutotoolsProjectNatureTest.java:
+	Clean up imports.
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/META-INF/MANIFEST.MF b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..9d3aa1e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.cdt.autotools.tests;singleton:=true
+Bundle-Version: 2.0.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.cdt.autotools.tests.AutotoolsTestsPlugin
+Bundle-Vendor: %provider
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.linuxtools.cdt.autotools.core,
+ org.eclipse.core.resources,
+ org.eclipse.cdt.managedbuilder.core,
+ org.eclipse.cdt.ui,
+ org.junit,
+ org.eclipse.ui.ide,
+ org.eclipse.jface.text,
+ org.eclipse.ui.editors,
+ org.eclipse.cdt.make.core,
+ org.eclipse.cdt.make.ui,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.cdt.core,
+ org.eclipse.linuxtools.cdt.autotools.ui;bundle-version="1.0.0"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/about.html b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/about.html
new file mode 100644
index 0000000..44e2290
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

+<html>

+<head>

+<title>About</title>

+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>8th September, 2004</p>	

+<h3>License</h3>

+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<h3>Contributions</h3>

+

+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise

+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such

+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or

+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the

+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available

+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also

+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+</body>

+</html>
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/build.properties b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/build.properties
new file mode 100644
index 0000000..5c6ae50
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/build.properties
@@ -0,0 +1,7 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.properties,\
+               test.xml,\
+               zip/
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/plugin.properties b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/plugin.properties
new file mode 100644
index 0000000..ea28acf
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+#  Copyright (c) 2008 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+bundleName=Autotools Tests Plug-in (Incubation)
+provider=Eclipse.org
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AllAutotoolsTests.java b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AllAutotoolsTests.java
new file mode 100644
index 0000000..5064f51
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AllAutotoolsTests.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.tests;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllAutotoolsTests {
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite(
+				"Test for org.eclipse.linuxtools.cdt.autotools.core.tests");
+		//$JUnit-BEGIN$
+		suite.addTestSuite(AutotoolsProjectTest0.class);
+		suite.addTestSuite(AutotoolsProjectNatureTest.class);
+		suite.addTestSuite(AutotoolsProjectTest1.class);
+		suite.addTestSuite(AutotoolsProjectTest2.class);
+		//$JUnit-END$
+		return suite;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectNatureTest.java b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectNatureTest.java
new file mode 100644
index 0000000..dc1f46a
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectNatureTest.java
@@ -0,0 +1,27 @@
+package org.eclipse.linuxtools.cdt.autotools.tests;
+
+import junit.framework.TestCase;
+
+import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
+import org.eclipse.core.resources.IProject;
+
+public class AutotoolsProjectNatureTest extends TestCase {
+    
+    /*
+     * @see TestCase#setUp()
+     */
+    protected void setUp() throws Exception {
+        super.setUp();
+        if (!ProjectTools.setup())
+        	fail("could not perform basic project workspace setup");
+     }
+	
+	public void testAutotoolsProjectNature() throws Exception {
+		IProject testProject = ProjectTools.createProject("testProject");
+		if(testProject == null) {
+            fail("Unable to create test project");
+        }
+		assertTrue(testProject.hasNature(ManagedCProjectNature.MNG_NATURE_ID));
+		testProject.delete(true, false, ProjectTools.getMonitor());
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest0.java b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest0.java
new file mode 100644
index 0000000..ce63dcc
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest0.java
@@ -0,0 +1,68 @@
+package org.eclipse.linuxtools.cdt.autotools.tests;
+
+import junit.framework.TestCase;
+
+import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+
+public class AutotoolsProjectTest0 extends TestCase {
+    
+	private IProject testProject;
+	
+    /*
+     * @see TestCase#setUp()
+     */
+    protected void setUp() throws Exception {
+        super.setUp();
+        if (!ProjectTools.setup())
+        	fail("could not perform basic project workspace setup");
+		testProject = ProjectTools.createProject("testProject0");
+		if (testProject == null) {
+            fail("Unable to create test project");
+        }
+		testProject.open(new NullProgressMonitor());
+    }
+	
+    /**
+     * Test sample project which has a hello world program. The top-level 
+     * configure is found in the top-level directory.  The hello world source
+     * is found in sample/hello.c.
+     * @throws Exception
+     */
+	public void testAutotoolsProject0() throws Exception {
+		Path p = new Path("zip/project1.zip");
+		ProjectTools.addSourceContainerWithImport(testProject, null, p, null, true);
+		assertTrue(testProject.hasNature(ManagedCProjectNature.MNG_NATURE_ID));
+		org.eclipse.core.runtime.Path x = new org.eclipse.core.runtime.Path("ChangeLog");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("configure");
+		ProjectTools.markExecutable(testProject, "configure");
+		ProjectTools.markExecutable(testProject, "config.guess");
+		ProjectTools.markExecutable(testProject, "config.sub");
+		ProjectTools.markExecutable(testProject, "missing");
+		ProjectTools.markExecutable(testProject, "mkinstalldirs");
+		ProjectTools.markExecutable(testProject, "install-sh");
+		assertTrue(ProjectTools.build());
+		x = new org.eclipse.core.runtime.Path("config.status");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("Makefile");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("sample/a.out");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("sample/Makefile");
+		assertTrue(testProject.exists(x));
+	}
+	
+	protected void tearDown() throws Exception {
+		testProject.refreshLocal(IResource.DEPTH_INFINITE, null);
+		try {
+			testProject.delete(true, true, null);
+		} catch (Exception e) {
+			//FIXME: Why does a ResourceException occur when deleting the project??
+		}
+		super.tearDown();
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest1.java b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest1.java
new file mode 100644
index 0000000..7355493
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest1.java
@@ -0,0 +1,71 @@
+package org.eclipse.linuxtools.cdt.autotools.tests;
+
+import junit.framework.TestCase;
+
+import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+
+public class AutotoolsProjectTest1 extends TestCase {
+    
+	private IProject testProject;
+	
+    /*
+     * @see TestCase#setUp()
+     */
+    protected void setUp() throws Exception {
+        super.setUp();
+        if (!ProjectTools.setup())
+        	fail("could not perform basic project workspace setup");
+		testProject = ProjectTools.createProject("testProject1");
+		if (testProject == null) {
+            fail("Unable to create test project");
+        }
+		testProject.open(new NullProgressMonitor());
+    }
+	
+    /**
+     * Test sample project which has a hello world program. The top-level 
+     * configure is found in the subdirectory src which also contains the 
+     * subdirectory sample.  The hello world source is found in
+     * src/sample/hello.c so configuration must create multiple
+     * Makefiles.
+     * @throws Exception
+     */
+	public void testAutotoolsProject1() throws Exception {
+		Path p = new Path("zip/project1.zip");
+		ProjectTools.addSourceContainerWithImport(testProject, "src", p, null, true);
+		assertTrue(testProject.hasNature(ManagedCProjectNature.MNG_NATURE_ID));
+		org.eclipse.core.runtime.Path x = new org.eclipse.core.runtime.Path("src/ChangeLog");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("src/configure");
+		ProjectTools.setConfigDir(testProject, "src");
+		ProjectTools.markExecutable(testProject, "src/configure");
+		ProjectTools.markExecutable(testProject, "src/config.guess");
+		ProjectTools.markExecutable(testProject, "src/config.sub");
+		ProjectTools.markExecutable(testProject, "src/missing");
+		ProjectTools.markExecutable(testProject, "src/mkinstalldirs");
+		ProjectTools.markExecutable(testProject, "src/install-sh");
+		assertTrue(ProjectTools.build());
+		x = new org.eclipse.core.runtime.Path("config.status");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("Makefile");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("sample/a.out");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("sample/Makefile");
+		assertTrue(testProject.exists(x));
+	}
+	
+	protected void tearDown() throws Exception {
+		testProject.refreshLocal(IResource.DEPTH_INFINITE, null);
+		try {
+			testProject.delete(true, true, null);
+		} catch (Exception e) {
+			//FIXME: Why does a ResourceException occur when deleting the project??
+		}
+		super.tearDown();
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest2.java b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest2.java
new file mode 100644
index 0000000..85f9d4b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsProjectTest2.java
@@ -0,0 +1,85 @@
+package org.eclipse.linuxtools.cdt.autotools.tests;
+
+import junit.framework.TestCase;
+
+import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+
+// This test verifies an autogen.sh project that builds configure, but
+// does not run it.
+public class AutotoolsProjectTest2 extends TestCase {
+    
+	private IProject testProject;
+	
+    /*
+     * @see TestCase#setUp()
+     */
+    protected void setUp() throws Exception {
+        super.setUp();
+        if (!ProjectTools.setup())
+        	fail("could not perform basic project workspace setup");
+		testProject = ProjectTools.createProject("testProject2");
+		if (testProject == null) {
+            fail("Unable to create test project");
+        }
+		testProject.open(new NullProgressMonitor());
+    }
+	
+    /**
+     * Test sample project which has a hello world program. The top-level 
+     * contains autogen.sh which will build configure, but not run it.
+     * The hello world source is found in
+     * src/sample/hello.c so configuration must create multiple
+     * Makefiles.
+     * @throws Exception
+     */
+	public void testAutotoolsProject2() throws Exception {
+		Path p = new Path("zip/project2.zip");
+		ProjectTools.addSourceContainerWithImport(testProject, "src", p, null);
+		assertTrue(testProject.hasNature(ManagedCProjectNature.MNG_NATURE_ID));
+		org.eclipse.core.runtime.Path x = new org.eclipse.core.runtime.Path("src/ChangeLog");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("src/configure");
+		ProjectTools.setConfigDir(testProject, "src");
+		ProjectTools.markExecutable(testProject, "src/autogen.sh");
+		x = new org.eclipse.core.runtime.Path("src/configure");
+		assertFalse(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("src/Makefile.in");
+		assertFalse(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("src/sample/Makefile.in");
+		assertFalse(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("src/aclocal.m4");
+		assertFalse(testProject.exists(x));
+		assertTrue(ProjectTools.build());
+		x = new org.eclipse.core.runtime.Path("src/configure");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("src/Makefile.in");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("src/sample/Makefile.in");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("src/aclocal.m4");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("config.status");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("Makefile");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("sample/a.out");
+		assertTrue(testProject.exists(x));
+		x = new org.eclipse.core.runtime.Path("sample/Makefile");
+		assertTrue(testProject.exists(x));
+	}
+	
+	protected void tearDown() throws Exception {
+		testProject.refreshLocal(IResource.DEPTH_INFINITE, null);
+		try {
+			testProject.delete(true, true, null);
+		} catch (Exception e) {
+			//FIXME: Why does a ResourceException occur when deleting the project??
+		}
+		super.tearDown();
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsTestsPlugin.java b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsTestsPlugin.java
new file mode 100644
index 0000000..533bd44
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/AutotoolsTestsPlugin.java
@@ -0,0 +1,103 @@
+package org.eclipse.linuxtools.cdt.autotools.tests;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class AutotoolsTestsPlugin extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.cdt.autotools.core.tests";
+
+	// The shared instance
+	private static AutotoolsTestsPlugin plugin;
+	private ResourceBundle resourceBundle;
+	
+	/**
+	 * The constructor
+	 */
+	public AutotoolsTestsPlugin() {
+		plugin = this;
+		try {
+			resourceBundle = ResourceBundle.getBundle("org.eclipse.linuxtools.cdt.autotools.core.tests.Resources");
+		} catch (MissingResourceException x) {
+			resourceBundle = null;
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static AutotoolsTestsPlugin getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Returns an image descriptor for the image file at the given
+	 * plug-in relative path
+	 *
+	 * @param path the path
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return imageDescriptorFromPlugin(PLUGIN_ID, path);
+	}
+	
+	/**
+	 * Returns active shell.
+	 */
+	public static Shell getActiveWorkbenchShell() {
+		IWorkbenchWindow window = getDefault().getWorkbench().getActiveWorkbenchWindow();
+		if (window != null) {
+			return window.getShell();
+		}
+		return null;
+	}
+	
+	/**
+	 * Returns the string from the plugin's resource bundle,
+	 * or 'key' if not found.
+	 */
+	public static String getResourceString(String key) {
+		ResourceBundle bundle = AutotoolsTestsPlugin.getDefault().getResourceBundle();
+		try {
+			return (bundle != null) ? bundle.getString(key) : key;
+		} catch (MissingResourceException e) {
+			return key;
+		}
+	}
+
+	/**
+	 * Returns the plugin's resource bundle,
+	 */
+	public ResourceBundle getResourceBundle() {
+		return resourceBundle;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/CoreUtility.java b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/CoreUtility.java
new file mode 100644
index 0000000..67b1b87
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/CoreUtility.java
@@ -0,0 +1,108 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - initial API and implementation
+ *     Markus Schorn (Wind River Systems)
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.tests;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.osgi.framework.Bundle;
+
+public class CoreUtility {
+	
+	/**
+	 * Creates a folder and all parent folders if not existing.
+	 * Project must exist.
+	 * <code> org.eclipse.ui.dialogs.ContainerGenerator</code> is too heavy
+	 * (creates a runnable)
+	 */
+	public static void createFolder(IFolder folder, boolean force, boolean local, IProgressMonitor monitor) throws CoreException {
+		if (!folder.exists()) {
+			IContainer parent= folder.getParent();
+			if (parent instanceof IFolder) {
+				createFolder((IFolder)parent, force, local, null);
+			}
+			folder.create(force, local, monitor);
+		}
+	}
+	
+	/**
+	 * Creates an extension.  If the extension plugin has not
+	 * been loaded a busy cursor will be activated during the duration of
+	 * the load.
+	 *
+	 * @param element the config element defining the extension
+	 * @param classAttribute the name of the attribute carrying the class
+	 * @return the extension object
+	 */
+	public static Object createExtension(final IConfigurationElement element, final String classAttribute) throws CoreException {
+		// If plugin has been loaded create extension.
+		// Otherwise, show busy cursor then create extension.
+		
+		String id= element.getContributor().getName();
+		Bundle bundle = Platform.getBundle(id);
+		if(bundle.getState() == org.osgi.framework.Bundle.ACTIVE) {
+			return element.createExecutableExtension(classAttribute);
+		}
+		final Object[] ret = new Object[1];
+		final CoreException[] exc = new CoreException[1];
+		BusyIndicator.showWhile(null, new Runnable() {
+			public void run() {
+				try {
+					ret[0] = element.createExecutableExtension(classAttribute);
+				} catch (CoreException e) {
+					exc[0] = e;
+				}
+			}
+		});
+		if (exc[0] != null)
+			throw exc[0];
+		return ret[0];
+	}
+
+	/**
+	 * Calls equals after checking for nulls
+	 */
+	public static boolean safeEquals(Object lhs, Object rhs) {
+	    if (lhs==rhs) {
+	        return true;
+	    }
+	    if (lhs == null || rhs == null) {
+	        return false;
+	    }
+	    return lhs.equals(rhs);
+	}
+
+	/**
+	 * Calls hashCode after checking for null
+	 */
+	public static int safeHashcode(Object o) {
+		return o == null ? 0 : o.hashCode();
+	}
+
+	/**
+	 * Comparse two integers.
+	 */
+	public static int compare(int lhs, int rhs) {
+		if (lhs < rhs) {
+			return -1;
+		}
+		if (lhs > rhs) {
+			return 1;
+		}
+		return 0;
+	}
+}	
+
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/ProjectTools.java b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/ProjectTools.java
new file mode 100644
index 0000000..c78eca1
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/ProjectTools.java
@@ -0,0 +1,418 @@
+package org.eclipse.linuxtools.cdt.autotools.tests;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.util.zip.ZipFile;
+
+import org.eclipse.cdt.core.CommandLauncher;
+import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.IProjectType;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.ui.wizards.conversion.ConvertProjectWizardPage;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceDescription;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsConfigurationManager;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IAConfiguration;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards.ConvertToAutotoolsProjectWizard;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards.ConvertToAutotoolsProjectWizardPage;
+import org.eclipse.ui.dialogs.IOverwriteQuery;
+import org.eclipse.ui.wizards.datatransfer.ImportOperation;
+import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider;
+
+
+public class ProjectTools {
+
+	static IWorkspace workspace;
+    static IWorkspaceRoot root;
+    static NullProgressMonitor monitor;
+    static String pluginRoot;
+    static ConvertProjectWizardPage page;
+    static boolean setupComplete;
+
+    /**
+     * Setup routine for tests.
+     * @return true if setup successful, false otherwise
+     * @throws Exception
+     */
+	public static boolean setup() throws Exception {
+		if (!setupComplete) {
+        IWorkspaceDescription desc;
+        workspace = ResourcesPlugin.getWorkspace();
+        root = workspace.getRoot();
+        monitor = new NullProgressMonitor();
+        if(workspace == null) {
+        	return false;
+        }
+        if(root == null) {
+        	return false;
+        }
+        desc = workspace.getDescription();
+        desc.setAutoBuilding(false);
+        workspace.setDescription(desc);
+		}
+		setupComplete = true;
+		return true;
+	}
+	
+	/**
+	 * Build the project.
+	 * @return true if build started successfully or false otherwise
+	 */
+	public static boolean build() {
+		try {
+			workspace.build(IncrementalProjectBuilder.FULL_BUILD, getMonitor());
+		} catch (CoreException e) {
+		    return false;	
+		}
+		return true;
+	}
+	
+	/**
+	 * Get the default monitor.
+	 * @return The current monitor
+	 */
+	public static IProgressMonitor getMonitor() {
+		return monitor;
+	}
+
+	/**
+	 * Mark a specified file in a project as executable.
+	 * @param project The project that the file is found in
+	 * @param filePath The relative path to the file
+	 * @return true if the change was successful, false otherwise
+	 */
+	public static boolean markExecutable(IProject project, String filePath) {
+		// Get a launcher for the config command
+		CommandLauncher launcher = new CommandLauncher();
+		OutputStream stdout = new ByteArrayOutputStream();
+		OutputStream stderr = new ByteArrayOutputStream();
+
+		launcher.showCommand(true);
+		IPath commandPath = new Path("chmod");
+		IPath runPath = project.getLocation().append(filePath).removeLastSegments(1);
+		String[] args = new String[2];
+		args[0] = "+x";
+		args[1] = project.getLocation().append(filePath).toOSString();
+		try {
+			Process proc = launcher.execute(commandPath, args, new String[0],
+					runPath, new NullProgressMonitor());
+			if (proc != null) {
+				try {
+					// Close the input of the process since we will never write to
+					// it
+					proc.getOutputStream().close();
+				} catch (IOException e) {
+				}
+
+				if (launcher.waitAndRead(stdout, stderr, new SubProgressMonitor(
+						monitor, IProgressMonitor.UNKNOWN)) != CommandLauncher.OK) {
+					return false;
+				}
+			} else
+				return false;
+		} catch (CoreException e) {
+			return false;
+		}
+		return true;
+	}
+	
+	// Inner class to allow us to fake a project wizard without starting up
+	// the UI for it.
+	protected static class ConvertToAutotoolsProjectWizardTest extends ConvertToAutotoolsProjectWizard {
+		ConvertToAutotoolsProjectWizardTest() {
+			super();
+		}
+
+		// The following is a kludge to allow testing to occur for the
+		// wizard code.  The regular applyOptions() method would also attempt
+		// to call performApply() for the optionPage.  This doesn't work in
+		// the test scenario because the UI display logic is needed to
+		// initialize some things.  The performApply() call is only needed
+		// to check out referenced projects.  In our test scenario, this is
+		// not required.
+		public void applyOptions(IProject project, IProgressMonitor monitor) {
+			setCurrentProject(project);
+	    }
+		
+		public IConfiguration[] getSelectedConfigurations() {
+			IProjectType projectType = ManagedBuildManager.getExtensionProjectType("org.eclipse.linuxtools.cdt.autotools.core.projectType"); //$NON-NLS-1$
+			IConfiguration[] cfgs = projectType.getConfigurations();
+			return cfgs;
+		}
+	}
+	
+	/**
+	 * Creates an empty Autotools project.
+	 * @param name The name of the new project
+	 * @return The newly created project or null
+	 */		
+	public static IProject createProject(String name) {
+		IProject testProject = root.getProject(name);
+		if (testProject == null) {
+			return null;
+        }
+		try {
+			testProject.create(monitor);
+			testProject.open(monitor);
+			ConvertToAutotoolsProjectWizardTest wizard = new ConvertToAutotoolsProjectWizardTest();
+			wizard.addPages();
+			ConvertToAutotoolsProjectWizardPage page = new ConvertToAutotoolsProjectWizardPage("test", wizard);
+			page.convertProject(testProject, monitor, wizard.getProjectID());
+		} catch (CoreException e) {
+			testProject = null;
+		}
+		return testProject;
+	}
+	
+	/**
+	 * Set the configuration source directory for an Autotools project.
+	 * @param project The Autotools project to modify
+	 * @param dir The relative project directory to use
+	 */
+	public static void setConfigDir(IProject project, String dir) {
+		IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+		IConfiguration c = info.getDefaultConfiguration();
+		ICConfigurationDescription cfgd = ManagedBuildManager.getDescriptionForConfiguration(c);
+		String id = cfgd.getId();
+		IAConfiguration cfg = AutotoolsConfigurationManager.getInstance().getConfiguration(project, id, true);
+		cfg.setConfigToolDirectory(dir);
+//		IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+//		ITool tool = info.getToolFromOutputExtension("status"); //$NON-NLS-1$
+//		IOption[] options = tool.getOptions();
+//		try {
+//		for (int i = 0; i < options.length; ++i) {
+//			if (options[i].getValueType() == IOption.STRING) {
+//				String id = options[i].getId();
+//				if (id.indexOf("configdir") > 0) { //$NON-NLS-1$
+//					options[i].setValue(dir);
+//					break;
+//				}
+//			}
+//		}
+//		} catch (BuildException e) {
+//			// do nothing
+//		}
+	}
+	
+	private static void importFilesFromZip(ZipFile srcZipFile, IPath destPath, IProgressMonitor monitor) throws InvocationTargetException {		
+		ZipFileStructureProvider structureProvider=	new ZipFileStructureProvider(srcZipFile);
+		try {
+			ImportOperation op= new ImportOperation(destPath, structureProvider.getRoot(), structureProvider, new ImportOverwriteQuery());
+			op.run(monitor);
+		} catch (InterruptedException e) {
+			// should not happen
+		}
+	}
+
+	private static boolean generateFiles(IPath destPath) {
+		// Get a launcher for the config command
+		CommandLauncher launcher = new CommandLauncher();
+		OutputStream stdout = new ByteArrayOutputStream();
+		OutputStream stderr = new ByteArrayOutputStream();
+		
+		IPath runPath = root.getLocation().append(destPath);
+
+		// Run the genfiles.sh shell script which will simulate
+		// running aclocal, autoconf, and automake
+		launcher.showCommand(true);
+		IPath commandPath = new Path("sh");
+		String[] cmdargs = new String[]{"genfiles.sh"};
+		try {
+			Process proc = launcher.execute(commandPath, cmdargs, new String[0],
+					runPath, new NullProgressMonitor());
+			if (proc != null) {
+				try {
+					// Close the input of the process since we will never write to
+					// it
+					proc.getOutputStream().close();
+				} catch (IOException e) {
+				}
+
+				if (launcher.waitAndRead(stdout, stderr, new SubProgressMonitor(
+						monitor, IProgressMonitor.UNKNOWN)) != CommandLauncher.OK) {
+					return false;
+				}
+			} else
+				return false;
+		} catch (CoreException e) {
+			return false;
+		}
+
+		return true;
+	}
+
+	private static void importFilesFromZipAndGenerate(ZipFile srcZipFile, IPath destPath, IProgressMonitor monitor) throws InvocationTargetException {
+		importFilesFromZip(srcZipFile, destPath, monitor);
+		if (!generateFiles(destPath))
+			throw new InvocationTargetException(new Exception("Unsuccessful test file generation"));
+	}
+	
+	private static class ImportOverwriteQuery implements IOverwriteQuery {
+		public String queryOverwrite(String file) {
+			return ALL;
+		}	
+	}		
+	
+	/**
+	 * Adds a source container to a IProject.
+	 * @param jproject The parent project
+	 * @param containerName The name of the new source container
+	 * @return The handle to the new source container
+	 * @throws CoreException Creation failed
+	 */		
+	public static IContainer addSourceContainer(IProject jproject, String containerName) throws CoreException {
+		return addSourceContainer(jproject, containerName, new Path[0]);
+	}
+
+	/**
+	 * Adds a source container to a IProject.
+	 * @param jproject The parent project
+	 * @param containerName The name of the new source container
+	 * @param exclusionFilters Exclusion filters to set
+	 * @return The handle to the new source container
+	 * @throws CoreException Creation failed
+	 */		
+	public static IContainer addSourceContainer(IProject jproject, String containerName, IPath[] exclusionFilters) throws CoreException {
+		return addSourceContainer(jproject, containerName, new Path[0], exclusionFilters);
+	}
+	
+	/**
+	 * Adds a source container to a IProject.
+	 * @param jproject The parent project
+	 * @param containerName The name of the new source container
+	 * @param inclusionFilters Inclusion filters to set
+	 * @param exclusionFilters Exclusion filters to set
+	 * @return The handle to the new source container
+	 * @throws CoreException Creation failed
+	 */				
+	public static IContainer addSourceContainer(IProject jproject, String containerName, IPath[] inclusionFilters, IPath[] exclusionFilters) throws CoreException {
+		IProject project= jproject.getProject();
+		IContainer container= null;
+		if (containerName == null || containerName.length() == 0) {
+			container= project;
+		} else {
+			IFolder folder= project.getFolder(containerName);
+			if (!folder.exists()) {
+				CoreUtility.createFolder(folder, false, true, null);
+			}
+			container= folder;
+		}
+	
+		return container;
+	}
+	
+	/**
+	 * Adds a source container to a IProject and imports all files contained
+	 * in the given ZIP file.
+	 * @param project The parent project
+	 * @param containerName Name of the source container
+	 * @param zipFile Archive to import
+	 * @param containerEncoding encoding for the generated source container
+	 * @param generate true if configuration files need to be pre-generated
+	 * @param exclusionFilters Exclusion filters to set
+	 * @return The handle to the new source container
+	 * @throws InvocationTargetException Creation failed
+	 * @throws CoreException Creation failed
+	 * @throws IOException Creation failed
+	 */		
+	public static IContainer addSourceContainerWithImport(IProject project, String containerName, File zipFile, String containerEncoding, boolean generate, IPath[] exclusionFilters) throws InvocationTargetException, CoreException, IOException {
+		ZipFile file= new ZipFile(zipFile);
+		try {
+//			IPackageFragmentRoot root= addSourceContainer(jproject, containerName, exclusionFilters);
+//			((IContainer) root.getCorrespondingResource()).setDefaultCharset(containerEncoding, null);
+			IContainer root= addSourceContainer(project, containerName, exclusionFilters);
+			if (generate)
+				importFilesFromZipAndGenerate(file, root.getFullPath(), null);
+			else
+				importFilesFromZip(file, root.getFullPath(), null);
+			return root;
+		} finally {
+			if (file != null) {
+				file.close();
+			}
+		}
+	}
+
+	/**
+	 * Adds a source container to a IProject and imports all files contained
+	 * in the given ZIP file and generates configuration files if needed.
+	 * @param project The parent project
+	 * @param containerName Name of the source container
+	 * @param path path of zipFile Archive to import
+	 * @param containerEncoding encoding for the generated source container
+	 * @param generate true if configuration files need to be pre-generated
+	 * @return The handle to the new source container
+	 * @throws InvocationTargetException Creation failed
+	 * @throws CoreException Creation failed
+	 * @throws IOException Creation failed
+	 */		
+	public static IContainer addSourceContainerWithImport(IProject project, String containerName, Path zipFilePath, String containerEncoding, boolean generate) throws InvocationTargetException, CoreException, IOException {
+		File zipFile = new File(FileLocator.toFileURL(FileLocator.find(AutotoolsTestsPlugin.getDefault().getBundle(), zipFilePath, null)).getFile());
+		return addSourceContainerWithImport(project, containerName, zipFile, containerEncoding, generate, null);
+	}
+	
+	/**
+	 * Adds a source container to a IProject and imports all files contained
+	 * in the given ZIP file.
+	 * @param project The parent project
+	 * @param containerName Name of the source container
+	 * @param path path of zipFile Archive to import
+	 * @param containerEncoding encoding for the generated source container
+	 * @return The handle to the new source container
+	 * @throws InvocationTargetException Creation failed
+	 * @throws CoreException Creation failed
+	 * @throws IOException Creation failed
+	 */		
+	public static IContainer addSourceContainerWithImport(IProject project, String containerName, Path zipFilePath, String containerEncoding) throws InvocationTargetException, CoreException, IOException {
+		return addSourceContainerWithImport(project, containerName, zipFilePath, containerEncoding, false);
+	}
+
+	/**
+	 * Create an empty file for a project.
+	 * @param project The project to create the file for
+	 * @param filename The name of the new file
+	 * @return the created file
+	 * @throws CoreException
+	 */
+	public IFile createEmptyFile(IProject project, String filename) throws CoreException {
+		IFile emptyFile = project.getFile(filename);
+		emptyFile.create(null, false, null);
+		return emptyFile;
+	}
+
+	/**
+	 * Create a file for a project and initialize the contents.
+	 * @param project The project to create a file for
+	 * @param filename Name of the new file
+	 * @param contents String containing the initial contents of the file
+	 * @return the created file
+	 * @throws CoreException
+	 */
+	public IFile createFile(IProject project, String filename, String contents) throws CoreException {
+		IFile file = project.getFile(filename);
+		file.create(null, false, null);
+		file.setContents(new ByteArrayInputStream(contents.getBytes()), false, false, null);
+		return file;
+	}
+	
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/Resources.properties b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/Resources.properties
new file mode 100644
index 0000000..72d197e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/Resources.properties
@@ -0,0 +1,2 @@
+ProjectTools.ErrorDialog.Title="Project Creation Error"
+ProjectTools.Exist.Error="Project already exists"
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/AutoconfTests.java b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/AutoconfTests.java
new file mode 100644
index 0000000..566b866
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/AutoconfTests.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.tests.autoconf;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AutoconfTests {
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite(
+				"Test for org.eclipse.linuxtools.cdt.autotools.core.tests.autoconf");
+		//$JUnit-BEGIN$
+		suite.addTestSuite(TestMacroParser.class);
+		suite.addTestSuite(TestTokenizer.class);
+		suite.addTestSuite(TestShellParser.class);
+		//$JUnit-END$
+		return suite;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/BaseParserTest.java b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/BaseParserTest.java
new file mode 100644
index 0000000..d61e810
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/BaseParserTest.java
@@ -0,0 +1,268 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.tests.autoconf;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.jface.text.Document;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfMacroDetector;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfMacroElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfParser;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.IAutoconfErrorHandler;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.IAutoconfMacroValidator;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.ParseException;
+
+
+import junit.framework.TestCase;
+
+public abstract class BaseParserTest extends TestCase {
+
+	private IAutoconfErrorHandler errorHandler;
+	protected List errors;
+	private IAutoconfMacroValidator macroValidator;
+	private Set macroNames;
+	private AutoconfMacroDetector macroDetector;
+
+	public BaseParserTest() {
+		super();
+	}
+
+	public BaseParserTest(String name) {
+		super(name);
+	}
+
+	protected void setUp() throws Exception {
+		errors = new ArrayList();
+		this.errorHandler = new IAutoconfErrorHandler() {
+	
+			public void handleError(ParseException exception) {
+				assertNotNull(exception);
+				errors.add(exception);
+			}
+			
+		};
+	
+		this.macroDetector = new AutoconfMacroDetector();
+		
+		macroNames = new HashSet/*<String>*/();
+		this.macroValidator = new IAutoconfMacroValidator() {
+	
+			public void validateMacroCall(AutoconfMacroElement element)
+					throws ParseException {
+				assertNotNull(element);
+				assertNotNull(element.getName());
+				assertNotNull(element.getChildren());
+				macroNames.add(element.getName());
+			}
+			
+		};
+	}
+
+	protected void tearDown() throws Exception {
+	}
+
+	protected IDocument createDocument(String text) {
+		return new Document(text);
+	}
+
+	/**
+	 * Parse the document with no error or macro handlers
+	 * @param parser
+	 * @param document
+	 * @return root
+	 */
+	protected AutoconfElement parseNoHandlers(IDocument document) {
+		AutoconfParser parser = new AutoconfParser(null, null, null);
+		AutoconfElement root = parser.parse(document);
+		assertNotNull(root);
+		return root;
+	}
+
+	/**
+	 * Parse the document with the standard error or macro handlers,
+	 * cleared out before use
+	 * @param parser
+	 * @param document
+	 * @return root 
+	 */
+	protected AutoconfElement parseWithHandlers(IDocument document) {
+		AutoconfParser parser = new AutoconfParser(errorHandler, macroDetector, macroValidator);
+		
+		errors.clear();
+		macroNames.clear();
+		
+		AutoconfElement root = parser.parse(document);
+		assertNotNull(root);
+		return root;
+	}
+
+	/**
+	 * Parse the document in 'string' twice, once without any handlers and once with the standard error or macro handlers,
+	 * cleared out before use
+	 * @param string
+	 * @return root 
+	 */
+	protected AutoconfElement parse(String string) {
+		AutoconfElement tree = parse(string, false);
+		return tree;
+	}
+
+	protected AutoconfElement parse(String string, boolean allowErrors) {
+		IDocument document = createDocument(string);
+		AutoconfElement root1 = parseNoHandlers(document);
+		assertNotNull(root1);
+		AutoconfElement root2 = parseWithHandlers(document);
+		assertNotNull(root2);
+	
+		validateSourceTree(root1);
+		validateSourceTree(root2);
+	
+		// TODO: check root1 == root2
+		
+		// ensure the doc wasn't changed (sanity)
+		assertEquals(string, document.get());
+	
+		if (!allowErrors) {
+			if (errors.size() > 0)
+				fail("got errors" + errors.get(0));
+		}
+		else
+			assertTrue(errors.size() > 0);
+		
+		return root2;
+	}
+
+	protected void checkError(String msgKey) {
+		for (Iterator iter = errors.iterator(); iter.hasNext(); ) {
+			ParseException exc = (ParseException) iter.next();
+			if (exc.getMessage().contains(msgKey))
+				return;
+		}
+		String any = "";
+		if (errors.size() > 0)
+			any = ", but saw " + errors.get(0).toString();
+		fail("did not find error: " + msgKey + any );
+	}
+
+	protected void checkError(String msgKey, int line) {
+		ParseException possible = null;
+		int distance = 999;
+		for (Iterator iter = errors.iterator(); iter.hasNext(); ) {
+			ParseException exc = (ParseException) iter.next();
+			if (exc.getMessage().contains(msgKey)) {
+				int curDistance = Math.abs(possible.getLineNumber() - line);
+				if (possible == null || curDistance < distance) {
+					possible = exc;
+					distance = curDistance;
+				}
+				if (exc.getLineNumber() == line)
+					return;
+			}
+		}
+		if (possible == null)
+			fail("did not find any error: " + msgKey);
+		else
+			fail("did not find error: " + msgKey + " on line: " + line +", but found one at " + possible.getLineNumber());
+	}
+
+	/**
+	 * Make sure the source ranges for the tree are sane:
+	 * <p>
+	 * <li>document set
+	 * <li>line numbers, columns valid
+	 * <li>children encompassed in parent
+	 * <li>siblings non-overlapping
+	 * @param element
+	 */
+	protected void validateSourceTree(AutoconfElement element) {
+		validateSourceElement(element);
+		AutoconfElement[] kids = element.getChildren();
+		for (int i = 0; i < kids.length; i++) {
+			if (kids[i].getStartOffset() < element.getStartOffset() 
+					|| kids[i].getEndOffset() > element.getEndOffset())
+				fail(describeElement(kids[i]) + " not inside parent " + describeElement(element));
+			validateSourceTree(kids[i]);
+		}
+		for (int i = 0; i < kids.length - 1; i++) {
+			AutoconfElement kid1 = kids[i];
+			AutoconfElement kid2 = kids[i + 1];
+			if (kid1.getEndOffset() > kid2.getStartOffset())
+				fail(describeElement(kid1) + " overlaps " + describeElement(kid2));
+		}
+	}
+
+	/**
+	 * Make sure the source ranges for the element are sane:
+	 * <p>
+	 * <li>document set
+	 * <li>line numbers, columns valid
+	 * @param element
+	 */
+	private void validateSourceElement(AutoconfElement element) {
+		if (element.getDocument() == null)
+			fail("no document for " + describeElement(element));
+		if (element.getStartOffset() < 0)
+			fail("no start offset for " + describeElement(element));
+		if (element.getEndOffset() < 0)
+			fail("no end offset for " + describeElement(element));
+		if (element.getStartOffset() > element.getEndOffset())
+			fail("invalid range (start > end) for " + describeElement(element));
+	}
+
+	private String describeElement(AutoconfElement element) {
+		return element.getClass().getSimpleName() + " <<" + element.getSource() + ">>";
+	}
+
+	protected void assertEqualSource(String text, AutoconfElement element) {
+		assertEquals(text, element.getSource());
+	}
+
+	/** Check that a tree has the given structure.  'elements' is a flattened
+	 * representation of the tree, where each node represents one level deeper
+	 * in the tree, except for 'null' which backs out one level.
+	 * @param tree
+	 * @param elements
+	 */
+	protected void assertTreeStructure(AutoconfElement tree, String[] elements) {
+		// if fails, the elements[] array is missing final nulls
+		assertEquals(elements.length, assertTreeStructure(tree, elements, 0));
+	}
+
+	private int assertTreeStructure(AutoconfElement tree, String[] elements,
+			int elementIdx) {
+		AutoconfElement[] kids = tree.getChildren();
+		for (int j = 0; j < kids.length; j++) {
+			if (elementIdx >= elements.length  || elements[elementIdx] == null) {
+				fail("extra children in " + tree + " at " + kids[j]);
+			}
+			if (!kids[j].getName().equals(elements[elementIdx])) 
+				fail("did not match " + elements[elementIdx] + ", instead got " + kids[j].getClass().getSimpleName() + "=" + kids[j].getName());
+			
+			elementIdx++;
+			if (kids[j].getChildren().length > 0) {
+				elementIdx = assertTreeStructure(kids[j], elements, elementIdx);
+				if (elementIdx >= elements.length)
+					fail("Missing null in elements list, or invalid tree hierarchy");
+				if (elements[elementIdx] != null) {
+					fail("not enough children in " + tree);
+				}
+				elementIdx++;
+			}
+		}
+		return elementIdx;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/TestMacroParser.java b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/TestMacroParser.java
new file mode 100644
index 0000000..7bcf950
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/TestMacroParser.java
@@ -0,0 +1,266 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.tests.autoconf;
+
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.AutoconfEditorMessages;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfIfElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfMacroArgumentElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfMacroElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfParser;
+
+
+/**
+ * Test parsing with macros
+ * @author eswartz
+ *
+ */
+public class TestMacroParser extends BaseParserTest {
+
+	public void testEmpty() throws Exception {
+		parse("");
+	}
+	
+	public void testComments() throws Exception {
+		// 
+		String text = 
+			"dnl first line\n" +
+			"dnl second line\n";
+		AutoconfElement root = parse(text);
+		Object[] kids = root.getChildren();
+		// these are stripped
+		assertEquals(0, kids.length);
+		assertTreeStructure(root, new String[] {});
+	}
+	
+	public void testMacroParsing1() throws Exception {
+		// 
+		String text =
+			"AC_REQUIRE([AM_SANITY_CHECK])\n" + 
+			"";
+		AutoconfElement root = parse(text);
+		assertTreeStructure(root, new String[] { "AC_REQUIRE", "AM_SANITY_CHECK", null });
+		
+		AutoconfElement[] kids = root.getChildren();
+		assertEquals(1, kids.length);
+		assertTrue(kids[0] instanceof AutoconfMacroElement);
+		AutoconfMacroElement macro = (AutoconfMacroElement) kids[0];
+		assertEquals("AC_REQUIRE", macro.getName());
+		assertEquals(1, macro.getParameterCount());
+		
+		AutoconfElement[] args = macro.getChildren();
+		assertEquals(1, args.length);
+		assertTrue(args[0] instanceof AutoconfMacroArgumentElement);
+		
+		assertEquals("AM_SANITY_CHECK", ((AutoconfMacroArgumentElement)args[0]).getName());
+		assertEquals("AM_SANITY_CHECK", macro.getParameter(0));
+		
+		// keep quotes in source
+		assertEqualSource("[AM_SANITY_CHECK]", args[0]);
+		assertEqualSource("AC_REQUIRE([AM_SANITY_CHECK])", macro);
+	}
+	
+	public void testMacroParsing2() throws Exception {
+		// 
+		String text =
+			"AC_TWO_ARGS(first,second)\n" + 
+			"";
+		AutoconfElement root = parse(text);
+		assertTreeStructure(root, new String[] { "AC_TWO_ARGS", "first", "second", null });
+		
+		AutoconfElement[] kids = root.getChildren();
+		assertEquals(1, kids.length);
+		assertTrue(kids[0] instanceof AutoconfMacroElement);
+		AutoconfMacroElement macro = (AutoconfMacroElement) kids[0];
+		assertEquals("AC_TWO_ARGS", macro.getName());
+		assertEquals(2, macro.getParameterCount());
+		
+		AutoconfElement[] args = macro.getChildren();
+		assertEquals(2, args.length);
+		assertTrue(args[0] instanceof AutoconfMacroArgumentElement);
+		assertEquals("first", ((AutoconfMacroArgumentElement)args[0]).getName());
+		assertTrue(args[1] instanceof AutoconfMacroArgumentElement);
+		assertEquals("second", ((AutoconfMacroArgumentElement)args[1]).getName());
+		assertEquals("first", macro.getParameter(0));
+		assertEquals("second", macro.getParameter(1));
+		
+		assertEqualSource("first", args[0]);
+		assertEqualSource("second", args[1]);
+		assertEqualSource("AC_TWO_ARGS(first,second)", macro);
+	}
+	
+	public void testMacroParsing3() throws Exception {
+		// 
+		String text =
+			"AC_ONE_ARG( [quoted( arg ), second] )\n" + 
+			"";
+		AutoconfElement root = parse(text);
+		assertTreeStructure(root, new String[] { "AC_ONE_ARG", "quoted( arg ), second", null });
+		
+		AutoconfElement[] kids = root.getChildren();
+		assertEquals(1, kids.length);
+		assertTrue(kids[0] instanceof AutoconfMacroElement);
+		AutoconfMacroElement macro = (AutoconfMacroElement) kids[0];
+		assertEquals("AC_ONE_ARG", macro.getName());
+		
+		AutoconfElement[] args = macro.getChildren();
+		assertEquals(1, macro.getParameterCount());
+		assertEquals(1, args.length);
+		assertTrue(args[0] instanceof AutoconfMacroArgumentElement);
+		
+		// spaces removed from outermost arguments, but not inner
+		assertEquals("quoted( arg ), second", ((AutoconfMacroArgumentElement)args[0]).getName());
+		assertEquals("quoted( arg ), second", macro.getParameter(0));
+		
+		assertEqualSource("[quoted( arg ), second]", args[0]);
+		assertEqualSource("AC_ONE_ARG( [quoted( arg ), second] )", macro);
+	}
+
+	public void testMacroParsing4() throws Exception {
+		// 
+		String text =
+			"AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],\r\n" + 
+			"         [AM_AUTOMAKE_VERSION([1.4-p6])])\r\n" + 
+			"\r\n" + 
+			"";
+		AutoconfElement root = parse(text);
+		AutoconfElement[] kids = root.getChildren();
+		assertEquals(1, kids.length);
+		assertTrue(kids[0] instanceof AutoconfMacroElement);
+		AutoconfMacroElement macro = (AutoconfMacroElement) kids[0];
+		assertEquals("AC_DEFUN", macro.getName());
+
+		// spaces and quotes dropped
+		assertEquals(2, macro.getParameterCount());
+		assertEquals("AM_SET_CURRENT_AUTOMAKE_VERSION", macro.getParameter(0));
+		assertEquals("AM_AUTOMAKE_VERSION([1.4-p6])", macro.getParameter(1));
+		
+		// no spaces in source either, but quotes kept
+		assertEqualSource("[AM_SET_CURRENT_AUTOMAKE_VERSION]", macro.getChildren()[0]);
+		assertEqualSource("[AM_AUTOMAKE_VERSION([1.4-p6])]", macro.getChildren()[1]);
+	}
+
+	public void testMacroParsing5() throws Exception {
+		// check that complex shell constructs don't throw off the
+		// parser, and also that we don't mistake shell tokens in a macro argument
+		String arg2 =
+			"AC_MSG_CHECKING(for working $2)\n" + 
+			"# Run test in a subshell; some versions of sh will print an error if\n" + 
+			"# an executable is not found, even if stderr is redirected.\n" + 
+			"# Redirect stdin to placate older versions of autoconf.  Sigh.\n" + 
+			"if ($2 --version) < /dev/null > /dev/null 2>&1; then\n" + 
+			"   $1=$2\n" + 
+			"   AC_MSG_RESULT(found)\n" + 
+			"else\n" + 
+			"   $1=\"$3/missing $2\"\n" + 
+			"   AC_MSG_RESULT(missing)\n" + 
+			"fi\n" + 
+			"AC_SUBST($1)";
+		String text =
+			"AC_DEFUN([AM_MISSING_PROG],\n" + 
+			"[" + arg2 + "])\n" + 
+			"";
+		AutoconfElement root = parse(text);
+		assertTreeStructure(root, new String[] {
+				"AC_DEFUN", 
+					"AM_MISSING_PROG", 
+					arg2, 
+					null,
+		});
+		AutoconfElement[] kids = root.getChildren();
+		assertEquals(1, kids.length);
+		assertTrue(kids[0] instanceof AutoconfMacroElement);
+		AutoconfMacroElement macro = (AutoconfMacroElement) kids[0];
+		assertEquals("AC_DEFUN", macro.getName());
+		assertEquals("AM_MISSING_PROG", macro.getVar());
+
+		// spaces dropped
+		assertEquals(2, macro.getParameterCount());
+		assertEquals("AM_MISSING_PROG", macro.getParameter(0));
+		
+		// be sure complex arguments aren't mangled
+		assertEquals(arg2, macro.getParameter(1));
+		assertEqualSource("[" + arg2 + "]", macro.getChildren()[1]);
+		
+	}
+
+	public void testMacroParsing6() throws Exception {
+		// empty arguments
+		String text =
+			"AC_DEFUN( ,\n" +
+			")\n"; 
+		AutoconfElement root = parse(text);
+		AutoconfElement[] kids = root.getChildren();
+		assertEquals(1, kids.length);
+		assertTrue(kids[0] instanceof AutoconfMacroElement);
+		AutoconfMacroElement macro = (AutoconfMacroElement) kids[0];
+		assertEquals("AC_DEFUN", macro.getName());
+		assertEquals("", macro.getVar());
+
+		// spaces dropped
+		assertEquals(2, macro.getParameterCount());
+		assertEquals("", macro.getParameter(0));
+		assertEquals("", macro.getParameter(1));
+
+		assertEqualSource("", macro.getChildren()[0]);
+		assertEqualSource("", macro.getChildren()[1]);
+	}
+
+	public void testWithErrorUnmatchedLeftParen() {
+		String text =
+			"AC_BAD_MACRO(\n";
+		
+		AutoconfElement root = parse(text, true);
+		assertEquals(1, root.getChildren().length);
+		assertTrue(root.getChildren()[0] instanceof AutoconfMacroElement);
+		checkError(AutoconfEditorMessages.getString(AutoconfParser.UNMATCHED_LEFT_PARENTHESIS));
+	}
+	public void testWithErrorUnmatchedRightParen() {
+		String text =
+			"AC_BAD_MACRO())\n";
+		
+		AutoconfElement root = parse(text, true);
+		assertEquals(1, root.getChildren().length);
+		assertTrue(root.getChildren()[0] instanceof AutoconfMacroElement);
+		checkError(AutoconfEditorMessages.getString(AutoconfParser.UNMATCHED_RIGHT_PARENTHESIS));
+	}
+	public void testNoFalseUnmatchedRightParen() {
+		String text =
+			"AC_BAD_MACRO()\n" +
+			"(\n"+
+			"cd foo;\n"+
+			"if test -f myfile; then exit 1; fi\n"+
+			")\n";
+		
+		// nothing but the macro and 'if' is detected as meaningful 
+		AutoconfElement root = parse(text);
+		assertEquals(2, root.getChildren().length);
+		assertTrue(root.getChildren()[0] instanceof AutoconfMacroElement);
+		assertTrue(root.getChildren()[1] instanceof AutoconfIfElement);
+	}
+
+	public void testNestedMacro() {
+		String text =
+			"AC_1(AC_2())\n";
+		
+		AutoconfElement root = parse(text);
+		assertEquals(1, root.getChildren().length);
+		assertTrue(root.getChildren()[0] instanceof AutoconfMacroElement);
+		AutoconfMacroElement ac1 = (AutoconfMacroElement) root.getChildren()[0];
+		assertEquals(1, ac1.getChildren().length);
+		assertTrue(ac1.getChildren()[0] instanceof AutoconfMacroArgumentElement);
+		AutoconfMacroArgumentElement ac2 = (AutoconfMacroArgumentElement) ac1.getChildren()[0];
+		// one empty argument
+		assertEquals(1, ac2.getChildren().length);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/TestShellParser.java b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/TestShellParser.java
new file mode 100644
index 0000000..764e239
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/TestShellParser.java
@@ -0,0 +1,437 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.tests.autoconf;
+
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.AutoconfEditorMessages;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfCaseConditionElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfCaseElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfParser;
+
+/**
+ * @author eswartz
+ *
+ */
+public class TestShellParser extends BaseParserTest {
+
+	public void testHERE() {
+		String HERE_TEXT = 
+			"\n"+
+			"while true; do \n"+
+			"AM_INIT_AUTOMAKE([confusion], [$2], EOF)\n"+
+			"done\n";
+		String text = "cat <<EOF"+
+			HERE_TEXT +
+			"EOF\n" +
+			"blah";
+		AutoconfElement tree = parse(text);
+		
+		// only see a macro call, not a loop
+		assertTreeStructure(tree, new String[] { "AM_INIT_AUTOMAKE", "confusion", "$2", "EOF", null });
+	}
+
+	public void testHERE2() {
+		String HERE_TEXT = 
+			"\n"+
+			"while true; do \n"+
+			"AM_INIT_AUTOMAKE([confusion], [$2], EOF)\n"+
+			"done\n";
+		String text = "cat <<-EOF"+
+			HERE_TEXT +
+			"EOF\n" +
+			"blah";
+		AutoconfElement tree = parse(text);
+
+		// only see a macro call, not a loop
+		assertTreeStructure(tree, new String[] { "AM_INIT_AUTOMAKE", "confusion", "$2", "EOF", null });
+	}
+	
+
+	public void testIf0() {
+		String text = "# comment\n"+
+		"\tif true; then\n" +
+		"\t\tfoo;\n"+
+		"\tfi\n";
+		AutoconfElement tree = parse(text);
+		assertTreeStructure(tree, new String[] { "if" });
+	}
+
+	public void testIf1() {
+		String text = "# comment\n"+
+		"\tif true; then\n" +
+		"\t\tAC_SOMETHING();\n"+
+		"\tfi\n";
+		AutoconfElement tree = parse(text);
+		assertTreeStructure(tree, new String[] { "if", "AC_SOMETHING", "", null, null });
+	}
+	
+
+	public void testIfElse0() {
+		String text = "# comment\n"+
+		"\tif true; then\n" +
+		"\t\tfoo;\n"+
+		"\telse\n"+
+		"\t\tbar;\n"+
+		"\tfi\n";
+		AutoconfElement tree = parse(text);
+		assertTreeStructure(tree, new String[] { "if", "else", null });
+	}
+
+	public void testIfElse1() {
+		String text = "# comment\n"+
+		"\tif true; then\n" +
+		"\t\tAC_ONE(...);\n"+
+		"\telse\n"+
+		"\t\tAC_TWO(AC_THREE());\n"+
+		"\tfi\n";
+		AutoconfElement tree = parse(text);
+		assertTreeStructure(tree, new String[] {
+				"if", 
+					"AC_ONE", 
+						"...", 
+					null,
+					"else", 
+						"AC_TWO", 
+							"AC_THREE",
+								"AC_THREE", 
+									"",
+								null,
+							null,  
+						null, 
+					null,
+				null});
+
+		AutoconfElement[] kids = tree.getChildren();
+		assertEqualSource("AC_ONE(...)", kids[0].getChildren()[0]);
+		assertEqualSource("AC_TWO(AC_THREE())", kids[0].getChildren()[1].getChildren()[0]);
+	}
+	public void testIf2() {
+		String text =
+		"if blah\n" +
+		"then fi\n";
+		AutoconfElement tree = parse(text);
+		assertTreeStructure(tree, new String[] { "if" });
+	}
+	
+	public void testIfElif() {
+		String text = "# comment\n"+
+		"\tif true; then\n" +
+		"\t\tAC_ONE(...);\n"+
+		"\telif false; then \n"+
+		"\t\tAC_TWO(...);\n"+
+		"\tfi\n";
+		AutoconfElement tree = parse(text);
+		assertTreeStructure(tree, new String[] { 
+				"if", 
+					"AC_ONE", 
+						"...", 
+					null, 
+					"elif", 
+						"AC_TWO", 
+							"...", 
+						null, 
+					null, 
+				null });
+	}
+	
+	public void testIfErr1() {
+		String text =
+		"if then fi\n";
+		AutoconfElement tree = parse(text, true);
+		assertEquals(1, errors.size());
+		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.INVALID_SPECIFIER, "then"));
+		assertTreeStructure(tree, new String[] { "if" });
+	}
+	public void testIfErr2() {
+		String text =
+		"if true; do fi\n";
+		AutoconfElement tree = parse(text, true);
+		assertEquals(1, errors.size());
+		checkError(AutoconfEditorMessages.getString(AutoconfParser.INVALID_DO));
+		assertTreeStructure(tree, new String[] { "if" });
+	}
+	public void testIfErr3() {
+		String text =
+		"if; else bar; fi\n";
+		AutoconfElement tree = parse(text, true);
+		assertEquals(1, errors.size());
+		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.MISSING_SPECIFIER, "then"));
+		assertTreeStructure(tree, new String[] { "if", "else", null });
+	}
+	public void testIfErr4() {
+		String text =
+		"if true; then stmt fi\n";
+		AutoconfElement tree = parse(text, true);
+		assertEquals(1, errors.size());
+		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.INVALID_TERMINATION, "fi"));
+		assertTreeStructure(tree, new String[] { "if" });
+	}
+	public void testIfErr5() {
+		String text =
+		"if true; then\n";
+		AutoconfElement tree = parse(text, true);
+		assertEquals(1, errors.size());
+		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.UNTERMINATED_CONSTRUCT, "if"));
+		assertTreeStructure(tree, new String[] { "if" });
+	}
+	public void testIfErr6() {
+		String text =
+		"if true; then foo; else\n";
+		AutoconfElement tree = parse(text, true);
+		assertEquals(2, errors.size());
+		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.UNTERMINATED_CONSTRUCT, "if"));
+		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.UNTERMINATED_CONSTRUCT, "else"));
+		assertTreeStructure(tree, new String[] { "if", "else", null });
+	}
+	public void testWhile() {
+		String text =
+			"while true; do foo; done\n";
+		AutoconfElement tree = parse(text);
+		assertTreeStructure(tree, new String[] { "while" });
+	}
+	public void testWhile2() {
+		String text =
+			"while true\n" +
+			"do\n"+
+			"AC_SOMETHING(...); done\n";
+		AutoconfElement tree = parse(text);
+		assertTreeStructure(tree, new String[] { "while", "AC_SOMETHING", "...", null, null });
+	}
+	public void testWhileErr() {
+		String text =
+			"while; AC_SOMETHING(...) done\n";
+		AutoconfElement tree = parse(text, true);
+		assertEquals(2, errors.size());
+		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.MISSING_SPECIFIER, "do"));
+		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.INVALID_TERMINATION, "done"));
+		assertTreeStructure(tree, new String[] { "while", "AC_SOMETHING", "...", null, null });
+	}
+	public void testWhileErr2() {
+		String text =
+			"while true; do AC_SOMETHING(...)\n";
+		AutoconfElement tree = parse(text, true);
+		assertEquals(1, errors.size());
+		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.UNTERMINATED_CONSTRUCT, "while"));
+		assertTreeStructure(tree, new String[] { "while", "AC_SOMETHING", "...", null, null });
+	}
+	
+	public void testCase() {
+		String text = 
+			"case $VAL in\n"+
+			"linux-*-*) AC_FIRST($VAL) ; true ;;\n"+
+			"bsd-* | macosx-*) : ;;\n"+
+			"*) echo \"I dunno $VAL\";;\n"+
+			"esac\n";
+		AutoconfElement tree = parse(text, false);
+		assertTreeStructure(tree, new String[] { 
+				"case", 
+					"linux-*-*", 
+						"AC_FIRST", 
+							"$VAL",
+							null,
+						null,
+					"bsd-* | macosx-*",
+					"*",
+					null
+					});
+
+		AutoconfElement[] kids = tree.getChildren();
+		assertEquals(1, kids.length);
+		assertTrue(kids[0] instanceof AutoconfCaseElement);
+		
+		AutoconfCaseElement caseEl = (AutoconfCaseElement) kids[0];
+		assertEqualSource(text.substring(0, text.length()-1), caseEl);
+		
+		assertEquals(3, caseEl.getChildren().length);
+		
+		assertTrue(caseEl.getChildren()[0] instanceof AutoconfCaseConditionElement);
+		assertTrue(caseEl.getChildren()[1] instanceof AutoconfCaseConditionElement);
+		assertTrue(caseEl.getChildren()[2] instanceof AutoconfCaseConditionElement);
+		
+		AutoconfCaseConditionElement caseCond = (AutoconfCaseConditionElement) caseEl.getChildren()[0];
+		assertEquals("linux-*-*) AC_FIRST($VAL) ; true ;;", caseCond.getSource());
+		assertEquals(1, caseCond.getChildren().length);
+		assertEqualSource("AC_FIRST($VAL)", caseCond.getChildren()[0]);
+
+		caseCond = (AutoconfCaseConditionElement) caseEl.getChildren()[1];
+		assertEquals("bsd-* | macosx-*) : ;;", caseCond.getSource());
+		assertEquals(0, caseCond.getChildren().length);
+
+		caseCond = (AutoconfCaseConditionElement) caseEl.getChildren()[2];
+		assertEquals("*) echo \"I dunno $VAL\";;", caseCond.getSource());
+		assertEquals(0, caseCond.getChildren().length);
+		
+	}
+	
+	public void testCaseErr() {
+		String text = 
+			"case $VAL; linux-*-*) AC_FIRST($VAL) ; true esac\n";
+		AutoconfElement tree = parse(text, true);
+		assertEquals(2, errors.size());
+		checkError(AutoconfEditorMessages.getString(AutoconfParser.INVALID_IN));
+		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.INVALID_TERMINATION, "esac"));
+		
+		assertTreeStructure(tree, new String[] { "case", "linux-*-*", "AC_FIRST", "$VAL", null, null, null });
+		
+		AutoconfElement[] kids = tree.getChildren();
+		AutoconfCaseElement caseEl = (AutoconfCaseElement) kids[0];
+		AutoconfCaseConditionElement caseCond = (AutoconfCaseConditionElement) caseEl.getChildren()[0];
+		// goofed up, but ok
+		assertEquals("linux-*-*) AC_FIRST($VAL) ; true esac", caseCond.getSource());
+		assertEqualSource("AC_FIRST($VAL)", caseCond.getChildren()[0]);
+
+	}
+	public void testCaseErr2() {
+		String text = 
+			"case $VAL in\n";
+		AutoconfElement tree = parse(text, true);
+		assertEquals(1, errors.size());
+		checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.UNTERMINATED_CONSTRUCT, "case"));
+		
+		assertTreeStructure(tree, new String[] { "case" });
+
+	}
+
+	public void testForIn() {
+		// don't get upset by 'in'
+		String text = 
+			"for VAL in 1 2 3 4; do echo $VAL; done\n";
+		AutoconfElement tree = parse(text, false);
+		
+		assertTreeStructure(tree, new String[] { "for" });
+		AutoconfElement[] kids = tree.getChildren();
+		
+		AutoconfElement forEl = kids[0];
+		assertEqualSource(text.substring(0, text.length()-1), forEl);
+		
+	}
+	
+	public void testForDo() {
+		// don't get upset by parentheses
+		String text = 
+			"for (( AC_1; AC_2(); AC_3(...) )); do echo $VAL; done\n";
+		AutoconfElement tree = parse(text, false);
+		
+		assertTreeStructure(tree, new String[] { "for", "AC_1", "AC_2", "", null, "AC_3", "...", null, null });
+		
+	}
+	
+	public void testUntil() {
+		String text = 
+			"until false; do AC_SOMETHING(...); done\n";
+		AutoconfElement tree = parse(text, false);
+		assertTreeStructure(tree, new String[] { "until", "AC_SOMETHING", "...", null, null });
+
+		
+	}
+	public void testSelect() {
+		String text = 
+			"select VAR in 1 2 3; do AC_SOMETHING(...); done\n"+
+			"select VAR; do AC_SOMETHING; done\n";
+			
+		AutoconfElement tree = parse(text, false);
+		assertTreeStructure(tree, new String[] { 
+				"select", 
+					"AC_SOMETHING", 
+						"...", 
+					null, 
+				null,
+				"select", 
+					"AC_SOMETHING", 
+				null
+		});
+	}
+	
+	public void testComplex1() {
+		String text =
+			"AM_INIT_AUTOMAKE([foo1], 1.96)\n" +
+			"while true; do \n" +
+			"	var=shift;\n" +
+			"	if [ test -f \"$var\"] ; then\n"+
+			"		AC_SOMETHING($var);\n"+
+			"	fi\n"+
+			"done;\n"+
+			"AM_GENERATE(Makefile)\n";
+		AutoconfElement tree = parse(text, false);
+		assertTreeStructure(tree, new String[] { 
+				"AM_INIT_AUTOMAKE",
+					"foo1",
+					"1.96",
+				null,
+				"while",
+					"if",
+						"AC_SOMETHING",
+							"$var",
+						null,
+					null,
+				null,
+				"AM_GENERATE",
+					"Makefile",
+				null
+		});
+	}
+	
+	public void testComplex2() {
+		String text = 
+			"if true; then\n" + 
+			"AC_CANONICAL_HOST\n" + 
+			"else\n" + 
+			"case foo in \n" + 
+			"	3) 1 ;;\n" + 
+			"esac;\n" + 
+			"fi\n";
+		AutoconfElement tree = parse(text, false);
+		assertTreeStructure(tree, new String[] {
+				"if",
+					"AC_CANONICAL_HOST",
+					"else",
+						"case",
+							"3",
+						null,
+					null,
+				null
+		});
+	}
+
+	public void testEarlyClose() {
+		String text = 
+			"if true; then foo ; fi\n"+
+			"fi\n"+
+			"while true; do done;\n";
+		AutoconfElement tree = parse(text, true);
+		assertTreeStructure(tree, new String[] {
+				"if",
+				"while"
+		});
+	}
+	
+	public void testOverlapping() {
+		String text =
+			"for foo\n"+
+			"if bar\n";
+		AutoconfElement tree = parse(text, true);
+		assertTreeStructure(tree, new String[] {
+				"for",
+				"if"
+		});
+	}
+	
+	public void testDollar() {
+		// dollars guard keywords
+		String text =
+			"if [ $if == 3 ] ; then $for; fi\n";
+		AutoconfElement tree = parse(text);
+		assertTreeStructure(tree, new String[] {
+				"if"
+		});
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/TestTokenizer.java b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/TestTokenizer.java
new file mode 100644
index 0000000..03f4d63
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/autoconf/TestTokenizer.java
@@ -0,0 +1,486 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.tests.autoconf;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.eclipse.jface.text.Document;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfTokenizer;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.IAutoconfErrorHandler;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.ITokenConstants;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.ParseException;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.Token;
+
+
+/**
+ * Test autoconf tokenizer.  The tokenizer mainly is used to detect boundaries and keywords
+ * and is not a full shell tokenizer.
+ * @author eswartz
+ *
+ */
+public class TestTokenizer extends TestCase {
+
+	private ArrayList tokenizerErrors;
+
+	/* (non-Javadoc)
+	 * @see junit.framework.TestCase#setUp()
+	 */
+	protected void setUp() throws Exception {
+	}
+
+	/* (non-Javadoc)
+	 * @see junit.framework.TestCase#tearDown()
+	 */
+	protected void tearDown() throws Exception {
+	}
+
+	protected IDocument createDocument(String text) {
+		return new Document(text);
+	}
+
+	protected List/*<Token>*/tokenize(IDocument document) {
+		return tokenize(document, false);
+	}
+
+	protected List/*<Token>*/tokenize(IDocument document, boolean isM4Mode) {
+		tokenizerErrors = new ArrayList();
+		AutoconfTokenizer tokenizer = new AutoconfTokenizer(document, new IAutoconfErrorHandler() {
+
+			public void handleError(ParseException exception) {
+				tokenizerErrors.add(exception);
+			}
+			
+		});
+		tokenizer.setM4Context(isM4Mode);
+		
+		List/*<Token>*/ tokens = tokenize(tokenizer);
+		return tokens;
+	}
+
+	protected List/*<Token>*/tokenize(AutoconfTokenizer tokenizer) {
+		List/*<Token>*/tokens = new ArrayList();
+		while (true) {
+			Token token = tokenizer.readToken();
+			if (token.getType() == ITokenConstants.EOF)
+				break;
+			tokens.add(token);
+		}
+		return tokens;
+	}
+
+	protected void checkNoErrors() {
+		assertEquals(0, tokenizerErrors.size());
+	}
+	public void testEmpty() {
+		IDocument document = createDocument("");
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(0, tokens.size());
+	}
+
+	public void testEOL1() {
+		IDocument document = createDocument("\n");
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(1, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.EOL, "\n");
+	}
+
+	public void testEOL2() {
+		IDocument document = createDocument("\r\n");
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(1, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.EOL, "\r\n");
+	}
+
+	public void testEOL3() {
+		IDocument document = createDocument("\n\r\n\n");
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(3, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.EOL, "\n");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.EOL, "\r\n");
+		checkToken((Token) tokens.get(2), document, ITokenConstants.EOL, "\n");
+	}
+
+	public void testShellText() {
+		// default mode is shell
+		String text = "random\nstuff\n";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(4, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.WORD,
+				"random");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.EOL, "\n");
+		checkToken((Token) tokens.get(2), document, ITokenConstants.WORD,
+				"stuff");
+		checkToken((Token) tokens.get(3), document, ITokenConstants.EOL, "\n");
+	}
+
+	public void testShellTokens() {
+		// default mode is shell
+		String text = "while true; do ls; done\n";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(8, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.SH_WHILE,
+				"while");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.WORD,
+				"true");
+		checkToken((Token) tokens.get(2), document, ITokenConstants.SEMI, ";");
+		checkToken((Token) tokens.get(3), document, ITokenConstants.SH_DO, "do");
+		checkToken((Token) tokens.get(4), document, ITokenConstants.WORD, "ls");
+		checkToken((Token) tokens.get(5), document, ITokenConstants.SEMI, ";");
+		checkToken((Token) tokens.get(6), document, ITokenConstants.SH_DONE,
+				"done");
+		checkToken((Token) tokens.get(7), document, ITokenConstants.EOL, "\n");
+	}
+
+	public void testShellTokens2() {
+		// don't misread partial tokens
+		String text = "while_stuff incase";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(2, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.WORD,
+				"while_stuff");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.WORD,
+				"incase");
+	}
+
+	public void testShellTokens3() {
+		// don't interpret m4 strings in shell mode
+		String text = "`foo'";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, false);
+		assertEquals(1, tokenizerErrors.size());
+		assertEquals(1, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.SH_STRING_BACKTICK, "foo'", 5);
+	}
+
+	public void testShellTokens4() {
+		String text = "echo $if $((foo)) $\n";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(11, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.WORD, "echo");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.SH_DOLLAR, "$");
+		// dollar guards keywords, but the tokenizer doesn't know this
+		checkToken((Token) tokens.get(2), document, ITokenConstants.SH_IF, "if");
+		checkToken((Token) tokens.get(3), document, ITokenConstants.SH_DOLLAR, "$");
+		checkToken((Token) tokens.get(4), document, ITokenConstants.LPAREN, "(");
+		checkToken((Token) tokens.get(5), document, ITokenConstants.LPAREN, "(");
+		checkToken((Token) tokens.get(6), document, ITokenConstants.WORD, "foo");
+		checkToken((Token) tokens.get(7), document, ITokenConstants.RPAREN, ")");
+		checkToken((Token) tokens.get(8), document, ITokenConstants.RPAREN, ")");
+		checkToken((Token) tokens.get(9), document, ITokenConstants.SH_DOLLAR, "$");
+		checkToken((Token) tokens.get(10), document, ITokenConstants.EOL, "\n");
+
+	}
+
+	public void testShellTokens5() {
+		String text = "while do select for until done\n";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(7, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.SH_WHILE, "while");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.SH_DO, "do");
+		checkToken((Token) tokens.get(2), document, ITokenConstants.SH_SELECT, "select");
+		checkToken((Token) tokens.get(3), document, ITokenConstants.SH_FOR, "for");
+		checkToken((Token) tokens.get(4), document, ITokenConstants.SH_UNTIL, "until");
+		checkToken((Token) tokens.get(5), document, ITokenConstants.SH_DONE, "done");
+		checkToken((Token) tokens.get(6), document, ITokenConstants.EOL, "\n");
+
+	}
+
+	public void testShellComments() {
+		// comments are stripped and ignored in the shell mode
+		String text = "for # while case\n";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(2, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.SH_FOR,
+				"for");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.EOL, "\n");
+	}
+
+	public void testShellComments2() {
+		// comments are stripped and ignored in the shell mode
+		String text = "# while case\n" + "#for x in 3\n" + "\n";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(3, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.EOL, "\n");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.EOL, "\n");
+		checkToken((Token) tokens.get(2), document, ITokenConstants.EOL, "\n");
+	}
+
+	public void testM4Tokens0() {
+		String text = "while_stuff incase";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, true);
+		checkNoErrors();
+		assertEquals(2, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.WORD,
+				"while_stuff");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.WORD,
+				"incase");
+	}
+	
+	public void testShellStrings() {
+		String QUOTED = 
+			"ls -la \"*.c\"";
+		String text = "echo `" + QUOTED + "`\n";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(3, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.WORD,
+				"echo");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.SH_STRING_BACKTICK,
+				QUOTED, QUOTED.length() + 2);
+		checkToken((Token) tokens.get(2), document, ITokenConstants.EOL, "\n");
+	}
+	public void testShellStrings2() {
+		String QUOTED = 
+			"ls -la 'space file'";
+		String text = "echo \"" + QUOTED + "\"\n";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(3, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.WORD,
+				"echo");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.SH_STRING_DOUBLE,
+				QUOTED, QUOTED.length() + 2);
+		checkToken((Token) tokens.get(2), document, ITokenConstants.EOL, "\n");
+	}
+	public void testShellStrings3() {
+		String QUOTED = 
+			"echo \"*.c\" | sed s/[a-z]/[A-Z]/g";
+		String text = "echo '" + QUOTED + "'\n";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, false);
+		checkNoErrors();
+		assertEquals(3, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.WORD,
+				"echo");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.SH_STRING_SINGLE,
+				QUOTED, QUOTED.length() + 2);
+		checkToken((Token) tokens.get(2), document, ITokenConstants.EOL, "\n");
+	}
+	public void testM4Tokens1() {
+		String text = "define(`hi\', `HI\')\n";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, true);
+		checkNoErrors();
+		assertEquals(7, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.WORD,
+				"define");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.LPAREN, "(");
+		// strings are unquoted in token text
+		checkToken((Token) tokens.get(2), document, ITokenConstants.M4_STRING,
+				"hi", 4);
+		checkToken((Token) tokens.get(3), document, ITokenConstants.COMMA, ",");
+		checkToken((Token) tokens.get(4), document, ITokenConstants.M4_STRING,
+				"HI", 4);
+		checkToken((Token) tokens.get(5), document, ITokenConstants.RPAREN, ")");
+		checkToken((Token) tokens.get(6), document, ITokenConstants.EOL, "\n");
+	}
+
+	public void testM4Comments() {
+		String text = "dnl # comment\n";
+		IDocument document = createDocument(text);
+		List tokens = tokenize(document, true);
+		checkNoErrors();
+		assertEquals(2, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.WORD, "dnl");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.M4_COMMENT,
+				"# comment\n");
+	}
+
+	public void testM4Comments2() {
+		String text = "dnl /* word(`quoted')\n" + "*/\n";
+		IDocument document = createDocument(text);
+		AutoconfTokenizer tokenizer = createTokenizer(document);
+		tokenizer.setM4Context(true);
+		tokenizer.setM4Comment("/*", "*/");
+
+		List tokens = tokenize(tokenizer);
+		assertEquals(3, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.WORD, "dnl");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.M4_COMMENT,
+				"/* word(`quoted')\n*/");
+		checkToken((Token) tokens.get(2), document, ITokenConstants.EOL, "\n");
+	}
+
+	public void testM4Strings1() {
+		// double quotes only removes one level of quotes
+		String text = "``double''\n";
+		IDocument document = createDocument(text);
+		AutoconfTokenizer tokenizer = createTokenizer(document);
+		tokenizer.setM4Context(true);
+
+		List tokens = tokenize(tokenizer);
+		assertEquals(2, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.M4_STRING,
+				"`double'", 8 + 1 + 1);
+		checkToken((Token) tokens.get(1), document, ITokenConstants.EOL, "\n");
+	}
+
+	public void testM4Strings2() {
+		String text = "myword(!!boundary==)\n";
+		IDocument document = createDocument(text);
+		AutoconfTokenizer tokenizer = createTokenizer(document);
+		tokenizer.setM4Context(true);
+		tokenizer.setM4Quote("!!", "==");
+
+		List tokens = tokenize(tokenizer);
+		assertEquals(5, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.WORD,
+				"myword");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.LPAREN, "(");
+		checkToken((Token) tokens.get(2), document, ITokenConstants.M4_STRING,
+				"boundary", 8 + 2 + 2);
+		checkToken((Token) tokens.get(3), document, ITokenConstants.RPAREN, ")");
+		checkToken((Token) tokens.get(4), document, ITokenConstants.EOL, "\n");
+	}
+
+	public void testM4Tokens2() {
+		// dollar is not seen in m4 mode (only important when expanding)
+		String text = "define(foo,$1)\n";
+		IDocument document = createDocument(text);
+		AutoconfTokenizer tokenizer = createTokenizer(document);
+		tokenizer.setM4Context(true);
+
+		List tokens = tokenize(tokenizer);
+		assertEquals(8, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.WORD,
+				"define");
+		checkToken((Token) tokens.get(1), document, ITokenConstants.LPAREN, "(");
+		checkToken((Token) tokens.get(2), document, ITokenConstants.WORD, "foo");
+		checkToken((Token) tokens.get(3), document, ITokenConstants.COMMA, ",");
+		checkToken((Token) tokens.get(4), document, ITokenConstants.TEXT, "$");
+		checkToken((Token) tokens.get(5), document, ITokenConstants.TEXT, "1");
+		checkToken((Token) tokens.get(6), document, ITokenConstants.RPAREN, ")");
+		checkToken((Token) tokens.get(7), document, ITokenConstants.EOL, "\n");
+	}
+	
+	public void testM4QuoteNesting() {
+		String quote = "this is `nested\'!";
+		String text = "`" + quote +"'\n";
+		IDocument document = createDocument(text);
+		AutoconfTokenizer tokenizer = createTokenizer(document);
+		tokenizer.setM4Context(true);
+
+		List tokens = tokenize(tokenizer);
+		assertEquals(2, tokens.size());
+		checkToken((Token) tokens.get(0), document, ITokenConstants.M4_STRING,
+				quote, quote.length() + 2);
+		checkToken((Token) tokens.get(1), document, ITokenConstants.EOL, "\n");
+		
+	}
+
+	public void testMixedContext() {
+		String text = "AM_INIT([arg])if true\n";
+		IDocument document = createDocument(text);
+		AutoconfTokenizer tokenizer = createTokenizer(document);
+		tokenizer.setM4Context(false);
+		tokenizer.setM4Quote("[", "]");
+
+		Token token;
+		token = tokenizer.readToken();
+		checkToken(token, document, ITokenConstants.WORD, "AM_INIT");
+
+		// "hey, that's a macro"
+		tokenizer.setM4Context(true);
+
+		token = tokenizer.readToken();
+		checkToken(token, document, ITokenConstants.LPAREN, "(");
+		token = tokenizer.readToken();
+		checkToken(token, document, ITokenConstants.M4_STRING, "arg", 5);
+		token = tokenizer.readToken();
+		checkToken(token, document, ITokenConstants.RPAREN, ")");
+
+		// "check it's not a dangling paren"
+		// it'll still be an m4 word
+		token = tokenizer.readToken();
+		checkToken(token, document, ITokenConstants.WORD, "if");
+
+		// push back token
+		tokenizer.unreadToken(token);
+
+		// "done reading macro"
+		tokenizer.setM4Context(false);
+
+		// "get shell stuff"
+		token = tokenizer.readToken();
+		checkToken(token, document, ITokenConstants.SH_IF, "if");
+		token = tokenizer.readToken();
+		checkToken(token, document, ITokenConstants.WORD, "true");
+
+		token = tokenizer.readToken();
+		checkToken(token, document, ITokenConstants.EOL, "\n");
+
+		checkToken(tokenizer.readToken(), document, ITokenConstants.EOF);
+
+	}
+
+	private AutoconfTokenizer createTokenizer(IDocument document) {
+		return new AutoconfTokenizer(document, new IAutoconfErrorHandler() {
+
+			public void handleError(ParseException exception) {
+				fail(exception.toString());
+			}
+			
+		});
+	}
+	
+	private void checkToken(Token token, IDocument document, int type) {
+		assertEquals(type, token.getType());
+		assertSame(document, token.getDocument());
+		assertTrue(token.getOffset() >= 0);
+		assertTrue(token.getType() == ITokenConstants.EOF || token.getLength() > 0);
+		assertEquals(document.get().substring(token.getOffset(),
+				token.getOffset() + token.getLength()), token.getText());
+	}
+
+	private void checkToken(Token token, IDocument document, int type,
+			String text) {
+		assertEquals(type, token.getType());
+		assertSame(document, token.getDocument());
+		assertTrue(token.getOffset() >= 0);
+		assertEquals(text, token.getText());
+		assertEquals(text.length(), token.getLength());
+	}
+
+	private void checkToken(Token token, IDocument document, int type,
+			String text, int length) {
+		assertEquals(type, token.getType());
+		assertSame(document, token.getDocument());
+		assertTrue(token.getOffset() >= 0);
+		assertEquals(text, token.getText());
+		assertEquals(length, token.getLength());
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeColourizationTests.java b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeColourizationTests.java
new file mode 100644
index 0000000..4bc8017
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeColourizationTests.java
@@ -0,0 +1,215 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.tests.editors;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITypedRegion;
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.linuxtools.cdt.autotools.tests.AutotoolsTestsPlugin;
+import org.eclipse.linuxtools.cdt.autotools.tests.ProjectTools;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.AutomakeDocumentProvider;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.AutomakeEditor;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.AutomakefileCodeScanner;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.AutomakefileSourceConfiguration;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.ColorManager;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbench;
+
+
+public class AutomakeColourizationTests extends TestCase {
+	
+	ProjectTools tools;
+	private IProject project;
+	private IFile makefileAmFile;
+	
+	static String makefileAmContents =
+		"# This is a comment" + "\n" +
+		"if CONDITION" + "\n" +
+		"MACRO = case1" + "\n" +
+		"else" + "\n" +
+		"MACRO = case2" + "\n" +
+		"$(MACRO)" + "\n" +
+		"${MACRO}" + "\n" +
+		"";
+	private IWorkbench workbench;
+	private AutomakefileCodeScanner codeScanner;
+	
+    protected void setUp() throws Exception {
+        super.setUp();
+        tools = new ProjectTools();
+        if (!ProjectTools.setup())
+        	fail("could not perform basic project workspace setup");
+        
+        project = ProjectTools.createProject("testProjectACT");
+        
+        if(project == null) {
+        	fail("Unable to create test project");
+        }
+        
+        project.open(new NullProgressMonitor());
+        
+        makefileAmFile = tools.createFile(project, "Makefile.am", makefileAmContents);
+		workbench = AutotoolsTestsPlugin.getDefault().getWorkbench();
+		
+		IEditorPart openEditor = org.eclipse.ui.ide.IDE.openEditor(workbench
+				.getActiveWorkbenchWindow().getActivePage(), makefileAmFile,
+				true);
+		
+		AutomakeEditor automakeEditor = (AutomakeEditor) openEditor;
+		AutomakeDocumentProvider docProvider = automakeEditor.getAutomakefileDocumentProvider();
+		IDocument automakeDocument = docProvider.getDocument(openEditor.getEditorInput());
+		AutomakefileSourceConfiguration automakeSourceViewerConfig = automakeEditor.getAutomakeSourceViewerConfiguration();
+		
+		ITypedRegion region = automakeDocument.getPartition(0);
+		
+		codeScanner = automakeSourceViewerConfig.getAutomakeCodeScanner();
+		codeScanner.setRange(automakeDocument, region.getOffset(), region.getLength());
+    }
+    
+    IToken getNextToken() {
+    	return codeScanner.nextToken();
+    }
+	
+	public void testAutomakeEditorColourization() throws Exception {
+		// # This is a comment
+		IToken token0 = getNextToken();
+		assertTrue(token0 instanceof Token);
+		assertEquals(codeScanner.getTokenLength(), 20);
+		assertEquals(codeScanner.getTokenOffset(), 0);
+
+		Token token = (Token) token0;
+		TextAttribute ta = (TextAttribute) token.getData();
+		assertEquals(ColorManager.MAKE_COMMENT_RGB, ((Color) ta.getForeground()).getRGB());
+
+		// if CONDITION
+		token0 = getNextToken();
+		assertTrue(token0 instanceof Token);
+		assertEquals(codeScanner.getTokenLength(), 2);
+		assertEquals(codeScanner.getTokenOffset(), 20);
+
+		token = (Token) token0;
+		TextAttribute attribute = (TextAttribute) token.getData();
+		assertEquals(ColorManager.MAKE_KEYWORD_RGB, ((Color) attribute.getForeground()).getRGB());
+
+		// blank space between "if" and "CONDITION"
+		token0 = getNextToken();
+		assertTrue(token0 instanceof Token);
+		assertEquals(codeScanner.getTokenLength(), 1);
+		assertEquals(codeScanner.getTokenOffset(), 22);
+
+		token = (Token) token0;
+		attribute = (TextAttribute) token.getData();
+		assertNull(attribute);
+
+		// if CONDITION
+		token0 = getNextToken();
+		assertTrue(token0 instanceof Token);
+		assertEquals(codeScanner.getTokenLength(), 9);
+		assertEquals(codeScanner.getTokenOffset(), 23);
+
+		token = (Token) token0;
+		attribute = (TextAttribute) token.getData();
+		assertEquals(ColorManager.MAKE_DEFAULT_RGB, ((Color) attribute.getForeground()).getRGB());
+
+		// line break
+		token0 = getNextToken();
+		assertTrue(token0 instanceof Token);
+		assertEquals(codeScanner.getTokenLength(), 1);
+		assertEquals(codeScanner.getTokenOffset(), 32);
+
+		token = (Token) token0;
+		attribute = (TextAttribute) token.getData();
+		assertNull(attribute);
+
+		// MACRO = case1
+		token0 = getNextToken();
+		assertTrue(token0 instanceof Token);
+		assertEquals(codeScanner.getTokenLength(), 14);
+		assertEquals(codeScanner.getTokenOffset(), 33);
+
+		token = (Token) token0;
+		attribute = (TextAttribute) token.getData();
+		assertEquals(ColorManager.MAKE_MACRO_DEF_RGB, ((Color) attribute.getForeground()).getRGB());
+
+		// else
+		token0 = getNextToken();
+		assertTrue(token0 instanceof Token);
+		assertEquals(codeScanner.getTokenLength(), 4);
+		assertEquals(codeScanner.getTokenOffset(), 47);
+
+		token = (Token) token0;
+		attribute = (TextAttribute) token.getData();
+		assertEquals(ColorManager.MAKE_KEYWORD_RGB, ((Color) attribute.getForeground()).getRGB());
+
+		// line break
+		token0 = getNextToken();
+		assertTrue(token0 instanceof Token);
+		assertEquals(codeScanner.getTokenLength(), 1);
+		assertEquals(codeScanner.getTokenOffset(), 51);
+
+		token = (Token) token0;
+		attribute = (TextAttribute) token.getData();
+		assertNull(attribute);
+
+		// MACRO = case2
+		token0 = getNextToken();
+		assertTrue(token0 instanceof Token);
+		assertEquals(codeScanner.getTokenLength(), 14);
+		assertEquals(codeScanner.getTokenOffset(), 52);
+
+		token = (Token) token0;
+		attribute = (TextAttribute) token.getData();
+		assertEquals(ColorManager.MAKE_MACRO_DEF_RGB, ((Color) attribute.getForeground()).getRGB());
+
+		// $(MACRO)
+		token0 = getNextToken();
+		assertTrue(token0 instanceof Token);
+		assertEquals(codeScanner.getTokenLength(), 8);
+		assertEquals(codeScanner.getTokenOffset(), 66);
+
+		token = (Token) token0;
+		attribute = (TextAttribute) token.getData();
+		assertEquals(ColorManager.MAKE_MACRO_REF_RGB, ((Color) attribute.getForeground()).getRGB());
+
+		// line break
+		token0 = getNextToken();
+		assertTrue(token0 instanceof Token);
+		assertEquals(codeScanner.getTokenLength(), 1);
+		assertEquals(codeScanner.getTokenOffset(), 74);
+
+		token = (Token) token0;
+		attribute = (TextAttribute) token.getData();
+		assertNull(attribute);
+		
+		// ${MACRO}
+		token0 = getNextToken();
+		assertTrue(token0 instanceof Token);
+		assertEquals(codeScanner.getTokenLength(), 8);
+		assertEquals(codeScanner.getTokenOffset(), 75);
+
+		token = (Token) token0;
+		attribute = (TextAttribute) token.getData();
+		assertEquals(ColorManager.MAKE_MACRO_REF_RGB, ((Color) attribute.getForeground()).getRGB());
+	}
+	
+	protected void tearDown() throws Exception {
+		super.tearDown();
+		project.delete(true, false, ProjectTools.getMonitor());
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeEditorTests.java b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeEditorTests.java
new file mode 100644
index 0000000..01ee1fb
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeEditorTests.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.tests.editors;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.linuxtools.cdt.autotools.tests.AutotoolsTestsPlugin;
+import org.eclipse.linuxtools.cdt.autotools.tests.ProjectTools;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.AutomakeEditor;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbench;
+
+
+public class AutomakeEditorTests extends TestCase {
+	
+	ProjectTools tools;
+	private IProject project;
+	
+    protected void setUp() throws Exception {
+        super.setUp();
+        tools = new ProjectTools();
+        if (!ProjectTools.setup())
+        	fail("could not perform basic project workspace setup");
+    }
+	  
+	public void testAutomakeEditorAssociation() throws Exception {
+		project = ProjectTools.createProject("testProjectAET");
+		
+		if(project == null) {
+            fail("Unable to create test project");
+        }
+		
+		project.open(new NullProgressMonitor());
+		
+		IFile makefileAmFile = tools.createEmptyFile(project, "Makefile.am");
+		
+		IWorkbench workbench = AutotoolsTestsPlugin.getDefault().getWorkbench();
+
+		IEditorPart openEditor = org.eclipse.ui.ide.IDE.openEditor(workbench
+					.getActiveWorkbenchWindow().getActivePage(), makefileAmFile,
+					true);
+		assertTrue(openEditor instanceof AutomakeEditor);
+		
+		project.delete(true, false, ProjectTools.getMonitor());
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeTextHoverTest.java b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeTextHoverTest.java
new file mode 100644
index 0000000..5f86843
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/editors/AutomakeTextHoverTest.java
@@ -0,0 +1,210 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.tests.editors;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.linuxtools.cdt.autotools.tests.AutotoolsTestsPlugin;
+import org.eclipse.linuxtools.cdt.autotools.tests.ProjectTools;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.AutomakeDocumentProvider;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.AutomakeEditor;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.AutomakeTextHover;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.AutomakefileSourceConfiguration;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbench;
+
+
+public class AutomakeTextHoverTest extends TestCase {
+
+	ProjectTools tools;
+	private IProject project;
+	private IFile makefileAmFile;
+	private AutomakeTextHover textHover;
+	private AutomakeEditor automakeEditor;
+	private IDocument automakeDocument;
+	
+	static String makefileAmContents =
+		// There are 6 characters from line beginning to
+		// the space after the echo
+		// ie. '\techo ' == 6 characters
+		"MACRO = case1" + "\n" +
+		// 14
+		"target1:" + "\n" +
+		// 23 (before the tab)
+		// 32 is after the M in MACRO
+		"\t" + "echo $(MACRO)" + "\n" +
+		// 38 (before the tab)
+		"\t" + "echo $@" + "\n" +
+		"\n" +
+		// 48
+		"target2: target1" + "\n" +
+		// 65 (before the tab)
+		"\t" + "echo ${MACRO}" + "\n" +
+		// 80 (before the tab)
+		"\t" + "echo $@" + "\n" +
+		// 89 (before the tab)
+		"\t" + "echo $<" + "\n" +
+		"\n" +
+		// 99
+		"target3: target1 target2" + "\n" +
+		// 124 (before the tab)
+		"\t" + "echo $?" + "\n" +
+		"";
+	private IWorkbench workbench;
+	
+	protected void setUp() throws Exception {
+        super.setUp();
+        tools = new ProjectTools();
+        if (!ProjectTools.setup())
+        	fail("could not perform basic project workspace setup");
+        
+        project = ProjectTools.createProject("testProjectATHT");
+        
+        if(project == null) {
+        	fail("Unable to create test project");
+        }
+        
+        project.open(new NullProgressMonitor());
+        
+        makefileAmFile = tools.createFile(project, "Makefile.am", makefileAmContents);
+		workbench = AutotoolsTestsPlugin.getDefault().getWorkbench();
+		
+		IEditorPart openEditor = org.eclipse.ui.ide.IDE.openEditor(workbench
+				.getActiveWorkbenchWindow().getActivePage(), makefileAmFile,
+				true);
+		
+		automakeEditor = (AutomakeEditor) openEditor;
+		AutomakeDocumentProvider docProvider = automakeEditor.getAutomakefileDocumentProvider();
+		automakeDocument = docProvider.getDocument(openEditor.getEditorInput());
+		AutomakefileSourceConfiguration automakeSourceViewerConfig = automakeEditor.getAutomakeSourceViewerConfiguration();
+		textHover = (AutomakeTextHover) automakeSourceViewerConfig.getTextHover(null, "");
+	}
+	
+	protected void tearDown() throws Exception {
+		super.tearDown();
+		project.delete(true, false, ProjectTools.getMonitor());
+	}
+	
+	public void testGetHoverInfoTargetName1() {
+		IRegion hoverRegion = textHover.getHoverRegion(automakeEditor.getAutomakeSourceViewer(), 45);
+		if (hoverRegion == null)
+			fail("Null hoverRegion");
+		// hover between the $ and the @ in target1
+		assertEquals(44, hoverRegion.getOffset());
+		assertEquals(2, hoverRegion.getLength());
+		try {
+			assertEquals("$@", automakeDocument.get(hoverRegion.getOffset(),
+					hoverRegion.getLength()));
+		} catch (BadLocationException e) {
+			fail("BadLocationException");
+			e.printStackTrace();
+		}
+		assertEquals("target1", textHover.getHoverInfo(
+				automakeEditor.getAutomakeSourceViewer(), hoverRegion));
+	}
+	
+	public void testGetHoverInfoTargetName2() {
+		// hover between the $ and the @ in target2
+		IRegion hoverRegion = textHover.getHoverRegion(automakeEditor.getAutomakeSourceViewer(), 87);
+		if (hoverRegion == null)
+			fail("Null hoverRegion");
+		assertEquals(86, hoverRegion.getOffset());
+		assertEquals(2, hoverRegion.getLength());
+		try {
+			assertEquals("$@", automakeDocument.get(hoverRegion.getOffset(),
+					hoverRegion.getLength()));
+		} catch (BadLocationException e) {
+			fail("BadLocationException");
+			e.printStackTrace();
+		}
+		assertEquals("target2", textHover.getHoverInfo(
+				automakeEditor.getAutomakeSourceViewer(), hoverRegion));
+	}
+	
+	public void testGetHoverInfoForTargetDependency() {
+		// hover between the $ and the < in target2
+		IRegion hoverRegion = textHover.getHoverRegion(automakeEditor.getAutomakeSourceViewer(), 96);
+		if (hoverRegion == null)
+			fail("Null hoverRegion");
+		assertEquals(95, hoverRegion.getOffset());
+		assertEquals(2, hoverRegion.getLength());
+		try {
+			assertEquals("$<", automakeDocument.get(hoverRegion.getOffset(),
+					hoverRegion.getLength()));
+		} catch (BadLocationException e) {
+			fail("BadLocationException");
+			e.printStackTrace();
+		}
+		assertEquals("target1", textHover.getHoverInfo(
+				automakeEditor.getAutomakeSourceViewer(), hoverRegion));
+	}
+	
+	public void testGetHoverInfoForTargetDependencies() {
+		// hover between the $ and the ? in target3
+		IRegion hoverRegion = textHover.getHoverRegion(automakeEditor.getAutomakeSourceViewer(), 131);
+		if (hoverRegion == null)
+			fail("Null hoverRegion");
+		assertEquals(130, hoverRegion.getOffset());
+		assertEquals(2, hoverRegion.getLength());
+		try {
+			assertEquals("$?", automakeDocument.get(hoverRegion.getOffset(),
+					hoverRegion.getLength()));
+		} catch (BadLocationException e) {
+			fail("BadLocationException");
+			e.printStackTrace();
+		}
+		assertEquals("target1 target2", textHover.getHoverInfo(
+				automakeEditor.getAutomakeSourceViewer(), hoverRegion));
+	}
+
+	public void testGetHoverForMacro1() {
+		IRegion hoverRegion = textHover.getHoverRegion(automakeEditor.getAutomakeSourceViewer(), 32);
+		if (hoverRegion == null)
+			fail("Null hoverRegion");
+		// hover between the M and the A in the first $(MACRO) reference
+		assertEquals(31, hoverRegion.getOffset());
+		assertEquals(5, hoverRegion.getLength());
+		try {
+			assertEquals("MACRO", automakeDocument.get(hoverRegion.getOffset(),
+					hoverRegion.getLength()));
+		} catch (BadLocationException e) {
+			fail("BadLocationException");
+			e.printStackTrace();
+		}
+		assertEquals("case1", textHover.getHoverInfo(
+				automakeEditor.getAutomakeSourceViewer(), hoverRegion));
+	}
+	
+	public void testGetHoverForMacro2() {
+		// hover between the M and the A in the ${MACRO} reference in target2
+		IRegion hoverRegion = textHover.getHoverRegion(automakeEditor.getAutomakeSourceViewer(), 74);
+		if (hoverRegion == null)
+			fail("Null hoverRegion");
+		assertEquals(73, hoverRegion.getOffset());
+		assertEquals(5, hoverRegion.getLength());
+		try {
+			assertEquals("MACRO", automakeDocument.get(hoverRegion.getOffset(),
+					hoverRegion.getLength()));
+		} catch (BadLocationException e) {
+			fail("BadLocationException");
+			e.printStackTrace();
+		}
+		assertEquals("case1", textHover.getHoverInfo(
+				automakeEditor.getAutomakeSourceViewer(), hoverRegion));
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/editors/EditorTests.java b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/editors/EditorTests.java
new file mode 100644
index 0000000..308129f
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/src/org/eclipse/linuxtools/cdt/autotools/tests/editors/EditorTests.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.tests.editors;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class EditorTests {
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite(
+				"Test for org.eclipse.linuxtools.cdt.autotools.core.tests.editors");
+		//$JUnit-BEGIN$
+		suite.addTestSuite(AutomakeColourizationTests.class);
+		suite.addTestSuite(AutomakeTextHoverTest.class);
+		suite.addTestSuite(AutomakeEditorTests.class);
+		//$JUnit-END$
+		return suite;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/test.xml b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/test.xml
new file mode 100644
index 0000000..2cdb85d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/test.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+
+<project name="testsuite" default="run" basedir=".">
+	<property name="classname" value="org.eclipse.linuxtools.cdt.autotools.tests.AllAutotoolsTests" />
+	<property name="autoconf_classname" value="org.eclipse.linuxtools.cdt.autotools.tests.autoconf.AutoconfTests" />
+	<property name="editors_classname" value="org.eclipse.linuxtools.cdt.autotools.tests.editors.EditorTests" />
+
+	<!-- The property ${eclipse-home} should be passed into this script -->
+	<!-- Set a meaningful default value for when it is not. -->
+	<property name="eclipse-home" value="${basedir}/../.." />
+
+	<!-- sets the properties eclipse-home, and library-file -->
+	<property name="plugin-name" value="org.eclipse.linuxtools.cdt.autotools.tests" />
+	<property name="library-file" value="${eclipse-home}/dropins/${subProjectName2}/plugins/org.eclipse.test/library.xml" />
+
+	<!-- This target holds all initialization code that needs to be done for -->
+	<!-- all tests that are to be run. Initialization for individual tests -->
+	<!-- should be done within the body of the suite target. -->
+	<target name="init">
+		<tstamp />
+		<delete>
+			<fileset dir="${eclipse-home}" includes="org*.xml" />
+		</delete>
+	</target>
+
+	<!-- This target defines the tests that need to be run. -->
+	<target name="suite">
+		<property name="autotools-folder" value="${eclipse-home}/autotools_folder" />
+		<delete dir="${autotools-folder}" quiet="true" />
+		<echo message="Calling ui-test in ${library-file} with eclipse-home = ${eclipse-home} and library-file = ${library-file}"/>
+		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="data-dir" value="${autotools-folder}" />
+			<property name="plugin-name" value="${plugin-name}" />
+			<property name="classname" value="${classname}" />
+		</ant>
+	</target>
+
+	<target name="autoconf_suite">
+		<property name="autoconf-folder" value="${eclipse-home}/autoconf_folder" />
+		<delete dir="${autoconf-folder}" quiet="true" />
+		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="data-dir" value="${autoconf-folder}" />
+			<property name="plugin-name" value="${plugin-name}" />
+			<property name="classname" value="${autoconf_classname}" />
+		</ant>
+	</target>
+
+	<target name="editors_suite">
+		<property name="editors-folder" value="${eclipse-home}/editors_folder" />
+		<delete dir="${editors-folder}" quiet="true" />
+		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="data-dir" value="${editors-folder}" />
+			<property name="plugin-name" value="${plugin-name}" />
+			<property name="classname" value="${editors_classname}" />
+		</ant>
+	</target>
+
+	<!-- This target holds code to cleanup the testing environment after -->
+	<!-- after all of the tests have been run. You can use this target to -->
+	<!-- delete temporary files that have been created. -->
+	<target name="cleanup">
+		<mkdir dir="${results}/consolelogs" />
+		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
+	</target>
+
+	<!-- This target runs the test suite. Any actions that need to happen -->
+	<!-- after all the tests have been run should go here. -->
+	<target name="run" depends="init,suite,autoconf_suite,editors_suite,cleanup">
+		<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="includes" value="org*.xml" />
+			<property name="output-file" value="${plugin-name}.xml" />
+		</ant>
+	</target>
+
+</project>
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/zip/project1.zip b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/zip/project1.zip
new file mode 100644
index 0000000..4a51e51
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/zip/project1.zip
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/zip/project2.zip b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/zip/project2.zip
new file mode 100644
index 0000000..98319d4
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/zip/project2.zip
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/.classpath b/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/.classpath
new file mode 100644
index 0000000..ad32c83
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/.project b/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/.project
new file mode 100644
index 0000000..256be3d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.cdt.autotools.ui.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/.settings/org.eclipse.jdt.core.prefs b/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..7dd8708
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Thu Mar 25 17:32:29 EDT 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/ChangeLog b/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/ChangeLog
new file mode 100644
index 0000000..9f4d158
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/ChangeLog
@@ -0,0 +1,60 @@
+2010-05-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* build.properties: Remove non-existent test.xml references.
+	* META-INF/MANIFEST.MF: Mark plug-in as singleton.
+
+2010-05-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/tests/SetConfigurationParameter.java (canBuildWithConfigParm): Wait until
+	a.out is created before looking at config.status as we could end up looking at config.status while it is being created. 
+	(newConfigCopiesParms): Don't assume that active configuration will be set in configuration list.
+
+2010-04-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/tests/SetConfigurationParameter.java (canBuildWithConfigParm): Add
+	waiting period before testing existence of created file to ensure action has run on a slower system. 
+	(newConfigCopiesParms): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/tests/TestToolActions.java (canAccessAutoconf): Ditto. 
+	(canAccessAutomake): Ditto.
+	(canReconfigureProject): Ditto.
+	(canAccessAutoreconf): Ditto.
+	(canAccessAclocal): Ditto.
+	* plugin.properties: Change provider to Eclipse instead of Eclipse.org.
+	* META-INF/MANIFEST.MF: Add BundleLocalization statement so plugin.properties gets
+    used.
+
+2010-04-22  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.properties: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/tests/AllTests.java: New file.
+	* build.properties: Make plugin.properties part of binary build.
+	* META-INF/MANIFEST.MF: Change Java requirement to 1.5.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/tests/Activator.java: Add copyright notice. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/tests/SetConfigurationParameter.java (beforeClass): Close
+	Welcome view optionally if it exists.  Also hard-wire keyboard to EN_US. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/tests/TestToolActions.java (beforeClass): Ditto.
+	(sleep): Close Eclipse.
+
+2010-04-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/tests/TestToolActions.java (canAccessAutoheader): New test. 
+	(canAccessAutomake): Ditto.
+	(canReconfigureProject): Ditto.
+	(canAccessLibtoolize): Ditto.
+	(canAccessAutoreconf): Ditto.
+
+2010-04-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/tests/TestToolActions.java: New file.
+	(canAccessAutomake): New test.
+
+2010-04-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Initial check-in.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/tests/Activator.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/tests/SetConfigurationParameter.java: New file.
+	* build.properties: New file.
+	* .project: New file.
+	* .classpath: New file.
+	* .settings: New file.
+	* META-INF/MANIFEST.MF: New file.
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/META-INF/MANIFEST.MF b/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..976e1e1
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,30 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.cdt.autotools.ui.tests;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.cdt.autotools.ui.tests.Activator
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.swtbot.eclipse.core;bundle-version="2.0.0",
+ org.eclipse.swtbot.eclipse.finder;bundle-version="2.0.0",
+ org.eclipse.swtbot.junit4_x;bundle-version="2.0.0",
+ org.eclipse.swtbot.swt.finder;bundle-version="2.0.0",
+ org.hamcrest;bundle-version="1.1.0",
+ org.junit4;bundle-version="4.5.0",
+ org.apache.log4j;bundle-version="1.2.13",
+ org.eclipse.core.resources;bundle-version="3.5.1",
+ org.eclipse.linuxtools.cdt.autotools.core;bundle-version="1.0.0",
+ org.eclipse.linuxtools.cdt.autotools.ui;bundle-version="1.0.0",
+ org.eclipse.cdt.core;bundle-version="5.1.1",
+ org.eclipse.cdt.launch;bundle-version="6.0.0",
+ org.eclipse.cdt.make.core;bundle-version="6.0.0",
+ org.eclipse.cdt.make.ui;bundle-version="6.0.1",
+ org.eclipse.cdt.managedbuilder.core;bundle-version="6.0.0",
+ org.eclipse.cdt.managedbuilder.gnu.ui;bundle-version="5.0.100",
+ org.eclipse.cdt.managedbuilder.ui;bundle-version="5.1.0",
+ org.eclipse.cdt.ui;bundle-version="5.1.1"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Vendor: %provider
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/build.properties b/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/build.properties
new file mode 100644
index 0000000..aa10a0e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/build.properties
@@ -0,0 +1,9 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.properties
+src.includes = src/,\
+               META-INF/,\
+               plugin.properties
+individualSourceBundles=true
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/plugin.properties b/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/plugin.properties
new file mode 100644
index 0000000..ed7fdac
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+#  Copyright (c) 2010 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+bundleName=Autotools UI Tests Plug-in (Incubation)
+provider=Eclipse
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/src/org/eclipse/linuxtools/cdt/autotools/ui/tests/Activator.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/src/org/eclipse/linuxtools/cdt/autotools/ui/tests/Activator.java
new file mode 100644
index 0000000..6f0b5ff
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/src/org/eclipse/linuxtools/cdt/autotools/ui/tests/Activator.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.tests;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.cdt.autotools.ui.tests";
+
+	// The shared instance
+	private static Activator plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/src/org/eclipse/linuxtools/cdt/autotools/ui/tests/AllTests.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/src/org/eclipse/linuxtools/cdt/autotools/ui/tests/AllTests.java
new file mode 100644
index 0000000..0b2b6e0
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/src/org/eclipse/linuxtools/cdt/autotools/ui/tests/AllTests.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.tests;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+  SetConfigurationParameter.class,
+  TestToolActions.class,
+})
+public class AllTests {
+    // needed for this class to compile
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/src/org/eclipse/linuxtools/cdt/autotools/ui/tests/SetConfigurationParameter.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/src/org/eclipse/linuxtools/cdt/autotools/ui/tests/SetConfigurationParameter.java
new file mode 100644
index 0000000..d1aa9ec
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/src/org/eclipse/linuxtools/cdt/autotools/ui/tests/SetConfigurationParameter.java
@@ -0,0 +1,515 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.eclipse.cdt.ui.newui.UIMessages;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectNature;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
+import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
+import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotCombo;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotRadio;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotText;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+@RunWith(SWTBotJunit4ClassRunner.class)
+public class SetConfigurationParameter {
+	
+	private static SWTWorkbenchBot	bot;
+
+	@BeforeClass
+	public static void beforeClass() throws Exception {
+		SWTBotPreferences.KEYBOARD_LAYOUT = "EN_US";
+		bot = new SWTWorkbenchBot();
+		// Close the Welcome view if it exists
+		try {
+		bot.viewByTitle("Welcome").close();
+		// Turn off automatic building by default
+		} catch (Exception e) {
+			// do nothing
+		}
+		// Turn off automatic building by default
+		bot.menu("Window").menu("Preferences").click();
+		SWTBotShell shell = bot.shell("Preferences");
+		shell.activate();
+		bot.tree().expandNode("General").select("Workspace");
+		SWTBotCheckBox buildAuto = bot.checkBox("Build automatically");
+		if (buildAuto != null && buildAuto.isChecked())
+			buildAuto.click();
+		bot.button("Apply").click();
+		// Ensure that the C/C++ perspective is chosen automatically
+		// and doesn't require user intervention
+		bot.tree().expandNode("General").select("Perspectives");
+		SWTBotRadio radio = bot.radio("Always open");
+		if (radio != null && !radio.isSelected())
+			radio.click();
+		bot.button("OK").click();
+	}
+ 
+	@Test
+	// Verify we can create a sample Autotools project using the New C Project UI
+	public void canCreateANewAutotoolsProject() throws Exception {
+		bot.menu("File").menu("New").menu("Project...").click();
+ 
+		SWTBotShell shell = bot.shell("New Project");
+		shell.activate();
+		bot.tree().expandNode("C/C++").select("C Project");
+		bot.button("Next >").click();
+ 
+		bot.textWithLabel("Project name:").setText("GnuProject0");
+		bot.tree().expandNode("GNU Autotools").select("Hello World ANSI C Autotools Project");
+ 
+		bot.button("Finish").click();
+		
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		assertTrue(workspace != null);
+		IWorkspaceRoot root = workspace.getRoot();
+		assertTrue(root != null);
+		IProject project = root.getProject("GnuProject0");
+		assertTrue(project != null);
+		IProjectNature nature = project.getNature("org.eclipse.linuxtools.cdt.autotools.core.autotoolsNatureV2");
+		assertTrue(nature != null);
+	}
+	
+	@Test
+	// Verify we can set a configuration parameter and that it is recorded in
+	// the .autotools file for the project
+	public void canSetConfigParm() throws Exception {
+		SWTBotView view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject0");
+		bot.menu("Project", 1).menu("Properties").click();
+		SWTBotShell shell = bot.shell("Properties for GnuProject0");
+		shell.activate();
+		bot.tree().expandNode("Autotools").select("Configure Settings");
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
+		// Set the configure parameters to be --enable-jeff via user-defined options
+		SWTBotText text = bot.textWithLabel("Additional command-line options");
+		text.typeText("--enable-jeff");
+		bot.button("OK").click();
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		assertTrue(workspace != null);
+		IWorkspaceRoot root = workspace.getRoot();
+		assertTrue(root != null);
+		IProject project = root.getProject("GnuProject0");
+		assertTrue(project != null);
+		IPath path = project.getLocation();
+		path = path.append(".autotools");
+		File f = new File(path.toOSString());
+		assertTrue(f.exists());
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder db = dbf.newDocumentBuilder();
+		Document d = db.parse(f);
+		Element e = d.getDocumentElement();
+		// Get the stored configuration data
+		NodeList cfgs = e.getElementsByTagName("configuration"); // $NON-NLS-1$
+		assertEquals(1, cfgs.getLength());
+		Node n = cfgs.item(0);
+		NodeList l = n.getChildNodes();
+		// Verify user field in .autotools file is set to --enable-jeff
+		boolean foundUser = false;
+		for (int y = 0; y < l.getLength(); ++y) {
+			Node child = l.item(y);
+			if (child.getNodeName().equals("option")) { // $NON-NLS-1$
+				NamedNodeMap optionAttrs = child.getAttributes();
+				Node idNode = optionAttrs.getNamedItem("id"); // $NON-NLS-1$
+				Node valueNode = optionAttrs.getNamedItem("value"); // $NON-NLS-1$
+				assertTrue(idNode != null);
+				assertTrue(valueNode != null);
+				String id = idNode.getNodeValue();
+				String value = valueNode.getNodeValue();
+				if (id.equals("user")) {
+					foundUser = true;
+					assertEquals(value, "--enable-jeff");
+				}
+			}
+		}
+		assertTrue(foundUser);
+	}
+
+	@Test
+	// Verify we can build the project with a configuration parameter and that
+	// the configuration parameter can be found in the config.status file.
+	public void canBuildWithConfigParm() throws Exception {
+		SWTBotView view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject0");
+		bot.menu("Project", 1).menu("Build Project").click();
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		assertTrue(workspace != null);
+		IWorkspaceRoot root = workspace.getRoot();
+		assertTrue(root != null);
+		IProject project = root.getProject("GnuProject0");
+		assertTrue(project != null);
+		IPath path = project.getLocation();
+		// We need to wait until the a.out file is created so
+		// sleep a bit and look for it...give up after 120 seconds
+		for (int i = 0; i < 240; ++i) {
+			bot.sleep(500);
+			File f = new File(path.append("src/a.out").toOSString());
+			if (f.exists())
+				break;
+		}
+		File f = new File(path.append("config.status").toOSString());
+		assertTrue(f.exists());
+		BufferedReader r = new BufferedReader(new FileReader(f));
+		int ch;
+		boolean optionFound = false;
+		// Read config.status and look for the string --enable-jeff
+		// which is a simple verification that the option was used in the 
+		// configure step.
+		while ((ch = r.read()) != -1) {
+			if (ch == '-') {
+				char[] buf = new char[12];
+				r.mark(100);
+				int count = r.read(buf);
+				if (count < 12)
+					break;
+				String s = new String(buf);
+				if (s.equals("-enable-jeff")) {
+					optionFound = true;
+					break;
+				} else {
+					r.reset();
+				}
+			}
+		}
+		assertTrue(optionFound);
+	}
+
+	@Test
+	// Verify a new configuration will copy the configuration parameters
+	// of its base configuration.
+	public void newConfigCopiesParms() throws Exception {
+		SWTBotView view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject0");
+		bot.menu("Project", 1).menu("Build Configurations").menu("Manage...").click();
+		SWTBotShell shell = bot.shell("GnuProject0: Manage Configurations");
+		shell.activate();
+		bot.button("New...").click();
+		shell = bot.shell("Create New Configuration");
+		shell.activate();
+		SWTBotText t = bot.textWithLabel("Name:");
+		t.typeText("debug");
+		SWTBotRadio radio = bot.radio("Existing configuration");
+		if (!radio.isSelected())
+			radio.click();
+		bot.button("OK").click();
+		shell = bot.shell("GnuProject0: Manage Configurations");
+		shell.activate();
+		bot.button("New...").click();
+		shell = bot.shell("Create New Configuration");
+		shell.activate();
+		t = bot.textWithLabel("Name:");
+		t.typeText("default");
+		radio = bot.radio("Default configuration");
+		if (!radio.isSelected())
+			radio.click();
+		bot.button("OK").click();
+		shell = bot.shell("GnuProject0: Manage Configurations");
+		shell.activate();
+		SWTBotTable table = bot.table();
+		assertTrue(table.containsItem("debug"));
+		table.getTableItem("debug").select();
+		bot.button("Set Active").click();
+		bot.button("OK").click();
+		// Verify the debug configuration is active and has a user parameter: --enable-jeff
+		view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject0");
+		bot.menu("Project", 1).menu("Properties").click();
+		shell = bot.shell("Properties for GnuProject0");
+		shell.activate();
+		bot.tree().expandNode("Autotools").select("Configure Settings");
+		SWTBotCombo configs = bot.comboBoxWithLabel(UIMessages.getString("AbstractPage.6"));
+		configs.setFocus();
+		String[] items = configs.items();
+		for (int i = 0; i < items.length; ++i) {
+			if (items[i].contains("debug") && items[i].contains("Active"))
+				configs.setSelection(i);
+		}
+		assertTrue(configs.getText().contains("debug"));
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
+		SWTBotText text = bot.textWithLabel("Additional command-line options");
+		String val = text.getText();
+		assertEquals(val, "--enable-jeff");
+		// Verify that the build directory for the new configuration has been
+		// switched to build-debug
+		bot.tree().expandNode("C/C++ Build").select();
+		String buildDir = bot.textWithLabel("Build directory:").getText();
+		assertTrue(buildDir.endsWith("build-debug"));
+		// Verify the default configuration has no user setting
+		bot.tree().expandNode("Autotools").select("Configure Settings");
+		configs = bot.comboBoxWithLabel(UIMessages.getString("AbstractPage.6"));
+		configs.setSelection("default");
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
+		text = bot.textWithLabel("Additional command-line options");
+		val = text.getText();
+		assertEquals(val, "");
+		bot.button("OK").click();
+		// Build the project again and verify we get a build-debug directory
+		view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject0");
+		bot.menu("Project", 1).menu("Build Project").click();
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		assertTrue(workspace != null);
+		IWorkspaceRoot root = workspace.getRoot();
+		assertTrue(root != null);
+		IProject project = root.getProject("GnuProject0");
+		assertTrue(project != null);
+		IPath path = project.getLocation();
+		// We need to wait until the config.status file is created so
+		// sleep a bit and look for it...give up after 20 seconds
+		for (int i = 0; i < 40; ++i) {
+			bot.sleep(500);
+			File f = new File(path.append("build-debug/src/a.out").toOSString());
+			if (f.exists())
+				break;
+		}
+		File f = new File(path.append("build-debug/config.status").toOSString());
+		assertTrue(f.exists());
+		BufferedReader r = new BufferedReader(new FileReader(f));
+		int ch;
+		boolean optionFound = false;
+		// Read config.status and look for the string --enable-jeff
+		// which is a simple verification that the option was used in the 
+		// configure step.
+		while ((ch = r.read()) != -1) {
+			if (ch == '-') {
+				char[] buf = new char[12];
+				r.mark(100);
+				int count = r.read(buf);
+				if (count < 12)
+					break;
+				String s = new String(buf);
+				if (s.equals("-enable-jeff")) {
+					optionFound = true;
+					break;
+				} else {
+					r.reset();
+				}
+			}
+		}
+		assertTrue(optionFound);
+		// Verify we cleaned out the top-level build directory (i.e. that there
+		// is no config.status there anymore).
+		path = project.getLocation().append("config.status");
+		f = new File(path.toOSString());
+		assertTrue(!f.exists());
+		path = project.getLocation().append(".autotools");
+		f = new File(path.toOSString());
+		assertTrue(f.exists());
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder db = dbf.newDocumentBuilder();
+		Document d = db.parse(f);
+		Element e = d.getDocumentElement();
+		// Get the stored configuration data
+		NodeList cfgs = e.getElementsByTagName("configuration"); // $NON-NLS-1$
+		assertEquals(3, cfgs.getLength());
+		int foundUser = 0;
+		for (int x = 0; x < cfgs.getLength(); ++x) {
+			Node n = cfgs.item(x);
+			NodeList l = n.getChildNodes();
+			// Verify two of the user fields in .autotools file are set to --enable-jeff
+			for (int y = 0; y < l.getLength(); ++y) {
+				Node child = l.item(y);
+				if (child.getNodeName().equals("option")) { // $NON-NLS-1$
+					NamedNodeMap optionAttrs = child.getAttributes();
+					Node idNode = optionAttrs.getNamedItem("id"); // $NON-NLS-1$
+					Node valueNode = optionAttrs.getNamedItem("value"); // $NON-NLS-1$
+					assertTrue(idNode != null);
+					assertTrue(valueNode != null);
+					String id = idNode.getNodeValue();
+					String value = valueNode.getNodeValue();
+					if (id.equals("user")) {
+						if (value.equals("--enable-jeff"))
+							++foundUser;
+					}
+				}
+			}
+		}
+		assertEquals(foundUser, 2);
+	}
+
+	@Test
+	// Verify we can do a double rename of configurations, renaming one configuration to
+	// another and then cancel without changing configuration settings.
+	public void doubleRenameCancel() throws Exception {
+		SWTBotView view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject0");
+		bot.menu("Project", 1).menu("Properties").click();
+		SWTBotShell shell = bot.shell("Properties for GnuProject0");
+		shell.activate();
+		bot.tree().expandNode("Autotools").select("Configure Settings");
+		SWTBotCombo configs = bot.comboBoxWithLabel(UIMessages.getString("AbstractPage.6"));
+		assertTrue(configs.getText().contains("debug"));
+		bot.button("Manage Configurations...").click();
+		shell = bot.shell("GnuProject0: Manage Configurations");
+		shell.activate();
+		bot.table().select("debug");
+		// Rename "debug" to "release" and rename "default" to "debug".
+		// The settings should follow the rename operation.
+		bot.button("Rename...").click();
+		shell = bot.shell("Rename Configuration");
+		shell.activate();
+		SWTBotText text = bot.textWithLabel("Name:");
+		text.setText("");
+		text.typeText("release");
+		bot.button("OK").click();
+		shell = bot.shell("GnuProject0: Manage Configurations");
+		shell.activate();
+		bot.table().select("default");
+		bot.button("Rename...").click();
+		shell = bot.shell("Rename Configuration");
+		shell.activate();
+		text = bot.textWithLabel("Name:");
+		text.setText("");
+		text.typeText("debug");
+		bot.button("OK").click();
+		shell = bot.shell("GnuProject0: Manage Configurations");
+		shell.activate();
+		bot.button("OK").click();
+		// Verify that "release" has --enable-jeff set and that
+		// the new "debug" configuration has no user setting.
+		shell = bot.shell("Properties for GnuProject0");
+		shell.activate();
+		configs = bot.comboBoxWithLabel(UIMessages.getString("AbstractPage.6"));
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
+		text = bot.textWithLabel("Additional command-line options");
+		String setting = text.getText();
+		assertEquals("--enable-jeff", setting);
+		configs.setFocus();
+		configs.setSelection("debug");
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
+		text = bot.textWithLabel("Additional command-line options");
+		setting = text.getText();
+		assertEquals("", setting);
+		bot.button("Cancel").click();
+		// Cancel and then verify that "debug" is back to normal with
+		// --enable-jeff set and that "default" is back to normal with
+		// no user setting.
+		view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject0");
+		bot.menu("Project", 1).menu("Properties").click();
+		shell = bot.shell("Properties for GnuProject0");
+		shell.activate();
+		bot.tree().expandNode("Autotools").select("Configure Settings");
+		configs = bot.comboBoxWithLabel(UIMessages.getString("AbstractPage.6"));
+		assertTrue(configs.getText().contains("debug"));
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
+		text = bot.textWithLabel("Additional command-line options");
+		setting = text.getText();
+		assertEquals("--enable-jeff", setting);
+		configs.setFocus();
+		configs.setSelection("default");
+		assertTrue(configs.getText().contains("default"));
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
+		text = bot.textWithLabel("Additional command-line options");
+		setting = text.getText();
+		assertEquals("", setting);
+		bot.button("OK").click();
+	}
+
+	@Test
+	// Verify we can do a double rename of configurations, renaming one configuration to
+	// another and inheriting the settings properly.
+	public void doubleRenameOk() throws Exception {
+		SWTBotView view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject0");
+		bot.menu("Project", 1).menu("Properties").click();
+		SWTBotShell shell = bot.shell("Properties for GnuProject0");
+		shell.activate();
+		bot.tree().expandNode("Autotools").select("Configure Settings");
+		SWTBotCombo configs = bot.comboBoxWithLabel(UIMessages.getString("AbstractPage.6"));
+		assertTrue(configs.getText().contains("debug"));
+		bot.button("Manage Configurations...").click();
+		shell = bot.shell("GnuProject0: Manage Configurations");
+		shell.activate();
+		bot.table().select("debug");
+		// Rename "debug" to "release" and rename "default" to "debug".
+		// The settings should follow the rename operation.
+		bot.button("Rename...").click();
+		shell = bot.shell("Rename Configuration");
+		shell.activate();
+		SWTBotText text = bot.textWithLabel("Name:");
+		text.setText("");
+		text.typeText("release");
+		bot.button("OK").click();
+		shell = bot.shell("GnuProject0: Manage Configurations");
+		shell.activate();
+		bot.table().select("default");
+		bot.button("Rename...").click();
+		shell = bot.shell("Rename Configuration");
+		shell.activate();
+		text = bot.textWithLabel("Name:");
+		text.setText("");
+		text.typeText("debug");
+		bot.button("OK").click();
+		shell = bot.shell("GnuProject0: Manage Configurations");
+		shell.activate();
+		bot.button("OK").click();
+		shell = bot.shell("Properties for GnuProject0");
+		shell.activate();
+		bot.button("OK").click();
+		// Verify changes have taken effect permanently
+		view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject0");
+		bot.menu("Project", 1).menu("Properties").click();
+		shell = bot.shell("Properties for GnuProject0");
+		shell.activate();
+		bot.tree().expandNode("Autotools").select("Configure Settings");
+		configs = bot.comboBoxWithLabel(UIMessages.getString("AbstractPage.6"));
+		assertTrue(configs.getText().contains("release"));
+		assertTrue(configs.getText().contains("Active"));
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
+		text = bot.textWithLabel("Additional command-line options");
+		String setting = text.getText();
+		assertEquals("--enable-jeff", setting);
+		configs.setFocus();
+		configs.setSelection("debug");
+		assertTrue(configs.getText().contains("debug"));
+		bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
+		text = bot.textWithLabel("Additional command-line options");
+		setting = text.getText();
+		assertEquals("", setting);
+		bot.button("OK").click();
+	}
+
+	@AfterClass
+	public static void sleep() {
+		bot.sleep(4000);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/src/org/eclipse/linuxtools/cdt/autotools/ui/tests/TestToolActions.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/src/org/eclipse/linuxtools/cdt/autotools/ui/tests/TestToolActions.java
new file mode 100644
index 0000000..7c1a111
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui.tests/src/org/eclipse/linuxtools/cdt/autotools/ui/tests/TestToolActions.java
@@ -0,0 +1,449 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.tests;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
+import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
+import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotRadio;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(SWTBotJunit4ClassRunner.class)
+public class TestToolActions {
+	private static SWTWorkbenchBot	bot;
+
+	@BeforeClass
+	public static void beforeClass() throws Exception {
+		SWTBotPreferences.KEYBOARD_LAYOUT = "EN_US";
+		bot = new SWTWorkbenchBot();
+		// Close the Welcome view if it exists
+		try {
+		bot.viewByTitle("Welcome").close();
+		// Turn off automatic building by default
+		} catch (Exception e) {
+			// do nothing
+		}
+		bot.menu("Window").menu("Preferences").click();
+		SWTBotShell shell = bot.shell("Preferences");
+		shell.activate();
+		bot.tree().expandNode("General").select("Workspace");
+		SWTBotCheckBox buildAuto = bot.checkBox("Build automatically");
+		if (buildAuto != null && buildAuto.isChecked())
+			buildAuto.click();
+		bot.button("Apply").click();
+		// Ensure that the C/C++ perspective is chosen automatically
+		// and doesn't require user intervention
+		bot.tree().expandNode("General").select("Perspectives");
+		SWTBotRadio radio = bot.radio("Always open");
+		if (radio != null && !radio.isSelected())
+			radio.click();
+		bot.button("OK").click();
+		bot.menu("File").menu("New").menu("Project...").click();
+		 
+		shell = bot.shell("New Project");
+		shell.activate();
+		bot.tree().expandNode("C/C++").select("C Project");
+		bot.button("Next >").click();
+ 
+		bot.textWithLabel("Project name:").setText("GnuProject1");
+		bot.tree().expandNode("GNU Autotools").select("Hello World ANSI C Autotools Project");
+ 
+		bot.button("Finish").click();
+	}
+ 
+	@Test
+	// Verify we can access the aclocal tool
+	public void canAccessAclocal() throws Exception {
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		assertTrue(workspace != null);
+		IWorkspaceRoot root = workspace.getRoot();
+		assertTrue(root != null);
+		IProject project = root.getProject("GnuProject1");
+		assertTrue(project != null);
+		IPath path = project.getLocation();
+		// Verify configure does not exist initially
+		path = path.append("aclocal.m4");
+		File f = new File(path.toOSString());
+		assertTrue(!f.exists());
+		SWTBotView view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject1");
+		bot.menu("Project", 1).menu("Invoke Autotools").menu("Invoke Aclocal").click();
+		SWTBotShell shell = bot.shell("Aclocal Options");
+		shell.activate();
+		bot.text(0).typeText("--help");
+		bot.button("OK").click();
+		bot.sleep(1000);
+		SWTBotView consoleView = bot.viewByTitle("Console");
+		consoleView.setFocus();
+		String output = consoleView.bot().styledText().getText();
+		// Verify we got some help output to the console
+		Pattern p = Pattern.compile(".*Invoking aclocal in.*GnuProject1.*aclocal --help.*Usage: aclocal.*", Pattern.DOTALL);
+		Matcher m = p.matcher(output);
+		assertTrue(m.matches());
+		// Verify we still don't have an aclocal.m4 file yet
+		f = new File(path.toOSString());
+		assertTrue(!f.exists());
+		// Now lets run aclocal for our hello world project which hasn't had any
+		// autotool files generated yet.
+		view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject1");
+		bot.menu("Project", 1).menu("Invoke Autotools").menu("Invoke Aclocal").click();
+		shell = bot.shell("Aclocal Options");
+		shell.activate();
+		bot.button("OK").click();
+		bot.sleep(1000);
+		consoleView = bot.viewByTitle("Console");
+		consoleView.setFocus();
+		output = consoleView.bot().styledText().getText();
+		p = Pattern.compile(".*Invoking aclocal in.*GnuProject1.*aclocal.*", Pattern.DOTALL);
+		m = p.matcher(output);
+		assertTrue(m.matches());
+		// We need to wait until the aclocal.m4 file is created so
+		// sleep a bit and look for it...give up after 20 seconds
+		for (int i = 0; i < 40; ++i) {
+			bot.sleep(500);
+			f = new File(path.toOSString());
+			if (f.exists())
+				break;
+		}
+		// Verify we now have an aclocal.m4 file created
+		assertTrue(f.exists());
+	}
+
+	@Test
+	// Verify we can access the autoconf tool
+	public void canAccessAutoconf() throws Exception {
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		assertTrue(workspace != null);
+		IWorkspaceRoot root = workspace.getRoot();
+		assertTrue(root != null);
+		IProject project = root.getProject("GnuProject1");
+		assertTrue(project != null);
+		IPath path = project.getLocation();
+		// Verify configure does not exist initially
+		path = path.append("configure");
+		File f = new File(path.toOSString());
+		assertTrue(!f.exists());
+		SWTBotView view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject1");
+		bot.menu("Project", 1).menu("Invoke Autotools").menu("Invoke Autoconf").click();
+		bot.sleep(1000);
+		SWTBotView consoleView = bot.viewByTitle("Console");
+		consoleView.setFocus();
+		String output = consoleView.bot().styledText().getText();
+		// Verify we got some help output to the console
+		Pattern p = Pattern.compile(".*Invoking autoconf in.*GnuProject1.*autoconf.*", Pattern.DOTALL);
+		Matcher m = p.matcher(output);
+		assertTrue(m.matches());
+		// We need to wait until the configure file is created so
+		// sleep a bit and look for it...give up after 20 seconds
+		for (int i = 0; i < 40; ++i) {
+			bot.sleep(500);
+			f = new File(path.toOSString());
+			if (f.exists())
+				break;
+		}
+		// Verify we now have a configure script
+		f = new File(path.toOSString());
+		assertTrue(f.exists());
+		// Now lets delete the configure file and run autoconf from the project explorer
+		// menu directly from the configure.ac file.
+		assertTrue(f.delete());
+		view = bot.viewByTitle("Project Explorer");
+		SWTBotTreeItem node = view.bot().tree().expandNode("GnuProject1").getNode("configure.ac");
+		node.setFocus();
+		node.select().contextMenu("Invoke Autoconf").click();
+		bot.sleep(1000);
+		consoleView = bot.viewByTitle("Console");
+		consoleView.setFocus();
+		output = consoleView.bot().styledText().getText();
+		p = Pattern.compile(".*Invoking autoconf in.*GnuProject1.*autoconf.*", Pattern.DOTALL);
+		m = p.matcher(output);
+		assertTrue(m.matches());
+		// We need to wait until the configure file is created so
+		// sleep a bit and look for it...give up after 20 seconds
+		for (int i = 0; i < 40; ++i) {
+			bot.sleep(500);
+			f = new File(path.toOSString());
+			if (f.exists())
+				break;
+		}
+		// Verify we now have a configure script again
+		f = new File(path.toOSString());
+		assertTrue(f.exists());
+	}
+	
+	@Test
+	// Verify we can access the automake tool
+	public void canAccessAutomake() throws Exception {
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		assertTrue(workspace != null);
+		IWorkspaceRoot root = workspace.getRoot();
+		assertTrue(root != null);
+		IProject project = root.getProject("GnuProject1");
+		assertTrue(project != null);
+		IPath path = project.getLocation();
+		// Verify configure does not exist initially
+		IPath path2 = path.append("src/Makefile.in");
+		path = path.append("Makefile.in");
+		File f = new File(path.toOSString());
+		assertTrue(!f.exists());
+		File f2 = new File(path2.toOSString());
+		assertTrue(!f2.exists());
+		SWTBotView view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject1");
+		bot.menu("Project", 1).menu("Invoke Autotools").menu("Invoke Automake").click();
+		SWTBotShell shell = bot.shell("Automake Options");
+		shell.activate();
+		bot.text(0).typeText("--help");
+		bot.button("OK").click();
+		bot.sleep(1000);
+		SWTBotView consoleView = bot.viewByTitle("Console");
+		consoleView.setFocus();
+		String output = consoleView.bot().styledText().getText();
+		// Verify we got some help output to the console
+		Pattern p = Pattern.compile(".*Invoking automake in.*GnuProject1.*automake --help.*Usage:.*", Pattern.DOTALL);
+		Matcher m = p.matcher(output);
+		assertTrue(m.matches());
+		// Verify we still don't have Makefile.in files yet
+		f = new File(path.toOSString());
+		assertTrue(!f.exists());
+		f2 = new File(path2.toOSString());
+		assertTrue(!f2.exists());
+		// Now lets run automake for our hello world project which hasn't had any
+		// Makefile.in files generated yet.
+		view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject1");
+		bot.menu("Project", 1).menu("Invoke Autotools").menu("Invoke Automake").click();
+		shell = bot.shell("Automake Options");
+		shell.activate();
+		bot.text(0).typeText("--add-missing"); // need this to successfully run here
+		bot.text(1).typeText("Makefile src/Makefile");
+		bot.button("OK").click();
+		bot.sleep(2000);
+		consoleView = bot.viewByTitle("Console");
+		consoleView.setFocus();
+		output = consoleView.bot().styledText().getText();
+		p = Pattern.compile(".*Invoking automake in.*GnuProject1.*automake --add-missing Makefile src/Makefile.*", Pattern.DOTALL);
+		m = p.matcher(output);
+		assertTrue(m.matches());
+		// We need to wait until the Makefile.in files are created so
+		// sleep a bit and look for it...give up after 20 seconds
+		for (int i = 0; i < 40; ++i) {
+			bot.sleep(500);
+			f = new File(path.toOSString());
+			f2 = new File(path2.toOSString());
+			if (f.exists() && f2.exists())
+				break;
+		}
+		// Verify we now have Makefile.in files created
+		f = new File(path.toOSString());
+		assertTrue(f.exists());
+		f2 = new File(path2.toOSString());
+		assertTrue(f2.exists());
+	}
+	
+	@Test
+	// Verify we can access the libtoolize tool
+	public void canAccessLibtoolize() throws Exception {
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		assertTrue(workspace != null);
+		IWorkspaceRoot root = workspace.getRoot();
+		assertTrue(root != null);
+		IProject project = root.getProject("GnuProject1");
+		assertTrue(project != null);
+		SWTBotView view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject1");
+		bot.menu("Project", 1).menu("Invoke Autotools").menu("Invoke Libtoolize").click();
+		SWTBotShell shell = bot.shell("Libtoolize Options");
+		shell.activate();
+		bot.text(0).typeText("--help");
+		bot.button("OK").click();
+		bot.sleep(1000);
+		SWTBotView consoleView = bot.viewByTitle("Console");
+		consoleView.setFocus();
+		String output = consoleView.bot().styledText().getText();
+		// Verify we got some help output to the console
+		Pattern p = Pattern.compile(".*Invoking libtoolize in.*GnuProject1.*libtoolize --help.*Usage: libtoolize.*", Pattern.DOTALL);
+		Matcher m = p.matcher(output);
+		assertTrue(m.matches());
+	}
+
+	@Test
+	// Verify we can access the libtoolize tool
+	public void canAccessAutoheader() throws Exception {
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		assertTrue(workspace != null);
+		IWorkspaceRoot root = workspace.getRoot();
+		assertTrue(root != null);
+		IProject project = root.getProject("GnuProject1");
+		assertTrue(project != null);
+		SWTBotView view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject1");
+		bot.menu("Project", 1).menu("Invoke Autotools").menu("Invoke Autoheader").click();
+		SWTBotShell shell = bot.shell("Autoheader Options");
+		shell.activate();
+		bot.text(0).typeText("--help");
+		bot.button("OK").click();
+		bot.sleep(1000);
+		SWTBotView consoleView = bot.viewByTitle("Console");
+		consoleView.setFocus();
+		String output = consoleView.bot().styledText().getText();
+		// Verify we got some help output to the console
+		Pattern p = Pattern.compile(".*Invoking autoheader in.*GnuProject1.*autoheader --help.*Usage:.*autoheader.*", Pattern.DOTALL);
+		Matcher m = p.matcher(output);
+		assertTrue(m.matches());
+	}
+
+	@Test
+	// Verify we can access the autoreconf tool
+	public void canAccessAutoreconf() throws Exception {
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		assertTrue(workspace != null);
+		IWorkspaceRoot root = workspace.getRoot();
+		assertTrue(root != null);
+		IProject project = root.getProject("GnuProject1");
+		assertTrue(project != null);
+		IPath path = project.getLocation();
+		// Remove a number of generated files
+		File f = new File(path.append("src/Makefile.in").toOSString());
+		if (f.exists())
+			f.delete();
+		f = new File(path.append("Makefile.in").toOSString());
+		if (f.exists())
+			f.delete();
+		f = new File(path.append("configure").toOSString());
+		if (f.exists())
+			f.delete();
+		f = new File(path.append("config.status").toOSString());
+		if (f.exists())
+			f.delete();
+		f = new File(path.append("config.sub").toOSString());
+		if (f.exists())
+			f.delete();
+		SWTBotView view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject1");
+		bot.menu("Project", 1).menu("Invoke Autotools").menu("Invoke Autoreconf").click();
+		SWTBotShell shell = bot.shell("Autoreconf Options");
+		shell.activate();
+		bot.text(0).typeText("--help");
+		bot.button("OK").click();
+		bot.sleep(1000);
+		SWTBotView consoleView = bot.viewByTitle("Console");
+		consoleView.setFocus();
+		String output = consoleView.bot().styledText().getText();
+		// Verify we got some help output to the console
+		Pattern p = Pattern.compile(".*Invoking autoreconf in.*GnuProject1.*autoreconf --help.*Usage: .*autoreconf.*", Pattern.DOTALL);
+		Matcher m = p.matcher(output);
+		assertTrue(m.matches());
+		view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject1");
+		bot.menu("Project", 1).menu("Invoke Autotools").menu("Invoke Autoreconf").click();
+		shell = bot.shell("Autoreconf Options");
+		shell.activate();
+		bot.text(0).typeText("-i");
+		bot.button("OK").click();
+		// We need to wait until the Makefile.in file is created so
+		// sleep a bit and look for it...give up after 20 seconds
+		for (int i = 0; i < 40; ++i) {
+			bot.sleep(500);
+			f = new File(path.append("Makefile.in").toOSString());
+			if (f.exists())
+				break;
+		}
+		// Verify a number of generated files now exist
+		f = new File(path.append("src/Makefile.in").toOSString());
+		assertTrue(f.exists());
+		f = new File(path.append("Makefile.in").toOSString());
+		assertTrue(f.exists());
+		f = new File(path.append("configure").toOSString());
+		assertTrue(f.exists());
+		f = new File(path.append("config.status").toOSString());
+		assertTrue(!f.exists()); //shouldn't have run configure
+		f = new File(path.append("config.sub").toOSString());
+		assertTrue(f.exists());
+	}
+
+	@Test
+	// Verify we can access the autoreconf tool
+	public void canReconfigureProject() throws Exception {
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		assertTrue(workspace != null);
+		IWorkspaceRoot root = workspace.getRoot();
+		assertTrue(root != null);
+		IProject project = root.getProject("GnuProject1");
+		assertTrue(project != null);
+		IPath path = project.getLocation();
+		// Remove a number of generated files
+		File f = new File(path.append("src/Makefile.in").toOSString());
+		if (f.exists())
+			f.delete();
+		f = new File(path.append("Makefile.in").toOSString());
+		if (f.exists())
+			f.delete();
+		f = new File(path.append("configure").toOSString());
+		if (f.exists())
+			f.delete();
+		f = new File(path.append("config.status").toOSString());
+		if (f.exists())
+			f.delete();
+		f = new File(path.append("config.sub").toOSString());
+		if (f.exists())
+			f.delete();
+		SWTBotView view = bot.viewByTitle("Project Explorer");
+		view.bot().tree().select("GnuProject1");
+		bot.menu("Project", 1).menu("Reconfigure Project").click();
+		// We need to wait until the config.status file is created so
+		// sleep a bit and look for it...give up after 40 seconds
+		for (int i = 0; i < 40; ++i) {
+			bot.sleep(500);
+			f = new File(path.append("config.status").toOSString());
+			if (f.exists())
+				break;
+		}
+		// Verify a number of generated files now exist
+		f = new File(path.append("src/Makefile.in").toOSString());
+		assertTrue(f.exists());
+		f = new File(path.append("Makefile.in").toOSString());
+		assertTrue(f.exists());
+		f = new File(path.append("configure").toOSString());
+		assertTrue(f.exists());
+		f = new File(path.append("config.status").toOSString());
+		assertTrue(f.exists());
+		f = new File(path.append("config.sub").toOSString());
+		assertTrue(f.exists());
+	}
+
+	@AfterClass
+	public static void sleep() {
+		bot.sleep(2000);
+		bot.menu("File").menu("Exit").click();
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/.classpath b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/.classpath
new file mode 100644
index 0000000..ad32c83
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/.project b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/.project
new file mode 100644
index 0000000..7356f52
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.cdt.autotools.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/.settings/org.eclipse.jdt.core.prefs b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..137c164
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Tue Oct 06 15:50:25 EDT 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/ChangeLog b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/ChangeLog
new file mode 100644
index 0000000..4803f83
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/ChangeLog
@@ -0,0 +1,543 @@
+2010-04-22  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Switch to J2SE-1.5.
+
+2010-04-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #307258
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditor.java (isTabsToSpacesConversionEnabled): 
+	Add override method so tabs are not converted within the Automake editor.
+
+2010-03-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject): Move
+	creation of Autotools configuration to bottom as we must ensure that an ICConfigurationDescription
+	has been set up for the default configuration and we can't do this manually ourselves.
+
+2010-03-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #304005
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsCategoryPropertyOptionPage.java (createFieldEditors): 
+	Specify minimum length of 20 for text entry windows. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyPage.java (cfgChanged): Store configuration
+	descriptor for possible later usage.
+	(getConfiguration): Changed to use id rather than name.
+	(getAllConfigurationData): New method. 
+	(getCfgd): New method.
+	(AutotoolsConfigurePropertyPage): No longer implement ICloneCfgListener interface.  No longer keep track of temporary configuration
+	list.  This is now done by AutotoolsConfigurationManager.
+	(cloneCfg): Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyTab.java (createEditArea): Comment out
+	minimum size setting.
+	(setValues): Remove resizing.
+	(syncClones): New method.
+	(createControls): Sync all clones and clear the temporary configuration list.
+	(updateData): Get configuration description.
+	(performApply): Call AutotoolsConfigurationManager to do apply passing the Configuration Description list for
+	the page instead of calling performOk.
+	(getAutotoolsCfg): Change to use id rather than name. 
+	(performCancel): Call AutotoolsConfigurationManager to clear temporary configuration list.
+	(performOK): Changed to use new calls to AutotoolsConfigurationManager.
+	(specificResize): Removed.
+	(calcExtra): Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsBuildWizardHandler.java (convertProject): Create
+	configuration by id not name. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject): Ditto. 
+
+2010-02-25  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyPage.java (cloneCfg): If
+	clonee is null, assign new configuration to clonee variable to avoid NPE.
+
+2010-02-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #303613
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/Resources.properties: Fix message
+	issued for autoreconf.
+
+2009-12-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #296616
+	* META-INF/MANIFEST.MF: Revert dependency on org.eclipse.linuxtools.cdt.autotools plugin which
+	causes a dependency loop.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject): 
+	Change code to use new removeOldAutotoolsNature method in AutotoolsNewProjectNature class.
+
+2009-12-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #296616
+	* META-INF/MANIFEST.MF: Add dependency on org.eclipse.linuxtools.cdt.autotools plugin.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject): 
+	Remove old Autotools nature from existing project.
+
+2009-11-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml: Make sure COPYING file
+	is copied over as part of template.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml: Ditto. 
+
+2009-11-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/Resources.properties: Fix conversion wizard messages
+	to not mention CVS or repository.
+
+2009-11-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Fix dependencies to support CDT 6.0.0 and up.
+
+2009-11-02  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/AutoconfTextHover.java: Clean up warning.
+	* plugin.xml: Add back conversion wizard which is needed to convert from old Autotools project
+	to new as well as convert a Std Makefile project over.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyPage.java: Remove
+	the override logic and use the base AbstractPage plus some additions.
+	(cfgChanged):  Change this to be a place-holder for future usage. 
+	(getConfiguration): Add any configuration we create to the cfgs list.
+	(isSingle): Return true.
+	(AutotoolsConfigurePropertyPage): Changed to only set cfgs.
+	(cloneCfg): Changed to only access cfgs local variable.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyTab.java (performOK): 
+	Change to get IConfiguration list and then for each IConfiguration, get the IAConfiguration from
+	the parent page.  This allows the parent page to only have to track cloned and special Autotools
+	configurations as opposed to knowing the entire list.
+
+2009-10-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/EditorUtility.java (getWorkingCopy): Clean up.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsPropertyMessages.java: Change to reference
+	bundle using class name rather than by string.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/AutoconfTextHover.java (getHoverDoc): Add compatibility
+	support for old projects which use compatiblity plugin. 
+	(getDefaultAutomakeMacrosVer): New method.
+	(getDefaultAutoconfMacrosVer): Ditto.
+	(getLocalAutoconfMacrosDocName): Ditto.
+	(getLocalAutomakeMacrosDocName): Ditto.
+	(getHoverDoc): Change to use new interfaces.
+	(getAMDoc): Change to try local files.
+	(getACDoc): Ditto.
+
+2009-10-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsBuildWizardHandler.java: New file.
+	* META-INF/MANIFEST.MF: Change dependencies to match CDT 6.0.1.
+	* plugin.properties: Add new strings as needed.
+	* plugin.xml: Fix Autotools sub-pages which had been removed.  Also comment out GNU Autotools-specific
+	project wizards and conversion wizards.  These are all done under the C/C++ Wizards now.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsUIPluginImages.java: Clean up AutotoolsPlugin reference.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIImages.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/EditorUtility.java (getWorkingCopy): Change to
+	use new findSharedWorkingCopy API since old public one has been removed from the CDT.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyPage.java (handleConfigSelection): 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsBuildWizard.java (createItems): Use the new
+	AutotoolsBuildWizardHandler so we get proper project conversion in the CDT C and C++ Conversion Wizards. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsWizardMessages.properties: Add new message.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizard.java: Clean up unused
+	imports.
+
+2009-10-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizard.java (doRun): Remove
+	commented section. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject): Add
+	creation of default Autotools configuration.
+	 
+2009-10-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java (createControls): Remove
+	scanner discovery option which is no longer pertinent. 
+	(initialize): Ditto. 
+	(performOK): Ditto.
+
+2009-10-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsUIPluginImages.java (static initializer): Make sure
+	we are referencing icons folder for this plug-in, not AutotoolsPlugin. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLTextPresenter.java (updatePresentation): Fix references to
+	AutotoolsPlugin that should be AutotoolsUIPlugin. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIImages.java (static initializer): Ditto. 
+	(makeIconFileURL): Ditto.
+
+2009-10-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Fix Automake editor content-type typo.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizard.java (doRun): Put
+	back code to do conversion.
+
+2009-10-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add export of packages and allow org.eclipse.linuxtools.cdt.autotools.tests
+	plug-in to see them.
+
+2009-10-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Refactoring of org.eclipse.linuxtools.cdt.autotools into org.eclipse.linuxtools.cdt.autotools.core
+	and org.eclipse.linuxtools.cdt.autotools.ui.
+	
+	* .classpath: New file.
+	* .project: New file.
+	* .settings/org.eclipse.jdt.core.prefs: New file.
+	* build.properties: New file.
+	* icons/ac16/acmacro_arg_obj.gif: New file.
+	* icons/ac16/acmacro_obj.gif: New file.
+	* icons/ac16/ammacro_obj.gif: New file.
+	* icons/ac16/case_obj.gif: New file.
+	* icons/ac16/condition_obj.gif: New file.
+	* icons/ac16/convert_normal.gif: New file.
+	* icons/ac16/elif_obj.gif: New file.
+	* icons/ac16/else_obj.gif: New file.
+	* icons/ac16/for_obj.gif: New file.
+	* icons/ac16/if_obj.gif: New file.
+	* icons/ac16/while_obj.gif: New file.
+	* icons/autoconf.gif: New file.
+	* icons/automake.gif: New file.
+	* icons/dlcl16/build_configs.gif: New file.
+	* icons/dlcl16/config_category.gif: New file.
+	* icons/dlcl16/config_tool.gif: New file.
+	* icons/dlcl16/newc_app.gif: New file.
+	* icons/dlcl16/newcc_app.gif: New file.
+	* icons/dlcl16/open_include.gif: New file.
+	* icons/dtool16/alphab_sort_co.gif: New file.
+	* icons/dtool16/build_menu.gif: New file.
+	* icons/dtool16/convert-normal.gif: New file.
+	* icons/dtool16/make.gif: New file.
+	* icons/dtool16/makefile.gif: New file.
+	* icons/dtool16/newc_app.gif: New file.
+	* icons/dtool16/newcc_app.gif: New file.
+	* icons/dtool16/segment_edit.gif: New file.
+	* icons/dtool16/target_add.gif: New file.
+	* icons/dtool16/target_build.gif: New file.
+	* icons/dtool16/target_delete.gif: New file.
+	* icons/dtool16/target_edit.gif: New file.
+	* icons/dtool16/update_old.gif: New file.
+	* icons/elcl16/build_configs.gif: New file.
+	* icons/elcl16/config_category.gif: New file.
+	* icons/elcl16/config_tool.gif: New file.
+	* icons/elcl16/newc_app.gif: New file.
+	* icons/elcl16/newcc_app.gif: New file.
+	* icons/elcl16/open_include.gif: New file.
+	* icons/etool16/alphab_sort_co.gif: New file.
+	* icons/etool16/build_menu.gif: New file.
+	* icons/etool16/convert_normal.gif: New file.
+	* icons/etool16/make.gif: New file.
+	* icons/etool16/makefile.gif: New file.
+	* icons/etool16/newc_app.gif: New file.
+	* icons/etool16/newcc_app.gif: New file.
+	* icons/etool16/segment_edit.gif: New file.
+	* icons/etool16/target_add.gif: New file.
+	* icons/etool16/target_build.gif: New file.
+	* icons/etool16/target_delete.gif: New file.
+	* icons/etool16/target_edit.gif: New file.
+	* icons/etool16/target_filter.gif: New file.
+	* icons/etool16/update_old.gif: New file.
+	* icons/obj16/acmacro_obj.gif: New file.
+	* icons/obj16/command_obj.gif: New file.
+	* icons/obj16/define_obj.gif: New file.
+	* icons/obj16/environment_obj.gif: New file.
+	* icons/obj16/envvar_obj.gif: New file.
+	* icons/obj16/error_obj.gif: New file.
+	* icons/obj16/fatalerror_obj.gif: New file.
+	* icons/obj16/hfolder_obj.gif: New file.
+	* icons/obj16/include_obj.gif: New file.
+	* icons/obj16/info_obj.gif: New file.
+	* icons/obj16/irule_obj.gif: New file.
+	* icons/obj16/lib_obj.gif: New file.
+	* icons/obj16/macro_obj.gif: New file.
+	* icons/obj16/relation_obj.gif: New file.
+	* icons/obj16/target_obj.gif: New file.
+	* icons/obj16/trule_obj.gif: New file.
+	* icons/obj16/warning_obj.gif: New file.
+	* icons/sample.gif: New file.
+	* META-INF/MANIFEST.MF: New file.
+	* plugin.properties: New file.
+	* plugin.xml: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/AutotoolsUIPlugin.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfAnnotationHover.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfCodeScanner.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentSetupParticipant.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditor.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMacroValidator.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMessages.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMessages.properties: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfErrorHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfIdentifierRule.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfKeywordDetector.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfM4WordDetector.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacro.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroCodeScanner.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroParameterListValidator.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroPartitionRule.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroProposalContextInformation.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroRule.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroWordDetector.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitioner.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitionScanner.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPKGWordDetector.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfReconcilingStrategy.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfWhitespaceDetector.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfWordDetector.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolEditorActionDefinitionIds.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolHelpContextIds.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolsEditor.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/InlineDataRule.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/MultilineRuleDamagerRepairer.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentProvider.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/ParseException.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseConditionElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElifElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElseElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfForElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfIfElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroArgumentElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroDetector.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfParser.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfRootElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfSelectElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfTokenizer.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfUntilElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfWhileElement.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfErrorHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroDetector.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroValidator.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IMacroDetector.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ITokenConstants.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ParseException.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/Token.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RecursiveSingleLineRule.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RestrictedEndOfLineRule.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/Resources.properties: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AbstractAutotoolsCPropertyTab.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AbstractAutotoolsHandler.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AbstractTargetAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AclocalHandler.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutoconfHandler.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutoheaderHandler.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutomakeHandler.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutoreconfHandler.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAclocalAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutoconfAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutoheaderAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutomakeAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutoreconfAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeLibtoolizeAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeMessages.properties: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/LibtoolizeHandler.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/ReconfigureAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/ReconfigureHandler.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/SingleInputDialog.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/TwoInputDialog.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsConsole.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsUIPluginImages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CBuildStepsConsole.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CConfigureConsole.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/Console.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.properties: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CWordFinder.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/autoconf/ProjectionFileUpdater.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AbstractElementListSelectionDialog.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AbstractMakefile.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AbstractMakefileCodeScanner.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AddBuildTargetAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ArchiveTarget.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutoconfSubstRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeCompletionProcessor.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeConfigMacro.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeDocumentProvider.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeEditor.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeEditorFactory.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeErrorHandler.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Automakefile.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileCodeScanner.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileContentOutlinePage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileReconcilingStrategy.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileSourceConfiguration.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileUtil.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeIfElse.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeMacroDefinitionRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeMacroReferenceRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeTextHover.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeWordDetector.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/BadDirective.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Command.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Comment.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/CompletionProposalComparator.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Conditional.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/DefaultRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/DefineVariable.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/DeleteOnErrorRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Directive.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/EditorUtility.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ElementListSelectionDialog.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Else.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/EmptyLine.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Endef.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Endif.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExportAllVariablesRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExportVariable.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExternalEditorInput.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExternalEditorInputFactory.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUAutomakefile.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUMakefileConstants.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUMakefileUtil.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUTargetRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUVariableDef.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IAutomakeConditional.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/If.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifdef.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifeq.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifndef.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifneq.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IgnoreRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IMakefileDocumentProvider.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IMakefileEditorActionDefinitionIds.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Include.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/InferenceRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IntermediateRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IReconcilingParticipant.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ISelectionValidator.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ITranslationUnitEditorInput.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/LexicalSortingAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/LowResolutionTimeRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MacroDefinition.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MacroDefinitionRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MacroReferenceRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileAnnotationHover.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileCodeScanner.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileCompletionProcessor.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakeFileConstants.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileContentOutlinePage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileDocumentProvider.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileDocumentSetupParticipant.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditor.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditorActionContributor.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditorPreferenceConstants.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditorTogglePresentationAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakeFileMessages.properties: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefilePartitionScanner.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileReader.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileReconcilingStrategy.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileSourceConfiguration.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileStorageDocumentProvider.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileTextHover.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileWordDetector.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MessageLine.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/NotParallelRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/NullMakefile.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OpenDeclarationAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OpenIncludeAction.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OverrideDefine.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OverrideVariable.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Parent.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PhonyRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PosixMakefileUtil.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PosixRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PreciousRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ProjectionMakefileUpdater.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Rule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SccsGetRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SecondaryRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SelectionList.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SelectionStatusDialog.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SilentRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SpecialRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StaticTargetRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StatusInfo.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StatusTool.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StringMatcher.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SuffixesRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Target.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/TargetRule.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/TargetVariable.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Terminal.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/TwoArrayQuickSort.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/UnExport.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Util.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/VariableDefinition.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/VPath.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/WordPartDetector.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/WorkingCopyManager.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ErrorParserBlock.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/FileRelevance.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTML2TextReader.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLPrinter.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLTextPresenter.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/LineBreakingReader.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/LocationAdapter.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIImages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIMessages.properties: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MessageLine.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/OptionalMessageDialog.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AbstractEditorPreferencePage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutoconfEditorPreferencePage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutomakeEditorPreferencePage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsEditorPreferenceConstants.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencePage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencesMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencesMessages.properties: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/ColorEditor.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/ColorManager.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/OverlayPreferenceStore.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/StatusInfo.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/TabFolderLayout.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AbstractConfigurePropertyOptionsPage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsCategoryPropertyOptionPage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePrefStore.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyPage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyTab.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsEditorPropertyTab.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsGeneralPropertyPage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsHeadPropertyPage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsPropertyManager.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsPropertyMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsToolPropertyOptionPage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsToolsPropertyTab.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/IProjectPropertyListener.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/IPropertyChangeManager.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/ToolListContentProvider.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/ToolListElement.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/ToolListLabelProvider.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ResourceLookup.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ResourceLookupTree.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SingleCharReader.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SubstitutionTextReader.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/AutoconfPrototype.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/AutoconfTextHover.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/HoverMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/HoverMessages.properties: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsBuildWizard.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsNewCCProjectWizardV2.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsNewCProjectWizardV2.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsWizardMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsWizardMessages.properties: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConfigurationContentProvider.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConfigurationLabelProvider.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizard.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizardPage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/CProjectPlatformPage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ManagedProjectOptionBlock.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/NewAutotoolsProjectOptionPage.java: New file.
+	* templates/projecttemplates/EmptyProject/template.properties: New file.
+	* templates/projecttemplates/EmptyProject/template.xml: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/template.properties: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.properties: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml: 
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/META-INF/MANIFEST.MF b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..7ec9cd2
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,38 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name.0
+Bundle-SymbolicName: org.eclipse.linuxtools.cdt.autotools.ui;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin
+Bundle-Localization: plugin
+Bundle-Vendor: %provider
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.linuxtools.cdt.autotools.core;bundle-version="1.0.0",
+ org.eclipse.cdt.make.core;bundle-version="6.0.0",
+ org.eclipse.cdt.core;bundle-version="5.1.0",
+ org.eclipse.core.resources;bundle-version="3.5.0",
+ org.eclipse.cdt.managedbuilder.core;bundle-version="6.0.0",
+ org.eclipse.jface.text;bundle-version="3.5.0",
+ org.eclipse.ui.editors;bundle-version="3.5.0",
+ org.eclipse.cdt.ui;bundle-version="5.1.0",
+ org.eclipse.help;bundle-version="3.4.0",
+ org.eclipse.ui.ide;bundle-version="3.5.0",
+ org.eclipse.cdt.managedbuilder.ui;bundle-version="5.1.0",
+ org.eclipse.core.filesystem;bundle-version="1.2.0",
+ org.eclipse.cdt.make.ui;bundle-version="6.0.0",
+ org.eclipse.ui.views;bundle-version="3.4.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.linuxtools.cdt.autotools.ui,
+ org.eclipse.linuxtools.cdt.autotools.ui.editors,
+ org.eclipse.linuxtools.cdt.autotools.ui.editors.outline,
+ org.eclipse.linuxtools.cdt.autotools.ui.editors.parser,
+ org.eclipse.linuxtools.internal.cdt.autotools.ui;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests",
+ org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests",
+ org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.autoconf;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests",
+ org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests",
+ org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests",
+ org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests",
+ org.eclipse.linuxtools.internal.cdt.autotools.ui.text.hover;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests",
+ org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests"
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/build.properties b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/build.properties
new file mode 100644
index 0000000..b5179fa
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/build.properties
@@ -0,0 +1,8 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               plugin.properties,\
+               templates/,\
+               icons/
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/acmacro_arg_obj.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/acmacro_arg_obj.gif
new file mode 100644
index 0000000..fa1765e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/acmacro_arg_obj.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/acmacro_obj.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/acmacro_obj.gif
new file mode 100644
index 0000000..d90a51c
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/acmacro_obj.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/ammacro_obj.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/ammacro_obj.gif
new file mode 100644
index 0000000..91c4c93
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/ammacro_obj.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/case_obj.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/case_obj.gif
new file mode 100644
index 0000000..5a15a79
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/case_obj.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/condition_obj.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/condition_obj.gif
new file mode 100644
index 0000000..1be9094
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/condition_obj.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/convert_normal.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/convert_normal.gif
new file mode 100644
index 0000000..0b693cb
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/convert_normal.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/elif_obj.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/elif_obj.gif
new file mode 100644
index 0000000..f34581a
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/elif_obj.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/else_obj.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/else_obj.gif
new file mode 100644
index 0000000..a441bef
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/else_obj.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/for_obj.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/for_obj.gif
new file mode 100644
index 0000000..11d3d8d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/for_obj.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/if_obj.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/if_obj.gif
new file mode 100644
index 0000000..86550fe
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/if_obj.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/while_obj.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/while_obj.gif
new file mode 100644
index 0000000..2407494
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/ac16/while_obj.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/autoconf.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/autoconf.gif
new file mode 100644
index 0000000..98afb3e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/autoconf.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/automake.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/automake.gif
new file mode 100644
index 0000000..57df70e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/automake.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/build_configs.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/build_configs.gif
new file mode 100644
index 0000000..f040465
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/build_configs.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/config_category.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/config_category.gif
new file mode 100644
index 0000000..cd837b1
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/config_category.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/config_tool.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/config_tool.gif
new file mode 100644
index 0000000..4539ebd
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/config_tool.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/newc_app.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/newc_app.gif
new file mode 100644
index 0000000..a8353f6
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/newc_app.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/newcc_app.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/newcc_app.gif
new file mode 100644
index 0000000..9ed7487
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/newcc_app.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/open_include.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/open_include.gif
new file mode 100644
index 0000000..b902fca
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dlcl16/open_include.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/alphab_sort_co.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/alphab_sort_co.gif
new file mode 100644
index 0000000..a024548
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/alphab_sort_co.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/build_menu.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/build_menu.gif
new file mode 100644
index 0000000..825d4c1
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/build_menu.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/convert-normal.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/convert-normal.gif
new file mode 100644
index 0000000..580eac5
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/convert-normal.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/make.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/make.gif
new file mode 100644
index 0000000..496f46b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/make.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/makefile.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/makefile.gif
new file mode 100644
index 0000000..a66cba4
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/makefile.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/newc_app.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/newc_app.gif
new file mode 100644
index 0000000..a8353f6
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/newc_app.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/newcc_app.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/newcc_app.gif
new file mode 100644
index 0000000..9ed7487
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/newcc_app.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/segment_edit.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/segment_edit.gif
new file mode 100644
index 0000000..8cbaa85
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/segment_edit.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/target_add.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/target_add.gif
new file mode 100644
index 0000000..92003c4
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/target_add.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/target_build.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/target_build.gif
new file mode 100644
index 0000000..f545148
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/target_build.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/target_delete.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/target_delete.gif
new file mode 100644
index 0000000..5bff522
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/target_delete.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/target_edit.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/target_edit.gif
new file mode 100644
index 0000000..5e4b501
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/target_edit.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/update_old.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/update_old.gif
new file mode 100644
index 0000000..1f37827
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/dtool16/update_old.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/build_configs.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/build_configs.gif
new file mode 100644
index 0000000..c4c76d0
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/build_configs.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/config_category.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/config_category.gif
new file mode 100644
index 0000000..ee7c485
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/config_category.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/config_tool.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/config_tool.gif
new file mode 100644
index 0000000..c984fba
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/config_tool.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/newc_app.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/newc_app.gif
new file mode 100644
index 0000000..23b0284
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/newc_app.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/newcc_app.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/newcc_app.gif
new file mode 100644
index 0000000..4b39411
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/newcc_app.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/open_include.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/open_include.gif
new file mode 100644
index 0000000..b902fca
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/elcl16/open_include.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/alphab_sort_co.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/alphab_sort_co.gif
new file mode 100644
index 0000000..7d27529
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/alphab_sort_co.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/build_menu.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/build_menu.gif
new file mode 100644
index 0000000..ab543f4
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/build_menu.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/convert_normal.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/convert_normal.gif
new file mode 100644
index 0000000..0b693cb
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/convert_normal.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/make.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/make.gif
new file mode 100644
index 0000000..def312a
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/make.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/makefile.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/makefile.gif
new file mode 100644
index 0000000..7afb494
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/makefile.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/newc_app.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/newc_app.gif
new file mode 100644
index 0000000..23b0284
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/newc_app.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/newcc_app.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/newcc_app.gif
new file mode 100644
index 0000000..4b39411
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/newcc_app.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/segment_edit.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/segment_edit.gif
new file mode 100644
index 0000000..1b50ff8
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/segment_edit.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_add.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_add.gif
new file mode 100644
index 0000000..7fe9625
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_add.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_build.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_build.gif
new file mode 100644
index 0000000..174965f
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_build.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_delete.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_delete.gif
new file mode 100644
index 0000000..b853d62
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_delete.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_edit.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_edit.gif
new file mode 100644
index 0000000..65b97a5
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_edit.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_filter.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_filter.gif
new file mode 100644
index 0000000..5340ec9
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/target_filter.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/update_old.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/update_old.gif
new file mode 100644
index 0000000..c40724d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/etool16/update_old.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/acmacro_obj.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/acmacro_obj.gif
new file mode 100644
index 0000000..98afb3e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/acmacro_obj.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/command_obj.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/command_obj.gif
new file mode 100644
index 0000000..7b3a92e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/command_obj.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/define_obj.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/define_obj.gif
new file mode 100644
index 0000000..87d583e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/define_obj.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/environment_obj.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/environment_obj.gif
new file mode 100644
index 0000000..3150162
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/environment_obj.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/envvar_obj.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/envvar_obj.gif
new file mode 100644
index 0000000..0f07692
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/envvar_obj.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/error_obj.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/error_obj.gif
new file mode 100644
index 0000000..0bc6068
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/error_obj.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/fatalerror_obj.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/fatalerror_obj.gif
new file mode 100644
index 0000000..75a9275
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/fatalerror_obj.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/hfolder_obj.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/hfolder_obj.gif
new file mode 100644
index 0000000..b98b817
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/hfolder_obj.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/include_obj.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/include_obj.gif
new file mode 100644
index 0000000..612067c
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/include_obj.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/info_obj.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/info_obj.gif
new file mode 100644
index 0000000..745b884
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/info_obj.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/irule_obj.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/irule_obj.gif
new file mode 100644
index 0000000..975d789
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/irule_obj.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/lib_obj.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/lib_obj.gif
new file mode 100644
index 0000000..cb55e33
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/lib_obj.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/macro_obj.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/macro_obj.gif
new file mode 100644
index 0000000..fdde5fb
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/macro_obj.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/relation_obj.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/relation_obj.gif
new file mode 100644
index 0000000..edbd8a3
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/relation_obj.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/target_obj.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/target_obj.gif
new file mode 100644
index 0000000..def312a
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/target_obj.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/trule_obj.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/trule_obj.gif
new file mode 100644
index 0000000..dd26112
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/trule_obj.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/warning_obj.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/warning_obj.gif
new file mode 100644
index 0000000..1e5f5eb
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/obj16/warning_obj.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/sample.gif b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/sample.gif
new file mode 100644
index 0000000..34fb3c9
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/icons/sample.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/plugin.properties b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/plugin.properties
new file mode 100644
index 0000000..6a64207
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/plugin.properties
@@ -0,0 +1,174 @@
+#################################################################################
+#  Copyright (c) 2006, 2008, 2009 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+ConvertWizard.description=Convert to C/C++ Autotools Project
+ConvertWizard.name = Convert to a C/C++ Autotools Project
+
+NewCProjectV2.description=GNU C Autotools Project
+NewCCProjectV2.description=GNU C++ Autotools Project
+NewCWizardV2.name=GNU C Autotools Project
+NewCCWizardV2.name=GNU C++ Autotools Project
+
+Autotools.wizard.name=GNU Autotools Build Wizard
+
+Autoconf.editor.name=Autoconf Editor
+
+BuildProperty.value.name.default=Default;
+BuildProperty.type.name.autotools=GNU Autotools
+
+PreferenceAutotools.name=Autotools
+PreferenceAutomakeEditor.name=Automake Editor
+PreferenceAutoconfEditor.name=Autoconf Editor
+
+PropertyAutotools.name=Autotools
+PropertyAutotools.general.name=General
+PropertyAutotools.configure.name=Configure Settings
+PropertyTabEditor.name=Editors
+AutotoolsBuildPropertyTab.name=Behaviour
+AutotoolsEditorsPropertyTab.name=Editors
+AutotoolsToolsPropertyTab.name=Tools Settings
+AutotoolsConfigurePropertyTab.name=Configure Settings
+
+PropertyTabEditor.tooltip=Set options for Autotools-specific editors
+PropertyTabBuild.tooltip=Set additional Autotools build options
+
+Makefile.builder.name=Autotools Makefile Generator
+Autotools.projecttype.name=GNU Autotools
+AutotoolsNature.name=Autotools Project Nature
+AutotoolsNewNature.name=Autotools Project Nature V2
+Configuration.build.name=Build (GNU)
+Autotools.targetplatform.name=GNU Autotools Target Platform
+Autotools.gnu.toolchain.name=GNU Autotools Toolchain
+Configure.outputType=Configure Output (config.status)
+Autogen.outputType=Autogen Output (configure)
+
+CommandCategorySource.name=Source
+CommandCategorySource.description=Source commands
+CommandCategoryTools.name=Tools
+CommandCategoryTools.description=Autotool tools
+ShowTooltip.name=Show Tooltip Description
+ShowTooltip.description=Shows the tooltip description for the element at the cursor
+
+# Scope and Key Commands
+ACeditor.scope.name=Autoconf Editor
+ACeditor.scope.description=Editor for Autoconf Configuration Source Files
+
+Tool.configure=configure
+
+OptionCategory.configure.general=General
+Option.configure.name=Name
+Option.configure.builddir=Build directory
+Option.configure.builddir.tip=Subdirectory off of project where build will occur
+Option.configure.configdir=Configure tool directory
+Option.configure.configdir.tip=Subdirectory off of project containing configure scripts
+Option.configure.cache_file=Name of configuration cache file (--cache-file)
+Option.configure.cache_file.tip=Specify the name of the configuration cache file [config.cache]
+Option.configure.no_create=Turn off file creation <not advised> (--no-create)
+Option.configure.no_create.tip=This tells configuration not to generate the output files as part of configuration
+Option.configure.quiet=Turn off checking messages (--quiet)
+Option.configure.quiet.tip=This turns off "checking ..." style messages from the configuration console output
+Option.configure.help=Display help contents of top-level configuration (--help)
+Option.configure.help.tip=Ask configuration file to display its help documentation
+Option.configure.version=Display version of autotools used to create configuration (--version)
+Option.configure.version.tip=This outputs the version of the Autotools used to create the configuration files
+
+OptionCategory.configure.platform=Platform Specifiers
+Option.configure.host=Host platform (--host)
+Option.configure.host.tip=Platform that project will run on
+Option.configure.target=Target platform (--target)
+Option.configure.target.tip=Platform that project will target output for
+Option.configure.build=Build platform (--build)
+Option.configure.build.tip=Platform where project is being built
+
+OptionCategory.configure.directories=Directory specifiers
+Option.configure.prefix=Arch-independent install directory (--prefix)
+Option.configure.prefix.tip=Place where architecture-independent files are installed [/usr/local]
+Option.configure.exec_prefix=Arch-dependent install directory (--exec-prefix)
+Option.configure.exec_prefix.tip=Place where architecture-dependent files are installed [PREFIX]
+Option.configure.libdir=Object code library directory (--libdir)
+Option.configure.libdir.tip=Place where object code libraries are installed [EPREFIX/lib]
+Option.configure.bindir=User executable directory (--bindir)
+Option.configure.bindir.tip=Place where binary executables are installed [EPREFIX/bin]
+Option.configure.sbindir=System admin executable directory (--sbindir)
+Option.configure.sbindir.tip=Place where system admin executables are installed [EPREFIX/sbin]
+Option.configure.includedir=C Header file directory (--includdir)
+Option.configure.includedir.tip=Place where header files will be installed [PREFIX/include]
+Option.configure.datadir=Read-only architecture-independent data (--datadir)
+Option.configure.datadir.tip=Place where read-only architecture-independent data is installed [PREFIX/share]
+Option.configure.sysconfdir=Read-only single-machine data directory (--syconfdir)
+Option.configure.sysconfdir.tip=Place where read-only single-machine data is stored [PREFIX/etc]
+Option.configure.infodir=Info file documentation directory (--infodir)
+Option.configure.infodir.tip=Place where info files are installed [PREFIX/info]
+Option.configure.mandir=Man file documentation directory (--mandir)
+Option.configure.mandir.tip=Place where man file documentation is installed [PREFIX/man]
+Option.configure.srcdir=Sources directory (--srcdir)
+Option.configure.srcdir.tip=Place where configure can find sources [configure directory or ..]
+Option.configure.localstatedir=Modifiable single-machine data directory (--localstatedir)
+Option.configure.localstatedir.tip=Place where modifiable single-machine data is installed [PREFIX/var]
+Option.configure.sharedstatedir=Modifiable architecture-independent data directory (--sharedstatedir)
+Option.configure.sharedstatedir.tip=Place where modifiable architecture-independent data is installed [PREFIX/com}
+Option.configure.libexecdir=Program executable directory (--libexecdir)
+Option.configure.libexecdir=Place where program executables will be installed [EPREFIX/libexec]
+Option.configure.oldincludedir=Non-gcc C header file directory (--oldincludedir)
+Option.configure.oldincludedir.tip=Place where non-gcc C header files are installed [/usr/include]
+
+OptionCategory.configure.filenames=File-name transformations
+Option.configure.program_prefix=Installed program prefix (--program-prefix)
+Option.configure.program_prefix.tip=Prepend PREFIX to the beginning of installed program names
+Option.configure.program_suffix=Installed program suffix (--program-suffix)
+Option.configure.program_suffix.tip=Append SUFFIX to the end of installed program names
+Option.configure.program_transform_name=Installed program name transform (--program-transform-name)
+Option.configure.program_transform_name.tip=A sed string used to transform installed program names
+
+OptionCategory.configure.features=Features and packages
+Option.configure.enable_maintainer_mode=Enable maintainer mode (--enable-maintainer-mode)
+Option.configure.enable_maintainer_mode.tip=Specify this to have Makefiles generated with checks for Autotool configuration file changes
+Option.configure.user=User-specified configuration options
+Option.configure.user.tip=Specify one or more configuration options (e.g. --enable-FEATURE, --disable-FEATURE, or --with-PACKAGE)
+
+Tool.autogen = autogen.sh
+
+OptionCategory.autogen.general=Options
+Option.autogen.user=Command line options
+Option.autogen.user.tip=Specify options to pass to the top-level autogen.sh script
+
+RedHatVendor.name = Red Hat
+Bundle-Name.0 = Autotools UI Plug-in (Incubation)
+provider=Eclipse
+InvokeAutotools.label = Invoke Autotools
+InvokeAutotools.mnemonic = I
+InvokeAutoconf.label = Invoke Autoconf
+InvokeAutoconf.mnemonic = c
+InvokeAutoconf.description = Run autoconf in the selected directory
+InvokeAutoheader.label = Invoke Autoheader
+InvokeAutoheader.mnemonic = h
+InvokeAutoheader.description = Run autoheader from the selected directory
+InvokeAutomake.label = Invoke Automake
+InvokeAutomake.mnemonic = m
+InvokeAutomake.description = Run automake from the selected directory
+InvokeAutoreconf.label = Invoke Autoreconf
+InvokeAutoreconf.mnemonic = r
+InvokeAutoreconf.description = Run autoreconf from the selected directory
+InvokeAclocal.label = Invoke Aclocal
+InvokeAclocal.mnemonic = l
+InvokeAclocal.description = Run aclocal from the selected directory
+InvokeLibtoolize.label = Invoke Libtoolize
+InvokeLibtoolize.mnemonic = t
+InvokeLibtoolize.description = Run libtoolize in the selected directory
+Reconfigure.label = Reconfigure Project
+Reconfigure.mnemonic = f
+Reconfigure.description = Run configuration scripts for project
+DynamicBuild.label = Dynamic Build Info
+GetIncludePath.label = Get Include Path
+GetDefinedSymbols.label = Get Defined Symbols
+IncludesOption.name = includes
+SymbolsOption.name = symbols
+AutomakeEditor.name = AutomakeEditor
+Automake.name = automake
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/plugin.xml b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/plugin.xml
new file mode 100644
index 0000000..5dbeb1d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/plugin.xml
@@ -0,0 +1,740 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+   <extension
+         point="org.eclipse.ui.newWizards">
+      <wizard
+            category="org.eclipse.cdt.ui.newCWizards"
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards.ConvertToAutotoolsProjectWizard"
+            finalPerspective="org.eclipse.cdt.ui.CPerspective"
+            hasPages="true"
+            icon="icons/ac16/convert_normal.gif"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.wizards.conversionWizard"
+            name="%ConvertWizard.name">
+         <description>
+            %ConvertWizard.description
+         </description>
+         <selection class="org.eclipse.core.resources.IProject"/>
+      </wizard>
+    <!--
+      <wizard
+            category="org.eclipse.cdt.ui.newCWizards"
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards.AutotoolsNewCProjectWizardV2"
+            finalPerspective="org.eclipse.cdt.ui.CPerspective"
+            hasPages="true"
+            icon="icons/elcl16/newc_app.gif"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.wizard.c.v2"
+            name="%NewCWizardV2.name"
+            project="true">
+         <description>
+            %NewCProjectV2.description
+         </description>
+         <selection
+               class="org.eclipse.core.resources.IProject">
+         </selection>
+      </wizard>
+      <wizard
+            category="org.eclipse.cdt.ui.newCWizards"
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards.AutotoolsNewCCProjectWizardV2"
+            finalPerspective="org.eclipse.cdt.ui.CPerspective"
+            hasPages="true"
+            icon="icons/elcl16/newcc_app.gif"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.wizard.cc.v2"
+            name="%NewCCWizardV2.name"
+            project="true">
+         <description>
+            %NewCCProjectV2.description
+         </description>
+         <selection
+               class="org.eclipse.core.resources.IProject">
+         </selection>
+      </wizard>
+    -->
+   </extension>
+   <!--
+  <extension
+        point="org.eclipse.ui.navigator.navigatorContent">
+     <commonWizard
+           associatedExtensionId="org.eclipse.cdt.ui.navigator.content"
+           menuGroupId="org.eclipse.cdt.ui.newProject"
+           type="new"
+           wizardId="org.eclipse.linuxtools.cdt.autotools.ui.wizards.conversionWizard">
+		 <enablement>
+		 	<and>
+	            <adapt type="org.eclipse.core.resources.IProject" />
+				<not>
+		            <adapt type="org.eclipse.core.resources.IProject" >
+		               <test
+		                     property="org.eclipse.core.resources.projectNature"
+		                     value="org.eclipse.linuxtools.cdt.autotools.core.autotoolsNatureV2"/>
+		            </adapt>
+				</not>
+		 	</and>
+         </enablement>
+      </commonWizard>
+  </extension>
+  <extension
+        point="org.eclipse.ui.navigator.viewer">
+     <viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
+        <includes>
+           <contentExtension pattern="org.eclipse.linuxtools.cdt.autotools.ui.wizards.*"/>
+        </includes>
+     </viewerContentBinding>
+  </extension> 
+  -->
+   <extension
+         id="org.eclipse.linuxtools.cdt.autotools.ui.popup1"
+         point="org.eclipse.ui.popupMenus">
+      <objectContribution
+            adaptable="true"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.objectContribution.autoconf"
+            nameFilter="configure.ac"
+            objectClass="org.eclipse.core.resources.IResource">
+         <action
+               class="org.eclipse.linuxtools.internal.cdt.autotools.ui.actions.InvokeAutoconfAction"
+               enablesFor="1"
+               id="org.eclipse.linuxtools.cdt.autotools.ui.action.autoconf1"
+               label="%InvokeAutoconf.label"
+               menubarPath="additions">
+         </action>
+      </objectContribution>
+      <objectContribution
+            adaptable="true"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.objectContribution.autoconf2"
+            nameFilter="configure.in"
+            objectClass="org.eclipse.core.resources.IResource">
+         <action
+               class="org.eclipse.linuxtools.internal.cdt.autotools.ui.actions.InvokeAutoconfAction"
+               enablesFor="1"
+               id="org.eclipse.linuxtools.cdt.autotools.ui.action2"
+               label="%InvokeAutoconf.label"
+               menubarPath="additions">
+         </action>
+      </objectContribution>
+   </extension>
+   <extension
+         point="org.eclipse.cdt.core.CBuildConsole">
+      <CBuildConsole
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.CConfigureConsole"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.configureConsole"/>
+      <CBuildConsole
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.CBuildStepsConsole"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.buildStepsConsole">
+      </CBuildConsole>
+      <CBuildConsole
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.AutotoolsConsole"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.autotoolsConsole">
+      </CBuildConsole>
+   </extension>
+   <extension point="org.eclipse.core.contenttype.contentTypes">
+	  <!-- declares a content type for automake files -->
+	  <content-type id="org.eclipse.linuxtools.cdt.autotools.ui.automake" name="%Automake.name" 
+		  base-type="org.eclipse.core.runtime.text"
+		  priority="high"/>
+  </extension>
+   <extension point="org.eclipse.core.contenttype.contentTypes"> 
+      <file-association 
+       content-type="org.eclipse.linuxtools.cdt.autotools.ui.automake"
+       file-names="Makefile.am"
+       file-extensions="am"/>
+   </extension>
+   <extension
+         point="org.eclipse.ui.editors">
+      <editor
+            class="org.eclipse.linuxtools.cdt.autotools.ui.editors.AutoconfEditor"
+            contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor"
+            default="true"
+            extensions="m4"
+            filenames="configure.in,configure.ac"
+            icon="icons/autoconf.gif"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.editor.autoconf"
+            name="%Autoconf.editor.name"/>
+   </extension>
+      <extension
+         id="org.eclipse.cdt.make.editor"
+         name="MakefileEditor"
+         point="org.eclipse.ui.editors">
+      <editor
+            name="%AutomakeEditor.name"
+            icon="icons/automake.gif"
+            contributorClass="org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.MakefileEditorActionContributor"
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.AutomakeEditor"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.editors.AutomakeEditor"
+            filenames="Makefile.am,Makefile.in">
+            <contentTypeBinding contentTypeId="org.eclipse.linuxtools.cdt.autotools.ui.automake"/>
+      </editor>
+   </extension>
+   <extension
+         point="org.eclipse.ui.contexts">
+      <context
+            description="%ACeditor.scope.description"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.editor.scope"
+            name="%ACeditor.scope.name"
+            parentId="org.eclipse.ui.textEditorScope"/>
+   </extension>
+   <extension
+         point="org.eclipse.ui.bindings">
+      <key
+            commandId="org.eclipse.linuxtools.cdt.autotools.ui.editors.text.show.tooltip"
+            contextId="org.eclipse.linuxtools.cdt.autotools.ui.editor.scope"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+            sequence="F2"/>
+   </extension>
+   <extension
+         point="org.eclipse.ui.commands">
+      <category
+            description="%CommandCategorySource.description"
+            id="org.eclipse.linuxtools.cdt.ui.category.source"
+            name="%CommandCategorySource.name"/>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.ui.category.source"
+            description="%ShowTooltip.description"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.editors.text.show.tooltip"
+            name="%ShowTooltip.name"/>
+   </extension>
+   <extension
+         id="parsefileerror"
+         name="Autotools Parse Error Marker"
+         point="org.eclipse.core.resources.markers">
+      <super type="org.eclipse.core.resources.problemmarker"/>
+      <super type="org.eclipse.core.resources.textmarker"/>
+      <persistent value="true"/>
+   </extension>
+   <extension
+         id="outlineparsefileerror"
+         name="Autotools Outline Page Parse Error"
+         point="org.eclipse.core.resources.markers">
+      <super type="org.eclipse.core.resources.problemmarker"/>
+      <super type="org.eclipse.core.resources.textmarker"/>
+      <persistent value="true"/>
+   </extension>
+   <extension
+         id="org.eclipse.linuxtools.cdt.autoconf.docsetup"
+         name="Autoconf Editor Setup"
+         point="org.eclipse.core.filebuffers.documentSetup">
+      <participant
+            class="org.eclipse.linuxtools.cdt.autotools.ui.editors.AutoconfDocumentSetupParticipant"
+            extensions="m4"
+            fileNames="configure.in,configure.ac"/>
+   </extension>
+   <extension
+         point="org.eclipse.ui.preferencePages">
+      <page
+            category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutotoolsPreferencePage"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.preferences1"
+            name="%PreferenceAutotools.name">
+      </page>
+      <page
+            category="org.eclipse.linuxtools.cdt.autotools.ui.preferences1"
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutomakeEditorPreferencePage"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.preferences.automake.editor1"
+            name="%PreferenceAutomakeEditor.name">
+      </page>
+      <page
+            category="org.eclipse.linuxtools.cdt.autotools.ui.preferences1"
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutoconfEditorPreferencePage"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.preferences.autoconf.editor1"
+            name="%PreferenceAutoconfEditor.name">
+      </page>
+   </extension>
+   <extension
+         point="org.eclipse.cdt.ui.cPropertyTab">
+      <tab
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.properties.AutotoolsBuildPropertyPage"
+            icon="icons/autoconf.gif"
+            name="%AutotoolsBuildPropertyTab.name"
+            parent="org.eclipse.linuxtools.internal.cdt.autotools.ui.properties.AutotoolsHeadPropertyPage"
+            tooltip="%PropertyTabBuild.tooltip"
+            weight="002">
+      </tab>
+      <tab
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.properties.AutotoolsEditorPropertyTab"
+            name="%AutotoolsEditorsPropertyTab.name"
+            parent="org.eclipse.linuxtools.internal.cdt.autotools.ui.properties.AutotoolsGeneralPropertyPage">
+      </tab>
+      <tab
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.properties.AutotoolsToolsPropertyTab"
+            name="%AutotoolsToolsPropertyTab.name"
+            parent="org.eclipse.linuxtools.internal.cdt.autotools.ui.properties.AutotoolsGeneralPropertyPage">
+      </tab>
+      <tab
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.properties.AutotoolsConfigurePropertyTab"
+            name="%AutotoolsConfigurePropertyTab.name"
+            parent="org.eclipse.linuxtools.internal.cdt.autotools.ui.properties.AutotoolsConfigurePropertyPage">
+      </tab>
+   </extension>
+   <extension
+         point="org.eclipse.ui.propertyPages">
+       <page
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.properties.AutotoolsHeadPropertyPage"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.propertypage"
+            name="%PropertyAutotools.name"
+            >
+          <filter
+               name="projectNature"
+               value="org.eclipse.linuxtools.cdt.autotools.core.autotoolsNatureV2">
+          </filter>
+          <enabledWhen>
+             <or>
+		       <instanceof value="org.eclipse.core.resources.IProject"/>
+		       <instanceof value="org.eclipse.cdt.core.model.ICProject"/>
+		     
+		       <instanceof value="org.eclipse.core.resources.IFolder"/>
+		       <instanceof value="org.eclipse.cdt.core.model.ICContainer"/>
+
+         	   <instanceof value="org.eclipse.cdt.core.model.ITranslationUnit"/>
+	           <instanceof value="org.eclipse.core.resources.IFile"/>
+		     </or>          
+          </enabledWhen>
+       </page>
+       <page
+            category="org.eclipse.linuxtools.cdt.autotools.ui.propertypage"
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.properties.AutotoolsGeneralPropertyPage"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.propertypage2"
+            name="%PropertyAutotools.general.name">
+          <filter
+               name="projectNature"
+               value="org.eclipse.linuxtools.cdt.autotools.core.autotoolsNatureV2">
+          </filter>
+       </page>
+       <page
+            category="org.eclipse.linuxtools.cdt.autotools.ui.propertypage"
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.properties.AutotoolsConfigurePropertyPage"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.propertypage3"
+            name="%PropertyAutotools.configure.name">
+          <filter
+               name="projectNature"
+               value="org.eclipse.linuxtools.cdt.autotools.core.autotoolsNatureV2">
+          </filter>
+      </page>
+    </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            locationURI="menu:project?after=additions">
+         <menu
+               id="invokeAutotools"
+               label="%InvokeAutotools.label"
+               mnemonic="%InvokeAutotools.mnemonic">
+            <visibleWhen
+                  checkEnabled="false">
+               <and>
+                  <count
+                        value="1">
+                  </count>
+                  <iterate
+                        ifEmpty="false"
+                        operator="and">
+                     <adapt
+                           type="org.eclipse.core.resources.IResource">
+                        <test
+                              property="org.eclipse.core.resources.projectNature"
+                              value="org.eclipse.linuxtools.cdt.autotools.core.autotoolsNatureV2">
+                        </test>
+                     </adapt>
+                  </iterate>
+               </and>
+            </visibleWhen>
+         </menu>
+      </menuContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            locationURI="menu:project?after=additions">
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.reconfigure"
+               id="reconfigure"
+               label="%Reconfigure.label"
+               mnemonic="%Reconfigure.mnemonic"
+               style="push">
+            <visibleWhen
+                  checkEnabled="false">
+               <and>
+                  <count
+                        value="1">
+                  </count>
+                  <iterate
+                        ifEmpty="false"
+                        operator="and">
+                     <adapt
+                           type="org.eclipse.core.resources.IResource">
+                        <test
+                              property="org.eclipse.core.resources.projectNature"
+                              value="org.eclipse.linuxtools.cdt.autotools.core.autotoolsNatureV2">
+                        </test>
+                     </adapt>
+                  </iterate>
+               </and>
+            </visibleWhen>
+         </command>
+       </menuContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            locationURI="menu:invokeAutotools">
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.autoconf"
+               id="autoconf"
+               label="%InvokeAutoconf.label"
+               mnemonic="%InvokeAutoconf.mnemonic"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.autoheader"
+               id="autoheader"
+               label="%InvokeAutoheader.label"
+               mnemonic="%InvokeAutoheader.mnemonic"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.automake"
+               id="automake"
+               label="%InvokeAutomake.label"
+               mnemonic="%InvokeAutomake.mnemonic"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.autoreconf"
+               id="autoreconf"
+               label="%InvokeAutoreconf.label"
+               mnemonic="%InvokeAutoreconf.mnemonic"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.aclocal"
+               id="aclocal"
+               label="%InvokeAclocal.label"
+               mnemonic="%InvokeAclocal.mnemonic"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.libtoolize"
+               id="libtoolize"
+               label="%InvokeLibtoolize.label"
+               mnemonic="%InvokeLibtoolize.mnemonic"
+               style="push">
+         </command>
+      </menuContribution>
+   </extension>
+   <extension
+         id="org.eclipse.linuxtools.cdt.autotools.ui.commands"
+         name="Autoconf"
+         point="org.eclipse.ui.commands">
+      <category
+            id="org.eclipse.linuxtools.cdt.autotools.ui.category.invokeAutotools"
+            name="%InvokeAutotools.label">
+      </category>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.ui.category.invokeAutotools"
+            description="%InvokeAutoconf.description"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.command.autoconf"
+            name="%InvokeAutoconf.label">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.ui.category.invokeAutotools"
+            description="%InvokeAutoheader.description"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.command.autoheader"
+            name="%InvokeAutoheader.label">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.ui.category.invokeAutotools"
+            description="%InvokeAutomake.description"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.command.automake"
+            name="%InvokeAutomake.label">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.ui.category.invokeAutotools"
+            description="%InvokeAutoreconf.description"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.command.autoreconf"
+            name="%InvokeAutoreconf.label">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.ui.category.invokeAutotools"
+            description="%InvokeAclocal.description"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.command.aclocal"
+            name="%InvokeAclocal.label">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.ui.category.invokeAutotools"
+            description="%InvokeLibtoolize.description"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.command.libtoolize"
+            name="%InvokeLibtoolize.label">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.ui.category.invokeAutotools"
+            description="%Reconfigure.description"
+            id="org.eclipse.linuxtools.cdt.autotools.ui.command.reconfigure"
+            name="%Reconfigure.label">
+      </command>
+   </extension>
+    <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.actions.AutoconfHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.autoconf">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.actions.AutoheaderHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.autoheader">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.actions.AutomakeHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.automake">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.actions.AutoreconfHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.autoreconf">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.actions.AclocalHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.aclocal">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.actions.LibtoolizeHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.libtoolize">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.actions.ReconfigureHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.ui.command.reconfigure">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+   </extension>
+    <extension
+          point="org.eclipse.cdt.core.templates">
+       <template
+             id="org.eclipse.linuxtools.cdt.autotools.ui.template.emptyProject"
+             location="templates/projecttemplates/EmptyProject/template.xml"
+             projectType="org.eclipse.linuxtools.cdt.autotools.core.projectType">
+       </template>
+       <template
+             filterPattern=".*gcc"
+             id="org.eclipse.linuxtools.cdt.autotools.ui.template.helloWorldCProject"
+             location="templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml"
+             projectType="org.eclipse.linuxtools.cdt.autotools.core.projectType">
+       </template>
+       <template
+             filterPattern=".*g\+\+"
+             id="org.eclipse.linuxtools.cdt.autotools.ui.template.helloWorldCPPProject"
+             location="templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml"
+             projectType="org.eclipse.linuxtools.cdt.autotools.core.projectType">
+       </template>
+    </extension>
+    <extension
+          point="org.eclipse.cdt.ui.CDTWizard">
+       <wizard
+             class="org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards.AutotoolsBuildWizard"
+             name="%Autotools.wizard.name">
+       </wizard>
+    </extension>
+</plugin>
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/AutotoolsUIPlugin.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/AutotoolsUIPlugin.java
new file mode 100644
index 0000000..0f80cee
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/AutotoolsUIPlugin.java
@@ -0,0 +1,257 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui;
+
+import java.lang.reflect.InvocationTargetException;
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class AutotoolsUIPlugin extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.cdt.autotools.ui"; //$NON-NLS-1$
+
+	// The shared instance
+	private static AutotoolsUIPlugin plugin;
+	
+	private ResourceBundle resourceBundle;
+	
+	/**
+	 * The constructor.
+	 */
+	public AutotoolsUIPlugin() {
+		plugin = this;
+		try {
+			resourceBundle = ResourceBundle.getBundle(PLUGIN_ID + ".Resources"); //$NON-NLS-1$
+		} catch (MissingResourceException x) {
+			resourceBundle = null;
+		}
+
+	}
+
+	public static String getPluginId() {
+		return PLUGIN_ID;
+	}
+	
+	public static String getUniqueIdentifier() {
+		if (getDefault() == null) {
+			// If the default instance is not yet initialized,
+			// return a static identifier. This identifier must
+			// match the plugin id defined in plugin.xml
+			return PLUGIN_ID;
+		}
+		return getDefault().getBundle().getSymbolicName();
+	}
+
+	/**
+	 * This method is called upon plug-in activation
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+	}
+
+	/**
+	 * This method is called when the plug-in is stopped
+	 */
+	public void stop(BundleContext context) throws Exception {
+		super.stop(context);
+		plugin = null;
+	}
+
+	/**
+	 * Returns the shared instance.
+	 */
+	public static AutotoolsUIPlugin getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Returns active shell.
+	 */
+	public static Shell getActiveWorkbenchShell() {
+		IWorkbenchWindow window = getDefault().getWorkbench().getActiveWorkbenchWindow();
+		if (window != null) {
+			return window.getShell();
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the string from the plugin's resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @return the resource bundle message
+	 */
+	public static String getResourceString(String key) {
+		ResourceBundle bundle = AutotoolsUIPlugin.getDefault().getResourceBundle();
+		try {
+			return bundle.getString(key);
+		} catch (MissingResourceException e) {
+			return key;
+		}
+	}
+
+	/**
+	 * Returns the string from the plugin's resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @param args an array of substituition strings
+	 * @return the resource bundle message
+	 */
+	public static String getFormattedString(String key, String[] args) {
+		return MessageFormat.format(getResourceString(key), (Object[])args);
+	}
+
+	/**
+	 * Returns the plugin's resource bundle,
+	 */
+	public ResourceBundle getResourceBundle() {
+		return resourceBundle;
+	}
+
+	/**
+	 * Returns an image descriptor for the image file at the given
+	 * plug-in relative path.
+	 *
+	 * @param path the path
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
+	}
+	
+	public static void log(IStatus status) {
+		ResourcesPlugin.getPlugin().getLog().log(status);
+	}
+
+	public static void logErrorMessage(String message) {
+		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, message, null));
+	}
+
+	public static void logException(Throwable e, final String title, String message) {
+		if (e instanceof InvocationTargetException) {
+			e = ((InvocationTargetException) e).getTargetException();
+		}
+		IStatus status = null;
+		if (e instanceof CoreException)
+			status = ((CoreException) e).getStatus();
+		else {
+			if (message == null)
+				message = e.getMessage();
+			if (message == null)
+				message = e.toString();
+			status = new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.OK, message, e);
+		}
+		ResourcesPlugin.getPlugin().getLog().log(status);
+		Display display;
+		display = Display.getCurrent();
+		if (display == null)
+			display = Display.getDefault();
+		final IStatus fstatus = status;
+		display.asyncExec(new Runnable() {
+			public void run() {
+				ErrorDialog.openError(null, title, null, fstatus);
+			}
+		});
+	}
+
+	public static void logException(Throwable e) {
+		logException(e, null, null);
+	}
+
+	public static void log(Throwable e) {
+		if (e instanceof InvocationTargetException)
+			e = ((InvocationTargetException) e).getTargetException();
+		IStatus status = null;
+		if (e instanceof CoreException)
+			status = ((CoreException) e).getStatus();
+		else
+			status = new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.OK, e.getMessage(), e);
+		log(status);
+	}
+
+	/**
+	* Utility method with conventions
+	*/
+	public static void errorDialog(Shell shell, String title, String message, IStatus s) {
+		log(s);
+		// if the 'message' resource string and the IStatus' message are the same,
+		// don't show both in the dialog
+		if (s != null && message.equals(s.getMessage())) {
+			message = null;
+		}
+		ErrorDialog.openError(shell, title, message, s);
+	}
+
+	/**
+	* Utility method with conventions
+	*/
+	public static void errorDialog(Shell shell, String title, String message, Throwable t) {
+		log(t);
+		IStatus status;
+		if (t instanceof CoreException) {
+			status = ((CoreException) t).getStatus();
+			// if the 'message' resource string and the IStatus' message are the same,
+			// don't show both in the dialog
+			if (status != null && message.equals(status.getMessage())) {
+				message = null;
+			}
+		} else {
+			status = new Status(IStatus.ERROR, AutotoolsUIPlugin.getUniqueIdentifier(), -1, "Internal Error: ", t); //$NON-NLS-1$	
+		}
+		ErrorDialog.openError(shell, title, message, status);
+	}
+	
+	/**
+	 * Returns the workspace instance.
+	 */
+	public static IWorkspace getWorkspace() {
+		return ResourcesPlugin.getWorkspace();
+	}
+
+	/**
+	 * Returns the active workbench window or <code>null</code> if none
+	 */
+	public static IWorkbenchWindow getActiveWorkbenchWindow() {
+		return getDefault().getWorkbench().getActiveWorkbenchWindow();
+	}
+
+	/**
+	 * Returns the active workbench page or <code>null</code> if none.
+	 */
+	public static IWorkbenchPage getActivePage() {
+		IWorkbenchWindow window= getActiveWorkbenchWindow();
+		if (window != null) {
+			return window.getActivePage();
+		}
+		return null;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/Resources.properties b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/Resources.properties
new file mode 100644
index 0000000..84ce7c0
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/Resources.properties
@@ -0,0 +1,105 @@
+#################################################################################
+#  Copyright (c) 2006, 2007, 2009 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+# 
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#      IBM Rational Software - ManagedMakeMessages copied to AutotoolsMakefileBuilder
+#################################################################################
+MakeCWizard.title=C/Make Project
+MakeCWizard.description=Create a New C Project using 'make' to build it
+
+WARNING_UNSUPPORTED_CONFIGURATION=Warning: unsupported configuration
+
+AutotoolsMakefileBuilder.message.finished=Build complete for project {0}
+AutotoolsMakefileBuilder.message.stopped=Build stopped
+AutotoolsMakefileBuilder.type.clean=Clean-only build
+AutotoolsMakefileBuilder.message.clean.deleting.output=Removing build artifacts from {0}
+AutotoolsMakefileBuilder.message.console.header=**** {0} of configuration {1} for project {2} ****
+
+MakeGenerator.makefile.built=Makefile built
+MakeGenerator.refresh=Refresh
+MakeGenerator.refresh.error=Refresh error
+MakeGenerator.generation.error=Configuration failed with error
+MakeGenerator.configuring=Configuring
+MakeGenerator.make.message=Invoking {0} for project {1}
+MakeGenerator.config.error=Error {0} occurred while running {1}
+MakeGenerator.createdir.error=Error creating build directory: {0}
+MakeGenerator.run.config.status=Running config.status in build directory: {0}
+MakeGenerator.makefile.cvs=Invoking Makefile.cvs in build directory: {0}
+MakeGenerator.autogen.sh=Invoking autogen.sh in build directory: {0}
+MakeGenerator.autoreconf=Invoking autoreconf in directory: {0}
+MakeGenerator.gen.makefile=Generating Makefile in build directory: {0}
+MakeGenerator.clean.builddir=Cleaning build directory: {0}
+MakeGenerator.gen.configure=Generating configure
+MakeGenerator.unsupportedConfig=Warning: unsupported configuration {0}
+MakeGenerator.success=[Operation successful]
+MakeGenerator.didnt.generate=No Makefile generated
+MakeGenerator.refresh.MakeTargets=Refreshing Make Targets
+
+BuildDir.apply=Build directory already in use
+BuildDir.default=Default build directory to unused value?
+BuildDir.yes=Yes
+BuildDir.no=No
+
+WizardAutotoolsProjectConversion.title=Convert to C/C++ Autotools Project
+WizardAutotoolsProjectConversion.description=Convert an existing Project to a C/C++ Autotools Project
+WizardAutotoolsProjectConversion.message.add_nature=Adding C/C++ Autotools Managed Project Nature
+WizardAutotoolsProjectConversion.message.add_builder=Adding C/C++ Autotools Managed Project Builder
+WizardMakeProjectConversion.monitor.convertingToMakeProject=Converting Project...
+WizardAutotoolsConversion=C/C++ Autotools Conversion
+WizardAutotoolsConversion.windowTitle=Conversion to a C/C++ Autotools Project
+WizardAutotoolsConversion.config.title=Select a configuration
+WizardAutotoolsConversion.config.desc=Select the configuration you wish to deploy on
+WizardAutotoolsConversion.options.title=Additional Project Settings
+WizardAutotoolsConversion.options.desc=Define the inter-project dependencies, if any.
+WizardAutotoolsConversion.message.save=Saving new build options
+
+WizardAutotoolsNewCProject.title=Autotools C Project
+WizardAutotoolsNewCProject.description=Create a new C Autotools project
+WizardAutotoolsNewCProject.monitor.creatingProject=Creating Project...
+WizardAutotoolsNewCProject.windowTitle=GNU Autotools C Project
+WizardAutotoolsNewCProject.config.title=Select a configuration
+WizardAutotoolsNewCProject.config.desc=Select the configuration you wish to deploy on
+WizardAutotoolsNewCProject.options.title=Additional Project Settings
+WizardAutotoolsNewCProject.options.desc=Define the inter-project dependencies, if any.
+WizardAutotoolsNewCProject.message.save=Saving new build options
+
+WizardAutotoolsNewCProjectV2.title=Autotools C Project V2
+WizardAutotoolsNewCProjectV2.description=Create a new C Autotools project
+WizardAutotoolsNewCProjectV2.monitor.creatingProject=Creating Project...
+WizardAutotoolsNewCProjectV2.windowTitle=GNU Autotools C Project V2
+WizardAutotoolsNewCProjectV2.config.title=Select a configuration
+WizardAutotoolsNewCProjectV2.config.desc=Select the configuration you wish to deploy on
+WizardAutotoolsNewCProjectV2.options.title=Additional Project Settings
+WizardAutotoolsNewCProjectV2.options.desc=Define the inter-project dependencies, if any.
+WizardAutotoolsNewCProjectV2.message.save=Saving new build options
+
+WizardAutotoolsNewCCProject.title=Autotools C++ Project
+WizardAutotoolsNewCCProject.description=Create a new C++ Autotools project
+WizardAutotoolsNewCCProject.monitor.creatingProject=Creating Project...
+WizardAutotoolsNewCCProject.windowTitle=GNU Autotools C++ Project
+WizardAutotoolsNewCCProject.config.title=Select a configuration
+WizardAutotoolsNewCCProject.config.desc=Select the configuration you wish to deploy on
+WizardAutotoolsNewCCProject.options.title=Additional Project Settings
+WizardAutotoolsNewCCProject.options.desc=Define the inter-project dependencies, if any.
+WizardAutotoolsNewCCProject.message.save=Saving new build options
+
+
+BuildTargetDialog.title.buildTarget=Build Special Targets
+BuildTargetDialog.title.makeTargetsFor=Make targets for 
+BuildTargetDialog.button.build=Build
+
+TargetListViewer.button.add=Add...
+TargetListViewer.button.remove=Remove
+TargetListViewer.button.edit=Edit...
+TargetListViewer.label.target=Target
+TargetListViewer.label.location=Location
+TargetListViewer.exception.error=Error
+TargetListViewer.exception.message=An error occurred performing the selected action
+
+AutotoolsPreferencePage.useAutotoolsFileScanner.label=Use make -w for includepath scanning
+MakeTargetPreferencePage.buildTargetInBackground.label=Build target in background
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfAnnotationHover.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfAnnotationHover.java
new file mode 100644
index 0000000..444cef3
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfAnnotationHover.java
@@ -0,0 +1,202 @@
+/*******************************************************************************
+ * Copyright (c) 2000 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.DefaultInformationControl;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IInformationControl;
+import org.eclipse.jface.text.IInformationControlCreator;
+import org.eclipse.jface.text.Position;
+import org.eclipse.jface.text.source.IAnnotationHover;
+import org.eclipse.jface.text.source.IAnnotationHoverExtension;
+import org.eclipse.jface.text.source.IAnnotationModel;
+import org.eclipse.jface.text.source.ILineRange;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.LineRange;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.HTMLPrinter;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.texteditor.MarkerAnnotation;
+
+
+public class AutoconfAnnotationHover implements IAnnotationHover, IAnnotationHoverExtension {
+	
+	/**
+	 * Returns the distance to the ruler line.
+	 */
+	protected int compareRulerLine(Position position, IDocument document, int line) {
+		
+		if (position.getOffset() > -1 && position.getLength() > -1) {
+			try {
+				int markerLine= document.getLineOfOffset(position.getOffset());
+				if (line == markerLine)
+					return 1;
+				if (markerLine <= line && line <= document.getLineOfOffset(position.getOffset() + position.getLength()))
+					return 2;
+			} catch (BadLocationException x) {
+			}
+		}
+		
+		return 0;
+	}
+	
+	/**
+	 * Selects a set of markers from the two lists. By default, it just returns
+	 * the set of exact matches.
+	 */
+	protected List<IMarker> select(List<IMarker> exactMatch, List<IMarker> including) {
+		return exactMatch;
+	}
+
+	/**
+	 * Returns one marker which includes the ruler's line of activity.
+	 */
+	@SuppressWarnings("unchecked")
+	protected List<IMarker> getMarkersForLine(ISourceViewer viewer, int line) {
+		
+		IDocument document= viewer.getDocument();
+		IAnnotationModel model= viewer.getAnnotationModel();
+		
+		if (model == null)
+			return null;
+			
+		List<IMarker> exact= new ArrayList<IMarker>();
+		List<IMarker> including= new ArrayList<IMarker>();
+		
+		Iterator e= model.getAnnotationIterator();
+		while (e.hasNext()) {
+			Object o= e.next();
+			if (o instanceof MarkerAnnotation) {
+				MarkerAnnotation a= (MarkerAnnotation) o;
+				switch (compareRulerLine(model.getPosition(a), document, line)) {
+					case 1:
+						exact.add(a.getMarker());
+						break;
+					case 2:
+						including.add(a.getMarker());
+						break;
+				}
+			}
+		}
+		
+		return select(exact, including);
+	}
+
+	/*
+	 * @see IVerticalRulerHover#getHoverInfo(ISourceViewer, int)
+	 */
+	public String getHoverInfo(ISourceViewer sourceViewer, int lineNumber) {
+		List<IMarker> markers= getMarkersForLine(sourceViewer, lineNumber);
+		if (markers != null && markers.size() > 0) {
+			
+			if (markers.size() == 1) {
+				
+				// optimization
+				IMarker marker= (IMarker) markers.get(0);
+				String message= marker.getAttribute(IMarker.MESSAGE, (String) null);
+				if (message != null && message.trim().length() > 0)
+					return formatSingleMessage(message);
+					
+			} else {
+					
+				List<String> messages= new ArrayList<String>();
+				
+				Iterator<IMarker> e= markers.iterator();
+				while (e.hasNext()) {
+					IMarker marker= (IMarker) e.next();
+					String message= marker.getAttribute(IMarker.MESSAGE, (String) null);
+					if (message != null && message.trim().length() > 0)
+						messages.add(message.trim());
+				}
+				
+				if (messages.size() == 1)
+					return formatSingleMessage((String) messages.get(0));
+					
+				if (messages.size() > 1)
+					return formatMultipleMessages(messages);
+			}
+		}
+		
+		return null;
+	}
+		
+	
+//	private int getHoverWidth(Display display) {
+//		Rectangle displayBounds= display.getBounds();
+//		int hoverWidth= displayBounds.width - (display.getCursorLocation().x - displayBounds.x);
+//		hoverWidth-= 12; // XXX: Add some space to the border, Revisit
+//		if (hoverWidth < 200) {
+//			hoverWidth= 200;
+//		}
+//		return hoverWidth;
+//	}	
+	
+	/*
+	 * Formats a message as HTML text.
+	 */
+	private String formatSingleMessage(String message) {
+		StringBuffer buffer= new StringBuffer();
+		HTMLPrinter.addPageProlog(buffer);
+		HTMLPrinter.addParagraph(buffer, HTMLPrinter.convertToHTMLContent(message));
+		HTMLPrinter.addPageEpilog(buffer);
+		return buffer.toString();
+	}
+	
+	/*
+	 * Formats several message as HTML text.
+	 */
+	private String formatMultipleMessages(List<String> messages) {
+		StringBuffer buffer= new StringBuffer();
+		HTMLPrinter.addPageProlog(buffer);
+		HTMLPrinter.addParagraph(buffer, HTMLPrinter.convertToHTMLContent(AutoconfEditorMessages.getString("AutoconfAnnotationHover.multipleMarkers"))); //$NON-NLS-1$
+		
+		HTMLPrinter.startBulletList(buffer);
+		Iterator<String> e= messages.iterator();
+		while (e.hasNext())
+			HTMLPrinter.addBullet(buffer, HTMLPrinter.convertToHTMLContent((String) e.next()));
+		HTMLPrinter.endBulletList(buffer);	
+		
+		HTMLPrinter.addPageEpilog(buffer);
+		return buffer.toString();
+	}
+	
+	// IAnnotationHoverExtension members
+	// We need to use the extension to get a Hover Control Creator which
+	// handles html.
+	
+	
+	public IInformationControlCreator getHoverControlCreator() {
+		return new IInformationControlCreator() {
+			public IInformationControl createInformationControl(Shell parent) {
+				return new DefaultInformationControl(parent, false);
+			}
+		};
+	}
+	
+	public boolean canHandleMouseCursor() {
+		return false;
+	}
+	
+	public ILineRange getHoverLineRange(ISourceViewer viewer, int lineNumber) {
+		return new LineRange(lineNumber, 1);
+	}
+	
+	public Object getHoverInfo(ISourceViewer sourceViewer, ILineRange lineRange, int visibleNumberOfLines) {
+		return getHoverInfo(sourceViewer, lineRange.getStartLine());
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfCodeScanner.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfCodeScanner.java
new file mode 100644
index 0000000..51e7e9e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfCodeScanner.java
@@ -0,0 +1,256 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat, Inc., (c) 2008 NOKIA Inc
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *     Ed Swartz (NOKIA) - updates
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.resource.StringConverter;
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.rules.EndOfLineRule;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
+import org.eclipse.jface.text.rules.SingleLineRule;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.jface.text.rules.WhitespaceRule;
+import org.eclipse.jface.text.rules.WordRule;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutotoolsEditorPreferenceConstants;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.ColorManager;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+
+
+public class AutoconfCodeScanner extends RuleBasedScanner {
+
+	private Map<String, IToken> fTokenMap= new HashMap<String, IToken>();
+	private String[] fPropertyNamesColor;
+	
+	/**
+	 * Preference keys for boolean preferences which are <code>true</code>,
+	 * iff the corresponding token should be rendered bold. 
+	 */
+	private String[] fPropertyNamesBold;
+	/**
+	 * Preference keys for boolean preferences which are <code>true</code>,
+	 * iff the corresponding token should be rendered italic.
+	 */
+	private String[] fPropertyNamesItalic;
+
+	private static String[] keywords = { 
+		"case", "do", "done", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
+		"esac",	"if", "elif", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		"else",	"fi", "for",  //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		"in", "then" };       //$NON-NLS-1$ //$NON-NLS-2$
+
+	public static final String[] fTokenProperties = new String[] {
+		ColorManager.AUTOCONF_COMMENT_COLOR,
+		ColorManager.AUTOCONF_KEYWORD_COLOR,
+		ColorManager.AUTOCONF_ACMACRO_COLOR,
+		ColorManager.AUTOCONF_AMMACRO_COLOR,
+		ColorManager.AUTOCONF_VAR_REF_COLOR,
+		ColorManager.AUTOCONF_VAR_SET_COLOR,
+		ColorManager.AUTOCONF_CODESEQ_COLOR,
+		ColorManager.AUTOCONF_DEFAULT_COLOR,
+	};
+
+	public AutoconfCodeScanner() {
+		
+		initialize();
+		
+		IToken other= getToken(ColorManager.AUTOCONF_DEFAULT_COLOR);
+		IToken keyword = getToken(ColorManager.AUTOCONF_KEYWORD_COLOR);
+		IToken comment= getToken(ColorManager.AUTOCONF_COMMENT_COLOR);
+		IToken string = getToken(ColorManager.AUTOCONF_DEFAULT_COLOR);
+		IToken varRef = getToken(ColorManager.AUTOCONF_VAR_REF_COLOR);
+		IToken acmacro = getToken(ColorManager.AUTOCONF_ACMACRO_COLOR);
+		IToken ammacro = getToken(ColorManager.AUTOCONF_AMMACRO_COLOR);
+		IToken code = getToken(ColorManager.AUTOCONF_CODESEQ_COLOR);
+		
+		List<IRule> rules= new ArrayList<IRule>();
+
+		// Add rule for single line comments.
+		rules.add(new EndOfLineRule("dnl", comment)); //$NON-NLS-1$
+		rules.add(new EndOfLineRule("#", comment, '\\')); //$NON-NLS-1$
+		
+		// Add special recursive rule for strings which allows variable
+		// references to be internally tokenized.
+		RecursiveSingleLineRule stringRule =
+			new RecursiveSingleLineRule("\"", "\"", string, '\\'); //$NON-NLS-1$ //$NON-NLS-2$
+		stringRule.addRule(new SingleLineRule("${", "}", varRef)); //$NON-NLS-1$ //$NON-NLS-2$
+		rules.add(stringRule);
+		
+		// Add rule for variable references
+		rules.add(new SingleLineRule("${", "}", varRef)); //$NON-NLS-1$ //$NON-NLS-2$
+		// Add rule for strings
+		rules.add(new SingleLineRule("\"", "\"", string, '\\')); //$NON-NLS-1$ //$NON-NLS-2$
+
+		// Add rule for PKG_ macros
+		rules.add(new AutoconfMacroRule("PKG_", new AutoconfPKGWordDetector(), acmacro)); //$NON-NLS-1$
+
+		// Add rule for AC_ macros
+		rules.add(new AutoconfMacroRule("AC_", new AutoconfMacroWordDetector(), acmacro)); //$NON-NLS-1$
+
+		// Add rule for AM_ macros
+		rules.add(new AutoconfMacroRule("AM_", new AutoconfMacroWordDetector(), ammacro)); //$NON-NLS-1$
+
+		// Add rule for m4_ macros
+		rules.add(new AutoconfMacroRule("m4_", new AutoconfM4WordDetector(), acmacro)); //$NON-NLS-1$
+		
+		// Add rule for code sequences starting with <<EOF and ending with EOF
+		rules.add(new InlineDataRule(code));
+		
+		// Add word rule for keywords.
+		WordRule wordRule= new WordRule(new AutoconfWordDetector(), Token.UNDEFINED);
+		for (int i= 0; i < keywords.length; i++)
+			wordRule.addWord(keywords[i], keyword);
+		rules.add(wordRule);
+		
+		// Add word rule for identifier.
+		rules.add(new AutoconfIdentifierRule(other));
+		
+		// Make sure we don't treat "\#" as comment start.
+		rules.add(new SingleLineRule("\\#", null, Token.UNDEFINED));
+		
+		rules.add(new WhitespaceRule(new AutoconfWhitespaceDetector()));
+		
+		setDefaultReturnToken(other);
+
+		IRule[] result= new IRule[rules.size()];
+		rules.toArray(result);
+		setRules(result);
+	}
+	
+	protected Token getToken(String key) {
+		return (Token) fTokenMap.get(key);
+	}
+
+	private void addToken(String colorKey, String boldKey, String italicKey) {
+		fTokenMap.put(colorKey, new Token(createTextAttribute(colorKey, boldKey, italicKey)));
+	}
+
+	protected String[] getTokenProperties() {
+		return fTokenProperties;
+	}
+	
+	private int indexOf(String property) {
+		if (property != null) {
+			int length= fPropertyNamesColor.length;
+			for (int i= 0; i < length; i++) {
+				if (property.equals(fPropertyNamesColor[i]) || property.equals(fPropertyNamesBold[i]) || property.equals(fPropertyNamesItalic[i]))
+					return i;
+			}
+		}
+		return -1;
+	}
+	
+	/*
+	 * @see ITokenScanner#nextToken()
+	 */
+	public IToken nextToken() {
+		return super.nextToken();
+	}
+
+	public boolean affectsBehavior(PropertyChangeEvent event) {
+		return indexOf(event.getProperty()) >= 0;
+	}
+	
+	public void adaptToPreferenceChange(PropertyChangeEvent event) {
+		String p= event.getProperty();
+		int index= indexOf(p);
+		Token token= getToken(fPropertyNamesColor[index]);
+		if (fPropertyNamesColor[index].equals(p))
+			adaptToColorChange(event, token);
+		else if (fPropertyNamesBold[index].equals(p))
+			adaptToStyleChange(event, token, SWT.BOLD);
+		else if (fPropertyNamesItalic[index].equals(p))
+			adaptToStyleChange(event, token, SWT.ITALIC);
+	}
+
+	protected void adaptToColorChange(PropertyChangeEvent event, Token token) {
+		RGB rgb= null;
+		Object value= event.getNewValue();
+		if (value instanceof RGB) {
+			rgb= (RGB) value;
+		} else if (value instanceof String) {
+			rgb= StringConverter.asRGB((String) value);
+		}
+			
+		if (rgb != null) {
+			TextAttribute attr= (TextAttribute) token.getData();
+			token.setData(new TextAttribute(ColorManager.getDefault().getColor(rgb), attr.getBackground(), attr.getStyle()));
+		}
+	}
+
+	protected void adaptToStyleChange(PropertyChangeEvent event, Token token, int styleAttribute) {
+	 	if (token == null) {
+			return;
+		}
+		boolean eventValue= false;
+		Object value= event.getNewValue();
+		if (value instanceof Boolean) {
+			eventValue= ((Boolean) value).booleanValue();
+		} else if (IPreferenceStore.TRUE.equals(value)) {
+			eventValue= true;
+		}
+		
+		TextAttribute attr= (TextAttribute) token.getData();
+		boolean activeValue= (attr.getStyle() & styleAttribute) == styleAttribute;
+		if (activeValue != eventValue) { 
+			token.setData(new TextAttribute(attr.getForeground(), attr.getBackground(), eventValue ? attr.getStyle() | styleAttribute : attr.getStyle() & ~styleAttribute));
+		}
+	}
+
+	protected TextAttribute createTextAttribute(String colorID, String boldKey, String italicKey) {
+		Color color= null;
+		if (colorID != null) {
+			color= AutoconfEditor.getPreferenceColor(colorID);
+		}
+		IPreferenceStore store= AutotoolsPlugin.getDefault().getPreferenceStore();
+		int style= store.getBoolean(boldKey) ? SWT.BOLD : SWT.NORMAL;
+		if (store.getBoolean(italicKey)) {
+			style |= SWT.ITALIC;
+		}		
+		return new TextAttribute(color, null, style);
+	}
+	
+	/**
+	 * Must be called after the constructor has been called.
+	 */
+	public final void initialize() {
+		
+		fPropertyNamesColor= getTokenProperties();
+		int length= fPropertyNamesColor.length;
+		fPropertyNamesBold= new String[length];
+		fPropertyNamesItalic= new String[length];
+
+		for (int i= 0; i < length; i++) {
+			fPropertyNamesBold[i]= fPropertyNamesColor[i] + AutotoolsEditorPreferenceConstants.EDITOR_BOLD_SUFFIX;
+			fPropertyNamesItalic[i]= fPropertyNamesColor[i] + AutotoolsEditorPreferenceConstants.EDITOR_ITALIC_SUFFIX;
+			addToken(fPropertyNamesColor[i], fPropertyNamesBold[i], fPropertyNamesItalic[i]);
+		}
+	}
+
+	/*
+	 * @see ICharacterScanner#unread()
+	 */
+	public void unread() {
+	    	--fOffset;
+	    	fColumn = UNDEFINED;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentProvider.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentProvider.java
new file mode 100644
index 0000000..dd7c38c
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentProvider.java
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import java.util.Iterator;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.ui.editors.text.TextFileDocumentProvider;
+
+public class AutoconfDocumentProvider extends TextFileDocumentProvider {
+	
+	@SuppressWarnings("unchecked")
+	public void shutdown() {
+		Iterator e= getConnectedElementsIterator();
+		while (e.hasNext())
+			disconnect(e.next());
+	}
+	
+	public void connect(Object element) throws CoreException {
+		super.connect(element);
+		// Remove all error markers for file as we will parse
+		// from scratch.
+//		AutoconfErrorHandler h = new AutoconfErrorHandler(getDocument(element));
+//		h.removeAllExistingMarkers();
+	}
+	
+	public IDocument getDocument(Object element) {
+		FileInfo info= (FileInfo) getFileInfo(element);
+		if (info != null)
+			return info.fTextFileBuffer.getDocument();
+		return getParentProvider().getDocument(element);
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentSetupParticipant.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentSetupParticipant.java
new file mode 100644
index 0000000..a3d0b1b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentSetupParticipant.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.core.filebuffers.IDocumentSetupParticipant;
+import org.eclipse.jface.text.DocumentEvent;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IDocumentExtension3;
+import org.eclipse.jface.text.IDocumentListener;
+
+public class AutoconfDocumentSetupParticipant implements
+		IDocumentSetupParticipant, IDocumentListener {
+
+	public void setup(IDocument document) {
+		AutoconfPartitioner partitioner =
+			new AutoconfPartitioner(
+				new AutoconfPartitionScanner(),
+				AutoconfPartitionScanner.AUTOCONF_PARTITION_TYPES);
+		partitioner.connect(document, 1);
+		if (document instanceof IDocumentExtension3) {
+			IDocumentExtension3 extension3= (IDocumentExtension3) document;
+			extension3.setDocumentPartitioner(AutoconfEditor.AUTOCONF_PARTITIONING, partitioner);
+		} else {
+			document.setDocumentPartitioner(partitioner);
+		}
+//		document.addDocumentListener(this);
+	}
+	
+	/*
+	 * @see IDocumentListener#documentAboutToBeChanged(DocumentEvent)
+	 */
+
+	public void documentAboutToBeChanged(DocumentEvent e) {
+		// do nothing
+	}
+	
+	/*
+	 * @see IDocumentListener#documentChanged(DocumentEvent)
+	 */
+	public void documentChanged(DocumentEvent e) {
+		// do nothing
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditor.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditor.java
new file mode 100644
index 0000000..a65cb24
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditor.java
@@ -0,0 +1,787 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import java.util.ResourceBundle;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.ListenerList;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.jface.text.AbstractInformationControlManager;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.DefaultInformationControl;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IInformationControl;
+import org.eclipse.jface.text.IInformationControlCreator;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextHover;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.ITextViewerExtension;
+import org.eclipse.jface.text.ITextViewerExtension2;
+import org.eclipse.jface.text.ITextViewerExtension4;
+import org.eclipse.jface.text.ITextViewerExtension5;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.TextUtilities;
+import org.eclipse.jface.text.information.IInformationProvider;
+import org.eclipse.jface.text.information.IInformationProviderExtension;
+import org.eclipse.jface.text.information.IInformationProviderExtension2;
+import org.eclipse.jface.text.information.InformationPresenter;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
+import org.eclipse.jface.text.source.IAnnotationHover;
+import org.eclipse.jface.text.source.IAnnotationHoverExtension;
+import org.eclipse.jface.text.source.ILineRange;
+import org.eclipse.jface.text.source.IOverviewRuler;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.ISourceViewerExtension3;
+import org.eclipse.jface.text.source.IVerticalRuler;
+import org.eclipse.jface.text.source.IVerticalRulerInfo;
+import org.eclipse.jface.text.source.projection.ProjectionAnnotationModel;
+import org.eclipse.jface.text.source.projection.ProjectionSupport;
+import org.eclipse.jface.text.source.projection.ProjectionViewer;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.outline.AutoconfContentOutlinePage;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfMacroDetector;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfParser;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.IAutoconfMacroValidator;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.autoconf.ProjectionFileUpdater;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.IReconcilingParticipant;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.MakefileEditorPreferenceConstants;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutoconfEditorPreferencePage;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutotoolsEditorPreferenceConstants;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.ColorManager;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.properties.AutotoolsPropertyManager;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.properties.IProjectPropertyListener;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.editors.text.EditorsUI;
+import org.eclipse.ui.editors.text.TextEditor;
+import org.eclipse.ui.texteditor.ChainedPreferenceStore;
+import org.eclipse.ui.texteditor.ContentAssistAction;
+import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
+import org.eclipse.ui.texteditor.ResourceAction;
+import org.eclipse.ui.texteditor.TextEditorAction;
+import org.eclipse.ui.texteditor.TextOperationAction;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+
+
+public class AutoconfEditor extends TextEditor implements IAutotoolsEditor, IProjectPropertyListener {
+
+	public final static String AUTOCONF_PARTITIONING= "autoconf_partitioning";  //$NON-NLS-1$
+
+
+    private AutoconfPartitionScanner fPartitionScanner;
+    private RuleBasedScanner fCodeScanner;
+    private RuleBasedScanner fMacroCodeScanner;
+    private static AutoconfDocumentProvider fDocumentProvider;
+    private AutoconfElement rootElement;
+    private AutoconfContentOutlinePage outlinePage;
+    private AutoconfParser fParser;
+    private IEditorInput input;
+    private IProject fProject;
+	
+    /** The information provider used to present focusable information shells. */
+    private InformationPresenter fInformationPresenter;
+	/** 
+	 * This editor's projection support 
+	 */
+    
+	ProjectionSupport fProjectionSupport;
+	ProjectionFileUpdater fProjectionFileUpdater;
+
+	/**
+	 * Reconciling listeners
+	 */
+	private ListenerList fReconcilingListeners= new ListenerList(ListenerList.IDENTITY);
+
+
+    public AutoconfEditor() {
+    	super();
+    }
+
+	/**
+	 * Adapted source viewer for CEditor
+	 */
+
+	public class AdaptedSourceViewer extends ProjectionViewer implements ITextViewerExtension {
+
+
+		public AdaptedSourceViewer(Composite parent, IVerticalRuler ruler,
+			IOverviewRuler overviewRuler, boolean showsAnnotation, int styles) {
+			super(parent, ruler, overviewRuler, showsAnnotation, styles);
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.text.source.ISourceViewer#setRangeIndication(int, int, boolean)
+		 */
+		public void setRangeIndication(int offset, int length, boolean moveCursor) {
+			// Fixin a bug in the ProjectViewer implemenation
+			// PR: https://bugs.eclipse.org/bugs/show_bug.cgi?id=72914
+			if (isProjectionMode()) {
+				super.setRangeIndication(offset, length, moveCursor);
+			} else {
+				super.setRangeIndication(offset, length, false);
+			}
+		}
+	}
+
+    protected void initializeEditor() {
+    	super.initializeEditor();
+    	setDocumentProvider(getAutoconfDocumentProvider());
+		IPreferenceStore[] stores = new IPreferenceStore[2];
+		stores[0] = AutotoolsPlugin.getDefault().getPreferenceStore();
+		stores[1] = EditorsUI.getPreferenceStore();
+		ChainedPreferenceStore chainedStore = new ChainedPreferenceStore(stores);
+		setPreferenceStore(chainedStore);    	
+		setSourceViewerConfiguration(new AutoconfSourceViewerConfiguration(chainedStore, this));
+		AutotoolsEditorPreferenceConstants.initializeDefaultValues(stores[0]);
+    	AutoconfEditorPreferencePage.initDefaults(stores[0]);
+    }
+
+    public static AutoconfDocumentProvider getAutoconfDocumentProvider() {
+    	if (fDocumentProvider == null)
+    		fDocumentProvider= new AutoconfDocumentProvider();
+    	return fDocumentProvider;
+    }
+
+    public AutoconfElement getRootElement() {
+    	return rootElement;
+    }
+    
+    public void setRootElement(AutoconfElement element) {
+    	rootElement = element;
+    }
+
+    public ISourceViewer getViewer() {
+    	return getSourceViewer();
+    }
+    
+    protected IDocument getInputDocument()
+	{
+		IDocument document = getDocumentProvider().getDocument(input);
+		return document;
+	}
+
+    protected void doSetInput(IEditorInput newInput) throws CoreException
+	{
+    	// If this editor is for a project file, remove this editor as a property
+    	// change listener.
+    	if (fProject != null)
+    		AutotoolsPropertyManager.getDefault().removeProjectPropertyListener(fProject, this);
+    	this.fProject = null;
+		super.doSetInput(newInput);
+		this.input = newInput;
+
+		if (input instanceof IFileEditorInput) {
+			IFile f = ((IFileEditorInput)input).getFile();
+			fProject = f.getProject();
+			// This is a project file.  We want to be notified if the Autoconf editor
+			// properties are changed such that the macro versions are changed.
+			AutotoolsPropertyManager.getDefault().addProjectPropertyListener(fProject, this);
+		}
+		getOutlinePage().setInput(input);
+		try
+		{
+			IDocument document = getInputDocument();
+
+			setRootElement(reparseDocument(document, newInput));
+		}
+		catch (Exception e)
+		{
+			e.printStackTrace();
+		}
+	}
+
+    @SuppressWarnings("unchecked")
+	public Object getAdapter(Class required) {
+		if (ProjectionAnnotationModel.class.equals(required)) {
+			if (fProjectionSupport != null) {
+				Object result = fProjectionSupport.getAdapter(getSourceViewer(), required);
+				if (result != null) {
+					return result;
+				}
+			}
+		} else if (IContentOutlinePage.class.equals(required)) {
+			return getOutlinePage();
+		}
+		return super.getAdapter(required);
+	}
+	
+
+    public AutoconfContentOutlinePage getOutlinePage() {
+		if (outlinePage == null) {
+			outlinePage= new AutoconfContentOutlinePage(this);
+			if (getEditorInput() != null)
+				outlinePage.setInput(getEditorInput());
+		}
+		return outlinePage;
+	}
+
+    /**
+     * Return a scanner for creating Autoconf partitions.
+     *
+     * @return a scanner for creating Autoconf partitions
+     */
+    public AutoconfParser getAutoconfParser() {
+    	if (fParser == null) {
+    		AutoconfErrorHandler errorHandler = new AutoconfErrorHandler(input);
+    		IAutoconfMacroValidator macroValidator = new AutoconfEditorMacroValidator(this);
+    		fParser = new AutoconfParser(errorHandler, new AutoconfMacroDetector(), macroValidator);
+    	}
+    	return fParser;
+    }
+ 
+	/**
+     * Return a scanner for creating Autoconf partitions.
+     *
+     * @return a scanner for creating Autoconf partitions
+     */
+    public AutoconfPartitionScanner getAutoconfPartitionScanner() {
+    	if (fPartitionScanner == null)
+    		fPartitionScanner= new AutoconfPartitionScanner();
+    	return fPartitionScanner;
+    }
+    
+    /**
+     * Returns the Autoconf code scanner.
+     *
+     * @return the Autoconf code scanner
+     */
+    public RuleBasedScanner getAutoconfCodeScanner() {
+    	if (fCodeScanner == null)
+    		fCodeScanner= new AutoconfCodeScanner();
+    	return fCodeScanner;
+    }
+    
+    /**
+     * Returns the Autoconf code scanner.
+     *
+     * @return the Autoconf code scanner
+     */
+    public RuleBasedScanner getAutoconfMacroCodeScanner() {
+    	if (fMacroCodeScanner == null)
+    		fMacroCodeScanner= new AutoconfMacroCodeScanner();
+    	return fMacroCodeScanner;
+    }
+    
+	/**
+	 * Returns the preference color, identified by the given preference.
+	 */
+	public static Color getPreferenceColor(String key) {
+		return ColorManager.getDefault().getColor(PreferenceConverter.getColor(AutotoolsPlugin.getDefault().getPreferenceStore(), key));
+	}
+
+	public void handleProjectPropertyChanged(IProject project, String property) {
+		if (property.equals(AutotoolsPropertyConstants.AUTOCONF_MACRO_VERSIONING)) {
+			ISourceViewer sourceViewer= getSourceViewer();
+			if (sourceViewer == null)
+				return;
+			handleVersionChange(sourceViewer);
+		}
+	}
+
+	/**
+	 * Handle the case whereby the Autoconf or Automake macro versions to use
+	 * for this project are changed in which case we want to invalidate and reparse 
+	 * the document.
+	 * 
+	 * @param sourceViewer
+	 */
+	protected void handleVersionChange(ISourceViewer sourceViewer) {
+		sourceViewer.invalidateTextPresentation();
+		try {
+			IDocument document = getInputDocument();
+
+			setRootElement(reparseDocument(document, getEditorInput()));
+		}
+		catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+	
+	private AutoconfElement reparseDocument(IDocument document,
+			IEditorInput editorInput) {
+		AutoconfParser parser = getAutoconfParser();
+		((AutoconfErrorHandler)parser.getErrorHandler()).removeAllExistingMarkers();
+		return parser.parse(document);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#handlePreferenceStoreChanged(org.eclipse.jface.util.PropertyChangeEvent)
+	 */
+	protected void handlePreferenceStoreChanged(PropertyChangeEvent event) {
+		ISourceViewer sourceViewer= getSourceViewer();
+		if (sourceViewer == null)
+			return;
+
+        String property = event.getProperty();
+
+        AutoconfCodeScanner scanner = (AutoconfCodeScanner)getAutoconfCodeScanner();
+        if (scanner != null) {
+        	if (scanner.affectsBehavior(event)) {
+        		scanner.adaptToPreferenceChange(event);
+        		sourceViewer.invalidateTextPresentation();
+        	}
+        }
+
+        if (AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION.equals(property) ||
+        		AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION.equals(property)) {
+        	handleVersionChange(sourceViewer);
+        } else if (AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_ENABLED.equals(property)) {
+			if (sourceViewer instanceof ProjectionViewer) {
+				ProjectionViewer projectionViewer= (ProjectionViewer) sourceViewer;
+				if (fProjectionFileUpdater != null)
+					fProjectionFileUpdater.uninstall();
+				// either freshly enabled or provider changed
+				fProjectionFileUpdater= new ProjectionFileUpdater();
+				if (fProjectionFileUpdater != null) {
+					fProjectionFileUpdater.install(this, projectionViewer);
+				}
+			}
+			return;
+		}
+
+		super.handlePreferenceStoreChanged(event);
+	}
+
+    /**
+     * Information provider used to present focusable information shells.
+     *
+     * @since 3.1.1
+     */
+    private static final class InformationProvider implements IInformationProvider, IInformationProviderExtension, IInformationProviderExtension2 {
+
+    	private IRegion fHoverRegion;
+    	private Object fHoverInfo;
+    	private IInformationControlCreator fControlCreator;
+
+    	InformationProvider(IRegion hoverRegion, Object hoverInfo, IInformationControlCreator controlCreator) {
+    		fHoverRegion= hoverRegion;
+    		fHoverInfo= hoverInfo;
+    		fControlCreator= controlCreator;
+    	}
+    	/*
+    	 * @see org.eclipse.jface.text.information.IInformationProvider#getSubject(org.eclipse.jface.text.ITextViewer, int)
+    	 */
+    	public IRegion getSubject(ITextViewer textViewer, int invocationOffset) {
+    		return fHoverRegion;
+    	}
+    	/*
+    	 * @see org.eclipse.jface.text.information.IInformationProvider#getInformation(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion)
+    	 */
+    	public String getInformation(ITextViewer textViewer, IRegion subject) {
+    		return fHoverInfo.toString();
+    	}
+    	
+    	/*
+    	 * @see org.eclipse.jface.text.information.IInformationProviderExtension#getInformation2(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion)
+    	 * @since 3.2
+    	 */
+    	public Object getInformation2(ITextViewer textViewer, IRegion subject) {
+    		return fHoverInfo;
+    	}
+    	/*
+    	 * @see org.eclipse.jface.text.information.IInformationProviderExtension2#getInformationPresenterControlCreator()
+    	 */
+    	public IInformationControlCreator getInformationPresenterControlCreator() {
+    		return fControlCreator;
+    	}
+    }
+
+    /**
+     * This action behaves in two different ways: If there is no current text
+     * hover, the tooltip is displayed using information presenter. If there is
+     * a current text hover, it is converted into a information presenter in
+     * order to make it sticky.
+     * @since 3.1.1
+     */
+    class InformationDispatchAction extends TextEditorAction {
+
+    	/** The wrapped text operation action. */
+    	private final TextOperationAction fTextOperationAction;
+
+    	/**
+    	 * Creates a dispatch action.
+    	 *
+    	 * @param resourceBundle the resource bundle
+    	 * @param prefix the prefix
+    	 * @param textOperationAction the text operation action
+    	 */
+    	public InformationDispatchAction(ResourceBundle resourceBundle, String prefix, final TextOperationAction textOperationAction) {
+    		super(resourceBundle, prefix, AutoconfEditor.this);
+    		if (textOperationAction == null)
+    			throw new IllegalArgumentException();
+    		fTextOperationAction= textOperationAction;
+    	}
+
+    	/*
+    	 * @see org.eclipse.jface.action.IAction#run()
+    	 */
+    	public void run() {
+
+    		ISourceViewer sourceViewer= getSourceViewer();
+    		if (sourceViewer == null) {
+    			fTextOperationAction.run();
+    			return;
+    		}
+
+    		if (sourceViewer instanceof ITextViewerExtension4)  {
+    			ITextViewerExtension4 extension4= (ITextViewerExtension4) sourceViewer;
+    			if (extension4.moveFocusToWidgetToken())
+    				return;
+    		}
+
+    		if (sourceViewer instanceof ITextViewerExtension2) {
+    			// does a text hover exist?
+    			ITextHover textHover= ((ITextViewerExtension2) sourceViewer).getCurrentTextHover();
+    			if (textHover != null && makeTextHoverFocusable(sourceViewer, textHover))
+    				return;
+    		}
+
+    		if (sourceViewer instanceof ISourceViewerExtension3) {
+    			// does an annotation hover exist?
+    			IAnnotationHover annotationHover= ((ISourceViewerExtension3) sourceViewer).getCurrentAnnotationHover();
+    			if (annotationHover != null && makeAnnotationHoverFocusable(sourceViewer, annotationHover))
+    				return;
+    		}
+
+    		// otherwise, just display the tooltip
+    		//fTextOperationAction.run();
+    	}
+
+    	/**
+    	 * Tries to make a text hover focusable (or "sticky").
+    	 * 
+    	 * @param sourceViewer the source viewer to display the hover over
+    	 * @param textHover the hover to make focusable
+    	 * @return <code>true</code> if successful, <code>false</code> otherwise
+    	 */
+    	@SuppressWarnings("deprecation")
+		private boolean makeTextHoverFocusable(ISourceViewer sourceViewer, ITextHover textHover) {
+    		Point hoverEventLocation= ((ITextViewerExtension2) sourceViewer).getHoverEventLocation();
+    		int offset= computeOffsetAtLocation(sourceViewer, hoverEventLocation.x, hoverEventLocation.y);
+    		if (offset == -1)
+    			return false;
+
+    		try {
+    			IRegion hoverRegion= textHover.getHoverRegion(sourceViewer, offset);
+    			if (hoverRegion == null)
+    				return false;
+
+    			String hoverInfo= textHover.getHoverInfo(sourceViewer, hoverRegion);
+
+    			IInformationControlCreator controlCreator= null;
+    			if (textHover instanceof IInformationProviderExtension2)
+    				controlCreator= ((IInformationProviderExtension2)textHover).getInformationPresenterControlCreator();
+
+    			IInformationProvider informationProvider= new InformationProvider(hoverRegion, hoverInfo, controlCreator);
+
+    			fInformationPresenter.setOffset(offset);
+    			fInformationPresenter.setAnchor(AbstractInformationControlManager.ANCHOR_BOTTOM);
+    			fInformationPresenter.setMargins(6, 6); // default values from AbstractInformationControlManager
+    			String contentType= TextUtilities.getContentType(sourceViewer.getDocument(), AutoconfPartitionScanner.AUTOCONF_MACRO, offset, true);
+    			fInformationPresenter.setInformationProvider(informationProvider, contentType);
+    			fInformationPresenter.showInformation();
+
+    			return true;
+
+    		} catch (BadLocationException e) {
+    			return false;
+    		}
+    	}
+
+    	/**
+    	 * Tries to make an annotation hover focusable (or "sticky").
+    	 * 
+    	 * @param sourceViewer the source viewer to display the hover over
+    	 * @param annotationHover the hover to make focusable
+    	 * @return <code>true</code> if successful, <code>false</code> otherwise
+    	 */
+    	private boolean makeAnnotationHoverFocusable(ISourceViewer sourceViewer, IAnnotationHover annotationHover) {
+    		IVerticalRulerInfo info= getVerticalRuler();
+    		int line= info.getLineOfLastMouseButtonActivity();
+    		if (line == -1)
+    			return false;
+
+    		try {
+
+    			// compute the hover information
+    			Object hoverInfo;
+    			if (annotationHover instanceof IAnnotationHoverExtension) {
+    				IAnnotationHoverExtension extension= (IAnnotationHoverExtension) annotationHover;
+    				ILineRange hoverLineRange= extension.getHoverLineRange(sourceViewer, line);
+    				if (hoverLineRange == null)
+    					return false;
+    				final int maxVisibleLines= Integer.MAX_VALUE; // allow any number of lines being displayed, as we support scrolling
+    				hoverInfo= extension.getHoverInfo(sourceViewer, hoverLineRange, maxVisibleLines);
+    			} else {
+    				hoverInfo= annotationHover.getHoverInfo(sourceViewer, line);
+    			}
+
+    			// hover region: the beginning of the concerned line to place the control right over the line
+    			IDocument document= sourceViewer.getDocument();
+    			int offset= document.getLineOffset(line);
+    			String contentType= TextUtilities.getContentType(document, AutoconfPartitionScanner.AUTOCONF_MACRO, offset, true);
+
+    			IInformationControlCreator controlCreator= null;
+
+//    			/* 
+//    			 * XXX: This is a hack to avoid API changes at the end of 3.2,
+//    			 * and should be fixed for 3.3, see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=137967
+//    			 */
+//    			if ("org.eclipse.jface.text.source.projection.ProjectionAnnotationHover".equals(annotationHover.getClass().getName())) { //$NON-NLS-1$
+//    				controlCreator= new IInformationControlCreator() {
+//    					public IInformationControl createInformationControl(Shell shell) {
+//    						int shellStyle= SWT.RESIZE | SWT.TOOL | getOrientation();
+//    						int style= SWT.V_SCROLL | SWT.H_SCROLL;
+//    						return new SourceViewerInformationControl(shell, shellStyle, style);
+//    					}
+//    				};
+//
+//    			} else {
+    			if (annotationHover instanceof IInformationProviderExtension2)
+    				controlCreator= ((IInformationProviderExtension2) annotationHover).getInformationPresenterControlCreator();
+    			else if (annotationHover instanceof IAnnotationHoverExtension)
+    				controlCreator= ((IAnnotationHoverExtension) annotationHover).getHoverControlCreator();
+//    			}
+
+    			IInformationProvider informationProvider= new InformationProvider(new Region(offset, 0), hoverInfo, controlCreator);
+
+    			fInformationPresenter.setOffset(offset);
+    			fInformationPresenter.setAnchor(AbstractInformationControlManager.ANCHOR_RIGHT);
+    			fInformationPresenter.setMargins(4, 0); // AnnotationBarHoverManager sets (5,0), minus SourceViewer.GAP_SIZE_1
+    			fInformationPresenter.setInformationProvider(informationProvider, contentType);
+    			fInformationPresenter.showInformation();
+
+    			return true;
+
+    		} catch (BadLocationException e) {
+    			return false;
+    		}
+    	}
+
+    	// modified version from TextViewer
+    	private int computeOffsetAtLocation(ITextViewer textViewer, int x, int y) {
+
+    		StyledText styledText= textViewer.getTextWidget();
+    		IDocument document= textViewer.getDocument();
+
+    		if (document == null)
+    			return -1;
+
+    		try {
+    			int widgetOffset= styledText.getOffsetAtLocation(new Point(x, y));
+    			Point p= styledText.getLocationAtOffset(widgetOffset);
+    			if (p.x > x)
+    				widgetOffset--;
+
+    			if (textViewer instanceof ITextViewerExtension5) {
+    				ITextViewerExtension5 extension= (ITextViewerExtension5) textViewer;
+    				return extension.widgetOffset2ModelOffset(widgetOffset);
+    			} else {
+    				IRegion visibleRegion= textViewer.getVisibleRegion();
+    				return widgetOffset + visibleRegion.getOffset();
+    			}
+    		} catch (IllegalArgumentException e) {
+    			return -1;
+    		}
+
+    	}
+    }
+
+	/**
+	 * Adds the given listener.
+	 * Has no effect if an identical listener was not already registered.
+	 * 
+	 * @param listener	The reconcile listener to be added
+	 */
+	public final void addReconcilingParticipant(IReconcilingParticipant listener) {
+		synchronized (fReconcilingListeners) {
+			fReconcilingListeners.add(listener);
+		}
+	}
+	
+	/**
+	 * Removes the given listener.
+	 * Has no effect if an identical listener was not already registered.
+	 * 
+	 * @param listener	the reconcile listener to be removed
+	 */
+	final void removeReconcilingParticipant(IReconcilingParticipant listener) {
+		synchronized (fReconcilingListeners) {
+			fReconcilingListeners.remove(listener);
+		}
+	}
+	
+	/*
+	 */
+	public void reconciled() {
+		// Notify listeners
+		Object[] listeners = fReconcilingListeners.getListeners();
+		for (int i = 0, length= listeners.length; i < length; ++i) {
+			((IReconcilingParticipant)listeners[i]).reconciled();
+		}
+	}
+
+    /**
+     * Determines is folding enabled.
+     * @return <code>true</code> if folding is enabled, <code>false</code> otherwise.
+     */
+	boolean isFoldingEnabled() {
+		return AutotoolsPlugin.getDefault().getPreferenceStore().getBoolean(MakefileEditorPreferenceConstants.EDITOR_FOLDING_ENABLED);
+	}
+
+    /* (non-Javadoc)
+	 * @see org.eclipse.ui.editors.text.TextEditor#initializeKeyBindingScopes()
+	 */
+	protected void initializeKeyBindingScopes() {
+		setKeyBindingScopes(new String [] { AutotoolsUIPlugin.getUniqueIdentifier() + ".editor.scope" } ); //$NON-NLS-1$
+	}
+
+
+    /**
+     * @see org.eclipse.ui.texteditor.AbstractTextEditor#createActions()
+     */
+    protected void createActions() {
+    	super.createActions();
+    	// TODO: Figure out how to do this later. 		
+//  	fFoldingGroup= new FoldingActionGroup(this, getSourceViewer());
+
+    	// Sticky hover support
+    	ResourceAction resAction= new TextOperationAction(AutoconfEditorMessages.getResourceBundle(), "ShowToolTip.", this, ISourceViewer.INFORMATION, true); //$NON-NLS-1$
+    	resAction= new InformationDispatchAction(AutoconfEditorMessages.getResourceBundle(), "ShowToolTip.", (TextOperationAction) resAction); //$NON-NLS-1$
+    	resAction.setActionDefinitionId(IAutotoolEditorActionDefinitionIds.SHOW_TOOLTIP);
+    	setAction("ShowToolTip", resAction); //$NON-NLS-1$
+    	PlatformUI.getWorkbench().getHelpSystem().setHelp(resAction, IAutotoolHelpContextIds.SHOW_TOOLTIP_ACTION);
+
+    	// Content assist
+    	Action action = new ContentAssistAction(AutoconfEditorMessages.getResourceBundle(), "ContentAssistProposal.", this); //$NON-NLS-1$
+		action.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
+		setAction("ContentAssistProposal", action); //$NON-NLS-1$
+		markAsStateDependentAction("ContentAssistProposal", true); //$NON-NLS-1$
+    	PlatformUI.getWorkbench().getHelpSystem().setHelp(action, IAutotoolHelpContextIds.CONTENT_ASSIST);
+   }
+
+    /**
+     * The <code>AbstractTextEditor</code> implementation of this 
+     * <code>IWorkbenchPart</code> method creates the vertical ruler and
+     * source viewer. Subclasses may extend.
+     * 
+     * We attach our own mouseDown listener on the menu bar, 
+     * and our own listener for cursor/key/selection events to update cursor position in
+     * status bar.
+
+     * @param parent Parent composite of the control.
+     */
+    public void createPartControl(Composite parent) {
+    	super.createPartControl(parent);
+
+    	// Sticky hover support
+    	IInformationControlCreator informationControlCreator= new IInformationControlCreator() {
+    		public IInformationControl createInformationControl(Shell shell) {
+       			return new DefaultInformationControl(shell, true);
+    		}
+    	};
+
+    	fInformationPresenter= new InformationPresenter(informationControlCreator);
+    	fInformationPresenter.setSizeConstraints(60, 10, true, true);
+    	fInformationPresenter.install(getSourceViewer());
+    	fInformationPresenter.setDocumentPartitioning(AutoconfPartitionScanner.AUTOCONF_MACRO);
+
+    	ProjectionViewer projectionViewer= (ProjectionViewer) getSourceViewer();
+
+    	fProjectionSupport= new ProjectionSupport(projectionViewer, getAnnotationAccess(), getSharedColors());
+    	fProjectionSupport.addSummarizableAnnotationType("org.eclipse.ui.workbench.texteditor.error"); //$NON-NLS-1$
+    	fProjectionSupport.addSummarizableAnnotationType("org.eclipse.ui.workbench.texteditor.warning"); //$NON-NLS-1$
+    	fProjectionSupport.install();
+
+    	if (isFoldingEnabled())
+    		projectionViewer.doOperation(ProjectionViewer.TOGGLE);
+    	
+		fProjectionFileUpdater= new ProjectionFileUpdater();
+		if (fProjectionFileUpdater != null) {
+			fProjectionFileUpdater.install(this, projectionViewer);
+			fProjectionFileUpdater.initialize();
+		}
+
+    	PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IAutotoolHelpContextIds.AC_EDITOR_VIEW);
+
+    	// TODO: Do we need the following two lines?
+//  	fEditorSelectionChangedListener= new EditorSelectionChangedListener();
+//  	fEditorSelectionChangedListener.install(getSelectionProvider());
+    }
+
+    protected ISourceViewer createSourceViewer(Composite parent, IVerticalRuler ruler, int styles) {
+    	ISourceViewer viewer = new AdaptedSourceViewer(parent, ruler, getOverviewRuler(), isOverviewRulerVisible(), styles);
+
+    	// ensure decoration support has been created and configured.
+    	getSourceViewerDecorationSupport(viewer);
+
+    	return viewer;
+    }
+    
+    
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IWorkbenchPart#dispose()
+	 */
+	public void dispose() {
+		if (fProjectionFileUpdater != null) {
+			fProjectionFileUpdater.uninstall();
+			fProjectionFileUpdater= null;
+		}
+		if (fProject != null) {
+			AutotoolsPropertyManager.getDefault().removeProjectPropertyListener(fProject, this);
+		}
+		super.dispose();
+	}
+
+	/*
+	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#performRevert()
+	 */
+	protected void performRevert() {
+		ProjectionViewer projectionViewer= (ProjectionViewer) getSourceViewer();
+		projectionViewer.setRedraw(false);
+		try {
+
+			boolean projectionMode= projectionViewer.isProjectionMode();
+			if (projectionMode) {
+				projectionViewer.disableProjection();
+				if (fProjectionFileUpdater != null)
+					fProjectionFileUpdater.uninstall();
+			}
+
+			super.performRevert();
+
+			if (projectionMode) {
+				if (fProjectionFileUpdater != null)
+					fProjectionFileUpdater.install(this, projectionViewer);
+				projectionViewer.enableProjection();
+			}
+
+		} finally {
+			projectionViewer.setRedraw(true);
+		}
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMacroValidator.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMacroValidator.java
new file mode 100644
index 0000000..bae46a9
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMacroValidator.java
@@ -0,0 +1,101 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Corporation, (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	  Red Hat Incorporated - initial API and implementation
+ *    Ed Swartz (Nokia) - refactoring
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfMacroElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.IAutoconfMacroValidator;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.ParseException;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutotoolsEditorPreferenceConstants;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.text.hover.AutoconfPrototype;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.text.hover.AutoconfTextHover;
+
+
+/**
+ *	Validate a macro call by checking against the stored macro prototypes
+ */
+public class AutoconfEditorMacroValidator implements IAutoconfMacroValidator {
+	public final String AUTOCONF_MACRO_ARGS_TOO_FEW = "AutoconfMacroArgsTooFew"; //$NON-NLS-1$
+	public final String AUTOCONF_MACRO_ARGS_TOO_MANY = "AutoconfMacroArgsTooMany"; //$NON-NLS-1$
+
+	private AutoconfEditor fEditor;
+
+	public AutoconfEditorMacroValidator(AutoconfEditor autoconfEditor) {
+		fEditor = autoconfEditor;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.IAutoconfMacroValidator#validateMacroCall(org.eclipse.linuxtools.cdt.autotools.core.ui.editors.parser.AutoconfMacroElement)
+	 */
+	public void validateMacroCall(AutoconfMacroElement macro)
+			throws ParseException {
+		AutoconfPrototype p = AutoconfTextHover.getPrototype(macro.getName(), fEditor);
+		if (p != null) {
+			boolean tooFew = false;
+			boolean tooMany = false;
+			boolean justRight = false;
+			int parms = macro.getParameterCount();
+			int numPrototypes = p.getNumPrototypes();
+			int minParms = 0;
+			int maxParms = 0;
+			for (int i = 0; i < numPrototypes; ++i) {
+				if (parms < p.getMinParms(i)) {
+					tooFew = true;
+					minParms = p.getMinParms(i);
+				} else if (parms > p.getMaxParms(i)) {
+					tooMany = true;
+					maxParms = p.getMaxParms(i);
+				} else {
+					justRight = true;
+					break;
+				}
+			}
+			
+			int length = macro.getEndOffset() - macro.getStartOffset();
+			int start = macro.getStartOffset();
+			int end = macro.getEndOffset();
+			int lineNumber = 0;
+			try {
+				lineNumber = macro.getDocument().getLineOfOffset(start);
+			} catch (BadLocationException e) {
+				
+			}
+			
+			if (!justRight) {
+				if (tooFew) {
+					String formatString = AutoconfEditorMessages.getFormattedString(AUTOCONF_MACRO_ARGS_TOO_FEW, 
+							AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION),
+							p.getName(), Integer.toString(minParms));
+					throw new ParseException(
+							formatString,
+							start, end,
+							lineNumber, 0, length,
+							IMarker.SEVERITY_WARNING);
+				} else if (tooMany) {
+					String formatString = AutoconfEditorMessages.getFormattedString(AUTOCONF_MACRO_ARGS_TOO_MANY,
+							AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION),
+							p.getName(), Integer.toString(maxParms));
+					throw new ParseException(
+							formatString,
+							start, end,
+							lineNumber, 0, length,
+							IMarker.SEVERITY_WARNING);
+				}
+			}
+		}
+
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMessages.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMessages.java
new file mode 100644
index 0000000..d1f6f14
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMessages.java
@@ -0,0 +1,117 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+
+/**
+ * AutoconfEditorMessages
+ */
+public class AutoconfEditorMessages {
+
+	private static final String RESOURCE_BUNDLE= AutoconfEditorMessages.class.getName();
+
+	private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);
+
+	private AutoconfEditorMessages() {
+	}
+
+	public static ResourceBundle getResourceBundle() {
+		return fgResourceBundle;
+	}
+	
+	public static String getString(String key) {
+		try {
+			return fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+	}
+	/**
+	 * Gets a string from the resource bundle and formats it with the argument
+	 * 
+	 * @param key	the string used to get the bundle value, must not be null
+	 * @since 3.0
+	 */
+	public static String getFormattedString(String key, Object arg) {
+		String format= null;
+		try {
+			format= fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+		if (arg == null)
+			arg= ""; //$NON-NLS-1$
+		return MessageFormat.format(format, new Object[] { arg });
+	}
+	/**
+	 * Gets a string from the resource bundle and formats it with the arguments
+	 * 
+	 * @param key	the string used to get the bundle value, must not be null
+	 * @since 3.0
+	 */
+	public static String getFormattedString(String key, Object arg1, Object arg2) {
+		String format= null;
+		try {
+			format= fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+		if (arg1 == null)
+			arg1= ""; //$NON-NLS-1$
+		if (arg2 == null)
+			arg2= ""; //$NON-NLS-1$
+		return MessageFormat.format(format, new Object[] { arg1, arg2 });
+	}
+	
+	/**
+	 * Gets a string from the resource bundle and formats it with the arguments
+	 * 
+	 * @param key	the string used to get the bundle value, must not be null
+	 * @since 3.0
+	 */
+	public static String getFormattedString(String key, Object arg1, Object arg2, Object arg3) {
+		String format= null;
+		try {
+			format= fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+		if (arg1 == null)
+			arg1= ""; //$NON-NLS-1$
+		if (arg2 == null)
+			arg2= ""; //$NON-NLS-1$
+		if (arg3 == null)
+			arg3= ""; //$NON-NLS-1$
+		return MessageFormat.format(format, new Object[] { arg1, arg2, arg3 });
+	}
+	
+	/**
+	 * Gets a string from the resource bundle and formats it with the argument
+	 * 
+	 * @param key	the string used to get the bundle value, must not be null
+	 * @since 3.0
+	 */
+	public static String getFormattedString(String key, boolean arg) {
+		String format= null;
+		try {
+			format= fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+		return MessageFormat.format(format, new Object[] { new Boolean(arg) });
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMessages.properties b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMessages.properties
new file mode 100644
index 0000000..692d064
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMessages.properties
@@ -0,0 +1,47 @@
+#################################################################################
+#  Copyright (c) 2007 Red Hat, Inc., (c) 2008 Nokia Inc
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+# 
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#      Nokia Inc - refactoring
+#################################################################################
+UnmatchedRightParenthesis=Unmatched right parenthesis
+UnmatchedLeftParenthesis=Unmatched left parenthesis
+UnmatchedRightQuote=Unmatched right quote, expected {0}
+UnmatchedLeftQuote=Unmatched left quote, expected {0}
+UnmatchedCloseComment=Unmatched end of comment, expected {0}
+UnterminatedString=Unterminated string, expected {0}
+
+AutoconfMacroArgsTooFew=The autoconf version {0} definition of macro "{1}" requires at least {2} arguments
+AutoconfMacroArgsTooMany=The autoconf version {0} definition of macro "{1}" may have a maximum of {2} arguments
+M4MacroArgsTooFew=The m4 macro "{0}" requires at least {1} arguments
+M4MacroArgsTooMany=The m4 macro "{0}" may have a maximum of {1} arguments
+MissingSpecifier=Missing "{0}" specifier
+InvalidSpecifier=The specifier "{0}" should be separated from condition by semicolon or newline
+InvalidTermination=The specifier "{0}" should appear after semicolon or newline
+UnterminatedConstruct=This "{0}" construct is unterminated
+MissingCondition=Missing condition for {0} specifier
+InvalidElif=The "elif" keyword should appear in an "if" or "elif" construct
+InvalidElse=The "else" keyword should appear in an "if" or "elif" construct
+InvalidFi=The "fi" keyword should terminate an "if", "elif", or "else" construct
+InvalidEsac=The "esac" keyword should terminate a "case" statement
+InvalidDone=The "done" keyword should terminate a "for", "while", "until", or "select" statement
+InvalidDo=The "do" keyword should appear in a "for", "while", "until", or "select" statement
+InvalidThen=The "then" keyword should appear in an "if" or "elif" statement
+InvalidIn=The "in" keyword should appear in a "case" statement
+UnterminatedCaseCondition=Case condition is not terminated before "esac" keyword
+ImproperCaseCondition=Case condition expected to end with ")"
+UnterminatedInlineDocument=Inline document started with "<<" is unterminated
+IncompleteInlineMarker=Inline document marker has incomplete quote
+MissingInlineMarker=Inline document specification is missing end marker
+AutoconfAnnotationHover.multipleMarkers=Multiple markers at this line
+
+ShowToolTip.label=Show T&ooltip Description
+ContentAssistProposal.label=Co&ntent Assist
+ContentAssistProposal.tooltip=Content Assist
+ContentAssistProposal.description=Content Assist
+
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfErrorHandler.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfErrorHandler.java
new file mode 100644
index 0000000..14ea7f8
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfErrorHandler.java
@@ -0,0 +1,213 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.eclipse.cdt.core.model.ICModelMarker;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.text.Position;
+import org.eclipse.jface.text.source.Annotation;
+import org.eclipse.jface.text.source.AnnotationModel;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.IAutoconfErrorHandler;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.ParseException;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.texteditor.MarkerAnnotation;
+import org.eclipse.ui.texteditor.MarkerUtilities;
+
+
+public class AutoconfErrorHandler implements IAutoconfErrorHandler {
+	
+	public static final String PARSE_ERROR_MARKER_ID = AutotoolsUIPlugin.PLUGIN_ID
+	+ ".parsefileerror"; //$NON-NLS-1$
+	
+	private Map<Position, MarkerAnnotation> annotations = new HashMap<Position, MarkerAnnotation>();
+	private AnnotationModel fAnnotationModel;
+	
+	public AutoconfErrorHandler(IEditorInput input) {
+		this.fAnnotationModel = (AnnotationModel)AutoconfEditor.getAutoconfDocumentProvider().getAnnotationModel(input);
+	}
+	
+	private class AutoconfMarker implements IMarker {
+		private Map<String, Object> attributes;
+		private String type;
+		private long id;
+		
+		public void delete() throws CoreException {
+			// TODO Auto-generated method stub
+			
+		}
+		public boolean equals(Object obj) {
+			// TODO Auto-generated method stub
+			return super.equals(obj);
+		}
+		public boolean exists() {
+			// TODO Auto-generated method stub
+			return true;
+		}
+		@SuppressWarnings("unchecked")
+		public Object getAdapter(Class adapter) {
+			// TODO Auto-generated method stub
+			return null;
+		}
+		public Object getAttribute(String attributeName) throws CoreException {
+			return attributes.get(attributeName);
+		}
+		public boolean getAttribute(String attributeName, boolean defaultValue) {
+			Object o = attributes.get(attributeName);
+			if (o != null && o instanceof Boolean)
+				return ((Boolean)o).booleanValue();
+			return defaultValue;
+		}
+		public int getAttribute(String attributeName, int defaultValue) {
+			Object o = attributes.get(attributeName);
+			if (o != null && o instanceof Integer)
+				return ((Integer)o).intValue();
+			return defaultValue;
+		}
+		public String getAttribute(String attributeName, String defaultValue) {
+			Object o = attributes.get(attributeName);
+			if (o != null && o instanceof String)
+				return (String)o;
+			return defaultValue;
+		}
+		public Map<String, Object> getAttributes() throws CoreException {
+			return attributes;
+		}
+		public Object[] getAttributes(String[] attributeNames)
+				throws CoreException {
+			Collection<Object> c = attributes.values();
+			return c.toArray();
+		}
+		public long getCreationTime() throws CoreException {
+			// TODO Auto-generated method stub
+			return 0;
+		}
+		public long getId() {
+			return id;
+		}
+		public IResource getResource() {
+			return null;
+		}
+		public String getType() throws CoreException {
+			return type;
+		}
+		public boolean isSubtypeOf(String superType) throws CoreException {
+			if (superType.equals(type))
+				return true;
+			return false;
+		}
+		public void setAttribute(String attributeName, boolean value)
+				throws CoreException {
+			Boolean b = new Boolean(value);
+			attributes.put(attributeName, b);
+		}
+		public void setAttribute(String attributeName, int value)
+				throws CoreException {
+			Integer i = new Integer(value);
+			attributes.put(attributeName, i);	
+		}
+		public void setAttribute(String attributeName, Object value)
+				throws CoreException {
+			attributes.put(attributeName, value);
+		}
+		@SuppressWarnings("unchecked")
+		public void setAttributes(Map map) throws CoreException {
+			attributes.putAll(map);
+		}
+		public void setAttributes(String[] attributeNames, Object[] values)
+				throws CoreException {
+			for (int i = 0; i < attributeNames.length; ++i) {
+				attributes.put(attributeNames[i], values[i]);
+			}
+		}
+		protected Object clone() throws CloneNotSupportedException {
+			// TODO Auto-generated method stub
+			return super.clone();
+		}
+		public AutoconfMarker(String type, long id) {
+			this.type = type;
+			this.id = id;
+			this.attributes = new HashMap<String, Object>();
+		}
+	}
+	private IMarker createMarker(Map<String, Object> attributes, String markerType) throws CoreException {
+		IMarker marker= new AutoconfMarker(markerType, -1);
+		marker.setAttributes(attributes);
+		return marker;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.cdt.autotools.ui.editors.IAutoconfErrorHandler#handleError(org.eclipse.linuxtools.cdt.autotools.core.ui.editors.parser.ParseException)
+	 */
+	public void handleError(ParseException e) {
+		
+		int lineNumber = e.getLineNumber();
+		
+		Map<String, Object> map = new HashMap<String, Object>();
+		MarkerUtilities.setLineNumber(map, lineNumber);
+		MarkerUtilities.setMessage(map, e.getMessage());
+		map.put(IMarker.MESSAGE, e.getMessage());
+		map.put(IMarker.LOCATION, Integer.valueOf(lineNumber));
+
+		Integer charStart = new Integer(e.getStartOffset());
+		if (charStart != null) {
+			map.put(IMarker.CHAR_START, charStart);
+		}
+		Integer charEnd = new Integer(e.getEndOffset());
+		if (charEnd != null) {
+			map.put(IMarker.CHAR_END, charEnd);
+		}
+		
+		// FIXME:  add severity level
+		map.put(IMarker.SEVERITY, new Integer(e.getSeverity()));
+		
+		try {
+			IMarker marker = createMarker(map, ICModelMarker.C_MODEL_PROBLEM_MARKER);
+
+			MarkerAnnotation annotation = new MarkerAnnotation(marker);
+			Position p = new Position(charStart.intValue(),charEnd.intValue() - charStart.intValue());
+			fAnnotationModel.addAnnotation(annotation, p);
+			annotations.put(p, annotation);
+		} catch (CoreException ce) {
+			// do nothing
+		}
+		return;
+	}
+	
+	public void removeAllExistingMarkers()
+	{
+		fAnnotationModel.removeAllAnnotations();
+		annotations.clear();
+	}
+
+	@SuppressWarnings("unchecked")
+	public void removeExistingMarkers(int offset, int length)
+	{	
+		Iterator i = fAnnotationModel.getAnnotationIterator();
+		while (i.hasNext()) {
+			Annotation annotation = (Annotation)i.next();
+			Position p = fAnnotationModel.getPosition(annotation);
+			int pStart = p.getOffset();
+			if (pStart >= offset && pStart < (offset + length)) {
+				// Remove directly from model instead of using
+				// iterator so position will be removed from document.
+				fAnnotationModel.removeAnnotation(annotation);
+			}
+		}
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfIdentifierRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfIdentifierRule.java
new file mode 100644
index 0000000..4306541
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfIdentifierRule.java
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 20009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IPredicateRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.Token;
+
+public class AutoconfIdentifierRule implements IPredicateRule {
+
+	private IToken fToken;
+	private String fExtraChars = "_${@"; //$NON-NLS-1$
+	
+	public AutoconfIdentifierRule(IToken token) {
+		Assert.isNotNull(token);
+		fToken = token;
+	}
+
+	public IToken getSuccessToken() {
+		return fToken;
+	}
+
+	/*
+	 * @see IRule#evaluate(ICharacterScanner)
+	 */
+	public IToken evaluate(ICharacterScanner scanner) {
+		return evaluate(scanner, false);
+	}
+	
+	/*
+	 * @see IPredicateRule#evaluate(ICharacterScanner, resume)
+	 */
+	public IToken evaluate(ICharacterScanner scanner, boolean resume) {
+		int c = scanner.read();
+		if (Character.isLetterOrDigit((char)c) || fExtraChars.indexOf((char)c) >= 0) {
+			do {
+				c = scanner.read();
+			} while (Character.isLetterOrDigit((char)c) || fExtraChars.indexOf((char)c) >= 0);
+			scanner.unread();
+			return fToken;
+		}
+		scanner.unread();
+		return Token.UNDEFINED;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfKeywordDetector.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfKeywordDetector.java
new file mode 100644
index 0000000..4007042
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfKeywordDetector.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.rules.IWordDetector;
+
+public class AutoconfKeywordDetector implements IWordDetector {
+
+	/**
+	 * @see IWordDetector#isWordPart(character)
+	 */
+	public boolean isWordPart(char character) {
+		return (Character.isLetter(character) && Character.isLowerCase(character));
+	}
+
+	/**
+	 * @see IWordDetector#isWordStart(char)
+	 */
+	public boolean isWordStart(char character) {
+		return (Character.isLetter(character) && Character.isLowerCase(character));
+	}
+
+}
+
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfM4WordDetector.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfM4WordDetector.java
new file mode 100644
index 0000000..2d4059d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfM4WordDetector.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.rules.IWordDetector;
+
+public class AutoconfM4WordDetector implements IWordDetector {
+
+	public boolean isWordPart(char c) {
+		// TODO Auto-generated method stub
+		return (Character.isLetter(c) || 
+				Character.isDigit(c) ||	c == '_');
+	}
+
+	public boolean isWordStart(char c) {
+		// TODO Auto-generated method stub
+		return (c == 'm');
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacro.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacro.java
new file mode 100644
index 0000000..ced0c88
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacro.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+public class AutoconfMacro implements Comparable<Object> {
+		protected String name;
+		protected String parms;
+		
+		public AutoconfMacro(String name, String parms) {
+			this.name = name;
+			this.parms = parms;
+		}
+		public String getName() {
+			return name;
+		}
+		public String getTemplate() {
+			return name + (hasParms() ? "()" : ""); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		public String getParms() {
+			return parms;
+		}
+		public boolean hasParms() {
+			return (parms.length() > 0);
+		}
+		public int compareTo (Object x) {
+			AutoconfMacro y = (AutoconfMacro)x;
+			return getName().compareTo(y.getName());
+		}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroCodeScanner.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroCodeScanner.java
new file mode 100644
index 0000000..f0a088b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroCodeScanner.java
@@ -0,0 +1,277 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.resource.StringConverter;
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
+import org.eclipse.jface.text.rules.SingleLineRule;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.jface.text.rules.WhitespaceRule;
+import org.eclipse.jface.text.rules.WordRule;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutotoolsEditorPreferenceConstants;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.ColorManager;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+
+
+public class AutoconfMacroCodeScanner extends RuleBasedScanner {
+
+	private Map<String, IToken> fTokenMap= new HashMap<String, IToken>();
+	private String[] fPropertyNamesColor;
+	
+	private int quoteLevel;
+	
+	/**
+	 * Preference keys for boolean preferences which are <code>true</code>,
+	 * iff the corresponding token should be rendered bold. 
+	 */
+	private String[] fPropertyNamesBold;
+	/**
+	 * Preference keys for boolean preferences which are <code>true</code>,
+	 * iff the corresponding token should be rendered italic.
+	 */
+	private String[] fPropertyNamesItalic;
+
+	private static String[] keywords = { 
+		"case", "do", "done", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
+		"esac",	"if", "elif", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		"else",	"fi", "for",  //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		"in", "then" };       //$NON-NLS-1$ //$NON-NLS-2$
+
+	public static final String[] fTokenProperties = new String[] {
+		ColorManager.AUTOCONF_COMMENT_COLOR,
+		ColorManager.AUTOCONF_KEYWORD_COLOR,
+		ColorManager.AUTOCONF_ACMACRO_COLOR,
+		ColorManager.AUTOCONF_AMMACRO_COLOR,
+		ColorManager.AUTOCONF_VAR_REF_COLOR,
+		ColorManager.AUTOCONF_VAR_SET_COLOR,
+		ColorManager.AUTOCONF_CODESEQ_COLOR,
+		ColorManager.AUTOCONF_DEFAULT_COLOR,
+	};
+
+	public AutoconfMacroCodeScanner() {
+		
+		initialize();
+		
+		IToken other= getToken(ColorManager.AUTOCONF_DEFAULT_COLOR);
+		IToken keyword = getToken(ColorManager.AUTOCONF_KEYWORD_COLOR);
+		IToken comment= getToken(ColorManager.AUTOCONF_COMMENT_COLOR);
+		IToken string = getToken(ColorManager.AUTOCONF_DEFAULT_COLOR);
+		IToken varRef = getToken(ColorManager.AUTOCONF_VAR_REF_COLOR);
+		IToken acmacro = getToken(ColorManager.AUTOCONF_ACMACRO_COLOR);
+		IToken ammacro = getToken(ColorManager.AUTOCONF_AMMACRO_COLOR);
+		IToken code = getToken(ColorManager.AUTOCONF_CODESEQ_COLOR);
+		
+		List<IRule> rules= new ArrayList<IRule>();
+
+		// Add rule for single line comments.
+		rules.add(new RestrictedEndOfLineRule("dnl", "[]", comment)); //$NON-NLS-1$
+		rules.add(new RestrictedEndOfLineRule("#", "[]", comment, '\\')); //$NON-NLS-1$
+		
+		// Add special recursive rule for strings which allows variable
+		// references to be internally tokenized.
+		RecursiveSingleLineRule stringRule =
+			new RecursiveSingleLineRule("\"", "\"", string, '\\'); //$NON-NLS-1$ //$NON-NLS-2$
+		stringRule.addRule(new SingleLineRule("${", "}", varRef)); //$NON-NLS-1$ //$NON-NLS-2$
+		rules.add(stringRule);
+		
+		// Add rule for variable references
+		rules.add(new SingleLineRule("${", "}", varRef)); //$NON-NLS-1$ //$NON-NLS-2$
+		// Add rule for strings
+		rules.add(new SingleLineRule("\"", "\"", string, '\\')); //$NON-NLS-1$ //$NON-NLS-2$
+
+		// Add rule for AC_ macros
+		rules.add(new AutoconfMacroRule("AC_", new AutoconfMacroWordDetector(), acmacro)); //$NON-NLS-1$
+
+		// Add rule for AM_ macros
+		rules.add(new AutoconfMacroRule("AM_", new AutoconfMacroWordDetector(), ammacro)); //$NON-NLS-1$
+
+		// Add rule for m4_ macros
+		rules.add(new AutoconfMacroRule("m4_", new AutoconfM4WordDetector(), acmacro)); //$NON-NLS-1$
+		
+		// Add rule for code sequences starting with <<EOF and ending with EOF
+		rules.add(new InlineDataRule(code));
+		
+		// Add word rule for keywords.
+		WordRule wordRule= new WordRule(new AutoconfWordDetector(), other);
+		for (int i= 0; i < keywords.length; i++)
+			wordRule.addWord(keywords[i], keyword);
+		rules.add(wordRule);
+		
+		// Add word rule for identifier.
+		rules.add(new AutoconfIdentifierRule(other));
+		
+		// Make sure we don't treat "\#" as comment start.
+		rules.add(new SingleLineRule("\\#", null, Token.UNDEFINED));
+		
+		rules.add(new WhitespaceRule(new AutoconfWhitespaceDetector()));
+		
+		IRule[] result= new IRule[rules.size()];
+		rules.toArray(result);
+		setRules(result);
+	}
+	
+	/*
+	 * @see ITokenScanner#nextToken()
+	 */
+	public IToken nextToken() {
+		int ch = read();
+		if (ch == '[') {
+			incQuoteLevel();
+			return getToken(ColorManager.AUTOCONF_DEFAULT_COLOR);
+		} else if (ch == ']') {
+			decQuoteLevel();
+			return getToken(ColorManager.AUTOCONF_DEFAULT_COLOR);
+		}
+		unread();
+		return super.nextToken();
+	}
+
+	protected Token getToken(String key) {
+		return (Token) fTokenMap.get(key);
+	}
+
+	private void addToken(String colorKey, String boldKey, String italicKey) {
+		fTokenMap.put(colorKey, new Token(createTextAttribute(colorKey, boldKey, italicKey)));
+	}
+
+	protected String[] getTokenProperties() {
+		return fTokenProperties;
+	}
+	
+	private int indexOf(String property) {
+		if (property != null) {
+			int length= fPropertyNamesColor.length;
+			for (int i= 0; i < length; i++) {
+				if (property.equals(fPropertyNamesColor[i]) || property.equals(fPropertyNamesBold[i]) || property.equals(fPropertyNamesItalic[i]))
+					return i;
+			}
+		}
+		return -1;
+	}
+	
+	public void incQuoteLevel() {
+		++quoteLevel;
+	}
+	
+	public void decQuoteLevel() {
+		--quoteLevel;
+	}
+	
+	public void resetQuoteLevel() {
+		quoteLevel = 0;
+	}
+	
+	public int getQuoteLevel() {
+		return quoteLevel;
+	}
+
+	public boolean affectsBehavior(PropertyChangeEvent event) {
+		return indexOf(event.getProperty()) >= 0;
+	}
+	
+	public void adaptToPreferenceChange(PropertyChangeEvent event) {
+		String p= event.getProperty();
+		int index= indexOf(p);
+		Token token= getToken(fPropertyNamesColor[index]);
+		if (fPropertyNamesColor[index].equals(p))
+			adaptToColorChange(event, token);
+		else if (fPropertyNamesBold[index].equals(p))
+			adaptToStyleChange(event, token, SWT.BOLD);
+		else if (fPropertyNamesItalic[index].equals(p))
+			adaptToStyleChange(event, token, SWT.ITALIC);
+	}
+
+	protected void adaptToColorChange(PropertyChangeEvent event, Token token) {
+		RGB rgb= null;
+		Object value= event.getNewValue();
+		if (value instanceof RGB) {
+			rgb= (RGB) value;
+		} else if (value instanceof String) {
+			rgb= StringConverter.asRGB((String) value);
+		}
+			
+		if (rgb != null) {
+			TextAttribute attr= (TextAttribute) token.getData();
+			token.setData(new TextAttribute(ColorManager.getDefault().getColor(rgb), attr.getBackground(), attr.getStyle()));
+		}
+	}
+
+	protected void adaptToStyleChange(PropertyChangeEvent event, Token token, int styleAttribute) {
+	 	if (token == null) {
+			return;
+		}
+		boolean eventValue= false;
+		Object value= event.getNewValue();
+		if (value instanceof Boolean) {
+			eventValue= ((Boolean) value).booleanValue();
+		} else if (IPreferenceStore.TRUE.equals(value)) {
+			eventValue= true;
+		}
+		
+		TextAttribute attr= (TextAttribute) token.getData();
+		boolean activeValue= (attr.getStyle() & styleAttribute) == styleAttribute;
+		if (activeValue != eventValue) { 
+			token.setData(new TextAttribute(attr.getForeground(), attr.getBackground(), eventValue ? attr.getStyle() | styleAttribute : attr.getStyle() & ~styleAttribute));
+		}
+	}
+
+	protected TextAttribute createTextAttribute(String colorID, String boldKey, String italicKey) {
+		Color color= null;
+		if (colorID != null) {
+			color= AutoconfEditor.getPreferenceColor(colorID);
+		}
+		IPreferenceStore store= AutotoolsPlugin.getDefault().getPreferenceStore();
+		int style= store.getBoolean(boldKey) ? SWT.BOLD : SWT.NORMAL;
+		if (store.getBoolean(italicKey)) {
+			style |= SWT.ITALIC;
+		}		
+		return new TextAttribute(color, null, style);
+	}
+	
+	/**
+	 * Must be called after the constructor has been called.
+	 */
+	public final void initialize() {
+	
+		resetQuoteLevel();
+		fPropertyNamesColor= getTokenProperties();
+		int length= fPropertyNamesColor.length;
+		fPropertyNamesBold= new String[length];
+		fPropertyNamesItalic= new String[length];
+
+		for (int i= 0; i < length; i++) {
+			fPropertyNamesBold[i]= fPropertyNamesColor[i] + AutotoolsEditorPreferenceConstants.EDITOR_BOLD_SUFFIX;
+			fPropertyNamesItalic[i]= fPropertyNamesColor[i] + AutotoolsEditorPreferenceConstants.EDITOR_ITALIC_SUFFIX;
+			addToken(fPropertyNamesColor[i], fPropertyNamesBold[i], fPropertyNamesItalic[i]);
+		}
+	}
+
+	/*
+	 * @see ICharacterScanner#unread()
+	 */
+	public void unread() {
+	    	--fOffset;
+	    	fColumn = UNDEFINED;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java
new file mode 100644
index 0000000..b1c9590
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java
@@ -0,0 +1,120 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import java.util.ArrayList;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.contentassist.CompletionProposal;
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.text.contentassist.IContextInformation;
+import org.eclipse.jface.text.contentassist.IContextInformationValidator;
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.text.hover.AutoconfTextHover;
+
+
+public class AutoconfMacroContentAssistProcessor implements
+		IContentAssistProcessor {
+	
+	protected ICharacterScanner scanner;
+	protected AutoconfEditor editor;
+	
+	public AutoconfMacroContentAssistProcessor(ICharacterScanner scanner, AutoconfEditor editor) {
+		this.scanner = scanner;
+		this.editor = editor;
+	}
+
+	private int computeMacroStart(IDocument document, int offset) {
+		try {
+			while (Character.isJavaIdentifierPart(document.getChar(offset - 1))) {
+				--offset;
+			}
+		} catch (BadLocationException e) {
+			// Do nothing
+		}
+		return offset;
+	}
+	
+	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer,
+			int offset) {
+		
+		IDocument document = viewer.getDocument();
+		String prefix = ""; //$NON-NLS-1$
+		AutoconfMacro[] macros = AutoconfTextHover.getMacroList(editor);
+		try {
+			int macroStart = computeMacroStart(document, offset);
+			if (macroStart < offset) {
+				prefix = prefix + document.get(macroStart, offset - macroStart);
+			}
+		} catch (BadLocationException e) {
+			// Do nothing.  Leave prefix empty.
+		}
+		ICompletionProposal[] result = null;
+		if (macros != null) {
+			ArrayList<ICompletionProposal> validList = new ArrayList<ICompletionProposal>();
+			for (int i = 0; i < macros.length; ++i) {
+				String name = macros[i].getName();
+				if (name.length() >= prefix.length()) {
+					if (name.startsWith(prefix)) {
+						String template = macros[i].getTemplate();
+						int cursorPos = template.length();
+						int prefixLen = prefix.length();
+						if (template.charAt(template.length() - 1) == ')')
+							cursorPos -= 1;
+						AutoconfMacroProposalContextInformation ci = null;
+						if (macros[i].hasParms()) {
+							// Provide parameter info as context information that
+							// is tied to the completion proposal.
+							ci = new AutoconfMacroProposalContextInformation(macros[i].getParms(), macros[i].getParms());
+							ci.setContextInformationPosition(offset - prefixLen + cursorPos - 1);
+						}
+						ICompletionProposal cp = new CompletionProposal(template, offset - prefixLen, prefixLen, cursorPos, null, 
+								name, ci, AutoconfTextHover.getIndexedInfo(name, editor));
+						validList.add(cp);
+					}
+				}
+			}
+			result = new ICompletionProposal[validList.size()];
+			result = (ICompletionProposal[])validList.toArray(result);
+		}
+		return result;
+	}
+
+	public IContextInformation[] computeContextInformation(ITextViewer viewer,
+			int offset) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public char[] getCompletionProposalAutoActivationCharacters() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public char[] getContextInformationAutoActivationCharacters() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public IContextInformationValidator getContextInformationValidator() {
+		// TODO Auto-generated method stub
+		return new AutoconfMacroParameterListValidator();
+	}
+
+	public String getErrorMessage() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java
new file mode 100644
index 0000000..c6ead68
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.DocumentEvent;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITypedRegion;
+import org.eclipse.jface.text.TextPresentation;
+import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
+import org.eclipse.jface.text.rules.ITokenScanner;
+
+public class AutoconfMacroDamagerRepairer extends DefaultDamagerRepairer {
+	
+	public final static String UNMATCHED_RIGHT_PARENTHESIS = "UnmatchedRightParenthesis"; //$NON-NLS-1$
+	public final static String UNMATCHED_LEFT_PARENTHESIS = "UnmatchedLeftParenthesis"; //$NON-NLS-1$
+	public final static String UNMATCHED_RIGHT_QUOTE = "UnmatchedRightQuote"; //$NON-NLS-1$
+	public final static String UNMATCHED_LEFT_QUOTE = "UnmatchedLeftQuote"; //$NON-NLS-1$
+	
+	/**
+	 * Creates a damager/repairer that uses the given scanner. The scanner may not be <code>null</code>
+	 * and is assumed to return only token that carry text attributes.
+	 *
+	 * @param scanner the token scanner to be used, may not be <code>null</code>
+	 */
+	public AutoconfMacroDamagerRepairer(ITokenScanner scanner) {
+		super(scanner);
+	}
+
+	/*
+	 * @see IPresentationDamager#getDamageRegion(ITypedRegion, DocumentEvent, boolean)
+	 */
+	public IRegion getDamageRegion(ITypedRegion partition, DocumentEvent e, boolean documentPartitioningChanged) {
+		// In the case of a partition with multiline rules, we will punt to
+		// reparse the entire partition because we don't know if the line being
+		// edited is in the middle of an area covered by a multiline rule.  In
+		// such a case, we need to back up and find the start sequence of the
+		// rule.  It is easiest to just reparse the whole partition.
+		return partition;
+	}
+	
+	/*
+	 * @see IPresentationRepairer#createPresentation(TextPresentation, ITypedRegion)
+	 */
+	public void createPresentation(TextPresentation presentation, ITypedRegion region) {
+
+//		int offset = region.getOffset();
+//		int length = region.getLength();
+		
+		super.createPresentation(presentation, region);
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroParameterListValidator.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroParameterListValidator.java
new file mode 100644
index 0000000..f59fbc5
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroParameterListValidator.java
@@ -0,0 +1,215 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2005 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.TextPresentation;
+import org.eclipse.jface.text.contentassist.IContextInformation;
+import org.eclipse.jface.text.contentassist.IContextInformationPresenter;
+import org.eclipse.jface.text.contentassist.IContextInformationValidator;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyleRange;
+
+/**
+ * This class provides the macro call parameter parsing for the Autoconf Editor hover
+ * It is modified from the CDT class CParameterListValidator
+ * 
+ * @author jjohnstn
+ *
+ */
+public class AutoconfMacroParameterListValidator implements IContextInformationValidator, IContextInformationPresenter {
+	private int fPosition;
+	private ITextViewer fViewer;
+	private IContextInformation fInformation;
+	
+	private int fCurrentParameter;
+	
+	public AutoconfMacroParameterListValidator() {
+	}
+	
+	/**
+	 * @see IContextInformationValidator#install(IContextInformation, ITextViewer, int)
+	 * @see IContextInformationPresenter#install(IContextInformation, ITextViewer, int)
+	 */
+	public void install(IContextInformation info, ITextViewer viewer, int documentPosition) {
+		
+		fPosition= documentPosition;
+		fViewer= viewer;
+		fInformation= info;
+		
+		fCurrentParameter= -1;
+	}
+	
+	private int getStringEnd(IDocument d, int pos, int end, char ch) throws BadLocationException {
+		while (pos < end) {
+			char curr= d.getChar(pos);
+			pos++;
+			if (curr == '\\') {
+				// ignore escaped characters
+				pos++;
+			} else if (curr == ch) {
+				return pos;
+			}
+		}
+		return end;
+	}
+	
+	private int getCharCount(IDocument document, int start, int end, 
+							 char increment, char decrement, boolean considerNesting) throws BadLocationException {
+		
+		Assert.isTrue((increment != 0 || decrement != 0) && increment != decrement);
+		
+		// There are two nesting levels to worry about.  Arguments can be
+		// quoted with [] which means to treat the contents as one arg.
+		// As well, macro calls can be nested within macro calls so we
+		// have to handle parentheses.
+		int macroQuotingLevel = 0; // Pertaining to '[' and ']' quoted args.
+		int macroNestingLevel = -1; // Set to -1 to take into account first ( for function call
+		int charCount = 0;
+		while (start < end) {
+			char curr = document.getChar(start++);
+			switch (curr) {
+				case 'd':
+					if (start < end - 2) {
+						char next= document.getChar(start);
+						if (next == 'n') {
+							// a comment starts, advance to the comment end
+							next = document.getChar(start + 1);
+							if (next == 'l')
+							// dnl-comment: nothing to do anymore on this line 
+								start= end;
+						}
+					}
+					break;
+				case '"':
+				case '\'':
+					start= getStringEnd(document, start, end, curr);
+					break;
+				default:
+					if ('[' == curr)
+						++ macroQuotingLevel;
+					else if (']' == curr)
+						-- macroQuotingLevel;
+					if (macroQuotingLevel != 0)
+						break;
+					if (considerNesting) {
+						if ('(' == curr)
+							++ macroNestingLevel;
+						else if (')' == curr) {
+							-- macroNestingLevel;
+						}
+						if (macroNestingLevel != 0)
+							break;
+					}
+					if (increment != 0) {
+						if (curr == increment) {
+							++charCount;
+						}
+					}
+					
+					if (decrement != 0) {
+						if (curr == decrement) {
+							-- charCount;
+						}
+					}
+			}
+		}
+		
+		return charCount;
+	}
+	
+	/**
+	 * @see IContextInformationValidator#isContextInformationValid(int)
+	 */
+	public boolean isContextInformationValid(int position) {		
+		
+		try {
+			if (position < fPosition)
+				return false;
+				
+			IDocument document= fViewer.getDocument();
+			IRegion line= document.getLineInformationOfOffset(fPosition);
+			
+			if (position > line.getOffset() + line.getLength())
+				return false;
+				
+			return (getCharCount(document, fPosition, position, '(', ')', false) >= 0);
+			
+		} catch (BadLocationException x) {
+			return false;
+		}
+	}
+	
+	/**
+	 * @see IContextInformationPresenter#updatePresentation(int, TextPresentation)
+	 */
+	public boolean updatePresentation(int position, TextPresentation presentation) {
+
+		int currentParameter= -1;
+		try {
+			currentParameter= getCharCount(fViewer.getDocument(), fPosition, position, ',', (char) 0, true);
+		} catch (BadLocationException x) {
+			return false;
+		}
+		
+		if (fCurrentParameter != -1) {
+			if (currentParameter == fCurrentParameter)
+				return false;
+		}
+		
+		presentation.clear();
+		fCurrentParameter= currentParameter;
+		
+		//Don't presume what has been done to the string, rather use as is
+		String s= fInformation.getInformationDisplayString();
+		
+		//@@@ This is obviously going to have problems with functions such
+		//int myfunction(int (*function_argument)(void * extra, int param), void * extra)
+		//int myfunction(/*A comment, indeed */int a);
+		int start= 0;
+		int occurrences= 0;
+		while (occurrences < fCurrentParameter) {
+			int found= s.indexOf(',', start);
+			if (found == -1)
+				break;
+			start= found + 1;
+			++ occurrences;
+		}
+		
+		if (occurrences < fCurrentParameter) {
+			presentation.addStyleRange(new StyleRange(0, s.length(), null, null, SWT.NORMAL));
+			return true;
+		}
+		
+		if (start == -1)
+			start= 0;
+		
+		int end= s.indexOf(',', start);
+		if (end == -1)
+			end= s.length();
+			
+		if (start > 0)	
+			presentation.addStyleRange(new StyleRange(0, start, null, null, SWT.NORMAL));
+		
+		if (end > start)
+			presentation.addStyleRange(new StyleRange(start, end - start, null, null, SWT.BOLD));
+		
+		if (end < s.length())
+			presentation.addStyleRange(new StyleRange(end, s.length() - end, null, null, SWT.NORMAL));
+			
+		return true;
+	}
+}
+
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroPartitionRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroPartitionRule.java
new file mode 100644
index 0000000..49b0566
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroPartitionRule.java
@@ -0,0 +1,148 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IPredicateRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.IWhitespaceDetector;
+import org.eclipse.jface.text.rules.IWordDetector;
+import org.eclipse.jface.text.rules.Token;
+
+
+public class AutoconfMacroPartitionRule implements IPredicateRule {
+	/**
+	 * The default token to be returned on success and if nothing else has been
+	 * specified.
+	 */
+	protected IToken token;
+
+	private IWordDetector generalMacroWordDetector;
+	private IWordDetector m4MacroWordDetector;
+	protected IWordDetector fDetector;
+	protected IWhitespaceDetector fWsDetector = new AutoconfWhitespaceDetector();
+
+	/** The column constraint */
+	protected int fColumn = UNDEFINED;
+
+	/** Internal setting for the un-initialized column constraint */
+	protected static final int UNDEFINED = -1;
+
+	/** Buffer used for pattern detection */
+	private StringBuffer fBuffer = new StringBuffer();
+
+	public AutoconfMacroPartitionRule(IToken inToken) {
+		token = inToken;
+		generalMacroWordDetector = new AutoconfMacroWordDetector();
+		m4MacroWordDetector = new AutoconfM4WordDetector();
+	}
+
+	public IToken getSuccessToken() {
+		return token;
+	}
+	
+	protected void matchParentheses(ICharacterScanner scanner) {
+		boolean finished = false;
+		int depth = 1;
+		int quoteDepth = 0;
+		int c = scanner.read();
+		while (!finished && c != ICharacterScanner.EOF) {
+			if (c == '[') {
+				++quoteDepth;
+			}
+			else if (c == ']') {
+				--quoteDepth;
+				if (quoteDepth < 0)
+					finished = true;
+			}
+			if (quoteDepth == 0) {
+				if (c == ')') {
+				  --depth;
+				  if (depth <= 0)
+					  finished = true;
+				}
+				else if (c == '(') {
+					++depth;
+				}
+			}
+			c = scanner.read();
+		}
+	}
+	
+	public IToken evaluate(ICharacterScanner scanner, boolean resume) {
+//		if (resume)
+//			return Token.UNDEFINED;
+		return evaluate(scanner);
+	}
+	
+	public IToken evaluate(ICharacterScanner scanner) {
+		int c = scanner.read();
+		fBuffer.setLength(0);
+
+		fBuffer.append((char)c);
+		if (c == 'A') {
+			c = scanner.read();
+			fBuffer.append((char)c);
+			if (c != 'C' && c != 'H' && c != 'M') {
+				unreadBuffer(scanner);
+				return Token.UNDEFINED;	
+			}
+			fDetector = generalMacroWordDetector;
+		} else if (c == 'm') {
+			c = scanner.read();
+			fBuffer.append((char)c);
+			if (c != 4) {
+				unreadBuffer(scanner);
+				return Token.UNDEFINED;
+			}
+			fDetector = m4MacroWordDetector;
+		} else {
+			unreadBuffer(scanner);
+			return Token.UNDEFINED;
+		}
+		
+    	c = scanner.read();
+		while (c != ICharacterScanner.EOF
+				&& fDetector.isWordPart((char) c)) {
+			fBuffer.append((char) c);
+			c = scanner.read();
+		}
+
+		if (c != ICharacterScanner.EOF) {
+			if (c == ';' || fWsDetector.isWhitespace((char)c)) {
+				// We are done
+			}
+			else if (c == '(') {
+				matchParentheses(scanner);
+			}
+			else {
+				scanner.unread();
+				unreadBuffer(scanner);
+				return Token.UNDEFINED;
+			}
+		}
+
+		scanner.unread();
+		return token;
+	}
+
+	/**
+	 * Returns the characters in the buffer to the scanner.
+	 * 
+	 * @param scanner
+	 *            the scanner to be used
+	 */
+	protected void unreadBuffer(ICharacterScanner scanner) {
+		for (int i = fBuffer.length() - 1; i >= 0; i--)
+			scanner.unread();
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroProposalContextInformation.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroProposalContextInformation.java
new file mode 100644
index 0000000..e549af6
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroProposalContextInformation.java
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corp. - Rational Software - initial implementation
+ *******************************************************************************/
+/*
+ * Created on May 6, 2004
+ */
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.contentassist.IContextInformation;
+import org.eclipse.jface.text.contentassist.IContextInformationExtension;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * @author aniefer
+ */
+public class AutoconfMacroProposalContextInformation implements IContextInformation, IContextInformationExtension {
+	/** The name of the context */
+	private String fContextDisplayString;
+	/** The information to be displayed */
+	private String fInformationDisplayString;
+	/** The position to display the information */
+	private int fInformationPosition;
+	/** The image to be displayed */
+	private Image fImage;
+
+	/**
+	 * Creates a new context information without an image.
+	 *
+	 * @param contextDisplayString the string to be used when presenting the context
+	 * @param informationDisplayString the string to be displayed when presenting the context information
+	 */
+	public AutoconfMacroProposalContextInformation(String contextDisplayString, String informationDisplayString) {
+		this(null, contextDisplayString, informationDisplayString);
+	}
+
+	/**
+	 * Creates a new context information with an image.
+	 *
+	 * @param image the image to display when presenting the context information
+	 * @param contextDisplayString the string to be used when presenting the context
+	 * @param informationDisplayString the string to be displayed when presenting the context information,
+	 *		may not be <code>null</code>
+	 */
+	public AutoconfMacroProposalContextInformation(Image image, String contextDisplayString, String informationDisplayString) {
+		//Assert.isNotNull(informationDisplayString);
+		fImage= image;
+		fContextDisplayString= contextDisplayString;
+		fInformationDisplayString= informationDisplayString;
+	}
+
+	/*
+	 * @see IContextInformation#equals(Object)
+	 */
+	public boolean equals(Object object) {
+		if (object instanceof IContextInformation) {
+			IContextInformation contextInformation= (IContextInformation) object;
+			boolean equals= fInformationDisplayString.equalsIgnoreCase(contextInformation.getInformationDisplayString());
+			if (fContextDisplayString != null) 
+				equals= equals && fContextDisplayString.equalsIgnoreCase(contextInformation.getContextDisplayString());
+			return equals;
+		}
+		return false;
+	}
+	
+	/*
+	 * @see IContextInformation#getInformationDisplayString()
+	 */
+	public String getInformationDisplayString() {
+		return fInformationDisplayString;
+	}
+	
+	/*
+	 * @see IContextInformation#getImage()
+	 */
+	public Image getImage() {
+		return fImage;
+	}
+	
+	/*
+	 * @see IContextInformation#getContextDisplayString()
+	 */
+	public String getContextDisplayString() {
+		if (fContextDisplayString != null)
+			return fContextDisplayString;
+		return fInformationDisplayString;
+	}
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.contentassist.IContextInformationExtension#getContextInformationPosition()
+	 */
+	public int getContextInformationPosition() {
+		return fInformationPosition;
+	}
+	
+	public void setContextInformationPosition( int pos ){
+		fInformationPosition = pos;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroRule.java
new file mode 100644
index 0000000..caab3d6
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroRule.java
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.IWhitespaceDetector;
+import org.eclipse.jface.text.rules.IWordDetector;
+import org.eclipse.jface.text.rules.Token;
+
+public class AutoconfMacroRule implements IRule {
+	/**
+	 * The default token to be returned on success and if nothing else has been
+	 * specified.
+	 */
+	protected IToken token;
+
+	protected IWordDetector fDetector;
+	protected IWhitespaceDetector fWsDetector = new AutoconfWhitespaceDetector();
+
+	/** The column constraint */
+	protected int fColumn = UNDEFINED;
+
+	/** Internal setting for the un-initialized column constraint */
+	protected static final int UNDEFINED = -1;
+
+	/** Buffer used for pattern detection */
+	private StringBuffer fBuffer = new StringBuffer();
+
+	private String fStartingSequence;
+
+	public AutoconfMacroRule(String startingSequence,
+			IWordDetector detector, IToken inToken) {
+		token = inToken;
+		fDetector = detector;
+		fStartingSequence = startingSequence;
+	}
+
+	public IToken evaluate(ICharacterScanner scanner) {
+		int c = scanner.read();
+		fBuffer.setLength(0);
+
+		for (int i = 0; i < fStartingSequence.length(); i++) {
+			fBuffer.append((char) c);
+			if (fStartingSequence.charAt(i) != c) {
+				unreadBuffer(scanner);
+				return Token.UNDEFINED;
+			}
+			c = scanner.read();
+		}
+
+		while (c != ICharacterScanner.EOF
+				&& fDetector.isWordPart((char) c)) {
+			fBuffer.append((char) c);
+			c = scanner.read();
+		}
+
+		if (c != ICharacterScanner.EOF && c != '(' && c != ';'
+			&& !fWsDetector.isWhitespace((char)c)) {
+			unreadBuffer(scanner);
+			return Token.UNDEFINED;
+		}
+
+		scanner.unread();
+		return token;
+	}
+
+	/**
+	 * Returns the characters in the buffer to the scanner.
+	 * 
+	 * @param scanner
+	 *            the scanner to be used
+	 */
+	protected void unreadBuffer(ICharacterScanner scanner) {
+		for (int i = fBuffer.length() - 1; i >= 0; i--)
+			scanner.unread();
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroWordDetector.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroWordDetector.java
new file mode 100644
index 0000000..2a0e0f8
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroWordDetector.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.rules.IWordDetector;
+
+public class AutoconfMacroWordDetector implements IWordDetector {
+
+	public boolean isWordPart(char c) {
+		return ((Character.isLetter(c) && Character.isUpperCase(c)) || 
+				Character.isDigit(c) ||	c == '_');
+	}
+
+	public boolean isWordStart(char c) {
+		return (c == 'A');
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPKGWordDetector.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPKGWordDetector.java
new file mode 100644
index 0000000..49c923d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPKGWordDetector.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2008 NOKIA Inc
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.rules.IWordDetector;
+
+public class AutoconfPKGWordDetector implements IWordDetector {
+
+	public boolean isWordPart(char c) {
+		return ((Character.isLetter(c) && Character.isUpperCase(c)) || 
+				Character.isDigit(c) ||	c == '_');
+	}
+
+	public boolean isWordStart(char c) {
+		return (c == 'P');
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitionScanner.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitionScanner.java
new file mode 100644
index 0000000..7dd8f70
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitionScanner.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jface.text.rules.EndOfLineRule;
+import org.eclipse.jface.text.rules.IPredicateRule;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
+import org.eclipse.jface.text.rules.SingleLineRule;
+import org.eclipse.jface.text.rules.Token;
+
+public class AutoconfPartitionScanner extends RuleBasedPartitionScanner {
+	
+	public final static String AUTOCONF_MACRO = "autoconf_macro"; //$NON-NLS-1$
+	public final static String AUTOCONF_COMMENT = "autoconf_comment"; //$NON-NLS-1$
+	public final static String[] AUTOCONF_PARTITION_TYPES= 
+		new String[] { AUTOCONF_MACRO, AUTOCONF_COMMENT };
+	
+	/**
+	 * Creates the partitioner and sets up the appropriate rules.
+	 */
+	public AutoconfPartitionScanner() {
+		super();
+		
+		List<IRule> rules= new ArrayList<IRule>();
+		Token macro = new Token(AUTOCONF_MACRO);
+		Token comment = new Token(AUTOCONF_COMMENT);
+
+		// Add rule for target bodies.
+		rules.add(new AutoconfMacroPartitionRule(macro));
+		
+
+		rules.add(new EndOfLineRule("dnl", comment)); //$NON-NLS-1$
+		rules.add(new SingleLineRule("\\#", null, Token.UNDEFINED));
+		rules.add(new EndOfLineRule("#", comment, '\\')); //$NON-NLS-1$
+		
+		// We want to process identifiers that might have macro
+		// names inside them.
+		rules.add(new AutoconfIdentifierRule(Token.UNDEFINED));
+
+		IPredicateRule[] result= new IPredicateRule[rules.size()];
+		rules.toArray(result);
+		setPredicateRules(result);
+	}
+	
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitioner.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitioner.java
new file mode 100644
index 0000000..c449f42
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitioner.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITypedRegion;
+import org.eclipse.jface.text.rules.FastPartitioner;
+import org.eclipse.jface.text.rules.IPartitionTokenScanner;
+
+public class AutoconfPartitioner extends FastPartitioner {
+
+	public AutoconfPartitioner(IPartitionTokenScanner scanner, String[] legalContentTypes) {
+		// TODO Auto-generated constructor stub
+		super(scanner, legalContentTypes);
+	}
+			
+	public void connect(IDocument document, int blah) {
+		super.connect(document);
+	}
+	
+	// To optionally show partitions, we must do so by overriding the computePartitioning
+	// method.  We cannot do it at connect time because the document may be zero length
+	// at the time and we will end up getting default partitioning from then on.
+	public ITypedRegion[] computePartitioning(int offset, int length, 
+			boolean includeZeroLength) {
+		ITypedRegion[] regions = super.computePartitioning(offset, length, includeZeroLength);
+		// Uncomment the following line to see partitioning.
+//		printPartitions(regions);
+		return regions;
+	}
+	
+	public void printPartitions(ITypedRegion[] partitions)
+	{
+		StringBuffer buffer = new StringBuffer();
+
+		for (int i = 0; i < partitions.length; i++)
+		{
+			try
+			{
+				buffer.append("Partition type: " + partitions[i].getType() //$NON-NLS-1$
+						+ ", offset: " + partitions[i].getOffset() //$NON-NLS-1$
+						+ ", length: " + partitions[i].getLength()); //$NON-NLS-1$
+				buffer.append("\n"); //$NON-NLS-1$
+				buffer.append("Text:\n"); //$NON-NLS-1$
+				buffer.append(super.fDocument.get(partitions[i].getOffset(), partitions[i].getLength()));
+				buffer.append("\n---------------------------\n\n\n"); //$NON-NLS-1$
+			}
+			catch (BadLocationException e)
+			{
+				e.printStackTrace();
+			}
+		}
+		System.out.print(buffer);
+	}
+}
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfReconcilingStrategy.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfReconcilingStrategy.java
new file mode 100644
index 0000000..b81aead
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfReconcilingStrategy.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.reconciler.DirtyRegion;
+import org.eclipse.jface.text.reconciler.IReconcilingStrategy;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.outline.AutoconfContentOutlinePage;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfParser;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+
+
+public class AutoconfReconcilingStrategy implements IReconcilingStrategy {
+
+	AutoconfContentOutlinePage outline;
+	int lastRegionOffset;
+	AutoconfEditor editor;
+	IDocumentProvider documentProvider;
+	
+	public AutoconfReconcilingStrategy(AutoconfEditor editor) {
+		outline= editor.getOutlinePage();
+		lastRegionOffset = Integer.MAX_VALUE;
+		this.editor = editor;
+		documentProvider = editor.getDocumentProvider();
+	}
+	
+	public void reconcile(IRegion partition) {
+		try {
+			AutoconfParser parser = editor.getAutoconfParser();
+			((AutoconfErrorHandler)parser.getErrorHandler()).removeAllExistingMarkers();
+			editor.setRootElement(parser.parse(documentProvider.getDocument(editor.getEditorInput())));
+			outline.update();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void reconcile(DirtyRegion dirtyRegion, IRegion subRegion) {
+		// TODO Auto-generated method stub
+
+	}
+
+	public void setDocument(IDocument document) {
+		// TODO Auto-generated method stub
+
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java
new file mode 100644
index 0000000..958cf70
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java
@@ -0,0 +1,119 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITextHover;
+import org.eclipse.jface.text.contentassist.ContentAssistant;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.text.contentassist.IContentAssistant;
+import org.eclipse.jface.text.presentation.IPresentationReconciler;
+import org.eclipse.jface.text.presentation.PresentationReconciler;
+import org.eclipse.jface.text.reconciler.IReconciler;
+import org.eclipse.jface.text.reconciler.MonoReconciler;
+import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
+import org.eclipse.jface.text.source.IAnnotationHover;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.text.hover.AutoconfTextHover;
+import org.eclipse.ui.editors.text.TextSourceViewerConfiguration;
+
+
+public class AutoconfSourceViewerConfiguration extends
+		TextSourceViewerConfiguration {
+
+	private ITextHover acHover;
+	private IAnnotationHover aaHover;
+	private AutoconfEditor fEditor;
+	
+	public AutoconfSourceViewerConfiguration(IPreferenceStore prefs, AutoconfEditor editor) {
+		super(prefs);
+		fEditor = editor;
+	}
+	
+	/*
+	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getConfiguredDocumentPartitioning(org.eclipse.jface.text.source.ISourceViewer)
+	 */
+	public String getConfiguredDocumentPartitioning(ISourceViewer sourceViewer) {
+		return AutoconfEditor.AUTOCONF_PARTITIONING;
+	}
+
+	/*
+	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getContentAssistant(org.eclipse.jface.text.source.ISourceViewer)
+	 */
+	public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
+		ContentAssistant assistant = new ContentAssistant();
+		
+		IContentAssistProcessor macroContentAssistProcessor =
+			new AutoconfMacroContentAssistProcessor(new AutoconfMacroCodeScanner(), fEditor);
+		assistant.setContentAssistProcessor(macroContentAssistProcessor, AutoconfPartitionScanner.AUTOCONF_MACRO);
+		assistant.setContentAssistProcessor(macroContentAssistProcessor, IDocument.DEFAULT_CONTENT_TYPE);
+		assistant.enableAutoActivation(true);
+		assistant.setAutoActivationDelay(500);
+		assistant.setProposalPopupOrientation(IContentAssistant.PROPOSAL_OVERLAY);
+		assistant.setContextInformationPopupOrientation(IContentAssistant.CONTEXT_INFO_ABOVE);
+		assistant.setInformationControlCreator(AutoconfTextHover.getInformationControlCreator());
+		
+		return assistant;
+	}
+	
+	/* (non-Javadoc)
+	 * Method declared on SourceViewerConfiguration
+	 */
+	public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
+		return new String[] { IDocument.DEFAULT_CONTENT_TYPE,
+							  AutoconfPartitionScanner.AUTOCONF_MACRO,
+							  AutoconfPartitionScanner.AUTOCONF_COMMENT};
+	}
+	
+	public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) {
+		if (acHover == null)
+			acHover = new AutoconfTextHover(fEditor);
+		return acHover;
+	}
+	
+	public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) {
+		if (aaHover == null)
+			aaHover = new AutoconfAnnotationHover();
+		return aaHover;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getReconciler(org.eclipse.jface.text.source.ISourceViewer)
+	 */
+	public IReconciler getReconciler(ISourceViewer sourceViewer) {
+		MonoReconciler reconciler= new MonoReconciler(new AutoconfReconcilingStrategy(fEditor), false);
+		reconciler.setDelay(1000);
+		reconciler.setProgressMonitor(new NullProgressMonitor());
+		return reconciler;
+	}
+	/* (non-Javadoc)
+	 * Method declared on SourceViewerConfiguration
+	 */
+	public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
+		PresentationReconciler reconciler = new PresentationReconciler();
+
+		DefaultDamagerRepairer dr= new AutoconfMacroDamagerRepairer(new AutoconfMacroCodeScanner());
+		reconciler.setDamager(dr, AutoconfPartitionScanner.AUTOCONF_MACRO);
+		reconciler.setRepairer(dr, AutoconfPartitionScanner.AUTOCONF_MACRO);
+		
+		dr= new DefaultDamagerRepairer(new AutoconfCodeScanner());
+		reconciler.setDamager(dr, AutoconfPartitionScanner.AUTOCONF_COMMENT);
+		reconciler.setRepairer(dr, AutoconfPartitionScanner.AUTOCONF_COMMENT);
+		
+		dr= new MultilineRuleDamagerRepairer(new AutoconfCodeScanner());
+		reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
+		reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
+		
+		return reconciler;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfWhitespaceDetector.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfWhitespaceDetector.java
new file mode 100644
index 0000000..1219c8d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfWhitespaceDetector.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.rules.IWhitespaceDetector;
+
+public class AutoconfWhitespaceDetector implements IWhitespaceDetector {
+
+	public boolean isWhitespace(char c) {
+		return (c == ' ' || c == '\t' || c == '\n' || c == '\r');
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfWordDetector.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfWordDetector.java
new file mode 100644
index 0000000..1017f97
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfWordDetector.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.rules.IWordDetector;
+
+public class AutoconfWordDetector implements IWordDetector {
+
+	private static final String correctStartSpecChars = "%*().><"; //$NON-NLS-1$
+	private static final String correctSpecChars = "@$/\\><"; //$NON-NLS-1$
+
+	/**
+	 * @see IWordDetector#isWordPart(character)
+	 */
+	public boolean isWordPart(char character) {
+		return Character.isLetterOrDigit(character) || (correctSpecChars.indexOf(character) >= 0);
+	}
+
+	/**
+	 * @see IWordDetector#isWordStart(char)
+	 */
+	public boolean isWordStart(char character) {
+		return Character.isLetterOrDigit(character) || (correctStartSpecChars.indexOf(character) >= 0);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolEditorActionDefinitionIds.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolEditorActionDefinitionIds.java
new file mode 100644
index 0000000..74d4f16
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolEditorActionDefinitionIds.java
@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+
+public interface IAutotoolEditorActionDefinitionIds {
+	public static final String SHOW_TOOLTIP = AutotoolsUIPlugin.getUniqueIdentifier() + ".editors.text.show.tooltip"; //$NON-NLS-1$
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolHelpContextIds.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolHelpContextIds.java
new file mode 100644
index 0000000..cd822f4
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolHelpContextIds.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+
+public interface IAutotoolHelpContextIds {
+	public static final String PREFIX = AutotoolsUIPlugin.getUniqueIdentifier();
+	public static final String AC_EDITOR_VIEW = PREFIX + "autoconf_editor"; //$NON-NLS-1$
+	public static final String SHOW_TOOLTIP_ACTION = PREFIX + "show_tooltip_action"; //$NON-NLS-1$
+	public static final String CONTENT_ASSIST = PREFIX + "content_assist"; //$NON-NLS-1$
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolsEditor.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolsEditor.java
new file mode 100644
index 0000000..0a2c730
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolsEditor.java
@@ -0,0 +1,18 @@
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.IReconcilingParticipant;
+import org.eclipse.ui.texteditor.ITextEditor;
+
+
+public interface IAutotoolsEditor extends ITextEditor {
+	
+	public Object getAdapter(Class<?> key);
+	
+	/**
+	 * Adds the given listener.
+	 * Has no effect if an identical listener was not already registered.
+	 * 
+	 * @param listener	The reconcile listener to be added
+	 */
+	public void addReconcilingParticipant(IReconcilingParticipant listener);
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/InlineDataRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/InlineDataRule.java
new file mode 100644
index 0000000..658bae4
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/InlineDataRule.java
@@ -0,0 +1,165 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.IWhitespaceDetector;
+import org.eclipse.jface.text.rules.IWordDetector;
+import org.eclipse.jface.text.rules.Token;
+
+public class InlineDataRule implements IRule {
+	/**
+	 * The default token to be returned on success and if nothing else has been
+	 * specified.
+	 */
+	protected IToken token;
+
+	protected IWordDetector fDetector;
+	protected IWhitespaceDetector fWsDetector = new AutoconfWhitespaceDetector();
+
+	/** The column constraint */
+	protected int fColumn = UNDEFINED;
+
+	/** Internal setting for the un-initialized column constraint */
+	protected static final int UNDEFINED = -1;
+
+	/** Buffer used for pattern detection */
+	private StringBuffer fBuffer = new StringBuffer();
+
+	private String fStartingSequence = "<<";
+
+	public InlineDataRule(IToken inToken) {
+		token = inToken;
+	}
+
+	// Confirm an EOL delimeter after already matching first delimeter character.
+	protected boolean confirmDelimeter(ICharacterScanner scanner, char[] delimeter) {
+		int c = scanner.read();
+		StringBuffer buffer = new StringBuffer();
+		buffer.append((char)c);
+		for (int i = 1; i < delimeter.length; ++i) {
+			if (c == delimeter[i]) {
+				c = scanner.read();
+				buffer.append((char)c);
+			} else {
+				for (int j = buffer.length() - 1; j >= 0; j--)
+					scanner.unread();
+				return false;
+			}
+		}
+		scanner.unread();
+		return true;
+	}
+	public IToken evaluate(ICharacterScanner scanner) {
+		int c = scanner.read();
+		fBuffer.setLength(0);
+
+		// Looking for <<WORD or <<-WORD or <<'WORD' at end of line.
+		for (int i = 0; i < fStartingSequence.length(); i++) {
+			fBuffer.append((char) c);
+			if (fStartingSequence.charAt(i) != c) {
+				unreadBuffer(scanner);
+				return Token.UNDEFINED;
+			}
+			c = scanner.read();
+		}
+
+		char[][] lineDelimeters = scanner.getLegalLineDelimiters();
+		StringBuffer endMarkerBuffer = new StringBuffer();
+		if (c == '-') {
+			fBuffer.append((char)c);
+			c = scanner.read();
+		} else if (c == '\'') {
+			fBuffer.append((char)c);
+			c = scanner.read();
+		}
+		
+		while (c != ICharacterScanner.EOF &&
+				Character.isJavaIdentifierPart((char)c) &&
+				c != '\'') {
+			fBuffer.append((char)c);
+			endMarkerBuffer.append((char)c);
+			c = scanner.read();
+		}
+		
+		if (c == '\'') {
+			fBuffer.append((char)c);
+			c = scanner.read();
+		}
+		
+		if (endMarkerBuffer.length() == 0) {
+			unreadBuffer(scanner);
+			return Token.UNDEFINED;
+		}
+			
+		// At this point we read until we find id by itself on its own line
+		boolean eol = false;
+		boolean finished = false;
+		boolean foundMarker = false;
+		String endMarker = endMarkerBuffer.toString();
+		while (!finished && c != ICharacterScanner.EOF) {
+			for (int i = 0; i < lineDelimeters.length; ++i) {
+				if (c == lineDelimeters[i][0]) {
+					if (confirmDelimeter(scanner, lineDelimeters[i])) {
+						c = scanner.read();
+						eol = true;
+						break;
+					}
+				}
+			}
+			if (eol) {
+				eol = false;
+				if (foundMarker) {
+					// We get here if we have found the marker by itself
+					// on the line
+					finished = true;
+				} else {
+					foundMarker = false;
+					int j = 0;
+					while (j < endMarker.length()) {
+						if (c == endMarker.charAt(j)) {
+							c = scanner.read();
+							++j;
+						} else {
+							break;
+						}
+					}
+					if (j == endMarker.length()) {
+						foundMarker = true;
+					}
+				}
+			} else {
+				// otherwise ignore all other characters
+				eol = false;
+				foundMarker = false;
+				c = scanner.read();
+			}
+		}
+
+		// unread last character
+		scanner.unread();
+		return token;
+	}
+
+	/**
+	 * Returns the characters in the buffer to the scanner.
+	 * 
+	 * @param scanner
+	 *            the scanner to be used
+	 */
+	protected void unreadBuffer(ICharacterScanner scanner) {
+		for (int i = fBuffer.length() - 1; i >= 0; i--)
+			scanner.unread();
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/MultilineRuleDamagerRepairer.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/MultilineRuleDamagerRepairer.java
new file mode 100644
index 0000000..7f9329f
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/MultilineRuleDamagerRepairer.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import org.eclipse.jface.text.DocumentEvent;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITypedRegion;
+import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
+import org.eclipse.jface.text.rules.ITokenScanner;
+
+public class MultilineRuleDamagerRepairer extends DefaultDamagerRepairer {
+	
+	
+	/**
+	 * Creates a damager/repairer that uses the given scanner. The scanner may not be <code>null</code>
+	 * and is assumed to return only token that carry text attributes.
+	 *
+	 * @param scanner the token scanner to be used, may not be <code>null</code>
+	 */
+	public MultilineRuleDamagerRepairer(ITokenScanner scanner) {
+		super(scanner);
+	}
+
+	/*
+	 * @see IPresentationDamager#getDamageRegion(ITypedRegion, DocumentEvent, boolean)
+	 */
+	public IRegion getDamageRegion(ITypedRegion partition, DocumentEvent e, boolean documentPartitioningChanged) {
+		// In the case of a partition with multiline rules, we will punt to
+		// reparse the entire partition because we don't know if the line being
+		// edited is in the middle of an area covered by a multiline rule.  In
+		// such a case, we need to back up and find the start sequence of the
+		// rule.  It is easiest to just reparse the whole partition.
+		return partition;
+	}
+	
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/ParseException.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/ParseException.java
new file mode 100644
index 0000000..d3787eb
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/ParseException.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+public class ParseException extends Exception {
+	
+	static final long serialVersionUID = 1;
+	String message;
+	int severity;
+	int lineNumber;
+	int startColumn;
+	int endColumn;
+	public int getEndColumn() {
+		return endColumn;
+	}
+	public void setEndColumn(int endColumn) {
+		this.endColumn = endColumn;
+	}
+	public int getLineNumber() {
+		return lineNumber;
+	}
+	public void setLineNumber(int lineNumber) {
+		this.lineNumber = lineNumber;
+	}
+	public String getMessage() {
+		return message;
+	}
+	public void setMessage(String message) {
+		this.message = message;
+	}
+	public int getStartColumn() {
+		return startColumn;
+	}
+	public void setStartColumn(int startColumn) {
+		this.startColumn = startColumn;
+	}
+	public ParseException(String message, int lineNumber, int startColumn, int endColumn, int severity) {
+		super();
+		this.message = message;
+		this.lineNumber = lineNumber;
+		this.startColumn = startColumn;
+		this.endColumn = endColumn;
+		this.severity = severity;
+	}
+	public int getSeverity() {
+		return severity;
+	}
+	public void setSeverity(int severity) {
+		this.severity = severity;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RecursiveSingleLineRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RecursiveSingleLineRule.java
new file mode 100644
index 0000000..f5818ab
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RecursiveSingleLineRule.java
@@ -0,0 +1,196 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import java.util.ArrayList;
+
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.SingleLineRule;
+import org.eclipse.jface.text.rules.Token;
+
+public class RecursiveSingleLineRule extends SingleLineRule {
+	
+	private ArrayList<IRule> rules;
+	private int evalIndex;
+	private int startIndex;
+	private int endIndex;
+	private int endBoundary;
+	private String startSequence;
+	private String endSequence;
+	/**
+	 * Creates a rule for the given starting and ending sequence
+	 * which, if detected, will return the specified token.
+	 *
+	 * @param startSequence the pattern's start sequence
+	 * @param endSequence the pattern's end sequence
+	 * @param token the token to be returned on success
+	 */
+	public RecursiveSingleLineRule(String startSequence, String endSequence, IToken token) {
+		this(startSequence, endSequence, token, (char) 0);
+	}
+
+	/**
+	 * Creates a rule for the given starting and ending sequence
+	 * which, if detected, will return the specified token.
+	 * Any character which follows the given escape character
+	 * will be ignored.
+	 *
+	 * @param startSequence the pattern's start sequence
+	 * @param endSequence the pattern's end sequence
+	 * @param token the token to be returned on success
+	 * @param escapeCharacter the escape character
+	 */
+	public RecursiveSingleLineRule(String startSequence, String endSequence, IToken token, char escapeCharacter) {
+		this(startSequence, endSequence, token, escapeCharacter, false);
+	}
+
+	/**
+	 * Creates a rule for the given starting and ending sequence
+	 * which, if detected, will return the specified token. Alternatively, the
+	 * line can also be ended with the end of the file.
+	 * Any character which follows the given escape character
+	 * will be ignored.
+	 *
+	 * @param startSequence the pattern's start sequence
+	 * @param endSequence the pattern's end sequence
+	 * @param token the token to be returned on success
+	 * @param escapeCharacter the escape character
+	 * @param breaksOnEOF indicates whether the end of the file successfully terminates this rule
+	 * @since 2.1
+	 */
+	public RecursiveSingleLineRule(String startSequence, String endSequence, IToken token, char escapeCharacter, boolean breaksOnEOF) {
+		super(startSequence, endSequence, token, escapeCharacter, breaksOnEOF);
+		this.startSequence = startSequence;
+		this.endSequence = endSequence;
+		rules = new ArrayList<IRule>();
+		startIndex = 0;
+		endIndex = 0;
+	}
+
+	/**
+	 * Creates a rule for the given starting and ending sequence
+	 * which, if detected, will return the specified token. Alternatively, the
+	 * line can also be ended with the end of the file.
+	 * Any character which follows the given escape character
+	 * will be ignored. In addition, an escape character immediately before an
+	 * end of line can be set to continue the line.
+	 *
+	 * @param startSequence the pattern's start sequence
+	 * @param endSequence the pattern's end sequence
+	 * @param token the token to be returned on success
+	 * @param escapeCharacter the escape character
+	 * @param breaksOnEOF indicates whether the end of the file successfully terminates this rule
+	 * @param escapeContinuesLine indicates whether the specified escape character is used for line
+	 *        continuation, so that an end of line immediately after the escape character does not
+	 *        terminate the line, even if <code>breakOnEOL</code> is true
+	 * @since 3.0
+	 */
+	public RecursiveSingleLineRule(String startSequence, String endSequence, IToken token, char escapeCharacter, boolean breaksOnEOF, boolean escapeContinuesLine) {
+		super(startSequence, endSequence, token, escapeCharacter, breaksOnEOF, escapeContinuesLine);
+		this.startSequence = startSequence;
+		this.endSequence = endSequence;
+		rules = new ArrayList<IRule>();
+		startIndex = 0;
+		endIndex = 0;
+	}
+	
+	public void addRule(SingleLineRule rule) {
+		rules.add(rule);
+	}
+	
+	public IToken getSuccessToken() {
+		// We need to be aware of what success token we are referring to.
+		// The current internal rule index will help us determine which
+		// one.
+		if (evalIndex < rules.size()) {
+			SingleLineRule x = (SingleLineRule)rules.get(evalIndex);
+			return x.getSuccessToken();
+		}
+		return super.getSuccessToken();
+	}
+	
+	protected void backupScanner(ICharacterScanner scanner, int position) {
+		int count = scanner.getColumn() - position;
+		while (count-- > 0)
+			scanner.unread();
+	}
+	
+	public IToken evaluate(ICharacterScanner scanner, boolean resume) {
+		int column = scanner.getColumn();
+		// Check if we are at EOF, in which case rules don't hold
+		if (column < 0)
+			return Token.UNDEFINED;
+		if (!resume) {
+			evalIndex = 0;
+			// Check if we are within outer rule boundaries.
+			if (column >= endIndex || column < startIndex) {
+				// If not, then we should evaluate to see if the
+				// outer rule is true starting at the current position.
+				startIndex = scanner.getColumn();
+				if (super.evaluate(scanner, false) != Token.UNDEFINED) {
+					// Outer rule is true for a section.  Now we can
+					// set the boundaries for the internal rules.
+					// End boundary for internal rules is the start of
+					// the end sequence.
+					endIndex = scanner.getColumn();
+					endBoundary = endIndex - endSequence.length();
+					// Back up scanner to just after start sequence.
+					backupScanner(scanner, startIndex + startSequence.length());
+					return super.getSuccessToken();
+				}
+				else
+					// Outer rule doesn't hold.
+					return Token.UNDEFINED;
+			}
+		}
+
+		// At this point, we want to subdivide up the area covered by the
+		// outer rule into success tokens for internal areas separated by
+		// areas of the outer rule.
+		
+		int start = scanner.getColumn();
+		column = start;
+		while (column < endBoundary) {
+			while (evalIndex < rules.size()) {
+				SingleLineRule x = (SingleLineRule)rules.get(evalIndex);
+				IToken token = x.evaluate(scanner, false);
+				if (!token.isUndefined()) {
+					// Found internal token.  If we had to read to get
+					// to the start of the internal token, then back up
+					// the scanner to the start of the internal token and
+					// return the initial read area as part of an outer token.
+					// Otherwise, return the internal token.
+					if (column == start) {
+						evalIndex = 0;
+						return token;
+					} else {
+						backupScanner(scanner, column);
+						return super.getSuccessToken();
+					}
+				}
+				++evalIndex;
+			}
+			evalIndex = 0;
+			scanner.read();
+			++column;
+		}
+		
+		// Outside internal area.  Read until end of outer area and return
+		// outer token.
+		while (column++ < endIndex)
+			scanner.read();
+		startIndex = 0;
+		endIndex = 0;
+		return super.getSuccessToken();
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RestrictedEndOfLineRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RestrictedEndOfLineRule.java
new file mode 100644
index 0000000..80f7904
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RestrictedEndOfLineRule.java
@@ -0,0 +1,130 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors;
+
+import java.util.ArrayList;
+
+import org.eclipse.jface.text.rules.EndOfLineRule;
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.SingleLineRule;
+import org.eclipse.jface.text.rules.Token;
+
+public class RestrictedEndOfLineRule extends EndOfLineRule {
+	
+	private ArrayList<IRule> rules;
+	private int startIndex;
+	private int endIndex;
+	private String startSequence;
+	private String restrictedChars;
+	/**
+	 * Creates a rule for the given starting and ending sequence
+	 * which, if detected, will return the specified token.
+	 *
+	 * @param startSequence the pattern's start sequence
+	 * @param restrictedChars chars that stop the sequence
+	 * @param token the token to be returned on success
+	 */
+	public RestrictedEndOfLineRule(String startSequence, String restrictedChars, IToken token) {
+		this(startSequence, restrictedChars, token, (char) 0);
+	}
+
+	/**
+	 * Creates a rule for the given starting and ending sequence
+	 * which, if detected, will return the specified token.
+	 * Any character which follows the given escape character
+	 * will be ignored.
+	 *
+	 * @param startSequence the pattern's start sequence
+	 * @param restrictedChars chars that stop the sequence
+	 * @param token the token to be returned on success
+	 * @param escapeCharacter the escape character
+	 */
+	public RestrictedEndOfLineRule(String startSequence, String restrictedChars, IToken token, char escapeCharacter) {
+		this(startSequence, restrictedChars, token, escapeCharacter, false);
+	}
+
+	/**
+	 * Creates a rule for the given starting and ending sequence
+	 * which, if detected, will return the specified token. Alternatively, the
+	 * line can also be ended with the end of the file.
+	 * Any character which follows the given escape character
+	 * will be ignored.
+	 *
+	 * @param startSequence the pattern's start sequence
+	 * @param restrictedChars chars that stop the sequence
+	 * @param token the token to be returned on success
+	 * @param escapeCharacter the escape character
+	 * @param breaksOnEOF indicates whether the end of the file successfully terminates this rule
+	 * @since 2.1
+	 */
+	public RestrictedEndOfLineRule(String startSequence, String restrictedChars, IToken token, char escapeCharacter, boolean breaksOnEOF) {
+		super(startSequence, token, escapeCharacter, breaksOnEOF);
+		this.startSequence = startSequence;
+		this.restrictedChars = restrictedChars;
+		rules = new ArrayList<IRule>();
+		startIndex = 0;
+		endIndex = 0;
+	}
+
+	
+	public void addRule(SingleLineRule rule) {
+		rules.add(rule);
+	}
+	
+	
+	protected void backupScanner(ICharacterScanner scanner, int position) {
+		int count = scanner.getColumn() - position;
+		while (count-- > 0)
+			scanner.unread();
+	}
+	
+	public IToken evaluate(ICharacterScanner scanner, boolean resume) {
+		int column = scanner.getColumn();
+		// Check if we are at EOF, in which case rules don't hold
+		if (column < 0)
+			return Token.UNDEFINED;
+		if (!resume) {
+			startIndex = scanner.getColumn();
+			if (super.evaluate(scanner, false) != Token.UNDEFINED) {
+				// Outer rule is true for a section.  Now we can
+				// set the boundaries for the internal rules.
+				// End boundary for internal rules is the start of
+				// the end sequence.
+				endIndex = scanner.getColumn();
+				// Back up scanner to just after start sequence.
+				backupScanner(scanner, startIndex + startSequence.length());
+			}
+			else
+				// Base rule doesn't hold.
+				return Token.UNDEFINED;
+		}
+
+		// At this point, we want to check for restricted chars in the
+		// token.  If we find them, we stop there.
+		
+		int start = scanner.getColumn();
+		column = start;
+		while (column < endIndex) {
+			int ch = scanner.read();
+			if (ch == ICharacterScanner.EOF
+					|| restrictedChars.indexOf(ch) >= 0) {
+				scanner.unread();
+				return getSuccessToken();
+			}
+			++column;
+		}
+		startIndex = 0;
+		endIndex = 0;
+		return getSuccessToken();
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java
new file mode 100644
index 0000000..1b1d792
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java
@@ -0,0 +1,128 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.outline;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.AutoconfEditor;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfElement;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.texteditor.ITextEditor;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+
+
+public class AutoconfContentOutlinePage extends ContentOutlinePage {
+
+	private ITextEditor editor;
+	private IEditorInput input;
+	
+	public AutoconfContentOutlinePage(AutoconfEditor editor) {
+		super();
+		this.editor = editor;
+	}
+
+	public void setInput(IEditorInput editorInput) {
+		this.input = editorInput;
+		update();
+	}
+
+	@SuppressWarnings("unchecked")
+	protected ISelection updateSelection(ISelection sel) {
+		ArrayList<AutoconfElement> newSelection= new ArrayList<AutoconfElement>();
+		if (sel instanceof IStructuredSelection) {
+			Iterator iter= ((IStructuredSelection)sel).iterator();
+			for (;iter.hasNext();) {
+				//ICElement elem= fInput.findEqualMember((ICElement)iter.next());
+				Object o = iter.next();
+				if (o instanceof AutoconfElement) {
+					newSelection.add((AutoconfElement)o);
+				}
+			}
+		}
+		return new StructuredSelection(newSelection);
+	}
+
+	public void update() {
+		//set the input so that the outlines parse can be called
+		//update the tree viewer state
+		final TreeViewer viewer = getTreeViewer();
+
+		if (viewer != null)
+		{
+			final Control control = viewer.getControl();
+			if (control != null && !control.isDisposed())
+			{
+				control.getDisplay().asyncExec(new Runnable() {
+					public void run() {
+						if (!control.isDisposed()) {
+//							control.setRedraw(false);
+//							if (input != null)
+//								viewer.setInput(input);
+//							viewer.expandAll();
+//							control.setRedraw(true);
+							ISelection sel= viewer.getSelection();
+							viewer.setSelection(updateSelection(sel));		
+							viewer.refresh();
+						}
+					}
+				});
+			}
+		}
+	}
+	
+	public void createControl(Composite parent) {
+
+		super.createControl(parent);
+
+		TreeViewer viewer= getTreeViewer();
+		viewer.setContentProvider(new AutoconfContentProvider(editor));
+		viewer.setLabelProvider(new AutoconfLabelProvider());
+		viewer.addSelectionChangedListener(this);
+
+		if (input != null)
+			viewer.setInput(input);
+	}
+	
+	/*
+	 * Change in selection
+	 */
+	public void selectionChanged(SelectionChangedEvent event)
+	{
+		super.selectionChanged(event);
+		
+		//find out which item in tree viewer we have selected, and set highlight range accordingly
+		ISelection selection = event.getSelection();
+		if (selection.isEmpty()) {
+			editor.resetHighlightRange();
+		} else {
+			AutoconfElement element = (AutoconfElement) ((IStructuredSelection) selection)
+					.getFirstElement();		
+			
+			try {
+				int offset = element.getStartOffset();
+				int length = element.getEndOffset() - offset;
+				editor.setHighlightRange(offset, length, true);
+				editor.selectAndReveal(offset, length);
+			} catch (IllegalArgumentException x) {
+				editor.resetHighlightRange();
+			}
+		}
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentProvider.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentProvider.java
new file mode 100644
index 0000000..ea2e4db
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentProvider.java
@@ -0,0 +1,94 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.outline;
+
+import org.eclipse.jface.text.BadPositionCategoryException;
+import org.eclipse.jface.text.DefaultPositionUpdater;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IPositionUpdater;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.AutoconfEditor;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfElement;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+import org.eclipse.ui.texteditor.ITextEditor;
+
+
+public class AutoconfContentProvider implements ITreeContentProvider {
+
+	private IDocumentProvider documentProvider;
+	private AutoconfEditor editor;
+	protected final static String SECTION_POSITIONS = "section_positions";
+	protected IPositionUpdater positionUpdater = new DefaultPositionUpdater(SECTION_POSITIONS);
+	
+	public AutoconfContentProvider(ITextEditor editor) {
+		if (editor instanceof AutoconfEditor) {
+			this.editor = (AutoconfEditor) editor;
+		}
+		this.documentProvider = editor.getDocumentProvider();
+	}
+	
+	public void dispose() {
+		// TODO Auto-generated method stub
+
+	}
+
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		if (oldInput != null)
+		{
+			IDocument document = documentProvider.getDocument(oldInput);
+			if (document != null)
+			{
+				try
+				{
+					document.removePositionCategory(SECTION_POSITIONS);
+				}
+				catch (BadPositionCategoryException x)
+				{
+				}
+				document.removePositionUpdater(positionUpdater);
+			}
+		}
+
+		if (newInput != null)
+		{
+			IDocument document = documentProvider.getDocument(newInput);
+			if (document != null)
+			{
+				document.addPositionCategory(SECTION_POSITIONS);
+				document.addPositionUpdater(positionUpdater);
+			}
+		}
+	}
+
+	public Object[] getChildren(Object parentElement) {
+		if (parentElement instanceof AutoconfElement) {
+			AutoconfElement element = (AutoconfElement)parentElement;
+			return element.getChildren();
+		}
+		return new Object[0];
+	}
+
+	public Object getParent(Object element) {
+		return null;
+	}
+
+	public boolean hasChildren(Object element) {
+		if (element instanceof AutoconfElement) {
+			return ((AutoconfElement)element).hasChildren();
+		} 
+		return false;
+	}
+
+	public Object[] getElements(Object inputElement) {
+		return this.getChildren(editor.getRootElement());
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java
new file mode 100644
index 0000000..944718e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java
@@ -0,0 +1,100 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc., (c) 2008 NOKIA Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *     Ed Swartz (NOKIA) - refactoring
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.outline;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfCaseConditionElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfCaseElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfElifElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfElseElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfForElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfIfElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfMacroArgumentElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfMacroElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfSelectElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfUntilElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfWhileElement;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.AutotoolsUIPluginImages;
+import org.eclipse.swt.graphics.Image;
+
+
+public class AutoconfLabelProvider implements ILabelProvider {
+
+	public AutoconfLabelProvider() {
+		super();
+	}
+	
+	public void addListener(ILabelProviderListener listener) {
+	}
+
+	public void dispose() {
+	}
+
+	public boolean isLabelProperty(Object element, String property) {
+		return false;
+	}
+
+	public void removeListener(ILabelProviderListener listener) {
+	}
+
+	public Image getImage(Object element) {
+		if (element instanceof AutoconfIfElement)
+			return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_IF);
+		else if (element instanceof AutoconfElseElement)
+			return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_ELSE);
+		else if (element instanceof AutoconfElifElement)
+			return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_ELIF);
+		else if (element instanceof AutoconfCaseElement)
+			return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_CASE);
+		else if (element instanceof AutoconfCaseConditionElement)
+			return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_CONDITION);
+		else if (element instanceof AutoconfForElement)
+			return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_FOR);
+		else if (element instanceof AutoconfWhileElement)
+			return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_WHILE);
+		else if (element instanceof AutoconfUntilElement)
+			return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_WHILE);	// TODO
+		else if (element instanceof AutoconfSelectElement)
+			return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_WHILE);	// TODO
+		else if (element instanceof AutoconfMacroElement)
+			return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_ACMACRO);
+		else if (element instanceof AutoconfMacroArgumentElement)
+			return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_ACMACRO_ARG); // TODO
+		return null;
+	}
+
+	public String getText(Object element) {
+		if (element instanceof AutoconfElement) {
+			AutoconfElement e = (AutoconfElement)element;
+			String result;
+			String name = e.getName();
+			if (name.length() > 31)
+				name = name.substring(0, 31) + "...";
+			String var = e.getVar();
+			if (var != null) {
+				if (var.length() > 15)
+					var = var.substring(0, 15) + "...";
+				var = " " + var; //$NON-NLS-1$
+			} else {
+				var = "";
+			}
+			result = (name + var).replaceAll("(\r|\n| |\t|\f)+", " ");
+			return result;
+		} else if (element instanceof String) {
+			return (String) element;
+		}
+		return "";
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseConditionElement.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseConditionElement.java
new file mode 100644
index 0000000..d06e73d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseConditionElement.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfCaseConditionElement extends AutoconfElement {
+	
+	public AutoconfCaseConditionElement() {
+		super("");
+	}
+	
+	public AutoconfCaseConditionElement(String name) {
+		super(name);
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseElement.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseElement.java
new file mode 100644
index 0000000..c8ad284
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfCaseElement extends AutoconfElement {
+	
+	public AutoconfCaseElement() {
+		super("case"); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElement.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElement.java
new file mode 100644
index 0000000..4a804cb
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElement.java
@@ -0,0 +1,138 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+
+public class AutoconfElement {
+	
+	protected String name;
+	protected String var;
+	protected int startOffset;
+	protected int endOffset;
+	protected ArrayList<AutoconfElement> children;
+	protected AutoconfElement parent;
+	private IDocument document;
+	
+	public AutoconfElement(String name) {
+		this(name, null);
+	}
+	
+	public AutoconfElement(String name, String var) {
+		this.name = name;
+		this.var = var;
+		this.startOffset = 0;
+		this.children = new ArrayList<AutoconfElement>();
+	}
+	
+
+	public String toString() {
+		String source = getSource();
+		if (source == null) {
+			StringBuffer kids = new StringBuffer();
+			for (Iterator<AutoconfElement> iterator = children.iterator(); iterator.hasNext();) {
+				AutoconfElement kid = (AutoconfElement) iterator.next();
+				kids.append(kid.toString());
+				kids.append(","); //$NON-NLS-1$
+			}
+			source = kids.toString();
+		}
+		return getClass().getSimpleName() + ": '" + source + "'"; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+	
+	public void addChild(AutoconfElement element) {
+		children.add(element);
+		if (element.getParent() == null)
+			element.setParent(this);
+	}
+	
+	public void addSibling(AutoconfElement element) {
+		parent.addChild(element);
+	}
+	
+	public AutoconfElement getLastChild() {
+		if (hasChildren())
+			return (AutoconfElement)children.get(children.size() - 1);
+		return null;
+	}
+	
+	public AutoconfElement getParent() {
+		return parent;
+	}
+	
+	public void setParent(AutoconfElement parent) {
+		this.parent = parent;
+	}
+	
+	public AutoconfElement[] getChildren() {
+		return (AutoconfElement[]) children.toArray(new AutoconfElement[children.size()]);
+	}
+	
+	public boolean hasChildren() {
+		return !children.isEmpty();
+	}
+
+	public String getName() {
+		return name;
+	}
+	 
+	public void setName(String string) {
+		this.name = string;
+	}
+
+	
+	public String getVar() {
+		return var;
+	}
+	
+	public void setVar(String value) {
+		var = value;
+	}
+	
+	public void setDocument(IDocument document) {
+		this.document = document;
+	}
+	
+	public IDocument getDocument() {
+		return document;
+	}
+	
+	public void setStartOffset(int offset) {
+		this.startOffset = offset;
+	}
+	
+	public int getStartOffset() {
+		return startOffset;
+	}
+	
+	public void setEndOffset(int offset) {
+		this.endOffset = offset;
+	}
+	
+	public int getEndOffset() {
+		return endOffset;
+	}
+
+	public String getSource() {
+		if (document != null && startOffset >= 0 && endOffset >= startOffset) {
+			try {
+				return document.get(startOffset, endOffset - startOffset);
+			} catch (BadLocationException e) {
+				return null;
+			}
+		}
+		return null;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElifElement.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElifElement.java
new file mode 100644
index 0000000..a990ea8
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElifElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfElifElement extends AutoconfElement {
+	
+	public AutoconfElifElement() {
+		super("elif"); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElseElement.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElseElement.java
new file mode 100644
index 0000000..bbaa2c2
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElseElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfElseElement extends AutoconfElement {
+	
+	public AutoconfElseElement() {
+		super("else"); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfForElement.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfForElement.java
new file mode 100644
index 0000000..6b0ffcc
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfForElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfForElement extends AutoconfElement {
+	
+	public AutoconfForElement() {
+		super("for"); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfIfElement.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfIfElement.java
new file mode 100644
index 0000000..6ad6589
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfIfElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfIfElement extends AutoconfElement {
+	
+	public AutoconfIfElement() {
+		super("if"); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroArgumentElement.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroArgumentElement.java
new file mode 100644
index 0000000..96e3e3d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroArgumentElement.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+/**
+ * This is a macro argument node.  It may also hold
+ * other AutoconfMacroElements.  The source range includes any quotes around an argument
+ * but the #getName() has them stripped.
+ * @author eswartz
+ *
+ */
+public class AutoconfMacroArgumentElement extends AutoconfElement {
+
+	public AutoconfMacroArgumentElement() {
+		super(""); // //$NON-NLS-N$
+	}
+	public AutoconfMacroArgumentElement(String name) {
+		super(name);
+	}
+	public String getVar() {
+		return super.getVar();
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroDetector.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroDetector.java
new file mode 100644
index 0000000..b5c1373
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroDetector.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc., (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat Incorporated - initial API and implementation
+ *    Ed Swartz (Nokia) - refactoring
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+import java.util.regex.Pattern;
+
+/**
+ *
+ */
+public class AutoconfMacroDetector implements IAutoconfMacroDetector {
+
+	private static final Pattern AUTOCONF_MACRO_PATTERN = Pattern.compile("PKG_.*|AC_.*|AM_.*|m4.*"); //$NON-NLS-1$
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.cdt.autotools.core.ui.editors.parser.IAutoconfMacroDetector#isMacroIdentifier(java.lang.String)
+	 */
+	public boolean isMacroIdentifier(String name) {
+		return AUTOCONF_MACRO_PATTERN.matcher(name).matches();
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java
new file mode 100644
index 0000000..1168f91
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *     Ed Swartz (NOKIA Inc) - support standalone parser
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+/**
+ * A call to a macro.
+ * <p>
+ * Macro element now stores arguments as AutoconfMacroElement or AutoconfMacroArgument children 
+ *
+ */
+public class AutoconfMacroElement extends AutoconfElement {
+
+	public AutoconfMacroElement(String name) {
+		super(name);
+	}
+
+	public String getVar() {
+		if (children.size() > 0)
+			return getParameter(0);
+		else
+			return null;
+	}
+	public int getParameterCount() {
+		return children.size();
+	}
+
+	public String getParameter(int num) {
+		return ((AutoconfElement) children.get(num)).getName();
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java
new file mode 100644
index 0000000..e684ab2
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java
@@ -0,0 +1,136 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.ui.IStorageEditorInput;
+import org.eclipse.ui.texteditor.MarkerUtilities;
+
+
+public class AutoconfOutlineErrorHandler {
+	
+	public static final String PARSE_ERROR_MARKER_ID = AutotoolsUIPlugin.PLUGIN_ID
+	+ ".outlineparsefileerror"; //$NON-NLS-1$
+	
+	private IFile file;
+	private IDocument document;
+	
+	public AutoconfOutlineErrorHandler(IStorageEditorInput input, IDocument document)
+	{
+		this.document = document;
+		IWorkspaceRoot root = CCorePlugin.getWorkspace().getRoot();
+		try {
+			IPath absPath = input.getStorage().getFullPath();
+			IPath rootPath = root.getLocation();
+			IPath relPath = new Path("");
+
+			for (int i = 0; i < rootPath.segmentCount(); ++i) {
+				relPath = relPath.append("../"); //$NON-NLS-1$
+			}
+			relPath = relPath.append(absPath);
+			this.file = root.getFileForLocation(relPath);
+			if (this.file == null) {
+				this.file = root.getFile(relPath);
+			}
+		} catch (CoreException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	public IDocument getDocument() {
+		return document;
+	}
+	
+	public void handleError(ParseException e) {
+		if (!file.exists())
+			return;
+		
+		int lineNumber = e.getLineNumber();
+		
+		Map<String, Object> map = new HashMap<String, Object>();
+		MarkerUtilities.setLineNumber(map, lineNumber);
+		MarkerUtilities.setMessage(map, e.getMessage());
+		map.put(IMarker.MESSAGE, e.getMessage());
+		map.put(IMarker.LOCATION, file.getFullPath().toString());
+
+		Integer charStart = getCharOffset(lineNumber, e.getStartColumn());
+		if (charStart != null) {
+			map.put(IMarker.CHAR_START, charStart);
+		}
+		Integer charEnd = getCharOffset(lineNumber, e.getEndColumn());
+		if (charEnd != null) {
+			map.put(IMarker.CHAR_END, charEnd);
+		}
+		
+		// FIXME:  add severity level
+		map.put(IMarker.SEVERITY, new Integer(e.getSeverity()));
+		
+		try {
+			MarkerUtilities.createMarker(file, map, PARSE_ERROR_MARKER_ID);
+		} catch (CoreException ee) {
+			ee.printStackTrace();
+		}
+		return;
+	}
+	
+	public void removeAllExistingMarkers() {
+		if (!file.exists())
+			return;
+		
+		try	{
+			file.deleteMarkers(PARSE_ERROR_MARKER_ID, true, IResource.DEPTH_ZERO);
+		} catch (CoreException e1) {
+			e1.printStackTrace();
+		}
+	}
+
+	public void removeExistingMarkers(int offset, int length) {
+		if (!file.exists())
+			return;
+		
+		try	{
+			IMarker[] markers = file.findMarkers(PARSE_ERROR_MARKER_ID, true, IResource.DEPTH_ZERO);
+			// Delete all markers that start in the given document range.
+			for (int i = 0; i < markers.length; ++i) {
+				IMarker marker = markers[i];
+				int charEnd = MarkerUtilities.getCharEnd(marker);
+				int charStart = MarkerUtilities.getCharStart(marker);
+				if (charStart >= offset && charEnd <= (offset + length))
+					marker.delete();
+			}
+		} catch (CoreException e1) {
+			e1.printStackTrace();
+		}
+	}
+	
+	private Integer getCharOffset(int lineNumber, int columnNumber)	{
+		try	{
+			return new Integer(document.getLineOffset(lineNumber) + columnNumber);
+		} catch (BadLocationException e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfParser.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfParser.java
new file mode 100644
index 0000000..76963f3
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfParser.java
@@ -0,0 +1,1042 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc., (c) 2008 Nokia
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *     Ed Swartz (Nokia) - refactoring
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.AutoconfEditorMessages;
+
+
+/**
+ * Tokenizing autoconf parser, based on original work by Jeff Johnston 
+ * @author eswartz
+ */
+public class AutoconfParser {
+	
+	public static final String MISSING_SPECIFIER = "MissingSpecifier"; //$NON-NLS-1$
+	public static final String INVALID_SPECIFIER = "InvalidSpecifier"; //$NON-NLS-1$
+	public static final String INVALID_TERMINATION = "InvalidTermination"; //$NON-NLS-1$
+	public static final String UNTERMINATED_CONSTRUCT = "UnterminatedConstruct"; //$NON-NLS-1$
+	public static final String MISSING_CONDITION = "MissingCondition"; //$NON-NLS-1$
+	public static final String INVALID_ELIF = "InvalidElif"; //$NON-NLS-1$
+	public static final String INVALID_ELSE = "InvalidElse"; //$NON-NLS-1$
+	public static final String INVALID_FI = "InvalidFi"; //$NON-NLS-1$
+	public static final String INVALID_DONE = "InvalidDone"; //$NON-NLS-1$
+	public static final String INVALID_ESAC = "InvalidEsac"; //$NON-NLS-1$
+	public static final String INVALID_DO = "InvalidDo"; //$NON-NLS-1$
+	public static final String INVALID_THEN = "InvalidThen"; //$NON-NLS-1$
+	public static final String INVALID_IN = "InvalidIn"; //$NON-NLS-1$
+	public static final String IMPROPER_CASE_CONDITION = "ImproperCaseCondition"; //$NON-NLS-1$
+	public static final String UNTERMINATED_CASE_CONDITION = "UnterminatedCaseCondition"; //$NON-NLS-1$
+	public static final String UNTERMINATED_INLINE_DOCUMENT = "UnterminatedInlineDocument"; //$NON-NLS-1$
+	public static final String INCOMPLETE_INLINE_MARKER="IncompleteInlineMarker"; //$NON-NLS-1$
+	public static final String MISSING_INLINE_MARKER="MissingInlineMarker"; //$NON-NLS-1$
+	public static final String UNMATCHED_RIGHT_PARENTHESIS = "UnmatchedRightParenthesis"; //$NON-NLS-1$
+	public static final String UNMATCHED_LEFT_PARENTHESIS = "UnmatchedLeftParenthesis"; //$NON-NLS-1$
+	
+	private IAutoconfErrorHandler errorHandler;
+	private IAutoconfMacroValidator macroValidator;
+	private AutoconfTokenizer tokenizer;
+	private IAutoconfMacroDetector macroDetector;
+	
+	private static final String M4_BUILTINS =
+		"define undefine defn pushdef popdef indir builtin ifdef ifelse shift reverse cond " + //$NON-NLS-1$
+		"dumpdef traceon traceoff debugmode debugfile dnl changequote changecom changeword " + //$NON-NLS-1$
+		"m4wrap " + //$NON-NLS-1$
+		"include sinclude divert undivert divnum len index regexp substr translit patsubst " + //$NON-NLS-1$
+		"format incr decr eval syscmd esyscmd sysval mkstemp maketemp errprint m4exit " + //$NON-NLS-1$
+		"__file__ __line__ __program__ "; //$NON-NLS-1$
+	
+	private static List<String> m4builtins = new ArrayList<String>();
+	static {
+		m4builtins.addAll(Arrays.asList(M4_BUILTINS.split(" "))); //$NON-NLS-1$
+	}
+	
+	/**
+	 * Create a parser for autoconf-style sources.  
+	 * @param errorHandler
+	 * @param macroDetector
+	 * @param macroValidator
+	 */
+	public AutoconfParser(IAutoconfErrorHandler errorHandler,
+			IAutoconfMacroDetector macroDetector,
+			IAutoconfMacroValidator macroValidator) {
+		this.errorHandler = errorHandler;
+		this.macroDetector = macroDetector;
+		this.macroValidator = macroValidator;
+	}
+
+	/**
+	 * Parse the given document and produce an AutoconfElement tree
+	 * @param errorHandler
+	 * @param macroValidator
+	 * @param document
+	 * @return element tree
+	 */
+	public AutoconfElement parse(IDocument document) {
+		return parse(document, true);
+	}
+	
+	/**
+	 * Parse the given document and produce an AutoconfElement tree,
+	 * and control whether the initial quoting style is m4 style (`...')
+	 * or autoconf style ([ ... ]).
+	 * @param errorHandler
+	 * @param macroValidator
+	 * @param document
+	 * @param useAutoconfQuotes
+	 * @return element tree
+	 */
+	public AutoconfElement parse(IDocument document, boolean useAutoconfQuotes) {
+		this.tokenizer = new AutoconfTokenizer(document, errorHandler);
+		if (useAutoconfQuotes)
+			tokenizer.setM4Quote("[", "]"); //$NON-NLS-1$ //$NON-NLS-2$
+		
+		AutoconfElement root = new AutoconfRootElement();
+		Token eof = parseTopLevel(root);
+		
+		root.setStartOffset(0);
+		root.setDocument(document);
+		
+		setSourceEnd(root, eof);
+		
+		return root;
+	}
+
+
+	static class BlockEndCondition extends Exception {
+		/**
+		 * 
+		 */
+		private static final long serialVersionUID = 1L;
+		private Token token;
+
+		public BlockEndCondition(Token token) {
+			this.token = token;
+		}
+		
+		public Token getToken() {
+			return token;
+		}
+		
+	}
+
+	static class ExprEndCondition extends Exception {
+		/**
+		 * 
+		 */
+		private static final long serialVersionUID = 1L;
+		private Token token;
+
+		public ExprEndCondition(Token token) {
+			this.token = token;
+		}
+		
+		public Token getToken() {
+			return token;
+		}
+		
+	}
+
+	/**
+	 * Parse individual top-level nodes: divide text into macro calls
+	 * and recognized shell constructs.  Anything else is not accounted for.
+	 * @param parent
+	 * @return
+	 */
+	protected Token parseTopLevel(AutoconfElement parent) {
+		while (true) {
+			try {
+				parseStatement(parent);
+			} catch (BlockEndCondition e) {
+				// don't terminate here; we may have constructs closed too early
+				Token token = tokenizer.peekToken();
+				if (token.getType() == ITokenConstants.EOF)
+					return token; 
+			}
+		}
+	}
+	
+	/**
+	 * Parse a block of nodes, which starts with an expression and contains
+	 * subnodes.  Divide text into macro calls and recognized shell constructs.  
+	 * Anything else is not accounted for.
+	 * @param parent
+	 */
+	protected void parseBlock(AutoconfElement parent, Token open, AutoconfElement block) throws BlockEndCondition {
+		parent.addChild(block);
+		
+		setSourceStart(block, open);
+		
+		// get the expression part
+		Token token;
+		try {
+			token = parseBlockExpression(open, block);
+		} catch (BlockEndCondition e) {
+			setSourceEndBefore(block, e.getToken());
+			throw e;
+		}
+		
+		// parse the block proper
+		if (token.getType() != ITokenConstants.EOF) {
+			while (true) {
+				try {
+					parseStatement(block);
+				} catch (BlockEndCondition e) {
+					setSourceEnd(block, e.getToken());
+					return;
+				}
+			}
+		} else {
+			setSourceEnd(block, token);
+		}
+	}
+
+	private Token parseBlockExpression(Token open, AutoconfElement block) throws BlockEndCondition {
+		Token token;
+		try {
+			if (block instanceof AutoconfIfElement 
+					|| block instanceof AutoconfElifElement 
+					|| block instanceof AutoconfCaseElement 
+					|| block instanceof AutoconfWhileElement) {
+				token = parseExpression(block);
+			} else if (block instanceof AutoconfForElement) {
+				token = parseForExpression(block);
+			} else {
+				// no expression
+				return open;
+			}
+			block.setVar(getTokenSpanTextBetween(open, token));
+		} catch (BlockEndCondition e) {
+			// oops, premature end
+			setSourceEnd(block, e.getToken());
+			throw e;
+		}
+	
+		// check for expected token
+		while (true) {
+			token = tokenizer.readToken();
+			if (token.getType() == ITokenConstants.EOF)
+				break;
+			if (token.getType() != ITokenConstants.EOL)
+				break;
+		}
+		
+		if (token.getType() == ITokenConstants.SH_DO) {
+			checkBlockValidity(block, token, 
+					new Class[] { AutoconfForElement.class, AutoconfWhileElement.class },
+					INVALID_DO);
+		}
+		else if (token.getType() == ITokenConstants.SH_THEN) {
+			checkBlockValidity(block, token, 
+					new Class[] { AutoconfIfElement.class, AutoconfElifElement.class },
+					INVALID_THEN);
+		} 
+		else {
+			String exp;
+			if (block instanceof AutoconfIfElement || block instanceof AutoconfElifElement)
+				exp = "then";
+			else
+				exp = "do";
+			
+			handleError(block, token, AutoconfEditorMessages.getFormattedString(MISSING_SPECIFIER, exp));
+
+			// assume we're still in the block...
+			tokenizer.unreadToken(token);
+		}
+		return token;
+	}
+	
+	/**
+	 * Parse a case statement.  Scoop up statements into case conditional blocks.
+	 * <pre>
+	 * 'case' EXPR 'in' 
+	 * 		{ EXPR ')'  { STMTS } ';;' }
+	 * 'esac'
+	 * </pre>
+	 * @param parent
+	 * @return
+	 */
+	protected void parseCaseBlock(AutoconfElement parent, Token open, AutoconfElement block) throws BlockEndCondition {
+		parent.addChild(block);
+		
+		setSourceStart(block, open);
+		
+		// get the case expression, terminating at 'in'
+		Token token;
+		try {
+			token = parseCaseExpression(block);
+		} catch (BlockEndCondition e) {
+			// oops, premature end
+			setSourceEnd(block, e.getToken());
+			throw e;
+		}
+		
+		block.setVar(getTokenSpanTextBetween(open, token));
+		
+		// now get the statements, which are themselves blocks... just read statements
+		// that terminate with ';;' and stuff those into blocks.
+		
+		while (true) {
+			AutoconfCaseConditionElement condition = new AutoconfCaseConditionElement();
+
+			// skip EOLs and get the first "real" token
+			while (true) {
+				token = tokenizer.readToken();
+				setSourceStart(condition, token);
+				if (token.getType() == ITokenConstants.EOF)
+					break;
+				if (token.getType() == ITokenConstants.EOL)
+					continue;
+				break;
+			}
+			
+			if (token.getType() == ITokenConstants.SH_ESAC) {
+				break;
+			}
+			
+			try {
+				Token start = token;
+				token = parseCaseExpression(condition);
+				condition.setName(getTokenSpanTextFromUpTo(start, token));
+				
+				while (true) {
+					parseStatement(condition);
+				}
+			} catch (BlockEndCondition e) {
+				setSourceEnd(condition, e.getToken());
+				
+				if (condition.getSource().length() > 0)
+					block.addChild(condition);
+				
+				if (e.getToken().getType() != ITokenConstants.SH_CASE_CONDITION_END) {
+					token = e.getToken();
+					break;
+				}
+			}
+		}
+		
+		setSourceEnd(block, token);
+		
+		if (token.getType() != ITokenConstants.SH_ESAC) {
+			handleError(parent, token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, block.getName()));
+		}
+	}
+
+	private String getTokenSpanTextBetween(Token open, Token close) {
+		int startOffset = open.getOffset() + open.getLength();
+		int endOffset = close.getOffset();
+		if (open.getDocument() != close.getDocument())
+			return open.getText();
+		
+		String text;
+		try {
+			text = open.getDocument().get(startOffset, endOffset - startOffset).trim();
+		} catch (BadLocationException e) {
+			text = open.getText();
+			// TODO: error
+		}
+		
+		return text;
+	}
+
+	private String getTokenSpanTextFromUpTo(Token open, Token close) {
+		int startOffset = open.getOffset();
+		int endOffset = close.getOffset();
+		if (open.getDocument() != close.getDocument())
+			return open.getText();
+		
+		String text;
+		try {
+			text = open.getDocument().get(startOffset, endOffset - startOffset).trim();
+		} catch (BadLocationException e) {
+			text = open.getText();
+			// TODO: error
+		}
+		
+		return text;
+	}
+	private void setSourceStart(AutoconfElement block, Token open) {
+		int offset = open.getOffset();
+		block.setDocument(open.getDocument());
+		block.setStartOffset(offset);
+	}
+
+	private void setSourceEnd(AutoconfElement block, Token close) {
+		int offset = close.getOffset() + close.getLength();
+		if (block.getDocument() != null && block.getDocument() != close.getDocument())
+			throw new IllegalStateException();
+		block.setDocument(close.getDocument());
+		block.setEndOffset(offset);
+	}
+
+	private void setSourceEndBefore(AutoconfElement block, Token close) {
+		int offset = close.getOffset();
+		if (block.getDocument() != null && block.getDocument() != close.getDocument())
+			throw new IllegalStateException();
+		block.setDocument(close.getDocument());
+		block.setEndOffset(offset);
+	}
+
+	/**
+	 * Parse a single statement (macro call or a shell construct).
+	 * This can recursively invoke parseBlock() or parseStatement() to populate the tree.
+	 * Whenever a token terminates a block, we check its validity and then throw BlockEndCondition.
+	 * @param parent the parent into which to add statements.  The type of this element is used
+	 * to validate the legality of block closing tokens.
+	 */
+	protected void parseStatement(AutoconfElement parent) throws BlockEndCondition {
+	
+		boolean atStart = true;
+		
+		while (true) {
+			Token token = tokenizer.readToken();
+			
+			switch (token.getType()) {
+			// 0. Check EOF
+			case ITokenConstants.EOF:
+				AutoconfElement element = parent;
+				while (element != null && !(element instanceof AutoconfRootElement)) {
+					handleError(element, token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, element.getName()));
+					element = element.getParent();
+				}
+				throw new BlockEndCondition(token);
+			
+			
+			// 1. Check for end of statement
+			case ITokenConstants.EOL:
+			case ITokenConstants.SEMI:
+				return;
+			
+			
+			// 2. Check macro expansions
+			case ITokenConstants.WORD:
+				checkMacro(parent, token);
+				atStart = false;
+				break;
+			
+			// Check for shell constructs.  These should appear at the start of a line
+			// or after a semicolon.  If they don't,  just report an error and continue, 
+			// to be tolerant of our own lax parsing.
+			
+			// 3.a) Check dollar variables
+			case ITokenConstants.SH_DOLLAR:
+				// skip the next token
+				atStart = false;
+				token = tokenizer.readToken();
+				continue;
+				
+			// 3.b) Look for if/else/elif/fi constructs,
+			// being tolerant of nesting problems by allowing
+			// stranded else/elif nodes but reporting errors.
+			case ITokenConstants.SH_IF:
+				checkLineStart(parent, token, atStart);
+				parseBlock(parent, token, new AutoconfIfElement());
+				break;
+				
+			case ITokenConstants.SH_ELIF:
+				checkLineStart(parent, token, atStart);
+				checkBlockValidity(
+						parent, token, 
+						new Class[] { AutoconfIfElement.class, AutoconfElifElement.class },
+						INVALID_ELIF);
+				parseBlock(parent, token, new AutoconfElifElement());
+				token = tokenizer.peekToken();
+				throw new BlockEndCondition(token);
+			
+			case ITokenConstants.SH_ELSE:
+				checkLineStart(parent, token, atStart);
+				checkBlockValidity(
+						parent, token, 
+						new Class[] { AutoconfIfElement.class, AutoconfElifElement.class },
+						INVALID_ELSE);
+				parseBlock(parent, token, new AutoconfElseElement());
+				token = tokenizer.peekToken();
+				throw new BlockEndCondition(token);
+			
+			case ITokenConstants.SH_FI:
+				checkLineStart(parent, token, atStart);
+				checkBlockValidity(
+						parent, token, 
+						new Class[] { AutoconfIfElement.class, AutoconfElifElement.class, AutoconfElseElement.class },
+						INVALID_FI);
+				throw new BlockEndCondition(token);
+			
+				
+			// 4. Look for for/while loops
+			case ITokenConstants.SH_FOR:
+				checkLineStart(parent, token, atStart);
+				parseBlock(parent, token, new AutoconfForElement());
+				break;
+				
+			case ITokenConstants.SH_WHILE:
+				checkLineStart(parent, token, atStart);
+				parseBlock(parent, token, new AutoconfWhileElement());
+				break;
+				
+			case ITokenConstants.SH_UNTIL:
+				checkLineStart(parent, token, atStart);
+				parseBlock(parent, token, new AutoconfUntilElement());
+				break;
+				
+			case ITokenConstants.SH_SELECT:
+				checkLineStart(parent, token, atStart);
+				parseBlock(parent, token, new AutoconfSelectElement());
+				break;
+				
+			case ITokenConstants.SH_DONE:
+				checkLineStart(parent, token, atStart);
+				checkBlockValidity(
+						parent, token, 
+						new Class[] { AutoconfForElement.class, AutoconfWhileElement.class,
+								AutoconfUntilElement.class, AutoconfSelectElement.class },
+						INVALID_DONE);
+				throw new BlockEndCondition(token);
+			
+			// 5. Look for case statements
+			case ITokenConstants.SH_CASE:
+				checkLineStart(parent, token, atStart);
+				parseCaseBlock(parent, token, new AutoconfCaseElement());
+				break;
+				
+			case ITokenConstants.SH_CASE_CONDITION_END:
+				checkBlockValidity(
+						parent, token, 
+						new Class[] { AutoconfCaseConditionElement.class },
+						IMPROPER_CASE_CONDITION);
+				throw new BlockEndCondition(token);
+			
+			case ITokenConstants.SH_ESAC:
+				checkLineStart(parent, token, atStart);
+				checkBlockValidity(
+						parent, token, 
+						// note: we don't strictly recurse here, so accept either parent
+						new Class[] { AutoconfCaseElement.class, AutoconfCaseConditionElement.class },
+						INVALID_ESAC);
+				throw new BlockEndCondition(token);
+			
+			
+			// 6. Check for HERE documents
+			case ITokenConstants.SH_HERE:
+			case ITokenConstants.SH_HERE_DASH:
+
+				parseHERE(parent, token);
+				break;
+			}
+		}
+	}
+
+	private void checkLineStart(AutoconfElement parent, Token token, boolean atStart) {
+		if (!atStart) {
+			handleError(parent, token, AutoconfEditorMessages.getFormattedString(INVALID_TERMINATION, token.getText()));
+		}
+	}
+
+	/**
+	 * Parse the Here document, whose control token is provided (SH_HERE or SH_HERE_DASH).
+	 * Contents are thrown away except for any macro calls.
+	 * @param parent
+	 * @param controlToken
+	 */
+	private void parseHERE(AutoconfElement parent, Token controlToken) {
+		Token token = tokenizer.readToken();
+		if (token.getType() == ITokenConstants.EOL || token.getType() == ITokenConstants.EOF) {
+			handleError(parent, token,
+					AutoconfEditorMessages.getString(INCOMPLETE_INLINE_MARKER));
+			
+		} else {
+			String hereTag = token.getText();
+		
+			boolean atEOL = false;
+			while (true) {
+				token = tokenizer.readToken();
+				if (token.getType() == ITokenConstants.EOF) {
+					handleError(parent, token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, parent.getName()));
+					break;
+				} else if (token.getType() == ITokenConstants.EOL) {
+					atEOL = true;
+				} else {
+					if (atEOL && token.getText().equals(hereTag)) {
+						// only the end if it is also followed by EOL without any whitespace
+						Token eol = tokenizer.readToken();
+						if (eol.getType() == ITokenConstants.EOL && eol.getOffset() == token.getOffset() + token.getLength()) {
+							break;
+						}
+					}
+					if (token.getType() == ITokenConstants.WORD) {
+						checkMacro(parent, token);
+					}
+					atEOL = false;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Parse through a single expression up to a semicolon or newline.
+	 * Add a macro call to the element or just return upon finding the desired token.
+	 * Whenever a token terminates the expression, we check its validity and return the final token
+	 * Throw {@link BlockEndCondition} if an unexpected token was found.
+	 * @param parent the parent into which to add statements.  The type of this element is used
+	 * to validate the legality of block closing tokens.
+	 */
+	protected Token parseExpression(AutoconfElement parent) throws BlockEndCondition {
+	
+		while (true) {
+			Token token = tokenizer.readToken();
+			
+			// 0. Ignore comments (tokenizer skipped them!)
+			
+			switch (token.getType()) {
+			// 1. Check EOF
+			case ITokenConstants.EOF:
+				throw new BlockEndCondition(token);
+		
+			// 2. Check macro expansions
+			case ITokenConstants.WORD:
+				token = checkMacro(parent, token);
+				break;
+			
+			// 3. Check expression terminators
+			case ITokenConstants.SEMI:
+			case ITokenConstants.EOL:
+				return token;
+
+			// 4. Handle variables
+			case ITokenConstants.SH_DOLLAR:
+				token = tokenizer.readToken();
+				break;
+				
+			case ITokenConstants.SH_IN:
+				// in 'for' or 'select, an 'in' may occur before 'do'
+				if (!(parent instanceof AutoconfForElement)
+						&& !(parent instanceof AutoconfSelectElement)) 
+					return token;
+				// fall through
+				
+			// 5. Abort on unexpected tokens
+			case ITokenConstants.SH_DO:
+			case ITokenConstants.SH_THEN:
+				handleError(parent, token, AutoconfEditorMessages.getFormattedString(INVALID_SPECIFIER, token.getText()));
+				tokenizer.unreadToken(token);
+				// close enough...
+				return token;
+				
+			case ITokenConstants.SH_ESAC:
+			case ITokenConstants.SH_CASE:
+			case ITokenConstants.SH_CASE_CONDITION_END:
+			case ITokenConstants.SH_FOR:
+			case ITokenConstants.SH_IF:
+			case ITokenConstants.SH_ELIF:
+			case ITokenConstants.SH_ELSE:
+			case ITokenConstants.SH_FI:
+			case ITokenConstants.SH_DONE:
+				handleError(parent, token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, parent.getName()));
+				tokenizer.unreadToken(token);
+				throw new BlockEndCondition(token);
+			}
+		}
+	}
+
+	/**
+	 * Parse through a single expression up to 'do'.
+	 * Add a macro call to the element or just return upon finding the desired token.
+	 * Whenever a token terminates the expression, we check its validity and then throw ExprEndCondition.
+	 * Throw {@link BlockEndCondition} if an unexpected token was found.
+	 * @param parent the parent into which to add statements.  The type of this element is used
+	 * to validate the legality of block closing tokens.
+	 */
+	protected Token parseForExpression(AutoconfElement parent) throws BlockEndCondition {
+		while (true) {
+			Token token = tokenizer.readToken();
+			
+			// 0. Ignore comments (tokenizer skipped them!)
+			
+			// 1. Check EOF
+			if (token.getType() == ITokenConstants.EOF) {
+				throw new BlockEndCondition(token);
+			}
+		
+			// 2. Check macro expansions
+			else if (token.getType() == ITokenConstants.WORD) {
+				token = checkMacro(parent, token);
+			}
+			
+			// 3. Check expression terminators -- not ';' here, but 'do'
+			else if (token.getType() == ITokenConstants.SH_DO) {
+				tokenizer.unreadToken(token);
+				return tokenizer.peekToken();
+			}
+			
+			// 4. Abort on unexpected tokens
+			else switch (token.getType()) {
+			case ITokenConstants.SH_THEN:
+				handleError(parent, token, AutoconfEditorMessages.getFormattedString(INVALID_SPECIFIER, token.getText()));
+				tokenizer.unreadToken(token);
+				// close enough...
+				//throw new ExprEndCondition(token);
+				return token;
+				
+			case ITokenConstants.SH_ESAC:
+			case ITokenConstants.SH_CASE:
+			case ITokenConstants.SH_CASE_CONDITION_END:
+			case ITokenConstants.SH_FOR:
+			case ITokenConstants.SH_IF:
+			case ITokenConstants.SH_ELIF:
+			case ITokenConstants.SH_ELSE:
+			case ITokenConstants.SH_FI:
+			case ITokenConstants.SH_DONE:
+				handleError(parent, token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, parent.getName()));
+				tokenizer.unreadToken(token);
+				throw new BlockEndCondition(token);
+			}
+		}
+	}
+
+	/**
+	 * Parse through a single expression up to 'in'.
+	 * Add a macro call to the element or just return upon finding the desired token.
+	 * Whenever a token terminates the expression, we check its validity and then throw ExprEndCondition.
+	 * Throw {@link BlockEndCondition} if an unexpected token was found.
+	 * @param parent the parent into which to add statements.  The type of this element is used
+	 * to validate the legality of block closing tokens.
+	 */
+	protected Token parseCaseExpression(AutoconfElement parent) throws BlockEndCondition {
+		while (true) {
+			Token token = tokenizer.readToken();
+			
+			// 0. Ignore comments (tokenizer skipped them!)
+			
+			// 1. Check EOF
+			if (token.getType() == ITokenConstants.EOF) {
+				throw new BlockEndCondition(token);
+			}
+		
+			// 2. Check macro expansions
+			else if (token.getType() == ITokenConstants.WORD) {
+				token = checkMacro(parent, token);
+			}
+			
+			// 3. Check expression terminators
+			else if (parent instanceof AutoconfCaseElement && token.getType() == ITokenConstants.SH_IN) {
+				return token;
+			}
+			else if (parent instanceof AutoconfCaseConditionElement && token.getType() == ITokenConstants.RPAREN) {
+				return token;
+			}
+			
+			// 4. Abort on unexpected tokens
+			else switch (token.getType()) {
+			case ITokenConstants.SEMI:
+			case ITokenConstants.SH_IN:
+			case ITokenConstants.RPAREN:
+			case ITokenConstants.SH_DO:
+			case ITokenConstants.SH_THEN:
+				if (parent instanceof AutoconfCaseElement)
+					handleError(parent, token, AutoconfEditorMessages.getString(INVALID_IN));
+				else
+					handleError(parent, token, AutoconfEditorMessages.getString(IMPROPER_CASE_CONDITION));
+				// close enough...
+				return token;
+				
+			case ITokenConstants.SH_ESAC:
+			case ITokenConstants.SH_CASE:
+			case ITokenConstants.SH_CASE_CONDITION_END:
+			case ITokenConstants.SH_FOR:
+			case ITokenConstants.SH_IF:
+			case ITokenConstants.SH_ELIF:
+			case ITokenConstants.SH_ELSE:
+			case ITokenConstants.SH_FI:
+			case ITokenConstants.SH_DONE:
+				handleError(parent, token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, parent.getName()));
+				tokenizer.unreadToken(token);
+				throw new BlockEndCondition(token);
+			}
+		}
+	}
+	
+	/**
+	 * Check a given close block token against the current parent by checking that
+	 * the parent's class is one of classes,  If a match happens,
+	 * optionally push back the token if it will be used to parse new statements in the parent.
+	 * Report an error if the parent is not one of the expected kinds.
+	 * @param parent
+	 * @param token
+	 * @param classes
+	 */
+	private void checkBlockValidity(
+			AutoconfElement parent, 
+			Token token,
+			Class<?>[] classes,
+			String errorMessage) {
+		for (int i = 0; i < classes.length; i++) {
+			if (classes[i].isInstance(parent)) {
+				return;
+			}
+		}
+		
+		// not a match
+		handleError(parent, token, 
+				AutoconfEditorMessages.getFormattedString(errorMessage, parent.getName(), token.getText()));
+	}
+
+	/**
+	 * Check whether the given token is part of a macro, and parse it as such
+	 * if necessary.  
+	 * @param parent
+	 * @param token
+	 * @return Token last read for the macro call
+	 */
+	private Token checkMacro(AutoconfElement parent, Token token) {
+		String name = token.getText();
+		
+		boolean hasArguments = tokenizer.peekToken().getType() == ITokenConstants.LPAREN;
+		if (macroDetector != null && macroDetector.isMacroIdentifier(name)) {
+			// ok
+		} else if (m4builtins.contains(name)) {
+			// all of these except dnl take arguments
+			if (!name.equals("dnl") && !hasArguments) //$NON-NLS-1$
+				return token;
+		} else {
+			return token;
+		}
+		
+		AutoconfMacroElement macro = new AutoconfMacroElement(name);
+		token = parseMacro(macro, token);
+		
+		// handle special macros here
+		if ("dnl".equals(name)) { //$NON-NLS-1$
+			// consume to EOL
+			while (true) {
+				token = tokenizer.readToken();
+				if (token.getType() == ITokenConstants.EOF || token.getType() == ITokenConstants.EOL)
+					break;
+			}
+			
+			// ignore macro entirely
+			macro = null;
+		} else if ("changequote".equals(name)) { //$NON-NLS-1$
+			// change quote delimiters
+			validateMacroParameterCount(macro, token, 2);
+			
+			// GNU behavior for invalid argument count
+			String parm0 = "`"; //$NON-NLS-1$
+			String parm1 = "'"; //$NON-NLS-1$
+			if (macro.getParameterCount() >= 1)
+				parm0 = macro.getParameter(0);
+			if (macro.getParameterCount() >= 2)
+				parm1 = macro.getParameter(1);
+			
+			tokenizer.setM4Quote(parm0, parm1);
+		}  else if ("changecom".equals(name)) { //$NON-NLS-1$
+			// change comment delimiters
+			validateMacroParameterCount(macro, token, 2);
+			
+			// GNU behavior for invalid argument count
+			String parm0 = "#"; //$NON-NLS-1$
+			String parm1 = "\n"; //$NON-NLS-1$
+			if (macro.getParameterCount() >= 1)
+				parm0 = macro.getParameter(0);
+			if (macro.getParameterCount() >= 2)
+				parm1 = macro.getParameter(1);
+			
+			tokenizer.setM4Comment(parm0, parm1);
+		}
+		
+		if (macro != null) {
+			parent.addChild(macro);
+		}
+		
+		// now validate that the macro is properly terminated
+		if (!(parent instanceof AutoconfMacroArgumentElement) 
+				&& !(parent instanceof AutoconfMacroElement)
+				&& !(parent instanceof AutoconfForElement)) {
+			Token peek = tokenizer.peekToken();
+			if (peek.getType() == ITokenConstants.RPAREN) {
+				handleError(macro, peek, AutoconfEditorMessages.getString(UNMATCHED_RIGHT_PARENTHESIS)); 
+			}
+		}
+		
+		return token;
+	}
+
+	private void validateMacroParameterCount(AutoconfMacroElement macro, Token token, int count) {
+		if (macro.getParameterCount() < count) {
+			handleError(macro, token, AutoconfEditorMessages.getFormattedString("M4MacroArgsTooFew", macro.getName(), new Integer(2))); //$NON-NLS-1$ 
+		} else if (macro.getParameterCount() > count) {
+			handleError(macro, token, AutoconfEditorMessages.getFormattedString("M4MacroArgsTooMany", macro.getName(), new Integer(2))); //$NON-NLS-1$
+		}
+	}
+
+	/**
+	 * Start parsing a macro call at a suspected macro expansion location.
+	 * @param macro
+	 * @param line the line containing the start of the 
+	 * @param parent
+	 * @return last token parsed
+	 */
+	protected Token parseMacro(AutoconfMacroElement macro, Token macroName) {
+		setSourceStart(macro, macroName);
+		
+		// parse any arguments
+		tokenizer.setM4Context(true);
+		
+		Token token = tokenizer.readToken();
+		if (token.getType() == ITokenConstants.LPAREN) {
+			token = parseMacroArguments(macro, token);
+			setSourceEnd(macro, token);
+		} else {
+			tokenizer.unreadToken(token);
+			setSourceEnd(macro, macroName);
+		}
+		
+		tokenizer.setM4Context(false);
+		
+		// validate macro arguments?
+		if (macroValidator != null) {
+			try {
+				macroValidator.validateMacroCall(macro);
+			} catch (ParseException e) {
+				errorHandler.handleError(e);
+			}
+		}
+		
+		return token;
+	}
+
+	/**
+	 * Parse the arguments for the given macro.  These are not interpreted as shell
+	 * constructs but just as text with possibly more macro expansions inside.
+	 * @param macro
+	 * @return final token (')')
+	 */
+	protected Token parseMacroArguments(AutoconfMacroElement macro, Token lparen) {
+		Token argStart = null;
+		Token argEnd = null;
+		Token token;
+		
+		// When parsing, we want to ignore the whitespace around the arguments.
+		// So, instead of taking the source range "between" a parenthesis and a comma,
+		// track the exact tokens forming the start and end of an argument, defaulting
+		// to the borders of the parentheses and commas if no text is included.
+		
+		StringBuffer argBuffer = new StringBuffer();
+		AutoconfMacroArgumentElement arg = new AutoconfMacroArgumentElement();
+
+		while (true) {
+			token = tokenizer.readToken();
+			
+			if (token.getType() == ITokenConstants.EOL) {
+				if (argBuffer.length() > 0)
+					argBuffer.append(token.getText());
+				continue;
+			}
+			
+			if (token.getType() == ITokenConstants.COMMA 
+					|| token.getType() == ITokenConstants.RPAREN
+					|| token.getType() == ITokenConstants.EOF) {
+
+				arg.setName(argBuffer.toString());
+				argBuffer.setLength(0);
+				
+				if (argStart != null && argEnd != null) {
+					setSourceStart(arg, argStart);
+					setSourceEnd(arg, argEnd);
+				} else if (argEnd != null) {
+					setSourceStart(arg, argStart);
+					setSourceEndBefore(arg, token);
+				} else {
+					// empty argument
+					setSourceStart(arg, token);
+					setSourceEndBefore(arg, token);
+				}
+				
+				macro.addChild(arg);
+				
+				if (token.getType() != ITokenConstants.COMMA)
+					break;
+				
+				argStart = null;
+				argEnd = null;
+				
+				arg = new AutoconfMacroArgumentElement();
+
+			} else {
+				if (argStart == null) {
+					argStart = token;
+				}
+				argEnd = token;
+				
+				if (argBuffer.length() > 0 && token.followsSpace())
+					argBuffer.append(' ');
+				argBuffer.append(token.getText());
+				
+				// handle nested macro calls in arguments
+				if (token.getType() == ITokenConstants.WORD) {
+					argEnd = checkMacro(arg, token);
+				}
+			}
+		}
+		
+		if (token.getType() != ITokenConstants.RPAREN) {
+			handleError(macro, token, AutoconfEditorMessages.getString(UNMATCHED_LEFT_PARENTHESIS)); 
+		}
+		
+		// note: moved 15-char truncation to AutoconfLabelProvider
+		AutoconfElement[] children = macro.getChildren();
+		if (children.length > 0)
+			macro.setVar(children[0].getVar());
+		
+		return token;
+	}
+	
+
+	
+	protected void handleError(AutoconfElement element, Token token, String message) {
+		handleMessage(element, token, message, IMarker.SEVERITY_ERROR);
+	}
+	protected void handleWarning(AutoconfElement element, Token token, String message) {
+		handleMessage(element, token, message, IMarker.SEVERITY_WARNING);
+	}
+	protected void handleMessage(AutoconfElement element, Token token, String message, int severity) {
+		if (errorHandler != null) {
+			int lineNumber = 0;
+			int startColumn = 0;
+			int endColumn = 0;
+			try {
+				lineNumber = token.getDocument().getLineOfOffset(token.getOffset());
+				int lineOffs = token.getDocument().getLineOffset(lineNumber);
+				startColumn = token.getOffset() - lineOffs;
+				endColumn = startColumn + token.getLength();
+			} catch (BadLocationException e) {
+				// Don't care if we blow up trying to issue marker
+			}
+			errorHandler.handleError(new ParseException(
+					message,
+					token.getOffset(),
+					token.getOffset() + token.getLength(),
+					lineNumber, 
+					startColumn, endColumn,
+					severity));
+		}
+	}
+
+	public IAutoconfErrorHandler getErrorHandler() {
+		return errorHandler;
+	}
+}
+
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfRootElement.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfRootElement.java
new file mode 100644
index 0000000..105d00b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfRootElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfRootElement extends AutoconfElement {
+	
+	public AutoconfRootElement() {
+		super(""); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfSelectElement.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfSelectElement.java
new file mode 100644
index 0000000..204a459
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfSelectElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfSelectElement extends AutoconfElement {
+	
+	public AutoconfSelectElement() {
+		super("select"); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfTokenizer.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfTokenizer.java
new file mode 100644
index 0000000..6063be4
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfTokenizer.java
@@ -0,0 +1,435 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.AutoconfEditorMessages;
+
+
+/**
+ * This tokenizer traverses autotools-style text (m4 or configure.ac) to support the
+ * autoconf parser.  It tracks the current context (m4 macro call or shell commands)
+ * to detect appropriate tokens, and tracks the m4 current quote style as well.
+ * <p>
+ * In m4 mode, its primary purpose is to find word boundaries, detect comments and quoted
+ * strings, and to find the macro punctuation tokens.  It will not interpret anything
+ * (e.g. '$1' inside a macro) -- this is up to the parser.
+ * <p>
+ * In shell script mode, its primary purpose is to identify enough
+ * tokens to get a general picture of the structure of source for use by the autoconf
+ * parser.  This isn't intended to be used for full shell script parsing.  In fact,
+ * aside from the known tokens and identifiers, only individual characters will be returned.
+ * <p>
+ * Both modes know about "words" or identifiers and use the same syntax to detect these.
+ * It's expected that the parser will detect a word as a macro or possible macro and
+ * switch the mode of the tokenizer to fit.  The parser should invoke "setM4Context(...)"
+ * (and "unreadToken" if necessary) to switch modes.
+ * @author eswartz
+ *
+ */
+public class AutoconfTokenizer {
+
+	private static final String UNTERMINATED_STRING = "UnterminatedString"; //$NON-NLS-1$
+	public static final String UNMATCHED_RIGHT_QUOTE = "UnmatchedRightQuote"; //$NON-NLS-1$
+	public static final String UNMATCHED_LEFT_QUOTE = "UnmatchedLeftQuote"; //$NON-NLS-1$
+	public static final String UNMATCHED_CLOSE_COMMENT = "UnmatchedCloseComment"; //$NON-NLS-1$
+	
+	private IDocument document;
+	private int offset;
+	private String m4OpenQuote;
+	private String m4CloseQuote;
+	private String m4OpenComment;
+	private String m4CloseComment;
+	private char[] chars;
+	private int startOffset;
+	private boolean isM4Context;
+	private Token eofToken;
+	private IAutoconfErrorHandler errorHandler;
+
+	/** Create a tokenizer for a document. */
+	public AutoconfTokenizer(IDocument document, IAutoconfErrorHandler errorHandler) {
+		if (document == null /* || macroDetector == null*/)
+			throw new IllegalArgumentException();
+		this.document = document;
+		this.errorHandler = errorHandler;
+		
+		this.chars = document.get().toCharArray();
+		this.offset = 0;
+		
+		this.eofToken = new Token(ITokenConstants.EOF, "", document, chars.length, 0);
+		
+		this.m4OpenQuote = "`"; //$NON-NLS-1$
+		this.m4CloseQuote = "'"; //$NON-NLS-1$
+		this.m4OpenComment = "#"; //$NON-NLS-1$
+		this.m4CloseComment = "\n"; //$NON-NLS-1$
+	}
+	
+	/**
+	 * Tell whether the tokenizer considers itself to be in an m4 context.
+	 * This determines what kinds of tokens it returns.
+	 * @return
+	 */
+	public boolean isM4Context() {
+		return isM4Context;
+	}
+	
+	/**
+	 * Switch the tokenizer into or out of m4 context.
+	 * @return
+	 */
+	public void setM4Context(boolean flag) {
+		isM4Context = flag;
+	}
+	
+	/** 
+	 * Set the m4 quote delimiters
+	 */
+	public void setM4Quote(String open, String close) {
+		this.m4OpenQuote = open;
+		this.m4CloseQuote = close;
+	}
+
+	/** 
+	 * Set the m4 comment delimiters
+	 */
+	public void setM4Comment(String open, String close) {
+		this.m4OpenComment = open;
+		this.m4CloseComment = close;
+	}
+	
+	/** Push back the given token.  This allows the tokenizer to restart from its start position,
+	 * potentially in a different context. */
+	public void unreadToken(Token token) {
+		if (token.getLength() > 0 && offset == token.getOffset())
+			throw new IllegalStateException();
+		offset = token.getOffset();
+	}
+	
+	/** Read the next token. Returns an EOF token at EOF. */
+	public Token readToken() {
+		if (offset >= chars.length)
+			return eofToken;
+		
+		char ch = chars[offset];
+		
+		// skip whitespace (but not EOL)
+		while (isWhitespace(ch)) {
+			offset++;
+			if (offset >= chars.length)
+				return eofToken;
+			ch = chars[offset];
+		}
+
+		// in shell mode, strip comments up to eol 
+		if (!isM4Context && ch == '#') {
+			while (offset < chars.length) {
+				ch = chars[offset];
+				if (ch == '\n')
+					break;
+				offset++;
+			}
+			
+			// keep inside doc if we didn't find that EOL
+			if (offset >= chars.length)
+				offset--;
+		}
+
+		startOffset = offset;
+		StringBuffer buffer = new StringBuffer();
+		
+		// check EOL
+		if (ch == '\r' || ch == '\n') {
+			buffer.append(ch);
+			offset++;
+			if (ch == '\r' && offset < chars.length && chars[offset] == '\n') {
+				buffer.append(chars[offset++]);
+			}
+			return makeToken(ITokenConstants.EOL, buffer.toString());
+		}
+		
+		// TODO: this parser always uses fixed logic for identifier reading, ignoring m4's "changeword"
+		if (isLeadIdentifierChar(ch)) {
+			return parseWord(ch);
+		}
+		
+		// check comments and quotes
+		if (isM4Context) {
+			if (lookAhead(m4OpenComment)) {
+				boolean found = false;
+				// keep reading until the close comment (these are NOT nested)
+				while (offset < chars.length) {
+					if (lookAhead(m4CloseComment)) {
+						found = true;
+						break;
+					}
+					offset++;
+				}
+				if (!found) {
+					handleError(startOffset, offset, AutoconfEditorMessages.getFormattedString(UNMATCHED_CLOSE_COMMENT, 
+							m4CloseComment.equals("\n") ? "newline" : m4CloseComment)); //$NON-NLS-1$
+				}
+				return makeToken(ITokenConstants.M4_COMMENT);
+			}
+			
+			if (lookAhead(m4OpenQuote)) {
+				return parseQuote();
+			}
+		}
+		
+		// check shell punctuation
+		if (!isM4Context) {
+			if (ch == ';' && offset + 1 < chars.length && chars[offset + 1] == ';') {
+				offset += 2;
+				return makeToken(ITokenConstants.SH_CASE_CONDITION_END);
+			}
+			if (ch == '<' && offset + 1 < chars.length && chars[offset + 1] == '<') {
+				offset += 2;
+				if (offset < chars.length && chars[offset] == '-') {
+					offset++;
+					return makeToken(ITokenConstants.SH_HERE_DASH);
+				} else {
+					return makeToken(ITokenConstants.SH_HERE);
+				}
+			}
+			switch (ch) {
+			case '$':
+				offset++;
+				return makeToken(ITokenConstants.SH_DOLLAR);
+			case '[':
+				offset++;
+				return makeToken(ITokenConstants.SH_LBRACKET);
+			case ']':
+				offset++;
+				return makeToken(ITokenConstants.SH_RBRACKET);
+			case '{':
+				offset++;
+				return makeToken(ITokenConstants.SH_LBRACE);
+			case '}':
+				offset++;
+				return makeToken(ITokenConstants.SH_RBRACE);
+			case '\'':
+				return parseString(ITokenConstants.SH_STRING_SINGLE, ch);
+			case '\"':
+				return parseString(ITokenConstants.SH_STRING_DOUBLE, ch);
+			case '`':
+				return parseString(ITokenConstants.SH_STRING_BACKTICK, ch);
+			}
+		}
+		
+		// check common punctuation
+		if (ch == ';') {
+			offset++;
+			return makeToken(ITokenConstants.SEMI);
+		}
+		if (ch == ',') {
+			offset++;
+			return makeToken(ITokenConstants.COMMA);
+		}
+		if (ch == '(') {
+			offset++;
+			return makeToken(ITokenConstants.LPAREN);
+		}
+		if (ch == ')') {
+			offset++;
+			return makeToken(ITokenConstants.RPAREN);
+		}
+		
+		// unknown text
+		offset++;
+		return makeToken(ITokenConstants.TEXT);
+	}
+
+	private Token parseWord(char ch) {
+		StringBuffer buffer = new StringBuffer();
+		
+		buffer.append(ch);
+		offset++;
+		do {
+			if (offset >= chars.length)
+				break;
+			ch = chars[offset];
+			if (!isIdentifierChar(ch))
+				break;
+			buffer.append(ch);
+			offset++;
+		} while (true);
+		
+		String text = buffer.toString();
+		
+		if (!isM4Context) {
+			// detect sh tokens
+			if ("case".equals(text))
+				return makeToken(ITokenConstants.SH_CASE, text);
+			if ("in".equals(text))
+				return makeToken(ITokenConstants.SH_IN, text);
+			if ("esac".equals(text))
+				return makeToken(ITokenConstants.SH_ESAC, text);
+			if ("while".equals(text))
+				return makeToken(ITokenConstants.SH_WHILE, text);
+			if ("select".equals(text))
+				return makeToken(ITokenConstants.SH_SELECT, text);
+			if ("until".equals(text))
+				return makeToken(ITokenConstants.SH_UNTIL, text);
+			if ("for".equals(text))
+				return makeToken(ITokenConstants.SH_FOR, text);
+			if ("do".equals(text))
+				return makeToken(ITokenConstants.SH_DO, text);
+			if ("done".equals(text))
+				return makeToken(ITokenConstants.SH_DONE, text);
+			if ("if".equals(text))
+				return makeToken(ITokenConstants.SH_IF, text);
+			if ("then".equals(text))
+				return makeToken(ITokenConstants.SH_THEN, text);
+			if ("else".equals(text))
+				return makeToken(ITokenConstants.SH_ELSE, text);
+			if ("elif".equals(text))
+				return makeToken(ITokenConstants.SH_ELIF, text);
+			if ("fi".equals(text))
+				return makeToken(ITokenConstants.SH_FI, text);
+		}
+		
+		// other identifier-looking word
+		return makeToken(ITokenConstants.WORD, text);
+	}
+	
+	private Token parseQuote() {
+		// read text, honoring nested quotes, but don't put the outermost quotes in the token  
+		
+		StringBuffer buffer = new StringBuffer();
+		
+		int quoteLevel = 1;
+		// keep reading until the close quote
+		while (offset < chars.length) {
+			if (lookAhead(m4CloseQuote)) {
+				quoteLevel--;
+				if (quoteLevel == 0)
+					break;
+				buffer.append(m4CloseQuote);
+			} else if (lookAhead(m4OpenQuote)) {
+				buffer.append(m4OpenQuote);
+				quoteLevel++;
+			} else {
+				buffer.append(chars[offset]);
+				offset++;
+			}
+		}
+		
+		if (quoteLevel > 0) {
+			handleError(startOffset, offset, AutoconfEditorMessages.getFormattedString(UNMATCHED_LEFT_QUOTE, m4CloseQuote));
+		} else if (quoteLevel < 0) {
+			handleError(startOffset, offset, AutoconfEditorMessages.getFormattedString(UNMATCHED_RIGHT_QUOTE, m4OpenQuote));
+		}
+		
+		return makeToken(ITokenConstants.M4_STRING, buffer.toString());
+	}
+
+	private Token parseString(int type, char terminal) {
+		startOffset = offset;
+		offset++;
+		
+		StringBuffer buffer = new StringBuffer();
+		
+		char ch = 0;
+		while (offset < chars.length) {
+			ch = chars[offset++];
+			if (ch == '\\') {
+				if (offset < chars.length)
+					buffer.append(chars[offset++]);
+				else
+					buffer.append(ch);
+			} else if (ch == terminal) {
+				break;
+			} else {
+				buffer.append(ch);
+			}
+		}
+
+		if (ch != terminal) {
+			handleError(startOffset, offset, AutoconfEditorMessages.getFormattedString(UNTERMINATED_STRING, "" + ch));
+		}
+		
+		return makeToken(type, buffer.toString());
+	}
+
+	private void handleError(int start, int end,
+			String message) {
+		if (errorHandler != null) {
+			int lineNumber = 0;
+			int startColumn = 0;
+			int endColumn = 0;
+			try {
+				lineNumber = document.getLineOfOffset(start);
+				int lineOffs = document.getLineOffset(lineNumber);
+				startColumn = start - lineOffs;
+				endColumn = end - lineOffs;
+			} catch (BadLocationException e) {
+				// Don't care if we blow up trying to issue marker
+			}
+			errorHandler.handleError(new ParseException(
+					message,
+					start, end,
+					lineNumber, 
+					startColumn, endColumn,
+					IMarker.SEVERITY_ERROR));
+		}
+	}
+
+	/** 
+	 * Look ahead for the given string.  If found, return true, and have
+	 * offset updated.  Otherwise, return false with offset unchanged.
+	 * @param keyword
+	 * @param text
+	 * @return
+	 */
+	private boolean lookAhead(String keyword) {
+		int length = keyword.length();
+		if (offset + length > chars.length) {
+			return false;
+		}
+		for (int idx = 0; idx < length; idx++) {
+			if (chars[offset + idx] != keyword.charAt(idx))
+				return false;
+		}
+		offset += length;
+		return true;
+	}
+
+	private boolean isWhitespace(char ch) {
+		return ch == ' ' || ch == '\t' || ch == '\f';
+	}
+
+	private Token makeToken(int type) {
+		return new Token(type,
+				new String(chars, startOffset, offset - startOffset),
+				document, startOffset, offset - startOffset);
+	}
+
+	private Token makeToken(int type, String text) {
+		return new Token(type, text, document, startOffset, offset - startOffset);
+	}
+
+	private boolean isIdentifierChar(char ch) {
+		return isLeadIdentifierChar(ch) || (ch >= '0' && ch <= '9');
+	}
+
+	private boolean isLeadIdentifierChar(char ch) {
+		return (ch >= 'A' &&  ch <= 'Z') || (ch >= 'a' && ch <= 'z') || ch == '_';
+	}
+	
+	public Token peekToken() {
+		Token token = readToken();
+		unreadToken(token);
+		return token;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfUntilElement.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfUntilElement.java
new file mode 100644
index 0000000..979ffe4
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfUntilElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfUntilElement extends AutoconfElement {
+	
+	public AutoconfUntilElement() {
+		super("until"); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfWhileElement.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfWhileElement.java
new file mode 100644
index 0000000..169edd7
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfWhileElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfWhileElement extends AutoconfElement {
+	
+	public AutoconfWhileElement() {
+		super("while"); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfErrorHandler.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfErrorHandler.java
new file mode 100644
index 0000000..1363240
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfErrorHandler.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+
+/**
+ * Clients implement this interface to handle errors encountered while parsing.
+ * @author eswartz
+ *
+ */
+public interface IAutoconfErrorHandler {
+
+	/**
+	 * Handle an exception associated with the given element
+	 * @param exception the exception to handle; has a line number
+	 * at the time of call
+	 */
+	void handleError(ParseException exception);
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroDetector.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroDetector.java
new file mode 100644
index 0000000..e438731
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroDetector.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+
+/**
+ * Clients implement this interface to identify what identifiers represent 
+ * macros for the autoconf tree.
+ * @author eswartz
+ *
+ */
+public interface IAutoconfMacroDetector {
+
+	/**
+	 * Tell if this identifier should be treated as an m4 macro call.
+	 * The identifier has already been judged to be a valid candidate
+	 * (i.e. it's not quoted).
+	 * @param name the string to check
+	 */
+	boolean isMacroIdentifier(String name);
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroValidator.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroValidator.java
new file mode 100644
index 0000000..2a54ee4
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroValidator.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+
+/**
+ * Clients implement this interface to validate macro calls.
+ * @author eswartz
+ *
+ */
+public interface IAutoconfMacroValidator {
+
+	/**
+	 * Validate the given macro call.
+	 * @param element macro call, never <code>null</code>
+	 * @throws ParseException if the call doesn't match the expected number of elements 
+	 */
+	void validateMacroCall(AutoconfMacroElement element) throws ParseException;
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IMacroDetector.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IMacroDetector.java
new file mode 100644
index 0000000..b225942
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IMacroDetector.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+/**
+ * Clients implement this interface to detect whether a given identifier 
+ * represents a known or potential macro in m4 or configure.ac text.
+ * @author eswartz
+ *
+ */
+public interface IMacroDetector {
+	boolean isMacro(String identifier);
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ITokenConstants.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ITokenConstants.java
new file mode 100644
index 0000000..b665115
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ITokenConstants.java
@@ -0,0 +1,87 @@
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public interface ITokenConstants {
+
+	/** end of file */
+	public static final int EOF = 0;
+	/** end of line */
+	public static final int EOL = 1;
+	
+	/** an open parenthesis */
+	public static final int LPAREN = 2;
+	/** a close parenthesis */
+	public static final int RPAREN = 3;
+	/** a comma */
+	public static final int COMMA = 4;
+	/** a semicolon */
+	public static final int SEMI = 5;
+
+	/** a word (either m4 word or shell identifier-looking word) */
+	public static final int WORD = 6;
+
+	/** other text (usually punctuation or number, one char at a time) */
+	public static final int TEXT = 7;
+
+	/** an m4 string (the text does not contain the outermost quotes) */
+	public static final int M4_STRING = 21;
+	/** an m4 comment (as determined by changecomment, NOT dnl) */
+	public static final int M4_COMMENT = 22;
+	
+	/** the sh 'if' token */
+	public static final int SH_IF = 40;
+	/** the sh 'then' token */
+	public static final int SH_THEN = 41;
+	/** the sh 'else' token */
+	public static final int SH_ELSE = 42;
+	/** the sh 'elif' token */
+	public static final int SH_ELIF = 43;
+	/** the sh 'fi' token */
+	public static final int SH_FI = 44;
+	
+	/** the sh 'while' token */
+	public static final int SH_WHILE = 45;
+	/** the sh 'for' token */
+	public static final int SH_FOR = 46;
+	/** the sh 'select' token */
+	public static final int SH_SELECT = 47;
+	/** the sh 'until' token */
+	public static final int SH_UNTIL = 48;
+	/** the sh 'do' token */
+	public static final int SH_DO = 49;
+	/** the sh 'done' token */
+	public static final int SH_DONE = 50;
+	/** the sh 'case' token */
+	
+	public static final int SH_CASE = 51;
+	/** the sh 'in' token */
+	public static final int SH_IN = 52;
+	/** the sh ';;' token */
+	public static final int SH_CASE_CONDITION_END = 53;
+	/** the sh 'esac' token */
+	public static final int SH_ESAC = 54;
+
+	/** the sh '$' token */
+	public static final int SH_DOLLAR = 60;
+	
+	/** the sh '{' token */
+	public static final int SH_LBRACE = 61;
+	/** the sh '}' token */
+	public static final int SH_RBRACE = 62;
+	/** the sh '[' token */
+	public static final int SH_LBRACKET = 63;
+	/** the sh ']' token */
+	public static final int SH_RBRACKET = 64;
+	
+	/** the sh '<<' token */
+	public static final int SH_HERE = 65;
+	/** the sh '<<-' token */
+	public static final int SH_HERE_DASH = 66;
+	/** an sh double-quoted string */
+	public static final int SH_STRING_DOUBLE = 67;
+	/** an sh single-quoted string */
+	public static final int SH_STRING_SINGLE = 68;
+	/** an sh backtick-quoted string */
+	public static final int SH_STRING_BACKTICK = 69;
+
+
+}
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ParseException.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ParseException.java
new file mode 100644
index 0000000..f0bc442
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ParseException.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class ParseException extends Exception {
+	
+	static final long serialVersionUID = 1;
+	String message;
+	int severity;
+	int lineNumber;
+	int startColumn;
+	int endColumn;
+	private int startOffset;
+	private int endOffset;
+	public int getEndColumn() {
+		return endColumn;
+	}
+	public void setEndColumn(int endColumn) {
+		this.endColumn = endColumn;
+	}
+	public int getLineNumber() {
+		return lineNumber;
+	}
+	public void setLineNumber(int lineNumber) {
+		this.lineNumber = lineNumber;
+	}
+	public String getMessage() {
+		return message;
+	}
+	public void setMessage(String message) {
+		this.message = message;
+	}
+	public int getStartColumn() {
+		return startColumn;
+	}
+	public void setStartColumn(int startColumn) {
+		this.startColumn = startColumn;
+	}
+	public ParseException(String message,
+			int startOffset, int endOffset,
+			int lineNumber, int startColumn, int endColumn, int severity) {
+		super();
+		this.message = message;
+		this.startOffset = startOffset;
+		this.endOffset = endOffset;
+		this.lineNumber = lineNumber;
+		this.startColumn = startColumn;
+		this.endColumn = endColumn;
+		this.severity = severity;
+	}
+	public int getSeverity() {
+		return severity;
+	}
+	public void setSeverity(int severity) {
+		this.severity = severity;
+	}
+	public int getStartOffset() {
+		return startOffset;
+	}
+	public int getEndOffset() {
+		return endOffset;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/Token.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/Token.java
new file mode 100644
index 0000000..9690363
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/Token.java
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+import org.eclipse.jface.text.IDocument;
+
+/**
+ * A single token parsed from an autotools-style file.  This represents m4 and sh
+ * tokens.  Punctuation characters shared by both are not in a namespace.
+ * 
+ * @author eswartz
+ *
+ */
+public class Token implements ITokenConstants {
+	/** Type: 
+	 * @see ITokenConstants
+	 */
+	final int type;
+	/**
+	 * Text of token, possibly interpreted or reduced from original characters
+	 */
+	final String text;
+	/**
+	 * Offset of token before interpretation
+	 */
+	final int offset;
+	/**
+	 * Length of token before interpretation
+	 */
+	final int length;
+	/**
+	 * The document providing the text
+	 */
+	final IDocument document;
+
+	public Token(int type, String text, IDocument document, int offset, int length) {
+		this.type = type;
+		this.text = text;
+		this.document = document;
+		this.offset = offset;
+		this.length = length;
+	}
+	
+	public String toString() {
+		return text;
+	}
+
+	public int getType() {
+		return type;
+	}
+
+	public String getText() {
+		return text;
+	}
+
+	public IDocument getDocument() {
+		return document;
+	}
+
+	public int getOffset() {
+		return offset;
+	}
+	
+	public int getLength() {
+		return length;
+	}
+
+	public boolean followsSpace() {
+		char[] text = document.get().toCharArray();
+		if (offset == 0)
+			return false;
+		return (" \t\r\n\f".indexOf(text[offset - 1]) >= 0);
+	}
+	
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AbstractAutotoolsCPropertyTab.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AbstractAutotoolsCPropertyTab.java
new file mode 100644
index 0000000..3459ea0
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AbstractAutotoolsCPropertyTab.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.cdt.managedbuilder.ui.properties.AbstractCBuildPropertyTab;
+
+public abstract class AbstractAutotoolsCPropertyTab extends
+		AbstractCBuildPropertyTab {
+
+	public boolean isIndexerAffected() {
+		return false;
+	}
+	
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsConsole.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsConsole.java
new file mode 100644
index 0000000..982764a
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsConsole.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2004, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ * Red Hat Inc - Adapted for Autotools usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.cdt.ui.IBuildConsoleManager;
+import org.eclipse.core.resources.IProject;
+
+public class AutotoolsConsole extends Console {
+	IProject project;
+	IBuildConsoleManager fConsoleManager;
+	
+	private static final String CONTEXT_MENU_ID = "CAutotoolsConsole"; //$NON-NLS-1$
+	private static final String CONSOLE_NAME = ConsoleMessages.getString("AutotoolsConsole.name"); //$NON-NLS-1$
+	
+	public AutotoolsConsole() {
+		super(CONSOLE_NAME, CONTEXT_MENU_ID);
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsUIPluginImages.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsUIPluginImages.java
new file mode 100644
index 0000000..7314abc
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsUIPluginImages.java
@@ -0,0 +1,133 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2007, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *     Red Hat Inc. - completely modified for Autotools usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.cdt.ui.CUIPlugin;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.swt.graphics.Image;
+
+
+/**
+ * Bundle of all images used by the C plugin.
+ */
+public class AutotoolsUIPluginImages {
+	
+	// The plugin registry
+	private static ImageRegistry imageRegistry = new ImageRegistry(CUIPlugin.getStandardDisplay());
+
+	// Subdirectory (under the package containing this class) where 16 color images are
+	private static URL fgIconBaseURL;
+
+	static {
+		try {
+			fgIconBaseURL= new URL(AutotoolsUIPlugin.getDefault().getBundle().getEntry("/"), "icons/" ); //$NON-NLS-1$ //$NON-NLS-2$
+		} catch (MalformedURLException e) {
+			CUIPlugin.log(e);
+		}
+	}	
+	private static final String NAME_PREFIX= AutotoolsUIPlugin.PLUGIN_ID + '.';
+	private static final int NAME_PREFIX_LENGTH= NAME_PREFIX.length();
+
+	public static final String T_OBJ= "ac16/"; //$NON-NLS-1$
+	public static final String T_BUILD= "elcl16/"; //$NON-NLS-1$
+
+	public static final String IMG_OBJS_IF= NAME_PREFIX + "if_obj.gif"; //$NON-NLS-1$
+	public static final String IMG_OBJS_ELSE= NAME_PREFIX + "else_obj.gif"; //$NON-NLS-1$
+	public static final String IMG_OBJS_ELIF= NAME_PREFIX + "elif_obj.gif";	 //$NON-NLS-1$
+	public static final String IMG_OBJS_CASE= NAME_PREFIX + "case_obj.gif"; //$NON-NLS-1$
+	public static final String IMG_OBJS_CONDITION= NAME_PREFIX + "condition_obj.gif"; //$NON-NLS-1$
+	public static final String IMG_OBJS_FOR= NAME_PREFIX + "for_obj.gif"; //$NON-NLS-1$
+	public static final String IMG_OBJS_WHILE= NAME_PREFIX + "while_obj.gif"; //$NON-NLS-1$
+	public static final String IMG_OBJS_ACMACRO= NAME_PREFIX + "acmacro_obj.gif"; //$NON-NLS-1$
+	public static final String IMG_OBJS_AMMACRO= NAME_PREFIX + "ammacro_obj.gif"; //$NON-NLS-1$
+	public static final String IMG_OBJS_ACMACRO_ARG = NAME_PREFIX + "acmacro_arg_obj.gif"; // $NON-NLS-1$
+	public static final String IMG_BUILD_CONFIG = NAME_PREFIX + "build_configs.gif"; //$NON-NLS-1$
+	public static final String IMG_CFG_CATEGORY = NAME_PREFIX + "config_category.gif"; //$NON-NLS-1$
+	public static final String IMG_CFG_TOOL = NAME_PREFIX + "config_tool.gif"; //$NON-NLS-1$
+
+ 	public static final ImageDescriptor DESC_OBJS_IF= createManaged(T_OBJ, IMG_OBJS_IF);
+	public static final ImageDescriptor DESC_OBJS_ELSE= createManaged(T_OBJ, IMG_OBJS_ELSE);
+	public static final ImageDescriptor DESC_OBJS_ELIF= createManaged(T_OBJ, IMG_OBJS_ELIF);
+	public static final ImageDescriptor DESC_OBJS_CASE= createManaged(T_OBJ, IMG_OBJS_CASE);
+	public static final ImageDescriptor DESC_OBJS_CONDITION = createManaged(T_OBJ, IMG_OBJS_CONDITION);
+	public static final ImageDescriptor DESC_OBJS_FOR= createManaged(T_OBJ, IMG_OBJS_FOR);
+	public static final ImageDescriptor DESC_OBJS_WHILE= createManaged(T_OBJ, IMG_OBJS_WHILE);
+	public static final ImageDescriptor DESC_OBJS_ACMACRO= createManaged(T_OBJ, IMG_OBJS_ACMACRO);
+	public static final ImageDescriptor DESC_OBJS_AMMACRO= createManaged(T_OBJ, IMG_OBJS_AMMACRO);
+	public static final ImageDescriptor DESC_OBJS_ACMACRO_ARG= createManaged(T_OBJ, IMG_OBJS_ACMACRO_ARG);
+	public static final ImageDescriptor DESC_BUILD_CONFIG = createManaged(T_BUILD, IMG_BUILD_CONFIG);
+	public static final ImageDescriptor DESC_CFG_CATEGORY = createManaged(T_BUILD, IMG_CFG_CATEGORY);
+	public static final ImageDescriptor DESC_CFG_TOOL = createManaged(T_BUILD, IMG_CFG_TOOL);
+
+	private static ImageDescriptor createManaged(String prefix, String name) {
+		return createManaged(imageRegistry, prefix, name);
+	}
+	
+	private static ImageDescriptor createManaged(ImageRegistry registry, String prefix, String name) {
+		ImageDescriptor result= ImageDescriptor.createFromURL(makeIconFileURL(prefix, name.substring(NAME_PREFIX_LENGTH)));
+		registry.put(name, result);
+		return result;
+	}
+	
+	public static Image get(String key) {
+		return imageRegistry.get(key);
+	}
+	
+	private static ImageDescriptor create(String prefix, String name) {
+		return ImageDescriptor.createFromURL(makeIconFileURL(prefix, name));
+	}
+	
+	private static URL makeIconFileURL(String prefix, String name) {
+		StringBuffer buffer= new StringBuffer(prefix);
+		buffer.append(name);
+		try {
+			return new URL(fgIconBaseURL, buffer.toString());
+		} catch (MalformedURLException e) {
+			CUIPlugin.log(e);
+			return null;
+		}
+	}
+	
+	/**
+	 * Sets all available image descriptors for the given action.
+	 */	
+	public static void setImageDescriptors(IAction action, String type, String relPath) {
+	    if (relPath.startsWith(NAME_PREFIX))
+	        relPath= relPath.substring(NAME_PREFIX_LENGTH);
+		action.setDisabledImageDescriptor(create("d" + type, relPath)); //$NON-NLS-1$
+//		action.setHoverImageDescriptor(create("c" + type, relPath)); //$NON-NLS-1$
+		action.setImageDescriptor(create("e" + type, relPath)); //$NON-NLS-1$
+
+		// We are still not sure about this, let see TF results first.
+		//		Use the managed version so that we ensure that there is no resource handle leaks
+		//		Let the widget itself manage the disabled/hover attribution.  This was a huge leak
+		//ImageDescriptor desc = getImageRegistry().getDescriptor(relPath);
+		//if(desc == null) {
+		//	desc = createManaged(T + "c" + type, relPath);
+		//}	
+		//action.setImageDescriptor(desc);
+	}
+	
+	/**
+	 * Helper method to access the image registry from the CUIPlugin class.
+	 */
+	static ImageRegistry getImageRegistry() {
+		return imageRegistry;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CBuildStepsConsole.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CBuildStepsConsole.java
new file mode 100644
index 0000000..5ba3259
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CBuildStepsConsole.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2004, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ * Red Hat Inc - Adapted for Autotools usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.cdt.ui.IBuildConsoleManager;
+import org.eclipse.core.resources.IProject;
+
+public class CBuildStepsConsole extends Console {
+	IProject project;
+	IBuildConsoleManager fConsoleManager;
+	
+	private static final String CONTEXT_MENU_ID = "CAutotoolsBuildStepsConsole"; //$NON-NLS-1$
+	private static final String CONSOLE_NAME = ConsoleMessages.getString("BuildStepsConsole.name"); //$NON-NLS-1$
+	
+	public CBuildStepsConsole() {
+		super(CONSOLE_NAME, CONTEXT_MENU_ID);
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CConfigureConsole.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CConfigureConsole.java
new file mode 100644
index 0000000..1925fcd
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CConfigureConsole.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2004, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.cdt.ui.IBuildConsoleManager;
+import org.eclipse.core.resources.IProject;
+
+public class CConfigureConsole extends Console {
+	IProject project;
+	IBuildConsoleManager fConsoleManager;
+	
+	private static final String CONTEXT_MENU_ID = "CAutotoolsConfigureConsole"; //$NON-NLS-1$
+	private static final String CONSOLE_NAME = ConsoleMessages.getString("ConfigureConsole.name"); //$NON-NLS-1$
+	
+	public CConfigureConsole() {
+		super(CONSOLE_NAME, CONTEXT_MENU_ID);
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CWordFinder.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CWordFinder.java
new file mode 100644
index 0000000..cc28694
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CWordFinder.java
@@ -0,0 +1,283 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.Region;
+
+
+/**
+ * This is a helper class for the text editor to be able to determine, given a
+ * particular offset in a document, various candidates segments for things like
+ * context help, proposals and hovering.
+ */
+public class CWordFinder {
+	
+	private static final char CBRACE_L = '{';
+	private static final char CBRACE_R = '}';
+	private static final char  BRACE_R = ')';
+	
+	/**
+	 * This method determines for a given offset into a given document what the
+	 * region is which defines the current word. A word is defined as the set of
+	 * non "C" identifiers. So assuming that ! indicated the current cursor
+	 * postion: !afunction(int a, int b) --> word = length 0 afunc!tion(int a,
+	 * int b) --> word = afunction afunction!(int a, int b) --> word = afunction
+	 * afunction(!int a, int b) --> word = length 0 afunction(int a,! int b) -->
+	 * word = length 0 afunction(!) --> word = length 0
+	 * 
+	 * @param document
+	 *            The document to be examined
+	 * @param offset
+	 *            The offset into the document where a word should be
+	 *            idendified.
+	 * @return The region defining the current word, which may be a region of
+	 *         length 0 if the offset is not in a word, or null if there is an
+	 *         error accessing the docment data.
+	 */
+	public static IRegion findWord(IDocument document, int offset) {
+		int start = -1;
+		int end = -1;
+
+		try {
+			int pos = offset;
+			char c;
+
+			while (pos >= 0) {
+				c = document.getChar(pos);
+				if (!Character.isJavaIdentifierPart(c))
+					break;
+				--pos;
+			}
+
+			start = pos + 1;
+
+			pos = offset;
+			int length = document.getLength();
+
+			while (pos < length) {
+				c = document.getChar(pos);
+				if (!Character.isJavaIdentifierPart(c))
+					break;
+				++pos;
+			}
+
+			end = pos;
+
+		} catch (BadLocationException x) {
+		}
+
+		if (start > -1 && end > -1) {
+			if (start >= offset && end == offset)
+				return new Region(offset, 0);
+			else
+				return new Region(start, end - start);
+		}
+
+		return null;
+	}
+
+	/**
+	 * This method will determine the region for the name of the function within
+	 * which the current offset is contained.
+	 * 
+	 * @param document
+	 *            The document to be examined
+	 * @param offset
+	 *            The offset into the document where a word should be
+	 *            idendified.
+	 * @return The region defining the current word, which may be a region of
+	 *         length 0 if the offset is not in a function, or null if there is
+	 *         an error accessing the docment data.
+	 */
+	public static IRegion findFunction(IDocument document, int offset) {
+		int leftbracket = -1;
+		int leftbracketcount = 0;
+		int rightbracket = -1;
+		int rightbracketcount = 0;
+		int functionstart = -1;
+		int functionend = -1;
+
+		try {
+			int length = document.getLength();
+			int pos;
+			char c;
+
+			//Find most relevant right bracket from our position
+			pos = offset;
+			rightbracketcount = leftbracketcount = 0;
+			while (pos < length) {
+				c = document.getChar(pos);
+
+				if (c == ')') {
+					rightbracketcount++;
+					if (rightbracketcount >= leftbracketcount) {
+						rightbracket = pos;
+						break;
+					}
+				}
+
+				if (c == '(') {
+					leftbracketcount++;
+				}
+
+				if (c == ';') {
+					break;
+				}
+
+				pos++;
+			}
+
+			if (rightbracket == -1) {
+				return new Region(offset, 0);
+			}
+
+			//Now backtrack our way from the rightbracket to the left
+			pos = rightbracket;
+			rightbracketcount = leftbracketcount = 0;
+			while (pos >= 0) {
+				c = document.getChar(pos);
+
+				if (c == ')') {
+					rightbracketcount++;
+				}
+
+				if (c == '(') {
+					leftbracketcount++;
+					if (leftbracketcount >= rightbracketcount) {
+						leftbracket = pos;
+						break;
+					}
+				}
+
+				if (c == ';') {
+					break;
+				}
+
+				pos--;
+			}
+
+			if (leftbracket == -1) {
+				return new Region(offset, 0);
+			}
+
+			//Now work our way to the function name
+			pos = leftbracket - 1;
+			while (pos >= 0) {
+				c = document.getChar(pos);
+				if (functionend == -1 && c == ' ') {
+					pos--;
+					continue;
+				}
+
+				if (!Character.isJavaIdentifierPart(c)) {
+					break;
+				}
+
+				functionstart = pos;
+				if (functionend == -1) {
+					functionend = pos;
+				}
+
+				pos--;
+			}
+		} catch (BadLocationException x) {
+			/* Ignore */
+		}
+
+		if (functionstart > -1 && functionend > -1) {
+			return new Region(functionstart, functionend - functionstart + 1);
+		}
+
+		return null;
+	}
+
+	/**
+	 * This method will determine whether current offset is contained 
+	 * in any function's body or it's outside it. 
+	 * 
+	 * @param document
+	 *            The document to be examined
+	 * @param offset
+	 *            The offset into the document
+	 * @return 
+	 *      <code>true</code> if there is no function body around offset 
+	 *      <code>false</code> otherwise 
+	 */
+	public static boolean isGlobal(IDocument document, int offset) {
+		try {
+			int pos = offset;
+			int bracketcount = 0;
+			char c;
+
+			//Find left curled bracket from our position
+			while (pos > 0) {
+				c = document.getChar(pos--);
+
+				if (c == CBRACE_R) {
+					bracketcount++; // take into account nested blocks
+				} else if (c == CBRACE_L) {
+					if (bracketcount-- == 0) {
+						do {
+							c = document.getChar(pos--);
+							if (c == BRACE_R) return false;
+						} while (Character.isWhitespace(c));
+						// container block seems to be not a function or statement body
+						pos++;             // step back one symbol
+						bracketcount = 0;  // let's search for upper block
+					}
+				}
+			}
+			
+		} catch (BadLocationException x) { /* Ignore */	}
+		// return true in case of unknown result or exception 
+		return true;
+	}
+	
+	/**
+	 * Searches for line feed symbols in string.
+	 * First met '\r' or '\n' is treated as LF symbol
+	 * 
+	 * @param s
+	 * 			string to search in.
+	 * @return  number of LFs met.
+	 */
+	public static int countLFs (String s) {
+		int counter = 0;
+		char lf = 0;
+		char c;
+		for (int i=0; i<s.length(); i++) {
+			c = s.charAt(i);
+			if (lf == 0) {
+				if (c == '\n' || c == '\r') {
+					lf = c;
+					counter++;
+				}
+			} else if (lf == c) counter++;
+		}
+		return counter;
+	}
+
+	/**
+	 * Checks whether the string contains any C-block delimiters ( { } ) 
+	 * 
+	 * @param s 
+	 * 			text to check
+	 * @return  true if curled brace found.
+	 */
+	public static boolean hasCBraces (String s) {
+		if (s.indexOf(CBRACE_L) > -1 || s.indexOf(CBRACE_R) > -1) return true;
+		else return false;
+	}
+}
+
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/Console.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/Console.java
new file mode 100644
index 0000000..695e489
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/Console.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2004 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.cdt.core.ConsoleOutputStream;
+import org.eclipse.cdt.core.resources.IConsole;
+import org.eclipse.cdt.ui.CUIPlugin;
+import org.eclipse.cdt.ui.IBuildConsoleManager;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+
+public class Console implements IConsole {
+	IProject project;
+	IBuildConsoleManager fConsoleManager;
+	
+	public Console(String consoleName, String contextId) {
+		fConsoleManager = CUIPlugin.getDefault().getConsoleManager(consoleName, 
+				contextId);
+	}
+	
+//	/**
+//	 * Constructor for ConfigureConsole.
+//	 */
+//	public CConfigureConsole() {
+//		fConsoleManager = AutotoolsPlugin.getDefault().getConsoleManager();
+//	}
+//
+
+	public void start(IProject project ) {
+		this.project = project;
+		fConsoleManager.getConsole(project).start(project);
+	}
+	
+	/**
+	 * @throws CoreException
+	 * @see org.eclipse.cdt.core.resources.IConsole#getOutputStream()
+	 */
+	public ConsoleOutputStream getOutputStream() throws CoreException {
+		return fConsoleManager.getConsole(project).getOutputStream();
+	}
+
+	public ConsoleOutputStream getInfoStream() throws CoreException {
+		return fConsoleManager.getConsole(project).getInfoStream();
+	}
+
+	public ConsoleOutputStream getErrorStream() throws CoreException {
+		return fConsoleManager.getConsole(project).getErrorStream();
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.java
new file mode 100644
index 0000000..a9b3d21
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2004 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class ConsoleMessages {
+
+	public static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.cdt.autotools.ui.ConsoleMessages";//$NON-NLS-1$
+
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+
+	private ConsoleMessages() {
+
+	}
+	public static String getString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.properties b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.properties
new file mode 100644
index 0000000..7c4510d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.properties
@@ -0,0 +1,25 @@
+###############################################################################
+# Copyright (c) 2003, 2004 QNX Software Systems and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# QNX Software Systems - Initial API and implementation
+###############################################################################
+ConfigureConsole.name=Configure
+BuildStepsConsole.name=Build Steps
+AutotoolsConsole.name=Autotools
+
+find_replace_action.label=&Find/Replace...@Ctrl+F
+find_replace_action.tooltip=Find/Replace
+find_replace_action.image=
+find_replace_action.description=Find/Replace
+
+ConfigureConsolePage.&Copy@Ctrl+C_6=&Copy@Ctrl+C
+ConfigureConsolePage.Copy_7=Copy
+ConfigureConsolePage.Select_&All@Ctrl+A_12=Select &All@Ctrl+A
+ConfigureConsolePage.Select_All=Select All
+
+ScrollLockAction.Scroll_Lock_1=Scroll Lock
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ErrorParserBlock.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ErrorParserBlock.java
new file mode 100644
index 0000000..fd1ad86
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ErrorParserBlock.java
@@ -0,0 +1,119 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.cdt.make.core.IMakeBuilderInfo;
+import org.eclipse.cdt.make.core.MakeBuilder;
+import org.eclipse.cdt.make.core.MakeCorePlugin;
+import org.eclipse.cdt.ui.dialogs.AbstractErrorParserBlock;
+import org.eclipse.cdt.ui.dialogs.ICOptionContainer;
+import org.eclipse.cdt.utils.ui.controls.ControlFactory;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Preferences;
+import org.eclipse.swt.widgets.Composite;
+
+@SuppressWarnings("deprecation")
+public class ErrorParserBlock extends AbstractErrorParserBlock {
+
+	// make builder enabled
+	IMakeBuilderInfo fBuildInfo;
+	boolean useBuildInfo = false;
+	Preferences fPrefs;
+	
+	public ErrorParserBlock(Preferences preferences) {
+		super();
+		fPrefs = preferences;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
+	 */
+	public void createControl(Composite parent) {
+
+		if (useBuildInfo == true && fBuildInfo == null) {
+			Composite composite = ControlFactory.createComposite(parent, 1);
+			setControl(composite);
+			ControlFactory.createEmptySpace(composite);
+			ControlFactory.createLabel(composite, MakeUIMessages.getResourceString("ErrorParserBlock.label.missingBuilderInformation")); //$NON-NLS-1$
+			return;
+		}
+		super.createControl(parent);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.cdt.ui.dialogs.ErrorParserBlock#getErrorParserIDs(org.eclipse.core.resources.IProject)
+	 */
+	protected String[] getErrorParserIDs(IProject project) {
+		if (getContainer().getProject() != null && fBuildInfo == null) {
+			try {
+				fBuildInfo = MakeCorePlugin.createBuildInfo(getContainer().getProject(), MakeBuilder.BUILDER_ID);
+			} catch (CoreException e) {
+			}
+		}
+		if (fBuildInfo != null) {
+			return fBuildInfo.getErrorParsers();
+		}
+		return new String[0];
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.cdt.ui.dialogs.ErrorParserBlock#saveErrorParsers(org.eclipse.core.resources.IProject,
+	 *      java.lang.String[])
+	 */
+	public void saveErrorParsers(IProject project, String[] parserIDs) throws CoreException {
+		if (getContainer().getProject() != null) {
+			try {
+				fBuildInfo = MakeCorePlugin.createBuildInfo(getContainer().getProject(), MakeBuilder.BUILDER_ID);
+			} catch (CoreException e) {
+			}
+		}
+		if (fBuildInfo != null) {
+			fBuildInfo.setErrorParsers(parserIDs);
+		}
+	}
+
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.dialogs.AbstractErrorParserBlock#saveErrorParsers(java.lang.String[])
+	 */
+	protected void saveErrorParsers(String[] parserIDs) throws CoreException {
+		fBuildInfo = MakeCorePlugin.createBuildInfo(fPrefs, MakeBuilder.BUILDER_ID, false);
+		fBuildInfo.setErrorParsers(parserIDs);
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.dialogs.AbstractErrorParserBlock#getErrorParserIDs(boolean)
+	 */
+	protected String[] getErrorParserIDs(boolean defaults) {
+		fBuildInfo = MakeCorePlugin.createBuildInfo(fPrefs, MakeBuilder.BUILDER_ID, defaults);
+		return fBuildInfo.getErrorParsers();
+	}
+	
+	public void setContainer(ICOptionContainer container) {
+		super.setContainer(container);
+		if (getContainer().getProject() != null) {
+			try {
+				fBuildInfo = MakeCorePlugin.createBuildInfo(getContainer().getProject(), MakeBuilder.BUILDER_ID);
+			} catch (CoreException e) {
+			}
+			useBuildInfo = true; 
+		} else {
+		}
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/FileRelevance.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/FileRelevance.java
new file mode 100644
index 0000000..a360965
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/FileRelevance.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Broadcom and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     James Blackburn (Broadcom) - Initial API and implementation
+ *     Markus Schorn (Wind River Systems)
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.cdt.core.model.CoreModel;
+import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourceAttributes;
+
+/**
+ * This class computes a relevance for files in case we have to select
+ * from multiple files for the same file-system location.
+ */
+public class FileRelevance {
+	private static final int PREFERRED_PROJECT 		= 0x40;
+	private static final int CDT_PROJECT 			= 0x20;
+	private static final int ON_SOURCE_ROOT			= 0x10;
+
+	// Penalty for undesirable attributes
+	private static final int LINK_PENALTY			= 1;
+	private static final int INACCESSIBLE_SHIFT 	= 4;
+
+	/**
+	 * Compute a relevance for the given file. The higher the score the more relevant the
+	 * file. It is determined by the following criteria: <br>
+	 * - file belongs to preferred project <br>
+	 * - file belongs to a cdt-project <br>
+	 * - file belongs to a source folder of a cdt-project <br>
+	 * - file is accessible
+	 * - file is not a link
+	 * @param f the file to compute the relevance for
+	 * @return integer representing file relevance. Larger numbers are more relevant
+	 */
+	public static int getRelevance(IFile f, IProject preferredProject) {
+		int result= 0;
+		IProject p= f.getProject();
+		if (p.equals(preferredProject))
+			result+= PREFERRED_PROJECT;
+
+		if (CoreModel.hasCNature(p)) {
+			result+= CDT_PROJECT;
+			ICProject cproject= CoreModel.getDefault().create(p);
+			if (cproject.isOnSourceRoot(f))
+				result+= ON_SOURCE_ROOT;
+		}
+
+		if (!f.isAccessible())
+			result >>= INACCESSIBLE_SHIFT;
+		else {
+			ResourceAttributes ra = f.getResourceAttributes();
+			if (f.isLinked() || (ra != null && ra.isSymbolicLink()))
+				result -= LINK_PENALTY;
+		}
+
+		return result;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTML2TextReader.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTML2TextReader.java
new file mode 100644
index 0000000..c4adcba
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTML2TextReader.java
@@ -0,0 +1,260 @@
+/*******************************************************************************
+ * Copyright (c) 2000 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+
+import java.io.IOException;
+import java.io.PushbackReader;
+import java.io.Reader;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.jface.text.TextPresentation;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyleRange;
+
+
+/**
+ * Reads the text contents from a reader of HTML contents and translates 
+ * the tags or cut them out.
+ */
+public class HTML2TextReader extends SubstitutionTextReader {
+	
+	
+	private static final String LINE_DELIM= System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
+	private static final Map<String, String> fgEntityLookup;
+	private static final Set<String> fgTags;
+	
+	static {
+		
+		fgTags= new HashSet<String>();
+		fgTags.add("b"); //$NON-NLS-1$
+		fgTags.add("br"); //$NON-NLS-1$
+		fgTags.add("h5"); //$NON-NLS-1$
+		fgTags.add("p"); //$NON-NLS-1$
+		fgTags.add("dl"); //$NON-NLS-1$
+		fgTags.add("dt"); //$NON-NLS-1$
+		fgTags.add("dd"); //$NON-NLS-1$
+		fgTags.add("li"); //$NON-NLS-1$
+		fgTags.add("ul"); //$NON-NLS-1$
+		
+		fgEntityLookup= new HashMap<String, String>(7);
+		fgEntityLookup.put("lt", "<"); //$NON-NLS-1$ //$NON-NLS-2$
+		fgEntityLookup.put("gt", ">"); //$NON-NLS-1$ //$NON-NLS-2$
+		fgEntityLookup.put("nbsp", " "); //$NON-NLS-1$ //$NON-NLS-2$
+		fgEntityLookup.put("amp", "&"); //$NON-NLS-1$ //$NON-NLS-2$
+		fgEntityLookup.put("circ", "^"); //$NON-NLS-1$ //$NON-NLS-2$
+		fgEntityLookup.put("tilde", "~"); //$NON-NLS-2$ //$NON-NLS-1$
+		fgEntityLookup.put("quot", "\"");		 //$NON-NLS-1$ //$NON-NLS-2$
+	}
+	
+	private int fCounter= 0;
+	private TextPresentation fTextPresentation;
+	private int fBold= 0;
+	private int fStartOffset= -1;
+	private boolean fInParagraph= false;
+
+	/**
+	 * Transforms the html text from the reader to formatted text.
+	 * @param presentation If not <code>null</code>, formattings will be applied to 
+	 * the presentation.
+	*/
+	public HTML2TextReader(Reader reader, TextPresentation presentation) {
+		super(new PushbackReader(reader));
+		fTextPresentation= presentation;
+	}
+	
+	public int read() throws IOException {
+		int c= super.read();
+		if (c != -1)
+			++ fCounter;
+		return c;
+	}
+	
+	protected void startBold() {
+		if (fBold == 0)
+			fStartOffset= fCounter;
+		++ fBold;
+	}
+	
+	protected void stopBold() {
+		-- fBold;
+		if (fBold == 0) {
+			if (fTextPresentation != null) {
+				fTextPresentation.addStyleRange(new StyleRange(fStartOffset, fCounter - fStartOffset, null, null, SWT.BOLD));
+			}
+			fStartOffset= -1;
+		}
+	}
+	
+	/**
+	 * @see SubstitutionTextReader#computeSubstitution(char)
+	 */
+	protected String computeSubstitution(int c) throws IOException {
+		if (c == '<')
+			return  processHTMLTag();
+		else if (c == '&')
+			return processEntity();
+		
+		return null;
+	}
+
+	private String html2Text(String html) {
+		
+		String tag= html;
+		if ('/' == tag.charAt(0))
+			tag= tag.substring(1);
+			
+		if (!fgTags.contains(tag))
+			return ""; //$NON-NLS-1$
+
+		if ("b".equals(html)) { //$NON-NLS-1$
+			startBold();
+			return ""; //$NON-NLS-1$
+		}
+				
+		if ("h5".equals(html) || "dt".equals(html)) { //$NON-NLS-1$ //$NON-NLS-2$
+			startBold();
+			return ""; //$NON-NLS-1$
+		}
+		
+		if ("dl".equals(html)) //$NON-NLS-1$
+			return LINE_DELIM;
+		
+		if ("dd".equals(html)) //$NON-NLS-1$
+			return "\t"; //$NON-NLS-1$
+		
+		if ("li".equals(html)) //$NON-NLS-1$
+			return LINE_DELIM + "\t" + "-"; //$NON-NLS-1$ //$NON-NLS-2$
+					
+		if ("/b".equals(html)) { //$NON-NLS-1$
+			stopBold();
+			return ""; //$NON-NLS-1$
+		}
+
+		if ("p".equals(html))  { //$NON-NLS-1$
+			fInParagraph= true;
+			return LINE_DELIM;
+		}
+
+		if ("br".equals(html)) //$NON-NLS-1$
+			return LINE_DELIM;
+		
+		if ("/p".equals(html))  { //$NON-NLS-1$
+			boolean inParagraph= fInParagraph;
+			fInParagraph= false;
+			return inParagraph ? "" : LINE_DELIM; //$NON-NLS-1$
+		}
+			
+		if ("/h5".equals(html) || "/dt".equals(html)) { //$NON-NLS-1$ //$NON-NLS-2$
+			stopBold();
+			return LINE_DELIM;
+		}
+		
+		if ("/dd".equals(html)) //$NON-NLS-1$
+			return LINE_DELIM;
+				
+		return ""; //$NON-NLS-1$
+	}
+	
+	/*
+	 * A '<' has been read. Process a html tag
+	 */ 
+	private String processHTMLTag() throws IOException {
+		
+		StringBuffer buf= new StringBuffer();
+		int ch;
+		do {		
+			
+			ch= nextChar();
+			
+			while (ch != -1 && ch != '>') {
+				buf.append(Character.toLowerCase((char) ch));
+				ch= nextChar();
+				if (ch == '"'){
+					buf.append(Character.toLowerCase((char) ch));
+					ch= nextChar();
+					while (ch != -1 && ch != '"'){
+						buf.append(Character.toLowerCase((char) ch));
+						ch= nextChar();
+					}	
+				}
+				if (ch == '<'){
+					unread(ch);
+					return '<' + buf.toString();
+				}	
+			}
+			
+			if (ch == -1)
+				return null;
+			
+			int tagLen= buf.length();
+			// needs special treatment for comments 
+			if ((tagLen >= 3 && "!--".equals(buf.substring(0, 3))) //$NON-NLS-1$
+				&& !(tagLen >= 5 && "--!".equals(buf.substring(tagLen - 3)))) { //$NON-NLS-1$
+				// unfinished comment
+				buf.append(ch);
+			} else {
+				break;
+			}
+		} while (true);
+		 
+		return html2Text(buf.toString());
+	}
+	
+	private void unread(int ch) throws IOException {
+		((PushbackReader) getReader()).unread(ch);
+	}
+	
+	protected String entity2Text(String symbol) {
+		if (symbol.length() > 1 && symbol.charAt(0) == '#') {
+			int ch;
+			try {
+				if (symbol.charAt(1) == 'x') {
+					ch= Integer.parseInt(symbol.substring(2), 16);
+				} else {
+					ch= Integer.parseInt(symbol.substring(1), 10);
+				}
+				return "" + (char)ch; //$NON-NLS-1$
+			} catch (NumberFormatException e) {
+			}
+		} else {
+			String str= (String) fgEntityLookup.get(symbol);
+			if (str != null) {
+				return str;
+			}
+		}
+		return "&" + symbol; // not found //$NON-NLS-1$
+	}
+	
+	/*
+	 * A '&' has been read. Process a entity
+	 */ 	
+	private String processEntity() throws IOException {
+		StringBuffer buf= new StringBuffer();
+		int ch= nextChar();
+		while (Character.isLetterOrDigit((char)ch) || ch == '#') {
+			buf.append((char) ch);
+			ch= nextChar();
+		}
+		
+		if (ch == ';') 
+			return entity2Text(buf.toString());
+		
+		buf.insert(0, '&');
+		if (ch != -1)
+			buf.append((char) ch);
+		return buf.toString();
+	}
+}
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLPrinter.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLPrinter.java
new file mode 100644
index 0000000..a9de7d1
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLPrinter.java
@@ -0,0 +1,116 @@
+/*******************************************************************************
+ * Copyright (c) 2000 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.io.IOException;
+import java.io.Reader;
+
+
+/**
+ * Provides a set of convenience methods for creating HTML pages.
+ */
+public class HTMLPrinter {
+			
+	private HTMLPrinter() {
+	}
+	
+	private static String replace(String text, char c, String s) {
+				
+		int previous= 0;
+		int current= text.indexOf(c, previous);
+		
+		if (current == -1)
+			return text;
+		
+		StringBuffer buffer= new StringBuffer();	
+		while (current > -1) {
+			buffer.append(text.substring(previous, current));
+			buffer.append(s);
+			previous= current + 1;
+			current= text.indexOf(c, previous);
+		}
+		buffer.append(text.substring(previous));
+		
+		return buffer.toString();
+	}
+	
+	public static String convertToHTMLContent(String content) {
+		content= replace(content, '<', "&lt;"); //$NON-NLS-1$
+		return replace(content, '>', "&gt;"); //$NON-NLS-1$
+	}
+	
+	public static String read(Reader rd) {
+		
+		StringBuffer buffer= new StringBuffer();
+		char[] readBuffer= new char[2048];
+		
+		try {
+			int n= rd.read(readBuffer);
+			while (n > 0) {
+				buffer.append(readBuffer, 0, n);
+				n= rd.read(readBuffer);
+			}
+			return buffer.toString();
+		} catch (IOException x) {
+		}
+		
+		return null;
+	}
+
+	public static void insertPageProlog(StringBuffer buffer, int position) {
+		buffer.insert(position, "<html><body text=\"#000000\" bgcolor=\"#FFFF88\"><font size=-1>"); //$NON-NLS-1$
+	}
+	
+	public static void addPageProlog(StringBuffer buffer) {
+		insertPageProlog(buffer, buffer.length());
+	}
+	
+	public static void addPageEpilog(StringBuffer buffer) {
+		buffer.append("</font></body></html>"); //$NON-NLS-1$
+	}
+	
+	public static void startBulletList(StringBuffer buffer) {
+		buffer.append("<ul>"); //$NON-NLS-1$
+	}
+	
+	public static void endBulletList(StringBuffer buffer) {
+		buffer.append("</ul>"); //$NON-NLS-1$
+	}
+	
+	public static void addBullet(StringBuffer buffer, String bullet) {
+		if (bullet != null) {
+			buffer.append("<li>"); //$NON-NLS-1$
+			buffer.append(bullet);
+			buffer.append("</li>"); //$NON-NLS-1$
+		}
+	}
+	
+	public static void addSmallHeader(StringBuffer buffer, String header) {
+		if (header != null) {
+			buffer.append("<h5>"); //$NON-NLS-1$
+			buffer.append(header);
+			buffer.append("</h5>"); //$NON-NLS-1$
+		}
+	}
+	
+	public static void addParagraph(StringBuffer buffer, String paragraph) {
+		if (paragraph != null) {
+			buffer.append("<p>"); //$NON-NLS-1$
+			buffer.append(paragraph);
+		}
+	}
+	
+	public static void addParagraph(StringBuffer buffer, Reader paragraphReader) {
+		if (paragraphReader != null)
+			addParagraph(buffer, read(paragraphReader));
+	}
+}
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLTextPresenter.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLTextPresenter.java
new file mode 100644
index 0000000..233112b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLTextPresenter.java
@@ -0,0 +1,190 @@
+/*******************************************************************************
+ * Copyright (c) 2000 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.util.Iterator;
+
+import org.eclipse.jface.text.DefaultInformationControl;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.TextPresentation;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.swt.custom.StyleRange;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.widgets.Display;
+
+
+public class HTMLTextPresenter implements DefaultInformationControl.IInformationPresenter {
+	
+	private static final String LINE_DELIM= System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
+	
+	private int fCounter;
+	private boolean fEnforceUpperLineLimit;
+	
+	public HTMLTextPresenter(boolean enforceUpperLineLimit) {
+		super();
+		fEnforceUpperLineLimit= enforceUpperLineLimit;
+	}
+	
+	public HTMLTextPresenter() {
+		this(true);
+	}
+	
+	protected Reader createReader(String hoverInfo, TextPresentation presentation) {
+		return new HTML2TextReader(new StringReader(hoverInfo), presentation);
+	}
+	
+	@SuppressWarnings("unchecked")
+	protected void adaptTextPresentation(TextPresentation presentation, int offset, int insertLength) {
+				
+		int yoursStart= offset;
+		int yoursEnd=   offset + insertLength -1;
+		yoursEnd= Math.max(yoursStart, yoursEnd);
+		
+		Iterator e= presentation.getAllStyleRangeIterator();
+		while (e.hasNext()) {
+			
+			StyleRange range= (StyleRange) e.next();
+		
+			int myStart= range.start;
+			int myEnd=   range.start + range.length -1;
+			myEnd= Math.max(myStart, myEnd);
+			
+			if (myEnd < yoursStart)
+				continue;
+			
+			if (myStart < yoursStart)
+				range.length += insertLength;
+			else
+				range.start += insertLength;
+		}
+	}
+	
+	private void append(StringBuffer buffer, String string, TextPresentation presentation) {
+		
+		int length= string.length();
+		buffer.append(string);
+		
+		if (presentation != null)
+			adaptTextPresentation(presentation, fCounter, length);
+			
+		fCounter += length;
+	}
+	
+	private String getIndent(String line) {
+		int length= line.length();
+		
+		int i= 0;
+		while (i < length && Character.isWhitespace(line.charAt(i))) ++i;
+		
+		return (i == length ? line : line.substring(0, i)) + " "; //$NON-NLS-1$
+	}
+	
+	/*
+	 * @see IHoverInformationPresenter#updatePresentation(Display display, String, TextPresentation, int, int)
+	 */
+	public String updatePresentation(Display display, String hoverInfo, TextPresentation presentation, int maxWidth, int maxHeight) {
+		
+		if (hoverInfo == null)
+			return null;
+			
+		GC gc= new GC(display);
+		try {
+			
+			StringBuffer buffer= new StringBuffer();
+			int maxNumberOfLines= Math.round(maxHeight / gc.getFontMetrics().getHeight());
+			
+			fCounter= 0;
+			LineBreakingReader reader= new LineBreakingReader(createReader(hoverInfo, presentation), gc, maxWidth);
+			
+			boolean lastLineFormatted= false;
+			String lastLineIndent= null;
+			
+			String line=reader.readLine();
+			boolean lineFormatted= reader.isFormattedLine();
+			boolean firstLineProcessed= false;
+			
+			while (line != null) {
+				
+				if (fEnforceUpperLineLimit && maxNumberOfLines <= 0)
+					break;
+				
+				if (firstLineProcessed) {
+					if (!lastLineFormatted)
+						append(buffer, LINE_DELIM, null);
+					else {
+						append(buffer, LINE_DELIM, presentation);
+						if (lastLineIndent != null)
+							append(buffer, lastLineIndent, presentation);
+					}
+				}
+				
+				append(buffer, line, null);
+				firstLineProcessed= true;
+				
+				lastLineFormatted= lineFormatted;
+				if (!lineFormatted)
+					lastLineIndent= null;
+				else if (lastLineIndent == null)
+					lastLineIndent= getIndent(line);
+					
+				line= reader.readLine();
+				lineFormatted= reader.isFormattedLine();
+				
+				maxNumberOfLines--;
+			}
+			
+			if (line != null) {
+				append(buffer, LINE_DELIM, lineFormatted ? presentation : null);
+				append(buffer, (""), presentation); //$NON-NLS-1$
+			}
+			
+			return trim(buffer, presentation);
+			
+		} catch (IOException e) {
+			
+			AutotoolsUIPlugin.log(e);
+			return null;
+			
+		} finally {
+			gc.dispose();
+		}
+	}
+	
+	private String trim(StringBuffer buffer, TextPresentation presentation) {
+		
+		int length= buffer.length();
+				
+		int end= length -1;
+		while (end >= 0 && Character.isWhitespace(buffer.charAt(end)))
+			-- end;
+		
+		if (end == -1)
+			return ""; //$NON-NLS-1$
+			
+		if (end < length -1)
+			buffer.delete(end + 1, length);
+		else
+			end= length;
+			
+		int start= 0;
+		while (start < end && Character.isWhitespace(buffer.charAt(start)))
+			++ start;
+			
+		buffer.delete(0, start);
+		presentation.setResultWindow(new Region(start, buffer.length()));
+		return buffer.toString();
+	}
+}
+
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/LineBreakingReader.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/LineBreakingReader.java
new file mode 100644
index 0000000..52fb3e3
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/LineBreakingReader.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2000 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.Reader;
+
+import java.text.BreakIterator;
+import org.eclipse.swt.graphics.GC;
+
+/*
+ * Not a real reader. Could change if requested
+ */
+public class LineBreakingReader {
+	
+	private BufferedReader fReader;
+	private GC fGC;
+	private int fMaxWidth;
+	
+	private String fLine;
+	private int fOffset;
+	
+	private BreakIterator fLineBreakIterator;
+	private int findNextBreakOffset(int currOffset) {
+		int currWidth= 0;
+		int nextOffset= fLineBreakIterator.following(currOffset);
+		while (nextOffset != BreakIterator.DONE) {
+			String word= fLine.substring(currOffset, nextOffset);
+			int wordWidth= fGC.textExtent(word).x;
+			int nextWidth= wordWidth + currWidth;
+			if (nextWidth > fMaxWidth) {
+				if (currWidth > 0) {
+					return currOffset;
+				}
+				return nextOffset;
+			}
+			currWidth= nextWidth;
+			currOffset= nextOffset;
+			nextOffset= fLineBreakIterator.next();
+		}
+		return nextOffset;
+	}
+	private int findWordBegin(int idx) {
+		while (idx < fLine.length() && Character.isWhitespace(fLine.charAt(idx))) {
+			idx++;
+		}
+		return idx;
+	}
+	/**
+	 * Creates a reader that breaks an input text to fit in a given width.
+	 * @param reader Reader of the input text
+	 * @param gc The graphic context that defines the currently used font sizes
+	 * @param maxLineWidth The max width (pixes) where the text has to fit in 
+	 */
+	public LineBreakingReader(Reader reader, GC gc, int maxLineWidth) {
+		fReader= new BufferedReader(reader);
+		fGC= gc;
+		fMaxWidth= maxLineWidth;
+		fOffset= 0;
+		fLine= null;
+		fLineBreakIterator= BreakIterator.getLineInstance();
+	}
+	
+	public boolean isFormattedLine() {
+		return fLine != null;
+	}
+	
+	/**
+	 * Reads the next line. The lengths of the line will not exceed the gived maximum
+	 * width.
+	 */
+	public String readLine() throws IOException {
+		if (fLine == null) {
+			String line= fReader.readLine();
+			if (line == null) {
+				return null;
+			}
+								
+			int lineLen= fGC.textExtent(line).x;
+			if (lineLen < fMaxWidth) {
+				return line;
+			}
+			fLine= line;
+			fLineBreakIterator.setText(line);
+			fOffset= 0;
+		}
+		int breakOffset= findNextBreakOffset(fOffset);
+		String res;
+		if (breakOffset != BreakIterator.DONE) {
+			res= fLine.substring(fOffset, breakOffset);
+			fOffset= findWordBegin(breakOffset);
+			if (fOffset == fLine.length()) {
+				fLine= null;
+			}
+		} else {
+			res= fLine.substring(fOffset);
+			fLine= null;
+		}
+		return res;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/LocationAdapter.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/LocationAdapter.java
new file mode 100644
index 0000000..22b5584
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/LocationAdapter.java
@@ -0,0 +1,97 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Wind River Systems, Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Markus Schorn - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+
+import org.eclipse.core.filesystem.URIUtil;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+
+/**
+ * Provides common functionality for URI and IPath
+ */
+abstract class LocationAdapter<T> {
+	
+	public abstract String extractName(T location);
+	public abstract IFile[] platformsFindFilesForLocation(T location);
+	public abstract String getCanonicalPath(T location);
+	public abstract T getLocation(IFile file);
+
+	public static final LocationAdapter<IPath> PATH = new LocationAdapter<IPath>() {
+		@Override
+		public String extractName(IPath location) {
+			String name = location.lastSegment();
+			if (name != null)
+				return name;
+			return location.toString();
+		}
+
+		@Override
+		public IFile[] platformsFindFilesForLocation(IPath location) {
+			final IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+			return root.findFilesForLocationURI(URIUtil.toURI(location.makeAbsolute()));
+		}
+
+		@Override
+		public String getCanonicalPath(IPath location) {
+			final File file= location.toFile();
+			try {
+				return file.getCanonicalPath();
+			} catch (IOException e) {
+				// use non-canonical version
+				return file.getAbsolutePath();
+			}
+		}
+
+		@Override
+		public IPath getLocation(IFile file) {
+			return file.getLocation();
+		}
+	};
+
+	public static final LocationAdapter<URI> URI = new LocationAdapter<URI>() {
+		@Override
+		public String extractName(URI location) {
+			String path= location.getPath();
+			int idx= path.lastIndexOf('/');
+			return path.substring(idx+1);
+		}
+
+		@Override
+		public IFile[] platformsFindFilesForLocation(URI location) {
+			return ResourcesPlugin.getWorkspace().getRoot().findFilesForLocationURI(location);
+		}
+
+		@Override
+		public String getCanonicalPath(URI location) {
+			if (!"file".equals(location.getScheme()))  //$NON-NLS-1$
+				return null;
+
+			String path= location.getPath();
+			try {
+				return new File(path).getCanonicalPath();
+			} catch (IOException e) {
+				// use non-canonical version
+				return path;
+			}
+		}
+
+		@Override
+		public URI getLocation(IFile file) {
+			return file.getLocationURI();
+		}
+	};
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIImages.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIImages.java
new file mode 100644
index 0000000..68bff55
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIImages.java
@@ -0,0 +1,140 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2005, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.swt.graphics.Image;
+
+
+
+public class MakeUIImages {
+
+	/**
+	 * Bundle of all images used by the Make plugin.
+	 */
+	// The plugin registry
+	private static ImageRegistry imageRegistry = new ImageRegistry();
+
+	// Subdirectory (under the package containing this class) where 16 color images are
+	private static URL fgIconBaseURL;
+	static {
+		try {
+			fgIconBaseURL = new URL(AutotoolsUIPlugin.getDefault().getBundle().getEntry("/"), "icons/"); //$NON-NLS-1$ //$NON-NLS-2$
+		} catch (MalformedURLException e) {
+			AutotoolsUIPlugin.log(e);
+		}
+	}
+	private static final String NAME_PREFIX = AutotoolsUIPlugin.getUniqueIdentifier() + '.';
+	private static final int NAME_PREFIX_LENGTH = NAME_PREFIX.length();
+
+	public static final String OBJ = "obj16/"; //$NON-NLS-1$
+	public static final String T_TOOL= "tool16/"; //$NON-NLS-1$
+	public static final String T_LCL = "lcl16/"; //$NON-NLS-1$
+
+	// For the build image
+	public static final String IMG_OBJS_BUILD_TARGET = NAME_PREFIX + "target_obj.gif"; //$NON-NLS-1$
+	public static final ImageDescriptor DESC_BUILD_TARGET = createManaged(OBJ, IMG_OBJS_BUILD_TARGET);
+
+	public static final String IMG_OBJS_ERROR = NAME_PREFIX + "error_obj.gif"; //$NON-NLS-1$
+	public static final ImageDescriptor DESC_OBJ_ERROR = createManaged(OBJ, IMG_OBJS_ERROR);
+	public static final String IMG_OBJS_WARNING = NAME_PREFIX + "warning_obj.gif"; //$NON-NLS-1$
+	public static final ImageDescriptor DESC_OBJ_WARNING = createManaged(OBJ, IMG_OBJS_WARNING);
+
+	public static final String IMG_TOOLS_MAKE_TARGET_BUILD = NAME_PREFIX + "target_build.gif"; //$NON-NLS-1$
+	public static final String IMG_TOOLS_MAKE_TARGET_ADD = NAME_PREFIX + "target_add.gif"; //$NON-NLS-1$
+	public static final String IMG_TOOLS_MAKE_TARGET_DELETE = NAME_PREFIX + "target_delete.gif"; //$NON-NLS-1$
+	public static final String IMG_TOOLS_MAKE_TARGET_EDIT = NAME_PREFIX + "target_edit.gif"; //$NON-NLS-1$
+	public static final String IMG_TOOLS_MAKE_TARGET_FILTER = NAME_PREFIX + "target_filter.gif"; //$NON-NLS-1$
+
+	public static final String IMG_OBJS_MAKEFILE_MACRO = NAME_PREFIX + "macro_obj.gif"; //$NON-NLS-1$
+	public static final ImageDescriptor DESC_MAKEFILE_MACRO = createManaged(OBJ, IMG_OBJS_MAKEFILE_MACRO);
+
+	public static final String IMG_OBJS_MAKEFILE_ACMACRO = NAME_PREFIX + "acmacro_obj.gif"; //$NON-NLS-1$
+	public static final ImageDescriptor DESC_MAKEFILE_ACMACRO = createManaged(OBJ, IMG_OBJS_MAKEFILE_ACMACRO);
+
+	public static final String IMG_OBJS_MAKEFILE_TARGET_RULE = NAME_PREFIX + "trule_obj.gif"; //$NON-NLS-1$
+	public static final ImageDescriptor DESC_MAKEFILE_TARGET_RULE = createManaged(OBJ, IMG_OBJS_MAKEFILE_TARGET_RULE);
+
+	public static final String IMG_OBJS_MAKEFILE_INFERENCE_RULE = NAME_PREFIX + "irule_obj.gif"; //$NON-NLS-1$
+	public static final ImageDescriptor DESC_MAKEFILE_INFERENCE_RULE = createManaged(OBJ, IMG_OBJS_MAKEFILE_INFERENCE_RULE);
+
+	public static final String IMG_OBJS_MAKEFILE_RELATION = NAME_PREFIX + "relation_obj.gif"; //$NON-NLS-1$
+	public static final ImageDescriptor DESC_MAKEFILE_RELATION = createManaged(OBJ, IMG_OBJS_MAKEFILE_RELATION);
+
+	public static final String IMG_OBJS_MAKEFILE_COMMAND = NAME_PREFIX + "command_obj.gif"; //$NON-NLS-1$
+	public static final ImageDescriptor DESC_MAKEFILE_COMMAND = createManaged(OBJ, IMG_OBJS_MAKEFILE_COMMAND);
+
+	public static final String IMG_OBJS_MAKEFILE_INCLUDE = NAME_PREFIX + "include_obj.gif"; //$NON-NLS-1$
+	public static final ImageDescriptor DESC_MAKEFILE_INCLUDE = createManaged(OBJ, IMG_OBJS_MAKEFILE_INCLUDE);
+
+	public static final String IMG_OBJS_ENVIRONMNET = NAME_PREFIX + "environment_obj.gif"; //$NON-NLS-1$
+	public static final ImageDescriptor DESC_ENVIRONMENT = createManaged(OBJ, IMG_OBJS_ENVIRONMNET);
+
+	public static final String IMG_OBJS_ENV_VAR = NAME_PREFIX + "envvar_obj.gif"; //$NON-NLS-1$
+	public static final ImageDescriptor DESC_ENV_VAR = createManaged(OBJ, IMG_OBJS_ENV_VAR);
+
+	public static final String IMG_TOOLS_ALPHA_SORTING= NAME_PREFIX + "alphab_sort_co.gif"; //$NON-NLS-1$
+	public static final String IMG_TOOLS_MAKEFILE_SEGMENT_EDIT= NAME_PREFIX + "segment_edit.gif"; //$NON-NLS-1$
+
+	public static final String IMG_MENU_OPEN_INCLUDE= NAME_PREFIX + "open_include.gif"; //$NON-NLS-1$
+
+	private static ImageDescriptor createManaged(String prefix, String name) {
+		return createManaged(imageRegistry, prefix, name);
+	}
+
+	private static ImageDescriptor createManaged(ImageRegistry registry, String prefix, String name) {
+		ImageDescriptor result = ImageDescriptor.createFromURL(makeIconFileURL(prefix, name.substring(NAME_PREFIX_LENGTH)));
+		registry.put(name, result);
+		return result;
+	}
+
+	public static Image getImage(String key) {
+		return imageRegistry.get(key);
+	}
+
+	private static ImageDescriptor create(String prefix, String name) {
+		return ImageDescriptor.createFromURL(makeIconFileURL(prefix, name));
+	}
+
+	private static URL makeIconFileURL(String prefix, String name) {
+		StringBuffer buffer = new StringBuffer(prefix);
+		buffer.append(name);
+		try {
+			return new URL(fgIconBaseURL, buffer.toString());
+		} catch (MalformedURLException e) {
+			AutotoolsUIPlugin.log(e);
+			return null;
+		}
+	}
+
+	/**
+	 * Sets all available image descriptors for the given action.
+	 */
+	public static void setImageDescriptors(IAction action, String type, String relPath) {
+		relPath = relPath.substring(NAME_PREFIX_LENGTH);
+		action.setDisabledImageDescriptor(create("d" + type + "/", relPath)); //$NON-NLS-1$ //$NON-NLS-2$
+//		action.setHoverImageDescriptor(create("e" + type + "/", relPath)); //$NON-NLS-1$ //$NON-NLS-2$
+		action.setImageDescriptor(create("e" + type + "/", relPath)); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * Helper method to access the image registry from the JavaPlugin class.
+	 */
+	static ImageRegistry getImageRegistry() {
+		return imageRegistry;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIMessages.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIMessages.java
new file mode 100644
index 0000000..a4ecd91
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIMessages.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2004, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class MakeUIMessages {
+
+	public static final String BUNDLE_NAME = MakeUIMessages.class.getName();
+
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+
+	private MakeUIMessages() {
+
+	}
+	public static String getResourceString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+	
+	/**
+	 * Returns the plugin's resource bundle,
+	 */
+	public static ResourceBundle getResourceBundle() {
+		return RESOURCE_BUNDLE;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIMessages.properties b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIMessages.properties
new file mode 100644
index 0000000..4f49ba8
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIMessages.properties
@@ -0,0 +1,283 @@
+###############################################################################
+# Copyright (c) 2003, 2005, 2009 QNX Software Systems and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     QNX Software Systems - initial API and implementation
+#     Wind River Systems - fix for bugzilla 135150
+#     Tianchao Li (tianchao.li@gmail.com) - arbitrary build directory (bug #136136)
+###############################################################################
+
+MakeCWizard.title=C/Make Project
+MakeCWizard.description=Create a New C Project using 'make' to build it
+MakeEnvironmentBlock.10=&Remove
+MakeEnvironmentBlock.11=New Environment Variable
+MakeEnvironmentBlock.12=Overwrite variable?
+MakeEnvironmentBlock.13=A variable named {0} already exists. Overwrite?
+MakeEnvironmentBlock.14=Select &environment variables to add:
+MakeEnvironmentBlock.15=Select Environment Variables
+MakeEnvironmentBlock.16=Edit Environment Variable
+MakeEnvironmentBlock.17=&Append environment to native environment
+MakeEnvironmentBlock.18=Re&place native environment with specified environment
+MakeCWizard.task_name=Creating C project with Make builder...
+
+MakeCCWizard.title=C++/Make Project
+MakeCCWizard.description=Create a New C++ Project using 'make' to build it
+MakeCCWizard.task_name=Creating C++ project with Make builder...
+MakeEnvironmentBlock.0=Variable
+MakeEnvironmentBlock.1=Value
+MakeEnvironmentBlock.2=&Name:
+MakeEnvironmentBlock.3=&Value:
+MakeEnvironmentBlock.4=Environment
+MakeEnvironmentBlock.5=Environment used for make builder
+MakeEnvironmentBlock.6=Environment variables to set
+MakeEnvironmentBlock.7=N&ew...
+MakeEnvironmentBlock.8=Se&lect...
+MakeEnvironmentBlock.9=E&dit...
+
+MakeCWizardSettings.title=C/Make Project Settings
+MakeCWizardSettings.description=Define the project and 'make' builder settings
+
+MakeCCWizardSettings.title=C++/Make Project Settings
+MakeCCWizardSettings.description=Define the project and 'make' builder settings
+
+WizardMakeProjectConversion.title=Convert to C/C++ Make project
+WizardMakeProjectConversion.description=Convert a project to a C/C++ project which uses 'make' to build it.
+WizardMakeProjectConversion.monitor.convertingToMakeProject=Converting to Make Project...
+
+MakeWizardUpdate.window_title=Make Project Migration
+MakeWizardUpdatePage.title=Make Project Migration
+MakeWizardUpdatePage.description=Migrate older make projects to new make builder.
+MakeWizardUpdatePage.projectList=Project list
+MakeWizardUpdatePage.status.noProjectsToUpdate=No projects to update
+MakeWizardUpdatePage.status.noProjectsSelected=No projects selected
+
+WizardCheckboxTablePart.WizardCheckboxTablePart.selectAll=Select All
+WizardCheckboxTablePart.WizardCheckboxTablePart.deselectAll=Deselect All
+WizardCheckboxTablePart.WizardCheckboxTablePart.counter={0} of {1} Selected
+
+SettingsBlock.label=Make Builder
+SettingsBlock.message=Make builder settings.
+SettingsBlock.makeSetting.group_label=Build Setting
+SettingsBlock.makeSetting.stopOnError=Stop on first build error.
+SettingsBlock.makeSetting.runAllBuilders=Run all project builders.
+SettingsBlock.makeCmd.group_label=Build command
+SettingsBlock.makeCmd.use_default=Use default
+SettingsBlock.makeCmd.label=Build command:
+SettingsBlock.makeLoc.group_label=Build Location
+SettingsBlock.makeDir.label=Build directory:
+SettingsBlock.makeDir.browseWorkspace=Workspace...
+SettingsBlock.makeDir.browseFilesystem=Filesystem...
+SettingsBlock.makeWorkbench.group_label=Workbench Build Behavior
+SettingsBlock.makeWorkbench.type=Workbench build type:
+SettingsBlock.makeWorkbench.target=Make build target:
+SettingsBlock.makeWorkbench.auto=Build on resource save (Auto Build)
+SettingsBlock.makeWorkbench.note=Note:
+SettingsBlock.makeWorkbench.autobuildMessage=See Workbench automatic build preference.
+SettingsBlock.makeWorkbench.incremental=Build (Incremental Build)
+SettingsBlock.makeWorkbench.clean=Clean
+SettingsBlock.makeWorkbench.autoBuildTarget=Auto Build Target
+SettingsBlock.makeWorkbench.incrementalBuildTarget=Incremental Build Target
+SettingsBlock.makeWorkbench.cleanTarget=Clean Target
+SettingsBlock.variables=Variables...
+TargetBlock.target.group_label=Target
+TargetBlock.target.label=Target Name:
+
+ErrorParserBlock.label.missingBuilderInformation=Builder is missing or disabled on project.
+
+BuildTarget.target.group_label=Make Target
+BuildTarget.target.label=Make Target:
+
+MakeTargetsPreferencePage.buildTargetInBackground.label=Build make targets in background.
+
+MakeDocumentProvider.exception.createElementInfo=Error creating element.
+
+AddBuildTargetAction.title=Add make Target
+AddBuildTargetAction.description=Add make Target
+AddBuildTargetAction.tooltip= Add make Target
+AddBuildTargetAction.exception.internal=Internal Error
+
+OpenIncludeAction.title=Open include directive
+OpenIncludeAction.description=Open an include directive
+OpenIncludeAction.tooltip= Include Directive
+OpenIncludeAction.exception.internal=Internal Error
+
+TargetBuild.execption.message=Target Build Error
+TargetBuild.monitor.beginTask=Building Targets...
+TargetBuild.backgroundTask.name=Building Targets.
+
+TargetListViewer.button.add=Add...
+TargetListViewer.button.remove=Remove
+TargetListViewer.button.edit=Edit...
+TargetListViewer.lable.target=Target
+TargetListViewer.lable.location=Location
+TargetListViewer.exception.error=Error
+TargetListViewer.exception.message=An error occurred performing the selected action
+
+UpdateMakeProjectAction.exception.error=Error
+UpdateMakeProjectAction.eception.message=Error updating Make Projects
+UpdateMakeProjectAction.monitor.convert=Converting Make Targets...
+UpdateMakeProjectAction.monitor.update=Updating make Projects...
+
+BuildPathInfoBlock.button.browse=Browse...
+BuildPathInfoBlock.description=Set the include paths and preprocessor symbols for this project
+BuildPathInfoBlock.monitor.settingScannerInfo=Setting Scanner Info
+
+BuildTargetDialog.title.buildTarget=Make Targets
+BuildTargetDialog.button.build=Build
+BuildTargetDialog.title.makeTargetsFor=Make Targets for: 
+
+MakeTargetDialog.exception.noTargetBuilderOnProject=Not target builders on the project
+MakeTargetDialog.title.createMakeTarget=Create a new Make target
+MakeTargetDialog.title.modifyMakeTarget=Modify a Make target
+MakeTargetDialog.message.mustSpecifyName=Must specify a target name.
+MakeTargetDialog.message.targetWithNameExists=Target with that name already exits.
+MakeTargetDialog.message.mustSpecifyBuildCommand=Must specify a build command
+MakeTargetDialog.button.update=Update
+MakeTargetDialog.button.create=Create
+MakeTargetDialog.exception.makeTargetError=Make Target Error
+MakeTargetDialog.exception.errorAddingTarget=Error adding target
+
+SettingsBlock.title.selectLocationToBuildFrom=Selection Location to build from.
+SettingsBlock.label.missingBuilderInformation=Builder is missing or disabled on project.
+SettingsBlock.monitor.applyingSettings=Applying Settings...
+SettingsBlock.message.mustEnterBuildCommand=Must enter a build command
+
+DeleteTargetAction.label=Delete Make Target
+DeleteTargetAction.tooltip=Delete Make Target
+DeleteTargetAction.title.confirmDeletion=Confirm Target Deletion
+DeleteTargetAction.message.confirmDeleteion=Are you sure you want to delete  ''{0}''?
+DeleteTargetAction.title.confirmMultipleDeletion=Confirm Multiple Target Deletion
+DeleteTargetAction.message.confirmMultipleDeletion=Are you sure you want to delete these {0} targets?
+DeleteTargetAction.exception.removeError=Make Target Remove Error
+DeleteTargetAction.exception.errorDeletingBuildTarget=Error deleting Make target
+
+BuildTargetAction.label=Build Make Target
+BuildTargetAction.tooltip=Build Make Target
+
+EditTargetAction.label=Edit Make Target
+EditTargetAction.tooltip=Edit Make Target
+EditTargetAction.exception.internalError=Internal Error
+EditTargetAction.exception.errorEditingTarget=Error editing target.
+
+AddTargetAction.label=Add Make Target
+AddTargetAction.tooltip=Add Make Target
+AddTargetAction.exception.internalError=Internal Error
+AddTargetAction.=Internal Error
+
+FilterEmptyFolderAction.label=Hide Empty Folders
+FilterEmptyFolderAction.tooltip=Hide Empty Folders
+
+# Startup messages
+MakeUIPlugin.update_project=Update make projects
+MakeUIPlugin.update_project_message=Older \'make\' projects have been detected in your workspace. \n These projects are no longer supported, would you like to convert these now?
+
+# Prefernece Page
+MakePreferencePage.description=Specify the settings used as defaults by the New Standard Make Project creation wizard.
+MakeTargetPreferencePage.buildTargetInBackground.label=Build Make target in the background.
+
+#Property Page
+MakeProjectPropertyPage.closedproject=Project Closed
+MakeProjectPropertyPage.internalError=An Internal error has occur please check error log.
+
+#-------------- Makefile Editor messages
+ContentAssistProposal.label=Content Assist@Ctrl+SPACE
+ContentAssistProposal.tooltip=Content Assist
+ContentAssistProposal.image=
+ContentAssistProposal.description=Content Assist
+ 
+ContentAssistTip.label=Content Tip@Ctrl+SHIFT+SPACE
+ContentAssistTip.tooltip=Content Tip
+ContentAssistTip.image=
+ContentAssistTip.description=Content Tip
+ 
+TogglePresentation.label=Show Source of Selected Element Only
+TogglePresentation.tooltip=Show Source of Selected Element Only
+TogglePresentation.description=Enable/Disable Segmented Source Viewer
+ 
+Comment.label=&Comment
+Comment.tooltip=Comment the Selected Lines
+Comment.description=Turn the selected lines into # style comments
+
+Uncomment.label=Uncommen&t
+Uncomment.tooltip=Uncomment the Selected # comment Lines
+Uncomment.description=Uncomment the selected # comment lines
+
+OpenDeclarationAction.label=&Open Declaration@F3
+OpenDeclarationAction.description=Open an editor on the referenced element
+OpenDeclarationAction.tooltip=Open an editor on the referenced element
+
+# ------- LexicalSortingAction------------
+ 
+LexicalSortingAction.label=Sort
+LexicalSortingAction.description=Sorts the elements in the outliner
+LexicalSortingAction.tooltip=Sort
+LexicalSortingAction.tooltip.on=Do Not Sort
+LexicalSortingAction.tooltip.off=Sort
+
+# --- ManageIncludePathsDialog dialog ---
+ManageIncludePathsDialog.title=Manage include paths
+ManageIncludePathsDialog.userGroup.title=User specified include paths
+ManageIncludePathsDialog.discoveredGroup.title=Discovered include paths
+
+ManageScannerConfigDialogCommon.discoveredGroup.selected.label=Selected:
+ManageScannerConfigDialogCommon.discoveredGroup.removed.label=Removed:
+ManageScannerConfigDialogCommon.discoveredGroup.buttons.up.label=Up
+ManageScannerConfigDialogCommon.discoveredGroup.buttons.down.label=Down
+ManageScannerConfigDialogCommon.discoveredGroup.buttons.disable.label=Disable
+ManageScannerConfigDialogCommon.discoveredGroup.buttons.enable.label=Enable
+ManageScannerConfigDialogCommon.discoveredGroup.buttons.delete.label=Delete
+ManageScannerConfigDialogCommon.discoveredGroup.buttons.deleteAll.label=Delete all
+ManageScannerConfigDialogCommon.discoveredGroup.annotation.disabled=disabled
+
+# --- ManageDefinedSymbolsDialog dialog ---
+ManageDefinedSymbolsDialog.title=Manage defined symbols
+ManageDefinedSymbolsDialog.userGroup.title=User specified symbol definitions
+ManageDefinedSymbolsDialog.discoveredGroup.title=Discovered symbol definitions
+
+# --- ScannerConfigOptionsDialog ---
+ScannerConfigOptionsDialog.title=Discovery Options
+ScannerConfigOptionsDialog.description=Set the scanner configuration discovery options for this project
+ScannerConfigOptionsDialog.scGroup.label=Automated discovery of paths and symbols
+ScannerConfigOptionsDialog.scGroup.enabled.button=Automate discovery of paths and symbols
+ScannerConfigOptionsDialog.scGroup.problemReporting.enabled.button=Report path detection problems
+ScannerConfigOptionsDialog.scGroup.selectedProfile.combo=Discovery profile:
+ScannerConfigOptionsDialog.profile.group.label=Discovery profile options
+ScannerConfigOptionsDialog.boProvider.parser.enabled.button=Enable build output scanner info discovery
+ScannerConfigOptionsDialog.boProvider.open.label=Load build output from file
+ScannerConfigOptionsDialog.boProvider.browse.button=Browse...
+ScannerConfigOptionsDialog.boProvider.browse.openFileDialog=Build output file:
+ScannerConfigOptionsDialog.boProvider.load.button=Load
+ScannerConfigOptionsDialog.siProvider.parser.enabled.button=Enable generate scanner info command
+ScannerConfigOptionsDialog.siProvider.command.label=Compiler invocation command  
+ScannerConfigOptionsDialog.siProvider.browse.button=Browse...
+ScannerConfigOptionsDialog.siProvider.browse.runCommandDialog='gcc' command:
+ScannerConfigOptionsDialog.siProvider.command.errorMessage=Must enter compiler invocation command
+ScannerConfigOptionsDialog.apply.progressMessage=Setting scanner configuration discovery options...
+ScannerConfigOptionsDialog.common.variables.button=Variables...
+
+ScannerConfigOptionsDialog.unsavedchanges.title=Setting C/C++ Make Project Discovery Options 
+ScannerConfigOptionsDialog.unsavedchanges.message=The C/C++ Make Project Discovery Options property page contains unsaved modifications. Do you want to save changes so that other discovery related settings can be updated?
+ScannerConfigOptionsDialog.unsavedchanges.button.save=Apply
+ScannerConfigOptionsDialog.unsavedchanges.button.cancel=Cancel
+
+ScannerConfigOptionsDialog.error.title=Error Setting Project Discovery options
+ScannerConfigOptionsDialog.error.message=An error occurred while setting the project discovery options
+
+# --- DiscoveredScannerConfigurationContainerPage ---
+DiscoveredScannerConfigurationContainerPage.title=Edit container
+DiscoveredScannerConfigurationContainerPage.description=Manage discovered scanner configuration
+DiscoveredScannerConfigurationContainerPage.list.title=Discovered include paths and symbol definitions
+DiscoveredScannerConfigurationContainerPage.initialization.error.message=Error initializing Discovered paths container
+
+CopyDiscoveredPathAction.title=Copy
+CopyDiscoveredPathAction.description=Copy as text
+CopyDiscoveredPathAction.tooltip=Copy as text
+MultipleInputDialog.0=&Browse...
+MultipleInputDialog.1=Select a file:
+MultipleInputDialog.2=Varia&bles...
+
+OptionalMessageDialog_dontShowAgain= Do not show this &message again
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MessageLine.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MessageLine.java
new file mode 100644
index 0000000..f909063
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MessageLine.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.jface.resource.JFaceColors;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.widgets.Composite;
+
+
+/**
+ * A message line. It distinguishes between "normal" messages and errors. 
+ * Setting an error message hides a currently displayed message until 
+ * <code>clearErrorMessage</code> is called.
+ */
+public class MessageLine extends CLabel {
+
+	private String fMessage;
+
+	private Color fNormalMsgAreaBackground;
+
+	private boolean hasErrorMessage;
+
+	/**
+	 * Creates a new message line as a child of the given parent.
+	 */
+	public MessageLine(Composite parent) {
+		this(parent, SWT.LEFT);
+	}
+
+	/**
+	 * Creates a new message line as a child of the parent and with the given SWT stylebits.
+	 */
+	public MessageLine(Composite parent, int style) {
+		super(parent, style);
+		fNormalMsgAreaBackground= getBackground();
+	}
+
+	
+	/**
+     * Display the given error message. A currently displayed message
+     * is saved and will be redisplayed when the error message is cleared.
+     */
+	public void setErrorMessage(String message) {
+		if (message != null && message.length() > 0) {
+			hasErrorMessage = true;
+			setText(message);
+			setImage(MakeUIImages.getImage(MakeUIImages.IMG_OBJS_ERROR));
+			setBackground(JFaceColors.getErrorBackground(getDisplay()));
+			return;
+		}
+		hasErrorMessage = false;
+		setText(fMessage);	
+		setImage(null);
+		setBackground(fNormalMsgAreaBackground);	
+	}
+
+	public void setMessage(String message) {
+		fMessage = message;
+		setText(message);
+	}
+	
+	public boolean hasErrorMessage() {
+		return hasErrorMessage;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/OptionalMessageDialog.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/OptionalMessageDialog.java
new file mode 100644
index 0000000..a8e5781
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/OptionalMessageDialog.java
@@ -0,0 +1,144 @@
+/*******************************************************************************
+ *  Copyright (c) 2000, 2009 IBM Corporation and others.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ * 
+ *  Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     Anton Leherbauer (Wind River Systems)
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.cdt.ui.CUIPlugin;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * This is a <code>MessageDialog</code> which allows the user
+ * to choose that the dialog isn't shown again the next time.
+ */ 
+public class OptionalMessageDialog extends MessageDialog {
+	// String constants for widgets
+	private static final String CHECKBOX_TEXT= MakeUIMessages.getResourceString("OptionalMessageDialog_dontShowAgain"); // $NON-NLS-1$  
+
+	// Dialog store id constants
+	private static final String STORE_ID= "OptionalMessageDialog.hide."; //$NON-NLS-1$
+	private static final String KEY_DETAIL = ".detail"; //$NON-NLS-1$
+
+	public static final int NOT_SHOWN= IDialogConstants.CLIENT_ID + 1;
+	public static final int NO_DETAIL= -1;
+	
+	private Button fHideDialogCheckBox;
+	private String fId;
+
+	/**
+	 * Opens the dialog but only if the user hasn't choosen to hide it.
+	 * Returns <code>NOT_SHOWN</code> if the dialog was not shown.
+	 */
+	public static int open(String id, Shell parent, String title, Image titleImage, String message, int dialogType, String[] buttonLabels, int defaultButtonIndex) {
+		if (!isDialogEnabled(id))
+			return OptionalMessageDialog.NOT_SHOWN;
+		
+		MessageDialog dialog= new OptionalMessageDialog(id, parent, title, titleImage, message, dialogType, buttonLabels, defaultButtonIndex);
+		return dialog.open();
+	}
+
+	protected OptionalMessageDialog(String id, Shell parent, String title, Image titleImage, String message, int dialogType, String[] buttonLabels, int defaultButtonIndex) {
+		super(parent, title, titleImage, message, dialogType, buttonLabels, defaultButtonIndex);
+		fId= id;
+	}
+
+	@Override
+	protected Control createCustomArea(Composite parent) {
+		Composite composite= new Composite(parent, SWT.NONE);
+		GridLayout layout= new GridLayout();
+		layout.marginHeight= convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
+		layout.marginWidth= convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
+		layout.horizontalSpacing= convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
+		composite.setLayout(layout);
+		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+		
+		fHideDialogCheckBox= new Button(composite, SWT.CHECK | SWT.LEFT);
+		fHideDialogCheckBox.setText(CHECKBOX_TEXT);
+		fHideDialogCheckBox.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				setDialogEnabled(fId, !((Button)e.widget).getSelection());
+			}
+		});
+		applyDialogFont(fHideDialogCheckBox);
+		return fHideDialogCheckBox;
+	}
+	
+	//--------------- Configuration handling --------------
+	
+	/**
+	 * Returns this dialog
+	 * 
+	 * @return the settings to be used
+	 */
+	private static IDialogSettings getDialogSettings() {
+		IDialogSettings settings= CUIPlugin.getDefault().getDialogSettings();
+		settings= settings.getSection(STORE_ID);
+		if (settings == null)
+			settings= CUIPlugin.getDefault().getDialogSettings().addNewSection(STORE_ID);
+		return settings;
+	}
+		
+	/**
+	 * Answers whether the optional dialog is enabled and should be shown.
+	 */
+	public static boolean isDialogEnabled(String key) {
+		IDialogSettings settings= getDialogSettings();
+		return !settings.getBoolean(key);
+	}
+	
+	/**
+	 * Sets a detail for the dialog.
+	 */
+	public static void setDialogDetail(String key, int detail) {
+		IDialogSettings settings= getDialogSettings();
+		settings.put(key+KEY_DETAIL, detail);
+	}
+
+	/**
+	 * Returns the detail for this dialog, or NO_DETAIL, if none.
+	 */
+	public static int getDialogDetail(String key) {
+		IDialogSettings settings= getDialogSettings();
+		try {
+			return settings.getInt(key+KEY_DETAIL);
+		} catch (NumberFormatException e) {
+			return NO_DETAIL;
+		}
+	}
+	
+	/**
+	 * Sets whether the optional dialog is enabled and should be shown.
+	 */
+	public static void setDialogEnabled(String key, boolean isEnabled) {
+		IDialogSettings settings= getDialogSettings();
+		settings.put(key, !isEnabled);
+	}
+
+	/**
+	 * Clears all remembered information about hidden dialogs
+	 */
+	public static void clearAllRememberedStates() {
+		IDialogSettings settings= CUIPlugin.getDefault().getDialogSettings();
+		settings.addNewSection(STORE_ID);
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ResourceLookup.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ResourceLookup.java
new file mode 100644
index 0000000..0479466
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ResourceLookup.java
@@ -0,0 +1,159 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Wind River Systems, Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Markus Schorn - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.net.URI;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IPath;
+
+/**
+ * Allows for looking up resources by location or name.
+ */
+public class ResourceLookup {
+	private static ResourceLookupTree lookupTree= new ResourceLookupTree();
+
+	public static void startup() {
+		lookupTree.startup();
+	}
+	
+	public static void shutdown() {
+		lookupTree.shutdown();
+	}
+	
+	/**
+	 * Searches for files with the given location suffix. 
+	 * 
+	 * At this point the method works for sources and headers (no other content types), only. 
+	 * This is done to use less memory and can be changed if necessary. 
+	 * For linked resource files, the name of the link target is relevant.
+	 * 
+	 * @param locationSuffix the suffix to match, always used as relative path.
+	 * @param projects the projects to search
+	 * @param ignoreCase whether or not to ignore case when comparing the suffix.
+	 */
+	public static IFile[] findFilesByName(IPath locationSuffix, IProject[] projects, boolean ignoreCase) {
+		return lookupTree.findFilesByName(locationSuffix, projects, ignoreCase);
+	}
+	
+	/**
+	 * Uses a lookup-tree that finds resources for locations using the canonical representation
+	 * of the path. 
+	 */
+	public static IFile[] findFilesForLocationURI(URI location) {
+		return lookupTree.findFilesForLocationURI(location);
+	}
+
+	/**
+	 * Uses a lookup-tree that finds resources for locations using the canonical representation
+	 * of the path. The method does not work for files where the name (last segment) of the 
+	 * resources differs from the name of the location.
+	 */
+	public static IFile[] findFilesForLocation(IPath location) {
+		return lookupTree.findFilesForLocation(location);
+	}
+
+	/**
+	 * Uses {@link #findFilesForLocationURI(URI)} and selects the most relevant file
+	 * from the result. Files form the first project, from cdt-projects and those on source
+	 * roots are preferred, see {@link FileRelevance}. 
+	 * @param location an URI for the location of the files to search for.
+	 * @param preferredProject a project to be preferred over others, or <code>null</code>.
+	 * @return a file for the location in one of the given projects, or <code>null</code>.
+	 * 			NB the returned IFile may not exist
+	 */
+	public static IFile selectFileForLocationURI(URI location, IProject preferredProject) {
+		return selectFile(findFilesForLocationURI(location), preferredProject);
+	}
+
+	/**
+	 * Uses {@link #findFilesForLocation(IPath)} and selects the most relevant file
+	 * from the result. Files form the preferred project, from cdt-projects and those on source
+	 * roots are preferred, see {@link FileRelevance}. 
+	 * @param location a path for the location of the files to search for.
+	 * @param preferredProject a project to be preferred over others, or <code>null</code>.
+	 * @return a file for the location or <code>null</code>.
+	 * 			NB the returned IFile may not exist
+	 */
+	public static IFile selectFileForLocation(IPath location, IProject preferredProject) {
+		return selectFile(findFilesForLocation(location), preferredProject);
+	}
+
+	private static IFile selectFile(IFile[] files, IProject preferredProject) {
+		if (files.length == 0)
+			return null;
+
+		if (files.length == 1)
+			return files[0];
+
+		IFile best= null;
+		int bestRelevance= -1;
+
+		for (int i = 0; i < files.length; i++) {
+			IFile file = files[i];
+			int relevance= FileRelevance.getRelevance(file, preferredProject);
+			if (best == null || relevance > bestRelevance ||
+					(relevance == bestRelevance && 
+							best.getFullPath().toString().compareTo(file.getFullPath().toString()) > 0)) {
+				bestRelevance= relevance;
+				best= file;
+			}
+		}
+		return best;
+	}
+
+	/**
+	 * Sorts files by relevance for CDT, by the criteria listed below. The most relevant files
+	 * is listed first.
+	 * <br> Accessible files
+	 * <br> Files of preferred project
+	 * <br> Files of CDT projects
+	 * <br> Files on a source root of a CDT project
+	 */
+	public static void sortFilesByRelevance(IFile[] filesToSort, final IProject preferredProject) {
+		Collections.sort(Arrays.asList(filesToSort), new Comparator<IFile>() {
+			public int compare(IFile f1, IFile f2) {
+				int r1= FileRelevance.getRelevance(f1, preferredProject);
+				int r2= FileRelevance.getRelevance(f2, preferredProject);
+				
+				if (r1 > r2)
+					return -1;
+				if (r1 < r2)
+					return 1;
+				
+				return f1.getFullPath().toString().compareTo(f2.getFullPath().toString());
+			}
+		});
+	}
+
+	/** 
+	 * For testing, only.
+	 */
+	public static void dump() {
+		lookupTree.dump();
+	}
+	/** 
+	 * For testing, only.
+	 */
+	public static void unrefNodeMap() {
+		lookupTree.unrefNodeMap();
+	}
+	/** 
+	 * For testing, only.
+	 */
+	public static void simulateNodeMapCollection() {
+		lookupTree.simulateNodeMapCollection();
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ResourceLookupTree.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ResourceLookupTree.java
new file mode 100644
index 0000000..5644f98
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ResourceLookupTree.java
@@ -0,0 +1,861 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Wind River Systems, Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Markus Schorn - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.lang.ref.SoftReference;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.CProjectNature;
+import org.eclipse.cdt.core.model.CoreModel;
+import org.eclipse.cdt.core.parser.util.CharArrayUtils;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.IResourceProxy;
+import org.eclipse.core.resources.IResourceProxyVisitor;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.core.runtime.content.IContentTypeManager;
+import org.eclipse.core.runtime.jobs.Job;
+
+/**
+ * Allows for looking up resources by location or name. When using this class 100 bytes per resource
+ * are needed. Therefore the support is limited to header-files int non-cdt projects and all files 
+ * except non-cdt-files in CDT projects.
+ *
+ * The information for a project is initialized when first requested and then it is kept up to date
+ * using a resource change listener. No memory is used, as long as the class is not used.
+ * When information is not used for more than 10 minutes, the data-structures will be held via a weak
+ * reference, only and are subject to garbage collection.
+ * 
+ * The node map stores a map from hash-code of file-names to nodes.
+ * A node contains the name of a file plus a link to the parent resource. From that we can compute
+ * the resource path and obtain further information via the resource.
+ */
+class ResourceLookupTree implements IResourceChangeListener, IResourceDeltaVisitor, IResourceProxyVisitor {
+	private static final int UNREF_DELAY = 10 * 60000; // 10 min
+	
+	private static final boolean VISIT_CHILDREN = true;
+	private static final boolean SKIP_CHILDREN = false;
+	private static final IFile[] NO_FILES = new IFile[0];
+	private static final int TRIGGER_RECALC= 
+		IResourceDelta.TYPE | IResourceDelta.REPLACED | 
+		IResourceDelta.LOCAL_CHANGED | IResourceDelta.OPEN;
+	
+	private static class Extensions {
+		private final boolean fInvert;
+		private final Set<String> fExtensions;
+		Extensions(Set<String> extensions, boolean invert) {
+			fInvert= invert;
+			fExtensions= extensions;
+		}
+		boolean isRelevant(String filename) {
+			// accept all files without extension
+			final int idx= filename.lastIndexOf('.');
+			if (idx < 0)
+				return true;
+			
+			return fExtensions.contains(filename.substring(idx+1).toUpperCase()) != fInvert;
+		}
+	}
+	
+	private static class Node {
+		final Node fParent;
+		final char[] fResourceName;
+		final boolean fHasFileLocationName;
+		final boolean fIsFileLinkTarget;
+		
+		boolean fDeleted;
+		boolean fHasChildren;
+		int fCanonicHash;
+		
+		Node(Node parent, char[] name, boolean hasFileLocationName, boolean isFileLinkTarget) {
+			fParent= parent;
+			fResourceName= name;
+			fHasFileLocationName= hasFileLocationName;
+			fIsFileLinkTarget= isFileLinkTarget;
+			if (parent != null)
+				parent.fHasChildren= true;
+		}
+	}
+	
+	private final Object fLock= new Object();
+	private final Job fUnrefJob;
+	private SoftReference<Map<Integer, Object>> fNodeMapRef;
+	private Map<Integer, Object> fNodeMap;
+	private final Map<String, Extensions> fFileExtensions;
+	private Extensions fCDTProjectExtensions;
+	private Extensions fDefaultExtensions;
+	private Extensions fCurrentExtensions;
+	private Node fRootNode;
+	private boolean fNeedCleanup;
+	private Node fLastFolderNode;
+	
+	public ResourceLookupTree() {
+		fRootNode= new Node(null, CharArrayUtils.EMPTY, false, false) {};
+		fFileExtensions= new HashMap<String, Extensions>();
+		fUnrefJob= new Job("Timer") { //$NON-NLS-1$
+			@Override
+			protected IStatus run(IProgressMonitor monitor) {
+				unrefNodeMap();
+				return Status.OK_STATUS;
+			}
+		};
+		fUnrefJob.setSystem(true);
+	}
+
+	public void startup() {
+		final IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		workspace.addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
+	}
+
+	public void shutdown() {
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
+		synchronized (fLock) {
+			fNodeMap= null;
+			fNodeMapRef= null;
+			fFileExtensions.clear();
+		}
+	}
+
+	/**
+	 * Handle resource change notifications.
+	 */
+	public void resourceChanged(IResourceChangeEvent event) {
+		IResourceDelta delta= event.getDelta();
+		synchronized (fLock) {
+			if (fNodeMapRef == null)
+				return;
+			boolean unsetMap= false;
+			if (fNodeMap == null) {
+				fNodeMap= fNodeMapRef.get();
+				if (fNodeMap == null)
+					return;
+				unsetMap= true;
+			}
+			try {
+				delta.accept(this);
+			} catch (CoreException e) {
+				CCorePlugin.log(e);
+			} finally {
+				if (fNeedCleanup)
+					cleanup();
+				fCurrentExtensions= null;
+				fNeedCleanup= false;
+				if (unsetMap)
+					fNodeMap= null;
+			}
+		}
+	}
+	
+	/**
+	 * Handles resource change notifications by visiting the delta.
+	 */
+	public boolean visit(IResourceDelta delta) throws CoreException {
+		assert Thread.holdsLock(fLock);
+		
+		final IResource res= delta.getResource();
+		if (res instanceof IWorkspaceRoot)
+			return VISIT_CHILDREN;
+		
+		if (res instanceof IProject) {
+			// project not yet handled
+			final String name = res.getName();
+			final Extensions exts= fFileExtensions.get(name);
+			if (exts == null)
+				return SKIP_CHILDREN;
+			
+			switch (delta.getKind()) {
+			case IResourceDelta.ADDED:	// new projects should not yet be part of the tree
+			case IResourceDelta.REMOVED:
+				fFileExtensions.remove(name);
+				remove(res);
+				return SKIP_CHILDREN;
+				
+			case IResourceDelta.CHANGED:
+				if ((delta.getFlags() & (TRIGGER_RECALC | IResourceDelta.DESCRIPTION)) != 0) {
+					fFileExtensions.remove(name);
+					remove(res);
+					return SKIP_CHILDREN;
+				}
+				break;
+			}
+			fCurrentExtensions= exts;
+			return VISIT_CHILDREN;
+		}
+				
+		// file or folder
+		switch (delta.getKind()) {
+		case IResourceDelta.ADDED:
+			add(res);
+			return SKIP_CHILDREN;
+			
+		case IResourceDelta.CHANGED:
+			if ((delta.getFlags() & TRIGGER_RECALC) != 0) {
+				remove(res);
+				add(res);
+				return SKIP_CHILDREN;
+			}
+			return VISIT_CHILDREN;
+			
+		case IResourceDelta.REMOVED:
+			
+			remove(res);
+			return SKIP_CHILDREN;
+		}
+		return VISIT_CHILDREN;
+	}
+
+
+	/**
+	 * Add a resource to the tree.
+	 */
+	private void add(IResource res) {
+		assert Thread.holdsLock(fLock);
+		
+		if (res instanceof IFile) {
+			final String resName = res.getName();
+			String linkedName= null;
+			if (res.isLinked()) {
+				URI uri= res.getLocationURI();
+				if (uri != null) {
+					linkedName= LocationAdapter.URI.extractName(uri);
+					if (linkedName.length() > 0 && fCurrentExtensions.isRelevant(linkedName)) {
+						if (linkedName.equals(resName)) {
+							createFileNode(res.getFullPath(), null);
+						} else {
+							createFileNode(res.getFullPath(), linkedName);
+						}
+					}			
+				}
+			} else if (fCurrentExtensions.isRelevant(resName)) {
+				createFileNode(res.getFullPath(), null);
+			}
+		} else {
+			try {
+				res.accept(this, 0);
+			} catch (CoreException e) {
+				CCorePlugin.log(e);
+			}
+		}
+	}
+	
+	/**
+	 * Add a resource tree by using a resource proxy visitor.
+	 */
+	public boolean visit(IResourceProxy proxy) throws CoreException {
+		if (proxy.getType() == IResource.FILE) {
+			if (fCurrentExtensions.isRelevant(proxy.getName())) {
+				if (proxy.isLinked()) {
+					IResource res= proxy.requestResource();
+					if (res instanceof IFile) { 
+						add(res);
+					}
+					return true;
+				}
+				createFileNode(proxy.requestFullPath(), null);
+			}
+		}
+		return true;
+	}
+
+	
+	public void unrefNodeMap() {
+		synchronized (fLock) {
+			fNodeMap= null;
+		}
+	}
+
+	public void simulateNodeMapCollection() {
+		synchronized (fLock) {
+			fNodeMap= null;
+			fNodeMapRef= new SoftReference<Map<Integer, Object>>(null);
+		}
+	}
+
+	/**
+	 * Initializes nodes for the given projects. Also creates the node map if it was collected.
+	 */
+	private void initializeProjects(IProject[] projects) {
+		assert Thread.holdsLock(fLock);
+		
+		if (fNodeMap == null) {
+			if (fNodeMapRef != null) {
+				fNodeMap= fNodeMapRef.get();
+			}
+
+			if (fNodeMap == null) {
+				fFileExtensions.clear();
+				fNodeMap= new HashMap<Integer, Object>();
+				fNodeMapRef= new SoftReference<Map<Integer, Object>>(fNodeMap);
+			}
+		}
+		fUnrefJob.cancel();
+		fUnrefJob.schedule(UNREF_DELAY); 
+
+		for (IProject project : projects) {
+			if (project.isOpen() && !fFileExtensions.containsKey(project.getName())) {
+				Extensions ext= fDefaultExtensions;
+				try {
+					if (project.hasNature(CProjectNature.C_NATURE_ID)) {
+						ext= fCDTProjectExtensions;
+					}
+				} catch (CoreException e) {
+					CCorePlugin.log(e);
+					// treat as non-cdt project
+				}
+				fCurrentExtensions= ext;
+				add(project);
+				fFileExtensions.put(project.getName(), ext);
+				fCurrentExtensions= null;
+			}
+		}
+	}
+
+	/**
+	 * Initializes file-extensions and node map
+	 */
+	private void initFileExtensions() {
+		
+		if (fDefaultExtensions == null) {
+			HashSet<String> cdtContentTypes= new HashSet<String>();
+			String[] registeredContentTypes= CoreModel.getRegistedContentTypeIds();
+			cdtContentTypes.addAll(Arrays.asList(registeredContentTypes));
+
+			final IContentTypeManager ctm= Platform.getContentTypeManager();
+			final IContentType[] ctts= ctm.getAllContentTypes();
+			Set<String> result= new HashSet<String>();
+			outer: for (IContentType ctt : ctts) {
+				IContentType basedOn= ctt;
+				while (basedOn != null) {
+					if (cdtContentTypes.contains(basedOn.getId())) 
+						continue outer;
+					basedOn= basedOn.getBaseType();
+				}
+				// this is a non-cdt content type
+				addFileSpecs(ctt, result);
+			}
+			fCDTProjectExtensions= new Extensions(result, true);
+
+			result= new HashSet<String>();
+			for (IContentType ctt : ctts) {
+				IContentType basedOn= ctt;
+				while (basedOn != null) {
+					if (cdtContentTypes.contains(basedOn.getId())) {
+						addFileSpecs(ctt, result);
+						break;
+					}
+					basedOn= basedOn.getBaseType();
+				}
+			}
+			fDefaultExtensions= new Extensions(result, false);
+		}
+	}
+
+	private void addFileSpecs(IContentType ctt, Set<String> result) {
+		String[] fspecs= ctt.getFileSpecs(IContentType.FILE_EXTENSION_SPEC);
+		for (String fspec : fspecs) {
+			result.add(fspec.toUpperCase());
+		}
+	}
+
+	/**
+	 * Inserts a node for the given path.
+	 */
+	private void createFileNode(IPath fullPath, String fileLink) {
+		final String[] segments= fullPath.segments();
+		final boolean isFileLinkTarget= fileLink != null;
+		final char[][] charArraySegments = toCharArrayArray(segments, fileLink);
+		createNode(charArraySegments, charArraySegments.length, true, isFileLinkTarget);
+	}
+
+	private char[][] toCharArrayArray(String[] segments, String fileLink) {
+		final int segmentLen = segments.length;
+		char[][] chsegs;
+		if (fileLink != null) {
+			chsegs= new char[segmentLen+1][];
+			chsegs[segmentLen]= fileLink.toCharArray();
+		} else {
+			chsegs= new char[segmentLen][];
+		}
+		for (int i = 0; i < segmentLen; i++) {
+			chsegs[i]= segments[i].toCharArray();
+		}
+		return chsegs;
+	}
+
+	/**
+	 * Inserts a node for the given path.
+	 */
+	private Node createNode(char[][] segments, int segmentCount, boolean hasFileLocationName, boolean isFileLinkTarget) {
+		assert Thread.holdsLock(fLock);
+		
+		if (segmentCount == 0)
+			return fRootNode;
+
+		if (!hasFileLocationName && fLastFolderNode != null) {
+			if (isNodeForSegments(fLastFolderNode, segments, segmentCount, isFileLinkTarget))
+				return fLastFolderNode;
+		}
+		
+		final char[] name= segments[segmentCount-1];
+		final int hash= hashCode(name);
+		
+		// search for existing node
+		Object obj= fNodeMap.get(hash);
+
+		Node[] nodes= null;
+		int len= 0;
+		if (obj != null) {
+			if (obj instanceof Node) {
+				Node node= (Node) obj;
+				if (isNodeForSegments(node, segments, segmentCount, isFileLinkTarget)) {
+					if (!hasFileLocationName)
+						fLastFolderNode= node;
+					return node;
+				}
+				nodes= new Node[]{node, null};
+				fNodeMap.put(hash, nodes);
+				len= 1;
+			} else {
+				nodes= (Node[]) obj;
+				for (len=0; len < nodes.length; len++) {
+					Node node = nodes[len];
+					if (node == null) 
+						break;
+					if (isNodeForSegments(node, segments, segmentCount, isFileLinkTarget)) {
+						if (!hasFileLocationName)
+							fLastFolderNode= node;
+						return node;
+					}
+				}
+			}
+		}		
+		final Node parent= createNode(segments, segmentCount-1, false, false);
+		Node node= new Node(parent, name, hasFileLocationName, isFileLinkTarget);
+		if (nodes == null) {
+			fNodeMap.put(hash, node);
+		} else { 
+			if (len == nodes.length) {
+				Node[] newNodes= new Node[len+2];
+				System.arraycopy(nodes, 0, newNodes, 0, len);
+				nodes= newNodes;
+				fNodeMap.put(hash, nodes);
+			}
+			nodes[len]= node;
+		}
+		
+		if (!hasFileLocationName)
+			fLastFolderNode= node;
+		return node;
+	}
+
+	/**
+	 * Checks whether the given node matches the given segments.
+	 */
+	private boolean isNodeForSegments(Node node, char[][] segments, int segmentLength, boolean isFileLinkTarget) {
+		assert Thread.holdsLock(fLock);
+		
+		if (node.fIsFileLinkTarget != isFileLinkTarget)
+			return false;
+		
+		while(segmentLength > 0 && node != null) {
+			if (!CharArrayUtils.equals(segments[--segmentLength], node.fResourceName))
+				return false;
+			node= node.fParent;
+		}
+		return node == fRootNode;
+	}
+	
+	/**
+	 * Remove a resource from the tree
+	 */
+	private void remove(IResource res) {
+		assert Thread.holdsLock(fLock);
+		
+		final char[] name= res.getName().toCharArray();
+		final int hash= hashCode(name);
+		
+		Object obj= fNodeMap.get(hash);
+		if (obj == null)
+			return;
+		
+		final IPath fullPath= res.getFullPath();
+		final int segmentCount= fullPath.segmentCount();
+		if (segmentCount == 0)
+			return;
+		
+		final char[][]segments= toCharArrayArray(fullPath.segments(), null);
+		if (obj instanceof Node) {
+			final Node node= (Node) obj;
+			if (!node.fDeleted && isNodeForSegments(node, segments, segmentCount, false)) {
+				node.fDeleted= true;
+				if (node.fHasChildren)
+					fNeedCleanup= true;
+				fNodeMap.remove(hash);
+			}
+		} else {
+			final Node[] nodes= (Node[]) obj;
+			for (int i= 0; i < nodes.length; i++) {
+				Node node = nodes[i];
+				if (node == null)
+					return;
+				if (!node.fDeleted && isNodeForSegments(node, segments, segmentCount, false)) {
+					remove(nodes, i);
+
+					if (nodes[0] == null) 
+						fNodeMap.remove(hash);
+
+					node.fDeleted= true;
+					if (node.fHasChildren)
+						fNeedCleanup= true;
+
+					return;
+				}
+			}
+		}
+	}
+
+	private void remove(Node[] nodes, int i) {
+    	int idx= lastValid(nodes, i);
+    	if (idx > 0) { 
+    		nodes[i]= nodes[idx];
+    		nodes[idx]= null;
+    	}
+	}
+
+	private int lastValid(Node[] nodes, int left) {
+		int right= nodes.length-1;
+    	while (left < right) {
+    		int mid= (left+right+1)/2;  // ==> mid > left
+    		if (nodes[mid] == null) 
+    			right= mid-1;
+    		else 
+    			left= mid;
+    	}
+		return right;
+	}
+
+	private void cleanup() {
+		assert Thread.holdsLock(fLock);
+		fLastFolderNode= null;
+		
+		for (Iterator<Object> iterator = fNodeMap.values().iterator(); iterator.hasNext();) {
+			Object obj= iterator.next();
+			if (obj instanceof Node) {
+				if (isDeleted((Node) obj)) {
+					iterator.remove();
+				}
+			} else {
+				Node[] nodes= (Node[]) obj;
+				int j= 0;
+				for (int i = 0; i < nodes.length; i++) {
+					final Node node = nodes[i];
+					if (node == null) {
+						if (j==0) {
+							iterator.remove();
+						} 
+						break;
+					}
+					if (!isDeleted(node)) {
+						if (i != j) {
+							nodes[j]= node;
+							nodes[i]= null;
+						}
+						j++;
+					} else {
+						nodes[i]= null;
+					}
+				}
+			}
+		}
+	}
+	
+	private boolean isDeleted(Node node) {
+		while(node != null) {
+			if (node.fDeleted)
+				return true;
+			node= node.fParent;
+		}
+		return false;
+	}
+
+	/**
+	 * Computes a case insensitive hash-code for file names.
+	 */
+	private int hashCode(char[] name) {
+		int h= 0;
+		final int len = name.length;
+		for (int i = 0; i < len; i++) {
+			h = 31*h + Character.toUpperCase(name[i]);
+		}
+		return h;
+	}
+
+	/**
+	 * Searches for all files with the given location. In case the name of the location is
+	 * a cdt-content type the lookup tree is consulted, otherwise as a fallback the platform's
+	 * method is called.
+	 */
+	public IFile[] findFilesForLocationURI(URI location) {
+		return findFilesForLocation(location, LocationAdapter.URI);
+	}
+
+	/**
+	 * Searches for all files with the given location. In case the name of the location is
+	 * a cdt-content type the lookup tree is consulted, otherwise as a fallback the platform's
+	 * method is called.
+	 */
+	public IFile[] findFilesForLocation(IPath location) {
+		return findFilesForLocation(location, LocationAdapter.PATH);
+	}
+
+	/**
+	 * Searches for all files with the given location. In case the name of the location is
+	 * a cdt-content type the lookup tree is consulted, otherwise as a fallback the platform's
+	 * method is called.
+	 */
+	public <T> IFile[] findFilesForLocation(T location, LocationAdapter<T> adapter) {
+		initFileExtensions();
+		String name= adapter.extractName(location);
+		Node[] candidates= null;
+		synchronized (fLock) {
+			initializeProjects(ResourcesPlugin.getWorkspace().getRoot().getProjects());
+			Object obj= fNodeMap.get(hashCode(name.toCharArray()));
+			if (obj != null) {
+				candidates= convert(obj);
+				IFile[] result= extractMatchesForLocation(candidates, location, adapter);
+				if (result.length > 0)
+					return result;
+			}
+		}	
+		
+		// fall back to platform functionality
+		return adapter.platformsFindFilesForLocation(location);
+	}
+
+	private Node[] convert(Object obj) {
+		if (obj instanceof Node)
+			return new Node[] {(Node) obj};
+
+		final Node[] nodes= (Node[]) obj;
+		final int len= lastValid(nodes, -1)+1;
+		final Node[] result= new Node[len];
+		System.arraycopy(nodes, 0, result, 0, len);
+		return result;
+	}
+
+	/**
+	 * Returns an array of files for the given name. Search is limited to the supplied projects.
+	 */
+	public IFile[] findFilesByName(IPath relativeLocation, IProject[] projects, boolean ignoreCase) {
+		final int segCount= relativeLocation.segmentCount();
+		if (segCount < 1)
+			return NO_FILES;
+		
+		final String name= relativeLocation.lastSegment();
+		Node[] candidates;
+
+		initFileExtensions();
+		synchronized (fLock) {
+			initializeProjects(projects);
+			Object obj= fNodeMap.get(hashCode(name.toCharArray()));
+			if (obj == null) {
+				return NO_FILES;
+			}
+			candidates= convert(obj);
+		}	
+		String suffix= relativeLocation.toString();
+		while(suffix.startsWith("../")) { //$NON-NLS-1$
+			suffix= suffix.substring(3);
+		}
+		Set<String> prjset= new HashSet<String>();
+		for (IProject prj : projects) {
+			prjset.add(prj.getName());
+		}
+		return extractMatchesForName(candidates, name, suffix, ignoreCase, prjset);
+	}
+	
+	/**
+	 * Selects the actual matches for the list of candidate nodes.
+	 */
+	private IFile[] extractMatchesForName(Node[] candidates, String name, String suffix, boolean ignoreCase, Set<String> prjSet) {
+		final char[] n1= name.toCharArray();
+		final int namelen = n1.length;
+		int resultIdx= 0;
+		
+		if (ignoreCase) {
+			for (int j = 0; j < namelen; j++) {
+				n1[j]= Character.toUpperCase(n1[j]);
+			}
+		}
+		final int suffixLen= suffix.length();
+		final IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();
+		IFile[] result= null;
+		outer: for (int i = 0; i < candidates.length; i++) {
+			final Node node = candidates[i];
+			if (node.fHasFileLocationName && checkProject(node, prjSet)) {
+				final char[] n2= node.fResourceName;
+				if (namelen == n2.length) {
+					for (int j = 0; j < n2.length; j++) {
+						final char c= ignoreCase ? Character.toUpperCase(n2[j]) : n2[j];
+						if (c != n1[j]) 
+							continue outer;
+					}
+					final IFile file= root.getFile(createPath(node));
+					final URI loc= file.getLocationURI();
+					if (loc != null) {
+						String path= loc.getPath();
+						final int len= path.length();
+						if (len >= suffixLen && 
+								suffix.regionMatches(ignoreCase, 0, path, len-suffixLen, suffixLen)) {
+							if (result == null) 
+								result= new IFile[candidates.length-i];
+							result[resultIdx++]= root.getFile(createPath(node));
+						} 
+					}
+				}
+			}
+		}
+		if (result==null)
+			return NO_FILES;
+		
+		if (resultIdx < result.length) {
+			IFile[] copy= new IFile[resultIdx];
+			System.arraycopy(result, 0, copy, 0, resultIdx);
+			return copy;
+		}
+		return result;
+	}
+
+	private boolean checkProject(Node node, Set<String> prjSet) {
+		while(true) {
+			final Node n= node.fParent;
+			if (n == fRootNode)
+				break;
+			if (n == null)
+				return false;
+			node= n;
+		}
+		return prjSet.contains(new String(node.fResourceName));
+	}
+
+	private IPath createPath(Node node) {
+		if (node == fRootNode)
+			return Path.ROOT;
+
+		if (node.fIsFileLinkTarget)
+			return createPath(node.fParent);
+
+		return createPath(node.fParent).append(new String(node.fResourceName));
+	}
+	
+	/**
+	 * Selects the actual matches from the list of candidates
+	 */
+	private <T> IFile[] extractMatchesForLocation(Node[] candidates, T location, LocationAdapter<T> adapter) {
+		final IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();
+		final String searchPath= adapter.getCanonicalPath(location);
+		IFile[] result= null;
+		int resultIdx= 0;
+		for (int i = 0; i < candidates.length; i++) {
+			final Node node = candidates[i];
+			if (node.fHasFileLocationName) {
+				final IFile file= root.getFile(createPath(node));
+				final T loc= adapter.getLocation(file);
+				if (loc != null) {
+					if (!loc.equals(location)) {
+						if (searchPath == null) 
+							continue;
+						
+						if (node.fCanonicHash != 0 && node.fCanonicHash != searchPath.hashCode())
+							continue;
+						
+						final String candPath= adapter.getCanonicalPath(loc);
+						if (candPath == null)
+							continue;
+						
+						node.fCanonicHash= candPath.hashCode();
+						if (!candPath.equals(searchPath))
+							continue;
+					}
+					if (result == null) 
+						result= new IFile[candidates.length-i];
+					result[resultIdx++]= root.getFile(createPath(node));
+				}
+			}
+		}
+		if (result==null)
+			return NO_FILES;
+		
+		if (resultIdx < result.length) {
+			IFile[] copy= new IFile[resultIdx];
+			System.arraycopy(result, 0, copy, 0, resultIdx);
+			return copy;
+		}
+		return result;
+	}
+
+	@SuppressWarnings("nls")
+	public void dump() {
+		List<String> lines= new ArrayList<String>();
+		synchronized (fLock) {
+			for (Iterator<Object> iterator = fNodeMap.values().iterator(); iterator.hasNext();) {
+				Node[] nodes= convert(iterator.next());	
+				for (int i = 0; i < nodes.length; i++) {
+					final Node node = nodes[i];
+					if (node == null) {
+						break;
+					}
+					lines.add(toString(node));
+				}
+			}
+		}
+		Collections.sort(lines);
+		System.out.println("Dumping files:");
+		for (Iterator<String> iterator = lines.iterator(); iterator.hasNext();) {
+			String line = iterator.next();
+			System.out.println(line);
+		}
+		System.out.flush();
+	}
+
+	@SuppressWarnings("nls")
+	private String toString(Node node) {
+		if (node == fRootNode)
+			return "";
+		
+		return toString(node.fParent) + "/" + new String(node.fResourceName);
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SingleCharReader.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SingleCharReader.java
new file mode 100644
index 0000000..1d48fcc
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SingleCharReader.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2000 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.io.IOException;
+import java.io.Reader;
+
+
+public abstract class SingleCharReader extends Reader {
+	
+	/**
+	 * @see Reader#read(char)
+	 */
+	public abstract int read() throws IOException;
+
+
+	/**
+	 * @see Reader#read(char[],int,int)
+	 */
+	public int read(char cbuf[], int off, int len) throws IOException {
+		int end= off + len;
+		for (int i= off; i < end; i++) {
+			int ch= read();
+			if (ch == -1) {
+				if (i == off) {
+					return -1;
+				}
+				return i - off;
+			}
+			cbuf[i]= (char)ch;
+		}
+		return len;
+	}		
+	
+	/**
+	 * @see Reader#ready()
+	 */		
+    public boolean ready() throws IOException {
+		return true;
+	}
+	
+	/**
+	 * Gets the content as a String
+	 */
+	public String getString() throws IOException {
+		StringBuffer buf= new StringBuffer();
+		int ch;
+		while ((ch= read()) != -1) {
+			buf.append((char)ch);
+		}
+		return buf.toString();
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SubstitutionTextReader.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SubstitutionTextReader.java
new file mode 100644
index 0000000..16d8400
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SubstitutionTextReader.java
@@ -0,0 +1,138 @@
+/*******************************************************************************
+ * Copyright (c) 2000 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+
+import java.io.IOException;
+import java.io.Reader;
+
+
+/**
+ * Reads the text contents from a reader and computes for each character
+ * a potential substitution. The substitution may eat more characters than 
+ * only the one passed into the computation routine.
+ */
+public abstract class SubstitutionTextReader extends SingleCharReader {
+	
+	protected static final String LINE_DELIM= System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
+	
+	private Reader fReader;
+	private boolean fWasWhiteSpace;
+	private int fCharAfterWhiteSpace;
+	
+	private boolean fReadFromBuffer;
+	private StringBuffer fBuffer;
+	private int fIndex;
+
+
+	protected SubstitutionTextReader(Reader reader) {
+		fReader= reader;
+		fBuffer= new StringBuffer();
+		fIndex= 0;
+		fReadFromBuffer= false;
+		fCharAfterWhiteSpace= -1;
+		fWasWhiteSpace= true;
+	}
+	
+	/**
+	 * Implement to compute the substitution for the given character and 
+	 * if necessary subsequent characters. Use <code>nextChar</code>
+	 * to read subsequent characters.
+	 */
+	protected abstract String computeSubstitution(int c) throws IOException;
+	
+	/**
+	 * Returns the internal reader.
+	 */
+	protected Reader getReader() {
+		return fReader;
+	}
+	 
+	/**
+	 * Returns the next character.
+	 */
+	protected int nextChar() throws IOException {
+		fReadFromBuffer= (fBuffer.length() > 0);
+		if (fReadFromBuffer) {
+			char ch= fBuffer.charAt(fIndex++);
+			if (fIndex >= fBuffer.length()) {
+				fBuffer.setLength(0);
+				fIndex= 0;
+			}
+			return ch;
+		}
+		int ch= fCharAfterWhiteSpace;
+		if (ch == -1) {
+			ch= fReader.read();
+		}
+		if (Character.isWhitespace((char)ch)) {
+			do {
+				ch= fReader.read();
+			} while (Character.isWhitespace((char)ch));
+			if (ch != -1) {
+				fCharAfterWhiteSpace= ch;
+				return ' ';
+			}
+		} else {
+			fCharAfterWhiteSpace= -1;
+		}
+		return ch;
+	}
+	
+	/**
+	 * @see Reader#read()
+	 */
+	public int read() throws IOException {
+		int c;
+		do {
+			
+			c= nextChar();
+			while (!fReadFromBuffer) {
+				String s= computeSubstitution(c);
+				if (s == null)
+					break;
+				if (s.length() > 0)
+					fBuffer.insert(0, s);
+				c= nextChar();
+			}
+			
+		} while (fWasWhiteSpace && (c == ' '));
+				
+		fWasWhiteSpace= (c == ' ' || c == '\r' || c == '\n');
+		return c;
+	}
+		
+	/**
+	 * @see Reader#ready()
+	 */		
+    public boolean ready() throws IOException {
+		return fReader.ready();
+	}
+		
+	/**
+	 * @see Reader#close()
+	 */		
+	public void close() throws IOException {
+		fReader.close();
+	}
+	
+	/**
+	 * @see Reader#reset()
+	 */		
+	public void reset() throws IOException {
+		fReader.reset();
+		fWasWhiteSpace= true;
+		fCharAfterWhiteSpace= -1;
+		fBuffer.setLength(0);
+		fIndex= 0;		
+	}
+}
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AbstractAutotoolsHandler.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AbstractAutotoolsHandler.java
new file mode 100644
index 0000000..f912af4
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AbstractAutotoolsHandler.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import java.util.Collection;
+
+import org.eclipse.cdt.core.model.ICContainer;
+import org.eclipse.cdt.core.model.ICElement;
+import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IResource;
+
+public abstract class AbstractAutotoolsHandler extends AbstractHandler {
+	
+	@SuppressWarnings("unchecked")
+	protected IContainer getContainer(IEvaluationContext e) {
+		IContainer fContainer = null;
+
+		Object obj = e.getDefaultVariable();
+		if (obj instanceof Collection) {
+			Collection<Object> c = (Collection<Object>)obj;
+			Object[] objArray = c.toArray();
+			if (objArray.length > 0)
+				obj = objArray[0];
+		}
+		if (obj instanceof ICElement) {
+			if ( obj instanceof ICContainer || obj instanceof ICProject) {
+				fContainer = (IContainer) ((ICElement) obj).getUnderlyingResource();
+			} else {
+				obj = ((ICElement)obj).getResource();
+				if ( obj != null) {
+					fContainer = ((IResource)obj).getParent();
+				}
+			}
+		} else if (obj instanceof IResource) {
+			if (obj instanceof IContainer) {
+				fContainer = (IContainer) obj;
+			} else {
+				fContainer = ((IResource)obj).getParent();
+			}
+		} else {
+			fContainer = null;
+		}
+		return fContainer;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AbstractTargetAction.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AbstractTargetAction.java
new file mode 100644
index 0000000..738faf0
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AbstractTargetAction.java
@@ -0,0 +1,92 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2004 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.cdt.core.model.ICContainer;
+import org.eclipse.cdt.core.model.ICElement;
+import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IObjectActionDelegate;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.eclipse.ui.actions.ActionDelegate;
+
+
+public abstract class AbstractTargetAction
+	extends ActionDelegate
+	implements IObjectActionDelegate, IWorkbenchWindowActionDelegate {
+	private IWorkbenchPart fPart;
+	private IWorkbenchWindow fWindow;
+	private IContainer fContainer;
+
+	protected Shell getShell() {
+		if (fPart != null) {
+			return fPart.getSite().getShell();
+		} else if (fWindow != null) {
+			return fWindow.getShell();
+		}
+		return AutotoolsPlugin.getActiveWorkbenchShell();
+	}
+
+	protected IContainer getSelectedContainer() {
+		return fContainer;
+	}
+
+	public void setSelectedContainer(IContainer container) {
+		fContainer = container;
+	}
+	
+	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
+		fPart = targetPart;
+	}
+
+	public void init(IWorkbenchWindow window) {
+		fWindow = window;
+	}
+
+	public void selectionChanged(IAction action, ISelection selection) {
+		boolean enabled = false;
+		if (selection instanceof IStructuredSelection) {
+			IStructuredSelection sel = (IStructuredSelection) selection;
+			Object obj = sel.getFirstElement();
+			if (obj instanceof ICElement) {
+				if ( obj instanceof ICContainer || obj instanceof ICProject) {
+					fContainer = (IContainer) ((ICElement) obj).getUnderlyingResource();
+				} else {
+					obj = ((ICElement)obj).getResource();
+					if ( obj != null) {
+						fContainer = ((IResource)obj).getParent();
+					}
+				}
+			} else if (obj instanceof IResource) {
+				if (obj instanceof IContainer) {
+					fContainer = (IContainer) obj;
+				} else {
+					fContainer = ((IResource)obj).getParent();
+				}
+			} else {
+				fContainer = null;
+			}
+			if (fContainer != null && AutotoolsPlugin.hasTargetBuilder(fContainer.getProject())) {
+				enabled = true;
+			}
+		}
+		action.setEnabled(enabled);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AclocalHandler.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AclocalHandler.java
new file mode 100644
index 0000000..e09ea26
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AclocalHandler.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+/**
+ * @author Jeff Johnston
+ *
+ */
+public class AclocalHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		InvokeAclocalAction a = new InvokeAclocalAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutoconfHandler.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutoconfHandler.java
new file mode 100644
index 0000000..7991a51
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutoconfHandler.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+public class AutoconfHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		InvokeAutoconfAction a = new InvokeAutoconfAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutoheaderHandler.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutoheaderHandler.java
new file mode 100644
index 0000000..473e71b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutoheaderHandler.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+/**
+ * @author Jeff Johnston
+ *
+ */
+public class AutoheaderHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		InvokeAutoheaderAction a = new InvokeAutoheaderAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutomakeHandler.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutomakeHandler.java
new file mode 100644
index 0000000..23b8050
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutomakeHandler.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+public class AutomakeHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		InvokeAutomakeAction a = new InvokeAutomakeAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutoreconfHandler.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutoreconfHandler.java
new file mode 100644
index 0000000..ae1923f
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/AutoreconfHandler.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+/**
+ * @author Jeff Johnston
+ *
+ */
+public class AutoreconfHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		InvokeAutoreconfAction a = new InvokeAutoreconfAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAclocalAction.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAclocalAction.java
new file mode 100644
index 0000000..1d03b33
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAclocalAction.java
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+import org.eclipse.swt.widgets.Shell;
+
+
+public class InvokeAclocalAction extends InvokeAction {
+
+	private static final String DEFAULT_OPTION = ""; //$NON-NLS-1$
+	private static final String DEFAULT_COMMAND = "aclocal"; //$NON-NLS-1$
+
+	public void run(IAction action) {
+
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+		
+		IPath execDir = getExecDir(container);
+		String cwd = InvokeMessages.getString("CWD") + getCWD(container); //$NON-NLS-1$
+
+		TwoInputDialog optionDialog = new TwoInputDialog(
+				new Shell(),
+				cwd,
+				InvokeMessages
+						.getString("InvokeAclocalAction.windowTitle.options"), //$NON-NLS-1$
+				InvokeMessages
+						.getString("InvokeAclocalAction.message.options.otherOptions"), //$NON-NLS-1$
+				InvokeMessages
+						.getString("InvokeAclocalAction.message.options.includeDir"), DEFAULT_OPTION, null); //$NON-NLS-1$
+
+		optionDialog.open();
+
+		// chop args into string array
+		String rawArgList = optionDialog.getValue();
+
+		String[] optionsList = separateOptions(rawArgList);
+
+		// chop args into string array
+		rawArgList = optionDialog.getSecondValue();
+
+		String[] targetList = separateTargets(rawArgList);
+
+		if (targetList == null) {
+
+			showError(InvokeMessages
+					.getString("InvokeAction.execute.windowTitle.error"), //$NON-NLS-1$
+					InvokeMessages
+							.getString("InvokeAction.windowTitle.quoteError")); //$NON-NLS-1$
+			return;
+		}
+
+		int iOption = 0;
+		if (targetList.length > 0)
+			iOption = 1;
+
+		String[] argumentList = new String[targetList.length
+				+ optionsList.length + iOption];
+
+		System.arraycopy(optionsList, 0, argumentList, 0, optionsList.length);
+
+		if (iOption == 1)
+			argumentList[optionsList.length] = "-I"; //$NON-NLS-1$
+
+		System.arraycopy(targetList, 0, argumentList, optionsList.length
+				+ iOption, targetList.length);
+
+		if (container != null) {
+			String aclocalCommand = null;
+			IProject project = getSelectedContainer().getProject();
+			try {
+				aclocalCommand = project.getPersistentProperty(AutotoolsPropertyConstants.ACLOCAL_TOOL);
+			} catch (CoreException e) {
+				// do nothing
+			}
+			
+			// If unset, use default system path
+			if (aclocalCommand == null)
+				aclocalCommand = DEFAULT_COMMAND;
+			
+			executeConsoleCommand(DEFAULT_COMMAND, aclocalCommand,
+					argumentList, execDir);
+		}
+	}
+
+	public void dispose() {
+
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAction.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAction.java
new file mode 100644
index 0000000..600eef7
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAction.java
@@ -0,0 +1,442 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007, 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.StringTokenizer;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.CommandLauncher;
+import org.eclipse.cdt.core.ConsoleOutputStream;
+import org.eclipse.cdt.core.envvar.IEnvironmentVariable;
+import org.eclipse.cdt.core.resources.IConsole;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.core.runtime.jobs.ISchedulingRule;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsNewMakeGenerator;
+import org.eclipse.swt.widgets.Shell;
+
+public abstract class InvokeAction extends AbstractTargetAction {
+
+	protected void showInformation(String title, String content) {
+
+		MessageDialog.openInformation(new Shell(), title, content);
+	}
+
+	protected void showError(String title, String content) {
+
+		MessageDialog.openError(new Shell(), title, content);
+	}
+
+	protected void showSuccess(String title) {
+		MessageDialog.openInformation(new Shell(), title, 
+				InvokeMessages.getString("InvokeAction.success")); //$NON-NLS-1$
+	}
+	
+	protected String showInput(String title, String content, String defaultTxt) {
+		InputDialog getOptionDialog = new InputDialog(new Shell(), title,
+				content, defaultTxt, null);
+
+		getOptionDialog.open();
+
+		return getOptionDialog.getValue();
+	}
+
+	/**
+	 * Separate targets to array from a string.
+	 * 
+	 * @param rawArgList
+	 * @return targets in string[] array. if targets are not formatted properly,
+	 *         returns null
+	 */
+	protected String[] separateTargets(String rawArgList) {
+
+		StringTokenizer st = new StringTokenizer(rawArgList, " "); //$NON-NLS-1$
+		ArrayList<String> targetList = new ArrayList<String>();
+
+		while (st.hasMoreTokens()) {
+			String currentWord = st.nextToken().trim();
+
+			if (currentWord.startsWith("'")) { //$NON-NLS-1$
+				String tmpTarget = ""; //$NON-NLS-1$
+				while (!currentWord.endsWith("'")) { //$NON-NLS-1$
+					tmpTarget += currentWord + " "; //$NON-NLS-1$
+					if (!st.hasMoreTokens()) {
+						// quote not closed properly, so return null
+						return null;
+					}
+					currentWord = st.nextToken().trim();
+				}
+
+				tmpTarget += currentWord;
+				targetList.add(tmpTarget);
+				continue;
+			}
+
+			if (currentWord.startsWith("\"")) { //$NON-NLS-1$
+				String tmpTarget = ""; //$NON-NLS-1$
+				while (!currentWord.endsWith("\"")) { //$NON-NLS-1$
+					tmpTarget += currentWord + " "; //$NON-NLS-1$
+					if (!st.hasMoreTokens()) {
+						// double quote not closed properly, so return null
+						return null;
+					}
+					currentWord = st.nextToken().trim();
+				}
+
+				tmpTarget += currentWord;
+				targetList.add(tmpTarget);
+				continue;
+			}
+
+			// for targets without quote/double quotes.
+			targetList.add(currentWord);
+
+		}
+
+		return (String[])targetList.toArray(new String[targetList.size()]);
+	}
+
+	protected String[] separateOptions(String rawArgList) {
+		ArrayList<String> argList = new ArrayList<String>();
+		// May be multiple user-specified options in which case we
+		// need to split them up into individual options
+		rawArgList = rawArgList.trim();
+		boolean finished = false;
+		int lastIndex = rawArgList.indexOf("--"); //$NON-NLS-1$
+		if (lastIndex != -1) {
+			while (!finished) {
+				int index = rawArgList.indexOf("--", lastIndex + 2); //$NON-NLS-1$
+				if (index != -1) {
+					String previous = rawArgList.substring(lastIndex, index)
+							.trim();
+					argList.add(previous);
+					rawArgList = rawArgList.substring(index);
+				} else {
+					argList.add(rawArgList);
+					finished = true;
+				}
+			}
+		}
+
+		return (String[])argList.toArray(new String[argList.size()]);
+
+	}
+
+	protected String[] simpleParseOptions(String rawArgList) {
+		ArrayList<String> argList = new ArrayList<String>();
+		int lastArgIndex = -1;
+		int i = 0;
+		while (i < rawArgList.length()) {
+			char ch = rawArgList.charAt(i);
+			// Skip white-space
+			while (Character.isWhitespace(ch)) {
+				++i;
+				if (i < rawArgList.length())
+					ch = rawArgList.charAt(i);
+				else // Otherwise we are done
+					return argList.toArray(new String[argList.size()]);
+			}
+
+			// Simplistic parser.  We break up into strings delimited
+			// by blanks.  If quotes are used, we ignore blanks within.
+			// If a backslash is used, we ignore the next character and
+			// pass it through.
+			lastArgIndex = i;
+			boolean inString = false;
+			while (i < rawArgList.length()) {
+				ch = rawArgList.charAt(i);
+				if (ch == '\\') // escape character
+					++i; // skip over the next character
+				else if (ch == '\"') { // double quotes
+					inString = !inString;
+				} else if (Character.isWhitespace(ch)) {
+					if (!inString) {
+						argList.add(rawArgList.substring(lastArgIndex, i));
+						break;
+					}
+				}
+				++i;
+			}
+			// Look for the case where we ran out of chars for the last
+			// token.
+			if (i >= rawArgList.length())
+				argList.add(rawArgList.substring(lastArgIndex));
+			++i;
+		}
+		return argList.toArray(new String[argList.size()]);
+	}
+
+	protected IPath getExecDir(IContainer container) {
+		int type = container.getType();
+		IPath execDir = null;
+		if (type == IContainer.FILE) {
+			execDir = container.getLocation().removeLastSegments(1);
+		} else {
+			execDir = container.getLocation();
+		}
+		return execDir;
+	}
+	
+	protected IPath getCWD(IContainer container) {
+		int type = container.getType();
+		IPath cwd = null;
+		if (type == IContainer.FILE) {
+			cwd = container.getFullPath().removeLastSegments(1);
+		} else {
+			cwd = container.getFullPath();
+		}
+		return cwd;
+	}
+	
+	private class ExecuteProgressDialog implements IRunnableWithProgress {
+		private IPath command;
+		private String[] argumentList;
+		private String[] envList;
+		private IPath execDir;
+		private int status;
+		private HashMap<String, String> outputs = null;
+		
+		public ExecuteProgressDialog(IPath command, String[] argumentList,
+				String[] envList, IPath execDir) {
+			this.command = command;
+			this.argumentList = argumentList;
+			this.envList = envList;
+			this.execDir = execDir;
+		}
+
+		public void run(IProgressMonitor monitor)
+		throws InvocationTargetException, InterruptedException {
+			ByteArrayOutputStream stdout = new ByteArrayOutputStream();
+			ByteArrayOutputStream stderr = new ByteArrayOutputStream();
+			CommandLauncher cmdL = new CommandLauncher();
+			outputs = null;
+
+			// invoke command
+			try {
+				monitor.beginTask(
+						InvokeMessages.getFormattedString("InvokeAction.progress.message", // $NON-NLS-1$
+								new String[]{command.toOSString()}), IProgressMonitor.UNKNOWN);
+				monitor.worked(1);
+				Process process = cmdL.execute(command, argumentList, envList,
+						execDir, new NullProgressMonitor());
+
+				if (cmdL.waitAndRead(stdout, stderr) == CommandLauncher.OK) {
+					try {
+						status = 0;
+						monitor.done();
+						process.getOutputStream().close();
+					} catch (IOException e) {
+						// ignore
+					}
+				} else {
+					// failed to execute command
+					status = -1;
+					monitor.done();
+					return;
+				}
+			} catch (CoreException e) {
+				monitor.done();
+				throw new InvocationTargetException(e);
+			}
+
+			outputs = new HashMap<String, String>();
+
+			outputs.put("stdout", stdout.toString()); //$NON-NLS-1$
+			outputs.put("stderr", stderr.toString()); //$NON-NLS-1$
+
+			try {
+				stdout.close();
+				stderr.close();
+			} catch (IOException e) {
+				// ignore
+			}
+		}
+			
+		public HashMap<String, String> getOutputs() {
+			return outputs;
+		}
+		
+		public int getStatus() {
+			return status;
+		}
+	}
+	
+	
+	protected HashMap<String, String> executeCommand(IPath command,
+			String[] argumentList, String[] envList, IPath execDir) {
+		try {
+			ExecuteProgressDialog d = new ExecuteProgressDialog(command,
+					argumentList, envList, execDir);
+			new ProgressMonitorDialog(new Shell()).run(false, false, d);
+			if (d.getStatus() == -1)
+				showError(InvokeMessages
+					.getString("InvokeAction.execute.windowTitle.error"), InvokeMessages //$NON-NLS-1$
+					.getString("InvokeAction.execute.message") //$NON-NLS-1$
+					+ command.toOSString()); //$NON-NLS-1$
+			return d.getOutputs();
+		} catch (InvocationTargetException e) {
+			showError(InvokeMessages
+					.getString("InvokeAction.execute.windowTitle.error"), InvokeMessages //$NON-NLS-1$
+					.getString("InvokeAction.execute.message") //$NON-NLS-1$
+					+ command.toOSString()); //$NON-NLS-1$
+			AutotoolsUIPlugin.logException(e);
+			return null;
+		} catch (InterruptedException e) {
+		    return null;
+		}
+	}
+
+	protected void executeConsoleCommand(final String actionName, final String command,
+			final String[] argumentList, final IPath execDir) {
+		// We need to use a workspace root scheduling rule because adding MakeTargets
+		// may end up saving the project description which runs under a workspace root rule.
+		final ISchedulingRule rule = ResourcesPlugin.getWorkspace().getRoot();
+
+		Job backgroundJob = new Job(actionName) {
+			/* (non-Javadoc)
+			 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
+			 */
+			protected IStatus run(IProgressMonitor monitor) {
+				try {
+					ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
+
+						public void run(IProgressMonitor monitor) throws CoreException {
+							try {
+								String errMsg = null;
+								IProject project = getSelectedContainer().getProject();
+								// Get a build console for the project
+								IConsole console = CCorePlugin.getDefault().getConsole("org.eclipse.linuxtools.cdt.autotools.ui.autotoolsConsole"); //$NON-NLS-1$
+								console.start(project);
+								ConsoleOutputStream consoleOutStream = console.getOutputStream();
+								// FIXME: we want to remove need for ManagedBuilderManager, but how do we
+								// get environment variables.
+								IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+								IConfiguration cfg = info.getDefaultConfiguration();
+
+								StringBuffer buf = new StringBuffer();
+								String[] consoleHeader = new String[3];
+
+								consoleHeader[0] = actionName;
+								consoleHeader[1] = cfg.getName();
+								consoleHeader[2] = project.getName();
+								buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+								String invokeMsg = InvokeMessages.getFormattedString("InvokeAction.console.message", //$NON-NLS-1$
+										new String[]{actionName, execDir.toString()}); //$NON-NLS-1$
+								buf.append(invokeMsg);
+								buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+								buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+								consoleOutStream.write(buf.toString().getBytes());
+								consoleOutStream.flush();
+								
+								ArrayList<String> additionalEnvs = new ArrayList<String>();
+								String strippedCommand = AutotoolsNewMakeGenerator.stripEnvVars(command, additionalEnvs);
+								// Get a launcher for the config command
+								CommandLauncher launcher = new CommandLauncher();
+								// Set the environment
+								IEnvironmentVariable variables[] = ManagedBuildManager
+										.getEnvironmentVariableProvider().getVariables(cfg, true);
+								String[] env = null;
+								ArrayList<String> envList = new ArrayList<String>();
+								if (variables != null) {
+									for (int i = 0; i < variables.length; i++) {
+										envList.add(variables[i].getName()
+												+ "=" + variables[i].getValue()); //$NON-NLS-1$
+									}
+									if (additionalEnvs.size() > 0)
+										envList.addAll(additionalEnvs); // add any additional environment variables specified ahead of script
+									env = (String[]) envList.toArray(new String[envList.size()]);
+								}
+								OutputStream stdout = consoleOutStream;
+								OutputStream stderr = consoleOutStream;
+
+								launcher.showCommand(true);
+								// Run the shell script via shell command.
+								Process proc = launcher.execute(new Path(strippedCommand), argumentList, env,
+										execDir, new NullProgressMonitor());
+								if (proc != null) {
+									try {
+										// Close the input of the process since we will never write to
+										// it
+										proc.getOutputStream().close();
+									} catch (IOException e) {
+									}
+
+									if (launcher.waitAndRead(stdout, stderr, new SubProgressMonitor(
+											monitor, IProgressMonitor.UNKNOWN)) != CommandLauncher.OK) {
+										errMsg = launcher.getErrorMessage();
+									}
+
+									// Force a resync of the projects without allowing the user to
+									// cancel.
+									// This is probably unkind, but short of this there is no way to
+									// ensure
+									// the UI is up-to-date with the build results
+									// monitor.subTask(ManagedMakeMessages
+									// .getResourceString(REFRESH));
+									monitor.subTask(AutotoolsUIPlugin.getResourceString("MakeGenerator.refresh")); //$NON-NLS-1$
+									try {
+										project.refreshLocal(IResource.DEPTH_INFINITE, null);
+									} catch (CoreException e) {
+										monitor.subTask(AutotoolsUIPlugin
+												.getResourceString("MakeGenerator.refresh.error")); //$NON-NLS-1$
+									}
+								} else {
+									errMsg = launcher.getErrorMessage();
+								}
+								
+								if (errMsg != null)
+									AutotoolsUIPlugin.logErrorMessage(errMsg);
+								
+							} catch (IOException e) {
+								AutotoolsUIPlugin.log(e);
+							}
+						}
+					}, rule, IWorkspace.AVOID_UPDATE, monitor);
+				} catch (CoreException e) {
+					return e.getStatus();
+				}
+				IStatus returnStatus = Status.OK_STATUS;
+				return returnStatus;
+			}
+		};
+
+		backgroundJob.setRule(rule);
+		backgroundJob.schedule();
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutoconfAction.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutoconfAction.java
new file mode 100644
index 0000000..81e323c
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutoconfAction.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+
+
+/**
+ * Class responsible for invoking autoconf.
+ * 
+ * @author klee
+ * 
+ */
+public class InvokeAutoconfAction extends InvokeAction {
+
+	private final static String DEFAULT_COMMAND = "autoconf"; //$NON-NLS-1$
+	public void run(IAction action) {
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+		
+		IPath execDir = getExecDir(container);
+
+		if (container != null) {
+			IProject project = container.getProject();
+			String autoconfCommand = null;
+			try {
+				autoconfCommand = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_TOOL);
+			} catch (CoreException e) {
+				// do nothing
+			}
+			
+			// If unset for the project, default to system path
+			if (autoconfCommand == null)
+				autoconfCommand = DEFAULT_COMMAND;
+			
+			executeConsoleCommand(DEFAULT_COMMAND, autoconfCommand, new String[]{}, execDir);
+		}
+	}
+
+
+	public void dispose() {
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutoheaderAction.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutoheaderAction.java
new file mode 100644
index 0000000..8c4e577
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutoheaderAction.java
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+import org.eclipse.swt.widgets.Shell;
+
+
+public class InvokeAutoheaderAction extends InvokeAction {
+
+	private static final String DEFAULT_OPTION = ""; //$NON-NLS-1$
+	private static final String DEFAULT_COMMAND = "autoheader"; //$NON-NLS-1$
+
+	public void run(IAction action) {
+
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+		
+		IPath execDir = getExecDir(container);
+		String cwd = InvokeMessages.getString("CWD") + getCWD(container); //$NON-NLS-1$
+
+		InputDialog optionDialog = new SingleInputDialog(
+				new Shell(),
+				cwd,
+				InvokeMessages
+						.getString("InvokeAutoheaderAction.windowTitle.options"), //$NON-NLS-1$
+				InvokeMessages
+						.getString("InvokeAutoheaderAction.message.options.otherOptions"), //$NON-NLS-1$
+				DEFAULT_OPTION, null);
+		optionDialog.open();
+
+		// chop args into string array
+		String rawArgList = optionDialog.getValue();
+
+		String[] optionsList = simpleParseOptions(rawArgList);
+
+		String[] argumentList = new String[optionsList.length];
+
+		System.arraycopy(optionsList, 0, argumentList, 0, optionsList.length);
+
+		if (container != null) {
+			String autoheaderCommand = null;
+			IProject project = getSelectedContainer().getProject();
+			try {
+				autoheaderCommand = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOHEADER_TOOL);
+			} catch (CoreException e) {
+				// do nothing
+			}
+			
+			// If unset, use default system path
+			if (autoheaderCommand == null)
+				autoheaderCommand = DEFAULT_COMMAND;
+			
+			executeConsoleCommand(DEFAULT_COMMAND, autoheaderCommand,
+					argumentList, execDir);
+		}
+
+	}
+
+	public void dispose() {
+
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutomakeAction.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutomakeAction.java
new file mode 100644
index 0000000..8210cd9
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutomakeAction.java
@@ -0,0 +1,98 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+import org.eclipse.swt.widgets.Shell;
+
+
+/**
+ * Class responsible for invoking automake.
+ * 
+ * @author klee
+ * 
+ */
+public class InvokeAutomakeAction extends InvokeAction {
+
+	private static final String DEFAULT_OPTION = ""; //$NON-NLS-1$
+	private static final String DEFAULT_COMMAND = "automake"; //$NON-NLS-1$
+
+	public void run(IAction action) {
+
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+		
+		IPath execDir = getExecDir(container);
+		String cwd = InvokeMessages.getString("CWD") + getCWD(container); //$NON-NLS-1$
+;
+		TwoInputDialog optionDialog = new TwoInputDialog(new Shell(), cwd,
+		InvokeMessages
+		.getString("InvokeAutomakeAction.windowTitle.options"), //$NON-NLS-1$
+InvokeMessages
+		.getString("InvokeAutomakeAction.message.options.otherOptions"),InvokeMessages //$NON-NLS-1$
+		.getString("InvokeAutomakeAction.message.options.makeTargets"), DEFAULT_OPTION, null); //$NON-NLS-1$
+		
+		optionDialog.open();
+		
+		// chop args into string array
+		String rawArgList = optionDialog.getValue();
+
+		String[] optionsList = separateOptions(rawArgList);
+
+
+		// chop args into string array
+		rawArgList = optionDialog.getSecondValue();
+
+		String[] targetList = separateTargets(rawArgList);
+		
+		if (targetList == null) {
+
+			showError(InvokeMessages.getString("InvokeAction.execute.windowTitle.error"), //$NON-NLS-1$
+					InvokeMessages.getString("InvokeAction.windowTitle.quoteError")); //$NON-NLS-1$
+			return;
+		}
+
+		String[] argumentList = new String[targetList.length
+				+ optionsList.length];
+
+		System.arraycopy(optionsList, 0, argumentList, 0, optionsList.length);
+		System.arraycopy(targetList, 0, argumentList, optionsList.length,
+				targetList.length);
+
+		if (container != null) {
+			IProject project = container.getProject();
+			String automakeCommand = null;
+			try {
+				automakeCommand = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_TOOL);
+			} catch (CoreException e) {
+				// do nothing
+			}
+			
+			// If automake path not set for the project, default to system path
+			if (automakeCommand == null)
+				automakeCommand = DEFAULT_COMMAND;
+
+			executeConsoleCommand(DEFAULT_COMMAND, automakeCommand,
+					argumentList, execDir);
+		}
+	}
+
+	public void dispose() {
+
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutoreconfAction.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutoreconfAction.java
new file mode 100644
index 0000000..ade71d9
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeAutoreconfAction.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+import org.eclipse.swt.widgets.Shell;
+
+
+public class InvokeAutoreconfAction extends InvokeAction {
+
+	private static final String DEFAULT_OPTION = ""; //$NON-NLS-1$
+	private static final String DEFAULT_COMMAND = "autoreconf"; //$NON-NLS-1$
+
+	public void run(IAction action) {
+
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+		
+		IPath execDir = getExecDir(container);
+		String cwd = InvokeMessages.getString("CWD") + getCWD(container); //$NON-NLS-1$
+
+		InputDialog optionDialog = new SingleInputDialog(
+				new Shell(),
+				cwd,
+				InvokeMessages
+						.getString("InvokeAutoreconfAction.windowTitle.options"), //$NON-NLS-1$
+				InvokeMessages
+						.getString("InvokeAutoreconfAction.message.options.otherOptions"), //$NON-NLS-1$
+				DEFAULT_OPTION, null);
+		optionDialog.open();
+
+		// chop args into string array
+		String rawArgList = optionDialog.getValue();
+
+		String[] optionsList = simpleParseOptions(rawArgList);
+
+		String[] argumentList = new String[optionsList.length];
+
+		System.arraycopy(optionsList, 0, argumentList, 0, optionsList.length);
+
+		if (container != null) {
+			String autoreconfCommand = null;
+			IProject project = getSelectedContainer().getProject();
+			try {
+				autoreconfCommand = project.getPersistentProperty(AutotoolsPropertyConstants.AUTORECONF_TOOL);
+			} catch (CoreException e) {
+				// do nothing
+			}
+			
+			// If unset, use default system path
+			if (autoreconfCommand == null)
+				autoreconfCommand = DEFAULT_COMMAND;
+			
+			executeConsoleCommand(DEFAULT_COMMAND, autoreconfCommand,
+					argumentList, execDir);
+		}
+	}
+
+	public void dispose() {
+
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeLibtoolizeAction.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeLibtoolizeAction.java
new file mode 100644
index 0000000..02ec65d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeLibtoolizeAction.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+import org.eclipse.swt.widgets.Shell;
+
+
+public class InvokeLibtoolizeAction extends InvokeAction {
+
+	private static final String DEFAULT_OPTION = ""; //$NON-NLS-1$
+	private static final String DEFAULT_COMMAND = "libtoolize"; //$NON-NLS-1$
+
+	public void run(IAction action) {
+
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+		
+		IPath execDir = getExecDir(container);
+		String cwd = InvokeMessages.getString("CWD") + getCWD(container); //$NON-NLS-1$
+
+		InputDialog optionDialog = new SingleInputDialog(
+				new Shell(),
+				cwd,
+				InvokeMessages
+						.getString("InvokeLibtoolizeAction.windowTitle.options"), //$NON-NLS-1$
+				InvokeMessages
+						.getString("InvokeLibtoolizeAction.message.options.otherOptions"), //$NON-NLS-1$
+				DEFAULT_OPTION, null);
+		optionDialog.open();
+
+		// chop args into string array
+		String rawArgList = optionDialog.getValue();
+
+		String[] optionsList = simpleParseOptions(rawArgList);
+
+		String[] argumentList = new String[optionsList.length];
+
+		System.arraycopy(optionsList, 0, argumentList, 0, optionsList.length);
+
+		if (container != null) {
+			String libtoolizeCommand = null;
+			IProject project = getSelectedContainer().getProject();
+			try {
+				libtoolizeCommand = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOHEADER_TOOL);
+			} catch (CoreException e) {
+				// do nothing
+			}
+			
+			// If unset, use default system path
+			if (libtoolizeCommand == null)
+				libtoolizeCommand = DEFAULT_COMMAND;
+			
+			executeConsoleCommand(DEFAULT_COMMAND, libtoolizeCommand,
+					argumentList, execDir);
+		}
+	}
+
+	public void dispose() {
+
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeMessages.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeMessages.java
new file mode 100644
index 0000000..5a3710c
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeMessages.java
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007, 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class InvokeMessages {
+	private static final String BUNDLE_NAME = InvokeMessages.class.getName();
+
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
+			.getBundle(BUNDLE_NAME);
+
+	private InvokeMessages() {
+	}
+
+	/**
+	 * Returns the string from the resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @return the resource bundle message
+	 */
+	public static String getString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+	
+	/**
+	 * Returns the formatted string from the resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @param args an array of substituition strings
+	 * @return the resource bundle message
+	 */
+	public static String getFormattedString(String key, String[] args) {
+		return MessageFormat.format(getString(key), (Object[])args);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeMessages.properties b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeMessages.properties
new file mode 100644
index 0000000..b2da117
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/InvokeMessages.properties
@@ -0,0 +1,56 @@
+#################################################################################
+#  Copyright (c) 2006, 2007, 2009 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+# 
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+CWD=Working Directory:
+
+InvokeAction.windowTitle.quoteError=Quote/Double quote not correct
+InvokeAction.progress.message=Running {0}
+InvokeAction.execute.windowTitle.error=Invoke Action Error
+InvokeAction.execute.message=Couldn't execute command :
+InvokeAction.success=Command executed successfully
+InvokeAction.console.message=Invoking {0} in {1}
+
+
+InvokeAutoconfAction.command=Running autoconf in {0} 
+InvokeAutoconfAction.windowTitle.stdout=Invoke Autoconf - Output
+InvokeAutoconfAction.windowTitle.stderr=Invoke Autoconf - Error
+
+
+InvokeAutomakeAction.command=Running automake
+InvokeAutomakeAction.windowTitle.options=Automake Options
+InvokeAutomakeAction.message.options.makeTargets=Enter targets separated by space :
+InvokeAutomakeAction.message.options.otherOptions=Enter options separated by space :
+InvokeAutomakeAction.windowTitle.stdout=Invoke Automake - Output
+InvokeAutomakeAction.windowTitle.stderr=Invoke Automake - Error
+
+InvokeAutoheaderAction.command=Running autoheader
+InvokeAutoheaderAction.windowTitle.options=Autoheader Options
+InvokeAutoheaderAction.message.options.otherOptions=Enter options separated by space :
+InvokeAutoheaderAction.windowTitle.stdout=Invoke Autoheader - Output
+InvokeAutoheaderAction.windowTitle.stderr=Invoke Autoheader - Error
+
+InvokeAutoreconfAction.command=Running autoreconf
+InvokeAutoreconfAction.windowTitle.options=Autoreconf Options
+InvokeAutoreconfAction.message.options.otherOptions=Enter options separated by space :
+InvokeAutoreconfAction.windowTitle.stdout=Invoke Autoreconf - Output
+InvokeAutoreconfAction.windowTitle.stderr=Invoke Autoreconf - Error
+
+InvokeAclocalAction.command=Running aclocal
+InvokeAclocalAction.windowTitle.options=Aclocal Options
+InvokeAclocalAction.message.options.includeDir=Add directory to search list for .m4 files :
+InvokeAclocalAction.message.options.otherOptions=Enter options separated by space :
+InvokeAclocalAction.windowTitle.stdout=Invoke Automake - Output
+InvokeAclocalAction.windowTitle.stderr=Invoke Automake - Error
+
+InvokeLibtoolizeAction.command=Running libtoolize
+InvokeLibtoolizeAction.windowTitle.options=Libtoolize Options
+InvokeLibtoolizeAction.message.options.otherOptions=Enter options separated by space :
+InvokeLibtoolizeAction.windowTitle.stdout=Invoke Libtoolize - Output
+InvokeLibtoolizeAction.windowTitle.stderr=Invoke Libtoolize - Error
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/LibtoolizeHandler.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/LibtoolizeHandler.java
new file mode 100644
index 0000000..c2d6faf
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/LibtoolizeHandler.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+/**
+ * @author Jeff Johnston
+ *
+ */
+public class LibtoolizeHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		InvokeLibtoolizeAction a = new InvokeLibtoolizeAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/ReconfigureAction.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/ReconfigureAction.java
new file mode 100644
index 0000000..6ab2eb7
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/ReconfigureAction.java
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.ISchedulingRule;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsNewMakeGenerator;
+
+
+public class ReconfigureAction extends InvokeAction {
+
+	public void run(IAction action) {
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+
+		// We need to use a workspace root scheduling rule because adding MakeTargets
+		// may end up saving the project description which runs under a workspace root rule.
+		final ISchedulingRule rule = ResourcesPlugin.getWorkspace().getRoot();
+		
+		Job backgroundJob = new Job("Reconfigure Action"){  //$NON-NLS-1$
+			/* (non-Javadoc)
+			 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
+			 */
+			protected IStatus run(IProgressMonitor monitor) {
+				try {
+					ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
+
+						public void run(IProgressMonitor monitor) throws CoreException {
+							IProject project = getSelectedContainer().getProject();
+							AutotoolsNewMakeGenerator m = new AutotoolsNewMakeGenerator();
+							IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+							m.initialize(project, info, monitor);
+							try {
+								m.reconfigure();
+							} catch (CoreException e) {
+								// do nothing for now
+							}
+						}
+					}, rule, IWorkspace.AVOID_UPDATE, monitor);
+				} catch (CoreException e) {
+					return e.getStatus();
+				}
+				IStatus returnStatus = Status.OK_STATUS;
+				return returnStatus;
+			}
+		};
+
+		backgroundJob.setRule(rule);
+		backgroundJob.schedule();
+	}
+
+	public void dispose() {
+
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/ReconfigureHandler.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/ReconfigureHandler.java
new file mode 100644
index 0000000..586c5fa
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/ReconfigureHandler.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+/**
+ * @author Jeff Johnston
+ *
+ */
+public class ReconfigureHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		ReconfigureAction a = new ReconfigureAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/SingleInputDialog.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/SingleInputDialog.java
new file mode 100644
index 0000000..a7342f5
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/SingleInputDialog.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+
+public class SingleInputDialog extends InputDialog {
+	
+	private String firstMessage;
+
+	public SingleInputDialog(Shell parentShell, String firstMessage, String dialogTitle,
+			String dialogMessage, String initialValue,
+			IInputValidator validator) {
+		super(parentShell, dialogTitle, dialogMessage, initialValue, validator);
+
+		this.firstMessage = firstMessage;
+	}
+
+	/*
+	 * (non-Javadoc) Method declared on Dialog.
+	 */
+	protected void buttonPressed(int buttonId) {
+		super.buttonPressed(buttonId);
+	}
+
+	protected Control createDialogArea(Composite parent) {
+
+		// create composite
+		Composite composite = (Composite) super.createDialogArea(parent);
+
+		CLabel label0 = new CLabel(composite, SWT.WRAP);
+		label0.setText(firstMessage);
+		GridData data = new GridData(GridData.GRAB_HORIZONTAL
+				| GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL
+				| GridData.VERTICAL_ALIGN_CENTER);
+		data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
+		label0.setLayoutData(data);
+		label0.setFont(parent.getFont());
+
+		// remove error message dialog from focusing.
+		composite.getTabList()[2].setVisible(false);
+		composite.getTabList()[2].setEnabled(false);
+
+		return composite;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/TwoInputDialog.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/TwoInputDialog.java
new file mode 100644
index 0000000..5d1654c
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/actions/TwoInputDialog.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.actions;
+
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+
+public class TwoInputDialog extends InputDialog {
+
+	private Text secondText;
+
+	private String secondValue;
+
+	private String secondMessage;
+	
+	private String firstMessage;
+
+	public TwoInputDialog(Shell parentShell, String firstMessage, String dialogTitle,
+			String dialogMessage, String secondMessage, String initialValue,
+			IInputValidator validator) {
+		super(parentShell, dialogTitle, dialogMessage, initialValue, validator);
+
+		this.firstMessage = firstMessage;
+		this.secondMessage = secondMessage;
+	}
+
+	/*
+	 * (non-Javadoc) Method declared on Dialog.
+	 */
+	protected void buttonPressed(int buttonId) {
+		if (buttonId == IDialogConstants.OK_ID) {
+			secondValue = secondText.getText();
+		} else {
+			secondValue = null;
+		}
+		super.buttonPressed(buttonId);
+	}
+
+	protected Control createDialogArea(Composite parent) {
+
+		// create composite
+		Composite composite = (Composite) super.createDialogArea(parent);
+
+		CLabel label0 = new CLabel(composite, SWT.WRAP);
+		label0.setText(firstMessage);
+		Label label = new Label(composite, SWT.WRAP);
+		label.setText(secondMessage);
+		GridData data = new GridData(GridData.GRAB_HORIZONTAL
+				| GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL
+				| GridData.VERTICAL_ALIGN_CENTER);
+		data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
+		label0.setLayoutData(data);
+		label0.setFont(parent.getFont());
+		label.setLayoutData(data);
+		label.setFont(parent.getFont());
+		
+
+		secondText = new Text(composite, SWT.SINGLE | SWT.BORDER);
+		secondText.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL
+				| GridData.HORIZONTAL_ALIGN_FILL));
+		secondText.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				validateInput();
+			}
+		});
+
+		// remove error message dialog from focusing.
+		composite.getTabList()[2].setVisible(false);
+		composite.getTabList()[2].setEnabled(false);
+
+		return composite;
+	}
+
+	/**
+	 * Returns the text area.
+	 * 
+	 * @return the text area
+	 */
+	protected Text getSecondText() {
+		return secondText;
+	}
+
+	/**
+	 * Returns the string typed into this input dialog.
+	 * 
+	 * @return the input string
+	 */
+	public String getSecondValue() {
+		return secondValue;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/autoconf/ProjectionFileUpdater.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/autoconf/ProjectionFileUpdater.java
new file mode 100644
index 0000000..0d55552
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/autoconf/ProjectionFileUpdater.java
@@ -0,0 +1,424 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ * Red Hat Inc. - convert to use with Autoconf Editor
+ * Ed Swartz (NOKIA) - refactoring
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.autoconf;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.Position;
+import org.eclipse.jface.text.source.Annotation;
+import org.eclipse.jface.text.source.IAnnotationModel;
+import org.eclipse.jface.text.source.projection.IProjectionListener;
+import org.eclipse.jface.text.source.projection.ProjectionAnnotation;
+import org.eclipse.jface.text.source.projection.ProjectionAnnotationModel;
+import org.eclipse.jface.text.source.projection.ProjectionViewer;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.AutoconfEditor;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfCaseElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfElifElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfElseElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfForElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfIfElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfMacroArgumentElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfMacroElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfRootElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfSelectElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfUntilElement;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.AutoconfWhileElement;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.IReconcilingParticipant;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutotoolsEditorPreferenceConstants;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+
+
+/**
+ * ProjectionMakefileUpdater
+ */
+public class ProjectionFileUpdater implements IProjectionListener {
+
+	private static class AutoconfProjectionAnnotation extends ProjectionAnnotation {
+		
+		private AutoconfElement fElement;
+		private boolean fIsComment;
+		
+		public AutoconfProjectionAnnotation(AutoconfElement element, boolean isCollapsed, boolean isComment) {
+			super(isCollapsed);
+			fElement = element;
+			fIsComment = isComment;
+		}
+		
+		public AutoconfElement getElement() {
+			return fElement;
+		}
+		
+		public void setElement(AutoconfElement element) {
+			fElement = element;
+		}
+		
+		public boolean isComment() {
+			return fIsComment;
+		}
+		
+	}
+	
+
+	public void install(AutoconfEditor editor, ProjectionViewer viewer) {
+		fEditor= editor;
+		fViewer= viewer;
+		fViewer.addProjectionListener(this);
+	}
+	
+	public void uninstall() {
+		if (isInstalled()) {
+			projectionDisabled();
+			fViewer.removeProjectionListener(this);
+			fViewer= null;
+			fEditor= null;
+		}
+	}
+	
+	protected boolean isInstalled() {
+		return fEditor != null;
+	}
+
+	private class ReconcilerParticipant implements IReconcilingParticipant {
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.IReconcilingParticipant#reconciled()
+		 */
+		public void reconciled() {
+			processReconcile();
+		}
+	}
+
+	private IDocument fCachedDocument;
+	private AutoconfEditor fEditor;
+	private ProjectionViewer fViewer;
+	private IReconcilingParticipant fParticipant;
+
+	private boolean fAllowCollapsing = false;
+	private boolean fCollapseMacroDef = false;
+	private boolean fCollapseCase = false;
+	private boolean fCollapseConditional = false;
+	private boolean fCollapseLoop = false;
+
+	/*
+	 * @see org.eclipse.jface.text.source.projection.IProjectionListener#projectionEnabled()
+	 */
+	public void projectionEnabled() {
+		// http://home.ott.oti.com/teams/wswb/anon/out/vms/index.html
+		// projectionEnabled messages are not always paired with projectionDisabled
+		// i.e. multiple enabled messages may be sent out.
+		// we have to make sure that we disable first when getting an enable
+		// message.
+		projectionDisabled();
+		
+		initialize();			
+		fParticipant= new ReconcilerParticipant();
+		fEditor.addReconcilingParticipant(fParticipant);
+	}
+	
+	/*
+	 * @see org.eclipse.jface.text.source.projection.IProjectionListener#projectionDisabled()
+	 */
+	public void projectionDisabled() {
+		fCachedDocument= null;
+		if (fParticipant != null) {
+			fEditor.addReconcilingParticipant(fParticipant);
+			fParticipant= null;
+		}
+	}
+		
+	public void initialize() {
+		
+		if (!isInstalled())
+			return;
+		
+		initializePreferences();
+		
+		try {
+			
+			IDocumentProvider provider= fEditor.getDocumentProvider();
+			fCachedDocument= provider.getDocument(fEditor.getEditorInput());
+			fAllowCollapsing= true;
+			
+//			IWorkingCopyManager manager= AutomakeEditorFactory.getDefault().getWorkingCopyManager();
+			AutoconfElement fInput= fEditor.getRootElement();
+			
+			if (fInput != null) {
+				ProjectionAnnotationModel model= (ProjectionAnnotationModel) fEditor.getAdapter(ProjectionAnnotationModel.class);
+				if (model != null) {
+					Map<AutoconfProjectionAnnotation, Position> additions= computeAdditions(fInput);
+					model.removeAllAnnotations();
+					model.replaceAnnotations(null, additions);
+				}
+			}
+			
+		} finally {
+			fCachedDocument= null;
+			fAllowCollapsing= false;
+		}
+	}
+
+	private void initializePreferences() {
+		//FIXME: what to do with Makefile editor preferences
+		IPreferenceStore store = AutotoolsPlugin.getDefault().getPreferenceStore();
+		fCollapseMacroDef = store.getBoolean(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_MACRODEF);
+		fCollapseCase = store.getBoolean(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_CASE);
+		fCollapseConditional = store.getBoolean(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_CONDITIONAL);
+		fCollapseLoop = store.getBoolean(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_LOOP);
+	}
+
+	private Map<AutoconfProjectionAnnotation, Position> computeAdditions(AutoconfElement root) {
+		Map<AutoconfProjectionAnnotation, Position> map= new HashMap<AutoconfProjectionAnnotation, Position>();
+		if (root instanceof AutoconfRootElement)
+			computeAdditions(root.getChildren(), map);
+		return map;
+	}
+
+	private void computeAdditions(Object[] elements, Map<AutoconfProjectionAnnotation, Position> map) {
+		for (int i= 0; i < elements.length; i++) {
+			AutoconfElement element= (AutoconfElement)elements[i];
+			
+			computeAdditions(element, map);
+			
+			if (element.hasChildren()) {				
+				computeAdditions(element.getChildren(), map);
+			}
+		}
+	}
+
+	private void computeAdditions(AutoconfElement element, Map<AutoconfProjectionAnnotation, Position> map) {
+		
+		boolean createProjection= false;
+		
+		@SuppressWarnings("unused")
+		boolean collapse= false;
+			
+		if (element instanceof AutoconfIfElement ||
+				element instanceof AutoconfElseElement ||
+				element instanceof AutoconfElifElement) {
+			collapse= fAllowCollapsing && fCollapseConditional;
+			createProjection= true;
+		} else if (element instanceof AutoconfMacroElement) {
+			collapse= fAllowCollapsing && fCollapseMacroDef;
+			createProjection= true;
+		} else if (element instanceof AutoconfMacroArgumentElement) {
+			collapse= fAllowCollapsing && fCollapseMacroDef;
+			createProjection= true;
+		} else if (element instanceof AutoconfCaseElement) {
+			collapse= fAllowCollapsing && fCollapseCase;
+			createProjection= true;
+		} else if (element instanceof AutoconfForElement ||
+				element instanceof AutoconfWhileElement ||
+				element instanceof AutoconfUntilElement ||
+				element instanceof AutoconfSelectElement) {
+			collapse = fAllowCollapsing && fCollapseLoop;
+			createProjection = true;
+		}
+	
+		if (createProjection) {
+			Position position= createProjectionPosition(element);
+			if (position != null) {
+				map.put(new AutoconfProjectionAnnotation(element, fAllowCollapsing, true), position);
+			}
+		}
+	}
+
+	private Position createProjectionPosition(AutoconfElement element) {
+		if (fCachedDocument == null)
+			return null;
+		int offset = 0;
+		try {
+			int startLine = 0;
+			int endLine = 0;
+			startLine = fCachedDocument.getLineOfOffset(element.getStartOffset());
+			endLine = fCachedDocument.getLineOfOffset(element.getEndOffset());
+
+			if (startLine != endLine) {
+				offset= fCachedDocument.getLineOffset(startLine);
+				int endOffset = fCachedDocument.getLineOffset(endLine) + fCachedDocument.getLineLength(endLine);
+				return new Position(offset, endOffset - offset);
+			}
+		} catch (BadLocationException x) {
+			// We should only get here if we try and read the line past EOF
+			return new Position(offset, fCachedDocument.getLength() - 1);
+		}
+		return null;
+	}
+
+	public void processReconcile() {
+		if (!isInstalled())
+			return;
+		
+		ProjectionAnnotationModel model= (ProjectionAnnotationModel) fEditor.getAdapter(ProjectionAnnotationModel.class);
+		if (model == null)
+			return;
+		
+		try {
+			IDocumentProvider provider= fEditor.getDocumentProvider();
+			fCachedDocument= provider.getDocument(fEditor.getEditorInput());
+			fAllowCollapsing= false;
+			
+			Map<AutoconfProjectionAnnotation, Position> additions= new HashMap<AutoconfProjectionAnnotation, Position>();
+			List<AutoconfProjectionAnnotation> deletions= new ArrayList<AutoconfProjectionAnnotation>();
+			List<AutoconfProjectionAnnotation> updates = new ArrayList<AutoconfProjectionAnnotation>();
+			
+			Map<AutoconfProjectionAnnotation, Position> updated= computeAdditions(fEditor.getRootElement());
+			
+			Map<AutoconfElement, List<AutoconfProjectionAnnotation>> previous= createAnnotationMap(model);
+			
+			
+			Iterator<AutoconfProjectionAnnotation> e= updated.keySet().iterator();
+			while (e.hasNext()) {
+				AutoconfProjectionAnnotation annotation= (AutoconfProjectionAnnotation) e.next();
+				AutoconfElement element= annotation.getElement();
+				Position position= (Position) updated.get(annotation);
+				
+				List<AutoconfProjectionAnnotation> annotations= previous.get(element);
+				if (annotations == null) {
+					additions.put(annotation, position);
+				} else {
+					Iterator<AutoconfProjectionAnnotation> x= annotations.iterator();
+					while (x.hasNext()) {
+						AutoconfProjectionAnnotation a= (AutoconfProjectionAnnotation) x.next();
+						if (annotation.isComment() == a.isComment()) {
+							Position p= model.getPosition(a);
+							if (p != null && !position.equals(p)) {
+								p.setOffset(position.getOffset());
+								p.setLength(position.getLength());
+								updates.add(a);
+							}
+							x.remove();
+							break;
+						}
+					}
+										
+					if (annotations.isEmpty())
+						previous.remove(element);
+				}
+			}
+			
+			Iterator<List<AutoconfProjectionAnnotation>> e2 = previous.values().iterator();
+			while (e2.hasNext()) {
+				List<AutoconfProjectionAnnotation> list= e2.next();
+				int size= list.size();
+				for (int i= 0; i < size; i++)
+					deletions.add(list.get(i));
+			}
+
+			match(model, deletions, additions, updates);
+
+			Annotation[] removals= new Annotation[deletions.size()];
+			deletions.toArray(removals);
+			Annotation[] changes= new Annotation[updates.size()];
+			updates.toArray(changes);
+			model.modifyAnnotations(removals, additions, changes);
+			
+		} finally {
+			fCachedDocument= null;
+			fAllowCollapsing= true;
+		}
+	}
+
+	private void match(ProjectionAnnotationModel model, List<AutoconfProjectionAnnotation> deletions, Map<AutoconfProjectionAnnotation, Position> additions, List<AutoconfProjectionAnnotation> changes) {
+		if (deletions.isEmpty() || (additions.isEmpty() && changes.isEmpty()))
+			return;
+		
+		List<AutoconfProjectionAnnotation> newDeletions= new ArrayList<AutoconfProjectionAnnotation>();
+		List<AutoconfProjectionAnnotation> newChanges= new ArrayList<AutoconfProjectionAnnotation>();
+		
+		Iterator<AutoconfProjectionAnnotation> deletionIterator= deletions.iterator();
+		outer: while (deletionIterator.hasNext()) {
+			AutoconfProjectionAnnotation deleted= (AutoconfProjectionAnnotation) deletionIterator.next();
+			Position deletedPosition= model.getPosition(deleted);
+			if (deletedPosition == null)
+				continue;
+			
+			Iterator<AutoconfProjectionAnnotation> changesIterator= changes.iterator();
+			while (changesIterator.hasNext()) {
+				AutoconfProjectionAnnotation changed= (AutoconfProjectionAnnotation) changesIterator.next();
+				if (deleted.isComment() == changed.isComment()) {
+					Position changedPosition= model.getPosition(changed);
+					if (changedPosition == null)
+						continue;
+					
+					if (deletedPosition.getOffset() == changedPosition.getOffset()) {
+						
+						deletedPosition.setLength(changedPosition.getLength());
+						deleted.setElement(changed.getElement());
+						
+						deletionIterator.remove();
+						newChanges.add(deleted);
+						
+						changesIterator.remove();
+						newDeletions.add(changed);
+						
+						continue outer;
+					}
+				}
+			}
+			
+			Iterator<AutoconfProjectionAnnotation> additionsIterator= additions.keySet().iterator();
+			while (additionsIterator.hasNext()) {
+				AutoconfProjectionAnnotation added= (AutoconfProjectionAnnotation) additionsIterator.next();
+				if (deleted.isComment() == added.isComment()) {
+					Position addedPosition= (Position) additions.get(added);
+					
+					if (deletedPosition.getOffset() == addedPosition.getOffset()) {
+						
+						deletedPosition.setLength(addedPosition.getLength());
+						deleted.setElement(added.getElement());
+						
+						deletionIterator.remove();
+						newChanges.add(deleted);
+						
+						additionsIterator.remove();
+						
+						break;
+					}
+				}
+			}
+		}
+		
+		deletions.addAll(newDeletions);
+		changes.addAll(newChanges);
+	}
+
+	@SuppressWarnings("unchecked")
+	private Map<AutoconfElement, List<AutoconfProjectionAnnotation>> createAnnotationMap(IAnnotationModel model) {
+		Map<AutoconfElement, List<AutoconfProjectionAnnotation>> map= new HashMap<AutoconfElement, List<AutoconfProjectionAnnotation>>();
+		Iterator e= model.getAnnotationIterator();
+		while (e.hasNext()) {
+			Object annotation= e.next();
+			if (annotation instanceof AutoconfProjectionAnnotation) {
+				AutoconfProjectionAnnotation directive= (AutoconfProjectionAnnotation) annotation;
+				List<AutoconfProjectionAnnotation> list= map.get(directive.getElement());
+				if (list == null) {
+					list= new ArrayList<AutoconfProjectionAnnotation>(2);
+					map.put(directive.getElement(), list);
+				}
+				list.add(directive);
+			}
+		}
+		return map;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AbstractElementListSelectionDialog.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AbstractElementListSelectionDialog.java
new file mode 100644
index 0000000..f63da33
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AbstractElementListSelectionDialog.java
@@ -0,0 +1,283 @@
+/*******************************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+
+/**
+ * A class to select one or more elements out of an indexed property
+ */
+public abstract class AbstractElementListSelectionDialog extends SelectionStatusDialog {
+	
+	private ILabelProvider fRenderer;
+	private boolean fIgnoreCase;
+	private boolean fIsMultipleSelection;
+	
+	private SelectionList fSelectionList;
+	private Label fMessage;
+	private ISelectionValidator fValidator;	
+	
+	private String fMessageText;
+	private String fEmptyListMessage;
+	private String fNothingSelectedMessage;
+	
+	private StatusInfo fCurrStatus;
+	
+	/*
+	 * @private
+	 */
+	protected void access$superOpen() {
+		super.open();
+	}
+	/*
+	 * @private
+	 * @see Dialog#cancelPressed
+	 */
+	protected void cancelPressed() {
+		setResult(null);
+		super.cancelPressed();
+	}
+	protected Point computeInitialSize() {
+		return new Point(convertWidthInCharsToPixels(60), convertHeightInCharsToPixels(18));
+	}
+	/*
+	 * @private
+	 * @see Window#createDialogArea(Composite)
+	 */
+	protected Control createDialogArea(Composite parent) {
+		Composite contents= (Composite)super.createDialogArea(parent);
+		
+		fMessage= createMessage(contents);
+		
+		int flags= fIsMultipleSelection ? SWT.MULTI : SWT.SINGLE;			
+		fSelectionList= new SelectionList(contents, flags | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL,
+			fRenderer, fIgnoreCase);
+		
+		fSelectionList.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+				handleDoubleClick();
+			}
+			public void widgetSelected(SelectionEvent e) {
+				verifyCurrentSelection();
+			}
+		});
+
+		GridData spec= new GridData();
+		Point initialSize= computeInitialSize();
+		spec.widthHint= initialSize.x;
+		spec.heightHint= initialSize.y;
+		spec.grabExcessVerticalSpace= true;
+		spec.grabExcessHorizontalSpace= true;
+		spec.horizontalAlignment= GridData.FILL;
+		spec.verticalAlignment= GridData.FILL;
+		fSelectionList.setLayoutData(spec);
+				
+		return contents;
+	}
+	/**
+	 * Creates the message text widget and sets layout data.
+	 */
+	protected Label createMessage(Composite parent) {
+		Label text= new Label(parent, SWT.NULL);
+		text.setText(fMessageText);
+		GridData spec= new GridData();
+		spec.grabExcessVerticalSpace= false;
+		spec.grabExcessHorizontalSpace= true;
+		spec.horizontalAlignment= GridData.FILL;
+		spec.verticalAlignment= GridData.BEGINNING;
+		text.setLayoutData(spec);
+		return text;
+	}
+	/*
+	 * @private
+	 * @see Window#create(Shell)
+	 */
+	public void create() {
+		super.create();
+	     	if (isEmptyList()) {
+	     		fMessage.setEnabled(false);
+	     		fSelectionList.setEnabled(false);
+	     	} else {
+		     	verifyCurrentSelection();		
+			fSelectionList.selectFilterText();
+			fSelectionList.setFocus();
+	     	}	
+	}
+	/**
+	 * Returns the currently used filter text.
+	 */
+	protected String getFilter() {
+		return fSelectionList.getFilter();
+	}
+	/**
+	 * Returns the selection indices.
+	 */
+	protected int[] getSelectionIndices() {
+		return fSelectionList.getSelectionIndices();
+	}
+	/**
+	 * Returns the widget selection. Returns empty list when the widget is not
+	 * usable.
+	 */
+	protected List<Object> getWidgetSelection() {
+		if (fSelectionList == null || fSelectionList.isDisposed())
+			return new ArrayList<Object>(0);
+		return fSelectionList.getSelection();	
+	}
+	/**
+	 * An element as been selected in the list by double clicking on it.
+	 * Emulate a OK button pressed to close the dialog.
+	 */	
+	protected abstract void handleDoubleClick();
+	/**
+	 * Checks whether the list of elements is empty or not.
+	 */
+	protected boolean isEmptyList() {
+		if (fSelectionList == null)
+			return true;
+		return fSelectionList.isEmptyList();
+	}
+	/**
+	 * Constructs a list selection dialog.
+	 * @param renderer The label renderer used
+	 * @param ignoreCase Decides if the match string ignores lower/upppr case
+	 * @param multipleSelection Allow multiple selection	 
+	 */
+	protected AbstractElementListSelectionDialog(Shell parent, String title, Image image, ILabelProvider renderer, boolean ignoreCase, boolean multipleSelection) {
+		super(parent);
+		setTitle(title);
+		setImage(image);
+		fRenderer= renderer;
+		fIgnoreCase= ignoreCase;
+		fIsMultipleSelection= multipleSelection;
+		
+		fMessageText= ""; //$NON-NLS-1$
+		
+		fCurrStatus= new StatusInfo();
+		
+		fValidator= null;
+		fEmptyListMessage= ""; //$NON-NLS-1$
+		fNothingSelectedMessage= ""; //$NON-NLS-1$
+	}
+	/**
+	 * Constructs a list selection dialog.
+	 * @param renderer The label renderer used
+	 * @param ignoreCase Decides if the match string ignores lower/upppr case
+	 * @param multipleSelection Allow multiple selection	 
+	 */
+	protected AbstractElementListSelectionDialog(Shell parent, ILabelProvider renderer, boolean ignoreCase, boolean multipleSelection) {
+		this(parent, "", null, renderer, ignoreCase, multipleSelection); //$NON-NLS-1$
+	}
+	/*
+	 * @private
+	 */
+	public int open() {
+		BusyIndicator.showWhile(null, new Runnable() {
+			public void run() {
+				access$superOpen();
+			}
+		});
+		return getReturnCode() ;
+	}
+	/**
+	 * Refilters the current list according to the filter entered into the
+	 * text edit field.
+	 */
+	protected void refilter() {
+		fSelectionList.filter(true);
+	}
+	/**
+	 * If a empty-list message is set, a error message is shown
+	 * Must be set before widget creation
+	 */
+	public void setEmptyListMessage(String message) {
+		fEmptyListMessage= message;
+	}
+	/**
+	 * Sets the filter text to the given value.
+	 */
+	protected void setFilter(String text, boolean refilter) {
+		fSelectionList.setFilter(text, refilter);
+	}
+	/**
+	 * Sets the message to be shown above the match text field.
+	 * Must be set before widget creation
+	 */
+	public void setMessage(String message) {
+		fMessageText= message;
+	}
+	/**
+	 * If the selection is empty, this message is shown
+	 */
+	public void setNothingSelectedMessage(String message) {
+		fNothingSelectedMessage= message;
+	}
+	/**
+	 * Selects the elements in the list determined by the given
+	 * selection indices.
+	 */
+	protected void setSelection(int[] selection) {
+		fSelectionList.setSelection(selection);
+	}
+	/**
+	 * Initializes the selection list widget with the given list of
+	 * elements.
+	 */
+	protected void setSelectionListElements(List<Object> elements, boolean refilter) {
+		fSelectionList.setElements(elements, refilter);
+	}
+	/**
+	 * A validator can be set to check if the current selection
+	 * is valid
+	 */
+	public void setValidator(ISelectionValidator validator) {
+		fValidator= validator;
+	}
+	/**
+	 * Verifies the current selection and updates the status line
+	 * accordingly.
+	 */
+	protected boolean verifyCurrentSelection() {
+		List<Object> sel= getWidgetSelection();
+		int length= sel.size();
+		if (length > 0) {
+			if (fValidator != null) {
+				fValidator.isValid(sel.toArray(), fCurrStatus);
+			} else {
+				fCurrStatus.setOK();
+			}
+		} else {
+			if (isEmptyList()) {
+				fCurrStatus.setError(fEmptyListMessage);
+			} else {
+				fCurrStatus.setError(fNothingSelectedMessage);
+			}
+		}
+		updateStatus(fCurrStatus);
+		return fCurrStatus.isOK();
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AbstractMakefile.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AbstractMakefile.java
new file mode 100644
index 0000000..8edc6c9
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AbstractMakefile.java
@@ -0,0 +1,294 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.IInferenceRule;
+import org.eclipse.cdt.make.core.makefile.IMacroDefinition;
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.core.makefile.IMakefileReaderProvider;
+import org.eclipse.cdt.make.core.makefile.IRule;
+import org.eclipse.cdt.make.core.makefile.ITargetRule;
+
+/**
+ * Makefile : ( statement ) *
+ * statement :   rule | macro_definition | comments | empty
+ * rule :  inference_rule | target_rule
+ * inference_rule : target ':' <nl> ( <tab> command <nl> ) +
+ * target_rule : target [ ( target ) * ] ':' [ ( prerequisite ) * ] [ ';' command ] <nl> 
+                 [ ( command ) * ]
+ * macro_definition : string '=' (string)* 
+ * comments : ('#' (string) <nl>) *
+ * empty : <nl>
+ * command : <tab> prefix_command string <nl>
+ * target : string
+ * prefix_command : '-' | '@' | '+'
+ * internal_macro :  "$<" | "$*" | "$@" | "$?" | "$%" 
+ */
+
+public abstract class AbstractMakefile extends Parent implements IMakefile {
+
+	private URI filename;
+
+	public AbstractMakefile(Directive parent) {
+		super(parent);
+	}
+
+	public abstract IDirective[] getBuiltins();
+
+	public IRule[] getRules() {
+		IDirective[] stmts = getDirectives(true);
+		List<IRule> array = new ArrayList<IRule>(stmts.length);
+		for (int i = 0; i < stmts.length; i++) {
+			if (stmts[i] instanceof IRule) {
+				array.add((IRule)stmts[i]);
+			}
+		}
+		return (IRule[]) array.toArray(new IRule[0]);
+	}
+
+	public IRule[] getRules(String target) {
+		IRule[] rules = getRules();
+		List<IRule> array = new ArrayList<IRule>(rules.length);
+		for (int i = 0; i < rules.length; i++) {
+			if (rules[i].getTarget().equals(target)) {
+				array.add(rules[i]);
+			}
+		}
+		return (IRule[]) array.toArray(new IRule[0]);
+	}
+
+	public IInferenceRule[] getInferenceRules() {
+		IRule[] rules = getRules();
+		List<IInferenceRule> array = new ArrayList<IInferenceRule>(rules.length);
+		for (int i = 0; i < rules.length; i++) {
+			if (rules[i] instanceof IInferenceRule) {
+				array.add((IInferenceRule)rules[i]);
+			}
+		}
+		return (IInferenceRule[]) array.toArray(new IInferenceRule[0]);
+	}
+
+	public IInferenceRule[] getInferenceRules(String target) {
+		IInferenceRule[] irules = getInferenceRules();
+		List<IInferenceRule> array = new ArrayList<IInferenceRule>(irules.length);
+		for (int i = 0; i < irules.length; i++) {
+			if (irules[i].getTarget().equals(target)) {
+				array.add(irules[i]);
+			}
+		}
+		return (IInferenceRule[]) array.toArray(new IInferenceRule[0]);
+	}
+
+	public ITargetRule[] getTargetRules() {
+		IRule[] trules = getRules();
+		List<ITargetRule> array = new ArrayList<ITargetRule>(trules.length);
+		for (int i = 0; i < trules.length; i++) {
+			if (trules[i] instanceof ITargetRule) {
+				array.add((ITargetRule)trules[i]);
+			}
+		}
+		return (ITargetRule[]) array.toArray(new ITargetRule[0]);
+	}
+
+	public ITargetRule[] getTargetRules(String target) {
+		ITargetRule[] trules = getTargetRules();
+		List<ITargetRule> array = new ArrayList<ITargetRule>(trules.length);
+		for (int i = 0; i < trules.length; i++) {
+			if (trules[i].getTarget().equals(target)) {
+				array.add(trules[i]);
+			}
+		}
+		return (ITargetRule[]) array.toArray(new ITargetRule[0]);
+	}
+
+	public IMacroDefinition[] getMacroDefinitions() {
+		IDirective[] stmts = getDirectives(true);
+		List<IMacroDefinition> array = new ArrayList<IMacroDefinition>(stmts.length);
+		for (int i = 0; i < stmts.length; i++) {
+			if (stmts[i] instanceof IMacroDefinition) {
+				array.add((IMacroDefinition)stmts[i]);
+			}
+		}
+		return (IMacroDefinition[]) array.toArray(new IMacroDefinition[0]);
+	}
+
+	public IMacroDefinition[] getMacroDefinitions(String name) {
+		IMacroDefinition[] variables = getMacroDefinitions();
+		List<IMacroDefinition> array = new ArrayList<IMacroDefinition>(variables.length);
+		for (int i = 0; i < variables.length; i++) {
+			if (variables[i].getName().equals(name)) {
+				array.add(variables[i]);
+			}
+		}
+		return (IMacroDefinition[]) array.toArray(new IMacroDefinition[0]);
+	}
+
+	public IMacroDefinition[] getBuiltinMacroDefinitions() {
+		IDirective[] stmts = getBuiltins();
+		List<IMacroDefinition> array = new ArrayList<IMacroDefinition>(stmts.length);
+		for (int i = 0; i < stmts.length; i++) {
+			if (stmts[i] instanceof IMacroDefinition) {
+				array.add((IMacroDefinition)stmts[i]);
+			}
+		}
+		return (IMacroDefinition[]) array.toArray(new IMacroDefinition[0]);
+	}
+
+	public IMacroDefinition[] getBuiltinMacroDefinitions(String name) {
+		IMacroDefinition[] variables = getBuiltinMacroDefinitions();
+		List<IMacroDefinition> array = new ArrayList<IMacroDefinition>(variables.length);
+		for (int i = 0; i < variables.length; i++) {
+			if (variables[i].getName().equals(name)) {
+				array.add(variables[i]);
+			}
+		}
+		return (IMacroDefinition[]) array.toArray(new IMacroDefinition[0]);
+	}
+
+	public IInferenceRule[] getBuiltinInferenceRules() {
+		IDirective[] stmts = getBuiltins();
+		List<IInferenceRule> array = new ArrayList<IInferenceRule>(stmts.length);
+		for (int i = 0; i < stmts.length; i++) {
+			if (stmts[i] instanceof IInferenceRule) {
+				array.add((IInferenceRule)stmts[i]);
+			}
+		}
+		return (IInferenceRule[]) array.toArray(new IInferenceRule[0]);
+	}
+
+	public IInferenceRule[] getBuiltinInferenceRules(String target) {
+		IInferenceRule[] irules = getBuiltinInferenceRules();
+		List<IInferenceRule> array = new ArrayList<IInferenceRule>(irules.length);
+		for (int i = 0; i < irules.length; i++) {
+			if (irules[i].getTarget().equals(target)) {
+				array.add(irules[i]);
+			}
+		}
+		return (IInferenceRule[]) array.toArray(new IInferenceRule[0]);
+	}
+
+	public String expandString(String line) {
+		return expandString(line, false);
+	}
+
+	public String expandString(String line, boolean recursive) {
+		int len = line.length();
+		boolean foundDollar = false;
+		boolean inMacro = false;
+		StringBuffer buffer = new StringBuffer();
+		StringBuffer macroName = new StringBuffer();
+		for (int i = 0; i < len; i++) {
+			char c = line.charAt(i);
+			switch(c) {
+				case '$':
+					// '$$' --> '$'
+					if (foundDollar) {
+						buffer.append(c);
+						foundDollar = false;
+					} else {
+						foundDollar = true;
+					}
+					break;
+				case '(':
+				case '{':
+					if (foundDollar) {
+						inMacro = true;
+					} else {
+						buffer.append(c);
+					}
+					break;
+				case ')':
+				case '}':
+					if (inMacro) {
+						String name = macroName.toString();
+						if (name.length() > 0) {
+							IMacroDefinition[] defs = getMacroDefinitions(name);
+							if (defs.length == 0) {
+								defs = getBuiltinMacroDefinitions(name);
+							}
+							if (defs.length > 0) {
+								String result = defs[0].getValue().toString();
+								if (result.indexOf('$') != -1 && recursive) {
+									result = expandString(result, recursive);
+								}
+								buffer.append(result);
+							} else { // Do not expand
+								buffer.append('$').append('(').append(name).append(')');
+							}
+						}
+						macroName.setLength(0);
+						inMacro = false;
+					} else {
+						buffer.append(c);
+					}
+					break;
+				default:
+					if (inMacro) {
+						macroName.append(c);
+					} else if (foundDollar) {
+						String name = String.valueOf(c);
+						IMacroDefinition[] defs = getMacroDefinitions(name);
+						if (defs.length == 0) {
+							defs = getBuiltinMacroDefinitions(name);
+						}
+						if (defs.length > 0) {
+							String result = defs[0].getValue().toString();
+							if (result.indexOf('$') != -1 && recursive) {
+								result = expandString(result, recursive);
+							}
+							buffer.append(result);
+						} else {
+							// nothing found
+							buffer.append('$').append(c);
+						}
+						inMacro = false;
+					} else {
+						buffer.append(c);
+					}
+					foundDollar = false;
+					break;
+			}
+		}
+		return buffer.toString();
+	}
+	
+	public URI getFileURI() {
+		return filename;
+	}
+	
+	public void setFileURI(URI filename) {
+	    this.filename = filename;
+    }
+	
+
+	public IMakefile getMakefile() {
+		return this;
+	}
+	
+	public IMakefileReaderProvider getMakefileReaderProvider() {
+		return null;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.make.core.makefile.IMakefile#parse(java.net.URI, org.eclipse.cdt.make.core.makefile.IMakefileReaderProvider)
+	 */
+	public void parse(URI fileURI,
+			IMakefileReaderProvider makefileReaderProvider) throws IOException {
+		// not used
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AbstractMakefileCodeScanner.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AbstractMakefileCodeScanner.java
new file mode 100644
index 0000000..0bb70e2
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AbstractMakefileCodeScanner.java
@@ -0,0 +1,172 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ * Red Hat Inc. - convert to use with Automake editor
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.resource.StringConverter;
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.ColorManager;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+
+
+/**
+ * AbstractMakefileEditorScanner
+ */
+public abstract class AbstractMakefileCodeScanner extends RuleBasedScanner {
+
+	private Map<String, Token> fTokenMap= new HashMap<String, Token>();
+	private String[] fPropertyNamesColor;
+	/**
+	 * Preference keys for boolean preferences which are <code>true</code>,
+	 * iff the corresponding token should be rendered bold. 
+	 */
+	private String[] fPropertyNamesBold;
+	/**
+	 * Preference keys for boolean preferences which are <code>true</code>,
+	 * iff the corresponding token should be rendered italic.
+	 */
+	private String[] fPropertyNamesItalic;
+	
+
+	/** 
+	 * Returns the list of preference keys which define the tokens
+	 * used in the rules of this scanner.
+	 */
+	abstract protected String[] getTokenProperties();
+		
+	/**
+	 * Creates the list of rules controlling this scanner.
+	 */
+	abstract protected List<IRule> createRules();
+		
+	/**
+	 * Must be called after the constructor has been called.
+	 */
+	public final void initialize() {
+		
+		fPropertyNamesColor= getTokenProperties();
+		int length= fPropertyNamesColor.length;
+		fPropertyNamesBold= new String[length];
+		fPropertyNamesItalic= new String[length];
+
+		for (int i= 0; i < length; i++) {
+			fPropertyNamesBold[i]= fPropertyNamesColor[i] + MakefileEditorPreferenceConstants.EDITOR_BOLD_SUFFIX;
+			fPropertyNamesItalic[i]= fPropertyNamesColor[i] + MakefileEditorPreferenceConstants.EDITOR_ITALIC_SUFFIX;
+			addToken(fPropertyNamesColor[i], fPropertyNamesBold[i], fPropertyNamesItalic[i]);
+		}
+		
+		initializeRules();
+	}
+
+	private void initializeRules() {
+		List<IRule> rules= createRules();
+		if (rules != null) {
+			IRule[] result= new IRule[rules.size()];
+			rules.toArray(result);
+			setRules(result);
+		}
+	}
+
+	protected Token getToken(String key) {
+		return (Token) fTokenMap.get(key);
+	}
+
+	private void addToken(String colorKey, String boldKey, String italicKey) {
+		fTokenMap.put(colorKey, new Token(createTextAttribute(colorKey, boldKey, italicKey)));
+	}
+
+	private int indexOf(String property) {
+		if (property != null) {
+			int length= fPropertyNamesColor.length;
+			for (int i= 0; i < length; i++) {
+				if (property.equals(fPropertyNamesColor[i]) || property.equals(fPropertyNamesBold[i]) || property.equals(fPropertyNamesItalic[i]))
+					return i;
+			}
+		}
+		return -1;
+	}
+	
+	public boolean affectsBehavior(PropertyChangeEvent event) {
+		return indexOf(event.getProperty()) >= 0;
+	}
+	
+	public void adaptToPreferenceChange(PropertyChangeEvent event) {
+		String p= event.getProperty();
+		int index= indexOf(p);
+		Token token= getToken(fPropertyNamesColor[index]);
+		if (fPropertyNamesColor[index].equals(p))
+			adaptToColorChange(event, token);
+		else if (fPropertyNamesBold[index].equals(p))
+			adaptToStyleChange(event, token, SWT.BOLD);
+		else if (fPropertyNamesItalic[index].equals(p))
+			adaptToStyleChange(event, token, SWT.ITALIC);
+	}
+
+	protected void adaptToColorChange(PropertyChangeEvent event, Token token) {
+		RGB rgb= null;
+		Object value= event.getNewValue();
+		if (value instanceof RGB) {
+			rgb= (RGB) value;
+		} else if (value instanceof String) {
+			rgb= StringConverter.asRGB((String) value);
+		}
+			
+		if (rgb != null) {
+			TextAttribute attr= (TextAttribute) token.getData();
+			token.setData(new TextAttribute(ColorManager.getDefault().getColor(rgb), attr.getBackground(), attr.getStyle()));
+		}
+	}
+
+	protected void adaptToStyleChange(PropertyChangeEvent event, Token token, int styleAttribute) {
+	 	if (token == null) {
+			return;
+		}
+		boolean eventValue= false;
+		Object value= event.getNewValue();
+		if (value instanceof Boolean) {
+			eventValue= ((Boolean) value).booleanValue();
+		} else if (IPreferenceStore.TRUE.equals(value)) {
+			eventValue= true;
+		}
+		
+		TextAttribute attr= (TextAttribute) token.getData();
+		boolean activeValue= (attr.getStyle() & styleAttribute) == styleAttribute;
+		if (activeValue != eventValue) { 
+			token.setData(new TextAttribute(attr.getForeground(), attr.getBackground(), eventValue ? attr.getStyle() | styleAttribute : attr.getStyle() & ~styleAttribute));
+		}
+	}
+
+	protected TextAttribute createTextAttribute(String colorID, String boldKey, String italicKey) {
+		Color color= null;
+		if (colorID != null) {
+			color= AutomakeEditorFactory.getPreferenceColor(colorID);
+		}
+		IPreferenceStore store= AutotoolsPlugin.getDefault().getPreferenceStore();
+		int style= store.getBoolean(boldKey) ? SWT.BOLD : SWT.NORMAL;
+		if (store.getBoolean(italicKey)) {
+			style |= SWT.ITALIC;
+		}		
+		return new TextAttribute(color, null, style);
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AddBuildTargetAction.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AddBuildTargetAction.java
new file mode 100644
index 0000000..8e3c699
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AddBuildTargetAction.java
@@ -0,0 +1,155 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - convert to use with Automake editor
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.cdt.make.core.IMakeTarget;
+import org.eclipse.cdt.make.core.IMakeTargetManager;
+import org.eclipse.cdt.make.core.MakeCorePlugin;
+import org.eclipse.cdt.make.core.makefile.ITargetRule;
+import org.eclipse.cdt.make.ui.dialogs.MakeTargetDialog;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.MakeUIMessages;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IFileEditorInput;
+
+
+/**
+ */
+public class AddBuildTargetAction extends Action {
+
+	MakefileContentOutlinePage fOutliner;
+	static final ITargetRule[] EMPTY_TARGET_RULES = {
+	};
+
+	public AddBuildTargetAction(MakefileContentOutlinePage outliner) {
+		super(MakeUIMessages.getResourceString("AddBuildTargetAction.title")); //$NON-NLS-1$
+		setDescription(MakeUIMessages.getResourceString("AddBuildTargetAction.description")); //$NON-NLS-1$
+		setToolTipText(MakeUIMessages.getResourceString("AddBuildTargetAction.tooltip")); //$NON-NLS-1$
+		fOutliner = outliner;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jface.action.IAction#run()
+	 */
+	public void run() {
+		IMakeTargetManager manager = MakeCorePlugin.getDefault().getTargetManager();
+		IFile file = getFile();
+		Shell shell = fOutliner.getControl().getShell();
+		ITargetRule[] rules = getTargetRules(fOutliner.getSelection());
+		if (file != null && rules.length > 0 && shell != null) {
+			StringBuffer sbBuildName = new StringBuffer();
+			StringBuffer sbMakefileTarget = new StringBuffer();
+			for (int i = 0; i < rules.length; i++) {
+				String name = rules[i].getTarget().toString().trim();
+				if (sbBuildName.length() == 0) {
+					sbBuildName.append(name);
+				} else {
+					sbBuildName.append('_').append(name);
+				}
+				if (sbMakefileTarget.length() == 0) {
+					sbMakefileTarget.append(name);
+				} else {
+					sbMakefileTarget.append(' ').append(name);
+				}
+			}
+			String buildName = generateUniqueName(file.getParent(), sbBuildName.toString());
+			String makefileTarget = sbMakefileTarget.toString();
+			IMakeTarget target = null;
+			try {
+				String[] ids = manager.getTargetBuilders(file.getProject());
+				if (ids.length > 0) {
+					target = manager.createTarget(file.getProject(), buildName, ids[0]);
+					target.setBuildAttribute(IMakeTarget.BUILD_TARGET, makefileTarget);
+					target.setContainer(file.getParent());
+				}
+			} catch (CoreException e) {
+				AutotoolsUIPlugin.errorDialog(shell, MakeUIMessages.getResourceString("AddBuildTargetAction.exception.internal"), e.toString(), e); //$NON-NLS-1$
+				target = null;
+			}
+
+			// Always popup the dialog.
+			if (target != null) {
+				MakeTargetDialog dialog;
+				try {
+					dialog = new MakeTargetDialog(shell, target);
+					dialog.open();
+				} catch (CoreException e) {
+					AutotoolsUIPlugin.errorDialog(shell, MakeUIMessages.getResourceString("AddBuildTargetAction.exception.internal"), e.toString(), e); //$NON-NLS-1$
+				}
+			}
+		}
+	}
+
+	private String generateUniqueName(IContainer container, String targetString) {
+		String newName = targetString;
+		int i = 0;
+		IMakeTargetManager manager = MakeCorePlugin.getDefault().getTargetManager();
+		try {
+			while (manager.findTarget(container, newName) != null) {
+				i++;
+				newName = targetString + " (" + Integer.toString(i) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+			}
+		} catch (CoreException e) {
+		}
+		return newName;
+	}
+	
+	public boolean canActionBeAdded(ISelection selection) {
+		ITargetRule[] rules = getTargetRules(selection);
+		for (int i = 0; i < rules.length; i++) {
+			IFile file = getFile();
+			if (file == null)
+				return false;
+			if (!MakeCorePlugin.getDefault().getTargetManager().hasTargetBuilder(file.getProject()))
+				return false;
+		}
+		return true;
+	}
+
+	private IFile getFile() {
+		Object input = fOutliner.getInput();
+		if (input instanceof IFileEditorInput) {
+			return ((IFileEditorInput)input).getFile();
+		}
+		return null;
+	}
+
+	@SuppressWarnings("unchecked")
+	private ITargetRule[] getTargetRules(ISelection sel) {
+		if (!sel.isEmpty() && sel instanceof IStructuredSelection) {
+			List list = ((IStructuredSelection)sel).toList();
+			if (list.size() > 0) {
+				List<ITargetRule> targets = new ArrayList<ITargetRule>(list.size());
+				Object[] elements = list.toArray();
+				for (int i = 0; i < elements.length; i++) {
+					if (elements[i] instanceof ITargetRule) {
+						targets.add((ITargetRule)elements[i]);
+					}
+				}
+				return (ITargetRule[])targets.toArray(EMPTY_TARGET_RULES);
+			}
+		}
+		return EMPTY_TARGET_RULES;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ArchiveTarget.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ArchiveTarget.java
new file mode 100644
index 0000000..0b6cf7e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ArchiveTarget.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+/**
+ * IArchiveTarget
+ */
+public class ArchiveTarget extends Target {
+
+	String member;
+
+	public ArchiveTarget(String lib, String obj) {
+		super(lib);
+		member = obj;
+	}
+
+	public String getMember() {
+		return member;
+	}
+
+	public String getLibaryName() {
+		return toString();
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutoconfSubstRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutoconfSubstRule.java
new file mode 100644
index 0000000..c4f2e3f
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutoconfSubstRule.java
@@ -0,0 +1,92 @@
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.Arrays;
+import java.util.Comparator;
+
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IPredicateRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.Token;
+
+public class AutoconfSubstRule implements IPredicateRule {
+
+	private IToken token;
+	private char[][] fLineDelimiters;
+	private char[][] fSortedLineDelimiters;
+	
+	private static class DecreasingCharArrayLengthComparator implements Comparator<Object> {
+		public int compare(Object o1, Object o2) {
+			return ((char[]) o2).length - ((char[]) o1).length;
+		}
+	}
+
+	private Comparator<Object> fLineDelimiterComparator= new DecreasingCharArrayLengthComparator();
+
+	public AutoconfSubstRule(IToken token) {
+		this.token = token;
+	}
+	
+	public IToken evaluate(ICharacterScanner scanner, boolean resume) {
+		char[][] originalDelimiters= scanner.getLegalLineDelimiters();
+		int count= originalDelimiters.length;
+		if (fLineDelimiters == null || originalDelimiters.length != count) {
+			fSortedLineDelimiters= new char[count][];
+		} else {
+			while (count > 0 && fLineDelimiters[count-1] == originalDelimiters[count-1])
+				count--;
+		}
+		if (count != 0) {
+			fLineDelimiters= originalDelimiters;
+			System.arraycopy(fLineDelimiters, 0, fSortedLineDelimiters, 0, fLineDelimiters.length);
+			Arrays.sort(fSortedLineDelimiters, fLineDelimiterComparator);
+		}
+		
+		int c;
+		boolean okToScan = resume;
+		int charCount = 0;
+		
+		if (!resume) {
+			// Not resuming.  Verify first char is '@'.
+			c = scanner.read();
+			++charCount;
+			if (c == '@') {
+				okToScan = true;
+			}
+		}
+		
+		if (okToScan) {
+			// We want to make sure we have a valid id (not @@) or (@_@).  When
+			// we resume, we have no choice but to assume it is valid so far.
+			boolean isId = resume;
+			++charCount;
+			while ((c = scanner.read()) != ICharacterScanner.EOF) {
+				if (c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z') {
+					// A valid id has some alphabetic character in it.
+					isId = true;
+				}
+				else if (c >= '0' && c <= '9' || c == '_') {
+					; // continue
+				}
+				else if (c == '@' && isId)
+					return getSuccessToken();
+				else
+					break;
+				++charCount;
+			}
+		}
+		
+		for (int i = 0; i < charCount; ++i)
+			scanner.unread();
+		
+		return Token.UNDEFINED;
+	}
+
+	public IToken getSuccessToken() {
+		return token;
+	}
+
+	public IToken evaluate(ICharacterScanner scanner) {
+		return evaluate(scanner, false);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeCompletionProcessor.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeCompletionProcessor.java
new file mode 100644
index 0000000..94a608e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeCompletionProcessor.java
@@ -0,0 +1,241 @@
+/*******************************************************************************
+ * Mostly copied from makefileCompletionProcessor which has the following
+ * copyright notice:
+ * 
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.IMacroDefinition;
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.core.makefile.IRule;
+import org.eclipse.cdt.make.ui.IWorkingCopyManager;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.TextPresentation;
+import org.eclipse.jface.text.contentassist.CompletionProposal;
+import org.eclipse.jface.text.contentassist.ContextInformation;
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.text.contentassist.IContextInformation;
+import org.eclipse.jface.text.contentassist.IContextInformationPresenter;
+import org.eclipse.jface.text.contentassist.IContextInformationValidator;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.MakeUIImages;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.IEditorPart;
+
+
+public class AutomakeCompletionProcessor implements IContentAssistProcessor {
+
+		/**
+		 * Simple content assist tip closer. The tip is valid in a range
+		 * of 5 characters around its popup location.
+		 */
+		protected static class Validator implements IContextInformationValidator, IContextInformationPresenter {
+
+			protected int fInstallOffset;
+
+			/*
+			 * @see IContextInformationValidator#isContextInformationValid(int)
+			 */
+			public boolean isContextInformationValid(int offset) {
+				return Math.abs(fInstallOffset - offset) < 5;
+			}
+
+			/*
+			 * @see IContextInformationValidator#install(IContextInformation, ITextViewer, int)
+			 */
+			public void install(IContextInformation info, ITextViewer viewer, int offset) {
+				fInstallOffset = offset;
+			}
+
+			/*
+			 * @see org.eclipse.jface.text.contentassist.IContextInformationPresenter#updatePresentation(int, TextPresentation)
+			 */
+			public boolean updatePresentation(int documentPosition, TextPresentation presentation) {
+				return false;
+			}
+		}
+
+		public class DirectiveComparator implements Comparator<Object> {
+
+			/* (non-Javadoc)
+			 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+			 */
+			public int compare(Object o1, Object o2) {
+				String name1;
+				String name2;
+
+				if (o1 instanceof IMacroDefinition) {
+					name1 = ((IMacroDefinition)o1).getName();
+				} else if (o1 instanceof IRule) {
+					name1 = ((IRule)o1).getTarget().toString();
+				} else {
+					name1 =""; //$NON-NLS-1$
+				}
+
+				if (o2 instanceof IMacroDefinition) {
+					name2 = ((IMacroDefinition)o1).getName();
+				} else if (o2 instanceof IRule) {
+					name2 = ((IRule)o1).getTarget().toString();
+				} else {
+					name2 =""; //$NON-NLS-1$
+				}
+
+				//return String.CASE_INSENSITIVE_ORDER.compare(name1, name2);
+				return name1.compareToIgnoreCase(name2);
+			}
+			
+		}
+		protected IContextInformationValidator fValidator = new Validator();
+		protected Image imageMacro = MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_MACRO);
+		protected Image imageTarget = MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_TARGET_RULE);
+
+		protected CompletionProposalComparator comparator = new CompletionProposalComparator();
+		protected IEditorPart fEditor;
+		protected IWorkingCopyManager fManager;
+
+		public AutomakeCompletionProcessor(IEditorPart editor) {
+			fEditor = editor;
+			fManager =  AutomakeEditorFactory.getDefault().getWorkingCopyManager();
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeCompletionProposals(org.eclipse.jface.text.ITextViewer, int)
+		 */
+		public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int documentOffset) {
+			WordPartDetector wordPart = new WordPartDetector(viewer, documentOffset);
+			boolean macro = WordPartDetector.inMacro(viewer, documentOffset);
+			IMakefile makefile = fManager.getWorkingCopy(fEditor.getEditorInput());
+			IDirective[] statements = null;
+			if (macro) {
+				IDirective[] m1 = makefile.getMacroDefinitions();
+				IDirective[] m2 = makefile.getBuiltinMacroDefinitions();
+				statements = new IDirective[m1.length + m2.length];
+				System.arraycopy(m1, 0, statements, 0, m1.length);
+				System.arraycopy(m2, 0, statements, m1.length, m2.length);
+			} else {
+				statements = makefile.getTargetRules();
+			}
+
+			ArrayList<ICompletionProposal> proposalList = new ArrayList<ICompletionProposal>(statements.length);
+
+			// iterate over all the different categories
+			for (int i = 0; i < statements.length; i++) {
+				String name = null;
+				Image image = null;
+				String infoString = "";//getContentInfoString(name); //$NON-NLS-1$
+				if (statements[i] instanceof IMacroDefinition) {
+					name = ((IMacroDefinition) statements[i]).getName();
+					image = imageMacro;
+					infoString = ((IMacroDefinition)statements[i]).getValue().toString();
+				} else if (statements[i] instanceof IRule) {
+					name = ((IRule) statements[i]).getTarget().toString();
+					image = imageTarget;
+					infoString = name;
+				}
+				if (name != null && name.startsWith(wordPart.toString())) {
+					IContextInformation info = new ContextInformation(name, infoString);
+					String displayString = (name.equals(infoString) ? name : name + " - " + infoString); //$NON-NLS-1$
+					ICompletionProposal result =
+						new CompletionProposal(
+							name,
+							wordPart.getOffset(),
+							wordPart.toString().length(),
+							name.length(),
+							image,
+							displayString,
+							info,
+							infoString);
+					proposalList.add(result);
+				}
+			}
+			ICompletionProposal[] proposals = (ICompletionProposal[]) proposalList.toArray(new ICompletionProposal[0]);
+			Arrays.sort(proposals, comparator);
+			return proposals;
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeContextInformation(org.eclipse.jface.text.ITextViewer, int)
+		 */
+		public IContextInformation[] computeContextInformation(ITextViewer viewer, int documentOffset) {
+			WordPartDetector wordPart = new WordPartDetector(viewer, documentOffset);
+			boolean macro = WordPartDetector.inMacro(viewer, documentOffset);
+			IMakefile makefile = fManager.getWorkingCopy(fEditor.getEditorInput());
+			ArrayList<String> contextList = new ArrayList<String>();
+			if (macro) {
+				IDirective[] statements = makefile.getMacroDefinitions();
+				for (int i = 0; i < statements.length; i++) {
+					if (statements[i] instanceof IMacroDefinition) {
+						String name = ((IMacroDefinition) statements[i]).getName();
+						if (name != null && name.equals(wordPart.toString())) {
+							String value = ((IMacroDefinition) statements[i]).getValue().toString();
+							if (value != null && value.length() > 0) {
+								contextList.add(value);
+							}
+						}
+					}
+				}
+				statements = makefile.getBuiltinMacroDefinitions();
+				for (int i = 0; i < statements.length; i++) {
+					if (statements[i] instanceof IMacroDefinition) {
+						String name = ((IMacroDefinition) statements[i]).getName();
+						if (name != null && name.equals(wordPart.toString())) {
+							String value = ((IMacroDefinition) statements[i]).getValue().toString();
+							if (value != null && value.length() > 0) {
+								contextList.add(value);
+							}
+						}
+					}
+				}
+			}
+
+			IContextInformation[] result = new IContextInformation[contextList.size()];
+			for (int i = 0; i < result.length; i++) {
+				String context = (String)contextList.get(i);
+				result[i] = new ContextInformation(imageMacro, wordPart.toString(), context);
+			}
+			return result;
+
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getCompletionProposalAutoActivationCharacters()
+		 */
+		public char[] getCompletionProposalAutoActivationCharacters() {
+			return null;
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationAutoActivationCharacters()
+		 */
+		public char[] getContextInformationAutoActivationCharacters() {
+			return null;
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getErrorMessage()
+		 */
+		public String getErrorMessage() {
+			return null;
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationValidator()
+		 */
+		public IContextInformationValidator getContextInformationValidator() {
+			return fValidator;
+		}
+	
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeConfigMacro.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeConfigMacro.java
new file mode 100644
index 0000000..63c47d9
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeConfigMacro.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+
+public class AutomakeConfigMacro extends Directive {
+	String name;
+	
+	public AutomakeConfigMacro(Directive parent, String name) {
+		super(parent);
+		this.name = name;
+	}
+	
+	public String getName() {
+		return name;
+	}
+	
+	public String toString() {
+		return name + "\n";
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeDocumentProvider.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeDocumentProvider.java
new file mode 100644
index 0000000..92226f6
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeDocumentProvider.java
@@ -0,0 +1,121 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - Modified from MakefileDocumentProvider for Automake
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.IOException;
+import java.util.Iterator;
+
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.IURIEditorInput;
+import org.eclipse.ui.editors.text.TextFileDocumentProvider;
+
+
+public class AutomakeDocumentProvider extends TextFileDocumentProvider implements IMakefileDocumentProvider  {
+	
+	/**
+	 * Remembers a IMakefile for each element.
+	 */
+	protected class AutomakefileFileInfo extends FileInfo {		
+		public IMakefile fCopy;
+	}
+	
+    /*
+	 * @see org.eclipse.ui.editors.text.TextFileDocumentProvider#createEmptyFileInfo()
+	 */
+	protected FileInfo createEmptyFileInfo() {
+		return new AutomakefileFileInfo();
+	}
+	
+    /*
+	 * @see org.eclipse.ui.editors.text.TextFileDocumentProvider#createFileInfo(java.lang.Object)
+	 */
+	protected FileInfo createFileInfo(Object element) throws CoreException {
+		IMakefile original = null;
+		if (element instanceof IFileEditorInput) {	
+			IFileEditorInput input= (IFileEditorInput) element;
+			if (input.getFile().exists())
+				original= createMakefile(input.getFile().getLocation().toOSString());
+		} else if (element instanceof IURIEditorInput) {
+			IURIEditorInput input = (IURIEditorInput)element;
+			original = createMakefile(input.getURI().getPath().toString());
+		}
+		if (original == null)
+			return null;
+
+		FileInfo info= super.createFileInfo(element);
+		if (!(info instanceof AutomakefileFileInfo)) {
+			return null;
+		}
+
+		AutomakefileFileInfo makefileInfo= (AutomakefileFileInfo) info;
+		setUpSynchronization(makefileInfo);
+
+		makefileInfo.fCopy = original;
+
+		return makefileInfo;
+	}
+	
+	/**
+	 */
+	private IMakefile createMakefile(String fileName) {
+		IMakefile makefile = null;
+		Automakefile automakefile = new Automakefile();
+		try {
+			automakefile.parse(fileName);
+		} catch (IOException e) {
+		}
+		makefile = automakefile;
+		return makefile;
+	}
+	
+	/*
+	 * @see org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.IMakefileDocumentProvider#getWorkingCopy(java.lang.Object)
+	 */
+	public IMakefile getWorkingCopy(Object element) {
+		FileInfo fileInfo= getFileInfo(element);		
+		if (fileInfo instanceof AutomakefileFileInfo) {
+			AutomakefileFileInfo info= (AutomakefileFileInfo) fileInfo;
+			return info.fCopy;
+		}
+		return null;
+	}
+	
+	/*
+	 * @see org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.IMakefileDocumentProvider#shutdown()
+	 */
+	@SuppressWarnings("unchecked")
+	public void shutdown() {
+		Iterator e= getConnectedElementsIterator();
+		while (e.hasNext())
+			disconnect(e.next());
+	}
+	
+	public void connect(Object element) throws CoreException {
+		super.connect(element);
+		IMakefile makefile = getWorkingCopy(element);
+		IDocument document = getDocument(element);
+		AutomakeErrorHandler errorHandler = new AutomakeErrorHandler(document);
+		errorHandler.update(makefile);
+	}
+	
+	public IDocument getDocument(Object element) {
+		FileInfo info= (FileInfo) getFileInfo(element);
+		if (info != null)
+			return info.fTextFileBuffer.getDocument();
+		return getParentProvider().getDocument(element);
+	}
+	
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeEditor.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeEditor.java
new file mode 100644
index 0000000..644274c
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeEditor.java
@@ -0,0 +1,132 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - Modified from MakefileEditor to support Automake files
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutomakeEditorPreferencePage;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutotoolsEditorPreferenceConstants;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.editors.text.EditorsUI;
+import org.eclipse.ui.texteditor.ChainedPreferenceStore;
+import org.eclipse.ui.texteditor.DefaultRangeIndicator;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+
+
+public class AutomakeEditor extends MakefileEditor {
+	
+	protected AutomakefileContentOutlinePage page;
+	private AutomakefileSourceConfiguration sourceViewerConfiguration;
+	private AutomakeErrorHandler errorHandler;
+	private static AutomakeEditor fgInstance;
+	private IEditorInput input;
+	
+    public AutomakeEditor() {
+    	super();
+    	fgInstance = this;
+    }
+
+    /**
+     * Returns the default editor instance.
+     *
+     * @return the default editor instance
+     */
+    public static AutomakeEditor getDefault() {
+    	return fgInstance;
+    }
+
+    protected void doSetInput(IEditorInput newInput) throws CoreException
+	{
+		super.doSetInput(newInput);
+		this.input = newInput;
+
+		getOutlinePage().setInput(input);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#initializeEditor()
+	 */
+	protected void initializeEditor() {
+		setRangeIndicator(new DefaultRangeIndicator());
+		setEditorContextMenuId("#MakefileEditorContext"); //$NON-NLS-1$
+		setRulerContextMenuId("#MakefileRulerContext"); //$NON-NLS-1$
+		setDocumentProvider(AutomakeEditorFactory.getDefault().getAutomakefileDocumentProvider());
+		IPreferenceStore[] stores = new IPreferenceStore[2];
+		stores[0] = AutotoolsPlugin.getDefault().getPreferenceStore();
+		stores[1] = EditorsUI.getPreferenceStore();
+		ChainedPreferenceStore chainedStore = new ChainedPreferenceStore(stores);
+		setPreferenceStore(chainedStore);
+		sourceViewerConfiguration = new AutomakefileSourceConfiguration(chainedStore, this);
+		setSourceViewerConfiguration(sourceViewerConfiguration);
+		AutotoolsEditorPreferenceConstants.initializeDefaultValues(stores[0]);
+		AutomakeEditorPreferencePage.initDefaults(stores[0]);
+		configureInsertMode(SMART_INSERT, false);
+		setInsertMode(INSERT);
+	}
+	
+	public AutomakeDocumentProvider getAutomakefileDocumentProvider() {
+		return (AutomakeDocumentProvider) AutomakeEditorFactory.getDefault().getAutomakefileDocumentProvider();
+	}
+	
+	public AutomakefileContentOutlinePage getAutomakeOutlinePage() {
+		if (page == null) {
+			page = new AutomakefileContentOutlinePage(this);
+			page.addSelectionChangedListener(this);
+			page.setInput(getEditorInput());
+		}
+		return page;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
+	 */
+	public void createPartControl(Composite parent) {
+		super.createPartControl(parent);
+	}
+	
+	/* (non-Javadoc)
+	 * Method declared on IAdaptable
+	 */
+	@SuppressWarnings("unchecked")
+	public Object getAdapter(Class key) {
+		if (key.equals(IContentOutlinePage.class)) {
+			return getAutomakeOutlinePage();
+		}
+		return super.getAdapter(key);
+	}
+	
+	public AutomakefileSourceConfiguration getAutomakeSourceViewerConfiguration() {
+		return sourceViewerConfiguration;
+	}
+	
+	protected void handlePreferenceStoreChanged(PropertyChangeEvent event) {
+		super.handlePreferenceStoreChanged(event);
+	}
+	
+	public IMakefile getMakefile() {
+		return getAutomakefileDocumentProvider().getWorkingCopy(this.getEditorInput());
+	}
+	
+	public ISourceViewer getAutomakeSourceViewer() {
+		return getSourceViewer();
+	}
+	
+	public AutomakeErrorHandler getAutomakeErrorHandler() {
+		return errorHandler;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeEditorFactory.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeEditorFactory.java
new file mode 100644
index 0000000..8e47378
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeEditorFactory.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.ui.IWorkingCopyManager;
+import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.ColorManager;
+import org.eclipse.swt.graphics.Color;
+
+
+public class AutomakeEditorFactory {
+	private IWorkingCopyManager workingCopyManager;
+	private IMakefileDocumentProvider automakeFileDocumentProvider;
+	private static AutomakeEditorFactory factory;
+
+	/**
+	 * The constructor.
+	 */
+	private AutomakeEditorFactory() {
+		factory = this;
+	}
+	
+	public synchronized IMakefileDocumentProvider getAutomakefileDocumentProvider() {
+		if (automakeFileDocumentProvider == null) {
+			automakeFileDocumentProvider=  new AutomakeDocumentProvider();
+		}
+		return automakeFileDocumentProvider;
+	}
+
+	public synchronized IWorkingCopyManager getWorkingCopyManager() {
+		if (workingCopyManager == null) {
+			IMakefileDocumentProvider provider= getAutomakefileDocumentProvider();
+			workingCopyManager= new WorkingCopyManager(provider);
+		}
+		return workingCopyManager;
+	}
+
+	/**
+	 * Returns the preference color, identified by the given preference.
+	 */
+	public static Color getPreferenceColor(String key) {
+		//FIXME: what do we do with Makefile editor preferences?
+		return ColorManager.getDefault().getColor(PreferenceConverter.getColor(AutotoolsPlugin.getDefault().getPreferenceStore(), key));
+	}
+
+	public static AutomakeEditorFactory getDefault() {
+		if (factory == null)
+			factory = new AutomakeEditorFactory();
+		return factory;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeErrorHandler.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeErrorHandler.java
new file mode 100644
index 0000000..7862b20
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeErrorHandler.java
@@ -0,0 +1,229 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.core.makefile.IParent;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.Position;
+import org.eclipse.jface.text.source.AnnotationModel;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.texteditor.MarkerAnnotation;
+import org.eclipse.ui.texteditor.MarkerUtilities;
+
+
+public class AutomakeErrorHandler {
+	public static final String AUTOMAKE_ERROR_MARKER_ID = AutotoolsUIPlugin.PLUGIN_ID
+	+ ".parsefileerror";
+	
+	private IDocument document;
+	private AnnotationModel fAnnotationModel;
+
+	public AutomakeErrorHandler(IDocument document)
+	{
+		this.document = document;
+		IEditorInput input = AutomakeEditor.getDefault().getEditorInput();
+		this.fAnnotationModel = (AnnotationModel)AutomakeEditorFactory.getDefault().getAutomakefileDocumentProvider().getAnnotationModel(input);
+	}
+	
+	private class AutomakeMarker implements IMarker {
+		private Map<String, Object> attributes;
+		private String type;
+		private long id;
+		
+		public void delete() throws CoreException {
+			// TODO Auto-generated method stub
+			
+		}
+		public boolean equals(Object obj) {
+			// TODO Auto-generated method stub
+			return super.equals(obj);
+		}
+		public boolean exists() {
+			// TODO Auto-generated method stub
+			return true;
+		}
+		@SuppressWarnings("unchecked")
+		public Object getAdapter(Class adapter) {
+			// TODO Auto-generated method stub
+			return null;
+		}
+		public Object getAttribute(String attributeName) throws CoreException {
+			return attributes.get(attributeName);
+		}
+		public boolean getAttribute(String attributeName, boolean defaultValue) {
+			Object o = attributes.get(attributeName);
+			if (o != null && o instanceof Boolean)
+				return ((Boolean)o).booleanValue();
+			return defaultValue;
+		}
+		public int getAttribute(String attributeName, int defaultValue) {
+			Object o = attributes.get(attributeName);
+			if (o != null && o instanceof Integer)
+				return ((Integer)o).intValue();
+			return defaultValue;
+		}
+		public String getAttribute(String attributeName, String defaultValue) {
+			Object o = attributes.get(attributeName);
+			if (o != null && o instanceof String)
+				return (String)o;
+			return defaultValue;
+		}
+		@SuppressWarnings("unchecked")
+		public Map getAttributes() throws CoreException {
+			return attributes;
+		}
+		public Object[] getAttributes(String[] attributeNames)
+				throws CoreException {
+			Collection<Object> c = attributes.values();
+			return c.toArray();
+		}
+		public long getCreationTime() throws CoreException {
+			// TODO Auto-generated method stub
+			return 0;
+		}
+		public long getId() {
+			return id;
+		}
+		public IResource getResource() {
+			return null;
+		}
+		public String getType() throws CoreException {
+			return type;
+		}
+		public boolean isSubtypeOf(String superType) throws CoreException {
+			if (superType.equals(type))
+				return true;
+			return false;
+		}
+		public void setAttribute(String attributeName, boolean value)
+				throws CoreException {
+			Boolean b = new Boolean(value);
+			attributes.put(attributeName, b);
+		}
+		public void setAttribute(String attributeName, int value)
+				throws CoreException {
+			Integer i = new Integer(value);
+			attributes.put(attributeName, i);	
+		}
+		public void setAttribute(String attributeName, Object value)
+				throws CoreException {
+			attributes.put(attributeName, value);
+		}
+		@SuppressWarnings("unchecked")
+		public void setAttributes(Map map) throws CoreException {
+			attributes.putAll(map);
+		}
+		public void setAttributes(String[] attributeNames, Object[] values)
+				throws CoreException {
+			for (int i = 0; i < attributeNames.length; ++i) {
+				attributes.put(attributeNames[i], values[i]);
+			}
+		}
+		protected Object clone() throws CloneNotSupportedException {
+			// TODO Auto-generated method stub
+			return super.clone();
+		}
+		public AutomakeMarker(String type, long id) {
+			this.type = type;
+			this.id = id;
+			this.attributes = new HashMap<String, Object>();
+		}
+	}
+	
+	@SuppressWarnings("unchecked")
+	private IMarker createMarker(Map attributes, String markerType) throws CoreException {
+		IMarker marker= new AutomakeMarker(markerType, -1);
+		marker.setAttributes(attributes);
+		return marker;
+	}
+
+	public void update(IMakefile makefile) {
+		removeExistingMarkers();
+
+		// Recursively process all the directives in the Makefile
+		checkChildren(makefile);
+	}
+	
+	private void checkChildren(IParent parent) {
+		IDirective[] directives = parent.getDirectives();
+		for (int i = 0; i < directives.length; i++) {
+			IDirective directive = directives[i];
+			if (directive instanceof IParent) {
+				checkChildren((IParent)directive);
+			} else if (directive instanceof BadDirective) {
+				
+				int lineNumber = directive.getStartLine();
+				
+				Map<String, Object> map = new HashMap<String, Object>();
+				MarkerUtilities.setLineNumber(map, lineNumber);
+				// FIXME:  message
+				MarkerUtilities.setMessage(map, "Bad Directive");
+				map.put(IMarker.MESSAGE, "Bad Directive");
+				map.put(IMarker.LOCATION, Integer.valueOf(lineNumber));
+				
+				Integer charStart = getCharOffset(lineNumber - 1, 0);
+				if (charStart != null) {
+					map.put(IMarker.CHAR_START, charStart);
+				}
+				// FIXME:  probably a better way to do this
+				// This is the end character
+				Integer charEnd = new Integer(getCharOffset(directive.getEndLine(), 0).intValue() - 1);
+				if (charEnd != null) {
+					map.put(IMarker.CHAR_END, charEnd);
+				}
+				
+				// FIXME:  add severity level
+				map.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_ERROR));
+				
+				try {
+					IMarker marker = createMarker(map, AUTOMAKE_ERROR_MARKER_ID); // ICModelMarker.C_MODEL_PROBLEM_MARKER);
+
+					MarkerAnnotation annotation = new MarkerAnnotation(marker);
+					Position p = new Position(charStart.intValue(),charEnd.intValue() - charStart.intValue());
+					fAnnotationModel.addAnnotation(annotation, p);
+				} catch (CoreException ce) {
+					// do nothing
+				}
+			}
+		}
+		return;
+	}
+	
+	public void removeExistingMarkers()
+	{
+		fAnnotationModel.removeAllAnnotations();
+	}
+	
+	
+	private Integer getCharOffset(int lineNumber, int columnNumber)
+	{
+		try
+		{
+			return new Integer(document.getLineOffset(lineNumber) + columnNumber);
+		}
+		catch (BadLocationException e)
+		{
+			e.printStackTrace();
+			return null;
+		}
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeIfElse.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeIfElse.java
new file mode 100644
index 0000000..a0b7abe
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeIfElse.java
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+
+public class AutomakeIfElse extends Parent {
+	String condition;
+	int startLine;
+	int endLine;
+	String type;
+	public AutomakeIfElse(Directive parent, String type, String condition) {
+		super(parent);
+		this.type = type;
+		this.condition = condition;
+	}
+	public String getCondition() {
+		return condition;
+	}
+	public void setCondition(String condition) {
+		this.condition = condition;
+	}
+	public void setLines(int startLine, int endLine) {
+		this.startLine = startLine;
+		this.endLine = endLine;
+	}
+	public String getType() {
+		return type;
+	}
+	public void setType(String type) {
+		this.type = type;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeMacroDefinitionRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeMacroDefinitionRule.java
new file mode 100644
index 0000000..e4ef44d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeMacroDefinitionRule.java
@@ -0,0 +1,206 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - Modified from MacroDefinitionRule to support Automake files
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IPredicateRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.Token;
+
+class AutomakeMacroDefinitionRule implements IPredicateRule {
+	private static final int INIT_STATE = 0;
+	private static final int VAR_STATE = 1;
+	private static final int END_VAR_STATE = 2;
+	private static final int EQUAL_STATE = 3;
+	private static final int FINISH_STATE = 4;
+	private static final int ERROR_STATE = 5;
+
+	private IToken token;
+	private StringBuffer buffer = new StringBuffer();
+	protected IToken defaultToken;
+	
+	public AutomakeMacroDefinitionRule(IToken token, IToken defaultToken) {
+		this.token = token;
+		this.defaultToken = defaultToken;
+	}
+
+	public IToken getSuccessToken() {
+		return token;
+	}
+
+	public IToken evaluate(ICharacterScanner scanner, boolean resume) {
+		buffer.setLength(0);
+		int c;
+		int state = INIT_STATE;
+
+		if (resume)
+			scanToBeginOfLine(scanner);
+
+		for (c = scanner.read(); c != ICharacterScanner.EOF; c = scanner.read()) {
+			switch (state) {
+				case INIT_STATE :
+					if (c != '\n' && Character.isWhitespace((char) c)) {
+						break;
+					}
+					if (isValidCharacter(c)) {
+						state = VAR_STATE;
+					} else {
+						state = ERROR_STATE;
+					}
+					break;
+				case VAR_STATE :
+					if (isValidCharacter(c)) {
+						break;
+					}
+				case END_VAR_STATE :
+					if (Character.isWhitespace((char) c)) {
+						state = END_VAR_STATE;
+					} else if (c == ':' || c == '+') {
+						state = EQUAL_STATE;
+					} else if (c == '=') {
+						state = FINISH_STATE;
+					} else {
+//						if (state == END_VAR_STATE) {
+//							scanner.unread(); // Return back to the space
+//						}
+						state = ERROR_STATE;
+					}
+					break;
+				case EQUAL_STATE :
+					if (c == '=') {
+						state = FINISH_STATE;
+					} else {
+						state = ERROR_STATE;
+					}
+					break;
+				case FINISH_STATE :
+					break;
+				default :
+					break;
+			}
+			if (state >= FINISH_STATE) {
+				break;
+			}
+			buffer.append((char) c);
+		}
+
+		if (state == FINISH_STATE) {
+			scanToEndOfLine(scanner);
+			return token;
+		}
+
+        boolean debug = true;
+        if (debug) {
+//        	System.out.println("This should be a 'c':  " + peek(scanner));
+//                System.out.println("This is what's in the **REST OF** the buffer:");
+//                int count = 0;
+//                for (int c = scanner.read(); c != ICharacterScanner.EOF; c = scanner.read()) {
+//                        System.out.println((char) c);
+//                        count++;
+//                }
+//                // Unread what we just displayed
+//                for (int i = 0; i < count; i++) {
+//                        scanner.unread();
+//                }
+        }
+		
+		if (defaultToken.isUndefined()) {
+			// If c is EOF, we've read it and broken out of the for loop above,
+			// but we need to unread it since it got read but not put into the
+			// buffer
+			if (state == ERROR_STATE || c == ICharacterScanner.EOF)
+				scanner.unread();
+			unreadBuffer(scanner);
+            debug = true;
+            if (debug) {
+//            	System.out.println("This should be an 'i':  " + peek(scanner));
+//                    System.out.println("We've supposedly just unread the entire buffer.  Here it is:");
+//                    int count = 0;
+//                    for (int c = scanner.read(); c != ICharacterScanner.EOF; c = scanner.read()) {
+//                            System.out.println((char) c);
+//                            count++;
+//                    }
+//                    // Unread what we just displayed
+//                    for (int i = 0; i < count + 1; i++) {
+//                            scanner.unread();
+//                    }
+//                    System.out.println("... just to be safe, here's the first character:  " + peek(scanner));
+            }
+
+		}
+		
+		return Token.UNDEFINED;
+	}
+	
+	public char peek(ICharacterScanner scanner) {
+		char c = (char) scanner.read();
+		scanner.unread();
+		return c;
+	}
+
+	public IToken evaluate(ICharacterScanner scanner) {
+		return evaluate(scanner, false);
+	}
+
+	/**
+	 * Returns the characters in the buffer to the scanner.
+	 *
+	 * @param scanner the scanner to be used
+	 */
+	protected void unreadBuffer(ICharacterScanner scanner) {
+		for (int i = buffer.length() - 1; i >= 0; i--)
+			scanner.unread();
+	}
+
+	private void scanToEndOfLine(ICharacterScanner scanner) {
+		int c;
+		char[][] delimiters = scanner.getLegalLineDelimiters();
+		while ((c = scanner.read()) != ICharacterScanner.EOF) {
+			// Check for end of line since it can be used to terminate the pattern.
+			for (int i = 0; i < delimiters.length; i++) {
+				if (c == delimiters[i][0] && sequenceDetected(scanner, delimiters[i])) {
+					return;
+				}
+			}
+		}
+	}
+
+	private void scanToBeginOfLine(ICharacterScanner scanner) {
+		while(scanner.getColumn() != 0) {
+			scanner.unread();
+		}
+	}
+
+	private boolean sequenceDetected(ICharacterScanner scanner, char[] sequence) {
+		for (int i = 1; i < sequence.length; i++) {
+			int c = scanner.read();
+			if (c == ICharacterScanner.EOF) {
+				return true;
+			} else if (c != sequence[i]) {
+				// Non-matching character detected, rewind the scanner back to the start.
+				for (; i > 0; i--) {
+					scanner.unread();
+				}
+				return false;
+			}
+		}
+
+		return true;
+	}
+	protected boolean isValidCharacter(int c) {
+		char c0 = (char) c;
+		return Character.isLetterOrDigit(c0) || (c0 == '_') || (c0 == '-') || 
+		(c0 == '@') || (c0 == '+') || (c0 == '$') || (c0 == '(') || (c0 == ')');
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeMacroReferenceRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeMacroReferenceRule.java
new file mode 100644
index 0000000..678f506
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeMacroReferenceRule.java
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * Copyright (c) 2006, Red Hat, Inc.
+ * Based on MacroReferenceRule which has the following copyright notice
+ * 
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.PatternRule;
+
+public class AutomakeMacroReferenceRule extends PatternRule {
+
+	int nOfBrackets;
+	int fBracket;
+
+//	public MacroReferenceRule(IToken token) {
+//		super("$(", ")", token, (char) 0, true); //$NON-NLS-1$ //$NON-NLS-2$
+//	}
+
+	public AutomakeMacroReferenceRule(IToken token, String startSeq, String endSeq) {
+		super(startSeq, endSeq, token, (char)0, true);
+		if (endSeq.length() > 0 && endSeq.charAt(0) == '}') {
+			fBracket = '{';
+		} else {
+			fBracket = '(';
+		}
+	}
+	
+	protected IToken doEvaluate(ICharacterScanner scanner, boolean resume) {
+		nOfBrackets = 1;
+		return super.doEvaluate(scanner, resume);
+	}
+
+	protected boolean endSequenceDetected(ICharacterScanner scanner) {
+		int c;
+		char[][] delimiters = scanner.getLegalLineDelimiters();
+		while ((c = scanner.read()) != ICharacterScanner.EOF) {
+			if (fBracket == c) {
+				++nOfBrackets;
+			}
+			if (fEndSequence.length > 0 && c == fEndSequence[0]) {
+				// Check if the specified end sequence has been found.
+				if (sequenceDetected(scanner, fEndSequence, true)) {
+					if (0 == --nOfBrackets) {
+						return true;
+					}
+				}
+			} else if (fBreaksOnEOL) {
+				// Check for end of line since it can be used to terminate the pattern.
+				for (int i = 0; i < delimiters.length; i++) {
+					if (c == delimiters[i][0] && sequenceDetected(scanner, delimiters[i], false)) {
+						return true;
+					}
+				}
+			}
+		}
+		scanner.unread();
+		return false;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeTextHover.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeTextHover.java
new file mode 100644
index 0000000..483f630
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeTextHover.java
@@ -0,0 +1,187 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.IMacroDefinition;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IInformationControlCreator;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextHover;
+import org.eclipse.jface.text.ITextHoverExtension;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.Region;
+import org.eclipse.swt.graphics.Point;
+
+
+public class AutomakeTextHover implements ITextHover, ITextHoverExtension {
+
+	AutomakeEditor editor;
+	
+	public AutomakeTextHover(AutomakeEditor editor) {
+		this.editor = editor;
+	}
+	
+	public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
+		TargetRule target = null;
+		String[] preReqs = null;
+		
+		if (hoverRegion == null || hoverRegion.getLength() == 0)
+			return null;
+		Automakefile makefile = (Automakefile) editor.getMakefile();
+		if (makefile == null)
+			return null;
+		
+		String hoverText;
+		int hoverLine;
+		try {
+			hoverText = textViewer.getDocument().get(hoverRegion.getOffset(), hoverRegion.getLength());
+			hoverLine = textViewer.getDocument().getLineOfOffset(hoverRegion.getOffset());
+		} catch (BadLocationException e) {
+			return null;
+		}
+		
+		// Automatic variables
+		if (hoverText.startsWith("$")) {
+			IDirective containingDirective = makefile.getDirectiveContainingLine(hoverLine);
+			if (containingDirective instanceof TargetRule) {
+				target = (TargetRule) containingDirective;
+			}
+			if (target == null)
+				return "";
+			switch (hoverText.charAt(1)) {
+			case '@':
+				return target.getTarget().toString();
+			case '<':
+				preReqs = target.getPrerequisites();
+				if (preReqs != null && preReqs.length > 0)
+					return preReqs[0];
+				break;
+			// FIXME:  implement $* ?
+//			case '*':
+//				break;
+			case '?':
+				preReqs = target.getPrerequisites();
+				if (preReqs != null && preReqs.length > 0) {
+					String toReturn = "";
+					toReturn = preReqs[0];
+					for (int i = 1; i < preReqs.length; i++) {
+						toReturn += " " + preReqs[i];
+					}
+					return toReturn;
+				}
+				break;
+			case '%':
+//				if (target instanceOf ArchiveTarget) {
+//					return target.getMember();
+//				} else {
+//					error;
+//				}
+//				break;
+			default:
+				break;
+			}
+		} else {
+			// Macros
+			IMacroDefinition[] macroDefinitions = makefile.getMacroDefinitions(hoverText);
+			for (int i = 0; i < macroDefinitions.length; i++) {
+				IMacroDefinition definition = macroDefinitions[i];
+				if (definition.getName().equals(hoverText))
+					return definition.getValue().toString();
+			}
+		}
+		
+//		IRule[] rules = makefile.getRules();
+//		for (int i = 0; i < rules.length; i++) {
+//			rule = rules[i];
+//			System.out.println("rule:  " + rule);
+//			System.out.println("target:  " + rule.getTarget());
+//			ICommand[] commands = rule.getCommands();
+//			for (int j = 0; j < commands.length; j++) {
+//				ICommand command = commands[j];
+//				System.out.println("command:  " + command);
+//			}
+//		}
+		return "";
+	}
+
+	public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
+		
+		if (textViewer != null) {
+			/*
+			 * If the hover offset falls within the selection range return the
+			 * region for the whole selection.
+			 */
+			Point selectedRange = textViewer.getSelectedRange();
+			if (selectedRange.x >= 0 && selectedRange.y > 0
+					&& offset >= selectedRange.x
+					&& offset <= selectedRange.x + selectedRange.y)
+				return new Region(selectedRange.x, selectedRange.y);
+			else {
+				return findWord(textViewer.getDocument(), offset);
+			}
+		}
+		return null;
+	}
+
+	private IRegion findWord(IDocument document, int offset) {
+		int start = -1;
+		int end = -1;
+
+		try {
+			int pos = offset;
+			char c;
+
+			while (pos >= 0) {
+				c = document.getChar(pos);
+				if (!Character.isJavaIdentifierPart(c) &&
+						(c != '@') && (c != '<') && (c != '*') && (c != '?') && (c != '%'))
+					break;
+				--pos;
+			}
+
+			start = pos;
+
+			pos = offset;
+			int length = document.getLength();
+
+			while (pos < length) {
+				c = document.getChar(pos);
+				if (!Character.isJavaIdentifierPart(c) &&
+						(c != '@') && (c != '<') && (c != '*') && (c != '?') && (c != '%'))
+					break;
+				++pos;
+			}
+
+			end = pos;
+
+		} catch (BadLocationException x) {
+		}
+
+		if (start > -1 && end > -1) {
+			if (start == offset && end == offset)
+				return new Region(offset, 0);
+			else if (start == offset)
+				return new Region(start, end - start);
+			else
+				return new Region(start + 1, end - start - 1);
+		}
+
+		return null;
+	}
+
+	public IInformationControlCreator getHoverControlCreator() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeWordDetector.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeWordDetector.java
new file mode 100644
index 0000000..941e7d4
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakeWordDetector.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.jface.text.rules.IWordDetector;
+
+public class AutomakeWordDetector implements IWordDetector {
+	
+	private static final String correctStartSpecChars = "$%*().><"; //$NON-NLS-1$
+	private static final String correctSpecChars = "?@$/\\<*%"; //$NON-NLS-1$
+	
+	public boolean isWordStart(char character) {
+		return Character.isLetterOrDigit(character) || (correctStartSpecChars.indexOf(character) >= 0);
+	}
+
+	public boolean isWordPart(char character) {
+		return Character.isLetterOrDigit(character) || (correctSpecChars.indexOf(character) >= 0);
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Automakefile.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Automakefile.java
new file mode 100644
index 0000000..2879c5b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Automakefile.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - Modified from PosixMakeFile to support Automake files
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.IOException;
+import org.eclipse.cdt.make.core.makefile.IDirective;
+
+
+public class Automakefile extends GNUAutomakefile {
+
+	public Automakefile() {
+		super();
+	}
+
+	protected IDirective getDirectiveContainingLine(int line) {
+		int startLine, endLine;
+		IDirective[] directives = this.getDirectives();
+		for (int i = 0; i < directives.length; i++) {
+			IDirective directive = directives[i];
+			startLine = directive.getStartLine();
+			endLine = directive.getEndLine();
+			if (startLine <= line && endLine >= line)
+				return directive;
+		}
+		return null;
+	}
+	
+	public static void main(String[] args) {
+		try {
+			String filename = "Makefile.am"; //$NON-NLS-1$
+			if (args.length == 1) {
+				filename = args[0];
+			}
+			Automakefile makefile = new Automakefile();
+			makefile.parse(filename);
+			IDirective[] directives = makefile.getDirectives();
+			//IDirective[] directives = makefile.getBuiltins();
+			for (int i = 0; i < directives.length; i++) {
+				//System.out.println("Rule[" + i +"]");
+				System.out.print(directives[i]);
+			}
+		} catch (IOException e) {
+			System.out.println(e);
+		}
+	}
+	
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileCodeScanner.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileCodeScanner.java
new file mode 100644
index 0000000..7bd336b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileCodeScanner.java
@@ -0,0 +1,150 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - Modified from MakefileCodeScanner to support Automake files
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jface.text.rules.EndOfLineRule;
+import org.eclipse.jface.text.rules.IPredicateRule;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.IWhitespaceDetector;
+import org.eclipse.jface.text.rules.MultiLineRule;
+import org.eclipse.jface.text.rules.SingleLineRule;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.jface.text.rules.WhitespaceRule;
+import org.eclipse.jface.text.rules.WordRule;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.AutoconfIdentifierRule;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.AutoconfWhitespaceDetector;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.ColorManager;
+
+
+public class AutomakefileCodeScanner extends AbstractMakefileCodeScanner {
+
+
+	private final static String[] keywords = { "define", "endef", "ifdef", "ifndef", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		"ifeq", "ifneq", "else", "endif", "include", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+		"-include", "sinclude", "override", "endef", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		"export", "unexport", "vpath", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		"if", "@if", "@endif" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+	private final static String[] functions = { "subst", "patsubst", "strip", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		"findstring", "filter", "sort", "dir", "notdir", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+		"suffix", "basename", "addsuffix", "addprefix", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		"join", "word", "words", "wordlist", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		"firstword", "wildcard", "error", "warning", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		"shell", "origin", "foreach", "call" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+	};
+	
+	private final static String[] automaticVariables = { "$<" , "$*" , "$@" , "$?" , "$%"
+	};
+
+	public static final String[] fTokenProperties = new String[] {
+			ColorManager.MAKE_COMMENT_COLOR,
+			ColorManager.MAKE_KEYWORD_COLOR,
+			ColorManager.MAKE_FUNCTION_COLOR,
+			ColorManager.MAKE_MACRO_REF_COLOR,
+			ColorManager.MAKE_MACRO_DEF_COLOR,
+			ColorManager.MAKE_DEFAULT_COLOR
+	};
+
+	/**
+	 * Constructor for AutomakefileCodeScanner
+	 */
+	public AutomakefileCodeScanner() {
+		super();
+		initialize();
+	}
+	
+	protected List<IRule> createRules() {
+		IToken keyword = getToken(ColorManager.MAKE_KEYWORD_COLOR);
+		IToken function = getToken(ColorManager.MAKE_FUNCTION_COLOR);
+		IToken comment = getToken(ColorManager.MAKE_COMMENT_COLOR);
+		IToken macroRef = getToken(ColorManager.MAKE_MACRO_REF_COLOR);
+		IToken macroDef = getToken(ColorManager.MAKE_MACRO_DEF_COLOR);
+		IToken other = getToken(ColorManager.MAKE_DEFAULT_COLOR);
+
+		List<IRule> rules = new ArrayList<IRule>();
+
+		// Add rule for single line comments.
+		rules.add(new EndOfLineRule("#", comment, '\\', true)); //$NON-NLS-1$
+
+		// Add generic whitespace rule.
+		rules.add(new WhitespaceRule(new IWhitespaceDetector() {
+			public boolean isWhitespace(char character) {
+				return Character.isWhitespace(character);
+			}
+		}));
+		
+		// Put before the the word rules
+		MultiLineRule defineRule = new MultiLineRule("define", "endef", macroDef); //$NON-NLS-1$ //$NON-NLS-2$
+		defineRule.setColumnConstraint(0);
+		rules.add(defineRule);
+		
+		rules.add(new AutomakeMacroDefinitionRule(macroDef, Token.UNDEFINED));
+		
+		// @AC_SUBST_VAR@
+		IPredicateRule substVarRule = new AutoconfSubstRule(macroRef);
+		rules.add(substVarRule);
+
+		// Add word rule for keywords, types, and constants.
+		// We restring the detection of the keywords to be the first column to be valid.
+		WordRule keyWordRule = new WordRule(new MakefileWordDetector(), Token.UNDEFINED);
+		for (int i = 0; i < keywords.length; i++) {
+			keyWordRule.addWord(keywords[i], keyword);
+		}
+		keyWordRule.setColumnConstraint(0);
+		rules.add(keyWordRule);
+
+
+		WordRule functionRule = new WordRule(new MakefileWordDetector(), Token.UNDEFINED);
+		for (int i = 0; i < functions.length; i++)
+			functionRule.addWord(functions[i], function);
+		rules.add(functionRule);
+		
+		WordRule automaticVarRule = new WordRule(new AutomakeWordDetector(), Token.UNDEFINED);
+		for (int i = 0; i < automaticVariables.length; i++)
+			automaticVarRule.addWord(automaticVariables[i], keyword);
+		rules.add(automaticVarRule);
+
+//		rules.add(new SingleLineRule("$(", ")", macroRef)); //$NON-NLS-1$ //$NON-NLS-2$
+//		rules.add(new SingleLineRule("${", "}", macroRef)); //$NON-NLS-1$ //$NON-NLS-2$
+		rules.add(new AutomakeMacroReferenceRule(macroRef, "$(", ")")); //$NON-NLS-1$ //$NON-NLS-2$
+		rules.add(new AutomakeMacroReferenceRule(macroRef, "${", "}")); //$NON-NLS-1$ //$NON-NLS-2$
+		// Add word rule for identifier.
+
+		rules.add(new AutoconfIdentifierRule(other));
+		
+		// Make sure we don't treat "\#" as comment start.
+		rules.add(new SingleLineRule("\\#", null, Token.UNDEFINED));
+		
+		rules.add(new WhitespaceRule(new AutoconfWhitespaceDetector()));
+
+		setDefaultReturnToken(other);
+
+		return rules;
+	}
+
+	public IToken nextToken() {
+		return super.nextToken();
+	}
+	
+	/*
+	 * @see AbstractMakefileCodeScanner#getTokenProperties()
+	 */
+	protected String[] getTokenProperties() {
+		return fTokenProperties;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileContentOutlinePage.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileContentOutlinePage.java
new file mode 100644
index 0000000..4c1fcac
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileContentOutlinePage.java
@@ -0,0 +1,322 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - Modified from MakefileContentOutlinePage for Automake files
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.cdt.make.core.makefile.IBadDirective;
+import org.eclipse.cdt.make.core.makefile.ICommand;
+import org.eclipse.cdt.make.core.makefile.IComment;
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.IEmptyLine;
+import org.eclipse.cdt.make.core.makefile.IInferenceRule;
+import org.eclipse.cdt.make.core.makefile.IMacroDefinition;
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.core.makefile.IParent;
+import org.eclipse.cdt.make.core.makefile.IRule;
+import org.eclipse.cdt.make.core.makefile.ITargetRule;
+import org.eclipse.cdt.make.core.makefile.gnu.IInclude;
+import org.eclipse.cdt.make.core.makefile.gnu.ITerminal;
+import org.eclipse.cdt.make.ui.IWorkingCopyManager;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.MakeUIImages;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+
+
+public class AutomakefileContentOutlinePage extends ContentOutlinePage implements IContentOutlinePage {
+	
+	protected IMakefile makefile;
+	protected IMakefile nullMakefile = new NullMakefile();
+
+	private class AutomakefileContentProvider implements ITreeContentProvider {
+
+		protected boolean showMacroDefinition = true;
+		protected boolean showTargetRule = true;
+		protected boolean showInferenceRule = true;
+		protected boolean showIncludeChildren = false;
+
+		protected IMakefile makefile;
+		protected IMakefile nullMakefile = new NullMakefile();
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
+		 */
+		public Object[] getChildren(Object element) {
+			if (element == fInput) {
+				return getElements(makefile);
+			} else if (element instanceof IDirective) {
+				return getElements(element);
+			}
+			return new Object[0];
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
+		 */
+		public Object getParent(Object element) {
+			if (element instanceof IMakefile) {
+				return fInput;
+			} else if (element instanceof IDirective) {
+				return ((IDirective)element).getParent();
+			}
+			return fInput;
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
+		 */
+		public boolean hasChildren(Object element) {
+			if (element == fInput) {
+				return true;
+			} else if (element instanceof IParent) {
+				// Do not drill down in includes.
+				if (element instanceof IInclude && !showIncludeChildren) {
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
+		 */
+		public Object[] getElements(Object inputElement) {
+			IDirective[] directives;
+			if (inputElement == fInput) {
+				directives = makefile.getDirectives();
+			} else if (inputElement instanceof IRule) {
+				directives = ((IRule)inputElement).getCommands();
+			} else if (inputElement instanceof IParent) {
+				if (inputElement instanceof IInclude && !showIncludeChildren) {
+					directives = new IDirective[0];
+				} else {
+					directives = ((IParent)inputElement).getDirectives();
+				}
+			} else {
+				directives = new IDirective[0];
+			}
+			List<IDirective> list = new ArrayList<IDirective>(directives.length);
+			for (int i = 0; i < directives.length; i++) {
+				if (showMacroDefinition && directives[i] instanceof IMacroDefinition) {
+					list.add(directives[i]);
+				} else if (showInferenceRule && directives[i] instanceof IInferenceRule) {
+					list.add(directives[i]);
+				} else if (showTargetRule && directives[i] instanceof ITargetRule) {
+					list.add(directives[i]);
+				} else if (showTargetRule && directives[i] instanceof AutomakeIfElse) {
+					list.add(directives[i]);
+				} else {
+					boolean irrelevant = (directives[i] instanceof IComment ||
+							directives[i] instanceof IEmptyLine ||
+							directives[i] instanceof ITerminal); 
+					if (!irrelevant) {
+						list.add(directives[i]);
+					}
+				}
+			}
+			return list.toArray();
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
+		 */
+		public void dispose() {
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+		 */
+		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+			if (oldInput != null) {
+				makefile = nullMakefile;
+			}
+
+			if (newInput != null) {
+				IWorkingCopyManager manager= AutomakeEditorFactory.getDefault().getWorkingCopyManager();
+				makefile = manager.getWorkingCopy((IEditorInput) newInput);
+				if (makefile == null) {
+					makefile = nullMakefile;
+				}
+			}
+		}
+	}
+
+	private class AutomakefileLabelProvider extends LabelProvider implements ILabelProvider {
+
+		/* (non-Javadoc)
+		* @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
+		*/
+		public Image getImage(Object element) {
+			if (element instanceof ITargetRule) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_TARGET_RULE);
+			} else if (element instanceof IInferenceRule) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_INFERENCE_RULE);
+			} else if (element instanceof IMacroDefinition) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_MACRO);
+			} else if (element instanceof IAutomakeConditional) {
+				// Must process this before ICommand because if/else are also ICommands
+				return super.getImage(element);
+			} else if (element instanceof ICommand) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_COMMAND);
+			} else if (element instanceof IInclude) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_INCLUDE);
+			} else if (element instanceof IBadDirective) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_ERROR);
+			} else if (element instanceof AutomakeConfigMacro) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_ACMACRO);
+			}
+
+			return super.getImage(element);
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
+		 */
+		public String getText(Object element) {
+			String name;
+			if (element instanceof IRule) {
+				name = ((IRule) element).getTarget().toString().trim();
+			} else if (element instanceof IMacroDefinition) {
+				name = ((IMacroDefinition) element).getName().trim();
+			} else if (element instanceof AutomakeIfElse) {
+				AutomakeIfElse ifelse = (AutomakeIfElse) element;
+				// FIXME:  make this not a string comparison
+				if (ifelse.getType().equals("if")) {
+					name = "if " + ifelse.getCondition();
+				} else
+					name = "else";
+			} else if (element instanceof AutomakeConfigMacro) {
+				AutomakeConfigMacro macro = (AutomakeConfigMacro)element;
+				name = macro.getName();
+			} else {
+				name = super.getText(element);
+			}
+			if (name != null) {
+				name = name.trim();
+				if (name.length() > 25) {
+					name = name.substring(0, 25) + " ..."; //$NON-NLS-1$
+				}
+			}
+			return name;
+		}
+
+	}
+	
+	protected AutomakeEditor fEditor;
+	protected Object fInput;
+	
+	public AutomakefileContentOutlinePage(AutomakeEditor editor) {
+		super();
+		fEditor = editor;
+	}
+	
+	/**
+	 * Sets the input of the outline page
+	 */
+	public void setInput(Object input) {
+		fInput = input;
+		update();
+	}
+	
+	/**
+	 * Updates the outline page.
+	 */
+	public void update() {
+		final TreeViewer viewer = getTreeViewer();
+
+		if (viewer != null) {
+			final Control control = viewer.getControl();
+			if (control != null && !control.isDisposed()) {
+				control.getDisplay().asyncExec(new Runnable() {
+					public void run() {
+						if (!control.isDisposed()) {
+							control.setRedraw(false);
+							viewer.setInput(fInput);
+							viewer.expandAll();
+							control.setRedraw(true);
+						}
+					}
+				});
+			}
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.part.IPage#createControl(org.eclipse.swt.widgets.Composite)
+	 */
+	public void createControl(Composite parent) {
+		super.createControl(parent);
+		TreeViewer viewer = getTreeViewer();
+		viewer.setContentProvider(new AutomakefileContentProvider());
+		viewer.setLabelProvider(new AutomakefileLabelProvider());
+		if (fInput != null) {
+			viewer.setInput(fInput);
+		}
+
+//		MenuManager manager= new MenuManager("#MakefileOutlinerContext"); //$NON-NLS-1$
+//		manager.setRemoveAllWhenShown(true);
+//		manager.addMenuListener(new IMenuListener() {
+//			public void menuAboutToShow(IMenuManager m) {
+//				contextMenuAboutToShow(m);
+//			}
+//		});
+//		Control tree = viewer.getControl();
+//		Menu menu = manager.createContextMenu(tree);
+//		tree.setMenu(menu);
+//
+//		viewer.addDoubleClickListener(new IDoubleClickListener() {
+//			/* (non-Javadoc)
+//			 * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)
+//			 */
+//			public void doubleClick(DoubleClickEvent event) {
+//				if (fOpenIncludeAction != null) {
+//					fOpenIncludeAction.run();
+//				}
+//			}
+//		});
+//
+//		IPageSite site= getSite();
+//		site.registerContextMenu(MakeUIPlugin.getPluginId() + ".outline", manager, viewer); //$NON-NLS-1$
+//		site.setSelectionProvider(viewer);
+
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+	 */
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		if (oldInput != null) {
+			makefile = nullMakefile;
+		}
+
+		if (newInput != null) {
+			IWorkingCopyManager manager= AutomakeEditorFactory.getDefault().getWorkingCopyManager();
+			makefile = manager.getWorkingCopy((IEditorInput)newInput);
+			if (makefile == null) {
+				makefile = nullMakefile;
+			}
+		}
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileReconcilingStrategy.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileReconcilingStrategy.java
new file mode 100644
index 0000000..7cae0e2
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileReconcilingStrategy.java
@@ -0,0 +1,108 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - Modified from MakefileReconcilingStrategy for Automake files
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.IOException;
+import java.io.StringReader;
+
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.ui.IWorkingCopyManager;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.reconciler.DirtyRegion;
+import org.eclipse.jface.text.reconciler.IReconcilingStrategy;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+import org.eclipse.ui.texteditor.ITextEditor;
+
+
+public class AutomakefileReconcilingStrategy implements IReconcilingStrategy {
+
+	private int fLastRegionOffset;
+	private ITextEditor fEditor;	
+	private IWorkingCopyManager fManager;
+	private IDocumentProvider fDocumentProvider;
+	private AutomakefileContentOutlinePage fOutliner;
+	private IReconcilingParticipant fMakefileReconcilingParticipant;
+	private AutomakeErrorHandler fErrorHandler;
+	private IEditorInput input;
+	
+	public AutomakefileReconcilingStrategy(AutomakeEditor editor) {
+		fOutliner= editor.getAutomakeOutlinePage();
+		fLastRegionOffset = Integer.MAX_VALUE;
+		fEditor= editor;
+		input = (IEditorInput) fEditor.getEditorInput();
+		fManager= AutomakeEditorFactory.getDefault().getWorkingCopyManager();
+		fDocumentProvider= AutomakeEditorFactory.getDefault().getAutomakefileDocumentProvider();
+		fErrorHandler= new AutomakeErrorHandler(fDocumentProvider.getDocument(input));
+		if (fEditor instanceof IReconcilingParticipant) {
+			fMakefileReconcilingParticipant= (IReconcilingParticipant)fEditor;
+		}
+	}
+	
+	/**
+	 * @see IReconcilingStrategy#reconcile(document)
+	 */
+	public void setDocument(IDocument document) {
+	}	
+
+
+	/**
+	 * @see IReconcilingStrategy#reconcile(region)
+	 */
+	public void reconcile(IRegion region) {
+		// We use a trick to avoid running the reconciler multiple times
+		// on a file when it gets changed. This is because this gets called
+		// multiple times with different regions of the file, we do a 
+		// complete parse on the first region.
+		if(region.getOffset() <= fLastRegionOffset) {
+			reconcile();
+		}
+		fLastRegionOffset = region.getOffset();
+	}
+
+	/**
+	 * @see IReconcilingStrategy#reconcile(dirtyRegion, region)
+	 */
+	public void reconcile(DirtyRegion dirtyRegion, IRegion region) {
+		// FIXME: This seems to generate too much flashing in
+		// the contentoutline viewer.
+		//reconcile();
+	}
+	
+	private void reconcile() {
+		try {
+			IMakefile makefile = fManager.getWorkingCopy(fEditor.getEditorInput());
+			if (makefile != null) {
+				String content = fDocumentProvider.getDocument(input).get();
+				StringReader reader = new StringReader(content);
+				try {
+					makefile.parse(makefile.getFileURI(), reader);
+				} catch (IOException e) {
+				}
+				
+				fOutliner.update();
+				fErrorHandler.update(makefile);
+			}
+		} finally {
+			try {
+				if (fMakefileReconcilingParticipant != null) {
+					fMakefileReconcilingParticipant.reconciled();
+				}
+			} finally {
+				//
+			}
+		}
+ 	}	
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileSourceConfiguration.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileSourceConfiguration.java
new file mode 100644
index 0000000..acffc5e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileSourceConfiguration.java
@@ -0,0 +1,148 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - Modified from MakefileSourceConfiguration to support Automake
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITextHover;
+import org.eclipse.jface.text.contentassist.ContentAssistant;
+import org.eclipse.jface.text.contentassist.IContentAssistant;
+import org.eclipse.jface.text.presentation.IPresentationReconciler;
+import org.eclipse.jface.text.presentation.PresentationReconciler;
+import org.eclipse.jface.text.reconciler.IReconciler;
+import org.eclipse.jface.text.reconciler.MonoReconciler;
+import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.SourceViewerConfiguration;
+import org.eclipse.jface.util.PropertyChangeEvent;
+
+
+public class AutomakefileSourceConfiguration extends
+		MakefileSourceConfiguration {
+	
+	AutomakeEditor editor;
+	AutomakefileCodeScanner codeScanner;
+	AutomakeTextHover amHover;
+	
+	/**
+	 * Constructor for MakeConfiguration
+	 */
+	public AutomakefileSourceConfiguration(IPreferenceStore preferenceStore) {
+		super(preferenceStore, null);
+	}
+	
+	public AutomakefileSourceConfiguration(IPreferenceStore preferenceStore, AutomakeEditor editor) {
+		super(preferenceStore, editor);
+		this.editor = editor;
+	}
+	
+	public AutomakefileCodeScanner getAutomakeCodeScanner() {
+		if (null == codeScanner)
+			codeScanner = new AutomakefileCodeScanner();
+		return codeScanner;
+
+	}
+	
+	public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) {
+		if (amHover == null)
+			amHover = new AutomakeTextHover(editor);
+		return amHover;
+	}
+	
+	/**
+	 * @param event
+	 */
+	public void adaptToPreferenceChange(PropertyChangeEvent event) {
+		AutomakefileCodeScanner scanner = getAutomakeCodeScanner();
+		scanner.adaptToPreferenceChange(event);
+	}
+	
+	/**
+	 * @param event
+	 * @return
+	 */
+	public boolean affectsBehavior(PropertyChangeEvent event) {
+		AutomakefileCodeScanner scanner = getAutomakeCodeScanner();
+		return scanner.affectsBehavior(event);
+	}
+	
+	public IPresentationReconciler getPresentationReconciler(ISourceViewer v) {
+
+		PresentationReconciler reconciler = new PresentationReconciler();
+
+		DefaultDamagerRepairer dr = new DefaultDamagerRepairer(getAutomakeCodeScanner());
+		reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
+		reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
+
+		dr = new DefaultDamagerRepairer(getAutomakeCodeScanner());
+		reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_COMMENT_PARTITION);
+		reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_COMMENT_PARTITION);
+
+		dr = new DefaultDamagerRepairer(getAutomakeCodeScanner());
+		reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_MACRO_ASSIGNEMENT_PARTITION);
+		reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_MACRO_ASSIGNEMENT_PARTITION);
+
+		dr = new DefaultDamagerRepairer(getAutomakeCodeScanner());
+		reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_INCLUDE_BLOCK_PARTITION);
+		reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_INCLUDE_BLOCK_PARTITION);
+
+		dr = new DefaultDamagerRepairer(getAutomakeCodeScanner());
+		reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_IF_BLOCK_PARTITION);
+		reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_IF_BLOCK_PARTITION);
+
+		dr = new DefaultDamagerRepairer(getAutomakeCodeScanner());
+		reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_DEF_BLOCK_PARTITION);
+		reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_DEF_BLOCK_PARTITION);
+
+		dr = new DefaultDamagerRepairer(getAutomakeCodeScanner());
+		reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_OTHER_PARTITION);
+		reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_OTHER_PARTITION);
+		return reconciler;
+	}
+
+	
+	/**
+	 * @see SourceViewerConfiguration#getReconciler(ISourceViewer)
+	 */
+	public IReconciler getReconciler(ISourceViewer sourceViewer) {
+		if (editor != null && editor.isEditable()) {
+			MonoReconciler reconciler= new MonoReconciler(new AutomakefileReconcilingStrategy(editor), false);
+			reconciler.setDelay(1000);
+			reconciler.setProgressMonitor(new NullProgressMonitor());
+			return reconciler;
+		}
+		return null;
+	}
+	
+	/**
+	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getContentAssistant(ISourceViewer)
+	 */
+	public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
+		ContentAssistant assistant = new ContentAssistant();
+		assistant.setContentAssistProcessor(new AutomakeCompletionProcessor(editor), IDocument.DEFAULT_CONTENT_TYPE);
+		assistant.setContentAssistProcessor(new AutomakeCompletionProcessor(editor), MakefilePartitionScanner.MAKEFILE_COMMENT_PARTITION);
+		assistant.setContentAssistProcessor(new AutomakeCompletionProcessor(editor), MakefilePartitionScanner.MAKEFILE_DEF_BLOCK_PARTITION);
+		assistant.setContentAssistProcessor(new AutomakeCompletionProcessor(editor), MakefilePartitionScanner.MAKEFILE_IF_BLOCK_PARTITION);
+		assistant.setContentAssistProcessor(new AutomakeCompletionProcessor(editor), MakefilePartitionScanner.MAKEFILE_INCLUDE_BLOCK_PARTITION);
+		assistant.setContentAssistProcessor(new AutomakeCompletionProcessor(editor), MakefilePartitionScanner.MAKEFILE_MACRO_ASSIGNEMENT_PARTITION);
+
+		assistant.enableAutoActivation(true);
+		assistant.setAutoActivationDelay(500);
+
+		assistant.setProposalPopupOrientation(IContentAssistant.CONTEXT_INFO_BELOW);
+		assistant.setContextInformationPopupOrientation(IContentAssistant.CONTEXT_INFO_BELOW);
+
+		return assistant;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileUtil.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileUtil.java
new file mode 100644
index 0000000..1cc1f62
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/AutomakefileUtil.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007, 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+public class AutomakefileUtil {
+
+	// Look for Automake conditionals which optionally
+	// activate or disable a Makefile rule command.
+	public static boolean isAutomakeCommand(String line) {
+		return line.matches("^@[a-z_A-Z0-9]+@\\t.*$"); //$NON-NLS-1$
+	}
+	
+	public static boolean isIfBlock(String line) {
+		return line.startsWith("if"); //$NON-NLS-1$
+	}
+
+	public static boolean isElseBlock(String line) {
+		return line.startsWith("else"); //$NON-NLS-1$
+	}
+	
+	public static boolean isElseIfBlock(String line) {
+		return line.startsWith("else if"); //$NON-NLS-1$
+	}
+
+	public static boolean isEndifBlock(String line) {
+		return line.startsWith("endif"); //$NON-NLS-1$
+	}
+	
+	public static boolean isConfigMacro(String line) {
+		return line.matches("\\s*@[a-z_A-Z0-9]+@"); //$NON-NLS-1$
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/BadDirective.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/BadDirective.java
new file mode 100644
index 0000000..2186b49
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/BadDirective.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IBadDirective;
+
+public class BadDirective extends Directive implements IBadDirective {
+
+	String line;
+
+	public BadDirective(Directive parent, String s) {
+		super(parent);
+		line = s;
+	}
+
+	public String toString() {
+		return line;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Command.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Command.java
new file mode 100644
index 0000000..3d76180
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Command.java
@@ -0,0 +1,115 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.eclipse.cdt.make.core.makefile.ICommand;
+
+/**
+ * Makefile : ( statement ) *
+ * statement : command | ..  
+ * command : <tab> prefix_command string <nl>
+ * prefix_command : '-' | '@' | '+'
+ */
+public class Command extends Directive implements ICommand {
+
+	final public static char NL = '\n';
+
+	String command = ""; //$NON-NLS-1$
+	char prefix = '\0';
+
+	public Command(Directive parent, String cmd) {
+		super(parent);
+		parse(cmd);
+	}
+
+	/**
+	 *   -    If the command prefix contains a hyphen, or the -i option is
+	 * present, or the special target .IGNORE has either the current
+	 * target as a prerequisite or has no prerequisites, any error
+	 * found while executing the command will be ignored.
+	 */
+	public boolean shouldIgnoreError() {
+		// Check for the prefix hyphen in the command.
+		if (getPrefix() == HYPHEN) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * @    If the command prefix contains an at sign and the
+	 * command-line -n option is not specified, or the -s option is
+	 * present, or the special target .SILENT has either the current
+	 * target as a prerequisite or has no prerequisites, the command
+	 * will not be written to standard output before it is executed.
+	 */
+	public boolean shouldBeSilent() {
+		// Check for the prefix at sign
+		if (getPrefix() == AT) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * +    If the command prefix contains a plus sign, this indicates a
+	 * command line that will be executed even if -n, -q or -t is
+	 * specified.
+	 */
+	public boolean shouldExecute() {
+		// Check for the prefix at sign
+		if (getPrefix() == PLUS) {
+			return true;
+		}
+		return false;
+	}
+
+	public String toString() {
+		StringBuffer cmd = new StringBuffer();
+		cmd.append( '\t');
+		if (getPrefix() != 0) {
+			cmd.append(getPrefix());
+		}
+		cmd.append(command).append('\n');
+		return cmd.toString();
+	}
+
+	public boolean equals(Command cmd) {
+		return cmd.toString().equals(toString());
+	}
+
+	char getPrefix() {
+		return prefix;
+	}
+
+	/**
+	* command : <tab> prefix_command string <nl>
+	*/
+	void parse(String cmd) {
+		command = cmd.trim();
+		if (command.startsWith(HYPHEN_STRING) || command.startsWith(AT_STRING) || command.startsWith(PLUS_STRING)) {
+			prefix = command.charAt(0);
+			command = command.substring(1).trim();
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.make.core.makefile.ICommand#execute(java.lang.String[], java.io.File)
+	 */
+	public Process execute(String shell, String[] envp, File dir) throws IOException {
+		String[] cmdArray = new String[] { shell, "-c", command}; //$NON-NLS-1$
+		return Runtime.getRuntime().exec(cmdArray, envp, dir);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Comment.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Comment.java
new file mode 100644
index 0000000..772105f
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Comment.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IComment;
+
+public class Comment extends Directive implements IComment {
+
+	String comment;
+
+	public Comment(Directive parent, String cmt) {
+		super(parent);
+		if (cmt.startsWith(POUND_STRING)) {
+			comment = cmt.substring(1);
+		} else {
+			comment = cmt;
+		}
+	}
+
+	public String toString() {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append(POUND_STRING).append(comment).append('\n');
+		return buffer.toString();
+	}
+
+	public boolean equals(Comment cmt) {
+		return cmt.toString().equals(toString());
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/CompletionProposalComparator.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/CompletionProposalComparator.java
new file mode 100644
index 0000000..a92415d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/CompletionProposalComparator.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+import java.util.Comparator;
+
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+
+public class CompletionProposalComparator implements Comparator<ICompletionProposal> {
+
+	/**
+	 * Constructor for CompletionProposalComparator.
+	 */
+	public CompletionProposalComparator() {
+	}
+	
+	/* (non-Javadoc)
+	 * @see Comparator#compare(Object, Object)
+	 */
+	public int compare(ICompletionProposal o1, ICompletionProposal o2) {
+		ICompletionProposal c1= (ICompletionProposal) o1;
+		ICompletionProposal c2= (ICompletionProposal) o2;
+		return c1.getDisplayString().compareToIgnoreCase(c2.getDisplayString());
+	}	
+	
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Conditional.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Conditional.java
new file mode 100644
index 0000000..90e5828
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Conditional.java
@@ -0,0 +1,170 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - modified for Automake editor usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.gnu.IConditional;
+
+
+public abstract class Conditional extends Parent implements IConditional {
+
+    private static final String EMPTY = ""; //$NON-NLS-1$
+	String cond;
+	String arg1;
+	String arg2;
+
+	public Conditional(Directive parent, String conditional) {
+		super(parent);
+		cond = conditional;
+		parse();
+	}
+
+	public Conditional(Directive parent) {
+		this(parent, EMPTY, EMPTY, EMPTY);
+	}
+
+	public Conditional(Directive parent, String conditional, String argument1, String argument2) {
+		super(parent);
+		arg1 = argument1;
+		arg2 = argument2;
+		cond = conditional;
+	}
+
+
+	public String getConditional() {
+		return cond;
+	}
+
+	public String getArg1() {
+		return arg1;
+	}
+
+	public String getArg2() {
+		return arg2;
+	}
+	
+	public boolean isIf() {
+		return false;
+	}
+
+	public boolean isIfdef() {
+		return false;
+	}
+
+	public boolean isIfndef() {
+		return false;
+	}
+
+	public boolean isIfeq() {
+		return false;
+	}
+
+	public boolean isIfneq() {
+		return false;
+	}
+
+	public boolean isElse() {
+		return false;
+	}
+
+	public boolean isEndif() {
+		return false;
+	}
+
+	/**
+	 * Formats of the conditional string.
+	 * ifeq (ARG1, ARG2)
+	 * ifeq 'ARG1' 'ARG2'
+	 * ifeq "ARG1" "ARG2"
+	 * ifeq "ARG1" 'ARG2'
+	 * ifeq 'ARG1' "ARG2"
+	 */
+	protected void parse() {
+		String line = getConditional().trim();
+
+		char terminal = line.charAt(0) == '(' ? ',' : line.charAt(0);
+ 
+		if (line.length() < 5 && terminal != ',' && terminal != '"' && terminal != '\'') {
+			arg1 = arg2 = EMPTY;
+			return;
+		}
+ 
+		// Find the end of the first string.
+		int count = 0;
+		// For the (ARG1, ARG2) format.
+
+		// get the first ARG1
+		if (terminal == ',') {
+			int paren = 0;
+			for (count = 1; count < line.length(); count++) {
+				char ch = line.charAt(count);
+				if (ch == '(') {
+					paren++;
+				} else if (ch == ')') {
+					paren--;
+				}
+				if (ch == terminal && paren <= 0) {
+					break;
+				}
+			}
+		} else {
+			for (count = 1; count < line.length(); count++) {
+				if (line.charAt(count) == terminal) {
+					break;
+				}
+			}
+		}
+
+		if (count >= line.length()) {
+			arg1 = arg2 = EMPTY;
+			return;			
+		}
+
+		arg1 = line.substring(1, count);
+ 
+		/* Find the start of the second string.  */
+		line = line.substring(count + 1).trim();
+ 
+		terminal = terminal == ',' ? ')' : line.charAt(0);
+		if (terminal != ')' && terminal != '"' && terminal != '\'') {
+			arg2 = EMPTY;
+			return;
+		}
+ 
+		count = 0;
+		/* Find the end of the second string.  */
+		if (terminal == ')') {
+			int paren = 0;
+			for (count = 0; count < line.length(); count++) {
+				char ch = line.charAt(count);
+				if (ch == '(') {
+					paren++;
+				} else if (ch == ')') {
+					paren--;
+				}
+				if (ch == terminal && paren <= 0) {
+					break;
+				}
+			}
+		} else {
+			for (count = 1; count < line.length(); count++) {
+				if (line.charAt(count) == terminal) {
+					break;
+				}
+			}
+		}
+		if (count > line.length()) {
+			arg2 = EMPTY;
+		} else {
+			arg2 = line.substring(0, count);
+		}
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/DefaultRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/DefaultRule.java
new file mode 100644
index 0000000..2967311
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/DefaultRule.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IDefaultRule;
+
+/**
+ * .DEFAULT
+ * If the makefile uses this special target, the application shall ensure that it is
+ * specified with commands, but without prerequisites.
+ */
+public class DefaultRule extends SpecialRule implements IDefaultRule {
+
+	public DefaultRule(Directive parent, Command[] cmds) {
+		super(parent, new Target(MakeFileConstants.RULE_DEFAULT), new String[0], cmds);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/DefineVariable.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/DefineVariable.java
new file mode 100644
index 0000000..b4bde3e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/DefineVariable.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+public class DefineVariable extends GNUVariableDef {
+
+	public DefineVariable(Directive parent, String name, StringBuffer value) {
+		super(parent, name, value);
+	}
+
+	public boolean isMultiLine() {
+		return true;
+	}
+
+	public String toString() {
+		StringBuffer sb = new StringBuffer(GNUMakefileConstants.VARIABLE_DEFINE);
+		sb.append(getName()).append('\n');
+		sb.append(getValue());
+		sb.append(GNUMakefileConstants.TERMINAL_ENDEF);
+		return sb.toString();
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/DeleteOnErrorRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/DeleteOnErrorRule.java
new file mode 100644
index 0000000..fc25fbb
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/DeleteOnErrorRule.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.gnu.IDeleteOnErrorRule;
+
+/**
+ * .DELETE_ON_ERROR
+ *  If `.DELETE_ON_ERROR' is mentioned as a target anywhere in the
+ *  makefile, then `make' will delete the target of a rule if it has
+ *  changed and its commands exit with a nonzero exit status, just as
+ *  it does when it receives a signal.
+ */
+public class DeleteOnErrorRule extends SpecialRule implements IDeleteOnErrorRule {
+
+	public DeleteOnErrorRule(Directive parent, String[] reqs) {
+		super(parent, new Target(GNUMakefileConstants.RULE_DELETE_ON_ERROR), reqs, new Command[0]);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Directive.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Directive.java
new file mode 100644
index 0000000..06f0826
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Directive.java
@@ -0,0 +1,100 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+
+public abstract class Directive implements IDirective {
+
+	int endLine;
+	int startLine;
+	String filename;
+	IMakefile makefile;
+	Directive parent;
+
+	public Directive(Directive owner) {
+		parent = owner;
+	}
+
+	public Directive(int start, int end) {
+		setLines(start, end);
+	}
+
+	public abstract String toString();
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.make.core.makefile.IDirective#getEndLine()
+	 */
+	public int getEndLine() {
+		return endLine;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.make.core.makefile.IDirective#getStartLine()
+	 */
+	public int getStartLine() {
+		return startLine;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.make.core.makefile.IDirective#getParent()
+	 */
+	public IDirective getParent() {
+		return parent;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.make.core.makefile.IDirective#getFileName()
+	 */
+	public String getFileName() {
+		if (filename == null) {
+			if (parent != null) {
+				filename = parent.getFileName();
+			}
+		}
+		return filename;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.make.core.makefile.IDirective#getMakefile()
+	 */
+	public IMakefile getMakefile() {
+		if (makefile == null) {
+			if (parent != null) {
+				makefile = parent.getMakefile();
+			}
+		}
+		return makefile;
+	}
+
+	public void setParent(Directive owner) {
+		parent = owner;
+	}
+
+	public void setStartLine(int lineno) {
+		startLine = lineno;
+	}
+
+	public void setEndLine(int lineno) {
+		endLine = lineno;
+	}
+
+	public void setLines(int start, int end) {
+		setStartLine(start);
+		setEndLine(end);
+	}
+
+	public void setFilename(String name) {
+		filename = name;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/EditorUtility.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/EditorUtility.java
new file mode 100644
index 0000000..ffb99a2
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/EditorUtility.java
@@ -0,0 +1,561 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Markus Schorn (Wind River Systems)
+ *     Norbert Ploett (Siemens AG)
+ *     Anton Leherbauer (Wind River Systems)
+ *     Ed Swartz (Nokia)
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.text.MessageFormat;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.model.CModelException;
+import org.eclipse.cdt.core.model.CoreModel;
+import org.eclipse.cdt.core.model.IBinary;
+import org.eclipse.cdt.core.model.IBuffer;
+import org.eclipse.cdt.core.model.ICElement;
+import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.cdt.core.model.IIncludeReference;
+import org.eclipse.cdt.core.model.ISourceReference;
+import org.eclipse.cdt.core.model.ITranslationUnit;
+import org.eclipse.cdt.core.model.IWorkingCopy;
+import org.eclipse.cdt.core.resources.FileStorage;
+import org.eclipse.cdt.ui.CUIPlugin;
+import org.eclipse.core.filebuffers.FileBuffers;
+import org.eclipse.core.filesystem.URIUtil;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IStorage;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.jface.action.Action;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.MessageBox;
+import org.eclipse.ui.IEditorDescriptor;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorRegistry;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.editors.text.EditorsUI;
+import org.eclipse.ui.part.FileEditorInput;
+
+public class EditorUtility {
+
+	/**
+	 * The ID of the default text editor
+	 */
+	public static final String DEFAULT_TEXT_EDITOR_ID = EditorsUI.DEFAULT_TEXT_EDITOR_ID;
+
+	private EditorUtility () {
+	}
+
+	/** 
+	 * Tests if a cu is currently shown in an editor
+	 * @return the IEditorPart if shown, null if element is not open in an editor
+	 */     
+	public static IEditorPart isOpenInEditor(Object inputElement) {
+		IEditorInput input = null;
+                
+		try {
+			input = getEditorInput(inputElement);
+		} catch (CModelException x) {
+			//CUIPlugin.log(x.getStatus());
+		}
+                
+		if (input != null) {
+			IWorkbenchPage p= CUIPlugin.getActivePage();
+			if (p != null) {
+				return p.findEditor(input);
+			}
+		}
+                
+		return null;
+	}
+
+	/**
+	 * Opens an editor for an element such as <code>ICElement</code>, 
+	 * <code>IFile</code>, or <code>IStorage</code>.
+	 * The editor is activated by default.
+	 * @return the IEditorPart or null if wrong element type or opening failed
+	 */
+	public static IEditorPart openInEditor(Object inputElement) throws CModelException, PartInitException {
+		return openInEditor(inputElement, true);
+	}
+
+	/**
+	 * Opens an editor for an element (ICElement, IFile, IStorage...)
+	 * @return the IEditorPart or null if wrong element type or opening failed
+	 */
+	public static IEditorPart openInEditor(Object inputElement, boolean activate) throws CModelException, PartInitException {
+                
+		if (inputElement instanceof IFile) {
+			return openInEditor((IFile) inputElement, activate);
+		}
+                
+		IEditorInput input = getEditorInput(inputElement);
+                
+		if (input != null) {
+			return openInEditor(input, getEditorID(input, inputElement), activate);
+		}
+		
+		return null;
+	}
+
+	// Following is not needed and drags in internal reference to CEditor.
+	
+//	/** 
+//	 * Selects a C Element in an editor
+//	 */     
+//	public static void revealInEditor(IEditorPart part, ICElement element) {
+//		if (element != null && part instanceof CEditor) {
+//			((CEditor) part).setSelection(element);
+//		}
+//	}
+
+	private static IEditorPart openInEditor(IFile file, boolean activate) throws PartInitException {
+		if (!file.getProject().isAccessible()){
+			closedProject(file.getProject());
+			return null;
+		}
+		
+		if (file != null) {
+		try {
+				if (!isLinked(file)) {
+					File tempFile = file.getRawLocation().toFile();
+				
+					if (tempFile != null){
+						String canonicalPath = null;
+						try {
+							canonicalPath = tempFile.getCanonicalPath();
+						} catch (IOException e1) {}
+						
+						if (canonicalPath != null){
+							IPath path = new Path(canonicalPath);
+							file = CUIPlugin.getWorkspace().getRoot().getFileForLocation(path);
+						}
+					}
+				}
+				
+				IEditorInput input = getEditorInput(file);
+				if (input != null) {
+					return openInEditor(input, getEditorID(input, file), activate);
+				}
+			} catch (CModelException e) {}
+		}
+		return null;
+	}
+	
+	@SuppressWarnings("deprecation")
+	public static boolean isLinked(IFile file) {
+		if (file.isLinked())
+			return true;
+		
+		IPath path = file.getLocation();
+		while (path.segmentCount() > 0) {
+			path = path.removeLastSegments(1);
+			IContainer[] containers = ResourcesPlugin.getWorkspace().getRoot().findContainersForLocation(path);
+			
+			for(int i=0; i<containers.length; i++) {
+				if (containers[i] instanceof IFolder && ((IFolder)containers[i]).isLinked()) {
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+
+	/**
+	 * Open error dialog about closed project.
+	 * @param project
+	 */
+	private static void closedProject(IProject project) {
+		MessageBox errorMsg = new MessageBox(CUIPlugin.getActiveWorkbenchShell(), SWT.ICON_ERROR | SWT.OK);
+		errorMsg.setText(CUIPlugin.getResourceString("EditorUtility.closedproject")); //$NON-NLS-1$
+		String desc= CUIPlugin.getResourceString("Editorutility.closedproject.description"); //$NON-NLS-1$
+		errorMsg.setMessage (MessageFormat.format(desc, new Object[]{project.getName()})); 
+		errorMsg.open();
+		
+	}
+
+	private static IEditorPart openInEditor(IEditorInput input, String editorID, boolean activate) throws PartInitException {
+		if (input != null) {
+			IWorkbenchPage p= CUIPlugin.getActivePage();
+			if (p != null) {
+				IEditorPart editorPart= p.openEditor(input, editorID, activate);
+				return editorPart;
+			}
+		}
+		return null;
+	}
+
+	private static IEditorInput getEditorInput(ICElement element) throws CModelException {
+		while (element != null) {
+ 			if (element instanceof ISourceReference) {
+ 				ITranslationUnit tu = ((ISourceReference)element).getTranslationUnit();
+ 				if (tu != null) {
+ 					element = tu;                    
+ 				}
+ 			}
+			if (element instanceof IWorkingCopy && ((IWorkingCopy) element).isWorkingCopy()) 
+				element= ((IWorkingCopy) element).getOriginalElement();
+ 
+			if (element instanceof ITranslationUnit) {
+				ITranslationUnit unit= (ITranslationUnit) element;
+				IResource resource= unit.getResource();
+				if (resource instanceof IFile) {
+					return new FileEditorInput((IFile) resource);
+				}
+				return new ExternalEditorInput(unit, new FileStorage(unit.getPath()));
+			}
+                        
+			if (element instanceof IBinary) {
+				return new ExternalEditorInput(getStorage((IBinary)element), (IPath)null);
+			}
+                        
+			element= element.getParent();
+		}
+                
+		return null;
+	}
+
+	public static IEditorInput getEditorInput(Object input) throws CModelException {
+		if (input instanceof ICElement) {
+			return getEditorInput((ICElement) input);
+		}
+		if (input instanceof IFile) { 
+			return new FileEditorInput((IFile) input);
+		}
+		if (input instanceof IStorage) { 
+			return new ExternalEditorInput((IStorage)input);
+		}
+		return null;
+	}
+
+	/**
+	 * Utility method to open an editor for the given file system location
+	 * using {@link #getEditorInputForLocation(IPath, ICElement)} to create
+	 * the editor input.
+	 * 
+	 * @param location  a file system location
+	 * @param element  an element related to the target file, may be <code>null</code>
+	 * @throws PartInitException 
+	 */
+	public static IEditorPart openInEditor(IPath location, ICElement element) throws PartInitException {
+		IEditorInput input= getEditorInputForLocation(location, element);
+		return EditorUtility.openInEditor(input, getEditorID(input, element), true);		
+	}
+
+	/**
+	 * Utility method to get an editor input for the given file system location.
+	 * If the location denotes a workspace file, a <code>FileEditorInput</code>
+	 * is returned, otherwise, the input is an <code>IStorageEditorInput</code>
+	 * assuming the location points to an existing file in the file system.
+	 * The <code>ICElement</code> is used to determine the associated project
+	 * in case the location can not be resolved to a workspace <code>IFile</code>.
+	 * 
+	 * @param location  a valid file system location
+	 * @param context  an element related to the target file, may be <code>null</code>
+	 * @return an editor input
+	 */
+	public static IEditorInput getEditorInputForLocation(IPath location, ICElement context) {
+		IFile resource= getWorkspaceFileAtLocation(location, context);
+		if (resource != null) {
+			return new FileEditorInput(resource);
+		} 
+		
+		if (context == null) {
+			// try to synthesize a context for a location appearing on a project's
+			// include paths
+			try {
+				ICProject[] projects = CCorePlugin.getDefault().getCoreModel().getCModel().getCProjects();
+				outerFor: for (int i = 0; i < projects.length; i++) {
+					IIncludeReference[] includeReferences = projects[i].getIncludeReferences();
+					for (int j = 0; j < includeReferences.length; j++) {
+						if (includeReferences[j].isOnIncludeEntry(location)) {
+							context = projects[i];
+							break outerFor;
+						}
+					}
+				}
+				if (context == null && projects.length > 0) {
+					// last resort: just take any of them
+					context= projects[0];
+				}
+			} catch (CModelException e) {
+			}
+		}
+		
+		if (context != null) {
+			// try to get a translation unit from the location and associated element
+			ICProject cproject= context.getCProject();
+			if (cproject != null) {
+				ITranslationUnit unit = CoreModel.getDefault().createTranslationUnitFrom(cproject, location);
+				if (unit != null) {
+					return new ExternalEditorInput(unit, new FileStorage(location));
+				}
+				// no translation unit - still try to get a sensible marker resource
+				// from the associated element
+				IResource markerResource= cproject.getProject();
+				return new ExternalEditorInput(new FileStorage(location), markerResource);
+			}
+		}
+		return new ExternalEditorInput(new FileStorage(location));
+	}
+
+
+	/**
+	 * Utility method to resolve a file system location to a workspace resource.
+	 * If a context element is given and there are multiple matches in the workspace,
+	 * a resource with the same project of the context element are preferred.
+	 * 
+	 * @param location  a valid file system location
+	 * @param context  an element related to the target file, may be <code>null</code>
+	 * @return an <code>IFile</code> or <code>null</code>
+	 */
+	private static IFile getWorkspaceFileAtLocation(IPath location, ICElement context) {
+		IFile file= FileBuffers.getWorkspaceFileAtLocation(location);
+		if (file == null) {
+			// try to find a linked resource
+			IProject project= null;
+			if (context != null) {
+				ICProject cProject= context.getCProject();
+				if (cProject != null) {
+					project= cProject.getProject();
+				}
+			}
+			IFile bestMatch= null;
+			IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();
+			IFile[] files= root.findFilesForLocationURI(URIUtil.toURI(location));
+			for (int i= 0; i < files.length; i++) {
+				file= files[i];
+				if (file.isAccessible()) {
+					if (project != null && file.getProject() == project) {
+						bestMatch= file;
+						break;
+					}
+					if (bestMatch == null) {
+						bestMatch= file;
+						if (project == null) {
+							break;
+						}
+					}
+				}
+			}
+			return bestMatch;
+		}
+		return file;
+	}
+
+	/**
+	 * If the current active editor edits a c element return it, else
+	 * return null
+	 */
+	public static ICElement getActiveEditorCInput() {
+		IWorkbenchPage page= CUIPlugin.getActivePage();
+		if (page != null) {
+			IEditorPart part= page.getActiveEditor();
+			if (part != null) {
+				IEditorInput editorInput= part.getEditorInput();
+				if (editorInput != null) {
+					return (ICElement)editorInput.getAdapter(ICElement.class);
+				}
+			}
+		}
+		return null;    
+	}
+        
+	/** 
+	 * Gets the working copy of an compilation unit opened in an editor
+	 * 
+	 * @param cu the original compilation unit (or another working copy)
+	 * @return the working copy of the compilation unit, or null if not found
+	*/     
+	public static ITranslationUnit getWorkingCopy(ITranslationUnit cu) {
+		if (cu == null)
+			return null;
+		if (cu.isWorkingCopy())
+			return cu;
+
+		return cu.findSharedWorkingCopy();
+	}
+
+	/**
+	 * Determine the editor id from the given file name using
+	 * the workspace-wide content-type definitions.
+	 * 
+	 * @param name  the file name
+	 * @return a valid editor id, never <code>null</code>
+	 */
+	public static String getEditorID(String name) {
+		IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
+		if (registry != null) {
+			IEditorDescriptor descriptor = registry.getDefaultEditor(name);
+			if (descriptor != null) {
+				return descriptor.getId();
+			}
+		}
+		return DEFAULT_TEXT_EDITOR_ID;
+	}
+
+	/**
+	 * Determine the editor id from the given editor input and optional input object.
+	 * When a translation unit can be obtained, the project-specific content-type
+	 * mechanism is used to determine the correct editor id.
+	 * If that fails, the editor id is determined by file name and extension using
+	 * the workspace-wide content-type definitions.
+	 * 
+	 * @param input  the editor input
+	 * @param inputObject  the input object (used to create the editor input) or <code>null</code>
+	 * @return a valid editor id, never <code>null</code>
+	 */
+	public static String getEditorID(IEditorInput input, Object inputObject) {
+
+		ITranslationUnit tunit = null;
+		if (inputObject instanceof ITranslationUnit) {
+			tunit= (ITranslationUnit)inputObject;
+		} else if (input instanceof IFileEditorInput) {
+			IFileEditorInput editorInput = (IFileEditorInput)input;
+			IFile file = editorInput.getFile();
+			ICElement celement = CoreModel.getDefault().create(file);
+			if (celement instanceof ITranslationUnit) {
+				tunit = (ITranslationUnit)celement;
+			}
+		} else if (input instanceof ITranslationUnitEditorInput) {
+			ITranslationUnitEditorInput editorInput = (ITranslationUnitEditorInput)input;
+			tunit = editorInput.getTranslationUnit();
+		}
+
+		if (tunit != null) {
+			// Choose an editor based on the content type
+			String contentTypeId= tunit.getContentTypeId();
+			if (contentTypeId != null) {
+				IContentType contentType= Platform.getContentTypeManager().getContentType(contentTypeId);
+				IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
+				IEditorDescriptor desc= registry.getDefaultEditor(input.getName(), contentType);
+				if (desc != null) {
+					return desc.getId();
+				}
+			}
+			// Choose an editor based on the language (obsolete?)
+			if (tunit.isCLanguage()) {
+				return CUIPlugin.EDITOR_ID;
+			} else if (tunit.isCXXLanguage()) {
+				return CUIPlugin.EDITOR_ID;
+			} else if (tunit.isASMLanguage()) {
+				return "org.eclipse.cdt.ui.editor.asm.AsmEditor"; //$NON-NLS-1$
+			}
+		}
+
+		// Choose an editor based on filename/extension
+		String editorId = getEditorID(input.getName());
+
+		return editorId;
+	}
+
+	/**
+	 * Maps the localized modifier name to a code in the same
+	 * manner as #findModifier.
+	 * 
+	 * @return the SWT modifier bit, or <code>0</code> if no match was found
+	 */
+	public static int findLocalizedModifier(String token) {
+		if (token == null)
+			return 0;
+		
+		if (token.equalsIgnoreCase(Action.findModifierString(SWT.CTRL)))
+			return SWT.CTRL;
+		if (token.equalsIgnoreCase(Action.findModifierString(SWT.SHIFT)))
+			return SWT.SHIFT;
+		if (token.equalsIgnoreCase(Action.findModifierString(SWT.ALT)))
+			return SWT.ALT;
+		if (token.equalsIgnoreCase(Action.findModifierString(SWT.COMMAND)))
+			return SWT.COMMAND;
+
+		return 0;
+	}
+
+	/**
+	 * Returns the modifier string for the given SWT modifier
+	 * modifier bits.
+	 * 
+	 * @param stateMask	the SWT modifier bits
+	 * @return the modifier string
+	 * @since 2.1.1
+	 */
+	public static String getModifierString(int stateMask) {
+		String modifierString= ""; //$NON-NLS-1$
+		if ((stateMask & SWT.CTRL) == SWT.CTRL)
+			modifierString= appendModifierString(modifierString, SWT.CTRL);
+		if ((stateMask & SWT.ALT) == SWT.ALT)
+			modifierString= appendModifierString(modifierString, SWT.ALT);
+		if ((stateMask & SWT.SHIFT) == SWT.SHIFT)
+			modifierString= appendModifierString(modifierString, SWT.SHIFT);
+		if ((stateMask & SWT.COMMAND) == SWT.COMMAND)
+			modifierString= appendModifierString(modifierString,  SWT.COMMAND);
+		
+		return modifierString;
+	}
+
+	/**
+	 * Appends to modifier string of the given SWT modifier bit
+	 * to the given modifierString.
+	 * 
+	 * @param modifierString	the modifier string
+	 * @param modifier			an int with SWT modifier bit
+	 * @return the concatenated modifier string
+	 * @since 2.1.1
+	 */
+	private static String appendModifierString(String modifierString, int modifier) {
+		if (modifierString == null)
+			modifierString= ""; //$NON-NLS-1$
+		String newModifierString= Action.findModifierString(modifier);
+		if (modifierString.length() == 0)
+			return newModifierString;
+		return MakefileMessages.getFormattedString("EditorUtility.concatModifierStrings", new String[] {modifierString, newModifierString}); //$NON-NLS-1$
+	}
+
+	public static IStorage getStorage(IBinary bin) {
+		IStorage store = null;
+		try {
+			IBuffer buffer = bin.getBuffer();
+			if (buffer != null) {
+				store = new FileStorage (new ByteArrayInputStream(buffer.getContents().getBytes()), bin.getPath());
+			}
+		} catch (CModelException e) {
+			// nothing;
+		}
+		return store;
+	}
+	
+	public static IStorage getStorage(ITranslationUnit tu) {
+		IStorage store = null;
+		try {
+			store = new FileStorage (new ByteArrayInputStream(tu.getBuffer().getContents().getBytes()), tu.getPath());
+		} catch (CModelException e) {
+			// nothing;
+		}
+		return store;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ElementListSelectionDialog.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ElementListSelectionDialog.java
new file mode 100644
index 0000000..82a7f71b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ElementListSelectionDialog.java
@@ -0,0 +1,120 @@
+/*******************************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.viewers.ILabelProvider;
+
+/**
+ * A class to select one or more elements out of an indexed property
+ */
+public class ElementListSelectionDialog extends AbstractElementListSelectionDialog {
+	
+	private List<Object> fElements;
+	
+	/*
+	 * @private
+	 */
+	protected void computeResult() {
+		setResult(getWidgetSelection());
+	}
+	/*
+	 * @private
+	 */	
+	protected Control createDialogArea(Composite parent) {
+		Control result= super.createDialogArea(parent);
+		
+		setSelectionListElements(fElements, false);
+	  	//a little trick to make the window come up faster
+	  	String initialFilter= null;
+	  	if (getPrimaryInitialSelection() instanceof String)
+			initialFilter= (String)getPrimaryInitialSelection();
+	  	if (initialFilter != null)
+	  		setFilter(initialFilter, true);
+	  	else
+	  		refilter();
+	  				
+		return result;
+	}
+	public Object getSelectedElement() {
+		return getPrimaryResult();
+	}
+	public Object[] getSelectedElements() {
+		return getResult();
+	}
+	/*
+	 * @private
+	 */	
+	protected void handleDoubleClick() {
+		if (verifyCurrentSelection()) {
+			buttonPressed(IDialogConstants.OK_ID);
+		}
+	}
+	/**
+	 * Constructs a list selection dialog.
+	 * @param renderer The label renderer used
+	 * @param ignoreCase Decides if the match string ignores lower/upper case
+	 * @param multipleSelection Allow multiple selection	 
+	 */
+	public ElementListSelectionDialog(Shell parent, String title, Image image, ILabelProvider renderer, boolean ignoreCase, boolean multipleSelection) {
+		super (parent, title, image, renderer, ignoreCase, multipleSelection);
+	}
+	/**
+	 * Constructs a list selection dialog.
+	 * @param renderer The label renderer used
+	 * @param ignoreCase Decides if the match string ignores lower/upppr case
+	 * @param multipleSelection Allow multiple selection	 
+	 */
+	public ElementListSelectionDialog(Shell parent, ILabelProvider renderer, boolean ignoreCase, boolean multipleSelection) {
+		this(parent, "", null, renderer, ignoreCase, multipleSelection); //$NON-NLS-1$
+	}
+	public int open(Object[] elements) {
+		return open(Arrays.asList(elements));
+	}
+	public int open(Object[] elements, String initialSelection) {
+		return open(Arrays.asList(elements), initialSelection);
+	}
+	/**
+	 * Open the dialog.
+	 * @param elements The elements to show in the list
+	 * @return Returns OK or CANCEL
+	 */	
+	public int open(List<Object> elements) {
+		setElements(elements);
+		return open();
+	}
+	/**
+	 * Open the dialog.
+	 * @param elements The elements to show in the list
+	 * @param initialSelection The initial content of the match text box.
+	 * @return Returns OK or CANCEL
+	 */
+	public int open(List<Object> elements, String initialSelection) {
+		setElements(elements);
+		setInitialSelection(initialSelection);
+		return open();
+	}
+	/**
+	 * Sets the elements presented by this dialog.
+	 */
+	public void setElements(List<Object> elements) {
+		fElements= elements;	
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Else.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Else.java
new file mode 100644
index 0000000..618ce90
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Else.java
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - modified for Automake editor usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.eclipse.cdt.make.core.makefile.ICommand;
+
+public class Else extends Conditional implements IAutomakeConditional, ICommand {
+
+	private boolean isAutomake;
+	private Rule[] rules;
+	
+	public Else(Directive parent) {
+		super(parent);
+	}
+
+	public boolean isAutomake() {
+		return isAutomake;
+	}
+	
+	public Rule[] getRules() {
+		return rules;
+	}
+
+	public void setRules(Rule[] rules) {
+		this.rules = rules;
+	}
+	
+	public void setAutomake(boolean value) {
+		isAutomake = value;
+	}
+	
+	public boolean isElse() {
+		return true;
+	}
+
+	public String toString() {
+		return GNUMakefileConstants.CONDITIONAL_ELSE;
+	}
+	
+	// ICommand methods so Automake else can be a child of an IRule
+	public Process execute(String shell, String[] envp, File dir)
+			throws IOException {
+		return null;
+	}
+	
+	public boolean shouldBeSilent() {
+		return false;
+	}
+	
+	public boolean shouldIgnoreError() {
+		return false;
+	}
+	
+	public boolean shouldExecute() {
+		return false;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/EmptyLine.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/EmptyLine.java
new file mode 100644
index 0000000..fa7aaee
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/EmptyLine.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IEmptyLine;
+
+public class EmptyLine extends Directive implements IEmptyLine {
+
+	final public static char NL = '\n';
+	final public static String NL_STRING = "\n"; //$NON-NLS-1$
+
+	public EmptyLine(Directive parent) {
+		super(parent);
+	}
+
+	public String toString() {
+		return NL_STRING;
+	}
+
+	public boolean equals(IEmptyLine stmt) {
+		return true;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Endef.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Endef.java
new file mode 100644
index 0000000..9bcc68b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Endef.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+public class Endef extends Terminal {
+
+
+	public Endef(Directive parent) {
+		super(parent);
+	}
+
+	public boolean isEndef() {
+		return true;
+	}
+	
+	public String toString() {
+       return GNUMakefileConstants.TERMINAL_ENDEF;
+    }
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Endif.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Endif.java
new file mode 100644
index 0000000..af77d40
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Endif.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+public class Endif extends Terminal {
+
+	public Endif(Directive parent) {
+		super(parent);
+	}
+
+	public boolean isEndif() {
+		return true;
+	}
+	
+    public String toString() {
+        return GNUMakefileConstants.TERMINAL_ENDIF;
+    }
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExportAllVariablesRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExportAllVariablesRule.java
new file mode 100644
index 0000000..0aa0a31
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExportAllVariablesRule.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.gnu.IExportAllVariablesRule;
+
+/**
+ * .EXPORT_ALL_VARIABLES
+ *  Simply by being mentioned as a target, this tells `make' to export
+ *  all variables to child processes by default.
+ */
+public class ExportAllVariablesRule extends SpecialRule implements IExportAllVariablesRule {
+
+	public ExportAllVariablesRule(Directive parent, String[] reqs) {
+		super(parent, new Target(GNUMakefileConstants.RULE_EXPORT_ALL_VARIABLES), reqs, new Command[0]);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExportVariable.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExportVariable.java
new file mode 100644
index 0000000..b98512d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExportVariable.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - Modified for Automake usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+public class ExportVariable extends GNUVariableDef {
+
+	public ExportVariable(Directive parent, String name, StringBuffer value, int type) {
+		super(parent, name, value, type);
+	}
+
+	public boolean isExport() {
+		return true;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExternalEditorInput.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExternalEditorInput.java
new file mode 100644
index 0000000..a7087de
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExternalEditorInput.java
@@ -0,0 +1,169 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Anton Leherbauer (Wind River Systems)
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+import org.eclipse.cdt.core.model.ITranslationUnit;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IStorage;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.IEditorRegistry;
+import org.eclipse.ui.IMemento;
+import org.eclipse.ui.IPersistableElement;
+import org.eclipse.ui.IStorageEditorInput;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.editors.text.ILocationProvider;
+
+
+/**
+ * An EditorInput for an external (non-workspace) file.
+ */
+public class ExternalEditorInput implements ITranslationUnitEditorInput, IPersistableElement {
+           
+	private IStorage externalFile;
+	private IResource markerResource;
+	private ITranslationUnit unit;
+	private IPath location;
+
+	/*
+	*/
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (!(obj instanceof IStorageEditorInput))
+			return false;
+		IStorageEditorInput other = (IStorageEditorInput)obj;
+		try {
+			return externalFile.equals(other.getStorage());
+		} catch (CoreException exc) {
+			return false;
+		}
+	}
+
+	/*
+	* @see IEditorInput#exists()
+	*/
+	public boolean exists() {
+		// External file can not be deleted
+		return true;
+	}
+
+	/*
+	* @see IAdaptable#getAdapter(Class)
+	*/
+	@SuppressWarnings("unchecked")
+	public Object getAdapter(Class adapter) {
+		if (ILocationProvider.class.equals(adapter)) {
+			return this;
+		}
+		return Platform.getAdapterManager().getAdapter(this, adapter);
+	}
+
+	/*
+	* @see IEditorInput#getImageDescriptor()
+	*/
+	public ImageDescriptor getImageDescriptor() {
+		IEditorRegistry registry= PlatformUI.getWorkbench().getEditorRegistry();
+		return registry.getImageDescriptor(externalFile.getFullPath().getFileExtension());
+	}
+
+	/*
+	* @see IEditorInput#getName()
+	*/
+	public String getName() {
+		return externalFile.getName();
+	}
+
+	/*
+	* @see IEditorInput#getPersistable()
+	*/
+	public IPersistableElement getPersistable() {
+		return this;
+	}
+
+	/*
+	* see IStorageEditorInput#getStorage()
+	*/
+	public IStorage getStorage() {
+		return externalFile;
+	}
+
+	/*
+	* @see IEditorInput#getToolTipText()
+	*/
+	public String getToolTipText() {
+		return externalFile.getFullPath().toString();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.ITranslationUnitEditorInput#getTranslationUnit()
+	 */
+	public ITranslationUnit getTranslationUnit() {
+		return unit;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.editors.text.ILocationProvider#getPath(java.lang.Object)
+	 */
+	public IPath getPath(Object element) {
+		return location;
+	}
+
+	public ExternalEditorInput(ITranslationUnit unit, IStorage exFile) {
+		this(exFile, exFile.getFullPath());
+		this.unit = unit;
+		markerResource= unit.getCProject().getProject();
+	}
+
+	public ExternalEditorInput(IStorage exFile) {
+		this(exFile, exFile.getFullPath());
+	}
+
+	public ExternalEditorInput(IStorage exFile, IPath location) {
+		externalFile = exFile;
+		this.location = location;
+	}
+	
+	/**
+	 * This constructor accepts the storage for the editor
+	 * and a reference to a resource which holds the markers for the external file.
+	 */
+	public ExternalEditorInput(IStorage exFile, IResource markerResource)  {
+		this(exFile, exFile.getFullPath());
+		this.markerResource = markerResource ;
+	}
+
+	/**
+	 * Return the resource where markers for this external editor input are stored
+	 */
+	public IResource getMarkerResource() {
+		return markerResource;
+	}
+
+	/*
+	 * @see org.eclipse.ui.IPersistableElement#getFactoryId()
+	 */
+	public String getFactoryId() {
+		return ExternalEditorInputFactory.ID;
+	}
+
+	/*
+	 * @see org.eclipse.ui.IPersistable#saveState(org.eclipse.ui.IMemento)
+	 */
+	public void saveState(IMemento memento) {
+		ExternalEditorInputFactory.saveState(memento, this);
+	}
+	
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExternalEditorInputFactory.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExternalEditorInputFactory.java
new file mode 100644
index 0000000..2e8ebf6
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ExternalEditorInputFactory.java
@@ -0,0 +1,92 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Wind River Systems, Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Anton Leherbauer (Wind River Systems) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.ui.IElementFactory;
+import org.eclipse.ui.IMemento;
+import org.eclipse.ui.IPersistableElement;
+
+import org.eclipse.cdt.core.model.CoreModel;
+import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.cdt.core.model.ITranslationUnit;
+
+/**
+ * The ExternalEditorInputFactory is used to save and recreate an ExternalEditorInput object.
+ * As such, it implements the IPersistableElement interface for storage
+ * and the IElementFactory interface for recreation.
+ *
+ * @see IMemento
+ * @see IPersistableElement
+ * @see IElementFactory
+ *
+ * @since 4.0
+ */
+public class ExternalEditorInputFactory implements IElementFactory {
+
+	public static final String ID = "org.eclipse.cdt.ui.ExternalEditorInputFactory"; //$NON-NLS-1$
+
+    private static final String TAG_PATH = "path";//$NON-NLS-1$
+    private static final String TAG_PROJECT = "project";//$NON-NLS-1$
+
+	/*
+	 * @see org.eclipse.ui.IElementFactory#createElement(org.eclipse.ui.IMemento)
+	 */
+	public IAdaptable createElement(IMemento memento) {
+        // Get the file name.
+        String fileName = memento.getString(TAG_PATH);
+        if (fileName == null) {
+			return null;
+		}
+
+        IPath location= new Path(fileName);
+        ICProject cProject= null;
+        
+        String projectName= memento.getString(TAG_PROJECT);
+        if (projectName != null) {
+        	IProject project= ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+        	if (project.isAccessible() && CoreModel.hasCNature(project)) {
+        		cProject= CoreModel.getDefault().create(project);
+        	}
+        }
+		return EditorUtility.getEditorInputForLocation(location, cProject);
+	}
+
+	/**
+	 * Save the element state.
+	 * 
+	 * @param memento  the storage
+	 * @param input  the element
+	 */
+	static void saveState(IMemento memento, ExternalEditorInput input) {
+		IPath location= input.getPath(input);
+		if (location != null) {
+			memento.putString(TAG_PATH, location.toOSString());
+		}
+		IProject project= null;
+		ITranslationUnit unit= input.getTranslationUnit();
+		if (unit != null) {
+			project= unit.getCProject().getProject();
+		}
+		if (project == null && input.getMarkerResource() instanceof IProject) {
+			project= (IProject)input.getMarkerResource();
+		}
+		if (project != null) {
+			memento.putString(TAG_PROJECT, project.getName());
+		}
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUAutomakefile.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUAutomakefile.java
new file mode 100644
index 0000000..f71edd6
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUAutomakefile.java
@@ -0,0 +1,948 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - Modified for Automake editor usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.URI;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Stack;
+import java.util.StringTokenizer;
+
+import org.eclipse.cdt.make.core.MakeCorePlugin;
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.core.makefile.gnu.IGNUMakefile;
+import org.eclipse.core.filesystem.URIUtil;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+
+
+/**
+ * Makefile : ( statement ) *
+ * statement :   rule | macro_definition | comments | empty
+ * rule :  inference_rule | target_rule
+ * inference_rule : target ':' <nl> ( <tab> command <nl> ) +
+ * target_rule : target [ ( target ) * ] ':' [ ( prerequisite ) * ] [ ';' command ] <nl> 
+                 [ ( command ) * ]
+ * macro_definition : string '=' (string)* 
+ * comments : ('#' (string) <nl>) *
+ * empty : <nl>
+ * command : <tab> prefix_command string <nl>
+ * target : string
+ * prefix_command : '-' | '@' | '+'
+ * internal_macro :  "$<" | "$*" | "$@" | "$?" | "$%" 
+ */
+
+public class GNUAutomakefile extends AbstractMakefile implements IGNUMakefile {
+
+	public static String PATH_SEPARATOR = System.getProperty("path.separator", ":"); //$NON-NLS-1$ //$NON-NLS-2$
+	public static String FILE_SEPARATOR = System.getProperty("file.separator", "/"); //$NON-NLS-1$ //$NON-NLS-2$
+
+	String[] includeDirectories = new String[0];
+	IDirective[] builtins = null;
+
+	public GNUAutomakefile() {
+		super(null);
+	}
+
+	public void parse(String name) throws IOException {
+		FileReader stream = new FileReader(name);
+		parse(name, stream);
+		if (stream != null) {
+			try {
+				stream.close();
+			} catch (IOException e) {
+			}
+		}
+	}
+	
+	public void parse(String filePath, Reader reader) throws IOException {
+		parse(URIUtil.toURI(filePath), new MakefileReader(reader));
+	}
+
+	public void parse(URI fileURI, Reader reader) throws IOException {
+		parse(fileURI, new MakefileReader(reader));
+	}
+	
+
+	protected void parse(URI fileURI, MakefileReader reader) throws IOException {
+		String line;
+		Rule[] rules = null;
+		Stack<IDirective> conditions = new Stack<IDirective>();
+		Stack<GNUVariableDef> defines = new Stack<GNUVariableDef>();
+		int startLine = 0;
+		int endLine = 0;
+
+		// Clear any old directives.
+		clearDirectives();
+
+		setFileURI(fileURI);
+	
+		while ((line = reader.readLine()) != null) {
+			startLine = endLine + 1;
+			endLine = reader.getLineNumber();
+			
+			// Check if we enter in "define"
+			if (GNUMakefileUtil.isEndef(line)) {
+				// We should have a "define" for a "endef".
+				if (!defines.empty()) {
+					GNUVariableDef def = (GNUVariableDef) defines.pop();
+					def.setEndLine(endLine);
+				}
+				Endef endef = new Endef((Directive)this);
+				endef.setLines(startLine, endLine);
+				addDirective(conditions, endef);
+				continue;
+			} else if (GNUMakefileUtil.isDefine(line)) {
+				GNUVariableDef def = parseGNUVariableDef(line);
+				def.setLines(startLine, endLine);
+				addDirective(conditions, def);
+				defines.push(def);
+				continue;
+			} else if (GNUMakefileUtil.isOverrideDefine(line)) {
+				GNUVariableDef oDef = parseGNUVariableDef(line);
+				oDef.setLines(startLine, endLine);
+				addDirective(conditions, oDef);
+				defines.push(oDef);
+				continue;
+			}
+
+			// We still in a define.
+			if (!defines.empty()) {
+				GNUVariableDef def = (GNUVariableDef) defines.peek();
+				StringBuffer sb = def.getValue();
+				if (sb.length() > 0) {
+					sb.append('\n');
+				}
+				sb.append(line);
+				continue;
+			}
+
+			// 1- Try command first, since we can not strip '#' in command line
+			if (PosixMakefileUtil.isCommand(line) ||
+					AutomakefileUtil.isAutomakeCommand(line)) {
+				Command cmd = new Command(this, line);
+				cmd.setLines(startLine, endLine);
+				if (rules != null) {
+					// The command is added to the rules
+					for (int i = 0; i < rules.length; i++) {
+						rules[i].addDirective(cmd);
+						rules[i].setEndLine(endLine);
+					}
+					continue;
+				}
+				if (!conditions.isEmpty()) {
+					addDirective(conditions, cmd);
+					continue;
+				}
+				// If we have no rules/condition for the command,
+				// give the other directives a chance by falling through
+			}
+
+			// 2- Strip away any comments.
+			int pound = Util.indexOfComment(line);
+			if (pound != -1) {
+				Comment cmt = new Comment(this, line.substring(pound + 1));
+				cmt.setLines(startLine, endLine);
+				if (rules != null) {
+					// The comment is added to the rules.
+					for (int i = 0; i < rules.length; i++) {
+						rules[i].addDirective(cmt);
+						rules[i].setEndLine(endLine);
+					}
+				} else {
+					addDirective(conditions, cmt);
+				}
+				line = line.substring(0, pound);
+				// If all we have left are spaces continue
+				if (Util.isEmptyLine(line)) {
+					continue;
+				}
+				// The rest of the line maybe a valid directives.
+				// keep on trying by falling through.
+			}
+
+			// 3- Empty lines ?
+			if (Util.isEmptyLine(line)) {
+				Directive empty = new EmptyLine(this);
+				empty.setLines(startLine, endLine);
+				if (rules != null) {
+					// The EmptyLine is added to the rules.
+					for (int i = 0; i < rules.length; i++) {
+						rules[i].addDirective(empty);
+						rules[i].setEndLine(endLine);
+					}
+				} else {
+					addDirective(conditions, empty);
+				}
+				continue;
+			}
+
+			// 3b - look for if statement which is an Automake directive.
+			// These will be processed at configure time and all statements
+			// in-between are modified with a prefix.  We will treat these as
+			// standard conditionals even though they can affect the behavior
+			// of lines that follow the construct.  For
+			// example, an automake-if could start in the middle of a rule
+			// and the else might be outside a target.
+			if (GNUMakefileUtil.isIf(line)) {
+				// We cache the rules that were in effect at entry to the
+				// if/else block.  We treat the endif as restoring the
+				// state of the rules at this point.  It is possible for
+				// commands to follow the if/else that belong to different
+				// rules that start inside the if/else, but we are not
+				// prepared to handle that in an outline view and it is
+				// pretty bad Automake coding.
+				If ifDirective = parseIf(line, rules);
+				ifDirective.setLines(startLine, endLine);
+				if (rules != null) {
+					// The if statement is added to the rules.
+					for (int i = 0; i < rules.length; i++) {
+						rules[i].addDirective(ifDirective);
+						rules[i].setEndLine(endLine);
+					}
+				} else {
+					addDirective(conditions, ifDirective);
+				}
+				conditions.push(ifDirective);
+				rules = null;
+				continue;
+			}
+			
+			// 3c - Check for else or endif
+
+			if (GNUMakefileUtil.isElse(line)) {
+				Else elseDirective = (Else)parseConditional(line);
+				elseDirective.setLines(startLine, endLine);
+				Conditional cond = null;
+				// FIXME: Are we missing a if condition ?
+				if (!conditions.empty()) {
+					cond = (Conditional) conditions.pop();
+					cond.setEndLine(endLine - 1);
+				}
+				if (cond != null && cond.isIf()) {
+					// See 3b above for description on automake if/else handling.
+					elseDirective.setAutomake(true);
+					rules = ((If)cond).getRules();
+					// We cache the rules at the time of entry into the if/else block.
+					elseDirective.setRules(rules);
+					if (rules != null) {
+						// The else is added to the rules.
+						for (int i = 0; i < rules.length; i++) {
+							rules[i].addDirective(elseDirective);
+							rules[i].setEndLine(endLine);
+						}
+					} else {
+						addDirective(conditions, elseDirective);
+					}
+					rules = null;
+				} else {
+					addDirective(conditions, elseDirective);
+				}
+				conditions.push(elseDirective);
+				continue;
+			} else if (GNUMakefileUtil.isEndif(line)) {
+				Endif endif = new Endif(this);
+				endif.setLines(startLine, endLine);
+				Conditional cond = null;
+				// FIXME: Are we missing a if/else condition ?
+				if (!conditions.empty()) {
+					cond = (Conditional) conditions.pop();
+					cond.setEndLine(endLine);
+				}
+				if (cond != null && cond instanceof IAutomakeConditional) {
+				   rules = ((IAutomakeConditional)cond).getRules();
+				}
+				if (rules != null) {
+					// The endif is added to the rules.
+					for (int i = 0; i < rules.length; i++) {
+						rules[i].addDirective(endif);
+						rules[i].setEndLine(endLine);
+					}
+				} else {
+					addDirective(conditions, endif);
+				}
+				continue;
+			}
+			
+			// 4 - reset rules to null
+			// The first non empty line that does not begin with a <TAB> or '#'
+			// shall begin a new entry.
+			rules = null;
+
+			// 5- Check for the conditionals.
+			Directive directive = processConditions(line);
+			if (directive != null) {
+				directive.setLines(startLine, endLine);
+				addDirective(conditions, directive);
+				conditions.push(directive);
+				continue;
+			}
+
+			// 6- Check for other special gnu directives.
+			directive = processGNUDirectives(line);
+			if (directive != null) {
+				directive.setLines(startLine, endLine);
+				addDirective(conditions, directive);
+				continue;
+			}
+
+			// 7- Check for GNU special rules.
+			SpecialRule special = processSpecialRules(line);
+			if (special != null) {
+				rules = new Rule[] { special };
+				special.setLines(startLine, endLine);
+				addDirective(conditions, special);
+				continue;
+			}
+
+			// - Check for inference rule.
+			if (PosixMakefileUtil.isInferenceRule(line)) {
+				InferenceRule irule = parseInferenceRule(line);
+				irule.setLines(startLine, endLine);
+				addDirective(conditions, irule);
+				rules = new Rule[] { irule };
+				continue;
+			}
+
+			// - Variable Definiton ?
+			if (GNUMakefileUtil.isVariableDefinition(line)) {
+				GNUVariableDef vd = parseGNUVariableDef(line);
+				vd.setLines(startLine, endLine);
+				addDirective(conditions, vd);
+				if (!vd.isTargetSpecific()) {
+					continue;					
+				}
+			}
+
+			// - GNU Static Target rule ?
+			if (GNUMakefileUtil.isStaticTargetRule(line)) {
+				StaticTargetRule[] srules = parseStaticTargetRule(line);
+				for (int i = 0; i < srules.length; i++) {
+					srules[i].setLines(startLine, endLine);
+					addDirective(conditions, srules[i]);
+				}
+				rules = srules;
+				continue;
+			}
+
+			// - Target Rule ?
+			if (GNUMakefileUtil.isGNUTargetRule(line)) {
+				GNUTargetRule[] trules = parseGNUTargetRules(line);
+				for (int i = 0; i < trules.length; i++) {
+					trules[i].setLines(startLine, endLine);
+					addDirective(conditions, trules[i]);
+				}
+				rules = trules;
+				continue;
+			}
+			
+			// - Configure macro (@xxxx@)
+			if (AutomakefileUtil.isConfigMacro(line)) {
+				AutomakeConfigMacro macro = parseConfigMacro(line);
+				if (macro != null) {
+					macro.setLines(startLine, endLine);
+					addDirective(macro);
+					continue;
+				}
+			}
+
+			// XXX ?? Should not be here.
+			BadDirective stmt = new BadDirective(this, line);
+			stmt.setLines(startLine, endLine);
+			addDirective(conditions, stmt);
+
+		}
+		setLines(1, endLine);
+		// TEST please remove.
+		//GNUMakefileValidator validator = new GNUMakefileValidator();
+		//validator.validateDirectives(null, getDirectives());
+	}
+
+	private void addDirective(Stack<IDirective> conditions, Directive directive) {
+		if (conditions.empty()) {
+			addDirective(directive);
+		} else {
+			Conditional cond = (Conditional) conditions.peek();
+			cond.addDirective(directive);
+			cond.setEndLine(directive.getEndLine());
+		}
+	}
+
+	protected Conditional processConditions(String line) {
+		Conditional stmt = null;
+		if (GNUMakefileUtil.isIfdef(line)) {
+			stmt = parseConditional(line);
+		} else if (GNUMakefileUtil.isIfndef(line)) {
+			stmt = parseConditional(line);
+		} else if (GNUMakefileUtil.isIfeq(line)) {
+			stmt = parseConditional(line);
+		} else if (GNUMakefileUtil.isIfneq(line)) {
+			stmt = parseConditional(line);
+		}
+		return stmt;
+	}
+
+	protected Directive processGNUDirectives(String line) {
+		Directive stmt = null;
+		if (GNUMakefileUtil.isUnExport(line)) {
+			stmt = parseUnExport(line);
+		} else if (GNUMakefileUtil.isVPath(line)) {
+			stmt = parseVPath(line);
+		} else if (GNUMakefileUtil.isInclude(line)) {
+			stmt = parseInclude(line);
+		}
+		return stmt;
+	}
+
+	protected SpecialRule processSpecialRules(String line) {
+		SpecialRule stmt = null;
+		if (PosixMakefileUtil.isIgnoreRule(line)) {
+			stmt = parseSpecialRule(line);
+		} else if (PosixMakefileUtil.isPosixRule(line)) {
+			stmt = parseSpecialRule(line);
+		} else if (PosixMakefileUtil.isPreciousRule(line)) {
+			stmt = parseSpecialRule(line);
+		} else if (PosixMakefileUtil.isSilentRule(line)) {
+			stmt = parseSpecialRule(line);
+		} else if (PosixMakefileUtil.isSuffixesRule(line)) {
+			stmt = parseSpecialRule(line);
+		} else if (PosixMakefileUtil.isDefaultRule(line)) {
+			stmt = parseSpecialRule(line);
+		} else if (PosixMakefileUtil.isSccsGetRule(line)) {
+			stmt = parseSpecialRule(line);
+		} else if (GNUMakefileUtil.isPhonyRule(line)) {
+			stmt = parseSpecialRule(line);
+		} else if (GNUMakefileUtil.isIntermediateRule(line)) {
+			stmt = parseSpecialRule(line);
+		} else if (GNUMakefileUtil.isSecondaryRule(line)) {
+			stmt = parseSpecialRule(line);
+		} else if (GNUMakefileUtil.isDeleteOnErrorRule(line)) {
+			stmt = parseSpecialRule(line);
+		} else if (GNUMakefileUtil.isLowResolutionTimeRule(line)) {
+			stmt = parseSpecialRule(line);
+		} else if (GNUMakefileUtil.isExportAllVariablesRule(line)) {
+			stmt = parseSpecialRule(line);
+		} else if (GNUMakefileUtil.isNotParallelRule(line)) {
+			stmt = parseSpecialRule(line);
+		}
+		return stmt;
+	}
+
+	/**
+	 * @param line
+	 * @return
+	 */
+	protected SpecialRule parseSpecialRule(String line) {
+		line = line.trim();
+		String keyword =  null;
+		String[] reqs = null;
+		SpecialRule special = null;
+		int index = Util.indexOf(line, ':');
+		if (index != -1) {
+			keyword = line.substring(0, index).trim();
+			String req = line.substring(index + 1);
+			reqs = PosixMakefileUtil.findPrerequisites(req);
+		} else {
+			keyword = line;
+			reqs = new String[0];
+		}
+		if (keyword.equals(MakeFileConstants.RULE_IGNORE)) {
+			special = new IgnoreRule(this, reqs);
+		} else if (keyword.equals(MakeFileConstants.RULE_POSIX)) {
+			special = new PosixRule(this);
+		} else if (keyword.equals(MakeFileConstants.RULE_PRECIOUS)) {
+			special = new PreciousRule(this, reqs);
+		} else if (keyword.equals(MakeFileConstants.RULE_SILENT)) {
+			special = new SilentRule(this, reqs);
+		} else if (keyword.equals(MakeFileConstants.RULE_SUFFIXES)) {
+			special = new SuffixesRule(this, reqs);
+		} else if (keyword.equals(MakeFileConstants.RULE_DEFAULT)) {
+			special = new DefaultRule(this, new Command[0]);
+		} else if (keyword.equals(MakeFileConstants.RULE_SCCS_GET)) {
+			special = new SccsGetRule(this, new Command[0]);
+		} else if (keyword.equals(GNUMakefileConstants.RULE_PHONY)) {
+			special = new PhonyRule(this, reqs);
+		} else if (keyword.equals(GNUMakefileConstants.RULE_INTERMEDIATE)) {
+			special = new IntermediateRule(this, reqs);
+		} else if (keyword.equals(GNUMakefileConstants.RULE_SECONDARY)) {
+			special = new SecondaryRule(this, reqs);
+		} else if (keyword.equals(GNUMakefileConstants.RULE_DELETE_ON_ERROR)) {
+			special = new DeleteOnErrorRule(this, reqs);
+		} else if (keyword.equals(GNUMakefileConstants.RULE_LOW_RESOLUTION_TIME)) {
+			special = new LowResolutionTimeRule(this, reqs);
+		} else if (keyword.equals(GNUMakefileConstants.RULE_EXPORT_ALL_VARIABLES)) {
+			special = new ExportAllVariablesRule(this, reqs);
+		} else if (keyword.equals(GNUMakefileConstants.RULE_NOT_PARALLEL)) {
+			special = new NotParallelRule(this, reqs);
+		}
+		return special;
+	}
+	
+	/**
+	 * if CONDITIONAL
+	 *
+	 * @param line
+	 * @return
+	 */
+	protected If parseIf(String line, Rule[] rules) {
+		line = line.trim();
+		String keyword = null;
+		// Move pass the keyword
+		for (int i = 0; i < line.length(); i++) {
+			if (Util.isSpace(line.charAt(i))) {
+				keyword = line.substring(0, i);
+				line = line.substring(i).trim();
+				break;
+			}
+		}
+		if (keyword == null) {
+			keyword = line;
+		}
+		if (keyword.equals(GNUMakefileConstants.CONDITIONAL_IF) ||
+				keyword.equals(GNUMakefileConstants.AT_CONDITIONAL_IF)) {
+			return new If(this, rules, line);
+		}
+		return null;
+	}
+
+	/**
+	 * 
+	 * ifdef CONDITIONAL
+	 * ifeq CONDITIONAL
+	 * ifneq CONDITIONAL
+	 * else
+	 *
+	 * @param line
+	 * @return
+	 */
+	protected Conditional parseConditional(String line) {
+		Conditional condition = null;
+		line = line.trim();
+		String keyword = null;
+		// Move pass the keyword
+		for (int i = 0; i < line.length(); i++) {
+			if (Util.isSpace(line.charAt(i))) {
+				keyword = line.substring(0, i);
+				line = line.substring(i).trim();
+				break;
+			}
+		}
+		if (keyword == null) {
+			keyword = line;
+		}
+		if (keyword.equals(GNUMakefileConstants.CONDITIONAL_IFDEF)) {
+			condition = new Ifdef(this, line);
+		} else if (keyword.equals(GNUMakefileConstants.CONDITIONAL_IFNDEF)) {
+			condition = new Ifndef(this, line);
+		} else if (keyword.equals(GNUMakefileConstants.CONDITIONAL_IFEQ)) {
+			condition = new Ifeq(this, line);
+		} else if (keyword.equals(GNUMakefileConstants.CONDITIONAL_IFNEQ)) {
+			condition = new Ifneq(this, line);
+		} else if (keyword.equals(GNUMakefileConstants.CONDITIONAL_ELSE)) {
+			condition = new Else(this);
+		}
+		return condition;
+	}
+
+	/**
+	 * An Autoconf directive of the form @xxx@
+	 */
+	protected AutomakeConfigMacro parseConfigMacro(String line) {
+		String extraChars = "_-";
+		char[] ch = line.toCharArray();
+		int i = 1;
+		while (Character.isLetterOrDigit(ch[i]) ||
+				extraChars.indexOf(ch[i]) >= 0) {
+			++i;
+		}
+		if (i > 1 && ch[i] == '@')
+			return new AutomakeConfigMacro(this, line.substring(0, i+1));
+		return null;
+	}
+	/**
+	 *  Format of the include directive:
+	 *      include filename1 filename2 ...
+	 */
+	protected Include parseInclude(String line) {
+		String[] filenames;
+		StringTokenizer st = new StringTokenizer(line);
+		int count = st.countTokens();
+		if (count > 0) {
+			filenames = new String[count - 1];
+			for (int i = 0; i < count; i++) {
+				if (i == 0) {
+					st.nextToken();
+					// ignore the "include" keyword.
+					continue;
+				}
+				filenames[i - 1] = st.nextToken();
+			}
+		} else {
+			filenames = new String[0];
+		}
+		return new Include(this, filenames, getIncludeDirectories());
+	}
+
+	/**
+	   * There are three forms of the "vpath" directive:
+	   *      "vpath PATTERN DIRECTORIES"
+	   * Specify the search path DIRECTORIES for file names that match PATTERN.
+	   *
+	   * The search path, DIRECTORIES, is a list of directories to be
+	   * searched, separated by colons (semi-colons on MS-DOS and
+	   * MS-Windows) or blanks, just like the search path used in the `VPATH' variable.
+	   *
+	   *      "vpath PATTERN"
+	   * Clear out the search path associated with PATTERN.
+	   *
+	   *      "vpath"
+	   * Clear all search paths previously specified with `vpath' directives.
+	   */
+	protected VPath parseVPath(String line) {
+		String pattern = null;
+		String[] directories;
+		StringTokenizer st = new StringTokenizer(line);
+		int count = st.countTokens();
+		List<String> dirs = new ArrayList<String>(count);
+		if (count > 0) {
+			for (int i = 0; i < count; i++) {
+				if (count == 0) {
+					// ignore the "vpath" directive
+					st.nextToken();
+				} else if (count == 1) {
+					pattern = st.nextToken();
+				} else if (count == 3) {
+					String delim = " \t\n\r\f" + GNUAutomakefile.PATH_SEPARATOR; //$NON-NLS-1$
+					dirs.add(st.nextToken(delim));
+				} else {
+					dirs.add(st.nextToken());
+				}
+			}
+		}
+		directories = (String[]) dirs.toArray(new String[0]);
+		if (pattern == null) {
+			pattern = new String();
+		}
+		return new VPath(this, pattern, directories);
+	}
+
+	/**
+	 * @param line
+	 * @return
+	 */
+	protected UnExport parseUnExport(String line) {
+		// Pass over "unexport"
+		for (int i = 0; i < line.length(); i++) {
+			if (Util.isSpace(line.charAt(i))) {
+				line = line.substring(i).trim();
+				break;
+			}
+		}
+		return new UnExport(this, line);
+	}
+
+	protected GNUTargetRule[] parseGNUTargetRules(String line) {
+		String[] targetNames;
+		String[] normalReqs;
+		String[] orderReqs;
+		String cmd = null;
+		boolean doubleColon = false;
+		int index = Util.indexOf(line, ':');
+		if (index != -1) {
+			// Break the targets
+			String target = line.substring(0, index);
+			targetNames = PosixMakefileUtil.findTargets(target.trim());
+
+			// Some TargetRule have "::" for separator
+			String req = line.substring(index + 1);
+			doubleColon = req.startsWith(":"); //$NON-NLS-1$
+			if (doubleColon) {
+				// move pass the second ':'
+				req = req.substring(1);
+			}
+
+			// Check for command
+			int semicolon = Util.indexOf(req, ';');
+			if (semicolon != -1) {
+				cmd = req.substring(semicolon + 1);
+				req = req.substring(0, semicolon);
+			}
+
+			// Check for Normal and order prerequisites
+			String normalReq = null;
+			String orderReq = null;
+			int pipe = Util.indexOf(req, '|');
+			if (pipe != -1) {
+				normalReq = req.substring(0, pipe);
+				orderReq = req.substring(pipe + 1);
+			} else {
+				normalReq = req;
+				orderReq = ""; //$NON-NLS-1$
+			}
+
+			normalReqs = PosixMakefileUtil.findPrerequisites(normalReq.trim());
+			orderReqs = PosixMakefileUtil.findPrerequisites(orderReq.trim());
+		} else {
+			targetNames = PosixMakefileUtil.findTargets(line);
+			normalReqs = new String[0];
+			orderReqs = new String[0];
+		}
+
+		GNUTargetRule[] rules = new GNUTargetRule[targetNames.length];
+		for (int i = 0; i < targetNames.length; i++) {
+			rules[i] = new GNUTargetRule(this, new Target(targetNames[i]), doubleColon, normalReqs, orderReqs, new Command[0]);
+			if (cmd != null) {
+				rules[i].addDirective(new Command(this, cmd));
+			}
+		}
+		return rules;
+	}
+
+	protected GNUVariableDef parseGNUVariableDef(String line) {
+		line = line.trim();
+		GNUVariableDef vd;
+
+		// the default type.
+		int type = GNUVariableDef.TYPE_RECURSIVE_EXPAND;
+		boolean isDefine = false;
+		boolean isOverride = false;
+		boolean isTargetVariable = false;
+		boolean isExport = false;
+		String targetName = ""; //$NON-NLS-1$
+
+		String name;
+		StringBuffer value = new StringBuffer();
+
+		// Check for Target: Variable-assignment
+		isTargetVariable = GNUMakefileUtil.isTargetVariable(line);
+		if (isTargetVariable) {
+			// move to the first ':'
+			int colon = Util.indexOf(line, ':');
+			if (colon != -1) {
+				targetName = line.substring(0, colon).trim();
+				line = line.substring(colon + 1).trim();
+			} else {
+				targetName = ""; //$NON-NLS-1$
+			}
+		}
+
+		// Check for Override condition.
+		if (GNUMakefileUtil.isOverride(line)) {
+			isOverride = true;
+			// Move pass the keyword override.
+			for (int i = 0; i < line.length(); i++) {
+				if (Util.isSpace(line.charAt(i))) {
+					line = line.substring(i).trim();
+					break;
+				}
+			}
+		}
+
+		// Check for "define"
+		if (GNUMakefileUtil.isDefine(line)) {
+			isDefine = true;
+			// Move pass the keyword define.
+			for (int i = 0; i < line.length(); i++) {
+				if (Util.isSpace(line.charAt(i))) {
+					line = line.substring(i).trim();
+					break;
+				}
+			}
+		}
+
+		// Check for Override condition.
+		if (GNUMakefileUtil.isExport(line)) {
+			isExport = true;
+			// Move pass the keyword export.
+			for (int i = 0; i < line.length(); i++) {
+				if (Util.isSpace(line.charAt(i))) {
+					line = line.substring(i).trim();
+					break;
+				}
+			}
+		}
+
+		// Check for Target-variable
+
+		int index = line.indexOf('=');
+		if (index != -1) {
+			int separator = index;
+			// Check for "+=",  ":=", "?="
+			if (index > 0) {
+				type = line.charAt(index - 1);
+				if (type == GNUVariableDef.TYPE_SIMPLE_EXPAND
+					|| type == GNUVariableDef.TYPE_APPEND
+					|| type == GNUVariableDef.TYPE_CONDITIONAL) {
+					separator = index - 1;
+				} else {
+					type = GNUVariableDef.TYPE_RECURSIVE_EXPAND;
+				}
+			}
+			name = line.substring(0, separator).trim();
+			value.append(line.substring(index + 1).trim());
+		} else {
+			name = line;
+		}
+
+		if (isTargetVariable) {
+			vd = new TargetVariable(this, targetName, name, value, isOverride, type);
+		} else if (isOverride && isDefine) {
+			vd = new OverrideDefine(this, name, value);
+		} else if (isDefine) {
+			vd = new DefineVariable(this, name, value);
+		} else if (isOverride) {
+			vd = new OverrideVariable(this, name, value, type);
+		} else if (isExport) {
+			vd = new ExportVariable(this, name, value, type);
+		} else {
+			vd = new GNUVariableDef(this, name, value, type);
+		}
+		return vd;
+	}
+
+	protected StaticTargetRule[] parseStaticTargetRule(String line) {
+		// first colon: the Targets
+		String targetPattern;
+		String[] prereqPatterns;
+		String[] targets;
+		int colon = Util.indexOf(line, ':');
+		if (colon > 1) {
+			String targetLine = line.substring(0, colon).trim();
+			targets = PosixMakefileUtil.findTargets(targetLine);
+			// second colon: Target-Pattern
+			line = line.substring(colon + 1);
+			colon = Util.indexOf(line, ':');
+			if (colon != -1) {
+				targetPattern = line.substring(0, colon).trim();
+				line = line.substring(colon + 1);
+				StringTokenizer st = new StringTokenizer(line);
+				int count = st.countTokens();
+				prereqPatterns = new String[count];
+				for (int i = 0; i < count; i++) {
+					prereqPatterns[i] = st.nextToken();
+				}
+			} else {
+				targetPattern = ""; //$NON-NLS-1$
+				prereqPatterns = new String[0];
+			}
+		} else {
+			targets = new String[0];
+			targetPattern = ""; //$NON-NLS-1$
+			prereqPatterns = new String[0];
+		}
+
+		StaticTargetRule[] staticRules = new StaticTargetRule[targets.length];
+		for (int i = 0; i < targets.length; i++) {
+			staticRules[i] = new StaticTargetRule(this, new Target(targets[i]), targetPattern, prereqPatterns, new Command[0]);
+		}
+		return staticRules;
+	}
+
+	/**
+	 * @param line
+	 * @return
+	 */
+	protected InferenceRule parseInferenceRule(String line) {
+		String tgt;
+		int index = Util.indexOf(line, ':');
+		if (index != -1) {
+			tgt = line.substring(0, index);
+		} else {
+			tgt = line;
+		}
+		return new InferenceRule(this, new Target(tgt));
+	}
+
+	public IDirective[] getDirectives(boolean expand) {
+		if (!expand) {
+			return getDirectives();
+		}
+		IDirective[] dirs = getDirectives();
+		ArrayList<IDirective> list = new ArrayList<IDirective>(Arrays.asList(dirs));
+		for (int i = 0; i < dirs.length; ++i) {
+			if (dirs[i] instanceof Include) {
+				Include include = (Include)dirs[i];
+				IDirective[] includedMakefiles = include.getDirectives();
+				for (int j = 0; j < includedMakefiles.length; ++j) {
+					IMakefile includedMakefile = (IMakefile)includedMakefiles[j];
+					list.addAll(Arrays.asList(includedMakefile.getDirectives()));
+				}
+			}
+		}
+		return (IDirective[]) list.toArray(new IDirective[list.size()]);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.AbstractMakefile#getBuiltins()
+	 */
+	public IDirective[] getBuiltins() {
+		if (builtins == null) {
+			String location =  "builtin" + File.separator + "gnu.mk"; //$NON-NLS-1$ //$NON-NLS-2$
+			try {
+				InputStream stream = FileLocator.openStream(MakeCorePlugin.getDefault().getBundle(), new Path(location), false);
+				GNUAutomakefile gnu = new GNUAutomakefile();
+				URL url = FileLocator.find(MakeCorePlugin.getDefault().getBundle(), new Path(location), null);
+				url = FileLocator.resolve(url);
+				location = url.getFile();
+				gnu.parse(location, new InputStreamReader(stream));
+				builtins = gnu.getDirectives();
+				for (int i = 0; i < builtins.length; i++) {
+					if (builtins[i] instanceof MacroDefinition) {
+						((MacroDefinition)builtins[i]).setFromDefault(true);
+					}
+				}
+			} catch (Exception e) {
+				//e.printStackTrace();
+			}
+			if (builtins == null) {
+				builtins = new IDirective[0];
+			}
+		}
+		return builtins;
+	}
+
+	public void setIncludeDirectories(String[] dirs) {
+		includeDirectories = dirs;
+	}
+
+	public String[] getIncludeDirectories() {
+		return includeDirectories;
+	}
+
+	public static void main(String[] args) {
+		try {
+			String filename = "Makefile"; //$NON-NLS-1$
+			if (args.length == 1) {
+				filename = args[0];
+			}
+			GNUAutomakefile makefile = new GNUAutomakefile();
+			makefile.parse(filename);
+			IDirective[] directive = makefile.getDirectives();
+			for (int i = 0; i < directive.length; i++) {
+				//System.out.println("Rule[" + i +"]");
+				System.out.print(directive[i]);
+			}
+		} catch (IOException e) {
+			System.out.println(e);
+		}
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUMakefileConstants.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUMakefileConstants.java
new file mode 100644
index 0000000..a9ccdfb
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUMakefileConstants.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - modified for Automake editor usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+public class GNUMakefileConstants extends MakeFileConstants {
+    static final String CONDITIONAL_ELSE = "else"; //$NON-NLS-1$
+    static final String CONDITIONAL_IF = "if"; //$NON-NLS-1$
+    static final String AT_CONDITIONAL_IF = "@if"; //$NON-NLS-1$
+    static final String CONDITIONAL_IFNEQ = "ifneq";  //$NON-NLS-1$
+    static final String CONDITIONAL_IFNDEF = "ifndef"; //$NON-NLS-1$
+    static final String CONDITIONAL_IFEQ = "ifeq"; //$NON-NLS-1$
+    static final String CONDITIONAL_IFDEF = "ifdef"; //$NON-NLS-1$
+ 
+    static final String TERMINAL_ENDEF = "endef"; //$NON-NLS-1$
+    static final String TERMINAL_ENDIF = "endif"; //$NON-NLS-1$
+    static final String AT_TERMINAL_ENDIF = "@endif"; //$NON-NLS-1$
+
+    static final String DIRECTIVE_VPATH = "vpath"; //$NON-NLS-1$
+    static final String DIRECTIVE_UNEXPORT = "unexport"; //$NON-NLS-1$
+    
+    static final String VARIABLE_DEFINE = "define"; //$NON-NLS-1$
+    static final String VARIABLE_EXPORT = "export"; //$NON-NLS-1$
+    static final String VARIABLE_OVERRIDE = "override"; //$NON-NLS-1$
+    
+    static final String DIRECTIVE_INCLUDE =  "include"; //$NON-NLS-1$
+
+    static final String RULE_DELETE_ON_ERROR = ".DELETE_ON_ERROR";  //$NON-NLS-1$
+    static final String RULE_PHONY = ".PHONY"; //$NON-NLS-1$
+    static final String RULE_SECONDARY = ".SECONDARY"; //$NON-NLS-1$
+    static final String RULE_LOW_RESOLUTION_TIME = ".LOW_RESOLUTION_TIME"; //$NON-NLS-1$
+    static final String RULE_NOT_PARALLEL = ".NOTPARALLEL"; //$NON-NLS-1$
+    static final String RULE_EXPORT_ALL_VARIABLES = ".EXPORT_ALL_VARIABLES"; //$NON-NLS-1$
+    static final String RULE_INTERMEDIATE = ".INTERMEDIATE"; //$NON-NLS-1$
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUMakefileUtil.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUMakefileUtil.java
new file mode 100644
index 0000000..80a3c45
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUMakefileUtil.java
@@ -0,0 +1,233 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - modified for Automake editor usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+/**
+ * GNUMakefile
+ */
+public class GNUMakefileUtil extends PosixMakefileUtil {
+
+	public static boolean isInclude(String line) {
+		line = line.trim();
+		boolean isInclude = line.startsWith(GNUMakefileConstants.DIRECTIVE_INCLUDE) && line.length() > 7 && Character.isWhitespace(line.charAt(7));
+		boolean isDashInclude = line.startsWith("-" + GNUMakefileConstants.DIRECTIVE_INCLUDE) && line.length() > 8 && Character.isWhitespace(line.charAt(8)); //$NON-NLS-1$
+		boolean isSInclude = line.startsWith("s" + GNUMakefileConstants.DIRECTIVE_INCLUDE) && line.length() > 8 && Character.isWhitespace(line.charAt(8)); //$NON-NLS-1$
+		return isInclude || isDashInclude || isSInclude;
+	}
+
+	public static boolean isVPath(String line) {
+		line = line.trim();
+		return line.equals(GNUMakefileConstants.DIRECTIVE_VPATH) || line.startsWith(GNUMakefileConstants.DIRECTIVE_VPATH) && line.length() > 5 && Character.isWhitespace(line.charAt(5));
+	}
+
+	public static boolean isExport(String line) {
+		line = line.trim();
+		return line.equals(GNUMakefileConstants.VARIABLE_EXPORT) || line.startsWith(GNUMakefileConstants.VARIABLE_EXPORT) && line.length() > 6 && Character.isWhitespace(line.charAt(6));
+	}
+
+	public static boolean isUnExport(String line) {
+		line = line.trim();
+		return line.startsWith(GNUMakefileConstants.DIRECTIVE_UNEXPORT) && line.length() > 8 && Character.isWhitespace(line.charAt(8));
+	}
+
+	public static boolean isDefine(String line) {
+		line = line.trim();
+		return line.startsWith(GNUMakefileConstants.VARIABLE_DEFINE) && line.length() > 6 && Character.isWhitespace(line.charAt(6));
+	}
+
+	public static boolean isEndef(String line) {
+		return line.trim().equals(GNUMakefileConstants.TERMINAL_ENDEF);
+	}
+
+	public static boolean isOverride(String line) {
+		line = line.trim();
+		return line.startsWith(GNUMakefileConstants.VARIABLE_OVERRIDE) && line.length() > 8 && Character.isWhitespace(line.charAt(8));
+	}
+
+	public static boolean isIf(String line) {
+		line = line.trim();
+		return (line.startsWith(GNUMakefileConstants.CONDITIONAL_IF) && line.length() > 2 && Character.isWhitespace(line.charAt(2))) ||
+				(line.startsWith(GNUMakefileConstants.AT_CONDITIONAL_IF) && line.length() > 3 && Character.isWhitespace(line.charAt(3)));
+	}
+	
+	public static boolean isIfeq(String line) {
+		line = line.trim();
+		return line.startsWith(GNUMakefileConstants.CONDITIONAL_IFEQ) && line.length() > 4 && Character.isWhitespace(line.charAt(4));
+	}
+
+	public static boolean isIfneq(String line) {
+		line = line.trim();
+		return line.startsWith(GNUMakefileConstants.CONDITIONAL_IFNEQ) && line.length() > 5 && Character.isWhitespace(line.charAt(5));
+	}
+
+	public static boolean isIfdef(String line) {
+		line = line.trim();
+		return line.startsWith(GNUMakefileConstants.CONDITIONAL_IFDEF) && line.length() > 5 && Character.isWhitespace(line.charAt(5));
+	}
+
+	public static boolean isIfndef(String line) {
+		line = line.trim();
+		return line.startsWith(GNUMakefileConstants.CONDITIONAL_IFNDEF) && line.length() > 6 && Character.isWhitespace(line.charAt(6));
+	}
+
+	public static boolean isElse(String line) {
+		return line.trim().equals(GNUMakefileConstants.CONDITIONAL_ELSE);
+	}
+
+	public static boolean isEndif(String line) {
+		return line.trim().equals(GNUMakefileConstants.TERMINAL_ENDIF) ||
+		line.trim().startsWith(GNUMakefileConstants.AT_TERMINAL_ENDIF);
+	}
+
+	public static boolean isOverrideDefine(String line) {
+		line = line.trim();
+		if (line.startsWith(GNUMakefileConstants.VARIABLE_OVERRIDE)) {
+			int i = 8;
+			while(i < line.length() && Character.isWhitespace(line.charAt(i))) {
+				i++;
+			}
+			if (line.startsWith(GNUMakefileConstants.VARIABLE_DEFINE, i)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public static boolean isTargetVariable(String line) {
+		line = line.trim();
+		int index = Util.indexOf(line, ':');
+		if (index > 1) {
+			line = line.substring(index + 1).trim();
+			int equal = Util.indexOf(line, '=');
+			if (equal > 1) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public static boolean isVariableDefinition(String line) {
+		return isOverrideDefine(line)
+			|| isTargetVariable(line)
+			|| isDefine(line)
+			|| isOverride(line)
+			|| isExport(line)
+			|| isMacroDefinition(line);
+	}
+
+	/**
+	 * @param line
+	 * @return
+	 */
+	public static boolean isStaticTargetRule(String line) {
+		line = line.trim();
+		int colon1 = Util.indexOf(line, ':');
+		if (colon1 > 0) {
+			// move pass colon1
+			line = line.substring(colon1 + 1);
+			int colon2 =  Util.indexOf(line, ':');
+			// Catch operator "::" not a static pattern rule
+			return (colon2 > 0);
+		}
+		return false;
+	}
+
+	/**
+	 * @param line
+	 * @return
+	 */
+	public static boolean isGNUTargetRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			colon++;
+			// Catch VariableDefiniton with operator ":="
+			if (colon < line.length()) {
+				return line.charAt(colon) != '=';
+			}
+			return true;
+		}
+		return false;
+	}
+
+	public static boolean isPhonyRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(GNUMakefileConstants.RULE_PHONY);
+		}
+		return false;
+	}
+
+	public static boolean isIntermediateRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(GNUMakefileConstants.RULE_INTERMEDIATE);
+		}
+		return false;
+	}
+
+	public static boolean isSecondaryRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(GNUMakefileConstants.RULE_SECONDARY);
+		}
+		return false;
+	}
+
+	public static boolean isDeleteOnErrorRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(GNUMakefileConstants.RULE_DELETE_ON_ERROR);
+		}
+		return false;
+	}
+
+	public static boolean isLowResolutionTimeRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(GNUMakefileConstants.RULE_LOW_RESOLUTION_TIME);
+		}
+		return false;
+	}
+
+	public static boolean isExportAllVariablesRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(GNUMakefileConstants.RULE_EXPORT_ALL_VARIABLES);
+		}
+		return false;
+	}
+
+	public static boolean isNotParallelRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(GNUMakefileConstants.RULE_NOT_PARALLEL);
+		}
+		return false;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUTargetRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUTargetRule.java
new file mode 100644
index 0000000..a770e0c
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUTargetRule.java
@@ -0,0 +1,66 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.ICommand;
+
+/**
+ */
+public class GNUTargetRule extends TargetRule {
+
+	String[] orderOnlyPrerequisites;
+	boolean doubleColon;
+
+	public GNUTargetRule(Directive parent, Target target, boolean double_colon, String[] normal_prereqs, String[] order_prereqs, Command[] commands) {
+		super(parent, target, normal_prereqs, commands);
+		orderOnlyPrerequisites = order_prereqs;
+		doubleColon = double_colon;
+	}
+
+	public boolean isDoubleColon() {
+		return doubleColon;
+	}
+
+	public String[] getNormalPrerequisites() {
+		return getPrerequisites();
+	}
+
+	public String[] getOrderOnlyPrerequisites() {
+		return orderOnlyPrerequisites;
+	}
+
+
+	/**
+	 * @see java.lang.Object#toString()
+	 */
+	public String toString() {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append(getTarget().toString());
+		buffer.append(':');
+		String[] reqs = getNormalPrerequisites();
+		for (int i = 0; i < reqs.length; i++) {
+			buffer.append(' ').append(reqs[i]);
+		}
+		reqs = getOrderOnlyPrerequisites();
+		if (reqs.length > 0) {
+			buffer.append(" |"); //$NON-NLS-1$
+			for (int i = 0; i < reqs.length; i++) {
+				buffer.append(' ').append(reqs[i]);
+			}
+		}
+		buffer.append('\n');
+		ICommand[] cmds = getCommands();
+		for (int i = 0; i < cmds.length; i++) {
+			buffer.append(cmds[i].toString());
+		}
+		return buffer.toString();
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUVariableDef.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUVariableDef.java
new file mode 100644
index 0000000..9c0509e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/GNUVariableDef.java
@@ -0,0 +1,132 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - Refactor name
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.gnu.IVariableDefinition;
+
+/**
+ */
+public class GNUVariableDef extends MacroDefinition implements IVariableDefinition  {
+
+	/**
+	 * ? is Conditional
+	 * : is Simply-expanded
+	 * + is append
+	 * 0 is recursively-expanded.
+	 */
+	final static int TYPE_RECURSIVE_EXPAND = 0;
+	final static int TYPE_SIMPLE_EXPAND = ':';
+	final static int TYPE_CONDITIONAL = '?';
+	final static int TYPE_APPEND = '+';
+	int type;
+	String varTarget;
+
+	public GNUVariableDef(Directive parent, String name, StringBuffer value) {
+		this(parent, name, value, TYPE_RECURSIVE_EXPAND);
+	}
+
+	public GNUVariableDef(Directive parent, String name, StringBuffer value, int type) {
+		this(parent,  "", name, value, type); //$NON-NLS-1$
+	}
+
+	public GNUVariableDef(Directive parent, String target, String name, StringBuffer value, int type) {
+		super(parent, name, value);
+		varTarget = target;
+		this.type = type;
+	}
+
+	/**
+	 * @see java.lang.Object#toString()
+	 */
+	public String toString() {
+		StringBuffer sb = new StringBuffer();
+		if (isTargetSpecific()) {
+			sb.append(getTarget()).append(": "); //$NON-NLS-1$
+		}
+		if (isOverride()) {
+			sb.append(GNUMakefileConstants.VARIABLE_OVERRIDE);
+		}
+		if (isMultiLine()) {
+			sb.append(GNUMakefileConstants.VARIABLE_DEFINE);
+			sb.append(' ');
+			sb.append(getName()).append('\n');
+			sb.append(getValue()).append('\n');
+			sb.append(GNUMakefileConstants.TERMINAL_ENDEF);
+			sb.append('\n');
+		} else {
+			if (isExport()) {
+				sb.append(GNUMakefileConstants.VARIABLE_EXPORT);
+				sb.append(' ');
+			}
+			sb.append(getName());
+			if (isRecursivelyExpanded()) {
+				sb.append(" = "); //$NON-NLS-1$
+			} else if (isSimplyExpanded()) {
+				sb.append(" := "); //$NON-NLS-1$
+			} else if (isConditional()) {
+				sb.append(" ?= "); //$NON-NLS-1$
+			} else if (isAppend()) {
+				sb.append(" += "); //$NON-NLS-1$
+			}
+			sb.append(getValue()).append('\n');
+		}
+		return sb.toString();
+	}
+
+	public boolean isRecursivelyExpanded() {
+		return type == TYPE_RECURSIVE_EXPAND;
+	}
+
+	public boolean isSimplyExpanded() {
+		return type == TYPE_SIMPLE_EXPAND;
+	}
+
+	public boolean isConditional() {
+		return type == TYPE_CONDITIONAL;
+	}
+
+	public boolean isAppend() {
+		return type == TYPE_APPEND;
+	}
+
+	public boolean isTargetSpecific() {
+		String t = getTarget();
+		return t != null && t.length() > 0;
+	}
+
+	public boolean isExport() {
+		return false;
+	}
+
+	public boolean isMultiLine() {
+		return false;
+	}
+
+	/**
+	 * Variable from an `override' directive.
+	 */
+	 public boolean isOverride() {
+		return false;
+	}
+
+	/**
+	 * Automatic variable -- cannot be set.
+	 */
+	 public boolean isAutomatic() {
+		return false;
+	}
+
+	public String getTarget() {
+		return varTarget;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IAutomakeConditional.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IAutomakeConditional.java
new file mode 100644
index 0000000..623d72b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IAutomakeConditional.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+public interface IAutomakeConditional {
+	
+	public boolean isAutomake();
+	public void setAutomake(boolean value);
+	public Rule[] getRules();
+	public void setRules(Rule[] rules);
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IMakefileDocumentProvider.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IMakefileDocumentProvider.java
new file mode 100644
index 0000000..22f1218
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IMakefileDocumentProvider.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+/*
+ */
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+
+/**
+ */
+public interface IMakefileDocumentProvider extends IDocumentProvider {
+
+	/**
+	 * Shuts down this provider.
+	 */
+	void shutdown();
+
+	/**
+	 * Returns the working copy for the given element.
+	 *
+	 * @param element the element
+	 * @return the working copy for the given element
+	 */
+	IMakefile getWorkingCopy(Object element);
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IMakefileEditorActionDefinitionIds.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IMakefileEditorActionDefinitionIds.java
new file mode 100644
index 0000000..dc0642c
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IMakefileEditorActionDefinitionIds.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2005 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
+
+/**
+ */
+public interface IMakefileEditorActionDefinitionIds extends ITextEditorActionDefinitionIds {
+
+	final String UNCOMMENT = "org.eclipse.cdt.make.ui.edit.text.makefile.uncomment"; //$NON-NLS-1$
+
+	final String COMMENT = "org.eclipse.cdt.make.ui.edit.text.makefile.comment"; //$NON-NLS-1$
+
+	final String OPEN_DECLARATION = "org.eclipse.cdt.make.ui.edit.text.makefile.opendcl"; //$NON-NLS-1$
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IReconcilingParticipant.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IReconcilingParticipant.java
new file mode 100644
index 0000000..783dff8
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IReconcilingParticipant.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+/**
+ * IReconcilingParticipant
+ * Interface of an object participating in reconciling.
+ */
+public interface IReconcilingParticipant {
+	
+	/**
+	 * Called after reconciling has been finished.
+	 */
+	void reconciled();
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ISelectionValidator.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ISelectionValidator.java
new file mode 100644
index 0000000..38984ea
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ISelectionValidator.java
@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+public interface ISelectionValidator {
+	void isValid(Object[] selection, StatusInfo res);
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ITranslationUnitEditorInput.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ITranslationUnitEditorInput.java
new file mode 100644
index 0000000..33db78b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ITranslationUnitEditorInput.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.core.model.ITranslationUnit;
+import org.eclipse.ui.IStorageEditorInput;
+import org.eclipse.ui.editors.text.ILocationProvider;
+
+/**
+ * ITranslationUnitEditorInput
+ */
+public interface ITranslationUnitEditorInput extends IStorageEditorInput, ILocationProvider {
+
+	ITranslationUnit getTranslationUnit();
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/If.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/If.java
new file mode 100644
index 0000000..83dd8d6
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/If.java
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - modified to be If class
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.eclipse.cdt.make.core.makefile.ICommand;
+
+
+public class If extends Conditional implements IAutomakeConditional, ICommand {
+    private static final String EMPTY = ""; //$NON-NLS-1$
+    private Rule rules[] = null;
+    
+	public If(Directive parent, Rule[] rules, String var) {
+		super(parent, var, EMPTY, EMPTY);
+		if (rules != null) {
+			this.rules = new Rule[rules.length];
+			System.arraycopy(rules, 0, this.rules, 0, rules.length);
+		}
+	}
+
+	public Rule[] getRules() {
+		return rules;
+	}
+	
+	public void setRules(Rule[] rules) {
+		this.rules = rules;
+	}
+	
+	public boolean isIf() {
+		return true;
+	}
+
+	public boolean isAutomake() {
+		return true;
+	}
+	
+	public void setAutomake(boolean value) {
+		// ignore value
+	}
+	
+	public String toString() {
+		StringBuffer sb = new StringBuffer(GNUMakefileConstants.CONDITIONAL_IF);
+		sb.append(' ').append(getVariable());
+		return sb.toString();
+	}
+
+	public String getVariable() {
+		return getConditional();
+	}
+	
+	// ICommand methods so Automake if can be a child of an IRule
+	public Process execute(String shell, String[] envp, File dir)
+			throws IOException {
+		return null;
+	}
+	
+	public boolean shouldBeSilent() {
+		return false;
+	}
+	
+	public boolean shouldIgnoreError() {
+		return false;
+	}
+	
+	public boolean shouldExecute() {
+		return false;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifdef.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifdef.java
new file mode 100644
index 0000000..f1e9dfb
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifdef.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+public class Ifdef extends Conditional {
+    private static final String EMPTY = ""; //$NON-NLS-1$
+    
+	public Ifdef(Directive parent, String var) {
+		super(parent, var, EMPTY, EMPTY);
+	}
+
+	public boolean isIfdef() {
+		return true;
+	}
+
+	public String toString() {
+		StringBuffer sb = new StringBuffer(GNUMakefileConstants.CONDITIONAL_IFDEF);
+		sb.append(' ').append(getVariable());
+		return sb.toString();
+	}
+
+	public String getVariable() {
+		return getConditional();
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifeq.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifeq.java
new file mode 100644
index 0000000..ea02665
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifeq.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+public class Ifeq extends Conditional {
+
+	public Ifeq(Directive parent, String cond) {
+		super(parent, cond);
+	}
+
+	public boolean isIfeq() {
+		return true;
+	}
+
+	public String toString() {
+		StringBuffer sb = new StringBuffer(GNUMakefileConstants.CONDITIONAL_IFEQ);
+		sb.append(' ').append(getConditional());
+		return sb.toString();
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifndef.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifndef.java
new file mode 100644
index 0000000..336765b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifndef.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+public class Ifndef extends Conditional {
+
+    private static final String EMPTY = ""; //$NON-NLS-1$
+	public Ifndef(Directive parent, String var) {
+		super(parent, var, EMPTY, EMPTY);
+	}
+
+	public boolean isIfndef() {
+		return true;
+	}
+
+	public String toString() {
+		StringBuffer sb = new StringBuffer(GNUMakefileConstants.CONDITIONAL_IFNDEF);
+		sb.append(' ').append(getVariable());
+		return sb.toString();
+	}
+
+	public String getVariable() {
+		return getConditional();
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifneq.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifneq.java
new file mode 100644
index 0000000..fa02a12
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Ifneq.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+public class Ifneq extends Conditional {
+
+	public Ifneq(Directive parent, String cond) {
+		super(parent, cond);
+	}
+
+	public boolean isIfneq() {
+		return true;
+	}
+
+	public String toString() {
+		StringBuffer sb = new StringBuffer(GNUMakefileConstants.CONDITIONAL_IFNEQ);
+		sb.append(' ').append(getConditional());
+		return sb.toString();
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IgnoreRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IgnoreRule.java
new file mode 100644
index 0000000..a962aea
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IgnoreRule.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IIgnoreRule;
+
+/**
+ * .IGNORE
+ * Prerequisites of this special target are targets themselves; this shall cause errors
+ * from commands associated with them to be ignored in the same manner as
+ * specified by the -i option.
+ */
+public class IgnoreRule extends SpecialRule implements IIgnoreRule {
+
+	public IgnoreRule(Directive parent, String[] reqs) {
+		super(parent, new Target(MakeFileConstants.RULE_IGNORE), reqs, new Command[0]);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Include.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Include.java
new file mode 100644
index 0000000..1110c13
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Include.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.IOException;
+
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.gnu.IInclude;
+
+public class Include extends Parent implements IInclude {
+
+	String[] filenames;
+	String[] dirs;
+
+	public Include(Directive parent, String[] files, String[] directories) {
+		super(parent);
+		filenames = files;
+		dirs = directories;
+	}
+
+	public String toString() {
+		StringBuffer sb = new StringBuffer(GNUMakefileConstants.DIRECTIVE_INCLUDE);
+		for (int i = 0; i < filenames.length; i++) {
+			sb.append(' ').append(filenames[i]);
+		}
+		return sb.toString();
+	}
+
+	public String[] getFilenames() {
+		return filenames;
+	}
+
+	public IDirective[] getDirectives() {
+		clearDirectives();
+		for (int i = 0; i < filenames.length; i++) {
+			// Try the current directory.
+			GNUAutomakefile gnu = new GNUAutomakefile();
+			try {
+				gnu.parse(filenames[i]);
+				addDirective(gnu);
+				continue;
+			} catch (IOException e) {
+			}
+			if (!filenames[i].startsWith(GNUAutomakefile.FILE_SEPARATOR) && dirs != null) {
+				for (int j = 0; j < dirs.length; j++) {
+					try {
+						String filename =  dirs[j] + GNUAutomakefile.FILE_SEPARATOR + filenames[i];
+						gnu = new GNUAutomakefile();
+						gnu.parse(filename);
+						addDirective(gnu);
+						break;
+					} catch (IOException e) {
+					}
+				}
+			}
+		}
+		return super.getDirectives();
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/InferenceRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/InferenceRule.java
new file mode 100644
index 0000000..308fdca
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/InferenceRule.java
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.ICommand;
+
+public class InferenceRule extends Rule {
+
+	public InferenceRule(Directive parent, Target target) {
+		this(parent, target, new Command[0]);
+	}
+
+	public InferenceRule(Directive parent, String tgt, Command[] cmds) {
+		this(parent, new Target(tgt), cmds);
+	}
+
+	public InferenceRule(Directive parent, Target target, Command[] cmds) {
+		super(parent, target, cmds);
+	}
+
+	/**
+	 * @see java.lang.Object#toString()
+	 */
+	public String toString() {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append(getTarget().toString()).append(":\n"); //$NON-NLS-1$
+		ICommand[] cmds = getCommands();
+		for (int i = 0; i < cmds.length; i++) {
+			buffer.append(cmds[i].toString());
+		}
+		return buffer.toString();
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IntermediateRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IntermediateRule.java
new file mode 100644
index 0000000..20dee49
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/IntermediateRule.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.gnu.IIntermediateRule;
+
+
+/**
+ * .INTERMEDIATE
+ *   The targets which `.INTERMEDIATE' depends on are treated as intermediate files.
+ *   `.INTERMEDIATE' with no prerequisites has no effect.
+ */
+public class IntermediateRule extends SpecialRule implements IIntermediateRule {
+
+	public IntermediateRule(Directive parent, String[] reqs) {
+		super(parent, new Target(GNUMakefileConstants.RULE_INTERMEDIATE), reqs, new Command[0]);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/LexicalSortingAction.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/LexicalSortingAction.java
new file mode 100644
index 0000000..fc15565
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/LexicalSortingAction.java
@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *     Red Hat Inc. - convert to use with Automake editor
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.core.model.ICElement;
+import org.eclipse.cdt.ui.CUIPlugin;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.MakeUIImages;
+
+
+
+public class LexicalSortingAction extends Action {
+	
+	private static final String ACTION_NAME= "LexicalSortingAction"; //$NON-NLS-1$
+	private static final String DIALOG_STORE_KEY= ACTION_NAME + ".sort"; //$NON-NLS-1$
+	
+	private LexicalCSorter fSorter;
+	private TreeViewer fTreeViewer;
+	
+	public LexicalSortingAction(TreeViewer treeViewer) {
+		super(CUIPlugin.getResourceString(ACTION_NAME + ".label")); //$NON-NLS-1$
+		
+		setDescription(CUIPlugin.getResourceString(ACTION_NAME + ".description")); //$NON-NLS-1$
+		setToolTipText(CUIPlugin.getResourceString(ACTION_NAME + ".tooltip")); //$NON-NLS-1$
+	
+		MakeUIImages.setImageDescriptors(this, MakeUIImages.T_TOOL, MakeUIImages.IMG_TOOLS_ALPHA_SORTING);
+	
+		fTreeViewer= treeViewer;
+		fSorter= new LexicalCSorter();
+		
+		boolean checked= CUIPlugin.getDefault().getDialogSettings().getBoolean(DIALOG_STORE_KEY);
+		valueChanged(checked, false);
+	}
+	
+	public void run() {
+		valueChanged(isChecked(), true);
+	}
+	
+	private void valueChanged(boolean on, boolean store) {
+		setChecked(on);
+		fTreeViewer.setSorter(on ? fSorter : null);
+		
+		String key= ACTION_NAME + ".tooltip" + (on ? ".on" : ".off"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		setToolTipText(CUIPlugin.getResourceString(key));
+		
+		if (store) {
+			CUIPlugin.getDefault().getDialogSettings().put(DIALOG_STORE_KEY, on);
+		}
+	}
+	
+	private class LexicalCSorter extends ViewerSorter {		
+		@SuppressWarnings("unused")
+		public boolean isSorterProperty(Object element, Object property) {
+			return true;
+		}
+		
+		public int category(Object obj) {
+			if (obj instanceof ICElement) {
+				ICElement elem= (ICElement)obj;
+				switch (elem.getElementType()) {
+					case ICElement.C_MACRO: return 1;
+					case ICElement.C_INCLUDE: return 2;
+					
+					case ICElement.C_CLASS: return 3;
+					case ICElement.C_STRUCT: return 4;
+					case ICElement.C_UNION: return 5;
+					
+					case ICElement.C_FIELD: return 6;
+					case ICElement.C_FUNCTION: return 7;		
+				}
+				
+			}
+			return 0;
+		}
+	}
+	
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/LowResolutionTimeRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/LowResolutionTimeRule.java
new file mode 100644
index 0000000..e22225e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/LowResolutionTimeRule.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.gnu.ILowResolutionTimeRule;
+
+
+/**
+ * .LOW_RESOLUTION_TIME'
+ *  If you specify prerequisites for `.LOW_RESOLUTION_TIME', `make'
+ *  assumes that these files are created by commands that generate low
+ *  resolution time stamps.
+ */
+public class LowResolutionTimeRule extends SpecialRule implements ILowResolutionTimeRule {
+
+	public LowResolutionTimeRule(Directive parent, String[] reqs) {
+		super(parent, new Target(GNUMakefileConstants.RULE_LOW_RESOLUTION_TIME), reqs, new Command[0]);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MacroDefinition.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MacroDefinition.java
new file mode 100644
index 0000000..74859d2
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MacroDefinition.java
@@ -0,0 +1,112 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IMacroDefinition;
+
+/**
+ */
+public class MacroDefinition extends Directive implements IMacroDefinition {
+	String name;
+	StringBuffer value;
+	boolean fromCommand;
+	boolean fromDefault;
+	boolean fromMakefile;
+	boolean fromEnvironment;
+	boolean fromEnvironmentOverride;
+
+	public MacroDefinition(Directive parent, String n, StringBuffer v) {
+		super(parent);
+		name = n;
+		value = v;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String n) {
+		name = (n == null) ? "" : n.trim() ; //$NON-NLS-1$
+	}
+
+	public StringBuffer getValue() {
+		return value;
+	}
+
+	/**
+	 * @see java.lang.Object#toString()
+	 */
+	public String toString() {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append(getName()).append(" = ").append(getValue()).append('\n'); //$NON-NLS-1$
+		return buffer.toString();
+	}
+
+	public boolean equals(MacroDefinition v) {
+		return v.getName().equals(getName());
+	}
+
+	public void setFromCommand(boolean from) {
+		fromCommand = from;
+	}
+
+	public void setFromDefault(boolean from) {
+		fromDefault = from;
+	}
+
+	public void setFromEnviroment(boolean from) {
+		fromEnvironment = from;
+	}
+
+	public void setFromEnviromentOverride(boolean from) {
+		fromEnvironmentOverride = from;
+	}
+
+	public void setFromMakefile(boolean from) {
+		fromMakefile = from;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.make.core.makefile.IMacroDefinition#isFromCommand()
+	 */
+	public boolean isFromCommand() {
+		return fromCommand;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.make.core.makefile.IMacroDefinition#isFromDefault()
+	 */
+	public boolean isFromDefault() {
+		return fromDefault;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.make.core.makefile.IMacroDefinition#isFromEnviroment()
+	 */
+	public boolean isFromEnviroment() {
+		return fromEnvironment;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.make.core.makefile.IMacroDefinition#isFromEnviroment()
+	 */
+	public boolean isFromEnvironmentOverride() {
+		return fromEnvironmentOverride;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.make.core.makefile.IMacroDefinition#isFromMakefile()
+	 */
+	public boolean isFromMakefile() {
+		return fromMakefile;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MacroDefinitionRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MacroDefinitionRule.java
new file mode 100644
index 0000000..c1f86af
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MacroDefinitionRule.java
@@ -0,0 +1,164 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IPredicateRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.Token;
+
+class MacroDefinitionRule implements IPredicateRule {
+	private static final int INIT_STATE = 0;
+	private static final int VAR_STATE = 1;
+	private static final int END_VAR_STATE = 2;
+	private static final int EQUAL_STATE = 3;
+	private static final int FINISH_STATE = 4;
+	private static final int ERROR_STATE = 5;
+
+	private IToken token;
+	private StringBuffer buffer = new StringBuffer();
+	protected IToken defaultToken;
+	
+	public MacroDefinitionRule(IToken token, IToken defaultToken) {
+		this.token = token;
+		this.defaultToken = defaultToken;
+	}
+
+	public IToken getSuccessToken() {
+		return token;
+	}
+
+	public IToken evaluate(ICharacterScanner scanner, boolean resume) {
+		buffer.setLength(0);
+		int state = INIT_STATE;
+
+		if (resume)
+			scanToBeginOfLine(scanner);
+
+		for (int c = scanner.read(); c != ICharacterScanner.EOF; c = scanner.read()) {
+			switch (state) {
+				case INIT_STATE :
+					if (c != '\n' && Character.isWhitespace((char) c)) {
+						break;
+					}
+					if (isValidCharacter(c)) {
+						state = VAR_STATE;
+					} else {
+						state = ERROR_STATE;
+					}
+					break;
+				case VAR_STATE :
+					if (isValidCharacter(c)) {
+						break;
+					}
+				case END_VAR_STATE :
+					if (c != '\n' && Character.isWhitespace((char) c)) {
+						state = END_VAR_STATE;
+					} else if (c == ':' || c == '+') {
+						state = EQUAL_STATE;
+					} else if (c == '=') {
+						state = FINISH_STATE;
+					} else {
+						if (state == END_VAR_STATE) {
+							scanner.unread(); // Return back to the space
+						}
+						state = ERROR_STATE;
+					}
+					break;
+				case EQUAL_STATE :
+					if (c == '=') {
+						state = FINISH_STATE;
+					} else {
+						state = ERROR_STATE;
+					}
+					break;
+				case FINISH_STATE :
+					break;
+				default :
+					break;
+			}
+			if (state >= FINISH_STATE) {
+				break;
+			}
+			buffer.append((char) c);
+		}
+
+		scanner.unread();
+
+		if (state == FINISH_STATE) {
+			scanToEndOfLine(scanner);
+			return token;
+		}
+
+		if (defaultToken.isUndefined())
+			unreadBuffer(scanner);
+
+		return Token.UNDEFINED;
+
+	}
+
+	public IToken evaluate(ICharacterScanner scanner) {
+		return evaluate(scanner, false);
+	}
+
+	/**
+	 * Returns the characters in the buffer to the scanner.
+	 *
+	 * @param scanner the scanner to be used
+	 */
+	protected void unreadBuffer(ICharacterScanner scanner) {
+		for (int i = buffer.length() - 1; i >= 0; i--) {
+			scanner.unread();
+		}
+	}
+
+	private void scanToEndOfLine(ICharacterScanner scanner) {
+		int c;
+		char[][] delimiters = scanner.getLegalLineDelimiters();
+		while ((c = scanner.read()) != ICharacterScanner.EOF) {
+			// Check for end of line since it can be used to terminate the pattern.
+			for (int i = 0; i < delimiters.length; i++) {
+				if (c == delimiters[i][0] && sequenceDetected(scanner, delimiters[i])) {
+					return;
+				}
+			}
+		}
+	}
+
+	private void scanToBeginOfLine(ICharacterScanner scanner) {
+		while(scanner.getColumn() != 0) {
+			scanner.unread();
+		}
+	}
+
+	private boolean sequenceDetected(ICharacterScanner scanner, char[] sequence) {
+		for (int i = 1; i < sequence.length; i++) {
+			int c = scanner.read();
+			if (c == ICharacterScanner.EOF) {
+				return true;
+			} else if (c != sequence[i]) {
+				// Non-matching character detected, rewind the scanner back to the start.
+				for (; i > 0; i--) {
+					scanner.unread();
+				}
+				return false;
+			}
+		}
+
+		return true;
+	}
+	protected boolean isValidCharacter(int c) {
+		char c0 = (char) c;
+		return Character.isLetterOrDigit(c0) || (c0 == '_');
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MacroReferenceRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MacroReferenceRule.java
new file mode 100644
index 0000000..a2ca12e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MacroReferenceRule.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.PatternRule;
+
+public class MacroReferenceRule extends PatternRule {
+
+	int nOfBrackets;
+	int fBracket;
+
+//	public MacroReferenceRule(IToken token) {
+//		super("$(", ")", token, (char) 0, true); //$NON-NLS-1$ //$NON-NLS-2$
+//	}
+
+	public MacroReferenceRule(IToken token, String startSeq, String endSeq) {
+		super(startSeq, endSeq, token, (char)0, true);
+		if (endSeq.length() > 0 && endSeq.charAt(0) == '}') {
+			fBracket = '{';
+		} else {
+			fBracket = '(';
+		}
+	}
+	
+	protected IToken doEvaluate(ICharacterScanner scanner, boolean resume) {
+		nOfBrackets = 1;
+		return super.doEvaluate(scanner, resume);
+	}
+
+	protected boolean endSequenceDetected(ICharacterScanner scanner) {
+		int c;
+		char[][] delimiters = scanner.getLegalLineDelimiters();
+		while ((c = scanner.read()) != ICharacterScanner.EOF) {
+			if (fBracket == c) {
+				++nOfBrackets;
+			}
+			if (fEndSequence.length > 0 && c == fEndSequence[0]) {
+				// Check if the specified end sequence has been found.
+				if (sequenceDetected(scanner, fEndSequence, true)) {
+					if (0 == --nOfBrackets) {
+						return true;
+					}
+				}
+			} else if (fBreaksOnEOL) {
+				// Check for end of line since it can be used to terminate the pattern.
+				for (int i = 0; i < delimiters.length; i++) {
+					if (c == delimiters[i][0] && sequenceDetected(scanner, delimiters[i], false)) {
+						return true;
+					}
+				}
+			}
+		}
+		scanner.unread();
+		return true;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakeFileConstants.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakeFileConstants.java
new file mode 100644
index 0000000..0ed46c2
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakeFileConstants.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+public class MakeFileConstants {
+
+    public static final String RULE_DEFAULT = ".DEFAULT"; //$NON-NLS-1$
+    public static final String RULE_IGNORE =".IGNORE"; //$NON-NLS-1$
+    public static final String RULE_POSIX = ".POSIX"; //$NON-NLS-1$
+    public static final String RULE_PRECIOUS = ".PRECIOUS"; //$NON-NLS-1$
+    public static final String RULE_SCCS_GET = ".SCCS_GET"; //$NON-NLS-1$
+    public static final String RULE_SILENT = ".SILENT"; //$NON-NLS-1$
+    public static final String RULE_SUFFIXES = ".SUFFIXES"; //$NON-NLS-1$
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakeFileMessages.properties b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakeFileMessages.properties
new file mode 100644
index 0000000..ae76283
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakeFileMessages.properties
@@ -0,0 +1,27 @@
+###############################################################################
+# Copyright (c) 2003, 2006, 2007 QNX Software Systems and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     QNX Software Systems - initial API and implementation
+#     Red Hat Inc. - convert to use with Automake editor
+###############################################################################
+
+MakefileValidator.errorBuild=Error Build
+MakefileValidator.errorResource=Error resource
+MakefileValidator.warningInfo=Warning info
+MakefileValidator.warning=Warning
+MakefileValidator.unknown=unknown
+MakefileValidator.checkingFile=Checking file : 
+MakefileValidator.fileChecked=File checked
+MakefileValidator.error.elseMissingIfCondition=else missing if condition
+MakefileValidator.error.endifMissingIfElseCondition=Endif missing if/else condition
+MakefileValidator.error.endefMissingOverrideDefine=endef missing [override] define
+MakefileValidator.error.unknownDirective=unknow directive
+MakefileValidator.error.noMatchingEndifForCondition=No matching endif for condition
+MakefileValidator.error.noMatchingEndefForOverrideDefine=No matching endef for [override] define
+
+EditorUtility.concatModifierStrings= {0} + {1}
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileAnnotationHover.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileAnnotationHover.java
new file mode 100644
index 0000000..198c603
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileAnnotationHover.java
@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - convert to use with Automake editor
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.ui.IWorkingCopyManager;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.source.IAnnotationHover;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.ui.IEditorPart;
+
+
+/**
+ * MakefileAnnotationHover
+ *  
+ */
+public class MakefileAnnotationHover implements IAnnotationHover {
+
+	private IEditorPart fEditor;
+                                                                                                                             
+	/**
+	 *  
+	 */
+	public MakefileAnnotationHover(IEditorPart editor) {
+                fEditor = editor;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jface.text.source.IAnnotationHover#getHoverInfo(org.eclipse.jface.text.source.ISourceViewer,
+	 *      int)
+	 */
+	public String getHoverInfo(ISourceViewer sourceViewer, int lineNumber) {
+		IDocument document = sourceViewer.getDocument();
+		try {
+			IRegion info = document.getLineInformation(lineNumber);
+			String line = document.get(info.getOffset(), info.getLength());
+			int numberOfLines = document.getNumberOfLines();
+			while (line != null && line.endsWith("\\")) { //$NON-NLS-1$
+				line = line.substring(0, line.length() - 1);
+				lineNumber++;
+				if (lineNumber < numberOfLines) {
+					info = document.getLineInformation(lineNumber);
+					String l = document.get(info.getOffset(), info.getLength());
+					line += "\n" + l; //$NON-NLS-1$
+				}
+			}
+			if (line != null && line.indexOf('$') != -1 && line.length() > 1) {
+				IWorkingCopyManager fManager = AutomakeEditorFactory.getDefault().getWorkingCopyManager();
+				IMakefile makefile = fManager.getWorkingCopy(fEditor.getEditorInput());
+				line = makefile.expandString(line);
+				return line;
+			}
+			return line;
+		} catch (BadLocationException x) {
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileCodeScanner.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileCodeScanner.java
new file mode 100644
index 0000000..c7f5526
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileCodeScanner.java
@@ -0,0 +1,114 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jface.text.rules.EndOfLineRule;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.IWhitespaceDetector;
+import org.eclipse.jface.text.rules.MultiLineRule;
+import org.eclipse.jface.text.rules.WhitespaceRule;
+import org.eclipse.jface.text.rules.WordRule;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.ColorManager;
+
+
+public class MakefileCodeScanner extends AbstractMakefileCodeScanner {
+
+	private final static String[] keywords = { "define", "endef", "ifdef", "ifndef", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		"ifeq", "ifneq", "else", "endif", "include", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+		"-include", "sinclude", "override", "endef", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		"export", "unexport", "vpath" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+	};
+
+	private final static String[] functions = { "subst", "patsubst", "strip", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		"findstring", "filter", "sort", "dir", "notdir", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+		"suffix", "basename", "addsuffix", "addprefix", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		"join", "word", "words", "wordlist", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		"firstword", "wildcard", "error", "warning", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		"shell", "origin", "foreach", "call" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+	};
+
+	public static final String[] fTokenProperties = new String[] {
+			ColorManager.MAKE_COMMENT_COLOR,
+			ColorManager.MAKE_KEYWORD_COLOR,
+			ColorManager.MAKE_FUNCTION_COLOR,
+			ColorManager.MAKE_MACRO_REF_COLOR,
+			ColorManager.MAKE_MACRO_DEF_COLOR,
+			ColorManager.MAKE_DEFAULT_COLOR
+	};
+
+	/**
+	 * Constructor for MakefileCodeScanner
+	 */
+	public MakefileCodeScanner() {
+		super();
+		initialize();
+	}
+	
+	protected List<IRule> createRules() {
+		IToken keyword = getToken(ColorManager.MAKE_KEYWORD_COLOR);
+		IToken function = getToken(ColorManager.MAKE_FUNCTION_COLOR);
+		IToken comment = getToken(ColorManager.MAKE_COMMENT_COLOR);
+		IToken macroRef = getToken(ColorManager.MAKE_MACRO_REF_COLOR);
+		IToken macroDef = getToken(ColorManager.MAKE_MACRO_DEF_COLOR);
+		IToken other = getToken(ColorManager.MAKE_DEFAULT_COLOR);
+
+		List<IRule> rules = new ArrayList<IRule>();
+
+		// Add rule for single line comments.
+		rules.add(new EndOfLineRule("#", comment, '\\', true)); //$NON-NLS-1$
+
+		// Add generic whitespace rule.
+		rules.add(new WhitespaceRule(new IWhitespaceDetector() {
+			public boolean isWhitespace(char character) {
+				return Character.isWhitespace(character);
+			}
+		}));
+
+		// Put before the the word rules
+		MultiLineRule defineRule = new MultiLineRule("define", "endef", macroDef); //$NON-NLS-1$ //$NON-NLS-2$
+		defineRule.setColumnConstraint(0);
+		rules.add(defineRule);
+		rules.add(new MacroDefinitionRule(macroDef, other));
+
+		// Add word rule for keywords, types, and constants.
+		// We restring the detection of the keywords to be the first column to be valid.
+		WordRule keyWordRule = new WordRule(new MakefileWordDetector(), other);
+		for (int i = 0; i < keywords.length; i++) {
+			keyWordRule.addWord(keywords[i], keyword);
+		}
+		keyWordRule.setColumnConstraint(0);
+		rules.add(keyWordRule);
+
+		WordRule functionRule = new WordRule(new MakefileWordDetector(), other);
+		for (int i = 0; i < functions.length; i++)
+			functionRule.addWord(functions[i], function);
+		rules.add(functionRule);
+
+		rules.add(new MacroReferenceRule(macroRef, "$(", ")")); //$NON-NLS-1$ //$NON-NLS-2$
+		rules.add(new MacroReferenceRule(macroRef, "${", "}")); //$NON-NLS-1$ //$NON-NLS-2$
+
+		setDefaultReturnToken(other);
+
+		return rules;
+	}
+
+	/*
+	 * @see AbstractMakefileCodeScanner#getTokenProperties()
+	 */
+	protected String[] getTokenProperties() {
+		return fTokenProperties;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileCompletionProcessor.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileCompletionProcessor.java
new file mode 100644
index 0000000..5237f17
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileCompletionProcessor.java
@@ -0,0 +1,242 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - convert to use with Automake editor
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.IMacroDefinition;
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.core.makefile.IRule;
+import org.eclipse.cdt.make.ui.IWorkingCopyManager;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.TextPresentation;
+import org.eclipse.jface.text.contentassist.CompletionProposal;
+import org.eclipse.jface.text.contentassist.ContextInformation;
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.text.contentassist.IContextInformation;
+import org.eclipse.jface.text.contentassist.IContextInformationPresenter;
+import org.eclipse.jface.text.contentassist.IContextInformationValidator;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.MakeUIImages;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.IEditorPart;
+
+
+/**
+ * MakefileCompletionProcessor
+ */
+public class MakefileCompletionProcessor implements IContentAssistProcessor {
+
+	/**
+	 * Simple content assist tip closer. The tip is valid in a range
+	 * of 5 characters around its popup location.
+	 */
+	protected static class Validator implements IContextInformationValidator, IContextInformationPresenter {
+
+		protected int fInstallOffset;
+
+		/*
+		 * @see IContextInformationValidator#isContextInformationValid(int)
+		 */
+		public boolean isContextInformationValid(int offset) {
+			return Math.abs(fInstallOffset - offset) < 5;
+		}
+
+		/*
+		 * @see IContextInformationValidator#install(IContextInformation, ITextViewer, int)
+		 */
+		public void install(IContextInformation info, ITextViewer viewer, int offset) {
+			fInstallOffset = offset;
+		}
+
+		/*
+		 * @see org.eclipse.jface.text.contentassist.IContextInformationPresenter#updatePresentation(int, TextPresentation)
+		 */
+		public boolean updatePresentation(int documentPosition, TextPresentation presentation) {
+			return false;
+		}
+	}
+
+	public class DirectiveComparator implements Comparator<Object>{
+
+		/* (non-Javadoc)
+		 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+		 */
+		public int compare(Object o1, Object o2) {
+			String name1;
+			String name2;
+
+			if (o1 instanceof IMacroDefinition) {
+				name1 = ((IMacroDefinition)o1).getName();
+			} else if (o1 instanceof IRule) {
+				name1 = ((IRule)o1).getTarget().toString();
+			} else {
+				name1 =""; //$NON-NLS-1$
+			}
+
+			if (o2 instanceof IMacroDefinition) {
+				name2 = ((IMacroDefinition)o1).getName();
+			} else if (o2 instanceof IRule) {
+				name2 = ((IRule)o1).getTarget().toString();
+			} else {
+				name2 =""; //$NON-NLS-1$
+			}
+
+			//return String.CASE_INSENSITIVE_ORDER.compare(name1, name2);
+			return name1.compareToIgnoreCase(name2);
+		}
+		
+	}
+	protected IContextInformationValidator fValidator = new Validator();
+	protected Image imageMacro = MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_MACRO);
+	protected Image imageTarget = MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_TARGET_RULE);
+
+	protected CompletionProposalComparator comparator = new CompletionProposalComparator();
+	protected IEditorPart fEditor;
+	protected IWorkingCopyManager fManager;
+
+	public MakefileCompletionProcessor(IEditorPart editor) {
+		fEditor = editor;
+		fManager =  AutomakeEditorFactory.getDefault().getWorkingCopyManager();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeCompletionProposals(org.eclipse.jface.text.ITextViewer, int)
+	 */
+	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int documentOffset) {
+		WordPartDetector wordPart = new WordPartDetector(viewer, documentOffset);
+		boolean macro = WordPartDetector.inMacro(viewer, documentOffset);
+		IMakefile makefile = fManager.getWorkingCopy(fEditor.getEditorInput());
+		IDirective[] statements = null;
+		if (macro) {
+			IDirective[] m1 = makefile.getMacroDefinitions();
+			IDirective[] m2 = makefile.getBuiltinMacroDefinitions();
+			statements = new IDirective[m1.length + m2.length];
+			System.arraycopy(m1, 0, statements, 0, m1.length);
+			System.arraycopy(m2, 0, statements, m1.length, m2.length);
+		} else {
+			statements = makefile.getTargetRules();
+		}
+
+		ArrayList<ICompletionProposal> proposalList = new ArrayList<ICompletionProposal>(statements.length);
+
+		// iterate over all the different categories
+		for (int i = 0; i < statements.length; i++) {
+			String name = null;
+			Image image = null;
+			String infoString = "";//getContentInfoString(name); //$NON-NLS-1$
+			if (statements[i] instanceof IMacroDefinition) {
+				name = ((IMacroDefinition) statements[i]).getName();
+				image = imageMacro;
+				infoString = ((IMacroDefinition)statements[i]).getValue().toString();
+			} else if (statements[i] instanceof IRule) {
+				name = ((IRule) statements[i]).getTarget().toString();
+				image = imageTarget;
+				infoString = name;
+			}
+			if (name != null && name.startsWith(wordPart.toString())) {
+				IContextInformation info = new ContextInformation(name, infoString);
+				String displayString = (name.equals(infoString) ? name : name + " - " + infoString); //$NON-NLS-1$
+				ICompletionProposal result =
+					new CompletionProposal(
+						name,
+						wordPart.getOffset(),
+						wordPart.toString().length(),
+						name.length(),
+						image,
+						displayString,
+						info,
+						infoString);
+				proposalList.add(result);
+			}
+		}
+		ICompletionProposal[] proposals = (ICompletionProposal[]) proposalList.toArray(new ICompletionProposal[0]);
+		Arrays.sort(proposals, comparator);
+		return proposals;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeContextInformation(org.eclipse.jface.text.ITextViewer, int)
+	 */
+	public IContextInformation[] computeContextInformation(ITextViewer viewer, int documentOffset) {
+		WordPartDetector wordPart = new WordPartDetector(viewer, documentOffset);
+		boolean macro = WordPartDetector.inMacro(viewer, documentOffset);
+		IMakefile makefile = fManager.getWorkingCopy(fEditor.getEditorInput());
+		ArrayList<String> contextList = new ArrayList<String>();
+		if (macro) {
+			IDirective[] statements = makefile.getMacroDefinitions();
+			for (int i = 0; i < statements.length; i++) {
+				if (statements[i] instanceof IMacroDefinition) {
+					String name = ((IMacroDefinition) statements[i]).getName();
+					if (name != null && name.equals(wordPart.toString())) {
+						String value = ((IMacroDefinition) statements[i]).getValue().toString();
+						if (value != null && value.length() > 0) {
+							contextList.add(value);
+						}
+					}
+				}
+			}
+			statements = makefile.getBuiltinMacroDefinitions();
+			for (int i = 0; i < statements.length; i++) {
+				if (statements[i] instanceof IMacroDefinition) {
+					String name = ((IMacroDefinition) statements[i]).getName();
+					if (name != null && name.equals(wordPart.toString())) {
+						String value = ((IMacroDefinition) statements[i]).getValue().toString();
+						if (value != null && value.length() > 0) {
+							contextList.add(value);
+						}
+					}
+				}
+			}
+		}
+
+		IContextInformation[] result = new IContextInformation[contextList.size()];
+		for (int i = 0; i < result.length; i++) {
+			String context = (String)contextList.get(i);
+			result[i] = new ContextInformation(imageMacro, wordPart.toString(), context);
+		}
+		return result;
+
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getCompletionProposalAutoActivationCharacters()
+	 */
+	public char[] getCompletionProposalAutoActivationCharacters() {
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationAutoActivationCharacters()
+	 */
+	public char[] getContextInformationAutoActivationCharacters() {
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getErrorMessage()
+	 */
+	public String getErrorMessage() {
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationValidator()
+	 */
+	public IContextInformationValidator getContextInformationValidator() {
+		return fValidator;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileContentOutlinePage.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileContentOutlinePage.java
new file mode 100644
index 0000000..098195c
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileContentOutlinePage.java
@@ -0,0 +1,335 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - convert to use with Automake editor
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.cdt.make.core.makefile.IBadDirective;
+import org.eclipse.cdt.make.core.makefile.ICommand;
+import org.eclipse.cdt.make.core.makefile.IComment;
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.IEmptyLine;
+import org.eclipse.cdt.make.core.makefile.IInferenceRule;
+import org.eclipse.cdt.make.core.makefile.IMacroDefinition;
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.core.makefile.IParent;
+import org.eclipse.cdt.make.core.makefile.IRule;
+import org.eclipse.cdt.make.core.makefile.ITargetRule;
+import org.eclipse.cdt.make.core.makefile.gnu.IInclude;
+import org.eclipse.cdt.make.core.makefile.gnu.ITerminal;
+import org.eclipse.cdt.make.ui.IWorkingCopyManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.MakeUIImages;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IWorkbenchActionConstants;
+import org.eclipse.ui.part.IPageSite;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+
+
+/**
+ * MakefileContentOutlinePage
+ */
+public class MakefileContentOutlinePage extends ContentOutlinePage implements IContentOutlinePage {
+
+	private class MakefileContentProvider implements ITreeContentProvider {
+
+		protected boolean showMacroDefinition = true;
+		protected boolean showTargetRule = true;
+		protected boolean showInferenceRule = true;
+		protected boolean showIncludeChildren = false;
+
+		protected IMakefile makefile;
+		protected IMakefile nullMakefile = new NullMakefile();
+
+		/* (non-Javadoc)
+		* @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
+		*/
+		public Object[] getChildren(Object element) {
+			if (element == fInput) {
+				return getElements(makefile);
+			} else if (element instanceof IDirective) {
+				return getElements(element);
+			}
+			return new Object[0];
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
+		 */
+		public Object getParent(Object element) {
+			if (element instanceof IMakefile) {
+				return fInput;
+			} else if (element instanceof IDirective) {
+				return ((IDirective)element).getParent();
+			}
+			return fInput;
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
+		 */
+		public boolean hasChildren(Object element) {
+			if (element == fInput) {
+				return true;
+			} else if (element instanceof IParent) {
+				// Do not drill down in includes.
+				if (element instanceof IInclude && !showIncludeChildren) {
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
+		 */
+		public Object[] getElements(Object inputElement) {
+			IDirective[] directives;
+			if (inputElement == fInput) {
+				directives = makefile.getDirectives();
+			} else if (inputElement instanceof IRule) {
+				directives = ((IRule)inputElement).getCommands();
+			} else if (inputElement instanceof IParent) {
+				if (inputElement instanceof IInclude && !showIncludeChildren) {
+					directives = new IDirective[0];
+				} else {
+					directives = ((IParent)inputElement).getDirectives();
+				}
+			} else {
+				directives = new IDirective[0];
+			}
+			List<Object> list = new ArrayList<Object>(directives.length);
+			for (int i = 0; i < directives.length; i++) {
+				if (showMacroDefinition && directives[i] instanceof IMacroDefinition) {
+					list.add(directives[i]);
+				} else if (showInferenceRule && directives[i] instanceof IInferenceRule) {
+					list.add(directives[i]);
+				} else if (showTargetRule && directives[i] instanceof ITargetRule) {
+					list.add(directives[i]);
+				} else {
+					boolean irrelevant = (directives[i] instanceof IComment ||
+						directives[i] instanceof IEmptyLine ||
+						directives[i] instanceof ITerminal); 
+					if (!irrelevant) {
+						list.add(directives[i]);
+					}
+				}
+			}
+			return list.toArray();
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
+		 */
+		public void dispose() {
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+		 */
+		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+			if (oldInput != null) {
+				makefile = nullMakefile;
+			}
+
+			if (newInput != null) {
+				IWorkingCopyManager manager= AutomakeEditorFactory.getDefault().getWorkingCopyManager();
+				makefile = manager.getWorkingCopy((IEditorInput)newInput);
+				if (makefile == null) {
+					makefile = nullMakefile;
+				}
+			}
+		}
+
+	}
+
+	private class MakefileLabelProvider extends LabelProvider implements ILabelProvider {
+
+		/* (non-Javadoc)
+		* @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
+		*/
+		public Image getImage(Object element) {
+			if (element instanceof ITargetRule) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_TARGET_RULE);
+			} else if (element instanceof IInferenceRule) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_INFERENCE_RULE);
+			} else if (element instanceof IMacroDefinition) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_MACRO);
+			} else if (element instanceof ICommand) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_COMMAND);
+			} else if (element instanceof IInclude) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_INCLUDE);
+			} else if (element instanceof IBadDirective) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_ERROR);
+			} else if (element instanceof IParent) {
+				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_RELATION);
+			}
+			return super.getImage(element);
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
+		 */
+		public String getText(Object element) {
+			String name;
+			if (element instanceof IRule) {
+				name = ((IRule) element).getTarget().toString().trim();
+			} else if (element instanceof IMacroDefinition) {
+				name = ((IMacroDefinition) element).getName().trim();
+			} else {
+				name = super.getText(element);
+			}
+			if (name != null) {
+				name = name.trim();
+				if (name.length() > 25) {
+					name = name.substring(0, 25) + " ..."; //$NON-NLS-1$
+				}
+			}
+			return name;
+		}
+
+	}
+
+	protected MakefileEditor fEditor;
+	protected Object fInput;
+	protected AddBuildTargetAction fAddBuildTargetAction;
+	protected OpenIncludeAction fOpenIncludeAction;
+
+	public MakefileContentOutlinePage(MakefileEditor editor) {
+		super();
+		fEditor = editor;
+		fAddBuildTargetAction = new AddBuildTargetAction(this);
+		fOpenIncludeAction = new OpenIncludeAction(this);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.part.IPage#createControl(org.eclipse.swt.widgets.Composite)
+	 */
+	public void createControl(Composite parent) {
+		super.createControl(parent);
+		TreeViewer viewer = getTreeViewer();
+		viewer.setContentProvider(new MakefileContentProvider());
+		viewer.setLabelProvider(new MakefileLabelProvider());
+		if (fInput != null) {
+			viewer.setInput(fInput);
+		}
+
+		MenuManager manager= new MenuManager("#MakefileOutlinerContext"); //$NON-NLS-1$
+		manager.setRemoveAllWhenShown(true);
+		manager.addMenuListener(new IMenuListener() {
+			public void menuAboutToShow(IMenuManager m) {
+				contextMenuAboutToShow(m);
+			}
+		});
+		Control tree = viewer.getControl();
+		Menu menu = manager.createContextMenu(tree);
+		tree.setMenu(menu);
+
+		viewer.addDoubleClickListener(new IDoubleClickListener() {
+			/* (non-Javadoc)
+			 * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)
+			 */
+			public void doubleClick(DoubleClickEvent event) {
+				if (fOpenIncludeAction != null) {
+					fOpenIncludeAction.run();
+				}
+			}
+		});
+
+		IPageSite site= getSite();
+		//FIXME: should pluginid below be MakeUIPlugin id?
+		site.registerContextMenu(AutotoolsUIPlugin.getPluginId() + ".outline", manager, viewer); //$NON-NLS-1$
+		site.setSelectionProvider(viewer);
+
+	}
+
+	/**
+	 * called to create the context menu of the outline
+	 */
+	protected void contextMenuAboutToShow(IMenuManager menu) {
+		if (OpenIncludeAction.canActionBeAdded(getSelection())) {
+			menu.add(fOpenIncludeAction);
+		}
+		if (fAddBuildTargetAction.canActionBeAdded(getSelection())) {
+			menu.add(fAddBuildTargetAction);
+		}
+		menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
+		menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS+"-end"));//$NON-NLS-1$
+	}
+
+	/**
+	 * Sets the input of the outline page
+	 */
+	public void setInput(Object input) {
+		fInput = input;
+		update();
+	}
+
+	public Object getInput() {
+		return fInput;
+	}
+
+	/**
+	 * Updates the outline page.
+	 */
+	public void update() {
+		final TreeViewer viewer = getTreeViewer();
+
+		if (viewer != null) {
+			final Control control = viewer.getControl();
+			if (control != null && !control.isDisposed()) {
+				control.getDisplay().asyncExec(new Runnable() {
+					public void run() {
+						if (!control.isDisposed()) {
+							control.setRedraw(false);
+							viewer.setInput(fInput);
+							viewer.expandAll();
+							control.setRedraw(true);
+						}
+					}
+				});
+			}
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.part.IPage#setActionBars(org.eclipse.ui.IActionBars)
+	 */
+	public void setActionBars(IActionBars actionBars) {
+		super.setActionBars(actionBars);
+		IToolBarManager toolBarManager= actionBars.getToolBarManager();
+
+		LexicalSortingAction action= new LexicalSortingAction(getTreeViewer());
+		toolBarManager.add(action);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileDocumentProvider.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileDocumentProvider.java
new file mode 100644
index 0000000..fc733b3
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileDocumentProvider.java
@@ -0,0 +1,148 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Anton Leherbauer (Wind River Systems) - Fixed bug 141295
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.Iterator;
+
+import org.eclipse.cdt.make.core.MakeCorePlugin;
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.text.source.IAnnotationModel;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.editors.text.ForwardingDocumentProvider;
+import org.eclipse.ui.editors.text.TextFileDocumentProvider;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+import org.eclipse.ui.texteditor.ResourceMarkerAnnotationModel;
+
+public class MakefileDocumentProvider extends TextFileDocumentProvider implements IMakefileDocumentProvider {
+	
+	IMakefile fMakefile;
+
+	protected class MakefileAnnotationModel extends ResourceMarkerAnnotationModel /*implements IProblemRequestor */{
+		/**
+		 * @param resource
+		 */
+		public MakefileAnnotationModel(IResource resource) {
+			super(resource);
+		}
+
+		/**
+		 * @param makefile
+		 */
+		public void setMakefile(IMakefile makefile) {
+			fMakefile = makefile;
+		}
+	}
+
+	/**
+	 * Remembers a IMakefile for each element.
+	 */
+	protected class MakefileFileInfo extends FileInfo {		
+		public IMakefile fCopy;
+	}
+
+	public MakefileDocumentProvider() {
+		IDocumentProvider provider= new TextFileDocumentProvider(new MakefileStorageDocumentProvider());
+		provider= new ForwardingDocumentProvider(MakefileDocumentSetupParticipant.MAKEFILE_PARTITIONING, new MakefileDocumentSetupParticipant(), provider);
+		setParentDocumentProvider(provider);
+	}
+
+	/**
+	 */
+	private IMakefile createMakefile(IFile file) throws CoreException {
+		if (file.exists()) {
+			return MakeCorePlugin.getDefault().createMakefile(file);
+		}
+		return null;
+	}
+
+    /* (non-Javadoc)
+     * @see org.eclipse.ui.editors.text.TextFileDocumentProvider#createAnnotationModel(org.eclipse.core.resources.IFile)
+     */
+    protected IAnnotationModel createAnnotationModel(IFile file) {
+    	return new MakefileAnnotationModel(file);
+    }
+
+    /*
+	 * @see org.eclipse.ui.editors.text.TextFileDocumentProvider#createFileInfo(java.lang.Object)
+	 */
+	protected FileInfo createFileInfo(Object element) throws CoreException {
+		if (!(element instanceof IFileEditorInput))
+			return null;
+			
+		IFileEditorInput input= (IFileEditorInput) element;
+		IMakefile original= createMakefile(input.getFile());
+		if (original == null)
+			return null;
+
+		FileInfo info= super.createFileInfo(element);
+		if (!(info instanceof MakefileFileInfo)) {
+			return null;
+		}
+	
+		MakefileFileInfo makefileInfo= (MakefileFileInfo) info;
+		setUpSynchronization(makefileInfo);
+
+		makefileInfo.fCopy = original;
+
+		if (makefileInfo.fModel instanceof MakefileAnnotationModel)   {
+			MakefileAnnotationModel model= (MakefileAnnotationModel) makefileInfo.fModel;
+			model.setMakefile(makefileInfo.fCopy);
+		} 		
+		return makefileInfo;
+	}
+	
+    /* (non-Javadoc)
+     * @see org.eclipse.ui.editors.text.TextFileDocumentProvider#disposeFileInfo(java.lang.Object, org.eclipse.ui.editors.text.TextFileDocumentProvider.FileInfo)
+     */
+    protected void disposeFileInfo(Object element, FileInfo info) {
+	    if (info instanceof MakefileFileInfo) {
+		    MakefileFileInfo makefileInfo= (MakefileFileInfo) info;
+		    if (makefileInfo.fCopy != null) {
+		    	makefileInfo.fCopy = null;
+		    }
+	    }
+	    super.disposeFileInfo(element, info);	
+    }
+    
+    /*
+	 * @see org.eclipse.ui.editors.text.TextFileDocumentProvider#createEmptyFileInfo()
+	 */
+	protected FileInfo createEmptyFileInfo() {
+		return new MakefileFileInfo();
+	}
+	
+	/*
+	 * @see org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.IMakefileDocumentProvider#getWorkingCopy(java.lang.Object)
+	 */
+	public IMakefile getWorkingCopy(Object element) {
+		FileInfo fileInfo= getFileInfo(element);		
+		if (fileInfo instanceof MakefileFileInfo) {
+			MakefileFileInfo info= (MakefileFileInfo) fileInfo;
+			return info.fCopy;
+		}
+		return null;
+	}
+
+	/*
+	 * @see org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.MakefileDocumentProvider#shutdown()
+	 */
+	@SuppressWarnings("unchecked")
+	public void shutdown() {
+		Iterator e= getConnectedElementsIterator();
+		while (e.hasNext())
+			disconnect(e.next());
+	}
+	
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileDocumentSetupParticipant.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileDocumentSetupParticipant.java
new file mode 100644
index 0000000..30bf900
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileDocumentSetupParticipant.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2005 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.core.filebuffers.IDocumentSetupParticipant;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IDocumentExtension3;
+import org.eclipse.jface.text.IDocumentPartitioner;
+import org.eclipse.jface.text.rules.FastPartitioner;
+
+/**
+ * MakefileDocumentSetupParticipant
+ * The document setup participant for Ant.
+ */
+public class MakefileDocumentSetupParticipant  implements IDocumentSetupParticipant {
+	
+	/**
+	 * The name of the Makefile partitioning.
+	 */
+	public final static String MAKEFILE_PARTITIONING= "___makefile_partitioning";  //$NON-NLS-1$
+	
+	public MakefileDocumentSetupParticipant() {
+	}
+	
+	/*
+	 * @see org.eclipse.core.filebuffers.IDocumentSetupParticipant#setup(org.eclipse.jface.text.IDocument)
+	 */
+	public void setup(IDocument document) {
+		if (document instanceof IDocumentExtension3) {
+			IDocumentExtension3 extension3= (IDocumentExtension3) document;
+			IDocumentPartitioner partitioner = createDocumentPartitioner();
+			extension3.setDocumentPartitioner(MAKEFILE_PARTITIONING, partitioner);
+			partitioner.connect(document);
+		} 
+	}
+	
+	private IDocumentPartitioner createDocumentPartitioner() {
+		return new FastPartitioner(
+				new MakefilePartitionScanner(), MakefilePartitionScanner.MAKE_PARTITIONS);
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditor.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditor.java
new file mode 100644
index 0000000..9fb54e8
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditor.java
@@ -0,0 +1,462 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Anton Leherbauer, Wind River Systems, Inc.
+ *     Red Hat Inc. - convert to use with Automake editor
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ResourceBundle;
+
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.ListenerList;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.FindReplaceDocumentAdapter;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextOperationTarget;
+import org.eclipse.jface.text.ITextViewerExtension;
+import org.eclipse.jface.text.rules.IWordDetector;
+import org.eclipse.jface.text.source.IOverviewRuler;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.IVerticalRuler;
+import org.eclipse.jface.text.source.SourceViewerConfiguration;
+import org.eclipse.jface.text.source.projection.ProjectionAnnotationModel;
+import org.eclipse.jface.text.source.projection.ProjectionSupport;
+import org.eclipse.jface.text.source.projection.ProjectionViewer;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.MakeUIMessages;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IPartService;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.editors.text.EditorsUI;
+import org.eclipse.ui.editors.text.TextEditor;
+import org.eclipse.ui.texteditor.ChainedPreferenceStore;
+import org.eclipse.ui.texteditor.DefaultRangeIndicator;
+import org.eclipse.ui.texteditor.ITextEditorActionConstants;
+import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
+import org.eclipse.ui.texteditor.TextOperationAction;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+
+
+public class MakefileEditor extends TextEditor implements ISelectionChangedListener, IReconcilingParticipant {
+
+	/**
+	 * The page that shows the outline.
+	 */
+	protected MakefileContentOutlinePage page;
+	ProjectionSupport projectionSupport;
+	ProjectionMakefileUpdater fProjectionMakefileUpdater;
+	private FindReplaceDocumentAdapter fFindReplaceDocumentAdapter;
+
+	/**
+	 * Reconciling listeners.
+	 * @since 3.0
+	 */
+	private ListenerList fReconcilingListeners= new ListenerList(ListenerList.IDENTITY);
+
+	/**
+	 * Adapted source viewer for CEditor
+	 */
+
+	public class AdaptedSourceViewer extends ProjectionViewer implements ITextViewerExtension {
+
+
+		public AdaptedSourceViewer(Composite parent, IVerticalRuler ruler,
+			IOverviewRuler overviewRuler, boolean showsAnnotation, int styles) {
+			super(parent, ruler, overviewRuler, showsAnnotation, styles);
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.text.source.ISourceViewer#setRangeIndication(int, int, boolean)
+		 */
+		public void setRangeIndication(int offset, int length, boolean moveCursor) {
+			// Fixin a bug in the ProjectViewer implemenation
+			// PR: https://bugs.eclipse.org/bugs/show_bug.cgi?id=72914
+			if (isProjectionMode()) {
+				super.setRangeIndication(offset, length, moveCursor);
+			} else {
+				super.setRangeIndication(offset, length, false);
+			}
+		}
+	}
+
+
+	MakefileSourceConfiguration getMakefileSourceConfiguration() {
+		SourceViewerConfiguration configuration = getSourceViewerConfiguration();
+		if (configuration instanceof MakefileSourceConfiguration) {
+			return (MakefileSourceConfiguration)configuration;
+		}
+		return null;
+	}
+
+	public MakefileContentOutlinePage getOutlinePage() {
+		if (page == null) {
+			page = new MakefileContentOutlinePage(this);
+			page.addSelectionChangedListener(this);
+			page.setInput(getEditorInput());
+		}
+		return page;
+	}
+
+	public MakefileEditor() {
+		super();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#initializeEditor()
+	 */
+	protected void initializeEditor() {
+		setRangeIndicator(new DefaultRangeIndicator());
+		setEditorContextMenuId("#MakefileEditorContext"); //$NON-NLS-1$
+		setRulerContextMenuId("#MakefileRulerContext"); //$NON-NLS-1$
+		setDocumentProvider(AutomakeEditorFactory.getDefault().getAutomakefileDocumentProvider());
+		IPreferenceStore[] stores = new IPreferenceStore[2];
+		stores[0] = AutotoolsPlugin.getDefault().getPreferenceStore();
+		stores[1] = EditorsUI.getPreferenceStore();
+		ChainedPreferenceStore chainedStore = new ChainedPreferenceStore(stores);
+		setPreferenceStore(chainedStore);
+		setSourceViewerConfiguration(new MakefileSourceConfiguration(chainedStore, this));
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IWorkbenchPart#dispose()
+	 */
+	public void dispose() {
+		if (fProjectionMakefileUpdater != null) {
+			fProjectionMakefileUpdater.uninstall();
+			fProjectionMakefileUpdater= null;
+		}
+		super.dispose();
+	}
+
+	boolean isFoldingEnabled() {
+		return AutotoolsPlugin.getDefault().getPreferenceStore().getBoolean(MakefileEditorPreferenceConstants.EDITOR_FOLDING_ENABLED);
+	}
+
+	/*
+	 * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#isTabsToSpacesConversionEnabled()
+	 */
+	protected boolean isTabsToSpacesConversionEnabled() {
+		// always false for Makefiles
+		// see http://bugs.eclipse.org/186106
+		return false;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
+	 */
+	public void createPartControl(Composite parent) {
+		super.createPartControl(parent);
+		ProjectionViewer projectionViewer = (ProjectionViewer) getSourceViewer();
+		projectionSupport = new ProjectionSupport(projectionViewer, getAnnotationAccess(), getSharedColors());
+		projectionSupport.addSummarizableAnnotationType("org.eclipse.ui.workbench.texteditor.error"); //$NON-NLS-1$
+		projectionSupport.addSummarizableAnnotationType("org.eclipse.ui.workbench.texteditor.warning"); //$NON-NLS-1$
+		projectionSupport.install();
+
+		if (isFoldingEnabled()) {
+			projectionViewer.doOperation(ProjectionViewer.TOGGLE);
+		}
+
+//		ProjectionAnnotationModel model= (ProjectionAnnotationModel) getAdapter(ProjectionAnnotationModel.class);
+
+		fProjectionMakefileUpdater= new ProjectionMakefileUpdater();
+		if (fProjectionMakefileUpdater != null) {
+			fProjectionMakefileUpdater.install(this, projectionViewer);
+			fProjectionMakefileUpdater.initialize();
+		}
+	}
+
+	protected ISourceViewer createSourceViewer(Composite parent, IVerticalRuler ruler, int styles) {
+		ISourceViewer viewer = new AdaptedSourceViewer(parent, ruler, getOverviewRuler(), isOverviewRulerVisible(), styles);
+
+		// ensure decoration support has been created and configured.
+		getSourceViewerDecorationSupport(viewer);
+		
+		return viewer;
+	}
+
+	/* (non-Javadoc)
+	 * Method declared on IAdaptable
+	 */
+	@SuppressWarnings("unchecked")
+	public Object getAdapter(Class key) {
+		if (ProjectionAnnotationModel.class.equals(key)) {
+			if (projectionSupport != null) {
+				Object result = projectionSupport.getAdapter(getSourceViewer(), key);
+				if (result != null) {
+					return result;
+				}
+			}
+		} else if (key.equals(IContentOutlinePage.class)) {
+			return getOutlinePage();
+		}
+		return super.getAdapter(key);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.ISaveablePart#doSave(org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	public void doSave(IProgressMonitor monitor) {
+		super.doSave(monitor);
+		if (page != null) {
+			page.update();
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#createActions()
+	 */
+	protected void createActions() {
+		super.createActions();
+
+		ResourceBundle bundle = MakeUIMessages.getResourceBundle();
+
+		IAction a = new TextOperationAction(bundle, "ContentAssistProposal.", this, ISourceViewer.CONTENTASSIST_PROPOSALS); //$NON-NLS-1$
+		a.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
+		setAction("ContentAssistProposal", a); //$NON-NLS-1$
+
+		a = new TextOperationAction(bundle, "ContentAssistTip.", this, ISourceViewer.CONTENTASSIST_CONTEXT_INFORMATION); //$NON-NLS-1$
+		a.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_CONTEXT_INFORMATION);
+		setAction("ContentAssistTip", a); //$NON-NLS-1$
+
+		a = new TextOperationAction(bundle, "Comment.", this, ITextOperationTarget.PREFIX); //$NON-NLS-1$
+		a.setActionDefinitionId(IMakefileEditorActionDefinitionIds.COMMENT);
+		setAction("Comment", a); //$NON-NLS-1$
+		markAsStateDependentAction("Comment", true); //$NON-NLS-1$
+ 
+		a = new TextOperationAction(bundle, "Uncomment.", this, ITextOperationTarget.STRIP_PREFIX); //$NON-NLS-1$
+		a.setActionDefinitionId(IMakefileEditorActionDefinitionIds.UNCOMMENT);
+		setAction("Uncomment", a); //$NON-NLS-1$
+		markAsStateDependentAction("Uncomment", true); //$NON-NLS-1$
+
+		a = new OpenDeclarationAction(this);
+		a.setActionDefinitionId(IMakefileEditorActionDefinitionIds.OPEN_DECLARATION);
+		setAction("OpenDeclarationAction", a); //$NON-NLS-1$
+		markAsStateDependentAction("OpenDeclarationAction", true); //$NON-NLS-1$
+
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
+	 */
+	public void selectionChanged(SelectionChangedEvent event) {
+		ISelection selection = event.getSelection();
+		if (selection.isEmpty()) {
+			resetHighlightRange();
+		} else if (selection instanceof IStructuredSelection){                                                                                                                         
+			if (!isActivePart() && AutotoolsPlugin.getActivePage() != null) {
+				AutotoolsPlugin.getActivePage().bringToTop(this);
+			}                                                                                                                 
+			Object element =  ((IStructuredSelection) selection).getFirstElement();
+			if (element instanceof IDirective) {
+				IDirective statement = (IDirective)element;
+				setSelection(statement, !isActivePart());
+			}
+		}
+	}
+
+	/**
+	 * Returns whether the editor is active.
+	 */
+	private boolean isActivePart() {
+		IWorkbenchWindow window= getSite().getWorkbenchWindow();
+		IPartService service= window.getPartService();
+		IWorkbenchPart part= service.getActivePart();
+		return part != null && part.equals(this);
+	}
+
+	/**
+	 * Returns the find/replace document adapter.
+	 * 
+	 * @return the find/replace document adapter.
+	 */
+	private FindReplaceDocumentAdapter getFindRepalceDocumentAdapter() {
+		if (fFindReplaceDocumentAdapter == null) {
+			IDocument doc = getDocumentProvider().getDocument(getEditorInput());
+			fFindReplaceDocumentAdapter= new FindReplaceDocumentAdapter(doc);
+		}
+		return fFindReplaceDocumentAdapter;
+	}
+
+	public void setSelection(IDirective directive, boolean moveCursor) {
+		int startLine = directive.getStartLine() - 1;
+		int endLine = directive.getEndLine() - 1;
+		try {
+			IDocument doc = getDocumentProvider().getDocument(getEditorInput());
+			int start = doc.getLineOffset(startLine);
+			int len = doc.getLineLength(endLine) - 1;
+			int length = (doc.getLineOffset(endLine) + len) - start;
+			setHighlightRange(start, length, true);
+			if (moveCursor) {
+				// Let see if we can move the cursor at the position also
+				String var = directive.toString().trim();
+				IWordDetector detector = new MakefileWordDetector();
+				for (len = 0; len < var.length(); len++) {
+					char c = var.charAt(len);
+					//if (! (Character.isLetterOrDigit(c) || c == '.' || c == '_')) {
+					if (!(detector.isWordPart(c) || detector.isWordStart(c) || c == '-' || c == '_')) {
+						break;
+					}
+				}
+				if (len > 0) {
+					var = var.substring(0, len);
+				}
+				IRegion region = getFindRepalceDocumentAdapter().find(start, var, true, true, true, false);
+
+				if (region != null) {
+					len = region.getOffset();
+					length = region.getLength();
+					getSourceViewer().revealRange(len, length);
+					// Selected region begins one index after offset
+					getSourceViewer().setSelectedRange(len, length);
+				}
+
+			}
+		} catch (IllegalArgumentException x) {
+			resetHighlightRange();
+		} catch (BadLocationException e) {
+			resetHighlightRange();
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#editorContextMenuAboutToShow(org.eclipse.jface.action.IMenuManager)
+	 */
+	protected void editorContextMenuAboutToShow(IMenuManager menu) {
+		super.editorContextMenuAboutToShow(menu);
+		addAction(menu, ITextEditorActionConstants.GROUP_EDIT, "Comment"); //$NON-NLS-1$
+		addAction(menu, ITextEditorActionConstants.GROUP_EDIT, "Uncomment"); //$NON-NLS-1$
+		//addAction(menu, ITextEditorActionConstants.GROUP_EDIT, "OpenDeclarationAction"); //$NON-NLS-1$
+	}
+
+	/**
+	 * Adds the given listener.
+	 * Has no effect if an identical listener was not already registered.
+	 * 
+	 * @param listener	The reconcile listener to be added
+	 * @since 3.0
+	 */
+	final void addReconcilingParticipant(IReconcilingParticipant listener) {
+		synchronized (fReconcilingListeners) {
+			fReconcilingListeners.add(listener);
+		}
+	}
+	
+	/**
+	 * Removes the given listener.
+	 * Has no effect if an identical listener was not already registered.
+	 * 
+	 * @param listener	the reconcile listener to be removed
+	 * @since 3.0
+	 */
+	final void removeReconcilingParticipant(IReconcilingParticipant listener) {
+		synchronized (fReconcilingListeners) {
+			fReconcilingListeners.remove(listener);
+		}
+	}
+	
+	/*
+	 */
+	public void reconciled() {		
+		// Notify listeners
+		Object[] listeners = fReconcilingListeners.getListeners();
+		for (int i = 0, length= listeners.length; i < length; ++i) {
+			((IReconcilingParticipant)listeners[i]).reconciled();
+		}
+	}
+
+	/*
+	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#performRevert()
+	 */
+	protected void performRevert() {
+		ProjectionViewer projectionViewer= (ProjectionViewer) getSourceViewer();
+		projectionViewer.setRedraw(false);
+		try {
+			
+			boolean projectionMode= projectionViewer.isProjectionMode();
+			if (projectionMode) {
+				projectionViewer.disableProjection();				
+				if (fProjectionMakefileUpdater != null)
+					fProjectionMakefileUpdater.uninstall();
+			}
+			
+			super.performRevert();
+			
+			if (projectionMode) {
+				if (fProjectionMakefileUpdater != null)
+					fProjectionMakefileUpdater.install(this, projectionViewer);	
+				projectionViewer.enableProjection();
+			}
+			
+		} finally {
+			projectionViewer.setRedraw(true);
+		}
+	}
+
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#handlePreferenceStoreChanged(org.eclipse.jface.util.PropertyChangeEvent)
+	 */
+	protected void handlePreferenceStoreChanged(PropertyChangeEvent event) {
+		ISourceViewer sourceViewer= getSourceViewer();
+		if (sourceViewer == null)
+			return;
+
+        String property = event.getProperty();
+
+        MakefileSourceConfiguration makeConf = getMakefileSourceConfiguration();
+        if (makeConf != null) {
+        	if (makeConf.affectsBehavior(event)) {
+        		makeConf.adaptToPreferenceChange(event);
+        		sourceViewer.invalidateTextPresentation();
+        	}
+        }
+
+        if (MakefileEditorPreferenceConstants.EDITOR_FOLDING_ENABLED.equals(property)) {
+			if (sourceViewer instanceof ProjectionViewer) {
+				ProjectionViewer projectionViewer= (ProjectionViewer) sourceViewer;
+				if (fProjectionMakefileUpdater != null)
+					fProjectionMakefileUpdater.uninstall();
+				// either freshly enabled or provider changed
+				fProjectionMakefileUpdater= new ProjectionMakefileUpdater();
+				if (fProjectionMakefileUpdater != null) {
+					fProjectionMakefileUpdater.install(this, projectionViewer);
+				}
+			}
+			return;
+		}
+
+		super.handlePreferenceStoreChanged(event);
+	}
+
+	/*
+	 * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#collectContextMenuPreferencePages()
+	 */
+	protected String[] collectContextMenuPreferencePages() {
+		// Add Makefile Editor relevant pages
+		String[] parentPrefPageIds = super.collectContextMenuPreferencePages();
+		String[] prefPageIds = new String[parentPrefPageIds.length + 2];
+		int nIds = 0;
+		prefPageIds[nIds++] = "org.eclipse.cdt.make.ui.preferences.MakeFileEditorPreferencePage"; //$NON-NLS-1$
+		prefPageIds[nIds++] = "org.eclipse.cdt.make.ui.preferences.MakefileSettingPreferencePage"; //$NON-NLS-1$
+		System.arraycopy(parentPrefPageIds, 0, prefPageIds, nIds, parentPrefPageIds.length);
+		return prefPageIds;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditorActionContributor.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditorActionContributor.java
new file mode 100644
index 0000000..d86e087
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditorActionContributor.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Wind River Systems - fix for bugzilla 135150
+ *     Red Hat Inc. - modify for usage with Automake editor
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ResourceBundle;
+
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.MakeUIMessages;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchActionConstants;
+import org.eclipse.ui.texteditor.BasicTextEditorActionContributor;
+import org.eclipse.ui.texteditor.ITextEditor;
+import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
+import org.eclipse.ui.texteditor.RetargetTextEditorAction;
+
+
+/**
+ */
+public class MakefileEditorActionContributor extends BasicTextEditorActionContributor {
+
+	private MakefileEditorTogglePresentationAction fTogglePresentation;
+	private OpenDeclarationAction fOpenDeclarationAction;
+	protected RetargetTextEditorAction fContentAssistProposal;
+	protected RetargetTextEditorAction fContentAssistTip;
+
+	/**
+	 * Constructor for MakefileEditorActionContributor.
+	 */
+	public MakefileEditorActionContributor() {
+		super();
+		ResourceBundle bundle = MakeUIMessages.getResourceBundle();
+		fContentAssistProposal = new RetargetTextEditorAction(bundle, "ContentAssistProposal."); //$NON-NLS-1$
+		fContentAssistProposal.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
+		fContentAssistTip = new RetargetTextEditorAction(bundle, "ContentAssistTip."); //$NON-NLS-1$
+		fContentAssistTip.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_CONTEXT_INFORMATION);
+		fTogglePresentation = new MakefileEditorTogglePresentationAction();
+		fOpenDeclarationAction = new OpenDeclarationAction();
+		
+	}
+
+	/**
+	 * @see org.eclipse.ui.IEditorActionBarContributor#setActiveEditor(IEditorPart)
+	 */
+	public void setActiveEditor(IEditorPart targetEditor) {
+		super.setActiveEditor(targetEditor);
+		doSetActiveEditor(targetEditor);
+	}
+
+	private void doSetActiveEditor(IEditorPart part) {
+		super.setActiveEditor(part);
+
+		ITextEditor editor = null;
+		if (part instanceof ITextEditor) {
+			editor = (ITextEditor) part;
+		}
+
+		fContentAssistProposal.setAction(getAction(editor, "ContentAssistProposal")); //$NON-NLS-1$
+		fContentAssistTip.setAction(getAction(editor, "ContentAssistTip")); //$NON-NLS-1$
+
+		fTogglePresentation.setEditor(editor);
+		fTogglePresentation.update();
+		
+		fOpenDeclarationAction.setEditor(editor);
+		fOpenDeclarationAction.update();
+	}
+
+	/*
+	 * @see IEditorActionBarContributor#dispose()
+	 */
+	public void dispose() {
+		doSetActiveEditor(null);
+		super.dispose();
+	}
+
+	/**
+	 * @see org.eclipse.ui.part.EditorActionBarContributor#init(IActionBars)
+	 */
+	public void init(IActionBars bars) {
+		super.init(bars);
+		IMenuManager menuManager = bars.getMenuManager();
+		IMenuManager editMenu = menuManager.findMenuUsingPath(IWorkbenchActionConstants.M_EDIT);
+		if (editMenu != null) {
+			editMenu.add(new Separator());
+			editMenu.add(fContentAssistProposal);
+			editMenu.add(fContentAssistTip);
+			editMenu.add(fOpenDeclarationAction);
+		}
+
+		bars.setGlobalActionHandler(ITextEditorActionDefinitionIds.TOGGLE_SHOW_SELECTED_ELEMENT_ONLY, fTogglePresentation);
+		// there is a global action in the toolbar, that is retargeted,
+		// there is no need to add another one.
+//		IToolBarManager toolBarManager = bars.getToolBarManager();
+//		if (toolBarManager != null) {
+//			toolBarManager.add(new Separator());
+//			toolBarManager.add(fTogglePresentation);
+//		}
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditorPreferenceConstants.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditorPreferenceConstants.java
new file mode 100644
index 0000000..169d791
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditorPreferenceConstants.java
@@ -0,0 +1,66 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2005 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+
+/**
+ * MakefileEditorPreferenceConstants
+ */
+public class MakefileEditorPreferenceConstants {
+
+	/**
+	 * 
+	 */
+	private MakefileEditorPreferenceConstants() {
+	}
+
+	/**
+	 * The symbolic names for colors for displaying code assist proposals
+	 * @see org.eclipse.jface.resource.ColorRegistry
+	 */
+	public static final String CURRENT_LINE_COLOR = "org.eclipse.cdt.make.ui.currentLineHightlightColor"; //$NON-NLS-1$
+	public static final String LINE_NUMBER_RULER_COLOR = "org.eclipse.cdt.make.ui.lineNumberForegroundColor"; //$NON-NLS-1$
+	public static final String PRINT_MARGIN_COLOR = "org.eclipse.cdt.make.ui.printMarginColor"; //$NON-NLS-1$	
+	
+	/**
+	 * Preference key suffix for bold text style preference keys.
+	 * 
+	 */
+	public static final String EDITOR_BOLD_SUFFIX= "_bold"; //$NON-NLS-1$
+
+	/**
+	 * Preference key suffix for italic text style preference keys.
+	 */
+	public static final String EDITOR_ITALIC_SUFFIX= "_italic"; //$NON-NLS-1$
+
+
+	public static final String EDITOR_FOLDING_MACRODEF = "editor_folding_default_macrodef"; //$NON-NLS-1$
+
+
+	public static final String EDITOR_FOLDING_RULE = "editor_folding_default_rule"; //$NON-NLS-1$
+
+
+	public static final String EDITOR_FOLDING_CONDITIONAL = "editor_folding_default_conditional"; //$NON-NLS-1$
+
+	public static final String EDITOR_FOLDING_ENABLED = "editor_folding_enabled"; //$NON-NLS-1$
+	
+	public static void initializeDefaultValues(IPreferenceStore store) {
+
+		store.setDefault(MakefileEditorPreferenceConstants.EDITOR_FOLDING_ENABLED, false);
+		store.setDefault(MakefileEditorPreferenceConstants.EDITOR_FOLDING_MACRODEF, false);
+		store.setDefault(MakefileEditorPreferenceConstants.EDITOR_FOLDING_RULE, true);
+		store.setDefault(MakefileEditorPreferenceConstants.EDITOR_FOLDING_CONDITIONAL, true);
+
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditorTogglePresentationAction.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditorTogglePresentationAction.java
new file mode 100644
index 0000000..cd9f159
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileEditorTogglePresentationAction.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - modified for Automake editor usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.MakeUIImages;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.MakeUIMessages;
+import org.eclipse.ui.texteditor.ITextEditor;
+import org.eclipse.ui.texteditor.TextEditorAction;
+
+
+/**
+ */
+public class MakefileEditorTogglePresentationAction extends TextEditorAction {
+
+	/**
+	 * Constructor for MakefileEditorTogglePresentationAction.
+	 */
+	public MakefileEditorTogglePresentationAction() {
+		super(MakeUIMessages.getResourceBundle(), "TogglePresentation.", null); //$NON-NLS-1$
+		MakeUIImages.setImageDescriptors(this, MakeUIImages.T_TOOL, MakeUIImages.IMG_TOOLS_MAKEFILE_SEGMENT_EDIT);
+		update();
+	}
+
+	/**
+	 * @see org.eclipse.jface.action.IAction#run()
+	 */
+	public void run() {
+		ITextEditor editor= getTextEditor();
+		editor.resetHighlightRange();
+		boolean show = editor.showsHighlightRangeOnly();
+		setChecked(!show);
+		editor.showHighlightRangeOnly(!show);
+	}
+
+	/**
+	 * @see org.eclipse.ui.texteditor.IUpdate#update()
+	 */
+	public void update() {
+		setChecked(getTextEditor() != null && getTextEditor().showsHighlightRangeOnly());
+		setEnabled(true);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileMessages.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileMessages.java
new file mode 100644
index 0000000..c8decc4
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileMessages.java
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class MakefileMessages {
+
+    private static final String BUNDLE_NAME = MakefileMessages.class.getName();
+
+    private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
+            .getBundle(BUNDLE_NAME);
+
+    private MakefileMessages() {
+    }
+
+	/**
+	 * Returns the string from the plugin's resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @return the resource bundle message
+	 */
+    public static String getString(String key) {
+        try {
+            return RESOURCE_BUNDLE.getString(key);
+        } catch (MissingResourceException e) {
+            return '!' + key + '!';
+        }
+    }
+    
+	/**
+	 * Returns the string from the plugin's resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @param args an array of substitution strings
+	 * @return the resource bundle message
+	 */
+	public static String getFormattedString(String key, String[] args) {
+		return MessageFormat.format(getString(key), (Object[])args);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefilePartitionScanner.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefilePartitionScanner.java
new file mode 100644
index 0000000..fc99758
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefilePartitionScanner.java
@@ -0,0 +1,96 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jface.text.rules.EndOfLineRule;
+import org.eclipse.jface.text.rules.IPredicateRule;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.MultiLineRule;
+import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
+import org.eclipse.jface.text.rules.Token;
+
+public class MakefilePartitionScanner extends RuleBasedPartitionScanner {
+	// Partition types
+	public final static String MAKEFILE_COMMENT_PARTITION = "makefile_comment"; //$NON-NLS-1$
+	public final static String MAKEFILE_MACRO_ASSIGNEMENT_PARTITION = "makefile_macro_assignement"; //$NON-NLS-1$
+	public final static String MAKEFILE_INCLUDE_BLOCK_PARTITION = "makefile_include_block"; //$NON-NLS-1$
+	public final static String MAKEFILE_IF_BLOCK_PARTITION = "makefile_if_block"; //$NON-NLS-1$
+	public final static String MAKEFILE_DEF_BLOCK_PARTITION = "makefile_def_block"; //$NON-NLS-1$
+	public final static String MAKEFILE_OTHER_PARTITION = "makefile_other"; //$NON-NLS-1$
+
+	public final static String[] MAKE_PARTITIONS =
+		new String[] {
+			MAKEFILE_COMMENT_PARTITION,
+			MAKEFILE_MACRO_ASSIGNEMENT_PARTITION,
+			MAKEFILE_INCLUDE_BLOCK_PARTITION,
+			MAKEFILE_IF_BLOCK_PARTITION,
+			MAKEFILE_DEF_BLOCK_PARTITION,
+			MAKEFILE_OTHER_PARTITION,
+	};
+
+	/** The predefined delimiters of this tracker */
+	private char[][] fModDelimiters = { { '\r', '\n' }, { '\r' }, { '\n' } };
+
+	/**
+	 * Constructor for MakefilePartitionScanner
+	 */
+	public MakefilePartitionScanner() {
+		super();
+
+		IToken tComment = new Token(MAKEFILE_COMMENT_PARTITION);
+		IToken tMacro = new Token(MAKEFILE_MACRO_ASSIGNEMENT_PARTITION);
+		IToken tInclude = new Token(MAKEFILE_INCLUDE_BLOCK_PARTITION);
+		IToken tIf = new Token(MAKEFILE_IF_BLOCK_PARTITION);
+		IToken tDef = new Token(MAKEFILE_DEF_BLOCK_PARTITION);
+		IToken tOther = new Token(MAKEFILE_OTHER_PARTITION);
+
+		List<IRule> rules = new ArrayList<IRule>();
+
+		// Add rule for single line comments.
+
+		rules.add(new EndOfLineRule("#", tComment, '\\', true)); //$NON-NLS-1$
+
+		rules.add(new EndOfLineRule("include", tInclude)); //$NON-NLS-1$
+
+		rules.add(new EndOfLineRule("export", tDef)); //$NON-NLS-1$
+		rules.add(new EndOfLineRule("unexport", tDef)); //$NON-NLS-1$
+		rules.add(new EndOfLineRule("vpath", tDef)); //$NON-NLS-1$
+		rules.add(new EndOfLineRule("override", tDef)); //$NON-NLS-1$
+		rules.add(new MultiLineRule("define", "endef", tDef)); //$NON-NLS-1$ //$NON-NLS-2$
+		rules.add(new MultiLineRule("override define", "endef", tDef)); //$NON-NLS-1$ //$NON-NLS-2$
+
+		// Add rules for multi-line comments and javadoc.
+		rules.add(new MultiLineRule("ifdef", "endif", tIf)); //$NON-NLS-1$ //$NON-NLS-2$
+		rules.add(new MultiLineRule("ifndef", "endif", tIf)); //$NON-NLS-1$ //$NON-NLS-2$
+		rules.add(new MultiLineRule("ifeq", "endif", tIf)); //$NON-NLS-1$ //$NON-NLS-2$
+		rules.add(new MultiLineRule("ifnneq", "endif", tIf)); //$NON-NLS-1$ //$NON-NLS-2$
+
+		// Last rule must be supplied with default token!
+		rules.add(new MacroDefinitionRule(tMacro, tOther)); //$NON-NLS-1$
+
+		IPredicateRule[] result = new IPredicateRule[rules.size()];
+		rules.toArray(result);
+		setPredicateRules(result);
+
+	}
+
+	/*
+	 * @see ICharacterScanner#getLegalLineDelimiters
+	 */
+	public char[][] getLegalLineDelimiters() {
+		return fModDelimiters;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileReader.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileReader.java
new file mode 100644
index 0000000..d06c014
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileReader.java
@@ -0,0 +1,86 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.IOException;
+import java.io.LineNumberReader;
+import java.io.Reader;
+
+/**
+ */
+public class MakefileReader extends LineNumberReader {
+
+
+	public MakefileReader(Reader reader) {
+		super(reader);
+	}
+
+	public MakefileReader(Reader reader, int sz) {
+		super(reader, sz);
+	}
+
+
+	public String readLine() throws IOException {
+		boolean done = false;
+		StringBuffer buffer = new StringBuffer();
+		boolean escapedLine = false;
+		boolean escapedCommand = false;
+		while (!done) {
+			String line = super.readLine();
+			if (line == null) {
+				return null;
+			}
+
+			if (escapedLine && line.length() > 0) {
+				// Eat the spaces at the beginning.
+				int i = 0;
+				while (i < line.length() && (Util.isSpace(line.charAt(i)))) {
+					i++ ;
+				}
+				line = line.substring(i);
+			} else if (escapedCommand && line.length() > 0) {
+				// Only eat the first tab
+				if (line.charAt(0) == '\t') {
+					line.substring(1);
+				}
+			}
+
+			// According to POSIX rules:
+			// When an escaped <newline>(one preceded by a backslash) is found
+			// anywhere in the makefile except in a command line, it shall be replaced,
+			// along with any leading white space on the following line, with a single <space>
+			//
+			// When an escaped <newline> is found in a command line in a makefile,
+			// the command line shall contain the backslash, the <newline>, and  the next line,
+			// except that the first character of the next line shall not be included if it is a <tab>
+			if (Util.isEscapedLine(line)) {
+				int index = line.lastIndexOf('\\');
+				if (index > 0) {
+					if (!escapedLine && Util.isCommand(line)) {
+						escapedCommand = true;
+						buffer.append(line);
+					} else {
+						escapedLine = true;
+						buffer.append(line.substring(0, index));
+						buffer.append(' ');
+					}
+				}
+			} else {
+				done = true;
+				escapedLine = false;
+				escapedCommand = false;
+				buffer.append(line);
+			}
+		}
+		return buffer.toString();
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileReconcilingStrategy.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileReconcilingStrategy.java
new file mode 100644
index 0000000..8c654d8
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileReconcilingStrategy.java
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - convert to use with Automake editor
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.IOException;
+import java.io.StringReader;
+
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.ui.IWorkingCopyManager;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.reconciler.DirtyRegion;
+import org.eclipse.jface.text.reconciler.IReconcilingStrategy;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+import org.eclipse.ui.texteditor.ITextEditor;
+
+
+
+public class MakefileReconcilingStrategy implements IReconcilingStrategy {
+
+
+	private int fLastRegionOffset;
+	private ITextEditor fEditor;	
+	private IWorkingCopyManager fManager;
+	private IDocumentProvider fDocumentProvider;
+	private MakefileContentOutlinePage fOutliner;
+	private IReconcilingParticipant fMakefileReconcilingParticipant;
+
+	public MakefileReconcilingStrategy(MakefileEditor editor) {
+		fOutliner= editor.getOutlinePage();
+		fLastRegionOffset = Integer.MAX_VALUE;
+		fEditor= editor;
+		fManager= AutomakeEditorFactory.getDefault().getWorkingCopyManager();
+		fDocumentProvider= AutomakeEditorFactory.getDefault().getAutomakefileDocumentProvider();
+		if (fEditor instanceof IReconcilingParticipant) {
+			fMakefileReconcilingParticipant= (IReconcilingParticipant)fEditor;
+		}
+
+	}
+	
+	/**
+	 * @see IReconcilingStrategy#reconcile(document)
+	 */
+	public void setDocument(IDocument document) {
+	}	
+
+
+	/**
+	 * @see IReconcilingStrategy#reconcile(region)
+	 */
+	public void reconcile(IRegion region) {
+		// We use a trick to avoid running the reconciler multiple times
+		// on a file when it gets changed. This is because this gets called
+		// multiple times with different regions of the file, we do a 
+		// complete parse on the first region.
+		if(region.getOffset() <= fLastRegionOffset) {
+			reconcile();
+		}
+		fLastRegionOffset = region.getOffset();
+	}
+
+	/**
+	 * @see IReconcilingStrategy#reconcile(dirtyRegion, region)
+	 */
+	public void reconcile(DirtyRegion dirtyRegion, IRegion region) {
+		// FIXME: This seems to generate to much flashing in
+		// the contentouline viewer.
+		//reconcile();
+	}
+	
+	private void reconcile() {
+		try {
+			IMakefile makefile = fManager.getWorkingCopy(fEditor.getEditorInput());
+			if (makefile != null) {
+				String content = fDocumentProvider.getDocument(fEditor.getEditorInput()).get();
+				StringReader reader = new StringReader(content);
+				try {
+					makefile.parse(makefile.getFileURI(), reader);
+				} catch (IOException e) {
+				}
+				
+				fOutliner.update();
+			}
+		} finally {
+			try {
+				if (fMakefileReconcilingParticipant != null) {
+					fMakefileReconcilingParticipant.reconciled();
+				}
+			} finally {
+				//
+			}
+		}
+ 	}	
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileSourceConfiguration.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileSourceConfiguration.java
new file mode 100644
index 0000000..76b7f03
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileSourceConfiguration.java
@@ -0,0 +1,191 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Anton Leherbauer (Wind River Systems)
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITextHover;
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.contentassist.ContentAssistant;
+import org.eclipse.jface.text.contentassist.IContentAssistant;
+import org.eclipse.jface.text.presentation.IPresentationReconciler;
+import org.eclipse.jface.text.presentation.PresentationReconciler;
+import org.eclipse.jface.text.reconciler.IReconciler;
+import org.eclipse.jface.text.reconciler.MonoReconciler;
+import org.eclipse.jface.text.rules.BufferedRuleBasedScanner;
+import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.jface.text.source.IAnnotationHover;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.SourceViewerConfiguration;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.ColorManager;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.ui.editors.text.TextSourceViewerConfiguration;
+
+
+public class MakefileSourceConfiguration extends TextSourceViewerConfiguration {
+
+	private ColorManager colorManager;
+	MakefileCodeScanner codeScanner;
+	private MakefileEditor fEditor;
+
+	/**
+	 * Single token scanner.
+	 */
+	static class SingleTokenScanner extends BufferedRuleBasedScanner {
+		public SingleTokenScanner(TextAttribute attribute) {
+			setDefaultReturnToken(new Token(attribute));
+		}
+	}
+
+	/**
+	 * Constructor for MakeConfiguration
+	 */
+	public MakefileSourceConfiguration(IPreferenceStore preferenceStore, MakefileEditor editor) {
+		super(preferenceStore);
+		fEditor = editor;
+		colorManager = ColorManager.getDefault();
+	}
+
+	/**
+	 * @see SourceViewerConfiguration#getConfiguredContentTypes(ISourceViewer)
+	 */
+	public String[] getConfiguredContentTypes(ISourceViewer v) {
+		return new String[] {
+			IDocument.DEFAULT_CONTENT_TYPE,
+			MakefilePartitionScanner.MAKEFILE_COMMENT_PARTITION,
+			MakefilePartitionScanner.MAKEFILE_IF_BLOCK_PARTITION,
+			MakefilePartitionScanner.MAKEFILE_DEF_BLOCK_PARTITION,
+			MakefilePartitionScanner.MAKEFILE_INCLUDE_BLOCK_PARTITION,
+			MakefilePartitionScanner.MAKEFILE_MACRO_ASSIGNEMENT_PARTITION,
+		};
+
+	}
+
+	/**
+	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getContentAssistant(ISourceViewer)
+	 */
+	public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
+		ContentAssistant assistant = new ContentAssistant();
+		assistant.setContentAssistProcessor(new MakefileCompletionProcessor(fEditor), IDocument.DEFAULT_CONTENT_TYPE);
+		assistant.setContentAssistProcessor(new MakefileCompletionProcessor(fEditor), MakefilePartitionScanner.MAKEFILE_COMMENT_PARTITION);
+		assistant.setContentAssistProcessor(new MakefileCompletionProcessor(fEditor), MakefilePartitionScanner.MAKEFILE_DEF_BLOCK_PARTITION);
+		assistant.setContentAssistProcessor(new MakefileCompletionProcessor(fEditor), MakefilePartitionScanner.MAKEFILE_IF_BLOCK_PARTITION);
+		assistant.setContentAssistProcessor(new MakefileCompletionProcessor(fEditor), MakefilePartitionScanner.MAKEFILE_INCLUDE_BLOCK_PARTITION);
+		assistant.setContentAssistProcessor(new MakefileCompletionProcessor(fEditor), MakefilePartitionScanner.MAKEFILE_MACRO_ASSIGNEMENT_PARTITION);
+
+		assistant.enableAutoActivation(true);
+		assistant.setAutoActivationDelay(500);
+
+		assistant.setProposalPopupOrientation(IContentAssistant.CONTEXT_INFO_BELOW);
+		assistant.setContextInformationPopupOrientation(IContentAssistant.CONTEXT_INFO_BELOW);
+		//Set to Carolina blue
+		assistant.setContextInformationPopupBackground(colorManager.getColor(new RGB(0, 191, 255)));
+
+		return assistant;
+	}
+
+	protected MakefileCodeScanner getCodeScanner() {
+		if (null == codeScanner)
+			codeScanner = new MakefileCodeScanner();
+		return codeScanner;
+
+	}
+
+	public IPresentationReconciler getPresentationReconciler(ISourceViewer v) {
+
+		PresentationReconciler reconciler = new PresentationReconciler();
+
+		DefaultDamagerRepairer dr = new DefaultDamagerRepairer(getCodeScanner());
+		reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
+		reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
+
+		dr = new DefaultDamagerRepairer(getCodeScanner());
+		dr = new DefaultDamagerRepairer(getCodeScanner());
+		reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_COMMENT_PARTITION);
+		reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_COMMENT_PARTITION);
+
+		dr = new DefaultDamagerRepairer(getCodeScanner());
+		reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_MACRO_ASSIGNEMENT_PARTITION);
+		reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_MACRO_ASSIGNEMENT_PARTITION);
+
+		dr = new DefaultDamagerRepairer(getCodeScanner());
+		reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_INCLUDE_BLOCK_PARTITION);
+		reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_INCLUDE_BLOCK_PARTITION);
+
+		dr = new DefaultDamagerRepairer(getCodeScanner());
+		reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_IF_BLOCK_PARTITION);
+		reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_IF_BLOCK_PARTITION);
+
+		dr = new DefaultDamagerRepairer(getCodeScanner());
+		reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_DEF_BLOCK_PARTITION);
+		reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_DEF_BLOCK_PARTITION);
+
+		dr = new DefaultDamagerRepairer(getCodeScanner());
+		reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_OTHER_PARTITION);
+		reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_OTHER_PARTITION);
+		return reconciler;
+	}
+
+	/**
+	 * @see SourceViewerConfiguration#getReconciler(ISourceViewer)
+	 */
+	public IReconciler getReconciler(ISourceViewer sourceViewer) {
+		if (fEditor != null && fEditor.isEditable()) {
+			MonoReconciler reconciler= new MonoReconciler(new MakefileReconcilingStrategy(fEditor), false);
+			reconciler.setDelay(1000);
+			reconciler.setProgressMonitor(new NullProgressMonitor());
+			return reconciler;
+		}
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getDefaultPrefixes(org.eclipse.jface.text.source.ISourceViewer, java.lang.String)
+	 */
+	public String[] getDefaultPrefixes(ISourceViewer sourceViewer, String contentType) {
+		return new String[]{"#"}; //$NON-NLS-1$
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getTextHover(org.eclipse.jface.text.source.ISourceViewer, java.lang.String)
+	 */
+	public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) {
+		return new MakefileTextHover(fEditor);
+	}
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getAnnotationHover(org.eclipse.jface.text.source.ISourceViewer)
+	 */
+	public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) {
+		return new MakefileAnnotationHover(fEditor);
+	}
+
+	/**
+	 * @param event
+	 * @return
+	 */
+	public boolean affectsBehavior(PropertyChangeEvent event) {
+		MakefileCodeScanner scanner = getCodeScanner();
+		return scanner.affectsBehavior(event);
+	}
+
+	/**
+	 * @param event
+	 */
+	public void adaptToPreferenceChange(PropertyChangeEvent event) {
+		MakefileCodeScanner scanner = getCodeScanner();
+		scanner.adaptToPreferenceChange(event);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileStorageDocumentProvider.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileStorageDocumentProvider.java
new file mode 100644
index 0000000..cbcd643
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileStorageDocumentProvider.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2005 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IDocumentExtension3;
+import org.eclipse.jface.text.IDocumentPartitioner;
+import org.eclipse.jface.text.rules.FastPartitioner;
+import org.eclipse.ui.editors.text.StorageDocumentProvider;
+
+/**
+ * MakefileStorageDocumentProvider
+ */
+public class MakefileStorageDocumentProvider extends StorageDocumentProvider {
+
+	/*
+	 * @see org.eclipse.ui.editors.text.StorageDocumentProvider#setupDocument(java.lang.Object,
+	 *      org.eclipse.jface.text.IDocument)
+	 */
+	protected void setupDocument(Object element, IDocument document) {
+		if (document != null) {
+			IDocumentPartitioner partitioner= createDocumentPartitioner();
+			if (document instanceof IDocumentExtension3) {
+				IDocumentExtension3 extension3= (IDocumentExtension3) document;
+				extension3.setDocumentPartitioner(MakefileDocumentSetupParticipant.MAKEFILE_PARTITIONING, partitioner);
+			} else {
+				document.setDocumentPartitioner(partitioner);
+			}
+			partitioner.connect(document);
+		}
+	}
+	
+	private IDocumentPartitioner createDocumentPartitioner() {
+		return new FastPartitioner(
+				new MakefilePartitionScanner(), MakefilePartitionScanner.MAKE_PARTITIONS);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileTextHover.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileTextHover.java
new file mode 100644
index 0000000..c2b9a6f
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileTextHover.java
@@ -0,0 +1,105 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - convert to use with Automake editor
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IMacroDefinition;
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.ui.IWorkingCopyManager;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextHover;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.Region;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.ui.IEditorPart;
+
+
+/**
+ * MakefileTextHover
+ *  
+ */
+public class MakefileTextHover implements ITextHover {
+
+	private IEditorPart fEditor;
+
+	/**
+	 *  
+	 */
+	public MakefileTextHover(IEditorPart editor) {
+		fEditor = editor;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jface.text.ITextHover#getHoverInfo(org.eclipse.jface.text.ITextViewer,
+	 *      org.eclipse.jface.text.IRegion)
+	 */
+	public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
+		if (hoverRegion != null) {
+			try {
+				int len = hoverRegion.getLength();
+				int offset = hoverRegion.getOffset();
+				textViewer.getDocument().get(offset, len); // check off/len validity
+				if (fEditor != null && len > -1) {
+					IWorkingCopyManager fManager = AutomakeEditorFactory.getDefault().getWorkingCopyManager();
+					IMakefile makefile = fManager.getWorkingCopy(fEditor.getEditorInput());
+					if (makefile != null) {
+						WordPartDetector wordPart = new WordPartDetector(textViewer, offset);
+						String name = wordPart.toString();
+						IMacroDefinition[] statements = null;
+						if (WordPartDetector.inMacro(textViewer, offset)) {
+							statements = makefile.getMacroDefinitions(name);
+							if (statements == null || statements.length == 0) {
+								statements = makefile.getBuiltinMacroDefinitions(name);
+							}
+						}
+						
+						if (statements == null) {
+							statements = new IMacroDefinition[0];
+						}
+						// iterate over all the different categories
+						StringBuffer buffer = new StringBuffer();
+						for (int i = 0; i < statements.length; i++) {
+							if (i > 0) {
+								buffer.append("\n"); //$NON-NLS-1$
+							}
+							String infoString = statements[i].getValue().toString();
+							buffer.append(name);
+							buffer.append(" - "); //$NON-NLS-1$
+							buffer.append(infoString);			
+						}
+						return buffer.toString();
+					}
+				}
+			} catch (BadLocationException e) {
+			}
+		}
+		return ""; //$NON-NLS-1$
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jface.text.ITextHover#getHoverRegion(org.eclipse.jface.text.ITextViewer,
+	 *      int)
+	 */
+	public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
+		Point selection = textViewer.getSelectedRange();
+		if (selection.x <= offset && offset < selection.x + selection.y) {
+			return new Region(selection.x, selection.y);
+		}
+		return new Region(offset, 0);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileWordDetector.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileWordDetector.java
new file mode 100644
index 0000000..3008721
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MakefileWordDetector.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.jface.text.rules.IWordDetector;
+
+public class MakefileWordDetector implements IWordDetector {
+
+	private static final String correctStartSpecChars = "%*().><"; //$NON-NLS-1$
+	private static final String correctSpecChars = "@$/\\"; //$NON-NLS-1$
+
+	/**
+	 * @see IWordDetector#isWordPart(character)
+	 */
+	public boolean isWordPart(char character) {
+		return Character.isLetterOrDigit(character) || (correctSpecChars.indexOf(character) >= 0);
+	}
+
+	/**
+	 * @see IWordDetector#isWordStart(char)
+	 */
+	public boolean isWordStart(char character) {
+		return Character.isLetterOrDigit(character) || (correctStartSpecChars.indexOf(character) >= 0);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MessageLine.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MessageLine.java
new file mode 100644
index 0000000..367c9ed
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/MessageLine.java
@@ -0,0 +1,132 @@
+/*******************************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A message line. It distinguishs between "normal" messages and errors. 
+ * Setting an error message hides a currently displayed message until 
+ * <code>clearErrorMessage</code> is called.
+ */
+public class MessageLine extends CLabel {
+
+	private String fMessageText;
+	private String fErrorText;
+
+	private Color fDefaultColor;
+	private RGB fErrorRGB;
+	protected Color fErrorColor;
+
+	private static RGB fgErrorRGB= new RGB(200, 0, 0);
+
+	/**
+	 * Clears the currently displayed error message and redisplayes
+	 * the message which was active before the error message was set.
+	 */
+	public void clearErrorMessage() {
+		setErrorMessage(null);
+	}
+	/**
+	 * Clears the currently displayed message.
+	 */
+	public void clearMessage() {
+		setMessage(null);
+	}
+	/**
+	 * Get the currently displayed error text.
+	 * @return The error message. If no error message is displayed <code>null</code> is returned.
+	 */
+	public String getErrorMessage() {
+		return fErrorText;
+	}
+	/**
+	 * Get the currently displayed message.
+	 * @return The message. If no message is displayed <code>null<code> is returned.
+	 */
+	public String getMessage() {
+		return fMessageText;
+	}
+	/**
+	 * Creates a new message line as a child of the parent and with the given SWT stylebits.
+	 * Error message will be shown with in the given rgb color.
+	 */
+	public MessageLine(Composite parent, int style, RGB errorRGB) {
+		super(parent, style);
+		fDefaultColor= getForeground();
+		fErrorRGB= errorRGB;
+	}
+	/**
+	 * Creates a new message line as a child of the parent and with the given SWT stylebits.
+	 * Error message will be shown with in the rgb color 200,0,0.
+	 */
+	public MessageLine(Composite parent, int style) {
+		super(parent, style);
+		fDefaultColor= getForeground();
+		fErrorRGB= fgErrorRGB;
+	}
+	/**
+	 * Creates a new message line as a child of the given parent.
+	 * Error message will be shown with in the rgb color 200,0,0.
+	 */
+	public MessageLine(Composite parent) {
+		this(parent, SWT.LEFT);
+	}
+	/**
+	 * Sets the default error color used by all message lines.
+	 * Note: a call to this method only affects newly created MessageLines not existing ones. 
+	 */
+	public static void setErrorColor(RGB color) {
+		fgErrorRGB= color;
+	}
+	/**
+	     * Display the given error message. A currently displayed message
+	     * is saved and will be redisplayed when the error message is cleared.
+	     */
+	public void setErrorMessage(String message) {
+		fErrorText= message;
+
+		if (message == null) {
+			setMessage(fMessageText);
+		} else {
+			if (fErrorColor == null) {
+				fErrorColor= new Color(getDisplay(), fErrorRGB);
+				addDisposeListener(new DisposeListener() {
+					public void widgetDisposed(DisposeEvent e) {
+						fErrorColor.dispose();
+					}
+				});
+			}
+			setForeground(fErrorColor);
+			setText(message);
+		}
+	}
+	/**
+	     * Set the message text. If the message line currently displays an error,
+	     * the message is stored and will be shown after a call to clearErrorMessage
+	     */
+	public void setMessage(String message) {
+		fMessageText= message;
+		if (message == null)
+			message= ""; //$NON-NLS-1$
+		if (fErrorText == null) {
+			setForeground(fDefaultColor);
+			setText(message);
+		}
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/NotParallelRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/NotParallelRule.java
new file mode 100644
index 0000000..5650725
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/NotParallelRule.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.gnu.INotParallelRule;
+
+
+/**
+ * .NOTPARALLEL
+ *  If `.NOTPARALLEL' is mentioned as a target, then this invocation of
+ *  `make' will be run serially, even if the `-j' option is given.
+ *  Any recursively invoked `make' command will still be run in
+ *  parallel (unless its makefile contains this target).  Any
+ *  prerequisites on this target are ignored.
+ */
+public class NotParallelRule extends SpecialRule implements INotParallelRule {
+
+	public NotParallelRule(Directive parent, String[] reqs) {
+		super(parent, new Target(GNUMakefileConstants.RULE_NOT_PARALLEL), reqs, new Command[0]);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/NullMakefile.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/NullMakefile.java
new file mode 100644
index 0000000..6a5acba
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/NullMakefile.java
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.net.URI;
+
+import org.eclipse.cdt.make.core.makefile.IDirective;
+
+/**
+ * Makefile : ( statement ) *
+ * statement :   rule | macro_definition | comments | empty
+ * rule :  inference_rule | target_rule
+ * inference_rule : target ':' <nl> ( <tab> command <nl> ) +
+ * target_rule : target [ ( target ) * ] ':' [ ( prerequisite ) * ] [ ';' command ] <nl> 
+                 [ ( command ) * ]
+ * macro_definition : string '=' (string)* 
+ * comments : ('#' (string) <nl>) *
+ * empty : <nl>
+ * command : <tab> prefix_command string <nl>
+ * target : string
+ * prefix_command : '-' | '@' | '+'
+ * internal_macro :  "$<" | "$*" | "$@" | "$?" | "$%" 
+ */
+
+public class NullMakefile extends AbstractMakefile {
+
+	public final static IDirective[] EMPTY_DIRECTIVES = new IDirective[0];
+
+	public NullMakefile() {
+		super(null);
+	}
+
+	public IDirective[] getDirectives() {
+		return EMPTY_DIRECTIVES;
+	}
+
+	public IDirective[] getBuiltins() {
+		return EMPTY_DIRECTIVES;
+	}
+
+	public void addDirective(IDirective directive) {
+	}
+
+	public String toString() {
+		return new String();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.make.core.makefile.IMakefile#parse(java.io.Reader)
+	 */
+	public void parse(String name, Reader makefile) throws IOException {
+	}
+	
+	public void parse(URI fileURI, Reader reader) throws IOException {
+	}
+	
+	protected void parse(URI fileURI, MakefileReader reader) throws IOException {
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OpenDeclarationAction.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OpenDeclarationAction.java
new file mode 100644
index 0000000..aaeab02
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OpenDeclarationAction.java
@@ -0,0 +1,130 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     Red Hat Inc. - convert to use with Automake editor
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.net.URI;
+
+import org.eclipse.cdt.core.resources.FileStorage;
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.ui.IWorkingCopyManager;
+import org.eclipse.core.filesystem.URIUtil;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IStorage;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITextSelection;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.MakeUIMessages;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IStorageEditorInput;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.ide.IDE;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+import org.eclipse.ui.texteditor.ITextEditor;
+import org.eclipse.ui.texteditor.TextEditorAction;
+
+
+public class OpenDeclarationAction extends TextEditorAction {
+
+	public OpenDeclarationAction() {
+		this(null);
+	}
+
+	public OpenDeclarationAction(ITextEditor editor) {
+		super(MakeUIMessages.getResourceBundle(), "OpenDeclarationAction.", editor); //$NON-NLS-1$
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jface.action.IAction#run()
+	 */
+	public void run() {
+		ITextEditor editor = getTextEditor();
+		if (editor == null) {
+			return;
+		}
+		ISelectionProvider provider = editor.getSelectionProvider();
+		if (provider == null) {
+			return;
+		}
+		IDirective[] directives = null;
+		IWorkingCopyManager fManager = AutomakeEditorFactory.getDefault().getWorkingCopyManager();
+		IMakefile makefile = fManager.getWorkingCopy(editor.getEditorInput());
+		if (makefile != null) {
+			IDocumentProvider prov = editor.getDocumentProvider();
+			IDocument doc = prov.getDocument(editor.getEditorInput());
+			try {
+				ITextSelection textSelection = (ITextSelection) provider.getSelection();
+				int offset = textSelection.getOffset();
+				WordPartDetector wordPart = new WordPartDetector(doc, textSelection.getOffset());
+				String name = wordPart.toString();
+				if (WordPartDetector.inMacro(doc, offset)) {
+					directives = makefile.getMacroDefinitions(name);
+					if (directives.length == 0) {
+						directives = makefile.getBuiltinMacroDefinitions(name);
+					}
+				} else {
+					directives = makefile.getTargetRules(name);
+				}
+				if (directives != null && directives.length > 0) {
+					openInEditor(directives[0]);
+				}
+			} catch (Exception x) {
+				//
+			}
+		}
+	}
+
+	private static IEditorPart openInEditor(IDirective directive) throws PartInitException {
+		URI fileURI = directive.getMakefile().getFileURI();
+		IPath path = URIUtil.toPath(fileURI);
+		IFile file = AutotoolsUIPlugin.getWorkspace().getRoot().getFileForLocation(path);
+		if (file != null) {
+			IWorkbenchPage p = AutotoolsUIPlugin.getActivePage();
+			if (p != null) {
+				IEditorPart editorPart = IDE.openEditor(p, file, true);
+				if (editorPart instanceof MakefileEditor) {
+					((MakefileEditor)editorPart).setSelection(directive, true);
+				}
+				return editorPart;
+			}
+		} else {
+			// External file
+			IStorage storage = new FileStorage(path);
+			IStorageEditorInput input = new ExternalEditorInput(storage);
+			IWorkbenchPage p = AutotoolsUIPlugin.getActivePage();
+			if (p != null) {
+				String editorID = "org.eclipse.cdt.make.editor"; //$NON-NLS-1$
+				IEditorPart editorPart = IDE.openEditor(p, input, editorID, true);
+				if (editorPart instanceof MakefileEditor) {
+					((MakefileEditor)editorPart).setSelection(directive, true);
+				}
+				return editorPart;
+			}
+			
+		}
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jdt.ui.actions.SelectionDispatchAction#selectionChanged(org.eclipse.jface.text.ITextSelection)
+	 */
+	//public void selectionChanged(ITextSelection selection) {
+		//setEnabled(fEditor != null);
+	//}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OpenIncludeAction.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OpenIncludeAction.java
new file mode 100644
index 0000000..eabaa06
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OpenIncludeAction.java
@@ -0,0 +1,303 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *     Sergey Prigogin, Google - https://bugs.eclipse.org/bugs/show_bug.cgi?id=13221
+ *     Ed Swartz (Nokia)
+ *     Anton Leherbauer (Wind River Systems)
+ *     Red Hat Inc. - convert to use with Automake editor
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.model.CModelException;
+import org.eclipse.cdt.core.model.ICElement;
+import org.eclipse.cdt.core.model.IInclude;
+import org.eclipse.cdt.core.parser.ExtendedScannerInfo;
+import org.eclipse.cdt.core.parser.IExtendedScannerInfo;
+import org.eclipse.cdt.core.parser.IScannerInfo;
+import org.eclipse.cdt.core.parser.IScannerInfoProvider;
+import org.eclipse.cdt.ui.CUIPlugin;
+import org.eclipse.cdt.utils.PathUtil;
+import org.eclipse.core.filesystem.URIUtil;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceProxy;
+import org.eclipse.core.resources.IResourceProxyVisitor;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.window.Window;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.MakeUIImages;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.MessageBox;
+
+
+
+public class OpenIncludeAction extends Action {
+
+
+	private static final String PREFIX= "OpenIncludeAction."; //$NON-NLS-1$
+	
+	private static final String DIALOG_TITLE= PREFIX + "dialog.title"; //$NON-NLS-1$
+	private static final String DIALOG_MESSAGE= PREFIX + "dialog.message"; //$NON-NLS-1$
+	
+	private ISelectionProvider fSelectionProvider;
+
+
+	public OpenIncludeAction(ISelectionProvider provider) {
+		super(CUIPlugin.getResourceString(PREFIX + "label")); //$NON-NLS-1$
+		setDescription(CUIPlugin.getResourceString(PREFIX + "description")); //$NON-NLS-1$
+		setToolTipText(CUIPlugin.getResourceString(PREFIX + "tooltip")); //$NON-NLS-1$
+		
+		MakeUIImages.setImageDescriptors(this, MakeUIImages.T_LCL, MakeUIImages.IMG_MENU_OPEN_INCLUDE);
+		
+		fSelectionProvider= provider;
+	}
+			
+	public void run() {
+		IInclude include= getIncludeStatement(fSelectionProvider.getSelection());
+		if (include == null) {
+			return;
+		}
+		
+		try {
+			IResource res = include.getUnderlyingResource();
+			ArrayList<Object> filesFound = new ArrayList<Object>(4);
+			String fullFileName= include.getFullFileName();
+			if (fullFileName != null) {
+				IPath fullPath= new Path(fullFileName);
+				if (fullPath.isAbsolute() && fullPath.toFile().exists()) {
+					filesFound.add(fullPath);
+				}
+			}
+			if (filesFound.isEmpty() && res != null) {
+				IProject proj = res.getProject();
+				String includeName = include.getElementName();
+				// Search in the scannerInfo information
+				IScannerInfoProvider provider =  CCorePlugin.getDefault().getScannerInfoProvider(proj);
+				if (provider != null) {
+					IScannerInfo info = provider.getScannerInformation(res);
+					// XXXX this should fall back to project by itself
+					if (info == null) {
+						info = provider.getScannerInformation(proj);
+					}
+					if (info != null) {
+						IExtendedScannerInfo scanInfo = new ExtendedScannerInfo(info);
+						
+						boolean isSystemInclude = include.isStandard();
+						
+						if (!isSystemInclude) {
+							// search in current directory
+							IPath location= include.getTranslationUnit().getLocation();
+							if (location != null) {
+								String currentDir= location.removeLastSegments(1).toOSString();
+								findFile(new String[] { currentDir }, includeName, filesFound);
+							}
+							if (filesFound.isEmpty()) {
+								// search in "..." include directories
+								String[] localIncludePaths = scanInfo.getLocalIncludePath();
+								findFile(localIncludePaths, includeName, filesFound);
+							}
+						}
+	
+						if (filesFound.isEmpty()) {
+							// search in <...> include directories
+							String[] includePaths = scanInfo.getIncludePaths();
+							findFile(includePaths, includeName, filesFound);
+						}
+					}
+					
+					if (filesFound.isEmpty()) {
+						// Fall back and search the project
+						findFile(proj, new Path(includeName), filesFound);
+					}
+				}
+			}
+			IPath fileToOpen;
+			int nElementsFound= filesFound.size();
+			if (nElementsFound == 0) {
+				noElementsFound();
+				fileToOpen= null;
+			} else if (nElementsFound == 1) {
+				fileToOpen= (IPath) filesFound.get(0);
+			} else {
+				fileToOpen= chooseFile(filesFound);
+			}
+			
+			if (fileToOpen != null) {
+				EditorUtility.openInEditor(fileToOpen, include);
+			} 
+		} catch (CModelException e) {
+			CUIPlugin.log(e.getStatus());
+		} catch (CoreException e) {
+			CUIPlugin.log(e.getStatus());
+		}
+	}
+
+	/**
+	 * 
+	 */
+	private void noElementsFound() {
+		MessageBox errorMsg = new MessageBox(CUIPlugin.getActiveWorkbenchShell(), SWT.ICON_ERROR | SWT.OK);
+		errorMsg.setText(CUIPlugin.getResourceString("OpenIncludeAction.error")); //$NON-NLS-1$
+		errorMsg.setMessage (CUIPlugin.getResourceString("OpenIncludeAction.error.description")); //$NON-NLS-1$
+		errorMsg.open();
+	}
+	
+	private boolean isInProject(IPath path) {
+		return getWorkspaceRoot().getFileForLocation(path) != null;		
+	}
+	
+	/**
+	 * Returns the path as is, if it points to a workspace resource. If the path
+	 * does not point to a workspace resource, but there are linked workspace
+	 * resources pointing to it, returns the paths of these resources.
+	 * Othervise, returns the path as is. 
+	 */
+	private IPath[] resolveIncludeLink(IPath path) {
+		if (!isInProject(path)) {
+			IFile[] files = getWorkspaceRoot().findFilesForLocationURI(URIUtil.toURI(path));
+			if (files.length > 0) {
+				IPath[] paths = new IPath[files.length];
+				for (int i = 0; i < files.length; i++) {
+					paths[i] = files[i].getFullPath(); 
+				}
+				return paths;
+			}
+		}
+		
+		return new IPath[] { path };
+	}
+
+	private IWorkspaceRoot getWorkspaceRoot() {
+		return ResourcesPlugin.getWorkspace().getRoot();
+	}
+	
+	private void findFile(String[] includePaths, String name, ArrayList<Object> list)
+			throws CoreException {
+		// in case it is an absolute path
+		IPath includeFile= new Path(name);		
+		if (includeFile.isAbsolute()) {
+			includeFile = PathUtil.getCanonicalPath(includeFile);
+			if (includeFile.toFile().exists()) {
+				list.add(includeFile);
+				return;
+			}
+		}
+		HashSet<IPath> foundSet = new HashSet<IPath>();
+		for (int i = 0; i < includePaths.length; i++) {
+			IPath path = PathUtil.getCanonicalPath(new Path(includePaths[i]).append(includeFile));
+			File file = path.toFile();
+			if (file.exists()) {
+				IPath[] paths = resolveIncludeLink(path);
+				for (int j = 0; j < paths.length; j++) {
+					IPath p = paths[j];
+					if (foundSet.add(p)) {
+						list.add(p);
+					}
+				}
+			} 
+		}
+	}
+
+	/**
+	 * Recuse in the project.
+	 * @param parent
+	 * @param name
+	 * @param list
+	 * @throws CoreException
+	 */
+	private void findFile(IContainer parent, final IPath name, final ArrayList<Object> list) throws CoreException {
+		parent.accept(new IResourceProxyVisitor() {
+
+			public boolean visit(IResourceProxy proxy) throws CoreException {
+				if (proxy.getType() == IResource.FILE && proxy.getName().equalsIgnoreCase(name.lastSegment())) {
+					IPath rPath = proxy.requestResource().getLocation();
+					int numSegToRemove = rPath.segmentCount() - name.segmentCount();
+					IPath sPath = rPath.removeFirstSegments(numSegToRemove);
+					sPath = sPath.setDevice(name.getDevice());
+					if (Platform.getOS().equals(Platform.OS_WIN32) ?
+							sPath.toOSString().equalsIgnoreCase(name.toOSString()) :
+							sPath.equals(name)) {
+						list.add(rPath);
+					}
+					return false;
+				}
+				return true;
+			}
+		}, 0);
+	}
+
+
+	private IPath chooseFile(ArrayList<Object> filesFound) {
+		ILabelProvider renderer= new LabelProvider() {
+			public String getText(Object element) {
+				if (element instanceof IPath) {
+					IPath file= (IPath)element;
+					return file.lastSegment() + " - "  + file.toString(); //$NON-NLS-1$
+				}
+				return super.getText(element);
+			}
+		};
+		
+		ElementListSelectionDialog dialog= new ElementListSelectionDialog(CUIPlugin.getActiveWorkbenchShell(), renderer, false, false);
+		dialog.setTitle(CUIPlugin.getResourceString(DIALOG_TITLE));
+		dialog.setMessage(CUIPlugin.getResourceString(DIALOG_MESSAGE));
+		dialog.setElements(filesFound);
+		
+		if (dialog.open() == Window.OK) {
+			return (IPath) dialog.getSelectedElement();
+		}
+		return null;
+	}
+
+
+	@SuppressWarnings("unchecked")
+	private static IInclude getIncludeStatement(ISelection sel) {
+		if (!sel.isEmpty() && sel instanceof IStructuredSelection) {
+			List list= ((IStructuredSelection)sel).toList();
+			if (list.size() == 1) {
+				Object element= list.get(0);
+				if (element instanceof IInclude) {
+					return (IInclude)element;
+				}
+			}
+		}
+		return null;
+	}
+	
+	public static boolean canActionBeAdded(ISelection selection) {
+		ICElement include = getIncludeStatement(selection);
+		if (include != null) {
+			IResource res = include.getUnderlyingResource();
+			if (res != null) {
+				return true; 
+			}
+		}
+		return false;
+	}	
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OverrideDefine.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OverrideDefine.java
new file mode 100644
index 0000000..ff0ed3c
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OverrideDefine.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+public class OverrideDefine extends DefineVariable {
+
+	public OverrideDefine(Directive parent, String name, StringBuffer value) {
+		super(parent, name, value);
+	}
+
+	public String toString() {
+		StringBuffer sb = new StringBuffer(GNUMakefileConstants.VARIABLE_OVERRIDE + " " + GNUMakefileConstants.VARIABLE_DEFINE); //$NON-NLS-1$
+		sb.append(getName()).append('\n');
+		sb.append(getValue());
+		sb.append(GNUMakefileConstants.TERMINAL_ENDEF);
+		return sb.toString();
+	}
+
+	public boolean isOverride() {
+		return true;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OverrideVariable.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OverrideVariable.java
new file mode 100644
index 0000000..5fcfe6f
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/OverrideVariable.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - Modified for Automake usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+public class OverrideVariable extends GNUVariableDef {
+
+	public OverrideVariable(Directive parent, String name, StringBuffer value, int type) {
+		super(parent, name, value, type);
+	}
+
+	public boolean isOverride() {
+		return true;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Parent.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Parent.java
new file mode 100644
index 0000000..e9f4d38
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Parent.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import org.eclipse.cdt.make.core.makefile.IParent;
+import org.eclipse.cdt.make.core.makefile.IDirective;
+
+/**
+ * IParent
+ */
+
+public abstract class Parent extends Directive implements IParent {
+
+	ArrayList<IDirective> children = new ArrayList<IDirective>();
+
+	public Parent(Directive parent) {
+		super(parent);
+	}
+
+	public IDirective[] getDirectives(boolean expand) {
+		return getDirectives();
+	}
+
+	public IDirective[] getDirectives() {
+		children.trimToSize();
+		return (IDirective[]) children.toArray(new IDirective[0]);
+	}
+
+	public void addDirective(Directive directive) {
+		children.add(directive);
+		// reparent
+		directive.setParent(this);
+	}
+
+	public void addDirectives(Directive[] directives) {
+		children.addAll(Arrays.asList(directives));
+		// reparent
+		for (int i = 0; i < directives.length; i++) {
+			directives[i].setParent(this);
+		}
+	}
+
+	public void clearDirectives() {
+		children.clear();
+	}
+
+	public Directive[] getStatements() {
+		children.trimToSize();
+		return (Directive[]) children.toArray(new Directive[0]);		
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	public String toString() {
+		StringBuffer sb = new StringBuffer();
+		IDirective[] directives = getDirectives();
+		for (int i = 0; i < directives.length; i++) {
+			sb.append(directives[i]);
+		}
+		return sb.toString();
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PhonyRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PhonyRule.java
new file mode 100644
index 0000000..999c9e0
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PhonyRule.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.gnu.IPhonyRule;
+
+
+/**
+ * .PHONY
+ *     The prerequisites of the special target `.PHONY' are considered to be phony targets.
+ *     When it is time to consider such a target, `make' will run its commands unconditionally, regardless of
+ *     whether a file with that name exists or what its last-modification time is.
+ */
+public class PhonyRule extends SpecialRule implements IPhonyRule {
+
+	public PhonyRule(Directive parent, String[] reqs) {
+		super(parent, new Target(GNUMakefileConstants.RULE_PHONY), reqs, new Command[0]);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PosixMakefileUtil.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PosixMakefileUtil.java
new file mode 100644
index 0000000..9932c01
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PosixMakefileUtil.java
@@ -0,0 +1,159 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ */
+public class PosixMakefileUtil {
+
+	public static String[] findPrerequisites(String line) {
+		return findTargets(line);
+	}
+
+	public static String[] findTargets(String line) {
+		List<String> aList = new ArrayList<String>();
+		int space;
+		// Trim away trailing and prepending spaces.
+		line = line.trim();
+		while ((space = Util.indexOf(line, " \t")) != -1) { //$NON-NLS-1$
+			aList.add(line.substring(0, space).trim());
+			line = line.substring(space + 1).trim();
+		}
+		// The last target.
+		if (line.length() > 0) {
+			aList.add(line);
+		}
+		return (String[]) aList.toArray(new String[0]);
+	}
+
+	public static boolean isMacroDefinition(String line) {
+		return Util.indexOf(line, '=') != -1;
+	}
+
+	public static boolean isTargetRule(String line) {
+		return Util.indexOf(line, ':') != -1;
+	}
+
+	public static boolean isCommand(String line) {
+		return line.length() > 1 && line.charAt(0) == '\t';
+	}
+
+	public static boolean isEmptyLine(String line) {
+		return line.trim().length() == 0;
+	}
+
+	public static boolean isInferenceRule(String line) {
+		line = line.trim();
+		if (line.startsWith(".")) { //$NON-NLS-1$
+			int index = Util.indexOf(line, ':');
+			if (index > 1) {
+				line = line.substring(index + 1).trim();
+				if (line.length() == 0 || line.equals(";")) { //$NON-NLS-1$
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	public static boolean isDefaultRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(MakeFileConstants.RULE_DEFAULT);
+		}
+		return false;
+	}
+
+	public static boolean isIgnoreRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(MakeFileConstants.RULE_IGNORE);
+		}
+		return false;
+	}
+
+	public static boolean isPosixRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(MakeFileConstants.RULE_POSIX);
+		}
+		return false;
+	}
+
+	public static boolean isPreciousRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(MakeFileConstants.RULE_PRECIOUS);
+		}
+		return false;
+	}
+
+	public static boolean isSccsGetRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(MakeFileConstants.RULE_SCCS_GET);
+		}
+		return false;
+	}
+
+	public static boolean isSilentRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(MakeFileConstants.RULE_SILENT);
+		}
+		return false;
+	}
+
+	public static boolean isSuffixesRule(String line) {
+		line = line.trim();
+		int colon = Util.indexOf(line, ':');
+		if (colon > 0) {
+			line = line.substring(0, colon).trim();
+			return line.equals(MakeFileConstants.RULE_SUFFIXES);
+		}
+		return false;
+	}
+
+	public static boolean isLibraryTarget(String line) {
+		char prev = 0;
+		int paren = 0;
+
+		for (int i = 0; i < line.length(); i++) {
+			char ch = line.charAt(i);
+			if (ch == '(' && prev != '$' && prev != '\\') {
+				paren++;
+			} else if (ch == ')' && prev != '\\') {
+				if (paren > 0) {
+					return true;
+				}
+			}
+			prev = ch;
+		}
+		return false;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PosixRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PosixRule.java
new file mode 100644
index 0000000..0114479
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PosixRule.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IPosixRule;
+
+/**
+ * .POSIX
+ * The appliation shall ensure that this special target is specified without
+ * prerequisites or commands.
+ */
+public class PosixRule extends SpecialRule implements IPosixRule {
+
+	public PosixRule(Directive parent) {
+		super(parent, new Target(MakeFileConstants.RULE_POSIX), new String[0], new Command[0]);
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PreciousRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PreciousRule.java
new file mode 100644
index 0000000..ef72f6d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/PreciousRule.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.IPreciousRule;
+
+/**
+ * .PRECIOUS
+ * Prerequisites of this special target shall not be removed if make recieves an
+ * asynchronous events.
+ */
+public class PreciousRule extends SpecialRule implements IPreciousRule {
+
+	public PreciousRule(Directive parent, String[] reqs) {
+		super(parent, new Target(MakeFileConstants.RULE_PRECIOUS), reqs, new Command[0]);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ProjectionMakefileUpdater.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ProjectionMakefileUpdater.java
new file mode 100644
index 0000000..61418d3
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/ProjectionMakefileUpdater.java
@@ -0,0 +1,397 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ * Red Hat Inc. - convert to use with Automake editor
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.IMacroDefinition;
+import org.eclipse.cdt.make.core.makefile.IParent;
+import org.eclipse.cdt.make.core.makefile.IRule;
+import org.eclipse.cdt.make.core.makefile.gnu.IConditional;
+import org.eclipse.cdt.make.ui.IWorkingCopyManager;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.Position;
+import org.eclipse.jface.text.source.Annotation;
+import org.eclipse.jface.text.source.IAnnotationModel;
+import org.eclipse.jface.text.source.projection.IProjectionListener;
+import org.eclipse.jface.text.source.projection.ProjectionAnnotation;
+import org.eclipse.jface.text.source.projection.ProjectionAnnotationModel;
+import org.eclipse.jface.text.source.projection.ProjectionViewer;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+
+
+/**
+ * ProjectionMakefileUpdater
+ */
+public class ProjectionMakefileUpdater implements IProjectionListener {
+
+	private static class MakefileProjectionAnnotation extends ProjectionAnnotation {
+		
+		private IDirective fDirective;
+		private boolean fIsComment;
+		
+		public MakefileProjectionAnnotation(IDirective element, boolean isCollapsed, boolean isComment) {
+			super(isCollapsed);
+			fDirective = element;
+			fIsComment = isComment;
+		}
+		
+		public IDirective getElement() {
+			return fDirective;
+		}
+		
+		public void setElement(IDirective element) {
+			fDirective = element;
+		}
+		
+		public boolean isComment() {
+			return fIsComment;
+		}
+	}
+	
+
+	public void install(MakefileEditor editor, ProjectionViewer viewer) {
+		fEditor= editor;
+		fViewer= viewer;
+		fViewer.addProjectionListener(this);
+	}
+	
+	public void uninstall() {
+		if (isInstalled()) {
+			projectionDisabled();
+			fViewer.removeProjectionListener(this);
+			fViewer= null;
+			fEditor= null;
+		}
+	}
+	
+	protected boolean isInstalled() {
+		return fEditor != null;
+	}
+
+	private class ReconcilerParticipant implements IReconcilingParticipant {
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.IReconcilingParticipant#reconciled()
+		 */
+		public void reconciled() {
+			processReconcile();
+		}
+	}
+
+	private IDocument fCachedDocument;
+	private MakefileEditor fEditor;
+	private IDirective fInput;
+	private ProjectionViewer fViewer;
+	private IReconcilingParticipant fParticipant;
+
+	private boolean fAllowCollapsing = false;
+	@SuppressWarnings("unused")
+	private boolean fCollapseMacroDef = false;
+	@SuppressWarnings("unused")
+	private boolean fCollapseRule = false;
+	@SuppressWarnings("unused")
+	private boolean fCollapseConditional = false;
+
+	/*
+	 * @see org.eclipse.jface.text.source.projection.IProjectionListener#projectionEnabled()
+	 */
+	public void projectionEnabled() {
+		// http://home.ott.oti.com/teams/wswb/anon/out/vms/index.html
+		// projectionEnabled messages are not always paired with projectionDisabled
+		// i.e. multiple enabled messages may be sent out.
+		// we have to make sure that we disable first when getting an enable
+		// message.
+		projectionDisabled();
+		
+		initialize();			
+		fParticipant= new ReconcilerParticipant();
+		fEditor.addReconcilingParticipant(fParticipant);
+	}
+	
+	/*
+	 * @see org.eclipse.jface.text.source.projection.IProjectionListener#projectionDisabled()
+	 */
+	public void projectionDisabled() {
+		fCachedDocument= null;
+		if (fParticipant != null) {
+			fEditor.addReconcilingParticipant(fParticipant);
+			fParticipant= null;
+		}
+	}
+		
+	@SuppressWarnings("unchecked")
+	public void initialize() {
+		
+		if (!isInstalled())
+			return;
+		
+		initializePreferences();
+		
+		try {
+			
+			IDocumentProvider provider= fEditor.getDocumentProvider();
+			fCachedDocument= provider.getDocument(fEditor.getEditorInput());
+			fAllowCollapsing= true;
+			
+			IWorkingCopyManager manager= AutomakeEditorFactory.getDefault().getWorkingCopyManager();
+			fInput= manager.getWorkingCopy(fEditor.getEditorInput());
+			
+			if (fInput != null) {
+				ProjectionAnnotationModel model= (ProjectionAnnotationModel) fEditor.getAdapter(ProjectionAnnotationModel.class);
+				if (model != null) {
+					Map additions= computeAdditions((IParent) fInput);
+					model.removeAllAnnotations();
+					model.replaceAnnotations(null, additions);
+				}
+			}
+			
+		} finally {
+			fCachedDocument= null;
+			fAllowCollapsing= false;
+		}
+	}
+
+	private void initializePreferences() {
+		//FIXME: what to do with Makefile editor preferences
+		IPreferenceStore store = AutotoolsPlugin.getDefault().getPreferenceStore();
+		fCollapseMacroDef = store.getBoolean(MakefileEditorPreferenceConstants.EDITOR_FOLDING_MACRODEF);
+		fCollapseRule = store.getBoolean(MakefileEditorPreferenceConstants.EDITOR_FOLDING_RULE);
+		fCollapseConditional = store.getBoolean(MakefileEditorPreferenceConstants.EDITOR_FOLDING_CONDITIONAL);
+	}
+
+	private Map<MakefileProjectionAnnotation, Position> computeAdditions(IParent parent) {
+		Map<MakefileProjectionAnnotation, Position> map= new HashMap<MakefileProjectionAnnotation, Position>();
+		computeAdditions(parent.getDirectives(), map);
+		return map;
+	}
+
+	private void computeAdditions(IDirective[] elements, Map<MakefileProjectionAnnotation, Position> map) {
+		for (int i= 0; i < elements.length; i++) {
+			IDirective element= elements[i];
+			
+			computeAdditions(element, map);
+			
+			if (element instanceof IParent) {
+				IParent parent= (IParent) element;
+				computeAdditions(parent.getDirectives(), map);
+			}
+		}
+	}
+
+	private void computeAdditions(IDirective element, Map<MakefileProjectionAnnotation, Position> map) {
+		
+		boolean createProjection= false;
+		
+		if (element instanceof IConditional) {
+			createProjection= true;
+		} else if (element instanceof IMacroDefinition) {
+			createProjection= true;
+		} else if (element instanceof IRule) {
+			createProjection= true;
+		}
+	
+		if (createProjection) {
+			Position position= createProjectionPosition(element);
+			if (position != null) {
+				map.put(new MakefileProjectionAnnotation(element, fAllowCollapsing, true), position);
+			}
+		}
+	}
+
+	private Position createProjectionPosition(IDirective element) {
+		
+		if (fCachedDocument == null)
+			return null;
+		
+		try {			
+			int startLine= element.getStartLine() - 1;
+			int endLine= element.getEndLine() - 1;
+			if (startLine != endLine) {
+				int offset= fCachedDocument.getLineOffset(startLine);
+				int endOffset= fCachedDocument.getLineOffset(endLine + 1);
+				return new Position(offset, endOffset - offset);
+			}
+			
+		} catch (BadLocationException x) {
+		}
+		
+		return null;
+	}
+
+	public void processReconcile() {
+		if (!isInstalled())
+			return;
+		
+		ProjectionAnnotationModel model= (ProjectionAnnotationModel) fEditor.getAdapter(ProjectionAnnotationModel.class);
+		if (model == null)
+			return;
+		
+		try {
+			IDocumentProvider provider= fEditor.getDocumentProvider();
+			fCachedDocument= provider.getDocument(fEditor.getEditorInput());
+			fAllowCollapsing= false;
+			
+			Map<MakefileProjectionAnnotation, Position> additions= new HashMap<MakefileProjectionAnnotation, Position>();
+			List<MakefileProjectionAnnotation> deletions= new ArrayList<MakefileProjectionAnnotation>();
+			List<MakefileProjectionAnnotation> updates= new ArrayList<MakefileProjectionAnnotation>();
+			
+			Map<MakefileProjectionAnnotation, Position> updated= computeAdditions((IParent) fInput);
+			Map<IDirective, List<MakefileProjectionAnnotation>> previous= createAnnotationMap(model);
+			
+			
+			Iterator<MakefileProjectionAnnotation> e= updated.keySet().iterator();
+			while (e.hasNext()) {
+				MakefileProjectionAnnotation annotation= (MakefileProjectionAnnotation) e.next();
+				IDirective element= annotation.getElement();
+				Position position= (Position) updated.get(annotation);
+				
+				List<MakefileProjectionAnnotation> annotations= previous.get(element);
+				if (annotations == null) {
+					additions.put(annotation, position);
+				} else {
+					Iterator<MakefileProjectionAnnotation> x= annotations.iterator();
+					while (x.hasNext()) {
+						MakefileProjectionAnnotation a= (MakefileProjectionAnnotation) x.next();
+						if (annotation.isComment() == a.isComment()) {
+							Position p= model.getPosition(a);
+							if (p != null && !position.equals(p)) {
+								p.setOffset(position.getOffset());
+								p.setLength(position.getLength());
+								updates.add(a);
+							}
+							x.remove();
+							break;
+						}
+					}
+										
+					if (annotations.isEmpty())
+						previous.remove(element);
+				}
+			}
+			
+			Iterator<List<MakefileProjectionAnnotation>> e2 = previous.values().iterator();
+			while (e.hasNext()) {
+				List<MakefileProjectionAnnotation> list= e2.next();
+				int size= list.size();
+				for (int i= 0; i < size; i++)
+					deletions.add(list.get(i));
+			}
+
+			match(model, deletions, additions, updates);
+
+			Annotation[] removals= new Annotation[deletions.size()];
+			deletions.toArray(removals);
+			Annotation[] changes= new Annotation[updates.size()];
+			updates.toArray(changes);
+			model.modifyAnnotations(removals, additions, changes);
+			
+		} finally {
+			fCachedDocument= null;
+			fAllowCollapsing= true;
+		}
+	}
+
+	private void match(ProjectionAnnotationModel model, List<MakefileProjectionAnnotation> deletions, 
+			Map<MakefileProjectionAnnotation, Position> additions, List<MakefileProjectionAnnotation> changes) {
+		if (deletions.isEmpty() || (additions.isEmpty() && changes.isEmpty()))
+			return;
+		
+		List<MakefileProjectionAnnotation> newDeletions= new ArrayList<MakefileProjectionAnnotation>();
+		List<MakefileProjectionAnnotation> newChanges= new ArrayList<MakefileProjectionAnnotation>();
+		
+		Iterator<MakefileProjectionAnnotation> deletionIterator= deletions.iterator();
+		outer: while (deletionIterator.hasNext()) {
+			MakefileProjectionAnnotation deleted= (MakefileProjectionAnnotation) deletionIterator.next();
+			Position deletedPosition= model.getPosition(deleted);
+			if (deletedPosition == null)
+				continue;
+			
+			Iterator<MakefileProjectionAnnotation> changesIterator= changes.iterator();
+			while (changesIterator.hasNext()) {
+				MakefileProjectionAnnotation changed= (MakefileProjectionAnnotation) changesIterator.next();
+				if (deleted.isComment() == changed.isComment()) {
+					Position changedPosition= model.getPosition(changed);
+					if (changedPosition == null)
+						continue;
+					
+					if (deletedPosition.getOffset() == changedPosition.getOffset()) {
+						
+						deletedPosition.setLength(changedPosition.getLength());
+						deleted.setElement(changed.getElement());
+						
+						deletionIterator.remove();
+						newChanges.add(deleted);
+						
+						changesIterator.remove();
+						newDeletions.add(changed);
+						
+						continue outer;
+					}
+				}
+			}
+			
+			Iterator<MakefileProjectionAnnotation> additionsIterator= additions.keySet().iterator();
+			while (additionsIterator.hasNext()) {
+				MakefileProjectionAnnotation added= (MakefileProjectionAnnotation) additionsIterator.next();
+				if (deleted.isComment() == added.isComment()) {
+					Position addedPosition= (Position) additions.get(added);
+					
+					if (deletedPosition.getOffset() == addedPosition.getOffset()) {
+						
+						deletedPosition.setLength(addedPosition.getLength());
+						deleted.setElement(added.getElement());
+						
+						deletionIterator.remove();
+						newChanges.add(deleted);
+						
+						additionsIterator.remove();
+						
+						break;
+					}
+				}
+			}
+		}
+		
+		deletions.addAll(newDeletions);
+		changes.addAll(newChanges);
+	}
+
+	@SuppressWarnings("unchecked")
+	private Map<IDirective, List<MakefileProjectionAnnotation>> createAnnotationMap(IAnnotationModel model) {
+		Map<IDirective, List<MakefileProjectionAnnotation>> map= new HashMap<IDirective, List<MakefileProjectionAnnotation>>();
+		Iterator e= model.getAnnotationIterator();
+		while (e.hasNext()) {
+			Object annotation= e.next();
+			if (annotation instanceof MakefileProjectionAnnotation) {
+				MakefileProjectionAnnotation directive= (MakefileProjectionAnnotation) annotation;
+				List<MakefileProjectionAnnotation> list= map.get(directive.getElement());
+				if (list == null) {
+					list= new ArrayList<MakefileProjectionAnnotation>(2);
+					map.put(directive.getElement(), list);
+				}
+				list.add(directive);
+			}
+		}
+		return map;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Rule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Rule.java
new file mode 100644
index 0000000..44b281a
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Rule.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+
+import org.eclipse.cdt.make.core.makefile.ICommand;
+import org.eclipse.cdt.make.core.makefile.IRule;
+import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.ITarget;
+
+public abstract class Rule extends Parent implements IRule {
+
+	Target target;
+
+	public Rule(Directive parent, Target tgt) {
+		this(parent, tgt, new Command[0]);
+	}
+
+	public Rule(Directive parent, Target tgt, Command[] cmds) {
+		super(parent);
+		target = tgt;
+		addDirectives(cmds);
+	}
+
+	public ICommand[] getCommands() {
+		IDirective[] directives = getDirectives();
+		ArrayList<IDirective> cmds = new ArrayList<IDirective>(directives.length);
+		for (int i = 0; i < directives.length; i++) {
+			if (directives[i] instanceof ICommand) {
+				cmds.add(directives[i]);
+			}
+		}
+		return (ICommand[])cmds.toArray(new ICommand[0]);
+	}
+
+	public ITarget getTarget() {
+		return target;
+	}
+
+	public void setTarget(Target tgt) {
+		target = tgt;
+	}
+
+	public boolean equals(Rule r) {
+		return r.getTarget().equals(getTarget());
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SccsGetRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SccsGetRule.java
new file mode 100644
index 0000000..c98f8c2
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SccsGetRule.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.ISccsGetRule;
+
+/**
+ * .SCCS_GET
+ * The application shall ensure that this special target is specified without
+ * prerequesites.
+ * The commands specifeied with this target shall replace the default
+ * commands associated with this special target.
+ */
+public class SccsGetRule extends SpecialRule implements ISccsGetRule {
+
+	public SccsGetRule(Directive parent, Command[] cmds) {
+		super(parent, new Target(MakeFileConstants.RULE_SCCS_GET), new String[0], cmds);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SecondaryRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SecondaryRule.java
new file mode 100644
index 0000000..c99a770
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SecondaryRule.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.gnu.ISecondaryRule;
+
+
+/**
+ * .SECONDARY
+ *  The targets which `.SECONDARY' depends on are treated as
+ *  intermediate files, except that they are never automatically deleted.
+ *
+ *  `.SECONDARY' with no prerequisites causes all targets to be treated
+ *  as secondary (i.e., no target is removed because it is considered intermediate).
+ */
+public class SecondaryRule extends SpecialRule implements ISecondaryRule {
+
+	public SecondaryRule(Directive parent, String[] reqs) {
+		super(parent, new Target(GNUMakefileConstants.RULE_SECONDARY), reqs, new Command[0]);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SelectionList.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SelectionList.java
new file mode 100644
index 0000000..c282883
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SelectionList.java
@@ -0,0 +1,252 @@
+/*******************************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * A selection widget that consists of a list and a text entry field. The list
+ * of elements presented are limited to the pattern entered into the text entry
+ * field.
+ */
+public class SelectionList extends Composite {
+
+	// State
+	private Object[] fElements;
+	protected ILabelProvider fRenderer;
+	private boolean fIgnoreCase;
+	
+	// Implementation details
+	private String[] fRenderedStrings;
+	private int[] fFilteredElements;	
+	private String fRememberedMatchText;
+
+	// SWT widgets
+	private Table fList;
+	private Text fText;
+	
+	/**
+	 * Adds a selection change listener to this widget.
+	 */
+	public void addSelectionListener(SelectionListener listener) {
+		fList.addSelectionListener(listener);
+	}
+	private void createList(int style) {
+		fList= new Table(this, style);
+		fList.setLayoutData(new GridData(GridData.FILL_BOTH));
+		fList.addDisposeListener(new DisposeListener() {
+			public void widgetDisposed(DisposeEvent e) {
+				fRenderer.dispose();
+			}
+		});
+	}
+	private void createText() {
+		fText= new Text(this, SWT.BORDER);
+		GridData spec= new GridData();
+		spec.grabExcessVerticalSpace= false;
+		spec.grabExcessHorizontalSpace= true;
+		spec.horizontalAlignment= GridData.FILL;
+		spec.verticalAlignment= GridData.BEGINNING;
+		fText.setLayoutData(spec);
+		Listener l= new Listener() {
+			public void handleEvent(Event evt) {
+				filter(false);
+			}
+		};
+		fText.addListener(SWT.Modify, l);
+	}
+	/**
+	 * Filters the list of elements according to the pattern entered
+	 * into the text entry field.
+	 */
+	public void filter(boolean forceUpdate) {
+		int k= 0;
+		String text= fText.getText();
+		if (!forceUpdate && text.equals(fRememberedMatchText))
+			return;
+		fRememberedMatchText= text;
+		StringMatcher matcher= new StringMatcher(text+"*", fIgnoreCase, false); //$NON-NLS-1$
+		for (int i= 0; i < fElements.length; i++) {
+			if (matcher.match(fRenderedStrings[i])) {
+				fFilteredElements[k]= i;
+				k++;
+			}
+		}
+		fFilteredElements[k]= -1;
+		updateListWidget(fFilteredElements, k);
+	}
+	/**
+	 * Returns the currently used filter text.
+	 */
+	public String getFilter() {
+		return fText.getText();
+	}
+	/**
+	 * Returns the selection indices.
+	 */
+	public int[] getSelectionIndices() {
+		return fList.getSelectionIndices();
+	}
+	/**
+	 * Returns a list of selected elements. Note that the type of the elements
+	 * returned in the list are the same as the ones passed to the selection list
+	 * via <code>setElements</code>. The list doesn't contain the rendered strings.
+	 */
+	public List<Object> getSelection() {
+		if (fList == null || fList.isDisposed() || fList.getSelectionCount() == 0)
+			return new ArrayList<Object>(0);
+		int[] listSelection= fList.getSelectionIndices();
+		List<Object> selected= new ArrayList<Object>(listSelection.length);
+		for (int i= 0; i < listSelection.length; i++) {
+			selected.add(fElements[fFilteredElements[listSelection[i]]]);
+		}
+		return selected;
+	}
+	/**
+	 * Returns <code>true</code> when the list of elements is empty.
+	 */
+	public boolean isEmptyList() {
+		return fElements == null || fElements.length == 0;
+	}
+	/**
+	 * Creates new instance of the widget.
+	 */
+	public SelectionList(Composite parent, int style, ILabelProvider renderer, boolean ignoreCase) {
+		super(parent, SWT.NONE);
+		fRenderer= renderer;
+		fIgnoreCase= ignoreCase;
+		GridLayout layout= new GridLayout();
+		layout.marginHeight= 0; layout.marginWidth= 0;
+		//XXX: 1G9V58A: ITPUI:WIN2000 - Dialog.convert* methods should be static
+		setLayout(layout);
+		createText();
+		createList(style);
+	}
+	/**
+	 * Removes a selection change listener to this widget.
+	 */
+	public void removeSelectionListener(SelectionListener listener) {
+		fList.removeSelectionListener(listener);
+	}
+	private String[] renderStrings() {
+		String[] strings= new String[fElements.length];
+		for (int i= 0; i < strings.length; i++) {
+			strings[i]= fRenderer.getText(fElements[i]);
+		}
+		TwoArrayQuickSort.sort(strings, fElements, fIgnoreCase);
+		return strings;
+	}
+	/**
+	 * Select the pattern text.
+	 */
+	public void selectFilterText() {
+		fText.selectAll();
+	}
+	/**
+	 * Sets the list of elements presented in the widget.
+	 */
+	public void setElements(List<Object> elements, boolean refilter) {
+		// We copy the list since we sort it.
+		if (elements == null)
+			fElements= new Object[0];
+		else 
+			fElements= elements.toArray();
+		fFilteredElements= new int[fElements.length+1];
+		fRenderedStrings= renderStrings();
+		if (refilter)
+			filter(true);		
+	}
+	/* 
+	 * Non Java-doc
+	 */
+	public void setEnabled(boolean enable) {
+		super.setEnabled(enable);
+		fText.setEnabled(enable);
+		fList.setEnabled(enable);
+	}
+	/**
+	 * Sets the filter pattern. Current only prefix filter pattern are supported.
+	 */
+	public void setFilter(String pattern, boolean refilter) {
+		fText.setText(pattern);
+		if (refilter)
+			filter(true);
+	}
+	/*
+	 * Non Java-doc
+	 */
+	public boolean setFocus() {
+		return fText.setFocus();
+	}
+	/*
+	 * Non Java-doc
+	 */
+	public void setFont(Font font) {
+		super.setFont(font);
+		fText.setFont(font);
+		fList.setFont(font);
+	}
+	/**
+	 * Selects the elements in the list determined by the given
+	 * selection indices.
+	 */
+	protected void setSelection(int[] selection) {
+		fList.setSelection(selection);
+	}
+	private void updateListWidget(int[] indices, int size) {
+		if (fList == null || fList.isDisposed())
+			return;
+		fList.setRedraw(false);
+		int itemCount= fList.getItemCount();
+		if (size < itemCount) {
+			fList.remove(0, itemCount-size-1);
+		}
+
+		TableItem[] items= fList.getItems();
+		for (int i= 0; i < size; i++) {
+			TableItem ti= null;
+			if (i < itemCount) {
+				ti= items[i];
+			} else {
+				ti= new TableItem(fList, i);
+			}
+			ti.setText(fRenderedStrings[indices[i]]);
+			Image img= fRenderer.getImage(fElements[indices[i]]);
+			if (img != null)
+				ti.setImage(img);
+		}
+		if (fList.getItemCount() > 0) {
+			fList.setSelection(0);
+		}
+					
+		fList.setRedraw(true);
+		Event event= new Event();
+		fList.notifyListeners(SWT.Selection, event);
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SelectionStatusDialog.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SelectionStatusDialog.java
new file mode 100644
index 0000000..f480531
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SelectionStatusDialog.java
@@ -0,0 +1,195 @@
+/*******************************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+
+import org.eclipse.ui.dialogs.SelectionDialog;
+
+import org.eclipse.core.runtime.IStatus;
+
+/**
+ * An abstract base class for dialogs with a status bar and ok/cancel buttons.
+ * The status message must be passed over as StatusInfo object and can be
+ * an error, warning or ok. The OK button is enabled / disabled depending
+ * on the status.
+ */ 
+public abstract class SelectionStatusDialog extends SelectionDialog {
+	
+	private MessageLine fStatusLine;
+	private IStatus fLastStatus;
+	private Image fImage;
+	private boolean fInitialSelectionSet;
+	private boolean fStatusLineAboveButtons= false;
+	
+	
+	/**
+	 * Compute the result and return it.
+	 */
+	protected abstract void computeResult();
+	/* (non-Javadoc)
+	 * Method declared in Window.
+	 */
+	protected void configureShell(Shell shell) {
+		super.configureShell(shell);
+		if (fImage != null)
+			shell.setImage(fImage);
+	}
+	/* (non-Javadoc)
+	 * Method declared in Dialog.
+	 */
+	protected Control createButtonBar(Composite parent) {
+		Composite composite= new Composite(parent, SWT.NULL);
+		GridLayout layout= new GridLayout();
+		if (fStatusLineAboveButtons) {
+			layout.verticalSpacing= 0;
+		} else {
+			layout.numColumns= 2;
+		}
+		layout.marginHeight= 0; layout.marginWidth= 0;
+		composite.setLayout(layout);
+		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		
+		fStatusLine= new MessageLine(composite);
+		fStatusLine.setAlignment(SWT.LEFT);
+		fStatusLine.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		fStatusLine.setMessage(""); //$NON-NLS-1$
+
+		super.createButtonBar(composite);
+		return composite;
+	}
+	/* (non-Javadoc)
+	 * Method declared in Dialog.
+	 */
+	public void create() {
+		super.create();
+		if (fLastStatus != null) {
+			updateStatus(fLastStatus);
+		}
+	}
+	/**
+	 * Returns the first element of the initial selection or <code>null<code>
+	 * if there isn't any initial selection.
+	 * @return the first element of the initial selection.
+	 */
+	@SuppressWarnings("unchecked")
+	protected Object getPrimaryInitialSelection() {
+		List result= getInitialElementSelections();
+		if (result == null || result.size() == 0)
+			return null;
+		return result.get(0);	
+	}
+	/**
+	 * Returns the first element from the list of results. Returns <code>null</code>
+	 * if no element has been selected.
+	 *
+	 * @return the first result element if one exists. Otherwise <code>null</code> is
+	 *  returned.
+	 */
+	public Object getPrimaryResult() {
+		Object[] result= getResult();
+		if (result == null || result.length == 0)
+			return null;
+		return result[0];	
+	}
+	public SelectionStatusDialog(Shell parent) {
+		super(parent);
+		fInitialSelectionSet= false;
+	}
+	/* (non-Javadoc)
+	 * Method declared in Dialog.
+	 */
+	protected void okPressed() {
+		computeResult();
+		super.okPressed();
+	}
+	/**
+	 * Sets the image for this dialog.
+	 *
+	 * @param image the dialog's image
+	 */
+	public void setImage(Image image) {
+		fImage= image;
+	}
+	@SuppressWarnings("unchecked")
+	protected void setInitialSelection(int position, Object element) {
+		List l= getInitialElementSelections();
+		l.set(position, element);
+		fInitialSelectionSet= true;
+	}
+	/**
+	 * Sets the initial selection to the given element.
+	 */
+	public void setInitialSelection(Object element) {
+		// Allow clients to use set their own initial selection(s)
+		if (fInitialSelectionSet && element != null && element.equals("A")) //$NON-NLS-1$
+			return;
+
+		if (element != null) {
+			setInitialSelections(new Object[] { element });
+		} else {
+			setInitialSelections(new Object[0]);
+		}
+	}
+	public void setInitialSelections(Object[] selectedElements) {
+		super.setInitialSelections(selectedElements);
+		fInitialSelectionSet= true;
+	}
+	/**
+	 * Sets a result element at the given position.
+	 */
+	protected void setResult(int position, Object element) {
+		Object[] result= getResult();
+		result[position]= element;
+		setResult(Arrays.asList(result));
+	}
+	/**
+	 * Controls whether status line appears to the left of the buttons (default)
+	 * or above them.
+	 *
+	 * @param aboveButtons if <code>true</code> status line is placed above buttons; if
+	 * 	<code>false</code> to the right
+	 */
+	public void setStatusLineAboveButtons(boolean aboveButtons) {
+		fStatusLineAboveButtons= aboveButtons;
+	}
+	/**
+	 * Update the status of the ok button to reflect the given status. Subclasses
+	 * may override this method to update additional buttons.
+	 */
+	protected void updateButtonsEnableState(IStatus status) {
+		Button okButton= getOkButton();
+		if (okButton != null && !okButton.isDisposed())
+			okButton.setEnabled(!status.matches(IStatus.ERROR));
+	}
+	/**
+	 * Update the dialog's status line to reflect the given status. It is safe to call
+	 * this method before the dialog has been opened.
+	 */
+	protected void updateStatus(IStatus status) {
+		fLastStatus= status;
+		if (fStatusLine != null && !fStatusLine.isDisposed()) {
+		    updateButtonsEnableState(status);
+		    StatusTool.applyToStatusLine(fStatusLine, status);			
+		}
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SilentRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SilentRule.java
new file mode 100644
index 0000000..91c7d01
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SilentRule.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.ISilentRule;
+
+/**
+ * .SILENT
+ * Prerequisties of this special target are targets themselves; this shall cause
+ * commands associated with them not to be written to the standard output before
+ * they are executed.
+ */
+public class SilentRule extends SpecialRule implements ISilentRule {
+
+	public SilentRule(Directive parent, String[] reqs) {
+		super(parent, new Target(MakeFileConstants.RULE_SILENT), reqs, new Command[0]);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SpecialRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SpecialRule.java
new file mode 100644
index 0000000..079605c
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SpecialRule.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.ISpecialRule;
+import org.eclipse.cdt.make.core.makefile.ICommand;
+
+/**
+ * Targets that have special meaning for Make.
+ */
+public abstract class SpecialRule extends Rule implements ISpecialRule {
+
+	String[] prerequisites;
+
+	public SpecialRule(Directive parent, Target target, String[] reqs, Command[] cmds) {
+		super(parent, target, cmds);
+		prerequisites = reqs;
+	}
+
+	public String[] getPrerequisites() {
+		return prerequisites;
+	}
+
+	public String toString() {
+		StringBuffer sb = new StringBuffer();
+		sb.append(target).append(':');
+		String[] reqs = getPrerequisites();
+		for (int i = 0; i < reqs.length; i++) {
+			sb.append(' ').append(reqs[i]);
+		}
+		sb.append('\n');
+		ICommand[] cmds = getCommands();
+		for (int i = 0; i < cmds.length; i++) {
+			sb.append(cmds[i]);
+		}
+		return sb.toString();
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StaticTargetRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StaticTargetRule.java
new file mode 100644
index 0000000..21877de
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StaticTargetRule.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.ICommand;
+import org.eclipse.cdt.make.core.makefile.IInferenceRule;
+
+
+/**
+ *   Here is the syntax of a static pattern rule:
+ *
+ *    TARGETS ...: TARGET-PATTERN: DEP-PATTERNS ...
+ *            COMMANDS
+ *            ...
+ */
+public class StaticTargetRule extends InferenceRule implements IInferenceRule {
+
+	String targetPattern;
+	String[] prereqPatterns;
+
+	public StaticTargetRule(Directive parent, Target target, String target_pattern, String[] prereq_patterns, Command[] commands) {
+		super(parent, target, commands);
+		targetPattern = target_pattern;
+		prereqPatterns = prereq_patterns;
+	}
+
+	public String[] getPrerequisitePatterns() {
+		return prereqPatterns;
+	}
+
+	public void setPrerequesitePatterns(String[] prereqs) {
+		prereqPatterns = prereqs;
+	}
+
+	public String getTargetPattern() {
+		return targetPattern;
+	}
+
+	public void setTargetPattern(String target_pattern) {
+		targetPattern = target_pattern;
+	}
+
+	/**
+	 * @see java.lang.Object#toString()
+	 */
+	public String toString() {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append(getTarget()).append(':');
+		String pattern = getTargetPattern();
+		if (pattern != null && pattern.length() > 0) {
+			buffer.append(' ').append(targetPattern);
+		}
+		buffer.append(':');
+		for (int i = 0; i < prereqPatterns.length; i++) {
+			buffer.append(' ').append(prereqPatterns[i]);
+		}
+		buffer.append('\n');
+		ICommand[] cmds = getCommands();
+		for (int i = 0; i < cmds.length; i++) {
+			buffer.append(cmds[i].toString());
+		}
+		return buffer.toString();
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StatusInfo.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StatusInfo.java
new file mode 100644
index 0000000..b73de94
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StatusInfo.java
@@ -0,0 +1,148 @@
+/*******************************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.core.runtime.IStatus;
+
+import org.eclipse.cdt.ui.CUIPlugin;
+
+/**
+ * A settable IStatus
+ * Can be an error, warning, info or ok. For error, info and warning states,
+ * a message describes the problem
+ */
+public class StatusInfo implements IStatus {
+	
+	public static final IStatus OK_STATUS= new StatusInfo();
+
+	private String fStatusMessage;
+	private int fSeverity;
+
+	/**
+	 * Creates a status set to OK (no message)
+	 */
+	public StatusInfo() {
+		this(OK, null);
+	}
+
+	/**
+	 * Creates a status .
+	 * @param severity The status severity: ERROR, WARNING, INFO and OK.
+	 * @param message The message of the status. Applies only for ERROR,
+	 * WARNING and INFO.
+	 */	
+	public StatusInfo(int severity, String message) {
+		fStatusMessage= message;
+		fSeverity= severity;
+	}		
+
+	/**
+	 * @see IStatus#getChildren()
+	 */
+	public IStatus[] getChildren() {
+		return new IStatus[0];
+	}
+	/**
+	 * @see IStatus#getCode()
+	 */
+	public int getCode() {
+		return fSeverity;
+	}
+	/**
+	 * @see IStatus#getException()
+	 */
+	public Throwable getException() {
+		return null;
+	}
+	/**
+	 * @see IStatus#getMessage
+	 */
+	public String getMessage() {
+		return fStatusMessage;
+	}
+	/**
+	 * @see IStatus#getPlugin()
+	 */
+	public String getPlugin() {
+		return CUIPlugin.PLUGIN_ID;
+	}
+	/**
+	 * @see IStatus#getSeverity()
+	 */
+	public int getSeverity() {
+		return fSeverity;
+	}
+	public boolean isError() {
+		return fSeverity == IStatus.ERROR;
+	}
+	public boolean isInfo() {
+		return fSeverity == IStatus.INFO;
+	}
+	/**
+	 * @see IStatus#isMultiStatus()
+	 */
+	public boolean isMultiStatus() {
+		return false;
+	}
+	public boolean isOK() {
+		return fSeverity == IStatus.OK;
+	}
+	public boolean isWarning() {
+		return fSeverity == IStatus.WARNING;
+	}
+	/**
+	 * @see IStatus#matches(int)
+	 */
+	public boolean matches(int severityMask) {
+		return (fSeverity & severityMask) != 0;
+	}
+	public void setError(String errorMessage) {
+		fStatusMessage= errorMessage;
+		fSeverity= IStatus.ERROR;
+	}
+	public void setInfo(String infoMessage) {
+		fStatusMessage= infoMessage;
+		fSeverity= IStatus.INFO;
+	}
+	public void setOK() {
+		fStatusMessage= null;
+		fSeverity= IStatus.OK;
+	}
+	public void setWarning(String warningMessage) {
+		fStatusMessage= warningMessage;
+		fSeverity= IStatus.WARNING;
+	}
+
+	/**
+	 * Returns a string representation of the status, suitable 
+	 * for debugging purposes only.
+	 */
+	public String toString() {
+		StringBuffer buf = new StringBuffer();
+		buf.append("StatusInfo "); //$NON-NLS-1$
+		if (fSeverity == OK) {
+			buf.append("OK"); //$NON-NLS-1$
+		} else if (fSeverity == ERROR) {
+			buf.append("ERROR"); //$NON-NLS-1$
+		} else if (fSeverity == WARNING) {
+			buf.append("WARNING"); //$NON-NLS-1$
+		} else if (fSeverity == INFO) {
+			buf.append("INFO"); //$NON-NLS-1$
+		} else {
+			buf.append("severity="); //$NON-NLS-1$
+			buf.append(fSeverity);
+		}
+		buf.append(": "); //$NON-NLS-1$
+		buf.append(fStatusMessage);
+		return buf.toString();
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StatusTool.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StatusTool.java
new file mode 100644
index 0000000..0d849c9
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StatusTool.java
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.core.runtime.IStatus;
+
+import org.eclipse.jface.dialogs.DialogPage;
+
+public class StatusTool {
+
+	/**
+	 * Applies the status to the status line of a dialog page
+	 */
+	public static void applyToStatusLine(MessageLine messageLine, IStatus status) {
+		String[] messages= getErrorMessages(status);
+		messageLine.setErrorMessage(messages[0]);
+		messageLine.setMessage(messages[1]);
+	}
+	/**
+	 * Applies the status to the status line of a dialog page
+	 */
+	public static void applyToStatusLine(DialogPage page, IStatus status) {
+		String[] messages= getErrorMessages(status);
+		page.setErrorMessage(messages[0]);
+		page.setMessage(messages[1]);
+	}
+	/**
+	 * Returns error-message / warning-message for a status
+	 */
+	public static String[] getErrorMessages(IStatus status) {
+		String message= status.getMessage();
+		if (status.matches(IStatus.ERROR) && !"".equals(message)) { //$NON-NLS-1$
+			return new String[] { message, null };
+		} else if (status.matches(IStatus.WARNING | IStatus.INFO)) {
+			return new String[] { null, message };
+		} else {
+			return new String[] { null, null };
+		}
+	}
+	/**
+	 * Compare two IStatus. The more severe is returned:
+	 * An error is more severe than a warning, and a warning is more severe
+	 * than ok.
+	 */
+	public static IStatus getMoreSevere(IStatus s1, IStatus s2) {
+		if (s1.getSeverity() > s2.getSeverity()) {
+			return s1;
+		}
+		return s2;
+	}
+	/**
+	 * Finds the most severe status from a array of status
+	 * An error is more severe than a warning, and a warning is more severe
+	 * than ok.
+	 */
+	public static IStatus getMostSevere(IStatus[] status) {
+		IStatus max= null;
+		for (int i= 0; i < status.length; i++) {
+			IStatus curr= status[i];
+			if (curr.matches(IStatus.ERROR)) {
+				return curr;
+			}
+			if (max == null || curr.getSeverity() > max.getSeverity()) {
+				max= curr;
+			}
+		}
+		return max;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StringMatcher.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StringMatcher.java
new file mode 100644
index 0000000..880f3a4
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/StringMatcher.java
@@ -0,0 +1,389 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *     Markus Schorn (Wind River Systems)
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.util.Vector;
+
+public class StringMatcher {
+	protected String fPattern;
+	protected int fLength; // pattern length
+	protected boolean fIgnoreWildCards;
+	protected boolean fIgnoreCase;
+	protected boolean fHasLeadingStar;
+	protected boolean fHasTrailingStar;
+	protected String fSegments[]; //the given pattern is split into * separated segments
+
+	/* boundary value beyond which we don't need to search in the text */
+	protected int fBound= 0;
+
+	protected static final char fSingleWildCard= '\u0000';
+
+	public static class Position {
+		int start; //inclusive
+		int end; //exclusive
+		public Position(int start, int end) {
+			this.start= start;
+			this.end= end;
+		}
+		public int getStart() {
+			return start;
+		}
+		public int getEnd() {
+			return end;
+		}
+	}
+
+	/**
+	 * Find the first occurrence of the pattern between <code>start</code)(inclusive) 
+	 * and <code>end</code>(exclusive).  
+	 * @param text the String object to search in 
+	 * @param start the starting index of the search range, inclusive
+	 * @param end the ending index of the search range, exclusive
+	 * @return an <code>StringMatcher.Position</code> object that keeps the starting 
+	 * (inclusive) and ending positions (exclusive) of the first occurrence of the 
+	 * pattern in the specified range of the text; return null if not found or subtext
+	 * is empty (start==end). A pair of zeros is returned if pattern is empty string
+	 * Note that for pattern like "*abc*" with leading and trailing stars, position of "abc"
+	 * is returned. For a pattern like"*??*" in text "abcdf", (1,3) is returned
+	 */
+
+	public StringMatcher.Position find(String text, int start, int end) {
+		if (fPattern == null || text == null)
+			throw new IllegalArgumentException();
+
+		int tlen= text.length();
+		if (start < 0)
+			start= 0;
+		if (end > tlen)
+			end= tlen;
+		if (end < 0 || start >= end)
+			return null;
+		if (fLength == 0)
+			return new Position(start, start);
+		if (fIgnoreWildCards) {
+			int x= posIn(text, start, end);
+			if (x < 0)
+				return null;
+			return new Position(x, x + fLength);
+		}
+
+		int segCount= fSegments.length;
+		if (segCount == 0) //pattern contains only '*'(s)
+			return new Position(start, end);
+
+		int curPos= start;
+		int matchStart= -1;
+		for (int i= 0; i < segCount && curPos < end; ++i) {
+			String current= fSegments[i];
+			int nextMatch= regExpPosIn(text, curPos, end, current);
+			if (nextMatch < 0)
+				return null;
+			if (i == 0)
+				matchStart= nextMatch;
+			curPos= nextMatch + current.length();
+		}
+		return new Position(matchStart, curPos);
+	}
+	/**
+	 * StringMatcher constructor takes in a String object that is a simple 
+	 * pattern which may contain  *  for 0 and many characters and
+	 *  ?  for exactly one character. Also takes as parameter a boolean object
+	 * specifying if case should be ignored
+	 * @deprecated Use StringMatcher(pattern, ignoreCase, ignoreWildCards).
+	 */
+	public StringMatcher(String aPattern, boolean ignoreCase) {
+		this(aPattern, ignoreCase, false);
+	}
+	/**
+	 * StringMatcher constructor takes in a String object that is a simple 
+	 * pattern which may contain  *  for 0 and many characters and
+	 *  ?  for exactly one character.  
+	 *
+	 * Literal '*' and '?' characters must be escaped in the pattern 
+	 * e.g., "\*" means literal "*", etc.
+	 *
+	 * Escaping any other character (including the escape character itself), 
+	 * just results in that character in the pattern.
+	 * e.g., "\a" means "a" and "\\" means "\"
+	 *
+	 * If invoking the StringMatcher with string literals in Java, don't forget
+	 * escape characters are represented by "\\".
+	 *
+	 * @param aPattern the pattern to match text against
+	 * @param ignoreCase if true, case is ignored
+	 * @param ignoreWildCards if true, wild cards and their escape sequences are ignored
+	 * 		  (everything is taken literally).
+	 */
+	public StringMatcher(String aPattern, boolean ignoreCase, boolean ignoreWildCards) {
+		fIgnoreCase= ignoreCase;
+		fIgnoreWildCards= ignoreWildCards;
+		fLength= aPattern.length();
+
+		/* convert case */
+		if (fIgnoreCase) {
+			char[] chars= aPattern.toCharArray();
+			for (int i = 0; i < chars.length; i++) {
+				chars[i]= Character.toUpperCase(chars[i]);
+			}
+			fPattern= new String(chars);
+		} else {
+			fPattern= aPattern;
+		}
+
+		if (fIgnoreWildCards) {
+			parseNoWildCards();
+		} else {
+			parseWildCards();
+		}
+	}
+	/**
+	 * Given the starting (inclusive) and the ending (exclusive) poisitions in the   
+	 * <code>text</code>, determine if the given substring matches with aPattern  
+	 * @return true if the specified portion of the text matches the pattern
+	 * @param text  a String object that contains the substring to match 
+	 * @param start marks the starting position (inclusive) of the substring
+	 * @param end marks the ending index (exclusive) of the substring 
+	 */
+	public boolean match(String text, int start, int end) {
+		if (null == fPattern || null == text)
+			throw new IllegalArgumentException();
+
+		if (start > end)
+			return false;
+
+		if (fIgnoreWildCards)
+			return fPattern.regionMatches(fIgnoreCase, 0, text, start, fLength);
+		int segCount= fSegments.length;
+		if (segCount == 0) //pattern contains only '*'(s) or empty pattern
+			return true;
+		if (start == end)
+			return fLength == 0;
+		if (fLength == 0)
+			return start == end;
+
+		int tlen= text.length();
+		if (start < 0)
+			start= 0;
+		if (end > tlen)
+			end= tlen;
+
+		int tCurPos= start;
+		int bound= end - fBound;
+		if (bound < 0)
+			return false;
+		int i= 0;
+		String current= fSegments[i];
+		int segLength= current.length();
+
+		/* process first segment */
+		if (!fHasLeadingStar) {
+			if (!regExpRegionMatches(text, start, current, 0, segLength)) {
+				return false;
+			}
+			++i;
+			tCurPos= tCurPos + segLength;
+		}
+
+		/* process middle segments */
+		for (; i < segCount && tCurPos <= bound; ++i) {
+			current= fSegments[i];
+			int currentMatch;
+			int k= current.indexOf(fSingleWildCard);
+			if (k < 0) {
+				currentMatch= textPosIn(text, tCurPos, end, current);
+				if (currentMatch < 0)
+					return false;
+			} else {
+				currentMatch= regExpPosIn(text, tCurPos, end, current);
+				if (currentMatch < 0)
+					return false;
+			}
+			tCurPos= currentMatch + current.length();
+		}
+
+		/* process final segment */
+		if (!fHasTrailingStar && tCurPos != end) {
+			int clen= current.length();
+			return regExpRegionMatches(text, end - clen, current, 0, clen);
+		}
+		return i == segCount;
+	}
+	/**
+	 * match the given <code>text</code> with the pattern 
+	 * @return true if matched eitherwise false
+	 * @param text a String object 
+	 */
+	public boolean match(String text) {
+		return match(text, 0, text.length());
+	}
+	/**
+	 * This method parses the given pattern into segments seperated by wildcard '*' characters.
+	 * Since wildcards are not being used in this case, the pattern consists of a single segment.
+	 */
+	private void parseNoWildCards() {
+		fSegments= new String[1];
+		fSegments[0]= fPattern;
+		fBound= fLength;
+	}
+	/**
+	 *  This method parses the given pattern into segments seperated by wildcard '*' characters.
+	 */
+	private void parseWildCards() {
+		if (fPattern.startsWith("*")) //$NON-NLS-1$
+			fHasLeadingStar= true;
+		if (fPattern.endsWith("*")) { //$NON-NLS-1$
+			/* make sure it's not an escaped wildcard */
+			if (fLength > 1 && fPattern.charAt(fLength - 2) != '\\') {
+				fHasTrailingStar= true;
+			}
+		}
+
+		Vector<String> temp= new Vector<String>();
+
+		int pos= 0;
+		StringBuffer buf= new StringBuffer();
+		while (pos < fLength) {
+			char c= fPattern.charAt(pos++);
+			switch (c) {
+				case '\\' :
+					if (pos >= fLength) {
+						buf.append(c);
+					} else {
+						char next= fPattern.charAt(pos++);
+						/* if it's an escape sequence */
+						if (next == '*' || next == '?' || next == '\\') {
+							buf.append(next);
+						} else {
+							/* not an escape sequence, just insert literally */
+							buf.append(c);
+							buf.append(next);
+						}
+					}
+					break;
+				case '*' :
+					if (buf.length() > 0) {
+						/* new segment */
+						temp.addElement(buf.toString());
+						fBound += buf.length();
+						buf.setLength(0);
+					}
+					break;
+				case '?' :
+					/* append special character representing single match wildcard */
+					buf.append(fSingleWildCard);
+					break;
+				default :
+					buf.append(c);
+			}
+		}
+
+		/* add last buffer to segment list */
+		if (buf.length() > 0) {
+			temp.addElement(buf.toString());
+			fBound += buf.length();
+		}
+
+		fSegments= new String[temp.size()];
+		temp.copyInto(fSegments);
+	}
+	/** 
+	 * @param text a string which contains no wildcard
+	 * @param start the starting index in the text for search, inclusive
+	 * @param end the stopping point of search, exclusive
+	 * @return the starting index in the text of the pattern , or -1 if not found 
+	 */
+	protected int posIn(String text, int start, int end) { //no wild card in pattern
+		int max= end - fLength;
+
+		if (!fIgnoreCase) {
+			int i= text.indexOf(fPattern, start);
+			if (i == -1 || i > max)
+				return -1;
+			return i;
+		}
+
+		for (int i= start; i <= max; ++i) {
+			if (text.regionMatches(true, i, fPattern, 0, fLength))
+				return i;
+		}
+
+		return -1;
+	}
+	/** 
+	 * @param text a simple regular expression that may only contain '?'(s)
+	 * @param start the starting index in the text for search, inclusive
+	 * @param end the stopping point of search, exclusive
+	 * @param p a simple regular expression that may contains '?'
+	 * @return the starting index in the text of the pattern , or -1 if not found 
+	 */
+	protected int regExpPosIn(String text, int start, int end, String p) {
+		int plen= p.length();
+
+		int max= end - plen;
+		for (int i= start; i <= max; ++i) {
+			if (regExpRegionMatches(text, i, p, 0, plen))
+				return i;
+		}
+		return -1;
+	}
+
+	protected boolean regExpRegionMatches(String text, int tStart, String p, int pStart, int plen) {
+		while (plen-- > 0) {
+			char tchar= text.charAt(tStart++);
+			char pchar= p.charAt(pStart++);
+
+			/* process wild cards */
+			if (!fIgnoreWildCards) {
+				/* skip single wild cards */
+				if (pchar == fSingleWildCard) {
+					continue;
+				}
+			}
+			if (pchar == tchar)
+				continue;
+			if (fIgnoreCase) {
+				char tc= Character.toUpperCase(tchar);
+				if (tc == pchar)
+					continue;
+			}
+			return false;
+		}
+		return true;
+	}
+	/** 
+	 * @param text the string to match
+	 * @param start the starting index in the text for search, inclusive
+	 * @param end the stopping point of search, exclusive
+	 * @param p a string that has no wildcard
+	 * @return the starting index in the text of the pattern , or -1 if not found 
+	 */
+	protected int textPosIn(String text, int start, int end, String p) {
+
+		int plen= p.length();
+		int max= end - plen;
+
+		if (!fIgnoreCase) {
+			int i= text.indexOf(p, start);
+			if (i == -1 || i > max)
+				return -1;
+			return i;
+		}
+
+		for (int i= 0; i <= max; ++i) {
+			if (text.regionMatches(true, i, p, 0, plen))
+				return i;
+		}
+
+		return -1;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SuffixesRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SuffixesRule.java
new file mode 100644
index 0000000..c942842
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/SuffixesRule.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.ISuffixesRule;
+
+/**
+ * .SUFFIXES
+ * Prerequisites of .SUFFIXES shall be appended to the list of known suffixes and are
+ * used in conjunction with the inference rules.
+ *
+ */
+public class SuffixesRule extends SpecialRule implements ISuffixesRule {
+
+	public SuffixesRule(Directive parent, String[] suffixes) {
+		super(parent, new Target(MakeFileConstants.RULE_SUFFIXES), suffixes, new Command[0]);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Target.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Target.java
new file mode 100644
index 0000000..1c56cca
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Target.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import java.io.File;
+
+import org.eclipse.cdt.make.core.makefile.ITarget;
+
+public class Target implements ITarget {
+
+	String target;
+
+	public Target(String t) {
+		target = t;
+	}
+
+	public String toString() {
+		return target;
+	}
+
+	public boolean exits() {
+		return new File(target).exists();
+	}
+
+	public long lastModified() {
+		return new File(target).lastModified();
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/TargetRule.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/TargetRule.java
new file mode 100644
index 0000000..76452a6
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/TargetRule.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.ICommand;
+import org.eclipse.cdt.make.core.makefile.ITargetRule;
+
+/**
+ * Makefile : ( statement ) *
+ * statement :   rule | macro_definition | comments | empty
+ * rule :  inference_rule | target_rule
+ * inference_rule : target ':' <nl> ( <tab> command <nl> ) +
+ * target_rule : target [ ( target ) * ] ':' [ ( prerequisite ) * ] [ ';' command ] <nl> 
+                 [ ( <tab> prefix_command command ) * ]
+ * macro_definition : string '=' (string)* 
+ * comments : '#' (string) *
+ * empty : <nl>
+ * command : string <nl>
+ * target : string
+ * prefix_command : '-' | '@' | '+'
+ * internal_macro :  "$<" | "$*" | "$@" | "$?" | "$%" 
+ */
+
+public class TargetRule extends Rule implements ITargetRule {
+
+	String[] prerequisites;
+
+	public TargetRule(Directive parent, Target target) {
+		this(parent, target, new String[0], new Command[0]);
+	}
+
+	public TargetRule(Directive parent, Target target, String[] deps) {
+		this(parent, target, deps, new Command[0]);
+	}
+
+	public TargetRule(Directive parent, Target target, String[] reqs, Command[] commands) {
+		super(parent, target, commands);
+		prerequisites = reqs;
+	}
+
+	public String[] getPrerequisites() {
+		return prerequisites;
+	}
+
+	public void setDependecies(String[] reqs) {
+		prerequisites = reqs;
+	}
+
+	/**
+	 * @see java.lang.Object#toString()
+	 */
+	public String toString() {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append(getTarget().toString());
+		buffer.append(':');
+		String[] reqs = getPrerequisites();
+		for (int i = 0; i < reqs.length; i++) {
+			buffer.append(' ').append(reqs[i]);
+		}
+		buffer.append('\n');
+		ICommand[] cmds = getCommands();
+		for (int i = 0; i < cmds.length; i++) {
+			buffer.append(cmds[i].toString());
+		}
+		return buffer.toString();
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/TargetVariable.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/TargetVariable.java
new file mode 100644
index 0000000..0e393e9
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/TargetVariable.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *     Red Hat Inc. - modified for Automake usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+/**
+ *   Here is the syntax of a static pattern rule:
+ *
+ *    TARGETS ...: VARIABLE-ASSIGNMENT
+ *    TARGETS ...: override VARIABLE-ASSIGNMENT
+ */
+public class TargetVariable extends GNUVariableDef {
+
+	boolean override;
+
+	public TargetVariable(Directive parent, String target, String name, StringBuffer value, boolean override, int type) {
+		super(parent, target, name, value, type);
+		this.override = override;
+	}
+
+	public boolean isOverride() {
+		return override;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Terminal.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Terminal.java
new file mode 100644
index 0000000..17eca37
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Terminal.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.gnu.ITerminal;
+
+public abstract class Terminal extends Directive implements ITerminal {
+
+	public Terminal(Directive parent) {
+		super(parent);
+	}
+
+	public boolean isEndif() {
+		return false;
+	}
+
+	public boolean isEndef() {
+		return false;
+	}
+
+	public String toString() {
+		return "\n"; //$NON-NLS-1$
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/TwoArrayQuickSort.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/TwoArrayQuickSort.java
new file mode 100644
index 0000000..96049ba
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/TwoArrayQuickSort.java
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright (c) 2000 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.core.runtime.Assert;
+
+
+/**
+ * Quick sort to sort two arrays in parallel.
+ */
+public class TwoArrayQuickSort {
+
+	private static void internalSort(String[] keys, Object[] values, int left, int right, boolean ignoreCase) { 
+	
+		int original_left= left;
+		int original_right= right;
+		
+		String mid= keys[(left + right) / 2]; 
+		do { 
+			while (smaller(keys[left], mid, ignoreCase)) { 
+				left++; 
+			} 
+			while (smaller(mid, keys[right], ignoreCase)) { 
+				right--; 
+			} 
+			if (left <= right) { 
+				String tmp= keys[left]; 
+				keys[left]= keys[right]; 
+				keys[right]= tmp;
+				
+				Object tmp2= values[left]; 
+				values[left]= values[right]; 
+				values[right]= tmp2;
+				
+				left++; 
+				right--; 
+			} 
+		} while (left <= right);
+		
+		if (original_left < right) {
+			internalSort(keys , values, original_left, right, ignoreCase); 
+		}	
+		if (left < original_right) {
+			 internalSort(keys, values, left, original_right, ignoreCase); 
+		} 
+	}
+	private static boolean smaller(String left, String right, boolean ignoreCase) {
+		if (ignoreCase)
+			return left.compareToIgnoreCase(right) < 0;
+		return left.compareTo(right) < 0;	
+	}
+	/**
+	 * Sorts keys and values in parallel.
+	 */
+	public static void sort(String[] keys, Object[] values, boolean ignoreCase) { 
+		if (keys != null && values != null) {
+			Assert.isTrue(keys.length == values.length);
+			if (keys.length > 1)
+				internalSort(keys, values, 0, keys.length - 1, ignoreCase);	
+		} else {
+			if (keys != null || values != null)
+				Assert.isTrue(false, "Either keys or values in null"); //$NON-NLS-1$
+		}
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/UnExport.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/UnExport.java
new file mode 100644
index 0000000..d51301e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/UnExport.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.gnu.IUnExport;
+
+public class UnExport extends Directive implements IUnExport {
+
+	String variable;
+
+	public UnExport(Directive parent, String var) {
+		super(parent);
+		variable = var;
+	}
+
+	public String toString() {
+		StringBuffer sb = new StringBuffer(GNUMakefileConstants.DIRECTIVE_UNEXPORT);
+		sb.append(' ').append(variable);
+		return sb.toString();
+	}
+
+	public String getVariable() {
+		return variable;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Util.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Util.java
new file mode 100644
index 0000000..be70536
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/Util.java
@@ -0,0 +1,86 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+/**
+ * Utility methods.
+ */
+public class Util {
+
+	private Util() {
+	}
+
+	public static boolean isCommand(String line) {
+		return line.length() > 1 && line.startsWith("\t"); //$NON-NLS-1$
+	}
+
+	public static boolean isEscapedLine(String line) {
+		return (line.endsWith("\\") && !line.endsWith("\\\\")); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	public static boolean isEmptyLine(String line) {
+		return line.trim().length() == 0;
+	}
+
+	public static int indexOfComment(String line) {
+		boolean escaped = false;
+		for (int i = 0; i < line.length(); i++) {
+			if (line.charAt(i) == '#' && !escaped) {
+				return i;
+			}
+			escaped = line.charAt(i) == '\\';
+		}
+		return -1;
+	}
+
+	public static boolean isSpace(char c) {
+		return (c == ' '  || c == '\t' || c == '\r' || c == '\n');
+	}
+
+	public static int indexOf(String line, char c) {
+		return indexOf(line, new Character(c).toString());
+	}
+
+	/**
+	 * Special indexOf() method that makes sure that what we are searching
+	 * is not between parentheses and brackets like a macro $(foo) ${bar}
+	 */
+	public static int indexOf(String line, String tokens) {
+		int paren = 0;
+		int bracket = 0;
+		char prev = 0;
+		char pprev = 0;
+		for (int i = 0; i < line.length(); i++) {
+			char ch = line.charAt(i);
+			if (ch == '(' && prev == '$' && pprev != '\\') {
+				paren++;
+			} else if (ch == '{' && prev == '$'  && pprev != '\\') {
+				bracket++;
+			} else if (ch == ')' && prev != '\\') {
+				if (paren > 0) {
+					paren--;
+				}
+			} else if (ch == '}' && prev != '\\') {
+				if (bracket > 0) {
+					bracket--;
+				}
+			} else if (tokens.indexOf(ch) != -1) {
+				if (paren == 0 && bracket == 0) {
+					return i;
+				}
+			}
+			pprev = prev;
+			prev = ch;
+		}
+		return -1;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/VPath.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/VPath.java
new file mode 100644
index 0000000..7a7f8f3
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/VPath.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.gnu.IVPath;
+
+public class VPath extends Directive implements IVPath {
+
+	String pattern;
+	String[] directories;
+
+	public VPath(Directive parent, String pat, String[] dirs) {
+		super(parent);
+		pattern = pat;
+		directories = dirs;
+	}
+
+	public String toString() {
+		StringBuffer sb = new StringBuffer(GNUMakefileConstants.DIRECTIVE_VPATH);
+		if (pattern != null && pattern.length() > 0) {
+			sb.append(' ').append(pattern);
+		}
+		for (int i = 0; i < directories.length; i++) {
+			sb.append(' ').append(directories[i]);
+		}
+		return sb.toString();
+	}
+
+	public String[] getDirectories() {
+		return directories;
+	}
+
+	public String getPattern() {
+		return pattern;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/VariableDefinition.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/VariableDefinition.java
new file mode 100644
index 0000000..d23236c
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/VariableDefinition.java
@@ -0,0 +1,131 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.cdt.make.core.makefile.gnu.IVariableDefinition;
+
+/**
+ */
+public class VariableDefinition extends MacroDefinition implements IVariableDefinition  {
+
+	/**
+	 * ? is Conditional
+	 * : is Simply-expanded
+	 * + is append
+	 * 0 is recursively-expanded.
+	 */
+	final static int TYPE_RECURSIVE_EXPAND = 0;
+	final static int TYPE_SIMPLE_EXPAND = ':';
+	final static int TYPE_CONDITIONAL = '?';
+	final static int TYPE_APPEND = '+';
+	int type;
+	String varTarget;
+
+	public VariableDefinition(Directive parent, String name, StringBuffer value) {
+		this(parent, name, value, TYPE_RECURSIVE_EXPAND);
+	}
+
+	public VariableDefinition(Directive parent, String name, StringBuffer value, int type) {
+		this(parent,  "", name, value, type); //$NON-NLS-1$
+	}
+
+	public VariableDefinition(Directive parent, String target, String name, StringBuffer value, int type) {
+		super(parent, name, value);
+		varTarget = target;
+		this.type = type;
+	}
+
+	/**
+	 * @see java.lang.Object#toString()
+	 */
+	public String toString() {
+		StringBuffer sb = new StringBuffer();
+		if (isTargetSpecific()) {
+			sb.append(getTarget()).append(": "); //$NON-NLS-1$
+		}
+		if (isOverride()) {
+			sb.append(GNUMakefileConstants.VARIABLE_OVERRIDE);
+		}
+		if (isMultiLine()) {
+			sb.append(GNUMakefileConstants.VARIABLE_DEFINE);
+			sb.append(' ');
+			sb.append(getName()).append('\n');
+			sb.append(getValue()).append('\n');
+			sb.append(GNUMakefileConstants.TERMINAL_ENDEF);
+			sb.append('\n');
+		} else {
+			if (isExport()) {
+				sb.append(GNUMakefileConstants.VARIABLE_EXPORT);
+				sb.append(' ');
+			}
+			sb.append(getName());
+			if (isRecursivelyExpanded()) {
+				sb.append(" = "); //$NON-NLS-1$
+			} else if (isSimplyExpanded()) {
+				sb.append(" := "); //$NON-NLS-1$
+			} else if (isConditional()) {
+				sb.append(" ?= "); //$NON-NLS-1$
+			} else if (isAppend()) {
+				sb.append(" += "); //$NON-NLS-1$
+			}
+			sb.append(getValue()).append('\n');
+		}
+		return sb.toString();
+	}
+
+	public boolean isRecursivelyExpanded() {
+		return type == TYPE_RECURSIVE_EXPAND;
+	}
+
+	public boolean isSimplyExpanded() {
+		return type == TYPE_SIMPLE_EXPAND;
+	}
+                                                                                                                             
+	public boolean isConditional() {
+		return type == TYPE_CONDITIONAL;
+	}
+                                                                                                                             
+	public boolean isAppend() {
+		return type == TYPE_APPEND;
+	}
+
+	public boolean isTargetSpecific() {
+		String t = getTarget();
+		return t != null && t.length() > 0;
+	}
+
+	public boolean isExport() {
+		return false;
+	}
+
+	public boolean isMultiLine() {
+		return false;
+	}
+
+	/**
+	 * Variable from an `override' directive.
+	 */
+	public boolean isOverride() {
+		return false;
+	}
+
+	/**
+	 * Automatic variable -- cannot be set.
+	 */
+	public boolean isAutomatic() {
+		return false;
+	}
+
+	public String getTarget() {
+		return varTarget;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/WordPartDetector.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/WordPartDetector.java
new file mode 100644
index 0000000..4075dc1
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/WordPartDetector.java
@@ -0,0 +1,99 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextViewer;
+ 
+/**
+ * Used to scan and detect for SQL keywords  
+ */
+public class WordPartDetector {
+	String wordPart = ""; //$NON-NLS-1$
+	int offset;
+
+	/**
+	 * WordPartDetector.
+	 * @param viewer is a text viewer 
+	 * @param documentOffset into the SQL document
+	 */
+	public WordPartDetector(ITextViewer viewer, int documentOffset) {
+		this(viewer.getDocument(), documentOffset);
+	}
+
+	/**
+	 * 
+	 * @param doc
+	 * @param documentOffset
+	 */
+	public WordPartDetector(IDocument doc, int documentOffset) {
+		offset = documentOffset - 1;
+		int endOffset = documentOffset;		
+		try {
+			IRegion region = doc.getLineInformationOfOffset(documentOffset);
+			int top = region.getOffset();
+			int bottom = region.getLength() + top;
+			while (offset >= top && isMakefileLetter(doc.getChar(offset))) {
+				offset--;
+			}
+			while (endOffset < bottom && isMakefileLetter(doc.getChar(endOffset))) {
+					endOffset++;
+			} 
+			//we've been one step too far : increase the offset
+			offset++;
+			wordPart = doc.get(offset, endOffset - offset);
+		} catch (BadLocationException e) {
+			// do nothing
+		}
+	}
+
+	public static boolean inMacro(ITextViewer viewer, int offset) {
+		return inMacro(viewer.getDocument(), offset);
+	}
+	
+	public static boolean inMacro(IDocument document, int offset) {
+		boolean isMacro = false;
+		// Try to figure out if we are in a Macro.
+		try {
+			for (int index = offset - 1; index >= 0; index--) {
+				char c;
+				c = document.getChar(index);
+				if (c == '$') {
+					isMacro = true;
+					break;
+				} else if (Character.isWhitespace(c)) {
+					break;
+				}
+			}
+		} catch (BadLocationException e) {
+		}
+		return isMacro;
+	}
+
+
+	/**
+	 * @return String
+	 */
+	public String toString() {
+		return wordPart;
+	}
+	
+	public int getOffset() {
+		return offset;
+	}
+
+	boolean isMakefileLetter(char c) {
+		return Character.isLetterOrDigit(c) || c == '_' || c == '.';
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/WorkingCopyManager.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/WorkingCopyManager.java
new file mode 100644
index 0000000..7136c4d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/automake/WorkingCopyManager.java
@@ -0,0 +1,106 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.ui.IWorkingCopyManager;
+import org.eclipse.cdt.make.ui.IWorkingCopyManagerExtension;
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.ui.IEditorInput;
+
+
+/**
+ * This working copy manager works together with a given compilation unit document provider and
+ * additionally offers to "overwrite" the working copy provided by this document provider.
+ */
+public class WorkingCopyManager implements IWorkingCopyManager, IWorkingCopyManagerExtension {
+	
+	private IMakefileDocumentProvider fDocumentProvider;
+	private Map<IEditorInput, IMakefile> fMap;
+	private boolean fIsShuttingDown;
+
+	/**
+	 * Creates a new working copy manager that co-operates with the given
+	 * compilation unit document provider.
+	 * 
+	 * @param provider the provider
+	 */
+	public WorkingCopyManager(IMakefileDocumentProvider provider) {
+		Assert.isNotNull(provider);
+		fDocumentProvider= provider;
+	}
+
+	/*
+	 * @see org.eclipse.cdt.make.ui.IWorkingCopyManager#connect(org.eclipse.ui.IEditorInput)
+	 */
+	public void connect(IEditorInput input) throws CoreException {
+		fDocumentProvider.connect(input);
+	}
+	
+	/*
+	 * @see org.eclipse.cdt.make.ui.IWorkingCopyManager#disconnect(org.eclipse.ui.IEditorInput)
+	 */
+	public void disconnect(IEditorInput input) {
+		fDocumentProvider.disconnect(input);
+	}
+	
+	/*
+	 * @see org.eclipse.cdt.make.ui.IWorkingCopyManager#shutdown()
+	 */
+	public void shutdown() {
+		if (!fIsShuttingDown) {
+			fIsShuttingDown= true;
+			try {
+				if (fMap != null) {
+					fMap.clear();
+					fMap= null;
+				}
+				fDocumentProvider.shutdown();
+			} finally {
+				fIsShuttingDown= false;
+			}
+		}
+	}
+
+	/*
+	 * @see org.eclipse.cdt.make.ui.IWorkingCopyManager#getWorkingCopy(org.eclipse.ui.IEditorInput)
+	 */
+	public IMakefile getWorkingCopy(IEditorInput input) {
+		IMakefile unit= fMap == null ? null : (IMakefile) fMap.get(input);
+		return unit != null ? unit : fDocumentProvider.getWorkingCopy(input);
+	}
+	
+	/*
+	 * @see org.eclipse.cdt.make.ui.IWorkingCopyManagerExtension#setWorkingCopy(org.eclipse.ui.IEditorInput, org.eclipse.cdt.make.core.makefile.IMakefile)
+	 */
+	public void setWorkingCopy(IEditorInput input, IMakefile workingCopy) {
+		if (fDocumentProvider.getDocument(input) != null) {
+			if (fMap == null)
+				fMap= new HashMap<IEditorInput, IMakefile>();
+			fMap.put(input, workingCopy);
+		}
+	}
+	
+	/*
+	 * @see org.eclipse.linuxtools.internal.cdt.autotools.ui.editors.automake.IWorkingCopyManagerExtension#removeWorkingCopy(org.eclipse.ui.IEditorInput)
+	 */
+	public void removeWorkingCopy(IEditorInput input) {
+		fMap.remove(input);
+		if (fMap.isEmpty())
+			fMap= null;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AbstractEditorPreferencePage.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AbstractEditorPreferencePage.java
new file mode 100644
index 0000000..62c659c
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AbstractEditorPreferencePage.java
@@ -0,0 +1,328 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.jface.dialogs.IMessageProvider;
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.osgi.service.prefs.BackingStoreException;
+
+
+/**
+ * AbstraceMakeEditorPreferencePage
+ */
+public abstract class AbstractEditorPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
+	OverlayPreferenceStore fOverlayStore;
+	
+	Map<Button, String> fCheckBoxes= new HashMap<Button, String>();
+	private SelectionListener fCheckBoxListener= new SelectionListener() {
+		public void widgetDefaultSelected(SelectionEvent e) {
+		}
+		public void widgetSelected(SelectionEvent e) {
+			Button button= (Button) e.widget;
+			fOverlayStore.setValue((String) fCheckBoxes.get(button), button.getSelection());
+		}
+	};
+	
+	Map<Text, String> fTextFields= new HashMap<Text, String>();
+	private ModifyListener fTextFieldListener= new ModifyListener() {
+		public void modifyText(ModifyEvent e) {
+			Text text= (Text) e.widget;
+			fOverlayStore.setValue((String) fTextFields.get(text), text.getText());
+		}
+	};
+
+	private Map<Text, Object> fNumberFields= new HashMap<Text, Object>();
+	private ModifyListener fNumberFieldListener= new ModifyListener() {
+		public void modifyText(ModifyEvent e) {
+			numberFieldChanged((Text) e.widget);
+		}
+	};
+			
+	public AbstractEditorPreferencePage() {
+		super();
+		setPreferenceStore(AutotoolsPlugin.getDefault().getPreferenceStore());
+		fOverlayStore= createOverlayStore();
+	}
+	
+	protected abstract OverlayPreferenceStore createOverlayStore();
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
+	 */
+	public void init(IWorkbench workbench) {
+	}
+	
+	protected void initializeFields() {
+		Map<Button, String> checkBoxes= getCheckBoxes();
+		Map<Text, String> textFields= getTextFields();
+		Iterator<Button> e= checkBoxes.keySet().iterator();
+		while (e.hasNext()) {
+			Button b= (Button) e.next();
+			String key= (String) checkBoxes.get(b);
+			b.setSelection(getOverlayStore().getBoolean(key));
+		}
+		
+		Iterator<Text> e2 = textFields.keySet().iterator();
+		while (e.hasNext()) {
+			Text t= (Text) e2.next();
+			String key= (String) textFields.get(t);
+			t.setText(getOverlayStore().getString(key));
+		}		
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
+	 */
+	public boolean performOk() {
+		getOverlayStore().propagate();
+		InstanceScope scope = new InstanceScope();
+		try {
+			scope.getNode(AutotoolsPlugin.PLUGIN_ID).flush();
+		} catch (BackingStoreException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return true;
+	}
+	
+	protected OverlayPreferenceStore getOverlayStore() {
+		return fOverlayStore;
+	}
+	
+	protected OverlayPreferenceStore setOverlayStore() {
+		return fOverlayStore;
+	}
+	
+	protected Map<Button, String> getCheckBoxes() {
+		return fCheckBoxes;
+	}
+	
+	protected Map<Text, String> getTextFields() {
+		return fTextFields;
+	}
+	
+	protected Map<Text, Object> getNumberFields() {
+		return fNumberFields;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
+	 */
+	protected void performDefaults() {
+		getOverlayStore().loadDefaults();
+		initializeFields();
+		handleDefaults();
+		super.performDefaults();
+	}
+	
+	protected abstract void handleDefaults();
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.dialogs.IDialogPage#dispose()
+	 */
+	public void dispose() {
+		if (getOverlayStore() != null) {
+			getOverlayStore().stop();
+			fOverlayStore= null;
+		}
+		super.dispose();
+	}
+	
+	protected Button addCheckBox(Composite parent, String labelText, String key, int indentation) {		
+		Button checkBox= new Button(parent, SWT.CHECK);
+		checkBox.setText(labelText);
+		checkBox.setFont(parent.getFont());
+		
+		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
+		gd.horizontalIndent= indentation;
+		gd.horizontalSpan= 2;
+		checkBox.setLayoutData(gd);
+		checkBox.addSelectionListener(fCheckBoxListener);
+		
+		getCheckBoxes().put(checkBox, key);
+		
+		return checkBox;
+	}
+	
+	protected Control addTextField(Composite composite, String labelText, String key, int textLimit, int indentation, String[] errorMessages) {
+		Font font= composite.getFont();
+		
+		Label label= new Label(composite, SWT.NONE);
+		label.setText(labelText);
+		label.setFont(font);
+		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
+		gd.horizontalIndent= indentation;
+		label.setLayoutData(gd);
+		
+		Text textControl= new Text(composite, SWT.BORDER | SWT.SINGLE);
+		textControl.setFont(font);		
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
+		gd.widthHint= convertWidthInCharsToPixels(textLimit + 1);
+		textControl.setLayoutData(gd);
+		textControl.setTextLimit(textLimit);
+		getTextFields().put(textControl, key);
+		if (errorMessages != null) {
+			getNumberFields().put(textControl, errorMessages);
+			textControl.addModifyListener(fNumberFieldListener);
+		} else {
+			textControl.addModifyListener(fTextFieldListener);
+		}
+			
+		return textControl;
+	}
+	
+	void numberFieldChanged(Text textControl) {
+		String number= textControl.getText();
+		IStatus status= validatePositiveNumber(number, (String[])getNumberFields().get(textControl));
+		if (!status.matches(IStatus.ERROR)) {
+			getOverlayStore().setValue((String) getTextFields().get(textControl), number);
+		}
+		updateStatus(status);
+	}
+	
+	private IStatus validatePositiveNumber(String number, String[] errorMessages) {
+		StatusInfo status= new StatusInfo();
+		if (number.length() == 0) {
+			status.setError(errorMessages[0]);
+		} else {
+			try {
+				int value= Integer.parseInt(number);
+				if (value < 0)
+					status.setError(MessageFormat.format(errorMessages[1], new Object[]{number})); //$NON-NLS-1$
+			} catch (NumberFormatException e) {
+				status.setError(MessageFormat.format(errorMessages[1], new Object[]{number})); //$NON-NLS-1$
+			}
+		}
+		return status;
+	}
+	
+	private void updateStatus(IStatus status) {
+		if (!status.matches(IStatus.ERROR)) {
+			Set<Text> keys= getNumberFields().keySet();
+			for (Iterator<Text> iter = keys.iterator(); iter.hasNext();) {
+				Text text = (Text) iter.next();
+				IStatus s= validatePositiveNumber(text.getText(), (String[])getNumberFields().get(text));
+				status= s.getSeverity() > status.getSeverity() ? s : status;
+			}
+		}	
+		setValid(!status.matches(IStatus.ERROR));
+		applyToStatusLine(this, status);
+	}
+
+	/*
+	 * Applies the status to the status line of a dialog page.
+	 */
+	private void applyToStatusLine(DialogPage page, IStatus status) {
+		String message= status.getMessage();
+		switch (status.getSeverity()) {
+			case IStatus.OK:
+				page.setMessage(message, IMessageProvider.NONE);
+				page.setErrorMessage(null);
+				break;
+			case IStatus.WARNING:
+				page.setMessage(message, IMessageProvider.WARNING);
+				page.setErrorMessage(null);
+				break;				
+			case IStatus.INFO:
+				page.setMessage(message, IMessageProvider.INFORMATION);
+				page.setErrorMessage(null);
+				break;			
+			default:
+				if (message.length() == 0) {
+					message= null;
+				}
+				page.setMessage(null);
+				page.setErrorMessage(message);
+				break;		
+		}
+	}
+	
+	/**
+	 * Returns an array of size 2:
+	 *  - first element is of type <code>Label</code>
+	 *  - second element is of type <code>Text</code>
+	 * Use <code>getLabelControl</code> and <code>getTextControl</code> to get the 2 controls.
+	 */
+	protected Control[] addLabelledTextField(Composite composite, String label, String key, int textLimit, int indentation, String[] errorMessages) {
+		Label labelControl= new Label(composite, SWT.NONE);
+		labelControl.setText(label);
+		labelControl.setFont(composite.getFont());
+		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
+		gd.horizontalIndent= indentation;
+		labelControl.setLayoutData(gd);
+	
+		Text textControl= new Text(composite, SWT.BORDER | SWT.SINGLE);		
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
+		gd.widthHint= convertWidthInCharsToPixels(textLimit + 1);
+		textControl.setLayoutData(gd);
+		textControl.setTextLimit(textLimit);
+		textControl.setFont(composite.getFont());
+		fTextFields.put(textControl, key);
+		if (errorMessages != null) {
+			fNumberFields.put(textControl, errorMessages);
+			textControl.addModifyListener(fNumberFieldListener);
+		} else {
+			textControl.addModifyListener(fTextFieldListener);
+		}
+		
+		return new Control[]{labelControl, textControl};
+	}
+	
+	protected String loadPreviewContentFromFile(String filename) {
+		String line;
+		String separator= System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
+		StringBuffer buffer= new StringBuffer(512);
+		BufferedReader reader= null;
+		try {
+			reader= new BufferedReader(new InputStreamReader(getClass().getResourceAsStream(filename)));
+			while ((line= reader.readLine()) != null) {
+				buffer.append(line);
+				buffer.append(separator);
+			}
+		} catch (IOException io) {
+			AutotoolsUIPlugin.log(io);
+		} finally {
+			if (reader != null) {
+				try { reader.close(); } catch (IOException e) {}
+			}
+		}
+		return buffer.toString();
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutoconfEditorPreferencePage.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutoconfEditorPreferencePage.java
new file mode 100644
index 0000000..487537b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutoconfEditorPreferencePage.java
@@ -0,0 +1,591 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ * Red Hat Inc. - modification to use with Autoconf editor
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.cdt.make.ui.IMakeHelpContextIds;
+import org.eclipse.cdt.ui.PreferenceConstants;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.jface.viewers.IColorProvider;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.TabFolder;
+import org.eclipse.swt.widgets.TabItem;
+import org.eclipse.ui.model.WorkbenchViewerComparator;
+
+
+
+/**
+ * MakeEditorPreferencePage
+ * The page for setting the editor options.
+ */
+public class AutoconfEditorPreferencePage extends AbstractEditorPreferencePage {
+
+	private static String[] fACVersions = {"2.13", "2.59", "2.61"};
+	public static final String LATEST_AC_VERSION = fACVersions[fACVersions.length - 1];
+	
+	private static String[] fAMVersions = {"1.4-p6", "1.9.5", "1.9.6"};
+	public static final String LATEST_AM_VERSION = fAMVersions[fAMVersions.length - 1];
+	
+	/** The keys of the overlay store. */
+	private String[][] fSyntaxColorListModel;
+
+	private TableViewer fHighlightingColorListViewer;
+	private final List<HighlightingColorListItem> fHighlightingColorList= new ArrayList<HighlightingColorListItem>(5);
+
+	ColorEditor fAppearanceColorEditor;
+	Button fAppearanceColorDefault;
+	ColorEditor fSyntaxForegroundColorEditor;
+	ColorEditor fBackgroundColorEditor;
+	Button fBoldCheckBox;
+	Button fItalicCheckBox;
+	
+	// folding
+	protected Button fFoldingCheckbox;
+	
+	// version
+	protected Combo fACVersionCombo;
+	protected Combo fAMVersionCombo;
+	
+	/**
+	 * Item in the highlighting color list.
+	 * 
+	 * @since 3.0
+	 */
+	private class HighlightingColorListItem {
+		/** Display name */
+		private String fDisplayName;
+		/** Color preference key */
+		private String fColorKey;
+		/** Bold preference key */
+		private String fBoldKey;
+		/** Italic preference key */
+		private String fItalicKey;
+		/** Item color */
+		private Color fItemColor;
+		
+		/**
+		 * Initialize the item with the given values.
+		 * 
+		 * @param displayName the display name
+		 * @param colorKey the color preference key
+		 * @param boldKey the bold preference key
+		 * @param italicKey the italic preference key
+		 * @param itemColor the item color
+		 */
+		public HighlightingColorListItem(String displayName, String colorKey, String boldKey, String italicKey, Color itemColor) {
+			fDisplayName= displayName;
+			fColorKey= colorKey;
+			fBoldKey= boldKey;
+			fItalicKey= italicKey;
+			fItemColor= itemColor;
+		}
+		
+		/**
+		 * @return the bold preference key
+		 */
+		public String getBoldKey() {
+			return fBoldKey;
+		}
+		
+		/**
+		 * @return the bold preference key
+		 */
+		public String getItalicKey() {
+			return fItalicKey;
+		}
+		
+		/**
+		 * @return the color preference key
+		 */
+		public String getColorKey() {
+			return fColorKey;
+		}
+		
+		/**
+		 * @return the display name
+		 */
+		public String getDisplayName() {
+			return fDisplayName;
+		}
+		
+		/**
+		 * @return the item color
+		 */
+		public Color getItemColor() {
+			return fItemColor;
+		}
+	}
+
+	/**
+	 * Color list label provider.
+	 * 
+	 * @since 3.0
+	 */
+	private class ColorListLabelProvider extends LabelProvider implements IColorProvider {
+
+		/*
+		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
+		 */
+		public String getText(Object element) {
+			return ((HighlightingColorListItem)element).getDisplayName();
+		}
+		
+		/*
+		 * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
+		 */
+		public Color getForeground(Object element) {
+			return ((HighlightingColorListItem)element).getItemColor();
+		}
+
+		/*
+		 * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
+		 */
+		public Color getBackground(Object element) {
+			return null;
+		}
+	}
+	
+	/**
+	 * Color list content provider.
+	 * 
+	 * @since 3.0
+	 */
+	private class ColorListContentProvider implements IStructuredContentProvider {
+
+		/*
+		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
+		 */
+		@SuppressWarnings("unchecked")
+		public Object[] getElements(Object inputElement) {
+			return ((List<Object>)inputElement).toArray();
+		}
+
+		/*
+		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
+		 */
+		public void dispose() {
+		}
+
+		/*
+		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+		 */
+		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		}
+	}
+	
+
+
+	/**
+	 * 
+	 */
+	public AutoconfEditorPreferencePage() {
+		super();
+	}
+
+	protected OverlayPreferenceStore createOverlayStore() {
+		fSyntaxColorListModel= new String[][] {
+				{AutotoolsPreferencesMessages.getString("AutoconfEditorPreferencePage.autoconf_editor_comment"), ColorManager.AUTOCONF_COMMENT_COLOR, null}, //$NON-NLS-1$
+				{AutotoolsPreferencesMessages.getString("AutoconfEditorPreferencePage.autoconf_editor_acmacro"), ColorManager.AUTOCONF_ACMACRO_COLOR, null}, //$NON-NLS-1$
+				{AutotoolsPreferencesMessages.getString("AutoconfEditorPreferencePage.autoconf_editor_ammacro"), ColorManager.AUTOCONF_AMMACRO_COLOR, null}, //$NON-NLS-1$
+				{AutotoolsPreferencesMessages.getString("AutoconfEditorPreferencePage.autoconf_editor_code_seq"), ColorManager.AUTOCONF_CODESEQ_COLOR, null},  //$NON-NLS-1$
+				{AutotoolsPreferencesMessages.getString("AutoconfEditorPreferencePage.autoconf_editor_keyword"), ColorManager.AUTOCONF_KEYWORD_COLOR, null},  //$NON-NLS-1$
+				{AutotoolsPreferencesMessages.getString("AutoconfEditorPreferencePage.autoconf_editor_var_ref"), ColorManager.AUTOCONF_VAR_REF_COLOR, null},  //$NON-NLS-1$
+				{AutotoolsPreferencesMessages.getString("AutoconfEditorPreferencePage.autoconf_editor_var_set"), ColorManager.AUTOCONF_VAR_SET_COLOR, null},  //$NON-NLS-1$
+				{AutotoolsPreferencesMessages.getString("AutoconfEditorPreferencePage.autoconf_editor_default"), ColorManager.AUTOCONF_DEFAULT_COLOR, null},  //$NON-NLS-1$
+			};
+		ArrayList<OverlayPreferenceStore.OverlayKey> overlayKeys= new ArrayList<OverlayPreferenceStore.OverlayKey>();
+
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_ENABLED));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_CONDITIONAL));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_MACRODEF));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_RULE));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION));
+		
+		for (int i= 0; i < fSyntaxColorListModel.length; i++) {
+			String colorKey= fSyntaxColorListModel[i][1];
+			addTextKeyToCover(overlayKeys, colorKey);
+		}
+		
+		OverlayPreferenceStore.OverlayKey[] keys= new OverlayPreferenceStore.OverlayKey[overlayKeys.size()];
+		overlayKeys.toArray(keys);
+		return new OverlayPreferenceStore(getPreferenceStore(), keys);
+	}
+
+	private void addTextKeyToCover(ArrayList<OverlayPreferenceStore.OverlayKey> overlayKeys, String mainKey) {
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, mainKey));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, mainKey + AutotoolsEditorPreferenceConstants.EDITOR_BOLD_SUFFIX));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, mainKey + AutotoolsEditorPreferenceConstants.EDITOR_ITALIC_SUFFIX));
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
+	 */
+	protected Control createContents(Composite parent) {
+		AutotoolsUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(getControl(), IMakeHelpContextIds.MAKE_EDITOR_PREFERENCE_PAGE);
+		getOverlayStore().load();
+		getOverlayStore().start();
+		
+		TabFolder folder= new TabFolder(parent, SWT.NONE);
+		folder.setLayout(new TabFolderLayout());	
+		folder.setLayoutData(new GridData(GridData.FILL_BOTH));
+		
+		TabItem item= new TabItem(folder, SWT.NONE);
+		item.setText(AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.syntax")); //$NON-NLS-1$
+		item.setControl(createSyntaxPage(folder));
+		
+		item= new TabItem(folder, SWT.NONE);
+		item.setText(AutotoolsPreferencesMessages.getString("AutoconfEditorPreferencePage.folding")); //$NON-NLS-1$
+		item.setControl(createFoldingTabContent(folder));
+					
+		// Allow end-user to select which version of autoconf to use for hover help
+		// and syntax checking of macros.
+		item= new TabItem(folder, SWT.NONE);
+		item.setText(AutotoolsPreferencesMessages.getString("AutoconfEditorPreferencePage.version")); //$NON-NLS-1$
+		item.setControl(createVersionTabContent(folder));
+					
+		initialize();
+		
+		applyDialogFont(folder);
+		return folder;
+	}
+
+	private void initialize() {
+		
+		initializeFields();
+		
+		for (int i= 0, n= fSyntaxColorListModel.length; i < n; i++) {
+			fHighlightingColorList.add(
+				new HighlightingColorListItem (fSyntaxColorListModel[i][0], fSyntaxColorListModel[i][1],
+						fSyntaxColorListModel[i][1] + AutotoolsEditorPreferenceConstants.EDITOR_BOLD_SUFFIX, 
+						fSyntaxColorListModel[i][1] + AutotoolsEditorPreferenceConstants.EDITOR_ITALIC_SUFFIX, null));
+		}
+		fHighlightingColorListViewer.setInput(fHighlightingColorList);
+		fHighlightingColorListViewer.setSelection(new StructuredSelection(fHighlightingColorListViewer.getElementAt(0)));
+
+		for (int i=0, n= fACVersions.length; i < n; i++) {
+			fACVersionCombo.setItem(i, fACVersions[i]);
+		}
+		
+		initializeFolding();
+		initializeACVersion();
+		initializeAMVersion();
+	}
+
+	void initializeFolding() {
+		boolean enabled= getOverlayStore().getBoolean(PreferenceConstants.EDITOR_FOLDING_ENABLED);
+		fFoldingCheckbox.setSelection(enabled);		
+	}
+	
+	void initializeACVersion() {
+		// FIXME: What do we do here?  There is no PreferenceConstants value for this.
+		// Perhaps we should be using our own overlay store.
+		String version = getOverlayStore().getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION);
+		String[] items = fACVersionCombo.getItems();
+		// Try and find which list item matches the current preference stored and
+		// select it in the list.
+		int i;
+		for (i = 0; i < items.length; ++i) {
+			if (items[i].equals(version))
+				break;
+		}
+		if (i >= items.length)
+			i = items.length - 1;
+		fACVersionCombo.select(i);
+	}
+
+	void initializeAMVersion() {
+		// FIXME: What do we do here?  There is no PreferenceConstants value for this.
+		// Perhaps we should be using our own overlay store.
+		String version = getOverlayStore().getString(AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION);
+		String[] items = fAMVersionCombo.getItems();
+		// Try and find which list item matches the current preference stored and
+		// select it in the list.
+		int i;
+		for (i = 0; i < items.length; ++i) {
+			if (items[i].equals(version))
+				break;
+		}
+		if (i >= items.length)
+			i = items.length - 1;
+		fAMVersionCombo.select(i);
+	}
+
+	void initializeDefaultFolding() {
+		boolean enabled= getOverlayStore().getDefaultBoolean(PreferenceConstants.EDITOR_FOLDING_ENABLED);
+		fFoldingCheckbox.setSelection(enabled);		
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AbstractAutomakeEditorPreferencePage#handleDefaults()
+	 */
+	protected void handleDefaults() {
+		handleSyntaxColorListSelection();
+		initializeDefaultFolding();
+	}
+	
+	private Control createSyntaxPage(Composite parent) {
+		
+		Composite colorComposite= new Composite(parent, SWT.NONE);
+		colorComposite.setLayout(new GridLayout());
+
+		Label label= new Label(colorComposite, SWT.LEFT);
+		label.setText(AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.Foreground")); //$NON-NLS-1$
+		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+		Composite editorComposite= new Composite(colorComposite, SWT.NONE);
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 2;
+		layout.marginHeight= 0;
+		layout.marginWidth= 0;
+		editorComposite.setLayout(layout);
+		GridData gd= new GridData(GridData.FILL_BOTH);
+		editorComposite.setLayoutData(gd);		
+
+		fHighlightingColorListViewer= new TableViewer(editorComposite, SWT.SINGLE | SWT.V_SCROLL | SWT.BORDER | SWT.FULL_SELECTION);
+		fHighlightingColorListViewer.setLabelProvider(new ColorListLabelProvider());
+		fHighlightingColorListViewer.setContentProvider(new ColorListContentProvider());
+		fHighlightingColorListViewer.setComparator(new WorkbenchViewerComparator());
+		gd= new GridData(GridData.FILL_BOTH);
+		gd.heightHint= convertHeightInCharsToPixels(5);
+		fHighlightingColorListViewer.getControl().setLayoutData(gd);
+						
+		Composite stylesComposite= new Composite(editorComposite, SWT.NONE);
+		layout= new GridLayout();
+		layout.marginHeight= 0;
+		layout.marginWidth= 0;
+		layout.numColumns= 2;
+		stylesComposite.setLayout(layout);
+		stylesComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
+		
+		label= new Label(stylesComposite, SWT.LEFT);
+		label.setText(AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.color")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label.setLayoutData(gd);
+
+		fSyntaxForegroundColorEditor= new ColorEditor(stylesComposite);
+		Button foregroundColorButton= fSyntaxForegroundColorEditor.getButton();
+		gd= new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalAlignment= GridData.BEGINNING;
+		foregroundColorButton.setLayoutData(gd);
+		
+		fBoldCheckBox= new Button(stylesComposite, SWT.CHECK);
+		fBoldCheckBox.setText(AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.bold")); //$NON-NLS-1$
+		gd= new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalAlignment= GridData.BEGINNING;
+		gd.horizontalSpan= 2;
+		fBoldCheckBox.setLayoutData(gd);
+		
+		fItalicCheckBox= new Button(stylesComposite, SWT.CHECK);
+		fItalicCheckBox.setText(AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.italic")); //$NON-NLS-1$
+		gd= new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalAlignment= GridData.BEGINNING;
+		gd.horizontalSpan= 2;
+		fItalicCheckBox.setLayoutData(gd);
+
+		fHighlightingColorListViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+			public void selectionChanged(SelectionChangedEvent event) {
+				handleSyntaxColorListSelection();
+			}
+		});
+
+		foregroundColorButton.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// do nothing
+			}
+			public void widgetSelected(SelectionEvent e) {
+				HighlightingColorListItem item= getHighlightingColorListItem();
+				PreferenceConverter.setValue(getOverlayStore(), item.getColorKey(), fSyntaxForegroundColorEditor.getColorValue());
+			}
+		});
+
+		fBoldCheckBox.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// do nothing
+			}
+			public void widgetSelected(SelectionEvent e) {
+				HighlightingColorListItem item= getHighlightingColorListItem();
+				getOverlayStore().setValue(item.getBoldKey(), fBoldCheckBox.getSelection());
+			}
+		});
+				
+		fItalicCheckBox.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// do nothing
+			}
+			public void widgetSelected(SelectionEvent e) {
+				HighlightingColorListItem item= getHighlightingColorListItem();
+				getOverlayStore().setValue(item.getItalicKey(), fItalicCheckBox.getSelection());
+			}
+		});
+				
+		return colorComposite;
+	}
+	
+
+	private Composite createFoldingTabContent(TabFolder folder) {
+		Composite composite= new Composite(folder, SWT.NULL);
+		// assume parent page uses griddata
+		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_FILL);
+		composite.setLayoutData(gd);
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 2;
+		//PixelConverter pc= new PixelConverter(composite);
+		//layout.verticalSpacing= pc.convertHeightInCharsToPixels(1) / 2;
+		composite.setLayout(layout);
+		
+		
+		/* check box for new editors */
+		fFoldingCheckbox= new Button(composite, SWT.CHECK);
+		fFoldingCheckbox.setText(AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.foldingenable")); //$NON-NLS-1$
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+		fFoldingCheckbox.setLayoutData(gd);
+		fFoldingCheckbox.addSelectionListener(new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				boolean enabled= fFoldingCheckbox.getSelection(); 
+				getOverlayStore().setValue(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_ENABLED, enabled);
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+		});
+		
+		return composite;
+	}
+
+	private Composite createVersionTabContent(TabFolder folder) {
+		Composite composite= new Composite(folder, SWT.NULL);
+		// assume parent page uses griddata
+		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_FILL);
+		composite.setLayoutData(gd);
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 2;
+		//PixelConverter pc= new PixelConverter(composite);
+		//layout.verticalSpacing= pc.convertHeightInCharsToPixels(1) / 2;
+		composite.setLayout(layout);
+		
+		
+		/* check box for new editors */
+		fACVersionCombo= new Combo(composite, SWT.CHECK | SWT.DROP_DOWN | SWT.READ_ONLY);
+		fACVersionCombo.setItems(fACVersions);
+		fACVersionCombo.select(fACVersions.length - 1);
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+		fACVersionCombo.setLayoutData(gd);
+		fACVersionCombo.addSelectionListener(new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				int index = fACVersionCombo.getSelectionIndex(); 
+				getOverlayStore().setValue(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION, fACVersionCombo.getItem(index));
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+		});
+		
+		Label label= new Label(composite, SWT.LEFT);
+		label.setText(AutotoolsPreferencesMessages.getString("AutoconfEditorPreferencePage.autoconfVersion")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label.setLayoutData(gd);
+		
+		/* check box for new editors */
+		fAMVersionCombo= new Combo(composite, SWT.CHECK | SWT.DROP_DOWN | SWT.READ_ONLY);
+		fAMVersionCombo.setItems(fAMVersions);
+		fAMVersionCombo.select(fAMVersions.length - 1);
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+		fAMVersionCombo.setLayoutData(gd);
+		fAMVersionCombo.addSelectionListener(new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				int index = fAMVersionCombo.getSelectionIndex(); 
+				getOverlayStore().setValue(AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION, fAMVersionCombo.getItem(index));
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+		});
+		
+		Label label2= new Label(composite, SWT.LEFT);
+		label2.setText(AutotoolsPreferencesMessages.getString("AutoconfEditorPreferencePage.automakeVersion")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label2.setLayoutData(gd);
+
+		return composite;
+	}
+
+	void handleSyntaxColorListSelection() {
+		HighlightingColorListItem item= getHighlightingColorListItem();
+		RGB rgb= PreferenceConverter.getColor(getOverlayStore(), item.getColorKey());
+		fSyntaxForegroundColorEditor.setColorValue(rgb);		
+		fBoldCheckBox.setSelection(getOverlayStore().getBoolean(item.getBoldKey()));
+		fItalicCheckBox.setSelection(getOverlayStore().getBoolean(item.getItalicKey()));
+	}
+	
+	/**
+	 * Returns the current highlighting color list item.
+	 * 
+	 * @return the current highlighting color list item
+	 * @since 3.0
+	 */
+	HighlightingColorListItem getHighlightingColorListItem() {
+		IStructuredSelection selection= (IStructuredSelection) fHighlightingColorListViewer.getSelection();
+		return (HighlightingColorListItem) selection.getFirstElement();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
+	 */
+	public boolean performOk() {
+		return super.performOk();
+	}
+
+	/**
+	 * @param preferenceStore
+	 */
+	public static void initDefaults(IPreferenceStore prefs) {		
+		// Makefile Editor color preferences
+		PreferenceConverter.setDefault(prefs, ColorManager.AUTOCONF_COMMENT_COLOR, ColorManager.AUTOCONF_COMMENT_RGB);
+		PreferenceConverter.setDefault(prefs, ColorManager.AUTOCONF_DEFAULT_COLOR, ColorManager.AUTOCONF_DEFAULT_RGB);
+		PreferenceConverter.setDefault(prefs, ColorManager.AUTOCONF_KEYWORD_COLOR, ColorManager.AUTOCONF_KEYWORD_RGB);
+		PreferenceConverter.setDefault(prefs, ColorManager.AUTOCONF_VAR_REF_COLOR, ColorManager.AUTOCONF_VAR_REF_RGB);
+		PreferenceConverter.setDefault(prefs, ColorManager.AUTOCONF_VAR_SET_COLOR, ColorManager.AUTOCONF_VAR_SET_RGB);
+		PreferenceConverter.setDefault(prefs, ColorManager.AUTOCONF_ACMACRO_COLOR, ColorManager.AUTOCONF_ACMACRO_RGB);
+		PreferenceConverter.setDefault(prefs, ColorManager.AUTOCONF_AMMACRO_COLOR, ColorManager.AUTOCONF_AMMACRO_RGB);
+		PreferenceConverter.setDefault(prefs, ColorManager.AUTOCONF_CODESEQ_COLOR, ColorManager.AUTOCONF_CODESEQ_RGB);
+		prefs.setDefault(ColorManager.AUTOCONF_CODESEQ_COLOR + AutotoolsEditorPreferenceConstants.EDITOR_ITALIC_SUFFIX, true);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutomakeEditorPreferencePage.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutomakeEditorPreferencePage.java
new file mode 100644
index 0000000..3ef71c6
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutomakeEditorPreferencePage.java
@@ -0,0 +1,468 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ * Red Hat Inc. - modification to use with Automake editor
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.cdt.make.ui.IMakeHelpContextIds;
+import org.eclipse.cdt.ui.PreferenceConstants;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.jface.viewers.IColorProvider;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.TabFolder;
+import org.eclipse.swt.widgets.TabItem;
+import org.eclipse.ui.model.WorkbenchViewerComparator;
+
+
+
+/**
+ * MakeEditorPreferencePage
+ * The page for setting the editor options.
+ */
+public class AutomakeEditorPreferencePage extends AbstractEditorPreferencePage {
+
+	/** The keys of the overlay store. */
+	private String[][] fSyntaxColorListModel;
+
+	private TableViewer fHighlightingColorListViewer;
+	private final List<HighlightingColorListItem> fHighlightingColorList= new ArrayList<HighlightingColorListItem>(5);
+
+	ColorEditor fAppearanceColorEditor;
+	Button fAppearanceColorDefault;
+	ColorEditor fSyntaxForegroundColorEditor;
+	ColorEditor fBackgroundColorEditor;
+	Button fBoldCheckBox;
+	Button fItalicCheckBox;
+	
+	// folding
+	protected Button fFoldingCheckbox;
+	
+	/**
+	 * Item in the highlighting color list.
+	 * 
+	 * @since 3.0
+	 */
+	private class HighlightingColorListItem {
+		/** Display name */
+		private String fDisplayName;
+		/** Color preference key */
+		private String fColorKey;
+		/** Bold preference key */
+		private String fBoldKey;
+		/** Italic preference key */
+		private String fItalicKey;
+		/** Item color */
+		private Color fItemColor;
+		
+		/**
+		 * Initialize the item with the given values.
+		 * 
+		 * @param displayName the display name
+		 * @param colorKey the color preference key
+		 * @param boldKey the bold preference key
+		 * @param italicKey the italic preference key
+		 * @param itemColor the item color
+		 */
+		public HighlightingColorListItem(String displayName, String colorKey, String boldKey, String italicKey, Color itemColor) {
+			fDisplayName= displayName;
+			fColorKey= colorKey;
+			fBoldKey= boldKey;
+			fItalicKey= italicKey;
+			fItemColor= itemColor;
+		}
+		
+		/**
+		 * @return the bold preference key
+		 */
+		public String getBoldKey() {
+			return fBoldKey;
+		}
+		
+		/**
+		 * @return the bold preference key
+		 */
+		public String getItalicKey() {
+			return fItalicKey;
+		}
+		
+		/**
+		 * @return the color preference key
+		 */
+		public String getColorKey() {
+			return fColorKey;
+		}
+		
+		/**
+		 * @return the display name
+		 */
+		public String getDisplayName() {
+			return fDisplayName;
+		}
+		
+		/**
+		 * @return the item color
+		 */
+		public Color getItemColor() {
+			return fItemColor;
+		}
+	}
+
+	/**
+	 * Color list label provider.
+	 * 
+	 * @since 3.0
+	 */
+	private class ColorListLabelProvider extends LabelProvider implements IColorProvider {
+
+		/*
+		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
+		 */
+		public String getText(Object element) {
+			return ((HighlightingColorListItem)element).getDisplayName();
+		}
+		
+		/*
+		 * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
+		 */
+		public Color getForeground(Object element) {
+			return ((HighlightingColorListItem)element).getItemColor();
+		}
+
+		/*
+		 * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
+		 */
+		public Color getBackground(Object element) {
+			return null;
+		}
+	}
+	
+	/**
+	 * Color list content provider.
+	 * 
+	 * @since 3.0
+	 */
+	private class ColorListContentProvider implements IStructuredContentProvider {
+
+		/*
+		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
+		 */
+		@SuppressWarnings("unchecked")
+		public Object[] getElements(Object inputElement) {
+			return ((List<Object>)inputElement).toArray();
+		}
+
+		/*
+		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
+		 */
+		public void dispose() {
+		}
+
+		/*
+		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+		 */
+		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		}
+	}
+	
+
+
+	/**
+	 * 
+	 */
+	public AutomakeEditorPreferencePage() {
+		super();
+	}
+
+	protected OverlayPreferenceStore createOverlayStore() {
+		fSyntaxColorListModel= new String[][] {
+				{AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.makefile_editor_comment"), ColorManager.MAKE_COMMENT_COLOR, null}, //$NON-NLS-1$
+				{AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.makefile_editor_macro_ref"), ColorManager.MAKE_MACRO_REF_COLOR, null}, //$NON-NLS-1$
+				{AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.makefile_editor_macro_def"), ColorManager.MAKE_MACRO_DEF_COLOR, null}, //$NON-NLS-1$
+				{AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.makefile_editor_function"), ColorManager.MAKE_FUNCTION_COLOR, null},  //$NON-NLS-1$
+				{AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.makefile_editor_keyword"),  ColorManager.MAKE_KEYWORD_COLOR, null},  //$NON-NLS-1$
+				{AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.makefile_editor_default"),  ColorManager.MAKE_DEFAULT_COLOR, null},  //$NON-NLS-1$
+			};
+		ArrayList<OverlayPreferenceStore.OverlayKey> overlayKeys= new ArrayList<OverlayPreferenceStore.OverlayKey>();
+
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_ENABLED));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_CONDITIONAL));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_MACRODEF));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_RULE));
+		
+		for (int i= 0; i < fSyntaxColorListModel.length; i++) {
+			String colorKey= fSyntaxColorListModel[i][1];
+			addTextKeyToCover(overlayKeys, colorKey);
+		}
+		
+		OverlayPreferenceStore.OverlayKey[] keys= new OverlayPreferenceStore.OverlayKey[overlayKeys.size()];
+		overlayKeys.toArray(keys);
+		return new OverlayPreferenceStore(getPreferenceStore(), keys);
+	}
+
+	private void addTextKeyToCover(ArrayList<OverlayPreferenceStore.OverlayKey> overlayKeys, String mainKey) {
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, mainKey));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, mainKey + AutotoolsEditorPreferenceConstants.EDITOR_BOLD_SUFFIX));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, mainKey + AutotoolsEditorPreferenceConstants.EDITOR_ITALIC_SUFFIX));
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
+	 */
+	protected Control createContents(Composite parent) {
+		AutotoolsUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(getControl(), IMakeHelpContextIds.MAKE_EDITOR_PREFERENCE_PAGE);
+		getOverlayStore().load();
+		getOverlayStore().start();
+		
+		TabFolder folder= new TabFolder(parent, SWT.NONE);
+		folder.setLayout(new TabFolderLayout());	
+		folder.setLayoutData(new GridData(GridData.FILL_BOTH));
+		
+		TabItem item= new TabItem(folder, SWT.NONE);
+		item.setText(AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.syntax")); //$NON-NLS-1$
+		item.setControl(createSyntaxPage(folder));
+		
+		item= new TabItem(folder, SWT.NONE);
+		item.setText(AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.folding")); //$NON-NLS-1$
+		item.setControl(createFoldingTabContent(folder));
+					
+		initialize();
+		
+		applyDialogFont(folder);
+		return folder;
+	}
+
+	private void initialize() {
+		
+		initializeFields();
+		
+		for (int i= 0, n= fSyntaxColorListModel.length; i < n; i++) {
+			fHighlightingColorList.add(
+				new HighlightingColorListItem (fSyntaxColorListModel[i][0], fSyntaxColorListModel[i][1],
+						fSyntaxColorListModel[i][1] + AutotoolsEditorPreferenceConstants.EDITOR_BOLD_SUFFIX, 
+						fSyntaxColorListModel[i][1] + AutotoolsEditorPreferenceConstants.EDITOR_ITALIC_SUFFIX, null));
+		}
+		fHighlightingColorListViewer.setInput(fHighlightingColorList);
+		fHighlightingColorListViewer.setSelection(new StructuredSelection(fHighlightingColorListViewer.getElementAt(0)));
+
+		initializeFolding();
+	}
+
+	void initializeFolding() {
+		boolean enabled= getOverlayStore().getBoolean(PreferenceConstants.EDITOR_FOLDING_ENABLED);
+		fFoldingCheckbox.setSelection(enabled);		
+	}
+
+	void initializeDefaultFolding() {
+		boolean enabled= getOverlayStore().getDefaultBoolean(PreferenceConstants.EDITOR_FOLDING_ENABLED);
+		fFoldingCheckbox.setSelection(enabled);		
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AbstractAutomakeEditorPreferencePage#handleDefaults()
+	 */
+	protected void handleDefaults() {
+		handleSyntaxColorListSelection();
+		initializeDefaultFolding();
+	}
+	
+	private Control createSyntaxPage(Composite parent) {
+		
+		Composite colorComposite= new Composite(parent, SWT.NONE);
+		colorComposite.setLayout(new GridLayout());
+
+		Label label= new Label(colorComposite, SWT.LEFT);
+		label.setText(AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.Foreground")); //$NON-NLS-1$
+		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+		Composite editorComposite= new Composite(colorComposite, SWT.NONE);
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 2;
+		layout.marginHeight= 0;
+		layout.marginWidth= 0;
+		editorComposite.setLayout(layout);
+		GridData gd= new GridData(GridData.FILL_BOTH);
+		editorComposite.setLayoutData(gd);		
+
+		fHighlightingColorListViewer= new TableViewer(editorComposite, SWT.SINGLE | SWT.V_SCROLL | SWT.BORDER | SWT.FULL_SELECTION);
+		fHighlightingColorListViewer.setLabelProvider(new ColorListLabelProvider());
+		fHighlightingColorListViewer.setContentProvider(new ColorListContentProvider());
+		fHighlightingColorListViewer.setComparator(new WorkbenchViewerComparator());
+		gd= new GridData(GridData.FILL_BOTH);
+		gd.heightHint= convertHeightInCharsToPixels(5);
+		fHighlightingColorListViewer.getControl().setLayoutData(gd);
+						
+		Composite stylesComposite= new Composite(editorComposite, SWT.NONE);
+		layout= new GridLayout();
+		layout.marginHeight= 0;
+		layout.marginWidth= 0;
+		layout.numColumns= 2;
+		stylesComposite.setLayout(layout);
+		stylesComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
+		
+		label= new Label(stylesComposite, SWT.LEFT);
+		label.setText(AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.color")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label.setLayoutData(gd);
+
+		fSyntaxForegroundColorEditor= new ColorEditor(stylesComposite);
+		Button foregroundColorButton= fSyntaxForegroundColorEditor.getButton();
+		gd= new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalAlignment= GridData.BEGINNING;
+		foregroundColorButton.setLayoutData(gd);
+		
+		fBoldCheckBox= new Button(stylesComposite, SWT.CHECK);
+		fBoldCheckBox.setText(AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.bold")); //$NON-NLS-1$
+		gd= new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalAlignment= GridData.BEGINNING;
+		gd.horizontalSpan= 2;
+		fBoldCheckBox.setLayoutData(gd);
+		
+		fItalicCheckBox= new Button(stylesComposite, SWT.CHECK);
+		fItalicCheckBox.setText(AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.italic")); //$NON-NLS-1$
+		gd= new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalAlignment= GridData.BEGINNING;
+		gd.horizontalSpan= 2;
+		fItalicCheckBox.setLayoutData(gd);
+
+		fHighlightingColorListViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+			public void selectionChanged(SelectionChangedEvent event) {
+				handleSyntaxColorListSelection();
+			}
+		});
+
+		foregroundColorButton.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// do nothing
+			}
+			public void widgetSelected(SelectionEvent e) {
+				HighlightingColorListItem item= getHighlightingColorListItem();
+				PreferenceConverter.setValue(getOverlayStore(), item.getColorKey(), fSyntaxForegroundColorEditor.getColorValue());
+			}
+		});
+
+		fBoldCheckBox.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// do nothing
+			}
+			public void widgetSelected(SelectionEvent e) {
+				HighlightingColorListItem item= getHighlightingColorListItem();
+				getOverlayStore().setValue(item.getBoldKey(), fBoldCheckBox.getSelection());
+			}
+		});
+				
+		fItalicCheckBox.addSelectionListener(new SelectionListener() {
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// do nothing
+			}
+			public void widgetSelected(SelectionEvent e) {
+				HighlightingColorListItem item= getHighlightingColorListItem();
+				getOverlayStore().setValue(item.getItalicKey(), fItalicCheckBox.getSelection());
+			}
+		});
+				
+		return colorComposite;
+	}
+	
+
+	private Composite createFoldingTabContent(TabFolder folder) {
+		Composite composite= new Composite(folder, SWT.NULL);
+		// assume parent page uses griddata
+		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_FILL);
+		composite.setLayoutData(gd);
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 2;
+		//PixelConverter pc= new PixelConverter(composite);
+		//layout.verticalSpacing= pc.convertHeightInCharsToPixels(1) / 2;
+		composite.setLayout(layout);
+		
+		
+		/* check box for new editors */
+		fFoldingCheckbox= new Button(composite, SWT.CHECK);
+		fFoldingCheckbox.setText(AutotoolsPreferencesMessages.getString("AutomakeEditorPreferencePage.foldingenable")); //$NON-NLS-1$
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+		fFoldingCheckbox.setLayoutData(gd);
+		fFoldingCheckbox.addSelectionListener(new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				boolean enabled= fFoldingCheckbox.getSelection(); 
+				getOverlayStore().setValue(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_ENABLED, enabled);
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+		});
+		
+		return composite;
+	}
+
+	void handleSyntaxColorListSelection() {
+		HighlightingColorListItem item= getHighlightingColorListItem();
+		RGB rgb= PreferenceConverter.getColor(getOverlayStore(), item.getColorKey());
+		fSyntaxForegroundColorEditor.setColorValue(rgb);		
+		fBoldCheckBox.setSelection(getOverlayStore().getBoolean(item.getBoldKey()));
+		fItalicCheckBox.setSelection(getOverlayStore().getBoolean(item.getItalicKey()));
+	}
+	
+	/**
+	 * Returns the current highlighting color list item.
+	 * 
+	 * @return the current highlighting color list item
+	 * @since 3.0
+	 */
+	HighlightingColorListItem getHighlightingColorListItem() {
+		IStructuredSelection selection= (IStructuredSelection) fHighlightingColorListViewer.getSelection();
+		return (HighlightingColorListItem) selection.getFirstElement();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
+	 */
+	public boolean performOk() {
+		return super.performOk();
+	}
+
+	/**
+	 * @param preferenceStore
+	 */
+	public static void initDefaults(IPreferenceStore prefs) {		
+		// Makefile Editor color preferences
+		PreferenceConverter.setDefault(prefs, ColorManager.MAKE_COMMENT_COLOR, ColorManager.MAKE_COMMENT_RGB);
+		PreferenceConverter.setDefault(prefs, ColorManager.MAKE_DEFAULT_COLOR, ColorManager.MAKE_DEFAULT_RGB);
+		PreferenceConverter.setDefault(prefs, ColorManager.MAKE_FUNCTION_COLOR, ColorManager.MAKE_FUNCTION_RGB);
+		PreferenceConverter.setDefault(prefs, ColorManager.MAKE_KEYWORD_COLOR, ColorManager.MAKE_KEYWORD_RGB);
+		PreferenceConverter.setDefault(prefs, ColorManager.MAKE_MACRO_DEF_COLOR, ColorManager.MAKE_MACRO_DEF_RGB);
+		PreferenceConverter.setDefault(prefs, ColorManager.MAKE_MACRO_REF_COLOR, ColorManager.MAKE_MACRO_REF_RGB);		
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsEditorPreferenceConstants.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsEditorPreferenceConstants.java
new file mode 100644
index 0000000..ec329af
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsEditorPreferenceConstants.java
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2005, 2007, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ * Red Hat Inc. - rename to use with Autotools editors
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+
+/**
+ * MakefileEditorPreferenceConstants
+ */
+public class AutotoolsEditorPreferenceConstants {
+
+	/**
+	 * 
+	 */
+	private AutotoolsEditorPreferenceConstants() {
+	}
+
+	/**
+	 * The symbolic names for colors for displaying code assist proposals
+	 * @see org.eclipse.jface.resource.ColorRegistry
+	 */
+	public static final String CURRENT_LINE_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.automake.currentLineHightlightColor"; //$NON-NLS-1$
+	public static final String LINE_NUMBER_RULER_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.automake.lineNumberForegroundColor"; //$NON-NLS-1$
+	public static final String PRINT_MARGIN_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.automake.printMarginColor"; //$NON-NLS-1$	
+	
+	/**
+	 * Preference key suffix for bold text style preference keys.
+	 * 
+	 */
+	public static final String EDITOR_BOLD_SUFFIX= "_bold"; //$NON-NLS-1$
+
+	/**
+	 * Preference key suffix for italic text style preference keys.
+	 */
+	public static final String EDITOR_ITALIC_SUFFIX= "_italic"; //$NON-NLS-1$
+
+
+	public static final String EDITOR_FOLDING_MACRODEF = "editor_folding_default_macrodef"; //$NON-NLS-1$
+
+	public static final String EDITOR_FOLDING_RULE = "editor_folding_default_rule"; //$NON-NLS-1$
+
+	public static final String EDITOR_FOLDING_CASE = "editor_folding_default_case"; //$NON-NLS-1$
+
+	public static final String EDITOR_FOLDING_CONDITIONAL = "editor_folding_default_conditional"; //$NON-NLS-1$
+
+	public static final String EDITOR_FOLDING_LOOP = "editor_folding_default_loop"; //$NON-NLS-1$
+
+	public static final String EDITOR_FOLDING_ENABLED = "editor_folding_enabled"; //$NON-NLS-1$
+	
+	public static final String AUTOCONF_VERSION = "autoconf_version";
+	
+	public static final String AUTOMAKE_VERSION = "automake_version";
+	
+	public static void initializeDefaultValues(IPreferenceStore store) {
+
+		store.setDefault(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_ENABLED, false);
+		store.setDefault(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_MACRODEF, false);
+		store.setDefault(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_RULE, true);
+		store.setDefault(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_CASE, true);
+		store.setDefault(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_CONDITIONAL, true);
+		store.setDefault(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_LOOP, true);
+		store.setDefault(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION, AutoconfEditorPreferencePage.LATEST_AC_VERSION);
+		store.setDefault(AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION, AutoconfEditorPreferencePage.LATEST_AM_VERSION);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencePage.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencePage.java
new file mode 100644
index 0000000..525657f
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencePage.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2006, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import org.eclipse.jface.preference.BooleanFieldEditor;
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+
+public class AutotoolsPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
+
+	private static final String PREF_BUILD_TARGET_IN_BACKGROUND = "MakeTargetPrefs.buildTargetInBackground"; //$NON-NLS-1$
+	private static final String TARGET_BUILDS_IN_BACKGROUND = "MakeTargetPreferencePage.buildTargetInBackground.label"; //$NON-NLS-1$
+
+	public AutotoolsPreferencePage() {
+		super(GRID);
+		setPreferenceStore(AutotoolsPlugin.getDefault().getPreferenceStore());
+	}
+
+	/**
+	 * @see FieldEditorPreferencePage#createControl(Composite)
+	 */
+	protected void createFieldEditors() {
+		Composite parent = getFieldEditorParent();
+
+		BooleanFieldEditor targetBackgroundEditor = new BooleanFieldEditor(PREF_BUILD_TARGET_IN_BACKGROUND,
+				AutotoolsUIPlugin.getResourceString(TARGET_BUILDS_IN_BACKGROUND), parent);
+		addField(targetBackgroundEditor);
+	}
+
+	public static boolean isBuildTargetInBackground() {
+		return AutotoolsPlugin.getDefault().getPreferenceStore().getBoolean(PREF_BUILD_TARGET_IN_BACKGROUND);
+	}
+
+	public static void setBuildTargetInBackground(boolean enable) {
+		AutotoolsPlugin.getDefault().getPreferenceStore().setValue(PREF_BUILD_TARGET_IN_BACKGROUND, enable);
+	}
+
+	/**
+	 * Initializes the default values of this page in the preference bundle.
+	 */
+	public static void initDefaults(IPreferenceStore prefs) {
+		prefs.setDefault(PREF_BUILD_TARGET_IN_BACKGROUND, true);
+	}
+
+	public void init(IWorkbench workbench) {
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencesMessages.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencesMessages.java
new file mode 100644
index 0000000..3f24110
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencesMessages.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+/**
+ * MakefilePreferencesMessages
+ */
+public class AutotoolsPreferencesMessages {
+
+	/**
+	 * 
+	 */
+	private AutotoolsPreferencesMessages() {
+	}
+
+	private static final String BUNDLE_NAME = AutotoolsPreferencesMessages.class.getName();
+
+	public static String getString(String key) {
+		try {
+			return ResourceBundle.getBundle(BUNDLE_NAME).getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		} catch (NullPointerException e) {
+			return '#' + key + '#';
+		}
+	}	
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencesMessages.properties b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencesMessages.properties
new file mode 100644
index 0000000..40b5380
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencesMessages.properties
@@ -0,0 +1,108 @@
+###############################################################################
+# Copyright (c) 2000, 2006, 2007 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+#     Red Hat Inc.    - convert for usage with Automake and Autoconf editors
+###############################################################################
+
+AutomakeEditorPreferencePage.description=Automake Editor settings:
+AutomakeEditorPreferencePage.invalid_input_print_margin= Invalid print margin column specified
+AutomakeEditorPreferencePage.empty_input_print_margin= No print margin column specified
+AutomakeEditorPreferencePage.appearance=Appeara&nce
+AutomakeEditorPreferencePage.printMarginColumn=Print margin col&umn:
+AutomakeEditorPreferencePage.showOverviewRuler=Show overview &ruler
+AutomakeEditorPreferencePage.showLineNumbers=Show lin&e numbers
+AutomakeEditorPreferencePage.highlightCurrentLine=Hi&ghlight current line
+AutomakeEditorPreferencePage.showPrintMargin=Sho&w print margin
+AutomakeEditorPreferencePage.color=C&olor:
+AutomakeEditorPreferencePage.appearanceOptions=Appearance co&lor options:
+AutomakeEditorPreferencePage.lineNumberForegroundColor=Line number foreground
+AutomakeEditorPreferencePage.currentLineHighlighColor=Current line highlight
+AutomakeEditorPreferencePage.printMarginColor=Print margin
+AutomakeEditorPreferencePage.Makefile_editor_text_1=Text
+AutomakeEditorPreferencePage.Makefile_editor_processing_instuctions_2=Processing instructions
+AutomakeEditorPreferencePage.Makefile_editor_constMakefile_strings_3=ConstMakefile strings
+AutomakeEditorPreferencePage.Makefile_editor_tags_4=Tags
+AutomakeEditorPreferencePage.Makefile_editor_comments_5=Comments
+AutomakeEditorPreferencePage.tabwidth=Displayed &tab width:
+AutomakeEditorPreferencePage.notabwidth=No tab width specified
+AutomakeEditorPreferencePage.39=Invalid tab width specified
+AutomakeEditorPreferencePage.systemdefault=System de&fault
+AutomakeEditorPreferencePage.spacetabs=&Insert spaces for tabs when typing
+AutomakeEditorPreferencePage.foreground= Selection foreground color
+AutomakeEditorPreferencePage.background= Selection background color
+AutomakeEditorPreferencePage.syntax=Synta&x
+AutomakeEditorPreferencePage.backcolor=Background color
+AutomakeEditorPreferencePage.custom=C&ustom:
+AutomakeEditorPreferencePage.Foreground=Fore&ground:
+AutomakeEditorPreferencePage.bold=&Bold
+AutomakeEditorPreferencePage.italic=I&talic
+
+AutomakeEditorPreferencePage.folding= &Folding
+AutomakeEditorPreferencePage.foldingenable= Enable folding when &opening a new editor
+
+AutomakeEditorPreferencePage.makefile_editor_comment=comment
+AutomakeEditorPreferencePage.makefile_editor_macro_def=macro definition
+AutomakeEditorPreferencePage.makefile_editor_macro_ref=macro reference
+AutomakeEditorPreferencePage.makefile_editor_function=function
+AutomakeEditorPreferencePage.makefile_editor_keyword=keyword
+AutomakeEditorPreferencePage.makefile_editor_target=target
+AutomakeEditorPreferencePage.makefile_editor_default=default
+
+
+AutomakeSettingsPreferencePage.style=Style of Makefile
+AutomakeSettingsPreferencePage.path.label=Makefile include directories
+AutomakeSettingsPreferencePage.path.browse=directory
+
+AutoconfEditorPreferencePage.description=Autoconf Editor settings:
+AutoconfEditorPreferencePage.invalid_input_print_margin= Invalid print margin column specified
+AutoconfEditorPreferencePage.empty_input_print_margin= No print margin column specified
+AutoconfEditorPreferencePage.appearance=Appeara&nce
+AutoconfEditorPreferencePage.printMarginColumn=Print margin col&umn:
+AutoconfEditorPreferencePage.showOverviewRuler=Show overview &ruler
+AutoconfEditorPreferencePage.showLineNumbers=Show lin&e numbers
+AutoconfEditorPreferencePage.highlightCurrentLine=Hi&ghlight current line
+AutoconfEditorPreferencePage.showPrintMargin=Sho&w print margin
+AutoconfEditorPreferencePage.color=C&olor:
+AutoconfEditorPreferencePage.appearanceOptions=Appearance co&lor options:
+AutoconfEditorPreferencePage.lineNumberForegroundColor=Line number foreground
+AutoconfEditorPreferencePage.currentLineHighlighColor=Current line highlight
+AutoconfEditorPreferencePage.printMarginColor=Print margin
+AutoconfEditorPreferencePage.Makefile_editor_text_1=Text
+AutoconfEditorPreferencePage.Makefile_editor_processing_instuctions_2=Processing instructions
+AutoconfEditorPreferencePage.Makefile_editor_constMakefile_strings_3=ConstMakefile strings
+AutoconfEditorPreferencePage.Makefile_editor_tags_4=Tags
+AutoconfEditorPreferencePage.Makefile_editor_comments_5=Comments
+AutoconfEditorPreferencePage.tabwidth=Displayed &tab width:
+AutoconfEditorPreferencePage.notabwidth=No tab width specified
+AutoconfEditorPreferencePage.39=Invalid tab width specified
+AutoconfEditorPreferencePage.systemdefault=System de&fault
+AutoconfEditorPreferencePage.spacetabs=&Insert spaces for tabs when typing
+AutoconfEditorPreferencePage.foreground= Selection foreground color
+AutoconfEditorPreferencePage.background= Selection background color
+AutoconfEditorPreferencePage.syntax=Synta&x
+AutoconfEditorPreferencePage.backcolor=Background color
+AutoconfEditorPreferencePage.custom=C&ustom:
+AutoconfEditorPreferencePage.Foreground=Fore&ground:
+AutoconfEditorPreferencePage.bold=&Bold
+AutoconfEditorPreferencePage.italic=I&talic
+
+AutoconfEditorPreferencePage.folding= &Folding
+AutoconfEditorPreferencePage.foldingenable= Enable folding when &opening a new editor
+
+AutoconfEditorPreferencePage.version= &Version
+AutoconfEditorPreferencePage.autoconfVersion = Default version of Autoconf to use for syntax checking
+AutoconfEditorPreferencePage.automakeVersion = Default version of Automake to use for syntax checking
+AutoconfEditorPreferencePage.autoconf_editor_comment=comment
+AutoconfEditorPreferencePage.autoconf_editor_acmacro=autoconf macro
+AutoconfEditorPreferencePage.autoconf_editor_ammacro=automake macro
+AutoconfEditorPreferencePage.autoconf_editor_var_ref=variable reference
+AutoconfEditorPreferencePage.autoconf_editor_keyword=keyword
+AutoconfEditorPreferencePage.autoconf_editor_var_set=variable set
+AutoconfEditorPreferencePage.autoconf_editor_code_seq=inlined code sequence
+AutoconfEditorPreferencePage.autoconf_editor_default=default
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/ColorEditor.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/ColorEditor.java
new file mode 100644
index 0000000..fb4ff10
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/ColorEditor.java
@@ -0,0 +1,122 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.ColorDialog;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * A "button" of a certain color determined by the color picker
+ */
+public class ColorEditor {
+	
+	private Point fExtent;
+	Image fImage;
+	RGB fColorValue;
+	Color fColor;
+	Button fButton;
+	
+	public ColorEditor(Composite parent) {
+		
+		fButton= new Button(parent, SWT.PUSH);
+		fExtent= computeImageSize(parent);
+		fImage= new Image(parent.getDisplay(), fExtent.x, fExtent.y);
+		
+		GC gc= new GC(fImage);
+		gc.setBackground(fButton.getBackground());
+		gc.fillRectangle(0, 0, fExtent.x, fExtent.y);
+		gc.dispose();
+		
+		fButton.setImage(fImage);
+		fButton.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent event) {
+				ColorDialog colorDialog= new ColorDialog(fButton.getShell());
+				colorDialog.setRGB(fColorValue);
+				RGB newColor = colorDialog.open();
+				if (newColor != null) {
+					fColorValue= newColor;
+					updateColorImage();
+				}
+			}
+		});
+		
+		fButton.addDisposeListener(new DisposeListener() {
+			public void widgetDisposed(DisposeEvent event) {
+				if (fImage != null)  {
+					fImage.dispose();
+					fImage= null;
+				}
+				if (fColor != null) {
+					fColor.dispose();
+					fColor= null;
+				}
+			}
+		});
+	}
+	
+	public RGB getColorValue() {
+		return fColorValue;
+	}
+	
+	public void setColorValue(RGB rgb) {
+		fColorValue= rgb;
+		updateColorImage();
+	}
+	
+	public Button getButton() {
+		return fButton;
+	}
+	
+	protected void updateColorImage() {
+		
+		Display display= fButton.getDisplay();
+		
+		GC gc= new GC(fImage);
+		gc.setForeground(display.getSystemColor(SWT.COLOR_BLACK));
+		gc.drawRectangle(0, 2, fExtent.x - 1, fExtent.y - 4);
+		
+		if (fColor != null)
+			fColor.dispose();
+			
+		fColor= new Color(display, fColorValue);
+		gc.setBackground(fColor);
+		gc.fillRectangle(1, 3, fExtent.x - 2, fExtent.y - 5);
+		gc.dispose();
+		
+		fButton.setImage(fImage);
+	}
+	
+	protected Point computeImageSize(Control window) {
+		GC gc= new GC(window);
+		Font f= JFaceResources.getFontRegistry().get(JFaceResources.DEFAULT_FONT);
+		gc.setFont(f);
+		int height= gc.getFontMetrics().getHeight();
+		gc.dispose();
+		Point p= new Point(height * 3 - 6, height);
+		return p;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/ColorManager.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/ColorManager.java
new file mode 100644
index 0000000..726af8d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/ColorManager.java
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.eclipse.jface.text.source.ISharedTextColors;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.widgets.Display;
+
+public class ColorManager implements ISharedTextColors {
+
+	public static final String MAKE_COMMENT_COLOR ="org.eclipse.linuxtools.cdt.autotools.ui.automake.editor.comment"; //$NON-NLS-1$
+	public static final String MAKE_KEYWORD_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.automake.editor.keyword"; //$NON-NLS-1$
+	public static final String MAKE_FUNCTION_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.automake.editor.function"; //$NON-NLS-1$
+	public static final String MAKE_MACRO_REF_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.automake.editor.macro_ref"; //$NON-NLS-1$
+	public static final String MAKE_MACRO_DEF_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.automake.editor.macro_def"; //$NON-NLS-1$
+	public static final String MAKE_DEFAULT_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.automake.editor.default"; //$NON-NLS-1$
+
+	public static final String AUTOCONF_COMMENT_COLOR ="org.eclipse.linuxtools.cdt.autotools.ui.autoconf.editor.comment"; //$NON-NLS-1$
+	public static final String AUTOCONF_KEYWORD_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.autoconf.editor.keyword"; //$NON-NLS-1$
+	public static final String AUTOCONF_VAR_REF_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.autoconf.editor.var_ref"; //$NON-NLS-1$
+	public static final String AUTOCONF_VAR_SET_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.autoconf.editor.var_set"; //$NON-NLS-1$
+	public static final String AUTOCONF_ACMACRO_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.autoconf.editor.acmacro"; //$NON-NLS-1$
+	public static final String AUTOCONF_AMMACRO_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.autoconf.editor.ammacro"; //$NON-NLS-1$
+	public static final String AUTOCONF_CODESEQ_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.autoconf.editor.codeseq"; //$NON-NLS-1$
+	public static final String AUTOCONF_DEFAULT_COLOR = "org.eclipse.linuxtools.cdt.autotools.ui.autoconf.editor.default"; //$NON-NLS-1$
+
+	public static final RGB MAKE_COMMENT_RGB = new RGB(128, 0, 0);
+	public static final RGB MAKE_KEYWORD_RGB = new RGB(128, 255, 0);
+	public static final RGB MAKE_FUNCTION_RGB = new RGB(128, 0, 128);
+	public static final RGB MAKE_MACRO_DEF_RGB = new RGB(0, 0, 128);
+	public static final RGB MAKE_MACRO_REF_RGB = new RGB(0, 128, 0);
+	public static final RGB MAKE_DEFAULT_RGB = new RGB(0, 0, 0);
+
+	public static final RGB AUTOCONF_COMMENT_RGB = new RGB(63, 95, 191);
+	public static final RGB AUTOCONF_KEYWORD_RGB = new RGB(127, 0, 85);
+	public static final RGB AUTOCONF_VAR_REF_RGB = new RGB(128, 0, 0);
+	public static final RGB AUTOCONF_VAR_SET_RGB = new RGB(255, 101, 52);
+	public static final RGB AUTOCONF_ACMACRO_RGB = new RGB(0, 0, 128);
+	public static final RGB AUTOCONF_AMMACRO_RGB = new RGB(0, 128, 0);
+	public static final RGB AUTOCONF_CODESEQ_RGB = new RGB(0, 100, 0);
+	public static final RGB AUTOCONF_DEFAULT_RGB = new RGB(0, 0, 0);
+
+	private static ColorManager fgColorManager;
+	
+	private ColorManager() {
+	}
+	
+	public static ColorManager getDefault() {
+		if (fgColorManager == null) {
+			fgColorManager= new ColorManager();
+		}
+		return fgColorManager;
+	}
+
+	protected Map<RGB, Color> fColorTable = new HashMap<RGB, Color>(10);
+
+	/**
+	 * @see IMakefileColorManager#dispose()
+	 */
+	public void dispose() {
+		Iterator<Color> e = fColorTable.values().iterator();
+		while (e.hasNext())
+			 ((Color) e.next()).dispose();
+	}
+
+	/**
+	 * @see IMakefileColorManager#getColor(RGB)
+	 */
+	public Color getColor(RGB rgb) {
+		Color color = (Color) fColorTable.get(rgb);
+		if (color == null) {
+			color = new Color(Display.getCurrent(), rgb);
+			fColorTable.put(rgb, color);
+		}
+		return color;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/OverlayPreferenceStore.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/OverlayPreferenceStore.java
new file mode 100644
index 0000000..3c6a672
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/OverlayPreferenceStore.java
@@ -0,0 +1,455 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferenceStore;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.PropertyChangeEvent;
+
+/**
+ * OverlayPreferenceStore
+ */
+/**
+ * An overlaying preference store.
+ */
+class OverlayPreferenceStore  implements IPreferenceStore {
+	
+	
+	public static final class TypeDescriptor {
+		TypeDescriptor() {
+		}
+	}
+	
+	public static final TypeDescriptor BOOLEAN= new TypeDescriptor();
+	public static final TypeDescriptor DOUBLE= new TypeDescriptor();
+	public static final TypeDescriptor FLOAT= new TypeDescriptor();
+	public static final TypeDescriptor INT= new TypeDescriptor();
+	public static final TypeDescriptor LONG= new TypeDescriptor();
+	public static final TypeDescriptor STRING= new TypeDescriptor();
+	
+	public static class OverlayKey {
+		
+		TypeDescriptor fDescriptor;
+		String fKey;
+		
+		public OverlayKey(TypeDescriptor descriptor, String key) {
+			fDescriptor= descriptor;
+			fKey= key;
+		}
+	}
+	
+	private class PropertyListener implements IPropertyChangeListener {
+				
+		/*
+		 * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent)
+		 */
+		public void propertyChange(PropertyChangeEvent event) {
+			OverlayKey key= findOverlayKey(event.getProperty());
+			if (key != null)
+				propagateProperty(fParent, key, fStore); 
+		}
+	}
+	
+	
+	IPreferenceStore fParent;
+	IPreferenceStore fStore;
+	private OverlayKey[] fOverlayKeys;
+	
+	private PropertyListener fPropertyListener;
+	
+	
+	public OverlayPreferenceStore(IPreferenceStore parent, OverlayKey[] overlayKeys) {
+		fParent= parent;
+		fOverlayKeys= overlayKeys;
+		fStore= new PreferenceStore();
+	}
+	
+	OverlayKey findOverlayKey(String key) {
+		for (int i= 0; i < fOverlayKeys.length; i++) {
+			if (fOverlayKeys[i].fKey.equals(key))
+				return fOverlayKeys[i];
+		}
+		return null;
+	}
+	
+	private boolean covers(String key) {
+		return (findOverlayKey(key) != null);
+	}
+	
+	void propagateProperty(IPreferenceStore orgin, OverlayKey key, IPreferenceStore target) {
+		
+		if (orgin.isDefault(key.fKey)) {
+			if (!target.isDefault(key.fKey))
+				target.setToDefault(key.fKey);
+			return;
+		}
+		
+		TypeDescriptor d= key.fDescriptor;
+		if (BOOLEAN == d) {
+			
+			boolean originValue= orgin.getBoolean(key.fKey);
+			boolean targetValue= target.getBoolean(key.fKey);
+			if (targetValue != originValue)
+				target.setValue(key.fKey, originValue);
+				
+		} else if (DOUBLE == d) {
+			
+			double originValue= orgin.getDouble(key.fKey);
+			double targetValue= target.getDouble(key.fKey);
+			if (targetValue != originValue)
+				target.setValue(key.fKey, originValue);
+		
+		} else if (FLOAT == d) {
+			
+			float originValue= orgin.getFloat(key.fKey);
+			float targetValue= target.getFloat(key.fKey);
+			if (targetValue != originValue)
+				target.setValue(key.fKey, originValue);
+				
+		} else if (INT == d) {
+
+			int originValue= orgin.getInt(key.fKey);
+			int targetValue= target.getInt(key.fKey);
+			if (targetValue != originValue)
+				target.setValue(key.fKey, originValue);
+
+		} else if (LONG == d) {
+
+			long originValue= orgin.getLong(key.fKey);
+			long targetValue= target.getLong(key.fKey);
+			if (targetValue != originValue)
+				target.setValue(key.fKey, originValue);
+
+		} else if (STRING == d) {
+
+			String originValue= orgin.getString(key.fKey);
+			String targetValue= target.getString(key.fKey);
+			if (targetValue != null && originValue != null && !targetValue.equals(originValue))
+				target.setValue(key.fKey, originValue);
+
+		}
+	}
+	
+	public void propagate() {
+		for (int i= 0; i < fOverlayKeys.length; i++)
+			propagateProperty(fStore, fOverlayKeys[i], fParent);
+	}
+	
+	private void loadProperty(IPreferenceStore orgin, OverlayKey key, IPreferenceStore target, boolean forceInitialization) {
+		TypeDescriptor d= key.fDescriptor;
+		if (BOOLEAN == d) {
+			
+			if (forceInitialization)
+				target.setValue(key.fKey, true);
+			target.setValue(key.fKey, orgin.getBoolean(key.fKey));
+			target.setDefault(key.fKey, orgin.getDefaultBoolean(key.fKey));
+			
+		} else if (DOUBLE == d) {
+			
+			if (forceInitialization)
+				target.setValue(key.fKey, 1.0D);
+			target.setValue(key.fKey, orgin.getDouble(key.fKey));
+			target.setDefault(key.fKey, orgin.getDefaultDouble(key.fKey));
+			
+		} else if (FLOAT == d) {
+			
+			if (forceInitialization)
+				target.setValue(key.fKey, 1.0F);
+			target.setValue(key.fKey, orgin.getFloat(key.fKey));
+			target.setDefault(key.fKey, orgin.getDefaultFloat(key.fKey));
+			
+		} else if (INT == d) {
+			
+			if (forceInitialization)
+				target.setValue(key.fKey, 1);
+			target.setValue(key.fKey, orgin.getInt(key.fKey));
+			target.setDefault(key.fKey, orgin.getDefaultInt(key.fKey));
+			
+		} else if (LONG == d) {
+			
+			if (forceInitialization)
+				target.setValue(key.fKey, 1L);
+			target.setValue(key.fKey, orgin.getLong(key.fKey));
+			target.setDefault(key.fKey, orgin.getDefaultLong(key.fKey));
+			
+		} else if (STRING == d) {
+			
+			if (forceInitialization)
+				target.setValue(key.fKey, "1"); //$NON-NLS-1$
+			target.setValue(key.fKey, orgin.getString(key.fKey));
+			target.setDefault(key.fKey, orgin.getDefaultString(key.fKey));
+			
+		}
+	}
+	
+	public void load() {
+		for (int i= 0; i < fOverlayKeys.length; i++)
+			loadProperty(fParent, fOverlayKeys[i], fStore, true);
+	}
+	
+	public void loadDefaults() {
+		for (int i= 0; i < fOverlayKeys.length; i++)
+			setToDefault(fOverlayKeys[i].fKey);
+	}
+	
+	public void start() {
+		if (fPropertyListener == null) {
+			fPropertyListener= new PropertyListener();
+			fParent.addPropertyChangeListener(fPropertyListener);
+		}
+	}
+	
+	public void stop() {
+		if (fPropertyListener != null)  {
+			fParent.removePropertyChangeListener(fPropertyListener);
+			fPropertyListener= null;
+		}
+	}
+	
+	/*
+	 * @see IPreferenceStore#addPropertyChangeListener(IPropertyChangeListener)
+	 */
+	public void addPropertyChangeListener(IPropertyChangeListener listener) {
+		fStore.addPropertyChangeListener(listener);
+	}
+	
+	/*
+	 * @see IPreferenceStore#removePropertyChangeListener(IPropertyChangeListener)
+	 */
+	public void removePropertyChangeListener(IPropertyChangeListener listener) {
+		fStore.removePropertyChangeListener(listener);
+	}
+	
+	/*
+	 * @see IPreferenceStore#firePropertyChangeEvent(String, Object, Object)
+	 */
+	public void firePropertyChangeEvent(String name, Object oldValue, Object newValue) {
+		fStore.firePropertyChangeEvent(name, oldValue, newValue);
+	}
+
+	/*
+	 * @see IPreferenceStore#contains(String)
+	 */
+	public boolean contains(String name) {
+		return fStore.contains(name);
+	}
+	
+	/*
+	 * @see IPreferenceStore#getBoolean(String)
+	 */
+	public boolean getBoolean(String name) {
+		return fStore.getBoolean(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDefaultBoolean(String)
+	 */
+	public boolean getDefaultBoolean(String name) {
+		return fStore.getDefaultBoolean(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDefaultDouble(String)
+	 */
+	public double getDefaultDouble(String name) {
+		return fStore.getDefaultDouble(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDefaultFloat(String)
+	 */
+	public float getDefaultFloat(String name) {
+		return fStore.getDefaultFloat(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDefaultInt(String)
+	 */
+	public int getDefaultInt(String name) {
+		return fStore.getDefaultInt(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDefaultLong(String)
+	 */
+	public long getDefaultLong(String name) {
+		return fStore.getDefaultLong(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDefaultString(String)
+	 */
+	public String getDefaultString(String name) {
+		return fStore.getDefaultString(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDouble(String)
+	 */
+	public double getDouble(String name) {
+		return fStore.getDouble(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getFloat(String)
+	 */
+	public float getFloat(String name) {
+		return fStore.getFloat(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getInt(String)
+	 */
+	public int getInt(String name) {
+		return fStore.getInt(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getLong(String)
+	 */
+	public long getLong(String name) {
+		return fStore.getLong(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getString(String)
+	 */
+	public String getString(String name) {
+		return fStore.getString(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#isDefault(String)
+	 */
+	public boolean isDefault(String name) {
+		return fStore.isDefault(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#needsSaving()
+	 */
+	public boolean needsSaving() {
+		return fStore.needsSaving();
+	}
+
+	/*
+	 * @see IPreferenceStore#putValue(String, String)
+	 */
+	public void putValue(String name, String value) {
+		if (covers(name))
+			fStore.putValue(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setDefault(String, double)
+	 */
+	public void setDefault(String name, double value) {
+		if (covers(name))
+			fStore.setDefault(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setDefault(String, float)
+	 */
+	public void setDefault(String name, float value) {
+		if (covers(name))
+			fStore.setDefault(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setDefault(String, int)
+	 */
+	public void setDefault(String name, int value) {
+		if (covers(name))
+			fStore.setDefault(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setDefault(String, long)
+	 */
+	public void setDefault(String name, long value) {
+		if (covers(name))
+			fStore.setDefault(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setDefault(String, String)
+	 */
+	public void setDefault(String name, String value) {
+		if (covers(name))
+			fStore.setDefault(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setDefault(String, boolean)
+	 */
+	public void setDefault(String name, boolean value) {
+		if (covers(name))
+			fStore.setDefault(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setToDefault(String)
+	 */
+	public void setToDefault(String name) {
+		fStore.setToDefault(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#setValue(String, double)
+	 */
+	public void setValue(String name, double value) {
+		if (covers(name))
+			fStore.setValue(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setValue(String, float)
+	 */
+	public void setValue(String name, float value) {
+		if (covers(name))
+			fStore.setValue(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setValue(String, int)
+	 */
+	public void setValue(String name, int value) {
+		if (covers(name))
+			fStore.setValue(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setValue(String, long)
+	 */
+	public void setValue(String name, long value) {
+		if (covers(name))
+			fStore.setValue(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setValue(String, String)
+	 */
+	public void setValue(String name, String value) {
+		if (covers(name))
+			fStore.setValue(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setValue(String, boolean)
+	 */
+	public void setValue(String name, boolean value) {
+		if (covers(name))
+			fStore.setValue(name, value);
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/StatusInfo.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/StatusInfo.java
new file mode 100644
index 0000000..d01fc66
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/StatusInfo.java
@@ -0,0 +1,173 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+
+
+/**
+ * A settable IStatus.
+ * Can be an error, warning, info or ok. For error, info and warning states,
+ * a message describes the problem.
+ */
+public class StatusInfo implements IStatus {
+
+	private String fStatusMessage;
+	private int fSeverity;
+
+	/**
+	 * Creates a status set to OK (no message)
+	 */
+	public StatusInfo() {
+		this(OK, null);
+	}
+
+	/**
+	 * Creates a status .
+	 * @param severity The status severity: ERROR, WARNING, INFO and OK.
+	 * @param message The message of the status. Applies only for ERROR,
+	 * WARNING and INFO.
+	 */
+	public StatusInfo(int severity, String message) {
+		fStatusMessage= message;
+		fSeverity= severity;
+	}
+
+	/**
+	 *  Returns if the status' severity is OK.
+	 */
+	public boolean isOK() {
+		return fSeverity == IStatus.OK;
+	}
+
+	/**
+	 *  Returns if the status' severity is WARNING.
+	 */
+	public boolean isWarning() {
+		return fSeverity == IStatus.WARNING;
+	}
+
+	/**
+	 *  Returns if the status' severity is INFO.
+	 */
+	public boolean isInfo() {
+		return fSeverity == IStatus.INFO;
+	}
+
+	/**
+	 *  Returns if the status' severity is ERROR.
+	 */
+	public boolean isError() {
+		return fSeverity == IStatus.ERROR;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.runtime.IStatus#getMessage()
+	 */
+	public String getMessage() {
+		return fStatusMessage;
+	}
+
+	/**
+	 * Sets the status to ERROR.
+	 * @param errorMessage The error message (can be empty, but not null)
+	 */
+	public void setError(String errorMessage) {
+		Assert.isNotNull(errorMessage);
+		fStatusMessage= errorMessage;
+		fSeverity= IStatus.ERROR;
+	}
+
+	/**
+	 * Sets the status to WARNING.
+	 * @param warningMessage The warning message (can be empty, but not null)
+	 */
+	public void setWarning(String warningMessage) {
+		Assert.isNotNull(warningMessage);
+		fStatusMessage= warningMessage;
+		fSeverity= IStatus.WARNING;
+	}
+
+	/**
+	 * Sets the status to INFO.
+	 * @param infoMessage The info message (can be empty, but not null)
+	 */
+	public void setInfo(String infoMessage) {
+		Assert.isNotNull(infoMessage);
+		fStatusMessage= infoMessage;
+		fSeverity= IStatus.INFO;
+	}
+
+	/**
+	 * Sets the status to OK.
+	 */
+	public void setOK() {
+		fStatusMessage= null;
+		fSeverity= IStatus.OK;
+	}
+
+	/*
+	 * @see IStatus#matches(int)
+	 */
+	public boolean matches(int severityMask) {
+		return (fSeverity & severityMask) != 0;
+	}
+
+	/**
+	 * Returns always <code>false</code>.
+	 * @see IStatus#isMultiStatus()
+	 */
+	public boolean isMultiStatus() {
+		return false;
+	}
+
+	/*
+	 * @see IStatus#getSeverity()
+	 */
+	public int getSeverity() {
+		return fSeverity;
+	}
+
+	/*
+	 * @see IStatus#getPlugin()
+	 */
+	public String getPlugin() {
+		return AutotoolsUIPlugin.getPluginId();
+	}
+
+	/**
+	 * Returns always <code>null</code>.
+	 * @see IStatus#getException()
+	 */
+	public Throwable getException() {
+		return null;
+	}
+
+	/**
+	 * Returns always the error severity.
+	 * @see IStatus#getCode()
+	 */
+	public int getCode() {
+		return fSeverity;
+	}
+
+	/**
+	 * Returns always <code>null</code>.
+	 * @see IStatus#getChildren()
+	 */
+	public IStatus[] getChildren() {
+		return new IStatus[0];
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/TabFolderLayout.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/TabFolderLayout.java
new file mode 100644
index 0000000..bda23b8
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/TabFolderLayout.java
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Layout;
+
+public class TabFolderLayout extends Layout {
+
+	protected Point computeSize (Composite composite, int wHint, int hHint, boolean flushCache) {
+		if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT)
+			return new Point(wHint, hHint);
+			
+		Control [] children = composite.getChildren ();
+		int count = children.length;
+		int maxWidth = 0, maxHeight = 0;
+		for (int i=0; i<count; i++) {
+			Control child = children [i];
+			Point pt = child.computeSize (SWT.DEFAULT, SWT.DEFAULT, flushCache);
+			maxWidth = Math.max (maxWidth, pt.x);
+			maxHeight = Math.max (maxHeight, pt.y);
+		}
+		
+		if (wHint != SWT.DEFAULT)
+			maxWidth= wHint;
+		if (hHint != SWT.DEFAULT)
+			maxHeight= hHint;
+		
+		return new Point(maxWidth, maxHeight);	
+		
+	}
+	
+	protected void layout (Composite composite, boolean flushCache) {
+		Rectangle rect= composite.getClientArea();
+	
+		Control[] children = composite.getChildren();
+		for (int i = 0; i < children.length; i++) {
+			children[i].setBounds(rect);
+		}
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AbstractConfigurePropertyOptionsPage.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AbstractConfigurePropertyOptionsPage.java
new file mode 100644
index 0000000..f844dd9
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AbstractConfigurePropertyOptionsPage.java
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import org.eclipse.jface.preference.FieldEditor;
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.util.PropertyChangeEvent;
+
+public abstract class AbstractConfigurePropertyOptionsPage extends
+		FieldEditorPreferencePage {
+
+	private boolean dirty = false;
+	private String name;
+
+	protected AbstractConfigurePropertyOptionsPage(String name) {
+		this(GRID);
+		this.name = name;
+	}
+	
+	protected String getName() {
+		return name;
+	}
+	
+	protected AbstractConfigurePropertyOptionsPage(int style) {
+		super(style);
+		noDefaultAndApplyButton();
+	}
+	
+	@Override
+	protected void createFieldEditors() {
+		// Get the preference store for the build settings
+		IPreferenceStore settings = getConfigurePrefStore();
+		setPreferenceStore(settings);
+	}
+
+	/**
+	 * Return the tool settings preference store
+	 */
+	protected AutotoolsConfigurePrefStore getConfigurePrefStore() {
+		return AutotoolsConfigurePrefStore.getInstance();	
+	}
+
+	/**
+	 * Method called when the value of a dialog field changes
+	 */
+	public void propertyChange(PropertyChangeEvent event) {
+	    super.propertyChange(event);
+		if (event.getProperty().equals(FieldEditor.VALUE)) {
+		    setDirty(true);
+		}
+	}
+
+	public void setDirty(boolean b) {  dirty = b; }
+	public boolean isDirty() { return dirty; }
+	public void storeSettings() { super.performOk(); }
+
+	public abstract void updateFields();
+	public abstract void setValues();
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java
new file mode 100644
index 0000000..3ec1077
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java
@@ -0,0 +1,241 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import org.eclipse.cdt.core.settings.model.ICResourceDescription;
+import org.eclipse.cdt.managedbuilder.ui.properties.AbstractCBuildPropertyTab;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+
+public class AutotoolsBuildPropertyPage extends AbstractCBuildPropertyTab {
+
+	private String TRUE = "true"; // $NON-NLS-1$
+	private String FALSE = "false"; // $NON-NLS-1$
+	private String CLEAN_DELETE_LABEL = "CleanDelete.label"; // $NON-NLS-1$
+	private String CLEAN_MAKE_LABEL = "CleanMake.label"; // $NON-NLS-1$
+	private String CLEAN_MAKETARGET_LABEL = "CleanMakeTarget.label"; // $NON-NLS-1$
+	private String CLEAN_MAKETARGET_TOOLTIP = "CleanMakeTarget.tooltip"; // $NON-NLS-1$
+	private String AUTO_BUILDNAME_LABEL = "AutoBuildName.label"; // $NON-NLS-1$
+	private String AUTO_BUILDNAME_TOOLTIP = "AutoBuildName.tooltip"; // $NON-NLS-1$
+	
+	protected Button fCleanDelete;
+	protected Button fCleanMake;
+	protected Button fAutoName;
+	protected Text   fCleanMakeTarget;
+
+	private IProject getProject() {
+		return (IProject)getCfg().getManagedProject().getOwner();
+	}
+
+	public boolean canBeVisible() {
+		return AutotoolsPlugin.hasTargetBuilder(getProject());
+	}
+
+	public void createControls(Composite parent) {
+		super.createControls(parent);
+		Composite composite= usercomp;
+		// assume parent page uses griddata
+		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_FILL | GridData.FILL_HORIZONTAL);
+		composite.setLayoutData(gd);
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 2;
+		//PixelConverter pc= new PixelConverter(composite);
+		//layout.verticalSpacing= pc.convertHeightInCharsToPixels(1) / 2;
+		composite.setLayout(layout);
+		
+		Group g = new Group(composite, SWT.SHADOW_ETCHED_IN);
+		g.setText(AutotoolsPropertyMessages.getString("CleanBehavior.title"));
+		gd = new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan = 2;
+		g.setLayoutData(gd);
+		layout= new GridLayout();
+		layout.numColumns= 2;
+		g.setLayout(layout);
+		
+		fCleanDelete = new Button(g, SWT.RADIO);
+		fCleanDelete.setText(AutotoolsPropertyMessages.getString(CLEAN_DELETE_LABEL));
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		gd.horizontalSpan = 2;
+		fCleanDelete.setLayoutData(gd);
+		fCleanMake = new Button(g, SWT.RADIO);
+		fCleanMake.setText(AutotoolsPropertyMessages.getString(CLEAN_MAKE_LABEL));
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		gd.horizontalSpan = 2;
+		fCleanMake.setLayoutData(gd);
+		
+		Label label = new Label(g, SWT.LEFT);
+		label.setText(AutotoolsPropertyMessages.getString(CLEAN_MAKETARGET_LABEL));
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label.setLayoutData(gd);
+		
+		fCleanMakeTarget = new Text(g, SWT.SINGLE | SWT.BORDER);
+		fCleanMakeTarget.setText(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET_DEFAULT);
+		fCleanMakeTarget.setToolTipText(AutotoolsPropertyMessages.getString(CLEAN_MAKETARGET_TOOLTIP));
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fCleanMakeTarget.setLayoutData(gd);
+		
+		fCleanDelete.addSelectionListener(new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				fCleanMake.setSelection(false);
+				fCleanDelete.setSelection(true);
+				fCleanMakeTarget.setEnabled(false);
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// do nothing
+			}
+		});
+		
+		fCleanMake.addSelectionListener(new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				fCleanDelete.setSelection(false);
+				fCleanMake.setSelection(true);
+				fCleanMakeTarget.setEnabled(true);
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// do nothing
+			}
+		});
+		
+		fCleanMakeTarget.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				if (fCleanMakeTarget.getText().equals("")) { // $NON-NLS-1$
+					// FIXME: should probably issue warning here, but how?
+				}
+			}
+		});
+		
+		fAutoName = new Button(composite, SWT.LEFT | SWT.CHECK);
+		fAutoName.setText(AutotoolsPropertyMessages.getString(AUTO_BUILDNAME_LABEL));
+		fAutoName.setToolTipText(AutotoolsPropertyMessages.getString(AUTO_BUILDNAME_TOOLTIP));
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		gd.horizontalSpan = 2;
+		fAutoName.setLayoutData(gd);
+		
+		initialize();
+	}
+
+	protected void performOK() {
+		IProject project = getProject();
+		if (fCleanDelete.getSelection()) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE, TRUE); 
+			} catch (CoreException ce) {
+				// FIXME: what can we do here?
+			}
+		} else {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE, FALSE);
+			} catch (CoreException ce) {
+				// FIXME: what can we do here?
+			}
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET, fCleanMakeTarget.getText());
+			} catch (CoreException ce) {
+				// FIXME: what can we do here?
+			}
+		}
+		
+		if (fAutoName.getSelection()) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTO_BUILD_NAME, TRUE); 
+			} catch (CoreException ce) {
+				// FIXME: what can we do here?
+			}
+		} else {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTO_BUILD_NAME, FALSE);
+			} catch (CoreException ce) {
+				// FIXME: what can we do here?
+			}
+		}
+
+	}
+
+	protected void performApply(ICResourceDescription src, ICResourceDescription dst) {
+		performOK();
+	}
+	
+	protected void performDefaults() {
+		fCleanDelete.setSelection(false);
+		fCleanMake.setSelection(true);
+		fCleanMakeTarget.setText(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET_DEFAULT);
+		fCleanMakeTarget.setEnabled(true);
+		fAutoName.setEnabled(true);
+	}
+	
+	public void updateData(ICResourceDescription cfgd) {
+		// what to do here?
+	}
+	
+	public void updateButtons() {
+		// what to do here?
+	}
+
+	public void setVisible (boolean b) {
+		super.setVisible(b);
+	}
+
+	private void initialize() {
+		IProject project = getProject();
+		String cleanDelete = null;
+		String autoName = null;
+		String cleanMakeTarget = null;
+		try {
+			cleanDelete = project.getPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE);
+			cleanMakeTarget = project.getPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET);
+			autoName = project.getPersistentProperty(AutotoolsPropertyConstants.AUTO_BUILD_NAME);
+		} catch (CoreException e) {
+			// do nothing
+		}
+
+		if (cleanMakeTarget == null) {
+			cleanMakeTarget = AutotoolsPropertyConstants.CLEAN_MAKE_TARGET_DEFAULT;
+		}
+		fCleanMakeTarget.setText(cleanMakeTarget);
+
+		if (cleanDelete == null || cleanDelete.equals(FALSE)) {
+			fCleanDelete.setSelection(false);
+			fCleanMake.setSelection(true);
+			fCleanMakeTarget.setEnabled(true);
+		} else {
+			fCleanDelete.setSelection(true);
+			fCleanMake.setSelection(false);
+			fCleanMakeTarget.setEnabled(false);
+		}
+		
+		if (autoName == null || autoName.equals(TRUE))
+			fAutoName.setSelection(true);
+		else
+			fAutoName.setSelection(false);
+	}
+	
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsCategoryPropertyOptionPage.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsCategoryPropertyOptionPage.java
new file mode 100644
index 0000000..452fa18
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsCategoryPropertyOptionPage.java
@@ -0,0 +1,139 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import java.util.ArrayList;
+
+import org.eclipse.jface.preference.BooleanFieldEditor;
+import org.eclipse.jface.preference.FieldEditor;
+import org.eclipse.jface.preference.StringFieldEditor;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsConfiguration;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IAConfiguration;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IConfigureOption;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+
+public class AutotoolsCategoryPropertyOptionPage extends
+		AbstractConfigurePropertyOptionsPage {
+
+	private String catName = "";
+	private IAConfiguration cfg;
+	//  Label class for a preference page.
+	class LabelFieldEditor extends FieldEditor {
+		private String fTitle;
+		private Label fTitleLabel;
+
+		public LabelFieldEditor( Composite parent, String title ) {
+			fTitle = title;
+			this.createControl( parent );
+		}
+
+		protected void adjustForNumColumns( int numColumns ) {
+			((GridData)fTitleLabel.getLayoutData()).horizontalSpan = 2;
+		}
+
+		protected void doFillIntoGrid( Composite parent, int numColumns ) {
+			fTitleLabel = new Label( parent, SWT.WRAP );
+			fTitleLabel.setText( fTitle );
+			GridData gd = new GridData();
+			gd.verticalAlignment = SWT.TOP;
+			gd.grabExcessHorizontalSpace = false;
+			gd.horizontalSpan = 2;
+			fTitleLabel.setLayoutData( gd );
+		}
+
+		public int getNumberOfControls() {	return 1; }
+		/**
+		 * The label field editor is only used to present a text label on a preference page.
+		 */
+		protected void doLoad() {}
+		protected void doLoadDefault() {}
+		protected void doStore() {}
+	}
+	
+	private ArrayList<FieldEditor> fieldEditors;
+	
+	public AutotoolsCategoryPropertyOptionPage(ToolListElement element, IAConfiguration cfg) {
+ 		super(element.getName());
+ 		this.catName = element.getName();
+ 		this.cfg = cfg;
+ 		fieldEditors = new ArrayList<FieldEditor>();
+	}
+
+	public String getName() {
+		return super.getName();
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors()
+	 */
+	protected void createFieldEditors() {
+		super.createFieldEditors();
+		Composite parent = getFieldEditorParent();
+//		FontMetrics fm = AbstractCPropertyTab.getFontMetrics(parent);
+		AutotoolsConfiguration.Option[] options = AutotoolsConfiguration.getChildOptions(catName);
+		for (int i = 0; i < options.length; ++i) {
+			AutotoolsConfiguration.Option option = options[i];
+			switch (option.getType()) {
+			case IConfigureOption.STRING:
+			case IConfigureOption.INTERNAL:
+			case IConfigureOption.MULTIARG:
+				parent = getFieldEditorParent();
+				StringFieldEditor f = new StringFieldEditor(option.getName(), option.getDescription(), 20, parent);
+				f.getLabelControl(parent).setToolTipText(option.getToolTip());
+				addField(f);
+				fieldEditors.add(f);
+				break;
+			case IConfigureOption.BIN:
+				parent = getFieldEditorParent();
+				BooleanFieldEditor b = new BooleanFieldEditor(option.getName(), option.getDescription(), parent);
+				b.getDescriptionControl(parent).setToolTipText(option.getToolTip());
+				addField(b);
+				fieldEditors.add(b);
+				break;
+			}
+		}
+	}
+
+	protected FieldEditor createLabelEditor( Composite parent, String title ) {
+		return new LabelFieldEditor( parent, title );
+	}
+
+	/**
+	 * Update the field editor that displays all the build options
+	 */
+	public void updateFields() {
+		setValues();
+	}
+	
+	public void setValues() {
+		for (int i = 0; i < fieldEditors.size(); ++i) {
+			fieldEditors.get(i).load();
+		}
+	}
+	
+	public void propertyChange(PropertyChangeEvent event) {
+		// allow superclass to handle as well
+		super.propertyChange(event);
+
+		if (event.getSource() instanceof StringFieldEditor) {
+			StringFieldEditor f = (StringFieldEditor)event.getSource();
+			cfg.setOption(f.getPreferenceName(), f.getStringValue());
+		} else if (event.getSource() instanceof BooleanFieldEditor) {
+			BooleanFieldEditor b = (BooleanFieldEditor)event.getSource();
+			cfg.setOption(b.getPreferenceName(), Boolean.toString(b.getBooleanValue()));
+		}
+	}
+	
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePrefStore.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePrefStore.java
new file mode 100644
index 0000000..6c3c667
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePrefStore.java
@@ -0,0 +1,283 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import org.eclipse.core.runtime.ListenerList;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IAConfiguration;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IConfigureOption;
+
+/**
+ * @author jjohnstn
+ *
+ */
+public class AutotoolsConfigurePrefStore implements IPreferenceStore {
+
+	public final static String EMPTY_STRING = new String();
+	public final static String ALL_OPTIONS_ID = EMPTY_STRING;
+	
+	private static AutotoolsConfigurePrefStore instance = null;
+	private ToolListElement selectedElement;
+	private IAConfiguration cfg;
+	private ListenerList listenerList;
+	private boolean isdirty;
+
+	private AutotoolsConfigurePrefStore() {
+		// private constructor
+	}
+	
+	public static AutotoolsConfigurePrefStore getInstance() {
+		if (instance == null)
+			instance = new AutotoolsConfigurePrefStore();
+		return instance;
+	}
+	
+	public void setSelection(IAConfiguration cfg, ToolListElement element) {
+		this.cfg = cfg;
+		selectedElement = element;
+	}
+	
+	/* (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jface.preference.IPreferenceStore#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener)
+	 */
+	public void addPropertyChangeListener(IPropertyChangeListener listener) {
+		listenerList.add(listener);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#contains(java.lang.String)
+	 */
+	public boolean contains(String name) {
+		return cfg.getOption(name) != null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#firePropertyChangeEvent(java.lang.String, java.lang.Object, java.lang.Object)
+	 */
+	public void firePropertyChangeEvent(String name, Object oldValue,
+			Object newValue) {
+		Object[] listeners = listenerList.getListeners();
+		if (listeners.length > 0 && (oldValue == null || !oldValue.equals(newValue))) 
+		{
+			PropertyChangeEvent pe = new PropertyChangeEvent(this, name, oldValue, newValue);
+			for (int i = 0; i < listeners.length; ++i) 
+			{
+				IPropertyChangeListener l = (IPropertyChangeListener)listeners[i];
+				l.propertyChange( pe );
+			}
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#getBoolean(java.lang.String)
+	 */
+	public boolean getBoolean(String name) {
+		IConfigureOption option = cfg.getOption(name);
+		if (option != null && option.getType() == IConfigureOption.BIN) {
+			return Boolean.parseBoolean(option.getValue());
+		}
+		// otherwise punt
+		return getDefaultBoolean(name);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultBoolean(java.lang.String)
+	 */
+	public boolean getDefaultBoolean(String name) {
+		return false;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultDouble(java.lang.String)
+	 */
+	public double getDefaultDouble(String name) {
+		return 0;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultFloat(java.lang.String)
+	 */
+	public float getDefaultFloat(String name) {
+		return 0;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultInt(java.lang.String)
+	 */
+	public int getDefaultInt(String name) {
+		return 0;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultLong(java.lang.String)
+	 */
+	public long getDefaultLong(String name) {
+		return 0;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultString(java.lang.String)
+	 */
+	public String getDefaultString(String name) {
+		return EMPTY_STRING;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#getDouble(java.lang.String)
+	 */
+	public double getDouble(String name) {
+		return 0;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#getFloat(java.lang.String)
+	 */
+	public float getFloat(String name) {
+		return 0;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#getInt(java.lang.String)
+	 */
+	public int getInt(String name) {
+		return 0;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#getLong(java.lang.String)
+	 */
+	public long getLong(String name) {
+		return 0;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#getString(java.lang.String)
+	 */
+	public String getString(String name) {
+		if (name.equals(ALL_OPTIONS_ID) && selectedElement.getType() == IConfigureOption.TOOL) {
+			return cfg.getToolParameters(selectedElement.getName());
+		}
+		IConfigureOption option = cfg.getOption(name);
+		if (option != null) {
+			return option.getValue();
+		}
+		// otherwise punt
+		return getDefaultString(name);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#isDefault(java.lang.String)
+	 */
+	public boolean isDefault(String name) {
+		return false;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#needsSaving()
+	 */
+	public boolean needsSaving() {
+		return isdirty;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#putValue(java.lang.String, java.lang.String)
+	 */
+	public void putValue(String name, String value) {
+		setValue(name, value);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener)
+	 */
+	public void removePropertyChangeListener(IPropertyChangeListener listener) {
+		listenerList.remove(listener);
+	}
+
+	protected void setDirty(boolean isdirty) {
+		this.isdirty = isdirty;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, double)
+	 */
+	public void setDefault(String name, double value) {}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, float)
+	 */
+	public void setDefault(String name, float value) {}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, int)
+	 */
+	public void setDefault(String name, int value) {}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, long)
+	 */
+	public void setDefault(String name, long value) {}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, java.lang.String)
+	 */
+	public void setDefault(String name, String defaultObject) {}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, boolean)
+	 */
+	public void setDefault(String name, boolean value) {}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#setToDefault(java.lang.String)
+	 */
+	public void setToDefault(String name) {}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, double)
+	 */
+	public void setValue(String name, double value) {}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, float)
+	 */
+	public void setValue(String name, float value) {}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, int)
+	 */
+	public void setValue(String name, int value) {}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, long)
+	 */
+	public void setValue(String name, long value) {}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, java.lang.String)
+	 */
+	public void setValue(String name, String value) {
+		IConfigureOption option = cfg.getOption(name);
+		if (option != null)
+			option.setValue(value);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, boolean)
+	 */
+	public void setValue(String name, boolean value) {
+		IConfigureOption option = cfg.getOption(name);
+		if (option != null)
+			option.setValue(Boolean.toString(value));
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyPage.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyPage.java
new file mode 100644
index 0000000..301a1d0
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyPage.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
+import org.eclipse.cdt.core.settings.model.extension.CConfigurationData;
+import org.eclipse.cdt.ui.newui.AbstractPage;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsConfigurationManager;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IAConfiguration;
+
+public class AutotoolsConfigurePropertyPage extends AbstractPage {
+
+	private ICConfigurationDescription cfgd;
+	
+	protected boolean isSingle() {
+		return true;
+	}
+	
+	/**
+	 * Default constructor
+	 */
+	public AutotoolsConfigurePropertyPage() {
+		super();
+	}
+
+	public ICConfigurationDescription getCfgd() {
+		return cfgd;
+	}
+	
+	public void getAllConfigurationData() {
+		ICConfigurationDescription[] cfgds = getCfgsEditable();
+		for (int i = 0; i < cfgds.length; ++i) {
+			@SuppressWarnings("unused")
+			// Following will trigger an option value handler check which will
+			// clone a configuration if necessary
+			CConfigurationData data = cfgds[i].getConfigurationData();
+		}
+	}
+	
+	public IAConfiguration getConfiguration(ICConfigurationDescription cfgd) {
+		IAConfiguration acfg = AutotoolsConfigurationManager.getInstance().getTmpConfiguration(getProject(), cfgd);
+		return acfg;
+	}
+	
+	protected void cfgChanged(ICConfigurationDescription _cfgd) {
+		cfgd = _cfgd;
+		// Let super update all pages
+		super.cfgChanged(_cfgd);
+	}
+}
+
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyTab.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyTab.java
new file mode 100644
index 0000000..06a3c74
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsConfigurePropertyTab.java
@@ -0,0 +1,390 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+
+import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
+import org.eclipse.cdt.core.settings.model.ICResourceDescription;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IMultiConfiguration;
+import org.eclipse.cdt.ui.newui.AbstractPage;
+import org.eclipse.cdt.ui.newui.PageLayout;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.jface.preference.IPreferencePageContainer;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsConfigurationManager;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IAConfiguration;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IConfigureOption;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.AbstractAutotoolsCPropertyTab;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.custom.ScrolledComposite;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.ScrollBar;
+
+public class AutotoolsConfigurePropertyTab extends AbstractAutotoolsCPropertyTab implements IPreferencePageContainer {
+
+	private TreeViewer fTree;
+	private SashForm sashForm;
+	private Composite settingsPageContainer;
+	private AutotoolsConfigurePrefStore settingsStore;
+	private AbstractConfigurePropertyOptionsPage currentSettingsPage;
+	private ScrolledComposite containerSC;
+	private ToolListContentProvider listprovider;
+	private ToolListElement selectedElement;
+	private ICConfigurationDescription icfgd;
+
+	private Map<String, List<AbstractConfigurePropertyOptionsPage>> configToPageListMap;
+
+	private IProject getProject() {
+		return page.getProject();
+	}
+	
+	public boolean canBeVisible() {
+		if (page.isForProject() || page.isForPrefs()) {
+			return true;
+		}
+		return false;
+	}
+
+	public IAConfiguration getAutotoolsCfg() {
+		AutotoolsConfigurePropertyPage ap = (AutotoolsConfigurePropertyPage)page;
+		// We call getConfigurationData() to get the name because if the configuration has been renamed,
+		// it will cause the option value handler to clone the IAConfiguration
+		return ap.getConfiguration(icfgd);
+	}
+
+	private void syncClones() {
+		AutotoolsConfigurePropertyPage ap = (AutotoolsConfigurePropertyPage)page;
+		// We call getConfigurationData() to get the name because if the configuration has been renamed,
+		// it will cause the option value handler to clone the IAConfiguration
+		ap.getAllConfigurationData();
+	}
+	
+	public IPreferenceStore getPreferenceStore() {
+		return settingsStore;
+	}
+	
+	public void createControls(Composite parent) {
+		AutotoolsConfigurationManager.getInstance().clearTmpConfigurations(getProject());
+		syncClones();
+		
+		super.createControls(parent);
+		Composite composite= usercomp;
+		
+		settingsStore = AutotoolsConfigurePrefStore.getInstance();
+		configToPageListMap = new HashMap<String, List<AbstractConfigurePropertyOptionsPage>>();
+		
+		// assume parent page uses griddata
+		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_FILL | GridData.FILL_HORIZONTAL
+				| GridData.FILL_VERTICAL);
+		composite.setLayoutData(gd);
+		GridLayout layout= new GridLayout();
+//		layout.numColumns= 2;
+		//PixelConverter pc= new PixelConverter(composite);
+		//layout.verticalSpacing= pc.convertHeightInCharsToPixels(1) / 2;
+		composite.setLayout(layout);
+		
+		// Create the sash form
+		sashForm = new SashForm(usercomp, SWT.NONE);
+		sashForm.setOrientation(SWT.HORIZONTAL);
+		sashForm.setLayoutData(new GridData(GridData.FILL_BOTH));
+		
+		layout = new GridLayout(2, true);
+		layout.marginHeight = 5;
+		sashForm.setLayout(layout);
+		createSelectionArea(sashForm);
+		createEditArea(sashForm);
+
+//		usercomp.addControlListener(new ControlAdapter() {
+//			@Override
+//			public void controlResized(ControlEvent e) {
+//				specificResize();
+//			}});
+		
+	}
+
+//	private void specificResize() {
+//		Point p1 = fTree.getTree().computeSize(-1, -1);
+//		Point p2 = fTree.getTree().getSize();
+//		Point p3 = usercomp.getSize();
+//		p1.x += calcExtra();
+//		if (p3.x >= p1.x && (p1.x < p2.x || (p2.x * 2 < p3.x))) {
+//			fTree.getTree().setSize(p1.x , p2.y);
+//			sashForm.setWeights(new int[] {p1.x, (p3.x - p1.x)});
+//		} 
+//	}
+//
+//	private int calcExtra() {
+//		int x = fTree.getTree().getBorderWidth() * 2;
+//		ScrollBar sb = fTree.getTree().getVerticalBar();
+//		if (sb != null) x += sb.getSize().x;
+//		return x;
+//	}
+	
+	protected void createSelectionArea (Composite parent) {
+		fTree = new TreeViewer(parent, SWT.SINGLE|SWT.H_SCROLL|SWT.V_SCROLL|SWT.BORDER);
+		fTree.addSelectionChangedListener(new ISelectionChangedListener() {
+			public void selectionChanged(SelectionChangedEvent event) {
+				handleOptionSelection();
+			}});
+		fTree.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+		// Create a temporary default AutotoolsConfiguration to use for label info
+		IAConfiguration tmp = AutotoolsConfigurationManager.getInstance().createDefaultConfiguration(getProject(), "");
+		fTree.setLabelProvider(new ToolListLabelProvider(tmp));
+	}
+
+	protected void createEditArea(Composite parent) {
+		containerSC = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
+		containerSC.setExpandHorizontal(true);
+		containerSC.setExpandVertical(true);
+		
+		// Add a container for the build settings page
+		settingsPageContainer = new Composite(containerSC, SWT.NONE);
+		settingsPageContainer.setLayout(new PageLayout());
+
+		containerSC.setContent(settingsPageContainer);
+//		containerSC.setMinSize(settingsPageContainer.computeSize(SWT.DEFAULT, SWT.DEFAULT));
+		settingsPageContainer.layout();
+	}
+	
+	protected void setValues() {
+		/*
+		 *  This method updates the context of the build property pages
+		 *   - Which configuration/resource configuration is selected
+		 *   - Which tool/option category is selected
+		 *    
+		 *  It is called:
+		 *   - When a property page becomes visible
+		 *   - When the user changes the configuration selection
+		 *   - When the user changes the "exclude" setting for a resource
+		 */
+		
+		
+		IConfiguration icfg = getCfg(icfgd.getConfiguration());
+		if (icfg instanceof IMultiConfiguration) {
+			fTree.setInput(null);
+			fTree.getControl().setEnabled(false);
+			currentSettingsPage.setVisible(false);
+			return;
+		}
+
+		IAConfiguration currCfg = getAutotoolsCfg();
+		
+		//  Create the Tree Viewer content provider if first time
+		if (listprovider == null) {
+			listprovider = new ToolListContentProvider();
+			fTree.setContentProvider(listprovider);
+		}
+
+		//  Update the selected configuration and the Tree Viewer
+		ToolListElement[] newElements;
+		
+		fTree.setInput(currCfg);
+		fTree.getControl().setEnabled(true);
+		newElements = (ToolListElement[])listprovider.getElements(currCfg);
+		fTree.expandAll();
+		
+		selectedElement = newElements[0];
+		fTree.setSelection(new StructuredSelection(selectedElement), true);
+		
+//		//  Determine what the selection in the tree should be
+//		//  If the saved selection is not null, try to match the saved selection
+//		//  with an object in the new element list.
+//		//  Otherwise, select the first tool in the tree
+//		Object primaryObject = null;
+//		if (selectedElement != null) {
+//			selectedElement = matchSelectionElement(selectedElement, newElements);
+//		}
+//			
+//		if (selectedElement == null) {
+//			selectedElement = (newElements != null && newElements.length > 0 ? newElements[0] : null);
+//		}
+//			
+//		if (selectedElement != null) {
+//			primaryObject = selectedElement.getTool();
+//			if (primaryObject == null) {
+//				primaryObject = selectedElement.getOptionCategory();
+//			}
+//			if (primaryObject != null) {
+//				if (primaryObject instanceof IOptionCategory) {
+//					((ToolSettingsPrefStore)settingsStore).setSelection(getResDesc(), selectedElement, (IOptionCategory)primaryObject);
+//				}
+//				optionList.setSelection(new StructuredSelection(selectedElement), true);
+//			}
+//		}
+//		specificResize();
+	}
+
+	private void handleOptionSelection() {
+		// Get the selection from the tree list
+		if (fTree == null) return;
+		IStructuredSelection selection = (IStructuredSelection) fTree.getSelection();
+		ToolListElement element = (ToolListElement)selection.getFirstElement();
+		if (element != null) {
+			displayPageForElement(element);
+		}
+
+		ScrollBar sb = containerSC.getHorizontalBar();
+		if (sb != null && sb.isVisible()) {
+			settingsPageContainer.pack(true);
+			containerSC.setMinSize(settingsPageContainer.getSize());
+			((AbstractPage)page).resize();
+		}
+	}
+
+	private void displayPageForElement(ToolListElement element) {
+		selectedElement = element;
+		settingsStore.setSelection(getAutotoolsCfg(), selectedElement);
+		
+		AbstractConfigurePropertyOptionsPage oldPage = currentSettingsPage;
+		currentSettingsPage = null;
+
+		// Create a new settings page if necessary
+		List<AbstractConfigurePropertyOptionsPage> pages = getPagesForConfig();
+		ListIterator<AbstractConfigurePropertyOptionsPage> iter = pages.listIterator();
+		
+		while (iter.hasNext()) {
+			AbstractConfigurePropertyOptionsPage page = iter.next();
+			if (page.getName().equals(element.getName())) {
+				currentSettingsPage = page;
+				break;
+			}
+		}
+		if (currentSettingsPage == null) {
+			if (element.getType() == IConfigureOption.TOOL) {
+				currentSettingsPage = new AutotoolsToolPropertyOptionPage(
+					element, getAutotoolsCfg());
+			}
+			else {
+				currentSettingsPage = new AutotoolsCategoryPropertyOptionPage(
+						element, getAutotoolsCfg());
+			}
+			pages.add(currentSettingsPage);
+			currentSettingsPage.setContainer(this);
+			if (currentSettingsPage.getControl() == null) {
+				currentSettingsPage.createControl(settingsPageContainer);
+			}
+		}
+		
+		// Make all the other pages invisible
+		Control[] children = settingsPageContainer.getChildren();
+		Control currentControl = currentSettingsPage.getControl();
+		for (int i = 0; i < children.length; i++) {
+			if (children[i] != currentControl)
+				children[i].setVisible(false);
+		}
+		currentSettingsPage.setVisible(true);
+		currentSettingsPage.updateFields();
+		
+		if (oldPage != null  && oldPage != currentSettingsPage)
+			oldPage.setVisible(false);
+
+		// Set the size of the scrolled area
+		containerSC.setMinSize(currentSettingsPage.computeSize());
+		settingsPageContainer.layout();
+	
+	}
+
+	/* (non-Javadoc)
+	 * Answers the list of settings pages for the selected configuration 
+	 */
+	private List<AbstractConfigurePropertyOptionsPage> getPagesForConfig() {
+		if (getCfg() == null) return null;
+		List<AbstractConfigurePropertyOptionsPage> pages = configToPageListMap.get(getCfg().getName());
+		if (pages == null) {
+			pages = new ArrayList<AbstractConfigurePropertyOptionsPage>();
+			configToPageListMap.put(getCfg().getName(), pages);	
+		}
+		return pages;
+	}
+	
+	/**
+	 * Returns the "dirty" state
+	 */
+	public boolean isDirty() {
+		// Check each settings page
+		List<AbstractConfigurePropertyOptionsPage> pages = getPagesForConfig();
+		// Make sure we have something to work on
+		if (pages == null) {
+			// Nothing to do
+			return false;
+		}
+		ListIterator<AbstractConfigurePropertyOptionsPage> iter = pages.listIterator();
+		while (iter.hasNext()) {
+			AbstractConfigurePropertyOptionsPage page = iter.next();
+			if (page == null) continue;
+			if (page.isDirty()) return true;
+		}
+		return false;
+	}
+	
+	protected void performOK() {
+		ICConfigurationDescription[] cfgs = page.getCfgsEditable();
+		AutotoolsConfigurePropertyPage ap = (AutotoolsConfigurePropertyPage)page;
+		Map<String, IAConfiguration> cfgList = new HashMap<String, IAConfiguration>();
+		for (int i = 0; i < cfgs.length; ++i) {
+			ICConfigurationDescription cd = cfgs[i];
+			IAConfiguration acfg = ap.getConfiguration(cd);
+			cfgList.put(cd.getId(), acfg);
+		}
+		IProject project = getProject();
+		AutotoolsConfigurationManager.getInstance().replaceProjectConfigurations(project, cfgList, cfgs);
+		AutotoolsConfigurationManager.getInstance().clearTmpConfigurations(project);
+	}
+	
+	protected void performCancel() {
+		AutotoolsConfigurationManager.getInstance().clearTmpConfigurations(getProject());
+	}
+	
+	protected void performApply(ICResourceDescription src, ICResourceDescription dst) {
+		IProject project = getProject();
+		ICConfigurationDescription[] cfgs = page.getCfgsEditable();
+		// Apply all changes to existing saved configurations and new configurations, but do not perform
+		// deletions.
+		AutotoolsConfigurationManager.getInstance().applyConfigs(project.getName(), cfgs);
+	}
+	
+	protected void performDefaults() {
+		IAConfiguration cfg = getAutotoolsCfg();
+		cfg.setDefaultOptions();
+		setValues();
+	}
+	
+	protected void updateData(ICResourceDescription rd) {
+		if (rd == null) return;
+		icfgd = rd.getConfiguration();
+		setValues();
+	}
+	
+	public void setVisible (boolean b) {
+		super.setVisible(b);
+	}
+
+	// IPreferencePageContainer methods
+	@Override
+	public void updateButtons() {}
+	public void updateMessage() {}
+	public void updateTitle() {}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsEditorPropertyTab.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsEditorPropertyTab.java
new file mode 100644
index 0000000..26d0443
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsEditorPropertyTab.java
@@ -0,0 +1,276 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import org.eclipse.cdt.core.settings.model.ICResourceDescription;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.AbstractAutotoolsCPropertyTab;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutotoolsEditorPreferenceConstants;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+
+
+public class AutotoolsEditorPropertyTab extends AbstractAutotoolsCPropertyTab {
+
+	protected Combo fACVersionCombo;
+	protected Combo fAMVersionCombo;
+	IProject project;
+
+//	private class ACVersionSelectionListener implements SelectionListener {
+//		ICPropertyProvider p;
+//		public ACVersionSelectionListener(ICPropertyProvider p) {
+//			this.p = p;
+//		}
+//		
+//		public void widgetSelected(SelectionEvent e) {
+//			int index = fACVersionCombo.getSelectionIndex();
+//			try {
+//				AutotoolsEditorPropertyTab.getProject(p).setPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_VERSION, fACVersionCombo.getItem(index));
+//			} catch (CoreException ce) {
+//				// FIXME: what can we do here?
+//			}
+//		}
+//
+//		public void widgetDefaultSelected(SelectionEvent e) {
+//			// do nothing
+//		}
+//	}
+//	
+//	private class AMVersionSelectionListener implements SelectionListener {
+//		ICPropertyProvider p;
+//		public AMVersionSelectionListener(ICPropertyProvider p) {
+//			this.p = p;
+//		}
+//		
+//		public void widgetSelected(SelectionEvent e) {
+//			int index = fAMVersionCombo.getSelectionIndex(); 
+//			try {
+//				AutotoolsEditorPropertyTab.getProject(p).setPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_VERSION, fAMVersionCombo.getItem(index));
+//			} catch (CoreException ce) {
+//				// FIXME: what can we do here?
+//			}
+//		}
+//
+//		public void widgetDefaultSelected(SelectionEvent e) {
+//			// do nothing
+//		}
+//	}
+	
+	private IProject getProject() {
+		return page.getProject();
+	}
+	
+	public boolean canBeVisible() {
+		return true;
+	}
+
+	public void createControls(Composite parent) {
+		// TODO Auto-generated method stub
+		super.createControls(parent);
+		Composite composite= usercomp;
+		
+		// assume parent page uses griddata
+		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_FILL);
+		composite.setLayoutData(gd);
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 2;
+		//PixelConverter pc= new PixelConverter(composite);
+		//layout.verticalSpacing= pc.convertHeightInCharsToPixels(1) / 2;
+		composite.setLayout(layout);
+		
+		project = getProject();
+		
+		/* check box for new editors */
+		fACVersionCombo= new Combo(composite, SWT.CHECK | SWT.DROP_DOWN | SWT.READ_ONLY);
+		fACVersionCombo.setItems(AutotoolsPropertyConstants.fACVersions);
+		fACVersionCombo.select(AutotoolsPropertyConstants.fACVersions.length - 1);
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+		fACVersionCombo.setLayoutData(gd);
+		
+		Label label= new Label(composite, SWT.LEFT);
+		label.setText(AutotoolsPropertyMessages.getString("ACEditor.autoconfVersion")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label.setLayoutData(gd);
+		
+		/* check box for new editors */
+		fAMVersionCombo= new Combo(composite, SWT.CHECK | SWT.DROP_DOWN | SWT.READ_ONLY);
+		fAMVersionCombo.setItems(AutotoolsPropertyConstants.fAMVersions);
+		fAMVersionCombo.select(AutotoolsPropertyConstants.fAMVersions.length - 1);
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+		fAMVersionCombo.setLayoutData(gd);
+		
+		Label label2= new Label(composite, SWT.LEFT);
+		label2.setText(AutotoolsPropertyMessages.getString("ACEditor.automakeVersion")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label2.setLayoutData(gd);
+
+		initialize();
+	}
+
+	public void performOK() {
+		String acVer = null;
+		String amVer = null;
+		boolean changed = false;
+		try {
+			acVer = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_VERSION);
+			amVer = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_VERSION);
+		} catch (CoreException e) {
+			acVer = "";
+			amVer = "";
+		}
+		int index = fACVersionCombo.getSelectionIndex();
+		String acVerSelected = fACVersionCombo.getItem(index);
+		if (!acVerSelected.equals(acVer)) {
+			changed = true;
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_VERSION, fACVersionCombo.getItem(index));
+			} catch (CoreException ce) {
+				// Not much we can do at this point
+			}
+		}
+
+		index = fAMVersionCombo.getSelectionIndex();
+		String amVerSelected = fAMVersionCombo.getItem(index);
+		if (!amVerSelected.equals(amVer)) {
+			changed = true;
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_VERSION, fAMVersionCombo.getItem(index));
+			} catch (CoreException ce) {
+				// Not much we can do here either
+			}
+		}
+
+		// Notify any Autoconf editors that are open for this project that macro versioning
+		// has changed.
+		if (changed)
+			AutotoolsPropertyManager.getDefault().notifyPropertyListeners(project, AutotoolsPropertyConstants.AUTOCONF_MACRO_VERSIONING);
+	}
+	
+	protected void performApply(ICResourceDescription src, ICResourceDescription dst) {
+		performOK();
+	}
+	
+	public void performDefaults() {
+		// For default Autoconf and Automake versions, use the setting from the
+		// Autotools preference dialog.
+		String version = AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION);
+		String[] items = fACVersionCombo.getItems();
+		// Try and find which list item matches the current preference stored and
+		// select it in the list.
+		int i;
+		for (i = 0; i < items.length; ++i) {
+			if (items[i].equals(version))
+				break;
+		}
+		if (i >= items.length)
+			i = items.length - 1;
+		fACVersionCombo.select(i);
+
+		version = AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION);
+		items = fAMVersionCombo.getItems();
+		// Try and find which list item matches the current preference stored and
+		// select it in the list
+		for (i = 0; i < items.length; ++i) {
+			if (items[i].equals(version))
+				break;
+		}
+		if (i >= items.length)
+			i = items.length - 1;
+		fAMVersionCombo.select(i);
+	}
+	
+	public void updateData(ICResourceDescription cfgd) {
+		// Nothing to do
+	}
+	
+	public void updateButtons() {
+		// Nothing to do
+	}
+
+	public void setVisible (boolean b) {
+		super.setVisible(b);
+	}
+	
+//	private IProject getProject(ICPropertyProvider provider) {
+//		Object element = provider.getElement();
+//		if (element != null) { 
+//			if (element instanceof IFile ||
+//				element instanceof IProject ||
+//				element instanceof IFolder)
+//				{
+//			IResource f = (IResource) element;
+//			return f.getProject();
+//				}
+//			else if (element instanceof ICProject)
+//				return ((ICProject)element).getProject();
+//		}
+//		return null;
+//	}
+
+	private void initialize() {
+		initializeACVersion();
+		initializeAMVersion();
+	}
+	
+	void initializeACVersion() {
+		String version = "";
+		try {
+			version = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_VERSION);
+			if (version == null)
+				version = AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION);
+		} catch (CoreException e) {
+			// do nothing
+		}
+		String[] items = fACVersionCombo.getItems();
+		// Try and find which list item matches the current preference stored and
+		// select it in the list.
+		int i;
+		for (i = 0; i < items.length; ++i) {
+			if (items[i].equals(version))
+				break;
+		}
+		if (i >= items.length)
+			i = items.length - 1;
+		fACVersionCombo.select(i);
+	}
+	
+	void initializeAMVersion() {
+		String version = "";
+		try {
+			version = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_VERSION);
+			if (version == null)
+				version = AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION);
+		} catch (CoreException e) {
+			// do nothing
+		}
+		String[] items = fAMVersionCombo.getItems();
+		// Try and find which list item matches the current preference stored and
+		// select it in the list.
+		int i;
+		for (i = 0; i < items.length; ++i) {
+			if (items[i].equals(version))
+				break;
+		}
+		if (i >= items.length)
+			i = items.length - 1;
+		fAMVersionCombo.select(i);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsGeneralPropertyPage.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsGeneralPropertyPage.java
new file mode 100644
index 0000000..b7f234d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsGeneralPropertyPage.java
@@ -0,0 +1,15 @@
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import org.eclipse.cdt.ui.newui.AbstractPage;
+
+public class AutotoolsGeneralPropertyPage extends AbstractPage {
+
+	@Override
+	protected boolean isSingle() {
+		return false;
+	}
+	
+	@Override
+	protected boolean showsConfig() { return false;	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsHeadPropertyPage.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsHeadPropertyPage.java
new file mode 100644
index 0000000..dfba7fc
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsHeadPropertyPage.java
@@ -0,0 +1,15 @@
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import org.eclipse.cdt.ui.newui.AbstractPage;
+
+public class AutotoolsHeadPropertyPage extends AbstractPage {
+
+	@Override
+	protected boolean isSingle() {
+		return true;
+	}
+
+	@Override
+	protected boolean showsConfig() { return false;	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsPropertyManager.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsPropertyManager.java
new file mode 100644
index 0000000..21f27d3
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsPropertyManager.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.ListenerList;
+
+public class AutotoolsPropertyManager implements IPropertyChangeManager {
+
+	private static AutotoolsPropertyManager fInstance;
+	private Map<IProject, ListenerList> projectList;
+	
+	private AutotoolsPropertyManager() {
+		projectList = new HashMap<IProject, ListenerList>();
+	}
+	
+	public static AutotoolsPropertyManager getDefault() {
+		if (fInstance == null)
+			fInstance = new AutotoolsPropertyManager();
+		return fInstance;
+	}
+	
+	public synchronized void addProjectPropertyListener(IProject project,
+			IProjectPropertyListener listener) {
+		ListenerList list = (ListenerList)projectList.get(project);
+		if (list == null) {
+			list = new ListenerList();
+			projectList.put(project, list);
+		}
+		list.add(listener);
+	}
+
+	public synchronized void notifyPropertyListeners(IProject project, String property) {
+		ListenerList list = (ListenerList)projectList.get(project);
+		if (list != null) {
+			Object[] listeners = list.getListeners();
+			for (int i = 0; i < listeners.length; ++i) {
+				((IProjectPropertyListener)listeners[i]).handleProjectPropertyChanged(project, property);
+			}
+		}
+	}
+
+	public synchronized void removeProjectPropertyListener(IProject project, 
+			IProjectPropertyListener listener) {
+		ListenerList list = (ListenerList)projectList.get(project);
+		if (list != null)
+			list.remove(listener);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsPropertyMessages.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsPropertyMessages.java
new file mode 100644
index 0000000..44f2174
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsPropertyMessages.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+/**
+ * MakefilePreferencesMessages
+ */
+public class AutotoolsPropertyMessages {
+
+	/**
+	 * 
+	 */
+	private AutotoolsPropertyMessages() {
+	}
+
+	private static final String BUNDLE_NAME = AutotoolsPropertyMessages.class.getName();
+
+	public static String getString(String key) {
+		try {
+			return ResourceBundle.getBundle(BUNDLE_NAME).getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		} catch (NullPointerException e) {
+			return '#' + key + '#';
+		}
+	}	
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties
new file mode 100644
index 0000000..a9c6125
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties
@@ -0,0 +1,44 @@
+###############################################################################
+# Copyright (c) 2007, 2009 Red Hat Inc. and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Red Hat Inc. - initial API and implementation
+###############################################################################
+
+Edit.name=Editors
+Build.name=Build
+
+Autotools.aclocalPath=aclocal
+Autotools.aclocalPath.tooltip=Specify desired aclocal to use for project
+Autotools.automakePath=automake
+Autotools.automakePath.tooltip=Specify desired automake to use for project
+Autotools.autoconfPath=autoconf
+Autotools.autoconfPath.tooltip=Specify desired autoconf to use for project
+Autotools.autoheaderPath=autoheader
+Autotools.autoheaderPath.tooltip=Specify desired autoheader to use for project
+Autotools.autoreconfPath=autoreconf
+Autotools.autoreconfPath.tooltip=Specify desired autoreconf to use for project
+Autotools.libtoolizePath=libtoolize
+Autotools.libtoolizePath.tooltip=Specify desired libtoolize to use for project
+
+ACEditor.version=&Version
+ACEditor.autoconfVersion=Version of Autoconf to use for syntax checking
+ACEditor.automakeVersion=Version of Automake to use for syntax checking
+
+ScannerMakeW.label=Use make -n -w per file to generate scanner info
+ScannerMakeW.tooltip=Use this option only if necessary to get correct include path
+
+CleanBehavior.title=Clean Build Behavior
+
+CleanDelete.label=Delete build directory on "clean" operation
+CleanMake.label=Use make target to clean
+CleanMakeTarget.label=Make target:
+CleanMakeTarget.default=distclean
+CleanMakeTarget.tooltip=Specify a top-level make target to clean build directory
+
+AutoBuildName.label=Automatically generate build directory names for additional configurations
+AutoBuildName.tooltip=When a configuration other than the first configuration is created, generate a unique build directory using the configuration name.
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsToolPropertyOptionPage.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsToolPropertyOptionPage.java
new file mode 100644
index 0000000..c7f5048
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsToolPropertyOptionPage.java
@@ -0,0 +1,142 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import org.eclipse.cdt.ui.newui.AbstractCPropertyTab;
+import org.eclipse.cdt.ui.newui.MultiLineTextFieldEditor;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.preference.FieldEditor;
+import org.eclipse.jface.preference.StringFieldEditor;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.ConfigureMessages;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IAConfiguration;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.FontMetrics;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+
+public class AutotoolsToolPropertyOptionPage extends
+		AbstractConfigurePropertyOptionsPage {
+
+	private ToolListElement element;
+	private String toolName = "";
+	private IAConfiguration cfg;
+	//  Label class for a preference page.
+	class LabelFieldEditor extends FieldEditor {
+		private String fTitle;
+		private Label fTitleLabel;
+
+		public LabelFieldEditor( Composite parent, String title ) {
+			fTitle = title;
+			this.createControl( parent );
+		}
+
+		protected void adjustForNumColumns( int numColumns ) {
+			((GridData)fTitleLabel.getLayoutData()).horizontalSpan = 2;
+		}
+
+		protected void doFillIntoGrid( Composite parent, int numColumns ) {
+			fTitleLabel = new Label( parent, SWT.WRAP );
+			fTitleLabel.setText( fTitle );
+			GridData gd = new GridData();
+			gd.verticalAlignment = SWT.TOP;
+			gd.grabExcessHorizontalSpace = false;
+			gd.horizontalSpan = 2;
+			fTitleLabel.setLayoutData( gd );
+		}
+
+		public int getNumberOfControls() {	return 1; }
+		/**
+		 * The label field editor is only used to present a text label on a preference page.
+		 */
+		protected void doLoad() {}
+		protected void doLoadDefault() {}
+		protected void doStore() {}
+	}
+	
+	public AutotoolsToolPropertyOptionPage(ToolListElement element, IAConfiguration cfg) {
+ 		super(element.getName());
+ 		this.element = element;
+ 		this.toolName = element.getName();
+ 		this.cfg = cfg;
+	}
+
+	public String getName() {
+		return super.getName();
+	}
+
+	public ToolListElement getElement() {
+		return element;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors()
+	 */
+	protected void createFieldEditors() {
+		super.createFieldEditors();
+		// Add a string editor to edit the tool command
+		Composite parent = getFieldEditorParent();
+		FontMetrics fm = AbstractCPropertyTab.getFontMetrics(parent);
+		commandStringField = new StringFieldEditor(toolName,
+				ConfigureMessages.getString(COMMAND),
+				parent);
+		commandStringField.setEmptyStringAllowed(false);
+		GridData gd = ((GridData)commandStringField.getTextControl(parent).getLayoutData());
+		gd.grabExcessHorizontalSpace = true;
+		gd.minimumWidth = Dialog.convertWidthInCharsToPixels(fm, 3);
+		addField(commandStringField);
+		// Add a field editor that displays overall build options
+		Composite par = getFieldEditorParent();
+		allOptionFieldEditor = new MultiLineTextFieldEditor(AutotoolsConfigurePrefStore.ALL_OPTIONS_ID,
+				ConfigureMessages.getString(ALL_OPTIONS), par);
+		allOptionFieldEditor.getTextControl(par).setEditable(false);
+//		gd = ((GridData)allOptionFieldEditor.getTextControl().getLayoutData());
+		gd.grabExcessHorizontalSpace = true;
+		gd.minimumWidth = Dialog.convertWidthInCharsToPixels(fm, 20);
+		addField(allOptionFieldEditor);
+	}
+
+	protected FieldEditor createLabelEditor( Composite parent, String title ) {
+		return new LabelFieldEditor( parent, title );
+	}
+
+	// field editor that displays all the build options for a particular tool
+	private MultiLineTextFieldEditor allOptionFieldEditor;
+	//tool command field
+	private StringFieldEditor commandStringField;
+	// all build options field editor label
+	private static final String ALL_OPTIONS = "Tool.allopts"; //$NON-NLS-1$
+	// Field editor label for tool command
+	private static final String COMMAND = "Tool.command"; //$NON-NLS-1$
+
+	/**
+	 * Update the field editor that displays all the build options
+	 */
+	public void updateFields() {
+		allOptionFieldEditor.load();
+	}
+	
+	public void setValues(){
+		commandStringField.load();
+		updateFields();
+	}
+	
+	public void propertyChange(PropertyChangeEvent event) {
+		// allow superclass to handle as well
+		super.propertyChange(event);
+
+		if(event.getSource() == commandStringField){
+			cfg.setOption(toolName, commandStringField.getStringValue());
+			updateFields();
+		}
+	}
+	
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsToolsPropertyTab.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsToolsPropertyTab.java
new file mode 100644
index 0000000..2d8268e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/AutotoolsToolsPropertyTab.java
@@ -0,0 +1,346 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import org.eclipse.cdt.core.settings.model.ICResourceDescription;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsConfiguration;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.AbstractAutotoolsCPropertyTab;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class AutotoolsToolsPropertyTab extends AbstractAutotoolsCPropertyTab {
+
+	public static final String DEFAULT_ACLOCAL = "aclocal"; // $NON-NLS-1$
+	public static final String DEFAULT_AUTOMAKE = "automake"; // $NON-NLS-1$
+	public static final String DEFAULT_AUTOCONF = "autoconf"; // $NON-NLS-1$
+	public static final String DEFAULT_AUTOHEADER = "autoheader"; // $NON-NLS-1$
+	public static final String DEFAULT_AUTORECONF = "autoreconf"; // $NON-NLS-1$
+	public static final String DEFAULT_LIBTOOLIZE = "libtoolize"; // $NON-NLS-1$
+	
+	protected Text fAclocalPath;
+	protected Text fAutomakePath;
+	protected Text fAutoconfPath;
+	protected Text fAutoheaderPath;
+	protected Text fAutoreconfPath;
+	protected Text fLibtoolizePath;
+	private IProject project;
+
+	
+	private IProject getProject() {
+		return page.getProject();
+	}
+	
+	public boolean canBeVisible() {
+		return true;
+	}
+
+	public void cfgChanged(AutotoolsConfiguration cfg) {
+		// Nothing to do
+	}
+	
+	public void createControls(Composite parent) {
+		// TODO Auto-generated method stub
+		super.createControls(parent);
+		Composite composite= usercomp;
+		
+		// assume parent page uses griddata
+		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_FILL | GridData.FILL_HORIZONTAL);
+		composite.setLayoutData(gd);
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 2;
+		//PixelConverter pc= new PixelConverter(composite);
+		//layout.verticalSpacing= pc.convertHeightInCharsToPixels(1) / 2;
+		composite.setLayout(layout);
+		
+		project = getProject();
+		
+		Label label= new Label(composite, SWT.LEFT);
+		label.setText(AutotoolsPropertyMessages.getString("Autotools.aclocalPath")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label.setLayoutData(gd);
+		
+		/* text window for aclocal path */
+		fAclocalPath = new Text(composite, SWT.BORDER | SWT.SINGLE);
+		fAclocalPath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.aclocalPath.tooltip")); // $NON-NLS-1$
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fAclocalPath.setLayoutData(gd);
+		
+		Label label2= new Label(composite, SWT.LEFT);
+		label2.setText(AutotoolsPropertyMessages.getString("Autotools.automakePath")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label2.setLayoutData(gd);
+		
+		/* text window for automake path */
+		fAutomakePath = new Text(composite, SWT.BORDER | SWT.SINGLE);
+		fAutomakePath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.automakePath.tooltip")); // $NON-NLS-1#
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fAutomakePath.setLayoutData(gd);
+		
+		Label label3 = new Label(composite, SWT.LEFT);
+		label3.setText(AutotoolsPropertyMessages.getString("Autotools.autoconfPath")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label3.setLayoutData(gd);
+		
+		/* text window for autoconf path */
+		fAutoconfPath = new Text(composite, SWT.BORDER | SWT.SINGLE);
+		fAutoconfPath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.autoconfPath.tooltip")); // $NON-NLS-1$
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fAutoconfPath.setLayoutData(gd);
+
+		Label label4= new Label(composite, SWT.LEFT);
+		label4.setText(AutotoolsPropertyMessages.getString("Autotools.autoheaderPath")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label4.setLayoutData(gd);
+		
+		/* text window for autoheader path */
+		fAutoheaderPath = new Text(composite, SWT.BORDER | SWT.SINGLE);
+		fAutoheaderPath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.autoheaderPath.tooltip")); // $NON-NLS-1$
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fAutoheaderPath.setLayoutData(gd);
+
+		Label label5= new Label(composite, SWT.LEFT);
+		label5.setText(AutotoolsPropertyMessages.getString("Autotools.autoreconfPath")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label5.setLayoutData(gd);
+		
+		/* text window for autoreconf path */
+		fAutoreconfPath = new Text(composite, SWT.BORDER | SWT.SINGLE);
+		fAutoreconfPath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.autoreconfPath.tooltip")); // $NON-NLS-1$
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fAutoreconfPath.setLayoutData(gd);
+
+		Label label6= new Label(composite, SWT.LEFT);
+		label6.setText(AutotoolsPropertyMessages.getString("Autotools.libtoolizePath")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label6.setLayoutData(gd);
+		
+		/* text window for libtoolize path */
+		fLibtoolizePath = new Text(composite, SWT.BORDER | SWT.SINGLE);
+		fLibtoolizePath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.libtoolizePath.tooltip")); // $NON-NLS-1$
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fLibtoolizePath.setLayoutData(gd);
+
+		initialize();
+	}
+
+	public void performOK() {
+		String aclocalPath = null;
+		String automakePath = null;
+		String autoconfPath = null;
+		String autoheaderPath = null;
+		String autoreconfPath = null;
+		String libtoolizePath = null;
+		try {
+			aclocalPath = project.getPersistentProperty(AutotoolsPropertyConstants.ACLOCAL_TOOL);
+		} catch (CoreException e1) {
+			aclocalPath = DEFAULT_ACLOCAL;
+		}
+
+		String newAclocalPath = fAclocalPath.getText().trim();
+		if (aclocalPath == null || !newAclocalPath.equals(aclocalPath)) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.ACLOCAL_TOOL, newAclocalPath);
+			} catch (CoreException e1) {
+				// Not much we can do at this point
+			}
+		}
+		
+		try {
+			automakePath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_TOOL);
+		} catch (CoreException e1) {
+			automakePath = DEFAULT_AUTOMAKE;
+		}
+
+		String newAutomakePath = fAutomakePath.getText().trim();
+		if (automakePath == null || !newAutomakePath.equals(automakePath)) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_TOOL, newAutomakePath);
+			} catch (CoreException e2) {
+				// Not much we can do at this point
+			}
+		}
+		
+		try {
+			autoconfPath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_TOOL);
+		} catch (CoreException e1) {
+			autoconfPath = DEFAULT_AUTOCONF;
+		}
+
+		String newAutoconfPath = fAutoconfPath.getText().trim();
+		if (autoconfPath == null || !newAutoconfPath.equals(autoconfPath)) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_TOOL, newAutoconfPath);
+			} catch (CoreException e2) {
+				// Not much we can do at this point
+			}
+		}
+
+		try {
+			autoheaderPath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOHEADER_TOOL);
+		} catch (CoreException e1) {
+			autoheaderPath = DEFAULT_AUTOHEADER;
+		}
+
+		String newAutoheaderPath = fAutoheaderPath.getText().trim();
+		if (autoheaderPath == null || !newAutoheaderPath.equals(autoheaderPath)) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTOHEADER_TOOL, newAutoheaderPath);
+			} catch (CoreException e2) {
+				// Not much we can do at this point
+			}
+		}
+
+		try {
+			autoreconfPath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTORECONF_TOOL);
+		} catch (CoreException e1) {
+			autoreconfPath = DEFAULT_AUTORECONF;
+		}
+
+		String newAutoreconfPath = fAutoreconfPath.getText().trim();
+		if (autoreconfPath == null || !newAutoreconfPath.equals(autoreconfPath)) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTORECONF_TOOL, newAutoreconfPath);
+			} catch (CoreException e2) {
+				// Not much we can do at this point
+			}
+		}
+	
+		try {
+			libtoolizePath = project.getPersistentProperty(AutotoolsPropertyConstants.LIBTOOLIZE_TOOL);
+		} catch (CoreException e1) {
+			libtoolizePath = DEFAULT_LIBTOOLIZE;
+		}
+
+		String newLibtoolizePath = fLibtoolizePath.getText().trim();
+		if (libtoolizePath == null || !newLibtoolizePath.equals(libtoolizePath)) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.LIBTOOLIZE_TOOL, newLibtoolizePath);
+			} catch (CoreException e2) {
+				// Not much we can do at this point
+			}
+		}
+	}
+	
+	protected void performApply(ICResourceDescription src, ICResourceDescription dst) {
+		performOK();
+	}
+	
+	public void performDefaults() {
+		// For default tool settings, simply default the base tool names
+		fAclocalPath.setText(DEFAULT_ACLOCAL);
+		fAutomakePath.setText(DEFAULT_AUTOMAKE);
+		fAutoconfPath.setText(DEFAULT_AUTOCONF);
+		fAutoheaderPath.setText(DEFAULT_AUTOHEADER);
+		fAutoreconfPath.setText(DEFAULT_AUTORECONF);
+		fLibtoolizePath.setText(DEFAULT_LIBTOOLIZE);
+	}
+	
+	public void updateData(ICResourceDescription cfgd) {
+		// Nothing to do
+	}
+	
+	public void updateButtons() {
+		// Nothing to do
+	}
+
+	public void setVisible (boolean b) {
+		super.setVisible(b);
+	}
+	
+	private void initialize() {
+		String aclocalPath = null;
+		String automakePath = null;
+		String autoconfPath = null;
+		String autoheaderPath = null;
+		String autoreconfPath = null;
+		String libtoolizePath = null;
+		
+		try {
+			aclocalPath = project.getPersistentProperty(AutotoolsPropertyConstants.ACLOCAL_TOOL);
+		} catch (CoreException e1) {
+			// do nothing
+		}
+		
+		if (aclocalPath == null)
+			aclocalPath = DEFAULT_ACLOCAL;
+		
+		fAclocalPath.setText(aclocalPath);
+		
+		try {
+			automakePath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_TOOL);
+		} catch (CoreException e1) {
+			// do nothing
+		}
+		
+		if (automakePath == null)
+			automakePath = DEFAULT_AUTOMAKE;
+		
+		fAutomakePath.setText(automakePath);
+		
+		try {
+			autoconfPath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_TOOL);
+		} catch (CoreException e1) {
+			// do nothing
+		}
+		
+		if (autoconfPath == null)
+			autoconfPath = DEFAULT_AUTOCONF;
+		
+		fAutoconfPath.setText(autoconfPath);
+
+		try {
+			autoheaderPath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOHEADER_TOOL);
+		} catch (CoreException e1) {
+			// do nothing
+		}
+		
+		if (autoheaderPath == null)
+			autoheaderPath = DEFAULT_AUTOHEADER;
+		
+		fAutoheaderPath.setText(autoheaderPath);
+
+		try {
+			autoreconfPath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTORECONF_TOOL);
+		} catch (CoreException e1) {
+			// do nothing
+		}
+		
+		if (autoreconfPath == null)
+			autoreconfPath = DEFAULT_AUTORECONF;
+		
+		fAutoreconfPath.setText(autoreconfPath);
+
+		try {
+			libtoolizePath = project.getPersistentProperty(AutotoolsPropertyConstants.LIBTOOLIZE_TOOL);
+		} catch (CoreException e1) {
+			// do nothing
+		}
+		
+		if (libtoolizePath == null)
+			libtoolizePath = DEFAULT_LIBTOOLIZE;
+		
+		fLibtoolizePath.setText(libtoolizePath);
+	}
+	
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/IProjectPropertyListener.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/IProjectPropertyListener.java
new file mode 100644
index 0000000..133b46e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/IProjectPropertyListener.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import org.eclipse.core.resources.IProject;
+
+public interface IProjectPropertyListener {
+
+	/**
+	 * Handler for property changes
+	 * 
+	 * @param project the project to which the property changed
+	 * @param property the name of the property changed
+	 */
+	void handleProjectPropertyChanged(IProject project, String property);
+	
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/IPropertyChangeManager.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/IPropertyChangeManager.java
new file mode 100644
index 0000000..5ae066b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/IPropertyChangeManager.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import org.eclipse.core.resources.IProject;
+
+public interface IPropertyChangeManager {
+
+	/**
+	 * Add a project property listener for given project.
+	 * 
+	 * @param project the project to which the listener is interested
+	 * @param listener the listener to notify
+	 */
+	void addProjectPropertyListener(IProject project, IProjectPropertyListener listener);
+	
+	/**
+	 * Remove a project property listener.
+	 * 
+	 * @param listener the listener to remove
+	 */
+	void removeProjectPropertyListener(IProject project, IProjectPropertyListener listener);
+	
+	/**
+	 * Notify all listeners of project that a property has changed.
+	 * 
+	 * @param project the project for which the property has changed
+	 * @param property the property that has changed
+	 */
+	void notifyPropertyListeners(IProject project, String property);
+	
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/ToolListContentProvider.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/ToolListContentProvider.java
new file mode 100644
index 0000000..2ca2281
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/ToolListContentProvider.java
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import java.util.ArrayList;
+
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsConfiguration;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IConfigureOption;
+
+public class ToolListContentProvider implements ITreeContentProvider {
+
+	private ToolListElement[] elements;
+	
+	private ToolListElement[] createElements() {
+		ArrayList<ToolListElement> toolList = new ArrayList<ToolListElement>();
+		AutotoolsConfiguration.Option[] options = AutotoolsConfiguration.getTools();
+		for (int i = 0; i < options.length; ++i) {
+			AutotoolsConfiguration.Option opt = options[i];
+			String optName = opt.getName();
+			ToolListElement tool = new ToolListElement(optName, IConfigureOption.TOOL);
+			toolList.add(tool);
+			AutotoolsConfiguration.Option[] categories = 
+				AutotoolsConfiguration.getChildOptions(optName);
+			for (int j = 0; j < categories.length; ++j) {
+				String catName = categories[j].getName();
+				ToolListElement newItem = new ToolListElement(catName, IConfigureOption.CATEGORY);
+				tool.addChild(newItem);
+			}
+		}
+		return toolList.toArray(new ToolListElement[toolList.size()]);
+	}
+	
+	public Object[] getChildren(Object parentElement) {
+		if (parentElement instanceof AutotoolsConfiguration) {
+			return elements;
+		}
+		return ((ToolListElement)parentElement).getChildren();	
+	}
+
+	public Object getParent(Object element) {
+		return ((ToolListElement)element).getParent();
+	}
+
+	public boolean hasChildren(Object element) {
+		return ((ToolListElement)element).hasChildren();
+	}
+
+	public Object[] getElements(Object inputElement) {
+		return elements;
+	}
+
+	public void dispose() {
+		// nothing needed
+	}
+
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		// TODO Auto-generated method stub
+		elements = createElements();
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/ToolListElement.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/ToolListElement.java
new file mode 100644
index 0000000..1c3e6be
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/ToolListElement.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import java.util.ArrayList;
+
+public class ToolListElement {
+	
+	private ArrayList<ToolListElement> children;
+	private ToolListElement parent;
+	private String name;
+	private int type;
+	
+	public ToolListElement(String name, int type) {
+		this.name = name;
+		this.type = type;
+		this.children = new ArrayList<ToolListElement>();
+	}
+	
+	public void setParent(ToolListElement p) {
+		parent = p;
+	}
+	
+	public ToolListElement getParent() {
+		return parent;
+	}
+	
+	public String getName() {
+		return name;
+	}
+	
+	public int getType() {
+		return type;
+	}
+	
+	public void addChild(ToolListElement e) {
+		children.add(e);
+		e.setParent(this);
+	}
+	
+	public boolean hasChildren() {
+		return children.size() > 0;
+	}
+	
+	public Object[] getChildren() {
+		return children.toArray();
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/ToolListLabelProvider.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/ToolListLabelProvider.java
new file mode 100644
index 0000000..07b8ce0
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/properties/ToolListLabelProvider.java
@@ -0,0 +1,92 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2007, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Rational Software - Initial API and implementation
+ * Red Hat Inc. - Modification for Autotools usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.properties;
+
+import org.eclipse.cdt.ui.newui.UIMessages;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceManager;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IAConfiguration;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.IConfigureOption;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.AutotoolsUIPluginImages;
+import org.eclipse.swt.graphics.Image;
+ 
+public class ToolListLabelProvider extends LabelProvider {
+	private final Image IMG_TOOL = AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_CFG_TOOL);
+	private final Image IMG_CAT = AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_CFG_CATEGORY);
+	private static final String ERROR_UNKNOWN_ELEMENT = "ConfigurePropertyPage.error.Unknown_tree_element";	//$NON-NLS-1$
+
+	private ImageDescriptor descriptor = null;
+	private ResourceManager manager = null;
+	private IAConfiguration cfg = null;
+	
+	public ToolListLabelProvider(IAConfiguration cfg) {
+		this.cfg = cfg;
+	}
+	
+	public IAConfiguration getCfg() {
+		return cfg;
+	}
+	
+	public void setCfg(IAConfiguration cfg) {
+		this.cfg = cfg;
+	}
+	
+	public Image getImage(Object element) {
+		if (!(element instanceof ToolListElement)) {
+			throw unknownElement(element);
+		}
+		Image defaultImage = IMG_CAT;
+		ToolListElement toolListElement = (ToolListElement)element;
+		IConfigureOption cat = cfg.getOption(toolListElement.getName());
+	
+		if (cat == null) {
+			defaultImage = IMG_TOOL;
+		}
+		
+		// Use default icon for display 
+		return defaultImage;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(Object)
+	 */
+	public String getText(Object element) {
+		if (!(element instanceof ToolListElement)) {
+			throw unknownElement(element);
+		}
+		ToolListElement toolListElement = (ToolListElement)element;
+		IConfigureOption cat = cfg.getOption(toolListElement.getName());
+	
+		if (cat == null) {
+			return toolListElement.getName();
+		}
+		else {
+			return cat.getDescription();
+		}
+	}
+
+	protected RuntimeException unknownElement(Object element) {
+		return new RuntimeException(UIMessages.getFormattedString(ERROR_UNKNOWN_ELEMENT, element.getClass().getName()));
+	}
+
+    /**
+     * Disposing any images that were allocated for it.
+     * 
+     * @since 3.0
+     */
+    public void dispose() {
+        if (descriptor != null && manager != null) {
+            manager.destroyImage(descriptor);
+        }
+    };
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/AutoconfPrototype.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/AutoconfPrototype.java
new file mode 100644
index 0000000..88b1702
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/AutoconfPrototype.java
@@ -0,0 +1,82 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.text.hover;
+
+import java.util.ArrayList;
+
+public class AutoconfPrototype {
+	protected String name;
+	protected int numPrototypes;
+	protected ArrayList<Integer> minParms;
+	protected ArrayList<Integer> maxParms;
+	protected ArrayList<ArrayList<String>> parmList;
+	
+	public AutoconfPrototype() {
+		numPrototypes = 0;
+		minParms = new ArrayList<Integer>();
+		maxParms = new ArrayList<Integer>();
+		parmList = new ArrayList<ArrayList<String>>();
+	}
+	
+	public String getName() {
+		return name;
+	}
+	
+	public void setName(String newName) {
+		name = newName;
+	}
+	
+	public int getNumPrototypes() {
+		return numPrototypes;
+	}
+	
+	public void setNumPrototypes(int num) {
+		numPrototypes = num;
+	}
+	
+	public int getMinParms(int prototypeNum) {
+		return ((Integer)minParms.get(prototypeNum)).intValue();
+	}
+	
+	public void setMinParms(int prototypeNum, int value) {
+		minParms.add(prototypeNum, new Integer(value));
+	}
+	
+	public int getMaxParms(int prototypeNum) {
+		return ((Integer)maxParms.get(prototypeNum)).intValue();
+	}
+	
+	public void setMaxParms(int prototypeNum, int value) {
+		maxParms.add(prototypeNum, new Integer(value));
+	}
+	
+	public String getParmName(int prototypeNum, int parmNum) {
+		ArrayList<String> parms = parmList.get(prototypeNum);
+		return (String)parms.get(parmNum);
+	}
+
+	// This function assumes that parms will be added in order starting
+	// with lowest prototype first.
+	public void setParmName(int prototypeNum, int parmNum, String value) {
+		ArrayList<String> parms;
+		if (parmList.size() == prototypeNum) {
+			parms = new ArrayList<String>();
+			parmList.add(parms);
+		}
+		else
+			parms = parmList.get(prototypeNum);
+		if (parms.size() == parmNum)
+			parms.add(value);	
+		else
+			parms.set(parmNum, value);
+	}
+	
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/AutoconfTextHover.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/AutoconfTextHover.java
new file mode 100644
index 0000000..624db19
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/AutoconfTextHover.java
@@ -0,0 +1,596 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.text.hover;
+
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.core.filesystem.URIUtil;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.DefaultInformationControl;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IInformationControl;
+import org.eclipse.jface.text.IInformationControlCreator;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextHover;
+import org.eclipse.jface.text.ITextHoverExtension;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.Region;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsPlugin;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.AutoconfEditor;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.AutoconfMacro;
+import org.eclipse.linuxtools.cdt.autotools.ui.editors.IAutotoolEditorActionDefinitionIds;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.CWordFinder;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.HTMLPrinter;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.HTMLTextPresenter;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutotoolsEditorPreferenceConstants;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.keys.IBindingService;
+import org.osgi.framework.Bundle;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+
+public class AutoconfTextHover implements ITextHover, ITextHoverExtension {
+
+	public static String LOCAL_AUTOCONF_MACROS_DOC_NAME = "macros/acmacros";
+	public static String LOCAL_AUTOMAKE_MACROS_DOC_NAME = "macros/ammacros";
+	public static String AUTOCONF_MACROS_DOC_NAME = "http://www.sourceware.org/eclipse/autotools/acmacros"; //$NON-NLS-1$
+	public static String AUTOMAKE_MACROS_DOC_NAME = "http://www.sourceware.org/eclipse/autotools/ammacros"; //$NON-NLS-1$
+
+	private static class AutotoolsHoverDoc {
+		public Document[] documents = new Document[2];
+		public AutotoolsHoverDoc(Document ac_document, Document am_document) {
+			this.documents[0] = ac_document;
+			this.documents[1] = am_document;
+		}
+		public Document getAcDocument() {
+			return documents[0];
+		}
+		public Document getAmDocument() {
+			return documents[1];
+		}
+		public Document[] getDocuments() {
+			return documents;
+		}
+	};
+
+	private static Map<String, Document> acHoverDocs;
+	private static Map<String, Document> amHoverDocs;
+	private static Map<Document, ArrayList<AutoconfMacro>> acHoverMacros;
+	private static String fgStyleSheet;
+	private static AutoconfEditor fEditor;
+
+	/* Mapping key to action */
+	private static IBindingService fBindingService;
+	{
+		fBindingService= (IBindingService)PlatformUI.getWorkbench().getAdapter(IBindingService.class);
+	}
+
+	public static String getAutoconfMacrosDocName(String version) {
+		return AUTOCONF_MACROS_DOC_NAME + "-" //$NON-NLS-1$ 
+		+ version
+		+ ".xml"; //$NON-NLS-1$	
+	}
+
+	public static String getLocalAutoconfMacrosDocName(String version) {
+		return LOCAL_AUTOCONF_MACROS_DOC_NAME + "-" //$NON-NLS-1$ 
+		+ version
+		+ ".xml"; //$NON-NLS-1$	
+	}
+
+	/* Get the preferences default for the autoconf macros document name.  */
+	public static String getDefaultAutoconfMacrosVer() {
+		return AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION);
+	}
+
+	public static String getAutomakeMacrosDocName(String version) {
+		return AUTOMAKE_MACROS_DOC_NAME + "-" //$NON-NLS-1$ 
+		+ version
+		+ ".xml"; //$NON-NLS-1$	
+	}
+	
+	public static String getLocalAutomakeMacrosDocName(String version) {
+		return LOCAL_AUTOMAKE_MACROS_DOC_NAME + "-" //$NON-NLS-1$ 
+		+ version
+		+ ".xml"; //$NON-NLS-1$	
+	}
+	
+	/* Get the preferences default for the autoconf macros document name.  */
+	public static String getDefaultAutomakeMacrosVer() {
+		return AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION);
+	}
+
+	protected static Document getACDoc(String acDocVer) {
+		Document ac_document = null;
+		if (acHoverDocs == null) {
+			acHoverDocs = new HashMap<String, Document>();
+		}
+		ac_document = (Document)acHoverDocs.get(acDocVer);
+		if (ac_document == null) {
+			Document doc = null;
+			try {
+				// see comment in initialize()
+				try {
+					InputStream docStream = null;
+					try {
+						URI uri = new URI(getLocalAutoconfMacrosDocName(acDocVer));
+						IPath p = URIUtil.toPath(uri);
+						// Try to open the file as local to this plug-in.
+						docStream = FileLocator.openStream(AutotoolsPlugin.getDefault().getBundle(), p, false);
+					} catch (IOException e) {
+						// Local open failed.  Try normal external location.
+						URI acDoc = new URI(getAutoconfMacrosDocName(acDocVer));
+						IPath p = URIUtil.toPath(acDoc);
+						if (p == null) {
+							URL url = acDoc.toURL();
+							docStream = url.openStream();
+						} else {
+							docStream = new FileInputStream(p.toFile());
+						}
+					}
+					DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+					factory.setValidating(false);
+					try {
+						DocumentBuilder builder = factory.newDocumentBuilder();
+						doc = builder.parse(docStream);
+					}
+					catch (SAXParseException saxException) {
+						doc = null;
+					}
+					catch (SAXException saxEx) {
+						doc = null;
+					}
+					catch (ParserConfigurationException pce) {
+						doc = null;
+					}
+					catch (IOException ioe) {
+						doc = null;
+					}
+				} catch (FileNotFoundException e) {
+					AutotoolsPlugin.log(e);
+				} catch (MalformedURLException e) {
+					AutotoolsPlugin.log(e);
+				} catch (URISyntaxException e) {
+					AutotoolsPlugin.log(e);
+				}
+				ac_document = doc;
+			}
+			catch (IOException ioe) {
+			}
+		}
+		acHoverDocs.put(acDocVer, ac_document);
+		return ac_document;
+	}
+	
+	protected static Document getAMDoc(String amDocVer) {
+		Document am_document = null;
+		if (amHoverDocs == null) {
+			amHoverDocs = new HashMap<String, Document>();
+		}
+		am_document = (Document)amHoverDocs.get(amDocVer);
+		if (am_document == null) {
+			Document doc = null;
+			try {
+				// see comment in initialize()
+				try {
+					InputStream docStream = null;
+					try {
+						URI uri = new URI(getLocalAutomakeMacrosDocName(amDocVer));
+						IPath p = URIUtil.toPath(uri);
+						// Try to open the file as local to this plug-in.
+						docStream = FileLocator.openStream(AutotoolsPlugin.getDefault().getBundle(), p, false);
+					} catch (IOException e) {
+						// Local open failed.  Try normal external location.
+						URI acDoc = new URI(getAutomakeMacrosDocName(amDocVer));
+						IPath p = URIUtil.toPath(acDoc);
+						if (p == null) {
+							URL url = acDoc.toURL();
+							docStream = url.openStream();
+						} else {
+							docStream = new FileInputStream(p.toFile());
+						}
+					}
+					DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+					factory.setValidating(false);
+					try {
+						DocumentBuilder builder = factory.newDocumentBuilder();
+						doc = builder.parse(docStream);
+					}
+					catch (SAXParseException saxException) {
+						doc = null;
+					}
+					catch (SAXException saxEx) {
+						doc = null;
+					}
+					catch (ParserConfigurationException pce) {
+						doc = null;
+					}
+					catch (IOException ioe) {
+						doc = null;
+					}
+				} catch (FileNotFoundException e) {
+					AutotoolsPlugin.log(e);
+				} catch (MalformedURLException e) {
+					AutotoolsPlugin.log(e);
+				} catch (URISyntaxException e) {
+					AutotoolsPlugin.log(e);
+				}
+				am_document = doc;
+			}
+			catch (IOException ioe) {
+			}
+		}
+		amHoverDocs.put(amDocVer, am_document);
+		return am_document;
+	}
+
+	protected static AutotoolsHoverDoc getHoverDoc(IEditorInput input) {
+		String acDocVer = getDefaultAutoconfMacrosVer();
+		String amDocVer = getDefaultAutomakeMacrosVer();
+		if (input instanceof IFileEditorInput) {
+			IFileEditorInput fe = (IFileEditorInput)input;
+			IFile f = fe.getFile();
+			IProject p = f.getProject();
+			try {
+				String acVer = p.getPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_VERSION);
+				if (acVer != null)
+					acDocVer = acVer;
+				else { // look for compat project properties
+					acVer = p.getPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_VERSION_COMPAT);
+					if (acVer != null)
+						acDocVer = acVer;
+				}
+			} catch (CoreException ce1) {
+				// do nothing
+			}
+			try {
+				String amVer = p.getPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_VERSION);
+				if (amVer != null)
+					amDocVer = amVer;
+				else { // look for compat project properties
+					amVer = p.getPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_VERSION_COMPAT);
+					if (amVer != null)
+						amDocVer = amVer;
+				}
+			} catch (CoreException ce2) {
+				// do nothing
+			}
+		}
+		Document ac_document = getACDoc(acDocVer);
+		Document am_document = getAMDoc(amDocVer);
+		return new AutoconfTextHover.AutotoolsHoverDoc(ac_document, am_document);
+	}
+
+	public AutoconfTextHover(AutoconfEditor editor) {
+		fEditor = editor;
+	}
+
+	public static String getIndexedInfo(String name, AutoconfEditor editor) {
+		AutotoolsHoverDoc h = getHoverDoc(editor.getEditorInput());
+		String x = getIndexedInfoFromDocument(name, h.getAcDocument());
+		if (x == null)
+			x = getIndexedInfoFromDocument(name, h.getAmDocument());
+		return x;
+	}
+
+	private static String getIndexedInfoFromDocument(String name, Document document) {
+		StringBuffer buffer = new StringBuffer();
+
+		if (document != null && name != null) {
+			Element elem = document.getElementById(name);
+			if (null != elem) {
+				int prototypeCount = 0;
+				buffer.append("<B>Macro:</B> " + name);
+				NodeList nl = elem.getChildNodes();
+				for (int i = 0; i < nl.getLength(); ++i) {
+					Node n = nl.item(i);
+					String nodeName = n.getNodeName();
+					if (nodeName.equals("prototype")) { //$NON-NLS-1$
+						String prototype = "";
+						++prototypeCount;
+						if (prototypeCount == 1) {
+							buffer.append(" (");
+						} else
+							buffer.append("    <B>or</B> " + name + " (<I>"); //$NON-NLS-2$
+						NodeList varList = n.getChildNodes();
+						for (int j = 0; j < varList.getLength(); ++j) {
+							Node v = varList.item(j);
+							String vnodeName = v.getNodeName();
+							if (vnodeName.equals("parameter")) { //$NON-NLS-1$
+								NamedNodeMap parms = v.getAttributes();
+								Node parmNode = parms.item(0);
+								String parm = parmNode.getNodeValue();
+								prototype = (prototype.equals("")) 
+								? parm
+										: prototype + ", " + parm; 
+							}
+						}
+						buffer.append(prototype + "</I>)<br>"); //$NON-NLS-1$
+					}
+					if (nodeName.equals("synopsis")) {  //$NON-NLS-1$
+						Node textNode = n.getLastChild();
+						buffer.append("<br><B>Synopsis:</B> ");
+						buffer.append(textNode.getNodeValue());
+					}
+				}
+			}
+		}
+		if (buffer.length() > 0) {
+			HTMLPrinter.insertPageProlog(buffer, 0);
+			HTMLPrinter.addPageEpilog(buffer);
+			return buffer.toString();
+		}
+
+		return null;
+	}
+	
+	public static AutoconfMacro[] getMacroList(AutoconfEditor editor) {
+		IEditorInput input = editor.getEditorInput();
+		AutotoolsHoverDoc hoverdoc = getHoverDoc(input);
+		AutoconfMacro[] macros = getMacroList(hoverdoc);
+		return macros;
+	}
+	
+	private static AutoconfMacro[] getMacroList(AutotoolsHoverDoc hoverdoc) {
+		if (acHoverMacros == null) {
+			acHoverMacros = new HashMap<Document, ArrayList<AutoconfMacro>>();
+		}
+
+		ArrayList<AutoconfMacro> masterList = new ArrayList<AutoconfMacro>();
+		Document[] doc = hoverdoc.getDocuments();
+		for (int ix = 0; ix < doc.length; ++ix) {
+			Document macroDoc = doc[ix];
+			ArrayList<AutoconfMacro> list = acHoverMacros.get(macroDoc);
+			if (list == null && macroDoc != null) {
+				list = new ArrayList<AutoconfMacro>();
+				NodeList nl = macroDoc.getElementsByTagName("macro"); //$NON-NLS-1$
+				for (int i = 0; i < nl.getLength(); ++i) {
+					Node macro = nl.item(i);
+					NamedNodeMap macroAttrs = macro.getAttributes();
+					Node n2 = macroAttrs.getNamedItem("id"); //$NON-NLS-1$
+					if (n2 != null) {
+						String name = n2.getNodeValue();
+						String parms = "";
+						NodeList macroChildren = macro.getChildNodes();
+						for (int j = 0; j < macroChildren.getLength(); ++j) {
+							Node x = macroChildren.item(j);
+							if (x.getNodeName().equals("prototype")) { //$NON-NLS-1$
+								// Use parameters for context info.
+								NodeList parmList = x.getChildNodes();
+								int parmCount = 0;
+								for (int k = 0; k < parmList.getLength(); ++k) {
+									Node n3 = parmList.item(k);
+									if (n3.getNodeName() == "parameter") {  //$NON-NLS-1$
+										NamedNodeMap parmVals = n3.getAttributes();
+										Node parmVal = parmVals.item(0);
+										if (parmCount > 0)
+											parms = parms + ", "; //$NON-NLS-1$
+										parms = parms + parmVal.getNodeValue();
+										++parmCount;
+									}
+								}
+							}
+						}
+						AutoconfMacro m = new AutoconfMacro(name, parms);
+						list.add(m);
+					}
+				}
+				// Cache the arraylist of macros for later usage.
+				acHoverMacros.put(macroDoc, list);
+			}
+			masterList.addAll(list);
+		}
+		// Convert to a sorted array of macros and return result.
+		AutoconfMacro[] macros = new AutoconfMacro[masterList.size()];
+		masterList.toArray(macros);
+		Arrays.sort(macros);
+		return macros;
+	}
+
+	public static AutoconfPrototype getPrototype(String name, AutoconfEditor editor) {
+		IEditorInput input = editor.getEditorInput();
+		AutotoolsHoverDoc hoverdoc = getHoverDoc(input);
+		AutoconfPrototype x = getPrototype(name, hoverdoc.getAcDocument());
+		if (x == null)
+			x = getPrototype(name, hoverdoc.getAmDocument());
+		return x;
+	}
+
+	private static AutoconfPrototype getPrototype(String name, Document document) {
+		AutoconfPrototype p = null;
+		if (document != null && name != null) {
+			Element elem = document.getElementById(name);
+			if (null != elem) {
+				int prototypeCount = -1;
+				p = new AutoconfPrototype();
+				p.setName(name);
+				NodeList nl = elem.getChildNodes();
+				for (int i = 0; i < nl.getLength(); ++i) {
+					Node n = nl.item(i);
+					String nodeName = n.getNodeName();
+					if (nodeName.equals("prototype")) { //$NON-NLS-1$
+						++prototypeCount;
+						int parmCount = 0;
+						int minParmCount = -1;
+						p.setNumPrototypes(prototypeCount  + 1);
+						NodeList varList = n.getChildNodes();
+						for (int j = 0; j < varList.getLength(); ++j) {
+							Node v = varList.item(j);
+							String vnodeName = v.getNodeName();
+							if (vnodeName.equals("parameter")) { //$NON-NLS-1$
+								++parmCount;
+								NamedNodeMap parms = v.getAttributes();
+								Node parmNode = parms.item(0);
+								String parm = parmNode.getNodeValue();
+								// Check for first optional parameter which means
+								// we know the minimum number of parameters needed.
+								if (minParmCount < 0 && (parm.charAt(0) == '[' ||
+										parm.startsWith("...")))
+									minParmCount = parmCount  - 1;
+								// Old style documentation sometimes had '[' in
+								// prototypes so look for one at end of a parm too.
+								else if (minParmCount < 0 && parm.endsWith("["))
+									minParmCount = parmCount;
+								p.setParmName(prototypeCount, parmCount - 1, parm);
+							}
+						}
+						p.setMaxParms(prototypeCount, parmCount);
+						// If we see no evidence of optional parameters, then
+						// the min and max number of parameters are equal.
+						if (minParmCount < 0)
+							minParmCount = parmCount;
+						p.setMinParms(prototypeCount, minParmCount);
+					}
+				}
+			}
+		}
+		return p;
+	}
+
+	public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
+
+		String hoverInfo = null;
+
+		IDocument d = textViewer.getDocument();
+
+		try {
+			String name = d.get(hoverRegion.getOffset(), hoverRegion.getLength());
+			hoverInfo = getIndexedInfo(name, fEditor);
+		} catch (BadLocationException e) {
+			// do nothing
+		}
+		// TODO Auto-generated method stub
+		return hoverInfo;
+	}
+
+	/*
+	 * @see ITextHover#getHoverRegion(ITextViewer, int)
+	 */
+	public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
+
+		if (textViewer != null) {
+			/*
+			 * If the hover offset falls within the selection range return the
+			 * region for the whole selection.
+			 */
+			Point selectedRange = textViewer.getSelectedRange();
+			if (selectedRange.x >= 0 && selectedRange.y > 0
+					&& offset >= selectedRange.x
+					&& offset <= selectedRange.x + selectedRange.y)
+				return new Region(selectedRange.x, selectedRange.y);
+			else {
+				return CWordFinder.findWord(textViewer.getDocument(), offset);
+			}
+		}
+		return null;
+	}
+
+	/*
+	 * @see ITextHoverExtension#getHoverControlCreator()
+	 * @since 3.0
+	 */
+	public IInformationControlCreator getHoverControlCreator() {
+		return new IInformationControlCreator() {
+			public IInformationControl createInformationControl(Shell parent) {
+				return new DefaultInformationControl(parent, getTooltipAffordanceString(),
+						new HTMLTextPresenter(false));
+			}
+		};
+	}
+
+	/*
+	 * Static member function to allow content assist to add hover help.
+	 */
+	public static IInformationControlCreator getInformationControlCreator() {
+		return new IInformationControlCreator() {
+			public IInformationControl createInformationControl(Shell parent) {
+				return new DefaultInformationControl(parent, getTooltipAffordanceString(),
+						new HTMLTextPresenter(false));
+			}
+		};
+	}
+
+	protected static String getTooltipAffordanceString() {
+		if (fBindingService == null)
+			return null;
+
+		String keySequence= fBindingService.getBestActiveBindingFormattedFor(IAutotoolEditorActionDefinitionIds.SHOW_TOOLTIP);
+		if (keySequence == null)
+			return null;
+
+		return HoverMessages.getFormattedString("ToolTipFocus", keySequence == null ? "" : keySequence); //$NON-NLS-1$
+	}
+
+	/**
+	 * Returns the style sheet.
+	 *
+	 * @since 3.2
+	 */
+	protected static String getStyleSheet() {
+		if (fgStyleSheet == null) {
+			Bundle bundle= Platform.getBundle(AutotoolsUIPlugin.PLUGIN_ID);
+			URL styleSheetURL= bundle.getEntry("/AutoconfHoverStyleSheet.css"); //$NON-NLS-1$
+			if (styleSheetURL != null) {
+				try {
+					styleSheetURL= FileLocator.toFileURL(styleSheetURL);
+					BufferedReader reader= new BufferedReader(new InputStreamReader(styleSheetURL.openStream()));
+					StringBuffer buffer= new StringBuffer(200);
+					String line= reader.readLine();
+					while (line != null) {
+						buffer.append(line);
+						buffer.append('\n');
+						line= reader.readLine();
+					}
+					fgStyleSheet= buffer.toString();
+				} catch (IOException ex) {
+					CCorePlugin.log(ex);
+					fgStyleSheet= ""; //$NON-NLS-1$
+				}
+			}
+		}
+		return fgStyleSheet;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/HoverMessages.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/HoverMessages.java
new file mode 100644
index 0000000..e3757a4
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/HoverMessages.java
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.text.hover;
+
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+
+/**
+ * AutoconfEditorMessages
+ */
+public class HoverMessages {
+
+	private static final String RESOURCE_BUNDLE= HoverMessages.class.getName();
+
+	private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);
+
+	private HoverMessages() {
+	}
+
+	public static String getString(String key) {
+		try {
+			return fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+	}
+	/**
+	 * Gets a string from the resource bundle and formats it with the argument
+	 * 
+	 * @param key	the string used to get the bundle value, must not be null
+	 * @since 3.0
+	 */
+	public static String getFormattedString(String key, Object arg) {
+		String format= null;
+		try {
+			format= fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+		if (arg == null)
+			arg= ""; //$NON-NLS-1$
+		return MessageFormat.format(format, new Object[] { arg });
+	}
+	/**
+	 * Gets a string from the resource bundle and formats it with the arguments
+	 * 
+	 * @param key	the string used to get the bundle value, must not be null
+	 * @since 3.0
+	 */
+	public static String getFormattedString(String key, Object arg1, Object arg2) {
+		String format= null;
+		try {
+			format= fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+		if (arg1 == null)
+			arg1= ""; //$NON-NLS-1$
+		if (arg2 == null)
+			arg2= ""; //$NON-NLS-1$
+		return MessageFormat.format(format, new Object[] { arg1, arg2 });
+	}
+	
+	/**
+	 * Gets a string from the resource bundle and formats it with the argument
+	 * 
+	 * @param key	the string used to get the bundle value, must not be null
+	 * @since 3.0
+	 */
+	public static String getFormattedString(String key, boolean arg) {
+		String format= null;
+		try {
+			format= fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+		return MessageFormat.format(format, new Object[] { new Boolean(arg) });
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/HoverMessages.properties b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/HoverMessages.properties
new file mode 100644
index 0000000..d9326d9
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/text/hover/HoverMessages.properties
@@ -0,0 +1,11 @@
+#################################################################################
+#  Copyright (c) 2006 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+# 
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+ToolTipFocus="Press ''{0}'' for focus."
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsBuildWizard.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsBuildWizard.java
new file mode 100644
index 0000000..920d80b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsBuildWizard.java
@@ -0,0 +1,86 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2008, 2009 Intel Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Intel Corporation - initial API and implementation
+ *     Red Hat Inc - modification for Autotools project
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.SortedMap;
+
+import org.eclipse.cdt.managedbuilder.buildproperties.IBuildPropertyManager;
+import org.eclipse.cdt.managedbuilder.buildproperties.IBuildPropertyType;
+import org.eclipse.cdt.managedbuilder.buildproperties.IBuildPropertyValue;
+import org.eclipse.cdt.managedbuilder.core.BuildListComparator;
+import org.eclipse.cdt.managedbuilder.core.IProjectType;
+import org.eclipse.cdt.managedbuilder.core.IToolChain;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.managedbuilder.ui.properties.Messages;
+import org.eclipse.cdt.managedbuilder.ui.wizards.AbstractCWizard;
+import org.eclipse.cdt.managedbuilder.ui.wizards.MBSWizardHandler;
+import org.eclipse.cdt.ui.newui.CDTPrefUtil;
+import org.eclipse.cdt.ui.wizards.EntryDescriptor;
+import org.eclipse.jface.wizard.IWizard;
+
+/**
+ *
+ */
+public class AutotoolsBuildWizard extends AbstractCWizard {
+	public static final String OTHERS_LABEL = Messages.getString("CNewWizard.0");  //$NON-NLS-1$
+	public static final String AUTOTOOLS_PROJECTTYPE_ID = "org.eclipse.linuxtools.cdt.autotools.core.projectType"; //$NON-NLS-1$
+	
+	/**
+	 * @since 5.1
+	 */
+	public static final String EMPTY_PROJECT = Messages.getString("AbstractCWizard.0");  //$NON-NLS-1$
+	/**
+	 * Creates and returns an array of items to be displayed 
+	 */
+	public EntryDescriptor[] createItems(boolean supportedOnly, IWizard wizard) {
+		IBuildPropertyManager bpm = ManagedBuildManager.getBuildPropertyManager();
+		IBuildPropertyType bpt = bpm.getPropertyType(MBSWizardHandler.ARTIFACT);
+		IBuildPropertyValue[] vs = bpt.getSupportedValues();
+		Arrays.sort(vs, BuildListComparator.getInstance());
+		ArrayList<EntryDescriptor> items = new ArrayList<EntryDescriptor>();
+		
+		// look for Autotools project type
+		EntryDescriptor oldsRoot = null;
+		SortedMap<String, IProjectType> sm = ManagedBuildManager.getExtensionProjectTypeMap();
+		for (String s : sm.keySet()) {
+			IProjectType pt = (IProjectType)sm.get(s);
+			if (pt.getId().equals(AUTOTOOLS_PROJECTTYPE_ID)) {
+				AutotoolsBuildWizardHandler h = new AutotoolsBuildWizardHandler(pt, parent, wizard);
+				IToolChain[] tcs = ManagedBuildManager.getExtensionToolChains(pt);
+				for(int i = 0; i < tcs.length; i++){
+					IToolChain t = tcs[i];
+					if(t.isSystemObject()) 
+						continue;
+					if (!isValid(t, supportedOnly, wizard))
+						continue;
+
+					h.addTc(t);
+				}
+
+				String pId = null;
+				if (CDTPrefUtil.getBool(CDTPrefUtil.KEY_OTHERS)) {
+					if (oldsRoot == null) {
+						oldsRoot = new EntryDescriptor(OTHERS_LABEL, null, OTHERS_LABEL, true, null, null);
+						items.add(oldsRoot);
+					}
+					pId = oldsRoot.getId();
+				} else { // do not group to <Others>
+					pId = null;
+				}
+				items.add(new EntryDescriptor(pt.getId(), pId, pt.getName(), true, h, null));
+			}
+		}
+		return (EntryDescriptor[])items.toArray(new EntryDescriptor[items.size()]);
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsBuildWizardHandler.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsBuildWizardHandler.java
new file mode 100644
index 0000000..35f541a
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsBuildWizardHandler.java
@@ -0,0 +1,42 @@
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards;
+
+import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.IProjectType;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.managedbuilder.ui.wizards.MBSWizardHandler;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsNewProjectNature;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsConfigurationManager;
+import org.eclipse.swt.widgets.Composite;
+
+public class AutotoolsBuildWizardHandler extends MBSWizardHandler {
+	public AutotoolsBuildWizardHandler(Composite p, IWizard w) {
+		super(AutotoolsWizardMessages.getResourceString("AutotoolsBuildWizard.0"), p, w); //$NON-NLS-1$
+	}
+
+	public AutotoolsBuildWizardHandler(IProjectType pt, Composite parent, IWizard wizard) {
+		super(pt, parent, wizard);
+	}
+
+	@Override
+	public void convertProject(IProject proj, IProgressMonitor monitor) throws CoreException {
+	    super.convertProject(proj, monitor);
+		AutotoolsNewProjectNature.addAutotoolsNature(proj, monitor);
+		
+		// For each IConfiguration, create a corresponding Autotools Configuration
+		IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(proj);
+		IConfiguration[] cfgs = info.getManagedProject().getConfigurations();
+		for (int i = 0; i < cfgs.length; ++i) {
+			IConfiguration cfg = cfgs[i];
+			ICConfigurationDescription cfgd = ManagedBuildManager.getDescriptionForConfiguration(cfg);
+			String id = cfgd.getId();
+			AutotoolsConfigurationManager.getInstance().getConfiguration(proj, id, true);
+		}
+		AutotoolsConfigurationManager.getInstance().saveConfigs(proj);
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsNewCCProjectWizardV2.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsNewCCProjectWizardV2.java
new file mode 100644
index 0000000..9ab81be
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsNewCCProjectWizardV2.java
@@ -0,0 +1,340 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2005, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Rational Software - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.ICDescriptor;
+import org.eclipse.cdt.managedbuilder.core.BuildException;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.IManagedProject;
+import org.eclipse.cdt.managedbuilder.core.IProjectType;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
+import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
+import org.eclipse.cdt.managedbuilder.ui.wizards.MBSCustomPageManager;
+import org.eclipse.cdt.ui.newui.CDTHelpContextIds;
+import org.eclipse.cdt.ui.wizards.NewCCProjectWizard;
+import org.eclipse.cdt.ui.wizards.NewCProjectWizardPage;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.wizard.IWizardPage;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsNewProjectNature;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.PlatformUI;
+
+
+
+@SuppressWarnings("deprecation")
+public class AutotoolsNewCCProjectWizardV2 extends NewCCProjectWizard {
+
+	/* (non-Javadoc)
+	 * String constants
+	 */
+	protected static final String PREFIX = "WizardAutotoolsNewCCProjectV2";	//$NON-NLS-1$
+	protected static final String OP_ERROR = PREFIX + ".op_error";	//$NON-NLS-1$
+	protected static final String WZ_TITLE = PREFIX + ".title";	//$NON-NLS-1$
+	protected static final String WZ_DESC = PREFIX + ".description";	//$NON-NLS-1$
+	protected static final String WINDOW_TITLE = PREFIX + ".windowTitle";  //$NON-NLS-1$
+	protected static final String CONF_TITLE = PREFIX + ".config.title";	//$NON-NLS-1$
+	protected static final String CONF_DESC = PREFIX + ".config.desc";	//$NON-NLS-1$
+	protected static final String OPTIONS_TITLE = PREFIX + ".options.title";	//$NON-NLS-1$
+	protected static final String OPTIONS_DESC = PREFIX + ".options.desc";	//$NON-NLS-1$
+	protected static final String MSG_ADD_NATURE = PREFIX + ".message.add_nature";	//$NON-NLS-1$
+	protected static final String MSG_ADD_BUILDER = PREFIX + ".message.add_builder";	//$NON-NLS-1$
+	protected static final String MSG_SAVE = PREFIX + ".message.save";	//$NON-NLS-1$
+	
+	// Wizard pages
+	protected CProjectPlatformPage projectConfigurationPage;
+	protected NewAutotoolsProjectOptionPage optionPage;
+	protected IProjectType projectType;
+
+	public AutotoolsNewCCProjectWizardV2() {
+		this(AutotoolsUIPlugin.getResourceString(WZ_TITLE), AutotoolsUIPlugin.getResourceString(WZ_DESC));
+	}
+
+	public AutotoolsNewCCProjectWizardV2(String title, String description) {
+		super(title, description);
+	}
+	/**
+	 * Method getWzDescriptionResource,  allows Wizard description label value
+	 * to be changed by subclasses
+	 * 
+	 * @return String
+	 */
+	protected static String getWzDescriptionResource() {
+		return AutotoolsUIPlugin.getResourceString(WZ_DESC);
+	}
+
+	/**
+	 * Method getWzTitleResource,  allows Wizard description label value
+	 * to be changed by subclasses
+	 * 
+	 * @return String
+	 */
+	protected static String getWzTitleResource() {
+		return AutotoolsUIPlugin.getResourceString(WZ_TITLE);
+	}
+
+	/**
+	 * Method getWindowTitleResource, allows Wizard Title label value to be
+	 * changed by subclasses
+	 * 
+	 * @return String
+	 */
+	protected static String getWindowTitleResource() {
+		return AutotoolsUIPlugin.getResourceString(WINDOW_TITLE);
+	}
+
+	/**
+	  * Method getPrefix,  allows prefix value to be changed by subclasses
+	  * 
+	  * @return String
+	  */
+	protected static String getPrefix() {
+		return PREFIX;
+	}
+
+	public void addPages() {
+		// Add the default page for all new projects 
+		super.addPages();
+		
+		// Add the configuration selection page
+		projectConfigurationPage = new CProjectPlatformPage(PREFIX, this);
+		projectConfigurationPage.setTitle(AutotoolsUIPlugin.getResourceString(CONF_TITLE));
+		projectConfigurationPage.setDescription(AutotoolsUIPlugin.getResourceString(CONF_DESC));
+		addPage(projectConfigurationPage);
+		
+		// Add the options (tabbed) page
+		optionPage = new NewAutotoolsProjectOptionPage(PREFIX, this);
+		optionPage.setTitle(AutotoolsUIPlugin.getResourceString(OPTIONS_TITLE));
+		optionPage.setDescription(AutotoolsUIPlugin.getResourceString(OPTIONS_DESC));
+		addPage(optionPage);
+		
+		// add custom pages
+		MBSCustomPageManager.init();
+		
+		// add stock pages
+		MBSCustomPageManager.addStockPage(fMainPage, NewCProjectWizardPage.PAGE_ID);
+		MBSCustomPageManager.addStockPage(projectConfigurationPage, CProjectPlatformPage.PAGE_ID);
+		MBSCustomPageManager.addStockPage(optionPage, NewAutotoolsProjectOptionPage.PAGE_ID);
+		
+	}
+	
+	public void createPageControls(Composite pageContainer) {
+		super.createPageControls( pageContainer );
+		
+		IWizardPage [] pages = getPages();
+		
+		if (pages != null) {
+			for (int i = 0; i < pages.length; i++) {
+				IWizardPage page = pages[i];
+				if (page instanceof NewCProjectWizardPage) {
+					// Setup the help information
+					PlatformUI.getWorkbench().getHelpSystem().setHelp(pageContainer, CDTHelpContextIds.MAN_PROJ_WIZ_NAME_PAGE);
+				}
+				else if (page instanceof NewAutotoolsProjectOptionPage) {
+					NewAutotoolsProjectOptionPage optionPage = (NewAutotoolsProjectOptionPage) page;
+					optionPage.setupHelpContextIds();
+				}
+				//  The other built-in page is the CProjectPlatformPage which already has a help id.
+			} 
+		}
+	}
+	
+	public void updateProjectTypeProperties() {
+		//  Update the error parser list
+		optionPage.updateProjectTypeProperties();
+	}
+
+	protected void addNature(IProgressMonitor monitor) throws CoreException {
+		monitor.beginTask("", 4);
+		monitor.subTask(AutotoolsUIPlugin.getResourceString(MSG_ADD_NATURE));
+		ManagedCProjectNature.addManagedNature(newProject, new SubProgressMonitor(monitor, 1));
+		monitor.subTask(AutotoolsUIPlugin.getResourceString(MSG_ADD_BUILDER));
+		ManagedCProjectNature.addManagedBuilder(newProject, new SubProgressMonitor(monitor, 1));
+		monitor.subTask(AutotoolsUIPlugin.getResourceString(MSG_ADD_NATURE));
+		AutotoolsNewProjectNature.addAutotoolsNature(newProject, new SubProgressMonitor(monitor, 1));
+		monitor.subTask(AutotoolsUIPlugin.getResourceString(MSG_ADD_BUILDER));
+		AutotoolsNewProjectNature.addAutotoolsBuilder(newProject, new SubProgressMonitor(monitor, 1));
+		monitor.done();
+	}
+	
+	public IProjectType getProjectType() {
+		return projectConfigurationPage.getProjectType();
+	}
+
+	protected void doRun(IProgressMonitor monitor) throws CoreException {
+		if (monitor == null) {
+			monitor = new NullProgressMonitor();
+		}
+
+		// super.doRun() just creates the project and does not assign a builder to it.
+		super.doRun(new SubProgressMonitor(monitor, 5));
+
+		// Add the managed build nature and builder
+		try {
+			addNature(new SubProgressMonitor(monitor, 2));
+		} catch (CoreException e) {
+			AutotoolsUIPlugin.log(e);
+		}
+		// FIXME: Default scanner property: make -w - eventually we want to use Make core's build scanner
+		newProject.setPersistentProperty(AutotoolsPropertyConstants.SCANNER_USE_MAKE_W, AutotoolsPropertyConstants.TRUE);
+		
+		CCorePlugin.getDefault().mapCProjectOwner(newProject, getProjectID(), true);
+		
+		// Add the ManagedProject to the project
+		IManagedProject newManagedProject = null;
+		IManagedBuildInfo info = null;
+		try {
+			info = ManagedBuildManager.createBuildInfo(newProject);
+			IProjectType parent = getProjectType();
+			newManagedProject = ManagedBuildManager.createManagedProject(newProject, parent);
+			if (newManagedProject != null) {
+				IConfiguration [] selectedConfigs = getSelectedConfigurations();
+				for (int i = 0; i < selectedConfigs.length; i++) {
+					IConfiguration config = selectedConfigs[i];
+					int id = ManagedBuildManager.getRandomNumber();
+					IConfiguration newConfig = newManagedProject.createConfiguration(config, config.getId() + "." + id); //$NON-NLS-1$
+					newConfig.setArtifactName(newManagedProject.getDefaultArtifactName());
+				}
+				// Now add the first supported config in the list as the default
+				IConfiguration defaultCfg = null;
+				IConfiguration[] newConfigs = newManagedProject.getConfigurations();
+				for(int i = 0; i < newConfigs.length; i++) {
+					if(newConfigs[i].isSupported()){
+						defaultCfg = newConfigs[i];
+						break;
+					}
+				}
+				
+				if(defaultCfg == null && newConfigs.length > 0)
+					defaultCfg = newConfigs[0];
+				
+				if(defaultCfg != null) {
+					ManagedBuildManager.setDefaultConfiguration(newProject, defaultCfg);
+					ManagedBuildManager.setSelectedConfiguration(newProject, defaultCfg);
+				}
+				ManagedBuildManager.setNewProjectVersion(newProject);
+				ICDescriptor desc = null;
+				try {
+					desc = CCorePlugin.getDefault().getCProjectDescription(newProject, true);
+					desc.create(CCorePlugin.BUILD_SCANNER_INFO_UNIQ_ID, ManagedBuildManager.INTERFACE_IDENTITY);
+					//  TODO:  The binary parser setting is currently per-project in the rest of CDT.
+					//         In the MBS, it is per-coonfiguration.  For now, select the binary parsers of the
+					//         first configuration.
+//					if (newConfigs.length > 0) {
+//						IToolChain tc = newConfigs[0].getToolChain();
+//						ITargetPlatform targetPlatform = tc.getTargetPlatform();
+//					}
+				} catch (CoreException e) {
+					AutotoolsUIPlugin.log(e);
+				}
+			}
+		} catch (BuildException e) {
+			AutotoolsUIPlugin.log(e);
+		}
+
+		// Following is a bit of a hack because changing the project options
+		// causes a change event to be fired which will try to reindex the project.  
+		// We are in the middle of setting the project indexer which may end up 
+		// being the null indexer.  In that case, we don't want the default indexer 
+		// (Fast Indexer) to be invoked.
+		//IPDOMManager manager = CCorePlugin.getPDOMManager();
+		//ICProject cproject = CoreModel.getDefault().create(newProject);
+		//manager.setIndexerId(cproject, ConvertToAutotoolsProjectWizard.NULL_INDEXER_ID);
+
+		// Modify the project settings
+		if (newProject != null) {
+			optionPage.performApply(new SubProgressMonitor(monitor, 2));
+		}
+
+		// Save the build options
+		monitor.subTask(AutotoolsUIPlugin.getResourceString(MSG_SAVE));
+		if (info != null) {
+			info.setValid(true);
+			ManagedBuildManager.saveBuildInfo(newProject, true);
+		}
+		
+		IStatus initResult = ManagedBuildManager.initBuildInfoContainer(newProject);
+		if (initResult.getCode() != IStatus.OK) {
+			// At this point, I can live with a failure
+			AutotoolsUIPlugin.log(initResult);
+		}
+
+		monitor.done();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.wizards.NewCProjectWizard#doRunPrologue(org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	protected void doRunPrologue(IProgressMonitor monitor) {
+		// Auto-generated method stub
+
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.wizards.NewCProjectWizard#doRunEpilogue(org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	protected void doRunEpilogue(IProgressMonitor monitor) {
+		// Get my initializer to run
+		if(newProject == null)
+			return;
+
+		IStatus initResult = ManagedBuildManager.initBuildInfoContainer(newProject);
+		if (initResult.getCode() != IStatus.OK) {
+			// At this point, I can live with a failure
+			AutotoolsUIPlugin.log(initResult);
+		}
+		
+		// execute any operations specified by custom pages
+		// execute any operations specified by custom pages
+		IRunnableWithProgress operations[] = MBSCustomPageManager.getOperations();
+		
+		if (operations != null)
+		{
+			for(int k = 0; k < operations.length; k++)
+			{
+				try {
+				operations[k].run(monitor);
+				} catch(InvocationTargetException e) {
+					//TODO: what should we do?
+				} catch(InterruptedException e) {
+					//TODO: what should we do?
+				}
+			}
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.wizards.NewCProjectWizard#getProjectID()
+	 */
+	public String getProjectID() {
+//		return "org.eclipse.cdt.make.core.make"; //$NON-NLS-1$
+		return ManagedBuilderCorePlugin.MANAGED_MAKE_PROJECT_ID;
+	}
+	
+//	public IProjectType getSelectedProjectType() {
+//		return projectConfigurationPage.getSelectedProjectType();
+//	}
+
+	public IConfiguration[] getSelectedConfigurations() {
+		return projectConfigurationPage.getSelectedConfigurations();
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsNewCProjectWizardV2.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsNewCProjectWizardV2.java
new file mode 100644
index 0000000..3e647b2
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsNewCProjectWizardV2.java
@@ -0,0 +1,340 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2005, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Rational Software - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.ICDescriptor;
+import org.eclipse.cdt.managedbuilder.core.BuildException;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.IManagedProject;
+import org.eclipse.cdt.managedbuilder.core.IProjectType;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
+import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
+import org.eclipse.cdt.managedbuilder.ui.wizards.MBSCustomPageManager;
+import org.eclipse.cdt.ui.newui.CDTHelpContextIds;
+import org.eclipse.cdt.ui.wizards.NewCProjectWizard;
+import org.eclipse.cdt.ui.wizards.NewCProjectWizardPage;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.wizard.IWizardPage;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsNewProjectNature;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.PlatformUI;
+
+
+
+@SuppressWarnings("deprecation")
+public class AutotoolsNewCProjectWizardV2 extends NewCProjectWizard {
+
+	/* (non-Javadoc)
+	 * String constants
+	 */
+	protected static final String PREFIX = "WizardAutotoolsNewCProjectV2";	//$NON-NLS-1$
+	protected static final String OP_ERROR = PREFIX + ".op_error";	//$NON-NLS-1$
+	protected static final String WZ_TITLE = PREFIX + ".title";	//$NON-NLS-1$
+	protected static final String WZ_DESC = PREFIX + ".description";	//$NON-NLS-1$
+	protected static final String WINDOW_TITLE = PREFIX + ".windowTitle";  //$NON-NLS-1$
+	protected static final String CONF_TITLE = PREFIX + ".config.title";	//$NON-NLS-1$
+	protected static final String CONF_DESC = PREFIX + ".config.desc";	//$NON-NLS-1$
+	protected static final String OPTIONS_TITLE = PREFIX + ".options.title";	//$NON-NLS-1$
+	protected static final String OPTIONS_DESC = PREFIX + ".options.desc";	//$NON-NLS-1$
+	protected static final String MSG_ADD_NATURE = PREFIX + ".message.add_nature";	//$NON-NLS-1$
+	protected static final String MSG_ADD_BUILDER = PREFIX + ".message.add_builder";	//$NON-NLS-1$
+	protected static final String MSG_SAVE = PREFIX + ".message.save";	//$NON-NLS-1$
+	
+	// Wizard pages
+	protected CProjectPlatformPage projectConfigurationPage;
+	protected NewAutotoolsProjectOptionPage optionPage;
+	protected IProjectType projectType;
+
+	public AutotoolsNewCProjectWizardV2() {
+		this(AutotoolsUIPlugin.getResourceString(WZ_TITLE), AutotoolsUIPlugin.getResourceString(WZ_DESC));
+	}
+
+	public AutotoolsNewCProjectWizardV2(String title, String description) {
+		super(title, description);
+	}
+	/**
+	 * Method getWzDescriptionResource,  allows Wizard description label value
+	 * to be changed by subclasses
+	 * 
+	 * @return String
+	 */
+	protected static String getWzDescriptionResource() {
+		return AutotoolsUIPlugin.getResourceString(WZ_DESC);
+	}
+
+	/**
+	 * Method getWzTitleResource,  allows Wizard description label value
+	 * to be changed by subclasses
+	 * 
+	 * @return String
+	 */
+	protected static String getWzTitleResource() {
+		return AutotoolsUIPlugin.getResourceString(WZ_TITLE);
+	}
+
+	/**
+	 * Method getWindowTitleResource, allows Wizard Title label value to be
+	 * changed by subclasses
+	 * 
+	 * @return String
+	 */
+	protected static String getWindowTitleResource() {
+		return AutotoolsUIPlugin.getResourceString(WINDOW_TITLE);
+	}
+
+	/**
+	  * Method getPrefix,  allows prefix value to be changed by subclasses
+	  * 
+	  * @return String
+	  */
+	protected static String getPrefix() {
+		return PREFIX;
+	}
+
+	public void addPages() {
+		// Add the default page for all new projects 
+		super.addPages();
+		
+		// Add the configuration selection page
+		projectConfigurationPage = new CProjectPlatformPage(PREFIX, this);
+		projectConfigurationPage.setTitle(AutotoolsUIPlugin.getResourceString(CONF_TITLE));
+		projectConfigurationPage.setDescription(AutotoolsUIPlugin.getResourceString(CONF_DESC));
+		addPage(projectConfigurationPage);
+		
+		// Add the options (tabbed) page
+		optionPage = new NewAutotoolsProjectOptionPage(PREFIX, this);
+		optionPage.setTitle(AutotoolsUIPlugin.getResourceString(OPTIONS_TITLE));
+		optionPage.setDescription(AutotoolsUIPlugin.getResourceString(OPTIONS_DESC));
+		addPage(optionPage);
+		
+		// add custom pages
+		MBSCustomPageManager.init();
+		
+		// add stock pages
+		MBSCustomPageManager.addStockPage(fMainPage, NewCProjectWizardPage.PAGE_ID);
+		MBSCustomPageManager.addStockPage(projectConfigurationPage, CProjectPlatformPage.PAGE_ID);
+		MBSCustomPageManager.addStockPage(optionPage, NewAutotoolsProjectOptionPage.PAGE_ID);
+		
+	}
+	
+	public void createPageControls(Composite pageContainer) {
+		super.createPageControls( pageContainer );
+		
+		IWizardPage [] pages = getPages();
+		
+		if (pages != null) {
+			for (int i = 0; i < pages.length; i++) {
+				IWizardPage page = pages[i];
+				if (page instanceof NewCProjectWizardPage) {
+					// Setup the help information
+					PlatformUI.getWorkbench().getHelpSystem().setHelp(pageContainer, CDTHelpContextIds.MAN_PROJ_WIZ_NAME_PAGE);
+				}
+				else if (page instanceof NewAutotoolsProjectOptionPage) {
+					NewAutotoolsProjectOptionPage optionPage = (NewAutotoolsProjectOptionPage) page;
+					optionPage.setupHelpContextIds();
+				}
+				//  The other built-in page is the CProjectPlatformPage which already has a help id.
+			} 
+		}
+	}
+	
+	public void updateProjectTypeProperties() {
+		//  Update the error parser list
+		optionPage.updateProjectTypeProperties();
+	}
+
+	protected void addNature(IProgressMonitor monitor) throws CoreException {
+		monitor.beginTask("", 4);
+		monitor.subTask(AutotoolsUIPlugin.getResourceString(MSG_ADD_NATURE));
+		ManagedCProjectNature.addManagedNature(newProject, new SubProgressMonitor(monitor, 1));
+		monitor.subTask(AutotoolsUIPlugin.getResourceString(MSG_ADD_BUILDER));
+		ManagedCProjectNature.addManagedBuilder(newProject, new SubProgressMonitor(monitor, 1));
+		monitor.subTask(AutotoolsUIPlugin.getResourceString(MSG_ADD_NATURE));
+		AutotoolsNewProjectNature.addAutotoolsNature(newProject, new SubProgressMonitor(monitor, 1));
+		monitor.subTask(AutotoolsUIPlugin.getResourceString(MSG_ADD_BUILDER));
+		AutotoolsNewProjectNature.addAutotoolsBuilder(newProject, new SubProgressMonitor(monitor, 1));
+		monitor.done();
+	}
+	
+	public IProjectType getProjectType() {
+		return projectConfigurationPage.getProjectType();
+	}
+
+	protected void doRun(IProgressMonitor monitor) throws CoreException {
+		if (monitor == null) {
+			monitor = new NullProgressMonitor();
+		}
+
+		// super.doRun() just creates the project and does not assign a builder to it.
+		super.doRun(new SubProgressMonitor(monitor, 5));
+
+		// Add the managed build nature and builder
+		try {
+			addNature(new SubProgressMonitor(monitor, 2));
+		} catch (CoreException e) {
+			AutotoolsUIPlugin.log(e);
+		}
+		// FIXME: Default scanner property: make -w - eventually we want to use Make core's build scanner
+		newProject.setPersistentProperty(AutotoolsPropertyConstants.SCANNER_USE_MAKE_W, AutotoolsPropertyConstants.TRUE);
+		
+		CCorePlugin.getDefault().mapCProjectOwner(newProject, getProjectID(), true);
+		
+		// Add the ManagedProject to the project
+		IManagedProject newManagedProject = null;
+		IManagedBuildInfo info = null;
+		try {
+			info = ManagedBuildManager.createBuildInfo(newProject);
+			IProjectType parent = getProjectType();
+			newManagedProject = ManagedBuildManager.createManagedProject(newProject, parent);
+			if (newManagedProject != null) {
+				IConfiguration [] selectedConfigs = getSelectedConfigurations();
+				for (int i = 0; i < selectedConfigs.length; i++) {
+					IConfiguration config = selectedConfigs[i];
+					int id = ManagedBuildManager.getRandomNumber();
+					IConfiguration newConfig = newManagedProject.createConfiguration(config, config.getId() + "." + id); //$NON-NLS-1$
+					newConfig.setArtifactName(newManagedProject.getDefaultArtifactName());
+				}
+				// Now add the first supported config in the list as the default
+				IConfiguration defaultCfg = null;
+				IConfiguration[] newConfigs = newManagedProject.getConfigurations();
+				for(int i = 0; i < newConfigs.length; i++) {
+					if(newConfigs[i].isSupported()){
+						defaultCfg = newConfigs[i];
+						break;
+					}
+				}
+				
+				if(defaultCfg == null && newConfigs.length > 0)
+					defaultCfg = newConfigs[0];
+				
+				if(defaultCfg != null) {
+					ManagedBuildManager.setDefaultConfiguration(newProject, defaultCfg);
+					ManagedBuildManager.setSelectedConfiguration(newProject, defaultCfg);
+				}
+				ManagedBuildManager.setNewProjectVersion(newProject);
+				ICDescriptor desc = null;
+				try {
+					desc = CCorePlugin.getDefault().getCProjectDescription(newProject, true);
+					desc.create(CCorePlugin.BUILD_SCANNER_INFO_UNIQ_ID, ManagedBuildManager.INTERFACE_IDENTITY);
+					//  TODO:  The binary parser setting is currently per-project in the rest of CDT.
+					//         In the MBS, it is per-coonfiguration.  For now, select the binary parsers of the
+					//         first configuration.
+//					if (newConfigs.length > 0) {
+//						IToolChain tc = newConfigs[0].getToolChain();
+//						ITargetPlatform targetPlatform = tc.getTargetPlatform();
+//					}
+				} catch (CoreException e) {
+					AutotoolsUIPlugin.log(e);
+				}
+			}
+		} catch (BuildException e) {
+			AutotoolsUIPlugin.log(e);
+		}
+
+		// Following is a bit of a hack because changing the project options
+		// causes a change event to be fired which will try to reindex the project.  
+		// We are in the middle of setting the project indexer which may end up 
+		// being the null indexer.  In that case, we don't want the default indexer 
+		// (Fast Indexer) to be invoked.
+		//IPDOMManager manager = CCorePlugin.getPDOMManager();
+		//ICProject cproject = CoreModel.getDefault().create(newProject);
+		//manager.setIndexerId(cproject, ConvertToAutotoolsProjectWizard.NULL_INDEXER_ID);
+
+		// Modify the project settings
+		if (newProject != null) {
+			optionPage.performApply(new SubProgressMonitor(monitor, 2));
+		}
+
+		// Save the build options
+		monitor.subTask(AutotoolsUIPlugin.getResourceString(MSG_SAVE));
+		if (info != null) {
+			info.setValid(true);
+			ManagedBuildManager.saveBuildInfo(newProject, true);
+		}
+		
+		IStatus initResult = ManagedBuildManager.initBuildInfoContainer(newProject);
+		if (initResult.getCode() != IStatus.OK) {
+			// At this point, I can live with a failure
+			AutotoolsUIPlugin.log(initResult);
+		}
+
+		monitor.done();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.wizards.NewCProjectWizard#doRunPrologue(org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	protected void doRunPrologue(IProgressMonitor monitor) {
+		// Auto-generated method stub
+
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.wizards.NewCProjectWizard#doRunEpilogue(org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	protected void doRunEpilogue(IProgressMonitor monitor) {
+		// Get my initializer to run
+		if(newProject == null)
+			return;
+
+		IStatus initResult = ManagedBuildManager.initBuildInfoContainer(newProject);
+		if (initResult.getCode() != IStatus.OK) {
+			// At this point, I can live with a failure
+			AutotoolsUIPlugin.log(initResult);
+		}
+		
+		// execute any operations specified by custom pages
+		// execute any operations specified by custom pages
+		IRunnableWithProgress operations[] = MBSCustomPageManager.getOperations();
+		
+		if (operations != null)
+		{
+			for(int k = 0; k < operations.length; k++)
+			{
+				try {
+				operations[k].run(monitor);
+				} catch(InvocationTargetException e) {
+					//TODO: what should we do?
+				} catch(InterruptedException e) {
+					//TODO: what should we do?
+				}
+			}
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.wizards.NewCProjectWizard#getProjectID()
+	 */
+	public String getProjectID() {
+//		return "org.eclipse.cdt.make.core.make"; //$NON-NLS-1$
+		return ManagedBuilderCorePlugin.MANAGED_MAKE_PROJECT_ID;
+	}
+	
+//	public IProjectType getSelectedProjectType() {
+//		return projectConfigurationPage.getSelectedProjectType();
+//	}
+
+	public IConfiguration[] getSelectedConfigurations() {
+		return projectConfigurationPage.getSelectedConfigurations();
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsWizardMessages.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsWizardMessages.java
new file mode 100644
index 0000000..adccbfd
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsWizardMessages.java
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2007, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM - Initial API and implementation
+ * Red Hat - Copy from org.eclipse.cdt.wizards to here plus rename 
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards;
+
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+/**
+ * @since 2.0
+ */
+public class AutotoolsWizardMessages {
+	// Bundle ID
+	private static final String BUNDLE_ID = AutotoolsWizardMessages.class.getName();
+	//Resource bundle.
+	private static ResourceBundle resourceBundle;
+
+	static {
+		try {
+			resourceBundle = ResourceBundle.getBundle(BUNDLE_ID);
+		} catch (MissingResourceException x) {
+			resourceBundle = null;
+		}
+	}
+
+	public static String getFormattedString(String key, String arg) {
+		return MessageFormat.format(getResourceString(key), new Object[] { arg });
+	}
+
+	public static String getFormattedString(String key, String[] args) {
+		return MessageFormat.format(getResourceString(key), (Object[])args);
+	}
+
+	public static String getResourceString(String key) {
+		try {
+			return resourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!"; //$NON-NLS-1$ //$NON-NLS-2$
+		} catch (NullPointerException e) {
+			return "#" + key + "#"; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	private AutotoolsWizardMessages() {
+		// No constructor
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsWizardMessages.properties b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsWizardMessages.properties
new file mode 100644
index 0000000..5583ca1
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/AutotoolsWizardMessages.properties
@@ -0,0 +1,364 @@
+###############################################################################
+# Copyright (c) 2000, 2006, 2007 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM - Initial API and implementation
+# Red Hat - Copy to AutotoolsWizardMessages.properties
+###############################################################################
+
+# ------- Project Update Messages ------- 
+ManagedBuilderStartup.update.20x.title=Update Managed Make Project
+ManagedBuilderStartup.update.20x.message=The project {0} has been detected in your workspace.\n Its build settings are stored in a format that is no longer supported.\n Would you like to convert them now?
+
+AutotoolsBuildWizard.0=GNU Autotools project
+
+# ------- NewProjectCreationPluginPage------- 
+MngMakeProjectWizard.op_error=Managed Make Error
+MngMakeProjectWizard.title=Managed Make Project
+MngMakeProjectWizard.description=Create a new Managed Make project.
+#MngMakeProjectWizardSettings.title=Managed Make Settings
+#MngMakeProjectWizardSettings.description=Define the Managed Make build settings.
+MngMakeProjectWizard.message.add_nature=Adding Managed Nature
+MngMakeProjectWizard.message.add_builder=Adding Makefile Generator
+MngMakeProjectWizard.message.save=Saving new build options
+
+MngCWizard.title=Managed Make C Project
+MngCWizard.description=Create a new Managed Make C project.
+MngCWizardSettings.title=Managed Make C Settings
+MngCWizardSettings.description=Define the Managed Make C build settings.
+
+MngCCWizard.title=Managed Make C++ Project
+MngCCWizard.description=Create a new Managed Make C++ Project.
+MngCCWizard.message.creating=Creating a new C++ Project with a makefile generator
+MngCCWizardSettings.title=Managed Make C++ Settings
+MngCCWizardSettings.description=Define the Managed Make C++ build settings.
+
+# -- Strings for the platform selection page --
+MngMakeProjectWizard.config.title=Select a type of project
+MngMakeProjectWizard.config.desc=Select the platform and configurations you wish to deploy on
+PlatformBlock.tip.platform=Select the type of project for the build goal
+PlatformBlock.tip.forcedconfigs=There are no buildable configurations on this platform for this project type.\n By default, all configurations selected.
+PlatformBlock.label.platform=Project Type:
+PlatformBlock.label.configs=Configurations:
+PlatformBlock.label.showall=Show All Project Types
+PlatformBlock.label.showall.config=Show All Configurations
+PlatformBlock.label.selectAll=Select All
+PlatformBlock.label.deselectAll=Deselect All
+PlatformBlock.message.error.noconfigs=You must select at least one configuration
+
+# -- Strings for the additional options tab
+MngMakeProjectWizard.options.title=Additional Project Settings
+MngMakeProjectWizard.options.desc=Define the inter-project dependencies, if any.
+
+# ----------- Configuration Selection Page -----------
+BuildPropertyPage.label.Platform=Project Type:
+BuildPropertyPage.label.Configuration=Configuration:
+BuildPropertyPage.label.Active=Active configuration
+BuildPropertyPage.label.Settings=Configuration Settings
+BuildPropertyPage.label.AddConfButton=Manage...
+BuildPropertyPage.selection.configuration.all=All configurations
+BuildPropertyPage.tip.platform=Select a platform for the project
+BuildPropertyPage.tip.config=Select the configuration to edit
+BuildPropertyPage.tip.addconf=Add configurations for the platform
+BuildPropertyPage.tip.remconf=Remove configurations for the platform
+BuildPropertyPage.manage.title=Manage
+BuildPropertyPage.error.Unknown_tree_element=Unknown type of element in tree of type {0}
+BuildPropertyPage.error.version_low=The Managed Make project settings for this project are not available.
+BuildPropertyPage.defaults.title=Reset Configuration Tools
+BuildPropertyPage.defaults.message=This action will reset all of the tools in the selected configuration to their default settings.\n\nDo you want to proceed? 
+BuildPropertyPage.changes.save.title=Apply Configuration Changes
+BuildPropertyPage.changes.save.question=You have made changes to the {0} configuration.\n\nDo you want to apply these changes before switching to the {1} configuration? 
+BuildPropertyPage.changes.save.error=The configuration changes could not be applied.
+BuildPropertyPage.unsupported.proj=The project support is not installed on the system
+BuildPropertyPage.unsupported.config=The configuration support is not installed on the system
+BuildPropertyPage.config.notselected=No configurations selected
+
+# ----------- Managed Build Custom Wizard Page Manager Error Strings -----------
+MBSCustomPageManager.error0=Unknown element type 
+MBSCustomPageManager.error1=\ for extension point 
+MBSCustomPageManager.error2=Unknown child element type 
+MBSCustomPageManager.error3=\ for wizardPage element in extension point 
+MBSCustomPageManager.error4=Missing projectType ID
+MBSCustomPageManager.error5=Missing projectType ID
+MBSCustomPageManager.error6=Missing nature ID
+
+
+# ----------- Managed Build Preference Page -----------
+BuildPreferencePage.label.Settings=Workspace Settings
+BuildPreferencePage.job.rebuild=Rebuilding the Managed Projects
+BuildPreferencePage.apply.internal.error=An Internal error has occured please check error log.
+
+#--------------- Resource Configuration Selection Page --------------
+ResourceBuildPropertyPage.defaults.title=Reset Resource Configuration Tool
+ResourceBuildPropertyPage.defaults.message=This action will reset all options of the tool in the current resource configuration to their default settings.\n\nDo you want to proceed? 
+
+# ----------- Tools Settings Block -----------
+ToolsSettingsBlock.label.Settings=Tool Settings
+ToolsSettingsBlock.label.ToolTree=Tools
+ToolsSettingsBlock.label.ToolOptions=Options
+
+# ----------- Build Settings Block -----------
+BuildSettingsBlock.label.Settings=Build Settings
+BuildSettingsBlock.label.makecmdgroup=Build command
+BuildSettingsBlock.label.makecmddef=Use default command
+BuildSettingsBlock.label.output.group=Build output
+BuildSettingsBlock.label.output.name=Artifact name:
+BuildSettingsBlock.label.output.extension=Artifact extension:
+BuildSettingsBlock.defaults.title=Reset Build Settings
+BuildSettingsBlock.defaults.message=This action will reset the build settings to their default settings.\n\nDo you want to proceed?
+BuildSettingsBlock.label.macros.group=Build Macros usage
+BuildSettingsBlock.label.macros.expand=Expand Build Environment Macros
+BuildSettingsBlock.label.internal.builder.group=Internal Builder
+BuildSettingsBlock.label.internal.builder.enable=Enable Internal Builder
+BuildSettingsBlock.label.internal.builder.ignore.err=Ignore build errorors
+BuildSettingsBlock.label.internal.builder.experimental.note=NOTE: This is experimental functionality
+
+
+# ----------- Build Steps Block -----------
+BuildStepSettingsBlock.label.Settings=Build Steps
+BuildStepSettingsBlock.label.prebuildstep.group=Pre-build step:
+BuildStepSettingsBlock.label.prebuildstep.cmd=Command:
+BuildStepSettingsBlock.label.prebuildstep.desc=Description:
+BuildStepSettingsBlock.label.postbuildstep.group=Post-build step:
+BuildStepSettingsBlock.label.postbuildstep.cmd=Command:
+BuildStepSettingsBlock.label.postbuildstep.desc=Description:
+BuildStepsSettingsBlock.defaults.title=Reset Build Steps
+BuildStepsSettingsBlock.defaults.message=This action will reset the pre-build and post-build steps to their default settings.\n\nDo you want to proceed?
+
+# ----------- Environment Set Block -----------
+EnvironmentSetBlock.label.environment=Environment
+EnvironmentSetBlock.label.environment.group=Environment variables
+EnvironmentSetBlock.label.tab.configuration=Configuration
+EnvironmentSetBlock.label.tab.project=Project
+EnvironmentSetBlock.label.tab.workspace=Workspace
+EnvironmentSetBlock.label.tab.eclipse=Eclipse Environment
+
+# ----------- Environment Block -----------
+EnvironmentBlock.label.header.name=Name
+EnvironmentBlock.label.header.value=Value
+EnvironmentBlock.label.button.new=New
+EnvironmentBlock.label.button.edit=Edit
+EnvironmentBlock.label.button.delete=Delete
+EnvironmentBlock.label.button.undef=Undefine
+EnvironmentBlock.label.value.undef=<UNDEFINED>
+EnvironmentBlock.label.button.check.chow.parent=Show parent level variables
+EnvironmentBlock.label.user.var=User Variables
+EnvironmentBlock.label.system.var=System Variables
+EnvironmentBlock.label.delete.confirm.title=Variable deletion confirmation
+EnvironmentBlock.label.delete.confirm.message=Are you sure you want to delete the selected user variable(s)? 
+EnvironmentBlock.label.delete.all.confirm.title=Variable deletion confirmation
+EnvironmentBlock.label.delete.all.confirm.message=Are you sure you want to delete all user variables? 
+
+# ----------- New Env Var Dialog -----------
+NewEnvVarDialog.label.name=Name
+NewEnvVarDialog.label.value=Value
+NewEnvVarDialog.label.delimiter=Delimiter
+NewEnvVarDialog.label.operation=Operation
+NewEnvVarDialog.label.operation.replace=Replace
+NewEnvVarDialog.label.operation.prepend=Prepend
+NewEnvVarDialog.label.operation.append=Append
+NewEnvVarDialog.label.operation.remove=Remove
+NewEnvVarDialog.label.value.prepend=Prepended Value
+NewEnvVarDialog.label.value.append=Appended Value
+NewEnvVarDialog.label.value.undef=<UNDEFINED>
+NewEnvVarDialog.label.title.new=Define a new variable
+NewEnvVarDialog.label.title.edit=Edit existing variable
+NewEnvVarDialog.label.status.cannot.create=The "{0}" Variable can not be created by user
+
+# ----------- Macros Set Block -----------
+MacrosSetBlock.label.macros=Macros
+MacrosSetBlock.label.macros.group=Macros
+MacrosSetBlock.label.tab.configuration=Configuration
+MacrosSetBlock.label.tab.project=Project
+MacrosSetBlock.label.tab.workspace=Workspace
+
+# ----------- Macros Block -----------
+MacrosBlock.label.header.name=Name
+MacrosBlock.label.header.type=Type
+MacrosBlock.label.header.value=Value
+MacrosBlock.label.button.new=New
+MacrosBlock.label.button.edit=Edit
+MacrosBlock.label.button.delete=Delete
+MacrosBlock.label.button.check.chow.parent=Show parent context macros
+MacrosBlock.label.user.macros=User Macros
+MacrosBlock.label.system.macros=System Macros
+MacrosBlock.label.delete.confirm.title=Macro deletion confirmation
+MacrosBlock.label.delete.confirm.message=Are you sure you want to delete the selected user Macro(s)? 
+MacrosBlock.label.delete.all.confirm.title=Macro deletion confirmation
+MacrosBlock.label.delete.all.confirm.message=Are you sure you want to delete all user macros?
+MacrosBlock.label.value.eclipse.dynamic=<ECLIPSE DYNAMIC VARIABLE>
+MacrosBlock.label.type.text=String
+MacrosBlock.label.type.text.list=StringList
+MacrosBlock.label.type.path.file=File
+MacrosBlock.label.type.path.dir=Dir
+MacrosBlock.label.type.path.file.list=FileList
+MacrosBlock.label.type.path.dir.list=DirList
+MacrosBlock.label.type.path.any=Path
+MacrosBlock.label.type.path.any.list=PathList
+
+
+# ----------- New Build Macro Dialog -----------
+NewBuildMacroDialog.label.name=Name
+NewBuildMacroDialog.label.value=Value
+NewBuildMacroDialog.label.type=Type
+NewBuildMacroDialog.label.type.text=String
+NewBuildMacroDialog.label.type.text.list=List of Strings
+NewBuildMacroDialog.label.type.path.file=File
+NewBuildMacroDialog.label.type.path.dir=Directory
+NewBuildMacroDialog.label.type.path.file.list=List of Files
+NewBuildMacroDialog.label.type.path.dir.list=List of Directories
+NewBuildMacroDialog.label.type.path.any=File or Directory
+NewBuildMacroDialog.label.type.path.any.list=List of Files or Directories
+NewBuildMacroDialog.label.browse=Browse
+NewBuildMacroDialog.label.title.new=Define a new macro
+NewBuildMacroDialog.label.title.edit=Edit existing macro
+NewBuildMacroDialog.label.list.title=Macro Value
+NewBuildMacroDialog.label.status.cannot.create=The "{0}" Macro can not be created by user
+
+# ------------Resource Configuration Selection Page
+ResourceBuildPropertyPage.label.ActiveResource=Active Resource configuration
+ResourceBuildPropertyPage.label.ResourceSettings=Resource Configuration settings
+ResourceBuildPropertyPage.label.Configuration=Configuration:
+ResourceBuildPropertyPage.label.ExcludeCheckBox= Exclude from build
+ResourceBuildPropertyPage.selection.configuration.all=All configurations
+ResourceBuildPropertyPage.label.ToolTree=Tools
+ResourceBuildPropertyPage.label.ToolOptions=Options
+ResourceBuildPropertyPage.label.NotMBSFile=The project is closed or the file is not contained within a Managed Make project.
+ResourceBuildPropertyPage.error.version_low=The Managed Make project settings for this project are not available.
+ResourceBuildPropertyPage.tip.excludecheck=Exclude the file from building in the selected configuration
+ResourceBuildPropertyPage.tip.config=Select the configuration to edit
+ResourceBuildPropertyPage.unsupported.proj=The project support is not installed on the system
+ResourceBuildPropertyPage.unsupported.config=The configuration support is not installed on the system
+ResourceBuildPropertyPage.config.notselected=No configurations selected
+ResourceBuildPropertyPage.rc.non.build=Managed Build settings for this resource are not available
+ResourceBuildPropertyPage.rc.generated=The selected resource is created by the buildfile generator
+
+# ----------- Resource Custom Build Step Block -----------
+ResourceCustomBuildStepBlock.label.settings=Custom Build Steps
+ResourceCustomBuildStepBlock.label.tool.group=Resource Custom Build Step
+ResourceCustomBuildStepBlock.label.applicability=Custom Build Step Applicability
+ResourceCustomBuildStepBlock.label.applicability.rule.before=Apply Custom Build Step Before Other Tools
+ResourceCustomBuildStepBlock.label.applicability.rule.after=Apply Custom Build Step After Other Tools
+ResourceCustomBuildStepBlock.label.applicability.rule.override=Apply Custom Build Step Overriding Other Tools
+ResourceCustomBuildStepBlock.label.applicability.rule.disable=Disable Custom Build Step
+ResourceCustomBuildStepBlock.label.input.filenames=Additional Input file name(s):
+ResourceCustomBuildStepBlock.label.output.filenames=Output file name(s):
+ResourceCustomBuildStepBlock.label.command.cmd=Command:
+ResourceCustomBuildStepBlock.label.description.desc=Description:
+ResourceCustomBuildStepBlock.tip.applicability=specifies how to apply the custom build step with respect to other resource configuration tools
+ResourceCustomBuildStepBlock.tip.inputs=a semicolon separated list of additional input files for this build step.  Paths are interpreted as relative to the Project directory.
+ResourceCustomBuildStepBlock.tip.outputs=a semicolon separated list of the output files produced by this build step.  Paths are interpreted as relative to the Build directory.
+ResourceCustomBuildStepBlock.tip.command=a semicolon separated list of commands or a single command to be executed by this build step.  Paths are interpreted as relative to the Build directory.
+ResourceCustomBuildStepBlock.tip.announcement=a message to be output in the build log upon execution of this build step
+ResourceCustomBuildStepBlock.defaults.title=Reset Resource Custom Build Step
+ResourceCustomBuildStepBlock.defaults.message=This action will reset the resource custom build step to the default settings.\n\nDo you want to proceed?
+
+# ----------- Entry Dialog -----------
+BrowseEntryDialog.error.Folder_name_invalid = Folder name invalid
+BrowseEntryDialog.message.file = File:
+BrowseEntryDialog.message.directory = Directory:
+BrowseEntryDialog.file.title.add=Add file path
+BrowseEntryDialog.dir.title.add=Add directory path
+BrowseEntryDialog.file.title.edit=Edit file path
+BrowseEntryDialog.dir.title.edit=Edit directory path
+BrowseEntryDialog.wsp.dir.dlg.title=Folder selection
+BrowseEntryDialog.wsp.file.dlg.title=File selection
+BrowseEntryDialog.wsp.dir.dlg.msg=Select a folder from workspace:
+BrowseEntryDialog.wsp.file.dlg.msg=Select a file from workspace:
+BrowseEntryDialog.wsp.file.dlg.err=The selected element is not a file.
+BrowseEntryDialog.fs.dir.dlg.msg=Select a folder from file system:
+
+# ----------- New Configuration -----------
+NewConfiguration.label.name=Name:
+NewConfiguration.label.description=Description:
+NewConfiguration.label.group=Copy settings from
+NewConfiguration.label.copy=Default configuration:
+NewConfiguration.label.clone=Existing configuration:
+NewConfiguration.label.showall=Show unsupported configurations 
+NewConfiguration.error.duplicateName=A configuration named "{0}" already exists.
+NewConfiguration.error.caseName=A configuration name that differs only in case to "{0}" exists.
+NewConfiguration.error.invalidName=The name "{0}" is invalid.
+
+# ----------- Rename Configuration -----------
+RenameConfiguration.label.name=Name:
+RenameConfiguration.label.description=Description:
+RenameConfiguration.error.duplicateName=A configuration named "{0}" already exists.
+RenameConfiguration.error.caseName=A configuration name that differs only in case to "{0}" exists.
+RenameConfiguration.error.invalidName=The name "{0}" is invalid.
+
+# ----------- Target/Config management dialog -----------------
+ManageConfig.label.configs=Manage configurations
+ManageConfig.label.rename=Rename
+ManageConfig.label.conversionTargetLabel=Tool chain conversion targets:
+ManageConfig.label.convertTarget=Convert
+ManageConfig.label.new.config.dialog=Create configuration
+ManageConfig.label.rename.config.dialog=Rename configuration
+ManageConfig.deletedialog.message=Are you sure you want to delete the "{0}" configuration?
+ManageConfig.deletedialog.title=Confirm Delete
+
+# Toolchain Conversion Target confirmation Dialog
+ConfigurationConvert.confirmdialog.message=Currently the "{0}" Configuration uses "{1}" tool-chain. After conversion it will use "{2}" tool-chain. Do you want to proceed?
+ConfigurationConvert.confirmdialog.title=Confirm Configuration Conversion
+
+# ----------- Build Property Common -----------
+BuildPropertyCommon.label.title=Enter Value
+BuildPropertyCommon.label.new=New...
+BuildPropertyCommon.label.remove=Remove
+BuildPropertyCommon.label.up=Up
+BuildPropertyCommon.label.down=Down
+BuildPropertyCommon.label.editVar=Edit...
+BuildPropertyCommon.label.addVar=Add
+BuildPropertyCommon.label.message=Value:
+BuildPropertyCommon.label.browse=Browse...
+BuildPropertyCommon.label.configs=Defined configurations:
+
+# ----------- Field Editors -----------
+Multiline.error.message=Please give correct input
+
+# ----------- Build Tool Settings -----------
+BuildToolSettingsPage.alloptions=All options:
+BuildToolSettingsPage.tool.command=Command:
+BuildToolSettingsPage.tool.commandLinePattern=Command\nline pattern:
+BuildToolSettingsPage.tool.advancedSettings=Expert settings:
+
+# ----------- File List Control -----------
+FileListControl.add=Add
+FileListControl.delete=Delete
+FileListControl.edit=Edit
+FileListControl.moveup=Move Up
+FileListControl.movedown=Move Down
+FileListControl.filedialog.title=Select File
+FileListControl.dirdialog.title=Select Include Directory
+FileListControl.dirdialog.desc=Select Include Paths
+FileListControl.deletedialog.message=Are you sure you want to delete the selected files or directories?
+FileListControl.deletedialog.title=Confirm Delete
+FileListControl.editdialog.title=Edit Dialog
+FileListControl.newdialog.title=New Dialog
+FileListControl.button.workspace=Workspace...
+FileListControl.button.fs=File system...
+
+# ----------- Property Page ----------
+MngMakeProjectPropertyPage.closedproject=Project Closed
+MngMakeProjectPropertyPage.internalError=An Internal error has occur please check error log.
+
+# Copies from org.eclipse.ui.workbench
+showAdvanced = &Advanced >>
+hideAdvanced = << &Advanced
+NewFolderDialog.folderNameEmpty = Folder name must be specified
+
+# Project Conversion Dialog messages
+ProjectConvert.confirmdialog.title=Confirm Project Conversion
+ProjectConvert.confirmdialog.message=The selected project {0} will be converted. Do you want to proceed ?
+
+ProjectConvert.conversionErrordialog.title=Project Conversion Error
+ProjectConvert.conversionErrordialog.message=Error has occured during the conversion of the project {0} .
+
+ProjectConvert.noConverterErrordialog.title=Project Conversion Error
+ProjectConvert.noConverterErrordialog.message=There are no converters available to convert the project {0} .
+
+ProjectConvert.title=Project Converters for {0}
+ProjectConvert.convertersList=Converters List
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/CProjectPlatformPage.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/CProjectPlatformPage.java
new file mode 100644
index 0000000..323349d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/CProjectPlatformPage.java
@@ -0,0 +1,319 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Rational Software - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.cdt.core.CProjectNature;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IProjectType;
+import org.eclipse.cdt.managedbuilder.core.IToolChain;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.managedbuilder.ui.wizards.MBSCustomPageManager;
+import org.eclipse.cdt.ui.newui.CDTHelpContextIds;
+import org.eclipse.cdt.ui.wizards.NewCProjectWizard;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.viewers.CheckboxTableViewer;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.PlatformUI;
+
+
+/**
+ * Class that implements the project type and configuration selection page in the new 
+ * project wizard for managed builder projects.
+ * 
+ * @since 1.2
+ */
+public class CProjectPlatformPage extends WizardPage {
+	/*
+	 * Dialog variables and string constants
+	 */
+	private static final String PREFIX = "PlatformBlock"; //$NON-NLS-1$
+	private static final String LABEL = PREFIX + ".label"; //$NON-NLS-1$
+	private static final String TIP = PREFIX + ".tip"; //$NON-NLS-1$
+	private static final String CONFIG_LABEL = LABEL + ".configs"; //$NON-NLS-1$
+	private static final String TARGET_LABEL = LABEL + ".platform"; //$NON-NLS-1$
+	private static final String TARGET_TIP = TIP + ".platform"; //$NON-NLS-1$
+	private static final String FORCEDCONFIG_TIP = TIP + ".forcedconfigs"; //$NON-NLS-1$
+	
+	// support for exporting data to custom wizard pages
+	public static final String PAGE_ID = "org.eclipse.cdt.managedbuilder.ui.wizard.platformPage"; //$NON-NLS-1$
+	public static final String PROJECT_TYPE = "projectType"; //$NON-NLS-1$
+	public static final String TOOLCHAIN = "toolchain"; //$NON-NLS-1$
+	public static final String NATURE = "nature"; //$NON-NLS-1$
+	
+	protected Wizard parentWizard;
+	protected Text platformSelection;
+	private ArrayList<Object> selectedConfigurations;
+	protected IProjectType projectType;
+	protected Button showAllConfigs;
+	protected boolean showAllConfigsForced;
+	protected CheckboxTableViewer tableViewer;
+	protected IConfiguration configurations[];
+
+	/**
+	 * Constructor.
+	 * @param pageName
+	 * @param wizard
+	 */
+	public CProjectPlatformPage(String pageName, Wizard parentWizard) {
+		super(pageName);
+		setPageComplete(false);
+		projectType = ManagedBuildManager.getExtensionProjectType("org.eclipse.linuxtools.cdt.autotools.core.projectType"); //$NON-NLS-1$
+		selectedConfigurations = new ArrayList<Object>(0);
+		this.parentWizard = parentWizard;
+		showAllConfigsForced = false;
+	}
+
+	/**
+	 * @see org.eclipse.jface.wizard.IWizardPage#canFlipToNextPage()
+	 */
+	public boolean canFlipToNextPage() {
+		return validatePage();
+	}
+
+	private void createConfigSelectionGroup (Composite parent) {
+		// Create the group composite
+		Composite composite = new Composite(parent, SWT.NULL);
+		composite.setFont(parent.getFont());
+		composite.setLayout(new GridLayout());
+		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+		// Create a check box table of valid configurations
+		final Label configLabel = new Label(composite, SWT.LEFT);
+		configLabel.setFont(composite.getFont());
+		configLabel.setText(AutotoolsWizardMessages.getResourceString(CONFIG_LABEL));
+
+		Table table = new Table(composite, SWT.CHECK | SWT.BORDER | SWT.MULTI
+								| SWT.SINGLE | SWT.H_SCROLL	| SWT.V_SCROLL);
+		table.setLayoutData(new GridData(GridData.FILL_BOTH));
+		table.setHeaderVisible(true);
+		table.setLinesVisible(false);
+
+		// Add a table layout to the table
+		TableLayout tableLayout = new TableLayout();
+		table.setHeaderVisible(false);
+		table.setLayout(tableLayout);
+
+		// Add the viewer
+		tableViewer = new CheckboxTableViewer(table);
+		tableViewer.setLabelProvider(new ConfigurationLabelProvider());
+		tableViewer.setContentProvider(new ConfigurationContentProvider());
+		tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+			public void selectionChanged(SelectionChangedEvent e) {
+				// will default to false until a selection is made
+				handleConfigurationSelectionChange();
+			}
+		});
+
+	}
+	
+	/**
+	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
+	 */
+	public void createControl(Composite parent) {
+		// Create the composite control for the tab
+		Composite composite = new Composite(parent, SWT.NULL);
+		composite.setFont(parent.getFont());
+		composite.setLayout(new GridLayout());
+		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+		// Setup the help information
+		PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, CDTHelpContextIds.MAN_PROJ_PLATFORM_HELP);
+
+		// Create the widgets
+		createTypeSelectGroup(composite);
+		createConfigSelectionGroup(composite);
+
+		// Publish which project type has been chosen with the custom wizard page manager
+		MBSCustomPageManager.addPageProperty(PAGE_ID, PROJECT_TYPE, projectType.getId());
+
+		// Select configuration
+		populateConfigurations();
+		setPageComplete(validatePage());
+		
+		// Do the nasty
+		setErrorMessage(null);
+		setMessage(null);
+		setControl(composite);
+	}
+
+	
+	private void createTypeSelectGroup(Composite parent) {
+		// Create the group composite
+		Composite composite = new Composite(parent, SWT.NULL);
+		composite.setFont(parent.getFont());
+		composite.setLayout(new GridLayout(2, false));
+		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+		// Create the platform selection label and combo widgets
+		final Label platformLabel = new Label(composite, SWT.LEFT);
+		platformLabel.setFont(composite.getFont());
+		platformLabel.setText(AutotoolsWizardMessages.getResourceString(TARGET_LABEL));
+
+		platformSelection = new Text(composite, SWT.READ_ONLY);
+//		platformSelection = new Combo(composite, SWT.READ_ONLY | SWT.BORDER);	
+		platformSelection.setFont(composite.getFont());
+		platformSelection.setToolTipText(AutotoolsWizardMessages.getResourceString(TARGET_TIP));
+		platformSelection.setText("GNU Autotools"); //$NON-NLS-1$
+		platformSelection.addDisposeListener(new DisposeListener() {
+			public void widgetDisposed(DisposeEvent e) {
+				platformSelection = null;
+			}
+		});
+		
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		// Make this the same as NewCProjectWizardPage.SIZING_TEXT_FIELD_WIDTH
+		gd.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH + 50;
+		platformSelection.setLayoutData(gd);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.dialogs.ICOptionContainer#getProject()
+	 */
+	public IProject getProject() {
+		return ((NewCProjectWizard)getWizard()).getNewProject();
+	}
+	
+	/**
+	 * @return
+	 */
+	public IConfiguration[] getSelectedConfigurations() {
+		return (IConfiguration[]) selectedConfigurations.toArray(new IConfiguration[selectedConfigurations.size()]);
+	}
+
+	/**
+	 * Returns the selected project type.
+	 * 
+	 * @return IProjectType Selected type or <code>null</code> if an invalid selection
+	 * has been made.
+	 */
+	public IProjectType getProjectType() {
+		return projectType;
+	}
+
+	private void handleConfigurationSelectionChange() {
+		// Get the selections from the table viewer
+		selectedConfigurations.clear();
+		selectedConfigurations.addAll(Arrays.asList(tableViewer.getCheckedElements()));
+		
+		// support for publishing the toolchains for the selected configs so that custom wizard
+		// pages will know which toolchains have been selected
+		
+		// get the toolchains from the selected configs and put them into a set
+		Set<IToolChain> toolchainSet = new LinkedHashSet<IToolChain>();
+		for(int k = 0; k < selectedConfigurations.size(); k++)
+		{
+			IConfiguration config = (IConfiguration) selectedConfigurations.get(k);
+			IToolChain toolchain = config.getToolChain();
+			toolchainSet.add(toolchain);
+		}
+		
+		// publish the set of selected toolchains with the custom page manager
+		MBSCustomPageManager.addPageProperty(PAGE_ID, TOOLCHAIN, toolchainSet);
+		
+		// TODO: Don't know where this goes and how to find true nature
+		MBSCustomPageManager.addPageProperty(CProjectPlatformPage.PAGE_ID, CProjectPlatformPage.NATURE, CProjectNature.C_NATURE_ID);
+		
+		setPageComplete(validatePage());
+	}
+
+	/**
+	 * Populate the table viewer with either all known configurations
+	 * or only with the supported configurations depending on whether a user
+	 * has chosen to display unsupported configurations or not 
+	 * By default, only supported configurations are selected.
+	 */
+	private void populateConfigurations() {
+		if (projectType == null)
+			return;
+		IConfiguration selected[] = null;
+		
+		configurations = filterSupportedConfigurations(projectType.getConfigurations());
+		selected = configurations;
+	
+		// Check for buildable configs on this platform
+		if (selected.length == 0) {
+			// Indicate that there are no buildable configurations on this platform for this project
+			// type and that all configurations will be selected
+			setMessage(AutotoolsWizardMessages.getResourceString(FORCEDCONFIG_TIP), WARNING);
+		}
+		else { 
+			setMessage(null, NONE);
+		}
+		
+		tableViewer.setInput(configurations);
+		tableViewer.setCheckedElements(selected);
+		handleConfigurationSelectionChange();
+	}
+
+	/**
+	 * Returns the array of supported configurations found in the configurations
+	 * passed to this method
+	 */
+	IConfiguration[] filterSupportedConfigurations(IConfiguration cfgs[]){
+		ArrayList<IConfiguration> supported = new ArrayList<IConfiguration>();
+		String os = Platform.getOS();
+		String arch = Platform.getOSArch();
+
+		for (int i = 0; i < cfgs.length; i++) {
+			// First, filter on supported state
+			if (cfgs[i].isSupported()) {				
+				// Now, apply the OS and ARCH filters to determine if the configuration should be shown
+				// Determine if the configuration's tool-chain supports this OS & Architecture.
+				IToolChain tc = cfgs[i].getToolChain();
+				List<String> osList = Arrays.asList(tc.getOSList());
+				if (osList.contains("all") || osList.contains(os)) {	//$NON-NLS-1$
+					List<String> archList = Arrays.asList(tc.getArchList());
+					if (archList.contains("all") || archList.contains(arch)) { //$NON-NLS-1$
+						supported.add(cfgs[i]);						
+					}
+				}		
+			}
+		}
+		return (IConfiguration[])supported.toArray(new IConfiguration[supported.size()]);
+	}
+	
+
+	/**
+	 * @return
+	 */
+	private boolean validatePage() {
+		// TODO some validation ... maybe
+		if ((tableViewer.getCheckedElements()).length > 0) {
+			setErrorMessage(null);
+			return true;
+		} else {
+			setErrorMessage(AutotoolsWizardMessages.getResourceString("PlatformBlock.message.error.noconfigs"));	//$NON-NLS-1$
+			return false;
+		}
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConfigurationContentProvider.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConfigurationContentProvider.java
new file mode 100644
index 0000000..7fc4b20
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConfigurationContentProvider.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2005, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Rational Software - Initial API and implementation
+ * Red Hat Inc. - Copy from CDT 3.1.2 to here
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards;
+
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+
+public class ConfigurationContentProvider implements IStructuredContentProvider {
+	// The contents of the parent of the table is a list of configurations
+	public Object[] getElements(Object parent) {
+		// The content is an array of configurations
+		Object array[] = (Object[])parent;
+		return (array == null || array.length == 0) ? new Object[0] : array;
+	}
+
+	public void dispose() {
+	}
+
+	public void inputChanged(
+		Viewer viewer,
+		Object oldInput,
+		Object newInput) {
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConfigurationLabelProvider.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConfigurationLabelProvider.java
new file mode 100644
index 0000000..3d7f3de
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConfigurationLabelProvider.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2005, 2007 Rational Software Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Rational Software - Initial API and implementation
+ * Red Hat Inc. - Copy from CDT 3.1.2 to here
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards;
+
+
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.AutotoolsUIPluginImages;
+import org.eclipse.swt.graphics.Image;
+
+
+public class ConfigurationLabelProvider	extends LabelProvider implements ITableLabelProvider {
+	private final Image IMG_CFG =
+		AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_BUILD_CONFIG);
+
+	// 
+	public String getColumnText(Object obj, int index) {
+		if (obj instanceof IConfiguration) {
+			IConfiguration tmpConfig = (IConfiguration) obj;
+			
+			if( (tmpConfig.getDescription() == null)|| (tmpConfig.getDescription().equals("")) )	//$NON-NLS-1$
+				return ((IConfiguration) obj).getName();
+			else
+				return ( tmpConfig.getName() + " ( " + tmpConfig.getDescription() + " )");	//$NON-NLS-1$	//$NON-NLS-2$
+		}
+		return new String();
+	}
+
+	public Image getColumnImage(Object obj, int index) {
+		return IMG_CFG;
+	}
+}
+
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizard.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizard.java
new file mode 100644
index 0000000..a917e47
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizard.java
@@ -0,0 +1,218 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2004, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards;
+
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IProjectType;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
+import org.eclipse.cdt.managedbuilder.ui.wizards.MBSCustomPageManager;
+import org.eclipse.cdt.ui.wizards.NewCProjectWizardPage;
+import org.eclipse.cdt.ui.wizards.conversion.ConversionWizard;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+
+
+/**
+ * This wizard provides a method by which the user can 
+ * add a C nature to a project that previously had no nature associated with it.
+ */
+public class ConvertToAutotoolsProjectWizard extends ConversionWizard {
+
+	private static final String WZ_TITLE = "WizardAutotoolsProjectConversion.title"; //$NON-NLS-1$
+	private static final String WZ_DESC = "WizardAutotoolsProjectConversion.description"; //$NON-NLS-1$
+	private static final String PREFIX = "WizardAutotoolsConversion"; //$NON-NLS-1$
+	private static final String WINDOW_TITLE = "WizardAutotoolsConversion.windowTitle"; //$NON-NLS-1$
+	protected static final String CONF_TITLE = PREFIX + ".config.title";	//$NON-NLS-1$
+	protected static final String CONF_DESC = PREFIX + ".config.desc";	//$NON-NLS-1$
+	protected static final String MSG_SAVE = PREFIX + ".message.save";	//$NON-NLS-1$
+	protected static final String OPTIONS_TITLE = PREFIX + ".options.title";	//$NON-NLS-1$
+	protected static final String OPTIONS_DESC = PREFIX + ".options.desc";	//$NON-NLS-1$
+
+	public static final String NULL_INDEXER_ID = "org.eclipse.cdt.core.nullindexer"; //$NON-NLS-1$
+	
+	protected CProjectPlatformPage projectConfigurationPage;
+	protected NewAutotoolsProjectOptionPage optionPage;
+
+	protected IProject curProject;
+	
+	/**
+	 * ConvertToAutotoolsConversionWizard Wizard constructor
+	 */
+	public ConvertToAutotoolsProjectWizard() {
+		this(getWindowTitleResource(), getWzDescriptionResource());
+	}
+	/**
+	 * ConvertToAutotoolsConversionWizard Wizard constructor
+	 * 
+	 * @param title
+	 * @param desc
+	 */
+	public ConvertToAutotoolsProjectWizard(String title, String desc) {
+		super(title, desc);
+	}
+
+	/**
+	 * Method getWzDescriptionResource,  allows Wizard description label value
+	 * to be changed by subclasses
+	 * 
+	 * @return String
+	 */
+	protected static String getWzDescriptionResource() {
+		return AutotoolsUIPlugin.getResourceString(WZ_DESC);
+	}
+
+	/**
+	 * Method getWzTitleResource,  allows Wizard description label value
+	 * to be changed by subclasses
+	 * 
+	 * @return String
+	 */
+	protected static String getWzTitleResource() {
+		return AutotoolsUIPlugin.getResourceString(WZ_TITLE);
+	}
+
+	/**
+	 * Method getWindowTitleResource, allows Wizard Title label value to be
+	 * changed by subclasses
+	 * 
+	 * @return String
+	 */
+	protected static String getWindowTitleResource() {
+		return AutotoolsUIPlugin.getResourceString(WINDOW_TITLE);
+	}
+
+	/**
+	  * Method getPrefix,  allows prefix value to be changed by subclasses
+	  * 
+	  * @return String
+	  */
+	protected static String getPrefix() {
+		return PREFIX;
+	}
+
+	/**
+	 * Method addPages adds our Simple to C conversion Wizard page.
+	 * 
+	 * @see Wizard#createPages
+	 */
+	public void addPages() {
+		addPage(mainPage = new ConvertToAutotoolsProjectWizardPage(getPrefix(), this));
+		
+		// Add the configuration selection page
+		projectConfigurationPage = new CProjectPlatformPage(PREFIX, this);
+		projectConfigurationPage.setTitle(AutotoolsUIPlugin.getResourceString(CONF_TITLE));
+		projectConfigurationPage.setDescription(AutotoolsUIPlugin.getResourceString(CONF_DESC));
+		addPage(projectConfigurationPage);
+
+		// Add the options (tabbed) page
+		optionPage = new NewAutotoolsProjectOptionPage(PREFIX, this);
+		optionPage.setTitle(AutotoolsUIPlugin.getResourceString(OPTIONS_TITLE));
+		optionPage.setDescription(AutotoolsUIPlugin.getResourceString(OPTIONS_DESC));
+		addPage(optionPage);
+		
+		// add custom pages
+		MBSCustomPageManager.init();
+		
+		// add stock pages
+		MBSCustomPageManager.addStockPage(fMainPage, NewCProjectWizardPage.PAGE_ID);
+		MBSCustomPageManager.addStockPage(projectConfigurationPage, CProjectPlatformPage.PAGE_ID);
+		MBSCustomPageManager.addStockPage(optionPage, NewAutotoolsProjectOptionPage.PAGE_ID);
+	}
+
+	public String getProjectID() {
+		return ManagedBuilderCorePlugin.MANAGED_MAKE_PROJECT_ID;
+	}
+
+	public IProjectType getProjectType() {
+		return projectConfigurationPage.getProjectType();
+	}
+
+	public IConfiguration[] getSelectedConfigurations() {
+		return projectConfigurationPage.getSelectedConfigurations();
+	}
+
+	protected void setCurrentProject (IProject project) {
+		curProject = project;
+	}
+	
+	public IProject getProject() {
+		return curProject;
+	}
+	
+	public void applyOptions(IProject project, IProgressMonitor monitor) {
+		// When applying the project options, we need to specify which
+		// project because the conversion wizard allows us to convert
+		// more than one project at once.  We accomplish this by setting
+		// the current project we are working on.  The optionPage when
+		// applying options will ask the wizard (us) to get the project which
+		// we will report is the current project being converted.
+		setCurrentProject(project);
+    	optionPage.performApply(monitor);
+    }
+	
+	protected void doRun(IProgressMonitor monitor) throws CoreException {
+		monitor.beginTask(AutotoolsUIPlugin.getResourceString("WizardAutotoolsProjectConversion.monitor.convertingToMakeProject"), 2); //$NON-NLS-1$
+		try {
+			super.doRun(new SubProgressMonitor(monitor, 5));
+		} finally {
+			monitor.done();
+		}
+		
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.wizards.NewCProjectWizard#doRunPrologue(org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	protected void doRunPrologue(IProgressMonitor monitor) {
+		// Auto-generated method stub
+
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.wizards.NewCProjectWizard#doRunEpilogue(org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	protected void doRunEpilogue(IProgressMonitor monitor) {
+		// Get my initializer to run
+//		if (project == null)
+//			return;
+//
+//		IStatus initResult = ManagedBuildManager.initBuildInfoContainer(project);
+//		if (initResult.getCode() != IStatus.OK) {
+//			// At this point, I can live with a failure
+//			ManagedBuilderUIPlugin.log(initResult);
+//		}
+		
+		// execute any operations specified by custom pages
+		IRunnableWithProgress operations[] = MBSCustomPageManager.getOperations();
+		
+		if (operations != null)
+		{
+			for(int k = 0; k < operations.length; k++)
+			{
+				try {
+				operations[k].run(monitor);
+				} catch(InvocationTargetException e) {
+					//TODO: what should we do?
+				} catch(InterruptedException e) {
+					//TODO: what should we do?
+				}
+			}
+		}
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizardPage.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizardPage.java
new file mode 100644
index 0000000..ab1c3e4
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ConvertToAutotoolsProjectWizardPage.java
@@ -0,0 +1,224 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2004, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards;
+
+ 
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
+import org.eclipse.cdt.managedbuilder.core.BuildException;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.IManagedProject;
+import org.eclipse.cdt.managedbuilder.core.IProjectType;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
+import org.eclipse.cdt.ui.wizards.conversion.ConvertProjectWizardPage;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.linuxtools.cdt.autotools.core.AutotoolsNewProjectNature;
+import org.eclipse.linuxtools.cdt.autotools.ui.AutotoolsUIPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.AutotoolsPropertyConstants;
+import org.eclipse.linuxtools.internal.cdt.autotools.core.configure.AutotoolsConfigurationManager;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
+
+
+/**
+ *
+ * ConvertToAutotoolsProjectWizardPage
+ * Standard main page for a wizard that adds a Managed Make C project Nature to a project with no nature associated with it.
+ * This conversion is one way in that the project cannot be converted back (i.e have the nature removed).
+ *
+ * @author Jeff Johnston
+ * @since Feb 8, 2006
+ *<p>
+ * Example useage:
+ * <pre>
+ * mainPage = new ConvertToAutotoolsProjectWizardPage("ConvertProjectPage");
+ * mainPage.setTitle("Project Conversion");
+ * mainPage.setDescription("Add C or C++ Managed Make Nature to a project.");
+ * </pre>
+ * </p>
+ */
+public class ConvertToAutotoolsProjectWizardPage extends ConvertProjectWizardPage {
+    
+    private static final String WZ_TITLE = "WizardAutotoolsProjectConversion.title"; //$NON-NLS-1$
+    private static final String WZ_DESC = "WizardAutotoolsProjectConversion.description"; //$NON-NLS-1$
+    private static final String PREFIX = "WizardAutotoolsProjectConversion";
+	protected static final String MSG_ADD_NATURE = PREFIX + ".message.add_nature";	//$NON-NLS-1$
+	protected static final String MSG_ADD_BUILDER = PREFIX + ".message.add_builder";	//$NON-NLS-1$
+	protected static final String MSG_SAVE = PREFIX + ".message.save";	//$NON-NLS-1$
+    
+	/**
+	 * Constructor for ConvertToStdMakeProjectWizardPage.
+	 * @param pageName
+	 */
+	public ConvertToAutotoolsProjectWizardPage(String pageName, ConvertToAutotoolsProjectWizard wizard) {
+		super(pageName);
+		setWizard(wizard);
+	}
+    
+    /**
+     * Method getWzTitleResource returns the correct Title Label for this class
+     * overriding the default in the superclass.
+     */
+    protected String getWzTitleResource(){
+        return AutotoolsUIPlugin.getResourceString(WZ_TITLE);
+    }
+    
+    /**
+     * Method getWzDescriptionResource returns the correct description
+     * Label for this class overriding the default in the superclass.
+     */
+    protected String getWzDescriptionResource(){
+        return AutotoolsUIPlugin.getResourceString(WZ_DESC);
+    }
+       
+    /**
+     * Method isCandidate returns true for all projects.
+     * 
+     * @param project
+     * @return boolean
+     */
+    public boolean isCandidate(IProject project) { 
+		return true; // all 
+    }    
+    
+    protected IProjectType getProjectType() {
+    	return ((ConvertToAutotoolsProjectWizard)getWizard()).getProjectType();
+    }
+    
+    protected IConfiguration[] getSelectedConfigurations() {
+    	return ((ConvertToAutotoolsProjectWizard)getWizard()).getSelectedConfigurations();
+    }
+    
+    protected void applyOptions(IProject project, IProgressMonitor monitor) {
+    	((ConvertToAutotoolsProjectWizard)getWizard()).applyOptions(project, monitor);
+    }
+    
+	public void convertProject(IProject project, IProgressMonitor monitor, String projectID) throws CoreException {
+		monitor.beginTask(AutotoolsUIPlugin.getResourceString("WizardMakeProjectConversion.monitor.convertingToMakeProject"), 7); //$NON-NLS-1$
+		IConfiguration defaultCfg = null;
+		try {
+			super.convertProject(project, new SubProgressMonitor(monitor, 1), projectID);
+			monitor.subTask(AutotoolsUIPlugin.getResourceString(MSG_ADD_NATURE));
+			ManagedCProjectNature.addManagedNature(project, new SubProgressMonitor(monitor, 1));
+			AutotoolsNewProjectNature.addAutotoolsNature(project, new SubProgressMonitor(monitor, 1));
+			// We need to remove any old Autotools nature, if one exists.
+			AutotoolsNewProjectNature.removeOldAutotoolsNature(project, new SubProgressMonitor(monitor, 1));
+			monitor.subTask(AutotoolsUIPlugin.getResourceString(MSG_ADD_BUILDER));
+//			ManagedCProjectNature.addManagedBuilder(project, new SubProgressMonitor(monitor, 1));
+			AutotoolsNewProjectNature.addAutotoolsBuilder(project, new SubProgressMonitor(monitor,1));
+			// FIXME: Default scanner property: make -w - eventually we want to use Make core's build scanner
+			project.setPersistentProperty(AutotoolsPropertyConstants.SCANNER_USE_MAKE_W, AutotoolsPropertyConstants.TRUE);
+			CCorePlugin.getDefault().mapCProjectOwner(project, projectID, true);
+			// Add the ManagedProject to the project
+			IManagedProject newManagedProject = null;
+			IManagedBuildInfo info = null;
+			try {
+				info = ManagedBuildManager.createBuildInfo(project);
+				IProjectType parent = getProjectType();
+				newManagedProject = ManagedBuildManager.createManagedProject(project, parent);
+				if (newManagedProject != null) {
+					IConfiguration [] selectedConfigs = getSelectedConfigurations();
+					for (int i = 0; i < selectedConfigs.length; i++) {
+						IConfiguration config = selectedConfigs[i];
+						int id = ManagedBuildManager.getRandomNumber();
+						IConfiguration newConfig = newManagedProject.createConfiguration(config, config.getId() + "." + id); //$NON-NLS-1$
+						newConfig.setArtifactName(newManagedProject.getDefaultArtifactName());
+					}
+					// Now add the first supported config in the list as the default
+					IConfiguration[] newConfigs = newManagedProject.getConfigurations();
+					for(int i = 0; i < newConfigs.length; i++) {
+						if(newConfigs[i].isSupported()){
+							defaultCfg = newConfigs[i];
+							break;
+						}
+					}
+					
+					if(defaultCfg == null && newConfigs.length > 0)
+						defaultCfg = newConfigs[0];
+					
+					
+					if(defaultCfg != null) {
+						ManagedBuildManager.setDefaultConfiguration(project, defaultCfg);
+						ManagedBuildManager.setSelectedConfiguration(project, defaultCfg);
+					}
+					ManagedBuildManager.setNewProjectVersion(project);
+				}
+			} catch (BuildException e) {
+				AutotoolsUIPlugin.log(e);
+			}
+
+			// Following is a bit of a hack because changing the project options
+			// causes a change event to be fired which will try to reindex the project.  
+			// We are in the middle of setting the project indexer which may end up 
+			// being the null indexer.  In that case, we don't want the default indexer 
+			// (Fast Indexer) to be invoked.
+			//IIndexManager manager = CCorePlugin.getIndexManager();
+			//ICProject cproject = CoreModel.getDefault().create(project);
+			//manager.setIndexerId(cproject, ConvertToAutotoolsProjectWizard.NULL_INDEXER_ID);
+		
+			// Modify the project settings
+			if (project != null) {
+				applyOptions(project, new SubProgressMonitor(monitor, 2));
+			}
+
+//			 Set the ScannerInfoProvider.  We must do this after
+//			 applying the options because changing the ScannerInfoProvider
+//			 is considered a change to the project and a reindex will
+//			 occur.  One of the options being applied above is the indexer
+//			 selected by the user.  Thus, we wait until now.
+//			try {
+//				AutotoolsUIPlugin.setScannerInfoProvider(project);
+//			} catch (CoreException e) {
+//				ManagedBuilderUIPlugin.log(e);
+//			}
+
+			// Save the build options
+			monitor.subTask(AutotoolsUIPlugin.getResourceString(MSG_SAVE));
+			if (info != null) {
+				info.setValid(true);
+				ManagedBuildManager.saveBuildInfo(project, true);
+			}
+		} finally {
+			// Create a default Autotools configuration and save it.
+			// We must do this after the ManagedBuildManager does a save because
+			// we might not yet have a Configuration Description set up for the
+			// default configuration and we need the id to create our own form
+			// of configuration.
+			ICConfigurationDescription cfgd = ManagedBuildManager.getDescriptionForConfiguration(defaultCfg);
+			String id = cfgd.getId();
+			AutotoolsConfigurationManager.getInstance().getConfiguration(project, id, true);
+			AutotoolsConfigurationManager.getInstance().saveConfigs(project);
+			IStatus initResult = ManagedBuildManager.initBuildInfoContainer(project);
+			if (initResult.getCode() != IStatus.OK) {
+				// At this point, I can live with a failure
+				AutotoolsUIPlugin.log(initResult);
+			}
+			monitor.done();
+		}
+	}
+
+	public void createControl(Composite parent) {
+		super.createControl(parent);
+		IStructuredSelection sel = ((BasicNewResourceWizard)getWizard()).getSelection();
+		if ( sel != null) {
+			tableViewer.setCheckedElements(sel.toArray());
+			setPageComplete(validatePage());
+		}
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ManagedProjectOptionBlock.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ManagedProjectOptionBlock.java
new file mode 100644
index 0000000..5ea85f9
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/ManagedProjectOptionBlock.java
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2005, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Rational Software - Initial API and implementation
+ * Red Hat - Copy from CDT 3.1.2
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards;
+
+import org.eclipse.cdt.ui.dialogs.BinaryParserBlock;
+import org.eclipse.cdt.ui.dialogs.ICOptionContainer;
+import org.eclipse.cdt.ui.dialogs.TabFolderOptionBlock;
+import org.eclipse.cdt.ui.newui.CDTHelpContextIds;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.ErrorParserBlock;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.PlatformUI;
+
+
+public class ManagedProjectOptionBlock extends TabFolderOptionBlock {
+
+	private ErrorParserBlock errParserBlock;
+	private BinaryParserBlock binaryParserBlock;
+	
+	/**
+	 * @param parent
+	 */
+	public ManagedProjectOptionBlock(ICOptionContainer parent) {
+		super(parent, false);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.dialogs.TabFolderOptionBlock#addTabs()
+	 */
+	protected void addTabs() {
+		errParserBlock = new ErrorParserBlock(null);
+		addTab(errParserBlock);
+		addTab(binaryParserBlock = new BinaryParserBlock());
+	}
+
+	public BinaryParserBlock getBinaryParserBlock() {
+		return binaryParserBlock;
+	}
+	
+	public ErrorParserBlock getErrorParserBlock() {
+		return errParserBlock;
+	}
+	
+	public Control createContents(Composite parent) {
+		Control control = super.createContents( parent );
+		((GridLayout)((Composite)control).getLayout()).marginWidth = 1;
+		GridData gd = new GridData(GridData.FILL_BOTH);
+		((Composite)control).setLayoutData(gd);
+
+		if (getErrorParserBlock()!= null)
+			PlatformUI.getWorkbench().getHelpSystem().setHelp(getErrorParserBlock().getControl(), CDTHelpContextIds.MAN_PROJ_ERROR_PARSER);
+
+		return control;
+	}	
+
+	public void updateValues() {
+		if (getErrorParserBlock()!= null) {
+			getErrorParserBlock().updateValues();
+		}
+		if (getBinaryParserBlock()!= null) {
+			// TODO
+			//getBinaryParserBlock().updateValues();
+		}
+	}
+
+	public void update() {
+		super.update();
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/NewAutotoolsProjectOptionPage.java b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/NewAutotoolsProjectOptionPage.java
new file mode 100644
index 0000000..866f7d8
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/wizards/NewAutotoolsProjectOptionPage.java
@@ -0,0 +1,156 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Rational Software - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.wizards;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.cdt.managedbuilder.ui.properties.ManagedBuilderUIPlugin;
+import org.eclipse.cdt.managedbuilder.ui.wizards.MBSCustomPageManager;
+import org.eclipse.cdt.ui.dialogs.ICOptionPage;
+import org.eclipse.cdt.ui.dialogs.IndexerBlock;
+import org.eclipse.cdt.ui.dialogs.ReferenceBlock;
+import org.eclipse.cdt.ui.dialogs.TabFolderOptionBlock;
+import org.eclipse.cdt.ui.newui.CDTHelpContextIds;
+import org.eclipse.cdt.ui.wizards.NewCProjectWizard;
+import org.eclipse.cdt.ui.wizards.NewCProjectWizardOptionPage;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Preferences;
+import org.eclipse.jface.wizard.IWizardPage;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.ErrorParserBlock;
+import org.eclipse.ui.PlatformUI;
+
+
+@SuppressWarnings("deprecation")
+public class NewAutotoolsProjectOptionPage extends NewCProjectWizardOptionPage {
+	
+	public static final String PAGE_ID = "org.eclipse.cdt.managedbuilder.ui.wizard.projectOptionsPage"; //$NON-NLS-1$
+	
+	public class ManagedWizardOptionBlock extends ManagedProjectOptionBlock {
+		
+		NewAutotoolsProjectOptionPage parent;
+		ErrorParserBlock errorParsers;
+		IndexerBlock indexBlock;
+		
+
+		public ManagedWizardOptionBlock(NewAutotoolsProjectOptionPage parentPage) {
+			super(parentPage);
+			parent = parentPage;
+		}
+
+		public class AutotoolsReferenceBlock extends ReferenceBlock {
+			AutotoolsReferenceBlock() {
+				super();
+			}
+			
+			public void performApply(IProgressMonitor monitor) throws CoreException {
+				try {
+					super.performApply(monitor);
+				} catch (RuntimeException e) {
+					// TODO: Fix ReferenceBlock not to generate NullPointerException
+					//       when no projects are referenced
+				}
+			}
+		}
+		public void updateProjectTypeProperties() {
+			//  Update the error parser list
+			if (errorParsers != null) {
+				errorParsers.updateValues();
+			}
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.cdt.ui.dialogs.TabFolderOptionBlock#addTabs()
+		 */
+		protected void addTabs() {
+			addTab(new AutotoolsReferenceBlock());
+			// NOTE: The setting of error parsers is commented out here
+			//       because they need to be set per-configuration.
+			//       The other tabs on this page are per-project.
+			//       Error parsers can be selected per configuration in the 
+			//        project properties
+			//errorParsers = new ErrorParserBlock();
+			//addTab(errorParsers);
+			addTab(indexBlock = new IndexerBlock());
+		}
+		
+		public void setupHelpContextIds(){
+			List<ICOptionPage> pages = getOptionPages();
+			
+			Iterator<ICOptionPage> iter = pages.iterator();
+			for( int i = 0; i < 3 && iter.hasNext(); i++ ) {
+				ICOptionPage page = (ICOptionPage) iter.next();
+				
+				String id = null;
+				if (page instanceof ReferenceBlock) {
+					id = CDTHelpContextIds.MAN_PROJ_WIZ_PROJECTS_TAB;
+				} else if (page instanceof ErrorParserBlock) {
+					id = CDTHelpContextIds.MAN_PROJ_WIZ_ERRORPARSERS_TAB;
+				} else if (page instanceof IndexerBlock) {
+					id = CDTHelpContextIds.MAN_PROJ_WIZ_INDEXER_TAB;
+				}
+				PlatformUI.getWorkbench().getHelpSystem().setHelp(page.getControl(), id);
+			}
+		}
+	}
+	
+	protected ManagedWizardOptionBlock optionBlock;
+	protected NewCProjectWizard parentWizard;
+
+	/**
+	 * @param pageName
+	 */
+	public NewAutotoolsProjectOptionPage(String pageName, NewCProjectWizard parentWizard) {
+		super(pageName);
+		this.parentWizard = parentWizard;
+		optionBlock = new ManagedWizardOptionBlock(this);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.wizards.NewCProjectWizardOptionPage#createOptionBlock()
+	 */
+	protected TabFolderOptionBlock createOptionBlock() {
+		return optionBlock;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.dialogs.ICOptionContainer#getProject()
+	 */
+	public IProject getProject() {
+		if (getWizard() instanceof ConvertToAutotoolsProjectWizard)
+			return ((ConvertToAutotoolsProjectWizard)getWizard()).getProject();
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.dialogs.ICOptionContainer#getPreferenceStore()
+	 */
+	public Preferences getPreferences() {
+		return ManagedBuilderUIPlugin.getDefault().getPluginPreferences();
+	}
+	
+	public void updateProjectTypeProperties() {
+		//  Update the error parser list
+		optionBlock.updateProjectTypeProperties();
+	}
+	
+	public void setupHelpContextIds(){
+		optionBlock.setupHelpContextIds();
+	}
+	
+	public IWizardPage getNextPage()
+	{
+		return MBSCustomPageManager.getNextPage(PAGE_ID); // get first custom page, if any
+	}
+	
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/EmptyProject/template.properties b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/EmptyProject/template.properties
new file mode 100644
index 0000000..d7af2dc
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/EmptyProject/template.properties
@@ -0,0 +1,14 @@
+###############################################################################
+# Copyright (c) 2008 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+
+#Template Default Values
+EmptyProject.template.label=Empty Project
+EmptyProject.template.description=An empty project template
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/EmptyProject/template.xml b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/EmptyProject/template.xml
new file mode 100644
index 0000000..4ab9796
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/EmptyProject/template.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<template type="ProjTempl" version="1.0" supplier="Eclipse.org" revision="1.0" author="Intel Corporation"
+		copyright="Copyright (c) 2007 Intel Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html"
+		id="EmptyProject" label="%EmptyProject.template.label" description="%EmptyProject.template.description"
+		 help="help.html">
+
+	<process type="org.eclipse.linuxtools.cdt.autotools.core.NewAutotoolsProject">
+		<simple name="name" value="$(projectName)" /> 
+		<simple name="artifactExtension" value="exe" /> 
+		<simple name="isCProject" value="false" /> 
+	</process>
+
+</template>
+
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/AUTHORS b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/AUTHORS
new file mode 100644
index 0000000..9d38b85
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/AUTHORS
@@ -0,0 +1 @@
+$(author)
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/Basename.c b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/Basename.c
new file mode 100644
index 0000000..9f48078
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/Basename.c
@@ -0,0 +1,17 @@
+/*
+ ============================================================================
+ Name        : $(baseName).c
+ Author      : $(author)
+ Version     :
+ Copyright   : $(copyright)
+ Description : Hello World in C, Ansi-style
+ ============================================================================
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int main(void) {
+	puts("$(message)"); /* prints $(message) */
+	return EXIT_SUCCESS;
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/COPYING b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/COPYING
new file mode 100644
index 0000000..54c4590
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/COPYING
@@ -0,0 +1 @@
+<Place your desired license here.>
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/ChangeLog b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/ChangeLog
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/ChangeLog
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/Makefile.am.src b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/Makefile.am.src
new file mode 100644
index 0000000..727c953
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/Makefile.am.src
@@ -0,0 +1,3 @@
+bin_PROGRAMS=a.out
+a_out_SOURCES=$(projectName).c
+
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/Makefile.am.top b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/Makefile.am.top
new file mode 100644
index 0000000..3e024d5
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/Makefile.am.top
@@ -0,0 +1 @@
+SUBDIRS=$(sourceDir)
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/NEWS b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/NEWS
new file mode 100644
index 0000000..97e91a4
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/NEWS
@@ -0,0 +1 @@
+Sample NEWS file for $(projectName) project.
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/README b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/README
new file mode 100644
index 0000000..d791b0b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/README
@@ -0,0 +1 @@
+Sample readme file for $(projectName) project.
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/configure.ac.top b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/configure.ac.top
new file mode 100644
index 0000000..f272ccd
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/src/configure.ac.top
@@ -0,0 +1,14 @@
+dnl Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.59)
+AC_INIT($(projectName), 1.0)
+
+
+AC_CANONICAL_SYSTEM
+AM_INIT_AUTOMAKE()
+
+AC_PROG_CC
+
+AC_CONFIG_FILES(Makefile $(sourceDir)/Makefile)
+AC_OUTPUT
+
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/template.properties b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/template.properties
new file mode 100644
index 0000000..ab982e4
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/template.properties
@@ -0,0 +1,30 @@
+###############################################################################
+# Copyright (c) 2007, 2009 Symbian Software Private Ltd. and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Bala Torati (Symbian) - initial API and implementation
+#     Red Hat Inc - modification to use with Autotools project
+###############################################################################
+
+#Template Default Values
+HelloWorld.CCtemplate.label=Hello World C++ Autotools Project
+HelloWorld.CCtemplate.description=A skeletal C++ Hello World Autotools project. Creates a folder for sources and another for include.
+HelloWorld.CAnsitemplate.label=Hello World ANSI C Autotools Project
+HelloWorld.CAnsitemplate.description=A skeletal C Hello World Autotools project. Creates a folder for sources and another for include.
+HelloWorld.basics.label=Basic Settings
+HelloWorld.basics.description=Basic properties of a project
+HelloWorld.author.label=Author
+HelloWorld.author.description=Name of the author
+HelloWorld.copyright.label=Copyright notice
+HelloWorld.copyright.description=Your copyright notice
+HelloWorld.copyright.default=Your copyright notice
+HelloWorld.message.default=Hello World
+HelloWorld.message.description=Your hello world greeting message
+HelloWorld.message.label=Hello world greeting
+HelloWorld.sourceDir.label=Source
+HelloWorld.sourceDir.description=Directory for hello world project source files
+HelloWorld.sourceDir.default=src
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml
new file mode 100644
index 0000000..a9a56a1
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<template type="ProjTempl" version="1.0" supplier="Eclipse.org" revision="1.0" author="Bala Torati (Symbian)"
+		copyright="Copyright (c) 2007,2009 Symbian Software Limited and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available athttp://www.eclipse.org/legal/epl-v10.html"
+		id="HelloWorldCAutotoolsProject" label="%HelloWorld.CAnsitemplate.label" description="%HelloWorld.CAnsitemplate.description"
+		 help="help.html">
+
+	<property-group id="basics" label="%HelloWorld.basics.label" description="%HelloWorld.basics.description" type="PAGES-ONLY" help="help.html">
+		<property id="author"
+			label="%HelloWorld.author.label"
+			description="%HelloWorld.author.description"
+			type="input"
+			pattern=".*"
+			default=""
+			hidden="false"
+			persist="true"/>
+		<property id="copyright"
+			label="%HelloWorld.copyright.label"
+			description="%HelloWorld.copyright.description"
+			type="input"
+			pattern=".*"
+			default="%HelloWorld.copyright.default"
+			hidden="false"
+			persist="true"/>
+		<property id="message"
+			label="%HelloWorld.message.label"
+			description="%HelloWorld.message.description"
+			type="input"
+			pattern=".*"
+			default="%HelloWorld.message.default"
+			hidden="false"
+			persist="true"/>
+		<property id="sourceDir"
+				label="%HelloWorld.sourceDir.label"
+				description="%HelloWorld.sourceDir.description"
+				type="input"
+				default="%HelloWorld.sourceDir.default"
+				pattern="[a-zA-Z0-9]+"
+				mandatory="false"
+				persist="true"/>
+	</property-group>
+
+	<process type="org.eclipse.linuxtools.cdt.autotools.core.NewAutotoolsProject">
+		<simple name="name" value="$(projectName)" /> 
+		<simple name="artifactExtension" value="exe" /> 
+		<simple name="isCProject" value="true" /> 
+	</process>
+
+	<process type="org.eclipse.cdt.core.CreateSourceFolder">
+		<simple name="projectName" value="$(projectName)"/>
+		<simple name="path" value="$(sourceDir)"/>
+	</process>
+
+	<process type="org.eclipse.cdt.core.AddFiles">
+		<simple name="projectName" value="$(projectName)"/>
+		<complex-array name="files">
+			<element>
+				<simple name="source" value="src/Basename.c"/>
+				<simple name="target" value="$(sourceDir)/$(projectName).c"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/configure.ac.top"/>
+				<simple name="target" value="configure.ac"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/AUTHORS"/>
+				<simple name="target" value="AUTHORS"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/NEWS"/>
+				<simple name="target" value="NEWS"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/README"/>
+				<simple name="target" value="README"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/ChangeLog"/>
+				<simple name="target" value="ChangeLog"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/COPYING"/>
+				<simple name="target" value="COPYING"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/Makefile.am.top"/>
+				<simple name="target" value="Makefile.am"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/Makefile.am.src"/>
+				<simple name="target" value="$(sourceDir)/Makefile.am"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+		</complex-array>
+	</process>
+
+</template>
+
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/AUTHORS b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/AUTHORS
new file mode 100644
index 0000000..9d38b85
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/AUTHORS
@@ -0,0 +1 @@
+$(author)
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Basename.cpp b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Basename.cpp
new file mode 100644
index 0000000..8e191ac
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Basename.cpp
@@ -0,0 +1,18 @@
+/*
+ ============================================================================
+ Name        : $(baseName).cpp
+ Author      : $(author)
+ Version     :
+ Copyright   : $(copyright)
+ Description : Hello World in C++,
+ ============================================================================
+ */
+
+#include <iostream>
+
+using namespace std;
+
+int main(void) {
+	cout << "$(message)" << endl; /* prints $(message) */
+	return 0;
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/COPYING b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/COPYING
new file mode 100644
index 0000000..54c4590
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/COPYING
@@ -0,0 +1 @@
+<Place your desired license here.>
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/ChangeLog b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/ChangeLog
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/ChangeLog
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Makefile.am.src b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Makefile.am.src
new file mode 100644
index 0000000..7b3125b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Makefile.am.src
@@ -0,0 +1,3 @@
+bin_PROGRAMS=a.out
+a_out_SOURCES=$(projectName).cpp
+
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Makefile.am.top b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Makefile.am.top
new file mode 100644
index 0000000..3e024d5
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Makefile.am.top
@@ -0,0 +1 @@
+SUBDIRS=$(sourceDir)
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/NEWS b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/NEWS
new file mode 100644
index 0000000..97e91a4
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/NEWS
@@ -0,0 +1 @@
+Sample NEWS file for $(projectName) project.
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/README b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/README
new file mode 100644
index 0000000..d791b0b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/README
@@ -0,0 +1 @@
+Sample readme file for $(projectName) project.
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/configure.ac.top b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/configure.ac.top
new file mode 100644
index 0000000..e58a4fe
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/configure.ac.top
@@ -0,0 +1,14 @@
+dnl Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.59)
+AC_INIT($(projectName), 1.0)
+
+
+AC_CANONICAL_SYSTEM
+AM_INIT_AUTOMAKE()
+
+AC_PROG_CXX
+
+AC_CONFIG_FILES(Makefile $(sourceDir)/Makefile)
+AC_OUTPUT
+
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.properties b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.properties
new file mode 100644
index 0000000..ab982e4
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.properties
@@ -0,0 +1,30 @@
+###############################################################################
+# Copyright (c) 2007, 2009 Symbian Software Private Ltd. and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Bala Torati (Symbian) - initial API and implementation
+#     Red Hat Inc - modification to use with Autotools project
+###############################################################################
+
+#Template Default Values
+HelloWorld.CCtemplate.label=Hello World C++ Autotools Project
+HelloWorld.CCtemplate.description=A skeletal C++ Hello World Autotools project. Creates a folder for sources and another for include.
+HelloWorld.CAnsitemplate.label=Hello World ANSI C Autotools Project
+HelloWorld.CAnsitemplate.description=A skeletal C Hello World Autotools project. Creates a folder for sources and another for include.
+HelloWorld.basics.label=Basic Settings
+HelloWorld.basics.description=Basic properties of a project
+HelloWorld.author.label=Author
+HelloWorld.author.description=Name of the author
+HelloWorld.copyright.label=Copyright notice
+HelloWorld.copyright.description=Your copyright notice
+HelloWorld.copyright.default=Your copyright notice
+HelloWorld.message.default=Hello World
+HelloWorld.message.description=Your hello world greeting message
+HelloWorld.message.label=Hello world greeting
+HelloWorld.sourceDir.label=Source
+HelloWorld.sourceDir.description=Directory for hello world project source files
+HelloWorld.sourceDir.default=src
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml
new file mode 100644
index 0000000..38a4cc6
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<template type="ProjTempl" version="1.0" supplier="Eclipse.org" revision="1.0" author="Bala Torati (Symbian)"
+		copyright="Copyright (c) 2007,2009 Symbian Software Limited and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available athttp://www.eclipse.org/legal/epl-v10.html"
+		id="HelloWorldCPPAutotoolsProject" label="%HelloWorld.CCtemplate.label" description="%HelloWorld.CCtemplate.description"
+		 help="help.html">
+
+	<property-group id="basics" label="%HelloWorld.basics.label" description="%HelloWorld.basics.description" type="PAGES-ONLY" help="help.html">
+		<property id="author"
+			label="%HelloWorld.author.label"
+			description="%HelloWorld.author.description"
+			type="input"
+			pattern=".*"
+			default=""
+			hidden="false"
+			persist="true"/>
+		<property id="copyright"
+			label="%HelloWorld.copyright.label"
+			description="%HelloWorld.copyright.description"
+			type="input"
+			pattern=".*"
+			default="%HelloWorld.copyright.default"
+			hidden="false"
+			persist="true"/>
+		<property id="message"
+			label="%HelloWorld.message.label"
+			description="%HelloWorld.message.description"
+			type="input"
+			pattern=".*"
+			default="%HelloWorld.message.default"
+			hidden="false"
+			persist="true"/>
+		<property id="sourceDir"
+				label="%HelloWorld.sourceDir.label"
+				description="%HelloWorld.sourceDir.description"
+				type="input"
+				default="%HelloWorld.sourceDir.default"
+				pattern="[a-zA-Z0-9]+"
+				mandatory="false"
+				persist="true"/>
+	</property-group>
+
+	<process type="org.eclipse.linuxtools.cdt.autotools.core.NewAutotoolsProject">
+		<simple name="name" value="$(projectName)" /> 
+		<simple name="artifactExtension" value="exe" /> 
+		<simple name="isCProject" value="false" /> 
+	</process>
+
+	<process type="org.eclipse.cdt.core.CreateSourceFolder">
+		<simple name="projectName" value="$(projectName)"/>
+		<simple name="path" value="$(sourceDir)"/>
+	</process>
+
+	<process type="org.eclipse.cdt.core.AddFiles">
+		<simple name="projectName" value="$(projectName)"/>
+		<complex-array name="files">
+			<element>
+				<simple name="source" value="src/Basename.cpp"/>
+				<simple name="target" value="$(sourceDir)/$(projectName).cpp"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/configure.ac.top"/>
+				<simple name="target" value="configure.ac"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/AUTHORS"/>
+				<simple name="target" value="AUTHORS"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/NEWS"/>
+				<simple name="target" value="NEWS"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/README"/>
+				<simple name="target" value="README"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/ChangeLog"/>
+				<simple name="target" value="ChangeLog"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/COPYING"/>
+				<simple name="target" value="COPYING"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/Makefile.am.top"/>
+				<simple name="target" value="Makefile.am"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+			<element>
+				<simple name="source" value="src/Makefile.am.src"/>
+				<simple name="target" value="$(sourceDir)/Makefile.am"/>
+				<simple name="replaceable" value="true"/>
+			</element>
+		</complex-array>
+	</process>
+
+</template>
+
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/.classpath b/autotools/org.eclipse.linuxtools.cdt.autotools/.classpath
new file mode 100644
index 0000000..751c8f2
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/.cvsignore b/autotools/org.eclipse.linuxtools.cdt.autotools/.cvsignore
new file mode 100644
index 0000000..50c1b30
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/.cvsignore
@@ -0,0 +1,4 @@
+bin
+@dot
+javaCompiler...args
+build.xml
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/.project b/autotools/org.eclipse.linuxtools.cdt.autotools/.project
new file mode 100644
index 0000000..dd372b3
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.cdt.autotools</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/.settings/org.eclipse.jdt.core.prefs b/autotools/org.eclipse.linuxtools.cdt.autotools/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..93e9280
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Wed Mar 18 16:28:06 EDT 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/.settings/org.eclipse.jdt.ui.prefs b/autotools/org.eclipse.linuxtools.cdt.autotools/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..4c71318
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,3 @@
+#Tue Jan 02 14:11:13 EST 2007
+eclipse.preferences.version=1
+internal.default.compliance=default
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/ChangeLog b/autotools/org.eclipse.linuxtools.cdt.autotools/ChangeLog
new file mode 100644
index 0000000..6e8cfd0
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/ChangeLog
@@ -0,0 +1,4046 @@
+2010-02-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #303616
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (getAutogenArgs): Fall
+	back to default value for uninitialized environment variable. 
+	(getConfigArgs): Ditto.
+	(initializeBuildConfigDirs): Ditto. 
+
+2009-12-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #297260
+	* plugin.xml: Make org.eclipse.linuxtools.cdt.autotools.builder abstract as it is used as
+	a superclass only.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsBuilder.java (getOutputEntries): Override
+	to ensure we don't use the Builder default for this method which returns an output entry
+	based on the configuration name.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (build): Set the
+	build location and makefile generator element for the old builder to ensure the build path
+	set by the configure settings will always be returned. 
+
+2009-11-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Fix dependencies to support CDT 6.0.0 and up.
+
+2009-11-02  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.properties: Add new messages.
+	* plugin.xml: Add GCCMakefilePerProjectProfile discovery profile ids to configure and
+	autogen.sh inputs.
+
+2009-10-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Add back some UI elements needed for compatibility.
+	
+	* icons/autoconf.gif: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractAutotoolsHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractTargetAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AclocalHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoconfHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoheaderHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutomakeHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoreconfHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoconfAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoheaderAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoreconfAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeLibtoolizeAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.properties: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/LibtoolizeHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/SingleInputDialog.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/TwoInputDialog.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsEditorPropertyPage.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyMessages.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyPage.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsToolsPropertyPage.java: New file.
+	* build.properties: Add icons directory to bin group. 
+	* META-INF/MANIFEST.MF: Add autotools.core and autotools.ui dependency and lower cdt.ui requirement.
+	* plugin.xml: Add menus for autotool invocation.  Add back old Autotools property page and
+	build settings tabs.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsDefaultBuildDirHandler.java (isOptionVisible): Add
+	a check for includes or symbols in which case return false. 
+
+2009-10-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Change org.eclipse.linuxtools.cdt.autotools to be a compatibility plug-in to
+	support building of old projects.  Remove all UI elements except for the Autoconf
+	parser code which was exposed as a public API.
+	
+	* .settings/org.eclipse.core.resources.prefs: Removed.
+	* html/maintopic.html: Removed.
+	* html/subtopic.html: Removed.
+	* html/toc.html: Removed.
+	* icons/ac16/acmacro_arg_obj.gif: Removed.
+	* icons/ac16/acmacro_obj.gif: Removed.
+	* icons/ac16/ammacro_obj.gif: Removed.
+	* icons/ac16/case_obj.gif: Removed.
+	* icons/ac16/condition_obj.gif: Removed.
+	* icons/ac16/convert-normal.gif: Removed.
+	* icons/ac16/elif_obj.gif: Removed.
+	* icons/ac16/else_obj.gif: Removed.
+	* icons/ac16/for_obj.gif: Removed.
+	* icons/ac16/if_obj.gif: Removed.
+	* icons/ac16/while_obj.gif: Removed.
+	* icons/autoconf.gif: Removed.
+	* icons/automake.gif: Removed.
+	* icons/dlcl16/build_configs.gif: Removed.
+	* icons/dlcl16/newc_app.gif: Removed.
+	* icons/dlcl16/newcc_app.gif: Removed.
+	* icons/dlcl16/open_include.gif: Removed.
+	* icons/dtool16/alphab_sort_co.gif: Removed.
+	* icons/dtool16/build_menu.gif: Removed.
+	* icons/dtool16/convert-normal.gif: Removed.
+	* icons/dtool16/make.gif: Removed.
+	* icons/dtool16/makefile.gif: Removed.
+	* icons/dtool16/newc_app.gif: Removed.
+	* icons/dtool16/newcc_app.gif: Removed.
+	* icons/dtool16/segment_edit.gif: Removed.
+	* icons/dtool16/target_add.gif: Removed.
+	* icons/dtool16/target_build.gif: Removed.
+	* icons/dtool16/target_delete.gif: Removed.
+	* icons/dtool16/target_edit.gif: Removed.
+	* icons/dtool16/update_old.gif: Removed.
+	* icons/elcl16/build_configs.gif: Removed.
+	* icons/elcl16/newc_app.gif: Removed.
+	* icons/elcl16/newcc_app.gif: Removed.
+	* icons/elcl16/open_include.gif: Removed.
+	* icons/etool16/alphab_sort_co.gif: Removed.
+	* icons/etool16/build_menu.gif: Removed.
+	* icons/etool16/convert-normal.gif: Removed.
+	* icons/etool16/make.gif: Removed.
+	* icons/etool16/makefile.gif: Removed.
+	* icons/etool16/newc_app.gif: Removed.
+	* icons/etool16/newcc_app.gif: Removed.
+	* icons/etool16/segment_edit.gif: Removed.
+	* icons/etool16/target_add.gif: Removed.
+	* icons/etool16/target_build.gif: Removed.
+	* icons/etool16/target_delete.gif: Removed.
+	* icons/etool16/target_edit.gif: Removed.
+	* icons/etool16/target_filter.gif: Removed.
+	* icons/etool16/update_old.gif: Removed.
+	* icons/obj16/acmacro_obj.gif: Removed.
+	* icons/obj16/command_obj.gif: Removed.
+	* icons/obj16/define_obj.gif: Removed.
+	* icons/obj16/environment_obj.gif: Removed.
+	* icons/obj16/envvar_obj.gif: Removed.
+	* icons/obj16/error_obj.gif: Removed.
+	* icons/obj16/hfolder_obj.gif: Removed.
+	* icons/obj16/include_obj.gif: Removed.
+	* icons/obj16/irule_obj.gif: Removed.
+	* icons/obj16/lib_obj.gif: Removed.
+	* icons/obj16/macro_obj.gif: Removed.
+	* icons/obj16/relation_obj.gif: Removed.
+	* icons/obj16/target_obj.gif: Removed.
+	* icons/obj16/trule_obj.gif: Removed.
+	* icons/sample.gif: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractAutotoolsHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractTargetAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AclocalHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoconfHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoheaderHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutomakeHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoreconfHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoconfAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoheaderAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoreconfAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeLibtoolizeAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/LibtoolizeHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/SingleInputDialog.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/TwoInputDialog.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakeTargetManager.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutoconfSubstRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeCompletionProcessor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeConfigMacro.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeDocumentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeEditor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeEditorFactory.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeErrorHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/Automakefile.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileCodeScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileUtil.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeIfElse.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeMacroDefinitionRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeMacroReferenceRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeTextHover.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeWordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/popup/actions/GetDefinedSymbolsAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/popup/actions/GetIncludePathAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfAnnotationHover.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfCodeScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentSetupParticipant.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMacroValidator.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfErrorHandler.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfIdentifierRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfKeywordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfM4WordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacro.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroCodeScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroParameterListValidator.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroPartitionRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroProposalContextInformation.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroWordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitioner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitionScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPKGWordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfReconcilingStrategy.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfWhitespaceDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfWordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolEditorActionDefinitionIds.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolHelpContextIds.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolsEditor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/InlineDataRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/MultilineRuleDamagerRepairer.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/ParseException.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RecursiveSingleLineRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RestrictedEndOfLineRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsEditorPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsToolsPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/ConvertToAutotoolsProjectWizard.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/CProjectPlatformPage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCCProjectWizard.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCProjectWizard.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsProjectOptionPage.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/AbstractElementListSelectionDialog.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/AbstractMakefile.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/AbstractMakefileCodeScanner.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/AddBuildTargetAction.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ArchiveTarget.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/BadDirective.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Command.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Comment.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/CompletionProposalComparator.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Conditional.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/DefaultRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/DefineVariable.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/DeleteOnErrorRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Directive.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/EditorUtility.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ElementListSelectionDialog.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Else.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/EmptyLine.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Endef.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Endif.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ExportAllVariablesRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ExportVariable.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ExternalEditorInput.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ExternalEditorInputFactory.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/GNUAutomakefile.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/GNUMakefileConstants.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/GNUMakefileUtil.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/GNUTargetRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/GNUVariableDef.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/IAutomakeConditional.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/If.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Ifdef.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Ifeq.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Ifndef.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Ifneq.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/IgnoreRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/IMakefileDocumentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/IMakefileEditorActionDefinitionIds.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Include.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/InferenceRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/IntermediateRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/IReconcilingParticipant.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ISelectionValidator.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ITranslationUnitEditorInput.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/LexicalSortingAction.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/LowResolutionTimeRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MacroDefinition.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MacroDefinitionRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MacroReferenceRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileAnnotationHover.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileCodeScanner.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileCompletionProcessor.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakeFileConstants.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileContentOutlinePage.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileDocumentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileDocumentSetupParticipant.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileEditor.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileEditorActionContributor.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileEditorPreferenceConstants.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileEditorTogglePresentationAction.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileMessages.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefilePartitionScanner.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileReader.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileReconcilingStrategy.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakeFileResources.properties: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileSourceConfiguration.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileStorageDocumentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileTextHover.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileWordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MessageLine.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/NotParallelRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/NullMakefile.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/OpenDeclarationAction.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/OpenIncludeAction.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/OverrideDefine.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/OverrideVariable.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Parent.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/PhonyRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/PosixMakefileUtil.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/PosixRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/PreciousRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ProjectionMakefileUpdater.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Rule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SccsGetRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SecondaryRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SelectionList.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SelectionStatusDialog.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SilentRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SpecialRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/StaticTargetRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/StatusInfo.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/StatusTool.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/StringMatcher.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SuffixesRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Target.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/TargetRule.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/TargetVariable.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Terminal.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/TwoArrayQuickSort.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/UnExport.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Util.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/VariableDefinition.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/VPath.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/WordPartDetector.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/WorkingCopyManager.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/MakeMessages.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/MakeTarget.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/MakeTargetManager.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ProjectTargets.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/text/hover/AutoconfPrototype.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/text/hover/AutoconfTextHover.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/text/hover/HoverMessages.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/text/hover/HoverMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsPluginImages.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/autoconf/ProjectionFileUpdater.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ErrorParserBlock.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTML2TextReader.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLTextPresenter.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeResources.properties: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIImages.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIMessages.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MessageLine.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AbstractEditorPreferencePage.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutoconfEditorPreferencePage.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutomakeEditorPreferencePage.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencePage.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencesMessages.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencesMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/ColorEditor.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/ColorManager.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/TabFolderLayout.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/wizards/AutotoolsBuildWizard.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/wizards/AutotoolsWizardMessages.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/wizards/AutotoolsWizardMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/wizards/ConfigurationContentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/wizards/ConfigurationLabelProvider.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/wizards/ManagedProjectOptionBlock.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/wizards/NewAutotoolsProject.java: Removed.
+	* templates/projecttemplates/EmptyProject/template.properties: Removed.
+	* templates/projecttemplates/EmptyProject/template.xml: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/AUTHORS: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/Basename.c: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/configure.ac.top: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/COPYING: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/Makefile.am.src: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/Makefile.am.top: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/NEWS: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src/README: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/template.properties: Removed.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/AUTHORS: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Basename.cpp: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/configure.ac.top: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/COPYING: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Makefile.am.src: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/Makefile.am.top: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/NEWS: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src/README: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.properties: Removed.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfEditorMessages.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfEditorMessages.properties: New file.
+	* build.properties: Remove UI elements that are no longer used. 
+	* META-INF/MANIFEST.MF: Update exposed packages and required bundles. Bump to 2.0.0.
+	* plugin.xml: Remove all UI extensions.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java (getTargetManager): Removed. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfParser.java: Fixed to build. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfTokenizer.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsEditorPreferenceConstants.java (initializeDefaultValues):
+	Add latest AM and AC macro version constants as the initial source of these constants has been removed. 
+
+2009-10-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump version to 1.0.5.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/text/hover/AutoconfTextHover.java (getHoverDoc):
+	Change to get document versions and pass these to getACDoc and getAMDoc. 
+	(getDefaultAutomakeMacrosVer): New method.
+	(getAMDoc): Change to take doc version rather than name and to support document in local plugin.
+	(getDefaultAutoconfMacrosVer): New method.
+	(getLocalAutoconfMacrosDocName): New method.
+	(getACDoc): Change to take doc version rather than name and to support document in local plugin.
+	(getLocalAutomakeMacrosDocName): New method.
+
+2009-10-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCCProjectWizard.java (doRun): Fix warnings.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCProjectWizard.java (doRun): Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ProjectTargets.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java (setScannerInfoProvider): Fix
+	deprecated warnings. 
+	(verifyScannerInfoProvider): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java: Ditto. 
+	
+2009-10-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/wizards/AutotoolsBuildWizard.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/wizards/NewAutotoolsProject.java: New file.
+	* templates/projecttemplates/EmptyProject/template.properties: New file.
+	* templates/projecttemplates/EmptyProject/template.xml: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/src: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/template.properties: New file.
+	* templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/src: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.properties: New file.
+	* templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml: New file.
+	* build.properties: Add templates directory to binary contents.
+	* plugin.properties: Add new strings to support additions in plugin.xml.
+	* plugin.xml: Remove name from Autotools project type so it will get a category in the C/C++
+	new project wizard UI.  Connect the gcc and g++ tools to their proper parents in the CDT.
+	Add template and wizard support for Autotools.  Remove project conversion stuff that shouldn't
+	have been checked in.
+
+2009-10-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #292272
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsBuilder.java (AutotoolsBuilder): Use
+	a super copy constructor rather than a parent chained super constructor.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (clean): Save old
+	builder and replace back when build is complete. 
+	(build): Ditto.
+
+2009-09-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #289557
+	* plugin.xml: Add ApplicabilityCalculator for includes and symbols for
+	configure tool to prevent values from being added to the command line in the
+	Tool Settings tab.
+	
+2009-09-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #289558
+	* plugin.xml: Put GNU C++ Project Wizard under C/C++ project category.
+	
+2009-09-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #289555
+	* plugin.xml: Add back org.eclipse.linuxtools.cdt.autotools.toolchain.tool.gcc and
+	org.eclipse.linuxtools.cdt.autotools.toolchain.tool.gpp to Autotools toolchain to
+	prevent older projects from getting NPEs.  Do not tie these tools to the real
+	CDT core gcc and gpp tools and make them unused children of the toolchain so new
+	projects won't put them in the Settings UI nor the .cproject.
+
+2009-09-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #289819
+	* plugin.properties: Change convert message to match the same format as CDT's
+	convertor.
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (createDirectory): Changed
+	to use Java File and mkdirs method.
+	(regenerateMakefiles): Use Java File for existence checking and do not use Workspace
+	root because file may be external.  As well, share console if autoreconf required
+	prior to configuration.
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Add create dir error
+	message.
+	
+
+2009-08-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #286543
+	* plugin.xml: Add input types for configure tool so we
+	can specify CDT gcc and g++ language ids which are checked
+	for in the CDT New C/C++ Project Wizards.  Also add the
+	Autotools build artefact type as a supported property of the
+	Autotools tool chain.
+
+2009-08-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #285865
+	* plugin.properties: Change Provider to Eclipse instead of Eclipse.org.
+
+2009-08-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #267538
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (getAbsoluteDirectory):
+	Call getPathString to get the directory path instead of calling toOSString. 
+	(getPathString): New method that gets the path string and handles MingW paths.
+	(runScript): Call getPathString to convert the command path instead of
+	using toOSString.
+
+2009-08-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Make autotools.tests able to see internal classes.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/text/hover/AutoconfTextHover.java (getAMDoc): Remove
+	printlns and log errors with AutotoolsPlugin instead of CUIPlugin.
+	 
+2009-08-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #267197
+	(getACDoc): 
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsDefaultBuildDirHandler.java (handleValue): Continue
+	loop if no tool for config.status is found.
+
+2009-07-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump release to 1.0.4. 
+	
+2009-07-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Rename all internal classes to adhere to Eclipse naming conventions.  Change all references appropriately.
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AbstractElementListSelectionDialog.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AbstractMakefile.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AbstractMakefileCodeScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AddBuildTargetAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ArchiveTarget.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/BadDirective.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Command.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Comment.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/CompletionProposalComparator.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Conditional.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/DefaultRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/DefineVariable.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/DeleteOnErrorRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Directive.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/EditorUtility.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ElementListSelectionDialog.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Else.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/EmptyLine.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Endef.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Endif.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ExportAllVariablesRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ExportVariable.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ExternalEditorInput.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ExternalEditorInputFactory.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/GNUAutomakefile.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/GNUMakefileConstants.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/GNUMakefileUtil.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/GNUTargetRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/GNUVariableDef.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/IAutomakeConditional.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/If.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Ifdef.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Ifeq.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Ifndef.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Ifneq.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/IgnoreRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/IMakefileDocumentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/IMakefileEditorActionDefinitionIds.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Include.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/InferenceRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/IntermediateRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/IReconcilingParticipant.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ISelectionValidator.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ITranslationUnitEditorInput.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/LexicalSortingAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/LowResolutionTimeRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MacroDefinition.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MacroDefinitionRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MacroReferenceRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileAnnotationHover.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileCodeScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileCompletionProcessor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakeFileConstants.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileContentOutlinePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileDocumentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileDocumentSetupParticipant.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileEditor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileEditorActionContributor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileEditorPreferenceConstants.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileEditorTogglePresentationAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefilePartitionScanner.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileReader.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileReconcilingStrategy.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakeFileResources.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileSourceConfiguration.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileStorageDocumentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileTextHover.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileWordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MessageLine.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/NotParallelRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/NullMakefile.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/OpenDeclarationAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/OpenIncludeAction.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/OverrideDefine.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/OverrideVariable.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Parent.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/PhonyRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/PosixMakefileUtil.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/PosixRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/PreciousRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ProjectionMakefileUpdater.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Rule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SccsGetRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SecondaryRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SelectionList.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SelectionStatusDialog.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SilentRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SpecialRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/StaticTargetRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/StatusInfo.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/StatusTool.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/StringMatcher.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SuffixesRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Target.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/TargetRule.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/TargetVariable.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Terminal.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/TwoArrayQuickSort.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/UnExport.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Util.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/VariableDefinition.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/VPath.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/WordPartDetector.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/WorkingCopyManager.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/MakeMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/MakeTarget.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/MakeTargetManager.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/MarkerGenerator.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ProjectTargets.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/AutoconfPrototype.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/AutoconfTextHover.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/HoverMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/HoverMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AutotoolsConsole.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AutotoolsPluginImages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/CBuildStepsConsole.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/CConfigureConsole.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/Console.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ConsoleMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ConsoleMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/CWordFinder.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/editors/autoconf/ProjectionFileUpdater.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ErrorParserBlock.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/HTML2TextReader.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/HTMLPrinter.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/HTMLTextPresenter.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/LineBreakingReader.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/MakeResources.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/MakeUIImages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/MakeUIMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/MessageLine.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AbstractEditorPreferencePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferencePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutotoolsEditorPreferenceConstants.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutotoolsPreferencePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/ColorEditor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/ColorManager.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/OverlayPreferenceStore.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/StatusInfo.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/TabFolderLayout.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/SingleCharReader.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/SubstitutionTextReader.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/AutotoolsWizardMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/AutotoolsWizardMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/ConfigurationContentProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/ConfigurationLabelProvider.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/ManagedProjectOptionBlock.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/MakeMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/MakeTarget.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/MakeTargetManager.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/MarkerGenerator.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ProjectTargets.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsConsole.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsPluginImages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CBuildStepsConsole.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CConfigureConsole.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/Console.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.properties: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CWordFinder.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ErrorParserBlock.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTML2TextReader.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLPrinter.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLTextPresenter.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/LineBreakingReader.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeResources.properties: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIImages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MakeUIMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/MessageLine.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SingleCharReader.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SubstitutionTextReader.java: New file.
+	* plugin.xml: Change any internal class references to new naming convention.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakeTargetManager.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeCompletionProcessor.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeConfigMacro.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeDocumentProvider.java (getWorkingCopy): Ditto. 
+	(shutdown): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeEditor.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeEditorFactory.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeErrorHandler.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/Automakefile.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileCodeScanner.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeIfElse.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeTextHover.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfAnnotationHover.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfCodeScanner.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditor.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditorMacroValidator.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroCodeScanner.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolsEditor.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsEditorPropertyPage.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/CProjectPlatformPage.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsProjectOptionPage.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/AbstractElementListSelectionDialog.java:
+	Ditto. 
+	
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/AbstractMakefile.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/AbstractMakefileCodeScanner.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/AddBuildTargetAction.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ArchiveTarget.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/BadDirective.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Command.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Comment.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/CompletionProposalComparator.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Conditional.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/DefaultRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/DefineVariable.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/DeleteOnErrorRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Directive.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/EditorUtility.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ElementListSelectionDialog.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Else.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/EmptyLine.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Endef.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Endif.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ExportAllVariablesRule.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ExportVariable.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ExternalEditorInput.java (getTranslationUnit): Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ExternalEditorInputFactory.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/GNUAutomakefile.java (getBuiltins): Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/GNUMakefileConstants.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/GNUMakefileUtil.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/GNUTargetRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/GNUVariableDef.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/IAutomakeConditional.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/If.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Ifdef.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Ifeq.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Ifndef.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Ifneq.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/IgnoreRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/IMakefileDocumentProvider.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/IMakefileEditorActionDefinitionIds.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Include.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/InferenceRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/IntermediateRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/IReconcilingParticipant.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ISelectionValidator.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ITranslationUnitEditorInput.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/LexicalSortingAction.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/LowResolutionTimeRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MacroDefinition.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MacroDefinitionRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MacroReferenceRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileAnnotationHover.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileCodeScanner.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileCompletionProcessor.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakeFileConstants.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileContentOutlinePage.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileDocumentProvider.java (getWorkingCopy): Ditto. 
+	(shutdown): 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileDocumentSetupParticipant.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileEditor.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileEditorActionContributor.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileEditorPreferenceConstants.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileEditorTogglePresentationAction.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileMessages.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefilePartitionScanner.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileReader.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileReconcilingStrategy.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileSourceConfiguration.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileStorageDocumentProvider.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileTextHover.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MakefileWordDetector.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/MessageLine.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/NotParallelRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/NullMakefile.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/OpenDeclarationAction.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/OpenIncludeAction.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/OverrideDefine.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/OverrideVariable.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Parent.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/PhonyRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/PosixMakefileUtil.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/PosixRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/PreciousRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/ProjectionMakefileUpdater.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Rule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SccsGetRule.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SecondaryRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SelectionList.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SelectionStatusDialog.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SilentRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SpecialRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/StaticTargetRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/StatusInfo.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/StatusTool.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/StringMatcher.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/SuffixesRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Target.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/TargetRule.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/TargetVariable.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Terminal.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/TwoArrayQuickSort.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/UnExport.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/Util.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/VariableDefinition.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/VPath.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/WordPartDetector.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/editors/automake/WorkingCopyManager.java (removeWorkingCopy): Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/text/hover/AutoconfPrototype.java: Ditto.
+	
+	
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/text/hover/AutoconfTextHover.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/text/hover/HoverMessages.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/editors/autoconf/ProjectionFileUpdater.java: Ditto. 
+	
+	
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AbstractEditorPreferencePage.java: Ditto.
+	
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutoconfEditorPreferencePage.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutomakeEditorPreferencePage.java: Ditto. 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsEditorPreferenceConstants.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencePage.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsPreferencesMessages.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/ColorEditor.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/ColorManager.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/OverlayPreferenceStore.java: Ditto.l 
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/StatusInfo.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/TabFolderLayout.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/wizards/AutotoolsWizardMessages.java: Ditto.
+	
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/wizards/ConfigurationContentProvider.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/wizards/ConfigurationLabelProvider.java: Ditto.
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/wizards/ManagedProjectOptionBlock.java: Ditto.
+
+2009-07-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Fix visibility of Reconfigure Project menu item.
+
+2009-07-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AutotoolsConsole.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/Console.java: New file.
+	* plugin.xml: Add build consoles for Autotools and Build Steps.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java: 
+	(executeConsoleCommand): New method to run commands in the console.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java (run):  Use
+	executeConsoleCommand. 
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoconfAction.java (run): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoheaderAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoreconfAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeLibtoolizeAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.properties: Add working directory
+	message and special message for invoking tools.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/CBuildStepsConsole.java (CBuildStepsConsole):
+	Changed to inherit from Console class. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/CConfigureConsole.java (CConfigureConsole): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ConsoleMessages.properties: Add messages
+	for build steps and autotools console names.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (stripEnvVars): Make public static. 
+
+2009-07-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #283828
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureAction.java (run): Use
+	workspace root scheduling rule instead of project modification rule because MakeTargets
+	may end up saving project description.
+
+2009-07-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureHandler.java: New file.
+	* plugin.properties: Add messages for new reconfigure action. 
+	* plugin.xml: Add new reconfigure command to Project menu.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (removeConfigSettings): New
+	method.
+	 
+2009-07-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (saveConfigArgs): Use toFile
+	method for config settings path.
+	(regenerateMakefiles): Ditto.
+
+2009-07-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #281850
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (getConfigSettingsPath): Save configure
+	settings file in project working directory for Autotools plugin.
+
+2009-07-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #269974
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (build):  Look for make target
+	arguments as any arguments added to the build command in a MakeTarget will be stripped off and given as
+	one of the fields in args.  Take any make arguments given and set them for the builder.
+
+2009-07-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (stripEnvVars): Add support for stripping off
+	recursive env var references even though they are not interpreted.  Also remove single and double quotes from
+	env var if variable value is quoted.
+
+2009-07-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #282696, #283084
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (getAutogenPath): Change to
+	strip off environment variable settings prior to command string using stripEnvVars method. 
+	(getConfigurePath): Ditto.
+	(runScript): Add additional environment variable parameters. 
+	(stripEnvVars): New method.
+	(regenerateMakefiles): Fix needs full reconfiguration to use designated clean method
+	instead of deleting build directory.
+	(makeArray): New method.
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Add cleaning build directory
+	message. 
+
+2009-07-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #281811
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (postBuildErrMsg): New. 
+	(preBuildErrMsg): Ditto.
+	(clean): Set the build generator element acquired from the AutotoolsPlugin.
+	(build): Add prebuild/postbuild step support.  Add sub-directory make target support and fix
+	problem with GNU Make Generator being used by setting the build generator element acquired from the
+	AutotoolsPlugin.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java (getImageDescriptor): 
+	(getGeneratorElement): New method.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (initializeBuildConfigDirs): Don't set
+	builder working directory since this is done by AutotoolsMakefileBuilder. 
+
+2009-07-02  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (clean): Don't ask
+	the ManagedBuildManager for the generator as it may default to the GnuMakefileGenerator. 
+	(removeBuildDir): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (regenerateMakefiles): Add
+	MakeTargets when autogen.sh runs configure successfully. 
+
+2009-06-25  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #281583, #281582
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (build): Don't ask the
+	ManagedBuildManager for the generator as it will default to the GnuMakefileGenerator until we tell
+	it otherwise.  Just get a new Autotools MakeGenerator.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java (getCompilationString): Add support
+	for g++, top-level builds, and compilation strings with continuation characters.
+
+2009-06-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #280696
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java (showSuccess):
+	Changed to issue a information dialog that does not have a cancel button. 
+	(executeCommand): Changed to create a ProgressMonitorDialog that is issued
+	until the command completes successfully or with failure.
+	(ExecuteProgressDialog): New private internal class that implements IRunnableWithProgress
+	which is used to run the command for a ProgressMonitorDialog.
+
+2009-06-17  Jeff Johnston  <jjohnstn@redhat.com>
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.properties: 
+	Resolves #280509
+	* META-INF/MANIFEST.MF: Bump version to 1.0.3. 
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsBuilder.java (getBuildFileGenerator): New
+	method to override Builder method so we get Autotools Makefile generator. 
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (regenerateMakefiles): Add
+	logic to use autoreconf if no configure script and no autogen.sh. 
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Add messages. 
+
+2009-06-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #280504, #280505, #280506.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoheaderHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoreconfHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoheaderAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoreconfAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeLibtoolizeAction.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/LibtoolizeHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/SingleInputDialog.java: New file.
+	* plugin.properties: Add new messages for additional tools/commands added.
+	* plugin.xml: Change invoking autotools to be a single menu item in Project menu which
+	expands to show all tools available, including aclocal, autoconf, autoheader, automake,
+	autoreconf, and libtoolize.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java (simpleParseOptions): New
+	method to parse options and account for quoted strings.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.properties: Add support
+	for autoheader, autoreconf, and libtoolize. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyConstants.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsToolsPropertyPage.java (createControls):
+	Ditto. 
+	(initialize): Ditto. 
+	(performDefaults): Ditto.
+	(performOK): Ditto.
+
+2009-06-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #280117
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java (buildFile): Fix so
+	loop doesn't exit early before finding build directory.
+
+2009-06-05  Andrew Overholt  <overholt@redhat.com>
+
+	* Fix up after erroneous SVN operation.
+
+2009-05-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* .classpath: Updated.
+
+2009-05-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #273830
+	* plugin.xml: Remove warnings.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java (executeCommand): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/TwoInputDialog.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsBuilder.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsDefaultBuildDirHandler.java (handleValue): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (clean): Ditto.
+	(build): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java (setScannerInfoProvider): Ditto. 
+	(verifyScannerInfoProvider): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java (buildFile): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfoProvider.java (setDirty): Ditto. 
+	(getScannerInformation): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutoconfSubstRule.java (DecreasingCharArrayLengthComparator): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeDocumentProvider.java (connect): Ditto.
+	(shutdown): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeEditor.java (getAdapter): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeErrorHandler.java (AutomakeMarker): Ditto. 
+	(checkChildren): Ditto. 
+	(AutomakeMarker.setAttributes): Ditto. 
+	(AutomakeMarker.getAttributes): Ditto.
+	(createMarker): Ditto.
+	(AutomakeMarker.AutomakeMarker): Ditto. 
+	(AutomakeMarker.getAdapter): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/EditorUtility.java (getWorkspaceFileAtLocation): Ditto. 
+	(isLinked): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ElementListSelectionDialog.java (open): Ditto. 
+	(setElements): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ExternalEditorInput.java (getAdapter): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/GNUAutomakefile.java (getBuiltins): Ditto.
+	(addDirective): Ditto. 
+	(parseVPath): Ditto.
+	(getDirectives): Ditto.
+	(parse): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/LexicalSortingAction.java (LexicalCSorter.isSorterProperty): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileCompletionProcessor.java (DirectiveComparator): Ditto.
+	(computeContextInformation): Ditto.
+	(computeCompletionProposals): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileContentOutlinePage.java (MakefileContentProvider.getElements): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileDocumentProvider.java (shutdown): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileEditor.java (getAdapter): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileMessages.java (getFormattedString): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefilePartitionScanner.java (MakefilePartitionScanner): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/NullMakefile.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/OpenIncludeAction.java (resolveIncludeLink): Ditto. 
+	(findFile): Ditto.
+	(getIncludeStatement): Ditto. 
+	(chooseFile): Ditto.
+	(run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Parent.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/PosixMakefileUtil.java (findTargets): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/ProjectionMakefileUpdater.java (createAnnotationMap): Ditto. 
+	(fCollapseConditional): Ditto.
+	(fCollapseRule): Ditto.
+	(fCollapseMacroDef): Ditto.
+	(match): Ditto.
+	(processReconcile): Ditto. 
+	(computeAdditions): Ditto.
+	(initialize): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/Rule.java (getCommands): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SelectionStatusDialog.java (setInitialSelection): Ditto. 
+	(getPrimaryInitialSelection): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/StringMatcher.java (parseWildCards): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/WorkingCopyManager.java (setWorkingCopy): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/MakeTarget.java (getAdapter): Ditto.
+	(getEnvironment): Ditto.
+	(setEnvironment): Ditto.
+	(build): Ditto.
+	(getExpandedEnvironment): Ditto. 
+	(getAttributeMap): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/MakeTargetManager.java (initializeBuilders): Ditto. 
+	(getTargetBuilders): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ProjectTargets.java (findTarget): Ditto. 
+	(remove): Ditto.
+	(get): Ditto.
+	(getAsXML): Ditto.
+	(translateCDTProjectToDocument): Ditto. 
+	(translateDocumentToCDTProject): Ditto.
+	(contains): Ditto.
+	(add): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/editors/autoconf/ProjectionFileUpdater.java (createAnnotationMap): Ditto.
+	(match): Ditto.
+	(processReconcile): Ditto. 
+	(computeAdditions): Ditto.
+	(initialize): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ErrorParserBlock.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/HTML2TextReader.java (static initializer): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/HTMLTextPresenter.java (updatePresentation): Ditto.
+	(adaptTextPresentation): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/ColorManager.java (dispose): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/StatusInfo.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (runScript): Ditto.
+	(runCommand): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/popup/actions/GetDefinedSymbolsAction.java (run): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfDocumentProvider.java (shutdown): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfEditor.java (getAdapter): Ditto.
+	(InformationDispatchAction.makeTextHoverFocusable): Ditto.
+	(.createInformationControl): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfErrorHandler.java (AutoconfMarker.getAttributes): Ditto. 
+	(handleError): Ditto.
+	(AutoconfMarker.getAdapter): Ditto. 
+	(createMarker): Ditto. 
+	(AutoconfMarker.setAttributes): Ditto. 
+	(removeExistingMarkers): Ditto.
+	(AutoconfMarker.AutoconfMarker): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfIdentifierRule.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacro.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java (createPresentation): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroParameterListValidator.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/IAutotoolsEditor.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/InlineDataRule.java (evaluate): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java (handleError): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RecursiveSingleLineRule.java (RecursiveSingleLineRule): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/RestrictedEndOfLineRule.java (RestrictedEndOfLineRule): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyManager.java (AutotoolsPropertyManager): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsToolsPropertyPage.java (performOK): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/CProjectPlatformPage.java (handleConfigurationSelectionChange): Ditto. 
+	(CProjectPlatformPage): Ditto.
+	(filterSupportedConfigurations): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCCProjectWizard.java (doRun): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCProjectWizard.java (doRun): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsProjectOptionPage.java (ManagedWizardOptionBlock.setupHelpContextIds): Ditto. 
+
+2009-05-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #276204
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsProjectNature.java (removeNature): 
+	(addAutotoolsBuilder): Fix compiler warnings.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeCompletionProcessor.java (DirectiveComparator): Ditto. 
+	(computeContextInformation): Ditto. 
+	(computeCompletionProposals): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileCodeScanner.java (createRules): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java (AutomakefileContentProvider.getElements): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AbstractElementListSelectionDialog.java (setSelectionListElements): Ditto.
+	(getWidgetSelection): Ditto.
+	(verifyCurrentSelection): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AbstractMakefile.java (getMacroDefinitions): Ditto. 
+	(getBuiltinInferenceRules): Ditto. 
+	(getRules): Ditto.
+	(getInferenceRules): Ditto. 
+	(getTargetRules): Ditto.
+	(getBuiltinMacroDefinitions): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AddBuildTargetAction.java (getTargetRules): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/CompletionProposalComparator.java (compare): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/SelectionList.java (getSelection): Ditto.
+	(setElements): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/AutoconfPrototype.java (AutoconfPrototype): Ditto. 
+	(getParmName): Ditto.
+	(setParmName): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/AutoconfTextHover.java (getAMDoc): Ditto. 
+	(getMacroList): Ditto.
+	(getACDoc): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java (fHighlightingColorList): Ditto. 
+	(ColorListContentProvider.getElements): Ditto. 
+	(addTextKeyToCover): Ditto.
+	(createSyntaxPage): Ditto.
+	(createOverlayStore): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferencePage.java (fHighlightingColorList): Ditto. 
+	(ColorListContentProvider.getElements): Ditto.
+	(addTextKeyToCover): Ditto.
+	(createSyntaxPage): Ditto.
+	(createOverlayStore): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfAnnotationHover.java (getMarkersForLine): Ditto. 
+	(select): Ditto.
+	(getHoverInfo): Ditto.
+	(formatMultipleMessages): Ditto. 
+	(.createInformationControl): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfCodeScanner.java (AutoconfCodeScanner): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java (computeCompletionProposals): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfPartitionScanner.java (AutoconfPartitionScanner): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java (updateSelection): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElement.java (AutoconfElement): Ditto.
+	(toString): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfParser.java (ExprEndCondition): Ditto. 
+	(ExprEndCondition.serialVersionUID): Ditto.
+	(BlockEndCondition): Ditto.
+	(checkBlockValidity): Ditto.
+	(BlockEndCondition.serialVersionUID): Ditto. 
+
+2009-05-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java (run): Fix to
+	add type for result of InvokeAction.executeCommand call.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoconfAction.java (run): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java (separateTargets): Fix
+	compiler warnings. 
+	(separateOptions): Ditto.
+	(executeCommand): Add type for resulting Collection.  Regress previous fix until Galileo
+	build catches up to recent CDT changes.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java (buildFile): Regress
+	previous fix until Galileo build catches up to recent CDT changes.
+	(getDefinedSymbols): Fix compiler warnings.
+	(getIncludePaths): Ditto.
+	(definedSymbols): Ditto.
+
+2009-05-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java (executeCommand): Use new
+	launcher execute method which isn't deprecated and handle CoreException.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java (buildFile): Ditto. 
+
+2009-04-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #249199
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractAutotoolsHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutoconfHandler.java: New file.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AutomakeHandler.java: New file.
+	* plugin.properties: Add messages for invoking autotools.
+	* plugin.xml: Change invoke autotools actions from Actions in an ActionSet to instead
+	use org.eclipse.ui.menus, org.eclipse.ui.commands, and org.eclipse.ui.handlers and
+	do not add these actions to project menu if not an Autotools project.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/AclocalHandler.java (execute): Implemented. 
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java (run): Add check
+	for null container.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoconfAction.java (run): Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java (run): Ditto.
+
+2009-04-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #270518.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (getPostBuildErrMsg):
+	New method. 
+	(getPreBuildErrMsg): Ditto. 
+	(getTargets): Fix warnings.
+	(makeArrayList): Ditto.
+	(build): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (addMakeTargetsToManager): Add
+	check for non-existent Makefile.
+	(regenerateMakefiles): Check for Makefile at end and if not present, always return error.
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Change message for
+	non-generation of Makefile.
+
+2009-04-20  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/HTMLTextPresenter.java
+	(updatePresentation): Fix compiler warnings.
+
+2009-04-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #272924
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/OpenIncludeAction.java (run): 
+	Fix compiler warnings.
+	(getIncludeStatement): Ditto.
+	(chooseFile): Ditto.
+	(.visit): Ditto.
+	(findFile): Ditto.
+
+2009-04-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #272923
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileMessages.java (getFormattedString): Fix
+	compiler warnings.
+
+2009-04-20  Jeff Johnston  <jjohnstn@redhat.com>
+	
+	Resolves #272922
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (getAutogenArgs): Fix compiler
+	warnings. 
+	(addMakeTargetsToManager): Ditto. 
+	(runScript): Ditto.
+	(getConfigArgs): Ditto.
+	(MakeTargetComparator): Ditto.
+	(makeArray): Ditto.
+	(runCommand): Ditto.
+	
+2009-04-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #272921
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.java (getFormattedString): 
+	Cast 2nd argument for message fomatting to avoid compile warnings. 
+
+2009-04-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #272920
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/wizards/AutotoolsWizardMessages.java (getFormattedString):
+	Cast 2nd argument for message formatting to avoid compiler warnings. 
+	(getFormattedString): Ditto.
+
+2009-04-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #272919
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/AutotoolsPluginImages.java (makeIconFileURL):
+	Fix static member reference to avoid compiler warning. 
+	(static initializer): Ditto.
+	
+2009-04-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #272918
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java (getFormattedString): Cast
+	2nd argument to avoid compiler warning.
+	
+2009-04-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #272917
+	* .settings: Updated.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/preferences/AbstractEditorPreferencePage.java (validatePositiveNumber):
+	Properly template containers. 
+	(getTextFields): Ditto.
+	(initializeFields): Ditto.
+	(updateStatus): Ditto.
+	(getCheckBoxes): Ditto.
+	(getNumberFields): Ditto.
+	
+2009-04-20  Jeff Johnston  <jjohnstn@redhat.com>
+	
+	Resolves #272916.	
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileCodeScanner.java (createRules): Use templated
+	List.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/MakefileCodeScanner.java (createRules): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/editors/automake/AbstractMakefileCodeScanner.java (createTextAttribute):
+	Correctly access static member function. 
+	(initializeRules): Use templated List.
+
+2009-04-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #270680
+	
+	* plugin.xml: Fix Autotools properties page to only show up for Autotools nature.
+	Add gcc and g++ to Toolchain so indexing will work.
+
+2009-03-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (build): Add
+	logic to also respect the makefile command being changed in the Makefile target.
+
+2009-03-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #269974
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (build): Add
+	logic to handle a makefile target being for a subdirectory Makefile as opposed to
+	the main Makefile.
+
+2009-03-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (build): Use
+	System.arraycopy rather than Arrays.copyOfRange because the latter is a 1.6 API.
+
+2009-03-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #265996
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (regenerateMakefiles): If we are
+	doing full reconfigure, use same cleaning method on build directory as "clean" build.
+	(makeArray): New method to convert String into array of Strings.
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Add message when cleaning
+	build directory prior to reconfigure. 
+
+2009-03-02  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #266451
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (build): Use
+	property "line.separator" instead of "lineSeparator".
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (initializeBuildConfigDirs):
+	Store a workspace-neutral builddir that can be moved to another workspace.
+	Use IBuilder.setBuildPath method instead of IBuilder.setBuildAttribute to set the new build
+	dir.  Also, check to see if the builddir has changed first. 
+	
+2009-03-02  Jeff Johnston  <jjohnstn@redhat.com>
+ 
+	Resolves #264935
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/CBuildStepsConsole.java: New file.
+	* plugin.xml: Add CBuildSteps console.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (build): Perform
+	prebuild and postbuild steps if present.
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/ui/ConsoleMessages.properties: Add name
+	for Build Steps console. 
+
+2009-02-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #265873
+	
+	* META-INF/MANIFEST.MF: Add dependency on org.eclipse.core.net.
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java (stop): Add call to
+	ServiceTracker close() method.
+	(start): Add ServiceTracker open() call for IProxyService.
+	(getProxyService): New method to get IProxyService. 
+
+2009-01-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #261717
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/AutoconfTextHover.java (getMacroList): 
+	Don't bother processing macros if the macro document turns out to be null.
+
+2009-01-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #261257
+	
+	* META-INF/MANIFEST.MF: Update plug-in to add .qualifier to id and update
+	to 1.0.2.qualifier.
+	* plugin.xml: Update invoke autotools action set to set visible to true.
+
+2009-01-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (getConfigArgs): If there
+	are no -- args in the user arguments, still pass them on to configure.
+
+2008-11-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #472731
+	
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (hasTargetBuilder): 
+	Add check for ManagedProject being null which is apparently possible.
+
+2008-11-25  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeDocumentProvider.java: Change
+	Copyright to make Red Hat a contributor to the copyright of the original file modified to make
+	this new class.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeEditor.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/Automakefile.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileCodeScanner.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java: Ditto. 
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakeMacroDefinitionRule.java: Ditto.
+
+2008-11-03  Andrew Overholt  <overholt@redhat.com>
+
+	* build.properties: Remove libhoverdocs/.
+
+2008-10-31  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Use plugin.properties for provider.
+	* plugin.properties: Add "(Incubation)" to Bundle-Name.
+
+2008-10-28  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Update BREE to J2SE-1.5.
+
+2008-10-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump up release to 1.0.1.
+
+2008-10-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java (build): Add check for default
+	configuration coming back null from buildinfo.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java (performDefaults):
+	Set make -w default to be true.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject):
+	Set make -w project property to true and don't turn off indexer.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCCProjectWizard.java (doRun): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/wizards/NewAutotoolsCProjectWizard.java (doRun): Ditto.
+
+2008-10-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for #249416
+
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java: Fix addition of MakeTargets to run faster.
+	(addMakeTargetsToManager): Rewritten to not use MakeTargetManager addTarget or removeTarget methods which
+	cause a rewrite of the .cproject file each time.
+	(isValidTarget): Remove checking MakeTargetManager existing target.
+	(translateDocumentToCDTProject): New method which outputs the MakeTargets to the .cproject file.
+	(MakeTargetComparator): New Comparator for sorting MakeTargets.
+	(createTargetElement): New method.
+	* src/org/eclipse/linuxtools/cdt/autotools/Resources.properties: Add subtask message for refreshing Make Targets
+	which might take some time.
+
+2008-10-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for #249231
+
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (getAutogenArgs): Add
+	support to resolve build macros.
+	(getConfigArgs): Ditto.
+	(initializeBuildConfigDirs): Ditto.
+
+2008-10-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for #249644.
+
+	* plugin.xml: Change visible to true for invoke autotools action set.  Also add
+	new popupmenus for running autoconf directly on configure.ac or configure.in.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java (run): Use
+	getCWD to get the relative current working directory and pass a string to the new
+	TwoInputDialog constructor.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java (run): Ditto.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java (getCWD): New method
+	to get the relative CWD for an autotools action.
+	* src/org/eclipse/linuxtools/cdt/autotools/actions/TwoInputDialog.java (createDialogArea):
+	Use CLabel instead of Label for first label (the CWD).
+	(TwoInputDialog): Change to accept a String for the first message instead of an IPath.
+	* src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java (addMakeTargetsToManager):
+	Temporarily disable.
+
+2008-10-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java (getIncludePaths): Fix bug that
+	was properly resolving relative paths.  Also add support for parsing -isystem specifiers and putting
+	the paths on the include path list.
+
+2008-09-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Change Eclipse-AutoStart over to Bundle-ActivationPolicy.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/LibHover.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/LibHoverMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/LibHoverMessages.properties: Removed.
+	* plugin.xml: Remove CHelpProvider library hover extension as this functionality
+	has been moved into its own plugin.
+
+2008-09-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/editors/automake/AutomakefileCodeScanner.java (createRules):
+	Specify Token.UNDEFINED for WordRules default token.  Otherwise, just getting the first possible
+	character of a word detector will result in default token being returned and no further parsing.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/editors/AutoconfCodeScanner.java (AutoconfCodeScanner):
+	Ditto.
+
+2008-09-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfoProvider.java (getScannerInformation):
+	Return null if project is not an Autotools project.
+	(unsubscribe): Check scanner info for null before accessing.
+
+2008-09-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Refactored from com.redhat.eclipse.cdt.autotools to org.eclipse.linuxtools.cdt.autotools
+
+	* src/org/eclipse/linuxtools/cdt/autotools/internal/text/hover/AutoconfTextHover.java:
+	(AUTOCONF_MACROS_DOC_NAME): Change to use default URL pointing to sourceware.org.
+	(AUTOMAKE_MACROS_DOC_NAME): Ditto.
+	(getHoverDoc): Remove unused variable.
+	(getAMDoc): Modify to handle either a file or URL.
+	(getACDoc): Ditto.
+	(.createInformationControl): Switch to use non-deprecated constructor.
+	* src/org/eclipse/linuxtools/cdt/autotools/ui/LibHover.java (getLibHoverDocs): Modify to handle
+	either an external file name or URL.
+	(getLibHoverDocName): New method that returns default URL pointing to sourceware.org.
+	(HelpResource.getHref): Change to return URL.
+	(getFunctionInfo): Remove unread variable.
+
+2008-09-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder(hasTargetBuilder): Change logic
+	to look for ProjectType id rather than looking at builder id of configuration since ManagedProject
+	might have had configuration removed.  Resolves #461647.
+	* plugin.xml: Fix typo in referenced nature of autoolsNature.  Resolves #461201.
+
+2008-08-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Update version number to 1.0.0 and specify minimum/maximum versions
+	for all dependencies now that CDT 5.0 and Eclipse 3.4 must be used.
+
+2008-07-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* icons/ac16/acmacro_arg_obj.gif: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsEditorPropertyPage.java:
+	(getproject): Remove.
+	* META-INF/MANIFEST.MF: Add org.eclipse.core.filesystem as dependency.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java: Update imports.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java (getImage):
+	Use special image for acmacro argument.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java:
+	Update imports.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/AutotoolsPluginImages.java: Add image for
+	acmacro argument.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java: Update imports.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java (reconcile):
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java: Update imports.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileReconcilingStrategy.java (reconcile):
+	Call new form of parse method.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Directive.java:
+	(getMakefile): New required method.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUAutomakefile.java:
+	(parse): New required method.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/AbstractMakefile.java:
+	(getFileURI): New required method.
+	(getMakefile): Ditto.
+	(setFileURI): Ditto.
+	(getMakefileReaderProvider): Ditto.
+	(parse): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/OpenDeclarationAction.java:
+	(openInEditor): Use URI instead of File.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/NullMakefile.java:
+	(parse): New required method to implement.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileDocumentProvider.java (createMakefile):
+	Add throws modifier.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroCodeScanner.java: Update imports.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java: Ditto.
+
+2008-07-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump release to 0.9.7.
+
+2008-04-17 14:12  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/:
+	  internal/ui/editors/autoconf/ProjectionFileUpdater.java,
+	  ui/editors/AutoconfCodeScanner.java,
+	  ui/editors/AutoconfPKGWordDetector.java,
+	  ui/editors/outline/AutoconfLabelProvider.java: Collapse and
+	  decorate long macro arguments, and notice PKG_ macros
+
+2008-04-17 13:13  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/:
+	  internal/ui/editors/autoconf/ProjectionFileUpdater.java,
+	  ui/editors/AutoconfEditorMacroValidator.java,
+	  ui/editors/parser/AutoconfElement.java,
+	  ui/editors/parser/AutoconfParser.java: Fix editor collapsing and
+	  remove line number metadata from AutoconfElement, since the "end
+	  line" is only meaningful in the context of the client.
+
+2008-04-17 10:43  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/:
+	  AutoconfEditorMessages.properties,
+	  outline/AutoconfContentOutlinePage.java,
+	  parser/AutoconfCaseConditionElement.java,
+	  parser/AutoconfCaseElement.java, parser/AutoconfElement.java,
+	  parser/AutoconfElifElement.java, parser/AutoconfElseElement.java,
+	  parser/AutoconfForElement.java, parser/AutoconfIfElement.java,
+	  parser/AutoconfMacroDetector.java,
+	  parser/AutoconfMacroElement.java,
+	  parser/AutoconfOutlineErrorHandler.java,
+	  parser/AutoconfParser.java, parser/AutoconfRootElement.java,
+	  parser/AutoconfTokenizer.java, parser/AutoconfWhileElement.java,
+	  parser/OldAutoconfParser.java, parser/Token.java: More autoconf
+	  parser work.	Remove old parser and standardize AST node
+	  constructors.  Add more tests and fix some bugs.
+
+2008-04-10 15:40  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/:
+	  internal/ui/editors/autoconf/ProjectionFileUpdater.java,
+	  ui/editors/AutoconfEditor.java,
+	  ui/editors/AutoconfEditorMacroValidator.java,
+	  ui/editors/AutoconfEditorMessages.properties,
+	  ui/editors/AutoconfErrorHandler.java,
+	  ui/editors/AutoconfReconcilingStrategy.java,
+	  ui/editors/outline/AutoconfLabelProvider.java,
+	  ui/editors/parser/AutoconfElement.java,
+	  ui/editors/parser/AutoconfMacroArgumentElement.java,
+	  ui/editors/parser/AutoconfMacroElement.java,
+	  ui/editors/parser/AutoconfParser.java,
+	  ui/editors/parser/AutoconfParser2.java,
+	  ui/editors/parser/AutoconfSelectElement.java,
+	  ui/editors/parser/AutoconfTokenizer.java,
+	  ui/editors/parser/AutoconfUntilElement.java,
+	  ui/editors/parser/AutoconfWhileElement.java,
+	  ui/editors/parser/ITokenConstants.java,
+	  ui/editors/parser/OldAutoconfParser.java,
+	  ui/editors/parser/ParseException.java: More autoconf parser work.
+
+2008-04-09 14:38  Ed Swartz <ed.swartz@nokia.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/:
+	  AutoconfEditorMacroValidator.java,
+	  AutoconfEditorMessages.properties, AutoconfErrorHandler.java,
+	  parser/AutoconfCaseConditionElement.java,
+	  parser/AutoconfElement.java,
+	  parser/AutoconfMacroArgumentElement.java,
+	  parser/AutoconfMacroDetector.java, parser/AutoconfParser.java,
+	  parser/AutoconfParser2.java, parser/AutoconfTokenizer.java,
+	  parser/IAutoconfErrorHandler.java,
+	  parser/IAutoconfMacroDetector.java, parser/IMacroDetector.java,
+	  parser/ITokenConstants.java, parser/Token.java: New autoconf
+	  parser work in progress
+
+2008-04-07 14:06  Ed Swartz <ed.swartz@nokia.com>
+
+	* META-INF/MANIFEST.MF,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMacroValidator.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfErrorHandler.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroPartitionRule.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroWordDetector.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfReconcilingStrategy.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/ParseException.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElement.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfMacroArgumentElement.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/IAutoconfErrorHandler.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/IAutoconfMacroValidator.java,
+	  src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/ParseException.java:
+	  Initial checkpoint for autotools parser changes
+
+
+2008-01-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/AclocalHandler.java: New file for
+	future menu support.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsProjectNature.java: New file.
+	* META-INF/MANIFEST.MF: Release updated.
+	* plugin.properties: Add some new messages for autotools tool invocation.
+	* plugin.xml: Update release to 0.9.6.  Add autotools project nature.  Make
+	autotools commands enablement dependent on autotools project nature.
+	Specify enablesFor 1 for all autotools tool actions.
+	* src/com/redhat/eclipse/cdt/autotools/actions/AbstractTargetAction.java (setSelectedContainer): New
+	method for future menu support.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java (hasTargetBuilder): Use
+	AutotoolsProjectNature static addAutotoolsBuilder method.
+	(addAutotoolsBuilder): Moved to AutotoolsProjectNature.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (runScript): New method to
+	run scripts.
+	(regenerateMakefiles): Use runScript method to run configuration scripts. Use
+	runCommand for executables like "make".
+	(runCommand): Added comments.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject):
+	Add new autotools project nature.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsCCProjectWizard.java (addNature):
+	Ditto plus set up autotools builder.
+	(doRun): Don't set up autotools builder since it is done in addNature.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsCProjectWizard.java (addNature):
+	Add new autotools project nature and set up autotools builder.
+	(doRun): Don't set up autotools builder since it is done in addNature.
+
+2007-12-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Update release to 0.9.5.3.
+
+2007-12-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #412651, #412661
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (getConfigurePath): Fetch tool command
+	name instead of hard-wiring to "configure".
+	(autogenExists): Fetch command name from autogen.sh options.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java: (removeBuildDir): New method.
+	(clean): If user has specified remove build directory, then use removeBuildDir method.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: New messages for supporting
+	build directory removal operation.
+
+2007-11-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHoverMessages.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHoverMessages.properties: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java: Add references to
+	LibHoverMessages instead of hard-coded strings.
+	* libhoverdocs/glibc-2.7-2.xml: Regenerated.
+
+2007-11-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java
+	(HelpResource.getHref): Use latest glibc doc version.
+	(getLibHoverDocs): Ditto.
+	* libhoverdocs/glibc-2.7-2.xml: New C library docs based on glibc-2.7-2 manual.
+	* libhoverdocs/glibc.xml: Old glibc docs removed.
+
+2007-11-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Update release to 0.9.5.2.  Also clear all OS lists for build definitions to
+	default to "all" OSes.
+
+2007-11-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #385991
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java (getMatchingFunctions): New method.
+	(FunctionSummary.compareTo): New method to support Comparable interface.
+	(FunctionSummary.getIncludes): Fix to avoid type cast exception/
+	(getFunctionInfo): Revised to call getFunctionSummaryFromNode method.
+	(FunctionSummary): Add Comparable interface.
+	(getFunctionSummaryFromNode): New method.
+	(FunctionSummary.FunctionPrototypeSummary.getPrototypeString): Add NLS
+	comments.
+
+
+2007-11-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsToolsPropertyPage.java: New File for
+	setting tool paths for the various autotools.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAclocalAction.java (run): Use the
+	project properties setting to determine what tools to use.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutoconfAction.java (run): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutomakeAction.java (run): Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties: New
+	messages.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyConstants.java: Add new
+	constants for setting the tool paths for aclocal, automake, and autoconf.
+	* plugin.xml: Add tools settings property page for Autotools.
+	* plugin.properties: New message for added property page.
+
+2007-10-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #359311, #359301, #359321
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacro.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyManager.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/IProjectPropertyListener.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsProjectPropertyTester.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/IPropertyChangeManager.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java:
+	(getAMDoc): New method.
+	(fBindingService):
+	(getAutomakeMacrosDocName): Modified to take a version parameter.
+	(getAutoconfMacrosDocName): Ditto.
+	(getPrototype): Changed to take an editor input.
+	(getAutoconfMacrosDocName): Ditto.
+	(AutotoolsHoverDoc): New internal class.
+	(getMacroList): New method to merge AC and AM macros together based on version
+	properties.
+	(getACDoc): New method.
+	(getIndexedInfo): Changed to take editor input.
+	(getHoverDoc): New metohd.
+	(getIndexedInfoFromDocument): New method that will parse the given document.
+	(getDefaultAutoconfMacrosDocName): New method to get the default preference
+	Autoconf macros doc name.
+	(getHoverRegion): Modified to get editor from elsewhere.
+	(getDefaultAutomakeMacrosDocName): New method to get the default preference
+	Autoconf AM macros doc name.
+	(getHoverInfo): Changed to take an editor input.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroParser.java: Removed.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/editors/autoconf/ProjectionFileUpdater.java (initialize):
+	(processReconcile): Use stored editor.
+	(install): Change input parameter to AutoconfEditor.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java (parseMacro):
+	(parse): Modified to take IEditorInput argument and pass that on to AutoconfErrorHandler.
+	(AutoconfParser): Modified to take an editor parameter.
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsDefaultBuildDirHandler.java: Updated
+	copyright to just Red Hat Inc.
+	* plugin.properties: New messages.
+	* plugin.xml: Add ICPropertyTab extension for editor properties.  Add properties
+	page for Autotools properties.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsEditorPropertyPage.java: New file.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyPage.java: Rewritten.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java:
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyConstants.java:
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfErrorHandler.java (AutoconfErrorHandler):
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java
+	(AutoconfSourceViewerConfiguration): Take editor as parameter.
+	(getPresentationReconciler): Pass along or use editor passed in.
+	(getContentAssistant): Ditto.
+	(getReconciler): Ditto.
+	(getTextHover): Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java (connect):
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java:
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java (computeCompletionProposals):
+	(AutoconfMacroContentAssistProcessor): Take editor input.
+	(computeMacroStart): Use editor.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfReconcilingStrategy.java (reconcile):
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java: Make this implement
+	IProjectPropertyListener
+	(handlePreferenceStoreChanged): Modified to call handleVersionChange method if a
+	autoconf or automake macro version preference change has occurred.
+	(doSetInput): Deregister editor as property listener if editor was for a project
+	file previously and register editor as property listener if editor is now for a
+	project.
+	(getAutoconfDocumentProvider): Make static.
+	(getAutoconfCodeScanner): Pass this to constructor.
+	(handleVersionChange): New method.
+	(handleProjectPropertyChanged): New IProjectPropertyListener method.
+	(initializeEditor): Pass this to source viewer configuration constructor.
+	(getAutoconfParser): Pass this to constructor.
+	(dispose): Deregister editor as property listener for a project if applicable.
+	(getAutoconfMacroCodeScanner): Pass this to constructor.
+
+2007-10-23  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroCodeScanner.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/RestrictedEndOfLineRule.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitionScanner.java (AutoconfPartitionScanner):
+	Move macro partitioning ahead of comments.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java (getPresentationReconciler):
+	Use AutoconfMacroCodeScanner for macro damager repairer.
+	(getContentAssistant): Use AutoconfMacroCodeScanner for macro content assist.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java (nextToken):
+	New method that simply defaults to super.nextToken to be used for debugging purposes.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java (getAutoconfMacroCodeScanner):
+
+	* plugin.xml: Update to release 0.9.5.1.
+
+2007-10-23  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #330701
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java: New File to
+	add property settings for how to clean an Autotools project and whether or not to use the
+	current Autotools info scanner.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyMessages.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyConstants.java: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties: New File.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java (parseLines):
+	Process macros ahead of stripping out comments as this prevents removing quotes inside the
+	macro which have precedence over # (e.g. used to specify #include and not meaning a
+	comment to end of line).
+	(parseWhile): Change comment typo.
+	(parseFor): Ditto.
+	* plugin.properties: Add new messages regarding property pages.
+	* plugin.xml: Add Autotools build IcPropertyTab (AutotoolsBuildPropertyPage).  Also
+	specify that AutotoolsDefaultBuildDirHandler is also an option applicability tester.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.properties:
+	Change the message for autoconf and automake versions to include the word "Default".
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitioner.java (computePartitioning):
+	Add override method as way to print out partitions.  Cannot compute and print out partitions at
+	connect time as in 4.0.1 we initially are given an empty document that is later filled.
+	(printPartitions): Change argument to be an array of partition regions.
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java (build):
+	(clean): New method.  Pay attention to user clean method preference.
+	(getTargets): Pay attention to user clean target preference.
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java (getCompilationString):
+	Pay attention to user preference on scanner info retrieval and disable if need be.
+	(createIncludeChain): Use AutotoolsPropertyConstants to get property names to use.
+	(followIncludeChain): Ditto.
+	(getMakefile): Add nls comments.
+	(AutotoolsScannerInfo): Ditto.
+	(getDefinedSymbols): Ditto.
+	(buildFile): Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (regenerateMakefiles): Don't
+	call AutotoolsScannerInfoProvider.setDirty method anymore.  Instead, set a project property
+	to indicate the scanner info is dirty.
+	(addMakeTargetsToManager): Add a try/catch statement to prevent duplicate entries from
+	stopping loop that adds make targets.
+	(initializeBuildConfigDirs): Formatting change.
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfoProvider.java (getScannerInformation):
+	Add a check for project property indicating the scanner info is dirty in which case call
+	setDirty method.
+	(setDirty): Make private.
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsDefaultBuildDirHandler.java: Now implements
+	IOptionApplicability.
+	(isOptionEnabled): New interface method to implement.
+	(isOptionVisible): Ditto.
+	(isOptionUsedInCommandLine): Ditto (set to false).
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsBuilder.java (getProject): New method.
+	(AutotoolsBuilder): Add project argument.
+	(getCleanBuildTarget): Implemented using new Autotools CLEAN_MAKE_TARGET property.
+
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new message.
+
+2007-10-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #323641
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java (getDefinedSymbols): Use
+	the patch provided by Jose Fonseca to provide a proper regular expression for parsing
+	the defined symbols from the make output.
+
+2007-10-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Ensure the ids for InvokeAutoconf and InvokeAutomake actions are unique.
+
+2007-10-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsDefaultBuildDirHandler.java (handleValue):
+	Add some place holders for supporting the user manually setting the build directory.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add some dialog messages for
+	future usage.
+	* plugin.xml: Update version to 0.9.5.
+
+2007-10-02  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #315811
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsDefaultBuildDirHandler.java: New File.
+	* plugin.xml: Change build definition to version 4.0.0.  Remove unused project converter
+	extension.  For build directory, specify an option handler which is implemented by
+	AutotoolsDefaultBuildDirHandler.
+
+2007-09-24  Andrew Overholt  <overholt@redhat.com>
+
+	* plugin.xml: Update version to 0.9.4.
+
+2007-09-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutoconfAction.java (run):
+	Fix array indexing.
+
+2007-09-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Add ELF and GNU_ELF binary parsers as default for an Autotools project.
+
+2007-09-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #274551
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java (getCompilationString): Support
+	the case where the file isn't part of the build and there is no scanner info to gather.
+	(buildFile): Minor cosmetic changes.
+
+	* META-INF/MANIFEST.MF: Update release.
+
+2007-09-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (regenerateMakefiles): Add a
+	clause to check for the case whereby there was no way to generate the Makefile and one
+	didn't already exist.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties (Makegenerator.didnt.generate):
+	New message.
+
+2007-08-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #254248
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java (selectionChanged):
+	Make call to editor.selectAndReveal method to focus editor page on selected outline item.
+
+2007-08-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #254246
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/CWordFinder.java (findWord): Fix
+	to handle being in the first word of the file.
+
+2007-08-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #253331
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java (build): Enable
+	autobuilding.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (regenerateMakefiles):  If
+	the configuration options change, clean the previous build directory so a full rebuild
+	will occur.
+
+2007-08-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Change release to 0.9.2 and specify minimum java runtime as
+	1.4.
+
+2007-08-15 Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #251412
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java (addAutotoolsBuilder):
+	When calling IProject.setDescription(), pass a NullProgressMonitor instead of
+	null, despite what the function API says because an isCancelled() call may occur
+	and will result in an exception thrown.  Also, use a try/catch block to handle any
+	of the legitimate exceptions that might occur in this operation.
+
+2007-08-15 Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new messages
+	for new C and C++ project wizards.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectWizard.java: Renamed...
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsCProjectWizard.java: ..to this.
+	(doRun): Rewritten based on conversion wizard to properly set up project.
+	(getProjectType): New method.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsCCProjectWizard.java:  New file
+	copied from NewAutotoolsCProjectWizard but inherits from NewCCProjectWizard.
+
+	* icons/dlcl16/newc_app.gif: New gif.
+	* icons/dlcl16/newcc_app.gif: Ditto.
+	* icons/elcl16/newc_app.gif: Ditto.
+	* icons/elcl16/newcc_app.gif: Ditto.
+
+	* plugin.properties: Add new strings for new C and C++ project wizards.
+	* plugin.xml: Add new C and C++ project wizards.
+
+2007-08-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #251604
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (getAutogenArgs): New method.
+	(regenerateMakefiles): Pass user-specified autogen.sh options when invoking autogen.sh.
+	* plugin.xml: Add autogen.sh tool support with user options.
+	* plugin.properties: Add new autogen tool message strings.
+
+2007-07-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java
+	(handlePreferenceStoreChanged): Add support for changing automake macros version.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java
+	(getAutomakeMacrosDocument):
+	New method.
+	(getIndexInfo, getPrototype): Create private versions of these that take a document
+	as an input parameter.  Change the public static methods to call the private
+	versions with the autoconf macro document and the automake macro document, if
+	the macro isn't found yet.
+	(init): Set up the autoconf macro document and automake macro document.
+	(reinit): Reset both the autoconf and automake macro documents.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java
+	(LATEST_VERSION): Replace with LATEST_AC_VERSION and LATEST_AM_VERSION.
+	(createOverlayStore): Add automake version setting.
+	(initializeVersion): Replace with initializeACVersion and initializeAMVersion.
+	(initialize): Call the two replacements of initializeVersion.
+	(createVersionTabContent): Add automake version support.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsEditorPreferenceConstants.java
+	Add automake version support.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.properties:
+	Add messages used in automake version preference.
+
+	* libhoverdocs/ammacros-1.4-p6.xml: New automake macro docs for 1.4-p6.
+	* libhoverdocs/ammacros-1.9.5.xml: New automake macro docs for 1.9.5.
+	* libhoverdocs/ammacros-1.9.6.xml: New automake macro docs for 1.9.6.
+
+2007-07-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* MANIFEST.MF: Bump up release to 0.9.1.
+
+2007-07-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUAutomakefile.java
+	(parse): Fix Automake if/else constructs to be child/parent directives as appropriate.
+	(bypassIf, bypassElse, isTrue): Removed.
+	(parseIf): Add rules parameter.
+	(addDirective): Remove caveat when dealing with automake if/else.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IAutomakeConditional.java
+	(getRules, setRules): New methods for the interface.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Else.java: Add ICommand
+	interface and implement required methods including new ones add to IAutomakeConditional.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/If.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeErrorHandler.java
+	(update): Change to call checkChildren for makefile.
+	(checkChildren): New recursive method to check for bad directives.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java
+	(AutomakefileLabelProvider.getImage): Add support for IAutomakeConditional elements and
+	remove reference to AutomakeIfElse class.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeMacroDefinitionRule.java
+	(isValidCharacter): Add support for "+-$()@" chars.
+
+2007-07-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUAutomakefile.java
+	(parseIf): Add @if support.
+	(isTrue): Default to true for if conditions.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUMakefileConstants.java:
+	Add @if and @endif macros.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUMakefileUtil.java
+	(isIf): Add @if support.
+	(isEndif): Add @endif support.
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java:
+	Add support for @if and @endif keywords.
+	(createRules): Add support for whitespace and simple identifiers.
+
+2007-07-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #247518
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java
+	(createRules): Use new AutoconfSubstRule class for identifying autoconf substituitions.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileUtil.java (isConfigMacro):
+	Refine so that macro must start and end with @ and contain at least one valid char.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutoconfSubstRule.java: New file.
+
+2007-07-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #246153
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java (createFileInfo):
+	Rewrite to handle workspace files as well as external ones.
+	(createMakefile): Change to accept a file name rather than an IFile.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor
+	(getDefault): New method.
+	(doSetInput): Ditto.
+	(initializeEditor): Add a few lines that would have been performed by
+	base class initializeEditor.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeErrorHandler
+	(AutomakeMarker): New internal class for error marking.
+	(update): Switch to using internal markers and directly updating the
+	Annotation model.
+	(removeExistingMarkers): Directly reference the annotation model.
+	(AutomakeErrorHandler): Fetch and store the annotation model for the input.
+	Change prototype.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java
+	(AutomakefileReconcilingStrategy): Change to store an IEditorInput.  Use new
+	AutomakeErrorHandler interface.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileEditor.java
+	(initializeEditor): Remove fixme comment.
+
+2007-07-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #246783
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java:
+	(initializeEditor): Call AutotoolsEditorPreferenceConstants.initializeDefaultValues
+	to ensure the editor default values are set.
+
+2007-06-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #246154
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsBuilder.java: New proxy
+	class to wrap an existing IBuilder and override build path functionality.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java:
+	(build): Wrap the builder using the new AutotoolsBuilder class so the
+	build path will work properly.
+
+2007-06-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #246134
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfErrorHandler.java:
+	(AutoconfErrorHandler): Change constructor to just take IDocument input.
+	(AutoconfMarker): New private class for marking autoconf document.
+	(createMarker): New private method to create AutoconfMarker in document.
+	(handleError): Create a marker and add it to annotation model durectly
+	instead of using MarkerUtilities.
+	(removeAllMarkers): Remove directly from annotation model instead of using file.
+	(removeExistingMarkers): Ditto.
+	(getDocument): New method.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java:
+	(connect): Change constructor call to AutoconfErrorHandler.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java:
+	(getViewer): New method to return the source viewer for the editor.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroParser.java:
+	(AutoconfMacroParser): Change constructor call to AutoconfErrorHandler.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java:
+	Change all uses of AutoconfOutlineErrorHandler to AutoconfErrorHandler.
+
+2007-06-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #245820
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileUtil.java (isAutomakeCommand):
+	New method.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Conditional.java (isIf): New
+	method.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IAutomakeConditional.java:
+	New interface.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Else.java: Changed to
+	implement new IAutomakeConditional interface.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/If.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUAutomakefile.java
+	(parse): Add Automake if/else parsing and support for Makefile.in processed if/else blocks.
+	(bypassIf, bypassElse, parseIf): New private methods.
+	(addDirective): Don't add directives to an Automake if or else construct.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUMakefileConstants.java:
+	Add CONDITIONAL_IF constant.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUMakefileUtil.java
+	(isIf): New method.
+
+2007-06-25  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileEditorTogglePresentationAction.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileEditorActionContributor.java: Ditto.
+
+	* icons/etool16/alphab_sort_co.gif: New icon.
+	* icons/etool16/build_menu.gif: Ditto.
+	* icons/etool16/convert_normal.gif: Ditto.
+	* icons/etool16/make.gif: Ditto.
+	* icons/etool16/makefile.gif: Ditto.
+	* icons/etool16/newc_app.gif: Ditto.
+	* icons/etool16/newcc_app.gif: Ditto.
+	* icons/etool16/segment_edit.gif: Ditto.
+	* icons/etool16/target_add.gif: Ditto.
+	* icons/etool16/target_build.gif: Ditto.
+	* icons/etool16/target_delete.gif: Ditto.
+	* icons/etool16/target_edit.gif: Ditto.
+	* icons/etool16/target_filter.gif: Ditto.
+	* icons/etool16/update_old.gif: Ditto.
+
+	* plugin.xml: Change Automake editor to use new internal MakefileEditorActionContributor
+	class rather than point to the internal one in internal CDT make.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentSetupParticipant.java:
+	(setup): Don't bother registering this as document listener.
+	(documentAboutToBeChanged): Remove body of method as this is no longer needed.
+
+2007-06-25  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #245611
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java
+	(getMacroList): Change to call AutoconfTextHover to get the name of the macros
+	document since it will depend on current preferences.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java
+	(getAutoconfMacrosDocName): New static method.
+
+2007-06-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* libhoverdocs/acmacros-2.59.xml: New autoconf hover text and syntax info
+	for autoconf 2.59.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java:
+	Add 2.59 support.
+
+2007-06-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* libhoverdocs/acmacros-2.13.xml: New autoconf hover text and syntax info
+	for autoconf 2.13.
+	* libhoverdocs/acmacros-2.61.xml: New autoconf hover text and syntax info
+	for autoconf 2.61.
+	* libhoverdocs/acmacros.xml: Replaced with files above.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover (init): Change document
+	to be dependent on autoconf version preference.
+	(reinit): New method to force reinitialization of help document.
+	(getPrototype): Fix to allow for earlier versions which specify multiple
+	prototypes in one using "[,", for example.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java:
+	Add version preference support.
+	(createOverlayStore): Add version support.
+	(createContents): Add version tab.
+	(initializeVersion): New method.
+	(createVersionTabContents): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsEditorPreferenceConstants.java:
+	Add AUTOCONF_VERSION and initialize the default autoconf version value to be the
+	highest possible.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.properties:
+	Add new messages pertaining to autoconf version.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java (handlePreferenceStoreChanged):
+	If the autoconf version is changed, invalidate the document and force a reparse.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.java (getFormattedString):
+	Add new method which takes 3 replacement strings.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.properties:
+	Change macro error messages to take the autoconf version as a parameter.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java: Fix
+	typo for too many args message id.
+	(parseMacro): For wrong number of argument messages, get the current autoconf version preference
+	and pass it in to the message.
+
+2007-06-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java: Rebase on
+	GNUAutomakefile class.  Remove all parsing methods.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java: Fix
+	comments to refer to internal Autotools classes as appropriate.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Conditional.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/DefineVariable.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/DeleteOnErrorRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Else.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Endef.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Endif.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ExportAllVariablesRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ExternalEditorInput.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUAutomakefile.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUTargetRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUVariableDef.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Ifdef.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Ifeq.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Ifndef.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Ifneq.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Include.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IntermediateRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/LowResolutionTimeRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/NotParallelRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/OverrideDefine.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/OverrideVariable.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/PhonyRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/SecondaryRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/StaticTargetRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/TargetVariable.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Terminal.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/UnExport.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/VPath.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/ExternalEditorInput.java: Update comments
+	that should refer to internal Autotools classes.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/MakefileDocumentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/ProjectionMakefileUpdater.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/WorkingCopyManager.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/editors/autoconf/ProjectionFileUpdater.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferencePage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Ditto.
+
+2007-06-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #243184
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeConfigMacro.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java (parse): Add
+	support for autoconf macros.
+	(parseConfigMacro): New method.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java
+	(createRules): Add rule for configure macros.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java
+	(getImage): Add support for AutomakeConfigMacro.
+	(getText): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileUtil.java (isConfigMacro):
+	New method.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeUIImages.java: Add acmacro_obj image.
+	* icons/obj16/acmacro_obj.gif: New icon.
+
+2007-06-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java: Removed.  No
+	longer used now that MakeTargets work.
+	* src/com/redhat/eclipse/cdt/autotools/actions/CheckboxTablePart.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeContentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeTargetDialog.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/SharedPart.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/SharedPartWithButtons.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/StructuredViewerPart.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/TargetListViewerPart.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/editors/autoconf/ProjectionFileUpdater.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsEditorPreferenceConstants.java:
+	Add new constants for Autoconf editor folding.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/IAutotoolsEditor.java: New interface.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java: Make class
+	implement IAutotoolsEditor interface.  This allows ProjectionFileUpdater class to
+	work.  Add folding support based on MakefileEditor class.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElement.java
+	(getStartOffset, setStartOffset, getEndLineNumber, setEndLineNumber): New methods.
+	(getEndOffset, setEndOffset, getLastChild): Ditto.
+	(AutoconfElement): New constructor which takes start offset.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfCaseElement.java:
+	Add new constructor to match that of AutoconfElement.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElifElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElseElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfForElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfIfElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfWhileElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java:
+	(AutoconfLineReader): New internal class to replace LineNumberReader class.  Change
+	all internal parse routines to use this class instead of LineNumberReader.
+	(parseLines): When a semicolon is found that denotes a multistatement line, update the end
+	offset of the previous construct and set the start offset for the next construct to be after
+	the semicolon and additional whitespace.
+	(parseMacro, parseIf, parseElif, parseElse, parseCase, parseFor, parseWhile): Construct with
+	start offset based on previous mark.  After processing, set the end line number for the
+	element.
+
+2007-06-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java:
+	Refactor AutomakeEditorPreferenceConstants to AutotoolsEditorPreferenceConstants.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ColorManager.java:  Moved from here to..
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/ColorManager.java: ...here
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditorFactory.java:
+	Changed due to movement of ColorManager class.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/AbstractMakefileCodeScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileCodeScanner.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileSourceConfiguration.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AbstractAutomakeEditorPreferencePaga.java:
+	Refactored to be...
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AbstractEditorPreferencePage.java:
+	...this.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutoconfEditorPreferencePage.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferenceConstants.java:
+	Refactored to be...
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsEditorPreferenceConstants.java:
+	...this.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakePreferencesMessages.java:
+	Refactored to be...
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.java:
+	...this.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakePreferencesMessages.properties:
+	Refactored to be...
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsPreferencesMessages.properties:
+	...this.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferencePage.java:
+	Use new refactored classes.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java:  Add color preference
+	support.
+	(AutoconfCodeScanner): A color provider is no longer needed as input.
+	(getToken, getTokenProperties, addToken, indexOf, affectsBehavior): New methods.
+	(adaptToPreferenceChange, adaptToColorChange, adaptToStyleChange); Ditto.
+	(createTextAttribute, initialize): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfColorProvider.java: Removed and replaced
+	with ColorManager.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java: Change to use
+	ColorManager.
+	(initializeEditor): Set the preference change store and initialize the editor preferences.
+	(getAutoconfCodeScanner): Changed to match new AutoconfCodeScanner constructor.
+	(getPreferenceColor): New method.
+	(getColorProvider): Removed.
+	(handlePreferenceStoreChanged): New method.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java:
+	Inherit from TextSourceViewerConfiguration.  Store the preference store.
+	* plugin.properties: Add new internationalized string for Autoconf editor preferences.
+	* plugin.xml: Add Autoconf editor preference page.
+
+2007-05-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #241908
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (addMakeTargetsToManager):
+	Change builder id used to one used in plugin.xml.
+
+2007-05-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #241782
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new message
+	for Autotools preference page.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java
+	(initializeEditor): Initialize color and folding preference defaults.
+	(handlePreferenceStoreChanges): Call super method to refresh editor.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ColorManager.java:
+	Change constants to be in Autotools domain.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AbstractAutomakeEditorPreferencePage.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferenceConstants.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakeEditorPreferencePage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakePreferencesMessages.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutomakePreferencesMessages.properties:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/AutotoolsPreferencePage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/ColorEditor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/OverlayPreferenceStore.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/StatusInfo.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/preferences/TabFolderLayout.java: Ditto.
+
+	* plugin.properties: Add new internationalized strings from plugin.xml.
+	* plugin.xml: Add Autotools and Automake Editor preference pages.  Also
+	clean up some extensions to use internationalized strings.
+
+2007-05-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #241612
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java:
+	Add utility methods from MakeUIPlugin to log messages and
+	issue error dialogs, etc..
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeTargetDialog.java:
+	Use MakeUIMessages instead of MakeUIPlugin for messages.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeCompletionProcessor.java:
+	Replace internal CDT classes with internal Autotools classes.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java:  Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditorFactory.java:
+	Ditto.
+	(getPreferenceColor): New method.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeErrorHandler.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java:	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeIfElse.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeMacroDefinitionRule.java:
+	Ditto.
+	(evaluate): Remove unused local variable ch.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeTextHover.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/AbstractElementListSelectionDialog.java:
+	New file transported from CDT internals.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/AbstractMakefile.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/AbstractMakefileCodeScanner.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/AddBuildTargetAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ArchiveTarget.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/BadDirective.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ColorManager.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Command.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Comment.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/CompletionProposalComparator.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/DefaultRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Directive.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/EditorUtility.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ElementListSelectionDialog.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/EmptyLine.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ExternalEditorInput.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ExternalEditorInputFactory: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/GNUMakefileConstants.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IgnoreRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IMakefileDocumentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IMakefileEditorActionDefinitionIds.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/InferenceRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/IReconcilingParticipant.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ISelectionValidator.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ITranslationUnitEditorInput.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/LexicalSortingAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MacroDefinition.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MacroDefinitionRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MacroReferenceRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileAnnotationHover.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileCodeScanner.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileCompletionProcessor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileConstants.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileContentOutlinePage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileDocumentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileDocumentSetupParticipant.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileEditor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileEditorPreferenceConstants.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileMessages.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefilePartitionScanner.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileReader.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileReconcilingStrategy.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakeFileResources.properties: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileSourceConfiguration.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileStorageDocumentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileTextHover.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MakefileWordDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/MessageLine.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/NullMakefile.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/OpenDeclarationAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/OpenIncludeAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Parent.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/PosixMakefileUtil.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/PosixRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/PreciousRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/ProjectionMakefileUpdater.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Rule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/SccsGetRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/SelectionList.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/SilentRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/SpecialRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/StatusInfo.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/StringMatcher.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/SuffixesRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Target.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/TargetRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/TwoArrayQuickSort.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/Util.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/VariableDefinition.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/WordPartDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/editors/automake/WorkingCopyManager.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/AutotoolsPluginImages.java: Switch to
+	use new ac16 icon directory instead of etools16.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ErrorParserBlock.java: Use
+	MakeUIMessages instead of MakeUIPlugin for messages.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeUIImages.java: Use
+	AutotoolsPlugin for error dialogs.  Add new images.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeUIMessages.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeUIPlugin.java: Removed.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MessageLine.java: Fix typo.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/AutotoolsWizardMessages.java:
+	Fix bundle id for messages.
+
+	* plugin.xml: Fix icon references.
+
+	* icons/ac16: New folder containing icons that used to be in etool16.
+	* icons/dlcl16/build_configs.gif: New icon.
+	* icons/dlcl16/open_include.gif: Ditto.
+	* icons/elcl16/build_configs.gif: Ditto.
+	* icons/elcl16/open_include.gif: Ditto.
+	* icons/dtool16/alphab_sort_co.gif: Ditto.
+	* icons/dtool16/build_menu.gif: Ditto.
+	* icons/dtool16/convert-normal.gif: Ditto.
+	* icons/dtool16/make.gif: Ditto.
+	* icons/dtool16/makefile.gif: Ditto.
+	* icons/dtool16/newc_app.gif: Ditto.
+	* icons/dtool16/newcc_app.gif: Ditto.
+	* icons/dtool16/segment_edit.gif: Ditto.
+	* icons/dtool16/target_add.gif: Ditto.
+	* icons/dtool16/target_build.gif: Ditto.
+	* icons/dtool16/target_delete.gif: Ditto.
+	* icons/dtool16/target_edit.gif: Ditto.
+	* icons/dtool16/update_old.gif: Ditto.
+	* icons/etool16: Move autoconf editor icons to ac16 folder.
+	* icons/obj16/command_obj.gif: New icon.
+	* icons/obj16/define_obj.gif: Ditto.
+	* icons/obj16/environment_obj.gif: Ditto.
+	* icons/obj16/envvar_obj.gif: Ditto.
+	* icons/obj16/error_obj.gif: Ditto.
+	* icons/obj16/hfolder_obj.gif: Ditto.
+	* icons/obj16/include_obj.gif: Ditto.
+	* icons/obj16/irule_obj.gif: Ditto.
+	* icons/obj16/lib_obj.gif: Ditto.
+	* icons/obj16/macro_obj.gif: Ditto.
+	* icons/obj16/relation_obj.gif: Ditto.
+	* icons/obj16/target_obj.gif: Ditto.
+	* icons/obj16/trule_obj.gif: Ditto.
+
+2007-05-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java:
+	(addMakeTargetsToManager): Use MakeCorePlugin to get an IMakefile
+	rather than use the internal PosixMakefile class directly.
+
+2007-05-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java:
+	(initialize): Store the configuration for later usage.
+	(getConfigSettingsPath): Use stored configuration instead of fetching
+	it each time.
+	(runCommand): Ditto.
+	(addMakeTargetsToManager): Use the real MakeTargetManager to store
+	targets.  Mark targets added by parsing the Makefile with special
+	tag.  Delete all MakeTargets with special tag before adding the
+	new targets.
+	(initializeBuildConfigDirs): Use stored configuration to get the
+	tool options rather than the ManagedBuildInfo.
+	(getConfigArgs): Ditto.
+	(addMakeTargetsToManager):
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java:
+	Inherit from CommonBuilder.
+	(build): Change to fetch make target name from args map and store for
+	later use.
+	(getTargets): Change to get make target from stored make target name.
+
+	* plugin.xml: Remove Build Special Targets menu item as it is no longer
+	needed.  Add MakeTargetBuilder extension so we can use MakeTargets.
+
+2007-05-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #239886
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAclocalAction.java (run):
+	Pass the CWD to TwoInputDialog and use it when executing the command.  On
+	success, show a success dialog.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutoconfAction.java (run):
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/TwoInputDialog.java (TwoInputDialog):
+	Take the CWD as a parameter.
+	(createDialogArea): Add label with CWD.
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutomakeAction.java (run):
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeMessages.java (getString):
+	Add comments.
+	(getFormattedString): New method.
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAction.java (getExecDir):
+	New method to return the CWD.
+	(showSuccess): New method to display a success dialog.
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeMessages.properties: Add new
+	messages.
+
+2007-05-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #238173
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfIdentifierRule.java (evaluate):
+	Cast read character to char before invoking Character methods to avoid gcj bug.
+
+2007-04-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #238493
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/RecursiveSingleLineRule.java (evaluate):
+	Add check for scanner column < 0 which means we are already at EOF.
+
+2007-04-25  jjohnstn  <jjohnstn@toocool.toronto.redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectOptionPage.java (ManagedWizardOptionBlock.setupHelpContextIds):
+	Switch to use CDTHelpContextIds for static help context id.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/CProjectPlatformPage.java (createControl):
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/ManagedProjectOptionBlock.java (createContents):
+	Ditto.
+
+2007-04-25  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Bugzilla #182821
+
+	2007-04-25  Mikhail Sennikovsky
+	* plugin.xml: Add plugin extensions which let the CDT know that includes and
+	defined symbols are supported for the Autotools tool-chain.
+
+2007-04-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #236304
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (runCommand): Use the
+	job description as a message in the console.
+	(regenerateMakefiles): Fix autogen.sh logic to run configure after invoking
+	autogen.sh if config.status doesn't exist.  Make sure console is reused for
+	2nd step.  Change some of the status messages with new ones.
+	(autogenExists): Fix bug where path to autogen.sh wasn't being set on return.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new MakeGenerator messages.
+
+2007-04-11  jjohnstn  <jjohnstn@toocool.toronto.redhat.com>
+
+	Bugzilla #236077
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/CWordFinder.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java: Replace
+	CDT internal classes with Autotools internal classes.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/ManagedProjectOptionBlock.java (createContents):
+	Replace WorkbenchHelp reference with non-deprecated alternative.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakeTargetManager.java: Fix
+	imports.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (runCommand): Replace
+	deprecated environmental variable method being used.
+	(createFile): Make protected instead of private.
+	(getInvalidDirList): Remove.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject):
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java (getWorkingCopyManager):
+	Moved into AutomakeEditorFactory.
+	(getAutomakefileDocumentProvider): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditorFactory.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeCompletionProcessor.java:
+	Change all calls to getWorkingCopyManager and getAutomakefileDocumentProvider to use
+	new AutomakeEditorFactory class.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeCompletionProcessor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.java (getResourceBundle):
+	New method.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.properties: Add
+	new messages that were formerly fetched internally from CDT.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java: Comment out unused
+	projectSupport.
+	(createActions): Use AutoconfEditorMessages.
+	(InformationDispatchAction.makeAnnotationHoverFocusable): Ditto.
+	(fProjectionModelUpdater): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfAnnotationHover.java (formatMultipleMessages):
+	Use AutoconfEditorMessages instead of CUIMessages.
+	* src/com/redhat/eclipse/cdt/autotools/interenal/ui/ErrorParserBlock.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/CProjectPlatformPage.java (createControl): Remove
+	usage of WorkbenchHelp class which is deprecated.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectOptionPage.java (ManagedWizardOptionBlock.setupHelpContextIds):
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject):
+	Remove unused code.  Switch to use non-deprecated interface for getting
+	indexer.
+
+2007-04-10  jjohnstn  <jjohnstn@toocool.toronto.redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectWizard.java:
+	Removed.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectOptionPage.java:
+	Use new internal ManagedProjectOptionBlock class.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/CProjectPlatformPage.java:
+	Switch to use new AutotoolsWizardMessages internal class.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java:
+	Fix imports.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizard.java (doRunEpilogue):
+	Switch to new IRunnableWithProgress interface.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/AutotoolsWizardMessages.java:
+	New file to support old wizard code.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/AutotoolsWizardMessages.properties:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/ConfigurationContentProvider.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/ConfigurationLabelProvider.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/wizards/ManagedProjectOptionBlock:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/AutotoolsPluginImages.java:
+	Add build_configs.gif for Wizard support.
+	* src/com/redhat/eclipse/cdt/autotools/internal/MarkerGenerator.java (addMarker):
+	New method required by IMarkerGenerator interface.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (getProject):
+	New method.
+	(initializeBuildConfigDirs): Change the default build directory
+	for the configuration's builder.
+	Add support for CDT 4.0 M6.
+	* cdtpatches/*: Removed.
+	* icons/eclcl16: New icon directory.
+	* icons/eclcl16/build_configs.gif: New icon.
+	* plugin.properties: Add new strings used in plugin.xml.
+	* plugin.xml: Add buildType and buildArtefactType extensions.  Add
+	toolchain to Autotools project buildDefinitions extension.
+
+2007-04-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #235076
+	* src/com/redhat/eclipse/cdt/autotools/wizards/CProjectPlatformPage.java (CProjectPlatformPage):
+	Add missing NLS comment.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (makefileCvsExists): Use
+	getMakefileCVSPath method.
+	(configureExists): Use getConfigurePath method.
+	(getConfigurePath): New method.
+	(getMakefileCVSPath): New method.
+	(regenerateMakefiles): Use getConfigurePath and getMakefileCVSPath to get the
+	command to use when either of these is found to exist.
+	(autogenExists): Change to protected method.
+
+2007-03-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java (createPresentation):
+	Comment out macro parsing as this is now done by the reconciler and overall parsing.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java (getPrototype):
+	Fix so it is properly setting minimum and maximum parm counts for a macro.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfPrototype.java (setMaxParms):
+	Fix typo.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java (matchParentheses):
+	Update logic.
+	(parseMacro):  Add error checking for minimum and maximum parameters as well as unmatched
+	parentheses or square-brackets.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java (setParmCount):
+	New method.
+	(setQuoteDepth): Ditto.
+	(getParmCount): Ditto.
+	(getQuoteDepth): Ditto.
+	(setDepth): Ditto.
+	(getDepth): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.properties: Add
+	new error messages for parsing of macros.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage (update):
+	Use viewer refresh instead of redraw when updating.
+	(updateSelection): New method.
+
+2007-03-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/Makegenerator.java (regenerateMakefiles):
+	Refine algorithm so we don't cause a reconfigure if the configuration settings
+	file doesn't contain the project name.  If the configuration arguments are
+	unchanged and the settings file is the old style, rewrite with project
+	name.
+
+2007-03-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #230128
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (saveConfigArgs): Add
+	the project name as first argument saved.
+	(regenerateMakefiles): Read off first argument and verify that it matches the
+	current project name.
+
+2007-03-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #232965
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (runCommand):
+	Change prototype to accept a console and a boolean which when true
+	means to restart the console which may possibly clear the console.
+	(regenerateMakefiles): Change calls to runCommand.  For multiple
+	actions (e.g. autogen.sh then configure), opt for the 2nd, 3rd, etc...
+	calls to not clear the console.  Don't run config.status unless
+	the top-level Makefile is missing.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new
+	MakeGenerator.unsupportedConfig message.
+
+2007-03-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (regenerateMakefiles):
+	If configuration parameters have changed, mark all Scanner Info as dirty.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfoProvider.java (getCollectionName):
+	Make synchronized to avoid concurrent access of the infoCollection.
+	(getScannerInformation): Ditto.
+	(setDirty): New method.
+
+2007-03-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #230493
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java (getDefinedSymbols):
+	Recalculate each time if compilation string is null.
+	(getIncludePaths): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfoProvider.java (getScannerInformation):
+	Use a map of configurations to keep ScannerInfo seperate per configuration.  Use
+	current configuration to fetch scanner info.
+
+2007-02-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Bump up release to 0.0.8.1.
+
+2007-02-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzillas #230253, #205310.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakeTargetManager.java (addTargets):
+	New method to do mass add of MakeTargets for performance improvement.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java:
+	(addMakeTargetsToManager): Use new AutotoolsMakeTargetManager addTargets method.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectWizard.java (doRun):
+	Set indexer to NullIndexer before applying options.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java (convertProject):
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizard.java:
+	Add new NULL_INDEXER_ID.
+	* src/com/redhat/eclipse/cdt/autotools/internal/MakeTargetManager.java: Expose
+	projectTargetMap to inheriting classes.
+
+2007-02-23  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 229891.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java (getMakeTargets):
+	Use Make Target info to find the real build target which may have been set by the
+	Build Special Targets action.
+	(build): Set up the IMakeBuildInfo needed to fetch Make Target from.
+
+2007-02-22  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeMessages.properties: Fix a few
+	typos.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentSetupParticipant.java (setup):
+	Use IDocumentExtension3 version of setDocumentParitioner if document is an instance of
+	IDocumentExtension3.
+
+2007-02-22  Andrew Overholt  <overholt@redhat.com>
+
+	* icons/automake.gif: New craptacular icon for automake editor.
+	* icons/autoconf.gif: Another manifestation of my poor artistic skills.
+	* plugin.xml: Use new icons.
+
+2007-02-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 229893.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Switch
+	to superclass TextFileDocumentProvider instead of FileDocumentProvider so as to fix
+	undo support.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentSetupParticipant.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.properties:  Fix typo.
+	* plugin.xml: Add extension for document setup that ties document setup for configuration
+	files to AutoconfDocumentSetupParticipant.
+
+2007-02-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java (findDelimeter): Ignore
+	escaped character.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitionScanner.java (AutoconfPartitionScanner):
+	Add escape character for # format comment and eat "\#" as character.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java (AutoconfCodeScanner):
+	Ditto.
+	* plugin.xml: Update release to 0.0.8.
+
+2007-02-20  Andrew Overholt  <overholt@redhat.com>
+
+	Patch from Jordy Potman
+	http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=229352
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java
+	(AutomakefileSourceConfiguration): Update super constructor call to reflect
+	change in CDT 3.1.2.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java
+	(initializeEditor): Likewise.
+
+2007-02-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElement.java: New class.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElifElement: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfElseElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfIfElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfRootElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfWhileElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfCaseElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfForElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfCaseConditionElement.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java (AutoconfCodeScanner):
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java: New class to
+	do Autoconf file parsing and error marking.
+	Add AutoconfIdentifierRule and InlineDataRule.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java (createDocument):
+	Changed to use new AutoconfErrorHandler interface.
+	(documentAboutToBeChanged): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfErrorHandler.java (removeExistingMarkers):
+	Add verification that file exists.
+	(removeAllExistingMarkers): Ditto.
+	(handleError): Ditto.
+	(getCharOffset): Reformatted.
+	(AutoconfErrorHandler): Change constructor to take an IStorageEditorInput rather than
+	an IFile.  This allows external files to be edited without error handling.
+	* src/com/redhat/eclipse/cdt/autotools/editors/AutoconfEditorMessages.properties: New messages
+	added for outline parsing.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitionScanner.java (AutoconfPartitionScanner):
+	Use new AutoconfIdentifierRule.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java (getPresentationReconciler):
+	Change default partition to use MultilineRuleDamagerRepairer.
+	(getReconciler): New method.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java (createPresentation):
+	Change to use new AutoconfErrorHandler constructor.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroParser.java (AutoconfMacroParser): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java (doSetInput): New.
+	(getInputDocument): Ditto.
+	(getRootElement): Ditto.
+	(getAutoconfParser): Ditto.
+	(getAdapter): Ditto.
+	(InformationProvider): Ditto.
+	(getOutlinePage): Ditto.
+	(setRootElement): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfContentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfIdentifierRule.java: New class to
+	prevent matches of other strings that happen to be inside common identifiers.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/InlineDataRule.java: New class to
+	recognize inline data files.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/MultilineRuleDamagerRepairer.java: New class
+	to handle damage/repair when multiline rules are used.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfReconciliingStrategy.java: New class
+	for delayed document-change parsing.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/AutotoolsPluginImages.java: New class
+	to handle image repository.
+	* icons/etool16/acmacro_obj.gif: New image for Autoconf outline view.
+	* icons/etool16/ammacro_obj.gif: Ditto.
+	* icons/etool16/case_obj.gif: Ditto.
+	* icons/etool16/condition_obj.gif: Ditto.
+	* icons/etool16/elif_obj.gif: Ditto.
+	* icons/etool16/for_obj.gif: Ditto.
+	* icons/etool16/if_obj.gif: Ditto.
+	* icons/etool16/while_obj.gif: Ditto.
+	* plugin.xml: Add new error marker extension for outline view.
+
+2007-02-02  Andrew Overholt  <overholt@redhat.com>
+
+	* cdtpatches/README: Fix CVS location of managedbuilder.
+
+2007-02-02  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeCompletionProcessor.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java (getBuiltins):
+	Add $<, $@, and $?.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java
+	(getContentAssistant): Make use of AutomakeCompletionProcessor.
+
+2007-01-31  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* cdtpatches/cdt.ui.buildconsole.patch: New file that contains the
+	3.1.1 version of the patch for Bugzilla 153816 which adds multiple
+	build console support to CDT 4.0.
+	* cdtpatches/cdt.ui.patch: Altered to remove any build console patches.
+	* cdtpatches/README: Updated to include the new patch.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/CConfigureConsole.java (CConfigureConsole):
+	Modified to use new CUIPlugin build console manager interface.
+
+2007-01-31  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeErrorHandler.java: New class.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Remove unnecessary import.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java
+	(connect): New method.  Update error markers at document load time.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java
+	(reconcile): Update error markers.
+	(AutomakefileReconcilingStrategy): Set class-wide variables.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java
+	(getAutomakeErrorHandler): New method.
+
+2007-01-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 224644.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java (getMakeTargets):
+	Don't add "clean" for fullbuild anymore.  It causes unnecessary extra building to occur.
+	(build): Set a flag that build was called.
+	(clean): Only clean if this method is called directly and via a call to build method.
+	Clean by doing a make clean rather than calling super.clean.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (runCommand): When an
+	error occurs in configure, we want to set the status of the project to "needs rebuild".
+	(getConfigSettingsPath): New method to generate name of config settings file.
+	(saveConfigArgs): Use new getConfigSettingsPath method.
+	(regenerateMakefiles): Ditto, when checking if config options have changed.
+	(autogenExists): Clean up unused variables.
+	(getMakefileName): Return "Makefile" instead of "makefile".
+
+2007-01-22  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java:
+	Update copyright.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeIfElse.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileUtil.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java
+	(getAutomakeSourceViewer): New method. Update copyright.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java:
+	Update copyright.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeTextHover.java
+	(getHoverInfo): Remove debugging println. Update copyright.
+
+2007-01-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 214624.
+	* src/com/redhat/eclipse/cdt/autotools/internal/MarkerGenerator.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (runCommand): Add check
+	for return code being 0 or 1 to reveal whether command ran correctly.
+	(regenerateMakefiles): Add boolean checking for runCmd calls and also quit
+	if runCmd fails.  For autogen.sh cases, check if configure is run by autogen.sh
+	and don't bother calling configure afterwards if true.  Add error checking to
+	ensure a second command is not run if the first fails.
+	(PathVar): New private class.
+	(autogenExists): Fixed to take a path parameter to fill in.  It also looks for
+	any file that ends in autogen.sh to handle projects like Gnome.
+	* Resources.properties: Add new messages used by MakeGenerator.
+	* cdtpatches/managedbuilder.core.patch: New patch to cause ManagedMake build
+	to stop if an error occurs generating Makefile.
+	* cdtpatches/README: Add details on how to install new patch.
+
+2007-01-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroParser.java: New code
+	to parse an Autoconf macro.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java (createPresentation):
+	Use new AutoconfMacroParser.parse method instead of embedding the code.  Remove
+	all corresponding parse methods.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java (documentAboutToBeChanged):
+	Add checks for whether we should remove the error markers in an autoconf_macro
+	partition.
+
+2007-01-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* about.html: New EPL license file.
+
+2007-01-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/ParseException.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfErrorHandler.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfPrototype.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfAnnotationHover.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java: Add
+	copyright info.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfColorProvider.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Ditto.
+	(createDocument): New method.
+	(documentChanged): Ditto.
+	(documentAboutToBeChanged): Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfKeywordDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfM4WordDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroPartitionRule.java : Ditto.
+	(matchParentheses): Fix up logic.
+	(evaluate):
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroWordDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitioner.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitionScanner.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java: Ditto.
+	(getPresentationReconciler): Use AutoconfMacroDamagerRepairer for macro partition.
+	(getAnnotationHover): New method.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfWhitespaceDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfWordDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/IAutotoolEditorActionDefinitionIds.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/IAutotoolHelpContextIds.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/RecursiveSingleLineRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions/GetDefinedSymbolsAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions/GetIncludePathAction.java: Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java: Ditto.
+	(getIndexedInfo): New method.
+	(getPrototype): Ditto.
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/HoverMessages.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeWordDetector.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAclocalAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutoconfAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutomakeAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeMessages.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/TwoInputDialog.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfoProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java: Ditto.
+
+2007-01-12  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeTextHover.java: New class.  Hover help provider for automake editor.
+	(getHoverControlCreator): New method.  Return null for now.
+	(AutomakeTextHover): New method.
+	(getHoverRegion): New method.  Return an IRegion from an offset in the document.
+	(findWord): New method.  Return an IRegion of the hover region.
+	(getHoverInfo): New method.  Return the hover information for a particular region.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java (getTextHover): New method.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java (getDirectiveContainingLine): Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java (getMakefile): Likewise.
+
+2007-01-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java: Revert
+	to version 1.2 prior to 2006-11-27.  This reversion is required because the previous
+	fix causes a regression in autoconf partitioning.
+
+2007-01-08  Andrew Overholt  <overholt@redhat.com>
+
+ 	* libhoverdocs/acmacros.xml: Add PKG_* macros from pkgconfig.
+
+2007-01-05  Andrew Overholt  <overholt@redhat.com>
+
+ 	* libhoverdocs/acmacros.xml: Add AM_* macros from automake's Public-macros.html.
+
+2007-01-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (regenerateMakefiles):
+	Add check for Makefile.cvs ahead of configure check.  Use resource strings
+	for runCommand descriptions.
+	(makefileCvsExists): New internal method.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new
+	resource strings.
+
+2007-01-02  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileCodeScanner.java
+	(automaticVariables): New $<, etc. variables.
+	(createRules): Add automatic variables as keywords. Also add @AC_SUBST_VAR@
+	highlighting.
+	(nextToken): New method.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java
+	(getDocument): New method.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeWordDetector.java:
+	New file.
+
+2006-12-15  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java
+	(getAutomakeCodeScanner): New method.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java
+	(getAutomakeSourceViewerConfiguration): Likewise.
+	(getAutomakefileDocumentProvider): Likewise
+	(initializeEditor): Set up field variables.
+
+2006-12-12  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add package visibility for tests.
+	* plugin.xml: Add filename associations for AutomakeEditor.
+
+2006-12-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* MANIFEST.MF: Update release to 0.0.6.
+
+2006-12-11  Kyu Lee  <klee@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/TwoInputDialog.java: New class
+	for getting 2 text field inputs.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeMessages.java: New class
+	for NLS strings.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutomakeAction.java: New
+	class for handling invoke automake.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAutoconfAction.java: New
+	class for handling invoke autoconf.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAction.java: New super
+	class for invoking autotools classes.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeAclocalAction.java: New
+	class for handling invoke aclocal.
+	* src/com/redhat/eclipse/cdt/autotools/actions/InvokeMessages.properties:
+	Property file for NLS strings.
+	* plugin.xml: Added menu options for invoking autotools under project menu.
+
+2006-12-11  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java
+	(getWorkingCopyManager): New method.
+	(getAutomakefileDocumentProvider): Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java
+	(initializeEditor): New method.
+	(getAutomakeOutlinePage): Likewise.
+	(createPartControl): Likewise.
+	(getAdapter): Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeDocumentProvider.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeMacroReferenceRule.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeMacroDefinitionRule.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeIfElse.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileUtil.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileReconcilingStrategy.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileContentOutlinePage.java:
+	Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/Automakefile.java:
+	Likewise.
+
+2006-12-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizard.java
+	(setCurrentProject): Make protected to allow subclasses to use.
+	* MANIFEST.MF: Export org.eclipse.linuxtools.cdt.autotools.wizards classes to the
+	autotools.tests plug-in.
+
+2006-12-01  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake: New directory.
+	* src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java: New
+	file. Simple extension of MakefileEditor for now.
+	* plugin.xml: Add automake editor.
+
+2006-11-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Add .m4 file support to the Autoconf editor.
+
+2006-11-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java
+	(performRevert): Method copied from CDT and JDT editors.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java:
+	Change base class to be TextFileDocumentProvider. This means no longer providing
+	a createDocument() method.
+	(createDocument): Deleted.
+	(AutoconfStorageDocumentProvider.AutoconfStorageDocumentProvider): New internal
+	class based on StorageDocumentProvider.
+	(AutoconfStorageDocumentProvider.setupDocument): New method of internal class.
+	(AutoconfDocumentProvider): New constructor which sets up a
+	TextFileDocumentProvider that takes the internal AutoconfStorageDocumentProvider
+	class as parent DocumentProvider. This emulates what the CDT CEditor does and is
+	done to provide proper edit reversion support.
+
+2006-11-22  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/IAutotoolHelpContextIds.java:
+	Add CONTENT_ASSIST string.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java
+	(getContentAssistant): New routine to add content assist support.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java
+	(createActions): Add action for content assist.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java
+	(getIndexedInfo):
+	(getInformationControlCreator): New method.
+	(getTooltipAffordanceString): Make static.
+	(init): Ditto.
+	(getIndexedInfo): Ditto plus add call to init.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java:
+	New class for macro content assist.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroParameterListValidator.java:
+	New class for content assist to help with macro call parameters.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroProposalContextInformation.java:
+	New file for parameter context assist information.
+
+2006-11-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitionScanner.java
+	(AutoconfPartitionScanner): Change partitions to be comments, macros, and
+	default.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java
+	(getPresentationReconciler): Change to match new paritioning. Use a special new
+	MultiLineDamagerRepairer for macros.
+	(getConfiguredContentTypes): Change to list of new partitions.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java
+	(createPartControl): Specify new AUTOCONF_MACRO partition.
+	(InformationDispatchAction.makeAnnotationHoverFocusable): Ditto.
+	(InformationDispatchAction.makeTextHoverFocusable): Ditto.
+	(getAutoconfInlineCodeScanner, getAutoconfStringScanner): Removed.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfInlineCodeScanner.java:
+	Removed.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSectionRule.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfStringScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java
+	(AutoconfCodeScanner): Change rules to add a recursive single line rule for
+	strings and a multiline rule for inlined code. Also add a rule to discover m4
+	macros.
+	* src/com/redhat/eclipse.cdt/autotools/ui/editors/AutoconfM4WordDetector.java:
+	New file.
+	* src/com/redhat/eclipse.cdt/autotools/ui/editors/AutoconfMacroPartitionRule.java:
+	Ditto.
+	* src/com/redhat/eclipse.cdt/autotools/ui/editors/MultiLineDamagerRepairer.java:
+	Ditto.
+	* src/com/redhat/eclipse.cdt/autotools/ui/editors/RecursiveSingleLineRule.java:
+	Ditto.
+
+2006-10-31  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java
+	(init): Turn off parser validation.
+	* libhoverdocs/acmacros.xml: Update including m4 macros.
+
+2006-10-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java:
+	Remove unneeded import.
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java
+	(getLibHoverDocs): Specify no xml validation since there may be duplicate
+	function ids due to multiple standard definitions used in glibc.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java
+	(getTextHover): New method to add text hover for autoconf editor.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitioner.java
+	(connect): Remove calls to print debug messages.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java
+	(isFoldingEnabled):
+	(InformationDispatchAction.InformationDispatchAction): New for scrollable
+	tooltip support.
+	(createPartControl): Ditto.
+	(fProjectionModelUpdater): Ditto.
+	(InformationProvider.getInformation): Ditto.
+	(InformationDispatchAction): Ditto.
+	(initializeKeyBindingScopes): Ditto.
+	(InformationDispatchAction.makeTextHoverFocusable): Ditto.
+	(InformationProvider.getInformation2): Ditto.
+	(InformationProvider): Ditto.
+	(InformationDispatchAction.computeOffsetAtLocation): Ditto.
+	(fInformationPresenter): Ditto.
+	(.createInformationControl): Ditto.
+	(InformationProvider.getInformationPresenterControlCreator): Ditto.
+	(createActions): Ditto.
+	(InformationDispatchAction..createInformationControl): Ditto.
+	(InformationDispatchAction.run): Ditto.
+	(InformationDispatchAction.fTextOperationAction): Ditto.
+	(InformationDispatchAction.makeAnnotationHoverFocusable): Ditto.
+	(fProjectionSupport): Ditto.
+	(InformationProvider.getSubject): Ditto.
+	(InformationProvider.InformationProvider): Ditto.
+	* src/libhoverdocs/acmacros.xml: New file containing autoconf hover help.
+	* src/libhoverdocs/glibc.xml: Updated.
+	* src/libhoverdocs/LIBHOVERDOCS.LICENSE: New file with licensing info.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/IAutotoolEditorActionDefinitionIds.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editoros/IAutotoolHelpContextIds.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/AutoconfTextHover.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/HoverMessages.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/text/hover/HoverMessages.properties:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/HTML2TextReader.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/HTMLPrinter.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/HTMLTextPresenter.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/LineBreakingReader.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/SingleCharReader.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/SubstitutionTextReader.java:
+	Ditto.
+	* plugin.xml: Fix autoconf editor to look for configure.in or configure.ac. Add
+	hover help for autoconf editor and set up F2 key binding for scrollable tooltips.
+	* plugin.properties: Add autoconf editor strings.
+
+2006-10-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java: New
+	file.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfWordDetector.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfWhitespaceDetector.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfStringScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfSectionRule.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitionScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfPartitioner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroWordDetector.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfMacroRule.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfKeywordDetector.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfInlineCodeScanner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/ui/editors/AutoconfColorProvider.java:
+	Ditto.
+	* plugin.properties: Add Autoconf editor name.
+	* plugin.xml: Add Autoconf editor.
+
+2006-10-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 209161.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(initializeBuildConfigDirs): New method.
+	(initialize): Call initializeBuildConfigDirs().
+	(regenerateMakefiles): Ditto if configuration parameters have changed.
+	(createDirectory): Return project path if input directory is empty string or
+	".".
+
+2006-09-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* build.properties: Update so plugin.properties built into binary.
+	* build.xml: New file.
+
+2006-09-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Bump up release number to 0.0.5.
+
+2006-09-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 206719
+	* plugin.xml: Comment out deprecated ManagedBuildInfo extension and replace with
+	new org.eclipse.cdt.managedbuilder.core.buildDefinitions extension point.
+	* plugin.properties: Add new strings from new build definition.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/CProjectPlatformPage.java
+	(CProjectPlatformPage): Fix project type reference to refer to new project type
+	id in build definition.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(initialize): Switch over to new option ids in new build definition.
+	(getConfigArgs): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java
+	(getCompilationString): Don't bother if input resource isn't a file.
+	(buildFile): Fix how build directory is fetched to work with new build
+	definition.
+	(AutotoolsScannerInfo): Save the original resource reference.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
+	(AUTOTOOLS_CONFIG_ID): Change to match new build definition.
+
+2006-09-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 206359
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java
+	(verifyScannerInfoProvider): New method to check ScannerInfoProvider and set it
+	only if necessary.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
+	(hasTargetBuilder): Call verifyScannerInfoProvider instead of
+	setScannerInfoProvider to prevent changing the project file every time the
+	hasTargetBuilder check is made.
+
+2006-09-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fix for Bugzilla 206164.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java
+	(followIncludeChain): Follow the session property as far as possible. When it
+	ends try looking for the new OPEN_INCLUDE_P persistent property to re-establish
+	the chain.
+	(createIncludeChain): Set a new persistent property OPEN_INCLUDE_P that is the
+	location of the resource.
+
+2006-09-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* cdtpatches/cdt.ui.patch: Update patch to include defined symbol hover help.
+
+2006-09-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java
+	(getDefinedSymbols): Prepare code for failure to get compilation string.
+
+2006-09-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* cdtpatches/README: New file to instruct how to apply patches to the CDT.
+	* cdtpatches/cdt.core.patch: Patch for org.eclipse.cdt.core.
+	* cdtpatches/cdt.ui.patch: Patch for org.eclipse.cdt.ui.
+
+2006-08-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Replace DynamicScannerInfo extension hack with existing CDT
+	ScannerInfoProvider extension. Change version to 0.0.4.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/CConfigureConsole.java
+	(CConfigureConsole): Use new getSubConsoleManager method of CUIPlugin.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsole.java: No
+	longer needed, so removed.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleDocument.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleManager.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsolePage.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsolePartition.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsolePartitioner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleStream.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleViewer.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConsoleEvent.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConsoleOutputTextStore.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ScrollLockAction.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java
+	(convertProject): Set scanner info provider for project.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfoProvider.java: Extend
+	AbstractCExtension.
+	(getScannerInformation): Call AutotoolsScannerInfo.followIncludeChain method to
+	get real underlying resource to get dynamic build info from.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java: Implement new
+	interface IScannerInfoPlus.
+	(followIncludeChain): New method to adhere to new interface.
+	(createIncludeChain): New method.
+	(getDefinedSymbols): Add defined symbols found by ManagedBuildManager.
+	(getIncludePaths): Append include path found by ManagedBuildManager.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java
+	(setScannerInfoProvider): New method.
+	(getConsoleManager): Removed.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java:
+	(hasTargetBuilder): Replace the default scanner provider for Managed Make
+	projects with AutotoolsScannerInfoProvider.
+
+2006-08-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java
+	(run): If there are no targets yet
+	(i.e. no makefile), try and regenerate the makefile.* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java (getConfigArgs):
+	Make sure there is an "other" string to process rather than adding an empty
+	argument.
+
+2006-08-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(regenerateMakefiles): Add logic to check if the configuration arguments have
+	changed since the last configuration and reconfigure if they have.
+	(saveConfigArgs): New method.
+
+2006-08-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
+	(addAutotoolsBuilder): Check for ManagedMake's genmakebuilder and remove if
+	found.
+	(hasTargetBuilder): Look for Autotools default configuration and if found, add
+	the Autotools Makefile builder.
+
+2006-07-31  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java
+	(getLibHoverDocs): New method which replaces buildDocPath and fetches libhover
+	base data file from the plugin's jar.
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java
+	(buildDocPath): Replaced by getLibHoverDocs. Change all callers.
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java
+	(getDocument): Removed.
+
+2006-07-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Remove unused sample extensions.
+	* src/com/redhat/eclipse/cdt/autotools/editors/*: Remove all files.
+	* src/com/redhat/eclipse/cdt/autotools/preferences/*: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/properties/*: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/views/*: Ditto.
+
+2006-07-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Update release.
+	* META-INF/MANIFEST.MF: Export libhoverdocs.
+
+2006-07-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Update release.
+
+2006-07-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
+	(getMakeTargets): Use IMakeBuildInfo.BUILD_TARGET_INCREMENTAL instead of
+	IMakeBuildInfo.BUILD_TARGET_FULL which is now obsoleted and not set by the
+	MakeTargets.
+	(clean): Ditto.
+
+2006-07-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Add new "other" option which allows the end-user to specify any
+	configuration option manually.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(getConfigArgs): New function to get configure arguments from preferences.
+	(runCommand): Change prototype to take an argument array.
+	(regenerateMakefiles): Only when running full configure, pass args to runCommand
+	and get these from getConfigArgs method.
+
+2006-07-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java
+	(getCompilationString): Don't use previous compilation string if we have marked
+	the scanner info as dirty.
+	(getIncludePaths): Don't continue processing if the compilation string is null.
+
+2006-06-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions/GetDefinedSymbolsAction.java:
+	New file.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java
+	(getDefinedSymbols): Fill in function details to fetch flags used in dynamic
+	compilation info.
+	(getCompilationString): New function to get and save the actual compilation
+	string from the make invocation.
+	(getIncludePaths): Move logic into getCompilationString.
+	(compilationString): New field to store compilation string.
+	(definedSymbols): New field to store map of defined symbols.
+	* plugin.xml: Add defined symbols menu item.
+
+2006-06-20  jjohnstn  <jjohnstn@toy.toronto.redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions/GetIncludePathAction.java:
+	Remove unused imports.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeUIImages.java: New class
+	copied from Std Make internal packages to local internal package.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MessageLine.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeUIPlugin.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/MakeResources.properties: New
+	properties message file used by MakeUIPlugin.
+	* src/com/redhat/eclipse/cdt/autotools/actions/TargetListViewerPart.java: Use
+	Autotools StructureViewPart instead of internal one from Std Make plugin.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeTargetDialog.java: Use new
+	Autotools internal classes rather than internal ones from Std Make plugin.
+	* src/com/redhat/eclipse/cdt/autotools/actions/AbstractTargetAction.java
+	(getShell): Use new AutotoolsPlugin getActiveWorkbenchShell method instead of
+	the one in internal MakeUIPlugin.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java: Remove
+	unused imports.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java
+	(getActiveWorkbenchShell): New method.
+
+2006-06-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Add dependency on org.eclipse.core.variables.
+	* src/com/redhat/eclipse/cdt/autotools/internal/MakeTargetManager: New internal
+	class copied from Std Make projects.
+	* src/com/redhat/eclipse/cdt/autotools/internal/MakeTarget: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ProjectTargets: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/MakeMessages: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakeTargetManager: Base on local
+	internal MakeTargetManager class rather than unpublished Std Make internal class.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator: Remove reference to Std
+	Make MakeMessages internal class.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: Add new message
+	about invoking make for the project.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java
+	(getFormattedString): New method to get resource string with arguments.
+
+2006-06-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Added "org.eclipse.cdt.core.DynamicScannerInfoProvider" extension.
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions/GetIncludePathAction.java
+	(run): Altered to use new AutotoolsScannerInfo class.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfoProvider.java: New
+	class used to hook up to added extension point:
+	org.eclipse.cdt.core.DynamicScannerInfoProvider.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsScannerInfo.java: New file based
+	on AutotoolsMakefileMiner.java. Class implements IScannerInfo interface.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileMiner.java: Transformed
+	into AutotoolsScannerInfo.java.
+
+2006-06-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions/GetIncludePathAction.java:
+	Fix up imports.
+
+2006-06-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Make provider Red Hat.
+
+2006-06-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileMiner.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/popup/actions: GetIncludePathAction.java:
+	Ditto.
+	* plugin.xml: Add extensions to create menu for source files that will grab the
+	dynamic include path for the build and display it in a message dialog. This is
+	just a temporary test.
+
+2006-05-19  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java
+	(run): Create our target selection dialog in-line. Make this dialog have a
+	filter for selection of make target.
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildTargetDialog.java: Remove:
+	no longer necessary.
+
+2006-05-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
+	(clean): Overriding method to check for MakeTargets in which case we don't want
+	to clean out directory.
+	* plugin.xml: Remove unneeded extension.
+
+2006-04-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java
+	(getHref): Change to reference the glibc book rather than the Gnu help.
+
+2006-04-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java: New file based on Chris
+	Moller's hover help, using ICHelpProvider interface.
+	* plugin.xml: Add CHelpProvider extension to supply hover help.
+	* libhoverdocs/glibc.xml: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutoconfPlugin.java: Refactored.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsPlugin.java: Refactored from
+	AutoconfPlugin.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/CConfigureConsole.java:
+	Refactor AutoconfPlugin to AutotoolsPlugin.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/CProjectPlatformPage.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizard.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/preferences/PreferenceInitializer.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/TargetListViewerPart.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeTargetDialog.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeContentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildTargetDialog.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java: Ditto.
+
+2006-04-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Remove toc extension since we have moved docs to a separate
+	plug-in.
+	* getdocs.sh: Moved to autotools-doc plugin.
+	* doc.zip: Ditto.
+	* toc.xml: Ditto.
+	* testToc.xml: Removed.
+
+2006-04-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* toc.xml: Add references for Gnu Tools documents.
+	* doc.zip: New file containing zipped up html files for Gnu tools.
+	* getdocs.sh: Shell script to get html files from the web and build doc.zip.
+	* plugin.xml: Connect toc extension to toc.xml so that Gnu tools help is
+	provided with Autotools plugin.
+
+2006-03-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutoconfPlugin.java
+	(getConsoleManager): New method.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(runCommand): Specify the Autotools configure console to use for configuration
+	output.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/CConfigureConsole.java: New
+	file stodified from ManagedBuild Project internal directory.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleDocument.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleManager.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsolePage.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsolePartitioner.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsolePartition.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleStream.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsoleViewer.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConfigureConsole.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConsoleEvent.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConsoleMessages.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ConsoleMessages.properties:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/internal/ui/ScrollLockAction.java: Ditto.
+	* plugin.xml: Set up CBuildConsole extension to be CConfigureConsole.
+
+2006-03-15  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(addMakeTargetsToManager): New method.
+	(regenerateMakefiles): Call addMakeTargetsToManager after Makefile is generated.
+
+2006-03-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectOptionPage.java
+	(getProject): If dealing with a ConvertToAutotoolsProjectWizard, use it's
+	getProject method.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizard.java
+	(setCurrentProject): New method.
+	(applyOptions): Change prototype to accept project as input. Call
+	setCurrentProject method using the project variable before getting the optionPage
+	to performApply.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java
+	(applyOptions): Add project as input variable and pass this on call.
+	(convertProject): Pass project when calling applyOptions method.
+
+2006-03-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
+	(getMakeTargets): When doing a full build, we don't want to do a "clean" if the
+	target is not "all".
+
+2006-03-09  Andrew Overholt  <overholt@redhat.com>
+
+	* .cvsignore: Initial checkin. Ignore bin.
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java
+	(regenerateMakefiles): Rename CONFIG_STATUS_NAME to CONFIG_STATUS. Call
+	autogen.sh first if configure does not exist.
+	(configureExists): New method.
+	(autogenExists): New method.
+	(runCommand): New method. Run configure or autogen and report success.
+	* plugin.properties: Change "CVS Autotools" to Autotools.
+	* plugin.xml: Likewise.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/NewAutotoolsProjectWizard.java
+	(NewAutotoolsProjectWizard): Likewise.
+
+2006-03-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Set up default gcc scanner in our ManagedMakeProject target
+	extension -
+	org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java
+	(convertProject): Remove commented code about setting ScannerConfig as we now
+	set the default GCC scanner collector in our ManagedMakeProject extension.
+
+2006-03-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/AutoconfPlugin.java
+	(ftargetManager): New field.
+	(getUniqueIdentifier): New method.
+	(getTargetManager): Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java: New
+	builder that extends ManagedMakeProject's GeneratedMakefileBuilder and allows us
+	to override behavior.
+	* src/com/redhat/eclipse/cdt/autotools/AutotoolsMakeTargetManager.java: New
+	class that extends a Std MakeProject's MakeTargetManager and allows us to
+	override behavior.
+	* src/com/redhat/eclipse/cdt/autotools/Resources.properties: New strings added
+	to support BuildSpecial functionality.
+	* src/com/redhat/eclipse/cdt/autotools/AbstractTargetAction.java: New file based
+	on Std MakeProject class.
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildSpecial.java: Rewritten to
+	extend AbstractTargetAction and to create a dialog rather than print out hello
+	world.
+	* src/com/redhat/eclipse/cdt/autotools/actions/BuildTargetDialog.java: New file
+	that implements the Build Special Targets dialog. Based on a Std Make Project's
+	BuildTargetDialog.
+	* src/com/redhat/eclipse/cdt/autotools/actions/CheckboxTablePart.java: New file
+	to support new dialogs.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeContentProvider.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/MakeTargetDialog.java: New file
+	that implements the Make Target dialog allowing management of make targets. Based
+	on Std Make Project's MakeTargetDialog.
+	* src/com/redhat/eclipse/cdt/autotools/actions/SharedPartWithButtons.java:
+	Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/StructuredViewerPart.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/actions/TargetListViewerPart.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/wizards/ConvertToAutotoolsProjectWizardPage.java:
+	Instead of adding a ManagedProject builder, add our new AutotoolsMakefileBuilder.
+	* plugin.xml: Add our new AutotoolsMakefileBuilder as an official builder.
+
+2006-02-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/MakeGenerator.java: Remove some warnings.
+	* plugin.xml: Fix duplicate target configuration options and re-add in --build
+	option.
+
+2006-02-23  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* Initial import.
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/META-INF/MANIFEST.MF b/autotools/org.eclipse.linuxtools.cdt.autotools/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..a9de97b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/META-INF/MANIFEST.MF
@@ -0,0 +1,34 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name.0
+Bundle-SymbolicName: org.eclipse.linuxtools.cdt.autotools;singleton:=true
+Bundle-Version: 2.0.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.cdt.autotools.AutotoolsPlugin
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.4.0",
+ org.eclipse.jface.text;bundle-version="3.4.0",
+ org.eclipse.core.resources;bundle-version="3.4.0",
+ org.eclipse.cdt.managedbuilder.core;bundle-version="5.0.100",
+ org.eclipse.cdt.core;bundle-version="5.1.0",
+ org.eclipse.cdt.managedbuilder.ui;bundle-version="5.0.100",
+ org.eclipse.cdt.managedbuilder.gnu.ui;bundle-version="5.0.100",
+ org.eclipse.cdt.make.core;bundle-version="5.1.0",
+ org.eclipse.ui.console;bundle-version="3.3.0",
+ org.eclipse.help;bundle-version="3.3.100",
+ org.eclipse.core.variables;bundle-version="3.2.100",
+ org.eclipse.ui.views;bundle-version="3.3.0",
+ org.eclipse.core.filesystem;bundle-version="1.2.0",
+ org.eclipse.ui;bundle-version="3.5.0",
+ org.eclipse.cdt.ui;bundle-version="5.1.0",
+ org.eclipse.ui.ide;bundle-version="3.5.0",
+ org.eclipse.ui.editors;bundle-version="3.5.0",
+ org.eclipse.linuxtools.cdt.autotools.core;bundle-version="1.0.0",
+ org.eclipse.linuxtools.cdt.autotools.ui;bundle-version="1.0.0"
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %provider
+Export-Package: org.eclipse.linuxtools.cdt.autotools;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests",
+ org.eclipse.linuxtools.cdt.autotools.ui.properties;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests",
+ org.eclipse.linuxtools.internal.cdt.autotools;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests",
+ org.eclipse.linuxtools.internal.cdt.autotools.ui;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests",
+ org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;x-friends:="org.eclipse.linuxtools.cdt.autotools.tests"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/about.html b/autotools/org.eclipse.linuxtools.cdt.autotools/about.html
new file mode 100644
index 0000000..44e2290
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

+<html>

+<head>

+<title>About</title>

+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>8th September, 2004</p>	

+<h3>License</h3>

+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<h3>Contributions</h3>

+

+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise

+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such

+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or

+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the

+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available

+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also

+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+</body>

+</html>
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/build.properties b/autotools/org.eclipse.linuxtools.cdt.autotools/build.properties
new file mode 100644
index 0000000..592910e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/build.properties
@@ -0,0 +1,8 @@
+source.. = src/
+output.. = bin/
+bin.includes = plugin.xml,\
+               META-INF/,\
+               .,\
+               plugin.properties,\
+               icons/
+
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/icons/autoconf.gif b/autotools/org.eclipse.linuxtools.cdt.autotools/icons/autoconf.gif
new file mode 100644
index 0000000..98afb3e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/icons/autoconf.gif
Binary files differ
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/plugin.properties b/autotools/org.eclipse.linuxtools.cdt.autotools/plugin.properties
new file mode 100644
index 0000000..128cd2a
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/plugin.properties
@@ -0,0 +1,170 @@
+#################################################################################
+#  Copyright (c) 2006, 2008, 2009 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+ConvertWizard.description=Convert to C/C++ Autotools Project
+NewCProject.description=GNU C Autotools Project
+NewCCProject.description=GNU C++ Autotools Project
+NewCWizard.name=GNU C Autotools Project
+NewCCWizard.name=GNU C++ Autotools Project
+
+Autotools.wizard.name=GNU Autotools Build Wizard
+
+Autoconf.editor.name=Autoconf Editor
+
+BuildProperty.value.name.default=Default;
+BuildProperty.type.name.autotools=GNU Autotools
+
+PreferenceAutotools.name=Autotools
+PreferenceAutomakeEditor.name=Automake Editor
+PreferenceAutoconfEditor.name=Autoconf Editor
+
+PropertyAutotools.name=Autotools
+PropertyTabEditor.name=Editors
+AutotoolsBuildPropertyTab.name=Autotools
+AutotoolsEditorsPropertyTab.name=Editors
+AutotoolsToolsPropertyTab.name=Tools Settings
+
+PropertyTabEditor.tooltip=Set options for Autotools-specific editors
+PropertyTabBuild.tooltip=Set additional Autotools build options
+
+Makefile.builder.name=Autotools Makefile Generator
+Autotools.projecttype.name=GNU Autotools
+AutotoolsNature.name=Autotools Project Nature
+Configuration.build.name=Build (GNU)
+Autotools.targetplatform.name=GNU Autotools Target Platform
+Autotools.gnu.toolchain.name=GNU Autotools Toolchain
+Configure.outputType=Configure Output (config.status)
+Autogen.outputType=Autogen Output (configure)
+
+CommandCategorySource.name=Source
+CommandCategorySource.description=Source commands
+CommandCategoryTools.name=Tools
+CommandCategoryTools.description=Autotool tools
+ShowTooltip.name=Show Tooltip Description
+ShowTooltip.description=Shows the tooltip description for the element at the cursor
+
+# Scope and Key Commands
+ACeditor.scope.name=Autoconf Editor
+ACeditor.scope.description=Editor for Autoconf Configuration Source Files
+
+Tool.configure=configure
+
+OptionCategory.configure.general=General
+Option.configure.builddir=Build directory
+Option.configure.builddir.tip=Subdirectory off of project where build will occur
+Option.configure.configdir=Configure tool directory
+Option.configure.configdir.tip=Subdirectory to change to before invoking configure
+Option.configure.cache_file=Name of configuration cache file (--cache-file)
+Option.configure.cache_file.tip=Specify the name of the configuration cache file [config.cache]
+Option.configure.no_create=Turn off file creation <not advised> (--no-create)
+Option.configure.no_create.tip=This tells configuration not to generate the output files as part of configuration
+Option.configure.quiet=Turn off checking messages (--quiet)
+Option.configure.quiet.tip=This turns off "checking ..." style messages from the configuration console output
+Option.configure.help=Display help contents of top-level configuration (--help)
+Option.configure.help.tip=Ask configuration file to display its help documentation
+Option.configure.version=Display version of autotools used to create configuration (--version)
+Option.configure.version.tip=This outputs the version of the Autotools used to create the configuration files
+
+OptionCategory.configure.platform=Platform Specifiers
+Option.configure.host=Host platform (--host)
+Option.configure.host.tip=Platform that project will run on
+Option.configure.target=Target platform (--target)
+Option.configure.target.tip=Platform that project will target output for
+Option.configure.build=Build platform (--build)
+Option.configure.build.tip=Platform where project is being built
+
+OptionCategory.configure.directories=Directory specifiers
+Option.configure.prefix=Arch-independent install directory (--prefix)
+Option.configure.prefix.tip=Place where architecture-independent files are installed [/usr/local]
+Option.configure.exec_prefix=Arch-dependent install directory (--exec-prefix)
+Option.configure.exec_prefix.tip=Place where architecture-dependent files are installed [PREFIX]
+Option.configure.libdir=Object code library directory (--libdir)
+Option.configure.libdir.tip=Place where object code libraries are installed [EPREFIX/lib]
+Option.configure.bindir=User executable directory (--bindir)
+Option.configure.bindir.tip=Place where binary executables are installed [EPREFIX/bin]
+Option.configure.sbindir=System admin executable directory (--sbindir)
+Option.configure.sbindir.tip=Place where system admin executables are installed [EPREFIX/sbin]
+Option.configure.includedir=C Header file directory (--includdir)
+Option.configure.includedir.tip=Place where header files will be installed [PREFIX/include]
+Option.configure.datadir=Read-only architecture-independent data (--datadir)
+Option.configure.datadir.tip=Place where read-only architecture-independent data is installed [PREFIX/share]
+Option.configure.sysconfdir=Read-only single-machine data directory (--syconfdir)
+Option.configure.sysconfdir.tip=Place where read-only single-machine data is stored [PREFIX/etc]
+Option.configure.infodir=Info file documentation directory (--infodir)
+Option.configure.infodir.tip=Place where info files are installed [PREFIX/info]
+Option.configure.mandir=Man file documentation directory (--mandir)
+Option.configure.mandir.tip=Place where man file documentation is installed [PREFIX/man]
+Option.configure.srcdir=Sources directory (--srcdir)
+Option.configure.srcdir.tip=Place where configure can find sources [configure directory or ..]
+Option.configure.localstatedir=Modifiable single-machine data directory (--localstatedir)
+Option.configure.localstatedir.tip=Place where modifiable single-machine data is installed [PREFIX/var]
+Option.configure.sharedstatedir=Modifiable architecture-independent data directory (--sharedstatedir)
+Option.configure.sharedstatedir.tip=Place where modifiable architecture-independent data is installed [PREFIX/com}
+Option.configure.libexecdir=Program executable directory (--libexecdir)
+Option.configure.libexecdir=Place where program executables will be installed [EPREFIX/libexec]
+Option.configure.oldincludedir=Non-gcc C header file directory (--oldincludedir)
+Option.configure.oldincludedir.tip=Place where non-gcc C header files are installed [/usr/include]
+
+OptionCategory.configure.filenames=File-name transformations
+Option.configure.program_prefix=Installed program prefix (--program-prefix)
+Option.configure.program_prefix.tip=Prepend PREFIX to the beginning of installed program names
+Option.configure.program_suffix=Installed program suffix (--program-suffix)
+Option.configure.program_suffix.tip=Append SUFFIX to the end of installed program names
+Option.configure.program_transform_name=Installed program name transform (--program-transform-name)
+Option.configure.program_transform_name.tip=A sed string used to transform installed program names
+
+OptionCategory.configure.features=Features and packages
+Option.configure.enable_maintainer_mode=Enable maintainer mode (--enable-maintainer-mode)
+Option.configure.enable_maintainer_mode.tip=Specify this to have Makefiles generated with checks for Autotool configuration file changes
+Option.configure.user=User-specified configuration options
+Option.configure.user.tip=Specify one or more configuration options (e.g. --enable-FEATURE, --disable-FEATURE, or --with-PACKAGE)
+
+Tool.autogen = autogen.sh
+
+OptionCategory.autogen.general=Options
+Option.autogen.user=Command line options
+Option.autogen.user.tip=Specify options to pass to the top-level autogen.sh script
+
+RedHatVendor.name = Red Hat
+Bundle-Name.0 = Autotools Plug-in (Incubation)
+provider=Eclipse
+ConvertWizard.name = Convert to a C/C++ Autotools Project
+InvokeAutotools.label = Invoke Autotools
+InvokeAutotools.mnemonic = I
+InvokeAutoconf.label = Invoke Autoconf
+InvokeAutoconf.mnemonic = c
+InvokeAutoconf.description = Run autoconf in the selected directory
+InvokeAutoheader.label = Invoke Autoheader
+InvokeAutoheader.mnemonic = h
+InvokeAutoheader.description = Run autoheader from the selected directory
+InvokeAutomake.label = Invoke Automake
+InvokeAutomake.mnemonic = m
+InvokeAutomake.description = Run automake from the selected directory
+InvokeAutoreconf.label = Invoke Autoreconf
+InvokeAutoreconf.mnemonic = r
+InvokeAutoreconf.description = Run autoreconf from the selected directory
+InvokeAclocal.label = Invoke Aclocal
+InvokeAclocal.mnemonic = l
+InvokeAclocal.description = Run aclocal from the selected directory
+InvokeLibtoolize.label = Invoke Libtoolize
+InvokeLibtoolize.mnemonic = t
+InvokeLibtoolize.description = Run libtoolize in the selected directory
+Reconfigure.label = Reconfigure Project
+Reconfigure.mnemonic = f
+Reconfigure.description = Run configuration scripts for project
+DynamicBuild.label = Dynamic Build Info
+GetIncludePath.label = Get Include Path
+GetDefinedSymbols.label = Get Defined Symbols
+IncludesOption.name = includes
+SymbolsOption.name = symbols
+AutomakeEditor.name = AutomakeEditor
+Automake.name = automake
+ConfigureScript.name=Configure Script
+AutogenScript.name=Autogen Script
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/plugin.xml b/autotools/org.eclipse.linuxtools.cdt.autotools/plugin.xml
new file mode 100644
index 0000000..04c6fa3
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/plugin.xml
@@ -0,0 +1,1031 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+     <extension
+           id="autotoolsProperties"
+           name="Autotools Build Properties"
+           point="org.eclipse.cdt.managedbuilder.core.buildProperties">
+           <propertyValue 
+              	property="org.eclipse.cdt.build.core.buildType" 
+              	id="org.eclipse.linuxtools.cdt.autotools.buildType.default" 
+              	name="%BuildProperty.value.name.default"/>
+           <propertyValue 
+            	property="org.eclipse.cdt.build.core.buildArtefactType" 
+            	id="org.eclipse.linuxtools.cdt.autotools.buildArtefactType.autotools" 
+            	name="%BuildProperty.type.name.autotools"/>
+     </extension>
+   <extension
+         id="cdt.autootols.managed.build.info"
+         name="Autotools Managed Build Info"
+         point="org.eclipse.cdt.managedbuilder.core.buildDefinitions">
+      <managedBuildRevision fileVersion="4.0.0"/>
+      <tool
+            command="configure"
+            id="org.eclipse.linuxtools.cdt.autotools.tool.configure"
+            isAbstract="false"
+            name="%Tool.configure"
+            natureFilter="both">
+         <optionCategory
+               id="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.general"
+               name="%OptionCategory.configure.general"
+               owner="org.eclipse.linuxtools.cdt.autotools.tool.configure"/>
+         <option
+               applicabilityCalculator="org.eclipse.linuxtools.cdt.autotools.AutotoolsDefaultBuildDirHandler"
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.general"
+               defaultValue="build"
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.builddir"
+               isAbstract="false"
+               name="%Option.configure.builddir"
+               resourceFilter="all"
+               tip="%Option.configure.builddir.tip"
+               valueHandler="org.eclipse.linuxtools.cdt.autotools.AutotoolsDefaultBuildDirHandler"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.general"
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.configdir"
+               isAbstract="false"
+               name="%Option.configure.configdir"
+               resourceFilter="all"
+               tip="%Option.configure.configdir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.general"
+               command="--cache-file="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.cache_file"
+               isAbstract="false"
+               name="%Option.configure.cache_file"
+               resourceFilter="all"
+               tip="%Option.configure.cache_file.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.general"
+               command="--help"
+               defaultValue="false"
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.help"
+               isAbstract="false"
+               name="%Option.configure.help"
+               resourceFilter="all"
+               tip="%Option.configure.help.tip"
+               valueType="boolean"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.general"
+               command="--no-create"
+               defaultValue="false"
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.no_create"
+               isAbstract="false"
+               name="%Option.configure.no_create"
+               resourceFilter="all"
+               tip="%Option.configure.no_create.tip"
+               valueType="boolean"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.general"
+               command="--quiet"
+               defaultValue="false"
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.quiet"
+               isAbstract="false"
+               name="%Option.configure.quiet"
+               resourceFilter="all"
+               tip="%Option.configure.quiet.tip"
+               valueType="boolean"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.general"
+               command="--version"
+               defaultValue="false"
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.version"
+               isAbstract="false"
+               name="%Option.configure.version"
+               resourceFilter="all"
+               tip="%Option.configure.version.tip"
+               valueType="boolean"/>
+         <optionCategory
+               id="org.eclipse.linuxtools.cdt.autotools.configure.optionCategory.configure.platform"
+               name="%OptionCategory.configure.platform"
+               owner="org.eclipse.linuxtools.cdt.autotools.tool.configure"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.configure.optionCategory.configure.platform"
+               command="--host="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.host"
+               isAbstract="false"
+               name="%Option.configure.host"
+               resourceFilter="all"
+               tip="%Option.configure.host.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.configure.optionCategory.configure.platform"
+               command="--target="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.target"
+               isAbstract="false"
+               name="%Option.configure.target"
+               resourceFilter="all"
+               tip="%Option.configure.target.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.configure.optionCategory.configure.platform"
+               command="--build="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.build"
+               isAbstract="false"
+               name="%Option.configure.build"
+               resourceFilter="all"
+               tip="%Option.configure.build.tip"
+               valueType="string"/>
+         <optionCategory
+               id="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               name="%OptionCategory.configure.directories"
+               owner="org.eclipse.linuxtools.cdt.autotools.tool.configure"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--prefix="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.prefix"
+               isAbstract="false"
+               name="%Option.configure.prefix"
+               resourceFilter="all"
+               tip="%Option.configure.prefix.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--exec-prefix="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.exec_prefix"
+               isAbstract="false"
+               name="%Option.configure.exec_prefix"
+               resourceFilter="all"
+               tip="%Option.configure.exec_prefix.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--libdir="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.libdir"
+               isAbstract="false"
+               name="%Option.configure.libdir"
+               resourceFilter="all"
+               tip="%Option.configure.libdir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--bindir="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.bindir"
+               isAbstract="false"
+               name="%Option.configure.bindir"
+               resourceFilter="all"
+               tip="%Option.configure.bindir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--sbindir="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.sbindir"
+               isAbstract="false"
+               name="%Option.configure.sbindir"
+               resourceFilter="all"
+               tip="%Option.configure.sbindir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--includedir="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.includedir"
+               isAbstract="false"
+               name="%Option.configure.includedir"
+               resourceFilter="all"
+               tip="%Option.configure.includedir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--datadir="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.datadir"
+               isAbstract="false"
+               name="%Option.configure.datadir"
+               resourceFilter="all"
+               tip="%Option.configure.datadir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--sysconfdir="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.sysconfdir"
+               isAbstract="false"
+               name="%Option.configure.sysconfdir"
+               resourceFilter="all"
+               tip="%Option.configure.sysconfdir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--infodir="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.infodir"
+               isAbstract="false"
+               name="%Option.configure.infodir"
+               resourceFilter="all"
+               tip="%Option.configure.infodir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--mandir="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.mandir"
+               isAbstract="false"
+               name="%Option.configure.mandir"
+               resourceFilter="all"
+               tip="%Option.configure.mandir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--srcdir="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.srcdir"
+               isAbstract="false"
+               name="%Option.configure.srcdir"
+               resourceFilter="all"
+               tip="%Option.configure.srcdir.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--localstatedir="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.localstatedir"
+               isAbstract="false"
+               name="%Option.configure.localstatedir"
+               resourceFilter="all"
+               tip="%Option.configure.localstatedir"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--sharedstatedir="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.sharedstatedir"
+               isAbstract="false"
+               name="%Option.configure.sharedstatedir"
+               resourceFilter="all"
+               tip="%Option.configure.sharedstatedir"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--libexecdir="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.libexecdir"
+               isAbstract="false"
+               name="%Option.configure.libexecdir"
+               resourceFilter="all"
+               tip="%Option.configure.libexecdir"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.directories"
+               command="--oldincludedir="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.oldincludedir"
+               isAbstract="false"
+               name="%Option.configure.oldincludedir"
+               resourceFilter="all"
+               tip="%Option.configure.oldincludedir.tip"
+               valueType="string"/>
+         <optionCategory
+               id="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.filenames"
+               name="%OptionCategory.configure.filenames"
+               owner="org.eclipse.linuxtools.cdt.autotools.tool.configure"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.filenames"
+               command="--program-prefix="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.program_prefix"
+               isAbstract="false"
+               name="%Option.configure.program_prefix"
+               resourceFilter="all"
+               tip="%Option.configure.program_prefix.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.filenames"
+               command="--program-suffix="
+               id="org.eclipse.linuxtools.cdt.autotools.option.program_suffix"
+               isAbstract="false"
+               name="%Option.configure.program_suffix"
+               resourceFilter="all"
+               tip="%Option.configure.program_suffix.tip"
+               valueType="string"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.filenames"
+               command="--program-transform-name="
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.program_transform_name"
+               isAbstract="false"
+               name="%Option.configure.program_transform_name"
+               resourceFilter="all"
+               tip="%Option.configure.program_transform_name.tip"
+               valueType="string"/>
+         <optionCategory
+               id="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.features"
+               name="%OptionCategory.configure.features"
+               owner="org.eclipse.linuxtools.cdt.autotools.tool.configure"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.features"
+               command="--enable-maintainer-mode"
+               defaultValue="false"
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.enable_maintainer_mode"
+               isAbstract="false"
+               name="%Option.configure.enable_maintainer_mode"
+               resourceFilter="all"
+               tip="%Option.configure.enable_maintainer_mode.tip"
+               valueType="boolean"/>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.features"
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.user"
+               isAbstract="false"
+               name="%Option.configure.user"
+               resourceFilter="all"
+               tip="%Option.configure.user.tip"
+               valueType="string"/>
+         <option
+               applicabilityCalculator="org.eclipse.linuxtools.cdt.autotools.AutotoolsDefaultBuildDirHandler"
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.general"
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.includes"
+               isAbstract="false"
+               name="%IncludesOption.name"
+               valueType="includePath">
+         <enablement type="UI_VISIBILITY|UI_ENABLEMENT">
+         <false/>
+         </enablement>
+         </option>
+         <option
+               applicabilityCalculator="org.eclipse.linuxtools.cdt.autotools.AutotoolsDefaultBuildDirHandler"
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.configure.general"
+               id="org.eclipse.linuxtools.cdt.autotools.option.configure.symbols"
+               isAbstract="false"
+               name="%SymbolsOption.name"
+               valueType="definedSymbols">
+         <enablement type="UI_VISIBILITY|UI_ENABLEMENT">
+         <false/>
+         </enablement>
+         </option>
+         <outputType
+               id="org.eclipse.linuxtools.cdt.autotools.outputType.configure"
+               name="%Configure.outputType"
+               outputs="status"
+               primaryOutput="true"/>
+         <inputType
+               id="org.eclipse.linuxtools.cdt.autotools.inputType.configure"
+               scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
+               languageId="org.eclipse.cdt.core.gcc">
+         </inputType>
+         <inputType
+               id="org.eclipse.linuxtools.cdt.autotools.inputType.configure1"
+               scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
+               languageId="org.eclipse.cdt.core.g++">
+         </inputType>
+      </tool>
+      <tool
+            command="autogen.sh"
+            id="org.eclipse.linuxtools.cdt.autotools.tool.autogen"
+            isAbstract="false"
+            name="%Tool.autogen"
+            natureFilter="both">
+         <optionCategory
+               id="org.eclipse.linuxtools.cdt.autotools.optionCategory.autogen.general"
+               name="%OptionCategory.autogen.general"
+               owner="org.eclipse.linuxtools.cdt.autotools.tool.autogen">
+         </optionCategory>
+         <option
+               category="org.eclipse.linuxtools.cdt.autotools.optionCategory.autogen.general"
+               id="org.eclipse.linuxtools.cdt.autotools.option.autogen.user"
+               isAbstract="false"
+               name="%Option.autogen.user"
+               resourceFilter="all"
+               tip="%Option.autogen.user.tip"
+               valueType="string">
+         </option>
+         <outputType
+               id="org.eclipse.linuxtools.cdt.autotools.autogen.outputType"
+               name="%Autogen.outputType"
+               outputNames="configure"
+               primaryOutput="true">
+         </outputType>
+         <inputType
+               id="org.eclipse.linuxtools.cdt.autotools.autogen.inputType"
+               multipleOfType="false"
+               name="autogenScript"
+               scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
+               sourceContentType="org.eclipse.linuxtools.cdt.autotools.autogenScript">
+         </inputType>
+      </tool>
+      <builder
+            arguments="-k"
+            buildfileGenerator="org.eclipse.linuxtools.cdt.autotools.MakeGenerator"
+            command="make"
+            id="org.eclipse.linuxtools.cdt.autotools.builder"
+            isAbstract="true"
+            isVariableCaseSensitive="false"
+            name="%Makefile.builder.name"/>
+      <targetPlatform
+            archList="all"
+            binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.GNU_ELF"
+            id="org.eclipse.linuxtools.cdt.autotools.targetPlatform"
+            isAbstract="false"
+            name="%Autotools.targetplatform.name"/>
+      <projectType
+            buildArtefactType="org.eclipse.linuxtools.cdt.autotools.buildArtefactType.autotools"
+            id="org.eclipse.linuxtools.cdt.autotools.projectType"
+            isAbstract="false">
+         <configuration
+               buildProperties="org.eclipse.linuxtools.cdt.autotools.buildType.default"
+               cleanCommand="rm -rf"
+               errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser"
+               id="org.eclipse.linuxtools.cdt.autotools.configuration.build"
+               name="%Configuration.build.name">
+            <toolChain
+                  archList="all"
+                  id="org.eclipse.linuxtools.cdt.autotools.toolChain"
+                  name="%Autotools.gnu.toolchain.name"
+                  scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProject"
+                  targetTool="org.eclipse.linuxtools.cdt.autotools.tool.configure"
+                  unusedChildren="org.eclipse.linuxtools.cdt.autotools.toolchain.tool.gcc;org.eclipse.linuxtools.cdt.autotools.toolchain.tool.gpp">
+               <tool
+                     id="org.eclipse.linuxtools.cdt.autotools.gnu.toolchain.tool.configure"
+                     isAbstract="false"
+                     natureFilter="both"
+                     superClass="org.eclipse.linuxtools.cdt.autotools.tool.configure"/>
+               <tool
+                     id="org.eclipse.linuxtools.cdt.autotools.toolchain.tool.autogen"
+                     isAbstract="false"
+                     natureFilter="both"
+                     superClass="org.eclipse.linuxtools.cdt.autotools.tool.autogen">
+               </tool>
+               <tool
+                     id="org.eclipse.linuxtools.cdt.autotools.toolchain.tool.gcc"
+                     isAbstract="false"
+                     superClass="cdt.managedbuild.tool.gnu.c.compiler">
+               </tool>
+               <tool
+                     id="org.eclipse.linuxtools.cdt.autotools.toolchain.tool.gpp"
+                     isAbstract="false"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.compiler">
+               </tool>
+               <builder
+                     id="org.eclipse.linuxtools.cdt.autotools.toolchain.builder"
+                     isAbstract="false"
+                     isVariableCaseSensitive="false"
+                     superClass="org.eclipse.linuxtools.cdt.autotools.builder"/>
+               <targetPlatform
+                     id="org.eclipse.linuxtools.cdt.autotools.toolchain.targetPlatform"
+                     isAbstract="false"
+                     name="%Autotools.targetplatform.name"
+                     superClass="org.eclipse.linuxtools.cdt.autotools.targetPlatform">
+               </targetPlatform>
+               <supportedProperties>
+                  <property
+                        id="org.eclipse.cdt.build.core.buildArtefactType">
+                     <value
+                           id="org.eclipse.linuxtools.cdt.autotools.buildArtefactType.autotools">
+                     </value>
+                  </property>
+               </supportedProperties>
+            </toolChain>
+         </configuration>
+      </projectType>
+   </extension>
+   <extension
+         id="genmakebuilder"
+         name="Autotools generated make builder"
+         point="org.eclipse.core.resources.builders">
+      <builder
+            callOnEmptyDelta="true"
+            hasNature="false">
+         <run class="org.eclipse.linuxtools.cdt.autotools.AutotoolsMakefileBuilder"/>
+      </builder>
+   </extension>
+   <extension
+         point="org.eclipse.cdt.core.CBuildConsole">
+      <CBuildConsole
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.CConfigureConsole"
+            id="org.eclipse.linuxtools.cdt.autotools.configureConsole"/>
+      <CBuildConsole
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.CBuildStepsConsole"
+            id="org.eclipse.linuxtools.cdt.autotools.buildStepsConsole">
+      </CBuildConsole>
+      <CBuildConsole
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.AutotoolsConsole"
+            id="org.eclipse.linuxtools.cdt.autotools.autotoolsConsole">
+      </CBuildConsole>
+   </extension>
+   <extension
+   	     id="AutotoolsScannerInfoProvider"
+         point="org.eclipse.cdt.core.ScannerInfoProvider">
+      <cextension>   
+        <run 
+             class="org.eclipse.linuxtools.cdt.autotools.AutotoolsScannerInfoProvider">
+        </run>
+      </cextension>
+   </extension>
+   <extension
+         id="parsefileerror"
+         name="Autotools Parse Error Marker"
+         point="org.eclipse.core.resources.markers">
+      <super type="org.eclipse.core.resources.problemmarker"/>
+      <super type="org.eclipse.core.resources.textmarker"/>
+      <persistent value="true"/>
+   </extension>
+   <extension
+         id="outlineparsefileerror"
+         name="Autotools Outline Page Parse Error"
+         point="org.eclipse.core.resources.markers">
+      <super type="org.eclipse.core.resources.problemmarker"/>
+      <super type="org.eclipse.core.resources.textmarker"/>
+      <persistent value="true"/>
+   </extension>
+   <extension
+         point="org.eclipse.cdt.make.core.MakeTargetBuilder">
+      <builder
+            builderID="org.eclipse.linuxtools.cdt.autotools.genmakebuilder"
+            id="org.eclipse.linuxtools.cdt.autotools.builder1">
+      </builder>
+   </extension>
+   <extension
+         point="org.eclipse.core.expressions.propertyTesters">
+      <propertyTester
+            class="org.eclipse.linuxtools.cdt.autotools.AutotoolsProjectPropertyTester"
+            id="org.eclipse.linuxtools.cdt.autotools.propertyTester.isAutotoolsProject"
+            namespace="org.eclipse.linuxtools.cdt.autotools"
+            properties="isAutotoolsProject"
+            type="org.eclipse.core.resources.IResource">
+      </propertyTester>
+   </extension>
+   <extension
+         id="autotoolsNature"
+         name="%AutotoolsNature.name"
+         point="org.eclipse.core.resources.natures">
+      <requires-nature
+            id="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
+      </requires-nature>
+      <runtime>
+         <run
+               class="org.eclipse.linuxtools.cdt.autotools.AutotoolsProjectNature">
+         </run>
+      </runtime>
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            locationURI="menu:project?after=additions">
+         <menu
+               id="invokeAutotoolsOld"
+               label="%InvokeAutotools.label"
+               mnemonic="%InvokeAutotools.mnemonic">
+            <visibleWhen
+                  checkEnabled="false">
+               <and>
+                  <count
+                        value="1">
+                  </count>
+                  <iterate
+                        ifEmpty="false"
+                        operator="and">
+                     <adapt
+                           type="org.eclipse.core.resources.IResource">
+                        <test
+                              property="org.eclipse.core.resources.projectNature"
+                              value="org.eclipse.linuxtools.cdt.autotools.autotoolsNature">
+                        </test>
+                     </adapt>
+                  </iterate>
+               </and>
+            </visibleWhen>
+         </menu>
+      </menuContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            locationURI="menu:project?after=additions">
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.command.reconfigure"
+               id="reconfigure"
+               label="%Reconfigure.label"
+               mnemonic="%Reconfigure.mnemonic"
+               style="push">
+            <visibleWhen
+                  checkEnabled="false">
+               <and>
+                  <count
+                        value="1">
+                  </count>
+                  <iterate
+                        ifEmpty="false"
+                        operator="and">
+                     <adapt
+                           type="org.eclipse.core.resources.IResource">
+                        <test
+                              property="org.eclipse.core.resources.projectNature"
+                              value="org.eclipse.linuxtools.cdt.autotools.autotoolsNature">
+                        </test>
+                     </adapt>
+                  </iterate>
+               </and>
+            </visibleWhen>
+         </command>
+       </menuContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            locationURI="menu:invokeAutotoolsOld">
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.command.autoconf"
+               id="autoconf"
+               label="%InvokeAutoconf.label"
+               mnemonic="%InvokeAutoconf.mnemonic"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.command.autoheader"
+               id="autoheader"
+               label="%InvokeAutoheader.label"
+               mnemonic="%InvokeAutoheader.mnemonic"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.command.automake"
+               id="automake"
+               label="%InvokeAutomake.label"
+               mnemonic="%InvokeAutomake.mnemonic"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.command.autoreconf"
+               id="autoreconf"
+               label="%InvokeAutoreconf.label"
+               mnemonic="%InvokeAutoreconf.mnemonic"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.command.aclocal"
+               id="aclocal"
+               label="%InvokeAclocal.label"
+               mnemonic="%InvokeAclocal.mnemonic"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.linuxtools.cdt.autotools.command.libtoolize"
+               id="libtoolize"
+               label="%InvokeLibtoolize.label"
+               mnemonic="%InvokeLibtoolize.mnemonic"
+               style="push">
+         </command>
+      </menuContribution>
+   </extension>
+   <extension
+         id="org.eclipse.linuxtools.cdt.autotools.commands"
+         name="Autoconf"
+         point="org.eclipse.ui.commands">
+      <category
+            id="org.eclipse.linuxtools.cdt.autotools.category.invokeAutotools"
+            name="%InvokeAutotools.label">
+      </category>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.category.invokeAutotools"
+            description="%InvokeAutoconf.description"
+            id="org.eclipse.linuxtools.cdt.autotools.command.autoconf"
+            name="%InvokeAutoconf.label">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.category.invokeAutotools"
+            description="%InvokeAutoheader.description"
+            id="org.eclipse.linuxtools.cdt.autotools.command.autoheader"
+            name="%InvokeAutoheader.label">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.category.invokeAutotools"
+            description="%InvokeAutomake.description"
+            id="org.eclipse.linuxtools.cdt.autotools.command.automake"
+            name="%InvokeAutomake.label">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.category.invokeAutotools"
+            description="%InvokeAutoreconf.description"
+            id="org.eclipse.linuxtools.cdt.autotools.command.autoreconf"
+            name="%InvokeAutoreconf.label">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.category.invokeAutotools"
+            description="%InvokeAclocal.description"
+            id="org.eclipse.linuxtools.cdt.autotools.command.aclocal"
+            name="%InvokeAclocal.label">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.category.invokeAutotools"
+            description="%InvokeLibtoolize.description"
+            id="org.eclipse.linuxtools.cdt.autotools.command.libtoolize"
+            name="%InvokeLibtoolize.label">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.cdt.autotools.category.invokeAutotools"
+            description="%Reconfigure.description"
+            id="org.eclipse.linuxtools.cdt.autotools.command.reconfigure"
+            name="%Reconfigure.label">
+      </command>
+   </extension>
+    <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.eclipse.linuxtools.cdt.autotools.actions.AutoconfHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.command.autoconf">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.cdt.autotools.actions.AutoheaderHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.command.autoheader">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.cdt.autotools.actions.AutomakeHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.command.automake">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.cdt.autotools.actions.AutoreconfHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.command.autoreconf">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.cdt.autotools.actions.AclocalHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.command.aclocal">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.cdt.autotools.actions.LibtoolizeHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.command.libtoolize">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.cdt.autotools.actions.ReconfigureHandler"
+            commandId="org.eclipse.linuxtools.cdt.autotools.command.reconfigure">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </activeWhen>
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+   </extension>
+   <extension
+         point="org.eclipse.cdt.core.CBuildConsole">
+      <CBuildConsole
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.CConfigureConsole"
+            id="org.eclipse.linuxtools.cdt.autotools.configureConsole"/>
+      <CBuildConsole
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.CBuildStepsConsole"
+            id="org.eclipse.linuxtools.cdt.autotools.buildStepsConsole">
+      </CBuildConsole>
+      <CBuildConsole
+            class="org.eclipse.linuxtools.internal.cdt.autotools.ui.AutotoolsConsole"
+            id="org.eclipse.linuxtools.cdt.autotools.autotoolsConsole">
+      </CBuildConsole>
+   </extension>
+   <extension
+         point="org.eclipse.ui.propertyPages">
+      <page
+            class="org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyPage"
+            id="org.eclipse.linuxtools.cdt.autotools.propertypage"
+            name="%PropertyAutotools.name"
+            >
+         <filter
+               name="projectNature"
+               value="org.eclipse.linuxtools.cdt.autotools.autotoolsNature">
+         </filter>
+         <enabledWhen>
+            <or>
+		     <instanceof value="org.eclipse.core.resources.IProject"/>
+		     <instanceof value="org.eclipse.cdt.core.model.ICProject"/>
+		     
+		     <instanceof value="org.eclipse.core.resources.IFolder"/>
+		     <instanceof value="org.eclipse.cdt.core.model.ICContainer"/>
+
+             <instanceof value="org.eclipse.core.resources.IFile"/>
+          	 <instanceof value="org.eclipse.cdt.core.model.ITranslationUnit"/>
+		    </or>          
+         </enabledWhen>
+      </page>
+   </extension>
+   <extension
+         point="org.eclipse.cdt.ui.cPropertyTab">
+      <tab
+            class="org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsBuildPropertyPage"
+            icon="icons/autoconf.gif"
+            name="%AutotoolsBuildPropertyTab.name"
+            parent="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"
+            tooltip="%PropertyTabBuild.tooltip"
+            weight="002">
+      </tab>
+      <tab
+            class="org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsEditorPropertyPage"
+            name="%AutotoolsEditorsPropertyTab.name"
+            parent="org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyPage">
+      </tab>
+      <tab
+            class="org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsToolsPropertyPage"
+            name="%AutotoolsToolsPropertyTab.name"
+            parent="org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyPage">
+      </tab>
+   </extension>
+     <extension
+          point="org.eclipse.core.contenttype.contentTypes">
+       <content-type
+             id="org.eclipse.linuxtools.cdt.autotools.configureScript"
+             name="%ConfigureScript.name"
+             priority="high">
+       </content-type>
+       <content-type
+             id="org.eclipse.linuxtools.cdt.autotools.autogenScript"
+             name="%AutogenScript.name"
+             priority="high">
+       </content-type>
+       <file-association
+             content-type="org.eclipse.linuxtools.cdt.autotools.configureScript"
+             file-names="configure">
+       </file-association>
+       <file-association
+             content-type="org.eclipse.linuxtools.cdt.autotools.autogenScript"
+             file-names="autogen.sh">
+       </file-association>
+    </extension>
+ </plugin>
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsBuilder.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsBuilder.java
new file mode 100644
index 0000000..f51c2b6
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsBuilder.java
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools;
+
+import org.eclipse.cdt.core.settings.model.COutputEntry;
+import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
+import org.eclipse.cdt.core.settings.model.ICOutputEntry;
+import org.eclipse.cdt.managedbuilder.core.IBuilder;
+import org.eclipse.cdt.managedbuilder.internal.core.Builder;
+import org.eclipse.cdt.managedbuilder.internal.core.ToolChain;
+import org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyConstants;
+
+
+
+// Proxy class for IBuilder to allow overriding of getBuildLocation().
+
+@SuppressWarnings("restriction")
+public class AutotoolsBuilder extends Builder {
+
+	private String buildPath;
+	private IProject project;
+	
+	public AutotoolsBuilder(IBuilder builder, IProject project, ToolChain toolChain) {
+		super(toolChain, builder.getId(), builder.getName(), (Builder)builder);
+		this.project = project;
+	}
+	
+	protected IProject getProject() {
+		return project;
+	}
+	
+
+	public String getBuildPath() {
+		// TODO Auto-generated method stub
+		return buildPath;
+	}
+
+
+	public void setBuildPath(String path) {
+		// TODO Auto-generated method stub
+		this.buildPath = path;
+	}
+
+	public String getCleanBuildTarget() {
+		String target = null;
+		try {
+			target = getProject().getPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET);
+		} catch (CoreException ce) {
+			// do nothing
+		}
+		if (target == null)
+			target = AutotoolsPropertyConstants.CLEAN_MAKE_TARGET_DEFAULT;
+		return target;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.managedbuilder.core.IBuilder#getBuildFileGenerator()
+	 */
+	public IManagedBuilderMakefileGenerator getBuildFileGenerator() {
+		return new MakeGenerator();
+	}
+
+	/* @override */
+	public ICOutputEntry[] getOutputEntries() {
+		return new ICOutputEntry[]{new COutputEntry(buildPath, null, ICLanguageSettingEntry.VALUE_WORKSPACE_PATH | ICLanguageSettingEntry.RESOLVED)};
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsDefaultBuildDirHandler.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsDefaultBuildDirHandler.java
new file mode 100644
index 0000000..e1a3e5a
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsDefaultBuildDirHandler.java
@@ -0,0 +1,155 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools;
+
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.eclipse.cdt.managedbuilder.core.BuildException;
+import org.eclipse.cdt.managedbuilder.core.IBuildObject;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IHoldsOptions;
+import org.eclipse.cdt.managedbuilder.core.IManagedOptionValueHandler;
+import org.eclipse.cdt.managedbuilder.core.IOption;
+import org.eclipse.cdt.managedbuilder.core.IOptionApplicability;
+import org.eclipse.cdt.managedbuilder.core.ITool;
+import org.eclipse.cdt.managedbuilder.core.ManagedOptionValueHandler;
+
+public class AutotoolsDefaultBuildDirHandler extends ManagedOptionValueHandler 
+	implements IOptionApplicability {
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.managedbuilder.core.IManagedOptionValueHandler#handleValue(IConfiguration,IToolChain,IOption,String,int)
+	 */
+	
+	public final static String DEFAULT_BUILD_DIR = "build"; //$NON-NLS-1$
+	public final static String CONFIGURE_TOOL_ID = "org.eclipse.linuxtools.cdt.autotools.gnu.toolchain.tool.configure"; //$NON-NLS-1$
+	public final static String BUILD_DIR_OPTION_ID = "org.eclipse.linuxtools.cdt.autotools.option.configure.builddir"; //$NON-NLS-1$
+	public final static String BUILD_DIR_APPLY = "BuildDir.apply"; //$NON-NLS-1$
+	public final static String BUILD_DIR_DEFAULT_QUESTION = "BuildDir.default"; //$NON-NLS-1$
+	public final static String BUILD_DIR_YES = "BuildDir.yes"; //$NON-NLS-1$
+	public final static String BUILD_DIR_NO = "BuildDir.no"; //$NON-NLS-1$
+
+	//FIXME: Use holder to set option value, not the "option" parameter
+	public boolean handleValue(IBuildObject buildObject, 
+                   IHoldsOptions holder, 
+                   IOption option,
+                   String extraArgument, int event)
+	{
+		// Get the current value of the build dir option.
+		String value = (String)option.getValue();
+		String valueBase = value;
+
+		if (buildObject instanceof IConfiguration &&
+				(event == IManagedOptionValueHandler.EVENT_OPEN)) {
+//						|| event == IManagedOptionValueHandler.EVENT_APPLY)) {
+			SortedSet<Integer> nums = new TreeSet<Integer>();
+			IConfiguration configuration = (IConfiguration)buildObject;
+			IConfiguration[] cfgs = configuration.getManagedProject().getConfigurations();
+			int index = 1;
+			boolean valueFound = false;
+			for (int i = 0; i < cfgs.length; ++i) {
+				IConfiguration config = cfgs[i];
+				if (config == null || config.getName().equals(configuration.getName())) {
+					continue;
+				}
+				ITool tool = config.getToolFromOutputExtension("status");  //$NON-NLS-1$
+				if (tool == null) // can happen if user has purposely mixed autotools and non-autotools cfgs
+					continue;
+				
+				// We now want to get the builddir option for the tool.  If we use
+				// getOptionById(), we must know the full id which in our case has a generated
+				// numeric extension at the end.  Otherwise, the base builddir option id
+				// will get us the default option, not the one for the configuration we
+				// are currently looking at.  We use getOptionBySuperClassId() instead
+				// which will find us options that are based off the original builddir
+				// option which include those with generated extensions at the end.
+				IOption buildDirOption = tool.getOptionBySuperClassId(BUILD_DIR_OPTION_ID);
+				String buildDir = (String)buildDirOption.getValue();
+				if (buildDir.equals(value)) {
+					valueFound = true;
+				}
+				// For "buildXX" values, store the XX values in a list of used extensions.
+				if (buildDir.startsWith(DEFAULT_BUILD_DIR)) {
+					String numstr = buildDir.substring(DEFAULT_BUILD_DIR.length());
+					try {
+						Integer k = Integer.valueOf(numstr);
+						// Assume the value to start with is the last value in the list
+						// plus 1.
+						index = k.intValue() + 1;
+						nums.add(k);
+					} catch (NumberFormatException e) {
+						// ignore
+					}
+				}
+			}
+			
+			// If there is no name collision for the configurations, then we simply return.
+			if (!valueFound)
+				return true;
+			
+//			// If the user has applied a change and it matches an existing build directory,
+//			// then warn and ask if the user wants the value defaulted to a safe value.
+//			if (event == EVENT_APPLY) {
+//				String title = AutotoolsPlugin.getResourceString(BUILD_DIR_APPLY);
+//				String question = AutotoolsPlugin.getResourceString(BUILD_DIR_DEFAULT_QUESTION);
+//				String[] buttonLabels = new String[2];
+//				buttonLabels[0] = AutotoolsPlugin.getResourceString(BUILD_DIR_YES);
+//				buttonLabels[1] = AutotoolsPlugin.getResourceString(BUILD_DIR_NO);
+//				MessageDialog d = new MessageDialog(AutotoolsPlugin.getActiveWorkbenchShell(),
+//						title, null, question, MessageDialog.QUESTION, buttonLabels, 0);
+//				int result = d.open();
+//				if (result == 1)
+//					return true;
+//			}
+			
+			// For defaulted buildXX values, we support defaulting a unique XX value.
+			if (value.startsWith(DEFAULT_BUILD_DIR)) {
+				valueBase = DEFAULT_BUILD_DIR;
+				// Try and establish a unique "buildXX" name that hasn't been used yet.
+				while (nums.contains(Integer.valueOf(index))) {
+					++index;
+				}
+			}
+			
+			// Reset the default build directory for this opened configuration.
+			try {
+				IOption optionToSet = holder.getOptionToSet(option, false);
+				optionToSet.setValue(valueBase + index);
+			} catch (BuildException e) {
+				return false;
+			}
+		}
+		
+		// The event was not handled, thus return false
+		return true;
+	}
+	
+	// IOptionApplicability methods
+	
+	public boolean isOptionEnabled(IBuildObject configuration,
+			IHoldsOptions holder, IOption option) {
+		return true;
+	}
+
+	public boolean isOptionUsedInCommandLine(IBuildObject configuration,
+			IHoldsOptions holder, IOption option) {
+		return false;
+	}
+
+	public boolean isOptionVisible(IBuildObject configuration,
+			IHoldsOptions holder, IOption option) {
+		if (option.getName().equals("includes") || option.getName().equals("symbols"))
+			return false;
+		return true;
+	}
+
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java
new file mode 100644
index 0000000..198d89d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsMakefileBuilder.java
@@ -0,0 +1,512 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2005, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Rational Software - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.CommandLauncher;
+import org.eclipse.cdt.core.ConsoleOutputStream;
+import org.eclipse.cdt.core.envvar.IEnvironmentVariable;
+import org.eclipse.cdt.core.resources.IConsole;
+import org.eclipse.cdt.make.core.IMakeCommonBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.IBuilder;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.IManagedProject;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
+import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
+import org.eclipse.cdt.managedbuilder.internal.core.Builder;
+import org.eclipse.cdt.managedbuilder.internal.core.CommonBuilder;
+import org.eclipse.cdt.managedbuilder.internal.core.ToolChain;
+import org.eclipse.cdt.managedbuilder.macros.BuildMacroException;
+import org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider;
+import org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyConstants;
+
+
+/**
+ * This is the incremental builder associated with a managed build project. It dynamically 
+ * decides the makefile generator it wants to use for a specific target.
+ * 
+ * @since 1.2 
+ */
+@SuppressWarnings("restriction")
+public class AutotoolsMakefileBuilder extends CommonBuilder {
+	public static final String BUILDER_NAME = "genmakebuilder"; //$NON-NLS-1$
+	public static final String BUILDER_ID = AutotoolsPlugin.getUniqueIdentifier() + "." + BUILDER_NAME; //$NON-NLS-1$
+	public static final String MANAGED_BUILDER_ID = ManagedBuilderCorePlugin.getUniqueIdentifier() + "." + BUILDER_NAME; //$NON-NLS-1$
+	public static final String AUTOTOOLS_CONFIG_ID = AutotoolsPlugin.getUniqueIdentifier() + ".configuration.build"; //$NON-NLS-1$
+	public static final String AUTOTOOLS_PROJECT_TYPE_ID = AutotoolsPlugin.getUniqueIdentifier() + ".projectType"; //$NON-NLS-1$
+	
+	private static final String BUILD_FINISHED = "AutotoolsMakefileBuilder.message.finished";	//$NON-NLS-1$
+	private static final String TYPE_CLEAN = "AutotoolsMakefileBuilder.type.clean";	//$NON-NLS-1$
+	private static final String CONSOLE_HEADER = "AutotoolsMakefileBuilder.message.console.header";	//$NON-NLS-1$
+
+	private static final String EMPTY_STRING = new String();
+	public final String WHITESPACE = " ";	//$NON-NLS-1$
+
+	protected boolean buildCalled;
+	
+	private String makeTargetName;
+
+	@SuppressWarnings("unused")
+	private String preBuildErrMsg = new String();
+	@SuppressWarnings("unused")
+	private String postBuildErrMsg = new String();
+
+	public static String getBuilderId() {
+		return BUILDER_ID;
+	}
+	
+	public static boolean hasTargetBuilder(IProject project) {
+		try {
+			// When a project is converted to an Autotools project, we
+			// replace the ManagedMake builder with a special one that
+			// handles MakeTargets.  If a project is brought into Eclipse and
+			// uses the New Project Wizard to create a ManagedMake project that
+			// is of type: Autotools, this added step is not done.  If we know
+			// we have an Autotools project from the configuration id, then
+			// we should add the builder now.  We also should replace the
+			// default ManagedMake scanner provider with the Autotools one,
+			// then return true.
+			if (project.getNature(ManagedCProjectNature.MNG_NATURE_ID) != null) {
+				IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+				IManagedProject m = info.getManagedProject();
+				if (m != null && m.getProjectType().getId().equals(AUTOTOOLS_PROJECT_TYPE_ID)) {
+					AutotoolsProjectNature.addAutotoolsBuilder(project, new NullProgressMonitor());
+					AutotoolsPlugin.verifyScannerInfoProvider(project);
+					return true;
+				}
+			}
+		} catch (CoreException e) {
+			// Don't care...fall through to not found.
+		} catch (Exception f) {
+			// Don't care...fall through to not found.
+		}
+		// Otherwise not found.
+		return false;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.internal.events.InternalBuilder#build(int, java.util.Map, org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	@SuppressWarnings({ "unchecked", "deprecation" })
+	protected IProject[] build(int kind, Map args, IProgressMonitor monitor) throws CoreException {
+		IProject[] results = null;
+		IProject project = getProject();
+		IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+		IManagedBuilderMakefileGenerator generator = null;
+		try {
+			// Figure out the working directory for the build and make sure there is a makefile there
+			// If not, mark a rebuild is required so that configuration will get
+			// invoked.
+			IWorkspace workspace = project.getWorkspace();
+			if (workspace != null) {
+				IWorkspaceRoot root = workspace.getRoot();
+				if (root != null) {
+					if (info.getDefaultConfiguration() == null)
+						return null;
+					generator = new MakeGenerator();
+					generator.initialize(getProject(), info, monitor);
+					IPath buildDir = project.getLocation().append(generator.getBuildWorkingDir());
+					IPath makefilePath = buildDir.append(generator.getMakefileName());
+					IFile makefile = root.getFileForLocation(makefilePath);
+					if (makefile == null || !makefile.exists()) {
+						info.setRebuildState(true);
+					}
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			makeTargetName = (String)args.get("org.eclipse.cdt.make.core.build.target.inc"); //$NON-NLS-1$
+			
+			buildCalled = true;
+			/**
+			 * @see IncrementalProjectBuilder#build
+			 */
+//			fBuildSet.start(this);
+
+			// Hijack the build.  This is because the CommonBuilder code will
+			// try and create builders for a MakeTarget build.  We don't want
+			// that because this will default to using the GnuMakefileGenerator
+			// which fails.  We want to use our Autotools MakeGenerator and
+			// perform a make from the top-level.
+			if(VERBOSE)
+				outputTrace(project.getName(), ">>build requested, type = " + kind); //$NON-NLS-1$
+			
+			IConfiguration cfg = info.getDefaultConfiguration();
+
+			// Assemble the information needed to generate the targets
+			String prebuildStep = cfg.getPrebuildStep();
+			try{
+				//try to resolve the build macros in the prebuild step
+				prebuildStep = ManagedBuildManager.getBuildMacroProvider().resolveValueToMakefileFormat(
+						prebuildStep,
+						EMPTY_STRING,
+						WHITESPACE,
+						IBuildMacroProvider.CONTEXT_CONFIGURATION,
+						cfg);
+			} catch (BuildMacroException e){
+			}
+			prebuildStep = prebuildStep.trim(); // Remove leading and trailing whitespace (and control characters)
+
+			String postbuildStep = cfg.getPostbuildStep();
+			try{
+				//try to resolve the build macros in the postbuild step
+				postbuildStep = ManagedBuildManager.getBuildMacroProvider().resolveValueToMakefileFormat(
+						postbuildStep,
+						EMPTY_STRING,
+						WHITESPACE,
+						IBuildMacroProvider.CONTEXT_CONFIGURATION,
+						cfg);
+					
+			} catch (BuildMacroException e){
+			}
+			postbuildStep = postbuildStep.trim(); // Remove leading and trailing whitespace (and control characters)
+			String preannouncebuildStep = cfg.getPreannouncebuildStep();
+			String postannouncebuildStep = cfg.getPostannouncebuildStep();
+
+			IConsole console = null;
+			ConsoleOutputStream consoleOutStream = null;
+			CommandLauncher launcher = null;
+			String[] env = null;
+			Process proc = null;
+			OutputStream stdout = null;
+			OutputStream stderr = null;
+			
+			// If we have a prebuild or postbuild step, set up a command launcher to use.
+			if (!prebuildStep.equals("") || !postbuildStep.equals("")) {
+				console = CCorePlugin.getDefault().getConsole("org.eclipse.linuxtools.cdt.autotools.buildStepsConsole"); // $NON-NLS-1$
+				console.start(project);
+				consoleOutStream = console.getOutputStream();
+				stdout = consoleOutStream;
+				stderr = consoleOutStream;
+				launcher = new CommandLauncher();
+				// Set the environment
+				IEnvironmentVariable variables[] = ManagedBuildManager
+						.getEnvironmentVariableProvider().getVariables(cfg, true);
+				ArrayList<String> envList = new ArrayList<String>();
+				if (variables != null) {
+					for (int i = 0; i < variables.length; i++) {
+						envList.add(variables[i].getName()
+								+ "=" + variables[i].getValue()); //$NON-NLS-1$
+					}
+					env = (String[]) envList.toArray(new String[envList.size()]);
+				}
+			}
+			
+			// Check for a prebuild step and execute it if it exists.
+			if (!prebuildStep.equals("")) {
+				monitor.subTask(preannouncebuildStep);
+
+				StringBuffer buffer = new StringBuffer();
+				buffer.append(preannouncebuildStep);
+				buffer.append(System.getProperty("line.separator", "\n")); // $NON-NLS-1$ // $NON-NLS-2$
+
+				try {
+					consoleOutStream.write(buffer.toString().getBytes());
+					consoleOutStream.flush();
+				} catch (IOException e) {
+					// do nothing
+				}
+
+				launcher.showCommand(true);
+				String[] tmp = prebuildStep.split("\\s");
+				String[] cmdargs = new String[tmp.length - 1];
+				if (tmp.length > 1)
+					System.arraycopy(tmp, 1, cmdargs, 0, tmp.length - 1);
+				proc = launcher.execute(new Path(tmp[0]), cmdargs, env,
+						project.getLocation().append(generator.getBuildWorkingDir()), monitor);
+				if (proc != null) {
+					try {
+						// Close the input of the process since we will never write to
+						// it
+						proc.getOutputStream().close();
+					} catch (IOException e) {
+					}
+
+					if (launcher.waitAndRead(stdout, stderr, new SubProgressMonitor(
+							monitor, IProgressMonitor.UNKNOWN)) != CommandLauncher.OK) {
+						preBuildErrMsg = launcher.getErrorMessage();
+					}
+				}
+			}
+
+			// Perform build
+
+			ToolChain toolChain = (ToolChain)cfg.getToolChain();
+			IBuilder oldBuilder = cfg.getBuilder();
+			String workingDir = generator.getBuildWorkingDir().toString();
+			IPath location = project.getLocation().append(workingDir);
+			oldBuilder.setBuildPath(location.toString());	
+			oldBuilder.setBuildFileGeneratorElement(AutotoolsPlugin.getDefault().getGeneratorElement());
+			IBuilder builder = new AutotoolsBuilder(cfg.getEditableBuilder(), project, toolChain);
+			String buildLocation = null;
+			String buildCommand = null;
+			String buildArguments = null;
+			if (makeTargetName != null) {
+				// We have a MakeTarget.  Get the location and command.
+				buildLocation = (String)args.get("org.eclipse.cdt.make.core.build.location"); // $NON-NLS-1$
+				buildCommand = (String)args.get("org.eclipse.cdt.make.core.build.command"); // $NON-NLS-1$
+				buildArguments = (String)args.get("org.eclipse.cdt.make.core.build.arguments"); // $NON-NLS-1$
+			}
+			if (buildLocation == null) {
+				builder.setBuildPath(location.toString());
+			}
+			else {
+				IWorkspace workspace = project.getWorkspace();
+				builder.setBuildPath(workspace.getRoot().getLocation().append(buildLocation).toString());
+				builder.setManagedBuildOn(false); // needed to avoid ManagedBuild from defaulting directory of makefile.
+			}
+			if (buildCommand != null)
+				builder.setBuildAttribute(IMakeCommonBuildInfo.BUILD_COMMAND, buildCommand);
+			if (buildArguments != null)
+				builder.setBuildAttribute(IMakeCommonBuildInfo.BUILD_ARGUMENTS, buildArguments);
+			builder.setAutoBuildEnable(true);
+			builder.setCleanBuildEnable(false); // Don't want clean build done ahead of our build.
+			// Following is needed to circumvent the CommonBuilder from using the default
+			// GNUMakefileGenerator.
+			builder.setBuildFileGeneratorElement(AutotoolsPlugin.getDefault().getGeneratorElement());
+			toolChain.setBuilder((Builder)builder);
+			
+			IProject[] projects = null;
+			try {
+				projects = super.build(kind, args, monitor);
+			} finally {
+				// Must ensure we reset everything back so configuration will be run in future.
+				toolChain.setBuilder((Builder)oldBuilder);
+			}
+
+			if(VERBOSE)
+				outputTrace(project.getName(), "<<done build requested, type = " + kind); //$NON-NLS-1$
+
+			results = projects;
+			buildCalled = false;
+			// Check for a postbuild step and execute it if it exists.
+			if (!postbuildStep.equals("")) {
+				monitor.subTask(postannouncebuildStep);
+				StringBuffer buffer = new StringBuffer();
+				buffer.append(postannouncebuildStep);
+				buffer.append(System.getProperty("line.separator", "\n")); // $NON-NLS-1$ // $NON-NLS-2$
+
+				try {
+					consoleOutStream.write(buffer.toString().getBytes());
+					consoleOutStream.flush();
+				} catch (IOException e) {
+					// do nothing
+				}
+				String[] tmp = postbuildStep.split("\\s");
+				String[] cmdargs = new String[tmp.length - 1];
+				if (tmp.length > 1)
+					System.arraycopy(tmp, 1, cmdargs, 0, tmp.length - 1);
+				proc = launcher.execute(new Path(tmp[0]), cmdargs, env,
+						project.getLocation().append(generator.getBuildWorkingDir()), monitor);
+				if (proc != null) {
+					try {
+						// Close the input of the process since we will never write to
+						// it
+						proc.getOutputStream().close();
+					} catch (IOException e) {
+					}
+
+					if (launcher.waitAndRead(stdout, stderr, new SubProgressMonitor(
+							monitor, IProgressMonitor.UNKNOWN)) != CommandLauncher.OK) {
+						postBuildErrMsg = launcher.getErrorMessage();
+					}
+				}
+			}
+		}
+		return results;
+	}
+
+	@SuppressWarnings({ "unchecked", "deprecation" })
+	protected void clean(IProgressMonitor monitor) throws CoreException {
+		// See what type of cleaning the user has set up in the
+		// build properties dialog.
+		String cleanDelete = null;
+		try {
+			cleanDelete = getProject().getPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE);
+		} catch (CoreException ce) {
+			// do nothing
+		}
+		
+		if (cleanDelete != null && cleanDelete.equals(AutotoolsPropertyConstants.TRUE))
+			removeBuildDir(monitor);
+		else {
+			IProject project = getProject();
+			IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+			IConfiguration cfg = info.getDefaultConfiguration();
+			IManagedBuilderMakefileGenerator generator = new MakeGenerator();
+			generator.initialize(getProject(), info, monitor);
+
+//			// Hijack the builder itself so that instead of ManagedMake
+//			// policy of defaulting the build path to the configuration name,
+//			// we get the build occurring in the builddir configure tool setting.
+//			builders[0] = new AutotoolsBuilder(cfg.getEditableBuilder(), project);
+//			builders[0].setBuildPath(project.getLocation().append(generator.getBuildWorkingDir()).toOSString());
+//			builders[0].setAutoBuildEnable(true);
+//			builders[0].setCleanBuildEnable(true);
+//			builders[0].setManagedBuildOn(false);
+
+			ToolChain toolChain = (ToolChain)cfg.getToolChain();
+			IBuilder oldBuilder = cfg.getBuilder();
+			IBuilder builder = new AutotoolsBuilder(cfg.getEditableBuilder(), project, toolChain);
+			builder.setBuildPath(project.getLocation().append(generator.getBuildWorkingDir()).toOSString());
+			builder.setAutoBuildEnable(true);
+			builder.setCleanBuildEnable(true);
+			builder.setManagedBuildOn(false);
+			// Following is needed to circumvent the CommonBuilder from using the default
+			// GNUMakefileGenerator.
+			builder.setBuildFileGeneratorElement(AutotoolsPlugin.getDefault().getGeneratorElement());
+			toolChain.setBuilder((Builder)builder);
+			
+			try {
+				super.build(CLEAN_BUILD, (Map)null, monitor);
+			} finally {
+				toolChain.setBuilder((Builder)oldBuilder);
+			}
+		}
+	}
+
+	protected void removeBuildDir(IProgressMonitor monitor) {
+		try {
+			// use brute force approach
+			IProject project = getProject();
+			IWorkspace workspace = AutotoolsPlugin.getWorkspace();
+			IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+			IConfiguration cfg = info.getDefaultConfiguration();
+			IManagedBuilderMakefileGenerator generator = new MakeGenerator();
+			generator.initialize(getProject(), info, monitor);
+			String buildPath = project.getFullPath().append(generator.getBuildWorkingDir()).toOSString();
+			IResource rc = workspace.getRoot().findMember(buildPath);
+			if (rc == null || rc.getType() != IResource.FOLDER)
+				return;
+			IFolder buildDir = (IFolder)rc;
+			String status = AutotoolsPlugin.getFormattedString("AutotoolsMakefileBuilder.message.clean.deleting.output", new String[]{buildDir.getName()});	//$NON-NLS-1$
+			monitor.subTask(status);
+			workspace.delete(new IResource[]{buildDir}, true, monitor);
+			StringBuffer buf = new StringBuffer();
+			// write to the console
+
+//			IConsole console = CCorePlugin.getDefault().getConsole();
+//			console.start(getProject());
+			// Get a build console for the project
+			IConsole console = CCorePlugin.getDefault().getConsole();
+			console.start(project);
+//			IConsole console = bInfo.getConsole();
+			ConsoleOutputStream consoleOutStream = console.getOutputStream();
+			String[] consoleHeader = new String[3];
+			consoleHeader[0] = AutotoolsPlugin.getResourceString(TYPE_CLEAN);
+			consoleHeader[1] = cfg.getName();
+			consoleHeader[2] = project.getName();
+			buf.append(System.getProperty("line.separator", "\n"));	//$NON-NLS-1$	//$NON-NLS-2$
+			buf.append(AutotoolsPlugin.getFormattedString(CONSOLE_HEADER, consoleHeader));
+			buf.append(System.getProperty("line.separator", "\n"));	//$NON-NLS-1$	//$NON-NLS-2$
+			consoleOutStream.write(buf.toString().getBytes());
+			consoleOutStream.flush();
+			buf = new StringBuffer();
+			// Report a successful clean
+			String successMsg = AutotoolsPlugin.getFormattedString(BUILD_FINISHED, new String[]{project.getName()});
+			buf.append(successMsg);
+			buf.append(System.getProperty("line.separator", "\n"));  //$NON-NLS-1$//$NON-NLS-2$
+			consoleOutStream.write(buf.toString().getBytes());
+			consoleOutStream.flush();
+			consoleOutStream.close();
+		}  catch (IOException io) {
+			//  Ignore console failures...
+		}  catch (CoreException e) {
+			//  Ignore console failures...		
+		}
+	}
+
+	/* (non-javadoc)
+	 * Answers an array of strings with the proper make targets
+        * for a build with no custom prebuild/postbuild steps 
+	 * 
+	 * @param fullBuild
+	 * @return
+	 */
+	protected String[] getTargets(int kind, IBuilder builder) {
+		List<String> args = new ArrayList<String>();
+		String buildTarget = "all";
+		switch (kind) {
+			case CLEAN_BUILD:
+				// For a clean build, we use the clean make target set up by the user
+				// in the build properties dialog.  Otherwise, we use the default for
+				// an autotools project.
+				String target = null;
+				try {
+					target = getProject().getPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET);
+				} catch (CoreException ce) {
+					// do nothing
+				}
+				if (target == null)
+					target = AutotoolsPropertyConstants.CLEAN_MAKE_TARGET_DEFAULT;
+				args.add(target);
+				break;
+			case FULL_BUILD:
+				if (makeTargetName != null)
+					buildTarget = makeTargetName;
+			case AUTO_BUILD:
+			case INCREMENTAL_BUILD:
+				args.addAll(makeArrayList(buildTarget));
+				break;
+		}
+		return (String[])args.toArray(new String[args.size()]);
+	}
+
+	// Turn the string into an array.
+	ArrayList<String> makeArrayList(String string) {
+		string.trim();
+		char[] array = string.toCharArray();
+		ArrayList<String> aList = new ArrayList<String>();
+		StringBuffer buffer = new StringBuffer();
+		boolean inComment = false;
+		for (int i = 0; i < array.length; i++) {
+			char c = array[i];
+			if (array[i] == '"' || array[i] == '\'') {
+				if (i > 0 && array[i - 1] == '\\') {
+					inComment = false;
+				} else {
+					inComment = !inComment;
+				}
+			}
+			if (c == ' ' && !inComment) {
+				aList.add(buffer.toString());
+				buffer = new StringBuffer();
+			} else {
+				buffer.append(c);
+			}
+		}
+		if (buffer.length() > 0)
+			aList.add(buffer.toString());
+		return aList;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java
new file mode 100644
index 0000000..5e2e495
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsPlugin.java
@@ -0,0 +1,324 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools;
+
+import java.lang.reflect.InvocationTargetException;
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.ICDescriptor;
+import org.eclipse.cdt.core.ICExtensionReference;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The main plugin class to be used in the desktop.
+ */
+@SuppressWarnings("deprecation")
+public class AutotoolsPlugin extends AbstractUIPlugin {
+
+	//The shared instance.
+	private static AutotoolsPlugin plugin;
+	private ResourceBundle resourceBundle;
+	
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.cdt.autotools"; //$NON-NLS-1$
+
+	private IConfigurationElement generatorElement;
+
+	public static final String EXTENSION_POINT_ID = ManagedBuilderCorePlugin.getUniqueIdentifier() + ".buildDefinitions";		//$NON-NLS-1$
+	public static final String BUILDER = "builder";   //$NON-NLS-1$
+	public static final String ID_ELEMENT_NAME = "id"; // $NON-NLS-1$
+	public static final String AUTOTOOLS_BUILDER_ID = PLUGIN_ID + ".builder"; // $NON-NLS-1$
+	
+	/**
+	 * The constructor.
+	 */
+	public AutotoolsPlugin() {
+		plugin = this;
+		try {
+			resourceBundle = ResourceBundle.getBundle("org.eclipse.linuxtools.cdt.autotools.Resources"); //$NON-NLS-1$
+		} catch (MissingResourceException x) {
+			resourceBundle = null;
+		}
+
+	}
+
+	public static String getPluginId() {
+		return PLUGIN_ID;
+	}
+	
+	public static String getUniqueIdentifier() {
+		if (getDefault() == null) {
+			// If the default instance is not yet initialized,
+			// return a static identifier. This identifier must
+			// match the plugin id defined in plugin.xml
+			return PLUGIN_ID;
+		}
+		return getDefault().getBundle().getSymbolicName();
+	}
+
+	public static void verifyScannerInfoProvider(IProject project) throws CoreException {
+		boolean found = false;
+		ICDescriptor desc = CCorePlugin.getDefault().getCProjectDescription(project, true);
+        ICExtensionReference[] refs = desc.get(CCorePlugin.BUILD_SCANNER_INFO_UNIQ_ID);
+        for (int i = 0; i < refs.length; ++i) {
+        	if (refs[i].getID().equals(AutotoolsScannerInfoProvider.INTERFACE_IDENTITY))
+        		found = true;
+        }
+        if (!found) {
+        	setScannerInfoProvider(project);
+        }
+	}
+	
+	public static void setScannerInfoProvider(IProject project) throws CoreException {
+		ICDescriptor desc = CCorePlugin.getDefault().getCProjectDescription(project, true);
+		desc.remove(CCorePlugin.BUILD_SCANNER_INFO_UNIQ_ID);
+		desc.create(CCorePlugin.BUILD_SCANNER_INFO_UNIQ_ID, AutotoolsScannerInfoProvider.INTERFACE_IDENTITY);
+	}
+
+	/**
+	 * This method is called upon plug-in activation
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+	}
+
+	/**
+	 * This method is called when the plug-in is stopped
+	 */
+	public void stop(BundleContext context) throws Exception {
+		super.stop(context);
+		plugin = null;
+	}
+
+	/**
+	 * Returns the shared instance.
+	 */
+	public static AutotoolsPlugin getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Returns active shell.
+	 */
+	public static Shell getActiveWorkbenchShell() {
+		IWorkbenchWindow window = getDefault().getWorkbench().getActiveWorkbenchWindow();
+		if (window != null) {
+			return window.getShell();
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the string from the plugin's resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @return the resource bundle message
+	 */
+	public static String getResourceString(String key) {
+		ResourceBundle bundle = AutotoolsPlugin.getDefault().getResourceBundle();
+		try {
+			return bundle.getString(key);
+		} catch (MissingResourceException e) {
+			return key;
+		}
+	}
+
+	/**
+	 * Returns the string from the plugin's resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @param args an array of substituition strings
+	 * @return the resource bundle message
+	 */
+	public static String getFormattedString(String key, String[] args) {
+		return MessageFormat.format(getResourceString(key), (Object[])args);
+	}
+
+	/**
+	 * Returns the plugin's resource bundle,
+	 */
+	public ResourceBundle getResourceBundle() {
+		return resourceBundle;
+	}
+
+	/**
+	 * Get the configuration element for the Autotools Makefile generator
+	 * @return the generator element
+	 */
+	public IConfigurationElement getGeneratorElement() {
+		if (generatorElement == null) {
+			IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(EXTENSION_POINT_ID);
+			if( extensionPoint != null) {
+				IExtension[] extensions = extensionPoint.getExtensions();
+				if (extensions != null) {
+					for (int i = 0; i < extensions.length; ++i) {
+						IExtension extension = extensions[i];
+				
+						IConfigurationElement[] elements = extension.getConfigurationElements();
+						
+						// Get the managedBuildRevsion of the extension.
+						for (int j = 0; j < elements.length; j++) {
+							IConfigurationElement element = elements[j];
+							if (element.getName().equals(BUILDER)) {
+								String id = element.getAttribute(ID_ELEMENT_NAME);
+								if (id.equals(AUTOTOOLS_BUILDER_ID)) {
+									generatorElement = element;
+									break;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		return generatorElement;
+	}
+	
+	/**
+	 * Returns an image descriptor for the image file at the given
+	 * plug-in relative path.
+	 *
+	 * @param path the path
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.linuxtools.cdt.autotools", path);
+	}
+	
+	public static void log(IStatus status) {
+		ResourcesPlugin.getPlugin().getLog().log(status);
+	}
+
+	public static void logErrorMessage(String message) {
+		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, message, null));
+	}
+
+	public static void logException(Throwable e, final String title, String message) {
+		if (e instanceof InvocationTargetException) {
+			e = ((InvocationTargetException) e).getTargetException();
+		}
+		IStatus status = null;
+		if (e instanceof CoreException)
+			status = ((CoreException) e).getStatus();
+		else {
+			if (message == null)
+				message = e.getMessage();
+			if (message == null)
+				message = e.toString();
+			status = new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.OK, message, e);
+		}
+		ResourcesPlugin.getPlugin().getLog().log(status);
+		Display display;
+		display = Display.getCurrent();
+		if (display == null)
+			display = Display.getDefault();
+		final IStatus fstatus = status;
+		display.asyncExec(new Runnable() {
+			public void run() {
+				ErrorDialog.openError(null, title, null, fstatus);
+			}
+		});
+	}
+
+	public static void logException(Throwable e) {
+		logException(e, null, null);
+	}
+
+	public static void log(Throwable e) {
+		if (e instanceof InvocationTargetException)
+			e = ((InvocationTargetException) e).getTargetException();
+		IStatus status = null;
+		if (e instanceof CoreException)
+			status = ((CoreException) e).getStatus();
+		else
+			status = new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.OK, e.getMessage(), e);
+		log(status);
+	}
+
+	/**
+	* Utility method with conventions
+	*/
+	public static void errorDialog(Shell shell, String title, String message, IStatus s) {
+		log(s);
+		// if the 'message' resource string and the IStatus' message are the same,
+		// don't show both in the dialog
+		if (s != null && message.equals(s.getMessage())) {
+			message = null;
+		}
+		ErrorDialog.openError(shell, title, message, s);
+	}
+
+	/**
+	* Utility method with conventions
+	*/
+	public static void errorDialog(Shell shell, String title, String message, Throwable t) {
+		log(t);
+		IStatus status;
+		if (t instanceof CoreException) {
+			status = ((CoreException) t).getStatus();
+			// if the 'message' resource string and the IStatus' message are the same,
+			// don't show both in the dialog
+			if (status != null && message.equals(status.getMessage())) {
+				message = null;
+			}
+		} else {
+			status = new Status(IStatus.ERROR, AutotoolsPlugin.getUniqueIdentifier(), -1, "Internal Error: ", t); //$NON-NLS-1$	
+		}
+		ErrorDialog.openError(shell, title, message, status);
+	}
+	
+	/**
+	 * Returns the workspace instance.
+	 */
+	public static IWorkspace getWorkspace() {
+		return ResourcesPlugin.getWorkspace();
+	}
+
+	/**
+	 * Returns the active workbench window or <code>null</code> if none
+	 */
+	public static IWorkbenchWindow getActiveWorkbenchWindow() {
+		return getDefault().getWorkbench().getActiveWorkbenchWindow();
+	}
+
+	/**
+	 * Returns the active workbench page or <code>null</code> if none.
+	 */
+	public static IWorkbenchPage getActivePage() {
+		IWorkbenchWindow window= getActiveWorkbenchWindow();
+		if (window != null) {
+			return window.getActivePage();
+		}
+		return null;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsProjectNature.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsProjectNature.java
new file mode 100644
index 0000000..5a7f311
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsProjectNature.java
@@ -0,0 +1,175 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat Inc.. and others
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial implementation
+ *     IBM Rational Software - add and remove nature static methods
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Vector;
+
+import org.eclipse.core.resources.ICommand;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IProjectNature;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+
+public class AutotoolsProjectNature implements IProjectNature {
+
+	public static final String AUTOTOOLS_NATURE_ID = AutotoolsPlugin.getUniqueIdentifier() + ".autotoolsNature";  //$NON-NLS-1$
+
+	private IProject project;
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.resources.IProjectNature#configure()
+	 */
+	public void configure() throws CoreException {
+		addAutotoolsBuilder(project, new NullProgressMonitor());
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.resources.IProjectNature#deconfigure()
+	 */
+	public void deconfigure() throws CoreException {
+		// TODO remove builder from here
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.resources.IProjectNature#getProject()
+	 */
+	public IProject getProject() {
+		return project;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.resources.IProjectNature#setProject(org.eclipse.core.resources.IProject)
+	 */
+	public void setProject(IProject project) {
+		this.project = project;
+	}
+	
+	/**
+	 * Add the Autotools builder to the project
+	 * @param project
+	 * @param monitor
+	 * @throws CoreException
+	 */
+	public static void addAutotoolsBuilder(IProject project, IProgressMonitor monitor) throws CoreException {
+		// Add the builder to the project
+		IProjectDescription description = project.getDescription();
+		ICommand[] commands = description.getBuildSpec();
+	
+		// TODO Remove the cbuilder check when the new StandardBuild nature adds the cbuilder
+		for (int i = 0; i < commands.length; i++) {
+			ICommand command = commands[i];
+			String builderName = command.getBuilderName();
+			// If there is a ManagedMake makefile generator, remove it as it will
+			// cause an additional build "all" to occur when we are making any target.
+			if (builderName.equals("org.eclipse.cdt.core.cbuilder") ||
+					builderName.equals(AutotoolsMakefileBuilder.MANAGED_BUILDER_ID)) { //$NON-NLS-1$
+				// Remove the command
+				Vector<ICommand> vec = new Vector<ICommand>(Arrays.asList(commands));
+				vec.removeElementAt(i);
+				vec.trimToSize();
+				ICommand[] tempCommands = (ICommand[]) vec.toArray(new ICommand[commands.length-1]); 
+				description.setBuildSpec(tempCommands);
+				project.setDescription(description, new NullProgressMonitor());
+				break;
+			}
+		}
+		
+		commands = description.getBuildSpec();
+		boolean found = false;
+		// See if the builder is already there
+		for (int i = 0; i < commands.length; ++i) {
+		   if (commands[i].getBuilderName().equals(AutotoolsMakefileBuilder.BUILDER_ID)) {
+			  found = true;
+			  break;
+		   }
+		}
+		if (!found) { 
+		   //add builder to project
+		   ICommand command = description.newCommand();
+		   command.setBuilderName(AutotoolsMakefileBuilder.BUILDER_ID);
+		   ICommand[] newCommands = new ICommand[commands.length + 1];
+		   // Add it before other builders.
+		   System.arraycopy(commands, 0, newCommands, 1, commands.length);
+		   newCommands[0] = command;
+		   description.setBuildSpec(newCommands);
+		   project.setDescription(description, new NullProgressMonitor());
+		}		
+	}
+
+	/**
+	 * Utility method for adding an autotools nature to a project.
+	 * 
+	 * @param proj the project to add the autotools nature to.
+	 * @param monitor a progress monitor to indicate the duration of the operation, or
+	 * <code>null</code> if progress reporting is not required.
+	 */
+	public static void addAutotoolsNature(IProject project, IProgressMonitor monitor) throws CoreException {
+		addNature(project, AUTOTOOLS_NATURE_ID, monitor);
+	}
+
+	/**
+	 * Utility method for adding a nature to a project.
+	 * 
+	 * @param proj the project to add the nature to.
+	 * @param natureId the id of the nature to assign to the project
+	 * @param monitor a progress monitor to indicate the duration of the operation, or
+	 * <code>null</code> if progress reporting is not required.
+	 */
+	public static void addNature(IProject project, String natureId, IProgressMonitor monitor) throws CoreException {
+		IProjectDescription description = project.getDescription();
+		String[] prevNatures = description.getNatureIds();
+		for (int i = 0; i < prevNatures.length; i++) {
+			if (natureId.equals(prevNatures[i]))
+				return;
+		}
+		String[] newNatures = new String[prevNatures.length + 1];
+		System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
+		newNatures[prevNatures.length] = natureId;
+		description.setNatureIds(newNatures);
+		project.setDescription(description, monitor);
+	}
+	
+	/**
+	 * Utility method to remove the autotools nature from a project.
+	 * 
+	 * @param project to remove the autotools nature from
+	 * @param mon progress monitor to indicate the duration of the operation, or 
+	 * <code>null</code> if progress reporting is not required. 
+	 * @throws CoreException
+	 */
+	public static void removeAutotoolsNature(IProject project, IProgressMonitor mon) throws CoreException {
+		removeNature(project, AUTOTOOLS_NATURE_ID, mon);
+	}
+
+	/**
+	 * Utility method for removing a project nature from a project.
+	 * 
+	 * @param proj the project to remove the nature from
+	 * @param natureId the nature id to remove
+	 * @param monitor a progress monitor to indicate the duration of the operation, or
+	 * <code>null</code> if progress reporting is not required.
+	 */
+	public static void removeNature(IProject project, String natureId, IProgressMonitor monitor) throws CoreException {
+		IProjectDescription description = project.getDescription();
+		String[] prevNatures = description.getNatureIds();
+		List<String> newNatures = new ArrayList<String>(Arrays.asList(prevNatures));
+		newNatures.remove(natureId);
+		description.setNatureIds((String[])newNatures.toArray(new String[newNatures.size()]));
+		project.setDescription(description, monitor);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsProjectPropertyTester.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsProjectPropertyTester.java
new file mode 100644
index 0000000..a561d6a
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsProjectPropertyTester.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools;
+
+import org.eclipse.core.expressions.PropertyTester;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+
+public class AutotoolsProjectPropertyTester extends PropertyTester {
+
+	public AutotoolsProjectPropertyTester() {
+		// nothing needed
+	}
+
+	public boolean test(Object receiver, String property, Object[] args,
+			Object expectedValue) {
+		IProject project = null;
+		IResource resource = (IResource)receiver;
+		project = resource.getProject();
+		return AutotoolsMakefileBuilder.hasTargetBuilder(project);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java
new file mode 100644
index 0000000..83c331d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java
@@ -0,0 +1,431 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.CommandLauncher;
+import org.eclipse.cdt.core.parser.IScannerInfo;
+import org.eclipse.cdt.core.parser.IScannerInfoChangeListener;
+import org.eclipse.cdt.managedbuilder.core.BuildException;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.IOption;
+import org.eclipse.cdt.managedbuilder.core.ITool;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyConstants;
+
+
+// This class is used to get and store information from the Autotools
+// makefiles for a specific file in a specific Autotools project.
+// It gets information by invoking make with special options
+// to find out what occurs if the file in question has changed.
+public class AutotoolsScannerInfo implements IScannerInfo {
+	
+	private IResource res;
+	private IProject project;
+	private IPath filePath;
+	private String[] includePaths;
+	@SuppressWarnings("unchecked")
+	private HashMap definedSymbols;
+	private boolean isDirty;
+	private String compilationString;
+	private String dirName;
+	private HashSet<IScannerInfoChangeListener> listeners = new HashSet<IScannerInfoChangeListener>();
+	
+	public AutotoolsScannerInfo (IResource res) {
+		this.res = res;
+		this.project = res.getProject();
+		this.filePath = res.getFullPath();
+	}
+	
+	public void addListener(IScannerInfoChangeListener listener) {
+		if (!listeners.contains(listener)) {
+			listeners.add(listener);
+		}
+	}
+	
+	public void removeListener(IScannerInfoChangeListener listener) {
+		if (listeners.contains(listener)) {
+			listeners.remove(listener);
+		}
+	}
+	
+	// TODO: Should make a listener to watch all Makefiles up the
+	// tree from the resource.  If any change, the include
+	// paths and options passed to make the file in question
+	// could change.
+	public void setDirty (boolean isDirty) {
+		this.isDirty = isDirty;
+	}
+	
+	private String buildFile (IPath filePath, IFile makefile, IManagedBuildInfo info) {
+		String outString = "";
+		IPath dir = makefile.getFullPath().removeLastSegments(1);
+		IPath relFilePath = filePath.removeFirstSegments(dir.segmentCount());
+		CommandLauncher launcher = new CommandLauncher();
+		String[] env = null;
+		ByteArrayOutputStream stdout = new ByteArrayOutputStream();
+		ByteArrayOutputStream stderr = stdout;
+		IPath makeCommandPath = new Path(info.getBuildCommand());
+		ITool tool = info.getToolFromOutputExtension("status"); // $NON-NLS-1$
+		IOption[] options = tool.getOptions();
+		IPath runPath = null;
+		boolean done = false;
+
+		for (int i = 0; i < options.length && !done; ++i) {
+			try {
+				if (options[i].getValueType() == IOption.STRING) {
+					String value = (String) options[i].getValue();
+					String id = options[i].getId();
+					if (id.indexOf("builddir") > 0) { // $NON-NLS-1$
+						runPath = makefile.getProject().getLocation().append(value.trim());
+						done = true;
+					}
+				}
+			} catch (BuildException e) {
+				// do nothing
+			}
+		}
+
+		IProgressMonitor monitor = new NullProgressMonitor();
+		String errMsg = null;
+		String[] makeArgs = new String[3];
+		makeArgs[0] = "-n"; // $NON-NLS-1$
+		makeArgs[1] = "all"; // $NON-NLS-1$
+		makeArgs[2] = "MAKE=make -W " + relFilePath.toOSString(); //$NON-NLS-1$
+
+		try {
+			Process proc = launcher.execute(makeCommandPath, makeArgs, env,
+					runPath, new NullProgressMonitor());
+			if (proc != null) {
+				try {
+					// Close the input of the process since we will never write to
+					// it
+					proc.getOutputStream().close();
+				} catch (IOException e) {
+				}
+
+				if (launcher.waitAndRead(stdout, stderr, new SubProgressMonitor(
+						monitor, IProgressMonitor.UNKNOWN)) != CommandLauncher.OK) {
+					errMsg = launcher.getErrorMessage();
+				}
+				outString = stdout.toString();
+			} else {
+				errMsg = launcher.getErrorMessage();
+			}
+		} catch (CoreException e) {
+			errMsg = e.getLocalizedMessage();
+			AutotoolsPlugin.logErrorMessage(errMsg);
+		}
+		return outString;
+	}
+	
+	private IFile getMakefile (IManagedBuildInfo info, IPath filePath) {
+		IWorkspaceRoot root = CCorePlugin.getWorkspace().getRoot();
+		IPath dir = filePath.removeLastSegments(1);
+		IFile makefile = null;
+		boolean done = false;
+		IPath makefilePath = null;
+		// Look starting at source file directory for the
+		// Makefile.in or Makefile for the given file.
+		while (!done) {
+			makefilePath = dir.append("Makefile.in"); // $NON-NLS-1$
+			makefile = root.getFile(makefilePath);
+			if (makefile != null && makefile.exists()) {
+				done = true;
+				continue;
+			}
+			makefilePath = dir.append("Makefile"); // $NON-NLS-1$
+			makefile = root.getFile(makefilePath);
+			if (makefile != null && makefile.exists()) {
+				done = true;
+			}
+			else {
+				dir = dir.removeLastSegments(1);
+				if (dir.lastSegment() == null)
+					done = true;
+			}
+		}
+		return makefile;
+	}
+	
+	private String getCompilationString() {
+		if (compilationString != null && !isDirty)
+			return compilationString;
+		String makeWEnabled = null;
+		try {
+			makeWEnabled = project.getPersistentProperty(AutotoolsPropertyConstants.SCANNER_USE_MAKE_W);
+		} catch (CoreException e) {
+			// do nothing
+		}
+		if (!(res instanceof IFile) ||
+				makeWEnabled == null ||
+				makeWEnabled.equals("false")) // $NON-NLS-1$
+			return null;
+		isDirty = false;
+		IWorkspaceRoot root = CCorePlugin.getWorkspace().getRoot();
+		IFile file = root.getFile(filePath);
+		IFile makefile = null;
+		IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+		// If the given file exists and we have a ManagedBuild, we may have
+		// an Autotools project source file.
+		if (file != null && file.exists() && info != null) {
+			makefile = getMakefile(info, filePath);
+		}
+		// We now have the closest directory to the given path
+		// that contains a Makefile.in or Makefile.  This Makefile
+		// should contain a relative reference to the file in
+		// question.  We now want to try and extract the include
+		// path from the top-level make run with the assumption
+		// that the file in question has been altered.
+		if (makefile != null) {
+			IPath dir = makefile.getFullPath().removeLastSegments(1);
+			// Get relative name of file as we assume the Makefile will
+			// refer to it this way.
+			String out = buildFile(filePath, makefile, info);
+			try {
+				boolean topLevel = dir.equals(project.getFullPath());
+				Pattern p = null;
+				Matcher m = null;
+				if (!topLevel) {
+					String regex1 = "^Making.*in.*" + dir.lastSegment(); // $NON-NLS-1$
+					p = Pattern.compile(regex1, Pattern.MULTILINE);
+					m = p.matcher(out);
+				}
+				if (topLevel || m.find()) {
+					Pattern p2 = null;
+					Matcher m2 = null;
+					String substr2 = out;
+					if (!topLevel) {
+						substr2 = out.substring(m.end());
+						String regex2 = "^make.*Entering directory.*`(.*)'"; // $NON-NLS-1$
+						p2 = Pattern.compile(regex2, Pattern.MULTILINE);
+						m2 = p2.matcher(substr2);
+					}
+					if (topLevel || m2.find()) {
+						String substr3 = null;
+						if (!topLevel) {
+							dirName = m2.group(1);
+							substr3 = substr2.substring(m2.start());
+						} else {
+							dirName = "";
+							substr3 = out;
+						}
+						// We need to test for both gcc and g++ compilers.
+						String regex3 = "^.*gcc.*?-I.*?" + filePath.lastSegment(); // $NON-NLS-1$
+						String regex4 = "^.*g[+][+].*?-I.*?" + filePath.lastSegment(); // $NON-NLS-1$
+						// Replace all continuation markers so we don't have to worry about newlines in
+						// the middle of a compilation string.
+						substr3 = substr3.replaceAll("\\\\\\n", "");
+						Pattern p3 = Pattern.compile(regex3, Pattern.MULTILINE);
+						Matcher m3 = p3.matcher(substr3);
+						if (m3.find())
+							compilationString = substr3.substring(m3.start(),m3.end());
+						else {
+							String substr4 = substr3;
+							Pattern p4 = Pattern.compile(regex4, Pattern.MULTILINE);
+							Matcher m4 = p4.matcher(substr4);
+							if (m4.find())
+								compilationString = substr3.substring(m4.start(),m4.end());
+						}
+					}
+				} else if (!out.equals("")) {
+					compilationString = "";
+				}
+			} catch (IllegalStateException t) {
+				// Mark as dirty for next time.
+				isDirty = true;
+			}
+		}
+		return compilationString;
+	}
+	
+	public String[] getIncludePaths() {
+		String[] pathArray = new String[0];
+		if (project == null || filePath == null)
+			return pathArray;
+		if (includePaths != null && !isDirty && compilationString != null) {
+			return includePaths;
+		}
+		ArrayList<String> pathList = new ArrayList<String>();
+		String cs = getCompilationString();
+		if (cs != null) {
+			// Grab include paths specified via -I
+			Pattern p4 = Pattern.compile(" -I");
+			String[] tokens = p4.split(cs);
+			for (int j = 1; j < tokens.length; ++j) {
+				String x = tokens[j].trim();
+				int firstSpace = x.indexOf(' ');
+				if (firstSpace != -1) {
+					x = x.substring(0, firstSpace);
+				}
+				if (x.charAt(0) == '/') {
+					pathList.add(x);
+				} else {
+					IPath relPath = new Path(dirName);
+					relPath = relPath.append(x);
+					pathList.add(relPath.toOSString());
+				}
+			}
+			// Grab include paths that are specified via -isystem
+			Pattern p5 = Pattern.compile(" -isystem");
+			tokens = p5.split(cs);
+			for (int j = 1; j < tokens.length; ++j) {
+				String x = tokens[j].trim();
+				int firstSpace = x.indexOf(' ');
+				if (firstSpace != -1) {
+					x = x.substring(0, firstSpace);
+				}
+				if (x.charAt(0) == '/') {
+					pathList.add(x);
+				} else {
+					IPath relPath = new Path(dirName);
+					relPath = relPath.append(x);
+					pathList.add(relPath.toOSString());
+				}
+			}
+		}
+		
+		// The ManagedBuildManager is the normal default IScannerInfoProvider
+		// for Managed Projects.  It has the ability to check gcc for the
+		// default include paths and we don't want to lose that.  Append
+		// the include paths from it to the end of our list which is dynamically
+		// picking up the -I options.
+		
+		// TODO: Should we even allow the user-defined includePaths in settings?
+		//       These will be picked up by the ManagedBuildManager.
+		IScannerInfo info = (IScannerInfo)ManagedBuildManager.getBuildInfo(project);
+		if (info != null) {
+			String[] extraIncludePaths = info.getIncludePaths();
+			for (int i = 0; i < extraIncludePaths.length; ++i) {
+				pathList.add(extraIncludePaths[i]);
+			}
+		}
+
+		includePaths = (String[])pathList.toArray(pathArray);
+		
+		// FIXME: Info has been updated.  Is this the best place to notify listeners?
+		Iterator<IScannerInfoChangeListener> i = listeners.iterator();
+		while (i.hasNext()) {
+			IScannerInfoChangeListener listener = (IScannerInfoChangeListener)i.next();
+			listener.changeNotification(project, this);
+		}
+		return includePaths;
+	}
+	
+	@SuppressWarnings("unchecked")
+	public Map getDefinedSymbols () {
+		HashMap symbolMap = new HashMap();
+		if (project == null || filePath == null)
+			return symbolMap;
+		if (definedSymbols != null && !isDirty && compilationString != null) {
+			return definedSymbols;
+		}
+		// Extract -D directives from the compilation string.
+		// TODO: Handle -U directives as well.
+		String cs = getCompilationString();
+		if (cs != null) {
+			Pattern p4 = Pattern.compile("\\s-D([^\\s=]+)(?:=(\\\\\".*?\\\\\"|\\S*))?"); // $NON-NLS-1$
+			Matcher m = p4.matcher(cs);
+			while(m.find()) {
+				String name = m.group(1);
+				String value = m.group(2);
+				if(value != null)
+					symbolMap.put(name, value.replace("\\", "")); // $NON-NLS-1$ $NON-NLS-2$
+				else
+					symbolMap.put(name, "");
+			}
+		}
+		// Add the defined symbols from ManagedBuildManager.  This will include
+		// the builtin implicit defines from the compiler and the user-set
+		// defines from settings.  Since these are added last, they will overwrite
+		// existing defines fished out of the Makefiles above.  For the user-defined
+		// symbols, this is the correct behavior.  For the implicit defines,
+		// this is not; however, this is not valid programming behavior and
+		// the compiler definitely warns against it.
+		IScannerInfo info = (IScannerInfo)ManagedBuildManager.getBuildInfo(project);
+		if (info != null) {
+			Map builtinDefinedSymbols = info.getDefinedSymbols();
+			symbolMap.putAll(builtinDefinedSymbols);
+		}
+
+		definedSymbols = symbolMap;
+		return definedSymbols;
+	}
+	
+	public void createIncludeChain(IFile include, IResource res) {
+		try {
+			// We store two different values.  The first only lasts for the 
+			// the session and is the actual resource.  We prefer to work with
+			// this form as it is quicker.  To handle persistence across
+			// sessions, we also store a persistent copy of the resource's
+			// path.  When the session is brought back again, we will recreate
+			// the session chain again using the persistent data.
+			include.setSessionProperty(AutotoolsPropertyConstants.OPEN_INCLUDE, res);
+			include.setPersistentProperty(AutotoolsPropertyConstants.OPEN_INCLUDE_P, res.getLocation().toPortableString());
+		} catch (CoreException e) {
+			// Do nothing
+		}
+	}
+	
+	/**
+	 * 
+	 * @param resource the resource we are scanning
+	 * @return the final resource in the include chain if one exists
+	 * otherwise the resource itself
+	 */
+	public static IResource followIncludeChain(IResource resource) {
+		IResource res = resource;
+		try {
+			boolean done = false;
+			// In the case of include files, we chain to the file that
+			// included the header file.  This may end up ultimately as
+			// a source file which has build parameters such as flag
+			// defines and a separate include path.
+			while (!done) {
+				while (res.getSessionProperty(AutotoolsPropertyConstants.OPEN_INCLUDE) != null)
+					res = (IResource)res.getSessionProperty(AutotoolsPropertyConstants.OPEN_INCLUDE);
+				String chainPath = res.getPersistentProperty(AutotoolsPropertyConstants.OPEN_INCLUDE_P);
+				if (chainPath != null) {
+					IPath location = Path.fromPortableString(chainPath);
+					IResource next = res.getWorkspace().getRoot().getFileForLocation(location);
+					res.setSessionProperty(AutotoolsPropertyConstants.OPEN_INCLUDE, next);
+					res = next;
+				} else
+					done = true;
+			}
+		} catch (CoreException e) {
+			// Do nothing
+		} finally {
+			resource = res;
+		}
+		return resource;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfoProvider.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfoProvider.java
new file mode 100644
index 0000000..572ce76
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfoProvider.java
@@ -0,0 +1,112 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.eclipse.cdt.core.AbstractCExtension;
+import org.eclipse.cdt.core.parser.IScannerInfo;
+import org.eclipse.cdt.core.parser.IScannerInfoChangeListener;
+import org.eclipse.cdt.core.parser.IScannerInfoProvider;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyConstants;
+
+
+public class AutotoolsScannerInfoProvider extends AbstractCExtension implements IScannerInfoProvider {
+
+	static private Map<String, Map<IResource, AutotoolsScannerInfo>> infoCollections = new HashMap<String, Map<IResource, AutotoolsScannerInfo>>();
+	static public final String INTERFACE_IDENTITY = 
+		AutotoolsPlugin.PLUGIN_ID + "." + "AutotoolsScannerInfoProvider"; // $NON-NLS-1$
+
+	protected String getCollectionName(IProject project) {
+		IManagedBuildInfo buildInfo = ManagedBuildManager.getBuildInfo(project);
+		String config = project.getName() + "." + buildInfo.getConfigurationName();
+		return config;
+	}
+	
+	public synchronized IScannerInfo getScannerInformation(IResource resource) {
+		IResource res = AutotoolsScannerInfo.followIncludeChain(resource);
+		// We keep scanner info separate per configuration.
+		// This is because one configuration may result in a file being
+		// compiled with one include path while another configuration
+		// may change the include path / defined symbols.
+		IProject project = resource.getProject();
+		
+		// We punt for non-Autotools projects.  This ScannerInfoProvider is used for
+		// all C Projects and we might get called for a non-Autotools project (e.g.
+		// unsubscribe operation when converting to C project).
+		if (!AutotoolsMakefileBuilder.hasTargetBuilder(project))
+			return null;
+		
+		// Check if the scanner info has been marked dirty, in which case we need
+		// to mark all entries dirty.
+		Boolean isDirty = Boolean.FALSE;
+		try {
+			isDirty = (Boolean)project.getSessionProperty(AutotoolsPropertyConstants.SCANNER_INFO_DIRTY);
+		} catch (CoreException e) {
+			// do nothing
+		}
+		if (isDirty != null && isDirty.equals(Boolean.TRUE)) {
+			setDirty(project);
+			try {
+			project.setSessionProperty(AutotoolsPropertyConstants.SCANNER_INFO_DIRTY, Boolean.FALSE);
+			} catch (CoreException ce) {
+				// do nothing
+			}
+		}
+		String config = getCollectionName(project);
+		// Get the ScannerInfo collection for current configuration or else
+		// create an empty collection if one doesn't already exist.
+		Map<IResource, AutotoolsScannerInfo> infoCollection = infoCollections.get(config);
+		if (infoCollection == null) {
+			infoCollection = new HashMap<IResource, AutotoolsScannerInfo>();
+			infoCollections.put(config, infoCollection);
+		}
+		AutotoolsScannerInfo info = (AutotoolsScannerInfo)infoCollection.get(res);
+		if (info == null) {
+			info = new AutotoolsScannerInfo(res);
+			infoCollection.put(res, info);
+		}
+		return info; 
+	}
+
+	private void setDirty(IProject project) {
+		String config = getCollectionName(project);
+		Map<IResource, AutotoolsScannerInfo> infoCollection = infoCollections.get(config);
+		if (infoCollection != null) {
+			Collection<AutotoolsScannerInfo> s = infoCollection.values();
+			for (Iterator<AutotoolsScannerInfo> i = s.iterator(); i.hasNext();) {
+				AutotoolsScannerInfo info = (AutotoolsScannerInfo)i.next();
+				info.setDirty(true);
+			}
+		}
+	}
+	
+	public void subscribe(IResource resource,
+			IScannerInfoChangeListener listener) {
+		AutotoolsScannerInfo info = (AutotoolsScannerInfo)getScannerInformation(resource);
+		info.addListener(listener);
+	}
+
+	public void unsubscribe(IResource resource,
+			IScannerInfoChangeListener listener) {
+		AutotoolsScannerInfo info = (AutotoolsScannerInfo)getScannerInformation(resource);
+		if (info != null)
+			info.removeListener(listener);
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java
new file mode 100644
index 0000000..aca5677
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/MakeGenerator.java
@@ -0,0 +1,1374 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.EOFException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.CommandLauncher;
+import org.eclipse.cdt.core.ConsoleOutputStream;
+import org.eclipse.cdt.core.ICDescriptor;
+import org.eclipse.cdt.core.envvar.IEnvironmentVariable;
+import org.eclipse.cdt.core.resources.IConsole;
+import org.eclipse.cdt.core.settings.model.ICStorageElement;
+import org.eclipse.cdt.make.core.IMakeTarget;
+import org.eclipse.cdt.make.core.IMakeTargetManager;
+import org.eclipse.cdt.make.core.MakeCorePlugin;
+import org.eclipse.cdt.make.core.makefile.IMakefile;
+import org.eclipse.cdt.make.core.makefile.ITarget;
+import org.eclipse.cdt.make.core.makefile.ITargetRule;
+import org.eclipse.cdt.managedbuilder.core.BuildException;
+import org.eclipse.cdt.managedbuilder.core.IBuilder;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.IOption;
+import org.eclipse.cdt.managedbuilder.core.ITool;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.managedbuilder.macros.BuildMacroException;
+import org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider;
+import org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator;
+import org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator2;
+import org.eclipse.cdt.newmake.core.IMakeCommonBuildInfo;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceStatus;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyConstants;
+import org.eclipse.linuxtools.internal.cdt.autotools.MarkerGenerator;
+
+
+@SuppressWarnings("deprecation")
+public class MakeGenerator extends MarkerGenerator implements IManagedBuilderMakefileGenerator, IManagedBuilderMakefileGenerator2 {
+
+	public final String CONFIG_STATUS = "config.status"; //$NON-NLS-1$
+	public final String MAKEFILE = "Makefile"; //$NON-NLS-1$
+	public final String MAKEFILE_CVS = "Makefile.cvs"; //$NON-NLS-1$
+	public final String SETTINGS_FILE_NAME = ".cdtconfigure"; //$NON-NLS-1$
+	public final String SHELL_COMMAND = "sh"; //$NON-NLS-1$
+	
+	public final String AUTOGEN_TOOL_ID = "org.eclipse.linuxtools.cdt.autotools.tool.autogen"; //$NON-NLS-1$
+	public final String CONFIGURE_TOOL_ID = "org.eclipse.linuxtools.cdt.autotools.tool.configure"; //$NON-NLS-1$
+	
+	public final String GENERATED_TARGET = AutotoolsPlugin.PLUGIN_ID + ".generated.MakeTarget"; //$NON-NLS-1$
+
+	private static final String MAKE_TARGET_KEY = MakeCorePlugin.getUniqueIdentifier() + ".buildtargets"; //$NON-NLS-1$
+	private static final String BUILD_TARGET_ELEMENT = "buildTargets"; //$NON-NLS-1$
+	private static final String TARGET_ELEMENT = "target"; //$NON-NLS-1$
+	private static final String TARGET_ATTR_ID = "targetID"; //$NON-NLS-1$
+	private static final String TARGET_ATTR_PATH = "path"; //$NON-NLS-1$
+	private static final String TARGET_ATTR_NAME = "name"; //$NON-NLS-1$
+	private static final String TARGET_STOP_ON_ERROR = "stopOnError"; //$NON-NLS-1$
+	private static final String TARGET_USE_DEFAULT_CMD = "useDefaultCommand"; //$NON-NLS-1$
+	private static final String TARGET_ARGUMENTS = "buildArguments"; //$NON-NLS-1$
+	private static final String TARGET_COMMAND = "buildCommand"; //$NON-NLS-1$
+	private static final String TARGET_RUN_ALL_BUILDERS = "runAllBuilders";
+	private static final String TARGET = "buildTarget"; //$NON-NLS-1$
+
+	private IProject project;
+
+	private IProgressMonitor monitor;
+
+	private String buildDir;
+	private String srcDir;
+
+	private IConfiguration cfg;
+	private IBuilder builder;
+
+	public void generateDependencies() throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	public MultiStatus generateMakefiles(IResourceDelta delta)
+			throws CoreException {
+		return regenerateMakefiles();
+	}
+
+	private void initializeBuildConfigDirs() {
+		ITool tool = cfg.getToolFromOutputExtension("status"); //$NON-NLS-1$
+		IOption[] options = tool.getOptions();
+		for (int i = 0; i < options.length; ++i) {
+			String id = options[i].getId();
+			if (id.indexOf("builddir") > 0) { //$NON-NLS-1$
+				buildDir = (String) options[i].getValue();
+				try {
+					String resolved = ManagedBuildManager.getBuildMacroProvider().resolveValue(buildDir, "build", null, 
+							IBuildMacroProvider.CONTEXT_CONFIGURATION, cfg);
+					buildDir = resolved;
+				} catch (BuildMacroException e) {
+					// do nothing
+				}
+//				try {
+//					builder.setBuildAttribute(IMakeCommonBuildInfo.BUILD_LOCATION, 
+//							project.getLocation().append(buildDir).toOSString());
+//				} catch (CoreException e) {
+//					e.printStackTrace();
+//				}
+			} else if (id.indexOf("configdir") > 0) {  //$NON-NLS-1$
+				srcDir = (String) options[i].getValue();
+				try {
+					String resolved = ManagedBuildManager.getBuildMacroProvider().resolveValue(srcDir, "", null, 
+							IBuildMacroProvider.CONTEXT_CONFIGURATION, cfg);
+					srcDir = resolved;
+				} catch (BuildMacroException e) {
+					// do nothing
+				}
+			}
+		}
+	}
+	
+	public void initialize(IProject project, IManagedBuildInfo info,
+			IProgressMonitor monitor) {
+		this.project = project;
+		this.cfg = info.getDefaultConfiguration();
+		this.builder = cfg.getBuilder();
+		this.monitor = monitor;
+		initializeBuildConfigDirs();
+	}
+
+	public void initialize(int buildKind, IConfiguration cfg, IBuilder builder, 
+			IProgressMonitor monitor) {
+		this.cfg = cfg;
+		this.builder = builder;
+		this.monitor = monitor;
+		this.project = (IProject)cfg.getManagedProject().getOwner();
+		initializeBuildConfigDirs();
+	}
+
+	public IProject getProject() {
+		return project;
+	}
+	
+	public boolean isGeneratedResource(IResource resource) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public void regenerateDependencies(boolean force) throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	/*
+	 * (non-Javadoc) Check whether the build has been cancelled. Cancellation
+	 * requests propagated to the caller by throwing <code>OperationCanceledException</code>.
+	 * 
+	 * @see org.eclipse.core.runtime.OperationCanceledException#OperationCanceledException()
+	 */
+	protected void checkCancel() {
+		if (monitor != null && monitor.isCanceled()) {
+			throw new OperationCanceledException();
+		}
+	}
+
+	/*
+	 * (non-Javadoc) Return or create the makefile needed for the build. If we
+	 * are creating the resource, set the derived bit to true so the CM system
+	 * ignores the contents. If the resource exists, respect the existing
+	 * derived setting.
+	 * 
+	 * @param makefilePath @return IFile
+	 */
+	protected IFile createFile(IPath makefilePath) throws CoreException {
+		// Create or get the handle for the makefile
+		IWorkspaceRoot root = CCorePlugin.getWorkspace().getRoot();
+		IFile newFile = root.getFileForLocation(makefilePath);
+		if (newFile == null) {
+			newFile = root.getFile(makefilePath);
+		}
+		// Create the file if it does not exist
+		ByteArrayInputStream contents = new ByteArrayInputStream(new byte[0]);
+		try {
+			newFile.create(contents, false, new SubProgressMonitor(monitor, 1));
+			// Make sure the new file is marked as derived
+			if (!newFile.isDerived()) {
+				newFile.setDerived(true);
+			}
+
+		} catch (CoreException e) {
+			// If the file already existed locally, just refresh to get contents
+			if (e.getStatus().getCode() == IResourceStatus.PATH_OCCUPIED)
+				newFile.refreshLocal(IResource.DEPTH_ZERO, null);
+			else
+				throw e;
+		}
+
+		return newFile;
+	}
+
+	/*
+	 * (non-Javadoc) Return or create the folder needed for the build output. If
+	 * we are creating the folder, set the derived bit to true so the CM system
+	 * ignores the contents. If the resource exists, respect the existing
+	 * derived setting.
+	 * 
+	 * @param string @return IPath
+	 */
+	private boolean createDirectory(String dirName) throws CoreException {
+		// Create or get the handle for the build directory
+		boolean rc = true;
+		IPath path = new Path(dirName);
+		if (dirName.length() == 0 || dirName.startsWith(".") || !dirName.startsWith("/"))
+			path = project.getLocation().append(dirName);
+		File f = path.toFile();
+		if (!f.exists())
+			rc = f.mkdirs();
+
+		return rc;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator#getBuildWorkingDir()
+	 */
+	public IPath getBuildWorkingDir() {
+		return new Path(buildDir);
+	}
+
+	/*
+	 * (non-Javadoc) Get the project's absolute path. @return IPath
+	 */
+	private IPath getProjectLocation() {
+		return project.getLocation();
+	}
+
+	private String getAbsoluteDirectory(String dir) {
+		IPath path = new Path(dir);
+		if (!path.isAbsolute()) {
+			IPath absPath = getProjectLocation().addTrailingSeparator().append(
+					path);
+			return getPathString(absPath);
+		}
+		return dir;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator#getMakefileName()
+	 */
+	public String getMakefileName() {
+		return new String(MAKEFILE);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @return the path to the configuration settings file
+	 */
+	protected IPath getConfigSettingsPath() {
+		IPath path = project.getWorkingLocation(AutotoolsPlugin.PLUGIN_ID).append(SETTINGS_FILE_NAME + "." + cfg.getName()); //$NON-NLS-1$
+		return path;
+	}
+	
+	public void removeConfigSettings() {
+		File f = getConfigSettingsPath().toFile();
+		try {
+			f.delete();
+		} catch (Exception e) {
+			// do nothing
+		}
+	}
+	
+	public MultiStatus regenerateMakefiles() throws CoreException {
+		MultiStatus status;
+		int rc = IStatus.OK;
+		String errMsg = new String();
+		boolean needFullConfigure = true;
+
+		// See if the user has cancelled the build
+		checkCancel();
+
+		// Create the top-level directory for the build output
+		if (!createDirectory(buildDir)) {
+			rc = IStatus.ERROR;
+			errMsg = AutotoolsPlugin.getFormattedString("MakeGenerator.createdir.error", //$NON-NLS-1$
+					new String[] {buildDir});
+			return new MultiStatus(AutotoolsPlugin.getUniqueIdentifier(), 
+					rc, errMsg, null);
+		}
+
+		checkCancel();
+
+		// // How did we do
+		// if (!getInvalidDirList().isEmpty()) {
+		// status = new MultiStatus (
+		// ManagedBuilderCorePlugin.getUniqueIdentifier(),
+		// IStatus.WARNING,
+		// new String(),
+		// null);
+		// // Add a new status for each of the bad folders
+		// iter = getInvalidDirList().iterator();
+		// while (iter.hasNext()) {
+		// status.add(new Status (
+		// IStatus.WARNING,
+		// ManagedBuilderCorePlugin.getUniqueIdentifier(),
+		// SPACES_IN_PATH,
+		// ((IContainer)iter.next()).getFullPath().toString(),
+		// null));
+		// }
+		// } else {
+		// status = new MultiStatus(
+		// ManagedBuilderCorePlugin.getUniqueIdentifier(),
+		// IStatus.OK,
+		// new String(),
+		// null);
+		// }
+
+		// Get a build console for the project
+		IConsole console = CCorePlugin.getDefault().getConsole("org.eclipse.linuxtools.cdt.autotools.configureConsole"); //$NON-NLS-1$
+
+		// Get the project and make sure there's a monitor to cancel the build
+		if (monitor == null) {
+			monitor = new NullProgressMonitor();
+		}
+
+		try {
+			// If a config.status file exists in the build directory, we call it
+			// to
+			// regenerate the makefile
+			IPath configfile = getProjectLocation().append(buildDir).append(
+					CONFIG_STATUS);
+			IPath makefilePath = getProjectLocation().append(buildDir).append(MAKEFILE);
+			File configStatus = configfile.toFile();
+			File makefile = makefilePath.toFile();
+			IPath configSettingsPath = getConfigSettingsPath();
+			File configSettings = configSettingsPath.toFile();
+			String[] configArgs = getConfigArgs();
+
+			// We need to figure out if the end-user has changed the configuration
+			// settings.  In such a case, we need to reconfigure from scratch
+			// regardless of whether config.status exists or not.
+			// We figure this out by saving the configuration settings to
+			// a special file and reading/comparing whenever we are asked to build.
+			if (configSettings.exists()) {
+				int i = 0;
+				boolean needSaveConfigArgs = false;
+				needFullConfigure = false;
+				try {
+					DataInputStream settings = new DataInputStream(
+							new BufferedInputStream(new FileInputStream(configSettings)));
+					// Get the first String in the configure settings file.
+					// Newer configure settings file start with the project name.  
+					// If the project name is present and doesn't match the
+					// current project name, the project has been refactored and
+					// we need to do a full reconfigure.
+					settings.mark(100);
+					String s = settings.readUTF();
+					if (s.startsWith("project=")) { //$NON-NLS-1$
+						if (!s.substring(8).equals(project.getName())) {
+							needFullConfigure = true;
+						}
+					} else {
+						// An older configure arguments file.  Reset
+						// to beginning and process as normal.
+						needSaveConfigArgs = true;
+						settings.reset();
+					}
+					while (i < configArgs.length) {
+						s = settings.readUTF();
+						if (!s.equals(configArgs[i])) {
+							i = configArgs.length;
+							needFullConfigure = true;
+						}
+						++i;
+					}
+					if (settings.available() > 0)
+						needFullConfigure = true;
+				} catch (EOFException e) {
+					needFullConfigure = true;
+				} catch (IOException e) {
+					needFullConfigure = true;
+				}
+				if (needFullConfigure) {
+					// If we are going to do a full reconfigure, then if the current
+					// build directory exists, we should clean it out first.  This is
+					// because the reconfiguration could change compile flags, etc..
+					// and the Makefile might not detect a rebuild is required.  In
+					// addition, the build directory itself could have been changed and
+					// we should remove the previous build.
+					File r = project.getLocation().append(buildDir).toFile();
+					if (r != null && r.exists()) {
+						// See what type of cleaning the user has set up in the
+						// build properties dialog.
+						String cleanDelete = null;
+						try {
+							cleanDelete = getProject().getPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE);
+						} catch (CoreException ce) {
+							// do nothing
+						}
+						
+						if (cleanDelete != null && cleanDelete.equals(AutotoolsPropertyConstants.TRUE)) {
+							SubProgressMonitor sub = new SubProgressMonitor(monitor, IProgressMonitor.UNKNOWN);
+							sub.beginTask(AutotoolsPlugin.getResourceString("MakeGenerator.clean.builddir"), IProgressMonitor.UNKNOWN);
+							try {
+								r.delete();
+							} finally {
+								sub.done();
+							}
+						}
+						else {
+							// There is a make target for cleaning.
+							if (makefile != null && makefile.exists()) {
+								String[] makeargs = new String[1];
+								IPath makeCmd = new Path("make"); //$NON-NLS-1$
+								String target = null;
+								try {
+									target = getProject().getPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET);
+								} catch (CoreException ce) {
+									// do nothing
+								}
+								if (target == null)
+									target = AutotoolsPropertyConstants.CLEAN_MAKE_TARGET_DEFAULT;
+								String args = builder.getBuildArguments();
+								if (args != null && !(args = args.trim()).equals("")) { //$NON-NLS-1$
+									String[] newArgs = makeArray(args);
+									makeargs = new String[newArgs.length + 1];
+									System.arraycopy(newArgs, 0, makeargs, 0, newArgs.length);
+								}
+								makeargs[makeargs.length - 1] = target;
+								rc = runCommand(makeCmd,
+										project.getLocation().append(buildDir),
+										makeargs,
+										AutotoolsPlugin.getResourceString("MakeGenerator.clean.builddir"), //$NON-NLS-1$
+										errMsg, console, true);
+							}
+						}
+					}
+					initializeBuildConfigDirs();
+					createDirectory(buildDir);
+					// Mark the scanner info as dirty.
+					try {
+						project.setSessionProperty(AutotoolsPropertyConstants.SCANNER_INFO_DIRTY, Boolean.TRUE);
+					} catch (CoreException ce) {
+						// do nothing
+					}
+				} else if (needSaveConfigArgs) {
+					// No change in configuration args, but we have old
+					// style settings format which can't determine if project has
+					// been renamed.  Refresh the settings file.
+					saveConfigArgs(configArgs);
+				}
+			}
+			
+			ArrayList<String> configureEnvs = new ArrayList<String>();
+			IPath configurePath = getConfigurePath(configureEnvs);
+			ArrayList<String> autogenEnvs = new ArrayList<String>();
+			IPath autogenPath = getAutogenPath(autogenEnvs);
+			
+			// Check if we have a config.status (meaning configure has already run).
+    		if (!needFullConfigure && configStatus != null && configStatus.exists()) {
+			    // If no corresponding Makefile in the same build location, then we
+	            // can simply run config.status again to ensure the top level Makefile has been
+				// created.
+				if (makefile == null || !makefile.exists()) {
+					rc = runScript(configfile, project.getLocation().append(
+							buildDir), null, 
+							AutotoolsPlugin.getResourceString("MakeGenerator.run.config.status"), //$NON-NLS-1$
+							errMsg, console, null, true);
+				}
+			}
+			// Look for configure and configure from scratch
+			else if (configurePath.toFile().exists()) {
+				rc = runScript(configurePath, 
+						project.getLocation().append(buildDir),
+						configArgs, 
+						AutotoolsPlugin.getResourceString("MakeGenerator.gen.makefile"), //$NON-NLS-1$
+						errMsg, console, configureEnvs, true);
+				if (rc != IStatus.ERROR) {
+					File makefileFile = project.getLocation().append(buildDir)
+					.append(MAKEFILE).toFile();
+					addMakeTargetsToManager(makefileFile);
+					// TODO: should we do something special if configure doesn't
+					// return ok?
+					saveConfigArgs(configArgs);
+				}
+			}
+			// If no configure, look for autogen.sh which may create configure and
+    		// possibly even run it.
+			else if (autogenPath.toFile().exists()) {
+				// Remove the existing config.status file since we use it
+				// to figure out if configure was run.
+				if (configStatus.exists())
+					configStatus.delete();
+				// Get any user-specified arguments for autogen.
+				String[] autogenArgs = getAutogenArgs();
+				rc = runScript(autogenPath,
+						autogenPath.removeLastSegments(1), autogenArgs,
+						AutotoolsPlugin.getResourceString("MakeGenerator.autogen.sh"), //$NON-NLS-1$
+						errMsg, console, autogenEnvs, true);
+				if (rc != IStatus.ERROR) {
+					configStatus =configfile.toFile();
+					// Check for config.status.  If it is created, then
+					// autogen.sh ran configure and we should not run it
+					// ourselves.
+					if (configStatus == null || !configStatus.exists()) {
+						rc = runScript(configurePath, 
+								project.getLocation().append(buildDir),
+								configArgs, 
+								AutotoolsPlugin.getResourceString("MakeGenerator.gen.makefile"), //$NON-NLS-1$
+								errMsg, console, configureEnvs, false);
+						if (rc != IStatus.ERROR) {
+							File makefileFile = project.getLocation().append(buildDir)
+							.append(MAKEFILE).toFile();
+							addMakeTargetsToManager(makefileFile);
+						}
+					} else {
+						File makefileFile = project.getLocation().append(buildDir)
+						.append(MAKEFILE).toFile();
+						addMakeTargetsToManager(makefileFile);						
+					}
+				}
+			}
+			// If nothing this far, look for a Makefile.cvs file which needs to be run. 
+			else if (makefileCvsExists()) {
+				String[] makeargs = new String[1];
+				IPath makeCmd = new Path("make"); //$NON-NLS-1$
+				makeargs[0] = "-f" + getMakefileCVSPath().toOSString(); //$NON-NLS-1$
+				rc = runCommand(makeCmd,
+						project.getLocation().append(buildDir),
+						makeargs,
+						AutotoolsPlugin.getResourceString("MakeGenerator.makefile.cvs"), //$NON-NLS-1$
+						errMsg, console, true);
+				if (rc != IStatus.ERROR) {
+					File makefileFile = project.getLocation().append(buildDir)
+					.append(MAKEFILE).toFile();
+					addMakeTargetsToManager(makefileFile);
+					saveConfigArgs(configArgs);
+				}
+			}
+			// If nothing this far, try running autoreconf -i
+			else {
+				String[] reconfArgs = new String[1];
+				String reconfCmd = project.getPersistentProperty(AutotoolsPropertyConstants.AUTORECONF_TOOL);
+				if (reconfCmd == null)
+					reconfCmd = "autoreconf"; // $NON-NLS-1$
+				IPath reconfCmdPath = new Path(reconfCmd);
+				reconfArgs[0] = "-i"; //$NON-NLS-1$
+				rc = runCommand(reconfCmdPath,
+						project.getLocation().append(srcDir),
+						reconfArgs,
+						AutotoolsPlugin.getResourceString("MakeGenerator.autoreconf"), //$NON-NLS-1$
+						errMsg, console, true);
+				// Check if configure generated and if yes, run it.
+				if (rc != IStatus.ERROR) {
+					if (configurePath.toFile().exists()) {
+						
+						rc = runScript(configurePath, 
+								project.getLocation().append(buildDir),
+								configArgs, 
+								AutotoolsPlugin.getResourceString("MakeGenerator.gen.makefile"), //$NON-NLS-1$
+								errMsg, console, configureEnvs, false);
+						if (rc != IStatus.ERROR) {
+							File makefileFile = project.getLocation().append(buildDir)
+							.append(MAKEFILE).toFile();
+							addMakeTargetsToManager(makefileFile);
+							// TODO: should we do something special if configure doesn't
+							// return ok?
+							saveConfigArgs(configArgs);
+						}
+					}
+				}
+			}
+    		
+    		// Treat no Makefile as generation error.
+			if (makefile == null || !makefile.exists()) {
+				rc = IStatus.ERROR;
+				errMsg = AutotoolsPlugin.getResourceString("MakeGenerator.didnt.generate"); //$NON-NLS-1$
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			// forgetLastBuiltState();
+			rc = IStatus.ERROR;
+		} finally {
+			// getGenerationProblems().clear();
+			status = new MultiStatus(AutotoolsPlugin
+						.getUniqueIdentifier(), rc, errMsg, null);
+		}
+		return status;
+	}
+
+	/**
+	 * Strip a command of VAR=VALUE pairs that appear ahead of the command and add
+	 * them to a list of environment variables.
+	 *
+	 * @param command - command to strip
+	 * @param envVars - ArrayList to add environment variables to
+	 * @return stripped command
+	 */
+	public static String stripEnvVars(String command, ArrayList<String> envVars) {
+		Pattern p = Pattern.compile("(\\w+[=]([$]?\\w+[:;]?)+\\s+)\\w+.*");
+		Pattern p2 = Pattern.compile("(\\w+[=]\\\".*?\\\"\\s+)\\w+.*");
+		Pattern p3 = Pattern.compile("(\\w+[=]'.*?'\\s+)\\w+.*");
+		boolean finished = false;
+		while (!finished) {
+			Matcher m = p.matcher(command);
+			if (m.matches()) {
+				command = command.replaceFirst("\\w+[=]([$]?\\w+[:;]?)+", "").trim();
+				envVars.add(m.group(1).trim());
+			} else {
+				Matcher m2 = p2.matcher(command);
+				if (m2.matches()) {
+					command = command.replaceFirst("\\w+[=]\\\".*?\\\"","").trim();
+					String s = m2.group(1).trim();
+					envVars.add(s.replaceAll("\\\"", ""));
+				} else {
+					Matcher m3 = p3.matcher(command);
+					if (m3.matches()) {
+						command = command.replaceFirst("\\w+[=]'.*?'", "").trim();
+						String s = m3.group(1).trim();
+						envVars.add(s.replaceAll("'", ""));
+					} else {
+						finished = true;
+					}
+				}
+			}
+		}
+		return command;
+	}
+	
+	protected IPath getConfigurePath(ArrayList<String> envVars) {
+		IPath configPath;
+		ITool[] tool = cfg.getToolsBySuperClassId(CONFIGURE_TOOL_ID);
+		String command = stripEnvVars(tool[0].getToolCommand().trim(), envVars);
+			
+		if (srcDir.equals(""))
+			configPath = project.getLocation().append(command);
+		else
+			configPath = project.getLocation().append(srcDir).append(command);
+		return configPath;
+	}
+	
+	protected IPath getMakefileCVSPath() {
+		IPath makefileCVSPath;
+		if (srcDir.equals(""))
+			makefileCVSPath = project.getLocation().append(MAKEFILE_CVS);
+		else
+			makefileCVSPath= project.getLocation().append(srcDir).append(
+					MAKEFILE_CVS);
+		return makefileCVSPath;
+	}
+	
+	protected boolean makefileCvsExists() {
+		IPath makefileCVSPath = getMakefileCVSPath();
+		return makefileCVSPath.toFile().exists();
+	}
+
+	protected IPath getAutogenPath(ArrayList<String> envVars) {
+		IPath autogenPath;
+		ITool[] tool = cfg.getToolsBySuperClassId(AUTOGEN_TOOL_ID);
+		String command = stripEnvVars(tool[0].getToolCommand().trim(), envVars);
+			
+		if (srcDir.equals(""))
+			autogenPath = project.getLocation().append(command);
+		else
+			autogenPath = project.getLocation().append(srcDir).append(command);
+		return autogenPath;
+	}
+	
+	private void saveConfigArgs(String[] args) {
+		IPath settingsPath = getConfigSettingsPath();
+		try {
+			File f = settingsPath.toFile();
+			DataOutputStream settings = new DataOutputStream(
+					new BufferedOutputStream(new FileOutputStream(f)));
+			// Write the project name in the configure arguments
+			// so we know if the project gets refactored.
+			settings.writeUTF("project=" + project.getName()); //$NON-NLS-1$
+			for (int i = 0; i < args.length; ++i) {
+				settings.writeUTF(args[i]);
+			}
+			settings.close();
+		} catch (IOException e) {
+			/* What should we do?  */
+		}
+	}
+	
+	private String[] getAutogenArgs() throws BuildException {
+		// Get the arguments to be passed to config from build model
+		ITool[] tool = cfg.getToolsBySuperClassId(AUTOGEN_TOOL_ID);
+		IOption[] options = tool[0].getOptions();
+		ArrayList<String> autogenArgs = new ArrayList<String>();
+		
+		for (int i = 0; i < options.length; ++i) {
+			if (options[i].getValueType() == IOption.STRING) {
+				String value = (String) options[i].getValue();
+				try {
+					String resolved = ManagedBuildManager.getBuildMacroProvider().resolveValue(value, "", null, 
+							IBuildMacroProvider.CONTEXT_CONFIGURATION, cfg);
+					value = resolved;
+				} catch (BuildMacroException e) {
+					// do nothing
+				}
+				String id = options[i].getId();
+				if (id.indexOf("user") > 0) { //$NON-NLS-1$
+					// May be multiple user-specified options in which case we
+					// need to split them up into individual options
+					value = value.trim();
+					boolean finished = false;
+					int lastIndex = value.indexOf("--"); //$NON-NLS-1$
+					if (lastIndex != -1) {
+						while (!finished) {
+							int index = value.indexOf("--",lastIndex+2); //$NON-NLS-1$
+							if (index != -1) {
+								String previous = value.substring(lastIndex, index).trim();
+								autogenArgs.add(previous);
+								value = value.substring(index);
+							} else {
+								autogenArgs.add(value);
+								finished = true;
+							}
+						}
+					}
+				}
+			}
+		}
+		return (String[]) autogenArgs.toArray(new String[autogenArgs.size()]);
+	}
+
+	private String[] getConfigArgs() throws BuildException {
+		// Get the arguments to be passed to config from build model
+		ITool tool = cfg.getToolFromOutputExtension("status"); //$NON-NLS-1$
+		IOption[] options = tool.getOptions();
+		ArrayList<String> configArgs = new ArrayList<String>();
+		for (int i = 0; i < options.length; ++i) {
+			if (options[i].getValueType() == IOption.STRING) {
+				String value = (String) options[i].getValue();
+				try {
+					String resolved = ManagedBuildManager.getBuildMacroProvider().resolveValue(value, "", null, 
+							IBuildMacroProvider.CONTEXT_CONFIGURATION, cfg);
+					value = resolved;
+				} catch (BuildMacroException e) {
+					// do nothing
+				}
+				String id = options[i].getId();
+				if (id.indexOf("configdir") > 0 || id.indexOf("builddir") > 0) //$NON-NLS-1$ $NON-NLS-2$
+					continue;
+				else if (id.indexOf("user") > 0) { //$NON-NLS-1$
+					// May be multiple user-specified options in which case we
+					// need to split them up into individual options
+					value = value.trim();
+					boolean finished = false;
+					int lastIndex = value.indexOf("--"); //$NON-NLS-1$
+					if (lastIndex != -1) {
+						while (!finished) {
+							int index = value.indexOf("--",lastIndex+2); //$NON-NLS-1$
+							if (index != -1) {
+								String previous = value.substring(lastIndex, index).trim();
+								configArgs.add(previous);
+								value = value.substring(index);
+							} else {
+								configArgs.add(value);
+								finished = true;
+							}
+						}
+					} else {
+						// No --xxx arguments, but there might still be some NAME=VALUE args
+						// and we should pass them on regardless
+						configArgs.add(value);
+					}
+				}
+				else if (value.trim().length() > 0) {
+					String categoryId = options[i].getCategory().getId();
+					if (categoryId.indexOf("directories") >= 0) //$NON-NLS-1$
+						value = getAbsoluteDirectory(value);
+					String cmd = options[i].getCommand().concat(value);
+					configArgs.add(cmd);
+				}
+			} else if (options[i].getValueType() == IOption.BOOLEAN) {
+				Boolean value = (Boolean) options[i].getValue();
+				if (value.booleanValue())
+					configArgs.add(options[i].getCommand());
+				else if (!options[i].getCommandFalse().equals(""))
+					configArgs.add(options[i].getCommandFalse());
+			}
+		}
+		return (String[]) configArgs.toArray(new String[configArgs.size()]);
+	}
+
+	// Run a command or executable (e.g. make).
+	private int runCommand(IPath commandPath, IPath runPath, String[] args,
+			String jobDescription, String errMsg, IConsole console, 
+			boolean consoleStart) throws BuildException, CoreException,
+			NullPointerException, IOException {
+		// TODO: Figure out what this next stuff is used for
+		// //try to resolve the build macros in the builder command
+		// try{
+		// String resolved =
+		// ManagedBuildManager.getBuildMacroProvider().resolveValueToMakefileFormat(
+		// configCmd,
+		// "", //$NON-NLS-1$
+		// " ", //$NON-NLS-1$
+		// IBuildMacroProvider.CONTEXT_CONFIGURATION,
+		// info.getDefaultConfiguration());
+		// if((resolved = resolved.trim()).length() > 0)
+		// configCmd = resolved;
+		// } catch (BuildMacroException e){
+		// }
+
+		int rc = IStatus.OK;
+		
+		removeAllMarkers(project);
+		
+		String[] configTargets = args;
+		if (args == null)
+			configTargets = new String[0];
+	
+		String[] msgs = new String[2];
+		msgs[0] = commandPath.toString();
+		msgs[1] = project.getName();
+		monitor.subTask(AutotoolsPlugin.getFormattedString(
+				"MakeGenerator.make.message", msgs)); //$NON-NLS-1$
+
+
+		ConsoleOutputStream consoleOutStream = null;
+		StringBuffer buf = new StringBuffer();
+
+		// Launch command - main invocation
+		if (consoleStart)
+			console.start(project);
+		consoleOutStream = console.getOutputStream();
+		String[] consoleHeader = new String[3];
+
+		consoleHeader[0] = jobDescription;
+		consoleHeader[1] = cfg.getName();
+		consoleHeader[2] = project.getName();
+		buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+		buf.append(jobDescription);
+		buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+		buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+
+		if (!cfg.isSupported()) {
+			String msgArgs[] = new String[1];
+			msgArgs[0] = cfg.getName();
+			buf.append(AutotoolsPlugin.getFormattedString("MakeGenerator.unsupportedConfig", msgArgs));
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+		}
+		consoleOutStream.write(buf.toString().getBytes());
+		consoleOutStream.flush();
+
+		// Get a launcher for the config command
+		CommandLauncher launcher = new CommandLauncher();
+		// Set the environment
+		IEnvironmentVariable variables[] = ManagedBuildManager
+				.getEnvironmentVariableProvider().getVariables(cfg, true);
+		String[] env = null;
+		ArrayList<String> envList = new ArrayList<String>();
+		if (variables != null) {
+			for (int i = 0; i < variables.length; i++) {
+				envList.add(variables[i].getName()
+						+ "=" + variables[i].getValue()); //$NON-NLS-1$
+			}
+			env = (String[]) envList.toArray(new String[envList.size()]);
+		}
+
+		// // Hook up an error parser manager
+		// String[] errorParsers =
+		// info.getDefaultConfiguration().getErrorParserList();
+		// ErrorParserManager epm = new ErrorParserManager(project, topBuildDir,
+		// this, errorParsers);
+		// epm.setOutputStream(consoleOutStream);
+		OutputStream stdout = consoleOutStream;
+		OutputStream stderr = consoleOutStream;
+
+		launcher.showCommand(true);
+		Process proc = launcher.execute(commandPath, configTargets, env,
+				runPath, new NullProgressMonitor());
+		if (proc != null) {
+			try {
+				// Close the input of the process since we will never write to
+				// it
+				proc.getOutputStream().close();
+			} catch (IOException e) {
+			}
+
+			if (launcher.waitAndRead(stdout, stderr, new SubProgressMonitor(
+					monitor, IProgressMonitor.UNKNOWN)) != CommandLauncher.OK) {
+				errMsg = launcher.getErrorMessage();
+			}
+
+			// Force a resync of the projects without allowing the user to
+			// cancel.
+			// This is probably unkind, but short of this there is no way to
+			// ensure
+			// the UI is up-to-date with the build results
+			// monitor.subTask(ManagedMakeMessages
+			// .getResourceString(REFRESH));
+			monitor.subTask(AutotoolsPlugin.getResourceString("MakeGenerator.refresh")); //$NON-NLS-1$
+			try {
+				project.refreshLocal(IResource.DEPTH_INFINITE, null);
+			} catch (CoreException e) {
+				monitor.subTask(AutotoolsPlugin
+						.getResourceString("MakeGenerator.refresh.error")); //$NON-NLS-1$
+			}
+		} else {
+			errMsg = launcher.getErrorMessage();
+		}
+
+		// Report either the success or failure of our mission
+		buf = new StringBuffer();
+		if (errMsg != null && errMsg.length() > 0) {
+			String errorDesc = AutotoolsPlugin
+					.getResourceString("MakeGenerator.generation.error"); //$NON-NLS-1$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			buf.append(errorDesc);
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			buf.append("(").append(errMsg).append(")"); //$NON-NLS-1$ //$NON-NLS-2$
+			rc = IStatus.ERROR;
+		} else if (proc.exitValue() >= 1 || proc.exitValue() < 0) {
+			// We have an invalid return code from configuration.
+			String[] errArg = new String[2];
+			errArg[0] = Integer.toString(proc.exitValue());
+			errArg[1] = commandPath.toString();
+			errMsg = AutotoolsPlugin.getFormattedString(
+					"MakeGenerator.config.error", errArg); //$NON-NLS-1$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			buf.append(AutotoolsPlugin.getResourceString("MakeGenerator.generation.error")); //$NON-NLS-1$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			if (proc.exitValue() == 1)
+				rc = IStatus.WARNING;
+			else
+			    rc = IStatus.ERROR;
+		} else {
+			// Report a successful build
+			String successMsg = 
+				AutotoolsPlugin.getResourceString("MakeGenerator.success"); //$NON-NLS-1$
+			buf.append(successMsg);
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			rc = IStatus.OK;
+		}
+
+		// Write message on the console
+		consoleOutStream.write(buf.toString().getBytes());
+		consoleOutStream.flush();
+
+		// // Generate any error markers that the build has discovered
+		// monitor.subTask(ManagedMakeMessages
+		// .getResourceString(MARKERS));
+		// epm.reportProblems();
+		consoleOutStream.close();
+		
+		// TODO: For now, add a marker with our generated error message.
+		// In the future, we might add an error parser to do this properly
+		// and give the actual error line, etc..
+		if (rc == IStatus.ERROR) {
+			addMarker(project, -1, errMsg, SEVERITY_ERROR_BUILD, null);
+			// Mark the configuration as needing a full rebuild.
+			cfg.setRebuildState(true);
+		}
+		
+		return rc;
+	}
+	
+	// Get the path string.  We add a Win check to handle MingW.
+	// For MingW, we would rather represent C:\a\b as /C/a/b which
+	// doesn't cause Makefile to choke.
+	// TODO: further logic would be needed to handle cygwin if desired
+	private String getPathString(IPath path) {
+		String s = path.toString();
+		if (Platform.getOS().equals(Platform.OS_WIN32))
+			s = s.replaceAll("^([A-Z])(:)", "/$1");
+		return s;
+	}
+	
+	// Run an autotools script (e.g. configure, autogen.sh, config.status).
+	private int runScript(IPath commandPath, IPath runPath, String[] args,
+			String jobDescription, String errMsg, IConsole console, 
+			ArrayList<String> additionalEnvs, 
+			boolean consoleStart) throws BuildException, CoreException,
+			NullPointerException, IOException {
+		// TODO: Figure out what this next stuff is used for
+		// //try to resolve the build macros in the builder command
+		// try{
+		// String resolved =
+		// ManagedBuildManager.getBuildMacroProvider().resolveValueToMakefileFormat(
+		// configCmd,
+		// "", //$NON-NLS-1$
+		// " ", //$NON-NLS-1$
+		// IBuildMacroProvider.CONTEXT_CONFIGURATION,
+		// info.getDefaultConfiguration());
+		// if((resolved = resolved.trim()).length() > 0)
+		// configCmd = resolved;
+		// } catch (BuildMacroException e){
+		// }
+
+		int rc = IStatus.OK;
+		
+		removeAllMarkers(project);
+		
+		// We want to run the script via the shell command.  So, we add the command
+		// script as the first argument and expect "sh" to be on the runtime path.
+		// Any other arguments are placed after the script name.
+		String[] configTargets = null;
+		if (args == null)
+			configTargets = new String[1];
+		else {
+			configTargets = new String[args.length+1];
+			System.arraycopy(args, 0, configTargets, 1, args.length);
+		}
+		configTargets[0] = getPathString(commandPath);
+		
+		String[] msgs = new String[2];
+		msgs[0] = commandPath.toString();
+		msgs[1] = project.getName();
+		monitor.subTask(AutotoolsPlugin.getFormattedString(
+				"MakeGenerator.make.message", msgs)); //$NON-NLS-1$
+
+
+		ConsoleOutputStream consoleOutStream = null;
+		StringBuffer buf = new StringBuffer();
+
+		// Launch command - main invocation
+		if (consoleStart)
+			console.start(project);
+		consoleOutStream = console.getOutputStream();
+		String[] consoleHeader = new String[3];
+
+		consoleHeader[0] = jobDescription;
+		consoleHeader[1] = cfg.getName();
+		consoleHeader[2] = project.getName();
+		buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+		buf.append(jobDescription);
+		buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+		buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+
+		if (!cfg.isSupported()) {
+			String msgArgs[] = new String[1];
+			msgArgs[0] = cfg.getName();
+			buf.append(AutotoolsPlugin.getFormattedString("MakeGenerator.unsupportedConfig", msgArgs)); // $NON-NLS-1$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+		}
+		consoleOutStream.write(buf.toString().getBytes());
+		consoleOutStream.flush();
+
+		// Get a launcher for the config command
+		CommandLauncher launcher = new CommandLauncher();
+		// Set the environment
+		IEnvironmentVariable variables[] = ManagedBuildManager
+				.getEnvironmentVariableProvider().getVariables(cfg, true);
+		String[] env = null;
+		ArrayList<String> envList = new ArrayList<String>();
+		if (variables != null) {
+			for (int i = 0; i < variables.length; i++) {
+				envList.add(variables[i].getName()
+						+ "=" + variables[i].getValue()); //$NON-NLS-1$
+			}
+			if (additionalEnvs != null)
+				envList.addAll(additionalEnvs); // add any additional environment variables specified ahead of script
+			env = (String[]) envList.toArray(new String[envList.size()]);
+		}
+
+		// // Hook up an error parser manager
+		// String[] errorParsers =
+		// info.getDefaultConfiguration().getErrorParserList();
+		// ErrorParserManager epm = new ErrorParserManager(project, topBuildDir,
+		// this, errorParsers);
+		// epm.setOutputStream(consoleOutStream);
+		OutputStream stdout = consoleOutStream;
+		OutputStream stderr = consoleOutStream;
+
+		launcher.showCommand(true);
+		// Run the shell script via shell command.
+		Process proc = launcher.execute(new Path(SHELL_COMMAND), configTargets, env,
+				runPath, new NullProgressMonitor());
+		if (proc != null) {
+			try {
+				// Close the input of the process since we will never write to
+				// it
+				proc.getOutputStream().close();
+			} catch (IOException e) {
+			}
+
+			if (launcher.waitAndRead(stdout, stderr, new SubProgressMonitor(
+					monitor, IProgressMonitor.UNKNOWN)) != CommandLauncher.OK) {
+				errMsg = launcher.getErrorMessage();
+			}
+
+			// Force a resync of the projects without allowing the user to
+			// cancel.
+			// This is probably unkind, but short of this there is no way to
+			// ensure
+			// the UI is up-to-date with the build results
+			// monitor.subTask(ManagedMakeMessages
+			// .getResourceString(REFRESH));
+			monitor.subTask(AutotoolsPlugin.getResourceString("MakeGenerator.refresh")); //$NON-NLS-1$
+			try {
+				project.refreshLocal(IResource.DEPTH_INFINITE, null);
+			} catch (CoreException e) {
+				monitor.subTask(AutotoolsPlugin
+						.getResourceString("MakeGenerator.refresh.error")); //$NON-NLS-1$
+			}
+		} else {
+			errMsg = launcher.getErrorMessage();
+		}
+
+		// Report either the success or failure of our mission
+		buf = new StringBuffer();
+		if (errMsg != null && errMsg.length() > 0) {
+			String errorDesc = AutotoolsPlugin
+					.getResourceString("MakeGenerator.generation.error"); //$NON-NLS-1$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			buf.append(errorDesc);
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			buf.append("(").append(errMsg).append(")"); //$NON-NLS-1$ //$NON-NLS-2$
+			rc = IStatus.ERROR;
+		} else if (proc.exitValue() >= 1 || proc.exitValue() < 0) {
+			// We have an invalid return code from configuration.
+			String[] errArg = new String[2];
+			errArg[0] = Integer.toString(proc.exitValue());
+			errArg[1] = commandPath.toString();
+			errMsg = AutotoolsPlugin.getFormattedString(
+					"MakeGenerator.config.error", errArg); //$NON-NLS-1$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			buf.append(AutotoolsPlugin.getResourceString("MakeGenerator.generation.error")); //$NON-NLS-1$
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			if (proc.exitValue() == 1)
+				rc = IStatus.WARNING;
+			else
+			    rc = IStatus.ERROR;
+		} else {
+			// Report a successful build
+			String successMsg = 
+				AutotoolsPlugin.getResourceString("MakeGenerator.success"); //$NON-NLS-1$
+			buf.append(successMsg);
+			buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
+			rc = IStatus.OK;
+		}
+
+		// Write message on the console
+		consoleOutStream.write(buf.toString().getBytes());
+		consoleOutStream.flush();
+
+		// // Generate any error markers that the build has discovered
+		// monitor.subTask(ManagedMakeMessages
+		// .getResourceString(MARKERS));
+		// epm.reportProblems();
+		consoleOutStream.close();
+		
+		// TODO: For now, add a marker with our generated error message.
+		// In the future, we might add an error parser to do this properly
+		// and give the actual error line, etc..
+		if (rc == IStatus.ERROR) {
+			addMarker(project, -1, errMsg, SEVERITY_ERROR_BUILD, null);
+			// Mark the configuration as needing a full rebuild.
+			cfg.setRebuildState(true);
+		}
+		
+		return rc;
+	}
+	
+	private ICStorageElement createTargetElement(ICStorageElement parent, IMakeTarget target) {
+		ICStorageElement targetElem = parent.createChild(TARGET_ELEMENT);
+		targetElem.setAttribute(TARGET_ATTR_NAME, target.getName());
+		targetElem.setAttribute(TARGET_ATTR_ID, target.getTargetBuilderID());
+		targetElem.setAttribute(TARGET_ATTR_PATH, target.getContainer().getProjectRelativePath().toString());
+		ICStorageElement elem = targetElem.createChild(TARGET_COMMAND);
+		elem.setValue(target.getBuildAttribute(IMakeCommonBuildInfo.BUILD_COMMAND, "make")); //$NON-NLS-1$
+
+		String targetAttr = target.getBuildAttribute(IMakeCommonBuildInfo.BUILD_ARGUMENTS, null);
+		if ( targetAttr != null) {
+			elem = targetElem.createChild(TARGET_ARGUMENTS);
+			elem.setValue(targetAttr);
+		}
+
+		targetAttr = target.getBuildAttribute(IMakeTarget.BUILD_TARGET, null);
+		if (targetAttr != null) {
+			elem = targetElem.createChild(TARGET);
+			elem.setValue(targetAttr);
+		}
+
+		elem = targetElem.createChild(TARGET_STOP_ON_ERROR);
+		elem.setValue(new Boolean(target.isStopOnError()).toString());
+
+		elem = targetElem.createChild(TARGET_USE_DEFAULT_CMD);
+		elem.setValue(new Boolean(target.isDefaultBuildCmd()).toString());
+
+		elem = targetElem.createChild(TARGET_RUN_ALL_BUILDERS);
+		elem.setValue(new Boolean(target.runAllBuilders()).toString());
+
+		return targetElem;
+	}
+
+	/**
+	 * This output method saves the information into the .cdtproject metadata file.
+	 * 
+	 * @param doc
+	 * @throws CoreException
+	 */
+	private void saveTargets(IMakeTarget[] makeTargets) throws CoreException {
+		ICDescriptor descriptor = CCorePlugin.getDefault().getCProjectDescription(getProject(), true);
+		ICStorageElement rootElement = descriptor.getProjectStorageElement(MAKE_TARGET_KEY);
+
+		//Nuke the children since we are going to write out new ones
+		rootElement.clear();
+
+		// Fetch the ProjectTargets as ICStorageElements
+		rootElement = rootElement.createChild(BUILD_TARGET_ELEMENT);
+		for (int i = 0; i < makeTargets.length; ++i)
+			createTargetElement(rootElement, makeTargets[i]);
+
+		//Save the results
+		descriptor.saveProjectData();
+	}
+	
+
+	protected class MakeTargetComparator implements Comparator<Object> {
+		public int compare(Object a, Object b) {
+			IMakeTarget make1 = (IMakeTarget)a;
+			IMakeTarget make2 = (IMakeTarget)b;
+			return make1.getName().compareToIgnoreCase(make2.getName());
+		}
+		
+	}
+
+	/**
+	 * This method parses the given Makefile and produces MakeTargets for all targets so the
+	 * end-user can access them from the MakeTargets popup-menu.
+	 * 
+	 * @param makefileFile the Makefile to parse
+	 * @throws CoreException
+	 */
+	private void addMakeTargetsToManager(File makefileFile) throws CoreException {
+		// Return immediately if no Makefile.
+		if (makefileFile == null || !makefileFile.exists())
+			return;
+		
+		checkCancel();
+		if (monitor == null)
+			monitor = new NullProgressMonitor();
+		String statusMsg = AutotoolsPlugin.getResourceString("MakeGenerator.refresh.MakeTargets");	//$NON-NLS-1$
+		monitor.subTask(statusMsg);
+		
+		IMakeTargetManager makeTargetManager = 
+			MakeCorePlugin.getDefault().getTargetManager();
+		
+		IMakefile makefile = MakeCorePlugin.createMakefile(makefileFile.toURI(), false, null);
+		ITargetRule[] targets = makefile.getTargetRules();
+		ITarget target = null;
+		Map<String, IMakeTarget> makeTargets = new HashMap<String, IMakeTarget>(); // use a HashMap so duplicate names are handled
+		for (int i = 0; i < targets.length; i++) {
+			target = targets[i].getTarget();
+			String targetName = target.toString();
+			if (!isValidTarget(targetName, makeTargetManager))
+				continue;
+			try {
+				IMakeTarget makeTarget = makeTargetManager.createTarget(
+						project, targetName, "org.eclipse.linuxtools.cdt.autotools.builder1"); //$NON-NLS-1$
+				makeTarget.setContainer(project);
+				makeTarget.setStopOnError(true);
+				makeTarget.setRunAllBuilders(false);
+				makeTarget.setUseDefaultBuildCmd(true);
+
+				makeTarget.setBuildAttribute(GENERATED_TARGET, "true");
+				makeTarget.setBuildAttribute(IMakeTarget.BUILD_TARGET,
+						targetName);
+
+				makeTarget.setBuildAttribute(IMakeTarget.BUILD_LOCATION,
+						buildDir);
+				makeTargets.put(makeTarget.getName(), makeTarget);
+			} catch (CoreException e) {
+				// Duplicate target.  Ignore.
+			}
+		}
+		
+		IMakeTarget[] makeTargetArray = new IMakeTarget[makeTargets.size()];
+		Collection<IMakeTarget> values = makeTargets.values();
+		ArrayList<IMakeTarget> valueList = new ArrayList<IMakeTarget>(values);
+		valueList.toArray(makeTargetArray);
+		MakeTargetComparator compareMakeTargets = new MakeTargetComparator();
+		Arrays.sort(makeTargetArray, compareMakeTargets);
+		
+		saveTargets(makeTargetArray);
+	}
+
+	private boolean isValidTarget(String targetName, IMakeTargetManager makeTargetManager) {
+		return !(targetName.endsWith("-am") //$NON-NLS-1$
+				|| targetName.endsWith("PROGRAMS") //$NON-NLS-1$
+				|| targetName.endsWith("-generic") //$NON-NLS-1$
+				|| (targetName.indexOf('$') >= 0)
+				|| (targetName.charAt(0) == '.')
+				|| targetName.equals(targetName.toUpperCase()));
+	}
+	
+	// Turn the string into an array.
+	private String[] makeArray(String string) {
+		string = string.trim();
+		char[] array = string.toCharArray();
+		ArrayList<String> aList = new ArrayList<String>();
+		StringBuilder buffer = new StringBuilder();
+		boolean inComment = false;
+		for (int i = 0; i < array.length; i++) {
+			char c = array[i];
+			boolean needsToAdd = true;
+			if (array[i] == '"' || array[i] == '\'') {
+				if (i > 0 && array[i - 1] == '\\') {
+					inComment = false;
+				} else {
+					inComment = !inComment;
+					needsToAdd = false; // skip it
+				}
+			}
+			if (c == ' ' && !inComment) {
+				if (buffer.length() > 0){
+					String str = buffer.toString().trim();
+					if(str.length() > 0){
+						aList.add(str);
+					}
+				}
+				buffer = new StringBuilder();
+			} else {
+				if (needsToAdd)
+					buffer.append(c);
+			}
+		}
+		if (buffer.length() > 0){
+			String str = buffer.toString().trim();
+			if(str.length() > 0){
+				aList.add(str);
+			}
+		}
+		return (String[])aList.toArray(new String[aList.size()]);
+	}
+
+}
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/Resources.properties b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/Resources.properties
new file mode 100644
index 0000000..7b4c917
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/Resources.properties
@@ -0,0 +1,95 @@
+#################################################################################
+#  Copyright (c) 2006, 2007 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+# 
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#      IBM Rational Software - ManagedMakeMessages copied to AutotoolsMakefileBuilder
+#################################################################################
+MakeCWizard.title=C/Make Project
+MakeCWizard.description=Create a New C Project using 'make' to build it
+
+WARNING_UNSUPPORTED_CONFIGURATION=Warning: unsupported configuration
+
+AutotoolsMakefileBuilder.message.finished=Build complete for project {0}
+AutotoolsMakefileBuilder.type.clean=Clean-only build
+AutotoolsMakefileBuilder.message.clean.deleting.output=Removing build artifacts from {0}
+AutotoolsMakefileBuilder.message.console.header=**** {0} of configuration {1} for project {2} ****
+
+MakeGenerator.makefile.built=Makefile built
+MakeGenerator.refresh=Refresh
+MakeGenerator.refresh.error=Refresh error
+MakeGenerator.generation.error=Configuration failed with error
+MakeGenerator.configuring=Configuring
+MakeGenerator.createdir.error=Error creating build directory: {0}
+MakeGenerator.make.message=Invoking {0} for project {1}
+MakeGenerator.config.error=Error {0} occurred while running {1}
+MakeGenerator.run.config.status=Running config.status
+MakeGenerator.makefile.cvs=Invoking Makefile.cvs
+MakeGenerator.autogen.sh=Invoking autogen.sh
+MakeGenerator.autoreconf=Invoking autoreconf
+MakeGenerator.gen.makefile=Generating Makefile
+MakeGenerator.gen.configure=Generating configure
+MakeGenerator.unsupportedConfig=Warning: unsupported configuration {0}
+MakeGenerator.success=[Operation successful]
+MakeGenerator.didnt.generate=No Makefile generated
+MakeGenerator.refresh.MakeTargets=Refreshing Make Targets
+MakeGenerator.clean.builddir=Cleaning build directory before reconfiguring
+
+
+BuildDir.apply=Build directory already in use
+BuildDir.default=Default build directory to unused value?
+BuildDir.yes=Yes
+BuildDir.no=No
+
+WizardAutotoolsProjectConversion.title=Convert to a CVS C/C++ Autotools Project
+WizardAutotoolsProjectConversion.description=Convert a CVS source repository to C/C++ Autotools Project
+WizardAutotoolsProjectConversion.message.add_nature=Adding C/C++ Autotools Managed Project Nature
+WizardAutotoolsProjectConversion.message.add_builder=Adding C/C++ Autotools Managed Project Builder
+WizardMakeProjectConversion.monitor.convertingToMakeProject=Converting Project...
+WizardAutotoolsConversion=CVS C/C++ Autotools Conversion
+WizardAutotoolsConversion.windowTitle=Conversion to CVS C/C++ Autotools Project
+WizardAutotoolsConversion.config.title=Select a configuration
+WizardAutotoolsConversion.config.desc=Select the configuration you wish to deploy on
+WizardAutotoolsConversion.options.title=Additional Project Settings
+WizardAutotoolsConversion.options.desc=Define the inter-project dependencies, if any.
+WizardAutotoolsConversion.message.save=Saving new build options
+
+WizardAutotoolsNewCProject.title=Autotools C Project
+WizardAutotoolsNewCProject.description=Create a new C Autotools project
+WizardAutotoolsNewCProject.monitor.creatingProject=Creating Project...
+WizardAutotoolsNewCProject.windowTitle=GNU Autotools C Project
+WizardAutotoolsNewCProject.config.title=Select a configuration
+WizardAutotoolsNewCProject.config.desc=Select the configuration you wish to deploy on
+WizardAutotoolsNewCProject.options.title=Additional Project Settings
+WizardAutotoolsNewCProject.options.desc=Define the inter-project dependencies, if any.
+WizardAutotoolsNewCProject.message.save=Saving new build options
+
+WizardAutotoolsNewCCProject.title=Autotools C++ Project
+WizardAutotoolsNewCCProject.description=Create a new C++ Autotools project
+WizardAutotoolsNewCCProject.monitor.creatingProject=Creating Project...
+WizardAutotoolsNewCCProject.windowTitle=GNU Autotools C++ Project
+WizardAutotoolsNewCCProject.config.title=Select a configuration
+WizardAutotoolsNewCCProject.config.desc=Select the configuration you wish to deploy on
+WizardAutotoolsNewCCProject.options.title=Additional Project Settings
+WizardAutotoolsNewCCProject.options.desc=Define the inter-project dependencies, if any.
+WizardAutotoolsNewCCProject.message.save=Saving new build options
+
+
+BuildTargetDialog.title.buildTarget=Build Special Targets
+BuildTargetDialog.title.makeTargetsFor=Make targets for 
+BuildTargetDialog.button.build=Build
+
+TargetListViewer.button.add=Add...
+TargetListViewer.button.remove=Remove
+TargetListViewer.button.edit=Edit...
+TargetListViewer.label.target=Target
+TargetListViewer.label.location=Location
+TargetListViewer.exception.error=Error
+TargetListViewer.exception.message=An error occurred performing the selected action
+
+AutotoolsPreferencePage.useAutotoolsFileScanner.label=Use make -w for includepath scanning
+MakeTargetPreferencePage.buildTargetInBackground.label=Build target in background
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractAutotoolsHandler.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractAutotoolsHandler.java
new file mode 100644
index 0000000..be54ee8
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractAutotoolsHandler.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import java.util.Collection;
+
+import org.eclipse.cdt.core.model.ICContainer;
+import org.eclipse.cdt.core.model.ICElement;
+import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IResource;
+
+public abstract class AbstractAutotoolsHandler extends AbstractHandler {
+	
+	@SuppressWarnings("unchecked")
+	protected IContainer getContainer(IEvaluationContext e) {
+		IContainer fContainer = null;
+
+		Object obj = e.getDefaultVariable();
+		if (obj instanceof Collection) {
+			Collection<Object> c = (Collection<Object>)obj;
+			Object[] objArray = c.toArray();
+			if (objArray.length > 0)
+				obj = objArray[0];
+		}
+		if (obj instanceof ICElement) {
+			if ( obj instanceof ICContainer || obj instanceof ICProject) {
+				fContainer = (IContainer) ((ICElement) obj).getUnderlyingResource();
+			} else {
+				obj = ((ICElement)obj).getResource();
+				if ( obj != null) {
+					fContainer = ((IResource)obj).getParent();
+				}
+			}
+		} else if (obj instanceof IResource) {
+			if (obj instanceof IContainer) {
+				fContainer = (IContainer) obj;
+			} else {
+				fContainer = ((IResource)obj).getParent();
+			}
+		} else {
+			fContainer = null;
+		}
+		return fContainer;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractTargetAction.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractTargetAction.java
new file mode 100644
index 0000000..367d63a
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AbstractTargetAction.java
@@ -0,0 +1,93 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2004 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.cdt.core.model.ICContainer;
+import org.eclipse.cdt.core.model.ICElement;
+import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.linuxtools.cdt.autotools.AutotoolsMakefileBuilder;
+import org.eclipse.linuxtools.cdt.autotools.AutotoolsPlugin;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IObjectActionDelegate;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.eclipse.ui.actions.ActionDelegate;
+
+
+public abstract class AbstractTargetAction
+	extends ActionDelegate
+	implements IObjectActionDelegate, IWorkbenchWindowActionDelegate {
+	private IWorkbenchPart fPart;
+	private IWorkbenchWindow fWindow;
+	private IContainer fContainer;
+
+	protected Shell getShell() {
+		if (fPart != null) {
+			return fPart.getSite().getShell();
+		} else if (fWindow != null) {
+			return fWindow.getShell();
+		}
+		return AutotoolsPlugin.getActiveWorkbenchShell();
+	}
+
+	protected IContainer getSelectedContainer() {
+		return fContainer;
+	}
+
+	public void setSelectedContainer(IContainer container) {
+		fContainer = container;
+	}
+	
+	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
+		fPart = targetPart;
+	}
+
+	public void init(IWorkbenchWindow window) {
+		fWindow = window;
+	}
+
+	public void selectionChanged(IAction action, ISelection selection) {
+		boolean enabled = false;
+		if (selection instanceof IStructuredSelection) {
+			IStructuredSelection sel = (IStructuredSelection) selection;
+			Object obj = sel.getFirstElement();
+			if (obj instanceof ICElement) {
+				if ( obj instanceof ICContainer || obj instanceof ICProject) {
+					fContainer = (IContainer) ((ICElement) obj).getUnderlyingResource();
+				} else {
+					obj = ((ICElement)obj).getResource();
+					if ( obj != null) {
+						fContainer = ((IResource)obj).getParent();
+					}
+				}
+			} else if (obj instanceof IResource) {
+				if (obj instanceof IContainer) {
+					fContainer = (IContainer) obj;
+				} else {
+					fContainer = ((IResource)obj).getParent();
+				}
+			} else {
+				fContainer = null;
+			}
+			if (fContainer != null && AutotoolsMakefileBuilder.hasTargetBuilder(fContainer.getProject())) {
+				enabled = true;
+			}
+		}
+		action.setEnabled(enabled);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AclocalHandler.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AclocalHandler.java
new file mode 100644
index 0000000..b534cfe
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AclocalHandler.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+/**
+ * @author Jeff Johnston
+ *
+ */
+public class AclocalHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		InvokeAclocalAction a = new InvokeAclocalAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AutoconfHandler.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AutoconfHandler.java
new file mode 100644
index 0000000..9dc28e2
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AutoconfHandler.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+public class AutoconfHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		InvokeAutoconfAction a = new InvokeAutoconfAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AutoheaderHandler.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AutoheaderHandler.java
new file mode 100644
index 0000000..e64ad41
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AutoheaderHandler.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+/**
+ * @author Jeff Johnston
+ *
+ */
+public class AutoheaderHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		InvokeAutoheaderAction a = new InvokeAutoheaderAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AutomakeHandler.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AutomakeHandler.java
new file mode 100644
index 0000000..c1bbcf4
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AutomakeHandler.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+public class AutomakeHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		InvokeAutomakeAction a = new InvokeAutomakeAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AutoreconfHandler.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AutoreconfHandler.java
new file mode 100644
index 0000000..d9b0c8c
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/AutoreconfHandler.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+/**
+ * @author Jeff Johnston
+ *
+ */
+public class AutoreconfHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		InvokeAutoreconfAction a = new InvokeAutoreconfAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java
new file mode 100644
index 0000000..0834ef4
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAclocalAction.java
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyConstants;
+import org.eclipse.swt.widgets.Shell;
+
+
+public class InvokeAclocalAction extends InvokeAction {
+
+	private static final String DEFAULT_OPTION = ""; //$NON-NLS-1$
+	private static final String DEFAULT_COMMAND = "aclocal"; //$NON-NLS-1$
+
+	public void run(IAction action) {
+
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+		
+		IPath execDir = getExecDir(container);
+		String cwd = InvokeMessages.getString("CWD") + getCWD(container); //$NON-NLS-1$
+
+		TwoInputDialog optionDialog = new TwoInputDialog(
+				new Shell(),
+				cwd,
+				InvokeMessages
+						.getString("InvokeAclocalAction.windowTitle.options"), //$NON-NLS-1$
+				InvokeMessages
+						.getString("InvokeAclocalAction.message.options.otherOptions"), //$NON-NLS-1$
+				InvokeMessages
+						.getString("InvokeAclocalAction.message.options.includeDir"), DEFAULT_OPTION, null); //$NON-NLS-1$
+
+		optionDialog.open();
+
+		// chop args into string array
+		String rawArgList = optionDialog.getValue();
+
+		String[] optionsList = separateOptions(rawArgList);
+
+		// chop args into string array
+		rawArgList = optionDialog.getSecondValue();
+
+		String[] targetList = separateTargets(rawArgList);
+
+		if (targetList == null) {
+
+			showError(InvokeMessages
+					.getString("InvokeAction.execute.windowTitle.error"), //$NON-NLS-1$
+					InvokeMessages
+							.getString("InvokeAction.windowTitle.quoteError")); //$NON-NLS-1$
+			return;
+		}
+
+		int iOption = 0;
+		if (targetList.length > 0)
+			iOption = 1;
+
+		String[] argumentList = new String[targetList.length
+				+ optionsList.length + iOption];
+
+		System.arraycopy(optionsList, 0, argumentList, 0, optionsList.length);
+
+		if (iOption == 1)
+			argumentList[optionsList.length] = "-I"; //$NON-NLS-1$
+
+		System.arraycopy(targetList, 0, argumentList, optionsList.length
+				+ iOption, targetList.length);
+
+		if (container != null) {
+			String aclocalCommand = null;
+			IProject project = getSelectedContainer().getProject();
+			try {
+				aclocalCommand = project.getPersistentProperty(AutotoolsPropertyConstants.ACLOCAL_TOOL);
+			} catch (CoreException e) {
+				// do nothing
+			}
+			
+			// If unset, use default system path
+			if (aclocalCommand == null)
+				aclocalCommand = DEFAULT_COMMAND;
+			
+			executeConsoleCommand(DEFAULT_COMMAND, aclocalCommand,
+					argumentList, execDir);
+		}
+	}
+
+	public void dispose() {
+
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java
new file mode 100644
index 0000000..0197973
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAction.java
@@ -0,0 +1,442 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007, 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.StringTokenizer;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.CommandLauncher;
+import org.eclipse.cdt.core.ConsoleOutputStream;
+import org.eclipse.cdt.core.envvar.IEnvironmentVariable;
+import org.eclipse.cdt.core.resources.IConsole;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.core.runtime.jobs.ISchedulingRule;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.linuxtools.cdt.autotools.AutotoolsPlugin;
+import org.eclipse.linuxtools.cdt.autotools.MakeGenerator;
+import org.eclipse.swt.widgets.Shell;
+
+public abstract class InvokeAction extends AbstractTargetAction {
+
+	protected void showInformation(String title, String content) {
+
+		MessageDialog.openInformation(new Shell(), title, content);
+	}
+
+	protected void showError(String title, String content) {
+
+		MessageDialog.openError(new Shell(), title, content);
+	}
+
+	protected void showSuccess(String title) {
+		MessageDialog.openInformation(new Shell(), title, 
+				InvokeMessages.getString("InvokeAction.success")); //$NON-NLS-1$
+	}
+	
+	protected String showInput(String title, String content, String defaultTxt) {
+		InputDialog getOptionDialog = new InputDialog(new Shell(), title,
+				content, defaultTxt, null);
+
+		getOptionDialog.open();
+
+		return getOptionDialog.getValue();
+	}
+
+	/**
+	 * Separate targets to array from a string.
+	 * 
+	 * @param rawArgList
+	 * @return targets in string[] array. if targets are not formatted properly,
+	 *         returns null
+	 */
+	protected String[] separateTargets(String rawArgList) {
+
+		StringTokenizer st = new StringTokenizer(rawArgList, " "); //$NON-NLS-1$
+		ArrayList<String> targetList = new ArrayList<String>();
+
+		while (st.hasMoreTokens()) {
+			String currentWord = st.nextToken().trim();
+
+			if (currentWord.startsWith("'")) { //$NON-NLS-1$
+				String tmpTarget = ""; //$NON-NLS-1$
+				while (!currentWord.endsWith("'")) { //$NON-NLS-1$
+					tmpTarget += currentWord + " "; //$NON-NLS-1$
+					if (!st.hasMoreTokens()) {
+						// quote not closed properly, so return null
+						return null;
+					}
+					currentWord = st.nextToken().trim();
+				}
+
+				tmpTarget += currentWord;
+				targetList.add(tmpTarget);
+				continue;
+			}
+
+			if (currentWord.startsWith("\"")) { //$NON-NLS-1$
+				String tmpTarget = ""; //$NON-NLS-1$
+				while (!currentWord.endsWith("\"")) { //$NON-NLS-1$
+					tmpTarget += currentWord + " "; //$NON-NLS-1$
+					if (!st.hasMoreTokens()) {
+						// double quote not closed properly, so return null
+						return null;
+					}
+					currentWord = st.nextToken().trim();
+				}
+
+				tmpTarget += currentWord;
+				targetList.add(tmpTarget);
+				continue;
+			}
+
+			// for targets without quote/double quotes.
+			targetList.add(currentWord);
+
+		}
+
+		return (String[])targetList.toArray(new String[targetList.size()]);
+	}
+
+	protected String[] separateOptions(String rawArgList) {
+		ArrayList<String> argList = new ArrayList<String>();
+		// May be multiple user-specified options in which case we
+		// need to split them up into individual options
+		rawArgList = rawArgList.trim();
+		boolean finished = false;
+		int lastIndex = rawArgList.indexOf("--"); //$NON-NLS-1$
+		if (lastIndex != -1) {
+			while (!finished) {
+				int index = rawArgList.indexOf("--", lastIndex + 2); //$NON-NLS-1$
+				if (index != -1) {
+					String previous = rawArgList.substring(lastIndex, index)
+							.trim();
+					argList.add(previous);
+					rawArgList = rawArgList.substring(index);
+				} else {
+					argList.add(rawArgList);
+					finished = true;
+				}
+			}
+		}
+
+		return (String[])argList.toArray(new String[argList.size()]);
+
+	}
+
+	protected String[] simpleParseOptions(String rawArgList) {
+		ArrayList<String> argList = new ArrayList<String>();
+		int lastArgIndex = -1;
+		int i = 0;
+		while (i < rawArgList.length()) {
+			char ch = rawArgList.charAt(i);
+			// Skip white-space
+			while (Character.isWhitespace(ch)) {
+				++i;
+				if (i < rawArgList.length())
+					ch = rawArgList.charAt(i);
+				else // Otherwise we are done
+					return argList.toArray(new String[argList.size()]);
+			}
+
+			// Simplistic parser.  We break up into strings delimited
+			// by blanks.  If quotes are used, we ignore blanks within.
+			// If a backslash is used, we ignore the next character and
+			// pass it through.
+			lastArgIndex = i;
+			boolean inString = false;
+			while (i < rawArgList.length()) {
+				ch = rawArgList.charAt(i);
+				if (ch == '\\') // escape character
+					++i; // skip over the next character
+				else if (ch == '\"') { // double quotes
+					inString = !inString;
+				} else if (Character.isWhitespace(ch)) {
+					if (!inString) {
+						argList.add(rawArgList.substring(lastArgIndex, i));
+						break;
+					}
+				}
+				++i;
+			}
+			// Look for the case where we ran out of chars for the last
+			// token.
+			if (i >= rawArgList.length())
+				argList.add(rawArgList.substring(lastArgIndex));
+			++i;
+		}
+		return argList.toArray(new String[argList.size()]);
+	}
+
+	protected IPath getExecDir(IContainer container) {
+		int type = container.getType();
+		IPath execDir = null;
+		if (type == IContainer.FILE) {
+			execDir = container.getLocation().removeLastSegments(1);
+		} else {
+			execDir = container.getLocation();
+		}
+		return execDir;
+	}
+	
+	protected IPath getCWD(IContainer container) {
+		int type = container.getType();
+		IPath cwd = null;
+		if (type == IContainer.FILE) {
+			cwd = container.getFullPath().removeLastSegments(1);
+		} else {
+			cwd = container.getFullPath();
+		}
+		return cwd;
+	}
+	
+	private class ExecuteProgressDialog implements IRunnableWithProgress {
+		private IPath command;
+		private String[] argumentList;
+		private String[] envList;
+		private IPath execDir;
+		private int status;
+		private HashMap<String, String> outputs = null;
+		
+		public ExecuteProgressDialog(IPath command, String[] argumentList,
+				String[] envList, IPath execDir) {
+			this.command = command;
+			this.argumentList = argumentList;
+			this.envList = envList;
+			this.execDir = execDir;
+		}
+
+		public void run(IProgressMonitor monitor)
+		throws InvocationTargetException, InterruptedException {
+			ByteArrayOutputStream stdout = new ByteArrayOutputStream();
+			ByteArrayOutputStream stderr = new ByteArrayOutputStream();
+			CommandLauncher cmdL = new CommandLauncher();
+			outputs = null;
+
+			// invoke command
+			try {
+				monitor.beginTask(
+						InvokeMessages.getFormattedString("InvokeAction.progress.message", // $NON-NLS-1$
+								new String[]{command.toOSString()}), IProgressMonitor.UNKNOWN);
+				monitor.worked(1);
+				Process process = cmdL.execute(command, argumentList, envList,
+						execDir, new NullProgressMonitor());
+
+				if (cmdL.waitAndRead(stdout, stderr) == CommandLauncher.OK) {
+					try {
+						status = 0;
+						monitor.done();
+						process.getOutputStream().close();
+					} catch (IOException e) {
+						// ignore
+					}
+				} else {
+					// failed to execute command
+					status = -1;
+					monitor.done();
+					return;
+				}
+			} catch (CoreException e) {
+				monitor.done();
+				throw new InvocationTargetException(e);
+			}
+
+			outputs = new HashMap<String, String>();
+
+			outputs.put("stdout", stdout.toString()); //$NON-NLS-1$
+			outputs.put("stderr", stderr.toString()); //$NON-NLS-1$
+
+			try {
+				stdout.close();
+				stderr.close();
+			} catch (IOException e) {
+				// ignore
+			}
+		}
+			
+		public HashMap<String, String> getOutputs() {
+			return outputs;
+		}
+		
+		public int getStatus() {
+			return status;
+		}
+	}
+	
+	
+	protected HashMap<String, String> executeCommand(IPath command,
+			String[] argumentList, String[] envList, IPath execDir) {
+		try {
+			ExecuteProgressDialog d = new ExecuteProgressDialog(command,
+					argumentList, envList, execDir);
+			new ProgressMonitorDialog(new Shell()).run(false, false, d);
+			if (d.getStatus() == -1)
+				showError(InvokeMessages
+					.getString("InvokeAction.execute.windowTitle.error"), InvokeMessages //$NON-NLS-1$
+					.getString("InvokeAction.execute.message") //$NON-NLS-1$
+					+ command.toOSString()); //$NON-NLS-1$
+			return d.getOutputs();
+		} catch (InvocationTargetException e) {
+			showError(InvokeMessages
+					.getString("InvokeAction.execute.windowTitle.error"), InvokeMessages //$NON-NLS-1$
+					.getString("InvokeAction.execute.message") //$NON-NLS-1$
+					+ command.toOSString()); //$NON-NLS-1$
+			AutotoolsPlugin.logException(e);
+			return null;
+		} catch (InterruptedException e) {
+		    return null;
+		}
+	}
+
+	protected void executeConsoleCommand(final String actionName, final String command,
+			final String[] argumentList, final IPath execDir) {
+		// We need to use a workspace root scheduling rule because adding MakeTargets
+		// may end up saving the project description which runs under a workspace root rule.
+		final ISchedulingRule rule = ResourcesPlugin.getWorkspace().getRoot();
+
+		Job backgroundJob = new Job(actionName) {
+			/* (non-Javadoc)
+			 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
+			 */
+			protected IStatus run(IProgressMonitor monitor) {
+				try {
+					ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
+
+						public void run(IProgressMonitor monitor) throws CoreException {
+							try {
+								String errMsg = null;
+								IProject project = getSelectedContainer().getProject();
+								// Get a build console for the project
+								IConsole console = CCorePlugin.getDefault().getConsole("org.eclipse.linuxtools.cdt.autotools.autotoolsConsole"); //$NON-NLS-1$
+								console.start(project);
+								ConsoleOutputStream consoleOutStream = console.getOutputStream();
+								// FIXME: we want to remove need for ManagedBuilderManager, but how do we
+								// get environment variables.
+								IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+								IConfiguration cfg = info.getDefaultConfiguration();
+
+								StringBuffer buf = new StringBuffer();
+								String[] consoleHeader = new String[3];
+
+								consoleHeader[0] = actionName;
+								consoleHeader[1] = cfg.getName();
+								consoleHeader[2] = project.getName();
+								buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+								String invokeMsg = InvokeMessages.getFormattedString("InvokeAction.console.message", //$NON-NLS-1$
+										new String[]{actionName, execDir.toString()}); //$NON-NLS-1$
+								buf.append(invokeMsg);
+								buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+								buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+								consoleOutStream.write(buf.toString().getBytes());
+								consoleOutStream.flush();
+								
+								ArrayList<String> additionalEnvs = new ArrayList<String>();
+								String strippedCommand = MakeGenerator.stripEnvVars(command, additionalEnvs);
+								// Get a launcher for the config command
+								CommandLauncher launcher = new CommandLauncher();
+								// Set the environment
+								IEnvironmentVariable variables[] = ManagedBuildManager
+										.getEnvironmentVariableProvider().getVariables(cfg, true);
+								String[] env = null;
+								ArrayList<String> envList = new ArrayList<String>();
+								if (variables != null) {
+									for (int i = 0; i < variables.length; i++) {
+										envList.add(variables[i].getName()
+												+ "=" + variables[i].getValue()); //$NON-NLS-1$
+									}
+									if (additionalEnvs.size() > 0)
+										envList.addAll(additionalEnvs); // add any additional environment variables specified ahead of script
+									env = (String[]) envList.toArray(new String[envList.size()]);
+								}
+								OutputStream stdout = consoleOutStream;
+								OutputStream stderr = consoleOutStream;
+
+								launcher.showCommand(true);
+								// Run the shell script via shell command.
+								Process proc = launcher.execute(new Path(strippedCommand), argumentList, env,
+										execDir, new NullProgressMonitor());
+								if (proc != null) {
+									try {
+										// Close the input of the process since we will never write to
+										// it
+										proc.getOutputStream().close();
+									} catch (IOException e) {
+									}
+
+									if (launcher.waitAndRead(stdout, stderr, new SubProgressMonitor(
+											monitor, IProgressMonitor.UNKNOWN)) != CommandLauncher.OK) {
+										errMsg = launcher.getErrorMessage();
+									}
+
+									// Force a resync of the projects without allowing the user to
+									// cancel.
+									// This is probably unkind, but short of this there is no way to
+									// ensure
+									// the UI is up-to-date with the build results
+									// monitor.subTask(ManagedMakeMessages
+									// .getResourceString(REFRESH));
+									monitor.subTask(AutotoolsPlugin.getResourceString("MakeGenerator.refresh")); //$NON-NLS-1$
+									try {
+										project.refreshLocal(IResource.DEPTH_INFINITE, null);
+									} catch (CoreException e) {
+										monitor.subTask(AutotoolsPlugin
+												.getResourceString("MakeGenerator.refresh.error")); //$NON-NLS-1$
+									}
+								} else {
+									errMsg = launcher.getErrorMessage();
+								}
+								
+								if (errMsg != null)
+									AutotoolsPlugin.logErrorMessage(errMsg);
+								
+							} catch (IOException e) {
+								AutotoolsPlugin.log(e);
+							}
+						}
+					}, rule, IWorkspace.AVOID_UPDATE, monitor);
+				} catch (CoreException e) {
+					return e.getStatus();
+				}
+				IStatus returnStatus = Status.OK_STATUS;
+				return returnStatus;
+			}
+		};
+
+		backgroundJob.setRule(rule);
+		backgroundJob.schedule();
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoconfAction.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoconfAction.java
new file mode 100644
index 0000000..6440dfa
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoconfAction.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyConstants;
+
+
+/**
+ * Class responsible for invoking autoconf.
+ * 
+ * @author klee
+ * 
+ */
+public class InvokeAutoconfAction extends InvokeAction {
+
+	private final static String DEFAULT_COMMAND = "autoconf"; //$NON-NLS-1$
+	public void run(IAction action) {
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+		
+		IPath execDir = getExecDir(container);
+
+		if (container != null) {
+			IProject project = container.getProject();
+			String autoconfCommand = null;
+			try {
+				autoconfCommand = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_TOOL);
+			} catch (CoreException e) {
+				// do nothing
+			}
+			
+			// If unset for the project, default to system path
+			if (autoconfCommand == null)
+				autoconfCommand = DEFAULT_COMMAND;
+			
+			executeConsoleCommand(DEFAULT_COMMAND, autoconfCommand, new String[]{}, execDir);
+		}
+	}
+
+
+	public void dispose() {
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoheaderAction.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoheaderAction.java
new file mode 100644
index 0000000..1057d45
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoheaderAction.java
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyConstants;
+import org.eclipse.swt.widgets.Shell;
+
+
+public class InvokeAutoheaderAction extends InvokeAction {
+
+	private static final String DEFAULT_OPTION = ""; //$NON-NLS-1$
+	private static final String DEFAULT_COMMAND = "autoheader"; //$NON-NLS-1$
+
+	public void run(IAction action) {
+
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+		
+		IPath execDir = getExecDir(container);
+		String cwd = InvokeMessages.getString("CWD") + getCWD(container); //$NON-NLS-1$
+
+		InputDialog optionDialog = new SingleInputDialog(
+				new Shell(),
+				cwd,
+				InvokeMessages
+						.getString("InvokeAutoheaderAction.windowTitle.options"), //$NON-NLS-1$
+				InvokeMessages
+						.getString("InvokeAutoheaderAction.message.options.otherOptions"), //$NON-NLS-1$
+				DEFAULT_OPTION, null);
+		optionDialog.open();
+
+		// chop args into string array
+		String rawArgList = optionDialog.getValue();
+
+		String[] optionsList = simpleParseOptions(rawArgList);
+
+		String[] argumentList = new String[optionsList.length];
+
+		System.arraycopy(optionsList, 0, argumentList, 0, optionsList.length);
+
+		if (container != null) {
+			String autoheaderCommand = null;
+			IProject project = getSelectedContainer().getProject();
+			try {
+				autoheaderCommand = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOHEADER_TOOL);
+			} catch (CoreException e) {
+				// do nothing
+			}
+			
+			// If unset, use default system path
+			if (autoheaderCommand == null)
+				autoheaderCommand = DEFAULT_COMMAND;
+			
+			executeConsoleCommand(DEFAULT_COMMAND, autoheaderCommand,
+					argumentList, execDir);
+		}
+
+	}
+
+	public void dispose() {
+
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java
new file mode 100644
index 0000000..2e97384
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutomakeAction.java
@@ -0,0 +1,98 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyConstants;
+import org.eclipse.swt.widgets.Shell;
+
+
+/**
+ * Class responsible for invoking automake.
+ * 
+ * @author klee
+ * 
+ */
+public class InvokeAutomakeAction extends InvokeAction {
+
+	private static final String DEFAULT_OPTION = ""; //$NON-NLS-1$
+	private static final String DEFAULT_COMMAND = "automake"; //$NON-NLS-1$
+
+	public void run(IAction action) {
+
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+		
+		IPath execDir = getExecDir(container);
+		String cwd = InvokeMessages.getString("CWD") + getCWD(container); //$NON-NLS-1$
+;
+		TwoInputDialog optionDialog = new TwoInputDialog(new Shell(), cwd,
+		InvokeMessages
+		.getString("InvokeAutomakeAction.windowTitle.options"), //$NON-NLS-1$
+InvokeMessages
+		.getString("InvokeAutomakeAction.message.options.otherOptions"),InvokeMessages //$NON-NLS-1$
+		.getString("InvokeAutomakeAction.message.options.makeTargets"), DEFAULT_OPTION, null); //$NON-NLS-1$
+		
+		optionDialog.open();
+		
+		// chop args into string array
+		String rawArgList = optionDialog.getValue();
+
+		String[] optionsList = separateOptions(rawArgList);
+
+
+		// chop args into string array
+		rawArgList = optionDialog.getSecondValue();
+
+		String[] targetList = separateTargets(rawArgList);
+		
+		if (targetList == null) {
+
+			showError(InvokeMessages.getString("InvokeAction.execute.windowTitle.error"), //$NON-NLS-1$
+					InvokeMessages.getString("InvokeAction.windowTitle.quoteError")); //$NON-NLS-1$
+			return;
+		}
+
+		String[] argumentList = new String[targetList.length
+				+ optionsList.length];
+
+		System.arraycopy(optionsList, 0, argumentList, 0, optionsList.length);
+		System.arraycopy(targetList, 0, argumentList, optionsList.length,
+				targetList.length);
+
+		if (container != null) {
+			IProject project = container.getProject();
+			String automakeCommand = null;
+			try {
+				automakeCommand = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_TOOL);
+			} catch (CoreException e) {
+				// do nothing
+			}
+			
+			// If automake path not set for the project, default to system path
+			if (automakeCommand == null)
+				automakeCommand = DEFAULT_COMMAND;
+
+			executeConsoleCommand(DEFAULT_COMMAND, automakeCommand,
+					argumentList, execDir);
+		}
+	}
+
+	public void dispose() {
+
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoreconfAction.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoreconfAction.java
new file mode 100644
index 0000000..b16de91
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeAutoreconfAction.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyConstants;
+import org.eclipse.swt.widgets.Shell;
+
+
+public class InvokeAutoreconfAction extends InvokeAction {
+
+	private static final String DEFAULT_OPTION = ""; //$NON-NLS-1$
+	private static final String DEFAULT_COMMAND = "autoreconf"; //$NON-NLS-1$
+
+	public void run(IAction action) {
+
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+		
+		IPath execDir = getExecDir(container);
+		String cwd = InvokeMessages.getString("CWD") + getCWD(container); //$NON-NLS-1$
+
+		InputDialog optionDialog = new SingleInputDialog(
+				new Shell(),
+				cwd,
+				InvokeMessages
+						.getString("InvokeAutoreconfAction.windowTitle.options"), //$NON-NLS-1$
+				InvokeMessages
+						.getString("InvokeAutoreconfAction.message.options.otherOptions"), //$NON-NLS-1$
+				DEFAULT_OPTION, null);
+		optionDialog.open();
+
+		// chop args into string array
+		String rawArgList = optionDialog.getValue();
+
+		String[] optionsList = simpleParseOptions(rawArgList);
+
+		String[] argumentList = new String[optionsList.length];
+
+		System.arraycopy(optionsList, 0, argumentList, 0, optionsList.length);
+
+		if (container != null) {
+			String autoreconfCommand = null;
+			IProject project = getSelectedContainer().getProject();
+			try {
+				autoreconfCommand = project.getPersistentProperty(AutotoolsPropertyConstants.AUTORECONF_TOOL);
+			} catch (CoreException e) {
+				// do nothing
+			}
+			
+			// If unset, use default system path
+			if (autoreconfCommand == null)
+				autoreconfCommand = DEFAULT_COMMAND;
+			
+			executeConsoleCommand(DEFAULT_COMMAND, autoreconfCommand,
+					argumentList, execDir);
+		}
+	}
+
+	public void dispose() {
+
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeLibtoolizeAction.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeLibtoolizeAction.java
new file mode 100644
index 0000000..03e0427
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeLibtoolizeAction.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.linuxtools.cdt.autotools.ui.properties.AutotoolsPropertyConstants;
+import org.eclipse.swt.widgets.Shell;
+
+
+public class InvokeLibtoolizeAction extends InvokeAction {
+
+	private static final String DEFAULT_OPTION = ""; //$NON-NLS-1$
+	private static final String DEFAULT_COMMAND = "libtoolize"; //$NON-NLS-1$
+
+	public void run(IAction action) {
+
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+		
+		IPath execDir = getExecDir(container);
+		String cwd = InvokeMessages.getString("CWD") + getCWD(container); //$NON-NLS-1$
+
+		InputDialog optionDialog = new SingleInputDialog(
+				new Shell(),
+				cwd,
+				InvokeMessages
+						.getString("InvokeLibtoolizeAction.windowTitle.options"), //$NON-NLS-1$
+				InvokeMessages
+						.getString("InvokeLibtoolizeAction.message.options.otherOptions"), //$NON-NLS-1$
+				DEFAULT_OPTION, null);
+		optionDialog.open();
+
+		// chop args into string array
+		String rawArgList = optionDialog.getValue();
+
+		String[] optionsList = simpleParseOptions(rawArgList);
+
+		String[] argumentList = new String[optionsList.length];
+
+		System.arraycopy(optionsList, 0, argumentList, 0, optionsList.length);
+
+		if (container != null) {
+			String libtoolizeCommand = null;
+			IProject project = getSelectedContainer().getProject();
+			try {
+				libtoolizeCommand = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOHEADER_TOOL);
+			} catch (CoreException e) {
+				// do nothing
+			}
+			
+			// If unset, use default system path
+			if (libtoolizeCommand == null)
+				libtoolizeCommand = DEFAULT_COMMAND;
+			
+			executeConsoleCommand(DEFAULT_COMMAND, libtoolizeCommand,
+					argumentList, execDir);
+		}
+	}
+
+	public void dispose() {
+
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.java
new file mode 100644
index 0000000..b62632a
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.java
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007, 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class InvokeMessages {
+	private static final String BUNDLE_NAME = InvokeMessages.class.getName();
+
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
+			.getBundle(BUNDLE_NAME);
+
+	private InvokeMessages() {
+	}
+
+	/**
+	 * Returns the string from the resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @return the resource bundle message
+	 */
+	public static String getString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+	
+	/**
+	 * Returns the formatted string from the resource bundle,
+	 * or 'key' if not found.
+	 * 
+	 * @param key the message key
+	 * @param args an array of substituition strings
+	 * @return the resource bundle message
+	 */
+	public static String getFormattedString(String key, String[] args) {
+		return MessageFormat.format(getString(key), (Object[])args);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.properties b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.properties
new file mode 100644
index 0000000..b2da117
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/InvokeMessages.properties
@@ -0,0 +1,56 @@
+#################################################################################
+#  Copyright (c) 2006, 2007, 2009 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+# 
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+CWD=Working Directory:
+
+InvokeAction.windowTitle.quoteError=Quote/Double quote not correct
+InvokeAction.progress.message=Running {0}
+InvokeAction.execute.windowTitle.error=Invoke Action Error
+InvokeAction.execute.message=Couldn't execute command :
+InvokeAction.success=Command executed successfully
+InvokeAction.console.message=Invoking {0} in {1}
+
+
+InvokeAutoconfAction.command=Running autoconf in {0} 
+InvokeAutoconfAction.windowTitle.stdout=Invoke Autoconf - Output
+InvokeAutoconfAction.windowTitle.stderr=Invoke Autoconf - Error
+
+
+InvokeAutomakeAction.command=Running automake
+InvokeAutomakeAction.windowTitle.options=Automake Options
+InvokeAutomakeAction.message.options.makeTargets=Enter targets separated by space :
+InvokeAutomakeAction.message.options.otherOptions=Enter options separated by space :
+InvokeAutomakeAction.windowTitle.stdout=Invoke Automake - Output
+InvokeAutomakeAction.windowTitle.stderr=Invoke Automake - Error
+
+InvokeAutoheaderAction.command=Running autoheader
+InvokeAutoheaderAction.windowTitle.options=Autoheader Options
+InvokeAutoheaderAction.message.options.otherOptions=Enter options separated by space :
+InvokeAutoheaderAction.windowTitle.stdout=Invoke Autoheader - Output
+InvokeAutoheaderAction.windowTitle.stderr=Invoke Autoheader - Error
+
+InvokeAutoreconfAction.command=Running autoreconf
+InvokeAutoreconfAction.windowTitle.options=Autoreconf Options
+InvokeAutoreconfAction.message.options.otherOptions=Enter options separated by space :
+InvokeAutoreconfAction.windowTitle.stdout=Invoke Autoreconf - Output
+InvokeAutoreconfAction.windowTitle.stderr=Invoke Autoreconf - Error
+
+InvokeAclocalAction.command=Running aclocal
+InvokeAclocalAction.windowTitle.options=Aclocal Options
+InvokeAclocalAction.message.options.includeDir=Add directory to search list for .m4 files :
+InvokeAclocalAction.message.options.otherOptions=Enter options separated by space :
+InvokeAclocalAction.windowTitle.stdout=Invoke Automake - Output
+InvokeAclocalAction.windowTitle.stderr=Invoke Automake - Error
+
+InvokeLibtoolizeAction.command=Running libtoolize
+InvokeLibtoolizeAction.windowTitle.options=Libtoolize Options
+InvokeLibtoolizeAction.message.options.otherOptions=Enter options separated by space :
+InvokeLibtoolizeAction.windowTitle.stdout=Invoke Libtoolize - Output
+InvokeLibtoolizeAction.windowTitle.stderr=Invoke Libtoolize - Error
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/LibtoolizeHandler.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/LibtoolizeHandler.java
new file mode 100644
index 0000000..202f1b6
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/LibtoolizeHandler.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+/**
+ * @author Jeff Johnston
+ *
+ */
+public class LibtoolizeHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		InvokeLibtoolizeAction a = new InvokeLibtoolizeAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureAction.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureAction.java
new file mode 100644
index 0000000..96ef9a6
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureAction.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.ISchedulingRule;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.linuxtools.cdt.autotools.MakeGenerator;
+
+
+public class ReconfigureAction extends InvokeAction {
+
+	public void run(IAction action) {
+		IContainer container = getSelectedContainer();
+		if (container == null)
+			return;
+
+		// We need to use a workspace root scheduling rule because adding MakeTargets
+		// may end up saving the project description which runs under a workspace root rule.
+		final ISchedulingRule rule = ResourcesPlugin.getWorkspace().getRoot();
+		
+		Job backgroundJob = new Job("Reconfigure Action"){  //$NON-NLS-1$
+			/* (non-Javadoc)
+			 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
+			 */
+			protected IStatus run(IProgressMonitor monitor) {
+				try {
+					ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
+
+						public void run(IProgressMonitor monitor) throws CoreException {
+							IProject project = getSelectedContainer().getProject();
+							MakeGenerator m = new MakeGenerator();
+							IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+							m.initialize(project, info, monitor);
+							m.removeConfigSettings();
+							try {
+								m.regenerateMakefiles();
+							} catch (CoreException e) {
+								// do nothing for now
+							}
+						}
+					}, rule, IWorkspace.AVOID_UPDATE, monitor);
+				} catch (CoreException e) {
+					return e.getStatus();
+				}
+				IStatus returnStatus = Status.OK_STATUS;
+				return returnStatus;
+			}
+		};
+
+		backgroundJob.setRule(rule);
+		backgroundJob.schedule();
+	}
+
+	public void dispose() {
+
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureHandler.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureHandler.java
new file mode 100644
index 0000000..843d7bb
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/ReconfigureHandler.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IContainer;
+
+/**
+ * @author Jeff Johnston
+ *
+ */
+public class ReconfigureHandler extends AbstractAutotoolsHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		ReconfigureAction a = new ReconfigureAction();
+		Object o = event.getApplicationContext();
+		if (o instanceof IEvaluationContext) {
+			IContainer container = getContainer((IEvaluationContext)o);
+			if (container != null) {
+				a.setSelectedContainer(container);
+				a.run(null);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/SingleInputDialog.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/SingleInputDialog.java
new file mode 100644
index 0000000..8a5f8bc
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/SingleInputDialog.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+
+public class SingleInputDialog extends InputDialog {
+	
+	private String firstMessage;
+
+	public SingleInputDialog(Shell parentShell, String firstMessage, String dialogTitle,
+			String dialogMessage, String initialValue,
+			IInputValidator validator) {
+		super(parentShell, dialogTitle, dialogMessage, initialValue, validator);
+
+		this.firstMessage = firstMessage;
+	}
+
+	/*
+	 * (non-Javadoc) Method declared on Dialog.
+	 */
+	protected void buttonPressed(int buttonId) {
+		super.buttonPressed(buttonId);
+	}
+
+	protected Control createDialogArea(Composite parent) {
+
+		// create composite
+		Composite composite = (Composite) super.createDialogArea(parent);
+
+		CLabel label0 = new CLabel(composite, SWT.WRAP);
+		label0.setText(firstMessage);
+		GridData data = new GridData(GridData.GRAB_HORIZONTAL
+				| GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL
+				| GridData.VERTICAL_ALIGN_CENTER);
+		data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
+		label0.setLayoutData(data);
+		label0.setFont(parent.getFont());
+
+		// remove error message dialog from focusing.
+		composite.getTabList()[2].setVisible(false);
+		composite.getTabList()[2].setEnabled(false);
+
+		return composite;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/TwoInputDialog.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/TwoInputDialog.java
new file mode 100644
index 0000000..f786e44
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/actions/TwoInputDialog.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.actions;
+
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+
+public class TwoInputDialog extends InputDialog {
+
+	private Text secondText;
+
+	private String secondValue;
+
+	private String secondMessage;
+	
+	private String firstMessage;
+
+	public TwoInputDialog(Shell parentShell, String firstMessage, String dialogTitle,
+			String dialogMessage, String secondMessage, String initialValue,
+			IInputValidator validator) {
+		super(parentShell, dialogTitle, dialogMessage, initialValue, validator);
+
+		this.firstMessage = firstMessage;
+		this.secondMessage = secondMessage;
+	}
+
+	/*
+	 * (non-Javadoc) Method declared on Dialog.
+	 */
+	protected void buttonPressed(int buttonId) {
+		if (buttonId == IDialogConstants.OK_ID) {
+			secondValue = secondText.getText();
+		} else {
+			secondValue = null;
+		}
+		super.buttonPressed(buttonId);
+	}
+
+	protected Control createDialogArea(Composite parent) {
+
+		// create composite
+		Composite composite = (Composite) super.createDialogArea(parent);
+
+		CLabel label0 = new CLabel(composite, SWT.WRAP);
+		label0.setText(firstMessage);
+		Label label = new Label(composite, SWT.WRAP);
+		label.setText(secondMessage);
+		GridData data = new GridData(GridData.GRAB_HORIZONTAL
+				| GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL
+				| GridData.VERTICAL_ALIGN_CENTER);
+		data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
+		label0.setLayoutData(data);
+		label0.setFont(parent.getFont());
+		label.setLayoutData(data);
+		label.setFont(parent.getFont());
+		
+
+		secondText = new Text(composite, SWT.SINGLE | SWT.BORDER);
+		secondText.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL
+				| GridData.HORIZONTAL_ALIGN_FILL));
+		secondText.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				validateInput();
+			}
+		});
+
+		// remove error message dialog from focusing.
+		composite.getTabList()[2].setVisible(false);
+		composite.getTabList()[2].setEnabled(false);
+
+		return composite;
+	}
+
+	/**
+	 * Returns the text area.
+	 * 
+	 * @return the text area
+	 */
+	protected Text getSecondText() {
+		return secondText;
+	}
+
+	/**
+	 * Returns the string typed into this input dialog.
+	 * 
+	 * @return the input string
+	 */
+	public String getSecondValue() {
+		return secondValue;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseConditionElement.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseConditionElement.java
new file mode 100644
index 0000000..d06e73d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseConditionElement.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfCaseConditionElement extends AutoconfElement {
+	
+	public AutoconfCaseConditionElement() {
+		super("");
+	}
+	
+	public AutoconfCaseConditionElement(String name) {
+		super(name);
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseElement.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseElement.java
new file mode 100644
index 0000000..c8ad284
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfCaseElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfCaseElement extends AutoconfElement {
+	
+	public AutoconfCaseElement() {
+		super("case"); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfEditorMessages.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfEditorMessages.java
new file mode 100644
index 0000000..53c7a7d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfEditorMessages.java
@@ -0,0 +1,117 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+
+/**
+ * AutoconfEditorMessages
+ */
+public class AutoconfEditorMessages {
+
+	private static final String RESOURCE_BUNDLE= AutoconfEditorMessages.class.getName();
+
+	private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);
+
+	private AutoconfEditorMessages() {
+	}
+
+	public static ResourceBundle getResourceBundle() {
+		return fgResourceBundle;
+	}
+	
+	public static String getString(String key) {
+		try {
+			return fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+	}
+	/**
+	 * Gets a string from the resource bundle and formats it with the argument
+	 * 
+	 * @param key	the string used to get the bundle value, must not be null
+	 * @since 3.0
+	 */
+	public static String getFormattedString(String key, Object arg) {
+		String format= null;
+		try {
+			format= fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+		if (arg == null)
+			arg= ""; //$NON-NLS-1$
+		return MessageFormat.format(format, new Object[] { arg });
+	}
+	/**
+	 * Gets a string from the resource bundle and formats it with the arguments
+	 * 
+	 * @param key	the string used to get the bundle value, must not be null
+	 * @since 3.0
+	 */
+	public static String getFormattedString(String key, Object arg1, Object arg2) {
+		String format= null;
+		try {
+			format= fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+		if (arg1 == null)
+			arg1= ""; //$NON-NLS-1$
+		if (arg2 == null)
+			arg2= ""; //$NON-NLS-1$
+		return MessageFormat.format(format, new Object[] { arg1, arg2 });
+	}
+	
+	/**
+	 * Gets a string from the resource bundle and formats it with the arguments
+	 * 
+	 * @param key	the string used to get the bundle value, must not be null
+	 * @since 3.0
+	 */
+	public static String getFormattedString(String key, Object arg1, Object arg2, Object arg3) {
+		String format= null;
+		try {
+			format= fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+		if (arg1 == null)
+			arg1= ""; //$NON-NLS-1$
+		if (arg2 == null)
+			arg2= ""; //$NON-NLS-1$
+		if (arg3 == null)
+			arg3= ""; //$NON-NLS-1$
+		return MessageFormat.format(format, new Object[] { arg1, arg2, arg3 });
+	}
+	
+	/**
+	 * Gets a string from the resource bundle and formats it with the argument
+	 * 
+	 * @param key	the string used to get the bundle value, must not be null
+	 * @since 3.0
+	 */
+	public static String getFormattedString(String key, boolean arg) {
+		String format= null;
+		try {
+			format= fgResourceBundle.getString(key);
+		} catch (MissingResourceException e) {
+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
+		}
+		return MessageFormat.format(format, new Object[] { new Boolean(arg) });
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfEditorMessages.properties b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfEditorMessages.properties
new file mode 100644
index 0000000..692d064
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfEditorMessages.properties
@@ -0,0 +1,47 @@
+#################################################################################
+#  Copyright (c) 2007 Red Hat, Inc., (c) 2008 Nokia Inc
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+# 
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#      Nokia Inc - refactoring
+#################################################################################
+UnmatchedRightParenthesis=Unmatched right parenthesis
+UnmatchedLeftParenthesis=Unmatched left parenthesis
+UnmatchedRightQuote=Unmatched right quote, expected {0}
+UnmatchedLeftQuote=Unmatched left quote, expected {0}
+UnmatchedCloseComment=Unmatched end of comment, expected {0}
+UnterminatedString=Unterminated string, expected {0}
+
+AutoconfMacroArgsTooFew=The autoconf version {0} definition of macro "{1}" requires at least {2} arguments
+AutoconfMacroArgsTooMany=The autoconf version {0} definition of macro "{1}" may have a maximum of {2} arguments
+M4MacroArgsTooFew=The m4 macro "{0}" requires at least {1} arguments
+M4MacroArgsTooMany=The m4 macro "{0}" may have a maximum of {1} arguments
+MissingSpecifier=Missing "{0}" specifier
+InvalidSpecifier=The specifier "{0}" should be separated from condition by semicolon or newline
+InvalidTermination=The specifier "{0}" should appear after semicolon or newline
+UnterminatedConstruct=This "{0}" construct is unterminated
+MissingCondition=Missing condition for {0} specifier
+InvalidElif=The "elif" keyword should appear in an "if" or "elif" construct
+InvalidElse=The "else" keyword should appear in an "if" or "elif" construct
+InvalidFi=The "fi" keyword should terminate an "if", "elif", or "else" construct
+InvalidEsac=The "esac" keyword should terminate a "case" statement
+InvalidDone=The "done" keyword should terminate a "for", "while", "until", or "select" statement
+InvalidDo=The "do" keyword should appear in a "for", "while", "until", or "select" statement
+InvalidThen=The "then" keyword should appear in an "if" or "elif" statement
+InvalidIn=The "in" keyword should appear in a "case" statement
+UnterminatedCaseCondition=Case condition is not terminated before "esac" keyword
+ImproperCaseCondition=Case condition expected to end with ")"
+UnterminatedInlineDocument=Inline document started with "<<" is unterminated
+IncompleteInlineMarker=Inline document marker has incomplete quote
+MissingInlineMarker=Inline document specification is missing end marker
+AutoconfAnnotationHover.multipleMarkers=Multiple markers at this line
+
+ShowToolTip.label=Show T&ooltip Description
+ContentAssistProposal.label=Co&ntent Assist
+ContentAssistProposal.tooltip=Content Assist
+ContentAssistProposal.description=Content Assist
+
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElement.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElement.java
new file mode 100644
index 0000000..2bf2a28
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElement.java
@@ -0,0 +1,138 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+
+public class AutoconfElement {
+	
+	protected String name;
+	protected String var;
+	protected int startOffset;
+	protected int endOffset;
+	protected ArrayList<AutoconfElement> children;
+	protected AutoconfElement parent;
+	private IDocument document;
+	
+	public AutoconfElement(String name) {
+		this(name, null);
+	}
+	
+	public AutoconfElement(String name, String var) {
+		this.name = name;
+		this.var = var;
+		this.startOffset = 0;
+		this.children = new ArrayList<AutoconfElement>();
+	}
+	
+
+	public String toString() {
+		String source = getSource();
+		if (source == null) {
+			StringBuffer kids = new StringBuffer();
+			for (Iterator<AutoconfElement> iterator = children.iterator(); iterator.hasNext();) {
+				AutoconfElement kid = (AutoconfElement) iterator.next();
+				kids.append(kid.toString());
+				kids.append(",");
+			}
+			source = kids.toString();
+		}
+		return getClass().getSimpleName() + ": '" + source + "'";
+	}
+	
+	public void addChild(AutoconfElement element) {
+		children.add(element);
+		if (element.getParent() == null)
+			element.setParent(this);
+	}
+	
+	public void addSibling(AutoconfElement element) {
+		parent.addChild(element);
+	}
+	
+	public AutoconfElement getLastChild() {
+		if (hasChildren())
+			return (AutoconfElement)children.get(children.size() - 1);
+		return null;
+	}
+	
+	public AutoconfElement getParent() {
+		return parent;
+	}
+	
+	public void setParent(AutoconfElement parent) {
+		this.parent = parent;
+	}
+	
+	public AutoconfElement[] getChildren() {
+		return (AutoconfElement[]) children.toArray(new AutoconfElement[children.size()]);
+	}
+	
+	public boolean hasChildren() {
+		return !children.isEmpty();
+	}
+
+	public String getName() {
+		return name;
+	}
+	 
+	public void setName(String string) {
+		this.name = string;
+	}
+
+	
+	public String getVar() {
+		return var;
+	}
+	
+	public void setVar(String value) {
+		var = value;
+	}
+	
+	public void setDocument(IDocument document) {
+		this.document = document;
+	}
+	
+	public IDocument getDocument() {
+		return document;
+	}
+	
+	public void setStartOffset(int offset) {
+		this.startOffset = offset;
+	}
+	
+	public int getStartOffset() {
+		return startOffset;
+	}
+	
+	public void setEndOffset(int offset) {
+		this.endOffset = offset;
+	}
+	
+	public int getEndOffset() {
+		return endOffset;
+	}
+
+	public String getSource() {
+		if (document != null && startOffset >= 0 && endOffset >= startOffset) {
+			try {
+				return document.get(startOffset, endOffset - startOffset);
+			} catch (BadLocationException e) {
+				return null;
+			}
+		}
+		return null;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElifElement.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElifElement.java
new file mode 100644
index 0000000..a990ea8
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElifElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfElifElement extends AutoconfElement {
+	
+	public AutoconfElifElement() {
+		super("elif"); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElseElement.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElseElement.java
new file mode 100644
index 0000000..bbaa2c2
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfElseElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfElseElement extends AutoconfElement {
+	
+	public AutoconfElseElement() {
+		super("else"); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfForElement.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfForElement.java
new file mode 100644
index 0000000..6b0ffcc
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfForElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfForElement extends AutoconfElement {
+	
+	public AutoconfForElement() {
+		super("for"); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfIfElement.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfIfElement.java
new file mode 100644
index 0000000..6ad6589
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfIfElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfIfElement extends AutoconfElement {
+	
+	public AutoconfIfElement() {
+		super("if"); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroArgumentElement.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroArgumentElement.java
new file mode 100644
index 0000000..24bf1d5
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroArgumentElement.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+/**
+ * This is a macro argument node.  It may also hold
+ * other AutoconfMacroElements.  The source range includes any quotes around an argument
+ * but the #getName() has them stripped.
+ * @author eswartz
+ *
+ */
+public class AutoconfMacroArgumentElement extends AutoconfElement {
+
+	public AutoconfMacroArgumentElement() {
+		super(""); // //$NON-NLS-N$
+	}
+	public AutoconfMacroArgumentElement(String name) {
+		super(name); // //$NON-NLS-N$
+	}
+	public String getVar() {
+		return super.getVar();
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroDetector.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroDetector.java
new file mode 100644
index 0000000..3635bcd
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroDetector.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc., (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat Incorporated - initial API and implementation
+ *    Ed Swartz (Nokia) - refactoring
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+import java.util.regex.Pattern;
+
+/**
+ *
+ */
+public class AutoconfMacroDetector implements IAutoconfMacroDetector {
+
+	private static final Pattern AUTOCONF_MACRO_PATTERN = Pattern.compile("PKG_.*|AC_.*|AM_.*|m4.*"); //$NON-NLS-1$
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.cdt.autotools.ui.editors.parser.IAutoconfMacroDetector#isMacroIdentifier(java.lang.String)
+	 */
+	public boolean isMacroIdentifier(String name) {
+		return AUTOCONF_MACRO_PATTERN.matcher(name).matches();
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java
new file mode 100644
index 0000000..1168f91
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *     Ed Swartz (NOKIA Inc) - support standalone parser
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+/**
+ * A call to a macro.
+ * <p>
+ * Macro element now stores arguments as AutoconfMacroElement or AutoconfMacroArgument children 
+ *
+ */
+public class AutoconfMacroElement extends AutoconfElement {
+
+	public AutoconfMacroElement(String name) {
+		super(name);
+	}
+
+	public String getVar() {
+		if (children.size() > 0)
+			return getParameter(0);
+		else
+			return null;
+	}
+	public int getParameterCount() {
+		return children.size();
+	}
+
+	public String getParameter(int num) {
+		return ((AutoconfElement) children.get(num)).getName();
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java
new file mode 100644
index 0000000..9a5100e
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java
@@ -0,0 +1,136 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.linuxtools.cdt.autotools.AutotoolsPlugin;
+import org.eclipse.ui.IStorageEditorInput;
+import org.eclipse.ui.texteditor.MarkerUtilities;
+
+
+public class AutoconfOutlineErrorHandler {
+	
+	public static final String PARSE_ERROR_MARKER_ID = AutotoolsPlugin.PLUGIN_ID
+	+ ".outlineparsefileerror";
+	
+	private IFile file;
+	private IDocument document;
+	
+	public AutoconfOutlineErrorHandler(IStorageEditorInput input, IDocument document)
+	{
+		this.document = document;
+		IWorkspaceRoot root = CCorePlugin.getWorkspace().getRoot();
+		try {
+			IPath absPath = input.getStorage().getFullPath();
+			IPath rootPath = root.getLocation();
+			IPath relPath = new Path("");
+
+			for (int i = 0; i < rootPath.segmentCount(); ++i) {
+				relPath = relPath.append("../");
+			}
+			relPath = relPath.append(absPath);
+			this.file = root.getFileForLocation(relPath);
+			if (this.file == null) {
+				this.file = root.getFile(relPath);
+			}
+		} catch (CoreException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	public IDocument getDocument() {
+		return document;
+	}
+	
+	public void handleError(ParseException e) {
+		if (!file.exists())
+			return;
+		
+		int lineNumber = e.getLineNumber();
+		
+		Map<String, Object> map = new HashMap<String, Object>();
+		MarkerUtilities.setLineNumber(map, lineNumber);
+		MarkerUtilities.setMessage(map, e.getMessage());
+		map.put(IMarker.MESSAGE, e.getMessage());
+		map.put(IMarker.LOCATION, file.getFullPath().toString());
+
+		Integer charStart = getCharOffset(lineNumber, e.getStartColumn());
+		if (charStart != null) {
+			map.put(IMarker.CHAR_START, charStart);
+		}
+		Integer charEnd = getCharOffset(lineNumber, e.getEndColumn());
+		if (charEnd != null) {
+			map.put(IMarker.CHAR_END, charEnd);
+		}
+		
+		// FIXME:  add severity level
+		map.put(IMarker.SEVERITY, new Integer(e.getSeverity()));
+		
+		try {
+			MarkerUtilities.createMarker(file, map, PARSE_ERROR_MARKER_ID);
+		} catch (CoreException ee) {
+			ee.printStackTrace();
+		}
+		return;
+	}
+	
+	public void removeAllExistingMarkers() {
+		if (!file.exists())
+			return;
+		
+		try	{
+			file.deleteMarkers(PARSE_ERROR_MARKER_ID, true, IResource.DEPTH_ZERO);
+		} catch (CoreException e1) {
+			e1.printStackTrace();
+		}
+	}
+
+	public void removeExistingMarkers(int offset, int length) {
+		if (!file.exists())
+			return;
+		
+		try	{
+			IMarker[] markers = file.findMarkers(PARSE_ERROR_MARKER_ID, true, IResource.DEPTH_ZERO);
+			// Delete all markers that start in the given document range.
+			for (int i = 0; i < markers.length; ++i) {
+				IMarker marker = markers[i];
+				int charEnd = MarkerUtilities.getCharEnd(marker);
+				int charStart = MarkerUtilities.getCharStart(marker);
+				if (charStart >= offset && charEnd <= (offset + length))
+					marker.delete();
+			}
+		} catch (CoreException e1) {
+			e1.printStackTrace();
+		}
+	}
+	
+	private Integer getCharOffset(int lineNumber, int columnNumber)	{
+		try	{
+			return new Integer(document.getLineOffset(lineNumber) + columnNumber);
+		} catch (BadLocationException e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfParser.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfParser.java
new file mode 100644
index 0000000..e699603
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfParser.java
@@ -0,0 +1,1041 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc., (c) 2008 Nokia
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *     Ed Swartz (Nokia) - refactoring
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+
+
+/**
+ * Tokenizing autoconf parser, based on original work by Jeff Johnston 
+ * @author eswartz
+ */
+public class AutoconfParser {
+	
+	public static final String MISSING_SPECIFIER = "MissingSpecifier"; //$NON-NLS-1$
+	public static final String INVALID_SPECIFIER = "InvalidSpecifier"; //$NON-NLS-1$
+	public static final String INVALID_TERMINATION = "InvalidTermination"; //$NON-NLS-1$
+	public static final String UNTERMINATED_CONSTRUCT = "UnterminatedConstruct"; //$NON-NLS-1$
+	public static final String MISSING_CONDITION = "MissingCondition"; //$NON-NLS-1$
+	public static final String INVALID_ELIF = "InvalidElif"; //$NON-NLS-1$
+	public static final String INVALID_ELSE = "InvalidElse"; //$NON-NLS-1$
+	public static final String INVALID_FI = "InvalidFi"; //$NON-NLS-1$
+	public static final String INVALID_DONE = "InvalidDone"; //$NON-NLS-1$
+	public static final String INVALID_ESAC = "InvalidEsac"; //$NON-NLS-1$
+	public static final String INVALID_DO = "InvalidDo"; //$NON-NLS-1$
+	public static final String INVALID_THEN = "InvalidThen"; //$NON-NLS-1$
+	public static final String INVALID_IN = "InvalidIn"; //$NON-NLS-1$
+	public static final String IMPROPER_CASE_CONDITION = "ImproperCaseCondition"; //$NON-NLS-1$
+	public static final String UNTERMINATED_CASE_CONDITION = "UnterminatedCaseCondition"; //$NON-NLS-1$
+	public static final String UNTERMINATED_INLINE_DOCUMENT = "UnterminatedInlineDocument"; //$NON-NLS-1$
+	public static final String INCOMPLETE_INLINE_MARKER="IncompleteInlineMarker"; //$NON-NLS-1$
+	public static final String MISSING_INLINE_MARKER="MissingInlineMarker"; //$NON-NLS-1$
+	public static final String UNMATCHED_RIGHT_PARENTHESIS = "UnmatchedRightParenthesis"; //$NON-NLS-1$
+	public static final String UNMATCHED_LEFT_PARENTHESIS = "UnmatchedLeftParenthesis"; //$NON-NLS-1$
+	
+	private IAutoconfErrorHandler errorHandler;
+	private IAutoconfMacroValidator macroValidator;
+	private AutoconfTokenizer tokenizer;
+	private IAutoconfMacroDetector macroDetector;
+	
+	private static final String M4_BUILTINS =
+		"define undefine defn pushdef popdef indir builtin ifdef ifelse shift reverse cond " +
+		"dumpdef traceon traceoff debugmode debugfile dnl changequote changecom changeword " +
+		"m4wrap " +
+		"include sinclude divert undivert divnum len index regexp substr translit patsubst " +
+		"format incr decr eval syscmd esyscmd sysval mkstemp maketemp errprint m4exit " +
+		"__file__ __line__ __program__ ";
+	
+	private static List<String> m4builtins = new ArrayList<String>();
+	static {
+		m4builtins.addAll(Arrays.asList(M4_BUILTINS.split(" ")));
+	}
+	
+	/**
+	 * Create a parser for autoconf-style sources.  
+	 * @param errorHandler
+	 * @param macroDetector
+	 * @param macroValidator
+	 */
+	public AutoconfParser(IAutoconfErrorHandler errorHandler,
+			IAutoconfMacroDetector macroDetector,
+			IAutoconfMacroValidator macroValidator) {
+		this.errorHandler = errorHandler;
+		this.macroDetector = macroDetector;
+		this.macroValidator = macroValidator;
+	}
+
+	/**
+	 * Parse the given document and produce an AutoconfElement tree
+	 * @param errorHandler
+	 * @param macroValidator
+	 * @param document
+	 * @return element tree
+	 */
+	public AutoconfElement parse(IDocument document) {
+		return parse(document, true);
+	}
+	
+	/**
+	 * Parse the given document and produce an AutoconfElement tree,
+	 * and control whether the initial quoting style is m4 style (`...')
+	 * or autoconf style ([ ... ]).
+	 * @param errorHandler
+	 * @param macroValidator
+	 * @param document
+	 * @param useAutoconfQuotes
+	 * @return element tree
+	 */
+	public AutoconfElement parse(IDocument document, boolean useAutoconfQuotes) {
+		this.tokenizer = new AutoconfTokenizer(document, errorHandler);
+		if (useAutoconfQuotes)
+			tokenizer.setM4Quote("[", "]");
+		
+		AutoconfElement root = new AutoconfRootElement();
+		Token eof = parseTopLevel(root);
+		
+		root.setStartOffset(0);
+		root.setDocument(document);
+		
+		setSourceEnd(root, eof);
+		
+		return root;
+	}
+
+
+	static class BlockEndCondition extends Exception {
+		/**
+		 * 
+		 */
+		private static final long serialVersionUID = 1L;
+		private Token token;
+
+		public BlockEndCondition(Token token) {
+			this.token = token;
+		}
+		
+		public Token getToken() {
+			return token;
+		}
+		
+	}
+
+	static class ExprEndCondition extends Exception {
+		/**
+		 * 
+		 */
+		private static final long serialVersionUID = 1L;
+		private Token token;
+
+		public ExprEndCondition(Token token) {
+			this.token = token;
+		}
+		
+		public Token getToken() {
+			return token;
+		}
+		
+	}
+
+	/**
+	 * Parse individual top-level nodes: divide text into macro calls
+	 * and recognized shell constructs.  Anything else is not accounted for.
+	 * @param parent
+	 * @return
+	 */
+	protected Token parseTopLevel(AutoconfElement parent) {
+		while (true) {
+			try {
+				parseStatement(parent);
+			} catch (BlockEndCondition e) {
+				// don't terminate here; we may have constructs closed too early
+				Token token = tokenizer.peekToken();
+				if (token.getType() == ITokenConstants.EOF)
+					return token; 
+			}
+		}
+	}
+	
+	/**
+	 * Parse a block of nodes, which starts with an expression and contains
+	 * subnodes.  Divide text into macro calls and recognized shell constructs.  
+	 * Anything else is not accounted for.
+	 * @param parent
+	 */
+	protected void parseBlock(AutoconfElement parent, Token open, AutoconfElement block) throws BlockEndCondition {
+		parent.addChild(block);
+		
+		setSourceStart(block, open);
+		
+		// get the expression part
+		Token token;
+		try {
+			token = parseBlockExpression(open, block);
+		} catch (BlockEndCondition e) {
+			setSourceEndBefore(block, e.getToken());
+			throw e;
+		}
+		
+		// parse the block proper
+		if (token.getType() != ITokenConstants.EOF) {
+			while (true) {
+				try {
+					parseStatement(block);
+				} catch (BlockEndCondition e) {
+					setSourceEnd(block, e.getToken());
+					return;
+				}
+			}
+		} else {
+			setSourceEnd(block, token);
+		}
+	}
+
+	private Token parseBlockExpression(Token open, AutoconfElement block) throws BlockEndCondition {
+		Token token;
+		try {
+			if (block instanceof AutoconfIfElement 
+					|| block instanceof AutoconfElifElement 
+					|| block instanceof AutoconfCaseElement 
+					|| block instanceof AutoconfWhileElement) {
+				token = parseExpression(block);
+			} else if (block instanceof AutoconfForElement) {
+				token = parseForExpression(block);
+			} else {
+				// no expression
+				return open;
+			}
+			block.setVar(getTokenSpanTextBetween(open, token));
+		} catch (BlockEndCondition e) {
+			// oops, premature end
+			setSourceEnd(block, e.getToken());
+			throw e;
+		}
+	
+		// check for expected token
+		while (true) {
+			token = tokenizer.readToken();
+			if (token.getType() == ITokenConstants.EOF)
+				break;
+			if (token.getType() != ITokenConstants.EOL)
+				break;
+		}
+		
+		if (token.getType() == ITokenConstants.SH_DO) {
+			checkBlockValidity(block, token, 
+					new Class[] { AutoconfForElement.class, AutoconfWhileElement.class },
+					INVALID_DO);
+		}
+		else if (token.getType() == ITokenConstants.SH_THEN) {
+			checkBlockValidity(block, token, 
+					new Class[] { AutoconfIfElement.class, AutoconfElifElement.class },
+					INVALID_THEN);
+		} 
+		else {
+			String exp;
+			if (block instanceof AutoconfIfElement || block instanceof AutoconfElifElement)
+				exp = "then";
+			else
+				exp = "do";
+			
+			handleError(block, token, AutoconfEditorMessages.getFormattedString(MISSING_SPECIFIER, exp));
+
+			// assume we're still in the block...
+			tokenizer.unreadToken(token);
+		}
+		return token;
+	}
+	
+	/**
+	 * Parse a case statement.  Scoop up statements into case conditional blocks.
+	 * <pre>
+	 * 'case' EXPR 'in' 
+	 * 		{ EXPR ')'  { STMTS } ';;' }
+	 * 'esac'
+	 * </pre>
+	 * @param parent
+	 * @return
+	 */
+	protected void parseCaseBlock(AutoconfElement parent, Token open, AutoconfElement block) throws BlockEndCondition {
+		parent.addChild(block);
+		
+		setSourceStart(block, open);
+		
+		// get the case expression, terminating at 'in'
+		Token token;
+		try {
+			token = parseCaseExpression(block);
+		} catch (BlockEndCondition e) {
+			// oops, premature end
+			setSourceEnd(block, e.getToken());
+			throw e;
+		}
+		
+		block.setVar(getTokenSpanTextBetween(open, token));
+		
+		// now get the statements, which are themselves blocks... just read statements
+		// that terminate with ';;' and stuff those into blocks.
+		
+		while (true) {
+			AutoconfCaseConditionElement condition = new AutoconfCaseConditionElement();
+
+			// skip EOLs and get the first "real" token
+			while (true) {
+				token = tokenizer.readToken();
+				setSourceStart(condition, token);
+				if (token.getType() == ITokenConstants.EOF)
+					break;
+				if (token.getType() == ITokenConstants.EOL)
+					continue;
+				break;
+			}
+			
+			if (token.getType() == ITokenConstants.SH_ESAC) {
+				break;
+			}
+			
+			try {
+				Token start = token;
+				token = parseCaseExpression(condition);
+				condition.setName(getTokenSpanTextFromUpTo(start, token));
+				
+				while (true) {
+					parseStatement(condition);
+				}
+			} catch (BlockEndCondition e) {
+				setSourceEnd(condition, e.getToken());
+				
+				if (condition.getSource().length() > 0)
+					block.addChild(condition);
+				
+				if (e.getToken().getType() != ITokenConstants.SH_CASE_CONDITION_END) {
+					token = e.getToken();
+					break;
+				}
+			}
+		}
+		
+		setSourceEnd(block, token);
+		
+		if (token.getType() != ITokenConstants.SH_ESAC) {
+			handleError(parent, token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, block.getName()));
+		}
+	}
+
+	private String getTokenSpanTextBetween(Token open, Token close) {
+		int startOffset = open.getOffset() + open.getLength();
+		int endOffset = close.getOffset();
+		if (open.getDocument() != close.getDocument())
+			return open.getText();
+		
+		String text;
+		try {
+			text = open.getDocument().get(startOffset, endOffset - startOffset).trim();
+		} catch (BadLocationException e) {
+			text = open.getText();
+			// TODO: error
+		}
+		
+		return text;
+	}
+
+	private String getTokenSpanTextFromUpTo(Token open, Token close) {
+		int startOffset = open.getOffset();
+		int endOffset = close.getOffset();
+		if (open.getDocument() != close.getDocument())
+			return open.getText();
+		
+		String text;
+		try {
+			text = open.getDocument().get(startOffset, endOffset - startOffset).trim();
+		} catch (BadLocationException e) {
+			text = open.getText();
+			// TODO: error
+		}
+		
+		return text;
+	}
+	private void setSourceStart(AutoconfElement block, Token open) {
+		int offset = open.getOffset();
+		block.setDocument(open.getDocument());
+		block.setStartOffset(offset);
+	}
+
+	private void setSourceEnd(AutoconfElement block, Token close) {
+		int offset = close.getOffset() + close.getLength();
+		if (block.getDocument() != null && block.getDocument() != close.getDocument())
+			throw new IllegalStateException();
+		block.setDocument(close.getDocument());
+		block.setEndOffset(offset);
+	}
+
+	private void setSourceEndBefore(AutoconfElement block, Token close) {
+		int offset = close.getOffset();
+		if (block.getDocument() != null && block.getDocument() != close.getDocument())
+			throw new IllegalStateException();
+		block.setDocument(close.getDocument());
+		block.setEndOffset(offset);
+	}
+
+	/**
+	 * Parse a single statement (macro call or a shell construct).
+	 * This can recursively invoke parseBlock() or parseStatement() to populate the tree.
+	 * Whenever a token terminates a block, we check its validity and then throw BlockEndCondition.
+	 * @param parent the parent into which to add statements.  The type of this element is used
+	 * to validate the legality of block closing tokens.
+	 */
+	protected void parseStatement(AutoconfElement parent) throws BlockEndCondition {
+	
+		boolean atStart = true;
+		
+		while (true) {
+			Token token = tokenizer.readToken();
+			
+			switch (token.getType()) {
+			// 0. Check EOF
+			case ITokenConstants.EOF:
+				AutoconfElement element = parent;
+				while (element != null && !(element instanceof AutoconfRootElement)) {
+					handleError(element, token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, element.getName()));
+					element = element.getParent();
+				}
+				throw new BlockEndCondition(token);
+			
+			
+			// 1. Check for end of statement
+			case ITokenConstants.EOL:
+			case ITokenConstants.SEMI:
+				return;
+			
+			
+			// 2. Check macro expansions
+			case ITokenConstants.WORD:
+				checkMacro(parent, token);
+				atStart = false;
+				break;
+			
+			// Check for shell constructs.  These should appear at the start of a line
+			// or after a semicolon.  If they don't,  just report an error and continue, 
+			// to be tolerant of our own lax parsing.
+			
+			// 3.a) Check dollar variables
+			case ITokenConstants.SH_DOLLAR:
+				// skip the next token
+				atStart = false;
+				token = tokenizer.readToken();
+				continue;
+				
+			// 3.b) Look for if/else/elif/fi constructs,
+			// being tolerant of nesting problems by allowing
+			// stranded else/elif nodes but reporting errors.
+			case ITokenConstants.SH_IF:
+				checkLineStart(parent, token, atStart);
+				parseBlock(parent, token, new AutoconfIfElement());
+				break;
+				
+			case ITokenConstants.SH_ELIF:
+				checkLineStart(parent, token, atStart);
+				checkBlockValidity(
+						parent, token, 
+						new Class[] { AutoconfIfElement.class, AutoconfElifElement.class },
+						INVALID_ELIF);
+				parseBlock(parent, token, new AutoconfElifElement());
+				token = tokenizer.peekToken();
+				throw new BlockEndCondition(token);
+			
+			case ITokenConstants.SH_ELSE:
+				checkLineStart(parent, token, atStart);
+				checkBlockValidity(
+						parent, token, 
+						new Class[] { AutoconfIfElement.class, AutoconfElifElement.class },
+						INVALID_ELSE);
+				parseBlock(parent, token, new AutoconfElseElement());
+				token = tokenizer.peekToken();
+				throw new BlockEndCondition(token);
+			
+			case ITokenConstants.SH_FI:
+				checkLineStart(parent, token, atStart);
+				checkBlockValidity(
+						parent, token, 
+						new Class[] { AutoconfIfElement.class, AutoconfElifElement.class, AutoconfElseElement.class },
+						INVALID_FI);
+				throw new BlockEndCondition(token);
+			
+				
+			// 4. Look for for/while loops
+			case ITokenConstants.SH_FOR:
+				checkLineStart(parent, token, atStart);
+				parseBlock(parent, token, new AutoconfForElement());
+				break;
+				
+			case ITokenConstants.SH_WHILE:
+				checkLineStart(parent, token, atStart);
+				parseBlock(parent, token, new AutoconfWhileElement());
+				break;
+				
+			case ITokenConstants.SH_UNTIL:
+				checkLineStart(parent, token, atStart);
+				parseBlock(parent, token, new AutoconfUntilElement());
+				break;
+				
+			case ITokenConstants.SH_SELECT:
+				checkLineStart(parent, token, atStart);
+				parseBlock(parent, token, new AutoconfSelectElement());
+				break;
+				
+			case ITokenConstants.SH_DONE:
+				checkLineStart(parent, token, atStart);
+				checkBlockValidity(
+						parent, token, 
+						new Class[] { AutoconfForElement.class, AutoconfWhileElement.class,
+								AutoconfUntilElement.class, AutoconfSelectElement.class },
+						INVALID_DONE);
+				throw new BlockEndCondition(token);
+			
+			// 5. Look for case statements
+			case ITokenConstants.SH_CASE:
+				checkLineStart(parent, token, atStart);
+				parseCaseBlock(parent, token, new AutoconfCaseElement());
+				break;
+				
+			case ITokenConstants.SH_CASE_CONDITION_END:
+				checkBlockValidity(
+						parent, token, 
+						new Class[] { AutoconfCaseConditionElement.class },
+						IMPROPER_CASE_CONDITION);
+				throw new BlockEndCondition(token);
+			
+			case ITokenConstants.SH_ESAC:
+				checkLineStart(parent, token, atStart);
+				checkBlockValidity(
+						parent, token, 
+						// note: we don't strictly recurse here, so accept either parent
+						new Class[] { AutoconfCaseElement.class, AutoconfCaseConditionElement.class },
+						INVALID_ESAC);
+				throw new BlockEndCondition(token);
+			
+			
+			// 6. Check for HERE documents
+			case ITokenConstants.SH_HERE:
+			case ITokenConstants.SH_HERE_DASH:
+
+				parseHERE(parent, token);
+				break;
+			}
+		}
+	}
+
+	private void checkLineStart(AutoconfElement parent, Token token, boolean atStart) {
+		if (!atStart) {
+			handleError(parent, token, AutoconfEditorMessages.getFormattedString(INVALID_TERMINATION, token.getText()));
+		}
+	}
+
+	/**
+	 * Parse the Here document, whose control token is provided (SH_HERE or SH_HERE_DASH).
+	 * Contents are thrown away except for any macro calls.
+	 * @param parent
+	 * @param controlToken
+	 */
+	private void parseHERE(AutoconfElement parent, Token controlToken) {
+		Token token = tokenizer.readToken();
+		if (token.getType() == ITokenConstants.EOL || token.getType() == ITokenConstants.EOF) {
+			handleError(parent, token,
+					AutoconfEditorMessages.getString(INCOMPLETE_INLINE_MARKER));
+			
+		} else {
+			String hereTag = token.getText();
+		
+			boolean atEOL = false;
+			while (true) {
+				token = tokenizer.readToken();
+				if (token.getType() == ITokenConstants.EOF) {
+					handleError(parent, token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, parent.getName()));
+					break;
+				} else if (token.getType() == ITokenConstants.EOL) {
+					atEOL = true;
+				} else {
+					if (atEOL && token.getText().equals(hereTag)) {
+						// only the end if it is also followed by EOL without any whitespace
+						Token eol = tokenizer.readToken();
+						if (eol.getType() == ITokenConstants.EOL && eol.getOffset() == token.getOffset() + token.getLength()) {
+							break;
+						}
+					}
+					if (token.getType() == ITokenConstants.WORD) {
+						checkMacro(parent, token);
+					}
+					atEOL = false;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Parse through a single expression up to a semicolon or newline.
+	 * Add a macro call to the element or just return upon finding the desired token.
+	 * Whenever a token terminates the expression, we check its validity and return the final token
+	 * Throw {@link BlockEndCondition} if an unexpected token was found.
+	 * @param parent the parent into which to add statements.  The type of this element is used
+	 * to validate the legality of block closing tokens.
+	 */
+	protected Token parseExpression(AutoconfElement parent) throws BlockEndCondition {
+	
+		while (true) {
+			Token token = tokenizer.readToken();
+			
+			// 0. Ignore comments (tokenizer skipped them!)
+			
+			switch (token.getType()) {
+			// 1. Check EOF
+			case ITokenConstants.EOF:
+				throw new BlockEndCondition(token);
+		
+			// 2. Check macro expansions
+			case ITokenConstants.WORD:
+				token = checkMacro(parent, token);
+				break;
+			
+			// 3. Check expression terminators
+			case ITokenConstants.SEMI:
+			case ITokenConstants.EOL:
+				return token;
+
+			// 4. Handle variables
+			case ITokenConstants.SH_DOLLAR:
+				token = tokenizer.readToken();
+				break;
+				
+			case ITokenConstants.SH_IN:
+				// in 'for' or 'select, an 'in' may occur before 'do'
+				if (!(parent instanceof AutoconfForElement)
+						&& !(parent instanceof AutoconfSelectElement)) 
+					return token;
+				// fall through
+				
+			// 5. Abort on unexpected tokens
+			case ITokenConstants.SH_DO:
+			case ITokenConstants.SH_THEN:
+				handleError(parent, token, AutoconfEditorMessages.getFormattedString(INVALID_SPECIFIER, token.getText()));
+				tokenizer.unreadToken(token);
+				// close enough...
+				return token;
+				
+			case ITokenConstants.SH_ESAC:
+			case ITokenConstants.SH_CASE:
+			case ITokenConstants.SH_CASE_CONDITION_END:
+			case ITokenConstants.SH_FOR:
+			case ITokenConstants.SH_IF:
+			case ITokenConstants.SH_ELIF:
+			case ITokenConstants.SH_ELSE:
+			case ITokenConstants.SH_FI:
+			case ITokenConstants.SH_DONE:
+				handleError(parent, token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, parent.getName()));
+				tokenizer.unreadToken(token);
+				throw new BlockEndCondition(token);
+			}
+		}
+	}
+
+	/**
+	 * Parse through a single expression up to 'do'.
+	 * Add a macro call to the element or just return upon finding the desired token.
+	 * Whenever a token terminates the expression, we check its validity and then throw ExprEndCondition.
+	 * Throw {@link BlockEndCondition} if an unexpected token was found.
+	 * @param parent the parent into which to add statements.  The type of this element is used
+	 * to validate the legality of block closing tokens.
+	 */
+	protected Token parseForExpression(AutoconfElement parent) throws BlockEndCondition {
+		while (true) {
+			Token token = tokenizer.readToken();
+			
+			// 0. Ignore comments (tokenizer skipped them!)
+			
+			// 1. Check EOF
+			if (token.getType() == ITokenConstants.EOF) {
+				throw new BlockEndCondition(token);
+			}
+		
+			// 2. Check macro expansions
+			else if (token.getType() == ITokenConstants.WORD) {
+				token = checkMacro(parent, token);
+			}
+			
+			// 3. Check expression terminators -- not ';' here, but 'do'
+			else if (token.getType() == ITokenConstants.SH_DO) {
+				tokenizer.unreadToken(token);
+				return tokenizer.peekToken();
+			}
+			
+			// 4. Abort on unexpected tokens
+			else switch (token.getType()) {
+			case ITokenConstants.SH_THEN:
+				handleError(parent, token, AutoconfEditorMessages.getFormattedString(INVALID_SPECIFIER, token.getText()));
+				tokenizer.unreadToken(token);
+				// close enough...
+				//throw new ExprEndCondition(token);
+				return token;
+				
+			case ITokenConstants.SH_ESAC:
+			case ITokenConstants.SH_CASE:
+			case ITokenConstants.SH_CASE_CONDITION_END:
+			case ITokenConstants.SH_FOR:
+			case ITokenConstants.SH_IF:
+			case ITokenConstants.SH_ELIF:
+			case ITokenConstants.SH_ELSE:
+			case ITokenConstants.SH_FI:
+			case ITokenConstants.SH_DONE:
+				handleError(parent, token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, parent.getName()));
+				tokenizer.unreadToken(token);
+				throw new BlockEndCondition(token);
+			}
+		}
+	}
+
+	/**
+	 * Parse through a single expression up to 'in'.
+	 * Add a macro call to the element or just return upon finding the desired token.
+	 * Whenever a token terminates the expression, we check its validity and then throw ExprEndCondition.
+	 * Throw {@link BlockEndCondition} if an unexpected token was found.
+	 * @param parent the parent into which to add statements.  The type of this element is used
+	 * to validate the legality of block closing tokens.
+	 */
+	protected Token parseCaseExpression(AutoconfElement parent) throws BlockEndCondition {
+		while (true) {
+			Token token = tokenizer.readToken();
+			
+			// 0. Ignore comments (tokenizer skipped them!)
+			
+			// 1. Check EOF
+			if (token.getType() == ITokenConstants.EOF) {
+				throw new BlockEndCondition(token);
+			}
+		
+			// 2. Check macro expansions
+			else if (token.getType() == ITokenConstants.WORD) {
+				token = checkMacro(parent, token);
+			}
+			
+			// 3. Check expression terminators
+			else if (parent instanceof AutoconfCaseElement && token.getType() == ITokenConstants.SH_IN) {
+				return token;
+			}
+			else if (parent instanceof AutoconfCaseConditionElement && token.getType() == ITokenConstants.RPAREN) {
+				return token;
+			}
+			
+			// 4. Abort on unexpected tokens
+			else switch (token.getType()) {
+			case ITokenConstants.SEMI:
+			case ITokenConstants.SH_IN:
+			case ITokenConstants.RPAREN:
+			case ITokenConstants.SH_DO:
+			case ITokenConstants.SH_THEN:
+				if (parent instanceof AutoconfCaseElement)
+					handleError(parent, token, AutoconfEditorMessages.getString(INVALID_IN));
+				else
+					handleError(parent, token, AutoconfEditorMessages.getString(IMPROPER_CASE_CONDITION));
+				// close enough...
+				return token;
+				
+			case ITokenConstants.SH_ESAC:
+			case ITokenConstants.SH_CASE:
+			case ITokenConstants.SH_CASE_CONDITION_END:
+			case ITokenConstants.SH_FOR:
+			case ITokenConstants.SH_IF:
+			case ITokenConstants.SH_ELIF:
+			case ITokenConstants.SH_ELSE:
+			case ITokenConstants.SH_FI:
+			case ITokenConstants.SH_DONE:
+				handleError(parent, token, AutoconfEditorMessages.getFormattedString(UNTERMINATED_CONSTRUCT, parent.getName()));
+				tokenizer.unreadToken(token);
+				throw new BlockEndCondition(token);
+			}
+		}
+	}
+	
+	/**
+	 * Check a given close block token against the current parent by checking that
+	 * the parent's class is one of classes,  If a match happens,
+	 * optionally push back the token if it will be used to parse new statements in the parent.
+	 * Report an error if the parent is not one of the expected kinds.
+	 * @param parent
+	 * @param token
+	 * @param classes
+	 */
+	private void checkBlockValidity(
+			AutoconfElement parent, 
+			Token token,
+			Class<?>[] classes,
+			String errorMessage) {
+		for (int i = 0; i < classes.length; i++) {
+			if (classes[i].isInstance(parent)) {
+				return;
+			}
+		}
+		
+		// not a match
+		handleError(parent, token, 
+				AutoconfEditorMessages.getFormattedString(errorMessage, parent.getName(), token.getText()));
+	}
+
+	/**
+	 * Check whether the given token is part of a macro, and parse it as such
+	 * if necessary.  
+	 * @param parent
+	 * @param token
+	 * @return Token last read for the macro call
+	 */
+	private Token checkMacro(AutoconfElement parent, Token token) {
+		String name = token.getText();
+		
+		boolean hasArguments = tokenizer.peekToken().getType() == ITokenConstants.LPAREN;
+		if (macroDetector != null && macroDetector.isMacroIdentifier(name)) {
+			// ok
+		} else if (m4builtins.contains(name)) {
+			// all of these except dnl take arguments
+			if (!name.equals("dnl") && !hasArguments)
+				return token;
+		} else {
+			return token;
+		}
+		
+		AutoconfMacroElement macro = new AutoconfMacroElement(name);
+		token = parseMacro(macro, token);
+		
+		// handle special macros here
+		if ("dnl".equals(name)) {
+			// consume to EOL
+			while (true) {
+				token = tokenizer.readToken();
+				if (token.getType() == ITokenConstants.EOF || token.getType() == ITokenConstants.EOL)
+					break;
+			}
+			
+			// ignore macro entirely
+			macro = null;
+		} else if ("changequote".equals(name)) {
+			// change quote delimiters
+			validateMacroParameterCount(macro, token, 2);
+			
+			// GNU behavior for invalid argument count
+			String parm0 = "`";
+			String parm1 = "'";
+			if (macro.getParameterCount() >= 1)
+				parm0 = macro.getParameter(0);
+			if (macro.getParameterCount() >= 2)
+				parm1 = macro.getParameter(1);
+			
+			tokenizer.setM4Quote(parm0, parm1);
+		}  else if ("changecom".equals(name)) {
+			// change comment delimiters
+			validateMacroParameterCount(macro, token, 2);
+			
+			// GNU behavior for invalid argument count
+			String parm0 = "#";
+			String parm1 = "\n";
+			if (macro.getParameterCount() >= 1)
+				parm0 = macro.getParameter(0);
+			if (macro.getParameterCount() >= 2)
+				parm1 = macro.getParameter(1);
+			
+			tokenizer.setM4Comment(parm0, parm1);
+		}
+		
+		if (macro != null) {
+			parent.addChild(macro);
+		}
+		
+		// now validate that the macro is properly terminated
+		if (!(parent instanceof AutoconfMacroArgumentElement) 
+				&& !(parent instanceof AutoconfMacroElement)
+				&& !(parent instanceof AutoconfForElement)) {
+			Token peek = tokenizer.peekToken();
+			if (peek.getType() == ITokenConstants.RPAREN) {
+				handleError(macro, peek, AutoconfEditorMessages.getString(UNMATCHED_RIGHT_PARENTHESIS)); 
+			}
+		}
+		
+		return token;
+	}
+
+	private void validateMacroParameterCount(AutoconfMacroElement macro, Token token, int count) {
+		if (macro.getParameterCount() < count) {
+			handleError(macro, token, AutoconfEditorMessages.getFormattedString("M4MacroArgsTooFew", macro.getName(), new Integer(2))); 
+		} else if (macro.getParameterCount() > count) {
+			handleError(macro, token, AutoconfEditorMessages.getFormattedString("M4MacroArgsTooMany", macro.getName(), new Integer(2)));
+		}
+	}
+
+	/**
+	 * Start parsing a macro call at a suspected macro expansion location.
+	 * @param macro
+	 * @param line the line containing the start of the 
+	 * @param parent
+	 * @return last token parsed
+	 */
+	protected Token parseMacro(AutoconfMacroElement macro, Token macroName) {
+		setSourceStart(macro, macroName);
+		
+		// parse any arguments
+		tokenizer.setM4Context(true);
+		
+		Token token = tokenizer.readToken();
+		if (token.getType() == ITokenConstants.LPAREN) {
+			token = parseMacroArguments(macro, token);
+			setSourceEnd(macro, token);
+		} else {
+			tokenizer.unreadToken(token);
+			setSourceEnd(macro, macroName);
+		}
+		
+		tokenizer.setM4Context(false);
+		
+		// validate macro arguments?
+		if (macroValidator != null) {
+			try {
+				macroValidator.validateMacroCall(macro);
+			} catch (ParseException e) {
+				errorHandler.handleError(e);
+			}
+		}
+		
+		return token;
+	}
+
+	/**
+	 * Parse the arguments for the given macro.  These are not interpreted as shell
+	 * constructs but just as text with possibly more macro expansions inside.
+	 * @param macro
+	 * @return final token (')')
+	 */
+	protected Token parseMacroArguments(AutoconfMacroElement macro, Token lparen) {
+		Token argStart = null;
+		Token argEnd = null;
+		Token token;
+		
+		// When parsing, we want to ignore the whitespace around the arguments.
+		// So, instead of taking the source range "between" a parenthesis and a comma,
+		// track the exact tokens forming the start and end of an argument, defaulting
+		// to the borders of the parentheses and commas if no text is included.
+		
+		StringBuffer argBuffer = new StringBuffer();
+		AutoconfMacroArgumentElement arg = new AutoconfMacroArgumentElement();
+
+		while (true) {
+			token = tokenizer.readToken();
+			
+			if (token.getType() == ITokenConstants.EOL) {
+				if (argBuffer.length() > 0)
+					argBuffer.append(token.getText());
+				continue;
+			}
+			
+			if (token.getType() == ITokenConstants.COMMA 
+					|| token.getType() == ITokenConstants.RPAREN
+					|| token.getType() == ITokenConstants.EOF) {
+
+				arg.setName(argBuffer.toString());
+				argBuffer.setLength(0);
+				
+				if (argStart != null && argEnd != null) {
+					setSourceStart(arg, argStart);
+					setSourceEnd(arg, argEnd);
+				} else if (argEnd != null) {
+					setSourceStart(arg, argStart);
+					setSourceEndBefore(arg, token);
+				} else {
+					// empty argument
+					setSourceStart(arg, token);
+					setSourceEndBefore(arg, token);
+				}
+				
+				macro.addChild(arg);
+				
+				if (token.getType() != ITokenConstants.COMMA)
+					break;
+				
+				argStart = null;
+				argEnd = null;
+				
+				arg = new AutoconfMacroArgumentElement();
+
+			} else {
+				if (argStart == null) {
+					argStart = token;
+				}
+				argEnd = token;
+				
+				if (argBuffer.length() > 0 && token.followsSpace())
+					argBuffer.append(' ');
+				argBuffer.append(token.getText());
+				
+				// handle nested macro calls in arguments
+				if (token.getType() == ITokenConstants.WORD) {
+					argEnd = checkMacro(arg, token);
+				}
+			}
+		}
+		
+		if (token.getType() != ITokenConstants.RPAREN) {
+			handleError(macro, token, AutoconfEditorMessages.getString(UNMATCHED_LEFT_PARENTHESIS)); 
+		}
+		
+		// note: moved 15-char truncation to AutoconfLabelProvider
+		AutoconfElement[] children = macro.getChildren();
+		if (children.length > 0)
+			macro.setVar(children[0].getVar());
+		
+		return token;
+	}
+	
+
+	
+	protected void handleError(AutoconfElement element, Token token, String message) {
+		handleMessage(element, token, message, IMarker.SEVERITY_ERROR);
+	}
+	protected void handleWarning(AutoconfElement element, Token token, String message) {
+		handleMessage(element, token, message, IMarker.SEVERITY_WARNING);
+	}
+	protected void handleMessage(AutoconfElement element, Token token, String message, int severity) {
+		if (errorHandler != null) {
+			int lineNumber = 0;
+			int startColumn = 0;
+			int endColumn = 0;
+			try {
+				lineNumber = token.getDocument().getLineOfOffset(token.getOffset());
+				int lineOffs = token.getDocument().getLineOffset(lineNumber);
+				startColumn = token.getOffset() - lineOffs;
+				endColumn = startColumn + token.getLength();
+			} catch (BadLocationException e) {
+				// Don't care if we blow up trying to issue marker
+			}
+			errorHandler.handleError(new ParseException(
+					message,
+					token.getOffset(),
+					token.getOffset() + token.getLength(),
+					lineNumber, 
+					startColumn, endColumn,
+					severity));
+		}
+	}
+
+	public IAutoconfErrorHandler getErrorHandler() {
+		return errorHandler;
+	}
+}
+
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfRootElement.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfRootElement.java
new file mode 100644
index 0000000..105d00b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfRootElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfRootElement extends AutoconfElement {
+	
+	public AutoconfRootElement() {
+		super(""); //$NON-NLS-1$
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfSelectElement.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfSelectElement.java
new file mode 100644
index 0000000..aded97c
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfSelectElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfSelectElement extends AutoconfElement {
+	
+	public AutoconfSelectElement() {
+		super("select");
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfTokenizer.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfTokenizer.java
new file mode 100644
index 0000000..a34cbb2
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfTokenizer.java
@@ -0,0 +1,434 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+
+
+/**
+ * This tokenizer traverses autotools-style text (m4 or configure.ac) to support the
+ * autoconf parser.  It tracks the current context (m4 macro call or shell commands)
+ * to detect appropriate tokens, and tracks the m4 current quote style as well.
+ * <p>
+ * In m4 mode, its primary purpose is to find word boundaries, detect comments and quoted
+ * strings, and to find the macro punctuation tokens.  It will not interpret anything
+ * (e.g. '$1' inside a macro) -- this is up to the parser.
+ * <p>
+ * In shell script mode, its primary purpose is to identify enough
+ * tokens to get a general picture of the structure of source for use by the autoconf
+ * parser.  This isn't intended to be used for full shell script parsing.  In fact,
+ * aside from the known tokens and identifiers, only individual characters will be returned.
+ * <p>
+ * Both modes know about "words" or identifiers and use the same syntax to detect these.
+ * It's expected that the parser will detect a word as a macro or possible macro and
+ * switch the mode of the tokenizer to fit.  The parser should invoke "setM4Context(...)"
+ * (and "unreadToken" if necessary) to switch modes.
+ * @author eswartz
+ *
+ */
+public class AutoconfTokenizer {
+
+	private static final String UNTERMINATED_STRING = "UnterminatedString"; //$NON-NLS-1$
+	public static final String UNMATCHED_RIGHT_QUOTE = "UnmatchedRightQuote"; //$NON-NLS-1$
+	public static final String UNMATCHED_LEFT_QUOTE = "UnmatchedLeftQuote"; //$NON-NLS-1$
+	public static final String UNMATCHED_CLOSE_COMMENT = "UnmatchedCloseComment"; //$NON-NLS-1$
+	
+	private IDocument document;
+	private int offset;
+	private String m4OpenQuote;
+	private String m4CloseQuote;
+	private String m4OpenComment;
+	private String m4CloseComment;
+	private char[] chars;
+	private int startOffset;
+	private boolean isM4Context;
+	private Token eofToken;
+	private IAutoconfErrorHandler errorHandler;
+
+	/** Create a tokenizer for a document. */
+	public AutoconfTokenizer(IDocument document, IAutoconfErrorHandler errorHandler) {
+		if (document == null /* || macroDetector == null*/)
+			throw new IllegalArgumentException();
+		this.document = document;
+		this.errorHandler = errorHandler;
+		
+		this.chars = document.get().toCharArray();
+		this.offset = 0;
+		
+		this.eofToken = new Token(ITokenConstants.EOF, "", document, chars.length, 0);
+		
+		this.m4OpenQuote = "`";
+		this.m4CloseQuote = "'";
+		this.m4OpenComment = "#";
+		this.m4CloseComment = "\n";
+	}
+	
+	/**
+	 * Tell whether the tokenizer considers itself to be in an m4 context.
+	 * This determines what kinds of tokens it returns.
+	 * @return
+	 */
+	public boolean isM4Context() {
+		return isM4Context;
+	}
+	
+	/**
+	 * Switch the tokenizer into or out of m4 context.
+	 * @return
+	 */
+	public void setM4Context(boolean flag) {
+		isM4Context = flag;
+	}
+	
+	/** 
+	 * Set the m4 quote delimiters
+	 */
+	public void setM4Quote(String open, String close) {
+		this.m4OpenQuote = open;
+		this.m4CloseQuote = close;
+	}
+
+	/** 
+	 * Set the m4 comment delimiters
+	 */
+	public void setM4Comment(String open, String close) {
+		this.m4OpenComment = open;
+		this.m4CloseComment = close;
+	}
+	
+	/** Push back the given token.  This allows the tokenizer to restart from its start position,
+	 * potentially in a different context. */
+	public void unreadToken(Token token) {
+		if (token.getLength() > 0 && offset == token.getOffset())
+			throw new IllegalStateException();
+		offset = token.getOffset();
+	}
+	
+	/** Read the next token. Returns an EOF token at EOF. */
+	public Token readToken() {
+		if (offset >= chars.length)
+			return eofToken;
+		
+		char ch = chars[offset];
+		
+		// skip whitespace (but not EOL)
+		while (isWhitespace(ch)) {
+			offset++;
+			if (offset >= chars.length)
+				return eofToken;
+			ch = chars[offset];
+		}
+
+		// in shell mode, strip comments up to eol 
+		if (!isM4Context && ch == '#') {
+			while (offset < chars.length) {
+				ch = chars[offset];
+				if (ch == '\n')
+					break;
+				offset++;
+			}
+			
+			// keep inside doc if we didn't find that EOL
+			if (offset >= chars.length)
+				offset--;
+		}
+
+		startOffset = offset;
+		StringBuffer buffer = new StringBuffer();
+		
+		// check EOL
+		if (ch == '\r' || ch == '\n') {
+			buffer.append(ch);
+			offset++;
+			if (ch == '\r' && offset < chars.length && chars[offset] == '\n') {
+				buffer.append(chars[offset++]);
+			}
+			return makeToken(ITokenConstants.EOL, buffer.toString());
+		}
+		
+		// TODO: this parser always uses fixed logic for identifier reading, ignoring m4's "changeword"
+		if (isLeadIdentifierChar(ch)) {
+			return parseWord(ch);
+		}
+		
+		// check comments and quotes
+		if (isM4Context) {
+			if (lookAhead(m4OpenComment)) {
+				boolean found = false;
+				// keep reading until the close comment (these are NOT nested)
+				while (offset < chars.length) {
+					if (lookAhead(m4CloseComment)) {
+						found = true;
+						break;
+					}
+					offset++;
+				}
+				if (!found) {
+					handleError(startOffset, offset, AutoconfEditorMessages.getFormattedString(UNMATCHED_CLOSE_COMMENT, 
+							m4CloseComment.equals("\n") ? "newline" : m4CloseComment)); //$NON-NLS-1$
+				}
+				return makeToken(ITokenConstants.M4_COMMENT);
+			}
+			
+			if (lookAhead(m4OpenQuote)) {
+				return parseQuote();
+			}
+		}
+		
+		// check shell punctuation
+		if (!isM4Context) {
+			if (ch == ';' && offset + 1 < chars.length && chars[offset + 1] == ';') {
+				offset += 2;
+				return makeToken(ITokenConstants.SH_CASE_CONDITION_END);
+			}
+			if (ch == '<' && offset + 1 < chars.length && chars[offset + 1] == '<') {
+				offset += 2;
+				if (offset < chars.length && chars[offset] == '-') {
+					offset++;
+					return makeToken(ITokenConstants.SH_HERE_DASH);
+				} else {
+					return makeToken(ITokenConstants.SH_HERE);
+				}
+			}
+			switch (ch) {
+			case '$':
+				offset++;
+				return makeToken(ITokenConstants.SH_DOLLAR);
+			case '[':
+				offset++;
+				return makeToken(ITokenConstants.SH_LBRACKET);
+			case ']':
+				offset++;
+				return makeToken(ITokenConstants.SH_RBRACKET);
+			case '{':
+				offset++;
+				return makeToken(ITokenConstants.SH_LBRACE);
+			case '}':
+				offset++;
+				return makeToken(ITokenConstants.SH_RBRACE);
+			case '\'':
+				return parseString(ITokenConstants.SH_STRING_SINGLE, ch);
+			case '\"':
+				return parseString(ITokenConstants.SH_STRING_DOUBLE, ch);
+			case '`':
+				return parseString(ITokenConstants.SH_STRING_BACKTICK, ch);
+			}
+		}
+		
+		// check common punctuation
+		if (ch == ';') {
+			offset++;
+			return makeToken(ITokenConstants.SEMI);
+		}
+		if (ch == ',') {
+			offset++;
+			return makeToken(ITokenConstants.COMMA);
+		}
+		if (ch == '(') {
+			offset++;
+			return makeToken(ITokenConstants.LPAREN);
+		}
+		if (ch == ')') {
+			offset++;
+			return makeToken(ITokenConstants.RPAREN);
+		}
+		
+		// unknown text
+		offset++;
+		return makeToken(ITokenConstants.TEXT);
+	}
+
+	private Token parseWord(char ch) {
+		StringBuffer buffer = new StringBuffer();
+		
+		buffer.append(ch);
+		offset++;
+		do {
+			if (offset >= chars.length)
+				break;
+			ch = chars[offset];
+			if (!isIdentifierChar(ch))
+				break;
+			buffer.append(ch);
+			offset++;
+		} while (true);
+		
+		String text = buffer.toString();
+		
+		if (!isM4Context) {
+			// detect sh tokens
+			if ("case".equals(text))
+				return makeToken(ITokenConstants.SH_CASE, text);
+			if ("in".equals(text))
+				return makeToken(ITokenConstants.SH_IN, text);
+			if ("esac".equals(text))
+				return makeToken(ITokenConstants.SH_ESAC, text);
+			if ("while".equals(text))
+				return makeToken(ITokenConstants.SH_WHILE, text);
+			if ("select".equals(text))
+				return makeToken(ITokenConstants.SH_SELECT, text);
+			if ("until".equals(text))
+				return makeToken(ITokenConstants.SH_UNTIL, text);
+			if ("for".equals(text))
+				return makeToken(ITokenConstants.SH_FOR, text);
+			if ("do".equals(text))
+				return makeToken(ITokenConstants.SH_DO, text);
+			if ("done".equals(text))
+				return makeToken(ITokenConstants.SH_DONE, text);
+			if ("if".equals(text))
+				return makeToken(ITokenConstants.SH_IF, text);
+			if ("then".equals(text))
+				return makeToken(ITokenConstants.SH_THEN, text);
+			if ("else".equals(text))
+				return makeToken(ITokenConstants.SH_ELSE, text);
+			if ("elif".equals(text))
+				return makeToken(ITokenConstants.SH_ELIF, text);
+			if ("fi".equals(text))
+				return makeToken(ITokenConstants.SH_FI, text);
+		}
+		
+		// other identifier-looking word
+		return makeToken(ITokenConstants.WORD, text);
+	}
+	
+	private Token parseQuote() {
+		// read text, honoring nested quotes, but don't put the outermost quotes in the token  
+		
+		StringBuffer buffer = new StringBuffer();
+		
+		int quoteLevel = 1;
+		// keep reading until the close quote
+		while (offset < chars.length) {
+			if (lookAhead(m4CloseQuote)) {
+				quoteLevel--;
+				if (quoteLevel == 0)
+					break;
+				buffer.append(m4CloseQuote);
+			} else if (lookAhead(m4OpenQuote)) {
+				buffer.append(m4OpenQuote);
+				quoteLevel++;
+			} else {
+				buffer.append(chars[offset]);
+				offset++;
+			}
+		}
+		
+		if (quoteLevel > 0) {
+			handleError(startOffset, offset, AutoconfEditorMessages.getFormattedString(UNMATCHED_LEFT_QUOTE, m4CloseQuote));
+		} else if (quoteLevel < 0) {
+			handleError(startOffset, offset, AutoconfEditorMessages.getFormattedString(UNMATCHED_RIGHT_QUOTE, m4OpenQuote));
+		}
+		
+		return makeToken(ITokenConstants.M4_STRING, buffer.toString());
+	}
+
+	private Token parseString(int type, char terminal) {
+		startOffset = offset;
+		offset++;
+		
+		StringBuffer buffer = new StringBuffer();
+		
+		char ch = 0;
+		while (offset < chars.length) {
+			ch = chars[offset++];
+			if (ch == '\\') {
+				if (offset < chars.length)
+					buffer.append(chars[offset++]);
+				else
+					buffer.append(ch);
+			} else if (ch == terminal) {
+				break;
+			} else {
+				buffer.append(ch);
+			}
+		}
+
+		if (ch != terminal) {
+			handleError(startOffset, offset, AutoconfEditorMessages.getFormattedString(UNTERMINATED_STRING, "" + ch));
+		}
+		
+		return makeToken(type, buffer.toString());
+	}
+
+	private void handleError(int start, int end,
+			String message) {
+		if (errorHandler != null) {
+			int lineNumber = 0;
+			int startColumn = 0;
+			int endColumn = 0;
+			try {
+				lineNumber = document.getLineOfOffset(start);
+				int lineOffs = document.getLineOffset(lineNumber);
+				startColumn = start - lineOffs;
+				endColumn = end - lineOffs;
+			} catch (BadLocationException e) {
+				// Don't care if we blow up trying to issue marker
+			}
+			errorHandler.handleError(new ParseException(
+					message,
+					start, end,
+					lineNumber, 
+					startColumn, endColumn,
+					IMarker.SEVERITY_ERROR));
+		}
+	}
+
+	/** 
+	 * Look ahead for the given string.  If found, return true, and have
+	 * offset updated.  Otherwise, return false with offset unchanged.
+	 * @param keyword
+	 * @param text
+	 * @return
+	 */
+	private boolean lookAhead(String keyword) {
+		int length = keyword.length();
+		if (offset + length > chars.length) {
+			return false;
+		}
+		for (int idx = 0; idx < length; idx++) {
+			if (chars[offset + idx] != keyword.charAt(idx))
+				return false;
+		}
+		offset += length;
+		return true;
+	}
+
+	private boolean isWhitespace(char ch) {
+		return ch == ' ' || ch == '\t' || ch == '\f';
+	}
+
+	private Token makeToken(int type) {
+		return new Token(type,
+				new String(chars, startOffset, offset - startOffset),
+				document, startOffset, offset - startOffset);
+	}
+
+	private Token makeToken(int type, String text) {
+		return new Token(type, text, document, startOffset, offset - startOffset);
+	}
+
+	private boolean isIdentifierChar(char ch) {
+		return isLeadIdentifierChar(ch) || (ch >= '0' && ch <= '9');
+	}
+
+	private boolean isLeadIdentifierChar(char ch) {
+		return (ch >= 'A' &&  ch <= 'Z') || (ch >= 'a' && ch <= 'z') || ch == '_';
+	}
+	
+	public Token peekToken() {
+		Token token = readToken();
+		unreadToken(token);
+		return token;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfUntilElement.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfUntilElement.java
new file mode 100644
index 0000000..bf6eb59
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfUntilElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfUntilElement extends AutoconfElement {
+	
+	public AutoconfUntilElement() {
+		super("until");
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfWhileElement.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfWhileElement.java
new file mode 100644
index 0000000..8d247f7
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/AutoconfWhileElement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class AutoconfWhileElement extends AutoconfElement {
+	
+	public AutoconfWhileElement() {
+		super("while");
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfErrorHandler.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfErrorHandler.java
new file mode 100644
index 0000000..1363240
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfErrorHandler.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+
+/**
+ * Clients implement this interface to handle errors encountered while parsing.
+ * @author eswartz
+ *
+ */
+public interface IAutoconfErrorHandler {
+
+	/**
+	 * Handle an exception associated with the given element
+	 * @param exception the exception to handle; has a line number
+	 * at the time of call
+	 */
+	void handleError(ParseException exception);
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroDetector.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroDetector.java
new file mode 100644
index 0000000..e438731
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroDetector.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+
+/**
+ * Clients implement this interface to identify what identifiers represent 
+ * macros for the autoconf tree.
+ * @author eswartz
+ *
+ */
+public interface IAutoconfMacroDetector {
+
+	/**
+	 * Tell if this identifier should be treated as an m4 macro call.
+	 * The identifier has already been judged to be a valid candidate
+	 * (i.e. it's not quoted).
+	 * @param name the string to check
+	 */
+	boolean isMacroIdentifier(String name);
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroValidator.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroValidator.java
new file mode 100644
index 0000000..2a54ee4
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IAutoconfMacroValidator.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+
+/**
+ * Clients implement this interface to validate macro calls.
+ * @author eswartz
+ *
+ */
+public interface IAutoconfMacroValidator {
+
+	/**
+	 * Validate the given macro call.
+	 * @param element macro call, never <code>null</code>
+	 * @throws ParseException if the call doesn't match the expected number of elements 
+	 */
+	void validateMacroCall(AutoconfMacroElement element) throws ParseException;
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IMacroDetector.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IMacroDetector.java
new file mode 100644
index 0000000..b225942
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/IMacroDetector.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+/**
+ * Clients implement this interface to detect whether a given identifier 
+ * represents a known or potential macro in m4 or configure.ac text.
+ * @author eswartz
+ *
+ */
+public interface IMacroDetector {
+	boolean isMacro(String identifier);
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ITokenConstants.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ITokenConstants.java
new file mode 100644
index 0000000..b665115
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ITokenConstants.java
@@ -0,0 +1,87 @@
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public interface ITokenConstants {
+
+	/** end of file */
+	public static final int EOF = 0;
+	/** end of line */
+	public static final int EOL = 1;
+	
+	/** an open parenthesis */
+	public static final int LPAREN = 2;
+	/** a close parenthesis */
+	public static final int RPAREN = 3;
+	/** a comma */
+	public static final int COMMA = 4;
+	/** a semicolon */
+	public static final int SEMI = 5;
+
+	/** a word (either m4 word or shell identifier-looking word) */
+	public static final int WORD = 6;
+
+	/** other text (usually punctuation or number, one char at a time) */
+	public static final int TEXT = 7;
+
+	/** an m4 string (the text does not contain the outermost quotes) */
+	public static final int M4_STRING = 21;
+	/** an m4 comment (as determined by changecomment, NOT dnl) */
+	public static final int M4_COMMENT = 22;
+	
+	/** the sh 'if' token */
+	public static final int SH_IF = 40;
+	/** the sh 'then' token */
+	public static final int SH_THEN = 41;
+	/** the sh 'else' token */
+	public static final int SH_ELSE = 42;
+	/** the sh 'elif' token */
+	public static final int SH_ELIF = 43;
+	/** the sh 'fi' token */
+	public static final int SH_FI = 44;
+	
+	/** the sh 'while' token */
+	public static final int SH_WHILE = 45;
+	/** the sh 'for' token */
+	public static final int SH_FOR = 46;
+	/** the sh 'select' token */
+	public static final int SH_SELECT = 47;
+	/** the sh 'until' token */
+	public static final int SH_UNTIL = 48;
+	/** the sh 'do' token */
+	public static final int SH_DO = 49;
+	/** the sh 'done' token */
+	public static final int SH_DONE = 50;
+	/** the sh 'case' token */
+	
+	public static final int SH_CASE = 51;
+	/** the sh 'in' token */
+	public static final int SH_IN = 52;
+	/** the sh ';;' token */
+	public static final int SH_CASE_CONDITION_END = 53;
+	/** the sh 'esac' token */
+	public static final int SH_ESAC = 54;
+
+	/** the sh '$' token */
+	public static final int SH_DOLLAR = 60;
+	
+	/** the sh '{' token */
+	public static final int SH_LBRACE = 61;
+	/** the sh '}' token */
+	public static final int SH_RBRACE = 62;
+	/** the sh '[' token */
+	public static final int SH_LBRACKET = 63;
+	/** the sh ']' token */
+	public static final int SH_RBRACKET = 64;
+	
+	/** the sh '<<' token */
+	public static final int SH_HERE = 65;
+	/** the sh '<<-' token */
+	public static final int SH_HERE_DASH = 66;
+	/** an sh double-quoted string */
+	public static final int SH_STRING_DOUBLE = 67;
+	/** an sh single-quoted string */
+	public static final int SH_STRING_SINGLE = 68;
+	/** an sh backtick-quoted string */
+	public static final int SH_STRING_BACKTICK = 69;
+
+
+}
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ParseException.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ParseException.java
new file mode 100644
index 0000000..f0bc442
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/ParseException.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+public class ParseException extends Exception {
+	
+	static final long serialVersionUID = 1;
+	String message;
+	int severity;
+	int lineNumber;
+	int startColumn;
+	int endColumn;
+	private int startOffset;
+	private int endOffset;
+	public int getEndColumn() {
+		return endColumn;
+	}
+	public void setEndColumn(int endColumn) {
+		this.endColumn = endColumn;
+	}
+	public int getLineNumber() {
+		return lineNumber;
+	}
+	public void setLineNumber(int lineNumber) {
+		this.lineNumber = lineNumber;
+	}
+	public String getMessage() {
+		return message;
+	}
+	public void setMessage(String message) {
+		this.message = message;
+	}
+	public int getStartColumn() {
+		return startColumn;
+	}
+	public void setStartColumn(int startColumn) {
+		this.startColumn = startColumn;
+	}
+	public ParseException(String message,
+			int startOffset, int endOffset,
+			int lineNumber, int startColumn, int endColumn, int severity) {
+		super();
+		this.message = message;
+		this.startOffset = startOffset;
+		this.endOffset = endOffset;
+		this.lineNumber = lineNumber;
+		this.startColumn = startColumn;
+		this.endColumn = endColumn;
+		this.severity = severity;
+	}
+	public int getSeverity() {
+		return severity;
+	}
+	public void setSeverity(int severity) {
+		this.severity = severity;
+	}
+	public int getStartOffset() {
+		return startOffset;
+	}
+	public int getEndOffset() {
+		return endOffset;
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/Token.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/Token.java
new file mode 100644
index 0000000..9690363
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/editors/parser/Token.java
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.editors.parser;
+
+import org.eclipse.jface.text.IDocument;
+
+/**
+ * A single token parsed from an autotools-style file.  This represents m4 and sh
+ * tokens.  Punctuation characters shared by both are not in a namespace.
+ * 
+ * @author eswartz
+ *
+ */
+public class Token implements ITokenConstants {
+	/** Type: 
+	 * @see ITokenConstants
+	 */
+	final int type;
+	/**
+	 * Text of token, possibly interpreted or reduced from original characters
+	 */
+	final String text;
+	/**
+	 * Offset of token before interpretation
+	 */
+	final int offset;
+	/**
+	 * Length of token before interpretation
+	 */
+	final int length;
+	/**
+	 * The document providing the text
+	 */
+	final IDocument document;
+
+	public Token(int type, String text, IDocument document, int offset, int length) {
+		this.type = type;
+		this.text = text;
+		this.document = document;
+		this.offset = offset;
+		this.length = length;
+	}
+	
+	public String toString() {
+		return text;
+	}
+
+	public int getType() {
+		return type;
+	}
+
+	public String getText() {
+		return text;
+	}
+
+	public IDocument getDocument() {
+		return document;
+	}
+
+	public int getOffset() {
+		return offset;
+	}
+	
+	public int getLength() {
+		return length;
+	}
+
+	public boolean followsSpace() {
+		char[] text = document.get().toCharArray();
+		if (offset == 0)
+			return false;
+		return (" \t\r\n\f".indexOf(text[offset - 1]) >= 0);
+	}
+	
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java
new file mode 100644
index 0000000..8bc173f
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsBuildPropertyPage.java
@@ -0,0 +1,243 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.properties;
+
+import org.eclipse.cdt.core.settings.model.ICResourceDescription;
+import org.eclipse.cdt.managedbuilder.ui.properties.AbstractCBuildPropertyTab;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.linuxtools.cdt.autotools.AutotoolsMakefileBuilder;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+
+public class AutotoolsBuildPropertyPage extends AbstractCBuildPropertyTab {
+
+	private String TRUE = "true"; // $NON-NLS-1$
+	private String FALSE = "false"; // $NON-NLS-1$
+	private String SCANNERMAKEW_LABEL = "ScannerMakeW.label"; // $NON-NLS-1$
+	private String SCANNERMAKEW_TOOLTIP = "ScannerMakeW.tooltip"; // $NON-NLS-1$
+	
+	protected Button fCleanDelete;
+	protected Button fCleanMake;
+	protected Text   fCleanMakeTarget;
+	protected Button fScannerMakeW;
+
+	private IProject getProject() {
+		return (IProject)getCfg().getManagedProject().getOwner();
+	}
+
+	public boolean canBeVisible() {
+		return AutotoolsMakefileBuilder.hasTargetBuilder(getProject());
+	}
+
+	public void createControls(Composite parent) {
+		super.createControls(parent);
+		Composite composite= usercomp;
+		// assume parent page uses griddata
+		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_FILL | GridData.FILL_HORIZONTAL);
+		composite.setLayoutData(gd);
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 2;
+		//PixelConverter pc= new PixelConverter(composite);
+		//layout.verticalSpacing= pc.convertHeightInCharsToPixels(1) / 2;
+		composite.setLayout(layout);
+		
+		Group g = new Group(composite, SWT.SHADOW_ETCHED_IN);
+		g.setText(AutotoolsPropertyMessages.getString("CleanBehavior.title"));
+		gd = new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan = 2;
+		g.setLayoutData(gd);
+		layout= new GridLayout();
+		layout.numColumns= 2;
+		g.setLayout(layout);
+		
+		fCleanDelete = new Button(g, SWT.RADIO);
+		fCleanDelete.setText(AutotoolsPropertyMessages.getString("CleanDelete.label"));
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		gd.horizontalSpan = 2;
+		fCleanDelete.setLayoutData(gd);
+		fCleanMake = new Button(g, SWT.RADIO);
+		fCleanMake.setText(AutotoolsPropertyMessages.getString("CleanMake.label"));
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		gd.horizontalSpan = 2;
+		fCleanMake.setLayoutData(gd);
+		
+		Label label = new Label(g, SWT.LEFT);
+		label.setText(AutotoolsPropertyMessages.getString("CleanMakeTarget.label"));
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label.setLayoutData(gd);
+		
+		fCleanMakeTarget = new Text(g, SWT.SINGLE | SWT.BORDER);
+		fCleanMakeTarget.setText(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET_DEFAULT);
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fCleanMakeTarget.setLayoutData(gd);
+		
+		fCleanDelete.addSelectionListener(new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				fCleanMake.setSelection(false);
+				fCleanDelete.setSelection(true);
+				fCleanMakeTarget.setEnabled(false);
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// do nothing
+			}
+		});
+		
+		fCleanMake.addSelectionListener(new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				fCleanDelete.setSelection(false);
+				fCleanMake.setSelection(true);
+				fCleanMakeTarget.setEnabled(true);
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// do nothing
+			}
+		});
+		
+		fCleanMakeTarget.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				if (fCleanMakeTarget.getText().equals("")) { // $NON-NLS-1$
+					// FIXME: should probably issue warning here, but how?
+				}
+			}
+		});
+		
+		fScannerMakeW = new Button(composite, SWT.LEFT | SWT.CHECK); 
+		fScannerMakeW.setText(AutotoolsPropertyMessages.getString(SCANNERMAKEW_LABEL));
+		fScannerMakeW.setToolTipText(AutotoolsPropertyMessages.getString(SCANNERMAKEW_TOOLTIP));
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+		fScannerMakeW.setLayoutData(gd);
+		
+		initialize();
+	}
+
+	protected void performOK() {
+		IProject project = getProject();
+		if (fCleanDelete.getSelection()) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE, TRUE); 
+			} catch (CoreException ce) {
+				// FIXME: what can we do here?
+			}
+		} else {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE, FALSE);
+			} catch (CoreException ce) {
+				// FIXME: what can we do here?
+			}
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET, fCleanMakeTarget.getText());
+			} catch (CoreException ce) {
+				// FIXME: what can we do here?
+			}
+		}
+		boolean setScannerInfoDirty = false;
+		try {
+			// Get old scanner method setting to see if it has changed.
+			String oldScannerMakeW = project.getPersistentProperty(AutotoolsPropertyConstants.SCANNER_USE_MAKE_W);
+			if (fScannerMakeW.getSelection()) {
+				project.setPersistentProperty(AutotoolsPropertyConstants.SCANNER_USE_MAKE_W, TRUE);
+				if (oldScannerMakeW == null || !oldScannerMakeW.equals(TRUE))
+					setScannerInfoDirty = true;
+			} else {
+				project.setPersistentProperty(AutotoolsPropertyConstants.SCANNER_USE_MAKE_W, null);
+				if (oldScannerMakeW != null && oldScannerMakeW.equals(TRUE))
+					setScannerInfoDirty = true;
+			}
+		} catch (CoreException ce) {
+			ce.printStackTrace(); // FIXME: what can we do here?
+		}
+		// If the scanner info method changes, we must mark the current data as
+		// dirty so it will be recalculated.
+		if (setScannerInfoDirty) {
+			try {
+				project.setSessionProperty(AutotoolsPropertyConstants.SCANNER_INFO_DIRTY, Boolean.TRUE);
+			} catch (CoreException ce2) {
+				// FIXME: what can we do here?
+			}
+		}
+	}
+
+	protected void performApply(ICResourceDescription src, ICResourceDescription dst) {
+		performOK();
+	}
+	
+	protected void performDefaults() {
+		fCleanDelete.setSelection(false);
+		fCleanMake.setSelection(true);
+		fCleanMakeTarget.setText(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET_DEFAULT);
+		fCleanMakeTarget.setEnabled(true);
+		fScannerMakeW.setSelection(true);
+	}
+	
+	public void updateData(ICResourceDescription cfgd) {
+		// what to do here?
+	}
+	
+	public void updateButtons() {
+		// what to do here?
+	}
+
+	public void setVisible (boolean b) {
+		super.setVisible(b);
+	}
+
+	private void initialize() {
+		IProject project = getProject();
+		String cleanDelete = null;
+		String cleanMakeTarget = null;
+		String scannerMakeW = null;
+		try {
+			cleanDelete = project.getPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE);
+			cleanMakeTarget = project.getPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET);
+			scannerMakeW = project.getPersistentProperty(AutotoolsPropertyConstants.SCANNER_USE_MAKE_W);
+		} catch (CoreException e) {
+			// do nothing
+		}
+
+		if (cleanMakeTarget == null) {
+			cleanMakeTarget = AutotoolsPropertyConstants.CLEAN_MAKE_TARGET_DEFAULT;
+		}
+		fCleanMakeTarget.setText(cleanMakeTarget);
+
+		if (cleanDelete == null || cleanDelete.equals(FALSE)) {
+			fCleanDelete.setSelection(false);
+			fCleanMake.setSelection(true);
+			fCleanMakeTarget.setEnabled(true);
+		} else {
+			fCleanDelete.setSelection(true);
+			fCleanMake.setSelection(false);
+			fCleanMakeTarget.setEnabled(false);
+		}
+		
+		if (scannerMakeW == null || !scannerMakeW.equals(TRUE)) {
+			fScannerMakeW.setSelection(false);
+		} else
+			fScannerMakeW.setSelection(true);
+	}
+	
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsEditorPropertyPage.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsEditorPropertyPage.java
new file mode 100644
index 0000000..9ee6a4b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsEditorPropertyPage.java
@@ -0,0 +1,278 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.properties;
+
+import org.eclipse.cdt.core.settings.model.ICResourceDescription;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.ui.newui.AbstractCPropertyTab;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.linuxtools.cdt.autotools.AutotoolsPlugin;
+import org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences.AutotoolsEditorPreferenceConstants;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+
+
+public class AutotoolsEditorPropertyPage extends AbstractCPropertyTab {
+
+	protected Combo fACVersionCombo;
+	protected Combo fAMVersionCombo;
+	IProject project;
+
+//	private class ACVersionSelectionListener implements SelectionListener {
+//		ICPropertyProvider p;
+//		public ACVersionSelectionListener(ICPropertyProvider p) {
+//			this.p = p;
+//		}
+//		
+//		public void widgetSelected(SelectionEvent e) {
+//			int index = fACVersionCombo.getSelectionIndex();
+//			try {
+//				AutotoolsEditorPropertyPage.getProject(p).setPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_VERSION, fACVersionCombo.getItem(index));
+//			} catch (CoreException ce) {
+//				// FIXME: what can we do here?
+//			}
+//		}
+//
+//		public void widgetDefaultSelected(SelectionEvent e) {
+//			// do nothing
+//		}
+//	}
+//	
+//	private class AMVersionSelectionListener implements SelectionListener {
+//		ICPropertyProvider p;
+//		public AMVersionSelectionListener(ICPropertyProvider p) {
+//			this.p = p;
+//		}
+//		
+//		public void widgetSelected(SelectionEvent e) {
+//			int index = fAMVersionCombo.getSelectionIndex(); 
+//			try {
+//				AutotoolsEditorPropertyPage.getProject(p).setPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_VERSION, fAMVersionCombo.getItem(index));
+//			} catch (CoreException ce) {
+//				// FIXME: what can we do here?
+//			}
+//		}
+//
+//		public void widgetDefaultSelected(SelectionEvent e) {
+//			// do nothing
+//		}
+//	}
+	
+	private IProject getProject() {
+		IConfiguration c = ManagedBuildManager.getConfigurationForDescription(getResDesc().getConfiguration());
+		return (IProject)c.getManagedProject().getOwner();
+	}
+	
+	public boolean canBeVisible() {
+		return true;
+	}
+
+	public void createControls(Composite parent) {
+		// TODO Auto-generated method stub
+		super.createControls(parent);
+		Composite composite= usercomp;
+		
+		// assume parent page uses griddata
+		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_FILL);
+		composite.setLayoutData(gd);
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 2;
+		//PixelConverter pc= new PixelConverter(composite);
+		//layout.verticalSpacing= pc.convertHeightInCharsToPixels(1) / 2;
+		composite.setLayout(layout);
+		
+		project = getProject();
+		
+		/* check box for new editors */
+		fACVersionCombo= new Combo(composite, SWT.CHECK | SWT.DROP_DOWN | SWT.READ_ONLY);
+		fACVersionCombo.setItems(AutotoolsPropertyConstants.fACVersions);
+		fACVersionCombo.select(AutotoolsPropertyConstants.fACVersions.length - 1);
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+		fACVersionCombo.setLayoutData(gd);
+		
+		Label label= new Label(composite, SWT.LEFT);
+		label.setText(AutotoolsPropertyMessages.getString("ACEditor.autoconfVersion")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label.setLayoutData(gd);
+		
+		/* check box for new editors */
+		fAMVersionCombo= new Combo(composite, SWT.CHECK | SWT.DROP_DOWN | SWT.READ_ONLY);
+		fAMVersionCombo.setItems(AutotoolsPropertyConstants.fAMVersions);
+		fAMVersionCombo.select(AutotoolsPropertyConstants.fAMVersions.length - 1);
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+		fAMVersionCombo.setLayoutData(gd);
+		
+		Label label2= new Label(composite, SWT.LEFT);
+		label2.setText(AutotoolsPropertyMessages.getString("ACEditor.automakeVersion")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label2.setLayoutData(gd);
+
+		initialize();
+	}
+
+	public void performOK() {
+		String acVer = null;
+		String amVer = null;
+		boolean changed = false;
+		try {
+			acVer = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_VERSION);
+			amVer = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_VERSION);
+		} catch (CoreException e) {
+			acVer = "";
+			amVer = "";
+		}
+		int index = fACVersionCombo.getSelectionIndex();
+		String acVerSelected = fACVersionCombo.getItem(index);
+		if (!acVerSelected.equals(acVer)) {
+			changed = true;
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_VERSION, fACVersionCombo.getItem(index));
+			} catch (CoreException ce) {
+				// Not much we can do at this point
+			}
+		}
+
+		index = fAMVersionCombo.getSelectionIndex();
+		String amVerSelected = fAMVersionCombo.getItem(index);
+		if (!amVerSelected.equals(amVer)) {
+			changed = true;
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_VERSION, fAMVersionCombo.getItem(index));
+			} catch (CoreException ce) {
+				// Not much we can do here either
+			}
+		}
+
+		// Notify any Autoconf editors that are open for this project that macro versioning
+		// has changed.
+		if (changed)
+			AutotoolsPropertyManager.getDefault().notifyPropertyListeners(project, AutotoolsPropertyConstants.AUTOCONF_MACRO_VERSIONING);
+	}
+	
+	protected void performApply(ICResourceDescription src, ICResourceDescription dst) {
+		performOK();
+	}
+	
+	public void performDefaults() {
+		// For default Autoconf and Automake versions, use the setting from the
+		// Autotools preference dialog.
+		String version = AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION);
+		String[] items = fACVersionCombo.getItems();
+		// Try and find which list item matches the current preference stored and
+		// select it in the list.
+		int i;
+		for (i = 0; i < items.length; ++i) {
+			if (items[i].equals(version))
+				break;
+		}
+		if (i >= items.length)
+			i = items.length - 1;
+		fACVersionCombo.select(i);
+
+		version = AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION);
+		items = fAMVersionCombo.getItems();
+		// Try and find which list item matches the current preference stored and
+		// select it in the list
+		for (i = 0; i < items.length; ++i) {
+			if (items[i].equals(version))
+				break;
+		}
+		if (i >= items.length)
+			i = items.length - 1;
+		fAMVersionCombo.select(i);
+	}
+	
+	public void updateData(ICResourceDescription cfgd) {
+		// what to do here?
+	}
+	
+	public void updateButtons() {
+		// what to do here?
+	}
+
+	public void setVisible (boolean b) {
+		super.setVisible(b);
+	}
+	
+//	private IProject getProject(ICPropertyProvider provider) {
+//		Object element = provider.getElement();
+//		if (element != null) { 
+//			if (element instanceof IFile ||
+//				element instanceof IProject ||
+//				element instanceof IFolder)
+//				{
+//			IResource f = (IResource) element;
+//			return f.getProject();
+//				}
+//			else if (element instanceof ICProject)
+//				return ((ICProject)element).getProject();
+//		}
+//		return null;
+//	}
+
+	private void initialize() {
+		initializeACVersion();
+		initializeAMVersion();
+	}
+	
+	void initializeACVersion() {
+		String version = "";
+		try {
+			version = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_VERSION);
+			if (version == null)
+				version = AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION);
+		} catch (CoreException e) {
+			// do nothing
+		}
+		String[] items = fACVersionCombo.getItems();
+		// Try and find which list item matches the current preference stored and
+		// select it in the list.
+		int i;
+		for (i = 0; i < items.length; ++i) {
+			if (items[i].equals(version))
+				break;
+		}
+		if (i >= items.length)
+			i = items.length - 1;
+		fACVersionCombo.select(i);
+	}
+	
+	void initializeAMVersion() {
+		String version = "";
+		try {
+			version = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_VERSION);
+			if (version == null)
+				version = AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION);
+		} catch (CoreException e) {
+			// do nothing
+		}
+		String[] items = fAMVersionCombo.getItems();
+		// Try and find which list item matches the current preference stored and
+		// select it in the list.
+		int i;
+		for (i = 0; i < items.length; ++i) {
+			if (items[i].equals(version))
+				break;
+		}
+		if (i >= items.length)
+			i = items.length - 1;
+		fAMVersionCombo.select(i);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyConstants.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyConstants.java
new file mode 100644
index 0000000..f020ce0
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyConstants.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.properties;
+
+import org.eclipse.core.runtime.QualifiedName;
+import org.eclipse.linuxtools.cdt.autotools.AutotoolsPlugin;
+
+
+public class AutotoolsPropertyConstants {
+	
+	static final String PREFIX = AutotoolsPlugin.getUniqueIdentifier() + "."; // $NON-NLS-1$
+	public static final String AUTOMAKE_VERSION_STRING = "AutoconfEditorAutomakeVersion"; // $NON-NLS-1$
+	public static final QualifiedName AUTOMAKE_VERSION = new QualifiedName(PREFIX, AUTOMAKE_VERSION_STRING);
+	public static final String AUTOCONF_VERSION_STRING = "AutoconfEditorAutoconfVersion"; // $NON-NLS-1$
+	public static final QualifiedName AUTOCONF_VERSION = new QualifiedName(PREFIX, AUTOCONF_VERSION_STRING);
+	public static final String AUTOCONF_MACRO_VERSIONING = "AutoconfEditorMacroVersioning"; // $NON-NLS-1$
+	public static final QualifiedName AUTOCONF_TOOL = new QualifiedName(PREFIX, "AutoconfToolPath"); // $NON-NLS-1$
+	public static final QualifiedName AUTOMAKE_TOOL = new QualifiedName(PREFIX, "AutomakeToolPath"); // $NON-NLS-1$
+	public static final QualifiedName ACLOCAL_TOOL = new QualifiedName(PREFIX, "AclocalToolPath");  // $NON-NLS-1$
+	public static final QualifiedName AUTOHEADER_TOOL = new QualifiedName(PREFIX, "AutoheaderToolPath");  // $NON-NLS-1$
+	public static final QualifiedName AUTORECONF_TOOL = new QualifiedName(PREFIX, "AutoreconfToolPath");  // $NON-NLS-1$
+	public static final QualifiedName LIBTOOLIZE_TOOL = new QualifiedName(PREFIX, "LibtoolizePath");  // $NON-NLS-1$
+	public static final QualifiedName CLEAN_DELETE = new QualifiedName(PREFIX, "CleanDelete"); // $NON-NLS-1$
+	public static final QualifiedName CLEAN_MAKE_TARGET = new QualifiedName(PREFIX, "CleanMakeTarget"); // $NON-NLS-1$
+	public static final QualifiedName SCANNER_USE_MAKE_W = new QualifiedName(PREFIX, "ScannerUseMakeW");
+	public static final QualifiedName OPEN_INCLUDE = new QualifiedName(PREFIX, "IncludeResourceMapping"); // $NON-NLS-1$
+	public static final QualifiedName OPEN_INCLUDE_P = new QualifiedName(PREFIX, "PersistentIncludeResourceMapping"); //$NON-NLS-1$
+	public static final QualifiedName SCANNER_INFO_DIRTY = new QualifiedName(PREFIX, "ScannerInfoDirty"); // $NON-NLSp-1$
+	
+	static String[] fACVersions = {"2.13", "2.59", "2.61"}; // $NON-NLS-1$
+	static final String LATEST_AC_VERSION = fACVersions[fACVersions.length - 1];
+	
+	static String[] fAMVersions = {"1.4-p6", "1.9.5", "1.9.6"}; // $NON-NLS-1$
+	static final String LATEST_AM_VERSION = fAMVersions[fAMVersions.length - 1];
+	
+	public static final String CLEAN_MAKE_TARGET_DEFAULT = "distclean"; // $NON-NLS-1$
+	public static final String TRUE = "true"; // $NON-NLS-1$
+	public static final String FALSE = "false"; // $NON-NLS-1$
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyManager.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyManager.java
new file mode 100644
index 0000000..1bdcca5
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyManager.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.properties;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.ListenerList;
+
+public class AutotoolsPropertyManager implements IPropertyChangeManager {
+
+	private static AutotoolsPropertyManager fInstance;
+	private Map<IProject, ListenerList> projectList;
+	
+	private AutotoolsPropertyManager() {
+		projectList = new HashMap<IProject, ListenerList>();
+	}
+	
+	public static AutotoolsPropertyManager getDefault() {
+		if (fInstance == null)
+			fInstance = new AutotoolsPropertyManager();
+		return fInstance;
+	}
+	
+	public synchronized void addProjectPropertyListener(IProject project,
+			IProjectPropertyListener listener) {
+		ListenerList list = (ListenerList)projectList.get(project);
+		if (list == null) {
+			list = new ListenerList();
+			projectList.put(project, list);
+		}
+		list.add(listener);
+	}
+
+	public synchronized void notifyPropertyListeners(IProject project, String property) {
+		ListenerList list = (ListenerList)projectList.get(project);
+		if (list != null) {
+			Object[] listeners = list.getListeners();
+			for (int i = 0; i < listeners.length; ++i) {
+				((IProjectPropertyListener)listeners[i]).handleProjectPropertyChanged(project, property);
+			}
+		}
+	}
+
+	public synchronized void removeProjectPropertyListener(IProject project, 
+			IProjectPropertyListener listener) {
+		ListenerList list = (ListenerList)projectList.get(project);
+		if (list != null)
+			list.remove(listener);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyMessages.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyMessages.java
new file mode 100644
index 0000000..8fb1bec
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyMessages.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.cdt.autotools.ui.properties;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+/**
+ * MakefilePreferencesMessages
+ */
+public class AutotoolsPropertyMessages {
+
+	/**
+	 * 
+	 */
+	private AutotoolsPropertyMessages() {
+	}
+
+	private static final String BUNDLE_NAME = AutotoolsPropertyMessages.class.getName();
+
+	public static String getString(String key) {
+		try {
+			return ResourceBundle.getBundle(BUNDLE_NAME).getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		} catch (NullPointerException e) {
+			return '#' + key + '#';
+		}
+	}	
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties
new file mode 100644
index 0000000..d729559
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyMessages.properties
@@ -0,0 +1,41 @@
+###############################################################################
+# Copyright (c) 2007 Red Hat Inc. and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Red Hat Inc. - initial API and implementation
+###############################################################################
+
+Edit.name=Editors
+Build.name=Build
+
+Autotools.aclocalPath=aclocal
+Autotools.aclocalPath.tooltip=Specify desired aclocal to use for project
+Autotools.automakePath=automake
+Autotools.automakePath.tooltip=Specify desired automake to use for project
+Autotools.autoconfPath=autoconf
+Autotools.autoconfPath.tooltip=Specify desired autoconf to use for project
+Autotools.autoheaderPath=autoheader
+Autotools.autoheaderPath.tooltip=Specify desired autoheader to use for project
+Autotools.autoreconfPath=autoreconf
+Autotools.autoreconfPath.tooltip=Specify desired autoreconf to use for project
+Autotools.libtoolizePath=libtoolize
+Autotools.libtoolizePath.tooltip=Specify desired libtoolize to use for project
+
+ACEditor.version=&Version
+ACEditor.autoconfVersion=Version of Autoconf to use for syntax checking
+ACEditor.automakeVersion=Version of Automake to use for syntax checking
+
+ScannerMakeW.label=Use make -n -w per file to generate scanner info
+ScannerMakeW.tooltip=Use this option only if necessary to get correct include path
+
+CleanBehavior.title=Clean Build Behavior
+
+CleanDelete.label=Delete build directory on "clean" operation
+CleanMake.label=Use make target to clean
+CleanMakeTarget.label=Make target:
+CleanMakeTarget.default=distclean
+CleanMakeTarget.tooltip=Specify a top-level make target to clean build directory
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyPage.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyPage.java
new file mode 100644
index 0000000..95fb589
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsPropertyPage.java
@@ -0,0 +1,376 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.properties;
+
+import org.eclipse.cdt.ui.newui.AbstractPage;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+
+public class AutotoolsPropertyPage extends AbstractPage {
+	
+	public AutotoolsPropertyPage() {
+		super();
+	}
+	
+	protected boolean isSingle() {
+		return false;
+	}
+
+	protected Control createContents(Composite parent) {
+		return super.createContents(parent);
+	}
+	
+	protected boolean showsConfig() {
+		return false;
+	}
+	
+//	protected Combo fACVersionCombo;
+//	protected Combo fAMVersionCombo;
+//	
+//	protected Button fCleanDelete;
+//	protected Button fCleanMake;
+//	protected Combo  fCleanMakeTarget;
+//	protected Button fScannerMakeW;
+//
+//
+//	public boolean isApplicable() {
+//		IProject project = getProject();
+//		if (project != null && !AutotoolsMakefileBuilder.hasTargetBuilder(project))
+//			return false;
+//		else
+//			return super.isApplicable();
+//	}
+//	
+//	protected Control createContents(Composite parent) {
+//		
+//		TabFolder folder= new TabFolder(parent, SWT.NONE);
+//		folder.setLayout(new TabFolderLayout());	
+//		folder.setLayoutData(new GridData(GridData.FILL_BOTH));
+//		
+//		// Allow end-user to select which version of autoconf to use for hover help
+//		// and syntax checking of macros.
+//		TabItem item= new TabItem(folder, SWT.NONE);
+//		item.setText(AutotoolsPropertyMessages.getString("Edit.name")); //$NON-NLS-1$
+//		item.setControl(createEditTabContent(folder));
+//					
+//		// Build options.
+//		item= new TabItem(folder, SWT.NONE);
+//		item.setText(AutotoolsPropertyMessages.getString("Build.name")); //$NON-NLS-1$
+//		item.setControl(createBuildTabContent(folder));
+//					
+//		initialize();
+//		
+//		applyDialogFont(folder);
+//		return folder;
+//	}
+//
+//	private Composite createEditTabContent(TabFolder folder) {
+//		Composite composite= new Composite(folder, SWT.NULL);
+//		// assume parent page uses griddata
+//		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_FILL);
+//		composite.setLayoutData(gd);
+//		GridLayout layout= new GridLayout();
+//		layout.numColumns= 2;
+//		//PixelConverter pc= new PixelConverter(composite);
+//		//layout.verticalSpacing= pc.convertHeightInCharsToPixels(1) / 2;
+//		composite.setLayout(layout);
+//		
+//		
+//		/* check box for new editors */
+//		fACVersionCombo= new Combo(composite, SWT.CHECK | SWT.DROP_DOWN | SWT.READ_ONLY);
+//		fACVersionCombo.setItems(AutotoolsPropertyConstants.fACVersions);
+//		fACVersionCombo.select(AutotoolsPropertyConstants.fACVersions.length - 1);
+//		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+//		fACVersionCombo.setLayoutData(gd);
+//		fACVersionCombo.addSelectionListener(new SelectionListener() {
+//			public void widgetSelected(SelectionEvent e) {
+//				int index = fACVersionCombo.getSelectionIndex();
+//				try {
+//					getProject().setPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_VERSION, fACVersionCombo.getItem(index));
+//				} catch (CoreException ce) {
+//					// FIXME: what can we do here?
+//				}
+//			}
+//
+//			public void widgetDefaultSelected(SelectionEvent e) {
+//				String version = AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION);
+//				String[] items = fACVersionCombo.getItems();
+//				// Try and find which list item matches the current preference stored and
+//				// select it in the list.
+//				int i;
+//				for (i = 0; i < items.length; ++i) {
+//					if (items[i].equals(version))
+//						break;
+//				}
+//				if (i >= items.length)
+//					i = items.length - 1;
+//				fACVersionCombo.select(i);
+//			}
+//		});
+//		
+//		Label label= new Label(composite, SWT.LEFT);
+//		label.setText(AutotoolsPropertyMessages.getString("ACEditor.autoconfVersion")); //$NON-NLS-1$
+//		gd= new GridData();
+//		gd.horizontalAlignment= GridData.BEGINNING;
+//		label.setLayoutData(gd);
+//		
+//		/* check box for new editors */
+//		fAMVersionCombo= new Combo(composite, SWT.CHECK | SWT.DROP_DOWN | SWT.READ_ONLY);
+//		fAMVersionCombo.setItems(AutotoolsPropertyConstants.fAMVersions);
+//		fAMVersionCombo.select(AutotoolsPropertyConstants.fAMVersions.length - 1);
+//		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+//		fAMVersionCombo.setLayoutData(gd);
+//		fAMVersionCombo.addSelectionListener(new SelectionListener() {
+//			public void widgetSelected(SelectionEvent e) {
+//				int index = fAMVersionCombo.getSelectionIndex(); 
+//				try {
+//					getProject().setPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_VERSION, fAMVersionCombo.getItem(index));
+//				} catch (CoreException ce) {
+//					// FIXME: what can we do here?
+//				}
+//			}
+//
+//			public void widgetDefaultSelected(SelectionEvent e) {
+//				String version = AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION);
+//				String[] items = fAMVersionCombo.getItems();
+//				// Try and find which list item matches the current preference stored and
+//				// select it in the list.
+//				int i;
+//				for (i = 0; i < items.length; ++i) {
+//					if (items[i].equals(version))
+//						break;
+//				}
+//				if (i >= items.length)
+//					i = items.length - 1;
+//				fAMVersionCombo.select(i);
+//			}
+//		});
+//		
+//		Label label2= new Label(composite, SWT.LEFT);
+//		label2.setText(AutotoolsPropertyMessages.getString("ACEditor.automakeVersion")); //$NON-NLS-1$
+//		gd= new GridData();
+//		gd.horizontalAlignment= GridData.BEGINNING;
+//		label2.setLayoutData(gd);
+//
+//		return composite;
+//	}
+//	
+//	private Composite createBuildTabContent(TabFolder folder) {
+//		Composite composite= new Composite(folder, SWT.NULL);
+//		// assume parent page uses griddata
+//		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_FILL);
+//		composite.setLayoutData(gd);
+//		GridLayout layout= new GridLayout();
+//		layout.numColumns= 2;
+//		//PixelConverter pc= new PixelConverter(composite);
+//		//layout.verticalSpacing= pc.convertHeightInCharsToPixels(1) / 2;
+//		composite.setLayout(layout);
+//		
+//		
+//		Group g = new Group(composite, SWT.SHADOW_ETCHED_IN);
+//		g.setText(AutotoolsPropertyMessages.getString("CleanBehavior.title"));
+//		gd = new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+//		gd.horizontalSpan = 2;
+//		g.setLayoutData(gd);
+//		layout= new GridLayout();
+//		layout.numColumns= 2;
+//		g.setLayout(layout);
+//		
+//		fCleanDelete = new Button(g, SWT.RADIO);
+//		fCleanDelete.setText(AutotoolsPropertyMessages.getString("CleanDelete.label"));
+//		gd= new GridData();
+//		gd.horizontalAlignment= GridData.BEGINNING;
+//		gd.horizontalSpan = 2;
+//		fCleanDelete.setLayoutData(gd);
+//		fCleanMake = new Button(g, SWT.RADIO);
+//		fCleanMake.setText(AutotoolsPropertyMessages.getString("CleanMake.label"));
+//		gd= new GridData();
+//		gd.horizontalAlignment= GridData.BEGINNING;
+//		gd.horizontalSpan = 2;
+//		fCleanMake.setLayoutData(gd);
+//		
+//		Label label = new Label(g, SWT.LEFT);
+//		label.setText(AutotoolsPropertyMessages.getString("CleanMakeTarget.label"));
+//		gd= new GridData();
+//		gd.horizontalAlignment= GridData.BEGINNING;
+//		label.setLayoutData(gd);
+//		
+//		fCleanMakeTarget = new Combo(g, SWT.SIMPLE);
+//		fCleanMakeTarget.setText(AutotoolsPropertyMessages.getString("CleanMakeTarget.default"));
+//		fCleanMakeTarget.setTextLimit(40);
+//		fCleanMakeTarget.setVisibleItemCount(0);
+//		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+//		fCleanMakeTarget.setLayoutData(gd);
+//		
+//		fCleanDelete.addSelectionListener(new SelectionListener() {
+//			public void widgetSelected(SelectionEvent e) {
+//				fCleanMake.setSelection(false);
+//				fCleanDelete.setSelection(true);
+//				fCleanMakeTarget.setEnabled(false);
+//				try {
+//					getProject().setPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE, "true");
+//				} catch (CoreException ce) {
+//					// FIXME: what can we do here?
+//				}
+//			}
+//
+//			public void widgetDefaultSelected(SelectionEvent e) {
+//				fCleanDelete.setSelection(false);
+//				fCleanMake.setSelection(true);
+//				fCleanMakeTarget.setEnabled(true);
+//				try {
+//					getProject().setPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE, "false");
+//					getProject().setPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET, "distclean");
+//				} catch (CoreException ce) {
+//					// FIXME: what can we do here?
+//				}
+//			}
+//		});
+//		
+//		fCleanMake.addSelectionListener(new SelectionListener() {
+//			public void widgetSelected(SelectionEvent e) {
+//				fCleanDelete.setSelection(false);
+//				fCleanMake.setSelection(true);
+//				fCleanMakeTarget.setEnabled(true);
+//				try {
+//					getProject().setPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE, "false");
+//				} catch (CoreException ce) {
+//					// FIXME: what can we do here?
+//				}
+//			}
+//
+//			public void widgetDefaultSelected(SelectionEvent e) {
+////				fCleanDelete.setSelection(false);
+////				fCleanMake.setSelection(true);
+////				try {
+////					getProject().setPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE, "false");
+////					getProject().setPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET, "distclean");
+////				} catch (CoreException ce) {
+////					// FIXME: what can we do here?
+////				}
+//			}
+//		});
+//		
+//		fCleanMakeTarget.addModifyListener(new ModifyListener() {
+//			public void modifyText(ModifyEvent e) {
+//				try {
+//					getProject().setPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET, fCleanMakeTarget.getText());
+//				} catch (CoreException ce) {
+//					// FIXME: what can we do here?
+//				}
+//			}
+//		});
+//		
+//		fScannerMakeW = new Button(composite, SWT.LEFT | SWT.CHECK); 
+//		fScannerMakeW.setText(AutotoolsPropertyMessages.getString("ScannerMakeW.label"));
+//		fScannerMakeW.setToolTipText(AutotoolsPropertyMessages.getString("ScannerMakeW.tooltip"));
+//		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+//		fScannerMakeW.setLayoutData(gd);
+//		fScannerMakeW.addSelectionListener(new SelectionListener() {
+//			public void widgetSelected(SelectionEvent e) {
+//				try {
+//					getProject().setPersistentProperty(AutotoolsPropertyConstants.SCANNER_USE_MAKE_W, "true");
+//				} catch (CoreException ce) {
+//					// FIXME: what can we do here?
+//				}
+//			}
+//
+//			public void widgetDefaultSelected(SelectionEvent e) {
+//				fScannerMakeW.setSelection(false);
+//				try {
+//					// This is only a temporary work-around so we remove the property rather than set it false.
+//					getProject().setPersistentProperty(AutotoolsPropertyConstants.SCANNER_USE_MAKE_W, null);
+//				} catch (CoreException ce) {
+//					// FIXME: what can we do here?
+//				}
+//			}
+//		});
+//		
+//		return composite;
+//	}
+//	
+//	void initializeACVersion() {
+//		String version = "";
+//		try {
+//			version = getProject().getPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_VERSION);
+//			if (version == null)
+//				version = AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION);
+//		} catch (CoreException e) {
+//			// do nothing
+//		}
+//		String[] items = fACVersionCombo.getItems();
+//		// Try and find which list item matches the current preference stored and
+//		// select it in the list.
+//		int i;
+//		for (i = 0; i < items.length; ++i) {
+//			if (items[i].equals(version))
+//				break;
+//		}
+//		if (i >= items.length)
+//			i = items.length - 1;
+//		fACVersionCombo.select(i);
+//	}
+//	
+//	void initializeAMVersion() {
+//		String version = "";
+//		try {
+//			version = getProject().getPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_VERSION);
+//			if (version == null)
+//				version = AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION);
+//		} catch (CoreException e) {
+//			// do nothing
+//		}
+//		String[] items = fAMVersionCombo.getItems();
+//		// Try and find which list item matches the current preference stored and
+//		// select it in the list.
+//		int i;
+//		for (i = 0; i < items.length; ++i) {
+//			if (items[i].equals(version))
+//				break;
+//		}
+//		if (i >= items.length)
+//			i = items.length - 1;
+//		fAMVersionCombo.select(i);
+//	}
+//	
+//	void initializeBuild() {
+//		String cleanDelete = null;
+//		String cleanMakeTarget = null;
+//		try {
+//			cleanDelete = getProject().getPersistentProperty(AutotoolsPropertyConstants.CLEAN_DELETE);
+//			cleanMakeTarget = getProject().getPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET);
+//		} catch (CoreException e) {
+//			// do nothing
+//		}
+//		
+//		if (cleanMakeTarget == null) {
+//			cleanMakeTarget = AutotoolsPropertyMessages.getString("CleanMakeTarget.default"); // $NON-NLS-1$
+//			fCleanMakeTarget.setText(cleanMakeTarget);
+//		}
+//		
+//		if (cleanDelete == null || cleanDelete.equals("false")) {
+//			fCleanDelete.setSelection(false);
+//			fCleanMake.setSelection(true);
+//			fCleanMakeTarget.setEnabled(true);
+//		} else {
+//			fCleanDelete.setSelection(true);
+//			fCleanMake.setSelection(false);
+//			fCleanMakeTarget.setEnabled(false);
+//		}
+//	}
+//	
+//	private void initialize() {
+//		initializeACVersion();
+//		initializeAMVersion();
+//		initializeBuild();
+//	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsToolsPropertyPage.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsToolsPropertyPage.java
new file mode 100644
index 0000000..7b56c2b
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/AutotoolsToolsPropertyPage.java
@@ -0,0 +1,343 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.properties;
+
+import org.eclipse.cdt.core.settings.model.ICResourceDescription;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.ui.newui.AbstractCPropertyTab;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class AutotoolsToolsPropertyPage extends AbstractCPropertyTab {
+
+	public static final String DEFAULT_ACLOCAL = "aclocal"; // $NON-NLS-1$
+	public static final String DEFAULT_AUTOMAKE = "automake"; // $NON-NLS-1$
+	public static final String DEFAULT_AUTOCONF = "autoconf"; // $NON-NLS-1$
+	public static final String DEFAULT_AUTOHEADER = "autoheader"; // $NON-NLS-1$
+	public static final String DEFAULT_AUTORECONF = "autoreconf"; // $NON-NLS-1$
+	public static final String DEFAULT_LIBTOOLIZE = "libtoolize"; // $NON-NLS-1$
+	
+	protected Text fAclocalPath;
+	protected Text fAutoheaderPath;
+	protected Text fAutomakePath;
+	protected Text fAutoreconfPath;
+	protected Text fAutoconfPath;
+	protected Text fLibtoolizePath;
+	private IProject project;
+
+	
+	private IProject getProject() {
+		IConfiguration c = ManagedBuildManager.getConfigurationForDescription(getResDesc().getConfiguration());
+		return (IProject)c.getManagedProject().getOwner();
+	}
+	
+	public boolean canBeVisible() {
+		return true;
+	}
+
+	public void createControls(Composite parent) {
+		// TODO Auto-generated method stub
+		super.createControls(parent);
+		Composite composite= usercomp;
+		
+		// assume parent page uses griddata
+		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_FILL | GridData.FILL_HORIZONTAL);
+		composite.setLayoutData(gd);
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 2;
+		//PixelConverter pc= new PixelConverter(composite);
+		//layout.verticalSpacing= pc.convertHeightInCharsToPixels(1) / 2;
+		composite.setLayout(layout);
+		
+		project = getProject();
+		
+		Label label= new Label(composite, SWT.LEFT);
+		label.setText(AutotoolsPropertyMessages.getString("Autotools.aclocalPath")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label.setLayoutData(gd);
+		
+		/* text window for aclocal path */
+		fAclocalPath = new Text(composite, SWT.BORDER | SWT.SINGLE);
+		fAclocalPath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.aclocalPath.tooltip")); // $NON-NLS-1$
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fAclocalPath.setLayoutData(gd);
+		
+		Label label2= new Label(composite, SWT.LEFT);
+		label2.setText(AutotoolsPropertyMessages.getString("Autotools.automakePath")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label2.setLayoutData(gd);
+		
+		/* text window for automake path */
+		fAutomakePath = new Text(composite, SWT.BORDER | SWT.SINGLE);
+		fAutomakePath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.automakePath.tooltip")); // $NON-NLS-1#
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fAutomakePath.setLayoutData(gd);
+		
+		Label label3 = new Label(composite, SWT.LEFT);
+		label3.setText(AutotoolsPropertyMessages.getString("Autotools.autoconfPath")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label3.setLayoutData(gd);
+		
+		/* text window for autoconf path */
+		fAutoconfPath = new Text(composite, SWT.BORDER | SWT.SINGLE);
+		fAutoconfPath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.autoconfPath.tooltip")); // $NON-NLS-1$
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fAutoconfPath.setLayoutData(gd);
+
+		Label label4= new Label(composite, SWT.LEFT);
+		label4.setText(AutotoolsPropertyMessages.getString("Autotools.autoheaderPath")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label4.setLayoutData(gd);
+		
+		/* text window for aclocal path */
+		fAutoheaderPath = new Text(composite, SWT.BORDER | SWT.SINGLE);
+		fAutoheaderPath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.autoheaderPath.tooltip")); // $NON-NLS-1$
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fAutoheaderPath.setLayoutData(gd);
+
+		Label label5= new Label(composite, SWT.LEFT);
+		label5.setText(AutotoolsPropertyMessages.getString("Autotools.autoreconfPath")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label5.setLayoutData(gd);
+		
+		/* text window for aclocal path */
+		fAutoreconfPath = new Text(composite, SWT.BORDER | SWT.SINGLE);
+		fAutoreconfPath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.autoreconfPath.tooltip")); // $NON-NLS-1$
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fAutoreconfPath.setLayoutData(gd);
+
+		Label label6= new Label(composite, SWT.LEFT);
+		label6.setText(AutotoolsPropertyMessages.getString("Autotools.libtoolizePath")); //$NON-NLS-1$
+		gd= new GridData();
+		gd.horizontalAlignment= GridData.BEGINNING;
+		label6.setLayoutData(gd);
+		
+		/* text window for aclocal path */
+		fLibtoolizePath = new Text(composite, SWT.BORDER | SWT.SINGLE);
+		fLibtoolizePath.setToolTipText(AutotoolsPropertyMessages.getString("Autotools.libtoolizePath.tooltip")); // $NON-NLS-1$
+		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
+		fLibtoolizePath.setLayoutData(gd);
+
+		initialize();
+	}
+
+	public void performOK() {
+		String aclocalPath = null;
+		String automakePath = null;
+		String autoconfPath = null;
+		String autoheaderPath = null;
+		String autoreconfPath = null;
+		String libtoolizePath = null;
+		try {
+			aclocalPath = project.getPersistentProperty(AutotoolsPropertyConstants.ACLOCAL_TOOL);
+		} catch (CoreException e1) {
+			aclocalPath = DEFAULT_ACLOCAL;
+		}
+
+		String newAclocalPath = fAclocalPath.getText().trim();
+		if (aclocalPath == null || !newAclocalPath.equals(aclocalPath)) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.ACLOCAL_TOOL, newAclocalPath);
+			} catch (CoreException e1) {
+				// Not much we can do at this point
+			}
+		}
+		
+		try {
+			automakePath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_TOOL);
+		} catch (CoreException e1) {
+			automakePath = DEFAULT_AUTOMAKE;
+		}
+
+		String newAutomakePath = fAutomakePath.getText().trim();
+		if (automakePath == null || !newAutomakePath.equals(automakePath)) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_TOOL, newAutomakePath);
+			} catch (CoreException e2) {
+				// Not much we can do at this point
+			}
+		}
+		
+		try {
+			autoconfPath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_TOOL);
+		} catch (CoreException e1) {
+			autoconfPath = DEFAULT_AUTOCONF;
+		}
+
+		String newAutoconfPath = fAutoconfPath.getText().trim();
+		if (autoconfPath == null || !newAutoconfPath.equals(autoconfPath)) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_TOOL, newAutoconfPath);
+			} catch (CoreException e2) {
+				// Not much we can do at this point
+			}
+		}
+
+		try {
+			autoheaderPath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOHEADER_TOOL);
+		} catch (CoreException e1) {
+			autoheaderPath = DEFAULT_AUTOHEADER;
+		}
+
+		String newAutoheaderPath = fAutoheaderPath.getText().trim();
+		if (autoheaderPath == null || !newAutoheaderPath.equals(autoheaderPath)) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTOHEADER_TOOL, newAutoheaderPath);
+			} catch (CoreException e2) {
+				// Not much we can do at this point
+			}
+		}
+
+		try {
+			autoreconfPath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTORECONF_TOOL);
+		} catch (CoreException e1) {
+			autoreconfPath = DEFAULT_AUTORECONF;
+		}
+
+		String newAutoreconfPath = fAutoreconfPath.getText().trim();
+		if (autoreconfPath == null || !newAutoreconfPath.equals(autoreconfPath)) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.AUTORECONF_TOOL, newAutoreconfPath);
+			} catch (CoreException e2) {
+				// Not much we can do at this point
+			}
+		}
+
+		try {
+			libtoolizePath = project.getPersistentProperty(AutotoolsPropertyConstants.LIBTOOLIZE_TOOL);
+		} catch (CoreException e1) {
+			libtoolizePath = DEFAULT_LIBTOOLIZE;
+		}
+
+		String newLibtoolizePath = fLibtoolizePath.getText().trim();
+		if (libtoolizePath == null || !newLibtoolizePath.equals(libtoolizePath)) {
+			try {
+				project.setPersistentProperty(AutotoolsPropertyConstants.LIBTOOLIZE_TOOL, newLibtoolizePath);
+			} catch (CoreException e2) {
+				// Not much we can do at this point
+			}
+		}
+	}
+	
+	protected void performApply(ICResourceDescription src, ICResourceDescription dst) {
+		performOK();
+	}
+	
+	public void performDefaults() {
+		// For default tool settings, simply default the base tool names
+		fAclocalPath.setText(DEFAULT_ACLOCAL);
+		fAutomakePath.setText(DEFAULT_AUTOMAKE);
+		fAutoconfPath.setText(DEFAULT_AUTOCONF);
+		fAutoheaderPath.setText(DEFAULT_AUTOHEADER);
+		fAutoreconfPath.setText(DEFAULT_AUTORECONF);
+		fLibtoolizePath.setText(DEFAULT_LIBTOOLIZE);
+	}
+	
+	public void updateData(ICResourceDescription cfgd) {
+		// what to do here?
+	}
+	
+	public void updateButtons() {
+		// what to do here?
+	}
+
+	public void setVisible (boolean b) {
+		super.setVisible(b);
+	}
+	
+	private void initialize() {
+		String aclocalPath = null;
+		String automakePath = null;
+		String autoconfPath = null;
+		String autoheaderPath = null;
+		String autoreconfPath = null;
+		String libtoolizePath = null;
+		
+		try {
+			aclocalPath = project.getPersistentProperty(AutotoolsPropertyConstants.ACLOCAL_TOOL);
+		} catch (CoreException e1) {
+			// do nothing
+		}
+		
+		if (aclocalPath == null)
+			aclocalPath = DEFAULT_ACLOCAL;
+		
+		fAclocalPath.setText(aclocalPath);
+		
+		try {
+			automakePath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOMAKE_TOOL);
+		} catch (CoreException e1) {
+			// do nothing
+		}
+		
+		if (automakePath == null)
+			automakePath = DEFAULT_AUTOMAKE;
+		
+		fAutomakePath.setText(automakePath);
+		
+		try {
+			autoconfPath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOCONF_TOOL);
+		} catch (CoreException e1) {
+			// do nothing
+		}
+		
+		if (autoconfPath == null)
+			autoconfPath = DEFAULT_AUTOCONF;
+		
+		fAutoconfPath.setText(autoconfPath);
+
+		try {
+			autoheaderPath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTOHEADER_TOOL);
+		} catch (CoreException e1) {
+			// do nothing
+		}
+		
+		if (autoheaderPath == null)
+			autoheaderPath = DEFAULT_AUTOHEADER;
+		
+		fAutoheaderPath.setText(autoheaderPath);
+
+		try {
+			autoreconfPath = project.getPersistentProperty(AutotoolsPropertyConstants.AUTORECONF_TOOL);
+		} catch (CoreException e1) {
+			// do nothing
+		}
+		
+		if (autoreconfPath == null)
+			autoreconfPath = DEFAULT_AUTORECONF;
+		
+		fAutoreconfPath.setText(autoreconfPath);
+		
+		try {
+			libtoolizePath = project.getPersistentProperty(AutotoolsPropertyConstants.LIBTOOLIZE_TOOL);
+		} catch (CoreException e1) {
+			// do nothing
+		}
+		
+		if (libtoolizePath == null)
+			libtoolizePath = DEFAULT_LIBTOOLIZE;
+		
+		fLibtoolizePath.setText(libtoolizePath);
+	}
+	
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/IProjectPropertyListener.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/IProjectPropertyListener.java
new file mode 100644
index 0000000..f975230
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/IProjectPropertyListener.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.properties;
+
+import org.eclipse.core.resources.IProject;
+
+public interface IProjectPropertyListener {
+
+	/**
+	 * Handler for property changes
+	 * 
+	 * @param project the project to which the property changed
+	 * @param property the name of the property changed
+	 */
+	void handleProjectPropertyChanged(IProject project, String property);
+	
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/IPropertyChangeManager.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/IPropertyChangeManager.java
new file mode 100644
index 0000000..65b4fad
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/cdt/autotools/ui/properties/IPropertyChangeManager.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.autotools.ui.properties;
+
+import org.eclipse.core.resources.IProject;
+
+public interface IPropertyChangeManager {
+
+	/**
+	 * Add a project property listener for given project.
+	 * 
+	 * @param project the project to which the listener is interested
+	 * @param listener the listener to notify
+	 */
+	void addProjectPropertyListener(IProject project, IProjectPropertyListener listener);
+	
+	/**
+	 * Remove a project property listener.
+	 * 
+	 * @param listener the listener to remove
+	 */
+	void removeProjectPropertyListener(IProject project, IProjectPropertyListener listener);
+	
+	/**
+	 * Notify all listeners of project that a property has changed.
+	 * 
+	 * @param project the project for which the property has changed
+	 * @param property the property that has changed
+	 */
+	void notifyPropertyListeners(IProject project, String property);
+	
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/MarkerGenerator.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/MarkerGenerator.java
new file mode 100644
index 0000000..c43f040
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/MarkerGenerator.java
@@ -0,0 +1,155 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.IMarkerGenerator;
+import org.eclipse.cdt.core.ProblemMarkerInfo;
+import org.eclipse.cdt.core.model.ICModelMarker;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.runtime.CoreException;
+
+public abstract class MarkerGenerator implements IMarkerGenerator {
+
+	/**
+	 * Constructor for MarkerGenerator
+	 */
+	public MarkerGenerator() {
+		super();
+	}
+
+	/*
+	 * callback from Output Parser
+	 */
+	public void addMarker(IResource file, int lineNumber, String errorDesc, int severity, String errorVar) {
+
+		try {
+			IMarker[] cur = file.findMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, false, IResource.DEPTH_ONE);
+			/*
+			 * Try to find matching markers and don't put in duplicates
+			 */
+			if ((cur != null) && (cur.length > 0)) {
+				for (int i = 0; i < cur.length; i++) {
+					int line = ((Integer) cur[i].getAttribute(IMarker.LOCATION)).intValue();
+					int sev = ((Integer) cur[i].getAttribute(IMarker.SEVERITY)).intValue();
+					String mesg = (String) cur[i].getAttribute(IMarker.MESSAGE);
+					if (line == lineNumber && sev == mapMarkerSeverity(severity) && mesg.equals(errorDesc)) {
+						return;
+					}
+				}
+			}
+
+			IMarker marker = file.createMarker(ICModelMarker.C_MODEL_PROBLEM_MARKER);
+			marker.setAttribute(IMarker.LOCATION, lineNumber);
+			marker.setAttribute(IMarker.MESSAGE, errorDesc);
+			marker.setAttribute(IMarker.SEVERITY, mapMarkerSeverity(severity));
+			marker.setAttribute(IMarker.LINE_NUMBER, lineNumber);
+			marker.setAttribute(IMarker.CHAR_START, -1);
+			marker.setAttribute(IMarker.CHAR_END, -1);
+			if (errorVar != null) {
+				marker.setAttribute(ICModelMarker.C_MODEL_MARKER_VARIABLE, errorVar);
+			}
+		}
+		catch (CoreException e) {
+			CCorePlugin.log(e.getStatus());
+		}
+
+	}
+	
+	public abstract IProject getProject();
+
+	/*
+	 * callback from Output Parser
+	 */
+	public void addMarker(ProblemMarkerInfo problemMarkerInfo) {
+		try {
+			IResource markerResource = problemMarkerInfo.file ;
+			if (markerResource==null)  {
+				markerResource = getProject();
+			}
+			IMarker[] cur = markerResource.findMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, true, IResource.DEPTH_ONE);
+			/*
+			 * Try to find matching markers and don't put in duplicates
+			 */
+			if ((cur != null) && (cur.length > 0)) {
+				for (int i = 0; i < cur.length; i++) {
+					int line = ((Integer) cur[i].getAttribute(IMarker.LOCATION)).intValue();
+					int sev = ((Integer) cur[i].getAttribute(IMarker.SEVERITY)).intValue();
+					String mesg = (String) cur[i].getAttribute(IMarker.MESSAGE);
+					if (line == problemMarkerInfo.lineNumber && sev == mapMarkerSeverity(problemMarkerInfo.severity) && mesg.equals(problemMarkerInfo.description)) {
+						return;
+					}
+				}
+			}
+
+			IMarker marker = markerResource.createMarker(ICModelMarker.C_MODEL_PROBLEM_MARKER);
+			marker.setAttribute(IMarker.LOCATION, problemMarkerInfo.lineNumber);
+			marker.setAttribute(IMarker.MESSAGE, problemMarkerInfo.description);
+			marker.setAttribute(IMarker.SEVERITY, mapMarkerSeverity(problemMarkerInfo.severity));
+			marker.setAttribute(IMarker.LINE_NUMBER, problemMarkerInfo.lineNumber);
+			marker.setAttribute(IMarker.CHAR_START, -1);
+			marker.setAttribute(IMarker.CHAR_END, -1);
+			if (problemMarkerInfo.variableName != null) {
+				marker.setAttribute(ICModelMarker.C_MODEL_MARKER_VARIABLE, problemMarkerInfo.variableName);
+			}
+			if (problemMarkerInfo.externalPath != null) {
+				marker.setAttribute(ICModelMarker.C_MODEL_MARKER_EXTERNAL_LOCATION, problemMarkerInfo.externalPath.toOSString());
+			}
+		}
+		catch (CoreException e) {
+			CCorePlugin.log(e.getStatus());
+		}
+	}
+
+	private int mapMarkerSeverity(int severity) {
+		switch (severity) {
+			case SEVERITY_ERROR_BUILD :
+			case SEVERITY_ERROR_RESOURCE :
+				return IMarker.SEVERITY_ERROR;
+			case SEVERITY_INFO :
+				return IMarker.SEVERITY_INFO;
+			case SEVERITY_WARNING :
+				return IMarker.SEVERITY_WARNING;
+		}
+		return IMarker.SEVERITY_ERROR;
+	}
+	
+	/* (non-Javadoc)
+	 * Removes the IMarkers for the project specified in the argument if the
+	 * project exists, and is open. 
+	 * 
+	 * @param project
+	 */
+	public void removeAllMarkers(IProject project) {
+		if (project == null || !project.isAccessible()) return;
+
+		// Clear out the problem markers
+		IWorkspace workspace = project.getWorkspace();
+		IMarker[] markers;
+		try {
+			markers = project.findMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE);
+		} catch (CoreException e) {
+			// Handled just about every case in the sanity check
+			return;
+		}
+		if (markers != null) {
+			try {
+				workspace.deleteMarkers(markers);
+			} catch (CoreException e) {
+				// The only situation that might cause this is some sort of resource change event
+				return;
+			}
+		}
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsConsole.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsConsole.java
new file mode 100644
index 0000000..982764a
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/AutotoolsConsole.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2004, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ * Red Hat Inc - Adapted for Autotools usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.cdt.ui.IBuildConsoleManager;
+import org.eclipse.core.resources.IProject;
+
+public class AutotoolsConsole extends Console {
+	IProject project;
+	IBuildConsoleManager fConsoleManager;
+	
+	private static final String CONTEXT_MENU_ID = "CAutotoolsConsole"; //$NON-NLS-1$
+	private static final String CONSOLE_NAME = ConsoleMessages.getString("AutotoolsConsole.name"); //$NON-NLS-1$
+	
+	public AutotoolsConsole() {
+		super(CONSOLE_NAME, CONTEXT_MENU_ID);
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CBuildStepsConsole.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CBuildStepsConsole.java
new file mode 100644
index 0000000..5ba3259
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CBuildStepsConsole.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2004, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ * Red Hat Inc - Adapted for Autotools usage
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.cdt.ui.IBuildConsoleManager;
+import org.eclipse.core.resources.IProject;
+
+public class CBuildStepsConsole extends Console {
+	IProject project;
+	IBuildConsoleManager fConsoleManager;
+	
+	private static final String CONTEXT_MENU_ID = "CAutotoolsBuildStepsConsole"; //$NON-NLS-1$
+	private static final String CONSOLE_NAME = ConsoleMessages.getString("BuildStepsConsole.name"); //$NON-NLS-1$
+	
+	public CBuildStepsConsole() {
+		super(CONSOLE_NAME, CONTEXT_MENU_ID);
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CConfigureConsole.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CConfigureConsole.java
new file mode 100644
index 0000000..1925fcd
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CConfigureConsole.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2004, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.cdt.ui.IBuildConsoleManager;
+import org.eclipse.core.resources.IProject;
+
+public class CConfigureConsole extends Console {
+	IProject project;
+	IBuildConsoleManager fConsoleManager;
+	
+	private static final String CONTEXT_MENU_ID = "CAutotoolsConfigureConsole"; //$NON-NLS-1$
+	private static final String CONSOLE_NAME = ConsoleMessages.getString("ConfigureConsole.name"); //$NON-NLS-1$
+	
+	public CConfigureConsole() {
+		super(CONSOLE_NAME, CONTEXT_MENU_ID);
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CWordFinder.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CWordFinder.java
new file mode 100644
index 0000000..cc28694
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/CWordFinder.java
@@ -0,0 +1,283 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.Region;
+
+
+/**
+ * This is a helper class for the text editor to be able to determine, given a
+ * particular offset in a document, various candidates segments for things like
+ * context help, proposals and hovering.
+ */
+public class CWordFinder {
+	
+	private static final char CBRACE_L = '{';
+	private static final char CBRACE_R = '}';
+	private static final char  BRACE_R = ')';
+	
+	/**
+	 * This method determines for a given offset into a given document what the
+	 * region is which defines the current word. A word is defined as the set of
+	 * non "C" identifiers. So assuming that ! indicated the current cursor
+	 * postion: !afunction(int a, int b) --> word = length 0 afunc!tion(int a,
+	 * int b) --> word = afunction afunction!(int a, int b) --> word = afunction
+	 * afunction(!int a, int b) --> word = length 0 afunction(int a,! int b) -->
+	 * word = length 0 afunction(!) --> word = length 0
+	 * 
+	 * @param document
+	 *            The document to be examined
+	 * @param offset
+	 *            The offset into the document where a word should be
+	 *            idendified.
+	 * @return The region defining the current word, which may be a region of
+	 *         length 0 if the offset is not in a word, or null if there is an
+	 *         error accessing the docment data.
+	 */
+	public static IRegion findWord(IDocument document, int offset) {
+		int start = -1;
+		int end = -1;
+
+		try {
+			int pos = offset;
+			char c;
+
+			while (pos >= 0) {
+				c = document.getChar(pos);
+				if (!Character.isJavaIdentifierPart(c))
+					break;
+				--pos;
+			}
+
+			start = pos + 1;
+
+			pos = offset;
+			int length = document.getLength();
+
+			while (pos < length) {
+				c = document.getChar(pos);
+				if (!Character.isJavaIdentifierPart(c))
+					break;
+				++pos;
+			}
+
+			end = pos;
+
+		} catch (BadLocationException x) {
+		}
+
+		if (start > -1 && end > -1) {
+			if (start >= offset && end == offset)
+				return new Region(offset, 0);
+			else
+				return new Region(start, end - start);
+		}
+
+		return null;
+	}
+
+	/**
+	 * This method will determine the region for the name of the function within
+	 * which the current offset is contained.
+	 * 
+	 * @param document
+	 *            The document to be examined
+	 * @param offset
+	 *            The offset into the document where a word should be
+	 *            idendified.
+	 * @return The region defining the current word, which may be a region of
+	 *         length 0 if the offset is not in a function, or null if there is
+	 *         an error accessing the docment data.
+	 */
+	public static IRegion findFunction(IDocument document, int offset) {
+		int leftbracket = -1;
+		int leftbracketcount = 0;
+		int rightbracket = -1;
+		int rightbracketcount = 0;
+		int functionstart = -1;
+		int functionend = -1;
+
+		try {
+			int length = document.getLength();
+			int pos;
+			char c;
+
+			//Find most relevant right bracket from our position
+			pos = offset;
+			rightbracketcount = leftbracketcount = 0;
+			while (pos < length) {
+				c = document.getChar(pos);
+
+				if (c == ')') {
+					rightbracketcount++;
+					if (rightbracketcount >= leftbracketcount) {
+						rightbracket = pos;
+						break;
+					}
+				}
+
+				if (c == '(') {
+					leftbracketcount++;
+				}
+
+				if (c == ';') {
+					break;
+				}
+
+				pos++;
+			}
+
+			if (rightbracket == -1) {
+				return new Region(offset, 0);
+			}
+
+			//Now backtrack our way from the rightbracket to the left
+			pos = rightbracket;
+			rightbracketcount = leftbracketcount = 0;
+			while (pos >= 0) {
+				c = document.getChar(pos);
+
+				if (c == ')') {
+					rightbracketcount++;
+				}
+
+				if (c == '(') {
+					leftbracketcount++;
+					if (leftbracketcount >= rightbracketcount) {
+						leftbracket = pos;
+						break;
+					}
+				}
+
+				if (c == ';') {
+					break;
+				}
+
+				pos--;
+			}
+
+			if (leftbracket == -1) {
+				return new Region(offset, 0);
+			}
+
+			//Now work our way to the function name
+			pos = leftbracket - 1;
+			while (pos >= 0) {
+				c = document.getChar(pos);
+				if (functionend == -1 && c == ' ') {
+					pos--;
+					continue;
+				}
+
+				if (!Character.isJavaIdentifierPart(c)) {
+					break;
+				}
+
+				functionstart = pos;
+				if (functionend == -1) {
+					functionend = pos;
+				}
+
+				pos--;
+			}
+		} catch (BadLocationException x) {
+			/* Ignore */
+		}
+
+		if (functionstart > -1 && functionend > -1) {
+			return new Region(functionstart, functionend - functionstart + 1);
+		}
+
+		return null;
+	}
+
+	/**
+	 * This method will determine whether current offset is contained 
+	 * in any function's body or it's outside it. 
+	 * 
+	 * @param document
+	 *            The document to be examined
+	 * @param offset
+	 *            The offset into the document
+	 * @return 
+	 *      <code>true</code> if there is no function body around offset 
+	 *      <code>false</code> otherwise 
+	 */
+	public static boolean isGlobal(IDocument document, int offset) {
+		try {
+			int pos = offset;
+			int bracketcount = 0;
+			char c;
+
+			//Find left curled bracket from our position
+			while (pos > 0) {
+				c = document.getChar(pos--);
+
+				if (c == CBRACE_R) {
+					bracketcount++; // take into account nested blocks
+				} else if (c == CBRACE_L) {
+					if (bracketcount-- == 0) {
+						do {
+							c = document.getChar(pos--);
+							if (c == BRACE_R) return false;
+						} while (Character.isWhitespace(c));
+						// container block seems to be not a function or statement body
+						pos++;             // step back one symbol
+						bracketcount = 0;  // let's search for upper block
+					}
+				}
+			}
+			
+		} catch (BadLocationException x) { /* Ignore */	}
+		// return true in case of unknown result or exception 
+		return true;
+	}
+	
+	/**
+	 * Searches for line feed symbols in string.
+	 * First met '\r' or '\n' is treated as LF symbol
+	 * 
+	 * @param s
+	 * 			string to search in.
+	 * @return  number of LFs met.
+	 */
+	public static int countLFs (String s) {
+		int counter = 0;
+		char lf = 0;
+		char c;
+		for (int i=0; i<s.length(); i++) {
+			c = s.charAt(i);
+			if (lf == 0) {
+				if (c == '\n' || c == '\r') {
+					lf = c;
+					counter++;
+				}
+			} else if (lf == c) counter++;
+		}
+		return counter;
+	}
+
+	/**
+	 * Checks whether the string contains any C-block delimiters ( { } ) 
+	 * 
+	 * @param s 
+	 * 			text to check
+	 * @return  true if curled brace found.
+	 */
+	public static boolean hasCBraces (String s) {
+		if (s.indexOf(CBRACE_L) > -1 || s.indexOf(CBRACE_R) > -1) return true;
+		else return false;
+	}
+}
+
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/Console.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/Console.java
new file mode 100644
index 0000000..695e489
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/Console.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2004 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import org.eclipse.cdt.core.ConsoleOutputStream;
+import org.eclipse.cdt.core.resources.IConsole;
+import org.eclipse.cdt.ui.CUIPlugin;
+import org.eclipse.cdt.ui.IBuildConsoleManager;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+
+public class Console implements IConsole {
+	IProject project;
+	IBuildConsoleManager fConsoleManager;
+	
+	public Console(String consoleName, String contextId) {
+		fConsoleManager = CUIPlugin.getDefault().getConsoleManager(consoleName, 
+				contextId);
+	}
+	
+//	/**
+//	 * Constructor for ConfigureConsole.
+//	 */
+//	public CConfigureConsole() {
+//		fConsoleManager = AutotoolsPlugin.getDefault().getConsoleManager();
+//	}
+//
+
+	public void start(IProject project ) {
+		this.project = project;
+		fConsoleManager.getConsole(project).start(project);
+	}
+	
+	/**
+	 * @throws CoreException
+	 * @see org.eclipse.cdt.core.resources.IConsole#getOutputStream()
+	 */
+	public ConsoleOutputStream getOutputStream() throws CoreException {
+		return fConsoleManager.getConsole(project).getOutputStream();
+	}
+
+	public ConsoleOutputStream getInfoStream() throws CoreException {
+		return fConsoleManager.getConsole(project).getInfoStream();
+	}
+
+	public ConsoleOutputStream getErrorStream() throws CoreException {
+		return fConsoleManager.getConsole(project).getErrorStream();
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.java
new file mode 100644
index 0000000..a9b3d21
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2004 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class ConsoleMessages {
+
+	public static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.cdt.autotools.ui.ConsoleMessages";//$NON-NLS-1$
+
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+
+	private ConsoleMessages() {
+
+	}
+	public static String getString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.properties b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.properties
new file mode 100644
index 0000000..7c4510d
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/ConsoleMessages.properties
@@ -0,0 +1,25 @@
+###############################################################################
+# Copyright (c) 2003, 2004 QNX Software Systems and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# QNX Software Systems - Initial API and implementation
+###############################################################################
+ConfigureConsole.name=Configure
+BuildStepsConsole.name=Build Steps
+AutotoolsConsole.name=Autotools
+
+find_replace_action.label=&Find/Replace...@Ctrl+F
+find_replace_action.tooltip=Find/Replace
+find_replace_action.image=
+find_replace_action.description=Find/Replace
+
+ConfigureConsolePage.&Copy@Ctrl+C_6=&Copy@Ctrl+C
+ConfigureConsolePage.Copy_7=Copy
+ConfigureConsolePage.Select_&All@Ctrl+A_12=Select &All@Ctrl+A
+ConfigureConsolePage.Select_All=Select All
+
+ScrollLockAction.Scroll_Lock_1=Scroll Lock
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLPrinter.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLPrinter.java
new file mode 100644
index 0000000..a9de7d1
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/HTMLPrinter.java
@@ -0,0 +1,116 @@
+/*******************************************************************************
+ * Copyright (c) 2000 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.io.IOException;
+import java.io.Reader;
+
+
+/**
+ * Provides a set of convenience methods for creating HTML pages.
+ */
+public class HTMLPrinter {
+			
+	private HTMLPrinter() {
+	}
+	
+	private static String replace(String text, char c, String s) {
+				
+		int previous= 0;
+		int current= text.indexOf(c, previous);
+		
+		if (current == -1)
+			return text;
+		
+		StringBuffer buffer= new StringBuffer();	
+		while (current > -1) {
+			buffer.append(text.substring(previous, current));
+			buffer.append(s);
+			previous= current + 1;
+			current= text.indexOf(c, previous);
+		}
+		buffer.append(text.substring(previous));
+		
+		return buffer.toString();
+	}
+	
+	public static String convertToHTMLContent(String content) {
+		content= replace(content, '<', "&lt;"); //$NON-NLS-1$
+		return replace(content, '>', "&gt;"); //$NON-NLS-1$
+	}
+	
+	public static String read(Reader rd) {
+		
+		StringBuffer buffer= new StringBuffer();
+		char[] readBuffer= new char[2048];
+		
+		try {
+			int n= rd.read(readBuffer);
+			while (n > 0) {
+				buffer.append(readBuffer, 0, n);
+				n= rd.read(readBuffer);
+			}
+			return buffer.toString();
+		} catch (IOException x) {
+		}
+		
+		return null;
+	}
+
+	public static void insertPageProlog(StringBuffer buffer, int position) {
+		buffer.insert(position, "<html><body text=\"#000000\" bgcolor=\"#FFFF88\"><font size=-1>"); //$NON-NLS-1$
+	}
+	
+	public static void addPageProlog(StringBuffer buffer) {
+		insertPageProlog(buffer, buffer.length());
+	}
+	
+	public static void addPageEpilog(StringBuffer buffer) {
+		buffer.append("</font></body></html>"); //$NON-NLS-1$
+	}
+	
+	public static void startBulletList(StringBuffer buffer) {
+		buffer.append("<ul>"); //$NON-NLS-1$
+	}
+	
+	public static void endBulletList(StringBuffer buffer) {
+		buffer.append("</ul>"); //$NON-NLS-1$
+	}
+	
+	public static void addBullet(StringBuffer buffer, String bullet) {
+		if (bullet != null) {
+			buffer.append("<li>"); //$NON-NLS-1$
+			buffer.append(bullet);
+			buffer.append("</li>"); //$NON-NLS-1$
+		}
+	}
+	
+	public static void addSmallHeader(StringBuffer buffer, String header) {
+		if (header != null) {
+			buffer.append("<h5>"); //$NON-NLS-1$
+			buffer.append(header);
+			buffer.append("</h5>"); //$NON-NLS-1$
+		}
+	}
+	
+	public static void addParagraph(StringBuffer buffer, String paragraph) {
+		if (paragraph != null) {
+			buffer.append("<p>"); //$NON-NLS-1$
+			buffer.append(paragraph);
+		}
+	}
+	
+	public static void addParagraph(StringBuffer buffer, Reader paragraphReader) {
+		if (paragraphReader != null)
+			addParagraph(buffer, read(paragraphReader));
+	}
+}
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/LineBreakingReader.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/LineBreakingReader.java
new file mode 100644
index 0000000..52fb3e3
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/LineBreakingReader.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2000 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.Reader;
+
+import java.text.BreakIterator;
+import org.eclipse.swt.graphics.GC;
+
+/*
+ * Not a real reader. Could change if requested
+ */
+public class LineBreakingReader {
+	
+	private BufferedReader fReader;
+	private GC fGC;
+	private int fMaxWidth;
+	
+	private String fLine;
+	private int fOffset;
+	
+	private BreakIterator fLineBreakIterator;
+	private int findNextBreakOffset(int currOffset) {
+		int currWidth= 0;
+		int nextOffset= fLineBreakIterator.following(currOffset);
+		while (nextOffset != BreakIterator.DONE) {
+			String word= fLine.substring(currOffset, nextOffset);
+			int wordWidth= fGC.textExtent(word).x;
+			int nextWidth= wordWidth + currWidth;
+			if (nextWidth > fMaxWidth) {
+				if (currWidth > 0) {
+					return currOffset;
+				}
+				return nextOffset;
+			}
+			currWidth= nextWidth;
+			currOffset= nextOffset;
+			nextOffset= fLineBreakIterator.next();
+		}
+		return nextOffset;
+	}
+	private int findWordBegin(int idx) {
+		while (idx < fLine.length() && Character.isWhitespace(fLine.charAt(idx))) {
+			idx++;
+		}
+		return idx;
+	}
+	/**
+	 * Creates a reader that breaks an input text to fit in a given width.
+	 * @param reader Reader of the input text
+	 * @param gc The graphic context that defines the currently used font sizes
+	 * @param maxLineWidth The max width (pixes) where the text has to fit in 
+	 */
+	public LineBreakingReader(Reader reader, GC gc, int maxLineWidth) {
+		fReader= new BufferedReader(reader);
+		fGC= gc;
+		fMaxWidth= maxLineWidth;
+		fOffset= 0;
+		fLine= null;
+		fLineBreakIterator= BreakIterator.getLineInstance();
+	}
+	
+	public boolean isFormattedLine() {
+		return fLine != null;
+	}
+	
+	/**
+	 * Reads the next line. The lengths of the line will not exceed the gived maximum
+	 * width.
+	 */
+	public String readLine() throws IOException {
+		if (fLine == null) {
+			String line= fReader.readLine();
+			if (line == null) {
+				return null;
+			}
+								
+			int lineLen= fGC.textExtent(line).x;
+			if (lineLen < fMaxWidth) {
+				return line;
+			}
+			fLine= line;
+			fLineBreakIterator.setText(line);
+			fOffset= 0;
+		}
+		int breakOffset= findNextBreakOffset(fOffset);
+		String res;
+		if (breakOffset != BreakIterator.DONE) {
+			res= fLine.substring(fOffset, breakOffset);
+			fOffset= findWordBegin(breakOffset);
+			if (fOffset == fLine.length()) {
+				fLine= null;
+			}
+		} else {
+			res= fLine.substring(fOffset);
+			fLine= null;
+		}
+		return res;
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SingleCharReader.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SingleCharReader.java
new file mode 100644
index 0000000..1d48fcc
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SingleCharReader.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2000 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+import java.io.IOException;
+import java.io.Reader;
+
+
+public abstract class SingleCharReader extends Reader {
+	
+	/**
+	 * @see Reader#read(char)
+	 */
+	public abstract int read() throws IOException;
+
+
+	/**
+	 * @see Reader#read(char[],int,int)
+	 */
+	public int read(char cbuf[], int off, int len) throws IOException {
+		int end= off + len;
+		for (int i= off; i < end; i++) {
+			int ch= read();
+			if (ch == -1) {
+				if (i == off) {
+					return -1;
+				}
+				return i - off;
+			}
+			cbuf[i]= (char)ch;
+		}
+		return len;
+	}		
+	
+	/**
+	 * @see Reader#ready()
+	 */		
+    public boolean ready() throws IOException {
+		return true;
+	}
+	
+	/**
+	 * Gets the content as a String
+	 */
+	public String getString() throws IOException {
+		StringBuffer buf= new StringBuffer();
+		int ch;
+		while ((ch= read()) != -1) {
+			buf.append((char)ch);
+		}
+		return buf.toString();
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SubstitutionTextReader.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SubstitutionTextReader.java
new file mode 100644
index 0000000..16d8400
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/SubstitutionTextReader.java
@@ -0,0 +1,138 @@
+/*******************************************************************************
+ * Copyright (c) 2000 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     QNX Software System
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.autotools.ui;
+
+
+import java.io.IOException;
+import java.io.Reader;
+
+
+/**
+ * Reads the text contents from a reader and computes for each character
+ * a potential substitution. The substitution may eat more characters than 
+ * only the one passed into the computation routine.
+ */
+public abstract class SubstitutionTextReader extends SingleCharReader {
+	
+	protected static final String LINE_DELIM= System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
+	
+	private Reader fReader;
+	private boolean fWasWhiteSpace;
+	private int fCharAfterWhiteSpace;
+	
+	private boolean fReadFromBuffer;
+	private StringBuffer fBuffer;
+	private int fIndex;
+
+
+	protected SubstitutionTextReader(Reader reader) {
+		fReader= reader;
+		fBuffer= new StringBuffer();
+		fIndex= 0;
+		fReadFromBuffer= false;
+		fCharAfterWhiteSpace= -1;
+		fWasWhiteSpace= true;
+	}
+	
+	/**
+	 * Implement to compute the substitution for the given character and 
+	 * if necessary subsequent characters. Use <code>nextChar</code>
+	 * to read subsequent characters.
+	 */
+	protected abstract String computeSubstitution(int c) throws IOException;
+	
+	/**
+	 * Returns the internal reader.
+	 */
+	protected Reader getReader() {
+		return fReader;
+	}
+	 
+	/**
+	 * Returns the next character.
+	 */
+	protected int nextChar() throws IOException {
+		fReadFromBuffer= (fBuffer.length() > 0);
+		if (fReadFromBuffer) {
+			char ch= fBuffer.charAt(fIndex++);
+			if (fIndex >= fBuffer.length()) {
+				fBuffer.setLength(0);
+				fIndex= 0;
+			}
+			return ch;
+		}
+		int ch= fCharAfterWhiteSpace;
+		if (ch == -1) {
+			ch= fReader.read();
+		}
+		if (Character.isWhitespace((char)ch)) {
+			do {
+				ch= fReader.read();
+			} while (Character.isWhitespace((char)ch));
+			if (ch != -1) {
+				fCharAfterWhiteSpace= ch;
+				return ' ';
+			}
+		} else {
+			fCharAfterWhiteSpace= -1;
+		}
+		return ch;
+	}
+	
+	/**
+	 * @see Reader#read()
+	 */
+	public int read() throws IOException {
+		int c;
+		do {
+			
+			c= nextChar();
+			while (!fReadFromBuffer) {
+				String s= computeSubstitution(c);
+				if (s == null)
+					break;
+				if (s.length() > 0)
+					fBuffer.insert(0, s);
+				c= nextChar();
+			}
+			
+		} while (fWasWhiteSpace && (c == ' '));
+				
+		fWasWhiteSpace= (c == ' ' || c == '\r' || c == '\n');
+		return c;
+	}
+		
+	/**
+	 * @see Reader#ready()
+	 */		
+    public boolean ready() throws IOException {
+		return fReader.ready();
+	}
+		
+	/**
+	 * @see Reader#close()
+	 */		
+	public void close() throws IOException {
+		fReader.close();
+	}
+	
+	/**
+	 * @see Reader#reset()
+	 */		
+	public void reset() throws IOException {
+		fReader.reset();
+		fWasWhiteSpace= true;
+		fCharAfterWhiteSpace= -1;
+		fBuffer.setLength(0);
+		fIndex= 0;		
+	}
+}
\ No newline at end of file
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsEditorPreferenceConstants.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsEditorPreferenceConstants.java
new file mode 100644
index 0000000..5fbd710
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/AutotoolsEditorPreferenceConstants.java
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2005, 2007, 2009 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ * Red Hat Inc. - rename to use with Autotools editors
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+
+/**
+ * MakefileEditorPreferenceConstants
+ */
+public class AutotoolsEditorPreferenceConstants {
+
+	/**
+	 * 
+	 */
+	private AutotoolsEditorPreferenceConstants() {
+	}
+
+	/**
+	 * The symbolic names for colors for displaying code assist proposals
+	 * @see org.eclipse.jface.resource.ColorRegistry
+	 */
+	public static final String CURRENT_LINE_COLOR = "org.eclipse.linuxtools.cdt.autotools.automake.ui.currentLineHightlightColor"; //$NON-NLS-1$
+	public static final String LINE_NUMBER_RULER_COLOR = "org.eclipse.linuxtools.cdt.autotools.automake.ui.lineNumberForegroundColor"; //$NON-NLS-1$
+	public static final String PRINT_MARGIN_COLOR = "org.eclipse.linuxtools.cdt.autotools.automake.ui.printMarginColor"; //$NON-NLS-1$	
+	
+	/**
+	 * Preference key suffix for bold text style preference keys.
+	 * 
+	 */
+	public static final String EDITOR_BOLD_SUFFIX= "_bold"; //$NON-NLS-1$
+
+	/**
+	 * Preference key suffix for italic text style preference keys.
+	 */
+	public static final String EDITOR_ITALIC_SUFFIX= "_italic"; //$NON-NLS-1$
+
+
+	public static final String EDITOR_FOLDING_MACRODEF = "editor_folding_default_macrodef"; //$NON-NLS-1$
+
+	public static final String EDITOR_FOLDING_RULE = "editor_folding_default_rule"; //$NON-NLS-1$
+
+	public static final String EDITOR_FOLDING_CASE = "editor_folding_default_case"; //$NON-NLS-1$
+
+	public static final String EDITOR_FOLDING_CONDITIONAL = "editor_folding_default_conditional"; //$NON-NLS-1$
+
+	public static final String EDITOR_FOLDING_LOOP = "editor_folding_default_loop"; //$NON-NLS-1$
+
+	public static final String EDITOR_FOLDING_ENABLED = "editor_folding_enabled"; //$NON-NLS-1$
+	
+	public static final String AUTOCONF_VERSION = "autoconf_version"; //$NON-NLS-1$
+	
+	public static final String AUTOMAKE_VERSION = "automake_version"; //$NON-NLS-1$
+	
+	public static final String LATEST_AC_VERSION = "2.61"; //$NON-NLS-1$
+	
+	public static final String LATEST_AM_VERSION = "1.9.6"; //$NON-NLS-1$
+	
+	public static void initializeDefaultValues(IPreferenceStore store) {
+
+		store.setDefault(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_ENABLED, false);
+		store.setDefault(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_MACRODEF, false);
+		store.setDefault(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_RULE, true);
+		store.setDefault(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_CASE, true);
+		store.setDefault(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_CONDITIONAL, true);
+		store.setDefault(AutotoolsEditorPreferenceConstants.EDITOR_FOLDING_LOOP, true);
+		store.setDefault(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION, LATEST_AC_VERSION);
+		store.setDefault(AutotoolsEditorPreferenceConstants.AUTOMAKE_VERSION, LATEST_AM_VERSION);
+	}
+
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/OverlayPreferenceStore.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/OverlayPreferenceStore.java
new file mode 100644
index 0000000..3c6a672
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/OverlayPreferenceStore.java
@@ -0,0 +1,455 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferenceStore;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.PropertyChangeEvent;
+
+/**
+ * OverlayPreferenceStore
+ */
+/**
+ * An overlaying preference store.
+ */
+class OverlayPreferenceStore  implements IPreferenceStore {
+	
+	
+	public static final class TypeDescriptor {
+		TypeDescriptor() {
+		}
+	}
+	
+	public static final TypeDescriptor BOOLEAN= new TypeDescriptor();
+	public static final TypeDescriptor DOUBLE= new TypeDescriptor();
+	public static final TypeDescriptor FLOAT= new TypeDescriptor();
+	public static final TypeDescriptor INT= new TypeDescriptor();
+	public static final TypeDescriptor LONG= new TypeDescriptor();
+	public static final TypeDescriptor STRING= new TypeDescriptor();
+	
+	public static class OverlayKey {
+		
+		TypeDescriptor fDescriptor;
+		String fKey;
+		
+		public OverlayKey(TypeDescriptor descriptor, String key) {
+			fDescriptor= descriptor;
+			fKey= key;
+		}
+	}
+	
+	private class PropertyListener implements IPropertyChangeListener {
+				
+		/*
+		 * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent)
+		 */
+		public void propertyChange(PropertyChangeEvent event) {
+			OverlayKey key= findOverlayKey(event.getProperty());
+			if (key != null)
+				propagateProperty(fParent, key, fStore); 
+		}
+	}
+	
+	
+	IPreferenceStore fParent;
+	IPreferenceStore fStore;
+	private OverlayKey[] fOverlayKeys;
+	
+	private PropertyListener fPropertyListener;
+	
+	
+	public OverlayPreferenceStore(IPreferenceStore parent, OverlayKey[] overlayKeys) {
+		fParent= parent;
+		fOverlayKeys= overlayKeys;
+		fStore= new PreferenceStore();
+	}
+	
+	OverlayKey findOverlayKey(String key) {
+		for (int i= 0; i < fOverlayKeys.length; i++) {
+			if (fOverlayKeys[i].fKey.equals(key))
+				return fOverlayKeys[i];
+		}
+		return null;
+	}
+	
+	private boolean covers(String key) {
+		return (findOverlayKey(key) != null);
+	}
+	
+	void propagateProperty(IPreferenceStore orgin, OverlayKey key, IPreferenceStore target) {
+		
+		if (orgin.isDefault(key.fKey)) {
+			if (!target.isDefault(key.fKey))
+				target.setToDefault(key.fKey);
+			return;
+		}
+		
+		TypeDescriptor d= key.fDescriptor;
+		if (BOOLEAN == d) {
+			
+			boolean originValue= orgin.getBoolean(key.fKey);
+			boolean targetValue= target.getBoolean(key.fKey);
+			if (targetValue != originValue)
+				target.setValue(key.fKey, originValue);
+				
+		} else if (DOUBLE == d) {
+			
+			double originValue= orgin.getDouble(key.fKey);
+			double targetValue= target.getDouble(key.fKey);
+			if (targetValue != originValue)
+				target.setValue(key.fKey, originValue);
+		
+		} else if (FLOAT == d) {
+			
+			float originValue= orgin.getFloat(key.fKey);
+			float targetValue= target.getFloat(key.fKey);
+			if (targetValue != originValue)
+				target.setValue(key.fKey, originValue);
+				
+		} else if (INT == d) {
+
+			int originValue= orgin.getInt(key.fKey);
+			int targetValue= target.getInt(key.fKey);
+			if (targetValue != originValue)
+				target.setValue(key.fKey, originValue);
+
+		} else if (LONG == d) {
+
+			long originValue= orgin.getLong(key.fKey);
+			long targetValue= target.getLong(key.fKey);
+			if (targetValue != originValue)
+				target.setValue(key.fKey, originValue);
+
+		} else if (STRING == d) {
+
+			String originValue= orgin.getString(key.fKey);
+			String targetValue= target.getString(key.fKey);
+			if (targetValue != null && originValue != null && !targetValue.equals(originValue))
+				target.setValue(key.fKey, originValue);
+
+		}
+	}
+	
+	public void propagate() {
+		for (int i= 0; i < fOverlayKeys.length; i++)
+			propagateProperty(fStore, fOverlayKeys[i], fParent);
+	}
+	
+	private void loadProperty(IPreferenceStore orgin, OverlayKey key, IPreferenceStore target, boolean forceInitialization) {
+		TypeDescriptor d= key.fDescriptor;
+		if (BOOLEAN == d) {
+			
+			if (forceInitialization)
+				target.setValue(key.fKey, true);
+			target.setValue(key.fKey, orgin.getBoolean(key.fKey));
+			target.setDefault(key.fKey, orgin.getDefaultBoolean(key.fKey));
+			
+		} else if (DOUBLE == d) {
+			
+			if (forceInitialization)
+				target.setValue(key.fKey, 1.0D);
+			target.setValue(key.fKey, orgin.getDouble(key.fKey));
+			target.setDefault(key.fKey, orgin.getDefaultDouble(key.fKey));
+			
+		} else if (FLOAT == d) {
+			
+			if (forceInitialization)
+				target.setValue(key.fKey, 1.0F);
+			target.setValue(key.fKey, orgin.getFloat(key.fKey));
+			target.setDefault(key.fKey, orgin.getDefaultFloat(key.fKey));
+			
+		} else if (INT == d) {
+			
+			if (forceInitialization)
+				target.setValue(key.fKey, 1);
+			target.setValue(key.fKey, orgin.getInt(key.fKey));
+			target.setDefault(key.fKey, orgin.getDefaultInt(key.fKey));
+			
+		} else if (LONG == d) {
+			
+			if (forceInitialization)
+				target.setValue(key.fKey, 1L);
+			target.setValue(key.fKey, orgin.getLong(key.fKey));
+			target.setDefault(key.fKey, orgin.getDefaultLong(key.fKey));
+			
+		} else if (STRING == d) {
+			
+			if (forceInitialization)
+				target.setValue(key.fKey, "1"); //$NON-NLS-1$
+			target.setValue(key.fKey, orgin.getString(key.fKey));
+			target.setDefault(key.fKey, orgin.getDefaultString(key.fKey));
+			
+		}
+	}
+	
+	public void load() {
+		for (int i= 0; i < fOverlayKeys.length; i++)
+			loadProperty(fParent, fOverlayKeys[i], fStore, true);
+	}
+	
+	public void loadDefaults() {
+		for (int i= 0; i < fOverlayKeys.length; i++)
+			setToDefault(fOverlayKeys[i].fKey);
+	}
+	
+	public void start() {
+		if (fPropertyListener == null) {
+			fPropertyListener= new PropertyListener();
+			fParent.addPropertyChangeListener(fPropertyListener);
+		}
+	}
+	
+	public void stop() {
+		if (fPropertyListener != null)  {
+			fParent.removePropertyChangeListener(fPropertyListener);
+			fPropertyListener= null;
+		}
+	}
+	
+	/*
+	 * @see IPreferenceStore#addPropertyChangeListener(IPropertyChangeListener)
+	 */
+	public void addPropertyChangeListener(IPropertyChangeListener listener) {
+		fStore.addPropertyChangeListener(listener);
+	}
+	
+	/*
+	 * @see IPreferenceStore#removePropertyChangeListener(IPropertyChangeListener)
+	 */
+	public void removePropertyChangeListener(IPropertyChangeListener listener) {
+		fStore.removePropertyChangeListener(listener);
+	}
+	
+	/*
+	 * @see IPreferenceStore#firePropertyChangeEvent(String, Object, Object)
+	 */
+	public void firePropertyChangeEvent(String name, Object oldValue, Object newValue) {
+		fStore.firePropertyChangeEvent(name, oldValue, newValue);
+	}
+
+	/*
+	 * @see IPreferenceStore#contains(String)
+	 */
+	public boolean contains(String name) {
+		return fStore.contains(name);
+	}
+	
+	/*
+	 * @see IPreferenceStore#getBoolean(String)
+	 */
+	public boolean getBoolean(String name) {
+		return fStore.getBoolean(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDefaultBoolean(String)
+	 */
+	public boolean getDefaultBoolean(String name) {
+		return fStore.getDefaultBoolean(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDefaultDouble(String)
+	 */
+	public double getDefaultDouble(String name) {
+		return fStore.getDefaultDouble(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDefaultFloat(String)
+	 */
+	public float getDefaultFloat(String name) {
+		return fStore.getDefaultFloat(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDefaultInt(String)
+	 */
+	public int getDefaultInt(String name) {
+		return fStore.getDefaultInt(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDefaultLong(String)
+	 */
+	public long getDefaultLong(String name) {
+		return fStore.getDefaultLong(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDefaultString(String)
+	 */
+	public String getDefaultString(String name) {
+		return fStore.getDefaultString(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getDouble(String)
+	 */
+	public double getDouble(String name) {
+		return fStore.getDouble(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getFloat(String)
+	 */
+	public float getFloat(String name) {
+		return fStore.getFloat(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getInt(String)
+	 */
+	public int getInt(String name) {
+		return fStore.getInt(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getLong(String)
+	 */
+	public long getLong(String name) {
+		return fStore.getLong(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#getString(String)
+	 */
+	public String getString(String name) {
+		return fStore.getString(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#isDefault(String)
+	 */
+	public boolean isDefault(String name) {
+		return fStore.isDefault(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#needsSaving()
+	 */
+	public boolean needsSaving() {
+		return fStore.needsSaving();
+	}
+
+	/*
+	 * @see IPreferenceStore#putValue(String, String)
+	 */
+	public void putValue(String name, String value) {
+		if (covers(name))
+			fStore.putValue(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setDefault(String, double)
+	 */
+	public void setDefault(String name, double value) {
+		if (covers(name))
+			fStore.setDefault(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setDefault(String, float)
+	 */
+	public void setDefault(String name, float value) {
+		if (covers(name))
+			fStore.setDefault(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setDefault(String, int)
+	 */
+	public void setDefault(String name, int value) {
+		if (covers(name))
+			fStore.setDefault(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setDefault(String, long)
+	 */
+	public void setDefault(String name, long value) {
+		if (covers(name))
+			fStore.setDefault(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setDefault(String, String)
+	 */
+	public void setDefault(String name, String value) {
+		if (covers(name))
+			fStore.setDefault(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setDefault(String, boolean)
+	 */
+	public void setDefault(String name, boolean value) {
+		if (covers(name))
+			fStore.setDefault(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setToDefault(String)
+	 */
+	public void setToDefault(String name) {
+		fStore.setToDefault(name);
+	}
+
+	/*
+	 * @see IPreferenceStore#setValue(String, double)
+	 */
+	public void setValue(String name, double value) {
+		if (covers(name))
+			fStore.setValue(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setValue(String, float)
+	 */
+	public void setValue(String name, float value) {
+		if (covers(name))
+			fStore.setValue(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setValue(String, int)
+	 */
+	public void setValue(String name, int value) {
+		if (covers(name))
+			fStore.setValue(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setValue(String, long)
+	 */
+	public void setValue(String name, long value) {
+		if (covers(name))
+			fStore.setValue(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setValue(String, String)
+	 */
+	public void setValue(String name, String value) {
+		if (covers(name))
+			fStore.setValue(name, value);
+	}
+
+	/*
+	 * @see IPreferenceStore#setValue(String, boolean)
+	 */
+	public void setValue(String name, boolean value) {
+		if (covers(name))
+			fStore.setValue(name, value);
+	}
+}
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/StatusInfo.java b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/StatusInfo.java
new file mode 100644
index 0000000..3ae395a
--- /dev/null
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools/src/org/eclipse/linuxtools/internal/cdt/autotools/ui/preferences/StatusInfo.java
@@ -0,0 +1,173 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.autotools.ui.preferences;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.linuxtools.cdt.autotools.AutotoolsPlugin;
+
+
+/**
+ * A settable IStatus.
+ * Can be an error, warning, info or ok. For error, info and warning states,
+ * a message describes the problem.
+ */
+public class StatusInfo implements IStatus {
+
+	private String fStatusMessage;
+	private int fSeverity;
+
+	/**
+	 * Creates a status set to OK (no message)
+	 */
+	public StatusInfo() {
+		this(OK, null);
+	}
+
+	/**
+	 * Creates a status .
+	 * @param severity The status severity: ERROR, WARNING, INFO and OK.
+	 * @param message The message of the status. Applies only for ERROR,
+	 * WARNING and INFO.
+	 */
+	public StatusInfo(int severity, String message) {
+		fStatusMessage= message;
+		fSeverity= severity;
+	}
+
+	/**
+	 *  Returns if the status' severity is OK.
+	 */
+	public boolean isOK() {
+		return fSeverity == IStatus.OK;
+	}
+
+	/**
+	 *  Returns if the status' severity is WARNING.
+	 */
+	public boolean isWarning() {
+		return fSeverity == IStatus.WARNING;
+	}
+
+	/**
+	 *  Returns if the status' severity is INFO.
+	 */
+	public boolean isInfo() {
+		return fSeverity == IStatus.INFO;
+	}
+
+	/**
+	 *  Returns if the status' severity is ERROR.
+	 */
+	public boolean isError() {
+		return fSeverity == IStatus.ERROR;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.runtime.IStatus#getMessage()
+	 */
+	public String getMessage() {
+		return fStatusMessage;
+	}
+
+	/**
+	 * Sets the status to ERROR.
+	 * @param errorMessage The error message (can be empty, but not null)
+	 */
+	public void setError(String errorMessage) {
+		Assert.isNotNull(errorMessage);
+		fStatusMessage= errorMessage;
+		fSeverity= IStatus.ERROR;
+	}
+
+	/**
+	 * Sets the status to WARNING.
+	 * @param warningMessage The warning message (can be empty, but not null)
+	 */
+	public void setWarning(String warningMessage) {
+		Assert.isNotNull(warningMessage);
+		fStatusMessage= warningMessage;
+		fSeverity= IStatus.WARNING;
+	}
+
+	/**
+	 * Sets the status to INFO.
+	 * @param infoMessage The info message (can be empty, but not null)
+	 */
+	public void setInfo(String infoMessage) {
+		Assert.isNotNull(infoMessage);
+		fStatusMessage= infoMessage;
+		fSeverity= IStatus.INFO;
+	}
+
+	/**
+	 * Sets the status to OK.
+	 */
+	public void setOK() {
+		fStatusMessage= null;
+		fSeverity= IStatus.OK;
+	}
+
+	/*
+	 * @see IStatus#matches(int)
+	 */
+	public boolean matches(int severityMask) {
+		return (fSeverity & severityMask) != 0;
+	}
+
+	/**
+	 * Returns always <code>false</code>.
+	 * @see IStatus#isMultiStatus()
+	 */
+	public boolean isMultiStatus() {
+		return false;
+	}
+
+	/*
+	 * @see IStatus#getSeverity()
+	 */
+	public int getSeverity() {
+		return fSeverity;
+	}
+
+	/*
+	 * @see IStatus#getPlugin()
+	 */
+	public String getPlugin() {
+		return AutotoolsPlugin.getPluginId();
+	}
+
+	/**
+	 * Returns always <code>null</code>.
+	 * @see IStatus#getException()
+	 */
+	public Throwable getException() {
+		return null;
+	}
+
+	/**
+	 * Returns always the error severity.
+	 * @see IStatus#getCode()
+	 */
+	public int getCode() {
+		return fSeverity;
+	}
+
+	/**
+	 * Returns always <code>null</code>.
+	 * @see IStatus#getChildren()
+	 */
+	public IStatus[] getChildren() {
+		return new IStatus[0];
+	}
+
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog-feature/.classpath b/changelog/org.eclipse.linuxtools.changelog-feature/.classpath
new file mode 100644
index 0000000..206b224
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog-feature/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="src" path=""/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/changelog/org.eclipse.linuxtools.changelog-feature/.project b/changelog/org.eclipse.linuxtools.changelog-feature/.project
new file mode 100644
index 0000000..0db2f51
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog-feature/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.changelog-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/changelog/org.eclipse.linuxtools.changelog-feature/.svnignore b/changelog/org.eclipse.linuxtools.changelog-feature/.svnignore
new file mode 100644
index 0000000..ba077a4
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog-feature/.svnignore
@@ -0,0 +1 @@
+bin
diff --git a/changelog/org.eclipse.linuxtools.changelog-feature/ChangeLog b/changelog/org.eclipse.linuxtools.changelog-feature/ChangeLog
new file mode 100644
index 0000000..6f9873f
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog-feature/ChangeLog
@@ -0,0 +1,186 @@
+2010-02-08  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.properties: Capitalize words in featureName.
+
+2009-08-05  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.properties: Variable-ize some strings.
+	* feature.xml: 	Use variables.
+
+2009-08-05  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Externalize a few strings and update.
+	* feature.properties: Update a few properties. 
+
+2009-05-19  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.properties: Change feature provider to Eclipse.
+
+2009-04-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Bump up version to 2.6.7.
+
+2009-01-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Bump up version to 2.6.6.
+
+2009-01-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Add .qualifier to feature version.
+
+2009-01-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Update version to 2.6.5.
+	* build.properties: Add feature.properties to build list.
+
+2009-01-06  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Update copyright years.  Add update site information.  Remove discovery tag.
+
+2008-11-27  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* feature.xml: Remove deprecated attribute usage.
+
+2008-10-20  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Update version to 2.6.3.
+
+2008-01-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: C Parser and Java Parser are now fragments.  Update version to 2.6.1.
+
+2008-01-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Remove CVS dependencies from feature.
+
+2007-12-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Update version to 2.6.0.
+
+2007-08-16  Andrew Overholt  <overholt@redhat.com>
+
+	* build.properties: Remove unnecessary stuff from binary build.
+	* feature.xml: Fill in provider and feature name. Don't include C and Java
+	parsers as they are their own features now. Bump to 2.5.1.
+
+2007-08-07  klee  <klee@redhat.com>
+
+	* feature.xml: Fixed dependencies.
+
+2007-08-02  Kyu Lee  <klee@redhat.com>
+
+	* feature.xml: Version bump to 2.5.0.
+
+2007-05-15  Kyu Lee  <klee@redhat.com>
+
+	* feature.xml: Added new parser features.
+
+2007-05-14  Kyu Lee  <klee@redhat.com>
+
+	* feature.xml: Version bump to 2.4.0.
+	Added parser fragments.
+	Removed JDT requirements.
+
+2007-03-27  Ben Konrath  <bkonrath@redhat.com>
+
+	* .svnignore: Rename from .cvsignore.
+
+2007-01-22  Kyu Lee  <klee@redhat.com>
+
+	* epl-v10.html: Added.
+	* feature.xml: Version bumped to 2.3.4.
+	* build.properties: epl-v10.html added.
+	* build.xml: Deleted generated file.
+
+2006-10-13  Kyu Lee  <klee@redhat.com>
+
+	* feature.xml: Changed version to 2.3.3.
+
+2006-09-29  Kyu Lee  <klee@redhat.com>
+
+	* feature.xml: Changed version to 2.3.2.
+
+2006-09-18  Kyu Lee  <klee@redhat.com>
+
+	* feature.xml: Changed version to 2.3.1.
+	Moved to manual versioning for core and doc.
+
+2006-09-14  Kyu Lee  <klee@redhat.com>
+
+	* feature.xml: Changed version to 2.3.0.
+	* .classpath: Changed to gcj-1.4.2.0.
+
+2006-09-01  Kyu Lee  <klee@redhat.com>
+
+	* feature.xml: Changed version to 2.2.3.
+
+2006-08-01  Kyu Lee  <klee@redhat.com>
+
+	* feature.xml: Changed version to 2.2.2.
+
+2006-07-25  Kyu Lee  <klee@redhat.com>
+
+	* feature.xml: Changed version to 2.2.1.
+
+2006-06-20  Kyu Lee  <klee@redhat.com>
+
+	* feature.xml: changed version to 2.1.0.
+
+2006-05-23  ifoox  <ifoox@redhat.com>
+
+	* feature.xml: Bump version to 2.0.4.
+
+2006-03-24  Igor Foox  <ifoox@redhat.com>
+
+	* feature.xml: Removed dependency on CDT, changed website references to
+	point at sourceware.org, version 2.0.3.
+
+2006-03-15  Igor Foox  <ifoox@redhat.com>
+
+	* feature.xml: Bump version to 2.0.2.
+
+2005-02-25  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* feature.xml: Updated plug-in versions
+
+
+2004-11-12  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* feature.xml: Updated copyright, license, update urls
+	Added license text
+
+2004-09-27  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* build.xml. Rebuilt from feature.xml
+	* feature.xml: Updated com.redhat.eclipse.changelog.core to 2.0.0
+	Updated feature.xml version.
+	Recomputed feature dependencies.
+
+2004-07-16  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* feature.xml: Upgrade version
+	Added dependencies. Changed provider name
+	Bumped plugin versions
+	* feature.properties: Added provider name
+
+2004-07-12  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* feature.xml change id to com.redhat.eclipse.changelog
+	* feature.xml: Change to changelog.core
+
+2004-07-09  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* build.xml: Migrate to 3.0. Regenerated
+	build.xml.
+
+2004-02-25  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* feature.xml : Added com.redhat.eclipse.changelog.doc
+	* build.xml: Added com.redhat.eclipse.changelog.doc
+
+2004-02-10  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* Initial Import
+
+
+
diff --git a/changelog/org.eclipse.linuxtools.changelog-feature/build.properties b/changelog/org.eclipse.linuxtools.changelog-feature/build.properties
new file mode 100644
index 0000000..d38c93e
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog-feature/build.properties
@@ -0,0 +1,9 @@
+bin.includes = feature.xml,\
+               epl-v10.html,\
+               feature.properties
+src.includes = feature.xml,\
+               feature.properties,\
+               build.properties,\
+               .classpath,\
+               .project,\
+               ChangeLog
diff --git a/changelog/org.eclipse.linuxtools.changelog-feature/epl-v10.html b/changelog/org.eclipse.linuxtools.changelog-feature/epl-v10.html
new file mode 100644
index 0000000..ed4b196
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog-feature/epl-v10.html
@@ -0,0 +1,328 @@
+<html xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
+<meta name=ProgId content=Word.Document>
+<meta name=Generator content="Microsoft Word 9">
+<meta name=Originator content="Microsoft Word 9">
+<link rel=File-List
+href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
+<title>Eclipse Public License - Version 1.0</title>
+<!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+  <o:Revision>2</o:Revision>
+  <o:TotalTime>3</o:TotalTime>
+  <o:Created>2004-03-05T23:03:00Z</o:Created>
+  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
+  <o:Pages>4</o:Pages>
+  <o:Words>1626</o:Words>
+  <o:Characters>9270</o:Characters>
+   <o:Lines>77</o:Lines>
+  <o:Paragraphs>18</o:Paragraphs>
+  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
+  <o:Version>9.4402</o:Version>
+ </o:DocumentProperties>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <w:WordDocument>
+  <w:TrackRevisions/>
+ </w:WordDocument>
+</xml><![endif]-->
+<style>
+<!--
+ /* Font Definitions */
+@font-face
+	{font-family:Tahoma;
+	panose-1:2 11 6 4 3 5 4 4 2 4;
+	mso-font-charset:0;
+	mso-generic-font-family:swiss;
+	mso-font-pitch:variable;
+	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
+ /* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{mso-style-parent:"";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p
+	{margin-right:0in;
+	mso-margin-top-alt:auto;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p.BalloonText, li.BalloonText, div.BalloonText
+	{mso-style-name:"Balloon Text";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:8.0pt;
+	font-family:Tahoma;
+	mso-fareast-font-family:"Times New Roman";}
+@page Section1
+	{size:8.5in 11.0in;
+	margin:1.0in 1.25in 1.0in 1.25in;
+	mso-header-margin:.5in;
+	mso-footer-margin:.5in;
+	mso-paper-source:0;}
+div.Section1
+	{page:Section1;}
+-->
+</style>
+</head>
+
+<body lang=EN-US style='tab-interval:.5in'>
+
+<div class=Section1>
+
+<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
+</p>
+
+<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
+THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
+REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+OF THIS AGREEMENT.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and<br clear=left>
+b) in the case of each subsequent Contributor:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+changes to the Program, and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+additions to the Program;</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
+such changes and/or additions to the Program originate from and are distributed
+by that particular Contributor. A Contribution 'originates' from a Contributor
+if it was added to the Program by such Contributor itself or anyone acting on
+such Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in conjunction
+with the Program under their own license agreement, and (ii) are not derivative
+works of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
+entity that distributes the Program.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
+claims licensable by a Contributor which are necessarily infringed by the use
+or sale of its Contribution alone or when combined with the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
+distributed in accordance with this Agreement.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
+receives the Program under this Agreement, including all Contributors.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+Subject to the terms of this Agreement, each Contributor hereby grants Recipient
+a non-exclusive, worldwide, royalty-free copyright license to<span
+style='color:red'> </span>reproduce, prepare derivative works of, publicly
+display, publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and object code
+form.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
+patent license under Licensed Patents to make, use, sell, offer to sell, import
+and otherwise transfer the Contribution of such Contributor, if any, in source
+code and object code form. This patent license shall apply to the combination
+of the Contribution and the Program if, at the time the Contribution is added
+by the Contributor, such addition of the Contribution causes such combination
+to be covered by the Licensed Patents. The patent license shall not apply to
+any other combinations which include the Contribution. No hardware per se is
+licensed hereunder. </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
+Recipient understands that although each Contributor grants the licenses to its
+Contributions set forth herein, no assurances are provided by any Contributor
+that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient
+for claims brought by any other entity based on infringement of intellectual
+property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility
+to secure any other intellectual property rights needed, if any. For example,
+if a third party patent license is required to allow Recipient to distribute
+the Program, it is Recipient's responsibility to acquire that license before
+distributing the Program.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
+Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement. </span></p>
+
+<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
+Program in object code form under its own license agreement, provided that:</span>
+</p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it complies with the terms and conditions of this Agreement; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+its license agreement:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+effectively excludes on behalf of all Contributors all liability for damages,
+including direct, indirect, special, incidental and consequential damages, such
+as lost profits; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
+states that any provisions which differ from this Agreement are offered by that
+Contributor alone and not by any other party; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
+states that source code for the Program is available from such Contributor, and
+informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
+
+<p><span style='font-size:10.0pt'>When the Program is made available in source
+code form:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it must be made available under this Agreement; and </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
+copy of this Agreement must be included with each copy of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
+copyright notices contained within the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
+originator of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution. </span></p>
+
+<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
+
+<p><span style='font-size:10.0pt'>Commercial distributors of software may
+accept certain responsibilities with respect to end users, business partners
+and the like. While this license is intended to facilitate the commercial use
+of the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes the
+Program in a commercial product offering, such Contributor (&quot;Commercial
+Contributor&quot;) hereby agrees to defend and indemnify every other
+Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
+costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
+legal actions brought by a third party against the Indemnified Contributor to
+the extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may participate
+in any such claim at its own expense.</span> </p>
+
+<p><span style='font-size:10.0pt'>For example, a Contributor might include the
+Program in a commercial product offering, Product X. That Contributor is then a
+Commercial Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance claims and
+warranties are such Commercial Contributor's responsibility alone. Under this
+section, the Commercial Contributor would have to defend claims against the
+other Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and distributing the
+Program and assumes all risks associated with its exercise of rights under this
+Agreement , including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs or
+equipment, and unavailability or interruption of operations. </span></p>
+
+<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
+THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
+
+<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
+or unenforceable under applicable law, it shall not affect the validity or
+enforceability of the remainder of the terms of this Agreement, and without
+further action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.</span> </p>
+
+<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
+against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with
+other software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the date
+such litigation is filed. </span></p>
+
+<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
+shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable
+period of time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive. </span></p>
+
+<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
+copies of this Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The Agreement
+Steward reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement Steward has
+the right to modify this Agreement. The Eclipse Foundation is the initial
+Agreement Steward. The Eclipse Foundation may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.</span> </p>
+
+<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
+State of New York and the intellectual property laws of the United States of
+America. No party to this Agreement will bring a legal action under this
+Agreement more than one year after the cause of action arose. Each party waives
+its rights to a jury trial in any resulting litigation.</span> </p>
+
+<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
+
+</div>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/changelog/org.eclipse.linuxtools.changelog-feature/feature.properties b/changelog/org.eclipse.linuxtools.changelog-feature/feature.properties
new file mode 100644
index 0000000..f00c528
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog-feature/feature.properties
@@ -0,0 +1,108 @@
+# features.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+featureProvider=Eclipse
+featureName=ChangeLog Management Tools (Incubation)
+featureDescription=The Changelog plug-in provides the ability to maintain and create GNU-style ChangeLogs from within Eclipse.
+copyright=Copyright 2004-2009 Red Hat, Inc.
+licenseURL=epl-v10.html
+license=\
+ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
+March 17, 2005\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse.org CVS\n\
+repository ("Repository") in CVS modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+Features may also include other Features ("Included Features"). Files named\n\
+"feature.xml" may contain a list of the names and version numbers of\n\
+Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+   - The top-level (root) directory\n\
+   - Plug-in and Fragment directories\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
+   - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Eclipse Update Manager, you must agree to a license ("Feature Update\n\
+License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties". Such Abouts,\n\
+Feature Licenses and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
+    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
\ No newline at end of file
diff --git a/changelog/org.eclipse.linuxtools.changelog-feature/feature.xml b/changelog/org.eclipse.linuxtools.changelog-feature/feature.xml
new file mode 100644
index 0000000..9e6f981
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog-feature/feature.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.linuxtools.changelog"
+      label="%featureName"
+      version="2.6.7.qualifier"
+      provider-name="%featureProvider">
+
+   <description url="http://www.eclipse.org/linuxtools">
+      %featureDescription
+   </description>
+
+   <copyright url="http://www.redhat.com">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <url>
+      <update label="Linux Tools Update Site" url="http://download.eclipse.org/technology/linuxtools/update"/>
+   </url>
+
+   <requires>
+      <import plugin="org.eclipse.team.ui"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.ui.editors"/>
+      <import plugin="org.eclipse.team.core"/>
+      <import plugin="org.eclipse.ui.navigator"/>
+      <import plugin="org.eclipse.compare"/>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
+      <import plugin="org.eclipse.core.runtime" version="2.1.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.linuxtools.changelog.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.changelog.doc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.changelog.cparser"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.changelog.parsers.java"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+</feature>
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/.classpath b/changelog/org.eclipse.linuxtools.changelog.core/.classpath
new file mode 100644
index 0000000..065ac06
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/.project b/changelog/org.eclipse.linuxtools.changelog.core/.project
new file mode 100644
index 0000000..399da33
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.changelog.core</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/.settings/org.eclipse.jdt.core.prefs b/changelog/org.eclipse.linuxtools.changelog.core/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..3b7fa83
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,83 @@
+#Thu Jan 15 01:39:03 CET 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=ignore
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/.svnignore b/changelog/org.eclipse.linuxtools.changelog.core/.svnignore
new file mode 100644
index 0000000..1578cb2
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/.svnignore
@@ -0,0 +1,4 @@
+bin
+temp.folder
+changelog.jar
+changelogsrc.zip
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/.template b/changelog/org.eclipse.linuxtools.changelog.core/.template
new file mode 100644
index 0000000..35895fa
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/.template
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+   <p><b>Generated content</b></p><p>This plug-in has been created using content templates. The following templates were used:</p>
+   <li style="text" value="1."><b>Sample Popup Menu.</b>This template adds a submenu and a new action to a target object's popup menu.  This contribution will appear in all viewers where an object of the specified type is selected.</li>
+   <p/><p><b>Tips on working with this plug-in project</b></p><li>For the view of the new plug-in at a glance, go to the <img href="pageImage"/><a href="OverviewPage">Overview</a>.</li><li>You can test the contributions of this plug-in by launching another instance of the workbench. On the <b>Run</b> menu, click <b>Run As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.run">Run-time Workbench</a> from the available choices.</li><li>You can add more functionality to this plug-in by adding extensions using the <a href="action.newExtension">New Extension Wizard</a>.</li><li>The plug-in project contains Java code that you can debug. Place breakpoints in Java classes. On the <b>Run</b> menu, select <b>Debug As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.debug">Run-time Workbench</a> from the available choices.</li>
+</form>
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/ChangeLog b/changelog/org.eclipse.linuxtools.changelog.core/ChangeLog
new file mode 100644
index 0000000..44e7312
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/ChangeLog
@@ -0,0 +1,1243 @@
+2010-03-25  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #306247
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java (outputMultipleEntryChangeLog): Make
+	a check for inline formatter before searching for a ChangeLog file.  If the file does not have an inline formatter,
+	do not create a ChangeLog.
+
+2010-03-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #304185
+	* META-INF/MANIFEST.MF: Change dependency on org.eclipse.core.resources to not have specific versions.
+	* src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogContainerContentProvider.java (getChildren): Add specific
+	check for ChangeLogRootContainer which is no longer an IContainer.
+	* src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogContainerSelectionGroup.java (createTreeViewer): Change
+	call to ChangeLogRootContainer constructor which now takes the project as input.  
+	* src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogRootContainer.java (ChangeLogRootContainer): Do not
+	implement IContainer which is not meant to be implemented externally and instead just create a simple class.  Also
+	take the project as a constructor parameter. 
+	* src/org/eclipse/linuxtools/changelog/core/ChangeLogPreferencesPage.java (performOk): Add deprecation annotation to
+	remove warning. 
+
+2010-02-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #299974
+	* src/org/eclipse/linuxtools/changelog/core/actions/SourceEditorInput.java: New file.
+	* src/org/eclipse/linuxtools/changelog/core/actions/StorageEditorInput.java: New file.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PatchFile.java (addLineRange): New
+	parameter that reveals whether patch is to local file or ancestor.
+	(getStorage): New method.
+	(setStorage): Ditto.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PatchRangeElement.java (equals): Modified
+	to compare local change field instead of patch field which is never used and has been
+	removed. 
+	(PatchRangeElement): Add new boolean which is set to true if patch is to local file.
+	Remove setting of patch text which is never used.
+	(isLocalChange): New method.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java (guessFunctionNames): Add
+	support for finding function names for changes to ancestor file which will be backed only by storage
+	and not a local file.
+	(MyStorageDocumentProvider): New private class.
+	(getChangedLines): Add changes to ancestor file and save the storage we get back to later
+	guess function names.
+
+2010-01-27  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/changelog/core/ChangelogPreferenceInitializer.java: New file.
+	* plugin.xml: Register preferenceInitializer.
+	* src/org/eclipse/linuxtools/changelog/core/ChangelogPlugin.java: Remove parts that belong to the preference initializer. 
+	* src/org/eclipse/linuxtools/changelog/core/ChangeLogPreferencesPage.java (createTextField): Don't register modify listener.
+	(getHostName): Removed.
+	(getUserEmail): Removed.
+	(getUserName): Removed.
+	(getUserRealName): Removed.
+	(init): Do not initialize properties.
+	(initializeDefaultPreferences): Removed.
+	(modifyText): Removed.
+	(widgetDefaultSelected): Removed.
+	(widgetSelected): Removed.
+		 
+2010-01-27  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/changelog/core/editors/GNUFileEntryDamagerRepairer.java (getDamageRegion): Add missing @Override.
+	(createPresentation): Remove dead variables.
+	* src/org/eclipse/linuxtools/changelog/core/editors/GNUPartitionScanner.java (nextToken): Add missing @Override.
+	* src/org/eclipse/linuxtools/changelog/core/editors/MultilineRuleDamagerRepairer.java (getDamageRegion): Likewise.
+
+2009-12-22  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Fix o.e.c.resources bundle version range.
+
+2009-12-18  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Set bundle version constraint on o.e.c.resources.
+	* src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogRootContainer.java:
+	Revert 3.6-only changes on trunk.
+
+2009-12-17  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogRootContainer.java (setDerived): Stub out inherited methods. 
+	(isGroup): Likewise.
+	(hasFilters): Likewise. 
+	(getFilters): Likewise.
+	(createFilter): Likewise.
+	(removeFilter): Likewise.
+
+2009-11-11  Charley Wang  <chwang@redhat.com>
+
+	* src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogRootContainer.java: Resolve warnings about generic type inferral. All methods return null, in any case.
+	* src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogAction.java: Add check in getDocumentLocation to fetch the relevant page of a multipage editor.
+
+2009-11-10  Roland Grunberg  <rgrunber@redhat.com>
+	
+	Resolves #256182
+	* src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogContainerContentProvider.java: New file.
+	* src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogContainerSelectionDialog.java:
+		New file. Use CLContainerSelectionGroup.
+	* src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogContainerSelectionGroup.java:
+		New file. Use CLContainerContentProvider.
+	* src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogRootContainer.java:
+		New file. An IContainer whose only member is some IProject.
+	* src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogAction.java:
+		Use CLContainerSelectionDialog to suggest folder locations.
+	* src/org/eclipse/linuxtools/changelog/core/strings.properties:
+		Externalize strings in CLContainerSelectionGroup, CLContainerSelectionDialog
+
+2009-11-06  Charley Wang  <chwang@redhat.com>
+
+	* src/org/eclipse/linuxtools/changelog/core/editors/GNUElementScanner.java:
+	(GNUElementScanner): Change the rule for colouring of ( ) elements so that the colour ends on the next ), rather than terminating on ):
+
+2009-08-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #285866
+	* plugin.properties: Change provider to Eclipse.
+	* META-INF/MANIFEST.MF: Make Provider use %providerName property.
+
+2009-07-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #285208
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareCommitAction.java (loadClipboard): 
+	Handle the case whereby the newest entry has the same date stamp and changer id as the
+	subsequent entry.
+
+2009-04-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump version up to 2.6.7.
+
+2009-04-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java (getChangedLines): 
+	Verify we have an IFile resource before treating it as an IFile resource.
+
+2009-03-16  Elliott Baron  <ebaron@redhat.com>
+
+	Resolves #268224.
+
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java (prepareChangeLog): 
+	Check that resource changed is a file before adding it to the changed list.
+
+2009-03-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #267281
+	
+	* src/org/eclipse/linuxtools/changelog/core/ChangeLogWriter.java (setEntryFilePath): Replace editor
+	tokenization characters such as blank, parentheses, and colon with escaped characters. 
+	* src/org/eclipse/linuxtools/changelog/core/editors/GNUHyperlinkDetector.java (detectHyperlinks):
+	Resolve any escaped characters in the file name so the file can be opened. 
+
+2009-02-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #264343
+	
+	* src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogDocumentSetupParticipant.java: New file.
+	* src/org/eclipse/linuxtools/changelog/core/editors/GNUFileEntryDamagerRepairer.java: New file.
+	* src/org/eclipse/linuxtools/changelog/core/editors/GNUFileEntryRule.java: New file.
+	* src/org/eclipse/linuxtools/changelog/core/editors/GNUPartitionScanner.java: New file.
+	* src/org/eclipse/linuxtools/changelog/core/editors/MultilineRuleDamagerRepairer.java: New file.
+	* src/org/eclipse/linuxtools/changelog/core/IEditorChangeLogContrib2.java: New file.
+	* build.properties: Add schema directory.
+	* plugin.xml: Add DocumentSetupParticipant extension to point to ChangeLogDocumentSetupParticipant.
+	* src/org/eclipse/linuxtools/changelog/core/editors/GNUEditorConfiguration.java (getPresentationReconciler): 
+	(setup): New method to set up partitioning.  From IEditorChangeLogContrib2 interface.
+	(getConfiguredDocumentPartitioning): Return CHANGELOG_PARTITIONING string.
+	(getConfiguredContentTypes): Return the various content types of GNU Partition scanner.
+	* src/org/eclipse/linuxtools/changelog/core/editors/GNUElementScanner.java (getOffset): 
+	(getDefaultToken): New.
+	(GNUElementScanner): Add new GNUFileEntryRule to find file entries.
+	* src/org/eclipse/linuxtools/changelog/core/editors/GNUHyperlinkDetector.java (detectHyperlinks): Change
+	to set range to current partition to allow for multiple file entries in a single ChangeLog entry.
+	Also be prepared to strip off trailing colon if needed. 
+
+2009-01-21  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* plugin.xml: Enable Ctrl+Alt+P to work in compare window.
+
+2009-01-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #261694
+	
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java (prepareChangeLog): When
+	looping through list of changes at end of method, check for null entries which will exist for all
+	changes that were recorded to the ChangeLog itself.
+
+2009-01-19  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogAction.java 
+	(.execute): Add missing @Override.
+	* src/org/eclipse/linuxtools/changelog/core/actions/FormatChangeLogAction.java 
+	(run): Likewise.
+	* src/org/eclipse/linuxtools/changelog/core/actions/InsertChangeLogKeyHandler.java 
+	(isHandled): Likewise.
+	(isEnabled): Likewise.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PatchFile.java 
+	(equals): Likewise.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PatchRangeElement.java 
+	(equals): Likewise.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java 
+	(MyDocumentProvider.createDocument): Likewise.
+	(PrepareChangeLogAction): Likewise.
+	(MyDocumentProvider): Likewise.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangelogKeyHandler.java 
+	(getWorkbench): Removed not needed. 
+	(isHandled): Add missing @Override.
+	(run): Add missing @Override.
+	(.run): Add missing @Override.
+	(isEnabled): Add missing @Override.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareCommitHandler.java 
+	(.run): Likewise.
+	* src/org/eclipse/linuxtools/changelog/core/ChangelogPlugin.java 
+	(stop): Likewise.
+	(start): Likewise.
+	(initializeDefaultPreferences): Likewise.
+	* src/org/eclipse/linuxtools/changelog/core/ChangeLogPreferencesPage.java 
+	(performOk): Likewise.
+	(createContents): Likewise.
+	(doGetPreferenceStore): Likewise.
+	(performDefaults): Likewise.
+	* src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogEditor.java 
+	(dispose): Removed - it simply calls super. 
+	(editorContextMenuAboutToShow): Add missing @Override.
+	* src/org/eclipse/linuxtools/changelog/core/editors/GNUEditorConfiguration.java 
+	(getPresentationReconciler): Likewise.
+	(getHyperlinkDetectors): Likewise.
+	(getConfiguredContentTypes): Likewise.
+	(getContentFormatter): Likewise.
+	(getHyperlinkPresenter): Likewise.
+	* src/org/eclipse/linuxtools/changelog/core/editors/GNUElementScanner.java 
+	(GNUElementScanner): Fix javadoc. 
+	* src/org/eclipse/linuxtools/changelog/core/editors/GNUHyperlinkDetector.java 
+	(GNUHyperlinkDetector): Likewise.
+	* src/org/eclipse/linuxtools/changelog/core/IEditorChangeLogContrib.java 
+	(setTextEditor): Likewise.
+	* src/org/eclipse/linuxtools/changelog/core/IParserChangeLogContrib.java 
+	(parseCurrentFunction): Likewise.
+	* src/org/eclipse/linuxtools/changelog/core/LineComparator.java 
+	(TrailingLineFeedDetector.read): Add missing @Override.
+	* src/org/eclipse/linuxtools/changelog/core/Messages.java 
+	(Messages): Fix documentation.
+	(getString): Likewise.
+	* src/org/eclipse/linuxtools/changelog/core/ui/ChangeLogActionProvider.java 
+	(ChangeLogActionProvider): Removed - not needed. 
+	(fillActionBars): Add missing @Override.
+	(init): Likewise.
+	(.run): Likewise.
+	(fillContextMenu): Likewise.
+	 
+2009-01-19  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* .settings/org.eclipse.jdt.core.prefs: Enable more warnings.
+
+2009-01-19  Alexander Kurtakov  <akurtako@redhat.com>
+	Fix #261379.
+	* src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogDocumentProvider.java 
+	(getDocument): Make it extend TextFileDocumentProvider.
+
+2009-01-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #260722
+	
+	* META-INF/MANIFEST.MF: Add .qualifier to version and bump up to 2.6.5.
+	* src/org/eclipse/linuxtools/changelog/core/ChangeLogExtensionManager.java (getFormatterContributor): 
+	Reset formatterConfigElementToUse each time to null.
+
+2009-01-13  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareCommitAction.java 
+	(loadClipboard): Fix NPE when project is not shared (#260719).
+
+2009-01-07  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* src/org/eclipse/linuxtools/changelog/core/actions/InsertChangeLogKeyHandler.java 
+	(InsertChangeLogKeyHandler): Remove empty lines.
+	(execute): Likewise.
+	(run): Likewise.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PatchFile.java 
+	(getRanges): Likewise.
+	(appendTxtToLastRange): Likewise.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java 
+	(prepareChangeLog): Use foreach.
+	(guessFunctionNames): Likewise.
+	(extractSynchronizeModelInfo): Likewise.
+	(outputMultipleEntryChangeLog): Likewise.
+	(getChangedLines): Likewise.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangelogKeyHandler.java 
+	(execute): Likewise.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareCommitAction.java 
+	(loadClipboard): Likewise.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareCommitHandler.java 
+	(execute): Remove empty lines.
+	(addHandlerListener): Likewise.
+
+2008-12-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump version to 2.6.4.
+
+2008-11-21  Andrew Overholt  <overholt@redhat.com>
+
+	Bug 253016
+	* src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogAction.java
+	(createChangeLog): Don't refresh entire workspace when creating initial
+	ChangeLog.
+
+2008-11-14  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	Generify.
+	* META-INF/MANIFEST.MF: Bump BREE to 1.5.
+	* src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogAction.java
+	(returnQualifedEditor): Remove unused method.
+	(getChangelog): Remove unneeded cast.
+	(getChangelogForRemovePath): Likewise.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PatchFile.java
+	(appendTxtToLastRange): Remove unneeded cast.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PatchFileComparator.java
+	(compare): Generify.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PatchRangeElement.java
+	(equals): Remove unneeded cast.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java
+	(prepareChangeLog): Generify.
+	(guessFunctionNames): Likewise.
+	(extractSynchronizeModelInfo): Likewise.
+	(getResourceMapping): Remove unused method.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangelogKeyHandler.java
+	(execute): Remove unneeded variables.
+	(getResourceMapping): Remove unused method.
+	* src/org/eclipse/linuxtools/changelog/core/ChangeLogExtensionManager.java
+	(getFormatterContributor): Generify.
+	* src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogFormattingStrategy.java
+	(format): Likewise.
+	* src/org/eclipse/linuxtools/changelog/core/editors/ColorManager.java
+	(getColor): Likewise.
+	(dispose): Likewise.
+	* src/org/eclipse/linuxtools/changelog/core/editors/GNUHyperlinkDetector.java: Remove deprecated usage.
+	* src/org/eclipse/linuxtools/changelog/core/LineComparator.java (LineComparator): Generify.
+
+2008-11-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Fixes #254665
+
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareCommitAction.java (loadClipboard): Fix in the
+	case where editor input is IFileEditorInput and ResourceMapping cannot be located.
+
+2008-11-07  Alexander Kurtakov  <akurtakov@gmail.com>
+	Fixes #179541.
+	* plugin.xml: Use BasicTextEditorActionContributor contributor for the editor extension
+	point.
+
+2008-11-06  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* plugin.xml: Add key binding for compareEditorScope.
+	* src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogAction.java
+	(getDocumentLocation): Add support for getting location from ICompareInput.
+
+2008-11-03  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add Bundle-ActivationPolicy.
+
+2008-10-20  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Update version to 2.6.3.
+
+2008-06-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.properties: Add strings for gnuFormatter and gnuEditorConfig names.
+	* plugin.xml: Specify names from properties file for gnuFormatter and gnuEditorConfig.
+	* src/org/eclipse/linuxtools/changelog/core/ChangelogPlugin.java (initializeDefaultPreferences):
+	* src/org/eclipse/linuxtools/changelog/core/ChangeLogPreferencesPage.java (storeValues): Verify
+	there is a valid selection before attempting to access it.
+	(initializeDefaultPreferences): Use property strings when looking for default gnuFormatter
+	and default gnuEditorConfig names.
+	* src/org/eclipse/linuxtools/changelog/core/strings.properties: Add corresponding strings for
+	gnuFormatter and gnuEditorConfig for code to use as comparison.
+
+2008-01-22  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* .classpath: Fix JSRE requirement.
+	* plugin.xml: Add "Prepare ChangeLog in Editor" action and key bindings to allow
+	Ctrl+Alt+P to work in a text editor.
+	* src/org/eclipse/linuxtools/changelog/core/ChangelogPlugin.java (initializeDefaultPreferences):
+	Don't try and translate gnuFormatter or gnuEditorConfig as these are actual names used in
+	the extensions in plugin.xml.
+
+2008-01-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java:
+	Update copyright.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangelogKeyHandler.java
+	(execute): Return if no selected project exists.
+	* src/org/eclipse/linuxtools/changelog/core/ChangelogPlugin.java
+	(initializeDefaultPreferences): Use new getUserEmail method.
+	* src/org/eclipse/linuxtools/changelog/core/ChangeLogPreferencesPage.java
+	(getUserRealName): Try and use environment variable if available.
+	(getUserEmail): New method.
+	(initializeDefaultPreferences): Use new getUserEmail method.
+
+2008-01-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.properties: Add new message for Prepare ChangeLog menu item.
+	* plugin.xml: Add "Prepare ChangeLog" action to project menu.
+
+2008-01-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Bugzilla #214684
+	* META-INF/MANIFEST.MF: Add specific minimum versions for plugins that are
+	required by the Java parser. This allows the Java parser to omit these plugin
+	dependencies and use the ones in this, the host plugin.
+	* plugin.xml: Remove locationContribution extension which does not exist.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java:
+	Remove unused imports.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangelogKeyHandler.java
+	(execute): Add support for editors that are editing IResources.
+
+2008-01-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Update version to 2.6.1.
+
+2007-12-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* MANIFEST.MF: Remove CVS dependencies.
+	* src/org/eclipse/linuxtools/changelog/core/ChangelogPlugin.java: Add new static
+	PLUGIN_ID.
+	* src/org/eclipse/linuxtools/changelog/core/LineComparator.java: New file.
+	* src/org/eclipse/linuxtools/changelog/core/ChangeLogExtensionManager.java: Add
+	NLS comments.
+	* src/org/eclipse/linuxtools/changelog/core/ChangeLogWriter.java: Ditto.
+	* src/org/eclipse/linuxtools/changelog/core/strings.properties: Add new messages
+	for NLS support.
+	* src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogEditor.java: NLS
+	string support.
+	* src/org/eclipse/linuxtools/changelog/core/ui/ChangeLogActionProvider.java: Add
+	NLS message support.
+	(getCompareAdapter): Renamed from getCompareAdpater.
+	* src/org/eclipse/linuxtools/changelog/core/formatters/GNUFormat.java: Add NLS
+	support.
+	(mergeChangelog): Fix test for existing entry to include the "*" qualifier so
+	that we don't get a false positive when dealing with short filenames that might
+	match the end of another entry.
+	* src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogAction.java:
+	(createChangeLog): Use Messages to get string.
+	(getChangelogForRemovePath): New method to get ChangeLog for a removed file.
+	(loadPreferences): Add NLS comment.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PatchFile.java: Add
+	removedFile boolean. Add constructor that takes an IPath.
+	(isRemovedFile, setRemovedFile): New methods.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PatchFileComparator.java:
+	New file.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java:
+	(doRun): Use Messages to get monitor message.
+	(getResourceMappings): Removed.
+	(guessFunctionNames): String cleanups.
+	(outputMultipleEntryChangeLog): Add removed file support. Add support for no
+	guessed function names. Remove variation of this method that takes all String
+	arguments.
+	(parseStandardPatch): Removed.
+	(parseCurrentFunctionAtOffset): Clean up strings.
+	(preapreChangeLog): Renamed to...
+	(prepareChangeLog): this.. As well, use RepositoryProvider to get set of
+	SyncInfos for changes instead of using resource list. As well, create patch file
+	manually using line comparators instead of calling StringDiffOperation which is
+	CVS-specific and uses internal classes. Sort the types of changes into new,
+	removed, and changed and within each category perform alphabetic sort.
+	(extractSynchronizeModelInfo): New method to extract all elements of the
+	Synchronize tree via an ISynchronizeModelInfo object.
+	(getChangedLines): New method to figure out what lines have changed in local
+	resource.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangelogKeyHandler.java:
+	Change to superclass ChangeLogAction and also make it IWorkbenchWindowDelegate.
+	(execute): Change to get current selection in current window. See if selection
+	can be used to either get an IResource directly, via IAdapter interface, or
+	through an ISynchronizeModelElement. If not, look to see if the SynchronizeView
+	is open and see if a resource is selected. Do not use current editor, nor bring
+	up choose project dialog.
+	(init, getWorkbenchWindow, getActiveWorkbenchShell): New methods.
+	(run): Ditto.
+	(PrepareChangeLog): New constructor.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareCommitAction.java
+	(doRun): String clean-up.
+	(extractNewlines): Removed.
+	(loadClipboard): Use line comparators to generate patch for ChangeLog instead of
+	using StringDiffOperation class.
+	* src/org/eclipse/linuxtools/changelog/core/actions/StringDiffOperation.java:
+	Remove.
+
+2007-08-16  Andrew Overholt  <overholt@redhat.com>
+
+	* build.properties: Change to be jarred plugin and not contain changelog.jar.
+	* META-INF/MANIFEST.MF: Change from changelog.jar to .. Set required EE. Bump to
+	2.5.1.
+
+2007-08-07  klee  <klee@redhat.com>
+
+	* META-INF/MANIFEST.MF: Fixed requirements.
+
+2007-07-31  Kyu Lee  <klee@redhat.com>
+
+	* META-INF/MANIFEST.MF: Version bump to 2.5.0.
+	* src/org/eclipse/linuxtools/changelog/core/actions/FormatChangeLogAction.java:
+	Removed unused imports.
+	* src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogEditor.java: Ditto.
+	* src/org/eclipse/linuxtools/changelog/core/ui/ChangeLogActionProvider.java:
+	Ditto.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PatchFile.java: Added
+	support for new files.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java:
+	Ditto. + Removed internal class reference.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangelogKeyHandler.java:
+	Removed internal class reference.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareCommitAction.java:
+	Ditto.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareCommitHandler.java:
+	Removed internal class reference.
+	* src/org/eclipse/linuxtools/changelog/core/actions/StringDiffOperation.java:
+	Added a constructor with default options for DiffOperation.
+	* src/org/eclipse/linuxtools/changelog/core/ChangeLogWriter.java: Added support
+	for inserting default content to changelog entry.
+	* src/org/eclipse/linuxtools/changelog/core/formatters/GNUFormat.java: Ditto.
+	* src/org/eclipse/linuxtools/changelog/core/IFormatterChangeLogContrib.java:
+	Ditto.
+
+2007-06-25  Kyu Lee  <klee@redhat.com>
+
+	* src/org/eclipse/linuxtools/changelog/core/actions/StringDiffOperation.java
+	(StringDiffOperation): Added support for Eclipse 3.3
+	* META-INF/MANIFEST.MF: Version bump to 2.4.1 and add dependency for Eclipse
+	3.3.
+
+2007-05-09  Kyu Lee  <klee@redhat.com>
+
+	* src/org/eclipse/linuxtools/changelog/core/parsers/JavaParser.java: Removed.
+	Now separate javaparser plugin will provide parsing.
+	* src/org/eclipse/linuxtools/changelog/core/parsers/CParser.java: Ditto.
+	* src/org/eclipse/linuxtools/changelog/core/parsers/PythonParser.java: Ditto.
+	* src/org/eclipse/linuxtools/changelog/core/parsers/CompareParser.java: Ditto.
+	* src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java:
+	Removed JDT import for JavaModelException which we don't really need.
+	* META-INF/MANIFEST.MF: Removed JDT and CDT dependency because now Java/C
+	parsers are in separate plug-ins.
+	* plugin.xml: Version bump to 2.4.0 and remove parser extensions.
+
+2007-05-04  Andrew Overholt  <overholt@redhat.com>
+
+	Bug #185598
+	* META-INF/MANIFEST.MF: Add "Incubation" to Bundle-Name.
+
+2007-04-10  Kyu Lee  <klee@redhat.com>
+
+	* plugin.xml: Igor's patch to renamespace old com.redhat strings bug #181497.
+	* src/org/eclipse/linuxtools/changelog/core/parsers/JavaParser.java: Removed use
+	of internal classes.
+
+2007-03-28  Remy Chi Jian Suen  <remy.suen@gmail.com>
+
+	* src/org/eclipse/linuxtools/changelog/core/parsers/JavaParser.java: Add support
+	for identifying static initializing blocks per bug #179549.
+
+2007-03-27  Ben Konrath  <bkonrath@redhat.com>
+
+	* src/org/eclipse/linuxtools/changelog/core/editors/GNUHyperlinkDetector.java:
+	Don't use internal classes.
+	* .svnignore: Rename from .cvsignore.
+
+2007-03-26  Kyu Lee  <klee@redhat.com>
+
+	* META-INF/MANIFEST.MF: Added.
+	* plugin.xml: Migrated require and other declarations to MANIFEST.MF. Fixed
+	extension declarations to work with new namespace.
+
+2007-01-24  Kyu Lee  <klee@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/parsers/PythonParser.java: Changed
+	copyright to Phil Muldoon.
+	* src/com/redhat/eclipse/changelog/core/parsers/JavaParser.java: Ditto.
+	* src/com/redhat/eclipse/changelog/core/parsers/CParser.java: Ditto.
+	* src/com/redhat/eclipse/changelog/core/parsers/CompareParser.java: Ditto.
+	* src/com/redhat/eclipse/changelog/core/formatters/GNUFormat.java: Ditto.
+	* src/com/redhat/eclipse/changelog/core/actions/InsertChangeLogKeyHandler.java:
+	Ditto.
+	* src/com/redhat/eclipse/changelog/core/IParserChangeLogContrib.java: Ditto.
+	* src/com/redhat/eclipse/changelog/core/IFormatterChangeLogContrib.java: Ditto.
+	* src/com/redhat/eclipse/changelog/core/ChangeLogPreferencesPage.java: Ditto.
+	* src/com/redhat/eclipse/changelog/core/ChangelogPlugin.java: Ditto.
+
+2007-01-23  Kyu Lee  <klee@redhat.com>
+
+	* : All .java files has been updated with new copyright/license information.
+
+2007-01-22  Kyu Lee  <klee@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/actions/PrepareChangeLogAction.java:
+	Error checking.
+	* src/com/redhat/eclipse/changelog/core/actions/PatchRangeElement.java: Minor
+	design changes.
+	* src/com/redhat/eclipse/changelog/core/actions/PatchFile.java: Ditto.
+	* src/com/redhat/eclipse/changelog/core/actions/InsertChangeLogKeyHandler.java:
+	Files without proper parsers to guess function names generates changelog entry.
+	* plubin.xml: Bumped version to 2.3.4.
+
+2007-01-11  Kyu Lee  <klee@redhat.com>
+
+	* *.java: Updated Copyright notices and license information on all files.
+
+2006-11-16  Kyu Lee  <klee@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/actions/ChangeLogAction.java
+	(getDocumentLocation): Improved error handling. Returns empty string when
+	current editor/workspace is not set properly.
+
+2006-11-15  Kyu Lee  <klee@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/actions/PrepareChangelogKeyHandler.java
+	(execute): Prepare ChangeLog defaults to currently-selected project. BZ#214430.
+
+2006-11-13  Kyu Lee  <klee@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/actions/PrepareCommitAction.java New
+	class for implementation of filling clipboard with changes in ChangeLog.
+	* src/com/redhat/eclipse/changelog/core/actions/PrepareCommitHandler.java New
+	class that handles keybinding.
+	* src/com/redhat/eclipse/changelog/core/editors/ChangeLogEditor.java
+	(editorContextMenuAboutToShow): Addes Fomratter action to context menu.
+	(ChangeLogEditor): Ditto.
+	* plugin.xml: Keybindings for changelog formatter and prepare commit added.
+
+2006-10-13  Kyu Lee  <klee@redhat.com>
+
+	* plugin.xml: Bump to version 2.3.3.
+
+2006-10-06  Kyu Lee  <klee@redhat.com>
+
+	* plugin.xml: Rename of KeyAction class to InsertChangeLogKeyHandler.
+	* src/com/redhat/eclipse/changelog/core/ChangeLogWriter.java : Debug output.
+	* src/com/redhat/eclipse/changelog/core/actions/ChangeLogAction.java : Clean up.
+	* src/com/redhat/eclipse/changelog/core/actions/InsertChangeLogKeyHandler.java :
+	Replaces KeyAction.java.
+	* src/com/redhat/eclipse/changelog/core/actions/KeyAction.java : Removed.
+	Replaced by InsertChangeLogKeyHandler.java.
+	* src/com/redhat/eclipse/changelog/core/actions/PrepareChangeLogAction.java :
+	Clean up.
+	* src/com/redhat/eclipse/changelog/core/actions/PrepareChangelogKeyHandler.java
+	: Clean up.
+	(execute): Opens resource selection window to let users choose files that will
+	be used in prepare changelog feature.
+	* src/com/redhat/eclipse/changelog/core/ui/ChangeLogActionProvider : Clean up.
+
+2006-10-03  Kyu Lee  <klee@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/ChangeLogWriter.java : Added.
+	* src/com/redhat/eclipse/changelog/core/actions/ChangeLogAction.java:
+	(insertChangelog): Removed. Refactored to a new class ChangeLogWriter.
+	* src/com/redhat/eclipse/changelog/core/actions/KeyAction.java:
+	(run): Uses new ChangeLogWriter class.
+	* src/com/redhat/eclipse/changelog/core/actions/PrepareChangeLogAction.java:
+	(outputMultipleEntryChangeLog): Uses new ChangeLogWriter class.
+
+2006-09-29  Kyu Lee  <klee@redhat.com>
+
+	* plugin.xml: Added prepare changelog key binding(not implemented yet). Bumped
+	version to 2.3.2.
+	* src/com/redhat/eclipse/changelog/core/ui/ChangeLogActionProvider.java: Some
+	cleanup.
+	* src/com/redhat/eclipse/changelog/core/actions/PrepareChangeLogAction.java:
+	(parseCurrentFunctionAtOffset): Modified to use new extension manager.
+	* src/com/redhat/eclipse/changelog/core/actions/KeyAction.java : Implemented new
+	abstract methods.
+	(run): Runs super's run instead.
+	* src/com/redhat/eclipse/changelog/core/actions/ChangeLogAction.java
+	(run): Uses prepareChangelog instead.
+	(reportErr): New method for reporting errors.
+	(insertChangelog): More generalized, clean, intuitive way of inserting
+	changelog.
+	(getEntryFilePath): Returns file path of changelog entry.
+	(getEditorName): Returns name of responsible editor for file specified in entry.
+	(parseFunctionName): Guesses current function name with given parser from
+	extension point.
+	(getChangelog): Finds/creates Changelog file.
+	* src/com/redhat/eclipse/changelog/core/actions/PrepareChangelogKeyHandler.java:
+	New Class reponsible for binding key to prepare changelog action.
+	* src/com/redhat/eclipse/changelog/core/ChangeLogExtensionManager.java : New
+	Class that manages extensions of changelog.
+
+2006-09-18  Kyu Lee  <klee@redhat.com>
+
+	* plugin.xml: Bump version to 2.3.1.
+	* src/com/redhat/eclipse/changelog/core/actions/KeyAction.java
+	(run): Handles exception when no editor is open.
+
+2006-09-14  Kyu Lee  <klee@redhat.com>
+
+	* plugin.xml: Bump version to 2.3.0 to differentiate with 2.2.X. Fixed key
+	binding.
+
+2006-09-07  Igor Foox  <ifoox@redhat.com>
+
+	* plugin.xml: Change definition of
+	com.redhat.eclipse.changelog.core.formatterContribution extension to new format.
+	* src/com/redhat/eclipse/changelog/core/ChangeLogPreferencesPage.java
+	(populateFormatList): Change the logic to not add in-file formatters to the
+	preference list.
+	* schema/formatterContribution.exsd: Create new, more extensible, format for the
+	extension, as well as documentation.
+	* src/com/redhat/eclipse/changelog/core/actions/KeyAction.java: Change to work
+	with new ChangeLogAction.runParserContributors().
+	* src/com/redhat/eclipse/changelog/core/actions/PrepareChangeLogAction.java
+	(outputMultipleEntryChangeLog): Likewise.
+	* src/com/redhat/eclipse/changelog/core/actions/ChangeLogAction.java
+	(runFormatterContributor): Change to differentiate between in-file and external
+	formatters and handle them accordingly. Also add caching of formatters so they
+	would not get looped over every time the action gets invoked.
+	(getDocumentLocation): Refactor to use getDocumentIFile().
+	(getDocumentIFile): New method.
+	(setChangeLogFile): Likewise.
+	(addChangeLogEntry): Likewise.
+	(createChangeLog): Formatting fixes.
+	(LoadPreferences): Remove redundant setting of pref_ChangeLogName.
+
+2006-09-01  Kyu Lee  <klee@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/parsers/CompareParser.java
+	(parseCurrentFunction): Currently not supported.
+	* plugin.xml: Bump version to 2.2.3 for FC6-Test3.
+
+2006-08-30  Kyu Lee  <klee@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/actions/GenerateDiffFile.java Removed.
+	* src/com/redhat/eclipse/changelog/core/actions/StringDiffOperation.java
+	(EMPTY_DIFF): Constant inherited from removed class GenerateDiffFile.
+	* plugin.xml: org.eclipse.team.cvs.core version requirement set to >=3.2.0.
+	* src/com/redhat/eclipse/changelog/core/actions/PrepareChangeLogAction.java
+	(preapreChangeLog): Adds new files to prepare changelog. RHBug#203438.
+	(parseStandardPatch): When ChangeLog was part of a file path prepareChangelog
+	ignored that file, but now it only ignores a file named 'ChangeLog'.
+
+2006-08-21  Kyu Lee  <klee@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/actions/KeyAction.java: Cleaned.
+	* src/com/redhat/eclipse/changelog/core/editors/ChangeLogFormattingStrategy.java
+	(format): Added Content formatting feature.
+
+2006-08-04  Kyu Lee  <klee@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/parsers/PythonParser.java: Removed
+	unused code due to deprecated method in 3.2.
+	* plugin.xml: Cleaned.
+	* src/com/redhat/eclipse/changelog/core/parsers/CompareParser.java
+	(parseCurrentFunction): Removed unused code.
+	* src/com/redhat/eclipse/changelog/core/editors/GNUElementScanner.java
+	(GNUElementScanner): More strick coloring for method names.
+	* src/com/redhat/eclipse/changelog/core/ui/ChangeLogActionProvider.java Removed
+	unused imports.
+	(getResourceMappings, getResourceMapping): Removed unused code.
+
+2006-08-03  Kyu Lee  <klee@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/editors/GNUEditorConfiguration.java
+	(getContentFormatter): Added. Adds context formatter to changelog editor.
+	* src/com/redhat/eclipse/changelog/core/editors/ChangeLogFormattingStrategy.java:
+	Added. Actual implementation that formats text.
+	* src/com/redhat/eclipse/changelog/core/editors/ChangeLogEditor.java
+	(editorContextMenuAboutToShow): Added. Configures changelog editor context
+	menus.
+	* src/com/redhat/eclipse/changelog/core/actions/FormatChangeLogAction.java:
+	Added. Action that formats changelog.
+
+2006-08-01  Kyu Lee  <klee@redhat.com>
+
+	* plugin.xml: Changed version to 2.2.2.
+	* src/com/redhat/eclipse/changelog/core/actions/GenerateDiffFile.java: Removed
+	unused imports.
+	* src/com/redhat/eclipse/changelog/core/actions/KeyAction.java
+	(KeyAction): Constructor creates empty actin menu title.
+
+2006-07-31  Kyu Lee  <klee@redhat.com>
+
+	* plugin.xml: Instead of using objectContribution to add action menu, now uses
+	Action Provider for Common Navigator Framework in Eclipse 3.2.
+	* src/com/redhat/eclipse/changelog/core/ui/ChangeLogActionProvider.java: Added.
+	Provides action menu
+	(Prepare ChangeLog) to UI.* src/com/redhat/eclipse/changelog/core/actions/PrepareChangeLogAction.java (PrepareChangeLogAction):
+	Initializes text of menu button.
+	(preapreChangeLog): projectPath variable is set from IResource of selected
+	object.
+	* src/com/redhat/eclipse/changelog/core/actions/KeyAction.java
+	(KeyAction): Initializer sets text of menu button.
+	* src/com/redhat/eclipse/changelog/core/actions/ChangeLogAction.java
+	(ChangeLogAction): Now extends Action to be used from ChangeLogActionProvider.
+
+2006-07-25  Kyu Lee  <klee@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/parsers/PythonParser.java
+	(parseCurrentFunction): Python Parser removed temporarily.
+	* plugin.xml: Changed property of pop-up menu item to work with 3.2.
+	* src/com/redhat/eclipse/changelog/core/actions/StringDiffOperation.java: Added.
+	Replaces GenerateDiffFile which is not supported anymore in 3.2.
+	* src/com/redhat/eclipse/changelog/core/actions/GenerateDiffFile.java: Not used
+	anymore.
+	* src/com/redhat/eclipse/changelog/core/actions/PrepareChangeLogAction.java
+	(preapreChangeLog): Uses new StringDiffOperation to get diff result.
+
+2006-07-21  Kyu Lee  <klee@redhat.com>
+
+	* Merged from PrepareChangeLogExperiment branch to HEAD.
+
+2006-07-21  Kyu Lee  <klee@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/parsers/CompareParser.java
+	(parseCurrentFunction): Changed default function name.
+	* src/com/redhat/eclipse/changelog/core/actions/PrepareChangeLogAction.java
+	(preapreChangeLog): Added information dialog to tell user that there is no
+	change.
+	* src/com/redhat/eclipse/changelog/core/editors/GNUHyperlinkDetector.java:
+	Removed unused field.
+
+2006-07-20  Kyu Lee  <klee@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/actions/PrepareChangeLogAction.java
+	(run, preapreChangeLog, parseStandardPatch): Added progress monitor.
+	* src/com/redhat/eclipse/changelog/core/actions/KeyAction.java
+	(outputChangeLog): Refactored method from ChangeLogAction class.
+	* src/com/redhat/eclipse/changelog/core/actions/GenerateDiffFile.java
+	(run): Changed progress monitor's text.
+	* src/com/redhat/eclipse/changelog/core/actions/ChangeLogAction.java: Revactored
+	outputChangeLog method to sub classes.
+
+2006-07-19  Kyu Lee  <klee@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/actions/ChangeLogAction.java: Added.
+	Refactoring class for KeyAction and PrepareChangeLogAction.
+	* src/com/redhat/eclipse/changelog/core/actions/PrepareChangeLogAction.java:
+	Refactored some methods to ChangeLogAction.
+	* src/com/redhat/eclipse/changelog/core/actions/KeyAction.java: Refactored some
+	methods to ChangeLogAction.
+
+2006-07-18  Kyu Lee  <klee@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/parsers/PythonParser.java
+	(parseCurrentFunction): Added to support new IParserChangeLogContrib.
+	* src/com/redhat/eclipse/changelog/core/parsers/JavaParser.java
+	(parseCurrentFunction): Added to support new IParserChangeLogContrib.
+	* src/com/redhat/eclipse/changelog/core/parsers/CParser.java
+	(parseCurrentFunction): Added to support new IParserChangeLogContrib.
+	* src/com/redhat/eclipse/changelog/core/parsers/CompareParser.java
+	(parseCurrentFunction): Added to support new IParserChangeLogContrib.
+	* src/com/redhat/eclipse/changelog/core/actions/PrepareChangeLogAction.java
+	(guessFunctionNames): Uses extension point parserContribution.
+	* src/com/redhat/eclipse/changelog/core/IParserChangeLogContrib.java
+	(parseCurrentFunction): New overloaded function that supports input parameters
+	from PrepareChangeLogAction.
+
+2006-07-14  Kyu Lee  <klee@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/actions/PrepareChangeLogAction.java
+	(parseStandardPatch): Now it parses standard diff instead of unified.
+	* src/com/redhat/eclipse/changelog/core/actions/GenerateDiffFile.java
+	(generateDiff): Changed diff option so that it generates standard diff.
+
+2006-07-13  Kyu Lee  <klee@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/actions/PrepareChangeLogAction.java
+	(parseStandardPatch): Return type changed.
+	(guessFunctionNames): Return type changed and fixed minor bugs.
+	(run): Added error checking, refactored.
+	* src/com/redhat/eclipse/changelog/core/actions/PatchFile.java
+	(countRanges): Added.
+	* src/com/redhat/eclipse/changelog/core/actions/GenerateDiffFile.java
+	(generateDiff): Renamed the method from generateDiffToClipboard.
+
+2006-07-10  Kyu Lee  <klee@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/actions/PatchRangeElement.java: Added.
+	Class that describes a block of change in a file in patch.
+	* src/com/redhat/eclipse/changelog/core/actions/PatchFile.java: Added. Class
+	that describes a file in patch.
+	* plugin.xml: Added dependencies for CVS diff operation.
+	* src/com/redhat/eclipse/changelog/core/ChangelogPlugin.java: Cleaned import.
+	* src/com/redhat/eclipse/changelog/core/actions/PrepareChangeLogAction.java
+	(run): Outputs patch to System.out.
+	(parseUnifiedPatch): Parses a patch(unified diff with remote resource) and
+	stores it in PatchFile array.
+	* src/com/redhat/eclipse/changelog/core/actions/GenerateDiffFile.java: Added.
+	Generates cvs diff from selected resource.
+
+2006-06-23  Kyu Lee  <klee@redhat.com>
+
+	* plugin.xml: Added popup menu for prepare chagelog.
+	* src/com/redhat/eclipse/changelog/core/actions/PrepareChangeLogAction.java:
+	Added. Action class that prepares ChangeLog from selected files/folders.
+	* src/com/redhat/eclipse/changelog/core/editors/GNUEditorConfiguration.java
+	(GNUEditorConfiguration): Changed to 0-argument constructor.
+	(setTextEditor): Sets TextEditor(since constructor no longer gets it).
+	* src/com/redhat/eclipse/changelog/core/editors/ChangeLogEditor.java
+	(getConfig): Implemented. Works as expected.
+	* src/com/redhat/eclipse/changelog/core/IEditorChangeLogContrib.java
+	(setTextEditor): Added. Since IConfigurationElement always instantiated using
+	its 0-argument public constructor, we need another way to set TextEditor(Used to
+	be passed in through constructor).
+	* src/com/redhat/eclipse/changelog/core/ChangeLogPreferencesPage.java
+	(populateEditorList): Fixed minor typo.
+	* src/com/redhat/eclipse/changelog/core/ChangelogPlugin.java
+	(initializeDefaultPreferences): Sets default value for editor.
+
+2006-06-22  Kyu Lee  <klee@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/ChangeLogPreferencesPage.java: Added
+	preference settings for editor.
+	* src/com/redhat/eclipse/changelog/core/strings.properties: Property text for
+	editor added.
+	* schema/editorContribution.exsd: Extension point element was re-defined.
+	* plugin.xml: Extension point element for editor fixed. And cleaned up some
+	extension elements for parsers.
+	* plugin.properties: Added a variable for Editor.
+
+2006-06-21  Kyu Lee  <klee@redhat.com>
+
+	* plugin.xml: Editor extension class has been changed to ChangeLogEditor from
+	GNUChangeLogEditor.
+	* src/com/redhat/eclipse/changelog/core/editors/GNUChangeLogEditor.java:
+	Removed. Replaced with ChangeLogEditor.java.
+	* src/com/redhat/eclipse/changelog/core/editors/ChangeLogEditor.java: Added.
+	Refactored from GNUChangeLogEditor.java. No longer the extension point for
+	editorContribution.
+	* src/com/redhat/eclipse/changelog/core/editors/GNUEditorConfiguration.java: Now
+	this class is the extension point for editorContribution.
+	* src/com/redhat/eclipse/changelog/core/IEditorChangeLogContrib.java: Replaced
+	classes that were required by old extension point to classes required by new
+	extension point.
+
+2006-06-20  Kyu Lee  <klee@redhat.com>
+
+	* plugin.xml: Changed version to 2.1.0.
+	* src/com/redhat/eclipse/changelog/core/editors/FileHyperlink.java: Added. Opens
+	files in new editor window.
+	* src/com/redhat/eclipse/changelog/core/editors/GNUHyperlinkDetector.java
+	(detectHyperlinks): Hyperlink for file names is now type FileHyperlink.
+	* src/com/redhat/eclipse/changelog/core/editors/GNUChangeLogConfiguration.java
+	(GNUChangeLogConfiguration): TextEditor parameter added to determine the path of
+	current project.
+
+2006-06-16  Kyu Lee  <klee@redhat.com>
+
+	* schema/editorContribution.exsd: Added. Schema file for ChangeLog extension
+	point.
+
+2006-06-15  Kyu Lee  <klee@redhat.com>
+
+	* plugin.xml: Added extension point for editorContribution. Fixed editor
+	extension class name.
+	* src/com/redhat/eclipse/changelog/core/IEditorChangeLogContrib.java: Added.
+	Interface for editorContribution extension point.
+	* src/com/redhat/eclipse/changelog/core/editors/IChangeLogColorConstants.java:
+	Added. Holds color scheme for syntax highlighters.
+	* src/com/redhat/eclipse/changelog/core/editors/GNUHyperlinkDetector.java:
+	Added. Detects hyperlinks from GNU style changelogs.
+	* src/com/redhat/eclipse/changelog/core/editors/GNUElementScanner.java: Added.
+	Detects elements from GNU style changelogs.
+	* src/com/redhat/eclipse/changelog/core/editors/GNUChangeLogEditor.java: Added.
+	Main class that defines GNU changelog editor.
+	* src/com/redhat/eclipse/changelog/core/editors/GNUChangeLogConfiguration.java:
+	Added. Configures GNU changelog editor.
+	* src/com/redhat/eclipse/changelog/core/editors/ColorManager.java: Added.
+	Manages color scheme.
+	* src/com/redhat/eclipse/changelog/core/editors/ChangeLogDocumentProvider.java:
+	Added. Connects the file with eidtor.
+	* src/com/redhat/eclipse/changelog/core/ChangeLogPreferencesPage.java: Removed
+	unused imports.
+
+2006-06-09  Kyu Lee  <klee@redhat.com>
+
+	* plugin.xml: categoryId is set properly so that keybindings page displays
+	ChangeLog keybinding without error.
+	* src/com/redhat/eclipse/changelog/core/ChangeLogPreferencesPage.java
+	(getHostName): Defaults hostname to 'localhost.localdomain' if it can not be
+	resolved.
+
+2006-06-08  Tom Tromey  <tromey@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/ChangeLogPreferencesPage.java
+	(getUserName): Check for gnu.gcj.user.realname property.
+
+2006-06-08  Kyu Lee  <klee@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/parsers/CParser.java
+	(parseCurrentFunction): Fix RH bug 168694.
+	* src/com/redhat/eclipse/changelog/core/parsers/JavaParser.java
+	(parseCurrentFunction): Fix RH bug 168694.
+
+2006-05-31  Andrew Overholt  <overholt@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/strings.properties: Fix typo.
+
+2006-05-23  ifoox  <ifoox@redhat.com>
+
+	* plugin.xml: Bump version to 2.0.4.
+
+2006-05-23  Kyu Lee  <klee@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/parsers/JavaParser.java
+	(parseCurrentFunction): Fix RH bug 168682.
+
+2006-03-24  Igor Foox  <ifoox@redhat.com>
+
+	* plugin.xml: Bump version to 2.0.3.
+
+2006-03-15  Igor Foox  <ifoox@redhat.com>
+
+	* plugin.xml: Bump version to 2.0.2.
+
+2006-03-11  Tom Tromey  <tromey@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/formatters/GNUFormat.java
+	(findChangeLogEntry): Removed unused code. Only reuse an existing entry if it is
+	at the beginning of the file.
+
+2006-03-11  Tom Tromey  <tromey@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/ChangeLogPreferencesPage.java
+	(createContents): Externalized strings.
+	* src/com/redhat/eclipse/changelog/core/strings.properties: Cleaned up.
+
+2006-03-11  Tom Tromey  <tromey@redhat.com>
+
+	Warning patrol:
+	* src/com/redhat/eclipse/changelog/core/ChangeLogPreferencesPage.java
+	(createCheckBox): Removed unused method.
+	(createRadioButton): Likewise.
+	(tabForward): Likewise.
+	* src/com/redhat/eclipse/changelog/core/actions/KeyAction.java
+	(outputChangeLog): Removed unused variables.
+	(getChangelog): Likewise.
+	(getDocumentName): Removed unused method.
+	(LoadPreferences): Use 'store'.
+	(document, caret_offset): Removed unused fields.
+	* src/com/redhat/eclipse/changelog/core/formatters/GNUFormat.java
+	(findChangeLogEntry): Removed unused variable.
+
+2005-04-20  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/parsers/PythonParser.java: Reworked
+	imports
+	* src/com/redhat/eclipse/changelog/core/actions/KeyAction.java: Removed unused
+	imports
+	* plugin.xml: Removed unused dependencies. Added %pyParser as name
+	* plugin.properties: Added pyParser string
+
+2005-03-03  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* plugin.xml: Added python optional dependencies. Added python parser extension
+	contributions
+
+2005-03-02  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/parsers/PythonParser.java: Added
+
+2005-03-01  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/formatters/GNUFormat.java
+	(findChangeLogEntry): Changed search to regex
+	* schema/formatterContribution.exsd: Added sequence details
+	* schema/parserContribution.exsd: Added sequence detilas
+
+2005-02-25  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* plugin.xml: Made CDT dependencies optional; bumped version.
+
+2004-11-10  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/formatters/GNUFormat.java
+	(mergeChangelog): Fixed extra spaces on continuation line
+	(mergeChangelog): Remove excess spaces from non function guess entries
+	(mergeChangelog): Install a special case where the Date line has been set, and a
+	continuance has neithier a file, nor function entry
+	* src/com/redhat/eclipse/changelog/core/parsers/CParser.java
+	(parseCurrentFunction): Added NPE check for extracted CElement
+	* src/com/redhat/eclipse/changelog/core/parsers/JavaParser.java
+	(parseCurrentFunction): Added NPE check for extracted JavaElement
+	* plugin.xml: Extracted strings
+	* plugin.properties: Added strings from plugin.xml Added prefTitle for
+	Preferences Page. Fixed Changelog -> ChangeLog in several places
+	* Cleaned up @author and license headers
+
+2004-09-27  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* plugin.xml: Changed keybinding to Ctrl-Alt-C
+	* src/com/redhat/eclipse/changelog/core/formatters/GNUFormat.java
+	(formatFunction): Fixed formatting errors with function
+	* src/com/redhat/eclipse/changelog/core/parsers/JavaParser.java
+	(parseCurrentFunction): Check JavaElement in JavaParser corresponds to a
+	function or compilation unit.
+	* src/com/redhat/eclipse/changelog/core/parsers/CParser.java
+	(parseCurrentFunction): Check ICElement in CParser corresponds to
+	class,function,enum,struct or a union
+
+2004-09-24  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* plugin.xml : Added org.eclipse.linuxtools.changelog.core.parsers.JavaParser.
+	Added org.eclipse.linuxtools.changelog.core.parsers.CParser. Added
+	org.eclipse.linuxtools.changelog.core.parsers.CompareParser. Added
+	org.eclipse.linuxtools.changelog.core.formatters.GNUFormat Added
+	com.redhat.eclipse.changelog.core.actions.KeyAction Removed
+	com.redhat.eclipse.changelog.core.AddAction Added schema/parserContribution.exsd
+	extension schema ref. Added schema/formatterContribution.exsd extension schema
+	ref.
+	* schema/parserContribution.exsd: Added. Define extension
+	com.redhat.eclipse.changelog.core.parserContribution for parser contributions.
+	* schema/formatterContribution.exsd: Added. Define extension
+	com.redhat.eclipse.changelog.core.formatterContribution for formatter
+	contributions.
+	* src/com/redhat/eclipse/changelog/core/popup/actions/AddAction.java: Removed
+	* src/com/redhat/eclipse/changelog/core/parsers/JavaParser.java: Added.
+	Implements IParserChangeLogContrib for parserContribution.
+	* src/com/redhat/eclipse/changelog/core/parsers/CParser.java: Added. Implements
+	IParserChangeLogContrib for parserContribution.
+	* src/com/redhat/eclipse/changelog/core/parsers/CompareParser.java: Added.
+	Implements IParserChangeLogContrib for parserContribution.
+	* src/com/redhat/eclipse/changelog/core/formatters/GNUFormat.java: Added.
+	Implements IFormatterChangeLogContrib for formatterContribution. Defined a GNU
+	Style Changelog layout.
+	* src/com/redhat/eclipse/changelog/core/actions/KeyAction.java: Added. Calls the
+	relevant parser and formatter module, and creates changelog entries.
+	* src/com/redhat/eclipse/changelog/core/IParserChangeLogContrib.java: Added.
+	Interface for parserContribution extension point.
+	* src/com/redhat/eclipse/changelog/core/IFormatterChangeLogContrib.java: Added.
+	Interface for formatterContribution extension point.
+
+2004-07-19  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* build.properties : Added plugin.properties to bin.includes
+
+2004-07-16  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* src/com/redhat/eclipse/changelog/core/ChangeLogPreferencesPage.java
+	(createComposite):
+	* plugin.xml: Fixed provider name. Upgraded version Use plugin.properties where
+	needed
+	* plugin.properties: Added
+
+2004-07-13  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* ChangelogPlugin.java
+	(initializeDefaultPreferences):
+	* Correctly populate programmed defaults
+	* ChangeLogPreferencesPage.java
+	(getUserName): Make static
+	(getHostName): Make static
+	* AddAction.java
+	(outputChangeLog): Fixed NPE on Region when
+	* FindReplaceDocumentAdapter returns a null Region
+
+2004-07-12  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* plugin.xml: Removed unused dependencies
+
+2004-07-12  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* Refactored to com.redhat.eclipse.changelog.core: plugin.xml build.xml
+	src/(...)/popup/actions/AddAction.java src/ChangelogPlugin.java
+	src/ChangeLogPreferences.java src/Messages.Java src/strings.properties
+
+2004-07-09  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* build.xml: 3.0 migration. Regenerated build.xml. Changed classpath. Added
+	baseClassPath variable to work temporarily until releng plug-in is written.
+
+2004-07-08  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* plugin.xml: 3.0 auto migration path
+	* ChangelogPlugin.java : Removed IPluginDescriptor
+	(getResourceBundle): Made failsafe
+	(start(BundleContext context)): Added
+	(stop(BundleContext context)): Added
+	* AddAction.java
+	(openEditor): Modified openEditor to use org.eclipse.ui.ide.IDE.openEditor for
+	3.0 migration
+	(outputChangeLog): Modified IDocument.search() to FindReplaceDocumentAdapter
+	model for 3.0
+
+2004-02-24  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* AddAction.java
+	(guessGenericFunction): Added == as a token
+	(askChangeLogLocation): Add Cancel button check
+
+2004-02-23  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* AddAction.java
+	(outputChangeLog): Fixed gnu continuance bugs
+	(guessGenericFunction): Added +- to delimeters for C nuggets of gold such as
+	(*foo)++;. Added anumber of other tokens2004-02-19 Phil Muldoon <pmuldoon@redhat.com>* AddAction.java (outputChangeLog):
+	Shortened date search delimeter by size of date search string
+
+2004-02-12  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* AddAction.java : Modified class variables scope to private
+	(formatFunctionDetail): Created
+	(guessGenericFunction): Renamed
+	(outputChangeLog): functionDetail and fileDetail evolved out
+	(formatFileDetail): Created
+	(outputChangeLog): Renamed
+	(askChangeLogLocation): Renamed
+	* ChangeLogPreferencesPage.java
+	(initializeValues): refactored
+
+2004-02-10  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* build.xml: Removed classpath versions
+	* build.xml : Changed classpath to reflect gcj build
+	* ChangeLogPreferencesPage.java
+	(getUserName): Added
+	(import) Removed Redundant exports(getHostName): Added
+	(initializeDefaultPreferences): Added sligtly more sensible name and email guess
+	* AddAction.java
+	(OutputChangeLog): Added maintenance boundary paths to file entries for
+	changelogs on maintenance boundaries
+	* plugin.xml: Changed Changelog Entry to Add Changelog Entry
+
+2004-02-05  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* AddAction.java
+	(matchDatePattern): Added function
+	* AddAction.java
+	(OutputChangeLog): Added GNU Style Continuance for single file, multiple
+	function entries
+
+2004-01-30  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* AddAction.java
+	(guessJavaFunction): Changed token
+	* to /*
+	(to fix C pointers)* AddAction.java : Removed various debug System.out's2004-01-22 Phil Muldoon <pmuldoon@redhat.com>* AddAction.java (guessJavaFunction):
+	Fixed Region Info
+	(use both getLinebyOffset).Added Support for functions that span more than one line2004-01-21 Phil Muldoon <pmuldoon@redhat.com>* AddAction.java (formatJavaFunction):
+	Fixed tokenize on parenthesis
+	* AddAction.java
+	(guessJavaFunction): Added parenthesis to tokenizer to assist in tokenzing
+	function headers
+	* plugin.xml: Added #CEditorContext
+	* build.xml: Added
+
+2004-01-21  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* Version 1.0 check-in
+
+2003-11-24  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* Initial check-in. Does not work. Experimental.
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/META-INF/MANIFEST.MF b/changelog/org.eclipse.linuxtools.changelog.core/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..4107f58
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/META-INF/MANIFEST.MF
@@ -0,0 +1,67 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ChangeLog Core Functionality (Incubation)
+Bundle-SymbolicName: org.eclipse.linuxtools.changelog.core;singleton:=true
+Bundle-Version: 2.6.7.qualifier
+Bundle-Activator: org.eclipse.linuxtools.changelog.core.ChangelogPlugin
+Bundle-Localization: plugin
+Bundle-Vendor: %providerName
+Eclipse-LazyStart: true
+Require-Bundle: org.eclipse.team.ui,
+ org.eclipse.ui.ide,
+ org.eclipse.jface.text;bundle-version="3.3.0",
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.core.runtime;bundle-version="3.3.100",
+ org.eclipse.ui;bundle-version="3.3.0",
+ org.eclipse.ui.editors;bundle-version="3.3.0",
+ org.eclipse.team.core,
+ org.eclipse.ui.navigator,
+ org.eclipse.compare,
+ org.eclipse.core.resources
+Export-Package: org.eclipse.linuxtools.changelog.core;
+  uses:="org.eclipse.jface.text.hyperlink,
+   org.eclipse.core.runtime,
+   org.eclipse.jface.text.source,
+   org.eclipse.ui,
+   org.eclipse.swt.events,
+   org.eclipse.ui.plugin,
+   org.eclipse.jface.preference,
+   org.eclipse.jface.text.presentation,
+   org.eclipse.core.resources,
+   org.osgi.framework,
+   org.eclipse.swt.widgets,
+   org.eclipse.ui.editors.text",
+ org.eclipse.linuxtools.changelog.core.actions;
+  uses:="org.eclipse.jface.action,
+   org.eclipse.linuxtools.changelog.core.editors,
+   org.eclipse.core.runtime,
+   org.eclipse.linuxtools.changelog.core,
+   org.eclipse.team.internal.ccvs.ui.operations,
+   org.eclipse.ui,
+   org.eclipse.core.resources,
+   org.eclipse.jface.viewers,
+   org.eclipse.core.commands",
+ org.eclipse.linuxtools.changelog.core.editors;
+  uses:="org.eclipse.jface.text.hyperlink,
+   org.eclipse.jface.text,
+   org.eclipse.jface.text.source,
+   org.eclipse.linuxtools.changelog.core,
+   org.eclipse.jface.text.formatter,
+   org.eclipse.linuxtools.changelog.core.actions,
+   org.eclipse.jface.text.rules,
+   org.eclipse.jface.action,
+   org.eclipse.jface.text.presentation,
+   org.eclipse.core.resources,
+   org.eclipse.swt.graphics,
+   org.eclipse.ui.editors.text",
+ org.eclipse.linuxtools.changelog.core.formatters;uses:="org.eclipse.jface.text,org.eclipse.linuxtools.changelog.core,org.eclipse.ui",
+ org.eclipse.linuxtools.changelog.core.ui;
+  uses:="org.eclipse.jface.action,
+   org.eclipse.team.ui.synchronize,
+   org.eclipse.team.core.mapping,
+   org.eclipse.team.ui.mapping,
+   org.eclipse.ui.navigator,
+   org.eclipse.ui,
+   org.eclipse.core.resources.mapping"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/build.properties b/changelog/org.eclipse.linuxtools.changelog.core/build.properties
new file mode 100644
index 0000000..fb895aa
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/build.properties
@@ -0,0 +1,9 @@
+bin.includes = plugin.xml,\
+               plugin.properties,\
+               *.jar,\
+               META-INF/,\
+               .,\
+               schema/
+jars.compile.order = .
+source.. = src/
+output.. = bin/
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/icons/file_obj.gif b/changelog/org.eclipse.linuxtools.changelog.core/icons/file_obj.gif
new file mode 100644
index 0000000..b226e41
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/icons/file_obj.gif
Binary files differ
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/plugin.properties b/changelog/org.eclipse.linuxtools.changelog.core/plugin.properties
new file mode 100644
index 0000000..d5bc973
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/plugin.properties
@@ -0,0 +1,19 @@
+
+pluginName=ChangeLog Plugin
+providerName=Eclipse
+compareParser=Compare Editor Parser
+cParser=C Editor Parser
+javaParser=Java Editor Parser
+pyParser=Python Parser
+# Following 2 strings need to be equivalently translated in strings.properties.
+gnuEditorConfig=GNU Editor
+gnuFormatter=GNU Style
+clActionSet=ChangeLog Action Set
+clEntry=&ChangeLog Entry
+prepCl=Prepare &ChangeLog
+prepChangeLog=Prepare ChangeLog
+prepChangeLog.tooltip=Create a set of ChangeLog entries based on local changes
+prepSVNChangeLog=Prepare ChangeLog
+insertCLEntry=Insert ChangeLog entry
+insertCLEntryDesc=Insert a ChangeLog entry
+prefTitle=ChangeLog
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/plugin.xml b/changelog/org.eclipse.linuxtools.changelog.core/plugin.xml
new file mode 100644
index 0000000..765bf7f
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/plugin.xml
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?><!--
+    Copyright (c) 2010 Red Hat, Inc.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+   
+    Contributors:
+        Alexander Kurtakov (Red Hat) - initial API and implementation
+ -->
+
+<plugin>
+
+    <extension-point id="parserContribution" 
+    	name="Changelog Language Parser Contribution" 
+    	schema="schema/parserContribution.exsd"/>
+    <extension-point id="formatterContribution" name="Changelog Format Contribution" schema="schema/formatterContribution.exsd"/>
+    <extension-point id="editorContribution" name="ChangeLog Editor Contribution" schema="schema/editorContribution.exsd"/>
+  
+    <extension
+  		point="org.eclipse.ui.commands">
+		
+		<category
+			name="Changelog"
+			description="Changelog key bindings"
+			id="org.eclipse.linuxtools.changelog">
+		</category>
+
+		<command
+        categoryId="org.eclipse.linuxtools.changelog"
+        description="%insertCLEntryDesc"
+        id="org.eclipse.linuxtools.changelog.core.actions.KeyActionCommand"
+        name="%insertCLEntry">
+		</command>
+  <command
+        categoryId="org.eclipse.linuxtools.changelog"
+        description="Prepares Changelog"
+        id="org.eclipse.linuxtools.changelog.core.preparechangelog"
+        name="Prepare Changelog"/>
+  <command
+        categoryId="org.eclipse.linuxtools.changelog"
+        description="Copies latest changelog entry to clipboard"
+        id="org.eclipse.linuxtools.changelog.core.prepareCommit"
+        name="Prepare Commit"/>
+  <command
+        categoryId="org.eclipse.linuxtools.changelog"
+        description="Formats ChangeLog"
+        id="org.eclipse.linuxtools.changelog.core.formatChangeLog"
+        name="Format ChangeLog"/>
+  <command
+        categoryId="org.eclipse.linuxtools.changelog"
+        description="Prepares ChangeLog in an editor"
+        id="org.eclipse.linuxtools.changelog.core.preparechangelog2"
+        name="Prepare Changelog In Editor">
+  </command>
+	</extension>
+	
+	 <!-- Actions -->	
+	<extension point="org.eclipse.ui.actionSets">
+ 		<actionSet label="%clActionSet" visible="true" id="org.eclipse.linuxtools.changelog.actionSet">
+        	<action
+            	definitionId="org.eclipse.linuxtools.changelog.core.actions.KeyActionCommand"
+				label="%clEntry"
+				class="org.eclipse.linuxtools.changelog.core.actions.InsertChangeLogKeyHandler"
+				tooltip="%clEntry"
+				menubarPath="edit/"
+				id="org.eclipse.linuxtools.changelog.core.actions.KeyAction">
+ 			</action>
+         <action
+               class="org.eclipse.linuxtools.changelog.core.actions.PrepareChangelogKeyHandler"
+               definitionId="org.eclipse.linuxtools.changelog.core.preparechangelog"
+               id="org.eclipse.linuxtools.changelog.core.action.prepChangeLog"
+               label="%prepCl"
+               menubarPath="project/"
+               tooltip="%prepChangeLog.tooltip">
+            <enablement>
+               <or>
+                  <objectClass
+                        name="org.eclipse.core.resources.IResource">
+                  </objectClass>
+                  <objectClass
+                        name="org.eclipse.team.ui.synchronize.ISynchronizeModelElement">
+                  </objectClass>
+                  <objectState
+                        name="projectNature"
+                        value="org.eclipse.cdt.core.cnature">
+                  </objectState>
+               </or>
+            </enablement>
+         </action>
+         <action
+               class="org.eclipse.linuxtools.changelog.core.actions.PrepareChangelogKeyHandler"
+               definitionId="org.eclipse.linuxtools.changelog.core.preparechangelog2"
+               id="org.eclipse.linuxtools.changelog.core.action.prepChangeLogInEditor"
+               label="Prepare ChangeLog In Editor">
+         </action>
+		</actionSet>
+	</extension>
+       
+	<extension point = "org.eclipse.ui.preferencePages">
+		<page 
+			id="org.eclipse.linuxtools.changelog.core.Page1"
+			class="org.eclipse.linuxtools.changelog.core.ChangeLogPreferencesPage"
+			name="%prefTitle">
+       	</page>
+	</extension>
+   		
+
+    <extension
+        point="org.eclipse.linuxtools.changelog.core.formatterContribution">
+        <formatter
+              inFile="false"
+              class="org.eclipse.linuxtools.changelog.core.formatters.GNUFormat"
+              id="org.eclipse.linuxtools.changelog.GNUFormat"
+              name="%gnuFormatter">
+              <fileName name="ChangeLog" />  
+        </formatter>        
+  </extension>
+    <extension
+          id="org.eclipse.linuxtools.changelog.core.editor"
+          point="org.eclipse.ui.editors">
+       <editor
+             class="org.eclipse.linuxtools.changelog.core.editors.ChangeLogEditor"
+             contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor"
+             default="true"
+             filenames="ChangeLog"
+             icon="icons/file_obj.gif"
+             id="org.eclipse.linuxtools.changelog.core.editor6"
+             name="ChangeLog Editor"/>
+    </extension>
+    <extension
+          point="org.eclipse.linuxtools.changelog.core.editorContribution">
+       <editor
+             class="org.eclipse.linuxtools.changelog.core.editors.GNUEditorConfiguration"
+             id="org.eclipse.linuxtools.changelog.core.gnueditor"
+             name="%gnuEditorConfig"/>
+    </extension>
+    <extension
+          point="org.eclipse.ui.navigator.viewer">
+       <viewerActionBinding viewerId="org.eclipse.team.cvs.ui.workspaceSynchronization">
+          <includes>
+             <actionExtension pattern="org.eclipse.linuxtools.changelog.core.ui.ChangeLogActioniProvider"/>
+          </includes>
+       </viewerActionBinding>
+    </extension>
+    <extension
+          point="org.eclipse.ui.navigator.navigatorContent">
+       <actionProvider
+             class="org.eclipse.linuxtools.changelog.core.ui.ChangeLogActionProvider"
+             id="org.eclipse.linuxtools.changelog.core.ui.ChangeLogActioniProvider">
+          <enablement>
+             <adapt type="org.eclipse.core.resources.mapping.ResourceMapping"/>
+          </enablement>
+       </actionProvider>
+    </extension>
+    <extension
+          point="org.eclipse.ui.bindings">
+       <key
+             commandId="org.eclipse.linuxtools.changelog.core.actions.KeyActionCommand"
+             contextId="org.eclipse.ui.textEditorScope"
+             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+             sequence="Ctrl+Alt+C"/>
+       <key
+             commandId="org.eclipse.linuxtools.changelog.core.actions.KeyActionCommand"
+             contextId="org.eclipse.compare.compareEditorScope"
+             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+             sequence="Ctrl+Alt+C"/>
+       <scheme
+             id="org.eclipse.linuxtools.changelog.keyscheme.default"
+             name="default"/>
+       <key
+             commandId="org.eclipse.linuxtools.changelog.core.preparechangelog2"
+             contextId="org.eclipse.ui.textEditorScope"
+             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+             sequence="Ctrl+Alt+P" />
+       <key
+             commandId="org.eclipse.linuxtools.changelog.core.preparechangelog2"
+             contextId="org.eclipse.compare.compareEditorScope"
+             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+             sequence="Ctrl+Alt+P"/>
+       <key
+             commandId="org.eclipse.linuxtools.changelog.core.preparechangelog"
+             contextId="org.eclipse.ui.contexts.window"
+             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+             sequence="Ctrl+Alt+P"/>
+       <key
+             commandId="org.eclipse.linuxtools.changelog.core.prepareCommit"
+             contextId="org.eclipse.ui.textEditorScope"
+             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+             sequence="Ctrl+Alt+V"/>
+       <key
+             commandId="org.eclipse.linuxtools.changelog.core.formatChangeLog"
+             contextId="org.eclipse.ui.textEditorScope"
+             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+             sequence="ESC Ctrl+F"/>
+    </extension>
+    <extension
+          point="org.eclipse.ui.handlers">
+       <handler
+             class="org.eclipse.linuxtools.changelog.core.actions.PrepareChangelogKeyHandler"
+             commandId="org.eclipse.linuxtools.changelog.core.preparechangelog"/>
+       <handler
+             class="org.eclipse.linuxtools.changelog.core.actions.InsertChangeLogKeyHandler"
+             commandId="org.eclipse.linuxtools.changelog.core.actions.KeyActionCommand"/>
+       <handler
+             class="org.eclipse.linuxtools.changelog.core.actions.PrepareCommitHandler"
+             commandId="org.eclipse.linuxtools.changelog.core.prepareCommit"/>
+       <handler
+             class="org.eclipse.linuxtools.changelog.core.actions.FormatChangeLogAction"
+             commandId="org.eclipse.linuxtools.changelog.core.formatChangeLog"/>
+    </extension>
+    <extension
+          id="org.eclipse.linuxtools.changelog.documentSetup"
+          point="org.eclipse.core.filebuffers.documentSetup">
+       <participant
+             class="org.eclipse.linuxtools.changelog.core.editors.ChangeLogDocumentSetupParticipant"
+             fileNames="ChangeLog">
+       </participant>
+    </extension>
+    <extension point="org.eclipse.core.runtime.preferences">
+		<initializer
+			class="org.eclipse.linuxtools.changelog.core.ChangelogPreferenceInitializer" />
+	</extension>
+</plugin>
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/schema/editorContribution.exsd b/changelog/org.eclipse.linuxtools.changelog.core/schema/editorContribution.exsd
new file mode 100644
index 0000000..4baec56
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/schema/editorContribution.exsd
@@ -0,0 +1,119 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.linuxtools.changelog.core">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.linuxtools.changelog.core" id="editorContribution" name="ChangeLog Editor Contribution"/>
+      </appInfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <complexType>
+         <sequence>
+            <element ref="editor" minOccurs="0" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="editor">
+      <complexType>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="class" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiInfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/schema/formatterContribution.exsd b/changelog/org.eclipse.linuxtools.changelog.core/schema/formatterContribution.exsd
new file mode 100644
index 0000000..707d4d0
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/schema/formatterContribution.exsd
@@ -0,0 +1,178 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.linuxtools.changelog.core">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.linuxtools.changelog.core" id="formatterContribution" name="Changelog Format Contribution"/>
+      </appInfo>
+      <documentation>
+         This extension point allows contributors to provide a formatter for a new type of changelog file. A formatter is responsible for formatting and inserting the text of the changelog entry into the editor.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <complexType>
+         <sequence>
+            <element ref="formatter" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="formatter">
+      <annotation>
+         <documentation>
+            &lt;p&gt;
+The &lt;i&gt;formatter&lt;/i&gt; element is the main element in this extension point. It defines a single formatter which is used by the plugin to format changelog entries. There are 2 types of formatters recognized by the plugin.
+&lt;/p&gt;
+
+&lt;ul&gt;
+&lt;li&gt;In-file changelog formatters&lt;/li&gt;
+&lt;li&gt;External changelog formatters&lt;/li&gt;
+&lt;/ul&gt;
+
+&lt;p&gt;An in-file changelog formatter is used for files (such as an RPM spec file) which contain a changelog section in addition to other information. An external changelog formatter is used for any other type of file, such as text files, source code files, etc., which rely on an external (usually per-project) changelog file. An example of this is the GNU Style ChangeLog formatter.
+&lt;/p&gt;
+
+&lt;p&gt;This element must contain either a &lt;i&gt;filePattern&lt;/i&gt; or a &lt;i&gt;fileName&lt;/i&gt; element. An in-file formatter (one which has the &lt;i&gt;inFile&lt;/i&gt; attribute set to &quot;true&quot;) must use a &lt;i&gt;filePattern&lt;/i&gt; element. An external formatter (one which has the &lt;i&gt;inFile&lt;/i&gt; attribute set to &quot;false&quot;) must use a &lt;i&gt;fileName&lt;/i&gt; element. Failure to do this will result in runtime Exceptions.&lt;/p&gt;
+         </documentation>
+      </annotation>
+      <complexType>
+         <choice>
+            <element ref="filePattern"/>
+            <element ref="fileName"/>
+         </choice>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  The name of the formatter.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  A unique identifier.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="class" type="string">
+            <annotation>
+               <documentation>
+                  A class implementing &lt;i&gt;org.eclipse.linuxtools.changelog.core.IFormatterChangeLogContrib&lt;/i&gt;.
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn="org.eclipse.linuxtools.changelog.core.IFormatterChangeLogContrib"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+         <attribute name="inFile" type="boolean" use="required">
+            <annotation>
+               <documentation>
+                  Describes whether this formatter is an in-file formatter or an external formatter. See the documentation for the &lt;i&gt;formatter&lt;/i&gt; element for more information.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="filePattern">
+      <annotation>
+         <documentation>
+            This element is used for in-class formatters to indicate what type of files the formatter applies to. The &lt;i&gt;pattern&lt;/i&gt; attribute of this element describes the pattern. Files conforming to the pattern will use this formatter when the changelog action is invoked.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="pattern" type="string" use="required">
+            <annotation>
+               <documentation>
+                  This attribute must contain a String that is a valid java.util.regex type regular expression. This cannot be checked at build time, but the ChangeLog plugin checks this at runtime.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="fileName">
+      <annotation>
+         <documentation>
+            This element is used for external changelog formatters. It describes file name that will be used as the changelog file. For instance the GNU Style formatter uses the filename &apos;ChangeLog&apos;. The &lt;i&gt;name&lt;/i&gt; attribute of this element contains the name of the file.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="name" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The value of this attribute must be a valid filename, as this file will be read/written to at runtime.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         0.1.0
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiInfo"/>
+      </appInfo>
+      <documentation>
+         Extending contributors must supply an implementation of org.eclipse.linuxtools.changelog.core.IFormatterChangeLogContrib in the &lt;i&gt;class&lt;/i&gt; attribute of the &lt;i&gt;formatter&lt;/i&gt; element.
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         The GNU Style formatter supplied by the org.eclipse.linuxtools.changelog.core plugin is an example implementation of this extension point. 
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/schema/parserContribution.exsd b/changelog/org.eclipse.linuxtools.changelog.core/schema/parserContribution.exsd
new file mode 100644
index 0000000..f2ed6ea
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/schema/parserContribution.exsd
@@ -0,0 +1,116 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.linuxtools.changelog.core">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.linuxtools.changelog.core" id="parserContribution" name="Changelog Language Parser Contribution"/>
+      </appInfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <complexType>
+         <sequence>
+    	 	<element ref="parser" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="parser">
+      <complexType>
+         <attribute name="name" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="editor" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiInfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/ChangeLogExtensionManager.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/ChangeLogExtensionManager.java
new file mode 100644
index 0000000..3481358
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/ChangeLogExtensionManager.java
@@ -0,0 +1,262 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kyu Lee <klee@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
+
+
+/**
+ * This class will manage extension related operations.
+ * 
+ * @author klee
+ * 
+ */
+public class ChangeLogExtensionManager {
+
+	
+	private static final ChangeLogExtensionManager exm = new ChangeLogExtensionManager();
+	
+
+	// These are used as a simple cache so we don't have to iterate over
+	// all extensions to formatContribution every time the action is invoked.
+	protected IConfigurationElement cachedPrefFormatter = null;
+
+	protected IConfigurationElement[] cachedInFileFormateters = null;
+
+	protected IExtensionPoint parserExtensions = null;
+
+	protected IExtensionPoint formatterExtensions = null;
+
+	protected IParserChangeLogContrib parserContributor = null;
+
+	protected IFormatterChangeLogContrib formatterContributor = null;
+	
+	protected IConfigurationElement formatterConfigElementToUse = null;
+	
+	private ChangeLogExtensionManager() {
+		getParserContributions();
+		getFormatterContributions();
+	}
+	
+	public static ChangeLogExtensionManager getExtensionManager() {
+		return exm;
+	}
+
+	protected void getFormatterContributions() {
+		formatterExtensions = Platform
+				.getExtensionRegistry()
+				.getExtensionPoint(
+						"org.eclipse.linuxtools.changelog.core", "formatterContribution"); //$NON-NLS-1$
+	}
+
+	protected void getParserContributions() {
+
+		parserExtensions = Platform.getExtensionRegistry().getExtensionPoint(
+				"org.eclipse.linuxtools.changelog.core", "parserContribution"); //$NON-NLS-1$
+
+	}
+
+	public IParserChangeLogContrib getParserContributor(String editorName) {
+		
+		 if (parserExtensions != null) {
+			IConfigurationElement[] elements = parserExtensions
+					.getConfigurationElements();
+			for (int i = 0; i < elements.length; i++) {
+				if (elements[i].getName().equals("parser") // $NON-NLS-1$
+						&& (elements[i].getAttribute("editor") // $NON-NLS-1$
+								.equals(editorName))) {
+					//$NON-NLS-1$
+					try {
+						IConfigurationElement bob = elements[i];
+						parserContributor = (IParserChangeLogContrib) bob
+								.createExecutableExtension("class"); // $NON-NLS-1$
+						return parserContributor;
+					} catch (CoreException e) {
+						ChangelogPlugin.getDefault().getLog().log(
+								new Status(IStatus.ERROR, ChangelogPlugin.PLUGIN_ID,
+										IStatus.ERROR, e.getMessage(), e));
+					}
+
+				}
+			}
+		}
+		
+		
+		
+		return null;
+	}
+
+
+
+	
+	public IConfigurationElement getFormatterConfigElement() {
+		return formatterConfigElementToUse;
+	}
+	
+	/**
+	 * Fetches formatterName formatter from extension, but if there exists a inline
+	 * formatter for entryFileName, then it uses that inline formatter.
+	 */
+	public IFormatterChangeLogContrib getFormatterContributor(String entryFilePath, String formatterName) {
+		
+		
+		// extract just file name;
+		String fileName;
+	
+		int lastDir = entryFilePath.lastIndexOf('/');
+		if ((lastDir >= 0) && (lastDir +1 <= entryFilePath.length()))
+			fileName = entryFilePath.substring(lastDir + 1, entryFilePath.length());
+		else
+			fileName = entryFilePath;
+		
+		// We don't yet know which formatter to use
+		formatterConfigElementToUse = null;
+
+		// IFile file = null;
+
+		if (formatterExtensions != null) {
+			IConfigurationElement[] elements = formatterExtensions
+					.getConfigurationElements();
+
+			// cache the in-file formatters on the first run
+			if (cachedInFileFormateters == null) {
+				List<IConfigurationElement> inFileFormatters = new LinkedList<IConfigurationElement>();
+				for (int i = 0; i < elements.length; i++) {
+					IConfigurationElement formatterConfigElement = elements[i];
+					if (formatterConfigElement.getName().equals("formatter") // $NON-NLS-1$
+							&& formatterConfigElement.getAttribute("inFile") // $NON-NLS-1$
+									.toLowerCase().equals("true")) { // $NON-NLS-1$
+						inFileFormatters.add(elements[i]);
+					}
+				}
+				cachedInFileFormateters = inFileFormatters
+						.toArray(new IConfigurationElement[] {});
+			}
+
+			// check if there is an in-file changelog formatter for the
+			// currently
+			// edited file
+			for (int i = 0; i < cachedInFileFormateters.length; i++) {
+				IConfigurationElement formatterConfigElement = cachedInFileFormateters[i];
+
+				IConfigurationElement[] patternElementTmp = formatterConfigElement
+						.getChildren();
+
+				// error check
+				if (patternElementTmp == null)
+					continue;
+				IConfigurationElement patternElement = patternElementTmp[0];
+
+				if (patternElement.getAttribute("pattern") == null) { // $NON-NLS-1$
+					ChangelogPlugin
+							.getDefault()
+							.getLog()
+							.log(
+									new Status(
+											IStatus.ERROR,
+											ChangelogPlugin.PLUGIN_ID,
+											IStatus.ERROR,
+											Messages.getString("ChangeLog.ErrNonPattern"), // $NON-NLS-1$
+											new Exception(Messages.getString("ChangeLog.ErrNonPattern")))); // $NON-NLS-1$
+				} else {
+					String filePattern = patternElement.getAttribute("pattern"); // $NON-NLS-1$
+
+					try {
+						Pattern pattern = Pattern.compile(filePattern);
+						Matcher fileMatcher = pattern.matcher(fileName);
+
+						// if the filename of the current editor matches the
+						// file
+						// pattern then we're done
+						if (fileMatcher.matches()) {
+							formatterConfigElementToUse = formatterConfigElement;
+							break;
+						}
+					} catch (PatternSyntaxException e) {
+						ChangelogPlugin.getDefault().getLog().log(
+								new Status(IStatus.ERROR, ChangelogPlugin.PLUGIN_ID,
+										IStatus.ERROR, e.getMessage(), e));
+					}
+				}
+
+			}
+
+			// if we haven't found an in-file formatter we try to get the user's
+			// prefered formatter
+			if (formatterConfigElementToUse == null) {
+
+				// we cache the user's preferred formatter on the first run, and
+				// whenever it changes
+				if (cachedPrefFormatter == null
+						|| !cachedPrefFormatter.getAttribute("name").equals( // $NON-NLS-1$
+								formatterName)) {
+
+					for (int i = 0; i < elements.length; i++) {
+						IConfigurationElement formatterConfigElement = elements[i];
+						if (formatterConfigElement.getName()
+								.equals("formatter") && formatterConfigElement.getAttribute("inFile").toLowerCase().equals("false")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+							if (formatterConfigElement.getAttribute("name") // $NON-NLS-1$
+									.equals(formatterName))
+								cachedPrefFormatter = formatterConfigElement;
+							break;
+
+						}
+					}
+				}
+
+				formatterConfigElementToUse = cachedPrefFormatter;
+
+				if (formatterConfigElementToUse == null) {
+					ChangelogPlugin
+							.getDefault()
+							.getLog()
+							.log(
+									new Status(
+											IStatus.ERROR,
+											ChangelogPlugin.PLUGIN_ID,
+											IStatus.ERROR,
+											Messages.getString("ChangeLog.ErrRetrieveFormatter"), // $NON-NLS-1$
+											new Exception(Messages.getString("ChangeLog.ErrRetrieveFormatter")))); // $NON-NLS-1$
+
+					return null;
+				}
+
+			}
+		}
+
+		
+		
+		try {
+			return (IFormatterChangeLogContrib) formatterConfigElementToUse
+					.createExecutableExtension("class"); // $NON-NLS-1$
+
+		} catch (CoreException e) {
+			ChangelogPlugin.getDefault().getLog().log(
+					new Status(IStatus.ERROR, ChangelogPlugin.PLUGIN_ID, IStatus.ERROR, e
+							.getMessage(), e));
+			e.printStackTrace();
+		}
+		
+		
+		return null;
+	}
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/ChangeLogPreferencesPage.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/ChangeLogPreferencesPage.java
new file mode 100644
index 0000000..989252e
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/ChangeLogPreferencesPage.java
@@ -0,0 +1,266 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2010 Phil Muldoon <pkmuldoon@picobot.org> and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Phil Muldoon <pmuldoon@redhat.com> - initial API and implementation
+ *    Kyu Lee <klee@redhat.com>          - editor support
+ *    Alexander Kurtakov (Red Hat)       - remove parts notneeded
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.List;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+/**
+ * @author pmuldoon (Phil Muldoon)
+ */
+
+/**
+ * This class implements a sample preference page that is added to the
+ * preference dialog based on the registration.
+ */
+public class ChangeLogPreferencesPage extends PreferencePage implements
+		IWorkbenchPreferencePage {
+
+	private Text emailField;
+
+	private Text nameField;
+
+	private List formatterList;
+
+	private List editorList;
+
+	private Composite createComposite(Composite parent, int numColumns) {
+		Composite composite = new Composite(parent, SWT.NULL);
+
+		// GridLayout
+		GridLayout layout = new GridLayout();
+		layout.numColumns = numColumns;
+		composite.setLayout(layout);
+
+		// GridData
+		GridData data = new GridData();
+		data.verticalAlignment = GridData.FILL;
+		data.horizontalAlignment = GridData.FILL;
+		composite.setLayoutData(data);
+		return composite;
+	}
+
+	private Label createLabel(Composite parent, String text) {
+		Label label = new Label(parent, SWT.LEFT);
+		label.setText(text);
+		GridData data = new GridData();
+		data.horizontalSpan = 2;
+		data.horizontalAlignment = GridData.FILL;
+		label.setLayoutData(data);
+		return label;
+	}
+
+	private Text createTextField(Composite parent) {
+		Text text = new Text(parent, SWT.SINGLE | SWT.BORDER);
+		GridData data = new GridData();
+		data.horizontalAlignment = GridData.FILL;
+		data.grabExcessHorizontalSpace = true;
+		data.verticalAlignment = GridData.CENTER;
+		data.grabExcessVerticalSpace = false;
+		text.setLayoutData(data);
+		return text;
+	}
+
+	private List createListBox(Composite parent, int sizeHint) {
+		List list = new List(parent, SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL);
+		GridData data = new GridData();
+		data.horizontalAlignment = GridData.FILL;
+		data.grabExcessHorizontalSpace = true;
+		data.verticalAlignment = GridData.CENTER;
+		data.grabExcessVerticalSpace = false;
+		data.heightHint = list.getItemHeight() * sizeHint;
+		list.setLayoutData(data);
+
+		return list;
+	}
+
+	public void init(IWorkbench workbench) {
+	}
+	
+	@Override
+	protected IPreferenceStore doGetPreferenceStore() {
+		return ChangelogPlugin.getDefault().getPreferenceStore();
+	}
+
+	private void initializeDefaults() {
+		IPreferenceStore store = getPreferenceStore();
+		emailField.setText(store
+				.getDefaultString("IChangeLogConstants.AUTHOR_EMAIL")); //$NON-NLS-1$
+		nameField.setText(store
+				.getDefaultString("IChangeLogConstants.AUTHOR_NAME")); //$NON-NLS-1$
+		setDefaultFormatter(store);
+		setDefaultEditor(store);
+		storeValues();
+	}
+
+	private void setDefaultFormatter(IPreferenceStore store) {
+
+		String defaultFormatter = store
+				.getDefaultString("IChangeLogConstants.DEFAULT_FORMATTER"); //$NON-NLS-1$
+		for (int i = 0; i < formatterList.getItemCount(); i++) {
+			if (formatterList.getItem(i).equals(defaultFormatter)) {
+				formatterList.setSelection(i);
+				return;
+			}
+		}
+	}
+
+	private void setDefaultEditor(IPreferenceStore store) {
+
+		String defaultEditor = store
+				.getDefaultString("IChangeLogConstants.DEFAULT_EDITOR"); //$NON-NLS-1$
+		for (int i = 0; i < editorList.getItemCount(); i++) {
+			if (editorList.getItem(i).equals(defaultEditor)) {
+				editorList.setSelection(i);
+				return;
+			}
+		}
+	}
+
+	private void populateFormatList(IPreferenceStore store) {
+		IExtensionPoint parserExtensions = Platform
+				.getExtensionRegistry()
+				.getExtensionPoint(
+						"org.eclipse.linuxtools.changelog.core", "formatterContribution"); //$NON-NLS-1$ //$NON-NLS-2$
+		if (parserExtensions != null) {
+			IConfigurationElement[] elements = parserExtensions
+					.getConfigurationElements();
+			for (int i = 0; i < elements.length; i++) {
+				if (elements[i].getName().equals("formatter")) //$NON-NLS-1$
+				{
+
+					String fname = elements[i].getAttribute("name"); //$NON-NLS-1$\
+					// only add formatters for external files, not in-file formatters.
+					if (elements[i].getAttribute("inFile").toLowerCase().equals("false"))
+						formatterList.add(fname);
+					
+					if (fname
+							.equals(store
+									.getString("IChangeLogConstants.DEFAULT_FORMATTER"))) //$NON-NLS-1$
+						formatterList
+								.setSelection(formatterList.getItemCount() - 1);
+				}
+			}
+
+		}
+	}
+
+	private void populateEditorList(IPreferenceStore store) {
+		IExtensionPoint editorExtensions = Platform
+				.getExtensionRegistry()
+				.getExtensionPoint(
+						"org.eclipse.linuxtools.changelog.core", "editorContribution"); //$NON-NLS-1$ //$NON-NLS-2$
+		if (editorExtensions != null) {
+			IConfigurationElement[] elements = editorExtensions
+					.getConfigurationElements();
+			for (int i = 0; i < elements.length; i++) {
+				if (elements[i].getName().equals("editor")) //$NON-NLS-1$
+				{
+
+					String fname = elements[i].getAttribute("name"); //$NON-NLS-1$
+					editorList.add(fname);
+					if (fname.equals(store
+							.getString("IChangeLogConstants.DEFAULT_EDITOR"))) //$NON-NLS-1$
+						editorList.setSelection(editorList.getItemCount() - 1);
+				}
+			}
+
+		}
+	}
+
+	private void initializeValues() {
+		IPreferenceStore store = getPreferenceStore();
+
+		emailField.setText(store.getString("IChangeLogConstants.AUTHOR_EMAIL")); //$NON-NLS-1$
+		nameField.setText(store.getString("IChangeLogConstants.AUTHOR_NAME")); //$NON-NLS-1$	   	
+		populateFormatList(store);
+		populateEditorList(store);
+	}
+
+	private void storeValues() {
+		IPreferenceStore store = getPreferenceStore();
+
+		store.setValue("IChangeLogConstants.AUTHOR_NAME", nameField.getText()); //$NON-NLS-1$
+		store
+				.setValue(
+						"IChangeLogConstants.AUTHOR_EMAIL", emailField.getText()); //$NON-NLS-1$
+		String[] selection = formatterList.getSelection();
+		if (selection != null && selection.length > 0)
+			store.setValue("IChangeLogConstants.DEFAULT_FORMATTER", selection[0]); //$NON-NLS-1$
+		String[] selection2 = editorList.getSelection();
+		if (selection2 != null && selection2.length > 0)
+			store.setValue("IChangeLogConstants.DEFAULT_EDITOR", selection2[0]); //$NON-NLS-1$
+
+	}
+
+	/*
+	 * (non-Javadoc) Method declared on PreferencePage
+	 */
+	@Override
+	protected void performDefaults() {
+		super.performDefaults();
+		initializeDefaults();
+
+	}
+
+	/*
+	 * (non-Javadoc) Method declared on PreferencePage
+	 */
+	@SuppressWarnings("deprecation")
+	@Override
+	public boolean performOk() {
+		storeValues();
+		ChangelogPlugin.getDefault().savePluginPreferences();
+		return true;
+	}
+
+	@Override
+	protected Control createContents(Composite parent) {
+		// composite_textField << parent
+		Composite composite_textField = createComposite(parent, 2);
+		createLabel(composite_textField, Messages
+				.getString("ChangeLogPreferencesPage.AuthorName")); //$NON-NLS-1$
+		nameField = createTextField(composite_textField);
+
+		// composite_textField << parent
+
+		createLabel(composite_textField, Messages
+				.getString("ChangeLogPreferencesPage.AuthorEmail")); //$NON-NLS-1$
+		emailField = createTextField(composite_textField);
+
+		createLabel(composite_textField, Messages
+				.getString("ChangeLogPreferencesPage.Formatters")); //$NON-NLS-1$
+		formatterList = createListBox(composite_textField, 3);
+
+		createLabel(composite_textField, Messages
+				.getString("ChangeLogPreferencesPage.Editors")); //$NON-NLS-1$
+		editorList = createListBox(composite_textField, 3);
+
+		initializeValues();
+
+		return new Composite(parent, SWT.NULL);
+	}
+}
\ No newline at end of file
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/ChangeLogWriter.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/ChangeLogWriter.java
new file mode 100644
index 0000000..2bd9508
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/ChangeLogWriter.java
@@ -0,0 +1,129 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kyu Lee <klee@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.ui.IEditorPart;
+
+/**
+ * Writes changelog using extension point IFormatterChangeLogContrib.
+ * 
+ * @author klee
+ *
+ */
+public class ChangeLogWriter {
+	
+	private String defaultContent = ""; // $NON-NLS-1$
+
+	private String entryFilePath = null;
+
+	private String guessedFName = null;
+
+	private IFormatterChangeLogContrib formatter = null;
+
+	private IEditorPart changelog = null;
+
+	private String dateLine = null;
+
+	private String changelogLocation = null;
+
+	public IEditorPart getChangelog() {
+		return changelog;
+	}
+
+	public void setChangelog(IEditorPart changelog) {
+		this.changelog = changelog;
+	}
+
+	public String getChangelogLocation() {
+		return changelogLocation;
+	}
+
+	public void setChangelogLocation(String changelogLocation) {
+		this.changelogLocation = changelogLocation;
+	}
+
+	public String getDateLine() {
+		return dateLine;
+	}
+
+	public void setDateLine(String dateLine) {
+		this.dateLine = dateLine;
+	}
+
+	public String getEntryFilePath() {
+		return entryFilePath;
+	}
+
+	public void setEntryFilePath(String entryFilePath) {
+		// Replace characters in the name that are supposed to be
+		// token markers such as blanks, parentheses, and colon with
+		// escaped characters so they won't fool the colorization or
+		// other parsing.
+		String resolvedPath = entryFilePath.replace("(", "\\(");
+		resolvedPath = resolvedPath.replace(")", "\\)");
+		resolvedPath = resolvedPath.replace(":", "\\:");
+		resolvedPath = resolvedPath.replace(" ", "\\ ");
+		this.entryFilePath = resolvedPath;
+	}
+
+	public IFormatterChangeLogContrib getFormatter() {
+		return formatter;
+	}
+
+	public void setFormatter(IFormatterChangeLogContrib formatter) {
+		this.formatter = formatter;
+	}
+
+	public String getGuessedFName() {
+		return guessedFName;
+	}
+
+	public void setGuessedFName(String guessedFName) {
+		this.guessedFName = guessedFName;
+	}
+
+	public void writeChangeLog() {
+
+		// System.out.println("Debug Output :");
+		// System.out.println(entryFilePath);
+		// System.out.println(guessedFName);
+		// System.out.println(formatter);
+		// System.out.println(changelog);
+		// System.out.println(dateLine);
+		// System.out.println(changelogLocation);
+		// System.out.println("\n");
+
+		if (entryFilePath == null || guessedFName == null || formatter == null
+				|| changelog == null || dateLine == null
+				|| changelogLocation == null) {
+			ChangelogPlugin.getDefault().getLog().log(
+					new Status(IStatus.ERROR, ChangelogPlugin.PLUGIN_ID, IStatus.ERROR,
+							Messages.getString("ChangeLogWriter.ErrUninitialized"), null)); // $NON-NLS-1$
+
+			return;
+		}
+
+		formatter.mergeChangelog(dateLine, guessedFName, defaultContent, changelog,
+				changelogLocation, entryFilePath);
+
+	}
+
+	public String getDefaultContent() {
+		return defaultContent;
+	}
+
+	public void setDefaultContent(String defaultContent) {
+		this.defaultContent = defaultContent;
+	}
+
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/ChangelogPlugin.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/ChangelogPlugin.java
new file mode 100644
index 0000000..2ae33d8
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/ChangelogPlugin.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2010 Phil Muldoon <pkmuldoon@picobot.org> and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Phil Muldoon <pmuldoon@redhat.com> - initial API and implementation
+ *    Kyu Lee <klee@redhat.com>          - editor support
+ *    Alexander Kurtakov (Red Hat)       - remove preferences initializing
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+
+/**
+ * @author pmuldoon (Phil Muldoon)
+ */
+
+/**
+ * The main plugin class to be used in the desktop.
+ */
+public class ChangelogPlugin extends AbstractUIPlugin {
+	
+	public final static String PLUGIN_ID = "org.eclipse.linuxtools.changelog.core"; // $NON-NLS-1$
+	
+	// The shared instance.
+	private static ChangelogPlugin plugin;
+
+	/**
+	 * The constructor.
+	 */
+	public ChangelogPlugin() {
+		// super();
+		plugin = this;
+	}
+
+	/**
+	 * Returns the shared instance.
+	 */
+	public static ChangelogPlugin getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/ChangelogPreferenceInitializer.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/ChangelogPreferenceInitializer.java
new file mode 100644
index 0000000..ab4e6e6
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/ChangelogPreferenceInitializer.java
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Alexander Kurtakov (Red Hat) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core;
+
+import java.net.UnknownHostException;
+
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.jface.preference.IPreferenceStore;
+
+public class ChangelogPreferenceInitializer extends
+		AbstractPreferenceInitializer {
+
+	@Override
+	public void initializeDefaultPreferences() {
+		IPreferenceStore store = ChangelogPlugin.getDefault()
+				.getPreferenceStore();
+		store.setDefault("IChangeLogConstants.DATE_FORMAT", "true"); // $NON-NLS-1$
+																		// //
+																		// $NON-NLS-2$
+		store.setDefault("IChangeLogConstants.APPEND_RESOURCE_PATH", "false"); // $NON-NLS-1$
+																				// //
+																				// $NON-NLS-2$
+
+		store.setDefault("IChangeLogConstants.AUTHOR_NAME", // $NON-NLS-1$
+				getUserRealName());
+		store.setDefault("IChangeLogConstants.AUTHOR_EMAIL", // $NON-NLS-2$
+				getUserEmail());
+		store.setDefault("IChangeLogConstants.DEFAULT_FORMATTER", // $NON-NLS-1$
+				Messages.getString("ChangeLogPreferencesPage.gnuFormatter")); // $NON-NLS-1$
+		store.setDefault("IChangeLogConstants.DEFAULT_EDITOR", // $NON-NLS-1$
+				Messages.getString("ChangeLogPreferencesPage.gnuEditorConfig")); // $NON-NLS-1$
+	}
+
+	private String getUserRealName() {
+		String realUserName = System.getenv("ECLIPSE_CHANGELOG_REALNAME"); // $NON-NLS-1$
+		if (realUserName != null)
+			return realUserName;
+		return System.getProperty("gnu.gcj.user.realname", //$NON-NLS-1$
+				getUserName());
+	}
+
+	private String getUserEmail() {
+		String emailID = System.getenv("ECLIPSE_CHANGELOG_EMAIL"); // $NON-NLS-1$
+		if (emailID != null)
+			return emailID;
+		return getUserName() + "@" + getHostName(); // $NON-NLS-1$
+	}
+
+	private String getUserName() {
+		return System.getProperty("user.name"); //$NON-NLS-1$
+	}
+
+	private String getHostName() {
+		try {
+			return java.net.InetAddress.getLocalHost().getHostName();
+		} catch (UnknownHostException e) {
+			// instead of throwing exception, return default host name
+			// RH bug#194406
+			return "localhost.localdomain"; //$NON-NLS-1$
+		}
+	}
+
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/IEditorChangeLogContrib.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/IEditorChangeLogContrib.java
new file mode 100644
index 0000000..1c7b052
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/IEditorChangeLogContrib.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kyu Lee <klee@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core;
+
+import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
+import org.eclipse.jface.text.hyperlink.IHyperlinkPresenter;
+import org.eclipse.jface.text.presentation.IPresentationReconciler;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.ui.editors.text.TextEditor;
+
+/**
+ * @author klee (Kyu Lee)
+ */
+public interface IEditorChangeLogContrib {
+
+	/**
+	 * Set TextEditor that this configuration is going to be used.
+	 * 
+	 * @param editor The text editor for this configuration.
+	 */
+	public void setTextEditor(TextEditor editor);
+
+	/**
+	 * Set default content type. GNU Changelog only has one type.
+	 * 
+	 * @return default content type.
+	 */
+	public String[] getConfiguredContentTypes(ISourceViewer sourceViewer);
+
+	/**
+	 * Detects hyperlinks in GNU formatted changelogs.
+	 * 
+	 * @return link detector for GNU format.
+	 */
+	public IHyperlinkDetector[] getHyperlinkDetectors(ISourceViewer sourceViewer);
+
+	/**
+	 * Hyperlink presenter (decorator).
+	 * 
+	 * @return default presenter.
+	 */
+	public IHyperlinkPresenter getHyperlinkPresenter(ISourceViewer sourceViewer);
+
+	/**
+	 * Highlights GNU format changelog syntaxes.
+	 * 
+	 * @return reconciler for GNU format changelog.
+	 */
+	public IPresentationReconciler getPresentationReconciler(
+			ISourceViewer sourceViewer);
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/IEditorChangeLogContrib2.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/IEditorChangeLogContrib2.java
new file mode 100644
index 0000000..4e1e07a
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/IEditorChangeLogContrib2.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Jeff Johnston <jjohnstn@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core;
+
+import org.eclipse.jface.text.IDocument;
+
+public interface IEditorChangeLogContrib2 {
+
+	/**
+	 * Perform documentation setup.  Use this to specify partitioning.
+	 * 
+	 * @param document to set up.
+	 */
+	public void setup(IDocument document);
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/IFormatterChangeLogContrib.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/IFormatterChangeLogContrib.java
new file mode 100644
index 0000000..5fee448
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/IFormatterChangeLogContrib.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Phil Muldoon <pkmuldoon@picobot.org>.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Phil Muldoon <pmuldoon@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core;
+
+import org.eclipse.ui.IEditorPart;
+
+/**
+ * @author pmuldoon (Phil Muldoon)
+ */
+public interface IFormatterChangeLogContrib {
+	
+	public String formatDateLine(String authorName, String authorEmail);
+	public String mergeChangelog(String dateLine, String functionGuess,String defaultContent,
+			IEditorPart changelog, String changeLogLocation, String fileLocation);
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/IParserChangeLogContrib.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/IParserChangeLogContrib.java
new file mode 100644
index 0000000..bf72fa7
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/IParserChangeLogContrib.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Phil Muldoon <pkmuldoon@picobot.org>.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Phil Muldoon <pmuldoon@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+
+/**
+ * @author pmuldoon (Phil Muldoon)
+ */
+public interface IParserChangeLogContrib {
+
+	/**
+	 * Used to determine function name from a currently open editor, where the
+	 * cursor is at. Used by KeyAction.
+	 * 
+	 * @param editor The editor to check for the function.
+	 * @return The name of the function.
+	 * @throws CoreException If unexpected error happens in the underlying Eclipse APIs.
+	 */
+	public String parseCurrentFunction(IEditorPart editor) throws CoreException;
+
+	/**
+	 * Used to determine function name from and editor input, with offset
+	 * supplied manualy. Used by prepare changelog.
+	 * 
+	 * @param input If unexpected error happens in the underlying Eclipse APIs.
+	 * @param offset The offset at which to start.
+	 * @return The name of the function.
+	 * @throws CoreException If unexpected error happens in the underlying Eclipse APIs.
+	 */
+	public String parseCurrentFunction(IEditorInput input, int offset)
+			throws CoreException;
+
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/LineComparator.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/LineComparator.java
new file mode 100644
index 0000000..d520daf
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/LineComparator.java
@@ -0,0 +1,157 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2006, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     Red Hat Inc. - copied to changelog plugin
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+
+import org.eclipse.compare.rangedifferencer.IRangeComparator;
+import org.eclipse.core.resources.IEncodedStorage;
+import org.eclipse.core.resources.IStorage;
+import org.eclipse.core.runtime.CoreException;
+
+/**
+ * This implementation of IRangeComparator breaks an input stream into lines.
+ * Copied from org.eclipse.compare.internal.merge.LineComparator 1.4 and
+ * modified for {@link IStorage}.
+ */
+public class LineComparator implements IRangeComparator {
+
+    private String[] fLines;
+
+    /*
+     * An input stream reader that detects a trailing LF in the wrapped stream.
+     */
+    private static class TrailingLineFeedDetector extends FilterInputStream {
+
+    	boolean trailingLF = false;
+    	
+		protected TrailingLineFeedDetector(InputStream in) {
+			super(in);
+		}
+		
+		@Override
+		public int read() throws IOException {
+			int c = super.read();
+			trailingLF = isLineFeed(c);
+			return c;
+		}
+		
+	    /*
+	     * We don't need to override read(byte[] buffer) as the javadoc of 
+	     * FilterInputStream states that it will call read(byte[] buffer, int off, int len)
+	     */
+		@Override
+		public int read(byte[] buffer, int off, int len) throws IOException {
+			int length = super.read(buffer, off, len);
+			if (length != -1) {
+				int index = off + length - 1;
+				if (index >= buffer.length)
+					index = buffer.length - 1;
+				trailingLF = isLineFeed(buffer[index]);
+			}
+			return length;
+		}
+
+		private boolean isLineFeed(int c) {
+			return c != -1 && c == '\n';
+		}
+		
+		public boolean hadTrailingLineFeed() {
+			return trailingLF;
+		}
+    	
+    }
+    
+    public static LineComparator create(IStorage storage, String outputEncoding) throws CoreException, UnsupportedEncodingException {
+    	InputStream is = new BufferedInputStream(storage.getContents());
+    	try {
+			String encoding = getEncoding(storage, outputEncoding);
+			return new LineComparator(is, encoding);
+		} finally {
+			try {
+				is.close();
+			} catch (IOException e) {
+				// Ignore
+			}
+		}
+    }
+    
+	private static String getEncoding(IStorage storage, String outputEncoding) throws CoreException {
+		if (storage instanceof IEncodedStorage) {
+			IEncodedStorage es = (IEncodedStorage) storage;
+			String charset = es.getCharset();
+			if (charset != null)
+				return charset;
+		}
+		return outputEncoding;
+	}
+	
+    public LineComparator(InputStream is, String encoding) throws UnsupportedEncodingException {
+        
+        TrailingLineFeedDetector trailingLineFeedDetector = new TrailingLineFeedDetector(is);
+		BufferedReader br = new BufferedReader(new InputStreamReader(trailingLineFeedDetector, encoding));
+        String line;
+        ArrayList<String> ar = new ArrayList<String>();
+        try {
+            while ((line = br.readLine()) != null)
+                ar.add(line);
+        } catch (IOException e) {
+        		// silently ignored
+        }
+        try {
+            is.close();
+        } catch (IOException e1) {
+        }
+        // Add a trailing line if the last character in the file was a line feed.
+        // We do this because a BufferedReader doesn't distinguish the case
+        // where the last line has or doesn't have a trailing line separator
+        if (trailingLineFeedDetector.hadTrailingLineFeed()) {
+        	ar.add(""); //$NON-NLS-1$
+        }
+        fLines = ar.toArray(new String[ar.size()]);
+    }
+
+	String getLine(int ix) {
+        return fLines[ix];
+    }
+
+    /* (non-Javadoc)
+     * @see org.eclipse.compare.rangedifferencer.IRangeComparator#getRangeCount()
+     */
+    public int getRangeCount() {
+        return fLines.length;
+    }
+
+    /* (non-Javadoc)
+     * @see org.eclipse.compare.rangedifferencer.IRangeComparator#rangesEqual(int, org.eclipse.compare.rangedifferencer.IRangeComparator, int)
+     */
+    public boolean rangesEqual(int thisIndex, IRangeComparator other,
+            int otherIndex) {
+        String s1 = fLines[thisIndex];
+        String s2 = ((LineComparator) other).fLines[otherIndex];
+        return s1.equals(s2);
+    }
+
+    /* (non-Javadoc)
+     * @see org.eclipse.compare.rangedifferencer.IRangeComparator#skipRangeComparison(int, int, org.eclipse.compare.rangedifferencer.IRangeComparator)
+     */
+    public boolean skipRangeComparison(int length, int maxLength, IRangeComparator other) {
+        return false;
+    }
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/Messages.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/Messages.java
new file mode 100644
index 0000000..3d101d8
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/Messages.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2004 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Phil Muldoon <pmuldoon@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+/**
+ * @author pmuldoon
+ *
+ * To change the template for this generated type comment go to
+ * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
+ */
+public class Messages {
+
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.changelog.core.strings"; //$NON-NLS-1$
+
+	private static final ResourceBundle RESOURCE_BUNDLE =
+		ResourceBundle.getBundle(BUNDLE_NAME);
+
+	/**
+	 * 
+	 */
+	private Messages() {
+		// It shouldn't be instantiated.
+	}
+	/**
+	 * Returns the message for the given key.
+	 * @param key The key of the message looking for.
+	 * @return The found message or "!key!" if no such key.
+	 */
+	public static String getString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogAction.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogAction.java
new file mode 100644
index 0000000..7f683ea
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogAction.java
@@ -0,0 +1,357 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kyu Lee <klee@redhat.com> - initial API and implementation
+ *    Jeff Johnston <jjohnstn@redhat.com> - add removed files support
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.actions;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.compare.CompareEditorInput;
+import org.eclipse.compare.IResourceProvider;
+import org.eclipse.compare.ITypedElement;
+import org.eclipse.compare.structuremergeviewer.ICompareInput;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.linuxtools.changelog.core.ChangeLogExtensionManager;
+import org.eclipse.linuxtools.changelog.core.ChangelogPlugin;
+import org.eclipse.linuxtools.changelog.core.Messages;
+import org.eclipse.team.ui.synchronize.SyncInfoCompareInput;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.MultiPageEditorPart;
+
+
+public abstract class ChangeLogAction extends Action {
+
+	protected ChangeLogExtensionManager extensionManager = null;
+
+	// Preference variables
+	protected String pref_AuthorName;
+
+	protected String pref_AuthorEmail;
+
+	protected String pref_ChangeLogName = "ChangeLog"; // $NON-NLS-1$
+
+	protected String pref_Formatter;
+
+	// set selection here
+	// selection can be either IEditorPart / IProject / IStructuredSelection
+	// IEditorPart and IProject will be adapted to IStructuredSelection.
+
+	public ChangeLogAction() {
+
+		extensionManager = ChangeLogExtensionManager.getExtensionManager();
+	}
+
+	public ChangeLogAction(String name) {
+		super(name);
+		extensionManager = ChangeLogExtensionManager.getExtensionManager();
+	}
+
+	protected void reportErr(String msg, Exception e) {
+		ChangelogPlugin.getDefault().getLog().log(
+				new Status(IStatus.ERROR, ChangelogPlugin.PLUGIN_ID, IStatus.ERROR, msg, e));
+	}
+
+	protected IWorkbench getWorkbench() {
+		return ChangelogPlugin.getDefault().getWorkbench();
+	}
+
+	protected IWorkspaceRoot getWorkspaceRoot() {
+		return ResourcesPlugin.getWorkspace().getRoot();
+	}
+
+	protected IEditorPart openEditor(IFile diskresource) {
+		IWorkbench ws = getWorkbench();
+
+		try {
+			return org.eclipse.ui.ide.IDE.openEditor(ws
+					.getActiveWorkbenchWindow().getActivePage(), diskresource,
+					true);
+		} catch (PartInitException e) {
+			e.printStackTrace();
+
+			return null;
+		}
+	}
+
+	protected String returnQualifedEditor(Class<?> ClassName) {
+		return ClassName.toString().substring(
+				ClassName.getPackage().toString().length() - 1,
+				ClassName.toString().length());
+	}
+
+	protected IFile createChangeLog(IPath changelog) {
+		IWorkspaceRoot myWorkspaceRoot = getWorkspaceRoot();
+		IWorkbench ws = getWorkbench();
+
+		final IFile changelog_File = myWorkspaceRoot.getFile(changelog);
+		final InputStream initialContents = new ByteArrayInputStream(
+				new byte[0]);
+
+		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
+			@Override
+			public void execute(IProgressMonitor monitor) throws CoreException {
+				try {
+					monitor.beginTask(Messages.getString("ChangeLog.AddingChangeLog"), 2000); //$NON-NLS-1$
+					changelog_File.create(initialContents, false, monitor);
+
+					if (monitor.isCanceled()) {
+						throw new OperationCanceledException();
+					}
+
+				} finally {
+					monitor.done();
+				}
+			}
+		};
+
+		try {
+			new ProgressMonitorDialog(ws.getActiveWorkbenchWindow().getShell())
+					.run(true, true, operation);
+		} catch (InterruptedException e) {
+			reportErr(Messages.getString("ChangeLog.ErrInterrupted"), e); // $NON-NLS-1$
+			return null;
+		} catch (InvocationTargetException e) {
+			reportErr(Messages.getString("ChangeLog.ErrInvocation"), e); // $NON-NLS-1$
+			return null;
+		}
+
+		// FIXME:  we should put this refreshLocal call into a thread (filed as bug #256180)
+		try {
+			IContainer changelogContainer = myWorkspaceRoot.getContainerForLocation(changelog);
+			if (changelogContainer != null)
+				changelogContainer.refreshLocal(2, null);
+		} catch (CoreException e) {
+			reportErr(Messages.getString("ChangeLog.ErrRefresh"), e); // $NON-NLS-1$
+			return null;
+		}
+
+		return changelog_File;
+	}
+
+	protected IEditorPart askChangeLogLocation(String editorLoc) {
+		IWorkbench ws = getWorkbench();
+		IWorkspaceRoot myWorkspaceRoot = getWorkspaceRoot();
+
+		IResource given_resource = myWorkspaceRoot.findMember(editorLoc);
+
+		ChangeLogContainerSelectionDialog dialog = new ChangeLogContainerSelectionDialog(ws
+				.getActiveWorkbenchWindow().getShell(), given_resource
+				.getParent(), false, Messages
+				.getString("AddAction.str_ChangeLog_Location")); //$NON-NLS-1$
+		dialog.showClosedProjects(false);
+
+		dialog.open();
+
+		Object[] result = dialog.getResult();
+		if (result == null)
+			return null;
+		final IPath result_path = new Path(result[0]
+				+ System.getProperty("file.separator") + pref_ChangeLogName); //$NON-NLS-1$ //$NON-NLS-2$
+		IFile newChangeLog = createChangeLog(result_path);
+
+		return openEditor(newChangeLog);
+
+	}
+
+	protected IEditorPart getChangelog(String currentEditorloc) {
+		// Scenario 1: The Changelog is in in the current project file
+		IWorkspaceRoot myWorkspaceRoot = getWorkspaceRoot();
+		IResource given_resource = myWorkspaceRoot.findMember(currentEditorloc);
+
+		if (given_resource != null) {
+			IResource parent_dec = given_resource;
+
+			while (parent_dec != null) {
+				String parent_node = parent_dec.getFullPath()
+						.removeLastSegments(1).toOSString();
+				parent_node = parent_node
+						+ System.getProperty("file.separator") + pref_ChangeLogName; //$NON-NLS-1$
+
+				IResource change_log_res = myWorkspaceRoot
+						.findMember(parent_node);
+
+				if (change_log_res != null) {
+					IProject proj_loc = given_resource.getProject();
+					IPath modified_changelog_path = change_log_res
+							.getFullPath().removeFirstSegments(1);
+					IFile change_log_file = proj_loc
+							.getFile(modified_changelog_path);
+
+					return openEditor(change_log_file);
+				}
+
+				parent_dec = parent_dec.getParent();
+
+				if (parent_dec == null) {
+					break;
+				}
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Find the ChangeLog for a file that is being removed.  It can't be found and
+	 * it is possible that the directory it is in has also been removed.
+	 *
+	 * @param path Path of removed file
+	 * @return ChangeLog editor part that must be used to report removed file
+	 */
+	protected IEditorPart getChangelogForRemovePath(IPath path) {
+		IResource parent_resource = null;
+		IPath loc_path = path;
+		// Look from current loc up to find first folder that is still existing
+		IWorkspaceRoot myWorkspaceRoot = getWorkspaceRoot();
+		while (loc_path.segmentCount() > 0) {
+			parent_resource = myWorkspaceRoot.findMember(loc_path);
+			if (parent_resource != null)
+				break;
+			loc_path = loc_path.removeLastSegments(1);
+		}
+
+		if (parent_resource != null) {
+			IResource parent_dec = parent_resource;
+
+			while (parent_dec != null) {
+				String parent_node = parent_dec.getFullPath().toOSString();
+				parent_node = parent_node
+						+ System.getProperty("file.separator") + pref_ChangeLogName; //$NON-NLS-1$
+
+				IResource change_log_res = myWorkspaceRoot
+						.findMember(parent_node);
+
+				if (change_log_res != null) {
+					IProject proj_loc = parent_resource.getProject();
+					IPath modified_changelog_path = change_log_res
+							.getFullPath().removeFirstSegments(1);
+					IFile change_log_file = proj_loc
+							.getFile(modified_changelog_path);
+
+					return openEditor(change_log_file);
+				}
+
+				parent_dec = parent_dec.getParent();
+
+				if (parent_dec == null) {
+					break;
+				}
+			}
+		}
+
+		return null;
+	}
+
+	protected IFile getDocumentIFile(IEditorPart currentEditor) {
+		IEditorInput cc = currentEditor.getEditorInput();
+
+		if (cc instanceof IFileEditorInput)
+			return ((IFileEditorInput) cc).getFile();
+		return null;
+	}
+
+	protected String getDocumentLocation(IEditorPart currentEditor,
+			boolean appendRoot) {
+		
+
+		IFile loc = getDocumentIFile(currentEditor);
+		IEditorInput cc = null;
+		String WorkspaceRoot;
+
+		try {
+		IWorkspaceRoot myWorkspaceRoot = getWorkspaceRoot();
+		WorkspaceRoot = myWorkspaceRoot.getLocation().toOSString();
+		
+		if (currentEditor instanceof MultiPageEditorPart) {
+			Object ed = ((MultiPageEditorPart) currentEditor).getSelectedPage();
+			if (ed instanceof IEditorPart) 
+				cc = ((IEditorPart) ed).getEditorInput();
+			if (cc instanceof FileEditorInput)
+				return (appendRoot) ? WorkspaceRoot + ((FileEditorInput) cc).getFile().getFullPath().toOSString() :
+					((FileEditorInput) cc).getFile().getFullPath().toOSString();
+		}
+		
+		
+		cc = currentEditor.getEditorInput();
+		} catch(Exception e) {
+			return "";
+		}
+		
+
+		if (cc == null)
+			return "";
+
+		if ((cc instanceof SyncInfoCompareInput)
+				|| (cc instanceof CompareEditorInput)) {
+
+			CompareEditorInput test = (CompareEditorInput) cc;
+			if (test.getCompareResult() == null) {
+				return "";
+			} else if (test.getCompareResult() instanceof ICompareInput) {
+				ITypedElement leftCompare = ((ICompareInput) test.getCompareResult())
+						.getLeft();
+				if (leftCompare instanceof IResourceProvider){
+					String localPath = ((IResourceProvider)leftCompare).getResource().getFullPath().toString();
+					if (appendRoot) {
+						return WorkspaceRoot + localPath;
+					}
+					return localPath;
+				}
+			} else {
+				if (appendRoot)
+					return WorkspaceRoot + test.getCompareResult().toString();
+				return test.getCompareResult().toString();
+			}
+		}
+
+
+		
+		if (appendRoot) {
+			return WorkspaceRoot + loc.getFullPath().toOSString();
+		} else {
+			return loc.getFullPath().toOSString();
+		}
+	}
+
+	protected void loadPreferences() {
+		IPreferenceStore store = ChangelogPlugin.getDefault()
+				.getPreferenceStore();
+
+		pref_AuthorName = store.getString("IChangeLogConstants.AUTHOR_NAME"); //$NON-NLS-1$
+		pref_AuthorEmail = store.getString("IChangeLogConstants.AUTHOR_EMAIL"); //$NON-NLS-1$
+
+		pref_Formatter = store
+				.getString("IChangeLogConstants.DEFAULT_FORMATTER"); // $NON-NLS-1$
+	}
+
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogContainerContentProvider.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogContainerContentProvider.java
new file mode 100644
index 0000000..efb8184
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogContainerContentProvider.java
@@ -0,0 +1,133 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     Red Hat Inc. - modified this file to work with ChangeLog Plugin
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.actions;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+
+/**
+ * Provides content for a tree viewer that shows only containers.
+ */
+public class ChangeLogContainerContentProvider implements ITreeContentProvider {
+    private boolean showClosedProjects = true;
+
+    /**
+     * Creates a new ContainerContentProvider.
+     */
+    public ChangeLogContainerContentProvider() {
+    }
+
+    /**
+     * The visual part that is using this content provider is about
+     * to be disposed. Deallocate all allocated SWT resources.
+     */
+    public void dispose() {
+    }
+
+    /*
+     * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
+     */
+    public Object[] getChildren(Object element) {
+        if (element instanceof IWorkspace) {
+            // check if closed projects should be shown
+            IProject[] allProjects = ((IWorkspace) element).getRoot()
+                    .getProjects();
+            if (showClosedProjects) {
+				return allProjects;
+			}
+
+            ArrayList<IProject> accessibleProjects = new ArrayList<IProject>();
+            for (int i = 0; i < allProjects.length; i++) {
+                if (allProjects[i].isOpen()) {
+                    accessibleProjects.add(allProjects[i]);
+                }
+            }
+            return accessibleProjects.toArray();
+        } else if (element instanceof IContainer) {
+            IContainer container = (IContainer) element;
+            if (container.isAccessible()) {
+                try {
+                    List<IResource> children = new ArrayList<IResource>();
+                    IResource[] members = container.members();
+                    for (int i = 0; i < members.length; i++) {
+                        if (members[i].getType() != IResource.FILE) {
+                            children.add(members[i]);
+                        }
+                    }
+                    return children.toArray();
+                } catch (CoreException e) {
+                    // this should never happen because we call #isAccessible before invoking #members
+                }
+            }
+        } else if (element instanceof ChangeLogRootContainer) {
+        	ChangeLogRootContainer container = (ChangeLogRootContainer) element;
+        	List<IResource> children = new ArrayList<IResource>();
+        	IResource[] members = container.members();
+        	for (int i = 0; i < members.length; i++) {
+        		if (members[i].getType() != IResource.FILE) {
+        			children.add(members[i]);
+        		}
+        	}
+        	return children.toArray();
+        }
+      return new Object[0];
+    }
+
+    /*
+     * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
+     */
+    public Object[] getElements(Object element) {
+        return getChildren(element);
+    }
+
+    /*
+     * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
+     */
+    public Object getParent(Object element) {
+        if (element instanceof IResource) {
+			return ((IResource) element).getParent();
+		}
+        return null;
+    }
+
+    /*
+     * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
+     */
+    public boolean hasChildren(Object element) {
+        return getChildren(element).length > 0;
+    }
+
+    /*
+     * @see org.eclipse.jface.viewers.IContentProvider#inputChanged
+     */
+    public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+    }
+
+    /**
+     * Specify whether or not to show closed projects in the tree 
+     * viewer.  Default is to show closed projects.
+     * 
+     * @param show boolean if false, do not show closed projects in the tree
+     */
+    public void showClosedProjects(boolean show) {
+        showClosedProjects = show;
+    }
+
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogContainerSelectionDialog.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogContainerSelectionDialog.java
new file mode 100644
index 0000000..b18612b
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogContainerSelectionDialog.java
@@ -0,0 +1,191 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   IBM Corporation - initial API and implementation 
+ *   Sebastian Davids <sdavids@gmx.de> - Fix for bug 19346 - Dialog
+ *     font should be activated and used by other components.
+ *   Red Hat Inc. - modified this file to work with ChangeLog Plugin
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.changelog.core.actions;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.linuxtools.changelog.core.Messages;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.dialogs.ISelectionValidator;
+import org.eclipse.ui.dialogs.SelectionDialog;
+
+/**
+ * A standard selection dialog which solicits a container resource from the user.
+ * The <code>getResult</code> method returns the selected container resource.
+ * <p>
+ * This class may be instantiated; it is not intended to be subclassed.
+ * </p>
+ * <p>
+ * Example:
+ * <pre>
+ * ContainerSelectionDialog dialog =
+ *    new ContainerSelectionDialog(getShell(), initialSelection, allowNewContainerName(), msg);
+ *	dialog.open();
+ *	Object[] result = dialog.getResult();
+ * </pre> 	
+ * </p>
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class ChangeLogContainerSelectionDialog extends SelectionDialog {
+    /**
+	 * 
+	 */
+	private static final String EMPTY_STRING = ""; //$NON-NLS-1$
+	
+	private static final String ContainerSelectionDialog_title = Messages.getString("ChangeLogContainerSelectionDialog.Title"); //$NON-NLS-1$
+	private static final String ContainerSelectionDialog_message = Messages.getString("ChangeLogContainerSelectionDialog.Message"); //$NON-NLS-1$
+	private static final String CONTAINER_SELECTION_DIALOG = "org.eclipse.ui.ide.container_selection_dialog_context"; //$NON-NLS-1$
+	
+
+	// the widget group;
+    ChangeLogContainerSelectionGroup group;
+
+    // the root resource to populate the viewer with
+    private IContainer initialSelection;
+
+    // allow the user to type in a new container name
+    private boolean allowNewContainerName = true;
+
+    // the validation message
+    Label statusMessage;
+
+    //for validating the selection
+    ISelectionValidator validator;
+
+    // show closed projects by default
+    private boolean showClosedProjects = true;
+
+    /**
+     * Creates a resource container selection dialog rooted at the given resource.
+     * All selections are considered valid. 
+     *
+     * @param parentShell the parent shell
+     * @param initialRoot the initial selection in the tree
+     * @param allowNewContainerName <code>true</code> to enable the user to type in
+     *  a new container name, and <code>false</code> to restrict the user to just
+     *  selecting from existing ones
+     * @param message the message to be displayed at the top of this dialog, or
+     *    <code>null</code> to display a default message
+     */
+    public ChangeLogContainerSelectionDialog(Shell parentShell, IContainer initialRoot,
+            boolean allowNewContainerName, String message) {
+        super(parentShell);
+        setTitle(ContainerSelectionDialog_title);
+        this.initialSelection = initialRoot;
+        this.allowNewContainerName = allowNewContainerName;
+        if (message != null) {
+			setMessage(message);
+		} else {
+			setMessage(ContainerSelectionDialog_message);
+		}
+        setShellStyle(getShellStyle() | SWT.SHEET);
+    }
+
+    /* (non-Javadoc)
+     * Method declared in Window.
+     */
+    @Override
+	protected void configureShell(Shell shell) {
+        super.configureShell(shell);
+        PlatformUI.getWorkbench().getHelpSystem()
+                .setHelp(shell, CONTAINER_SELECTION_DIALOG);
+    }
+
+    /* (non-Javadoc)
+     * Method declared on Dialog.
+     */
+    @Override
+	protected Control createDialogArea(Composite parent) {
+        // create composite 
+        Composite area = (Composite) super.createDialogArea(parent);
+
+        Listener listener = new Listener() {
+            public void handleEvent(Event event) {
+                if (statusMessage != null && validator != null) {
+                    String errorMsg = validator.isValid(group
+                            .getContainerFullPath());
+                    if (errorMsg == null || errorMsg.equals(EMPTY_STRING)) {
+                        statusMessage.setText(EMPTY_STRING);
+                        getOkButton().setEnabled(true);
+                    } else {
+                        statusMessage.setText(errorMsg);
+                        getOkButton().setEnabled(false);
+                    }
+                }
+            }
+        };
+
+        // container selection group
+        group = new ChangeLogContainerSelectionGroup(area, listener,
+                allowNewContainerName, getMessage(), showClosedProjects, initialSelection);
+        if (initialSelection != null) {
+            group.setSelectedContainer(initialSelection);
+        }
+
+        statusMessage = new Label(area, SWT.WRAP);
+        statusMessage.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+        statusMessage.setText(" \n "); //$NON-NLS-1$
+        statusMessage.setFont(parent.getFont());
+
+        return dialogArea;
+    }
+
+    /**
+     * The <code>ContainerSelectionDialog</code> implementation of this 
+     * <code>Dialog</code> method builds a list of the selected resource containers
+     * for later retrieval by the client and closes this dialog.
+     */
+    @Override
+	protected void okPressed() {
+
+        List<IPath> chosenContainerPathList = new ArrayList<IPath>();
+        IPath returnValue = group.getContainerFullPath();
+        if (returnValue != null) {
+			chosenContainerPathList.add(returnValue);
+		}
+        setResult(chosenContainerPathList);
+        super.okPressed();
+    }
+
+    /**
+     * Sets the validator to use.  
+     * 
+     * @param validator A selection validator
+     */
+    public void setValidator(ISelectionValidator validator) {
+        this.validator = validator;
+    }
+
+    /**
+     * Set whether or not closed projects should be shown
+     * in the selection dialog.
+     * 
+     * @param show Whether or not to show closed projects.
+     */
+    public void showClosedProjects(boolean show) {
+        this.showClosedProjects = show;
+    }
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogContainerSelectionGroup.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogContainerSelectionGroup.java
new file mode 100644
index 0000000..bb8da78
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogContainerSelectionGroup.java
@@ -0,0 +1,360 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     Igor Fedorenko <igorfie@yahoo.com> - 
+ *     		Fix for Bug 136921 [IDE] New File dialog locks for 20 seconds
+ *	   Red Hat Inc. - modified this file to work with ChangeLog Plugin
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.actions;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.ViewerComparator;
+import org.eclipse.linuxtools.changelog.core.Messages;
+import org.eclipse.osgi.util.TextProcessor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.model.WorkbenchLabelProvider;
+import org.eclipse.ui.part.DrillDownComposite;
+
+/**
+ * Workbench-level composite for choosing a container.
+ */
+public class ChangeLogContainerSelectionGroup extends Composite {
+	// The listener to notify of events
+	private Listener listener;
+
+	// Enable user to type in new container name
+	private boolean allowNewContainerName = true;
+
+	// show all projects by default
+	private boolean showClosedProjects = true;
+
+	// Last selection made by user
+	private IContainer selectedContainer;
+
+	// handle on parts
+	private Text containerNameField;
+
+	TreeViewer treeViewer;
+
+	private IContainer initialSelection;
+
+	// the message to display at the top of this dialog
+	private static final String DEFAULT_MSG_NEW_ALLOWED = Messages.getString("ChangeLogContainerSelectionGroup.DefaultMessageNewAllowed"); //$NON-NLS-1$
+
+	private static final String DEFAULT_MSG_SELECT_ONLY = Messages.getString("ChangeLogContainerSelectionGroup.DefaultMessageSelectOnly"); //$NON-NLS-1$
+
+	// sizing constants
+	private static final int SIZING_SELECTION_PANE_WIDTH = 320;
+
+	private static final int SIZING_SELECTION_PANE_HEIGHT = 300;
+
+	/**
+	 * Creates a new instance of the widget.
+	 * 
+	 * @param parent
+	 *            The parent widget of the group.
+	 * @param listener
+	 *            A listener to forward events to. Can be null if no listener is
+	 *            required.
+	 * @param allowNewContainerName
+	 *            Enable the user to type in a new container name instead of
+	 *            just selecting from the existing ones.
+	 */
+	/*public ChangeLogContainerSelectionGroup(Composite parent, Listener listener,
+			boolean allowNewContainerName) {
+		this(parent, listener, allowNewContainerName, null);
+	}*/
+
+	/**
+	 * Creates a new instance of the widget.
+	 * 
+	 * @param parent
+	 *            The parent widget of the group.
+	 * @param listener
+	 *            A listener to forward events to. Can be null if no listener is
+	 *            required.
+	 * @param allowNewContainerName
+	 *            Enable the user to type in a new container name instead of
+	 *            just selecting from the existing ones.
+	 * @param message
+	 *            The text to present to the user.
+	 */
+	/*public ChangeLogContainerSelectionGroup(Composite parent, Listener listener,
+			boolean allowNewContainerName, String message) {
+		this(parent, listener, allowNewContainerName, message, true);
+	}*/
+
+	/**
+	 * Creates a new instance of the widget.
+	 * 
+	 * @param parent
+	 *            The parent widget of the group.
+	 * @param listener
+	 *            A listener to forward events to. Can be null if no listener is
+	 *            required.
+	 * @param allowNewContainerName
+	 *            Enable the user to type in a new container name instead of
+	 *            just selecting from the existing ones.
+	 * @param message
+	 *            The text to present to the user.
+	 * @param showClosedProjects
+	 *            Whether or not to show closed projects.
+	 */
+	public ChangeLogContainerSelectionGroup(Composite parent, Listener listener,
+			boolean allowNewContainerName, String message,
+			boolean showClosedProjects, IContainer initialSelection) {
+		this(parent, listener, allowNewContainerName, message,
+				showClosedProjects, SIZING_SELECTION_PANE_HEIGHT,
+				SIZING_SELECTION_PANE_WIDTH, initialSelection);
+	}
+
+	/**
+	 * Creates a new instance of the widget.
+	 * 
+	 * @param parent
+	 *            The parent widget of the group.
+	 * @param listener
+	 *            A listener to forward events to. Can be null if no listener is
+	 *            required.
+	 * @param allowNewContainerName
+	 *            Enable the user to type in a new container name instead of
+	 *            just selecting from the existing ones.
+	 * @param message
+	 *            The text to present to the user.
+	 * @param showClosedProjects
+	 *            Whether or not to show closed projects.
+	 * @param heightHint
+	 *            height hint for the drill down composite
+	 * @param widthHint
+	 *            width hint for the drill down composite
+	 */
+	public ChangeLogContainerSelectionGroup(Composite parent, Listener listener,
+			boolean allowNewContainerName, String message,
+			boolean showClosedProjects, int heightHint, int widthHint, IContainer initialSelection) {
+		super(parent, SWT.NONE);
+		this.listener = listener;
+		this.allowNewContainerName = allowNewContainerName;
+		this.showClosedProjects = showClosedProjects;
+		this.initialSelection = initialSelection;
+		if (message != null) {
+			createContents(message, heightHint, widthHint);
+		} else if (allowNewContainerName) {
+			createContents(DEFAULT_MSG_NEW_ALLOWED, heightHint, widthHint);
+		} else {
+			createContents(DEFAULT_MSG_SELECT_ONLY, heightHint, widthHint);
+		}
+	}
+
+	/**
+	 * The container selection has changed in the tree view. Update the
+	 * container name field value and notify all listeners.
+	 * 
+	 * @param container
+	 *            The container that changed
+	 */
+	public void containerSelectionChanged(IContainer container) {
+		selectedContainer = container;
+
+		if (allowNewContainerName) {
+			if (container == null) {
+				containerNameField.setText("");//$NON-NLS-1$
+			} else {
+				String text = TextProcessor.process(container.getFullPath()
+						.makeRelative().toString());
+				containerNameField.setText(text);
+				containerNameField.setToolTipText(text);
+			}
+		}
+
+		// fire an event so the parent can update its controls
+		if (listener != null) {
+			Event changeEvent = new Event();
+			changeEvent.type = SWT.Selection;
+			changeEvent.widget = this;
+			listener.handleEvent(changeEvent);
+		}
+	}
+
+	/**
+	 * Creates the contents of the composite.
+	 * 
+	 * @param message message
+	 */
+	public void createContents(String message) {
+		createContents(message, SIZING_SELECTION_PANE_HEIGHT,
+				SIZING_SELECTION_PANE_WIDTH);
+	}
+
+	/**
+	 * Creates the contents of the composite.
+	 * 
+	 * @param message message
+	 * @param heightHint height hint for the drill down composite
+	 * @param widthHint specifies the perfered width in pixels
+	 */
+	public void createContents(String message, int heightHint, int widthHint) {
+		GridLayout layout = new GridLayout();
+		layout.marginWidth = 0;
+		setLayout(layout);
+		setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+
+		Label label = new Label(this, SWT.WRAP);
+		label.setText(message);
+		label.setFont(this.getFont());
+
+		if (allowNewContainerName) {
+			containerNameField = new Text(this, SWT.SINGLE | SWT.BORDER);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.widthHint = widthHint;
+			containerNameField.setLayoutData(gd);
+			containerNameField.addListener(SWT.Modify, listener);
+			containerNameField.setFont(this.getFont());
+		} else {
+			// filler...
+			new Label(this, SWT.NONE);
+		}
+
+		createTreeViewer(heightHint);
+		Dialog.applyDialogFont(this);
+	}
+
+	/**
+	 * Returns a new drill down viewer for this dialog.
+	 * 
+	 * @param heightHint
+	 *            height hint for the drill down composite
+	 */
+	protected void createTreeViewer(int heightHint) {
+		// Create drill down.
+		DrillDownComposite drillDown = new DrillDownComposite(this, SWT.BORDER);
+		GridData spec = new GridData(SWT.FILL, SWT.FILL, true, true);
+		spec.widthHint = SIZING_SELECTION_PANE_WIDTH;
+		spec.heightHint = heightHint;
+		drillDown.setLayoutData(spec);
+
+		// Create tree viewer inside drill down.
+		treeViewer = new TreeViewer(drillDown, SWT.NONE);
+		drillDown.setChildTree(treeViewer);
+		ChangeLogContainerContentProvider cp = new ChangeLogContainerContentProvider();
+		cp.showClosedProjects(showClosedProjects);
+		treeViewer.setContentProvider(cp);
+		treeViewer.setLabelProvider(WorkbenchLabelProvider
+				.getDecoratingWorkbenchLabelProvider());
+		treeViewer.setComparator(new ViewerComparator());
+		treeViewer.setUseHashlookup(true);
+		treeViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+			public void selectionChanged(SelectionChangedEvent event) {
+				IStructuredSelection selection = (IStructuredSelection) event
+						.getSelection();
+				containerSelectionChanged((IContainer) selection
+						.getFirstElement()); // allow null
+			}
+		});
+		treeViewer.addDoubleClickListener(new IDoubleClickListener() {
+			public void doubleClick(DoubleClickEvent event) {
+				ISelection selection = event.getSelection();
+				if (selection instanceof IStructuredSelection) {
+					Object item = ((IStructuredSelection) selection)
+							.getFirstElement();
+					if (item == null) {
+						return;
+					}
+					if (treeViewer.getExpandedState(item)) {
+						treeViewer.collapseToLevel(item, 1);
+					} else {
+						treeViewer.expandToLevel(item, 1);
+					}
+				}
+			}
+		});
+
+		/*
+		 * This helps in displaying all folders under the document
+		 * root as well as the actual root itself.
+		 */
+		ChangeLogRootContainer root = new ChangeLogRootContainer(this.initialSelection.getProject());
+		// This has to be done after the viewer has been laid out
+		treeViewer.setInput(root);
+	}
+
+	/**
+	 * Returns the currently entered container name. Null if the field is empty.
+	 * Note that the container may not exist yet if the user entered a new
+	 * container name in the field.
+	 * 
+	 * @return IPath
+	 */
+	public IPath getContainerFullPath() {
+		if (allowNewContainerName) {
+			String pathName = containerNameField.getText();
+			if (pathName == null || pathName.length() < 1) {
+				return null;
+			}
+			// The user may not have made this absolute so do it for them
+			return (new Path(TextProcessor.deprocess(pathName))).makeAbsolute();
+
+		}
+		if (selectedContainer == null)
+			return null;
+		return selectedContainer.getFullPath();
+
+	}
+
+	/**
+	 * Gives focus to one of the widgets in the group, as determined by the
+	 * group.
+	 */
+	public void setInitialFocus() {
+		if (allowNewContainerName) {
+			containerNameField.setFocus();
+		} else {
+			treeViewer.getTree().setFocus();
+		}
+	}
+
+	/**
+	 * Sets the selected existing container.
+	 * 
+	 * @param container container to set
+	 */
+	public void setSelectedContainer(IContainer container) {
+		selectedContainer = container;
+
+		// expand to and select the specified container
+		List<IContainer> itemsToExpand = new ArrayList<IContainer>();
+		IContainer parent = container.getParent();
+		while (parent != null) {
+			itemsToExpand.add(0, parent);
+			parent = parent.getParent();
+		}
+		treeViewer.setExpandedElements(itemsToExpand.toArray());
+		treeViewer.setSelection(new StructuredSelection(container), true);
+	}
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogRootContainer.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogRootContainer.java
new file mode 100644
index 0000000..1c90e7e
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/ChangeLogRootContainer.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.actions;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+
+public class ChangeLogRootContainer {
+
+	private IProject proj;
+	
+	public ChangeLogRootContainer(IProject project) {
+		proj = project;
+	}
+
+	public IResource[] members() {
+		return new IResource[]{proj};
+	}
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/FormatChangeLogAction.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/FormatChangeLogAction.java
new file mode 100644
index 0000000..39d9bb9
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/FormatChangeLogAction.java
@@ -0,0 +1,86 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kyu Lee <klee@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.commands.IHandlerListener;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.SourceViewer;
+import org.eclipse.linuxtools.changelog.core.ChangelogPlugin;
+import org.eclipse.linuxtools.changelog.core.editors.ChangeLogEditor;
+import org.eclipse.ui.IWorkbench;
+
+
+
+public class FormatChangeLogAction extends Action implements IHandler {
+
+
+	ChangeLogEditor editor = null;
+
+	public FormatChangeLogAction(ChangeLogEditor te) {
+		super("Format ChangeLog");
+		editor = te;
+	}
+
+	public FormatChangeLogAction() {
+		super("Format ChangeLog");
+		//editor = te;
+		try {
+			editor = (ChangeLogEditor)getWorkbench().getActiveWorkbenchWindow()
+					.getActivePage().getActiveEditor();
+		} catch (Exception e) {
+			// no editor is active now so do nothing
+		return;
+		}
+	}
+	protected IWorkbench getWorkbench() {
+		return ChangelogPlugin.getDefault().getWorkbench();
+	}
+	@Override
+	public void run() {
+
+		if (editor == null)
+			return;
+
+		SourceViewer srcViewer = (SourceViewer)editor.getMySourceViewer();
+		if (srcViewer != null) {
+			srcViewer.doOperation(ISourceViewer.FORMAT);
+
+		}
+
+	}
+
+	public void addHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	public void dispose() {
+		// TODO Auto-generated method stub
+		
+	}
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		// TODO Auto-generated method stub
+		run();
+		
+		return null;
+	}
+
+	public void removeHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+		
+	}
+
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/InsertChangeLogKeyHandler.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/InsertChangeLogKeyHandler.java
new file mode 100644
index 0000000..b3f5fbd
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/InsertChangeLogKeyHandler.java
@@ -0,0 +1,200 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Phil Muldoon <pkmuldoon@picobot.org>.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Phil Muldoon <pmuldoon@redhat.com> - initial API and implementation
+ *    Kyu Lee <klee@redhat.com>          - new execute method
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.commands.IHandlerListener;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.linuxtools.changelog.core.ChangeLogWriter;
+import org.eclipse.linuxtools.changelog.core.IParserChangeLogContrib;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+
+
+/**
+ * @author pmuldoon (Phil Muldoon)
+ */
+public class InsertChangeLogKeyHandler extends ChangeLogAction implements
+		IHandler, IWorkbenchWindowActionDelegate {
+
+	private IEditorPart currentEditor;
+
+	public InsertChangeLogKeyHandler() {
+		super();
+	}
+
+	String getEditorName() {
+		if (currentEditor != null)
+			return returnQualifedEditor(currentEditor.getClass());
+		else
+			return "";
+
+	}
+
+	String getEntryFilePath() {
+		if (currentEditor != null)
+			return getDocumentLocation(currentEditor, false);
+		else
+			return "";
+	}
+
+	IEditorPart getChangelog() {
+
+		IConfigurationElement formatterConfigElement = extensionManager
+				.getFormatterConfigElement();
+		if (formatterConfigElement.getAttribute("inFile").toLowerCase().equals(
+				"true")) {
+			return currentEditor;
+			// this formatter wants to use an external changelog file
+		} else {
+			IEditorPart changelog = null;
+
+			IConfigurationElement nameElement = formatterConfigElement
+					.getChildren()[0];
+			if (nameElement.getAttribute("name") == null) {
+				reportErr("Got non-name child with inFile set to False", null);
+				return null;
+			} else {
+				pref_ChangeLogName = nameElement.getAttribute("name");
+				changelog = getChangelog(getDocumentLocation(currentEditor,
+						false));
+
+				if (changelog == null) {
+					changelog = askChangeLogLocation(getDocumentLocation(
+							currentEditor, false));
+				}
+
+				return changelog;
+			}
+		}
+
+	}
+
+	String parseFunctionName(IParserChangeLogContrib parser) {
+
+		try {
+			return parser.parseCurrentFunction(currentEditor);
+		} catch (CoreException e) {
+			reportErr("Couldn't parse function name with "
+					+ parser.getClass().toString(), null);
+			return "";
+		}
+
+	}
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+
+		try {
+			currentEditor = getWorkbench().getActiveWorkbenchWindow()
+					.getActivePage().getActiveEditor();
+		} catch (Exception e) {
+			// no editor is active now so do nothing
+			return null;
+		}
+
+		// make sure an editor is selected.
+		if (currentEditor == null) {
+			return null;
+		}
+
+		ChangeLogWriter clw = new ChangeLogWriter();
+
+		// load settings from extensions + user pref.
+		loadPreferences();
+
+		// get file path from target file
+		clw.setEntryFilePath(getEntryFilePath());
+
+		// err check. do nothing if no file is being open/edited
+		if (clw.getEntryFilePath() == "") {
+			return null;
+		}
+
+		String editorName = getEditorName();
+
+		// get a parser for this file
+		IParserChangeLogContrib parser = extensionManager
+				.getParserContributor(editorName);
+
+		// if no parser for this type of document, then don't guess function
+		// name
+		// and set it as "".
+		if (parser == null) {
+			clw.setGuessedFName("");
+		} else {
+			// guess function name
+			clw.setGuessedFName(parseFunctionName(parser));
+		}
+
+		// get formatter
+		clw.setFormatter(extensionManager.getFormatterContributor(clw
+				.getEntryFilePath(), pref_Formatter));
+
+		// select changelog
+		clw.setChangelog(getChangelog());
+
+		// write to changelog
+		clw.setDateLine(clw.getFormatter().formatDateLine(pref_AuthorName,
+				pref_AuthorEmail));
+
+		clw.setChangelogLocation(getDocumentLocation(clw.getChangelog(), true));
+
+		clw.writeChangeLog();
+
+		return null;
+	}
+
+	public void addHandlerListener(IHandlerListener handlerListener) {
+
+	}
+
+	@Override
+	public boolean isEnabled() {
+		return true;
+	}
+
+	@Override
+	public boolean isHandled() {
+		return true;
+	}
+
+	public void removeHandlerListener(IHandlerListener handlerListener) {
+
+	}
+
+	public void dispose() {
+
+	}
+
+	public void init(IWorkbenchWindow window) {
+
+	}
+
+	public void run(IAction action) {
+
+		try {
+			execute(null);
+		} catch (ExecutionException e) {
+			reportErr("Executing insert changelog failed", e);
+		}
+	}
+
+	public void selectionChanged(IAction action, ISelection selection) {
+
+	}
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/PatchFile.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/PatchFile.java
new file mode 100644
index 0000000..8fff90a
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/PatchFile.java
@@ -0,0 +1,122 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kyu Lee <klee@redhat.com> - initial API and implementation
+ *    Jeff Johnston <jjohnstn@redhat.com> - add removed files support
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.actions;
+
+
+import java.util.ArrayList;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IStorage;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+
+/**
+ * 
+ * @author klee
+ *
+ */
+public class PatchFile {
+
+	private IPath fpath;
+	private IStorage storage;
+	private ArrayList<PatchRangeElement> pranges = new ArrayList<PatchRangeElement>();
+	
+	private boolean newfile = false;
+	private boolean removedfile = false;
+	private IResource resource; // required only if dealing with change
+	
+	
+	public boolean isNewfile() {
+		return newfile;
+	}
+
+	public void setNewfile(boolean newfile) {
+		this.newfile = newfile;
+	}
+
+	public boolean isRemovedFile() {
+		return removedfile;
+	}
+	
+	public void setRemovedFile(boolean removedfile) {
+		this.removedfile = removedfile;
+	}
+	
+	public PatchFile(String filePath) {
+		fpath = new Path(filePath);
+	}
+	
+	public PatchFile(IPath filePath) {
+		fpath = filePath;
+	}
+
+	public void addLineRange(int from, int to, boolean localChange) {
+	
+		pranges.add(new PatchRangeElement(from, to, localChange));
+	}
+	
+	public PatchRangeElement[] getRanges() {
+		Object[] tmpEle = pranges.toArray();
+		PatchRangeElement[] ret = new PatchRangeElement[tmpEle.length];
+		
+		for (int i = 0; i < tmpEle.length; i++) {
+			ret[i] = (PatchRangeElement) tmpEle[i];
+		}
+		return ret;
+	}
+
+
+	public IPath getPath() {
+		return fpath;
+	}
+	
+	public IStorage getStorage() {
+		return storage;
+	}
+
+	public void setStorage(IStorage storage) {
+		this.storage = storage;
+	}
+	
+	public void setResource(IResource resource) {
+		this.resource = resource;
+	}
+	
+	public IResource getResource() {
+		return resource;
+	}
+	
+	public int countRanges() {
+		return pranges.size();
+	}
+	
+	@Override
+	public boolean equals(Object o) {
+		
+		if (!(o instanceof PatchFile))
+			return false;
+		
+		PatchFile that = (PatchFile) o;
+		// check  fpath  +  count
+		if (!this.fpath.removeTrailingSeparator().toString().equals(that.getPath().removeTrailingSeparator().toString()) ||
+				this.countRanges() != that.countRanges())
+			return false;
+		
+		// check range elements
+		PatchRangeElement[] thatsrange = that.getRanges();
+		
+		for(int i=0; i<this.countRanges();i++)
+			if (!thatsrange[i].equals(pranges.get(i)))
+				return false;
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/PatchFileComparator.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/PatchFileComparator.java
new file mode 100644
index 0000000..81ab784
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/PatchFileComparator.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Jeff Johnston <jjohnstn@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.actions;
+
+import java.util.Comparator;
+
+public class PatchFileComparator implements Comparator<PatchFile> {
+
+	public int compare(PatchFile p1, PatchFile p2) {
+		return p1.getPath().toOSString().compareToIgnoreCase(p2.getPath().toOSString());
+	}
+
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/PatchRangeElement.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/PatchRangeElement.java
new file mode 100644
index 0000000..04d211e
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/PatchRangeElement.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kyu Lee <klee@redhat.com> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.changelog.core.actions;
+
+/**
+ * 
+ * @author klee
+ *
+ */
+public class PatchRangeElement {
+	
+	public int ffromLine;
+	public int ftoLine;
+	public boolean flocalChange;
+	
+	public PatchRangeElement(int from, int to, boolean localChange) {
+		ffromLine =from;
+		ftoLine= to;
+		flocalChange = localChange;
+	}
+
+	public boolean isLocalChange() {
+		return flocalChange;
+	}
+	
+	@Override
+	public boolean equals(Object o) {
+		if (o instanceof PatchRangeElement) {
+			PatchRangeElement b = (PatchRangeElement)o;
+			return b.ffromLine == ffromLine && b.ftoLine == ftoLine && b.flocalChange == flocalChange;
+		}
+		else
+			return this == o;
+	}
+}
\ No newline at end of file
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java
new file mode 100644
index 0000000..52694b8
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java
@@ -0,0 +1,601 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2008 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kyu Lee <klee@redhat.com> - initial API and implementation
+ *    Jeff Johnston <jjohnstn@redhat.com> - remove CVS bindings, support removal
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.actions;
+
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Vector;
+
+import org.eclipse.compare.rangedifferencer.RangeDifference;
+import org.eclipse.compare.rangedifferencer.RangeDifferencer;
+import org.eclipse.compare.structuremergeviewer.Differencer;
+import org.eclipse.compare.structuremergeviewer.IDiffElement;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IStorage;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.linuxtools.changelog.core.ChangeLogWriter;
+import org.eclipse.linuxtools.changelog.core.ChangelogPlugin;
+import org.eclipse.linuxtools.changelog.core.IFormatterChangeLogContrib;
+import org.eclipse.linuxtools.changelog.core.IParserChangeLogContrib;
+import org.eclipse.linuxtools.changelog.core.LineComparator;
+import org.eclipse.linuxtools.changelog.core.Messages;
+import org.eclipse.team.core.RepositoryProvider;
+import org.eclipse.team.core.diff.IDiff;
+import org.eclipse.team.core.diff.IThreeWayDiff;
+import org.eclipse.team.core.history.IFileRevision;
+import org.eclipse.team.core.mapping.IResourceDiff;
+import org.eclipse.team.core.subscribers.Subscriber;
+import org.eclipse.team.core.synchronize.SyncInfo;
+import org.eclipse.team.core.synchronize.SyncInfoSet;
+import org.eclipse.team.ui.synchronize.ISynchronizeModelElement;
+import org.eclipse.ui.IActionDelegate;
+import org.eclipse.ui.IEditorDescriptor;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.editors.text.FileDocumentProvider;
+import org.eclipse.ui.editors.text.StorageDocumentProvider;
+import org.eclipse.ui.part.FileEditorInput;
+
+
+
+/**
+ * Action handler for prepare changelog.
+ * 
+ * @author klee
+ * 
+ */
+public class PrepareChangeLogAction extends ChangeLogAction {
+
+	/**
+	 * Provides IDocument given editor input
+	 * 
+	 * @author klee
+	 * 
+	 */
+	
+	private class MyDocumentProvider extends FileDocumentProvider {
+
+		@Override
+		public IDocument createDocument(Object element) throws CoreException {
+			return super.createDocument(element);
+		}
+	}
+
+	private class MyStorageDocumentProvider extends StorageDocumentProvider {
+
+		@Override
+		public IDocument createDocument(Object element) throws CoreException {
+			return super.createDocument(element);
+		}
+	}
+
+	public PrepareChangeLogAction(String name) {
+		super(name);
+	}
+
+	private IStructuredSelection selected;
+
+	public PrepareChangeLogAction() {
+		super();
+	}
+
+	protected void setSelection(IStructuredSelection selection) {
+		this.selected = selection;
+	}
+
+	private String parseCurrentFunctionAtOffset(String editorName,
+			IEditorInput input, int offset) {
+
+		IParserChangeLogContrib parser = extensionManager
+				.getParserContributor(editorName);
+
+		// return empty string if function parser for editorName is not present
+		if (parser==null)
+			return "";
+		
+		try {
+			return parser.parseCurrentFunction(input, offset);
+		} catch (CoreException e) {
+			ChangelogPlugin.getDefault().getLog().log(
+					new Status(IStatus.ERROR, ChangelogPlugin.PLUGIN_ID, IStatus.ERROR, e
+							.getMessage(), e));
+		}
+		return "";
+	}
+
+	/**
+	 * @see IActionDelegate#run(IAction)
+	 */
+	protected void doRun() {
+		IRunnableWithProgress code = new IRunnableWithProgress() {
+
+			public void run(IProgressMonitor monitor)
+					throws InvocationTargetException, InterruptedException {
+				monitor.beginTask(Messages.getString("ChangeLog.PrepareChangeLog"), 1000); // $NON-NLS-1$
+				prepareChangeLog(monitor);
+				monitor.done();
+			}
+		};
+
+		ProgressMonitorDialog pd = new ProgressMonitorDialog(getWorkbench()
+				.getActiveWorkbenchWindow().getShell());
+
+		try {
+			pd.run(false /* fork */, false /* cancelable */, code);
+		} catch (InvocationTargetException e) {
+			ChangelogPlugin.getDefault().getLog().log(
+					new Status(IStatus.ERROR, ChangelogPlugin.PLUGIN_ID, IStatus.ERROR, e
+							.getMessage(), e));
+			return;
+		} catch (InterruptedException e) {
+			ChangelogPlugin.getDefault().getLog().log(
+					new Status(IStatus.ERROR, ChangelogPlugin.PLUGIN_ID, IStatus.ERROR, e
+							.getMessage(), e));
+		}
+	}
+
+	private void extractSynchronizeModelInfo (ISynchronizeModelElement d, IPath path, Vector<PatchFile> newList, Vector<PatchFile> removeList, Vector<PatchFile> changeList) {
+		// Recursively traverse the tree for children and sort leaf elements into their respective change kind sets.
+		// Don't add entries for ChangeLog files though.
+		if (d.hasChildren()) {
+			IPath newPath = path.append(d.getName());
+			for (IDiffElement element: d.getChildren()) {
+				if (element instanceof ISynchronizeModelElement)
+					extractSynchronizeModelInfo((ISynchronizeModelElement)element, newPath, newList, removeList, changeList);
+				else if (!(d.getName().equals("ChangeLog"))) { // $NON-NLS-1$
+					IPath finalPath = path.append(d.getName());
+					PatchFile p = new PatchFile(finalPath);
+					int kind = d.getKind() & Differencer.CHANGE_TYPE_MASK;
+					if (kind == Differencer.CHANGE) {
+						changeList.add(p);
+						// Save the resource so we can later figure out what lines changed
+						p.setResource(d.getResource());
+					}
+					else if (kind == Differencer.ADDITION) {
+						p.setNewfile(true);
+						newList.add(p);
+					}
+					else if (kind == Differencer.DELETION) {
+						p.setRemovedFile(true);
+						removeList.add(p);
+					}
+				}
+			}
+		} else if (!(d.getName().equals("ChangeLog"))) { // $NON-NLS-1$
+			IPath finalPath = path.append(d.getName());
+			PatchFile p = new PatchFile(finalPath);
+			int kind = d.getKind() & Differencer.CHANGE_TYPE_MASK;
+			if (kind == Differencer.CHANGE) {
+				changeList.add(p);
+				// Save the resource so we can later figure out what lines changed
+				p.setResource(d.getResource());
+			}
+			else if (kind == Differencer.ADDITION) {
+				p.setNewfile(true);
+				newList.add(p);
+			}
+			else if (kind == Differencer.DELETION) {
+				p.setRemovedFile(true);
+				removeList.add(p);
+			}
+		}
+	}
+
+	private void getChangedLines(Subscriber s, PatchFile p, IProgressMonitor monitor) {
+		try {
+			// For an outgoing changed resource, find out which lines
+			// differ from the local file and its previous local version
+			// (i.e. we don't want to force a diff with the repository).
+			IDiff d = s.getDiff(p.getResource());
+			if (d instanceof IThreeWayDiff
+					&& ((IThreeWayDiff)d).getDirection() == IThreeWayDiff.OUTGOING) {
+				IThreeWayDiff diff = (IThreeWayDiff)d;
+				monitor.beginTask(null, 100);
+				IResourceDiff localDiff = (IResourceDiff)diff.getLocalChange();
+				IResource resource = localDiff.getResource();
+				if (resource instanceof IFile) {
+					IFile file = (IFile)resource;
+					monitor.subTask(Messages.getString("ChangeLog.MergingDiffs")); // $NON-NLS-1$
+					String osEncoding = file.getCharset();
+					IFileRevision ancestorState = localDiff.getBeforeState();
+					IStorage ancestorStorage;
+					if (ancestorState != null) {
+						ancestorStorage = ancestorState.getStorage(monitor);
+						p.setStorage(ancestorStorage);
+					}
+					else 
+						ancestorStorage = null;
+
+					try {
+						// We compare using a standard differencer to get ranges
+						// of changes.  We modify them to be document-based (i.e.
+						// first line is line 1) and store them for later parsing.
+						LineComparator left = new LineComparator(ancestorStorage.getContents(), osEncoding);
+						LineComparator right = new LineComparator(file.getContents(), osEncoding);
+						for (RangeDifference tmp: RangeDifferencer.findDifferences(left, right)) {
+							if (tmp.kind() == RangeDifference.CHANGE) {
+								// Right side of diff are all changes found in local file.
+								int rightLength = tmp.rightLength() > 0 ? tmp.rightLength() : tmp.rightLength() + 1;
+								// We also want to store left side of the diff which are changes to the ancestor as it may contain
+								// functions/methods that have been removed.
+								int leftLength = tmp.leftLength() > 0 ? tmp.leftLength() : tmp.leftLength() + 1;
+								// Only store left side changes if the storage exists and we add one to the start line number
+								if (p.getStorage() != null)
+									p.addLineRange(tmp.leftStart(), tmp.leftStart() + leftLength, false);
+								p.addLineRange(tmp.rightStart(), tmp.rightStart() + rightLength, true);
+							}
+						}
+					} catch (UnsupportedEncodingException e) {
+						// do nothing for now
+					}
+				}
+				monitor.done();
+			}
+		} catch (CoreException e) {
+			// Do nothing if error occurs
+		}
+	}
+	
+	private void prepareChangeLog(IProgressMonitor monitor) {
+
+		Object element = selected.getFirstElement();
+		
+		IResource resource = null;
+		Vector<PatchFile> newList = new Vector<PatchFile>();
+		Vector<PatchFile> removeList = new Vector<PatchFile>();
+		Vector<PatchFile> changeList = new Vector<PatchFile>();
+		int totalChanges = 0;
+		
+		if (element instanceof IResource) {
+			resource = (IResource)element;
+		} else if (element instanceof ISynchronizeModelElement) {
+			ISynchronizeModelElement sme = (ISynchronizeModelElement)element;
+			resource = sme.getResource();
+		} else if (element instanceof IAdaptable) {
+			resource = (IResource)((IAdaptable)element).getAdapter(IResource.class);
+		}
+
+		if (resource == null)
+			return;
+
+		IProject project = resource.getProject();
+
+		// Get the repository provider so we can support multiple types of
+		// code repositories without knowing exactly which (e.g. CVS, SVN, etc..).
+		RepositoryProvider r = RepositoryProvider.getProvider(project);
+		if (r == null)
+			return;
+		SyncInfoSet set = new SyncInfoSet();
+		Subscriber s = r.getSubscriber();
+		if (s == null)
+			return;
+		if (element instanceof ISynchronizeModelElement) {
+			// We can extract the ChangeLog list from the synchronize view which
+			// allows us to skip items removed from the view
+			ISynchronizeModelElement d = (ISynchronizeModelElement)element;
+			while (d.getParent() != null)
+				d = (ISynchronizeModelElement)d.getParent();
+			extractSynchronizeModelInfo(d, new Path(""), newList, removeList, changeList);
+			totalChanges = newList.size() + removeList.size() + changeList.size();
+		}
+		else {
+			// We can then get a list of all out-of-sync resources.
+			s.collectOutOfSync(new IResource[] {project}, IResource.DEPTH_INFINITE, set, monitor);
+			SyncInfo[] infos = set.getSyncInfos();
+			totalChanges = infos.length;
+			// Iterate through the list of changed resources and categorize them into
+			// New, Removed, and Changed lists.
+			for (SyncInfo info : infos) {
+				int kind = SyncInfo.getChange(info.getKind());
+				PatchFile p = new PatchFile(info.getLocal().getFullPath());
+
+				// Check the type of entry and sort into lists.  Do not add an entry
+				// for ChangeLog files.
+				if (!(p.getPath().lastSegment().equals("ChangeLog"))) { // $NON-NLS-1$
+					if (kind == SyncInfo.ADDITION) {
+						p.setNewfile(true);
+						newList.add(p);
+					} else if (kind == SyncInfo.DELETION) {
+						p.setRemovedFile(true);
+						removeList.add(p);
+					} else if (kind == SyncInfo.CHANGE) {
+						if (info.getLocal().getType() == IResource.FILE) {
+							changeList.add(p);
+							// Save the resource so we can later figure out which lines were changed
+							p.setResource(info.getLocal());
+						}
+					}
+				}
+			}
+		}
+		
+		if (totalChanges == 0)
+			return; // nothing to parse
+		
+		PatchFile[] patchFileInfoList = new PatchFile[totalChanges];
+	
+		// Group like changes together and sort them by path name.
+		// We want removed files, then new files, then changed files.
+		// To get this, we put them in the array in reverse order.
+		int index = 0;
+		if (changeList.size() > 0) {
+			// Get the repository provider so we can support multiple types of
+			// code repositories without knowing exactly which (e.g. CVS, SVN, etc..).
+			Collections.sort(changeList, new PatchFileComparator());
+			int size = changeList.size();
+			for (int i = 0; i < size; ++i) {
+				PatchFile p = changeList.get(i);
+				getChangedLines(s, p, monitor);
+				patchFileInfoList[index+(size-i-1)] = p;
+			}
+			index += size;
+		}
+		
+		if (newList.size() > 0) {
+			Collections.sort(newList, new PatchFileComparator());
+			int size = newList.size();
+			for (int i = 0; i < size; ++i)
+				patchFileInfoList[index+(size-i-1)] = newList.get(i);
+			index += size;
+		}
+		
+		if (removeList.size() > 0) {
+			Collections.sort(removeList, new PatchFileComparator());
+			int size = removeList.size();
+			for (int i = 0; i < size; ++i)
+				patchFileInfoList[index+(size-i-1)] = removeList.get(i);
+		}
+	
+		// now, find out modified functions/classes.
+		// try to use the the extension point. so it can be extended easily
+		// for all files in patch file info list, get function guesses of each
+		// file.
+		monitor.subTask(Messages.getString("ChangeLog.WritingMessage")); // $NON-NLS-1$
+		int unitwork = 250 / patchFileInfoList.length;
+		for (PatchFile pf: patchFileInfoList) {
+			// for each file
+			if (pf != null) { // any ChangeLog changes will have null entries for them
+				String[] funcGuessList = guessFunctionNames(pf);
+				outputMultipleEntryChangeLog(pf, funcGuessList);
+			}
+			monitor.worked(unitwork);
+		}
+	}
+
+	protected IEditorPart changelog;
+
+	public void outputMultipleEntryChangeLog(PatchFile pf, String[] functionGuess) {
+
+		String defaultContent = null;
+		
+		if (pf.isNewfile())
+			defaultContent = Messages.getString("ChangeLog.NewFile"); // $NON-NLS-1$
+		else if (pf.isRemovedFile())
+			defaultContent = Messages.getString("ChangeLog.RemovedFile"); // $NON-NLS-1$
+
+		IPath entryPath = pf.getPath();
+		String entryFileName = entryPath.toOSString();
+		
+		ChangeLogWriter clw = new ChangeLogWriter();
+
+		// load settings from extensions + user pref.
+		loadPreferences();
+
+		// get file path from target file
+		clw.setEntryFilePath(entryPath.toOSString());
+		
+		if (defaultContent != null)
+			clw.setDefaultContent(defaultContent);
+
+		// err check. do nothing if no file is being open/edited
+		if (clw.getEntryFilePath() == "") {
+			return;
+		}
+
+		// Check if formatter is internal or inline..if inline, use the
+		// current active editor part, otherwise, we must find the external
+		// ChangeLog file.
+		IEditorPart changelog = null;
+	
+		// Before accessing the getFormatterConfigElement, the getFormatContibutor
+		// method must be called to initialize.
+		extensionManager.getFormatterContributor(clw.getEntryFilePath(), 
+				pref_Formatter);
+		IConfigurationElement formatterConfigElement = extensionManager
+        .getFormatterConfigElement();
+		
+		if (formatterConfigElement.getAttribute("inFile").toLowerCase().equals( //$NON-NLS-1$
+		    "true")) { //$NON-NLS-1$
+			try {
+				IWorkbenchPage ref = getWorkbench().getActiveWorkbenchWindow().getActivePage();
+				IWorkbenchPart part = ref.getActivePart();
+				if (part instanceof IEditorPart) {
+					changelog = (IEditorPart)part;
+				}
+				clw.setFormatter(extensionManager.getFormatterContributor(
+						clw.getEntryFilePath(), pref_Formatter));
+			} catch (Exception e) {
+				// do nothing changelog will be null
+			}
+		} else {
+			// external changelog
+			// get formatter
+			clw.setFormatter(extensionManager.getFormatterContributor(
+					entryFileName, pref_Formatter));
+
+			if (pf.isRemovedFile())
+				changelog = getChangelogForRemovePath(entryPath);
+			else
+				changelog = getChangelog(entryFileName);
+
+			// If there isn't a ChangeLog, we will not create one here.
+			// This prevents the situation whereby a project has an inline
+			// ChangeLog formatter and some other files have been modified
+			// as well (e.g. an rpm project).  In that case, we don't want
+			// to create a separate ChangeLog for the end-user.
+			if (changelog == null)
+				return;
+		}
+		// select changelog
+		clw.setChangelog(changelog);
+		
+		// write to changelog
+		IFormatterChangeLogContrib formatter = clw.getFormatter();
+		clw.setDateLine(formatter.formatDateLine(pref_AuthorName,
+				pref_AuthorEmail));
+
+		clw.setChangelogLocation(getDocumentLocation(clw.getChangelog(), true));
+
+		// print multiple changelog entries with different
+		// function guess names.  We default to an empty guessed name
+		// if we have zero function guess names.
+		int numFuncs = 0;
+		clw.setGuessedFName(""); // $NON-NLS-1$
+		if (functionGuess.length > 0) {
+			for (String guess : functionGuess) {
+				if (!guess.trim().equals("")) { // $NON-NLS-1$
+					++numFuncs;
+					clw.setGuessedFName(guess);
+					clw.writeChangeLog();
+				}
+			}
+		}
+		// Default an empty entry if we did not have any none-empty
+		// function guesses.
+		if (numFuncs == 0) {
+			clw.writeChangeLog();
+		}
+
+	}
+
+
+	/**
+	 * Guesses the function effected/modified by the patch from local file(newer
+	 * file).
+	 * 
+	 * @param patchFileInfo
+	 *            patch file
+	 * @return array of unique function names
+	 */
+	private String[] guessFunctionNames(PatchFile patchFileInfo) {
+
+		
+		// if this file is new file or removed file, do not guess function files
+		// TODO: create an option to include function names on 
+		// new files or not
+		if (patchFileInfo.isNewfile() || patchFileInfo.isRemovedFile()) {
+			return new String[]{""};
+		}
+
+		String[] fnames = new String[0];
+		String editorName = ""; // $NON-NLS-1$
+
+		try {
+			IEditorDescriptor ed = org.eclipse.ui.ide.IDE
+					.getEditorDescriptor(patchFileInfo.getPath().toOSString());
+			editorName = ed.getId().substring(ed.getId().lastIndexOf(".") + 1); // $NON-NLS-1$
+		} catch (PartInitException e1) {
+			ChangelogPlugin.getDefault().getLog().log(
+					new Status(IStatus.ERROR, ChangelogPlugin.PLUGIN_ID, IStatus.ERROR,
+							e1.getMessage(), e1));
+			return new String[0];
+		}
+
+		// check if the file type is supported
+
+		// get editor input for target file
+		FileEditorInput fei = new FileEditorInput(getWorkspaceRoot()
+				.getFileForLocation(
+						getWorkspaceRoot().getLocation().append(
+								patchFileInfo.getPath())));
+		
+		SourceEditorInput sei = new SourceEditorInput(patchFileInfo.getStorage());
+
+		MyDocumentProvider mdp = new MyDocumentProvider();
+		MyStorageDocumentProvider msdp = new MyStorageDocumentProvider();
+
+		try {
+			// get document for target file (one for local file, one for repository storage)
+			IDocument doc = mdp.createDocument(fei);
+			IDocument olddoc = msdp.createDocument(sei);
+
+			HashMap<String, String> functionNamesMap = new HashMap<String, String>();
+			ArrayList<String> nameList = new ArrayList<String>();
+
+			// for all the ranges
+			for (PatchRangeElement tpre: patchFileInfo.getRanges()) {
+
+					for (int j = tpre.ffromLine; j <= tpre.ftoLine; j++) {
+
+						if ((j < 0) || (j > doc.getNumberOfLines() - 1))
+							continue; // ignore out of bound lines
+
+						String functionGuess = "";
+						// add func that determines type of file.
+						// right now it assumes it's java file.
+						if (tpre.isLocalChange())
+							functionGuess = parseCurrentFunctionAtOffset(
+									editorName, fei, doc.getLineOffset(j));
+						else
+							functionGuess = parseCurrentFunctionAtOffset(
+									editorName, sei, olddoc.getLineOffset(j));
+
+						// putting it in hashmap will eliminate duplicate
+						// guesses.  We use a list to keep track of ordering which
+						// is helpful when trying to document a large set of changes.
+						if (functionNamesMap.get(functionGuess) == null)
+							nameList.add(functionGuess);
+						functionNamesMap.put(functionGuess, functionGuess);
+					}
+			}
+
+			// dump all unique func. guesses in the order found
+			fnames = new String[nameList.size()];
+			fnames = nameList.toArray(fnames);
+		
+		} catch (CoreException e) {
+			ChangelogPlugin.getDefault().getLog().log(
+					new Status(IStatus.ERROR, ChangelogPlugin.PLUGIN_ID, IStatus.ERROR,
+							e.getMessage(), e));
+		} catch (BadLocationException e) {
+			ChangelogPlugin.getDefault().getLog().log(
+					new Status(IStatus.ERROR, ChangelogPlugin.PLUGIN_ID, IStatus.ERROR,
+							e.getMessage(), e));
+		} catch (Exception e) {
+			ChangelogPlugin.getDefault().getLog().log(
+					new Status(IStatus.ERROR, ChangelogPlugin.PLUGIN_ID, IStatus.ERROR,
+							e.getMessage(), e));
+		}
+		return fnames;
+	}
+}
\ No newline at end of file
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangelogKeyHandler.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangelogKeyHandler.java
new file mode 100644
index 0000000..fd46467
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangelogKeyHandler.java
@@ -0,0 +1,206 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2008 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat, Inc. - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.changelog.core.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.commands.IHandlerListener;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.linuxtools.changelog.core.ChangelogPlugin;
+import org.eclipse.linuxtools.changelog.core.Messages;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.team.ui.synchronize.ISynchronizeModelElement;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IViewReference;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+
+/**
+ * 
+ * @author klee
+ *
+ */
+public class PrepareChangelogKeyHandler extends ChangeLogAction implements IHandler, IWorkbenchWindowActionDelegate {
+	
+	private IWorkbenchWindow window;
+	
+	public PrepareChangelogKeyHandler() {
+		super();
+	}
+	
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+
+		IStructuredSelection tempResult = null;
+		
+		// try getting currently selected project
+		try {
+			IWorkbenchPage ref = getWorkbench().getActiveWorkbenchWindow().getActivePage();
+			IWorkbenchPart part = ref.getActivePart();
+			if (part instanceof IEditorPart) {
+				// If we are in an editor, check if the file being edited is an IResource
+				// that belongs to a project in the workspace
+				IEditorPart editorPart = (IEditorPart)part;
+				IEditorInput input = editorPart.getEditorInput();
+				IResource r = (IResource)input.getAdapter(IResource.class);
+				if (r != null) {
+					// We have an IResource to work with, so create a selection we can use
+					// in PrepareChangeLogAction
+					tempResult = new StructuredSelection(r);
+				}
+			} else {
+				// Otherwise, our view is not an editor, see if we have an IResource or something
+				// that will lead us to an IResource
+				ISelection selected = ref.getSelection();
+				if (selected instanceof IStructuredSelection) {
+					IResource r = null;
+					IStructuredSelection iss = (IStructuredSelection)selected;
+					Object o = ((IStructuredSelection)selected).getFirstElement();
+					if (o instanceof ISynchronizeModelElement) {
+						r = ((ISynchronizeModelElement)o).getResource();
+					} else if (o instanceof IAdaptable) {
+						r = (IResource)((IAdaptable)o).getAdapter(IResource.class);
+					}
+					if (r != null)
+						tempResult = iss;
+				}
+			}
+			if (tempResult == null) {
+			    // We don't have an obvious project match in the current active view.  
+				// Let's search all open views for the Synchronize View which is our first
+				// choice to fall back on.
+				for (IViewReference view: ref.getViewReferences()) {
+					if (view.getId().equals("org.eclipse.team.sync.views.SynchronizeView")) { // $NON-NLS-1$
+						IViewPart v = view.getView(false);
+						ISelection s = null;
+						ISelectionProvider sp = v.getViewSite().getSelectionProvider();
+						if (sp != null) {
+							s = sp.getSelection();
+						}
+						if (s != null && s instanceof IStructuredSelection) {
+							IStructuredSelection ss = (IStructuredSelection)s;
+							Object element = ss.getFirstElement();
+							IResource r = null;
+							if (element instanceof ISynchronizeModelElement) {
+								r = ((ISynchronizeModelElement)element).getResource();
+							} else if (element instanceof IAdaptable) {
+								r = (IResource)((IAdaptable)element).getAdapter(IResource.class);
+							}
+
+							if (r != null) {
+								tempResult = ss;
+							}
+						}
+					}
+				}
+			}
+		} catch (Exception e) {
+			tempResult = null;
+		}
+
+		// If we can't find the project directly, let the user know.
+		if (tempResult == null) {
+			MessageDialog.openInformation(getActiveWorkbenchShell(), Messages.getString("ChangeLog.PrepareChangeLog"), // $NON-NLS-1$, 
+					Messages.getString("PrepareChangeLog.InfoNoProjectFound")); // $NON-NLS-1$
+			return null;
+		} 
+
+		final IStructuredSelection result = tempResult;
+		try {
+			Action exampleAction;
+			exampleAction = new PrepareChangeLogAction() {
+				@Override
+				public void run() {
+					setSelection(result);
+					doRun();
+				}
+			};
+
+			exampleAction.run();
+
+		} catch (Exception e) {
+			ChangelogPlugin.getDefault().getLog().log(
+					new Status(IStatus.ERROR, ChangelogPlugin.PLUGIN_ID, IStatus.ERROR,
+							e.getMessage(), e));
+		}
+
+		return null;
+	}
+
+	public void addHandlerListener(IHandlerListener handlerListener) {
+
+	}
+
+	public void dispose() {
+	}
+	
+	public void init(IWorkbenchWindow window) {
+		this.window = window;
+	}
+
+	protected IWorkbenchWindow getWorkbenchWindow() {
+		return window;
+	}
+	
+	/**
+	 * Returns active shell.
+	 */
+	protected Shell getActiveWorkbenchShell() {
+		IWorkbenchWindow window = getWorkbench().getActiveWorkbenchWindow();
+		if (window != null) {
+			return window.getShell();
+		}
+		return null;
+	}
+
+	public void run(IAction action) {
+
+		try {
+			execute(null);
+		} catch (ExecutionException e) {
+			reportErr(Messages.getString("PrepareChangeLog.ErrExecuteFailed"), e); // $NON-NLS-1$
+		}
+	}
+
+	public void selectionChanged(IAction action, ISelection selection) {
+
+	}
+
+	@Override
+	public boolean isEnabled() {
+		return true;
+	}
+
+	@Override
+	public boolean isHandled() {
+		return true;
+	}
+
+	public void removeHandlerListener(IHandlerListener handlerListener) {
+
+	}
+	
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/PrepareCommitAction.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/PrepareCommitAction.java
new file mode 100644
index 0000000..fda7649
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/PrepareCommitAction.java
@@ -0,0 +1,262 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2009 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kyu Lee <klee@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.actions;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.compare.rangedifferencer.RangeDifference;
+import org.eclipse.compare.rangedifferencer.RangeDifferencer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IStorage;
+import org.eclipse.core.resources.mapping.ResourceMapping;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.linuxtools.changelog.core.ChangelogPlugin;
+import org.eclipse.linuxtools.changelog.core.LineComparator;
+import org.eclipse.linuxtools.changelog.core.Messages;
+import org.eclipse.swt.dnd.Clipboard;
+import org.eclipse.swt.dnd.TextTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.team.core.RepositoryProvider;
+import org.eclipse.team.core.diff.IDiff;
+import org.eclipse.team.core.diff.IThreeWayDiff;
+import org.eclipse.team.core.history.IFileRevision;
+import org.eclipse.team.core.mapping.IResourceDiff;
+import org.eclipse.team.core.subscribers.Subscriber;
+import org.eclipse.team.core.synchronize.SyncInfo;
+import org.eclipse.team.core.synchronize.SyncInfoSet;
+import org.eclipse.ui.IContributorResourceAdapter;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.ide.IContributorResourceAdapter2;
+
+
+/**
+ * 
+ * @author klee
+ *
+ */
+public class PrepareCommitAction extends ChangeLogAction {
+
+	
+	protected void doRun() {
+		
+
+		IRunnableWithProgress code = new IRunnableWithProgress() {
+
+			public void run(IProgressMonitor monitor)
+					throws InvocationTargetException, InterruptedException {
+			//	monitor.beginTask("Loading Clipboard", 1000);
+				loadClipboard(monitor);
+				//monitor.done();
+			}
+		};
+
+		ProgressMonitorDialog pd = new ProgressMonitorDialog(getWorkbench()
+				.getActiveWorkbenchWindow().getShell());
+
+		try {
+			pd.run(false /* fork */, false /* cancelable */, code);
+		} catch (InvocationTargetException e) {
+			ChangelogPlugin.getDefault().getLog().log(
+					new Status(IStatus.ERROR, ChangelogPlugin.PLUGIN_ID, IStatus.ERROR, e
+							.getMessage(), e));
+			return;
+		} catch (InterruptedException e) {
+			ChangelogPlugin.getDefault().getLog().log(
+					new Status(IStatus.ERROR, ChangelogPlugin.PLUGIN_ID, IStatus.ERROR, e
+							.getMessage(), e));
+			return;
+		}
+		
+	//	loadClipboard();
+		
+	}
+	
+	
+	private ResourceMapping getResourceMapping(Object o) {
+		if (o instanceof ResourceMapping) {
+			return (ResourceMapping) o;
+		}
+		if (o instanceof IAdaptable) {
+			IAdaptable adaptable = (IAdaptable) o;
+			Object adapted = adaptable.getAdapter(ResourceMapping.class);
+			if (adapted instanceof ResourceMapping) {
+				return (ResourceMapping) adapted;
+			}
+			adapted = adaptable.getAdapter(IContributorResourceAdapter.class);
+			if (adapted instanceof IContributorResourceAdapter2) {
+				IContributorResourceAdapter2 cra = (IContributorResourceAdapter2) adapted;
+				return cra.getAdaptedResourceMapping(adaptable);
+			}
+		} else {
+			Object adapted = Platform.getAdapterManager().getAdapter(o,
+					ResourceMapping.class);
+			if (adapted instanceof ResourceMapping) {
+				return (ResourceMapping) adapted;
+			}
+		}
+		
+	
+		return null;
+	}
+	
+	private void loadClipboard(IProgressMonitor monitor) {
+		
+		IEditorPart currentEditor;
+		
+		try {
+			currentEditor = getWorkbench().getActiveWorkbenchWindow()
+					.getActivePage().getActiveEditor();
+		} catch (Exception e) {
+			// no editor is active now so do nothing
+			
+			return;
+		}
+		
+		if (currentEditor == null)
+			return;
+			
+		
+		
+	//	System.out.println(currentEditor.getTitle());
+		String diffResult = "";
+		IEditorInput input = currentEditor.getEditorInput();
+		ResourceMapping mapping = getResourceMapping(input);
+		IProject project = null;
+		IResource[] resources = new IResource[1];
+
+		if (mapping != null) {
+			project = mapping.getProjects()[0];
+			resources[0] = (IResource)mapping.getModelObject();
+		} else if (input instanceof IFileEditorInput) {
+			IFileEditorInput f = (IFileEditorInput)input;
+			project = f.getFile().getProject();
+			resources[0] = f.getFile();
+		} else {
+			return; // can't get what we need
+		}
+		
+		RepositoryProvider r = RepositoryProvider.getProvider(project);
+		if (r == null) {
+			return; //There is no repository provider for this project, i.e it's not shared.
+		}
+		SyncInfoSet set = new SyncInfoSet();
+		Subscriber s = r.getSubscriber();
+		s.collectOutOfSync(resources, IResource.DEPTH_ZERO, set, monitor);
+		SyncInfo[] infos = set.getSyncInfos();
+
+		if (infos.length == 1) {
+			int kind = SyncInfo.getChange(infos[0].getKind());
+			if (kind == SyncInfo.CHANGE) {
+				try {
+					IDiff d = s.getDiff(infos[0].getLocal());
+					if (d instanceof IThreeWayDiff
+							&& ((IThreeWayDiff)d).getDirection() == IThreeWayDiff.OUTGOING) {
+						IThreeWayDiff diff = (IThreeWayDiff)d;
+						monitor.beginTask(null, 100);
+						IResourceDiff localDiff = (IResourceDiff)diff.getLocalChange();
+						IFile file = (IFile)localDiff.getResource();
+						monitor.subTask(Messages.getString("ChangeLog.MergingDiffs")); // $NON-NLS-1$
+						String osEncoding = file.getCharset();
+						IFileRevision ancestorState = localDiff.getBeforeState();
+						IStorage ancestorStorage;
+						if (ancestorState != null)
+							ancestorStorage = ancestorState.getStorage(monitor);
+						else 
+							ancestorStorage = null;
+
+						try {
+							LineComparator left = new LineComparator(ancestorStorage.getContents(), osEncoding);
+							LineComparator right = new LineComparator(file.getContents(), osEncoding);
+							for (RangeDifference tmp: RangeDifferencer.findDifferences(left, right)) {
+								if (tmp.kind() == RangeDifference.CHANGE) {
+									LineNumberReader l = new LineNumberReader(new InputStreamReader(file.getContents()));
+									int rightLength = tmp.rightLength() > 0 ? tmp.rightLength() : tmp.rightLength() + 1;
+									String line0 = null;
+									String preDiffResult = "";
+									for (int i = 0; i < tmp.rightStart(); ++i) {
+										// We have equivalence at the start.  This could be due to a new entry with the
+										// same date stamp as the subsequent entry.  In this case, we want the diff to
+										// have the date stamp at the top so it forms a complete entry.  So, we cache
+										// those equivalent lines for later usage if needed.
+										try {
+											String line = l.readLine();
+											if (line0 == null)
+												line0 = line;
+											preDiffResult += line + "\n"; 
+										} catch (IOException e) {
+											break;
+										}
+									}
+									for (int i = 0; i < rightLength; ++i) {
+										try {
+											String line = l.readLine();
+											// If the last line of the diff matches the first line of the old file and
+											// there was equivalence at the start of the ChangeLog, then we want to put
+											// the equivalent section at top so as to give the best chance of forming
+											// a ChangeLog entry that can be used as a commit comment.
+											if (i == rightLength - tmp.rightStart()) {
+												if (tmp.rightStart() != 0 && line.equals(line0)) {
+													diffResult = preDiffResult += diffResult;
+													i = rightLength; // stop loop
+												}
+												else
+													diffResult += line + "\n";
+											} else 
+												diffResult += line + "\n"; // $NON-NLS-1$
+										} catch (IOException e) {
+											// do nothing
+										}
+									}
+								}
+							}
+						} catch (UnsupportedEncodingException e) {
+							// do nothing for now
+						}
+						monitor.done();
+					}
+				} catch (CoreException e) {
+					// do nothing
+				}
+			}
+		}
+		
+		if (!diffResult.equals(""))
+			populateClipboardBuffer(diffResult);
+	}
+	
+	private void populateClipboardBuffer(String input) {
+		
+		TextTransfer plainTextTransfer = TextTransfer.getInstance();
+		Clipboard clipboard = new Clipboard(getWorkbench().getDisplay());		
+		clipboard.setContents(
+			new String[]{input}, 
+			new Transfer[]{plainTextTransfer});	
+		clipboard.dispose();
+	}
+	
+	
+	
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/PrepareCommitHandler.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/PrepareCommitHandler.java
new file mode 100644
index 0000000..52cda3b
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/PrepareCommitHandler.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kyu Lee <klee@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.actions;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.commands.IHandlerListener;
+import org.eclipse.jface.action.Action;
+
+/**
+ * 
+ * @author klee
+ *
+ */
+public class PrepareCommitHandler  implements IHandler {
+
+	public void addHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+	public void dispose() {
+		// TODO Auto-generated method stub
+	}
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+	
+		Action exampleAction;
+		exampleAction = new PrepareCommitAction() {
+			@Override
+			public void run() {
+				//setSelection(new StructuredSelection(rm));
+				doRun();
+			}
+		};
+
+		exampleAction.run();
+		
+		return null;
+	}
+
+	public boolean isEnabled() {
+		// TODO Auto-generated method stub
+		return true;
+	}
+
+	public boolean isHandled() {
+		// TODO Auto-generated method stub
+		return true;
+	}
+
+	public void removeHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+
+	}
+
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/SourceEditorInput.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/SourceEditorInput.java
new file mode 100644
index 0000000..f80c86a
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/SourceEditorInput.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2008 Wind River Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Wind River Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.actions;
+
+import org.eclipse.core.resources.IStorage;
+
+/**
+ * SourceEditorInput
+ */
+public class SourceEditorInput extends StorageEditorInput {
+
+	/**
+	 * @param storage that represents a source file
+	 */
+	public SourceEditorInput(IStorage storage) {
+		super(storage);
+	}
+
+	/*
+	 * @see org.eclipse.ui.IEditorInput#exists()
+	 */
+	public boolean exists() {
+		return false;
+	}
+
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/StorageEditorInput.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/StorageEditorInput.java
new file mode 100644
index 0000000..d36a5b5
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/StorageEditorInput.java
@@ -0,0 +1,113 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2008 Wind River Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Wind River Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.actions;
+
+import org.eclipse.core.resources.IStorage;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.IPersistableElement;
+import org.eclipse.ui.IStorageEditorInput;
+
+
+/**
+ * Abstract implementation of <code>IStorageEditorInput</code>.
+ */
+abstract public class StorageEditorInput implements IStorageEditorInput {
+
+	/**
+	 * Storage associated with this editor input
+	 */
+	private IStorage fStorage;
+
+	/**
+	 * Constructs an editor input on the given storage
+	 */
+	public StorageEditorInput(IStorage storage) {
+		fStorage = storage;
+	}
+
+	/**
+	 * @see IStorageEditorInput#getStorage()
+	 */
+	public IStorage getStorage() {
+		return fStorage;
+	}
+
+	/**
+	 * Set new storage. For subclasses only.
+	 * @param storage
+	 */
+	protected void setStorage(IStorage storage) {
+		assert storage != null;
+		fStorage = storage;
+	}
+
+	/**
+	 * @see IStorageEditorInput#getImageDescriptor()
+	 */
+	public ImageDescriptor getImageDescriptor() {
+		return null;
+	}
+
+	/**
+	 * @see IStorageEditorInput#getName()
+	 */
+	public String getName() {
+		return getStorage().getName();
+	}
+
+	/**
+	 * @see IStorageEditorInput#getPersistable()
+	 */
+	public IPersistableElement getPersistable() {
+		return null;
+	}
+
+	/**
+	 * @see IStorageEditorInput#getToolTipText()
+	 */
+	public String getToolTipText() {
+		return getStorage().getFullPath().toOSString();
+	}
+
+	/**
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object object) {
+		if (object == this) {
+			return true;
+		}
+		try {
+			return object instanceof IStorageEditorInput
+				&& getStorage().equals(((IStorageEditorInput)object).getStorage());
+		} catch (CoreException e) {
+		}
+		return false;
+	}
+
+	/**
+	 * @see java.lang.Object#hashCode()
+	 */
+	@Override
+	public int hashCode() {
+		return getStorage().hashCode();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
+	 */
+	@SuppressWarnings("unchecked")
+    public Object getAdapter(Class adapter) {
+		return null;
+	}
+
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogDocumentProvider.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogDocumentProvider.java
new file mode 100644
index 0000000..1c5e503
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogDocumentProvider.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kyu Lee <klee@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.editors;
+
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.ui.editors.text.TextFileDocumentProvider;
+
+/**
+ * @author klee (Kyu Lee)
+ */
+public class ChangeLogDocumentProvider extends TextFileDocumentProvider {
+
+	@Override
+	public IDocument getDocument(Object element) {
+		return super.getDocument(element);
+	}
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogDocumentSetupParticipant.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogDocumentSetupParticipant.java
new file mode 100644
index 0000000..c5bf884
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogDocumentSetupParticipant.java
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.editors;
+
+import org.eclipse.core.filebuffers.IDocumentSetupParticipant;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.DocumentEvent;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IDocumentListener;
+import org.eclipse.linuxtools.changelog.core.ChangelogPlugin;
+import org.eclipse.linuxtools.changelog.core.IEditorChangeLogContrib;
+import org.eclipse.linuxtools.changelog.core.IEditorChangeLogContrib2;
+
+public class ChangeLogDocumentSetupParticipant implements
+		IDocumentSetupParticipant, IDocumentListener {
+
+	public void setup(IDocument document) {
+		IExtensionPoint editorExtensions = null;
+		IEditorChangeLogContrib editorContrib = null;
+
+		// get editor which is stored in preference.
+		IPreferenceStore store = ChangelogPlugin.getDefault()
+				.getPreferenceStore();
+		String pref_Editor = store
+				.getString("IChangeLogConstants.DEFAULT_EDITOR"); // $NON-NLS-1$
+
+		editorExtensions = Platform.getExtensionRegistry().getExtensionPoint(
+				"org.eclipse.linuxtools.changelog.core", "editorContribution"); //$NON-NLS-1$ //$NON-NLS-2$
+
+		if (editorExtensions != null) {
+			IConfigurationElement[] elements = editorExtensions
+					.getConfigurationElements();
+			for (int i = 0; i < elements.length; i++) {
+				if (elements[i].getName().equals("editor") // $NON-NLS-1$ 
+						&& (elements[i].getAttribute("name").equals(pref_Editor))) { //$NON-NLS-1$
+
+					try {
+						// If editor has a special setup routine, use it.
+						IConfigurationElement bob = elements[i];
+						editorContrib = (IEditorChangeLogContrib) bob
+								.createExecutableExtension("class"); // $NON-NLS-1$
+
+						if (editorContrib instanceof IEditorChangeLogContrib2)
+							((IEditorChangeLogContrib2)editorContrib).setup(document);
+					} catch (CoreException e) {
+						ChangelogPlugin.getDefault().getLog().log(
+								new Status(IStatus.ERROR, ChangelogPlugin.PLUGIN_ID,
+										IStatus.ERROR, e.getMessage(), e));
+					}
+				}
+			}
+		}
+	}
+	
+	/*
+	 * @see IDocumentListener#documentAboutToBeChanged(DocumentEvent)
+	 */
+
+	public void documentAboutToBeChanged(DocumentEvent e) {
+		// do nothing
+	}
+	
+	/*
+	 * @see IDocumentListener#documentChanged(DocumentEvent)
+	 */
+	public void documentChanged(DocumentEvent e) {
+		// do nothing
+	}
+
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogEditor.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogEditor.java
new file mode 100644
index 0000000..f149c63
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogEditor.java
@@ -0,0 +1,126 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kyu Lee <klee@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.editors;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.SourceViewerConfiguration;
+import org.eclipse.linuxtools.changelog.core.ChangelogPlugin;
+import org.eclipse.linuxtools.changelog.core.IEditorChangeLogContrib;
+import org.eclipse.linuxtools.changelog.core.Messages;
+import org.eclipse.linuxtools.changelog.core.actions.FormatChangeLogAction;
+import org.eclipse.ui.editors.text.TextEditor;
+import org.eclipse.ui.texteditor.ITextEditorActionConstants;
+
+
+/**
+ * ChangeLog editor that supports GNU format.
+ * 
+ * @author klee (Kyu Lee)
+ */
+public class ChangeLogEditor extends TextEditor {
+
+	FormatChangeLogAction fcla;
+
+	public ChangeLogEditor() {
+		super();
+
+		fcla = new FormatChangeLogAction(this);
+
+		SourceViewerConfiguration config = getConfig();
+
+		if (config != null) {
+
+			setSourceViewerConfiguration(config);
+		} else
+			ChangelogPlugin.getDefault().getLog().log(
+					new Status(IStatus.ERROR, ChangelogPlugin.PLUGIN_ID, IStatus.ERROR,
+							Messages.getString("ChangeLogEditor.ErrConfiguration"), // $NON-NLS-1$
+							new Exception(Messages.getString("ChangeLogEditor.ErrConfiguration")))); // $NON-NLS-1$
+
+		setDocumentProvider(new ChangeLogDocumentProvider());
+
+	}
+
+	/**
+	 * Gets appropriate style editor from user pref.
+	 * 
+	 * @return configuration for the Changelog editor
+	 */
+	
+	public SourceViewerConfiguration getConfig() {
+
+		IExtensionPoint editorExtensions = null;
+		IEditorChangeLogContrib editorContrib = null;
+
+		// get editor which is stored in preference.
+		IPreferenceStore store = ChangelogPlugin.getDefault()
+				.getPreferenceStore();
+		String pref_Editor = store
+				.getString("IChangeLogConstants.DEFAULT_EDITOR"); // $NON-NLS-1$
+
+		editorExtensions = Platform.getExtensionRegistry().getExtensionPoint(
+				"org.eclipse.linuxtools.changelog.core", "editorContribution"); //$NON-NLS-1$ //$NON-NLS-2$
+
+		if (editorExtensions != null) {
+			IConfigurationElement[] elements = editorExtensions
+					.getConfigurationElements();
+			for (int i = 0; i < elements.length; i++) {
+				if (elements[i].getName().equals("editor") // $NON-NLS-1$ 
+						&& (elements[i].getAttribute("name").equals(pref_Editor))) { //$NON-NLS-1$
+
+					try {
+						IConfigurationElement bob = elements[i];
+						editorContrib = (IEditorChangeLogContrib) bob
+								.createExecutableExtension("class"); // $NON-NLS-1$
+
+						editorContrib.setTextEditor(this);
+						return (SourceViewerConfiguration) editorContrib;
+					} catch (CoreException e) {
+						ChangelogPlugin.getDefault().getLog().log(
+								new Status(IStatus.ERROR, ChangelogPlugin.PLUGIN_ID,
+										IStatus.ERROR, e.getMessage(), e));
+					}
+
+				}
+			}
+		}
+
+		return null;
+	}
+
+	public ISourceViewer getMySourceViewer() {
+		return this.getSourceViewer();
+	}
+	
+	/**
+	 * Specifies context menu.
+	 */
+	@Override
+	protected void editorContextMenuAboutToShow(IMenuManager menu) {
+
+		super.editorContextMenuAboutToShow(menu);
+		addAction(menu, ITextEditorActionConstants.GROUP_EDIT,
+				ITextEditorActionConstants.SHIFT_RIGHT);
+		addAction(menu, ITextEditorActionConstants.GROUP_EDIT,
+				ITextEditorActionConstants.SHIFT_LEFT);
+		menu.appendToGroup(ITextEditorActionConstants.GROUP_EDIT, fcla);
+
+	}
+
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogFormattingStrategy.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogFormattingStrategy.java
new file mode 100644
index 0000000..b910c22
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogFormattingStrategy.java
@@ -0,0 +1,240 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kyu Lee <klee@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.editors;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.StringTokenizer;
+
+import org.eclipse.jface.text.formatter.IFormattingStrategy;
+
+public class ChangeLogFormattingStrategy implements IFormattingStrategy {
+
+	private final String NEW_LINE_CHAR = "\n";
+
+	private final String WHITE_SPACE_CHAR = " ";
+
+	private final String TAB_SPACE_CHAR = "\t";
+
+	public String format(String content, boolean isLineStart,
+			String indentation, int[] positions) {
+
+		ArrayList<String> formattedWords = new ArrayList<String>();
+		int currentLineLength = indentation.length();
+		boolean newLineBegin = true;
+
+		String firstLine = "";
+
+		// if first line is not from the start, ignore it
+		if (!isLineStart) {
+			int eol;
+			if ((eol = content.indexOf('\n')) == content.length() - 1) {
+				return content;
+			} else {
+				firstLine = content.substring(0, eol + 1);
+				content = content.substring(eol + 1);
+			}
+		}
+
+		StringTokenizer candidateWords = new StringTokenizer(content,
+				NEW_LINE_CHAR + WHITE_SPACE_CHAR + TAB_SPACE_CHAR, true);
+
+		boolean seenFirstWord = false;
+
+		boolean addedFirstNL = false;
+		while (candidateWords.hasMoreTokens()) {
+
+			String cword = candidateWords.nextToken();
+
+			if (!seenFirstWord) {
+
+				if ((cword.indexOf(NEW_LINE_CHAR) < 0
+						&& cword.indexOf(WHITE_SPACE_CHAR) < 0 && cword
+						.indexOf(TAB_SPACE_CHAR) < 0)) {
+					seenFirstWord = true;
+				} else {
+					if (!addedFirstNL && cword.indexOf(NEW_LINE_CHAR) >= 0) {
+						firstLine += "\n";
+						addedFirstNL = true;
+					}
+					continue;
+				}
+
+			} else {
+
+				if (cword.indexOf(NEW_LINE_CHAR) >= 0
+						|| cword.indexOf(WHITE_SPACE_CHAR) >= 0
+						|| cword.indexOf(TAB_SPACE_CHAR) >= 0) {
+					continue;
+				}
+			}
+
+			// if the word is date, start new line and include
+			// names, email, then an empty line.
+			if (isDate(cword)) {
+
+				// see if we are in middle of line and
+				// if so, start new line, else continue.
+				if (!newLineBegin)
+					formattedWords.add(NEW_LINE_CHAR);
+
+				if (formattedWords.size() > 0)
+					formattedWords.add(NEW_LINE_CHAR);
+
+				// insert date
+				formattedWords.add(cword + WHITE_SPACE_CHAR);
+
+				// insert name
+				cword = candidateWords.nextToken();
+				while (!isEmail(cword)) {
+					
+					if (!cword.equals(WHITE_SPACE_CHAR) && !cword.equals(TAB_SPACE_CHAR) && !cword.equals(NEW_LINE_CHAR)) {
+						formattedWords.add(WHITE_SPACE_CHAR + cword);	
+					}
+					
+					
+					cword = candidateWords.nextToken();
+				}
+
+				// insert email
+				formattedWords.add(WHITE_SPACE_CHAR + WHITE_SPACE_CHAR + cword + NEW_LINE_CHAR);
+
+				// inserted header, so insert a empty line
+				formattedWords.add(NEW_LINE_CHAR);
+				newLineBegin = true;
+				currentLineLength = indentation.length();
+				continue;
+			}
+
+			// means beginning of file name, so whole filename should be
+			// in one line.
+			if (isStar(cword)) {
+				// see if we are in middle of line and
+				// if so, start new line, else continue.
+				if (!newLineBegin) {
+					formattedWords.add(NEW_LINE_CHAR);
+					currentLineLength = indentation.length();
+				}
+
+				formattedWords.add(TAB_SPACE_CHAR + cword);
+				currentLineLength += cword.length() + 1;
+
+				// this should be path name
+				cword = candidateWords.nextToken();
+				cword = candidateWords.nextToken();
+
+				formattedWords.add(WHITE_SPACE_CHAR + cword);
+				currentLineLength += cword.length() + 1;
+				newLineBegin = false;
+				continue;
+			}
+
+			if (cword.startsWith("(")) {
+
+				if (formattedWords.size() > 0)
+					formattedWords.add(NEW_LINE_CHAR + TAB_SPACE_CHAR);
+				else
+					formattedWords.add(TAB_SPACE_CHAR);
+
+				currentLineLength = 1;
+				// add until closing bracket
+
+				boolean skipMultiWhiteSpace = false;
+
+				while (!cword.endsWith("):")) {
+
+					if (cword.equals(WHITE_SPACE_CHAR) && !skipMultiWhiteSpace) {
+						formattedWords.add(cword);
+						currentLineLength += cword.length();
+						skipMultiWhiteSpace = true;
+					}
+
+					if (!cword.equals(WHITE_SPACE_CHAR)
+							&& !cword.equals(NEW_LINE_CHAR)
+							&& !cword.equals(TAB_SPACE_CHAR)) {
+						formattedWords.add(cword);
+						currentLineLength += cword.length();
+						skipMultiWhiteSpace = false;
+					}
+
+					cword = candidateWords.nextToken();
+				}
+				formattedWords.add(cword);
+				currentLineLength += cword.length();
+				newLineBegin = false;
+
+				continue;
+			}
+
+			if (currentLineLength + cword.length() > 80) {
+				formattedWords.add(NEW_LINE_CHAR + TAB_SPACE_CHAR + cword);
+				currentLineLength = indentation.length() + cword.length();
+				newLineBegin = false;
+			} else {
+				if (newLineBegin) {
+					formattedWords.add(TAB_SPACE_CHAR);
+					newLineBegin = false;
+				} else {
+					formattedWords.add(WHITE_SPACE_CHAR);
+				}
+				formattedWords.add(cword);
+				currentLineLength += cword.length() + 1;
+
+			}
+		}
+
+		String finalContent = "";
+
+		for (String formattedWord: formattedWords) {
+			finalContent +=formattedWord;
+		}
+
+		return firstLine + finalContent;
+	}
+
+	private boolean isDate(String inputStr) {
+
+		// Set up patterns for looking for the next date in the changelog
+		SimpleDateFormat isoDate = new SimpleDateFormat("yyyy-MM-dd");
+
+		// Try to find next Date bounded changelog entry by parsing date
+		// patterns
+		// First start with an ISO date
+		try {
+			Date ad = isoDate.parse(inputStr);
+			if (ad != null)
+				return true;
+		} catch (ParseException e) {
+			// We don't really care on exception; it just means it could not
+			// parse a date on that line
+		}
+		return false;
+	}
+	
+	private boolean isEmail(String inputStr) {
+		return inputStr.startsWith("<") && inputStr.endsWith(">");
+	}
+
+	private boolean isStar(String inputStr) {
+		return inputStr.equals("*");
+	}
+
+	public void formatterStarts(String initialIndentation) {
+
+	}
+
+	public void formatterStops() {
+
+	}
+
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/ColorManager.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/ColorManager.java
new file mode 100644
index 0000000..e3ed526
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/ColorManager.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kyu Lee <klee@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.editors;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * Manages color schemes. Actual color value is stored in
+ * IChangeLogColorConstants.
+ * 
+ * @author klee (Kyu Lee)
+ * 
+ */
+public class ColorManager {
+
+	protected Map<RGB, Color> fColorTable = new HashMap<RGB, Color>(10);
+
+	public void dispose() {
+		for (Color color: fColorTable.values()){
+			color.dispose();
+		}
+	}
+
+	public Color getColor(RGB rgb) {
+		Color color = fColorTable.get(rgb);
+		if (color == null) {
+			color = new Color(Display.getCurrent(), rgb);
+			fColorTable.put(rgb, color);
+		}
+		return color;
+	}
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/FileHyperlink.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/FileHyperlink.java
new file mode 100644
index 0000000..0777645
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/FileHyperlink.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kyu Lee <klee@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.editors;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.eclipse.linuxtools.changelog.core.ChangelogPlugin;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * Hyperlink that opens up editor for a file.
+ * 
+ * @author klee (Kyu Lee)
+ * 
+ */
+public class FileHyperlink implements IHyperlink {
+
+	private IFile fileLoc;
+
+	private IRegion region;
+
+	public FileHyperlink(IRegion regionIn, IFile fileIn) {
+		fileLoc = fileIn;
+		region = regionIn;
+	}
+
+	public IRegion getHyperlinkRegion() {
+		return region;
+	}
+
+	public String getTypeLabel() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public String getHyperlinkText() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	/**
+	 * Opens the hyperlink in new editor window.
+	 */
+	public void open() {
+		IWorkbench ws = getWorkbench();
+
+		try {
+
+			org.eclipse.ui.ide.IDE.openEditor(ws.getActiveWorkbenchWindow()
+					.getActivePage(), fileLoc, true);
+		} catch (PartInitException e) {
+			e.printStackTrace();
+
+		}
+
+	}
+
+	private IWorkbench getWorkbench() {
+		return ChangelogPlugin.getDefault().getWorkbench();
+	}
+
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/GNUEditorConfiguration.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/GNUEditorConfiguration.java
new file mode 100644
index 0000000..9bcbcdf
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/GNUEditorConfiguration.java
@@ -0,0 +1,189 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2009 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kyu Lee <klee@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.editors;
+
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IDocumentExtension3;
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.formatter.ContentFormatter;
+import org.eclipse.jface.text.formatter.IContentFormatter;
+import org.eclipse.jface.text.hyperlink.DefaultHyperlinkPresenter;
+import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
+import org.eclipse.jface.text.hyperlink.IHyperlinkPresenter;
+import org.eclipse.jface.text.presentation.IPresentationReconciler;
+import org.eclipse.jface.text.presentation.PresentationReconciler;
+import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
+import org.eclipse.jface.text.rules.FastPartitioner;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.SourceViewerConfiguration;
+import org.eclipse.linuxtools.changelog.core.IEditorChangeLogContrib;
+import org.eclipse.linuxtools.changelog.core.IEditorChangeLogContrib2;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.ui.editors.text.TextEditor;
+
+
+/**
+ * GNU format ChangeLog editor configuration.
+ * 
+ * @author klee (Kyu Lee)
+ */
+public class GNUEditorConfiguration extends SourceViewerConfiguration implements
+		IEditorChangeLogContrib, IEditorChangeLogContrib2 {
+
+	public final static String CHANGELOG_PARTITIONING= "gnu_changelog_partitioning";  //$NON-NLS-1$
+
+	private GNUElementScanner scanner;
+
+	private ColorManager colorManager;
+
+	private GNUHyperlinkDetector linkDetector;
+
+	private final RGB DEFAULT_HYPERLINK_COLOR = new RGB(127, 0, 0);
+
+	private TextEditor parentEditor;
+
+	/**
+	 * Prepares configuration.
+	 */
+	public GNUEditorConfiguration() {
+		this.colorManager = new ColorManager();
+
+	}
+
+	/**
+	 * Sets TextEditor that this configuration is going to be applied.
+	 */
+	public void setTextEditor(TextEditor editor) {
+		parentEditor = editor;
+	}
+
+	/**
+	 * Get configured content types.
+	 * 
+	 * @return array of configured content types.
+	 */
+	@Override
+	public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
+		return new String[] { IDocument.DEFAULT_CONTENT_TYPE,
+				  GNUPartitionScanner.CHANGELOG_EMAIL,
+				  GNUPartitionScanner.CHANGELOG_SRC_ENTRY};
+	}
+
+	protected GNUElementScanner getChangeLogFileScanner() {
+		if (scanner == null) {
+			scanner = new GNUElementScanner(colorManager);
+			scanner.setDefaultReturnToken(new Token(new TextAttribute(
+					colorManager.getColor(IChangeLogColorConstants.TEXT))));
+		}
+		return scanner;
+	}
+
+	/**
+	 * Detects hyperlinks in GNU formatted changelogs.
+	 * 
+	 * @return link detector for GNU format.
+	 */
+	@Override
+	public IHyperlinkDetector[] getHyperlinkDetectors(ISourceViewer sourceViewer) {
+		if (sourceViewer == null)
+			return null;
+
+		if (linkDetector == null) {
+			linkDetector = new GNUHyperlinkDetector(sourceViewer, parentEditor);
+
+		}
+
+		return new IHyperlinkDetector[] { linkDetector };
+	}
+
+	/**
+	 * Hyperlink presenter (decorator).
+	 * 
+	 * @return default presenter.
+	 */
+	@Override
+	public IHyperlinkPresenter getHyperlinkPresenter(ISourceViewer sourceViewer) {
+		return new DefaultHyperlinkPresenter(DEFAULT_HYPERLINK_COLOR);
+	}
+	
+	/*
+	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getConfiguredDocumentPartitioning(org.eclipse.jface.text.source.ISourceViewer)
+	 */
+	@Override
+	public String getConfiguredDocumentPartitioning(ISourceViewer sourceViewer) {
+		return CHANGELOG_PARTITIONING;
+	}
+	
+	/**
+	 * Set content formatter. For ChangeLog, it just wraps lines.
+	 */
+	@Override
+	public IContentFormatter getContentFormatter(ISourceViewer sourceViewer) {
+		
+		ContentFormatter cf = new ContentFormatter();
+		
+		// no partitions
+		cf.enablePartitionAwareFormatting(false);
+		
+		ChangeLogFormattingStrategy cfs = new ChangeLogFormattingStrategy();
+		
+		cf.setFormattingStrategy(cfs, IDocument.DEFAULT_CONTENT_TYPE);
+		
+		
+		return cf;
+	}
+	
+
+	/**
+	 * Highlights GNU format changelog syntaxes.
+	 * 
+	 * @return reconciler for GNU format changelog.
+	 */
+	@Override
+	public IPresentationReconciler getPresentationReconciler(
+			ISourceViewer sourceViewer) {
+		PresentationReconciler reconciler = new PresentationReconciler();
+
+		DefaultDamagerRepairer dr = new DefaultDamagerRepairer(getChangeLogFileScanner());
+		reconciler.setDamager(dr, GNUPartitionScanner.CHANGELOG_EMAIL);
+		reconciler.setRepairer(dr, GNUPartitionScanner.CHANGELOG_EMAIL);
+
+		dr= new GNUFileEntryDamagerRepairer(getChangeLogFileScanner());
+		reconciler.setDamager(dr, GNUPartitionScanner.CHANGELOG_SRC_ENTRY);
+		reconciler.setRepairer(dr, GNUPartitionScanner.CHANGELOG_SRC_ENTRY);
+	
+		dr= new MultilineRuleDamagerRepairer(getChangeLogFileScanner());
+		reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
+		reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
+		
+		return reconciler;
+	}
+
+	/**
+	 * Perform documentation setup to set up partitioning.
+	 * 
+	 * @param document to set up partitioning on.
+	 */
+	public void setup(IDocument document) {
+		FastPartitioner partitioner =
+			new FastPartitioner(
+				new GNUPartitionScanner(),
+				GNUPartitionScanner.CHANGELOG_PARTITION_TYPES);
+		partitioner.connect(document);
+		if (document instanceof IDocumentExtension3) {
+			IDocumentExtension3 extension3= (IDocumentExtension3) document;
+			extension3.setDocumentPartitioner(CHANGELOG_PARTITIONING, partitioner);
+		} else {
+			document.setDocumentPartitioner(partitioner);
+		}
+	}
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/GNUElementScanner.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/GNUElementScanner.java
new file mode 100644
index 0000000..a32c00b
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/GNUElementScanner.java
@@ -0,0 +1,109 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kyu Lee <klee@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.editors;
+
+import org.eclipse.jface.text.*;
+import org.eclipse.jface.text.rules.*;
+
+/**
+ * Recognizes GNU format changelog. Can be configured to return different types
+ * of tokens.
+ * 
+ * @author klee (Kyu Lee)
+ */
+public class GNUElementScanner extends RuleBasedScanner {
+
+	public static final String FILE_NAME = "_file_name"; // $NON-NLS-1$
+    public static final String TEXT = "_text_content"; // $NON-NLS-1$
+	public static final String EMAIL = "_author_email"; // $NON-NLS-1$
+	public static final String DATE = "_entry_date"; // $NON-NLS-1$
+	public static final String AUTHOR = "_author_name"; // $NON-NLS-1$
+	public static final String FUNC_NAME = "_function_name"; // $NON-NLS-1$
+	public static final String OTHER = "_other"; // $NON-NLS-1$
+	/**
+	 * Build a scanner for syntax highlighting.
+	 * 
+	 * @param manager Color scheme to use.
+	 */
+	public GNUElementScanner(ColorManager manager) {
+		IToken file = new Token(new TextAttribute(manager
+				.getColor(IChangeLogColorConstants.FILE_NAME)));
+
+		IToken func = new Token(new TextAttribute(manager
+				.getColor(IChangeLogColorConstants.FUNC_NAME)));
+
+		IToken email = new Token(new TextAttribute(manager
+				.getColor(IChangeLogColorConstants.EMAIL)));
+
+		IToken other = new Token(new TextAttribute(manager
+				.getColor(IChangeLogColorConstants.TEXT)));
+
+		IRule[] rules = new IRule[3];
+
+		// Add rule for file path
+		rules[0] = new GNUFileEntryRule(file);
+
+		// function
+		rules[1] = new SingleLineRule("(", ")", func); // $NON-NLS-1$ // $NON-NLS-2$
+		// email
+		rules[2] = new SingleLineRule("<", ">\n", email); // $NON-NLS-1$ // $NON-NLS-2$
+		
+		setDefaultReturnToken(other);
+		
+		setRules(rules);
+	}
+
+	/**
+	 * Build a scanner for hyperlink.
+	 * 
+	 */
+	public GNUElementScanner() {
+		IToken file = new Token(new String(FILE_NAME));
+
+		IToken func = new Token(new String(FUNC_NAME));
+
+		IToken email = new Token(new String(EMAIL));
+		
+		IToken other = new Token(new String(OTHER));
+
+		IRule[] rules = new IRule[3];
+
+		// Add rule for file path
+		rules[0] = new GNUFileEntryRule(file);
+
+		// function
+		rules[1] = new SingleLineRule("(", "):", func); // $NON-NLS-1$ // $NON-NLS-2$
+		// email 
+		rules[2]= new SingleLineRule("<", ">", email); // $NON-NLS-1$ // $NON-NLS-2$
+
+		setDefaultReturnToken(other);
+		
+		setRules(rules);
+	}
+
+	/**
+	 * Get the file offset.
+	 * 
+	 * @return the file offset.
+	 */
+	public int getOffset() {
+		return fOffset;
+	}
+	
+	/**
+	 * Get the default token.
+	 * 
+	 * @return the default token.
+	 */
+	public IToken getDefaultToken() {
+		return fDefaultReturnToken;
+	}
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/GNUFileEntryDamagerRepairer.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/GNUFileEntryDamagerRepairer.java
new file mode 100644
index 0000000..0cc3c46
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/GNUFileEntryDamagerRepairer.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.editors;
+
+import org.eclipse.jface.text.DocumentEvent;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITypedRegion;
+import org.eclipse.jface.text.TextPresentation;
+import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
+import org.eclipse.jface.text.rules.ITokenScanner;
+
+public class GNUFileEntryDamagerRepairer extends DefaultDamagerRepairer {
+	
+	/**
+	 * Creates a damager/repairer that uses the given scanner. The scanner may not be <code>null</code>
+	 * and is assumed to return only token that carry text attributes.
+	 *
+	 * @param scanner the token scanner to be used, may not be <code>null</code>
+	 */
+	public GNUFileEntryDamagerRepairer(ITokenScanner scanner) {
+		super(scanner);
+	}
+
+	/*
+	 * @see IPresentationDamager#getDamageRegion(ITypedRegion, DocumentEvent, boolean)
+	 */
+	@Override
+	public IRegion getDamageRegion(ITypedRegion partition, DocumentEvent e, boolean documentPartitioningChanged) {
+		// In the case of a partition with multiline rules, we will punt to
+		// reparse the entire partition because we don't know if the line being
+		// edited is in the middle of an area covered by a multiline rule.  In
+		// such a case, we need to back up and find the start sequence of the
+		// rule.  It is easiest to just reparse the whole partition.
+		return partition;
+	}
+	
+	/*
+	 * @see IPresentationRepairer#createPresentation(TextPresentation, ITypedRegion)
+	 */
+	@Override
+	public void createPresentation(TextPresentation presentation, ITypedRegion region) {
+		super.createPresentation(presentation, region);
+	}
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/GNUFileEntryRule.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/GNUFileEntryRule.java
new file mode 100644
index 0000000..8468714
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/GNUFileEntryRule.java
@@ -0,0 +1,138 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.editors;
+
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IPredicateRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.IWhitespaceDetector;
+import org.eclipse.jface.text.rules.IWordDetector;
+import org.eclipse.jface.text.rules.Token;
+
+public class GNUFileEntryRule implements IPredicateRule {
+	/**
+	 * The default token to be returned on success and if nothing else has been
+	 * specified.
+	 */
+	protected IToken fileToken;
+	
+	protected IWordDetector fDetector = new IWordDetector() {
+
+		public boolean isWordPart(char c) {
+			return Character.isJavaIdentifierPart(c) || c == '/' || c == '.' || c == '-';
+		}
+
+		public boolean isWordStart(char c) {
+			return Character.isJavaIdentifierPart(c) || c == '/' || c == '.';
+		}
+		
+	};
+
+	private boolean started = false;
+	
+	private IWhitespaceDetector fWsDetector = new IWhitespaceDetector() {
+		public boolean isWhitespace(char character) {
+			return Character.isWhitespace(character);
+		}
+	};
+
+	/** The column constraint */
+	protected int fColumn = UNDEFINED;
+
+	/** Internal setting for the un-initialized column constraint */
+	protected static final int UNDEFINED = -1;
+
+	/** Buffer used for pattern detection */
+	private StringBuffer fBuffer = new StringBuffer();
+
+	private String fStartingSequence = "* ";
+
+	public GNUFileEntryRule(IToken fileToken) {
+		this.fileToken = fileToken;
+	}
+
+	public IToken evaluate(ICharacterScanner scanner) {
+		return evaluate(scanner, false);
+	}
+
+	public IToken evaluate(ICharacterScanner scanner, boolean resume) {
+		int c = scanner.read();
+		fBuffer.setLength(0);
+		if (started == false) {
+			for (int i = 0; i < fStartingSequence.length(); i++) {
+				fBuffer.append((char) c);
+				if (fStartingSequence.charAt(i) != c) {
+					unreadBuffer(scanner);
+					return Token.UNDEFINED;
+				}
+				c = scanner.read();
+			}
+		} else if (c == ',') { // we are continuing after a comma (perhaps we have multiple entries
+			fBuffer.append((char) c);
+			c = scanner.read();
+			while (c != ICharacterScanner.EOF && fWsDetector.isWhitespace((char)c)) {
+				fBuffer.append((char) c);
+				c = scanner.read();
+			}
+			scanner.unread();
+			return ((GNUElementScanner)scanner).getDefaultToken();
+		}
+
+		boolean haveFilePart = false;
+		
+		while (c != ICharacterScanner.EOF) {
+			if (fDetector.isWordPart((char) c)) {
+				fBuffer.append((char) c);
+				haveFilePart = true;
+			}
+			else if (c == '\\') {
+				fBuffer.append((char) c);
+				c = scanner.read();
+				if (c == ICharacterScanner.EOF) {
+					unreadBuffer(scanner);
+					return Token.UNDEFINED;
+				}
+				fBuffer.append((char) c);
+			} else {
+				break;
+			}
+			c = scanner.read();
+		}
+
+		if (!haveFilePart) {
+			unreadBuffer(scanner);
+			return Token.UNDEFINED;
+		}
+
+		if (c == ',')
+			started = true;
+
+		scanner.unread();
+		return fileToken;
+	}
+
+	/**
+	 * Returns the characters in the buffer to the scanner.
+	 * 
+	 * @param scanner
+	 *            the scanner to be used
+	 */
+	protected void unreadBuffer(ICharacterScanner scanner) {
+		for (int i = fBuffer.length() - 1; i >= 0; i--)
+			scanner.unread();
+		started = false;
+	}
+
+	public IToken getSuccessToken() {
+		return fileToken;
+	}
+
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/GNUHyperlinkDetector.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/GNUHyperlinkDetector.java
new file mode 100644
index 0000000..1b93b11
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/GNUHyperlinkDetector.java
@@ -0,0 +1,202 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kyu Lee <klee@redhat.com> - initial API and implementation
+ *    Remy Chi Jian Suen <remy.suen@gmail.com> - clean up internal API references (bug #179389)
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.editors;
+
+import org.eclipse.compare.CompareEditorInput;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.ITypedRegion;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.team.ui.synchronize.SyncInfoCompareInput;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.editors.text.TextEditor;
+
+/**
+ * 
+ * @author klee (Kyu Lee)
+ */
+public class GNUHyperlinkDetector implements IHyperlinkDetector {
+
+	private IPath documentLocation;
+
+	/**
+	 * Creates a new URL hyperlink detector for GNU Format changelogs.
+	 * 
+	 * NOTE: It assumes that the path this ChangeLog is in, is root
+	 * directory of path names in this ChangeLog.
+	 * 
+	 * ex) ChangeLog is in /some/project and in ChangeLog, path names are like
+	 * abc/file.java ghi/file2.java
+	 * 
+	 * then absolute path of file.java and file2.java are
+	 * /some/project/abc/file.java and /some/project/ghi/file2.java
+	 * 
+	 * @param textViewer The text viewer in which to detect the hyperlink.
+	 */
+	public GNUHyperlinkDetector(ITextViewer textViewer, TextEditor editor) {
+		Assert.isNotNull(textViewer);
+
+		documentLocation = getDocumentLocation(editor);
+
+	}
+
+	/**
+	 * Detector using RuleBasedScanner.
+	 */
+	public IHyperlink[] detectHyperlinks(ITextViewer textViewer,
+			IRegion region, boolean canShowMultipleHyperlinks) {
+
+		IDocument thisDoc = textViewer.getDocument();
+
+		GNUElementScanner scanner = new GNUElementScanner();
+
+		scanner.setDefaultReturnToken(new Token("default"));
+
+		ITypedRegion partitionInfo = null;
+
+		try {
+			partitionInfo = thisDoc.getPartition(region.getOffset());
+		} catch (org.eclipse.jface.text.BadLocationException e1) {
+			e1.printStackTrace();
+			return null;
+		}
+
+		scanner.setRange(thisDoc, partitionInfo.getOffset(), partitionInfo.getLength());
+
+		Token tmpToken = (Token) scanner.nextToken();
+
+		String tokenStr = (String) tmpToken.getData();
+
+		if (tokenStr == null) {
+			return null;
+		}
+
+		// try to find non-default token containing region..if none, return null.
+		while (region.getOffset() < scanner.getTokenOffset() ||
+				region.getOffset() > scanner.getOffset() ||
+				tokenStr.equals("default")) {
+			tmpToken = (Token) scanner.nextToken();
+			tokenStr = (String) tmpToken.getData();
+			if (tokenStr == null)
+				return null;
+		}
+
+		Region tokenRegion = new Region(scanner.getTokenOffset(), scanner
+				.getTokenLength());
+
+		String line = "";
+		try {
+			line = thisDoc
+					.get(tokenRegion.getOffset(), tokenRegion.getLength());
+		} catch (org.eclipse.jface.text.BadLocationException e1) {
+			e1.printStackTrace();
+			return null;
+		}
+
+		// process file link
+		if (tokenStr.equals(GNUElementScanner.FILE_NAME)) {
+
+			Region pathRegion = null;
+
+			int lineOffset = 0;
+			
+			// cut "* " if necessary
+			if (line.startsWith("* ")) {
+				lineOffset = 2;
+				line = line.substring(2);
+			}
+//			int trailingWhiteSpace;
+//			if (((trailingWhiteSpace = line.indexOf(":")) > 0)
+//					|| ((trailingWhiteSpace = line.indexOf(" ")) > 0)) {
+//
+//				line = line.substring(0, trailingWhiteSpace);
+//				pathRegion = new Region(tokenRegion.getOffset() + lineOffset,
+//						trailingWhiteSpace);
+//			} else {
+				pathRegion = new Region(tokenRegion.getOffset() + lineOffset, line
+						.length());
+//			}
+			
+			
+			if (documentLocation == null)
+				return null;
+
+			// Replace any escape characters added to name
+			line = line.replaceAll("\\\\(.)", "$1");
+
+			IPath filePath = documentLocation.append(line);
+
+			return new IHyperlink[] { new FileHyperlink(pathRegion,
+					ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(
+							filePath)) };
+
+		}
+
+		return null;
+	}
+
+	private IWorkspaceRoot getWorkspaceRoot() {
+		return ResourcesPlugin.getWorkspace().getRoot();
+	}
+
+	/**
+	 * Get current directory that ChangeLog is in.
+	 * 
+	 * @param currentEditor
+	 * @return path that this ChangeLog is in
+	 */
+	private IPath getDocumentLocation(IEditorPart currentEditor) {
+		IWorkspaceRoot myWorkspaceRoot = getWorkspaceRoot();
+		String WorkspaceRoot = myWorkspaceRoot.getLocation().toOSString();
+		IEditorInput cc = currentEditor.getEditorInput();
+
+		if (cc instanceof IFileEditorInput) {
+			IFileEditorInput test = (IFileEditorInput) cc;
+			IFile loc = test.getFile();
+
+			IPath docLoc = new Path(WorkspaceRoot
+					+ loc.getFullPath().toOSString());
+			docLoc = docLoc.removeLastSegments(1);
+			return docLoc;
+
+		}
+
+		if ((cc instanceof SyncInfoCompareInput)
+				|| (cc instanceof CompareEditorInput)) {
+
+			CompareEditorInput test = (CompareEditorInput) cc;
+			if (test.getCompareResult() == null)
+				return null;
+
+			IPath docLoc = new Path(WorkspaceRoot
+					+ test.getCompareResult().toString());
+			docLoc = docLoc.removeLastSegments(1);
+			return docLoc;
+
+		}
+
+		return null;
+	}
+
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/GNUPartitionScanner.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/GNUPartitionScanner.java
new file mode 100644
index 0000000..83c7d24
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/GNUPartitionScanner.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.editors;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jface.text.rules.IPredicateRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.MultiLineRule;
+import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
+import org.eclipse.jface.text.rules.SingleLineRule;
+import org.eclipse.jface.text.rules.Token;
+
+public class GNUPartitionScanner extends RuleBasedPartitionScanner {
+	// We partition into sections we want to parse from the beginning every time
+	// a change occurs within the area.  In this case, we are only interested in
+	// email entries which are surrounded by < and > and source entries which
+	// have one or more file names which may extend across lines.
+	public final static String CHANGELOG_EMAIL = "changelog_email"; //$NON-NLS-1$
+	public final static String CHANGELOG_SRC_ENTRY = "changelog_src_entry"; //$NON-NLS-1$
+	public final static String[] CHANGELOG_PARTITION_TYPES= 
+		new String[] { CHANGELOG_EMAIL, CHANGELOG_SRC_ENTRY };
+	
+	/**
+	 * Creates the partitioner and sets up the appropriate rules.
+	 */
+	public GNUPartitionScanner() {
+		super();
+		
+		List<IPredicateRule> rules= new ArrayList<IPredicateRule>();
+		Token email = new Token(CHANGELOG_EMAIL);
+		Token srcEntry = new Token(CHANGELOG_SRC_ENTRY);
+		
+		rules.add(new SingleLineRule("<", ">", email, '\\'));
+		rules.add(new MultiLineRule("* ", ":", srcEntry, '\\', true));
+		
+		IPredicateRule[] result= new IPredicateRule[rules.size()];
+		rules.toArray(result);
+		setPredicateRules(result);
+	}
+	
+	@Override
+	public IToken nextToken() {
+		return super.nextToken();
+	}
+
+
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/IChangeLogColorConstants.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/IChangeLogColorConstants.java
new file mode 100644
index 0000000..2feb84e
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/IChangeLogColorConstants.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kyu Lee <klee@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.editors;
+
+import org.eclipse.swt.graphics.RGB;
+
+/**
+ * Color scheme to use for syntax highlighting.
+ * 
+ * @author klee (Kyu Lee)
+ * 
+ */
+public interface IChangeLogColorConstants {
+	RGB FILE_NAME = new RGB(128, 0, 0);
+
+	RGB FUNC_NAME = new RGB(0, 128, 0);
+
+	RGB TEXT = new RGB(0, 0, 0);
+
+	RGB EMAIL = new RGB(0, 0, 128);
+
+	RGB DATE = new RGB(64, 64, 0);
+
+	RGB AUTHOR = new RGB(0, 64, 64);
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/MultilineRuleDamagerRepairer.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/MultilineRuleDamagerRepairer.java
new file mode 100644
index 0000000..238544d
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/editors/MultilineRuleDamagerRepairer.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.editors;
+
+import org.eclipse.jface.text.DocumentEvent;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITypedRegion;
+import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
+import org.eclipse.jface.text.rules.ITokenScanner;
+
+public class MultilineRuleDamagerRepairer extends DefaultDamagerRepairer {
+	
+	
+	/**
+	 * Creates a damager/repairer that uses the given scanner. The scanner may not be <code>null</code>
+	 * and is assumed to return only token that carry text attributes.
+	 *
+	 * @param scanner the token scanner to be used, may not be <code>null</code>
+	 */
+	public MultilineRuleDamagerRepairer(ITokenScanner scanner) {
+		super(scanner);
+	}
+
+	/*
+	 * @see IPresentationDamager#getDamageRegion(ITypedRegion, DocumentEvent, boolean)
+	 */
+	@Override
+	public IRegion getDamageRegion(ITypedRegion partition, DocumentEvent e, boolean documentPartitioningChanged) {
+		// In the case of a partition with multiline rules, we will punt to
+		// reparse the entire partition because we don't know if the line being
+		// edited is in the middle of an area covered by a multiline rule.  In
+		// such a case, we need to back up and find the start sequence of the
+		// rule.  It is easiest to just reparse the whole partition.
+		return partition;
+	}
+	
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/formatters/GNUFormat.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/formatters/GNUFormat.java
new file mode 100644
index 0000000..d2b474c
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/formatters/GNUFormat.java
@@ -0,0 +1,345 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2007 Phil Muldoon <pkmuldoon@picobot.org>.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Phil Muldoon <pmuldoon@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.formatters;
+
+import java.io.File;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.FindReplaceDocumentAdapter;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.linuxtools.changelog.core.ChangelogPlugin;
+import org.eclipse.linuxtools.changelog.core.IFormatterChangeLogContrib;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.texteditor.AbstractTextEditor;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+import org.eclipse.ui.texteditor.ITextEditor;
+
+
+/**
+ * @author pmuldoon (Phil Muldoon)
+ */
+public class GNUFormat implements IFormatterChangeLogContrib {
+	
+	final String line_sep = System.getProperty("line.separator"); //$NON-NLS-1$
+	
+	final String TAB = "\t"; // $NON-NLS-1$
+	
+	
+	public String formatDateLine(String authorName, String authorEmail) {
+		String detail = returnDate() + "  " + //$NON-NLS-1$
+		authorName + "  " + "<" + authorEmail + ">" + line_sep + //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		line_sep;
+		return detail;
+	}
+	
+	
+	public String mergeChangelog(String dateLine, String functionGuess,String defaultContent,
+			IEditorPart changelog, String changeLogLocation, String fileLocation) {
+		
+		String fileDetail = formatFileDetail(changeLogLocation, fileLocation);
+		IDocument changelog_doc = getDocument(changelog);
+		String function = formatFunction(functionGuess);
+		boolean multipleEntrySuccess = false;
+		String functionSpacer = " "; // $NON-NLS-1$
+		if (function.equals(": ")) // $NON-NLS-1$
+			functionSpacer = ""; // $NON-NLS-1$ 
+		if (changelog_doc.getLength() > 0) {
+			
+			int offset_start = findChangeLogEntry(changelog_doc, dateLine);
+			int offset_end = dateLine.length();
+			boolean foundFunction = false;
+			
+			if (offset_start != -1) {
+				int nextChangeEntry = findChangeLogPattern(changelog_doc,
+						offset_start + dateLine.length());
+				int functLogEntry = offset_start + dateLine.length();
+				
+				while (functLogEntry < nextChangeEntry) {
+					int line_length = 0;
+					String entry = ""; // $NON-NLS-1$
+					try {
+						line_length = changelog_doc
+						.getLineOfOffset(functLogEntry);
+						entry = changelog_doc.get(functLogEntry, changelog_doc
+								.getLineLength(line_length));
+					} catch (BadLocationException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+					// Look to see if entry already exists for file (will be preceded by "*")
+					if (entry.lastIndexOf("* " + fileDetail) > 0) {
+						foundFunction = true;
+						// Check for the case where the default content (e.g. new or removed file)
+						// is being caught again because user has prepared the ChangeLog more than once.
+						// In such a case, just return.  We don't need to repeat ourselves.
+						if (defaultContent.length() > 0) {
+							if (entry.lastIndexOf(defaultContent) > 0)
+								return ""; // $NON-NLS-1$
+						}
+						int nextFunctLoc = functLogEntry + fileDetail.length()
+						+ 2;
+						String nextFunc = ""; // $NON-NLS-1$
+						try {
+							nextFunc = changelog_doc.get(nextFunctLoc,
+									nextChangeEntry - nextFunctLoc);
+						} catch (BadLocationException e1) {
+							// TODO Auto-generated catch block
+							e1.printStackTrace();
+						}
+						int foundFunc = nextFunc.indexOf("* "); // $NON-NLS-1$
+						if (foundFunc > 0) {
+							foundFunc--;
+							try {
+								while (changelog_doc.get(
+										nextFunctLoc + foundFunc, 1).equals(
+										"\t") // $NON-NLS-1$
+										|| changelog_doc.get(
+												nextFunctLoc + foundFunc, 1)
+												.equals("\n")) // $NON-NLS-1$
+									foundFunc--;
+							} catch (BadLocationException e2) {
+								// TODO Auto-generated catch block
+								e2.printStackTrace();
+							}
+							functLogEntry = nextFunctLoc + foundFunc + 1;
+							break;
+						}
+						
+					}
+					try {
+						functLogEntry += changelog_doc
+						.getLineLength(line_length);
+					} catch (BadLocationException e1) {
+						// TODO Auto-generated catch block
+						e1.printStackTrace();
+					}
+				}
+				if (functLogEntry >= nextChangeEntry) {
+					functLogEntry = nextChangeEntry - 1;
+					try {
+						while (changelog_doc.get(functLogEntry, 1).equals("\n")) // $NON-NLS-1$
+							functLogEntry--;
+					} catch (BadLocationException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+					functLogEntry++;
+				}
+				
+				if (offset_start != -1) {
+					if (foundFunction) {
+						try {
+							if (!function.equals(": ")) // $NON-NLS-1$
+								changelog_doc.replace(functLogEntry, 0, "\n" + TAB // $NON-NLS-1$
+										+ function + " "); // $NON-NLS-1$
+							else
+								changelog_doc.replace(functLogEntry, 0, "\n" + TAB // $NON-NLS-1$
+										);
+						} catch (BadLocationException e) {
+							// TODO Auto-generated catch block
+							e.printStackTrace();
+						}
+						ITextEditor edit = (ITextEditor) changelog;
+						if (!function.equals(": ")) // $NON-NLS-1$
+							edit.selectAndReveal(functLogEntry + function.length()
+									+ 3, 0);
+						else
+							edit.selectAndReveal(functLogEntry + function.length()
+									, 0);
+						multipleEntrySuccess = true;
+					} else {
+						try {
+							changelog_doc.replace(offset_end, 0, TAB
+									+ "* " + fileDetail + functionSpacer // $NON-NLS-1$
+									+ function + functionSpacer + defaultContent + "\n"); //$NON-NLS-1$
+						} catch (BadLocationException e) {
+							// TODO Auto-generated catch block
+							e.printStackTrace();
+						}
+						
+						ITextEditor edit = (ITextEditor) changelog;
+						edit.selectAndReveal(offset_end + fileDetail.length()
+								+ function.length() +functionSpacer.length()*2 + 3 + defaultContent.length(), 0);
+						multipleEntrySuccess = true;
+					}
+					
+				}
+			}
+		}
+		
+		if (!multipleEntrySuccess) {
+			try {
+				if (changelog_doc.getLength() > 0)
+					changelog_doc.replace(0, 0, "\n\n"); //$NON-NLS-1$
+				changelog_doc.replace(0, 0, dateLine + TAB + "* " + fileDetail // $NON-NLS-1$
+						+ functionSpacer+function+functionSpacer);
+				
+				ITextEditor edit = (ITextEditor) changelog;
+				edit.selectAndReveal(dateLine.length() + fileDetail.length()
+						+ function.length() + functionSpacer.length()*2 + 3, 0);
+			} catch (BadLocationException e) {
+				e.printStackTrace();
+				
+			}
+			
+		}
+		
+		return ""; // $NON-NLS-1$
+		
+	}
+	
+	private IWorkspaceRoot getWorkspaceRoot() {
+		return ResourcesPlugin.getWorkspace().getRoot();
+	}
+	
+	private String formatFileDetail(String changeLogLocation,
+			String editorFileLocation) {
+		// Format Path. Is a full path specified, or just file name?
+		IWorkspaceRoot myWorkspaceRoot = getWorkspaceRoot();
+		String WorkspaceRoot = myWorkspaceRoot.getLocation().toOSString();
+		String changeLogLocNoRoot = ""; // $NON-NLS-1$
+		String editorFileLocNoRoot = ""; // $NON-NLS-1$
+		if (changeLogLocation.lastIndexOf(WorkspaceRoot) >= 0) {
+			changeLogLocNoRoot = changeLogLocation.substring(changeLogLocation
+					.lastIndexOf(WorkspaceRoot)
+					+ WorkspaceRoot.length(), changeLogLocation.length());
+		} else
+			changeLogLocNoRoot = changeLogLocation;
+		
+		if (editorFileLocation.lastIndexOf(WorkspaceRoot) >= 0) {
+			editorFileLocNoRoot = editorFileLocation.substring(
+					editorFileLocation.lastIndexOf(WorkspaceRoot),
+					editorFileLocation.lastIndexOf(WorkspaceRoot)
+					+ WorkspaceRoot.length());
+		} else
+			editorFileLocNoRoot = editorFileLocation;
+		
+		File changelogLocation = new File(changeLogLocNoRoot);
+		File fileLocation = new File(editorFileLocNoRoot);
+		File reversePath = fileLocation.getParentFile();
+		String reversePathb = ""; // $NON-NLS-1$
+		
+		while (reversePath.getParentFile() != null) {
+			if (reversePath.compareTo(changelogLocation.getParentFile()) == 0)
+				break;
+			reversePath = reversePath.getParentFile();
+		}
+		if (reversePath != null)
+			reversePathb = fileLocation.toString().substring(
+					reversePath.toString().length() + 1,
+					fileLocation.toString().length());
+		return reversePathb;
+	}
+	
+	private int findChangeLogPattern(IDocument changelog_doc, int startOffset) {
+		// find the "pattern" of a changelog entry. Not a specific one,
+		// but one that "looks" like an entry
+		int nextEntry = startOffset;
+		int line_length = 0;
+		String entry = ""; // $NON-NLS-1$
+		while (nextEntry < changelog_doc.getLength()) {
+			try {
+				// Get the line of interest in the changelog document
+				line_length = changelog_doc.getLineOfOffset(nextEntry);
+				entry = changelog_doc.get(nextEntry, changelog_doc
+						.getLineLength(line_length));
+				// Attempt to find date pattern on line
+				if (matchDatePattern(entry)) {
+					//nextDate -= entry.length()+1;
+					break;
+				}
+				// If no date matches, move to the next line
+				nextEntry += changelog_doc.getLineLength(line_length);
+			} catch (BadLocationException e) {
+				ChangelogPlugin.getDefault().getLog().log(
+						new Status(IStatus.ERROR, ChangelogPlugin.PLUGIN_ID, IStatus.ERROR, e
+								.getMessage(), e
+								
+						));
+			}
+			
+		}
+		return nextEntry;
+	}
+	
+	private boolean matchDatePattern(String text) {
+		
+		// Set up patterns for looking for the next date in the changelog
+		SimpleDateFormat isoDate = new SimpleDateFormat("yyyy-MM-dd"); // $NON-NLS-1$
+		
+		// Try to find next Date bounded changelog entry by parsing date patterns
+		// First start with an ISO date
+		try {
+			Date ad = isoDate.parse(text);
+			if (ad != null)
+				return true;
+		} catch (ParseException e) {
+			// We don't really care on exception; it just means it could not parse a date on that line
+		}
+		
+		return false;
+	}
+	
+	private int findChangeLogEntry(IDocument changelog_doc, String entry) {
+		FindReplaceDocumentAdapter findDocumentAptd = new FindReplaceDocumentAdapter(
+				changelog_doc);
+		IRegion region = null;
+		try {
+			region = findDocumentAptd.find(0, entry, true, false,/*whole world */ false, true);
+		} catch (BadLocationException e) {
+			ChangelogPlugin.getDefault().getLog().log(
+					new Status(IStatus.ERROR, ChangelogPlugin.PLUGIN_ID, IStatus.ERROR, e
+							.getMessage(), e
+							
+					));
+			return -1;
+		}
+		if (region != null) {
+			// If the user's entry is not at the beginning of the file,
+			// make a new entry.
+			return region.getOffset() > 0 ? -1 : 0;
+		}
+		else
+			return -1;
+	}
+	
+	private String formatFunction(String function) {
+		
+		// If Function Guess is true, and Function Guess has found something
+		if (function.length() > 0)
+			return "(" + function + "):"; // $NON-NLS-1$ // $NON-NLS-2$
+		else
+			return ": "; //$NON-NLS-1$
+		
+	}
+	
+	public IDocument getDocument(IEditorPart currentEditor) {
+		AbstractTextEditor castEditor = (AbstractTextEditor) currentEditor;
+		IDocumentProvider provider = castEditor.getDocumentProvider();
+		
+		return provider.getDocument(castEditor.getEditorInput());
+	}
+	
+	private String returnDate() {
+		SimpleDateFormat date_Format;
+		date_Format = new SimpleDateFormat("yyyy-MM-dd"); //$NON-NLS-1$
+		return date_Format.format(new Date());
+	}
+	
+}
\ No newline at end of file
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/strings.properties b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/strings.properties
new file mode 100644
index 0000000..c82f1a1
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/strings.properties
@@ -0,0 +1,37 @@
+AddAction.str_ChangeLog_Location=Select a location for the ChangeLog
+
+ChangeLogPreferencesPage.Formatters=Formatters: 
+ChangeLogPreferencesPage.AuthorName=Author Name: 
+ChangeLogPreferencesPage.AuthorEmail=Author Email: 
+ChangeLogPreferencesPage.Editors=Editors:
+# Following 2 strings need to be equivalently translated in plugin.properties.
+ChangeLogPreferencesPage.gnuEditorConfig=GNU Editor
+ChangeLogPreferencesPage.gnuFormatter=GNU Style
+
+ChangeLog.PrepareChangeLog=Prepare ChangeLog
+ChangeLog.NewFile=New file.
+ChangeLog.RemovedFile=Removed.
+ChangeLog.WritingMessage=Writing ChangeLog
+ChangeLog.MergingDiffs=Merging Diffs
+ChangeLog.AddingChangeLog=Adding ChangeLog
+
+ChangeLog.ErrInterrupted=Interrupted while creating ChangeLog
+ChangeLog.ErrInvocation=Couldn't create ChangeLog process
+ChangeLog.ErrRefresh=Couldn't refresh local resources
+ChangeLog.ErrNoChangeLog=Couldn't locate ChangeLog
+ChangeLog.ErrNonPattern=Got non-pattern child with inFile set to True
+ChangeLog.ErrRetrieveFormatter=Could not retrieve user's preferred formatter: aborting action
+
+PrepareChangeLog.ErrExecuteFailed=Executing prepare ChangeLog failed
+PrepareChangeLog.InfoNoProjectFound=Cannot prepare ChangeLog entry without a selected project.
+PrepareChangeLog.chooseResources=Choose resources to be included in preparing ChangeLog.
+
+ChangeLogEditor.ErrConfiguration=Couldn't get editor configuration
+
+ChangeLogWriter.ErrUninitialized=Some element of ChangeLog entry is uninitialized
+
+ChangeLogContainerSelectionDialog.Title=Folder Selection
+ChangeLogContainerSelectionDialog.Message=Enter or select the parent folder:
+
+ChangeLogContainerSelectionGroup.DefaultMessageNewAllowed=&Enter or select the parent folder:
+ChangeLogContainerSelectionGroup.DefaultMessageSelectOnly=Select the folder:
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/ui/ChangeLogActionProvider.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/ui/ChangeLogActionProvider.java
new file mode 100644
index 0000000..f99050c
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/ui/ChangeLogActionProvider.java
@@ -0,0 +1,133 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kyu Lee <klee@redhat.com> - initial API and implementation 
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.core.ui;
+
+import org.eclipse.core.resources.mapping.ModelProvider;
+import org.eclipse.core.resources.mapping.ResourceMapping;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.linuxtools.changelog.core.Messages;
+import org.eclipse.linuxtools.changelog.core.actions.PrepareChangeLogAction;
+import org.eclipse.team.core.mapping.ISynchronizationContext;
+import org.eclipse.team.ui.mapping.ISynchronizationCompareAdapter;
+import org.eclipse.team.ui.mapping.ITeamContentProviderManager;
+import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.navigator.CommonActionProvider;
+import org.eclipse.ui.navigator.ICommonActionConstants;
+import org.eclipse.ui.navigator.ICommonActionExtensionSite;
+import org.eclipse.ui.navigator.IExtensionStateModel;
+
+
+/**
+ * 
+ * @author klee
+ *
+ */
+public class ChangeLogActionProvider extends CommonActionProvider {
+	private Action exampleAction;
+
+	/**
+	 * Return the configuration from the synchronize page that contains the
+	 * common viewer.
+	 * 
+	 * @return the configuration from the synchronize page that contains the
+	 *         common viewer
+	 */
+	protected final ISynchronizePageConfiguration getSynchronizePageConfiguration() {
+		return (ISynchronizePageConfiguration) getExtensionStateModel()
+				.getProperty(
+						ITeamContentProviderManager.P_SYNCHRONIZATION_PAGE_CONFIGURATION);
+	}
+
+	/**
+	 * Return the extension state model for the content provider associated with
+	 * action provider.
+	 * 
+	 * @return the extension state model for the content provider associated
+	 *         with action provider
+	 */
+	protected final IExtensionStateModel getExtensionStateModel() {
+		return getActionSite().getExtensionStateModel();
+	}
+
+	/**
+	 * Return the synchronization context to which the actions of this provider
+	 * apply.
+	 * 
+	 * @return the synchronization context to which the actions of this provider
+	 *         apply
+	 */
+	protected final ISynchronizationContext getSynchronizationContext() {
+		return (ISynchronizationContext) getExtensionStateModel().getProperty(
+				ITeamContentProviderManager.P_SYNCHRONIZATION_CONTEXT);
+	}
+
+	@Override
+	public void init(ICommonActionExtensionSite aSite) {
+		super.init(aSite);
+		/*
+		 * exampleAction = new Action("Prepare ChangeLog") { public void run() {
+		 * StringBuffer buffer = new StringBuffer(); boolean addComma = false;
+		 * IStructuredSelection selection =
+		 * (IStructuredSelection)getContext().getSelection(); ResourceMapping[]
+		 * mappings = getResourceMappings(selection.toArray()); for (int i = 0;
+		 * i < mappings.length; i++) { ResourceMapping mapping = mappings[i];
+		 * ISynchronizationCompareAdapter adapter = getCompareAdpater(mapping);
+		 * if (adapter != null) {
+		 * 
+		 * String name = adapter.getPathString(mapping); if (addComma) {
+		 * buffer.append(", "); } buffer.append(name); addComma = true; } }
+		 * MessageDialog.openInformation(getActionSite().getViewSite().getShell(),
+		 * "Example Action", "You have executed a third party action on the
+		 * selected elements: " + buffer.toString()); } };
+		 */
+
+		exampleAction = new PrepareChangeLogAction(Messages.getString("ChangeLog.PrepareChangeLog")) { // $NON-NLS-1$
+			@Override
+			public void run() {
+				setSelection((IStructuredSelection) getContext().getSelection());
+				doRun();
+			}
+
+		};
+
+	}
+
+	protected ISynchronizationCompareAdapter getCompareAdapter(
+			ResourceMapping mapping) {
+		if (mapping != null) {
+			ModelProvider provider = mapping.getModelProvider();
+			if (provider != null) {
+				Object o = provider
+						.getAdapter(ISynchronizationCompareAdapter.class);
+				if (o instanceof ISynchronizationCompareAdapter) {
+					return (ISynchronizationCompareAdapter) o;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public void fillContextMenu(IMenuManager menu) {
+		super.fillContextMenu(menu);
+		menu.add(exampleAction);
+	}
+
+	@Override
+	public void fillActionBars(IActionBars actionBars) {
+
+		actionBars.setGlobalActionHandler(ICommonActionConstants.OPEN,
+				exampleAction);
+	}
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.cparser/.classpath b/changelog/org.eclipse.linuxtools.changelog.cparser/.classpath
new file mode 100644
index 0000000..751c8f2
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.cparser/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/changelog/org.eclipse.linuxtools.changelog.cparser/.project b/changelog/org.eclipse.linuxtools.changelog.cparser/.project
new file mode 100644
index 0000000..47ec674
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.cparser/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.changelog.cparser</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/changelog/org.eclipse.linuxtools.changelog.cparser/.settings/org.eclipse.jdt.core.prefs b/changelog/org.eclipse.linuxtools.changelog.cparser/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..3b7fa83
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.cparser/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,83 @@
+#Thu Jan 15 01:39:03 CET 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=ignore
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/changelog/org.eclipse.linuxtools.changelog.cparser/ChangeLog b/changelog/org.eclipse.linuxtools.changelog.cparser/ChangeLog
new file mode 100644
index 0000000..d853c7e
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.cparser/ChangeLog
@@ -0,0 +1,67 @@
+2010-03-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #304185
+	* META-INF/MANIFEST.MF: Add import of org.eclipse.core.resources.
+	* src/org/eclipse/linuxtools/changelog/parsers/CParser.java: Add deprecated annotation as
+	the CodeReader will be deprecated in Eclipse 3.6.
+	* src/org/eclipse/linuxtools/changelog/parsers/NullCodeReaderFactory.java: Ditto. 
+
+2010-02-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #299974
+	* src/org/eclipse/linuxtools/changelog/parsers/NullCodeReaderFactory.java: New file.
+	* src/org/eclipse/linuxtools/changelog/parsers/CParser.java (parseCurrentFunction): Add
+	support for parsing storage which happens with changes to ancestor file i.e. function
+	removals.
+
+2009-08-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #285866
+	* META-INF/MANIFEST.MF: Change provider to Eclipse.
+
+2009-01-19  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* .settings/org.eclipse.jdt.core.prefs: Enable more warnings.
+
+2009-01-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add .qualifier to version.
+
+2008-11-14  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* META-INF/MANIFEST.MF: Bump BREE to 1.5.
+
+2008-10-20  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Update version to 2.6.3.
+
+2008-03-27  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* src/org/eclipse/linuxtools/changelog/parsers/CParser.java (parseCurrentFunction): 
+	Cleaned up. Commented.
+
+2008-01-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/changelog/parsers/CParser.java: Update copyright. 
+
+2008-01-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Removed.
+	* fragment.xml: New file.
+	* build.properties: Using fragment.xml instead of plugin.xml now.
+	* META-INF/MANIFEST.MF: Changed to fragment.  Has host plugin
+	org.eclipse.linuxtools.changelog.core.  Also update version to 2.6.1.
+
+2008-01-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves Bugzilla #179389
+	* src/org/eclipse/linuxtools/changelog/parsers/CParser.java: Remove internal
+	class references.  Use AbstractTextEditor instead of CEditor.
+
+2007-08-16  Andrew Overholt  <overholt@redhat.com>
+
+	Move to new location.
+
+2007-08-07  klee  <klee@redhat.com>
+
+	* META-INF/MANIFEST.MF: Fixed requirements and version bump to 2.0.0.
\ No newline at end of file
diff --git a/changelog/org.eclipse.linuxtools.changelog.cparser/META-INF/MANIFEST.MF b/changelog/org.eclipse.linuxtools.changelog.cparser/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..eb1d01c
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.cparser/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ChangeLog C parser (Incubation)
+Bundle-SymbolicName: org.eclipse.linuxtools.changelog.cparser;singleton:=true
+Bundle-Version: 2.6.3.qualifier
+Bundle-Vendor: Eclipse
+Require-Bundle: org.eclipse.cdt.core;resolution:=optional,
+ org.eclipse.cdt.ui;resolution:=optional
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Fragment-Host: org.eclipse.linuxtools.changelog.core;bundle-version="2.6.3"
+Import-Package: org.eclipse.core.resources
diff --git a/changelog/org.eclipse.linuxtools.changelog.cparser/build.properties b/changelog/org.eclipse.linuxtools.changelog.cparser/build.properties
new file mode 100644
index 0000000..ab59e59
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.cparser/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+bin.includes = META-INF/,\
+               .,\
+               fragment.xml
diff --git a/changelog/org.eclipse.linuxtools.changelog.cparser/fragment.xml b/changelog/org.eclipse.linuxtools.changelog.cparser/fragment.xml
new file mode 100644
index 0000000..97b093a
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.cparser/fragment.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<fragment>
+   <extension
+         point="org.eclipse.linuxtools.changelog.core.parserContribution">
+      <parser
+            class="org.eclipse.linuxtools.changelog.parsers.CParser"
+            editor="CEditor"
+            name="C Parser">
+      </parser>
+   </extension>
+
+</fragment>
diff --git a/changelog/org.eclipse.linuxtools.changelog.cparser/src/org/eclipse/linuxtools/changelog/parsers/CParser.java b/changelog/org.eclipse.linuxtools.changelog.cparser/src/org/eclipse/linuxtools/changelog/parsers/CParser.java
new file mode 100644
index 0000000..487f8c5
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.cparser/src/org/eclipse/linuxtools/changelog/parsers/CParser.java
@@ -0,0 +1,212 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Phil Muldoon <pkmuldoon@picobot.org>.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Phil Muldoon <pmuldoon@redhat.com> - initial API and implementation, fixes. 
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.parsers;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.eclipse.cdt.core.dom.ICodeReaderFactory;
+import org.eclipse.cdt.core.dom.ast.IASTFunctionDeclarator;
+import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
+import org.eclipse.cdt.core.dom.ast.IASTNode;
+import org.eclipse.cdt.core.dom.ast.IASTNodeSelector;
+import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
+import org.eclipse.cdt.core.dom.ast.gnu.cpp.GPPLanguage;
+import org.eclipse.cdt.core.model.ICElement;
+import org.eclipse.cdt.core.model.ILanguage;
+import org.eclipse.cdt.core.model.IWorkingCopy;
+import org.eclipse.cdt.core.parser.CodeReader;
+import org.eclipse.cdt.core.parser.IScannerInfo;
+import org.eclipse.cdt.core.parser.ParserUtil;
+import org.eclipse.cdt.core.parser.ScannerInfo;
+import org.eclipse.cdt.ui.CUIPlugin;
+import org.eclipse.cdt.ui.IWorkingCopyManager;
+import org.eclipse.core.resources.IStorage;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.text.ITextSelection;
+import org.eclipse.linuxtools.changelog.core.IParserChangeLogContrib;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.IStorageEditorInput;
+import org.eclipse.ui.texteditor.AbstractTextEditor;
+
+/**
+ * @author pmuldoon (Phil Muldoon)
+ */
+@SuppressWarnings("deprecation")
+public class CParser implements IParserChangeLogContrib {
+
+	public CParser() {
+		super();
+	}
+
+	/**
+	 * @see IParserChangeLogContrib#parseCurrentFunction(IEditorInput, int)
+	 */
+	public String parseCurrentFunction(IEditorInput input, int offset)
+			throws CoreException {
+
+		String currentElementName;
+
+		if (input instanceof IFileEditorInput) {
+		// Get the working copy and connect to input.		
+		IWorkingCopyManager manager = CUIPlugin.getDefault()
+				.getWorkingCopyManager();
+		manager.connect(input);
+
+		// Retrieve the C/C++ Element in question.
+		IWorkingCopy workingCopy = manager.getWorkingCopy(input);
+		ICElement method = workingCopy.getElementAtOffset(offset);
+
+		manager.disconnect(input);
+
+		// no element selected
+		if (method == null)
+			return "";
+
+		// Get the current element name, to test it.
+		currentElementName = method.getElementName();
+		
+		// Element doesn't have a name. Can go no further.
+		if (currentElementName == null) {
+			// element doesn't have a name
+			return "";
+		}
+
+		// Get the Element Type to test.
+		int elementType = method.getElementType();
+
+		switch (elementType) {
+		case ICElement.C_FIELD:
+		case ICElement.C_METHOD:
+		case ICElement.C_FUNCTION:
+			break;
+		case ICElement.C_MODEL:
+			return "";
+
+		// So it's not a method, field, function, or model. Where are we?			
+		default:
+			ICElement tmpMethodType;
+		if (((tmpMethodType = method.getAncestor(ICElement.C_FUNCTION)) == null)
+				&& ((tmpMethodType = method.getAncestor(ICElement.C_METHOD)) == null)
+				&& ((tmpMethodType = method.getAncestor(ICElement.C_CLASS)) == null)) {
+			return "";
+		} else {
+			// In a class, but not in a method. Return class name instead.
+			method = tmpMethodType;
+			currentElementName = method.getElementName();
+		}
+
+		}
+
+		// Build all ancestor classes.
+		// Append all ancestor class names to string
+		ICElement tmpParent = method.getParent();
+
+		while (tmpParent != null) {
+			ICElement tmpParentClass = tmpParent.getAncestor(ICElement.C_CLASS);
+			if (tmpParentClass != null) {
+				String tmpParentClassName = tmpParentClass.getElementName();
+				if (tmpParentClassName == null)
+					return currentElementName;
+				currentElementName = tmpParentClassName + "."
+						+ currentElementName;
+			} else
+				return currentElementName;
+			tmpParent = tmpParentClass.getParent();
+
+		}
+		return currentElementName;
+		}
+		else if (input instanceof IStorageEditorInput) {
+			// Get the working copy and connect to input.
+			// don't follow inclusions
+			currentElementName = "";
+			IStorageEditorInput sei = (IStorageEditorInput)input;
+			ICodeReaderFactory codeReaderFactory= NullCodeReaderFactory.getInstance();
+			
+			// empty scanner info
+			IScannerInfo scanInfo= new ScannerInfo();
+			IStorage ancestorStorage = sei.getStorage();
+			if (ancestorStorage == null)
+				return "";
+			InputStream stream = ancestorStorage.getContents();
+			byte buffer[] = new byte[100];
+			String data = new String("");
+			int read = 0;
+			try {
+				do {
+					read = stream.read(buffer);
+					if (read > 0) {
+						String tmp = new String(buffer, 0, read);
+						data = data.concat(tmp);
+					}
+				} while (read == 100);
+				stream.close();
+			} catch (IOException e) {
+				// do nothing
+			}
+			
+			CodeReader reader= new CodeReader(data.toCharArray());
+			
+			// determine the language
+			boolean isSource[]= {false};
+			ILanguage language= GPPLanguage.getDefault();
+			
+			try {
+				IASTTranslationUnit ast;
+				int options= isSource[0] ? ILanguage.OPTION_IS_SOURCE_UNIT : 0;
+				ast= language.getASTTranslationUnit(reader, scanInfo, codeReaderFactory, null, options, ParserUtil.getParserLogService());
+				IASTNodeSelector n = ast.getNodeSelector(null);
+				IASTNode node = n.findFirstContainedNode(offset, 100);
+				while (node != null && !(node instanceof IASTTranslationUnit)) {
+					if (node instanceof IASTFunctionDefinition) {
+						IASTFunctionDefinition fd = (IASTFunctionDefinition)node;
+						IASTFunctionDeclarator d = fd.getDeclarator();
+						currentElementName = new String(d.getName().getSimpleID());
+						break;
+					}
+					node = node.getParent();
+				}
+//				System.out.println(currentElementName);
+			} catch (CoreException exc) {
+				currentElementName = "";
+				CUIPlugin.log(exc);
+			}
+
+			return currentElementName;
+		}
+		
+		return "";
+	}
+
+	/**
+	 * @see IParserChangeLogContrib#parseCurrentFunction(IEditorPart)
+	 */
+	public String parseCurrentFunction(IEditorPart editor) throws CoreException {
+
+		// Check for correct editor type		
+		if (!(editor instanceof AbstractTextEditor))
+			return "";
+
+		// Get the editor, test selection and input.
+		AbstractTextEditor a_editor = (AbstractTextEditor) editor;
+		ITextSelection selection = (ITextSelection) (a_editor)
+				.getSelectionProvider().getSelection();
+		IEditorInput input = a_editor.getEditorInput();
+
+		// Parse it and return the function.
+		return parseCurrentFunction(input, selection.getOffset());
+	}
+
+	
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.cparser/src/org/eclipse/linuxtools/changelog/parsers/NullCodeReaderFactory.java b/changelog/org.eclipse.linuxtools.changelog.cparser/src/org/eclipse/linuxtools/changelog/parsers/NullCodeReaderFactory.java
new file mode 100644
index 0000000..e4b0644
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.cparser/src/org/eclipse/linuxtools/changelog/parsers/NullCodeReaderFactory.java
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009, 2010 Wind River Systems, Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Anton Leherbauer (Wind River Systems) - initial API and implementation
+ *     Red Hat Inc. - modified for usage in ChangeLog C Parser plug-in
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.parsers;
+
+import org.eclipse.cdt.core.dom.ICodeReaderFactory;
+import org.eclipse.cdt.core.index.IIndexFileLocation;
+import org.eclipse.cdt.core.parser.CodeReader;
+import org.eclipse.cdt.core.parser.ICodeReaderCache;
+
+/**
+ * A <code>ICodeReaderFactory</code> which creates dummy <code>CodeReader</code>s without content.
+ *
+ * @since 4.0
+ */
+@SuppressWarnings("deprecation")
+public class NullCodeReaderFactory implements ICodeReaderFactory {
+
+	private static final char[] EMPTY_CHARS = new char[0];
+	private static final NullCodeReaderFactory INSTANCE= new NullCodeReaderFactory();
+
+	public static NullCodeReaderFactory getInstance() {
+		return INSTANCE;
+	}
+
+	private NullCodeReaderFactory() {
+	}
+
+	/*
+	 * @see org.eclipse.cdt.core.dom.ICodeReaderFactory#createCodeReaderForInclusion(java.lang.String)
+	 */
+	public CodeReader createCodeReaderForInclusion(String path) {
+		return new CodeReader(path, EMPTY_CHARS);
+	}
+
+	
+	public CodeReader createCodeReaderForInclusion(IIndexFileLocation ifl, String astPath) {
+		return new CodeReader(astPath, EMPTY_CHARS);
+	}
+
+	/*
+	 * @see org.eclipse.cdt.core.dom.ICodeReaderFactory#createCodeReaderForTranslationUnit(java.lang.String)
+	 */
+	public CodeReader createCodeReaderForTranslationUnit(String path) {
+		return new CodeReader(path, EMPTY_CHARS);
+	}
+
+	/*
+	 * @see org.eclipse.cdt.core.dom.ICodeReaderFactory#getCodeReaderCache()
+	 */
+	public ICodeReaderCache getCodeReaderCache() {
+		return null;
+	}
+
+	/*
+	 * @see org.eclipse.cdt.core.dom.ICodeReaderFactory#getUniqueIdentifier()
+	 */
+	public int getUniqueIdentifier() {
+		// is this used somewhere?
+		return 7;
+	}
+
+}
diff --git a/profiling/.classpath b/changelog/org.eclipse.linuxtools.changelog.doc/.classpath
similarity index 100%
copy from profiling/.classpath
copy to changelog/org.eclipse.linuxtools.changelog.doc/.classpath
diff --git a/changelog/org.eclipse.linuxtools.changelog.doc/.project b/changelog/org.eclipse.linuxtools.changelog.doc/.project
new file mode 100644
index 0000000..ed18384
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.doc/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.changelog.doc</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/changelog/org.eclipse.linuxtools.changelog.doc/.settings/org.eclipse.jdt.core.prefs b/changelog/org.eclipse.linuxtools.changelog.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..0d47615
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.doc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Tue Apr 14 09:48:05 EDT 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/changelog/org.eclipse.linuxtools.changelog.doc/ChangeLog b/changelog/org.eclipse.linuxtools.changelog.doc/ChangeLog
new file mode 100644
index 0000000..36af431
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.doc/ChangeLog
@@ -0,0 +1,202 @@
+2009-08-07  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add Bundle-Localization.
+
+2009-08-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #285866
+	* plugin.properties: Change provider to Eclipse.
+	* META-INF/MANIFEST.MF: Make Provider use %providerName property.
+
+2009-04-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add BREE of J2SE-1.5.
+
+2009-04-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump release to 2.6.4.
+
+2009-04-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* build.xml: Removed.
+	* raw/book.css: Removed.
+	* raw/ChangeLogDocs/ChangeLog.html: Removed.
+	* raw/ChangeLogDocs/changelog_location.png: Removed.
+	* raw/ChangeLogDocs/changelog_preferences.png: Removed.
+	* raw/ChangeLogDocs/changelog_preferences2.2.2.png: Removed.
+	* raw/ChangeLogDocs/prepareChangeLog1-sm-compare.png: Removed.
+	* raw/ChangeLogDocs/prepareChangeLog2-sm-workspace.png: Removed.
+	* raw/ChangeLogDocs/prepareChangeLog3-sm-prep.png: Removed.
+	* raw/ChangeLogDocs/prepareChangeLog4-sm-result.png: Removed.
+	* raw/ChangeLogDocs/prepareChangeLog5-sm-hyplink.png: Removed.
+	* raw/ChangeLogDocs/sm-changelog_invoke.png: Removed.
+	* raw/ChangeLogDocs/sm-changelog_multi_entry.png: Removed.
+	* raw/ChangeLogDocs/sm-changelog_pfg.png: Removed.
+	* raw/ChangeLogDocs/sm-changelog_pfg_off.png: Removed.
+	* raw/ChangeLogDocs/sm-changelog_traverse.png: Removed.
+	* raw/notnetscape4.css: Removed.
+	* raw/rhlegal2004.htm: Removed.
+	* raw/rhlegal2006.htm: Removed.
+	* raw/rhlegal2008.htm: Removed.
+	* toc.xml: Modified to link to new userguide toc.xml.
+	* .classpath: New file.
+	* .settings/org.eclipse.jdt.core.prefs: New file.
+	* about.html: New file.
+	* build-helper.xml: New file.
+	* doc/notices.html: New file.
+	* extract-markup.xsl: New file.
+	* src/org/eclipse/linuxtools/internal/changelog/doc/anttask/MediaWikiImageFetcher.java: New file.
+	* src/org/eclipse/linuxtools/internal/changelog/doc/anttask/tasks.properties: New file.
+	* userguide/ChangeLog\ Reference-toc.xml: New file.
+	* userguide/ChangeLog\ Reference.html: New file.
+	* userguide/images/Linuxtools-ChangeLogPreferences.png: New file.
+	* userguide/images/Linuxtools-ChangeLog-editor.png: New file.
+	* userguide/images/Linuxtools-ChangeLog-insert-changelog.png: New file.
+	* userguide/images/Linuxtools-ChangeLog-prepare-changelog-result.png: New file.
+	* userguide/Updating-This-Document.html: New file.
+	* .project: Change to Java project.
+	* build.properties: Add new userguide directory items and don't do custom build.
+	* META-INF/MANIFEST.MF: Updated.
+	* plugin.xml: Update help doc extension to add userguide secondary toc.
+
+2009-01-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add .qualifier to version.
+
+2009-01-07  Andrew Overholt  <overholt@redhat.com>
+
+	* build.xml: Back to version 2.6.3.  Include META-INF in binary build.
+	* plugin.properties: Update provider to be Eclipse.org.
+
+2008-11-14  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* build.properties: Add META-INF to bin.includes.
+
+2008-11-11  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* META-INF/MANIFEST.MF: New file.
+	* .project: Make it a plugin project.
+	* plugin.xml: Remove all the data now in the manifest.mf.
+
+2008-10-29  Andrew Overholt  <overholt@redhat.com>
+
+	* toc.xml: Remove "Red Hat ChangeLog" from documentation table of contents
+	entry.
+
+2008-10-20  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Update version to 2.6.3.
+
+2008-01-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* raw/rhlegal2008.htm: New file.
+	* plugin.xml: Update to 2.6.1.
+	* raw/ChangeLogDocs/ChangeLog.html: Updated to new functionality.
+	* raw/prepareChangeLog4-sm-result.png: Updated.
+
+2007-05-15  Kyu Lee  <klee@redhat.com>
+
+	* build.xml: version bump to 2.4.0.
+
+2007-05-14  Kyu Lee  <klee@redhat.com>
+
+	* plugin.xml: version bump to 2.4.0.
+
+2007-05-04  Andrew Overholt  <overholt@redhat.com>
+
+	Bug #185598
+	* plugin.xml: Add "Incubation" to Bundle-Name.
+
+2007-01-24  Kyu Lee  <klee@redhat.com>
+
+	* raw/ChangeLogDocs/ChangeLog.html:
+	* raw/rhlegal2006.htm: Updated copyright notice.
+
+2007-01-23  Kyu Lee  <klee@redhat.com>
+
+	* raw/ChangeLogDocs/ChangeLog.html: Updated link for copyright notice.
+	* raw/rhlegal2006.htm: Updated copyright notice.
+
+2007-01-22  Kyu Lee  <klee@redhat.com>
+	* plugin.xml:
+	* build.xml: Bump version to 2.3.4.
+
+2006-10-13  Kyu Lee  <klee@redhat.com>
+
+	* plugin.xml: Bump version to 2.3.3.
+
+2006-09-29  Kyu Lee  <klee@redhat.com>
+
+	* plugin.xml: Bump version to 2.3.2.
+
+2006-09-18  Kyu Lee  <klee@redhat.com>
+
+	* plugin.xml: Bump version to 2.3.1.
+
+2006-09-14  Kyu Lee  <klee@redhat.com>
+
+	* plugin.xml: Changed version to 2.3.0.
+
+2006-09-01  Kyu Lee  <klee@redhat.com>
+
+	* plugin.xml: Bump version to 2.2.3.
+
+2006-08-15  Kyu Lee  <klee@redhat.com>
+
+	* build.xml: Fixed file name to have correct format.
+	* raw/ChangeLogDocs/ChangeLog.html: Edited for 2.2.2.
+	* raw/ChangeLogDocs/changelog_preferences2.2.2.png: Added.
+	* raw/ChangeLogDocs/prepareChangeLog1-sm-compare.png: Added.
+	* raw/ChangeLogDocs/prepareChangeLog2-sm-workspace.png: Added.
+	* raw/ChangeLogDocs/prepareChangeLog3-sm-prep.png: Added.
+	* raw/ChangeLogDocs/prepareChangeLog4-sm-result.png: Added.
+	* raw/ChangeLogDocs/prepareChangeLog5-sm-hyplink.png: Added.
+
+2006-08-01  Kyu Lee  <klee@redhat.com>
+
+	* plugin.xml: Chenged version to 2.2.2.
+
+2006-07-25  Kyu Lee  <klee@redhat.com>
+
+	* plugin.xml: Changed version to 2.2.1.
+
+2006-06-20  Kyu Lee  <klee@redhat.com>
+
+	* plugin.xml: Changed version to 2.1.0.
+
+2006-05-23  ifoox  <ifoox@redhat.com>
+
+	* plugin.xml: Bump version to 2.0.4.
+
+2006-03-24  Igor Foox  <ifoox@redhat.com>
+
+	* plugin.xml: Bump version to 2.0.3.
+
+2006-03-15  Igor Foox  <ifoox@redhat.com>
+
+	* plugin.xml: Bump version to 2.0.2.
+
+2004-02-25  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* plugin.xml: Bumped version
+
+2004-11-10  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* raw/ChangeLogDocs/ChangeLog.html: Edited for 2.0
+	* raw/ChangeLogDocs/changelog_preferences.png: Changed
+	* raw/ChangeLogDocs/sm-changelog_invoke.png: Changed
+
+2004-07-16  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* plugin.xml: Upgraded version
+	* build.xml: Upgrade version
+
+2004-07-13  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* build.properties: Added custom=true to stop changelog
+	feature from generating a new build.xml on build
+
+2004-02-25  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* Initial Import
+
diff --git a/changelog/org.eclipse.linuxtools.changelog.doc/META-INF/MANIFEST.MF b/changelog/org.eclipse.linuxtools.changelog.doc/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..e56e7e1
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.doc/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ChangeLog Documentation (Incubation)
+Bundle-SymbolicName: org.eclipse.linuxtools.changelog.doc;singleton:=true
+Bundle-Version: 2.6.4.qualifier
+Bundle-Vendor: %providerName
+Require-Bundle: org.apache.ant;bundle-version="1.7.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Localization: plugin
diff --git a/changelog/org.eclipse.linuxtools.changelog.doc/about.html b/changelog/org.eclipse.linuxtools.changelog.doc/about.html
new file mode 100644
index 0000000..0c6525d
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.doc/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>24th October, 2008</p>	
+<h3>License</h3>
+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<h3>Contributions</h3>
+
+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise
+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such
+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
+
+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or
+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the
+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/changelog/org.eclipse.linuxtools.changelog.doc/build-helper.xml b/changelog/org.eclipse.linuxtools.changelog.doc/build-helper.xml
new file mode 100644
index 0000000..198d692
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.doc/build-helper.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="org.eclipse.linuxtools.changelog.doc" default="all">
+    <description>
+            Generate Eclipse help content for the Linux Tools changelog user guide
+    </description>
+
+	<property name="changelog.help.doc.url.base" value="http://wiki.eclipse.org"/>
+	<property name="changelog.wiki.url.base" value="${changelog.help.doc.url.base}/Linux_Tools_Project/ChangeLog"/>
+	<property name="imageFolder" value="images"/>
+	
+	<path id="tasks.classpath" path="bin"/>
+	<path id="wikitext.tasks.classpath">
+		<pathelement location="../org.eclipse.mylyn.wikitext.core/@dot"/>
+		<pathelement location="../org.eclipse.mylyn.wikitext.core/bin"/>
+		<pathelement location="../org.eclipse.mylyn.wikitext.mediawiki.core/@dot"/>
+		<pathelement location="../org.eclipse.mylyn.wikitext.mediawiki.core/bin"/>
+	</path>
+	
+	<taskdef classpathref="tasks.classpath" resource="org/eclipse/linuxtools/internal/changelog/doc/anttask/tasks.properties"/>
+	<taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/util/anttask/tasks.properties"/>
+	
+	<target name="init">
+		<mkdir dir="tmp"/>
+	</target>
+	
+	<target name="clean" depends="init">
+		<delete includeemptydirs="true" failonerror="false">
+			<fileset dir="tmp"/>
+		</delete>
+	</target>
+
+    <target name="all" depends="init" description="Generate Eclipse help content for the Linux Tools changelog user guide">
+        <eclipse-wiki-to-help
+        	help.doc.filenamenoextension="ChangeLog Reference"
+        	help.doc.url.base="${changelog.help.doc.url.base}"
+        	help.doc.url.html="${changelog.wiki.url.base}/User_Guide"
+        	help.doc.url.xml="${changelog.help.doc.url.base}/Special:Export/Linux_Tools_Project/ChangeLog/User_Guide"
+        	help.imagefolder="${imageFolder}"
+        	targetfolder="userguide"
+        	wiki.url.base="${changelog.help.doc.url.base}/Linux_Tools_Project"/>
+    </target>
+	
+	<macrodef name="eclipse-wiki-to-help">
+		<attribute name="help.doc.url.base"/>
+		<attribute name="wiki.url.base"/>
+		<attribute name="help.doc.url.html"/>
+		<attribute name="help.doc.url.xml"/>
+		<attribute name="help.doc.filenameNoExtension"/>
+		<attribute name="help.imageFolder"/>
+		<attribute name="targetFolder"/>
+		<sequential>
+			<get dest="tmp/help.doc.xml" src="@{help.doc.url.xml}"/>
+	    	<get dest="tmp/help.doc.html" src="@{help.doc.url.html}"/>
+	    	
+			<!--
+	    	<copy todir="tmp">
+	    		<fileset dir="images"/>
+	    	</copy>
+	    	-->
+	    	<mediawiki-fetch-images src="tmp/help.doc.html" dest="tmp" base="@{help.doc.url.base}"/>
+	    	
+	    	<xslt style="extract-markup.xsl" in="tmp/help.doc.xml" out="tmp/@{help.doc.filenameNoExtension}.mediawiki"/>
+			<echo append="true" file="tmp/@{help.doc.filenameNoExtension}.mediawiki">
+
+= Updating This Document =
+
+This document is maintained in a collaborative wiki.  If you wish to update or modify this document please visit 
+@{help.doc.url.html}
+			</echo>
+			
+			<!-- Removing Phoenix extensions -->
+			<replaceregexp match="\{\{\#eclipseproject.*" replace="" flags="g" byline="true">
+				<fileset dir="tmp" includes="**/*.mediawiki"/>
+			</replaceregexp>
+			
+			<wikitext-to-eclipse-help markupLanguage="org.eclipse.mylyn.wikitext.mediawiki.core.MediaWikiLanguage" 
+				multipleOutputFiles="true"
+				navigationImages="true"
+				helpPrefix="@{targetFolder}"
+				internallinkpattern="@{wiki.url.base}/{0}"
+				validate="true"
+				failonvalidationerror="true"
+				prependImagePrefix="${imageFolder}"
+				formatoutput="true">
+				<fileset dir="tmp" includes="**/*.mediawiki"/>
+				<stylesheet url="book.css"/>
+			</wikitext-to-eclipse-help>
+	    	
+	    	<mkdir dir="@{targetFolder}/${imageFolder}"/>
+			<copy todir="@{targetFolder}/${imageFolder}" overwrite="true">
+				<fileset dir="tmp">
+					<include name="*.gif"/>
+					<include name="*.png"/>
+				</fileset>
+			</copy>
+	    	<copy todir="@{targetFolder}" overwrite="true">
+				<fileset dir="tmp">
+					<include name="*.html"/>
+					<include name="*toc.xml"/>
+					<exclude name="help.doc.html"/>
+				</fileset>
+			</copy>
+	    	<antcall target="test"/>
+		</sequential>			
+	</macrodef>
+	
+
+	<target name="test" depends="init" description="verify that all of the HTML files are well-formed XML">
+		<echo level="info">
+Validating help content XML and HTML files: The Eclipse help system expects well-formed XML
+			
+If validation fails it is because either:
+			
+* the userguide source code is poorly formed, or
+* the WikiText MediaWiki parser has a bug
+			
+Problems with userguide source are usually caused by improper use of HTML markup in the MediaWiki source,
+or inadvertently starting a line with a space character (in MediaWiki this starts a preformatted block)
+		</echo>
+
+		<!-- 
+		Don't bother with DTD validation: we only care if the files are well-formed.
+		We therefore provide an empty DTD 
+		-->
+		<echo file="tmp/__empty.dtd" message=""/>
+		<xmlvalidate lenient="true">
+			<fileset dir="userguide">
+				<include name="**/*.xml"/>
+			</fileset>
+			<fileset dir="userguide">
+				<include name="**/*.html"/>
+			</fileset>
+			<dtd publicid="-//W3C//DTD XHTML 1.0 Transitional//EN" location="${basedir}/tmp/__empty.dtd"/>
+		</xmlvalidate>
+	</target>
+</project>
diff --git a/changelog/org.eclipse.linuxtools.changelog.doc/build.properties b/changelog/org.eclipse.linuxtools.changelog.doc/build.properties
new file mode 100644
index 0000000..6ef9e91
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.doc/build.properties
@@ -0,0 +1,13 @@
+
+bin.includes = plugin.properties,\
+               META-INF/,\
+               doc.zip,\
+               userguide/,\
+               plugin.xml,\
+               toc.xml,\
+               about.html,\
+               doc/
+
+jars.compile.order = .
+source.. = src/
+output.. = bin/
diff --git a/changelog/org.eclipse.linuxtools.changelog.doc/doc/notices.html b/changelog/org.eclipse.linuxtools.changelog.doc/doc/notices.html
new file mode 100644
index 0000000..dd6688f
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.doc/doc/notices.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+
+<meta name="copyright" content="&#169; Copyright 2009 Eclipse Linux Tools project committers and others. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+
+   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+   <LINK REL="STYLESHEET" HREF="book.css" CHARSET="ISO-8859-1" TYPE="text/css">
+   <title>Legal Notices</title>
+</head>
+<body>
+
+<h3>
+<a NAME="Notices"></a>Notices</h3>
+<p>
+The material in this guide is &#169; Copyright 2009 Eclipse Linux Tools project committers and others.
+</p>
+<p>
+<a href="../about.html">Terms and conditions regarding the use of this guide.</a>
+</p>
+</body>
+</html>
diff --git a/changelog/org.eclipse.linuxtools.changelog.doc/extract-markup.xsl b/changelog/org.eclipse.linuxtools.changelog.doc/extract-markup.xsl
new file mode 100644
index 0000000..4c4e731
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.doc/extract-markup.xsl
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:mw="http://www.mediawiki.org/xml/export-0.3/">
+	<xsl:output  method="text"/>
+	
+	<xsl:template match="/">
+		<xsl:value-of select="//mw:text"/>
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/changelog/org.eclipse.linuxtools.changelog.doc/plugin.properties b/changelog/org.eclipse.linuxtools.changelog.doc/plugin.properties
new file mode 100644
index 0000000..0d52247
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.doc/plugin.properties
@@ -0,0 +1,2 @@
+pluginName=ChangeLog Plugin
+providerName=Eclipse
diff --git a/changelog/org.eclipse.linuxtools.changelog.doc/plugin.xml b/changelog/org.eclipse.linuxtools.changelog.doc/plugin.xml
new file mode 100644
index 0000000..273310d
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.doc/plugin.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin>
+<!-- This part should be in a documentation plugin -->
+<!-- Configure the help contribution for this plugin -->
+   <extension point="org.eclipse.help.toc">
+      <toc
+            file="toc.xml"
+            primary="true">
+      </toc>
+      <toc
+            file="userguide/ChangeLog Reference-toc.xml"
+            primary="false">
+      </toc>
+   </extension>
+</plugin>
diff --git a/changelog/org.eclipse.linuxtools.changelog.doc/src/org/eclipse/linuxtools/internal/changelog/doc/anttask/MediaWikiImageFetcher.java b/changelog/org.eclipse.linuxtools.changelog.doc/src/org/eclipse/linuxtools/internal/changelog/doc/anttask/MediaWikiImageFetcher.java
new file mode 100644
index 0000000..be462d9
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.doc/src/org/eclipse/linuxtools/internal/changelog/doc/anttask/MediaWikiImageFetcher.java
@@ -0,0 +1,149 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008 David Green and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     David Green - initial API and implementation
+ * 
+ * Re-namespaced 2009-04-14 without changes from org.eclipse.mylyn.help.ui.
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.changelog.doc.anttask;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.Get;
+
+/**
+ * Fetch images from a MediaWiki-generated HTML page source
+ * 
+ * @author David Green
+ */
+public class MediaWikiImageFetcher extends Task {
+
+	private String base;
+
+	private File dest;
+
+	private File src;
+
+	@Override
+	public void execute() throws BuildException {
+		if (dest == null) {
+			throw new BuildException("Must specify @dest"); //$NON-NLS-1$
+		}
+		if (!dest.exists()) {
+			throw new BuildException("@dest does not exist: " + dest); //$NON-NLS-1$
+		}
+		if (!dest.isDirectory()) {
+			throw new BuildException("@dest is not a directory: " + dest); //$NON-NLS-1$
+		}
+		if (src == null) {
+			throw new BuildException("Must specify @src"); //$NON-NLS-1$
+		}
+		if (!src.exists()) {
+			throw new BuildException("@src does not exist: " + src); //$NON-NLS-1$
+		}
+		if (!src.isFile()) {
+			throw new BuildException("@src is not a file: " + src); //$NON-NLS-1$
+		}
+		if (base == null) {
+			throw new BuildException("Must specify @base"); //$NON-NLS-1$
+		}
+		if (base.endsWith("/")) { //$NON-NLS-1$
+			base = base.substring(0, base.length() - 1);
+		}
+		Pattern fragmentUrlPattern = Pattern.compile("src=\"([^\"]+)\""); //$NON-NLS-1$
+		Pattern imagePattern = Pattern.compile("alt=\"Image:([^\"]*)\"([^>]+)", Pattern.MULTILINE); //$NON-NLS-1$
+		String htmlSrc;
+		try {
+			htmlSrc = readSrc();
+		} catch (IOException e) {
+			throw new BuildException("Cannot read src: " + src + ": " + e.getMessage(), e); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		log("Parsing " + src, Project.MSG_INFO); //$NON-NLS-1$
+		int fileCount = 0;
+		Matcher imagePatternMatcher = imagePattern.matcher(htmlSrc);
+		while (imagePatternMatcher.find()) {
+			String alt = imagePatternMatcher.group(1);
+			String imageFragment = imagePatternMatcher.group(2);
+			if (imageFragment != null) {
+				Matcher fragmentUrlMatcher = fragmentUrlPattern.matcher(imageFragment);
+				if (fragmentUrlMatcher.find()) {
+					String url = fragmentUrlMatcher.group(1);
+					String qualifiedUrl = base + url;
+					log("Fetching " + qualifiedUrl, Project.MSG_INFO); //$NON-NLS-1$
+					Get get = new Get();
+					get.setProject(getProject());
+					get.setLocation(getLocation());
+					try {
+						get.setSrc(new URL(qualifiedUrl));
+					} catch (MalformedURLException e) {
+						log("Skipping " + url + ": " + e.getMessage(), Project.MSG_WARN); //$NON-NLS-1$ //$NON-NLS-2$
+						continue;
+					}
+					// note: we use the alt text for the name since for some files there is a case-difference between
+					//       the server URL and the text used in the image src of the markup
+					String name = alt == null ? url.substring(url.lastIndexOf('/')) : alt;
+					get.setDest(new File(dest, name));
+					get.execute();
+					++fileCount;
+				}
+			}
+		}
+		log("Fetched " + fileCount + " image files for " + src, Project.MSG_INFO); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	public String getBase() {
+		return base;
+	}
+
+	public File getDest() {
+		return dest;
+	}
+
+	public File getSrc() {
+		return src;
+	}
+
+	private String readSrc() throws IOException {
+		StringBuilder buf = new StringBuilder((int) src.length());
+		Reader reader = new BufferedReader(new FileReader(src));
+		try {
+			int i;
+			while ((i = reader.read()) != -1) {
+				buf.append((char) i);
+			}
+		} finally {
+			reader.close();
+		}
+		return buf.toString();
+	}
+
+	public void setBase(String base) {
+		this.base = base;
+	}
+
+	public void setDest(File dest) {
+		this.dest = dest;
+	}
+
+	public void setSrc(File src) {
+		this.src = src;
+	}
+
+}
diff --git a/changelog/org.eclipse.linuxtools.changelog.doc/src/org/eclipse/linuxtools/internal/changelog/doc/anttask/tasks.properties b/changelog/org.eclipse.linuxtools.changelog.doc/src/org/eclipse/linuxtools/internal/changelog/doc/anttask/tasks.properties
new file mode 100644
index 0000000..85e992b
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.doc/src/org/eclipse/linuxtools/internal/changelog/doc/anttask/tasks.properties
@@ -0,0 +1 @@
+mediawiki-fetch-images=org.eclipse.linuxtools.internal.changelog.doc.anttask.MediaWikiImageFetcher
diff --git a/changelog/org.eclipse.linuxtools.changelog.doc/toc.xml b/changelog/org.eclipse.linuxtools.changelog.doc/toc.xml
new file mode 100644
index 0000000..feb22d1
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.doc/toc.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="ChangeLog Plug-in User Guide">
+ <link toc="userguide/ChangeLog Reference-toc.xml"/>
+ <topic href="doc/notices.html" label="Legal" />
+</toc>
\ No newline at end of file
diff --git a/changelog/org.eclipse.linuxtools.changelog.doc/userguide/ChangeLog Reference-toc.xml b/changelog/org.eclipse.linuxtools.changelog.doc/userguide/ChangeLog Reference-toc.xml
new file mode 100644
index 0000000..081eb42
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.doc/userguide/ChangeLog Reference-toc.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<toc topic="userguide/ChangeLog Reference.html" label="ChangeLog Reference">
+	<topic href="userguide/ChangeLog Reference.html" label="Using the ChangeLog Plugin">
+		<topic href="userguide/ChangeLog Reference.html#ChangeLog_Preferences" label="ChangeLog Preferences"></topic>
+		<topic href="userguide/ChangeLog Reference.html#Using_the_ChangeLog_Plug-in" label="Using the ChangeLog Plug-in">
+			<topic href="userguide/ChangeLog Reference.html#ChangeLog_Editor" label="ChangeLog Editor"></topic>
+		</topic>
+	</topic>
+	<topic href="userguide/Updating-This-Document.html" label="Updating This Document"></topic>
+</toc>
\ No newline at end of file
diff --git a/changelog/org.eclipse.linuxtools.changelog.doc/userguide/ChangeLog Reference.html b/changelog/org.eclipse.linuxtools.changelog.doc/userguide/ChangeLog Reference.html
new file mode 100644
index 0000000..b068eee
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.doc/userguide/ChangeLog Reference.html
@@ -0,0 +1,146 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>ChangeLog Reference</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">ChangeLog Reference</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Updating-This-Document.html" title="Updating This Document">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Updating This Document</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Using_the_ChangeLog_Plugin">Using the ChangeLog Plugin</h1>
+		<p>The ChangeLog plug-in for Eclipse is a basic set of extensions to enable ChangeLog functionality for projects in Eclipse.</p>
+		<p>Before using the plug-in, you will want to set the ChangeLog preferences. These include your desired name and e-mail address to use in a ChangeLog entry. The default entries will be your username and your username@hostname. If you set the environment variables: ECLIPSE_CHANGELOG_REALNAME and/or ECLIPSE_CHANGELOG_EMAIL these will be used instead as your defaults.</p>
+		<h2 id="ChangeLog_Preferences">ChangeLog Preferences</h2>
+		<p>To access the 
+			<b>ChangeLog Preferences</b>, click 
+			<b>Window > Preferences > ChangeLog</b>.
+		</p>
+		<p>
+			<img border="0" src="images/Linuxtools-ChangeLogPreferences.png"/>
+		</p>
+		<p>The screenshot above illustrates the preferences associated with the ChangeLog plug-in. The effect of each preference is described below.</p>
+		<p>
+			<i>' Author Name '</i>
+		</p>
+		<dl>
+			<dd>
+				<dl>
+					<dd>The name of the Author to be included in the ChangeLog entry.</dd>
+				</dl>
+			</dd>
+		</dl>
+		<p>
+			<i>' Author Email '</i>
+		</p>
+		<dl>
+			<dd>
+				<dl>
+					<dd>The email address of the Author to be included in the ChangeLog entry.</dd>
+				</dl>
+			</dd>
+		</dl>
+		<p>
+			<i>' Formatter '</i>
+		</p>
+		<dl>
+			<dd>
+				<dl>
+					<dd>The name of the formatter module to use for ChangeLog entries.</dd>
+				</dl>
+			</dd>
+		</dl>
+		<p>
+			<i>' Editor '</i>
+		</p>
+		<dl>
+			<dd>
+				<dl>
+					<dd>The name of the editor module to use for opening ChangeLog file.</dd>
+				</dl>
+			</dd>
+		</dl>
+		<h2 id="Using_the_ChangeLog_Plug-in">Using the ChangeLog Plug-in</h2>
+		<p>The plug-in has two functions:</p>
+		<ul>
+			<li>
+				<b>Insert ChangeLog</b> is used to create a single ChangeLog entry for the current location in an editor.
+			</li>
+			<li>
+				<b>Prepare ChangeLog</b> is used to create the entire ChangeLog entry for all changes to the selected project. This requires access to a source control repository.
+			</li>
+		</ul>
+		<p>
+			<b>Insert ChangeLog</b>
+		</p>
+		<p>One invokes the Insert ChangeLog function by selecting 
+			<b>Edit -> ChangeLog</b> Entry from the menubar. It can also be invoked via the keyboard shortcut 
+			<b>Ctrl+Alt+C</b>.
+		</p>
+		<p>
+			<img border="0" src="images/Linuxtools-ChangeLog-insert-changelog.png"/>
+		</p>
+		<p>When clicked, the ChangeLog plug-in compiles an entry, the form of which depends on which formatter is set. The plug-in provides a GNU style formatter. There is an extension point by which other plug-ins may contribute alternate formatters.</p>
+		<p>
+			<b>Insert ChangeLog Entry</b> will calculate the current function location in the active editor and generate the entry.
+		</p>
+		<p>
+			<b>Prepare ChangeLog</b>
+		</p>
+		<p>Prepare ChangeLog will generate a full ChangeLog entry based upon local changes made in your workspace compared with the source control repository. This includes new files, removed files, and modifications. One invokes this feature by selecting 
+			<b>Project -> Prepare ChangeLog</b> from the menubar. It can also be invoked via the keyboard shortcut 
+			<b>Ctrl+Alt+P</b>. It will use the selected project or find the project for the file in the active editor or synchronization view.
+		</p>
+		<p>Prepare ChangeLog will open up ChangeLog editor and insert entries. If there is no existing ChangeLog in the top-level project directory, you will be prompted for the location of one. </p>
+		<p>
+			<img border="0" src="images/Linuxtools-ChangeLog-prepare-changelog-result.png"/>
+		</p>
+		<h3 id="ChangeLog_Editor">ChangeLog Editor</h3>
+		<p>The ChangeLog plug-in also provides a special editor for ChangeLog files. This editor has syntax highlighting and provides a file-hyperlink feature. Inside the ChangeLog editor, if you hold the Ctrl key and click on a hyperlink the corresponding file will be opened. </p>
+		<p>
+			<img border="0" src="images/Linuxtools-ChangeLog-editor.png"/>
+		</p>
+		<p>If you invoke the key combination 
+			<b>Ctrl+Alt+V</b>, the changes made to the ChangeLog file since the last check-in to the repository will be copied to the clipboard.  In most cases, this is the last entry unless you have performed other edits on the file.  This is useful when you later perform a commit and wish to use the ChangeLog entry as the comment.
+		</p>
+		<p><p class="copyright">&#169; Copyright Red Hat, Inc. 2009
+
+			<br/>&#169; Copyright Phil Muldoon &lt;pkmuldoon@picobot.org> 2006.
+
+			<br/>This documentation is licensed under the Eclipse Public License v. 1.0.</p>
+		</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Updating-This-Document.html" title="Updating This Document">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Updating This Document</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/changelog/org.eclipse.linuxtools.changelog.doc/userguide/Updating-This-Document.html b/changelog/org.eclipse.linuxtools.changelog.doc/userguide/Updating-This-Document.html
new file mode 100644
index 0000000..7562f6b
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.doc/userguide/Updating-This-Document.html
@@ -0,0 +1,54 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>ChangeLog Reference - Updating This Document</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Updating This Document</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="ChangeLog Reference.html" title="Using the ChangeLog Plugin">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right"></td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Using the ChangeLog Plugin</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top"></td>
+			</tr>
+		</table><hr/>
+		<h1 id="Updating_This_Document">Updating This Document</h1>
+		<p>This document is maintained in a collaborative wiki.  If you wish to update or modify this document please visit 
+
+			<a href="http://wiki.eclipse.org/Linux_Tools_Project/ChangeLog/User_Guide">http://wiki.eclipse.org/Linux_Tools_Project/ChangeLog/User_Guide</a>
+		</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="ChangeLog Reference.html" title="Using the ChangeLog Plugin">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="ChangeLog Reference.html" title="ChangeLog Reference">
+						<img alt="ChangeLog Reference" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right"></td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Using the ChangeLog Plugin</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top"></td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/changelog/org.eclipse.linuxtools.changelog.doc/userguide/images/Linuxtools-ChangeLog-editor.png b/changelog/org.eclipse.linuxtools.changelog.doc/userguide/images/Linuxtools-ChangeLog-editor.png
new file mode 100644
index 0000000..20875f4
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.doc/userguide/images/Linuxtools-ChangeLog-editor.png
Binary files differ
diff --git a/changelog/org.eclipse.linuxtools.changelog.doc/userguide/images/Linuxtools-ChangeLog-insert-changelog.png b/changelog/org.eclipse.linuxtools.changelog.doc/userguide/images/Linuxtools-ChangeLog-insert-changelog.png
new file mode 100644
index 0000000..85b804b
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.doc/userguide/images/Linuxtools-ChangeLog-insert-changelog.png
Binary files differ
diff --git a/changelog/org.eclipse.linuxtools.changelog.doc/userguide/images/Linuxtools-ChangeLog-prepare-changelog-result.png b/changelog/org.eclipse.linuxtools.changelog.doc/userguide/images/Linuxtools-ChangeLog-prepare-changelog-result.png
new file mode 100644
index 0000000..7db94c8
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.doc/userguide/images/Linuxtools-ChangeLog-prepare-changelog-result.png
Binary files differ
diff --git a/changelog/org.eclipse.linuxtools.changelog.doc/userguide/images/Linuxtools-ChangeLogPreferences.png b/changelog/org.eclipse.linuxtools.changelog.doc/userguide/images/Linuxtools-ChangeLogPreferences.png
new file mode 100644
index 0000000..174d308
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.doc/userguide/images/Linuxtools-ChangeLogPreferences.png
Binary files differ
diff --git a/changelog/org.eclipse.linuxtools.changelog.javaparser/.classpath b/changelog/org.eclipse.linuxtools.changelog.javaparser/.classpath
new file mode 100644
index 0000000..751c8f2
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.javaparser/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/changelog/org.eclipse.linuxtools.changelog.javaparser/.project b/changelog/org.eclipse.linuxtools.changelog.javaparser/.project
new file mode 100644
index 0000000..dbb74cb
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.javaparser/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.changelog.javaparser</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/changelog/org.eclipse.linuxtools.changelog.javaparser/.settings/org.eclipse.jdt.core.prefs b/changelog/org.eclipse.linuxtools.changelog.javaparser/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..3b7fa83
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.javaparser/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,83 @@
+#Thu Jan 15 01:39:03 CET 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=ignore
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/changelog/org.eclipse.linuxtools.changelog.javaparser/ChangeLog b/changelog/org.eclipse.linuxtools.changelog.javaparser/ChangeLog
new file mode 100644
index 0000000..a98fc76
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.javaparser/ChangeLog
@@ -0,0 +1,61 @@
+2010-02-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/changelog/parsers/java/JavaParser.java (parseCurrentFunction): Add
+	check for null WorkingCopy to avoid errors if type of IEditorInput is not supported.
+
+2009-08-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #285866
+	* META-INF/MANIFEST.MF: Change provider to Eclipse.
+
+2009-02-25  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/changelog/parsers/JavaParser.java: Removed.
+	* src/org/eclipse/linuxtools/changelog/parsers/java/JavaParser.java: New file.
+	* fragment.xml: Change extension to point to new location of JavaParser.java
+	which is in a path that matches the bundle name.
+
+2009-01-19  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* .settings/org.eclipse.jdt.core.prefs: Enable more warnings.	
+
+2009-01-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add .qualifier to version.
+
+2008-11-14  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* META-INF/MANIFEST.MF: Bump BREE to 1.5.
+
+2008-10-20  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Update version to 2.6.3.
+
+2008-03-25  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* src/org/eclipse/linuxtools/changelog/parsers/JavaParser.java (parseCurrentFunction): 
+	Cleaned up. Commented.
+
+2008-01-09 Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Removed.
+	* fragment.xml: New file.
+	* build.properties: Using fragment.xml instead of plugin.xml now.
+	* META-INF/MANIFEST.MF: Changed to fragment.  Reference host plugin
+	org.eclipse.linuxtools.changelog.core and bump up version to 2.6.1.
+
+2007-08-16  Andrew Overholt  <overholt@redhat.com>
+
+	Move to new location.
+
+2007-08-07  klee  <klee@redhat.com>
+
+	* feature.xml: Version bump to 2.0.0.
+
+2007-06-25  Kyu Lee  <klee@redhat.com>
+
+	* feature.xml : Includes new parser plugin instead of fragment.
+
+2007-05-15  Kyu Lee  <klee@redhat.com>
+
+	* : Initial import.
\ No newline at end of file
diff --git a/changelog/org.eclipse.linuxtools.changelog.javaparser/META-INF/MANIFEST.MF b/changelog/org.eclipse.linuxtools.changelog.javaparser/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..51dc1a9
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.javaparser/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ChangeLog Java parser (Incubation)
+Bundle-SymbolicName: org.eclipse.linuxtools.changelog.parsers.java;singleton:=true
+Bundle-Version: 2.6.3.qualifier
+Require-Bundle: org.eclipse.jdt.core;bundle-version="3.3.0";resolution:=optional,
+ org.eclipse.jdt.ui;bundle-version="3.3.0";resolution:=optional
+Bundle-Vendor: Eclipse
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Fragment-Host: org.eclipse.linuxtools.changelog.core;bundle-version="2.6.3"
diff --git a/changelog/org.eclipse.linuxtools.changelog.javaparser/build.properties b/changelog/org.eclipse.linuxtools.changelog.javaparser/build.properties
new file mode 100644
index 0000000..e3023e1
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.javaparser/build.properties
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               fragment.xml
diff --git a/changelog/org.eclipse.linuxtools.changelog.javaparser/fragment.xml b/changelog/org.eclipse.linuxtools.changelog.javaparser/fragment.xml
new file mode 100644
index 0000000..64f62b0
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.javaparser/fragment.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<fragment>
+   <extension
+         point="org.eclipse.linuxtools.changelog.core.parserContribution">
+      <parser
+            class="org.eclipse.linuxtools.changelog.parsers.java.JavaParser"
+            editor="CompilationUnitEditor"
+            name="Java Parser">
+      </parser>
+   </extension>
+
+</fragment>
diff --git a/changelog/org.eclipse.linuxtools.changelog.javaparser/src/org/eclipse/linuxtools/changelog/parsers/java/JavaParser.java b/changelog/org.eclipse.linuxtools.changelog.javaparser/src/org/eclipse/linuxtools/changelog/parsers/java/JavaParser.java
new file mode 100644
index 0000000..bb08b33
--- /dev/null
+++ b/changelog/org.eclipse.linuxtools.changelog.javaparser/src/org/eclipse/linuxtools/changelog/parsers/java/JavaParser.java
@@ -0,0 +1,145 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Phil Muldoon <pkmuldoon@picobot.org>.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Phil Muldoon <pmuldoon@redhat.com>       - initial API and implementation
+ *    Kyu Lee <klee@redhat.com>                - bug fixes and improvement 
+ *    Remy Chi Jian Suen <remy.suen@gmail.com> - support static blocks (#179549)
+ *******************************************************************************/
+package org.eclipse.linuxtools.changelog.parsers.java;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.ui.IWorkingCopyManager;
+import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jface.text.ITextSelection;
+import org.eclipse.linuxtools.changelog.core.IParserChangeLogContrib;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.texteditor.AbstractDecoratedTextEditor;
+
+
+
+
+/**
+ * @author pmuldoon (Phil Muldoon)
+ */
+public class JavaParser implements IParserChangeLogContrib {
+
+	/**
+	 * @see IParserChangeLogContrib#parseCurrentFunction(IEditorPart)
+	 */
+	public String parseCurrentFunction(IEditorInput input, int offset)
+			throws CoreException {
+	    
+		String currentElementName;
+		int elementType;
+		
+		// Get the working copy and connect to input.
+		IWorkingCopyManager manager = JavaUI.getWorkingCopyManager();
+		manager.connect(input);
+
+		// Retrieve the Java Element in question.
+		ICompilationUnit workingCopy = manager.getWorkingCopy(input);
+		
+		if (workingCopy == null)
+			return "";
+		
+		IJavaElement method = workingCopy.getElementAt(offset);
+		
+		manager.disconnect(input);
+
+		// no element selected
+		if (method == null)
+			return "";
+
+		// Get the current element name, to test it.
+		currentElementName = method.getElementName();
+
+		// Element doesn't have a name. Can go no further.
+		if (currentElementName == null)
+			return "";
+
+		// Get the Element Type to test.
+		elementType = method.getElementType();
+
+		switch (elementType) {
+		case IJavaElement.METHOD:
+		case IJavaElement.FIELD:
+		    break;
+		case IJavaElement.COMPILATION_UNIT:
+		    return "";
+		case IJavaElement.INITIALIZER:
+		    return "static initializer";
+
+		// So it's not a method, field, type, or static initializer. Where are we?
+		default:
+		    IJavaElement tmpMethodType;
+		    if (((tmpMethodType = method.getAncestor(IJavaElement.METHOD)) == null)
+			&& ((tmpMethodType = method.getAncestor(IJavaElement.TYPE)) == null)) {
+			return "";
+		    } else {
+			// In a class, but not in a method. Return class name instead.
+			method = tmpMethodType;
+			currentElementName = method.getElementName();
+		    }
+		}
+
+		// Build all ancestor classes.
+		// Append all ancestor class names to string
+
+		IJavaElement tmpParent = method.getParent();
+		boolean firstLoop = true;
+
+		while (tmpParent != null) {
+			IJavaElement tmpParentClass = tmpParent
+					.getAncestor(IJavaElement.TYPE);
+			if (tmpParentClass != null) {
+				String tmpParentClassName = tmpParentClass.getElementName();
+				if (tmpParentClassName == null)
+					return "";
+				currentElementName = tmpParentClassName + "."
+						+ currentElementName;
+			} else {
+				// cut root class name
+				int rootClassPos = currentElementName.indexOf(".");
+				if (rootClassPos >= 0)
+					currentElementName = currentElementName
+							.substring(rootClassPos + 1);
+				if (firstLoop)
+					return "";
+				else
+					return currentElementName;
+			}
+			tmpParent = tmpParentClass.getParent();
+			firstLoop = false;
+
+		}
+
+		return "";
+	}
+
+	/**
+	 * @see IParserChangeLogContrib#parseCurrentFunction(IEditorInput, int)
+	 */
+	public String parseCurrentFunction(IEditorPart editor) throws CoreException {
+
+		// Check for correct editor type
+		if (!(editor instanceof AbstractDecoratedTextEditor))
+		    return "";
+
+		// Get the editor, test selection and input.
+		AbstractDecoratedTextEditor java_editor = (AbstractDecoratedTextEditor) editor;		
+		ITextSelection selection = (ITextSelection)(java_editor.getSelectionProvider().getSelection());
+		IEditorInput input = java_editor.getEditorInput();
+
+		// Parse it and return the function.
+		return parseCurrentFunction(input, selection.getOffset());
+	}
+
+}
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/.classpath b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/.classpath
new file mode 100644
index 0000000..751c8f2
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/.project b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/.project
new file mode 100644
index 0000000..0e6347d
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.dataviewers.annotatedsourceeditor</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/.settings/org.eclipse.jdt.core.prefs b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..5466d96
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,3 @@
+#Tue Jun 03 09:41:19 CEST 2008
+eclipse.preferences.version=1
+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/.settings/org.eclipse.jdt.ui.prefs b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..fbc03a9
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,3 @@
+#Tue Jun 03 09:41:19 CEST 2008
+eclipse.preferences.version=1
+internal.default.compliance=default
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/META-INF/MANIFEST.MF b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..181a314
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/META-INF/MANIFEST.MF
@@ -0,0 +1,23 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.dataviewers.annotatedsourceeditor;singleton:=true
+Bundle-Version: 4.1.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.STAnnotatedSourceEditorActivator
+Bundle-Vendor: %bundleProvider
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.filesystem,
+ org.eclipse.ui.ide,
+ org.eclipse.jface.text,
+ org.eclipse.ui.editors,
+ org.eclipse.cdt.ui,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.core.resources
+Export-Package: org.eclipse.linuxtools.dataviewers.annotatedsourceeditor,
+ org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.actions,
+ org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.hyperlink,
+ org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.preferencespages
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/about.html b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/about.html
new file mode 100644
index 0000000..0c6525d
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>24th October, 2008</p>	
+<h3>License</h3>
+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<h3>Contributions</h3>
+
+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise
+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such
+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
+
+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or
+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the
+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/build.properties b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/build.properties
new file mode 100644
index 0000000..d9e2367
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/build.properties
@@ -0,0 +1,8 @@
+source.. = src/
+output.. = bin/
+bin.includes = .,\
+               META-INF/,\
+               icons/,\
+               plugin.xml,\
+               about.html,\
+               plugin.properties
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/icons/c_file_obj.gif b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/icons/c_file_obj.gif
new file mode 100644
index 0000000..8fd6adb
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/icons/c_file_obj.gif
Binary files differ
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/plugin.properties b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/plugin.properties
new file mode 100644
index 0000000..adda754
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/plugin.properties
@@ -0,0 +1,12 @@
+#******************************************************************************

+# Copyright (c) 2009 STMicroelectronics.

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v10.html

+#

+# Contributors:

+#   STMicroelectronics - initial API and implementation

+#*******************************************************************************

+bundleProvider = Eclipse

+bundleName = Annotated Source Editor Plug-in (Incubation)
\ No newline at end of file
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/plugin.xml b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/plugin.xml
new file mode 100644
index 0000000..9cf43ea
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/plugin.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+   <extension
+         point="org.eclipse.ui.workbench.texteditor.rulerColumns">
+      <column
+            class="org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.STContributedRulerColumn"
+            enabled="false"
+            global="false"
+            id="org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.column"
+            includeInMenu="false"
+            name="ST Column">
+         <placement
+               gravity="0.8"></placement>
+         <targetEditor
+               id="org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.editor">
+         </targetEditor>
+      </column>
+   </extension>
+   <extension
+         point="org.eclipse.ui.editors.markerAnnotationSpecification">
+      <specification
+            annotationType="org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.coloredLines"
+            colorPreferenceKey="coloredLinesResultIndicationColor"
+            colorPreferenceValue="250,0,0"
+            highlightPreferenceKey="coloredLinesHighlighting"
+            includeOnPreferencePage="false"
+            label="Colored Lines"
+            overviewRulerPreferenceKey="coloredLinesIndicationInOverviewRuler"
+            overviewRulerPreferenceValue="true"
+            presentationLayer="1"
+            textPreferenceKey="coloredLinedResultIndication"
+            verticalRulerPreferenceKey="coloredLinesIndicationInVerticalRuler">
+      </specification>
+   </extension>
+   <extension
+         point="org.eclipse.ui.editors">
+      <editor
+            class="org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.STAnnotatedCSourceEditor"
+            icon="icons/c_file_obj.gif"
+            id="org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.editor"
+            name="ST Annotated Source Editor">
+      </editor>
+      <editor
+            id="org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.editor2"
+            name="name">
+      </editor>
+   </extension>
+   <extension
+         point="org.eclipse.ui.commands">
+      <command
+            description="%ActionDefinition.STColumnToggle.description"
+            id=" org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.STColumnToggle"
+            name="Show Annotation Columns">
+      </command>
+   </extension>
+
+</plugin>
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/AbstractSTAnnotatedSourceEditorInput.java b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/AbstractSTAnnotatedSourceEditorInput.java
new file mode 100644
index 0000000..1a4a0f5
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/AbstractSTAnnotatedSourceEditorInput.java
@@ -0,0 +1,82 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.dataviewers.annotatedsourceeditor;

+

+import java.util.ArrayList;

+

+import org.eclipse.core.filesystem.IFileStore;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.ui.ide.FileStoreEditorInput;

+

+public abstract class AbstractSTAnnotatedSourceEditorInput extends FileStoreEditorInput{

+	private ArrayList<ISTAnnotationColumn> columns;

+	

+	public AbstractSTAnnotatedSourceEditorInput(IFileStore fileStore) {

+		super(fileStore);

+	}

+	

+	/** gets how many STColumn exist

+	 * 

+	 * @return

+	 */

+	public int getColumnCount(){

+		if (columns == null){

+			columns = getColumns();

+		}

+		return columns!=null ? columns.size() : 0;

+	}

+	

+	/** gets the title of a ST Column

+	 * 

+	 * @param column

+	 * @return

+	 */

+	public String getTitle(ISTAnnotationColumn column){

+		if (columns == null){

+			columns = getColumns();

+		}

+		return column!=null ? column.getTitle() : null;

+	}

+	

+	/** gets the background column of a editor line

+	 * 

+	 * @param line

+	 * @return

+	 */ 

+	public abstract Color  getColor(int line);

+	

+	public String getAnnotation(int line, ISTAnnotationColumn column){

+		if (columns == null){

+			columns = getColumns();

+		}

+		return column!=null ? column.getAnnotation(line) : null;

+	}

+	

+	public String getLongDescription(int line, ISTAnnotationColumn column){

+		if (columns == null){

+			columns = getColumns();

+		}

+		return column!=null ? column.getLongDescription(line) : null;

+	}

+	

+	public String getTooltip(int line, ISTAnnotationColumn column){

+		if (columns == null){

+			columns = getColumns();

+		}

+		return column!=null ? column.getTooltip(line) : null;

+	}

+	

+	/** gets the ISTAnnotationColumn objects list

+	 * 

+	 * @return

+	 */ 

+	public abstract ArrayList<ISTAnnotationColumn> getColumns();

+}

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/ISTAnnotationColumn.java b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/ISTAnnotationColumn.java
new file mode 100644
index 0000000..0d7291e
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/ISTAnnotationColumn.java
@@ -0,0 +1,19 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.dataviewers.annotatedsourceeditor;

+

+public interface ISTAnnotationColumn {

+	String getTitle();

+	String getAnnotation(int line);

+	String getTooltip(int line);

+	String getLongDescription(int line);

+	String getHeaderTooltip();

+}

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/ISTTextEditorActionConstants.java b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/ISTTextEditorActionConstants.java
new file mode 100644
index 0000000..9e24ca9
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/ISTTextEditorActionConstants.java
@@ -0,0 +1,19 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.dataviewers.annotatedsourceeditor;

+

+import org.eclipse.ui.texteditor.ITextEditorActionConstants;

+

+public interface ISTTextEditorActionConstants extends

+		ITextEditorActionConstants {

+

+	String ST_TOGGLE= "ST.Toggle"; //$NON-NLS-1$

+}

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/ISTTextEditorActionDefinitionIds.java b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/ISTTextEditorActionDefinitionIds.java
new file mode 100644
index 0000000..88915bb
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/ISTTextEditorActionDefinitionIds.java
@@ -0,0 +1,20 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.dataviewers.annotatedsourceeditor;

+

+import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;

+

+public interface ISTTextEditorActionDefinitionIds extends

+		ITextEditorActionDefinitionIds {

+	

+	String ST_TOGGLE= "org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.STColumnToggle"; //$NON-NLS-1$

+

+}

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STAnnotatedCSourceEditor.java b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STAnnotatedCSourceEditor.java
new file mode 100644
index 0000000..3b77d6c
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STAnnotatedCSourceEditor.java
@@ -0,0 +1,449 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.dataviewers.annotatedsourceeditor;

+

+import java.util.ArrayList;

+import java.util.Iterator;

+import java.util.List;

+

+import org.eclipse.cdt.internal.ui.editor.CEditor;

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.SafeRunner;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.jface.action.IAction;

+import org.eclipse.jface.action.IMenuManager;

+import org.eclipse.jface.preference.IPreferenceStore;

+import org.eclipse.jface.text.BadLocationException;

+import org.eclipse.jface.text.IDocument;

+import org.eclipse.jface.text.Position;

+import org.eclipse.jface.text.source.Annotation;

+import org.eclipse.jface.text.source.AnnotationModel;

+import org.eclipse.jface.text.source.CompositeRuler;

+import org.eclipse.jface.text.source.IChangeRulerColumn;

+import org.eclipse.jface.text.source.IOverviewRuler;

+import org.eclipse.jface.text.source.ISharedTextColors;

+import org.eclipse.jface.text.source.ISourceViewer;

+import org.eclipse.jface.text.source.IVerticalRuler;

+import org.eclipse.jface.text.source.IVerticalRulerColumn;

+import org.eclipse.jface.util.SafeRunnable;

+import org.eclipse.jface.window.DefaultToolTip;

+import org.eclipse.jface.window.ToolTip;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.custom.LineBackgroundEvent;

+import org.eclipse.swt.custom.LineBackgroundListener;

+import org.eclipse.swt.custom.StyledText;

+import org.eclipse.swt.custom.StyledTextContent;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.Font;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.layout.FillLayout;

+import org.eclipse.swt.layout.GridData;

+import org.eclipse.swt.layout.GridLayout;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Event;

+import org.eclipse.swt.widgets.Label;

+import org.eclipse.ui.IEditorInput;

+import org.eclipse.ui.editors.text.EditorsUI;

+import org.eclipse.ui.internal.editors.text.EditorsPlugin;

+import org.eclipse.ui.internal.texteditor.AnnotationColumn;

+import org.eclipse.ui.internal.texteditor.LineNumberColumn;

+import org.eclipse.ui.texteditor.AbstractDecoratedTextEditor;

+import org.eclipse.ui.texteditor.AnnotationPreference;

+import org.eclipse.ui.texteditor.ITextEditorActionConstants;

+import org.eclipse.ui.texteditor.MarkerAnnotationPreferences;

+import org.eclipse.ui.texteditor.ResourceAction;

+import org.eclipse.ui.texteditor.rulers.IColumnSupport;

+import org.eclipse.ui.texteditor.rulers.IContributedRulerColumn;

+import org.eclipse.ui.texteditor.rulers.RulerColumnDescriptor;

+import org.eclipse.ui.texteditor.rulers.RulerColumnRegistry;

+

+

+public class STAnnotatedCSourceEditor extends CEditor implements LineBackgroundListener {

+	private final static String ST_RULER= "STRuler";

+	

+	protected STContributedRulerColumn fAbstractSTRulerColumn;

+	

+	private IColumnSupport fColumnSupport;

+	

+	private LineNumberColumn fLineColumn;

+	

+	private STContributedRulerColumn fColumn;

+	

+	private StyledText fCachedTextWidget;

+	

+	private AbstractSTAnnotatedSourceEditorInput fInput;

+	

+	private ArrayList<ISTAnnotationColumn> fListColumns;

+	

+	private STChangeRulerColumn fSTChangeRulerColumn;

+	

+	@Override

+	public void createPartControl(Composite parent){

+		if (fInput == null){

+			super.createPartControl(parent);

+			return;

+		}

+

+		GridLayout layout= new GridLayout();

+		layout.numColumns=fInput.getColumnCount()+1;

+		layout.horizontalSpacing=0;

+		parent.setLayout(layout);

+		GridData  gd =new GridData();

+		gd.grabExcessHorizontalSpace =false;

+		gd.grabExcessVerticalSpace =true;

+

+		parent.setLayoutData(gd );

+            

+		Composite fParentSv= new Composite(parent, SWT.NONE);

+		gd = new GridData(GridData.FILL_BOTH);

+		gd.horizontalSpan =fInput.getColumnCount()+1;

+		gd.horizontalIndent=gd.verticalIndent=0;

+		fParentSv.setLayoutData(gd);

+		FillLayout fillLayout= new FillLayout(SWT.HORIZONTAL|SWT.VERTICAL);

+		fillLayout.marginWidth=fillLayout.marginHeight=0;

+		fParentSv.setLayout(fillLayout);

+			

+		super.createPartControl(fParentSv);

+

+		STColumnSupport columnSupport= (STColumnSupport)getAdapter(IColumnSupport.class);

+		RulerColumnRegistry registry = RulerColumnRegistry.getDefault();

+			

+		for(int i=1;i<=fInput.getColumnCount();i++){

+			RulerColumnDescriptor abstractSTColumnDescriptor= registry.getColumnDescriptor(STContributedRulerColumn.ID);

+			columnSupport.addSTColumn((CompositeRuler)getVerticalRuler(), abstractSTColumnDescriptor,fListColumns.get(i-1));

+				

+		}

+

+		CompositeRuler vr = (CompositeRuler)super.getVerticalRuler();

+		int count = 0;

+		Font font = parent.getFont();

+		FontData fd = font.getFontData()[0];

+		fd.setStyle(SWT.BOLD);

+		for(Iterator<?> iter = vr.getDecoratorIterator();iter.hasNext();){

+			IVerticalRulerColumn column = (IVerticalRulerColumn)iter.next();

+			if (column instanceof STContributedRulerColumn){

+				STContributedRulerColumn fSTColumn = (STContributedRulerColumn)column;

+				Label label = new Label(parent, SWT.BORDER);

+				gd = new GridData();

+				count++;

+				if (count==1) gd.horizontalIndent=VERTICAL_RULER_WIDTH+5;

+				else gd.horizontalIndent=0;

+				gd.widthHint = fSTColumn.getWidth();

+				label.setFont(new Font(label.getDisplay(), fd));

+				label.setLayoutData(gd);

+				label.moveAbove(fParentSv);

+				label.setText(fSTColumn.getAnnotationColumn(0).getTitle());

+				fSTColumn.setLabelColumn(label);

+

+				if (fSTColumn.isShowingSTRuler()){

+					ToolTipSupport.enableFor(fSTColumn);

+				}

+			}

+		}

+		

+		Label label = new Label(parent, SWT.BORDER);

+		gd = new GridData();

+		gd.horizontalAlignment = SWT.FILL;

+		gd.grabExcessHorizontalSpace = true;

+		label.setFont(new Font(label.getDisplay(), fd));

+		label.setLayoutData(gd);

+		label.moveAbove(fParentSv);

+		label.setText(getTitle());

+			

+		showLinesColored();

+		

+		if (getViewer() != null){

+			ISourceViewer sv = getViewer();

+

+			if (sv.getTextWidget() != null){

+					

+				fCachedTextWidget =  sv.getTextWidget();

+				fCachedTextWidget.addLineBackgroundListener(this);

+			}

+		}

+	}

+	

+	@Override

+	protected void rulerContextMenuAboutToShow(IMenuManager menu) {

+		super.rulerContextMenuAboutToShow(menu);

+		

+		CompositeRuler vr = (CompositeRuler)super.getVerticalRuler();

+		

+		for(Iterator<?> iter = vr.getDecoratorIterator();iter.hasNext();){

+			IVerticalRulerColumn column = (IVerticalRulerColumn)iter.next();

+			if (column instanceof STContributedRulerColumn){

+				STContributedRulerColumn fSTColumn = (STContributedRulerColumn)column;

+				IAction stprofcolAction = getAction(ISTTextEditorActionConstants.ST_TOGGLE);

+				stprofcolAction.setChecked(fSTColumn != null && fSTColumn.isShowingSTRuler());

+			}

+			else if (column instanceof LineNumberColumn){

+				LineNumberColumn fLineColumn = (LineNumberColumn)column;

+				IAction lineNumberAction= getAction(ITextEditorActionConstants.LINENUMBERS_TOGGLE);

+				lineNumberAction.setChecked(fLineColumn != null && fLineColumn.isShowingLineNumbers());

+			}

+		}

+		

+		if (fInput != null){

+			IAction stAction= getAction(ISTTextEditorActionConstants.ST_TOGGLE);

+			menu.appendToGroup(ITextEditorActionConstants.GROUP_RULERS, stAction);

+		}

+		

+		

+		

+	}

+	

+	@SuppressWarnings("unchecked")

+	@Override

+	public Object getAdapter(Class required) {

+		if (IColumnSupport.class.equals(required)) {

+			if (fColumnSupport == null)

+				fColumnSupport= createSTColumnSupport();

+			return fColumnSupport;

+		}

+

+		return super.getAdapter(required);

+	}

+	

+	protected IColumnSupport createSTColumnSupport() {

+		return new STColumnSupport(this,RulerColumnRegistry.getDefault());

+	}

+	

+	protected class STColumnSupport extends AbstractDecoratedTextEditor.ColumnSupport{

+		private final STAnnotatedCSourceEditor fEditor;

+		private final RulerColumnRegistry fRegistry;

+		private final ArrayList<ISTAnnotationColumn> fColumns;

+

+		public STColumnSupport(STAnnotatedCSourceEditor editor, RulerColumnRegistry registry) {

+			super(editor, registry);

+			fEditor = editor;

+			fRegistry = registry;

+			fColumns= new ArrayList<ISTAnnotationColumn>();

+		}

+		

+		private int computeIndex(CompositeRuler ruler, RulerColumnDescriptor descriptor) {

+			int index= 0;

+			List<?> all= fRegistry.getColumnDescriptors();

+			int newPos= all.indexOf(descriptor);

+			for (Iterator<?> it= ruler.getDecoratorIterator(); it.hasNext();) {

+				IVerticalRulerColumn column= (IVerticalRulerColumn) it.next();

+				if (column instanceof IContributedRulerColumn) {

+					RulerColumnDescriptor rcd= ((IContributedRulerColumn)column).getDescriptor();

+					if (rcd != null && all.indexOf(rcd) > newPos)

+						break;

+				} else if ("org.eclipse.jface.text.source.projection.ProjectionRulerColumn".equals(column.getClass().getName())) { //$NON-NLS-1$

+					// projection column is always the rightmost column

+					break;

+				}

+				index++;

+			}

+			return index;

+		}

+		

+		public void addSTColumn(final CompositeRuler ruler, final RulerColumnDescriptor descriptor,final ISTAnnotationColumn annotationColumn) {

+			

+			final int idx= computeIndex(ruler, descriptor);

+			

+			SafeRunnable runnable= new SafeRunnable() {

+				public void run() throws Exception {

+					IContributedRulerColumn column= descriptor.createColumn(fEditor);

+					fColumns.add(annotationColumn);

+					initializeColumn(column);

+					ruler.addDecorator(idx, column);

+				}

+			};

+			SafeRunner.run(runnable);

+		}

+		

+		protected void initializeColumn(IContributedRulerColumn column) {

+			super.initializeColumn(column);

+			RulerColumnDescriptor descriptor= column.getDescriptor();

+			IVerticalRuler ruler= getVerticalRuler();

+			if (ruler instanceof CompositeRuler) {

+				if (AnnotationColumn.ID.equals(descriptor.getId())) {

+					((AnnotationColumn)column).setDelegate(createAnnotationRulerColumn((CompositeRuler) ruler));

+				} else if (LineNumberColumn.ID.equals(descriptor.getId())) {

+					fLineColumn= ((LineNumberColumn) column);

+					fLineColumn.setForwarder(new LineNumberColumn.ICompatibilityForwarder() {

+						public IVerticalRulerColumn createLineNumberRulerColumn() {

+							return fEditor.createLineNumberRulerColumn();

+						}

+						public boolean isQuickDiffEnabled() {

+							return fEditor.isPrefQuickDiffAlwaysOn();

+						}

+						public boolean isLineNumberRulerVisible() {

+							return fEditor.isLineNumberRulerVisible();

+						}

+					});

+				}

+				if (STContributedRulerColumn.ID.equals(descriptor.getId())){

+					fColumn = ((STContributedRulerColumn) column);

+					//this is a workaround...

+					fColumn.setForwarder(new STContributedRulerColumn.ICompatibilityForwarder() {

+						public IVerticalRulerColumn createSTRulerColumn() {

+							if (fColumns != null && fColumns.size() > 0){

+								IVerticalRulerColumn fDelegate = fEditor.createSTRulerColumn(fColumns.get(fColumns.size()-1));

+								return fDelegate;

+							}

+							return null;

+						}

+						public boolean isQuickDiffEnabled() {

+							return fEditor.isPrefQuickDiffAlwaysOn();

+						}

+						public boolean isSTRulerVisible() {

+							return fEditor.isSTRulerVisible();

+						}

+					});

+				}

+			}

+		}

+	}

+	

+	protected IVerticalRulerColumn createSTRulerColumn(ISTAnnotationColumn annotationColumn) {

+		fSTChangeRulerColumn= new STChangeRulerColumn(getSharedColors(),annotationColumn);

+		((IChangeRulerColumn) fSTChangeRulerColumn).setHover(createChangeHover());

+		initializeLineNumberRulerColumn(fLineNumberRulerColumn);

+		

+		return fSTChangeRulerColumn;

+	}

+

+	public void lineGetBackground(LineBackgroundEvent event) {

+		if (fInput != null){

+			StyledTextContent c = (StyledTextContent)event.data;

+			int line = c.getLineAtOffset(event.lineOffset);

+			event.lineBackground = fInput.getColor(line);

+		}

+	}

+	

+	@Override

+	protected void doSetInput(IEditorInput input) throws CoreException {

+		super.doSetInput(input);

+		

+		if (input!=null && input instanceof AbstractSTAnnotatedSourceEditorInput){

+			fInput = (AbstractSTAnnotatedSourceEditorInput)input;

+			fListColumns = fInput.getColumns();

+		}

+	}

+	

+	@Override

+	protected void createActions() {

+		super.createActions();

+		

+		ResourceAction action;

+		

+		action= new ResourceAction(STTextEditorMessages.getBundleForConstructedKeys(), "Editor.ToggleSTColumnAction.", IAction.AS_CHECK_BOX) { //$NON-NLS-1$

+			@Override

+			public void run() {

+				toggleSTRuler();

+			}

+		};

+		

+		if (fInput != null){

+			action.setActionDefinitionId(ISTTextEditorActionDefinitionIds.ST_TOGGLE);

+			setAction(ISTTextEditorActionConstants.ST_TOGGLE, action);

+		}

+	}

+	

+	private void toggleSTRuler() {

+		// globally

+		IPreferenceStore store= EditorsUI.getPreferenceStore();

+		store.setValue(ST_RULER, !isSTRulerVisible());

+	}

+	

+	protected boolean isSTRulerVisible() {

+		IPreferenceStore store= getPreferenceStore();

+		return store != null ? store.getBoolean(ST_RULER) : true;

+	}

+	

+	private static class ToolTipSupport extends DefaultToolTip{

+		private STContributedRulerColumn control;

+		class ToolTipArea{

+			int line;

+			ISTAnnotationColumn ac;

+			

+			ToolTipArea(int line,ISTAnnotationColumn ac){

+				this.line = line;

+				this.ac = ac;

+			}

+			

+			public String getToolTip(){

+				return ac.getTooltip(line);

+			}

+		

+		}

+

+		protected ToolTipSupport(STContributedRulerColumn control, int style,boolean manualActivation) {

+			super(control.getControl(), style, manualActivation);

+			this.control = control;

+		}

+

+		protected Object getToolTipArea(Event event) {

+

+			int line = control.toDocumentLineNumber(event.y);

+			

+			return new ToolTipArea(line,control.getAnnotationColumn(line));

+		}

+

+		protected Composite createToolTipContentArea(Event event,

+				Composite parent) {

+			Composite comp = new Composite(parent, SWT.NONE);

+			comp.setLayout(new FillLayout());

+			Label b = new Label(comp,SWT.NONE);

+			ToolTipArea area  = (ToolTipArea)getToolTipArea(event);

+			if (area != null && area.getToolTip().trim().length()>0){

+				b.setText(area.getToolTip());

+			}

+			return comp;

+		}

+

+		public static void enableFor(STContributedRulerColumn control) {

+			new ToolTipSupport(control, ToolTip.NO_RECREATE, false);

+		}

+	}

+	

+	protected IOverviewRuler createOverviewRuler(ISharedTextColors sharedColors) {

+		IOverviewRuler ruler= new STOverviewRuler(getAnnotationAccess(), VERTICAL_RULER_WIDTH, sharedColors);

+		MarkerAnnotationPreferences fAnnotationPreferences = EditorsPlugin.getDefault().getMarkerAnnotationPreferences();

+		Iterator<?> e= fAnnotationPreferences.getAnnotationPreferences().iterator();

+		while (e.hasNext()) {

+			AnnotationPreference preference= (AnnotationPreference) e.next();

+			if (preference.contributesToHeader())

+				ruler.addHeaderAnnotationType(preference.getAnnotationType());

+		}

+		return ruler;

+		

+	}

+	

+	private void showLinesColored(){

+		STOverviewRuler or = (STOverviewRuler)getOverviewRuler();

+		AnnotationModel am = (AnnotationModel)or.getModel();

+		IDocument doc = getSourceViewer().getDocument();

+		int lines = doc.getNumberOfLines();

+

+		for(int i=0;i<lines;i++){

+			try {

+				Color color = fInput.getColor(i);

+				int r = color.getRed();

+				int g = color.getGreen();

+				int b = color.getBlue();

+				if (r !=255 || g != 255 || b!= 255){

+					int offset = doc.getLineOffset(i);

+					String type = STAnnotatedSourceEditorActivator.getUniqueIdentifier() + STAnnotatedSourceEditorActivator.getAnnotationType(); 

+					Annotation annotation = new Annotation(type,true,"");

+					or.setAnnotationColor(annotation, color);

+					am.addAnnotation(annotation,new Position(offset));

+			}

+			} catch (BadLocationException e) {

+				Status s =new Status(Status.ERROR,STAnnotatedSourceEditorActivator.PLUGIN_ID,Status.ERROR,e.getMessage(),e);

+				STAnnotatedSourceEditorActivator.getDefault().getLog().log(s);

+			}

+		}

+	}

+}

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STAnnotatedSourceEditorActivator.java b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STAnnotatedSourceEditorActivator.java
new file mode 100644
index 0000000..90cedbf
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STAnnotatedSourceEditorActivator.java
@@ -0,0 +1,76 @@
+/*******************************************************************************
+      * Copyright (c) 2009 STMicroelectronics.
+      * All rights reserved. This program and the accompanying materials
+      * are made available under the terms of the Eclipse Public License v1.0
+      * which accompanies this distribution, and is available at
+      * http://www.eclipse.org/legal/epl-v10.html
+      *
+      * Contributors:
+      *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation
+      
+**********************************************************************
+*********/
+package org.eclipse.linuxtools.dataviewers.annotatedsourceeditor;
+
+import org.eclipse.ui.editors.text.EditorsUI;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class STAnnotatedSourceEditorActivator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.dataviewers.annotatedsourceeditor";
+	
+	private static final String ANNOTATION_TYPE = ".coloredLines";
+
+	// The shared instance
+	private static STAnnotatedSourceEditorActivator plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public STAnnotatedSourceEditorActivator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		EditorsUI.getPreferenceStore().setValue("STRuler",true);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static STAnnotatedSourceEditorActivator getDefault() {
+		return plugin;
+	}
+	
+	public static String getAnnotationType()
+    {
+        return ANNOTATION_TYPE;
+    }
+	
+	public static String getUniqueIdentifier()
+    {
+        return PLUGIN_ID;
+    }
+
+}
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STChangeRulerColumn.java b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STChangeRulerColumn.java
new file mode 100644
index 0000000..fa2e057
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STChangeRulerColumn.java
@@ -0,0 +1,390 @@
+/*******************************************************************************
+ * Copyright (c) 2009 STMicroelectronics.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.dataviewers.annotatedsourceeditor;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.internal.text.revisions.RevisionPainter;
+import org.eclipse.jface.internal.text.source.DiffPainter;
+import org.eclipse.jface.text.revisions.IRevisionListener;
+import org.eclipse.jface.text.revisions.IRevisionRulerColumn;
+import org.eclipse.jface.text.revisions.IRevisionRulerColumnExtension;
+import org.eclipse.jface.text.revisions.RevisionInformation;
+import org.eclipse.jface.text.source.CompositeRuler;
+import org.eclipse.jface.text.source.IAnnotationHover;
+import org.eclipse.jface.text.source.IAnnotationModel;
+import org.eclipse.jface.text.source.IChangeRulerColumn;
+import org.eclipse.jface.text.source.ILineRange;
+import org.eclipse.jface.text.source.ISharedTextColors;
+import org.eclipse.jface.text.source.IVerticalRulerInfo;
+import org.eclipse.jface.text.source.IVerticalRulerInfoExtension;
+import org.eclipse.jface.text.source.IVerticalRulerListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * A vertical ruler column displaying line numbers and serving as a UI for quick diff.
+ * Clients usually instantiate and configure object of this class.
+ *
+ * @since 3.0
+ */
+public final class STChangeRulerColumn extends STRulerColumn implements IVerticalRulerInfo, IVerticalRulerInfoExtension, IChangeRulerColumn, IRevisionRulerColumn, IRevisionRulerColumnExtension {
+	/** The ruler's annotation model. */
+	private IAnnotationModel fAnnotationModel;
+	/** <code>true</code> if changes should be displayed using character indications instead of background colors. */
+	private boolean fCharacterDisplay;
+	/**
+	 * The revision painter strategy.
+	 * 
+	 * @since 3.2
+	 */
+	private final RevisionPainter fRevisionPainter;
+	/** 
+	 * The diff information painter strategy.
+	 * 
+	 * @since 3.2
+	 */
+	private final DiffPainter fDiffPainter;
+	/**
+	 * Whether to show number or to behave like a change ruler column.
+	 * @since 3.3
+	 */
+	private boolean fShowSTRuler= true;
+
+	/**
+	 * Creates a new instance.
+	 *
+	 * @param sharedColors the shared colors provider to use
+	 */
+	public STChangeRulerColumn(ISharedTextColors sharedColors,ISTAnnotationColumn ac) {
+		super(ac);
+		Assert.isNotNull(sharedColors);
+		fRevisionPainter= new RevisionPainter(this, sharedColors);
+		fDiffPainter= new DiffPainter(this, sharedColors);
+	}
+	
+	/*
+	 * @see org.eclipse.jface.text.source.LineNumberRulerColumn#createControl(org.eclipse.jface.text.source.CompositeRuler, org.eclipse.swt.widgets.Composite)
+	 */
+	public Control createControl(CompositeRuler parentRuler, Composite parentControl) {
+		Control control= super.createControl(parentRuler, parentControl);
+		fRevisionPainter.setParentRuler(parentRuler);
+		fDiffPainter.setParentRuler(parentRuler);
+		return control;
+	}
+	
+	/*
+	 * @see org.eclipse.jface.text.source.IVerticalRulerInfo#getLineOfLastMouseButtonActivity()
+	 */
+	public int getLineOfLastMouseButtonActivity() {
+		return getParentRuler().getLineOfLastMouseButtonActivity();
+	}
+
+	/*
+	 * @see org.eclipse.jface.text.source.IVerticalRulerInfo#toDocumentLineNumber(int)
+	 */
+	public int toDocumentLineNumber(int y_coordinate) {
+		return getParentRuler().toDocumentLineNumber(y_coordinate);
+	}
+
+	/*
+	 * @see IVerticalRulerColumn#setModel(IAnnotationModel)
+	 */
+	public void setModel(IAnnotationModel model) {
+		setAnnotationModel(model);
+		fRevisionPainter.setModel(model);
+		fDiffPainter.setModel(model);
+		updateNumberOfDigits();
+		computeIndentations();
+		layout(true);
+		postRedraw();
+	}
+	
+	private void setAnnotationModel(IAnnotationModel model) {
+		if (fAnnotationModel != model)
+			fAnnotationModel= model;
+	}
+
+
+	/**
+	 * Sets the display mode of the ruler. If character mode is set to <code>true</code>, diff
+	 * information will be displayed textually on the line number ruler.
+	 *
+	 * @param characterMode <code>true</code> if diff information is to be displayed textually.
+	 */
+	public void setDisplayMode(boolean characterMode) {
+		if (characterMode != fCharacterDisplay) {
+			fCharacterDisplay= characterMode;
+			updateNumberOfDigits();
+			computeIndentations();
+			layout(true);
+		}
+	}
+
+	/*
+	 * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#getModel()
+	 */
+	public IAnnotationModel getModel() {
+		return fAnnotationModel;
+	}
+
+	/*
+	 * @see org.eclipse.jface.text.source.LineNumberRulerColumn#createDisplayString(int)
+	 */
+	protected String createDisplayString(int line) {
+		StringBuffer buffer= new StringBuffer();
+		if (fShowSTRuler)
+			buffer.append(super.createDisplayString(line));
+		if (fCharacterDisplay && getModel() != null)
+			buffer.append(fDiffPainter.getDisplayCharacter(line));
+		return buffer.toString();
+	}
+
+	/*
+	 * @see org.eclipse.jface.text.source.LineNumberRulerColumn#computeNumberOfDigits()
+	 */
+	protected int computeNumberOfDigits() {
+		int digits;
+		if (fCharacterDisplay && getModel() != null) {
+			if (fShowSTRuler)
+				digits= super.computeNumberOfDigits() + 1;
+			else
+				digits= 1;
+		} else {
+			if (fShowSTRuler)
+				digits= super.computeNumberOfDigits();
+			else
+				digits= 0;
+		}
+		if (fRevisionPainter.hasInformation())
+			digits+= fRevisionPainter.getRequiredWidth();
+		return digits;
+	}
+
+	/*
+	 * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#addVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener)
+	 */
+	public void addVerticalRulerListener(IVerticalRulerListener listener) {
+		throw new UnsupportedOperationException();
+	}
+
+	/*
+	 * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#removeVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener)
+	 */
+	public void removeVerticalRulerListener(IVerticalRulerListener listener) {
+		throw new UnsupportedOperationException();
+	}
+	
+	/*
+	 * @see org.eclipse.jface.text.source.LineNumberRulerColumn#doPaint(org.eclipse.swt.graphics.GC)
+	 */
+	void doPaint(GC gc, ILineRange visibleLines) {
+		Color foreground= gc.getForeground();
+		if (visibleLines != null) {
+			if (fRevisionPainter.hasInformation())
+				fRevisionPainter.paint(gc, visibleLines);
+			else if (fDiffPainter.hasInformation()) // don't paint quick diff colors if revisions are painted
+				fDiffPainter.paint(gc, visibleLines);
+		}
+		gc.setForeground(foreground);
+		if (fShowSTRuler || fCharacterDisplay)
+			super.doPaint(gc, visibleLines);
+	}
+	
+	/*
+	 * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#getHover()
+	 */
+	public IAnnotationHover getHover() {
+		int activeLine= getParentRuler().getLineOfLastMouseButtonActivity();
+		if (fRevisionPainter.hasHover(activeLine))
+			return fRevisionPainter.getHover();
+		if (fDiffPainter.hasHover(activeLine))
+			return fDiffPainter.getHover();
+		return null;
+	}
+
+	/*
+	 * @see org.eclipse.jface.text.source.IChangeRulerColumn#setHover(org.eclipse.jface.text.source.IAnnotationHover)
+	 */
+	public void setHover(IAnnotationHover hover) {
+		fRevisionPainter.setHover(hover);
+		fDiffPainter.setHover(hover);
+	}
+
+	/*
+	 * @see org.eclipse.jface.text.source.IChangeRulerColumn#setBackground(org.eclipse.swt.graphics.Color)
+	 */
+	public void setBackground(Color background) {
+		super.setBackground(background);
+		fRevisionPainter.setBackground(background);
+		fDiffPainter.setBackground(background);
+	}
+
+	/*
+	 * @see org.eclipse.jface.text.source.IChangeRulerColumn#setAddedColor(org.eclipse.swt.graphics.Color)
+	 */
+	public void setAddedColor(Color addedColor) {
+		fDiffPainter.setAddedColor(addedColor);
+	}
+
+	/*
+	 * @see org.eclipse.jface.text.source.IChangeRulerColumn#setChangedColor(org.eclipse.swt.graphics.Color)
+	 */
+	public void setChangedColor(Color changedColor) {
+		fDiffPainter.setChangedColor(changedColor);
+	}
+
+	/*
+	 * @see org.eclipse.jface.text.source.IChangeRulerColumn#setDeletedColor(org.eclipse.swt.graphics.Color)
+	 */
+	public void setDeletedColor(Color deletedColor) {
+		fDiffPainter.setDeletedColor(deletedColor);
+	}
+	
+	/*
+	 * @see org.eclipse.jface.text.revisions.IRevisionRulerColumn#setRevisionInformation(org.eclipse.jface.text.revisions.RevisionInformation)
+	 */
+	public void setRevisionInformation(RevisionInformation info) {
+		fRevisionPainter.setRevisionInformation(info);
+		updateNumberOfDigits();
+		computeIndentations();
+		layout(true);
+		postRedraw();
+	}
+
+    /*
+     * @see org.eclipse.jface.text.revisions.IRevisionRulerColumnExtension#getRevisionSelectionProvider()
+     * @since 3.2
+     */
+    public ISelectionProvider getRevisionSelectionProvider() {
+	    return fRevisionPainter.getRevisionSelectionProvider();
+    }
+
+    /*
+     * @see org.eclipse.jface.text.revisions.IRevisionRulerColumnExtension#setRenderingMode(org.eclipse.jface.text.revisions.IRevisionRulerColumnExtension.RenderingMode)
+     * @since 3.3
+     */
+    public void setRevisionRenderingMode(RenderingMode renderingMode) {
+		fRevisionPainter.setRenderingMode(renderingMode);
+	}
+
+	/**
+	 * Sets the line number display mode.
+	 * 
+	 * @param showNumbers <code>true</code> to show numbers, <code>false</code> to only show
+	 *        diff / revision info.
+	 * @since 3.3
+	 */
+    public void showLineNumbers(boolean showNumbers) {
+    	if (fShowSTRuler != showNumbers) {
+    		fShowSTRuler= showNumbers;
+			updateNumberOfDigits();
+			computeIndentations();
+			layout(true);
+    	}
+    }
+
+    /*
+     * @see org.eclipse.jface.text.source.LineNumberRulerColumn#getWidth()
+     * @since 3.3
+     */
+    public int getWidth() {
+   		int width= super.getWidth();
+		return width > 0 ? width : 8; // minimal width to display quick diff / revisions if no textual info is shown
+    }
+
+    /**
+	 * Returns <code>true</code> if the ruler is showing line numbers, <code>false</code>
+	 * otherwise
+	 * 
+	 * @return <code>true</code> if line numbers are shown, <code>false</code> otherwise
+	 * @since 3.3
+	 */
+	public boolean isShowingSTRuler() {
+		return fShowSTRuler;
+	}
+
+	/**
+	 * Returns <code>true</code> if the ruler is showing revision information, <code>false</code>
+	 * otherwise
+	 * 
+	 * @return <code>true</code> if revision information is shown, <code>false</code> otherwise
+	 * @since 3.3
+	 */
+	public boolean isShowingRevisionInformation() {
+		return fRevisionPainter.hasInformation();
+	}
+
+	/**
+	 * Returns <code>true</code> if the ruler is showing change information, <code>false</code>
+	 * otherwise
+	 * 
+	 * @return <code>true</code> if change information is shown, <code>false</code> otherwise
+	 * @since 3.3
+	 */
+	public boolean isShowingChangeInformation() {
+		return fDiffPainter.hasInformation();
+	}
+
+	/*
+	 * @see org.eclipse.jface.text.revisions.IRevisionRulerColumnExtension#showRevisionAuthor(boolean)
+	 * @since 3.3
+	 */
+	public void showRevisionAuthor(boolean show) {
+		fRevisionPainter.showRevisionAuthor(show);
+		updateNumberOfDigits();
+		computeIndentations();
+		layout(true);
+		postRedraw();
+	}
+
+	/*
+	 * @see org.eclipse.jface.text.revisions.IRevisionRulerColumnExtension#showRevisionId(boolean)
+	 * @since 3.3
+	 */
+	public void showRevisionId(boolean show) {
+		fRevisionPainter.showRevisionId(show);
+		updateNumberOfDigits();
+		computeIndentations();
+		layout(true);
+		postRedraw();
+	}
+
+	/*
+	 * @see org.eclipse.jface.text.revisions.IRevisionRulerColumnExtension#addRevisionListener(org.eclipse.jface.text.revisions.IRevisionListener)
+	 * @since 3.3
+	 */
+	public void addRevisionListener(IRevisionListener listener) {
+		fRevisionPainter.addRevisionListener(listener);
+	}
+
+	/*
+	 * @see org.eclipse.jface.text.revisions.IRevisionRulerColumnExtension#removeRevisionListener(org.eclipse.jface.text.revisions.IRevisionListener)
+	 * @since 3.3
+	 */
+	public void removeRevisionListener(IRevisionListener listener) {
+		fRevisionPainter.removeRevisionListener(listener);
+	}
+	
+	/*
+	 * @see org.eclipse.jface.text.source.LineNumberRulerColumn#handleDispose()
+	 * @since 3.3
+	 */
+	protected void handleDispose() {
+		fRevisionPainter.setParentRuler(null);
+		fRevisionPainter.setModel(null);
+		fDiffPainter.setParentRuler(null);
+		fDiffPainter.setModel(null);
+		super.handleDispose();
+	}
+}
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STConstructedTextEditorMessages.properties b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STConstructedTextEditorMessages.properties
new file mode 100644
index 0000000..0c9d76c
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STConstructedTextEditorMessages.properties
@@ -0,0 +1,4 @@
+Editor.ToggleSTColumnAction.label=Show Annotation &Columns
+Editor.ToggleSTColumnAction.description=Show Annotation Columns
+Editor.STColumnAction.tooltip=Display the Annotation Column Ruler
+Editor.STColumnAction.image=
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STContributedRulerColumn.java b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STContributedRulerColumn.java
new file mode 100644
index 0000000..0836fd7
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STContributedRulerColumn.java
@@ -0,0 +1,798 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.dataviewers.annotatedsourceeditor;

+

+

+import java.util.HashMap;

+import java.util.Iterator;

+import java.util.Map;

+

+import org.eclipse.core.runtime.Assert;

+import org.eclipse.jface.dialogs.MessageDialogWithToggle;

+import org.eclipse.jface.preference.IPreferenceStore;

+import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.jface.text.ITextViewer;

+import org.eclipse.jface.text.revisions.IRevisionRulerColumn;

+import org.eclipse.jface.text.revisions.IRevisionRulerColumnExtension;

+import org.eclipse.jface.text.revisions.RevisionInformation;

+import org.eclipse.jface.text.revisions.IRevisionRulerColumnExtension.RenderingMode;

+import org.eclipse.jface.text.source.AnnotationModel;

+import org.eclipse.jface.text.source.CompositeRuler;

+import org.eclipse.jface.text.source.IAnnotationHover;

+import org.eclipse.jface.text.source.IAnnotationModel;

+import org.eclipse.jface.text.source.IAnnotationModelExtension;

+import org.eclipse.jface.text.source.IChangeRulerColumn;

+import org.eclipse.jface.text.source.ILineDifferExtension;

+import org.eclipse.jface.text.source.ILineDifferExtension2;

+import org.eclipse.jface.text.source.ISharedTextColors;

+import org.eclipse.jface.text.source.ISourceViewer;

+import org.eclipse.jface.text.source.IVerticalRulerColumn;

+import org.eclipse.jface.text.source.IVerticalRulerInfo;

+import org.eclipse.jface.text.source.IVerticalRulerInfoExtension;

+import org.eclipse.jface.text.source.IVerticalRulerListener;

+import org.eclipse.jface.util.IPropertyChangeListener;

+import org.eclipse.jface.util.PropertyChangeEvent;

+import org.eclipse.jface.viewers.ISelectionProvider;

+import org.eclipse.jface.window.Window;

+import org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.preferencespages.STAnnotatedSourceEditorPreferencePage;

+import org.eclipse.swt.graphics.Font;

+import org.eclipse.swt.graphics.RGB;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Control;

+import org.eclipse.swt.widgets.Label;

+import org.eclipse.ui.editors.text.EditorsUI;

+import org.eclipse.ui.internal.editors.text.EditorsPlugin;

+import org.eclipse.ui.internal.texteditor.PropertyEventDispatcher;

+import org.eclipse.ui.texteditor.AbstractDecoratedTextEditor;

+import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;

+import org.eclipse.ui.texteditor.AbstractTextEditor;

+import org.eclipse.ui.texteditor.AnnotationPreference;

+import org.eclipse.ui.texteditor.ITextEditor;

+import org.eclipse.ui.texteditor.ITextEditorExtension;

+import org.eclipse.ui.texteditor.ITextEditorExtension2;

+import org.eclipse.ui.texteditor.MarkerAnnotationPreferences;

+import org.eclipse.ui.texteditor.quickdiff.QuickDiff;

+import org.eclipse.ui.texteditor.rulers.AbstractContributedRulerColumn;

+

+

+public class STContributedRulerColumn extends AbstractContributedRulerColumn implements IVerticalRulerInfo, IVerticalRulerInfoExtension {

+	/**

+	 * Forwarder for preference checks and ruler creation. Needed to maintain the forwarded APIs in

+	 * {@link AbstractDecoratedTextEditor}.

+	 */

+	public static interface ICompatibilityForwarder {

+		IVerticalRulerColumn createSTRulerColumn();

+		boolean isQuickDiffEnabled();

+		boolean isSTRulerVisible();

+	}

+	

+	public static final String ID= "org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.column"; //$NON-NLS-1$

+	

+	private static final String FG_COLOR_KEY= AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR;

+	private static final String BG_COLOR_KEY= AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND;

+	private static final String USE_DEFAULT_BG_KEY= AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT;

+	private final static String ST_KEY= STAnnotatedSourceEditorPreferencePage.EDITOR_ST_RULER;

+	private final static String REVISION_ASK_BEFORE_QUICKDIFF_SWITCH_KEY= AbstractDecoratedTextEditorPreferenceConstants.REVISION_ASK_BEFORE_QUICKDIFF_SWITCH;

+		

+	private IVerticalRulerColumn fDelegate;

+	/**

+	 * The annotation preferences.

+	 */

+	private final MarkerAnnotationPreferences fAnnotationPreferences= EditorsPlugin.getDefault().getMarkerAnnotationPreferences();

+

+	/**

+	 * Preference dispatcher that registers a single listener so we don't have to manage every

+	 * single preference listener.

+	 */

+	private PropertyEventDispatcher fDispatcher;

+	private ISourceViewer fViewer;

+	private ICompatibilityForwarder fForwarder;

+	

+	

+	private Label labelColumn;

+

+	/*

+	 * @see org.eclipse.jface.text.source.IVerticalRulerColumn#createControl(org.eclipse.jface.text.source.CompositeRuler, org.eclipse.swt.widgets.Composite)

+	 */

+	public Control createControl(CompositeRuler parentRuler, Composite parentControl) {

+		Assert.isTrue(fDelegate != null);

+		ITextViewer viewer= parentRuler.getTextViewer();

+		Assert.isLegal(viewer instanceof ISourceViewer);

+		fViewer= (ISourceViewer) viewer;

+		initialize();

+		Control control= fDelegate.createControl(parentRuler, parentControl);

+		return control;

+	}

+	

+	public void setLabelColumn(Label label){

+		labelColumn = label;

+	}

+

+	/*

+	 * @see org.eclipse.jface.text.source.IVerticalRulerColumn#getControl()

+	 */

+	public Control getControl() {

+		return fDelegate.getControl();

+	}

+

+	public ISTAnnotationColumn getAnnotationColumn(int line){

+		if (fDelegate instanceof STChangeRulerColumn){

+			return ((STChangeRulerColumn)fDelegate).getSTAnnotationColumn();

+		}

+		return null;

+	}

+	

+	/*

+	 * @see org.eclipse.jface.text.source.IVerticalRulerColumn#getWidth()

+	 */

+	public int getWidth() {

+		return fDelegate.getWidth();

+	}

+

+	/*

+	 * @see org.eclipse.jface.text.source.IVerticalRulerColumn#redraw()

+	 */

+	public void redraw() {

+		fDelegate.redraw();

+	}

+

+	/*

+	 * @see org.eclipse.jface.text.source.IVerticalRulerColumn#setFont(org.eclipse.swt.graphics.Font)

+	 */

+	public void setFont(Font font) {

+		fDelegate.setFont(font);

+	}

+

+	/*

+	 * @see org.eclipse.jface.text.source.IVerticalRulerColumn#setModel(org.eclipse.jface.text.source.IAnnotationModel)

+	 */

+	public void setModel(IAnnotationModel model) {

+		if (getQuickDiffPreference())

+			fDelegate.setModel(model);

+	}

+	

+	/*

+	 * @see org.eclipse.jface.text.source.IVerticalRulerInfo#getLineOfLastMouseButtonActivity()

+	 */

+	public int getLineOfLastMouseButtonActivity() {

+		if (fDelegate instanceof IVerticalRulerInfo)

+			((IVerticalRulerInfo) fDelegate).getLineOfLastMouseButtonActivity();

+		return -1;

+	}

+

+	/*

+	 * @see org.eclipse.jface.text.source.IVerticalRulerInfo#toDocumentLineNumber(int)

+	 */

+	public int toDocumentLineNumber(int y_coordinate) {

+		if (fDelegate instanceof IVerticalRulerInfo)

+			return ((IVerticalRulerInfo) fDelegate).toDocumentLineNumber(y_coordinate);

+		return -1;

+	}

+

+	/*

+	 * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#addVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener)

+	 */

+	public void addVerticalRulerListener(IVerticalRulerListener listener) {

+		if (fDelegate instanceof IVerticalRulerInfoExtension)

+			((IVerticalRulerInfoExtension) fDelegate).addVerticalRulerListener(listener);

+	}

+

+	/*

+	 * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#getHover()

+	 */

+	public IAnnotationHover getHover() {

+		if (fDelegate instanceof IVerticalRulerInfoExtension)

+			return ((IVerticalRulerInfoExtension) fDelegate).getHover();

+		return null;

+	}

+

+	/*

+	 * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#getModel()

+	 */

+	public IAnnotationModel getModel() {

+		if (fDelegate instanceof IVerticalRulerInfoExtension)

+			return ((IVerticalRulerInfoExtension) fDelegate).getModel();

+		return null;

+	}

+

+	/*

+	 * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#removeVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener)

+	 */

+	public void removeVerticalRulerListener(IVerticalRulerListener listener) {

+		if (fDelegate instanceof IVerticalRulerInfoExtension)

+			((IVerticalRulerInfoExtension) fDelegate).removeVerticalRulerListener(listener);

+	}

+

+	/*

+	 * @see org.eclipse.ui.texteditor.rulers.AbstractContributedRulerColumn#columnRemoved()

+	 */

+	public void columnRemoved() {

+		if (fDispatcher != null) {

+			fDispatcher.dispose();

+			fDispatcher= null;

+		}

+	}

+

+	private IPreferenceStore getPreferenceStore() {

+		return EditorsUI.getPreferenceStore();

+	}

+

+	private ISharedTextColors getSharedColors() {

+		return EditorsUI.getSharedTextColors();

+	}

+

+	/**

+	 * Initializes the given line number ruler column from the preference store.

+	 */

+	private void initialize() {

+		final IPreferenceStore store= getPreferenceStore();

+		if (store == null)

+			return;

+

+		// initial set up

+		updateForegroundColor(store, fDelegate);

+		updateBackgroundColor(store, fDelegate);

+		

+		updateLineNumbersVisibility(fDelegate);

+		updateQuickDiffVisibility(fDelegate);

+		updateCharacterMode(store, fDelegate);

+		updateRevisionRenderingMode(store, fDelegate);

+		updateRevisionAuthorVisibility(store, fDelegate);

+		updateRevisionIdVisibility(store, fDelegate);

+

+		Map<Object, AnnotationPreference> annotationPrefs= getAnnotationPreferenceMap();

+		final AnnotationPreference changedPref= annotationPrefs.get("org.eclipse.ui.workbench.texteditor.quickdiffChange"); //$NON-NLS-1$

+		final AnnotationPreference addedPref= annotationPrefs.get("org.eclipse.ui.workbench.texteditor.quickdiffAddition"); //$NON-NLS-1$

+		final AnnotationPreference deletedPref= annotationPrefs.get("org.eclipse.ui.workbench.texteditor.quickdiffDeletion"); //$NON-NLS-1$

+		updateChangedColor(changedPref, store, fDelegate);

+		updateAddedColor(addedPref, store, fDelegate);

+		updateDeletedColor(deletedPref, store, fDelegate);

+

+		if (fDelegate != null)

+			fDelegate.redraw();

+

+		// listen to changes

+		fDispatcher= new PropertyEventDispatcher(store);

+

+		fDispatcher.addPropertyChangeListener(FG_COLOR_KEY, new IPropertyChangeListener() {

+			public void propertyChange(PropertyChangeEvent event) {

+				updateForegroundColor(store, fDelegate);

+				fDelegate.redraw();

+			}

+		});

+		IPropertyChangeListener backgroundHandler= new IPropertyChangeListener() {

+			public void propertyChange(PropertyChangeEvent event) {

+				updateBackgroundColor(store, fDelegate);

+				fDelegate.redraw();

+			}

+		};

+		fDispatcher.addPropertyChangeListener(BG_COLOR_KEY, backgroundHandler);

+		fDispatcher.addPropertyChangeListener(USE_DEFAULT_BG_KEY, backgroundHandler);

+

+		fDispatcher.addPropertyChangeListener(ST_KEY, new IPropertyChangeListener() {

+			public void propertyChange(PropertyChangeEvent event) {

+				// only handle quick diff on/off information, but not ruler visibility (handled by AbstractDecoratedTextEditor)

+				

+				updateLineNumbersVisibility(fDelegate);

+			}

+		});

+

+		fDispatcher.addPropertyChangeListener(AbstractDecoratedTextEditorPreferenceConstants.QUICK_DIFF_CHARACTER_MODE, new IPropertyChangeListener() {

+			public void propertyChange(PropertyChangeEvent event) {

+				updateCharacterMode(store, fDelegate);

+			}

+		});

+

+		fDispatcher.addPropertyChangeListener(AbstractDecoratedTextEditorPreferenceConstants.REVISION_RULER_RENDERING_MODE, new IPropertyChangeListener() {

+			public void propertyChange(PropertyChangeEvent event) {

+				updateRevisionRenderingMode(store, fDelegate);

+			}

+		});

+		

+		fDispatcher.addPropertyChangeListener(AbstractDecoratedTextEditorPreferenceConstants.REVISION_RULER_SHOW_AUTHOR, new IPropertyChangeListener() {

+			public void propertyChange(PropertyChangeEvent event) {

+				updateRevisionAuthorVisibility(store, fDelegate);

+			}

+		});

+		

+		fDispatcher.addPropertyChangeListener(AbstractDecoratedTextEditorPreferenceConstants.REVISION_RULER_SHOW_REVISION, new IPropertyChangeListener() {

+			public void propertyChange(PropertyChangeEvent event) {

+				updateRevisionIdVisibility(store, fDelegate);

+			}

+		});

+		

+		fDispatcher.addPropertyChangeListener(AbstractDecoratedTextEditorPreferenceConstants.QUICK_DIFF_ALWAYS_ON, new IPropertyChangeListener() {

+			public void propertyChange(PropertyChangeEvent event) {

+				updateQuickDiffVisibility(fDelegate);

+			}

+		});

+

+		if (changedPref != null) {

+			fDispatcher.addPropertyChangeListener(changedPref.getColorPreferenceKey(), new IPropertyChangeListener() {

+				public void propertyChange(PropertyChangeEvent event) {

+					updateChangedColor(changedPref, store, fDelegate);

+					fDelegate.redraw();

+				}

+			});

+		}

+		if (addedPref != null) {

+			fDispatcher.addPropertyChangeListener(addedPref.getColorPreferenceKey(), new IPropertyChangeListener() {

+				public void propertyChange(PropertyChangeEvent event) {

+					updateAddedColor(addedPref, store, fDelegate);

+					fDelegate.redraw();

+				}

+			});

+		}

+		if (deletedPref != null) {

+			fDispatcher.addPropertyChangeListener(deletedPref.getColorPreferenceKey(), new IPropertyChangeListener() {

+				public void propertyChange(PropertyChangeEvent event) {

+					updateDeletedColor(deletedPref, store, fDelegate);

+					fDelegate.redraw();

+				}

+			});

+		}

+	}

+

+	private Map<Object, AnnotationPreference> getAnnotationPreferenceMap() {

+		Map<Object, AnnotationPreference> annotationPrefs= new HashMap<Object, AnnotationPreference>();

+		Iterator<?> iter= fAnnotationPreferences.getAnnotationPreferences().iterator();

+		while (iter.hasNext()) {

+			AnnotationPreference pref= (AnnotationPreference) iter.next();

+			Object type= pref.getAnnotationType();

+			annotationPrefs.put(type, pref);

+		}

+		return annotationPrefs;

+	}

+	

+	private void updateForegroundColor(IPreferenceStore store, IVerticalRulerColumn column) {

+		RGB rgb=  getColorFromStore(store, FG_COLOR_KEY);

+		if (rgb == null)

+			rgb= new RGB(0, 0, 0);

+		ISharedTextColors sharedColors= getSharedColors();

+		if (column instanceof STRulerColumn)

+			((STRulerColumn) column).setForeground(sharedColors.getColor(rgb));

+	}

+	

+	private void updateBackgroundColor(IPreferenceStore store, IVerticalRulerColumn column) {

+		// background color: same as editor, or system default

+		RGB rgb;

+		if (store.getBoolean(USE_DEFAULT_BG_KEY))

+			rgb= null;

+		else

+			rgb= getColorFromStore(store, BG_COLOR_KEY);

+		ISharedTextColors sharedColors= getSharedColors();

+		if (column instanceof STRulerColumn)

+			((STRulerColumn) column).setBackground(sharedColors.getColor(rgb));

+	}

+

+	private void updateChangedColor(AnnotationPreference pref, IPreferenceStore store, IVerticalRulerColumn column) {

+		if (pref != null && column instanceof IChangeRulerColumn) {

+			RGB rgb= getColorFromAnnotationPreference(store, pref);

+			((IChangeRulerColumn) column).setChangedColor(getSharedColors().getColor(rgb));

+		}

+	}

+

+	private void updateAddedColor(AnnotationPreference pref, IPreferenceStore store, IVerticalRulerColumn column) {

+		if (pref != null && column instanceof IChangeRulerColumn) {

+			RGB rgb= getColorFromAnnotationPreference(store, pref);

+			((IChangeRulerColumn) column).setAddedColor(getSharedColors().getColor(rgb));

+		}

+	}

+	

+	private void updateDeletedColor(AnnotationPreference pref, IPreferenceStore store, IVerticalRulerColumn column) {

+		if (pref != null && column instanceof IChangeRulerColumn) {

+			RGB rgb= getColorFromAnnotationPreference(store, pref);

+			((IChangeRulerColumn) column).setDeletedColor(getSharedColors().getColor(rgb));

+		}

+	}

+	

+	private void updateCharacterMode(IPreferenceStore store, IVerticalRulerColumn column) {

+		if (column instanceof STChangeRulerColumn) {

+			STChangeRulerColumn lncrc= (STChangeRulerColumn) column;

+			lncrc.setDisplayMode(store.getBoolean(AbstractDecoratedTextEditorPreferenceConstants.QUICK_DIFF_CHARACTER_MODE));

+		}

+	}

+

+	private void updateLineNumbersVisibility(IVerticalRulerColumn column) {

+		if (column instanceof STChangeRulerColumn){

+			if (labelColumn != null){

+				labelColumn.setVisible(getLineNumberPreference());

+				Label labelName = (Label)labelColumn.getParent().getChildren()[labelColumn.getParent().getChildren().length-2];

+				labelName.setVisible(labelColumn.isVisible());

+				

+			}

+			((STChangeRulerColumn) column).showLineNumbers(getLineNumberPreference());

+		}	

+	}

+	

+	private void updateRevisionRenderingMode(IPreferenceStore store, IVerticalRulerColumn column) {

+		if (column instanceof IRevisionRulerColumnExtension) {

+			String option= store.getString(AbstractDecoratedTextEditorPreferenceConstants.REVISION_RULER_RENDERING_MODE);

+			RenderingMode[] modes= { IRevisionRulerColumnExtension.AUTHOR, IRevisionRulerColumnExtension.AGE, IRevisionRulerColumnExtension.AUTHOR_SHADED_BY_AGE };

+			for (int i= 0; i < modes.length; i++) {

+				if (modes[i].name().equals(option)) {

+					((IRevisionRulerColumnExtension) column).setRevisionRenderingMode(modes[i]);

+					return;

+				}

+			}

+		}

+	}

+	

+	private void updateRevisionAuthorVisibility(IPreferenceStore store, IVerticalRulerColumn column) {

+		if (column instanceof IRevisionRulerColumnExtension) {

+			boolean show= store.getBoolean(AbstractDecoratedTextEditorPreferenceConstants.REVISION_RULER_SHOW_AUTHOR);

+			((IRevisionRulerColumnExtension) column).showRevisionAuthor(show);

+		}

+	}

+	

+	private void updateRevisionIdVisibility(IPreferenceStore store, IVerticalRulerColumn column) {

+		if (column instanceof IRevisionRulerColumnExtension) {

+			boolean show= store.getBoolean(AbstractDecoratedTextEditorPreferenceConstants.REVISION_RULER_SHOW_REVISION);

+			((IRevisionRulerColumnExtension) column).showRevisionId(show);

+		}

+	}

+	

+	private void updateQuickDiffVisibility(IVerticalRulerColumn column) {

+		boolean show= getQuickDiffPreference();

+		if (show == isShowingChangeInformation())

+			return;

+		

+		if (show)

+			installChangeRulerModel(column);

+		else

+			uninstallChangeRulerModel(column);

+	}

+	

+	/**

+	 * Returns whether the line number ruler column should be

+	 * visible according to the preference store settings. Subclasses may override this

+	 * method to provide a custom preference setting.

+	 *

+	 * @return <code>true</code> if the line numbers should be visible

+	 */

+	private boolean getLineNumberPreference() {

+		if (fForwarder != null)

+			return fForwarder.isSTRulerVisible();

+		IPreferenceStore store= getPreferenceStore();

+		return store != null ? store.getBoolean(ST_KEY) : false;

+	}

+	

+	/**

+	 * Returns whether quick diff info should be visible upon opening an editor

+	 * according to the preference store settings.

+	 *

+	 * @return <code>true</code> if the line numbers should be visible

+	 */

+	private boolean getQuickDiffPreference() {

+		if (fForwarder != null)

+			return fForwarder.isQuickDiffEnabled();

+		IPreferenceStore store= getPreferenceStore();

+		boolean setting= store != null ? store.getBoolean(AbstractDecoratedTextEditorPreferenceConstants.QUICK_DIFF_ALWAYS_ON) : false;

+		if (!setting)

+			return false;

+		

+		boolean modifiable;

+		ITextEditor editor= getEditor();

+		if (editor instanceof ITextEditorExtension2) {

+			ITextEditorExtension2 ext= (ITextEditorExtension2) editor;

+			modifiable= ext.isEditorInputModifiable();

+		} else if (editor instanceof ITextEditorExtension) {

+			ITextEditorExtension ext= (ITextEditorExtension) editor;

+			modifiable= ext.isEditorInputReadOnly();

+		} else if (editor != null) {

+			modifiable= editor.isEditable();

+		} else {

+			modifiable= true;

+		}

+		return modifiable;

+	}

+

+	/**

+	 * Extracts the color preference for the given preference from the given store.

+	 * If the given store indicates that the default value is to be used, or

+	 * the value stored in the preferences store is <code>null</code>,

+	 * the value is taken from the <code>AnnotationPreference</code>'s default

+	 * color value.

+	 * <p>

+	 * The return value is

+	 * </p>

+	 *

+	 * @param store the preference store

+	 * @param pref the annotation preference

+	 * @return the RGB color preference, not <code>null</code>

+	 */

+	private static RGB getColorFromAnnotationPreference(IPreferenceStore store, AnnotationPreference pref) {

+		String key= pref.getColorPreferenceKey();

+		RGB rgb= null;

+		if (store.contains(key)) {

+			if (store.isDefault(key))

+				rgb= pref.getColorPreferenceValue();

+			else

+				rgb= PreferenceConverter.getColor(store, key);

+		}

+		if (rgb == null)

+			rgb= pref.getColorPreferenceValue();

+		return rgb;

+	}

+	

+	private static RGB getColorFromStore(IPreferenceStore store, String key) {

+		RGB rgb= null;

+		if (store.contains(key)) {

+			if (store.isDefault(key))

+				rgb= PreferenceConverter.getDefaultColor(store, key);

+			else

+				rgb= PreferenceConverter.getColor(store, key);

+		}

+		return rgb;

+	}

+	

+	/**

+	 * Ensures that quick diff information is displayed and the quick diff provider is the one with

+	 * the specified id. If a different quick diff provider is in use, the user may be asked whether

+	 * he wants to switch.

+	 * 

+	 * @param diffProviderId the quick diff provider id to use

+	 * @return <code>true</code> if quick diff could be enabled for the given id,

+	 *         <code>false</code> otherwise

+	 */

+	private boolean ensureQuickDiffProvider(String diffProviderId) {

+		if (!isShowingChangeInformation())

+			installChangeRulerModel(fDelegate); // FIXME pass provider id

+		

+		IAnnotationModel annotationModel= fViewer.getAnnotationModel();

+		IAnnotationModel oldDiffer= getDiffer();

+		if (oldDiffer == null && annotationModel != null)

+			return false; // quick diff is enabled, but no differ? not working for whatever reason

+

+		if (annotationModel == null)

+			annotationModel= new AnnotationModel();

+		if (!(annotationModel instanceof IAnnotationModelExtension))

+			return false;

+

+		QuickDiff util= new QuickDiff();

+		Object oldDifferId= util.getConfiguredQuickDiffProvider(oldDiffer);

+		if (oldDifferId.equals(diffProviderId)) {

+			if (oldDiffer instanceof ILineDifferExtension)

+				((ILineDifferExtension) oldDiffer).resume();

+			return true;

+		}

+

+		// Check whether the desired provider is available at all

+		IAnnotationModel newDiffer= util.createQuickDiffAnnotationModel(getEditor(), diffProviderId);

+		if (util.getConfiguredQuickDiffProvider(newDiffer).equals(oldDifferId)) {

+			if (oldDiffer instanceof ILineDifferExtension)

+				((ILineDifferExtension) oldDiffer).resume();

+				return true;

+		}

+		

+		// quick diff is showing with the wrong provider - ask the user whether he wants to switch

+		IPreferenceStore store= EditorsUI.getPreferenceStore();

+		if (oldDiffer != null && !store.getString(REVISION_ASK_BEFORE_QUICKDIFF_SWITCH_KEY).equals(MessageDialogWithToggle.ALWAYS)) {

+			MessageDialogWithToggle toggleDialog= MessageDialogWithToggle.openOkCancelConfirm(

+					fViewer.getTextWidget().getShell(),

+					STRulerMessages.AbstractDecoratedTextEditor_revision_quickdiff_switch_title,

+					STRulerMessages.AbstractDecoratedTextEditor_revision_quickdiff_switch_message, 

+					STRulerMessages.AbstractDecoratedTextEditor_revision_quickdiff_switch_rememberquestion,

+					true,

+					store,

+					REVISION_ASK_BEFORE_QUICKDIFF_SWITCH_KEY);

+			if (toggleDialog.getReturnCode() != Window.OK)

+				return false;

+		}

+		

+		IAnnotationModelExtension modelExtension=(IAnnotationModelExtension) annotationModel;

+		modelExtension.removeAnnotationModel(IChangeRulerColumn.QUICK_DIFF_MODEL_ID);

+		

+

+		modelExtension.addAnnotationModel(IChangeRulerColumn.QUICK_DIFF_MODEL_ID, newDiffer);

+		

+		if (fDelegate instanceof IChangeRulerColumn)

+			((IChangeRulerColumn) fDelegate).setModel(annotationModel); // picks up the new model attachment

+		

+		return true;

+	}

+

+	/**

+	 * Installs the differ annotation model with the current quick diff display.

+	 * 

+	 * @param column the column to install the model on

+	 */

+	private void installChangeRulerModel(IVerticalRulerColumn column) {

+		if (column instanceof IChangeRulerColumn) {

+			IAnnotationModel model= getAnnotationModelWithDiffer();

+			((IChangeRulerColumn) column).setModel(model);

+			if (model != null) {

+				ISourceViewer viewer= fViewer;

+				if (viewer != null && viewer.getAnnotationModel() == null)

+					viewer.showAnnotations(true);

+				}

+		}

+	}

+

+	/**

+	 * Uninstalls the differ annotation model from the current quick diff display.

+	 * 

+	 * @param column the column to remove the model from

+	 */

+	private void uninstallChangeRulerModel(IVerticalRulerColumn column) {

+		if (column instanceof IChangeRulerColumn)

+			((IChangeRulerColumn) column).setModel(null);

+		IAnnotationModel model= getDiffer();

+		if (model instanceof ILineDifferExtension)

+			((ILineDifferExtension) model).suspend();

+

+		ISourceViewer viewer= fViewer;

+		if (viewer != null && viewer.getAnnotationModel() == null)

+			viewer.showAnnotations(false);

+	}

+

+	/**

+	 * Returns the annotation model that contains the quick diff annotation model.

+	 * <p>

+	 * Extracts the line differ from the displayed document's annotation model. If none can be found,

+	 * a new differ is created and attached to the annotation model.</p>

+	 *

+	 * @return the annotation model that contains the line differ, or <code>null</code> if none could be found or created

+	 * @see IChangeRulerColumn#QUICK_DIFF_MODEL_ID

+	 */

+	private IAnnotationModel getAnnotationModelWithDiffer() {

+		ISourceViewer viewer= fViewer;

+		if (viewer == null)

+			return null;

+		

+		IAnnotationModel m= viewer.getAnnotationModel();

+		IAnnotationModelExtension model= null;

+		if (m instanceof IAnnotationModelExtension)

+			model= (IAnnotationModelExtension) m;

+		

+		IAnnotationModel differ= getDiffer();

+		// create diff model if it doesn't

+		if (differ == null) {

+			IPreferenceStore store= getPreferenceStore();

+			if (store != null) {

+				String defaultId= store.getString(AbstractDecoratedTextEditorPreferenceConstants.QUICK_DIFF_DEFAULT_PROVIDER);

+				differ= new QuickDiff().createQuickDiffAnnotationModel(getEditor(), defaultId);

+				if (differ != null) {

+					if (model == null)

+						model= new AnnotationModel();

+					model.addAnnotationModel(IChangeRulerColumn.QUICK_DIFF_MODEL_ID, differ);

+				}

+			}

+		} else if (differ instanceof ILineDifferExtension2) {

+			if (((ILineDifferExtension2) differ).isSuspended())

+				((ILineDifferExtension) differ).resume();

+		} else if (differ instanceof ILineDifferExtension) {

+			((ILineDifferExtension) differ).resume();

+		}

+		

+		return (IAnnotationModel)model;

+	}

+

+	/**

+	 * Extracts the line differ from the displayed document's annotation model. If none can be found,

+	 * <code>null</code> is returned.

+	 *

+	 * @return the line differ, or <code>null</code> if none could be found

+	 */

+	private IAnnotationModel getDiffer() {

+		// get annotation model extension

+		ISourceViewer viewer= fViewer;

+		if (viewer == null)

+			return null;

+

+		IAnnotationModel m= viewer.getAnnotationModel();

+		if (m == null && fDelegate instanceof IChangeRulerColumn)

+			m= ((IChangeRulerColumn)fDelegate).getModel();

+		

+		if (!(m instanceof IAnnotationModelExtension))

+			return null;

+		

+		IAnnotationModelExtension model= (IAnnotationModelExtension)m;

+

+		// get diff model if it exists already

+		return model.getAnnotationModel(IChangeRulerColumn.QUICK_DIFF_MODEL_ID);

+	}

+

+	/**

+	 * Sets the forwarder. Used by {@link AbstractDecoratedTextEditor} to maintain the contract of

+	 * its {@link AbstractDecoratedTextEditor#createLineNumberRulerColumn} method.

+	 * 

+	 * @param forwarder the forwarder

+	 */

+	public void setForwarder(ICompatibilityForwarder forwarder) {

+		fForwarder= forwarder;

+		fDelegate= forwarder.createSTRulerColumn();

+	}

+

+	/**

+	 * Initializes the given line number ruler column from the preference store.

+	 *

+	 * @param rulerColumn the ruler column to be initialized

+	 */

+	public void initializeSTRulerColumn(STRulerColumn rulerColumn) {

+		IPreferenceStore store= getPreferenceStore();

+		if (store != null) {

+			updateForegroundColor(store, rulerColumn);

+			updateBackgroundColor(store, rulerColumn);

+			updateLineNumbersVisibility(rulerColumn);

+			rulerColumn.redraw();

+		}

+	}

+

+	/**

+	 * Returns <code>true</code> if the ruler is showing line numbers, <code>false</code> if it

+	 * is only showing change information.

+	 * 

+	 * @return <code>true</code> if line numbers are shown, <code>false</code> otherwise

+	 */

+	public boolean isShowingSTRuler() {

+		boolean b = fDelegate instanceof STRulerColumn && ((STChangeRulerColumn) fDelegate).isShowingSTRuler();

+		return b;

+	}

+	

+	/**

+	 * Returns <code>true</code> if the ruler is showing change information, <code>false</code>

+	 * if it is only showing line numbers.

+	 * 

+	 * @return <code>true</code> if change information is shown, <code>false</code> otherwise

+	 */

+	public boolean isShowingChangeInformation() {

+		return fDelegate instanceof STChangeRulerColumn && ((STChangeRulerColumn) fDelegate).isShowingChangeInformation();

+	}

+

+	/**

+	 * Shows revision information on the receiver.

+	 * 

+	 * @param info the revision information to show

+	 * @param quickDiffProviderId the id of the corresponding quick diff provider

+	 */

+	public void showRevisionInformation(RevisionInformation info, String quickDiffProviderId) {

+		if (!ensureQuickDiffProvider(quickDiffProviderId))

+			return;

+

+		if (fDelegate instanceof IRevisionRulerColumn)

+			((IRevisionRulerColumn) fDelegate).setRevisionInformation(info);

+	}

+

+	/**

+	 * Hides revision information.

+	 */

+	public void hideRevisionInformation() {

+		if (fDelegate instanceof IRevisionRulerColumn)

+			((IRevisionRulerColumn) fDelegate).setRevisionInformation(null);

+	}

+	

+	/**

+	 * Returns <code>true</code> if the ruler is showing revision information, <code>false</code>

+	 * if it is only showing line numbers.

+	 * 

+	 * @return <code>true</code> if revision information is shown, <code>false</code> otherwise

+	 */

+	public boolean isShowingRevisionInformation() {

+		if (fDelegate instanceof STChangeRulerColumn)

+			return ((STChangeRulerColumn) fDelegate).isShowingRevisionInformation();

+		return false;

+	}

+

+	/**

+	 * Returns the selection provider of the revision column, <code>null</code> if none is

+	 * available.

+	 * 

+	 * @return the revision selection provider

+	 */

+	public ISelectionProvider getRevisionSelectionProvider() {

+		if (fDelegate instanceof IRevisionRulerColumnExtension)

+			return ((IRevisionRulerColumnExtension) fDelegate).getRevisionSelectionProvider();

+		return null;

+	}

+

+

+}

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STJFaceTextMessages.java b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STJFaceTextMessages.java
new file mode 100644
index 0000000..410b5cf
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STJFaceTextMessages.java
@@ -0,0 +1,67 @@
+/*******************************************************************************

+02:         * Copyright (c) 2000, 2005 IBM Corporation and others.

+03:         * All rights reserved. This program and the accompanying materials

+04:         * are made available under the terms of the Eclipse Public License v1.0

+05:         * which accompanies this distribution, and is available at

+06:         * http://www.eclipse.org/legal/epl-v10.html

+07:         *

+08:         * Contributors:

+09:         *     IBM Corporation - initial API and implementation

+10:         *******************************************************************************/

+package org.eclipse.linuxtools.dataviewers.annotatedsourceeditor;

+

+import java.text.MessageFormat;

+import java.util.MissingResourceException;

+import java.util.ResourceBundle;

+

+/**

+ * Accessor for the <code>JFaceTextMessages.properties</code> file in

+ * package <code>org.eclipse.jface.text</code>.

+ * @since 2.0

+ */

+class STJFaceTextMessages {

+

+	/** The resource bundle name. */

+	private static final String RESOURCE_BUNDLE= "org.eclipse.jface.text.JFaceTextMessages";//$NON-NLS-1$

+

+	/** The resource bundle. */

+	private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);

+

+	/**

+	 * Prohibits the creation of accessor objects.

+	 */

+	private STJFaceTextMessages() {

+	}

+

+	/**

+	 * Returns the string found in the resource bundle under the given key or a place holder string.

+	 *

+	 * @param key the look up key

+	 * @return the value found under the given key

+	 */

+	public static String getString(String key) {

+		try {

+			return fgResourceBundle.getString(key);

+		} catch (MissingResourceException e) {

+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * Gets a string from the resource bundle and formats it with the argument

+	 *

+	 * @param key	the string used to get the bundle value, must not be null

+	 * @param args arguments used when formatting the string

+	 * @return the formatted string

+	 * @since 3.0

+	 */

+	public static String getFormattedString(String key, Object[] args) {

+		String format= null;

+		try {

+			format= fgResourceBundle.getString(key);

+		} catch (MissingResourceException e) {

+			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$

+		}

+		return MessageFormat.format(format, args);

+	}

+}

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STOverviewRuler.java b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STOverviewRuler.java
new file mode 100644
index 0000000..cf7f084
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STOverviewRuler.java
@@ -0,0 +1,1309 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.dataviewers.annotatedsourceeditor;

+

+import java.util.ArrayList;

+import java.util.HashMap;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.List;

+import java.util.Map;

+import java.util.Set;

+

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.custom.StyledText;

+import org.eclipse.swt.custom.ViewForm;

+import org.eclipse.swt.events.DisposeEvent;

+import org.eclipse.swt.events.DisposeListener;

+import org.eclipse.swt.events.MouseAdapter;

+import org.eclipse.swt.events.MouseEvent;

+import org.eclipse.swt.events.MouseMoveListener;

+import org.eclipse.swt.events.PaintEvent;

+import org.eclipse.swt.events.PaintListener;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.Cursor;

+import org.eclipse.swt.graphics.GC;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.graphics.Point;

+import org.eclipse.swt.graphics.RGB;

+import org.eclipse.swt.graphics.Rectangle;

+import org.eclipse.swt.widgets.Canvas;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Control;

+import org.eclipse.swt.widgets.Display;

+

+import org.eclipse.jface.text.JFaceTextUtil;

+

+import org.eclipse.jface.text.BadLocationException;

+import org.eclipse.jface.text.IDocument;

+import org.eclipse.jface.text.IRegion;

+import org.eclipse.jface.text.ITextListener;

+import org.eclipse.jface.text.ITextViewer;

+import org.eclipse.jface.text.ITextViewerExtension5;

+import org.eclipse.jface.text.Position;

+import org.eclipse.jface.text.Region;

+import org.eclipse.jface.text.TextEvent;

+import org.eclipse.jface.text.source.Annotation;

+import org.eclipse.jface.text.source.IAnnotationAccess;

+import org.eclipse.jface.text.source.IAnnotationAccessExtension;

+import org.eclipse.jface.text.source.IAnnotationModel;

+import org.eclipse.jface.text.source.IAnnotationModelListener;

+import org.eclipse.jface.text.source.IOverviewRuler;

+import org.eclipse.jface.text.source.ISharedTextColors;

+import org.eclipse.jface.text.source.projection.AnnotationBag;

+

+public class STOverviewRuler implements IOverviewRuler {

+

+	/**

+	 * Internal listener class.

+	 */

+	class InternalListener implements ITextListener, IAnnotationModelListener {

+

+		/*

+		 * @see ITextListener#textChanged

+		 */

+		public void textChanged(TextEvent e) {

+			if (fTextViewer != null && e.getDocumentEvent() == null && e.getViewerRedrawState()) {

+				// handle only changes of visible document

+				redraw();

+			}

+		}

+

+		/*

+		 * @see IAnnotationModelListener#modelChanged(IAnnotationModel)

+		 */

+		public void modelChanged(IAnnotationModel model) {

+			update();

+		}

+	}

+

+	/**

+	 * Enumerates the annotations of a specified type and characteristics

+	 * of the associated annotation model.

+	 */

+	class FilterIterator implements Iterator<Annotation> {

+

+		final static int TEMPORARY= 1 << 1;

+		final static int PERSISTENT= 1 << 2;

+		final static int IGNORE_BAGS= 1 << 3;

+

+		private Iterator<?> fIterator;

+		private Object fType;

+		private Annotation fNext;

+		private int fStyle;

+

+		/**

+		 * Creates a new filter iterator with the given specification.

+		 *

+		 * @param annotationType the annotation type

+		 * @param style the style

+		 */

+		public FilterIterator(Object annotationType, int style) {

+			fType= annotationType;

+			fStyle= style;

+			if (fModel != null) {

+				fIterator= fModel.getAnnotationIterator();

+				skip();

+			}

+		}

+

+		/**

+		 * Creates a new filter iterator with the given specification.

+		 *

+		 * @param annotationType the annotation type

+		 * @param style the style

+		 * @param iterator the iterator

+		 */

+		public FilterIterator(Object annotationType, int style, Iterator<?> iterator) {

+			fType= annotationType;

+			fStyle= style;

+			fIterator= iterator;

+			skip();

+		}

+

+		private void skip() {

+

+			boolean temp= (fStyle & TEMPORARY) != 0;

+			boolean pers= (fStyle & PERSISTENT) != 0;

+			boolean ignr= (fStyle & IGNORE_BAGS) != 0;

+

+			while (fIterator.hasNext()) {

+				Annotation next= (Annotation) fIterator.next();

+

+				if (next.isMarkedDeleted())

+					continue;

+

+				if (ignr && (next instanceof AnnotationBag))

+					continue;

+

+				fNext= next;

+				Object annotationType= next.getType();

+				if (fType == null || isSubtype(annotationType)) {

+					if (temp && pers) return;

+					if (pers && next.isPersistent()) return;

+					if (temp && !next.isPersistent()) return;

+				}

+			}

+			fNext= null;

+		}

+

+		private boolean isSubtype(Object annotationType) {

+			if (fAnnotationAccess instanceof  IAnnotationAccessExtension) {

+				IAnnotationAccessExtension extension= (IAnnotationAccessExtension) fAnnotationAccess;

+				return extension.isSubtype(annotationType, fType);

+			}

+			return fType.equals(annotationType);

+		}

+

+		/*

+		 * @see Iterator#hasNext()

+		 */

+		public boolean hasNext() {

+			return fNext != null;

+		}

+		/*

+		 * @see Iterator#next()

+		 */

+		public Annotation next() {

+			try {

+				return fNext;

+			} finally {

+				if (fIterator != null)

+					skip();

+			}

+		}

+		/*

+		 * @see Iterator#remove()

+		 */

+		public void remove() {

+			throw new UnsupportedOperationException();

+		}

+	}

+

+	/**

+	 * The painter of the overview ruler's header.

+	 */

+	class HeaderPainter implements PaintListener {

+

+		private Color fIndicatorColor;

+		private Color fSeparatorColor;

+

+		/**

+		 * Creates a new header painter.

+		 */

+		public HeaderPainter() {

+			fSeparatorColor= fSharedTextColors.getColor(ViewForm.borderInsideRGB);

+		}

+

+		/**

+		 * Sets the header color.

+		 *

+		 * @param color the header color

+		 */

+		public void setColor(Color color) {

+			fIndicatorColor= color;

+		}

+

+		private void drawBevelRect(GC gc, int x, int y, int w, int h, Color topLeft, Color bottomRight) {

+			gc.setForeground(topLeft == null ? fSeparatorColor : topLeft);

+			gc.drawLine(x, y, x + w -1, y);

+			gc.drawLine(x, y, x, y + h -1);

+

+			gc.setForeground(bottomRight == null ? fSeparatorColor : bottomRight);

+			gc.drawLine(x + w, y, x + w, y + h);

+			gc.drawLine(x, y + h, x + w, y + h);

+		}

+

+		public void paintControl(PaintEvent e) {

+

+			Point s= fHeader.getSize();

+

+			if (fIndicatorColor != null) {

+				e.gc.setBackground(fIndicatorColor);

+				Rectangle r= new Rectangle(INSET, (s.y - (2*ANNOTATION_HEIGHT)) / 2, s.x - (2*INSET), 2*ANNOTATION_HEIGHT);

+				e.gc.fillRectangle(r);

+				Display d= fHeader.getDisplay();

+				if (d != null)

+//				drawBevelRect(e.gc, r.x, r.y, r.width -1, r.height -1, d.getSystemColor(SWT.COLOR_WIDGET_NORMAL_SHADOW), d.getSystemColor(SWT.COLOR_WIDGET_HIGHLIGHT_SHADOW));

+				drawBevelRect(e.gc, r.x, r.y, r.width -1, r.height -1, null, null);

+			}

+

+			e.gc.setForeground(fSeparatorColor);

+			e.gc.setLineWidth(1);

+			e.gc.drawLine(0, s.y -1, s.x -1, s.y -1);

+		}

+	}

+

+	private static final int INSET= 2;

+	private static final int ANNOTATION_HEIGHT= 1;

+	private static boolean ANNOTATION_HEIGHT_SCALABLE= true;

+

+

+	/** The model of the overview ruler */

+	private IAnnotationModel fModel;

+	/** The view to which this ruler is connected */

+	private ITextViewer fTextViewer;

+	/** The ruler's canvas */

+	private Canvas fCanvas;

+	/** The ruler's header */

+	private Canvas fHeader;

+	/** The buffer for double buffering */

+	private Image fBuffer;

+	/** The internal listener */

+	private InternalListener fInternalListener= new InternalListener();

+	/** The width of this vertical ruler */

+	private int fWidth;

+	/** The hit detection cursor */

+	private Cursor fHitDetectionCursor;

+	/** The last cursor */

+	private Cursor fLastCursor;

+	/** The line of the last mouse button activity */

+	private int fLastMouseButtonActivityLine= -1;

+	/** The actual annotation height */

+	private int fAnnotationHeight= -1;

+	/** The annotation access */

+	private IAnnotationAccess fAnnotationAccess;

+	/** The header painter */

+	private HeaderPainter fHeaderPainter;

+	/**

+	 * The list of annotation types to be shown in this ruler.

+	 * @since 3.0

+	 */

+	private Set<Object> fConfiguredAnnotationTypes= new HashSet<Object>();

+	/**

+	 * The list of annotation types to be shown in the header of this ruler.

+	 * @since 3.0

+	 */

+	private Set<Object> fConfiguredHeaderAnnotationTypes= new HashSet<Object>();

+	/** The mapping between annotation types and colors */

+	private Map<Object, Color> fAnnotationTypes2Colors= new HashMap<Object, Color>();

+

+	/** The mapping between annotation and colors */

+	private Map<Annotation, Color> fAnnotationColors = new HashMap<Annotation, Color>();

+	

+	/** The color manager */

+	private ISharedTextColors fSharedTextColors;

+	/**

+	 * All available annotation types sorted by layer.

+	 *

+	 * @since 3.0

+	 */

+	private List<Object> fAnnotationsSortedByLayer= new ArrayList<Object>();

+	/**

+	 * All available layers sorted by layer.

+	 * This list may contain duplicates.

+	 * @since 3.0

+	 */

+	private List<Integer> fLayersSortedByLayer= new ArrayList<Integer>();

+	/**

+	 * Map of allowed annotation types.

+	 * An allowed annotation type maps to <code>true</code>, a disallowed

+	 * to <code>false</code>.

+	 * @since 3.0

+	 */

+	private Map fAllowedAnnotationTypes= new HashMap();

+	/**

+	 * Map of allowed header annotation types.

+	 * An allowed annotation type maps to <code>true</code>, a disallowed

+	 * to <code>false</code>.

+	 * @since 3.0

+	 */

+	private Map fAllowedHeaderAnnotationTypes= new HashMap();

+	/**

+	 * The cached annotations.

+	 * @since 3.0

+	 */

+	private List<Annotation> fCachedAnnotations= new ArrayList<Annotation>();

+

+

+	/**

+	 * Constructs a overview ruler of the given width using the given annotation access and the given

+	 * color manager.

+	 *

+	 * @param annotationAccess the annotation access

+	 * @param width the width of the vertical ruler

+	 * @param sharedColors the color manager

+	 */

+	public STOverviewRuler(IAnnotationAccess annotationAccess, int width, ISharedTextColors sharedColors) {

+		fAnnotationAccess= annotationAccess;

+		fWidth= width;

+		fSharedTextColors= sharedColors;

+	}

+

+	/*

+	 * @see org.eclipse.jface.text.source.IVerticalRulerInfo#getControl()

+	 */

+	public Control getControl() {

+		return fCanvas;

+	}

+

+	/*

+	 * @see org.eclipse.jface.text.source.IVerticalRulerInfo#getWidth()

+	 */

+	public int getWidth() {

+		return fWidth;

+	}

+

+	/*

+	 * @see org.eclipse.jface.text.source.IVerticalRuler#setModel(org.eclipse.jface.text.source.IAnnotationModel)

+	 */

+	public void setModel(IAnnotationModel model) {

+		if (model != fModel || model != null) {

+

+			if (fModel != null)

+				fModel.removeAnnotationModelListener(fInternalListener);

+

+			fModel= model;

+

+			if (fModel != null)

+				fModel.addAnnotationModelListener(fInternalListener);

+

+			update();

+		}

+	}

+

+	/*

+	 * @see org.eclipse.jface.text.source.IVerticalRuler#createControl(org.eclipse.swt.widgets.Composite, org.eclipse.jface.text.ITextViewer)

+	 */

+	public Control createControl(Composite parent, ITextViewer textViewer) {

+

+		fTextViewer= textViewer;

+

+		fHitDetectionCursor= new Cursor(parent.getDisplay(), SWT.CURSOR_HAND);

+

+		fHeader= new Canvas(parent, SWT.NONE);

+

+		fCanvas= new Canvas(parent, SWT.NO_BACKGROUND);

+

+		fCanvas.addPaintListener(new PaintListener() {

+			public void paintControl(PaintEvent event) {

+				if (fTextViewer != null)

+					doubleBufferPaint(event.gc);

+			}

+		});

+

+		fCanvas.addDisposeListener(new DisposeListener() {

+			public void widgetDisposed(DisposeEvent event) {

+				handleDispose();

+				fTextViewer= null;

+			}

+		});

+

+		fCanvas.addMouseListener(new MouseAdapter() {

+			public void mouseDown(MouseEvent event) {

+				handleMouseDown(event);

+			}

+		});

+

+		fCanvas.addMouseMoveListener(new MouseMoveListener() {

+			public void mouseMove(MouseEvent event) {

+				handleMouseMove(event);

+			}

+		});

+

+		if (fTextViewer != null)

+			fTextViewer.addTextListener(fInternalListener);

+

+		return fCanvas;

+	}

+

+	/**

+	 * Disposes the ruler's resources.

+	 */

+	private void handleDispose() {

+

+		if (fTextViewer != null) {

+			fTextViewer.removeTextListener(fInternalListener);

+			fTextViewer= null;

+		}

+

+		if (fModel != null)

+			fModel.removeAnnotationModelListener(fInternalListener);

+

+		if (fBuffer != null) {

+			fBuffer.dispose();

+			fBuffer= null;

+		}

+

+		if (fHitDetectionCursor != null) {

+			fHitDetectionCursor.dispose();

+			fHitDetectionCursor= null;

+		}

+

+		fConfiguredAnnotationTypes.clear();

+		fAllowedAnnotationTypes.clear();

+		fConfiguredHeaderAnnotationTypes.clear();

+		fAllowedHeaderAnnotationTypes.clear();

+		fAnnotationTypes2Colors.clear();

+		fAnnotationsSortedByLayer.clear();

+		fLayersSortedByLayer.clear();

+	}

+

+	/**

+	 * Double buffer drawing.

+	 *

+	 * @param dest the GC to draw into

+	 */

+	private void doubleBufferPaint(GC dest) {

+

+		Point size= fCanvas.getSize();

+

+		if (size.x <= 0 || size.y <= 0)

+			return;

+

+		if (fBuffer != null) {

+			Rectangle r= fBuffer.getBounds();

+			if (r.width != size.x || r.height != size.y) {

+				fBuffer.dispose();

+				fBuffer= null;

+			}

+		}

+		if (fBuffer == null)

+			fBuffer= new Image(fCanvas.getDisplay(), size.x, size.y);

+

+		GC gc= new GC(fBuffer);

+		try {

+			gc.setBackground(fCanvas.getBackground());

+			gc.fillRectangle(0, 0, size.x, size.y);

+

+			if (fTextViewer instanceof ITextViewerExtension5)

+				doPaint1(gc);

+			else

+				doPaint(gc);

+

+		} finally {

+			gc.dispose();

+		}

+

+		dest.drawImage(fBuffer, 0, 0);

+	}

+

+	/**

+	 * Draws this overview ruler.

+	 *

+	 * @param gc the GC to draw into

+	 */

+	private void doPaint(GC gc) {

+		Rectangle r= new Rectangle(0, 0, 0, 0);

+		int yy, hh= ANNOTATION_HEIGHT;

+

+		IDocument document= fTextViewer.getDocument();

+		IRegion visible= fTextViewer.getVisibleRegion();

+

+		StyledText textWidget= fTextViewer.getTextWidget();

+		int maxLines= textWidget.getLineCount();

+

+		Point size= fCanvas.getSize();

+		int writable= JFaceTextUtil.computeLineHeight(textWidget, 0, maxLines, maxLines);

+		

+		if (size.y > writable)

+			size.y= Math.max(writable - fHeader.getSize().y, 0);

+

+		for (Iterator<Object> iterator= fAnnotationsSortedByLayer.iterator(); iterator.hasNext();) {

+			Object annotationType= iterator.next();

+

+			if (skip(annotationType))

+				continue;

+

+			int[] style= new int[] { FilterIterator.PERSISTENT, FilterIterator.TEMPORARY };

+			for (int t=0; t < style.length; t++) {

+				Color fill = null;

+				Color stroke = null;

+				FilterIterator e = new FilterIterator(annotationType, style[t]);

+				if (annotationType.toString().compareTo(getAnnotationTypeColoredLines()) != 0){

+					fill= getFillColor(annotationType, style[t] == FilterIterator.TEMPORARY);

+					stroke= getStrokeColor(annotationType, style[t] == FilterIterator.TEMPORARY);

+				}

+

+				for (int i= 0; e.hasNext(); i++) {

+

+					Annotation a=  e.next();

+					Position p= fModel.getPosition(a);

+

+					if (p == null || !p.overlapsWith(visible.getOffset(), visible.getLength()))

+						continue;

+

+					

+					if (a.getType().compareTo(getAnnotationTypeColoredLines()) == 0){

+						fill= getFPFillColor(a, true);

+						stroke= getFPStrokeColor(a, false);

+					}

+					

+					int annotationOffset= Math.max(p.getOffset(), visible.getOffset());

+					int annotationEnd= Math.min(p.getOffset() + p.getLength(), visible.getOffset() + visible.getLength());

+					int annotationLength= annotationEnd - annotationOffset;

+

+					try {

+						if (ANNOTATION_HEIGHT_SCALABLE) {

+							int numbersOfLines= document.getNumberOfLines(annotationOffset, annotationLength);

+							// don't count empty trailing lines

+							IRegion lastLine= document.getLineInformationOfOffset(annotationOffset + annotationLength);

+							if (lastLine.getOffset() == annotationOffset + annotationLength) {

+								numbersOfLines -= 2;

+								hh= (numbersOfLines * size.y) / maxLines + ANNOTATION_HEIGHT;

+								if (hh < ANNOTATION_HEIGHT)

+									hh= ANNOTATION_HEIGHT;

+							} else

+								hh= ANNOTATION_HEIGHT;

+						}

+						fAnnotationHeight= hh;

+

+						int startLine= textWidget.getLineAtOffset(annotationOffset - visible.getOffset());

+						yy= Math.min((startLine * size.y) / maxLines, size.y - hh);

+

+						if (fill != null) {

+							gc.setBackground(fill);

+							gc.fillRectangle(INSET, yy, size.x-(2*INSET), hh);

+						}

+

+						if (stroke != null) {

+							gc.setForeground(stroke);

+							r.x= INSET;

+							r.y= yy;

+							r.width= size.x - (2 * INSET);

+							r.height= hh;

+							gc.setLineWidth(1);

+							gc.drawRectangle(r);

+						}

+					} catch (BadLocationException x) {

+					}

+				}

+			}

+		}

+	}

+

+	/**

+	 * Draws this overview ruler. Uses <code>ITextViewerExtension5</code> for

+	 * its implementation. Will replace <code>doPaint(GC)</code>.

+	 *

+	 * @param gc the GC to draw into

+	 */

+	private void doPaint1(GC gc) {

+		Rectangle r= new Rectangle(0, 0, 0, 0);

+		int yy, hh= ANNOTATION_HEIGHT;

+

+		ITextViewerExtension5 extension= (ITextViewerExtension5) fTextViewer;

+		IDocument document= fTextViewer.getDocument();

+		StyledText textWidget= fTextViewer.getTextWidget();

+

+		int maxLines= textWidget.getLineCount();

+		Point size= fCanvas.getSize();

+		int writable= JFaceTextUtil.computeLineHeight(textWidget, 0, maxLines, maxLines);

+		if (size.y > writable)

+			size.y= Math.max(writable - fHeader.getSize().y, 0);

+

+		fCachedAnnotations.clear();

+		if (fModel != null) {

+			Iterator<?> iter= fModel.getAnnotationIterator();

+			while (iter.hasNext()) {

+				Annotation annotation= (Annotation) iter.next();

+

+				if (annotation.isMarkedDeleted())

+					continue;

+

+				if (skip(annotation.getType()))

+					continue;

+

+				fCachedAnnotations.add(annotation);

+			}

+		}

+

+		for (Iterator<Object> iterator= fAnnotationsSortedByLayer.iterator(); iterator.hasNext();) {

+			Object annotationType= iterator.next();

+

+			if (skip(annotationType))

+				continue;

+

+			int[] style= new int[] { FilterIterator.PERSISTENT, FilterIterator.TEMPORARY };

+			for (int t=0; t < style.length; t++) {

+

+				FilterIterator e= new FilterIterator(annotationType, style[t], fCachedAnnotations.iterator());

+				Color fill = null;

+				Color stroke = null;

+				if (annotationType.toString().compareTo(getAnnotationTypeColoredLines()) != 0){

+					fill= getFillColor(annotationType, style[t] == FilterIterator.TEMPORARY);

+					stroke= getStrokeColor(annotationType, style[t] == FilterIterator.TEMPORARY);

+				}

+

+				for (int i= 0; e.hasNext(); i++) {

+

+					Annotation a= e.next();

+					

+					

+					Position p= fModel.getPosition(a);

+

+					if (p == null)

+						continue;

+					

+					IRegion widgetRegion= extension.modelRange2WidgetRange(new Region(p.getOffset(), p.getLength()));

+					if (widgetRegion == null)

+						continue;

+					

+					if (a.getType().compareTo(getAnnotationTypeColoredLines()) == 0){

+						fill= getFPFillColor(a, true);

+						stroke= getFPStrokeColor(a, false);

+					}

+

+					try {

+						if (ANNOTATION_HEIGHT_SCALABLE) {

+							int numbersOfLines= document.getNumberOfLines(p.getOffset(), p.getLength());

+							// don't count empty trailing lines

+							IRegion lastLine= document.getLineInformationOfOffset(p.getOffset() + p.getLength());

+							if (lastLine.getOffset() == p.getOffset() + p.getLength()) {

+								numbersOfLines -= 2;

+								hh= (numbersOfLines * size.y) / maxLines + ANNOTATION_HEIGHT;

+								if (hh < ANNOTATION_HEIGHT)

+									hh= ANNOTATION_HEIGHT;

+							} else

+								hh= ANNOTATION_HEIGHT;

+						}

+						fAnnotationHeight= hh;

+

+						int startLine= textWidget.getLineAtOffset(widgetRegion.getOffset());

+						yy= Math.min((startLine * size.y) / maxLines, size.y - hh);

+

+						if (fill != null) {

+							gc.setBackground(fill);

+							gc.fillRectangle(INSET, yy, size.x-(2*INSET), hh);

+						}

+

+						if (stroke != null) {

+							gc.setForeground(stroke);

+							r.x= INSET;

+							r.y= yy;

+							r.width= size.x - (2 * INSET);

+							r.height= hh;

+							gc.setLineWidth(1);

+							gc.drawRectangle(r);

+						}

+					} catch (BadLocationException x) {

+					}

+				}

+			}

+		}

+		fCachedAnnotations.clear();

+	}

+

+	/*

+	 * @see org.eclipse.jface.text.source.IVerticalRuler#update()

+	 */

+	 public void update() {

+		if (fCanvas != null && !fCanvas.isDisposed()) {

+			Display d= fCanvas.getDisplay();

+			if (d != null) {

+				d.asyncExec(new Runnable() {

+					public void run() {

+						redraw();

+						updateHeader();

+					}

+				});

+			}

+		}

+	}

+

+	/**

+	 * Redraws the overview ruler.

+	 */

+	private void redraw() {

+

+		if (fTextViewer == null || fModel == null)

+			return;

+

+		if (fCanvas != null && !fCanvas.isDisposed()) {

+			GC gc= new GC(fCanvas);

+			doubleBufferPaint(gc);

+			gc.dispose();

+		}

+	}

+

+	/**

+	 * Translates a given y-coordinate of this ruler into the corresponding

+	 * document lines. The number of lines depends on the concrete scaling

+	 * given as the ration between the height of this ruler and the length

+	 * of the document.

+	 *

+	 * @param y_coordinate the y-coordinate

+	 * @return the corresponding document lines

+	 */

+	private int[] toLineNumbers(int y_coordinate) {

+

+		StyledText textWidget=  fTextViewer.getTextWidget();

+		int maxLines= textWidget.getContent().getLineCount();

+

+		int rulerLength= fCanvas.getSize().y;

+		int writable= JFaceTextUtil.computeLineHeight(textWidget, 0, maxLines, maxLines);

+

+		if (rulerLength > writable)

+			rulerLength= Math.max(writable - fHeader.getSize().y, 0);

+

+		if (y_coordinate >= writable || y_coordinate >= rulerLength)

+			return new int[] {-1, -1};

+

+		int[] lines= new int[2];

+

+		int pixel0= Math.max(y_coordinate - 1, 0);

+		int pixel1= Math.min(rulerLength, y_coordinate + 1);

+		rulerLength= Math.max(rulerLength, 1);

+

+		lines[0]= (pixel0 * maxLines) / rulerLength;

+		lines[1]= (pixel1 * maxLines) / rulerLength;

+

+		if (fTextViewer instanceof ITextViewerExtension5) {

+			ITextViewerExtension5 extension= (ITextViewerExtension5) fTextViewer;

+			lines[0]= extension.widgetLine2ModelLine(lines[0]);

+			lines[1]= extension.widgetLine2ModelLine(lines[1]);

+		} else {

+			try {

+				IRegion visible= fTextViewer.getVisibleRegion();

+				int lineNumber= fTextViewer.getDocument().getLineOfOffset(visible.getOffset());

+				lines[0] += lineNumber;

+				lines[1] += lineNumber;

+			} catch (BadLocationException x) {

+			}

+		}

+

+		return lines;

+	}

+

+	/**

+	 * Returns the position of the first annotation found in the given line range.

+	 *

+	 * @param lineNumbers the line range

+	 * @param ignoreSelectedAnnotation whether to ignore the current selection

+	 * @return the position of the first found annotation

+	 */

+	private Position getAnnotationPosition(int[] lineNumbers, boolean ignoreSelectedAnnotation) {

+		if (lineNumbers[0] == -1)

+			return null;

+

+		Position found= null;

+

+		try {

+			IDocument d= fTextViewer.getDocument();

+			IRegion line= d.getLineInformation(lineNumbers[0]);

+

+			Point currentSelection= fTextViewer.getSelectedRange();

+

+			int start= line.getOffset();

+

+			line= d.getLineInformation(lineNumbers[lineNumbers.length - 1]);

+			int end= line.getOffset() + line.getLength();

+

+			for (int i= fAnnotationsSortedByLayer.size() -1; i >= 0; i--) {

+

+				Object annotationType= fAnnotationsSortedByLayer.get(i);

+

+				FilterIterator e= new FilterIterator(annotationType, FilterIterator.PERSISTENT | FilterIterator.TEMPORARY);

+				while (e.hasNext() && found == null) {

+					Annotation a= e.next();

+					if (a.isMarkedDeleted())

+						continue;

+

+					if (skip(a.getType()))

+						continue;

+

+					Position p= fModel.getPosition(a);

+					if (p == null)

+						continue;

+

+					int posOffset= p.getOffset();

+					int posEnd= posOffset + p.getLength();

+					IRegion region= d.getLineInformationOfOffset(posEnd);

+					// trailing empty lines don't count

+					if (posEnd > posOffset && region.getOffset() == posEnd) {

+						posEnd--;

+						region= d.getLineInformationOfOffset(posEnd);

+					}

+

+					if (posOffset <= end && posEnd >= start) {

+						if (ignoreSelectedAnnotation || currentSelection.x != posOffset || currentSelection.y != p.getLength())

+							found= p;

+					}

+				}

+			}

+		} catch (BadLocationException x) {

+		}

+

+		return found;

+	}

+

+	/**

+	 * Returns the line which  corresponds best to one of

+	 * the underlying annotations at the given y-coordinate.

+	 *

+	 * @param lineNumbers the line numbers

+	 * @return the best matching line or <code>-1</code> if no such line can be found

+	 */

+	private int findBestMatchingLineNumber(int[] lineNumbers) {

+		if (lineNumbers == null || lineNumbers.length < 1)

+			return -1;

+

+		try {

+			Position pos= getAnnotationPosition(lineNumbers, true);

+			if (pos == null)

+				return -1;

+			return fTextViewer.getDocument().getLineOfOffset(pos.getOffset());

+		} catch (BadLocationException ex) {

+			return -1;

+		}

+	}

+

+	/**

+	 * Handles mouse clicks.

+	 *

+	 * @param event the mouse button down event

+	 */

+	private void handleMouseDown(MouseEvent event) {

+		if (fTextViewer != null) {

+			int[] lines= toLineNumbers(event.y);

+			Position p= getAnnotationPosition(lines, false);

+			if (p != null) {

+				fTextViewer.revealRange(p.getOffset(), p.getLength());

+				fTextViewer.setSelectedRange(p.getOffset(), p.getLength());

+			}

+			fTextViewer.getTextWidget().setFocus();

+		}

+		fLastMouseButtonActivityLine= toDocumentLineNumber(event.y);

+	}

+

+	/**

+	 * Handles mouse moves.

+	 *

+	 * @param event the mouse move event

+	 */

+	private void handleMouseMove(MouseEvent event) {

+		if (fTextViewer != null) {

+			int[] lines= toLineNumbers(event.y);

+			Position p= getAnnotationPosition(lines, true);

+			Cursor cursor= (p != null ? fHitDetectionCursor : null);

+			if (cursor != fLastCursor) {

+				fCanvas.setCursor(cursor);

+				fLastCursor= cursor;

+			}

+		}

+	}

+

+	/*

+	 * @see org.eclipse.jface.text.source.IOverviewRuler#addAnnotationType(java.lang.Object)

+	 */

+	public void addAnnotationType(Object annotationType) {

+		fConfiguredAnnotationTypes.add(annotationType);

+		fAllowedAnnotationTypes.clear();

+	}

+

+	/*

+	 * @see org.eclipse.jface.text.source.IOverviewRuler#removeAnnotationType(java.lang.Object)

+	 */

+	public void removeAnnotationType(Object annotationType) {

+		fConfiguredAnnotationTypes.remove(annotationType);

+		fAllowedAnnotationTypes.clear();

+	}

+

+	/*

+	 * @see org.eclipse.jface.text.source.IOverviewRuler#setAnnotationTypeLayer(java.lang.Object, int)

+	 */

+	public void setAnnotationTypeLayer(Object annotationType, int layer) {

+		int j= fAnnotationsSortedByLayer.indexOf(annotationType);

+		if (j != -1) {

+			fAnnotationsSortedByLayer.remove(j);

+			fLayersSortedByLayer.remove(j);

+		}

+

+		if (layer >= 0) {

+			int i= 0;

+			int size= fLayersSortedByLayer.size();

+			while (i < size && layer >= fLayersSortedByLayer.get(i))

+				i++;

+			fLayersSortedByLayer.add(i, layer);

+			fAnnotationsSortedByLayer.add(i, annotationType);

+		}

+	}

+

+	/*

+	 * @see org.eclipse.jface.text.source.IOverviewRuler#setAnnotationTypeColor(java.lang.Object, org.eclipse.swt.graphics.Color)

+	 */

+	

+	public void setAnnotationColor(Annotation annotation,Color color){

+		if (color != null)

+			fAnnotationColors.put(annotation, color);

+		else

+			fAnnotationColors.remove(annotation);

+	}

+	

+	

+	public void setAnnotationTypeColor(Object annotationType, Color color) {

+		if (color != null)

+			fAnnotationTypes2Colors.put(annotationType, color);

+		else

+			fAnnotationTypes2Colors.remove(annotationType);

+	}

+

+	/**

+	 * Returns whether the given annotation type should be skipped by the drawing routine.

+	 *

+	 * @param annotationType the annotation type

+	 * @return <code>true</code> if annotation of the given type should be skipped

+	 */

+	private boolean skip(Object annotationType) {

+		return !contains(annotationType, fAllowedAnnotationTypes, fConfiguredAnnotationTypes);

+	}

+

+	/**

+	 * Returns whether the given annotation type should be skipped by the drawing routine of the header.

+	 *

+	 * @param annotationType the annotation type

+	 * @return <code>true</code> if annotation of the given type should be skipped

+	 * @since 3.0

+	 */

+	private boolean skipInHeader(Object annotationType) {

+		return !contains(annotationType, fAllowedHeaderAnnotationTypes, fConfiguredHeaderAnnotationTypes);

+	}

+

+	/**

+	 * Returns whether the given annotation type is mapped to <code>true</code>

+	 * in the given <code>allowed</code> map or covered by the <code>configured</code>

+	 * set.

+	 *

+	 * @param annotationType the annotation type

+	 * @param allowed the map with allowed annotation types mapped to booleans

+	 * @param configured the set with configured annotation types

+	 * @return <code>true</code> if annotation is contained, <code>false</code>

+	 *         otherwise

+	 * @since 3.0

+	 */

+	private boolean contains(Object annotationType, Map allowed, Set configured) {

+		Boolean cached= (Boolean) allowed.get(annotationType);

+		if (cached != null)

+			return cached.booleanValue();

+

+		boolean covered= isCovered(annotationType, configured);

+		allowed.put(annotationType, covered ? Boolean.TRUE : Boolean.FALSE);

+		return covered;

+	}

+

+	/**

+	 * Computes whether the annotations of the given type are covered by the given <code>configured</code>

+	 * set. This is the case if either the type of the annotation or any of its

+	 * super types is contained in the <code>configured</code> set.

+	 *

+	 * @param annotationType the annotation type

+	 * @param configured the set with configured annotation types

+	 * @return <code>true</code> if annotation is covered, <code>false</code>

+	 *         otherwise

+	 * @since 3.0

+	 */

+	private boolean isCovered(Object annotationType, Set configured) {

+		if (fAnnotationAccess instanceof IAnnotationAccessExtension) {

+			IAnnotationAccessExtension extension= (IAnnotationAccessExtension) fAnnotationAccess;

+			Iterator<?> e= configured.iterator();

+			while (e.hasNext()) {

+				if (extension.isSubtype(annotationType,e.next()))

+					return true;

+			}

+			return false;

+		}

+		return configured.contains(annotationType);

+	}

+

+	/**

+	 * Returns a specification of a color that lies between the given

+	 * foreground and background color using the given scale factor.

+	 *

+	 * @param fg the foreground color

+	 * @param bg the background color

+	 * @param scale the scale factor

+	 * @return the interpolated color

+	 */

+	private static RGB interpolate(RGB fg, RGB bg, double scale) {

+		return new RGB(

+			(int) ((1.0-scale) * fg.red + scale * bg.red),

+			(int) ((1.0-scale) * fg.green + scale * bg.green),

+			(int) ((1.0-scale) * fg.blue + scale * bg.blue)

+		);

+	}

+

+	/**

+	 * Returns the grey value in which the given color would be drawn in grey-scale.

+	 *

+	 * @param rgb the color

+	 * @return the grey-scale value

+	 */

+	private static double greyLevel(RGB rgb) {

+		if (rgb.red == rgb.green && rgb.green == rgb.blue)

+			return rgb.red;

+		return  (0.299 * rgb.red + 0.587 * rgb.green + 0.114 * rgb.blue + 0.5);

+	}

+

+	/**

+	 * Returns whether the given color is dark or light depending on the colors grey-scale level.

+	 *

+	 * @param rgb the color

+	 * @return <code>true</code> if the color is dark, <code>false</code> if it is light

+	 */

+	private static boolean isDark(RGB rgb) {

+		return greyLevel(rgb) > 128;

+	}

+

+	/**

+	 * Returns a color based on the color configured for the given annotation type and the given scale factor.

+	 *

+	 * @param annotationType the annotation type

+	 * @param scale the scale factor

+	 * @return the computed color

+	 */

+	private Color getColor(Object annotationType, double scale) {

+		Color base= findColor(annotationType);

+		return getInterpolatedColor(base,scale);

+	}

+	

+	

+	private Color getFPColor(Object annotation, double scale){

+		Color base= (Color) fAnnotationColors.get(annotation);

+		return getInterpolatedColor(base,scale);

+	}

+	

+	private Color getInterpolatedColor(Color base,double scale){

+		if (base == null)

+			return null;

+		

+		RGB baseRGB= base.getRGB();

+		RGB background= fCanvas.getBackground().getRGB();

+

+		boolean darkBase= isDark(baseRGB);

+		boolean darkBackground= isDark(background);

+		if (darkBase && darkBackground)

+			background= new RGB(255, 255, 255);

+		else if (!darkBase && !darkBackground)

+			background= new RGB(0, 0, 0);

+

+		return fSharedTextColors.getColor(interpolate(baseRGB, background, scale));

+

+	}

+	

+

+	/**

+	 * Returns the color for the given annotation type

+	 *

+	 * @param annotationType the annotation type

+	 * @return the color

+	 * @since 3.0

+	 */

+	private Color findColor(Object annotationType) {

+		Color color= (Color) fAnnotationTypes2Colors.get(annotationType);

+		if (color != null)

+			return color;

+

+		if (fAnnotationAccess instanceof IAnnotationAccessExtension) {

+			IAnnotationAccessExtension extension= (IAnnotationAccessExtension) fAnnotationAccess;

+			Object[] superTypes= extension.getSupertypes(annotationType);

+			if (superTypes != null) {

+				for (int i= 0; i < superTypes.length; i++) {

+					color= (Color) fAnnotationTypes2Colors.get(superTypes[i]);

+					if (color != null)

+						return color;

+				}

+			}

+		}

+

+		return null;

+	}

+

+	/**

+	 * Returns the stroke color for the given annotation type and characteristics.

+	 *

+	 * @param annotationType the annotation type

+	 * @param temporary <code>true</code> if for temporary annotations

+	 * @return the stroke color

+	 */

+	private Color getStrokeColor(Object annotationType, boolean temporary) {

+		return getColor(annotationType, temporary ? 0.5 : 0.2);

+	}

+	

+	

+	private Color getFPStrokeColor(Object annotation, boolean temporary) {

+		return getFPColor(annotation, temporary ? 0.5 : 0.2);

+	}

+

+	/**

+	 * Returns the fill color for the given annotation type and characteristics.

+	 *

+	 * @param annotationType the annotation type

+	 * @param temporary <code>true</code> if for temporary annotations

+	 * @return the fill color

+	 */

+	private Color getFillColor(Object annotationType, boolean temporary) {

+		return getColor(annotationType, temporary ? 0.9 : 0.6);

+	}

+	

+	private Color getFPFillColor(Object annotation, boolean temporary){

+		return getFPColor(annotation, temporary ? 0.9 : 0.6);

+	}

+

+	/*

+	 * @see IVerticalRulerInfo#getLineOfLastMouseButtonActivity()

+	 */

+	public int getLineOfLastMouseButtonActivity() {

+		return fLastMouseButtonActivityLine;

+	}

+

+	/*

+	 * @see IVerticalRulerInfo#toDocumentLineNumber(int)

+	 */

+	public int toDocumentLineNumber(int y_coordinate) {

+

+		if (fTextViewer == null || y_coordinate == -1)

+			return -1;

+

+		int[] lineNumbers= toLineNumbers(y_coordinate);

+		int bestLine= findBestMatchingLineNumber(lineNumbers);

+		if (bestLine == -1 && lineNumbers.length > 0)

+			return lineNumbers[0];

+		return	bestLine;

+	}

+

+	/*

+	 * @see org.eclipse.jface.text.source.IVerticalRuler#getModel()

+	 */

+	public IAnnotationModel getModel() {

+		return fModel;

+	}

+

+	/*

+	 * @see org.eclipse.jface.text.source.IOverviewRuler#getAnnotationHeight()

+	 */

+	public int getAnnotationHeight() {

+		return fAnnotationHeight;

+	}

+

+	/*

+	 * @see org.eclipse.jface.text.source.IOverviewRuler#hasAnnotation(int)

+	 */

+	public boolean hasAnnotation(int y) {

+		return findBestMatchingLineNumber(toLineNumbers(y)) != -1;

+	}

+

+	/*

+	 * @see org.eclipse.jface.text.source.IOverviewRuler#getHeaderControl()

+	 */

+	public Control getHeaderControl() {

+		return fHeader;

+	}

+

+	/*

+	 * @see org.eclipse.jface.text.source.IOverviewRuler#addHeaderAnnotationType(java.lang.Object)

+	 */

+	public void addHeaderAnnotationType(Object annotationType) {

+		fConfiguredHeaderAnnotationTypes.add(annotationType);

+		fAllowedHeaderAnnotationTypes.clear();

+	}

+

+	/*

+	 * @see org.eclipse.jface.text.source.IOverviewRuler#removeHeaderAnnotationType(java.lang.Object)

+	 */

+	public void removeHeaderAnnotationType(Object annotationType) {

+		fConfiguredHeaderAnnotationTypes.remove(annotationType);

+		fAllowedHeaderAnnotationTypes.clear();

+	}

+

+	/**

+	 * Updates the header of this ruler.

+	 */

+	private void updateHeader() {

+

+		if (fHeader == null || fHeader.isDisposed())

+			return;

+

+		Object colorType= null;

+		outer: for (int i= fAnnotationsSortedByLayer.size() -1; i >= 0; i--) {

+

+			Object annotationType= fAnnotationsSortedByLayer.get(i);

+

+			if (skipInHeader(annotationType) || skip(annotationType))

+				continue;

+

+			for (FilterIterator e= new FilterIterator(annotationType, FilterIterator.PERSISTENT | FilterIterator.TEMPORARY | FilterIterator.IGNORE_BAGS); e.hasNext();) {

+				if (e.next() != null) {

+					colorType= annotationType;

+					break outer;

+				}

+			}

+		}

+

+		Color color= null;

+		if (colorType != null)

+			color= findColor(colorType);

+

+		if (color == null) {

+			if (fHeaderPainter != null)

+				fHeaderPainter.setColor(null);

+		}	else {

+			if (fHeaderPainter == null) {

+				fHeaderPainter= new HeaderPainter();

+				fHeader.addPaintListener(fHeaderPainter);

+			}

+			fHeaderPainter.setColor(color);

+		}

+

+		fHeader.redraw();

+		updateHeaderToolTipText();

+	}

+

+	/**

+	 * Updates the tool tip text of the header of this ruler.

+	 *

+	 * @since 3.0

+	 */

+	private void updateHeaderToolTipText() {

+

+		if (fHeader == null || fHeader.isDisposed())

+			return;

+

+		fHeader.setToolTipText(null);

+

+		if (!(fAnnotationAccess instanceof IAnnotationAccessExtension))

+			return;

+

+		String overview= ""; //$NON-NLS-1$

+

+		for (int i= fAnnotationsSortedByLayer.size() -1; i >= 0; i--) {

+

+			Object annotationType= fAnnotationsSortedByLayer.get(i);

+

+			if (skipInHeader(annotationType) || skip(annotationType))

+				continue;

+

+			int count= 0;

+			String annotationTypeLabel= null;

+

+			for (FilterIterator e= new FilterIterator(annotationType, FilterIterator.PERSISTENT | FilterIterator.TEMPORARY | FilterIterator.IGNORE_BAGS); e.hasNext();) {

+				Annotation annotation= e.next();

+				if (annotation != null) {

+					if (annotationTypeLabel == null)

+						annotationTypeLabel= ((IAnnotationAccessExtension)fAnnotationAccess).getTypeLabel(annotation);

+					count++;

+				}

+			}

+

+			if (annotationTypeLabel != null) {

+				if (overview.length() > 0)

+					overview += "\n"; //$NON-NLS-1$

+				overview += STJFaceTextMessages.getFormattedString("OverviewRulerHeader.toolTipTextEntry", new Object[] {annotationTypeLabel, new Integer(count)}); //$NON-NLS-1$

+			}

+		}

+		if (overview.length() > 0)

+			fHeader.setToolTipText(overview);

+	}

+	

+	private String getAnnotationTypeColoredLines(){

+		return (STAnnotatedSourceEditorActivator.getUniqueIdentifier() + STAnnotatedSourceEditorActivator.getAnnotationType());

+	}

+}

+

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STRulerColumn.java b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STRulerColumn.java
new file mode 100644
index 0000000..8af7be3
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STRulerColumn.java
@@ -0,0 +1,876 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.dataviewers.annotatedsourceeditor;

+

+import java.util.Arrays;

+

+import org.eclipse.jface.text.BadLocationException;

+import org.eclipse.jface.text.IDocument;

+import org.eclipse.jface.text.IRegion;

+import org.eclipse.jface.text.ITextListener;

+import org.eclipse.jface.text.ITextViewer;

+import org.eclipse.jface.text.ITextViewerExtension;

+import org.eclipse.jface.text.IViewportListener;

+import org.eclipse.jface.text.JFaceTextUtil;

+import org.eclipse.jface.text.TextEvent;

+import org.eclipse.jface.text.source.CompositeRuler;

+import org.eclipse.jface.text.source.IAnnotationModel;

+import org.eclipse.jface.text.source.ILineRange;

+import org.eclipse.jface.text.source.IVerticalRulerColumn;

+import org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.hyperlink.ISTAnnotationHyperlink;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.custom.StyledText;

+import org.eclipse.swt.events.DisposeEvent;

+import org.eclipse.swt.events.DisposeListener;

+import org.eclipse.swt.events.MouseEvent;

+import org.eclipse.swt.events.MouseListener;

+import org.eclipse.swt.events.MouseMoveListener;

+import org.eclipse.swt.events.MouseTrackListener;

+import org.eclipse.swt.events.PaintEvent;

+import org.eclipse.swt.events.PaintListener;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.Cursor;

+import org.eclipse.swt.graphics.Font;

+import org.eclipse.swt.graphics.FontMetrics;

+import org.eclipse.swt.graphics.GC;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.graphics.Point;

+import org.eclipse.swt.graphics.Rectangle;

+import org.eclipse.swt.graphics.TextLayout;

+import org.eclipse.swt.graphics.TextStyle;

+import org.eclipse.swt.widgets.Canvas;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Control;

+import org.eclipse.swt.widgets.Display;

+

+

+public class STRulerColumn implements IVerticalRulerColumn{

+	/**

+	 * Internal listener class.

+	 */

+	class InternalListener implements IViewportListener, ITextListener {

+

+		/**

+		 * @since 3.1

+		 */

+		private boolean fCachedRedrawState= true;

+

+		/*

+		 * @see IViewportListener#viewportChanged(int)

+		 */

+		public void viewportChanged(int verticalPosition) {

+			if (fCachedRedrawState && verticalPosition != fScrollPos)

+				redraw();

+		}

+

+		/*

+		 * @see ITextListener#textChanged(TextEvent)

+		 */

+		public void textChanged(TextEvent event) {

+

+			fCachedRedrawState= event.getViewerRedrawState();

+			if (!fCachedRedrawState)

+				return;

+

+			if (updateNumberOfDigits()) {

+				computeIndentations();

+				layout(event.getViewerRedrawState());

+				return;

+			}

+

+			boolean viewerCompletelyShown= isViewerCompletelyShown();

+			if (viewerCompletelyShown || fSensitiveToTextChanges || event.getDocumentEvent() == null)

+				postRedraw();

+			fSensitiveToTextChanges= viewerCompletelyShown;

+		}

+	}

+

+	/**

+	 * Handles all the mouse interaction in this line number ruler column.

+	 */

+	class MouseHandler implements MouseListener, MouseMoveListener {

+

+		/** The cached view port size */

+		private int fCachedViewportSize;

+		/** The area of the line at which line selection started */

+		private IRegion fStartLine;

+		/** The number of the line at which line selection started */

+		private int fStartLineNumber;

+		/** The auto scroll direction */

+		private int fAutoScrollDirection;

+		/* @since 3.2 */

+		private boolean fIsListeningForMove= false;

+

+		/*

+		 * @see org.eclipse.swt.events.MouseListener#mouseUp(org.eclipse.swt.events.MouseEvent)

+		 */

+		public void mouseUp(MouseEvent event) {

+			// see bug 45700

+			if (event.button == 1) {

+				stopSelecting();

+				stopAutoScroll();

+			}

+		}

+

+		/*

+		 * @see org.eclipse.swt.events.MouseListener#mouseDown(org.eclipse.swt.events.MouseEvent)

+		 */

+		public void mouseDown(MouseEvent event) {

+			fParentRuler.setLocationOfLastMouseButtonActivity(event.x, event.y);

+			

+			int newLine= fParentRuler.toDocumentLineNumber(event.y) + 1;

+			if (annotationColumn instanceof ISTAnnotationHyperlink){

+				ISTAnnotationHyperlink ahp = (ISTAnnotationHyperlink)annotationColumn;

+				if (ahp.isAnnotationHyperlink(newLine) && annotationColumn.getAnnotation(newLine).trim() != ""){

+					ahp.handleHyperlink(newLine);

+				}

+

+			}

+			else{

+				// see bug 45700

+				if (event.button == 1) {

+					startSelecting();

+				}

+			}

+		}

+

+		/*

+		 * @see org.eclipse.swt.events.MouseListener#mouseDoubleClick(org.eclipse.swt.events.MouseEvent)

+		 */

+		public void mouseDoubleClick(MouseEvent event) {

+			fParentRuler.setLocationOfLastMouseButtonActivity(event.x, event.y);

+			stopSelecting();

+			stopAutoScroll();

+		}

+

+		/*

+		 * @see org.eclipse.swt.events.MouseMoveListener#mouseMove(org.eclipse.swt.events.MouseEvent)

+		 */

+		public void mouseMove(MouseEvent event) {

+			int newLine= fParentRuler.toDocumentLineNumber(event.y) + 1;

+			if (annotationColumn instanceof ISTAnnotationHyperlink){

+				if (((ISTAnnotationHyperlink)annotationColumn).isAnnotationHyperlink(newLine) && annotationColumn.getAnnotation(newLine).trim() != ""){

+					Cursor cursor = new Cursor(event.display,SWT.CURSOR_HAND);

+					fCanvas.setCursor(cursor);

+				}

+				else{

+					Cursor cursor = new Cursor(event.display,SWT.CURSOR_ARROW);

+					fCanvas.setCursor(cursor);

+				}

+			}

+			if (fIsListeningForMove && !autoScroll(event)) {

+				expandSelection(newLine);

+			}

+			fParentRuler.setLocationOfLastMouseButtonActivity(event.x, event.y);

+		}

+

+		/**

+		 * Called when line drag selection started. Adds mouse move and track

+		 * listeners to this column's control.

+		 */

+		private void startSelecting() {

+			try {

+

+				// select line

+				IDocument document= fCachedTextViewer.getDocument();

+				fStartLineNumber= fParentRuler.getLineOfLastMouseButtonActivity();

+				fStartLine= document.getLineInformation(fStartLineNumber);

+				fCachedTextViewer.setSelectedRange(fStartLine.getOffset(), fStartLine.getLength());

+

+				// prepare for drag selection

+				fIsListeningForMove= true;

+

+			} catch (BadLocationException x) {

+			}

+		}

+	

+		/**

+		 * Called when line drag selection stopped. Removes all previously

+		 * installed listeners from this column's control.

+		 */

+		private void stopSelecting() {

+			// drag selection stopped

+			fIsListeningForMove= false;

+		}

+

+		/**

+		 * Expands the line selection from the remembered start line to the

+		 * given line.

+		 *

+		 * @param lineNumber the line to which to expand the selection

+		 */

+		private void expandSelection(int lineNumber) {

+			try {

+

+				IDocument document= fCachedTextViewer.getDocument();

+				IRegion lineInfo= document.getLineInformation(lineNumber);

+

+				int start= Math.min(fStartLine.getOffset(), lineInfo.getOffset());

+				int end= Math.max(fStartLine.getOffset() + fStartLine.getLength(), lineInfo.getOffset() + lineInfo.getLength());

+

+				if (lineNumber < fStartLineNumber)

+					fCachedTextViewer.setSelectedRange(end, start - end);

+				else

+					fCachedTextViewer.setSelectedRange(start, end - start);

+

+			} catch (BadLocationException x) {

+			}

+		}

+

+		/**

+		 * Called when auto scrolling stopped. Clears the auto scroll direction.

+		 */

+		private void stopAutoScroll() {

+			fAutoScrollDirection= SWT.NULL;

+		}

+

+		/**

+		 * Called on drag selection.

+		 *

+		 * @param event the mouse event caught by the mouse move listener

+		 * @return <code>true</code> if scrolling happened, <code>false</code> otherwise

+		 */

+		private boolean autoScroll(MouseEvent event) {

+			Rectangle area= fCanvas.getClientArea();

+

+			if (event.y > area.height) {

+				autoScroll(SWT.DOWN);

+				return true;

+			}

+

+			if (event.y < 0) {

+				autoScroll(SWT.UP);

+				return true;

+			}

+	

+			stopAutoScroll();

+			return false;

+		}

+

+		/**

+		 * Scrolls the viewer into the given direction.

+		 *

+		 * @param direction the scroll direction

+		 */

+		private void autoScroll(int direction) {

+

+			if (fAutoScrollDirection == direction)

+				return;

+

+			final int TIMER_INTERVAL= 5;

+			final Display display = fCanvas.getDisplay();

+			Runnable timer= null;

+			switch (direction) {

+				case SWT.UP:

+					timer= new Runnable() {

+						public void run() {

+							if (fAutoScrollDirection == SWT.UP) {

+								int top= getInclusiveTopIndex();

+								if (top > 0) {

+									fCachedTextViewer.setTopIndex(top -1);

+									expandSelection(top -1);

+									display.timerExec(TIMER_INTERVAL, this);

+								}

+							}

+						}

+					};

+					break;

+				case  SWT.DOWN:

+					timer = new Runnable() {

+						public void run() {

+							if (fAutoScrollDirection == SWT.DOWN) {

+								int top= getInclusiveTopIndex();

+								fCachedTextViewer.setTopIndex(top +1);

+								expandSelection(top +1 + fCachedViewportSize);

+								display.timerExec(TIMER_INTERVAL, this);

+							}

+						}

+					};

+					break;

+			}

+

+			if (timer != null) {

+				fAutoScrollDirection= direction;

+				display.timerExec(TIMER_INTERVAL, timer);

+			}

+		}

+

+		/**

+		 * Returns the viewer's first visible line, even if only partially visible.

+		 *

+		 * @return the viewer's first visible line

+		 */

+		private int getInclusiveTopIndex() {

+			if (fCachedTextWidget != null && !fCachedTextWidget.isDisposed()) {

+				return JFaceTextUtil.getPartialTopIndex(fCachedTextViewer);

+			}

+			return -1;

+		}

+	}

+

+	/** This column's parent ruler */

+	private CompositeRuler fParentRuler;

+	/** Cached text viewer */

+	private ITextViewer fCachedTextViewer;

+	/** Cached text widget */

+	private StyledText fCachedTextWidget;

+	/** The columns canvas */

+	private Canvas fCanvas;

+	/** Cache for the actual scroll position in pixels */

+	private int fScrollPos;

+	/** The drawable for double buffering */

+	private Image fBuffer;

+	/** The internal listener */

+	private InternalListener fInternalListener= new InternalListener();

+	/** The font of this column */

+	private Font fFont;

+	/** The indentation cache */

+	private int[] fIndentation;

+	/** Indicates whether this column reacts on text change events */

+	private boolean fSensitiveToTextChanges= false;

+	/** The foreground color */

+	private Color fForeground;

+	/** The background color */

+	private Color fBackground;

+	/** Cached number of displayed digits */

+	private int fCachedNumberOfDigits= -1;

+	/** Flag indicating whether a relayout is required */

+	private boolean fRelayoutRequired= false;

+	/**

+	 * Redraw runnable lock

+	 * @since 3.0

+	 */

+	private Object fRunnableLock= new Object();

+	/**

+	 * Redraw runnable state

+	 * @since 3.0

+	 */

+	private boolean fIsRunnablePosted= false;

+	/**

+	 * Redraw runnable

+	 * @since 3.0

+	 */

+	private Runnable fRunnable= new Runnable() {

+		public void run() {

+			synchronized (fRunnableLock) {

+				fIsRunnablePosted= false;

+			}

+			redraw();

+		}

+	};

+	/* @since 3.2 */

+	private MouseHandler fMouseHandler;

+

+	private ISTAnnotationColumn annotationColumn;

+	

+	/**

+	 * Constructs a new vertical ruler column.

+	 */

+	public STRulerColumn(ISTAnnotationColumn ac) {

+		annotationColumn = ac;

+	}

+	

+	public ISTAnnotationColumn getSTAnnotationColumn(){

+		return annotationColumn;

+	}

+	

+	public STRulerColumn() {

+	}

+

+	/**

+	 * Sets the foreground color of this column.

+	 *

+	 * @param foreground the foreground color

+	 */

+	public void setForeground(Color foreground) {

+		fForeground= foreground;

+	}

+

+	/**

+	 * Returns the foreground color being used to print the line numbers.

+	 *

+	 * @return the configured foreground color

+	 * @since 3.0

+	 */

+	protected Color getForeground() {

+		return fForeground;

+	}

+

+	/**

+	 * Sets the background color of this column.

+	 *

+	 * @param background the background color

+	 */

+	public void setBackground(Color background) {

+		fBackground= background;

+		if (fCanvas != null && !fCanvas.isDisposed())

+			fCanvas.setBackground(getBackground(fCanvas.getDisplay()));

+	}

+

+	/**

+	 * Returns the System background color for list widgets.

+	 *

+	 * @param display the display

+	 * @return the System background color for list widgets

+	 */

+	protected Color getBackground(Display display) {

+		if (fBackground == null)

+			return display.getSystemColor(SWT.COLOR_LIST_BACKGROUND);

+		return fBackground;

+	}

+

+	/*

+	 * @see IVerticalRulerColumn#getControl()

+	 */

+	public Control getControl() {

+		return fCanvas;

+	}

+

+	/*

+	 * @see IVerticalRuleColumnr#getWidth

+	 */

+	public int getWidth() {

+		return fIndentation[0];

+	}

+

+	/**

+	 * Computes the number of digits to be displayed. Returns

+	 * <code>true</code> if the number of digits changed compared

+	 * to the previous call of this method. If the method is called

+	 * for the first time, the return value is also <code>true</code>.

+	 *

+	 * @return whether the number of digits has been changed

+	 * @since 3.0

+	 */

+	protected boolean updateNumberOfDigits() {

+		if (fCachedTextViewer == null)

+			return false;

+

+		int digits= computeNumberOfDigits();

+

+		if (fCachedNumberOfDigits != digits) {

+			fCachedNumberOfDigits= digits;

+			return true;

+		}

+

+		return false;

+	}

+

+	/**

+	 * Does the real computation of the number of digits. Subclasses may override this method if

+	 * they need extra space on the line number ruler.

+	 *

+	 * @return the number of digits to be displayed on the line number ruler.

+	 */

+	protected int computeNumberOfDigits() {

+		IDocument document= fCachedTextViewer.getDocument();

+		int lines= document == null ? 0 : document.getNumberOfLines();

+		int digits = 0;

+		if (annotationColumn.getTitle() != null && annotationColumn.getTitle().length() >0){

+			digits= annotationColumn.getTitle().length() + 3;

+		}

+		else

+			digits = 3;

+		

+		while (lines > Math.pow(10, digits) -1) {

+			++digits;

+		}

+		return (digits);

+	}

+

+	/**

+	 * Layouts the enclosing viewer to adapt the layout to changes of the

+	 * size of the individual components.

+	 *

+	 * @param redraw <code>true</code> if this column can be redrawn

+	 */

+	protected void layout(boolean redraw) {

+		if (!redraw) {

+			fRelayoutRequired= true;

+			return;

+		}

+

+		fRelayoutRequired= false;

+		if (fCachedTextViewer instanceof ITextViewerExtension) {

+			ITextViewerExtension extension= (ITextViewerExtension) fCachedTextViewer;

+			Control control= extension.getControl();

+			if (control instanceof Composite && !control.isDisposed()) {

+				Composite composite= (Composite) control;

+				composite.layout(true);

+			}

+		}

+	}

+

+	/**

+	 * Computes the indentations for the given font and stores them in

+	 * <code>fIndentation</code>.

+	 */

+	protected void computeIndentations() {

+		if (fCanvas == null || fCanvas.isDisposed())

+			return;

+

+		GC gc= new GC(fCanvas);

+		try {

+

+			gc.setFont(fCanvas.getFont());

+

+			fIndentation= new int[fCachedNumberOfDigits + 3];

+

+			char[] nines= new char[fCachedNumberOfDigits + 2];

+			Arrays.fill(nines, '9');

+			String nineString= new String(nines);

+			Point p= gc.stringExtent(nineString);

+			fIndentation[0]= p.x;

+

+			for (int i= 1; i <= fCachedNumberOfDigits; i++) {

+				p= gc.stringExtent(nineString.substring(0, i));

+				fIndentation[i]= fIndentation[0] - p.x;

+			}

+

+		} finally {

+			gc.dispose();

+		}

+	}

+

+	/*

+	 * @see IVerticalRulerColumn#createControl(CompositeRuler, Composite)

+	 */

+	public Control createControl(CompositeRuler parentRuler, Composite parentControl) {

+

+		fParentRuler= parentRuler;

+		fCachedTextViewer= parentRuler.getTextViewer();

+		fCachedTextWidget= fCachedTextViewer.getTextWidget();

+

+		fCanvas= new Canvas(parentControl, SWT.BORDER);

+		fCanvas.setBackground(getBackground(fCanvas.getDisplay()));

+		fCanvas.setForeground(fForeground);

+		

+		fCanvas.addPaintListener(new PaintListener() {

+			public void paintControl(PaintEvent event) {

+				if (fCachedTextViewer != null)

+					doubleBufferPaint(event.gc);

+			}

+		});

+

+		fCanvas.addDisposeListener(new DisposeListener() {

+			public void widgetDisposed(DisposeEvent e) {

+				handleDispose();

+				fCachedTextViewer= null;

+				fCachedTextWidget= null;

+			}

+		});

+

+		fMouseHandler= new MouseHandler();

+		fCanvas.addMouseListener(fMouseHandler);

+		fCanvas.addMouseMoveListener(fMouseHandler);

+

+		if (fCachedTextViewer != null) {

+

+			fCachedTextViewer.addViewportListener(fInternalListener);

+			fCachedTextViewer.addTextListener(fInternalListener);

+

+			if (fFont == null) {

+				if (fCachedTextWidget != null && !fCachedTextWidget.isDisposed())

+					fFont= fCachedTextWidget.getFont();

+			}

+		}

+

+		if (fFont != null)

+			fCanvas.setFont(fFont);

+

+		updateNumberOfDigits();

+		computeIndentations();

+		return fCanvas;

+	}

+

+	/**

+	 * Disposes the column's resources.

+	 */

+	protected void handleDispose() {

+

+		if (fCachedTextViewer != null) {

+			fCachedTextViewer.removeViewportListener(fInternalListener);

+			fCachedTextViewer.removeTextListener(fInternalListener);

+		}

+

+		if (fBuffer != null) {

+			fBuffer.dispose();

+			fBuffer= null;

+		}

+	}

+

+	/**

+	 * Double buffer drawing.

+	 *

+	 * @param dest the GC to draw into

+	 */

+	private void doubleBufferPaint(GC dest) {

+

+		Point size= fCanvas.getSize();

+

+		if (size.x <= 0 || size.y <= 0)

+			return;

+

+		if (fBuffer != null) {

+			Rectangle r= fBuffer.getBounds();

+			if (r.width != size.x || r.height != size.y) {

+				fBuffer.dispose();

+				fBuffer= null;

+			}

+		}

+		if (fBuffer == null)

+			fBuffer= new Image(fCanvas.getDisplay(), size.x, size.y);

+

+		GC gc= new GC(fBuffer);

+		gc.setFont(fCanvas.getFont());

+		if (fForeground != null)

+			gc.setForeground(fForeground);

+

+		try {

+			gc.setBackground(getBackground(fCanvas.getDisplay()));

+			gc.fillRectangle(0, 0, size.x, size.y);

+

+			ILineRange visibleLines= JFaceTextUtil.getVisibleModelLines(fCachedTextViewer);

+			if (visibleLines == null)

+				return;

+			fScrollPos= fCachedTextWidget.getTopPixel();

+			doPaint(gc, visibleLines);

+			fCachedTextWidget.addMouseTrackListener(new MouseTrackListener(){

+

+				@Override

+				public void mouseEnter(MouseEvent e) {

+					// TODO Auto-generated method stub

+					

+				}

+

+				@Override

+				public void mouseExit(MouseEvent e) {

+					// TODO Auto-generated method stub

+					

+				}

+

+				@Override

+				public void mouseHover(MouseEvent e) {

+					

+					

+				}

+				

+			});

+		

+		} finally {

+			gc.dispose();

+		}

+

+		dest.drawImage(fBuffer, 0, 0);

+	}

+

+	/**

+	 * Returns <code>true</code> if the viewport displays the entire viewer contents, i.e. the

+	 * viewer is not vertically scrollable.

+	 * 

+	 * @return <code>true</code> if the viewport displays the entire contents, <code>false</code> otherwise

+	 * @since 3.2

+	 */

+	protected final boolean isViewerCompletelyShown() {

+		return JFaceTextUtil.isShowingEntireContents(fCachedTextWidget);

+	}

+

+	/**

+	 * Draws the ruler column.

+	 *

+	 * @param gc the GC to draw into

+	 * @param visibleLines the visible model lines

+	 * @since 3.2

+	 */

+	void doPaint(GC gc, ILineRange visibleLines) {

+		Display display= fCachedTextWidget.getDisplay();

+		

+		// draw diff info

+		int y= -JFaceTextUtil.getHiddenTopLinePixels(fCachedTextWidget);

+		

+		int lastLine= end(visibleLines);

+		for (int line= visibleLines.getStartLine(); line < lastLine; line++) {

+			int widgetLine= JFaceTextUtil.modelLineToWidgetLine(fCachedTextViewer, line);

+			if (widgetLine == -1)

+				continue;

+

+			int lineHeight= fCachedTextWidget.getLineHeight(fCachedTextWidget.getOffsetAtLine(widgetLine));

+			paintLine(line, y, lineHeight, gc, display);

+			y += lineHeight;

+		}

+	}

+

+	/* @since 3.2 */

+	private static int end(ILineRange range) {

+		return range.getStartLine() + range.getNumberOfLines();

+	}

+	

+	/**

+	 * Computes the string to be printed for <code>line</code>. The default implementation returns

+	 * <code>Integer.toString(line + 1)</code>.

+	 *

+	 * @param line the line number for which the line number string is generated

+	 * @return the string to be printed on the line number bar for <code>line</code>

+	 * @since 3.0

+	 */

+	protected String createDisplayString(int line) {

+		return Integer.toString(line);

+	}

+

+	/**

+	 * Returns the difference between the baseline of the widget and the

+	 * baseline as specified by the font for <code>gc</code>. When drawing

+	 * line numbers, the returned bias should be added to obtain text lined up

+	 * on the correct base line of the text widget.

+	 *

+	 * @param gc the <code>GC</code> to get the font metrics from

+	 * @param widgetLine the widget line

+	 * @return the baseline bias to use when drawing text that is lined up with

+	 *         <code>fCachedTextWidget</code>

+	 * @since 3.2

+	 */

+	private int getBaselineBias(GC gc, int widgetLine) {

+		/*

+		 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=62951

+		 * widget line height may be more than the font height used for the

+		 * line numbers, since font styles (bold, italics...) can have larger

+		 * font metrics than the simple font used for the numbers.

+		 */

+		int offset= fCachedTextWidget.getOffsetAtLine(widgetLine);

+		int widgetBaseline= fCachedTextWidget.getBaseline(offset);

+		

+		FontMetrics fm = gc.getFontMetrics();

+		int fontBaseline = fm.getAscent() + fm.getLeading();

+		int baselineBias= widgetBaseline - fontBaseline;

+		return Math.max(0, baselineBias);

+	}

+

+	/**

+	 * Paints the line. After this method is called the line numbers are painted on top

+	 * of the result of this method.

+	 *

+	 * @param line the line of the document which the ruler is painted for

+	 * @param y the y-coordinate of the box being painted for <code>line</code>, relative to <code>gc</code>

+	 * @param lineheight the height of one line (and therefore of the box being painted)

+	 * @param gc the drawing context the client may choose to draw on.

+	 * @param display the display the drawing occurs on

+	 * @since 3.0

+	 */

+	protected void paintLine(int line, int y, int lineheight, GC gc, Display display) {

+		int widgetLine= JFaceTextUtil.modelLineToWidgetLine(fParentRuler.getTextViewer(), line);

+		String s = "";

+		int indentation= fCachedNumberOfDigits; 

+		

+		if (annotationColumn instanceof ISTAnnotationHyperlink){

+			ISTAnnotationHyperlink ah = (ISTAnnotationHyperlink)annotationColumn;

+			if (ah.isAnnotationHyperlink(widgetLine)){

+				paintHyperLink(line, y, indentation, lineheight, gc, display);

+

+			}

+		}

+		else{

+			s = annotationColumn.getAnnotation(widgetLine);

+		

+			if (widgetLine + 1 == 1){

+				for(int i=0;i<annotationColumn.getTitle().length();i++)

+					s = s + " ";

+			}

+

+			int baselineBias= getBaselineBias(gc, widgetLine);

+			gc.drawString(s, indentation, y + baselineBias, true);

+		}

+	}

+

+	/**

+	 * Triggers a redraw in the display thread.

+	 *

+	 * @since 3.0

+	 */

+	protected final void postRedraw() {

+		if (fCanvas != null && !fCanvas.isDisposed()) {

+			Display d= fCanvas.getDisplay();

+			if (d != null) {

+				synchronized (fRunnableLock) {

+					if (fIsRunnablePosted)

+						return;

+					fIsRunnablePosted= true;

+				}

+				d.asyncExec(fRunnable);

+			}

+		}

+	}

+

+	/*

+	 * @see IVerticalRulerColumn#redraw()

+	 */

+	public void redraw() {

+

+		if (fRelayoutRequired) {

+			layout(true);

+			return;

+		}

+

+		if (fCachedTextViewer != null && fCanvas != null && !fCanvas.isDisposed()) {

+			GC gc= new GC(fCanvas);

+			doubleBufferPaint(gc);

+			gc.dispose();

+		}

+	}

+

+	/*

+	 * @see IVerticalRulerColumn#setModel(IAnnotationModel)

+	 */

+	public void setModel(IAnnotationModel model) {

+	}

+

+	/*

+	 * @see IVerticalRulerColumn#setFont(Font)

+	 */

+	public void setFont(Font font) {

+		fFont= font;

+		if (fCanvas != null && !fCanvas.isDisposed()) {

+			fCanvas.setFont(fFont);

+			updateNumberOfDigits();

+			computeIndentations();

+		}

+	}

+

+	/**

+	 * Returns the parent (composite) ruler of this ruler column.

+	 *

+	 * @return the parent ruler

+	 * @since 3.0

+	 */

+	protected CompositeRuler getParentRuler() {

+		return fParentRuler;

+	}

+	

+	protected void paintHyperLink(int line, int y, int x,int lineheight, GC gc, Display display) {

+		String str = annotationColumn.getAnnotation(line);

+		final TextStyle styledString = new TextStyle(gc.getFont(),null,null);

+		styledString.foreground = display.getSystemColor(SWT.COLOR_BLUE);

+		styledString.underline = true;

+		TextLayout tl = new TextLayout(display);

+		tl.setText(str);

+	

+		tl.setStyle(styledString, 0, str.length());

+		y = y + lineheight/2 - gc.stringExtent(str).y/2; 

+		tl.draw(gc, x, y);

+		if (line + 1 == 1){

+			int baselineBias= getBaselineBias(gc, line);

+			String s = "";

+			for(int i=0;i<annotationColumn.getTitle().length();i++)

+				s = s + " ";

+			gc.drawString(s, x + tl.getWidth() + 8, y + baselineBias, true);

+		}

+	}

+

+}

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STRulerMessages.java b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STRulerMessages.java
new file mode 100644
index 0000000..8c94eb7
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STRulerMessages.java
@@ -0,0 +1,34 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.dataviewers.annotatedsourceeditor;

+

+import org.eclipse.osgi.util.NLS;

+

+/**

+ * Helper class to get NLSed messages.

+ */

+final class STRulerMessages extends NLS {

+

+	private static final String BUNDLE_NAME= STRulerMessages.class.getName();

+

+	private STRulerMessages() {

+		// Do not instantiate

+	}

+

+	public static String AbstractDecoratedTextEditor_revision_quickdiff_switch_title;

+	public static String AbstractDecoratedTextEditor_revision_quickdiff_switch_message;

+	public static String AbstractDecoratedTextEditor_revision_quickdiff_switch_rememberquestion;

+	

+	static {

+		NLS.initializeMessages(BUNDLE_NAME, STRulerMessages.class);

+	}

+

+}

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STTextEditorMessages.java b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STTextEditorMessages.java
new file mode 100644
index 0000000..0cf4097
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/STTextEditorMessages.java
@@ -0,0 +1,37 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.dataviewers.annotatedsourceeditor;

+

+import java.util.ResourceBundle;

+

+import org.eclipse.osgi.util.NLS;

+

+public class STTextEditorMessages extends NLS {

+	private static final String BUNDLE_FOR_CONSTRUCTED_KEYS= "org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.STConstructedTextEditorMessages"; //$NON-NLS-1$

+	private static ResourceBundle fgBundleForConstructedKeys= ResourceBundle.getBundle(BUNDLE_FOR_CONSTRUCTED_KEYS);

+

+	/**

+	 * Returns the message bundle which contains constructed keys.

+	 *

+	 * @since 3.1

+	 * @return the message bundle

+	 */

+	public static ResourceBundle getBundleForConstructedKeys() {

+		return fgBundleForConstructedKeys;

+	}

+

+	private static final String BUNDLE_NAME= STTextEditorMessages.class.getName();

+	

+	static {

+		NLS.initializeMessages(BUNDLE_NAME, STTextEditorMessages.class);

+	}

+

+}

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/actions/AbstractOpenSourceFileAction.java b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/actions/AbstractOpenSourceFileAction.java
new file mode 100644
index 0000000..d6d923c
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/actions/AbstractOpenSourceFileAction.java
@@ -0,0 +1,93 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.actions;

+

+import org.eclipse.core.filesystem.EFS;

+import org.eclipse.core.filesystem.IFileStore;

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.jface.action.Action;

+import org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.AbstractSTAnnotatedSourceEditorInput;

+import org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.STAnnotatedSourceEditorActivator;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.widgets.MessageBox;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.ui.IEditorInput;

+import org.eclipse.ui.IWorkbenchPage;

+import org.eclipse.ui.IWorkbenchWindow;

+import org.eclipse.ui.PlatformUI;

+

+

+public abstract class AbstractOpenSourceFileAction extends Action{

+	public static final String EDITOR_ID = "org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.editor";

+	private long ts;

+	

+	public AbstractOpenSourceFileAction(String filepath,long ts){

+		super.setText("Open =>" + filepath);

+		this.ts = ts;

+	}

+	

+	@Override

+	public void run() {

+

+		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();

+		

+		IFileStore fileStore = getFileStore();

+		

+		if (fileStore != null && !fileStore.fetchInfo().isDirectory() && fileStore.fetchInfo().exists()) {

+			long timeStamp = fileStore.fetchInfo().getLastModified();

+			

+			if (timeStamp>ts) {

+				MessageBox msg = new MessageBox(window.getShell(),SWT.ICON_WARNING | SWT.APPLICATION_MODAL | SWT.YES| SWT.NO);

+				msg.setText(fileStore.toString());

+				msg.setMessage("The file "

+						+ fileStore

+						+ " is newer than the analysis result, \n"

+						+ " if you continue opening it the visualization could result inconsistent. \n Do you want to continue?");

+			}

+			

+			try {

+				IWorkbenchPage page = window.getActivePage();

+			    if (page != null) {

+			    	IFileStore fs =  EFS.getStore(fileStore.toURI());

+			    	IEditorInput input = getInput(fs);

+			    	page.openEditor(input,  EDITOR_ID, false);

+			    }

+			} catch (Exception e) {

+			    Status s = new Status(

+			            IStatus.ERROR,

+			            STAnnotatedSourceEditorActivator.getUniqueIdentifier(),

+			            IStatus.ERROR,

+			            "Error when opening annotated source view",

+			            e);

+			    STAnnotatedSourceEditorActivator.getDefault().getLog().log(s);

+			}

+		} 

+		else{

+			if (!fileStore.fetchInfo().exists()) {

+				showMessage("The selected file does not exist: " + fileStore,window.getShell());

+			}

+		}

+		

+	}

+

+	private void showMessage(String message,Shell shell) {

+		MessageBox msgBox = new MessageBox(shell,SWT.ICON_ERROR);

+		msgBox.setText("Error");

+		msgBox.setMessage(message);

+		msgBox.open();

+	}

+		

+	public abstract AbstractSTAnnotatedSourceEditorInput getInput(IFileStore fs);

+	

+	public abstract IFileStore getFileStore();

+}

+

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/actions/OpenFileFullPathAction.java b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/actions/OpenFileFullPathAction.java
new file mode 100644
index 0000000..85cb88f
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/actions/OpenFileFullPathAction.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2009 STMicroelectronics.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.actions;
+
+import org.eclipse.core.filesystem.EFS;
+import org.eclipse.core.filesystem.IFileStore;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.AbstractSTAnnotatedSourceEditorInput;
+
+
+public abstract class OpenFileFullPathAction extends AbstractOpenSourceFileAction {
+	private String filepath;
+	public OpenFileFullPathAction(String filepath, long ts) {
+		super(filepath, ts);
+		this.filepath = filepath;
+	}
+
+	public abstract AbstractSTAnnotatedSourceEditorInput getInput(IFileStore fs);
+
+	public IFileStore getFileStore(){
+		return 	EFS.getLocalFileSystem().getStore(new Path(filepath));
+	}
+
+}
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/actions/OpenWksRelFilePathAction.java b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/actions/OpenWksRelFilePathAction.java
new file mode 100644
index 0000000..a6dce5c
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/actions/OpenWksRelFilePathAction.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2009 STMicroelectronics.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.actions;
+
+import java.io.File;
+
+import org.eclipse.core.filesystem.EFS;
+import org.eclipse.core.filesystem.IFileStore;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.AbstractSTAnnotatedSourceEditorInput;
+import org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.STAnnotatedSourceEditorActivator;
+
+
+
+public abstract class OpenWksRelFilePathAction extends AbstractOpenSourceFileAction {
+	private String filepath;
+	
+	public OpenWksRelFilePathAction(String filepath, long ts) {
+		super(filepath, ts);
+		
+		this.filepath = filepath;
+	}
+
+	@Override
+	public abstract AbstractSTAnnotatedSourceEditorInput getInput(IFileStore fs);
+	
+	public IFileStore getFileStore(){
+		 File file = new File(filepath);
+	        IFile f = null;
+	        if (!file.isAbsolute())
+	        {
+	            IWorkspace workspace = ResourcesPlugin.getWorkspace();
+	            if (workspace != null) {
+	                IWorkspaceRoot wrkRoot = workspace.getRoot();
+	                f = wrkRoot.getFile(new Path(filepath));
+	                IPath p = f.getLocation();
+	                if (p != null) file = p.toFile();
+	            }
+	            try {
+					IFileStore fs =  EFS.getStore(file.toURI());
+					return fs;
+				} catch (CoreException e) {
+					STAnnotatedSourceEditorActivator.getDefault().getLog().log(e.getStatus());
+				}
+	        }
+	        return null;
+	}
+
+}
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/hyperlink/ISTAnnotationHyperlink.java b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/hyperlink/ISTAnnotationHyperlink.java
new file mode 100644
index 0000000..95dad66
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/hyperlink/ISTAnnotationHyperlink.java
@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * Copyright (c) 2009 STMicroelectronics.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.hyperlink;
+
+public interface ISTAnnotationHyperlink {
+	boolean isAnnotationHyperlink(int line);
+	void handleHyperlink(int line);
+}
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/preferencespages/STAnnotatedSourceEditorPreferencePage.java b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/preferencespages/STAnnotatedSourceEditorPreferencePage.java
new file mode 100644
index 0000000..23fd2d9
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/src/org/eclipse/linuxtools/dataviewers/annotatedsourceeditor/preferencespages/STAnnotatedSourceEditorPreferencePage.java
@@ -0,0 +1,59 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation

+ *******************************************************************************/

+

+package org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.preferencespages;

+

+import org.eclipse.jface.preference.PreferencePage;

+import org.eclipse.jface.resource.ImageDescriptor;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Control;

+import org.eclipse.ui.IWorkbench;

+import org.eclipse.ui.IWorkbenchPreferencePage;

+

+public class STAnnotatedSourceEditorPreferencePage extends PreferencePage

+		implements IWorkbenchPreferencePage {

+	

+	/**

+	 * A named preference that controls if the line number ruler is shown in the UI

+	 * (value <code>"lineNumberRuler"</code>).

+	 * <p>

+	 * The preference value is of type <code>Boolean</code>.

+	 * </p>

+	 */

+	public final static String EDITOR_ST_RULER= "STRuler"; //$NON-NLS-1$

+

+	public STAnnotatedSourceEditorPreferencePage() {

+		// TODO Auto-generated constructor stub

+	}

+

+	public STAnnotatedSourceEditorPreferencePage(String title) {

+		super(title);

+		// TODO Auto-generated constructor stub

+	}

+

+	public STAnnotatedSourceEditorPreferencePage(String title,

+			ImageDescriptor image) {

+		super(title, image);

+		// TODO Auto-generated constructor stub

+	}

+

+	@Override

+	protected Control createContents(Composite parent) {

+		// TODO Auto-generated method stub

+		return null;

+	}

+

+	public void init(IWorkbench workbench) {

+		// TODO Auto-generated method stub

+

+	}

+

+}

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/.classpath b/gcov/org.eclipse.linuxtools.dataviewers.charts/.classpath
new file mode 100755
index 0000000..8a8f166
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/.project b/gcov/org.eclipse.linuxtools.dataviewers.charts/.project
new file mode 100755
index 0000000..70e988c
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.dataviewers.charts</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/META-INF/MANIFEST.MF b/gcov/org.eclipse.linuxtools.dataviewers.charts/META-INF/MANIFEST.MF
new file mode 100755
index 0000000..ea57dcd
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/META-INF/MANIFEST.MF
@@ -0,0 +1,26 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.dataviewers.charts;singleton:=true
+Bundle-Version: 4.1.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.dataviewers.charts.Activator
+Bundle-Vendor: %bundleProvider
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.linuxtools.dataviewers;bundle-version="4.0.0",
+ org.eclipse.birt.core;bundle-version="2.5.1",
+ org.eclipse.birt.chart.ui;bundle-version="2.5.1",
+ org.eclipse.birt.data;bundle-version="2.5.1",
+ org.eclipse.birt.data.aggregation;bundle-version="2.5.1",
+ org.eclipse.core.resources;bundle-version="3.4.2"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.linuxtools.dataviewers.charts,
+ org.eclipse.linuxtools.dataviewers.charts.actions,
+ org.eclipse.linuxtools.dataviewers.charts.dataengine,
+ org.eclipse.linuxtools.dataviewers.charts.dialogs,
+ org.eclipse.linuxtools.dataviewers.charts.provider,
+ org.eclipse.linuxtools.dataviewers.charts.view,
+ org.eclipse.linuxtools.dataviewers.charts.viewer
+Import-Package: com.ibm.icu.util;version="4.0.1"
+Bundle-Localization: plugin
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/about.html b/gcov/org.eclipse.linuxtools.dataviewers.charts/about.html
new file mode 100644
index 0000000..0c6525d
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>24th October, 2008</p>	
+<h3>License</h3>
+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<h3>Contributions</h3>
+
+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise
+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such
+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
+
+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or
+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the
+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/build.properties b/gcov/org.eclipse.linuxtools.dataviewers.charts/build.properties
new file mode 100755
index 0000000..8ef30b8
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/build.properties
@@ -0,0 +1,8 @@
+source.. = src/

+output.. = bin/

+bin.includes = .,\

+               META-INF/,\

+               icons/,\

+               plugin.xml,\

+               about.html,\

+               plugin.properties

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/icons/Thumbs.db b/gcov/org.eclipse.linuxtools.dataviewers.charts/icons/Thumbs.db
new file mode 100755
index 0000000..1f91a7a
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/icons/Thumbs.db
Binary files differ
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/icons/chart_icon.png b/gcov/org.eclipse.linuxtools.dataviewers.charts/icons/chart_icon.png
new file mode 100755
index 0000000..67d1a81
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/icons/chart_icon.png
Binary files differ
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/icons/dexport.gif b/gcov/org.eclipse.linuxtools.dataviewers.charts/icons/dexport.gif
new file mode 100644
index 0000000..3f89cd9
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/icons/dexport.gif
Binary files differ
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/icons/dimport.gif b/gcov/org.eclipse.linuxtools.dataviewers.charts/icons/dimport.gif
new file mode 100644
index 0000000..cd44741
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/icons/dimport.gif
Binary files differ
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/icons/eexport.gif b/gcov/org.eclipse.linuxtools.dataviewers.charts/icons/eexport.gif
new file mode 100644
index 0000000..5a0837d
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/icons/eexport.gif
Binary files differ
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/icons/eimport.gif b/gcov/org.eclipse.linuxtools.dataviewers.charts/icons/eimport.gif
new file mode 100644
index 0000000..d38085a
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/icons/eimport.gif
Binary files differ
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/icons/save_chart.gif b/gcov/org.eclipse.linuxtools.dataviewers.charts/icons/save_chart.gif
new file mode 100755
index 0000000..466bfb1
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/icons/save_chart.gif
Binary files differ
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/plugin.properties b/gcov/org.eclipse.linuxtools.dataviewers.charts/plugin.properties
new file mode 100644
index 0000000..22dbecc
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/plugin.properties
@@ -0,0 +1,12 @@
+#******************************************************************************

+# Copyright (c) 2009 STMicroelectronics.

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v10.html

+#

+# Contributors:

+#   STMicroelectronics - initial API and implementation

+#*******************************************************************************

+bundleProvider = Eclipse

+bundleName = Data Viewers Birt Charts Plug-in (Incubation)
\ No newline at end of file
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/plugin.xml b/gcov/org.eclipse.linuxtools.dataviewers.charts/plugin.xml
new file mode 100755
index 0000000..4cfd8e5
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/plugin.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.2"?>

+<plugin>

+   <extension

+         point="org.eclipse.ui.views">

+      <view

+            allowMultiple="true"

+            category="org.eclipse.linuxtools.dataviewers.charts"

+            class="org.eclipse.linuxtools.dataviewers.charts.view.ChartView"

+            icon="icons/chart_icon.png"

+            id="org.eclipse.linuxtools.dataviewers.charts.view"

+            name="Chart View"

+            restorable="true">

+      </view>

+      <category

+            id="org.eclipse.linuxtools.dataviewers.charts"

+            name="Charts">

+      </category>

+   </extension>

+

+</plugin>

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/Activator.java b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/Activator.java
new file mode 100755
index 0000000..0162326
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/Activator.java
@@ -0,0 +1,88 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.dataviewers.charts;

+

+import org.eclipse.jface.resource.ImageDescriptor;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.ui.plugin.AbstractUIPlugin;

+import org.osgi.framework.BundleContext;

+

+/**

+ * The activator class controls the plug-in life cycle

+ */

+public class Activator extends AbstractUIPlugin {

+

+	// The plug-in ID

+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.dataviewers.charts";

+

+	// The shared instance

+	private static Activator plugin;

+	

+	/**

+	 * The constructor

+	 */

+	public Activator() {

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

+	 */

+	public void start(BundleContext context) throws Exception {

+		super.start(context);

+		plugin = this;

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

+	 */

+	public void stop(BundleContext context) throws Exception {

+		plugin = null;

+		super.stop(context);

+	}

+

+	/**

+	 * Returns the shared instance

+	 *

+	 * @return the shared instance

+	 */

+	public static Activator getDefault() {

+		return plugin;

+	}

+	

+	/**

+	 * Returns an image descriptor for the image file at the given

+	 * plug-in relative path

+	 *

+	 * @param path the path

+	 * @return the image descriptor

+	 */

+	public static ImageDescriptor getImageDescriptor(String path) {

+		return imageDescriptorFromPlugin(PLUGIN_ID, path);

+	}

+	

+	/**

+	 * Returns an image from the path

+	 * 

+	 * @param path the path

+	 * @return the image

+	 */

+	public static Image getImage(String path) {

+		Image image = plugin.getImageRegistry().get(path);

+		if (image == null) {

+			image = getImageDescriptor(path).createImage();

+			plugin.getImageRegistry().put(path, image);

+		}

+		return image;

+	}

+

+}

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/ChartConstants.java b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/ChartConstants.java
new file mode 100755
index 0000000..431ecf0
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/ChartConstants.java
@@ -0,0 +1,85 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.dataviewers.charts;

+

+

+/**

+ * A class that handles the constants used by the charts.

+ * 

+ * <br/>

+ * <br/>

+ * It contains:

+ * <ul>

+ * <li>labels used by the chart dialog.</li>

+ * <li>keys and default values used by the dialog settings.</li>

+ * <li>predefined colors used by the charts.</li>

+ * </ul>

+ *

+ */

+public class ChartConstants {

+	

+	/** The section name of the viewer's dialog settings where the chart dialog save its state */

+	public static final String TAG_SECTION_BIRTCHARTS_STATE = "birtcharts_section";

+	/** The key used by the column buttons to save their state. For example the button i will use the key <code>TAG_COLUMN_BUTTON_+i</code> */

+	public static final String TAG_COLUMN_BUTTON_ = "COLUMN_BUTTON_";

+	/** The key used by the bar graph button to save its state */

+	public static final String TAG_BAR_GRAPH_BUTTON = "BAR_GRAPH_BUTTON";

+	/** The key used by the vertical bars button to save its state */

+	public static final String TAG_VERTICAL_BARS_BUTTON = "VERTICAL_BARS_BUTTON";

+	

+	/** The default value of the column buttons */

+	public static final boolean DEFAULT_COLUMN_BUTTON = true;

+	/** The default value of the bar graph button */

+	public static final boolean DEFAULT_BAR_GRAPH_BUTTON = true;

+	/** The default value of the vertical bars button */

+	public static final boolean DEFAULT_VERTICAL_BARS_BUTTON = false;

+	

+	/** The section name of the "save chart as image" action dialog settings */

+	public static final String TAG_SECTION_BIRTCHARTS_SAVEACTION_STATE = "birtcharts_saveasimg_section";

+	/** The key used by the file dialog to save its file name */

+	public static final String TAG_IMG_FILE_NAME = "IMG_FILE_NAME";

+	/** The key used by the file dialog to save its filter path */

+	public static final String TAG_IMG_FILTER_PATH = "IMG_FILTER_PATH";

+	

+	/** The default value of the file dialog file name */

+	public static final String DEFAULT_IMG_FILE_NAME = ".";

+	/** The default value of the file dialog filter path */

+	public static final String DEFAULT_IMG_FILTER_PATH = ".";

+	

+	/** Image extension for jpg format */

+	public static final String EXT_JPG = ".jpg";

+	/** Image extension for jpeg format */

+	public static final String EXT_JPEG = ".jpeg";

+	/** Image extension for png format */

+	public static final String EXT_PNG = ".png";

+	/** Image extension for gif format */

+	public static final String EXT_GIF = ".gif";

+	/** Image extension for svg format */

+	public static final String EXT_SVG = ".svg";

+	/** The file extensions provided by the "save chart as image" file dialog */

+	public static final String[] saveAsImageExt = 

+	{

+		"*"+EXT_JPG,

+		"*"+EXT_JPEG,

+		"*"+EXT_PNG,

+		"*"+EXT_GIF,

+		"*.*"

+	};

+	/** The names associated to the files extensions provided by the "save chart as image" file dialog */

+	public static String[] saveAsImageExtNames =

+	{

+		"JPEG (*.jpg)",

+		"JPEG (*.jpeg)",

+		"PNG (*.png)",

+		"GIF (*.gif)",

+		"All Files (*.*)"

+	};

+}

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/UIHelper.java b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/UIHelper.java
new file mode 100644
index 0000000..1cfc2e3
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/UIHelper.java
@@ -0,0 +1,143 @@
+/*******************************************************************************
+ * Copyright (c) 2005 Actuate Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Actuate Corporation  - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.dataviewers.charts;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * This class has been created to hold methods that provide specific
+ * functionality or services.
+ */
+public final class UIHelper
+{
+
+	/**
+	 * This method returns an URL for a resource given its plugin relative path.
+	 * It is intended to be used to abstract out the usage of the UI as a plugin
+	 * or standalone component when it comes to accessing resources.
+	 * 
+	 * @param sPluginRelativePath
+	 *            The path to the resource relative to the plugin location.
+	 * @return URL representing the location of the resource.
+	 */
+	public static URL getURL( String sPluginRelativePath )
+	{
+		URL url = null;
+		if ( Platform.getExtensionRegistry( ) != null )
+		{
+			try
+			{
+				url = new URL( Activator.getDefault( )
+						.getBundle( )
+						.getEntry( "/" ), sPluginRelativePath ); //$NON-NLS-1$
+			}
+			catch ( MalformedURLException e )
+			{
+				e.printStackTrace( );
+			}
+		}
+		else
+		{
+			try
+			{
+				url = new URL( "file:///" + new File( sPluginRelativePath ).getAbsolutePath( ) ); //$NON-NLS-1$
+			}
+			catch ( MalformedURLException e )
+			{
+				e.printStackTrace( );
+			}
+		}
+
+		return url;
+	}
+
+	private static Image createImage( String sPluginRelativePath )
+	{
+		Image img = null;
+		try
+		{
+			try
+			{
+				img = new Image( Display.getCurrent( ),
+						getURL( sPluginRelativePath ).openStream( ) );
+			}
+			catch ( MalformedURLException e1 )
+			{
+				img = new Image( Display.getCurrent( ),
+						new FileInputStream( getURL( sPluginRelativePath ).toString( ) ) );
+			}
+		}
+		catch ( IOException e )
+		{
+			e.printStackTrace( );
+		}
+
+		// If still can't load, return a dummy image.
+		if ( img == null )
+		{
+			img = new Image( Display.getCurrent( ), 1, 1 );
+		}
+		return img;
+	}
+
+	/**
+	 * This is a convenience method to get an imgIcon from a URL.
+	 * 
+	 * @param sPluginRelativePath
+	 *            The URL for the imgIcon.
+	 * @return The imgIcon represented by the given URL.
+	 * @see #setImageCached( boolean )
+	 */
+	public static Image getImage( String sPluginRelativePath )
+	{
+		ImageRegistry registry = JFaceResources.getImageRegistry( );
+		Image image = registry.get( sPluginRelativePath );
+		if ( image == null )
+		{
+			image = createImage( sPluginRelativePath );
+			registry.put( sPluginRelativePath, image );
+		}
+		return image;
+	}
+
+	/**
+	 * This is a convenience method to get an imgIcon from a URL.
+	 * 
+	 * @param sPluginRelativePath
+	 *            The URL for the imgIcon.
+	 * @return The imgIcon represented by the given URL.
+	 * @see #setImageCached( boolean )
+	 */
+	public static ImageDescriptor getImageDescriptor( String sPluginRelativePath )
+	{
+		ImageRegistry registry = JFaceResources.getImageRegistry( );
+		ImageDescriptor image = registry.getDescriptor( sPluginRelativePath );
+		if ( image == null )
+		{
+			registry.put( sPluginRelativePath,
+					createImage( sPluginRelativePath ) );
+			image = registry.getDescriptor( sPluginRelativePath );
+		}
+		return image;
+	}
+}
\ No newline at end of file
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/ChartAction.java b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/ChartAction.java
new file mode 100755
index 0000000..43cf431
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/ChartAction.java
@@ -0,0 +1,67 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.dataviewers.charts.actions;

+

+import org.eclipse.birt.chart.model.Chart;

+import org.eclipse.jface.action.Action;

+import org.eclipse.jface.viewers.ISelectionChangedListener;

+import org.eclipse.jface.viewers.SelectionChangedEvent;

+import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTViewer;

+import org.eclipse.linuxtools.dataviewers.charts.Activator;

+import org.eclipse.linuxtools.dataviewers.charts.dialogs.ChartDialog;

+import org.eclipse.linuxtools.dataviewers.charts.view.ChartView;

+import org.eclipse.swt.widgets.Shell;

+

+/**

+ * An action that open a chart dialog from an <code>AbstractSTViewer</code>.

+ * 

+ * @see AbstractSTViewer

+ */

+public class ChartAction extends Action {

+	

+	/** The dialog */

+	private ChartDialog dialog;

+	

+	/**

+	 * The constructor.

+	 * 

+	 * @param shell the shell used by the dialog

+	 * @param viewer the viewer inputed to the disalog

+	 */

+	public ChartAction(Shell shell, AbstractSTViewer viewer) {

+		super("Create chart...", Activator.getImageDescriptor("icons/chart_icon.png"));

+		dialog = createDialog(shell, viewer);

+		setEnabled(!viewer.getViewer().getSelection().isEmpty());

+		viewer.getViewer().addSelectionChangedListener(new ISelectionChangedListener() {

+			public void selectionChanged(SelectionChangedEvent event) {

+				setEnabled(!event.getSelection().isEmpty());

+			}

+		});

+	}

+	

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.jface.action.Action#run()

+	 */

+	@Override

+	public void run() {

+		dialog.open();

+		Chart chart = dialog.getValue();

+		if (chart != null) {

+			ChartView.createChartView(chart);

+		

+		}

+	}

+	

+	protected ChartDialog createDialog(Shell shell,AbstractSTViewer viewer){

+		return new ChartDialog(shell,viewer);

+	}

+}

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/ChartActionRenderer.java b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/ChartActionRenderer.java
new file mode 100644
index 0000000..cd47aab
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/ChartActionRenderer.java
@@ -0,0 +1,46 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.dataviewers.charts.actions;

+

+import org.eclipse.birt.chart.render.ActionRendererAdapter;

+import org.eclipse.birt.chart.computation.DataPointHints;

+import org.eclipse.birt.chart.event.StructureSource;

+import org.eclipse.birt.chart.event.StructureType;

+import org.eclipse.birt.chart.model.attribute.ActionType;

+import org.eclipse.birt.chart.model.attribute.TooltipValue;

+import org.eclipse.birt.chart.model.attribute.impl.JavaNumberFormatSpecifierImpl;

+import org.eclipse.birt.chart.model.data.Action;

+

+import com.ibm.icu.util.ULocale;

+

+

+/**

+ * Simple implementation for IActionRenderer

+ */

+public class ChartActionRenderer extends ActionRendererAdapter {

+

+

+ public void processAction( Action action, StructureSource source )

+ {

+	 if ( ActionType.SHOW_TOOLTIP_LITERAL.equals( action.getType( ) ) )

+	 {

+		 TooltipValue tv = (TooltipValue) action.getValue( );

+		 if ( StructureType.SERIES_DATA_POINT.equals( source.getType( ) ) )

+		 {

+			 final DataPointHints dph = (DataPointHints) source.getSource( );

+			 String MyToolTip = "Value is " + 

+			 	JavaNumberFormatSpecifierImpl.create("0.00").format(

+			 			((Double)dph.getOrthogonalValue()).doubleValue(),ULocale.getDefault());

+			 tv.setText( MyToolTip );

+		}

+	 }

+ 	}

+}

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/OpenChartAction.java b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/OpenChartAction.java
new file mode 100644
index 0000000..539ef4c
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/OpenChartAction.java
@@ -0,0 +1,77 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.dataviewers.charts.actions;

+

+import java.io.File;

+import java.io.FileInputStream;

+

+import org.eclipse.birt.chart.model.Chart;

+import org.eclipse.birt.chart.model.Serializer;

+import org.eclipse.birt.chart.model.impl.SerializerImpl;

+import org.eclipse.birt.core.ui.frameworks.taskwizard.WizardBase;

+import org.eclipse.jface.action.Action;

+import org.eclipse.linuxtools.dataviewers.charts.UIHelper;

+import org.eclipse.linuxtools.dataviewers.charts.view.ChartView;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.widgets.FileDialog;

+import org.eclipse.swt.widgets.Shell;

+

+

+

+public class OpenChartAction extends Action {

+	private Chart chart = null;

+	private FileDialog dialog;

+	private ChartView chartView;

+	

+	public OpenChartAction(Shell shell,ChartView cView){

+		setImageDescriptor( UIHelper.getImageDescriptor( "icons/eimport.gif" ) ); 

+		setDisabledImageDescriptor( UIHelper.getImageDescriptor( "icons/dimport.gif" ) );

+		setToolTipText( "Open XML Source" );

+		setEnabled(true);

+		this.chartView = cView;

+		this.dialog = new FileDialog(shell, SWT.OPEN);

+		dialog.setText("Select a chart file ");

+		dialog.setFilterExtensions(new String[]{"*.chart"});

+	}

+	

+	public void run() {

+		String path = dialog.open();

+		

+		if (path == null) {

+			// cancel pressed

+			return;

+		}

+		

+		Serializer serializer = null;

+		final File chartFile = new File( path );

+

+		// Reads the chart model

+		try

+		{

+			serializer = SerializerImpl.instance( );

+			if ( chartFile.exists( ) )

+			{

+				chart = serializer.read( new FileInputStream( chartFile ) );

+				chartView.getChartViewer().setBuffer(null);

+				chartView.setChart(chart);

+			}

+		}

+		catch ( Exception e )

+		{

+			WizardBase.displayException( e );

+		}

+	}

+	

+	public Chart getChart(){

+		return chart;

+	}

+

+}

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/SaveChartAction.java b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/SaveChartAction.java
new file mode 100755
index 0000000..74de88b
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/SaveChartAction.java
@@ -0,0 +1,286 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.dataviewers.charts.actions;

+

+import java.io.File;

+import java.io.IOException;

+

+import org.eclipse.birt.chart.device.IDeviceRenderer;

+import org.eclipse.birt.chart.exception.ChartException;

+import org.eclipse.birt.chart.factory.GeneratedChartState;

+import org.eclipse.birt.chart.factory.Generator;

+import org.eclipse.birt.chart.factory.RunTimeContext;

+import org.eclipse.birt.chart.model.Chart;

+import org.eclipse.birt.chart.model.attribute.Bounds;

+import org.eclipse.birt.chart.model.attribute.impl.BoundsImpl;

+import org.eclipse.birt.chart.util.PluginSettings;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.core.runtime.jobs.Job;

+import org.eclipse.jface.action.Action;

+import org.eclipse.jface.dialogs.IDialogSettings;

+import org.eclipse.jface.dialogs.MessageDialog;

+import org.eclipse.linuxtools.dataviewers.charts.Activator;

+import org.eclipse.linuxtools.dataviewers.charts.ChartConstants;

+import org.eclipse.linuxtools.dataviewers.charts.view.ChartView;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.widgets.FileDialog;

+import org.eclipse.swt.widgets.Shell;

+

+import com.ibm.icu.util.ULocale;

+

+/**

+ * An action to save a chart as an image (jpeg, gif, png)

+ * @author Marzia Maugeri <marzia.maugeri@st.com>

+ */

+public class SaveChartAction extends Action {

+

+	private FileDialog dialog;

+	private Shell shell;

+	private Chart cm;

+	private IDeviceRenderer idr;

+	private Bounds bo;

+	private ChartView chartView;

+	

+	/**

+	 * Constructor

+	 * 

+	 * @param shell the shell used by the dialogs

+	 */

+	public SaveChartAction(Shell shell,ChartView cview) {

+		super("Save chart as...", Activator.getImageDescriptor("icons/save_chart.gif"));

+		this.chartView = cview;

+		this.setEnabled(false);

+		this.shell = shell;

+		this.dialog = new FileDialog(shell, SWT.SAVE);

+		dialog.setFileName(ChartConstants.DEFAULT_IMG_FILE_NAME);

+		dialog.setFilterPath(ChartConstants.DEFAULT_IMG_FILTER_PATH);

+		dialog.setFilterExtensions(ChartConstants.saveAsImageExt);

+		dialog.setFilterNames(ChartConstants.saveAsImageExtNames);

+		dialog.setText("Select an image file (extension will be set to \".jpeg\" if not recognized).");

+		

+		// restore state if there is one saved

+		restoreState();

+	}

+

+	/**

+	 * Sets the image plugins on the chart and enables the action if chart is not null.

+	 * 

+	 * @param chart

+	 */

+	public void setChart(Chart chart) {

+		try {

+			if (chart != null) {

+				setEnabled(true);

+			} else {

+				setEnabled(false);

+			}

+			cm = chart;

+		} catch (Throwable _)

+		{

+			Status s = new Status(

+					Status.ERROR,

+					Activator.PLUGIN_ID,

+					Status.ERROR,

+					"Error when creating \"save as image\" action...",

+					_);

+			Activator.getDefault().getLog().log(s);

+		}

+	}

+	

+	public void setBounds(Bounds bo){

+		this.bo = bo;

+	}

+	

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.jface.action.Action#run()

+	 */

+	public void run() {

+		String path = dialog.open();

+		if (path == null) {

+			// cancel pressed

+			return;

+		}

+

+		String ext = "";

+		

+

+		int dotIdx = path.lastIndexOf(".");

+		if (dotIdx > 0) ext = path.substring(dotIdx);

+		

+		try {

+			if (ext.equals(ChartConstants.EXT_GIF)) {

+				idr = PluginSettings.instance().getDevice("dv.GIF");

+			}

+			else if (ext.equals(ChartConstants.EXT_JPEG)) {

+				idr = PluginSettings.instance().getDevice("dv.JPEG");

+			}

+			else if (ext.equals(ChartConstants.EXT_JPG)) {

+				idr = PluginSettings.instance().getDevice("dv.JPG");

+			}

+			else if (ext.equals(ChartConstants.EXT_PNG)) {

+				idr = PluginSettings.instance().getDevice("dv.PNG");

+			}

+			else {

+				path += ChartConstants.EXT_JPEG;

+				idr = PluginSettings.instance().getDevice("dv.JPG");

+			}

+		

+		} catch (ChartException e) {

+			Status s = new Status(

+					Status.ERROR,

+					Activator.PLUGIN_ID,

+					Status.ERROR,

+					e.getMessage(),

+					e);

+			Activator.getDefault().getLog().log(s);

+		}

+

+		final File file = new File(path);

+		if (file.exists()) {

+			boolean overwrite = 

+				MessageDialog.openQuestion(shell, "Confirm overwrite", "File already exists. Overwrite?");

+			if (overwrite) {

+				file.delete();

+			} else {

+				return;

+			}

+		}

+

+		Job saveAsImage = new Job("Save chart as "+file.getName()) {

+			@Override

+			protected IStatus run(IProgressMonitor monitor) {

+				try {

+					monitor.beginTask("Saving chart as "+file.getName()+"...", IProgressMonitor.UNKNOWN);

+					file.createNewFile();

+					generateImageFile(file);

+					return Status.OK_STATUS;

+				} catch (IOException e) {

+					return new Status(

+							IStatus.ERROR,

+							Activator.PLUGIN_ID,

+							"Error saving chart to \"" 

+							+ file.getAbsolutePath()

+							+ "\":"

+							+ e.getMessage(),

+							e);

+				}

+			}

+		};

+		saveAsImage.setUser(true);

+		saveAsImage.schedule();

+

+		// save the state of the dialog

+		saveState();

+	}

+

+	/**

+	 * Restores the state of this action (file dialog)

+	 */

+	public void restoreState() {

+		try {

+			IDialogSettings settings = 

+				Activator.getDefault().getDialogSettings().getSection(ChartConstants.TAG_SECTION_BIRTCHARTS_SAVEACTION_STATE);

+			if (settings == null) {

+				settings = Activator.getDefault().getDialogSettings().addNewSection(ChartConstants.TAG_SECTION_BIRTCHARTS_SAVEACTION_STATE);

+				return;

+			}

+

+			dialog.setFileName(settings.get(ChartConstants.TAG_IMG_FILE_NAME));

+			dialog.setFilterPath(settings.get(ChartConstants.TAG_IMG_FILTER_PATH));

+		}

+		catch (Exception e) {

+			Status s = new Status(

+					Status.ERROR,

+					Activator.PLUGIN_ID,

+					Status.ERROR,

+					e.getMessage(),

+					e);

+			Activator.getDefault().getLog().log(s);

+		}

+	}

+

+	/**

+	 * Saves the state of this action (file dialog)

+	 */

+	public void saveState() {

+		try {

+			IDialogSettings settings = 

+				Activator.getDefault().getDialogSettings().getSection(ChartConstants.TAG_SECTION_BIRTCHARTS_SAVEACTION_STATE);

+			if (settings == null) {

+				settings = Activator.getDefault().getDialogSettings().addNewSection(ChartConstants.TAG_SECTION_BIRTCHARTS_SAVEACTION_STATE);

+			}

+

+			settings.put(ChartConstants.TAG_IMG_FILE_NAME, dialog.getFileName());

+			settings.put(ChartConstants.TAG_IMG_FILTER_PATH, dialog.getFilterPath());

+		}

+		catch (Exception e) {

+			Status s = new Status(

+					Status.ERROR,

+					Activator.PLUGIN_ID,

+					Status.ERROR,

+					e.getMessage(),

+					e);

+			Activator.getDefault().getLog().log(s);

+		}

+	}

+	

+	protected void generateImageFile(File file){

+		RunTimeContext rtc = new RunTimeContext( );

+		rtc.setULocale( ULocale.getDefault( ) );

+

+		final Generator gr = Generator.instance( );

+		GeneratedChartState gcs = null;

+	

+		Bounds boFile = null;

+		bo = chartView.getChartViewer().getBounds();

+		//Set the chart size

+		if (bo != null){

+			boFile = BoundsImpl.create(bo.getLeft(), bo.getTop(), bo.getWidth(), bo.getHeight());

+		}

+		else{

+			boFile = BoundsImpl.create(0, 0, 800, 600);

+		}

+			

+		

+		try {

+			gcs = gr.build( idr.getDisplayServer( ), cm, boFile, null, rtc, null );

+		} catch (ChartException e) {

+			Status s = new Status(

+					Status.ERROR,

+					Activator.PLUGIN_ID,

+					Status.ERROR,

+					e.getMessage(),

+					e);

+			Activator.getDefault().getLog().log(s);

+		}

+

+		//Specify the file to write to. 

+		idr.setProperty( IDeviceRenderer.FILE_IDENTIFIER, file.getAbsolutePath() );

+

+		//generate the chart

+		try {

+			gr.render( idr, gcs );

+		} catch (ChartException e) {

+			Status s = new Status(

+					Status.ERROR,

+					Activator.PLUGIN_ID,

+					Status.ERROR,

+					e.getMessage(),

+					e);

+			Activator.getDefault().getLog().log(s);

+		}

+	}

+	

+	

+}

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/SaveXMLAction.java b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/SaveXMLAction.java
new file mode 100644
index 0000000..a3c7ca0
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/SaveXMLAction.java
@@ -0,0 +1,132 @@
+/***********************************************************************
+ * Copyright (c) 2004, 2005 Actuate Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Actuate Corporation - initial API and implementation
+ ***********************************************************************/
+
+package org.eclipse.linuxtools.dataviewers.charts.actions;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import org.eclipse.birt.chart.model.Chart;
+import org.eclipse.birt.chart.model.Serializer;
+import org.eclipse.birt.chart.model.impl.SerializerImpl;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.action.Action;
+import org.eclipse.linuxtools.dataviewers.charts.Activator;
+import org.eclipse.linuxtools.dataviewers.charts.UIHelper;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.MessageBox;
+
+public class SaveXMLAction extends Action
+{
+
+	private Composite cmp;
+	private Chart cm;
+
+	public SaveXMLAction( Composite parent )
+	{
+		super( );
+		cmp = parent;
+		setImageDescriptor( UIHelper.getImageDescriptor( "icons/eexport.gif" ) ); 
+		setDisabledImageDescriptor( UIHelper.getImageDescriptor( "icons/dexport.gif" ) );
+		setToolTipText( "Save XML Source" ); 
+		setDescription( "Save XML Source to the designated directory" );
+	}
+
+	/**
+	 * When the action is invoked, pop up a File Dialog to designate the
+	 * directory.
+	 */
+	public void run( )
+	{
+		if ( cm != null )
+		{
+			final FileDialog saveDialog = new FileDialog( cmp.getShell( ),
+					SWT.SAVE );
+			saveDialog.setFilterExtensions( new String[]{
+				"*.chart"} ); //$NON-NLS-1$
+			try
+			{
+				saveDialog.open( );
+				String name = saveDialog.getFileName( );
+				if ( name != null && name != "" ) //$NON-NLS-1$
+				{
+					Serializer serializer = null;
+					final File file = new File( saveDialog.getFilterPath( ),
+							name );
+					if ( file.exists( ) )
+					{
+						MessageBox box = new MessageBox( cmp.getShell( ),
+								SWT.ICON_WARNING | SWT.YES | SWT.NO );
+						box.setText( "Save XML Source"); //$NON-NLS-1$
+						box.setMessage( "The XML source already exists in the directory. \nDo you want to replace it?" ); 
+						if ( box.open( ) != SWT.YES )
+						{
+							return;
+						}
+					}
+
+					serializer = SerializerImpl.instance( );
+					try
+					{
+						serializer.write( cm, new FileOutputStream( file ) );
+						IFile c = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(new Path(file.getAbsolutePath()));
+						if (c != null){
+							try {
+									c.refreshLocal(1, new NullProgressMonitor());
+								} catch (CoreException e) {
+									IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e);
+									Activator.getDefault().getLog().log(status);
+								}
+						}
+						
+					}
+					catch ( IOException ioe )
+					{
+						ioe.printStackTrace( );
+					}
+				}
+			}
+			catch ( Throwable e )
+			{
+				e.printStackTrace( );
+			}
+		}
+	}
+	
+	public void setChart(Chart chart) {
+		try {
+			if (chart != null) {
+				setEnabled(true);
+			} else {
+				setEnabled(false);
+			}
+			cm = chart;
+		} catch (Throwable _)
+		{
+			Status s = new Status(
+					Status.ERROR,
+					Activator.PLUGIN_ID,
+					Status.ERROR,
+					"Error when creating \"save as image\" action...",
+					_);
+			Activator.getDefault().getLog().log(s);
+		}
+	}
+}
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/dataengine/BindDataEngine.java b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/dataengine/BindDataEngine.java
new file mode 100644
index 0000000..a6d2d3a
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/dataengine/BindDataEngine.java
@@ -0,0 +1,364 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Actuate Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Actuate Corporation  - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.dataviewers.charts.dataengine;
+
+import org.eclipse.birt.chart.exception.ChartException;
+import org.eclipse.birt.chart.factory.Generator;
+import org.eclipse.birt.chart.factory.IDataRowExpressionEvaluator;
+import org.eclipse.birt.chart.factory.RunTimeContext;
+import org.eclipse.birt.chart.model.Chart;
+import org.eclipse.birt.chart.model.ChartWithAxes;
+import org.eclipse.birt.chart.model.attribute.AxisType;
+import org.eclipse.birt.chart.model.attribute.IntersectionType;
+import org.eclipse.birt.chart.model.attribute.LegendItemType;
+import org.eclipse.birt.chart.model.attribute.Position;
+import org.eclipse.birt.chart.model.attribute.TickStyle;
+import org.eclipse.birt.chart.model.attribute.impl.ColorDefinitionImpl;
+import org.eclipse.birt.chart.model.component.Axis;
+import org.eclipse.birt.chart.model.component.Series;
+import org.eclipse.birt.chart.model.component.impl.SeriesImpl;
+import org.eclipse.birt.chart.model.data.SeriesDefinition;
+import org.eclipse.birt.chart.model.data.impl.QueryImpl;
+import org.eclipse.birt.chart.model.data.impl.SeriesDefinitionImpl;
+import org.eclipse.birt.chart.model.impl.ChartWithAxesImpl;
+import org.eclipse.birt.chart.model.layout.Legend;
+import org.eclipse.birt.chart.model.layout.Plot;
+import org.eclipse.birt.chart.model.type.BarSeries;
+import org.eclipse.birt.chart.model.type.impl.BarSeriesImpl;
+import org.eclipse.birt.core.archive.IDocArchiveReader;
+import org.eclipse.birt.core.archive.IDocArchiveWriter;
+import org.eclipse.birt.core.data.Constants;
+import org.eclipse.birt.core.data.ExpressionUtil;
+import org.eclipse.birt.core.exception.BirtException;
+import org.eclipse.birt.data.aggregation.api.IBuildInAggregation;
+import org.eclipse.birt.data.engine.api.DataEngine;
+import org.eclipse.birt.data.engine.api.DataEngineContext;
+import org.eclipse.birt.data.engine.api.IGroupDefinition;
+import org.eclipse.birt.data.engine.api.IPreparedQuery;
+import org.eclipse.birt.data.engine.api.IQueryResults;
+import org.eclipse.birt.data.engine.api.querydefn.Binding;
+import org.eclipse.birt.data.engine.api.querydefn.GroupDefinition;
+import org.eclipse.birt.data.engine.api.querydefn.OdaDataSetDesign;
+import org.eclipse.birt.data.engine.api.querydefn.OdaDataSourceDesign;
+import org.eclipse.birt.data.engine.api.querydefn.QueryDefinition;
+import org.eclipse.birt.data.engine.api.querydefn.ScriptExpression;
+import org.eclipse.birt.data.engine.core.DataException;
+import org.eclipse.linuxtools.dataviewers.charts.Activator;
+
+import com.ibm.icu.util.ULocale;
+
+/**
+ * The example demonstrates how chart works with ODA/DtE(BIRT data engine) to
+ * get grouped/aggregated data set, the ODA/DtE is responsible to execute data
+ * query and grouping/aggregation, it returns a grouped data set to chart and
+ * chart retrieve data without grouping/aggregation by chart-self.
+ * <p>
+ * In the example, it only uses flat file as data source, actually it supports
+ * any JDBC data source, referring to {@link org.eclipse.birt.data.engine} to
+ * get detail information.
+ * 
+ * @since 2.3
+ */
+public class BindDataEngine
+{
+	private String[] columnsName = null;
+	private FlatFileDataSource ffds = null;
+	
+	/**
+	 * Create runtime chart model and bind data.
+	 * 
+	 * @return
+	 * @throws ChartException
+	 */
+	public final Chart createWorkingWithBIRTDataEngine(FlatFileDataSource ffds)
+			throws ChartException
+	{
+		this.ffds = ffds;
+		columnsName = ffds.getCOLUMNNAME();
+		String[] expressions = new String[columnsName.length]; 
+		expressions[0] = ExpressionUtil.createRowExpression( columnsName[0] );
+		expressions[1] = ExpressionUtil.createRowExpression( columnsName[1] );
+
+		ChartWithAxes cwaBar = createChartModel( expressions );
+
+		cwaBar = bindData( cwaBar, expressions );
+
+		return cwaBar;
+	}
+
+	/**
+	 * Create chart model.
+	 * 
+	 * @param expressions
+	 *            expressions are used to set category series and value series.
+	 * @return
+	 */
+	private static ChartWithAxes createChartModel( String[] expressions )
+	{
+		ChartWithAxes cwaBar = ChartWithAxesImpl.create( );
+		cwaBar.setType( "Bar Chart" ); 
+		cwaBar.setSubType( "Side-by-side" ); 
+		// Plot
+		cwaBar.getBlock( ).setBackground( ColorDefinitionImpl.WHITE( ) );
+		cwaBar.getBlock( ).getOutline( ).setVisible( true );
+		Plot p = cwaBar.getPlot( );
+		p.getClientArea( ).setBackground( ColorDefinitionImpl.create( 255,
+				255,
+				225 ) );
+
+		// Title
+		cwaBar.getTitle( )
+				.getLabel( )
+				.getCaption( )
+				.setValue( "Working with BIRT Data Engine" ); 
+
+		// Legend
+		Legend lg = cwaBar.getLegend( );
+		lg.setItemType( LegendItemType.CATEGORIES_LITERAL );
+
+		// X-Axis
+		Axis xAxisPrimary = cwaBar.getPrimaryBaseAxes( )[0];
+
+		xAxisPrimary.setType( AxisType.TEXT_LITERAL );
+		xAxisPrimary.getMajorGrid( ).setTickStyle( TickStyle.BELOW_LITERAL );
+		xAxisPrimary.getOrigin( ).setType( IntersectionType.MIN_LITERAL );
+
+		// Y-Axis
+		Axis yAxisPrimary = cwaBar.getPrimaryOrthogonalAxis( xAxisPrimary );
+		yAxisPrimary.getMajorGrid( ).setTickStyle( TickStyle.LEFT_LITERAL );
+		yAxisPrimary.setType( AxisType.LINEAR_LITERAL );
+		yAxisPrimary.getLabel( ).getCaption( ).getFont( ).setRotation( 90 );
+		yAxisPrimary.getTitle( ).setVisible( true );
+		yAxisPrimary.getTitle( ).getCaption( ).setValue( "Customer Amount" ); //$NON-NLS-1$
+		yAxisPrimary.getTitle( )
+				.getCaption( )
+				.setColor( ColorDefinitionImpl.GREEN( ) );
+
+		// X-Series
+		Series seCategory = SeriesImpl.create( );
+		// seCategory.setDataSet( categoryValues );
+
+		// Set category expression.
+		seCategory.getDataDefinition( )
+				.add( QueryImpl.create( expressions[0] ) );
+
+		SeriesDefinition sdX = SeriesDefinitionImpl.create( );
+		sdX.getSeriesPalette( ).shift( 0 );
+
+		xAxisPrimary.getSeriesDefinitions( ).add( sdX );
+		sdX.getSeries( ).add( seCategory );
+
+		// Y-Series
+		BarSeries bs1 = (BarSeries) BarSeriesImpl.create( );
+		bs1.getDataDefinition( ).add( QueryImpl.create( expressions[1] ) );
+		bs1.getLabel( ).setVisible( true );
+		bs1.setLabelPosition( Position.INSIDE_LITERAL );
+
+		SeriesDefinition sdY = SeriesDefinitionImpl.create( );
+		yAxisPrimary.getSeriesDefinitions( ).add( sdY );
+		sdY.getSeries( ).add( bs1 );
+		return cwaBar;
+	}
+
+	/**
+	 * Binds data into chart model.
+	 * 
+	 * @param cwaBar
+	 * @return
+	 * @throws ChartException
+	 */
+	private ChartWithAxes bindData( ChartWithAxes cwaBar,
+			String[] expressions ) throws ChartException
+	{
+
+		RunTimeContext context = new RunTimeContext( );
+		context.setULocale( ULocale.getDefault( ) );
+
+		IDataRowExpressionEvaluator evaluator;
+		try
+		{
+			// Create row expression evaluator for chart doing data binding.
+			evaluator = prepareRowExpressionEvaluator( cwaBar, expressions );
+			
+			// Binding data.
+			Generator.instance( ).bindData( evaluator, cwaBar, context );
+		}
+		catch ( BirtException e )
+		{
+			throw new ChartException( Activator.PLUGIN_ID,
+					ChartException.DATA_BINDING,
+					e );
+		}
+		return cwaBar;
+	}
+
+	/**
+	 * Uses BIRT data engine to do query and wraps data with
+	 * <code>IDataRowExpressionEvaluator</code> for chart doing data binding.
+	 * 
+	 * @return
+	 * @throws BirtException
+	 */
+	private IDataRowExpressionEvaluator prepareRowExpressionEvaluator(
+			ChartWithAxes chart, String[] expressions ) throws BirtException
+	{
+
+		// Initialize data source and data set.
+		OdaDataSourceDesign odaDataSource = newDataSource( );
+		OdaDataSetDesign odaDataSet = newDataSet( odaDataSource );
+
+		// Create query definition.
+		QueryDefinition query = createQueryDefinition( odaDataSet, expressions );
+
+		// Create data engine and execute query.
+		DataEngine dataEngine = newDataEngine( );
+		dataEngine.defineDataSource( odaDataSource );
+		dataEngine.defineDataSet( odaDataSet );
+		IPreparedQuery preparedQuery = dataEngine.prepare( query );
+
+		IQueryResults queryResults = preparedQuery.execute( null );
+
+		// Create row expression evaluator.
+		return new GroupedRowExpressionsEvaluator( queryResults.getResultIterator( ),
+				true );
+	}
+
+	/**
+	 * Create query definition.
+	 * 
+	 * @param odaDataSet
+	 * @param expressions
+	 * @return
+	 * @throws ChartException
+	 */
+	private QueryDefinition createQueryDefinition(
+			OdaDataSetDesign odaDataSet, String[] expressions )
+			throws ChartException
+	{
+
+		QueryDefinition queryDefn = new QueryDefinition( );
+		queryDefn.setDataSetName( odaDataSet.getName( ) );
+
+		try
+		{
+			initDefaultBindings( queryDefn );
+
+			// Add group definitions and aggregation binding.
+			String groupName = "Group_Country"; //$NON-NLS-1$
+			GroupDefinition gd = new GroupDefinition( groupName );
+			gd.setKeyExpression( expressions[0] );
+			gd.setInterval( IGroupDefinition.NO_INTERVAL );
+			gd.setIntervalRange( 0 );
+
+			// Add expression bindings.
+			for ( int i = 0; i < expressions.length; i++ )
+			{
+				String expr = (String) expressions[i];
+				Binding colBinding = new Binding( expr );
+				colBinding.setExpression( new ScriptExpression( expr ) );
+				if ( i == 1 )
+				{
+					colBinding.setExpression( null );
+					colBinding.setAggrFunction( IBuildInAggregation.TOTAL_COUNT_FUNC );
+					colBinding.addAggregateOn( groupName );
+					colBinding.addArgument( new ScriptExpression( expressions[i] ) );
+				}
+
+				queryDefn.addBinding( colBinding );
+			}
+
+			queryDefn.addGroup( gd );
+		}
+		catch ( DataException e )
+		{
+			throw new ChartException( Activator.PLUGIN_ID,
+					ChartException.DATA_BINDING,
+					e );
+		}
+
+		return queryDefn;
+	}
+
+	/**
+	 * Initialize default column bindings for original columns.
+	 * 
+	 * @param queryDefn
+	 * @throws DataException
+	 */
+	private  void initDefaultBindings( QueryDefinition queryDefn )
+			throws DataException
+	{
+
+		for(int i=0;i<columnsName.length;i++){
+			Binding colBinding = new Binding( columnsName[i] );
+			colBinding.setExpression( new ScriptExpression( ExpressionUtil.createDataSetRowExpression( columnsName[i]) ) );
+			queryDefn.addBinding( colBinding );
+		}
+	}
+
+	/**
+	 * Create a new data engine.
+	 * 
+	 * @return
+	 * @throws BirtException
+	 */
+	private static DataEngine newDataEngine( ) throws BirtException
+	{
+		DataEngineContext context = DataEngineContext.newInstance( DataEngineContext.DIRECT_PRESENTATION,null,(IDocArchiveReader) null,(IDocArchiveWriter) null);
+
+		// context.setTmpdir( this.getTempDir( ) );
+		DataEngine myDataEngine = DataEngine.newDataEngine( context );
+		return myDataEngine;
+	}
+
+	/**
+	 * Create a new data set.
+	 * 
+	 * @param dataSourceDesign
+	 * @return
+	 */
+	private OdaDataSetDesign newDataSet(
+			OdaDataSourceDesign dataSourceDesign )
+	{
+		OdaDataSetDesign dataSet = new OdaDataSetDesign( "Data Set1" ); //$NON-NLS-1$
+
+		dataSet.setDataSource( dataSourceDesign.getName( ) );
+		dataSet.setExtensionID( FlatFileDataSource.DATA_SET_TYPE );
+		dataSet.setQueryText( ffds.getQuery() );
+		return dataSet;
+	}
+
+	/**
+	 * Create a new data source.
+	 * 
+	 * @return
+	 * @throws BirtException
+	 */
+	private OdaDataSourceDesign newDataSource( ) throws BirtException
+	{
+		OdaDataSourceDesign dataSource = new OdaDataSourceDesign( "Data Source1" ); //$NON-NLS-1$
+		dataSource.setExtensionID( FlatFileDataSource.DATA_SOURCE_TYPE );
+		dataSource.addPrivateProperty( "HOME", ffds.HOME ); //$NON-NLS-1$
+		dataSource.addPrivateProperty( "CHARSET", FlatFileDataSource.CHARSET ); //$NON-NLS-1$
+		dataSource.addPrivateProperty( "DELIMTYPE", //$NON-NLS-1$
+				FlatFileDataSource.DELIMTYPE );
+		dataSource.addPrivateProperty( "INCLTYPELINE", //$NON-NLS-1$
+				FlatFileDataSource.INCLTYPELINE );
+		dataSource.addPrivateProperty( Constants.ODA_PROP_CONFIGURATION_ID,
+				dataSource.getExtensionID( )
+						+ Constants.ODA_PROP_CONFIG_KEY_SEPARATOR
+						+ dataSource.getName( ) );
+
+		return dataSource;
+	}
+	
+
+}
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/dataengine/FlatFileDataSource.java b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/dataengine/FlatFileDataSource.java
new file mode 100644
index 0000000..c48cb3d
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/dataengine/FlatFileDataSource.java
@@ -0,0 +1,70 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.dataviewers.charts.dataengine;

+

+/**

+ * Resource of flat file data.

+ */

+public class FlatFileDataSource {

+		static final String DATA_SOURCE_TYPE = "org.eclipse.datatools.connectivity.oda.flatfile"; 

+		static final String DATA_SET_TYPE = "org.eclipse.datatools.connectivity.oda.flatfile.dataSet"; 

+		static final String CHARSET = "UTF-8"; 

+		static final String DELIMTYPE = "TAB"; 

+		static final String INCLTYPELINE = "NO"; 

+		protected String HOME = null;

+	

+		protected String dataFile = "";

+		protected String query = ""; 

+		protected String[] columnsName = null;

+		

+		public FlatFileDataSource(){

+		}

+				

+		public FlatFileDataSource(String HOME,String dataFile,String query,String[] columns){

+			this.HOME = HOME;

+			this.dataFile = dataFile;

+			this.query = query;

+			this.columnsName = columns;

+		}

+		

+		protected void setHOME_VARIABLE(String home){

+			HOME = home;

+		}

+		

+		protected String getHOME(){

+			return HOME;

+		}

+		

+		protected void setDataFile(String fileName){

+			dataFile = fileName;

+		}

+		

+		protected String getDataFile(){

+			return dataFile; 

+		}

+		

+		protected void setQuery(String query){

+			this.query = query;

+		}

+		

+		protected String getQuery(){

+			return query;

+		}

+		

+		protected String[] getCOLUMNNAME(){

+			return columnsName;

+		}

+		

+		protected void setCOLUMNName(String[] cn){

+			columnsName = cn;

+		}

+

+}

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/dataengine/FlatFileDataSourceFactory.java b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/dataengine/FlatFileDataSourceFactory.java
new file mode 100644
index 0000000..5f5d4a8
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/dataengine/FlatFileDataSourceFactory.java
@@ -0,0 +1,40 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.dataviewers.charts.dataengine;

+

+public class FlatFileDataSourceFactory {

+	public FlatFileDataSourceFactory(){

+	}

+	

+	public String createHomeVariable(){

+		return null;

+	}

+	

+	public String createFileName(){

+		return null;

+		

+	}

+	

+	public String createQuery(){

+		return null;

+		

+	}

+	

+	public String[] createColumns(){

+		return null;

+	}

+	

+	public FlatFileDataSource createFlatFileDataSource(){

+		return new FlatFileDataSource(createHomeVariable(),createFileName(),createQuery(),createColumns());

+	}

+	

+	

+}

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/dataengine/GroupedRowExpressionsEvaluator.java b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/dataengine/GroupedRowExpressionsEvaluator.java
new file mode 100644
index 0000000..b56d135
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/dataengine/GroupedRowExpressionsEvaluator.java
@@ -0,0 +1,280 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Actuate Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Actuate Corporation  - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.dataviewers.charts.dataengine;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.birt.chart.exception.ChartException;
+import org.eclipse.birt.chart.factory.AbstractGroupedDataRowExpressionEvaluator;
+import org.eclipse.birt.chart.log.ILogger;
+import org.eclipse.birt.chart.log.Logger;
+import org.eclipse.birt.core.exception.BirtException;
+import org.eclipse.birt.data.engine.api.IGroupDefinition;
+import org.eclipse.birt.data.engine.api.IResultIterator;
+
+/**
+ * The class implements an evaluator to retrieve grouped row data.
+ * @since 2.3
+ */
+public class GroupedRowExpressionsEvaluator extends
+		AbstractGroupedDataRowExpressionEvaluator
+{
+
+	private static ILogger sLogger = Logger.getLogger( "org.eclipse.birt.chart.examples/trace" ); //$NON-NLS-1$
+
+	private IResultIterator fResultIterator;
+
+	private boolean fIsGrouped = false;
+
+	private int fGroupCount;
+
+	private List[] faGroupBreaks;
+
+	private int fCountOfAvaiableRows = 0;
+
+	private boolean fHasAggregation = false;
+
+	/**
+	 * Constructor.
+	 * 
+	 * @param resultSet
+	 * @param hasAggregation
+	 * @param cm
+	 * @throws ChartException
+	 */
+	public GroupedRowExpressionsEvaluator( IResultIterator resultIterator,
+			boolean hasAggregation ) throws ChartException
+	{
+		fHasAggregation = hasAggregation;
+
+		fResultIterator = resultIterator;
+		List<IGroupDefinition> groupDefinitions = fResultIterator.getQueryResults( )
+				.getPreparedQuery( )
+				.getReportQueryDefn( )
+				.getGroups( );
+		if ( groupDefinitions != null && groupDefinitions.size( ) > 0 )
+		{
+			fIsGrouped = true;
+			fGroupCount = groupDefinitions.size( );
+
+			faGroupBreaks = new List[groupDefinitions.size( )];
+			for ( int i = 0; i < faGroupBreaks.length; i++ )
+			{
+				faGroupBreaks[i] = new ArrayList( );
+			}
+		}
+	}
+
+	/**
+	 * Get list of group breaks, the group level is base on 0th index, 0 index
+	 * means outermost group.
+	 * 
+	 * @param groupLevel
+	 * @return
+	 */
+	private List getGroupBreaksList( int groupLevel )
+	{
+		if ( faGroupBreaks == null
+				|| groupLevel < 0
+				|| groupLevel > ( faGroupBreaks.length - 1 ) )
+		{
+			return new ArrayList( );
+		}
+
+		return faGroupBreaks[groupLevel];
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.birt.chart.factory.IGroupedDataResultSet#getGroupBreaks(int)
+	 */
+	public int[] getGroupBreaks( int groupLevel )
+	{
+		Object[] breaksArray = getGroupBreaksList( groupLevel ).toArray( );
+		int[] breaks = new int[breaksArray.length];
+		for ( int i = 0; i < breaksArray.length; i++ )
+		{
+			breaks[i] = ( (Integer) breaksArray[i] ).intValue( );
+		}
+		return breaks;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.birt.chart.factory.IDataRowExpressionEvaluator#close()
+	 */
+	public void close( )
+	{
+		try
+		{
+			fResultIterator.close( );
+		}
+		catch ( BirtException e )
+		{
+			sLogger.log( e );
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.birt.chart.factory.IDataRowExpressionEvaluator#evaluate(java.lang.String)
+	 */
+	public Object evaluate( String expression )
+	{
+		try
+		{
+			// Here, the expression should be binding name.
+			return fResultIterator.getValue( expression );
+		}
+		catch ( BirtException e )
+		{
+			sLogger.log( e );
+		}
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.birt.chart.factory.IDataRowExpressionEvaluator#evaluateGlobal(java.lang.String)
+	 */
+	public Object evaluateGlobal( String expression )
+	{
+		return evaluate( expression );
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.birt.chart.factory.IDataRowExpressionEvaluator#first()
+	 */
+	public boolean first( )
+	{
+		try
+		{
+			fCountOfAvaiableRows = 0;
+
+			if ( !fIsGrouped )
+			{
+				if ( fResultIterator.next( ) )
+				{
+					return true;
+				}
+			}
+			else
+			{
+				if ( findFirst( ) )
+				{
+					return true;
+				}
+			}
+		}
+		catch ( BirtException e )
+		{
+			sLogger.log( e );
+		}
+		return false;
+	}
+
+	/**
+	 * Find the first row position.
+	 * 
+	 * @return
+	 * @throws BirtException
+	 */
+	private boolean findFirst( ) throws BirtException
+	{
+		if ( !fResultIterator.next( ) )
+		{
+			return false;
+		}
+
+		int groupLevel = fResultIterator.getStartingGroupLevel( );
+		if ( groupLevel == 0 ) // It means the start of current row data.
+		{
+			return true;
+		}
+		else
+		{
+			return findFirst( );
+		}
+	}
+
+	/**
+	 * Find next available row position. If it has grouped-enabled, should
+	 * ignore non-grouped/non-aggregation row.
+	 * 
+	 * @return
+	 * @throws BirtException
+	 */
+	private boolean findNext( ) throws BirtException
+	{
+		while ( fResultIterator.next( ) )
+		{
+			int startIndex = fResultIterator.getStartingGroupLevel( );
+			if ( startIndex > 0 && startIndex <= fGroupCount )
+			{
+				fCountOfAvaiableRows++;
+				// Add break point to current grouping.
+				getGroupBreaksList( startIndex - 1 ).add( new Integer( fCountOfAvaiableRows ) );
+				// Also the sub-groupings of current grouping should be
+				// added the break point.
+				for ( int i = startIndex; i < fGroupCount; i++ )
+				{
+					getGroupBreaksList( i ).add( new Integer( fCountOfAvaiableRows ) );
+				}
+
+				return true;
+			}
+
+			if ( !fHasAggregation )
+			{
+				fCountOfAvaiableRows++;
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.birt.chart.factory.IDataRowExpressionEvaluator#next()
+	 */
+	public boolean next( )
+	{
+		try
+		{
+			if ( !fIsGrouped )
+			{
+				if ( fResultIterator.next( ) )
+				{
+					fCountOfAvaiableRows++;
+					return true;
+				}
+			}
+			else
+			{
+				return findNext( );
+			}
+		}
+		catch ( BirtException e )
+		{
+			sLogger.log( e );
+		}
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/dialogs/ChartDialog.java b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/dialogs/ChartDialog.java
new file mode 100755
index 0000000..76be33e
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/dialogs/ChartDialog.java
@@ -0,0 +1,427 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.dataviewers.charts.dialogs;

+

+import java.util.ArrayList;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.birt.chart.model.Chart;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.dialogs.IDialogConstants;

+import org.eclipse.jface.dialogs.IDialogSettings;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.jface.viewers.StructuredSelection;

+import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTViewer;

+import org.eclipse.linuxtools.dataviewers.abstractviewers.ISTDataViewersField;

+import org.eclipse.linuxtools.dataviewers.charts.Activator;

+import org.eclipse.linuxtools.dataviewers.charts.ChartConstants;

+import org.eclipse.linuxtools.dataviewers.charts.provider.ChartFactory;

+import org.eclipse.linuxtools.dataviewers.charts.provider.IChartField;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.events.SelectionAdapter;

+import org.eclipse.swt.events.SelectionEvent;

+import org.eclipse.swt.events.SelectionListener;

+import org.eclipse.swt.layout.FillLayout;

+import org.eclipse.swt.layout.GridData;

+import org.eclipse.swt.layout.GridLayout;

+import org.eclipse.swt.layout.RowLayout;

+import org.eclipse.swt.widgets.Button;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Control;

+import org.eclipse.swt.widgets.Group;

+import org.eclipse.swt.widgets.Label;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.swt.widgets.Text;

+

+/**

+ * The dialog used to customize the chart before cerating it.

+ */

+public class ChartDialog  extends Dialog {

+	

+	private final AbstractSTViewer stViewer;

+	private Chart chart;

+	

+	private Text errorMessageText;

+	private Button verticalBarsButton;

+	private Button pieChartButton;

+	private Button barGraphButton;

+	private Button okButton;

+	private List<Button> columnButtons;

+	

+	/**

+	 * The constructor

+	 * 

+	 * @param shell

+	 * @param stViewer

+	 */

+	public ChartDialog(Shell shell, AbstractSTViewer stViewer)

+	{

+		super(shell);

+		this.stViewer = stViewer;

+	}

+	

+	/**

+	 * Restores the state of this dialog

+	 */

+	public void restoreState() {

+		try {

+			IDialogSettings settings = 

+				stViewer.getViewerSettings().getSection(ChartConstants.TAG_SECTION_BIRTCHARTS_STATE);

+			if (settings == null) {

+				settings = stViewer.getViewerSettings().addNewSection(ChartConstants.TAG_SECTION_BIRTCHARTS_STATE);

+				return;

+			}

+			

+			for (int i=0; i<columnButtons.size(); i++) {

+				boolean selected = Boolean.parseBoolean(settings.get(ChartConstants.TAG_COLUMN_BUTTON_+i));

+				columnButtons.get(i).setSelection(selected);

+			}

+			

+			boolean barGraph = Boolean.parseBoolean(settings.get(ChartConstants.TAG_BAR_GRAPH_BUTTON));

+			barGraphButton.setSelection(barGraph);

+			pieChartButton.setSelection(!barGraph);

+			

+			boolean vBars = Boolean.parseBoolean(settings.get(ChartConstants.TAG_VERTICAL_BARS_BUTTON));

+			verticalBarsButton.setSelection(vBars);

+			verticalBarsButton.setEnabled(barGraph);

+		}

+		catch (Exception e) {}

+	}

+	

+	/**

+	 * Saves the state of this dialog

+	 */

+	public void saveState() {

+		try {

+			IDialogSettings settings = 

+				stViewer.getViewerSettings().getSection(ChartConstants.TAG_SECTION_BIRTCHARTS_STATE);

+			if (settings == null) {

+				settings = stViewer.getViewerSettings().addNewSection(ChartConstants.TAG_SECTION_BIRTCHARTS_STATE);

+			}

+			

+			for (int i=0; i<columnButtons.size(); i++) {

+				boolean selected = columnButtons.get(i).getSelection();

+				settings.put(ChartConstants.TAG_COLUMN_BUTTON_+i, selected);

+			}

+			

+			boolean barGraph = barGraphButton.getSelection();

+			settings.put(ChartConstants.TAG_BAR_GRAPH_BUTTON, barGraph);

+			

+			boolean vBars = verticalBarsButton.getSelection();

+			settings.put(ChartConstants.TAG_VERTICAL_BARS_BUTTON, vBars);

+		}

+		catch (Exception e) {}

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)

+	 */

+	@Override

+	protected void configureShell(Shell newShell) {

+		super.configureShell(newShell);

+		newShell.setText("Create chart from selection...");

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int)

+	 */

+	@Override

+	protected void buttonPressed(int buttonId) {

+		if (buttonId == IDialogConstants.OK_ID) {

+			chart = produceChart();

+			saveState();

+		} else {

+			chart = null;

+		}

+		super.buttonPressed(buttonId);

+	}

+	

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)

+	 */

+	@Override

+	protected void createButtonsForButtonBar(Composite parent) {

+		// create OK and Cancel buttons by default

+		okButton = createButton(parent, IDialogConstants.OK_ID,

+				IDialogConstants.OK_LABEL, true);

+		createButton(parent, IDialogConstants.CANCEL_ID,

+				IDialogConstants.CANCEL_LABEL, false);

+	}

+	

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.jface.dialogs.Dialog#createContents(org.eclipse.swt.widgets.Composite)

+	 */

+	@Override

+	protected Control createContents(Composite parent) {

+		Control c = super.createContents(parent);

+		this.validateInput();

+		return c;

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)

+	 */

+	@Override

+	protected Control createDialogArea(Composite parent) {

+		Composite composite = (Composite)super.createDialogArea(parent);

+		

+		Composite titleComp = new Composite(composite, SWT.NONE);

+		titleComp.setLayout(new RowLayout(SWT.HORIZONTAL));

+

+		Label icon = new Label(titleComp, SWT.NONE);

+		icon.setImage(Activator.getImage("icons/chart_icon.png"));

+

+		Label label = new Label(titleComp, SWT.WRAP);

+		label.setText("Chart builder");

+		GridData data = new GridData(GridData.GRAB_HORIZONTAL

+				| GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL

+				| GridData.VERTICAL_ALIGN_CENTER);

+		data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);

+		titleComp.setLayoutData(data);

+

+		Group chartTypeGroup = new Group(composite, SWT.NONE);

+		data = new GridData(GridData.GRAB_HORIZONTAL

+				| GridData.HORIZONTAL_ALIGN_FILL);

+		chartTypeGroup.setLayoutData(data);

+		chartTypeGroup.setLayout(new GridLayout(2, false));

+		chartTypeGroup.setText("Select your chart type");

+

+		ValidateSelectionListener listener = new ValidateSelectionListener();

+

+		barGraphButton = new Button(chartTypeGroup, SWT.RADIO);

+		barGraphButton.setText("Bar graph");

+		barGraphButton.addSelectionListener(listener);

+		barGraphButton.addSelectionListener(new SelectionAdapter() {

+			@Override

+			public void widgetSelected(SelectionEvent e) {

+				verticalBarsButton.setEnabled(barGraphButton.getSelection());

+			}

+		});

+		data = new GridData();

+		barGraphButton.setLayoutData(data);

+		

+		verticalBarsButton = new Button(chartTypeGroup, SWT.CHECK);

+		verticalBarsButton.setText("Vertical bars");

+		data = new GridData();

+		verticalBarsButton.setLayoutData(data);

+

+		pieChartButton = new Button(chartTypeGroup, SWT.RADIO);

+		pieChartButton.setText("Pie chart");

+		pieChartButton.addSelectionListener(listener);

+		data = new GridData();

+		data.horizontalSpan = 2;

+		pieChartButton.setLayoutData(data);

+

+		Group chartColumnGroup = new Group(composite, SWT.NONE);

+		chartColumnGroup.setLayout(new GridLayout(1,true));

+		data = new GridData(GridData.GRAB_HORIZONTAL

+				| GridData.HORIZONTAL_ALIGN_FILL);

+		chartColumnGroup.setLayoutData(data);

+		chartColumnGroup.setText("Select the columns(s) to show");

+

+		addColumnButtons(chartColumnGroup, listener);

+

+		errorMessageText = new Text(composite, SWT.READ_ONLY);

+		errorMessageText.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL

+				| GridData.HORIZONTAL_ALIGN_FILL));

+		errorMessageText.setBackground(errorMessageText.getDisplay()

+				.getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));

+

+		applyDialogFont(composite);

+		

+		setWidgetsValues();

+		

+		return composite;

+	}

+	

+	/**

+	 * Sets the widgets values

+	 */

+	private void setWidgetsValues() {

+		// set default values

+		barGraphButton.setSelection(ChartConstants.DEFAULT_BAR_GRAPH_BUTTON);

+		verticalBarsButton.setEnabled(barGraphButton.getSelection());

+		verticalBarsButton.setSelection(ChartConstants.DEFAULT_VERTICAL_BARS_BUTTON);

+		for (Button button : columnButtons) {

+			button.setSelection(ChartConstants.DEFAULT_COLUMN_BUTTON);

+		}

+		

+		// restore state if there is one saved

+		restoreState();

+	}

+	

+	/**

+	 * Adds one check button for each column implementing the IChartField interface.

+	 * 

+	 * @see IChartField

+	 * @param comp

+	 * @param listener

+	 */

+	private void addColumnButtons(Composite comp, SelectionListener listener)

+	{

+		columnButtons = new LinkedList<Button>();

+		for (ISTDataViewersField field : stViewer.getAllFields())

+		{

+			if (field instanceof IChartField) {

+				IChartField cField = (IChartField)field;

+				Button b = new Button(comp,SWT.CHECK);

+				b.setText(cField.getColumnHeaderText());

+				b.setData(cField);

+				b.addSelectionListener(listener);

+				GridData dt = new GridData();

+				b.setLayoutData(dt);

+				columnButtons.add(b);

+			}

+		}

+

+		Label sep = new Label(comp, SWT.SEPARATOR|SWT.HORIZONTAL);

+		GridData data = new GridData(GridData.GRAB_HORIZONTAL

+				| GridData.HORIZONTAL_ALIGN_FILL);

+		sep.setLayoutData(data);

+		Composite buttonComposite = new Composite(comp,SWT.NONE);

+		data = new GridData();

+		buttonComposite.setLayoutData(data);

+		FillLayout l = new FillLayout();

+		l.spacing = 5;

+		buttonComposite.setLayout(l);

+

+		final Button b1 = new Button(buttonComposite, SWT.PUSH);

+		b1.setText("Select all");

+		final Button b2 = new Button(buttonComposite, SWT.PUSH);

+		b2.setText("Deselect all");

+		SelectionListener sl = new SelectionListener() {

+			public void widgetDefaultSelected(SelectionEvent e)

+			{

+				widgetSelected(e);

+			}

+

+			public void widgetSelected(SelectionEvent e)

+			{

+				boolean b = (e.getSource() == b1);

+				for (Button button : columnButtons) {

+					button.setSelection(b);

+				}

+				validateInput();

+			}

+		};

+		b1.addSelectionListener(sl);

+		b2.addSelectionListener(sl);

+	}

+

+	/**

+	 * Returns the Chart built by this dialog

+	 * 

+	 * @return the chart

+	 */

+	public Chart getValue() {

+		return chart;

+	}

+

+	/**

+	 * Validates the input.

+	 * <p>

+	 * The default implementation of this framework method delegates the request

+	 * to the supplied input validator object; if it finds the input invalid,

+	 * the error message is displayed in the dialog's message line. This hook

+	 * method is called whenever the text changes in the input field.

+	 * </p>

+	 */

+	protected void validateInput() {

+		String errorMessage = null;

+		

+		int selectedNum = 0;

+		for (Button button : columnButtons) {

+			if (button.getSelection()) selectedNum++;

+		}

+		

+		if (selectedNum == 0)

+		{

+			errorMessage = "No column selected";

+		}

+		/*else if (pieChartButton.getSelection() && selectedNum != 1)

+		{

+			errorMessage = "PieChart: Please select only one column";

+		}*/

+

+		// Bug 16256: important not to treat "" (blank error) the same as null

+		// (no error)

+		setErrorMessage(errorMessage);

+	}

+

+	/**

+	 * Sets or clears the error message.

+	 * If not <code>null</code>, the OK button is disabled.

+	 * 

+	 * @param errorMessage

+	 *            the error message, or <code>null</code> to clear

+	 * @since 3.0

+	 */

+	public void setErrorMessage(String errorMessage) {

+		errorMessageText.setText(errorMessage == null ? "" : errorMessage); //$NON-NLS-1$

+		okButton.setEnabled(errorMessage == null);

+		errorMessageText.getParent().update();

+	}

+

+	/**

+	 * Build the chart from configuration

+	 * 

+	 * @return a new chart

+	 */

+	private Chart produceChart()

+	{	

+		IStructuredSelection selection = (IStructuredSelection)stViewer.getViewer().getSelection();

+		if (selection == StructuredSelection.EMPTY) return null;

+		Object[] objects = selection.toArray();

+		

+		ISTDataViewersField labelField = getLabelField(stViewer);

+

+		

+		List<IChartField> selectedFields = new ArrayList<IChartField>();

+		for (Button button : columnButtons) {

+			if (button.getSelection()) {

+				selectedFields.add((IChartField)button.getData());

+			}

+		}

+		boolean barChartType = barGraphButton.getSelection();

+		boolean horizontalBars = !verticalBarsButton.getSelection();

+		

+		if (barChartType) {

+			return ChartFactory.produceBarChart(objects, labelField, selectedFields, getBarChartTitle(),horizontalBars);

+		}

+		else {

+			return ChartFactory.producePieChart(objects, labelField, selectedFields);

+		}

+	}

+

+	private class ValidateSelectionListener extends SelectionAdapter

+	{

+		public void widgetSelected(SelectionEvent e) {

+			validateInput();

+		}

+	};

+	

+	/**

+	 * @param viewer

+	 * @return the field used to provide the labels to the series

+	 */

+	protected ISTDataViewersField getLabelField(AbstractSTViewer viewer) {

+		return viewer.getAllFields()[0];

+	}

+	

+	protected String getBarChartTitle(){

+		return "Bar Chart";

+	}

+}
\ No newline at end of file
diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/ChartFactory.java b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/ChartFactory.java
new file mode 100755
index 0000000..89b0310
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/ChartFactory.java
@@ -0,0 +1,251 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.dataviewers.charts.provider;

+

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.birt.chart.model.Chart;

+import org.eclipse.birt.chart.model.ChartWithAxes;

+import org.eclipse.birt.chart.model.ChartWithoutAxes;

+import org.eclipse.birt.chart.model.attribute.ActionType;

+import org.eclipse.birt.chart.model.attribute.AxisType;

+import org.eclipse.birt.chart.model.attribute.ChartDimension;

+import org.eclipse.birt.chart.model.attribute.IntersectionType;

+import org.eclipse.birt.chart.model.attribute.Position;

+import org.eclipse.birt.chart.model.attribute.TickStyle;

+import org.eclipse.birt.chart.model.attribute.TriggerCondition;

+import org.eclipse.birt.chart.model.attribute.impl.ColorDefinitionImpl;

+import org.eclipse.birt.chart.model.attribute.impl.GradientImpl;

+import org.eclipse.birt.chart.model.attribute.impl.TooltipValueImpl;

+import org.eclipse.birt.chart.model.component.Axis;

+import org.eclipse.birt.chart.model.component.Series;

+import org.eclipse.birt.chart.model.component.impl.SeriesImpl;

+import org.eclipse.birt.chart.model.data.NumberDataSet;

+import org.eclipse.birt.chart.model.data.SeriesDefinition;

+import org.eclipse.birt.chart.model.data.TextDataSet;

+import org.eclipse.birt.chart.model.data.Trigger;

+import org.eclipse.birt.chart.model.data.impl.ActionImpl;

+import org.eclipse.birt.chart.model.data.impl.NumberDataSetImpl;

+import org.eclipse.birt.chart.model.data.impl.SeriesDefinitionImpl;

+import org.eclipse.birt.chart.model.data.impl.TextDataSetImpl;

+import org.eclipse.birt.chart.model.data.impl.TriggerImpl;

+import org.eclipse.birt.chart.model.impl.ChartWithAxesImpl;

+import org.eclipse.birt.chart.model.impl.ChartWithoutAxesImpl;

+import org.eclipse.birt.chart.model.layout.Legend;

+import org.eclipse.birt.chart.model.layout.Plot;

+import org.eclipse.birt.chart.model.type.BarSeries;

+import org.eclipse.birt.chart.model.type.PieSeries;

+import org.eclipse.birt.chart.model.type.impl.BarSeriesImpl;

+import org.eclipse.birt.chart.model.type.impl.PieSeriesImpl;

+import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTViewer;

+import org.eclipse.linuxtools.dataviewers.abstractviewers.ISTDataViewersField;

+

+/**

+ * A utility class that handles the charts creation (pie chart & bar chart)

+ * 

+ * @author Marzia Maugeri <marzia.maugeri@st.com>

+ *

+ */

+public class ChartFactory {

+	

+	/** 

+	 * Produces a 3D pie chart from the input objects.

+	 * 

+	 * @param objects the input data

+	 * @param nameField the field used to get the labels of the objects (colored parts in the pie).

+	 * @param valField the field providing the values for the pie parts.

+	 * @return a new 3D pie chart

+	 */

+	public static final Chart producePieChart(Object[] objects, ISTDataViewersField nameField, List<IChartField> valFields)

+	{

+		ChartWithoutAxes cwoaPie = ChartWithoutAxesImpl.create( );

+		cwoaPie.setSeriesThickness( 20 );

+		cwoaPie.setGridColumnCount( valFields.size());

+		cwoaPie.getBlock( ).setBackground( ColorDefinitionImpl.WHITE( ) );

+		

+		//2D dimensional with DEPTH (birt DOESN'T SUPPORT 3D for Pie Chart)

+		cwoaPie.setDimension(ChartDimension.TWO_DIMENSIONAL_WITH_DEPTH_LITERAL);

+		

+		// Plot

+		Plot p = cwoaPie.getPlot( );

+		p.getClientArea( ).setBackground( null );

+		p.getClientArea( ).getOutline( ).setVisible( true );

+		p.getOutline( ).setVisible( true );

+

+		// Legend

+		Legend lg = cwoaPie.getLegend( );

+		lg.getText( ).getFont( ).setSize( 16 );

+		lg.setBackground( null );

+		lg.getOutline( ).setVisible( true );

+

+		// Title

+		cwoaPie.getTitle( ).getLabel( ).getCaption( ).setValue( nameField.getColumnHeaderText());

+		cwoaPie.getTitle( ).getOutline( ).setVisible( true );

+		

+		//Base Data Set

+		List<String> textLabels = new ArrayList<String>();

+		for (Object obj : objects) {

+			String label = nameField.getValue(obj);

+			textLabels.add(label);

+		}

+		TextDataSet categoryValues = TextDataSetImpl.create(textLabels );

+

+		// Base Series

+		Series seCategory = SeriesImpl.create( );

+		seCategory.setDataSet( categoryValues );

+		

+		SeriesDefinition sdBase = SeriesDefinitionImpl.create( );

+		cwoaPie.getSeriesDefinitions( ).add( sdBase );

+		sdBase.getSeriesPalette( ).shift( -1 );

+		sdBase.getSeries( ).add( seCategory );

+		

+		SeriesDefinition sdValue = SeriesDefinitionImpl.create( );

+		sdBase.getSeriesDefinitions( ).add( sdValue );

+

+

+		for (IChartField field : valFields) {

+			List<Double> doubleValues = new ArrayList<Double>();

+			for (Object obj : objects) {

+				doubleValues.add(field.getNumber(obj).doubleValue());

+			}

+			

+			NumberDataSet Values = NumberDataSetImpl.create(doubleValues);

+			

+			// Pie Series

+			PieSeries sePie = (PieSeries) PieSeriesImpl.create( );

+			sePie.setSeriesIdentifier( field.getColumnHeaderText());

+			sePie.setExplosion(3);

+			sePie.setDataSet( Values );

+			

+			//Mouse over the Serie to Show Tooltips

+			setTriggering(sePie);

+			

+			sdValue.getSeries( ).add( sePie);

+		}

+	

+	

+		return cwoaPie;

+	}

+		

+	/** 

+	 * Produces a 2D bar chart from the input objects.

+	 * 

+	 * @param objects the input data

+	 * @param nameField the field used to get the labels of the objects (the labels of the series groups).

+	 * @param valFields the fields providing the values for the different bars in a series group.

+	 * @param horizontal if true the bars are displayed horizontally, else vertically.

+	 * @return a new 2D bar chart

+	 */

+	

+	public static final Chart produceBarChart( Object[] objects, final ISTDataViewersField nameField, List<IChartField> valFields, String title,boolean horizontal)

+	{

+		ChartWithAxes cwaBar = ChartWithAxesImpl.create( );

+

+		// Plot

+		cwaBar.getBlock( ).setBackground( ColorDefinitionImpl.WHITE( ) );

+		Plot p = cwaBar.getPlot( );

+		p.getClientArea( )

+				.setBackground( GradientImpl.create( ColorDefinitionImpl.create( 225,

+						225,

+						255 ),

+						ColorDefinitionImpl.create( 255, 255, 225 ),

+						-35,

+						false ) );

+		p.getOutline( ).setVisible( true );

+

+		// Title

+		cwaBar.getTitle( ).getLabel( ).getCaption( ).setValue(title);

+		cwaBar.getTitle( ).getOutline( ).setVisible( true );

+		

+		//Orientation

+		if (horizontal) cwaBar.setTransposed(true);

+

+		// Legend

+		Legend lg = cwaBar.getLegend( );

+		lg.getText( ).getFont( ).setSize( 16 );

+

+		// X-Axis

+		Axis xAxisPrimary = cwaBar.getPrimaryBaseAxes( )[0];

+		xAxisPrimary.getTitle( ).setVisible( true );

+		xAxisPrimary.setTitlePosition( Position.BELOW_LITERAL );

+		xAxisPrimary.setType( AxisType.TEXT_LITERAL );

+		xAxisPrimary.getMajorGrid( ).setTickStyle( TickStyle.BELOW_LITERAL );

+		xAxisPrimary.getOrigin( ).setType( IntersectionType.VALUE_LITERAL );

+		xAxisPrimary.setLabelPosition( Position.BELOW_LITERAL );

+		xAxisPrimary.getTitle().getCaption( ).setValue(nameField.getColumnHeaderText());

+

+		// Y-Axis

+		Axis yAxisPrimary = cwaBar.getPrimaryOrthogonalAxis( xAxisPrimary );

+		yAxisPrimary.getMajorGrid( ).setTickStyle( TickStyle.LEFT_LITERAL );

+

+

+		double max = -1D;

+		List<String> textLabels = new ArrayList<String>();

+		for (Object obj : objects) {

+			String label = nameField.getValue(obj);

+			textLabels.add(label);

+		}

+		TextDataSet categoryValues = TextDataSetImpl.create(textLabels );

+		SeriesDefinition sdY = SeriesDefinitionImpl.create( );

+		sdY.getSeriesPalette( ).shift( -1 );

+

+		yAxisPrimary.getSeriesDefinitions( ).add( sdY );

+	

+		// Data Set

+		for (IChartField field : valFields) {

+			List<Double> doubleValues = new ArrayList<Double>();

+			for (Object obj : objects) {

+

+				Number num = field.getNumber(obj);

+				double longVal = num.doubleValue();

+				max = longVal > max ? longVal : max;

+				doubleValues.add(longVal);

+			}

+			

+			NumberDataSet orthoValues = NumberDataSetImpl.create(doubleValues);

+			// Y-Series

+			BarSeries bs = (BarSeries) BarSeriesImpl.create( );

+			bs.setSeriesIdentifier( field.getColumnHeaderText() );

+			bs.setDataSet( orthoValues );

+			bs.setRiserOutline( null );

+

+			//Mouse over the Serie to Show Tooltips

+			setTriggering(bs);

+			

+			sdY.getSeries( ).add( bs );

+		}

+

+		// X-Series

+		Series seCategory = SeriesImpl.create( );

+		seCategory.setDataSet( categoryValues );

+		SeriesDefinition sdX = SeriesDefinitionImpl.create( );

+		xAxisPrimary.getSeriesDefinitions( ).add( sdX );

+		sdX.getSeries( ).add( seCategory );

+

+		return cwaBar;

+	}

+	

+	/**

+	 * @param viewer

+	 * @return the field used to provide the labels to the series

+	 */

+	public ISTDataViewersField getLabelField(AbstractSTViewer viewer) {

+		return viewer.getAllFields()[0];

+	}

+	

+	public static void setTriggering(Series series){

+		//Mouse over the Serie to Show Tooltips

+		Trigger tr = TriggerImpl.create(TriggerCondition.ONMOUSEOVER_LITERAL, 

+				ActionImpl.create(ActionType.SHOW_TOOLTIP_LITERAL, TooltipValueImpl.create(200, null)));

+		series.getTriggers().add(tr);

+	}

+}

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/ChartUpdateNotifier.java b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/ChartUpdateNotifier.java
new file mode 100644
index 0000000..c3504df
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/ChartUpdateNotifier.java
@@ -0,0 +1,41 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.dataviewers.charts.provider;

+

+import org.eclipse.birt.chart.device.EmptyUpdateNotifier;

+import org.eclipse.birt.chart.device.ICallBackNotifier;

+import org.eclipse.birt.chart.model.Chart;

+import org.eclipse.birt.chart.model.attribute.CallBackValue;

+import org.eclipse.swt.widgets.Canvas;

+

+/**

+ *  @author Marzia Maugeri <marzia.maugeri@st.com>

+ */

+

+public class ChartUpdateNotifier extends EmptyUpdateNotifier implements ICallBackNotifier{

+	private Canvas preview = null;

+	

+	public ChartUpdateNotifier(Canvas preview,Chart designModel, Chart runtimeModel) {

+		super(designModel, runtimeModel);

+		this.preview = preview;

+	}

+	

+	public Object peerInstance( )

+	{

+		return preview;

+	}

+

+	@Override

+	public void callback(Object event, Object source, CallBackValue value) {

+	

+	}

+

+}

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/IChartField.java b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/IChartField.java
new file mode 100755
index 0000000..967c58b
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/IChartField.java
@@ -0,0 +1,30 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.dataviewers.charts.provider;

+

+import org.eclipse.linuxtools.dataviewers.abstractviewers.ISTDataViewersField;

+

+/**

+ * The interface used by the charts to get a <code>Number</code> data from a field.

+ * 

+ * @author Marzia Maugeri <marzia.maugeri@st.com>

+ *

+ */

+public interface IChartField extends ISTDataViewersField {

+	

+	/**

+	 * Returns the number to display in the chart for this object.

+	 * 

+	 * @param obj

+	 * @return the corresponding number value

+	 */

+	public Number getNumber(Object obj);

+}

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/view/ChartView.java b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/view/ChartView.java
new file mode 100755
index 0000000..a13ce8f
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/view/ChartView.java
@@ -0,0 +1,204 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.dataviewers.charts.view;

+

+

+import org.eclipse.birt.chart.model.Chart;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.jface.action.IToolBarManager;

+import org.eclipse.linuxtools.dataviewers.charts.Activator;

+import org.eclipse.linuxtools.dataviewers.charts.actions.SaveChartAction;

+import org.eclipse.linuxtools.dataviewers.charts.actions.SaveXMLAction;

+import org.eclipse.linuxtools.dataviewers.charts.viewer.ChartViewer;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.layout.GridData;

+import org.eclipse.swt.widgets.Canvas;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.IActionBars;

+import org.eclipse.ui.IWorkbenchPage;

+import org.eclipse.ui.PartInitException;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.ui.part.ViewPart;

+

+

+/**

+ * The chart view.

+ * 

+ * <br/>This view is multiple and all the created chart will be displayed in an instance of this view.

+ * Each one will have a primary id equals to ChartView.VIEW_ID and an integer (increased by 1 at each new view) for the secondary id.

+ * 

+ * @author Marzia Maugeri <marzia.maugeri@st.com>

+ *

+ */

+public class ChartView extends ViewPart {

+	

+	/** The primary id of this view */

+	public static final String VIEW_ID = "org.eclipse.linuxtools.dataviewers.charts.view";

+	

+	/** The current secondary id for these views */

+	private static Integer SEC_ID = 0;

+	

+	private Canvas paintCanvas;

+	

+	private ChartViewer chartViewer;

+	

+	private SaveChartAction saveChartAction;

+	

+	private SaveXMLAction saveXMLAction;

+	

+	

+	

+	/**

+	 * Create and open a new chart view

+	 * <br/>

+	 * <br/><u><b>Note</b></u>: this method uses the UI thread to open the view and then it sets the input chart.

+	 * The UI thread execution is synchronized on internal Integer SEC_ID which is the secondary id of the chart view.

+	 * Each new chart view has a secondary id equal to SEC_ID++. 

+	 * 

+	 * @param chart

+	 */

+	public  static void createChartView(final Chart chart) {

+		PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() {

+			public void run() {

+				try {

+					synchronized(SEC_ID) {

+						ChartView view = (ChartView)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(VIEW_ID, ""+(SEC_ID++), IWorkbenchPage.VIEW_ACTIVATE);

+						view.setChart(chart);

+						

+					}

+				} catch (PartInitException e) {

+					Status s = new Status(

+							Status.ERROR,

+							Activator.PLUGIN_ID,

+							Status.ERROR,

+							e.getMessage(),

+							e);

+					Activator.getDefault().getLog().log(s);

+				}

+			}

+		});

+		

+

+	}

+

+	

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)

+	 */

+	@Override

+	public void createPartControl(Composite parent) {

+		try {

+			paintCanvas = new Canvas( parent, SWT.BORDER );

+			paintCanvas.setLayoutData( new GridData( GridData.FILL_BOTH ) );

+			paintCanvas.setBackground( Display.getDefault( )

+					.getSystemColor( SWT.COLOR_WHITE ) );

+			chartViewer = new ChartViewer( );

+			paintCanvas.addPaintListener( chartViewer );

+			paintCanvas.addControlListener( chartViewer );

+			chartViewer.setViewer( paintCanvas );

+			

+			

+			createActions(parent);

+			IActionBars actionBars = getViewSite().getActionBars();

+			initToolBar(actionBars.getToolBarManager());

+			

+		} catch (Throwable _)

+		{

+			Status s = new Status(

+					Status.ERROR,

+					Activator.PLUGIN_ID,

+					Status.ERROR,

+					"Error when creating AWT Frame...",

+					_);

+			Activator.getDefault().getLog().log(s);

+		}

+	}

+	

+	protected void createActions(Composite parent) {

+		saveChartAction = new SaveChartAction(getViewSite().getShell(),this);

+		saveXMLAction = new SaveXMLAction(parent);

+		//openChartAction = new OpenChartAction(getViewSite().getShell(),this);

+	}

+

+	protected void initToolBar(IToolBarManager manager) {

+		manager.add(saveChartAction);

+		manager.add(saveXMLAction);

+		//manager.add(openChartAction);

+		manager.update(true);

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus()

+	 */

+	@Override

+	public void setFocus() {

+		if (paintCanvas != null) {

+			paintCanvas.setFocus();

+		} else {

+			Status s = new Status(

+					Status.ERROR,

+					Activator.PLUGIN_ID,

+					"Error setting the focus to the chart view: main composite is not set!");

+			Activator.getDefault().getLog().log(s);

+		}

+	}

+	

+	/**

+	 * Close this view

+	 * <br/>

+	 * <br/><u><b>Note</b></u>: it uses the UI thread to get the workbench window. Then it closes the view.

+	 */

+	public void closeView() {

+		PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() {

+			public void run() {

+				PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().hideView(ChartView.this);

+			}

+		});

+	}

+	

+	/**

+	 * Set the chart in this view

+	 * 

+	 * @param chart

+	 */

+	public void  setChart(Chart chart) {

+		if (chart != null) {

+			chartViewer.renderModel(chart);

+			saveChartAction.setChart(chart);

+			saveChartAction.setBounds(chartViewer.getBounds());

+			saveXMLAction.setChart(chart);

+			

+		} else {

+			saveChartAction.setEnabled(false);

+			Status s = new Status(

+					Status.ERROR,

+					Activator.PLUGIN_ID,

+					"Error adding the chart to the chart view: SWT is not set!");

+			Activator.getDefault().getLog().log(s);

+		}

+	}

+	

+	public ChartViewer getChartViewer(){

+		return chartViewer;

+	}

+	

+	public void setChartViewer(ChartViewer cv){

+		chartViewer = cv;

+	}

+	

+	public void dispose( )

+	{

+		super.dispose( );

+	}

+}

diff --git a/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/viewer/ChartViewer.java b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/viewer/ChartViewer.java
new file mode 100755
index 0000000..447644c
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/viewer/ChartViewer.java
@@ -0,0 +1,252 @@
+/*******************************************************************************
+ * Copyright (c) 2009 STMicroelectronics.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.dataviewers.charts.viewer;
+
+import org.eclipse.birt.chart.device.IDeviceRenderer;
+import org.eclipse.birt.chart.exception.ChartException;
+import org.eclipse.birt.chart.factory.GeneratedChartState;
+import org.eclipse.birt.chart.factory.Generator;
+import org.eclipse.birt.chart.model.Chart;
+import org.eclipse.birt.chart.model.attribute.Bounds;
+import org.eclipse.birt.chart.model.attribute.impl.BoundsImpl;
+import org.eclipse.birt.chart.util.PluginSettings;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.linuxtools.dataviewers.charts.Activator;
+import org.eclipse.linuxtools.dataviewers.charts.actions.ChartActionRenderer;
+import org.eclipse.linuxtools.dataviewers.charts.provider.ChartUpdateNotifier;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.events.ControlListener;
+import org.eclipse.swt.events.PaintEvent;
+import org.eclipse.swt.events.PaintListener;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Canvas;
+import org.eclipse.swt.widgets.Display;
+
+
+/**
+ * 
+ * @author Marzia Maugeri <marzia.maugeri@st.com>
+ *
+ */
+public class ChartViewer implements PaintListener, ControlListener
+{
+
+	private transient Canvas preview = null;
+
+	private Chart cm = null;
+
+	private transient boolean bIsPainting = false;
+
+	private transient Image buffer;
+
+	private static int X_OFFSET = 3;
+
+	private static int Y_OFFSET = 3;
+	
+	private GeneratedChartState gcs = null;
+	
+	private IDeviceRenderer deviceRenderer = null;
+	
+	private Bounds bo;
+
+	public ChartViewer( )
+	{
+		try {
+			deviceRenderer = PluginSettings.instance( ).getDevice( "dv.SWT" );
+		} catch (ChartException e) {
+			Status s = new Status(
+					Status.ERROR,
+					Activator.PLUGIN_ID,
+					Status.ERROR,
+					e.getMessage(),
+					e);
+			Activator.getDefault().getLog().log(s);
+		}
+		
+	}
+	/**
+	 * @param cm
+	 *            Chart Model
+	 */
+	public void renderModel( Chart cm )
+	{
+		 this.cm = cm;
+
+		if ( preview != null && !preview.isDisposed( ) )
+		{
+			updateBuffer( );
+			preview.redraw( );
+		}
+	}
+	
+	public Bounds getBounds()
+	{
+		return bo;
+	}
+	
+	public Chart getChart(){
+		return cm;
+	}
+
+	/**
+	 * Generate and render the chart model,the chart image is stored in a
+	 * buffer. The buffer will be updated only when the chart model is changed.
+	 */
+	private void updateBuffer( )
+	{
+		if ( bIsPainting )
+		{
+			return;
+		}
+		Throwable paintError = null;
+
+		Rectangle re = preview.getClientArea( );
+		final Rectangle adjustedRe = new Rectangle( 0, 0, re.width, re.height );
+
+		if ( adjustedRe.width - 2 * X_OFFSET <= 0
+				|| adjustedRe.height - 2 * Y_OFFSET <= 0 )
+		{
+			if ( buffer != null && !buffer.isDisposed( ) )
+			{
+				buffer.dispose( );
+				buffer = null;
+			}
+			return;
+		}
+
+		if ( cm == null )
+		{
+			buffer = null;
+		}
+		else
+		{
+			bIsPainting = true;
+			Image oldBuffer = null;
+			if ( buffer == null )
+			{
+				buffer = new Image( Display.getDefault( ), adjustedRe );
+			}
+			else
+			{
+				Rectangle ore = buffer.getBounds( );
+
+				oldBuffer = buffer;
+
+				if ( !adjustedRe.equals( ore ) )
+				{
+					buffer = new Image( Display.getDefault( ), adjustedRe );
+				}
+			}
+
+			GC gc = new GC( buffer );
+
+			// fill default background as white.
+			gc.setForeground( Display.getDefault( )
+					.getSystemColor( SWT.COLOR_WHITE ) );
+			gc.fillRectangle( buffer.getBounds( ) );
+
+			bo = BoundsImpl.create( X_OFFSET,
+					Y_OFFSET,
+					adjustedRe.width - 2 * X_OFFSET,
+					adjustedRe.height - 2 * Y_OFFSET );
+
+
+			try
+			{
+				deviceRenderer.setProperty( IDeviceRenderer.GRAPHICS_CONTEXT,gc );
+				
+				bo.scale( 72d / deviceRenderer.getDisplayServer( )
+						.getDpiResolution( ) ); // CONVERT  TO POINTS
+
+				// GENERATE AND RENDER THE CHART
+				final Generator gr = Generator.instance( );
+				
+				gcs = gr.build(deviceRenderer.getDisplayServer( ), cm, bo, null, null, null);
+				gcs.getRunTimeContext().setActionRenderer( new ChartActionRenderer());
+				deviceRenderer.setProperty(IDeviceRenderer.UPDATE_NOTIFIER,
+						new ChartUpdateNotifier(preview,cm, gcs.getChartModel()));
+				gr.render(deviceRenderer, gcs);
+			}
+			catch ( Exception ex )
+			{
+				paintError = ex;
+			}
+
+			if ( paintError != null )
+			{
+				buffer = oldBuffer;
+			}
+			if ( oldBuffer != null && oldBuffer != buffer )
+			{
+				oldBuffer.dispose( );
+			}
+			bIsPainting = false;
+		}
+
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.swt.events.PaintListener#paintControl(org.eclipse.swt.events.PaintEvent)
+	 */
+	public void paintControl( PaintEvent pe )
+	{
+		GC gc = pe.gc;
+		if ( buffer != null )
+		{
+			gc.drawImage( buffer, 0, 0 );
+		}
+	}
+
+	/**
+	 * Set the preview canvas.
+	 * 
+	 * @param paintCanvas
+	 */
+	public void setViewer( Canvas paintCanvas )
+	{
+		this.preview = paintCanvas;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.swt.events.ControlListener#controlMoved(org.eclipse.swt.events.ControlEvent)
+	 */
+	public void controlMoved( ControlEvent e )
+	{
+		if ( preview != null && !preview.isDisposed( ) )
+		{
+			updateBuffer( );
+			preview.redraw( );
+		}
+		
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.swt.events.ControlListener#controlResized(org.eclipse.swt.events.ControlEvent)
+	 */
+	public void controlResized( ControlEvent e )
+	{
+		if ( preview != null && !preview.isDisposed( ) )
+		{
+			updateBuffer( );
+			preview.redraw( );
+		}
+	}
+	
+	public void setBuffer(Image buffer){
+		this.buffer = buffer;
+	}
+		
+}
diff --git a/gcov/org.eclipse.linuxtools.gcov-feature/.project b/gcov/org.eclipse.linuxtools.gcov-feature/.project
new file mode 100755
index 0000000..9229605
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov-feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.gcov-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/gcov/org.eclipse.linuxtools.gcov-feature/build.properties b/gcov/org.eclipse.linuxtools.gcov-feature/build.properties
new file mode 100755
index 0000000..3cbc018
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov-feature/build.properties
@@ -0,0 +1,6 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html
+src.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/docs/epl-v10.html b/gcov/org.eclipse.linuxtools.gcov-feature/epl-v10.html
old mode 100644
new mode 100755
similarity index 100%
rename from systemtap/SystemTapGuiServer/systemtapguiserver-1.0/docs/epl-v10.html
rename to gcov/org.eclipse.linuxtools.gcov-feature/epl-v10.html
diff --git a/gcov/org.eclipse.linuxtools.gcov-feature/feature.properties b/gcov/org.eclipse.linuxtools.gcov-feature/feature.properties
new file mode 100755
index 0000000..14e4c51
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov-feature/feature.properties
@@ -0,0 +1,112 @@
+#*******************************************************************************
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Red Hat, Inc. - initial API and implementation
+#********************************************************************************
+featureName=GCov Integration (Incubation)
+description=Functionality to integrate GCov with the workbench.
+featureProvider=Eclipse
+copyright=Copyright 2009 Red Hat, Inc.
+licenseURL=epl-v10.html
+license=\
+ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
+March 17, 2005\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse.org CVS\n\
+repository ("Repository") in CVS modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+Features may also include other Features ("Included Features"). Files named\n\
+"feature.xml" may contain a list of the names and version numbers of\n\
+Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+   - The top-level (root) directory\n\
+   - Plug-in and Fragment directories\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
+   - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Eclipse Update Manager, you must agree to a license ("Feature Update\n\
+License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties". Such Abouts,\n\
+Feature Licenses and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
+    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
\ No newline at end of file
diff --git a/gcov/org.eclipse.linuxtools.gcov-feature/feature.xml b/gcov/org.eclipse.linuxtools.gcov-feature/feature.xml
new file mode 100755
index 0000000..72a9463
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov-feature/feature.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.linuxtools.gcov"
+      label="%featureName"
+      version="0.4.1.qualifier"
+      provider-name="%featureProvider">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <url>
+      <update label="Linux Tools Update Site" url="http://download.eclipse.org/technology/linuxtools/update"/>
+   </url>
+
+   <plugin
+         id="org.eclipse.linuxtools.gcov"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.binutils"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.dataviewers"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.dataviewers.charts"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+     <plugin
+         id="org.eclipse.linuxtools.dataviewers.annotatedsourceeditor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/.classpath b/gcov/org.eclipse.linuxtools.gcov.test/.classpath
new file mode 100644
index 0000000..1ca8caa
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry excluding="**/.svn/**" kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/.project b/gcov/org.eclipse.linuxtools.gcov.test/.project
new file mode 100644
index 0000000..ea8b6fd
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.gcov.test</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/.settings/org.eclipse.jdt.core.prefs b/gcov/org.eclipse.linuxtools.gcov.test/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..4ec9559
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Fri Jan 16 09:19:58 CET 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/META-INF/MANIFEST.MF b/gcov/org.eclipse.linuxtools.gcov.test/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..7340221
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.gcov.test
+Bundle-Version: 4.1.1.qualifier
+Bundle-Vendor: %bundleProvider
+Fragment-Host: org.eclipse.linuxtools.gcov
+Require-Bundle: org.junit
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/about.html b/gcov/org.eclipse.linuxtools.gcov.test/about.html
new file mode 100644
index 0000000..0c6525d
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>24th October, 2008</p>	
+<h3>License</h3>
+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<h3>Contributions</h3>
+
+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise
+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such
+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
+
+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or
+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the
+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/build.properties b/gcov/org.eclipse.linuxtools.gcov.test/build.properties
new file mode 100644
index 0000000..e70eafa
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/build.properties
@@ -0,0 +1,9 @@
+source.. = src/

+output.. = bin/

+bin.includes = META-INF/,\

+               .,\

+               test.xml,\

+               plugin.properties,\

+               test_c/,\

+               test_cpp/,\

+               about.html

diff --git a/gcov/org.eclipse.linuxtools.gcov.test/plugin.properties b/gcov/org.eclipse.linuxtools.gcov.test/plugin.properties
new file mode 100644
index 0000000..ecdbbf3
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/plugin.properties
@@ -0,0 +1,12 @@
+#******************************************************************************
+# Copyright (c) 2009 STMicroelectronics.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#   Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation
+#*******************************************************************************
+bundleProvider = Eclipse
+bundleName = Gcov Test Plug-in (Incubation)
\ No newline at end of file
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/gcov/test/AllGcovTests.java b/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/gcov/test/AllGcovTests.java
new file mode 100755
index 0000000..b44f96a
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/gcov/test/AllGcovTests.java
@@ -0,0 +1,29 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.test;

+

+import junit.framework.Test;

+import junit.framework.TestSuite;

+

+public class AllGcovTests {

+

+	public static Test suite() {

+		TestSuite ats = new TestSuite("Tests for org.eclipse.linuxtools.gcov.test");

+		//$JUnit-BEGIN$

+		ats.addTest(GcovGCDARetrieverTest.suite());

+		ats.addTest(GcovParserTest.suite());

+// Comment out until we fix bug #299995

+//		ats.addTest(GcovViewTest.suite());

+		//$JUnit-END$

+		return ats;		

+	}

+

+}
\ No newline at end of file
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/gcov/test/GcovGCDARetrieverTest.java b/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/gcov/test/GcovGCDARetrieverTest.java
new file mode 100755
index 0000000..92f2ee1
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/gcov/test/GcovGCDARetrieverTest.java
@@ -0,0 +1,68 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.test;

+

+import java.io.File;

+import java.util.Arrays;

+import java.util.List;

+

+import junit.framework.Assert;

+import junit.framework.Test;

+import junit.framework.TestCase;

+import junit.framework.TestSuite;

+

+import org.eclipse.linuxtools.gcov.Activator;

+import org.eclipse.linuxtools.gcov.parser.CovManager;

+

+public class GcovGCDARetrieverTest extends TestCase {

+

+	public GcovGCDARetrieverTest() {

+	}

+

+	public static Test suite() {

+		TestSuite ats = new TestSuite("Gcov:GCDA_Retriever");

+		File[] testDirs = STJunitUtils.getTestDirs(Activator.PLUGIN_ID + ".test", "test.*");

+		for (File testDir : testDirs) {	

+			final String[] covFiles = GcovTestUtils.getGCDANames(testDir);

+			final File binaryFile = GcovTestUtils.getBinary(testDir);

+			ats.addTest(

+					new TestCase(testDir.getName() + ":GCDA_Retriever") {

+						public void runTest() throws Throwable {

+							testGcdaRetriever(binaryFile, covFiles);

+						}

+					}

+			);

+		}	

+		return ats;

+	}

+

+

+	public static void testGcdaRetriever(

+			File binaryFile, String[] covFilesPaths)

+	throws Exception {

+		CovManager covManager = new CovManager(binaryFile.getAbsolutePath());

+		List<String> list = covManager.getGCDALocations();

+		String[] generatedCovFilesPath = new String[list.size()];

+		int index = 0;

+		for (String string : list) {

+			int i = string.lastIndexOf('/');

+			string = string.substring(i+1);

+			i = string.lastIndexOf('\\');

+			string = string.substring(i+1);

+			generatedCovFilesPath[index] = string;

+			index++;

+		}

+		Arrays.sort(generatedCovFilesPath);

+		boolean b = Arrays.equals(generatedCovFilesPath, covFilesPaths);

+		Assert.assertEquals("May be normal if binary not complied with gcov options", true, b);

+	}

+

+}
\ No newline at end of file
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/gcov/test/GcovParserTest.java b/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/gcov/test/GcovParserTest.java
new file mode 100755
index 0000000..1c0b5c6
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/gcov/test/GcovParserTest.java
@@ -0,0 +1,59 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.test;

+

+import java.io.File;

+import java.io.PrintStream;

+import java.util.List;

+

+import junit.framework.Test;

+import junit.framework.TestCase;

+import junit.framework.TestSuite;

+

+import org.eclipse.linuxtools.gcov.Activator;

+import org.eclipse.linuxtools.gcov.parser.CovManager;

+

+public class GcovParserTest extends TestCase {

+

+	public GcovParserTest() {

+	}

+

+

+	public static Test suite() {

+		TestSuite ats = new TestSuite("Gcov:Parser");

+		File[] testDirs = STJunitUtils.getTestDirs(Activator.PLUGIN_ID + ".test", "test.*");

+		for (File testDir : testDirs) {

+			final List<String> covPaths = GcovTestUtils.getGCDAPath(testDir);

+			final File binaryFile = GcovTestUtils.getBinary(testDir);

+			final File parserRefFile = new File(testDir, "testProcessCovFiles.ref");

+			final File parserDumpFile = new File(testDir, "testProcessCovFiles.dump");

+			ats.addTest(

+					new TestCase(testDir.getName() + ":Parser") {

+						public void runTest() throws Throwable {

+							testGcovParsing(binaryFile, covPaths, parserRefFile, parserDumpFile);

+						}

+					}

+			);

+		}	

+		return ats;

+	}

+

+	public static void testGcovParsing(

+			File binaryFile, List<String> covFilesPaths,

+			File parserRefFile, File parserDumpFile)

+	throws Exception {

+		CovManager covManager = new CovManager(binaryFile.getAbsolutePath());

+		covManager.processCovFiles(covFilesPaths);

+		covManager.dumpProcessCovFilesResult(new PrintStream(parserDumpFile));

+		STJunitUtils.compareIgnoreEOL(parserDumpFile.getAbsolutePath(), parserRefFile.getAbsolutePath(), true);

+	}

+

+}
\ No newline at end of file
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/gcov/test/GcovTestUtils.java b/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/gcov/test/GcovTestUtils.java
new file mode 100755
index 0000000..bd128bd
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/gcov/test/GcovTestUtils.java
@@ -0,0 +1,66 @@
+/*******************************************************************************
+ * Copyright (c) 2009 STMicroelectronics.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.gcov.test;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FilenameFilter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import junit.framework.Assert;
+
+public class GcovTestUtils {
+	public static final String GCOV_FILE_SUFFIX = ".gcda"; 
+	public static final String GCOV_BINARY_FILE_SUFFIX = ".out";
+	public static final String GCOV_DIRECTORY_SUFFIX = "_gcov_input";
+
+	public static String[] getGCDANames(File directory) {
+		String[] covFiles = directory.list(new FilenameFilter() {
+			public boolean accept(File dir, String name) {
+				return name.endsWith(GCOV_FILE_SUFFIX);
+			}
+		});
+		Arrays.sort(covFiles);
+		return covFiles;
+	}
+
+	public static File[] getGCDA(File directory) {
+		File[] covFiles = directory.listFiles(new FileFilter() {
+			public boolean accept(File arg0) {
+				return ( arg0.isDirectory() == false && arg0.getName().endsWith(GCOV_FILE_SUFFIX));
+			}
+		});
+		Arrays.sort(covFiles);
+		return covFiles;
+	}
+
+	public static List<String> getGCDAPath(File directory) {
+		File[] covFiles = getGCDA(directory);
+		final List<String> covPaths = new ArrayList<String>(covFiles.length);
+		for (File file : covFiles) {
+			covPaths.add(file.getAbsolutePath());
+		}
+		return covPaths;
+	}
+
+	public static File getBinary(File directory) {
+		File[] binaries = directory.listFiles(new FileFilter() {
+			public boolean accept(File arg1) {
+				return ( !arg1.isDirectory() && arg1.getName().endsWith(GCOV_BINARY_FILE_SUFFIX));
+			}
+		});
+		Assert.assertEquals(1, binaries.length);
+		return binaries[0];
+	}
+
+}
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/gcov/test/GcovViewTest.java b/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/gcov/test/GcovViewTest.java
new file mode 100755
index 0000000..a49fcd1
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/gcov/test/GcovViewTest.java
@@ -0,0 +1,111 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.test;

+

+import java.io.File;

+import java.util.List;

+import java.util.Locale;

+

+import junit.framework.Test;

+import junit.framework.TestCase;

+import junit.framework.TestSuite;

+

+import org.eclipse.jface.viewers.ITreeContentProvider;

+import org.eclipse.linuxtools.gcov.Activator;

+import org.eclipse.linuxtools.gcov.action.SwitchContentProviderAction;

+import org.eclipse.linuxtools.gcov.parser.CovManager;

+import org.eclipse.linuxtools.gcov.view.CovFileContentProvider;

+import org.eclipse.linuxtools.gcov.view.CovFolderContentProvider;

+import org.eclipse.linuxtools.gcov.view.CovFunctionContentProvider;

+import org.eclipse.linuxtools.gcov.view.CovView;

+

+public class GcovViewTest extends TestCase {

+	

+	public GcovViewTest() {

+	}

+	

+	public static Test suite() {

+		TestSuite emptyTestSuite = new TestSuite();

+		return emptyTestSuite;

+// Comment out until we fix bug #299995

+//		TestSuite ats = new TestSuite("GCov:View");

+//		File[] testDirs = STJunitUtils.getTestDirs(Activator.PLUGIN_ID + ".test", "test.*");

+//		

+//		for (File testDir : testDirs) {		

+//			final List<String> covFilesPaths = GcovTestUtils.getGCDAPath(testDir);

+//			final File binary = GcovTestUtils.getBinary(testDir);

+//			final File folderRefFile = new File(testDir, "testViewFolder.ref");

+//			final File folderDumpFile = new File(testDir, "testViewFolder.dump");

+//			final File fileRefFile = new File(testDir, "testView.ref");

+//			final File fileDumpFile = new File(testDir, "testView.dump");

+//			final File functionRefFile = new File(testDir, "testViewFunction.ref");

+//			final File functionDumpFile = new File(testDir, "testViewFunction.dump");

+//			ats.addTest(

+//					new TestCase(testDir.getName() + ":CSV-DIRECTORY") {

+//						public void runTest() throws Throwable {

+//							testView(

+//									covFilesPaths, binary,

+//									CovFolderContentProvider.sharedInstance,

+//									folderRefFile, folderDumpFile

+//							);

+//						}

+//					}

+//			);

+//			ats.addTest(

+//					new TestCase(testDir.getName() + ":CSV-FILE") {

+//						public void runTest() throws Throwable {

+//							testView(

+//									covFilesPaths, binary,

+//									CovFileContentProvider.sharedInstance,

+//									fileRefFile, fileDumpFile

+//							);

+//						}

+//					}

+//			);

+//			ats.addTest(

+//					new TestCase(testDir.getName() + ":CSV-FUNCTION") {

+//						public void runTest() throws Throwable {

+//							testView(

+//									covFilesPaths, binary,

+//									CovFunctionContentProvider.sharedInstance,

+//									functionRefFile, functionDumpFile

+//							);

+//						}

+//					}

+//			);

+//		}	

+//		return ats;

+	}

+	

+	

+	public static void testView(

+			List<String> covFilesPaths, File binaryFile,

+			ITreeContentProvider provider,

+			File refFile, File dumpFile) throws Exception {

+		Locale.setDefault( Locale.US );

+		CovManager cvrgeMnger = new CovManager(binaryFile.getAbsolutePath());

+		cvrgeMnger.processCovFiles(covFilesPaths);

+		// generate model for view

+		cvrgeMnger.fillGcovView();

+		//load an Eclipse view

+		CovView cvrgeView = CovView.displayCovResults(cvrgeMnger);

+		

+		SwitchContentProviderAction action = new SwitchContentProviderAction(

+				"test", "icons/directory_obj.gif",

+				cvrgeView.getSTViewer().getViewer(),

+				provider

+		);

+		action.run();

+		STJunitUtils.testCSVExport(cvrgeView, dumpFile.getAbsolutePath(), refFile.getAbsolutePath());

+		

+	}

+

+}
\ No newline at end of file
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/gcov/test/STJunitUtils.java b/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/gcov/test/STJunitUtils.java
new file mode 100755
index 0000000..39cdeee
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/gcov/test/STJunitUtils.java
@@ -0,0 +1,267 @@
+/*******************************************************************************
+ * Copyright (c) 2009 STMicroelectronics.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.gcov.test;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.LineNumberReader;
+import java.net.URL;
+
+import junit.framework.Assert;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.linuxtools.dataviewers.abstractview.AbstractSTDataView;
+import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersCSVExporter;
+import org.osgi.framework.Bundle;
+
+
+/**
+ * This class only contains some tools to facilitate tests
+ * (compare)
+ * @author Xavier Raynaud <xavier.raynaud@st.com>
+ */
+public class STJunitUtils {
+
+	
+	/**
+	 * Test CSV export of the given view
+	 * @param view
+	 * @param dumpFullFileName
+	 * @param refFullFileName
+	 */
+	public static void testCSVExport(AbstractSTDataView view, String dumpFullFileName, String refFullFileName) {
+		STDataViewersCSVExporter exporter = new STDataViewersCSVExporter(view.getSTViewer());
+		exporter.exportTo(dumpFullFileName, new NullProgressMonitor());
+		// compare with ref
+		compareCSVIgnoreEOL(dumpFullFileName, refFullFileName, true);
+	}
+	
+	/**
+	 * Utility method to compare files
+	 * @param dumpFile
+	 * @param refFile
+	 */
+	public static boolean compare(String dumpFile, String refFile, boolean deleteDumpFileIfOk) {
+		String message = "Comparing ref file ("+refFile+ ")and dump file (" + 
+		  dumpFile+")";
+		boolean equals = false;
+		System.out.println(message);
+		try {
+			InputStream is1 = new FileInputStream(dumpFile);
+			InputStream is2 = new FileInputStream(refFile);
+			equals = compare(is1, is2);
+			if (!equals) {
+				System.out.println(message +  "... FAILED");
+				junit.framework.Assert.assertEquals(message + ": not correspond ", true, false);
+			}
+			else {
+				System.out.println(message +  "... successful");
+			}
+			// delete dump only for successful tests
+			if (equals && deleteDumpFileIfOk)  
+				new File(dumpFile).delete();
+		}catch (FileNotFoundException _) {
+			message += "... FAILED: One of these files may not exist";
+			System.out.println(message);
+			junit.framework.Assert.assertNull(message, _);
+		}
+		catch (Exception _) {
+			message += ": exception raised ... FAILED";
+			System.out.println(message);
+			junit.framework.Assert.assertNull(message, _);
+		}
+		return equals;
+	}
+	
+	/**
+	 * Utility method to compare files
+	 * @param dumpFile
+	 * @param refFile
+	 * @return
+	 */
+	public static boolean compareIgnoreEOL(String dumpFile, String refFile, boolean deleteDumpFileIfOk) {
+		String message = "Comparing ref file ("+refFile+ ")and dump file (" + 
+		  dumpFile+")";
+		boolean equals = false;		
+		try {
+		LineNumberReader is1 = new LineNumberReader(new FileReader(dumpFile));
+		LineNumberReader is2 = new LineNumberReader(new FileReader(refFile));
+			do {
+				String line1 = is1.readLine();
+				String line2 = is2.readLine();				
+				if (line1 == null) {
+					if (line2 == null) {
+						equals = true;
+					}
+					break;
+				} else if (line2 == null || !line1.equals(line2)) {
+					break;
+				}				
+			} while (true);
+			
+			if (!equals) {
+ 				junit.framework.Assert.assertEquals(message + ": not correspond ", true, false);
+			}
+			
+			is1.close();
+			is2.close();
+			// delete dump only for successful tests
+			if (equals && deleteDumpFileIfOk) {
+				new File(dumpFile).delete();
+			}
+		}catch (FileNotFoundException _) {
+			message += "... FAILED: One of these files may not exist";
+			junit.framework.Assert.assertNull(message, _);
+		}
+		catch (Exception _) {
+			message += ": exception raised ... FAILED";
+			junit.framework.Assert.assertNull(message, _);
+		}
+		return equals;
+	}
+	
+	/**
+	 * Utility method to compare exported CSV files
+	 * @param dumpFile
+	 * @param refFile
+	 * @return
+	 */
+	public static boolean compareCSVIgnoreEOL(String dumpFile, String refFile, boolean deleteDumpFileIfOk) {
+		String message = "Comparing ref file ("+refFile+ ")and dump file (" + 
+		  dumpFile+")";
+		boolean equals = false;
+		String str = "[in-charge]"; // this string can be dumped according to binutils version installed on local machine
+		
+		try {
+		LineNumberReader is1 = new LineNumberReader(new FileReader(dumpFile));
+		LineNumberReader is2 = new LineNumberReader(new FileReader(refFile));
+			do {
+				String line1 = is1.readLine();
+				String line2 = is2.readLine();
+				int length = str.length();				
+				if (line1 == null) {
+					if (line2 == null) {
+						equals = true;
+					}
+					break;
+				} else if (line1.contains(str)){
+					int idx = line1.indexOf("[in-charge]");
+					char c = line1.charAt(idx -1);
+					if (c == ' ' ){
+						idx--;
+						length++;
+					}
+					line1 = line1.substring(0, idx) + line1.substring(idx+length, line1.length());
+					if (!line1.equals(line2))
+						break;
+				} else if (line2 == null || !line1.equals(line2)) {
+					break;
+				} 				
+			} while (true);
+			
+			if (!equals) {
+ 				junit.framework.Assert.assertEquals(message + ": not correspond ", true, false);
+			}
+
+			is1.close();
+			is2.close();
+			// delete dump only for successful tests
+			if (equals && deleteDumpFileIfOk) {
+				new File(dumpFile).delete();
+			}
+		}catch (FileNotFoundException _) {
+			message += "... FAILED: One of these files may not exist";
+			junit.framework.Assert.assertNull(message, _);
+		}
+		catch (Exception _) {
+			message += ": exception raised ... FAILED";
+			junit.framework.Assert.assertNull(message, _);
+		}
+		return equals;
+	}
+
+	/**
+	 * Utility method to compare Input streams
+	 * @param ISdump
+	 * @param ISref
+	 * @return
+	 * @throws IOException
+	 */
+	public static boolean compare(InputStream ISdump, InputStream ISref) throws IOException {
+		try {
+			boolean equals = false;
+			do {
+				int char1 = ISdump.read();
+				int char2 = ISref.read();
+				if (char1 != char2)
+					break;
+				if (char1 == -1) {
+					equals = true;
+					break;
+				}
+			} while (true);
+			return equals;
+		} finally {
+			ISdump.close();
+			ISref.close();
+		}
+	}
+
+	/**
+	 * Gets the absolute path of a resource in the given plugin
+	 * @param pluginId
+	 * @param relativeName
+	 * @return an absolute path to a file
+	 */
+	public static String getAbsolutePath(String pluginId, String relativeName) {
+		Bundle b = Platform.getBundle(pluginId);
+		URL url = FileLocator.find(b, new Path(relativeName), null);
+		try {
+			url = FileLocator.toFileURL(url);
+		} catch (IOException e) {
+			Assert.assertNotNull("Problem locating " + relativeName + " in" + pluginId,e);
+		}
+		String filename = url.getFile();
+		return filename;
+	}
+
+	/**
+	 * Utility method
+	 * @param pluginDirectory: the plugin where to look for directories
+	 * @param regexp: the regexp used for matching directories
+	 * @return the list of directories that belong to the pluginDirectory and 
+	 * ends with the given extensionSuffix
+	 */
+	public static File[] getTestDirs(String pluginDirectory, final String regexp) {
+		// load directories containing tests
+		String filename = getAbsolutePath(pluginDirectory, ".");
+		File dir = new File(filename);
+		File[] testDirs = dir.listFiles(
+			new FileFilter() {
+				public boolean accept(File arg0) {
+					return (arg0.isDirectory() && arg0.getName().matches(regexp));
+				}
+			}
+		);
+
+		// test if there is any directory samples 
+		Assert.assertNotNull("No project files to test",testDirs);
+		return testDirs;
+	}
+}
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test.xml b/gcov/org.eclipse.linuxtools.gcov.test/test.xml
new file mode 100755
index 0000000..0d6d7f8
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>

+

+<project name="testsuite" default="run" basedir=".">

+	<property name="classname" value="org.eclipse.linuxtools.gcov.test.AllGcovTests" />

+	<property name="plugin-name" value="org.eclipse.linuxtools.gcov.test" />

+

+	<!-- The property ${eclipse-home} should be passed into this script -->

+	<!-- Set a meaningful default value for when it is not. -->

+	<property name="eclipse-home" value="${basedir}/../../" />

+

+	<property name="library-file" value="${eclipse-home}/dropins/${subProjectName2}/plugins/org.eclipse.test/library.xml" />

+

+	<!-- This target holds all initialization code that needs to be done for -->

+	<!-- all tests that are to be run. Initialization for individual tests -->

+	<!-- should be done within the body of the suite target. -->

+	<target name="init">

+		<tstamp />

+		<delete>

+			<fileset dir="${eclipse-home}" includes="org*.xml" />

+		</delete>

+	</target>

+

+	<!-- This target defines the tests that need to be run. -->

+	<target name="gcov_suite">

+		<property name="gcov-folder" value="${eclipse-home}/gcov_folder" />

+		<delete dir="${gcov-folder}" quiet="true" />

+		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">

+			<property name="data-dir" value="${gcov-folder}" />

+			<property name="plugin-name" value="${plugin-name}" />

+			<property name="classname" value="${classname}" />

+		</ant>

+	</target>

+

+	<!-- This target holds code to cleanup the testing environment after  -->

+	<!-- all of the tests have been run. You can use this target to -->

+	<!-- delete temporary files that have been created. -->

+	<target name="cleanup">

+		<mkdir dir="${results}/consolelogs" />

+		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />

+	</target>

+

+	<!-- This target runs the test suite. Any actions that need to happen -->

+	<!-- after all the tests have been run should go here. -->

+	<target name="run" depends="init,gcov_suite,cleanup">

+		<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">

+			<property name="includes" value="org*.xml" />

+			<property name="output-file" value="${plugin-name}.xml" />

+		</ant>

+	</target>

+

+    <target name="all" depends="run" description="Dummy target to run all tests">

+    </target>

+

+</project>

diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_c/Makefile b/gcov/org.eclipse.linuxtools.gcov.test/test_c/Makefile
new file mode 100644
index 0000000..9771c05
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_c/Makefile
@@ -0,0 +1,8 @@
+build a.out:
+	gcc -fprofile-arcs -ftest-coverage *.c
+
+all: a.out
+	./$< 1 2 3 4 5 6
+	
+clean:
+	rm -f *.o a.out *.gcno *.gcda
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_c/a.out b/gcov/org.eclipse.linuxtools.gcov.test/test_c/a.out
new file mode 100755
index 0000000..baebd86
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_c/a.out
Binary files differ
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_c/fact.c b/gcov/org.eclipse.linuxtools.gcov.test/test_c/fact.c
new file mode 100644
index 0000000..f37737a
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_c/fact.c
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2009 STMicroelectronics.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation
+ *******************************************************************************/
+long mult(long val1, long val2);
+
+long fact(long val)
+{
+	int k = 100;
+	for (; k-->0;);
+	if (val == 1) return 1;
+	return mult(val,fact(val-1));
+}
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_c/fact.gcda b/gcov/org.eclipse.linuxtools.gcov.test/test_c/fact.gcda
new file mode 100644
index 0000000..0515b5e
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_c/fact.gcda
Binary files differ
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_c/fact.gcno b/gcov/org.eclipse.linuxtools.gcov.test/test_c/fact.gcno
new file mode 100644
index 0000000..d9242a8
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_c/fact.gcno
Binary files differ
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_c/main.c b/gcov/org.eclipse.linuxtools.gcov.test/test_c/main.c
new file mode 100644
index 0000000..6065d93
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_c/main.c
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2009 STMicroelectronics.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation
+ *******************************************************************************/
+#include <stdio.h>
+#include <stdlib.h>
+
+long fact(long val);
+
+int main(int argc, char** argv)
+{
+	int i = 1;
+	for (; i<argc; i++)
+	{
+		unsigned long val = strtol(argv[i],NULL,10);
+		unsigned long res = fact(val);
+		int k = 1000;
+		for (; k-->0;);
+		printf("%li! = %li\n", val, res);
+	}
+	return 0;
+}
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_c/main.gcda b/gcov/org.eclipse.linuxtools.gcov.test/test_c/main.gcda
new file mode 100644
index 0000000..bcbaaac
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_c/main.gcda
Binary files differ
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_c/main.gcno b/gcov/org.eclipse.linuxtools.gcov.test/test_c/main.gcno
new file mode 100644
index 0000000..3581c98
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_c/main.gcno
Binary files differ
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_c/mult.c b/gcov/org.eclipse.linuxtools.gcov.test/test_c/mult.c
new file mode 100644
index 0000000..62abaa9
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_c/mult.c
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2009 STMicroelectronics.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation
+ *******************************************************************************/
+long mult(long val1, long val2)
+{
+	int k = 50;
+	long res = 0;
+	for (; k-->0;);
+	while(val2-->0)
+	{
+		res += val1;
+	}
+	return res;
+}
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_c/mult.gcda b/gcov/org.eclipse.linuxtools.gcov.test/test_c/mult.gcda
new file mode 100644
index 0000000..12b1038
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_c/mult.gcda
Binary files differ
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_c/mult.gcno b/gcov/org.eclipse.linuxtools.gcov.test/test_c/mult.gcno
new file mode 100644
index 0000000..d7b49a8
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_c/mult.gcno
Binary files differ
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_c/testProcessCovFiles.ref b/gcov/org.eclipse.linuxtools.gcov.test/test_c/testProcessCovFiles.ref
new file mode 100644
index 0000000..bdb5e51
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_c/testProcessCovFiles.ref
@@ -0,0 +1,30 @@
+Parse gcda and gcno files done, resolve graph algorithm executed, now display results
+- PRINT FUNCTIONS ARRAY : 
+-- FUNCTION 0
+     name = fact
+     instrumentd lines = 5
+     executed lines = 5
+-- FUNCTION 1
+     name = main
+     instrumentd lines = 9
+     executed lines = 9
+-- FUNCTION 2
+     name = mult
+     instrumentd lines = 7
+     executed lines = 7
+- PRINT SRCS ARRAY : 
+-- FILE 0
+     name = fact.c
+     total lines = 19
+     instrumentd lines = 5
+     executed lines = 5
+-- FILE 1
+     name = main.c
+     total lines = 28
+     instrumentd lines = 9
+     executed lines = 9
+-- FILE 2
+     name = mult.c
+     total lines = 21
+     instrumentd lines = 7
+     executed lines = 7
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_c/testView.ref b/gcov/org.eclipse.linuxtools.gcov.test/test_c/testView.ref
new file mode 100644
index 0000000..2dc8ff6
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_c/testView.ref
@@ -0,0 +1,8 @@
+Hierarchy;Name;Total Lines;Instrumented Lines;Executed Lines;Coverage %
++-;Summary;68;21;21;100.0
+  +-;fact.c;19;5;5;100.0
+  | +-;fact;;5;5;100.0
+  +-;main.c;28;9;9;100.0
+  | +-;main;;9;9;100.0
+  +-;mult.c;21;7;7;100.0
+    +-;mult;;7;7;100.0
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_c/testViewFolder.ref b/gcov/org.eclipse.linuxtools.gcov.test/test_c/testViewFolder.ref
new file mode 100644
index 0000000..2f8156b
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_c/testViewFolder.ref
@@ -0,0 +1,9 @@
+Hierarchy;Name;Total Lines;Instrumented Lines;Executed Lines;Coverage %
++-;Summary;68;21;21;100.0
+  +-;?;68;21;21;100.0
+    +-;fact.c;19;5;5;100.0
+    | +-;fact;;5;5;100.0
+    +-;main.c;28;9;9;100.0
+    | +-;main;;9;9;100.0
+    +-;mult.c;21;7;7;100.0
+      +-;mult;;7;7;100.0
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_c/testViewFunction.ref b/gcov/org.eclipse.linuxtools.gcov.test/test_c/testViewFunction.ref
new file mode 100644
index 0000000..c24b616
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_c/testViewFunction.ref
@@ -0,0 +1,5 @@
+Hierarchy;Name;Total Lines;Instrumented Lines;Executed Lines;Coverage %
++-;Summary;68;21;21;100.0
+  +-;fact;;5;5;100.0
+  +-;main;;9;9;100.0
+  +-;mult;;7;7;100.0
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/Makefile b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/Makefile
new file mode 100644
index 0000000..e3c2b86
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/Makefile
@@ -0,0 +1,8 @@
+build a.out:
+	g++ -fprofile-arcs -ftest-coverage *.cpp
+
+all: a.out
+	./$< 1 2 3 4 5 6
+	
+clean:
+	rm -f *.o a.out *.gcno *.gcda
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/a.out b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/a.out
new file mode 100755
index 0000000..794f7f9
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/a.out
Binary files differ
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/fact.cpp b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/fact.cpp
new file mode 100644
index 0000000..cb1e7c8
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/fact.cpp
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2009 STMicroelectronics.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation
+ *******************************************************************************/
+#include "fact.hpp"
+#include "mult.hpp"
+
+namespace F
+{
+
+fact::fact()  {};
+
+fact::~fact() {};
+
+long fact::f(long val)
+{
+	for (int k = 100; k-->0;);
+	if (val == 1) return 1;
+	M::mult m;
+	return m.multiply(val,f(val-1));
+}
+}
+
+
+
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/fact.gcda b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/fact.gcda
new file mode 100644
index 0000000..042f39b
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/fact.gcda
Binary files differ
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/fact.gcno b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/fact.gcno
new file mode 100644
index 0000000..be33eb2
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/fact.gcno
Binary files differ
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/fact.hpp b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/fact.hpp
new file mode 100644
index 0000000..32a9296
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/fact.hpp
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2009 STMicroelectronics.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation
+ *******************************************************************************/
+
+namespace F
+{
+  
+  class fact
+  {
+  public:
+	  fact();
+	  ~fact();
+	  long f(long val);
+  };
+
+}
+
+
+
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/main.cpp b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/main.cpp
new file mode 100644
index 0000000..d3c4e21
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/main.cpp
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2009 STMicroelectronics.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation
+ *******************************************************************************/
+#include <iostream>
+#include <stdlib.h>
+#include "fact.hpp"
+
+
+int main(int argc, char** argv)
+{
+	int i = 1;
+	for (; i<argc; i++)
+	{
+		for (int k = 1000; k-->0;);
+		unsigned long val = strtol(argv[i],NULL,10);
+		F::fact f;
+		unsigned long res = f.f(val);
+		std::cout << val
+		          << "! = "
+		          << res
+		          << std::endl;
+	}
+}
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/main.gcda b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/main.gcda
new file mode 100644
index 0000000..073c23e
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/main.gcda
Binary files differ
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/main.gcno b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/main.gcno
new file mode 100644
index 0000000..4f642e7
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/main.gcno
Binary files differ
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/mult.cpp b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/mult.cpp
new file mode 100644
index 0000000..bd55274
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/mult.cpp
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2009 STMicroelectronics.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation
+ *******************************************************************************/
+#include "mult.hpp"
+
+namespace M 
+{
+mult::mult()  {};
+
+mult::~mult() {};
+
+long mult::multiply(long val1, long val2)
+{
+	for (int k = 50; k-->0;);
+	long res = 0;
+	while(val2-->0)
+	{
+		res += val1;
+	}
+	return res;
+};
+}
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/mult.gcda b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/mult.gcda
new file mode 100644
index 0000000..e2821df
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/mult.gcda
Binary files differ
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/mult.gcno b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/mult.gcno
new file mode 100644
index 0000000..b5f1fcd
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/mult.gcno
Binary files differ
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/mult.hpp b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/mult.hpp
new file mode 100644
index 0000000..3d3f147
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/mult.hpp
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2009 STMicroelectronics.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation
+ *******************************************************************************/
+namespace M 
+{
+  class mult
+  {
+  public:
+    mult();
+    
+    ~mult();
+    
+    long multiply(long val1, long val2);
+  };
+}
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/testProcessCovFiles.ref b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/testProcessCovFiles.ref
new file mode 100644
index 0000000..10a2316
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/testProcessCovFiles.ref
@@ -0,0 +1,148 @@
+Parse gcda and gcno files done, resolve graph algorithm executed, now display results
+- PRINT FUNCTIONS ARRAY : 
+-- FUNCTION 0
+     name = _ZN1F4factC2Ev
+     instrumentd lines = 1
+     executed lines = 0
+-- FUNCTION 1
+     name = _ZN1F4factC1Ev
+     instrumentd lines = 0
+     executed lines = 1
+-- FUNCTION 2
+     name = _ZN1F4factD2Ev
+     instrumentd lines = 1
+     executed lines = 0
+-- FUNCTION 3
+     name = _ZN1F4factD1Ev
+     instrumentd lines = 0
+     executed lines = 1
+-- FUNCTION 4
+     name = _ZN1F4fact1fEl
+     instrumentd lines = 5
+     executed lines = 5
+-- FUNCTION 5
+     name = _ZStorSt12_Ios_IostateS_
+     instrumentd lines = 2
+     executed lines = 0
+-- FUNCTION 6
+     name = _ZNSolsEPFRSoS_E
+     instrumentd lines = 2
+     executed lines = 0
+-- FUNCTION 7
+     name = _ZNKSt9basic_iosIcSt11char_traitsIcEE7rdstateEv
+     instrumentd lines = 2
+     executed lines = 0
+-- FUNCTION 8
+     name = _Z41__static_initialization_and_destruction_0ii
+     instrumentd lines = 2
+     executed lines = 2
+-- FUNCTION 9
+     name = _GLOBAL__I_main
+     instrumentd lines = 0
+     executed lines = 0
+-- FUNCTION 10
+     name = _ZNSt9basic_iosIcSt11char_traitsIcEE8setstateESt12_Ios_Iostate
+     instrumentd lines = 2
+     executed lines = 0
+-- FUNCTION 11
+     name = _ZNSt11char_traitsIcE6lengthEPKc
+     instrumentd lines = 2
+     executed lines = 0
+-- FUNCTION 12
+     name = _ZStlsISt11char_traitsIcEERSt13basic_ostreamIcT_ES5_PKc
+     instrumentd lines = 5
+     executed lines = 0
+-- FUNCTION 13
+     name = _ZNSolsEm
+     instrumentd lines = 2
+     executed lines = 0
+-- FUNCTION 14
+     name = main
+     instrumentd lines = 8
+     executed lines = 8
+-- FUNCTION 15
+     name = _ZSt13__check_facetISt5ctypeIcEERKT_PS3_
+     instrumentd lines = 4
+     executed lines = 0
+-- FUNCTION 16
+     name = _ZNKSt5ctypeIcE5widenEc
+     instrumentd lines = 5
+     executed lines = 0
+-- FUNCTION 17
+     name = _ZNKSt9basic_iosIcSt11char_traitsIcEE5widenEc
+     instrumentd lines = 2
+     executed lines = 0
+-- FUNCTION 18
+     name = _ZSt5flushIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_
+     instrumentd lines = 2
+     executed lines = 0
+-- FUNCTION 19
+     name = _ZSt4endlIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_
+     instrumentd lines = 2
+     executed lines = 0
+-- FUNCTION 20
+     name = _ZN1M4multC2Ev
+     instrumentd lines = 1
+     executed lines = 0
+-- FUNCTION 21
+     name = _ZN1M4multC1Ev
+     instrumentd lines = 0
+     executed lines = 1
+-- FUNCTION 22
+     name = _ZN1M4multD2Ev
+     instrumentd lines = 1
+     executed lines = 0
+-- FUNCTION 23
+     name = _ZN1M4multD1Ev
+     instrumentd lines = 0
+     executed lines = 1
+-- FUNCTION 24
+     name = _ZN1M4mult8multiplyEll
+     instrumentd lines = 6
+     executed lines = 6
+- PRINT SRCS ARRAY : 
+-- FILE 0
+     name = fact.cpp
+     total lines = 27
+     instrumentd lines = 7
+     executed lines = 7
+-- FILE 1
+     name = /sw/gnu_compil/gnu/Linux-RH-WS-3/.package/gcc-4.4.1/bin/../lib/gcc/i686-pc-linux-gnu/4.4.1/../../../../include/c++/4.4.1/bits/ios_base.h
+     total lines = 168
+     instrumentd lines = 2
+     executed lines = 0
+-- FILE 2
+     name = /sw/gnu_compil/gnu/Linux-RH-WS-3/.package/gcc-4.4.1/bin/../lib/gcc/i686-pc-linux-gnu/4.4.1/../../../../include/c++/4.4.1/ostream
+     total lines = 561
+     instrumentd lines = 13
+     executed lines = 0
+-- FILE 3
+     name = /sw/gnu_compil/gnu/Linux-RH-WS-3/.package/gcc-4.4.1/bin/../lib/gcc/i686-pc-linux-gnu/4.4.1/../../../../include/c++/4.4.1/bits/basic_ios.h
+     total lines = 441
+     instrumentd lines = 10
+     executed lines = 0
+-- FILE 4
+     name = main.cpp
+     total lines = 31
+     instrumentd lines = 9
+     executed lines = 9
+-- FILE 5
+     name = /sw/gnu_compil/gnu/Linux-RH-WS-3/.package/gcc-4.4.1/bin/../lib/gcc/i686-pc-linux-gnu/4.4.1/../../../../include/c++/4.4.1/iostream
+     total lines = 73
+     instrumentd lines = 1
+     executed lines = 1
+-- FILE 6
+     name = /sw/gnu_compil/gnu/Linux-RH-WS-3/.package/gcc-4.4.1/bin/../lib/gcc/i686-pc-linux-gnu/4.4.1/../../../../include/c++/4.4.1/bits/char_traits.h
+     total lines = 264
+     instrumentd lines = 2
+     executed lines = 0
+-- FILE 7
+     name = /sw/gnu_compil/gnu/Linux-RH-WS-3/.package/gcc-4.4.1/bin/../lib/gcc/i686-pc-linux-gnu/4.4.1/../../../../include/c++/4.4.1/bits/locale_facets.h
+     total lines = 871
+     instrumentd lines = 5
+     executed lines = 0
+-- FILE 8
+     name = mult.cpp
+     total lines = 28
+     instrumentd lines = 8
+     executed lines = 8
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/testView.ref b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/testView.ref
new file mode 100644
index 0000000..af0eefb
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/testView.ref
@@ -0,0 +1,36 @@
+Hierarchy;Name;Total Lines;Instrumented Lines;Executed Lines;Coverage %
++-;Summary;2464;57;25;43.86
+  +-;basic_ios.h;441;10;0;0.0
+  | +-;std::basic_ios<char, std::char_traits<char> >::rdstate() const;;2;0;0.0
+  | +-;std::basic_ios<char, std::char_traits<char> >::setstate(std::_Ios_Iostate);;2;0;0.0
+  | +-;std::basic_ios<char, std::char_traits<char> >::widen(char) const;;2;0;0.0
+  | +-;std::ctype<char> const& std::__check_facet<std::ctype<char> >(std::ctype<char> const*);;4;0;0.0
+  +-;char_traits.h;264;2;0;0.0
+  | +-;std::char_traits<char>::length(char const*);;2;0;0.0
+  +-;fact.cpp;27;7;7;100.0
+  | +-;F::fact::f(long);;5;5;100.0
+  | +-;F::fact::fact();;0;1;0.0
+  | +-;F::fact::fact();;1;0;0.0
+  | +-;F::fact::~fact();;0;1;0.0
+  | +-;F::fact::~fact();;1;0;0.0
+  +-;ios_base.h;168;2;0;0.0
+  | +-;std::operator|(std::_Ios_Iostate, std::_Ios_Iostate);;2;0;0.0
+  +-;iostream;73;1;1;100.0
+  +-;locale_facets.h;871;5;0;0.0
+  | +-;std::ctype<char>::widen(char) const;;5;0;0.0
+  +-;main.cpp;31;9;9;100.0
+  | +-;__static_initialization_and_destruction_0(int, int);;2;2;100.0
+  | +-;global constructors keyed to main;;0;0;0.0
+  | +-;main;;8;8;100.0
+  +-;mult.cpp;28;8;8;100.0
+  | +-;M::mult::mult();;0;1;0.0
+  | +-;M::mult::mult();;1;0;0.0
+  | +-;M::mult::multiply(long, long);;6;6;100.0
+  | +-;M::mult::~mult();;0;1;0.0
+  | +-;M::mult::~mult();;1;0;0.0
+  +-;ostream;561;13;0;0.0
+    +-;std::basic_ostream<char, std::char_traits<char> >& std::endl<char, std::char_traits<char> >(std::basic_ostream<char, std::char_traits<char> >&);;2;0;0.0
+    +-;std::basic_ostream<char, std::char_traits<char> >& std::flush<char, std::char_traits<char> >(std::basic_ostream<char, std::char_traits<char> >&);;2;0;0.0
+    +-;std::basic_ostream<char, std::char_traits<char> >& std::operator<< <std::char_traits<char> >(std::basic_ostream<char, std::char_traits<char> >&, char const*);;5;0;0.0
+    +-;std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&));;2;0;0.0
+    +-;std::basic_ostream<char, std::char_traits<char> >::operator<<(unsigned long);;2;0;0.0
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/testViewFolder.ref b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/testViewFolder.ref
new file mode 100644
index 0000000..ef35963
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/testViewFolder.ref
@@ -0,0 +1,39 @@
+Hierarchy;Name;Total Lines;Instrumented Lines;Executed Lines;Coverage %
++-;Summary;2464;57;25;43.86
+  +-;4.4.1;634;14;1;7.14
+  | +-;iostream;73;1;1;100.0
+  | +-;ostream;561;13;0;0.0
+  |   +-;std::basic_ostream<char, std::char_traits<char> >& std::endl<char, std::char_traits<char> >(std::basic_ostream<char, std::char_traits<char> >&);;2;0;0.0
+  |   +-;std::basic_ostream<char, std::char_traits<char> >& std::flush<char, std::char_traits<char> >(std::basic_ostream<char, std::char_traits<char> >&);;2;0;0.0
+  |   +-;std::basic_ostream<char, std::char_traits<char> >& std::operator<< <std::char_traits<char> >(std::basic_ostream<char, std::char_traits<char> >&, char const*);;5;0;0.0
+  |   +-;std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&));;2;0;0.0
+  |   +-;std::basic_ostream<char, std::char_traits<char> >::operator<<(unsigned long);;2;0;0.0
+  +-;?;86;24;24;100.0
+  | +-;fact.cpp;27;7;7;100.0
+  | | +-;F::fact::f(long);;5;5;100.0
+  | | +-;F::fact::fact();;0;1;0.0
+  | | +-;F::fact::fact();;1;0;0.0
+  | | +-;F::fact::~fact();;0;1;0.0
+  | | +-;F::fact::~fact();;1;0;0.0
+  | +-;main.cpp;31;9;9;100.0
+  | | +-;__static_initialization_and_destruction_0(int, int);;2;2;100.0
+  | | +-;global constructors keyed to main;;0;0;0.0
+  | | +-;main;;8;8;100.0
+  | +-;mult.cpp;28;8;8;100.0
+  |   +-;M::mult::mult();;0;1;0.0
+  |   +-;M::mult::mult();;1;0;0.0
+  |   +-;M::mult::multiply(long, long);;6;6;100.0
+  |   +-;M::mult::~mult();;0;1;0.0
+  |   +-;M::mult::~mult();;1;0;0.0
+  +-;bits;1744;19;0;0.0
+    +-;basic_ios.h;441;10;0;0.0
+    | +-;std::basic_ios<char, std::char_traits<char> >::rdstate() const;;2;0;0.0
+    | +-;std::basic_ios<char, std::char_traits<char> >::setstate(std::_Ios_Iostate);;2;0;0.0
+    | +-;std::basic_ios<char, std::char_traits<char> >::widen(char) const;;2;0;0.0
+    | +-;std::ctype<char> const& std::__check_facet<std::ctype<char> >(std::ctype<char> const*);;4;0;0.0
+    +-;char_traits.h;264;2;0;0.0
+    | +-;std::char_traits<char>::length(char const*);;2;0;0.0
+    +-;ios_base.h;168;2;0;0.0
+    | +-;std::operator|(std::_Ios_Iostate, std::_Ios_Iostate);;2;0;0.0
+    +-;locale_facets.h;871;5;0;0.0
+      +-;std::ctype<char>::widen(char) const;;5;0;0.0
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/testViewFunction.ref b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/testViewFunction.ref
new file mode 100644
index 0000000..e8a0cbb
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov.test/test_cpp/testViewFunction.ref
@@ -0,0 +1,27 @@
+Hierarchy;Name;Total Lines;Instrumented Lines;Executed Lines;Coverage %
++-;Summary;2464;57;25;43.86
+  +-;F::fact::f(long);;5;5;100.0
+  +-;F::fact::fact();;0;1;0.0
+  +-;F::fact::fact();;1;0;0.0
+  +-;F::fact::~fact();;0;1;0.0
+  +-;F::fact::~fact();;1;0;0.0
+  +-;M::mult::mult();;0;1;0.0
+  +-;M::mult::mult();;1;0;0.0
+  +-;M::mult::multiply(long, long);;6;6;100.0
+  +-;M::mult::~mult();;0;1;0.0
+  +-;M::mult::~mult();;1;0;0.0
+  +-;__static_initialization_and_destruction_0(int, int);;2;2;100.0
+  +-;global constructors keyed to main;;0;0;0.0
+  +-;main;;8;8;100.0
+  +-;std::basic_ios<char, std::char_traits<char> >::rdstate() const;;2;0;0.0
+  +-;std::basic_ios<char, std::char_traits<char> >::setstate(std::_Ios_Iostate);;2;0;0.0
+  +-;std::basic_ios<char, std::char_traits<char> >::widen(char) const;;2;0;0.0
+  +-;std::basic_ostream<char, std::char_traits<char> >& std::endl<char, std::char_traits<char> >(std::basic_ostream<char, std::char_traits<char> >&);;2;0;0.0
+  +-;std::basic_ostream<char, std::char_traits<char> >& std::flush<char, std::char_traits<char> >(std::basic_ostream<char, std::char_traits<char> >&);;2;0;0.0
+  +-;std::basic_ostream<char, std::char_traits<char> >& std::operator<< <std::char_traits<char> >(std::basic_ostream<char, std::char_traits<char> >&, char const*);;5;0;0.0
+  +-;std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&));;2;0;0.0
+  +-;std::basic_ostream<char, std::char_traits<char> >::operator<<(unsigned long);;2;0;0.0
+  +-;std::char_traits<char>::length(char const*);;2;0;0.0
+  +-;std::ctype<char> const& std::__check_facet<std::ctype<char> >(std::ctype<char> const*);;4;0;0.0
+  +-;std::ctype<char>::widen(char) const;;5;0;0.0
+  +-;std::operator|(std::_Ios_Iostate, std::_Ios_Iostate);;2;0;0.0
diff --git a/gcov/org.eclipse.linuxtools.gcov/.classpath b/gcov/org.eclipse.linuxtools.gcov/.classpath
new file mode 100644
index 0000000..a87b062
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry excluding="**/.svn/**" kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/gcov/org.eclipse.linuxtools.gcov/.project b/gcov/org.eclipse.linuxtools.gcov/.project
new file mode 100644
index 0000000..7c48214
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.gcov</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/gcov/org.eclipse.linuxtools.gcov/.settings/org.eclipse.jdt.core.prefs b/gcov/org.eclipse.linuxtools.gcov/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..3d3c172
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Thu Jan 15 16:04:09 CET 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/gcov/org.eclipse.linuxtools.gcov/META-INF/MANIFEST.MF b/gcov/org.eclipse.linuxtools.gcov/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..e5efc5e
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/META-INF/MANIFEST.MF
@@ -0,0 +1,26 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.gcov;singleton:=true
+Bundle-Version: 4.1.1.qualifier
+Bundle-Activator: org.eclipse.linuxtools.gcov.Activator
+Bundle-Vendor: %bundleProvider
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.linuxtools.dataviewers,
+ org.eclipse.core.filesystem,
+ org.eclipse.core.variables,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.editors,
+ org.eclipse.linuxtools.binutils,
+ org.eclipse.cdt.core,
+ org.eclipse.cdt.ui,
+ org.eclipse.jface.text,
+ org.eclipse.debug.ui,
+ org.eclipse.linuxtools.dataviewers.charts,
+ org.eclipse.linuxtools.dataviewers.annotatedsourceeditor
+Export-Package: org.eclipse.linuxtools.gcov.utils,
+ org.eclipse.linuxtools.gcov.view
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Localization: plugin
diff --git a/gcov/org.eclipse.linuxtools.gcov/about.html b/gcov/org.eclipse.linuxtools.gcov/about.html
new file mode 100644
index 0000000..0c6525d
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>24th October, 2008</p>	
+<h3>License</h3>
+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<h3>Contributions</h3>
+
+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise
+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such
+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
+
+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or
+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the
+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/gcov/org.eclipse.linuxtools.gcov/build.properties b/gcov/org.eclipse.linuxtools.gcov/build.properties
new file mode 100644
index 0000000..a4d0a62
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/build.properties
@@ -0,0 +1,8 @@
+source.. = src/

+output.. = bin/

+bin.includes = .,\

+               META-INF/,\

+               icons/,\

+               plugin.xml,\

+               about.html,\

+               plugin.properties
\ No newline at end of file
diff --git a/gcov/org.eclipse.linuxtools.gcov/icons/c_file_obj.gif b/gcov/org.eclipse.linuxtools.gcov/icons/c_file_obj.gif
new file mode 100644
index 0000000..915b7f4
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/icons/c_file_obj.gif
Binary files differ
diff --git a/gcov/org.eclipse.linuxtools.gcov/icons/directory_obj.gif b/gcov/org.eclipse.linuxtools.gcov/icons/directory_obj.gif
new file mode 100644
index 0000000..7937f33
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/icons/directory_obj.gif
Binary files differ
diff --git a/gcov/org.eclipse.linuxtools.gcov/icons/function_obj.gif b/gcov/org.eclipse.linuxtools.gcov/icons/function_obj.gif
new file mode 100644
index 0000000..08aef8f
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/icons/function_obj.gif
Binary files differ
diff --git a/gcov/org.eclipse.linuxtools.gcov/icons/src_file_obj.gif b/gcov/org.eclipse.linuxtools.gcov/icons/src_file_obj.gif
new file mode 100644
index 0000000..8fd6adb
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/icons/src_file_obj.gif
Binary files differ
diff --git a/gcov/org.eclipse.linuxtools.gcov/icons/toggle.gif b/gcov/org.eclipse.linuxtools.gcov/icons/toggle.gif
new file mode 100644
index 0000000..62a7d86
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/icons/toggle.gif
Binary files differ
diff --git a/gcov/org.eclipse.linuxtools.gcov/plugin.properties b/gcov/org.eclipse.linuxtools.gcov/plugin.properties
new file mode 100644
index 0000000..54efceb
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/plugin.properties
@@ -0,0 +1,16 @@
+#******************************************************************************
+# Copyright (c) 2009 STMicroelectronics.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#   Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation
+#*******************************************************************************
+bundleProvider = Eclipse
+bundleName = Gcov Plug-in (Incubation)
+gcovEditor = Gcov Editor
+gcov = gcov
+gcovDescription = Gcov view displays the profiling information contained in gcda/gcno files
+gcovCategory = gcov
\ No newline at end of file
diff --git a/gcov/org.eclipse.linuxtools.gcov/plugin.xml b/gcov/org.eclipse.linuxtools.gcov/plugin.xml
new file mode 100644
index 0000000..35247d6
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/plugin.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.2"?>

+<plugin>

+   <extension

+         point="org.eclipse.ui.views">

+      <category

+            id="org.eclipse.linuxtools.gcov"

+            name="%gcovCategory">

+      </category>

+      <view

+            allowMultiple="true"

+            category="org.eclipse.linuxtools.gcov"

+            class="org.eclipse.linuxtools.gcov.view.CovView"

+            icon="icons/toggle.gif"

+            id="org.eclipse.linuxtools.gcov.view"

+            name="%gcov"

+            restorable="false">

+      </view>

+   </extension>

+   <extension

+         point="org.eclipse.ui.editors">

+      <editor

+            class="org.eclipse.linuxtools.gcov.view.annotatedsource.STAnnotatedSourceNotFoundEditor"

+            icon="icons/src_file_obj.gif"

+            id="org.eclipse.linuxtools.gcov.view.annotatedsource.STAnnotatedSourceNotFoundEditor"

+            name="Source Not Found">

+      </editor>

+      <editor

+            extensions="gcda, gcno"

+            icon="icons/toggle.gif"

+            id="org.eclipse.linuxtools.gcov.editor"

+            launcher="org.eclipse.linuxtools.gcov.action.OpenGCAction"

+            name="%gcovEditor">

+      </editor>

+   </extension>

+

+

+</plugin>

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/Activator.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/Activator.java
new file mode 100644
index 0000000..e595b1d
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/Activator.java
@@ -0,0 +1,71 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov;

+

+import org.eclipse.jface.resource.ImageDescriptor;

+import org.eclipse.ui.plugin.AbstractUIPlugin;

+import org.osgi.framework.BundleContext;

+

+/**

+ * The activator class controls the plug-in life cycle

+ */

+public class Activator extends AbstractUIPlugin {

+

+	// The plug-in ID

+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.gcov";

+

+	// The shared instance

+	private static Activator plugin;

+	

+	/**

+	 * The constructor

+	 */

+	public Activator() {

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

+	 */

+	public void start(BundleContext context) throws Exception {

+		super.start(context);

+		plugin = this;

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

+	 */

+	public void stop(BundleContext context) throws Exception {

+		plugin = null;

+		super.stop(context);

+	}

+

+	/**

+	 * Returns the shared instance

+	 *

+	 * @return the shared instance

+	 */

+	public static Activator getDefault() {

+		return plugin;

+	}

+

+	/**

+	 * Returns an image descriptor for the image file at the given

+	 * plug-in relative path

+	 *

+	 * @param path the path

+	 * @return the image descriptor

+	 */

+	public static ImageDescriptor getImageDescriptor(String path) {

+		return imageDescriptorFromPlugin(PLUGIN_ID, path);

+	}

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/action/OpenGCAction.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/action/OpenGCAction.java
new file mode 100644
index 0000000..bfc86b4
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/action/OpenGCAction.java
@@ -0,0 +1,166 @@
+/*******************************************************************************
+ * Copyright (c) 2009 STMicroelectronics.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.gcov.action;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+
+import org.eclipse.cdt.core.model.CModelException;
+import org.eclipse.cdt.core.model.CoreModel;
+import org.eclipse.cdt.core.model.IBinary;
+import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.linuxtools.gcov.Activator;
+import org.eclipse.linuxtools.gcov.dialog.OpenGCDialog;
+import org.eclipse.linuxtools.gcov.view.CovView;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorLauncher;
+import org.eclipse.ui.PlatformUI;
+
+
+/**
+ * Action performed when user clicks on a gcda/gcno file
+ *
+ * @author Xavier Raynaud <xavier.raynaud@st.com>
+ */
+public class OpenGCAction implements IEditorLauncher {
+
+	public void open(IPath file) {
+		Shell shell = PlatformUI.getWorkbench().getDisplay().getActiveShell();
+		String extension = file.getFileExtension();
+		File gcno;
+		File gcda;
+		if ("gcno".equals(extension)) {
+			IPath file2 = file.removeFileExtension().addFileExtension("gcda");
+			gcno = file.toFile();
+			gcda = file2.toFile();
+		} else if ("gcda".equals(extension)) {
+			IPath file2 = file.removeFileExtension().addFileExtension("gcno");
+			gcda = file.toFile();
+			gcno = file2.toFile();
+			
+		} else {
+			// should never occurs
+			return;
+		}
+
+		if (gcda == null || !gcda.isFile()) {
+			String msg = "File " + gcda + " does not exist.";
+			msg += "\nPlease run your application at least once.";
+			MessageDialog.openError(shell, "gcov Error", msg);
+			return;
+		}
+		if (gcno == null || !gcno.isFile()) {
+			String msg = "File " + gcno + " does not exist.";
+			msg += "\nPlease recompile your application.";
+			MessageDialog.openError(shell, "gcov Error", msg);
+			return;
+		}
+		
+
+		String s = getDefaultBinary(file);
+		OpenGCDialog d = new OpenGCDialog(shell, s, file);
+		if (d.open() != OpenGCDialog.OK) {
+			return;
+		}
+		String binaryPath = d.getBinaryFile();
+		if (d.isCompleteCoverageResultWanted()) {
+			CovView.displayCovResults(binaryPath);
+		} else {
+			CovView.displayCovDetailedResult(binaryPath, gcda.getAbsolutePath());
+		}
+	}
+
+	private String getDefaultBinary(IPath file) {
+		File gmonFile = file.toFile();
+		File parent = gmonFile.getParentFile();
+		File info = new File(parent,"AnalysisInfo.txt");
+		IProject project = null;
+		IFile ifile = null;
+		try {
+			String line;
+			String  tab[];
+			if (info.exists()) {
+				BufferedReader br = new BufferedReader(new FileReader(info.toString()));
+
+				while ((line = br.readLine())!= null){
+					tab = line.split("=");
+					String name="", value="";
+					if (tab.length > 1){
+						name=tab[0];
+						value=tab[1].trim();	
+						if (name.equals("Project Name ")){
+							project = ResourcesPlugin.getWorkspace().getRoot().getProject(value);
+						}
+						else if (name.equals("Program Name ")){
+							if(project != null){
+								ifile = project.getFile(value);
+								br.close();
+								if (ifile.exists()) {
+									return ifile.getLocation().toString();
+								}
+							}
+						}	
+					}
+				}
+			}else{
+				IFile c = ResourcesPlugin.getWorkspace().getRoot()
+				.getFileForLocation(file);
+				if (c != null) {
+					project = c.getProject();
+					if (project != null && project.exists()) {
+						ICProject cproject = CoreModel.getDefault().create(project);
+						if (cproject != null) {
+							try {
+								IBinary[] b = cproject.getBinaryContainer()
+								.getBinaries();
+								if (b != null && b.length > 0 && b[0] != null) {
+									IResource r = b[0].getResource();
+									return r.getLocation().toOSString();
+								}
+							} catch (CModelException _) {
+							}
+						}
+					}
+				}
+			}
+		} catch (FileNotFoundException e) {
+			Status status = new Status(
+					Status.WARNING,
+					Activator.PLUGIN_ID,
+					IStatus.WARNING,
+					e.getMessage(),
+					e
+			);
+			Activator.getDefault().getLog().log(status);
+		} catch (IOException e) {
+			Status status = new Status(
+					Status.ERROR,
+					Activator.PLUGIN_ID,
+					IStatus.ERROR,
+					e.getMessage(),
+					e
+			);
+			Activator.getDefault().getLog().log(status);
+		}
+		return "";
+	}
+}
diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/action/SwitchContentProviderAction.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/action/SwitchContentProviderAction.java
new file mode 100644
index 0000000..b1ac0f2
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/action/SwitchContentProviderAction.java
@@ -0,0 +1,44 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.action;

+

+import org.eclipse.jface.action.Action;

+import org.eclipse.jface.viewers.ColumnViewer;

+import org.eclipse.jface.viewers.IContentProvider;

+import org.eclipse.jface.viewers.TreeViewer;

+import org.eclipse.linuxtools.gcov.Activator;

+

+

+	/**

+	 * This action changes the content provider 

+	 */

+

+	public class SwitchContentProviderAction extends Action {

+	

+		private final ColumnViewer viewer;

+		private final IContentProvider provider;

+

+		public SwitchContentProviderAction(String name, String iconPath, ColumnViewer viewer, IContentProvider provider) {

+			super(name, AS_RADIO_BUTTON);

+			this.setImageDescriptor(Activator.getImageDescriptor(iconPath));

+			this.setToolTipText(name);		

+			this.viewer = viewer;

+			this.provider = provider;

+		}

+

+		@Override

+		public void run() {

+			viewer.getControl().setRedraw(false); 

+			viewer.setContentProvider(provider);

+			((TreeViewer)viewer).expandToLevel(2);

+			viewer.getControl().setRedraw(true); 

+		}

+	}
\ No newline at end of file
diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/dialog/OpenGCDialog.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/dialog/OpenGCDialog.java
new file mode 100644
index 0000000..1d8b3ce
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/dialog/OpenGCDialog.java
@@ -0,0 +1,303 @@
+/*******************************************************************************
+ * Copyright (c) 2009 STMicroelectronics.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.gcov.dialog;
+
+import java.io.File;
+
+import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.variables.IStringVariableManager;
+import org.eclipse.core.variables.VariablesPlugin;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.linuxtools.binutils.utils.STSymbolManager;
+import org.eclipse.linuxtools.gcov.Activator;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
+import org.eclipse.ui.dialogs.ISelectionStatusValidator;
+import org.eclipse.ui.model.WorkbenchContentProvider;
+import org.eclipse.ui.model.WorkbenchLabelProvider;
+import org.eclipse.ui.views.navigator.ResourceComparator;
+
+
+/**
+ * This dialog box is opened when user clicks on a gcno/gcda file.
+ * it allows the user to choose the binary file who produced the gcno/gcda file.
+ * @author Xavier Raynaud <xavier.raynaud@st.com>
+ *
+ */
+public class OpenGCDialog extends Dialog {
+	
+	/* Inputs */
+	private Text binText;
+    private String binValue;
+
+    private Button openThisFileOnlyButton;
+    private Button openCoverageSummaryButton;
+    private boolean openCoverageSummary = true;
+    
+    /* buttons */
+    private Button binBrowseWorkspaceButton;
+    private Button binBrowseFileSystemButton;
+    
+    /* error label */
+    private Label errorLabel;
+    
+    /* validation boolean */
+    private boolean binaryValid;
+
+    /* internal listener */
+    private final BinaryModifyListener binModifyListener = new BinaryModifyListener();
+    
+    private final String defaultValue;
+    private final IPath gcFile;
+
+    /**
+     * Constructor
+     * @param parentShell
+     * @param binPath the path to a binary file.
+     */
+	public OpenGCDialog(Shell parentShell, String binPath, IPath gcFile) {
+		super(parentShell);
+		this.gcFile = gcFile;
+        setShellStyle(getShellStyle() | SWT.RESIZE);
+        this.defaultValue = binPath;
+	}
+
+	/**
+     * Gets the Binary file selected by the user
+     * @return a path to a binary file
+     */
+    public String getBinaryFile() {
+    	return binValue;
+    }
+    
+	/**
+     * Gets whether the user wants a complete coverage result, or a result specific file to the given gcFile.
+     */
+    public boolean isCompleteCoverageResultWanted() {
+    	return openCoverageSummary;
+    }
+
+
+    protected Control createContents(Composite parent) {
+        Control composite = super.createContents(parent);
+        validateBinary();
+        return composite;
+    }
+
+    protected Control createDialogArea(Composite parent) {
+    	this.getShell().setText("Gcov - Open coverage results...");
+        Composite composite = (Composite) super.createDialogArea(parent);
+
+    	/* first line */
+        Group c = new Group(composite, SWT.NONE);
+        c.setText("Binary File");
+        c.setToolTipText("Please enter here the binary file who produced this gcov trace.");
+        GridLayout layout = new GridLayout(2,false);
+        c.setLayout(layout);
+        GridData data = new GridData(GridData.FILL_BOTH);
+        c.setLayoutData(data);
+        
+        Label binLabel = new Label(c,SWT.NONE);
+        binLabel.setText("Please enter here the binary file who produced gcov trace");
+        data = new GridData();
+        data.horizontalSpan = 2;
+        binLabel.setLayoutData(data);
+
+        binText = new Text(c,SWT.BORDER);
+        binText.setText(this.defaultValue);
+        data = new GridData(GridData.FILL_HORIZONTAL);
+        data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH;
+        binText.setLayoutData(data);
+        binText.addModifyListener(binModifyListener);
+
+        Composite cbBin = new Composite(c,SWT.NONE);
+        data = new GridData(GridData.HORIZONTAL_ALIGN_END);
+        cbBin.setLayoutData(data);
+        cbBin.setLayout(new GridLayout(2, true));
+        binBrowseWorkspaceButton = new Button(cbBin, SWT.PUSH);
+        binBrowseWorkspaceButton.setText("&Workspace...");
+        binBrowseWorkspaceButton.addSelectionListener(
+                new SelectionAdapter()
+                {
+                    public void widgetSelected(SelectionEvent sev)
+                    {
+                    	handleBrowseWorkspace("Open Binary file...", binText);
+                    }
+                }
+        );
+        binBrowseFileSystemButton = new Button(cbBin, SWT.PUSH);
+        binBrowseFileSystemButton.setText("&File System...");
+        binBrowseFileSystemButton.addSelectionListener(
+                new SelectionAdapter()
+                {
+                    public void widgetSelected(SelectionEvent sev)
+                    {
+                        handleBrowse("Open Binary file...", binText);
+                    }
+                }
+        );
+        
+        Group covMode = new Group(composite, SWT.NONE);
+        covMode.setText("Coverage result");
+        covMode.setToolTipText("Please choose the result scope.");
+        GridData covModeData = new GridData(GridData.FILL_BOTH);
+        covMode.setLayoutData(covModeData);
+        covMode.setLayout(new GridLayout());
+        openThisFileOnlyButton = new Button(covMode, SWT.RADIO);
+        openThisFileOnlyButton.setLayoutData(new GridData());
+        openCoverageSummaryButton = new Button(covMode, SWT.RADIO);
+        openCoverageSummaryButton.setLayoutData(new GridData());
+        String cFile = gcFile.removeFileExtension().lastSegment() + ".c";
+        
+        openThisFileOnlyButton.setText("Show coverage details for \"" + cFile + "\" only.");
+        openCoverageSummaryButton.setText("Show coverage for the whole selected binary file");
+        
+        openCoverageSummaryButton.setSelection(true);
+        
+        SelectionAdapter sa = new SelectionAdapter() {
+        	public void widgetSelected(SelectionEvent sev)
+            {
+        		openCoverageSummary = openCoverageSummaryButton.getSelection();
+            }
+        };
+        openCoverageSummaryButton.addSelectionListener(sa);
+        openThisFileOnlyButton.addSelectionListener(sa);
+        
+
+        /* 2sd line */
+        errorLabel = new Label(composite,SWT.NONE);
+        data = new GridData(GridData.FILL_HORIZONTAL);
+        data.horizontalSpan = 3;
+        errorLabel.setLayoutData(data);
+        errorLabel.setForeground(getShell().getDisplay().getSystemColor(SWT.COLOR_RED));
+
+        c.layout();
+
+        return composite;
+    }
+
+    private void validateBinary() {
+        binValue = binText.getText();
+        IStringVariableManager mgr = VariablesPlugin.getDefault().getStringVariableManager();
+        try {
+        	binValue = mgr.performStringSubstitution(binValue, false);
+        } catch (CoreException _) {
+        	// do nothing: never occurs
+        }
+        
+        File f = new File(binValue);
+        if (f.exists()) {
+    		IBinaryObject binary = STSymbolManager.sharedInstance.getBinaryObject(new Path(binValue));
+    		if (binary == null) {
+    			MessageDialog.openError(
+    					PlatformUI.getWorkbench().getDisplay().getActiveShell(),
+    					"Invalid binary file",
+    					binText.getText() + " is not a valid binary file.");
+    			return;
+    		}
+        	binaryValid = true;
+            getButton(IDialogConstants.OK_ID).setEnabled(binaryValid);
+            errorLabel.setText("");
+        } else {
+        	binaryValid = false;
+            getButton(IDialogConstants.OK_ID).setEnabled(false);
+            if (!binValue.equals("")) {
+            	errorLabel.setText("\"" + binText.getText() + "\" doesn't exist");
+            } else {
+            	errorLabel.setText("Please enter a binary file");
+            }
+            return;
+        }
+    }
+
+    private class BinaryModifyListener implements ModifyListener
+    {
+        public void modifyText(ModifyEvent e) {
+            validateBinary();
+        }
+
+    }
+
+    protected void handleBrowseWorkspace(String msg, Text text) {
+        ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(), new WorkbenchLabelProvider(), new WorkbenchContentProvider());
+        dialog.setTitle(msg); 
+        dialog.setMessage(msg); 
+        dialog.setInput(ResourcesPlugin.getWorkspace().getRoot()); 
+        dialog.setComparator(new ResourceComparator(ResourceComparator.NAME));
+        dialog.setAllowMultiple(false);
+        IContainer c = ResourcesPlugin.getWorkspace().getRoot().getContainerForLocation(this.gcFile);
+        if (c != null) dialog.setInitialSelection(c.getProject());
+        dialog.setValidator(new ISelectionStatusValidator() {
+            public IStatus validate(Object[] selection)
+            {
+                if (selection.length != 1) {
+                        return new Status(IStatus.ERROR, Activator.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
+                }
+                if (!(selection[0] instanceof IFile)) {
+                    return new Status(IStatus.ERROR, Activator.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
+                }
+                return new Status(IStatus.OK, Activator.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
+            }
+        });
+        if (dialog.open() == IDialogConstants.OK_ID) {
+            IResource resource = (IResource) dialog.getFirstResult();
+            text.setText("${resource_loc:" + resource.getFullPath() + "}");
+        }
+    }
+
+
+    protected void handleBrowse(String msg, Text text)
+    {
+        FileDialog dialog = new FileDialog(this.getShell(),SWT.OPEN);
+        dialog.setText(msg);
+        String t = text.getText();
+        IStringVariableManager mgr = VariablesPlugin.getDefault().getStringVariableManager();
+        try {
+        	t = mgr.performStringSubstitution(t, false);
+        } catch (CoreException _) {
+        	// do nothing: never occurs
+        }
+        File f = new File(t);
+        t = f.getParent();
+        if (t == null || t.length() == 0) {
+        	t = this.gcFile.removeLastSegments(1).toOSString();
+        }
+        dialog.setFilterPath(t);
+        String s = dialog.open();
+        if (s != null) text.setText(s);
+    }
+}
diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/model/AbstractTreeElement.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/model/AbstractTreeElement.java
new file mode 100644
index 0000000..0fcce34
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/model/AbstractTreeElement.java
@@ -0,0 +1,79 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.model;

+

+import java.util.LinkedList;

+

+public abstract class AbstractTreeElement implements TreeElement{

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = -4911602250295116203L;

+	private final TreeElement parent;

+	private final LinkedList<TreeElement> children = new LinkedList<TreeElement>();

+	private final String name;

+	private final int totalLines;

+	private final int executedLines;

+	private final int instrumentedLines;

+	

+	public AbstractTreeElement(TreeElement parent, String name, int totalLines,

+			int executedLines, int instrumentedLines) {

+		this.parent = parent;

+		this.name = name;

+		this.totalLines = totalLines;

+		this.executedLines = executedLines;

+		this.instrumentedLines = instrumentedLines;

+	}

+	

+	public TreeElement getParent() {

+		return parent;

+	}

+	

+	public boolean hasChildren() {

+		return (children.size()>0);

+	}

+

+	public LinkedList<? extends TreeElement> getChildren() {

+		return children;

+	}

+

+	public String getName() {

+		return name;

+	}

+	

+	public TreeElement getRoot() {

+		if (parent == null) return this;

+		return parent.getRoot();

+	}

+

+	public int getExecutedLines() {

+		return executedLines;

+	}

+	

+	public int getInstrumentedLines() {

+		return instrumentedLines;

+	}

+

+	public float getCoveragePercentage() {

+		 if (instrumentedLines !=0 )

+			return (100.f*executedLines)/(instrumentedLines);

+		else return 0;

+	}

+

+	public void addChild(TreeElement child){

+		children.add(child);

+	}

+	

+	public int getTotalLines() {

+		return totalLines;

+	}

+}
\ No newline at end of file
diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/model/CovFileTreeElement.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/model/CovFileTreeElement.java
new file mode 100644
index 0000000..5bfa929
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/model/CovFileTreeElement.java
@@ -0,0 +1,25 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.model;

+

+

+public class CovFileTreeElement extends AbstractTreeElement {

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = -5017234616535899796L;

+

+	public CovFileTreeElement(TreeElement parent, 

+			String name, int totalLines, int executedLines, int instrumentedLines) {

+		super(parent, name, totalLines, executedLines, instrumentedLines);

+	}

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/model/CovFolderTreeElement.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/model/CovFolderTreeElement.java
new file mode 100644
index 0000000..8bfafdf
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/model/CovFolderTreeElement.java
@@ -0,0 +1,24 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.model;

+

+public class CovFolderTreeElement extends AbstractTreeElement {

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = 583359546284716138L;

+

+	public CovFolderTreeElement(TreeElement parent, 

+					String name, int totalLines, int executedLines, int instrumentedLines) {

+		super(parent, name, totalLines, executedLines, instrumentedLines);

+	}

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/model/CovFunctionTreeElement.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/model/CovFunctionTreeElement.java
new file mode 100644
index 0000000..3f5e32e
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/model/CovFunctionTreeElement.java
@@ -0,0 +1,57 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.model;

+

+import java.util.LinkedList;

+

+

+public class CovFunctionTreeElement extends AbstractTreeElement {

+	

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = -2025221943523670378L;

+	private final String sourceFilePath;

+	private final long firstLnNmbr;

+	

+	public CovFunctionTreeElement(TreeElement parent, String name, String sourceFilePath, 

+			long firstLnNmbr, int executedLines, int instrumentedLines) {

+		super(parent, name, 0, executedLines, instrumentedLines);

+		this.sourceFilePath = sourceFilePath;

+		this.firstLnNmbr = firstLnNmbr;

+	}

+

+		

+	/* no children for functions*/

+	

+	public boolean hasChildren() {

+		return false;

+	}

+

+	public LinkedList<? extends TreeElement> getChildren() {

+		return null;

+	}

+

+	public void addChild(TreeElement child){

+	}

+	

+

+	/* specific methods for functions*/

+	

+	public String getSourceFilePath() {

+		return sourceFilePath;

+	}

+

+	public long getFirstLnNmbr() {

+		return firstLnNmbr;

+	}

+	

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/model/CovRootTreeElement.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/model/CovRootTreeElement.java
new file mode 100644
index 0000000..57d879e
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/model/CovRootTreeElement.java
@@ -0,0 +1,26 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.model;

+

+import java.io.Serializable;

+

+public class CovRootTreeElement extends AbstractTreeElement implements Serializable {

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = 877070271548608926L;

+

+	public CovRootTreeElement(String name, int totalLines, int executedLines,

+			int instrumentedLines) {

+		super(null, name, totalLines, executedLines, instrumentedLines);

+	}

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/model/TreeElement.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/model/TreeElement.java
new file mode 100644
index 0000000..d489010
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/model/TreeElement.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2009 STMicroelectronics.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.gcov.model;
+
+import java.io.Serializable;
+import java.util.LinkedList;
+
+public interface TreeElement extends Serializable{
+	TreeElement getParent();
+	LinkedList<? extends TreeElement> getChildren();
+	boolean hasChildren();
+	TreeElement getRoot();
+
+	String getName();
+	int getExecutedLines();
+	int getInstrumentedLines();
+	int getTotalLines();
+	float getCoveragePercentage();
+}
diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/Arc.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/Arc.java
new file mode 100644
index 0000000..848462b
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/Arc.java
@@ -0,0 +1,131 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.parser;

+

+import java.io.Serializable;

+import java.util.List;

+

+public class Arc implements Serializable{

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = 4104429137191407662L;

+

+	private static final int VCOV_ARC_ON_TREE = (1 << 0);

+	private static final int VCOV_ARC_FAKE = (1 << 1);

+	private static final int VCOV_ARC_FALLTHROUGH = (1 << 2);

+	

+	private final Block srcBlock;

+	private final Block dstnatnBlock;

+	private final long flag;

+	private final boolean fake;

+	private final boolean onTree;

+	private final boolean fallthrough;

+	

+	private long count = 0;

+	private boolean countValid = false;

+	private boolean isCallNonReturn = false; // Arc is for a function that abnormally returns

+	private boolean isNonLoclaReturn = false; // Arc is for catch/setjump

+	private boolean isUnconditionnal = false; // Is an unconditional branch.

+

+	/**

+	 * Constructor

+	 */

+	public Arc(int srcBlockIndice, int dstnatnBlockIndice, long flag, List<Block> otherArcParams) {

+		this.flag = flag;

+		this.dstnatnBlock = otherArcParams.get(dstnatnBlockIndice);

+		this.srcBlock = otherArcParams.get(srcBlockIndice);

+		this.count = 0;

+		this.countValid = false;

+		if ((flag & VCOV_ARC_ON_TREE) != 0) {

+			onTree = true;

+			fake = false;

+			fallthrough = false;

+		} else if ((flag & VCOV_ARC_FAKE) != 0) {

+			onTree = false;

+			fake = true;

+			fallthrough = true;

+		} else if ((flag & VCOV_ARC_FALLTHROUGH) != 0) {

+			onTree = false;

+			fake = false;

+			fallthrough = true;

+		} else {

+			onTree = false;

+			fake = false;

+			fallthrough = false;

+		}

+	}

+

+	public Block getDstnatnBlock() {

+		return dstnatnBlock;

+	}

+

+	public long getFlag() {

+		return flag;

+	}

+

+	public boolean isFake() {

+		return fake;

+	}

+

+	public boolean isOnTree() {

+		return onTree;

+	}

+

+	public boolean isFallthrough() {

+		return fallthrough;

+	}

+

+	public boolean isUnconditionnal() {

+		return isUnconditionnal;

+	}

+

+	public boolean isNonLoclaReturn() {

+		return isNonLoclaReturn;

+	}

+

+	public boolean isCallNonReturn() {

+		return isCallNonReturn;

+	}

+

+	public void setCallNonReturn(boolean isCallNonReturn) {

+		this.isCallNonReturn = isCallNonReturn;

+	}

+

+	public void setNonLoclaReturn(boolean isNonLoclaReturn) {

+		this.isNonLoclaReturn = isNonLoclaReturn;

+	}

+

+	public void setUnconditionnal(boolean isUnconditionnal) {

+		this.isUnconditionnal = isUnconditionnal;

+	}

+

+	public Block getSrcBlock() {

+		return srcBlock;

+	}

+

+	public void setCount(long count) {

+		this.count = count;

+	}

+

+	public void setCountValid(boolean countValid) {

+		this.countValid = countValid;

+	}

+

+	public long getCount() {

+		return count;

+	}

+

+	public boolean isCountValid() {

+		return countValid;

+	}

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/Block.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/Block.java
new file mode 100644
index 0000000..495ebfe
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/Block.java
@@ -0,0 +1,177 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.parser;

+

+import java.io.Serializable;

+import java.util.ArrayList;

+

+public class Block implements Serializable{

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = -7665287885679756014L;

+	private final ArrayList<Arc> entryArcs = new ArrayList<Arc>();

+	private final ArrayList<Arc> exitArcs = new ArrayList<Arc>();

+	private final long flag;

+	private long numSuccs = 0;

+	private long  numPreds = 0;

+	private long  count = 0;

+	private boolean isCallSite = false;// Does the call

+	private boolean isCallReturn = false; // Is the return

+	private boolean isNonLocalReturn = false;

+	private boolean validChain = false;

+	private boolean invalidChain = false;

+	private boolean countValid = false;

+	private final BlkLine blkline = new BlkLine();

+

+	/**

+	 * Constructor

+	 */

+	public Block(long flag) {

+		this.flag = flag;

+	}

+	

+	

+	/* getters & setters */

+	public long getFlag() {

+		return flag;

+	}

+

+	public ArrayList<Arc> getEntryArcs() {

+		return entryArcs;

+	}

+

+	public ArrayList<Arc> getExitArcs() {

+		return exitArcs;

+	}

+

+	public boolean isCallSite() {

+		return isCallSite;

+	}

+

+	public boolean isCallReturn() {

+		return isCallReturn;

+	}

+

+	public boolean isNonLocalReturn() {

+		return isNonLocalReturn;

+	}

+

+	public void addEntryArcs(Arc arcEntry) {

+		this.entryArcs.add(arcEntry);

+	}

+

+	public void addExitArcs(Arc arcExit) {

+		this.exitArcs.add(arcExit);

+	}

+

+	public void setCallSite(boolean isCallSite) {

+		this.isCallSite = isCallSite;

+	}

+

+	public void setCallReturn(boolean isCallReturn) {

+		this.isCallReturn = isCallReturn;

+	}

+

+	public void setNonLocalReturn(boolean isNonLocalReturn) {

+		this.isNonLocalReturn = isNonLocalReturn;

+	}

+

+	public void decNumSuccs() {

+		this.numSuccs--;

+	}

+

+	public void decNumPreds() {

+		this.numPreds--;

+	}

+

+	public void incNumPreds() {

+		this.numPreds++;

+	}

+

+	public void incNumSuccs() {

+		this.numSuccs++;

+	}

+

+	public boolean isValidChain() {

+		return validChain;

+	}

+

+	public void setValidChain(boolean validChain) {

+		this.validChain = validChain;

+	}

+

+	public boolean isInvalidChain() {

+		return invalidChain;

+	}

+

+	public void setInvalidChain(boolean invalidChain) {

+		this.invalidChain = invalidChain;

+	}

+

+	public long getCount() {

+		return count;

+	}

+

+	public void setCount(long count) {

+		this.count = count;

+	}

+

+	public void setCountValid(boolean countValid) {

+		this.countValid = countValid;

+	}

+

+	public boolean isCountValid() {

+		return countValid;

+	}

+

+	public long getNumSuccs() {

+		return numSuccs;

+	}

+

+	public long getNumPreds() {

+		return numPreds;

+	}

+

+	public void setNumSuccs(long numSuccs) {

+		this.numSuccs = numSuccs;

+	}

+

+	public void setNumPreds(long numPreds) {

+		this.numPreds = numPreds;

+	}

+

+	public long[] getEncoding() {

+		return blkline.encoding;

+	}

+

+	public void setEncoding(long[] lineNos) {

+		this.blkline.encoding = lineNos;

+	}

+

+	public int getLineNum() {

+		return blkline.num;

+	}

+

+	public void setNumLine(int numline) {

+		this.blkline.num = numline;

+	}

+

+	class BlkLine implements Serializable{

+		/**

+		 * 

+		 */

+		private static final long serialVersionUID = 2757557929188979686L;

+		public long[] encoding;

+		public int num;

+	}

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/CovManager.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/CovManager.java
new file mode 100644
index 0000000..b1c3fa0
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/CovManager.java
@@ -0,0 +1,359 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.parser;

+

+import java.io.BufferedInputStream;

+import java.io.DataInput;

+import java.io.DataInputStream;

+import java.io.File;

+import java.io.FileInputStream;

+import java.io.FileNotFoundException;

+import java.io.IOException;

+import java.io.InputStream;

+import java.io.InputStreamReader;

+import java.io.LineNumberReader;

+import java.io.PrintStream;

+import java.io.Serializable;

+import java.util.ArrayList;

+import java.util.HashMap;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.IPath;

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.Path;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.linuxtools.binutils.utils.STSymbolManager;

+import org.eclipse.linuxtools.gcov.Activator;

+import org.eclipse.linuxtools.gcov.model.CovFileTreeElement;

+import org.eclipse.linuxtools.gcov.model.CovFolderTreeElement;

+import org.eclipse.linuxtools.gcov.model.CovFunctionTreeElement;

+import org.eclipse.linuxtools.gcov.model.CovRootTreeElement;

+

+

+/**

+ * @author Xavier Raynaud <xavier.raynaud@st.com>

+ *

+ */

+public class CovManager implements Serializable {

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = 5582066617970911413L;

+	// input

+	private final String binaryPath;

+	// results

+	private final ArrayList<Folder> allFolders = new ArrayList<Folder>();

+	private final ArrayList<SourceFile> allSrcs = new ArrayList<SourceFile>();

+	private final ArrayList<GcnoFunction> allFnctns = new ArrayList<GcnoFunction>();

+	private final HashMap<String, SourceFile> sourceMap = new HashMap<String, SourceFile>();

+	private long nbrPgmRuns = 0;

+	// for view

+	private CovRootTreeElement rootNode;

+

+	/**

+	 * Constructor

+	 * @param binaryPath

+	 */

+	public CovManager(String binaryPath) {

+		this.binaryPath = binaryPath;

+	}

+

+

+	/**

+	 * parse coverage files, execute resolve graph algorithm, process counts for functions, 

+	 * lines and folders.    

+	 * @param List of coverage files paths

+	 * @throws CoreException, IOException, InterruptedException

+	 */

+

+	public void processCovFiles(List<String> covFilesPaths) throws CoreException, IOException, InterruptedException {

+		GcdaRecordsParser daRcrd = null;

+		DataInput traceFile;

+		for (String gcdaPath: covFilesPaths) {

+			String gcnoPath = gcdaPath.replace(".gcda", ".gcno");

+			// parse GCNO file

+			traceFile = OpenTraceFileStream(gcnoPath);

+			GcnoRecordsParser noRcrd = new GcnoRecordsParser(sourceMap, allSrcs);

+			noRcrd.parseData(traceFile);

+

+			// add new functions parsed to AllSrcs array

+			for (GcnoFunction f: noRcrd.getFnctns()) {

+				allFnctns.add(f);

+			}

+

+			//close the input stream

+			if(traceFile.getClass() == DataInputStream.class)

+				((DataInputStream)traceFile).close();

+

+			// parse GCDA file

+			traceFile = OpenTraceFileStream(gcdaPath);

+			if (noRcrd.getFnctns().isEmpty()){

+				String message = gcnoPath + " doesn't contain any function:\n";

+				Status status = new Status(Status.ERROR, Activator.PLUGIN_ID, message);

+				throw new CoreException(status);

+			}

+			daRcrd = new GcdaRecordsParser(noRcrd.getFnctns());

+			daRcrd.parseGcdaRecord(traceFile);

+

+			//close the input stream

+			if(traceFile.getClass() == DataInputStream.class)

+				((DataInputStream)traceFile).close();

+		}

+

+		// to fill the view title

+		if (daRcrd != null)

+			nbrPgmRuns = daRcrd.getObjSmryNbrPgmRuns();

+		/* process counts from data parsed */

+

+		// solve graph for each function

+		for (GcnoFunction gf : allFnctns) {

+			gf.solveGraphFnctn();

+		}

+

+		// allocate lines

+		for (SourceFile sourceFile: allSrcs) {

+			sourceFile.createLines();

+		}

+

+		// add line counts

+		for (GcnoFunction gf : allFnctns) {

+			gf.addLineCounts(allSrcs);

+		}

+

+		// accumulate lines

+		for (SourceFile sf: allSrcs) {

+			sf.accumulateLineCounts();

+		}

+

+		/* compute counts by folder*/

+

+		// make the folders list

+		for (SourceFile sf : allSrcs) {

+			File srcFile = new File (sf.getName());

+			String folderName = srcFile.getParent();

+			if (folderName == null) folderName = "?";

+			Folder folder = null;

+			for (Folder f: allFolders) {

+				if (f.getPath().equals(folderName))

+					folder = f;

+			}

+			if (folder == null){

+				folder = new Folder(folderName);

+				allFolders.add(folder);

+			}

+			folder.addSrcFiles(sf);

+		}

+

+		// assign sourcesList for each folder

+		for (Folder f : allFolders) {

+			f.accumulateSourcesCounts();

+		}	

+	}

+

+

+	/**

+	 * fill the model by count results

+	 * @throws CoreException, IOException, InterruptedException

+	 */

+

+	public void fillGcovView() {

+		// process counts for summary level

+		int summaryTotal = 0, summaryInstrumented = 0, summaryExecuted = 0;

+		for (Folder f : allFolders) {

+			summaryTotal+=f.getNumLines();

+			summaryInstrumented+=f.getLinesInstrumented();

+			summaryExecuted+=f.getLinesExecuted();

+		}		

+

+		// fill rootNode model: the entry of the contentProvider

+		rootNode = new CovRootTreeElement("Summary", summaryTotal,summaryExecuted,

+				summaryInstrumented);

+		IBinaryObject binaryObject = STSymbolManager.sharedInstance.getBinaryObject(new Path(binaryPath));

+		

+		for (Folder fldr : allFolders) {

+			String folderLocation = fldr.getPath();

+			CovFolderTreeElement fldrTreeElem = new CovFolderTreeElement(

+					rootNode, folderLocation, fldr.getNumLines(), fldr.getLinesExecuted(), 

+					fldr.getLinesInstrumented());

+			rootNode.addChild(fldrTreeElem);

+

+			for (SourceFile src : fldr.getSrcFiles()) {

+				CovFileTreeElement srcTreeElem = new CovFileTreeElement(

+						fldrTreeElem, src.getName(), src.getNumLines(), src

+						.getLinesExecuted(), src.getLinesInstrumented());

+				fldrTreeElem.addChild(srcTreeElem);

+

+				for (GcnoFunction fnctn : src.getFnctns()) {

+					String name = fnctn.getName();

+					name = STSymbolManager.sharedInstance.demangle(binaryObject, name);

+					srcTreeElem.addChild(new CovFunctionTreeElement(

+							srcTreeElem, name, fnctn.getSrcFile(), fnctn

+							.getFirstLineNmbr(), fnctn.getCvrge()

+							.getLinesExecuted(), fnctn.getCvrge()

+							.getLinesInstrumented()));

+				}

+			}

+		}

+	}

+

+	// transform String path to stream

+	private DataInput OpenTraceFileStream(String filePath) throws FileNotFoundException{

+

+		FileInputStream fis = new FileInputStream(filePath);

+		InputStream inputStream = new BufferedInputStream(fis);

+

+		return new DataInputStream(inputStream);

+	}

+

+

+	public ArrayList<SourceFile> getAllSrcs() {

+		return allSrcs;

+	}

+

+	public ArrayList<GcnoFunction> getAllFnctns() {

+		return allFnctns;

+	}

+

+	public CovRootTreeElement getRootNode() {

+		return rootNode;

+	}

+

+	public String getBinaryPath() {

+		return binaryPath;

+	}

+

+	public SourceFile getSourceFile(String sourcePath){

+		return sourceMap.get(sourcePath);

+	}

+

+	public long getNbrPgmRuns() {

+		return nbrPgmRuns;

+	}

+

+	/**

+	 * Retrieve a list containing gcda paths from a binary file  

+	 * @return

+	 * @throws CoreException

+	 * @throws IOException

+	 * @throws InterruptedException

+	 */

+	public List<String> getGCDALocations() throws CoreException, IOException, InterruptedException

+	{	

+		IBinaryObject binaryObject = STSymbolManager.sharedInstance.getBinaryObject(new Path(binaryPath));

+		String binaryPath = binaryObject.getPath().toOSString();

+		List<String> l = new LinkedList<String>();

+		String cpu = binaryObject.getCPU();

+		Process p;

+		if ("sh".equals(cpu)) {

+			String stringsTool = "sh4strings"; 

+			p = getStringsProcess(stringsTool, binaryPath);

+			if ( p == null) p = getStringsProcess("sh4-linux-strings", binaryPath);

+		} else if ("stxp70".equals(cpu)) {

+			String stringsTool = "stxp70v3-strings"; 

+			p = getStringsProcess(stringsTool, binaryPath);

+		} else if ("st200".equals(cpu)){

+			String stringsTool = cpu + "strings";

+			p = getStringsProcess(stringsTool, binaryPath);

+		} else  {

+			String stringsTool = "strings";

+			p = getStringsProcess(stringsTool, binaryPath);

+		}

+		if (p == null) {

+			Status status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR,

+					"An error occured during analysis: unable to retrieve gcov data", new IOException());

+			Activator.getDefault().getLog().log(status);

+			return l;

+		}

+		ThreadConsumer t = new ThreadConsumer(p, l);

+		t.start();

+		p.waitFor();

+		t.join();

+		return l;

+	}

+	

+	

+	private Process getStringsProcess(String stringsTool, String binaryPath) {

+		try {

+			Process p = Runtime.getRuntime().exec(new String[] {stringsTool, binaryPath });

+			return p;

+		} catch (Exception _) {

+			return null;

+		}

+	}

+	

+	

+

+	private final class ThreadConsumer extends Thread

+	{

+		private final Process p;

+		private final List<String> list;

+		ThreadConsumer(Process p, List<String> files)

+		{

+			super();

+			this.p = p;

+			this.list = files;

+		}

+

+		public void run()

+		{

+			try {

+				populateGCDAFiles(p.getInputStream());

+			} catch (Exception _) {

+			}

+		}

+

+		private void populateGCDAFiles(InputStream s) throws IOException

+		{

+			InputStreamReader isr = new InputStreamReader(s);

+			LineNumberReader lnr = new LineNumberReader(isr);

+			String line = null;

+			while ((line =lnr.readLine()) != null) {

+				if (line.endsWith(".gcda"))

+				{

+					IPath p = new Path(line);

+					String filename = p.toString();

+					if (!list.contains(filename)) list.add(filename);

+				}

+			}

+		}

+	}

+

+	public void dumpProcessCovFilesResult(PrintStream ps) throws FileNotFoundException {

+		ps.println("Parse gcda and gcno files done, resolve graph algorithm executed, now display results");

+		ps.println("- PRINT FUNCTIONS ARRAY : ");

+		for (int i = 0; i < allFnctns.size(); i++) {

+			ps.println("-- FUNCTION " +i);

+			ps.println("     name = " + allFnctns.get(i).getName());

+			ps.println("     instrumentd lines = " + allFnctns.get(i).getCvrge().getLinesInstrumented());

+			ps.println("     executed lines = "+ allFnctns.get(i).getCvrge().getLinesExecuted());

+		}		

+		ps.println("- PRINT SRCS ARRAY : ");

+		for (int i = 0; i < allSrcs.size(); i++) {

+			ps.println("-- FILE " + i);

+			ps.println("     name = " + allSrcs.get(i).getName());

+			ps.println("     total lines = " + allSrcs.get(i).getNumLines());

+			ps.println("     instrumentd lines = "+ allSrcs.get(i).getLinesInstrumented());

+			ps.println("     executed lines = "+ allSrcs.get(i).getLinesExecuted());

+		}

+	}

+

+

+	/**

+	 * @return the sourceMap

+	 */

+	public HashMap<String, SourceFile> getSourceMap() {

+		return sourceMap;

+	}

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/CoverageInfo.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/CoverageInfo.java
new file mode 100644
index 0000000..1595635
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/CoverageInfo.java
@@ -0,0 +1,52 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.parser;

+

+import java.io.Serializable;

+

+public class CoverageInfo implements Serializable{

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = -6067335353999481231L;

+

+	private int linesInstrumented = 0;

+	private int linesExecuted = 0;

+	

+	/**

+	 * Constructor

+	 */

+	public CoverageInfo() {

+		

+	}

+

+	

+	/*getters & setters */

+	

+	public int getLinesInstrumented() {

+		return linesInstrumented;

+	}

+

+	public int getLinesExecuted() {

+		return linesExecuted;

+	}

+

+	public void incLinesInstrumented(){

+		this.linesInstrumented++;

+	}

+	

+	public void incLinesExecuted(){

+		this.linesExecuted++;

+	}

+

+	

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/Folder.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/Folder.java
new file mode 100644
index 0000000..482ae81
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/Folder.java
@@ -0,0 +1,65 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.parser;

+

+import java.io.Serializable;

+import java.util.ArrayList;

+

+public class Folder implements Serializable {

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = 5155033391199109661L;

+	private final String path;

+	private final ArrayList<SourceFile> srcFiles = new ArrayList<SourceFile>();

+	private int numLines = 0;

+	private int linesInstrumented = 0;

+	private int linesExecuted = 0;

+	

+	/**

+	 * Constructor

+	 */

+	public Folder(String path) {

+		this.path = path;

+	}

+	

+	

+	public void accumulateSourcesCounts(){

+		for (int i = 0; i < srcFiles.size(); i++) {

+			numLines += (srcFiles.get(i)).getNumLines();

+			linesInstrumented += (srcFiles.get(i)).getLinesInstrumented();

+			linesExecuted += (srcFiles.get(i)).getLinesExecuted();

+		}	

+	}

+		

+	public String getPath() {

+		return path;

+	}

+	

+	public ArrayList<SourceFile> getSrcFiles() {

+		return srcFiles;

+	}

+	

+	public void addSrcFiles(SourceFile srcFile) {

+		this.srcFiles.add(srcFile);

+	}

+	

+	public int getNumLines() {

+		return numLines;

+	}

+	public int getLinesExecuted() {

+		return linesExecuted;

+	}

+	public int getLinesInstrumented() {

+		return linesInstrumented;

+	}	

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/GcdaRecordsParser.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/GcdaRecordsParser.java
new file mode 100644
index 0000000..a82d724
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/GcdaRecordsParser.java
@@ -0,0 +1,272 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.parser;

+

+import java.io.DataInput;

+import java.io.DataInputStream;

+import java.io.EOFException;

+import java.io.IOException;

+import java.util.ArrayList;

+

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.linuxtools.gcov.Activator;

+import org.eclipse.linuxtools.gcov.utils.BEDataInputStream;

+import org.eclipse.linuxtools.gcov.utils.LEDataInputStream;

+import org.eclipse.linuxtools.gcov.utils.MasksGenerator;

+

+

+

+public class GcdaRecordsParser {

+

+

+	private static final int GCOV_DATA_MAGIC = 0x67636461; // en ASCII: 67=g 63=c 64=d 61=a

+	private static final int GCOV_TAG_FUNCTION = 0x01000000; 

+	private static final  int GCOV_COUNTER_ARCS = 0x01a10000; 

+	private static final int GCOV_TAG_OBJECT_SYMMARY = 0xa1000000; 

+	private static final int GCOV_TAG_PROGRAM_SUMMARY = 0xa3000000;

+

+	private final ArrayList<GcnoFunction> fnctns;

+	private long objSmryNbrPgmRuns = 0;

+	private long pgmSmryChksm = 0;

+	private long objSmryChksm = 0;

+	private long objSmryArcCnts = 0;

+	private long objSmrytotalCnts = 0;

+	private long objSmryRunMax = 0;

+	private long objSmrySumMax = 0;

+

+

+	public GcdaRecordsParser(ArrayList<GcnoFunction> fnctns) {

+		this.fnctns = fnctns;

+	}

+

+	public void parseGcdaRecord(DataInput stream) throws IOException, CoreException {

+		// header data

+		int magic = 0;

+

+		// data & flags to process tests

+		GcnoFunction currentFnctn = null;

+

+		//read magic

+		magic = stream.readInt();

+		//read version

+		//version = stream.readInt();

+		stream.readInt();

+		//read stamp

+		//stamp = stream.readInt();

+		stream.readInt();

+

+		if (magic == GCOV_DATA_MAGIC){

+			stream = new BEDataInputStream((DataInputStream) stream);

+		}else{

+			magic = (magic >> 16) |	(magic << 16);

+			magic = ((magic	& 0xff00ff)	<< 8) |	((magic	>> 8) &	0xff00ff);

+			if (magic == GCOV_DATA_MAGIC){

+				stream = new LEDataInputStream((DataInputStream) stream);

+			}else{

+				String message = magic + " :desn't correspond to a correct data file header\n";

+				Status status = new Status(Status.ERROR, Activator.PLUGIN_ID, message);

+				throw new CoreException(status);

+			}

+		}

+

+		while (true) {

+			try {

+				// parse header

+				int tag = stream.readInt();

+				long length = (stream.readInt() &  MasksGenerator.UNSIGNED_INT_MASK);

+				// parse gcda data

+				switch ((int) tag) {

+				case GCOV_TAG_FUNCTION: {

+					long fnctnId = stream.readInt() &  MasksGenerator.UNSIGNED_INT_MASK;

+					if (!fnctns.isEmpty()) {

+						boolean fnctnFound = false;

+						for (GcnoFunction f: fnctns) {

+							if (f.getIdent() == fnctnId) {

+								fnctnFound = true;

+								currentFnctn = f;

+								long fnctnChksm = stream.readInt()&  MasksGenerator.UNSIGNED_INT_MASK;

+								if (f.getCheksum() != fnctnChksm){

+									String message = "Checksums don't correspond for " +

+									currentFnctn.getName() + " (Id: " + fnctnId + ")\n";

+									Status status = new Status(Status.ERROR, Activator.PLUGIN_ID, message);

+									throw new CoreException(status);

+								}

+								break;

+							}

+						}

+

+						if (fnctnFound == false){

+							currentFnctn = null;

+							String message = "Function with Id: " + fnctnId +

+							" not found in function list\n";

+							Status status = new Status(Status.ERROR, Activator.PLUGIN_ID, message);

+							throw new CoreException(status);

+						}

+

+					}

+					break;

+				}

+

+				case GCOV_COUNTER_ARCS: {

+					if (currentFnctn == null){

+						String message = "Missing function or duplicate counter tag\n";

+						Status status = new Status(Status.ERROR, Activator.PLUGIN_ID, message);

+						throw new CoreException(status);

+					}

+

+					if (length != 2 * (currentFnctn.getNumCounts())){

+						String message = "GCDA content is inconsistent\n";

+						Status status = new Status(Status.ERROR, Activator.PLUGIN_ID, message);

+						throw new CoreException(status);

+					}

+

+					ArrayList<Block> fnctnBlcks = currentFnctn.getFunctionBlocks();

+					if (fnctnBlcks.isEmpty()){

+						String message = "Function block list is empty\n";

+						Status status = new Status(Status.ERROR, Activator.PLUGIN_ID, message);

+						throw new CoreException(status);

+					}

+

+					for (int i = 0; i < fnctnBlcks.size(); i++) {

+						Block b = fnctnBlcks.get(i);

+						int nonFakeExit = 0;

+						

+						ArrayList<Arc> arcsExit = b.getExitArcs();

+						for (Arc extArc: arcsExit) {

+							if (extArc.isFake() == false)

+								nonFakeExit++;

+							if (extArc.isOnTree() == false) {

+								long arcsCnts = stream.readLong();

+								extArc.setCount(arcsCnts);

+								extArc.setCountValid(true);

+								b.decNumSuccs();

+								extArc.getDstnatnBlock().decNumPreds();

+							}

+						}

+

+						// If there is only one non-fake exit, it is an

+						// unconditional branch.

+						if (nonFakeExit == 1) {

+							for (Arc extArc: arcsExit) {

+								if (extArc.isFake() == false) {

+									extArc.setUnconditionnal(true);

+

+									// If this block is instrumenting a call, it might be

+									// an artificial block. It is not artificial if it has

+									// a non-fallthrough exit, or the destination of this

+									// arc has more than one entry. Mark the destination

+									// block as a return site, if none of those conditions hold.

+

+									if (b.isCallSite() == true

+											&& extArc.isFallthrough() == true

+											&& extArc.getDstnatnBlock()

+											.getEntryArcs().get(0)

+											.equals(extArc)

+											&& extArc.getDstnatnBlock()

+											.getEntryArcs().size() == 1)

+										extArc.getDstnatnBlock()

+										.setCallReturn(true);

+								}

+							}

+						}

+					}

+

+					// counters arcs process data reset

+					currentFnctn = null;

+					break;

+				}

+

+				case GCOV_TAG_OBJECT_SYMMARY: {

+					objSmryChksm = (stream.readInt() &  MasksGenerator.UNSIGNED_INT_MASK);

+					objSmryArcCnts = (stream.readInt() &  MasksGenerator.UNSIGNED_INT_MASK);

+					objSmryNbrPgmRuns = (stream.readInt() &  MasksGenerator.UNSIGNED_INT_MASK);

+					objSmrytotalCnts = stream.readLong();

+					objSmryRunMax = stream.readLong();

+					objSmrySumMax = stream.readLong();

+					break;

+				}

+

+				// program summary tag

+				case GCOV_TAG_PROGRAM_SUMMARY: {

+					//long[] pgmSmryskips = new long[(int) length];

+					pgmSmryChksm = (stream.readInt() &  MasksGenerator.UNSIGNED_INT_MASK);

+					for (int i = 0; i < length - 1; i++) {

+						//pgmSmryskips[i] = (stream.readInt() &  MasksGenerator.UNSIGNED_INT_MASK);

+						stream.readInt();

+					}

+					break;

+				}

+

+				default: {

+					//System.out.println("wrong gcda tag");

+					break;

+				}

+				}

+			}

+			catch (EOFException _) {

+				break;

+			}

+		}

+	}

+

+	/**

+	 * @return the objSmryNbrPgmRuns

+	 */

+	public long getObjSmryNbrPgmRuns() {

+		return objSmryNbrPgmRuns;

+	}

+

+	/**

+	 * @return the objSmryChksm

+	 */

+	public long getObjSmryChksm() {

+		return objSmryChksm;

+	}

+

+	/**

+	 * @return the objSmryArcCnts

+	 */

+	public long getObjSmryArcCnts() {

+		return objSmryArcCnts;

+	}

+

+	/**

+	 * @return the objSmrytotalCnts

+	 */

+	public long getObjSmrytotalCnts() {

+		return objSmrytotalCnts;

+	}

+

+	/**

+	 * @return the objSmryRunMax

+	 */

+	public long getObjSmryRunMax() {

+		return objSmryRunMax;

+	}

+

+	/**

+	 * @return the objSmrySumMax

+	 */

+	public long getObjSmrySumMax() {

+		return objSmrySumMax;

+	}

+

+	/**

+	 * @return the pgmSmryChksm

+	 */

+	public long getPgmSmryChksm() {

+		return pgmSmryChksm;

+	}

+

+

+

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/GcnoFunction.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/GcnoFunction.java
new file mode 100644
index 0000000..2549883
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/GcnoFunction.java
@@ -0,0 +1,255 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.parser;

+

+import java.io.Serializable;

+import java.util.ArrayList;

+

+public class GcnoFunction implements Serializable, Comparable<GcnoFunction> {

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = -4159055012321132651L;

+

+	private final long ident;

+	private final long cheksum;

+	private final long firstLineNmbr;

+	private final String name;

+	private final String srcFile;

+	private ArrayList<Block> functionBlocks = new ArrayList<Block>();

+	private int numCounts = 0, blocksExecuted = 0, numBlocks = 0;;

+	private final CoverageInfo cvrge = new CoverageInfo();

+

+	public GcnoFunction(long fnctnIdent, long fnctnChksm, String fnctnName, String fnctnSrcFle, long fnctnFrstLnNmbr) {

+		this.ident = fnctnIdent;

+		this.cheksum = fnctnChksm;

+		this.name = fnctnName;

+		this.srcFile = fnctnSrcFle;

+		this.firstLineNmbr = fnctnFrstLnNmbr;

+	}

+

+	@Override

+	public int compareTo(GcnoFunction o) {

+		if (getFirstLineNmbr()>o.getFirstLineNmbr()) return 1;

+		else if  (getFirstLineNmbr()<o.getFirstLineNmbr()) return -1;

+		return 0;

+	}

+

+	

+	public void addLineCounts(ArrayList<SourceFile> srcs) {

+		for (int i = 0; i != numBlocks; i++) {

+			Block blk = functionBlocks.get(i);

+			SourceFile fileSrc = null;

+			if ((blk.getCount() != 0) && (i != 0) && (i + 1 != numBlocks))

+				blocksExecuted++;

+

+			long[] enc = blk.getEncoding();

+			for (int j = 0, k = 0; j != blk.getLineNum(); j++, k++) {

+				if (enc[k] == 0) {

+					int srcn = (int) enc[++k];

+					for (SourceFile sf : srcs) {

+						if (sf.getIndex() == srcn) {

+							fileSrc = sf;

+							break;

+						}

+					}

+					j++;

+				} else if ((fileSrc != null) && enc[k] < fileSrc.getLines().size()) {

+					Line line = fileSrc.getLines().get((int) enc[k]);

+					if (line.isExists() == false)

+						cvrge.incLinesInstrumented();

+					if ((line.getCount() == 0) && (blk.getCount() != 0))

+						cvrge.incLinesExecuted();

+					line.setExists(true);

+					line.setCount(line.getCount()+ blk.getCount());

+				}

+			}

+		}

+	}

+

+	public void solveGraphFnctn() {

+		ArrayList<Block> fnctnBlcks = this.functionBlocks;

+		ArrayList<Block> validBlocks = new ArrayList<Block>();

+		ArrayList<Block> invalidBlocks = new ArrayList<Block>();

+

+		

+		// Function should contain at least one block

+		if (fnctnBlcks.size() >= 2){			

+			if (fnctnBlcks.get(0).getNumPreds() == 0)

+				fnctnBlcks.get(0).setNumPreds(50000);

+			if (fnctnBlcks.get(fnctnBlcks.size() - 1).getNumSuccs() == 0)

+				fnctnBlcks.get(fnctnBlcks.size() - 1).setNumSuccs(50000);

+		}

+		

+

+		for (int i = 0; i < fnctnBlcks.size(); i++) {

+			Block b = fnctnBlcks.get(i);

+			b.setInvalidChain(true);

+			invalidBlocks.add(b);

+		}

+

+		while (validBlocks.isEmpty() == false

+				|| invalidBlocks.isEmpty() == false) {

+

+			if (invalidBlocks.isEmpty() == false) {

+				for (int i = invalidBlocks.size() - 1; i >= 0; i--) {

+					Block invb = invalidBlocks.get(i);

+					long total = 0;

+					invalidBlocks.remove(i);

+					invb.setInvalidChain(false);

+

+					if (invb.getNumSuccs() == 0) {

+						ArrayList<Arc> extArcs = invb.getExitArcs();

+						for (Arc arc : extArcs)

+							total += arc.getCount();

+					} else if (invb.getNumPreds() == 0) {

+						ArrayList<Arc> entrArcs = invb.getEntryArcs();

+						for (Arc arc : entrArcs)

+							total += arc.getCount();

+					} else

+						continue;

+

+					invb.setCount(total);

+					invb.setCountValid(true);

+					invb.setValidChain(true);

+					validBlocks.add(invb);

+				}

+			}/*else

+				System.out.println("NO, invalid blocks = 0");

+			*/	

+			while (validBlocks.isEmpty() == false) {

+				int last = validBlocks.size() - 1;

+				Block vb = validBlocks.get(last);

+				Arc invarc = null;

+				int total = 0;

+				validBlocks.remove(last);

+

+				vb.setValidChain(false);

+

+				if (vb.getNumSuccs() == 1) {

+					Block blcksdst;

+					total = (int) vb.getCount();

+

+					for (Arc extAr : vb.getExitArcs()) {

+						total -= extAr.getCount();

+						if (extAr.isCountValid() == false)

+							invarc = extAr;

+					}

+					blcksdst = invarc.getDstnatnBlock();

+					invarc.setCountValid(true);

+					invarc.setCount(total);

+					vb.decNumSuccs();

+					blcksdst.decNumPreds();

+

+					if (blcksdst.isCountValid() == true) {

+						if (blcksdst.getNumPreds() == 1

+								&& blcksdst.isValidChain() == false) {

+							blcksdst.setValidChain(true);

+							validBlocks.add(blcksdst);

+						}

+					} else {

+						if (blcksdst.getNumPreds() == 0

+								&& blcksdst.isInvalidChain() == false) {

+							blcksdst.setInvalidChain(true);

+							invalidBlocks.add(blcksdst);

+						}

+					}

+				}

+

+				if (vb.getNumPreds() == 1) {

+					Block blcksrc;

+					total = (int) vb.getCount();

+					invarc = null;

+

+					for (Arc entrAr: vb.getEntryArcs()) {

+						total -= entrAr.getCount();

+						if (entrAr.isCountValid() == false)

+							invarc = entrAr;

+					}

+

+					blcksrc = invarc.getSrcBlock();

+					invarc.setCountValid(true);

+					invarc.setCount(total);

+					vb.decNumPreds();

+					blcksrc.decNumSuccs();

+

+					if (blcksrc.isCountValid() == true) {

+						if (blcksrc.getNumSuccs() == 1

+								&& blcksrc.isInvalidChain() == false) {

+							blcksrc.setValidChain(true);

+							validBlocks.add(blcksrc);

+						}

+					} else if (blcksrc.getNumSuccs() == 0

+							&& blcksrc.isInvalidChain() == false) {

+						blcksrc.setInvalidChain(true);

+						invalidBlocks.add(blcksrc);

+					}

+				}

+			}

+		}

+	}

+

+	/* getters & setters */

+

+	public long getIdent() {

+		return ident;

+	}

+

+	public long getCheksum() {

+		return cheksum;

+	}

+

+	public String getName() {

+		return name;

+	}

+

+	public String getSrcFile() {

+		return srcFile;

+	}

+

+	public long getFirstLineNmbr() {

+		return firstLineNmbr;

+	}

+

+	public ArrayList<Block> getFunctionBlocks() {

+		return functionBlocks;

+	}

+

+	public Block getFunctionBlock(int i) {

+		return functionBlocks.get(i);

+	}

+

+	public void setFunctionBlocks(ArrayList<Block> functionBlocks) {

+		this.functionBlocks = functionBlocks;

+	}

+

+	public void incNumCounts() {

+		this.numCounts++;

+	}

+

+	public int getNumCounts() {

+		return numCounts;

+	}

+

+	public int getNumBlocks() {

+		return numBlocks;

+	}

+

+	public void setNumBlocks(int numBlocks) {

+		this.numBlocks = numBlocks;

+	}

+

+	public CoverageInfo getCvrge() {

+		return cvrge;

+	}

+	

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/GcnoRecordsParser.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/GcnoRecordsParser.java
new file mode 100644
index 0000000..c21e16f
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/GcnoRecordsParser.java
@@ -0,0 +1,241 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.parser;

+

+import java.io.DataInput;

+import java.io.DataInputStream;

+import java.io.EOFException;

+import java.io.IOException;

+import java.util.ArrayList;

+import java.util.HashMap;

+

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.linuxtools.gcov.Activator;

+import org.eclipse.linuxtools.gcov.utils.BEDataInputStream;

+import org.eclipse.linuxtools.gcov.utils.GcovStringReader;

+import org.eclipse.linuxtools.gcov.utils.LEDataInputStream;

+import org.eclipse.linuxtools.gcov.utils.MasksGenerator;

+

+

+public class GcnoRecordsParser {

+	

+	private static final int GCOV_NOTE_MAGIC = 0x67636e6f; // en ASCII: 67=g 63=c 6e=n 6f=o

+	private static final int GCOV_TAG_FUNCTION = 0x01000000; 

+	private static final int GCOV_TAG_BLOCKS = 0x01410000;

+	private static final int GCOV_TAG_ARCS = 0x01430000;

+	private static final int GCOV_TAG_LINES = 0x01450000;

+	

+	private GcnoFunction fnctn = null;	

+	private final ArrayList<GcnoFunction> fnctns  = new ArrayList<GcnoFunction>();

+	private final ArrayList<SourceFile> currentAllSrcs;

+	private final HashMap<String, SourceFile> sourceMap;

+	

+	public GcnoRecordsParser(HashMap<String, SourceFile> sourceMap, ArrayList<SourceFile> AllSrcs){

+		this.sourceMap = sourceMap;

+		this.currentAllSrcs = AllSrcs;

+	}

+	

+	private SourceFile findOrAdd (String fileName, ArrayList<SourceFile> srcs)

+	{		

+		SourceFile newsrc = sourceMap.get(fileName);

+		if (newsrc == null) {

+			 newsrc = new SourceFile(fileName, srcs.size()+1);

+			 srcs.add(newsrc);

+			 sourceMap.put(fileName, newsrc);

+		}

+		return newsrc; //return the new added element	

+	}

+	

+	

+	public void parseData(DataInput stream) throws IOException, CoreException{

+		// header data

+		int magic = 0;

+		// blocks data

+		ArrayList<Block> blocks = null;

+		// source file data

+		SourceFile source = null;

+		// flag

+		boolean parseFirstFnctn = false;

+		

+		magic = stream.readInt();

+		//version = stream.readInt();

+		stream.readInt();

+		//stamp = stream.readInt();

+		stream.readInt();

+		

+		if (magic == GCOV_NOTE_MAGIC){

+			stream = new BEDataInputStream((DataInputStream) stream);

+		}else{

+			magic = (magic >> 16) |	(magic << 16);

+			magic = ((magic	& 0xff00ff)	<< 8) |	((magic	>> 8) &	0xff00ff);

+			if (magic == GCOV_NOTE_MAGIC){

+				stream = new LEDataInputStream((DataInputStream) stream);

+			}else{

+				String message = magic + " :desn't correspond to a correct note file header\n";

+				Status status = new Status(Status.ERROR, Activator.PLUGIN_ID, message);

+				throw new CoreException(status);

+			}

+		}

+		

+		/*------------------------------------------------------------------------------

+		System.out.println("Gcno LE, Magic "+magic+" version "+version+" stamp "+stamp);

+		*/

+		

+		while (true){

+			try{		

+				int tag;

+				// parse header

+				while (true){

+					tag=stream.readInt();

+					if (tag == GCOV_TAG_FUNCTION || tag == GCOV_TAG_BLOCKS || 

+							tag == GCOV_TAG_ARCS || tag == GCOV_TAG_LINES)  

+						break;

+				}

+				int length=stream.readInt();

+

+				// parse gcno data

+				if ((int)tag ==  GCOV_TAG_FUNCTION){

+					// before parse new function, add current function to functions list

+					if (parseFirstFnctn == true) fnctns.add(fnctn);

+					

+					long fnctnIdent = (stream.readInt()&MasksGenerator.UNSIGNED_INT_MASK);

+					long fnctnChksm = (stream.readInt()&MasksGenerator.UNSIGNED_INT_MASK);

+					String fnctnName = GcovStringReader.readString(stream);

+					String fnctnSrcFle = GcovStringReader.readString(stream);

+					long fnctnFrstLnNmbr= (stream.readInt()&MasksGenerator.UNSIGNED_INT_MASK);

+					

+					fnctn = new GcnoFunction(fnctnIdent, fnctnChksm, fnctnName, fnctnSrcFle, fnctnFrstLnNmbr);

+					SourceFile srcFle2 = findOrAdd (fnctn.getSrcFile(),currentAllSrcs);

+					if (fnctn.getFirstLineNmbr() >= srcFle2.getNumLines()){

+						srcFle2.setNumLines((int)fnctn.getFirstLineNmbr()+1);

+					}

+					srcFle2.addFnctn(fnctn);

+			        parseFirstFnctn = true;

+					continue;

+				}

+				

+				else if ((int)tag ==  GCOV_TAG_BLOCKS){

+					blocks = new ArrayList<Block>();

+					for (int i = 0; i < length; i++) {

+						long BlckFlag = stream.readInt()& MasksGenerator.UNSIGNED_INT_MASK;

+						Block blck = new Block(BlckFlag);

+						blocks.add(blck);

+					}

+					fnctn.setNumBlocks(length);

+					continue;

+				}	

+				else if (tag ==  GCOV_TAG_ARCS){

+					int srcBlockIndice = stream.readInt();

+					int nmbrArcs = (length-1)/2;

+					 ArrayList<Arc> arcs = new ArrayList<Arc>(nmbrArcs);

+

+					for (int i = 0; i < nmbrArcs; i++) {

+						int dstnatnBlockIndice = stream.readInt();

+						long flag = (stream.readInt()&MasksGenerator.UNSIGNED_INT_MASK);

+						Arc arc = new Arc(srcBlockIndice, dstnatnBlockIndice, flag, blocks);

+						arcs.add(arc);					

+					}

+					

+					// each arc, register it as exit of the src block

+					Block srcBlk = blocks.get(srcBlockIndice);													

+					for (Arc a : arcs) {

+						srcBlk.addExitArcs(a);

+						srcBlk.incNumSuccs();

+					}

+					

+					// each arc, register it as entry of its dstntn block

+					for (Arc a : arcs) {

+						Block dstntnBlk = a.getDstnatnBlock();

+						dstntnBlk.addEntryArcs(a);

+						dstntnBlk.incNumPreds();

+					}

+					

+					for (Arc a : arcs) {

+						if (a.isFake() == true) {

+							if (a.getSrcBlock() != null ) {

+								 // Exceptional exit from this function, the 

+								 // 	source block must be a call.

+								srcBlk = blocks.get((int)srcBlockIndice);		

+								srcBlk.setCallSite(true);

+								a.setCallNonReturn(true);

+							} else {

+								a.setNonLoclaReturn(true);

+								Block dstntnBlk = a.getDstnatnBlock();

+								dstntnBlk.setNonLocalReturn(true);

+							}	

+						}

+						

+						if (a.isOnTree() == false) 

+							fnctn.incNumCounts();

+						 	//nbrCounts++;							

+					}

+					

+					fnctn.setFunctionBlocks(blocks);

+					continue;

+				}

+				

+				

+				else if (tag ==  GCOV_TAG_LINES) {

+					int numBlock = stream.readInt();

+					long[] lineNos = new long[length-1];			

+					int ix = 0;

+					do {

+						long lineNumber = stream.readInt()&MasksGenerator.UNSIGNED_INT_MASK;

+						if (lineNumber != 0){

+							if (ix == 0){

+								lineNos[ix++] = 0;

+								lineNos[ix++] = source.getIndex();

+							}

+							lineNos[ix++]=lineNumber;

+							if (lineNumber >= source.getNumLines()){

+								source.setNumLines((int)lineNumber+1);

+							}

+						} else {

+							String fileName = GcovStringReader.readString(stream);

+							if (fileName == "NULL string") 

+								break;

+

+								source = findOrAdd (fileName, currentAllSrcs);

+								lineNos[ix++]=0;

+								lineNos[ix++]=source.getIndex();

+						}

+					} while (true);

+					

+					fnctn.getFunctionBlocks().get(((int)numBlock))

+					.setEncoding(lineNos);

+				

+					fnctn.getFunctionBlocks().get(((int)numBlock))

+					.setNumLine(ix);

+					

+					continue;

+				}

+			}

+			catch (EOFException e) {				

+				

+				fnctn.setFunctionBlocks(blocks);

+				fnctns.add(fnctn);	

+							

+				break;			

+

+			}

+		}//while		

+	}

+	

+	/* Getters */

+	public ArrayList<GcnoFunction> getFnctns() {

+		return fnctns;

+	}

+	

+	public ArrayList<SourceFile> getcurrentAllSrcs() {

+		return currentAllSrcs;

+	}

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/Line.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/Line.java
new file mode 100644
index 0000000..e2b0c4a
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/Line.java
@@ -0,0 +1,50 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.parser;

+

+import java.io.Serializable;

+

+

+public class Line implements Serializable{

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = 8804878976767948267L;

+	private boolean exists = false;

+	private long count = 0;

+

+	/**

+	 * Constructor

+	 */

+	public Line() {

+	}

+	

+	

+	/*Getters & setters*/

+

+	public boolean isExists() {

+		return exists;

+	}

+

+	public void setExists(boolean exists) {

+		this.exists = exists;

+	}

+

+	public void setCount(long count) {

+		this.count = count;

+	}

+

+	public long getCount() {

+		return count;

+	}

+

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/SourceFile.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/SourceFile.java
new file mode 100644
index 0000000..3ba9d6817
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/parser/SourceFile.java
@@ -0,0 +1,110 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.parser;

+

+import java.io.Serializable;

+import java.util.ArrayList;

+import java.util.SortedSet;

+import java.util.TreeSet;

+

+public class SourceFile implements Serializable {

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = -9182882194956475711L;

+	private final String name;

+	private final int index;

+	private final ArrayList<Line> lines = new ArrayList<Line>();

+	private final TreeSet<GcnoFunction> fnctns = new TreeSet<GcnoFunction>();

+	private int numLines = 1;

+	private final CoverageInfo cvrge = new CoverageInfo();

+	private long maxCount = -1;

+	 

+	/**

+	 * Constructor

+	 */

+	public SourceFile(String name, int index) {

+		this.name = name;

+		this.index = index;

+	}

+	

+	

+	public void accumulateLineCounts() {

+		for (Line line : lines) {

+			if (line.isExists()) {

+				cvrge.incLinesInstrumented();

+				if (line.getCount() != 0)

+					cvrge.incLinesExecuted();

+			}

+		}

+	}

+

+	public long getmaxLineCount() {

+		if (maxCount < 0) {

+			for (Line line : lines) {

+				if (line.getCount() > maxCount)

+					maxCount = line.getCount();

+			}

+		}

+		return maxCount;

+	}

+

+	/* getters & setters */

+

+

+	

+	public int getLinesExecuted() {

+		return cvrge.getLinesExecuted();

+	}

+

+	public int getLinesInstrumented() {

+		return cvrge.getLinesInstrumented();

+	}

+

+	public String getName() {

+		return name;

+	}

+

+	public ArrayList<Line> getLines() {

+		return lines;

+	}

+

+	public SortedSet<GcnoFunction> getFnctns() {

+		return fnctns;

+	}

+

+	public void addFnctn(GcnoFunction fnctn) {

+		this.fnctns.add(fnctn);

+	}

+

+	public int getNumLines() {

+		return numLines;

+	}

+

+	public void setNumLines(int numLines) {

+		this.numLines = numLines;

+	}

+

+	public int getIndex() {

+		return index;

+	}

+

+	public void createLines() {

+		int n = getNumLines();

+		lines.ensureCapacity(n);

+		for (int j = 0; j<n ; j++) {

+			lines.add(new Line());

+		}

+	}

+	

+	

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/utils/BEDataInputStream.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/utils/BEDataInputStream.java
new file mode 100644
index 0000000..9765c94
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/utils/BEDataInputStream.java
@@ -0,0 +1,191 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.utils;

+

+import java.io.DataInput;

+import java.io.DataInputStream;

+import java.io.IOException;

+/**

+ *

+ */

+public class BEDataInputStream implements DataInput {

+

+	private final DataInputStream in;

+	private final byte[] buffer = new byte[8];

+

+	/**

+	 * Constructor

+	 * @param in

+	 */

+	public BEDataInputStream(DataInputStream in) {

+		this.in = in;

+	}

+

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readShort()

+	 */

+	public final short readShort() throws IOException

+	{

+		return in.readShort();

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readUnsignedShort()

+	 */

+	public final int readUnsignedShort() throws IOException

+	{

+		return in.readUnsignedShort();

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readChar()

+	 */

+	public final char readChar() throws IOException

+	{

+		return in.readChar();

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readInt()

+	 */

+	public final int readInt() throws IOException

+	{

+		return in.readInt();

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readLong()

+	 */

+	public final long readLong() throws IOException

+	{

+		in.readFully(buffer, 0, 8);

+		return (((long)buffer[7] << 32) +

+                ((long)(buffer[6] & 255) << 40) +

+                ((long)(buffer[5] & 255) << 48) +

+                ((long)(buffer[4] & 255) << 56) +

+                ((long)(buffer[3] & 255) << 0) +

+                ((buffer[2] & 255) << 8) +

+                ((buffer[1] & 255) <<  16) +

+                ((buffer[0] & 255) <<  24));

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readFloat()

+	 */

+	public final float readFloat() throws IOException

+	{

+		return Float.intBitsToFloat(readInt());

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readDouble()

+	 */

+	public final double readDouble() throws IOException

+	{

+		return Double.longBitsToDouble(readLong());

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readBoolean()

+	 */

+	public boolean readBoolean() throws IOException {

+		return in.readBoolean();

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readByte()

+	 */

+	public byte readByte() throws IOException {

+		return in.readByte();

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readFully(byte[])

+	 */

+	public void readFully(byte[] b) throws IOException {

+		in.readFully(b);

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readFully(byte[], int, int)

+	 */

+	public void readFully(byte[] b, int off, int len) throws IOException {

+		in.readFully(b,off,len);

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readLine()

+	 */

+	@Deprecated

+	public String readLine() throws IOException {

+		return in.readLine();

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readUTF()

+	 */

+	public String readUTF() throws IOException {

+		return in.readUTF();

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readUnsignedByte()

+	 */

+	public int readUnsignedByte() throws IOException {

+		return in.readUnsignedByte();

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#skipBytes(int)

+	 */

+	public int skipBytes(int n) throws IOException {

+		return in.skipBytes(n);

+	}

+

+	/**

+	 * Close this stream.

+	 */

+	public void close() throws IOException {

+		in.close();

+	}

+

+	public final long readUnsignedInt() throws IOException

+	{

+		in.readFully(buffer, 0, 4);

+		return

+		((

+		(buffer[0])      << 24 |

+		(buffer[1]&0xff) << 16 |

+		(buffer[2]&0xff) <<  8 |

+		(buffer[3]&0xff)

+		)

+		 & MasksGenerator.UNSIGNED_INT_MASK );

+	}

+

+

+

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/utils/GcovStringReader.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/utils/GcovStringReader.java
new file mode 100644
index 0000000..e6b13a6
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/utils/GcovStringReader.java
@@ -0,0 +1,38 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.utils;

+

+import java.io.DataInput;

+import java.io.IOException;

+

+public class GcovStringReader {

+

+

+	public static String readString(DataInput stream) throws IOException {

+		String res = "NULL string";

+		long length = stream.readInt()&MasksGenerator.UNSIGNED_INT_MASK;		

+		if (length != 0) {

+			int ln = ((int) length) << 2;

+			byte[] name = new byte[ln];

+			stream.readFully(name);

+			StringBuffer sb = new StringBuffer();

+			for(int j=0; j < ln; j++){

+				if(name[j]!=0){

+					char c = (char) name[j];

+					sb.append(c);

+				}

+			}

+			res = sb.toString();

+		}

+		return res;

+	}

+

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/utils/LEDataInputStream.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/utils/LEDataInputStream.java
new file mode 100644
index 0000000..51648e5
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/utils/LEDataInputStream.java
@@ -0,0 +1,208 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.utils;

+

+import java.io.DataInput;

+import java.io.DataInputStream;

+import java.io.IOException;

+/**

+ * Little-endian implementation of DataInputStream

+ * @author Xavier Raynaud <xavier.raynaud@st.com>

+ *

+ */

+public class LEDataInputStream implements DataInput {

+

+	private final DataInputStream in;

+	private final byte[] buffer = new byte[8];

+

+	/**

+	 * Constructor

+	 * @param in

+	 */

+	public LEDataInputStream(DataInputStream in) {

+		this.in = in;

+	}

+

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readShort()

+	 */

+	public final short readShort() throws IOException

+	{

+		in.readFully(buffer, 0, 2);

+		return (short)(

+				(buffer[1]&0xff) << 8 |

+				(buffer[0]&0xff));

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readUnsignedShort()

+	 */

+	public final int readUnsignedShort() throws IOException

+	{

+		in.readFully(buffer, 0, 2);

+		return (

+				(buffer[1]&0xff) << 8 |

+				(buffer[0]&0xff));

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readChar()

+	 */

+	public final char readChar() throws IOException

+	{

+		in.readFully(buffer, 0, 2);

+		return (char) (

+				(buffer[1]&0xff) << 8 |

+				(buffer[0]&0xff));

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readInt()

+	 */

+	public final int readInt() throws IOException

+	{

+		in.readFully(buffer, 0, 4);

+		return

+		(buffer[3])      << 24 |

+		(buffer[2]&0xff) << 16 |

+		(buffer[1]&0xff) <<  8 |

+		(buffer[0]&0xff);

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readLong()

+	 */

+	public final long readLong() throws IOException

+	{

+		in.readFully(buffer, 0, 8);

+		return

+		(long)(buffer[7])      << 56 |  /* long cast needed or shift done modulo 32 */

+		(long)(buffer[6]&0xff) << 48 |

+		(long)(buffer[5]&0xff) << 40 |

+		(long)(buffer[4]&0xff) << 32 |

+		(long)(buffer[3]&0xff) << 24 |

+		(long)(buffer[2]&0xff) << 16 |

+		(long)(buffer[1]&0xff) <<  8 |

+		(long)(buffer[0]&0xff);

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readFloat()

+	 */

+	public final float readFloat() throws IOException

+	{

+		return Float.intBitsToFloat(readInt());

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readDouble()

+	 */

+	public final double readDouble() throws IOException

+	{

+		return Double.longBitsToDouble(readLong());

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readBoolean()

+	 */

+	public boolean readBoolean() throws IOException {

+		return in.readBoolean();

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readByte()

+	 */

+	public byte readByte() throws IOException {

+		return in.readByte();

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readFully(byte[])

+	 */

+	public void readFully(byte[] b) throws IOException {

+		in.readFully(b);

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readFully(byte[], int, int)

+	 */

+	public void readFully(byte[] b, int off, int len) throws IOException {

+		in.readFully(b,off,len);

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readLine()

+	 */

+	@Deprecated

+	public String readLine() throws IOException {

+		return in.readLine();

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readUTF()

+	 */

+	public String readUTF() throws IOException {

+		return in.readUTF();

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#readUnsignedByte()

+	 */

+	public int readUnsignedByte() throws IOException {

+		return in.readUnsignedByte();

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see java.io.DataInput#skipBytes(int)

+	 */

+	public int skipBytes(int n) throws IOException {

+		return in.skipBytes(n);

+	}

+

+	/**

+	 * Close this stream.

+	 */

+	public void close() throws IOException {

+		in.close();

+	}

+

+	public final long readUnsignedInt() throws IOException

+	{

+		in.readFully(buffer, 0, 4);

+		return

+		((

+				(buffer[3])      << 24 |

+				(buffer[2]&0xff) << 16 |

+				(buffer[1]&0xff) <<  8 |

+				(buffer[0]&0xff)

+		)

+		& MasksGenerator.UNSIGNED_INT_MASK );

+	}

+

+

+

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/utils/MasksGenerator.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/utils/MasksGenerator.java
new file mode 100644
index 0000000..4b8adf5
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/utils/MasksGenerator.java
@@ -0,0 +1,15 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.utils;

+

+public class MasksGenerator {

+	public static final long UNSIGNED_INT_MASK = 0xffffffffL;

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/utils/STGcovProgramChecker.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/utils/STGcovProgramChecker.java
new file mode 100644
index 0000000..c47cf07
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/utils/STGcovProgramChecker.java
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright (c) 2009 STMicroelectronics.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.gcov.utils;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.WeakHashMap;
+
+import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.binutils.utils.STNMFactory;
+import org.eclipse.linuxtools.binutils.utils.STNMSymbolsHandler;
+import org.eclipse.linuxtools.binutils.utils.STSymbolManager;
+
+public class STGcovProgramChecker implements STNMSymbolsHandler {
+
+	private boolean gcovFound = false;
+	private long timestamp;
+	private final static WeakHashMap<File, STGcovProgramChecker> map = new WeakHashMap<File, STGcovProgramChecker>();
+	
+	/** Private Constructor */
+	private STGcovProgramChecker(long timestamp) {
+		this.timestamp = timestamp;
+	}
+	
+	private static STGcovProgramChecker getProgramChecker(IBinaryObject object) throws IOException {
+		File program = object.getPath().toFile();
+		STGcovProgramChecker pg = map.get(program);
+		if (pg == null) {
+			pg = new STGcovProgramChecker(program.lastModified());
+			STNMFactory.getNM(object.getCPU(), object.getPath().toOSString(), pg);
+			map.put(program, pg);
+		} else {
+			long fileTime = program.lastModified();
+			if (fileTime > pg.timestamp) {
+				pg.timestamp = fileTime;
+				pg.gcovFound = false;
+				STNMFactory.getNM(object.getCPU(), object.getPath().toOSString(), pg);
+			}
+		}
+		return pg;
+	}
+	
+	public static boolean isGCovCompatible(String s) throws IOException {
+		IBinaryObject object = STSymbolManager.sharedInstance.getBinaryObject(new Path(s));
+		if (object == null) return false;
+		return isGCovCompatible(object);
+	}
+	
+	public static boolean isGCovCompatible(IBinaryObject object) throws IOException {
+		STGcovProgramChecker pg = getProgramChecker(object);
+		return pg.gcovFound;
+	}
+
+	@Override
+	public void foundBssSymbol(String symbol, String address) {
+	}
+
+	@Override
+	public void foundDataSymbol(String symbol, String address) {
+	}
+
+	@Override
+	public void foundTextSymbol(String symbol, String address) {
+		if ("gcov_read_words".equals(symbol) || "_gcov_read_words".equals(symbol))
+		{
+			gcovFound = true;
+		}
+	}
+
+	@Override
+	public void foundUndefSymbol(String symbol) {
+	}
+	
+	
+	
+}
diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/CovFileContentProvider.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/CovFileContentProvider.java
new file mode 100644
index 0000000..1f011bc
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/CovFileContentProvider.java
@@ -0,0 +1,60 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.view;

+

+import java.util.LinkedList;

+

+import org.eclipse.linuxtools.gcov.model.CovFolderTreeElement;

+import org.eclipse.linuxtools.gcov.model.CovRootTreeElement;

+import org.eclipse.linuxtools.gcov.model.TreeElement;

+

+

+

+public class CovFileContentProvider extends CovFolderContentProvider {

+

+	public static final CovFileContentProvider sharedInstance = new CovFileContentProvider();

+	

+	/**

+	 * Constructor

+	 */

+	protected CovFileContentProvider() {

+	}

+	

+	@Override

+	public Object[] getChildren(Object parentElement) {

+		if (parentElement instanceof CovRootTreeElement) {

+			CovRootTreeElement root = (CovRootTreeElement) parentElement;

+			LinkedList<? extends TreeElement> ret = getElementChildrenList(root);

+			return ret.toArray();

+		}

+		return super.getChildren(parentElement);

+	}

+

+	protected LinkedList<? extends TreeElement> getElementChildrenList(CovRootTreeElement root) {

+		LinkedList<TreeElement> ret = new LinkedList<TreeElement>();

+		LinkedList<? extends TreeElement> list = root.getChildren();

+		for (TreeElement folderlist : list) {

+			LinkedList<? extends TreeElement> partialList = folderlist.getChildren();

+			ret.addAll(partialList);

+		}

+		return ret;

+	}

+

+	@Override

+	public Object getParent(Object element) {

+		Object o = super.getParent(element);

+		if (o instanceof CovFolderTreeElement) {

+			o = super.getParent(o);

+		}

+		return o;

+	}

+

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/CovFolderContentProvider.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/CovFolderContentProvider.java
new file mode 100644
index 0000000..f3fbfc1
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/CovFolderContentProvider.java
@@ -0,0 +1,61 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.view;

+

+

+import java.util.LinkedList;

+import org.eclipse.jface.viewers.ITreeContentProvider;

+import org.eclipse.jface.viewers.Viewer;

+import org.eclipse.linuxtools.gcov.model.TreeElement;

+import org.eclipse.linuxtools.gcov.parser.CovManager;

+

+

+public class CovFolderContentProvider implements ITreeContentProvider {

+	

+	/** Shared instance: this class is implemented as a Singleton */

+	public static final CovFolderContentProvider sharedInstance = new CovFolderContentProvider();

+

+	

+	protected CovFolderContentProvider(){

+	}

+

+	public Object[] getChildren(Object parentElement) {

+		TreeElement elem = (TreeElement) parentElement;

+		LinkedList<? extends TreeElement> list = elem.getChildren();

+		if (list != null)

+			return list.toArray();

+		else return null;

+	}

+

+	public Object getParent(Object element) {

+		TreeElement elem = (TreeElement) element;

+		return elem.getParent();

+	}

+

+	public boolean hasChildren(Object element) {

+		TreeElement elem = (TreeElement) element;

+		return elem.hasChildren();

+	}

+

+	public Object[] getElements(Object inputElement) {

+		if (inputElement == null) return new Object[0];

+		CovManager cvrgMnger = (CovManager)inputElement;

+		return new Object[] {

+				cvrgMnger.getRootNode()	

+		};

+	}

+

+	public void dispose() {

+	}

+

+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

+	}	

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/CovFunctionContentProvider.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/CovFunctionContentProvider.java
new file mode 100644
index 0000000..8093b2a
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/CovFunctionContentProvider.java
@@ -0,0 +1,52 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.view;

+

+import java.util.LinkedList;

+

+import org.eclipse.linuxtools.gcov.model.CovFileTreeElement;

+import org.eclipse.linuxtools.gcov.model.CovRootTreeElement;

+import org.eclipse.linuxtools.gcov.model.TreeElement;

+

+

+

+

+public class CovFunctionContentProvider extends CovFileContentProvider {

+

+	public static final CovFunctionContentProvider sharedInstance = new CovFunctionContentProvider();

+	

+	/**

+	 * Constructor

+	 */

+	protected CovFunctionContentProvider() {

+	}

+	

+	protected LinkedList<? extends TreeElement> getElementChildrenList(CovRootTreeElement root) {

+		LinkedList<? extends TreeElement> list = super.getElementChildrenList(root);

+		LinkedList<TreeElement> ret = new LinkedList<TreeElement>();

+		for (TreeElement histTreeElem : list) {

+			LinkedList<? extends TreeElement> partialList = histTreeElem.getChildren();

+			ret.addAll(partialList);

+		}

+		return ret;

+	}

+	

+

+	@Override

+	public Object getParent(Object element) {

+		Object o = super.getParent(element);

+		if (o instanceof CovFileTreeElement) {

+			o = super.getParent(o);

+		}

+		return o;

+	}

+

+}
\ No newline at end of file
diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/CovView.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/CovView.java
new file mode 100644
index 0000000..2e407fb
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/CovView.java
@@ -0,0 +1,261 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.view;

+

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IProject;

+import org.eclipse.core.resources.IWorkspaceRoot;

+import org.eclipse.core.resources.ResourcesPlugin;

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.Path;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.jface.action.Action;

+import org.eclipse.jface.action.IAction;

+import org.eclipse.jface.action.IToolBarManager;

+import org.eclipse.jface.action.Separator;

+import org.eclipse.jface.dialogs.MessageDialog;

+import org.eclipse.linuxtools.dataviewers.abstractview.AbstractSTDataView;

+import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTViewer;

+import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersImages;

+import org.eclipse.linuxtools.dataviewers.actions.STExportToCSVAction;

+import org.eclipse.linuxtools.dataviewers.charts.actions.ChartAction;

+import org.eclipse.linuxtools.gcov.Activator;

+import org.eclipse.linuxtools.gcov.action.SwitchContentProviderAction;

+import org.eclipse.linuxtools.gcov.parser.CovManager;

+import org.eclipse.linuxtools.gcov.parser.SourceFile;

+import org.eclipse.linuxtools.gcov.view.annotatedsource.OpenSourceFileAction;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.layout.GridData;

+import org.eclipse.swt.layout.GridLayout;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Label;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.ui.IWorkbenchPage;

+import org.eclipse.ui.IWorkbenchWindow;

+import org.eclipse.ui.PartInitException;

+import org.eclipse.ui.PlatformUI;

+

+

+/**

+ * @author Xavier Raynaud <xavier.raynaud@st.com>

+ *

+ */

+public class CovView extends AbstractSTDataView {

+

+	private String defaultCSVPath = "gcov.csv";

+	

+	private Label label;

+

+	private Action folderAction;

+	private Action fileAction;

+	private Action functionAction;

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.linuxtools.dataviewers.abstractview.AbstractSTDataView#createAbstractSTViewer

+	 * (org.eclipse.swt.widgets.Composite)

+	 */

+	protected AbstractSTViewer createAbstractSTViewer(Composite parent) {

+		return new CovViewer(parent);

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.linuxtools.dataviewers.abstractview.AbstractSTDataViewer#contributeToToolbar(org.eclipse.jface.action.IToolBarManager)

+	 */

+	@Override

+	protected void contributeToToolbar(IToolBarManager manager) {

+		super.contributeToToolbar(manager);

+		manager.add(new Separator());

+		manager.add(new Separator());

+		manager.add(folderAction);

+		manager.add(fileAction);

+		manager.add(functionAction);

+		manager.add(new Separator());

+		manager.add(new ChartAction(getViewSite().getShell(), getSTViewer()));

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.linuxtools.dataviewers.abstractview.AbstractSTDataViewer#createActions()

+	 */

+	@Override

+	protected void createActions() {

+		STDataViewersImages.getImageDescriptor(""); // workaround a bug

+		super.createActions();

+		folderAction = new SwitchContentProviderAction(

+				"Sort coverage per folder", 

+				"icons/directory_obj.gif",

+				getSTViewer().getViewer(),

+				CovFolderContentProvider.sharedInstance);

+

+		fileAction = new SwitchContentProviderAction(

+				"Sort coverage per file",

+				"icons/c_file_obj.gif", 

+				getSTViewer().getViewer(),

+				CovFileContentProvider.sharedInstance);

+		fileAction.setChecked(true);

+

+		functionAction = new SwitchContentProviderAction(

+				"Sort coverage per function", 

+				"icons/function_obj.gif",

+				getSTViewer().getViewer(),

+				CovFunctionContentProvider.sharedInstance);

+	}

+

+	/**

+	 * This is a callback that will allow us

+	 * to create the viewer and initialize it.

+	 */

+	public void createPartControl(Composite parent) {

+		STDataViewersImages.getImageDescriptor(""); // workaround a bug

+		super.createPartControl(parent);

+		GridLayout l = (GridLayout) parent.getLayout();

+		l.horizontalSpacing = 0;

+		l.verticalSpacing = 0;

+		l.marginHeight = 0;

+		l.marginWidth = 0;

+	}

+

+	protected void createTitle(Composite parent) {

+		label = new Label(parent, SWT.WRAP);

+		GridData data = new GridData(SWT.FILL, SWT.BEGINNING, true, false, 1, 1);

+		label.setLayoutData(data);

+	}

+

+	public static void setCovViewTitle(CovView view, String title,

+			String binaryPath) {

+		view.label.setText(" \n program runs = " + title

+				+ " \n program file : " + binaryPath + "\n ");

+		view.label.getParent().layout(true);

+	}

+

+

+	public static void displayCovDetailedResult(String binaryPath, String gcdaFile) {

+		try {

+			// parse and process coverage data

+			CovManager cvrgeMnger = new CovManager(binaryPath);

+			List<String> gcdaPaths = new LinkedList<String>();

+			gcdaPaths.add(gcdaFile);

+			cvrgeMnger.processCovFiles(gcdaPaths);

+			// generate model for view

+			cvrgeMnger.fillGcovView();

+			

+			for (SourceFile sf : cvrgeMnger.getSourceMap().values()) {

+				IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();

+				IFile binary = root.getFileForLocation(new Path(binaryPath));

+				IProject project = null;

+				if (binary != null) project = binary.getProject();

+				OpenSourceFileAction.sharedInstance.openAnnotatedSourceFile(project, 

+						binary, sf, 0);

+			}

+		} catch (Exception _) {

+			final String message = "An error has occured when parsing "

+				+ "the coverage data files :\n" + _.getMessage();

+			Status status = new Status(Status.ERROR, Activator.PLUGIN_ID,

+					IStatus.ERROR, message, _);

+

+			Activator.getDefault().getLog().log(status);

+			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {

+				public void run() {

+					Shell s = PlatformUI.getWorkbench().getDisplay().getActiveShell();

+					MessageDialog.openError(s, "Gcov Parsing Error", message);

+				}

+			});

+			return;

+		}

+	}

+	

+	public static CovView displayCovResults(String binaryPath) {

+		try {

+			// parse and process coverage data

+			CovManager cvrgeMnger = new CovManager(binaryPath);

+			List<String> gcdaPaths = cvrgeMnger.getGCDALocations();

+			cvrgeMnger.processCovFiles(gcdaPaths);

+			// generate model for view

+			cvrgeMnger.fillGcovView();

+			//load an Eclipse view

+			CovView cvrgeView = displayCovResults(cvrgeMnger);

+			return cvrgeView;

+		} catch (Exception _) {

+			final String message = "An error has occured when parsing "

+				+ "the coverage data files :\n" + _.getMessage();

+			Status status = new Status(Status.ERROR, Activator.PLUGIN_ID,

+					IStatus.ERROR, message, _);

+

+			Activator.getDefault().getLog().log(status);

+			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {

+				public void run() {

+					Shell s = PlatformUI.getWorkbench().getDisplay().getActiveShell();

+					MessageDialog.openError(s, "Gcov Parsing Error", message);

+				}

+			});

+		}

+		return null;

+	}

+	

+	/**

+	 * Used by Test engine and OpenSerAction

+	 * @param cvrgeMnger

+	 */

+	public static CovView displayCovResults(CovManager cvrgeMnger) throws PartInitException {

+			//load an Eclipse view

+			IWorkbenchWindow window = PlatformUI.getWorkbench()

+			.getActiveWorkbenchWindow();

+			IWorkbenchPage page = window.getActivePage();

+			CovView cvrgeView = (CovView) page.showView("org.eclipse.linuxtools.gcov.view");

+

+			//view title 

+			CovView.setCovViewTitle(cvrgeView, Integer

+					.toString((int) cvrgeMnger.getNbrPgmRuns()), cvrgeMnger

+					.getBinaryPath());

+

+			// load the controller

+			cvrgeView.setInput(cvrgeMnger);

+			CovViewer stviewer = (CovViewer) cvrgeView.getSTViewer();

+			stviewer.getViewer().expandToLevel(2);

+			return cvrgeView;

+	}

+	

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.linuxtools.dataviewers.abstractview.AbstractSTDataView#createExportToCSVAction()

+	 */

+	@Override

+	protected IAction createExportToCSVAction() {

+		IAction action = new STExportToCSVAction(this.getSTViewer()) {

+			public void run() {

+				Object o = getSTViewer().getInput();

+				if (o instanceof CovManager) {

+					getExporter().setFilePath(getDefaultCSVPath());

+				}

+				super.run();

+			}

+			

+		};

+		return action;

+	}

+

+	/**

+	 * @return the defaultCSVPath

+	 */

+	public String getDefaultCSVPath() {

+		return defaultCSVPath;

+	}

+

+	/**

+	 * @param defaultCSVPath the defaultCSVPath to set

+	 */

+	public void setDefaultCSVPath(String defaultCSVPath) {

+		this.defaultCSVPath = defaultCSVPath;

+	}

+

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/CovViewer.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/CovViewer.java
new file mode 100644
index 0000000..5ec9694
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/CovViewer.java
@@ -0,0 +1,119 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.view;

+

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IProject;

+import org.eclipse.core.resources.IWorkspaceRoot;

+import org.eclipse.core.resources.ResourcesPlugin;

+import org.eclipse.core.runtime.IPath;

+import org.eclipse.core.runtime.Path;

+import org.eclipse.jface.dialogs.IDialogSettings;

+import org.eclipse.jface.viewers.IContentProvider;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.jface.viewers.OpenEvent;

+import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTTreeViewer;

+import org.eclipse.linuxtools.dataviewers.abstractviewers.ISTDataViewersField;

+import org.eclipse.linuxtools.gcov.model.CovFileTreeElement;

+import org.eclipse.linuxtools.gcov.model.CovFunctionTreeElement;

+import org.eclipse.linuxtools.gcov.model.TreeElement;

+import org.eclipse.linuxtools.gcov.parser.CovManager;

+import org.eclipse.linuxtools.gcov.parser.SourceFile;

+import org.eclipse.linuxtools.gcov.view.annotatedsource.OpenSourceFileAction;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.widgets.Composite;

+

+

+

+public class CovViewer extends AbstractSTTreeViewer {

+

+	private ISTDataViewersField[] fields;

+

+	/**

+	 * Constructor

+	 * @param parent

+	 */

+	public CovViewer(Composite parent) {

+		super(parent, SWT.BORDER | SWT.H_SCROLL| SWT.V_SCROLL | SWT.MULTI | 

+				SWT.FULL_SELECTION);

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTViewer#createContentProvider()

+	 */

+	@Override

+	protected IContentProvider createContentProvider() {

+		return CovFileContentProvider.sharedInstance;

+

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTViewer#getAllFields()

+	 */

+	@Override

+	public ISTDataViewersField[] getAllFields() {

+		if (fields == null) {

+			fields = new ISTDataViewersField[] { 

+					new FieldName(),

+					new FieldTotalLines(), 

+					new FieldInstrumentedLines(),

+					new FieldExecutedLines(), 

+					new FieldCoveragePercentage() };

+		}

+		return fields;

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTViewer#getDialogSettings()

+	 */

+	public IDialogSettings getDialogSettings() {

+		return org.eclipse.linuxtools.gcov.Activator.getDefault().getDialogSettings();

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTViewer#handleOpenEvent(org.eclipse.jface.viewers.OpenEvent)

+	 */

+	protected void handleOpenEvent(OpenEvent event) {

+

+		IStructuredSelection selection = (IStructuredSelection) event

+		.getSelection();

+		TreeElement element = (TreeElement) selection.getFirstElement();

+

+		if (element != null) {

+			if (element.getParent() != null) {

+				String sourceLoc = "";

+				long lineNumber = 0;

+

+				if (element.getClass() == CovFileTreeElement.class)

+					sourceLoc = element.getName();

+

+				else if (element.getClass() == CovFunctionTreeElement.class) {

+					sourceLoc = ((CovFunctionTreeElement) element).getSourceFilePath();

+					lineNumber  =((CovFunctionTreeElement)element).getFirstLnNmbr();

+				}

+				CovManager cvm = (CovManager) this.getInput();

+				SourceFile sourceFile = cvm.getSourceFile(sourceLoc);

+				if (sourceFile != null) {

+					IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();

+					String binaryLoc = cvm.getBinaryPath();

+					IPath binaryPath = new Path(binaryLoc);

+					IFile binary = root.getFileForLocation(binaryPath);

+					IProject project = null;

+					if (binary != null) project = binary.getProject();

+

+					OpenSourceFileAction.sharedInstance.openAnnotatedSourceFile(project, 

+							binary, sourceFile, (int)lineNumber);

+				}

+			}

+		}

+	}

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/FieldCoveragePercentage.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/FieldCoveragePercentage.java
new file mode 100644
index 0000000..aef5074
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/FieldCoveragePercentage.java
@@ -0,0 +1,99 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.view;

+

+import java.text.DecimalFormat;

+import java.text.NumberFormat;

+

+import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractPercentageDrawerField;

+import org.eclipse.linuxtools.dataviewers.charts.provider.IChartField;

+import org.eclipse.linuxtools.gcov.model.CovRootTreeElement;

+import org.eclipse.linuxtools.gcov.model.TreeElement;

+

+

+

+public class FieldCoveragePercentage extends AbstractPercentageDrawerField implements IChartField {

+

+	public final static NumberFormat nf = new DecimalFormat("##0.0#");

+

+

+	public String getColumnHeaderText() {

+		return "Coverage %";

+	}

+

+	@Override

+	public String getValue(Object obj) {

+		float f = getPercentage(obj);

+		if (f < 0)

+			f = 0.0f;

+		return nf.format(f);

+	}

+

+

+	/**

+	 * Gets the percentage value to display

+	 * @param obj

+	 * @return the percentage value to display, as a float

+	 */

+	public float getPercentage(Object obj) {

+		TreeElement e = (TreeElement) obj;

+		return e.getCoveragePercentage();

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractPercentageDrawerField#getNumberFormat()

+	 */

+	@Override

+	public NumberFormat getNumberFormat() {

+		return nf;

+	}

+

+	@Override

+	public boolean isSettedNumberFormat() {

+		return true;

+	}

+

+	public String getToolTipText(Object element) {

+		TreeElement e = (TreeElement) element;

+		String s =" Coverage % = "+Integer.toString((int)e.getCoveragePercentage());

+		return s ;			

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.linuxtools.dataviewers.abstractviewers.ISTDataViewersField#compare(java.lang.Object, java.lang.Object)

+	 */

+	public int compare(Object obj1, Object obj2) {

+		TreeElement e1 = (TreeElement) obj1;

+		TreeElement e2 = (TreeElement) obj2;

+		float f1 = e1.getCoveragePercentage();

+		float f2 = e2.getCoveragePercentage();

+		return Float.compare(f1, f2);

+	}

+

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.linuxtools.dataviewers.charts.provider.IChartField#getNumber(java.lang.Object)

+	 */

+	public Number getNumber(Object obj) {

+		TreeElement e = (TreeElement) obj;

+		float f = getPercentage(obj);

+		if (e.getClass() == CovRootTreeElement.class)

+			return 0;

+		else {

+			if (f < 0)

+				f = 0.0f;

+			return f;

+		}

+	}

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/FieldExecutedLines.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/FieldExecutedLines.java
new file mode 100644
index 0000000..718a117
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/FieldExecutedLines.java
@@ -0,0 +1,68 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.view;

+

+import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTDataViewersField;

+import org.eclipse.linuxtools.dataviewers.charts.provider.IChartField;

+import org.eclipse.linuxtools.gcov.model.TreeElement;

+

+

+public class FieldExecutedLines extends AbstractSTDataViewersField implements IChartField{

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.linuxtools.dataviewers.abstractviewers.ISTDataViewersField#getColumnHeaderText()

+	 */

+	public String getColumnHeaderText() {

+		return "Executed Lines";

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.linuxtools.dataviewers.abstractviewers.ISTDataViewersField#getValue(java.lang.Object)

+	 */

+	public String getValue(Object obj) {

+		TreeElement e = (TreeElement) obj;

+		return Integer.toString(e.getExecutedLines());

+	}

+

+	@Override

+	public String getToolTipText(Object element) {

+		TreeElement e = (TreeElement) element;

+		String s = "Executed lines number = "

+			+ Integer.toString(e.getExecutedLines());

+		return s;

+	}

+

+	public int compare(Object obj1, Object obj2) {

+		TreeElement e1 = (TreeElement) obj1;

+		TreeElement e2 = (TreeElement) obj2;

+		String s1 = Integer.toString(e1.getExecutedLines());

+		String s2 = Integer.toString(e2.getExecutedLines());

+		if (s1 == null) {

+			if (s2 == null)

+				return 0;

+			return -1;

+		}

+		if (s2 == null)

+			return 1;

+		return s1.compareTo(s2);

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.linuxtools.dataviewers.charts.provider.IChartField#getNumber(java.lang.Object)

+	 */

+	public Number getNumber(Object obj) {

+		TreeElement e = (TreeElement) obj;

+		return e.getExecutedLines();

+	}

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/FieldInstrumentedLines.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/FieldInstrumentedLines.java
new file mode 100644
index 0000000..3d478dd
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/FieldInstrumentedLines.java
@@ -0,0 +1,77 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.view;

+

+import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTDataViewersField;

+import org.eclipse.linuxtools.dataviewers.charts.provider.IChartField;

+import org.eclipse.linuxtools.gcov.model.TreeElement;

+

+

+

+public class FieldInstrumentedLines extends AbstractSTDataViewersField implements IChartField{

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.linuxtools.dataviewers.abstractviewers.ISTDataViewersField#getColumnHeaderText()

+	 */

+	public String getColumnHeaderText() {

+		return "Instrumented Lines";

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.linuxtools.dataviewers.abstractviewers.ISTDataViewersField#getValue(java.lang.Object)

+	 */

+	public String getValue(Object obj) {

+		TreeElement e = (TreeElement) obj;

+		return Integer.toString(e.getInstrumentedLines());

+	}

+

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTDataViewersField#getToolTipText(java.lang.Object)

+	 */

+	@Override

+	public String getToolTipText(Object element) {

+		TreeElement e = (TreeElement) element;

+		String s = "Instrumented lines number = "+Integer.toString(e.getInstrumentedLines());

+		return s;

+	}

+

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.linuxtools.dataviewers.abstractviewers.ISTDataViewersField#compare(java.lang.Object, java.lang.Object)

+	 */

+	public int compare(Object obj1, Object obj2) {

+		TreeElement e1 = (TreeElement) obj1;

+		TreeElement e2 = (TreeElement) obj2;

+		String s1 = Integer.toString(e1.getInstrumentedLines());

+		String s2 = Integer.toString(e2.getInstrumentedLines());

+		if (s1 == null) {

+			if (s2 == null) return 0;

+			return -1;

+		}

+		if (s2 == null) return 1;

+		return s1.compareTo(s2);

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.linuxtools.dataviewers.charts.provider.IChartField#getNumber(java.lang.Object)

+	 */

+	public Number getNumber(Object obj) {

+		TreeElement e = (TreeElement) obj;

+		return e.getInstrumentedLines();

+	}

+

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/FieldName.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/FieldName.java
new file mode 100644
index 0000000..7193628
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/FieldName.java
@@ -0,0 +1,69 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.view;

+

+import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTDataViewersField;

+import org.eclipse.linuxtools.gcov.model.TreeElement;

+

+

+public class FieldName extends AbstractSTDataViewersField {

+

+	/* 

+	 * (non-Javadoc)

+	 * @see org.eclipse.linuxtools.dataviewers.abstractviewers.ISTDataViewersField#getColumnHeaderText()

+	 */

+	@Override

+	public String getColumnHeaderText() {

+		return "Name";

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.linuxtools.dataviewers.abstractviewers.ISTDataViewersField#getValue(java.lang.Object)

+	 */

+	@Override

+	public String getValue(Object obj) {

+		TreeElement e = (TreeElement) obj;

+		String nm = e.getName();

+		nm = nm.substring(nm.lastIndexOf('/')+1);

+		nm = nm.substring(nm.lastIndexOf('\\')+1);

+		return nm;

+	}

+

+	/* 

+	 * (non-Javadoc)

+	 * @see org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTDataViewersField#getToolTipText(java.lang.Object)

+	 */

+	@Override

+	public String getToolTipText(Object element) {

+		TreeElement elem = (TreeElement) element;

+		String s = elem.getName();

+		return s;

+	}

+

+	/* 

+	 * (non-Javadoc)

+	 * @see org.eclipse.linuxtools.dataviewers.abstractviewers.ISTDataViewersField#compare(java.lang.Object, java.lang.Object)

+	 */

+	@Override

+	public int compare(Object obj1, Object obj2) {

+		String s1 = getValue(obj1);

+		String s2 = getValue(obj2);

+		if (s1 == null) {

+			if (s2 == null)

+				return 0;

+			return -1;

+		}

+		if (s2 == null)

+			return 1;

+		return s1.compareTo(s2);

+	}

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/FieldTotalLines.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/FieldTotalLines.java
new file mode 100644
index 0000000..993679b
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/FieldTotalLines.java
@@ -0,0 +1,82 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.view;

+

+

+import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTDataViewersField;

+import org.eclipse.linuxtools.gcov.model.CovFileTreeElement;

+import org.eclipse.linuxtools.gcov.model.CovFunctionTreeElement;

+import org.eclipse.linuxtools.gcov.model.TreeElement;

+

+

+

+public class FieldTotalLines extends AbstractSTDataViewersField {

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.linuxtools.dataviewers.abstractviewers.ISTDataViewersField#getColumnHeaderText()

+	 */

+	@Override

+	public String getColumnHeaderText() {

+		return "Total Lines";

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.linuxtools.dataviewers.abstractviewers.ISTDataViewersField#getValue(java.lang.Object)

+	 */

+	@Override

+	public String getValue(Object obj) {	

+		TreeElement e = (TreeElement) obj;

+		if (e.getClass() != CovFunctionTreeElement.class)

+			return Integer.toString(e.getTotalLines());

+		else 

+			return "";

+	}

+

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTDataViewersField#getToolTipText(java.lang.Object)

+	 */

+	@Override

+	public String getToolTipText(Object element) {

+		TreeElement e = (TreeElement) element;

+		if (e.getClass() != CovFunctionTreeElement.class)

+			return "Total lines number = "+Integer.toString(e.getTotalLines());

+		else 

+			return "";

+	}

+

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.linuxtools.dataviewers.abstractviewers.ISTDataViewersField#compare(java.lang.Object, java.lang.Object)

+	 */

+	@Override

+	public int compare(Object obj1, Object obj2) {

+		TreeElement e1 = (TreeElement) obj1;

+		TreeElement e2 = (TreeElement) obj2;

+

+		if (e1.getClass() == CovFileTreeElement.class) {

+			String s1 = Integer.toString(((CovFileTreeElement)e1).getTotalLines());

+			String s2 = Integer.toString(((CovFileTreeElement)e2).getTotalLines());

+			if (s1 == null) {

+				if (s2 == null)

+					return 0;

+				return -1;

+			}

+			if (s2 == null)

+				return 1;

+			return s1.compareTo(s2);

+		}

+		else return 0;

+	}

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/annotatedsource/CoverageAnnotationColumn.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/annotatedsource/CoverageAnnotationColumn.java
new file mode 100644
index 0000000..8e098b5
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/annotatedsource/CoverageAnnotationColumn.java
@@ -0,0 +1,79 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.view.annotatedsource;

+

+

+import java.util.ArrayList;

+

+import org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.ISTAnnotationColumn;

+import org.eclipse.linuxtools.gcov.parser.Line;

+import org.eclipse.linuxtools.gcov.parser.SourceFile;

+

+

+public class CoverageAnnotationColumn implements ISTAnnotationColumn {

+	

+

+	private final ArrayList<Line> lines;

+

+	public CoverageAnnotationColumn(SourceFile sourceFile) {

+		lines = sourceFile.getLines();

+	}

+

+	@Override

+	public String getAnnotation(int index) {

+		try {

+			Line l = lines.get(index+1);

+			if (!l.isExists()) {

+				return "";

+			} else {

+				return Long.toString(l.getCount());

+			}

+		} catch (IndexOutOfBoundsException _) {

+			return "";

+		}

+	}

+

+	@Override

+	public String getLongDescription(int line) {

+		return null;

+	}

+

+	@Override

+	public String getTitle() {

+		return "Coverage";

+	}

+

+	

+	@Override

+	public String getHeaderTooltip() {

+		return "Coverage";

+	}

+

+	@Override

+	public String getTooltip(int index) {

+		try {

+			Line l = lines.get(index+1);

+			if (!l.isExists()) {

+				return "non executable line";

+			} else {

+				long count = l.getCount();

+				if (count == 0) return "line never executed";

+				if (count == 1) return "line executed 1 time";

+				return "line executed "

+				+ Long.toString(count)

+				+ " times";

+			}

+		} catch (IndexOutOfBoundsException _) {

+			return "non executable line";

+		}

+	}

+

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/annotatedsource/OpenSourceFileAction.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/annotatedsource/OpenSourceFileAction.java
new file mode 100644
index 0000000..4852144
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/annotatedsource/OpenSourceFileAction.java
@@ -0,0 +1,136 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.view.annotatedsource;

+

+import java.net.URI;

+

+import org.eclipse.cdt.ui.CUIPlugin;

+import org.eclipse.core.filesystem.EFS;

+import org.eclipse.core.filesystem.IFileStore;

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IProject;

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.IPath;

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.Path;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.jface.text.BadLocationException;

+import org.eclipse.jface.text.IDocument;

+import org.eclipse.linuxtools.binutils.link2source.STLink2SourceSupport;

+import org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.AbstractSTAnnotatedSourceEditorInput;

+import org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.actions.AbstractOpenSourceFileAction;

+import org.eclipse.linuxtools.gcov.Activator;

+import org.eclipse.linuxtools.gcov.parser.SourceFile;

+import org.eclipse.ui.IEditorInput;

+import org.eclipse.ui.IEditorPart;

+import org.eclipse.ui.IURIEditorInput;

+import org.eclipse.ui.IWorkbenchPage;

+import org.eclipse.ui.PartInitException;

+import org.eclipse.ui.texteditor.IDocumentProvider;

+import org.eclipse.ui.texteditor.ITextEditor;

+

+

+public class OpenSourceFileAction {

+

+	/**

+	 * Shared instance of this class

+	 */

+	public static final OpenSourceFileAction sharedInstance = new OpenSourceFileAction();

+

+	private OpenSourceFileAction() {

+	}

+

+	

+	// FIXME: move this method in binutils plugin.

+	private IFileStore getFileStore(IProject project, IPath path) {

+		IEditorInput input  = STLink2SourceSupport.sharedInstance.getEditorInput(path, project);

+		if (input instanceof IURIEditorInput) {

+			IURIEditorInput editorInput = (IURIEditorInput) input; 

+			URI uri = editorInput.getURI();

+			try {

+				IFileStore fs = EFS.getStore(uri);

+				return fs;

+			} catch (CoreException _) {

+				return null;

+			}

+		}

+		return null;

+	}

+

+	

+	private AbstractSTAnnotatedSourceEditorInput getInput(SourceFile sourceFile,

+			IFileStore fs) {

+		AbstractSTAnnotatedSourceEditorInput input = new STAnnotatedSourceEditorInput(

+				fs, sourceFile);

+		IWorkbenchPage p = CUIPlugin.getActivePage();

+		IEditorPart editorPart = p.findEditor(input);

+		if (editorPart != null)

+			p.closeEditor(editorPart, false);

+		return input;

+	}

+

+	public void openAnnotatedSourceFile(IProject project, IFile binary, SourceFile sourceFile, int lineNumber) {

+		if (sourceFile == null) return;

+		String pathName = sourceFile.getName();

+		if (pathName == null) return;

+		IPath path = new Path(pathName);

+		openAnnotatedSourceFile(project, binary, sourceFile, path, lineNumber);

+	}

+	

+	public void openAnnotatedSourceFile(IProject project, IFile binary, SourceFile sourceFile, IPath realLocation, int lineNumber) {

+		IWorkbenchPage page = CUIPlugin.getActivePage();

+		if (page != null) {

+			IFileStore fs = getFileStore(project, realLocation);

+			if (fs == null && !realLocation.isAbsolute() && binary != null) {

+				IPath p = binary.getProjectRelativePath().removeLastSegments(1);

+				fs = getFileStore(project, p.append(realLocation));

+			}

+			if (fs == null) {

+				try {

+					page.openEditor(new STAnnotatedSourceNotFoundEditorInput(project,sourceFile,

+							realLocation, lineNumber),

+							STAnnotatedSourceNotFoundEditor.ID, true);

+				} catch (PartInitException e) {

+					Status s = new Status(IStatus.ERROR, Activator.PLUGIN_ID,

+							IStatus.ERROR, "Error when opening annotated source view",

+							e);

+					Activator.getDefault().getLog().log(s);

+				}

+			} else {

+				IEditorInput input = getInput(sourceFile, fs);

+				try {

+					IEditorPart editor = page.openEditor(input,

+							AbstractOpenSourceFileAction.EDITOR_ID, true);

+					if (lineNumber > 0 && editor instanceof ITextEditor) {

+						IDocumentProvider provider = ((ITextEditor) editor).getDocumentProvider();

+						IDocument document = provider.getDocument(editor.getEditorInput());

+						try {

+							int start = document.getLineOffset(lineNumber - 1);

+							((ITextEditor) editor).selectAndReveal(start, 0);

+						} catch (BadLocationException _) {

+							// ignore

+						}

+						IWorkbenchPage p = editor.getSite().getPage();

+						p.activate(editor);

+					}

+				} catch (PartInitException e) {

+					Status s = new Status(IStatus.ERROR, Activator.PLUGIN_ID,

+							IStatus.ERROR, "Error when opening annotated source view",

+							e);

+					Activator.getDefault().getLog().log(s);

+				}

+			}

+		}

+	}

+	

+	

+

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/annotatedsource/STAnnotatedSourceEditorInput.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/annotatedsource/STAnnotatedSourceEditorInput.java
new file mode 100644
index 0000000..a74bc69
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/annotatedsource/STAnnotatedSourceEditorInput.java
@@ -0,0 +1,73 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.gcov.view.annotatedsource;

+

+import java.util.ArrayList;

+

+import org.eclipse.core.filesystem.IFileStore;

+import org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.AbstractSTAnnotatedSourceEditorInput;

+import org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.ISTAnnotationColumn;

+import org.eclipse.linuxtools.gcov.parser.Line;

+import org.eclipse.linuxtools.gcov.parser.SourceFile;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+

+

+

+public class STAnnotatedSourceEditorInput extends

+AbstractSTAnnotatedSourceEditorInput {

+

+	private final SourceFile sourceFile;

+	private final int lineCount;

+	private final ArrayList<ISTAnnotationColumn> columns = new ArrayList<ISTAnnotationColumn>();

+

+	public static final Color GREEN = new Color(PlatformUI.getWorkbench().getDisplay(), 0 ,128, 0);

+

+	// FIXME: dispose colors ?

+	private static final Color[] greenColors = new Color[129];

+	

+	

+	public STAnnotatedSourceEditorInput(IFileStore fileStore, SourceFile sourceFile){

+		super(fileStore);

+		this.sourceFile = sourceFile; 

+		lineCount = sourceFile.getLines().size();

+		this.columns.add(new CoverageAnnotationColumn(sourceFile));

+	}

+

+	@Override

+	public Color getColor(int ln) {

+		final int index = ln + 1;

+		Display display = PlatformUI.getWorkbench().getDisplay();

+		if (index < lineCount){

+			ArrayList<Line> lines = sourceFile.getLines();

+			Line line = lines.get(index);

+			if (line.isExists()) {

+				long count = line.getCount();

+				if (count == 0) return display.getSystemColor(SWT.COLOR_RED);;

+				if (count == sourceFile.getmaxLineCount()) return GREEN;

+				int colorIndex = 128 - (int) ((128*count)/sourceFile.getmaxLineCount());

+				if (greenColors[colorIndex] == null) {

+					greenColors[colorIndex] = new Color(display, colorIndex,127+colorIndex,colorIndex);

+				}

+				return greenColors[colorIndex];

+			}

+		}

+		return display.getSystemColor(SWT.COLOR_WHITE);

+	}	

+

+	@Override

+	public ArrayList<ISTAnnotationColumn> getColumns() {

+		return columns;

+	}

+

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/annotatedsource/STAnnotatedSourceNotFoundEditor.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/annotatedsource/STAnnotatedSourceNotFoundEditor.java
new file mode 100644
index 0000000..b73a617
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/annotatedsource/STAnnotatedSourceNotFoundEditor.java
@@ -0,0 +1,50 @@
+/*******************************************************************************

+ * Copyright (c) 2009 STMicroelectronics.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation

+ *******************************************************************************/

+

+package org.eclipse.linuxtools.gcov.view.annotatedsource;

+

+import org.eclipse.core.resources.IProject;

+import org.eclipse.core.runtime.IPath;

+import org.eclipse.linuxtools.binutils.link2source.STCSourceNotFoundEditor;

+import org.eclipse.linuxtools.gcov.parser.SourceFile;

+import org.eclipse.ui.IEditorInput;

+

+

+/**

+ * @author Xavier Raynaud <xavier.raynaud@st.com>

+ *

+ */

+public class STAnnotatedSourceNotFoundEditor extends

+		STCSourceNotFoundEditor {

+	

+	public static final String ID = "org.eclipse.linuxtools.gcov.view.annotatedsource.STAnnotatedSourceNotFoundEditor";

+

+	public STAnnotatedSourceNotFoundEditor() {

+		

+	}

+	

+	

+	

+	/* (non-Javadoc)

+	 * @see org.eclipse.linuxtools.binutils.link2source.STCSourceNotFoundEditor#openSourceFileAtLocation(org.eclipse.core.resources.IProject, org.eclipse.core.runtime.IPath, int)

+	 */

+	protected void openSourceFileAtLocation(IProject project, IPath sourceLoc,

+			int lineNumber) {

+		IEditorInput input = this.getEditorInput();

+		if (input instanceof STAnnotatedSourceNotFoundEditorInput) {

+			STAnnotatedSourceNotFoundEditorInput editorInput = (STAnnotatedSourceNotFoundEditorInput) input;

+			SourceFile sf = editorInput.getSourceFile();

+			OpenSourceFileAction.sharedInstance.openAnnotatedSourceFile(project, null, sf, sourceLoc, lineNumber);

+		} else {

+			super.openSourceFileAtLocation(project, sourceLoc, lineNumber);

+		}

+	}

+}

diff --git a/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/annotatedsource/STAnnotatedSourceNotFoundEditorInput.java b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/annotatedsource/STAnnotatedSourceNotFoundEditorInput.java
new file mode 100644
index 0000000..fb34914
--- /dev/null
+++ b/gcov/org.eclipse.linuxtools.gcov/src/org/eclipse/linuxtools/gcov/view/annotatedsource/STAnnotatedSourceNotFoundEditorInput.java
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2009 STMicroelectronics.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Xavier Raynaud <xavier.raynaud@st.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.gcov.view.annotatedsource;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.linuxtools.binutils.link2source.STCSourceNotFoundEditorInput;
+import org.eclipse.linuxtools.gcov.parser.SourceFile;
+
+
+public class STAnnotatedSourceNotFoundEditorInput extends STCSourceNotFoundEditorInput {
+
+	private final SourceFile sourceFile;
+	
+	public STAnnotatedSourceNotFoundEditorInput(IProject project,
+			SourceFile sourceFile,
+			IPath sourcePath, int lineNumber) {
+		super(project, sourcePath, lineNumber);
+		this.sourceFile = sourceFile;
+	}
+
+	/**
+	 * @return the sourceFile
+	 */
+	public SourceFile getSourceFile() {
+		return sourceFile;
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#hashCode()
+	 */
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = super.hashCode();
+		result = prime * result
+				+ ((sourceFile == null) ? 0 : sourceFile.hashCode());
+		return result;
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (!super.equals(obj))
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		final STAnnotatedSourceNotFoundEditorInput other = (STAnnotatedSourceNotFoundEditorInput) obj;
+		if (sourceFile == null) {
+			if (other.sourceFile != null)
+				return false;
+		} else if (!sourceFile.equals(other.sourceFile))
+			return false;
+		return true;
+	}
+
+}
diff --git a/gprof/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STCSourceNotFoundEditor.java b/gprof/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STCSourceNotFoundEditor.java
index 0f849c2..89770a4 100644
--- a/gprof/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STCSourceNotFoundEditor.java
+++ b/gprof/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STCSourceNotFoundEditor.java
@@ -17,7 +17,6 @@
 
 import org.eclipse.cdt.debug.core.CDebugCorePlugin;
 import org.eclipse.cdt.debug.core.sourcelookup.MappingSourceContainer;
-import org.eclipse.cdt.debug.internal.core.sourcelookup.CSourceLookupDirector;
 import org.eclipse.cdt.debug.internal.core.sourcelookup.MapEntrySourceContainer;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
@@ -189,7 +188,7 @@
 	}
 
 	private void addSourceMappingToCommon(IPath missingPath, IPath newSourcePath) throws CoreException {
-		CSourceLookupDirector director = CDebugCorePlugin.getDefault().getCommonSourceLookupDirector();
+		AbstractSourceLookupDirector director = CDebugCorePlugin.getDefault().getCommonSourceLookupDirector();
 		addSourceMappingToDirector(missingPath, newSourcePath, director);
 		CDebugCorePlugin.getDefault().savePluginPreferences();
 	}
diff --git a/gprof/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STCSourceNotFoundEditorInput.java b/gprof/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STCSourceNotFoundEditorInput.java
index b5a650e..38e76b8 100644
--- a/gprof/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STCSourceNotFoundEditorInput.java
+++ b/gprof/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STCSourceNotFoundEditorInput.java
@@ -87,6 +87,7 @@
 	 * (non-Javadoc)
 	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
 	 */
+	@SuppressWarnings("unchecked")
 	public Object getAdapter(Class adapter) {
 		return null;
 	}
diff --git a/gprof/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STLink2SourceSupport.java b/gprof/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STLink2SourceSupport.java
index 078c670..d11e957 100644
--- a/gprof/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STLink2SourceSupport.java
+++ b/gprof/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STLink2SourceSupport.java
@@ -25,7 +25,6 @@
 import org.eclipse.cdt.core.model.IOutputEntry;
 import org.eclipse.cdt.core.model.ISourceRoot;
 import org.eclipse.cdt.debug.core.CDebugCorePlugin;
-import org.eclipse.cdt.debug.internal.core.sourcelookup.CSourceLookupDirector;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.utils.Addr64;
 import org.eclipse.core.filesystem.EFS;
@@ -39,6 +38,7 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.debug.core.sourcelookup.AbstractSourceLookupDirector;
 import org.eclipse.debug.core.sourcelookup.ISourceContainer;
 import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage;
 import org.eclipse.jface.text.BadLocationException;
@@ -457,7 +457,7 @@
 	private IEditorInput findFileInCommonSourceLookup(IPath path)
 	{
 		try {
-			CSourceLookupDirector director = CDebugCorePlugin.getDefault().getCommonSourceLookupDirector();
+			AbstractSourceLookupDirector director = CDebugCorePlugin.getDefault().getCommonSourceLookupDirector();
 			ISourceContainer[] c = director.getSourceContainers();
 			for (ISourceContainer sourceContainer : c) {
 				Object[] o = sourceContainer.findSourceElements(path.toOSString());
diff --git a/gprof/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCopyAction.java b/gprof/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCopyAction.java
index 7a83596..c9c33ba 100644
--- a/gprof/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCopyAction.java
+++ b/gprof/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCopyAction.java
@@ -42,7 +42,7 @@
 		Clipboard cb = new Clipboard(Display.getDefault());
 		ISTDataViewersField[] fields = stViewer.getAllFields();
 		IStructuredSelection selections = (IStructuredSelection)stViewer.getViewer().getSelection();
-		Iterator iterator = selections.iterator();
+		Iterator<?> iterator = selections.iterator();
 		StringBuilder sb = new StringBuilder();
 			
 		for(int i=0;iterator.hasNext();i++){
diff --git a/gprof/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/findreplace/STFindReplaceDialog.java b/gprof/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/findreplace/STFindReplaceDialog.java
index b9eadfc..2c2ba94 100644
--- a/gprof/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/findreplace/STFindReplaceDialog.java
+++ b/gprof/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/findreplace/STFindReplaceDialog.java
@@ -16,8 +16,18 @@
 import java.util.Set;
 import java.util.regex.PatternSyntaxException;
 
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.fieldassist.ComboContentAdapter;
+import org.eclipse.jface.fieldassist.FieldDecoration;
+import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
+import org.eclipse.jface.resource.JFaceColors;
+import org.eclipse.jface.text.TextUtilities;
+import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.jface.viewers.ViewerRow;
+import org.eclipse.linuxtools.dataviewers.STDataViewersActivator;
+import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTViewer;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -36,30 +46,13 @@
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.fieldassist.ComboContentAdapter;
-import org.eclipse.jface.fieldassist.FieldDecoration;
-import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
-import org.eclipse.jface.resource.JFaceColors;
-
-import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.jface.viewers.ViewerCell;
-import org.eclipse.jface.viewers.ViewerRow;
-import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTViewer;
-
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.fieldassist.ContentAssistCommandAdapter;
-import org.eclipse.ui.internal.texteditor.NLSUtility;
-import org.eclipse.ui.internal.texteditor.SWTUtil;
-import org.eclipse.ui.internal.texteditor.TextEditorPlugin;
 import org.eclipse.ui.texteditor.IAbstractTextEditorHelpContextIds;
 import org.eclipse.ui.texteditor.IEditorStatusLine;
-import org.eclipse.ui.texteditor.IFindReplaceTargetExtension2;
 import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
 
 
@@ -153,8 +146,8 @@
 	 */
 	boolean fIsRegExInit;
 
-	private List fFindHistory;
-	private List fReplaceHistory;
+	private List<String> fFindHistory;
+	private List<String> fReplaceHistory;
 	
 	private boolean fIsTargetEditable;
 	private ISTFindReplaceTarget fTarget;
@@ -216,8 +209,8 @@
 		fTarget= null;
 
 		fDialogPositionInit= null;
-		fFindHistory= new ArrayList(HISTORY_SIZE - 1);
-		fReplaceHistory= new ArrayList(HISTORY_SIZE - 1);
+		fFindHistory= new ArrayList<String>(HISTORY_SIZE - 1);
+		fReplaceHistory= new ArrayList<String>(HISTORY_SIZE - 1);
 
 		fWrapInit= false;
 		fCaseInit= false;
@@ -894,7 +887,7 @@
 	 * Returns the dialog's history.
 	 * @return the dialog's history
 	 */
-	private List getFindHistory() {
+	private List<String> getFindHistory() {
 		return fFindHistory;
 	}
 
@@ -915,7 +908,7 @@
 	 * Returns the dialog's replace history.
 	 * @return the dialog's replace history
 	 */
-	private List getReplaceHistory() {
+	private List<String> getReplaceHistory() {
 		return fReplaceHistory;
 	}
 
@@ -1228,101 +1221,6 @@
 	}
 
 	/**
-	 * Replaces all occurrences of the user's findString with
-	 * the replace string.  Indicate to the user the number of replacements
-	 * that occur.
-	 */
-	private void performReplaceAll() {
-
-		int replaceCount= 0;
-		final String replaceString= getReplaceString();
-		final String findString= getFindString();
-
-		if (findString != null && findString.length() > 0) {
-
-			class ReplaceAllRunnable implements Runnable {
-				public int numberOfOccurrences;
-				public void run() {
-					numberOfOccurrences= replaceAll(findString, replaceString == null ? "" : replaceString, isForwardSearch(), isCaseSensitiveSearch(), isWrapSearch(), isWholeWordSearch(), isRegExSearchAvailableAndChecked());	//$NON-NLS-1$
-				}
-			}
-
-			try {
-				ReplaceAllRunnable runnable= new ReplaceAllRunnable();
-				BusyIndicator.showWhile(fActiveShell.getDisplay(), runnable);
-				replaceCount= runnable.numberOfOccurrences;
-
-				if (replaceCount != 0) {
-					if (replaceCount == 1) { // not plural
-						statusMessage(EditorMessages.FindReplace_Status_replacement_label);
-					} else {
-						String msg= EditorMessages.FindReplace_Status_replacements_label;
-						msg= NLSUtility.format(msg, String.valueOf(replaceCount));
-						statusMessage(msg);
-					}
-				} else {
-					statusMessage(EditorMessages.FindReplace_Status_noMatch_label);
-				}
-			} catch (PatternSyntaxException ex) {
-				statusError(ex.getLocalizedMessage());
-			} catch (IllegalStateException ex) {
-				// we don't keep state in this dialog
-			}
-		}
-		writeSelection();
-		updateButtonState();
-	}
-
-	/**
-	 * Validates the state of the find/replace target.
-	 * @return <code>true</code> if target can be changed, <code>false</code> otherwise
-	 * @since 2.1
-	 */
-	private boolean validateTargetState() {
-
-		if (fTarget instanceof IFindReplaceTargetExtension2) {
-			IFindReplaceTargetExtension2 extension= (IFindReplaceTargetExtension2) fTarget;
-			if (!extension.validateTargetState()) {
-				statusError(EditorMessages.FindReplaceDialog_read_only);
-				updateButtonState();
-				return false;
-			}
-		}
-		return isEditable();
-	}
-
-	/**
-	 * Replaces the current selection of the target with the user's
-	 * replace string.
-	 *
-	 * @return <code>true</code> if the operation was successful
-	 */
-	private boolean performReplaceSelection() {
-
-		if (!validateTargetState())
-			return false;
-
-		String replaceString= getReplaceString();
-		if (replaceString == null)
-			replaceString= ""; //$NON-NLS-1$
-
-		boolean replaced;
-		try {
-			replaceSelection(replaceString, isRegExSearchAvailableAndChecked());
-			replaced= true;
-			writeSelection();
-		} catch (PatternSyntaxException ex) {
-			statusError(ex.getLocalizedMessage());
-			replaced= false;
-		} catch (IllegalStateException ex) {
-			replaced= false;
-		}
-
-		updateButtonState();
-		return replaced;
-	}
-
-	/**
 	 * Locates the user's findString in the text of the target.
 	 */
 	private void performSearch() {
@@ -1367,28 +1265,9 @@
 		updateButtonState(!somethingFound);
 	}
 
-	/**
-	 * Replaces all occurrences of the user's findString with
-	 * the replace string.  Returns the number of replacements
-	 * that occur.
-	 *
-	 * @param findString the string to search for
-	 * @param replaceString the replacement string
-	 * @param forwardSearch	the search direction
-	 * @param caseSensitive should the search be case sensitive
-	 * @param wrapSearch	should search wrap to start/end if end/start is reached
-	 * @param wholeWord does the search string represent a complete word
-	 * @param regExSearch if <code>true</code> findString represents a regular expression
-	 * @return the number of occurrences
-	 *
-	 * @since 3.0
-	 */
-	private int replaceAll(String findString, String replaceString, boolean forwardSearch, boolean caseSensitive, boolean wrapSearch, boolean wholeWord, boolean regExSearch) {
-			return 0;
-	}
 
 	// ------- UI creation ---------------------------------------
-
+	
 	/**
 	 * Attaches the given layout specification to the <code>component</code>.
 	 *
@@ -1401,8 +1280,8 @@
 	private void setGridData(Control component, int horizontalAlignment, boolean grabExcessHorizontalSpace, int verticalAlignment, boolean grabExcessVerticalSpace) {
 		GridData gd;
 		if (component instanceof Button && (((Button)component).getStyle() & SWT.PUSH) != 0) {
-			SWTUtil.setButtonDimensionHint((Button)component);
 			gd= (GridData)component.getLayoutData();
+			gd.horizontalAlignment = GridData.FILL;
 		} else {
 			gd= new GridData();
 			component.setLayoutData(gd);
@@ -1443,12 +1322,6 @@
 	 */
 	private void updateButtonState(boolean disableReplace) {
 		if (okToUse(getShell()) && okToUse(fFindNextButton)) {
-
-			boolean selection= false;
-			if (fTarget != null) {
-				String selectedText= fTarget.getSelectionText(index);
-				selection= (selectedText != null && selectedText.length() > 0);
-			}
 			boolean enable= fTarget != null && (fActiveShell == fParentShell || fActiveShell == getShell());
 			String str= getFindString();
 			boolean findString= str != null && str.length() > 0;
@@ -1486,7 +1359,7 @@
 	 * @param combo combo to be updated
 	 * @param content to be put into the combo
 	 */
-	private void updateCombo(Combo combo, List content) {
+	private void updateCombo(Combo combo, List<String> content) {
 		combo.removeAll();
 		for (int i= 0; i < content.size(); i++) {
 			combo.add(content.get(i).toString());
@@ -1495,16 +1368,6 @@
 
 	// ------- open / reopen ---------------------------------------
 
-	/**
-	 * Called after executed find/replace action to update the history.
-	 */
-	private void updateFindAndReplaceHistory() {
-		updateFindHistory();
-		if (okToUse(fReplaceField)) {
-			updateHistory(fReplaceField, fReplaceHistory);
-		}
-
-	}
 
 	/**
 	 * Called after executed find action to update the history.
@@ -1522,7 +1385,7 @@
 	 * @param combo to be updated
 	 * @param history to be put into the combo
 	 */
-	private void updateHistory(Combo combo, List history) {
+	private void updateHistory(Combo combo, List<String> history) {
 		String findString= combo.getText();
 		int index= history.indexOf(findString);
 		if (index != 0) {
@@ -1627,7 +1490,7 @@
 	 * @return the dialog settings to be used
 	 */
 	private IDialogSettings getDialogSettings() {
-		IDialogSettings settings= TextEditorPlugin.getDefault().getDialogSettings();
+		IDialogSettings settings= STDataViewersActivator.getDefault().getDialogSettings();
 		fDialogSettings= settings.getSection(getClass().getName());
 		if (fDialogSettings == null)
 			fDialogSettings= settings.addNewSection(getClass().getName());
@@ -1640,7 +1503,7 @@
 	 */
 	protected IDialogSettings getDialogBoundsSettings() {
 		String sectionName= getClass().getName() + "_dialogBounds"; //$NON-NLS-1$
-		IDialogSettings settings= TextEditorPlugin.getDefault().getDialogSettings();
+		IDialogSettings settings= STDataViewersActivator.getDefault().getDialogSettings();
 		IDialogSettings section= settings.getSection(sectionName);
 		if (section == null)
 			section= settings.addNewSection(sectionName);
@@ -1670,7 +1533,7 @@
 
 		String[] findHistory= s.getArray("findhistory"); //$NON-NLS-1$
 		if (findHistory != null) {
-			List history= getFindHistory();
+			List<String> history= getFindHistory();
 			history.clear();
 			for (int i= 0; i < findHistory.length; i++)
 				history.add(findHistory[i]);
@@ -1678,7 +1541,7 @@
 
 		String[] replaceHistory= s.getArray("replacehistory"); //$NON-NLS-1$
 		if (replaceHistory != null) {
-			List history= getReplaceHistory();
+			List<String> history= getReplaceHistory();
 			history.clear();
 			for (int i= 0; i < replaceHistory.length; i++)
 				history.add(replaceHistory[i]);
@@ -1697,7 +1560,7 @@
 		s.put("incremental", fIncrementalInit); //$NON-NLS-1$
 		s.put("isRegEx", fIsRegExInit); //$NON-NLS-1$
 		
-		List history= getFindHistory();
+		List<String> history= getFindHistory();
 		String findString= getFindString();
 		if (findString.length() > 0)
 			history.add(0, findString);
@@ -1718,11 +1581,11 @@
 	 * @param sectionName the section name
 	 * @since 3.2
 	 */
-	private void writeHistory(List history, IDialogSettings settings, String sectionName) {
+	private void writeHistory(List<String> history, IDialogSettings settings, String sectionName) {
 		int itemCount= history.size();
-		Set distinctItems= new HashSet(itemCount);
+		Set<String> distinctItems= new HashSet<String>(itemCount);
 		for (int i= 0; i < itemCount; i++) {
-			String item= (String)history.get(i);
+			String item= history.get(i);
 			if (distinctItems.contains(item)) {
 				history.remove(i--);
 				itemCount--;
diff --git a/gprof/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/findreplace/STTreeViewerRow.java b/gprof/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/findreplace/STTreeViewerRow.java
index a4528f1..123db04 100644
--- a/gprof/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/findreplace/STTreeViewerRow.java
+++ b/gprof/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/findreplace/STTreeViewerRow.java
@@ -290,7 +290,7 @@
 
 	public TreePath getTreePath() {
 		TreeItem tItem = item;
-		LinkedList segments = new LinkedList();
+		LinkedList<Object> segments = new LinkedList<Object>();
 		while (tItem != null) {
 			Object segment = tItem.getData();
 			Assert.isNotNull(segment);
diff --git a/gprof/org.eclipse.linuxtools.gprof-feature/feature.xml b/gprof/org.eclipse.linuxtools.gprof-feature/feature.xml
index 8520c7d..265c4e2 100644
--- a/gprof/org.eclipse.linuxtools.gprof-feature/feature.xml
+++ b/gprof/org.eclipse.linuxtools.gprof-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.linuxtools.gprof"
       label="%featureName"
-      version="0.3.0.qualifier"
+      version="0.5.0.qualifier"
       provider-name="%featureProvider">
 
    <description>
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/bigtest_gprof_input/testParse.ref b/gprof/org.eclipse.linuxtools.gprof.test/bigtest_gprof_input/testParse.ref
new file mode 100755
index 0000000..4d85dbb
--- /dev/null
+++ b/gprof/org.eclipse.linuxtools.gprof.test/bigtest_gprof_input/testParse.ref
@@ -0,0 +1,4019 @@
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 0
+ 
+Histogram Header : 
+
+  Base pc address of sample buffer = 0x8048398
+  Max pc address of sampled buffer = 0x8077570
+  Number of histogram samples      = 48246
+  Profiling clock rate             = 100
+  Physical dimension abreviation : 's' for "seconds"  'm' for "milliseconds" = s
+
+ ==  HISTOGRAM RECORDS  == 
+ ========================= 
+ 
+Histogram Header : 
+
+  Base pc address of sample buffer = 0x8048398
+  Max pc address of sampled buffer = 0x8077570
+  Number of histogram samples      = 48246
+  Profiling clock rate             = 100
+  Physical dimension abreviation : 's' for "seconds"  'm' for "milliseconds" = s
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/build.properties b/gprof/org.eclipse.linuxtools.gprof.test/build.properties
index aa1a008..e1f454c 100644
--- a/gprof/org.eclipse.linuxtools.gprof.test/build.properties
+++ b/gprof/org.eclipse.linuxtools.gprof.test/build.properties
@@ -2,4 +2,9 @@
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
+               test.xml,\
+               foox_gprof_input/,\
+               foocpp_gprof_input/,\
+               partially-pg-build_gprof_input/,\
+               bigtest_gprof_input/,\
                plugin.properties
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testCallgraphTimeView.ref b/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testCallgraphTimeView.ref
index 549c72b..e58673b 100644
--- a/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testCallgraphTimeView.ref
+++ b/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testCallgraphTimeView.ref
@@ -1,8 +1,8 @@
 Hierarchy;Name (location);Time;Calls;Time/Call;%Time
 +-;Summary;0ns;;;0.0
-  +-;A::foocpp::foocpp[in-charge]();0ns;2;0ns;0.0
+  +-;A::foocpp::foocpp();0ns;2;0ns;0.0
   | +-;parents;0ns;2;0ns;0.0
-  |   +-;B::foocpp::foocpp[in-charge]() (foox.cpp:82);0ns;1;0ns;0.0
+  |   +-;B::foocpp::foocpp() (foox.cpp:82);0ns;1;0ns;0.0
   |   +-;main (foox.cpp:110);0ns;1;0ns;0.0
   +-;A::foocpp::func_a(int);0ns;2;0ns;0.0
   | +-;children;0ns;2;0ns;0.0
@@ -13,13 +13,13 @@
   +-;A::foocpp::func_f(int);0ns;2;0ns;0.0
   | +-;parents;0ns;2;0ns;0.0
   |   +-;A::foocpp::func_a(int) (foox.cpp:59);0ns;2;0ns;0.0
-  +-;A::foocpp::~foocpp [in-charge]();0ns;2;0ns;0.0
+  +-;A::foocpp::~foocpp();0ns;2;0ns;0.0
   | +-;parents;0ns;2;0ns;0.0
-  |   +-;B::foocpp::~foocpp [in-charge]() (foox.cpp:87);0ns;1;0ns;0.0
+  |   +-;B::foocpp::~foocpp() (foox.cpp:87);0ns;1;0ns;0.0
   |   +-;main (foox.cpp:118);0ns;1;0ns;0.0
-  +-;B::foocpp::foocpp[in-charge]();0ns;1;0ns;0.0
+  +-;B::foocpp::foocpp();0ns;1;0ns;0.0
   | +-;children;0ns;1;0ns;0.0
-  | | +-;A::foocpp::foocpp[in-charge]() (foox.cpp:42);0ns;1;0ns;0.0
+  | | +-;A::foocpp::foocpp() (foox.cpp:42);0ns;1;0ns;0.0
   | +-;parents;0ns;1;0ns;0.0
   |   +-;main (foox.cpp:109);0ns;1;0ns;0.0
   +-;B::foocpp::func_b(int);0ns;1;0ns;0.0
@@ -27,16 +27,16 @@
   | | +-;A::foocpp::func_a(int) (foox.cpp:54);0ns;1;0ns;0.0
   | +-;parents;0ns;1;0ns;0.0
   |   +-;main (foox.cpp:115);0ns;1;0ns;0.0
-  +-;B::foocpp::~foocpp [in-charge]();0ns;1;0ns;0.0
+  +-;B::foocpp::~foocpp();0ns;1;0ns;0.0
   | +-;children;0ns;1;0ns;0.0
-  | | +-;A::foocpp::~foocpp [in-charge]() (foox.cpp:44);0ns;1;0ns;0.0
+  | | +-;A::foocpp::~foocpp() (foox.cpp:44);0ns;1;0ns;0.0
   | +-;parents;0ns;1;0ns;0.0
   |   +-;main (foox.cpp:119);0ns;1;0ns;0.0
   +-;main;0ns;0;;0.0
     +-;children;0ns;6;0ns;0.0
-      +-;A::foocpp::foocpp[in-charge]() (foox.cpp:42);0ns;1;0ns;0.0
+      +-;A::foocpp::foocpp() (foox.cpp:42);0ns;1;0ns;0.0
       +-;A::foocpp::func_a(int) (foox.cpp:54);0ns;1;0ns;0.0
-      +-;A::foocpp::~foocpp [in-charge]() (foox.cpp:44);0ns;1;0ns;0.0
-      +-;B::foocpp::foocpp[in-charge]() (foox.cpp:81);0ns;1;0ns;0.0
+      +-;A::foocpp::~foocpp() (foox.cpp:44);0ns;1;0ns;0.0
+      +-;B::foocpp::foocpp() (foox.cpp:81);0ns;1;0ns;0.0
       +-;B::foocpp::func_b(int) (foox.cpp:91);0ns;1;0ns;0.0
-      +-;B::foocpp::~foocpp [in-charge]() (foox.cpp:86);0ns;1;0ns;0.0
+      +-;B::foocpp::~foocpp() (foox.cpp:86);0ns;1;0ns;0.0
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testCallgraphTimeView.ref.binutils-2.16 b/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testCallgraphTimeView.ref.binutils-2.16
new file mode 100644
index 0000000..9569eb7
--- /dev/null
+++ b/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testCallgraphTimeView.ref.binutils-2.16
@@ -0,0 +1,42 @@
+Hierarchy;Name (location);Time;Calls;Time/Call;%Time
++-;Summary;0ns;;;0.0
+  +-;A::foocpp::foocpp();0ns;2;0ns;0.0
+  | +-;parents;0ns;2;0ns;0.0
+  |   +-;B::foocpp::foocpp() (foox.cpp:82);0ns;1;0ns;0.0
+  |   +-;main (foox.cpp:110);0ns;1;0ns;0.0
+  +-;A::foocpp::func_a(int);0ns;2;0ns;0.0
+  | +-;children;0ns;2;0ns;0.0
+  | | +-;A::foocpp::func_f(int) (foox.cpp:99);0ns;2;0ns;0.0
+  | +-;parents;0ns;2;0ns;0.0
+  |   +-;B::foocpp::func_b(int) (foox.cpp:95);0ns;1;0ns;0.0
+  |   +-;main (foox.cpp:112);0ns;1;0ns;0.0
+  +-;A::foocpp::func_f(int);0ns;2;0ns;0.0
+  | +-;parents;0ns;2;0ns;0.0
+  |   +-;A::foocpp::func_a(int) (foox.cpp:59);0ns;2;0ns;0.0
+  +-;A::foocpp::~foocpp();0ns;2;0ns;0.0
+  | +-;parents;0ns;2;0ns;0.0
+  |   +-;B::foocpp::~foocpp() (foox.cpp:87);0ns;1;0ns;0.0
+  |   +-;main (foox.cpp:118);0ns;1;0ns;0.0
+  +-;B::foocpp::foocpp();0ns;1;0ns;0.0
+  | +-;children;0ns;1;0ns;0.0
+  | | +-;A::foocpp::foocpp() (foox.cpp:42);0ns;1;0ns;0.0
+  | +-;parents;0ns;1;0ns;0.0
+  |   +-;main (foox.cpp:109);0ns;1;0ns;0.0
+  +-;B::foocpp::func_b(int);0ns;1;0ns;0.0
+  | +-;children;0ns;1;0ns;0.0
+  | | +-;A::foocpp::func_a(int) (foox.cpp:44);0ns;1;0ns;0.0
+  | +-;parents;0ns;1;0ns;0.0
+  |   +-;main (foox.cpp:115);0ns;1;0ns;0.0
+  +-;B::foocpp::~foocpp();0ns;1;0ns;0.0
+  | +-;children;0ns;1;0ns;0.0
+  | | +-;A::foocpp::~foocpp() (foox.cpp:42);0ns;1;0ns;0.0
+  | +-;parents;0ns;1;0ns;0.0
+  |   +-;main (foox.cpp:119);0ns;1;0ns;0.0
+  +-;main;0ns;0;;0.0
+    +-;children;0ns;6;0ns;0.0
+      +-;A::foocpp::foocpp() (foox.cpp:42);0ns;1;0ns;0.0
+      +-;A::foocpp::func_a(int) (foox.cpp:44);0ns;1;0ns;0.0
+      +-;A::foocpp::~foocpp() (foox.cpp:42);0ns;1;0ns;0.0
+      +-;B::foocpp::foocpp() (foox.cpp:81);0ns;1;0ns;0.0
+      +-;B::foocpp::func_b(int) (foox.cpp:91);0ns;1;0ns;0.0
+      +-;B::foocpp::~foocpp() (foox.cpp:86);0ns;1;0ns;0.0
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testCallgraphView.ref b/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testCallgraphView.ref
index 98e450c..731eaf0 100644
--- a/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testCallgraphView.ref
+++ b/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testCallgraphView.ref
@@ -1,8 +1,8 @@
 Hierarchy;Name (location);Samples;Calls;Time/Call;%Time
 +-;Summary;0;;;0.0
-  +-;A::foocpp::foocpp[in-charge]();0;2;0ns;0.0
+  +-;A::foocpp::foocpp();0;2;0ns;0.0
   | +-;parents;0;2;0ns;0.0
-  |   +-;B::foocpp::foocpp[in-charge]() (foox.cpp:82);0;1;0ns;0.0
+  |   +-;B::foocpp::foocpp() (foox.cpp:82);0;1;0ns;0.0
   |   +-;main (foox.cpp:110);0;1;0ns;0.0
   +-;A::foocpp::func_a(int);0;2;0ns;0.0
   | +-;children;0;2;0ns;0.0
@@ -13,13 +13,13 @@
   +-;A::foocpp::func_f(int);0;2;0ns;0.0
   | +-;parents;0;2;0ns;0.0
   |   +-;A::foocpp::func_a(int) (foox.cpp:59);0;2;0ns;0.0
-  +-;A::foocpp::~foocpp [in-charge]();0;2;0ns;0.0
+  +-;A::foocpp::~foocpp();0;2;0ns;0.0
   | +-;parents;0;2;0ns;0.0
-  |   +-;B::foocpp::~foocpp [in-charge]() (foox.cpp:87);0;1;0ns;0.0
+  |   +-;B::foocpp::~foocpp() (foox.cpp:87);0;1;0ns;0.0
   |   +-;main (foox.cpp:118);0;1;0ns;0.0
-  +-;B::foocpp::foocpp[in-charge]();0;1;0ns;0.0
+  +-;B::foocpp::foocpp();0;1;0ns;0.0
   | +-;children;0;1;0ns;0.0
-  | | +-;A::foocpp::foocpp[in-charge]() (foox.cpp:42);0;1;0ns;0.0
+  | | +-;A::foocpp::foocpp() (foox.cpp:42);0;1;0ns;0.0
   | +-;parents;0;1;0ns;0.0
   |   +-;main (foox.cpp:109);0;1;0ns;0.0
   +-;B::foocpp::func_b(int);0;1;0ns;0.0
@@ -27,16 +27,16 @@
   | | +-;A::foocpp::func_a(int) (foox.cpp:54);0;1;0ns;0.0
   | +-;parents;0;1;0ns;0.0
   |   +-;main (foox.cpp:115);0;1;0ns;0.0
-  +-;B::foocpp::~foocpp [in-charge]();0;1;0ns;0.0
+  +-;B::foocpp::~foocpp();0;1;0ns;0.0
   | +-;children;0;1;0ns;0.0
-  | | +-;A::foocpp::~foocpp [in-charge]() (foox.cpp:44);0;1;0ns;0.0
+  | | +-;A::foocpp::~foocpp() (foox.cpp:44);0;1;0ns;0.0
   | +-;parents;0;1;0ns;0.0
   |   +-;main (foox.cpp:119);0;1;0ns;0.0
   +-;main;0;0;;0.0
     +-;children;0;6;0ns;0.0
-      +-;A::foocpp::foocpp[in-charge]() (foox.cpp:42);0;1;0ns;0.0
+      +-;A::foocpp::foocpp() (foox.cpp:42);0;1;0ns;0.0
       +-;A::foocpp::func_a(int) (foox.cpp:54);0;1;0ns;0.0
-      +-;A::foocpp::~foocpp [in-charge]() (foox.cpp:44);0;1;0ns;0.0
-      +-;B::foocpp::foocpp[in-charge]() (foox.cpp:81);0;1;0ns;0.0
+      +-;A::foocpp::~foocpp() (foox.cpp:44);0;1;0ns;0.0
+      +-;B::foocpp::foocpp() (foox.cpp:81);0;1;0ns;0.0
       +-;B::foocpp::func_b(int) (foox.cpp:91);0;1;0ns;0.0
-      +-;B::foocpp::~foocpp [in-charge]() (foox.cpp:86);0;1;0ns;0.0
+      +-;B::foocpp::~foocpp() (foox.cpp:86);0;1;0ns;0.0
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testCallgraphView.ref.binutils-2.16 b/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testCallgraphView.ref.binutils-2.16
new file mode 100644
index 0000000..6696d7e
--- /dev/null
+++ b/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testCallgraphView.ref.binutils-2.16
@@ -0,0 +1,42 @@
+Hierarchy;Name (location);Samples;Calls;Time/Call;%Time
++-;Summary;0;;;0.0
+  +-;A::foocpp::foocpp();0;2;0ns;0.0
+  | +-;parents;0;2;0ns;0.0
+  |   +-;B::foocpp::foocpp() (foox.cpp:82);0;1;0ns;0.0
+  |   +-;main (foox.cpp:110);0;1;0ns;0.0
+  +-;A::foocpp::func_a(int);0;2;0ns;0.0
+  | +-;children;0;2;0ns;0.0
+  | | +-;A::foocpp::func_f(int) (foox.cpp:99);0;2;0ns;0.0
+  | +-;parents;0;2;0ns;0.0
+  |   +-;B::foocpp::func_b(int) (foox.cpp:95);0;1;0ns;0.0
+  |   +-;main (foox.cpp:112);0;1;0ns;0.0
+  +-;A::foocpp::func_f(int);0;2;0ns;0.0
+  | +-;parents;0;2;0ns;0.0
+  |   +-;A::foocpp::func_a(int) (foox.cpp:59);0;2;0ns;0.0
+  +-;A::foocpp::~foocpp();0;2;0ns;0.0
+  | +-;parents;0;2;0ns;0.0
+  |   +-;B::foocpp::~foocpp() (foox.cpp:87);0;1;0ns;0.0
+  |   +-;main (foox.cpp:118);0;1;0ns;0.0
+  +-;B::foocpp::foocpp();0;1;0ns;0.0
+  | +-;children;0;1;0ns;0.0
+  | | +-;A::foocpp::foocpp() (foox.cpp:42);0;1;0ns;0.0
+  | +-;parents;0;1;0ns;0.0
+  |   +-;main (foox.cpp:109);0;1;0ns;0.0
+  +-;B::foocpp::func_b(int);0;1;0ns;0.0
+  | +-;children;0;1;0ns;0.0
+  | | +-;A::foocpp::func_a(int) (foox.cpp:44);0;1;0ns;0.0
+  | +-;parents;0;1;0ns;0.0
+  |   +-;main (foox.cpp:115);0;1;0ns;0.0
+  +-;B::foocpp::~foocpp();0;1;0ns;0.0
+  | +-;children;0;1;0ns;0.0
+  | | +-;A::foocpp::~foocpp() (foox.cpp:42);0;1;0ns;0.0
+  | +-;parents;0;1;0ns;0.0
+  |   +-;main (foox.cpp:119);0;1;0ns;0.0
+  +-;main;0;0;;0.0
+    +-;children;0;6;0ns;0.0
+      +-;A::foocpp::foocpp() (foox.cpp:42);0;1;0ns;0.0
+      +-;A::foocpp::func_a(int) (foox.cpp:44);0;1;0ns;0.0
+      +-;A::foocpp::~foocpp() (foox.cpp:42);0;1;0ns;0.0
+      +-;B::foocpp::foocpp() (foox.cpp:81);0;1;0ns;0.0
+      +-;B::foocpp::func_b(int) (foox.cpp:91);0;1;0ns;0.0
+      +-;B::foocpp::~foocpp() (foox.cpp:86);0;1;0ns;0.0
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testFunctionSampleView.ref b/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testFunctionSampleView.ref
index 3a1e605..d8781b2 100644
--- a/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testFunctionSampleView.ref
+++ b/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testFunctionSampleView.ref
@@ -1,10 +1,10 @@
 Hierarchy;Name (location);Samples;Calls;Time/Call;%Time
 +-;Summary;0;;;0.0
-  +-;A::foocpp::foocpp[in-charge]();0;2;0ns;0.0
+  +-;A::foocpp::foocpp();0;2;0ns;0.0
   +-;A::foocpp::func_a(int);0;2;0ns;0.0
   +-;A::foocpp::func_f(int);0;2;0ns;0.0
-  +-;A::foocpp::~foocpp [in-charge]();0;2;0ns;0.0
-  +-;B::foocpp::foocpp[in-charge]();0;1;0ns;0.0
+  +-;A::foocpp::~foocpp();0;2;0ns;0.0
+  +-;B::foocpp::foocpp();0;1;0ns;0.0
   +-;B::foocpp::func_b(int);0;1;0ns;0.0
-  +-;B::foocpp::~foocpp [in-charge]();0;1;0ns;0.0
+  +-;B::foocpp::~foocpp();0;1;0ns;0.0
   +-;main;0;0;;0.0
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testFunctionTimeView.ref b/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testFunctionTimeView.ref
index 12b785f..1445068 100644
--- a/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testFunctionTimeView.ref
+++ b/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testFunctionTimeView.ref
@@ -1,10 +1,10 @@
 Hierarchy;Name (location);Time;Calls;Time/Call;%Time
 +-;Summary;0ns;;;0.0
-  +-;A::foocpp::foocpp[in-charge]();0ns;2;0ns;0.0
+  +-;A::foocpp::foocpp();0ns;2;0ns;0.0
   +-;A::foocpp::func_a(int);0ns;2;0ns;0.0
   +-;A::foocpp::func_f(int);0ns;2;0ns;0.0
-  +-;A::foocpp::~foocpp [in-charge]();0ns;2;0ns;0.0
-  +-;B::foocpp::foocpp[in-charge]();0ns;1;0ns;0.0
+  +-;A::foocpp::~foocpp();0ns;2;0ns;0.0
+  +-;B::foocpp::foocpp();0ns;1;0ns;0.0
   +-;B::foocpp::func_b(int);0ns;1;0ns;0.0
-  +-;B::foocpp::~foocpp [in-charge]();0ns;1;0ns;0.0
+  +-;B::foocpp::~foocpp();0ns;1;0ns;0.0
   +-;main;0ns;0;;0.0
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testParse.ref b/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testParse.ref
new file mode 100755
index 0000000..ce258c6
--- /dev/null
+++ b/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testParse.ref
@@ -0,0 +1,67 @@
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 0
+ 
+Histogram Header : 
+
+  Base pc address of sample buffer = 0x804852c
+  Max pc address of sampled buffer = 0x8048ee8
+  Number of histogram samples      = 623
+  Profiling clock rate             = 100
+  Physical dimension abreviation : 's' for "seconds"  'm' for "milliseconds" = s
+
+ ==  HISTOGRAM RECORDS  == 
+ ========================= 
+ 
+Histogram Header : 
+
+  Base pc address of sample buffer = 0x804852c
+  Max pc address of sampled buffer = 0x8048ee8
+  Number of histogram samples      = 623
+  Profiling clock rate             = 100
+  Physical dimension abreviation : 's' for "seconds"  'm' for "milliseconds" = s
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testSampleView.ref b/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testSampleView.ref
index f430b08..92d6dce 100644
--- a/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testSampleView.ref
+++ b/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testSampleView.ref
@@ -1,11 +1,11 @@
 Hierarchy;Name (location);Samples;Calls;Time/Call;%Time
 +-;Summary;0;;;0.0
   +-;foox.cpp;0;;;0.0
-    +-;A::foocpp::foocpp[in-charge]();0;2;0ns;0.0
+    +-;A::foocpp::foocpp();0;2;0ns;0.0
     +-;A::foocpp::func_a(int);0;2;0ns;0.0
     +-;A::foocpp::func_f(int);0;2;0ns;0.0
-    +-;A::foocpp::~foocpp [in-charge]();0;2;0ns;0.0
-    +-;B::foocpp::foocpp[in-charge]();0;1;0ns;0.0
+    +-;A::foocpp::~foocpp();0;2;0ns;0.0
+    +-;B::foocpp::foocpp();0;1;0ns;0.0
     +-;B::foocpp::func_b(int);0;1;0ns;0.0
-    +-;B::foocpp::~foocpp [in-charge]();0;1;0ns;0.0
+    +-;B::foocpp::~foocpp();0;1;0ns;0.0
     +-;main;0;0;;0.0
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testTimeView.ref b/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testTimeView.ref
index ec13883..eed6086 100644
--- a/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testTimeView.ref
+++ b/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/testTimeView.ref
@@ -1,11 +1,11 @@
 Hierarchy;Name (location);Time;Calls;Time/Call;%Time
 +-;Summary;0ns;;;0.0
   +-;foox.cpp;0ns;;;0.0
-    +-;A::foocpp::foocpp[in-charge]();0ns;2;0ns;0.0
+    +-;A::foocpp::foocpp();0ns;2;0ns;0.0
     +-;A::foocpp::func_a(int);0ns;2;0ns;0.0
     +-;A::foocpp::func_f(int);0ns;2;0ns;0.0
-    +-;A::foocpp::~foocpp [in-charge]();0ns;2;0ns;0.0
-    +-;B::foocpp::foocpp[in-charge]();0ns;1;0ns;0.0
+    +-;A::foocpp::~foocpp();0ns;2;0ns;0.0
+    +-;B::foocpp::foocpp();0ns;1;0ns;0.0
     +-;B::foocpp::func_b(int);0ns;1;0ns;0.0
-    +-;B::foocpp::~foocpp [in-charge]();0ns;1;0ns;0.0
+    +-;B::foocpp::~foocpp();0ns;1;0ns;0.0
     +-;main;0ns;0;;0.0
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/foox_gprof_input/testParse.ref b/gprof/org.eclipse.linuxtools.gprof.test/foox_gprof_input/testParse.ref
new file mode 100755
index 0000000..f3f8314
--- /dev/null
+++ b/gprof/org.eclipse.linuxtools.gprof.test/foox_gprof_input/testParse.ref
@@ -0,0 +1,43 @@
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 0
+ 
+Histogram Header : 
+
+  Base pc address of sample buffer = 0x8048360
+  Max pc address of sampled buffer = 0x8048be8
+  Number of histogram samples      = 546
+  Profiling clock rate             = 100
+  Physical dimension abreviation : 's' for "seconds"  'm' for "milliseconds" = s
+
+ ==  HISTOGRAM RECORDS  == 
+ ========================= 
+ 
+Histogram Header : 
+
+  Base pc address of sample buffer = 0x8048360
+  Max pc address of sampled buffer = 0x8048be8
+  Number of histogram samples      = 546
+  Profiling clock rate             = 100
+  Physical dimension abreviation : 's' for "seconds"  'm' for "milliseconds" = s
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 1
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/partially-pg-build_gprof_input/testParse.ref b/gprof/org.eclipse.linuxtools.gprof.test/partially-pg-build_gprof_input/testParse.ref
new file mode 100755
index 0000000..fc8a9b2
--- /dev/null
+++ b/gprof/org.eclipse.linuxtools.gprof.test/partially-pg-build_gprof_input/testParse.ref
@@ -0,0 +1,23 @@
+-- gmon Results --
+cookie gmon
+gmon_version 1
+tag 0
+ 
+Histogram Header : 
+
+  Base pc address of sample buffer = 0x80483c8
+  Max pc address of sampled buffer = 0x80486c0
+  Number of histogram samples      = 190
+  Profiling clock rate             = 100
+  Physical dimension abreviation : 's' for "seconds"  'm' for "milliseconds" = s
+
+ ==  HISTOGRAM RECORDS  == 
+ ========================= 
+ 
+Histogram Header : 
+
+  Base pc address of sample buffer = 0x80483c8
+  Max pc address of sampled buffer = 0x80486c0
+  Number of histogram samples      = 190
+  Profiling clock rate             = 100
+  Physical dimension abreviation : 's' for "seconds"  'm' for "milliseconds" = s
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/src/org/eclipse/linuxtools/gprof/test/GprofAggregatorTest.java b/gprof/org.eclipse.linuxtools.gprof.test/src/org/eclipse/linuxtools/gprof/test/GprofAggregatorTest.java
index 19ec1be..b6fb8f9 100644
--- a/gprof/org.eclipse.linuxtools.gprof.test/src/org/eclipse/linuxtools/gprof/test/GprofAggregatorTest.java
+++ b/gprof/org.eclipse.linuxtools.gprof.test/src/org/eclipse/linuxtools/gprof/test/GprofAggregatorTest.java
@@ -61,9 +61,13 @@
 		s.add(gmon.toString());

 

 		String gprof2use="gprof";

+		File f = Aggregator.aggregate(gprof2use, binary, s, directory);
+		
+		Process p = Runtime.getRuntime().exec(new String[] {gprof2use, binary, f.getAbsolutePath()});
+		Process p2 = Runtime.getRuntime().exec(new String[] {gprof2use, binary, directory + File.separator + "gmon.sum.ref"});
 		

-

-		File f = Aggregator.aggregate(gprof2use, binary, s, directory);

-		STJunitUtils.compare(f.getAbsolutePath(), directory + File.separator + "gmon.sum.ref", true);

+		STJunitUtils.compare(p.getInputStream(), p2.getInputStream());
+		p.waitFor();
+		p2.waitFor();

 	}

 }

diff --git a/gprof/org.eclipse.linuxtools.gprof.test/src/org/eclipse/linuxtools/gprof/test/GprofParserTest.java b/gprof/org.eclipse.linuxtools.gprof.test/src/org/eclipse/linuxtools/gprof/test/GprofParserTest.java
index 19b752e..a5bf10a 100644
--- a/gprof/org.eclipse.linuxtools.gprof.test/src/org/eclipse/linuxtools/gprof/test/GprofParserTest.java
+++ b/gprof/org.eclipse.linuxtools.gprof.test/src/org/eclipse/linuxtools/gprof/test/GprofParserTest.java
@@ -41,7 +41,7 @@
 			ats.addTest(
 					new TestCase(testDir.getName() + ":Parser") {
 						public void runTest() throws Throwable {
-							testProcessGmonFile(logFile, binaryFile, parserRefFile, parserRefFile);
+							testProcessGmonFile(logFile, binaryFile, parserRefFile, parserDumpFile);
 						}
 					}
 			);
@@ -51,7 +51,7 @@
 	
 	public static void testProcessGmonFile(File gmonFile, File binaryFile, File parserRefFile, File parserDumpFile) throws Exception {
 		IBinaryObject binary = STSymbolManager.sharedInstance.getBinaryObject(binaryFile.getAbsolutePath());
-		final GmonDecoder gmondecoder = new GmonDecoder(binary, new PrintStream(parserRefFile));
+		final GmonDecoder gmondecoder = new GmonDecoder(binary, new PrintStream(parserDumpFile));
 		gmondecoder.setShouldDump(true);	
 		gmondecoder.read(gmonFile.getAbsolutePath());
 		STJunitUtils.compareIgnoreEOL(parserDumpFile.getAbsolutePath(), parserRefFile.getAbsolutePath(), true);
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/src/org/eclipse/linuxtools/gprof/test/GprofTest.java b/gprof/org.eclipse.linuxtools.gprof.test/src/org/eclipse/linuxtools/gprof/test/GprofTest.java
index a56c563..ea54907 100644
--- a/gprof/org.eclipse.linuxtools.gprof.test/src/org/eclipse/linuxtools/gprof/test/GprofTest.java
+++ b/gprof/org.eclipse.linuxtools.gprof.test/src/org/eclipse/linuxtools/gprof/test/GprofTest.java
@@ -14,6 +14,9 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
@@ -49,15 +52,45 @@
 
 	public static Test suite() {
 		TestSuite ats = new TestSuite("GProf:View CSV Export");
-
-		File[] testDirs = STJunitUtils.getTestDirs("org.eclipse.linuxtools.gprof.test", ".*" + GMON_DIRECTORY_SUFFIX);
+		boolean addr2line2_16 = false;
+		try {
+			Process p = Runtime.getRuntime().exec("addr2line --version");
+			InputStream is = p.getInputStream();
+			LineNumberReader reader = new LineNumberReader(new InputStreamReader(is));
+			String line;
+			while ((line = reader.readLine()) != null) {
+				if (line.contains("addr2line 2.16.")) {
+					addr2line2_16 = true;
+					break;
+				}
+			}
+		} catch (Exception _) {
+		}
+		
+		File[] testDirs = STJunitUtils.getTestDirs("org.eclipse.linuxtools.gprof.test",
+				".*" + GMON_DIRECTORY_SUFFIX);
 		for (File testDir : testDirs) {
 			final File gmonFile = new File(testDir, GMON_OUTPUT_FILE);
 			final File binaryFile = new File(testDir, GMON_BINARY_FILE);
-			final File view_cg_RefFile = new File(testDir, "testCallgraphView.ref");
-			final File view_cg_DumpFile = new File(testDir, "testCallgraphView.dump");
-			final File view_cg2_RefFile = new File(testDir, "testCallgraphTimeView.ref");
+
+			File view_cg_RefFile_default = new File(testDir, "testCallgraphView.ref");
+			File view_cg_RefFile_alternate = new File(testDir, "testCallgraphView.ref.binutils-2.16");
+			File view_cg2_RefFile_default = new File(testDir, "testCallgraphTimeView.ref");
+			File view_cg2_RefFile_alternate = new File(testDir, "testCallgraphTimeView.ref.binutils-2.16");
+			final File view_cg_RefFile;
+			final File view_cg2_RefFile;
+			if (addr2line2_16 && view_cg_RefFile_alternate.exists()) {
+				view_cg_RefFile = view_cg_RefFile_alternate;
+			} else {
+				view_cg_RefFile = view_cg_RefFile_default;
+			}
+			if (addr2line2_16 && view_cg2_RefFile_alternate.exists()) {
+				view_cg2_RefFile = view_cg2_RefFile_alternate;
+			} else {
+				view_cg2_RefFile = view_cg2_RefFile_default;
+			}
 			final File view_cg2_DumpFile = new File(testDir, "testCallgraphTimeView.dump");
+			final File view_cg_DumpFile = new File(testDir, "testCallgraphView.dump");
 
 			final File view_samplesFile_RefFile = new File(testDir, "testSampleView.ref");
 			final File view_samplesFile_DumpFile = new File(testDir, "testSampleView.dump");
@@ -73,68 +106,82 @@
 			final File view_samplesFlatT_RefFile = new File(testDir, "testFlatTimeView.ref");
 			final File view_samplesFlatT_DumpFile = new File(testDir, "testFlatTimeView.dump");
 
-			IBinaryObject binary = STSymbolManager.sharedInstance.getBinaryObject(new Path(binaryFile.getAbsolutePath()));
+			IBinaryObject binary = STSymbolManager.sharedInstance.getBinaryObject(
+					new Path(binaryFile.getAbsolutePath()));
 			final GmonDecoder gd = new GmonDecoder(binary);
 			try {
 				gd.read(gmonFile.getAbsolutePath());
 			} catch (IOException e) {
-				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
 
 			ats.addTest(
 					new TestCase(testDir.getName() + ":CSV-CALLGRAPH") {
 						public void runTest() throws Throwable {
-							testView(gmonFile, gd, view_cg_RefFile, view_cg_DumpFile, CallGraphContentProvider.sharedInstance, false);
+							testView(gmonFile, gd, view_cg_RefFile, view_cg_DumpFile,
+									CallGraphContentProvider.sharedInstance, false);
 						}
 					}
 			);
 			ats.addTest(
 					new TestCase(testDir.getName() + ":CSV-CALLGRAPH-TIMED") {
 						public void runTest() throws Throwable {
-							testView(gmonFile, gd, view_cg2_RefFile, view_cg2_DumpFile, CallGraphContentProvider.sharedInstance, true);
+							testView(gmonFile, gd, view_cg2_RefFile, view_cg2_DumpFile,
+									CallGraphContentProvider.sharedInstance, true);
 						}
 					}
 			);
 			ats.addTest(
 					new TestCase(testDir.getName() + ":CSV-FILE") {
 						public void runTest() throws Throwable {
-							testView(gmonFile, gd, view_samplesFile_RefFile, view_samplesFile_DumpFile, FileHistogramContentProvider.sharedInstance, false);
+							testView(gmonFile, gd, view_samplesFile_RefFile,
+									view_samplesFile_DumpFile,
+									FileHistogramContentProvider.sharedInstance, false);
 						}
 					}
 			);
 			ats.addTest(
 					new TestCase(testDir.getName() + ":CSV-FILE-TIMED") {
 						public void runTest() throws Throwable {
-							testView(gmonFile, gd, view_samplesFileT_RefFile, view_samplesFileT_DumpFile, FileHistogramContentProvider.sharedInstance, true);
+							testView(gmonFile, gd, view_samplesFileT_RefFile,
+									view_samplesFileT_DumpFile,
+									FileHistogramContentProvider.sharedInstance, true);
 						}
 					}
 			);
 			ats.addTest(
 					new TestCase(testDir.getName() + ":CSV-FUNCTION") {
 						public void runTest() throws Throwable {
-							testView(gmonFile, gd, view_samplesFunction_RefFile, view_samplesFunction_DumpFile, FunctionHistogramContentProvider.sharedInstance, false);
+							testView(gmonFile, gd, view_samplesFunction_RefFile,
+									view_samplesFunction_DumpFile,
+									FunctionHistogramContentProvider.sharedInstance, false);
 						}
 					}
 			);
 			ats.addTest(
 					new TestCase(testDir.getName() + ":CSV-FUNCTION-TIMED") {
 						public void runTest() throws Throwable {
-							testView(gmonFile, gd, view_samplesFunctionT_RefFile, view_samplesFunctionT_DumpFile, FunctionHistogramContentProvider.sharedInstance, true);
+							testView(gmonFile, gd, view_samplesFunctionT_RefFile,
+									view_samplesFunctionT_DumpFile,
+									FunctionHistogramContentProvider.sharedInstance, true);
 						}
 					}
 			);
 			ats.addTest(
 					new TestCase(testDir.getName() + ":CSV-FLAT") {
 						public void runTest() throws Throwable {
-							testView(gmonFile, gd, view_samplesFlat_RefFile, view_samplesFlat_DumpFile, FlatHistogramContentProvider.sharedInstance, false);
+							testView(gmonFile, gd, view_samplesFlat_RefFile,
+									view_samplesFlat_DumpFile,
+									FlatHistogramContentProvider.sharedInstance, false);
 						}
 					}
 			);
 			ats.addTest(
 					new TestCase(testDir.getName() + ":CSV-FLAT-TIMED") {
 						public void runTest() throws Throwable {
-							testView(gmonFile, gd, view_samplesFlatT_RefFile, view_samplesFlatT_DumpFile, FlatHistogramContentProvider.sharedInstance, true);
+							testView(gmonFile, gd, view_samplesFlatT_RefFile,
+									view_samplesFlatT_DumpFile,
+									FlatHistogramContentProvider.sharedInstance, true);
 						}
 					}
 			);
@@ -163,7 +210,9 @@
 			File refFile, File dumpFile,
 			ITreeContentProvider contentProvider, boolean timeMode) throws Exception {
 		GmonView view = GmonView.displayGprofView(gd, gmonFile.getAbsolutePath(), null);
-		SwitchContentProviderAction action = new SwitchContentProviderAction("testAction", "icons/ch_callees.png" /*to avoid error*/, view.getSTViewer().getViewer(), contentProvider);
+		SwitchContentProviderAction action = new SwitchContentProviderAction("testAction",
+				"icons/ch_callees.png" /*to avoid error*/, view.getSTViewer().getViewer(),
+				contentProvider);
 		action.run();
 		changeMode(view, timeMode);
 		STJunitUtils.testCSVExport(view, dumpFile.getAbsolutePath(), refFile.getAbsolutePath());
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/src/org/eclipse/linuxtools/gprof/test/STJunitUtils.java b/gprof/org.eclipse.linuxtools.gprof.test/src/org/eclipse/linuxtools/gprof/test/STJunitUtils.java
index 09d1d39..f5768fd 100644
--- a/gprof/org.eclipse.linuxtools.gprof.test/src/org/eclipse/linuxtools/gprof/test/STJunitUtils.java
+++ b/gprof/org.eclipse.linuxtools.gprof.test/src/org/eclipse/linuxtools/gprof/test/STJunitUtils.java
@@ -49,7 +49,7 @@
 		STDataViewersCSVExporter exporter = new STDataViewersCSVExporter(view.getSTViewer());
 		exporter.exportTo(dumpFullFileName, new NullProgressMonitor());
 		// compare with ref
-		compareIgnoreEOL(dumpFullFileName, refFullFileName, true);
+		compareCSVIgnoreEOL(dumpFullFileName, refFullFileName, true);
 	}
 	
 	/**
@@ -73,7 +73,7 @@
 			else {
 				System.out.println(message +  "... successful");
 			}
-			// delete dump only for sucessful tests
+			// delete dump only for successful tests
 			if (equals && deleteDumpFileIfOk)  
 				new File(dumpFile).delete();
 		}catch (FileNotFoundException _) {
@@ -98,13 +98,13 @@
 	public static boolean compareIgnoreEOL(String dumpFile, String refFile, boolean deleteDumpFileIfOk) {
 		String message = "Comparing ref file ("+refFile+ ")and dump file (" + 
 		  dumpFile+")";
-		boolean equals = false;
+		boolean equals = false;		
 		try {
 		LineNumberReader is1 = new LineNumberReader(new FileReader(dumpFile));
 		LineNumberReader is2 = new LineNumberReader(new FileReader(refFile));
 			do {
 				String line1 = is1.readLine();
-				String line2 = is2.readLine();
+				String line2 = is2.readLine();				
 				if (line1 == null) {
 					if (line2 == null) {
 						equals = true;
@@ -112,16 +112,76 @@
 					break;
 				} else if (line2 == null || !line1.equals(line2)) {
 					break;
-				}
+				}				
 			} while (true);
-
+			
+			if (!equals) {
+ 				junit.framework.Assert.assertEquals(message + ": not correspond ", true, false);
+			}
+			
+			is1.close();
+			is2.close();
+			// delete dump only for successful tests
+			if (equals && deleteDumpFileIfOk) {
+				new File(dumpFile).delete();
+			}
+		}catch (FileNotFoundException _) {
+			message += "... FAILED: One of these files may not exist";
+			junit.framework.Assert.assertNull(message, _);
+		}
+		catch (Exception _) {
+			message += ": exception raised ... FAILED";
+			junit.framework.Assert.assertNull(message, _);
+		}
+		return equals;
+	}
+	
+	/**
+	 * Utility method to compare exported CSV files
+	 * @param dumpFile
+	 * @param refFile
+	 * @return
+	 */
+	public static boolean compareCSVIgnoreEOL(String dumpFile, String refFile, boolean deleteDumpFileIfOk) {
+		String message = "Comparing ref file ("+refFile+ ")and dump file (" + 
+		  dumpFile+")";
+		boolean equals = false;
+		String str = "[in-charge]"; // this string can be dumped according to binutils version installed on local machine
+		
+		try {
+		LineNumberReader is1 = new LineNumberReader(new FileReader(dumpFile));
+		LineNumberReader is2 = new LineNumberReader(new FileReader(refFile));
+			do {
+				String line1 = is1.readLine();
+				String line2 = is2.readLine();
+				int length = str.length();				
+				if (line1 == null) {
+					if (line2 == null) {
+						equals = true;
+					}
+					break;
+				} else if (line1.contains(str)){
+					int idx = line1.indexOf("[in-charge]");
+					char c = line1.charAt(idx -1);
+					if (c == ' ' ){
+						idx--;
+						length++;
+					}
+					line1 = line1.substring(0, idx) + line1.substring(idx+length, line1.length());
+					if (!line1.equals(line2))
+						break;
+				} else if (line2 == null || !line1.equals(line2)) {
+					break;
+				} 				
+			} while (true);
+			
 			if (!equals) {
  				junit.framework.Assert.assertEquals(message + ": not correspond ", true, false);
 			}
 
 			is1.close();
 			is2.close();
-			// delete dump only for sucessful tests
+			// delete dump only for successful tests
 			if (equals && deleteDumpFileIfOk) {
 				new File(dumpFile).delete();
 			}
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/test.xml b/gprof/org.eclipse.linuxtools.gprof.test/test.xml
new file mode 100755
index 0000000..d8000bd
--- /dev/null
+++ b/gprof/org.eclipse.linuxtools.gprof.test/test.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>

+

+<project name="testsuite" default="run" basedir=".">

+	<property name="classname" value="org.eclipse.linuxtools.gprof.test.AllGprofTests" />

+	<property name="plugin-name" value="org.eclipse.linuxtools.gprof.test" />

+

+	<!-- The property ${eclipse-home} should be passed into this script -->

+	<!-- Set a meaningful default value for when it is not. -->

+	<property name="eclipse-home" value="${basedir}/../../" />

+

+	<property name="library-file" value="${eclipse-home}/dropins/${subProjectName2}/plugins/org.eclipse.test/library.xml" />

+

+	<!-- This target holds all initialization code that needs to be done for -->

+	<!-- all tests that are to be run. Initialization for individual tests -->

+	<!-- should be done within the body of the suite target. -->

+	<target name="init">

+		<tstamp />

+		<delete>

+			<fileset dir="${eclipse-home}" includes="org*.xml" />

+		</delete>

+	</target>

+

+	<!-- This target defines the tests that need to be run. -->

+	<target name="gprof_suite">

+		<property name="gprof-folder" value="${eclipse-home}/gprof_folder" />

+		<delete dir="${gprof-folder}" quiet="true" />

+		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">

+			<property name="data-dir" value="${gprof-folder}" />

+			<property name="plugin-name" value="${plugin-name}" />

+			<property name="classname" value="${classname}" />

+		</ant>

+	</target>

+

+	<!-- This target holds code to cleanup the testing environment after  -->

+	<!-- all of the tests have been run. You can use this target to -->

+	<!-- delete temporary files that have been created. -->

+	<target name="cleanup">

+		<mkdir dir="${results}/consolelogs" />

+		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />

+	</target>

+

+	<!-- This target runs the test suite. Any actions that need to happen -->

+	<!-- after all the tests have been run should go here. -->

+	<target name="run" depends="init,gprof_suite,cleanup">

+		<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">

+			<property name="includes" value="org*.xml" />

+			<property name="output-file" value="${plugin-name}.xml" />

+		</ant>

+	</target>

+

+    <target name="all" depends="run" description="Dummy target to run all tests">

+    </target>

+

+</project>

diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover-feature/.project b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover-feature/.project
new file mode 100644
index 0000000..4150d20
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover-feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.cdt.libhover.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover-feature/ChangeLog b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover-feature/ChangeLog
new file mode 100644
index 0000000..295d745
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover-feature/ChangeLog
@@ -0,0 +1,57 @@
+2010-02-08  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.properties: Capitalize "library" in featureName.
+
+2009-11-10  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.properties: Make featureName a bit more user-friendly.
+
+2009-08-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Remove newlib as included feature.
+
+2009-08-05  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Rename to org.eclipse.linuxtools.cdt.libhover.
+
+2009-05-19  Andrew Overholt  <overholt@redhat.com>
+
+	Bug #273931
+
+	* feature.properties: Change provider from Eclipse.org to Eclipse.
+
+2009-05-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Bump up to 0.2.0.  Add libhover newlib feature as
+	optional included feature.  Add libhover libstdcxx plugin.
+	
+2009-01-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Bump up to 0.1.1.
+
+2009-01-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Add .qualifier to version id.
+
+2009-01-06  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: 1.0.0 -> 0.1.0.  Add update site information.
+	* build.properties: Add feature.properties and epl-v10.html.
+
+2008-10-31  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Use feature.properties.  Add "(Incubation)".
+	* feature.properties: Initial checkin.
+	* epl-v10.html: Likewise.
+
+2008-10-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Add org.eclipse.linuxtools.cdt.libhover.library_docs plugin.
+	Also change org.eclipse.linuxtools.cdt.libhover.glibc reference to be plugin
+	instead of fragment.
+
+2008-10-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Initial check-in.
+	* about.html: Ditto.
+	* build.properties: Ditto.
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover-feature/about.html b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover-feature/about.html
new file mode 100644
index 0000000..44e2290
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover-feature/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

+<html>

+<head>

+<title>About</title>

+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>8th September, 2004</p>	

+<h3>License</h3>

+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<h3>Contributions</h3>

+

+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise

+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such

+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or

+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the

+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available

+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also

+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+</body>

+</html>
\ No newline at end of file
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover-feature/build.properties b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover-feature/build.properties
new file mode 100644
index 0000000..65a4460
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover-feature/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+               about.html,\
+               feature.properties,\
+               epl-v10.html
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover-feature/epl-v10.html b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover-feature/epl-v10.html
new file mode 100644
index 0000000..9320c9f
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover-feature/epl-v10.html
@@ -0,0 +1,320 @@
+<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
+
+
+<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
+<meta name="ProgId" content="Word.Document">
+<meta name="Generator" content="Microsoft Word 9">
+<meta name="Originator" content="Microsoft Word 9">
+<link rel="File-List" href="http://www.eclipse.org/legal/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
+<title>Eclipse Public License - Version 1.0</title>
+<!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+  <o:Revision>2</o:Revision>
+  <o:TotalTime>3</o:TotalTime>
+  <o:Created>2004-03-05T23:03:00Z</o:Created>
+  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
+  <o:Pages>4</o:Pages>
+  <o:Words>1626</o:Words>
+  <o:Characters>9270</o:Characters>
+   <o:Lines>77</o:Lines>
+  <o:Paragraphs>18</o:Paragraphs>
+  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
+  <o:Version>9.4402</o:Version>
+ </o:DocumentProperties>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <w:WordDocument>
+  <w:TrackRevisions/>
+ </w:WordDocument>
+</xml><![endif]-->
+<style>
+<!--
+ /* Font Definitions */
+@font-face
+	{font-family:Tahoma;
+	panose-1:2 11 6 4 3 5 4 4 2 4;
+	mso-font-charset:0;
+	mso-generic-font-family:swiss;
+	mso-font-pitch:variable;
+	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
+ /* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{mso-style-parent:"";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p
+	{margin-right:0in;
+	mso-margin-top-alt:auto;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p.BalloonText, li.BalloonText, div.BalloonText
+	{mso-style-name:"Balloon Text";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:8.0pt;
+	font-family:Tahoma;
+	mso-fareast-font-family:"Times New Roman";}
+@page Section1
+	{size:8.5in 11.0in;
+	margin:1.0in 1.25in 1.0in 1.25in;
+	mso-header-margin:.5in;
+	mso-footer-margin:.5in;
+	mso-paper-source:0;}
+div.Section1
+	{page:Section1;}
+-->
+</style>
+</head><body style="" lang="EN-US">
+
+<div class="Section1">
+
+<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
+</p>
+
+<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
+THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
+REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+OF THIS AGREEMENT.</span> </p>
+
+<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
+
+<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
+in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and<br clear="left">
+b) in the case of each subsequent Contributor:</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
+changes to the Program, and</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
+additions to the Program;</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
+such changes and/or additions to the Program originate from and are distributed
+by that particular Contributor. A Contribution 'originates' from a Contributor
+if it was added to the Program by such Contributor itself or anyone acting on
+such Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in conjunction
+with the Program under their own license agreement, and (ii) are not derivative
+works of the Program. </span></p>
+
+<p><span style="font-size: 10pt;">"Contributor" means any person or
+entity that distributes the Program.</span> </p>
+
+<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
+claims licensable by a Contributor which are necessarily infringed by the use
+or sale of its Contribution alone or when combined with the Program. </span></p>
+
+<p><span style="font-size: 10pt;">"Program" means the Contributions
+distributed in accordance with this Agreement.</span> </p>
+
+<p><span style="font-size: 10pt;">"Recipient" means anyone who
+receives the Program under this Agreement, including all Contributors.</span> </p>
+
+<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
+Subject to the terms of this Agreement, each Contributor hereby grants Recipient
+a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
+display, publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and object code
+form.</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
+Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
+patent license under Licensed Patents to make, use, sell, offer to sell, import
+and otherwise transfer the Contribution of such Contributor, if any, in source
+code and object code form. This patent license shall apply to the combination
+of the Contribution and the Program if, at the time the Contribution is added
+by the Contributor, such addition of the Contribution causes such combination
+to be covered by the Licensed Patents. The patent license shall not apply to
+any other combinations which include the Contribution. No hardware per se is
+licensed hereunder. </span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
+Recipient understands that although each Contributor grants the licenses to its
+Contributions set forth herein, no assurances are provided by any Contributor
+that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient
+for claims brought by any other entity based on infringement of intellectual
+property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility
+to secure any other intellectual property rights needed, if any. For example,
+if a third party patent license is required to allow Recipient to distribute
+the Program, it is Recipient's responsibility to acquire that license before
+distributing the Program.</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
+Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement. </span></p>
+
+<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
+
+<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
+Program in object code form under its own license agreement, provided that:</span>
+</p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
+it complies with the terms and conditions of this Agreement; and</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
+its license agreement:</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
+effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; </span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
+effectively excludes on behalf of all Contributors all liability for damages,
+including direct, indirect, special, incidental and consequential damages, such
+as lost profits; </span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
+states that any provisions which differ from this Agreement are offered by that
+Contributor alone and not by any other party; and</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
+states that source code for the Program is available from such Contributor, and
+informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
+
+<p><span style="font-size: 10pt;">When the Program is made available in source
+code form:</span> </p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
+it must be made available under this Agreement; and </span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
+copy of this Agreement must be included with each copy of the Program. </span></p>
+
+<p><span style="font-size: 10pt;">Contributors may not remove or alter any
+copyright notices contained within the Program. </span></p>
+
+<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
+originator of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution. </span></p>
+
+<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
+
+<p><span style="font-size: 10pt;">Commercial distributors of software may
+accept certain responsibilities with respect to end users, business partners
+and the like. While this license is intended to facilitate the commercial use
+of the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes the
+Program in a commercial product offering, such Contributor ("Commercial
+Contributor") hereby agrees to defend and indemnify every other
+Contributor ("Indemnified Contributor") against any losses, damages and
+costs (collectively "Losses") arising from claims, lawsuits and other
+legal actions brought by a third party against the Indemnified Contributor to
+the extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may participate
+in any such claim at its own expense.</span> </p>
+
+<p><span style="font-size: 10pt;">For example, a Contributor might include the
+Program in a commercial product offering, Product X. That Contributor is then a
+Commercial Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance claims and
+warranties are such Commercial Contributor's responsibility alone. Under this
+section, the Commercial Contributor would have to defend claims against the
+other Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.</span> </p>
+
+<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
+
+<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and distributing the
+Program and assumes all risks associated with its exercise of rights under this
+Agreement , including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs or
+equipment, and unavailability or interruption of operations. </span></p>
+
+<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
+
+<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
+THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
+
+<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
+
+<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
+or unenforceable under applicable law, it shall not affect the validity or
+enforceability of the remainder of the terms of this Agreement, and without
+further action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.</span> </p>
+
+<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
+against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with
+other software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the date
+such litigation is filed. </span></p>
+
+<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
+shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable
+period of time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive. </span></p>
+
+<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
+copies of this Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The Agreement
+Steward reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement Steward has
+the right to modify this Agreement. The Eclipse Foundation is the initial
+Agreement Steward. The Eclipse Foundation may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.</span> </p>
+
+<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
+State of New York and the intellectual property laws of the United States of
+America. No party to this Agreement will bring a legal action under this
+Agreement more than one year after the cause of action arose. Each party waives
+its rights to a jury trial in any resulting litigation.</span> </p>
+
+<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
+
+</div>
+
+</body></html>
\ No newline at end of file
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover-feature/feature.properties b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover-feature/feature.properties
new file mode 100644
index 0000000..98ce13d
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover-feature/feature.properties
@@ -0,0 +1,112 @@
+#################################################################################
+#  Copyright (c) 2008 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+featureName=C/C++ Library API Documentation Hover Help (Incubation)
+description=Plugins for C/C++ library hover help.
+provider=Eclipse
+copyright=Copyright 2008 Red Hat, Inc.
+licenseURL=epl-v10.html
+license=\
+ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
+March 17, 2005\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse.org CVS\n\
+repository ("Repository") in CVS modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+Features may also include other Features ("Included Features"). Files named\n\
+"feature.xml" may contain a list of the names and version numbers of\n\
+Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+   - The top-level (root) directory\n\
+   - Plug-in and Fragment directories\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
+   - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Eclipse Update Manager, you must agree to a license ("Feature Update\n\
+License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties". Such Abouts,\n\
+Feature Licenses and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
+    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
\ No newline at end of file
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover-feature/feature.xml b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover-feature/feature.xml
new file mode 100644
index 0000000..42e614f
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover-feature/feature.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.linuxtools.cdt.libhover"
+      label="%featureName"
+      version="0.2.0.qualifier"
+      provider-name="%provider">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="epl-v10.php">
+      %license
+   </license>
+
+   <url>
+      <update label="Linux Tools Update Site" url="http://download.eclipse.org/technology/linuxtools/update"/>
+   </url>
+
+   <requires>
+      <import plugin="org.eclipse.ui" version="3.4.0" match="compatible"/>
+      <import plugin="org.eclipse.core.runtime" version="3.4.0" match="compatible"/>
+      <import plugin="org.eclipse.core.resources" version="3.4.0" match="compatible"/>
+      <import plugin="org.eclipse.help" version="3.3.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.cdt.ui" version="5.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.filesystem" version="1.2.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.linuxtools.cdt.libhover"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.cdt.libhover.library_docs"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.cdt.libhover.glibc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.cdt.libhover.libstdcxx"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.glibc/.project b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.glibc/.project
new file mode 100644
index 0000000..b2adfe6
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.glibc/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.cdt.libhover.glibc</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.glibc/ChangeLog b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.glibc/ChangeLog
new file mode 100644
index 0000000..7201d35
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.glibc/ChangeLog
@@ -0,0 +1,42 @@
+2009-08-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #285867
+	* plugin.properties: Change Provider to Eclipse instead of Eclipse.org.
+
+2009-02-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump up version to 1.0.1.
+	* plugin.xml: Change to use new libhover library interface which requires
+	the location of a serialized LibHoverInfo instance rather than an xml document.
+
+2009-01-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add .qualifier to version.
+
+2008-11-03  Andrew Overholt  <overholt@redhat.com>
+
+	* build.properties: Add plugin.properties.
+
+2008-10-31  Andrew Overholt  <overholt@redhat.com>
+
+	* plugin.properties: Initial checkin.
+	* META-INF/MANIFEST.MF: Use plugin.properties.  Add "(Incubation)".
+
+2008-10-22  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Modify library name which shows up in the Project properties C/C++ General
+	Documentation page.
+
+2008-10-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* build.properties: Add toc.xml to binary build files.
+
+2008-10-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* fragment.xml: Removed.
+	* plugin.xml: New file.
+	* build.properties: Specify about.html in src build.
+	* META-INF/MANIFEST.MF: Require org.eclipse.linuxtools.cdt.libhover.library-docs
+	instead of org.eclipse.linuxtools.cdt.autotools-docs.
+	* toc.xml: Change to use moreclibdocs anchor instead of moregnutools
+	anchor which is in autotools-docs.
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.glibc/META-INF/MANIFEST.MF b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.glibc/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..29e9546
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.glibc/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.cdt.libhover.glibc;singleton:=true
+Bundle-Version: 1.0.1.qualifier
+Bundle-Vendor: %provider
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.linuxtools.cdt.libhover.library_docs;bundle-version="1.0.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.glibc/about.html b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.glibc/about.html
new file mode 100644
index 0000000..44e2290
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.glibc/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

+<html>

+<head>

+<title>About</title>

+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>8th September, 2004</p>	

+<h3>License</h3>

+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<h3>Contributions</h3>

+

+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise

+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such

+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or

+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the

+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available

+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also

+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+</body>

+</html>
\ No newline at end of file
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.glibc/build.properties b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.glibc/build.properties
new file mode 100644
index 0000000..2220fab
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.glibc/build.properties
@@ -0,0 +1,5 @@
+bin.includes = META-INF/,\
+               plugin.xml,\
+               toc.xml,\
+               plugin.properties
+src.includes = about.html
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.glibc/plugin.properties b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.glibc/plugin.properties
new file mode 100644
index 0000000..85eadef
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.glibc/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+#  Copyright (c) 2008 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+bundleName=Glibc Libhover (Incubation)
+provider=Eclipse
\ No newline at end of file
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml
new file mode 100644
index 0000000..4556b44
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+   <extension
+         id="library"
+         name="Glibc C Library"
+         point="org.eclipse.linuxtools.cdt.libhover.library">
+      <library
+            docs="http://www.gnu.org/software/libc/manual/html_node/index.html"
+            location="http://www.sourceware.org/eclipse/libhover/glibc-2.7-2.libhover"
+            name="glibc library"
+            type="C">
+      </library>
+   </extension>
+   <extension
+         point="org.eclipse.help.toc">
+      <toc
+            file="toc.xml"
+            primary="false">
+      </toc>
+   </extension>
+
+</plugin>
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.glibc/toc.xml b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.glibc/toc.xml
new file mode 100644
index 0000000..8ef4df1
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.glibc/toc.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="glibc library" link_to="../org.eclipse.linuxtools.cdt.libhover.library_docs/toc.xml#moreclibdocs">
+	<topic href="http://www.gnu.org/software/libc/manual/html_node/index.html" label="glibc">
+ </topic>
+</toc>
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.library-docs/.project b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.library-docs/.project
new file mode 100644
index 0000000..c02f456
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.library-docs/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.cdt.libhover.library-docs</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.library-docs/ChangeLog b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.library-docs/ChangeLog
new file mode 100644
index 0000000..48cf6c8
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.library-docs/ChangeLog
@@ -0,0 +1,29 @@
+2009-08-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #285867
+	* plugin.properties: Change Provider to Eclipse instead of Eclipse.org.
+
+2009-01-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add .qualifier to version and bump to 1.0.1.
+
+2008-11-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* build.properties: Remove doc.zip.
+	* doc.zip: Removed.
+
+2008-11-03  Andrew Overholt  <overholt@redhat.com>
+
+	* build.properties: Add plugin.properties.
+
+2008-10-31  Andrew Overholt  <overholt@redhat.com>
+
+	* plugin.properties: Initial import.
+	* META-INF/MANIFEST.MF: Use plugin.propeties.  Add "(Incubation)".
+
+2008-10-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* toc.xml: Initial release.
+	* doc.zip: Ditto.
+	* plugin.xml: Ditto.
+	* about.html: Ditto.
\ No newline at end of file
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.library-docs/META-INF/MANIFEST.MF b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.library-docs/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..f5fd146
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.library-docs/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.cdt.libhover.library_docs;singleton:=true
+Bundle-Version: 1.0.1.qualifier
+Bundle-Vendor: %provider
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.help
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.library-docs/about.html b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.library-docs/about.html
new file mode 100644
index 0000000..44e2290
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.library-docs/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

+<html>

+<head>

+<title>About</title>

+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>8th September, 2004</p>	

+<h3>License</h3>

+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<h3>Contributions</h3>

+

+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise

+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such

+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or

+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the

+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available

+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also

+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+</body>

+</html>
\ No newline at end of file
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.library-docs/build.properties b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.library-docs/build.properties
new file mode 100644
index 0000000..1d9ab88
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.library-docs/build.properties
@@ -0,0 +1,4 @@
+bin.includes = META-INF/,\
+               plugin.xml,\
+               toc.xml,\
+               plugin.properties
\ No newline at end of file
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.library-docs/plugin.properties b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.library-docs/plugin.properties
new file mode 100644
index 0000000..fd1b561
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.library-docs/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+#  Copyright (c) 2008 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+bundleName=Libhover C/C++ Library Documentation Plug-in (Incubation)
+provider=Eclipse
\ No newline at end of file
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.library-docs/plugin.xml b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.library-docs/plugin.xml
new file mode 100644
index 0000000..08f7ceb
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.library-docs/plugin.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+   <extension
+         point="org.eclipse.help.toc">
+      <toc
+            file="toc.xml"
+            primary="true"/>
+   </extension>
+
+</plugin>
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.library-docs/toc.xml b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.library-docs/toc.xml
new file mode 100644
index 0000000..de69a8a
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.library-docs/toc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="C/C++ Library Documentation">
+ <anchor id="moreclibdocs"/>
+</toc>
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/.classpath b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/.classpath
new file mode 100644
index 0000000..ad32c83
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/.project b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/.project
new file mode 100644
index 0000000..134e131
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.cdt.libhover.libstdcxx</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/.settings/org.eclipse.jdt.core.prefs b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..15fdc96
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Fri Jan 30 16:39:40 EST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/ChangeLog b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/ChangeLog
new file mode 100644
index 0000000..ae928bb
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/ChangeLog
@@ -0,0 +1,33 @@
+2009-08-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #285867
+	* plugin.properties: Change Provider to Eclipse instead of Eclipse.org.
+
+2009-08-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.properties: New file to fill in bundlename and provider.
+
+2009-05-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/libhover/libstdcxx/DoxygenCPPInfo.java (getParameters):
+	New method. 
+	(getReturn): Ditto. 
+	(buildDoxygenCPPInfo): Add code to get detailed description and break this up into
+	parameters and return value.  For return type, use refid to find a referenced class. 
+	(getElementText): Fix to be recursive.
+
+2009-02-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* .project: New file.
+	* toc.xml: Add missing toc file referenced by plugin. 
+
+2009-02-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Initial creation.
+	* plugin.properties: Ditto.
+	* toc.xml: Ditto.
+	* build.properties: Ditto.
+	* META-INF/MANIFEST.MF: Ditto.
+	* about.html: Ditto.
+	* src/org/eclipse/linuxtools/cdt/libhover/libstdcxx/DoxygenCPPInfo.java: New file
+	for creating serialized LibHover info from libstdc++ Doxygen xml documentation.
\ No newline at end of file
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/META-INF/MANIFEST.MF b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..111bb39
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.cdt.libhover.libstdcxx;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: %provider
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.linuxtools.cdt.libhover.library_docs;bundle-version="1.0.0",
+ org.eclipse.linuxtools.cdt.libhover;bundle-version="1.0.1",
+ org.eclipse.core.filesystem;bundle-version="1.2.0",
+ org.eclipse.core.runtime;bundle-version="3.4.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/about.html b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/about.html
new file mode 100644
index 0000000..44e2290
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

+<html>

+<head>

+<title>About</title>

+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>8th September, 2004</p>	

+<h3>License</h3>

+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<h3>Contributions</h3>

+

+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise

+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such

+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or

+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the

+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available

+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also

+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+</body>

+</html>
\ No newline at end of file
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties
new file mode 100644
index 0000000..b26ffbe
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties
@@ -0,0 +1,6 @@
+bin.includes = META-INF/,\
+               plugin.xml,\
+               toc.xml,\
+               plugin.properties
+src.includes = about.html,\
+               src/
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.properties b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.properties
new file mode 100644
index 0000000..337bfac
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+#  Copyright (c) 2009 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+bundleName=Libstdc++ Libhover (Incubation)
+provider=Eclipse
\ No newline at end of file
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml
new file mode 100644
index 0000000..f81634e
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+   <extension
+         id="library"
+         name="Libstdc++ Library"
+         point="org.eclipse.linuxtools.cdt.libhover.library">
+      <library
+            docs="http://gcc.gnu.org/onlinedocs/libstdc++/manual/spine.html"
+            location="http://www.sourceware.org/eclipse/libhover/libstdc++-v3.libhover"
+            name="libstdc++ library"
+            type="C++">
+      </library>
+   </extension>
+   <extension
+         point="org.eclipse.help.toc">
+      <toc
+            file="toc.xml"
+            primary="false">
+      </toc>
+   </extension>
+
+</plugin>
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/src/org/eclipse/linuxtools/cdt/libhover/libstdcxx/DoxygenCPPInfo.java b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/src/org/eclipse/linuxtools/cdt/libhover/libstdcxx/DoxygenCPPInfo.java
new file mode 100644
index 0000000..bb139e8
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/src/org/eclipse/linuxtools/cdt/libhover/libstdcxx/DoxygenCPPInfo.java
@@ -0,0 +1,537 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.libhover.libstdcxx;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectOutputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.eclipse.core.filesystem.URIUtil;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.linuxtools.cdt.libhover.LibHoverInfo;
+import org.eclipse.linuxtools.cdt.libhover.ClassInfo;
+import org.eclipse.linuxtools.cdt.libhover.MemberInfo;
+import org.eclipse.linuxtools.cdt.libhover.TypedefInfo;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+
+public class DoxygenCPPInfo {
+	
+	private Document document;
+	private LibHoverInfo cppInfo = new LibHoverInfo();
+	private HashMap<String, ClassInfo> classesById = new HashMap<String, ClassInfo>();
+	
+	public DoxygenCPPInfo(Document document) {
+		this.document = document;
+	}
+
+	public Document getDocument() {
+		return document;
+	}
+	
+	private String[] getTypedefTypes(String def) {
+		String[] result = null;
+		if (def.startsWith("typedef ")) { // $NON-NLS-1$
+			int startIndex = 8;
+			int count = 0;
+			int i = def.length() - 1;
+			// To break up types, we look for first blank outside of a template, working backwards.
+			// We need to work backwards because the transformed type may contain actual numeric parameters
+			// which could use the shift operators and we won't know whether they are shift operators or
+			// template specifiers without some actual parsing.
+			while (i >= 0) {
+				char ch = def.charAt(i);
+				if (ch == '<') {
+					--count;
+				}
+				else if (ch == '>') {
+					++count;
+				}
+				// We look at last blank not in a template as being the delimeter between
+				// type name and definition.
+				if (count == 0 && ch == ' ') {
+					startIndex = i + 1;
+					break;
+				}
+				--i;
+			}
+			result = new String[2];
+			result[1] = def.substring(startIndex);
+			// Following is a bit of a hack knowing the docs don't add the namespace when the transformed
+			// type is in the same space
+			int namespace = result[1].indexOf("::"); // $NON-NLS-1$
+			if (namespace < 0)
+				result[0] = def.substring(8, startIndex).trim();
+			else
+				result[0] = result[1].substring(0, namespace) + "::" + def.substring(8, startIndex).trim(); // $NON-NLS-1$
+		}
+		return result;
+	}
+	
+	private String getElementText(Node node) {
+		StringBuffer d = new StringBuffer();
+		NodeList nl = node.getChildNodes();
+		for (int x = 0; x < nl.getLength(); ++x) {
+			Node text = nl.item(x);
+			if (text.getNodeType() == Node.TEXT_NODE)
+				d.append(text.getNodeValue());
+			else
+				d.append(getElementText(text));
+		}
+		return d.toString();
+	}
+
+	public ClassInfo getClassInfo(String className) {
+		String typedefName = className.replaceAll("<.*>", "<>"); // $NON-NLS-1$ // $NON-NLS-2$
+		TypedefInfo typedef = cppInfo.typedefs.get(typedefName);
+		if (typedef != null) {
+			className = typedef.getTransformedType(className);  // Reset class name to typedef transformation
+		}
+		int index = className.indexOf('<');
+		// Check if it is a template reference.
+		if (index != -1) {
+			// It is.  We want to see if there are partial specific templates
+			// and we choose the first match.  If nothing matches our particular
+			// case, we fall back on the initial generic template.
+			ClassInfo info = cppInfo.classes.get(className.substring(0, index));
+			if (info == null)
+				return null;
+			ArrayList<ClassInfo> children = info.getChildren();
+			if (children != null && children.size() > 0) {
+				for (int x = 0; x < children.size(); ++x) {
+					ClassInfo child = children.get(x);
+					if (className.matches(child.getClassName())) {
+						info = child;
+						break;
+					}
+				}
+			}
+			return info;
+		}
+		// Otherwise no template, just fetch the class info directly.
+		return cppInfo.classes.get(className);
+	}
+	
+	public void buildDoxygenCPPInfo(String fileName) {
+		try {
+			// Create a hash table of all the class nodes mapped by class name.  Trim any template info
+			// for the class name key value.
+			NodeList nl = getDocument().getElementsByTagName("compounddef"); // $NON-NLS-1$
+			for (int i = 0; i < nl.getLength(); ++i) {
+				Node n = nl.item(i);
+				NamedNodeMap attrs = n.getAttributes();
+				Node kind = attrs.getNamedItem("kind"); // $NON-NLS-1$
+				Node id = attrs.getNamedItem("id"); // $NON-NLS-1$
+				Node prot = attrs.getNamedItem("prot"); // $NON-NLS-1$
+				// We are only interested in cataloging public classes.
+				if (id != null && prot != null && prot.getNodeValue().equals("public") // $NON-NLS-1$
+						&& kind != null && kind.getNodeValue().equals("class")) { // $NON-NLS-1$
+					NodeList nl2 = n.getChildNodes();
+					ClassInfo d = null;
+					String hashName = null;
+					for (int j = 0; j < nl2.getLength(); ++j) {
+						Node n2 = nl2.item(j);
+						String name2 = n2.getNodeName();
+						if (name2.equals("compoundname")) { // $NON-NLS-1$
+							String text = n2.getTextContent();
+							if (text != null && !text.equals("")) {
+								String className = text;
+								text = text.replaceAll("<\\s*", "<"); // $NON-NLS-1$ // $NON-NLS-2$
+								text = text.replaceAll("\\s*>", ">"); // $NON-NLS-1$ // $NON-NLS-2$
+								int index = text.indexOf('<');
+								hashName = text;
+								if (index > 0)
+									hashName = text.substring(0, index);
+								d = new ClassInfo(className, id.getNodeValue(), n);
+								classesById.put(id.getNodeValue(), d);
+								ClassInfo e = cppInfo.classes.get(hashName);
+								if (e != null) { /* We are dealing with a partial specific template...add it to list  */
+									if (!d.areTemplateParmsFilled())
+										d.setTemplateParms(getTemplateParms(n));
+									String[] templateParms = d.getTemplateParms();
+									// For each template parameter, replace with a generic regex so later we can compare
+									// and identify a match (e.g. A<_a, _b> and A<char, _b> are defined and we have an instance
+									// of A<char, int>.  We want to to match with A<char, _b> and replace all occurrences of "_b"
+									// with "int".  For speed, we assume that the template parameter is not a subset of any
+									// other variable (e.g. if _A is used, there is no __A or _AB).  If this proves untrue in
+									// any instance, more refinement of the initial value to replace will be required.
+									for (int k = 0; k < templateParms.length; ++k) {
+										text = text.replaceAll(templateParms[k], "[a-zA-Z0-9_: *]+"); // $NON-NLS-1$
+									}
+									d.setClassName(text);
+									e.addTemplate(d);
+								}
+								else
+									cppInfo.classes.put(hashName, d);
+							}
+						} else if (name2.equals("templateparamlist")) {
+							ArrayList<String> templates = new ArrayList<String>();
+							NodeList params = n2.getChildNodes();
+							int paramsLength = params.getLength();
+							for (int j2 = 0; j2 < paramsLength; ++j2) {
+								Node n3 = params.item(j2);
+								if (n3.getNodeName().equals("param")) {
+									NodeList types = n3.getChildNodes();
+									int typesLength = types.getLength();
+									for (int j3 = 0; j3 < typesLength; ++j3) {
+										Node n4 = types.item(j3);
+										if (n4.getNodeName().equals("declname")) {
+											templates.add(getElementText(n4));
+										}
+									}
+								}
+							}
+							String[] templateNames = new String[templates.size()];
+							d.setTemplateParms(templates.toArray(templateNames));
+						} else if (name2.equals("includes")) { // $NON-NLS-1$
+							String include = getElementText(n2);
+							if (d != null)
+								d.setInclude(include);
+						} else if (name2.equals("basecompoundref")) { // $NON-NLS-1$
+							// We have a base class.  If public, add it to the list of nodes to look at in case we don't find the member
+							// in the current class definition.
+							NamedNodeMap m = n2.getAttributes();
+							if (m != null) {
+								Node refid = m.getNamedItem("refid"); // $NON-NLS-1$
+								Node prot2 = m.getNamedItem("prot"); // $NON-NLS-1$
+								if (prot2 != null && prot2.getNodeValue().equals("public")) { // $NON-NLS-1$
+									ClassInfo baseClass = null;
+									if (refid != null) {
+										// If we have been given the id of the base class, fetch it directly
+										baseClass = classesById.get(refid.getNodeValue());
+									} else {
+										// We probably have a template that needs resolution
+										String baseClassName = n2.getTextContent();
+//										System.out.println("base class name is " + baseClassName);
+										baseClass = getClassInfo(baseClassName);
+									}
+									if (d != null && baseClass != null)
+										d.addBaseClass(baseClass);
+								}
+							}
+						} else if (name2.equals("sectiondef")) { // $NON-NLS-1$
+							// We are only interested in public member functions which are in their own section.
+							NamedNodeMap m = n2.getAttributes();
+							if (m != null) {
+								Node kind2 = m.getNamedItem("kind"); // $NON-NLS-1$
+								if (kind2 != null && kind2.getNodeValue().equals("public-func")) { // $NON-NLS-1$
+									NodeList pubfuncs = n2.getChildNodes();
+									int pubfuncLength = pubfuncs.getLength();
+									for (int j1 = 0; j1 < pubfuncLength; ++j1) {
+										Node n3 = pubfuncs.item(j1);
+										// Add all public member functions to the list of members
+										if (n3.getNodeName().equals("memberdef")) { // $NON-NLS-1$
+											NamedNodeMap m3 = n3.getAttributes();
+											if (m3 != null) {
+												Node m3Kind = m3.getNamedItem("kind"); // $NON-NLS-1$
+												if (m3Kind != null && m3Kind.getNodeValue().equals("function")) { // $NON-NLS-1$
+													String name = null;
+													String type = null;
+													String args = null;
+													String desc = null;
+													ArrayList<String> parms = new ArrayList<String>();
+													NodeList nl4 = n3.getChildNodes();
+													int memberLength = nl4.getLength();
+													for (int k = 0; k < memberLength; ++k) {
+														Node n4 = nl4.item(k);
+														String n4Name = n4.getNodeName();
+														if (n4Name.equals("type")) { // $NON-NLS-1$
+															NodeList nl5 = n4.getChildNodes();
+															type = new String(""); // $NON-NLS-1$
+															for (int x = 0; x < nl5.getLength(); ++x) {
+																Node n5 = nl5.item(x);
+																if (n5.getNodeType() == Node.TEXT_NODE)
+																	type += n5.getNodeValue();
+																else if (n5.getNodeName().equals("ref")) { // $NON-NLS-1$
+																	NamedNodeMap n5m = n5.getAttributes();
+																	Node n5id = n5m.getNamedItem("refid");
+																	if (n5id != null) {
+																		String refid = n5id.getNodeValue();
+																		ClassInfo refClass = classesById.get(refid);
+																		if (refClass != null)
+																			type += refClass.getClassName();
+																	}
+																}	
+															}
+														} else if (n4Name.equals("name")) { // $NON-NLS-1$
+															name = n4.getTextContent();
+														} else if (n4Name.equals("argsstring")) { // $NON-NLS-1$
+															args = getElementText(n4);
+														} else if (n4Name.equals("param")) { // $NON-NLS-1$
+															NodeList nl5 = n4.getChildNodes();
+															for (int x = 0; x < nl5.getLength(); ++x) {
+																Node n5 = nl5.item(x);
+																if (n5.getNodeName().equals("type")) { // $NON-NLS-1$
+																	parms.add(getElementText(n5));
+																}
+															}
+														} else if (n4Name.equals("briefdescription")) { // $NON-NLS-1$
+															NodeList nl5 = n4.getChildNodes();
+															for (int x = 0; x < nl5.getLength(); ++x) {
+																Node n5 = nl5.item(x);
+																if (n5.getNodeName().equals("para")) { // $NON-NLS-1$
+																	if (desc == null)
+																		desc = new String("");
+																	desc += "<p>" + getElementText(n5) + "</p>"; // $NON-NLS-1$ // $NON-NLS-2$
+																}	
+															}
+														} else if (n4Name.equals("detaileddescription")) { // $NON-NLS-1$
+															NodeList nl5 = n4.getChildNodes();
+															for (int x = 0; x < nl5.getLength(); ++x) {
+																Node n5 = nl5.item(x);
+																if (n5.getNodeName().equals("para")) { // $NON-NLS-1$
+																	if (desc == null)
+																		desc = new String(""); // $NON-NLS-1$
+																	NodeList nl6 = n5.getChildNodes();
+																	Node n6 = nl6.item(0);
+																	if (n6.getNodeType() == Node.TEXT_NODE)
+																		desc += "<p>" + getElementText(n5) + "</p>"; // $NON-NLS-1$ // $NON-NLS-2$
+																	else {
+																		for (int x2 = 0; x2 < nl6.getLength(); ++x2) {
+																			n6 = nl6.item(x2);
+																			if (n6.getNodeName().equals("parameterlist")) { // $NON-NLS-1$
+																				desc += getParameters(n6);
+																			} else if (n6.getNodeName().equals("simplesect")) { // $NON-NLS-1$
+																				desc += getReturn(n6);
+																			}
+																		}
+																	}
+																}	
+															}
+														} else if (n4Name.equals("location")) {
+															// Location is after all descriptions so we can now add the member
+															if (name != null) {
+																MemberInfo member = new MemberInfo(name);
+																member.setReturnType(type);
+																member.setPrototype(args);
+																member.setDescription(desc);
+																String[] argNames = new String[parms.size()];
+																member.setParamTypes(parms.toArray(argNames));
+																d.addMember(member);
+															}
+															break;
+														}
+													}
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			// Create a hash table of all the typedefs.  Keep any template info.
+			nl = getDocument().getElementsByTagName("memberdef"); // $NON-NLS-1$
+			for (int i = 0; i < nl.getLength(); ++i) {
+				Node n = nl.item(i);
+				NamedNodeMap attrs = n.getAttributes();
+				if (attrs != null) {
+					Node kind = attrs.getNamedItem("kind"); // $NON-NLS-1$
+					Node prot = attrs.getNamedItem("prot"); // $NON-NLS-1$
+					if (kind != null && kind.getNodeValue().equals("typedef") // $NON-NLS-1$
+							&& prot != null && prot.getNodeValue().equals("public")) { // $NON-NLS-1$
+						NodeList list = n.getChildNodes();
+						for (int x = 0; x < list.getLength(); ++x) {
+							Node n2 = list.item(x);
+							if (n2.getNodeName().equals("definition")) { // $NON-NLS-1$
+								String def = n2.getTextContent();
+								if (def != null && !def.equals("")) {
+									def = def.replaceAll("<\\s*", "<"); // $NON-NLS-1$ // $NON-NLS-2$
+									def = def.replaceAll("\\s*>", ">"); // $NON-NLS-1$ // $NON-NLS-2$
+									String[] types = getTypedefTypes(def);
+									TypedefInfo d = new TypedefInfo(types[1], types[0]);
+									String hashName = d.getTypedefName();
+									int index = hashName.indexOf('<');
+									if (index > 0) {
+										String className = hashName.substring(0, index);
+										hashName = hashName.replaceAll("<.*>", "<>"); // $NON-NLS-1$ // $NON-NLS-2$
+										ClassInfo e = cppInfo.classes.get(className);
+										if (e == null)
+											break;
+										ArrayList<ClassInfo> children = e.getChildren();
+										if (children != null && children.size() > 0) {
+											for (int y = 0; y < children.size(); ++y) {
+												ClassInfo child = children.get(y);
+												String childName = child.getClassName().replaceAll("\\*", "\\\\*"); // $NON-NLS-1$ // $NON-NLS-2$
+												childName = childName.replace("[]", "\\[\\]"); // $NON-NLS-1$ // $NON-NLS-2$
+												if (types[1].matches(childName.concat("::.*"))) { // $NON-NLS-1$
+													e = child;
+													break;
+												}
+											}
+										}
+										String[] templates = e.getTemplateParms();
+										d.copyTemplates(templates);
+
+										TypedefInfo f = cppInfo.typedefs.get(hashName);
+										if (f != null) {
+											String typedefName = d.getTypedefName();
+											for (int z = 0; z < templates.length; ++z) {
+												typedefName = typedefName.replaceAll(templates[z], "[a-zA-Z0-9_: ]+"); // $NON-NLS-1$
+											}
+											d.setTypedefName(typedefName);
+											f.addTypedef(d);
+										}
+										else
+											cppInfo.typedefs.put(hashName, d);
+										break;
+									} else {
+										// Otherwise we have a non-template typedef name.  Just add it to the list.
+										cppInfo.typedefs.put(hashName, d);
+										break;
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			// Now, output the LibHoverInfo for caching later
+			FileOutputStream f = new FileOutputStream(fileName);
+			ObjectOutputStream out = new ObjectOutputStream(f);
+			out.writeObject(cppInfo);
+			out.close();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+	
+	private String getParameters(Node n6) {
+		String desc = "<br><br><h3>Parameters:</h3>";
+		NodeList nl = n6.getChildNodes();
+		for (int x = 0; x < nl.getLength(); ++x) {
+			Node n = nl.item(x);
+			if (n.getNodeName().equals("parameteritem")) {
+				NodeList nl2 = n.getChildNodes();
+				for (int y = 0; y < nl2.getLength(); ++y) {
+					Node n2 = nl2.item(y);
+					if (n2.getNodeName().equals("parameternamelist")) {
+						NodeList nl3 = n2.getChildNodes();
+						for (int z = 0; z < nl3.getLength(); ++z) {
+							Node n3 = nl3.item(z);
+							if (n3.getNodeName().equals("parametername")) {
+								desc += getElementText(n3) + " - ";
+							}
+						}
+					} else if (n2.getNodeName().equals("parameterdescription")) {
+						desc += getElementText(n2) + "<br>";
+					}
+
+				}
+			}
+		}
+		return desc;
+	
+	}
+
+	private String getReturn(Node n6) {
+		String desc = "";
+		NamedNodeMap m = n6.getAttributes();
+		Node kind = m.getNamedItem("kind");
+		if (kind != null && kind.getNodeValue().equals("return")) {
+			desc += "<br><h3>Returns:</h3>" + getElementText(n6) + "<br>";
+		}
+		return desc;
+	}
+
+	public String[] getTemplateParms(Node classNode) {
+		Node n = null;
+		ArrayList<String> templateArray = new ArrayList<String>();
+		NodeList list = classNode.getChildNodes();
+		for (int i = 0; i < list.getLength(); ++i) {
+			n = list.item(i);
+			if (n.getNodeName().equals("templateparamlist")) { // $NON-NLS-1$
+				break;
+			}
+		}
+		if (n != null) {
+			NodeList templateList = n.getChildNodes();
+			for (int j = 0; j < templateList.getLength(); ++j) {
+				Node p = templateList.item(j);
+				if (p.getNodeName().equals("param")) { // $NON-NLS-1$
+					NodeList paramList = p.getChildNodes();
+					for (int k = 0; k < paramList.getLength(); ++k) {
+						Node q = paramList.item(k);
+						if (q.getNodeName().equals("declname")) { // $NON-NLS-1$
+							String templateName = q.getTextContent();
+							templateArray.add(templateName);
+						}
+					}
+				}
+			}
+		}
+		String[] templates = new String[templateArray.size()];
+		return templateArray.toArray(templates);
+	}
+
+	/**
+	 * Create LibHoverInfo serialized output
+	 * 
+	 * @param args (args[0] = location of Doxygen xml document to parse (file or URL),
+	 * 				args[1] = name of file to put serialized LibHoverInfo
+	 */
+	public static void main(String[] args) {
+		URI acDoc;
+		try {
+			acDoc = new URI(args[0]);
+			IPath p = URIUtil.toPath(acDoc);
+			InputStream docStream = null;
+			if (p == null) {
+				URL url = acDoc.toURL();
+				docStream = url.openStream();
+			} else {
+				docStream = new FileInputStream(p.toFile());
+			}
+			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+			factory.setValidating(false);
+			DocumentBuilder builder = factory.newDocumentBuilder();
+			Document doc = builder.parse(docStream);
+			if (doc != null) {
+				DoxygenCPPInfo d = new DoxygenCPPInfo(doc);
+				d.buildDoxygenCPPInfo(args[1]);
+			}
+			System.out.println("Built " + args[1] + " from " + args[0]);
+		} catch (URISyntaxException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (FileNotFoundException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (ParserConfigurationException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (SAXException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+}
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/toc.xml b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/toc.xml
new file mode 100644
index 0000000..e034d33
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx/toc.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="libstdc++ library" link_to="../org.eclipse.linuxtools.cdt.libhover.library_docs/toc.xml#moreclibdocs">
+	<topic href="http://gcc.gnu.org/onlinedocs/libstdc++/manual/spine.html" label="libstdc++">
+ </topic>
+</toc>
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib-feature/.project b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib-feature/.project
new file mode 100644
index 0000000..9773d04
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib-feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.cdt.libhover.newlib-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib-feature/ChangeLog b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib-feature/ChangeLog
new file mode 100644
index 0000000..f52d6c3
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib-feature/ChangeLog
@@ -0,0 +1,20 @@
+2009-08-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #285867
+	* feature.properties: Change provider to Eclipse instead of Eclipse.org.
+
+2009-08-05  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Add ".qualifier" to version.
+	
+2009-08-05  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Rename to org.eclipse.linuxtools.cdt.libhover.newlib.
+
+2009-05-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* about.html: Initial check-in.
+	* build.properties: Ditto.
+	* epl-v10.html:  Ditto.
+	* feature.properties:  Ditto.
+	* feature.xml: Ditto.
\ No newline at end of file
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib-feature/about.html b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib-feature/about.html
new file mode 100644
index 0000000..44e2290
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib-feature/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

+<html>

+<head>

+<title>About</title>

+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>8th September, 2004</p>	

+<h3>License</h3>

+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<h3>Contributions</h3>

+

+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise

+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such

+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or

+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the

+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available

+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also

+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+</body>

+</html>
\ No newline at end of file
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib-feature/build.properties b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib-feature/build.properties
new file mode 100644
index 0000000..d361ddb
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib-feature/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+               about.html,\
+               epl-v10.html,\
+               feature.properties
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib-feature/epl-v10.html b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib-feature/epl-v10.html
new file mode 100644
index 0000000..9320c9f
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib-feature/epl-v10.html
@@ -0,0 +1,320 @@
+<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
+
+
+<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
+<meta name="ProgId" content="Word.Document">
+<meta name="Generator" content="Microsoft Word 9">
+<meta name="Originator" content="Microsoft Word 9">
+<link rel="File-List" href="http://www.eclipse.org/legal/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
+<title>Eclipse Public License - Version 1.0</title>
+<!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+  <o:Revision>2</o:Revision>
+  <o:TotalTime>3</o:TotalTime>
+  <o:Created>2004-03-05T23:03:00Z</o:Created>
+  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
+  <o:Pages>4</o:Pages>
+  <o:Words>1626</o:Words>
+  <o:Characters>9270</o:Characters>
+   <o:Lines>77</o:Lines>
+  <o:Paragraphs>18</o:Paragraphs>
+  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
+  <o:Version>9.4402</o:Version>
+ </o:DocumentProperties>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <w:WordDocument>
+  <w:TrackRevisions/>
+ </w:WordDocument>
+</xml><![endif]-->
+<style>
+<!--
+ /* Font Definitions */
+@font-face
+	{font-family:Tahoma;
+	panose-1:2 11 6 4 3 5 4 4 2 4;
+	mso-font-charset:0;
+	mso-generic-font-family:swiss;
+	mso-font-pitch:variable;
+	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
+ /* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{mso-style-parent:"";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p
+	{margin-right:0in;
+	mso-margin-top-alt:auto;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p.BalloonText, li.BalloonText, div.BalloonText
+	{mso-style-name:"Balloon Text";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:8.0pt;
+	font-family:Tahoma;
+	mso-fareast-font-family:"Times New Roman";}
+@page Section1
+	{size:8.5in 11.0in;
+	margin:1.0in 1.25in 1.0in 1.25in;
+	mso-header-margin:.5in;
+	mso-footer-margin:.5in;
+	mso-paper-source:0;}
+div.Section1
+	{page:Section1;}
+-->
+</style>
+</head><body style="" lang="EN-US">
+
+<div class="Section1">
+
+<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
+</p>
+
+<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
+THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
+REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+OF THIS AGREEMENT.</span> </p>
+
+<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
+
+<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
+in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and<br clear="left">
+b) in the case of each subsequent Contributor:</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
+changes to the Program, and</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
+additions to the Program;</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
+such changes and/or additions to the Program originate from and are distributed
+by that particular Contributor. A Contribution 'originates' from a Contributor
+if it was added to the Program by such Contributor itself or anyone acting on
+such Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in conjunction
+with the Program under their own license agreement, and (ii) are not derivative
+works of the Program. </span></p>
+
+<p><span style="font-size: 10pt;">"Contributor" means any person or
+entity that distributes the Program.</span> </p>
+
+<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
+claims licensable by a Contributor which are necessarily infringed by the use
+or sale of its Contribution alone or when combined with the Program. </span></p>
+
+<p><span style="font-size: 10pt;">"Program" means the Contributions
+distributed in accordance with this Agreement.</span> </p>
+
+<p><span style="font-size: 10pt;">"Recipient" means anyone who
+receives the Program under this Agreement, including all Contributors.</span> </p>
+
+<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
+Subject to the terms of this Agreement, each Contributor hereby grants Recipient
+a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
+display, publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and object code
+form.</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
+Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
+patent license under Licensed Patents to make, use, sell, offer to sell, import
+and otherwise transfer the Contribution of such Contributor, if any, in source
+code and object code form. This patent license shall apply to the combination
+of the Contribution and the Program if, at the time the Contribution is added
+by the Contributor, such addition of the Contribution causes such combination
+to be covered by the Licensed Patents. The patent license shall not apply to
+any other combinations which include the Contribution. No hardware per se is
+licensed hereunder. </span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
+Recipient understands that although each Contributor grants the licenses to its
+Contributions set forth herein, no assurances are provided by any Contributor
+that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient
+for claims brought by any other entity based on infringement of intellectual
+property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility
+to secure any other intellectual property rights needed, if any. For example,
+if a third party patent license is required to allow Recipient to distribute
+the Program, it is Recipient's responsibility to acquire that license before
+distributing the Program.</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
+Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement. </span></p>
+
+<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
+
+<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
+Program in object code form under its own license agreement, provided that:</span>
+</p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
+it complies with the terms and conditions of this Agreement; and</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
+its license agreement:</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
+effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; </span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
+effectively excludes on behalf of all Contributors all liability for damages,
+including direct, indirect, special, incidental and consequential damages, such
+as lost profits; </span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
+states that any provisions which differ from this Agreement are offered by that
+Contributor alone and not by any other party; and</span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
+states that source code for the Program is available from such Contributor, and
+informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
+
+<p><span style="font-size: 10pt;">When the Program is made available in source
+code form:</span> </p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
+it must be made available under this Agreement; and </span></p>
+
+<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
+copy of this Agreement must be included with each copy of the Program. </span></p>
+
+<p><span style="font-size: 10pt;">Contributors may not remove or alter any
+copyright notices contained within the Program. </span></p>
+
+<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
+originator of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution. </span></p>
+
+<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
+
+<p><span style="font-size: 10pt;">Commercial distributors of software may
+accept certain responsibilities with respect to end users, business partners
+and the like. While this license is intended to facilitate the commercial use
+of the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes the
+Program in a commercial product offering, such Contributor ("Commercial
+Contributor") hereby agrees to defend and indemnify every other
+Contributor ("Indemnified Contributor") against any losses, damages and
+costs (collectively "Losses") arising from claims, lawsuits and other
+legal actions brought by a third party against the Indemnified Contributor to
+the extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may participate
+in any such claim at its own expense.</span> </p>
+
+<p><span style="font-size: 10pt;">For example, a Contributor might include the
+Program in a commercial product offering, Product X. That Contributor is then a
+Commercial Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance claims and
+warranties are such Commercial Contributor's responsibility alone. Under this
+section, the Commercial Contributor would have to defend claims against the
+other Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.</span> </p>
+
+<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
+
+<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and distributing the
+Program and assumes all risks associated with its exercise of rights under this
+Agreement , including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs or
+equipment, and unavailability or interruption of operations. </span></p>
+
+<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
+
+<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
+THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
+
+<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
+
+<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
+or unenforceable under applicable law, it shall not affect the validity or
+enforceability of the remainder of the terms of this Agreement, and without
+further action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.</span> </p>
+
+<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
+against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with
+other software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the date
+such litigation is filed. </span></p>
+
+<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
+shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable
+period of time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive. </span></p>
+
+<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
+copies of this Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The Agreement
+Steward reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement Steward has
+the right to modify this Agreement. The Eclipse Foundation is the initial
+Agreement Steward. The Eclipse Foundation may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.</span> </p>
+
+<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
+State of New York and the intellectual property laws of the United States of
+America. No party to this Agreement will bring a legal action under this
+Agreement more than one year after the cause of action arose. Each party waives
+its rights to a jury trial in any resulting litigation.</span> </p>
+
+<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
+
+</div>
+
+</body></html>
\ No newline at end of file
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib-feature/feature.properties b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib-feature/feature.properties
new file mode 100644
index 0000000..6844d99
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib-feature/feature.properties
@@ -0,0 +1,112 @@
+#################################################################################
+#  Copyright (c) 2008 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+featureName=Libhover for Newlib Feature (Incubation)
+description=Hover help plugins for maintaining C projects using newlib.
+provider=Eclipse
+copyright=Copyright 2009 Red Hat, Inc.
+licenseURL=epl-v10.html
+license=\
+ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
+March 17, 2005\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse.org CVS\n\
+repository ("Repository") in CVS modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+Features may also include other Features ("Included Features"). Files named\n\
+"feature.xml" may contain a list of the names and version numbers of\n\
+Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+   - The top-level (root) directory\n\
+   - Plug-in and Fragment directories\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
+   - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Eclipse Update Manager, you must agree to a license ("Feature Update\n\
+License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties". Such Abouts,\n\
+Feature Licenses and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
+    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
\ No newline at end of file
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib-feature/feature.xml b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib-feature/feature.xml
new file mode 100644
index 0000000..4beb8a6
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib-feature/feature.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.linuxtools.cdt.libhover.newlib"
+      label="%featureName"
+      version="1.0.0.qualifier"
+      provider-name="%provider">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="epl-v10.php">
+      %license
+   </license>
+
+   <url>
+      <update label="Linux Tools Update Site" url="http://download.eclipse.org/technology/linuxtools/update"/>
+   </url>
+
+   <requires>
+      <import plugin="org.eclipse.linuxtools.cdt.libhover.library_docs" version="1.0.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.linuxtools.cdt.libhover.newlib"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+</feature>
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib/.project b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib/.project
new file mode 100644
index 0000000..f3a0af0
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.cdt.libhover.newlib</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib/ChangeLog b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib/ChangeLog
new file mode 100644
index 0000000..04a4fa7
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib/ChangeLog
@@ -0,0 +1,32 @@
+2009-08-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #285867
+	* plugin.properties: Change Provider to Eclipse instead of Eclipse.org.
+
+2009-02-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump up version to 1.0.2.
+	* plugin.xml: Change to use new libhover library interface which requires
+	the location of a serialized LibHoverInfo instance rather than an xml document.
+
+2009-01-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add .qualifier to version and bump up to 1.0.1.
+
+2008-11-03  Andrew Overholt  <overholt@redhat.com>
+
+	* build.properties: Add plugin.properties.
+
+2008-10-31  Andrew Overholt  <overholt@redhat.com>
+
+	* plugin.properties: Initial checkin.
+	* META-INF/MANIFEST.MF: Use plugin.properties. Add "(Incubation)".
+
+2008-10-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* .project: New plugin for newlib libhover.
+	* META-INF/MANIFEST.MF: New file.
+	* plugin.xml: Ditto.
+	* toc.xml: Ditto.
+	* about.html: Ditto.
+	* build.properties: Ditto.
\ No newline at end of file
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib/META-INF/MANIFEST.MF b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..69e8682
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.cdt.libhover.newlib;singleton:=true
+Bundle-Version: 1.0.2.qualifier
+Bundle-Vendor: %provider
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.linuxtools.cdt.libhover.library_docs;bundle-version="1.0.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib/about.html b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib/about.html
new file mode 100644
index 0000000..44e2290
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

+<html>

+<head>

+<title>About</title>

+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>8th September, 2004</p>	

+<h3>License</h3>

+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<h3>Contributions</h3>

+

+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise

+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such

+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or

+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the

+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available

+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also

+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+</body>

+</html>
\ No newline at end of file
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib/build.properties b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib/build.properties
new file mode 100644
index 0000000..2220fab
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib/build.properties
@@ -0,0 +1,5 @@
+bin.includes = META-INF/,\
+               plugin.xml,\
+               toc.xml,\
+               plugin.properties
+src.includes = about.html
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib/plugin.properties b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib/plugin.properties
new file mode 100644
index 0000000..31d8eae
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+#  Copyright (c) 2008 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+bundleName=Newlib Libhover (Incubation)
+provider=Eclipse
\ No newline at end of file
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib/plugin.xml b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib/plugin.xml
new file mode 100644
index 0000000..3571976
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib/plugin.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+   <extension
+         id="library"
+         name="Newlib C Library"
+         point="org.eclipse.linuxtools.cdt.libhover.library">
+      <library
+            docs="http://www.sourceware.org/newlib/libc.html"
+            location="http://www.sourceware.org/eclipse/libhover/newlib-1.16.0.libhover"
+            name="newlib library"
+            type="C">
+      </library>
+   </extension>
+   <extension
+         point="org.eclipse.help.toc">
+      <toc
+            file="toc.xml"
+            primary="false">
+      </toc>
+   </extension>
+
+</plugin>
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib/toc.xml b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib/toc.xml
new file mode 100644
index 0000000..c73c418
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib/toc.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="newlib library" link_to="../org.eclipse.linuxtools.cdt.libhover.library_docs/toc.xml#moreclibdocs">
+	<topic href="http://www.sourceware.org/newlib/libc.html" label="newlib libc">
+ </topic>
+ <topic href="http://www.sourceware.org/newlib/libm.html" label="newlib libm">
+ </topic>
+</toc>
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/.classpath b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/.classpath
new file mode 100644
index 0000000..fb50116
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/.project b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/.project
new file mode 100644
index 0000000..175b8a5
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.cdt.libhover.texinfoparsers</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/ChangeLog b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/ChangeLog
new file mode 100644
index 0000000..ca197aa
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/ChangeLog
@@ -0,0 +1,55 @@
+2009-11-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Refactor to org.eclipse.linuxtools.cdt.libhover.texinfoparsers.
+
+2008-10-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tools/ParseNewlibTexinfo.java (DeftypefunPattern3): New
+	pattern for matching va_arg functions. 
+	(RtnTypeVar): Ditto.
+	(HandleFunctionDefs): Fix so multi-line prototypes are read until the line doesn't
+	end with comma.  Also add function pointer and va_arg function type support. 
+	* src/com/redhat/eclipse/cdt/autotools/tools/TexinfoUtils.java (transformTags):  Fix
+	table handling so like tables can be nested inside each other and/or can have @itemize
+	constructs between tables. 
+
+2008-10-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tools/ParseNewlibTexinfo.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/tools/TexinfoUtils.java (transformTags): 
+	Handle @strong{x}.
+
+2007-11-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tools/ParseGlibcTexinfo.java: Fix
+	include regexp to handle the case where a choice of headers are specified
+	with a blank between them.  Take the last header in the list in this case.
+	Also clear the global IncludeList whenever an @end deftypefn is seen.
+
+2007-11-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tools/ParseTexinfo.java: Renamed...
+	* src/com/redhat/eclipse/cdt/autotools/tools/ParseGlibcTexinfo.java: ...to this.
+	Code has been modified to use new TexinfoUtils class for tag stripping.  All
+	lines in synopsis are marked with <eol> at end to allow proper processing.
+	Fixed comment stripping and added @include support for bringing in sample files
+	from examples directory.
+	* src/com/redhat/eclipse/cdt/autotools/tools/TexinfoUtils.java: New file to
+	support proper transformation of texinfo tags into xml format that can be used
+	by a C Help processor.  Code was based on old killTags method, but rewritten to
+	handle many more types of scenarios found in glibc docs.
+	* src/com/redhat/eclipse/cdt/autotools/tools/ParseAutoconfHTML.java: Add
+	copyright statement.
+	* src/com/redhat/eclipse/cdt/autotools/tools/ParseAutoconfTexinfo.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/tools/ParseAutomakeTexinfo.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/tools/ParseAutoconfHTML.java: Removed.
+
+2007-11-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tools/ParseAutomakeTexinfo.java: New file to
+	parse Automake documentation and create xml files to use with Autotools plugin.
+
+2007-06-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tools/ParseAutoconfTexinfo.java: New file to
+	parse Autoconf documentation and create xml files to use with Autotools plugin.
\ No newline at end of file
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/README b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/README
new file mode 100644
index 0000000..600b5ec
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/README
@@ -0,0 +1,12 @@
+This project contains texinfo parsers used to create xml files for the purpose 
+of use with the Linux Tools plug-ins.  The parsers here were used to create the
+ xml files for glibc and newlib libhover and for autotools hover help for the 
+autoconf editor.  The glibc and newlib xml files were fed to the libhover 
+plugin BuildFunctionInfos java executable found in the libhover plugin: 
+
+ org.eclipse.linuxtools.cdt.libhover.utils/BuildFunctionInfos.java
+
+to create the libhover binary files used in the glibc and newlib libhover 
+plugins.
+
+To build, right-click on the build.xml file and run as -> Ant Build.
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/build.xml b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/build.xml
new file mode 100644
index 0000000..9abc931
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/build.xml
@@ -0,0 +1,15 @@
+<project name="Texinfo Parser" default="compile" basedir=".">
+  <property name="src" value="."/>
+  <property name="build" value="build"/>
+  <property name="build.compiler" value="modern"/>
+
+  <target name="init">
+    <tstamp/>
+    <mkdir dir="${build}"/>
+  </target>
+
+  <target name="compile" depends="init">
+    <javac srcdir="${src}" destdir="${build}" />
+  </target>
+</project>
+  
\ No newline at end of file
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutoconfTexinfo.java b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutoconfTexinfo.java
new file mode 100644
index 0000000..360d494
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutoconfTexinfo.java
@@ -0,0 +1,645 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.libhover.texinfoparsers;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+//This file contains a texinfo parser that can be
+//run to create the Autotools glibc.xml file.
+//Usage is as follows:
+//1. compile this file using javac
+//2. run this file using java, passing the
+//arguments: ${glibc_source_path}/manual glibc.xml
+
+public class ParseAutoconfTexinfo {
+
+	static final boolean DEBUG = false;
+
+	static final String ATcmd = "(@\\w*)";
+
+	//                           0
+	static final String Defmac = "@defmac";
+	static final String Defmacx = "@defmacx";
+
+	//                           1
+	static final String MacroName = "(\\w*)";
+	static final int    MacroNameIndex = 1;
+
+	//                          2    3
+	static final String Parms = "(\\((.*)\\))";
+	static final int    ParmsIndex = 2;
+
+	static final String rest = ".*";
+
+	static final String WhiteSpace = "\\s*";
+
+	static final Pattern MacroPattern
+	= Pattern.compile("^" + Defmac + WhiteSpace +
+			MacroName + WhiteSpace +
+			Parms +
+			rest, Pattern.MULTILINE + Pattern.CASE_INSENSITIVE);
+
+	static final Pattern MacroPattern2
+	= Pattern.compile("^" + Defmac + WhiteSpace + MacroName + rest, 
+			Pattern.MULTILINE + Pattern.CASE_INSENSITIVE);
+
+	static final Pattern MacroPatternx
+	= Pattern.compile("^" + Defmacx + WhiteSpace +
+			MacroName + WhiteSpace +
+			Parms +
+			rest, Pattern.MULTILINE + Pattern.CASE_INSENSITIVE);
+
+	static final Pattern MacroPatternx2
+	= Pattern.compile("^" + Defmacx + WhiteSpace + MacroName + rest, 
+			Pattern.MULTILINE + Pattern.CASE_INSENSITIVE);
+
+	static final Pattern ParmBracketPattern = Pattern.compile("\\((.*)\\)");
+	static final Pattern IndexPattern		= Pattern.compile("@\\w*index\\s+[a-zA-Z0-9_@\\{\\}]*");
+	static final Pattern IndexPattern2		= Pattern.compile("@\\w*index\\{[a-zA-Z0-9_@\\{\\}]*\\}");
+	static final Pattern ExamplePattern		= Pattern.compile("@example");
+	static final Pattern EndExamplePattern  = Pattern.compile("@end\\s+example");
+	static final Pattern EnumeratePattern	= Pattern.compile("@enumerate");
+	static final Pattern EndEnumeratePattern  = Pattern.compile("@end\\s+enumerate");
+	static final Pattern VerbatimPattern	= Pattern.compile("@verbatim");
+	static final Pattern ItemPattern		= Pattern.compile("@item");
+	static final Pattern NoIndentPattern	= Pattern.compile("@noindent");
+	static final Pattern BRPattern			= Pattern.compile("&lt;br&gt;");
+	static final Pattern EOLPattern			= Pattern.compile("&lt;eol&gt;");
+	static final Pattern EndVerbatimPattern = Pattern.compile("@end\\s+verbatim");
+	static final Pattern TableSampItemPattern = Pattern.compile("(@table\\s*@samp.*)@item\\s*([a-zA-Z_0-9+\\-<>/ ]*)<eol>(.*@end\\s*table)", Pattern.DOTALL);
+	static final Pattern TableAsisItemPattern = Pattern.compile("(@table\\s*@asis.*)@item\\s*([a-zA-Z_0-9+\\-,<>/ ]*)<eol>(.*@end\\s*table)", Pattern.DOTALL);
+	static final Pattern TableSampPattern 	= Pattern.compile("@table\\s*@samp", Pattern.MULTILINE);
+	static final Pattern TableAsisPattern	= Pattern.compile("@table\\s*@asis", Pattern.MULTILINE);
+	static final Pattern EndTablePattern 	= Pattern.compile("@end\\s+table");
+	static final Pattern DotsPattern		= Pattern.compile("@dots\\{\\}");
+	static final Pattern ItemizeMinusPattern= Pattern.compile("@itemize\\s+@minus" + "(.*)" + "@end\\s+itemize", Pattern.MULTILINE);
+	static final Pattern ItemizeBulletPattern= Pattern.compile("@itemize\\s+@bullet" + "(.*)" + "@end\\s+itemize", Pattern.MULTILINE);
+	static final Pattern XrefPattern		= Pattern.compile("@xref\\{[^\\}]*\\}", Pattern.MULTILINE);
+	static final Pattern CommandPattern		= Pattern.compile("@command\\{([^\\}]*)\\}");
+	static final Pattern KbdPattern			= Pattern.compile("@kbd\\{([^\\}]*)\\}");
+	static final Pattern RPattern			= Pattern.compile("@r\\{([^\\}]*)\\}");
+	static final Pattern FilePattern		= Pattern.compile("@file\\{([^\\}]*)\\}");
+	static final Pattern VarPattern			= Pattern.compile("@var\\{([^\\}]*)\\}");
+	static final Pattern OVarPattern		= Pattern.compile("@ovar\\{([^\\}]*)\\}");
+	static final Pattern DVarPattern		= Pattern.compile("@dvar\\{([^\\},\\,]*),([^\\}]*)\\}");
+	static final Pattern CodePattern		= Pattern.compile("@code\\{([^\\}]*)\\}");
+	static final Pattern EmphPattern		= Pattern.compile("@emph\\{([^\\}]*)\\}");
+	static final Pattern SampPattern		= Pattern.compile("@samp\\{([^\\}]*)\\}");
+	static final Pattern OptionPattern		= Pattern.compile("@option\\{([^\\}]*)\\}");
+	static final Pattern TagPattern		= Pattern.compile("@\\w*\\{([^\\}]*)\\}");
+	static final Pattern AmpersandPattern	= Pattern.compile("&");
+	static final Pattern LeftAnglePattern	= Pattern.compile("<");
+	static final Pattern RightAnglePattern	= Pattern.compile(">");
+
+
+	private static Map macroMap;
+	
+	static class MacroParms {
+		String[] parms;
+		MacroParms nextParms = null;
+		
+		public MacroParms(String[] parms) {
+			this.parms = parms;
+		}
+	}
+	
+	static class MacroDef {
+		String MacroName;
+		MacroParms Parameters;
+	}
+
+	static class TPElement {
+		String Content;
+		String Synopsis;
+	}
+
+	static class TPDef {
+		String TPType;
+		String TPName;
+		String TPSynopsis;
+		TPElement[] TPElements;
+		Object[] IncludeList;
+	}
+	
+	private static String killTagsParms(String tt) {
+		Matcher mm;
+		
+		mm = ParmBracketPattern.matcher(tt);
+		tt= mm.replaceAll("$1");
+		
+		mm = OVarPattern.matcher(tt);
+		tt = mm.replaceAll("[$1]");
+		
+		mm = DVarPattern.matcher(tt);
+		tt = mm.replaceAll("[$1=$2]");
+
+		mm = VarPattern.matcher(tt);
+		tt = mm.replaceAll("$1");
+		
+		mm = RPattern.matcher(tt);
+		tt = mm.replaceAll("$1");
+		
+		mm = DotsPattern.matcher(tt);
+		tt = mm.replaceAll("...");
+		
+		return tt;
+	}
+		
+
+	private static String killTags(String tt) {
+		Matcher mm;
+		String ss = "";
+		
+		while (ss != tt) {
+			mm = XrefPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = IndexPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = IndexPattern2.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = NoIndentPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = VarPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<VAR>$1</VAR>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = DotsPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<small>...</small>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = CommandPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<CODE>$1</CODE>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = CodePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<CODE>$1</CODE>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = KbdPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<KBD>$1</KBD>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EmphPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<EM>$1</EM>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = FilePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<TT>$1</TT>");
+		}
+		
+		
+		ss = "";
+		while (ss != tt) {
+			mm = VerbatimPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<CODE>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndVerbatimPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</CODE>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = SampPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<samp>$1</samp>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = OptionPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<samp>$1</samp>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = ExamplePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<TABLE><tr><td>&nbsp;</td><td class=example><pre>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndExamplePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</pre></td></tr></table>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = EnumeratePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<OL>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndEnumeratePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</OL>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TableSampItemPattern.matcher(tt);
+			ss = tt;
+			if (mm.matches()) {
+				System.out.println("group 1 is " + mm.group(1));
+				System.out.println("group 2 is " + mm.group(2));
+				System.out.println("group 3 is " + mm.group(3));
+			}
+			tt = mm.replaceAll("$1<DT>'<SAMP>$2</SAMP>'\n<DD>$3");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TableAsisItemPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("$1<DT>$2\n<DD>$3");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TableSampPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<DL>\n");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TableAsisPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<DL>\n");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = EndTablePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</DL>");
+		}
+
+		//FIXME: if there ever is a @itemize @bullet within a
+		//       @itemize @minus or vice-versa, the following
+		//       logic will get it wrong.
+		ss = "";
+		while (ss != tt) {
+			mm = ItemizeMinusPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<UL>$1</UL>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = ItemizeBulletPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<OL>$1</OL>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = ItemPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<LI>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TagPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("$1");
+		}
+		
+		mm = AmpersandPattern.matcher(tt);
+		tt = mm.replaceAll("&amp;");
+
+		mm = LeftAnglePattern.matcher(tt);
+		tt = mm.replaceAll("&lt;");
+
+		mm = RightAnglePattern.matcher(tt);
+		tt = mm.replaceAll("&gt;");	
+
+		// Clean up the eol markers we used to mark end of line for items
+		mm = EOLPattern.matcher(tt);
+		tt = mm.replaceAll("");
+		
+		return tt;
+	}
+
+	private static MacroDef BuildMacroDef(Matcher m) {
+		MacroDef md = new MacroDef();
+
+		md.MacroName = m.group(MacroNameIndex);
+
+		if (null != m.group(ParmsIndex)) {
+			String tt = killTagsParms(m.group(ParmsIndex));
+			String[] parms = tt.split(",\\s");
+			md.Parameters = new MacroParms(parms);
+		}
+		return md;
+	}
+
+	private static MacroParms AddMacroDefxParms(MacroParms mp, Matcher mx) {
+		if (null != mx.group(ParmsIndex)) {
+			String tt = killTagsParms(mx.group(ParmsIndex));
+			String[] parms = tt.split(",\\s");
+			MacroParms mpnew = new MacroParms(parms);
+			mp.nextParms = mpnew;
+			return mpnew;
+		}
+		return null;
+	}
+
+	private static MacroDef HandleMacroDef(BufferedReader is, String s) throws IOException {
+		MacroDef fd = null;
+
+		Matcher m = MacroPattern.matcher(s);
+
+		if (m.matches()) {
+			fd = BuildMacroDef(m);
+		}
+		else {						// assume the line got split and retry
+			is.mark(100);
+			String il = is.readLine();
+			m = MacroPattern.matcher(s + il);
+			if (m.matches()) fd = BuildMacroDef(m);
+			else {
+				is.reset();
+				m = MacroPattern2.matcher(s);
+				if (m.matches()) {
+					fd = new MacroDef();
+					fd.MacroName = m.group(MacroNameIndex);
+					fd.Parameters = new MacroParms(new String[0]);
+				}
+			}
+		}
+		
+		if (fd != null) {
+			// Look for @defmacx which are alternate prototypes for the macro
+			is.mark(100);
+			String il = is.readLine();
+			if (il != null) {
+				Matcher mx = MacroPatternx.matcher(il);
+				Matcher mx2 = MacroPatternx2.matcher(il);
+				MacroParms mp = fd.Parameters;
+				while (mx.matches() || mx2.matches()) {
+					if (mx.matches())
+					mp = AddMacroDefxParms(mp, mx);
+					else {
+						MacroParms mpnew = new MacroParms(new String[0]);
+						mp.nextParms = mpnew;
+						mp = mpnew;
+					}
+					is.mark(100);
+					il = is.readLine();
+					if (il != null) {
+						mx = MacroPatternx.matcher(il);
+						mx2 = MacroPatternx2.matcher(il);
+					}
+				}
+				is.reset();
+			}
+
+			if (macroMap.get(fd.MacroName) != null)
+				return null;
+			macroMap.put(fd.MacroName, fd);
+		}
+
+		return fd;
+	}
+
+	private static void WriteString(BufferedWriter os, String s) throws IOException {
+		//	System.out.println(s);
+		os.write(s+"\n", 0, 1+s.length());
+	}
+	
+    private static void CreateHeader(BufferedWriter os) throws IOException {
+    	WriteString(os, "<!-- This file automatically generated by ParseAutoconfTexinfo utility -->");
+    	WriteString(os, "<!-- cvs -d:pserver:anonymous@sources.redhat.com:/cvs/eclipse \\        -->");
+    	WriteString(os, "<!--   co autotools/ParseTexinfo                                       -->");
+    	WriteString(os, "<!DOCTYPE macros [");
+    	WriteString(os, "");
+    	WriteString(os, "  <!ELEMENT macros (macro)*>");
+    	WriteString(os, "");
+    	WriteString(os, "  <!ELEMENT macro (prototype*,synopsis)>");
+    	WriteString(os, "  <!ATTLIST macro");
+    	WriteString(os, "    id ID #REQUIRED");
+    	WriteString(os, "  >");
+    	WriteString(os, "");
+    	WriteString(os, "  <!ELEMENT synopsis     (#PCDATA)*>");
+    	WriteString(os, "");
+    	WriteString(os, "  <!ELEMENT prototype    (parameter+)?>");
+    	WriteString(os, "");
+    	WriteString(os, "  <!ELEMENT parameter (#PCDATA)*>");
+    	WriteString(os, "  <!ATTLIST parameter");
+    	WriteString(os, "    content CDATA #REQUIRED");
+    	WriteString(os, "  >");
+    	WriteString(os, "");
+    	WriteString(os, "]>");
+    	WriteString(os, "");
+    }
+
+
+
+	private static void CreateTrailer(BufferedWriter os) throws IOException {
+		WriteString(os, "</macros>");
+	}
+
+	private static void WriteSynopsis(BufferedWriter os, String Synopsis, boolean indent)  throws IOException {
+		String ss = killTags(Synopsis);
+		String[] tt = ss.split("\\s");
+		String aa = "";
+		String spaces = indent ? "            " : "        ";
+		WriteString(os, spaces + "<synopsis>");
+		if (null != Synopsis) {
+			for (int pp = 0; pp < tt.length; pp++) {
+				if (tt[pp].equals("&lt;br&gt;")) {
+					WriteString(os, spaces + aa + "&lt;/P&gt;&lt;P&gt;\n");
+					aa = "";
+				}
+				else {
+					if ((aa.length() + tt[pp].length()) > 64) {
+						WriteString(os, spaces + aa);
+						aa = "";
+					}
+					aa = aa + " " + tt[pp];
+				}
+			}
+		}
+		if (aa.length() > 0) WriteString(os, "        " + aa);
+		WriteString(os, spaces + "</synopsis>");
+	}
+
+	private static void HandleDefmacro(BufferedWriter os, BufferedReader is, String s) throws IOException {
+		String il;
+		MacroDef md;
+		List FDefs = new ArrayList();
+		String Synopsis = null;
+
+		if (null != (md = HandleMacroDef(is, s))) FDefs.add(md);
+
+		while (null != (il = is.readLine())) {
+			if (il.startsWith("@defmac")) {
+				if (null != (md = HandleMacroDef(is, il))) FDefs.add(md);
+			}
+			else if (il.startsWith("@comment") ||
+					il.startsWith("@c ")) {	// comment -- ignore it
+			}
+			else if (il.startsWith("@end defmac")) {
+				for (int kk = 0; kk < FDefs.size(); kk++) {
+					md = (MacroDef)FDefs.get(kk);
+
+					WriteString(os, "  <macro id=\"" + md.MacroName + "\">");
+
+					MacroParms mp = md.Parameters;
+					do {
+						WriteString(os, "      <prototype>");
+						String[] parms = mp.parms;
+						for (int i = 0; i < parms.length; i++) {
+							WriteString(os, "        <parameter content=\"" + parms[i] + "\"/>");
+						}
+						WriteString(os, "      </prototype>");
+						mp = mp.nextParms;
+					} while (mp != null);
+
+					if (null != Synopsis) WriteSynopsis(os, Synopsis, false);
+					
+					WriteString(os, "  </macro>");
+				}
+				return;
+			}
+			else {
+				Synopsis = ((Synopsis == null) ? "" : Synopsis + " " ) + ((il.length() == 0) ? "<br>" : 
+					il.startsWith("@item") ? il + "<eol>" : il);
+				
+			}
+		}
+		FDefs.clear();
+
+	}
+
+	private static class OnlyTexi implements FilenameFilter {
+		public boolean accept(File dir, String s) {
+			return (s.endsWith(".texi")) ? true : false;
+		}
+	}
+
+	public static void BuildXMLFromTexinfo(String srcdir, String dstdir) {
+		try {
+			macroMap = new HashMap();
+			BufferedWriter os = new BufferedWriter(new FileWriter(dstdir));
+
+			CreateHeader(os);
+//			CreateLicense(os);
+
+			WriteString(os, "<macros>");
+
+			try {
+				String[] dir = new java.io.File(srcdir).list(new OnlyTexi());
+				for (int i = 0; i < dir.length; i++) {
+					String qFile = srcdir.endsWith("/")
+					? srcdir + dir[i]
+					               : srcdir + "/" + dir[i];
+
+					try {
+						BufferedReader is = new BufferedReader(new FileReader(qFile));
+						String il;
+
+						while (null != (il = is.readLine())) {
+							if (il.startsWith("@defmac")) {	// handle @defmac x]
+								HandleDefmacro(os, is, il);
+							}
+						}
+						is.close();
+					}
+					catch (IOException e) {
+						System.out.println("Input File IOException: " + e);
+						return;
+					}
+				}
+			}
+			catch (NullPointerException e) {
+				System.out.println("NullPointerException: " + e);
+				return;
+			}
+
+			CreateTrailer(os);
+
+			os.close();
+		}
+		catch (IOException e) {
+			System.out.println("Output File IOException: " + e);
+			return;
+		}
+	}
+
+	public static void main(String[] args) {
+		// arg[0] is input directory containing .texi documents to read
+		// arg[1] is output xml file to create
+		BuildXMLFromTexinfo(args[0], args[1]);
+	}
+
+}
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutomakeTexinfo.java b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutomakeTexinfo.java
new file mode 100644
index 0000000..c61adc0
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutomakeTexinfo.java
@@ -0,0 +1,661 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.libhover.texinfoparsers;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+//This file contains a texinfo parser that can be
+//run to create the Autotools glibc.xml file.
+//Usage is as follows:
+//1. compile this file using javac
+//2. run this file using java, passing the
+//arguments: dir_to_automake_texi_files output_xml_file_name
+
+public class ParseAutomakeTexinfo {
+
+	static final boolean DEBUG = false;
+
+	static final String ATcmd = "(@\\w*)";
+
+	// Currently in automake docs, the macro section starts with
+	// a subsection as below and a table which contains macros which
+	// are item and itemx entries.
+	static final String MacrosStart = "@subsection\\sPublic\\smacros";
+	static final String OldMacrosStart = "@section\\sAutoconf\\smacros.*";
+	static final Pattern MacroSection1 = Pattern.compile(MacrosStart);
+	static final Pattern MacroSection2 = Pattern.compile(OldMacrosStart);
+	//                           0
+	static final String Defmac = "@item";
+	static final String Defmacx = "@itemx";
+
+	//                           1
+	static final String MacroName = "(\\w*)";
+	static final int    MacroNameIndex = 1;
+
+	//                          2    3
+	static final String Parms = "(\\((.*)\\))";
+	static final int    ParmsIndex = 2;
+
+	static final String rest = ".*";
+
+	static final String WhiteSpace = "\\s*";
+
+	static final Pattern MacroPattern
+	= Pattern.compile("^" + Defmac + WhiteSpace +
+			MacroName + WhiteSpace +
+			Parms +
+			rest, Pattern.MULTILINE + Pattern.CASE_INSENSITIVE);
+
+	static final Pattern MacroPattern2
+	= Pattern.compile("^" + Defmac + WhiteSpace + MacroName + rest, 
+			Pattern.MULTILINE + Pattern.CASE_INSENSITIVE);
+
+	static final Pattern MacroPatternx
+	= Pattern.compile("^" + Defmacx + WhiteSpace +
+			MacroName + WhiteSpace +
+			Parms +
+			rest, Pattern.MULTILINE + Pattern.CASE_INSENSITIVE);
+
+	static final Pattern MacroPatternx2
+	= Pattern.compile("^" + Defmacx + WhiteSpace + MacroName + rest, 
+			Pattern.MULTILINE + Pattern.CASE_INSENSITIVE);
+
+	static final Pattern ParmBracketPattern = Pattern.compile("\\((.*)\\)");
+	static final Pattern IndexPattern		= Pattern.compile("@\\w*index.*");
+	static final Pattern IndexPattern2		= Pattern.compile("@\\w*index\\{[a-zA-Z0-9_@\\{\\}]*\\}");
+	static final Pattern ExamplePattern		= Pattern.compile("@example");
+	static final Pattern EndExamplePattern  = Pattern.compile("@end\\s+example");
+	static final Pattern EnumeratePattern	= Pattern.compile("@enumerate");
+	static final Pattern EndEnumeratePattern  = Pattern.compile("@end\\s+enumerate");
+	static final Pattern VerbatimPattern	= Pattern.compile("@verbatim");
+	static final Pattern ItemPattern		= Pattern.compile("@item");
+	static final Pattern NoIndentPattern	= Pattern.compile("@noindent");
+	static final Pattern BRPattern			= Pattern.compile("&lt;br&gt;");
+	static final Pattern EOLPattern			= Pattern.compile("&lt;eol&gt;");
+	static final Pattern EndVerbatimPattern = Pattern.compile("@end\\s+verbatim");
+	static final Pattern TableSampItemPattern = Pattern.compile("(@table\\s*@samp.*)@item\\s*([a-zA-Z_0-9+\\-<>/ ]*)<eol>(.*@end\\s*table)", Pattern.DOTALL);
+	static final Pattern TableAsisItemPattern = Pattern.compile("(@table\\s*@asis.*)@item\\s*([a-zA-Z_0-9+\\-,<>/ ]*)<eol>(.*@end\\s*table)", Pattern.DOTALL);
+	static final Pattern TableSampPattern 	= Pattern.compile("@table\\s*@samp", Pattern.MULTILINE);
+	static final Pattern TableAsisPattern	= Pattern.compile("@table\\s*@asis", Pattern.MULTILINE);
+	static final Pattern EndTablePattern 	= Pattern.compile("@end\\s+table");
+	static final Pattern DotsPattern		= Pattern.compile("@dots\\{\\}");
+	static final Pattern ItemizeMinusPattern= Pattern.compile("@itemize\\s+@minus" + "(.*)" + "@end\\s+itemize", Pattern.MULTILINE);
+	static final Pattern ItemizeBulletPattern= Pattern.compile("@itemize\\s+@bullet" + "(.*)" + "@end\\s+itemize", Pattern.MULTILINE);
+	static final Pattern XrefPattern		= Pattern.compile("@xref\\{[^\\}]*\\}", Pattern.MULTILINE);
+	static final Pattern CommandPattern		= Pattern.compile("@command\\{([^\\}]*)\\}");
+	static final Pattern KbdPattern			= Pattern.compile("@kbd\\{([^\\}]*)\\}");
+	static final Pattern RPattern			= Pattern.compile("@r\\{([^\\}]*)\\}");
+	static final Pattern FilePattern		= Pattern.compile("@file\\{([^\\}]*)\\}");
+	static final Pattern VarPattern			= Pattern.compile("@var\\{([^\\}]*)\\}");
+	static final Pattern OVarPattern		= Pattern.compile("@ovar\\{([^\\}]*)\\}");
+	static final Pattern DVarPattern		= Pattern.compile("@dvar\\{([^\\},\\,]*),([^\\}]*)\\}");
+	static final Pattern CodePattern		= Pattern.compile("@code\\{([^\\}]*)\\}");
+	static final Pattern EmphPattern		= Pattern.compile("@emph\\{([^\\}]*)\\}");
+	static final Pattern SampPattern		= Pattern.compile("@samp\\{([^\\}]*)\\}");
+	static final Pattern OptionPattern		= Pattern.compile("@option\\{([^\\}]*)\\}");
+	static final Pattern UrefPattern		= Pattern.compile("@uref\\{([^,]*),\\s+([^\\}]*)\\}");
+	static final Pattern TagPattern		= Pattern.compile("@\\w*\\{([^\\}]*)\\}");
+	static final Pattern AmpersandPattern	= Pattern.compile("&");
+	static final Pattern LeftAnglePattern	= Pattern.compile("<");
+	static final Pattern RightAnglePattern	= Pattern.compile(">");
+
+
+	private static Map macroMap;
+	
+	static class MacroParms {
+		String[] parms;
+		MacroParms nextParms = null;
+		
+		public MacroParms(String[] parms) {
+			this.parms = parms;
+		}
+	}
+	
+	static class MacroDef {
+		String MacroName;
+		MacroParms Parameters;
+		String Synopsis;
+	}
+
+	static class TPElement {
+		String Content;
+		String Synopsis;
+	}
+
+	static class TPDef {
+		String TPType;
+		String TPName;
+		String TPSynopsis;
+		TPElement[] TPElements;
+		Object[] IncludeList;
+	}
+	
+	private static String killTagsParms(String tt) {
+		Matcher mm;
+		
+		mm = ParmBracketPattern.matcher(tt);
+		tt= mm.replaceAll("$1");
+		
+		mm = OVarPattern.matcher(tt);
+		tt = mm.replaceAll("[$1]");
+		
+		mm = DVarPattern.matcher(tt);
+		tt = mm.replaceAll("[$1=$2]");
+
+		mm = VarPattern.matcher(tt);
+		tt = mm.replaceAll("$1");
+		
+		mm = RPattern.matcher(tt);
+		tt = mm.replaceAll("$1");
+		
+		mm = DotsPattern.matcher(tt);
+		tt = mm.replaceAll("...");
+		
+		return tt;
+	}
+		
+
+	private static String killTags(String tt) {
+		Matcher mm;
+		String ss = "";
+		
+		while (ss != tt) {
+			mm = XrefPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = IndexPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = IndexPattern2.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = NoIndentPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = VarPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<VAR>$1</VAR>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = DotsPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<small>...</small>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = CommandPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<CODE>$1</CODE>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = CodePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<CODE>$1</CODE>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = UrefPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<A HREF=\"$1>$2</A>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = KbdPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<KBD>$1</KBD>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EmphPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<EM>$1</EM>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = FilePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<TT>$1</TT>");
+		}
+		
+		
+		ss = "";
+		while (ss != tt) {
+			mm = VerbatimPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<CODE>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndVerbatimPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</CODE>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = SampPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<samp>$1</samp>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = OptionPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<samp>$1</samp>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = ExamplePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<TABLE><tr><td>&nbsp;</td><td class=example><pre>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndExamplePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</pre></td></tr></table>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = EnumeratePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<OL>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndEnumeratePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</OL>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TableSampItemPattern.matcher(tt);
+			ss = tt;
+			if (mm.matches()) {
+				System.out.println("group 1 is " + mm.group(1));
+				System.out.println("group 2 is " + mm.group(2));
+				System.out.println("group 3 is " + mm.group(3));
+			}
+			tt = mm.replaceAll("$1<DT>'<SAMP>$2</SAMP>'\n<DD>$3");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TableAsisItemPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("$1<DT>$2\n<DD>$3");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TableSampPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<DL>\n");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TableAsisPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<DL>\n");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = EndTablePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</DL>");
+		}
+
+		//FIXME: if there ever is a @itemize @bullet within a
+		//       @itemize @minus or vice-versa, the following
+		//       logic will get it wrong.
+		ss = "";
+		while (ss != tt) {
+			mm = ItemizeMinusPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<UL>$1</UL>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = ItemizeBulletPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<OL>$1</OL>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = ItemPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<LI>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TagPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("$1");
+		}
+		
+		mm = AmpersandPattern.matcher(tt);
+		tt = mm.replaceAll("&amp;");
+
+		mm = LeftAnglePattern.matcher(tt);
+		tt = mm.replaceAll("&lt;");
+
+		mm = RightAnglePattern.matcher(tt);
+		tt = mm.replaceAll("&gt;");	
+
+		// Clean up the eol markers we used to mark end of line for items
+		mm = EOLPattern.matcher(tt);
+		tt = mm.replaceAll("");
+		
+		return tt;
+	}
+
+	private static MacroDef BuildMacroDef(Matcher m) {
+		MacroDef md = new MacroDef();
+
+		md.MacroName = m.group(MacroNameIndex);
+
+		if (null != m.group(ParmsIndex)) {
+			String tt = killTagsParms(m.group(ParmsIndex));
+			String[] parms = tt.split(",\\s");
+			md.Parameters = new MacroParms(parms);
+		}
+		return md;
+	}
+
+	private static MacroParms AddMacroDefxParms(MacroParms mp, Matcher mx) {
+		if (null != mx.group(ParmsIndex)) {
+			String tt = killTagsParms(mx.group(ParmsIndex));
+			String[] parms = tt.split(",\\s");
+			MacroParms mpnew = new MacroParms(parms);
+			mp.nextParms = mpnew;
+			return mpnew;
+		}
+		return null;
+	}
+
+	private static MacroDef HandleMacroDef(BufferedReader is, String s) throws IOException {
+		MacroDef fd = null;
+
+		Matcher m = MacroPattern.matcher(s);
+
+		if (m.matches()) {
+			fd = BuildMacroDef(m);
+		}
+		else {						// assume the line got split and retry
+			is.mark(100);
+			String il = is.readLine();
+			m = MacroPattern.matcher(s + il);
+			if (m.matches()) fd = BuildMacroDef(m);
+			else {
+				is.reset();
+				m = MacroPattern2.matcher(s);
+				if (m.matches()) {
+					fd = new MacroDef();
+					fd.MacroName = m.group(MacroNameIndex);
+					fd.Parameters = new MacroParms(new String[0]);
+				}
+			}
+		}
+		
+		if (fd != null) {
+			// Look for @defmacx which are alternate prototypes for the macro
+			is.mark(100);
+			String il = is.readLine();
+			if (il != null) {
+				Matcher mx = MacroPatternx.matcher(il);
+				Matcher mx2 = MacroPatternx2.matcher(il);
+				MacroParms mp = fd.Parameters;
+				while (mx.matches() || mx2.matches()) {
+					if (mx.matches())
+					mp = AddMacroDefxParms(mp, mx);
+					else {
+						MacroParms mpnew = new MacroParms(new String[0]);
+						mp.nextParms = mpnew;
+						mp = mpnew;
+					}
+					is.mark(100);
+					il = is.readLine();
+					if (il != null) {
+						mx = MacroPatternx.matcher(il);
+						mx2 = MacroPatternx2.matcher(il);
+					}
+				}
+				is.reset();
+			}
+
+			if (macroMap.get(fd.MacroName) != null)
+				return null;
+			macroMap.put(fd.MacroName, fd);
+		}
+
+		return fd;
+	}
+
+	private static void WriteString(BufferedWriter os, String s) throws IOException {
+		//	System.out.println(s);
+		os.write(s+"\n", 0, 1+s.length());
+	}
+	
+    private static void CreateHeader(BufferedWriter os) throws IOException {
+    	WriteString(os, "<!-- This file automatically generated by ParseAutomakeTexinfo utility -->");
+    	WriteString(os, "<!-- cvs -d:pserver:anonymous@sources.redhat.com:/cvs/eclipse \\        -->");
+    	WriteString(os, "<!--   co autotools/ParseTexinfo                                       -->");
+    	WriteString(os, "<!DOCTYPE macros [");
+    	WriteString(os, "");
+    	WriteString(os, "  <!ELEMENT macros (macro)*>");
+    	WriteString(os, "");
+    	WriteString(os, "  <!ELEMENT macro (prototype*,synopsis)>");
+    	WriteString(os, "  <!ATTLIST macro");
+    	WriteString(os, "    id ID #REQUIRED");
+    	WriteString(os, "  >");
+    	WriteString(os, "");
+    	WriteString(os, "  <!ELEMENT synopsis     (#PCDATA)*>");
+    	WriteString(os, "");
+    	WriteString(os, "  <!ELEMENT prototype    (parameter+)?>");
+    	WriteString(os, "");
+    	WriteString(os, "  <!ELEMENT parameter (#PCDATA)*>");
+    	WriteString(os, "  <!ATTLIST parameter");
+    	WriteString(os, "    content CDATA #REQUIRED");
+    	WriteString(os, "  >");
+    	WriteString(os, "");
+    	WriteString(os, "]>");
+    	WriteString(os, "");
+    }
+
+
+
+	private static void CreateTrailer(BufferedWriter os) throws IOException {
+		WriteString(os, "</macros>");
+	}
+
+	private static void WriteSynopsis(BufferedWriter os, String Synopsis, boolean indent)  throws IOException {
+		String ss = Synopsis;
+		String[] tt = ss.split("\\s");
+		String aa = "";
+		String spaces = indent ? "            " : "        ";
+		WriteString(os, spaces + "<synopsis>");
+		if (null != Synopsis) {
+			for (int pp = 0; pp < tt.length; pp++) {
+				if (tt[pp].equals("&lt;br&gt;")) {
+					WriteString(os, spaces + aa + "&lt;/P&gt;&lt;P&gt;\n");
+					aa = "";
+				}
+				else {
+					if ((aa.length() + tt[pp].length()) > 64) {
+						WriteString(os, spaces + aa);
+						aa = "";
+					}
+					aa = aa + " " + tt[pp];
+				}
+			}
+		}
+		if (aa.length() > 0) WriteString(os, "        " + aa);
+		WriteString(os, spaces + "</synopsis>");
+	}
+
+	private static void HandleDefmacro(BufferedWriter os, BufferedReader is, String s) throws IOException {
+		String il;
+		MacroDef md = null;
+		List FDefs = new ArrayList();
+
+		while (null != (il = is.readLine())) {
+			if (il.startsWith(Defmac)) {
+				if (null != (md = HandleMacroDef(is, il))) FDefs.add(md);
+			}
+			else if (il.startsWith("@comment") ||
+					il.startsWith("@c ")) {	// comment -- ignore it
+			}
+			else if (il.startsWith("@subsection") ||
+					il.startsWith("@section")) {
+				for (int kk = 0; kk < FDefs.size(); kk++) {
+					md = (MacroDef)FDefs.get(kk);
+
+					WriteString(os, "  <macro id=\"" + md.MacroName + "\">");
+
+					MacroParms mp = md.Parameters;
+					do {
+						WriteString(os, "      <prototype>");
+						String[] parms = mp.parms;
+						for (int i = 0; i < parms.length; i++) {
+							WriteString(os, "        <parameter content=\"" + parms[i] + "\"/>");
+						}
+						WriteString(os, "      </prototype>");
+						mp = mp.nextParms;
+					} while (mp != null);
+
+					if (null != md.Synopsis) WriteSynopsis(os, md.Synopsis, false);
+					
+					WriteString(os, "  </macro>");
+				}
+				return;
+			}
+			else {
+				if (md != null)
+					md.Synopsis = ((md.Synopsis == null) ? "" : md.Synopsis + " " ) + ((il.length() == 0) ? "&lt;br&gt;&lt;br&gt;" : 
+						il.startsWith("@item") ? killTags(il) + "<eol>" : killTags(il));
+			}
+		}
+		FDefs.clear();
+
+	}
+
+	private static class OnlyTexi implements FilenameFilter {
+		public boolean accept(File dir, String s) {
+			return (s.endsWith(".texi")) ? true : false;
+		}
+	}
+
+	public static void BuildXMLFromTexinfo(String srcdir, String dstdir) {
+		try {
+			macroMap = new HashMap();
+			BufferedWriter os = new BufferedWriter(new FileWriter(dstdir));
+
+			CreateHeader(os);
+//			CreateLicense(os);
+
+			WriteString(os, "<macros>");
+
+			try {
+				String[] dir = new java.io.File(srcdir).list(new OnlyTexi());
+				for (int i = 0; i < dir.length; i++) {
+					String qFile = srcdir.endsWith("/")
+					? srcdir + dir[i]
+					               : srcdir + "/" + dir[i];
+
+					try {
+						BufferedReader is = new BufferedReader(new FileReader(qFile));
+						String il;
+
+						while (null != (il = is.readLine())) {
+							Matcher mm1 = MacroSection1.matcher(il);
+							Matcher mm2 = MacroSection2.matcher(il);
+							if (mm1.matches() || mm2.matches()) {
+								HandleDefmacro(os, is, il);
+							}
+						}
+						is.close();
+					}
+					catch (IOException e) {
+						System.out.println("Input File IOException: " + e);
+						return;
+					}
+				}
+			}
+			catch (NullPointerException e) {
+				System.out.println("NullPointerException: " + e);
+				return;
+			}
+
+			CreateTrailer(os);
+
+			os.close();
+		}
+		catch (IOException e) {
+			System.out.println("Output File IOException: " + e);
+			return;
+		}
+	}
+
+	public static void main(String[] args) {
+		// arg[0] is input directory containing .texi documents to read
+		// arg[1] is output xml file to create
+		BuildXMLFromTexinfo(args[0], args[1]);
+	}
+
+}
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseGlibcTexinfo.java b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseGlibcTexinfo.java
new file mode 100644
index 0000000..08f657c
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseGlibcTexinfo.java
@@ -0,0 +1,881 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.libhover.texinfoparsers;
+import java.io.*;
+import java.util.regex.*;
+import java.util.*;
+
+//This file contains a texinfo parser that can be
+//run to create the Autotools glibc.xml file.
+//Usage is as follows:
+//1. compile this file using javac
+//2. run this file using java, passing the
+//arguments: ${glibc_source_path}/manual glibc.xml
+
+public class ParseGlibcTexinfo {
+	static final boolean DEBUG = false;
+
+	//                           1
+	static final String ATcmd = "(@\\w*)";
+
+
+	//                              3   4
+	static final String RtnTypeM = "(\\{([^\\}]*)\\})";
+	static final int    RtnTypeMIndex = 4;
+
+	//                              5
+	static final String RtnTypeS = "(\\w*)";
+	static final int    RtnTypeSIndex = 5;
+
+	//                             2
+	static final String RtnType = "(" + RtnTypeM + "|" + RtnTypeS + ")";
+	//                                  6
+	static final String FunctionName = "(\\w*)";
+	static final int    FunctionNameIndex = 6;
+
+	//                          7    8
+	static final String Parms = "(\\((.*)\\))";
+	static final int    ParmsIndex = 8;
+
+	static final String rest = ".*";
+
+	static final String WhiteSpace = "\\s*";
+
+	static final Pattern DeftypefunPattern
+	= Pattern.compile("^" + ATcmd + WhiteSpace +
+			RtnType + WhiteSpace +
+			FunctionName + WhiteSpace +
+			Parms +
+			rest, Pattern.MULTILINE + Pattern.CASE_INSENSITIVE);
+
+	static final String TPDataType = "\\{[^\\}]*\\}";
+
+
+	//                             3   4
+	static final String TPTypeM = "(\\{([^\\}]*)\\})";
+	static final int    TPTypeMIndex = 4;
+
+	//                             5
+	static final String TPTypeS = "(\\w*)";
+	static final int    TPTypeSIndex = 5;
+
+	//                            2
+	static final String TPType = "(" + TPTypeM + "|" + TPTypeS + ")";
+
+	static final Pattern DeftpPattern
+	= Pattern.compile("^" + ATcmd + WhiteSpace + TPDataType + WhiteSpace + TPType + rest,
+			Pattern.MULTILINE + Pattern.CASE_INSENSITIVE);
+
+	static final Pattern IncludePattern		= Pattern.compile("^@comment ((\\w*/)*\\w*\\.h\\s*)*\\s*$");
+	static final Pattern PindexPattern		= Pattern.compile("^@pindex\\s*\\w*\\s*$");
+	static final Pattern ParmBracketPattern = Pattern.compile("\\((.*)\\)");
+	static final Pattern IndexPattern		= Pattern.compile("@\\w*index\\s+[a-zA-Z0-9_@\\{\\}]*");
+	static final Pattern IndexPattern2		= Pattern.compile("@\\w*index\\{[a-zA-Z0-9_@\\{\\}]*\\}");
+	static final Pattern ExamplePattern		= Pattern.compile("@example");
+	static final Pattern EndExamplePattern  = Pattern.compile("@end\\s+example");
+	static final Pattern EnumeratePattern	= Pattern.compile("@enumerate");
+	static final Pattern EndEnumeratePattern  = Pattern.compile("@end\\s+enumerate");
+	static final Pattern VerbatimPattern	= Pattern.compile("@verbatim");
+	static final Pattern ItemPattern		= Pattern.compile("@item");
+	static final Pattern NoIndentPattern	= Pattern.compile("@noindent");
+	static final Pattern BRPattern			= Pattern.compile("&lt;br&gt;");
+	static final Pattern EOLPattern			= Pattern.compile("&lt;eol&gt;");
+	static final Pattern EndVerbatimPattern = Pattern.compile("@end\\s+verbatim");
+	static final Pattern TableSampItemPattern = Pattern.compile("(@table\\s*@samp.*)@item\\s*([a-zA-Z_0-9+\\-<>/ ]*)<eol>(.*@end\\s*table)", Pattern.DOTALL);
+	static final Pattern TableAsisItemPattern = Pattern.compile("(@table\\s*@asis.*)@item\\s*([a-zA-Z_0-9+\\-,<>/ ]*)<eol>(.*@end\\s*table)", Pattern.DOTALL);
+	static final Pattern TableSampPattern 	= Pattern.compile("@table\\s*@samp", Pattern.MULTILINE);
+	static final Pattern TableAsisPattern	= Pattern.compile("@table\\s*@asis", Pattern.MULTILINE);
+	static final Pattern EndTablePattern 	= Pattern.compile("@end\\s+table");
+	static final Pattern DotsPattern		= Pattern.compile("@dots\\{\\}");
+	static final Pattern ItemizeMinusPattern= Pattern.compile("@itemize\\s+@minus" + "(.*)" + "@end\\s+itemize", Pattern.MULTILINE);
+	static final Pattern ItemizeBulletPattern= Pattern.compile("@itemize\\s+@bullet" + "(.*)" + "@end\\s+itemize", Pattern.MULTILINE);
+	static final Pattern XrefPattern		= Pattern.compile("@xref\\{[^\\}]*\\}", Pattern.MULTILINE);
+	static final Pattern CommandPattern		= Pattern.compile("@command\\{([^\\}]*)\\}");
+	static final Pattern KbdPattern			= Pattern.compile("@kbd\\{([^\\}]*)\\}");
+	static final Pattern RPattern			= Pattern.compile("@r\\{([^\\}]*)\\}");
+	static final Pattern FilePattern		= Pattern.compile("@file\\{([^\\}]*)\\}");
+	static final Pattern VarPattern			= Pattern.compile("@var\\{([^\\}]*)\\}");
+	static final Pattern OVarPattern		= Pattern.compile("@ovar\\{([^\\}]*)\\}");
+	static final Pattern DVarPattern		= Pattern.compile("@dvar\\{([^\\},\\,]*),([^\\}]*)\\}");
+	static final Pattern CodePattern		= Pattern.compile("@code\\{([^\\}]*)\\}");
+	static final Pattern EmphPattern		= Pattern.compile("@emph\\{([^\\}]*)\\}");
+	static final Pattern SampPattern		= Pattern.compile("@samp\\{([^\\}]*)\\}");
+	static final Pattern OptionPattern		= Pattern.compile("@option\\{([^\\}]*)\\}");
+	static final Pattern TagPattern		= Pattern.compile("@\\w*\\{([^\\}]*)\\}");
+	static final Pattern AmpersandPattern	= Pattern.compile("&");
+	static final Pattern LeftAnglePattern	= Pattern.compile("<");
+	static final Pattern RightAnglePattern	= Pattern.compile(">");
+
+	static List IncludeList = new ArrayList();
+
+
+	static class FunctionDef {
+		String ReturnType;
+		String FunctionName;
+		String[] Parameters;
+		Object[] IncludeList;
+	}
+
+	static class TPElement {
+		String Content;
+		String Synopsis;
+	}
+
+	static class TPDef {
+		String TPType;
+		String TPName;
+		String TPSynopsis;
+		TPElement[] TPElements;
+		Object[] IncludeList;
+	}
+
+	private static FunctionDef BuildFunctionDef(Matcher m) {
+		FunctionDef fd = new FunctionDef();
+
+		fd.ReturnType = ((null != m.group(RtnTypeSIndex))
+				? m.group(RtnTypeSIndex)
+						: m.group(RtnTypeMIndex));
+		fd.FunctionName = m.group(FunctionNameIndex);
+
+		if (null != m.group(ParmsIndex)) {
+			String tt = TexinfoUtils.stripProtoTags(m.group(ParmsIndex));
+			String[] parms = tt.split(",\\s");
+			fd.Parameters = parms;
+		}
+
+		if (IncludeList.size() > 0) {
+			fd.IncludeList = IncludeList.toArray();
+			IncludeList.clear();
+		}
+		return fd;
+	}
+
+	private static void HandleDeftp(BufferedWriter os, BufferedReader is, String s) throws IOException {
+		TPDef td = new TPDef();
+		String il;
+		String Synopsis = null;
+		boolean ItemsAccumulating = false;
+		TPElement tpe = new TPElement();
+		List ElementList = new ArrayList();
+
+		Matcher m = DeftpPattern.matcher(s);
+		if (m.matches()) {
+			if (null != m.group(TPTypeMIndex)) {
+				String[] ss = m.group(TPTypeMIndex).split("\\s");
+				switch(ss.length) {
+				case 0:
+					td.TPType = "";
+					td.TPName = "type";
+					break;
+				case 1:
+					td.TPType = "type";
+					td.TPName = ss[0];
+					break;
+				case 2:
+					td.TPType = ss[0];
+					td.TPName = ss[1];
+					break;
+				default:
+					td.TPType = "type";
+				td.TPName = ss[ss.length - 1];
+				break;
+				}
+			}
+			else {
+				td.TPType = "dtype";
+				td.TPName = m.group(TPTypeSIndex);
+			}
+
+			while (null != (il = is.readLine())) {
+				if (il.startsWith("@end deftp")) {
+					WriteString(os, "  <construct id=\"" + td.TPType + "-" + td.TPName
+							+ "\" type=\"" + td.TPType + "\">");
+					WriteString(os, "    <structure>");
+					if (null != td.TPSynopsis) WriteSynopsis(os, td.TPSynopsis, false);
+					if (ElementList.size() > 0) {
+						WriteString(os, "      <elements>");
+						for (int ee = 0; ee < ElementList.size(); ee++) {
+							TPElement ttt = (TPElement)ElementList.get(ee);
+							WriteString(os, "        <element content=\"" + ttt.Content + "\">");
+							if (null != ttt.Synopsis) WriteSynopsis(os, ttt.Synopsis, true);
+							WriteString(os, "        </element>");
+						}
+						WriteString(os, "      </elements>");
+					}
+					WriteString(os, "    </structure>");
+					WriteString(os, "  </construct>");
+					return;
+				}
+				else if (il.startsWith("@item")) {
+					if (ItemsAccumulating) {
+						tpe.Synopsis = Synopsis;
+						ElementList.add(tpe);
+					}
+					else {
+						td.TPSynopsis  = Synopsis;
+						ItemsAccumulating = true;
+					}
+					Synopsis = null;
+					tpe = new TPElement();
+					tpe.Content = TexinfoUtils.transformTags(il.replaceFirst("@item ", ""));
+				}
+				else {
+					if (!il.startsWith("@table")) 
+						Synopsis = ((Synopsis == null) ? "" : Synopsis + " " ) + ((il.length() == 0) ? "<br><br>" : 
+							il + "<eol>");
+				}
+			}
+		}
+	}
+
+	private static FunctionDef HandleFunctionDef(BufferedReader is, String s) throws IOException {
+		FunctionDef fd;
+
+		Matcher m = DeftypefunPattern.matcher(s);
+
+		if (m.matches()) fd = BuildFunctionDef(m);
+		else {						// assume the line got split and retry
+			String il = is.readLine();
+			m = DeftypefunPattern.matcher(s + il);
+			if (m.matches()) fd = BuildFunctionDef(m);
+			else fd = null;
+		}
+
+		return fd;
+	}
+
+	private static void WriteString(BufferedWriter os, String s) throws IOException {
+		//	System.out.println(s);
+		os.write(s+"\n", 0, 1+s.length());
+	}
+
+	private static void CreateHeader(BufferedWriter os) throws IOException {
+		WriteString(os, "<!-- This file automatically generated by an Eclipse utility -->");
+		WriteString(os, "<!DOCTYPE descriptions [");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT descriptions (construct)*>");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT construct (structure|function)*>");
+		WriteString(os, "  <!ATTLIST construct");
+		WriteString(os, "    id ID #REQUIRED");
+		WriteString(os, "    type CDATA #REQUIRED");
+		WriteString(os, "  >");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT structure       (synopsis?, elements?)?>");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT elements     (element*)>");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT element (synopsis*)>");
+		WriteString(os, "  <!ATTLIST element");
+		WriteString(os, "    content CDATA #REQUIRED");
+		WriteString(os, "  >");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT synopsis     (#PCDATA)*>");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT function     (prototype,headers?,synopsis)>");
+		WriteString(os, "  <!ATTLIST function");
+		WriteString(os, "    returntype CDATA #REQUIRED");
+		WriteString(os, "  >");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT prototype    (parameter+)?>");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT parameter (#PCDATA)*>");
+		WriteString(os, "  <!ATTLIST parameter");
+		WriteString(os, "    content CDATA #REQUIRED");
+		WriteString(os, "  >");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT headers      (header+)?>");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT header (#PCDATA)*>");
+		WriteString(os, "  <!ATTLIST header");
+		WriteString(os, "    filename CDATA #REQUIRED");
+		WriteString(os, "  >");
+		WriteString(os, "");
+		WriteString(os, "]>");
+		WriteString(os, "");
+	}
+
+//  // For now we will use an aggregate document license instead of one per
+//  // document.
+//	private static void CreateLicense(BufferedWriter os) throws IOException {
+//		WriteString(os, "<!--");
+//		WriteString(os, "A.1 GNU Free Documentation License");
+//		WriteString(os,"Version 1.2, November 2002");
+//		WriteString(os, "");
+//		WriteString(os, "Copyright &copy; 2000,2001,2002 Free Software Foundation, Inc.");
+//		WriteString(os, "59 Temple Place, Suite 330, Boston, MA  02111-1307, USA");
+//		WriteString(os, "");
+//		WriteString(os, "Everyone is permitted to copy and distribute verbatim copies");
+//		WriteString(os, "of this license document, but changing it is not allowed.");
+//		WriteString(os, "");
+//		WriteString(os, "1. PREAMBLE");
+//		WriteString(os, "");
+//		WriteString(os, "The purpose of this License is to make a manual, textbook, or other");
+//		WriteString(os, "functional and useful document free in the sense of freedom: to");
+//		WriteString(os, "assure everyone the effective freedom to copy and redistribute it,");
+//		WriteString(os, "with or without modifying it, either commercially or noncommercially.");
+//		WriteString(os, "Secondarily, this License preserves for the author and publisher a way");
+//		WriteString(os, "to get credit for their work, while not being considered responsible");
+//		WriteString(os, "for modifications made by others.");
+//		WriteString(os, "");
+//		WriteString(os, "This License is a kind of \"copyleft\", which means that derivative");
+//		WriteString(os, "works of the document must themselves be free in the same sense.  It");
+//		WriteString(os, "complements the GNU General Public License, which is a copyleft");
+//		WriteString(os, "license designed for free software.");
+//		WriteString(os, "");
+//		WriteString(os, "We have designed this License in order to use it for manuals for free");
+//		WriteString(os, "software, because free software needs free documentation: a free");
+//		WriteString(os, "program should come with manuals providing the same freedoms that the");
+//		WriteString(os, "software does.  But this License is not limited to software manuals;");
+//		WriteString(os, "it can be used for any textual work, regardless of subject matter or");
+//		WriteString(os, "whether it is published as a printed book.  We recommend this License");
+//		WriteString(os, "principally for works whose purpose is instruction or reference.");
+//		WriteString(os, "");
+//		WriteString(os, "2. APPLICABILITY AND DEFINITIONS");
+//		WriteString(os, "");
+//		WriteString(os, "This License applies to any manual or other work, in any medium, that");
+//		WriteString(os, "contains a notice placed by the copyright holder saying it can be");
+//		WriteString(os, "distributed under the terms of this License.  Such a notice grants a");
+//		WriteString(os, "world-wide, royalty-free license, unlimited in duration, to use that");
+//		WriteString(os, "work under the conditions stated herein.  The \"Document\", below,");
+//		WriteString(os, "refers to any such manual or work.  Any member of the public is a");
+//		WriteString(os, "licensee, and is addressed as \"you\".  You accept the license if you");
+//		WriteString(os, "copy, modify or distribute the work in a way requiring permission");
+//		WriteString(os, "under copyright law.");
+//		WriteString(os, "");
+//		WriteString(os, "A \"Modified Version\" of the Document means any work containing the");
+//		WriteString(os, "Document or a portion of it, either copied verbatim, or with");
+//		WriteString(os, "modifications and/or translated into another language.");
+//		WriteString(os, "");
+//		WriteString(os, "A \"Secondary Section\" is a named appendix or a front-matter section");
+//		WriteString(os, "of the Document that deals exclusively with the relationship of the");
+//		WriteString(os, "publishers or authors of the Document to the Document's overall");
+//		WriteString(os, "subject (or to related matters) and contains nothing that could fall");
+//		WriteString(os, "directly within that overall subject.  (Thus, if the Document is in");
+//		WriteString(os, "part a textbook of mathematics, a Secondary Section may not explain");
+//		WriteString(os, "any mathematics.)  The relationship could be a matter of historical");
+//		WriteString(os, "connection with the subject or with related matters, or of legal,");
+//		WriteString(os, "commercial, philosophical, ethical or political position regarding");
+//		WriteString(os, "them.");
+//		WriteString(os, "");
+//		WriteString(os, "The \"Invariant Sections\" are certain Secondary Sections whose titles");
+//		WriteString(os, "are designated, as being those of Invariant Sections, in the notice");
+//		WriteString(os, "that says that the Document is released under this License.  If a");
+//		WriteString(os, "section does not fit the above definition of Secondary then it is not");
+//		WriteString(os, "allowed to be designated as Invariant.  The Document may contain zero");
+//		WriteString(os, "Invariant Sections.  If the Document does not identify any Invariant");
+//		WriteString(os, "Sections then there are none.");
+//		WriteString(os, "");
+//		WriteString(os, "The \"Cover Texts\" are certain short passages of text that are listed,");
+//		WriteString(os, "as Front-Cover Texts or Back-Cover Texts, in the notice that says that");
+//		WriteString(os, "the Document is released under this License.  A Front-Cover Text may");
+//		WriteString(os, "be at most 5 words, and a Back-Cover Text may be at most 25 words.");
+//		WriteString(os, "");
+//		WriteString(os, "A \"Transparent\" copy of the Document means a machine-readable copy,");
+//		WriteString(os, "represented in a format whose specification is available to the");
+//		WriteString(os, "general public, that is suitable for revising the document");
+//		WriteString(os, "straightforwardly with generic text editors or (for images composed of");
+//		WriteString(os, "pixels) generic paint programs or (for drawings) some widely available");
+//		WriteString(os, "drawing editor, and that is suitable for input to text formatters or");
+//		WriteString(os, "for automatic translation to a variety of formats suitable for input");
+//		WriteString(os, "to text formatters.  A copy made in an otherwise Transparent file");
+//		WriteString(os, "format whose markup, or absence of markup, has been arranged to thwart");
+//		WriteString(os, "or discourage subsequent modification by readers is not Transparent.");
+//		WriteString(os, "An image format is not Transparent if used for any substantial amount");
+//		WriteString(os, "of text.  A copy that is not \"Transparent\" is called \"Opaque\".");
+//		WriteString(os, "");
+//		WriteString(os, "Examples of suitable formats for Transparent copies include plain");
+//		WriteString(os, "ASCII without markup, Texinfo input format, LaTeX input");
+//		WriteString(os, "format, SGML or XML using a publicly available");
+//		WriteString(os, "DTD, and standard-conforming simple HTML,");
+//		WriteString(os, "PostScript or PDF designed for human modification.  Examples");
+//		WriteString(os, "of transparent image formats include PNG, XCF and");
+//		WriteString(os, "JPG.  Opaque formats include proprietary formats that can be");
+//		WriteString(os, "read and edited only by proprietary word processors, SGML or");
+//		WriteString(os, "XML for which the DTD and/or processing tools are");
+//		WriteString(os, "not generally available, and the machine-generated HTML,");
+//		WriteString(os, "PostScript or PDF produced by some word processors for");
+//		WriteString(os, "output purposes only.");
+//		WriteString(os, "");
+//		WriteString(os, "The \"Title Page\" means, for a printed book, the title page itself,");
+//		WriteString(os, "plus such following pages as are needed to hold, legibly, the material");
+//		WriteString(os, "this License requires to appear in the title page.  For works in");
+//		WriteString(os, "formats which do not have any title page as such, \"Title Page\" means");
+//		WriteString(os, "the text near the most prominent appearance of the work's title,");
+//		WriteString(os, "preceding the beginning of the body of the text.");
+//		WriteString(os, "");
+//		WriteString(os, "A section \"Entitled XYZ\" means a named subunit of the Document whose");
+//		WriteString(os, "title either is precisely XYZ or contains XYZ in parentheses following");
+//		WriteString(os, "text that translates XYZ in another language.  (Here XYZ stands for a");
+//		WriteString(os, "specific section name mentioned below, such as \"Acknowledgements\",");
+//		WriteString(os, "\"Dedications\", \"Endorsements\", or \"History\".)  To \"Preserve the Title\"");
+//		WriteString(os, "of such a section when you modify the Document means that it remains a");
+//		WriteString(os, "section \"Entitled XYZ\" according to this definition.");
+//		WriteString(os, "");
+//		WriteString(os, "The Document may include Warranty Disclaimers next to the notice which");
+//		WriteString(os, "states that this License applies to the Document.  These Warranty");
+//		WriteString(os, "Disclaimers are considered to be included by reference in this");
+//		WriteString(os, "License, but only as regards disclaiming warranties: any other");
+//		WriteString(os, "implication that these Warranty Disclaimers may have is void and has");
+//		WriteString(os, "no effect on the meaning of this License.");
+//		WriteString(os, "");
+//		WriteString(os, "3. VERBATIM COPYING");
+//		WriteString(os, "");
+//		WriteString(os, "You may copy and distribute the Document in any medium, either");
+//		WriteString(os, "commercially or noncommercially, provided that this License, the");
+//		WriteString(os, "copyright notices, and the license notice saying this License applies");
+//		WriteString(os, "to the Document are reproduced in all copies, and that you add no other");
+//		WriteString(os, "conditions whatsoever to those of this License.  You may not use");
+//		WriteString(os, "technical measures to obstruct or control the reading or further");
+//		WriteString(os, "copying of the copies you make or distribute.  However, you may accept");
+//		WriteString(os, "compensation in exchange for copies.  If you distribute a large enough");
+//		WriteString(os, "number of copies you must also follow the conditions in section 3.");
+//		WriteString(os, "");
+//		WriteString(os, "You may also lend copies, under the same conditions stated above, and");
+//		WriteString(os, "you may publicly display copies.");
+//		WriteString(os, "");
+//		WriteString(os, "4. COPYING IN QUANTITY");
+//		WriteString(os, "");
+//		WriteString(os, "If you publish printed copies (or copies in media that commonly have");
+//		WriteString(os, "printed covers) of the Document, numbering more than 100, and the");
+//		WriteString(os, "Document's license notice requires Cover Texts, you must enclose the");
+//		WriteString(os, "copies in covers that carry, clearly and legibly, all these Cover");
+//		WriteString(os, "Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on");
+//		WriteString(os, "the back cover.  Both covers must also clearly and legibly identify");
+//		WriteString(os, "you as the publisher of these copies.  The front cover must present");
+//		WriteString(os, "the full title with all words of the title equally prominent and");
+//		WriteString(os, "visible.  You may add other material on the covers in addition.");
+//		WriteString(os, "Copying with changes limited to the covers, as long as they preserve");
+//		WriteString(os, "the title of the Document and satisfy these conditions, can be treated");
+//		WriteString(os, "as verbatim copying in other respects.");
+//		WriteString(os, "");
+//		WriteString(os, "If the required texts for either cover are too voluminous to fit");
+//		WriteString(os, "legibly, you should put the first ones listed (as many as fit");
+//		WriteString(os, "reasonably) on the actual cover, and continue the rest onto adjacent");
+//		WriteString(os, "pages.");
+//		WriteString(os, "");
+//		WriteString(os, "If you publish or distribute Opaque copies of the Document numbering");
+//		WriteString(os, "more than 100, you must either include a machine-readable Transparent");
+//		WriteString(os, "copy along with each Opaque copy, or state in or with each Opaque copy");
+//		WriteString(os, "a computer-network location from which the general network-using");
+//		WriteString(os, "public has access to download using public-standard network protocols");
+//		WriteString(os, "a complete Transparent copy of the Document, free of added material.");
+//		WriteString(os, "If you use the latter option, you must take reasonably prudent steps,");
+//		WriteString(os, "when you begin distribution of Opaque copies in quantity, to ensure");
+//		WriteString(os, "that this Transparent copy will remain thus accessible at the stated");
+//		WriteString(os, "location until at least one year after the last time you distribute an");
+//		WriteString(os, "Opaque copy (directly or through your agents or retailers) of that");
+//		WriteString(os, "edition to the public.");
+//		WriteString(os, "");
+//		WriteString(os, "It is requested, but not required, that you contact the authors of the");
+//		WriteString(os, "Document well before redistributing any large number of copies, to give");
+//		WriteString(os, "them a chance to provide you with an updated version of the Document.");
+//		WriteString(os, "");
+//		WriteString(os, "5. MODIFICATIONS");
+//		WriteString(os, "");
+//		WriteString(os, "You may copy and distribute a Modified Version of the Document under");
+//		WriteString(os, "the conditions of sections 2 and 3 above, provided that you release");
+//		WriteString(os, "the Modified Version under precisely this License, with the Modified");
+//		WriteString(os, "Version filling the role of the Document, thus licensing distribution");
+//		WriteString(os, "and modification of the Modified Version to whoever possesses a copy");
+//		WriteString(os, "of it.  In addition, you must do these things in the Modified Version:");
+//		WriteString(os, "");
+//		WriteString(os, "   1. Use in the Title Page (and on the covers, if any) a title distinct");
+//		WriteString(os, "      from that of the Document, and from those of previous versions");
+//		WriteString(os, "      (which should, if there were any, be listed in the History section");
+//		WriteString(os, "      of the Document).  You may use the same title as a previous version");
+//		WriteString(os, "      if the original publisher of that version gives permission.");
+//		WriteString(os, "");
+//		WriteString(os, "   2. List on the Title Page, as authors, one or more persons or entities");
+//		WriteString(os, "      responsible for authorship of the modifications in the Modified");
+//		WriteString(os, "      Version, together with at least five of the principal authors of the");
+//		WriteString(os, "      Document (all of its principal authors, if it has fewer than five),");
+//		WriteString(os, "      unless they release you from this requirement.");
+//		WriteString(os, "");
+//		WriteString(os, "   3. State on the Title page the name of the publisher of the");
+//		WriteString(os, "      Modified Version, as the publisher.");
+//		WriteString(os, "");
+//		WriteString(os, "   4. Preserve all the copyright notices of the Document.");
+//		WriteString(os, "");
+//		WriteString(os, "   5. Add an appropriate copyright notice for your modifications");
+//		WriteString(os, "      adjacent to the other copyright notices.");
+//		WriteString(os, "");
+//		WriteString(os, "   6. Include, immediately after the copyright notices, a license notice");
+//		WriteString(os, "      giving the public permission to use the Modified Version under the");
+//		WriteString(os, "      terms of this License, in the form shown in the Addendum below.");
+//		WriteString(os, "");
+//		WriteString(os, "   7. Preserve in that license notice the full lists of Invariant Sections");
+//		WriteString(os, "      and required Cover Texts given in the Document's license notice.");
+//		WriteString(os, "");
+//		WriteString(os, "   8. Include an unaltered copy of this License.");
+//		WriteString(os, "");
+//		WriteString(os, "   9. Preserve the section Entitled \"History\", Preserve its Title, and add");
+//		WriteString(os, "      to it an item stating at least the title, year, new authors, and");
+//		WriteString(os, "      publisher of the Modified Version as given on the Title Page.  If");
+//		WriteString(os, "      there is no section Entitled \"History\" in the Document, create one");
+//		WriteString(os, "      stating the title, year, authors, and publisher of the Document as");
+//		WriteString(os, "      given on its Title Page, then add an item describing the Modified");
+//		WriteString(os, "      Version as stated in the previous sentence.");
+//		WriteString(os, "");
+//		WriteString(os, "  10. Preserve the network location, if any, given in the Document for");
+//		WriteString(os, "      public access to a Transparent copy of the Document, and likewise");
+//		WriteString(os, "      the network locations given in the Document for previous versions");
+//		WriteString(os, "      it was based on.  These may be placed in the \"History\" section.");
+//		WriteString(os, "      You may omit a network location for a work that was published at");
+//		WriteString(os, "      least four years before the Document itself, or if the original");
+//		WriteString(os, "      publisher of the version it refers to gives permission.");
+//		WriteString(os, "");
+//		WriteString(os, "  11. For any section Entitled \"Acknowledgements\" or \"Dedications\", Preserve");
+//		WriteString(os, "      the Title of the section, and preserve in the section all the");
+//		WriteString(os, "      substance and tone of each of the contributor acknowledgements and/or");
+//		WriteString(os, "      dedications given therein.");
+//		WriteString(os, "");
+//		WriteString(os, "  12. Preserve all the Invariant Sections of the Document,");
+//		WriteString(os, "      unaltered in their text and in their titles.  Section numbers");
+//		WriteString(os, "      or the equivalent are not considered part of the section titles.");
+//		WriteString(os, "");
+//		WriteString(os, "  13. Delete any section Entitled \"Endorsements\".  Such a section");
+//		WriteString(os, "      may not be included in the Modified Version.");
+//		WriteString(os, "");
+//		WriteString(os, "  14. Do not retitle any existing section to be Entitled \"Endorsements\" or");
+//		WriteString(os, "      to conflict in title with any Invariant Section.");
+//		WriteString(os, "");
+//		WriteString(os, "  15. Preserve any Warranty Disclaimers.");
+//		WriteString(os, "");
+//		WriteString(os, "");
+//		WriteString(os, "If the Modified Version includes new front-matter sections or");
+//		WriteString(os, "appendices that qualify as Secondary Sections and contain no material");
+//		WriteString(os, "copied from the Document, you may at your option designate some or all");
+//		WriteString(os, "of these sections as invariant.  To do this, add their titles to the");
+//		WriteString(os, "list of Invariant Sections in the Modified Version's license notice.");
+//		WriteString(os, "These titles must be distinct from any other section titles.");
+//		WriteString(os, "");
+//		WriteString(os, "You may add a section Entitled \"Endorsements\", provided it contains");
+//		WriteString(os, "nothing but endorsements of your Modified Version by various");
+//		WriteString(os, "parties - for example, statements of peer review or that the text has");
+//		WriteString(os, "been approved by an organization as the authoritative definition of a");
+//		WriteString(os, "standard.");
+//		WriteString(os, "");
+//		WriteString(os, "You may add a passage of up to five words as a Front-Cover Text, and a");
+//		WriteString(os, "passage of up to 25 words as a Back-Cover Text, to the end of the list");
+//		WriteString(os, "of Cover Texts in the Modified Version.  Only one passage of");
+//		WriteString(os, "Front-Cover Text and one of Back-Cover Text may be added by (or");
+//		WriteString(os, "through arrangements made by) any one entity.  If the Document already");
+//		WriteString(os, "includes a cover text for the same cover, previously added by you or");
+//		WriteString(os, "by arrangement made by the same entity you are acting on behalf of,");
+//		WriteString(os, "you may not add another; but you may replace the old one, on explicit");
+//		WriteString(os, "permission from the previous publisher that added the old one.");
+//		WriteString(os, "");
+//		WriteString(os, "The author(s) and publisher(s) of the Document do not by this License");
+//		WriteString(os, "give permission to use their names for publicity for or to assert or");
+//		WriteString(os, "imply endorsement of any Modified Version.");
+//		WriteString(os, "");
+//		WriteString(os, "6. COMBINING DOCUMENTS");
+//		WriteString(os, "");
+//		WriteString(os, "You may combine the Document with other documents released under this");
+//		WriteString(os, "License, under the terms defined in section 4 above for modified");
+//		WriteString(os, "versions, provided that you include in the combination all of the");
+//		WriteString(os, "Invariant Sections of all of the original documents, unmodified, and");
+//		WriteString(os, "list them all as Invariant Sections of your combined work in its");
+//		WriteString(os, "license notice, and that you preserve all their Warranty Disclaimers.");
+//		WriteString(os, "");
+//		WriteString(os, "The combined work need only contain one copy of this License, and");
+//		WriteString(os, "multiple identical Invariant Sections may be replaced with a single");
+//		WriteString(os, "copy.  If there are multiple Invariant Sections with the same name but");
+//		WriteString(os, "different contents, make the title of each such section unique by");
+//		WriteString(os, "adding at the end of it, in parentheses, the name of the original");
+//		WriteString(os, "author or publisher of that section if known, or else a unique number.");
+//		WriteString(os, "Make the same adjustment to the section titles in the list of");
+//		WriteString(os, "Invariant Sections in the license notice of the combined work.");
+//		WriteString(os, "");
+//		WriteString(os, "In the combination, you must combine any sections Entitled \"History\"");
+//		WriteString(os, "in the various original documents, forming one section Entitled");
+//		WriteString(os, "\"History\"; likewise combine any sections Entitled \"Acknowledgements\",");
+//		WriteString(os, "and any sections Entitled \"Dedications\".  You must delete all");
+//		WriteString(os, "sections Entitled \"Endorsements.\"");
+//		WriteString(os, "");
+//		WriteString(os, "7. COLLECTIONS OF DOCUMENTS");
+//		WriteString(os, "");
+//		WriteString(os, "You may make a collection consisting of the Document and other documents");
+//		WriteString(os, "released under this License, and replace the individual copies of this");
+//		WriteString(os, "License in the various documents with a single copy that is included in");
+//		WriteString(os, "the collection, provided that you follow the rules of this License for");
+//		WriteString(os, "verbatim copying of each of the documents in all other respects.");
+//		WriteString(os, "");
+//		WriteString(os, "You may extract a single document from such a collection, and distribute");
+//		WriteString(os, "it individually under this License, provided you insert a copy of this");
+//		WriteString(os, "License into the extracted document, and follow this License in all");
+//		WriteString(os, "other respects regarding verbatim copying of that document.");
+//		WriteString(os, "");
+//		WriteString(os, "8. AGGREGATION WITH INDEPENDENT WORKS");
+//		WriteString(os, "");
+//		WriteString(os, "A compilation of the Document or its derivatives with other separate");
+//		WriteString(os, "and independent documents or works, in or on a volume of a storage or");
+//		WriteString(os, "distribution medium, is called an \"aggregate\" if the copyright");
+//		WriteString(os, "resulting from the compilation is not used to limit the legal rights");
+//		WriteString(os, "of the compilation's users beyond what the individual works permit.");
+//		WriteString(os, "When the Document is included an aggregate, this License does not");
+//		WriteString(os, "apply to the other works in the aggregate which are not themselves");
+//		WriteString(os, "derivative works of the Document.");
+//		WriteString(os, "");
+//		WriteString(os, "If the Cover Text requirement of section 3 is applicable to these");
+//		WriteString(os, "copies of the Document, then if the Document is less than one half of");
+//		WriteString(os, "the entire aggregate, the Document's Cover Texts may be placed on");
+//		WriteString(os, "covers that bracket the Document within the aggregate, or the");
+//		WriteString(os, "electronic equivalent of covers if the Document is in electronic form.");
+//		WriteString(os, "Otherwise they must appear on printed covers that bracket the whole");
+//		WriteString(os, "aggregate.");
+//		WriteString(os, "");
+//		WriteString(os, "9. TRANSLATION");
+//		WriteString(os, "");
+//		WriteString(os, "Translation is considered a kind of modification, so you may");
+//		WriteString(os, "distribute translations of the Document under the terms of section 4.");
+//		WriteString(os, "Replacing Invariant Sections with translations requires special");
+//		WriteString(os, "permission from their copyright holders, but you may include");
+//		WriteString(os, "translations of some or all Invariant Sections in addition to the");
+//		WriteString(os, "original versions of these Invariant Sections.  You may include a");
+//		WriteString(os, "translation of this License, and all the license notices in the");
+//		WriteString(os, "Document, and any Warrany Disclaimers, provided that you also include");
+//		WriteString(os, "the original English version of this License and the original versions");
+//		WriteString(os, "of those notices and disclaimers.  In case of a disagreement between");
+//		WriteString(os, "the translation and the original version of this License or a notice");
+//		WriteString(os, "or disclaimer, the original version will prevail.");
+//		WriteString(os, "");
+//		WriteString(os, "If a section in the Document is Entitled \"Acknowledgements\",");
+//		WriteString(os, "\"Dedications\", or \"History\", the requirement (section 4) to Preserve");
+//		WriteString(os, "its Title (section 1) will typically require changing the actual");
+//		WriteString(os, "title.");
+//		WriteString(os, "");
+//		WriteString(os, "10. TERMINATION");
+//		WriteString(os, "");
+//		WriteString(os, "You may not copy, modify, sublicense, or distribute the Document except");
+//		WriteString(os, "as expressly provided for under this License.  Any other attempt to");
+//		WriteString(os, "copy, modify, sublicense or distribute the Document is void, and will");
+//		WriteString(os, "automatically terminate your rights under this License.  However,");
+//		WriteString(os, "parties who have received copies, or rights, from you under this");
+//		WriteString(os, "License will not have their licenses terminated so long as such");
+//		WriteString(os, "parties remain in full compliance.");
+//		WriteString(os, "");
+//		WriteString(os, "11. FUTURE REVISIONS OF THIS LICENSE");
+//		WriteString(os, "");
+//		WriteString(os, "The Free Software Foundation may publish new, revised versions");
+//		WriteString(os, "of the GNU Free Documentation License from time to time.  Such new");
+//		WriteString(os, "versions will be similar in spirit to the present version, but may");
+//		WriteString(os, "differ in detail to address new problems or concerns.  See");
+//		WriteString(os, "http://www.gnu.org/copyleft/.");
+//		WriteString(os, "");
+//		WriteString(os, "Each version of the License is given a distinguishing version number.");
+//		WriteString(os, "If the Document specifies that a particular numbered version of this");
+//		WriteString(os, "License \"or any later version\" applies to it, you have the option of");
+//		WriteString(os, "following the terms and conditions either of that specified version or");
+//		WriteString(os, "of any later version that has been published (not as a draft) by the");
+//		WriteString(os, "Free Software Foundation.  If the Document does not specify a version");
+//		WriteString(os, "number of this License, you may choose any version ever published (not");
+//		WriteString(os, "as a draft) by the Free Software Foundation.");
+//		WriteString(os, "-->");
+//	}
+
+	private static void CreateTrailer(BufferedWriter os) throws IOException {
+		WriteString(os, "</descriptions>");
+	}
+
+	private static void WriteSynopsis(BufferedWriter os, String Synopsis, boolean indent)  throws IOException {
+		String ss = TexinfoUtils.transformTags(Synopsis);
+		String[] tt = ss.split("<eol>");
+		String aa = "";
+		String spaces = indent ? "            " : "        ";
+		WriteString(os, spaces + "<synopsis>");
+		if (null != Synopsis) {
+			for (int pp = 0; pp < tt.length; pp++) {
+				WriteString(os, spaces + tt[pp]);
+//				if (tt[pp].equals("<br>")) {
+//					WriteString(os, spaces + aa + "\n");
+//					aa = "";
+//				}
+//				else {
+//					if ((aa.length() + tt[pp].length()) > 64) {
+//						WriteString(os, spaces + aa);
+//						aa = "";
+//					}
+//					aa = aa + " " + tt[pp];
+//				}
+			}
+		}
+		if (aa.length() > 0) WriteString(os, "        " + aa);
+		WriteString(os, spaces + "</synopsis>");
+	}
+
+	private static String HandleInclude (String srcdir, String line, String Synopsis) {
+		Pattern p = Pattern.compile("@include\\s+(.*?)\\.texi");
+		Matcher mm = p.matcher(line);
+		if (mm.find()) {
+			String il;
+			try {
+				String fileName = (srcdir.endsWith("/") ? srcdir : srcdir + "/") + mm.replaceAll("examples/$1");
+				BufferedReader is = new BufferedReader(new FileReader(fileName));
+				while (null != (il = is.readLine())) {
+					// C Help does not ignore "<" or ">" inside a <pre> or <samp> tag
+					// so we have to prepare for two levels of indirection.  The
+					// first is for xml to interpret and the second is for the
+					// C Help processor to interpret.  So, we put &lt; and &gt; which
+					// will be transformed into &amp;lt; by the tag transformer.
+					Pattern p1 = Pattern.compile("<");
+					Pattern p2 = Pattern.compile(">");
+					Matcher mm1 = p1.matcher(il);
+					il = mm1.replaceAll("&lt;");
+					Matcher mm2 = p2.matcher(il);
+					il = mm2.replaceAll("&gt;");
+					Synopsis = ((Synopsis == null) ? "" : Synopsis + " " ) + ((il.length() == 0) ? "<br><br>" : 
+						il + "<eol>");
+				}
+			} catch (IOException e) {
+				System.out.println("IOException reading example file");
+			}
+		}
+		return Synopsis;
+	}
+	private static void HandleDeftypefun(BufferedWriter os, BufferedReader is, String s, String srcdir) throws IOException {
+		String il;
+		FunctionDef fd;
+		List FDefs = new ArrayList();
+		String Synopsis = null;
+
+		if (null != (fd = HandleFunctionDef(is, s))) FDefs.add(fd);
+
+		while (null != (il = is.readLine())) {
+			Matcher mm = IncludePattern.matcher(il);
+			if (il.startsWith("@deftypefunx")) {
+				if (null != (fd = HandleFunctionDef(is, il))) FDefs.add(fd);
+			}
+			else if (mm.matches()) {
+				if (!IncludeList.contains(mm.group(1)))
+					IncludeList.add(mm.group(1));
+			}
+			else if (il.startsWith("@comment") ||
+					il.startsWith("@c ") ||
+					il.startsWith("@pindex")) {	// ignore
+			}
+			else if (il.startsWith("@include") && fd != null) {
+				Synopsis = HandleInclude(srcdir, il, Synopsis);
+			}
+			else if (il.startsWith("@end deftypefun")) {
+				for (int kk = 0; kk < FDefs.size(); kk++) {
+					fd = (FunctionDef)FDefs.get(kk);
+
+					WriteString(os, "  <construct id=\"function-" + fd.FunctionName + "\" type=\"function\">");
+
+					WriteString(os, "    <function returntype=\"" + fd.ReturnType + "\">");
+
+					WriteString(os, "      <prototype>");
+					String[] parms = fd.Parameters;
+					for (int i = 0; i < parms.length; i++) {
+						String parm = TexinfoUtils.stripProtoTags(parms[i]);
+						WriteString(os, "        <parameter content=\"" + parm + "\"/>");
+					}
+					WriteString(os, "      </prototype>");
+
+					if (fd.IncludeList != null) {
+						WriteString(os, "      <headers>");
+						Object[] incs = fd.IncludeList;
+						for (int j = 0; j < incs.length; j++) {
+							String inc = (String)incs[j];
+							WriteString(os, "        <header filename = \"" + inc + "\"/>");
+						}
+						WriteString(os, "      </headers>");
+					}
+
+					if (null != Synopsis) WriteSynopsis(os, Synopsis, false);
+
+					WriteString(os, "    </function>");
+					WriteString(os, "  </construct>");
+				}
+				return;
+			}
+			else {
+				Synopsis = ((Synopsis == null) ? "" : Synopsis + " " ) + ((il.length() == 0) ? "<br><br>" : 
+					il + "<eol>");
+			}
+		}
+		FDefs.clear();
+
+	}
+
+	private static class OnlyTexi implements FilenameFilter {
+		public boolean accept(File dir, String s) {
+			return (s.endsWith(".texi")) ? true : false;
+		}
+	}
+
+	public static void BuildXMLFromTexinfo(String srcdir, String dstdir) {
+		try {
+			BufferedWriter os = new BufferedWriter(new FileWriter(dstdir));
+
+			CreateHeader(os);
+//			CreateLicense(os);
+
+			WriteString(os, "<descriptions>");
+
+			try {
+				String[] dir = new java.io.File(srcdir).list(new OnlyTexi());
+				for (int i = 0; i < dir.length; i++) {
+					String qFile = srcdir.endsWith("/")
+					? srcdir + dir[i]
+					               : srcdir + "/" + dir[i];
+
+					try {
+						BufferedReader is = new BufferedReader(new FileReader(qFile));
+						String il;
+
+						while (null != (il = is.readLine())) {
+							Matcher mm = IncludePattern.matcher(il);
+							if (il.startsWith("@deftypefun")) {	// handle @deftypefun[x]
+								HandleDeftypefun(os, is, il, srcdir);
+							}
+							else if (il.startsWith("@deftp")) {	// handle @deftp
+								HandleDeftp(os, is, il);
+							}
+							else if (mm.matches()) {		// handle @comment <include_file>
+								if (!IncludeList.contains(mm.group(1)))
+									IncludeList.add(mm.group(1));
+							}
+							else if (il.startsWith("@end deftypefn"))
+								// Handle accumulated header file comments that are in
+								// constructs we aren't parsing.
+								IncludeList.clear();
+						}
+						is.close();
+					}
+					catch (IOException e) {
+						System.out.println("Input File IOException: " + e);
+						return;
+					}
+				}
+			}
+			catch (NullPointerException e) {
+				System.out.println("NullPointerException: " + e);
+				return;
+			}
+
+			CreateTrailer(os);
+
+			os.close();
+		}
+		catch (IOException e) {
+			System.out.println("Output File IOException: " + e);
+			return;
+		}
+	}
+
+	public static void main(String[] args) {
+		BuildXMLFromTexinfo(args[0], args[1]);
+	}
+
+}
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseNewlibTexinfo.java b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseNewlibTexinfo.java
new file mode 100644
index 0000000..eecce64
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseNewlibTexinfo.java
@@ -0,0 +1,564 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.libhover.texinfoparsers;
+import java.io.*;
+import java.util.regex.*;
+import java.util.*;
+
+//This file contains a texinfo parser that can be
+//run to create the Autotools glibc.xml file.
+//Usage is as follows:
+//1. compile this file using javac
+//2. run this file using java, passing the
+//arguments: ${glibc_source_path}/manual glibc.xml
+
+public class ParseNewlibTexinfo {
+	static final boolean DEBUG = false;
+
+	//                              1, 2, 3
+	static final String RtnType = "(\\w+\\s+(\\w+\\s+)?(\\w+\\s+)?\\**)";
+	static final int    RtnTypeSIndex = 1;
+
+	//                              4
+	static final String FunctionName = "(\\w+)\\s*\\(";
+	static final int    FunctionNameIndex = 4;
+
+	//                              5 and 6
+	static final String Parms = "((.*)\\))";
+	static final int    ParmsIndex = 6;
+
+	static final String rest = ".*";
+
+	static final String WhiteSpace = "\\s*";
+
+	static final Pattern DeftypefunPattern
+	= Pattern.compile("^" + WhiteSpace +
+			RtnType + WhiteSpace +
+			FunctionName + WhiteSpace +
+			Parms +
+			rest, Pattern.MULTILINE + Pattern.CASE_INSENSITIVE);
+	
+	//                              1, 2, 3
+	static final String RtnType2 = "(\\w*\\s*(\\w*\\*?\\s+)?(\\w*\\*?\\s+)?\\**\\s*)\\(\\*";
+	static final int    RtnType2Index = 1;
+
+	//                              4
+	static final String FunctionName2 = "(\\w+)\\s*\\(";
+	static final int    FunctionName2Index = 4;
+
+	//                              5 and 6
+	static final String Parms2 = "((.*)\\)\\)\\s*)";
+	static final int    Parms2Index = 6;
+	
+	//								7
+	static final String RtnTypeParms = "(\\(.*\\))";
+	static final int	RtnTypeParmsIndex = 7;
+
+	static final Pattern DeftypefunPattern2
+	= Pattern.compile("^" + WhiteSpace +
+			RtnType2 + WhiteSpace +
+			FunctionName2 + WhiteSpace +
+			Parms2 + RtnTypeParms +
+			rest, Pattern.MULTILINE + Pattern.CASE_INSENSITIVE);
+
+	// For va_arg, the prototype is @var{type} so we create a third type of function definition
+	// and we make it so the return type ends up taking as many groups as the normal RtnType so
+	// the BuildFunctionDef routine can be used without modification.
+	//                              1, 2, 3
+	static final String RtnTypeVar = "@var\\{(\\w+)(\\})(\\s)";
+
+	static final Pattern DeftypefunPattern3
+	= Pattern.compile("^" + WhiteSpace +
+			RtnTypeVar + WhiteSpace +
+			FunctionName + WhiteSpace +
+			Parms +
+			rest, Pattern.MULTILINE + Pattern.CASE_INSENSITIVE);
+
+	static final Pattern IncludePattern		= Pattern.compile("^#include\\s*<((\\w*/)*\\w*\\.h)>\\s*$");
+	static final Pattern PindexPattern		= Pattern.compile("^@pindex\\s*\\w*\\s*$");
+	static final Pattern FindexPattern		= Pattern.compile("^@findex\\s*(\\w*)\\s*$");
+	static final Pattern SynopsisPattern	= Pattern.compile("^\\s*@strong\\{Synopsis\\}\\s*");
+	static final Pattern ParmBracketPattern = Pattern.compile("\\((.*)\\)");
+	static final Pattern IndexPattern		= Pattern.compile("@\\w*index\\s+[a-zA-Z0-9_@\\{\\}]*");
+	static final Pattern IndexPattern2		= Pattern.compile("@\\w*index\\{[a-zA-Z0-9_@\\{\\}]*\\}");
+	static final Pattern ExamplePattern		= Pattern.compile("@example");
+	static final Pattern EndExamplePattern  = Pattern.compile("@end\\s+example");
+	static final Pattern EnumeratePattern	= Pattern.compile("@enumerate");
+	static final Pattern EndEnumeratePattern  = Pattern.compile("@end\\s+enumerate");
+	static final Pattern VerbatimPattern	= Pattern.compile("@verbatim");
+	static final Pattern ItemPattern		= Pattern.compile("@item");
+	static final Pattern NoIndentPattern	= Pattern.compile("@noindent");
+	static final Pattern BRPattern			= Pattern.compile("&lt;br&gt;");
+	static final Pattern EOLPattern			= Pattern.compile("&lt;eol&gt;");
+	static final Pattern EndVerbatimPattern = Pattern.compile("@end\\s+verbatim");
+	static final Pattern TableSampItemPattern = Pattern.compile("(@table\\s*@samp.*)@item\\s*([a-zA-Z_0-9+\\-<>/ ]*)<eol>(.*@end\\s*table)", Pattern.DOTALL);
+	static final Pattern TableAsisItemPattern = Pattern.compile("(@table\\s*@asis.*)@item\\s*([a-zA-Z_0-9+\\-,<>/ ]*)<eol>(.*@end\\s*table)", Pattern.DOTALL);
+	static final Pattern TableSampPattern 	= Pattern.compile("@table\\s*@samp", Pattern.MULTILINE);
+	static final Pattern TableAsisPattern	= Pattern.compile("@table\\s*@asis", Pattern.MULTILINE);
+	static final Pattern EndTablePattern 	= Pattern.compile("@end\\s+table");
+	static final Pattern DotsPattern		= Pattern.compile("@dots\\{\\}");
+	static final Pattern ItemizeMinusPattern= Pattern.compile("@itemize\\s+@minus" + "(.*)" + "@end\\s+itemize", Pattern.MULTILINE);
+	static final Pattern ItemizeBulletPattern= Pattern.compile("@itemize\\s+@bullet" + "(.*)" + "@end\\s+itemize", Pattern.MULTILINE);
+	static final Pattern XrefPattern		= Pattern.compile("@xref\\{[^\\}]*\\}", Pattern.MULTILINE);
+	static final Pattern CommandPattern		= Pattern.compile("@command\\{([^\\}]*)\\}");
+	static final Pattern KbdPattern			= Pattern.compile("@kbd\\{([^\\}]*)\\}");
+	static final Pattern RPattern			= Pattern.compile("@r\\{([^\\}]*)\\}");
+	static final Pattern FilePattern		= Pattern.compile("@file\\{([^\\}]*)\\}");
+	static final Pattern VarPattern			= Pattern.compile("@var\\{([^\\}]*)\\}");
+	static final Pattern OVarPattern		= Pattern.compile("@ovar\\{([^\\}]*)\\}");
+	static final Pattern DVarPattern		= Pattern.compile("@dvar\\{([^\\},\\,]*),([^\\}]*)\\}");
+	static final Pattern CodePattern		= Pattern.compile("@code\\{([^\\}]*)\\}");
+	static final Pattern EmphPattern		= Pattern.compile("@emph\\{([^\\}]*)\\}");
+	static final Pattern SampPattern		= Pattern.compile("@samp\\{([^\\}]*)\\}");
+	static final Pattern OptionPattern		= Pattern.compile("@option\\{([^\\}]*)\\}");
+	static final Pattern TagPattern		= Pattern.compile("@\\w*\\{([^\\}]*)\\}");
+	static final Pattern AmpersandPattern	= Pattern.compile("&");
+	static final Pattern LeftAnglePattern	= Pattern.compile("<");
+	static final Pattern RightAnglePattern	= Pattern.compile(">");
+
+	static List IncludeList = new ArrayList();
+	static Stack readers = new Stack();
+
+	static class FunctionDef {
+		String ReturnType;
+		String FunctionName;
+		String[] Parameters;
+		Object[] IncludeList;
+	}
+
+	static class TPElement {
+		String Content;
+		String Synopsis;
+	}
+
+	static class TPDef {
+		String TPType;
+		String TPName;
+		String TPSynopsis;
+		TPElement[] TPElements;
+		Object[] IncludeList;
+	}
+
+	private static FunctionDef FindFunctionDef(String name, List FDefs) {
+		for (Iterator iterator = FDefs.iterator(); iterator.hasNext();) {
+			FunctionDef k = (FunctionDef) iterator.next();
+			if (k.FunctionName.equals(name))
+				return k;
+		}
+		return null;
+	}
+	
+	private static FunctionDef BuildFunctionDef(Matcher m, FunctionDef fd) {
+		fd.ReturnType = m.group(RtnTypeSIndex);
+		fd.FunctionName = m.group(FunctionNameIndex);
+
+		if (null != m.group(ParmsIndex)) {
+			String tt = TexinfoUtils.stripProtoTags(m.group(ParmsIndex));
+			String[] parms = tt.split(",\\s");
+			fd.Parameters = parms;
+		}
+
+		if (IncludeList.size() > 0) {
+			fd.IncludeList = IncludeList.toArray();
+		}
+		return fd;
+	}
+
+	private static FunctionDef BuildFunctionDef2(Matcher m, FunctionDef fd) {
+		fd.ReturnType = m.group(RtnType2Index) + "(*)" + m.group(RtnTypeParmsIndex);
+		fd.FunctionName = m.group(FunctionName2Index);
+
+		if (null != m.group(Parms2Index)) {
+			String tt = TexinfoUtils.stripProtoTags(m.group(Parms2Index));
+			String[] parms = tt.split(",\\s");
+			fd.Parameters = parms;
+		}
+
+		if (IncludeList.size() > 0) {
+			fd.IncludeList = IncludeList.toArray();
+		}
+		return fd;
+	}
+
+	private static void HandleFunctionDefs(BufferedReader is, List FDefs) throws IOException {
+		FunctionDef fd;
+		String il = null;
+		boolean preRead = false;
+
+		while (preRead || (il = is.readLine()) != null) {
+			preRead = false;
+			if (il.startsWith("@end example"))
+				return;
+
+			Matcher m = DeftypefunPattern.matcher(il);
+			Matcher m2 = DeftypefunPattern2.matcher(il);
+			Matcher m3 = DeftypefunPattern3.matcher(il);
+			Matcher mm = IncludePattern.matcher(il);
+
+			if (mm.matches()) {
+				if (!IncludeList.contains(mm.group(1)))
+					IncludeList.add(mm.group(1));
+			}
+			else if (m.matches()) {
+				fd = FindFunctionDef(m.group(FunctionNameIndex), FDefs);
+				if (fd != null)
+					BuildFunctionDef(m, fd);
+				else
+					System.out.println("Missing findex for " + m.group(FunctionNameIndex));
+			}
+			else if (m2.matches()) {
+				fd = FindFunctionDef(m2.group(FunctionName2Index), FDefs);
+				if (fd != null)
+					BuildFunctionDef2(m2, fd);
+				else
+					System.out.println("Missing findex for " + m2.group(FunctionName2Index));
+			}
+			else if (m3.matches()) {
+				fd = FindFunctionDef(m3.group(FunctionNameIndex), FDefs);
+				if (fd != null)
+					BuildFunctionDef(m3, fd);
+				else
+					System.out.println("Missing findex for " + m3.group(FunctionName2Index));
+			}
+			else if (il.trim().length() > 0) {
+				il = il.trim();
+				while (il.endsWith(",")) {  // assume prototype extends more than one line
+					preRead = true;
+					String il2 = is.readLine().trim();
+					if (il2 != null && il2.startsWith("@")) { // something wrong, just look at new line fetched
+						il = il2;
+						continue;
+					}
+					il = il + il2; // concatenate
+				}
+			}
+		}
+	}
+
+	private static void WriteString(BufferedWriter os, String s) throws IOException {
+		//	System.out.println(s);
+		os.write(s+"\n", 0, 1+s.length());
+	}
+
+	private static void CreateHeader(BufferedWriter os) throws IOException {
+		WriteString(os, "<!-- This file automatically generated by an Eclipse utility -->");
+		WriteString(os, "<!DOCTYPE descriptions [");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT descriptions (construct)*>");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT construct (structure|function|synopsis)*>");
+		WriteString(os, "  <!ATTLIST construct");
+		WriteString(os, "    id ID #REQUIRED");
+		WriteString(os, "    type CDATA #REQUIRED");
+		WriteString(os, "  >");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT structure       (synopsis?, elements?)?>");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT elements     (element*)>");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT element (synopsis*)>");
+		WriteString(os, "  <!ATTLIST element");
+		WriteString(os, "    content CDATA #REQUIRED");
+		WriteString(os, "  >");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT synopsis     (#PCDATA)*>");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT function     (prototype,headers?,groupsynopsis?,synopsis)>");
+		WriteString(os, "  <!ATTLIST function");
+		WriteString(os, "    returntype CDATA #REQUIRED");
+		WriteString(os, "  >");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT prototype    (parameter+)?>");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT parameter (#PCDATA)*>");
+		WriteString(os, "  <!ATTLIST parameter");
+		WriteString(os, "    content CDATA #REQUIRED");
+		WriteString(os, "  >");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT headers      (header+)?>");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT header (#PCDATA)*>");
+		WriteString(os, "  <!ATTLIST header");
+		WriteString(os, "    filename CDATA #REQUIRED");
+		WriteString(os, "  >");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT groupsynopsis (#PCDATA)*>");
+		WriteString(os, "  <!ATTLIST groupsynopsis");
+		WriteString(os, "    id CDATA #REQUIRED");
+		WriteString(os, "  >");
+		WriteString(os, "");
+		WriteString(os, "]>");
+		WriteString(os, "");
+	}
+
+	private static void CreateTrailer(BufferedWriter os) throws IOException {
+		WriteString(os, "</descriptions>");
+	}
+
+	private static void WriteDescription(BufferedWriter os, String Synopsis, boolean indent)  throws IOException {
+		String ss = TexinfoUtils.transformTags(Synopsis);
+		String[] tt = ss.split("<eol>");
+		String aa = "";
+		String spaces = indent ? "            " : "        ";
+		WriteString(os, spaces + "<synopsis>");
+		if (null != Synopsis) {
+			for (int pp = 0; pp < tt.length; pp++) {
+				WriteString(os, spaces + tt[pp]);
+//				if (tt[pp].equals("<br>")) {
+//					WriteString(os, spaces + aa + "\n");
+//					aa = "";
+//				}
+//				else {
+//					if ((aa.length() + tt[pp].length()) > 64) {
+//						WriteString(os, spaces + aa);
+//						aa = "";
+//					}
+//					aa = aa + " " + tt[pp];
+//				}
+			}
+		}
+		if (aa.length() > 0) WriteString(os, "        " + aa);
+		WriteString(os, spaces + "</synopsis>");
+	}
+
+	private static BufferedReader HandleInclude (BufferedReader is, String srcdir, String line) {
+		Pattern p = Pattern.compile("@include\\s+(.*?)");
+		Matcher mm = p.matcher(line.trim());
+		BufferedReader is2 = null;
+		if (mm.find()) {
+			String fileName = (srcdir.endsWith("/") ? srcdir : srcdir + "/") + mm.replaceAll("$1");
+			try {
+				is2 = new BufferedReader(new FileReader(fileName));
+				readers.push(is);
+			} catch (FileNotFoundException e) {
+				System.out.println("include " + fileName + " not found");
+				// do nothing and return null
+			}
+		}
+		return is2 == null ? is : is2;
+	}
+	
+	private static String HandleDescription(BufferedReader is) throws IOException {
+		String Description = null;
+		String il;
+		
+		while (null != (il = is.readLine())) {
+			if (il.startsWith("@page") ||
+					il.startsWith("@section") ||
+					il.startsWith("@node"))
+				break;
+			Description = ((Description == null) ? "" : Description + " " ) + ((il.length() == 0) ? "<br><br>" : 
+				il + "<eol>");
+		}
+		
+		return Description;
+	}
+	
+	private static void HandleFunction(BufferedWriter os, BufferedReader is, String s, String builddir) throws IOException {
+		String il;
+		FunctionDef fd;
+		List FDefs = new ArrayList();
+		String Description = null;
+		boolean synopsisMarker = false;
+		
+		IncludeList.clear();
+        Matcher mmf = FindexPattern.matcher(s);
+		fd = new FunctionDef();
+		if (mmf.matches())
+			fd.FunctionName = mmf.group(1);
+		else
+			return;
+		FDefs.add(fd);
+
+		while (null != (il = is.readLine())) {
+			Matcher syn = SynopsisPattern.matcher(il);
+			if (il.startsWith("@findex")) {
+				synopsisMarker = false;
+				Matcher mm2 = FindexPattern.matcher(il);
+				FunctionDef fd2 = new FunctionDef();
+				if (mm2.matches()) {
+					fd2.FunctionName = mm2.group(1);
+					FDefs.add(fd2);
+				}
+			}
+			else if (il.startsWith("@example") && synopsisMarker) {
+				HandleFunctionDefs(is, FDefs);
+				synopsisMarker = false;
+			}
+			else if (il.startsWith("@include") && fd != null) {
+				is = HandleInclude(is, builddir, il);
+			}
+			else if (syn.matches()) {
+				synopsisMarker = true;
+			}
+			else if (il.startsWith("@strong{Description}")) {
+				synopsisMarker = false;
+				Description = HandleDescription(is);
+				break; // we are done after description has been fetched
+			}
+			// otherwise ignore line
+		}
+		
+		String name = ((FunctionDef)FDefs.get(0)).FunctionName;
+		
+        if (FDefs.size() > 1) {
+			for (int kk = 0; kk < FDefs.size(); kk++) {
+				fd = (FunctionDef)FDefs.get(kk);
+
+				WriteString(os, "  <construct id=\"function-" + fd.FunctionName + "\" type=\"function\">");
+
+				WriteString(os, "    <function returntype=\"" + fd.ReturnType + "\">");
+
+				WriteString(os, "      <prototype>");
+				String[] parms = fd.Parameters;
+				if (parms == null)
+					System.out.println("null parms for findex " + fd.FunctionName);
+				else {
+					for (int i = 0; i < parms.length; i++) {
+						String parm = TexinfoUtils.stripProtoTags(parms[i]);
+						WriteString(os, "        <parameter content=\"" + parm + "\"/>");
+					}
+				}
+				WriteString(os, "      </prototype>");
+
+				if (fd.IncludeList != null) {
+					WriteString(os, "      <headers>");
+					Object[] incs = fd.IncludeList;
+					for (int j = 0; j < incs.length; j++) {
+						String inc = (String)incs[j];
+						WriteString(os, "        <header filename = \"" + inc + "\"/>");
+					}
+					WriteString(os, "      </headers>");
+				}
+
+				if (null != Description)
+					WriteString(os, "      <groupsynopsis id=\"group-" + name + "\"/>");
+
+
+				WriteString(os, "    </function>");
+				WriteString(os, "  </construct>");
+			}
+				
+			if (null != Description) {
+				WriteString(os, "  <construct id=\"group-" + name + "\" type=\"groupsynopsis\">");
+				WriteDescription(os, Description, false);
+				WriteString(os, "  </construct>");
+			}
+		}
+        else {
+        	fd = (FunctionDef)FDefs.get(0);
+
+        	WriteString(os, "  <construct id=\"function-" + fd.FunctionName + "\" type=\"function\">");
+
+        	WriteString(os, "    <function returntype=\"" + fd.ReturnType + "\">");
+
+        	WriteString(os, "      <prototype>");
+        	String[] parms = fd.Parameters;
+        	if (parms == null)
+        		System.out.println("null parms for findex " + fd.FunctionName);
+        	else {
+        		for (int i = 0; i < parms.length; i++) {
+        			String parm = TexinfoUtils.stripProtoTags(parms[i]);
+        			WriteString(os, "        <parameter content=\"" + parm + "\"/>");
+        		}
+        	}
+        	WriteString(os, "      </prototype>");
+
+        	if (fd.IncludeList != null) {
+        		WriteString(os, "      <headers>");
+        		Object[] incs = fd.IncludeList;
+        		for (int j = 0; j < incs.length; j++) {
+        			String inc = (String)incs[j];
+        			WriteString(os, "        <header filename = \"" + inc + "\"/>");
+        		}
+        		WriteString(os, "      </headers>");
+        	}
+
+        	if (null != Description) WriteDescription(os, Description, false);
+
+        	WriteString(os, "    </function>");
+        	WriteString(os, "  </construct>");
+		}
+		FDefs.clear();
+	}
+
+	public static void BuildXMLFromTexinfo2(String srcdir, String builddir, BufferedWriter os, String lib) {
+		try {
+			srcdir = srcdir.endsWith("/") ? srcdir + lib : srcdir + "/" + lib;
+			builddir = builddir.endsWith("/") ? builddir + lib : builddir + "/" + lib;
+			String qFile = srcdir + "/" + lib + ".texinfo";
+
+			try {
+				BufferedReader is = new BufferedReader(new FileReader(qFile));
+				String il;
+				boolean ignore = false;
+
+				while (is != null) {
+					while (null != (il = is.readLine())) {
+						if (!ignore && il.startsWith("@findex")) {
+							HandleFunction(os, is, il, builddir);
+						}
+						else if (!ignore && il.startsWith("@include")) {
+							is = HandleInclude(is, builddir, il);
+						}
+						else if (il.startsWith("@ignore")) {
+							ignore = true;
+						}
+						else if (il.startsWith("@end ignore"))
+							ignore = false;
+					}
+					is.close();
+					is = (BufferedReader)readers.pop();
+				}
+			}
+			catch (IOException e) {
+				System.out.println("Input File IOException: " + e);
+				return;
+			}
+			catch (EmptyStackException f) {
+				// ok, we expect to get here
+			}
+		}
+		catch (NullPointerException e) {
+			e.printStackTrace();
+			System.out.println("NullPointerException: " + e);
+			return;
+		}
+
+	}
+
+	public static void BuildXMLFromTexinfo(String srcdir, String builddir, String dstdir) {
+		try {
+			BufferedWriter os = new BufferedWriter(new FileWriter(dstdir));
+
+			CreateHeader(os);
+//			CreateLicense(os);
+
+			WriteString(os, "<descriptions>");
+			BuildXMLFromTexinfo2(srcdir, builddir, os, "libc");
+			BuildXMLFromTexinfo2(srcdir, builddir, os, "libm");
+
+
+			CreateTrailer(os);
+
+			os.close();
+		}
+		catch (IOException e) {
+			System.out.println("Output File IOException: " + e);
+			return;
+		}
+	}
+
+	public static void main(String[] args) {
+		BuildXMLFromTexinfo(args[0], args[1], args[2]);
+	}
+
+}
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/TexinfoUtils.java b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/TexinfoUtils.java
new file mode 100644
index 0000000..ceb3d91
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/TexinfoUtils.java
@@ -0,0 +1,733 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.libhover.texinfoparsers;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class TexinfoUtils {
+	
+	static final Pattern ParmBracketPattern = Pattern.compile("\\((.*?)\\)");
+	static final Pattern IndexPattern		= Pattern.compile("@\\w*index\\s+[a-zA-Z0-9_@\\{\\}]*");
+	static final Pattern IndexPattern2		= Pattern.compile("@\\w*index\\{[a-zA-Z0-9_@\\{\\}]*\\}");
+	static final Pattern ExampleItem		= Pattern.compile("(@example)((.*?<br><eol>)*+.*?)(<eol>.*@end\\s+example)");
+	static final Pattern ExamplePattern		= Pattern.compile("@example");
+	static final Pattern EndExamplePattern  = Pattern.compile("@end\\s+example");
+	static final Pattern SmallExampleItem	= Pattern.compile("(@smallexample)((.*?<br><eol>)*+.*?)(<eol>.*@end\\s+smallexample)");
+	static final Pattern SmallExamplePattern	 = Pattern.compile("@smallexample");
+	static final Pattern StrongPattern		= Pattern.compile("@strong\\{(\\w*)\\}(@\\*)?");
+	static final Pattern EndSmallExamplePattern  = Pattern.compile("@end\\s+smallexample");
+	static final Pattern EnumeratePattern	= Pattern.compile("@enumerate");
+	static final Pattern EndEnumeratePattern  = Pattern.compile("@end\\s+enumerate");
+	static final Pattern VerbatimPattern	= Pattern.compile("@verbatim");
+	static final Pattern ItemPattern		= Pattern.compile("@item");
+	static final Pattern RefillPattern		= Pattern.compile("@refill");
+	static final Pattern NoIndentPattern	= Pattern.compile("@noindent");
+	static final Pattern QuotationPattern	= Pattern.compile("@quotation");
+	static final Pattern EndQuotation		= Pattern.compile("@end\\s+quotation");
+	static final Pattern GroupPattern		= Pattern.compile("@group");
+	static final Pattern TabPattern			= Pattern.compile("@tab");
+	static final Pattern DeftpPattern		= Pattern.compile("@deftp\\s+\\{([^\\}]*?)\\}\\s*\\{([^\\}]*?)\\}");
+	static final Pattern EndDeftpPattern	= Pattern.compile("@end\\s+deftp");
+	static final Pattern CommentPattern		= Pattern.compile("@c<eol>|@c\\s+.*?<eol>");
+	static final Pattern EndGroupPattern	= Pattern.compile("@end\\s+group");
+	static final Pattern BracketRefPattern 	= Pattern.compile("\\(@.?.?ref\\{[^\\}]*\\}\\)");
+	static final Pattern BRPattern			= Pattern.compile("&lt;br&gt;");
+	static final Pattern EOLPattern			= Pattern.compile("&lt;eol&gt;");
+	static final Pattern EndVerbatimPattern = Pattern.compile("@end\\s+verbatim");
+	static final Pattern TableSampItemPattern = Pattern.compile("(@table\\s*@samp.*?)@item\\s+(.*?)(<eol>.*@end\\s+table)", Pattern.DOTALL);
+	static final Pattern TableAsisItemPattern = Pattern.compile("(@table\\s*@asis.*?)@item\\s+(.*?)(<eol>.*@end\\+table)", Pattern.DOTALL);
+	static final Pattern TableCodeItemPattern = Pattern.compile("(@table\\s*@code.*?)@item\\s+(.*?)(<eol>.*?)(@end\\s+table)", Pattern.DOTALL);
+	static final Pattern TableVarItemPattern  = Pattern.compile("(@table\\s*@var.*?)@item\\s+(.*?)(<eol>.*@end\\s+table)", Pattern.DOTALL);
+	static final Pattern VtableCodeItemPattern = Pattern.compile("(@vtable\\s*@code.*?)@item\\s+(.*?)(<eol>.*@end\\s+vtable)", Pattern.DOTALL);
+	static final Pattern MultitableItemPattern = Pattern.compile("(@multitable.*)@item\\s+(.*?)<eol>(.*?@end\\s+multitable)" +
+																 "|(@multitable.*)@item\\s*<eol>(.*?)<eol>(.*?@end\\s+multitable)", Pattern.DOTALL);
+	static final Pattern TableCodeMatchPattern = Pattern.compile("(@table\\s+@code)(.*?)(@end\\s+table)", Pattern.DOTALL);
+	static final Pattern TableSampMatchPattern = Pattern.compile("(@table\\s+@samp)(.*?)(@end\\s+table)", Pattern.DOTALL);
+	static final Pattern TableAsisMatchPattern = Pattern.compile("(@table\\s+@asis)(.*?)(@end\\s+table)", Pattern.DOTALL);
+	static final Pattern TableVarMatchPattern  = Pattern.compile("(@table\\s+@var)(.*?)(@end\\s+table)", Pattern.DOTALL);
+	static final Pattern TableSampPattern 	= Pattern.compile("@table\\s*@samp", Pattern.MULTILINE);
+	static final Pattern TableAsisPattern	= Pattern.compile("@table\\s*@asis", Pattern.MULTILINE);
+	static final Pattern TableCodePattern	= Pattern.compile("@table\\s*@code", Pattern.MULTILINE);
+	static final Pattern TableVarPattern	= Pattern.compile("@table\\s*@var", Pattern.MULTILINE);
+	static final Pattern VtableCodePattern	= Pattern.compile("@vtable\\s*@code", Pattern.MULTILINE);
+	static final Pattern MultitablePattern	= Pattern.compile("@multitable.*?<DT>", Pattern.DOTALL);
+	static final Pattern EndTablePattern 	= Pattern.compile("@end\\s+table");
+	static final Pattern EndVtablePattern 	= Pattern.compile("@end\\s+vtable");
+	static final Pattern EndMultitablePattern 	= Pattern.compile("@end\\s+multitable");
+	static final Pattern DotsPattern		= Pattern.compile("@dots\\{\\}");
+	static final Pattern ItemizeMinusPattern= Pattern.compile("@itemize\\s+@minus" + "(.*?)" + "@end\\s+itemize", Pattern.DOTALL);
+	static final Pattern ItemizeBulletPattern= Pattern.compile("@itemize\\s+@bullet" + "(.*?)" + "@end\\s+itemize", Pattern.DOTALL);
+	static final Pattern InfoOnlyPattern	= Pattern.compile("@ifinfo.*?@end\\s+ifinfo", Pattern.DOTALL);
+	static final Pattern TexOnlyPattern		= Pattern.compile("@iftex.*?@end\\s+iftex", Pattern.DOTALL);
+	static final Pattern TexPattern			= Pattern.compile("@tex.*?@end\\s+tex", Pattern.DOTALL);
+	static final Pattern IgnorePattern		= Pattern.compile("@ignore.*?@end\\s+ignore", Pattern.DOTALL);
+	static final Pattern IfInfoPattern		= Pattern.compile("@ifinfo");
+	static final Pattern InfinityPattern	= Pattern.compile("@infinity");
+	static final Pattern EndIfInfoPattern	= Pattern.compile("@end\\s+ifinfo");
+	static final Pattern NotTexPattern		= Pattern.compile("@ifnottex");
+	static final Pattern EndNotTexPattern	= Pattern.compile("@end\\s+ifnottex");
+	static final Pattern DeftypevrPattern	= Pattern.compile("@deftypevr\\s+");
+	static final Pattern EndDeftypevr		= Pattern.compile("@end\\s+deftypevr");
+	static final Pattern XrefPattern		= Pattern.compile("@xref\\{[^\\}]*\\}", Pattern.MULTILINE);
+	static final Pattern PxrefPattern		= Pattern.compile("@pxref\\{[^\\}]*\\}", Pattern.MULTILINE);	
+	static final Pattern AtTPattern			= Pattern.compile("@t\\{([^\\}]*)\\}");
+	static final Pattern CommandPattern		= Pattern.compile("@command\\{([^\\}]*)\\}");
+	static final Pattern KbdPattern			= Pattern.compile("@kbd\\{([^\\}]*)\\}");
+	static final Pattern RPattern			= Pattern.compile("@r\\{([^\\}]*)\\}");
+	static final Pattern FilePattern		= Pattern.compile("@file\\{([^\\}]*)\\}");
+	static final Pattern VarPattern			= Pattern.compile("@var\\{([^\\}]*)\\}");
+	static final Pattern OVarPattern		= Pattern.compile("@ovar\\{([^\\}]*)\\}");
+	static final Pattern DVarPattern		= Pattern.compile("@dvar\\{([^\\},\\,]*),([^\\}]*)\\}");
+	static final Pattern AnyVarPattern		= Pattern.compile("@[a-z]*var\\{([^\\}]*)\\}");
+	static final Pattern CodePattern		= Pattern.compile("@code\\{([^\\}]*)\\}");
+	static final Pattern EmphPattern		= Pattern.compile("@emph\\{([^\\}]*)\\}");
+	static final Pattern SampPattern		= Pattern.compile("@samp\\{([^\\}]*)\\}");
+	static final Pattern OptionPattern		= Pattern.compile("@option\\{([^\\}]*)\\}");
+	static final Pattern TagPattern			= Pattern.compile("@\\w+\\{([^\\}]*)\\}");
+    static final Pattern TagCharPattern		= Pattern.compile("@([\\{\\}\\:\\*\"])");
+	static final Pattern StrandedPeriod		= Pattern.compile("(\\w)\\s+\\.\\s+");
+	static final Pattern LeftOverPeriod		= Pattern.compile("^\\.\\s+<eol>");
+	static final Pattern AmpersandPattern	= Pattern.compile("&");
+	static final Pattern LeftAnglePattern	= Pattern.compile("<");
+	static final Pattern RightAnglePattern	= Pattern.compile(">");
+
+	public static String stripProtoTags(String tt) {
+		Matcher mm;
+		String ss = "";
+		
+		ss = "";
+		while (ss != tt) {
+			mm = AnyVarPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("$1");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = DotsPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("...");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = CodePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("$1");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = AtTPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("$1");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = TagPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = TagCharPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+	return tt;
+	}
+	
+	public static String transformTags(String tt) {
+		Matcher mm;
+		String ss = "";
+		int endtableIndex = Integer.MAX_VALUE;
+
+		ss = "";
+		while (ss != tt) {
+			mm = BracketRefPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = XrefPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = CommentPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<eol>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = PxrefPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = DeftypevrPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = StrongPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<h3>$1</h3>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndDeftypevr.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = IndexPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = IndexPattern2.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = NoIndentPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = GroupPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndGroupPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = QuotationPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndQuotation.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = InfinityPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("infinity");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = DeftpPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<h4>$1 - $2</h4>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndDeftpPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = RefillPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = VarPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<VAR>$1</VAR>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = DotsPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<small>...</small>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = CommandPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<CODE>$1</CODE>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = CodePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<CODE>$1</CODE>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = KbdPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<KBD>$1</KBD>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EmphPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<EM>$1</EM>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = FilePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<TT>$1</TT>");
+		}
+		
+		
+		ss = "";
+		while (ss != tt) {
+			mm = VerbatimPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<CODE>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndVerbatimPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</CODE>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = SampPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<samp>$1</samp>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = OptionPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<samp>$1</samp>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = ExampleItem.matcher(tt);
+			ss = tt;
+			// We want to add a break at the end of each example line to preserve
+			// formatting when Eclipse processes the xml (e.g. C code lines).
+			tt = mm.replaceAll("$1$2<br>$4");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = ExamplePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<TABLE><tr><td>&nbsp;</td><td class=example><pre>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndExamplePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</pre></td></tr></table>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = SmallExampleItem.matcher(tt);
+			ss = tt;
+			// We want to add a break at the end of each example line to preserve
+			// formatting when Eclipse processes the xml (e.g. C code lines).
+			tt = mm.replaceAll("$1$2<br>$4");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = SmallExamplePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<pre>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndSmallExamplePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</pre>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = EnumeratePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<OL>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndEnumeratePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</OL>");
+		}
+
+//		ss = "";
+//		while (ss != tt) {
+//			mm = InfoOnlyPattern.matcher(tt);
+//			ss = tt;
+//			tt = mm.replaceAll("");
+//		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = TexOnlyPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = TexPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = IgnorePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = NotTexPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndNotTexPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+
+		// We will treat ifinfo the same as ifnottex which we pass through.
+		ss = "";
+		while (ss != tt) {
+			mm = IfInfoPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndIfInfoPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+
+		ss = "";
+		endtableIndex = Integer.MAX_VALUE;
+		while (ss != tt) {
+			mm = TableSampItemPattern.matcher(tt);
+			ss = tt;
+			if (mm.find()) {
+				if (mm.start(4) > endtableIndex) {
+					// We try and find the last @[table samp] marker we can find with an @item before @[end table].
+					// The end marker has moved forward to make the match which means we have exhausted all @item markers
+					// from the last @[table samp] and @[end table] we were using prior to this iteration of the loop.  
+					// If we change the table markers now, we avoid the prior table from
+					// matching any @item marker that sits between tables.
+					Matcher mm2 = TableSampMatchPattern.matcher(tt);
+					tt = mm2.replaceFirst("<DL>\n$2\n</DL>");
+					mm2 = TableSampMatchPattern.matcher(tt);
+					if (mm2.find())
+						endtableIndex = mm2.start(3);
+				}
+				else {
+					tt = mm.replaceFirst("$1<DT><SAMP>$2</SAMP>\n<DD>$3$4");
+					endtableIndex = mm.end(1) + 10 + mm.group(2).length() + 12 + mm.group(3).length();
+				}
+			}
+		}
+
+		//FIXME: This parser assumes that a table does not have an @itemize element
+		//       inside it.  It allows the opposite to be true (i.e. a table inside
+		//       an @itemize element.
+		
+		ss = "";
+		endtableIndex = Integer.MAX_VALUE;
+		while (ss != tt) {
+			mm = TableAsisItemPattern.matcher(tt);
+			ss = tt;
+			if (mm.find()) {
+				if (mm.start(4) > endtableIndex) {
+					// We try and find the last @[table asis] marker we can find with an @item before @[end table].
+					// The end marker has moved forward to make the match which means we have exhausted all @item markers
+					// from the last @[table asis] and @[end table] we were using prior to this iteration of the loop.  
+					// If we change the table markers now, we avoid the prior table from
+					// matching any @item marker that sits between tables.
+					Matcher mm2 = TableAsisMatchPattern.matcher(tt);
+					tt = mm2.replaceFirst("<DL>\n$2\n</DL>");
+					mm2 = TableAsisMatchPattern.matcher(tt);
+					if (mm2.find())
+						endtableIndex = mm2.start(3);
+				}
+				else {
+					tt = mm.replaceFirst("$1<DT>$2\n<DD>$3$4");
+					endtableIndex = mm.end(1) + 10 + mm.group(2).length() + 12 + mm.group(3).length();
+				}
+			}
+		}
+
+		ss = "";
+		endtableIndex = Integer.MAX_VALUE;
+		while (ss != tt) {
+			mm = TableCodeItemPattern.matcher(tt);
+			ss = tt;
+			if (mm.find()) {
+				if (mm.start(4) > endtableIndex) {
+					// We try and find the last @[table code] marker we can find with an @item before @[end table].
+					// The end marker has moved forward to make the match which means we have exhausted all @item markers
+					// from the last @[table code] and @[end table] we were using prior to this iteration of the loop.  
+					// If we change the table markers now, we avoid the prior table from
+					// matching any @item marker that sits between tables.
+					Matcher mm2 = TableCodeMatchPattern.matcher(tt);
+					tt = mm2.replaceFirst("<DL>\n$2\n</DL>");
+					mm2 = TableCodeMatchPattern.matcher(tt);
+					if (mm2.find())
+						endtableIndex = mm2.start(3);
+				}
+				else {
+					tt = mm.replaceFirst("$1<DT><CODE>$2</CODE>\n<DD>$3$4");
+					endtableIndex = mm.end(1) + 10 + mm.group(2).length() + 12 + mm.group(3).length();
+				}
+			}
+		}
+
+		ss = "";
+		endtableIndex = Integer.MAX_VALUE;
+		while (ss != tt) {
+			mm = TableVarItemPattern.matcher(tt);
+			ss = tt;
+			if (mm.find()) {
+				if (mm.start(4) > endtableIndex) {
+					// We try and find the last @[table var] marker we can find with an @item before @[end table].
+					// The end marker has moved forward to make the match which means we have exhausted all @item markers
+					// from the last @[table var] and @[end table] we were using prior to this iteration of the loop.  
+					// If we change the table markers now, we avoid the prior table from
+					// matching any @item marker that sits between tables.
+					Matcher mm2 = TableVarMatchPattern.matcher(tt);
+					tt = mm2.replaceFirst("<DL>\n$2\n</DL>");
+					mm2 = TableVarMatchPattern.matcher(tt);
+					if (mm2.find())
+						endtableIndex = mm2.start(3);
+				}
+				else {
+					tt = mm.replaceFirst("$1<DT><VAR>$2</VAR>\n<DD>$3$4");
+					endtableIndex = mm.end(1) + 10 + mm.group(2).length() + 12 + mm.group(3).length();
+				}
+			}
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = VtableCodeItemPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("$1<DT><CODE>$2</CODE>\n<DD>$3");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = MultitableItemPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("$1<DT><pre>$2</pre>\n<DD><br>$3");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TableSampPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<DL>\n");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TableAsisPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<DL>\n");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TableVarPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<DL>\n");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TableCodePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<DL>\n");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = VtableCodePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<DL>\n");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = MultitablePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<DL>\n<DT>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = EndTablePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</DL>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndVtablePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</DL>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndMultitablePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</DL>");
+		}
+		
+		//FIXME: if there ever is a @itemize @bullet within a
+		//       @itemize @minus or vice-versa, the following
+		//       logic will get it wrong.
+		ss = "";
+		while (ss != tt) {
+			mm = ItemizeMinusPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<UL>$1</UL>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = ItemizeBulletPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<OL>$1</OL>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = ItemPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<LI>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TagPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("$1");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = TagCharPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("$1");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = StrandedPeriod.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("$1. ");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = LeftOverPeriod.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = TabPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		mm = AmpersandPattern.matcher(tt);
+		tt = mm.replaceAll("&amp;");
+
+		mm = LeftAnglePattern.matcher(tt);
+		tt = mm.replaceAll("&lt;");
+
+		mm = RightAnglePattern.matcher(tt);
+		tt = mm.replaceAll("&gt;");	
+
+		// Put back all the eol markers
+		mm = EOLPattern.matcher(tt);
+		tt = mm.replaceAll("<eol>");
+		
+		return tt;
+	}
+}
diff --git a/profiling/.classpath b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/.classpath
similarity index 100%
copy from profiling/.classpath
copy to libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/.classpath
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/.project b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/.project
new file mode 100644
index 0000000..5207979
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.cdt.libhover</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/.settings/org.eclipse.jdt.core.prefs b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..bbc86d0
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Fri Sep 19 14:24:23 EDT 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/ChangeLog b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/ChangeLog
new file mode 100644
index 0000000..5dd3997
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/ChangeLog
@@ -0,0 +1,196 @@
+2010-03-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #306283
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java (getMemberSummary): Remove
+	code that looks in editor text for class name and then asks the AST.  Just get the class name
+	from the member we already do the lookup for.  Get the fully templated name using the new
+	getClassName method. 
+	(getMatchingFunctions): Remove commented out code.
+	(getClassName): New method to get class name including template parameters.
+	(getFunctionInfo): Change to specify fully qualified name and not remove
+	namespace.
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java (getClassInfo): Check
+	info is not null before accessing.
+
+2010-03-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java (getMemberSummary): Change
+	DOMException catch statement to Exception since the IFunction interface getReturnType method
+	changes in CDT 7.0.
+
+2009-12-22  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java (getMemberSummary):
+	Revert Helios-only change on trunk.
+
+2009-12-17  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java (getMemberSummary):
+	Remove unnecessary catch block.
+
+2009-09-23  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Load plugin if any of its classes are used.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java (LibhoverPlugin): Set
+	plugin in constructor. 
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java (resolveArgs): Change
+	to resolve template parms to actual types where known. 
+	(isParmMatch): Resolve the member prototype using template types so we are comparing
+	apples to apples.
+	(getMemberSummary): Change calls to isParmMatch and resolveArgs. 
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java (getHoverInfo): Add
+	code to try accessing a path locally within the plugin, then try the file system. 
+
+2009-08-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #285867
+	* plugin.properties: Change Provider to Eclipse instead of Eclipse.org.
+
+2009-07-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump release to 1.0.3. 
+	
+2009-07-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Refactor to hide internal classes in new packages.
+	
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHover.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHoverLibrary.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHoverMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHoverMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/libhover/preferences/CheckboxFieldEditor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/libhover/preferences/LibHoverPreferencePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/libhover/preferences/PreferenceConstants.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/libhover/preferences/PreferenceInitializer.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/libhover/properties/LibHoverPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverMessages.properties: New file.
+	* plugin.xml: Changed to match new packages. 
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/preferences/CheckboxFieldEditor.java: New file. 
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/preferences/LibHoverPreferencePage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/preferences/PreferenceConstants.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/preferences/PreferenceInitializer.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/properties/LibHoverPropertyPage.java: New file.
+	
+
+2009-05-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHover.java (getMemberSummary): Fix compiler warnings. 
+	(getFunctionInfo): Ditto.
+	* src/org/eclipse/linuxtools/cdt/libhover/preferences/CheckboxFieldEditor.java (doLoad): Ditto. 
+	(doLoadDefault): Ditto.
+	(adjustForNumColumns): Ditto.
+	* src/org/eclipse/linuxtools/cdt/libhover/properties/LibHoverPropertyPage.java (updateCheckboxData): Ditto. 
+
+2009-05-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHover.java (getFunctionInfo): Add logic
+	to find the qualified name of the class, even when namespaces are being used.
+	
+2009-05-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHover.java (resolveArgs): New method.
+	(isParmMatch): Ditto. 
+	(getMemberSummary): Add parameter matching support and template resolution.
+	(getFunctionInfo): Add AST logic to resolve member name for C++.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHoverLibrary.java (resolveTemplateTypes):
+	New method. 
+	(getClassInfo): Add additional parameter of template types and fill in.
+	* src/org/eclipse/linuxtools/cdt/libhover/MemberInfo.java (getReturnType): New method.
+	(setParamTypes): Ditto. 
+	(getParamTypes): Ditto.
+
+2009-02-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* schema/org.eclipse.linuxtools.cdt.libhover.library.exsd: Change description for
+	location field which now points to a serialized LibHoverInfo instance rather than
+	xml.
+	* src/org/eclipse/linuxtools/cdt/libhover/ClassInfo.java: New file.
+	* src/org/eclipse/linuxtools/cdt/libhover/FunctionInfo.java: New file.
+	* src/org/eclipse/linuxtools/cdt/libhover/HelpBook.java: New file.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHoverInfo.java: New file.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHoverLibrary.java: New file.
+	* src/org/eclipse/linuxtools/cdt/libhover/MemberInfo.java: New file.
+	* src/org/eclipse/linuxtools/cdt/libhover/TypedefInfo.java: New file.
+	* src/org/eclipse/linuxtools/cdt/libhover/utils/BuildFunctionInfos.java: New file to
+	create serialized LibHoverInfo file from an xml file in standard function format
+	used by previous version of LibHover.
+	* META-INF/MANIFEST.MF: Add additional dependencies and bump version to 1.0.2.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHover.java (isCPPCharacter): New method.
+	(EnclosingASTNameJob): New internal class to query the AST for IASTName
+	for a symbol in the document.
+	(ASTDeclarationFinderJob): New internal class to get the declaration of a symbol from
+	the AST.
+	(getMemberSummary): New method to get the summary of a C++ method. 
+	(getLibHoverDocs): Modified to no longer parse xml documentation.  It now expects
+	documentation to be in LibHoverInfo format, serialized via Java.  The method leaves
+	reading of the actual serialized info to LibHoverLibrary.
+	(getFunctionSummary): Rewritten to fetch info from the new LibHoverInfo class and
+	to handle C++.
+	(getMatchingFunctions): Ditto. 
+	(FunctionSummary): Added a boolean to mark whether the prototype already has
+	brackets in it.
+	(FunctionSummary.FunctionPrototypeSummary.getPrototypeString):  Use new boolean
+	to determine whether to add brackets or not. 
+	(getFunctionInfo): Add C++ support.
+
+2009-01-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add .qualifier to version and bump to 1.0.1.
+
+2008-10-31  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Use bundleName and provider from plugin.properties. Add
+	"(Incubation)".
+	* plugin.properties: Initial import.
+
+2008-10-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Remove libhover property and preferences pages which are not needed since
+	C/C++ Documentation properties page does the job.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHover.java:
+	(getMatchingFunctions): Pass document to getFunctionSummaryFromNode.
+	(constructTypes): Add groupsynopsis.
+	(getFunctionInfo): Pass document to getFunctionSummaryFromNode.
+	(getFunctionSummaryFromNode): Add groupsynopsis support.
+
+2008-10-22  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.properties: New file.
+	* src/org/eclipse/linuxtools/cdt/libhover/preferences/CheckboxFieldEditor.java: New file.
+	* build.properties: Add plugin.properties to list of binary files.
+	* META-INF/MANIFEST.MF: Add Bundle-Localization statement.
+	* plugin.xml: Use translatable names for preference and property pages.
+	* schema/org.eclipse.linuxtools.cdt.libhover.library.exsd: Make id and name required.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHover.java:
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHoverMessages.java: Fix bundle name.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHoverMessages.properties: New messages.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java (getID): New method.
+	* src/org/eclipse/linuxtools/cdt/libhover/preferences/LibHoverPreferencePage.java (createFieldEditors):
+	Rewrite to use new CheckboxFieldEditor.
+	* src/org/eclipse/linuxtools/cdt/libhover/preferences/PreferenceConstants.java: Add P_LIBHOVER.
+	* src/org/eclipse/linuxtools/cdt/libhover/preferences/PreferenceInitializer.java (initializeDefaultPreferences):
+	Set up an unused default string.
+	* src/org/eclipse/linuxtools/cdt/libhover/properties/LibHoverPropertyPage.java: Rewritten to use the
+	CheckboxFieldEditor widgets on a property page.
+
+2008-10-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* build.properties: Specify javacSource and javacTarget to be 1.5.
+
+2008-09-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHover.java: Initial implementation moved
+	org.eclipse.cdt.linuxtools.autotools.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHoverMessages.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHoverMessages.properties: Ditto.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHoverPlugin.java: New file.
+	* META-INF/MANIFEST.MF: Ditto.
+	* schema/org.eclipse.linuxtools.cdt.libhover.library.exsd: Ditto.
+	* about.html, build.properties, plugin.xml, plugin.properties: Ditto.
+	* src/org/eclipse/linuxtools/cdt/libhover/preferences/LibHoverPreferencesPage.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/libhover/preferences/PreferenceConstants.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/libhover/preferences/PreferenceInitializer.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/libhover/properties/LibHoverPropertyPage.java: Ditto.
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..fc024ea
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF
@@ -0,0 +1,21 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.cdt.libhover; singleton:=true
+Bundle-Version: 1.0.3.qualifier
+Bundle-Activator: org.eclipse.linuxtools.cdt.libhover.LibhoverPlugin
+Bundle-Vendor: %provider
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.help;bundle-version="3.3.100",
+ org.eclipse.cdt.ui;bundle-version="5.0.0",
+ org.eclipse.core.filesystem;bundle-version="1.2.0",
+ org.eclipse.cdt.core;bundle-version="5.0.0",
+ org.eclipse.cdt;bundle-version="5.0.0",
+ org.eclipse.ui.editors;bundle-version="3.4.0",
+ org.eclipse.jface.text;bundle-version="3.4.1"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.eclipse.linuxtools.cdt.libhover
+Bundle-ActivationPolicy: lazy
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/build.properties b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/build.properties
new file mode 100644
index 0000000..50e2a58
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/build.properties
@@ -0,0 +1,9 @@
+source.. = src/
+output.. = bin/
+bin.includes = plugin.xml,\
+               META-INF/,\
+               .,\
+               plugin.properties
+
+javacSource=1.5
+javacTarget=1.5
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/plugin.properties b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/plugin.properties
new file mode 100644
index 0000000..2f48939
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/plugin.properties
@@ -0,0 +1,14 @@
+#################################################################################
+#  Copyright (c) 2008 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+LibhoverPreference.name=Library Hover
+LibhoverProperty.name=Library Hover
+bundleName=C/C++ Libhover Plug-in (Incubation)
+provider=Eclipse
\ No newline at end of file
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/plugin.xml b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/plugin.xml
new file mode 100644
index 0000000..7ece4f4
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/plugin.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+   <extension-point id="org.eclipse.linuxtools.cdt.libhover.library" name="C/C++ Library Hover Specifier" schema="schema/org.eclipse.linuxtools.cdt.libhover.library.exsd"/>
+
+   <extension
+         point="org.eclipse.cdt.ui.CHelpProvider">
+      <provider
+            class="org.eclipse.linuxtools.internal.cdt.libhover.LibHover"
+            id="org.eclipse.linuxtools.cdt.libhover.provider"/>
+   </extension>
+</plugin>
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/schema/org.eclipse.linuxtools.cdt.libhover.library.exsd b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/schema/org.eclipse.linuxtools.cdt.libhover.library.exsd
new file mode 100644
index 0000000..749ba37
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/schema/org.eclipse.linuxtools.cdt.libhover.library.exsd
@@ -0,0 +1,216 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="library" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="library" id="org.eclipse.linuxtools.cdt.libhover.library" name="C/C++ Library Hover Specifier"/>
+      </appinfo>
+      <documentation>
+         This extension allows specification of a library hover file to use when editing C or C++ files under the CDT.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="library" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  Unique simple id for this extension (e.g. library).
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string" use="required">
+            <annotation>
+               <documentation>
+                  Name of this library to hover.  This name will be shown in the preference and property dialogs.
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="library">
+      <complexType>
+         <attribute name="name" type="string" use="required">
+            <annotation>
+               <documentation>
+                  Name of the library that the hover info is providing
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="location" type="string" use="required">
+            <annotation>
+               <documentation>
+                  Location of the binary file containing the serialized LibHoverInfo for the documentation: either an absolute file name or a URL
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="docs" type="string">
+            <annotation>
+               <documentation>
+                  URL of help documentation or empty.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="type" use="required">
+            <annotation>
+               <documentation>
+                  Type of library that help is for.  One of C, C++, or ASM
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+            <simpleType>
+               <restriction base="string">
+                  <enumeration value="C">
+                  </enumeration>
+                  <enumeration value="C++">
+                  </enumeration>
+                  <enumeration value="ASM">
+                  </enumeration>
+               </restriction>
+            </simpleType>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         1.0.0
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         &lt;extension
+           point=&quot;org.eclipse.linuxtools.cdt.libhover.library&quot;&gt;
+     &lt;library
+           name=&quot;GTK&quot;
+           location=&quot;http://mywebsite/libhover/xml/gtk.xml&quot;
+           docs=&quot;http;//gtk.org/docs/gtk.html&quot;/&gt;
+  &lt;/extension&gt;
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         XML files referenced must adhere to the following xml structure:
+&lt;pre&gt;
+
+&lt;!DOCTYPE descriptions [
+
+  &lt;!ELEMENT descriptions (construct)*&gt;
+
+  &lt;!ELEMENT construct (structure|function)*&gt;
+  &lt;!ATTLIST construct
+    id ID #REQUIRED
+    type CDATA #REQUIRED
+  &gt;
+
+  &lt;!ELEMENT structure       (synopsis?, elements?)?&gt;
+
+  &lt;!ELEMENT elements     (element*)&gt;
+
+  &lt;!ELEMENT element (synopsis*)&gt;
+  &lt;!ATTLIST element
+    content CDATA #REQUIRED
+  &gt;
+
+  &lt;!ELEMENT synopsis     (#PCDATA)*&gt;
+
+  &lt;!ELEMENT function     (prototype,headers?,synopsis)&gt;
+  &lt;!ATTLIST function
+    returntype CDATA #REQUIRED
+  &gt;
+
+  &lt;!ELEMENT prototype    (parameter+)?&gt;
+
+  &lt;!ELEMENT parameter (#PCDATA)*&gt;
+  &lt;!ATTLIST parameter
+    content CDATA #REQUIRED
+  &gt;
+
+  &lt;!ELEMENT headers      (header+)?&gt;
+
+  &lt;!ELEMENT header (#PCDATA)*&gt;
+  &lt;!ATTLIST header
+    filename CDATA #REQUIRED
+  &gt;
+
+]&gt;
+&lt;/pre&gt;
+Note that function names need to be prefixed by &quot;function-&quot;.  For example:
+&lt;pre&gt;
+&lt;descriptions&gt;
+  &lt;construct id=&quot;function-atexit&quot; type=&quot;function&quot;&gt;
+    &lt;function returntype=&quot;int&quot;&gt;
+      &lt;prototype&gt;
+        &lt;parameter content=&quot;void (*function) (void)&quot;/&gt;
+      &lt;/prototype&gt;
+      &lt;headers&gt;
+        &lt;header filename = &quot;stdlib.h&quot;/&gt;
+      &lt;/headers&gt;
+        &lt;synopsis&gt;
+        The &amp;lt;CODE&amp;gt;atexit&amp;lt;/CODE&amp;gt; function registers the function &amp;lt;VAR&amp;gt;function&amp;lt;/VAR&amp;gt; to be
+         called at normal program termination.  The &amp;lt;VAR&amp;gt;function&amp;lt;/VAR&amp;gt; is called with
+         no arguments.
+         &amp;lt;br&amp;gt;&amp;lt;br&amp;gt; The return value from &amp;lt;CODE&amp;gt;atexit&amp;lt;/CODE&amp;gt; is zero on success and nonzero if
+         the function cannot be registered.
+        &lt;/synopsis&gt;
+    &lt;/function&gt;
+  &lt;/construct&gt;
+&lt;/descriptions&gt;
+&lt;/pre&gt;
+
+Also note that the synopsis is output as html.  To specify html tags, one needs to use &amp;amp;lt; and &amp;amp;gt; as delimeters in place of &quot;&amp;lt&quot; and &quot;&amp;gt&quot;. In the previous example, VAR tags are used for variable references, CODE tags for the function name, and br tags for forcing paragraph breaks.  All of these make the hover look more interesting when displayed.
+      </documentation>
+   </annotation>
+
+
+   <annotation>
+      <appinfo>
+         <meta.section type="copyright"/>
+      </appinfo>
+      <documentation>
+         /*******************************************************************************
+ * Copyright (c) 2008 Red Hat Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/ClassInfo.java b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/ClassInfo.java
new file mode 100644
index 0000000..fe826df
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/ClassInfo.java
@@ -0,0 +1,123 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.libhover;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+
+
+public class ClassInfo implements Serializable {
+	private static final long serialVersionUID = 1L;
+	private String templateParms[] = new String[0];
+	private boolean templateParmsFilled = false;
+	private String className;
+	private String id;
+	private String include;
+	private ArrayList<ClassInfo> baseClasses = new ArrayList<ClassInfo>();
+	private HashMap<String, MemberInfo> members = new HashMap<String, MemberInfo>();
+	private transient Document document;
+	public transient Node classNode;
+	private ArrayList<ClassInfo> children = null;
+	public ClassInfo(String className, String id, Node classNode) {
+		this.className = className;
+		this.id = id;
+		this.classNode = classNode;
+	}
+	public String getClassName() {
+		return className;
+	}
+	public Node getClassNode() {
+		if (classNode == null)
+			classNode = document.getElementById(id);
+		return classNode;
+	}
+	public void setDocument (Document d) {
+		document = d;
+	}
+	public void setClassName(String newName) {
+		className = newName;
+	}
+	public void addTemplate(ClassInfo child) {
+		if (children == null)
+			children = new ArrayList<ClassInfo>();
+		children.add(child);
+	}
+	public boolean areTemplateParmsFilled() {
+		return templateParmsFilled;
+	}
+	
+	public String[] getTemplateParms() {
+		return templateParms;
+	}
+	
+	public void setTemplateParms(String[] templateParms) {
+		templateParmsFilled = true;
+		this.templateParms = templateParms;
+	}
+	
+	public String getInclude() {
+		return include;
+	}
+	
+	public void setInclude(String include) {
+		this.include = include;
+	}
+	
+	public ArrayList<ClassInfo> getChildren() {
+		return children;
+	}
+	
+	public MemberInfo getMember(String name) {
+		return members.get(name);
+	}
+	
+	public void addMember(MemberInfo info) {
+		String name = info.getName();
+		MemberInfo member = members.get(name);
+		if (member != null)
+			member.addChild(info);
+		else
+			members.put(name, info);
+	}
+	
+	public MemberInfo[] getMembers(String nameStart) {
+		ArrayList<MemberInfo> matchList = new ArrayList<MemberInfo>();
+		Collection<MemberInfo> values = members.values();
+		for (Iterator<MemberInfo> i = values.iterator(); i.hasNext();) {
+			MemberInfo k = i.next();
+			if (k.getName().startsWith(nameStart)) {
+				matchList.add(k);
+				ArrayList<MemberInfo> children = k.getChildren();
+				if (children != null) {
+					for (Iterator<MemberInfo> j = children.iterator(); j.hasNext();) {
+						MemberInfo child = (MemberInfo)i.next();
+						matchList.add(child);
+					}
+				}
+			}
+		}
+		MemberInfo[] matches = new MemberInfo[matchList.size()];
+		return matchList.toArray(matches);
+	}
+	
+	public ArrayList<ClassInfo> getBaseClasses() {
+		return baseClasses;
+	}
+	
+	public void addBaseClass(ClassInfo info) {
+		baseClasses.add(info);
+	}
+}
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/FunctionInfo.java b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/FunctionInfo.java
new file mode 100644
index 0000000..b9fef1b
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/FunctionInfo.java
@@ -0,0 +1,134 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.libhover;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+
+public class FunctionInfo implements Serializable {
+	private static final long serialVersionUID = 1L;
+	private String name;
+	private String prototype;
+	private String desc;
+	private String returnType;
+	private ArrayList<String> headers = new ArrayList<String>();
+	private ArrayList<FunctionInfo> children = null;
+	
+	/**
+	 * Constructor for function.
+	 * 
+	 * @param name
+	 */
+	public FunctionInfo(String name) {
+		this.name = name;
+	}
+	
+	/**
+	 * Get function name.
+	 * 
+	 * @return function name
+	 */
+	public String getName() {
+		return name;
+	}
+	
+	/**
+	 * Get prototype for function.
+	 * 
+	 * @return prototype string or null
+	 */
+	public String getPrototype() {
+		return prototype;
+	}
+	
+	/**
+	 * Set prototype string.
+	 * 
+	 * @param prototype
+	 */
+	public void setPrototype(String prototype) {
+		this.prototype = prototype;
+	}
+	
+	/**
+	 * Get description for function.
+	 * 
+	 * @return description string or null
+	 */
+	public String getDescription() {
+		return desc;
+	}
+	
+	/**
+	 * Set description string for function.
+	 * 
+	 * @param desc
+	 */
+	public void setDescription(String desc) {
+		this.desc = desc;
+	}
+
+	/**
+	 * Get return type for function.
+	 * 
+	 * @return return type as string or null
+	 */
+	public String getReturnType() {
+		return returnType;
+	}
+
+	/**
+	 * Set return type for function.
+	 * 
+	 * @param returnType
+	 */
+	public void setReturnType(String returnType) {
+		this.returnType = returnType;
+	}
+
+	/**
+	 * Get the headers that need including for this function.
+	 * 
+	 * @return list of header strings
+	 */
+	public ArrayList<String> getHeaders() {
+		return headers;
+	}
+	
+	/**
+	 * Add a header to the list of headers needed for this function.
+	 * 
+	 * @param header the name of the header file to add
+	 */
+	public void addHeader(String header) {
+		headers.add(header);
+	}
+	
+	/**
+	 * Add a function with the same name as a child of this function (C++-only).
+	 * 
+	 * @param info a function with same name as this function.
+	 */
+	public void addChild(FunctionInfo info) {
+		if (children == null)
+			children = new ArrayList<FunctionInfo>();
+		children.add(info);
+	}
+
+	/**
+	 * Get the children functions with same name as this function.
+	 * 
+	 * @return an ArrayList of functions with same name or null.
+	 */
+	public ArrayList<FunctionInfo> getChildren() {
+		return children;
+	}
+}
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/HelpBook.java b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/HelpBook.java
new file mode 100644
index 0000000..efdb2db
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/HelpBook.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.libhover;
+
+import org.eclipse.cdt.ui.ICHelpBook;
+
+public class HelpBook implements ICHelpBook {
+
+	private String title;
+	private int type;
+	
+	public HelpBook (String title, String typeName) {
+		this.title = title;
+		if (typeName.equals("C")) // $NON-NLS-1$
+		    type = HELP_TYPE_C;
+		else if (typeName.equals("C++")) // $NON-NLS-1$
+			type = HELP_TYPE_CPP;
+		else
+			type = HELP_TYPE_ASM;
+	}
+	public String getTitle () {
+		return title;
+	}
+	
+	public int getCHelpType () {
+		return type;
+	}
+
+}
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibHoverInfo.java b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibHoverInfo.java
new file mode 100644
index 0000000..09536d3
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibHoverInfo.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.libhover;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.TreeMap;
+
+public class LibHoverInfo implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+	public HashMap<String, ClassInfo> classes = new HashMap<String, ClassInfo>();
+	public HashMap<String, TypedefInfo> typedefs = new HashMap<String, TypedefInfo>();
+	public TreeMap<String, FunctionInfo> functions = new TreeMap<String, FunctionInfo>();
+
+}
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java
new file mode 100644
index 0000000..39e2b2b
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.libhover;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class LibhoverPlugin extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.cdt.libhover";
+
+	// The shared instance
+	private static LibhoverPlugin plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public LibhoverPlugin() {
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static LibhoverPlugin getDefault() {
+		return plugin;
+	}
+	
+	/*
+	 * Returns the id of the plugin
+	 */
+	public static String getID() {
+		return PLUGIN_ID;
+	}
+
+	/**
+	 * Returns an image descriptor for the image file at the given
+	 * plug-in relative path
+	 *
+	 * @param path the path
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return imageDescriptorFromPlugin(PLUGIN_ID, path);
+	}
+}
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/MemberInfo.java b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/MemberInfo.java
new file mode 100644
index 0000000..ac92c65
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/MemberInfo.java
@@ -0,0 +1,133 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.libhover;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+
+public class MemberInfo implements Serializable {
+	private static final long serialVersionUID = 1L;
+	private String name;
+	private String prototype;
+	private String desc;
+	private String returnType;
+	private String[] paramTypes = new String[0];
+	private ArrayList<MemberInfo> children = null;
+	
+	/**
+	 * Constructor for member.
+	 * 
+	 * @param name
+	 */
+	public MemberInfo(String name) {
+		this.name = name;
+	}
+	
+	/**
+	 * Get member name.
+	 * 
+	 * @return member name
+	 */
+	public String getName() {
+		return name;
+	}
+	
+	/**
+	 * Get prototype for member.
+	 * 
+	 * @return prototype string or null
+	 */
+	public String getPrototype() {
+		return prototype;
+	}
+	
+	/**
+	 * Set prototype string.
+	 * 
+	 * @param prototype
+	 */
+	public void setPrototype(String prototype) {
+		this.prototype = prototype;
+	}
+	
+	/**
+	 * Get description for member.
+	 * 
+	 * @return description string or null
+	 */
+	public String getDescription() {
+		return desc;
+	}
+	
+	/**
+	 * Set description string for member.
+	 * 
+	 * @param desc
+	 */
+	public void setDescription(String desc) {
+		this.desc = desc;
+	}
+
+	/**
+	 * Get param types for member.
+	 * 
+	 * @return return array of param types
+	 */
+	public String[] getParamTypes() {
+		return paramTypes;
+	}
+
+	/**
+	 * Set param types for member.
+	 * 
+	 * @param array of param types
+	 */
+	public void setParamTypes(String[] paramTypes) {
+		this.paramTypes = paramTypes;
+	}
+	/**
+	 * Get return type for member.
+	 * 
+	 * @return return type as string or null
+	 */
+	public String getReturnType() {
+		return returnType;
+	}
+
+	/**
+	 * Set return type for member.
+	 * 
+	 * @param returnType
+	 */
+	public void setReturnType(String returnType) {
+		this.returnType = returnType;
+	}
+
+	/**
+	 * Add a member with the same name as a child of this member.
+	 * 
+	 * @param info a member with same name as this member.
+	 */
+	public void addChild(MemberInfo info) {
+		if (children == null)
+			children = new ArrayList<MemberInfo>();
+		children.add(info);
+	}
+
+	/**
+	 * Get the children members with same name as this member.
+	 * 
+	 * @return an ArrayList of members with same name or null.
+	 */
+	public ArrayList<MemberInfo> getChildren() {
+		return children;
+	}
+}
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/TypedefInfo.java b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/TypedefInfo.java
new file mode 100644
index 0000000..d861558
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/TypedefInfo.java
@@ -0,0 +1,118 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.libhover;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+
+public class TypedefInfo implements Serializable {
+	private static final long serialVersionUID = 1L;
+	private String[] templates = new String[0];
+	private String typedefName;
+	private String transformedType;
+	private ArrayList<TypedefInfo> children = null;
+	public TypedefInfo(String typedefName, String transformedType) {
+		this.typedefName = typedefName;
+		this.transformedType = transformedType;
+	}
+	public String getTypedefName() {
+		return typedefName;
+	}
+	public void setTypedefName(String name) {
+		typedefName = name;
+	}
+	
+	private String[] getTemplateArgs(String str) {
+		ArrayList<String> list = new ArrayList<String>();
+		int index = 0;
+		int lastIndex = 0;
+		int templateCounter = 0;
+		while (index < str.length()) {
+			char ch = str.charAt(index);
+			if (ch == '<') {
+				if (templateCounter == 0)
+					lastIndex = index + 1;
+				templateCounter++;
+			} else if (ch == '>') {
+				templateCounter--;
+			} else if (ch == ',' && templateCounter == 1) {
+				// FIXME: do we have to strip out all blanks here?
+				list.add(str.substring(lastIndex, index).trim());
+				lastIndex = index + 1;
+			}
+			++index;
+		}
+		String[] args = new String[list.size()];
+		return list.toArray(args);
+	}
+	
+	public String getTransformedType(String className) {
+		int index = className.indexOf('<');
+		if (index > 0) {
+			TypedefInfo e = this;
+			// Search the children list in case the given class name
+			// matches a specific template case.
+			ArrayList<TypedefInfo> children = getChildren();
+			for (int x = 0; x < children.size(); ++x) {
+				TypedefInfo child = children.get(x);
+				if (className.matches(child.getTypedefName())) {
+					e = child;
+					break;
+				}
+			}
+			String[] templates = e.getTemplates();
+			String transformedName = e.transformedType;
+			// Check if there are any template arguments to replace.  If not,
+			// we can just return the transformed type we have.
+			if (templates.length <= 0)
+				return transformedName;
+			String[] args = getTemplateArgs(className);
+			String[] templateArgs = getTemplateArgs(e.getTypedefName());
+			int j = 0;
+			// For every argument that doesn't match up, it must be a template
+			// parameter so we'll replace the template parameter name with the
+			// supplied parameter.  We have to query the template parameter list
+			// for the names to replace because for partial specific templates
+			// those names will have been replaced with regex sequences designed to
+			// help us identify when the specific template has matched.  For example,
+			// <char, _Tp> will be stored as <char,[a-zA-Z0-9_]*> and if we have
+			// <char,char> we will replace _Tp with char in the transformed type.
+			for (int i = 0; i < args.length; ++i) {
+				if (!args[i].equals(templateArgs[i])) {
+					transformedName.replaceAll(templates[j], args[i]);
+					++j;
+				}
+			}
+			return transformedName;
+		} else {
+			// There is no template specified.
+			return transformedType;
+		}
+	}
+	
+	public void addTypedef(TypedefInfo typedef) {
+		if (children == null)
+			children = new ArrayList<TypedefInfo>();
+		children.add(typedef);
+	}
+	public ArrayList<TypedefInfo> getChildren() {
+		return children;
+	}
+	public void copyTemplates(String[] newTemplates) {
+		templates = new String[newTemplates.length];
+		for (int i = 0; i < templates.length; ++i)
+			templates[i] = newTemplates[i];
+	}
+	public String[] getTemplates() {
+		return templates;
+	}
+}
+
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/utils/BuildFunctionInfos.java b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/utils/BuildFunctionInfos.java
new file mode 100644
index 0000000..e0daac3
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/utils/BuildFunctionInfos.java
@@ -0,0 +1,213 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.libhover.utils;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectOutputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.eclipse.core.filesystem.URIUtil;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.linuxtools.cdt.libhover.LibHoverInfo;
+import org.eclipse.linuxtools.cdt.libhover.FunctionInfo;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+public class BuildFunctionInfos {
+	
+	private Document document;
+	private LibHoverInfo hoverInfo = new LibHoverInfo();
+	
+	public BuildFunctionInfos(Document document) {
+		this.document = document;
+	}
+
+	public Document getDocument() {
+		return document;
+	}
+
+	protected FunctionInfo getFunctionInfoFromNode(String name, Node function_node, Document document) {
+        FunctionInfo f = new FunctionInfo(name);
+        NamedNodeMap function_node_map = function_node.getAttributes();
+        Node function_node_returntype_node = function_node_map.item(0);
+        String function_node_rt_name = function_node_returntype_node.getNodeName();
+
+        if (function_node_rt_name.equals("returntype")) { // $NON-NLS-1$
+
+            // return type
+
+            String function_node_rt_value = function_node_returntype_node.getNodeValue();
+            f.setReturnType(function_node_rt_value);
+        }		// returntype
+        
+        NodeList function_node_kids = function_node.getChildNodes();
+        for (int fnk = 0; fnk < function_node_kids.getLength(); fnk++) {
+        	Node function_node_kid = function_node_kids.item(fnk);
+            String function_node_kid_name = function_node_kid.getNodeName();
+            if (function_node_kid_name.equals("prototype")) { // $NON-NLS-1$
+
+                // prototype
+
+                String prototype = null;
+
+                NodeList function_node_parms = function_node_kid.getChildNodes();
+                for (int fnp = 0; fnp < function_node_parms.getLength(); fnp++) {
+                    Node function_node_parm = function_node_parms.item(fnp);
+                    String function_node_parm_name =  function_node_parm.getNodeName();
+                    if (function_node_parm_name.equals("parameter")) { // $NON-NLS-1$
+                        NamedNodeMap function_node_parm_map = function_node_parm.getAttributes();
+                        Node function_node_parm_node = function_node_parm_map.item(0);
+                        String parameter = function_node_parm_node.getNodeValue();
+                        prototype = (null == prototype)
+                            ? parameter
+                            : prototype + ", " + parameter;
+                    }
+                }
+                f.setPrototype(prototype);
+            }	// prototype
+            
+            else if (function_node_kid_name.equals("headers")) { // $NON-NLS-1$
+
+                // headers
+
+                NodeList function_node_headers = function_node_kid.getChildNodes();
+                for (int fnh = 0; fnh < function_node_headers.getLength(); fnh++) {
+                    Node function_node_header = function_node_headers.item(fnh);
+                    String function_node_header_name =  function_node_header.getNodeName();
+                    if (function_node_header_name.equals("header")) { // $NON-NLS-1$
+                        NamedNodeMap function_node_header_map = function_node_header.getAttributes();
+                        Node function_node_header_node = function_node_header_map.item(0);
+                        f.addHeader(function_node_header_node.getNodeValue());
+                    }
+                }
+            }	// headers
+            
+
+            else if (function_node_kid_name.equals("groupsynopsis")) { // $NON-NLS-1$
+            	
+            	// group synopsis
+            	
+            	NamedNodeMap attr = function_node_kid.getAttributes();
+            	Node idnode = attr.getNamedItem("id"); // $NON-NLS-1$
+            	String id = idnode.getNodeValue();
+				if (id != null) {
+        			Element elem2 = document.getElementById(id);
+        			if (null != elem2) {
+        				NodeList synopsisNode = elem2.getElementsByTagName("synopsis"); // $NON-NLS-1$
+        				if (null != synopsisNode && synopsisNode.getLength() > 0) {
+        					Node synopsis = synopsisNode.item(0);
+        					Node textNode = synopsis.getLastChild();
+        					f.setDescription(textNode.getNodeValue());
+        				}
+        			}
+				}
+            }
+            
+            else if (function_node_kid_name.equals("synopsis")) { // $NON-NLS-1$
+
+                // synopsis
+
+                Node textNode = function_node_kid.getLastChild();
+                f.setDescription(textNode.getNodeValue());
+            }
+        }
+        return f;
+	}
+
+	public void buildCPPInfo(String fileName) {
+		Document document = getDocument();
+		NodeList nl = document.getElementsByTagName("construct"); // $NON-NLS-1$
+		for (int i = 0; i < nl.getLength(); ++i) {
+			Node n = nl.item(i);
+			NamedNodeMap m = n.getAttributes();
+			Node id = m.getNamedItem("id"); // $NON-NLS-1$
+			if (id != null && id.getNodeValue().startsWith("function-")) { // $NON-NLS-1$
+				String name = id.getNodeValue().substring(9);
+				NodeList nl2 = n.getChildNodes();
+				for (int j = 0; j < nl2.getLength(); ++j) {
+					Node n2 = nl2.item(j);
+					if (n2.getNodeName().equals("function")) { // $NON-NLS-1$
+						FunctionInfo f = getFunctionInfoFromNode(name, n2, document);
+						hoverInfo.functions.put(name, f);
+					}
+				}
+			}
+		}
+		try {
+			// Now, output the LibHoverInfo for caching later
+			FileOutputStream f = new FileOutputStream(fileName);
+			ObjectOutputStream out = new ObjectOutputStream(f);
+			out.writeObject(hoverInfo);
+			out.close();
+		} catch(Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @param args[0] - URL or file name of xml document to parse
+	 *        args[1] - file name to place resultant serialized LibHoverInfo
+	 */
+	public static void main(String[] args) {
+		URI acDoc;
+		try {
+			acDoc = new URI(args[0]);
+			IPath p = URIUtil.toPath(acDoc);
+			InputStream docStream = null;
+			if (p == null) {
+				URL url = acDoc.toURL();
+				docStream = url.openStream();
+			} else {
+				docStream = new FileInputStream(p.toFile());
+			}
+			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+			factory.setValidating(false);
+			DocumentBuilder builder = factory.newDocumentBuilder();
+			Document doc = builder.parse(docStream);
+			if (doc != null) {
+				BuildFunctionInfos d = new BuildFunctionInfos(doc);
+				d.buildCPPInfo(args[1]);
+			}
+			System.out.println("Built " + args[1] + " from " + args[0]);
+		} catch (URISyntaxException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (FileNotFoundException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (ParserConfigurationException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (SAXException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+	}
+
+}
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java
new file mode 100644
index 0000000..9585485
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java
@@ -0,0 +1,575 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2006, 2007, 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+/*
+ * Initially created on Jul 8, 2004
+ */
+
+/**
+ * @author Chris Moller, Red Hat, Inc.
+ * @author Jeff Johnston, Red Hat, Inc.  (rewrite to use ICHelpProvider)
+ * Modified to be org.eclipse.linuxtools.cdt.libhover package.
+ */
+
+package org.eclipse.linuxtools.internal.cdt.libhover;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.Map.Entry;
+
+import org.eclipse.cdt.core.dom.ast.DOMException;
+import org.eclipse.cdt.core.dom.ast.IASTName;
+import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
+import org.eclipse.cdt.core.dom.ast.IBinding;
+import org.eclipse.cdt.core.dom.ast.IType;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunction;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunctionType;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateArgument;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateDefinition;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateInstance;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameter;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameterMap;
+import org.eclipse.cdt.core.model.ILanguage;
+import org.eclipse.cdt.core.model.ITranslationUnit;
+import org.eclipse.cdt.ui.ICHelpBook;
+import org.eclipse.cdt.ui.ICHelpProvider;
+import org.eclipse.cdt.ui.ICHelpResourceDescriptor;
+import org.eclipse.cdt.ui.IFunctionSummary;
+import org.eclipse.cdt.ui.IRequiredInclude;
+import org.eclipse.cdt.ui.text.ICHelpInvocationContext;
+import org.eclipse.cdt.ui.text.IHoverHelpInvocationContext;
+import org.eclipse.cdt.ui.text.SharedASTJob;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.RegistryFactory;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.help.IHelpResource;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.linuxtools.cdt.libhover.ClassInfo;
+import org.eclipse.linuxtools.cdt.libhover.FunctionInfo;
+import org.eclipse.linuxtools.cdt.libhover.HelpBook;
+import org.eclipse.linuxtools.cdt.libhover.LibHoverInfo;
+import org.eclipse.linuxtools.cdt.libhover.LibhoverPlugin;
+import org.eclipse.linuxtools.cdt.libhover.MemberInfo;
+
+
+public class LibHover implements ICHelpProvider {
+	
+	public static String LIBHOVER_DOC_EXTENSION = LibhoverPlugin.PLUGIN_ID + ".library"; //$NON-NLS-1$
+
+    // see comment in initialize()
+    // private static String defaultSearchPath = null;
+    
+	private static HashMap<ICHelpBook, LibHoverLibrary> libraries = new HashMap<ICHelpBook, LibHoverLibrary>();
+	
+    static final String  constructTypes[] ={
+    	"dtype", // $NON-NLS-1$
+    	"enum",  // $NON-NLS-1$
+    	"function", // $NON-NLS-1$
+    	"groupsynopsis", // $NON-NLS-1$
+    	"struct", // $NON-NLS-1$
+    	"type",  // $NON-NLS-1$
+    	"union"  // $NON-NLS-1$
+    };
+    
+    static final int dtypeIndex         = 0;
+    static final int enumIndex          = 1;
+    static final int functionIndex      = 2;
+    static final int groupsynopsisIndex = 3;
+    static final int structIndex        = 4;
+    static final int typeIndex          = 5;
+    static final int unionIndex         = 6;
+
+    private static ArrayList<ICHelpBook> helpBooks = new ArrayList<ICHelpBook>();
+    public static boolean docsFetched = false;
+
+	public static synchronized void getLibHoverDocs() {
+		if (docsFetched)
+			return;
+//		System.out.println("getlibhoverdocs");
+		libraries.clear();
+		helpBooks.clear();
+		IExtensionRegistry x = RegistryFactory.getRegistry();
+		IConfigurationElement[] ces = x.getConfigurationElementsFor(LIBHOVER_DOC_EXTENSION);
+		for (int i = 0; i < ces.length; ++i) {
+			IConfigurationElement ce = ces[i];
+			if (ce.getName().equals("library")) { //$NON-NLS-1$
+				// see comment in initialize()
+				// Use the FileLocator class to open the magic hover doc file
+				// in the plugin's jar.
+				// Either open the html file or file system file depending
+				// on what has been specified.
+				String location = ce.getAttribute("location"); //$NON-NLS-1$
+				String name = ce.getAttribute("name"); //$NON-NLS-1$
+				String helpdocs = ce.getAttribute("docs"); //$NON-NLS-1$
+				String type = ce.getAttribute("type"); //$NON-NLS-1$
+				HelpBook h = new HelpBook(name, type);
+				helpBooks.add(h);
+				LibHoverLibrary l = new LibHoverLibrary(name, location, helpdocs, 
+						true);
+				libraries.put(h, l);
+				docsFetched = true;
+			}
+		}
+	}
+	
+	public void initialize() {
+		getLibHoverDocs();
+	}
+		
+	public ICHelpBook[] getCHelpBooks () {
+		ICHelpBook[] chelpbooks = new ICHelpBook[helpBooks.size()];
+		return helpBooks.toArray(chelpbooks);
+	}
+	
+	private class FunctionSummary implements IFunctionSummary, Comparable<FunctionSummary> {
+
+        private String Name;
+        private String NameSpace;
+        private String ReturnType;
+        private String Prototype;
+        private String Summary;
+        private boolean prototypeHasBrackets;
+        
+//        private String Synopsis;
+        private class RequiredInclude implements IRequiredInclude {
+        	private String include;
+        	
+        	public RequiredInclude (String file) {
+        		include = file;
+        	}
+        	
+        	public String getIncludeName() {
+        		return include;
+        	}
+        	
+        	public boolean isStandard() {
+        		return true;
+        	}
+        }
+        
+		public int compareTo (FunctionSummary x) {
+			FunctionSummary y = (FunctionSummary)x;
+			return getName().compareTo(y.getName());
+		}
+
+//        private RequiredInclude Includes[];
+        private ArrayList<RequiredInclude> Includes = new ArrayList<RequiredInclude>();
+
+        private void setIncludeName (String iname) {
+        	RequiredInclude nri = new RequiredInclude(iname);
+        	Includes.add(nri);
+        }
+
+        public class FunctionPrototypeSummary implements IFunctionPrototypeSummary {
+            public String getName()             { return Name; }
+            public String getReturnType()       { return ReturnType; }
+            public String getArguments()        { return Prototype; }
+            public String getPrototypeString(boolean namefirst) {
+                if (true == namefirst) {
+                	if (prototypeHasBrackets())
+                		return Name + " " + Prototype + " " + ReturnType; // $NON-NLS-1$ // $NON-NLS-2$
+                    return Name + " (" + Prototype + ") " + ReturnType; // $NON-NLS-1$ // $NON-NLS-2$
+                }
+                else {
+                	if (prototypeHasBrackets())
+                		return ReturnType + " " + Name + " " + Prototype; // $NON-NLS-1$ // $NON-NLS-2$
+                    return ReturnType + " " + Name + " (" + Prototype + ")"; // $NON-NLS-1$ // $NON-NLS-2$ // $NON-NLS-3$
+                }
+            }
+        }
+
+        public String getName()                         { return Name; }
+        public String getNamespace()                    { return NameSpace; }
+        public String getDescription()                  { return Summary; }
+        public boolean prototypeHasBrackets()			{ return prototypeHasBrackets; }
+        public void setPrototypeHasBrackets(boolean value)	{ prototypeHasBrackets = value; }
+        public IFunctionPrototypeSummary getPrototype() { return new FunctionPrototypeSummary(); }
+        
+        public IRequiredInclude[] getIncludes() {
+        	IRequiredInclude[] includes = new IRequiredInclude[Includes.size()];
+        	for (int i = 0; i < Includes.size(); ++i) {
+        		includes[i] = (IRequiredInclude)Includes.get(i);
+        	}
+        	return includes;
+        }
+        
+    }
+	
+	public boolean isCPPCharacter(int ch) {
+		return Character.isLetterOrDigit(ch) || ch == '_' || ch == ':'; 
+	}
+
+	private class EnclosingASTNameJob extends SharedASTJob {
+		private int tlength;
+		private int toffset;
+		private IASTName result = null;
+		public EnclosingASTNameJob (ITranslationUnit t, 
+				int toffset, int tlength) {
+			super("EnclosingASTNameJob", t); // $NON-NLS-1$
+			this.toffset = toffset;
+			this.tlength = tlength;
+		}
+		public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) {
+			if (ast != null) {
+				result = ast.getNodeSelector(null).findEnclosingName(toffset, tlength);
+			}
+			return Status.OK_STATUS;
+		}
+		public IASTName getASTName() {
+			return result;
+		}
+	}
+	
+	public class ASTDeclarationFinderJob extends SharedASTJob {
+		private IBinding binding;
+		private IASTName[] decls = null;
+		public ASTDeclarationFinderJob (ITranslationUnit t, IBinding binding) {
+			super("ASTDeclarationFinderJob", t); // $NON-NLS-1$
+			this.binding = binding;
+		}
+    	public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) {
+    		if (ast != null) {
+    			decls = ast.getDeclarationsInAST(binding);
+    		}
+    		return Status.OK_STATUS;
+    	}
+    	public IASTName[] getDeclarations() {
+    		return decls;
+    	}
+	}
+
+	public IFunctionSummary getFunctionInfo(ICHelpInvocationContext context, ICHelpBook[] helpBooks, String name) {
+        IFunctionSummary f;
+
+        f = null;
+        ITranslationUnit t = context.getTranslationUnit();
+        
+        String className = null;
+        ICPPFunctionType methodType = null;
+        
+        if (t.isCXXLanguage()) {
+        	try {
+        		if (context instanceof IHoverHelpInvocationContext) {
+        			// We know the file offset of the member reference.
+        			IRegion region = (IRegion)((IHoverHelpInvocationContext)context).getHoverRegion();
+        			
+        			// Now, let's find the declaration of the method.  We need to do this because we want the specific
+        			// member prototype to go searching for.  There could be many members called "x" which have different
+        			// documentation.
+           			final IASTName[] result= {null};
+           			EnclosingASTNameJob job = new EnclosingASTNameJob(t, region.getOffset(), region.getLength());
+           			job.schedule();
+           			try {
+           				job.join();
+           			} catch (InterruptedException e) {
+           				// TODO Auto-generated catch block
+           				e.printStackTrace();
+           			}
+           			if (job.getResult() == Status.OK_STATUS)
+           				result[0] = job.getASTName();
+        			if (result[0] != null) {
+        				final IBinding binding = result[0].getBinding();
+        				// Check to see we have a member function.
+        				if (binding instanceof ICPPFunction) {
+        					methodType = ((ICPPFunction)binding).getType();
+        					// We have a member function, find the class name.
+        					IBinding owner = ((ICPPFunction)binding).getOwner();
+        					if (owner instanceof ICPPClassType) {
+        						className = getClassName((ICPPClassType)owner);
+        					}
+        				}
+        			}
+        		}
+        	} catch (IllegalArgumentException e) {
+        		// TODO Auto-generated catch block
+        		e.printStackTrace();
+        	} catch (DOMException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+        }
+        	
+        // Loop through all the documents we have and report first match.
+        for (int i = 0; i < helpBooks.length; ++i) {
+        	LibHoverLibrary l = libraries.get(helpBooks[i]);
+        	if (name != null) {
+        		if (className != null) {
+        			if (l.isCPP())
+        				f = getMemberSummary(l, className, name, methodType);
+        		} else {
+        			f = getFunctionSummary(l, name);
+        		}
+        		if (f != null)
+        			return f;
+        	}
+        }
+        
+        return null;
+	}
+
+	// Get the class name for a type, including any instance template parameters
+	// e.g. std::basic_string<char>
+	private String getClassName(ICPPClassType c) {
+		String className = null;
+		try {
+			String[] qualified = c.getQualifiedName();
+			className = qualified[0];
+			for (int k = 1; k < qualified.length; ++k) {
+				className += "::" + qualified[k];
+			}
+
+			// Check if we have an instance of a template class.	
+			if (c instanceof ICPPTemplateInstance) {
+				ICPPTemplateInstance ti = (ICPPTemplateInstance)c;
+				// Get a map which tells us the values of the template
+				// arguments (e.g. _CharT maps to char in the instance).
+				ICPPTemplateParameterMap tiMap = ti.getTemplateParameterMap();
+				ICPPTemplateDefinition td = ti.getTemplateDefinition();
+				ICPPTemplateParameter[] templateArgs = td.getTemplateParameters();
+				className += "<";
+				String separator = "";
+				for (int x = 0; x < templateArgs.length; ++x) {
+					ICPPTemplateParameter tp = templateArgs[x];
+					ICPPTemplateArgument ta = tiMap.getArgument(tp);
+					IType type = null;
+					// The template may have a type specified or a value.
+					// In the case of a value, figure out its type and use
+					// that when we do a lookup.
+					if (ta.isTypeValue())
+						type = ta.getTypeValue();
+					else
+						type = ta.getTypeOfNonTypeValue();
+					if (tp.getTemplateNestingLevel() == 0) {
+						// if the parameter is a class type, use recursion to
+						// get its class name including template parameters
+						if (type instanceof ICPPClassType)
+							className += separator + getClassName((ICPPClassType)type);
+						else
+							className += separator + type.toString();
+						separator = ",";
+					}
+				}
+				className += ">";
+			}
+		} catch(DOMException e) {
+			return null;
+		}
+		return className;
+	}
+	
+	private IFunctionSummary getFunctionSummary(LibHoverLibrary l, String name) {
+		FunctionInfo x = l.getFunctionInfo(name);
+		if (x != null) {
+			FunctionSummary f = new FunctionSummary();
+			f.ReturnType = x.getReturnType();
+			f.Prototype = x.getPrototype();
+			f.Summary = x.getDescription();
+			f.Name = x.getName();
+			ArrayList<String> headers = x.getHeaders();
+			for (int i = 0; i < headers.size(); ++i)
+				f.setIncludeName(headers.get(i));
+			return f;
+		}
+		return null;
+	}
+	
+	private IFunctionSummary getMemberSummary(LibHoverLibrary l, String className, 
+			String memberName, ICPPFunctionType methodType) {
+
+		ArrayList<String> templateTypes = new ArrayList<String>();
+		ClassInfo info = l.getClassInfo(className, templateTypes);
+		String[] args = new String[0];
+		@SuppressWarnings("unused")
+		IType returnType = null;
+		if (info == null)
+			return null;
+		if (methodType != null) {
+			try {
+				args = resolveArgs(info, methodType.getParameterTypes(), templateTypes);
+				returnType = methodType.getReturnType();
+			} catch (Exception e) {
+				return null;
+			}
+//			for (int i = 0; i < args.length; ++i)
+//				System.out.println("args<" + i + "> is " + args[i].toString());
+//			System.out.println("return type is " + returnType.toString());
+			
+		}
+		MemberInfo member = info.getMember(memberName);
+		if (member != null) {
+			MemberInfo m = null;
+			if (!isParmMatch(member, args, templateTypes, info)) {
+				ArrayList<MemberInfo> members = member.getChildren();
+				for (int i = 0; i < members.size(); ++i) {
+					MemberInfo k = members.get(i);
+					if (isParmMatch(k, args, templateTypes, info)) {
+						m = k;
+						break;
+					}
+				}
+			} else {
+				m = member;
+			}
+			
+			if (m != null) {
+				// FIXME: do some work to determine parameters and return type.
+				FunctionSummary f = new FunctionSummary();
+				f.ReturnType = m.getReturnType();
+				f.Prototype = m.getPrototype();
+				f.Summary = m.getDescription();
+//				String actualClassName = className.substring(className.indexOf("::")+2); // $NON-NLS-1$
+				f.Name = className + "::" + memberName; // $NON-NLS-1$
+				String[] templateParms = info.getTemplateParms();
+				for (int i = 0; i < templateTypes.size(); ++i) {
+					f.ReturnType = f.ReturnType.replaceAll(templateParms[i], templateTypes.get(i));
+					f.Prototype = f.Prototype.replaceAll(templateParms[i], templateTypes.get(i));
+					f.Name = f.Name.replaceAll(templateParms[i], templateTypes.get(i));
+				}
+				if (f.ReturnType.indexOf('<') >= 0) {
+					f.ReturnType = f.ReturnType.replaceAll("<", "&lt;");
+					f.ReturnType = f.ReturnType.replaceAll(">", "&gt;");
+				}
+				if (f.Prototype.indexOf('<') >= 0) {
+					f.Prototype = f.Prototype.replaceAll("<", "&lt;");
+					f.Prototype = f.Prototype.replaceAll(">", "&gt;");
+				}
+				if (f.Name.indexOf('<') >= 0) {
+					f.Name = f.Name.replaceAll("<", "&lt;");
+					f.Name = f.Name.replaceAll(">", "&gt;");
+				}
+				f.setPrototypeHasBrackets(true);
+				f.setIncludeName(info.getInclude());
+				return f;
+			}
+		}
+		return null;
+	}
+     
+ 	
+	private boolean isParmMatch(MemberInfo m, String[] args, ArrayList<String> templateTypes, ClassInfo info) {
+		String[] memberParms = m.getParamTypes();
+		for (int i = 0; i < memberParms.length; ++i) {
+			String[] templateParms = info.getTemplateParms();
+			for (int j = 0; j < templateTypes.size(); ++j) {
+				memberParms[i] = memberParms[i].replaceAll(templateParms[j], templateTypes.get(j));
+			}
+		}
+		return Arrays.equals(memberParms, args);
+	}
+
+	private String[] resolveArgs(ClassInfo info, IType[] parameterTypes, ArrayList<String> templateTypes) {
+		String[] templateParms = info.getTemplateParms();
+		String[] result = new String[parameterTypes.length];
+		for (int i = 0; i < parameterTypes.length; ++i) {
+			String param = parameterTypes[i].toString();
+			param = param.replaceAll("\\{.*\\}", "");
+			param = param.trim();
+			int index = param.indexOf("#");
+			while (index >= 0) {
+				// We assume no class has more than 9 template parms.
+				int digit = param.charAt(index + 1) - '0';
+				// where possible, replace template parms with real values
+				if (digit < templateTypes.size())
+					param = param.replaceFirst(param.substring(index, index + 2), templateTypes.get(digit));
+				else
+					param = param.replaceFirst(param.substring(index, index + 2), templateParms[digit]);
+				index = param.indexOf("#");
+			}
+			result[i] = param;
+		}
+		return result;
+	}
+
+	public IFunctionSummary[] getMatchingFunctions(ICHelpInvocationContext context, ICHelpBook[] helpBooks, String prefix) {
+		ArrayList<IFunctionSummary> fList = new ArrayList<IFunctionSummary>();
+
+		for (int di = 0; di < helpBooks.length; ++di) {
+			LibHoverLibrary l = libraries.get(helpBooks[di]);
+			LibHoverInfo cppInfo = l.getHoverInfo();
+			SortedMap<String, FunctionInfo> map = cppInfo.functions.tailMap(prefix);
+			Set<Map.Entry<String, FunctionInfo>> c = map.entrySet();
+			for (Iterator<Entry<String, FunctionInfo>> i = c.iterator(); i.hasNext();) {
+				Map.Entry<String, FunctionInfo> e = (Map.Entry<String, FunctionInfo>)i.next();
+				FunctionInfo x = e.getValue();
+				if (x.getName().startsWith(prefix)) {
+					FunctionSummary f = new FunctionSummary();
+					f.ReturnType = x.getReturnType();
+					f.Prototype = x.getPrototype();
+					f.Summary = x.getDescription();
+					f.Name = x.getName();
+					ArrayList<String> headers = x.getHeaders();
+					for (int i1 = 0; i1 < headers.size(); ++i1)
+						f.setIncludeName(headers.get(i1));
+					fList.add(f);
+				}
+			}
+		}
+		IFunctionSummary[] summaries = new IFunctionSummary[fList.size()];
+		for (int k = 0; k < summaries.length; k++) {
+			summaries[k] = (IFunctionSummary)fList.get(k);
+		}
+		return summaries;
+	}
+	
+	private class HelpResource implements IHelpResource {
+		private String href;
+		private String label;
+		public HelpResource(String href, String label) {
+			this.href = href;
+			this.label = label;
+		}
+		public String getHref() {
+			return href;
+		}
+		public String getLabel() {
+			return label;
+		}
+	}
+	
+	private class HelpResourceDescriptor implements ICHelpResourceDescriptor {
+		private ICHelpBook helpbook;
+		
+		public HelpResourceDescriptor(ICHelpBook helpbook) {
+			this.helpbook = helpbook;
+		}
+		
+		public ICHelpBook getCHelpBook() {
+			return helpbook;
+		}
+		
+		public IHelpResource[] getHelpResources() {
+			LibHoverLibrary l = libraries.get(helpbook);
+			if (l != null) {
+				IHelpResource[] hr = new IHelpResource[1];
+				hr[0] = new HelpResource(l.getLocation(), l.getName());
+				return hr;
+			}
+			return null;
+		}
+	}
+	
+	public ICHelpResourceDescriptor[] getHelpResources(ICHelpInvocationContext context, ICHelpBook[] helpBooks, String name) {
+		for (int i = 0; i < helpBooks.length; ++i) {
+			IFunctionSummary fs = getFunctionInfo(context, new ICHelpBook[]{helpBooks[i]}, name);
+			if (fs != null) {
+				return new HelpResourceDescriptor[]{new HelpResourceDescriptor(helpBooks[i])};
+			}
+		}
+		return null;
+	}
+}
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java
new file mode 100644
index 0000000..d131058
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java
@@ -0,0 +1,218 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.libhover;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+
+import org.eclipse.core.filesystem.URIUtil;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.linuxtools.cdt.libhover.ClassInfo;
+import org.eclipse.linuxtools.cdt.libhover.FunctionInfo;
+import org.eclipse.linuxtools.cdt.libhover.LibHoverInfo;
+import org.eclipse.linuxtools.cdt.libhover.LibhoverPlugin;
+import org.eclipse.linuxtools.cdt.libhover.TypedefInfo;
+
+public class LibHoverLibrary {
+	private String name;
+	private String location;
+	private String docs;
+	private boolean isCPP;
+	private LibHoverInfo hoverInfo = new LibHoverInfo();
+	private boolean haveReadHoverInfo = false;
+
+	public LibHoverLibrary(String name, String location, String docs, 
+			boolean isCPP) {
+		this.name = name;
+		this.location = location;
+		this.docs = docs;
+		this.isCPP = isCPP;
+	}
+	
+	/**
+	 * Get the name of the library
+	 * 
+	 * @return the name of the library
+	 */
+	public String getName() { 
+		return name; 
+	}
+	
+	/**
+	 * Get the location of the library hover info (URL or file name)
+	 * 
+	 * @return the URL or file name string for the library hover info location
+	 */
+	public String getLocation() {
+		return location;
+	}
+	
+	/**
+	 * Get the browser help documentation URL for this library
+	 * 
+	 * @return the name of the help documentation URL
+	 */
+	public String getDocs() {
+		return docs;
+	}
+	
+	/**
+	 * Is this library a C++ library?
+	 * 
+	 * @return true if C++ library, false otherwise
+	 */
+	public boolean isCPP() {
+		return isCPP;
+	}
+
+	/**
+	 * Get the library hover info for this library
+	 * 
+	 * @return the library hover info for this library
+	 */
+	public LibHoverInfo getHoverInfo() {
+		// We lazily get the hover info for this library since it is possible
+		// the user will never access or ultimately need it if another library
+		// supplies the information first.
+		if (!haveReadHoverInfo) {
+			URI acDoc;
+			try {
+				acDoc = new URI(location);
+				IPath p = URIUtil.toPath(acDoc);
+				InputStream docStream = null;
+				if (p == null) {
+					URL url = acDoc.toURL();
+					docStream = url.openStream();
+				} else {
+					try {
+						// Try to open the file as local to this plug-in.
+						docStream = FileLocator.openStream(LibhoverPlugin.getDefault().getBundle(), p, false);
+					} catch (IOException e) {
+						// File is not local to plug-in, try file system.
+						docStream = new FileInputStream(p.toFile());
+					}
+				}
+				ObjectInputStream input = new ObjectInputStream(docStream);
+				hoverInfo = (LibHoverInfo)input.readObject();
+				haveReadHoverInfo = true;
+				input.close();
+				docStream.close();
+			} catch (URISyntaxException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (ClassNotFoundException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		return hoverInfo;
+	}
+	
+	/**
+	 * Set the library hover info.
+	 * 
+	 * @param hoverInfo the library hover info to set
+	 */
+	public void setHoverinfo(LibHoverInfo hoverInfo) {
+		this.hoverInfo = hoverInfo;
+	}
+	
+	/**
+	 * Fetch the class info for a given class.
+	 * 
+	 * @param className the name of the class to fetch info for
+	 * @return ClassInfo or null if no class info can be found
+	 */
+	public ClassInfo getClassInfo(String className, ArrayList<String> templateTypes) {
+		String typedefName = className.replaceAll("<.*>", "<>"); // $NON-NLS-1$ // $NON-NLS-2$
+		TypedefInfo typedef = getHoverInfo().typedefs.get(typedefName);
+		if (typedef != null) {
+			className = typedef.getTransformedType(className);  // Reset class name to typedef transformation
+		}
+		int index = className.indexOf('<');
+		// Check if it is a template reference.
+		if (index != -1) {
+			resolveTemplateTypes(className, templateTypes, index);
+			// It is.  We want to see if there are partial specific templates
+			// and we choose the first match.  If nothing matches our particular
+			// case, we fall back on the initial generic template.
+			ClassInfo info = getHoverInfo().classes.get(className.substring(0, index));
+			if (info != null) {
+				ArrayList<ClassInfo> children = info.getChildren();
+				if (children != null && children.size() > 0) {
+					for (int x = 0; x < children.size(); ++x) {
+						ClassInfo child = children.get(x);
+						if (className.matches(child.getClassName())) {
+							info = child;
+							break;
+						}
+					}
+				}
+			}
+			return info;
+		}
+		// Otherwise no template, just fetch the class info directly.
+		return getHoverInfo().classes.get(className);
+	}
+	
+	private void resolveTemplateTypes(String className,
+			ArrayList<String> templateTypes, int index) {
+		int startIndex = index + 1;
+		int i = startIndex;
+		int count = 1;
+		while (count > 0 && i < className.length()) {
+			char x = className.charAt(i);
+			switch (x) {
+			case ('<'):
+				++count;
+			break;
+			case ('>'):
+				--count;
+				if (count == 0)
+					templateTypes.add(className.substring(startIndex, i).trim());
+			break;
+			case (','): {
+				if (count == 1) {
+					templateTypes.add(className.substring(startIndex, i).trim());
+					startIndex = i + 1;
+				}
+			}
+			break;
+			}
+			++i;
+		}
+	}
+
+	/**
+	 * Fetch the function info for a given function.
+	 * 
+	 * @param name of function to find info for
+	 * @return FunctionInfo or null if no function info exists
+	 */
+	public FunctionInfo getFunctionInfo(String name) {
+		return getHoverInfo().functions.get(name);
+	}
+}
+
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverMessages.java b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverMessages.java
new file mode 100644
index 0000000..8a47247
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverMessages.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2006, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ * Red Hat Inc. - Modification to use with LibHover
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.cdt.libhover;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+/**
+ * MakefilePreferencesMessages
+ */
+public class LibHoverMessages {
+
+	/**
+	 * 
+	 */
+	private LibHoverMessages() {
+	}
+
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.cdt.libhover.LibHoverMessages"; //$NON-NLS-1$
+
+	public static String getString(String key) {
+		try {
+			return ResourceBundle.getBundle(BUNDLE_NAME).getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		} catch (NullPointerException e) {
+			return '#' + key + '#';
+		}
+	}	
+
+}
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverMessages.properties b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverMessages.properties
new file mode 100644
index 0000000..c187c96
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverMessages.properties
@@ -0,0 +1,16 @@
+#################################################################################
+#  Copyright (c) 2007 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+# 
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+LibcHelpResource.label=C Library Help
+LibcHelpBook.title=C Library Functions
+FileListControl.moveup=Move Up
+FileListControl.movedown=Move Down
+LibhoverPreferences.title=C/C++ Library Hover Enablement
+Libhover.projectSpecific.msg=Use project specific settings
\ No newline at end of file
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/preferences/CheckboxFieldEditor.java b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/preferences/CheckboxFieldEditor.java
new file mode 100644
index 0000000..546b4f5
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/preferences/CheckboxFieldEditor.java
@@ -0,0 +1,394 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.libhover.preferences;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import org.eclipse.cdt.ui.newui.UIMessages;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.preference.FieldEditor;
+import org.eclipse.jface.viewers.CheckStateChangedEvent;
+import org.eclipse.jface.viewers.CheckboxTableViewer;
+import org.eclipse.jface.viewers.ICheckStateListener;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.linuxtools.internal.cdt.libhover.LibHoverMessages;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Table;
+
+public class CheckboxFieldEditor extends FieldEditor {
+
+	private String extensionID;
+	private String preferenceName;
+	private HashMap<String, String> mapItems = new HashMap<String, String>();
+	private Table table;
+	private CheckboxTableViewer tv;
+	private Button[] buttons;
+	private Composite usercomp; // space where user can create widgets 
+	private Composite buttoncomp; // space for buttons on the right
+
+	
+	public static final String EMPTY_STR = ""; //$NON-NLS-1$
+	public static final String MOVEUP_STR = LibHoverMessages.getString("FileListControl.moveup"); //$NON-NLS-1$
+	public static final String MOVEDOWN_STR = LibHoverMessages.getString("FileListControl.movedown"); //$NON-NLS-1$
+
+	public CheckboxFieldEditor(String extensionID, String preferenceName, String label, Composite parent) {
+		this.extensionID = extensionID;
+		this.preferenceName = preferenceName;
+		init(preferenceName, label);
+		createControl(parent);
+	}
+	
+	
+	@Override
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.FieldEditor#adjustForNumColumns(int)
+	 */
+	protected void adjustForNumColumns(int numColumns) {
+		if (numColumns > 1) {
+			Control control = getLabelControl();
+			if (control != null) {
+				((GridData)control.getLayoutData()).horizontalSpan = numColumns;
+			}
+			((GridData)table.getLayoutData()).horizontalSpan = numColumns - 1;
+			((GridData)buttoncomp.getLayoutData()).horizontalSpan = 1;
+		} else {
+			Control control = getLabelControl();
+			if (control != null) {
+				((GridData)control.getLayoutData()).horizontalSpan = 1;
+			}
+			((GridData)usercomp.getLayoutData()).horizontalSpan = 1;
+			((GridData)buttoncomp.getLayoutData()).horizontalSpan = 1;
+		}
+	}
+
+
+	@Override
+	// TODO Auto-generated method stub
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.FieldEditor#doFillIntoGrid(org.eclipse.swt.widgets.Composite, int)
+	 */
+	protected void doFillIntoGrid(Composite parent, int numColumns) {
+		int checkC = 1;
+		if (numColumns > 1) {
+			checkC = numColumns - 1;
+		}
+		Control control = getLabelControl(parent);
+		GridData gd = new GridData();
+		gd.horizontalSpan = numColumns;
+		control.setLayoutData(gd);
+		control = getCheckboxControl(parent);
+		gd = new GridData();
+		gd.horizontalSpan = checkC;
+		gd.horizontalAlignment = GridData.FILL;
+		gd.verticalAlignment = GridData.FILL;
+		gd.grabExcessHorizontalSpace = true;
+		gd.grabExcessVerticalSpace = true;
+		control.setLayoutData(gd);
+		control.setFont(parent.getFont());
+		control = getButtonControl(parent);
+		gd = new GridData();
+		gd.horizontalSpan = 1;
+		gd.horizontalAlignment = GridData.FILL;
+		control.setLayoutData(gd);
+		control.setFont(parent.getFont());
+	}
+
+	private void getExtensions() {
+		mapItems.clear();
+		IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(
+				extensionID);
+		if (point != null) {
+			IExtension[] exts = point.getExtensions();
+			for (IExtension ext : exts) {
+				if (ext.getConfigurationElements().length > 0) {
+					mapItems.put(ext.getUniqueIdentifier(), ext.getLabel());
+				}
+			}
+		}
+	}
+	
+	@SuppressWarnings("unchecked")
+	@Override
+	protected void doLoad() {
+		// Combine user preference string with existing libhover extensions.
+		getExtensions();
+		HashMap<String,String> copyMap = (HashMap<String,String>)mapItems.clone();
+		ArrayList<TableData> data = new ArrayList<TableData>();
+		ArrayList<TableData> checkedData = new ArrayList<TableData>();
+		// See what the user has set in preferences and make sure that
+		// any libhover referred to is a valid current extension.
+		// Drop any preference for a non-existent extension.
+		String pref = getPreferenceStore().getString(preferenceName);
+		String[] tokens = pref.split(":");
+		if (tokens.length > 1) {
+			for (int i = 0; i < tokens.length; i+=2) {
+				String id = tokens[i];
+				Boolean checked = Boolean.valueOf(tokens[i+1]);
+				String value = copyMap.get(id);
+				if (value != null) {
+					TableData d = new TableData(id, value);
+					data.add(d);
+					if (checked)
+						checkedData.add(d);
+					copyMap.remove(id);
+				}
+			}
+		}
+		// Add remaining libhover extensions to end of list as checked by default
+		String[] leftovers = new String[copyMap.size()];
+		leftovers = copyMap.keySet().toArray(leftovers);
+		for (int i = 0; i < leftovers.length; ++i) {
+			TableData d = new TableData(leftovers[i], copyMap.get(leftovers[i]));
+			data.add(d);
+			checkedData.add(d);
+		}
+		tv.setInput(data.toArray());
+		tv.setCheckedElements(checkedData.toArray());
+		updateButtons();
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	protected void doLoadDefault() {
+	    // Default is to find all current extensions and turn them on by default.
+		getExtensions();
+		HashMap<String,String> copyMap = (HashMap<String,String>)mapItems.clone();
+		ArrayList<TableData> data = new ArrayList<TableData>();
+		ArrayList<TableData> checkedData = new ArrayList<TableData>();
+		String[] ids = new String[copyMap.size()];
+		ids = copyMap.keySet().toArray(ids);
+		for (int i = 0; i < ids.length; ++i) {
+			TableData d = new TableData(ids[i], copyMap.get(ids[i]));
+			data.add(d);
+			checkedData.add(d);
+		}
+		tv.setInput(data.toArray());
+		tv.setCheckedElements(checkedData.toArray());
+		updateButtons();
+	}
+
+	@Override
+	protected void doStore() {
+		save();
+	}
+
+	@Override
+	public int getNumberOfControls() {
+		return 3;
+	}
+
+	public Control getButtonControl(Composite parent) {
+		if (buttoncomp == null) {
+			buttoncomp = new Composite(parent, SWT.NONE);
+			GridData d = new GridData(GridData.END);
+			d.widthHint = 1;
+			buttoncomp.setLayoutData(d);
+			buttoncomp.setFont(parent.getFont());
+			initButtons(buttoncomp, new String[] {
+					MOVEUP_STR, MOVEDOWN_STR, null, 
+					UIMessages.getString("ErrorParsTab.0"), //$NON-NLS-1$
+					UIMessages.getString("ErrorParsTab.1")  //$NON-NLS-1$
+			});
+		}
+		return buttoncomp;
+	}
+	
+	public Control getCheckboxControl(Composite parent) {
+		if (table == null) {
+//			parent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+			table = new Table(parent, SWT.BORDER | SWT.CHECK | SWT.SINGLE);
+			table.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+			table.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					updateButtons();
+				}});
+			tv = new CheckboxTableViewer(table);
+			tv.setContentProvider(new IStructuredContentProvider() {
+				public Object[] getElements(Object inputElement) {
+					return (Object[])inputElement;
+				}
+				public void dispose() {}
+				public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}
+			});
+
+			tv.addCheckStateListener(new ICheckStateListener() {
+				public void checkStateChanged(CheckStateChangedEvent e) {
+				}
+			});
+
+		}
+		return table;
+	}
+	/**
+	 * Ability to create standard button on any composite.
+	 * @param c
+	 * @param names
+	 */
+	protected void initButtons(Composite c, String[] names) {
+		initButtons(c, names, 80);
+	}
+	protected void initButtons(Composite c, String[] names, int width) {
+		if (names == null || names.length == 0) return;
+		c.setLayoutData(new GridData(GridData.FILL_VERTICAL));
+	    c.setLayout(new GridLayout(1, false));
+		buttons = new Button[names.length];
+		for (int i=0; i<names.length; i++) {
+			buttons[i] = new Button(c, SWT.PUSH);
+			buttons[i].setFont(c.getFont());
+			GridData gdb = new GridData(GridData.VERTICAL_ALIGN_CENTER);
+			gdb.grabExcessHorizontalSpace = false;
+			gdb.horizontalAlignment = SWT.FILL;
+			gdb.minimumWidth = width;
+			
+			if (names[i] != null)
+				buttons[i].setText(names[i]);
+			else { // no button, but placeholder ! 
+				buttons[i].setVisible(false);
+				buttons[i].setEnabled(false);
+				gdb.heightHint = 10;
+			}
+			
+			buttons[i].setLayoutData(gdb);
+			buttons[i].addSelectionListener(new SelectionAdapter() {
+		        @Override
+				public void widgetSelected(SelectionEvent event) {
+		        	buttonPressed(event);
+		        }});
+		}
+	}
+	
+	/**
+	 * 
+	 * @param e - event to be handled
+	 */
+	private void buttonPressed(SelectionEvent e) {
+		for (int i=0; i<buttons.length; i++) {
+			if (buttons[i].equals(e.widget)) {
+				buttonPressed(i);
+				return;
+			}
+		}
+	}
+
+	public void buttonPressed (int n) {
+		switch (n) {
+		case 0: // up
+			moveItem(true);
+			break;
+		case 1: // down
+			moveItem(false);
+			break;
+		case 2: // do nothing - it's not a button
+			break;
+			
+		case 3: // check all
+			tv.setAllChecked(true);
+			break;
+		case 4: // uncheck all	
+			tv.setAllChecked(false);
+			break;
+		default:
+			break;
+		}
+	}
+
+	// Move item up / down
+	private void moveItem(boolean up) {
+		int n = table.getSelectionIndex();
+		if (n < 0 || 
+				(up && n == 0) || 
+				(!up && n+1 == table.getItemCount()))
+			return;
+		TableData d = (TableData)tv.getElementAt(n);
+		boolean checked = tv.getChecked(d);
+		tv.remove(d);
+		n = up ? n - 1 : n + 1;
+		tv.insert(d, n);
+		tv.setChecked(d, checked);
+		table.setSelection(n);
+	}
+	/**
+	 * Changes state of existing button.
+	 * Does nothing if index is invalid
+	 * 
+	 * @param i - button index
+	 * @param state - required state
+	 */
+	protected void buttonSetEnabled(int i, boolean state) {
+		if (buttons == null || buttons.length <= i ) return;
+		buttons[i].setEnabled(state);
+	}
+	
+	public void updateButtons() {
+		int cnt = table.getItemCount();
+		int pos = table.getSelectionIndex();
+		buttonSetEnabled(0, pos > 0);
+		buttonSetEnabled(1, pos != -1 && pos < (cnt - 1));
+		buttonSetEnabled(3, cnt > 0);
+		buttonSetEnabled(4, cnt > 0);
+	}
+
+	class TableData {
+		String key;
+		String value;
+		public TableData (String _key, String _value) {
+			key   = _key;
+			value = _value;
+		}
+		@Override
+		public String toString() { return value; } 
+	}
+	
+	private void save() {
+		boolean inRange = true;
+		int i = 0;
+		String outString = new String();
+		String del = "";
+		while (inRange) {
+			TableData t;
+			Object obj = tv.getElementAt(i);
+			if (obj == null)
+				inRange = false;
+			else {
+				++i;
+				t = (TableData)obj;
+				outString += del + t.key + ":" + tv.getChecked(obj);
+				del = ":";
+			}
+		}
+		if (outString.length() > 1)
+			getPreferenceStore().setValue(preferenceName, outString);
+	}
+	
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jface.preference.FieldEditor#setEnabled(boolean,
+	 *      org.eclipse.swt.widgets.Composite)
+	 */
+	public void setEnabled(boolean enabled, Composite parent) {
+		super.setEnabled(enabled, parent);
+		getCheckboxControl(parent).setEnabled(enabled);
+		getButtonControl(parent).setEnabled(enabled);
+	}
+}
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/preferences/LibHoverPreferencePage.java b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/preferences/LibHoverPreferencePage.java
new file mode 100644
index 0000000..c86aff4
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/preferences/LibHoverPreferencePage.java
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.libhover.preferences;
+
+import org.eclipse.jface.preference.*;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.linuxtools.cdt.libhover.LibhoverPlugin;
+import org.eclipse.linuxtools.internal.cdt.libhover.LibHover;
+import org.eclipse.linuxtools.internal.cdt.libhover.LibHoverMessages;
+
+/**
+ * This class represents a preference page that
+ * is contributed to the Preferences dialog. By 
+ * subclassing <samp>FieldEditorPreferencePage</samp>, we
+ * can use the field support built into JFace that allows
+ * us to create a page that is small and knows how to 
+ * save, restore and apply itself.
+ * <p>
+ * This page is used to modify preferences only. They
+ * are stored in the preference store that belongs to
+ * the main plug-in class. That way, preferences can
+ * be accessed directly via the preference store.
+ */
+
+public class LibHoverPreferencePage
+	extends FieldEditorPreferencePage
+	implements IWorkbenchPreferencePage {
+	
+	public LibHoverPreferencePage() {
+		super(GRID);
+		setPreferenceStore(LibhoverPlugin.getDefault().getPreferenceStore());
+	}
+	
+	/**
+	 * Creates the field editors. Field editors are abstractions of
+	 * the common GUI blocks needed to manipulate various types
+	 * of preferences. Each field editor knows how to save and
+	 * restore itself.
+	 */
+	public void createFieldEditors() {
+		addField(new CheckboxFieldEditor(LibHover.LIBHOVER_DOC_EXTENSION,
+				PreferenceConstants.P_LIBHOVER,
+				LibHoverMessages.getString("LibhoverPreferences.title"),
+				getFieldEditorParent()));
+//		addField(new DirectoryFieldEditor(PreferenceConstants.P_PATH, 
+//				"&Directory preference:", getFieldEditorParent()));
+//		addField(
+//			new BooleanFieldEditor(
+//				PreferenceConstants.P_BOOLEAN,
+//				"&An example of a boolean preference",
+//				getFieldEditorParent()));
+//
+//		addField(new RadioGroupFieldEditor(
+//				PreferenceConstants.P_CHOICE,
+//			"An example of a multiple-choice preference",
+//			1,
+//			new String[][] { { "&Choice 1", "choice1" }, {
+//				"C&hoice 2", "choice2" }
+//		}, getFieldEditorParent()));
+//		addField(
+//			new StringFieldEditor(PreferenceConstants.P_STRING, "A &text preference:", getFieldEditorParent()));
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
+	 */
+	public void init(IWorkbench workbench) {
+	}
+	
+}
\ No newline at end of file
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/preferences/PreferenceConstants.java b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/preferences/PreferenceConstants.java
new file mode 100644
index 0000000..709d6ca
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/preferences/PreferenceConstants.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.libhover.preferences;
+
+/**
+ * Constant definitions for plug-in preferences
+ */
+public class PreferenceConstants {
+
+	public static String P_LIBHOVER = "libhoverPreference"; //$NON-NLS-1$
+	
+}
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/preferences/PreferenceInitializer.java b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/preferences/PreferenceInitializer.java
new file mode 100644
index 0000000..4fd11a6
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/preferences/PreferenceInitializer.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.libhover.preferences;
+
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.jface.preference.IPreferenceStore;
+
+import org.eclipse.linuxtools.cdt.libhover.LibhoverPlugin;
+
+/**
+ * Class used to initialize default preference values.
+ */
+public class PreferenceInitializer extends AbstractPreferenceInitializer {
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
+	 */
+	public void initializeDefaultPreferences() {
+		IPreferenceStore store = LibhoverPlugin.getDefault().getPreferenceStore();
+		store.setDefault(PreferenceConstants.P_LIBHOVER, "");
+//		store.setDefault(PreferenceConstants.P_BOOLEAN, true);
+//		store.setDefault(PreferenceConstants.P_CHOICE, "choice2");
+//		store.setDefault(PreferenceConstants.P_STRING,
+//				"Default value");
+	}
+
+}
diff --git a/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/properties/LibHoverPropertyPage.java b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/properties/LibHoverPropertyPage.java
new file mode 100644
index 0000000..aca9cf0
--- /dev/null
+++ b/libhover/0.5.0/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/properties/LibHoverPropertyPage.java
@@ -0,0 +1,465 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.libhover.properties;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import org.eclipse.cdt.ui.newui.UIMessages;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.QualifiedName;
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.jface.viewers.CheckStateChangedEvent;
+import org.eclipse.jface.viewers.CheckboxTableViewer;
+import org.eclipse.jface.viewers.ICheckStateListener;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.linuxtools.cdt.libhover.LibhoverPlugin;
+import org.eclipse.linuxtools.internal.cdt.libhover.LibHover;
+import org.eclipse.linuxtools.internal.cdt.libhover.LibHoverMessages;
+import org.eclipse.linuxtools.internal.cdt.libhover.preferences.PreferenceConstants;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.ui.dialogs.PropertyPage;
+
+public class LibHoverPropertyPage extends PropertyPage {
+
+	private static final String PROJECT_SPECIFIC_MSG = "Libhover.projectSpecific.msg"; //$NON-NLS-1$
+	private static final String LIBHOVER_PROPERTY = "LIBHOVER"; //$NON-NLS-1$
+	
+	private QualifiedName libhoverProperty = new QualifiedName(LibhoverPlugin.getID(), LIBHOVER_PROPERTY);
+
+	private Button projectSpecific;
+
+	private HashMap<String, String> mapItems = new HashMap<String, String>();
+	
+	private Table table;
+	private CheckboxTableViewer tv;
+	private Button[] buttons; 
+	private Composite buttoncomp; // space for buttons on the right
+	
+	public static final String EMPTY_STR = ""; //$NON-NLS-1$
+	public static final String MOVEUP_STR = LibHoverMessages.getString("FileListControl.moveup"); //$NON-NLS-1$
+	public static final String MOVEDOWN_STR = LibHoverMessages.getString("FileListControl.movedown"); //$NON-NLS-1$
+
+	/**
+	 * Constructor for LibhoverPropertyPage.
+	 */
+	public LibHoverPropertyPage() {
+		super();
+		setPreferenceStore(LibhoverPlugin.getDefault().getPreferenceStore());
+	}
+
+	private IProject getProject() {
+		IResource r = (IResource)getElement().getAdapter(IResource.class);
+		return r.getProject();
+	}
+	
+	private String getPropertyString() {
+		String p;
+		try {
+			p = getProject().getPersistentProperty(libhoverProperty);
+		} catch (CoreException c) {
+			p = null;
+		}
+		return p;
+	}
+	
+	private void addFirstSection(Composite parent) {
+		Composite composite = createDefaultComposite(parent);
+
+		projectSpecific = new Button(composite, SWT.CHECK);
+		projectSpecific.setText(LibHoverMessages.getString(PROJECT_SPECIFIC_MSG));
+		String p = getPropertyString();
+		projectSpecific.setSelection(p != null);
+		projectSpecific.addSelectionListener(new SelectionAdapter() {
+	        @Override
+			public void widgetSelected(SelectionEvent event) {
+	        	projectSpecificPressed(event);
+	        }});
+	}
+
+	private void projectSpecificPressed(SelectionEvent event) {
+		if (projectSpecific.getSelection()) {
+			buttoncomp.setEnabled(true);
+			table.setEnabled(true);
+			updateCheckboxData(true);
+		} else {
+			buttoncomp.setEnabled(false);
+			table.setEnabled(false);
+			updateCheckboxData(false);
+		}
+	}
+	
+	private void addSeparator(Composite parent) {
+		Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
+		GridData gridData = new GridData();
+		gridData.horizontalAlignment = GridData.FILL;
+		gridData.grabExcessHorizontalSpace = true;
+		separator.setLayoutData(gridData);
+	}
+	
+	private void addLabel(Composite parent) {
+		Label label = new Label(parent, SWT.HORIZONTAL);
+		label.setText(LibHoverMessages.getString("LibhoverPreferences.title")); //$NON-NLS-1$
+		GridData gridData = new GridData();
+		gridData.horizontalAlignment = GridData.FILL;
+		gridData.grabExcessHorizontalSpace = true;
+		label.setLayoutData(gridData);
+	}
+	
+	private Control getCheckboxControl(Composite parent) {
+		if (table == null) {
+//			parent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+			table = new Table(parent, SWT.BORDER | SWT.CHECK | SWT.SINGLE);
+			GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
+			gridData.horizontalSpan = 2;
+			table.setLayoutData(gridData);
+			table.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					updateButtons();
+				}});
+			tv = new CheckboxTableViewer(table);
+			tv.setContentProvider(new IStructuredContentProvider() {
+				public Object[] getElements(Object inputElement) {
+					return (Object[])inputElement;
+				}
+				public void dispose() {}
+				public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}
+			});
+
+			tv.addCheckStateListener(new ICheckStateListener() {
+				public void checkStateChanged(CheckStateChangedEvent e) {
+				}
+			});
+
+		}
+		return table;
+	}
+	
+	private Control getButtonControl(Composite parent) {
+		if (buttoncomp == null) {
+			buttoncomp = new Composite(parent, SWT.NONE);
+			GridData d = new GridData(GridData.END);
+			d.widthHint = 1;
+			d.horizontalSpan = 1;
+			buttoncomp.setLayoutData(d);
+			buttoncomp.setFont(parent.getFont());
+			initButtons(buttoncomp, new String[] {
+					MOVEUP_STR, MOVEDOWN_STR, null, 
+					UIMessages.getString("ErrorParsTab.0"), //$NON-NLS-1$
+					UIMessages.getString("ErrorParsTab.1")  //$NON-NLS-1$
+			});
+		}
+		return buttoncomp;
+	}
+
+	private void addSecondSection(Composite parent) {
+		Composite composite = createDefaultComposite(parent);
+		GridLayout layout = new GridLayout();
+		layout.numColumns = 3;
+		composite.setLayout(layout);
+		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
+		composite.setLayoutData(data);
+
+		getCheckboxControl(composite);
+		getButtonControl(composite);
+	}
+
+	/**
+	 * @see PreferencePage#createContents(Composite)
+	 */
+	protected Control createContents(Composite parent) {
+		Composite composite = new Composite(parent, SWT.NONE);
+		GridLayout layout = new GridLayout();
+		composite.setLayout(layout);
+		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
+		composite.setLayoutData(data);
+
+		addFirstSection(composite);
+		addSeparator(composite);
+		addLabel(composite);
+		addSecondSection(composite);
+		String p = getPropertyString();
+		updateCheckboxData(p != null);
+		buttoncomp.setEnabled(p != null);
+		table.setEnabled(p != null);
+
+		return composite;
+	}
+
+	private Composite createDefaultComposite(Composite parent) {
+		Composite composite = new Composite(parent, SWT.NULL);
+		GridLayout layout = new GridLayout();
+		layout.numColumns = 2;
+		composite.setLayout(layout);
+
+		GridData data = new GridData();
+		data.verticalAlignment = GridData.FILL;
+		data.horizontalAlignment = GridData.FILL;
+		composite.setLayoutData(data);
+
+		return composite;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
+	 */
+	protected void performDefaults() {
+		updateCheckboxData(projectSpecific.getSelection());
+	}
+	
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.jface.preference.PreferencePage#performOk()
+	 */
+	public boolean performOk() {
+		try {
+			save();
+		} catch (CoreException e) {
+			return false;
+		}
+		return true;
+	}
+	
+	/**
+	 * Ability to create standard button on any composite.
+	 * @param c
+	 * @param names
+	 */
+	private void initButtons(Composite c, String[] names) {
+		initButtons(c, names, 80);
+	}
+	
+	private void initButtons(Composite c, String[] names, int width) {
+		if (names == null || names.length == 0) return;
+		c.setLayoutData(new GridData(GridData.FILL_VERTICAL));
+	    c.setLayout(new GridLayout(1, false));
+		buttons = new Button[names.length];
+		for (int i=0; i<names.length; i++) {
+			buttons[i] = new Button(c, SWT.PUSH);
+			buttons[i].setFont(c.getFont());
+			GridData gdb = new GridData(GridData.VERTICAL_ALIGN_CENTER);
+			gdb.grabExcessHorizontalSpace = false;
+			gdb.horizontalAlignment = SWT.FILL;
+			gdb.minimumWidth = width;
+			
+			if (names[i] != null)
+				buttons[i].setText(names[i]);
+			else { // no button, but placeholder ! 
+				buttons[i].setVisible(false);
+				buttons[i].setEnabled(false);
+				gdb.heightHint = 10;
+			}
+			
+			buttons[i].setLayoutData(gdb);
+			buttons[i].addSelectionListener(new SelectionAdapter() {
+		        @Override
+				public void widgetSelected(SelectionEvent event) {
+		        	buttonPressed(event);
+		        }});
+		}
+	}
+	
+	/**
+	 * 
+	 * @param e - event to be handled
+	 */
+	private void buttonPressed(SelectionEvent e) {
+		for (int i=0; i<buttons.length; i++) {
+			if (buttons[i].equals(e.widget)) {
+				buttonPressed(i);
+				return;
+			}
+		}
+	}
+
+	private void buttonPressed (int n) {
+		switch (n) {
+		case 0: // up
+			moveItem(true);
+			break;
+		case 1: // down
+			moveItem(false);
+			break;
+		case 2: // do nothing - it's not a button
+			break;
+			
+		case 3: // check all
+			tv.setAllChecked(true);
+			break;
+		case 4: // uncheck all	
+			tv.setAllChecked(false);
+			break;
+		default:
+			break;
+		}
+	}
+
+	// Move item up / down
+	private void moveItem(boolean up) {
+		int n = table.getSelectionIndex();
+		if (n < 0 || 
+				(up && n == 0) || 
+				(!up && n+1 == table.getItemCount()))
+			return;
+		TableData d = (TableData)tv.getElementAt(n);
+		boolean checked = tv.getChecked(d);
+		tv.remove(d);
+		n = up ? n - 1 : n + 1;
+		tv.insert(d, n);
+		tv.setChecked(d, checked);
+		table.setSelection(n);
+	}
+	/**
+	 * Changes state of existing button.
+	 * Does nothing if index is invalid
+	 * 
+	 * @param i - button index
+	 * @param state - required state
+	 */
+	private void buttonSetEnabled(int i, boolean state) {
+		if (buttons == null || buttons.length <= i ) return;
+		buttons[i].setEnabled(state);
+	}
+	
+	private void updateButtons() {
+		int cnt = table.getItemCount();
+		int pos = table.getSelectionIndex();
+		buttonSetEnabled(0, pos > 0);
+		buttonSetEnabled(1, pos != -1 && pos < (cnt - 1));
+		buttonSetEnabled(3, cnt > 0);
+		buttonSetEnabled(4, cnt > 0);
+	}
+
+	private class TableData {
+		String key;
+		String value;
+		public TableData (String _key, String _value) {
+			key   = _key;
+			value = _value;
+		}
+		@Override
+		public String toString() { return value; } 
+	}
+	
+	private void getExtensions() {
+		mapItems.clear();
+		IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(
+				LibHover.LIBHOVER_DOC_EXTENSION);
+		if (point != null) {
+			IExtension[] exts = point.getExtensions();
+			for (IExtension ext : exts) {
+				if (ext.getConfigurationElements().length > 0) {
+					mapItems.put(ext.getUniqueIdentifier(), ext.getLabel());
+				}
+			}
+		}
+	}
+	
+	@SuppressWarnings("unchecked")
+	private void updateCheckboxData(boolean useProject) {
+		// Combine user preference string with existing libhover extensions.
+		getExtensions();
+		HashMap<String,String> copyMap = (HashMap<String,String>)mapItems.clone();
+		ArrayList<TableData> data = new ArrayList<TableData>();
+		ArrayList<TableData> checkedData = new ArrayList<TableData>();
+		// See what the user has set in preferences/properties and make sure that
+		// any libhover referred to is a valid current extension.
+		// Drop any preference for a non-existent extension.
+		String prop = null;
+		String pref = null;
+		// User wants to use project settings.  If they already exist, honor them.
+		if (useProject)
+			prop = getPropertyString();
+		// If no property settings exist or the user has not asked for project
+		// specific settings, then use the preferences as default.
+		if (prop == null)
+		    pref = getPreferenceStore().getString(PreferenceConstants.P_LIBHOVER);
+		else // otherwise use the property settings
+			pref = prop;
+		// The property string has the same format as the preference string which is
+		// id1:boolean1:id2:boolean2:id3:boolean3 (where booleanx is checked or not)
+		String[] tokens = pref.split(":");
+		if (tokens.length > 1) {
+			for (int i = 0; i < tokens.length; i+=2) {
+				String id = tokens[i];
+				Boolean checked = Boolean.valueOf(tokens[i+1]);
+				String value = copyMap.get(id);
+				if (value != null) {
+					TableData d = new TableData(id, value);
+					data.add(d);
+					if (checked)
+						checkedData.add(d);
+					copyMap.remove(id);
+				}
+			}
+		}
+		// Add any remaining libhover extensions to end of list.  If there is an
+		// existing property string, we treat them as unchecked.  If we are
+		// defaulting to the preferences, then we treat them as checked.
+		String[] leftovers = new String[copyMap.size()];
+		leftovers = copyMap.keySet().toArray(leftovers);
+		for (int i = 0; i < leftovers.length; ++i) {
+			TableData d = new TableData(leftovers[i], copyMap.get(leftovers[i]));
+			data.add(d);
+			if (!useProject || prop == null)
+				checkedData.add(d);
+		}
+		tv.setInput(data.toArray());
+		tv.setCheckedElements(checkedData.toArray());
+		updateButtons();
+	}
+	
+	private void save() throws CoreException {
+		// if we are not using project-specific property, then we
+		// set it to be null
+		if (!projectSpecific.getSelection())
+			getProject().setPersistentProperty(libhoverProperty, null);
+		
+		// Otherwise form a string which has all of the libhovers in order
+		// with their boolean checked value.  Use ":" to separate all entries
+		boolean inRange = true;
+		int i = 0;
+		String outString = new String();
+		String del = "";
+		while (inRange) {
+			TableData t;
+			Object obj = tv.getElementAt(i);
+			if (obj == null)
+				inRange = false;
+			else {
+				++i;
+				t = (TableData)obj;
+				outString += del + t.key + ":" + tv.getChecked(obj);
+				del = ":";
+			}
+		}
+		// Save formatted string to project.
+		if (outString.length() > 1)
+			getProject().setPersistentProperty(libhoverProperty, outString);
+	}
+}
\ No newline at end of file
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover-feature/ChangeLog b/libhover/org.eclipse.linuxtools.cdt.libhover-feature/ChangeLog
new file mode 100644
index 0000000..295d745
--- /dev/null
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover-feature/ChangeLog
@@ -0,0 +1,57 @@
+2010-02-08  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.properties: Capitalize "library" in featureName.
+
+2009-11-10  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.properties: Make featureName a bit more user-friendly.
+
+2009-08-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Remove newlib as included feature.
+
+2009-08-05  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Rename to org.eclipse.linuxtools.cdt.libhover.
+
+2009-05-19  Andrew Overholt  <overholt@redhat.com>
+
+	Bug #273931
+
+	* feature.properties: Change provider from Eclipse.org to Eclipse.
+
+2009-05-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Bump up to 0.2.0.  Add libhover newlib feature as
+	optional included feature.  Add libhover libstdcxx plugin.
+	
+2009-01-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Bump up to 0.1.1.
+
+2009-01-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Add .qualifier to version id.
+
+2009-01-06  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: 1.0.0 -> 0.1.0.  Add update site information.
+	* build.properties: Add feature.properties and epl-v10.html.
+
+2008-10-31  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Use feature.properties.  Add "(Incubation)".
+	* feature.properties: Initial checkin.
+	* epl-v10.html: Likewise.
+
+2008-10-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Add org.eclipse.linuxtools.cdt.libhover.library_docs plugin.
+	Also change org.eclipse.linuxtools.cdt.libhover.glibc reference to be plugin
+	instead of fragment.
+
+2008-10-14  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* feature.xml: Initial check-in.
+	* about.html: Ditto.
+	* build.properties: Ditto.
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.glibc/ChangeLog b/libhover/org.eclipse.linuxtools.cdt.libhover.glibc/ChangeLog
new file mode 100644
index 0000000..7201d35
--- /dev/null
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.glibc/ChangeLog
@@ -0,0 +1,42 @@
+2009-08-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #285867
+	* plugin.properties: Change Provider to Eclipse instead of Eclipse.org.
+
+2009-02-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump up version to 1.0.1.
+	* plugin.xml: Change to use new libhover library interface which requires
+	the location of a serialized LibHoverInfo instance rather than an xml document.
+
+2009-01-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add .qualifier to version.
+
+2008-11-03  Andrew Overholt  <overholt@redhat.com>
+
+	* build.properties: Add plugin.properties.
+
+2008-10-31  Andrew Overholt  <overholt@redhat.com>
+
+	* plugin.properties: Initial checkin.
+	* META-INF/MANIFEST.MF: Use plugin.properties.  Add "(Incubation)".
+
+2008-10-22  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Modify library name which shows up in the Project properties C/C++ General
+	Documentation page.
+
+2008-10-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* build.properties: Add toc.xml to binary build files.
+
+2008-10-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* fragment.xml: Removed.
+	* plugin.xml: New file.
+	* build.properties: Specify about.html in src build.
+	* META-INF/MANIFEST.MF: Require org.eclipse.linuxtools.cdt.libhover.library-docs
+	instead of org.eclipse.linuxtools.cdt.autotools-docs.
+	* toc.xml: Change to use moreclibdocs anchor instead of moregnutools
+	anchor which is in autotools-docs.
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.glibc/META-INF/MANIFEST.MF b/libhover/org.eclipse.linuxtools.cdt.libhover.glibc/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..29e9546
--- /dev/null
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.glibc/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.cdt.libhover.glibc;singleton:=true
+Bundle-Version: 1.0.1.qualifier
+Bundle-Vendor: %provider
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.linuxtools.cdt.libhover.library_docs;bundle-version="1.0.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml b/libhover/org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml
new file mode 100644
index 0000000..4556b44
--- /dev/null
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+   <extension
+         id="library"
+         name="Glibc C Library"
+         point="org.eclipse.linuxtools.cdt.libhover.library">
+      <library
+            docs="http://www.gnu.org/software/libc/manual/html_node/index.html"
+            location="http://www.sourceware.org/eclipse/libhover/glibc-2.7-2.libhover"
+            name="glibc library"
+            type="C">
+      </library>
+   </extension>
+   <extension
+         point="org.eclipse.help.toc">
+      <toc
+            file="toc.xml"
+            primary="false">
+      </toc>
+   </extension>
+
+</plugin>
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.library-docs/ChangeLog b/libhover/org.eclipse.linuxtools.cdt.libhover.library-docs/ChangeLog
new file mode 100644
index 0000000..48cf6c8
--- /dev/null
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.library-docs/ChangeLog
@@ -0,0 +1,29 @@
+2009-08-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #285867
+	* plugin.properties: Change Provider to Eclipse instead of Eclipse.org.
+
+2009-01-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add .qualifier to version and bump to 1.0.1.
+
+2008-11-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* build.properties: Remove doc.zip.
+	* doc.zip: Removed.
+
+2008-11-03  Andrew Overholt  <overholt@redhat.com>
+
+	* build.properties: Add plugin.properties.
+
+2008-10-31  Andrew Overholt  <overholt@redhat.com>
+
+	* plugin.properties: Initial import.
+	* META-INF/MANIFEST.MF: Use plugin.propeties.  Add "(Incubation)".
+
+2008-10-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* toc.xml: Initial release.
+	* doc.zip: Ditto.
+	* plugin.xml: Ditto.
+	* about.html: Ditto.
\ No newline at end of file
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.library-docs/META-INF/MANIFEST.MF b/libhover/org.eclipse.linuxtools.cdt.libhover.library-docs/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..f5fd146
--- /dev/null
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.library-docs/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.cdt.libhover.library_docs;singleton:=true
+Bundle-Version: 1.0.1.qualifier
+Bundle-Vendor: %provider
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.help
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.library-docs/plugin.properties b/libhover/org.eclipse.linuxtools.cdt.libhover.library-docs/plugin.properties
new file mode 100644
index 0000000..fd1b561
--- /dev/null
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.library-docs/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+#  Copyright (c) 2008 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+bundleName=Libhover C/C++ Library Documentation Plug-in (Incubation)
+provider=Eclipse
\ No newline at end of file
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/ChangeLog b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/ChangeLog
new file mode 100644
index 0000000..ae928bb
--- /dev/null
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/ChangeLog
@@ -0,0 +1,33 @@
+2009-08-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #285867
+	* plugin.properties: Change Provider to Eclipse instead of Eclipse.org.
+
+2009-08-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.properties: New file to fill in bundlename and provider.
+
+2009-05-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/libhover/libstdcxx/DoxygenCPPInfo.java (getParameters):
+	New method. 
+	(getReturn): Ditto. 
+	(buildDoxygenCPPInfo): Add code to get detailed description and break this up into
+	parameters and return value.  For return type, use refid to find a referenced class. 
+	(getElementText): Fix to be recursive.
+
+2009-02-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* .project: New file.
+	* toc.xml: Add missing toc file referenced by plugin. 
+
+2009-02-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Initial creation.
+	* plugin.properties: Ditto.
+	* toc.xml: Ditto.
+	* build.properties: Ditto.
+	* META-INF/MANIFEST.MF: Ditto.
+	* about.html: Ditto.
+	* src/org/eclipse/linuxtools/cdt/libhover/libstdcxx/DoxygenCPPInfo.java: New file
+	for creating serialized LibHover info from libstdc++ Doxygen xml documentation.
\ No newline at end of file
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/src/org/eclipse/linuxtools/cdt/libhover/libstdcxx/DoxygenCPPInfo.java b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/src/org/eclipse/linuxtools/cdt/libhover/libstdcxx/DoxygenCPPInfo.java
new file mode 100644
index 0000000..bb139e8
--- /dev/null
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/src/org/eclipse/linuxtools/cdt/libhover/libstdcxx/DoxygenCPPInfo.java
@@ -0,0 +1,537 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.libhover.libstdcxx;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectOutputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.eclipse.core.filesystem.URIUtil;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.linuxtools.cdt.libhover.LibHoverInfo;
+import org.eclipse.linuxtools.cdt.libhover.ClassInfo;
+import org.eclipse.linuxtools.cdt.libhover.MemberInfo;
+import org.eclipse.linuxtools.cdt.libhover.TypedefInfo;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+
+public class DoxygenCPPInfo {
+	
+	private Document document;
+	private LibHoverInfo cppInfo = new LibHoverInfo();
+	private HashMap<String, ClassInfo> classesById = new HashMap<String, ClassInfo>();
+	
+	public DoxygenCPPInfo(Document document) {
+		this.document = document;
+	}
+
+	public Document getDocument() {
+		return document;
+	}
+	
+	private String[] getTypedefTypes(String def) {
+		String[] result = null;
+		if (def.startsWith("typedef ")) { // $NON-NLS-1$
+			int startIndex = 8;
+			int count = 0;
+			int i = def.length() - 1;
+			// To break up types, we look for first blank outside of a template, working backwards.
+			// We need to work backwards because the transformed type may contain actual numeric parameters
+			// which could use the shift operators and we won't know whether they are shift operators or
+			// template specifiers without some actual parsing.
+			while (i >= 0) {
+				char ch = def.charAt(i);
+				if (ch == '<') {
+					--count;
+				}
+				else if (ch == '>') {
+					++count;
+				}
+				// We look at last blank not in a template as being the delimeter between
+				// type name and definition.
+				if (count == 0 && ch == ' ') {
+					startIndex = i + 1;
+					break;
+				}
+				--i;
+			}
+			result = new String[2];
+			result[1] = def.substring(startIndex);
+			// Following is a bit of a hack knowing the docs don't add the namespace when the transformed
+			// type is in the same space
+			int namespace = result[1].indexOf("::"); // $NON-NLS-1$
+			if (namespace < 0)
+				result[0] = def.substring(8, startIndex).trim();
+			else
+				result[0] = result[1].substring(0, namespace) + "::" + def.substring(8, startIndex).trim(); // $NON-NLS-1$
+		}
+		return result;
+	}
+	
+	private String getElementText(Node node) {
+		StringBuffer d = new StringBuffer();
+		NodeList nl = node.getChildNodes();
+		for (int x = 0; x < nl.getLength(); ++x) {
+			Node text = nl.item(x);
+			if (text.getNodeType() == Node.TEXT_NODE)
+				d.append(text.getNodeValue());
+			else
+				d.append(getElementText(text));
+		}
+		return d.toString();
+	}
+
+	public ClassInfo getClassInfo(String className) {
+		String typedefName = className.replaceAll("<.*>", "<>"); // $NON-NLS-1$ // $NON-NLS-2$
+		TypedefInfo typedef = cppInfo.typedefs.get(typedefName);
+		if (typedef != null) {
+			className = typedef.getTransformedType(className);  // Reset class name to typedef transformation
+		}
+		int index = className.indexOf('<');
+		// Check if it is a template reference.
+		if (index != -1) {
+			// It is.  We want to see if there are partial specific templates
+			// and we choose the first match.  If nothing matches our particular
+			// case, we fall back on the initial generic template.
+			ClassInfo info = cppInfo.classes.get(className.substring(0, index));
+			if (info == null)
+				return null;
+			ArrayList<ClassInfo> children = info.getChildren();
+			if (children != null && children.size() > 0) {
+				for (int x = 0; x < children.size(); ++x) {
+					ClassInfo child = children.get(x);
+					if (className.matches(child.getClassName())) {
+						info = child;
+						break;
+					}
+				}
+			}
+			return info;
+		}
+		// Otherwise no template, just fetch the class info directly.
+		return cppInfo.classes.get(className);
+	}
+	
+	public void buildDoxygenCPPInfo(String fileName) {
+		try {
+			// Create a hash table of all the class nodes mapped by class name.  Trim any template info
+			// for the class name key value.
+			NodeList nl = getDocument().getElementsByTagName("compounddef"); // $NON-NLS-1$
+			for (int i = 0; i < nl.getLength(); ++i) {
+				Node n = nl.item(i);
+				NamedNodeMap attrs = n.getAttributes();
+				Node kind = attrs.getNamedItem("kind"); // $NON-NLS-1$
+				Node id = attrs.getNamedItem("id"); // $NON-NLS-1$
+				Node prot = attrs.getNamedItem("prot"); // $NON-NLS-1$
+				// We are only interested in cataloging public classes.
+				if (id != null && prot != null && prot.getNodeValue().equals("public") // $NON-NLS-1$
+						&& kind != null && kind.getNodeValue().equals("class")) { // $NON-NLS-1$
+					NodeList nl2 = n.getChildNodes();
+					ClassInfo d = null;
+					String hashName = null;
+					for (int j = 0; j < nl2.getLength(); ++j) {
+						Node n2 = nl2.item(j);
+						String name2 = n2.getNodeName();
+						if (name2.equals("compoundname")) { // $NON-NLS-1$
+							String text = n2.getTextContent();
+							if (text != null && !text.equals("")) {
+								String className = text;
+								text = text.replaceAll("<\\s*", "<"); // $NON-NLS-1$ // $NON-NLS-2$
+								text = text.replaceAll("\\s*>", ">"); // $NON-NLS-1$ // $NON-NLS-2$
+								int index = text.indexOf('<');
+								hashName = text;
+								if (index > 0)
+									hashName = text.substring(0, index);
+								d = new ClassInfo(className, id.getNodeValue(), n);
+								classesById.put(id.getNodeValue(), d);
+								ClassInfo e = cppInfo.classes.get(hashName);
+								if (e != null) { /* We are dealing with a partial specific template...add it to list  */
+									if (!d.areTemplateParmsFilled())
+										d.setTemplateParms(getTemplateParms(n));
+									String[] templateParms = d.getTemplateParms();
+									// For each template parameter, replace with a generic regex so later we can compare
+									// and identify a match (e.g. A<_a, _b> and A<char, _b> are defined and we have an instance
+									// of A<char, int>.  We want to to match with A<char, _b> and replace all occurrences of "_b"
+									// with "int".  For speed, we assume that the template parameter is not a subset of any
+									// other variable (e.g. if _A is used, there is no __A or _AB).  If this proves untrue in
+									// any instance, more refinement of the initial value to replace will be required.
+									for (int k = 0; k < templateParms.length; ++k) {
+										text = text.replaceAll(templateParms[k], "[a-zA-Z0-9_: *]+"); // $NON-NLS-1$
+									}
+									d.setClassName(text);
+									e.addTemplate(d);
+								}
+								else
+									cppInfo.classes.put(hashName, d);
+							}
+						} else if (name2.equals("templateparamlist")) {
+							ArrayList<String> templates = new ArrayList<String>();
+							NodeList params = n2.getChildNodes();
+							int paramsLength = params.getLength();
+							for (int j2 = 0; j2 < paramsLength; ++j2) {
+								Node n3 = params.item(j2);
+								if (n3.getNodeName().equals("param")) {
+									NodeList types = n3.getChildNodes();
+									int typesLength = types.getLength();
+									for (int j3 = 0; j3 < typesLength; ++j3) {
+										Node n4 = types.item(j3);
+										if (n4.getNodeName().equals("declname")) {
+											templates.add(getElementText(n4));
+										}
+									}
+								}
+							}
+							String[] templateNames = new String[templates.size()];
+							d.setTemplateParms(templates.toArray(templateNames));
+						} else if (name2.equals("includes")) { // $NON-NLS-1$
+							String include = getElementText(n2);
+							if (d != null)
+								d.setInclude(include);
+						} else if (name2.equals("basecompoundref")) { // $NON-NLS-1$
+							// We have a base class.  If public, add it to the list of nodes to look at in case we don't find the member
+							// in the current class definition.
+							NamedNodeMap m = n2.getAttributes();
+							if (m != null) {
+								Node refid = m.getNamedItem("refid"); // $NON-NLS-1$
+								Node prot2 = m.getNamedItem("prot"); // $NON-NLS-1$
+								if (prot2 != null && prot2.getNodeValue().equals("public")) { // $NON-NLS-1$
+									ClassInfo baseClass = null;
+									if (refid != null) {
+										// If we have been given the id of the base class, fetch it directly
+										baseClass = classesById.get(refid.getNodeValue());
+									} else {
+										// We probably have a template that needs resolution
+										String baseClassName = n2.getTextContent();
+//										System.out.println("base class name is " + baseClassName);
+										baseClass = getClassInfo(baseClassName);
+									}
+									if (d != null && baseClass != null)
+										d.addBaseClass(baseClass);
+								}
+							}
+						} else if (name2.equals("sectiondef")) { // $NON-NLS-1$
+							// We are only interested in public member functions which are in their own section.
+							NamedNodeMap m = n2.getAttributes();
+							if (m != null) {
+								Node kind2 = m.getNamedItem("kind"); // $NON-NLS-1$
+								if (kind2 != null && kind2.getNodeValue().equals("public-func")) { // $NON-NLS-1$
+									NodeList pubfuncs = n2.getChildNodes();
+									int pubfuncLength = pubfuncs.getLength();
+									for (int j1 = 0; j1 < pubfuncLength; ++j1) {
+										Node n3 = pubfuncs.item(j1);
+										// Add all public member functions to the list of members
+										if (n3.getNodeName().equals("memberdef")) { // $NON-NLS-1$
+											NamedNodeMap m3 = n3.getAttributes();
+											if (m3 != null) {
+												Node m3Kind = m3.getNamedItem("kind"); // $NON-NLS-1$
+												if (m3Kind != null && m3Kind.getNodeValue().equals("function")) { // $NON-NLS-1$
+													String name = null;
+													String type = null;
+													String args = null;
+													String desc = null;
+													ArrayList<String> parms = new ArrayList<String>();
+													NodeList nl4 = n3.getChildNodes();
+													int memberLength = nl4.getLength();
+													for (int k = 0; k < memberLength; ++k) {
+														Node n4 = nl4.item(k);
+														String n4Name = n4.getNodeName();
+														if (n4Name.equals("type")) { // $NON-NLS-1$
+															NodeList nl5 = n4.getChildNodes();
+															type = new String(""); // $NON-NLS-1$
+															for (int x = 0; x < nl5.getLength(); ++x) {
+																Node n5 = nl5.item(x);
+																if (n5.getNodeType() == Node.TEXT_NODE)
+																	type += n5.getNodeValue();
+																else if (n5.getNodeName().equals("ref")) { // $NON-NLS-1$
+																	NamedNodeMap n5m = n5.getAttributes();
+																	Node n5id = n5m.getNamedItem("refid");
+																	if (n5id != null) {
+																		String refid = n5id.getNodeValue();
+																		ClassInfo refClass = classesById.get(refid);
+																		if (refClass != null)
+																			type += refClass.getClassName();
+																	}
+																}	
+															}
+														} else if (n4Name.equals("name")) { // $NON-NLS-1$
+															name = n4.getTextContent();
+														} else if (n4Name.equals("argsstring")) { // $NON-NLS-1$
+															args = getElementText(n4);
+														} else if (n4Name.equals("param")) { // $NON-NLS-1$
+															NodeList nl5 = n4.getChildNodes();
+															for (int x = 0; x < nl5.getLength(); ++x) {
+																Node n5 = nl5.item(x);
+																if (n5.getNodeName().equals("type")) { // $NON-NLS-1$
+																	parms.add(getElementText(n5));
+																}
+															}
+														} else if (n4Name.equals("briefdescription")) { // $NON-NLS-1$
+															NodeList nl5 = n4.getChildNodes();
+															for (int x = 0; x < nl5.getLength(); ++x) {
+																Node n5 = nl5.item(x);
+																if (n5.getNodeName().equals("para")) { // $NON-NLS-1$
+																	if (desc == null)
+																		desc = new String("");
+																	desc += "<p>" + getElementText(n5) + "</p>"; // $NON-NLS-1$ // $NON-NLS-2$
+																}	
+															}
+														} else if (n4Name.equals("detaileddescription")) { // $NON-NLS-1$
+															NodeList nl5 = n4.getChildNodes();
+															for (int x = 0; x < nl5.getLength(); ++x) {
+																Node n5 = nl5.item(x);
+																if (n5.getNodeName().equals("para")) { // $NON-NLS-1$
+																	if (desc == null)
+																		desc = new String(""); // $NON-NLS-1$
+																	NodeList nl6 = n5.getChildNodes();
+																	Node n6 = nl6.item(0);
+																	if (n6.getNodeType() == Node.TEXT_NODE)
+																		desc += "<p>" + getElementText(n5) + "</p>"; // $NON-NLS-1$ // $NON-NLS-2$
+																	else {
+																		for (int x2 = 0; x2 < nl6.getLength(); ++x2) {
+																			n6 = nl6.item(x2);
+																			if (n6.getNodeName().equals("parameterlist")) { // $NON-NLS-1$
+																				desc += getParameters(n6);
+																			} else if (n6.getNodeName().equals("simplesect")) { // $NON-NLS-1$
+																				desc += getReturn(n6);
+																			}
+																		}
+																	}
+																}	
+															}
+														} else if (n4Name.equals("location")) {
+															// Location is after all descriptions so we can now add the member
+															if (name != null) {
+																MemberInfo member = new MemberInfo(name);
+																member.setReturnType(type);
+																member.setPrototype(args);
+																member.setDescription(desc);
+																String[] argNames = new String[parms.size()];
+																member.setParamTypes(parms.toArray(argNames));
+																d.addMember(member);
+															}
+															break;
+														}
+													}
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			// Create a hash table of all the typedefs.  Keep any template info.
+			nl = getDocument().getElementsByTagName("memberdef"); // $NON-NLS-1$
+			for (int i = 0; i < nl.getLength(); ++i) {
+				Node n = nl.item(i);
+				NamedNodeMap attrs = n.getAttributes();
+				if (attrs != null) {
+					Node kind = attrs.getNamedItem("kind"); // $NON-NLS-1$
+					Node prot = attrs.getNamedItem("prot"); // $NON-NLS-1$
+					if (kind != null && kind.getNodeValue().equals("typedef") // $NON-NLS-1$
+							&& prot != null && prot.getNodeValue().equals("public")) { // $NON-NLS-1$
+						NodeList list = n.getChildNodes();
+						for (int x = 0; x < list.getLength(); ++x) {
+							Node n2 = list.item(x);
+							if (n2.getNodeName().equals("definition")) { // $NON-NLS-1$
+								String def = n2.getTextContent();
+								if (def != null && !def.equals("")) {
+									def = def.replaceAll("<\\s*", "<"); // $NON-NLS-1$ // $NON-NLS-2$
+									def = def.replaceAll("\\s*>", ">"); // $NON-NLS-1$ // $NON-NLS-2$
+									String[] types = getTypedefTypes(def);
+									TypedefInfo d = new TypedefInfo(types[1], types[0]);
+									String hashName = d.getTypedefName();
+									int index = hashName.indexOf('<');
+									if (index > 0) {
+										String className = hashName.substring(0, index);
+										hashName = hashName.replaceAll("<.*>", "<>"); // $NON-NLS-1$ // $NON-NLS-2$
+										ClassInfo e = cppInfo.classes.get(className);
+										if (e == null)
+											break;
+										ArrayList<ClassInfo> children = e.getChildren();
+										if (children != null && children.size() > 0) {
+											for (int y = 0; y < children.size(); ++y) {
+												ClassInfo child = children.get(y);
+												String childName = child.getClassName().replaceAll("\\*", "\\\\*"); // $NON-NLS-1$ // $NON-NLS-2$
+												childName = childName.replace("[]", "\\[\\]"); // $NON-NLS-1$ // $NON-NLS-2$
+												if (types[1].matches(childName.concat("::.*"))) { // $NON-NLS-1$
+													e = child;
+													break;
+												}
+											}
+										}
+										String[] templates = e.getTemplateParms();
+										d.copyTemplates(templates);
+
+										TypedefInfo f = cppInfo.typedefs.get(hashName);
+										if (f != null) {
+											String typedefName = d.getTypedefName();
+											for (int z = 0; z < templates.length; ++z) {
+												typedefName = typedefName.replaceAll(templates[z], "[a-zA-Z0-9_: ]+"); // $NON-NLS-1$
+											}
+											d.setTypedefName(typedefName);
+											f.addTypedef(d);
+										}
+										else
+											cppInfo.typedefs.put(hashName, d);
+										break;
+									} else {
+										// Otherwise we have a non-template typedef name.  Just add it to the list.
+										cppInfo.typedefs.put(hashName, d);
+										break;
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			// Now, output the LibHoverInfo for caching later
+			FileOutputStream f = new FileOutputStream(fileName);
+			ObjectOutputStream out = new ObjectOutputStream(f);
+			out.writeObject(cppInfo);
+			out.close();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+	
+	private String getParameters(Node n6) {
+		String desc = "<br><br><h3>Parameters:</h3>";
+		NodeList nl = n6.getChildNodes();
+		for (int x = 0; x < nl.getLength(); ++x) {
+			Node n = nl.item(x);
+			if (n.getNodeName().equals("parameteritem")) {
+				NodeList nl2 = n.getChildNodes();
+				for (int y = 0; y < nl2.getLength(); ++y) {
+					Node n2 = nl2.item(y);
+					if (n2.getNodeName().equals("parameternamelist")) {
+						NodeList nl3 = n2.getChildNodes();
+						for (int z = 0; z < nl3.getLength(); ++z) {
+							Node n3 = nl3.item(z);
+							if (n3.getNodeName().equals("parametername")) {
+								desc += getElementText(n3) + " - ";
+							}
+						}
+					} else if (n2.getNodeName().equals("parameterdescription")) {
+						desc += getElementText(n2) + "<br>";
+					}
+
+				}
+			}
+		}
+		return desc;
+	
+	}
+
+	private String getReturn(Node n6) {
+		String desc = "";
+		NamedNodeMap m = n6.getAttributes();
+		Node kind = m.getNamedItem("kind");
+		if (kind != null && kind.getNodeValue().equals("return")) {
+			desc += "<br><h3>Returns:</h3>" + getElementText(n6) + "<br>";
+		}
+		return desc;
+	}
+
+	public String[] getTemplateParms(Node classNode) {
+		Node n = null;
+		ArrayList<String> templateArray = new ArrayList<String>();
+		NodeList list = classNode.getChildNodes();
+		for (int i = 0; i < list.getLength(); ++i) {
+			n = list.item(i);
+			if (n.getNodeName().equals("templateparamlist")) { // $NON-NLS-1$
+				break;
+			}
+		}
+		if (n != null) {
+			NodeList templateList = n.getChildNodes();
+			for (int j = 0; j < templateList.getLength(); ++j) {
+				Node p = templateList.item(j);
+				if (p.getNodeName().equals("param")) { // $NON-NLS-1$
+					NodeList paramList = p.getChildNodes();
+					for (int k = 0; k < paramList.getLength(); ++k) {
+						Node q = paramList.item(k);
+						if (q.getNodeName().equals("declname")) { // $NON-NLS-1$
+							String templateName = q.getTextContent();
+							templateArray.add(templateName);
+						}
+					}
+				}
+			}
+		}
+		String[] templates = new String[templateArray.size()];
+		return templateArray.toArray(templates);
+	}
+
+	/**
+	 * Create LibHoverInfo serialized output
+	 * 
+	 * @param args (args[0] = location of Doxygen xml document to parse (file or URL),
+	 * 				args[1] = name of file to put serialized LibHoverInfo
+	 */
+	public static void main(String[] args) {
+		URI acDoc;
+		try {
+			acDoc = new URI(args[0]);
+			IPath p = URIUtil.toPath(acDoc);
+			InputStream docStream = null;
+			if (p == null) {
+				URL url = acDoc.toURL();
+				docStream = url.openStream();
+			} else {
+				docStream = new FileInputStream(p.toFile());
+			}
+			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+			factory.setValidating(false);
+			DocumentBuilder builder = factory.newDocumentBuilder();
+			Document doc = builder.parse(docStream);
+			if (doc != null) {
+				DoxygenCPPInfo d = new DoxygenCPPInfo(doc);
+				d.buildDoxygenCPPInfo(args[1]);
+			}
+			System.out.println("Built " + args[1] + " from " + args[0]);
+		} catch (URISyntaxException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (FileNotFoundException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (ParserConfigurationException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (SAXException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+}
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.newlib/ChangeLog b/libhover/org.eclipse.linuxtools.cdt.libhover.newlib/ChangeLog
new file mode 100644
index 0000000..04a4fa7
--- /dev/null
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.newlib/ChangeLog
@@ -0,0 +1,32 @@
+2009-08-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #285867
+	* plugin.properties: Change Provider to Eclipse instead of Eclipse.org.
+
+2009-02-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump up version to 1.0.2.
+	* plugin.xml: Change to use new libhover library interface which requires
+	the location of a serialized LibHoverInfo instance rather than an xml document.
+
+2009-01-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add .qualifier to version and bump up to 1.0.1.
+
+2008-11-03  Andrew Overholt  <overholt@redhat.com>
+
+	* build.properties: Add plugin.properties.
+
+2008-10-31  Andrew Overholt  <overholt@redhat.com>
+
+	* plugin.properties: Initial checkin.
+	* META-INF/MANIFEST.MF: Use plugin.properties. Add "(Incubation)".
+
+2008-10-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* .project: New plugin for newlib libhover.
+	* META-INF/MANIFEST.MF: New file.
+	* plugin.xml: Ditto.
+	* toc.xml: Ditto.
+	* about.html: Ditto.
+	* build.properties: Ditto.
\ No newline at end of file
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/.classpath b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/.classpath
new file mode 100644
index 0000000..fb50116
--- /dev/null
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/.project b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/.project
new file mode 100644
index 0000000..175b8a5
--- /dev/null
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.cdt.libhover.texinfoparsers</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/ChangeLog b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/ChangeLog
new file mode 100644
index 0000000..ca197aa
--- /dev/null
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/ChangeLog
@@ -0,0 +1,55 @@
+2009-11-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Refactor to org.eclipse.linuxtools.cdt.libhover.texinfoparsers.
+
+2008-10-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tools/ParseNewlibTexinfo.java (DeftypefunPattern3): New
+	pattern for matching va_arg functions. 
+	(RtnTypeVar): Ditto.
+	(HandleFunctionDefs): Fix so multi-line prototypes are read until the line doesn't
+	end with comma.  Also add function pointer and va_arg function type support. 
+	* src/com/redhat/eclipse/cdt/autotools/tools/TexinfoUtils.java (transformTags):  Fix
+	table handling so like tables can be nested inside each other and/or can have @itemize
+	constructs between tables. 
+
+2008-10-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tools/ParseNewlibTexinfo.java: New file.
+	* src/com/redhat/eclipse/cdt/autotools/tools/TexinfoUtils.java (transformTags): 
+	Handle @strong{x}.
+
+2007-11-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tools/ParseGlibcTexinfo.java: Fix
+	include regexp to handle the case where a choice of headers are specified
+	with a blank between them.  Take the last header in the list in this case.
+	Also clear the global IncludeList whenever an @end deftypefn is seen.
+
+2007-11-26  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tools/ParseTexinfo.java: Renamed...
+	* src/com/redhat/eclipse/cdt/autotools/tools/ParseGlibcTexinfo.java: ...to this.
+	Code has been modified to use new TexinfoUtils class for tag stripping.  All
+	lines in synopsis are marked with <eol> at end to allow proper processing.
+	Fixed comment stripping and added @include support for bringing in sample files
+	from examples directory.
+	* src/com/redhat/eclipse/cdt/autotools/tools/TexinfoUtils.java: New file to
+	support proper transformation of texinfo tags into xml format that can be used
+	by a C Help processor.  Code was based on old killTags method, but rewritten to
+	handle many more types of scenarios found in glibc docs.
+	* src/com/redhat/eclipse/cdt/autotools/tools/ParseAutoconfHTML.java: Add
+	copyright statement.
+	* src/com/redhat/eclipse/cdt/autotools/tools/ParseAutoconfTexinfo.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/tools/ParseAutomakeTexinfo.java: Ditto.
+	* src/com/redhat/eclipse/cdt/autotools/tools/ParseAutoconfHTML.java: Removed.
+
+2007-11-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tools/ParseAutomakeTexinfo.java: New file to
+	parse Automake documentation and create xml files to use with Autotools plugin.
+
+2007-06-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/com/redhat/eclipse/cdt/autotools/tools/ParseAutoconfTexinfo.java: New file to
+	parse Autoconf documentation and create xml files to use with Autotools plugin.
\ No newline at end of file
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/README b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/README
new file mode 100644
index 0000000..600b5ec
--- /dev/null
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/README
@@ -0,0 +1,12 @@
+This project contains texinfo parsers used to create xml files for the purpose 
+of use with the Linux Tools plug-ins.  The parsers here were used to create the
+ xml files for glibc and newlib libhover and for autotools hover help for the 
+autoconf editor.  The glibc and newlib xml files were fed to the libhover 
+plugin BuildFunctionInfos java executable found in the libhover plugin: 
+
+ org.eclipse.linuxtools.cdt.libhover.utils/BuildFunctionInfos.java
+
+to create the libhover binary files used in the glibc and newlib libhover 
+plugins.
+
+To build, right-click on the build.xml file and run as -> Ant Build.
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/build.xml b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/build.xml
new file mode 100644
index 0000000..9abc931
--- /dev/null
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/build.xml
@@ -0,0 +1,15 @@
+<project name="Texinfo Parser" default="compile" basedir=".">
+  <property name="src" value="."/>
+  <property name="build" value="build"/>
+  <property name="build.compiler" value="modern"/>
+
+  <target name="init">
+    <tstamp/>
+    <mkdir dir="${build}"/>
+  </target>
+
+  <target name="compile" depends="init">
+    <javac srcdir="${src}" destdir="${build}" />
+  </target>
+</project>
+  
\ No newline at end of file
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutoconfTexinfo.java b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutoconfTexinfo.java
new file mode 100644
index 0000000..360d494
--- /dev/null
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutoconfTexinfo.java
@@ -0,0 +1,645 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.libhover.texinfoparsers;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+//This file contains a texinfo parser that can be
+//run to create the Autotools glibc.xml file.
+//Usage is as follows:
+//1. compile this file using javac
+//2. run this file using java, passing the
+//arguments: ${glibc_source_path}/manual glibc.xml
+
+public class ParseAutoconfTexinfo {
+
+	static final boolean DEBUG = false;
+
+	static final String ATcmd = "(@\\w*)";
+
+	//                           0
+	static final String Defmac = "@defmac";
+	static final String Defmacx = "@defmacx";
+
+	//                           1
+	static final String MacroName = "(\\w*)";
+	static final int    MacroNameIndex = 1;
+
+	//                          2    3
+	static final String Parms = "(\\((.*)\\))";
+	static final int    ParmsIndex = 2;
+
+	static final String rest = ".*";
+
+	static final String WhiteSpace = "\\s*";
+
+	static final Pattern MacroPattern
+	= Pattern.compile("^" + Defmac + WhiteSpace +
+			MacroName + WhiteSpace +
+			Parms +
+			rest, Pattern.MULTILINE + Pattern.CASE_INSENSITIVE);
+
+	static final Pattern MacroPattern2
+	= Pattern.compile("^" + Defmac + WhiteSpace + MacroName + rest, 
+			Pattern.MULTILINE + Pattern.CASE_INSENSITIVE);
+
+	static final Pattern MacroPatternx
+	= Pattern.compile("^" + Defmacx + WhiteSpace +
+			MacroName + WhiteSpace +
+			Parms +
+			rest, Pattern.MULTILINE + Pattern.CASE_INSENSITIVE);
+
+	static final Pattern MacroPatternx2
+	= Pattern.compile("^" + Defmacx + WhiteSpace + MacroName + rest, 
+			Pattern.MULTILINE + Pattern.CASE_INSENSITIVE);
+
+	static final Pattern ParmBracketPattern = Pattern.compile("\\((.*)\\)");
+	static final Pattern IndexPattern		= Pattern.compile("@\\w*index\\s+[a-zA-Z0-9_@\\{\\}]*");
+	static final Pattern IndexPattern2		= Pattern.compile("@\\w*index\\{[a-zA-Z0-9_@\\{\\}]*\\}");
+	static final Pattern ExamplePattern		= Pattern.compile("@example");
+	static final Pattern EndExamplePattern  = Pattern.compile("@end\\s+example");
+	static final Pattern EnumeratePattern	= Pattern.compile("@enumerate");
+	static final Pattern EndEnumeratePattern  = Pattern.compile("@end\\s+enumerate");
+	static final Pattern VerbatimPattern	= Pattern.compile("@verbatim");
+	static final Pattern ItemPattern		= Pattern.compile("@item");
+	static final Pattern NoIndentPattern	= Pattern.compile("@noindent");
+	static final Pattern BRPattern			= Pattern.compile("&lt;br&gt;");
+	static final Pattern EOLPattern			= Pattern.compile("&lt;eol&gt;");
+	static final Pattern EndVerbatimPattern = Pattern.compile("@end\\s+verbatim");
+	static final Pattern TableSampItemPattern = Pattern.compile("(@table\\s*@samp.*)@item\\s*([a-zA-Z_0-9+\\-<>/ ]*)<eol>(.*@end\\s*table)", Pattern.DOTALL);
+	static final Pattern TableAsisItemPattern = Pattern.compile("(@table\\s*@asis.*)@item\\s*([a-zA-Z_0-9+\\-,<>/ ]*)<eol>(.*@end\\s*table)", Pattern.DOTALL);
+	static final Pattern TableSampPattern 	= Pattern.compile("@table\\s*@samp", Pattern.MULTILINE);
+	static final Pattern TableAsisPattern	= Pattern.compile("@table\\s*@asis", Pattern.MULTILINE);
+	static final Pattern EndTablePattern 	= Pattern.compile("@end\\s+table");
+	static final Pattern DotsPattern		= Pattern.compile("@dots\\{\\}");
+	static final Pattern ItemizeMinusPattern= Pattern.compile("@itemize\\s+@minus" + "(.*)" + "@end\\s+itemize", Pattern.MULTILINE);
+	static final Pattern ItemizeBulletPattern= Pattern.compile("@itemize\\s+@bullet" + "(.*)" + "@end\\s+itemize", Pattern.MULTILINE);
+	static final Pattern XrefPattern		= Pattern.compile("@xref\\{[^\\}]*\\}", Pattern.MULTILINE);
+	static final Pattern CommandPattern		= Pattern.compile("@command\\{([^\\}]*)\\}");
+	static final Pattern KbdPattern			= Pattern.compile("@kbd\\{([^\\}]*)\\}");
+	static final Pattern RPattern			= Pattern.compile("@r\\{([^\\}]*)\\}");
+	static final Pattern FilePattern		= Pattern.compile("@file\\{([^\\}]*)\\}");
+	static final Pattern VarPattern			= Pattern.compile("@var\\{([^\\}]*)\\}");
+	static final Pattern OVarPattern		= Pattern.compile("@ovar\\{([^\\}]*)\\}");
+	static final Pattern DVarPattern		= Pattern.compile("@dvar\\{([^\\},\\,]*),([^\\}]*)\\}");
+	static final Pattern CodePattern		= Pattern.compile("@code\\{([^\\}]*)\\}");
+	static final Pattern EmphPattern		= Pattern.compile("@emph\\{([^\\}]*)\\}");
+	static final Pattern SampPattern		= Pattern.compile("@samp\\{([^\\}]*)\\}");
+	static final Pattern OptionPattern		= Pattern.compile("@option\\{([^\\}]*)\\}");
+	static final Pattern TagPattern		= Pattern.compile("@\\w*\\{([^\\}]*)\\}");
+	static final Pattern AmpersandPattern	= Pattern.compile("&");
+	static final Pattern LeftAnglePattern	= Pattern.compile("<");
+	static final Pattern RightAnglePattern	= Pattern.compile(">");
+
+
+	private static Map macroMap;
+	
+	static class MacroParms {
+		String[] parms;
+		MacroParms nextParms = null;
+		
+		public MacroParms(String[] parms) {
+			this.parms = parms;
+		}
+	}
+	
+	static class MacroDef {
+		String MacroName;
+		MacroParms Parameters;
+	}
+
+	static class TPElement {
+		String Content;
+		String Synopsis;
+	}
+
+	static class TPDef {
+		String TPType;
+		String TPName;
+		String TPSynopsis;
+		TPElement[] TPElements;
+		Object[] IncludeList;
+	}
+	
+	private static String killTagsParms(String tt) {
+		Matcher mm;
+		
+		mm = ParmBracketPattern.matcher(tt);
+		tt= mm.replaceAll("$1");
+		
+		mm = OVarPattern.matcher(tt);
+		tt = mm.replaceAll("[$1]");
+		
+		mm = DVarPattern.matcher(tt);
+		tt = mm.replaceAll("[$1=$2]");
+
+		mm = VarPattern.matcher(tt);
+		tt = mm.replaceAll("$1");
+		
+		mm = RPattern.matcher(tt);
+		tt = mm.replaceAll("$1");
+		
+		mm = DotsPattern.matcher(tt);
+		tt = mm.replaceAll("...");
+		
+		return tt;
+	}
+		
+
+	private static String killTags(String tt) {
+		Matcher mm;
+		String ss = "";
+		
+		while (ss != tt) {
+			mm = XrefPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = IndexPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = IndexPattern2.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = NoIndentPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = VarPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<VAR>$1</VAR>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = DotsPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<small>...</small>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = CommandPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<CODE>$1</CODE>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = CodePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<CODE>$1</CODE>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = KbdPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<KBD>$1</KBD>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EmphPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<EM>$1</EM>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = FilePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<TT>$1</TT>");
+		}
+		
+		
+		ss = "";
+		while (ss != tt) {
+			mm = VerbatimPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<CODE>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndVerbatimPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</CODE>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = SampPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<samp>$1</samp>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = OptionPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<samp>$1</samp>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = ExamplePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<TABLE><tr><td>&nbsp;</td><td class=example><pre>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndExamplePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</pre></td></tr></table>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = EnumeratePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<OL>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndEnumeratePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</OL>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TableSampItemPattern.matcher(tt);
+			ss = tt;
+			if (mm.matches()) {
+				System.out.println("group 1 is " + mm.group(1));
+				System.out.println("group 2 is " + mm.group(2));
+				System.out.println("group 3 is " + mm.group(3));
+			}
+			tt = mm.replaceAll("$1<DT>'<SAMP>$2</SAMP>'\n<DD>$3");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TableAsisItemPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("$1<DT>$2\n<DD>$3");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TableSampPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<DL>\n");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TableAsisPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<DL>\n");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = EndTablePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</DL>");
+		}
+
+		//FIXME: if there ever is a @itemize @bullet within a
+		//       @itemize @minus or vice-versa, the following
+		//       logic will get it wrong.
+		ss = "";
+		while (ss != tt) {
+			mm = ItemizeMinusPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<UL>$1</UL>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = ItemizeBulletPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<OL>$1</OL>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = ItemPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<LI>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TagPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("$1");
+		}
+		
+		mm = AmpersandPattern.matcher(tt);
+		tt = mm.replaceAll("&amp;");
+
+		mm = LeftAnglePattern.matcher(tt);
+		tt = mm.replaceAll("&lt;");
+
+		mm = RightAnglePattern.matcher(tt);
+		tt = mm.replaceAll("&gt;");	
+
+		// Clean up the eol markers we used to mark end of line for items
+		mm = EOLPattern.matcher(tt);
+		tt = mm.replaceAll("");
+		
+		return tt;
+	}
+
+	private static MacroDef BuildMacroDef(Matcher m) {
+		MacroDef md = new MacroDef();
+
+		md.MacroName = m.group(MacroNameIndex);
+
+		if (null != m.group(ParmsIndex)) {
+			String tt = killTagsParms(m.group(ParmsIndex));
+			String[] parms = tt.split(",\\s");
+			md.Parameters = new MacroParms(parms);
+		}
+		return md;
+	}
+
+	private static MacroParms AddMacroDefxParms(MacroParms mp, Matcher mx) {
+		if (null != mx.group(ParmsIndex)) {
+			String tt = killTagsParms(mx.group(ParmsIndex));
+			String[] parms = tt.split(",\\s");
+			MacroParms mpnew = new MacroParms(parms);
+			mp.nextParms = mpnew;
+			return mpnew;
+		}
+		return null;
+	}
+
+	private static MacroDef HandleMacroDef(BufferedReader is, String s) throws IOException {
+		MacroDef fd = null;
+
+		Matcher m = MacroPattern.matcher(s);
+
+		if (m.matches()) {
+			fd = BuildMacroDef(m);
+		}
+		else {						// assume the line got split and retry
+			is.mark(100);
+			String il = is.readLine();
+			m = MacroPattern.matcher(s + il);
+			if (m.matches()) fd = BuildMacroDef(m);
+			else {
+				is.reset();
+				m = MacroPattern2.matcher(s);
+				if (m.matches()) {
+					fd = new MacroDef();
+					fd.MacroName = m.group(MacroNameIndex);
+					fd.Parameters = new MacroParms(new String[0]);
+				}
+			}
+		}
+		
+		if (fd != null) {
+			// Look for @defmacx which are alternate prototypes for the macro
+			is.mark(100);
+			String il = is.readLine();
+			if (il != null) {
+				Matcher mx = MacroPatternx.matcher(il);
+				Matcher mx2 = MacroPatternx2.matcher(il);
+				MacroParms mp = fd.Parameters;
+				while (mx.matches() || mx2.matches()) {
+					if (mx.matches())
+					mp = AddMacroDefxParms(mp, mx);
+					else {
+						MacroParms mpnew = new MacroParms(new String[0]);
+						mp.nextParms = mpnew;
+						mp = mpnew;
+					}
+					is.mark(100);
+					il = is.readLine();
+					if (il != null) {
+						mx = MacroPatternx.matcher(il);
+						mx2 = MacroPatternx2.matcher(il);
+					}
+				}
+				is.reset();
+			}
+
+			if (macroMap.get(fd.MacroName) != null)
+				return null;
+			macroMap.put(fd.MacroName, fd);
+		}
+
+		return fd;
+	}
+
+	private static void WriteString(BufferedWriter os, String s) throws IOException {
+		//	System.out.println(s);
+		os.write(s+"\n", 0, 1+s.length());
+	}
+	
+    private static void CreateHeader(BufferedWriter os) throws IOException {
+    	WriteString(os, "<!-- This file automatically generated by ParseAutoconfTexinfo utility -->");
+    	WriteString(os, "<!-- cvs -d:pserver:anonymous@sources.redhat.com:/cvs/eclipse \\        -->");
+    	WriteString(os, "<!--   co autotools/ParseTexinfo                                       -->");
+    	WriteString(os, "<!DOCTYPE macros [");
+    	WriteString(os, "");
+    	WriteString(os, "  <!ELEMENT macros (macro)*>");
+    	WriteString(os, "");
+    	WriteString(os, "  <!ELEMENT macro (prototype*,synopsis)>");
+    	WriteString(os, "  <!ATTLIST macro");
+    	WriteString(os, "    id ID #REQUIRED");
+    	WriteString(os, "  >");
+    	WriteString(os, "");
+    	WriteString(os, "  <!ELEMENT synopsis     (#PCDATA)*>");
+    	WriteString(os, "");
+    	WriteString(os, "  <!ELEMENT prototype    (parameter+)?>");
+    	WriteString(os, "");
+    	WriteString(os, "  <!ELEMENT parameter (#PCDATA)*>");
+    	WriteString(os, "  <!ATTLIST parameter");
+    	WriteString(os, "    content CDATA #REQUIRED");
+    	WriteString(os, "  >");
+    	WriteString(os, "");
+    	WriteString(os, "]>");
+    	WriteString(os, "");
+    }
+
+
+
+	private static void CreateTrailer(BufferedWriter os) throws IOException {
+		WriteString(os, "</macros>");
+	}
+
+	private static void WriteSynopsis(BufferedWriter os, String Synopsis, boolean indent)  throws IOException {
+		String ss = killTags(Synopsis);
+		String[] tt = ss.split("\\s");
+		String aa = "";
+		String spaces = indent ? "            " : "        ";
+		WriteString(os, spaces + "<synopsis>");
+		if (null != Synopsis) {
+			for (int pp = 0; pp < tt.length; pp++) {
+				if (tt[pp].equals("&lt;br&gt;")) {
+					WriteString(os, spaces + aa + "&lt;/P&gt;&lt;P&gt;\n");
+					aa = "";
+				}
+				else {
+					if ((aa.length() + tt[pp].length()) > 64) {
+						WriteString(os, spaces + aa);
+						aa = "";
+					}
+					aa = aa + " " + tt[pp];
+				}
+			}
+		}
+		if (aa.length() > 0) WriteString(os, "        " + aa);
+		WriteString(os, spaces + "</synopsis>");
+	}
+
+	private static void HandleDefmacro(BufferedWriter os, BufferedReader is, String s) throws IOException {
+		String il;
+		MacroDef md;
+		List FDefs = new ArrayList();
+		String Synopsis = null;
+
+		if (null != (md = HandleMacroDef(is, s))) FDefs.add(md);
+
+		while (null != (il = is.readLine())) {
+			if (il.startsWith("@defmac")) {
+				if (null != (md = HandleMacroDef(is, il))) FDefs.add(md);
+			}
+			else if (il.startsWith("@comment") ||
+					il.startsWith("@c ")) {	// comment -- ignore it
+			}
+			else if (il.startsWith("@end defmac")) {
+				for (int kk = 0; kk < FDefs.size(); kk++) {
+					md = (MacroDef)FDefs.get(kk);
+
+					WriteString(os, "  <macro id=\"" + md.MacroName + "\">");
+
+					MacroParms mp = md.Parameters;
+					do {
+						WriteString(os, "      <prototype>");
+						String[] parms = mp.parms;
+						for (int i = 0; i < parms.length; i++) {
+							WriteString(os, "        <parameter content=\"" + parms[i] + "\"/>");
+						}
+						WriteString(os, "      </prototype>");
+						mp = mp.nextParms;
+					} while (mp != null);
+
+					if (null != Synopsis) WriteSynopsis(os, Synopsis, false);
+					
+					WriteString(os, "  </macro>");
+				}
+				return;
+			}
+			else {
+				Synopsis = ((Synopsis == null) ? "" : Synopsis + " " ) + ((il.length() == 0) ? "<br>" : 
+					il.startsWith("@item") ? il + "<eol>" : il);
+				
+			}
+		}
+		FDefs.clear();
+
+	}
+
+	private static class OnlyTexi implements FilenameFilter {
+		public boolean accept(File dir, String s) {
+			return (s.endsWith(".texi")) ? true : false;
+		}
+	}
+
+	public static void BuildXMLFromTexinfo(String srcdir, String dstdir) {
+		try {
+			macroMap = new HashMap();
+			BufferedWriter os = new BufferedWriter(new FileWriter(dstdir));
+
+			CreateHeader(os);
+//			CreateLicense(os);
+
+			WriteString(os, "<macros>");
+
+			try {
+				String[] dir = new java.io.File(srcdir).list(new OnlyTexi());
+				for (int i = 0; i < dir.length; i++) {
+					String qFile = srcdir.endsWith("/")
+					? srcdir + dir[i]
+					               : srcdir + "/" + dir[i];
+
+					try {
+						BufferedReader is = new BufferedReader(new FileReader(qFile));
+						String il;
+
+						while (null != (il = is.readLine())) {
+							if (il.startsWith("@defmac")) {	// handle @defmac x]
+								HandleDefmacro(os, is, il);
+							}
+						}
+						is.close();
+					}
+					catch (IOException e) {
+						System.out.println("Input File IOException: " + e);
+						return;
+					}
+				}
+			}
+			catch (NullPointerException e) {
+				System.out.println("NullPointerException: " + e);
+				return;
+			}
+
+			CreateTrailer(os);
+
+			os.close();
+		}
+		catch (IOException e) {
+			System.out.println("Output File IOException: " + e);
+			return;
+		}
+	}
+
+	public static void main(String[] args) {
+		// arg[0] is input directory containing .texi documents to read
+		// arg[1] is output xml file to create
+		BuildXMLFromTexinfo(args[0], args[1]);
+	}
+
+}
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutomakeTexinfo.java b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutomakeTexinfo.java
new file mode 100644
index 0000000..c61adc0
--- /dev/null
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutomakeTexinfo.java
@@ -0,0 +1,661 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.libhover.texinfoparsers;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+//This file contains a texinfo parser that can be
+//run to create the Autotools glibc.xml file.
+//Usage is as follows:
+//1. compile this file using javac
+//2. run this file using java, passing the
+//arguments: dir_to_automake_texi_files output_xml_file_name
+
+public class ParseAutomakeTexinfo {
+
+	static final boolean DEBUG = false;
+
+	static final String ATcmd = "(@\\w*)";
+
+	// Currently in automake docs, the macro section starts with
+	// a subsection as below and a table which contains macros which
+	// are item and itemx entries.
+	static final String MacrosStart = "@subsection\\sPublic\\smacros";
+	static final String OldMacrosStart = "@section\\sAutoconf\\smacros.*";
+	static final Pattern MacroSection1 = Pattern.compile(MacrosStart);
+	static final Pattern MacroSection2 = Pattern.compile(OldMacrosStart);
+	//                           0
+	static final String Defmac = "@item";
+	static final String Defmacx = "@itemx";
+
+	//                           1
+	static final String MacroName = "(\\w*)";
+	static final int    MacroNameIndex = 1;
+
+	//                          2    3
+	static final String Parms = "(\\((.*)\\))";
+	static final int    ParmsIndex = 2;
+
+	static final String rest = ".*";
+
+	static final String WhiteSpace = "\\s*";
+
+	static final Pattern MacroPattern
+	= Pattern.compile("^" + Defmac + WhiteSpace +
+			MacroName + WhiteSpace +
+			Parms +
+			rest, Pattern.MULTILINE + Pattern.CASE_INSENSITIVE);
+
+	static final Pattern MacroPattern2
+	= Pattern.compile("^" + Defmac + WhiteSpace + MacroName + rest, 
+			Pattern.MULTILINE + Pattern.CASE_INSENSITIVE);
+
+	static final Pattern MacroPatternx
+	= Pattern.compile("^" + Defmacx + WhiteSpace +
+			MacroName + WhiteSpace +
+			Parms +
+			rest, Pattern.MULTILINE + Pattern.CASE_INSENSITIVE);
+
+	static final Pattern MacroPatternx2
+	= Pattern.compile("^" + Defmacx + WhiteSpace + MacroName + rest, 
+			Pattern.MULTILINE + Pattern.CASE_INSENSITIVE);
+
+	static final Pattern ParmBracketPattern = Pattern.compile("\\((.*)\\)");
+	static final Pattern IndexPattern		= Pattern.compile("@\\w*index.*");
+	static final Pattern IndexPattern2		= Pattern.compile("@\\w*index\\{[a-zA-Z0-9_@\\{\\}]*\\}");
+	static final Pattern ExamplePattern		= Pattern.compile("@example");
+	static final Pattern EndExamplePattern  = Pattern.compile("@end\\s+example");
+	static final Pattern EnumeratePattern	= Pattern.compile("@enumerate");
+	static final Pattern EndEnumeratePattern  = Pattern.compile("@end\\s+enumerate");
+	static final Pattern VerbatimPattern	= Pattern.compile("@verbatim");
+	static final Pattern ItemPattern		= Pattern.compile("@item");
+	static final Pattern NoIndentPattern	= Pattern.compile("@noindent");
+	static final Pattern BRPattern			= Pattern.compile("&lt;br&gt;");
+	static final Pattern EOLPattern			= Pattern.compile("&lt;eol&gt;");
+	static final Pattern EndVerbatimPattern = Pattern.compile("@end\\s+verbatim");
+	static final Pattern TableSampItemPattern = Pattern.compile("(@table\\s*@samp.*)@item\\s*([a-zA-Z_0-9+\\-<>/ ]*)<eol>(.*@end\\s*table)", Pattern.DOTALL);
+	static final Pattern TableAsisItemPattern = Pattern.compile("(@table\\s*@asis.*)@item\\s*([a-zA-Z_0-9+\\-,<>/ ]*)<eol>(.*@end\\s*table)", Pattern.DOTALL);
+	static final Pattern TableSampPattern 	= Pattern.compile("@table\\s*@samp", Pattern.MULTILINE);
+	static final Pattern TableAsisPattern	= Pattern.compile("@table\\s*@asis", Pattern.MULTILINE);
+	static final Pattern EndTablePattern 	= Pattern.compile("@end\\s+table");
+	static final Pattern DotsPattern		= Pattern.compile("@dots\\{\\}");
+	static final Pattern ItemizeMinusPattern= Pattern.compile("@itemize\\s+@minus" + "(.*)" + "@end\\s+itemize", Pattern.MULTILINE);
+	static final Pattern ItemizeBulletPattern= Pattern.compile("@itemize\\s+@bullet" + "(.*)" + "@end\\s+itemize", Pattern.MULTILINE);
+	static final Pattern XrefPattern		= Pattern.compile("@xref\\{[^\\}]*\\}", Pattern.MULTILINE);
+	static final Pattern CommandPattern		= Pattern.compile("@command\\{([^\\}]*)\\}");
+	static final Pattern KbdPattern			= Pattern.compile("@kbd\\{([^\\}]*)\\}");
+	static final Pattern RPattern			= Pattern.compile("@r\\{([^\\}]*)\\}");
+	static final Pattern FilePattern		= Pattern.compile("@file\\{([^\\}]*)\\}");
+	static final Pattern VarPattern			= Pattern.compile("@var\\{([^\\}]*)\\}");
+	static final Pattern OVarPattern		= Pattern.compile("@ovar\\{([^\\}]*)\\}");
+	static final Pattern DVarPattern		= Pattern.compile("@dvar\\{([^\\},\\,]*),([^\\}]*)\\}");
+	static final Pattern CodePattern		= Pattern.compile("@code\\{([^\\}]*)\\}");
+	static final Pattern EmphPattern		= Pattern.compile("@emph\\{([^\\}]*)\\}");
+	static final Pattern SampPattern		= Pattern.compile("@samp\\{([^\\}]*)\\}");
+	static final Pattern OptionPattern		= Pattern.compile("@option\\{([^\\}]*)\\}");
+	static final Pattern UrefPattern		= Pattern.compile("@uref\\{([^,]*),\\s+([^\\}]*)\\}");
+	static final Pattern TagPattern		= Pattern.compile("@\\w*\\{([^\\}]*)\\}");
+	static final Pattern AmpersandPattern	= Pattern.compile("&");
+	static final Pattern LeftAnglePattern	= Pattern.compile("<");
+	static final Pattern RightAnglePattern	= Pattern.compile(">");
+
+
+	private static Map macroMap;
+	
+	static class MacroParms {
+		String[] parms;
+		MacroParms nextParms = null;
+		
+		public MacroParms(String[] parms) {
+			this.parms = parms;
+		}
+	}
+	
+	static class MacroDef {
+		String MacroName;
+		MacroParms Parameters;
+		String Synopsis;
+	}
+
+	static class TPElement {
+		String Content;
+		String Synopsis;
+	}
+
+	static class TPDef {
+		String TPType;
+		String TPName;
+		String TPSynopsis;
+		TPElement[] TPElements;
+		Object[] IncludeList;
+	}
+	
+	private static String killTagsParms(String tt) {
+		Matcher mm;
+		
+		mm = ParmBracketPattern.matcher(tt);
+		tt= mm.replaceAll("$1");
+		
+		mm = OVarPattern.matcher(tt);
+		tt = mm.replaceAll("[$1]");
+		
+		mm = DVarPattern.matcher(tt);
+		tt = mm.replaceAll("[$1=$2]");
+
+		mm = VarPattern.matcher(tt);
+		tt = mm.replaceAll("$1");
+		
+		mm = RPattern.matcher(tt);
+		tt = mm.replaceAll("$1");
+		
+		mm = DotsPattern.matcher(tt);
+		tt = mm.replaceAll("...");
+		
+		return tt;
+	}
+		
+
+	private static String killTags(String tt) {
+		Matcher mm;
+		String ss = "";
+		
+		while (ss != tt) {
+			mm = XrefPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = IndexPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = IndexPattern2.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = NoIndentPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = VarPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<VAR>$1</VAR>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = DotsPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<small>...</small>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = CommandPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<CODE>$1</CODE>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = CodePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<CODE>$1</CODE>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = UrefPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<A HREF=\"$1>$2</A>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = KbdPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<KBD>$1</KBD>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EmphPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<EM>$1</EM>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = FilePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<TT>$1</TT>");
+		}
+		
+		
+		ss = "";
+		while (ss != tt) {
+			mm = VerbatimPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<CODE>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndVerbatimPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</CODE>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = SampPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<samp>$1</samp>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = OptionPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<samp>$1</samp>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = ExamplePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<TABLE><tr><td>&nbsp;</td><td class=example><pre>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndExamplePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</pre></td></tr></table>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = EnumeratePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<OL>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndEnumeratePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</OL>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TableSampItemPattern.matcher(tt);
+			ss = tt;
+			if (mm.matches()) {
+				System.out.println("group 1 is " + mm.group(1));
+				System.out.println("group 2 is " + mm.group(2));
+				System.out.println("group 3 is " + mm.group(3));
+			}
+			tt = mm.replaceAll("$1<DT>'<SAMP>$2</SAMP>'\n<DD>$3");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TableAsisItemPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("$1<DT>$2\n<DD>$3");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TableSampPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<DL>\n");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TableAsisPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<DL>\n");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = EndTablePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</DL>");
+		}
+
+		//FIXME: if there ever is a @itemize @bullet within a
+		//       @itemize @minus or vice-versa, the following
+		//       logic will get it wrong.
+		ss = "";
+		while (ss != tt) {
+			mm = ItemizeMinusPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<UL>$1</UL>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = ItemizeBulletPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<OL>$1</OL>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = ItemPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<LI>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TagPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("$1");
+		}
+		
+		mm = AmpersandPattern.matcher(tt);
+		tt = mm.replaceAll("&amp;");
+
+		mm = LeftAnglePattern.matcher(tt);
+		tt = mm.replaceAll("&lt;");
+
+		mm = RightAnglePattern.matcher(tt);
+		tt = mm.replaceAll("&gt;");	
+
+		// Clean up the eol markers we used to mark end of line for items
+		mm = EOLPattern.matcher(tt);
+		tt = mm.replaceAll("");
+		
+		return tt;
+	}
+
+	private static MacroDef BuildMacroDef(Matcher m) {
+		MacroDef md = new MacroDef();
+
+		md.MacroName = m.group(MacroNameIndex);
+
+		if (null != m.group(ParmsIndex)) {
+			String tt = killTagsParms(m.group(ParmsIndex));
+			String[] parms = tt.split(",\\s");
+			md.Parameters = new MacroParms(parms);
+		}
+		return md;
+	}
+
+	private static MacroParms AddMacroDefxParms(MacroParms mp, Matcher mx) {
+		if (null != mx.group(ParmsIndex)) {
+			String tt = killTagsParms(mx.group(ParmsIndex));
+			String[] parms = tt.split(",\\s");
+			MacroParms mpnew = new MacroParms(parms);
+			mp.nextParms = mpnew;
+			return mpnew;
+		}
+		return null;
+	}
+
+	private static MacroDef HandleMacroDef(BufferedReader is, String s) throws IOException {
+		MacroDef fd = null;
+
+		Matcher m = MacroPattern.matcher(s);
+
+		if (m.matches()) {
+			fd = BuildMacroDef(m);
+		}
+		else {						// assume the line got split and retry
+			is.mark(100);
+			String il = is.readLine();
+			m = MacroPattern.matcher(s + il);
+			if (m.matches()) fd = BuildMacroDef(m);
+			else {
+				is.reset();
+				m = MacroPattern2.matcher(s);
+				if (m.matches()) {
+					fd = new MacroDef();
+					fd.MacroName = m.group(MacroNameIndex);
+					fd.Parameters = new MacroParms(new String[0]);
+				}
+			}
+		}
+		
+		if (fd != null) {
+			// Look for @defmacx which are alternate prototypes for the macro
+			is.mark(100);
+			String il = is.readLine();
+			if (il != null) {
+				Matcher mx = MacroPatternx.matcher(il);
+				Matcher mx2 = MacroPatternx2.matcher(il);
+				MacroParms mp = fd.Parameters;
+				while (mx.matches() || mx2.matches()) {
+					if (mx.matches())
+					mp = AddMacroDefxParms(mp, mx);
+					else {
+						MacroParms mpnew = new MacroParms(new String[0]);
+						mp.nextParms = mpnew;
+						mp = mpnew;
+					}
+					is.mark(100);
+					il = is.readLine();
+					if (il != null) {
+						mx = MacroPatternx.matcher(il);
+						mx2 = MacroPatternx2.matcher(il);
+					}
+				}
+				is.reset();
+			}
+
+			if (macroMap.get(fd.MacroName) != null)
+				return null;
+			macroMap.put(fd.MacroName, fd);
+		}
+
+		return fd;
+	}
+
+	private static void WriteString(BufferedWriter os, String s) throws IOException {
+		//	System.out.println(s);
+		os.write(s+"\n", 0, 1+s.length());
+	}
+	
+    private static void CreateHeader(BufferedWriter os) throws IOException {
+    	WriteString(os, "<!-- This file automatically generated by ParseAutomakeTexinfo utility -->");
+    	WriteString(os, "<!-- cvs -d:pserver:anonymous@sources.redhat.com:/cvs/eclipse \\        -->");
+    	WriteString(os, "<!--   co autotools/ParseTexinfo                                       -->");
+    	WriteString(os, "<!DOCTYPE macros [");
+    	WriteString(os, "");
+    	WriteString(os, "  <!ELEMENT macros (macro)*>");
+    	WriteString(os, "");
+    	WriteString(os, "  <!ELEMENT macro (prototype*,synopsis)>");
+    	WriteString(os, "  <!ATTLIST macro");
+    	WriteString(os, "    id ID #REQUIRED");
+    	WriteString(os, "  >");
+    	WriteString(os, "");
+    	WriteString(os, "  <!ELEMENT synopsis     (#PCDATA)*>");
+    	WriteString(os, "");
+    	WriteString(os, "  <!ELEMENT prototype    (parameter+)?>");
+    	WriteString(os, "");
+    	WriteString(os, "  <!ELEMENT parameter (#PCDATA)*>");
+    	WriteString(os, "  <!ATTLIST parameter");
+    	WriteString(os, "    content CDATA #REQUIRED");
+    	WriteString(os, "  >");
+    	WriteString(os, "");
+    	WriteString(os, "]>");
+    	WriteString(os, "");
+    }
+
+
+
+	private static void CreateTrailer(BufferedWriter os) throws IOException {
+		WriteString(os, "</macros>");
+	}
+
+	private static void WriteSynopsis(BufferedWriter os, String Synopsis, boolean indent)  throws IOException {
+		String ss = Synopsis;
+		String[] tt = ss.split("\\s");
+		String aa = "";
+		String spaces = indent ? "            " : "        ";
+		WriteString(os, spaces + "<synopsis>");
+		if (null != Synopsis) {
+			for (int pp = 0; pp < tt.length; pp++) {
+				if (tt[pp].equals("&lt;br&gt;")) {
+					WriteString(os, spaces + aa + "&lt;/P&gt;&lt;P&gt;\n");
+					aa = "";
+				}
+				else {
+					if ((aa.length() + tt[pp].length()) > 64) {
+						WriteString(os, spaces + aa);
+						aa = "";
+					}
+					aa = aa + " " + tt[pp];
+				}
+			}
+		}
+		if (aa.length() > 0) WriteString(os, "        " + aa);
+		WriteString(os, spaces + "</synopsis>");
+	}
+
+	private static void HandleDefmacro(BufferedWriter os, BufferedReader is, String s) throws IOException {
+		String il;
+		MacroDef md = null;
+		List FDefs = new ArrayList();
+
+		while (null != (il = is.readLine())) {
+			if (il.startsWith(Defmac)) {
+				if (null != (md = HandleMacroDef(is, il))) FDefs.add(md);
+			}
+			else if (il.startsWith("@comment") ||
+					il.startsWith("@c ")) {	// comment -- ignore it
+			}
+			else if (il.startsWith("@subsection") ||
+					il.startsWith("@section")) {
+				for (int kk = 0; kk < FDefs.size(); kk++) {
+					md = (MacroDef)FDefs.get(kk);
+
+					WriteString(os, "  <macro id=\"" + md.MacroName + "\">");
+
+					MacroParms mp = md.Parameters;
+					do {
+						WriteString(os, "      <prototype>");
+						String[] parms = mp.parms;
+						for (int i = 0; i < parms.length; i++) {
+							WriteString(os, "        <parameter content=\"" + parms[i] + "\"/>");
+						}
+						WriteString(os, "      </prototype>");
+						mp = mp.nextParms;
+					} while (mp != null);
+
+					if (null != md.Synopsis) WriteSynopsis(os, md.Synopsis, false);
+					
+					WriteString(os, "  </macro>");
+				}
+				return;
+			}
+			else {
+				if (md != null)
+					md.Synopsis = ((md.Synopsis == null) ? "" : md.Synopsis + " " ) + ((il.length() == 0) ? "&lt;br&gt;&lt;br&gt;" : 
+						il.startsWith("@item") ? killTags(il) + "<eol>" : killTags(il));
+			}
+		}
+		FDefs.clear();
+
+	}
+
+	private static class OnlyTexi implements FilenameFilter {
+		public boolean accept(File dir, String s) {
+			return (s.endsWith(".texi")) ? true : false;
+		}
+	}
+
+	public static void BuildXMLFromTexinfo(String srcdir, String dstdir) {
+		try {
+			macroMap = new HashMap();
+			BufferedWriter os = new BufferedWriter(new FileWriter(dstdir));
+
+			CreateHeader(os);
+//			CreateLicense(os);
+
+			WriteString(os, "<macros>");
+
+			try {
+				String[] dir = new java.io.File(srcdir).list(new OnlyTexi());
+				for (int i = 0; i < dir.length; i++) {
+					String qFile = srcdir.endsWith("/")
+					? srcdir + dir[i]
+					               : srcdir + "/" + dir[i];
+
+					try {
+						BufferedReader is = new BufferedReader(new FileReader(qFile));
+						String il;
+
+						while (null != (il = is.readLine())) {
+							Matcher mm1 = MacroSection1.matcher(il);
+							Matcher mm2 = MacroSection2.matcher(il);
+							if (mm1.matches() || mm2.matches()) {
+								HandleDefmacro(os, is, il);
+							}
+						}
+						is.close();
+					}
+					catch (IOException e) {
+						System.out.println("Input File IOException: " + e);
+						return;
+					}
+				}
+			}
+			catch (NullPointerException e) {
+				System.out.println("NullPointerException: " + e);
+				return;
+			}
+
+			CreateTrailer(os);
+
+			os.close();
+		}
+		catch (IOException e) {
+			System.out.println("Output File IOException: " + e);
+			return;
+		}
+	}
+
+	public static void main(String[] args) {
+		// arg[0] is input directory containing .texi documents to read
+		// arg[1] is output xml file to create
+		BuildXMLFromTexinfo(args[0], args[1]);
+	}
+
+}
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseGlibcTexinfo.java b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseGlibcTexinfo.java
new file mode 100644
index 0000000..08f657c
--- /dev/null
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseGlibcTexinfo.java
@@ -0,0 +1,881 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.libhover.texinfoparsers;
+import java.io.*;
+import java.util.regex.*;
+import java.util.*;
+
+//This file contains a texinfo parser that can be
+//run to create the Autotools glibc.xml file.
+//Usage is as follows:
+//1. compile this file using javac
+//2. run this file using java, passing the
+//arguments: ${glibc_source_path}/manual glibc.xml
+
+public class ParseGlibcTexinfo {
+	static final boolean DEBUG = false;
+
+	//                           1
+	static final String ATcmd = "(@\\w*)";
+
+
+	//                              3   4
+	static final String RtnTypeM = "(\\{([^\\}]*)\\})";
+	static final int    RtnTypeMIndex = 4;
+
+	//                              5
+	static final String RtnTypeS = "(\\w*)";
+	static final int    RtnTypeSIndex = 5;
+
+	//                             2
+	static final String RtnType = "(" + RtnTypeM + "|" + RtnTypeS + ")";
+	//                                  6
+	static final String FunctionName = "(\\w*)";
+	static final int    FunctionNameIndex = 6;
+
+	//                          7    8
+	static final String Parms = "(\\((.*)\\))";
+	static final int    ParmsIndex = 8;
+
+	static final String rest = ".*";
+
+	static final String WhiteSpace = "\\s*";
+
+	static final Pattern DeftypefunPattern
+	= Pattern.compile("^" + ATcmd + WhiteSpace +
+			RtnType + WhiteSpace +
+			FunctionName + WhiteSpace +
+			Parms +
+			rest, Pattern.MULTILINE + Pattern.CASE_INSENSITIVE);
+
+	static final String TPDataType = "\\{[^\\}]*\\}";
+
+
+	//                             3   4
+	static final String TPTypeM = "(\\{([^\\}]*)\\})";
+	static final int    TPTypeMIndex = 4;
+
+	//                             5
+	static final String TPTypeS = "(\\w*)";
+	static final int    TPTypeSIndex = 5;
+
+	//                            2
+	static final String TPType = "(" + TPTypeM + "|" + TPTypeS + ")";
+
+	static final Pattern DeftpPattern
+	= Pattern.compile("^" + ATcmd + WhiteSpace + TPDataType + WhiteSpace + TPType + rest,
+			Pattern.MULTILINE + Pattern.CASE_INSENSITIVE);
+
+	static final Pattern IncludePattern		= Pattern.compile("^@comment ((\\w*/)*\\w*\\.h\\s*)*\\s*$");
+	static final Pattern PindexPattern		= Pattern.compile("^@pindex\\s*\\w*\\s*$");
+	static final Pattern ParmBracketPattern = Pattern.compile("\\((.*)\\)");
+	static final Pattern IndexPattern		= Pattern.compile("@\\w*index\\s+[a-zA-Z0-9_@\\{\\}]*");
+	static final Pattern IndexPattern2		= Pattern.compile("@\\w*index\\{[a-zA-Z0-9_@\\{\\}]*\\}");
+	static final Pattern ExamplePattern		= Pattern.compile("@example");
+	static final Pattern EndExamplePattern  = Pattern.compile("@end\\s+example");
+	static final Pattern EnumeratePattern	= Pattern.compile("@enumerate");
+	static final Pattern EndEnumeratePattern  = Pattern.compile("@end\\s+enumerate");
+	static final Pattern VerbatimPattern	= Pattern.compile("@verbatim");
+	static final Pattern ItemPattern		= Pattern.compile("@item");
+	static final Pattern NoIndentPattern	= Pattern.compile("@noindent");
+	static final Pattern BRPattern			= Pattern.compile("&lt;br&gt;");
+	static final Pattern EOLPattern			= Pattern.compile("&lt;eol&gt;");
+	static final Pattern EndVerbatimPattern = Pattern.compile("@end\\s+verbatim");
+	static final Pattern TableSampItemPattern = Pattern.compile("(@table\\s*@samp.*)@item\\s*([a-zA-Z_0-9+\\-<>/ ]*)<eol>(.*@end\\s*table)", Pattern.DOTALL);
+	static final Pattern TableAsisItemPattern = Pattern.compile("(@table\\s*@asis.*)@item\\s*([a-zA-Z_0-9+\\-,<>/ ]*)<eol>(.*@end\\s*table)", Pattern.DOTALL);
+	static final Pattern TableSampPattern 	= Pattern.compile("@table\\s*@samp", Pattern.MULTILINE);
+	static final Pattern TableAsisPattern	= Pattern.compile("@table\\s*@asis", Pattern.MULTILINE);
+	static final Pattern EndTablePattern 	= Pattern.compile("@end\\s+table");
+	static final Pattern DotsPattern		= Pattern.compile("@dots\\{\\}");
+	static final Pattern ItemizeMinusPattern= Pattern.compile("@itemize\\s+@minus" + "(.*)" + "@end\\s+itemize", Pattern.MULTILINE);
+	static final Pattern ItemizeBulletPattern= Pattern.compile("@itemize\\s+@bullet" + "(.*)" + "@end\\s+itemize", Pattern.MULTILINE);
+	static final Pattern XrefPattern		= Pattern.compile("@xref\\{[^\\}]*\\}", Pattern.MULTILINE);
+	static final Pattern CommandPattern		= Pattern.compile("@command\\{([^\\}]*)\\}");
+	static final Pattern KbdPattern			= Pattern.compile("@kbd\\{([^\\}]*)\\}");
+	static final Pattern RPattern			= Pattern.compile("@r\\{([^\\}]*)\\}");
+	static final Pattern FilePattern		= Pattern.compile("@file\\{([^\\}]*)\\}");
+	static final Pattern VarPattern			= Pattern.compile("@var\\{([^\\}]*)\\}");
+	static final Pattern OVarPattern		= Pattern.compile("@ovar\\{([^\\}]*)\\}");
+	static final Pattern DVarPattern		= Pattern.compile("@dvar\\{([^\\},\\,]*),([^\\}]*)\\}");
+	static final Pattern CodePattern		= Pattern.compile("@code\\{([^\\}]*)\\}");
+	static final Pattern EmphPattern		= Pattern.compile("@emph\\{([^\\}]*)\\}");
+	static final Pattern SampPattern		= Pattern.compile("@samp\\{([^\\}]*)\\}");
+	static final Pattern OptionPattern		= Pattern.compile("@option\\{([^\\}]*)\\}");
+	static final Pattern TagPattern		= Pattern.compile("@\\w*\\{([^\\}]*)\\}");
+	static final Pattern AmpersandPattern	= Pattern.compile("&");
+	static final Pattern LeftAnglePattern	= Pattern.compile("<");
+	static final Pattern RightAnglePattern	= Pattern.compile(">");
+
+	static List IncludeList = new ArrayList();
+
+
+	static class FunctionDef {
+		String ReturnType;
+		String FunctionName;
+		String[] Parameters;
+		Object[] IncludeList;
+	}
+
+	static class TPElement {
+		String Content;
+		String Synopsis;
+	}
+
+	static class TPDef {
+		String TPType;
+		String TPName;
+		String TPSynopsis;
+		TPElement[] TPElements;
+		Object[] IncludeList;
+	}
+
+	private static FunctionDef BuildFunctionDef(Matcher m) {
+		FunctionDef fd = new FunctionDef();
+
+		fd.ReturnType = ((null != m.group(RtnTypeSIndex))
+				? m.group(RtnTypeSIndex)
+						: m.group(RtnTypeMIndex));
+		fd.FunctionName = m.group(FunctionNameIndex);
+
+		if (null != m.group(ParmsIndex)) {
+			String tt = TexinfoUtils.stripProtoTags(m.group(ParmsIndex));
+			String[] parms = tt.split(",\\s");
+			fd.Parameters = parms;
+		}
+
+		if (IncludeList.size() > 0) {
+			fd.IncludeList = IncludeList.toArray();
+			IncludeList.clear();
+		}
+		return fd;
+	}
+
+	private static void HandleDeftp(BufferedWriter os, BufferedReader is, String s) throws IOException {
+		TPDef td = new TPDef();
+		String il;
+		String Synopsis = null;
+		boolean ItemsAccumulating = false;
+		TPElement tpe = new TPElement();
+		List ElementList = new ArrayList();
+
+		Matcher m = DeftpPattern.matcher(s);
+		if (m.matches()) {
+			if (null != m.group(TPTypeMIndex)) {
+				String[] ss = m.group(TPTypeMIndex).split("\\s");
+				switch(ss.length) {
+				case 0:
+					td.TPType = "";
+					td.TPName = "type";
+					break;
+				case 1:
+					td.TPType = "type";
+					td.TPName = ss[0];
+					break;
+				case 2:
+					td.TPType = ss[0];
+					td.TPName = ss[1];
+					break;
+				default:
+					td.TPType = "type";
+				td.TPName = ss[ss.length - 1];
+				break;
+				}
+			}
+			else {
+				td.TPType = "dtype";
+				td.TPName = m.group(TPTypeSIndex);
+			}
+
+			while (null != (il = is.readLine())) {
+				if (il.startsWith("@end deftp")) {
+					WriteString(os, "  <construct id=\"" + td.TPType + "-" + td.TPName
+							+ "\" type=\"" + td.TPType + "\">");
+					WriteString(os, "    <structure>");
+					if (null != td.TPSynopsis) WriteSynopsis(os, td.TPSynopsis, false);
+					if (ElementList.size() > 0) {
+						WriteString(os, "      <elements>");
+						for (int ee = 0; ee < ElementList.size(); ee++) {
+							TPElement ttt = (TPElement)ElementList.get(ee);
+							WriteString(os, "        <element content=\"" + ttt.Content + "\">");
+							if (null != ttt.Synopsis) WriteSynopsis(os, ttt.Synopsis, true);
+							WriteString(os, "        </element>");
+						}
+						WriteString(os, "      </elements>");
+					}
+					WriteString(os, "    </structure>");
+					WriteString(os, "  </construct>");
+					return;
+				}
+				else if (il.startsWith("@item")) {
+					if (ItemsAccumulating) {
+						tpe.Synopsis = Synopsis;
+						ElementList.add(tpe);
+					}
+					else {
+						td.TPSynopsis  = Synopsis;
+						ItemsAccumulating = true;
+					}
+					Synopsis = null;
+					tpe = new TPElement();
+					tpe.Content = TexinfoUtils.transformTags(il.replaceFirst("@item ", ""));
+				}
+				else {
+					if (!il.startsWith("@table")) 
+						Synopsis = ((Synopsis == null) ? "" : Synopsis + " " ) + ((il.length() == 0) ? "<br><br>" : 
+							il + "<eol>");
+				}
+			}
+		}
+	}
+
+	private static FunctionDef HandleFunctionDef(BufferedReader is, String s) throws IOException {
+		FunctionDef fd;
+
+		Matcher m = DeftypefunPattern.matcher(s);
+
+		if (m.matches()) fd = BuildFunctionDef(m);
+		else {						// assume the line got split and retry
+			String il = is.readLine();
+			m = DeftypefunPattern.matcher(s + il);
+			if (m.matches()) fd = BuildFunctionDef(m);
+			else fd = null;
+		}
+
+		return fd;
+	}
+
+	private static void WriteString(BufferedWriter os, String s) throws IOException {
+		//	System.out.println(s);
+		os.write(s+"\n", 0, 1+s.length());
+	}
+
+	private static void CreateHeader(BufferedWriter os) throws IOException {
+		WriteString(os, "<!-- This file automatically generated by an Eclipse utility -->");
+		WriteString(os, "<!DOCTYPE descriptions [");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT descriptions (construct)*>");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT construct (structure|function)*>");
+		WriteString(os, "  <!ATTLIST construct");
+		WriteString(os, "    id ID #REQUIRED");
+		WriteString(os, "    type CDATA #REQUIRED");
+		WriteString(os, "  >");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT structure       (synopsis?, elements?)?>");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT elements     (element*)>");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT element (synopsis*)>");
+		WriteString(os, "  <!ATTLIST element");
+		WriteString(os, "    content CDATA #REQUIRED");
+		WriteString(os, "  >");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT synopsis     (#PCDATA)*>");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT function     (prototype,headers?,synopsis)>");
+		WriteString(os, "  <!ATTLIST function");
+		WriteString(os, "    returntype CDATA #REQUIRED");
+		WriteString(os, "  >");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT prototype    (parameter+)?>");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT parameter (#PCDATA)*>");
+		WriteString(os, "  <!ATTLIST parameter");
+		WriteString(os, "    content CDATA #REQUIRED");
+		WriteString(os, "  >");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT headers      (header+)?>");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT header (#PCDATA)*>");
+		WriteString(os, "  <!ATTLIST header");
+		WriteString(os, "    filename CDATA #REQUIRED");
+		WriteString(os, "  >");
+		WriteString(os, "");
+		WriteString(os, "]>");
+		WriteString(os, "");
+	}
+
+//  // For now we will use an aggregate document license instead of one per
+//  // document.
+//	private static void CreateLicense(BufferedWriter os) throws IOException {
+//		WriteString(os, "<!--");
+//		WriteString(os, "A.1 GNU Free Documentation License");
+//		WriteString(os,"Version 1.2, November 2002");
+//		WriteString(os, "");
+//		WriteString(os, "Copyright &copy; 2000,2001,2002 Free Software Foundation, Inc.");
+//		WriteString(os, "59 Temple Place, Suite 330, Boston, MA  02111-1307, USA");
+//		WriteString(os, "");
+//		WriteString(os, "Everyone is permitted to copy and distribute verbatim copies");
+//		WriteString(os, "of this license document, but changing it is not allowed.");
+//		WriteString(os, "");
+//		WriteString(os, "1. PREAMBLE");
+//		WriteString(os, "");
+//		WriteString(os, "The purpose of this License is to make a manual, textbook, or other");
+//		WriteString(os, "functional and useful document free in the sense of freedom: to");
+//		WriteString(os, "assure everyone the effective freedom to copy and redistribute it,");
+//		WriteString(os, "with or without modifying it, either commercially or noncommercially.");
+//		WriteString(os, "Secondarily, this License preserves for the author and publisher a way");
+//		WriteString(os, "to get credit for their work, while not being considered responsible");
+//		WriteString(os, "for modifications made by others.");
+//		WriteString(os, "");
+//		WriteString(os, "This License is a kind of \"copyleft\", which means that derivative");
+//		WriteString(os, "works of the document must themselves be free in the same sense.  It");
+//		WriteString(os, "complements the GNU General Public License, which is a copyleft");
+//		WriteString(os, "license designed for free software.");
+//		WriteString(os, "");
+//		WriteString(os, "We have designed this License in order to use it for manuals for free");
+//		WriteString(os, "software, because free software needs free documentation: a free");
+//		WriteString(os, "program should come with manuals providing the same freedoms that the");
+//		WriteString(os, "software does.  But this License is not limited to software manuals;");
+//		WriteString(os, "it can be used for any textual work, regardless of subject matter or");
+//		WriteString(os, "whether it is published as a printed book.  We recommend this License");
+//		WriteString(os, "principally for works whose purpose is instruction or reference.");
+//		WriteString(os, "");
+//		WriteString(os, "2. APPLICABILITY AND DEFINITIONS");
+//		WriteString(os, "");
+//		WriteString(os, "This License applies to any manual or other work, in any medium, that");
+//		WriteString(os, "contains a notice placed by the copyright holder saying it can be");
+//		WriteString(os, "distributed under the terms of this License.  Such a notice grants a");
+//		WriteString(os, "world-wide, royalty-free license, unlimited in duration, to use that");
+//		WriteString(os, "work under the conditions stated herein.  The \"Document\", below,");
+//		WriteString(os, "refers to any such manual or work.  Any member of the public is a");
+//		WriteString(os, "licensee, and is addressed as \"you\".  You accept the license if you");
+//		WriteString(os, "copy, modify or distribute the work in a way requiring permission");
+//		WriteString(os, "under copyright law.");
+//		WriteString(os, "");
+//		WriteString(os, "A \"Modified Version\" of the Document means any work containing the");
+//		WriteString(os, "Document or a portion of it, either copied verbatim, or with");
+//		WriteString(os, "modifications and/or translated into another language.");
+//		WriteString(os, "");
+//		WriteString(os, "A \"Secondary Section\" is a named appendix or a front-matter section");
+//		WriteString(os, "of the Document that deals exclusively with the relationship of the");
+//		WriteString(os, "publishers or authors of the Document to the Document's overall");
+//		WriteString(os, "subject (or to related matters) and contains nothing that could fall");
+//		WriteString(os, "directly within that overall subject.  (Thus, if the Document is in");
+//		WriteString(os, "part a textbook of mathematics, a Secondary Section may not explain");
+//		WriteString(os, "any mathematics.)  The relationship could be a matter of historical");
+//		WriteString(os, "connection with the subject or with related matters, or of legal,");
+//		WriteString(os, "commercial, philosophical, ethical or political position regarding");
+//		WriteString(os, "them.");
+//		WriteString(os, "");
+//		WriteString(os, "The \"Invariant Sections\" are certain Secondary Sections whose titles");
+//		WriteString(os, "are designated, as being those of Invariant Sections, in the notice");
+//		WriteString(os, "that says that the Document is released under this License.  If a");
+//		WriteString(os, "section does not fit the above definition of Secondary then it is not");
+//		WriteString(os, "allowed to be designated as Invariant.  The Document may contain zero");
+//		WriteString(os, "Invariant Sections.  If the Document does not identify any Invariant");
+//		WriteString(os, "Sections then there are none.");
+//		WriteString(os, "");
+//		WriteString(os, "The \"Cover Texts\" are certain short passages of text that are listed,");
+//		WriteString(os, "as Front-Cover Texts or Back-Cover Texts, in the notice that says that");
+//		WriteString(os, "the Document is released under this License.  A Front-Cover Text may");
+//		WriteString(os, "be at most 5 words, and a Back-Cover Text may be at most 25 words.");
+//		WriteString(os, "");
+//		WriteString(os, "A \"Transparent\" copy of the Document means a machine-readable copy,");
+//		WriteString(os, "represented in a format whose specification is available to the");
+//		WriteString(os, "general public, that is suitable for revising the document");
+//		WriteString(os, "straightforwardly with generic text editors or (for images composed of");
+//		WriteString(os, "pixels) generic paint programs or (for drawings) some widely available");
+//		WriteString(os, "drawing editor, and that is suitable for input to text formatters or");
+//		WriteString(os, "for automatic translation to a variety of formats suitable for input");
+//		WriteString(os, "to text formatters.  A copy made in an otherwise Transparent file");
+//		WriteString(os, "format whose markup, or absence of markup, has been arranged to thwart");
+//		WriteString(os, "or discourage subsequent modification by readers is not Transparent.");
+//		WriteString(os, "An image format is not Transparent if used for any substantial amount");
+//		WriteString(os, "of text.  A copy that is not \"Transparent\" is called \"Opaque\".");
+//		WriteString(os, "");
+//		WriteString(os, "Examples of suitable formats for Transparent copies include plain");
+//		WriteString(os, "ASCII without markup, Texinfo input format, LaTeX input");
+//		WriteString(os, "format, SGML or XML using a publicly available");
+//		WriteString(os, "DTD, and standard-conforming simple HTML,");
+//		WriteString(os, "PostScript or PDF designed for human modification.  Examples");
+//		WriteString(os, "of transparent image formats include PNG, XCF and");
+//		WriteString(os, "JPG.  Opaque formats include proprietary formats that can be");
+//		WriteString(os, "read and edited only by proprietary word processors, SGML or");
+//		WriteString(os, "XML for which the DTD and/or processing tools are");
+//		WriteString(os, "not generally available, and the machine-generated HTML,");
+//		WriteString(os, "PostScript or PDF produced by some word processors for");
+//		WriteString(os, "output purposes only.");
+//		WriteString(os, "");
+//		WriteString(os, "The \"Title Page\" means, for a printed book, the title page itself,");
+//		WriteString(os, "plus such following pages as are needed to hold, legibly, the material");
+//		WriteString(os, "this License requires to appear in the title page.  For works in");
+//		WriteString(os, "formats which do not have any title page as such, \"Title Page\" means");
+//		WriteString(os, "the text near the most prominent appearance of the work's title,");
+//		WriteString(os, "preceding the beginning of the body of the text.");
+//		WriteString(os, "");
+//		WriteString(os, "A section \"Entitled XYZ\" means a named subunit of the Document whose");
+//		WriteString(os, "title either is precisely XYZ or contains XYZ in parentheses following");
+//		WriteString(os, "text that translates XYZ in another language.  (Here XYZ stands for a");
+//		WriteString(os, "specific section name mentioned below, such as \"Acknowledgements\",");
+//		WriteString(os, "\"Dedications\", \"Endorsements\", or \"History\".)  To \"Preserve the Title\"");
+//		WriteString(os, "of such a section when you modify the Document means that it remains a");
+//		WriteString(os, "section \"Entitled XYZ\" according to this definition.");
+//		WriteString(os, "");
+//		WriteString(os, "The Document may include Warranty Disclaimers next to the notice which");
+//		WriteString(os, "states that this License applies to the Document.  These Warranty");
+//		WriteString(os, "Disclaimers are considered to be included by reference in this");
+//		WriteString(os, "License, but only as regards disclaiming warranties: any other");
+//		WriteString(os, "implication that these Warranty Disclaimers may have is void and has");
+//		WriteString(os, "no effect on the meaning of this License.");
+//		WriteString(os, "");
+//		WriteString(os, "3. VERBATIM COPYING");
+//		WriteString(os, "");
+//		WriteString(os, "You may copy and distribute the Document in any medium, either");
+//		WriteString(os, "commercially or noncommercially, provided that this License, the");
+//		WriteString(os, "copyright notices, and the license notice saying this License applies");
+//		WriteString(os, "to the Document are reproduced in all copies, and that you add no other");
+//		WriteString(os, "conditions whatsoever to those of this License.  You may not use");
+//		WriteString(os, "technical measures to obstruct or control the reading or further");
+//		WriteString(os, "copying of the copies you make or distribute.  However, you may accept");
+//		WriteString(os, "compensation in exchange for copies.  If you distribute a large enough");
+//		WriteString(os, "number of copies you must also follow the conditions in section 3.");
+//		WriteString(os, "");
+//		WriteString(os, "You may also lend copies, under the same conditions stated above, and");
+//		WriteString(os, "you may publicly display copies.");
+//		WriteString(os, "");
+//		WriteString(os, "4. COPYING IN QUANTITY");
+//		WriteString(os, "");
+//		WriteString(os, "If you publish printed copies (or copies in media that commonly have");
+//		WriteString(os, "printed covers) of the Document, numbering more than 100, and the");
+//		WriteString(os, "Document's license notice requires Cover Texts, you must enclose the");
+//		WriteString(os, "copies in covers that carry, clearly and legibly, all these Cover");
+//		WriteString(os, "Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on");
+//		WriteString(os, "the back cover.  Both covers must also clearly and legibly identify");
+//		WriteString(os, "you as the publisher of these copies.  The front cover must present");
+//		WriteString(os, "the full title with all words of the title equally prominent and");
+//		WriteString(os, "visible.  You may add other material on the covers in addition.");
+//		WriteString(os, "Copying with changes limited to the covers, as long as they preserve");
+//		WriteString(os, "the title of the Document and satisfy these conditions, can be treated");
+//		WriteString(os, "as verbatim copying in other respects.");
+//		WriteString(os, "");
+//		WriteString(os, "If the required texts for either cover are too voluminous to fit");
+//		WriteString(os, "legibly, you should put the first ones listed (as many as fit");
+//		WriteString(os, "reasonably) on the actual cover, and continue the rest onto adjacent");
+//		WriteString(os, "pages.");
+//		WriteString(os, "");
+//		WriteString(os, "If you publish or distribute Opaque copies of the Document numbering");
+//		WriteString(os, "more than 100, you must either include a machine-readable Transparent");
+//		WriteString(os, "copy along with each Opaque copy, or state in or with each Opaque copy");
+//		WriteString(os, "a computer-network location from which the general network-using");
+//		WriteString(os, "public has access to download using public-standard network protocols");
+//		WriteString(os, "a complete Transparent copy of the Document, free of added material.");
+//		WriteString(os, "If you use the latter option, you must take reasonably prudent steps,");
+//		WriteString(os, "when you begin distribution of Opaque copies in quantity, to ensure");
+//		WriteString(os, "that this Transparent copy will remain thus accessible at the stated");
+//		WriteString(os, "location until at least one year after the last time you distribute an");
+//		WriteString(os, "Opaque copy (directly or through your agents or retailers) of that");
+//		WriteString(os, "edition to the public.");
+//		WriteString(os, "");
+//		WriteString(os, "It is requested, but not required, that you contact the authors of the");
+//		WriteString(os, "Document well before redistributing any large number of copies, to give");
+//		WriteString(os, "them a chance to provide you with an updated version of the Document.");
+//		WriteString(os, "");
+//		WriteString(os, "5. MODIFICATIONS");
+//		WriteString(os, "");
+//		WriteString(os, "You may copy and distribute a Modified Version of the Document under");
+//		WriteString(os, "the conditions of sections 2 and 3 above, provided that you release");
+//		WriteString(os, "the Modified Version under precisely this License, with the Modified");
+//		WriteString(os, "Version filling the role of the Document, thus licensing distribution");
+//		WriteString(os, "and modification of the Modified Version to whoever possesses a copy");
+//		WriteString(os, "of it.  In addition, you must do these things in the Modified Version:");
+//		WriteString(os, "");
+//		WriteString(os, "   1. Use in the Title Page (and on the covers, if any) a title distinct");
+//		WriteString(os, "      from that of the Document, and from those of previous versions");
+//		WriteString(os, "      (which should, if there were any, be listed in the History section");
+//		WriteString(os, "      of the Document).  You may use the same title as a previous version");
+//		WriteString(os, "      if the original publisher of that version gives permission.");
+//		WriteString(os, "");
+//		WriteString(os, "   2. List on the Title Page, as authors, one or more persons or entities");
+//		WriteString(os, "      responsible for authorship of the modifications in the Modified");
+//		WriteString(os, "      Version, together with at least five of the principal authors of the");
+//		WriteString(os, "      Document (all of its principal authors, if it has fewer than five),");
+//		WriteString(os, "      unless they release you from this requirement.");
+//		WriteString(os, "");
+//		WriteString(os, "   3. State on the Title page the name of the publisher of the");
+//		WriteString(os, "      Modified Version, as the publisher.");
+//		WriteString(os, "");
+//		WriteString(os, "   4. Preserve all the copyright notices of the Document.");
+//		WriteString(os, "");
+//		WriteString(os, "   5. Add an appropriate copyright notice for your modifications");
+//		WriteString(os, "      adjacent to the other copyright notices.");
+//		WriteString(os, "");
+//		WriteString(os, "   6. Include, immediately after the copyright notices, a license notice");
+//		WriteString(os, "      giving the public permission to use the Modified Version under the");
+//		WriteString(os, "      terms of this License, in the form shown in the Addendum below.");
+//		WriteString(os, "");
+//		WriteString(os, "   7. Preserve in that license notice the full lists of Invariant Sections");
+//		WriteString(os, "      and required Cover Texts given in the Document's license notice.");
+//		WriteString(os, "");
+//		WriteString(os, "   8. Include an unaltered copy of this License.");
+//		WriteString(os, "");
+//		WriteString(os, "   9. Preserve the section Entitled \"History\", Preserve its Title, and add");
+//		WriteString(os, "      to it an item stating at least the title, year, new authors, and");
+//		WriteString(os, "      publisher of the Modified Version as given on the Title Page.  If");
+//		WriteString(os, "      there is no section Entitled \"History\" in the Document, create one");
+//		WriteString(os, "      stating the title, year, authors, and publisher of the Document as");
+//		WriteString(os, "      given on its Title Page, then add an item describing the Modified");
+//		WriteString(os, "      Version as stated in the previous sentence.");
+//		WriteString(os, "");
+//		WriteString(os, "  10. Preserve the network location, if any, given in the Document for");
+//		WriteString(os, "      public access to a Transparent copy of the Document, and likewise");
+//		WriteString(os, "      the network locations given in the Document for previous versions");
+//		WriteString(os, "      it was based on.  These may be placed in the \"History\" section.");
+//		WriteString(os, "      You may omit a network location for a work that was published at");
+//		WriteString(os, "      least four years before the Document itself, or if the original");
+//		WriteString(os, "      publisher of the version it refers to gives permission.");
+//		WriteString(os, "");
+//		WriteString(os, "  11. For any section Entitled \"Acknowledgements\" or \"Dedications\", Preserve");
+//		WriteString(os, "      the Title of the section, and preserve in the section all the");
+//		WriteString(os, "      substance and tone of each of the contributor acknowledgements and/or");
+//		WriteString(os, "      dedications given therein.");
+//		WriteString(os, "");
+//		WriteString(os, "  12. Preserve all the Invariant Sections of the Document,");
+//		WriteString(os, "      unaltered in their text and in their titles.  Section numbers");
+//		WriteString(os, "      or the equivalent are not considered part of the section titles.");
+//		WriteString(os, "");
+//		WriteString(os, "  13. Delete any section Entitled \"Endorsements\".  Such a section");
+//		WriteString(os, "      may not be included in the Modified Version.");
+//		WriteString(os, "");
+//		WriteString(os, "  14. Do not retitle any existing section to be Entitled \"Endorsements\" or");
+//		WriteString(os, "      to conflict in title with any Invariant Section.");
+//		WriteString(os, "");
+//		WriteString(os, "  15. Preserve any Warranty Disclaimers.");
+//		WriteString(os, "");
+//		WriteString(os, "");
+//		WriteString(os, "If the Modified Version includes new front-matter sections or");
+//		WriteString(os, "appendices that qualify as Secondary Sections and contain no material");
+//		WriteString(os, "copied from the Document, you may at your option designate some or all");
+//		WriteString(os, "of these sections as invariant.  To do this, add their titles to the");
+//		WriteString(os, "list of Invariant Sections in the Modified Version's license notice.");
+//		WriteString(os, "These titles must be distinct from any other section titles.");
+//		WriteString(os, "");
+//		WriteString(os, "You may add a section Entitled \"Endorsements\", provided it contains");
+//		WriteString(os, "nothing but endorsements of your Modified Version by various");
+//		WriteString(os, "parties - for example, statements of peer review or that the text has");
+//		WriteString(os, "been approved by an organization as the authoritative definition of a");
+//		WriteString(os, "standard.");
+//		WriteString(os, "");
+//		WriteString(os, "You may add a passage of up to five words as a Front-Cover Text, and a");
+//		WriteString(os, "passage of up to 25 words as a Back-Cover Text, to the end of the list");
+//		WriteString(os, "of Cover Texts in the Modified Version.  Only one passage of");
+//		WriteString(os, "Front-Cover Text and one of Back-Cover Text may be added by (or");
+//		WriteString(os, "through arrangements made by) any one entity.  If the Document already");
+//		WriteString(os, "includes a cover text for the same cover, previously added by you or");
+//		WriteString(os, "by arrangement made by the same entity you are acting on behalf of,");
+//		WriteString(os, "you may not add another; but you may replace the old one, on explicit");
+//		WriteString(os, "permission from the previous publisher that added the old one.");
+//		WriteString(os, "");
+//		WriteString(os, "The author(s) and publisher(s) of the Document do not by this License");
+//		WriteString(os, "give permission to use their names for publicity for or to assert or");
+//		WriteString(os, "imply endorsement of any Modified Version.");
+//		WriteString(os, "");
+//		WriteString(os, "6. COMBINING DOCUMENTS");
+//		WriteString(os, "");
+//		WriteString(os, "You may combine the Document with other documents released under this");
+//		WriteString(os, "License, under the terms defined in section 4 above for modified");
+//		WriteString(os, "versions, provided that you include in the combination all of the");
+//		WriteString(os, "Invariant Sections of all of the original documents, unmodified, and");
+//		WriteString(os, "list them all as Invariant Sections of your combined work in its");
+//		WriteString(os, "license notice, and that you preserve all their Warranty Disclaimers.");
+//		WriteString(os, "");
+//		WriteString(os, "The combined work need only contain one copy of this License, and");
+//		WriteString(os, "multiple identical Invariant Sections may be replaced with a single");
+//		WriteString(os, "copy.  If there are multiple Invariant Sections with the same name but");
+//		WriteString(os, "different contents, make the title of each such section unique by");
+//		WriteString(os, "adding at the end of it, in parentheses, the name of the original");
+//		WriteString(os, "author or publisher of that section if known, or else a unique number.");
+//		WriteString(os, "Make the same adjustment to the section titles in the list of");
+//		WriteString(os, "Invariant Sections in the license notice of the combined work.");
+//		WriteString(os, "");
+//		WriteString(os, "In the combination, you must combine any sections Entitled \"History\"");
+//		WriteString(os, "in the various original documents, forming one section Entitled");
+//		WriteString(os, "\"History\"; likewise combine any sections Entitled \"Acknowledgements\",");
+//		WriteString(os, "and any sections Entitled \"Dedications\".  You must delete all");
+//		WriteString(os, "sections Entitled \"Endorsements.\"");
+//		WriteString(os, "");
+//		WriteString(os, "7. COLLECTIONS OF DOCUMENTS");
+//		WriteString(os, "");
+//		WriteString(os, "You may make a collection consisting of the Document and other documents");
+//		WriteString(os, "released under this License, and replace the individual copies of this");
+//		WriteString(os, "License in the various documents with a single copy that is included in");
+//		WriteString(os, "the collection, provided that you follow the rules of this License for");
+//		WriteString(os, "verbatim copying of each of the documents in all other respects.");
+//		WriteString(os, "");
+//		WriteString(os, "You may extract a single document from such a collection, and distribute");
+//		WriteString(os, "it individually under this License, provided you insert a copy of this");
+//		WriteString(os, "License into the extracted document, and follow this License in all");
+//		WriteString(os, "other respects regarding verbatim copying of that document.");
+//		WriteString(os, "");
+//		WriteString(os, "8. AGGREGATION WITH INDEPENDENT WORKS");
+//		WriteString(os, "");
+//		WriteString(os, "A compilation of the Document or its derivatives with other separate");
+//		WriteString(os, "and independent documents or works, in or on a volume of a storage or");
+//		WriteString(os, "distribution medium, is called an \"aggregate\" if the copyright");
+//		WriteString(os, "resulting from the compilation is not used to limit the legal rights");
+//		WriteString(os, "of the compilation's users beyond what the individual works permit.");
+//		WriteString(os, "When the Document is included an aggregate, this License does not");
+//		WriteString(os, "apply to the other works in the aggregate which are not themselves");
+//		WriteString(os, "derivative works of the Document.");
+//		WriteString(os, "");
+//		WriteString(os, "If the Cover Text requirement of section 3 is applicable to these");
+//		WriteString(os, "copies of the Document, then if the Document is less than one half of");
+//		WriteString(os, "the entire aggregate, the Document's Cover Texts may be placed on");
+//		WriteString(os, "covers that bracket the Document within the aggregate, or the");
+//		WriteString(os, "electronic equivalent of covers if the Document is in electronic form.");
+//		WriteString(os, "Otherwise they must appear on printed covers that bracket the whole");
+//		WriteString(os, "aggregate.");
+//		WriteString(os, "");
+//		WriteString(os, "9. TRANSLATION");
+//		WriteString(os, "");
+//		WriteString(os, "Translation is considered a kind of modification, so you may");
+//		WriteString(os, "distribute translations of the Document under the terms of section 4.");
+//		WriteString(os, "Replacing Invariant Sections with translations requires special");
+//		WriteString(os, "permission from their copyright holders, but you may include");
+//		WriteString(os, "translations of some or all Invariant Sections in addition to the");
+//		WriteString(os, "original versions of these Invariant Sections.  You may include a");
+//		WriteString(os, "translation of this License, and all the license notices in the");
+//		WriteString(os, "Document, and any Warrany Disclaimers, provided that you also include");
+//		WriteString(os, "the original English version of this License and the original versions");
+//		WriteString(os, "of those notices and disclaimers.  In case of a disagreement between");
+//		WriteString(os, "the translation and the original version of this License or a notice");
+//		WriteString(os, "or disclaimer, the original version will prevail.");
+//		WriteString(os, "");
+//		WriteString(os, "If a section in the Document is Entitled \"Acknowledgements\",");
+//		WriteString(os, "\"Dedications\", or \"History\", the requirement (section 4) to Preserve");
+//		WriteString(os, "its Title (section 1) will typically require changing the actual");
+//		WriteString(os, "title.");
+//		WriteString(os, "");
+//		WriteString(os, "10. TERMINATION");
+//		WriteString(os, "");
+//		WriteString(os, "You may not copy, modify, sublicense, or distribute the Document except");
+//		WriteString(os, "as expressly provided for under this License.  Any other attempt to");
+//		WriteString(os, "copy, modify, sublicense or distribute the Document is void, and will");
+//		WriteString(os, "automatically terminate your rights under this License.  However,");
+//		WriteString(os, "parties who have received copies, or rights, from you under this");
+//		WriteString(os, "License will not have their licenses terminated so long as such");
+//		WriteString(os, "parties remain in full compliance.");
+//		WriteString(os, "");
+//		WriteString(os, "11. FUTURE REVISIONS OF THIS LICENSE");
+//		WriteString(os, "");
+//		WriteString(os, "The Free Software Foundation may publish new, revised versions");
+//		WriteString(os, "of the GNU Free Documentation License from time to time.  Such new");
+//		WriteString(os, "versions will be similar in spirit to the present version, but may");
+//		WriteString(os, "differ in detail to address new problems or concerns.  See");
+//		WriteString(os, "http://www.gnu.org/copyleft/.");
+//		WriteString(os, "");
+//		WriteString(os, "Each version of the License is given a distinguishing version number.");
+//		WriteString(os, "If the Document specifies that a particular numbered version of this");
+//		WriteString(os, "License \"or any later version\" applies to it, you have the option of");
+//		WriteString(os, "following the terms and conditions either of that specified version or");
+//		WriteString(os, "of any later version that has been published (not as a draft) by the");
+//		WriteString(os, "Free Software Foundation.  If the Document does not specify a version");
+//		WriteString(os, "number of this License, you may choose any version ever published (not");
+//		WriteString(os, "as a draft) by the Free Software Foundation.");
+//		WriteString(os, "-->");
+//	}
+
+	private static void CreateTrailer(BufferedWriter os) throws IOException {
+		WriteString(os, "</descriptions>");
+	}
+
+	private static void WriteSynopsis(BufferedWriter os, String Synopsis, boolean indent)  throws IOException {
+		String ss = TexinfoUtils.transformTags(Synopsis);
+		String[] tt = ss.split("<eol>");
+		String aa = "";
+		String spaces = indent ? "            " : "        ";
+		WriteString(os, spaces + "<synopsis>");
+		if (null != Synopsis) {
+			for (int pp = 0; pp < tt.length; pp++) {
+				WriteString(os, spaces + tt[pp]);
+//				if (tt[pp].equals("<br>")) {
+//					WriteString(os, spaces + aa + "\n");
+//					aa = "";
+//				}
+//				else {
+//					if ((aa.length() + tt[pp].length()) > 64) {
+//						WriteString(os, spaces + aa);
+//						aa = "";
+//					}
+//					aa = aa + " " + tt[pp];
+//				}
+			}
+		}
+		if (aa.length() > 0) WriteString(os, "        " + aa);
+		WriteString(os, spaces + "</synopsis>");
+	}
+
+	private static String HandleInclude (String srcdir, String line, String Synopsis) {
+		Pattern p = Pattern.compile("@include\\s+(.*?)\\.texi");
+		Matcher mm = p.matcher(line);
+		if (mm.find()) {
+			String il;
+			try {
+				String fileName = (srcdir.endsWith("/") ? srcdir : srcdir + "/") + mm.replaceAll("examples/$1");
+				BufferedReader is = new BufferedReader(new FileReader(fileName));
+				while (null != (il = is.readLine())) {
+					// C Help does not ignore "<" or ">" inside a <pre> or <samp> tag
+					// so we have to prepare for two levels of indirection.  The
+					// first is for xml to interpret and the second is for the
+					// C Help processor to interpret.  So, we put &lt; and &gt; which
+					// will be transformed into &amp;lt; by the tag transformer.
+					Pattern p1 = Pattern.compile("<");
+					Pattern p2 = Pattern.compile(">");
+					Matcher mm1 = p1.matcher(il);
+					il = mm1.replaceAll("&lt;");
+					Matcher mm2 = p2.matcher(il);
+					il = mm2.replaceAll("&gt;");
+					Synopsis = ((Synopsis == null) ? "" : Synopsis + " " ) + ((il.length() == 0) ? "<br><br>" : 
+						il + "<eol>");
+				}
+			} catch (IOException e) {
+				System.out.println("IOException reading example file");
+			}
+		}
+		return Synopsis;
+	}
+	private static void HandleDeftypefun(BufferedWriter os, BufferedReader is, String s, String srcdir) throws IOException {
+		String il;
+		FunctionDef fd;
+		List FDefs = new ArrayList();
+		String Synopsis = null;
+
+		if (null != (fd = HandleFunctionDef(is, s))) FDefs.add(fd);
+
+		while (null != (il = is.readLine())) {
+			Matcher mm = IncludePattern.matcher(il);
+			if (il.startsWith("@deftypefunx")) {
+				if (null != (fd = HandleFunctionDef(is, il))) FDefs.add(fd);
+			}
+			else if (mm.matches()) {
+				if (!IncludeList.contains(mm.group(1)))
+					IncludeList.add(mm.group(1));
+			}
+			else if (il.startsWith("@comment") ||
+					il.startsWith("@c ") ||
+					il.startsWith("@pindex")) {	// ignore
+			}
+			else if (il.startsWith("@include") && fd != null) {
+				Synopsis = HandleInclude(srcdir, il, Synopsis);
+			}
+			else if (il.startsWith("@end deftypefun")) {
+				for (int kk = 0; kk < FDefs.size(); kk++) {
+					fd = (FunctionDef)FDefs.get(kk);
+
+					WriteString(os, "  <construct id=\"function-" + fd.FunctionName + "\" type=\"function\">");
+
+					WriteString(os, "    <function returntype=\"" + fd.ReturnType + "\">");
+
+					WriteString(os, "      <prototype>");
+					String[] parms = fd.Parameters;
+					for (int i = 0; i < parms.length; i++) {
+						String parm = TexinfoUtils.stripProtoTags(parms[i]);
+						WriteString(os, "        <parameter content=\"" + parm + "\"/>");
+					}
+					WriteString(os, "      </prototype>");
+
+					if (fd.IncludeList != null) {
+						WriteString(os, "      <headers>");
+						Object[] incs = fd.IncludeList;
+						for (int j = 0; j < incs.length; j++) {
+							String inc = (String)incs[j];
+							WriteString(os, "        <header filename = \"" + inc + "\"/>");
+						}
+						WriteString(os, "      </headers>");
+					}
+
+					if (null != Synopsis) WriteSynopsis(os, Synopsis, false);
+
+					WriteString(os, "    </function>");
+					WriteString(os, "  </construct>");
+				}
+				return;
+			}
+			else {
+				Synopsis = ((Synopsis == null) ? "" : Synopsis + " " ) + ((il.length() == 0) ? "<br><br>" : 
+					il + "<eol>");
+			}
+		}
+		FDefs.clear();
+
+	}
+
+	private static class OnlyTexi implements FilenameFilter {
+		public boolean accept(File dir, String s) {
+			return (s.endsWith(".texi")) ? true : false;
+		}
+	}
+
+	public static void BuildXMLFromTexinfo(String srcdir, String dstdir) {
+		try {
+			BufferedWriter os = new BufferedWriter(new FileWriter(dstdir));
+
+			CreateHeader(os);
+//			CreateLicense(os);
+
+			WriteString(os, "<descriptions>");
+
+			try {
+				String[] dir = new java.io.File(srcdir).list(new OnlyTexi());
+				for (int i = 0; i < dir.length; i++) {
+					String qFile = srcdir.endsWith("/")
+					? srcdir + dir[i]
+					               : srcdir + "/" + dir[i];
+
+					try {
+						BufferedReader is = new BufferedReader(new FileReader(qFile));
+						String il;
+
+						while (null != (il = is.readLine())) {
+							Matcher mm = IncludePattern.matcher(il);
+							if (il.startsWith("@deftypefun")) {	// handle @deftypefun[x]
+								HandleDeftypefun(os, is, il, srcdir);
+							}
+							else if (il.startsWith("@deftp")) {	// handle @deftp
+								HandleDeftp(os, is, il);
+							}
+							else if (mm.matches()) {		// handle @comment <include_file>
+								if (!IncludeList.contains(mm.group(1)))
+									IncludeList.add(mm.group(1));
+							}
+							else if (il.startsWith("@end deftypefn"))
+								// Handle accumulated header file comments that are in
+								// constructs we aren't parsing.
+								IncludeList.clear();
+						}
+						is.close();
+					}
+					catch (IOException e) {
+						System.out.println("Input File IOException: " + e);
+						return;
+					}
+				}
+			}
+			catch (NullPointerException e) {
+				System.out.println("NullPointerException: " + e);
+				return;
+			}
+
+			CreateTrailer(os);
+
+			os.close();
+		}
+		catch (IOException e) {
+			System.out.println("Output File IOException: " + e);
+			return;
+		}
+	}
+
+	public static void main(String[] args) {
+		BuildXMLFromTexinfo(args[0], args[1]);
+	}
+
+}
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseNewlibTexinfo.java b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseNewlibTexinfo.java
new file mode 100644
index 0000000..eecce64
--- /dev/null
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseNewlibTexinfo.java
@@ -0,0 +1,564 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.libhover.texinfoparsers;
+import java.io.*;
+import java.util.regex.*;
+import java.util.*;
+
+//This file contains a texinfo parser that can be
+//run to create the Autotools glibc.xml file.
+//Usage is as follows:
+//1. compile this file using javac
+//2. run this file using java, passing the
+//arguments: ${glibc_source_path}/manual glibc.xml
+
+public class ParseNewlibTexinfo {
+	static final boolean DEBUG = false;
+
+	//                              1, 2, 3
+	static final String RtnType = "(\\w+\\s+(\\w+\\s+)?(\\w+\\s+)?\\**)";
+	static final int    RtnTypeSIndex = 1;
+
+	//                              4
+	static final String FunctionName = "(\\w+)\\s*\\(";
+	static final int    FunctionNameIndex = 4;
+
+	//                              5 and 6
+	static final String Parms = "((.*)\\))";
+	static final int    ParmsIndex = 6;
+
+	static final String rest = ".*";
+
+	static final String WhiteSpace = "\\s*";
+
+	static final Pattern DeftypefunPattern
+	= Pattern.compile("^" + WhiteSpace +
+			RtnType + WhiteSpace +
+			FunctionName + WhiteSpace +
+			Parms +
+			rest, Pattern.MULTILINE + Pattern.CASE_INSENSITIVE);
+	
+	//                              1, 2, 3
+	static final String RtnType2 = "(\\w*\\s*(\\w*\\*?\\s+)?(\\w*\\*?\\s+)?\\**\\s*)\\(\\*";
+	static final int    RtnType2Index = 1;
+
+	//                              4
+	static final String FunctionName2 = "(\\w+)\\s*\\(";
+	static final int    FunctionName2Index = 4;
+
+	//                              5 and 6
+	static final String Parms2 = "((.*)\\)\\)\\s*)";
+	static final int    Parms2Index = 6;
+	
+	//								7
+	static final String RtnTypeParms = "(\\(.*\\))";
+	static final int	RtnTypeParmsIndex = 7;
+
+	static final Pattern DeftypefunPattern2
+	= Pattern.compile("^" + WhiteSpace +
+			RtnType2 + WhiteSpace +
+			FunctionName2 + WhiteSpace +
+			Parms2 + RtnTypeParms +
+			rest, Pattern.MULTILINE + Pattern.CASE_INSENSITIVE);
+
+	// For va_arg, the prototype is @var{type} so we create a third type of function definition
+	// and we make it so the return type ends up taking as many groups as the normal RtnType so
+	// the BuildFunctionDef routine can be used without modification.
+	//                              1, 2, 3
+	static final String RtnTypeVar = "@var\\{(\\w+)(\\})(\\s)";
+
+	static final Pattern DeftypefunPattern3
+	= Pattern.compile("^" + WhiteSpace +
+			RtnTypeVar + WhiteSpace +
+			FunctionName + WhiteSpace +
+			Parms +
+			rest, Pattern.MULTILINE + Pattern.CASE_INSENSITIVE);
+
+	static final Pattern IncludePattern		= Pattern.compile("^#include\\s*<((\\w*/)*\\w*\\.h)>\\s*$");
+	static final Pattern PindexPattern		= Pattern.compile("^@pindex\\s*\\w*\\s*$");
+	static final Pattern FindexPattern		= Pattern.compile("^@findex\\s*(\\w*)\\s*$");
+	static final Pattern SynopsisPattern	= Pattern.compile("^\\s*@strong\\{Synopsis\\}\\s*");
+	static final Pattern ParmBracketPattern = Pattern.compile("\\((.*)\\)");
+	static final Pattern IndexPattern		= Pattern.compile("@\\w*index\\s+[a-zA-Z0-9_@\\{\\}]*");
+	static final Pattern IndexPattern2		= Pattern.compile("@\\w*index\\{[a-zA-Z0-9_@\\{\\}]*\\}");
+	static final Pattern ExamplePattern		= Pattern.compile("@example");
+	static final Pattern EndExamplePattern  = Pattern.compile("@end\\s+example");
+	static final Pattern EnumeratePattern	= Pattern.compile("@enumerate");
+	static final Pattern EndEnumeratePattern  = Pattern.compile("@end\\s+enumerate");
+	static final Pattern VerbatimPattern	= Pattern.compile("@verbatim");
+	static final Pattern ItemPattern		= Pattern.compile("@item");
+	static final Pattern NoIndentPattern	= Pattern.compile("@noindent");
+	static final Pattern BRPattern			= Pattern.compile("&lt;br&gt;");
+	static final Pattern EOLPattern			= Pattern.compile("&lt;eol&gt;");
+	static final Pattern EndVerbatimPattern = Pattern.compile("@end\\s+verbatim");
+	static final Pattern TableSampItemPattern = Pattern.compile("(@table\\s*@samp.*)@item\\s*([a-zA-Z_0-9+\\-<>/ ]*)<eol>(.*@end\\s*table)", Pattern.DOTALL);
+	static final Pattern TableAsisItemPattern = Pattern.compile("(@table\\s*@asis.*)@item\\s*([a-zA-Z_0-9+\\-,<>/ ]*)<eol>(.*@end\\s*table)", Pattern.DOTALL);
+	static final Pattern TableSampPattern 	= Pattern.compile("@table\\s*@samp", Pattern.MULTILINE);
+	static final Pattern TableAsisPattern	= Pattern.compile("@table\\s*@asis", Pattern.MULTILINE);
+	static final Pattern EndTablePattern 	= Pattern.compile("@end\\s+table");
+	static final Pattern DotsPattern		= Pattern.compile("@dots\\{\\}");
+	static final Pattern ItemizeMinusPattern= Pattern.compile("@itemize\\s+@minus" + "(.*)" + "@end\\s+itemize", Pattern.MULTILINE);
+	static final Pattern ItemizeBulletPattern= Pattern.compile("@itemize\\s+@bullet" + "(.*)" + "@end\\s+itemize", Pattern.MULTILINE);
+	static final Pattern XrefPattern		= Pattern.compile("@xref\\{[^\\}]*\\}", Pattern.MULTILINE);
+	static final Pattern CommandPattern		= Pattern.compile("@command\\{([^\\}]*)\\}");
+	static final Pattern KbdPattern			= Pattern.compile("@kbd\\{([^\\}]*)\\}");
+	static final Pattern RPattern			= Pattern.compile("@r\\{([^\\}]*)\\}");
+	static final Pattern FilePattern		= Pattern.compile("@file\\{([^\\}]*)\\}");
+	static final Pattern VarPattern			= Pattern.compile("@var\\{([^\\}]*)\\}");
+	static final Pattern OVarPattern		= Pattern.compile("@ovar\\{([^\\}]*)\\}");
+	static final Pattern DVarPattern		= Pattern.compile("@dvar\\{([^\\},\\,]*),([^\\}]*)\\}");
+	static final Pattern CodePattern		= Pattern.compile("@code\\{([^\\}]*)\\}");
+	static final Pattern EmphPattern		= Pattern.compile("@emph\\{([^\\}]*)\\}");
+	static final Pattern SampPattern		= Pattern.compile("@samp\\{([^\\}]*)\\}");
+	static final Pattern OptionPattern		= Pattern.compile("@option\\{([^\\}]*)\\}");
+	static final Pattern TagPattern		= Pattern.compile("@\\w*\\{([^\\}]*)\\}");
+	static final Pattern AmpersandPattern	= Pattern.compile("&");
+	static final Pattern LeftAnglePattern	= Pattern.compile("<");
+	static final Pattern RightAnglePattern	= Pattern.compile(">");
+
+	static List IncludeList = new ArrayList();
+	static Stack readers = new Stack();
+
+	static class FunctionDef {
+		String ReturnType;
+		String FunctionName;
+		String[] Parameters;
+		Object[] IncludeList;
+	}
+
+	static class TPElement {
+		String Content;
+		String Synopsis;
+	}
+
+	static class TPDef {
+		String TPType;
+		String TPName;
+		String TPSynopsis;
+		TPElement[] TPElements;
+		Object[] IncludeList;
+	}
+
+	private static FunctionDef FindFunctionDef(String name, List FDefs) {
+		for (Iterator iterator = FDefs.iterator(); iterator.hasNext();) {
+			FunctionDef k = (FunctionDef) iterator.next();
+			if (k.FunctionName.equals(name))
+				return k;
+		}
+		return null;
+	}
+	
+	private static FunctionDef BuildFunctionDef(Matcher m, FunctionDef fd) {
+		fd.ReturnType = m.group(RtnTypeSIndex);
+		fd.FunctionName = m.group(FunctionNameIndex);
+
+		if (null != m.group(ParmsIndex)) {
+			String tt = TexinfoUtils.stripProtoTags(m.group(ParmsIndex));
+			String[] parms = tt.split(",\\s");
+			fd.Parameters = parms;
+		}
+
+		if (IncludeList.size() > 0) {
+			fd.IncludeList = IncludeList.toArray();
+		}
+		return fd;
+	}
+
+	private static FunctionDef BuildFunctionDef2(Matcher m, FunctionDef fd) {
+		fd.ReturnType = m.group(RtnType2Index) + "(*)" + m.group(RtnTypeParmsIndex);
+		fd.FunctionName = m.group(FunctionName2Index);
+
+		if (null != m.group(Parms2Index)) {
+			String tt = TexinfoUtils.stripProtoTags(m.group(Parms2Index));
+			String[] parms = tt.split(",\\s");
+			fd.Parameters = parms;
+		}
+
+		if (IncludeList.size() > 0) {
+			fd.IncludeList = IncludeList.toArray();
+		}
+		return fd;
+	}
+
+	private static void HandleFunctionDefs(BufferedReader is, List FDefs) throws IOException {
+		FunctionDef fd;
+		String il = null;
+		boolean preRead = false;
+
+		while (preRead || (il = is.readLine()) != null) {
+			preRead = false;
+			if (il.startsWith("@end example"))
+				return;
+
+			Matcher m = DeftypefunPattern.matcher(il);
+			Matcher m2 = DeftypefunPattern2.matcher(il);
+			Matcher m3 = DeftypefunPattern3.matcher(il);
+			Matcher mm = IncludePattern.matcher(il);
+
+			if (mm.matches()) {
+				if (!IncludeList.contains(mm.group(1)))
+					IncludeList.add(mm.group(1));
+			}
+			else if (m.matches()) {
+				fd = FindFunctionDef(m.group(FunctionNameIndex), FDefs);
+				if (fd != null)
+					BuildFunctionDef(m, fd);
+				else
+					System.out.println("Missing findex for " + m.group(FunctionNameIndex));
+			}
+			else if (m2.matches()) {
+				fd = FindFunctionDef(m2.group(FunctionName2Index), FDefs);
+				if (fd != null)
+					BuildFunctionDef2(m2, fd);
+				else
+					System.out.println("Missing findex for " + m2.group(FunctionName2Index));
+			}
+			else if (m3.matches()) {
+				fd = FindFunctionDef(m3.group(FunctionNameIndex), FDefs);
+				if (fd != null)
+					BuildFunctionDef(m3, fd);
+				else
+					System.out.println("Missing findex for " + m3.group(FunctionName2Index));
+			}
+			else if (il.trim().length() > 0) {
+				il = il.trim();
+				while (il.endsWith(",")) {  // assume prototype extends more than one line
+					preRead = true;
+					String il2 = is.readLine().trim();
+					if (il2 != null && il2.startsWith("@")) { // something wrong, just look at new line fetched
+						il = il2;
+						continue;
+					}
+					il = il + il2; // concatenate
+				}
+			}
+		}
+	}
+
+	private static void WriteString(BufferedWriter os, String s) throws IOException {
+		//	System.out.println(s);
+		os.write(s+"\n", 0, 1+s.length());
+	}
+
+	private static void CreateHeader(BufferedWriter os) throws IOException {
+		WriteString(os, "<!-- This file automatically generated by an Eclipse utility -->");
+		WriteString(os, "<!DOCTYPE descriptions [");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT descriptions (construct)*>");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT construct (structure|function|synopsis)*>");
+		WriteString(os, "  <!ATTLIST construct");
+		WriteString(os, "    id ID #REQUIRED");
+		WriteString(os, "    type CDATA #REQUIRED");
+		WriteString(os, "  >");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT structure       (synopsis?, elements?)?>");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT elements     (element*)>");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT element (synopsis*)>");
+		WriteString(os, "  <!ATTLIST element");
+		WriteString(os, "    content CDATA #REQUIRED");
+		WriteString(os, "  >");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT synopsis     (#PCDATA)*>");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT function     (prototype,headers?,groupsynopsis?,synopsis)>");
+		WriteString(os, "  <!ATTLIST function");
+		WriteString(os, "    returntype CDATA #REQUIRED");
+		WriteString(os, "  >");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT prototype    (parameter+)?>");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT parameter (#PCDATA)*>");
+		WriteString(os, "  <!ATTLIST parameter");
+		WriteString(os, "    content CDATA #REQUIRED");
+		WriteString(os, "  >");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT headers      (header+)?>");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT header (#PCDATA)*>");
+		WriteString(os, "  <!ATTLIST header");
+		WriteString(os, "    filename CDATA #REQUIRED");
+		WriteString(os, "  >");
+		WriteString(os, "");
+		WriteString(os, "  <!ELEMENT groupsynopsis (#PCDATA)*>");
+		WriteString(os, "  <!ATTLIST groupsynopsis");
+		WriteString(os, "    id CDATA #REQUIRED");
+		WriteString(os, "  >");
+		WriteString(os, "");
+		WriteString(os, "]>");
+		WriteString(os, "");
+	}
+
+	private static void CreateTrailer(BufferedWriter os) throws IOException {
+		WriteString(os, "</descriptions>");
+	}
+
+	private static void WriteDescription(BufferedWriter os, String Synopsis, boolean indent)  throws IOException {
+		String ss = TexinfoUtils.transformTags(Synopsis);
+		String[] tt = ss.split("<eol>");
+		String aa = "";
+		String spaces = indent ? "            " : "        ";
+		WriteString(os, spaces + "<synopsis>");
+		if (null != Synopsis) {
+			for (int pp = 0; pp < tt.length; pp++) {
+				WriteString(os, spaces + tt[pp]);
+//				if (tt[pp].equals("<br>")) {
+//					WriteString(os, spaces + aa + "\n");
+//					aa = "";
+//				}
+//				else {
+//					if ((aa.length() + tt[pp].length()) > 64) {
+//						WriteString(os, spaces + aa);
+//						aa = "";
+//					}
+//					aa = aa + " " + tt[pp];
+//				}
+			}
+		}
+		if (aa.length() > 0) WriteString(os, "        " + aa);
+		WriteString(os, spaces + "</synopsis>");
+	}
+
+	private static BufferedReader HandleInclude (BufferedReader is, String srcdir, String line) {
+		Pattern p = Pattern.compile("@include\\s+(.*?)");
+		Matcher mm = p.matcher(line.trim());
+		BufferedReader is2 = null;
+		if (mm.find()) {
+			String fileName = (srcdir.endsWith("/") ? srcdir : srcdir + "/") + mm.replaceAll("$1");
+			try {
+				is2 = new BufferedReader(new FileReader(fileName));
+				readers.push(is);
+			} catch (FileNotFoundException e) {
+				System.out.println("include " + fileName + " not found");
+				// do nothing and return null
+			}
+		}
+		return is2 == null ? is : is2;
+	}
+	
+	private static String HandleDescription(BufferedReader is) throws IOException {
+		String Description = null;
+		String il;
+		
+		while (null != (il = is.readLine())) {
+			if (il.startsWith("@page") ||
+					il.startsWith("@section") ||
+					il.startsWith("@node"))
+				break;
+			Description = ((Description == null) ? "" : Description + " " ) + ((il.length() == 0) ? "<br><br>" : 
+				il + "<eol>");
+		}
+		
+		return Description;
+	}
+	
+	private static void HandleFunction(BufferedWriter os, BufferedReader is, String s, String builddir) throws IOException {
+		String il;
+		FunctionDef fd;
+		List FDefs = new ArrayList();
+		String Description = null;
+		boolean synopsisMarker = false;
+		
+		IncludeList.clear();
+        Matcher mmf = FindexPattern.matcher(s);
+		fd = new FunctionDef();
+		if (mmf.matches())
+			fd.FunctionName = mmf.group(1);
+		else
+			return;
+		FDefs.add(fd);
+
+		while (null != (il = is.readLine())) {
+			Matcher syn = SynopsisPattern.matcher(il);
+			if (il.startsWith("@findex")) {
+				synopsisMarker = false;
+				Matcher mm2 = FindexPattern.matcher(il);
+				FunctionDef fd2 = new FunctionDef();
+				if (mm2.matches()) {
+					fd2.FunctionName = mm2.group(1);
+					FDefs.add(fd2);
+				}
+			}
+			else if (il.startsWith("@example") && synopsisMarker) {
+				HandleFunctionDefs(is, FDefs);
+				synopsisMarker = false;
+			}
+			else if (il.startsWith("@include") && fd != null) {
+				is = HandleInclude(is, builddir, il);
+			}
+			else if (syn.matches()) {
+				synopsisMarker = true;
+			}
+			else if (il.startsWith("@strong{Description}")) {
+				synopsisMarker = false;
+				Description = HandleDescription(is);
+				break; // we are done after description has been fetched
+			}
+			// otherwise ignore line
+		}
+		
+		String name = ((FunctionDef)FDefs.get(0)).FunctionName;
+		
+        if (FDefs.size() > 1) {
+			for (int kk = 0; kk < FDefs.size(); kk++) {
+				fd = (FunctionDef)FDefs.get(kk);
+
+				WriteString(os, "  <construct id=\"function-" + fd.FunctionName + "\" type=\"function\">");
+
+				WriteString(os, "    <function returntype=\"" + fd.ReturnType + "\">");
+
+				WriteString(os, "      <prototype>");
+				String[] parms = fd.Parameters;
+				if (parms == null)
+					System.out.println("null parms for findex " + fd.FunctionName);
+				else {
+					for (int i = 0; i < parms.length; i++) {
+						String parm = TexinfoUtils.stripProtoTags(parms[i]);
+						WriteString(os, "        <parameter content=\"" + parm + "\"/>");
+					}
+				}
+				WriteString(os, "      </prototype>");
+
+				if (fd.IncludeList != null) {
+					WriteString(os, "      <headers>");
+					Object[] incs = fd.IncludeList;
+					for (int j = 0; j < incs.length; j++) {
+						String inc = (String)incs[j];
+						WriteString(os, "        <header filename = \"" + inc + "\"/>");
+					}
+					WriteString(os, "      </headers>");
+				}
+
+				if (null != Description)
+					WriteString(os, "      <groupsynopsis id=\"group-" + name + "\"/>");
+
+
+				WriteString(os, "    </function>");
+				WriteString(os, "  </construct>");
+			}
+				
+			if (null != Description) {
+				WriteString(os, "  <construct id=\"group-" + name + "\" type=\"groupsynopsis\">");
+				WriteDescription(os, Description, false);
+				WriteString(os, "  </construct>");
+			}
+		}
+        else {
+        	fd = (FunctionDef)FDefs.get(0);
+
+        	WriteString(os, "  <construct id=\"function-" + fd.FunctionName + "\" type=\"function\">");
+
+        	WriteString(os, "    <function returntype=\"" + fd.ReturnType + "\">");
+
+        	WriteString(os, "      <prototype>");
+        	String[] parms = fd.Parameters;
+        	if (parms == null)
+        		System.out.println("null parms for findex " + fd.FunctionName);
+        	else {
+        		for (int i = 0; i < parms.length; i++) {
+        			String parm = TexinfoUtils.stripProtoTags(parms[i]);
+        			WriteString(os, "        <parameter content=\"" + parm + "\"/>");
+        		}
+        	}
+        	WriteString(os, "      </prototype>");
+
+        	if (fd.IncludeList != null) {
+        		WriteString(os, "      <headers>");
+        		Object[] incs = fd.IncludeList;
+        		for (int j = 0; j < incs.length; j++) {
+        			String inc = (String)incs[j];
+        			WriteString(os, "        <header filename = \"" + inc + "\"/>");
+        		}
+        		WriteString(os, "      </headers>");
+        	}
+
+        	if (null != Description) WriteDescription(os, Description, false);
+
+        	WriteString(os, "    </function>");
+        	WriteString(os, "  </construct>");
+		}
+		FDefs.clear();
+	}
+
+	public static void BuildXMLFromTexinfo2(String srcdir, String builddir, BufferedWriter os, String lib) {
+		try {
+			srcdir = srcdir.endsWith("/") ? srcdir + lib : srcdir + "/" + lib;
+			builddir = builddir.endsWith("/") ? builddir + lib : builddir + "/" + lib;
+			String qFile = srcdir + "/" + lib + ".texinfo";
+
+			try {
+				BufferedReader is = new BufferedReader(new FileReader(qFile));
+				String il;
+				boolean ignore = false;
+
+				while (is != null) {
+					while (null != (il = is.readLine())) {
+						if (!ignore && il.startsWith("@findex")) {
+							HandleFunction(os, is, il, builddir);
+						}
+						else if (!ignore && il.startsWith("@include")) {
+							is = HandleInclude(is, builddir, il);
+						}
+						else if (il.startsWith("@ignore")) {
+							ignore = true;
+						}
+						else if (il.startsWith("@end ignore"))
+							ignore = false;
+					}
+					is.close();
+					is = (BufferedReader)readers.pop();
+				}
+			}
+			catch (IOException e) {
+				System.out.println("Input File IOException: " + e);
+				return;
+			}
+			catch (EmptyStackException f) {
+				// ok, we expect to get here
+			}
+		}
+		catch (NullPointerException e) {
+			e.printStackTrace();
+			System.out.println("NullPointerException: " + e);
+			return;
+		}
+
+	}
+
+	public static void BuildXMLFromTexinfo(String srcdir, String builddir, String dstdir) {
+		try {
+			BufferedWriter os = new BufferedWriter(new FileWriter(dstdir));
+
+			CreateHeader(os);
+//			CreateLicense(os);
+
+			WriteString(os, "<descriptions>");
+			BuildXMLFromTexinfo2(srcdir, builddir, os, "libc");
+			BuildXMLFromTexinfo2(srcdir, builddir, os, "libm");
+
+
+			CreateTrailer(os);
+
+			os.close();
+		}
+		catch (IOException e) {
+			System.out.println("Output File IOException: " + e);
+			return;
+		}
+	}
+
+	public static void main(String[] args) {
+		BuildXMLFromTexinfo(args[0], args[1], args[2]);
+	}
+
+}
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/TexinfoUtils.java b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/TexinfoUtils.java
new file mode 100644
index 0000000..ceb3d91
--- /dev/null
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/TexinfoUtils.java
@@ -0,0 +1,733 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.libhover.texinfoparsers;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class TexinfoUtils {
+	
+	static final Pattern ParmBracketPattern = Pattern.compile("\\((.*?)\\)");
+	static final Pattern IndexPattern		= Pattern.compile("@\\w*index\\s+[a-zA-Z0-9_@\\{\\}]*");
+	static final Pattern IndexPattern2		= Pattern.compile("@\\w*index\\{[a-zA-Z0-9_@\\{\\}]*\\}");
+	static final Pattern ExampleItem		= Pattern.compile("(@example)((.*?<br><eol>)*+.*?)(<eol>.*@end\\s+example)");
+	static final Pattern ExamplePattern		= Pattern.compile("@example");
+	static final Pattern EndExamplePattern  = Pattern.compile("@end\\s+example");
+	static final Pattern SmallExampleItem	= Pattern.compile("(@smallexample)((.*?<br><eol>)*+.*?)(<eol>.*@end\\s+smallexample)");
+	static final Pattern SmallExamplePattern	 = Pattern.compile("@smallexample");
+	static final Pattern StrongPattern		= Pattern.compile("@strong\\{(\\w*)\\}(@\\*)?");
+	static final Pattern EndSmallExamplePattern  = Pattern.compile("@end\\s+smallexample");
+	static final Pattern EnumeratePattern	= Pattern.compile("@enumerate");
+	static final Pattern EndEnumeratePattern  = Pattern.compile("@end\\s+enumerate");
+	static final Pattern VerbatimPattern	= Pattern.compile("@verbatim");
+	static final Pattern ItemPattern		= Pattern.compile("@item");
+	static final Pattern RefillPattern		= Pattern.compile("@refill");
+	static final Pattern NoIndentPattern	= Pattern.compile("@noindent");
+	static final Pattern QuotationPattern	= Pattern.compile("@quotation");
+	static final Pattern EndQuotation		= Pattern.compile("@end\\s+quotation");
+	static final Pattern GroupPattern		= Pattern.compile("@group");
+	static final Pattern TabPattern			= Pattern.compile("@tab");
+	static final Pattern DeftpPattern		= Pattern.compile("@deftp\\s+\\{([^\\}]*?)\\}\\s*\\{([^\\}]*?)\\}");
+	static final Pattern EndDeftpPattern	= Pattern.compile("@end\\s+deftp");
+	static final Pattern CommentPattern		= Pattern.compile("@c<eol>|@c\\s+.*?<eol>");
+	static final Pattern EndGroupPattern	= Pattern.compile("@end\\s+group");
+	static final Pattern BracketRefPattern 	= Pattern.compile("\\(@.?.?ref\\{[^\\}]*\\}\\)");
+	static final Pattern BRPattern			= Pattern.compile("&lt;br&gt;");
+	static final Pattern EOLPattern			= Pattern.compile("&lt;eol&gt;");
+	static final Pattern EndVerbatimPattern = Pattern.compile("@end\\s+verbatim");
+	static final Pattern TableSampItemPattern = Pattern.compile("(@table\\s*@samp.*?)@item\\s+(.*?)(<eol>.*@end\\s+table)", Pattern.DOTALL);
+	static final Pattern TableAsisItemPattern = Pattern.compile("(@table\\s*@asis.*?)@item\\s+(.*?)(<eol>.*@end\\+table)", Pattern.DOTALL);
+	static final Pattern TableCodeItemPattern = Pattern.compile("(@table\\s*@code.*?)@item\\s+(.*?)(<eol>.*?)(@end\\s+table)", Pattern.DOTALL);
+	static final Pattern TableVarItemPattern  = Pattern.compile("(@table\\s*@var.*?)@item\\s+(.*?)(<eol>.*@end\\s+table)", Pattern.DOTALL);
+	static final Pattern VtableCodeItemPattern = Pattern.compile("(@vtable\\s*@code.*?)@item\\s+(.*?)(<eol>.*@end\\s+vtable)", Pattern.DOTALL);
+	static final Pattern MultitableItemPattern = Pattern.compile("(@multitable.*)@item\\s+(.*?)<eol>(.*?@end\\s+multitable)" +
+																 "|(@multitable.*)@item\\s*<eol>(.*?)<eol>(.*?@end\\s+multitable)", Pattern.DOTALL);
+	static final Pattern TableCodeMatchPattern = Pattern.compile("(@table\\s+@code)(.*?)(@end\\s+table)", Pattern.DOTALL);
+	static final Pattern TableSampMatchPattern = Pattern.compile("(@table\\s+@samp)(.*?)(@end\\s+table)", Pattern.DOTALL);
+	static final Pattern TableAsisMatchPattern = Pattern.compile("(@table\\s+@asis)(.*?)(@end\\s+table)", Pattern.DOTALL);
+	static final Pattern TableVarMatchPattern  = Pattern.compile("(@table\\s+@var)(.*?)(@end\\s+table)", Pattern.DOTALL);
+	static final Pattern TableSampPattern 	= Pattern.compile("@table\\s*@samp", Pattern.MULTILINE);
+	static final Pattern TableAsisPattern	= Pattern.compile("@table\\s*@asis", Pattern.MULTILINE);
+	static final Pattern TableCodePattern	= Pattern.compile("@table\\s*@code", Pattern.MULTILINE);
+	static final Pattern TableVarPattern	= Pattern.compile("@table\\s*@var", Pattern.MULTILINE);
+	static final Pattern VtableCodePattern	= Pattern.compile("@vtable\\s*@code", Pattern.MULTILINE);
+	static final Pattern MultitablePattern	= Pattern.compile("@multitable.*?<DT>", Pattern.DOTALL);
+	static final Pattern EndTablePattern 	= Pattern.compile("@end\\s+table");
+	static final Pattern EndVtablePattern 	= Pattern.compile("@end\\s+vtable");
+	static final Pattern EndMultitablePattern 	= Pattern.compile("@end\\s+multitable");
+	static final Pattern DotsPattern		= Pattern.compile("@dots\\{\\}");
+	static final Pattern ItemizeMinusPattern= Pattern.compile("@itemize\\s+@minus" + "(.*?)" + "@end\\s+itemize", Pattern.DOTALL);
+	static final Pattern ItemizeBulletPattern= Pattern.compile("@itemize\\s+@bullet" + "(.*?)" + "@end\\s+itemize", Pattern.DOTALL);
+	static final Pattern InfoOnlyPattern	= Pattern.compile("@ifinfo.*?@end\\s+ifinfo", Pattern.DOTALL);
+	static final Pattern TexOnlyPattern		= Pattern.compile("@iftex.*?@end\\s+iftex", Pattern.DOTALL);
+	static final Pattern TexPattern			= Pattern.compile("@tex.*?@end\\s+tex", Pattern.DOTALL);
+	static final Pattern IgnorePattern		= Pattern.compile("@ignore.*?@end\\s+ignore", Pattern.DOTALL);
+	static final Pattern IfInfoPattern		= Pattern.compile("@ifinfo");
+	static final Pattern InfinityPattern	= Pattern.compile("@infinity");
+	static final Pattern EndIfInfoPattern	= Pattern.compile("@end\\s+ifinfo");
+	static final Pattern NotTexPattern		= Pattern.compile("@ifnottex");
+	static final Pattern EndNotTexPattern	= Pattern.compile("@end\\s+ifnottex");
+	static final Pattern DeftypevrPattern	= Pattern.compile("@deftypevr\\s+");
+	static final Pattern EndDeftypevr		= Pattern.compile("@end\\s+deftypevr");
+	static final Pattern XrefPattern		= Pattern.compile("@xref\\{[^\\}]*\\}", Pattern.MULTILINE);
+	static final Pattern PxrefPattern		= Pattern.compile("@pxref\\{[^\\}]*\\}", Pattern.MULTILINE);	
+	static final Pattern AtTPattern			= Pattern.compile("@t\\{([^\\}]*)\\}");
+	static final Pattern CommandPattern		= Pattern.compile("@command\\{([^\\}]*)\\}");
+	static final Pattern KbdPattern			= Pattern.compile("@kbd\\{([^\\}]*)\\}");
+	static final Pattern RPattern			= Pattern.compile("@r\\{([^\\}]*)\\}");
+	static final Pattern FilePattern		= Pattern.compile("@file\\{([^\\}]*)\\}");
+	static final Pattern VarPattern			= Pattern.compile("@var\\{([^\\}]*)\\}");
+	static final Pattern OVarPattern		= Pattern.compile("@ovar\\{([^\\}]*)\\}");
+	static final Pattern DVarPattern		= Pattern.compile("@dvar\\{([^\\},\\,]*),([^\\}]*)\\}");
+	static final Pattern AnyVarPattern		= Pattern.compile("@[a-z]*var\\{([^\\}]*)\\}");
+	static final Pattern CodePattern		= Pattern.compile("@code\\{([^\\}]*)\\}");
+	static final Pattern EmphPattern		= Pattern.compile("@emph\\{([^\\}]*)\\}");
+	static final Pattern SampPattern		= Pattern.compile("@samp\\{([^\\}]*)\\}");
+	static final Pattern OptionPattern		= Pattern.compile("@option\\{([^\\}]*)\\}");
+	static final Pattern TagPattern			= Pattern.compile("@\\w+\\{([^\\}]*)\\}");
+    static final Pattern TagCharPattern		= Pattern.compile("@([\\{\\}\\:\\*\"])");
+	static final Pattern StrandedPeriod		= Pattern.compile("(\\w)\\s+\\.\\s+");
+	static final Pattern LeftOverPeriod		= Pattern.compile("^\\.\\s+<eol>");
+	static final Pattern AmpersandPattern	= Pattern.compile("&");
+	static final Pattern LeftAnglePattern	= Pattern.compile("<");
+	static final Pattern RightAnglePattern	= Pattern.compile(">");
+
+	public static String stripProtoTags(String tt) {
+		Matcher mm;
+		String ss = "";
+		
+		ss = "";
+		while (ss != tt) {
+			mm = AnyVarPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("$1");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = DotsPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("...");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = CodePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("$1");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = AtTPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("$1");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = TagPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = TagCharPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+	return tt;
+	}
+	
+	public static String transformTags(String tt) {
+		Matcher mm;
+		String ss = "";
+		int endtableIndex = Integer.MAX_VALUE;
+
+		ss = "";
+		while (ss != tt) {
+			mm = BracketRefPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = XrefPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = CommentPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<eol>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = PxrefPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = DeftypevrPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = StrongPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<h3>$1</h3>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndDeftypevr.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = IndexPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = IndexPattern2.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = NoIndentPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = GroupPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndGroupPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = QuotationPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndQuotation.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = InfinityPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("infinity");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = DeftpPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<h4>$1 - $2</h4>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndDeftpPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = RefillPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = VarPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<VAR>$1</VAR>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = DotsPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<small>...</small>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = CommandPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<CODE>$1</CODE>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = CodePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<CODE>$1</CODE>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = KbdPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<KBD>$1</KBD>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EmphPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<EM>$1</EM>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = FilePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<TT>$1</TT>");
+		}
+		
+		
+		ss = "";
+		while (ss != tt) {
+			mm = VerbatimPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<CODE>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndVerbatimPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</CODE>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = SampPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<samp>$1</samp>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = OptionPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<samp>$1</samp>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = ExampleItem.matcher(tt);
+			ss = tt;
+			// We want to add a break at the end of each example line to preserve
+			// formatting when Eclipse processes the xml (e.g. C code lines).
+			tt = mm.replaceAll("$1$2<br>$4");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = ExamplePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<TABLE><tr><td>&nbsp;</td><td class=example><pre>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndExamplePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</pre></td></tr></table>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = SmallExampleItem.matcher(tt);
+			ss = tt;
+			// We want to add a break at the end of each example line to preserve
+			// formatting when Eclipse processes the xml (e.g. C code lines).
+			tt = mm.replaceAll("$1$2<br>$4");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = SmallExamplePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<pre>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndSmallExamplePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</pre>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = EnumeratePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<OL>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndEnumeratePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</OL>");
+		}
+
+//		ss = "";
+//		while (ss != tt) {
+//			mm = InfoOnlyPattern.matcher(tt);
+//			ss = tt;
+//			tt = mm.replaceAll("");
+//		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = TexOnlyPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = TexPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = IgnorePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = NotTexPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndNotTexPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+
+		// We will treat ifinfo the same as ifnottex which we pass through.
+		ss = "";
+		while (ss != tt) {
+			mm = IfInfoPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndIfInfoPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+
+		ss = "";
+		endtableIndex = Integer.MAX_VALUE;
+		while (ss != tt) {
+			mm = TableSampItemPattern.matcher(tt);
+			ss = tt;
+			if (mm.find()) {
+				if (mm.start(4) > endtableIndex) {
+					// We try and find the last @[table samp] marker we can find with an @item before @[end table].
+					// The end marker has moved forward to make the match which means we have exhausted all @item markers
+					// from the last @[table samp] and @[end table] we were using prior to this iteration of the loop.  
+					// If we change the table markers now, we avoid the prior table from
+					// matching any @item marker that sits between tables.
+					Matcher mm2 = TableSampMatchPattern.matcher(tt);
+					tt = mm2.replaceFirst("<DL>\n$2\n</DL>");
+					mm2 = TableSampMatchPattern.matcher(tt);
+					if (mm2.find())
+						endtableIndex = mm2.start(3);
+				}
+				else {
+					tt = mm.replaceFirst("$1<DT><SAMP>$2</SAMP>\n<DD>$3$4");
+					endtableIndex = mm.end(1) + 10 + mm.group(2).length() + 12 + mm.group(3).length();
+				}
+			}
+		}
+
+		//FIXME: This parser assumes that a table does not have an @itemize element
+		//       inside it.  It allows the opposite to be true (i.e. a table inside
+		//       an @itemize element.
+		
+		ss = "";
+		endtableIndex = Integer.MAX_VALUE;
+		while (ss != tt) {
+			mm = TableAsisItemPattern.matcher(tt);
+			ss = tt;
+			if (mm.find()) {
+				if (mm.start(4) > endtableIndex) {
+					// We try and find the last @[table asis] marker we can find with an @item before @[end table].
+					// The end marker has moved forward to make the match which means we have exhausted all @item markers
+					// from the last @[table asis] and @[end table] we were using prior to this iteration of the loop.  
+					// If we change the table markers now, we avoid the prior table from
+					// matching any @item marker that sits between tables.
+					Matcher mm2 = TableAsisMatchPattern.matcher(tt);
+					tt = mm2.replaceFirst("<DL>\n$2\n</DL>");
+					mm2 = TableAsisMatchPattern.matcher(tt);
+					if (mm2.find())
+						endtableIndex = mm2.start(3);
+				}
+				else {
+					tt = mm.replaceFirst("$1<DT>$2\n<DD>$3$4");
+					endtableIndex = mm.end(1) + 10 + mm.group(2).length() + 12 + mm.group(3).length();
+				}
+			}
+		}
+
+		ss = "";
+		endtableIndex = Integer.MAX_VALUE;
+		while (ss != tt) {
+			mm = TableCodeItemPattern.matcher(tt);
+			ss = tt;
+			if (mm.find()) {
+				if (mm.start(4) > endtableIndex) {
+					// We try and find the last @[table code] marker we can find with an @item before @[end table].
+					// The end marker has moved forward to make the match which means we have exhausted all @item markers
+					// from the last @[table code] and @[end table] we were using prior to this iteration of the loop.  
+					// If we change the table markers now, we avoid the prior table from
+					// matching any @item marker that sits between tables.
+					Matcher mm2 = TableCodeMatchPattern.matcher(tt);
+					tt = mm2.replaceFirst("<DL>\n$2\n</DL>");
+					mm2 = TableCodeMatchPattern.matcher(tt);
+					if (mm2.find())
+						endtableIndex = mm2.start(3);
+				}
+				else {
+					tt = mm.replaceFirst("$1<DT><CODE>$2</CODE>\n<DD>$3$4");
+					endtableIndex = mm.end(1) + 10 + mm.group(2).length() + 12 + mm.group(3).length();
+				}
+			}
+		}
+
+		ss = "";
+		endtableIndex = Integer.MAX_VALUE;
+		while (ss != tt) {
+			mm = TableVarItemPattern.matcher(tt);
+			ss = tt;
+			if (mm.find()) {
+				if (mm.start(4) > endtableIndex) {
+					// We try and find the last @[table var] marker we can find with an @item before @[end table].
+					// The end marker has moved forward to make the match which means we have exhausted all @item markers
+					// from the last @[table var] and @[end table] we were using prior to this iteration of the loop.  
+					// If we change the table markers now, we avoid the prior table from
+					// matching any @item marker that sits between tables.
+					Matcher mm2 = TableVarMatchPattern.matcher(tt);
+					tt = mm2.replaceFirst("<DL>\n$2\n</DL>");
+					mm2 = TableVarMatchPattern.matcher(tt);
+					if (mm2.find())
+						endtableIndex = mm2.start(3);
+				}
+				else {
+					tt = mm.replaceFirst("$1<DT><VAR>$2</VAR>\n<DD>$3$4");
+					endtableIndex = mm.end(1) + 10 + mm.group(2).length() + 12 + mm.group(3).length();
+				}
+			}
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = VtableCodeItemPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("$1<DT><CODE>$2</CODE>\n<DD>$3");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = MultitableItemPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("$1<DT><pre>$2</pre>\n<DD><br>$3");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TableSampPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<DL>\n");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TableAsisPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<DL>\n");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TableVarPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<DL>\n");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TableCodePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<DL>\n");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = VtableCodePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<DL>\n");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = MultitablePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<DL>\n<DT>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = EndTablePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</DL>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndVtablePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</DL>");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = EndMultitablePattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("</DL>");
+		}
+		
+		//FIXME: if there ever is a @itemize @bullet within a
+		//       @itemize @minus or vice-versa, the following
+		//       logic will get it wrong.
+		ss = "";
+		while (ss != tt) {
+			mm = ItemizeMinusPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<UL>$1</UL>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = ItemizeBulletPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<OL>$1</OL>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = ItemPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("<LI>");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = TagPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("$1");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = TagCharPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("$1");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = StrandedPeriod.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("$1. ");
+		}
+
+		ss = "";
+		while (ss != tt) {
+			mm = LeftOverPeriod.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		ss = "";
+		while (ss != tt) {
+			mm = TabPattern.matcher(tt);
+			ss = tt;
+			tt = mm.replaceAll("");
+		}
+		
+		mm = AmpersandPattern.matcher(tt);
+		tt = mm.replaceAll("&amp;");
+
+		mm = LeftAnglePattern.matcher(tt);
+		tt = mm.replaceAll("&lt;");
+
+		mm = RightAnglePattern.matcher(tt);
+		tt = mm.replaceAll("&gt;");	
+
+		// Put back all the eol markers
+		mm = EOLPattern.matcher(tt);
+		tt = mm.replaceAll("<eol>");
+		
+		return tt;
+	}
+}
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover/ChangeLog b/libhover/org.eclipse.linuxtools.cdt.libhover/ChangeLog
new file mode 100644
index 0000000..5dd3997
--- /dev/null
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover/ChangeLog
@@ -0,0 +1,196 @@
+2010-03-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #306283
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java (getMemberSummary): Remove
+	code that looks in editor text for class name and then asks the AST.  Just get the class name
+	from the member we already do the lookup for.  Get the fully templated name using the new
+	getClassName method. 
+	(getMatchingFunctions): Remove commented out code.
+	(getClassName): New method to get class name including template parameters.
+	(getFunctionInfo): Change to specify fully qualified name and not remove
+	namespace.
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java (getClassInfo): Check
+	info is not null before accessing.
+
+2010-03-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java (getMemberSummary): Change
+	DOMException catch statement to Exception since the IFunction interface getReturnType method
+	changes in CDT 7.0.
+
+2009-12-22  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java (getMemberSummary):
+	Revert Helios-only change on trunk.
+
+2009-12-17  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java (getMemberSummary):
+	Remove unnecessary catch block.
+
+2009-09-23  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Load plugin if any of its classes are used.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java (LibhoverPlugin): Set
+	plugin in constructor. 
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java (resolveArgs): Change
+	to resolve template parms to actual types where known. 
+	(isParmMatch): Resolve the member prototype using template types so we are comparing
+	apples to apples.
+	(getMemberSummary): Change calls to isParmMatch and resolveArgs. 
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java (getHoverInfo): Add
+	code to try accessing a path locally within the plugin, then try the file system. 
+
+2009-08-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Resolves #285867
+	* plugin.properties: Change Provider to Eclipse instead of Eclipse.org.
+
+2009-07-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump release to 1.0.3. 
+	
+2009-07-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Refactor to hide internal classes in new packages.
+	
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHover.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHoverLibrary.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHoverMessages.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHoverMessages.properties: Removed.
+	* src/org/eclipse/linuxtools/cdt/libhover/preferences/CheckboxFieldEditor.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/libhover/preferences/LibHoverPreferencePage.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/libhover/preferences/PreferenceConstants.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/libhover/preferences/PreferenceInitializer.java: Removed.
+	* src/org/eclipse/linuxtools/cdt/libhover/properties/LibHoverPropertyPage.java: Removed.
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverMessages.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverMessages.properties: New file.
+	* plugin.xml: Changed to match new packages. 
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/preferences/CheckboxFieldEditor.java: New file. 
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/preferences/LibHoverPreferencePage.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/preferences/PreferenceConstants.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/preferences/PreferenceInitializer.java: New file.
+	* src/org/eclipse/linuxtools/internal/cdt/libhover/properties/LibHoverPropertyPage.java: New file.
+	
+
+2009-05-29  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHover.java (getMemberSummary): Fix compiler warnings. 
+	(getFunctionInfo): Ditto.
+	* src/org/eclipse/linuxtools/cdt/libhover/preferences/CheckboxFieldEditor.java (doLoad): Ditto. 
+	(doLoadDefault): Ditto.
+	(adjustForNumColumns): Ditto.
+	* src/org/eclipse/linuxtools/cdt/libhover/properties/LibHoverPropertyPage.java (updateCheckboxData): Ditto. 
+
+2009-05-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHover.java (getFunctionInfo): Add logic
+	to find the qualified name of the class, even when namespaces are being used.
+	
+2009-05-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHover.java (resolveArgs): New method.
+	(isParmMatch): Ditto. 
+	(getMemberSummary): Add parameter matching support and template resolution.
+	(getFunctionInfo): Add AST logic to resolve member name for C++.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHoverLibrary.java (resolveTemplateTypes):
+	New method. 
+	(getClassInfo): Add additional parameter of template types and fill in.
+	* src/org/eclipse/linuxtools/cdt/libhover/MemberInfo.java (getReturnType): New method.
+	(setParamTypes): Ditto. 
+	(getParamTypes): Ditto.
+
+2009-02-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* schema/org.eclipse.linuxtools.cdt.libhover.library.exsd: Change description for
+	location field which now points to a serialized LibHoverInfo instance rather than
+	xml.
+	* src/org/eclipse/linuxtools/cdt/libhover/ClassInfo.java: New file.
+	* src/org/eclipse/linuxtools/cdt/libhover/FunctionInfo.java: New file.
+	* src/org/eclipse/linuxtools/cdt/libhover/HelpBook.java: New file.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHoverInfo.java: New file.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHoverLibrary.java: New file.
+	* src/org/eclipse/linuxtools/cdt/libhover/MemberInfo.java: New file.
+	* src/org/eclipse/linuxtools/cdt/libhover/TypedefInfo.java: New file.
+	* src/org/eclipse/linuxtools/cdt/libhover/utils/BuildFunctionInfos.java: New file to
+	create serialized LibHoverInfo file from an xml file in standard function format
+	used by previous version of LibHover.
+	* META-INF/MANIFEST.MF: Add additional dependencies and bump version to 1.0.2.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHover.java (isCPPCharacter): New method.
+	(EnclosingASTNameJob): New internal class to query the AST for IASTName
+	for a symbol in the document.
+	(ASTDeclarationFinderJob): New internal class to get the declaration of a symbol from
+	the AST.
+	(getMemberSummary): New method to get the summary of a C++ method. 
+	(getLibHoverDocs): Modified to no longer parse xml documentation.  It now expects
+	documentation to be in LibHoverInfo format, serialized via Java.  The method leaves
+	reading of the actual serialized info to LibHoverLibrary.
+	(getFunctionSummary): Rewritten to fetch info from the new LibHoverInfo class and
+	to handle C++.
+	(getMatchingFunctions): Ditto. 
+	(FunctionSummary): Added a boolean to mark whether the prototype already has
+	brackets in it.
+	(FunctionSummary.FunctionPrototypeSummary.getPrototypeString):  Use new boolean
+	to determine whether to add brackets or not. 
+	(getFunctionInfo): Add C++ support.
+
+2009-01-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add .qualifier to version and bump to 1.0.1.
+
+2008-10-31  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Use bundleName and provider from plugin.properties. Add
+	"(Incubation)".
+	* plugin.properties: Initial import.
+
+2008-10-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.xml: Remove libhover property and preferences pages which are not needed since
+	C/C++ Documentation properties page does the job.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHover.java:
+	(getMatchingFunctions): Pass document to getFunctionSummaryFromNode.
+	(constructTypes): Add groupsynopsis.
+	(getFunctionInfo): Pass document to getFunctionSummaryFromNode.
+	(getFunctionSummaryFromNode): Add groupsynopsis support.
+
+2008-10-22  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* plugin.properties: New file.
+	* src/org/eclipse/linuxtools/cdt/libhover/preferences/CheckboxFieldEditor.java: New file.
+	* build.properties: Add plugin.properties to list of binary files.
+	* META-INF/MANIFEST.MF: Add Bundle-Localization statement.
+	* plugin.xml: Use translatable names for preference and property pages.
+	* schema/org.eclipse.linuxtools.cdt.libhover.library.exsd: Make id and name required.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHover.java:
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHoverMessages.java: Fix bundle name.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHoverMessages.properties: New messages.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java (getID): New method.
+	* src/org/eclipse/linuxtools/cdt/libhover/preferences/LibHoverPreferencePage.java (createFieldEditors):
+	Rewrite to use new CheckboxFieldEditor.
+	* src/org/eclipse/linuxtools/cdt/libhover/preferences/PreferenceConstants.java: Add P_LIBHOVER.
+	* src/org/eclipse/linuxtools/cdt/libhover/preferences/PreferenceInitializer.java (initializeDefaultPreferences):
+	Set up an unused default string.
+	* src/org/eclipse/linuxtools/cdt/libhover/properties/LibHoverPropertyPage.java: Rewritten to use the
+	CheckboxFieldEditor widgets on a property page.
+
+2008-10-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* build.properties: Specify javacSource and javacTarget to be 1.5.
+
+2008-09-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHover.java: Initial implementation moved
+	org.eclipse.cdt.linuxtools.autotools.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHoverMessages.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHoverMessages.properties: Ditto.
+	* src/org/eclipse/linuxtools/cdt/libhover/LibHoverPlugin.java: New file.
+	* META-INF/MANIFEST.MF: Ditto.
+	* schema/org.eclipse.linuxtools.cdt.libhover.library.exsd: Ditto.
+	* about.html, build.properties, plugin.xml, plugin.properties: Ditto.
+	* src/org/eclipse/linuxtools/cdt/libhover/preferences/LibHoverPreferencesPage.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/libhover/preferences/PreferenceConstants.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/libhover/preferences/PreferenceInitializer.java: Ditto.
+	* src/org/eclipse/linuxtools/cdt/libhover/properties/LibHoverPropertyPage.java: Ditto.
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF b/libhover/org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..fc024ea
--- /dev/null
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF
@@ -0,0 +1,21 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.cdt.libhover; singleton:=true
+Bundle-Version: 1.0.3.qualifier
+Bundle-Activator: org.eclipse.linuxtools.cdt.libhover.LibhoverPlugin
+Bundle-Vendor: %provider
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.help;bundle-version="3.3.100",
+ org.eclipse.cdt.ui;bundle-version="5.0.0",
+ org.eclipse.core.filesystem;bundle-version="1.2.0",
+ org.eclipse.cdt.core;bundle-version="5.0.0",
+ org.eclipse.cdt;bundle-version="5.0.0",
+ org.eclipse.ui.editors;bundle-version="3.4.0",
+ org.eclipse.jface.text;bundle-version="3.4.1"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.eclipse.linuxtools.cdt.libhover
+Bundle-ActivationPolicy: lazy
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover/plugin.properties b/libhover/org.eclipse.linuxtools.cdt.libhover/plugin.properties
new file mode 100644
index 0000000..2f48939
--- /dev/null
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover/plugin.properties
@@ -0,0 +1,14 @@
+#################################################################################
+#  Copyright (c) 2008 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+LibhoverPreference.name=Library Hover
+LibhoverProperty.name=Library Hover
+bundleName=C/C++ Libhover Plug-in (Incubation)
+provider=Eclipse
\ No newline at end of file
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover/plugin.xml b/libhover/org.eclipse.linuxtools.cdt.libhover/plugin.xml
new file mode 100644
index 0000000..7ece4f4
--- /dev/null
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover/plugin.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+   <extension-point id="org.eclipse.linuxtools.cdt.libhover.library" name="C/C++ Library Hover Specifier" schema="schema/org.eclipse.linuxtools.cdt.libhover.library.exsd"/>
+
+   <extension
+         point="org.eclipse.cdt.ui.CHelpProvider">
+      <provider
+            class="org.eclipse.linuxtools.internal.cdt.libhover.LibHover"
+            id="org.eclipse.linuxtools.cdt.libhover.provider"/>
+   </extension>
+</plugin>
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/MemberInfo.java b/libhover/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/MemberInfo.java
new file mode 100644
index 0000000..ac92c65
--- /dev/null
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/MemberInfo.java
@@ -0,0 +1,133 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.cdt.libhover;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+
+public class MemberInfo implements Serializable {
+	private static final long serialVersionUID = 1L;
+	private String name;
+	private String prototype;
+	private String desc;
+	private String returnType;
+	private String[] paramTypes = new String[0];
+	private ArrayList<MemberInfo> children = null;
+	
+	/**
+	 * Constructor for member.
+	 * 
+	 * @param name
+	 */
+	public MemberInfo(String name) {
+		this.name = name;
+	}
+	
+	/**
+	 * Get member name.
+	 * 
+	 * @return member name
+	 */
+	public String getName() {
+		return name;
+	}
+	
+	/**
+	 * Get prototype for member.
+	 * 
+	 * @return prototype string or null
+	 */
+	public String getPrototype() {
+		return prototype;
+	}
+	
+	/**
+	 * Set prototype string.
+	 * 
+	 * @param prototype
+	 */
+	public void setPrototype(String prototype) {
+		this.prototype = prototype;
+	}
+	
+	/**
+	 * Get description for member.
+	 * 
+	 * @return description string or null
+	 */
+	public String getDescription() {
+		return desc;
+	}
+	
+	/**
+	 * Set description string for member.
+	 * 
+	 * @param desc
+	 */
+	public void setDescription(String desc) {
+		this.desc = desc;
+	}
+
+	/**
+	 * Get param types for member.
+	 * 
+	 * @return return array of param types
+	 */
+	public String[] getParamTypes() {
+		return paramTypes;
+	}
+
+	/**
+	 * Set param types for member.
+	 * 
+	 * @param array of param types
+	 */
+	public void setParamTypes(String[] paramTypes) {
+		this.paramTypes = paramTypes;
+	}
+	/**
+	 * Get return type for member.
+	 * 
+	 * @return return type as string or null
+	 */
+	public String getReturnType() {
+		return returnType;
+	}
+
+	/**
+	 * Set return type for member.
+	 * 
+	 * @param returnType
+	 */
+	public void setReturnType(String returnType) {
+		this.returnType = returnType;
+	}
+
+	/**
+	 * Add a member with the same name as a child of this member.
+	 * 
+	 * @param info a member with same name as this member.
+	 */
+	public void addChild(MemberInfo info) {
+		if (children == null)
+			children = new ArrayList<MemberInfo>();
+		children.add(info);
+	}
+
+	/**
+	 * Get the children members with same name as this member.
+	 * 
+	 * @return an ArrayList of members with same name or null.
+	 */
+	public ArrayList<MemberInfo> getChildren() {
+		return children;
+	}
+}
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java b/libhover/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java
new file mode 100644
index 0000000..9585485
--- /dev/null
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java
@@ -0,0 +1,575 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2006, 2007, 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+/*
+ * Initially created on Jul 8, 2004
+ */
+
+/**
+ * @author Chris Moller, Red Hat, Inc.
+ * @author Jeff Johnston, Red Hat, Inc.  (rewrite to use ICHelpProvider)
+ * Modified to be org.eclipse.linuxtools.cdt.libhover package.
+ */
+
+package org.eclipse.linuxtools.internal.cdt.libhover;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.Map.Entry;
+
+import org.eclipse.cdt.core.dom.ast.DOMException;
+import org.eclipse.cdt.core.dom.ast.IASTName;
+import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
+import org.eclipse.cdt.core.dom.ast.IBinding;
+import org.eclipse.cdt.core.dom.ast.IType;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunction;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunctionType;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateArgument;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateDefinition;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateInstance;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameter;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameterMap;
+import org.eclipse.cdt.core.model.ILanguage;
+import org.eclipse.cdt.core.model.ITranslationUnit;
+import org.eclipse.cdt.ui.ICHelpBook;
+import org.eclipse.cdt.ui.ICHelpProvider;
+import org.eclipse.cdt.ui.ICHelpResourceDescriptor;
+import org.eclipse.cdt.ui.IFunctionSummary;
+import org.eclipse.cdt.ui.IRequiredInclude;
+import org.eclipse.cdt.ui.text.ICHelpInvocationContext;
+import org.eclipse.cdt.ui.text.IHoverHelpInvocationContext;
+import org.eclipse.cdt.ui.text.SharedASTJob;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.RegistryFactory;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.help.IHelpResource;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.linuxtools.cdt.libhover.ClassInfo;
+import org.eclipse.linuxtools.cdt.libhover.FunctionInfo;
+import org.eclipse.linuxtools.cdt.libhover.HelpBook;
+import org.eclipse.linuxtools.cdt.libhover.LibHoverInfo;
+import org.eclipse.linuxtools.cdt.libhover.LibhoverPlugin;
+import org.eclipse.linuxtools.cdt.libhover.MemberInfo;
+
+
+public class LibHover implements ICHelpProvider {
+	
+	public static String LIBHOVER_DOC_EXTENSION = LibhoverPlugin.PLUGIN_ID + ".library"; //$NON-NLS-1$
+
+    // see comment in initialize()
+    // private static String defaultSearchPath = null;
+    
+	private static HashMap<ICHelpBook, LibHoverLibrary> libraries = new HashMap<ICHelpBook, LibHoverLibrary>();
+	
+    static final String  constructTypes[] ={
+    	"dtype", // $NON-NLS-1$
+    	"enum",  // $NON-NLS-1$
+    	"function", // $NON-NLS-1$
+    	"groupsynopsis", // $NON-NLS-1$
+    	"struct", // $NON-NLS-1$
+    	"type",  // $NON-NLS-1$
+    	"union"  // $NON-NLS-1$
+    };
+    
+    static final int dtypeIndex         = 0;
+    static final int enumIndex          = 1;
+    static final int functionIndex      = 2;
+    static final int groupsynopsisIndex = 3;
+    static final int structIndex        = 4;
+    static final int typeIndex          = 5;
+    static final int unionIndex         = 6;
+
+    private static ArrayList<ICHelpBook> helpBooks = new ArrayList<ICHelpBook>();
+    public static boolean docsFetched = false;
+
+	public static synchronized void getLibHoverDocs() {
+		if (docsFetched)
+			return;
+//		System.out.println("getlibhoverdocs");
+		libraries.clear();
+		helpBooks.clear();
+		IExtensionRegistry x = RegistryFactory.getRegistry();
+		IConfigurationElement[] ces = x.getConfigurationElementsFor(LIBHOVER_DOC_EXTENSION);
+		for (int i = 0; i < ces.length; ++i) {
+			IConfigurationElement ce = ces[i];
+			if (ce.getName().equals("library")) { //$NON-NLS-1$
+				// see comment in initialize()
+				// Use the FileLocator class to open the magic hover doc file
+				// in the plugin's jar.
+				// Either open the html file or file system file depending
+				// on what has been specified.
+				String location = ce.getAttribute("location"); //$NON-NLS-1$
+				String name = ce.getAttribute("name"); //$NON-NLS-1$
+				String helpdocs = ce.getAttribute("docs"); //$NON-NLS-1$
+				String type = ce.getAttribute("type"); //$NON-NLS-1$
+				HelpBook h = new HelpBook(name, type);
+				helpBooks.add(h);
+				LibHoverLibrary l = new LibHoverLibrary(name, location, helpdocs, 
+						true);
+				libraries.put(h, l);
+				docsFetched = true;
+			}
+		}
+	}
+	
+	public void initialize() {
+		getLibHoverDocs();
+	}
+		
+	public ICHelpBook[] getCHelpBooks () {
+		ICHelpBook[] chelpbooks = new ICHelpBook[helpBooks.size()];
+		return helpBooks.toArray(chelpbooks);
+	}
+	
+	private class FunctionSummary implements IFunctionSummary, Comparable<FunctionSummary> {
+
+        private String Name;
+        private String NameSpace;
+        private String ReturnType;
+        private String Prototype;
+        private String Summary;
+        private boolean prototypeHasBrackets;
+        
+//        private String Synopsis;
+        private class RequiredInclude implements IRequiredInclude {
+        	private String include;
+        	
+        	public RequiredInclude (String file) {
+        		include = file;
+        	}
+        	
+        	public String getIncludeName() {
+        		return include;
+        	}
+        	
+        	public boolean isStandard() {
+        		return true;
+        	}
+        }
+        
+		public int compareTo (FunctionSummary x) {
+			FunctionSummary y = (FunctionSummary)x;
+			return getName().compareTo(y.getName());
+		}
+
+//        private RequiredInclude Includes[];
+        private ArrayList<RequiredInclude> Includes = new ArrayList<RequiredInclude>();
+
+        private void setIncludeName (String iname) {
+        	RequiredInclude nri = new RequiredInclude(iname);
+        	Includes.add(nri);
+        }
+
+        public class FunctionPrototypeSummary implements IFunctionPrototypeSummary {
+            public String getName()             { return Name; }
+            public String getReturnType()       { return ReturnType; }
+            public String getArguments()        { return Prototype; }
+            public String getPrototypeString(boolean namefirst) {
+                if (true == namefirst) {
+                	if (prototypeHasBrackets())
+                		return Name + " " + Prototype + " " + ReturnType; // $NON-NLS-1$ // $NON-NLS-2$
+                    return Name + " (" + Prototype + ") " + ReturnType; // $NON-NLS-1$ // $NON-NLS-2$
+                }
+                else {
+                	if (prototypeHasBrackets())
+                		return ReturnType + " " + Name + " " + Prototype; // $NON-NLS-1$ // $NON-NLS-2$
+                    return ReturnType + " " + Name + " (" + Prototype + ")"; // $NON-NLS-1$ // $NON-NLS-2$ // $NON-NLS-3$
+                }
+            }
+        }
+
+        public String getName()                         { return Name; }
+        public String getNamespace()                    { return NameSpace; }
+        public String getDescription()                  { return Summary; }
+        public boolean prototypeHasBrackets()			{ return prototypeHasBrackets; }
+        public void setPrototypeHasBrackets(boolean value)	{ prototypeHasBrackets = value; }
+        public IFunctionPrototypeSummary getPrototype() { return new FunctionPrototypeSummary(); }
+        
+        public IRequiredInclude[] getIncludes() {
+        	IRequiredInclude[] includes = new IRequiredInclude[Includes.size()];
+        	for (int i = 0; i < Includes.size(); ++i) {
+        		includes[i] = (IRequiredInclude)Includes.get(i);
+        	}
+        	return includes;
+        }
+        
+    }
+	
+	public boolean isCPPCharacter(int ch) {
+		return Character.isLetterOrDigit(ch) || ch == '_' || ch == ':'; 
+	}
+
+	private class EnclosingASTNameJob extends SharedASTJob {
+		private int tlength;
+		private int toffset;
+		private IASTName result = null;
+		public EnclosingASTNameJob (ITranslationUnit t, 
+				int toffset, int tlength) {
+			super("EnclosingASTNameJob", t); // $NON-NLS-1$
+			this.toffset = toffset;
+			this.tlength = tlength;
+		}
+		public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) {
+			if (ast != null) {
+				result = ast.getNodeSelector(null).findEnclosingName(toffset, tlength);
+			}
+			return Status.OK_STATUS;
+		}
+		public IASTName getASTName() {
+			return result;
+		}
+	}
+	
+	public class ASTDeclarationFinderJob extends SharedASTJob {
+		private IBinding binding;
+		private IASTName[] decls = null;
+		public ASTDeclarationFinderJob (ITranslationUnit t, IBinding binding) {
+			super("ASTDeclarationFinderJob", t); // $NON-NLS-1$
+			this.binding = binding;
+		}
+    	public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) {
+    		if (ast != null) {
+    			decls = ast.getDeclarationsInAST(binding);
+    		}
+    		return Status.OK_STATUS;
+    	}
+    	public IASTName[] getDeclarations() {
+    		return decls;
+    	}
+	}
+
+	public IFunctionSummary getFunctionInfo(ICHelpInvocationContext context, ICHelpBook[] helpBooks, String name) {
+        IFunctionSummary f;
+
+        f = null;
+        ITranslationUnit t = context.getTranslationUnit();
+        
+        String className = null;
+        ICPPFunctionType methodType = null;
+        
+        if (t.isCXXLanguage()) {
+        	try {
+        		if (context instanceof IHoverHelpInvocationContext) {
+        			// We know the file offset of the member reference.
+        			IRegion region = (IRegion)((IHoverHelpInvocationContext)context).getHoverRegion();
+        			
+        			// Now, let's find the declaration of the method.  We need to do this because we want the specific
+        			// member prototype to go searching for.  There could be many members called "x" which have different
+        			// documentation.
+           			final IASTName[] result= {null};
+           			EnclosingASTNameJob job = new EnclosingASTNameJob(t, region.getOffset(), region.getLength());
+           			job.schedule();
+           			try {
+           				job.join();
+           			} catch (InterruptedException e) {
+           				// TODO Auto-generated catch block
+           				e.printStackTrace();
+           			}
+           			if (job.getResult() == Status.OK_STATUS)
+           				result[0] = job.getASTName();
+        			if (result[0] != null) {
+        				final IBinding binding = result[0].getBinding();
+        				// Check to see we have a member function.
+        				if (binding instanceof ICPPFunction) {
+        					methodType = ((ICPPFunction)binding).getType();
+        					// We have a member function, find the class name.
+        					IBinding owner = ((ICPPFunction)binding).getOwner();
+        					if (owner instanceof ICPPClassType) {
+        						className = getClassName((ICPPClassType)owner);
+        					}
+        				}
+        			}
+        		}
+        	} catch (IllegalArgumentException e) {
+        		// TODO Auto-generated catch block
+        		e.printStackTrace();
+        	} catch (DOMException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+        }
+        	
+        // Loop through all the documents we have and report first match.
+        for (int i = 0; i < helpBooks.length; ++i) {
+        	LibHoverLibrary l = libraries.get(helpBooks[i]);
+        	if (name != null) {
+        		if (className != null) {
+        			if (l.isCPP())
+        				f = getMemberSummary(l, className, name, methodType);
+        		} else {
+        			f = getFunctionSummary(l, name);
+        		}
+        		if (f != null)
+        			return f;
+        	}
+        }
+        
+        return null;
+	}
+
+	// Get the class name for a type, including any instance template parameters
+	// e.g. std::basic_string<char>
+	private String getClassName(ICPPClassType c) {
+		String className = null;
+		try {
+			String[] qualified = c.getQualifiedName();
+			className = qualified[0];
+			for (int k = 1; k < qualified.length; ++k) {
+				className += "::" + qualified[k];
+			}
+
+			// Check if we have an instance of a template class.	
+			if (c instanceof ICPPTemplateInstance) {
+				ICPPTemplateInstance ti = (ICPPTemplateInstance)c;
+				// Get a map which tells us the values of the template
+				// arguments (e.g. _CharT maps to char in the instance).
+				ICPPTemplateParameterMap tiMap = ti.getTemplateParameterMap();
+				ICPPTemplateDefinition td = ti.getTemplateDefinition();
+				ICPPTemplateParameter[] templateArgs = td.getTemplateParameters();
+				className += "<";
+				String separator = "";
+				for (int x = 0; x < templateArgs.length; ++x) {
+					ICPPTemplateParameter tp = templateArgs[x];
+					ICPPTemplateArgument ta = tiMap.getArgument(tp);
+					IType type = null;
+					// The template may have a type specified or a value.
+					// In the case of a value, figure out its type and use
+					// that when we do a lookup.
+					if (ta.isTypeValue())
+						type = ta.getTypeValue();
+					else
+						type = ta.getTypeOfNonTypeValue();
+					if (tp.getTemplateNestingLevel() == 0) {
+						// if the parameter is a class type, use recursion to
+						// get its class name including template parameters
+						if (type instanceof ICPPClassType)
+							className += separator + getClassName((ICPPClassType)type);
+						else
+							className += separator + type.toString();
+						separator = ",";
+					}
+				}
+				className += ">";
+			}
+		} catch(DOMException e) {
+			return null;
+		}
+		return className;
+	}
+	
+	private IFunctionSummary getFunctionSummary(LibHoverLibrary l, String name) {
+		FunctionInfo x = l.getFunctionInfo(name);
+		if (x != null) {
+			FunctionSummary f = new FunctionSummary();
+			f.ReturnType = x.getReturnType();
+			f.Prototype = x.getPrototype();
+			f.Summary = x.getDescription();
+			f.Name = x.getName();
+			ArrayList<String> headers = x.getHeaders();
+			for (int i = 0; i < headers.size(); ++i)
+				f.setIncludeName(headers.get(i));
+			return f;
+		}
+		return null;
+	}
+	
+	private IFunctionSummary getMemberSummary(LibHoverLibrary l, String className, 
+			String memberName, ICPPFunctionType methodType) {
+
+		ArrayList<String> templateTypes = new ArrayList<String>();
+		ClassInfo info = l.getClassInfo(className, templateTypes);
+		String[] args = new String[0];
+		@SuppressWarnings("unused")
+		IType returnType = null;
+		if (info == null)
+			return null;
+		if (methodType != null) {
+			try {
+				args = resolveArgs(info, methodType.getParameterTypes(), templateTypes);
+				returnType = methodType.getReturnType();
+			} catch (Exception e) {
+				return null;
+			}
+//			for (int i = 0; i < args.length; ++i)
+//				System.out.println("args<" + i + "> is " + args[i].toString());
+//			System.out.println("return type is " + returnType.toString());
+			
+		}
+		MemberInfo member = info.getMember(memberName);
+		if (member != null) {
+			MemberInfo m = null;
+			if (!isParmMatch(member, args, templateTypes, info)) {
+				ArrayList<MemberInfo> members = member.getChildren();
+				for (int i = 0; i < members.size(); ++i) {
+					MemberInfo k = members.get(i);
+					if (isParmMatch(k, args, templateTypes, info)) {
+						m = k;
+						break;
+					}
+				}
+			} else {
+				m = member;
+			}
+			
+			if (m != null) {
+				// FIXME: do some work to determine parameters and return type.
+				FunctionSummary f = new FunctionSummary();
+				f.ReturnType = m.getReturnType();
+				f.Prototype = m.getPrototype();
+				f.Summary = m.getDescription();
+//				String actualClassName = className.substring(className.indexOf("::")+2); // $NON-NLS-1$
+				f.Name = className + "::" + memberName; // $NON-NLS-1$
+				String[] templateParms = info.getTemplateParms();
+				for (int i = 0; i < templateTypes.size(); ++i) {
+					f.ReturnType = f.ReturnType.replaceAll(templateParms[i], templateTypes.get(i));
+					f.Prototype = f.Prototype.replaceAll(templateParms[i], templateTypes.get(i));
+					f.Name = f.Name.replaceAll(templateParms[i], templateTypes.get(i));
+				}
+				if (f.ReturnType.indexOf('<') >= 0) {
+					f.ReturnType = f.ReturnType.replaceAll("<", "&lt;");
+					f.ReturnType = f.ReturnType.replaceAll(">", "&gt;");
+				}
+				if (f.Prototype.indexOf('<') >= 0) {
+					f.Prototype = f.Prototype.replaceAll("<", "&lt;");
+					f.Prototype = f.Prototype.replaceAll(">", "&gt;");
+				}
+				if (f.Name.indexOf('<') >= 0) {
+					f.Name = f.Name.replaceAll("<", "&lt;");
+					f.Name = f.Name.replaceAll(">", "&gt;");
+				}
+				f.setPrototypeHasBrackets(true);
+				f.setIncludeName(info.getInclude());
+				return f;
+			}
+		}
+		return null;
+	}
+     
+ 	
+	private boolean isParmMatch(MemberInfo m, String[] args, ArrayList<String> templateTypes, ClassInfo info) {
+		String[] memberParms = m.getParamTypes();
+		for (int i = 0; i < memberParms.length; ++i) {
+			String[] templateParms = info.getTemplateParms();
+			for (int j = 0; j < templateTypes.size(); ++j) {
+				memberParms[i] = memberParms[i].replaceAll(templateParms[j], templateTypes.get(j));
+			}
+		}
+		return Arrays.equals(memberParms, args);
+	}
+
+	private String[] resolveArgs(ClassInfo info, IType[] parameterTypes, ArrayList<String> templateTypes) {
+		String[] templateParms = info.getTemplateParms();
+		String[] result = new String[parameterTypes.length];
+		for (int i = 0; i < parameterTypes.length; ++i) {
+			String param = parameterTypes[i].toString();
+			param = param.replaceAll("\\{.*\\}", "");
+			param = param.trim();
+			int index = param.indexOf("#");
+			while (index >= 0) {
+				// We assume no class has more than 9 template parms.
+				int digit = param.charAt(index + 1) - '0';
+				// where possible, replace template parms with real values
+				if (digit < templateTypes.size())
+					param = param.replaceFirst(param.substring(index, index + 2), templateTypes.get(digit));
+				else
+					param = param.replaceFirst(param.substring(index, index + 2), templateParms[digit]);
+				index = param.indexOf("#");
+			}
+			result[i] = param;
+		}
+		return result;
+	}
+
+	public IFunctionSummary[] getMatchingFunctions(ICHelpInvocationContext context, ICHelpBook[] helpBooks, String prefix) {
+		ArrayList<IFunctionSummary> fList = new ArrayList<IFunctionSummary>();
+
+		for (int di = 0; di < helpBooks.length; ++di) {
+			LibHoverLibrary l = libraries.get(helpBooks[di]);
+			LibHoverInfo cppInfo = l.getHoverInfo();
+			SortedMap<String, FunctionInfo> map = cppInfo.functions.tailMap(prefix);
+			Set<Map.Entry<String, FunctionInfo>> c = map.entrySet();
+			for (Iterator<Entry<String, FunctionInfo>> i = c.iterator(); i.hasNext();) {
+				Map.Entry<String, FunctionInfo> e = (Map.Entry<String, FunctionInfo>)i.next();
+				FunctionInfo x = e.getValue();
+				if (x.getName().startsWith(prefix)) {
+					FunctionSummary f = new FunctionSummary();
+					f.ReturnType = x.getReturnType();
+					f.Prototype = x.getPrototype();
+					f.Summary = x.getDescription();
+					f.Name = x.getName();
+					ArrayList<String> headers = x.getHeaders();
+					for (int i1 = 0; i1 < headers.size(); ++i1)
+						f.setIncludeName(headers.get(i1));
+					fList.add(f);
+				}
+			}
+		}
+		IFunctionSummary[] summaries = new IFunctionSummary[fList.size()];
+		for (int k = 0; k < summaries.length; k++) {
+			summaries[k] = (IFunctionSummary)fList.get(k);
+		}
+		return summaries;
+	}
+	
+	private class HelpResource implements IHelpResource {
+		private String href;
+		private String label;
+		public HelpResource(String href, String label) {
+			this.href = href;
+			this.label = label;
+		}
+		public String getHref() {
+			return href;
+		}
+		public String getLabel() {
+			return label;
+		}
+	}
+	
+	private class HelpResourceDescriptor implements ICHelpResourceDescriptor {
+		private ICHelpBook helpbook;
+		
+		public HelpResourceDescriptor(ICHelpBook helpbook) {
+			this.helpbook = helpbook;
+		}
+		
+		public ICHelpBook getCHelpBook() {
+			return helpbook;
+		}
+		
+		public IHelpResource[] getHelpResources() {
+			LibHoverLibrary l = libraries.get(helpbook);
+			if (l != null) {
+				IHelpResource[] hr = new IHelpResource[1];
+				hr[0] = new HelpResource(l.getLocation(), l.getName());
+				return hr;
+			}
+			return null;
+		}
+	}
+	
+	public ICHelpResourceDescriptor[] getHelpResources(ICHelpInvocationContext context, ICHelpBook[] helpBooks, String name) {
+		for (int i = 0; i < helpBooks.length; ++i) {
+			IFunctionSummary fs = getFunctionInfo(context, new ICHelpBook[]{helpBooks[i]}, name);
+			if (fs != null) {
+				return new HelpResourceDescriptor[]{new HelpResourceDescriptor(helpBooks[i])};
+			}
+		}
+		return null;
+	}
+}
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java b/libhover/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java
new file mode 100644
index 0000000..d131058
--- /dev/null
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java
@@ -0,0 +1,218 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.cdt.libhover;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+
+import org.eclipse.core.filesystem.URIUtil;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.linuxtools.cdt.libhover.ClassInfo;
+import org.eclipse.linuxtools.cdt.libhover.FunctionInfo;
+import org.eclipse.linuxtools.cdt.libhover.LibHoverInfo;
+import org.eclipse.linuxtools.cdt.libhover.LibhoverPlugin;
+import org.eclipse.linuxtools.cdt.libhover.TypedefInfo;
+
+public class LibHoverLibrary {
+	private String name;
+	private String location;
+	private String docs;
+	private boolean isCPP;
+	private LibHoverInfo hoverInfo = new LibHoverInfo();
+	private boolean haveReadHoverInfo = false;
+
+	public LibHoverLibrary(String name, String location, String docs, 
+			boolean isCPP) {
+		this.name = name;
+		this.location = location;
+		this.docs = docs;
+		this.isCPP = isCPP;
+	}
+	
+	/**
+	 * Get the name of the library
+	 * 
+	 * @return the name of the library
+	 */
+	public String getName() { 
+		return name; 
+	}
+	
+	/**
+	 * Get the location of the library hover info (URL or file name)
+	 * 
+	 * @return the URL or file name string for the library hover info location
+	 */
+	public String getLocation() {
+		return location;
+	}
+	
+	/**
+	 * Get the browser help documentation URL for this library
+	 * 
+	 * @return the name of the help documentation URL
+	 */
+	public String getDocs() {
+		return docs;
+	}
+	
+	/**
+	 * Is this library a C++ library?
+	 * 
+	 * @return true if C++ library, false otherwise
+	 */
+	public boolean isCPP() {
+		return isCPP;
+	}
+
+	/**
+	 * Get the library hover info for this library
+	 * 
+	 * @return the library hover info for this library
+	 */
+	public LibHoverInfo getHoverInfo() {
+		// We lazily get the hover info for this library since it is possible
+		// the user will never access or ultimately need it if another library
+		// supplies the information first.
+		if (!haveReadHoverInfo) {
+			URI acDoc;
+			try {
+				acDoc = new URI(location);
+				IPath p = URIUtil.toPath(acDoc);
+				InputStream docStream = null;
+				if (p == null) {
+					URL url = acDoc.toURL();
+					docStream = url.openStream();
+				} else {
+					try {
+						// Try to open the file as local to this plug-in.
+						docStream = FileLocator.openStream(LibhoverPlugin.getDefault().getBundle(), p, false);
+					} catch (IOException e) {
+						// File is not local to plug-in, try file system.
+						docStream = new FileInputStream(p.toFile());
+					}
+				}
+				ObjectInputStream input = new ObjectInputStream(docStream);
+				hoverInfo = (LibHoverInfo)input.readObject();
+				haveReadHoverInfo = true;
+				input.close();
+				docStream.close();
+			} catch (URISyntaxException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (MalformedURLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (ClassNotFoundException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		return hoverInfo;
+	}
+	
+	/**
+	 * Set the library hover info.
+	 * 
+	 * @param hoverInfo the library hover info to set
+	 */
+	public void setHoverinfo(LibHoverInfo hoverInfo) {
+		this.hoverInfo = hoverInfo;
+	}
+	
+	/**
+	 * Fetch the class info for a given class.
+	 * 
+	 * @param className the name of the class to fetch info for
+	 * @return ClassInfo or null if no class info can be found
+	 */
+	public ClassInfo getClassInfo(String className, ArrayList<String> templateTypes) {
+		String typedefName = className.replaceAll("<.*>", "<>"); // $NON-NLS-1$ // $NON-NLS-2$
+		TypedefInfo typedef = getHoverInfo().typedefs.get(typedefName);
+		if (typedef != null) {
+			className = typedef.getTransformedType(className);  // Reset class name to typedef transformation
+		}
+		int index = className.indexOf('<');
+		// Check if it is a template reference.
+		if (index != -1) {
+			resolveTemplateTypes(className, templateTypes, index);
+			// It is.  We want to see if there are partial specific templates
+			// and we choose the first match.  If nothing matches our particular
+			// case, we fall back on the initial generic template.
+			ClassInfo info = getHoverInfo().classes.get(className.substring(0, index));
+			if (info != null) {
+				ArrayList<ClassInfo> children = info.getChildren();
+				if (children != null && children.size() > 0) {
+					for (int x = 0; x < children.size(); ++x) {
+						ClassInfo child = children.get(x);
+						if (className.matches(child.getClassName())) {
+							info = child;
+							break;
+						}
+					}
+				}
+			}
+			return info;
+		}
+		// Otherwise no template, just fetch the class info directly.
+		return getHoverInfo().classes.get(className);
+	}
+	
+	private void resolveTemplateTypes(String className,
+			ArrayList<String> templateTypes, int index) {
+		int startIndex = index + 1;
+		int i = startIndex;
+		int count = 1;
+		while (count > 0 && i < className.length()) {
+			char x = className.charAt(i);
+			switch (x) {
+			case ('<'):
+				++count;
+			break;
+			case ('>'):
+				--count;
+				if (count == 0)
+					templateTypes.add(className.substring(startIndex, i).trim());
+			break;
+			case (','): {
+				if (count == 1) {
+					templateTypes.add(className.substring(startIndex, i).trim());
+					startIndex = i + 1;
+				}
+			}
+			break;
+			}
+			++i;
+		}
+	}
+
+	/**
+	 * Fetch the function info for a given function.
+	 * 
+	 * @param name of function to find info for
+	 * @return FunctionInfo or null if no function info exists
+	 */
+	public FunctionInfo getFunctionInfo(String name) {
+		return getHoverInfo().functions.get(name);
+	}
+}
+
diff --git a/lttng/org.eclipse.linuxtools.lttng-feature/.project b/lttng/org.eclipse.linuxtools.lttng-feature/.project
new file mode 100644
index 0000000..9ff62a9
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng-feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.lttng-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/lttng/org.eclipse.linuxtools.lttng-feature/build.properties b/lttng/org.eclipse.linuxtools.lttng-feature/build.properties
new file mode 100644
index 0000000..5864ee0
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng-feature/build.properties
@@ -0,0 +1,3 @@
+bin.includes = feature.xml,\
+               epl-v10.html,\
+               feature.properties
diff --git a/lttng/org.eclipse.linuxtools.lttng-feature/compile.org.eclipse.linuxtools.lttng-feature.xml b/lttng/org.eclipse.linuxtools.lttng-feature/compile.org.eclipse.linuxtools.lttng-feature.xml
new file mode 100644
index 0000000..dc361cd
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng-feature/compile.org.eclipse.linuxtools.lttng-feature.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Compile org.eclipse.linuxtools.lttng.feature" default="main">
+	<target name="main">
+		<ant antfile="build.xml" dir="../org.eclipse.linuxtools.lttng" target="build.jars"/>
+		<ant antfile="build.xml" dir="../org.eclipse.linuxtools.lttng.ui" target="build.jars"/>
+		<ant antfile="build.xml" dir="../org.eclipse.linuxtools.lttng.help" target="build.jars"/>
+	</target>
+</project>
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/docs/epl-v10.html b/lttng/org.eclipse.linuxtools.lttng-feature/epl-v10.html
similarity index 100%
copy from systemtap/SystemTapGuiServer/systemtapguiserver-1.0/docs/epl-v10.html
copy to lttng/org.eclipse.linuxtools.lttng-feature/epl-v10.html
diff --git a/lttng/org.eclipse.linuxtools.lttng-feature/feature.properties b/lttng/org.eclipse.linuxtools.lttng-feature/feature.properties
new file mode 100644
index 0000000..8b730b9
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng-feature/feature.properties
@@ -0,0 +1,118 @@
+#*******************************************************************************
+# Copyright (c) 2008 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Ericsson - initial API and implementation
+#********************************************************************************
+
+featureName=Linux Tracing Toolkit Integration (LTTng) (Incubation)
+
+description=Plugins to integrate LTTng tools into the workbench.
+
+featureProvider=Eclipse
+
+copyright=Copyright 2009 Ericsson
+
+licenseURL=epl-v10.html
+
+license=\
+ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
+March 17, 2005\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse.org CVS\n\
+repository ("Repository") in CVS modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+Features may also include other Features ("Included Features"). Files named\n\
+"feature.xml" may contain a list of the names and version numbers of\n\
+Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+   - The top-level (root) directory\n\
+   - Plug-in and Fragment directories\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
+   - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Eclipse Update Manager, you must agree to a license ("Feature Update\n\
+License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties". Such Abouts,\n\
+Feature Licenses and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
+    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
diff --git a/lttng/org.eclipse.linuxtools.lttng-feature/feature.xml b/lttng/org.eclipse.linuxtools.lttng-feature/feature.xml
new file mode 100644
index 0000000..ed0cdbc
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng-feature/feature.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.linuxtools.lttng"
+      label="%featureName"
+      version="0.2.0.qualifier"
+      provider-name="%featureProvider"
+      os="linux">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <requires>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.linuxtools.tmf" version="0.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.linuxtools.tmf.ui" version="0.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.lttng" version="0.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.lttng.jni" version="0.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.core.filesystem"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.linuxtools.lttng"
+         os="linux"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.lttng.ui"
+         os="linux"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.lttng.help"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.lttng.jni"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/.project b/lttng/org.eclipse.linuxtools.lttng.help/.project
new file mode 100644
index 0000000..ce3c28c
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.lttng.help</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng.help/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..be067bf
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/META-INF/MANIFEST.MF
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.linuxtools.lttng.help; singleton:=true
+Bundle-Version: 0.2.0.qualifier
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Localization: plugin
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/build.properties b/lttng/org.eclipse.linuxtools.lttng.help/build.properties
new file mode 100644
index 0000000..68a6760
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/build.properties
@@ -0,0 +1,5 @@
+bin.includes = plugin.xml,\
+               META-INF/,\
+               html/,\
+               *.xml,\
+               plugin.properties
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/controlFlowView.html b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/controlFlowView.html
new file mode 100644
index 0000000..6e4e635
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/controlFlowView.html
@@ -0,0 +1,67 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Control Flow View</title>
+</head>
+
+<body>
+<h1>Control Flow View</h1>
+<p>It shows a process table of the traced system as well as the state transitions over time</p>
+<p>The dotted vertical lines in the state area represent "more information" i.e. There is at least one state that could not be represented in one pixel with the current scale</p>
+
+<p>The tool bar options from right to left are:</p>
+<dl>
+<dt>Home</dt>
+<dd>Reset the time scale to Default</dd>
+<p></p>
+<dt>Next Event</dt>
+<dd>Moves to the next event over the highlighted process</dd>
+<p></p>
+<dt>Previous Event</dt>
+<dd>Moves to the previous event over the highlighted process</dd>
+<p></p>
+<dt>Next Process</dt>
+<dd>Moves from the currently highlighted process to the next down in the list</dd>
+<p></p>
+<dt>Previous Process</dt>
+<dd>Moves from the currently highlighted process to the next up in the list</dd>
+<p></p>
+<dt>Zoom In</dt>
+<dd>Maintains the same width while reducing the visible time range in order to see a bigger representation of the states</dd>
+<p></p>
+<dt>Zoom Out</dt>
+<dd>Maintains the same width while increasing the visible time range in order to see a smaller representation of the states</dd>
+<p></p>
+<dt>Synchronize</dt>
+<dd><ul><li>Notify time selections to synchronized views</li><li>Listens and apply time selections from other synchronized views</li></ul></dd>
+
+</dl> 
+<p>Note: Due to the large size of the LTTng traces, this view does not keep all state information in memory</p>
+<br> <img alt="Control Flow View" src="../images/controlFlowView2.png"  width="1059" height="343">
+
+<p>Additional mouse controls</p>
+<dl>
+<dt>Mouse Scroll wheel</dt>
+<dd>
+<ul>
+<li>Forward  - One Zoom In order per step</li>
+<li>Backward - One Zoom Out order per step</li>
+</ul>
+</dd>
+<dt>Mouse drag</dt>
+<dd>
+<ul>
+<li>States Area     - Moves the time window in the direction of the drag keeping current scale</li>
+<li>Time Scale Area - Changes the time scale to the time range from the start to the end of the drag action</li>
+</ul>
+</dd>
+<dt>Mouse Hovering</dt>
+<dd>Hovering the mouse selection over a state will trigger a tooltip display with additional information, 
+including the start and end times as well as the name of the state associated to the color</dd>
+
+</dl>
+<br> <img alt="Control Flow View hover tool tip" src="../images/controlFlowViewTooltip.png">
+</body>
+</html>
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/eventsView.html b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/eventsView.html
new file mode 100644
index 0000000..5c4d51e
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/eventsView.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Events View</title>
+</head>
+
+<body>
+<h1>Events View</h1>
+<p>
+The Events views shows the basic experiment data in chronological order in
+a tabular format. The following fields are displayed:
+<ul>
+<li>Timestamp: the event timestamp
+<li>Source: the component that generated the event
+<li>Type: the event type
+<li>Reference: the trace that holds the event
+<li>Content: the raw event content
+</ul>
+<p>
+
+<br> <img alt="Events View" src="../images/eventsView.png">
+
+</body>
+</html>
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/experiment.html b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/experiment.html
new file mode 100644
index 0000000..8fe1855
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/experiment.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Experiment</title>
+</head>
+
+<body>
+<h1>Experiment</h1>
+<p>
+An experiment consists in an arbitrary number of aggregated
+<a href="trace.html">LTTng traces</a>. In the degenerate case, an experiment
+can consist of a single trace.
+<p>
+The experiment provides a unified, time-ordered stream of the individual LTTng
+trace events.
+<p>
+Since the individual traces are likely to have unsynchronized clocks (or at
+least skewed with respect to each other), the experiment supports a timestamp
+adjustment scheme that synchronizes all the events against a common reference
+clock. This simplifies events correlation between traces.   
+
+</body>
+</html>
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/lttng.html b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/lttng.html
new file mode 100644
index 0000000..34d06b6
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/lttng.html
@@ -0,0 +1,16 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Main Topic</title>
+</head>
+
+<body>
+<h1>LTTng</h1>
+LTTng is a kernel tracer for Linux. It helps tracking down performance issues and debugging problems involving multiple concurrent processes and threads. 
+<br>Its trace analysis counterpart, The LTTng Eclipse plug-in, permits to analyze and show the traces gathered by LTTng.
+
+<br><br> <img alt="Lttng in Eclipse" src="../images/lttngEclipse1.png">
+</body>
+</html>
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/lttv.html b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/lttv.html
new file mode 100644
index 0000000..b6b63dc
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/lttv.html
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>LTTv</title>
+</head>
+
+<body>
+<h1>LTTv</h1>
+<p>LTTv is the former trace analysis counterpart of LTTng</p>
+<p>The LTTng Eclipse plug-in replaces LTTv by providing its analysis features in the Eclipse framework</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/perspective.html b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/perspective.html
new file mode 100644
index 0000000..b75a009
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/perspective.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Perspective</title>
+</head>
+
+<body>
+<h1>LTTng perspective</h1>
+<p>
+The screenshot below shows the LTTng perspective. It holds the following specific views:
+<ul>
+<li><a href="projectView.html">Project View</a>
+<li><a href="controlFlowView.html">Control Flow View</a>
+<li><a href="resourcesView.html">Resources View</a>
+<li><a href="statisticsView.html">Statistics View</a>
+<li><a href="timeFrameView.html">Time Frame View</a>
+<li><a href="eventsView.html">Events View</a>
+<li>Histogram View (not implemented)
+<li>Control View (not implemented)
+</ul>
+<p>
+The analysis views are synchronized i.e. selecting a raw event, a timestamp, etc,
+will position the other views accordingly.
+<p>
+
+<br> <img alt="LTTng Perspective" src="../images/perspective.png">
+
+</body>
+</html>
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/projectView.html b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/projectView.html
new file mode 100644
index 0000000..ce5a3d7
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/projectView.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Project View</title>
+</head>
+
+<body>
+<h1>Project View</h1>
+<p>
+The project view displays the LTTng projects of the current workspace.
+<p>
+Two folders are always present: <code>Traces</code> and <code>Experiments</code>.
+<p>
+<br> <img alt="Project View" src="../images/projectView.png">
+<p>
+<br>
+The <code>Traces</code> folder holds the set of traces available for experiments.
+Traces are imported in the LTTng project using an import wizard triggered by a
+context menu.
+<p>
+<u>Note</u>: An LTTng trace is actually a composite of multiple channel traces grouped
+under a folder. It is the <u>folder</u> that has to be imported.   
+<p>
+<br> <img alt="Import Traces" src="../images/importTraces.png">
+<p>
+The <code>Experiment</code> folder holds the set of experiments of the project.
+Experiments are created from the <code>Experiment</code> context menu and are
+configured from the experiment's context menu.
+<p>
+<br> <img alt="Select Traces" src="../images/selectTraces.png">
+ 
+
+</body>
+</html>
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/resourcesView.html b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/resourcesView.html
new file mode 100644
index 0000000..b85cdd3
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/resourcesView.html
@@ -0,0 +1,67 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

+

+<html>

+<head>

+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

+	<title>Resources View</title>

+</head>

+

+<body>

+<h1>Resources View</h1>

+<p>It shows a resources list of the traced system as well as the state transitions over time</p>

+<p>The dotted vertical lines in the state area represent "more information" i.e. There is at least one state that could not be represented in one pixel with the current scale</p>

+

+<p>The tool bar options from right to left are:</p>

+<dl>

+<dt>Home</dt>

+<dd>Reset the time scale to Default</dd>

+<p></p>

+<dt>Next Event</dt>

+<dd>Moves to the next event over the highlighted process</dd>

+<p></p>

+<dt>Previous Event</dt>

+<dd>Moves to the previous event overt the highlighted process</dd>

+<p></p>

+<dt>Next Resource</dt>

+<dd>Moves from the currently highlighted resource to the next down in the list</dd>

+<p></p>

+<dt>Previous Resource</dt>

+<dd>Moves from the currently highlighted resource to the next up in the list</dd>

+<p></p>

+<dt>Zoom In</dt>

+<dd>Maintains the same width while reducing the visible time range in order to see a bigger representation of the states</dd>

+<p></p>

+<dt>Zoom Out</dt>

+<dd>Maintains the same width while increasing the visible time range in order to see a smaller representation of the states</dd>

+<p></p>

+<dt>Synchronize</dt>

+<dd><ul><li>Notify time selections to synchronized views</li><li>Listens and apply time selections from other synchronized views</li></ul></dd>

+

+</dl> 

+<p>Note: Due to the large size of the Lttng traces, this view does not keep all state information in memory</p>

+<br> <img alt="Resources View" src="../images/resourcesView1.png">

+

+<p>Additional mouse controls</p>

+<dl>

+<dt>Mouse Scroll wheel</dt>

+<dd>

+<ul>

+<li>Forward  - One Zoom In order per step</li>

+<li>Backward - One Zoom Out order per step</li>

+</ul>

+</dd>

+<dt>Mouse drag</dt>

+<dd>

+<ul>

+<li>States Area     - Moves the time window in the direction of the drag keeping current scale</li>

+<li>Time Scale Area - Changes the time scale to the time range from the start to the end of the drag action</li>

+</ul>

+</dd>

+<dt>Mouse Hovering</dt>

+<dd>Hovering the mouse selection over a state will trigger a tooltip display with additional information, 

+including the start and end times as well as the name of the state associated to the color</dd>

+

+</dl>

+<br> <img alt="Resources View hover tool tip" src="../images/resourcesTooltip.png">

+</body>

+</html>
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/statisticsView.html b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/statisticsView.html
new file mode 100644
index 0000000..10d4af9
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/statisticsView.html
@@ -0,0 +1,16 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

+

+<html>

+<head>

+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

+	<title>Statistics View</title>

+</head>

+

+<body>

+<h1>Statistics View</h1>

+<p>This view represents in a tree format the multiple statistics related to the current  <a href="experiment.html">Experiment</a>.</p>

+

+<br> <img alt="Statistics View" src="../images/statistics1.png">

+

+</body>

+</html>
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/timeFrameView.html b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/timeFrameView.html
new file mode 100644
index 0000000..2ba3415
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/timeFrameView.html
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Time Frame View</title>
+</head>
+
+<body>
+<h1>Time Frame View</h1>
+<p>
+This view displays some general time characteristics about the selected
+experiment. All times are expressed in seconds (sec) and nanoseconds (ns).
+
+<ul>
+<li>Start Time
+<ul>
+<li>The start time of the interval of interest
+<li>Can take any value within the experiment time range
+<li>Initial value: the timestamp of the first event
+</ul>
+
+<li>End Time
+<ul>
+<li>The end time of the interval of interest
+<li>Can take any value within the experiment time range
+<li>Initial value: the timestamp of the last event
+</ul>
+
+<li>Interval
+<ul>
+<li>The interval length (End Time - Start Time)
+<li>Can take any value between 0 and the experiment time range
+<li>Initial value: the experiment time range
+</ul>
+
+<li>Current time
+<ul>
+<li>The currently selected time
+<li>Can take any value between Start Time and End Time
+<li>Initial value: Start Time
+</ul>
+
+</ul>
+
+The times can be modified, within their valid range, using the spinner buttons.
+Additionally, the Current Time can be modified by using the slider bar.
+<p>
+
+<br> <img alt="Time Frame View" src="../images/timeFrameView.png">
+
+</body>
+</html>
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/toc_concepts.html b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/toc_concepts.html
new file mode 100644
index 0000000..2ff8888
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/toc_concepts.html
@@ -0,0 +1,16 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Concepts</title>
+</head>
+
+<body>
+<h1>Concepts</h1>
+		<ul>
+			<li><a href="toc_general.html"> General</a></li>
+			<li><a href="toc_userInterface.html"> User Interface</a></li>
+		</ul>
+</body>
+</html>
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/toc_general.html b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/toc_general.html
new file mode 100644
index 0000000..6db0b73
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/toc_general.html
@@ -0,0 +1,18 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>General</title>
+</head>
+
+<body>
+<h1>General</h1>
+<ul>
+	<li><a href="lttng.html"> LTTng</a></li>
+	<li><a href="lttv.html"> LTTv</a></li>
+	<li><a href="trace.html">Trace</a></li>
+	<li><a href="experiment.html">Experiment</a></li>
+</ul>
+</body>
+</html>
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/toc_userInterface.html b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/toc_userInterface.html
new file mode 100644
index 0000000..e20dc3f
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/toc_userInterface.html
@@ -0,0 +1,21 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>User Interface</title>
+</head>
+
+<body>
+<h1>User Interface</h1>
+<ul>
+	<li><a href="perspective.html"> Perspective</a></li>
+	<li><a href="projectView.html"> Project View</a></li>
+	<li><a href="eventsView.html"> Events View</a></li>
+	<li><a href="timeFrameView.html"> Time Frame View</a></li>
+	<li><a href="controlFlowView.html"> Control Flow View</a></li>
+	<li><a href="resourcesView.html"> Resources View</a></li>
+	<li><a href="statisticsView.html"> Statistics View</a></li>
+</ul>
+</body>
+</html>
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/trace.html b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/trace.html
new file mode 100644
index 0000000..40a9577
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/concepts/trace.html
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Trace</title>
+</head>
+
+<body>
+<h1>Trace</h1>
+<p>
+Tracing is a technique used to understand what is going on in a system in
+order to debug or monitor it. A tracer is the software used for tracing.
+Tracing can be used to debug a wide range of bugs that are otherwise extremely 
+challenging. These include, for example, performance problems in complex
+parallel systems or real-time systems.
+<p>
+Tracing is similar to logging: it consists in recording events that happen
+in a system. However, compared to logging, it usually records much lower-level
+events that occur much more frequently. Tracers must therefore be optimized
+to handle a lot of data while having a small impact on the system. Tracers
+typically generate thousands of events per second. They frequently contain
+millions of events and have sizes from many megabytes to tens of gigabytes.
+<p>
+Traces may include events from the operating system kernel (IRQ handler
+entry/exit, system call entry/exit, scheduling activity, network activity, 
+etc). They may also include events from any application.
+<p>
+The list of events of a trace may be read manually like a log file, for the 
+maximum level of detail. However, trace analyzers and viewers are available 
+to produce graphs and statistics from this enormous amount of data. These 
+programs must be specially designed to handle quickly the enormous amount of 
+data traces contain.
+<p>
+In the case of LTTng, low tracing overhead is achieved by instrumenting the
+Linux kernel with a set of custom patches. The same set of patches can be
+used for both Linux kernel as well as user space (i.e application) tracing.  
+<p>
+Refer to the <a href="http://lttng.org">LTTng Project</a> for more information
+on tracing and LTTng.
+<p>
+In the scope of the Linux Tools LTTng project, a trace is essentially a (very)
+large set of time-ordered LTTng events. The LTTng set of plugins accepts these
+traces and provides a number of standard views to analyze their contents
+either individually or through an <a href="experiment.html">experiment</a>. 
+
+</body>
+</html>
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/gettingstarted/install_lttng.html b/lttng/org.eclipse.linuxtools.lttng.help/html/gettingstarted/install_lttng.html
new file mode 100644
index 0000000..b6d2a65
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/gettingstarted/install_lttng.html
@@ -0,0 +1,533 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
+	<TITLE></TITLE>
+	<META NAME="GENERATOR" CONTENT="OpenOffice.org 3.1  (Linux)">
+	<META NAME="CREATED" CONTENT="20091006;11250700">
+	<META NAME="CHANGED" CONTENT="20100312;12281000">
+	<STYLE TYPE="text/css">
+	<!--
+		@page { margin: 2cm }
+		H1 { margin-bottom: 0.21cm }
+		H1.western { font-family: "Nimbus Sans L", sans-serif; font-size: 16pt }
+		H1.cjk { font-family: "Bitstream Vera Sans"; font-size: 16pt }
+		H1.ctl { font-family: "Bitstream Vera Sans"; font-size: 16pt }
+		H3 { margin-bottom: 0.21cm }
+		H3.western { font-family: "Nimbus Roman No9 L", serif }
+		A:link { so-language: zxx }
+	-->
+	</STYLE>
+</HEAD>
+<BODY LANG="en-CA" DIR="LTR">
+<P STYLE="margin-bottom: 0cm"><BR>
+</P>
+<H1 CLASS="western">Installing LTTv library for Eclipse LTTng plugin</H1>
+<P STYLE="margin-bottom: 0.21cm"><BR><BR>
+</P>
+<P STYLE="margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">This
+document will describe how to install and configure LTTv C-code
+library to work with eclipse LTTng plugin. </FONT>
+</P>
+<P STYLE="margin-bottom: 0cm"><BR>
+</P>
+<H3 CLASS="western">For the impatients</H3>
+<UL>
+	<LI><P STYLE="margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">Download
+	latest LTTv application, from
+	<A HREF="http://git.dorsal.polymtl.ca/?p=liblttngtrace.git;a=summary">http://git.dorsal.polymtl.ca/?p=liblttngtrace.git;a=summary</A></FONT></P>
+	<LI><P STYLE="margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">Compile
+	it with the JNI support activated :</FONT></P>
+	<P STYLE="margin-bottom: 0.3cm"><FONT FACE="Arial, sans-serif"><FONT SIZE=2><I>./configure
+	--with-jni-interface &amp;&amp; make &amp;&amp; make install</I></FONT></FONT></P>
+	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Nimbus Roman No9 L, serif">Start
+	Eclipse application making sure the library is in LD_LIBRARY_PATH.</FONT></P>
+</UL>
+<P STYLE="margin-bottom: 0cm"><BR>
+</P>
+<P STYLE="text-indent: 1.27cm; margin-bottom: 0cm"><FONT FACE="Nimbus Roman No9 L, serif">It
+didn't work? Please read “Installation steps” section. </FONT>
+</P>
+<P STYLE="margin-bottom: 0cm"><BR>
+</P>
+<H3 CLASS="western">Why a C library ? 
+</H3>
+<P STYLE="margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">LTTng
+and LTTv are mostly made in C (and some part in more evil stuff) so
+their functionnality are not directly available in Java. Also, for
+the sake of performance, it was better for the project to use the
+native, multi-platform C library for most of the low-level functions
+than to try to re-implement the same in Java. Finally, the C library
+is under constant development and it would have been a bad idea to
+branch this one just yet.</FONT></P>
+<P STYLE="margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">So
+right now, the usual path for an event through LTTng would be the
+following :</FONT></P>
+<P STYLE="margin-left: 0.5cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><I>Linux
+Kernel -&gt; Trace Directory</I></FONT></P>
+<P STYLE="margin-left: 0.5cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><I>(Trace
+Directory read by) LTTv C Library -&gt; JNI (C side) -&gt; JNI (Java
+Side) -&gt; Eclipse LTTng Plugin</I></FONT></P>
+<P STYLE="margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">(Note
+that the kernel is only called to record at trace). </FONT>
+</P>
+<P STYLE="margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">For
+all these reasons, the LTTv C library and a JNI (Java Native
+Interface) is needed for java to process LTTng trace. The JNI itself,
+however, is already included in LTTV and it should be easy to build
+and to install (using this very installation guide). </FONT>
+</P>
+<P STYLE="margin-bottom: 0cm"><BR>
+</P>
+<H3 CLASS="western">Installation steps 
+</H3>
+<P STYLE="margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">First
+on all, we need to download and compile the source of the LTTv
+application, with the JNI support enabled. To do so, there is 4 steps
+to follow. </FONT>
+</P>
+<P STYLE="margin-bottom: 0.21cm"><BR><BR>
+</P>
+<OL>
+	<LI><P STYLE="margin-bottom: 0.21cm; text-decoration: none"><FONT FACE="Nimbus Roman No9 L, serif"><I><B>Downloading
+	LTTv</B></I></FONT></P>
+</OL>
+<P STYLE="margin-left: 1.22cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">There
+is actually three stage of LTTv available for download.</FONT></P>
+<P STYLE="margin-left: 1.22cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><I><B>Note</B>
+: LTTv is responsible of handling the trace format for Eclipse.
+However, as the trace format changed overtime, you might need to
+compile several versions of LTTv if you plan to support multiple
+trace formats. Each “branch” of LTTv should tell you by its name
+which version of the LTTng trace it supports. If you did not generate
+a trace already, you might want to stick with the latest LTTv
+version, otherwise, it is advice to compile all available versions. </I></FONT>
+</P>
+<P STYLE="margin-left: 1.22cm; margin-bottom: 0.21cm"><BR><BR>
+</P>
+<P STYLE="margin-left: 1.22cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">-
+<B>Beta JNI build (git) </B><FONT COLOR="#ff950e"><B>(PLEASE USE
+THIS)</B></FONT></FONT></P>
+<P STYLE="margin-left: 1.22cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">This
+is the very beta tree of LTTv that include the newest JNI changes. It
+is under constant development, so there might be some bugs left, but
+it contains the newer JNI interface, which is probably what you need.</FONT></P>
+<P STYLE="margin-left: 1.22cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">This
+is definitely what you should use, get it from :</FONT></P>
+<P STYLE="margin-left: 1.22cm; margin-bottom: 0.21cm"><A HREF="http://git.dorsal.polymtl.ca/?p=liblttngtrace.git;a=summary"><FONT FACE="Nimbus Roman No9 L, serif"><I>http://git.dorsal.polymtl.ca/?p=liblttngtrace.git;a=summary</I></FONT></A></P>
+<P STYLE="margin-left: 1.22cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><SPAN STYLE="font-style: normal">Then,
+in the “</SPAN><I>head</I>” <SPAN STYLE="font-style: normal">section,
+click on the traceformat that suite your need</SPAN> <SPAN STYLE="font-style: normal">and
+then choose “</SPAN><I>snapshot</I>” <SPAN STYLE="font-style: normal">to
+download its archive.</SPAN></FONT></P>
+<P STYLE="margin-left: 1.22cm; margin-bottom: 0.21cm; font-style: normal">
+<FONT FACE="Nimbus Roman No9 L, serif">If you don't know which
+traceformat you need, you may want to get all of them to support
+multiple versions of traces. </FONT>
+</P>
+<P STYLE="margin-left: 1.22cm; margin-bottom: 0.21cm"><BR><BR>
+</P>
+<P STYLE="margin-left: 1.22cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">-
+<B>Development build (git) </B></FONT>
+</P>
+<P STYLE="margin-left: 1.22cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">This
+is the release candidate of the LTTv application. It contains
+features that are under development or too experimental to make it to
+the main tree. It also includes the JNI interface that you need to
+use for eclipse; however, this branch could be a little late on the
+beta, so use at your own risk. </FONT>
+</P>
+<P STYLE="margin-left: 1.22cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">If
+you want to try, get it from
+:<BR></FONT><A HREF="http://lttng.org/cgi-bin/gitweb.cgi?p=lttv.git;a=summary"><FONT FACE="Nimbus Roman No9 L, serif"><I>http://lttng.org/cgi-bin/gitweb.cgi?p=lttv.git;a=summary</I></FONT></A></P>
+<P STYLE="margin-left: 1.22cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><SPAN STYLE="font-style: normal">Then,
+in the “</SPAN><I>head</I>” <SPAN STYLE="font-style: normal">section,
+click on the traceformat that suite your need</SPAN> <SPAN STYLE="font-style: normal">and
+then choose “</SPAN><I>snapshot</I>” <SPAN STYLE="font-style: normal">to
+download its archive.</SPAN></FONT></P>
+<P STYLE="margin-left: 1.22cm; margin-bottom: 0.21cm; font-style: normal">
+<FONT FACE="Nimbus Roman No9 L, serif">If you don't know which
+traceformat you need, you may want to compile all of them to support
+multiple versions of traces. </FONT>
+</P>
+<P STYLE="margin-left: 1.22cm; margin-bottom: 0.21cm"><BR><BR>
+</P>
+<P STYLE="margin-left: 1.22cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">-
+<B>Stable release</B></FONT></P>
+<P STYLE="margin-left: 1.22cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">This
+is the main LTTv tree. Actually missing the JNI fonctionnality but
+this might be added soon. Until this is done, you should stick with
+development version. </FONT>
+</P>
+<P STYLE="margin-left: 1.22cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">If
+you want to try it anyways, you can get it from
+</FONT><A HREF="http://www.lttng.org/?q=node/3"><FONT FACE="Nimbus Roman No9 L, serif"><I>http://www.lttng.org/?q=node/3</I></FONT></A></P>
+<P STYLE="margin-left: 1.22cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">Then,
+select “<I>Download the latest lttv-[version].tar.gz</I>” in the
+menu and pick the most recent (usually on top) release.</FONT></P>
+<P STYLE="margin-left: 1.22cm; margin-bottom: 0.21cm"><BR><BR>
+</P>
+<P STYLE="margin-bottom: 0.21cm"><BR><BR>
+</P>
+<OL START=2>
+	<LI><P STYLE="margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><I><B>Decompressing
+	the archive(s)</B></I></FONT></P>
+</OL>
+<P STYLE="margin-left: 1.27cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">You
+now need to archive files where you want them and to uncompress them.
+You need to do this for all the lttv version you downloaded.</FONT></P>
+<P STYLE="margin-left: 1.27cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">The
+way to do it in command line would be something like : </FONT>
+</P>
+<P STYLE="margin-left: 1.27cm; margin-bottom: 0.3cm"><FONT FACE="Arial, sans-serif"><FONT SIZE=2><I>mv
+archive_name.tar.gz /where/you/want</I></FONT></FONT></P>
+<P STYLE="margin-left: 1.27cm; margin-bottom: 0.3cm"><FONT FACE="Arial, sans-serif"><FONT SIZE=2><I>tar
+-xvzf archive_name.tar.gz</I></FONT></FONT></P>
+<P STYLE="margin-left: 1.27cm; margin-bottom: 0.21cm"><BR><BR>
+</P>
+<P STYLE="margin-left: 1.27cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">As
+example, this is what I would do for myself :</FONT></P>
+<P STYLE="margin-left: 1.27cm; margin-bottom: 0.3cm"><FONT FACE="Arial, sans-serif"><FONT SIZE=2><I>mv
+liblttngtrace-bcaf565bbfb26d0ac7e4647528230feb61443a01.tar.gz
+/home/william</I></FONT></FONT></P>
+<P STYLE="margin-left: 1.27cm; margin-bottom: 0.3cm"><FONT FACE="Arial, sans-serif"><FONT SIZE=2><I>tar
+-xvzf liblttngtrace-bcaf565bbfb26d0ac7e4647528230feb61443a01.tar.gz</I></FONT></FONT></P>
+<P STYLE="margin-bottom: 0.21cm"><BR><BR>
+</P>
+<OL START=3>
+	<LI><P STYLE="margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><I><B>Configuration</B></I></FONT></P>
+</OL>
+<P STYLE="margin-left: 1.27cm; margin-bottom: 0.21cm; font-style: normal">
+<FONT FACE="Nimbus Roman No9 L, serif"><B>At First</B></FONT></P>
+<P STYLE="margin-left: 1.27cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">Enter
+one of the uncompressed directory, you should use a command like : </FONT>
+</P>
+<P STYLE="margin-left: 1.27cm; margin-bottom: 0.3cm"><FONT FACE="Arial, sans-serif"><FONT SIZE=2><I>cd
+liblttngtrace</I></FONT></FONT></P>
+<P STYLE="margin-left: 1.24cm; margin-bottom: 0cm"><FONT FACE="Nimbus Roman No9 L, serif">(Of
+course “<I>liblttngtrace</I>” need to be the name of the
+uncompressed directory).</FONT></P>
+<P STYLE="margin-left: 1.24cm; margin-bottom: 0cm"><BR>
+</P>
+<P STYLE="margin-left: 1.24cm; margin-bottom: 0cm"><BR>
+</P>
+<P STYLE="margin-left: 1.24cm; margin-bottom: 0cm"><FONT FACE="Nimbus Roman No9 L, serif">If
+you are using any “Development build” (first or second choice of
+the download section), before doing anything, you need to do the
+following : </FONT>
+</P>
+<P STYLE="margin-left: 1.24cm; margin-bottom: 0.3cm"><FONT FACE="Arial, sans-serif"><FONT SIZE=2><I>./autogen.sh</I></FONT></FONT></P>
+<P STYLE="margin-left: 1.24cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">You
+can safetly ignore any errors you get there, we will take care of
+them next. </FONT>
+</P>
+<P STYLE="margin-bottom: 0.21cm"><BR><BR>
+</P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.21cm; font-style: normal">
+<FONT FACE="Nimbus Roman No9 L, serif"><B>Dependencies</B></FONT></P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">To
+build LTTv, the folowing dependencies need to be met. A (very)
+incomplete list is the following. Most distribution should have most
+of this stuff, except maybe gtk-dev, glib-dev and libopt that are
+probably missing on most systems.</FONT></P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">Install
+the missing dependencies using your distribution package manager and
+then jump to the “<I>configure script</I>” step.</FONT></P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><FONT SIZE=2><B>libtool
+(and its dependencies like autotools, autoconf, automake and such...)</B></FONT></FONT></P>
+<P STYLE="margin-left: 2.01cm; margin-bottom: 0.21cm; font-weight: normal">
+<FONT FACE="Nimbus Roman No9 L, serif"><FONT SIZE=2><I>(Debian/Ubuntu
+: libtool)</I></FONT></FONT></P>
+<P STYLE="margin-left: 2.01cm; margin-bottom: 0.21cm; font-weight: normal">
+<FONT FACE="Nimbus Roman No9 L, serif"><FONT SIZE=2><I>(Fedora/Redhat
+: libtool-2)</I></FONT></FONT></P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><FONT SIZE=2><B>gcc
+3.2 (or better)</B></FONT></FONT></P>
+<P STYLE="margin-left: 1.98cm; margin-bottom: 0.21cm; font-weight: normal">
+<FONT FACE="Nimbus Roman No9 L, serif"><FONT SIZE=2><I>(Debian/Ubuntu
+: gcc-3.2)</I></FONT></FONT></P>
+<P STYLE="margin-left: 1.98cm; margin-bottom: 0.21cm; font-weight: normal">
+<FONT FACE="Nimbus Roman No9 L, serif"><FONT SIZE=2><I>(Fedora/Redhat
+: gcc-3.2)</I></FONT></FONT></P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><FONT SIZE=2><B>gtk
+2.4 development libraries (or better)</B></FONT></FONT></P>
+<P STYLE="margin-left: 2.04cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><FONT SIZE=2><I>(Debian/Ubuntu
+: libgtk2.0, libgtk2.0-dev)</I></FONT></FONT></P>
+<P STYLE="margin-left: 2.04cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><FONT SIZE=2><I>(Fedora/Redhat
+: gtk2, gtk2-devel)</I></FONT></FONT></P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><FONT SIZE=2><B>glib
+2.4 development libraries (or better)</B></FONT></FONT></P>
+<P STYLE="margin-left: 2.09cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><FONT SIZE=2><I>(Debian/Ubuntu
+: libglib2.0-0, libglib2.0-dev)</I></FONT></FONT></P>
+<P STYLE="margin-left: 2.09cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><FONT SIZE=2><I>(Fedora/Redhat
+: glib2, glib2-devel)</I></FONT></FONT></P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><FONT SIZE=2><B>libpopt
+development libraries</B></FONT></FONT></P>
+<P STYLE="margin-left: 2.17cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><FONT SIZE=2><I>(Debian/Ubuntu
+: libpopt0, libpopt-dev)</I></FONT></FONT></P>
+<P STYLE="margin-left: 2.17cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><FONT SIZE=2><I>(Fedora/Redhat
+: popt)</I></FONT></FONT></P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><FONT SIZE=2><B>libpango
+development libraries</B></FONT></FONT></P>
+<P STYLE="margin-left: 2.12cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><FONT SIZE=2><I>(Debian
+: libpango1.0, libpango1.0-dev)</I></FONT></FONT></P>
+<P STYLE="margin-left: 2.12cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><FONT SIZE=2><I>(Fedora
+: pango, pango-devel)</I></FONT></FONT></P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><FONT SIZE=2><B>libc6
+development librairies </B></FONT></FONT>
+</P>
+<P STYLE="margin-left: 2.09cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><FONT SIZE=2><I>(Debian
+: libc6, libc6-dev)</I></FONT></FONT></P>
+<P STYLE="margin-left: 2.09cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><FONT SIZE=2><I>(Fedora
+: glibc, glibc)<BR></I></FONT></FONT><BR><BR>
+</P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><B>Configure
+step</B></FONT></P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">LTTv
+have several compile options that you can turn on/off. To see a full
+list, type the following : </FONT>
+</P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.3cm"><FONT FACE="Arial, sans-serif"><FONT SIZE=2><I>./configure
+–help<BR></I></FONT></FONT><BR><BR>
+</P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">The
+following option is <U><B>essential</B></U> for Eclipse to work :</FONT></P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.3cm"><FONT FACE="Arial, sans-serif"><FONT SIZE=2><I>--with-jni-interface
+Build JNI interface between C and java. Need java include files.
+[default=no]<BR></I></FONT></FONT><BR><BR>
+</P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">The
+following options may be useful for you as well : </FONT>
+</P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.3cm"><FONT FACE="Arial, sans-serif"><FONT SIZE=2><I>1)
+--prefix=PREFIX install architecture-independent files in PREFIX
+[/usr/local] </I></FONT></FONT>
+</P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.3cm"><FONT FACE="Arial, sans-serif"><FONT SIZE=2><I>2)
+--with-lttv Build whole LTTV system, as opposed to only the trace
+reading library [default=yes]</I></FONT></FONT></P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.3cm"><FONT FACE="Arial, sans-serif"><FONT SIZE=2><I>3)
+--with-java-jdk=DIR Use java jdk from DIR. Ex : $JAVA_HOME.</I></FONT></FONT></P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.21cm"><BR><BR>
+</P>
+<P STYLE="margin-left: 1.27cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">1)
+Change PREFIX to something in your home if you don't have root access
+on your system.</FONT></P>
+<P STYLE="margin-left: 1.85cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">Use
+a flag like : --prefix=/home/your_name/a_directory</FONT></P>
+<P STYLE="margin-left: 1.27cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">2)
+Unless you need LTTv Gtk gui, you better turn off turn off LTTv UI
+compilation. </FONT>
+</P>
+<P STYLE="margin-left: 1.85cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">Use
+the flag : --without-lttv</FONT></P>
+<P STYLE="margin-left: 1.27cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">3)
+On some (most?) system, configure will need you to indicate where it
+can find the java JDK to compile the JNI. </FONT>
+</P>
+<P STYLE="margin-left: 1.85cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">Use
+a flag like : --with-java-jdk=/where/java-jdk/is</FONT></P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.21cm"><BR><BR>
+</P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">As
+example, here is what I would use :</FONT></P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.3cm"><FONT FACE="Arial, sans-serif"><FONT SIZE=2><I>./configure
+--prefix=/home/william/apps --without-lttv
+--with-java-jdk=/usr/local/jdk1.6.0_13 --with-jni-interface </I></FONT></FONT>
+</P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.21cm"><BR><BR>
+</P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">Fix
+any missing dependencies errors and move to the next step.</FONT></P>
+<P STYLE="margin-bottom: 0.21cm"><BR><BR>
+</P>
+<OL START=4>
+	<LI><P STYLE="margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><I><B>Build
+	and install</B></I></FONT></P>
+</OL>
+<P STYLE="margin-left: 1.32cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">Now
+that program is correctly configured, we can try to build it. Type
+the following command (this can take a while) :</FONT></P>
+<P STYLE="margin-left: 1.32cm; margin-bottom: 0.3cm"><FONT FACE="Arial, sans-serif"><FONT SIZE=2><I>make</I></FONT></FONT></P>
+<P STYLE="margin-left: 1.32cm; margin-bottom: 0.21cm"><BR><BR>
+</P>
+<P STYLE="margin-left: 1.32cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">When
+it is over, make sure there were no error during the compilation and
+issue the following command : </FONT>
+</P>
+<P STYLE="margin-left: 1.32cm; margin-bottom: 0.3cm"><FONT FACE="Arial, sans-serif"><FONT SIZE=2><I>sudo
+make install</I></FONT></FONT></P>
+<P STYLE="margin-left: 1.32cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">OR
+if you don't have root acess AND changed the --prefix=PREFIX flag
+during the configuration :</FONT></P>
+<P STYLE="margin-left: 1.32cm; margin-bottom: 0.3cm"><FONT FACE="Arial, sans-serif"><FONT SIZE=2><I>make
+install </I></FONT></FONT>
+</P>
+<P STYLE="margin-left: 1.32cm; margin-bottom: 0.21cm"><BR><BR>
+</P>
+<P STYLE="margin-left: 1.32cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">LTTv
+should now be installed on your system. </FONT>
+</P>
+<P STYLE="margin-left: 1.32cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">Get
+back to the step <I>3) “Configuration” </I>and do the same
+operations for all the LTTv version that were downloaded to install
+them on your system. </FONT>
+</P>
+<P STYLE="margin-bottom: 0.21cm"><BR><BR>
+</P>
+<OL START=5>
+	<LI><P STYLE="margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><I><B>Set
+	library path</B></I></FONT></P>
+</OL>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0cm"><FONT FACE="Nimbus Roman No9 L, serif">Now
+that LTTv is installed, we need to make sure Eclipse can find its
+library easily. The best way to do so is to ajust the
+LD_LIBRARY_PATH. </FONT>
+</P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0cm"><BR>
+</P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0cm"><FONT FACE="Nimbus Roman No9 L, serif">The
+following should work on most system if your shell is BASH or KSH <U>(in
+case of doubt try this one)</U> :</FONT></P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.3cm"><FONT FACE="Arial, sans-serif"><FONT SIZE=2><I>export
+LD_LIBRARY_PATH=”/usr/local/lib:$LD_LIBRARY_PATH”</I></FONT></FONT></P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">OR
+if you changed the --prefix=PREFIX flag during the configuration :</FONT></P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.3cm"><FONT FACE="Arial, sans-serif"><FONT SIZE=2><I>export
+LD_LIBRARY_PATH=”/where_you_set_prefix/lib:$LD_LIBRARY_PATH”</I></FONT></FONT></P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0cm"><BR>
+</P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0cm"><BR>
+</P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0cm"><FONT FACE="Nimbus Roman No9 L, serif">If
+you are using a CSH or TCSH shell, this might be what you need : </FONT>
+</P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.3cm"><FONT FACE="Arial, sans-serif"><FONT SIZE=2><I>setenv
+LD_LIBRARY_PATH /usr/local/lib\:$LD_LIBRARY_PATH</I></FONT></FONT></P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">OR
+if you changed the --prefix=PREFIX flag during the configuration :</FONT></P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.3cm"><FONT FACE="Arial, sans-serif"><FONT SIZE=2><I>setenv
+LD_LIBRARY_PATH /where_you_set_prefix/lib\:$LD_LIBRARY_PATH</I></FONT></FONT></P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0cm"><BR>
+</P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0cm"><FONT FACE="Nimbus Roman No9 L, serif">If
+you have root access on the system, if can be a good idea to run
+ldconfig as well :</FONT></P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0.3cm"><FONT FACE="Arial, sans-serif"><FONT SIZE=2><I>sudo
+ldconfig</I></FONT></FONT></P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0cm"><BR>
+</P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0cm"><FONT FACE="Nimbus Roman No9 L, serif"><I><U>Note
+these settings will disapears on logout</U>, you mght consider adding
+this to your autostart or setting it system wide! </I></FONT>
+</P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0cm"><BR>
+</P>
+<P STYLE="margin-left: 1.3cm; margin-bottom: 0cm"><FONT FACE="Nimbus Roman No9 L, serif">You
+should be ready to start Eclipse now.</FONT></P>
+<P STYLE="margin-bottom: 0cm"><BR>
+</P>
+<H3 CLASS="western">FAQ</H3>
+<OL START=1>
+	<LI><P STYLE="margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><I>When
+	trying to start LTTng in Eclipse, I end up with the following
+	exception :<BR></I><FONT COLOR="#000080"><FONT FACE="Monospace"><FONT SIZE=2><I><U>org.eclipse.linuxtools.lttng.trace.LTTngTraceException</U></I></FONT></FONT></FONT><FONT COLOR="#ff0000"><FONT FACE="Monospace"><FONT SIZE=2><I>:
+	Failed to initialize library! Is the trace version supported?</I></FONT></FONT></FONT></FONT></P>
+<P ALIGN=LEFT><FONT COLOR="#ff0000"><FONT FACE="Monospace"><FONT SIZE=2>Make
+sure you have the correct LTTv library compiled. (openTrace)</FONT></FONT></FONT></P>
+	<P STYLE="margin-top: 0.3cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><FONT COLOR="#000000"><FONT SIZE=3><SPAN STYLE="font-style: normal">This
+	mean you do not have the correct LTTv library available on your
+	system. Go back to the section </SPAN></FONT></FONT><FONT COLOR="#000000"><FONT SIZE=3><I>&quot;1)
+	– Download”</I></FONT></FONT><FONT COLOR="#000000"><FONT SIZE=3><SPAN STYLE="font-style: normal">
+	and make sure you downloaded (and installed) the correct version of
+	LTTv to support the format of trace you want to read. As example, if
+	your trace is of LTTng format 2.3, you will need to download and
+	install the archive marked as “traceformat-2.3”.</SPAN></FONT></FONT></FONT></P>
+
+</OL>
+<P STYLE="margin-bottom: 0.21cm"><BR><BR>
+</P>
+<OL START=2>	
+	<LI><P STYLE="margin-top: 0.3cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><I>When
+	trying to import a trace, I get an error message and I have one of
+	the following exception in the Eclipse Console :
+	<BR></I><FONT COLOR="#000080"><FONT FACE="Monospace"><FONT SIZE=2><I><U>org.eclipse.linuxtools.lttng.trace.LTTngTraceException</U></I></FONT></FONT></FONT><FONT COLOR="#ff0000"><FONT FACE="Monospace"><FONT SIZE=2><I>:
+	ERROR : Unrecognized/unsupported trace version.</I></FONT></FONT></FONT></FONT></P>
+	<P STYLE="margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">OR</FONT></P>
+	<P STYLE="margin-bottom: 0.21cm"><FONT FACE="Monospace"><FONT SIZE=2><I><FONT COLOR="#000080"><U>org.eclipse.linuxtools.lttng.trace.LTTngTraceException</U></FONT><FONT COLOR="#ff0000">:
+	ERROR : Call to JniTraceVersion() failed.</FONT></I></FONT></FONT></P>
+	<P STYLE="margin-top: 0.2cm; margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">In
+	that case, either your LTTv version is very old and does not
+	recognize your trace version or you are using a very new trace
+	version that is not yet supported. You probably want to check if
+	there is a newer version of LTTv that you could use. Please refer to
+	the section <I>&quot;1) – Download” for the correct links.</I></FONT></P>
+</OL>
+<P STYLE="margin-bottom: 0.21cm"><BR><BR>
+</P>
+<OL START=3>
+	<LI><P STYLE="margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif"><I>When
+	trying to start LTTng in Eclipse, I end up with the following
+	exception :<BR></I><FONT COLOR="#ff0000"><FONT FACE="Monospace"><FONT SIZE=2><I>Exception
+	in thread &quot;main&quot; java.lang.UnsatisfiedLinkError: no
+	lttvtraceread in java.library.path</I></FONT></FONT></FONT></FONT></P>
+	<P STYLE="margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">This
+	basically mean that Java can not find the C library you just
+	compile. To find any C library, java would normally need to be
+	passed a flag like “-Djava.library.path=/somewhere/lib” but
+	there seems to be a bug in Eclipse about it, as defined here :
+	<A HREF="https://bugs.eclipse.org/bugs/show_bug.cgi?id=290068">https://bugs.eclipse.org/bugs/show_bug.cgi?id=290068</A></FONT></P>
+	<P STYLE="margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">Therefore,
+	the workaround is to make sure to pass a correct LD_LIBRARY_PATH to
+	Eclipse (see section above about “<I>Set library path</I>”). The
+	best way to make sure the flag is corerctly passed is to add it in
+	front of the command that is called to start Eclipse, on the command
+	line or in the desktop shortcut itself. </FONT>
+	</P>
+	<P STYLE="margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">As
+	example, here is the shortcut I use to call Eclipse :</FONT></P>
+	<P STYLE="margin-bottom: 0.3cm"><FONT FACE="Arial, sans-serif"><FONT SIZE=2><I>export
+	LD_LIBRARY_PATH=&quot;/usr/local/lib&quot;;
+	/usr/local/eclipse/eclipse</I></FONT></FONT></P>
+</OL>
+<P STYLE="margin-bottom: 0.3cm"><BR><BR>
+</P>
+<OL START=4>
+	<LI><P STYLE="margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">I
+	did what you said in 1) but I'm still getting the same error
+	<I>:<BR></I><FONT COLOR="#ff0000"><FONT FACE="Monospace"><FONT SIZE=2><I>Exception
+	in thread &quot;main&quot; java.lang.UnsatisfiedLinkError: no
+	lttvtraceread in java.library.path</I></FONT></FONT></FONT></FONT></P>
+	<P STYLE="margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">If
+	your LD_LIBRARY_PATH is correct, then the only reason why you might
+	get this error is that you did not compile the JNI interface inside
+	LTTv. <BR>Go back to “<I>Installation steps</I>” and make sure
+	you used the development version of LTTv and that you compiled it
+	with the --<I>with-jni-interface</I> <SPAN STYLE="font-style: normal">flag</SPAN>.</FONT></P>
+</OL>
+<P STYLE="margin-bottom: 0.21cm"><BR><BR>
+</P>
+<OL START=5>
+	<LI><P STYLE="margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">When
+	I run LTTng in Eclipse, at some point, I am getting an error like
+	this :</FONT></P>
+	<P STYLE="margin-bottom: 0cm"><FONT COLOR="#ff0000"><FONT FACE="Monospace"><FONT SIZE=2><I>Exception
+	in thread &quot;main&quot; java.lang.Error: Unresolved compilation
+	problem: </I></FONT></FONT></FONT>
+	</P>
+</OL>
+<P ALIGN=LEFT STYLE="margin-left: 1.3cm; margin-bottom: 0cm"><FONT COLOR="#ff0000"><FONT FACE="Monospace"><FONT SIZE=2><I>The
+method ltt_someFunction() is undefined for the type JniXYZ</I></FONT></FONT></FONT></P>
+<OL START=6>
+	<P STYLE="margin-bottom: 0.21cm"><FONT FACE="Nimbus Roman No9 L, serif">This
+	may happen if the LTTv version you are using is not recent enought.
+	Make sure you are using the latest development version, recompile
+	the latest one if needed. If this doesn't work, make sure you use
+	the “Beta” JNI Build, as described in “<I>Download</I>”
+	section. If nothing work, please submit a bug report. </FONT>
+	</P>
+</OL>
+<P STYLE="margin-bottom: 0.21cm"><BR><BR>
+</P>
+</BODY>
+</HTML>
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/gettingstarted/samples.html b/lttng/org.eclipse.linuxtools.lttng.help/html/gettingstarted/samples.html
new file mode 100644
index 0000000..2a8442a
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/gettingstarted/samples.html
@@ -0,0 +1,57 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=iso-8859-1">
+	<TITLE>Main Topic</TITLE>
+	<META NAME="GENERATOR" CONTENT="OpenOffice.org 3.1  (Linux)">
+	<META NAME="CREATED" CONTENT="0;0">
+	<META NAME="CHANGED" CONTENT="20091008;17334500">
+</HEAD>
+<BODY LANG="en-CA" DIR="LTR">
+<H1>Samples</H1>
+<P>The following LTTng traces are provided as reference examples. 
+</P>
+<P>Each trace as its own feature and complexity. The size given
+refers to the size of the trace once "untarred", the actual tar size
+should be around 10 times smaller. 
+</P>
+<UL>
+	<LI><P STYLE="margin-bottom: 0cm"><A HREF="http://dev.eclipse.org/viewsvn/index.cgi/lttng/trunk/org.eclipse.linuxtools.lttng.tests/traceset/trace-1021events-nolost-1cpu.tar.gz?root=Technology_LINUXTOOLS&view=co">trace-1021events-nolost-1cpu
+	(2.1MB)</A> 
+	</P>
+	<P STYLE="margin-bottom: 0cm">Very small trace made from a single
+	marker. Recorded under a VirtualBox system with 1 processor.</P>
+	<P STYLE="margin-bottom: 0cm"></P>
+	<LI><P STYLE="margin-bottom: 0cm"><A HREF="http://dev.eclipse.org/viewsvn/index.cgi/lttng/trunk/org.eclipse.linuxtools.lttng.tests/traceset/trace-399747events-nolost-1cpu.tar.gz?root=Technology_LINUXTOOLS&view=co">trace-399747events-nolost-1cpu
+	(28MB)</A> 
+	</P>
+	<P STYLE="margin-bottom: 0cm">Trace of several markers, that has no
+	lost event. Recorded under VirtualBox with 1 processor.</P>
+	<P STYLE="margin-bottom: 0cm"></P>
+	<LI><P STYLE="margin-bottom: 0cm"><A HREF="http://dev.eclipse.org/viewsvn/index.cgi/lttng/trunk/org.eclipse.linuxtools.lttng.tests/traceset/trace-618339events-1293lost-1cpu.tar.gz?root=Technology_LINUXTOOLS&view=co">trace-618339events-1293lost-1cpu
+	(11MB)</A></P>
+	<P STYLE="margin-bottom: 0cm">Trace of several markers, with some
+	lost events. Recorded under VirtualBox with 1 processor.</P>
+	<P STYLE="margin-bottom: 0cm"></P>
+	<LI><P STYLE="margin-bottom: 0cm"><A HREF="http://dev.eclipse.org/viewsvn/index.cgi/lttng/trunk/org.eclipse.linuxtools.lttng.tests/traceset/trace-698650events_3029lost-8CPU.tar.gz?root=Technology_LINUXTOOLS&view=co">trace-698650events_3029lost-8CPU
+	(41MB)</A> <FONT COLOR="#ff0000"><B>(Multi-cpu is currently
+	experimental)</B></FONT></P>
+	<P STYLE="margin-bottom: 0cm">Trace of several markers, with some
+	lost events. Recorded on a native system with 8 processors.</P>
+</UL>
+<P STYLE="margin-bottom: 0cm"><BR>
+</P>
+<P STYLE="margin-bottom: 0cm">The smaller is the trace, the faster it
+will load in Eclipse. All traces should load correctly, but only the
+first one and the third one were extensively tested. 
+</P>
+<P STYLE="margin-bottom: 0cm">Note that recording of a new trace
+directly in Eclipse is currently work under progress. If you would
+like to record your own trace, you need to install LTTng kernel
+patches and LTTv application. 
+</P>
+<P STYLE="margin-bottom: 0cm">You can get more information about that
+at <A HREF="http://www.lttng.org/">http://www.lttng.org</A>. 
+</P>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/gettingstarted/starting.html b/lttng/org.eclipse.linuxtools.lttng.help/html/gettingstarted/starting.html
new file mode 100644
index 0000000..81d3ff8
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/gettingstarted/starting.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Getting Started</title>
+</head>
+
+<body>
+<h1>Getting Started</h1>
+<p>The following steps will help you start the analysis of an LTTng example trace</p>
+
+<ol>
+	<li>See introduction to <a href="lttng.html">LTTng </a> under the
+	concepts section.</li>
+	<li>Obtain LTTng traces to the file system <br>
+	Link References to Examples are available from section <a href="samples.html">Samples</a></li>
+	<li>Open the <a href="../concepts/lttng.html">LTTng
+	perspective</a> from the Eclipse menu <br>
+	Windows -> Open <a href="../concepts/perspective.html">Perspective</a>
+	-> Other -> LTTng</li>
+	<li>Add a New LTTng Project<br>
+	Right click from the Project View</li>
+	<li>Import LTTng traces from the file system to the LTTng project<br>
+	Right click on the Traces folder and select the location</li>
+	<li>Add a new <a href="../concepts/experiment.html">Experiment</a><br>
+	Right click on the Experiments Folder</li>
+	<li>Add Traces to the Experiment<br>
+	Right click on an Experiment folder</li>
+	<li>Populate the LTTng views with the Experiment data<br>
+	Double click on an Experiment folder</li>
+</ol>
+
+<br> <img alt="Lttng in Eclipse" src="../images/lttngEclipse1.png">
+</body>
+</html>
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/gettingstarted/toc_gettingStarted.html b/lttng/org.eclipse.linuxtools.lttng.help/html/gettingstarted/toc_gettingStarted.html
new file mode 100644
index 0000000..e9e121a
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/gettingstarted/toc_gettingStarted.html
@@ -0,0 +1,17 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Getting Started</title>
+</head>
+
+<body>
+<h1>Getting Started</h1>
+<ul>
+	<li><a href="starting.html">General</a></li>
+	<li><a href="samples.html">Samples</a></li>
+	<li><a href="install_lttng.html">Installing the LTTng parsing library</a></li>
+</ul>
+</body>
+</html>
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/images/controlFlowView.png b/lttng/org.eclipse.linuxtools.lttng.help/html/images/controlFlowView.png
new file mode 100644
index 0000000..df76a26
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/images/controlFlowView.png
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/images/controlFlowView2.png b/lttng/org.eclipse.linuxtools.lttng.help/html/images/controlFlowView2.png
new file mode 100644
index 0000000..348a893
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/images/controlFlowView2.png
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/images/controlFlowView3.png b/lttng/org.eclipse.linuxtools.lttng.help/html/images/controlFlowView3.png
new file mode 100644
index 0000000..6ab23d6
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/images/controlFlowView3.png
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/images/controlFlowViewTooltip.png b/lttng/org.eclipse.linuxtools.lttng.help/html/images/controlFlowViewTooltip.png
new file mode 100644
index 0000000..167e1e3
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/images/controlFlowViewTooltip.png
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/images/eventsView.png b/lttng/org.eclipse.linuxtools.lttng.help/html/images/eventsView.png
new file mode 100644
index 0000000..4c3f00a
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/images/eventsView.png
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/images/eventsView1.png b/lttng/org.eclipse.linuxtools.lttng.help/html/images/eventsView1.png
new file mode 100644
index 0000000..3a36490
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/images/eventsView1.png
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/images/eventsView2.png b/lttng/org.eclipse.linuxtools.lttng.help/html/images/eventsView2.png
new file mode 100644
index 0000000..91bc479
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/images/eventsView2.png
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/images/garland_logo.png b/lttng/org.eclipse.linuxtools.lttng.help/html/images/garland_logo.png
new file mode 100644
index 0000000..4be116a
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/images/garland_logo.png
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/images/importTraces.png b/lttng/org.eclipse.linuxtools.lttng.help/html/images/importTraces.png
new file mode 100644
index 0000000..ec572f9
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/images/importTraces.png
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/images/lttngEclipse1.png b/lttng/org.eclipse.linuxtools.lttng.help/html/images/lttngEclipse1.png
new file mode 100644
index 0000000..cff3fff
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/images/lttngEclipse1.png
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/images/lttngEclipse2.png b/lttng/org.eclipse.linuxtools.lttng.help/html/images/lttngEclipse2.png
new file mode 100644
index 0000000..cff3fff
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/images/lttngEclipse2.png
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/images/perspective.png b/lttng/org.eclipse.linuxtools.lttng.help/html/images/perspective.png
new file mode 100644
index 0000000..41235f8
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/images/perspective.png
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/images/projectView.png b/lttng/org.eclipse.linuxtools.lttng.help/html/images/projectView.png
new file mode 100644
index 0000000..93fc313
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/images/projectView.png
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/images/resourcesTooltip.png b/lttng/org.eclipse.linuxtools.lttng.help/html/images/resourcesTooltip.png
new file mode 100644
index 0000000..355f4c2
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/images/resourcesTooltip.png
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/images/resourcesView1.png b/lttng/org.eclipse.linuxtools.lttng.help/html/images/resourcesView1.png
new file mode 100644
index 0000000..735a4e2
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/images/resourcesView1.png
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/images/resourcesView2.png b/lttng/org.eclipse.linuxtools.lttng.help/html/images/resourcesView2.png
new file mode 100644
index 0000000..740a282
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/images/resourcesView2.png
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/images/resourcesView3.png b/lttng/org.eclipse.linuxtools.lttng.help/html/images/resourcesView3.png
new file mode 100644
index 0000000..a63379a
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/images/resourcesView3.png
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/images/selectTraces.png b/lttng/org.eclipse.linuxtools.lttng.help/html/images/selectTraces.png
new file mode 100644
index 0000000..88e16cc
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/images/selectTraces.png
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/images/statistics1.png b/lttng/org.eclipse.linuxtools.lttng.help/html/images/statistics1.png
new file mode 100644
index 0000000..d7fca49
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/images/statistics1.png
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/images/timeFrameView.png b/lttng/org.eclipse.linuxtools.lttng.help/html/images/timeFrameView.png
new file mode 100644
index 0000000..fc0bb81
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/images/timeFrameView.png
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/images/timeFrameView1.png b/lttng/org.eclipse.linuxtools.lttng.help/html/images/timeFrameView1.png
new file mode 100644
index 0000000..f967ed4
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/images/timeFrameView1.png
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/images/timeFrameView2.png b/lttng/org.eclipse.linuxtools.lttng.help/html/images/timeFrameView2.png
new file mode 100644
index 0000000..eda4b10
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/images/timeFrameView2.png
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/limitations/limitations.html b/lttng/org.eclipse.linuxtools.lttng.help/html/limitations/limitations.html
new file mode 100644
index 0000000..8edbadd
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/limitations/limitations.html
@@ -0,0 +1,136 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=iso-8859-1">
+	<TITLE>Limitations</TITLE>
+	<META NAME="GENERATOR" CONTENT="OpenOffice.org 3.1  (Linux)">
+	<META NAME="CREATED" CONTENT="0;0">
+	<META NAME="CHANGED" CONTENT="20091008;18193600">
+</HEAD>
+<BODY LANG="en-CA" DIR="LTR">
+<H1>Limitations</H1>
+<P>The current implementation is still under heavy development and
+some important features are still missing.<BR>Here is a list of the
+known bugs and missing features that are worked on.</P>
+<UL>
+	<LI><P STYLE="margin-bottom: 0cm"><B>Thread issues affect
+	performance</B></P>
+	<P STYLE="margin-bottom: 0cm; font-weight: normal">The multi-thread
+	access to the traces is mostly turned off for now so the user might
+	experiment a very long load time when opening a trace and/or
+	zooming. Of course, this is especially true for big trace.</P>
+	<P STYLE="margin-bottom: 0cm"><SPAN STYLE="font-weight: normal">In
+	the future, the traces with be opened and indexed asynchronously,
+	with the result of greatly improved performance.</SPAN></P>
+</UL>
+<P STYLE="margin-bottom: 0cm"><BR>
+</P>
+<UL>
+	<LI><P STYLE="margin-bottom: 0cm"><B>No support for individual traces</B></P>
+	<P STYLE="margin-bottom: 0cm">The code for loading and parsing an individual
+	trace (not part of an experiment) is currently disabled. As a workaround,
+	just create an experiment with the single trace you want to analyze.
+	</P>
+</UL>
+<P STYLE="margin-bottom: 0cm"><BR>
+</P>
+<UL>
+	<LI><P STYLE="margin-bottom: 0cm"><B>One trace per experiment is
+	currently supported</B></P>
+	<P STYLE="margin-bottom: 0cm">Work to be able to merge and index
+	several traces into a single experiment have not being completed
+	yet. 
+	</P>
+	<P STYLE="margin-bottom: 0cm">In the future, it will be possible to
+	process several traces at once and to compare them in the views.</P>
+</UL>
+<P STYLE="margin-bottom: 0cm"><BR>
+</P>
+<UL>
+    <LI><P STYLE="margin-bottom: 0cm"><B>Time Frame View</B></P>
+    <P STYLE="margin-bottom: 0cm">In some cases, the End Time of the Time
+    Frame view is not set correctly (symptom: the nanoseconds are identical
+    to the Start Time nanoseconds and the Interval nanoseconds = 0).
+    <P STYLE="margin-bottom: 0cm">
+    To set it properly, just spin up the End Time seconds field.
+</UL>
+<P STYLE="margin-bottom: 0cm"><BR>
+</P>
+<UL>
+	<LI><P STYLE="margin-bottom: 0cm"><B>Simultaneous data requests</B></P>
+	<P STYLE="margin-bottom: 0cm">All views are currently working on a
+	standalone basis. Therefore, time selection synchronization among
+	views does not trigger simultaneous data requests, which heavily
+	hurts the performance of the application. 
+	</P>
+	<P STYLE="margin-bottom: 0cm">In the future, data request will be
+	centralized in the application, resulting in better response time in
+	and between views.</P>
+</UL>
+<P STYLE="margin-bottom: 0cm"><BR>
+</P>
+<UL>
+	<LI><P STYLE="margin-bottom: 0cm"><B>No trace recording capability
+	in Eclipse yet</B></P>
+	<P STYLE="margin-bottom: 0cm">It is not currently possible to record
+	a new trace directly in Eclipse, an user that would like to record a
+	new trace would need to use external tools, like LTTv.</P>
+	<P STYLE="margin-bottom: 0cm">In the future, a &ldquo;Control view&rdquo;
+	will be provided for the user to allow him to easily a new trace
+	inside Eclipse. It should also be possible to start the recording on
+	a remote host from that view.</P>
+</UL>
+<P STYLE="margin-bottom: 0cm"><BR>
+</P>
+<UL>
+	<LI><P STYLE="margin-bottom: 0cm"><B>Experimental Multi-CPU support</B></P>
+	<P STYLE="margin-bottom: 0cm">Although working, some more work need
+	to be done on trace that handle multiple processors. It is reputed
+	to work already but this feature is mostly untested for now.</P>
+	<P STYLE="margin-bottom: 0cm">In the future, multi-CPU should be
+	supported and work as well as uni-CPU traces.</P>
+</UL>
+<P STYLE="margin-bottom: 0cm"><BR>
+</P>
+<UL>
+	<LI><P STYLE="margin-bottom: 0cm"><B>Experimental 64 bits and/or non
+	x86 architecture implementation</B></P>
+	<P STYLE="margin-bottom: 0cm">The code used to read and parse files
+	have not been extensively tested on 64 bits and was not tested at
+	all on architecture different than x86 computer. The code is
+	believed to work on a broad horizon of architecture but this cannot
+	be certified for now.</P>
+	<P STYLE="margin-bottom: 0cm">In the future, all x86 (32 and 64
+	bits) as well as all PPC (32 and 64 bits) should work and possibly
+	some (all?) models of SPARC. 
+	</P>
+</UL>
+<P STYLE="margin-bottom: 0cm"><BR>
+</P>
+<UL>
+	<LI><P STYLE="margin-bottom: 0cm"><B>Missing filters and ordering on
+	all views</B></P>
+	<P STYLE="margin-bottom: 0cm">There is currently no way to filter
+	events following some criteria or to dynamically sort the different
+	fields. 
+	</P>
+	<P STYLE="margin-bottom: 0cm">In the future, both should be
+	implemented. 
+	</P>
+</UL>
+<P STYLE="margin-bottom: 0cm"><BR>
+</P>
+<UL>
+	<LI><P STYLE="margin-bottom: 0cm"><B>Some views missing and/or need
+	more work</B></P>
+	<P>Some more views (&ldquo;Control&rdquo;, &ldquo;Histogram&rdquo;,
+	etc...) are currently missing but planned in the Eclipse
+	implementation and some others (&ldquo;Statistics&rdquo;) are
+	working but need more work to be brought were they need to be.<BR>In
+	the future, all views provided by LTTv will be supported in Eclipse
+	and more!</P>
+</UL>
+<P><BR><BR>
+</P>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/limitations/toc_limitations.html b/lttng/org.eclipse.linuxtools.lttng.help/html/limitations/toc_limitations.html
new file mode 100644
index 0000000..39ab9ef
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/limitations/toc_limitations.html
@@ -0,0 +1,15 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>Limitations</title>
+</head>
+
+<body>
+<h1>Limitations</h1>
+<ul>
+	<li><a href="limitations.html"> Limitations</a></li>
+</ul>
+</body>
+</html>
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/reference/references.html b/lttng/org.eclipse.linuxtools.lttng.help/html/reference/references.html
new file mode 100644
index 0000000..b8b30cb
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/reference/references.html
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=iso-8859-1">
+	<TITLE>References</TITLE>
+	<META NAME="GENERATOR" CONTENT="OpenOffice.org 3.1  (Linux)">
+	<META NAME="CREATED" CONTENT="0;0">
+	<META NAME="CHANGED" CONTENT="20091008;18210200">
+</HEAD>
+<BODY LANG="en-CA" DIR="LTR">
+<H1>References</H1>
+<UL>
+	<LI><A HREF="http://www.eclipse.org/linuxtools/projectPages/lttng/">Linux
+	Tools Project - LTTng Integration</A></LI>
+
+	<LI><A HREF="http://www.lttng.org/">LTTng
+	Project</A></LI>
+	
+	<LI><A HREF="http://lttng.org/cgi-bin/gitweb.cgi?p=lttv.git;a=blob_plain;f=LTTngManual.html">LTTng
+	Manual</A> </LI>
+
+</UL>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/reference/toc_reference.html b/lttng/org.eclipse.linuxtools.lttng.help/html/reference/toc_reference.html
new file mode 100644
index 0000000..621428c
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/reference/toc_reference.html
@@ -0,0 +1,15 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Reference</title>
+</head>
+
+<body>
+<h1>Reference</h1>
+<ul>
+	<li><a href="references.html"> References</a></li>
+</ul>
+</body>
+</html>
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/html/toc.html b/lttng/org.eclipse.linuxtools.lttng.help/html/toc.html
new file mode 100644
index 0000000..b182144
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/html/toc.html
@@ -0,0 +1,58 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Table of Contents</title>
+</head>
+
+<body>
+<h1>Table of Contents</h1>
+<ul>
+	<li><a href="concepts/toc_concepts.html"> Concepts</a>
+	<ul>
+		<li><a href="concepts/toc_general.html"> General </a>
+		<ul>
+			<li><a href="concepts/lttng.html"> LTTng</a></li>
+			<li><a href="concepts/lttv.html"> LTTv</a></li>
+			<li><a href="concepts/trace.html">Trace</a></li>
+            <li><a href="concepts/experiment.html">Experiment</a></li>
+		</ul>
+		</li>
+		<li><a href="concepts/toc_userInterface.html"> User Interface </a>
+		<ul>
+			<li><a href="concepts/perspective.html"> Perspective</a></li>
+			<li><a href="concepts/projectView.html"> Project View</a></li>
+			<li><a href="concepts/eventsView.html"> Events View</a></li>
+			<li><a href="concepts/timeFrameView.html"> Time Frame View</a></li>
+			<li><a href="concepts/controlFlowView.html"> Control Flow
+			View</a></li>
+			<li><a href="concepts/resourcesView.html"> Resources View</a></li>
+			<li><a href="concepts/statisticsView.html"> Statistics View</a></li>
+		</ul>
+		</li>
+	</ul>
+	
+	</li>
+	<li><a href="gettingstarted/toc_gettingStarted.html"> Getting Started</a>
+	<ul>
+		<li><a href="gettingstarted/starting.html"> General</a></li>
+		<li><a href="gettingstarted/samples.html"> Samples</a></li>
+		<li><a href="gettingstarted/install_lttng.html">Installing the LTTng parsing library</a></li>
+	</ul>
+	</li>
+
+	<li><a href="limitations/toc_limitations.html"> Limitations </a>
+	<ul>
+		<li><a href="limitations/limitations.html"> Limitations</a></li>
+	</ul>
+	</li>
+
+	<li><a href="reference/toc_reference.html"> Reference </a>
+	<ul>
+		<li><a href="reference/references.html"> References</a></li>
+	</ul>
+	</li>
+</ul>
+</body>
+</html>
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/plugin.properties b/lttng/org.eclipse.linuxtools.lttng.help/plugin.properties
new file mode 100644
index 0000000..222d8ee
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/plugin.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.linuxtools.lttng.help
+Bundle-Vendor = Eclipse
+Bundle-Name = Linux Tracing Toolkit (LTTng) Help (Incubation)
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/plugin.xml b/lttng/org.eclipse.linuxtools.lttng.help/plugin.xml
new file mode 100644
index 0000000..32c88bf
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/plugin.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+   <extension
+         point="org.eclipse.help.toc">
+      <toc
+            file="toc.xml"
+            primary="true">
+      </toc>
+      <toc
+            file="tocconcepts.xml">
+      </toc>
+      <toc
+            file="tocgettingstarted.xml">
+      </toc>
+      <toc
+            file="tocreference.xml">
+      </toc>
+      <toc
+            file="toclimitations.xml">
+      </toc>
+   </extension>
+
+</plugin>
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/toc.xml b/lttng/org.eclipse.linuxtools.lttng.help/toc.xml
new file mode 100644
index 0000000..f9ab61c
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/toc.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="LTTng User Guide" topic="html/toc.html">
+   <topic label="Concepts">
+      <anchor id="concepts"/>
+   </topic>
+   <topic label="Getting Started">
+      <anchor id="gettingstarted"/>
+   </topic>
+   <topic label="Limitations">
+      <anchor id="limitations"/>
+   </topic>
+   <topic label="Reference">
+      <anchor id="reference"/>
+   </topic>
+</toc>
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/tocconcepts.xml b/lttng/org.eclipse.linuxtools.lttng.help/tocconcepts.xml
new file mode 100644
index 0000000..843fe9b
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/tocconcepts.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="Concepts" link_to="toc.xml#concepts"> 
+	<topic label="General"> 
+		<topic label="LTTng" href="html/concepts/lttng.html" />
+		<topic label="LTTv" href="html/concepts/lttv.html" /> 
+        <topic label="Trace" href="html/concepts/trace.html" /> 
+        <topic label="Experiment" href="html/concepts/experiment.html" /> 
+	</topic>
+	<topic label="User Interface">
+		<topic label="Perspective" href="html/concepts/perspective.html" /> 
+		<topic label="Project View" href="html/concepts/projectView.html" /> 
+		<topic label="Events View" href="html/concepts/eventsView.html" /> 
+		<topic label="Time Frame View" href="html/concepts/timeFrameView.html" /> 
+		<topic label="Control Flow View" href="html/concepts/controlFlowView.html" /> 
+		<topic label="Resources View" href="html/concepts/resourcesView.html" /> 
+		<topic label="Statistics View" href="html/concepts/statisticsView.html" /> 
+	</topic> 
+</toc>
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/tocgettingstarted.xml b/lttng/org.eclipse.linuxtools.lttng.help/tocgettingstarted.xml
new file mode 100644
index 0000000..2a9dad7
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/tocgettingstarted.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="Getting Started" link_to="toc.xml#gettingstarted"> 
+		<topic label="General" href="html/gettingstarted/starting.html" /> 
+		<topic label="Samples" href="html/gettingstarted/samples.html" /> 
+</toc>
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/toclimitations.xml b/lttng/org.eclipse.linuxtools.lttng.help/toclimitations.xml
new file mode 100644
index 0000000..cfc6d29
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/toclimitations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="Limitations" link_to="toc.xml#limitations"> 
+		<topic label="Limitations" href="html/limitations/limitations.html" /> 
+</toc>
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/tocreference.xml b/lttng/org.eclipse.linuxtools.lttng.help/tocreference.xml
new file mode 100644
index 0000000..f0bffa1
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/tocreference.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="Reference" link_to="toc.xml#reference"> 
+		<topic label="References" href="html/reference/references.html" /> 
+</toc>
diff --git a/profiling/.classpath b/lttng/org.eclipse.linuxtools.lttng.jni/.classpath
similarity index 100%
copy from profiling/.classpath
copy to lttng/org.eclipse.linuxtools.lttng.jni/.classpath
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/.project b/lttng/org.eclipse.linuxtools.lttng.jni/.project
new file mode 100644
index 0000000..7d476a5
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.lttng.jni</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng.jni/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..34c5ae0
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/META-INF/MANIFEST.MF
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.linuxtools.lttng.jni
+Bundle-Version: 0.2.0.qualifier
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.eclipse.linuxtools.lttng.jni,
+ org.eclipse.linuxtools.lttng.jni.common,
+ org.eclipse.linuxtools.lttng.jni.exception,
+ org.eclipse.linuxtools.lttng.jni.factory,
+ org.eclipse.linuxtools.lttng.jni_v2_3,
+ org.eclipse.linuxtools.lttng.jni_v2_5
+Bundle-Localization: plugin
+Bundle-Vendor: %Bundle-Vendor
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/build.properties b/lttng/org.eclipse.linuxtools.lttng.jni/build.properties
new file mode 100644
index 0000000..aa1a008
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/build.properties
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.properties
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/plugin.properties b/lttng/org.eclipse.linuxtools.lttng.jni/plugin.properties
new file mode 100644
index 0000000..323733c
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/plugin.properties
@@ -0,0 +1,2 @@
+Bundle-Vendor = Eclipse
+Bundle-Name = JNI implementation for LTTng (Incubation)
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniEvent.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniEvent.java
new file mode 100644
index 0000000..5a84e4f
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniEvent.java
@@ -0,0 +1,471 @@
+package org.eclipse.linuxtools.lttng.jni;
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   William Bourque (wbourque@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+
+import java.util.HashMap;
+
+import org.eclipse.linuxtools.lttng.jni.common.JniTime;
+import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer;
+import org.eclipse.linuxtools.lttng.jni.exception.JniEventException;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+import org.eclipse.linuxtools.lttng.jni.exception.JniNoSuchEventException;
+
+/**
+ * <b><u>JniEvent</u></b> <p>
+ * 
+ * A JniEvent has the actual content that got traced by Lttng.<br>
+ * Provides access to the LttEvent C structure in java. <p>
+ * 
+ * Most important fields in the JniEvent are :
+ * <ul>
+ * <li>an event time, which is a digested timestamp.
+ * </ul>
+ * Note that the JniEvent content is not directly accessibe and should be obtained
+ * using the parseAllFields() or parseFieldBy...() methods.
+ */
+public abstract class JniEvent extends Jni_C_Common implements Comparable<JniEvent> {
+    // Variables to detect if the event have been filled at least once
+    // this make possible the detection of "uninitialized" struct in Ltt
+    // Can be "EOK", "ERANGE" or "EPERM" (defined in Jaf_C_Common)
+    private int eventState = EPERM; // Start with EPERM to ensure sanity
+
+    // Internal C pointer of the JniEvent used in LTT
+    private Jni_C_Pointer thisEventPtr = new Jni_C_Pointer();
+
+    // Reference to the parent tracefile
+    private JniTracefile parentTracefile = null;
+
+    // This map hold marker relative to the parent tracefile of this event
+    // They are "our" marker in this event
+    private HashMap<Integer, JniMarker> markersMap = null;
+
+    // Data we should populate from ltt
+    // Note that all type have been scaled up as there is no "unsigned" in java
+    // This might be a problem about "unsigned long" as there is no equivalent
+    // in java
+    private Jni_C_Pointer tracefilePtr = new Jni_C_Pointer();
+    private JniTime eventTime = null;
+
+    // These methods need a tracefile pointer, instead of a event pointer
+    protected native int      ltt_readNextEvent(long tracefilePtr);
+    protected native int      ltt_seekEvent(long tracefilePtr, JniTime givenTime);
+    protected native int      ltt_positionToFirstEvent(long tracefilePtr);
+        
+    // Native access functions
+    protected native long     ltt_getTracefilePtr(long eventPtr);
+    protected native long     ltt_getBlock(long eventPtr);
+    protected native long     ltt_getOffset(long eventPtr);
+    protected native long     ltt_getCurrentTimestampCounter(long eventPtr);
+    protected native long     ltt_getTimestamp(long eventPtr);
+    protected native int      ltt_getEventMarkerId(long eventPtr);
+    protected native long     ltt_getNanosencondsTime(long eventPtr);
+    protected native void     ltt_feedEventTime(long eventPtr, JniTime eventTime);
+    protected native long     ltt_getEventDataSize(long eventPtr);
+    protected native long     ltt_getEventSize(long eventPtr);
+    protected native int      ltt_getCount(long eventPtr);
+    protected native long     ltt_getOverflowNanoSeconds(long eventPtr);
+        
+    // This method an event pointer
+    protected native void     ltt_getDataContent(long eventPtr, long dataSize, byte[] returnedContent);
+        
+    // Debug native function, ask LTT to print event structure
+    protected native void     ltt_printEvent(long eventPtr);
+    
+    /**
+     * Default constructor is forbidden
+     */
+    protected JniEvent() {
+    }
+
+    /**
+     * Copy constructor.<p>
+     * 
+     * @param oldEvent      Reference to the JniEvent you want to copy. 
+     */
+    public JniEvent(JniEvent oldEvent) {
+        thisEventPtr = oldEvent.thisEventPtr;
+        markersMap = oldEvent.markersMap;
+        parentTracefile = oldEvent.parentTracefile;
+        eventState = oldEvent.eventState;
+
+        tracefilePtr = oldEvent.tracefilePtr;
+        eventTime = oldEvent.eventTime;
+    }
+    
+    /**
+     * Constructor with parameters<p>
+     * 
+     * This constructor could throw. It will happen if an event can not be populated on <u>first read</u>.<br>
+     * In that case, the parent tracefile is probably useless and should be deleted.
+     * 
+     * @param newEventPtr         C pointer (converted in long) of the LttEvent C structure.
+     * @param newMarkersMap       Reference an already populated HashMap of JniMarker objects 
+     * @param newParentTracefile  Reference to the parent JniTracefile of this JniEvent
+     *            
+     * @exception JniException
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer
+     * @see org.eclipse.linuxtools.lttng.jni.JniMarker
+     * @see org.eclipse.linuxtools.lttng.jni.JniTracefile
+     */
+    public JniEvent(Jni_C_Pointer newEventPtr, HashMap<Integer, JniMarker> newMarkersMap, JniTracefile newParentTracefile) throws JniException {
+
+        // Basic test to make sure we didn't get null/empty value 
+        if ((newEventPtr.getPointer() == NULL)
+                || (newMarkersMap == null) 
+                || (newMarkersMap.size() == 0)
+                || (newParentTracefile == null)) {
+            throw new JniEventException("Null or empty value passed to constructor, object is invalid! (JniEvent)");
+        }
+        
+        thisEventPtr = newEventPtr;
+        tracefilePtr = newParentTracefile.getTracefilePtr();
+        markersMap = newMarkersMap;
+        parentTracefile = newParentTracefile;
+
+        eventTime = new JniTime();
+        
+        // Try to move to the first event
+        // If the event is Out of Range (ERANGE) at the first read, 
+        //  this event type will never be usable.
+        // In that case, throw JniNoSuchEventException to warn the tracefile.
+        eventState = positionToFirstEvent();
+        if (eventState != EOK)  {
+            throw new JniNoSuchEventException("Object not populated, unusable. There is probably no event of that type in the trace. (JniEvent)");
+        }
+        else {
+            populateEventInformation();
+        }
+    }
+
+    /**
+     * Move to the next event and populate the java object with LttEvent structure.<p>
+     * 
+     * If the move fails, the event will not get populated and the last event data will still be available.
+     * 
+     * @return LTT read status, as defined in Jni_C_Constant.
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Constant
+     */
+     public int readNextEvent() {
+        // Ask Ltt to read the next event for this particular tracefile
+        eventState = ltt_readNextEvent( tracefilePtr.getPointer() );
+        // If the event state is sane populate it
+        if (eventState == EOK) {
+            populateEventInformation();
+        }
+        
+        return eventState;
+    }
+
+    /**
+     * Seek to a certain time.<p>
+     * 
+     * Seek to a certain time and read event at this exact time or the next one if there is no event there.<p>
+     * 
+     * Note that this function can seek in an invalid position if the timestamp is after the last event.<br>
+     * In that case, a seek back would be required to get back to a consistent state.<p>
+     * 
+     * If the seek fails, the event will not get populated and the last event data will still be available.<p>
+     * 
+     * @return LTT read status, as defined in Jni_C_Constant
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Constant
+     */
+    public int seekToTime(JniTime seekTime) {
+        // Ask Ltt to read the next event for this particular tracefile
+        eventState = ltt_seekEvent(tracefilePtr.getPointer(), seekTime);
+
+        // If the event state is sane populate it
+        if (eventState == EOK) {
+            populateEventInformation();
+        }
+
+        return eventState;
+    }
+
+    /**
+     * Try to seek to a certain time and seek back if it failed.<p>
+     * 
+     * Seek to a certain time and read event at this exact time or the next one if there is no event there.<p>
+     * 
+     * If the seek fails, we will seek back to the previous position, so the event will stay in a consistent state.<p> 
+     * 
+     * @return LTT read status, as defined in Jni_C_Constant
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Constant
+     */
+    public int seekOrFallBack(JniTime seekTime) {
+        // Save the old time
+        JniTime oldTime = new JniTime(eventTime);
+
+        // Call seek to move ahead
+        // Save the state for the return (eventState will be modified if we seek back)
+        int returnState = seekToTime(seekTime);
+
+        // If the event state is sane populate it
+        if (returnState == EOK) {
+            populateEventInformation();
+        }
+        else {
+            seekToTime(oldTime);
+        }
+
+        return returnState;
+    }
+
+    /**
+     * Position on the first event in the tracefile.<p>
+     * 
+     * The function return the read status after the first event.<p>
+     * 
+     * A status different of EOK probably means there is no event associated to this tracefile.
+     * 
+     * @return LTT read status, as defined in Jni_C_Constant
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Constant
+     */
+    public int positionToFirstEvent() {
+        eventState = ltt_positionToFirstEvent(tracefilePtr.getPointer());
+        
+        return eventState;
+    }
+    
+    /**
+     * Obtain a marker associated with this tracefile's event.
+     * 
+     * @return Reference to the marker for this tracefile's event or null if none.
+     *  
+     * @see org.eclipse.linuxtools.lttng.jni.JniMarker
+     */
+    public JniMarker requestEventMarker() {
+        return markersMap.get(getEventMarkerId());
+    }
+
+    /**
+     * Obtain the raw data of a LttEvent object.<p>
+     * 
+     * The data will be in raw C bytes, not java bytes.<br>
+     * Note : This function is mostly untested and provided "as is".
+     * 
+     * @return  Bytes array of raw data (contain raw C bytes).
+     */
+    public byte[] requestEventContent() {
+        byte dataContent[] = new byte[(int) getEventDataSize()];
+
+        ltt_getDataContent(thisEventPtr.getPointer(), getEventDataSize(), dataContent);
+
+        return dataContent;
+    }
+    
+    /**
+     * Obtain an event source.<p>
+     * 
+     * This is not implemented yet and will always return "Kernel core" for now.
+     * 
+     * @return  Reference to the JniMarker object for this event or null if none. 
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.JniMarker
+     */
+    public String requestEventSource() {
+        // *** TODO ***
+        // No "Source" of event exists in Ltt so far
+        // It would be a good addition to have a way to detect where an event come
+        // from, like "kernel" or "userspace"
+        // 
+        return "Kernel Core";
+    }
+    
+    /**
+     * Parse a particular field in the event payload, identified by its id (position).<p>
+     * 
+     * Note : Position are relative to an event marker (i.e. requestEventMarker().getMarkerFieldsArrayList() )
+     * 
+     * @param fieldId   Position of the field to parse.
+     * 
+     * @return Object that contain the parsed payload
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.JniParser
+     */
+    public Object parseFieldById(int fieldId) {
+        return JniParser.parseField(this, fieldId);
+    }
+    
+    /**
+     * Parse a particular field in the event payload, identified by its name.<p>
+     * 
+     * Note : Name are relative to an event marker (i.e. requestEventMarker().getMarkerFieldsHashMap() )
+     * 
+     * @param fieldName   Position of the field to parse.
+     * 
+     * @return Object that contain the parsed payload
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.JniParser
+     */
+    public Object parseFieldByName(String fieldName) {
+        return JniParser.parseField(this, fieldName);
+    }
+    
+    /**
+     * Method to parse all the event payload.<p>
+     * 
+     * @return HashMap<String, Object> which is the parsedContent objects and their name as key.
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.JniParser 
+     */
+    public HashMap<String, Object> parseAllFields() {
+        return JniParser.parseAllFields(this);
+    }
+
+    /* 
+     * This function populates the event data with data from LTT
+     * 
+     * NOTE : To get better performance, we copy very few data into memory here
+     * 
+     */
+    private void populateEventInformation() {
+    	// We need to save the time, as it is not a primitive (can't be dynamically called in getter)
+    	eventTime.setTime(ltt_getNanosencondsTime(thisEventPtr.getPointer() ));
+    }
+    
+    public JniTime getEventTime() {
+        return eventTime;
+    }
+    
+    // *** To get better performance, all getter belows call LTT directly ****
+    //     That way, we can avoid copying data into memory
+    public int getEventMarkerId() {
+        return ltt_getEventMarkerId(thisEventPtr.getPointer());
+    }
+
+    public long getEventDataSize() {
+        return ltt_getEventDataSize(thisEventPtr.getPointer());
+    }
+
+    public HashMap<Integer, JniMarker> getMarkersMap() {
+        return markersMap;
+    }
+
+    /**
+     * Pointer to the parent LTTTracefile C structure.<br>
+     * <br>
+     * The pointer should only be used <u>INTERNALY</u>, do not use unless you
+     * know what you are doing.
+     * 
+     * @return The actual (long converted) pointer or NULL.
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer
+     */
+    public Jni_C_Pointer getTracefilePtr() {
+        return new Jni_C_Pointer( ltt_getTracefilePtr(thisEventPtr.getPointer()) );
+    }
+
+    /**
+     * Pointer to the LttEvent C structure.<br>
+     * <br>
+     * The pointer should only be used <u>INTERNALY</u>, do not use unless you
+     * know what you are doing.
+     * 
+     * @return The actual (long converted) pointer or NULL.
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer
+     */
+    public Jni_C_Pointer getEventPtr() {
+        return thisEventPtr;
+    }
+
+    public int getEventState() {
+        return eventState;
+    }
+
+    /**
+     * Getter to the parent tracefile for this event.
+     *
+     * @return  The parent tracefile 
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.JniTracefile
+     */
+    public JniTracefile getParentTracefile() {
+        return parentTracefile;
+    }
+    
+    /**
+     * Compare fonction for JNIEvent.<p>
+     * <p>
+     * This will compare the current JNIEvent with a passed one by timestamp AND tracefile ("type").<br>
+     * If both are equal but type differs, current event is considered to be older (-1 returned).
+     * 
+     * @return -1 if given event happens before, 0 if equal, 1 if passed event happens after.
+     */
+    public int compareTo(JniEvent rightEvent ){
+    	
+    	// Note : this = left hand operand
+    	
+        // By default, we consider the current event to be older.
+        int eventComparaison = -1; 
+        
+        // Test against null before performing anything
+        if ( rightEvent != null ) {
+            // Compare the timestamp first
+            eventComparaison = this.getEventTime().compareTo( rightEvent.getEventTime() );
+            
+            // If timestamp is equal, compare the parent tracefile ("event type")
+            if ( (eventComparaison == 0) && ( !this.parentTracefile.equals(rightEvent.parentTracefile)) ) {
+                eventComparaison = 1;
+            }
+        }
+        return eventComparaison;
+    }
+    
+    /**
+     * Print information for this event. 
+     * <u>Intended to debug</u><br>
+     * 
+     * This function will call Ltt to print, so information printed will be 
+     * the one from the C structure, not the one populated in java.<p>
+     * 
+     * This function will not throw but will complain loudly if pointer is NULL.
+     */
+    public void printEventInformation() {
+
+        // If null pointer, print a warning!
+        if (thisEventPtr.getPointer() == NULL) {
+            printlnC("Pointer is NULL, cannot print. (printEventInformation)");
+        }
+        else {
+            ltt_printEvent(thisEventPtr.getPointer());
+        }
+    }
+    
+    /**
+     * toString() method. 
+     * <u>Intended to debug.</u><p>
+     * 
+     * @return Attributes of the object concatenated in String
+     */
+    @Override
+	public String toString() {
+        String returnData = "";
+
+        returnData += "tracefilePtr            : " + tracefilePtr + "\n";
+        returnData += "eventMarkerId           : " + getEventMarkerId() + "\n";
+        returnData += "eventTime               : " + eventTime.getReferenceToString() + "\n";
+        returnData += "   seconds              : " + eventTime.getSeconds() + "\n";
+        returnData += "   nanoSeconds          : " + eventTime.getNanoSeconds() + "\n";
+        returnData += "eventDataSize           : " + getEventDataSize() + "\n";
+        returnData += "markersMap              : " + markersMap.keySet() + "\n"; // Hack to avoid ending up with markersMap.toString()
+
+        return returnData;
+    }
+    
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniMarker.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniMarker.java
new file mode 100644
index 0000000..66d4b42
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniMarker.java
@@ -0,0 +1,250 @@
+package org.eclipse.linuxtools.lttng.jni;
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   William Bourque (wbourque@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+import org.eclipse.linuxtools.lttng.jni.exception.JniMarkerException;
+
+/**
+ * <b><u>JniMarker</u></b><p>
+ * 
+ * A JniMarker contain information how to interpret the unparsed content (payload) of an event.<br>
+ * Each JniMarker contains several MarkerFields for each fields in the event's payload.
+ * 
+ * Provides access to the marker_info C structure (from LTT) in java. 
+ * 
+ * Most important fields in the JniMarker are :
+ * <ul>
+ * <li> the name of the marker in String
+ * <li> an overview of the marker format (in C style printf format)
+ * <li> a reference to an ArrayList that contains MarkerFields object of this JniMarker
+ * </ul>
+ */
+public abstract class JniMarker extends Jni_C_Common
+{
+    // Internal C pointer of the JniEvent used in LTT
+    private Jni_C_Pointer thisMarkerPtr = new Jni_C_Pointer();
+
+    private String name = "";
+    private String formatOverview = "";
+    
+    // These two contains hold references to the same MarkerField object
+    //  The ArrayList can be used to efficiently find a field by its position
+    //  The HashMap can be used to find a field by its name
+    private HashMap<String, JniMarkerField> markerFieldsHashMap = null;
+    private ArrayList<JniMarkerField> markerFieldsArrayList = null;
+
+    // Native access method
+    protected native String ltt_getName(long markerPtr);   
+    protected native String ltt_getFormatOverview(long markerPtr);
+    protected native long ltt_getSize(long markerPtr);
+    protected native short ltt_getLargestAlign(long markerPtr);
+    protected native short ltt_getIntSize(long markerPtr);
+    protected native short ltt_getLongSize(long markerPtr);
+    protected native short ltt_getPointerSize(long markerPtr);
+    protected native short ltt_getSize_tSize(long markerPtr);
+    protected native void ltt_getAllMarkerFields(long tracePtr);
+    protected native short ltt_getAlignement(long markerPtr);
+    protected native long ltt_getNextMarkerPtr(long markerPtr);
+
+    // Debug native function, ask LTT to print marker structure
+    protected native void ltt_printMarker(long markerPtr);
+
+    /*
+     * Default constructor is forbidden
+     */
+    protected JniMarker() {
+    }
+    
+    /**
+     * Copy constructor.<p>
+     * 
+     * @param oldMarker Reference to the JniMarker you want to copy. 
+     */
+    public JniMarker(JniMarker oldMarker) {
+        thisMarkerPtr = oldMarker.thisMarkerPtr;
+        name = oldMarker.name;
+        formatOverview = oldMarker.formatOverview;
+        markerFieldsHashMap = oldMarker.markerFieldsHashMap;
+        markerFieldsArrayList = oldMarker.markerFieldsArrayList;
+
+    }
+
+    /**
+     * Constructor, using pointer.<p>
+     * 
+     * @param newMarkerPtr  Pointer to a C marker_info structure
+     * 
+     * @exception JniException
+     */
+    public JniMarker(Jni_C_Pointer newMarkerPtr) throws JniException {
+        thisMarkerPtr = newMarkerPtr;
+        markerFieldsArrayList = new ArrayList<JniMarkerField>();
+        markerFieldsHashMap = new HashMap<String, JniMarkerField>();
+
+        // Populate the marker
+        populateMarkerInformation();
+    }
+
+    
+    /* 
+     * This function populates the marker data with data from LTT
+     * 
+     */
+    private void populateMarkerInformation() throws JniException {
+        if (thisMarkerPtr.getPointer() == NULL) {
+            throw new JniMarkerException("Pointer is NULL, trace closed? (populateMarkerInformatOverviewion)");
+        } else {
+            name = ltt_getName( thisMarkerPtr.getPointer() );
+            formatOverview = ltt_getFormatOverview( thisMarkerPtr.getPointer() );
+            // To fill the markerFieldArray is a bit different
+            ltt_getAllMarkerFields( thisMarkerPtr.getPointer() );
+        }
+    }
+
+    /* 
+     * Fills a map of all the JniMarkerField associated with this JniMarker.
+     * 
+     * Note: This function is called from C and there is no way to propagate
+     * exception back to the caller without crashing JNI. Therefore, it MUST
+     * catch all exceptions.
+     * 
+     * @param markerName        Name of the parent marker
+     * @param markerFieldPtr    C Pointer (converted in long) to marker_field C Structure
+     */
+	private void addMarkerFieldFromC(String markerFieldName, long markerFieldPtr) {
+        // Create a new Jaf_markerField object and insert it in the map
+        // the maker field fill itself with LTT data while being constructed
+        try {
+            JniMarkerField newMarkerField = allocateNewJniMarkerField( new Jni_C_Pointer(markerFieldPtr) );
+            markerFieldsArrayList.add(newMarkerField);
+            markerFieldsHashMap.put(markerFieldName, newMarkerField);
+            
+        } catch (JniException e) {
+            printlnC("Failed to add marker field " + markerFieldName + " to marker fields list!(addMarkerFieldFromC)\n\tException raised : " + e.toString() );
+        }
+    }
+
+    // Access to class variable. Most of them doesn't have setter
+    public String getName() {
+        return name;
+    }
+
+    public String getFormatOverview() {
+        return formatOverview;
+    }
+
+    public HashMap<String,JniMarkerField> getMarkerFieldsHashMap() {
+        return markerFieldsHashMap;
+    }
+    
+    public ArrayList<JniMarkerField> getMarkerFieldsArrayList() {
+        return markerFieldsArrayList;
+    }
+    
+    /**
+     * Pointer to the marker_info C structure.<p>
+     * 
+     * The pointer should only be used <u>INTERNALY</u>, do not use unless you
+     * know what you are doing.<p>
+     * 
+     * @return The actual (long converted) pointer or NULL
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer
+     */
+    public Jni_C_Pointer getMarkerPtr() {
+        return thisMarkerPtr;
+    }
+    
+    
+    /**
+     * Print information for this JniMarker. 
+     * <u>Intended to debug</u><br>
+     * 
+     * This function will call Ltt to print, so information printed will be the one from 
+     * the C structure, not the one populated in java.<p>
+     * 
+     * This function will not throw but will complain loudly if pointer is NULL
+     */
+    public void printMarkerInformation() {
+
+        // If null pointer, print a warning!
+        if (thisMarkerPtr.getPointer() == NULL) {
+            printlnC("Pointer is NULL, cannot print. (printMarkerInformation)");
+        } else {
+            ltt_printMarker(thisMarkerPtr.getPointer());
+        }
+    }
+    
+    /**
+     * Print information for ALL marker fields for this marker. 
+     * <u>Intended to debug</u><br>
+     * 
+     * This function will call Ltt to print, so information printed will be the one from 
+     * the C structure, not the one populated in java.
+     */
+    public void printAllMarkerFieldsInformation() {
+        Object[] allMarkersField = markerFieldsArrayList.toArray();
+
+        for (int pos = 0; pos < allMarkersField.length; pos++) {
+            printlnC(allMarkersField[pos].toString());
+        }
+    }
+    
+    /**
+     * toString() method. 
+     * <u>Intended to debug</u><br>
+     * 
+     * @return Attributes of the object concatenated in String
+     */
+    @Override
+	public String toString() {
+        String returnData = "";
+
+        returnData += "name                    : " + name + "\n";
+        returnData += "formatOverview          : " + formatOverview + "\n";
+        returnData += "markerFieldArrayList    : " + markerFieldsArrayList.toArray() + "\n";
+
+        return returnData;
+    }
+    
+    
+    // ****************************
+    // **** ABSTRACT FUNCTIONS ****
+    // You MUST override those in your version specific implementation
+	
+	
+	/**
+     * Function place holder to allocate a new JniMarkerField.<p>
+     * <br>
+     * JniMarkerField constructor is non overridable so we need another overridable function to return the correct version of JniMarkerField.<br>
+     * Effect of this function should be the same (allocate a fresh new JniMarkerField).<br>
+     * <br>
+     * <b>!! Override this with you version specific implementation.</b><br>
+     * 
+     * @param newMarkerFieldPtr		The pointer of an already opened marker_field C Structure
+     * 
+     * @return						The newly allocated JniMarkerField of the correct version
+     * 
+     * @throws JniException			The construction (allocation) failed.
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer
+     * @see org.eclipse.linuxtools.lttng.jni.JniMarkerField
+     */
+    public abstract JniMarkerField allocateNewJniMarkerField(Jni_C_Pointer newMarkerFieldPtr) throws JniException;
+    
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniMarkerField.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniMarkerField.java
new file mode 100644
index 0000000..3af403f
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniMarkerField.java
@@ -0,0 +1,143 @@
+package org.eclipse.linuxtools.lttng.jni;
+
+import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+import org.eclipse.linuxtools.lttng.jni.exception.JniMarkerFieldException;
+
+
+/**
+ * <b><u>JniMarkerField</u></b> <p>
+ * A JniMarkerField is one of the field of the unparsed content (payload) of an event. <p>
+ * 
+ * Provides access to the marker_field C structure (from LTT) in java.<p>
+ * 
+ * Most important attributes in the JniMarkerField are :
+ * <ul>
+ * <li> the name (field) of in String
+ * <li> the marker field format (in C style printf format)
+ * </ul>
+ */
+public abstract class JniMarkerField extends Jni_C_Common
+{
+    // Internal C pointer of the JniEvent used in LTT
+    private Jni_C_Pointer thisMarkerFieldPtr = new Jni_C_Pointer();
+
+    private String field = "";
+    private String format = "";
+    
+    // Native access method
+    protected native String ltt_getField(long markerFieldPtr);
+    protected native int ltt_getType(long markerFieldPtr);
+    protected native long ltt_getOffset(long markerFieldPtr);
+    protected native long ltt_getSize(long markerFieldPtr);
+    protected native long ltt_getAlignment(long markerFieldPtr);
+    protected native long ltt_getAttributes(long markerFieldPtr);
+    protected native int ltt_getStatic_offset(long markerFieldPtr);
+    protected native String ltt_getFormat(long markerFieldPtr);
+
+    // Debug native function, ask LTT to print marker structure
+    protected native void ltt_printMarkerField(long markerFieldPtr);
+
+    /*
+     * Default constructor is forbidden
+     */
+    protected JniMarkerField() {
+    }
+
+    /**
+     * Copy constructor.<p>
+     * 
+     * @param oldMarkerField Reference to the JniMarkerField you want to copy. 
+     */
+    public JniMarkerField(JniMarkerField oldMarkerField) {
+        thisMarkerFieldPtr = oldMarkerField.getMarkerFieldPtr();
+        field = oldMarkerField.getField();
+        format = oldMarkerField.getFormat();
+    }
+
+    /**
+     * Constructor, using pointer.<p>
+     * 
+     * @param newMarkerFieldPtr  Pointer to a C marker_field structure
+     * 
+     * @exception JniException
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer
+     */
+    public JniMarkerField(Jni_C_Pointer newMarkerFieldPtr) throws JniException {
+        thisMarkerFieldPtr = newMarkerFieldPtr;
+
+        // Populate the marker field
+        populateMarkerFieldInformation();
+    }
+
+    /* 
+     * This function populates the marker field data with data from LTT
+     * 
+     */
+    private void populateMarkerFieldInformation() throws JniException {
+        if (thisMarkerFieldPtr.getPointer() == NULL) {
+            throw new JniMarkerFieldException(
+                    "Pointer is NULL, trace closed? (populateMarkerInformation)");
+        } else {
+            field = ltt_getField(thisMarkerFieldPtr.getPointer());
+            format = ltt_getFormat(thisMarkerFieldPtr.getPointer());
+        }
+    }
+
+    public String getField() {
+        return field;
+    }
+
+    public String getFormat() {
+        return format;
+    }
+
+    /**
+     * Pointer to the marker_field C structure.<p>
+     * 
+     * The pointer should only be used <u>INTERNALY</u>, do not use these unless you
+     * know what you are doing.<p>
+     * 
+     * @return The actual (long converted) pointer or NULL
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer
+     */
+    public Jni_C_Pointer getMarkerFieldPtr() {
+        return thisMarkerFieldPtr;
+    }
+    
+    /**
+     * Print information for this event. <u>Intended to debug</u><br>
+     * 
+     * This function will call Ltt to print, so information printed will be the one from 
+     * the C structure, not the one populated in java.<p>
+     * 
+     * This function will not throw but will complain loudly if pointer is NULL
+     */
+    public void printMarkerFieldInformation() {
+
+        // If null pointer, print a warning!
+        if (thisMarkerFieldPtr.getPointer() == NULL) {
+            printlnC("Pointer is NULL, cannot print. (printMarkerFieldInformation)");
+        } else {
+            ltt_printMarkerField(thisMarkerFieldPtr.getPointer());
+        }
+    }
+    
+    /**
+     * toString() method. 
+     * <u>Intended to debug</u><br>
+     * 
+     * @return Attributes of the object concatenated in String
+     */
+    @Override
+    public String toString() {
+        String returnData = "";
+        returnData += "field                   : " + field + "\n";
+        returnData += "format                  : " + format + "\n";
+        
+        return returnData;
+    }
+    
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniParser.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniParser.java
new file mode 100644
index 0000000..d80fd23
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniParser.java
@@ -0,0 +1,295 @@
+package org.eclipse.linuxtools.lttng.jni;
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   William Bourque (wbourque@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+
+import java.util.HashMap;
+import java.util.Iterator;
+
+import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer;
+
+/**
+ * <b><u>JniParser</u></b><p>
+ * 
+ * JniParser is used to parse an event payload into something usable.<p>
+ * 
+ * All methods are static, the parser shouldn't be instantiated.
+ */
+public abstract class JniParser extends Jni_C_Common
+{
+    protected static native void ltt_getParsedData(ParsedObjectContent parseddata, long eventPtr, long markerFieldPtr);
+    
+    // *** HACK ***
+    // We cannot use "Object" directly as java does not support swapping primitive value
+    //    We either need to create a new object type or to use a "non-primitive" type that have "Setter()" functions
+    //    Another (ugly) hack would be to pass an array to modify the reference's reference.
+    // ***
+    private static ParsedObjectContent parsedData = new ParsedObjectContent();
+    
+    /*
+     * Default constructor is forbidden
+     */
+    protected JniParser() {
+    }
+    
+    
+    /**
+     * Method to parse a single field identified by its id.<p>
+     * 
+     * All parsing will be done on C side as we need LTT functions.
+     * 
+     * @param   eventToParse    The jni event we want to parse. 
+     * @param   fieldPosition   The position (or id) of the field we want to parse
+     * 
+     * @return                  An Object that contain the JniEvent payload parsed by the C, or null, if if was impossible to parse (i.e., wrong position)
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.JniEvent
+     */
+    static public Object parseField(JniEvent eventToParse, int fieldPosition) {
+        
+        // Sanity check
+        if ( (fieldPosition < 0) || ( fieldPosition >= eventToParse.requestEventMarker().getMarkerFieldsArrayList().size() ) ){
+            return null;
+        }
+        
+        JniMarkerField tmpField = eventToParse.requestEventMarker().getMarkerFieldsArrayList().get(fieldPosition);
+        
+        // Call the parsing function in C. The result will be put in parsedData object
+        ltt_getParsedData(parsedData, eventToParse.getEventPtr().getPointer(), tmpField.getMarkerFieldPtr().getPointer() );
+        
+        return parsedData.getData();
+    }
+    
+    
+    /**
+     * Method to parse a single field identified by its name.<p>
+     * 
+     * All parsing will be done on C side as we need LTT functions.
+     * 
+     * @param   eventToParse    The jni event we want to parse. 
+     * @param   fieldName       The name of the field we want to parse.
+     * 
+     * @return                  An Object that contain the JniEvent payload parsed by the C, or null, if if was impossible to parse (i.e., wrong position)
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.JniEvent
+     */
+    static public Object parseField(JniEvent eventToParse, String fieldName) {
+        
+        JniMarkerField tmpField = eventToParse.requestEventMarker().getMarkerFieldsHashMap().get(fieldName);
+        
+        // return immediately if there is no field by that name
+        if ( tmpField == null ) {
+            return null;
+        }
+        
+        ltt_getParsedData(parsedData, eventToParse.getEventPtr().getPointer(), tmpField.getMarkerFieldPtr().getPointer() );
+        
+        return parsedData.getData();
+    }
+    
+    
+    
+    /**
+     * Method to parse all fields at once.<p>
+     * 
+     * All parsing will be done on C side as we need LTT functions.
+     * 
+     * @param   eventToParse    The jni event we want to parse.  
+     * @return                  An HashMap of Object that contain the is the JniEvent's payload parsed by the C
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.JniEvent
+     */
+    static public HashMap<String, Object> parseAllFields(JniEvent eventToParse) {
+        HashMap<String,JniMarkerField> markerFieldData = eventToParse.requestEventMarker().getMarkerFieldsHashMap();
+		
+		// This hashmap will contain the parsed content.
+		// ParsedContent is a local class defined at the end of this file
+		
+		// *** HACK ***
+		// We want (need?) the map that contain the parsed data to be in the same order as markerField map
+		// The "instinctive way" would be to use : 
+		//       HashMap<String, Object> parsedDataMap = new HashMap<String, Object>(nbMarkerField);
+		//
+		// However, we cannot ensure that the newly created hashmap will use the same order.
+		// The hard way would be to override the default hash function for both hashmap
+		// However, this is way easier to abuse the fact that both hashmap are of type <String, something...>
+		// Therefore we can abuse the java-cast with clone() : 
+		//       HashMap<String, Object> parsedDataMap = (HashMap<String, Object>)markerFieldData.clone();
+		// Or even safer, use HashMap constructor to do so : 
+        HashMap<String, Object> parsedDataMap = new HashMap<String, Object>(markerFieldData);
+		 
+        String              newKey 	        = null; 
+        JniMarkerField      newMarkerField  = null;
+        Iterator<String>    iterator        = markerFieldData.keySet().iterator();
+        
+        while ( iterator.hasNext() ) {
+            newKey = iterator.next();
+            newMarkerField = markerFieldData.get(newKey);
+            // Call the C to parse the data
+            ltt_getParsedData(parsedData, eventToParse.getEventPtr().getPointer(), newMarkerField.getMarkerFieldPtr().getPointer() );
+            // Save the result into the HashMap
+            parsedDataMap.put(newMarkerField.getField(), parsedData.getData() );
+        }
+ 
+        return parsedDataMap;
+    }
+    
+    
+    /* 
+     * Add a parsed String value to the Array<br>
+     * <br>
+     * Note : this function will be called from the C side.
+     * Note2: contentHolder is of type "Object" instead of "ParsedObjectContent" to be able to use the most generic function signature on the C side.
+     *          its goal is to give a generic interface to people that would like to use the JNI library
+     * 
+     * @param parsedArray   Array where to store the value
+     * @param fieldName     The name of the parsed field
+     * @param stringToAdd   The parsed data to add
+     * @param formatToAdd   The format of the raw data
+     */
+	static private void addStringToParsingFromC(Object contentHolder, String stringToAdd) {
+        ((ParsedObjectContent)contentHolder).setData( stringToAdd);
+    }
+
+    /* 
+     * Add a parsed 64 bits Pointer value to the Array<br>
+     * <br>
+     * Note : this function will be called from the C side.
+     * Note2: contentHolder is of type "Object" instead of "ParsedObjectContent" to be able to use the most generic function signature on the C side.
+     *          its goal is to give a generic interface to people that would like to use the JNI library
+     * 
+     * @param contentHolder Object where to store the parsed value
+     * @param fieldName     The name of the parsed field
+     * @param pointerToAdd  The parsed data to add (in 64 bits long!)
+     * @param formatToAdd   The format of the raw data
+     */
+	static private void addLongPointerToParsingFromC(Object contentHolder, long pointerToAdd) {
+        ((ParsedObjectContent)contentHolder).setData( new Jni_C_Pointer((long) pointerToAdd));
+    }
+
+    /* 
+     * Add a parsed 32 bits Pointer value to the Array<br>
+     * <br>
+     * Note : this function will be called from the C side.
+     * Note2: contentHolder is of type "Object" instead of "ParsedObjectContent" to be able to use the most generic function signature on the C side.
+     *          its goal is to give a generic interface to people that would like to use the JNI library
+     * 
+     * @param contentHolder Object where to store the parsed value
+     * @param fieldName     The name of the parsed field
+     * @param pointerToAdd  The parsed data to add (converted in 64 bits long!)
+     * @param formatToAdd   The format of the raw data
+     */
+	static private void addIntPointerToParsingFromC(Object contentHolder, long pointerToAdd) {
+        ((ParsedObjectContent)contentHolder).setData( new Jni_C_Pointer((int) pointerToAdd));
+    }
+
+    /* 
+     * Add a parsed short value to the Array<br>
+     * <br>
+     * Note : this function will be called from the C side.
+     * Note2: contentHolder is of type "Object" instead of "ParsedObjectContent" to be able to use the most generic function signature on the C side.
+     *          its goal is to give a generic interface to people that would like to use the JNI library
+     * 
+     * @param contentHolder Object where to store the parsed value
+     * @param fieldName     The name of the parsed field
+     * @param shortToAdd    The parsed data to add
+     * @param formatToAdd   The format of the raw data
+     */
+	static private void addShortToParsingFromC(Object contentHolder, short shortToAdd) {
+        ((ParsedObjectContent)contentHolder).setData( new Short(shortToAdd));
+    }
+
+    /* 
+     * Add a parsed integer value to the Array<br>
+     * <br>
+     * Note : this function will be called from the C side.
+     * Note2: contentHolder is of type "Object" instead of "ParsedObjectContent" to be able to use the most generic function signature on the C side.
+     *          its goal is to give a generic interface to people that would like to use the JNI library
+     * 
+     * @param contentHolder Object where to store the parsed value
+     * @param fieldName     The name of the parsed field
+     * @param intToAdd      The parsed data to add
+     * @param formatToAdd   The format of the raw data
+     */
+	static private void addIntegerToParsingFromC(Object contentHolder, int intToAdd) {
+        ((ParsedObjectContent)contentHolder).setData( new Integer(intToAdd));
+    }
+
+    /* 
+     * Add a parsed long value to the Array<br>
+     * <br>
+     * Note : this function will be called from the C side.
+     * Note2: contentHolder is of type "Object" instead of "ParsedObjectContent" to be able to use the most generic function signature on the C side.
+     *          its goal is to give a generic interface to people that would like to use the JNI library
+     * 
+     * @param contentHolder Object where to store the parsed value
+     * @param fieldName     The name of the parsed field
+     * @param longToAdd     The parsed data to add
+     * @param formatToAdd   The format of the raw data
+     */
+	static private void addLongToParsingFromC(Object contentHolder, long longToAdd) {
+        ((ParsedObjectContent)contentHolder).setData( new Long(longToAdd));
+    }
+
+    /* 
+     * Add a parsed float value to the Array<br>
+     * <br>
+     * Note : this function will be called from the C side.
+     * Note2: contentHolder is of type "Object" instead of "ParsedObjectContent" to be able to use the most generic function signature on the C side.
+     *          its goal is to give a generic interface to people that would like to use the JNI library
+     * 
+     * @param contentHolder Object where to store the parsed value
+     * @param fieldName     The name of the parsed field
+     * @param floatToAdd    The parsed data to add
+     * @param formatToAdd   The format of the raw data
+     */
+	static private void addFloatToParsingFromC(Object contentHolder, float floatToAdd) {
+        ((ParsedObjectContent)contentHolder).setData( new Float(floatToAdd));
+    }
+
+    /* 
+     * Add a parsed double value to the Array<br>
+     * <br>
+     * Note : this function will be called from the C side.
+     * Note2: contentHolder is of type "Object" instead of "ParsedObjectContent" to be able to use the most generic function signature on the C side.
+     *          its goal is to give a generic interface to people that would like to use the JNI library
+     * 
+     * 
+     * @param contentHolder Object where to store the parsed value
+     * @param fieldName     The name of the parsed field
+     * @param doubleToAdd   The parsed data to add
+     * @param formatToAdd   The format of the raw data
+     */
+	static private void addDoubleToParsingFromC(Object contentHolder, double doubleToAdd) {
+        ((ParsedObjectContent)contentHolder).setData( new Double(doubleToAdd));
+    }
+    
+}
+
+
+/**
+ * <b><u>ParsedObjectContent</u></b><p>
+ * 
+ * ParsedObjectContent class.
+ * Only be used locally in this object to parse event data more efficiently in the C.
+ */
+class ParsedObjectContent {
+    private Object parsedData = null;
+    
+    public Object getData() {
+        return parsedData;
+    }
+    
+    public void setData(Object newData) {
+        parsedData = newData;
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTrace.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTrace.java
new file mode 100644
index 0000000..43918e5
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTrace.java
@@ -0,0 +1,880 @@
+package org.eclipse.linuxtools.lttng.jni;
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   William Bourque (wbourque@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.PriorityQueue;
+
+import org.eclipse.linuxtools.lttng.jni.common.JniTime;
+import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+import org.eclipse.linuxtools.lttng.jni.exception.JniOpenTraceFailedException;
+import org.eclipse.linuxtools.lttng.jni.exception.JniTraceException;
+import org.eclipse.linuxtools.lttng.jni.exception.JniTracefileWithoutEventException;
+
+/**
+ * <b><u>JniTrace</u></b>
+ * <p>
+ * This is the top level class in the JNI. It provides access to the 
+ * LttTrace C structure in java.
+ * <p>
+ * Most important fields in the JniTrace are :
+ * <ul>
+ * <li>a JniTrace path (a trace <b>directory</b>)
+ * <li>a HashMap of tracefiles that exists in this trace
+ * </ul>
+ */
+public abstract class JniTrace extends Jni_C_Common {
+    
+    private final static boolean DEFAULT_LTT_DEBUG = false;
+    
+    // Internal C pointer of the JniTrace used in LTT
+    private Jni_C_Pointer thisTracePtr = new Jni_C_Pointer();
+
+    // Data we should populate from LTT
+    // Note that all type have been scaled up as there is no "unsigned" in java
+    // This might be a problem about "unsigned long" as there is no equivalent
+    // in java
+    
+    private String tracepath = ""; // Path of the trace. Should be a directory (like : /tmp/traceX)
+    private int    cpuNumber = 0;
+    private long   archType = 0;
+    private long   archVariant = 0;
+    private short  archSize = 0;
+    private short  lttMajorVersion = 0;
+    private short  lttMinorVersion = 0;
+    private short  flightRecorder = 0;
+    private long   freqScale = 0;
+    private long   startFreq = 0;
+    private long   startTimestampCurrentCounter = 0;
+    private long   startMonotonic = 0;
+    private JniTime startTimeNoAdjustement = null;
+    private JniTime startTime = null;
+    private JniTime endTime = null;
+    
+    // This Map holds a reference to the tracefiles owned by this trace
+    private HashMap<String, JniTracefile> tracefilesMap = null;
+    // The priority queue (similar to heap) hold events 
+    private PriorityQueue<JniEvent> eventsHeap = null;
+    
+    // This variable will hold the content of the "last" event we read
+    private JniEvent currentEvent = null;  
+    
+    // Should we print debug in the C library or not?
+    private boolean printLttDebug = DEFAULT_LTT_DEBUG;
+    
+    // This need to be called prior to any operation
+    protected native boolean ltt_initializeHandle(String libname);
+    // This need to be called at the very end (destructor)
+    protected native boolean ltt_freeHandle();
+    
+    // Open/close native functions
+    protected native long ltt_openTrace(String pathname, boolean printDebug);
+    protected native void ltt_closeTrace(long tracePtr);
+
+    // Native access functions
+    protected native String ltt_getTracepath(long tracePtr);
+    protected native int    ltt_getCpuNumber(long tracePtr);
+    protected native long   ltt_getArchType(long tracePtr);
+    protected native long   ltt_getArchVariant(long tracePtr);
+    protected native short  ltt_getArchSize(long tracePtr);
+    protected native short  ltt_getLttMajorVersion(long tracePtr);
+    protected native short  ltt_getLttMinorVersion(long tracePtr);
+    protected native short  ltt_getFlightRecorder(long tracePtr);
+    protected native long   ltt_getFreqScale(long tracePtr);
+    protected native long   ltt_getStartFreq(long tracePtr);
+    protected native long   ltt_getStartTimestampCurrentCounter(long tracePtr);
+    protected native long   ltt_getStartMonotonic(long tracePtr);
+    
+    // Native function to fill out startTime
+    protected native void ltt_feedStartTime(long tracePtr, JniTime startTime);
+    
+    // Native function to fill out startTimeFromTimestampCurrentCounter
+    protected native void ltt_feedStartTimeFromTimestampCurrentCounter(long tracePtr, JniTime startTime);
+
+    // Native function to fill out tracefilesMap
+    protected native void ltt_feedAllTracefiles(long tracePtr);
+    
+    // Native function to fill out the start and end time of the trace
+    protected native void ltt_feedTracefileTimeRange(long tracePtr, JniTime startTime, JniTime endTime);
+    
+    // Debug native function, ask LTT to print trace structure
+    protected native void ltt_printTrace(long tracePtr);
+    
+    /*
+     * Default constructor is forbidden
+     */
+    protected JniTrace() {
+    }
+    
+    /**
+     * Constructor that takes a tracepath parameter.<p>
+     * 
+     * This constructor also opens the trace.
+     * 
+     * @param newpath The <b>directory</b> of the trace to be opened
+     * 
+     * @exception JniException
+     */
+    public JniTrace(String newpath) throws JniException {
+        this(newpath, DEFAULT_LTT_DEBUG);
+    }
+    
+    /**
+     * Constructor that takes a tracepath parameter and a debug value.<p>
+     * 
+     * This constructor also opens the trace.
+     * 
+     * @param newpath The <b>directory</b> of the trace to be opened
+     * @param newPrintDebug Should the debug information be printed in the LTT C library
+     * 
+     * @exception JniException
+     */
+    public JniTrace(String newpath, boolean newPrintDebug) throws JniException {
+        tracepath = newpath;
+        thisTracePtr = new Jni_C_Pointer();
+        printLttDebug = newPrintDebug;
+        
+        openTrace(newpath);
+    }
+    
+    /**
+     * Copy constructor.
+     * 
+     * @param oldTrace  A reference to the JniTrace to copy.           
+     */
+    public JniTrace(JniTrace oldTrace) {
+        thisTracePtr  = oldTrace.thisTracePtr;
+        
+        tracepath       = oldTrace.tracepath;
+        cpuNumber       = oldTrace.cpuNumber;
+        archType        = oldTrace.archType;
+        archVariant     = oldTrace.archVariant;
+        archSize        = oldTrace.archSize;
+        lttMajorVersion = oldTrace.lttMajorVersion;
+        lttMinorVersion = oldTrace.lttMinorVersion;
+        flightRecorder  = oldTrace.flightRecorder;
+        freqScale       = oldTrace.freqScale;
+        startFreq       = oldTrace.startFreq;
+        startTimestampCurrentCounter = oldTrace.startTimestampCurrentCounter;
+        startMonotonic  = oldTrace.startMonotonic;
+        startTimeNoAdjustement = oldTrace.startTimeNoAdjustement;
+        startTime       = oldTrace.startTime;
+        endTime         = oldTrace.endTime;
+
+        tracefilesMap = new HashMap<String, JniTracefile>(oldTrace.tracefilesMap.size());
+        tracefilesMap = oldTrace.tracefilesMap;
+        
+        eventsHeap = new PriorityQueue<JniEvent>( oldTrace.eventsHeap.size());
+        eventsHeap = oldTrace.eventsHeap;
+        
+        printLttDebug = oldTrace.printLttDebug;
+    }        
+        
+    /**
+     * Constructor, using C pointer.<p>
+     * 
+     * @param newPtr The pointer to an already opened LttTrace C structure.
+     * @param newPrintDebug Should the debug information be printed in the LTT C library
+     *            
+     * @exception JniException
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer
+     */
+    public JniTrace(Jni_C_Pointer newPtr, boolean newPrintDebug) throws JniException {
+        thisTracePtr = newPtr;
+        printLttDebug = newPrintDebug;
+        
+        // Populate our trace
+        populateTraceInformation();
+    }
+    
+    
+    @Override
+	public void finalize() {
+    	// If the trace is open, close it
+        if (thisTracePtr.getPointer() != NULL) {
+            closeTrace();
+        }
+        
+        // Tell the C to free the allocated memory
+        freeLibrary();
+    }
+    
+    /**
+     * Open an existing trace.<p>
+     * 
+     * The tracepath is a directory and needs to exist, otherwise
+     * a JafOpenTraceFailedException is throwed.
+     * 
+     * @param newPath The <b>directory</b> of the trace to be opened
+     * 
+     * @exception JniOpenTraceFailedException Thrown if the open failed
+     */
+    public void openTrace(String newPath) throws JniException {
+        // If open is called while a trace is already opened, we will try to close it first
+        if (thisTracePtr.getPointer() != NULL) {
+            closeTrace();
+        }
+
+        // Set the tracepath and open it
+        tracepath = newPath;
+        openTrace();
+    }
+        
+    /**
+     * Open an existing trace.<p>
+     * 
+     * The tracepath should have been set already,
+     * 
+     * @exception JniOpenTraceFailedException  Thrown if the open failed
+     */
+    public void openTrace() throws JniException {
+    	
+        // Raise an exception if the tracepath is empty, otherwise open the trace
+        if (tracepath == "") {
+            throw new JniTraceException("Tracepath is not set. (openTrace)");
+        }
+        
+        // If the file is already opened, close it first
+        if (thisTracePtr.getPointer() != NULL) {
+            closeTrace();
+        }
+        
+        if ( initializeLibrary() == true ) {
+	        // Call the LTT to open the trace
+	        long newPtr = ltt_openTrace(tracepath, printLttDebug);
+	        
+	        if (newPtr == NULL) {
+	        	thisTracePtr = new Jni_C_Pointer(NULL);
+	            throw new JniOpenTraceFailedException("Error while opening trace. Is the tracepath correct? (openTrace)");
+	        }
+	        
+	        // This is OUR pointer
+	        thisTracePtr = new Jni_C_Pointer(newPtr);
+	
+	        // Populate the trace with LTT information
+	        populateTraceInformation();
+        }
+        else {
+        	thisTracePtr = new Jni_C_Pointer(NULL);
+        	throw new JniTraceException("Failed to initialize library! Is the trace version supported?\n" +
+        			                    "Make sure you have the correct LTTv library compiled. (openTrace)");
+        }
+    }
+        
+    /**
+     * Close a trace.<p>
+     * 
+     * If the trace is already closed, will silently do nothing.
+     */
+    public void closeTrace() {
+    	
+        if (thisTracePtr.getPointer() != NULL) {
+            ltt_closeTrace(thisTracePtr.getPointer());
+            
+            // Clear the tracefile map
+            tracefilesMap.clear();
+            tracefilesMap = null;
+            
+            // Clear the eventsHeap and make it points to null
+            eventsHeap.clear();
+            eventsHeap = null;
+            
+            // Nullify the pointer
+            thisTracePtr = new Jni_C_Pointer(NULL);
+            
+            // Ask the garbage collector to make a little pass here, as we could
+            // be left with 100's of unreferenced objects
+            System.gc();
+        }
+    }
+    
+    /**
+     * This function force the library to free its memory.<p>
+     * 
+     * Note : No call to the library will work after this until ltt_initializeHandle is called again
+     */
+    public void freeLibrary() {
+    	ltt_freeHandle();
+    }
+    
+    /* 
+     * This function populates the trace data with data from LTT
+     * 
+     * @throws JniException
+     */
+    private void populateTraceInformation() throws JniException {
+        if (thisTracePtr.getPointer() == NULL) {
+            throw new JniTraceException("Pointer is NULL, trace not opened/already closed? (populateTraceInformation)");
+        }
+
+        // Populate from the LTT library
+        tracepath   = ltt_getTracepath( thisTracePtr.getPointer() );
+        cpuNumber   = ltt_getCpuNumber( thisTracePtr.getPointer() );
+        archType    = ltt_getArchType( thisTracePtr.getPointer() );
+        archVariant = ltt_getArchVariant( thisTracePtr.getPointer() );
+        archSize    = ltt_getArchSize( thisTracePtr.getPointer() );
+        lttMajorVersion = ltt_getLttMajorVersion( thisTracePtr.getPointer() );
+        lttMinorVersion = ltt_getLttMinorVersion( thisTracePtr.getPointer() );
+        flightRecorder  = ltt_getFlightRecorder( thisTracePtr.getPointer() );
+        freqScale   = ltt_getFreqScale( thisTracePtr.getPointer() );
+        startFreq   = ltt_getStartFreq( thisTracePtr.getPointer() );
+        startTimestampCurrentCounter = ltt_getStartTimestampCurrentCounter( thisTracePtr.getPointer() );
+        startMonotonic = ltt_getStartMonotonic( thisTracePtr.getPointer() );
+
+        // Creation of time is a bit different, we need to pass the object reference to C
+        //
+        // *** NOTE : LTTv consider "raw startTime" (time without any frequency adjustement) to be default startTime
+        //			  So "startTimeNoAdjustement" is obtain throught "ltt_feedStartTime()" and
+        //			  "startTime" is obtained from ltt_feedStartTimeFromTimestampCurrentCounter()
+        startTimeNoAdjustement = new JniTime();
+        ltt_feedStartTime( thisTracePtr.getPointer(), startTimeNoAdjustement );
+        
+        startTime = new JniTime();
+        ltt_feedStartTimeFromTimestampCurrentCounter( thisTracePtr.getPointer(), startTime );
+
+        // Call the fill up function for the tracefiles map
+        if ( tracefilesMap== null ) {
+            tracefilesMap = new HashMap<String, JniTracefile>();
+        }
+        ltt_feedAllTracefiles( thisTracePtr.getPointer() );
+        
+        // Now, obtain the trace "endTime"
+        // Note that we discard "startTime" right away, as we already have it
+        endTime = new JniTime();
+        ltt_feedTracefileTimeRange(thisTracePtr.getPointer(), new JniTime(), endTime);
+        
+        if (eventsHeap == null) {
+            eventsHeap = new PriorityQueue<JniEvent>(tracefilesMap.size());
+        }
+        
+        // Populate the heap with events
+        populateEventHeap();
+    }
+    
+    /* 
+     * This function populates the event heap with one event from each tracefile
+     * It should be called after each seek or when the object is constructed
+     */
+    private void populateEventHeap() {
+        currentEvent = null;
+        eventsHeap.clear();
+        
+        Object new_key = null;
+        JniTracefile tmpTracefile = null;
+        
+        Iterator<String> iterator = tracefilesMap.keySet().iterator();
+        while( iterator.hasNext() ) {
+            new_key = iterator.next();
+            
+            tmpTracefile = tracefilesMap.get(new_key);
+            if ( tmpTracefile.getCurrentEvent().getEventState() == EOK ) {
+                eventsHeap.add( tmpTracefile.getCurrentEvent() );
+            }
+        }
+    }
+    
+    /* 
+     * Fills a map of all the trace files.
+     * 
+     * Note: This function is called from C and there is no way to propagate
+     * exception back to the caller without crashing JNI. Therefore, it MUST
+     * catch all exceptions.
+     * 
+     * @param tracefileName
+     * @param tracefilePtr
+     */
+    protected void addTracefileFromC(String tracefileName, long tracefilePtr) {
+        
+        JniTracefile newTracefile = null;
+            
+        // Create a new tracefile object and insert it in the map
+        //    the tracefile fill itself with LTT data while being constructed
+        try {
+            newTracefile = allocateNewJniTracefile( new Jni_C_Pointer(tracefilePtr), this );
+            getTracefilesMap().put( (tracefileName + newTracefile.getCpuNumber()), newTracefile);
+        }
+        catch(JniTracefileWithoutEventException e) {
+        	if ( printLttDebug == true ) {
+        		printlnC("JniTracefile " + tracefileName + " has no event (addTracefileFromC). Ignoring.");
+        	}
+        }
+        catch(Exception e) {
+        	if ( printLttDebug == true ) {
+        		printlnC("Failed to add tracefile " + tracefileName + " to tracefilesMap!(addTracefileFromC)\n\tException raised : " + e.toString() );
+        	}
+        }
+    }
+    
+    /**
+     * Return the top event in the events stack, determined by timestamp, in the trace (all the tracefiles).<p>
+     * 
+     * Note : If the events were read before, the top event and the event currently loaded (currentEvent) are most likely the same.
+     * 
+     * @return The top event in the stack or null if no event is available.
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.JniEvent
+     */
+    public JniEvent findNextEvent() {
+        return eventsHeap.peek();
+    }
+    
+    /**
+     * Return the next event in the events stack, determined by timestamp, in the trace (all the tracefiles).<p>
+     * 
+     * @return The next event in the trace or null if no event is available.
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.JniEvent
+     */
+    public JniEvent readNextEvent() {
+        // Get the "next" event on the top of the heap but DO NOT remove it
+        JniEvent tmpEvent = eventsHeap.peek();
+        
+        // If the event is null, it was the last one in the trace we can leave the function
+        if (tmpEvent == null) {
+            return null;
+        }
+        
+        // Otherwise, we need to make sure the timestamp of the event we got is not the same as the last "NextEvent" we requested 
+        // NOTE : JniEvent.compareTo() compare by timestamp AND type, as 2 events of different type could have the same timestamp.
+        if ( tmpEvent.compareTo(currentEvent) == 0 ) {
+            // Remove the event on top as it is the same currentEventTimestamp
+            eventsHeap.poll();
+            
+            // Read the next event for this particular event type
+            tmpEvent.readNextEvent();
+            
+            // If the event state is sane (not Out of Range), put it back in the heap
+            if ( tmpEvent.getEventState() == EOK ) {
+                eventsHeap.add(tmpEvent);
+            }
+            
+            // Pick the top event again
+            tmpEvent = eventsHeap.peek();
+            
+            // Save the event we just read as the "current event"
+            currentEvent = tmpEvent;
+        }
+        // If the event on top has different timestamp than the currentTimestamp, just save this timestamp as current
+        else {
+            currentEvent = tmpEvent;
+        }
+        
+        return tmpEvent;
+    }
+    
+    /**
+     * Read the next event on a certain tracefile.<p>
+     * 
+     * By calling this function make sure the "global" readNextEvent() stay synchronised.
+     * Calling  readNextEvent() after this function will consider this tracefile moved and is then consistent.
+     * 
+     * @param targetTracefile 	The tracefile object to read from
+     * 
+     * @return The next event in the tracefile or null if no event is available.
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.JniTracefile
+     * @see org.eclipse.linuxtools.lttng.jni.JniEvent
+     */
+    public JniEvent readNextEvent(JniTracefile targetTracefile) {
+        JniEvent returnedEvent = null;
+    	
+        // There is 2 special cases where we should read the CURRENT event, not the next one
+        // 1- The currentEvent is null                      --> We never read or we just seeked
+        // 2- The currentEvent is of another type  --> We last read on a DIFFERENT tracefile
+        if ( (currentEvent == null) || 
+              (currentEvent.getParentTracefile().equals(targetTracefile) == false)
+            ) {
+            returnedEvent = targetTracefile.getCurrentEvent();
+            // Save the event we read
+            currentEvent = returnedEvent; 
+        }
+        else {
+        	// Remove from the event related to this tracefile from the event heap, if it exists.
+        	// WARNING : This only safe as long getCurrentEvent() never return "null" in any case.
+        	eventsHeap.remove(targetTracefile.getCurrentEvent() );
+        	
+        	// If status EOK, we can return the event, otherwise something wrong happen (out of range, read error, etc...)
+        	if ( targetTracefile.readNextEvent() == EOK) {
+        	    returnedEvent = targetTracefile.getCurrentEvent();
+        		// Add back to the heap the read event
+        		eventsHeap.add(returnedEvent);
+        	}
+        	// Save the event we read... 
+        	// Note : might be null if the read failed and it's ok
+        	currentEvent = targetTracefile.getCurrentEvent(); 
+        }
+        
+    	return returnedEvent;
+    }
+    
+    /**
+    * Seek to a certain time but <b>do not</b> read the next event.<p>
+    * 
+    * This only position the trace, it will not return anything.<p>
+    * 
+    * @param seekTime     The time where we want to seek to
+    * 
+    * @see org.eclipse.linuxtools.lttng.jni.common.JniTime
+    */
+    public void seekToTime(JniTime seekTime) {
+        
+        // Invalidate the last read event
+        currentEvent = null;
+        
+        Object tracefile_name = null;
+    	Iterator<String> iterator = tracefilesMap.keySet().iterator();
+    	
+    	while (iterator.hasNext() ) {
+    	    // We seek to the given event for ALL tracefiles
+    	    tracefile_name = iterator.next();
+    		seekToTime(seekTime, tracefilesMap.get(tracefile_name));
+    	}
+    	
+    	populateEventHeap();
+    }
+	
+    /**
+    * Seek to a certain time on a certain tracefile but <b>do not</b> read the next event.<p>
+    * 
+    * This only position the trace, it will not return anything.<p>
+    * 
+    * @param targetTracefile 	The tracefile object to read from
+    * @param seekTime     		The time where we want to seek to
+    * 
+    * @see org.eclipse.linuxtools.lttng.jni.JniTracefile
+    * @see org.eclipse.linuxtools.lttng.jni.common.JniTime
+    */
+    public void seekToTime(JniTime seekTime, JniTracefile targetTracefile) {
+        // Invalidate the current read event
+        currentEvent = null;
+        
+        // Remove from the event related to this tracefile from the event heap, if it exists.
+        // WARNING : This is only safe as long getCurrentEvent() never return "null" in any case.
+        eventsHeap.remove(targetTracefile.getCurrentEvent() );
+        
+        // Perform the actual seek on the tracefile
+        // Add the event to the heap if it succeed
+        if ( targetTracefile.seekToTime(seekTime) == EOK) {
+        	// Add back to the heap the read event
+            eventsHeap.add(targetTracefile.getCurrentEvent());
+        }
+    }
+	
+    /**
+    * Seek to a certain timestamp and read the next event.
+    * <p>
+    * If no more events are available or an error happen, null will be returned.
+    * 
+    * @param seekTime      The time where we want to seek to.
+    * 
+    * @return The event just after the seeked time or null if none available.
+    * 
+    * @see org.eclipse.linuxtools.lttng.jni.JniEvent
+    * @see org.eclipse.linuxtools.lttng.jni.common.JniTime
+    */
+    public JniEvent seekAndRead(JniTime seekTime) { 
+         JniEvent returnedEvent = null;
+         seekToTime(seekTime);
+            
+         // The trace should be correctly positionned, let's get the event
+         returnedEvent = readNextEvent();
+             
+         return returnedEvent;
+    }
+	
+    /**
+    * Seek to a certain timestamp on a certain tracefile and read the next event.<p>
+    * 
+    * If no more events are available or an error happen, null will be returned.
+    * 
+    * Calling  readNextEvent() after this function will consider this tracefile moved and is then consistent.<br>
+    * 
+    * @param targetTracefile    The tracefile object to read from
+    * @param seekTime           The time where we want to seek to
+    * 
+    * @return The event just after the seeked time or null if none available.
+    * 
+    * @see org.eclipse.linuxtools.lttng.jni.JniTracefile
+    * @see org.eclipse.linuxtools.lttng.jni.common.JniTime
+    * @see org.eclipse.linuxtools.lttng.jni.JniEvent
+    */
+    public JniEvent seekAndRead(JniTime seekTime, JniTracefile targetTracefile) { 
+        seekToTime(seekTime, targetTracefile);
+        return readNextEvent(targetTracefile);
+    }
+     
+    /**
+     * Get a certain tracefile from its given name.<p>
+     * 
+     * @param tracefileName     The name of the tracefile.
+     * 
+     * @return The tracefile found or null if none.
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.JniTracefile
+     */
+    public JniTracefile requestTracefileByName(String tracefileName) {
+        return tracefilesMap.get(tracefileName);
+    }        
+        
+    /**
+     * Get a certain event associated to a tracefile from the tracefile name.<p>
+     * 
+     * @param tracefileName     The name of the trace file.
+     * 
+     * @return Event of the tracefile or null if none found.
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.JniEvent
+     */
+    public JniEvent requestEventByName(String tracefileName) {
+        JniEvent returnValue = null;
+
+        JniTracefile tmpTracefile = tracefilesMap.get(tracefileName);
+
+        // If the tracefile is found, return the current event
+        // There should always be an event linked to a tracefile
+        if (tmpTracefile != null) {
+            returnValue = tmpTracefile.getCurrentEvent();
+        }
+
+        return returnValue;
+    }   
+        
+    // Access to class variable. Most of them doesn't have setter
+    public String getTracepath() {
+        return tracepath;
+    }
+
+    public int getCpuNumber() {
+        return cpuNumber;
+    }
+
+    public long getArchType() {
+        return archType;
+    }
+
+    public long getArchVariant() {
+        return archVariant;
+    }
+
+    public short getArchSize() {
+        return archSize;
+    }
+
+    public short getLttMajorVersion() {
+        return lttMajorVersion;
+    }
+
+    public short getLttMinorVersion() {
+        return lttMinorVersion;
+    }
+
+    public short getFlightRecorder() {
+        return flightRecorder;
+    }
+
+    public long getFreqScale() {
+        return freqScale;
+    }
+
+    public long getStartFreq() {
+        return startFreq;
+    }
+
+    public long getStartTimestampCurrentCounter() {
+        return startTimestampCurrentCounter;
+    }
+
+    public long getStartMonotonic() {
+        return startMonotonic;
+    }
+
+    public JniTime getStartTime() {
+        return startTime;
+    }
+    
+    public JniTime getEndTime() {
+        return endTime;
+    }
+
+    public JniTime getStartTimeNoAdjustement() {
+        return startTimeNoAdjustement;
+    }
+    
+    public HashMap<String, JniTracefile> getTracefilesMap() {
+        return tracefilesMap;
+    }        
+    
+    /**
+     * The timestamp of the last read event.<p>
+     * 
+     * Note : If no event is available, Long.MAX_VALUE is returned.
+     * 
+     * @return Time of the last event read
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.common.JniTime
+     */
+    public JniTime getCurrentEventTimestamp() {
+        JniTime returnedTime = null;
+        
+        // If no event were read or we reach the last event in the trace, 
+        //      currentEvent will be null
+        if (  currentEvent != null ) {
+            returnedTime = currentEvent.getEventTime();
+        }
+        else {
+            returnedTime = new JniTime(Long.MAX_VALUE);
+        }
+        return returnedTime;
+    }
+    
+    /**
+     * Pointer to the LttTrace C structure.<p>
+     * 
+     * The pointer should only be used <u>INTERNALY</u>, do not use unless you
+     * know what you are doing.
+     * 
+     * @return The actual (long converted) pointer or NULL.
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer
+     */
+    public Jni_C_Pointer getTracePtr() {
+        return thisTracePtr;
+    }        
+    
+    /**
+     * Return boolean value saying if the debug is enabled in LTT or not.<p>
+     * 
+     * Note : this need to be set at construction.
+     * 
+     * @return If the debug is set or not
+     */
+    public boolean isPrintingLttDebug() {
+        return printLttDebug;
+    }
+    
+    /**
+     * Print information for all the tracefiles associated with this trace.
+     * <u>Intended to debug</u><p>
+     * 
+     * This function will call Ltt to print, so information printed will be the
+     * one from the C structure, not the one populated in java.
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.JniTracefile
+     */
+    public void printAllTracefilesInformation() {
+        JniTracefile tracefile = null;
+
+        Iterator<String> iterator = tracefilesMap.keySet().iterator();
+        while (iterator.hasNext()) {
+            tracefile = tracefilesMap.get(iterator.next());
+            tracefile.printTracefileInformation();
+        }
+    }        
+        
+    /**
+     * Print information for this trace. 
+     * <u>Intended to debug</u><p>
+     * 
+     * This function will call Ltt to print, so information printed will be the
+     * one from the C structure, not the one populated in java.<p>
+     * <br>
+     * This function will not throw but will complain loudly if pointer is NULL
+     */
+    public void printTraceInformation() {
+
+        // If null pointer, print a warning!
+        if (thisTracePtr.getPointer() == NULL) {
+            printlnC("Pointer is NULL, cannot print. (printTraceInformation)");
+        } 
+        else {
+            ltt_printTrace( thisTracePtr.getPointer() );
+        }
+    }
+        
+    /**
+     * toString() method. 
+     * <u>Intended to debug</u><br>
+     * 
+     * @return Attributes of the object concatenated in String
+     */
+    @Override
+	public String toString() {
+        String returnData = "";
+        returnData += "tracepath                            : " + tracepath + "\n";
+        returnData += "cpuNumber                            : " + cpuNumber + "\n";
+        returnData += "archType                             : " + archType + "\n";
+        returnData += "archVariant                          : " + archVariant + "\n";
+        returnData += "archSize                             : " + archSize + "\n";
+        returnData += "lttMajorVersion                      : " + lttMajorVersion + "\n";
+        returnData += "lttMinorVersion                      : " + lttMinorVersion + "\n";
+        returnData += "flightRecorder                       : " + flightRecorder + "\n";
+        returnData += "freqScale                            : " + freqScale + "\n";
+        returnData += "startFreq                            : " + startFreq + "\n";
+        returnData += "startTimestampCurrentCounter         : " + startTimestampCurrentCounter + "\n";
+        returnData += "startMonotonic                       : " + startMonotonic + "\n";
+        returnData += "startTimeNoAdjustement               : " + startTimeNoAdjustement.getReferenceToString() + "\n";
+        returnData += "   seconds                           : " + startTimeNoAdjustement.getSeconds() + "\n";
+        returnData += "   nanoSeconds                       : " + startTimeNoAdjustement.getNanoSeconds() + "\n";
+        returnData += "startTime                            : " + startTime.getReferenceToString() + "\n";
+        returnData += "   seconds                           : " + startTime.getSeconds() + "\n";
+        returnData += "   nanoSeconds                       : " + startTime.getNanoSeconds() + "\n";
+        returnData += "endTime                              : " + endTime.getReferenceToString() + "\n";
+        returnData += "   seconds                           : " + endTime.getSeconds() + "\n";
+        returnData += "   nanoSeconds                       : " + endTime.getNanoSeconds() + "\n";
+        returnData += "tracefilesMap                        : " + tracefilesMap.keySet() + "\n";      // Hack to avoid ending up with tracefilesMap.toString()
+
+        return returnData;
+    }
+    
+    
+    // ****************************
+    // **** ABSTRACT FUNCTIONS ****
+    // You MUST override those in your version specific implementation
+    
+    /**
+     * Function place holder to load the correct C library.<p>
+     * <br>
+     * Can be as simple as calling ltt_initializeHandle(LIBRARY_NAME) with the correct .so instead of LIBRARY_NAME.<br>
+     * You may also want to perform some check or some additionnal validations.<br>
+     * <br>
+     * <b>!! Override this with you version specific implementation.</b><br>
+     * 
+     * @return boolean saying if the initialization was successful. 
+     */
+    public abstract boolean initializeLibrary();
+    
+    
+    /**
+     * Function place holder to allocate a new JniTracefile.<p>
+     * 
+     * JniTracefile constructor is non overridable so we need another overridable function to return the correct version of JniTracefile.<br>
+     * Effect of this function should be the same (allocate a fresh new JniTracefile)<br>
+     * <br>
+     * <b>!! Override this with you version specific implementation.</b><br>
+     * 
+     * @param newPtr			The pointer of an already opened LttTracefile C Structure
+     * @param newParentTrace	The JniTrace parent of this tracefile.
+     * 
+     * @return					The newly allocated JniTracefile of the correct version
+     * 
+     * @throws JniException		The construction (allocation) failed.
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.JniTracefile
+     * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer
+     * @see org.eclipse.linuxtools.lttng.jni.JniTrace
+     */
+    public abstract JniTracefile allocateNewJniTracefile(Jni_C_Pointer newPtr, JniTrace newParentTrace) throws JniException;
+    
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTracefile.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTracefile.java
new file mode 100644
index 0000000..e5eb9db
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTracefile.java
@@ -0,0 +1,516 @@
+package org.eclipse.linuxtools.lttng.jni;
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   William Bourque (wbourque@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+
+import java.util.HashMap;
+
+import org.eclipse.linuxtools.lttng.jni.common.JniTime;
+import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+import org.eclipse.linuxtools.lttng.jni.exception.JniNoSuchEventException;
+import org.eclipse.linuxtools.lttng.jni.exception.JniTracefileException;
+import org.eclipse.linuxtools.lttng.jni.exception.JniTracefileWithoutEventException;
+
+/**
+ * <b><u>JniTracefile</u></b>
+ * <p>
+ * A tracefile own an event of a certain type.<br>
+ * Provides access to the LttTracefile C structure in java.
+ * <p>
+ * Most important fields in the JniTracefile are :
+ * <ul>
+ * <li> a JniTracefile path (a tracefile <b>file</b> within a JniTrace directory)
+ * <li> a name (basically the name without the directory part)
+ * <li> a reference to a single event object
+ * <li> a HashMap of marker associated with this tracefile
+ * </ul>
+ */
+public abstract class JniTracefile extends Jni_C_Common {
+        
+    // Internal C pointer of the JniTracefile used in LTT
+    private Jni_C_Pointer thisTracefilePtr = new Jni_C_Pointer();
+    
+    // Reference to the parent trace
+    private JniTrace parentTrace = null;
+    
+    // Data we should populate from LTT
+    // Note that all type have been scaled up as there is no "unsigned" in java
+    // This might be a problem about "unsigned long" as there is no equivalent in java
+    private boolean isCpuOnline = false;
+    private String  tracefilePath = "";
+    private String  tracefileName = "";
+    private long    cpuNumber = 0;
+    private long    tid = 0;
+    private long    pgid = 0;
+    private long    creation = 0;
+    
+    // Internal C pointer for trace and marker
+    private Jni_C_Pointer tracePtr = null;
+    private Jni_C_Pointer markerDataPtr = null;
+    
+    private int     CFileDescriptor = 0;
+    private long    fileSize = 0;
+    private long    blocksNumber = 0;
+    private boolean isBytesOrderReversed = false;
+    private boolean isFloatWordOrdered = false;
+    private long    alignement = 0;
+    private long    bufferHeaderSize = 0;
+    private int     bitsOfCurrentTimestampCounter = 0;
+    private int     bitsOfEvent = 0;
+    private long    currentTimestampCounterMask = 0;
+    private long    currentTimestampCounterMaskNextBit = 0;
+    private long    eventsLost = 0;
+    private long    subBufferCorrupt = 0;
+    private JniEvent   currentEvent = null;
+    
+    // Internal C pointer for trace and marker
+    private Jni_C_Pointer bufferPtr = null;
+    
+    private long    bufferSize = 0;
+
+    // This map will hold markers_info owned by this tracefile
+    private HashMap<Integer, JniMarker> tracefileMarkersMap = null;        
+
+    // Native access functions
+    protected native boolean  ltt_getIsCpuOnline(long tracefilePtr);
+    protected native String   ltt_getTracefilepath(long tracefilePtr);
+    protected native String   ltt_getTracefilename(long tracefilePtr);
+    protected native long     ltt_getCpuNumber(long tracefilePtr);
+    protected native long     ltt_getTid(long tracefilePtr);
+    protected native long     ltt_getPgid(long tracefilePtr);
+    protected native long     ltt_getCreation(long tracefilePtr);
+    protected native long     ltt_getTracePtr(long tracefilePtr);
+    protected native long     ltt_getMarkerDataPtr(long tracefilePtr);
+    protected native int      ltt_getCFileDescriptor(long tracefilePtr);
+    protected native long     ltt_getFileSize(long tracefilePtr);
+    protected native long     ltt_getBlockNumber(long tracefilePtr);
+    protected native boolean  ltt_getIsBytesOrderReversed(long tracefilePtr);
+    protected native boolean  ltt_getIsFloatWordOrdered(long tracefilePtr);
+    protected native long     ltt_getAlignement(long tracefilePtr);
+    protected native long     ltt_getBufferHeaderSize(long tracefilePtr);
+    protected native int      ltt_getBitsOfCurrentTimestampCounter(long tracefilePtr);
+    protected native int      ltt_getBitsOfEvent(long tracefilePtr);
+    protected native long     ltt_getCurrentTimestampCounterMask(long tracefilePtr);
+    protected native long     ltt_getCurrentTimestampCounterMaskNextBit(long tracefilePtr);
+    protected native long     ltt_getEventsLost(long tracefilePtr);
+    protected native long     ltt_getSubBufferCorrupt(long tracefilePtr);
+    protected native long     ltt_getEventPtr(long tracefilePtr);
+    protected native long     ltt_getBufferPtr(long tracefilePtr);
+    protected native long     ltt_getBufferSize(long tracefilePtr);
+
+    // Method to fill a map with marker object
+    protected native void ltt_feedAllMarkers(long tracefilePtr);
+    
+    // Debug native function, ask LTT to print tracefile structure
+    protected native void ltt_printTracefile(long tracefilePtr);
+        
+    /*
+     * Default constructor is forbidden
+     */
+    protected JniTracefile() {
+    }
+
+    /**
+     * Copy constructor.<p>
+     * 
+     * @param oldTracefile      Reference to the JniTracefile you want to copy. 
+     */
+    public JniTracefile(JniTracefile oldTracefile) {
+        thisTracefilePtr    = oldTracefile.thisTracefilePtr;
+        parentTrace         = oldTracefile.parentTrace;
+        tracefileMarkersMap = oldTracefile.tracefileMarkersMap;
+        isCpuOnline         = oldTracefile.isCpuOnline;
+        tracefilePath       = oldTracefile.tracefilePath;
+        tracefileName       = oldTracefile.tracefileName;
+        cpuNumber           = oldTracefile.cpuNumber;
+        tid                 = oldTracefile.tid;
+        pgid                = oldTracefile.pgid;
+        creation            = oldTracefile.creation;
+        tracePtr            = oldTracefile.tracePtr;
+        markerDataPtr       = oldTracefile.markerDataPtr;
+        CFileDescriptor     = oldTracefile.CFileDescriptor;
+        fileSize            = oldTracefile.fileSize;
+        blocksNumber        = oldTracefile.blocksNumber;
+        isBytesOrderReversed = oldTracefile.isBytesOrderReversed;
+        isFloatWordOrdered  = oldTracefile.isFloatWordOrdered;
+        alignement          = oldTracefile.alignement;
+        bufferHeaderSize    = oldTracefile.bufferHeaderSize;
+        bitsOfCurrentTimestampCounter = oldTracefile.bitsOfCurrentTimestampCounter;
+        bitsOfEvent         = oldTracefile.bitsOfEvent;
+        currentTimestampCounterMask = oldTracefile.currentTimestampCounterMask;
+        currentTimestampCounterMaskNextBit = oldTracefile.currentTimestampCounterMaskNextBit;
+        eventsLost          = oldTracefile.eventsLost;
+        subBufferCorrupt    = oldTracefile.subBufferCorrupt;
+        currentEvent        = oldTracefile.currentEvent;
+        bufferPtr           = oldTracefile.bufferPtr;
+        bufferSize          = oldTracefile.bufferSize;
+    }
+
+    /**
+     * Constructor, using C pointer.<p>
+     * 
+     * @param newPtr  			The pointer of an already opened LttTracefile C Structure
+     * @param newParentTrace	The JniTrace parent of this tracefile.
+     * 
+     * @exception JniException
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.JniTrace
+     * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer
+     */
+    public JniTracefile(Jni_C_Pointer newPtr, JniTrace newParentTrace) throws JniException {
+        thisTracefilePtr = newPtr;
+        parentTrace = newParentTrace;
+        tracefileMarkersMap = new HashMap<Integer, JniMarker>();
+
+        // Retrieve the trace file information and load the first event.
+        try {
+            populateTracefileInformation();
+        } catch (JniNoSuchEventException e) {
+            throw new JniTracefileWithoutEventException(
+                    "JniEvent constructor reported that no event of this type are usable. (Jaf_Tracefile)");
+        }
+    }        
+
+    /**
+     * Read the next event of this tracefile.<p>
+     * 
+     * Note : If the read succeed, the event will be populated.<p>
+     *      
+     * @return LTT read status, as defined in Jni_C_Constant
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Constant
+     */
+    public int readNextEvent() {
+        return currentEvent.readNextEvent();
+    }        
+
+    /**
+     * Seek to the given time.<p>
+     * 
+     * Note : If the seek succeed, the event will be populated.
+     * 
+     * @param seekTime      The timestamp where to seek.
+     * 
+     * @return LTT read status, as defined in Jni_C_Constant
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Constant
+     */
+    public int seekToTime(JniTime seekTime) {
+        return currentEvent.seekToTime(seekTime);
+    }
+
+    /* 
+     * This function populates the tracefile data with data from LTT
+     * 
+     * @throws JniException
+     */
+    private void populateTracefileInformation() throws JniException {
+        if (thisTracefilePtr.getPointer() == NULL) {
+            throw new JniTracefileException(
+                    "Pointer is NULL, trace closed? (populateTracefileInformation)");
+        }
+
+        isCpuOnline = ltt_getIsCpuOnline( thisTracefilePtr.getPointer() );
+        tracefilePath = ltt_getTracefilepath( thisTracefilePtr.getPointer() );
+        tracefileName = ltt_getTracefilename( thisTracefilePtr.getPointer() );
+        cpuNumber = ltt_getCpuNumber( thisTracefilePtr.getPointer() );
+        tid = ltt_getTid( thisTracefilePtr.getPointer() );
+        pgid = ltt_getPgid( thisTracefilePtr.getPointer() );
+        creation = ltt_getCreation( thisTracefilePtr.getPointer() );
+        tracePtr = new Jni_C_Pointer(ltt_getTracePtr( thisTracefilePtr.getPointer()) );
+        markerDataPtr = new Jni_C_Pointer(ltt_getMarkerDataPtr( thisTracefilePtr.getPointer()) );
+        CFileDescriptor = ltt_getCFileDescriptor( thisTracefilePtr.getPointer() );
+        fileSize = ltt_getFileSize( thisTracefilePtr.getPointer() );
+        blocksNumber = ltt_getBlockNumber( thisTracefilePtr.getPointer() );
+        isBytesOrderReversed = ltt_getIsBytesOrderReversed( thisTracefilePtr.getPointer() );
+        isFloatWordOrdered = ltt_getIsFloatWordOrdered( thisTracefilePtr.getPointer() );
+        alignement = ltt_getAlignement( thisTracefilePtr.getPointer() );
+        bufferHeaderSize = ltt_getBufferHeaderSize( thisTracefilePtr.getPointer() );
+        bitsOfCurrentTimestampCounter = ltt_getBitsOfCurrentTimestampCounter( thisTracefilePtr.getPointer() );
+        bitsOfEvent = ltt_getBitsOfEvent( thisTracefilePtr.getPointer() );
+        currentTimestampCounterMask = ltt_getCurrentTimestampCounterMask( thisTracefilePtr.getPointer() );
+        currentTimestampCounterMaskNextBit = ltt_getCurrentTimestampCounterMaskNextBit( thisTracefilePtr.getPointer() );
+        eventsLost = ltt_getEventsLost( thisTracefilePtr.getPointer() );
+        subBufferCorrupt = ltt_getSubBufferCorrupt( thisTracefilePtr.getPointer() );
+        bufferPtr = new Jni_C_Pointer(ltt_getBufferPtr( thisTracefilePtr.getPointer()) );
+        bufferSize = ltt_getBufferSize( thisTracefilePtr.getPointer() );
+
+        // To fill the map is a bit different
+        ltt_feedAllMarkers( thisTracefilePtr.getPointer() );
+
+        Jni_C_Pointer tmpEventPointer = new Jni_C_Pointer(ltt_getEventPtr(thisTracefilePtr.getPointer()));
+        currentEvent = allocateNewJniEvent(tmpEventPointer , tracefileMarkersMap, this);
+    }        
+    
+    /* 
+     * Fills a map of all the markers associated with this tracefile.
+     * 
+     * Note: This function is called from C and there is no way to propagate
+     * exception back to the caller without crashing JNI. Therefore, it MUST
+     * catch all exceptions.
+     * 
+     * @param markerId          Id of the marker (int)
+     * @param markerInfoPtr     C Pointer to a marker_info C structure 
+     */
+	private void addMarkersFromC(int markerId, long markerInfoPtr) {
+        // Create a new tracefile object and insert it in the map
+        // the tracefile fill itself with LTT data while being constructed
+        try {
+            JniMarker newMarker = allocateNewJniMarker( new Jni_C_Pointer(markerInfoPtr) );
+
+            tracefileMarkersMap.put(markerId, newMarker);
+        } catch (Exception e) {
+            printlnC("Failed to add marker to tracefileMarkersMap!(addMarkersFromC)\n\tException raised : " + e.toString());
+        }
+    }
+    
+    // Access to class variable. Most of them doesn't have setter
+    public boolean getIsCpuOnline() {
+        return isCpuOnline;
+    }
+    
+    public String getTracefilePath() {
+        return tracefilePath;
+    }
+
+    public String getTracefileName() {
+        return tracefileName;
+    }
+
+    public long getCpuNumber() {
+        return cpuNumber;
+    }
+
+    public long getTid() {
+        return tid;
+    }
+
+    public long getPgid() {
+        return pgid;
+    }
+
+    public long getCreation() {
+        return creation;
+    }
+
+    public Jni_C_Pointer getTracePtr() {
+        return tracePtr;
+    }
+
+    public Jni_C_Pointer getMarkerDataPtr() {
+        return markerDataPtr;
+    }
+
+    public int getCFileDescriptor() {
+        return CFileDescriptor;
+    }
+
+    public long getFileSize() {
+        return fileSize;
+    }
+
+    public long getBlocksNumber() {
+        return blocksNumber;
+    }
+
+    public boolean getIsBytesOrderReversed() {
+        return isBytesOrderReversed;
+    }
+
+    public boolean getIsFloatWordOrdered() {
+        return isFloatWordOrdered;
+    }
+
+    public long getAlignement() {
+        return alignement;
+    }
+
+    public long getBufferHeaderSize() {
+        return bufferHeaderSize;
+    }
+
+    public int getBitsOfCurrentTimestampCounter() {
+        return bitsOfCurrentTimestampCounter;
+    }
+
+    public int getBitsOfEvent() {
+        return bitsOfEvent;
+    }
+
+    public long getCurrentTimestampCounterMask() {
+        return currentTimestampCounterMask;
+    }
+
+    public long getCurrentTimestampCounterMaskNextBit() {
+        return currentTimestampCounterMaskNextBit;
+    }
+
+    public long getEventsLost() {
+        return eventsLost;
+    }
+
+    public long getSubBufferCorrupt() {
+        return subBufferCorrupt;
+    }
+
+    public JniEvent getCurrentEvent() {
+        return currentEvent;
+    }
+
+    public Jni_C_Pointer getBufferPtr() {
+        return bufferPtr;
+    }
+
+    public long getBufferSize() {
+        return bufferSize;
+    }
+
+    public HashMap<Integer, JniMarker> getTracefileMarkersMap() {
+        return tracefileMarkersMap;
+    }
+
+    /**
+     * Parent trace of this tracefile.<p>
+     *
+     * @return The parent trace
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.JniTrace
+     */
+    public JniTrace getParentTrace() {
+        return parentTrace;
+    }
+    
+    /**
+     * Pointer to the LttTracefile C structure<p>
+     * 
+     * The pointer should only be used <u>INTERNALY</u>, do not use unless you
+     * know what you are doing.<p>
+     * 
+     * @return The actual (long converted) pointer or NULL.
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer
+     */
+    public Jni_C_Pointer getTracefilePtr() {
+        return thisTracefilePtr;
+    }
+    
+    /**
+     * Print information for this tracefile. 
+     * <u>Intended to debug</u><p>
+     * 
+     * This function will call Ltt to print, so information printed will be the
+     * one from the C structure, not the one populated in java.<p>
+     * 
+     * This function will not throw but will complain loudly if pointer is NULL.
+     */
+    public void printTracefileInformation() {
+
+        // If null pointer, print a warning!
+        if (thisTracefilePtr.getPointer() == NULL) {
+            printlnC("Pointer is NULL, cannot print. (printTracefileInformation)");
+        } 
+        else {
+            ltt_printTracefile( thisTracefilePtr.getPointer() );
+        }
+    }
+    
+    /**
+     * toString() method. 
+     * <u>Intended to debug</u><p>
+     * 
+     * @return Attributes of the object concatenated in String
+     */
+	@Override
+	public String toString() {
+        String returnData = "";
+                
+        returnData += "isCpuOnline                        : " + isCpuOnline + "\n";
+        returnData += "tracefilePath                      : " + tracefilePath + "\n";
+        returnData += "tracefileName                      : " + tracefileName + "\n";
+        returnData += "cpuNumber                          : " + cpuNumber + "\n";
+        returnData += "tid                                : " + tid + "\n";
+        returnData += "pgid                               : " + pgid + "\n";
+        returnData += "creation                           : " + creation + "\n";
+        returnData += "tracePtr                           : " + tracePtr + "\n";
+        returnData += "markerDataPtr                      : " + markerDataPtr + "\n";
+        returnData += "CFileDescriptor                    : " + CFileDescriptor + "\n";
+        returnData += "fileSize                           : " + fileSize + "\n";
+        returnData += "blocksNumber                       : " + blocksNumber + "\n";
+        returnData += "isBytesOrderReversed               : " + isBytesOrderReversed + "\n";
+        returnData += "isFloatWordOrdered                 : " + isFloatWordOrdered + "\n";
+        returnData += "alignement                         : " + alignement + "\n";
+        returnData += "bufferHeaderSize                   : " + bufferHeaderSize + "\n";
+        returnData += "bitsOfCurrentTimestampCounter      : " + bitsOfCurrentTimestampCounter + "\n";
+        returnData += "bitsOfEvent                        : " + bitsOfEvent + "\n";
+        returnData += "currentTimestampCounterMask        : " + currentTimestampCounterMask + "\n";
+        returnData += "currentTimestampCounterMaskNextBit : " + currentTimestampCounterMaskNextBit + "\n";
+        returnData += "eventsLost                         : " + eventsLost + "\n";
+        returnData += "subBufferCorrupt                   : " + subBufferCorrupt + "\n";
+        returnData += "currentEvent                       : " + currentEvent.getReferenceToString() + "\n"; // Hack to avoid ending up with event.toString()
+        returnData += "bufferPtr                          : " + bufferPtr + "\n";
+        returnData += "bufferSize                         : " + bufferSize + "\n";
+        returnData += "tracefileMarkersMap                : " + tracefileMarkersMap.keySet() + "\n"; // Hack to avoid ending up with tracefileMarkersMap.toString()
+
+        return returnData;
+    }
+	
+	
+	// ****************************
+    // **** ABSTRACT FUNCTIONS ****
+    // You MUST override those in your version specific implementation
+	
+	
+	/**
+     * Function place holder to allocate a new JniEvent.<p>
+     * <br>
+     * JniEvent constructor is non overridable so we need another overridable function to return the correct version of JniEvent.<br>
+     * Effect of this function should be the same (allocate a fresh new JniEvent).<br>
+     * <br>
+     * <b>!! Override this with you version specific implementation.</b><br>
+     * 
+     * @param newEventPtr			The pointer of an already opened LttEvent C Structure
+     * @param newMarkersMap			An already populated HashMap of JniMarker objects for this new event
+     * @param newParentTracefile	The JniTrace parent of this tracefile.
+     * 
+     * @return						The newly allocated JniEvent of the correct version
+     * 
+     * @throws JniException			The construction (allocation) failed.
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.JniEvent
+     * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer
+     * @see org.eclipse.linuxtools.lttng.jni.JniMarker
+     * @see org.eclipse.linuxtools.lttng.jni.JniTracefile
+     */
+	public abstract JniEvent allocateNewJniEvent(Jni_C_Pointer newEventPtr, HashMap<Integer, JniMarker> newMarkersMap, JniTracefile newParentTracefile) throws JniException;
+    
+	
+	/**
+     * Function place holder to allocate a new JniMarker.<p>
+     * <br>
+     * JniMarker constructor is non overridable so we need another overridable function to return the correct version of JniMarker.<br>
+     * Effect of this function should be the same (allocate a fresh new JniMarker).<br>
+     * <br>
+     * <b>!! Override this with you version specific implementation.</b><br>
+     * 
+     * @param newMarkerPtr			The pointer of an already opened marker_info C Structure
+     * 
+     * @return						The newly allocated JniMarker of the correct version
+     * 
+     * @throws JniException			The construction (allocation) failed.
+     * 
+     * @see org.eclipse.linuxtools.lttng.jni.JniMarker
+     * @see org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer
+     */
+	public abstract JniMarker allocateNewJniMarker(Jni_C_Pointer newMarkerPtr) throws JniException;
+	
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/Jni_C_Common.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/Jni_C_Common.java
new file mode 100644
index 0000000..eb4d38f
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/Jni_C_Common.java
@@ -0,0 +1,52 @@
+package org.eclipse.linuxtools.lttng.jni;
+
+import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Constant;
+
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   William Bourque (wbourque@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+
+/**
+ * <b><u>Jni_C_Common</u></b>
+ * <p>
+ * Common constants and methods that should be shared between JNI objects
+ */
+public abstract class Jni_C_Common extends Jni_C_Constant {
+    
+    // Native console printing function
+    protected native void ltt_printC(String string_to_print);
+
+    /**
+     * Java-side console printing function.<p>
+     * 
+     * Call the C printing function to make sure all printing happen on the same side.
+     * 
+     * @param msg   The string to print in C.
+     */
+    public void printC(String msg) {
+        // Need to escape "%" for C printf 
+        msg = msg.replaceAll("%", "%%");
+        ltt_printC(msg);
+    }
+
+    /**
+     * Java-side console printing function that add carriage return. <p>
+     * 
+     * Call the C printing function to make sure all printing happen on the same side.
+     * 
+     * @param msg   The string to print in C.
+     */
+    public void printlnC(String msg) {
+        printC(msg + "\n");
+    }
+    
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/JniTime.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/JniTime.java
new file mode 100644
index 0000000..dc6d282
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/JniTime.java
@@ -0,0 +1,177 @@
+package org.eclipse.linuxtools.lttng.jni.common;
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   William Bourque (wbourque@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+/**
+ * <b><u>JniTime</u></b>
+ * <p>
+ * Used to store (event, trace, tracefile, ...) timestamp.
+ * 
+ * Mimic the behavior of the LttTime C structure.
+ */
+public class JniTime extends Jni_C_Constant implements Comparable<JniTime>
+{
+    private long time = 0;
+
+    /**
+     * Default constructor.<p>
+     * 
+     * Note : Time will be set to 0.
+     * 
+     */
+    public JniTime() {
+        time = 0;
+    }
+
+    /**
+     * Copy constructor.
+     * 
+     * @param oldTime   Reference to the JniTime you want to copy.           
+     */
+    public JniTime(JniTime oldTime) {
+        time = oldTime.getTime();
+    }
+
+    /**
+     * Constructor with parameters.<p>
+     * 
+     * "LTT style" constructor with Seconds et Nanoseconds
+     * 
+     * @param newSec      Seconds of the JniTime
+     * @param newNanoSec  Nanoseconds of the JniTime
+     */
+    public JniTime(long newSec, long newNanoSec) {
+        time = (newSec * NANO) + newNanoSec;
+    }
+
+    /**
+     * Constructor with parameters.<p>
+     * 
+     * Usual "nanosecond only" constructor.
+     * 
+     * @param newNanoSecTime  Time in nanoseconds
+     */
+    public JniTime(long newNanoSecTime) {
+        time = newNanoSecTime;
+    }
+
+    /**
+     * Second of the time.<p>
+     * 
+     * Returns seconds, i.e. multiple of 1 000 000, of the stored nanoseconds time.
+     * 
+     * @return Second of this time.
+     */
+    public long getSeconds() {
+        return (time / NANO);
+    }
+
+    /**
+     * Getter for the nanosecond of the time.<p>
+     * 
+     * Returns nanoseconds part, i.e. modulo of 1 000 000, of the stored nanoseconds time.
+     * 
+     * @return Nanoseconds of this time
+     */
+    public long getNanoSeconds() {
+        return time % NANO;
+    }
+
+    /**
+     * Full time, in nanoseconds.<p>
+     * 
+     * @return Complete time in nanoseconds
+     */
+    public long getTime() {
+        return time;
+    }
+    
+    /**
+     * Changes the current time for this object<p>
+     * 
+     * @param newTime	New time to set, in nanoseconds.
+     */
+    public void setTime(long newTime) {
+        time = newTime;
+    }
+    
+    /* 
+     * Populate this time object
+     * 
+     * Note: This function is called from C side.
+     * 
+     * @param newTime The time we want to populate
+     */
+    @SuppressWarnings("unused")
+    private void setTimeFromC(long newTime) {
+        time = newTime;
+    }
+    
+    /**
+     * Comparaison operator smaller or equal than "<=" .<p>
+     * 
+     * @param comparedTime  The time we want to compare with this one
+     * 
+     * @return true if compared time is smaller or equal, false otherwise
+     */
+    public boolean isSmallerOrEqual(JniTime comparedTime) {
+
+        // NOTE : We check <= instead of just <
+        // This mean the LEFT OPERAND (comparedTime) always prevails
+        if (this.getTime() <= comparedTime.getTime() ) {
+            return true;
+        } 
+        else {
+            return false;
+        }
+    }
+    
+    /**
+     * compareTo operator.<p>
+     * 
+     * @param right  The time we want to compare with this one
+     * 
+     * @return int of value -1, 0 or 1, as the pased argument is bigger, equal or smaller than this time
+     */
+    public int compareTo(JniTime right) {
+        long leftTime = this.getTime();
+        long rightTime = right.getTime();
+        
+        if ( leftTime < rightTime ) { 
+            return -1;
+        }
+        else if ( leftTime > rightTime ) {
+            return  1;
+        }
+        else {
+            return 0;
+        }
+    }
+    
+    /**
+     * toString() method.
+     * <u>Intended to debug</u><p>
+     * 
+     * NOTE : We output the time in the same format as LTT (seconds and nanosecond separatly)
+     * 
+     * @return String Attributes of the object concatenated in String
+     */
+    @Override
+	public String toString() {
+        String returnData = "";
+
+        returnData += "seconds     : " + this.getSeconds() + "\n";
+        returnData += "nanoSeconds : " + this.getNanoSeconds() + "\n";
+
+        return returnData;
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/Jni_C_Constant.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/Jni_C_Constant.java
new file mode 100644
index 0000000..b6bc195
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/Jni_C_Constant.java
@@ -0,0 +1,48 @@
+package org.eclipse.linuxtools.lttng.jni.common;
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   William Bourque (wbourque@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+/**
+ * <b><u>Jni_C_Common</u></b>
+ * <p>
+ * Common constants and methods that should be shared between JNI objects
+ */
+public abstract class Jni_C_Constant {
+    
+    // Needed for native types
+    public static final int NULL = 0;
+
+    // C errno correspondance. Used to interpret LTT return value
+    public static final int EOK    =  0;
+    public static final int EPERM  =  1;
+    public static final int ERANGE = 34;
+    
+    // Timestamps are in nanoseconds, this const ease up the math
+    public static final long NANO = 1000000000;
+    
+    /**
+     * Default constructor
+     */
+    public Jni_C_Constant() {
+    }
+    
+    /**
+     * "Alternate" .toString()<p>
+     * 
+     * Simulates the way Java Object implements "toString()"
+     * 
+     * @return The Java hashed UID of the object (i.e. : NAME@HASH)
+     */
+    public String getReferenceToString() {
+        return this.getClass().getName() + "@" + Integer.toHexString(this.hashCode());
+    }
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/Jni_C_Pointer.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/Jni_C_Pointer.java
new file mode 100644
index 0000000..0dca5de
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/Jni_C_Pointer.java
@@ -0,0 +1,104 @@
+package org.eclipse.linuxtools.lttng.jni.common;
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   William Bourque (wbourque@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+/**
+ * <b><u>Jni_C_Pointer</u></b>
+ * <p>
+ * Class pointer to handle properly "C pointer" <p>
+ * 
+ * Can transparently handle pointer of 32 or 64 bits.
+ */
+public class Jni_C_Pointer extends Jni_C_Constant {
+
+    private long ptr = NULL;
+    private boolean isLong = true;
+    
+    /**
+     * Default constructor.<p>
+     * 
+     * Note : Pointer will be set to a 64bits "NULL".
+     */
+    public Jni_C_Pointer() {
+        ptr  = NULL;
+    }
+    
+    /**
+     * Constructor with parameters for 64bits pointers.
+     * 
+     * @param newPtr    long-converted (64 bits) C pointer.
+     */
+    public Jni_C_Pointer(long newPtr) {
+        ptr = newPtr;
+        isLong = true; 
+    }
+    
+    /**
+     * Constructor with parameters for 32bits pointers.
+     * 
+     * @param newPtr    int-converted (32 bits) C pointer.
+     */
+    public Jni_C_Pointer(int newPtr) {
+        ptr = (long)newPtr;
+        isLong = false; 
+    }
+    
+    /**
+     * Get the current pointer.
+     * 
+     * @return  The current pointer, in long.
+     */
+    public long getPointer() {
+        return ptr;
+    }
+    
+    /**
+     * Set the pointer, as a 64bits pointer.
+     * 
+     * @param newPtr    long-converted (64 bits) C pointer.
+     */
+    public void setPointer(long newPtr) {
+        ptr = newPtr;
+        isLong = true;
+    }
+    
+    /**
+     * Set the pointer, as a 64bits pointer.
+     * 
+     * @param newPtr    int-converted (32 bits) C pointer.
+     */
+    public void setPointer(int newPtr) {
+        ptr = newPtr;
+        isLong = false;
+    }
+
+    /**
+     * toString() method. <p>
+     * 
+     * Convert the pointer to a nice looking int/long hexadecimal format. 
+     * 
+     * @return Attributes of the object concatenated in String
+     */
+    @Override
+    public String toString() {
+        String returnData = "0x";
+
+        if (isLong == true) {
+            returnData += Long.toHexString(ptr);
+        }
+        else {
+            returnData += Integer.toHexString((int) ptr);
+        }
+
+        return returnData;
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniEventException.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniEventException.java
new file mode 100644
index 0000000..a63ac73
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniEventException.java
@@ -0,0 +1,14 @@
+package org.eclipse.linuxtools.lttng.jni.exception;
+
+/**
+ * <b><u>JniEventException</u></b>
+ * <p>
+ * Basic exception class for the JniEvent class
+ */
+public class JniEventException extends JniException {
+    private static final long serialVersionUID = -5891749130387304519L;
+
+    public JniEventException(String errMsg) {
+        super(errMsg);
+    }
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniEventOutOfRangeException.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniEventOutOfRangeException.java
new file mode 100644
index 0000000..e751ae9
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniEventOutOfRangeException.java
@@ -0,0 +1,17 @@
+package org.eclipse.linuxtools.lttng.jni.exception;
+
+/**
+ * <b><u>JniEventOutOfRangeException</u></b>
+ * <p>
+ * Sub-exception type for the JniEventException type
+ * This exception type will get thrown when there is no more event of this type
+ * available
+ */
+public class JniEventOutOfRangeException extends JniEventException {
+    private static final long serialVersionUID = -4645877232795324541L;
+
+    public JniEventOutOfRangeException(String errMsg) {
+        super(errMsg);
+    }
+}
+
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniException.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniException.java
new file mode 100644
index 0000000..1ba46b7
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniException.java
@@ -0,0 +1,27 @@
+package org.eclipse.linuxtools.lttng.jni.exception;
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   William Bourque (wbourque@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+
+/**
+ * <b><u>JniException</u></b>
+ * <p>
+ * Super class for JNI exception.
+ */
+public class JniException extends Exception {
+    private static final long serialVersionUID = -6620784221853154537L;
+
+    public JniException(String errMsg) {
+        super(errMsg);
+    }
+}
+
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniMarkerException.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniMarkerException.java
new file mode 100644
index 0000000..ed2e8a6
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniMarkerException.java
@@ -0,0 +1,14 @@
+package org.eclipse.linuxtools.lttng.jni.exception;
+
+/**
+ * <b><u>JniMarkerException</u></b>
+ * <p>
+ * Basic Exception class for the JniMarker class
+ */
+public class JniMarkerException extends JniException {
+    private static final long serialVersionUID = -4694173610721983794L;
+
+    public JniMarkerException(String errMsg) {
+        super(errMsg);
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniMarkerFieldException.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniMarkerFieldException.java
new file mode 100644
index 0000000..fc78821
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniMarkerFieldException.java
@@ -0,0 +1,14 @@
+package org.eclipse.linuxtools.lttng.jni.exception;
+
+/**
+ * <b><u>JniMarkerFieldException</u></b>
+ * <p>
+ * Basic Exception class for the JniMarkerField class
+ */
+public class JniMarkerFieldException extends JniException {
+    private static final long serialVersionUID = 6066381741374806879L;
+
+    public JniMarkerFieldException(String errMsg) {
+        super(errMsg);
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniNoNextEventInTraceException.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniNoNextEventInTraceException.java
new file mode 100644
index 0000000..87c66b1
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniNoNextEventInTraceException.java
@@ -0,0 +1,17 @@
+package org.eclipse.linuxtools.lttng.jni.exception;
+
+/**
+ * <b><u>JniNoNextEventInTraceException</u></b>
+ * <p>
+ * Sub-exception class type for JniTraceException
+ * This type will get thrown when we can't find any "next" event
+ * This should usually mean there is no more event in the trace
+
+ */
+public class JniNoNextEventInTraceException extends JniTraceException {
+    private static final long serialVersionUID = -2887528566100063849L;
+
+    public JniNoNextEventInTraceException(String errMsg) {
+        super(errMsg);
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniNoSuchEventException.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniNoSuchEventException.java
new file mode 100644
index 0000000..9317d6d
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniNoSuchEventException.java
@@ -0,0 +1,17 @@
+package org.eclipse.linuxtools.lttng.jni.exception;
+
+/**
+ * <b><u>JniNoSuchEventException</u></b>
+ * <p>
+ * Sub-exception type for the JniEventException type
+ * This exception type will get thrown when an event is unavailable
+ * This might happen at construction because some events type are not present in
+ * the trace
+ */
+public class JniNoSuchEventException extends JniEventException {
+    private static final long serialVersionUID = -4379712949891538051L;
+
+    public JniNoSuchEventException(String errMsg) {
+        super(errMsg);
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniOpenTraceFailedException.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniOpenTraceFailedException.java
new file mode 100644
index 0000000..9eb1ffc
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniOpenTraceFailedException.java
@@ -0,0 +1,16 @@
+package org.eclipse.linuxtools.lttng.jni.exception;
+
+/**
+ * <b><u>JniOpenTraceFailedException</u></b>
+ * <p>
+ * Sub-exception class type for JniTraceException
+ * This type will get thrown when a trace fail to open
+ * Most likely to be caused by a bad tracepath
+ */
+public class JniOpenTraceFailedException extends JniTraceException {
+    private static final long serialVersionUID = 877769692366394895L;
+
+    public JniOpenTraceFailedException(String errMsg) {
+        super(errMsg);
+    }
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniTraceException.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniTraceException.java
new file mode 100644
index 0000000..c841627
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniTraceException.java
@@ -0,0 +1,14 @@
+package org.eclipse.linuxtools.lttng.jni.exception;
+
+/**
+ * <b><u>JniTraceException</u></b>
+ * <p>
+ * Basic exception class for the JniTrace class
+ */
+public class JniTraceException extends JniException {
+    private static final long serialVersionUID = -6873007333085268143L;
+
+    public JniTraceException(String errMsg) {
+        super(errMsg);
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniTraceVersionException.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniTraceVersionException.java
new file mode 100644
index 0000000..6d07a18
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniTraceVersionException.java
@@ -0,0 +1,14 @@
+package org.eclipse.linuxtools.lttng.jni.exception;
+
+/**
+ * <b><u>JniTraceVersionException</u></b>
+ * <p>
+ * Basic exception class for the JniTraceVersion class
+ */
+public class JniTraceVersionException extends JniException {
+    private static final long serialVersionUID = -5891749123457304519L;
+
+    public JniTraceVersionException(String errMsg) {
+        super(errMsg);
+    }
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniTracefileException.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniTracefileException.java
new file mode 100644
index 0000000..1dc0d78
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniTracefileException.java
@@ -0,0 +1,14 @@
+package org.eclipse.linuxtools.lttng.jni.exception;
+
+/**
+ * <b><u>JniTracefileException</u></b>
+ * <p>
+ * Basic exception class for the JniTracefile class
+ */
+public class JniTracefileException extends JniException {
+    private static final long serialVersionUID = 5081317864491800084L;
+
+    public JniTracefileException(String errMsg) {
+        super(errMsg);
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniTracefileWithoutEventException.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniTracefileWithoutEventException.java
new file mode 100644
index 0000000..2af158d
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/exception/JniTracefileWithoutEventException.java
@@ -0,0 +1,16 @@
+package org.eclipse.linuxtools.lttng.jni.exception;
+
+/**
+ * <b><u>JniTracefileWithoutEventException</u></b>
+ * <p>
+ * Sub-exception class type for JniTracefileException
+ * This type will get thrown when a trace file contain no readable events
+ * The proper course of action would usually be to ignore this useless trace file
+ */
+public class JniTracefileWithoutEventException extends JniTracefileException {
+    private static final long serialVersionUID = -8183967479236071261L;
+
+    public JniTracefileWithoutEventException(String errMsg) {
+        super(errMsg);
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceFactory.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceFactory.java
new file mode 100644
index 0000000..ac15628
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceFactory.java
@@ -0,0 +1,90 @@
+package org.eclipse.linuxtools.lttng.jni.factory;
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   William Bourque (wbourque@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+import org.eclipse.linuxtools.lttng.jni.JniTrace;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+import org.eclipse.linuxtools.lttng.jni.exception.JniTraceVersionException;
+import org.eclipse.linuxtools.lttng.jni_v2_3.JniTrace_v2_3;
+import org.eclipse.linuxtools.lttng.jni_v2_5.JniTrace_v2_5;
+import org.eclipse.linuxtools.lttng.jni_v2_6.JniTrace_v2_6;
+
+/**
+ * <b><u>JniTraceFactory</u></b>
+ * <p>
+ * This class factory is responsible of returning the correct JniTrace implementation from a (valid) trace path.<p>
+ * 
+ * The different version supported are listed below and the same version string are expected to be returned by JniTraceVersion.<br>
+ * Each version need a different Lttv library so each need its liblttvtraceread-X.Y.so installed and available on the system.
+ * 
+ */
+public class JniTraceFactory {
+	
+	// ***
+	// Version string of the supported library version
+	// These will be used in the switch below to find the correct version
+	// ***
+	static final String TraceVersion_v2_3 = "2.3"; 
+	static final String TraceVersion_v2_5 = "2.5";
+	static final String TraceVersion_v2_6 = "2.6";
+	
+	/*
+	 * Default constructor is forbidden
+	 */
+	private JniTraceFactory(){
+	}
+	
+	/**
+	 * Factory function : return the correct version of the JniTrace from a given path<p>
+	 * NOTE : The correct Lttv library (liblttvtraceread-X.Y.so) need to be installed and accessible otherwise this
+	 * 		  function will return an Exception. 
+	 * 
+	 * If the path is wrong or if the library is not supported (bad version or missing library) an Exception will be throwed. 
+	 * 
+	 * @param path			Path of the trace we want to open
+	 * @param show_debug	Should JniTrace print debug or not?
+	 * 
+	 * @return				a newly allocated JniTrace of the correct version
+	 * 
+	 * @throws JniException
+	 */
+	static public JniTrace getJniTrace(String path, boolean show_debug) throws JniException {
+		
+		try {
+			JniTraceVersion traceVersion = new JniTraceVersion(path);
+			
+			if ( traceVersion.getVersionAsString().equals(TraceVersion_v2_6) ) {
+				return new JniTrace_v2_6(path, show_debug);
+			}
+			else if ( traceVersion.getVersionAsString().equals(TraceVersion_v2_5) ) {
+				return new JniTrace_v2_5(path, show_debug);
+			}
+			else if ( traceVersion.getVersionAsString().equals(TraceVersion_v2_3) ) {
+				return new JniTrace_v2_3(path, show_debug);
+			}
+			else {
+				String errMsg = "\nERROR : Unrecognized/unsupported trace version." +
+								"\nLibrary reported a trace version " + traceVersion.getVersionAsString() + "." + 
+								"\nMake sure you installed the Lttv library that support this version (look for liblttvtraceread-" + traceVersion.getVersionAsString() + ".so).\n"; 
+				throw new JniException(errMsg);
+			}
+		}
+		catch (JniTraceVersionException e) {
+			String errMsg = "\nERROR : Call to JniTraceVersion() failed." +
+							"\nThis usually means that the library (liblttvtraceread_loader.so) could not be found." +
+							"\nMake sure the LTTv library is installed and that your LD_LIBRARY_PATH is set correctly (see help for more details)\n.";
+			
+			throw new JniException(errMsg);
+		}
+	}
+	
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java
new file mode 100644
index 0000000..38ad73a
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java
@@ -0,0 +1,235 @@
+package org.eclipse.linuxtools.lttng.jni.factory;
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   William Bourque (wbourque@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+import org.eclipse.linuxtools.lttng.jni.exception.JniTraceVersionException;
+
+/**
+ * <b><u>JniTraceVersion</u></b>
+ * <p>
+ * This class is responsible of returning the correct version number of a trace at a certain given path.<p>
+ * 
+ * The class will call the C library to get the correct version number from the trace.<p>
+ * 
+ * Lttv library loader (liblttvtraceread_loader.so) and the default Lttv library (liblttvtraceread.so) must be installed on system and available to java.
+ * 
+ */
+public class JniTraceVersion {
+	
+	// Native access functions
+	protected native void ltt_getTraceVersion(String tracepath);
+	protected native void ltt_setLibraryPath(String ldLibraryPath);
+	
+	// Variables to store version number
+	private int majorNumber = 0;
+	private int minorNumber = 0;
+	
+	// To store the given tracepath
+	private String tracepath = "";
+	
+	// Was the trace read already?
+	private boolean wasTraceRead = false;
+	
+	/**
+	 * Default constructor.<p>
+	 * 
+	 * Do nothing, readVersionFromTrace(path) will need to be called by the user
+	 */
+	public JniTraceVersion() {
+		// Nothing to do 
+	}
+	
+	/**
+     * Constructor that takes a tracepath parameter.<p>
+     * 
+     * This constructor read the version number from the trace, so it might throw.
+     * 
+     * @param newTracepath 		The <b>directory</b> of the trace to read.
+     * 
+     * @exception JniException	If the library can not be loaded,if the path is wrong or if something go wrong during the read.
+     */
+	public JniTraceVersion(String newTracepath) throws JniTraceVersionException {
+		// Read the version number from the trace 
+		readVersionFromTrace(newTracepath);
+	}
+	
+	/**
+     * Copy constructor.
+     * 
+     * @param oldVersion  A reference to the JniTraceVersion to copy.           
+     */
+	public JniTraceVersion(JniTraceVersion oldVersion) {
+		majorNumber = oldVersion.majorNumber;
+		minorNumber = oldVersion.minorNumber;
+	}
+	
+	/*
+	 * Read the version from the (already set) tracepath.<p>
+	 * 
+	 * This version is used internally and will silently dismiss any exceptions.
+	 * 
+	 */
+	private void readVersionNumberNofail() {
+		try {
+			readVersionFromTrace(tracepath);
+		}
+		catch(JniTraceVersionException e) { }
+	}
+	
+	/**
+	 * Read the version from the (already set) tracepath.<p>
+	 * 
+	 * This function throw if the library can not be loaded, if the path is wrong or if something go wrong during the read.
+	 * 
+	 */
+	public void readVersionNumber() throws JniTraceVersionException {
+		readVersionFromTrace(tracepath);
+	}
+	
+	/**
+	 * Read the version from a given tracepath.<p>
+	 * MajorVersion and MinorVersion should be set after a successful execution of this function.<br>
+	 * 
+	 * This function throw if the library can not be loaded,if the path is wrong or if something go wrong during the read.
+	 * 
+	 */
+	public void readVersionFromTrace(String newTracepath) throws JniTraceVersionException {
+		
+		// Verify that the tracepath isn't obliviously wrong (null or empty)
+		if ( (newTracepath == null) || (newTracepath.equals("") ) ) {
+			throw new JniTraceVersionException("ERROR : Tracepath is null or empty! (readVersionNumber)");
+		}
+		else {
+			// Otherwise set the path in case it was changed
+			tracepath = newTracepath;
+		}
+		
+		try {
+			// Load the C library here. 
+			// If LD_LIBRARY_PATH is not set correctly this will raise a java.lang.UnsatisfiedLinkError
+			System.loadLibrary("lttvtraceread_loader");
+			
+			// Assuming the C library loaded correctly, call the JNI here.
+			ltt_getTraceVersion(tracepath);
+			
+			// We can now assume that the trace was read
+			wasTraceRead = true;
+		}
+		// The library was unable to load -> Lttv not installed or bad version of it? 
+		catch (java.lang.UnsatisfiedLinkError e) {
+			throw new JniTraceVersionException("\nERROR : Could not get trace version. Is the library missing?" +
+											   "\nMake sure your \"LD_LIBRARY_PATH\" is setted correctly (readVersionNumber)\n");
+		}
+		// Something else failed -> Possibly a bad tracepath was given 
+		catch (Exception e) {
+			throw new JniTraceVersionException("\nERROR : Call to ltt_getTraceVersion failed. (readVersionNumber)\n");
+		}
+	}
+	
+	/**
+	 * Get major version number of the trace.<p>
+	 * Note : readVersionFromTrace() will be called if it wasn't done but exception will be silently ignored.
+	 * 
+	 * @return major version
+	 */
+	public int getMajor() {
+		if ( wasTraceRead == false ) {
+			readVersionNumberNofail();
+		}
+		
+		return majorNumber;
+	}
+	
+	/**
+	 * Get minor version number of the trace.<p>
+	 * Note : readVersionFromTrace() will be called if it wasn't done but exception will be silently ignored.
+	 * 
+	 * @return minor version
+	 */
+	public int getMinor() {
+		if ( wasTraceRead == false ) {
+			readVersionNumberNofail();
+		}
+		
+		return minorNumber;
+	}
+	
+	/**
+	 * Get full version number of the trace.<p>
+	 * Note : readVersionFromTrace() will be called if it wasn't done but exception will be silently ignored.
+	 * 
+	 * @return Full Version as float
+	 */
+	public float getVersionAsFloat()  {
+		if ( wasTraceRead == false ) {
+			readVersionNumberNofail();
+		}
+		
+		return ((float)majorNumber + ((float)minorNumber)/10);
+	}
+	
+	/**
+	 * Get full version number of the trace.<p>
+	 * Note : readVersionFromTrace() will be called if it wasn't done but exception will be silently ignored.
+	 * 
+	 * @return Full Version as string
+	 */
+	public String getVersionAsString()  {
+		if ( wasTraceRead == false ) {
+			readVersionNumberNofail();
+		}
+		
+		return majorNumber + "." + minorNumber;
+	}
+	
+	/**
+	 * Get for the current tracepath
+	 * 
+	 * @return The tracepath was are currently using.
+	 */
+	public String getTracepath() {
+		return tracepath;
+	}
+	
+	/**
+	 * Set for the tracepath.<p>
+	 * NOTE  : Changing this will reset the version number currently loaded.
+	 * NOTE2 : readVersionFromTrace() will be called but exception will be silently ignored.
+	 * 
+	 * @param newtracepath The net tracepath
+	 */
+	public void setTracepath(String newtracepath) {
+		majorNumber = 0;
+		minorNumber = 0;
+		wasTraceRead = false;
+		tracepath = newtracepath;
+		
+		// Call the read function. This will fill up all the number if it goes well.
+		readVersionNumberNofail();
+	}
+	
+	/*
+	 * This function is be called from the C side to assign the version number the Java variable.
+	 */
+	private void setTraceVersionFromC(int newMajor, int newMinor) {
+		majorNumber = newMajor;
+		minorNumber = newMinor;
+    }
+	
+    
+	@Override
+	public String toString() {
+		return "JniTraceVersion [" + majorNumber + "." + minorNumber + "]";
+	}
+	
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniEvent_v2_3.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniEvent_v2_3.java
new file mode 100644
index 0000000..63e1809
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniEvent_v2_3.java
@@ -0,0 +1,29 @@
+package org.eclipse.linuxtools.lttng.jni_v2_3;
+
+import java.util.HashMap;
+
+import org.eclipse.linuxtools.lttng.jni.JniEvent;
+import org.eclipse.linuxtools.lttng.jni.JniMarker;
+import org.eclipse.linuxtools.lttng.jni.JniTracefile;
+import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+
+public class JniEvent_v2_3 extends JniEvent {
+
+	
+	protected JniEvent_v2_3() {
+		super();
+    }
+	
+	public JniEvent_v2_3(JniEvent_v2_3 oldEvent) {
+		super(oldEvent);
+	}
+    
+    
+    
+    public JniEvent_v2_3(Jni_C_Pointer newEventPtr, HashMap<Integer, JniMarker> newMarkersMap, JniTracefile newParentTracefile) throws JniException {
+    	super(newEventPtr, newMarkersMap, newParentTracefile);
+    }
+
+	
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniMarkerField_v2_3.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniMarkerField_v2_3.java
new file mode 100644
index 0000000..468d6e6
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniMarkerField_v2_3.java
@@ -0,0 +1,23 @@
+package org.eclipse.linuxtools.lttng.jni_v2_3;
+
+import org.eclipse.linuxtools.lttng.jni.JniMarkerField;
+import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+
+public class JniMarkerField_v2_3 extends JniMarkerField {
+	
+	protected JniMarkerField_v2_3() {
+		super();
+    }
+	
+	
+    public JniMarkerField_v2_3(JniMarkerField_v2_3 oldMarkerField) {
+    	super(oldMarkerField);
+    }
+    
+    
+    public JniMarkerField_v2_3(Jni_C_Pointer newMarkerFieldPtr) throws JniException {
+    	super(newMarkerFieldPtr);
+    }
+    
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniMarker_v2_3.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniMarker_v2_3.java
new file mode 100644
index 0000000..06fed6e
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniMarker_v2_3.java
@@ -0,0 +1,30 @@
+package org.eclipse.linuxtools.lttng.jni_v2_3;
+
+import org.eclipse.linuxtools.lttng.jni.JniMarker;
+import org.eclipse.linuxtools.lttng.jni.JniMarkerField;
+import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+
+public class JniMarker_v2_3 extends JniMarker {
+
+	protected JniMarker_v2_3() {
+		super();
+    }
+    
+    
+    public JniMarker_v2_3(JniMarker_v2_3 oldMarker) {
+    	super(oldMarker);
+    }
+    
+    
+    public JniMarker_v2_3(Jni_C_Pointer newMarkerPtr) throws JniException {
+    	super(newMarkerPtr);
+    }
+	
+    
+    @Override
+	public JniMarkerField allocateNewJniMarkerField(Jni_C_Pointer newMarkerFieldPtr) throws JniException {
+    	return new JniMarkerField_v2_3(newMarkerFieldPtr);
+    }
+    
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniParser_v2_3.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniParser_v2_3.java
new file mode 100644
index 0000000..675ffc1
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniParser_v2_3.java
@@ -0,0 +1,10 @@
+package org.eclipse.linuxtools.lttng.jni_v2_3;
+
+import org.eclipse.linuxtools.lttng.jni.JniParser;
+
+public class JniParser_v2_3 extends JniParser {
+
+	protected JniParser_v2_3() {
+		super();
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniTrace_v2_3.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniTrace_v2_3.java
new file mode 100644
index 0000000..01e5d04
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniTrace_v2_3.java
@@ -0,0 +1,47 @@
+package org.eclipse.linuxtools.lttng.jni_v2_3;
+
+import org.eclipse.linuxtools.lttng.jni.JniTrace;
+import org.eclipse.linuxtools.lttng.jni.JniTracefile;
+import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+
+public class JniTrace_v2_3 extends JniTrace {
+	
+	private static final String LIBRARY_NAME = "liblttvtraceread-2.3.so";
+	
+	protected JniTrace_v2_3() {
+		super();
+    }
+    
+	public JniTrace_v2_3(String newpath) throws JniException {
+		super(newpath);
+	}
+	
+    public JniTrace_v2_3(String newpath, boolean newPrintDebug) throws JniException {
+    	super(newpath, newPrintDebug);
+    }
+    
+    
+    public JniTrace_v2_3(JniTrace_v2_3 oldTrace) {
+    	super(oldTrace);
+    }        
+    
+    public JniTrace_v2_3(Jni_C_Pointer newPtr, boolean newPrintDebug) throws JniException {
+    	super(newPtr, newPrintDebug);
+    }
+    
+    
+    @Override
+	public boolean initializeLibrary() {
+    	return ltt_initializeHandle(LIBRARY_NAME);
+    }
+    
+    
+    @Override
+	public JniTracefile allocateNewJniTracefile(Jni_C_Pointer newPtr, JniTrace newParentTrace) throws JniException {
+    	return new JniTracefile_v2_3(newPtr, newParentTrace);
+    }
+    
+    
+    
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniTracefile_v2_3.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniTracefile_v2_3.java
new file mode 100644
index 0000000..1e2da28
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniTracefile_v2_3.java
@@ -0,0 +1,38 @@
+package org.eclipse.linuxtools.lttng.jni_v2_3;
+
+import java.util.HashMap;
+
+import org.eclipse.linuxtools.lttng.jni.JniEvent;
+import org.eclipse.linuxtools.lttng.jni.JniMarker;
+import org.eclipse.linuxtools.lttng.jni.JniTrace;
+import org.eclipse.linuxtools.lttng.jni.JniTracefile;
+import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+
+public class JniTracefile_v2_3 extends JniTracefile {
+	
+    protected JniTracefile_v2_3() {
+    	super();
+    }
+    
+    public JniTracefile_v2_3(JniTracefile_v2_3 oldTracefile) {
+    	super(oldTracefile);
+    }
+    
+    public JniTracefile_v2_3(Jni_C_Pointer newPtr, JniTrace newParentTrace) throws JniException {
+    	super(newPtr, newParentTrace);
+    }
+	
+    
+    @Override
+	public JniEvent allocateNewJniEvent(Jni_C_Pointer newEventPtr, HashMap<Integer, JniMarker> newMarkersMap, JniTracefile newParentTracefile) throws JniException {
+    	return new JniEvent_v2_3(newEventPtr, newMarkersMap, newParentTracefile);
+    }
+    
+    
+    @Override
+	public JniMarker allocateNewJniMarker(Jni_C_Pointer newMarkerPtr) throws JniException {
+    	return new JniMarker_v2_3(newMarkerPtr);
+    }
+    
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/Jni_C_Common_v2_3.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/Jni_C_Common_v2_3.java
new file mode 100644
index 0000000..78df570
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/Jni_C_Common_v2_3.java
@@ -0,0 +1,9 @@
+package org.eclipse.linuxtools.lttng.jni_v2_3;
+
+public class Jni_C_Common_v2_3 extends org.eclipse.linuxtools.lttng.jni.Jni_C_Common {
+
+	static {
+		System.loadLibrary("lttvtraceread2.3");
+	}
+	
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniEvent_v2_5.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniEvent_v2_5.java
new file mode 100644
index 0000000..046dd45
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniEvent_v2_5.java
@@ -0,0 +1,29 @@
+package org.eclipse.linuxtools.lttng.jni_v2_5;
+
+import java.util.HashMap;
+
+import org.eclipse.linuxtools.lttng.jni.JniEvent;
+import org.eclipse.linuxtools.lttng.jni.JniMarker;
+import org.eclipse.linuxtools.lttng.jni.JniTracefile;
+import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+
+public class JniEvent_v2_5 extends JniEvent {
+
+	
+	protected JniEvent_v2_5() {
+		super();
+    }
+	
+	public JniEvent_v2_5(JniEvent_v2_5 oldEvent) {
+		super(oldEvent);
+	}
+    
+    
+    
+    public JniEvent_v2_5(Jni_C_Pointer newEventPtr, HashMap<Integer, JniMarker> newMarkersMap, JniTracefile newParentTracefile) throws JniException {
+    	super(newEventPtr, newMarkersMap, newParentTracefile);
+    }
+
+	
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniMarkerField_v2_5.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniMarkerField_v2_5.java
new file mode 100644
index 0000000..0ebcb14
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniMarkerField_v2_5.java
@@ -0,0 +1,23 @@
+package org.eclipse.linuxtools.lttng.jni_v2_5;
+
+import org.eclipse.linuxtools.lttng.jni.JniMarkerField;
+import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+
+public class JniMarkerField_v2_5 extends JniMarkerField {
+	
+	protected JniMarkerField_v2_5() {
+		super();
+    }
+	
+	
+    public JniMarkerField_v2_5(JniMarkerField_v2_5 oldMarkerField) {
+    	super(oldMarkerField);
+    }
+    
+    
+    public JniMarkerField_v2_5(Jni_C_Pointer newMarkerFieldPtr) throws JniException {
+    	super(newMarkerFieldPtr);
+    }
+    
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniMarker_v2_5.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniMarker_v2_5.java
new file mode 100644
index 0000000..5620782
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniMarker_v2_5.java
@@ -0,0 +1,30 @@
+package org.eclipse.linuxtools.lttng.jni_v2_5;
+
+import org.eclipse.linuxtools.lttng.jni.JniMarker;
+import org.eclipse.linuxtools.lttng.jni.JniMarkerField;
+import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+
+public class JniMarker_v2_5 extends JniMarker {
+	
+	protected JniMarker_v2_5() {
+		super();
+    }
+    
+    
+    public JniMarker_v2_5(JniMarker_v2_5 oldMarker) {
+    	super(oldMarker);
+    }
+    
+    
+    public JniMarker_v2_5(Jni_C_Pointer newMarkerPtr) throws JniException {
+    	super(newMarkerPtr);
+    }
+	
+    
+    @Override
+	public JniMarkerField allocateNewJniMarkerField(Jni_C_Pointer newMarkerFieldPtr) throws JniException {
+    	return new JniMarkerField_v2_5(newMarkerFieldPtr);
+    }
+    
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniParser_v2_5.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniParser_v2_5.java
new file mode 100644
index 0000000..d8f05b2
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniParser_v2_5.java
@@ -0,0 +1,10 @@
+package org.eclipse.linuxtools.lttng.jni_v2_5;
+
+import org.eclipse.linuxtools.lttng.jni.JniParser;
+
+public class JniParser_v2_5 extends JniParser {
+
+	protected JniParser_v2_5() {
+		super();
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniTrace_v2_5.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniTrace_v2_5.java
new file mode 100644
index 0000000..30fb8e6
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniTrace_v2_5.java
@@ -0,0 +1,46 @@
+package org.eclipse.linuxtools.lttng.jni_v2_5;
+
+import org.eclipse.linuxtools.lttng.jni.JniTrace;
+import org.eclipse.linuxtools.lttng.jni.JniTracefile;
+import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+
+public class JniTrace_v2_5 extends JniTrace {
+	
+	private static final String LIBRARY_NAME = "liblttvtraceread-2.5.so";
+	
+	protected JniTrace_v2_5() {
+		super();
+    }
+    
+	public JniTrace_v2_5(String newpath) throws JniException {
+		super(newpath);
+	}
+	
+    public JniTrace_v2_5(String newpath, boolean newPrintDebug) throws JniException {
+    	super(newpath, newPrintDebug);
+    }
+    
+    
+    public JniTrace_v2_5(JniTrace_v2_5 oldTrace) {
+    	super(oldTrace);
+    }        
+    
+    public JniTrace_v2_5(Jni_C_Pointer newPtr, boolean newPrintDebug) throws JniException {
+    	super(newPtr, newPrintDebug);
+    }
+    
+    
+    @Override
+	public boolean initializeLibrary() {
+    	return ltt_initializeHandle(LIBRARY_NAME);
+    }
+    
+    @Override
+	public JniTracefile allocateNewJniTracefile(Jni_C_Pointer newPtr, JniTrace newParentTrace) throws JniException {
+    	return new JniTracefile_v2_5(newPtr, newParentTrace);
+    }
+    
+    
+    
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniTracefile_v2_5.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniTracefile_v2_5.java
new file mode 100644
index 0000000..60b07ba
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniTracefile_v2_5.java
@@ -0,0 +1,38 @@
+package org.eclipse.linuxtools.lttng.jni_v2_5;
+
+import java.util.HashMap;
+
+import org.eclipse.linuxtools.lttng.jni.JniEvent;
+import org.eclipse.linuxtools.lttng.jni.JniMarker;
+import org.eclipse.linuxtools.lttng.jni.JniTrace;
+import org.eclipse.linuxtools.lttng.jni.JniTracefile;
+import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+
+public class JniTracefile_v2_5 extends JniTracefile {
+	
+    protected JniTracefile_v2_5() {
+    	super();
+    }
+    
+    public JniTracefile_v2_5(JniTracefile_v2_5 oldTracefile) {
+    	super(oldTracefile);
+    }
+    
+    public JniTracefile_v2_5(Jni_C_Pointer newPtr, JniTrace newParentTrace) throws JniException {
+    	super(newPtr, newParentTrace);
+    }
+	
+    
+    @Override
+	public JniEvent allocateNewJniEvent(Jni_C_Pointer newEventPtr, HashMap<Integer, JniMarker> newMarkersMap, JniTracefile newParentTracefile) throws JniException {
+    	return new JniEvent_v2_5(newEventPtr, newMarkersMap, newParentTracefile);
+    }
+    
+    
+    @Override
+	public JniMarker allocateNewJniMarker(Jni_C_Pointer newMarkerPtr) throws JniException {
+    	return new JniMarker_v2_5(newMarkerPtr);
+    }
+    
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniEvent_v2_6.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniEvent_v2_6.java
new file mode 100644
index 0000000..8477403
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniEvent_v2_6.java
@@ -0,0 +1,29 @@
+package org.eclipse.linuxtools.lttng.jni_v2_6;
+
+import java.util.HashMap;
+
+import org.eclipse.linuxtools.lttng.jni.JniEvent;
+import org.eclipse.linuxtools.lttng.jni.JniMarker;
+import org.eclipse.linuxtools.lttng.jni.JniTracefile;
+import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+
+public class JniEvent_v2_6 extends JniEvent {
+
+	
+	protected JniEvent_v2_6() {
+		super();
+    }
+	
+	public JniEvent_v2_6(JniEvent_v2_6 oldEvent) {
+		super(oldEvent);
+	}
+    
+    
+    
+    public JniEvent_v2_6(Jni_C_Pointer newEventPtr, HashMap<Integer, JniMarker> newMarkersMap, JniTracefile newParentTracefile) throws JniException {
+    	super(newEventPtr, newMarkersMap, newParentTracefile);
+    }
+
+	
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniMarkerField_v2_6.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniMarkerField_v2_6.java
new file mode 100644
index 0000000..67d4dc2
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniMarkerField_v2_6.java
@@ -0,0 +1,23 @@
+package org.eclipse.linuxtools.lttng.jni_v2_6;
+
+import org.eclipse.linuxtools.lttng.jni.JniMarkerField;
+import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+
+public class JniMarkerField_v2_6 extends JniMarkerField {
+	
+	protected JniMarkerField_v2_6() {
+		super();
+    }
+	
+	
+    public JniMarkerField_v2_6(JniMarkerField_v2_6 oldMarkerField) {
+    	super(oldMarkerField);
+    }
+    
+    
+    public JniMarkerField_v2_6(Jni_C_Pointer newMarkerFieldPtr) throws JniException {
+    	super(newMarkerFieldPtr);
+    }
+    
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniMarker_v2_6.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniMarker_v2_6.java
new file mode 100644
index 0000000..0d23326
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniMarker_v2_6.java
@@ -0,0 +1,30 @@
+package org.eclipse.linuxtools.lttng.jni_v2_6;
+
+import org.eclipse.linuxtools.lttng.jni.JniMarker;
+import org.eclipse.linuxtools.lttng.jni.JniMarkerField;
+import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+
+public class JniMarker_v2_6 extends JniMarker {
+	
+	protected JniMarker_v2_6() {
+		super();
+    }
+    
+    
+    public JniMarker_v2_6(JniMarker_v2_6 oldMarker) {
+    	super(oldMarker);
+    }
+    
+    
+    public JniMarker_v2_6(Jni_C_Pointer newMarkerPtr) throws JniException {
+    	super(newMarkerPtr);
+    }
+	
+    
+    @Override
+	public JniMarkerField allocateNewJniMarkerField(Jni_C_Pointer newMarkerFieldPtr) throws JniException {
+    	return new JniMarkerField_v2_6(newMarkerFieldPtr);
+    }
+    
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniParser_v2_6.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniParser_v2_6.java
new file mode 100644
index 0000000..e6922bd
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniParser_v2_6.java
@@ -0,0 +1,10 @@
+package org.eclipse.linuxtools.lttng.jni_v2_6;
+
+import org.eclipse.linuxtools.lttng.jni.JniParser;
+
+public class JniParser_v2_6 extends JniParser {
+
+	protected JniParser_v2_6() {
+		super();
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniTrace_v2_6.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniTrace_v2_6.java
new file mode 100644
index 0000000..c021af8
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniTrace_v2_6.java
@@ -0,0 +1,46 @@
+package org.eclipse.linuxtools.lttng.jni_v2_6;
+
+import org.eclipse.linuxtools.lttng.jni.JniTrace;
+import org.eclipse.linuxtools.lttng.jni.JniTracefile;
+import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+
+public class JniTrace_v2_6 extends JniTrace {
+	
+	private static final String LIBRARY_NAME = "liblttvtraceread-2.6.so";
+	
+	protected JniTrace_v2_6() {
+		super();
+    }
+    
+	public JniTrace_v2_6(String newpath) throws JniException {
+		super(newpath);
+	}
+	
+    public JniTrace_v2_6(String newpath, boolean newPrintDebug) throws JniException {
+    	super(newpath, newPrintDebug);
+    }
+    
+    
+    public JniTrace_v2_6(JniTrace_v2_6 oldTrace) {
+    	super(oldTrace);
+    }        
+    
+    public JniTrace_v2_6(Jni_C_Pointer newPtr, boolean newPrintDebug) throws JniException {
+    	super(newPtr, newPrintDebug);
+    }
+    
+    
+    @Override
+	public boolean initializeLibrary() {
+    	return ltt_initializeHandle(LIBRARY_NAME);
+    }
+    
+    @Override
+	public JniTracefile allocateNewJniTracefile(Jni_C_Pointer newPtr, JniTrace newParentTrace) throws JniException {
+    	return new JniTracefile_v2_6(newPtr, newParentTrace);
+    }
+    
+    
+    
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniTracefile_v2_6.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniTracefile_v2_6.java
new file mode 100644
index 0000000..6087fdc
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniTracefile_v2_6.java
@@ -0,0 +1,38 @@
+package org.eclipse.linuxtools.lttng.jni_v2_6;
+
+import java.util.HashMap;
+
+import org.eclipse.linuxtools.lttng.jni.JniEvent;
+import org.eclipse.linuxtools.lttng.jni.JniMarker;
+import org.eclipse.linuxtools.lttng.jni.JniTrace;
+import org.eclipse.linuxtools.lttng.jni.JniTracefile;
+import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+
+public class JniTracefile_v2_6 extends JniTracefile {
+	
+    protected JniTracefile_v2_6() {
+    	super();
+    }
+    
+    public JniTracefile_v2_6(JniTracefile_v2_6 oldTracefile) {
+    	super(oldTracefile);
+    }
+    
+    public JniTracefile_v2_6(Jni_C_Pointer newPtr, JniTrace newParentTrace) throws JniException {
+    	super(newPtr, newParentTrace);
+    }
+	
+    
+    @Override
+	public JniEvent allocateNewJniEvent(Jni_C_Pointer newEventPtr, HashMap<Integer, JniMarker> newMarkersMap, JniTracefile newParentTracefile) throws JniException {
+    	return new JniEvent_v2_6(newEventPtr, newMarkersMap, newParentTracefile);
+    }
+    
+    
+    @Override
+	public JniMarker allocateNewJniMarker(Jni_C_Pointer newMarkerPtr) throws JniException {
+    	return new JniMarker_v2_6(newMarkerPtr);
+    }
+    
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.test-feature/.project b/lttng/org.eclipse.linuxtools.lttng.test-feature/.project
new file mode 100644
index 0000000..12910aa
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.test-feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.lttng.test-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/lttng/org.eclipse.linuxtools.lttng.test-feature/build.properties b/lttng/org.eclipse.linuxtools.lttng.test-feature/build.properties
new file mode 100644
index 0000000..3b49e4c
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.test-feature/build.properties
@@ -0,0 +1,8 @@
+bin.includes = feature.xml,\
+               build.properties,\
+               epl-v10.html,\
+               feature.properties
+src.includes = build.properties,\
+               epl-v10.html,\
+               feature.properties,\
+               feature.xml
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/docs/epl-v10.html b/lttng/org.eclipse.linuxtools.lttng.test-feature/epl-v10.html
similarity index 100%
copy from systemtap/SystemTapGuiServer/systemtapguiserver-1.0/docs/epl-v10.html
copy to lttng/org.eclipse.linuxtools.lttng.test-feature/epl-v10.html
diff --git a/lttng/org.eclipse.linuxtools.lttng.test-feature/feature.properties b/lttng/org.eclipse.linuxtools.lttng.test-feature/feature.properties
new file mode 100644
index 0000000..d6d5977
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.test-feature/feature.properties
@@ -0,0 +1,112 @@
+#*******************************************************************************
+# Copyright (c) 2008 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Red Hat, Inc. - initial API and implementation
+#********************************************************************************
+featureName=LTTng Tests (Incubation)
+description=Tests for the LTTng integration in Eclipse
+featureProvider=Eclipse
+copyright=Copyright 2010 Ericsson
+licenseURL=epl-v10.html
+license=\
+ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
+March 17, 2005\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse.org CVS\n\
+repository ("Repository") in CVS modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+Features may also include other Features ("Included Features"). Files named\n\
+"feature.xml" may contain a list of the names and version numbers of\n\
+Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+   - The top-level (root) directory\n\
+   - Plug-in and Fragment directories\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
+   - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Eclipse Update Manager, you must agree to a license ("Feature Update\n\
+License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties". Such Abouts,\n\
+Feature Licenses and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
+    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.test-feature/feature.xml b/lttng/org.eclipse.linuxtools.lttng.test-feature/feature.xml
new file mode 100644
index 0000000..0f7e6a8
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.test-feature/feature.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.linuxtools.lttng.tests"
+      label="%featureName"
+      version="0.2.0.qualifier"
+      provider-name="%featureProvider">
+
+   <description url="http://www.example.com/description">
+      %description
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <requires>
+      <import plugin="org.junit"/>
+      <import plugin="org.eclipse.linuxtools.lttng" version="0.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.tmf" version="0.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.lttng.ui" version="0.2.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.linuxtools.lttng.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.lttng.ui.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/profiling/.classpath b/lttng/org.eclipse.linuxtools.lttng.tests/.classpath
similarity index 100%
copy from profiling/.classpath
copy to lttng/org.eclipse.linuxtools.lttng.tests/.classpath
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/.project b/lttng/org.eclipse.linuxtools.lttng.tests/.project
new file mode 100644
index 0000000..2dad815
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.lttng.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..dcdbc74
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.linuxtools.lttng.tests
+Bundle-Version: 0.2.0.qualifier
+Bundle-Vendor: %Bundle-Vendor
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.junit,
+ org.eclipse.linuxtools.lttng;bundle-version="0.2.0",
+ org.eclipse.linuxtools.tmf;bundle-version="0.2.0",
+ org.eclipse.core.runtime;bundle-version="3.5.0",
+ org.eclipse.linuxtools.lttng.jni;bundle-version="0.2.0"
+Bundle-Localization: plugin
+Bundle-Activator: org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin
+Bundle-ActivationPolicy: lazy
+Import-Package: org.eclipse.linuxtools.lttng.jni
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/build.properties b/lttng/org.eclipse.linuxtools.lttng.tests/build.properties
new file mode 100644
index 0000000..d9271d7
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/build.properties
@@ -0,0 +1,7 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.properties,\
+               traceset/,\
+               test.xml
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/plugin.properties b/lttng/org.eclipse.linuxtools.lttng.tests/plugin.properties
new file mode 100644
index 0000000..b04d90e
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/plugin.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.linuxtools.lttng.tests
+Bundle-Vendor = Eclipse
+Bundle-Name = Linux Tracing Toolkit (LTTng) Core Unit Test Suite
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/ActivateDebugging.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/ActivateDebugging.java
new file mode 100644
index 0000000..0552775
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/ActivateDebugging.java
@@ -0,0 +1,14 @@
+package org.eclipse.linuxtools.lttng.tests;
+
+import org.eclipse.linuxtools.lttng.TraceDebug;
+
+public class ActivateDebugging {
+
+	public static void activate() {
+		TraceDebug.setDEBUG(true);
+	}
+	
+	public static void deactivate() {
+		TraceDebug.setDEBUG(false);
+	}
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/AllLTTngCoreTests.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/AllLTTngCoreTests.java
new file mode 100644
index 0000000..a6b1f48
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/AllLTTngCoreTests.java
@@ -0,0 +1,46 @@
+package org.eclipse.linuxtools.lttng.tests;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.eclipse.linuxtools.lttng.tests.event.LttngEventContentTest;
+import org.eclipse.linuxtools.lttng.tests.event.LttngEventFieldTest;
+import org.eclipse.linuxtools.lttng.tests.event.LttngEventReferenceTest;
+import org.eclipse.linuxtools.lttng.tests.event.LttngEventTest;
+import org.eclipse.linuxtools.lttng.tests.event.LttngEventTypeTest;
+import org.eclipse.linuxtools.lttng.tests.event.LttngTimestampTest;
+import org.eclipse.linuxtools.lttng.tests.jni.JniEventTest;
+import org.eclipse.linuxtools.lttng.tests.jni.JniMarkerFieldTest;
+import org.eclipse.linuxtools.lttng.tests.jni.JniMarkerTest;
+import org.eclipse.linuxtools.lttng.tests.jni.JniTraceTest;
+import org.eclipse.linuxtools.lttng.tests.jni.JniTracefileTest;
+import org.eclipse.linuxtools.lttng.tests.trace.LTTngTextTraceTest;
+import org.eclipse.linuxtools.lttng.tests.trace.LTTngTraceTest;
+
+public class AllLTTngCoreTests {
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite(AllLTTngCoreTests.class.getName());
+		//$JUnit-BEGIN$
+
+        suite.addTestSuite(LTTngTextTraceTest.class);
+        suite.addTestSuite(LttngTimestampTest.class);
+        suite.addTestSuite(LttngEventFieldTest.class);
+        suite.addTestSuite(LttngEventContentTest.class);
+        suite.addTestSuite(LttngEventReferenceTest.class);
+        suite.addTestSuite(LttngEventTypeTest.class);
+        suite.addTestSuite(LttngEventTest.class);
+		
+        suite.addTestSuite(JniTraceTest.class);
+        suite.addTestSuite(JniTracefileTest.class);
+        suite.addTestSuite(JniEventTest.class);
+        suite.addTestSuite(JniMarkerTest.class);
+        suite.addTestSuite(JniMarkerFieldTest.class);
+        
+        suite.addTestSuite(LTTngTextTraceTest.class);
+        suite.addTestSuite(LTTngTraceTest.class);
+		//$JUnit-END$
+		return suite;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/LTTngCoreTestPlugin.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/LTTngCoreTestPlugin.java
new file mode 100644
index 0000000..c7764fb
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/LTTngCoreTestPlugin.java
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.tests;
+
+import org.eclipse.core.runtime.Plugin;
+
+/**
+ * <b><u>TmfCoreTestPlugin</u></b>
+ * <p>
+ * The activator class controls the plug-in life cycle
+ */
+public class LTTngCoreTestPlugin extends Plugin {
+
+    // ========================================================================
+    // Attributes
+    // ========================================================================
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng.tests";
+
+	// The shared instance
+	private static LTTngCoreTestPlugin plugin;
+	
+    // ========================================================================
+    // Constructors
+    // ========================================================================
+
+	/**
+	 * The constructor
+	 */
+	public LTTngCoreTestPlugin() {
+		plugin = this;
+	}
+
+    // ========================================================================
+    // Accessors
+    // ========================================================================
+
+    /**
+     * @return the shared instance
+     */
+    public static LTTngCoreTestPlugin getPlugin() {
+        return plugin;
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/AllLttngTests.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/AllLttngTests.java
new file mode 100644
index 0000000..a14db9a
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/AllLttngTests.java
@@ -0,0 +1,22 @@
+package org.eclipse.linuxtools.lttng.tests.event;
+
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import org.eclipse.linuxtools.lttng.tests.trace.LTTngTextTraceTest;;
+
+public final class AllLttngTests extends TestCase  {
+    public static TestSuite suite() {
+        TestSuite suite = new TestSuite("Testing LTTng (trace in text format)");
+        
+        suite.addTestSuite(LTTngTextTraceTest.class);
+        suite.addTestSuite(LttngTimestampTest.class);
+        suite.addTestSuite(LttngEventFieldTest.class);
+        suite.addTestSuite(LttngEventContentTest.class);
+        suite.addTestSuite(LttngEventReferenceTest.class);
+        suite.addTestSuite(LttngEventTypeTest.class);
+        suite.addTestSuite(LttngEventTest.class);
+        
+        return suite;
+    }
+}
+
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventContentTest.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventContentTest.java
new file mode 100644
index 0000000..546fd68
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventContentTest.java
@@ -0,0 +1,265 @@
+package org.eclipse.linuxtools.lttng.tests.event;
+
+import java.io.File;
+import java.net.URL;
+import java.util.HashMap;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.event.LttngEventContent;
+import org.eclipse.linuxtools.lttng.event.LttngEventField;
+import org.eclipse.linuxtools.lttng.event.LttngEventType;
+import org.eclipse.linuxtools.lttng.event.LttngTimestamp;
+import org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin;
+import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace;
+import org.eclipse.linuxtools.tmf.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.trace.TmfLocation;
+
+/*
+ Functions tested here :
+ 	
+	public LttngEventContent()
+    public LttngEventContent(LttngEvent thisParent)
+    public LttngEventContent(LttngEvent thisParent, HashMap<String, LttngEventField> thisContent)
+    public LttngEventContent(LttngEventContent oldContent)
+    
+    public void emptyContent()
+    
+    public LttngEventField[] getFields()
+    public LttngEventField getField(int position)
+    public LttngEventField getField(String name)
+    public LttngEvent getEvent()
+    public LttngEventType getType()
+    public Object[] getContent()
+    public HashMap<String, LttngEventField> getRawContent()
+    
+    public void setType(LttngEventType newType)
+    public void setEvent(LttngEvent newParent)
+    
+    public String toString()
+ */
+
+public class LttngEventContentTest extends TestCase {
+    private final static String tracepath1="traceset/trace-15316events_nolost_newformat.txt";
+//    private final static boolean skipIndexing=true;
+    
+    private final static String firstEventContentFirstField 	= "alignment:0";
+    private final static String firstEventContentFirstFieldName = "alignment";
+    private final static String firstEventContentType 			= "metadata/0/core_marker_id";
+    
+    private final static String secondEventContentSecondField 	= "string:LTT state dump begin";
+    private final static String secondEventContentSecondFieldName = "string";
+    private final static String secondEventContentType 			= "kernel/0/vprintk";
+    
+    private final static long   timestampAfterMetadata 		 = 13589760262237L;
+    
+    private static LTTngTextTrace testStream = null;
+    
+    private LTTngTextTrace initializeEventStream() {
+    	if (testStream == null) {
+			try {
+				URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(tracepath1), null);
+				File testfile = new File(FileLocator.toFileURL(location).toURI());
+				LTTngTextTrace tmpStream = new LTTngTextTrace(testfile.getPath());
+				testStream = tmpStream;
+			} 
+			catch (Exception e) {
+				System.out.println("ERROR : Could not open " + tracepath1);
+				testStream = null;
+			}
+		}
+    	else {
+    		testStream.seekEvent(0);
+    	}
+    	
+		return testStream;
+    }
+    
+    
+	private LttngEventContent prepareToTest() {
+		LttngEventContent tmpEventContent = null;
+
+		// This trace should be valid
+		try {
+			testStream = null;
+		    LTTngTextTrace tmpStream = initializeEventStream();
+			tmpEventContent = (LttngEventContent)tmpStream.getNextEvent( new TmfContext(new TmfLocation<Long>(0L), 0) ).getContent();
+		}
+		catch (Exception e) {
+			fail("ERROR : Failed to get content!");
+		}
+
+		return tmpEventContent;
+	}
+
+	public void testConstructors() {
+		LttngEvent 		  testEvent = null;
+		LttngEventContent testContent 	= null;
+		LttngEventContent testContent2 	= null;
+        LttngEventField[] 	testFields  = new LttngEventField[1];
+        testFields[0] = new LttngEventField(testContent2, "test");
+        
+	    // Default construction with good argument
+        try {
+        	testContent = new LttngEventContent();
+        }
+        catch( Exception e) { 
+        	fail("Construction with format failed!");
+        }
+        
+        // Construction with good parameters (parent event)
+        try {
+        	testContent = new LttngEventContent(testEvent);
+        }
+        catch( Exception e) { 
+        	fail("Construction with format, content and fields failed!");
+        }
+        
+        // Construction with good parameters (parent event and pre-parsed content)
+        try {
+        	HashMap<String, LttngEventField> parsedContent = new HashMap<String, LttngEventField>();
+        	testContent = new LttngEventContent(testEvent, parsedContent);
+        }
+        catch( Exception e) { 
+        	fail("Construction with format, content and fields failed!");
+        }
+        
+        
+        // Copy constructor with correct parameters
+        try {
+        	testContent = new LttngEventContent(testEvent);
+        	testContent2 = new LttngEventContent(testContent);
+        }
+        catch( Exception e) { 
+        	fail("Copy constructor failed!");
+        }
+        
+	}
+	
+	
+	public void testGetter() {
+		LttngEventContent testContent = null;
+    	LTTngTextTrace tmpStream = null;
+    	LttngEvent tmpEvent = null;
+    	TmfContext tmpContext = null;
+    	
+    	// Require an event
+    	tmpStream = initializeEventStream();
+    	tmpContext = new TmfContext(new TmfLocation<Long>(0L), 0);
+    	tmpEvent = (LttngEvent)tmpStream.getNextEvent(tmpContext);
+		testContent = prepareToTest();
+    	// getFieldS()
+    	assertNotSame("getFields() returned null!",null,testContent.getFields() );
+    	
+    	// *** FIXME ***
+    	// Depending from the Java version because of the "hashcode()" on String. 
+    	// We can't really test that safetly
+    	//
+    	// getField(int)
+    	//assertEquals("getField(int) returned unexpected result!",firstEventContentFirstField, testContent.getField(0).toString());
+    	assertNotSame("getField(int) returned unexpected result!",null, testContent.getField(0).toString());
+    	
+    	
+    	// getField(name)
+    	assertEquals("getField(name) returned unexpected result!",firstEventContentFirstField, testContent.getField(firstEventContentFirstFieldName).toString());
+    	// getRawContent
+    	assertNotSame("getRawContent() returned null!",null, testContent.getRawContent());
+    	// Test that get event return the correct event
+    	assertTrue("getEvent() returned unexpected result!", tmpEvent.getTimestamp().getValue() == testContent.getEvent().getTimestamp().getValue());
+    	// getType()
+    	assertEquals("getType() returned unexpected result!",firstEventContentType, testContent.getType().toString());
+    	
+    	//*** To test getFields with a fields number >0, we need to move to an event that have some more
+    	tmpStream = initializeEventStream();
+    	tmpContext = new TmfContext(new TmfLocation<Long>(0L), 0);
+    	// Skip first events and seek to event pass metadata
+    	tmpContext= tmpStream.seekEvent(new LttngTimestamp(timestampAfterMetadata) );
+    	// Skip first one 
+    	tmpEvent = (LttngEvent)tmpStream.getNextEvent(tmpContext);
+    	
+    	// Second event past metadata should have more fields
+    	tmpEvent = (LttngEvent)tmpStream.getNextEvent(tmpContext);
+    	// Get the content
+    	testContent = tmpEvent.getContent();
+    	
+    	// Test that get event return the correct event
+    	assertTrue("getEvent() returned unexpected result!",tmpEvent.getTimestamp().getValue() == testContent.getEvent().getTimestamp().getValue());
+    	// getType()
+    	assertEquals("getType() returned unexpected result!",secondEventContentType, testContent.getType().toString());
+    	
+    	
+    	// getFieldS()
+    	assertNotSame("getFields() returned null!",null,testContent.getFields() );
+    	// getField(int)
+    	assertEquals("getField(int) returned unexpected result!",secondEventContentSecondField, testContent.getField(1).toString());
+    	// getField(name)
+    	assertEquals("getField(name) returned unexpected result!",secondEventContentSecondField, testContent.getField(secondEventContentSecondFieldName).toString());
+    	// getRawContent
+    	assertNotSame("getRawContent() returned null!",null, testContent.getRawContent());
+    	
+    }
+	
+	public void testSetter() {
+		// Not much to test here, we will just make sure the set does not fail for any reason.
+    	// It's pointless to test with a getter...
+    	LTTngTextTrace tmpStream = null;
+    	LttngEvent tmpEvent = null;
+    	TmfContext tmpContext = null;
+    	
+    	// Require an event
+    	tmpStream = initializeEventStream();
+    	tmpContext = new TmfContext(new TmfLocation<Long>(0L), 0);
+    	tmpEvent = (LttngEvent)tmpStream.getNextEvent(tmpContext);
+		
+    	LttngEventContent tmpContent = prepareToTest();
+    	try {
+    		tmpContent.setEvent(tmpEvent);
+    	}
+    	catch( Exception e) { 
+        	fail("setEvent(event) failed!");
+        }
+    	
+    	
+    	LttngEventType testType = new LttngEventType();
+    	try {
+    		tmpContent.setType(testType);
+    	}
+    	catch( Exception e) { 
+        	fail("setType(type) failed!");
+        }
+	}
+	
+	public void testEmptyContent() {
+		LttngEventContent testContent = null;
+    	LTTngTextTrace tmpStream = null;
+    	LttngEvent tmpEvent = null;
+    	TmfContext tmpContext = null;
+    	
+    	// Require an event
+    	tmpStream = initializeEventStream();
+    	tmpContext = new TmfContext(new TmfLocation<Long>(0L), 0);
+    	tmpEvent = (LttngEvent)tmpStream.getNextEvent(tmpContext);
+    	// Get the content
+    	testContent = tmpEvent.getContent();
+    	// Get all the fields to make sure there is something in the HashMap
+    	testContent.getFields();
+    	// Just making sure there is something in the HashMap
+    	assertNotSame("HashMap is empty but should not!", 0, testContent.getRawContent().size() );
+    	
+    	// This is the actual test
+    	testContent.emptyContent();
+    	assertSame("HashMap is not empty but should be!", 0, testContent.getRawContent().size() );
+	}
+    
+	public void testToString() {
+    	LttngEventContent tmpContent = prepareToTest();
+    	
+		// Just make sure toString() does not return null or the java reference
+		assertNotSame("toString returned null",null, tmpContent.toString() );
+		assertNotSame("toString is not overridded!", tmpContent.getClass().getName() + '@' + Integer.toHexString(tmpContent.hashCode()), tmpContent.toString() );
+    }
+	
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventFieldTest.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventFieldTest.java
new file mode 100644
index 0000000..25b4227
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventFieldTest.java
@@ -0,0 +1,124 @@
+package org.eclipse.linuxtools.lttng.tests.event;
+
+
+
+import java.io.File;
+import java.net.URL;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.lttng.event.LttngEventContent;
+import org.eclipse.linuxtools.lttng.event.LttngEventField;
+import org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin;
+import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace;
+import org.eclipse.linuxtools.tmf.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.trace.TmfLocation;
+
+/*
+ Functions tested here :
+        public LttngEventField(String name, Object newContent) 
+        public LttngEventField(LttngEventField oldField) 
+        public String getName() 
+        public String toString() 
+
+ */
+
+public class LttngEventFieldTest extends TestCase {
+    private final static String tracepath1="traceset/trace-15316events_nolost_newformat.txt";
+    private final static boolean skipIndexing=true;
+    
+//    private final static String firstEventName 		= "alignment";
+    private final static String firstEventValue 	= "0";
+    
+    private static LTTngTextTrace testStream = null;
+    private LTTngTextTrace initializeEventStream() {
+		if (testStream == null) {
+			try {
+				URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(tracepath1), null);
+				File testfile = new File(FileLocator.toFileURL(location).toURI());
+				LTTngTextTrace tmpStream = new LTTngTextTrace(testfile.getPath(), skipIndexing);
+				testStream = tmpStream;
+			} 
+			catch (Exception e) {
+				System.out.println("ERROR : Could not open " + tracepath1);
+				testStream = null;
+			}
+		}
+		else {
+			testStream.seekEvent(0);
+		}
+		
+		return testStream;
+	}
+    
+	private LttngEventField prepareToTest() {
+		LttngEventField tmpField = null;
+
+		// This trace should be valid
+		try {
+			LTTngTextTrace tmpStream = initializeEventStream();
+			tmpField = (LttngEventField)tmpStream.getNextEvent( new TmfContext(new TmfLocation<Long>(0L), 0) ).getContent().getField(0);
+		} 
+		catch (Exception e) {
+			fail("ERROR : Failed to get field!");
+		}
+
+		return tmpField;
+	}
+
+	public void testConstructors() {
+		LttngEventContent testContent = null;
+		LttngEventField testField 	= null;
+		@SuppressWarnings("unused")
+		LttngEventField testField2 	= null;
+        
+	    // Default construction with good argument
+        try {
+        	testField = new LttngEventField(testContent, "test", "test");
+        }
+        catch( Exception e) { 
+        	fail("Default construction failed!");
+        }
+        
+        // Copy constructor with correct parameters
+        try {
+        	testField = new LttngEventField(testContent, "test", "test");
+        	testField2 = new LttngEventField(testField);
+        }
+        catch( Exception e) { 
+        	fail("Copy constructor failed!");
+        }
+        
+	}
+	
+	public void testGetter() {
+    	
+    	// *** To "really" test the field, we will get a real field from LTTngTrace
+    	LTTngTextTrace tmpStream = initializeEventStream();
+    	
+    	LttngEventField testField 	= (LttngEventField)tmpStream.getNextEvent( new TmfContext(new TmfLocation<Long>(0L), 0) ).getContent().getField(0);
+    	assertNotSame("getField is null!",null,testField);
+    	
+    	// *** FIXME ***
+    	// Depending from the Java version because of the "hashcode()" on String. 
+    	// We can't really test that safetly
+    	//
+    	//assertTrue("getName() returned unexpected result!",firstEventName.equals(testField.getId().toString()));
+    	assertNotSame("getName() returned unexpected result!",null, testField.getId());
+    	
+    	assertTrue("getValue() returned unexpected result!",firstEventValue.equals(testField.getValue().toString()));
+    	
+    	
+    }
+    
+	public void testToString() {
+    	LttngEventField tmpField = prepareToTest();
+    	
+		// Just make sure toString() does not return null or the java reference
+		assertNotSame("toString returned null",null, tmpField.toString() );
+		assertNotSame("toString is not overridded!", tmpField.getClass().getName() + '@' + Integer.toHexString(tmpField.hashCode()), tmpField.toString() );
+    }
+	
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventReferenceTest.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventReferenceTest.java
new file mode 100644
index 0000000..24897aa
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventReferenceTest.java
@@ -0,0 +1,137 @@
+package org.eclipse.linuxtools.lttng.tests.event;
+
+import java.io.File;
+import java.net.URL;
+
+import junit.framework.TestCase;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.lttng.event.LttngEventReference;
+import org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin;
+import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace;
+import org.eclipse.linuxtools.tmf.trace.TmfContext;
+
+/*
+ Functions tested here :
+    public LttngEventReference(String newTraceName)
+    public LttngEventReference(String newTracefilePath, String newTraceName)
+    public LttngEventReference(LttngEventReference oldReference)
+    
+    public String getTracepath()
+    public String getValue()
+    
+    public void setTracepath(String tracename)
+    public void setValue(String newReference)
+    
+    public String toString()
+ */
+
+public class LttngEventReferenceTest extends TestCase {
+    private final static String tracepath1="traceset/trace-15316events_nolost_newformat.txt";
+    private final static boolean skipIndexing=true;
+    
+    private final static String firstEventReference        = "metadata_0";
+    
+    private static LTTngTextTrace testStream = null;
+    private LTTngTextTrace initializeEventStream() {
+		if (testStream == null) {
+			try {
+				URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(tracepath1), null);
+				File testfile = new File(FileLocator.toFileURL(location).toURI());
+				LTTngTextTrace tmpStream = new LTTngTextTrace(testfile.getPath(), skipIndexing);
+				testStream = tmpStream;
+			} 
+			catch (Exception e) {
+				System.out.println("ERROR : Could not open " + tracepath1);
+				testStream = null;
+			}
+		}
+		else {
+			testStream.seekEvent(0);
+		}
+		
+		return testStream;
+	}
+    
+    private LttngEventReference prepareToTest() {
+        LttngEventReference tmpEventRef = null;
+
+        // This trace should be valid
+        try {
+            LTTngTextTrace tmpStream = initializeEventStream();
+            tmpEventRef = (LttngEventReference)tmpStream.getNextEvent(new TmfContext(null, 0) ).getReference();
+        } 
+        catch (Exception e) {
+            fail("ERROR : Failed to get reference!");
+        }
+
+        return tmpEventRef;
+    }
+    
+    public void testConstructors() {
+        LttngEventReference testRef = null;
+        @SuppressWarnings("unused")
+        LttngEventReference testRef2 = null;
+        
+        // Default construction with good argument (newTracefilePath)
+        try {
+            testRef = new LttngEventReference("test");
+        }
+        catch( Exception e) { 
+            fail("Construction failed!");
+        }
+        
+        // Default construction with good arguments (newTracefilePath, newTraceName)
+        try {
+            testRef = new LttngEventReference("test", "test");
+        }
+        catch( Exception e) { 
+            fail("Construction failed!");
+        }
+        
+        // Copy constructor
+        try {
+            testRef = new LttngEventReference("test", "test");
+            testRef2 = new LttngEventReference(testRef);
+        }
+        catch( Exception e) { 
+            fail("Construction failed!");
+        }
+    }
+    
+    
+    public void testGetter() {
+        LttngEventReference tmpRef = prepareToTest();
+        
+        assertTrue("Tracepath not what was expected!",((String)tmpRef.getValue()).contains(firstEventReference) );
+        assertEquals("Content not what expected!",firstEventReference,tmpRef.getTracepath());
+    }
+    
+    public void testSetter() {
+    	// Not much to do here, we will just make sure the setter does not throw
+        LttngEventReference tmpRef = prepareToTest();
+        
+        try {
+        	tmpRef.setTracepath("test");
+    	}
+    	catch( Exception e) { 
+        	fail("setTracepath(string) failed!");
+        }
+    	
+    	try {
+        	tmpRef.setValue("test");
+    	}
+    	catch( Exception e) { 
+        	fail("setTracepath(string) failed!");
+        }
+    }
+    
+    public void testToString() {
+        LttngEventReference tmpRef = prepareToTest();
+        
+        // Just make sure toString() does not return null or the java reference
+        assertNotSame("toString returned null",null, tmpRef.toString() );
+        assertNotSame("toString is not overridded!", tmpRef.getClass().getName() + '@' + Integer.toHexString(tmpRef.hashCode()), tmpRef.toString() );
+    }
+    
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTest.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTest.java
new file mode 100644
index 0000000..53fe78a
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTest.java
@@ -0,0 +1,225 @@
+package org.eclipse.linuxtools.lttng.tests.event;
+
+import java.io.File;
+import java.net.URL;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.event.LttngEventContent;
+import org.eclipse.linuxtools.lttng.event.LttngEventReference;
+import org.eclipse.linuxtools.lttng.event.LttngEventType;
+import org.eclipse.linuxtools.lttng.event.LttngTimestamp;
+import org.eclipse.linuxtools.lttng.jni.JniEvent;
+import org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin;
+import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace;
+import org.eclipse.linuxtools.tmf.event.TmfEventSource;
+import org.eclipse.linuxtools.tmf.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.trace.TmfLocation;
+
+/*
+ Functions tested here :
+    public LttngEvent(LttngTimestamp timestamp, TmfEventSource source, LttngEventType type, LttngEventContent content, LttngEventReference reference, JniEvent lttEvent)
+    public LttngEvent(LttngEvent oldEvent)
+    
+    public String getChannelName()
+    public long getCpuId()
+    public String getMarkerName()
+    public LttngEventType getType()
+    public LttngEventContent getContent()
+    
+    public void updateJniEventReference(JniEvent newJniEventReference)
+    public void setContent(LttngEventContent newContent)
+    public void setType(LttngEventType newType)
+    
+    public JniEvent convertEventTmfToJni()
+    
+	public String toString()
+ */
+
+public class LttngEventTest extends TestCase {
+    private final static String tracepath1="traceset/trace-15316events_nolost_newformat.txt";
+    private final static boolean skipIndexing=true;
+    
+    private final static long   eventTimestamp 	= 13589759412128L;
+    private final static String eventSource 	= "Kernel Core";
+    private final static String eventType 		= "metadata/0/core_marker_id";
+    private final static String eventChannel 	= "metadata";
+    private final static long 	eventCpu 		= 0;
+    private final static String eventMarker 	= "core_marker_id";
+//    private final static String eventContent 	= "alignment:0 size_t:4 int:4 name:vm_map pointer:4 event_id:0 long:4 channel:vm_state ";
+    private final static String eventReference 	= eventChannel + "_" + eventCpu;
+    
+    
+    private static LTTngTextTrace testStream = null;
+    private LTTngTextTrace initializeEventStream() {
+		if (testStream == null) {
+			try {
+				URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(tracepath1), null);
+				File testfile = new File(FileLocator.toFileURL(location).toURI());
+				LTTngTextTrace tmpStream = new LTTngTextTrace(testfile.getPath(), skipIndexing);
+				testStream = tmpStream;
+			} 
+			catch (Exception e) {
+				System.out.println("ERROR : Could not open " + tracepath1);
+				testStream = null;
+			}
+		}
+		else {
+			testStream.seekEvent(0);
+		}
+		
+		return testStream;
+	}
+
+    private LttngEvent prepareToTest() {
+		LttngEvent tmpEvent = null;
+		
+		try {
+			LTTngTextTrace tmpStream = initializeEventStream();
+			tmpEvent = (LttngEvent)tmpStream.getNextEvent(new TmfContext(new TmfLocation<Long>(0L), 0) );
+		}
+		catch (Exception e) {
+			System.out.println("ERROR : Could not open " + tracepath1);
+		}
+
+		return tmpEvent;
+	}
+
+	public void testConstructors() {
+        LttngEvent 			testEvent 		= null;
+        @SuppressWarnings("unused")
+		LttngEvent 			testAnotherEvent = null;
+        LttngTimestamp		testTime		= null;
+        TmfEventSource 		testSource 		= null;
+        LttngEventType   	testType   		= null;
+        LttngEventContent	testContent		= null;
+        LttngEventReference testReference 	= null;
+        JniEvent			testJniEvent 	= null;
+		String[]			testMarkerFields = null;
+		
+        // This need to work if we want to perform tests
+        try {
+    			// In order to test LttngEvent, we need all these constructors/functions to work.
+            	// Make sure to run their unit tests first!
+        		testMarkerFields = new String[1];
+                testEvent 	= null;
+                testTime	= new LttngTimestamp(0L);
+                testSource 	= new TmfEventSource("test");
+                testType   	= new LttngEventType("test", 0L, "test", testMarkerFields);
+                testContent	= new LttngEventContent(testEvent);
+                testReference = new LttngEventReference("test", "test");
+        }
+        catch( Exception e) {
+                fail("Cannot allocate an EventStream, junit failed!");
+        }
+		
+        // Test constructor with correct information
+        try {
+        		testEvent = new LttngEvent( testTime, testSource, testType, testContent, testReference, testJniEvent);
+        }
+        catch( Exception e) { 
+                fail("Construction with correct information failed!");
+        }
+        
+        // Test about copy constructor
+        // Passing a null to copy constructor should fail
+        try {
+        	testAnotherEvent = new  LttngEvent(null);
+            fail("Copy constructor with null old event should fail!");
+		}
+		catch( Exception e) { 
+		}
+        
+		// Copy constructor used properly
+        testEvent = prepareToTest();
+        try {
+        	testAnotherEvent = new  LttngEvent(testEvent);
+		}
+		catch( Exception e) { 
+			fail("Correct utilisation of copy constructor failed!");
+		}
+		
+	}
+	
+	public void testGetter() {
+    	LttngEvent testEvent = prepareToTest();
+    	
+    	// These will test TMF functions but since we are expecting it to work...
+    	assertEquals("Timestamp not what expected!",eventTimestamp,testEvent.getTimestamp().getValue());
+    	assertEquals("Source not what expected!",eventSource,testEvent.getSource().getSourceId());
+    	assertEquals("Reference not what expected!",eventReference,((String)testEvent.getReference().toString()) );
+    	
+    	// These should be overridden functions
+    	assertEquals("Type not what expected!",eventType,testEvent.getType().getTypeId());
+    	assertEquals("Channel not what expected!",eventChannel,testEvent.getChannelName());
+    	assertEquals("CpuId not what expected!",eventCpu,testEvent.getCpuId());
+    	assertEquals("Marker not what expected!",eventMarker,testEvent.getMarkerName());
+    	
+    	// *** FIXME ***
+    	// Depending from the Java version because of the "hashcode()" on String. 
+    	// We can't really test that safetly
+    	//
+    	//assertEquals("Content not what expected!",eventContent,testEvent.getContent().toString());
+    	assertNotSame("Content is null!", null,testEvent.getContent());
+    }
+    
+	public void testSetter() {
+    	LttngEvent testEvent = prepareToTest();
+    	
+        LttngEventType   	testType   		= null;
+        LttngEventContent	testContent		= null;
+        JniEvent			testJniEvent 	= null;
+		
+        String[] testMarkerFields = new String[1];
+        testType   	= new LttngEventType("test", 0L, "test", testMarkerFields);
+        testContent	= new LttngEventContent(testEvent);
+        
+    	try {
+    		// *** FIXME ***
+    		// This won't do anything good on a text trace
+        	testEvent.updateJniEventReference(testJniEvent);
+        	
+        	testEvent.setContent(testContent);
+        	testEvent.setType(testType);
+		}
+		catch( Exception e) { 
+			fail("Setters raised an exception!");
+		}
+    	
+		assertSame("SetType failed : type not what expected!",testType,testEvent.getType());
+    	assertSame("SetContent failed : content not what expected!",testContent,testEvent.getContent());
+		
+	}
+	
+	
+	public void testConversion() {
+    	@SuppressWarnings("unused")
+		JniEvent tmpJniEvent = null;
+    	LttngEvent testEvent = null;
+    	
+        testEvent = prepareToTest();
+        
+        try {
+        	tmpJniEvent = testEvent.convertEventTmfToJni();
+		}
+		catch( Exception e) { 
+			fail("Conversion raised an exception!");
+		}
+		
+		// *** FIXME ***
+		// This test can't work with a text trace, commented for now 
+		//assertNotSame("Conversion returned a null event!",null, tmpJniEvent );
+    }
+    
+	public void testToString() {
+    	LttngEvent tmpEvent = prepareToTest();
+    	
+		// Just make sure toString() does not return null or the java reference
+		assertNotSame("toString returned null",null, tmpEvent.toString() );
+		assertNotSame("toString is not overridded!", tmpEvent.getClass().getName() + '@' + Integer.toHexString(tmpEvent.hashCode()), tmpEvent.toString() );
+    }
+	
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTypeTest.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTypeTest.java
new file mode 100644
index 0000000..a2ff91e
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTypeTest.java
@@ -0,0 +1,121 @@
+package org.eclipse.linuxtools.lttng.tests.event;
+
+import java.io.File;
+import java.net.URL;
+
+import junit.framework.TestCase;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.lttng.event.LttngEventType;
+import org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin;
+import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace;
+import org.eclipse.linuxtools.tmf.trace.TmfContext;
+
+/*
+ Functions tested here :
+    public LttngEventType()
+    public LttngEventType(String thisTracefileName, Long thisCpuId, String thisMarkerName, String[] thisMarkerfieldsName)
+    public LttngEventType(LttngEventType oldType)
+    
+    public String getTracefileName()
+    public Long getCpuId()
+    public String getMarkerName()
+    
+    public String toString()
+ */
+
+public class LttngEventTypeTest extends TestCase {
+	private final static String tracepath1="traceset/trace-15316events_nolost_newformat.txt";
+    private final static boolean skipIndexing=true;
+    
+    private final static String firstEventChannel       = "metadata";
+    private final static long firstEventCpu             = 0;
+    private final static String firstEventMarker        = "core_marker_id";
+    
+    private static LTTngTextTrace testStream = null;
+    private LTTngTextTrace initializeEventStream() {
+		if (testStream == null) {
+			try {
+				URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(tracepath1), null);
+				File testfile = new File(FileLocator.toFileURL(location).toURI());
+				LTTngTextTrace tmpStream = new LTTngTextTrace(testfile.getPath(), skipIndexing);
+				testStream = tmpStream;
+			} 
+			catch (Exception e) {
+				System.out.println("ERROR : Could not open " + tracepath1);
+				testStream = null;
+			}
+		}
+		else {
+			testStream.seekEvent(0);
+		}
+		
+		return testStream;
+	}
+    
+    private LttngEventType prepareToTest() {
+        LttngEventType tmpEventType = null;
+
+        // This trace should be valid
+        try {
+            LTTngTextTrace tmpStream = initializeEventStream();
+            tmpEventType = (LttngEventType)tmpStream.getNextEvent( new TmfContext(null, 0) ).getType();
+        } 
+        catch (Exception e) {
+            fail("ERROR : Failed to get reference!");
+        }
+
+        return tmpEventType;
+    }
+    
+    public void testConstructors() {
+        LttngEventType tmpEventType = null;
+        @SuppressWarnings("unused")
+        LttngEventType tmpEventType2 = null;
+        
+        // Default construction, no argument
+        try {
+            tmpEventType = new LttngEventType();
+        }
+        catch( Exception e) { 
+            fail("Construction failed!");
+        }
+        
+        // Default construction with good arguments
+        try {
+            tmpEventType = new LttngEventType("test", 0L, "test",  new String[1]);
+        }
+        catch( Exception e) { 
+            fail("Construction failed!");
+        }
+        
+        // Copy constructor
+        try {
+            tmpEventType = new LttngEventType("test", 0L, "test", new String[1]);
+            tmpEventType2 = new LttngEventType(tmpEventType);
+        }
+        catch( Exception e) { 
+            fail("Construction failed!");
+        }
+    }
+    
+    
+    public void testGetter() {
+        LttngEventType tmpEventType = prepareToTest();
+        
+        assertTrue("Channel name not what was expected!",firstEventChannel.equals((String)tmpEventType.getTracefileName()) );
+        assertTrue("Cpu Id not what was expected!",firstEventCpu == tmpEventType.getCpuId() );
+        assertTrue("Marker Name not what was expected!",firstEventMarker.equals((String)tmpEventType.getMarkerName()) );
+        // Just test the non-nullity of labels
+        assertNotSame("getLabels returned null",null, tmpEventType.getLabels() );
+    }
+    
+    public void testToString() {
+        LttngEventType tmpEventType = prepareToTest();
+        
+        // Just make sure toString() does not return null or the java reference
+        assertNotSame("toString returned null",null, tmpEventType.toString() );
+        assertNotSame("toString is not overridded!", tmpEventType.getClass().getName() + '@' + Integer.toHexString(tmpEventType.hashCode()), tmpEventType.toString() );
+    }
+    
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngTimestampTest.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngTimestampTest.java
new file mode 100644
index 0000000..3c3f85a
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngTimestampTest.java
@@ -0,0 +1,127 @@
+package org.eclipse.linuxtools.lttng.tests.event;
+
+import java.io.File;
+import java.net.URL;
+
+import junit.framework.TestCase;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.lttng.event.LttngTimestamp;
+import org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin;
+import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace;
+import org.eclipse.linuxtools.tmf.trace.TmfContext;
+
+/*
+ Functions tested here :
+    public LttngTimestamp()
+    public LttngTimestamp(long newEventTime)
+    public LttngTimestamp(TmfTimestamp oldEventTime)
+    
+    public long getValue()
+    public String getSeconds()
+    public String getNanoSeconds()
+    
+    public void setValue(long newValue)
+    
+    public String toString()
+ */
+
+public class LttngTimestampTest extends TestCase {
+	private final static String tracepath1="traceset/trace-15316events_nolost_newformat.txt";
+    private final static boolean skipIndexing=true;
+    
+    private final static String firstEventTimeSecond     = "13589";
+    private final static String firstEventTimeNano       = "759412128";
+    private final static long   firstEventTimeFull       = 13589759412128L;
+    
+    private static LTTngTextTrace testStream = null;
+    private LTTngTextTrace initializeEventStream() {
+		if (testStream == null) {
+			try {
+				URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(tracepath1), null);
+				File testfile = new File(FileLocator.toFileURL(location).toURI());
+				LTTngTextTrace tmpStream = new LTTngTextTrace(testfile.getPath(), skipIndexing);
+				testStream = tmpStream;
+			} 
+			catch (Exception e) {
+				System.out.println("ERROR : Could not open " + tracepath1);
+				testStream = null;
+			}
+		}
+		return testStream;
+	}
+
+    private LttngTimestamp prepareToTest() {
+        LttngTimestamp tmpTime = null;
+
+        // This trace should be valid
+        try {
+            LTTngTextTrace tmpStream = initializeEventStream();
+            tmpTime = (LttngTimestamp)tmpStream.getNextEvent( new TmfContext(null, 0) ).getTimestamp();
+        } 
+        catch (Exception e) {
+            fail("ERROR : Failed to get reference!");
+        }
+
+        return tmpTime;
+    }
+    
+    public void testConstructors() {
+        LttngTimestamp tmpTime = null;
+        @SuppressWarnings("unused")
+        LttngTimestamp tmpTime2 = null;
+        
+        // Default construction with no argument
+        try {
+            tmpTime = new LttngTimestamp();
+        }
+        catch( Exception e) { 
+            fail("Construction failed!");
+        }
+        
+        // Default construction with good argument
+        try {
+            tmpTime = new LttngTimestamp(1);
+        }
+        catch( Exception e) { 
+            fail("Construction failed!");
+        }
+        
+        // Copy constructor
+        try {
+            tmpTime = new LttngTimestamp(1);
+            tmpTime2 = new LttngTimestamp(tmpTime);
+        }
+        catch( Exception e) { 
+            fail("Construction failed!");
+        }
+    }
+    
+    
+    public void testGetter() {
+        LttngTimestamp tmpTime = prepareToTest();
+        
+        assertEquals("Time in second is wrong", firstEventTimeSecond, tmpTime.getSeconds() );
+        assertEquals("Time in nano second is wrong", firstEventTimeNano, tmpTime.getNanoSeconds() );
+        
+        assertEquals("Full time is wrong", firstEventTimeFull, tmpTime.getValue() );
+    }
+    
+    public void testSetter() {
+        LttngTimestamp tmpTime = prepareToTest();
+        
+        // We will set a time and we will make sure the set is working then
+        tmpTime.setValue(1);
+        assertEquals("Full time is wrong after set", 1, tmpTime.getValue() );
+    }
+    
+    
+    public void testToString() {
+        LttngTimestamp tmpTime = prepareToTest();
+        
+        // Just make sure toString() does not return null or the java reference
+        assertNotSame("toString returned null",null, tmpTime.toString() );
+        assertNotSame("toString is not overridded!", tmpTime.getClass().getName() + '@' + Integer.toHexString(tmpTime.hashCode()), tmpTime.toString() );
+    }
+    
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/AllJniTests.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/AllJniTests.java
new file mode 100644
index 0000000..d93756c
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/AllJniTests.java
@@ -0,0 +1,19 @@
+
+package org.eclipse.linuxtools.lttng.tests.jni;
+
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public final class AllJniTests extends TestCase  {
+    public static TestSuite suite() {
+        TestSuite suite = new TestSuite("Testing JNI");
+        
+        suite.addTestSuite(JniTraceTest.class);
+        suite.addTestSuite(JniTracefileTest.class);
+        suite.addTestSuite(JniEventTest.class);
+        suite.addTestSuite(JniMarkerTest.class);
+        suite.addTestSuite(JniMarkerFieldTest.class);
+        
+        return suite;
+    }
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/Combinations.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/Combinations.java
new file mode 100644
index 0000000..27dca2f
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/Combinations.java
@@ -0,0 +1,176 @@
+/**
+ * 
+ */
+package org.eclipse.linuxtools.lttng.tests.jni;
+
+import junit.framework.TestCase;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.linuxtools.lttng.jni.JniEvent;
+import org.eclipse.linuxtools.lttng.jni.JniMarker;
+import org.eclipse.linuxtools.lttng.jni.JniMarkerField;
+import org.eclipse.linuxtools.lttng.jni.JniTrace;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory;
+
+
+/**
+ * @author alvaro
+ * 
+ */
+public class Combinations extends TestCase {
+
+	private final static boolean printLttDebug = false;
+	
+    private final static String tracepath="traceset/trace-618339events-1293lost-1cpu";
+	private final static String eventName = "syscall_state";
+
+	private final static Integer expect_syscall_entry = 195596;
+	private final static Integer expect_syscall_exit = 195598;
+	private final static Integer expect_core_marker_format = 177;
+	private final static Integer expect_core_marker_id = 177;
+
+	// private static final String LTT_EVENT_SYSCALL_ENTRY = "syscall_entry";
+	// private static final String LTT_EVENT_SYSCALL_EXIT = "syscall_exit";
+	// private static final String LTT_EVENT_TRAP_ENTRY = "trap_entry";
+	// private static final String LTT_EVENT_TRAP_EXIT = "trap_exit";
+	// private static final String LTT_EVENT_PAGE_FAULT_ENTRY =
+	// "page_fault_entry";
+	// private static final String LTT_EVENT_PAGE_FAULT_EXIT =
+	// "page_fault_exit";
+	// private static final String LTT_EVENT_PAGE_FAULT_NOSEM_ENTRY =
+	// "page_fault_nosem_entry";
+	// private static final String LTT_EVENT_PAGE_FAULT_NOSEM_EXIT =
+	// "page_fault_nosem_exit";
+	// private static final String LTT_EVENT_IRQ_ENTRY = "irq_entry";
+	// private static final String LTT_EVENT_IRQ_EXIT = "irq_exit";
+	// private static final String LTT_EVENT_SOFT_IRQ_RAISE = "softirq_raise";
+	// private static final String LTT_EVENT_SOFT_IRQ_ENTRY = "softirq_entry";
+	// private static final String LTT_EVENT_SOFT_IRQ_EXIT = "softirq_exit";
+	// private static final String LTT_EVENT_SCHED_SCHEDULE = "sched_schedule";
+	// private static final String LTT_EVENT_PROCESS_FORK = "process_fork";
+	// private static final String LTT_EVENT_KTHREAD_CREATE = "kthread_create";
+	// private static final String LTT_EVENT_PROCESS_EXIT = "process_exit";
+	// private static final String LTT_EVENT_PROCESS_FREE = "process_free";
+	// private static final String LTT_EVENT_EXEC = "exec";
+	// private static final String LTT_EVENT_PROCESS_STATE = "process_state";
+	// private static final String LTT_EVENT_STATEDUMP_END = "statedump_end";
+	// private static final String LTT_EVENT_FUNCTION_ENTRY = "function_entry";
+	// private static final String LTT_EVENT_FUNCTION_EXIT = "function_exit";
+	// private static final String LTT_EVENT_THREAD_BRAND = "thread_brand";
+	// private static final String LTT_EVENT_REQUEST_ISSUE =
+	// "_blk_request_issue";
+	// private static final String LTT_EVENT_REQUEST_COMPLETE =
+	// "_blk_request_complete";
+	// private static final String LTT_EVENT_LIST_INTERRUPT = "interrupt";
+	// private static final String LTT_EVENT_SYS_CALL_TABLE = "sys_call_table";
+	// private static final String LTT_EVENT_SOFTIRQ_VEC = "softirq_vec";
+	// private static final String LTT_EVENT_KPROBE_TABLE = "kprobe_table";
+	// private static final String LTT_EVENT_KPROBE = "kprobe";
+
+	// enum EventString {
+	// syscall_entry, syscall_exit, trap_entry, trap_exit, page_fault_entry,
+	// page_fault_exit, page_fault_nosem_entry, page_fault_nosem_exit,
+	// irq_entry, irq_exit, softirq_raise, softirq_entry, softirq_exit,
+	// sched_schedule, process_fork, kthread_create, process_exit, process_free,
+	// exec, process_state, statedump_end, function_entry, function_exit,
+	// thread_brand, _blk_request_issue, blk_request_complete, interrupt,
+	// sys_call_table, softirq_vec, kprobe_table, kprobe
+	// };
+
+	enum EvStateTrans {
+		syscall_entry, syscall_exit, trap_entry, trap_exit, page_fault_entry, page_fault_exit, page_fault_nosem_entry, page_fault_nosem_exit, irq_entry, irq_exit, softirq_raise, softirq_entry, softirq_exit, sched_schedule, process_fork, kthread_create, process_exit, process_free, exec, thread_brand
+	};
+
+	private static Set<String> stateSet;
+	static {
+		stateSet = new HashSet<String>();
+		EvStateTrans[] stateArr = EvStateTrans.values();
+		for (EvStateTrans event : stateArr) {
+			stateSet.add(event.name());
+		}
+	}
+
+	private JniEvent prepareEventToTest() {
+
+		JniEvent tmpEvent = null;
+		// This trace should be valid
+		try {
+			tmpEvent = JniTraceFactory.getJniTrace(tracepath, printLttDebug).requestEventByName(eventName);
+		} catch (JniException e) {
+		}
+
+		return tmpEvent;
+	}
+	
+	public void testGetSpecEventFields() {
+		JniEvent event = prepareEventToTest();
+		JniMarker dmarker = event.requestEventMarker();
+		List<JniMarkerField> markers = dmarker.getMarkerFieldsArrayList();
+
+		assertNotNull(markers);
+		System.out.println("Markers: " + markers);
+
+	}
+
+	public void testEventsLoop() {
+		JniTrace trace = null;
+		JniEvent event = null;
+		try {
+			trace = JniTraceFactory.getJniTrace(tracepath, printLttDebug);
+		} catch (JniException e) {
+			e.printStackTrace();
+		}
+
+		HashMap<String, Integer> eventCount = new HashMap<String, Integer>();
+		while (true) {
+			event = trace.readNextEvent();
+			if (event == null) {
+				break;
+			}
+			JniMarker dmarker = event.requestEventMarker();
+			assertNotNull(dmarker);
+
+			String name = dmarker.getName();
+
+			if (eventCount.containsKey(name)) {
+				Integer cnt = eventCount.get(name);
+				eventCount.put(name, cnt + 1);
+			} else {
+				eventCount.put(name, 1);
+				// Only print state transition states and it's format
+				if (stateSet.contains(name)) {
+					System.out.println("\nMarker name: " + name + "\nFields:");
+					
+					Object[] tmpMarkerFields = dmarker.getMarkerFieldsArrayList().toArray();
+					String[] fields = new String[tmpMarkerFields.length];
+					
+					for (int pos = 0; pos < tmpMarkerFields.length; pos++) {
+						fields[pos] = ((JniMarkerField) tmpMarkerFields[pos]).getField() + ":" + ((JniMarkerField) tmpMarkerFields[pos]).getFormat();
+					}
+					
+					for (String field : fields) {
+						System.out.println(field + " ");
+					}
+				}
+			}
+		}
+
+		for (String state : eventCount.keySet()) {
+			System.out.println(state + " : " + eventCount.get(state));
+		}
+
+		assertEquals("syscall_entry mismatch", expect_syscall_entry, eventCount
+				.get(EvStateTrans.syscall_entry.name()));
+		assertEquals("syscall_exit mismatch", expect_syscall_exit, eventCount
+				.get(EvStateTrans.syscall_exit.name()));
+		assertEquals("core_market_format mismatch", expect_core_marker_format,
+				eventCount.get("core_marker_format"));
+		assertEquals("core_market_id mismatch", expect_core_marker_id,
+				eventCount.get("core_marker_id"));
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniEventTest.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniEventTest.java
new file mode 100644
index 0000000..e40cd73
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniEventTest.java
@@ -0,0 +1,353 @@
+
+/*
+ Functions tested here :
+        public JniEvent(JniEvent oldEvent)
+        public JniEvent(long newEventPtr, long newTracefilePtr, HashMap<Integer, JniMarker> newMarkersMap, JniTracefile newParentTracefile) throws JafException
+        
+        public int readNextEvent()
+        public int seekToTime(JniTime seekTime)
+        public int seekOrFallBack(JniTime seekTime)
+        
+        public JniMarker requestEventMarker()
+        public String requestEventSource()
+        public JniTime requestNextEventTime()
+        
+        public ArrayList<ParsedContent> parse()
+        
+        public int getEventMarkerId()
+        public JniTime getEventTime()
+        public long getEventDataSize()
+        public HashMap<Integer, JniMarker> getMarkersMap()
+        public long getTracefilePtr()
+        public long getEventPtr()
+        public int getEventState()
+        public JniTracefile getParentTracefile()
+        
+        public String toString()
+        public void printEventInformation()
+*/
+
+
+package org.eclipse.linuxtools.lttng.tests.jni;
+
+
+import org.eclipse.linuxtools.lttng.jni.JniEvent;
+import org.eclipse.linuxtools.lttng.jni.JniTracefile;
+import org.eclipse.linuxtools.lttng.jni.common.JniTime;
+import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory;
+
+import junit.framework.TestCase;
+
+public class JniEventTest extends TestCase
+{
+		private final static boolean printLttDebug = false;
+	
+        private final static String tracepath="traceset/trace-15316events_nolost_newformat";
+        private final static String eventName="kernel0";
+        
+        private final static int    numberOfMarkersInTracefile = 45;
+        
+        private final static int    numberOfparsedFieldsFirstEvent = 1;
+        private final static int    numberOfparsedFieldsSecondEvent = 3;
+        
+        private final static int    chosenPositionOfFieldsFirstEvent = 1;
+        private final static int    chosenPositionOfFieldsSecondEvent = 0;
+        private final static int    chosenPositionOfFieldsAfterSeekEvent = 1;
+        
+        private final static String chosenNameOfFieldsFirstEvent = "string";
+        private final static String chosenNameOfFieldsSecondEvent = "ip";
+        private final static String chosenNameOfFieldsThirdEvent = "syscall_id";
+        
+        private final static String contentOfFieldsFirstEvent = "LTT state dump begin";
+        private final static String   contentOfFieldsSecondEvent = "0xc142176d";
+        private final static long   contentOfFieldsThirdEvent = 3L;
+        
+        private final static int    numberOfByteInContent = 4;
+        
+        private final static long   firstEventTimestamp = 13589760262237L;
+        private final static long   secondEventTimestamp = 13589762149621L;
+        private final static long   thirdEventTimestamp = 13589762917527L;
+        
+        private final static long   timestampToSeekTest1 = 13589807108560L;
+        private final static long   timestampAfterSeekTest1 = 13589807116344L;
+        
+        private final static long   timestampToSeekLast = 13589906758692L;
+        
+        private final static long   timestampToSeekTooFarAway = Long.MAX_VALUE;
+
+        private JniEvent prepareEventToTest() {
+                
+                JniEvent tmpEvent = null;
+                
+                // This trace should be valid
+                try {
+                        tmpEvent = JniTraceFactory.getJniTrace(tracepath, printLttDebug).requestEventByName(eventName);
+                }
+                catch( JniException e) { }
+                
+                return tmpEvent;
+        }
+        
+        
+        public void testEventConstructors() {
+                JniTracefile testTracefile = null;
+                
+                @SuppressWarnings("unused")
+				JniEvent testEvent1 = null;
+                @SuppressWarnings("unused")
+				JniEvent testEvent2 = null;
+                
+                // This trace should be valid and will be used in test
+                try {
+                        testTracefile = JniTraceFactory.getJniTrace(tracepath, printLttDebug).requestTracefileByName(eventName);
+                }
+                catch( JniException e) { }
+                
+                
+                // Test the constructor with parameters using wrong arguments
+                // Test constructor on a wrong event pointer
+                try {
+                        testEvent1 = testTracefile.allocateNewJniEvent( new Jni_C_Pointer(0), testTracefile.getTracefileMarkersMap(), testTracefile );
+                        fail("Construction with wrong event pointer should fail!");
+                }
+                catch( JniException e) { 
+                }
+                
+                // Test constructor on a wrong marker HashMap
+                try {
+                        testEvent1 = testTracefile.allocateNewJniEvent( testTracefile.getCurrentEvent().getEventPtr(), null, testTracefile );
+                        fail("Construction with wrong marker hashmap should fail!");
+                }
+                catch( JniException e) { 
+                }
+                
+                // Test constructor on a wrong tracefile reference
+                try {
+                        testEvent1 = testTracefile.allocateNewJniEvent( testTracefile.getCurrentEvent().getEventPtr(), testTracefile.getTracefileMarkersMap(), null );
+                        fail("Construction with wrong tracefile reference should fail!");
+                }
+                catch( JniException e) { 
+                }
+                
+                
+                // Finally, test constructor with correct information
+                try {
+                        testEvent1 = testTracefile.allocateNewJniEvent( testTracefile.getCurrentEvent().getEventPtr(), testTracefile.getTracefileMarkersMap(), testTracefile );
+                }
+                catch( JniException e) { 
+                        fail("Construction with correct information failed!");
+                }
+                
+                /*
+                // Test copy constructor
+                try {
+                        testEvent1 = new JniEvent( testTracefile.getCurrentEvent() );
+                        testEvent2 = new JniEvent( testEvent1);
+                }
+                catch( Exception e) {
+                        fail("Copy constructor failed!");
+                }
+                assertEquals("JniEvent timestamp not same after using copy constructor", testEvent1.getEventTime().getTime() , testEvent2.getEventTime().getTime() );
+                */
+                
+        }
+        
+        public void testPrintAndToString() {
+                
+                JniEvent testEvent = prepareEventToTest();
+                
+                // Test printEventInformation
+                try {
+                        testEvent.printEventInformation();
+                }
+                catch( Exception e) { 
+                        fail("printEventInformation failed!");
+                }
+                
+                // Test ToString()
+                assertNotSame("toString returned empty data","",testEvent.toString() );
+                
+        }
+        
+        public void testEventDisplacement() {
+                
+                int readValue = -1;
+                int seekValue = -1; 
+                JniEvent testEvent = prepareEventToTest();
+                
+                // Test #1 readNextEvent()
+                readValue = testEvent.readNextEvent();
+                assertSame("readNextEvent() returned error (test #1)",0,readValue);
+                assertEquals("readNextEvent() event timestamp is incoherent (test #1)",secondEventTimestamp,testEvent.getEventTime().getTime() );
+                
+                // Test #2 readNextEvent()
+                readValue = testEvent.readNextEvent();
+                assertSame("readNextEvent() returned error (test #1)",0,readValue);
+                assertEquals("readNextEvent() event timestamp is incoherent (test #1)",thirdEventTimestamp,testEvent.getEventTime().getTime() );
+                
+                
+                // Test  #1 of seekToTime()
+                seekValue = testEvent.seekToTime(new JniTime(timestampToSeekTest1) );
+                assertSame("seekToTime() returned error (test #1)",0,seekValue);
+                // Read SHOULD NOT be performed after a seek!
+                assertEquals("readNextEvent() event timestamp is incoherent (test #1)",timestampToSeekTest1,testEvent.getEventTime().getTime() );
+                
+                readValue = testEvent.readNextEvent();
+                assertEquals("readNextEvent() event timestamp is incoherent (test #1)",timestampAfterSeekTest1,testEvent.getEventTime().getTime() );
+                
+                
+                // Test  #2 of seekToTime()
+                seekValue = testEvent.seekToTime(new JniTime(timestampToSeekLast) );
+                assertSame("seekToTime() returned error (test #2)",0,seekValue);
+                // Read SHOULD NOT be performed after a seek!
+                assertEquals("readNextEvent() event timestamp is incoherent (test #2)",timestampToSeekLast,testEvent.getEventTime().getTime() );
+                
+                // Read AFTER the last event should bring an error
+                readValue = testEvent.readNextEvent();
+                assertNotSame("readNextEvent() AFTER last event should return error (test #2)",0,readValue);
+                
+                
+                // Test to see if we can seek back
+                seekValue = testEvent.seekToTime(new JniTime(firstEventTimestamp) );
+                assertSame("seekToTime() returned error (test seek back)",0,seekValue);
+                // Read SHOULD NOT be performed after a seek!
+                assertEquals("readNextEvent() event timestamp is incoherent (test seek back)",firstEventTimestamp,testEvent.getEventTime().getTime() );
+                
+                
+                // Test  #1 of seekOrFallBack() (seek within range)
+                seekValue = testEvent.seekOrFallBack(new JniTime(timestampToSeekTest1) );
+                assertSame("seekToTime() returned error (test #1)",0,seekValue);
+                // Read SHOULD NOT be performed after a seek!
+                assertEquals("readNextEvent() event timestamp is incoherent (test #1)",timestampToSeekTest1,testEvent.getEventTime().getTime() );
+                
+                // Test  #2 of seekOrFallBack() (seek out of range, should fall back)
+                seekValue = testEvent.seekOrFallBack(new JniTime(timestampToSeekTooFarAway) );
+                assertNotSame("seekOrFallBack() should return an error (test #2)",0,seekValue);
+                // The read should return the "last" value as we seek back
+                assertEquals("readNextEvent() event timestamp is incoherent (test #2)",timestampToSeekTest1,testEvent.getEventTime().getTime() );
+        }
+        
+        public void testGetSet() {
+                
+                JniEvent testEvent = prepareEventToTest();
+                
+                // Test that all Get/Set return data
+                assertNotSame("getEventMarkerId is 0",0,testEvent.getEventMarkerId() );
+                
+                // JniTime should never be null
+                assertNotNull("getEventTime returned null", testEvent.getEventTime() );
+                
+                assertNotSame("getEventDataSize is 0",0,testEvent.getEventDataSize() );
+                
+                // Test that the marker map is not null
+                assertNotSame("getMarkersMap is null",null,testEvent.getMarkersMap() );
+                // Also check that the map contain some data
+                assertSame("getMarkersMap returned an unexpected number of markers",numberOfMarkersInTracefile,testEvent.getMarkersMap().size() );
+                
+                assertNotSame("getTracefilePtr is 0",0,testEvent.getTracefilePtr() );
+                assertNotSame("getEventPtr is 0",0,testEvent.getEventPtr() );
+                // State 0 (EOK) means the event is in a sane state
+                assertSame("getEventState is not EOK",0,testEvent.getEventState() );
+                
+                // ParentTracefile should never be null
+                assertNotNull("getParentTracefile returned null", testEvent.getParentTracefile() );
+        }
+        
+        public void testRequestFunctions() {
+                
+                JniEvent testEvent = prepareEventToTest();
+                
+                // Test requestEventMarker(). Should return an unique marker
+                assertNotNull("requestEventMarker returned null",testEvent.requestEventMarker() );
+                
+                // Test requestEventSource()
+                assertNotSame("requestEventSource is empty","",testEvent.requestEventSource() );
+                
+                // Test requestEventContent()
+                assertNotNull("requestEventContent returned null",testEvent.requestEventContent() );
+                
+                // Also check that the byte array contain some data
+                assertSame("requestEventContent returned an unexpected number of markers",numberOfByteInContent,testEvent.requestEventContent().length );
+                
+        }
+        
+        public void testParseAllFieldsFunctions() {
+                
+                JniEvent testEvent = prepareEventToTest();
+                
+                // Test parse()
+                assertNotNull("parseAllFields returned null",testEvent.parseAllFields() );
+                // Parse shouldn't be empty
+                assertSame("parseAllFields returned an unexpected number of parsed fields",numberOfparsedFieldsFirstEvent,testEvent.parseAllFields().size() );
+                
+                // MORE PARSING TESTS 
+                // We will perform several more unit tests about parsing as it is very important
+                // All those below use the same call as in the displacement test
+                // Test #1 readNextEvent()
+                testEvent.readNextEvent();
+                assertNotNull("parseAllFields returned null",testEvent.parseAllFields() );
+                assertSame("parseAllFields returned an unexpected number of parsed fields",numberOfparsedFieldsSecondEvent,testEvent.parseAllFields().size() );
+                // Test #2 readNextEvent()
+                testEvent.readNextEvent();
+                assertNotNull("parseAllFields returned null",testEvent.parseAllFields() );
+                
+                // Test  #1 of seekToTime()
+                testEvent.seekToTime(new JniTime(timestampToSeekTest1) );
+                // Read need to be perform after a seek!
+                testEvent.readNextEvent();
+                assertNotNull("parseAllFields returned null",testEvent.parseAllFields() );
+                testEvent.readNextEvent();
+                assertNotNull("parseAllFields returned null",testEvent.parseAllFields() );
+                
+                // Test  #2 of seekToTime()
+                testEvent.seekToTime(new JniTime(timestampToSeekLast) );
+                // Read need to be perform after a seek!
+                testEvent.readNextEvent();
+                assertNotNull("parseAllFields returned null",testEvent.parseAllFields() );
+                
+                // Test to see if we can seek back
+                testEvent.seekToTime(new JniTime(firstEventTimestamp) );
+                // Read need to be perform after a seek!
+                testEvent.readNextEvent();
+                assertNotNull("parseAllFields returned null",testEvent.parseAllFields() );
+        }
+        
+        public void testParseFieldByIdFunctions() {
+                JniEvent testEvent = prepareEventToTest();
+                
+                // Test parse()
+                assertNotNull("parseFieldById returned null",testEvent.parseFieldById(0) );
+                
+                testEvent.readNextEvent();
+                assertNotNull("parseFieldById returned null",testEvent.parseFieldById(chosenPositionOfFieldsFirstEvent) );
+                assertEquals("Content return by parseFieldById is invalid",contentOfFieldsFirstEvent, testEvent.parseFieldById(chosenPositionOfFieldsFirstEvent) );
+                assertEquals("Content return by parseFieldByName is invalid",contentOfFieldsFirstEvent, testEvent.parseFieldByName(chosenNameOfFieldsFirstEvent) );
+                
+                // MORE PARSING TESTS 
+                // We will perform several more unit tests about parsing as it is very important
+                // All those below use the same call as in the displacement test
+                // Test #1 readNextEvent()
+                testEvent.readNextEvent();
+                assertNotNull("parseFieldById returned null",testEvent.parseFieldById(chosenPositionOfFieldsSecondEvent) );
+                assertEquals("Content return by parseFieldById is invalid", contentOfFieldsSecondEvent, testEvent.parseFieldById(chosenPositionOfFieldsSecondEvent).toString() );
+                assertEquals("Content return by parseFieldByName is invalid",contentOfFieldsSecondEvent, testEvent.parseFieldByName(chosenNameOfFieldsSecondEvent).toString() );
+                
+                // Test  #1 of seekToTime()
+                testEvent.seekToTime(new JniTime(timestampToSeekTest1) );
+                // Read need to be perform after a seek!
+                testEvent.readNextEvent();
+                assertNotNull("parseFieldById returned null",testEvent.parseFieldById(chosenPositionOfFieldsAfterSeekEvent) );
+                assertEquals("Content return by parseFieldById is invalid",contentOfFieldsThirdEvent, testEvent.parseFieldById(chosenPositionOfFieldsAfterSeekEvent) );
+                assertEquals("Content return by parseFieldByName is invalid",contentOfFieldsThirdEvent, testEvent.parseFieldByName(chosenNameOfFieldsThirdEvent) );
+                
+                // Test to see if we can seek back
+                testEvent.seekToTime(new JniTime(firstEventTimestamp) );
+                // Read need to be perform after a seek!
+                testEvent.readNextEvent();
+                assertNotNull("parseFieldById returned null",testEvent.parseFieldById(chosenPositionOfFieldsFirstEvent) );
+                assertEquals("Content return by parseFieldById is invalid",contentOfFieldsFirstEvent, testEvent.parseFieldById(chosenPositionOfFieldsFirstEvent) );
+                assertEquals("Content return by parseFieldByName is invalid",contentOfFieldsFirstEvent, testEvent.parseFieldByName(chosenNameOfFieldsFirstEvent) );
+        }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerFieldTest.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerFieldTest.java
new file mode 100644
index 0000000..10c2194
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerFieldTest.java
@@ -0,0 +1,123 @@
+
+package org.eclipse.linuxtools.lttng.tests.jni;
+
+
+import junit.framework.TestCase;
+
+import org.eclipse.linuxtools.lttng.jni.JniEvent;
+import org.eclipse.linuxtools.lttng.jni.JniMarker;
+import org.eclipse.linuxtools.lttng.jni.JniMarkerField;
+import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory;
+
+/*
+ Functions tested here :
+        public JniMarkerField(JniMarkerField oldMarkerField)
+        public JniMarkerField(long newMarkerPtr) throws JniException
+        
+        public String getField()
+        public String getFormat()
+        
+        public String toString()
+        public void printMarkerFieldInformation()
+*/
+
+public class JniMarkerFieldTest extends TestCase
+{
+		private final static boolean printLttDebug = false;
+	
+        private final static String tracepath="traceset/trace-15316events_nolost_newformat";
+        private final static String eventName="kernel0";
+        
+        private JniMarkerField prepareMarkerFieldToTest() {
+                
+                JniEvent tmpEvent = null;
+                JniMarkerField tmpMarkerField = null;
+                
+                // This trace should be valid
+                // We will read the first 2 event to have something interesting to test on
+                try {
+                        tmpEvent = JniTraceFactory.getJniTrace(tracepath, printLttDebug).requestEventByName(eventName);
+                        tmpEvent.readNextEvent();
+                        tmpEvent.readNextEvent();
+                        
+                        // Use the first field
+                        tmpMarkerField = tmpEvent.requestEventMarker().getMarkerFieldsArrayList().get(0);
+                }
+                catch( JniException e) { }
+                
+                return tmpMarkerField;
+        }
+        
+        public void testEventConstructors() {
+                
+                JniMarker tmpMarker = null;
+                
+                @SuppressWarnings("unused")
+				JniMarkerField tmpMarkerField1 = null;
+                @SuppressWarnings("unused")
+				JniMarkerField tmpMarkerField2 = null;
+                
+                // This event should be valid and will be used in test
+                try {
+                        tmpMarker = JniTraceFactory.getJniTrace(tracepath, printLttDebug).requestEventByName(eventName).requestEventMarker();
+                }
+                catch( JniException e) { }
+                
+                // Test constructor with pointer on a wrong pointer
+                try {
+                        tmpMarkerField1 = tmpMarker.allocateNewJniMarkerField( new Jni_C_Pointer(0) );
+                        fail("Construction with wrong pointer should fail!");
+                }
+                catch( JniException e) {
+                }
+                
+                // Test constructor with pointer on a correct pointer
+                try {
+                        tmpMarkerField1 = tmpMarker.allocateNewJniMarkerField( tmpMarker.getMarkerFieldsArrayList().get(0).getMarkerFieldPtr() );
+                }
+                catch( JniException e) {
+                        fail("Construction with correct pointer failed!");
+                }
+                
+                /*
+                // Test copy constructor
+                try {
+                        tmpMarkerField1 = new JniMarkerField( tmpMarker.getMarkerFieldsArrayList().get(0) );
+                        tmpMarkerField2 = new JniMarkerField( tmpMarkerField1);
+                }
+                catch( Exception e) {
+                        fail("Copy constructor failed!");
+                }
+                assertSame("JniMarker name not same after using copy constructor", tmpMarkerField1.getField() , tmpMarkerField2.getField());
+                */
+                
+        }
+        
+        public void testGetSet() {
+                
+                JniMarkerField testMarkerField = prepareMarkerFieldToTest();
+                
+                // Test that all Get/Set return data
+                assertNotSame("getName is empty","",testMarkerField.getField() );
+                assertNotSame("getFormat is empty","",testMarkerField.getFormat() );
+                assertNotSame("getMarkerFieldPtr is 0",0,testMarkerField.getMarkerFieldPtr() );
+        }
+        
+        public void testPrintAndToString() {
+                
+                JniMarkerField testMarkerField = prepareMarkerFieldToTest();
+                
+                // Test printMarkerInformation
+                try {
+                        testMarkerField.printMarkerFieldInformation();
+                }
+                catch( Exception e) { 
+                        fail("printMarkerFieldInformation failed!");
+                }
+                
+                // Test ToString()
+                assertNotSame("toString returned empty data","",testMarkerField.toString() );
+        }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerTest.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerTest.java
new file mode 100644
index 0000000..55a66c5
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerTest.java
@@ -0,0 +1,131 @@
+
+package org.eclipse.linuxtools.lttng.tests.jni;
+
+
+import org.eclipse.linuxtools.lttng.jni.JniEvent;
+import org.eclipse.linuxtools.lttng.jni.JniMarker;
+import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory;
+
+import junit.framework.TestCase;
+
+/*
+ Functions tested here :
+        public JniMarker(JniMarker oldMarker)
+        public JniMarker(long newMarkerPtr) throws JniException
+        
+        public String[] requestMarkerFieldToString()
+        
+        public String getName()
+        public String  getFormatOverview()
+        public ArrayList<JniMarkerField> getMarkerFieldArrayList()
+        
+        public String toString()
+        public void printMarkerInformation()
+*/
+
+public class JniMarkerTest extends TestCase
+{
+		private final static boolean printLttDebug = false;
+		
+        private final static String tracepath="traceset/trace-15316events_nolost_newformat";
+        private final static String eventName="kernel0";
+        
+        private final static int    numberOfMarkersFieldInMarker = 3;
+        
+        private JniMarker prepareMarkerToTest() {
+                
+                JniEvent tmpEvent = null;
+                JniMarker tmpMarker = null;
+                
+                // This trace should be valid
+                // We will read the second event to have something interesting to test on
+                try {
+                        tmpEvent = JniTraceFactory.getJniTrace(tracepath, printLttDebug).requestEventByName(eventName);
+                        tmpEvent.readNextEvent();
+                        
+                        tmpMarker = tmpEvent.requestEventMarker();
+                }
+                catch( JniException e) { }
+                
+                return tmpMarker;
+        }
+        
+        public void testEventConstructors() {
+                
+                JniEvent tmpEvent = null;
+                
+                @SuppressWarnings("unused")
+				JniMarker testMarker1 = null;
+                @SuppressWarnings("unused")
+				JniMarker testMarker2 = null;
+                
+                // This event should be valid and will be used in test
+                try {
+                        tmpEvent = JniTraceFactory.getJniTrace(tracepath, printLttDebug).requestEventByName(eventName);
+                }
+                catch( JniException e) { }
+                
+                // Test constructor with pointer on a wrong pointer
+                try {
+                        testMarker1 = tmpEvent.getParentTracefile().allocateNewJniMarker( new Jni_C_Pointer(0) );
+                        fail("Construction with wrong pointer should fail!");
+                }
+                catch( JniException e) { 
+                }
+                
+                // Test constructor with pointer on a correct pointer
+                try {
+                        testMarker1 = tmpEvent.getParentTracefile().allocateNewJniMarker( tmpEvent.requestEventMarker().getMarkerPtr() );
+                }
+                catch( JniException e) {
+                        fail("Construction with correct pointer failed!");
+                }
+                
+                /*
+                // Test copy constructor
+                try {
+                        testMarker1 = new JniMarker( tmpEvent.requestEventMarker().getMarkerPtr() );
+                        testMarker2 = new JniMarker( testMarker1);
+                }
+                catch( JniException e) {
+                        fail("Copy constructor failed!");
+                }
+                assertSame("JniMarker name not same after using copy constructor", testMarker1.getName() , testMarker2.getName());
+                */
+                
+        }
+        
+        public void testGetSet() {
+                
+                JniMarker testMarker = prepareMarkerToTest();
+                
+                // Test that all Get/Set return data
+                assertNotSame("getName is empty","",testMarker.getName() );
+                assertNotSame("getFormat is empty","",testMarker.getFormatOverview() );
+                
+                assertNotSame("getMarkerFieldArrayList is null",null,testMarker.getMarkerFieldsArrayList() );
+                // Also check that the map contain a certains number of data
+                assertSame("getMarkerFieldArrayList returned an unexpected number of markers",numberOfMarkersFieldInMarker,testMarker.getMarkerFieldsArrayList().size() );
+                
+                assertNotSame("getMarkerPtr is 0",0,testMarker.getMarkerPtr() );
+        }
+        
+        public void testPrintAndToString() {
+                
+                JniMarker testMarker = prepareMarkerToTest();
+                
+                // Test printMarkerInformation
+                try {
+                        testMarker.printMarkerInformation();
+                }
+                catch( Exception e) { 
+                        fail("printMarkerInformation failed!");
+                }
+                
+                // Test ToString()
+                assertNotSame("toString returned empty data","",testMarker.toString() );
+                
+        }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTraceTest.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTraceTest.java
new file mode 100644
index 0000000..957c86e
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTraceTest.java
@@ -0,0 +1,397 @@
+
+package org.eclipse.linuxtools.lttng.tests.jni;
+
+import org.eclipse.linuxtools.lttng.jni.JniEvent;
+import org.eclipse.linuxtools.lttng.jni.JniTrace;
+import org.eclipse.linuxtools.lttng.jni.common.JniTime;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory;
+
+import junit.framework.TestCase;
+
+/*
+ Functions tested here :
+        public JniTrace()
+        public JniTrace(JniTrace oldTrace)
+        public JniTrace(String newpath) throws JafException
+        public JniTrace(long newPtr) throws JafException
+        
+        public void openTrace(String newPath) throws JafException
+        public void openTrace() throws JafException
+        public void closeTrace( ) throws JafException
+        
+        public JniEvent readNextEvent()
+        public JniEvent findNextEvent()
+        public JniEvent seekAndRead(JniTime seekTime)
+        public void seekToTime(JniTime seekTime)
+        
+        public JniTracefile requestTracefileByName(String tracefileName)
+        public JniEvent requestEventByName(String tracefileName)
+        public ArrayList<Location> requestTraceLocation()
+        
+        public String getTracepath()
+        public int getCpuNumber()
+        public long getArchType()
+        public long getArchVariant()
+        public short getArchSize()
+        public short getLttMajorVersion()
+        public short getLttMinorVersion()
+        public short getFlightRecorder()
+        public long getFreqScale()
+        public long getStartFreq()
+        public long getStartTimestampCurrentCounter()
+        public long getStartMonotonic()
+        public JniTime getStartTime()
+        public JniTime getStartTimeFromTimestampCurrentCounter()
+        public HashMap<String, JniTracefile> getTracefilesMap()
+        public long getTracePtr()
+        
+        public void printAllTracefilesInformation()
+        public void printTraceInformation()
+        
+        public String toString() 
+ */
+
+
+public class JniTraceTest extends TestCase
+{
+		private final static boolean printLttDebug = false;
+		
+        private final static String tracepath1="traceset/trace-15316events_nolost_newformat";
+        private final static String tracepath2="traceset/trace-15471events_nolost_newformat";
+        private final static String wrongTracePath="/somewhere/that/does/not/exist";
+        
+        private final static String correctTracefileName="kernel0";
+        private final static String wrongTracefileName="somethingThatDoesNotExists";
+        
+        private final static int   numberOfTracefilesInTrace = 16;
+        
+        private final static long   firstEventTimestamp = 13589759412128L;
+        private final static String firstEventTracefilename = "metadata0";
+        
+        private final static long   secondEventTimestamp = 13589759419903L;
+        private final static String secondEventName = "metadata";
+        
+        private final static long  thirdEventTimestamp = 13589759422785L;
+        
+        private final static long   eventTimestampAfterMetadata = 13589760262237L;
+        private final static String eventTracefilenameAfterMetadata = "kernel0";
+        
+        private final static long   timestampToSeekTest1 = 13589821608319L;
+        private final static String eventNameAfterSeekTest1 = "kernel";
+        private final static String eventTracefilenameAfterSeekTest1 = "kernel0";
+        private final static String nextEventNameAfterSeekTest1 = "vm_state";
+        
+        private final static long   timestampToSeekTest2 = 13589861889350L;
+        private final static String eventNameAfterSeekTest2 = "fs";
+        private final static String nextEventNameAfterSeekTest2 = "kernel";
+        
+        private final static long   timestampToSeekLast = 13589906758692L;
+        private final static String eventNameAfterSeekLast = "kernel";
+        
+        
+        private JniTrace prepareTraceToTest() {
+                JniTrace tmpTrace = null;
+                
+                // This trace should be valid
+                try {
+                        tmpTrace = JniTraceFactory.getJniTrace(tracepath1, printLttDebug);
+                        //tmpTrace.seekToTime(new JniTime(0L));
+                }
+                catch( JniException e) { }
+                
+                return tmpTrace;
+        }
+        
+        public void testTraceConstructors() {
+                @SuppressWarnings("unused")
+				JniTrace testTrace1 = null;
+                @SuppressWarnings("unused")
+                JniTrace testTrace2 = null;
+                
+                // Test constructor with argument on a wrong tracepath
+                try {
+                        testTrace1 = JniTraceFactory.getJniTrace(wrongTracePath, printLttDebug);
+                        fail("Construction with wrong tracepath should fail!");
+                }
+                catch( JniException e) { 
+                }
+                
+                // Test constructor with argument on a correct tracepath
+                try {
+                        testTrace1 = JniTraceFactory.getJniTrace(tracepath1, printLttDebug);
+                }
+                catch( JniException e) {
+                        fail("Construction with correct tracepath failed!");
+                }
+                
+                /*
+                // Test copy constructor that take a pointer with a good pointer
+                try {
+                        testTrace1 = new JniTrace( new Jni_C_Pointer(0), printLttDebug);
+                        fail("Construction with wrong pointer should fail!");
+                }
+                catch( JniException e) { 
+                }
+                
+                // Test copy constructor that take a pointer with a good pointer
+                try {
+                        testTrace1 = new JniTrace(tracepath1, printLttDebug); // This trace should be valid
+                        testTrace2 = new JniTrace( testTrace1.getTracePtr(), printLttDebug);
+                }
+                catch( JniException e) { 
+                        fail("Construction with correct pointer failed!");
+                }
+                */
+        }
+        
+        public void testTraceOpenClose() {
+                
+                JniTrace testTrace = prepareTraceToTest(); // This trace should be valid
+                
+                // test the constructor with arguments passing a wrong tracepath
+                try {
+                        testTrace.openTrace(wrongTracePath);
+                        fail("Open with wrong tracepath should fail!");
+                }
+                catch( JniException e) { }
+                
+                // Test open with a correct tracepath
+                try {
+                        testTrace.openTrace(tracepath1);
+                        assertNotSame("getTracepath is empty after open","",testTrace.getTracepath() );
+                }
+                catch( JniException e) { 
+                        fail("Open with a correct tracepath failed!");
+                }
+                
+                // Test to open a trace already opened
+                try {
+                        testTrace.openTrace(tracepath1);
+                        testTrace.openTrace(tracepath2);
+                        assertNotSame("getTracepath is empty after open","",testTrace.getTracepath() );
+                }
+                catch( JniException e) { 
+                        fail("Reopen of a trace failed!");
+                }
+                
+                
+                // Test to open a trace already opened, but with a wrong tracepath
+                try {
+                        testTrace.openTrace(tracepath1);
+                        testTrace.openTrace(wrongTracePath);
+                        fail("Reopen with wrong tracepath should fail!");
+                }
+                catch( JniException e) {
+                }
+        }
+        
+        public void testGetSet() {
+                
+                JniTrace testTrace = prepareTraceToTest();
+                
+                // Test that all Get/Set return data
+                assertNotSame("getTracepath is empty","",testTrace.getTracepath() );
+                assertNotSame("getCpuNumber is 0",0,testTrace.getCpuNumber() );
+                assertNotSame("getArchType is 0",0,testTrace.getArchType() );
+                assertNotSame("getArchVariant is 0",0,testTrace.getArchVariant() );
+                assertNotSame("getArchSize is 0",0,testTrace.getArchSize() );
+                assertNotSame("getLttMajorVersion is 0",0,testTrace.getLttMajorVersion() );
+                assertNotSame("getLttMinorVersion is 0",0,testTrace.getLttMinorVersion() );
+                assertNotSame("getFlightRecorder is 0",0,testTrace.getFlightRecorder() );
+                assertNotSame("getFreqScale is 0",0,testTrace.getFreqScale() );
+                assertNotSame("getStartFreq is 0",0,testTrace.getStartFreq() );
+                assertNotSame("getStartTimestampCurrentCounter is 0",0,testTrace.getStartTimestampCurrentCounter());
+                assertNotSame("getStartMonotonic is 0",0,testTrace.getStartMonotonic() );
+                assertNotSame("getStartTime is null",null,testTrace.getStartTime() );
+                assertNotSame("getStartTimeNoAdjustement is null",null,testTrace.getStartTimeNoAdjustement() );
+                assertNotSame("getTracefilesMap is null",null,testTrace.getTracefilesMap() );
+                // Also check that the map contain some tracefiles
+                assertSame("getTracefilesMap returned an unexpected number of tracefiles",numberOfTracefilesInTrace,testTrace.getTracefilesMap().size() );
+                assertNotSame("getTracePtr is 0",0,testTrace.getTracePtr() );
+                
+                
+        }
+        
+        public void testPrintAndToString() {
+                
+                JniTrace testTrace = prepareTraceToTest();
+                
+                // Test printTraceInformation
+                try {
+                        testTrace.printTraceInformation();
+                }
+                catch( Exception e) { 
+                        fail("printTraceInformation failed!");
+                }
+                
+                // Test ToString()
+                assertNotSame("toString returned empty data","",testTrace.toString() );
+        }
+        
+        public void testRequestFunctions() {
+        
+                JniTrace testTrace = prepareTraceToTest();
+                
+                // Test requestTracefileByName()
+                assertNotSame("requestTracefileByName returned null",null,testTrace.requestTracefileByName(correctTracefileName) );
+                assertSame("requestTracefileByName returned content on non existent name",null,testTrace.requestTracefileByName(wrongTracefileName) );
+                
+                // Test requestEventByName()
+                assertNotSame("requestEventByName returned null",null,testTrace.requestEventByName(correctTracefileName) );
+                assertSame("requestEventByName returned content on non existent name",null,testTrace.requestEventByName(wrongTracefileName) );
+        }
+        
+        public void testEventDisplacement() {
+        
+                JniEvent testEvent = null; 
+                JniTrace testTrace = prepareTraceToTest();
+                
+                // Test readNextEvent()
+                testEvent = testTrace.readNextEvent();
+                assertNotSame("readNextEvent() returned null",null,testEvent);
+                assertEquals("readNextEvent() timestamp is incoherent",firstEventTimestamp,testEvent.getEventTime().getTime() );
+                
+                // Test findNextEvent()
+                testEvent = testTrace.findNextEvent();
+                assertNotSame("findNextEvent() returned null",null,testEvent);
+                assertEquals("findNextEvent() name is incoherent",secondEventName,testEvent.getParentTracefile().getTracefileName() );
+                
+                // Test readNextEvent()
+                testEvent = testTrace.readNextEvent();
+                assertNotSame("readNextEvent() returned null",null,testEvent);
+                assertEquals("readNextEvent() timestamp is incoherent",secondEventName,testEvent.getParentTracefile().getTracefileName() );
+                
+                // Tests below are for seekAndRead()
+                // After, we will perform the same operation for seekTime
+                //
+                // Test  #1 of seekAndRead()
+                testEvent = testTrace.seekAndRead(new JniTime(timestampToSeekTest1) );
+                assertNotSame("seekAndRead(time) returned null (test #1)",null,testEvent);
+                assertEquals("seekAndRead(time) timestamp is incoherent (test #1)",timestampToSeekTest1,testEvent.getEventTime().getTime());
+                assertEquals("event name after seekAndRead(time) is incoherent (test #1)",eventNameAfterSeekTest1,testEvent.getParentTracefile().getTracefileName());
+                // Test that the next event after seek in the one we expect
+                testEvent = testTrace.readNextEvent();
+                assertEquals("readNextEvent() name after seekAndRead(time) is incoherent (test #1)",nextEventNameAfterSeekTest1,testEvent.getParentTracefile().getTracefileName());
+                
+                // Test  #2 of seekAndRead()
+                testEvent = testTrace.seekAndRead(new JniTime(timestampToSeekTest2) );
+                assertNotSame("seekAndRead(time) returned null (test #2)",null,testEvent);
+                assertEquals("seekAndRead(time) timestamp is incoherent (test #2)",timestampToSeekTest2,testEvent.getEventTime().getTime());
+                assertEquals("event name after seekAndRead(time) is incoherent (test #2)",eventNameAfterSeekTest2,testEvent.getParentTracefile().getTracefileName());
+                // Test that the next event after seek in the one we expect
+                testEvent = testTrace.readNextEvent();
+                assertEquals("readNextEvent() name after seekAndRead(time) is incoherent (test #2)",nextEventNameAfterSeekTest2,testEvent.getParentTracefile().getTracefileName());
+                
+                
+                // Seek to the LAST event of the trace
+                testEvent = testTrace.seekAndRead(new JniTime(timestampToSeekLast) );
+                assertNotSame("seekAndRead(time) returned null ",null,testEvent);
+                assertEquals("seekAndRead(time) timestamp is incoherent ",timestampToSeekLast,testEvent.getEventTime().getTime());
+                assertEquals("event name after seekTime(time) is incoherent ",eventNameAfterSeekLast,testEvent.getParentTracefile().getTracefileName());
+                // Test that the next event is NULL (end of the trace)
+                testEvent = testTrace.readNextEvent();
+                assertSame("seekAndRead(time) returned null ",null,testEvent);
+                
+                
+                // Make sure we can seek back
+                testEvent = testTrace.seekAndRead(new JniTime(firstEventTimestamp) );
+                assertNotSame("seekAndRead(time) to seek back returned null",null,testEvent);
+                assertEquals("seekAndRead(time) timestamp after seek back is incoherent",firstEventTimestamp,testEvent.getEventTime().getTime());
+                
+                
+                
+                // Tests below are for seekToTime()
+                // These are the same test as seekAndRead() for a readNextEvent() should be performed after seek
+                //
+                // Test  #1 of seekToTime()
+                testTrace.seekToTime(new JniTime(timestampToSeekTest1) );
+                testEvent = testTrace.readNextEvent();
+                assertNotSame("seekToTime(time) returned null (test #1)",null,testEvent);
+                assertEquals("seekToTime(time) timestamp is incoherent (test #1)",timestampToSeekTest1,testEvent.getEventTime().getTime());
+                assertEquals("event name after seekTime(time) is incoherent (test #1)",eventNameAfterSeekTest1,testEvent.getParentTracefile().getTracefileName());
+                // Test that the next event after seek in the one we expect
+                testEvent = testTrace.readNextEvent();
+                assertEquals("readNextEvent() name after seekToTime(time) is incoherent (test #1)",nextEventNameAfterSeekTest1,testEvent.getParentTracefile().getTracefileName());
+                
+                // Test  #2 of seekToTime()
+                testTrace.seekToTime(new JniTime(timestampToSeekTest2) );
+                testEvent = testTrace.readNextEvent();
+                assertNotSame("seekToTime(time) returned null (test #2)",null,testEvent);
+                assertEquals("seekToTime(time) timestamp is incoherent (test #2)",timestampToSeekTest2,testEvent.getEventTime().getTime());
+                assertEquals("event name after seekTime(time) is incoherent (test #2)",eventNameAfterSeekTest2,testEvent.getParentTracefile().getTracefileName());
+                // Test that the next event after seek in the one we expect
+                testEvent = testTrace.readNextEvent();
+                assertEquals("readNextEvent() name after seekToTime(time) is incoherent (test #2)",nextEventNameAfterSeekTest2,testEvent.getParentTracefile().getTracefileName());
+                
+                
+                // Seek to the LAST event of the trace
+                testTrace.seekToTime(new JniTime(timestampToSeekLast) );
+                testEvent = testTrace.readNextEvent();
+                assertNotSame("seekToTime(time) returned null ",null,testEvent);
+                assertEquals("seekToTime(time) timestamp is incoherent ",timestampToSeekLast,testEvent.getEventTime().getTime());
+                assertEquals("event name after seekTime(time) is incoherent ",eventNameAfterSeekLast,testEvent.getParentTracefile().getTracefileName());
+                // Test that the next event is NULL (end of the trace)
+                testEvent = testTrace.readNextEvent();
+                assertSame("seekToTime(time) returned null ",null,testEvent);
+                
+                
+                // Make sure we can seek back
+                testTrace.seekToTime(new JniTime(firstEventTimestamp) );
+                testEvent = testTrace.readNextEvent();
+                assertNotSame("seekToTime(time) to seek back returned null",null,testEvent);
+                assertEquals("seekToTime(time) timestamp after seek back is incoherent",firstEventTimestamp,testEvent.getEventTime().getTime());
+        }
+        
+        public void testEventDisplacementByTracefile() {
+        
+                JniEvent testEvent = null; 
+                JniTrace testTrace = prepareTraceToTest();
+                
+                // Read first event for the metadata (which is also the first event in the trace)
+                testEvent = testTrace.readNextEvent(testTrace.requestTracefileByName(firstEventTracefilename) );
+                assertNotSame("readNextEvent() returned null",null,testEvent);
+                assertEquals("readNextEvent() timestamp is incoherent",firstEventTimestamp,testEvent.getEventTime().getTime() );
+                
+                // If we read the next event again for this tracefile, we should get the SECOND event
+                testEvent = testTrace.readNextEvent(testTrace.requestTracefileByName(firstEventTracefilename));
+                assertNotSame("readNextEvent() on second read returned null",null,testEvent);
+                assertEquals("readNextEvent() timestamp on second read  is incoherent",secondEventTimestamp,testEvent.getEventTime().getTime() );
+                
+                // Reading the "global" event should take care of the change
+                // So if we read the next event, we should get the THIRD event
+                testEvent = testTrace.readNextEvent();
+                assertNotSame("readNextEvent() to read global event returned null",null,testEvent);
+                assertEquals("readNextEvent() timestamp to read global event is incoherent",thirdEventTimestamp,testEvent.getEventTime().getTime());
+                
+                // Now read the next event for another type of tracefile
+                testEvent = testTrace.readNextEvent(testTrace.requestTracefileByName(eventTracefilenameAfterMetadata) );
+                assertNotSame("readNextEvent() returned null",null,testEvent);
+                assertEquals("readNextEvent() timestamp is incoherent",eventTimestampAfterMetadata,testEvent.getEventTime().getTime() );
+                
+                
+                // Seek back to the beginning
+                testTrace.seekToTime(new JniTime(firstEventTimestamp), testTrace.requestTracefileByName(firstEventTracefilename) );
+                // Read the first event
+                testEvent = testTrace.readNextEvent(testTrace.requestTracefileByName(firstEventTracefilename) );
+                assertNotSame("readNextEvent() after seekToTime returned null",null,testEvent);
+                assertEquals("readNextEvent() after seekToTime timestamp is incoherent",firstEventTimestamp,testEvent.getEventTime().getTime() );
+                
+                // Seek and Read the first event for the metadata (again the first event in the trace)
+                testEvent = testTrace.seekAndRead(new JniTime(firstEventTimestamp), testTrace.requestTracefileByName(firstEventTracefilename) );
+                assertNotSame("seekAndRead() returned null",null,testEvent);
+                assertEquals("seekAndRead() timestamp is incoherent",firstEventTimestamp,testEvent.getEventTime().getTime() );
+                
+                // Seek the whole trace to the infinity
+                testTrace.seekToTime(new JniTime(Long.MAX_VALUE));
+                // Seek and Read the next event in the trace
+                testEvent = testTrace.seekAndRead(new JniTime(timestampToSeekTest1), testTrace.requestTracefileByName(eventTracefilenameAfterSeekTest1) );
+                assertNotSame("seekAndRead() returned null",null,testEvent);
+                assertEquals("seekAndRead() timestamp is incoherent",timestampToSeekTest1,testEvent.getEventTime().getTime() );
+                // Read next event... only the same type should be here as other are exhausted
+                testEvent = testTrace.readNextEvent();
+                assertNotSame("readNextEvent() after seekToTime returned null",null,testEvent);
+                assertEquals("readNextEvent() name after seekToTime is incoherent",eventNameAfterSeekTest1,testEvent.getParentTracefile().getTracefileName());
+                
+        }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTracefileTest.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTracefileTest.java
new file mode 100644
index 0000000..0f85bac
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTracefileTest.java
@@ -0,0 +1,239 @@
+
+package org.eclipse.linuxtools.lttng.tests.jni;
+
+import org.eclipse.linuxtools.lttng.jni.JniTrace;
+import org.eclipse.linuxtools.lttng.jni.JniTracefile;
+import org.eclipse.linuxtools.lttng.jni.common.JniTime;
+import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory;
+
+import junit.framework.TestCase;
+
+/*
+ Functions tested here :
+        public JniTracefile(JniTracefile oldTracefile)
+        public JniTracefile(long newPtr) throws JniException
+        
+        public int readNextEvent()
+        public int seekToTime(JniTime seekTime)
+        
+        public Location requestTracefileLocation()
+        
+        public boolean getIsCpuOnline()
+        public String getTracefilePath()
+        public String getTracefileName()
+        public long getCpuNumber()
+        public long getTid()
+        public long getPgid()
+        public long getCreation()
+        public long getTracePtr()
+        public long getMarkerDataPtr()
+        public int getCFileDescriptor()
+        public long getFileSize()
+        public long getBlocksNumber()
+        public boolean getIsBytesOrderReversed()
+        public boolean getIsFloatWordOrdered()
+        public long getAlignement()
+        public long getBufferHeaderSize()
+        public int getBitsOfCurrentTimestampCounter()
+        public int getBitsOfEvent()
+        public long getCurrentTimestampCounterMask()
+        public long getCurrentTimestampCounterMaskNextBit()
+        public long getEventsLost()
+        public long getSubBufferCorrupt()
+        public JniEvent getCurrentEvent()
+        public long getBufferPtr()
+        public long getBufferSize()
+        public HashMap<Integer, JniMarker> getTracefileMarkersMap()
+        public JniTrace getParentTrace()
+        public long getTracefilePtr()
+        
+        public String toString()
+        public void printTracefileInformation()
+*/
+
+public class JniTracefileTest extends TestCase
+{
+		private final static boolean printLttDebug = false;
+		
+        private final static String tracepath1="traceset/trace-15316events_nolost_newformat";
+        private final static String tracefileName1="kernel0";
+        
+        private final static int    numberOfMarkersInTracefile = 45;
+        
+        private final static long   firstEventTimestamp = 13589760262237L;
+        private final static long   secondEventTimestamp = 13589762149621L;
+        private final static long   thirdEventTimestamp = 13589762917527L;
+        
+        private final static long   timestampToSeekTest1 = 13589807108560L;
+        private final static long   timestampAfterSeekTest1 = 13589807116344L;
+        
+        private final static long   timestampToSeekLast = 13589906758692L;
+        
+        
+        private JniTracefile prepareTracefileToTest() {
+                
+                JniTracefile tmpTracefile = null;
+                
+                // This trace should be valid
+                try {
+                        tmpTracefile = JniTraceFactory.getJniTrace(tracepath1, printLttDebug).requestTracefileByName(tracefileName1);
+                        
+                }
+                catch( JniException e) { }
+                
+                return tmpTracefile;
+        }
+        
+        
+        public void testTracefileConstructors() {
+                JniTrace testTrace = null;
+                @SuppressWarnings("unused")
+				JniTracefile testTracefile1 = null;
+                @SuppressWarnings("unused")
+				JniTracefile testTracefile2 = null;
+                
+                // This trace should be valid and will be used in test
+                try {
+                        testTrace = JniTraceFactory.getJniTrace(tracepath1, printLttDebug);
+                }
+                catch( JniException e) { }
+                
+                
+                // Test constructor with pointer on a wrong pointer
+                try {
+                        testTracefile1 = testTrace.allocateNewJniTracefile( new Jni_C_Pointer(0), testTrace );
+                        fail("Construction with wrong pointer should fail!");
+                }
+                catch( JniException e) { 
+                }
+                
+                // Test constructor with pointer on a correct pointer
+                try {
+                        testTracefile1 = testTrace.allocateNewJniTracefile( testTrace.requestEventByName(tracefileName1).getTracefilePtr(), testTrace );
+                }
+                catch( JniException e) {
+                        fail("Construction with correct pointer failed!");
+                }
+                
+                /*
+                // Test copy constructor
+                try {
+                        testTracefile1 = new JniTracefile( testTrace.requestEventByName(tracefileName1).getTracefilePtr(), testTrace );
+                        testTracefile2 = new JniTracefile( testTracefile1);
+                }
+                catch( JniException e) {
+                        fail("Copy constructor failed!");
+                }
+                assertSame("JniTracefile name not same after using copy constructor", testTracefile1.getTracefileName() , testTracefile2.getTracefileName());
+                */
+                
+        }
+        
+        public void testGetSet() {
+                
+                JniTracefile testTracefile = prepareTracefileToTest();
+                
+                // Test that all Get/Set return data
+                //boolean getIsCpuOnline will always be sane...
+                assertNotSame("getTracefilePath is empty","",testTracefile.getTracefilePath() );
+                assertNotSame("getTracefileName is empty","",testTracefile.getTracefileName() );
+                assertNotSame("getCpuNumber is 0",0,testTracefile.getCpuNumber() );
+                assertNotSame("getTid is 0",0,testTracefile.getTid() );
+                assertNotSame("getPgid is 0",0,testTracefile.getPgid() );
+                assertNotSame("getCreation is 0",0,testTracefile.getCreation() );
+                assertNotSame("getTracePtr is 0",0,testTracefile.getTracePtr() );
+                assertNotSame("getMarkerDataPtr is 0",0,testTracefile.getMarkerDataPtr() );
+                assertNotSame("getCFileDescriptor is 0",0,testTracefile.getCFileDescriptor() );
+                assertNotSame("getFileSize is 0",0,testTracefile.getFileSize() );
+                assertNotSame("getBlocksNumber is 0",0,testTracefile.getBlocksNumber() );
+                //boolean getIsBytesOrderReversed will always be sane...
+                //boolean getIsFloatWordOrdered will always be sane...
+                assertNotSame("getAlignement is 0",0,testTracefile.getAlignement() );
+                assertNotSame("getBufferHeaderSize is 0",0,testTracefile.getBufferHeaderSize() );
+                assertNotSame("getBitsOfCurrentTimestampCounter is 0",0,testTracefile.getBitsOfCurrentTimestampCounter() );
+                assertNotSame("getBitsOfEvent is 0",0,testTracefile.getBitsOfEvent() );
+                assertNotSame("getCurrentTimestampCounterMask is 0",0,testTracefile.getCurrentTimestampCounterMask() );
+                assertNotSame("getCurrentTimestampCounterMaskNextBit is 0",0,testTracefile.getCurrentTimestampCounterMaskNextBit() );
+                assertNotSame("getEventsLost is 0",0,testTracefile.getEventsLost() );
+                assertNotSame("getSubBufferCorrupt is 0",0,testTracefile.getSubBufferCorrupt() );
+                // There should be at least 1 event, so it shouldn't be null
+                assertNotNull("getCurrentEvent returned null", testTracefile.getCurrentEvent() );
+                
+                assertNotSame("getBufferPtr is 0",0,testTracefile.getBufferPtr() );
+                assertNotSame("getBufferSize is 0",0,testTracefile.getBufferSize() );
+                
+                assertNotSame("getTracefileMarkersMap is null",null,testTracefile.getTracefileMarkersMap() );
+                // Also check that the map contain a certains number of data
+                assertSame("getTracefileMarkersMap returned an unexpected number of markers",numberOfMarkersInTracefile,testTracefile.getTracefileMarkersMap().size() );
+                
+                assertNotSame("getParentTrace is null",null,testTracefile.getParentTrace() );
+                
+                assertNotSame("getTracefilePtr is 0",0,testTracefile.getTracefilePtr() );
+                
+        }
+        
+        public void testPrintAndToString() {
+                
+                JniTracefile testTracefile = prepareTracefileToTest();
+                
+                // Test printTraceInformation
+                try {
+                        testTracefile.printTracefileInformation();
+                }
+                catch( Exception e) { 
+                        fail("printTraceInformation failed!");
+                }
+                
+                // Test ToString()
+                assertNotSame("toString returned empty data","",testTracefile.toString() );
+                
+        }
+        
+        public void testEventDisplacement() {
+                
+                int readValue = -1;
+                int seekValue = -1; 
+                JniTracefile testTracefile = prepareTracefileToTest();
+                
+                // Test #1 readNextEvent()
+                readValue = testTracefile.readNextEvent();
+                assertSame("readNextEvent() returned error (test #1)",0,readValue);
+                assertEquals("readNextEvent() event timestamp is incoherent (test #1)",secondEventTimestamp,testTracefile.getCurrentEvent().getEventTime().getTime() );
+                
+                // Test #2 readNextEvent()
+                readValue = testTracefile.readNextEvent();
+                assertSame("readNextEvent() returned error (test #1)",0,readValue);
+                assertEquals("readNextEvent() event timestamp is incoherent (test #1)",thirdEventTimestamp,testTracefile.getCurrentEvent().getEventTime().getTime() );
+                
+                
+                // Test  #1 of seekToTime()
+                seekValue = testTracefile.seekToTime(new JniTime(timestampToSeekTest1) );
+                assertSame("seekToTime() returned error (test #1)",0,seekValue);
+                // Read SHOULD NOT be performed after a seek!
+                assertEquals("readNextEvent() event timestamp is incoherent (test #1)",timestampToSeekTest1,testTracefile.getCurrentEvent().getEventTime().getTime() );
+                
+                readValue = testTracefile.readNextEvent();
+                assertEquals("readNextEvent() event timestamp is incoherent (test #1)",timestampAfterSeekTest1,testTracefile.getCurrentEvent().getEventTime().getTime() );
+                
+                
+                // Test  #2 of seekToTime()
+                seekValue = testTracefile.seekToTime(new JniTime(timestampToSeekLast) );
+                assertSame("seekToTime() returned error (test #2)",0,seekValue);
+                // Read SHOULD NOT be performed after a seek!
+                assertEquals("readNextEvent() event timestamp is incoherent (test #2)",timestampToSeekLast,testTracefile.getCurrentEvent().getEventTime().getTime() );
+                
+                // Read AFTER the last event should bring an error
+                readValue = testTracefile.readNextEvent();
+                assertNotSame("readNextEvent() AFTER last event should return error (test #2)",0,readValue);
+                
+                
+                // Test to see if we can seek back
+                seekValue = testTracefile.seekToTime(new JniTime(firstEventTimestamp) );
+                assertSame("seekToTime() returned error (test seek back)",0,seekValue);
+             	// Read SHOULD NOT be performed after a seek!
+                assertEquals("readNextEvent() event timestamp is incoherent (test seek back)",firstEventTimestamp,testTracefile.getCurrentEvent().getEventTime().getTime() );
+                
+        }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/StateManagerFactoryTestSupport.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/StateManagerFactoryTestSupport.java
new file mode 100644
index 0000000..7a12fda
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/StateManagerFactoryTestSupport.java
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.tests.state;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.linuxtools.lttng.state.StateManager;
+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.state.model.StateModelFactory;
+
+/**
+ * @author alvaro
+ * 
+ */
+public class StateManagerFactoryTestSupport {
+	// ========================================================================
+	// Data
+	// =======================================================================
+
+	private static final Map<String, StateManager> instanceBook = new HashMap<String, StateManager>();
+	
+	// ========================================================================
+	// Methods
+	// =======================================================================
+
+	/**
+	 * Provide a stateManager instance per trace
+	 * 
+	 * @return
+	 */
+	public static StateManager getManager(String traceUniqueId) {
+		if (traceUniqueId == null) {
+			return null;
+		}
+
+		if (instanceBook.containsKey(traceUniqueId)) {
+			return instanceBook.get(traceUniqueId);
+		}
+
+		LttngTraceState traceModel = StateModelFactory.getStateEntryInstance();
+		StateStacksHandlerTestSupport stateInputHandler = new StateStacksHandlerTestSupport(traceModel);
+		StateManager manager = new StateManager(stateInputHandler);
+
+		instanceBook.put(traceUniqueId, manager);
+		return manager;
+	}
+
+	/**
+	 * Remove previously registered managers
+	 * @param traceUniqueId
+	 */
+	public static void removeManager(String traceUniqueId) {
+		if (traceUniqueId != null && instanceBook.containsKey(traceUniqueId)) {
+			instanceBook.remove(traceUniqueId);
+		}
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/StateStacksHandlerTestSupport.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/StateStacksHandlerTestSupport.java
new file mode 100644
index 0000000..26f71bc
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/StateStacksHandlerTestSupport.java
@@ -0,0 +1,120 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.tests.state;
+
+import org.eclipse.linuxtools.lttng.TraceDebug;
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.state.StateStacksHandler;
+import org.eclipse.linuxtools.lttng.state.StateStrings;
+import org.eclipse.linuxtools.lttng.state.StateStrings.Events;
+import org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing;
+import org.eclipse.linuxtools.lttng.state.evProcessor.state.StateUpdateFactory;
+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.tests.state.handlers.after.StateAfterUpdateFactory;
+import org.eclipse.linuxtools.lttng.tests.state.handlers.before.StateBeforeUpdateFactory;
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.event.TmfEventField;
+
+/**
+ * @author Alvaro
+ * 
+ */
+public class StateStacksHandlerTestSupport extends StateStacksHandler {
+
+	// ========================================================================
+	// Table data
+	// =======================================================================
+
+	// private static final Long LTTNG_STATE_SAVE_INTERVAL = 50000L;
+	// private JniTrace trace = null;
+
+	// ========================================================================
+	// Constructors
+	// ========================================================================
+	StateStacksHandlerTestSupport(LttngTraceState model) {
+		// It's assumed to have one instance of this class per "TraceSet"
+		super(model);
+	}
+
+	// ========================================================================
+	// Methods
+	// =======================================================================
+
+	@Override
+	protected void processEvent(TmfEvent tmfEvent) /* throws LttngStateException */{
+		if (tmfEvent == null) {
+			return;
+		}
+
+		if (!(tmfEvent instanceof LttngEvent)) {
+			TraceDebug.debug("The event received is not an instance of LttngEvent and can not be processed");
+		}
+
+		LttngEvent trcEvent = (LttngEvent) tmfEvent;
+		TmfEventField[] fields = trcEvent.getContent().getFields();
+
+		if (fields != null) {
+			String inChannel = trcEvent.getChannelName();
+			String inEventName = trcEvent.getMarkerName();
+			// TraceDebug.debug("Event: " + inEventName);
+
+			// Check if the received event is a transition state event
+			Events eventStruct = StateStrings.getInstance()
+					.getStateTransEventMap().get(inEventName);
+			if (eventStruct != null) {
+				String expectedChannel = eventStruct.getParent().getInName();
+				// check that received channel is the expected channel in the
+				// structure
+				if (inChannel.equals(expectedChannel)) {
+					IEventProcessing handlerBefore = StateBeforeUpdateFactory.getInstance()
+					.getEventNametoProcessor(inEventName);
+
+					IEventProcessing handler = StateUpdateFactory.getInstance()
+					.getStateUpdaterProcessor(inEventName);
+					
+					IEventProcessing handlerAfter = StateAfterUpdateFactory.getInstance()
+					.getEventNametoProcessor(inEventName);
+					
+					
+					//Establish test reference calling the before handler
+					if(handlerBefore != null) {
+						handlerBefore.process(trcEvent, traceStateModel);
+					} 
+					
+					//Execute the actual test action
+					if (handler != null) {
+						// process State Update
+						handler.process(trcEvent, traceStateModel);
+					} else {
+						if (TraceDebug.isDEBUG()) {
+							eventsNotHandled.add(inEventName);
+						}
+					}
+					
+					//After processing verify the effects over the base state.
+					if(handlerAfter != null) {
+						handlerAfter.process(trcEvent, traceStateModel);
+					}
+
+				} else {
+					StringBuilder sb = new StringBuilder(
+							"Unexpected channel received for: " + inEventName
+									+ ", channel rec: " + inChannel
+									+ " chanel expected: " + expectedChannel);
+					TraceDebug.debug(sb.toString());
+				}
+			}
+		}
+	}
+
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/TestStateManager.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/TestStateManager.java
new file mode 100644
index 0000000..7dda2ea
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/TestStateManager.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.tests.state;
+
+import java.util.Set;
+
+import junit.framework.TestCase;
+
+import org.eclipse.linuxtools.lttng.TraceDebug;
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.state.StateManager;
+import org.eclipse.linuxtools.lttng.trace.LTTngTrace;
+import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
+
+/**
+ * @author alvaro
+ * 
+ */
+public class TestStateManager extends TestCase {
+	
+	public void testSetTraceSelection() {
+		String logName = "traceset/trace1";
+		
+		LTTngTrace testStream = null;
+		try {
+			testStream = new LTTngTrace(logName);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		if (testStream != null) {
+		    LTTngTrace[] streamList = new LTTngTrace[1];
+			streamList[0] = testStream;
+			TmfExperiment<LttngEvent> newExp = new TmfExperiment<LttngEvent>(LttngEvent.class, logName, streamList);
+			
+			//Get the Test StateManager
+			StateManager manager = StateManagerFactoryTestSupport.getManager(newExp.getName());
+			//Start execution.
+			manager.setTraceSelection(newExp, false);
+			
+			//Print events not handled.
+			Set<String> notHandledEvents = manager.getEventsNotHandled();
+			StringBuilder sb = new StringBuilder();
+			for (String event : notHandledEvents) {
+				sb.append("\n" + event);
+			}
+			TraceDebug.debug("Events not Handled: " + sb.toString());
+		}
+	}
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/AbsStateUpdate.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/AbsStateUpdate.java
new file mode 100644
index 0000000..aa6c529
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/AbsStateUpdate.java
@@ -0,0 +1,568 @@
+package org.eclipse.linuxtools.lttng.tests.state.handlers;
+
+import org.eclipse.linuxtools.lttng.TraceDebug;
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.event.LttngEventField;
+import org.eclipse.linuxtools.lttng.state.StateStrings.Fields;
+import org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing;
+import org.eclipse.linuxtools.lttng.state.model.LttngExecutionState;
+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.tmf.event.TmfEventField;
+
+public abstract class AbsStateUpdate implements IEventProcessing {
+
+	// ========================================================================
+	// Data
+	// =======================================================================
+	protected static LttngExecutionState exState = null;
+	protected static Long pid = null;
+	
+	// ========================================================================
+	// push and pop from stack
+	// =======================================================================
+
+//	protected static final Long ANY_CPU = 0L;
+	
+
+//	protected void push_state(Long cpu, StateStrings.ExecutionMode execMode,
+//			String submode, TmfTimestamp eventTime, LttngTraceState traceSt) {
+//
+//		LttngProcessState process = traceSt.getRunning_process().get(cpu);
+//		LttngExecutionState exe_state = new LttngExecutionState();
+//		exe_state.setExec_mode(execMode);
+//		exe_state.setExec_submode(submode);
+//		exe_state.setEntry_Time(eventTime);
+//		exe_state.setChage_Time(eventTime);
+//		exe_state.setCum_cpu_time(0L);
+//		exe_state.setProc_status(process.getState().getProc_status());
+//		process.setState(exe_state);
+//
+//		Stack<LttngExecutionState> exe_state_stack = process
+//				.getExecution_stack();
+//		exe_state_stack.push(exe_state);
+//	}
+//
+//	protected void pop_state(Long cpu, StateStrings.ExecutionMode execMode,
+//			LttngTraceState traceSt, TmfTimestamp eventTime) {
+//
+//		LttngProcessState process = traceSt.getRunning_process().get(cpu);
+//
+//		if (!process.getState().getExec_mode().equals(execMode)) {
+//			// Different execution mode
+//			TraceDebug.debug("Different Execution Mode type \n\tTime:"
+//					+ eventTime.toString() + "\n\tprocess state has: \n\t"
+//					+ process.getState().getExec_mode().toString()
+//					+ "\n\twhen pop_int is:\n\t" + execMode.toString());
+//			return;
+//		}
+//
+//		Stack<LttngExecutionState> exe_state_stack = process
+//				.getExecution_stack();
+//
+//		if (exe_state_stack.size() <= 1) {
+//			TraceDebug
+//					.debug("Removing last item from execution stack is not allowed");
+//		}
+//
+//		exe_state_stack.pop();
+//		process.setState(exe_state_stack.peek());
+//		process.getState().setChage_Time(eventTime);
+//	}
+//
+//	protected void irq_push_mode(LttngIRQState irqst, IRQMode state) {
+//		irqst.getMode_stack().push(state);
+//	}
+//
+//	protected void irq_set_base_mode(LttngIRQState irqst, IRQMode state) {
+//		Stack<IRQMode> irqModeStack = irqst.getMode_stack();
+//		irqModeStack.clear();
+//		irqModeStack.push(state);
+//	}
+//
+//	protected void irq_pop_mode(LttngIRQState irqst) {
+//		Stack<IRQMode> irq_stack = irqst.getMode_stack();
+//		if (irq_stack.size() <= 1)
+//			irq_set_base_mode(irqst, IRQMode.LTTV_IRQ_UNKNOWN);
+//		else
+//			irq_stack.pop();
+//	}
+//
+//	protected void cpu_push_mode(LTTngCPUState cpust, StateStrings.CpuMode state) {
+//		// The initialization (init) creates a LttngCPUState instance per
+//		// available cpu in the system
+//		Stack<CpuMode> cpuStack = cpust.getMode_stack();
+//		cpuStack.push(state);
+//	}
+//
+//	protected void cpu_pop_mode(LTTngCPUState cpust) {
+//		if (cpust.getMode_stack().size() <= 1)
+//			cpu_set_base_mode(cpust, StateStrings.CpuMode.LTTV_CPU_UNKNOWN);
+//		else
+//			cpust.getMode_stack().pop();
+//	}
+//
+//	/* clears the stack and sets the state passed as argument */
+//	protected void cpu_set_base_mode(LTTngCPUState cpust,
+//			StateStrings.CpuMode state) {
+//		Stack<CpuMode> cpuStack = cpust.getMode_stack();
+//		cpuStack.clear();
+//		cpuStack.push(state);
+//	}
+//
+//	protected void bdev_pop_mode(LttngBdevState bdevst) {
+//		Stack<BdevMode> bdevModeStack = bdevst.getMode_stack();
+//		if (bdevModeStack.size() <= 1) {
+//			bdev_set_base_mode(bdevModeStack, BdevMode.LTTV_BDEV_UNKNOWN);
+//		} else {
+//			bdevModeStack.pop();
+//		}
+//
+//	}
+//
+//	protected void bdev_set_base_mode(Stack<BdevMode> bdevModeStack,
+//			BdevMode state) {
+//		bdevModeStack.clear();
+//		bdevModeStack.push(state);
+//	}
+//
+//	/**
+//	 * Push a new received function pointer to the user_stack
+//	 * 
+//	 * @param traceSt
+//	 * @param funcptr
+//	 * @param cpu
+//	 */
+//	protected void push_function(LttngTraceState traceSt, Long funcptr, Long cpu) {
+//		// Get the related process
+//		LttngProcessState process = traceSt.getRunning_process().get(cpu);
+//
+//		// get the user_stack
+//		Stack<Long> user_stack = process.getUser_stack();
+//
+//		// update stack
+//		user_stack.push(funcptr);
+//
+//		// update the pointer to the current function on the corresponding
+//		// process
+//		process.setCurrent_function(funcptr);
+//	}
+//
+//	protected void pop_function(LttngTraceState traceSt, LttngEvent trcEvent,
+//			Long funcptr) {
+//		Long cpu = trcEvent.getCpuId();
+//		// LttvTraceState *ts = (LttvTraceState*)tfs->parent.t_context;
+//		// LttvProcessState *process = ts->running_process[cpu];
+//		LttngProcessState process = traceSt.getRunning_process().get(cpu);
+//		Long curr_function = process.getCurrent_function();
+//		if (curr_function != null && curr_function != funcptr) {
+//			TraceDebug.debug("Different functions: " + funcptr + " current: "
+//					+ curr_function + " time stamp: "
+//					+ trcEvent.getTimestamp().toString());
+//
+//			// g_info("Different functions (%lu.%09lu): ignore it\n",
+//			// tfs->parent.timestamp.tv_sec, tfs->parent.timestamp.tv_nsec);
+//			// g_info("process state has %" PRIu64 " when pop_function is %"
+//			// PRIu64
+//			// "\n",
+//			// process->current_function, funcptr);
+//			// g_info("{ %u, %u, %s, %s, %s }\n",
+//			// process->pid,
+//			// process->ppid,
+//			// g_quark_to_string(process->name),
+//			// g_quark_to_string(process->brand),
+//			// g_quark_to_string(process->state->s));
+//			return;
+//		}
+//
+//		Stack<Long> user_stack = process.getUser_stack();
+//		if (user_stack.size() == 0) {
+//			TraceDebug
+//					.debug("Trying to pop last function in stack. Ignored.  Time Stamp: "
+//							+ trcEvent.getTimestamp());
+//			return;
+//		}
+//		user_stack.pop();
+//		process.setCurrent_function(user_stack.peek());
+//	}
+//
+//	// ========================================================================
+//	// General methods
+//	// =======================================================================
+//	/**
+//	 * protected method used when only one Field is expected with Type "Long" if
+//	 * the number of fields is greater, the first field is returned and a
+//	 * tracing message is sent Null is returned if the value could not be
+//	 * extracted.
+//	 * 
+//	 * @param trcEvent
+//	 * @param traceSt
+//	 * @param expectedNumFields
+//	 * @return
+//	 */
+//	protected Long getDField(LttngEvent trcEvent, LttngTraceState traceSt,
+//			Fields expectedField) {
+//		Long fieldVal = null;
+//		TmfEventField[] fields = trcEvent.getContent().getFields();
+//		String[] fieldLabels = trcEvent.getContent().getFormat().getLabels();
+//
+//		// Only one field expected
+//		if (fields.length != 1 || fieldLabels.length != 1) {
+//			StringBuilder sb = new StringBuilder(
+//					"Unexpected number of fields received: " + fields.length
+//							+ " for Event: " + trcEvent.getMarkerName() + "\n\t\tFields: ");
+//
+//			for (TmfEventField field : fields) {
+//				sb.append(((LttngEventField)field).getName() + " ");				
+//			}
+//
+//			TraceDebug.debug(sb.toString());
+//			if (fields.length == 0) {
+//				return null;
+//			}
+//		}
+//
+//		LttngEventField field = (LttngEventField) fields[0];
+//		String fieldname = field.getName();
+//		String expectedFieldName = expectedField.getInName();
+//		if (fieldname.equals(expectedFieldName)) {
+//			Object fieldObj = field.getValue();
+//			if (fieldObj instanceof Long) {
+//				// Expected value found
+//				fieldVal = (Long) field.getValue();
+//			} else {
+//				if (TraceDebug.isDEBUG()) {
+//					TraceDebug
+//							.debug("Unexpected field Type. Expected: Long, Received: "
+//									+ fieldObj.getClass().getSimpleName());
+//				}
+//				return null;
+//			}
+//		} else {
+//			TraceDebug.debug("Unexpected field received: " + fieldname
+//					+ " Expected: " + expectedFieldName);
+//			return null;
+//		}
+//
+//		return fieldVal;
+//	}
+//
+	/**
+	 * protected method used when a Field is requested among several available
+	 * fields and the expected type is Long
+	 * 
+	 * @param trcEvent
+	 * @param traceSt
+	 * @param expectedNumFields
+	 * @return
+	 */
+	protected Long getAFieldLong(LttngEvent trcEvent, LttngTraceState traceSt,
+			Fields expectedField) {
+		Long fieldVal = null;
+		TmfEventField[] fields = trcEvent.getContent().getFields();
+
+		// At least one field expected
+		if (fields.length == 0) {
+			TraceDebug.debug("Unexpected number of fields received: "
+					+ fields.length);
+			return null;
+		}
+
+		LttngEventField field;
+		String fieldname;
+		String expectedFieldName = expectedField.getInName();
+		for (int i = 0; i < fields.length; i++) {
+			field = (LttngEventField) fields[i];
+			fieldname = field.getId();
+			if (fieldname.equals(expectedFieldName)) {
+				Object fieldObj = field.getValue();
+				if (fieldObj instanceof Long) {
+					// Expected value found
+					fieldVal = (Long) field.getValue();
+					// if (expectedField == Fields.LTT_FIELD_TYPE) {
+					// TraceDebug.debug("Field Type value is: " + fieldVal);
+					// }
+					break;
+				} else {
+					if (TraceDebug.isDEBUG()) {
+						TraceDebug
+								.debug("Unexpected field Type. Expected: Long, Received: "
+										+ fieldObj.getClass().getSimpleName());
+					}
+					return null;
+				}
+			}
+		}
+
+		if (fieldVal == null) {
+			if (TraceDebug.isDEBUG()) {
+				sendNoFieldFoundMsg(fields, expectedFieldName);
+			}
+		}
+		return fieldVal;
+	}
+
+	/**
+	 * protected method used when a Field is requested among several available
+	 * fields and the expected type is String
+	 * 
+	 * @param trcEvent
+	 * @param traceSt
+	 * @param expectedNumFields
+	 * @return
+	 */
+	protected String getAFieldString(LttngEvent trcEvent,
+			LttngTraceState traceSt, Fields expectedField) {
+		String fieldVal = null;
+		TmfEventField[] fields = trcEvent.getContent().getFields();
+
+		// Only one field expected
+		if (fields.length == 0) {
+			TraceDebug.debug("Unexpected number of fields received: "
+					+ fields.length);
+			return null;
+		}
+
+		LttngEventField field;
+		String fieldname;
+		String expectedFieldName = expectedField.getInName();
+		for (int i = 0; i < fields.length; i++) {
+			field = (LttngEventField) fields[i];
+			fieldname = field.getId();
+			if (fieldname.equals(expectedFieldName)) {
+				Object fieldObj = field.getValue();
+				if (fieldObj instanceof String) {
+					// Expected value found
+					fieldVal = (String) field.getValue();
+					break;
+				} else {
+					if (TraceDebug.isDEBUG()) {
+						TraceDebug
+								.debug("Unexpected field Type. Expected: String, Received: "
+										+ fieldObj.getClass().getSimpleName());
+					}
+					return null;
+				}
+			}
+		}
+
+		if (fieldVal == null) {
+			if (TraceDebug.isDEBUG()) {
+				sendNoFieldFoundMsg(fields, expectedFieldName);
+			}
+		}
+		return fieldVal;
+	}
+
+	protected void sendNoFieldFoundMsg(TmfEventField[] fields,
+			String expectedFieldName) {
+		LttngEventField field;
+		StringBuilder sb = new StringBuilder("Field not found, requested: "
+				+ expectedFieldName);
+		sb.append(" number of fields: " + fields.length + "Fields: ");
+		for (int i = 0; i < fields.length; i++) {
+			field = (LttngEventField) fields[i];
+			sb.append(field.getId() + " ");
+		}
+
+		TraceDebug.debug(sb.toString(), 5);
+	}
+
+//	// Adaption from MKDEV macro
+//	protected Long mkdev(Long major, Long minor) {
+//		Long result = null;
+//		if (major != null && minor != null) {
+//			result = (major << 20) | minor;
+//		}
+//		return result;
+//	}
+//
+//	/*
+//	 * FIXME : this function should be called when we receive an event telling
+//	 * that release_task has been called in the kernel. In happens generally
+//	 * when the parent waits for its child terminaison, but may also happen in
+//	 * special cases in the child's exit : when the parent ignores its children
+//	 * SIGCCHLD or has the flag SA_NOCLDWAIT. It can also happen when the child
+//	 * is part of a killed thread group, but isn't the leader.
+//	 */
+//	protected boolean exit_process(LttngTraceState ts, LttngProcessState process) {
+//		/*
+//		 * Wait for both schedule with exit dead and process free to happen.
+//		 * They can happen in any order.
+//		 */
+//		process.incrementFree_events();
+//		if (process.getFree_events() < 2) {
+//			return false;
+//		}
+//
+//		process.getExecution_stack().clear();
+//		process.getUser_stack().clear();
+//		ts.getProcesses().remove(process);
+//
+//		return true;
+//	}
+//
+//	// LttvProcessState *
+//	// lttv_state_create_process(LttvTraceState *tcs, LttvProcessState *parent,
+//	// guint cpu, guint pid, guint tgid, GQuark name, const LttTime *timestamp)
+//	// {
+//	// LttvProcessState *process = g_new(LttvProcessState, 1);
+//	//
+//	// LttvExecutionState *es;
+//	//
+//	// char buffer[128];
+//	//
+//	// process->pid = pid;
+//	// process->tgid = tgid;
+//	// process->cpu = cpu;
+//	// process->name = name;
+//	// process->brand = LTTV_STATE_UNBRANDED;
+//	// //process->last_cpu = tfs->cpu_name;
+//	// //process->last_cpu_index =
+//	// ltt_tracefile_num(((LttvTracefileContext*)tfs)->tf);
+//	// process->type = LTTV_STATE_USER_THREAD;
+//	// process->usertrace = ltt_state_usertrace_find(tcs, pid, timestamp);
+//	// process->current_function = 0; //function 0x0 by default.
+//	//
+//	// g_info("Process %u, core %p", process->pid, process);
+//	// g_hash_table_insert(tcs->processes, process, process);
+//	//
+//	// if(parent) {
+//	// process->ppid = parent->pid;
+//	// process->creation_time = *timestamp;
+//	// }
+//	//
+//	// /* No parent. This process exists but we are missing all information
+//	// about
+//	// its creation. The birth time is set to zero but we remember the time of
+//	// insertion */
+//	//
+//	// else {
+//	// process->ppid = 0;
+//	// process->creation_time = ltt_time_zero;
+//	// }
+//	//
+//	// process->insertion_time = *timestamp;
+//	// sprintf(buffer,"%d-%lu.%lu",pid, process->creation_time.tv_sec,
+//	// process->creation_time.tv_nsec);
+//	// process->pid_time = g_quark_from_string(buffer);
+//	// process->cpu = cpu;
+//	// process->free_events = 0;
+//	// //process->last_cpu = tfs->cpu_name;
+//	// //process->last_cpu_index =
+//	// ltt_tracefile_num(((LttvTracefileContext*)tfs)->tf);
+//	// process->execution_stack = g_array_sized_new(FALSE, FALSE,
+//	// sizeof(LttvExecutionState), PREALLOCATED_EXECUTION_STACK);
+//	// process->execution_stack = g_array_set_size(process->execution_stack, 2);
+//	// es = process->state = &g_array_index(process->execution_stack,
+//	// LttvExecutionState, 0);
+//	// es->t = LTTV_STATE_USER_MODE;
+//	// es->n = LTTV_STATE_SUBMODE_NONE;
+//	// es->entry = *timestamp;
+//	// //g_assert(timestamp->tv_sec != 0);
+//	// es->change = *timestamp;
+//	// es->cum_cpu_time = ltt_time_zero;
+//	// es->s = LTTV_STATE_RUN;
+//	//
+//	// es = process->state = &g_array_index(process->execution_stack,
+//	// LttvExecutionState, 1);
+//	// es->t = LTTV_STATE_SYSCALL;
+//	// es->n = LTTV_STATE_SUBMODE_NONE;
+//	// es->entry = *timestamp;
+//	// //g_assert(timestamp->tv_sec != 0);
+//	// es->change = *timestamp;
+//	// es->cum_cpu_time = ltt_time_zero;
+//	// es->s = LTTV_STATE_WAIT_FORK;
+//	//	  
+//	// /* Allocate an empty function call stack. If it's empty, use 0x0. */
+//	// process->user_stack = g_array_sized_new(FALSE, FALSE,
+//	// sizeof(guint64), 0);
+//	//	  
+//	// return process;
+//	// }
+//
+//	/**
+//	 * Find the process matching the given pid and cpu
+//	 * 
+//	 * If cpu is 0, the cpu value is not matched and the selection is based on
+//	 * pid value only
+//	 * 
+//	 * @param ts
+//	 * @param cpu
+//	 * @param pid
+//	 * @return
+//	 */
+//	protected LttngProcessState lttv_state_find_process(LttngTraceState ts,
+//			Long cpu, Long pid) {
+//		// Define the return value
+//		LttngProcessState process = null;
+//
+//		// Obtain the list of available processes
+//		List<LttngProcessState> processList = ts.getProcesses();
+//
+//		// find the process matching pid and cpu,
+//		// TODO: This may need to be improved since the pid may be re-used and
+//		// the creation time may need to be considered
+//		for (LttngProcessState dprocess : processList) {
+//			if (dprocess.getPid() == pid) {
+//				if (dprocess.getCpu() == cpu || cpu == 0) {
+//					return process;
+//				}
+//			}
+//		}
+//
+//		return process;
+//	}
+//
+//	/**
+//	 * @param ts
+//	 * @param cpu
+//	 * @param pid
+//	 * @param timestamp
+//	 *            , Used when a new process is needed
+//	 * @return
+//	 */
+//	protected LttngProcessState lttv_state_find_process_or_create(
+//			LttngTraceState ts, Long cpu, Long pid, final TmfTimestamp timestamp) {
+//
+//		LttngProcessState process = lttv_state_find_process(ts, cpu, pid);
+//		/* Put ltt_time_zero creation time for unexisting processes */
+//		if (process == null) {
+//			process = create_process(ts, cpu, pid, 0L, timestamp);
+//		}
+//		return process;
+//	}
+//
+//	/**
+//	 * @param traceSt
+//	 * @param cpu
+//	 * @param pid
+//	 * @param tgid
+//	 * @param timestamp
+//	 * @return
+//	 */
+//	protected LttngProcessState create_process(LttngTraceState traceSt,
+//			Long cpu, Long pid, Long tgid, final TmfTimestamp timestamp) {
+//		LttngProcessState process = create_process(traceSt, cpu, pid, tgid,
+//				ProcessStatus.LTTV_STATE_UNNAMED.getInName(), timestamp);
+//		return process;
+//	}
+//
+//	/**
+//	 * @param traceSt
+//	 * @param cpu
+//	 * @param pid
+//	 * @param tgid
+//	 * @param name
+//	 * @param timestamp
+//	 * @return
+//	 */
+//	protected LttngProcessState create_process(LttngTraceState traceSt,
+//			Long cpu, Long pid, Long tgid, String name,
+//			final TmfTimestamp timestamp) {
+//		LttngProcessState process;
+//		process = new LttngProcessState(cpu, pid, tgid, name, timestamp);
+//		traceSt.getProcesses().add(process);
+//		return process;
+//	}
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/after/StateAfterUpdateFactory.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/after/StateAfterUpdateFactory.java
new file mode 100644
index 0000000..39bde08
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/after/StateAfterUpdateFactory.java
@@ -0,0 +1,160 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.tests.state.handlers.after;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.linuxtools.lttng.state.StateStrings;
+import org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing;
+
+/**
+ * Builds a Map from string event name to a processing handler object, the
+ * processors implement the same interface to facilitate transparent methods
+ * call,
+ * 
+ * The map key STring is the entry point of the raw events, using a hash speeds
+ * up the resolution of the appropriate processor
+ * 
+ * @author alvaro
+ * 
+ */
+public class StateAfterUpdateFactory {
+	// ========================================================================
+	// Data
+	// =======================================================================
+	private final Map<String, IEventProcessing> eventNametoProcessor = new HashMap<String, IEventProcessing>();
+	private static StateAfterUpdateFactory instance = null;
+	private StateAfterUpdateHandlers instantiateHandler = new StateAfterUpdateHandlers();
+
+	// ========================================================================
+	// Constructors
+	// =======================================================================
+	private StateAfterUpdateFactory() {
+		//create one instance of each individual event handler and add the instance to the map
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_SYSCALL_ENTRY
+				.getInName(), instantiateHandler.getSyscallEntryHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_SYSCALL_EXIT
+				.getInName(), instantiateHandler.getsySyscallExitHandler());
+		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_TRAP_ENTRY
+//				.getInName(), instantiateHandler.getTrapEntryHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_TRAP_EXIT
+//				.getInName(), instantiateHandler.getTrapExitHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_PAGE_FAULT_ENTRY
+//				.getInName(), instantiateHandler.getTrapEntryHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_PAGE_FAULT_EXIT
+//				.getInName(), instantiateHandler.getTrapExitHandler());
+//
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_PAGE_FAULT_NOSEM_ENTRY
+//				.getInName(), instantiateHandler.getTrapEntryHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_PAGE_FAULT_NOSEM_EXIT
+//				.getInName(), instantiateHandler.getTrapExitHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_IRQ_ENTRY
+//				.getInName(), instantiateHandler.getIrqEntryHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_IRQ_EXIT
+//				.getInName(), instantiateHandler.getIrqExitHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_SOFT_IRQ_RAISE
+//				.getInName(), instantiateHandler.getSoftIrqRaiseHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_SOFT_IRQ_ENTRY
+//				.getInName(), instantiateHandler.getSoftIrqEntryHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_SOFT_IRQ_EXIT
+//				.getInName(), instantiateHandler.getSoftIrqExitHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_LIST_INTERRUPT
+//				.getInName(), instantiateHandler.getEnumInterruptHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_REQUEST_ISSUE
+//				.getInName(), instantiateHandler.getBdevRequestIssueHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_REQUEST_COMPLETE
+//				.getInName(), instantiateHandler.getBdevRequestCompleteHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_FUNCTION_ENTRY
+//				.getInName(), instantiateHandler.getFunctionEntryHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_FUNCTION_EXIT
+//				.getInName(), instantiateHandler.getFunctionExitHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_SYS_CALL_TABLE
+//				.getInName(), instantiateHandler.getDumpSyscallHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_KPROBE_TABLE
+//				.getInName(), instantiateHandler.getDumpKprobeHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_SOFTIRQ_VEC
+//				.getInName(), instantiateHandler.getDumpSoftIrqHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_SCHED_SCHEDULE
+//				.getInName(), instantiateHandler.getSchedChangeHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_PROCESS_FORK
+//				.getInName(), instantiateHandler.getProcessForkHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_KTHREAD_CREATE
+//				.getInName(), instantiateHandler.getProcessKernelThreadHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_PROCESS_EXIT
+//				.getInName(), instantiateHandler.getProcessExitHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_PROCESS_FREE
+//				.getInName(), instantiateHandler.getProcessFreeHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_EXEC
+//				.getInName(), instantiateHandler.getProcessExecHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_THREAD_BRAND
+//				.getInName(), instantiateHandler.GetThreadBrandHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_STATEDUMP_END
+//				.getInName(), instantiateHandler.getStateDumpEndHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_PROCESS_STATE
+//				.getInName(), instantiateHandler.getEnumProcessStateHandler());
+
+
+	}
+
+	// ========================================================================
+	// Public methods
+	// =======================================================================
+	/**
+	 * The event processors are common to all traces an multiple instances will
+	 * use more memory unnecessarily
+	 * 
+	 * @return
+	 */
+	public static StateAfterUpdateFactory getInstance() {
+		if (instance == null) {
+			instance = new StateAfterUpdateFactory();
+		}
+		return instance;
+	}
+
+	/**
+	 * 
+	 * @return The Event Handler corresponding to the type of event
+	 */
+	public IEventProcessing getEventNametoProcessor(String eventType) {
+		return eventNametoProcessor.get(eventType);
+	}
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/after/StateAfterUpdateHandlers.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/after/StateAfterUpdateHandlers.java
new file mode 100644
index 0000000..9c7f0ba
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/after/StateAfterUpdateHandlers.java
@@ -0,0 +1,1773 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.tests.state.handlers.after;
+
+
+
+import org.eclipse.linuxtools.lttng.TraceDebug;
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.state.StateStrings.Events;
+import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionMode;
+import org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing;
+import org.eclipse.linuxtools.lttng.state.model.LttngExecutionState;
+import org.eclipse.linuxtools.lttng.state.model.LttngProcessState;
+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.tests.state.handlers.AbsStateUpdate;
+
+/**
+ * Process the system call entry event
+ * 
+ * @author alvaro
+ * 
+ */
+class StateAfterUpdateHandlers {
+
+	final IEventProcessing getSyscallEntryHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SYSCALL_ENTRY;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				// TraceDebug.debug("After event called");
+
+				Long cpu = trcEvent.getCpuId();
+
+				// No syscall_entry update for initialization process
+				LttngProcessState process = traceSt.getRunning_process().get(
+						cpu);
+
+				if (pid != process.getPid()) {
+					TraceDebug
+							.debug("pid values don't match from before and after verification check");
+				}
+
+				if (process.getPid() == 0L) {
+					return true;
+				}
+
+				// Make sure the top of the stack and the state of the stack are
+				// set to the
+				// same object.
+				LttngExecutionState stackState = process.peekFromExecutionStack();
+				if (stackState != process.getState()) {
+					TraceDebug
+							.debug("The top of the stack does not match to the process state");
+				}
+
+				if (stackState.getExec_mode().getInName() != ExecutionMode.LTTV_STATE_SYSCALL
+						.getInName()) {
+					TraceDebug.debug("Unexpected ExecutionMode: "
+							+ stackState.getExec_mode().getInName()
+							+ " Expected: "
+							+ ExecutionMode.LTTV_STATE_SYSCALL.getInName());
+				}
+
+				if (stackState.getEntry_LttTime() != trcEvent.getTimestamp().getValue()) {
+					TraceDebug.debug("Unexpected Entry time: "
+							+ trcEvent.getTimestamp() + " Expected: "
+							+ stackState.getEntry_LttTime());
+				}
+
+				return false;
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	final IEventProcessing getsySyscallExitHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SYSCALL_EXIT;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				// TraceDebug.debug("Syscall Exit After event called");
+				Long cpu = trcEvent.getCpuId();
+				LttngProcessState process = traceSt.getRunning_process().get(
+						cpu);
+
+				/* There can be no system call from PID 0 : unknown state */
+				if (process.getPid() == 0L) {
+					if (pid != 0L) {
+						TraceDebug
+								.debug("Unexpected pid from before and after verfication methods, before pid: "
+										+ pid
+										+ " after pid: "
+										+ process.getPid_time());
+					}
+					return true;
+				}
+				
+				//
+				// pop_state(cpu, StateStrings.ExecutionMode.LTTV_STATE_SYSCALL,
+				// traceSt, trcEvent.getTimestamp());
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * Update stacks related to the parsing of an LttngEvent
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getTrapEntryHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_TRAP_ENTRY;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				// Long cpu = trcEvent.getCpuId();
+				//
+				// Long trap = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_TRAP_ID);
+				// if (trap == null) {
+				// return true;
+				// }
+				//
+				// String submode = traceSt.getSyscall_names()
+				// .get(trap);
+				//
+				// if (submode == null) {
+				// submode = ExecutionSubMode.LTTV_STATE_SUBMODE_UNKNOWN
+				// .getInName();
+				// }
+				//
+				// /* update process state */
+				// push_state(cpu, StateStrings.ExecutionMode.LTTV_STATE_TRAP,
+				// submode, trcEvent.getTimestamp(), traceSt);
+				//
+				// /* update cpu status */
+				// LTTngCPUState cpust = traceSt.getCpu_states().get(cpu);
+				// cpu_push_mode(cpust, StateStrings.CpuMode.LTTV_CPU_TRAP);
+				// cpust.setLast_trap(trap); /* update trap status */
+				//
+				// // update Trap State
+				// LttngTrapState trap_state = traceSt.getTrap_states().get(
+				// trap);
+				// trap_state.incrementRunning();
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getTrapExitHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_TRAP_EXIT;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// Long cpu = trcEvent.getCpuId();
+				// LTTngCPUState cpust = traceSt.getCpu_states().get(cpu);
+				// Long trap = cpust.getLast_trap();
+				//
+				// pop_state(cpu, ExecutionMode.LTTV_STATE_TRAP, traceSt,
+				// trcEvent
+				// .getTimestamp());
+				//
+				// /* update cpu status */
+				// cpu_pop_mode(cpust);
+				//
+				// /* update trap status */
+				// if (trap != -1L) {
+				// traceSt.getTrap_states().get(trap).decrementRunning();
+				// }
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getIrqEntryHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_IRQ_ENTRY;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// Long cpu = trcEvent.getCpuId();
+				//
+				// Long irq = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_IRQ_ID);
+				// if (irq == null) {
+				// return true;
+				// }
+				//
+				// String submode;
+				// submode = traceSt.getIrq_names().get(irq);
+				//
+				// if (submode == null) {
+				// submode =
+				// ExecutionSubMode.LTTV_STATE_SUBMODE_UNKNOWN.getInName();
+				// }
+				//				
+				// /*
+				// * Do something with the info about being in user or system
+				// mode
+				// * when int?
+				// */
+				// push_state(cpu, ExecutionMode.LTTV_STATE_IRQ, submode,
+				// trcEvent
+				// .getTimestamp(), traceSt);
+				//
+				// /* update cpu state */
+				// LTTngCPUState cpust = traceSt.getCpu_states().get(cpu);
+				// cpu_push_mode(cpust, CpuMode.LTTV_CPU_IRQ); /* mode stack */
+				// cpust.setLast_irq(irq); /* last irq */
+				//
+				// /* udpate irq state */
+				// irq_push_mode(traceSt.getIrq_states().get(irq),
+				// IRQMode.LTTV_IRQ_BUSY);
+				return false;
+
+			}
+
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getSoftIrqExitHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SOFT_IRQ_EXIT;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// Long cpu = trcEvent.getCpuId();
+				// LTTngCPUState cpust = traceSt.getCpu_states().get(cpu);
+				// Long softirq = cpust.getLast_soft_irq();
+				// pop_state(cpu, ExecutionMode.LTTV_STATE_SOFT_IRQ, traceSt,
+				// trcEvent.getTimestamp());
+				//
+				// /* update softirq status */
+				// if (softirq != -1) {
+				// LttngSoftIRQState softIrqstate = traceSt
+				// .getSoft_irq_states().get(softirq);
+				// softIrqstate.decrementRunning();
+				// }
+				//
+				// /* update cpu status */
+				// cpu_pop_mode(cpust);
+
+				return false;
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getIrqExitHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_IRQ_EXIT;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// Long cpu = trcEvent.getCpuId();
+				//
+				// /* update process state */
+				// pop_state(cpu, ExecutionMode.LTTV_STATE_IRQ, traceSt,
+				// trcEvent
+				// .getTimestamp());
+				//
+				// /* update cpu status */
+				// LTTngCPUState cpust = traceSt.getCpu_states().get(cpu);
+				// cpu_pop_mode(cpust);
+				//
+				// /* update irq status */
+				// Long last_irq = cpust.getLast_irq();
+				// if (last_irq != -1L) {
+				// LttngIRQState irq_state = traceSt.getIrq_states().get(
+				// last_irq);
+				// irq_pop_mode(irq_state);
+				// }
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getSoftIrqRaiseHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SOFT_IRQ_RAISE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// // Long cpu = trcEvent.getCpuId();
+				//
+				// // get event field
+				// Long softirq = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_SOFT_IRQ_ID);
+				//
+				// if (softirq == null) {
+				// return true;
+				// }
+				//
+				// // String submode;
+				// // String[] softIrqNames = traceSt.getSoft_irq_names();
+				// // if (softirq < softIrqNames.length) {
+				// // submode = softIrqNames[softirq];
+				// // } else {
+				// // submode = "softirq " + softirq;
+				// // }
+				//
+				// /* update softirq status */
+				// /* a soft irq raises are not cumulative */
+				// LttngSoftIRQState irqState =
+				// traceSt.getSoft_irq_states().get(
+				// softirq);
+				// if (irqState != null) {
+				// irqState.setPending(1L);
+				// } else {
+				// TraceDebug
+				// .debug("unexpected soft irq id value: " + softirq);
+				// }
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getSoftIrqEntryHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SOFT_IRQ_ENTRY;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// // obtrain cpu
+				// Long cpu = trcEvent.getCpuId();
+				//
+				// // get event field
+				// Long softirq = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_SOFT_IRQ_ID);
+				//
+				// if (softirq == null) {
+				// return true;
+				// }
+				//
+				// // obtain submode
+				// Map<Long, String> softIrqNames = traceSt.getSoft_irq_names();
+				// String submode = softIrqNames.get(softirq);
+				// if (submode == null) {
+				// submode = "softirq " + softirq;
+				// softIrqNames.put(softirq, submode);
+				// }
+				//
+				// /* update softirq status */
+				// LttngSoftIRQState irqState =
+				// traceSt.getSoft_irq_states().get(
+				// softirq);
+				// if (irqState != null) {
+				// irqState.decrementPending();
+				// irqState.incrementRunning();
+				// } else {
+				// TraceDebug
+				// .debug("unexpected soft irq id value: " + softirq);
+				// }
+				//
+				// /* update cpu state */
+				// LTTngCPUState cpu_state = traceSt.getCpu_states().get(cpu);
+				// cpu_state.setLast_soft_irq(softirq);
+				// cpu_push_mode(cpu_state, CpuMode.LTTV_CPU_SOFT_IRQ);
+				//
+				// /* update process execution mode state stack */
+				// push_state(cpu, ExecutionMode.LTTV_STATE_SOFT_IRQ, submode,
+				// trcEvent.getTimestamp(), traceSt);
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * Method to handle the event: LTT_EVENT_LIST_INTERRRUPT
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getEnumInterruptHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_LIST_INTERRUPT;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				// String action = getAFieldString(trcEvent, traceSt,
+				// Fields.LTT_FIELD_ACTION);
+				// Long irq = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_IRQ_ID);
+				//					
+				// Map<Long, String> irq_names = traceSt.getIrq_names();
+				//
+				// irq_names.put(irq, action);
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * Handle the event LTT_EVENT_REQUEST_ISSUE
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getBdevRequestIssueHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_REQUEST_ISSUE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// // Get Fields
+				// Long major = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_MAJOR);
+				// Long minor = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_MINOR);
+				// Long operation = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_OPERATION);
+				//
+				// // calculate bdevcode
+				// Long devcode = mkdev(major, minor);
+				//
+				// if (devcode == null) {
+				// TraceDebug
+				// .debug("incorrect calcualtion of bdevcode input( major: "
+				// + major
+				// + " minor: "
+				// + minor
+				// + " operation: " + operation);
+				// return true;
+				// }
+				//
+				// Map<Long, LttngBdevState> bdev_states = traceSt
+				// .getBdev_states();
+				// // Get the instance
+				// LttngBdevState bdevState = bdev_states.get(devcode);
+				// if (bdevState == null) {
+				// bdevState = new LttngBdevState();
+				// }
+				//
+				// // update the mode in the stack
+				// if (operation == 0L) {
+				// bdevState.getMode_stack().push(
+				// BdevMode.LTTV_BDEV_BUSY_READING);
+				// } else {
+				// bdevState.getMode_stack().push(
+				// BdevMode.LTTV_BDEV_BUSY_WRITING);
+				// }
+				//
+				// // make sure it is included in the set
+				// bdev_states.put(devcode, bdevState);
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handling event: LTT_EVENT_REQUEST_COMPLETE
+	 * </p>
+	 * <p>
+	 * FIELDS(LTT_FIELD_MAJOR, LTT_FIELD_MINOR, LTT_FIELD_OPERATION
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getBdevRequestCompleteHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_REQUEST_COMPLETE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// // Get Fields
+				// Long major = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_MAJOR);
+				// Long minor = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_MINOR);
+				// Long operation = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_OPERATION);
+				//
+				// // calculate bdevcode
+				// Long devcode = mkdev(major, minor);
+				//
+				// if (devcode == null) {
+				// TraceDebug
+				// .debug("incorrect calcualtion of bdevcode input( major: "
+				// + major
+				// + " minor: "
+				// + minor
+				// + " operation: " + operation);
+				// return true;
+				// }
+				//
+				// Map<Long, LttngBdevState> bdev_states = traceSt
+				// .getBdev_states();
+				// // Get the instance
+				// LttngBdevState bdevState = bdev_states.get(devcode);
+				// if (bdevState == null) {
+				// bdevState = new LttngBdevState();
+				// }
+				//
+				// /* update block device */
+				// bdev_pop_mode(bdevState);
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles event: LTT_EVENT_FUNCTION_ENTRY
+	 * </p>
+	 * <p>
+	 * FIELDS: LTT_FIELD_THIS_FN, LTT_FIELD_CALL_SITE
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getFunctionEntryHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_FUNCTION_ENTRY;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				// Long cpu = trcEvent.getCpuId();
+				// Long funcptr = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_THIS_FN);
+				//
+				// push_function(traceSt, funcptr, cpu);
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getFunctionExitHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_FUNCTION_EXIT;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// Long funcptr = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_THIS_FN);
+				//
+				// pop_function(traceSt, trcEvent, funcptr);
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * process event: LTT_EVENT_SYS_CALL_TABLE
+	 * </p>
+	 * <p>
+	 * fields: LTT_FIELD_ID, LTT_FIELD_ADDRESS, LTT_FIELD_SYMBOL
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getDumpSyscallHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SYS_CALL_TABLE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				// // obtain the syscall id
+				// Long id = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_ID);
+				//
+				// // Long address = getAFieldLong(trcEvent, traceSt,
+				// // Fields.LTT_FIELD_ADDRESS);
+				//
+				// // Obtain the symbol
+				// String symbol = getAFieldString(trcEvent, traceSt,
+				// Fields.LTT_FIELD_SYMBOL);
+				//
+				// // fill the symbol to the sycall_names collection
+				// traceSt.getSyscall_names().put(id, symbol);
+
+				return false;
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles event: LTT_EVENT_KPROBE_TABLE
+	 * </p>
+	 * <p>
+	 * Fields: LTT_FIELD_IP, LTT_FIELD_SYMBOL
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getDumpKprobeHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_KPROBE_TABLE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// Long ip = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_IP);
+				// String symbol = getAFieldString(trcEvent, traceSt,
+				// Fields.LTT_FIELD_SYMBOL);
+				//
+				// traceSt.getKprobe_table().put(ip, symbol);
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_SOFTIRQ_VEC
+	 * </p>
+	 * <p>
+	 * Fields: LTT_FIELD_ID, LTT_FIELD_ADDRESS, LTT_FIELD_SYMBOL
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getDumpSoftIrqHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SOFTIRQ_VEC;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// // Get id
+				// Long id = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_ID);
+				//
+				// // Address not needed
+				// // Long address = ltt_event_get_long_unsigned(e,
+				// // lttv_trace_get_hook_field(th,
+				// // 1));
+				//
+				// // Get symbol
+				// String symbol = getAFieldString(trcEvent, traceSt,
+				// Fields.LTT_FIELD_SYMBOL);
+				//
+				// // Register the soft irq name
+				// traceSt.getSoft_irq_names().put(id, symbol);
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_SCHED_SCHEDULE
+	 * </p>
+	 * <p>
+	 * Fields: LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getSchedChangeHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SCHED_SCHEDULE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// Long cpu = trcEvent.getCpuId();
+				// TmfTimestamp eventTime = trcEvent.getTimestamp();
+				//
+				// LttngProcessState process = traceSt.getRunning_process().get(
+				// cpu);
+				//
+				// Long pid_out = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_PREV_PID);
+				// Long pid_in = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_NEXT_PID);
+				// Long state_out = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_PREV_STATE);
+				//
+				// if (process != null) {
+				//
+				// /*
+				// * We could not know but it was not the idle process
+				// * executing. This should only happen at the beginning,
+				// * before the first schedule event, and when the initial
+				// * information (current process for each CPU) is missing. It
+				// * is not obvious how we could, after the fact, compensate
+				// * the wrongly attributed statistics.
+				// */
+				//
+				// // This test only makes sense once the state is known and if
+				// // there
+				// // is no
+				// // missing events. We need to silently ignore schedchange
+				// // coming
+				// // after a
+				// // process_free, or it causes glitches. (FIXME)
+				// // if(unlikely(process->pid != pid_out)) {
+				// // g_assert(process->pid == 0);
+				// // }
+				// if (process.getPid() == 0
+				// && process.getState().getExec_mode() ==
+				// ExecutionMode.LTTV_STATE_MODE_UNKNOWN) {
+				// if (pid_out == 0) {
+				// /*
+				// * Scheduling out of pid 0 at beginning of the trace
+				// * : we know for sure it is in syscall mode at this
+				// * point.
+				// */
+				// int stackSize = process.getExecution_stack().size();
+				// if (stackSize != 1) {
+				// TraceDebug
+				// .debug("unpexpected process execution stack size, expected 1, received: ");
+				// }
+				//
+				// process.getState().setExec_mode(
+				// ExecutionMode.LTTV_STATE_SYSCALL);
+				// process.getState().setProc_status(
+				// ProcessStatus.LTTV_STATE_WAIT);
+				// process.getState().setChage_Time(
+				// trcEvent.getTimestamp());
+				// process.getState().setEntry_Time(
+				// trcEvent.getTimestamp());
+				// }
+				// } else {
+				// if (process.getState().getProc_status() ==
+				// ProcessStatus.LTTV_STATE_EXIT) {
+				// process.getState().setProc_status(
+				// ProcessStatus.LTTV_STATE_ZOMBIE);
+				// process.getState().setChage_Time(
+				// trcEvent.getTimestamp());
+				// } else {
+				// if (state_out == 0L) {
+				// process.getState().setProc_status(
+				// ProcessStatus.LTTV_STATE_WAIT_CPU);
+				// } else {
+				// process.getState().setProc_status(
+				// ProcessStatus.LTTV_STATE_WAIT);
+				// }
+				//
+				// process.getState().setChage_Time(
+				// trcEvent.getTimestamp());
+				// }
+				//
+				// if (state_out == 32L || state_out == 64L) { /*
+				// * EXIT_DEAD
+				// * ||
+				// * TASK_DEAD
+				// */
+				// /* see sched.h for states */
+				// if (!exit_process(traceSt, process)) {
+				// process.getState().setProc_status(
+				// ProcessStatus.LTTV_STATE_DEAD);
+				// process.getState().setChage_Time(
+				// trcEvent.getTimestamp());
+				// }
+				// }
+				// }
+				// }
+				// process = lttv_state_find_process_or_create(traceSt, cpu,
+				// pid_in, eventTime);
+				//
+				// traceSt.getRunning_process().put(cpu, process);
+				//
+				// process.getState().setProc_status(ProcessStatus.LTTV_STATE_RUN);
+				// process.getState().setChage_Time(eventTime);
+				// process.setCpu(cpu);
+				// // process->state->s = LTTV_STATE_RUN;
+				// // if(process->usertrace)
+				// // process->usertrace->cpu = cpu;
+				// // process->last_cpu_index =
+				// // ltt_tracefile_num(((LttvTracefileContext*)s)->tf);
+				//
+				// // process->state->change = s->parent.timestamp;
+				//
+				// LTTngCPUState cpu_state = traceSt.getCpu_states().get(cpu);
+				// /* update cpu status */
+				// if (pid_in == 0) {
+				//
+				// /* going to idle task */
+				// cpu_set_base_mode(cpu_state, CpuMode.LTTV_CPU_IDLE);
+				// } else {
+				// /*
+				// * scheduling a real task. we must be careful here: if we
+				// * just schedule()'ed to a process that is in a trap, we
+				// * must put the cpu in trap mode
+				// */
+				// cpu_set_base_mode(cpu_state, CpuMode.LTTV_CPU_BUSY);
+				// if (process.getState().getExec_mode() ==
+				// ExecutionMode.LTTV_STATE_TRAP) {
+				// cpu_push_mode(cpu_state, CpuMode.LTTV_CPU_TRAP);
+				// }
+				// }
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_PROCESS_FORK
+	 * </p>
+	 * <p>
+	 * Fields: FIELD_ARRAY(LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID,
+	 * LTT_FIELD_CHILD_TGID)
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getProcessForkHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_PROCESS_FORK;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// Long cpu = trcEvent.getCpuId();
+				// LttngProcessState process = traceSt.getRunning_process().get(
+				// cpu);
+				// TmfTimestamp timeStamp = trcEvent.getTimestamp();
+				//
+				// // /* Parent PID */
+				// // Long parent_pid = getAFieldLong(trcEvent, traceSt,
+				// // Fields.LTT_FIELD_PARENT_PID);
+				//
+				// /* Child PID */
+				// /* In the Linux Kernel, there is one PID per thread. */
+				// Long child_pid = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_CHILD_PID);
+				//
+				// /* Child TGID */
+				// /* tgid in the Linux kernel is the "real" POSIX PID. */
+				// Long child_tgid = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_CHILD_TGID);
+				// if (child_tgid == null) {
+				// child_tgid = 0L;
+				// }
+				//
+				// /*
+				// * Mathieu : it seems like the process might have been
+				// scheduled
+				// * in before the fork, and, in a rare case, might be the
+				// current
+				// * process. This might happen in a SMP case where we don't
+				// have
+				// * enough precision on the clocks.
+				// *
+				// * Test reenabled after precision fixes on time. (Mathieu)
+				// */
+				// // #if 0
+				// // zombie_process = lttv_state_find_process(ts, ANY_CPU,
+				// // child_pid);
+				// //
+				// // if(unlikely(zombie_process != NULL)) {
+				// // /* Reutilisation of PID. Only now we are sure that the old
+				// // PID
+				// // * has been released. FIXME : should know when release_task
+				// // happens
+				// // instead.
+				// // */
+				// // guint num_cpus = ltt_trace_get_num_cpu(ts->parent.t);
+				// // guint i;
+				// // for(i=0; i< num_cpus; i++) {
+				// // g_assert(zombie_process != ts->running_process[i]);
+				// // }
+				// //
+				// // exit_process(s, zombie_process);
+				// // }
+				// // #endif //0
+				//
+				// if (process.getPid() == child_pid) {
+				// TraceDebug
+				// .debug("Unexpected, process pid equal to child pid: "
+				// + child_pid
+				// + " Event Time: "
+				// + trcEvent.getTimestamp());
+				// }
+				//
+				// // g_assert(process->pid != child_pid);
+				// // FIXME : Add this test in the "known state" section
+				// // g_assert(process->pid == parent_pid);
+				// LttngProcessState child_process = lttv_state_find_process(
+				// traceSt, ANY_CPU, child_pid);
+				// if (child_process == null) {
+				// child_process = create_process(traceSt, cpu, child_pid,
+				// child_tgid, timeStamp);
+				// } else {
+				// /*
+				// * The process has already been created : due to time
+				// * imprecision between multiple CPUs : it has been scheduled
+				// * in before creation. Note that we shouldn't have this kind
+				// * of imprecision.
+				// *
+				// * Simply put a correct parent.
+				// */
+				// StringBuilder sb = new StringBuilder("Process " + child_pid);
+				// sb.append(" has been created at ["
+				// + child_process.getCration_time() + "] ");
+				// sb.append("and inserted at ["
+				// + child_process.getInsertion_time() + "] ");
+				// sb.append("before \nfork on cpu " + cpu + " Event time: ["
+				// + trcEvent + "]\n.");
+				// sb
+				// .append("Probably an unsynchronized TSD problem on the traced machine.");
+				// TraceDebug.debug(sb.toString());
+				//
+				// // g_assert(0); /* This is a problematic case : the process
+				// // has
+				// // beencreated
+				// // before the fork event */
+				// child_process.setPpid(process.getPid());
+				// child_process.setTgid(child_tgid);
+				// }
+				//
+				// if (!child_process.getName().equals(
+				// ProcessStatus.LTTV_STATE_UNNAMED.getInName())) {
+				// TraceDebug.debug("Unexpected child process status: "
+				// + child_process.getName());
+				// }
+				//
+				// child_process.setName(process.getName());
+				// child_process.setBrand(process.getBrand());
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_KTHREAD_CREATE
+	 * </p>
+	 * <p>
+	 * Fields: LTT_FIELD_PID
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getProcessKernelThreadHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_KTHREAD_CREATE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				// /*
+				// * We stamp a newly created process as kernel_thread. The
+				// thread
+				// * should not be running yet.
+				// */
+				//
+				// LttngExecutionState exState;
+				// Long pid;
+				// LttngProcessState process;
+				//
+				// /* PID */
+				// pid = getAFieldLong(trcEvent, traceSt, Fields.LTT_FIELD_PID);
+				// // s->parent.target_pid = pid;
+				//
+				// process = lttv_state_find_process_or_create(traceSt, ANY_CPU,
+				// pid, new TmfTimestamp());
+				//
+				// if (!process.getState().getProc_status().equals(
+				// ProcessStatus.LTTV_STATE_DEAD)) {
+				// // Leave only the first element in the stack with execution
+				// // mode to
+				// // syscall
+				// Stack<LttngExecutionState> processExStack = process
+				// .getExecution_stack();
+				// exState = processExStack.firstElement();
+				// exState.setExec_mode(ExecutionMode.LTTV_STATE_SYSCALL);
+				// if (processExStack.size() > 1) {
+				// processExStack.clear();
+				// processExStack.add(exState);
+				// }
+				//
+				// // update the process state to the only one in the stack
+				// process.setState(exState);
+				// }
+				//
+				// process.setType(ProcessType.LTTV_STATE_KERNEL_THREAD);
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_PROCESS_EXIT
+	 * </p>
+	 * <p>
+	 * LTT_FIELD_PID
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getProcessExitHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_PROCESS_EXIT;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// Long pid;
+				// LttngProcessState process;
+				//
+				// pid = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_PID);
+				// // s->parent.target_pid = pid;
+				//
+				// // FIXME : Add this test in the "known state" section
+				// // g_assert(process->pid == pid);
+				//
+				// process = lttv_state_find_process(traceSt, ANY_CPU, pid);
+				// if (process != null) {
+				// process.getState().setProc_status(
+				// ProcessStatus.LTTV_STATE_EXIT);
+				// }
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_PROCESS_FREE
+	 * </p>
+	 * <p>
+	 * Fields: LTT_FIELD_PID
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getProcessFreeHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_PROCESS_FREE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// Long release_pid;
+				// LttngProcessState process;
+				//
+				// /* PID of the process to release */
+				// release_pid = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_PID);
+				// // s->parent.target_pid = release_pid;
+				//
+				// if (release_pid == 0) {
+				// TraceDebug.debug("Unexpected release_pid: 0, Event time: "
+				// + trcEvent.getTimestamp());
+				// }
+				//
+				// process = lttv_state_find_process(traceSt, ANY_CPU,
+				// release_pid);
+				// if (process != null) {
+				// exit_process(traceSt, process);
+				// }
+
+				return false;
+				// DISABLED
+				// if(process != null) {
+				/*
+				 * release_task is happening at kernel level : we can now safely
+				 * release the data structure of the process
+				 */
+				// This test is fun, though, as it may happen that
+				// at time t : CPU 0 : process_free
+				// at time t+150ns : CPU 1 : schedule out
+				// Clearly due to time imprecision, we disable it. (Mathieu)
+				// If this weird case happen, we have no choice but to put the
+				// Currently running process on the cpu to 0.
+				// I re-enable it following time precision fixes. (Mathieu)
+				// Well, in the case where an process is freed by a process on
+				// another
+				// CPU
+				// and still scheduled, it happens that this is the schedchange
+				// that
+				// will
+				// drop the last reference count. Do not free it here!
+
+				// int num_cpus = ltt_trace_get_num_cpu(ts->parent.t);
+				// guint i;
+				// for(i=0; i< num_cpus; i++) {
+				// //g_assert(process != ts->running_process[i]);
+				// if(process == ts->running_process[i]) {
+				// //ts->running_process[i] = lttv_state_find_process(ts, i, 0);
+				// break;
+				// }
+				// }
+				// if(i == num_cpus) /* process is not scheduled */
+				// exit_process(s, process);
+				// }
+				//	
+				// return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_EXEC
+	 * </p>
+	 * <p>
+	 * FIELDS: LTT_FIELD_FILENAME
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getProcessExecHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_EXEC;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// Long cpu = trcEvent.getCpuId();
+				// LttngProcessState process = traceSt.getRunning_process().get(
+				// cpu);
+				//
+				// // #if 0//how to use a sequence that must be transformed in a
+				// // string
+				// // /* PID of the process to release */
+				// // guint64 name_len = ltt_event_field_element_number(e,
+				// // lttv_trace_get_hook_field(th, 0));
+				// // //name = ltt_event_get_string(e,
+				// // lttv_trace_get_hook_field(th, 0));
+				// // LttField *child = ltt_event_field_element_select(e,
+				// // lttv_trace_get_hook_field(th, 0), 0);
+				// // gchar *name_begin =
+				// // (gchar*)(ltt_event_data(e)+ltt_event_field_offset(e,
+				// child));
+				// // gchar *null_term_name = g_new(gchar, name_len+1);
+				// // memcpy(null_term_name, name_begin, name_len);
+				// // null_term_name[name_len] = '\0';
+				// // process->name = g_quark_from_string(null_term_name);
+				// // #endif //0
+				//
+				// process.setName(getAFieldString(trcEvent, traceSt,
+				// Fields.LTT_FIELD_FILENAME));
+				// process.setBrand(StateStrings.LTTV_STATE_UNBRANDED);
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * LTT_EVENT_THREAD_BRAND
+	 * </p>
+	 * <p>
+	 * FIELDS: LTT_FIELD_NAME
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing GetThreadBrandHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_THREAD_BRAND;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// String name;
+				// Long cpu = trcEvent.getCpuId();
+				// LttngProcessState process = traceSt.getRunning_process().get(
+				// cpu);
+				//
+				// name = getAFieldString(trcEvent, traceSt,
+				// Fields.LTT_FIELD_NAME);
+				// process.setBrand(name);
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * @return
+	 */
+	final IEventProcessing getStateDumpEndHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_STATEDUMP_END;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// /* For all processes */
+				// /*
+				// * if kernel thread, if stack[0] is unknown, set to syscall
+				// * mode, wait
+				// */
+				// /* else, if stack[0] is unknown, set to user mode, running */
+				// List<LttngProcessState> processes = traceSt.getProcesses();
+				// TmfTimestamp time = trcEvent.getTimestamp();
+				//
+				// for (LttngProcessState process : processes) {
+				// fix_process(process, time);
+				// }
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * Private method used to establish the first execution state in the stack
+	 * for a given process
+	 * 
+	 * @param process
+	 * @param timestamp
+	 */
+	// private void fix_process(LttngProcessState process,
+	// TmfTimestamp timestamp) {
+	//
+	// LttngExecutionState es;
+	// Stack<LttngExecutionState> procStack = process
+	// .getExecution_stack();
+	//
+	// if (process.getType() == ProcessType.LTTV_STATE_KERNEL_THREAD) {
+	// es = procStack.firstElement();
+	//
+	// if (es.getExec_mode() == ExecutionMode.LTTV_STATE_MODE_UNKNOWN) {
+	// es.setExec_mode(ExecutionMode.LTTV_STATE_SYSCALL);
+	// es
+	// .setExec_submode(ExecutionSubMode.LTTV_STATE_SUBMODE_NONE
+	// .getInName());
+	// es.setEntry_Time(timestamp);
+	// es.setChage_Time(timestamp);
+	// es.setCum_cpu_time(0L);
+	// if (es.getProc_status() == ProcessStatus.LTTV_STATE_UNNAMED) {
+	// es.setProc_status(ProcessStatus.LTTV_STATE_WAIT);
+	// }
+	// }
+	// } else {
+	// es = procStack.firstElement();
+	// if (es.getExec_mode() == ExecutionMode.LTTV_STATE_MODE_UNKNOWN) {
+	// es.setExec_mode(ExecutionMode.LTTV_STATE_USER_MODE);
+	// es
+	// .setExec_submode(ExecutionSubMode.LTTV_STATE_SUBMODE_NONE
+	// .getInName());
+	// es.setEntry_Time(timestamp);
+	// es.setChage_Time(timestamp);
+	// es.setCum_cpu_time(0L);
+	// if (es.getProc_status() == ProcessStatus.LTTV_STATE_UNNAMED) {
+	// es.setProc_status(ProcessStatus.LTTV_STATE_RUN);
+	// }
+	//
+	// if (procStack.size() == 1) {
+	// /*
+	// * Still in bottom unknown mode, means never did a
+	// * system call May be either in user mode, syscall
+	// * mode, running or waiting.
+	// */
+	// /*
+	// * FIXME : we may be tagging syscall mode when being
+	// * user mode
+	// */
+	// // Get a new execution State
+	// es = new LttngExecutionState();
+	//
+	// // initialize values
+	// es.setExec_mode(ExecutionMode.LTTV_STATE_SYSCALL);
+	// es
+	// .setExec_submode(ExecutionSubMode.LTTV_STATE_SUBMODE_NONE
+	// .getInName());
+	// es.setEntry_Time(timestamp);
+	// es.setChage_Time(timestamp);
+	// es.setCum_cpu_time(0L);
+	// es.setProc_status(ProcessStatus.LTTV_STATE_UNNAMED);
+	//
+	// // Push the new state to the stack
+	// procStack.push(es);
+	// }
+	// }
+	// }
+	// }
+	// };
+	// return handler;
+	// }
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_PROCESS_STATE
+	 * </p>
+	 * <p>
+	 * FIELDS: LTT_FIELD_PID, LTT_FIELD_PARENT_PID, LTT_FIELD_NAME,
+	 * LTT_FIELD_TYPE, LTT_FIELD_MODE, LTT_FIELD_SUBMODE, LTT_FIELD_STATUS,
+	 * LTT_FIELD_TGID
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getEnumProcessStateHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_PROCESS_STATE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// Long parent_pid;
+				// Long pid;
+				// Long tgid;
+				// String command;
+				// Long cpu = trcEvent.getCpuId();
+				// LttngProcessState process = traceSt.getRunning_process().get(
+				// cpu);
+				// LttngProcessState parent_process;
+				// String type;
+				// // String mode, submode, status;
+				// LttngExecutionState es;
+				//
+				// /* PID */
+				// pid = getAFieldLong(trcEvent, traceSt, Fields.LTT_FIELD_PID);
+				//
+				// /* Parent PID */
+				// parent_pid = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_PARENT_PID);
+				//
+				// /* Command name */
+				// command = getAFieldString(trcEvent, traceSt,
+				// Fields.LTT_FIELD_NAME);
+				//
+				// /* TODO: type field, Values need to be verified */
+				// /* type */
+				// Long typeVal = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_TYPE);
+				// if (typeVal == 0L) {
+				// type = ProcessType.LTTV_STATE_KERNEL_THREAD.getInName();
+				// } else {
+				// type = ProcessType.LTTV_STATE_USER_THREAD.getInName();
+				// }
+				//
+				// // FIXME: type is rarely used, enum must match possible
+				// types.
+				//
+				// // /* mode */
+				// // mode = getAFieldString(trcEvent, traceSt,
+				// // Fields.LTT_FIELD_MODE);
+				// //
+				// // /* submode */
+				// // submode = getAFieldString(trcEvent, traceSt,
+				// // Fields.LTT_FIELD_SUBMODE);
+				// //
+				// // /* status */
+				// // status = getAFieldString(trcEvent, traceSt,
+				// // Fields.LTT_FIELD_STATUS);
+				//
+				// /* TGID */
+				// tgid = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_TGID);
+				// if (tgid == null) {
+				// tgid = 0L;
+				// }
+				//
+				// if (pid == 0) {
+				// for (Long acpu : traceSt.getCpu_states().keySet()) {
+				// process = lttv_state_find_process(traceSt, acpu, pid);
+				// if (process != null) {
+				// process.setPpid(parent_pid);
+				// process.setTgid(tgid);
+				// process.setName(command);
+				// process
+				// .setType(ProcessType.LTTV_STATE_KERNEL_THREAD);
+				// } else {
+				// StringBuilder sb = new StringBuilder(
+				// "Unexpected, null process read from the TraceState list of processes, event time: "
+				// + trcEvent.getTimestamp());
+				// TraceDebug.debug(sb.toString());
+				// }
+				// }
+				// } else {
+				// /*
+				// * The process might exist if a process was forked while
+				// * performing the state dump.
+				// */
+				// process = lttv_state_find_process(traceSt, ANY_CPU, pid);
+				// if (process == null) {
+				// parent_process = lttv_state_find_process(traceSt,
+				// ANY_CPU, parent_pid);
+				// process = create_process(traceSt, cpu, pid, tgid,
+				// command, trcEvent.getTimestamp());
+				// if (parent_process != null) {
+				// process.setPpid(parent_process.getPid());
+				// }
+				//
+				// /* Keep the stack bottom : a running user mode */
+				// /*
+				// * Disabled because of inconsistencies in the current
+				// * statedump states.
+				// */
+				// if (type.equals(ProcessType.LTTV_STATE_KERNEL_THREAD
+				// .getInName())) {
+				// /*
+				// * FIXME Kernel thread : can be in syscall or
+				// * interrupt or trap.
+				// */
+				// /*
+				// * Will cause expected trap when in fact being
+				// * syscall (even after end of statedump event) Will
+				// * cause expected interrupt when being syscall.
+				// * (only before end of statedump event)
+				// */
+				// process
+				// .setType(ProcessType.LTTV_STATE_KERNEL_THREAD);
+				//
+				// // #if 0
+				// // es->t = LTTV_STATE_SYSCALL;
+				// // es->s = status;
+				// // es->n = submode;
+				// // #endif //0
+				// } else {
+				// /*
+				// * User space process : bottom : user mode either
+				// * currently running or scheduled out. can be
+				// * scheduled out because interrupted in (user mode
+				// * or in syscall) or because of an explicit call to
+				// * the scheduler in syscall. Note that the scheduler
+				// * call comes after the irq_exit, so never in
+				// * interrupt context.
+				// */
+				// // temp workaround : set size to 1 : only have user
+				// // mode
+				// // bottom of stack.
+				// // will cause g_info message of expected syscall
+				// // mode when
+				// // in fact being
+				// // in user mode. Can also cause expected trap when
+				// // in fact
+				// // being user
+				// // mode in the event of a page fault reenabling
+				// // interrupts
+				// // in the handler.
+				// // Expected syscall and trap can also happen after
+				// // the end
+				// // of statedump
+				// // This will cause a
+				// // "popping last state on stack, ignoring it."
+				//
+				// // process->execution_stack =
+				// // g_array_set_size(process->execution_stack, 1);
+				// // es = process->state =
+				// // &g_array_index(process->execution_stack,
+				// // LttvExecutionState, 0);
+				// // a new process must have only one state in the
+				// // stack and
+				// // be the same as the current state
+				// // es = process.getState();
+				// // es.setExec_mode(ExecutionMode.LTTV_STATE_MODE_UNKNOWN);
+				// // es.setProc_status(ProcessStatus.LTTV_STATE_UNNAMED);
+				// // es
+				// //
+				// .setExec_submode(ExecutionSubMode.LTTV_STATE_SUBMODE_UNKNOWN
+				// // .getInName());
+				//
+				// // #if 0
+				// // es->t = LTTV_STATE_USER_MODE;
+				// // es->s = status;
+				// // es->n = submode;
+				// // #endif //0
+				// }
+				// // TODO: clean up comments above: Moved repeated code
+				// // from both
+				// // if / else blocks above,
+				// // comments left temporarily for easier visualization
+				// // and
+				// // comparision with c code
+				// es = process.getState();
+				// es.setExec_mode(ExecutionMode.LTTV_STATE_MODE_UNKNOWN);
+				// es.setProc_status(ProcessStatus.LTTV_STATE_UNNAMED);
+				// es
+				// .setExec_submode(ExecutionSubMode.LTTV_STATE_SUBMODE_UNKNOWN
+				// .getInName());
+				// // #if 0
+				// // /* UNKNOWN STATE */
+				// // {
+				// // es = process->state =
+				// // &g_array_index(process->execution_stack,
+				// // LttvExecutionState, 1);
+				// // es->t = LTTV_STATE_MODE_UNKNOWN;
+				// // es->s = LTTV_STATE_UNNAMED;
+				// // es->n = LTTV_STATE_SUBMODE_UNKNOWN;
+				// // }
+				// // #endif //0
+				// } else {
+				// /*
+				// * The process has already been created : Probably was
+				// * forked while dumping the process state or was simply
+				// * scheduled in prior to get the state dump event.
+				// */
+				// process.setPpid(parent_pid);
+				// process.setTgid(tgid);
+				// process.setName(command);
+				// if (type.equals(ProcessType.LTTV_STATE_KERNEL_THREAD
+				// .getInName())) {
+				// process
+				// .setType(ProcessType.LTTV_STATE_KERNEL_THREAD);
+				// } else {
+				// process.setType(ProcessType.LTTV_STATE_USER_THREAD);
+				// }
+				//
+				// // es =
+				// // &g_array_index(process->execution_stack,
+				// // LttvExecutionState,
+				// // 0);
+				// // #if 0
+				// // if(es->t == LTTV_STATE_MODE_UNKNOWN) {
+				// // if(type == LTTV_STATE_KERNEL_THREAD)
+				// // es->t = LTTV_STATE_SYSCALL;
+				// // else
+				// // es->t = LTTV_STATE_USER_MODE;
+				// // }
+				// // #endif //0
+				// /*
+				// * Don't mess around with the stack, it will eventually
+				// * become ok after the end of state dump.
+				// */
+				// }
+				// }
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/before/StateBeforeUpdateFactory.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/before/StateBeforeUpdateFactory.java
new file mode 100644
index 0000000..2c95f1d
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/before/StateBeforeUpdateFactory.java
@@ -0,0 +1,160 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.tests.state.handlers.before;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.linuxtools.lttng.state.StateStrings;
+import org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing;
+
+/**
+ * Builds a Map from string event name to a processing handler object, the
+ * processors implement the same interface to facilitate transparent methods
+ * call,
+ * 
+ * The map key STring is the entry point of the raw events, using a hash speeds
+ * up the resolution of the appropriate processor
+ * 
+ * @author alvaro
+ * 
+ */
+public class StateBeforeUpdateFactory {
+	// ========================================================================
+	// Data
+	// =======================================================================
+	private final Map<String, IEventProcessing> eventNametoProcessor = new HashMap<String, IEventProcessing>();
+	private static StateBeforeUpdateFactory instance = null;
+	private StateBeforeUpdateHandlers instantiateHandler = new StateBeforeUpdateHandlers();
+
+	// ========================================================================
+	// Constructors
+	// =======================================================================
+	private StateBeforeUpdateFactory() {
+		//create one instance of each individual event handler and add the instance to the map
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_SYSCALL_ENTRY
+				.getInName(), instantiateHandler.getSyscallEntryHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_SYSCALL_EXIT
+				.getInName(), instantiateHandler.getsySyscallExitHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_TRAP_ENTRY
+//				.getInName(), instantiateHandler.getTrapEntryHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_TRAP_EXIT
+//				.getInName(), instantiateHandler.getTrapExitHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_PAGE_FAULT_ENTRY
+//				.getInName(), instantiateHandler.getTrapEntryHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_PAGE_FAULT_EXIT
+//				.getInName(), instantiateHandler.getTrapExitHandler());
+//
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_PAGE_FAULT_NOSEM_ENTRY
+//				.getInName(), instantiateHandler.getTrapEntryHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_PAGE_FAULT_NOSEM_EXIT
+//				.getInName(), instantiateHandler.getTrapExitHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_IRQ_ENTRY
+//				.getInName(), instantiateHandler.getIrqEntryHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_IRQ_EXIT
+//				.getInName(), instantiateHandler.getIrqExitHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_SOFT_IRQ_RAISE
+//				.getInName(), instantiateHandler.getSoftIrqRaiseHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_SOFT_IRQ_ENTRY
+//				.getInName(), instantiateHandler.getSoftIrqEntryHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_SOFT_IRQ_EXIT
+//				.getInName(), instantiateHandler.getSoftIrqExitHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_LIST_INTERRUPT
+//				.getInName(), instantiateHandler.getEnumInterruptHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_REQUEST_ISSUE
+//				.getInName(), instantiateHandler.getBdevRequestIssueHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_REQUEST_COMPLETE
+//				.getInName(), instantiateHandler.getBdevRequestCompleteHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_FUNCTION_ENTRY
+//				.getInName(), instantiateHandler.getFunctionEntryHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_FUNCTION_EXIT
+//				.getInName(), instantiateHandler.getFunctionExitHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_SYS_CALL_TABLE
+//				.getInName(), instantiateHandler.getDumpSyscallHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_KPROBE_TABLE
+//				.getInName(), instantiateHandler.getDumpKprobeHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_SOFTIRQ_VEC
+//				.getInName(), instantiateHandler.getDumpSoftIrqHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_SCHED_SCHEDULE
+//				.getInName(), instantiateHandler.getSchedChangeHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_PROCESS_FORK
+//				.getInName(), instantiateHandler.getProcessForkHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_KTHREAD_CREATE
+//				.getInName(), instantiateHandler.getProcessKernelThreadHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_PROCESS_EXIT
+//				.getInName(), instantiateHandler.getProcessExitHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_PROCESS_FREE
+//				.getInName(), instantiateHandler.getProcessFreeHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_EXEC
+//				.getInName(), instantiateHandler.getProcessExecHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_THREAD_BRAND
+//				.getInName(), instantiateHandler.GetThreadBrandHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_STATEDUMP_END
+//				.getInName(), instantiateHandler.getStateDumpEndHandler());
+//		
+//		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_PROCESS_STATE
+//				.getInName(), instantiateHandler.getEnumProcessStateHandler());
+
+
+	}
+
+	// ========================================================================
+	// Public methods
+	// =======================================================================
+	/**
+	 * The event processors are common to all traces an multiple instances will
+	 * use more memory unnecessarily
+	 * 
+	 * @return
+	 */
+	public static StateBeforeUpdateFactory getInstance() {
+		if (instance == null) {
+			instance = new StateBeforeUpdateFactory();
+		}
+		return instance;
+	}
+
+	/**
+	 * 
+	 * @return The Event Handler corresponding to the type of event
+	 */
+	public IEventProcessing getEventNametoProcessor(String eventType) {
+		return eventNametoProcessor.get(eventType);
+	}
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/before/StateBeforeUpdateHandlers.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/before/StateBeforeUpdateHandlers.java
new file mode 100644
index 0000000..872c0e7
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/before/StateBeforeUpdateHandlers.java
@@ -0,0 +1,1762 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.tests.state.handlers.before;
+
+import org.eclipse.linuxtools.lttng.TraceDebug;
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.state.StateStrings.Events;
+import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionMode;
+import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionSubMode;
+import org.eclipse.linuxtools.lttng.state.StateStrings.Fields;
+import org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing;
+import org.eclipse.linuxtools.lttng.state.model.LttngExecutionState;
+import org.eclipse.linuxtools.lttng.state.model.LttngProcessState;
+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.tests.state.handlers.AbsStateUpdate;
+
+/**
+ * Process the system call entry event
+ * 
+ * @author alvaro
+ * 
+ */
+class StateBeforeUpdateHandlers {
+
+	final IEventProcessing getSyscallEntryHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SYSCALL_ENTRY;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				// TraceDebug.debug("Before event called");
+				//
+				Long cpu = trcEvent.getCpuId();
+
+				// No syscall_entry update for initialization process
+				LttngProcessState process = traceSt.getRunning_process().get(
+						cpu);
+
+				pid = process.getPid();
+				if (pid == 0L) {
+					return true;
+				}
+
+				// Get the expected event field
+				Long syscall = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_SYSCALL_ID);
+				if (syscall == null) {
+					TraceDebug.debug("Syscall Field not found in Event: "
+							+ trcEvent.getMarkerName());
+					return true;
+				}
+
+				String submode = traceSt.getSyscall_names().get(syscall);
+
+				if (submode == null) {
+					TraceDebug.debug("Submode not found in Event");
+					submode = ExecutionSubMode.LTTV_STATE_SUBMODE_UNKNOWN
+							.getInName();
+				}
+				
+				exState = new LttngExecutionState();
+				exState.setExec_mode(ExecutionMode.LTTV_STATE_SYSCALL);
+				exState.setExec_submode(submode);
+				exState.setEntry_Time(trcEvent.getTimestamp().getValue());
+				exState.setChange_Time(trcEvent.getTimestamp().getValue());
+				exState.setCum_cpu_time(0L);
+
+				return false;
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	final IEventProcessing getsySyscallExitHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SYSCALL_EXIT;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				Long cpu = trcEvent.getCpuId();
+				LttngProcessState process = traceSt.getRunning_process().get(
+						cpu);
+
+				/* There can be no system call from PID 0 : unknown state */
+				pid = process.getPid();
+				if (pid == 0L) {
+					return true;
+				}
+				
+				// pop_state(cpu, StateStrings.ExecutionMode.LTTV_STATE_SYSCALL,
+				// traceSt, trcEvent.getTimestamp());
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * Update stacks related to the parsing of an LttngEvent
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getTrapEntryHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_TRAP_ENTRY;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				// Long cpu = trcEvent.getCpuId();
+				//
+				// Long trap = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_TRAP_ID);
+				// if (trap == null) {
+				// return true;
+				// }
+				//
+				// String submode = traceSt.getSyscall_names()
+				// .get(trap);
+				//
+				// if (submode == null) {
+				// submode = ExecutionSubMode.LTTV_STATE_SUBMODE_UNKNOWN
+				// .getInName();
+				// }
+				//
+				// /* update process state */
+				// push_state(cpu, StateStrings.ExecutionMode.LTTV_STATE_TRAP,
+				// submode, trcEvent.getTimestamp(), traceSt);
+				//
+				// /* update cpu status */
+				// LTTngCPUState cpust = traceSt.getCpu_states().get(cpu);
+				// cpu_push_mode(cpust, StateStrings.CpuMode.LTTV_CPU_TRAP);
+				// cpust.setLast_trap(trap); /* update trap status */
+				//
+				// // update Trap State
+				// LttngTrapState trap_state = traceSt.getTrap_states().get(
+				// trap);
+				// trap_state.incrementRunning();
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getTrapExitHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_TRAP_EXIT;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// Long cpu = trcEvent.getCpuId();
+				// LTTngCPUState cpust = traceSt.getCpu_states().get(cpu);
+				// Long trap = cpust.getLast_trap();
+				//
+				// pop_state(cpu, ExecutionMode.LTTV_STATE_TRAP, traceSt,
+				// trcEvent
+				// .getTimestamp());
+				//
+				// /* update cpu status */
+				// cpu_pop_mode(cpust);
+				//
+				// /* update trap status */
+				// if (trap != -1L) {
+				// traceSt.getTrap_states().get(trap).decrementRunning();
+				// }
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getIrqEntryHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_IRQ_ENTRY;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// Long cpu = trcEvent.getCpuId();
+				//
+				// Long irq = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_IRQ_ID);
+				// if (irq == null) {
+				// return true;
+				// }
+				//
+				// String submode;
+				// submode = traceSt.getIrq_names().get(irq);
+				//
+				// if (submode == null) {
+				// submode =
+				// ExecutionSubMode.LTTV_STATE_SUBMODE_UNKNOWN.getInName();
+				// }
+				//				
+				// /*
+				// * Do something with the info about being in user or system
+				// mode
+				// * when int?
+				// */
+				// push_state(cpu, ExecutionMode.LTTV_STATE_IRQ, submode,
+				// trcEvent
+				// .getTimestamp(), traceSt);
+				//
+				// /* update cpu state */
+				// LTTngCPUState cpust = traceSt.getCpu_states().get(cpu);
+				// cpu_push_mode(cpust, CpuMode.LTTV_CPU_IRQ); /* mode stack */
+				// cpust.setLast_irq(irq); /* last irq */
+				//
+				// /* udpate irq state */
+				// irq_push_mode(traceSt.getIrq_states().get(irq),
+				// IRQMode.LTTV_IRQ_BUSY);
+				return false;
+
+			}
+
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getSoftIrqExitHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SOFT_IRQ_EXIT;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// Long cpu = trcEvent.getCpuId();
+				// LTTngCPUState cpust = traceSt.getCpu_states().get(cpu);
+				// Long softirq = cpust.getLast_soft_irq();
+				// pop_state(cpu, ExecutionMode.LTTV_STATE_SOFT_IRQ, traceSt,
+				// trcEvent.getTimestamp());
+				//
+				// /* update softirq status */
+				// if (softirq != -1) {
+				// LttngSoftIRQState softIrqstate = traceSt
+				// .getSoft_irq_states().get(softirq);
+				// softIrqstate.decrementRunning();
+				// }
+				//
+				// /* update cpu status */
+				// cpu_pop_mode(cpust);
+
+				return false;
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getIrqExitHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_IRQ_EXIT;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// Long cpu = trcEvent.getCpuId();
+				//
+				// /* update process state */
+				// pop_state(cpu, ExecutionMode.LTTV_STATE_IRQ, traceSt,
+				// trcEvent
+				// .getTimestamp());
+				//
+				// /* update cpu status */
+				// LTTngCPUState cpust = traceSt.getCpu_states().get(cpu);
+				// cpu_pop_mode(cpust);
+				//
+				// /* update irq status */
+				// Long last_irq = cpust.getLast_irq();
+				// if (last_irq != -1L) {
+				// LttngIRQState irq_state = traceSt.getIrq_states().get(
+				// last_irq);
+				// irq_pop_mode(irq_state);
+				// }
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getSoftIrqRaiseHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SOFT_IRQ_RAISE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// // Long cpu = trcEvent.getCpuId();
+				//
+				// // get event field
+				// Long softirq = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_SOFT_IRQ_ID);
+				//
+				// if (softirq == null) {
+				// return true;
+				// }
+				//
+				// // String submode;
+				// // String[] softIrqNames = traceSt.getSoft_irq_names();
+				// // if (softirq < softIrqNames.length) {
+				// // submode = softIrqNames[softirq];
+				// // } else {
+				// // submode = "softirq " + softirq;
+				// // }
+				//
+				// /* update softirq status */
+				// /* a soft irq raises are not cumulative */
+				// LttngSoftIRQState irqState =
+				// traceSt.getSoft_irq_states().get(
+				// softirq);
+				// if (irqState != null) {
+				// irqState.setPending(1L);
+				// } else {
+				// TraceDebug
+				// .debug("unexpected soft irq id value: " + softirq);
+				// }
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getSoftIrqEntryHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SOFT_IRQ_ENTRY;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// // obtrain cpu
+				// Long cpu = trcEvent.getCpuId();
+				//
+				// // get event field
+				// Long softirq = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_SOFT_IRQ_ID);
+				//
+				// if (softirq == null) {
+				// return true;
+				// }
+				//
+				// // obtain submode
+				// Map<Long, String> softIrqNames = traceSt.getSoft_irq_names();
+				// String submode = softIrqNames.get(softirq);
+				// if (submode == null) {
+				// submode = "softirq " + softirq;
+				// softIrqNames.put(softirq, submode);
+				// }
+				//
+				// /* update softirq status */
+				// LttngSoftIRQState irqState =
+				// traceSt.getSoft_irq_states().get(
+				// softirq);
+				// if (irqState != null) {
+				// irqState.decrementPending();
+				// irqState.incrementRunning();
+				// } else {
+				// TraceDebug
+				// .debug("unexpected soft irq id value: " + softirq);
+				// }
+				//
+				// /* update cpu state */
+				// LTTngCPUState cpu_state = traceSt.getCpu_states().get(cpu);
+				// cpu_state.setLast_soft_irq(softirq);
+				// cpu_push_mode(cpu_state, CpuMode.LTTV_CPU_SOFT_IRQ);
+				//
+				// /* update process execution mode state stack */
+				// push_state(cpu, ExecutionMode.LTTV_STATE_SOFT_IRQ, submode,
+				// trcEvent.getTimestamp(), traceSt);
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * Method to handle the event: LTT_EVENT_LIST_INTERRRUPT
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getEnumInterruptHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_LIST_INTERRUPT;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				// String action = getAFieldString(trcEvent, traceSt,
+				// Fields.LTT_FIELD_ACTION);
+				// Long irq = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_IRQ_ID);
+				//					
+				// Map<Long, String> irq_names = traceSt.getIrq_names();
+				//
+				// irq_names.put(irq, action);
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * Handle the event LTT_EVENT_REQUEST_ISSUE
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getBdevRequestIssueHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_REQUEST_ISSUE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// // Get Fields
+				// Long major = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_MAJOR);
+				// Long minor = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_MINOR);
+				// Long operation = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_OPERATION);
+				//
+				// // calculate bdevcode
+				// Long devcode = mkdev(major, minor);
+				//
+				// if (devcode == null) {
+				// TraceDebug
+				// .debug("incorrect calcualtion of bdevcode input( major: "
+				// + major
+				// + " minor: "
+				// + minor
+				// + " operation: " + operation);
+				// return true;
+				// }
+				//
+				// Map<Long, LttngBdevState> bdev_states = traceSt
+				// .getBdev_states();
+				// // Get the instance
+				// LttngBdevState bdevState = bdev_states.get(devcode);
+				// if (bdevState == null) {
+				// bdevState = new LttngBdevState();
+				// }
+				//
+				// // update the mode in the stack
+				// if (operation == 0L) {
+				// bdevState.getMode_stack().push(
+				// BdevMode.LTTV_BDEV_BUSY_READING);
+				// } else {
+				// bdevState.getMode_stack().push(
+				// BdevMode.LTTV_BDEV_BUSY_WRITING);
+				// }
+				//
+				// // make sure it is included in the set
+				// bdev_states.put(devcode, bdevState);
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handling event: LTT_EVENT_REQUEST_COMPLETE
+	 * </p>
+	 * <p>
+	 * FIELDS(LTT_FIELD_MAJOR, LTT_FIELD_MINOR, LTT_FIELD_OPERATION
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getBdevRequestCompleteHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_REQUEST_COMPLETE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// // Get Fields
+				// Long major = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_MAJOR);
+				// Long minor = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_MINOR);
+				// Long operation = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_OPERATION);
+				//
+				// // calculate bdevcode
+				// Long devcode = mkdev(major, minor);
+				//
+				// if (devcode == null) {
+				// TraceDebug
+				// .debug("incorrect calcualtion of bdevcode input( major: "
+				// + major
+				// + " minor: "
+				// + minor
+				// + " operation: " + operation);
+				// return true;
+				// }
+				//
+				// Map<Long, LttngBdevState> bdev_states = traceSt
+				// .getBdev_states();
+				// // Get the instance
+				// LttngBdevState bdevState = bdev_states.get(devcode);
+				// if (bdevState == null) {
+				// bdevState = new LttngBdevState();
+				// }
+				//
+				// /* update block device */
+				// bdev_pop_mode(bdevState);
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles event: LTT_EVENT_FUNCTION_ENTRY
+	 * </p>
+	 * <p>
+	 * FIELDS: LTT_FIELD_THIS_FN, LTT_FIELD_CALL_SITE
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getFunctionEntryHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_FUNCTION_ENTRY;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				// Long cpu = trcEvent.getCpuId();
+				// Long funcptr = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_THIS_FN);
+				//
+				// push_function(traceSt, funcptr, cpu);
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getFunctionExitHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_FUNCTION_EXIT;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// Long funcptr = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_THIS_FN);
+				//
+				// pop_function(traceSt, trcEvent, funcptr);
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * process event: LTT_EVENT_SYS_CALL_TABLE
+	 * </p>
+	 * <p>
+	 * fields: LTT_FIELD_ID, LTT_FIELD_ADDRESS, LTT_FIELD_SYMBOL
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getDumpSyscallHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SYS_CALL_TABLE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				// // obtain the syscall id
+				// Long id = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_ID);
+				//
+				// // Long address = getAFieldLong(trcEvent, traceSt,
+				// // Fields.LTT_FIELD_ADDRESS);
+				//
+				// // Obtain the symbol
+				// String symbol = getAFieldString(trcEvent, traceSt,
+				// Fields.LTT_FIELD_SYMBOL);
+				//
+				// // fill the symbol to the sycall_names collection
+				// traceSt.getSyscall_names().put(id, symbol);
+
+				return false;
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles event: LTT_EVENT_KPROBE_TABLE
+	 * </p>
+	 * <p>
+	 * Fields: LTT_FIELD_IP, LTT_FIELD_SYMBOL
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getDumpKprobeHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_KPROBE_TABLE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// Long ip = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_IP);
+				// String symbol = getAFieldString(trcEvent, traceSt,
+				// Fields.LTT_FIELD_SYMBOL);
+				//
+				// traceSt.getKprobe_table().put(ip, symbol);
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_SOFTIRQ_VEC
+	 * </p>
+	 * <p>
+	 * Fields: LTT_FIELD_ID, LTT_FIELD_ADDRESS, LTT_FIELD_SYMBOL
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getDumpSoftIrqHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SOFTIRQ_VEC;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// // Get id
+				// Long id = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_ID);
+				//
+				// // Address not needed
+				// // Long address = ltt_event_get_long_unsigned(e,
+				// // lttv_trace_get_hook_field(th,
+				// // 1));
+				//
+				// // Get symbol
+				// String symbol = getAFieldString(trcEvent, traceSt,
+				// Fields.LTT_FIELD_SYMBOL);
+				//
+				// // Register the soft irq name
+				// traceSt.getSoft_irq_names().put(id, symbol);
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_SCHED_SCHEDULE
+	 * </p>
+	 * <p>
+	 * Fields: LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getSchedChangeHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SCHED_SCHEDULE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// Long cpu = trcEvent.getCpuId();
+				// TmfTimestamp eventTime = trcEvent.getTimestamp();
+				//
+				// LttngProcessState process = traceSt.getRunning_process().get(
+				// cpu);
+				//
+				// Long pid_out = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_PREV_PID);
+				// Long pid_in = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_NEXT_PID);
+				// Long state_out = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_PREV_STATE);
+				//
+				// if (process != null) {
+				//
+				// /*
+				// * We could not know but it was not the idle process
+				// * executing. This should only happen at the beginning,
+				// * before the first schedule event, and when the initial
+				// * information (current process for each CPU) is missing. It
+				// * is not obvious how we could, after the fact, compensate
+				// * the wrongly attributed statistics.
+				// */
+				//
+				// // This test only makes sense once the state is known and if
+				// // there
+				// // is no
+				// // missing events. We need to silently ignore schedchange
+				// // coming
+				// // after a
+				// // process_free, or it causes glitches. (FIXME)
+				// // if(unlikely(process->pid != pid_out)) {
+				// // g_assert(process->pid == 0);
+				// // }
+				// if (process.getPid() == 0
+				// && process.getState().getExec_mode() ==
+				// ExecutionMode.LTTV_STATE_MODE_UNKNOWN) {
+				// if (pid_out == 0) {
+				// /*
+				// * Scheduling out of pid 0 at beginning of the trace
+				// * : we know for sure it is in syscall mode at this
+				// * point.
+				// */
+				// int stackSize = process.getExecution_stack().size();
+				// if (stackSize != 1) {
+				// TraceDebug
+				// .debug("unpexpected process execution stack size, expected 1, received: ");
+				// }
+				//
+				// process.getState().setExec_mode(
+				// ExecutionMode.LTTV_STATE_SYSCALL);
+				// process.getState().setProc_status(
+				// ProcessStatus.LTTV_STATE_WAIT);
+				// process.getState().setChage_Time(
+				// trcEvent.getTimestamp());
+				// process.getState().setEntry_Time(
+				// trcEvent.getTimestamp());
+				// }
+				// } else {
+				// if (process.getState().getProc_status() ==
+				// ProcessStatus.LTTV_STATE_EXIT) {
+				// process.getState().setProc_status(
+				// ProcessStatus.LTTV_STATE_ZOMBIE);
+				// process.getState().setChage_Time(
+				// trcEvent.getTimestamp());
+				// } else {
+				// if (state_out == 0L) {
+				// process.getState().setProc_status(
+				// ProcessStatus.LTTV_STATE_WAIT_CPU);
+				// } else {
+				// process.getState().setProc_status(
+				// ProcessStatus.LTTV_STATE_WAIT);
+				// }
+				//
+				// process.getState().setChage_Time(
+				// trcEvent.getTimestamp());
+				// }
+				//
+				// if (state_out == 32L || state_out == 64L) { /*
+				// * EXIT_DEAD
+				// * ||
+				// * TASK_DEAD
+				// */
+				// /* see sched.h for states */
+				// if (!exit_process(traceSt, process)) {
+				// process.getState().setProc_status(
+				// ProcessStatus.LTTV_STATE_DEAD);
+				// process.getState().setChage_Time(
+				// trcEvent.getTimestamp());
+				// }
+				// }
+				// }
+				// }
+				// process = lttv_state_find_process_or_create(traceSt, cpu,
+				// pid_in, eventTime);
+				//
+				// traceSt.getRunning_process().put(cpu, process);
+				//
+				// process.getState().setProc_status(ProcessStatus.LTTV_STATE_RUN);
+				// process.getState().setChage_Time(eventTime);
+				// process.setCpu(cpu);
+				// // process->state->s = LTTV_STATE_RUN;
+				// // if(process->usertrace)
+				// // process->usertrace->cpu = cpu;
+				// // process->last_cpu_index =
+				// // ltt_tracefile_num(((LttvTracefileContext*)s)->tf);
+				//
+				// // process->state->change = s->parent.timestamp;
+				//
+				// LTTngCPUState cpu_state = traceSt.getCpu_states().get(cpu);
+				// /* update cpu status */
+				// if (pid_in == 0) {
+				//
+				// /* going to idle task */
+				// cpu_set_base_mode(cpu_state, CpuMode.LTTV_CPU_IDLE);
+				// } else {
+				// /*
+				// * scheduling a real task. we must be careful here: if we
+				// * just schedule()'ed to a process that is in a trap, we
+				// * must put the cpu in trap mode
+				// */
+				// cpu_set_base_mode(cpu_state, CpuMode.LTTV_CPU_BUSY);
+				// if (process.getState().getExec_mode() ==
+				// ExecutionMode.LTTV_STATE_TRAP) {
+				// cpu_push_mode(cpu_state, CpuMode.LTTV_CPU_TRAP);
+				// }
+				// }
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_PROCESS_FORK
+	 * </p>
+	 * <p>
+	 * Fields: FIELD_ARRAY(LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID,
+	 * LTT_FIELD_CHILD_TGID)
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getProcessForkHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_PROCESS_FORK;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// Long cpu = trcEvent.getCpuId();
+				// LttngProcessState process = traceSt.getRunning_process().get(
+				// cpu);
+				// TmfTimestamp timeStamp = trcEvent.getTimestamp();
+				//
+				// // /* Parent PID */
+				// // Long parent_pid = getAFieldLong(trcEvent, traceSt,
+				// // Fields.LTT_FIELD_PARENT_PID);
+				//
+				// /* Child PID */
+				// /* In the Linux Kernel, there is one PID per thread. */
+				// Long child_pid = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_CHILD_PID);
+				//
+				// /* Child TGID */
+				// /* tgid in the Linux kernel is the "real" POSIX PID. */
+				// Long child_tgid = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_CHILD_TGID);
+				// if (child_tgid == null) {
+				// child_tgid = 0L;
+				// }
+				//
+				// /*
+				// * Mathieu : it seems like the process might have been
+				// scheduled
+				// * in before the fork, and, in a rare case, might be the
+				// current
+				// * process. This might happen in a SMP case where we don't
+				// have
+				// * enough precision on the clocks.
+				// *
+				// * Test reenabled after precision fixes on time. (Mathieu)
+				// */
+				// // #if 0
+				// // zombie_process = lttv_state_find_process(ts, ANY_CPU,
+				// // child_pid);
+				// //
+				// // if(unlikely(zombie_process != NULL)) {
+				// // /* Reutilisation of PID. Only now we are sure that the old
+				// // PID
+				// // * has been released. FIXME : should know when release_task
+				// // happens
+				// // instead.
+				// // */
+				// // guint num_cpus = ltt_trace_get_num_cpu(ts->parent.t);
+				// // guint i;
+				// // for(i=0; i< num_cpus; i++) {
+				// // g_assert(zombie_process != ts->running_process[i]);
+				// // }
+				// //
+				// // exit_process(s, zombie_process);
+				// // }
+				// // #endif //0
+				//
+				// if (process.getPid() == child_pid) {
+				// TraceDebug
+				// .debug("Unexpected, process pid equal to child pid: "
+				// + child_pid
+				// + " Event Time: "
+				// + trcEvent.getTimestamp());
+				// }
+				//
+				// // g_assert(process->pid != child_pid);
+				// // FIXME : Add this test in the "known state" section
+				// // g_assert(process->pid == parent_pid);
+				// LttngProcessState child_process = lttv_state_find_process(
+				// traceSt, ANY_CPU, child_pid);
+				// if (child_process == null) {
+				// child_process = create_process(traceSt, cpu, child_pid,
+				// child_tgid, timeStamp);
+				// } else {
+				// /*
+				// * The process has already been created : due to time
+				// * imprecision between multiple CPUs : it has been scheduled
+				// * in before creation. Note that we shouldn't have this kind
+				// * of imprecision.
+				// *
+				// * Simply put a correct parent.
+				// */
+				// StringBuilder sb = new StringBuilder("Process " + child_pid);
+				// sb.append(" has been created at ["
+				// + child_process.getCration_time() + "] ");
+				// sb.append("and inserted at ["
+				// + child_process.getInsertion_time() + "] ");
+				// sb.append("before \nfork on cpu " + cpu + " Event time: ["
+				// + trcEvent + "]\n.");
+				// sb
+				// .append("Probably an unsynchronized TSD problem on the traced machine.");
+				// TraceDebug.debug(sb.toString());
+				//
+				// // g_assert(0); /* This is a problematic case : the process
+				// // has
+				// // beencreated
+				// // before the fork event */
+				// child_process.setPpid(process.getPid());
+				// child_process.setTgid(child_tgid);
+				// }
+				//
+				// if (!child_process.getName().equals(
+				// ProcessStatus.LTTV_STATE_UNNAMED.getInName())) {
+				// TraceDebug.debug("Unexpected child process status: "
+				// + child_process.getName());
+				// }
+				//
+				// child_process.setName(process.getName());
+				// child_process.setBrand(process.getBrand());
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_KTHREAD_CREATE
+	 * </p>
+	 * <p>
+	 * Fields: LTT_FIELD_PID
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getProcessKernelThreadHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_KTHREAD_CREATE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				// /*
+				// * We stamp a newly created process as kernel_thread. The
+				// thread
+				// * should not be running yet.
+				// */
+				//
+				// LttngExecutionState exState;
+				// Long pid;
+				// LttngProcessState process;
+				//
+				// /* PID */
+				// pid = getAFieldLong(trcEvent, traceSt, Fields.LTT_FIELD_PID);
+				// // s->parent.target_pid = pid;
+				//
+				// process = lttv_state_find_process_or_create(traceSt, ANY_CPU,
+				// pid, new TmfTimestamp());
+				//
+				// if (!process.getState().getProc_status().equals(
+				// ProcessStatus.LTTV_STATE_DEAD)) {
+				// // Leave only the first element in the stack with execution
+				// // mode to
+				// // syscall
+				// Stack<LttngExecutionState> processExStack = process
+				// .getExecution_stack();
+				// exState = processExStack.firstElement();
+				// exState.setExec_mode(ExecutionMode.LTTV_STATE_SYSCALL);
+				// if (processExStack.size() > 1) {
+				// processExStack.clear();
+				// processExStack.add(exState);
+				// }
+				//
+				// // update the process state to the only one in the stack
+				// process.setState(exState);
+				// }
+				//
+				// process.setType(ProcessType.LTTV_STATE_KERNEL_THREAD);
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_PROCESS_EXIT
+	 * </p>
+	 * <p>
+	 * LTT_FIELD_PID
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getProcessExitHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_PROCESS_EXIT;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// Long pid;
+				// LttngProcessState process;
+				//
+				// pid = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_PID);
+				// // s->parent.target_pid = pid;
+				//
+				// // FIXME : Add this test in the "known state" section
+				// // g_assert(process->pid == pid);
+				//
+				// process = lttv_state_find_process(traceSt, ANY_CPU, pid);
+				// if (process != null) {
+				// process.getState().setProc_status(
+				// ProcessStatus.LTTV_STATE_EXIT);
+				// }
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_PROCESS_FREE
+	 * </p>
+	 * <p>
+	 * Fields: LTT_FIELD_PID
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getProcessFreeHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_PROCESS_FREE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// Long release_pid;
+				// LttngProcessState process;
+				//
+				// /* PID of the process to release */
+				// release_pid = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_PID);
+				// // s->parent.target_pid = release_pid;
+				//
+				// if (release_pid == 0) {
+				// TraceDebug.debug("Unexpected release_pid: 0, Event time: "
+				// + trcEvent.getTimestamp());
+				// }
+				//
+				// process = lttv_state_find_process(traceSt, ANY_CPU,
+				// release_pid);
+				// if (process != null) {
+				// exit_process(traceSt, process);
+				// }
+
+				return false;
+				// DISABLED
+				// if(process != null) {
+				/*
+				 * release_task is happening at kernel level : we can now safely
+				 * release the data structure of the process
+				 */
+				// This test is fun, though, as it may happen that
+				// at time t : CPU 0 : process_free
+				// at time t+150ns : CPU 1 : schedule out
+				// Clearly due to time imprecision, we disable it. (Mathieu)
+				// If this weird case happen, we have no choice but to put the
+				// Currently running process on the cpu to 0.
+				// I re-enable it following time precision fixes. (Mathieu)
+				// Well, in the case where an process is freed by a process on
+				// another
+				// CPU
+				// and still scheduled, it happens that this is the schedchange
+				// that
+				// will
+				// drop the last reference count. Do not free it here!
+
+				// int num_cpus = ltt_trace_get_num_cpu(ts->parent.t);
+				// guint i;
+				// for(i=0; i< num_cpus; i++) {
+				// //g_assert(process != ts->running_process[i]);
+				// if(process == ts->running_process[i]) {
+				// //ts->running_process[i] = lttv_state_find_process(ts, i, 0);
+				// break;
+				// }
+				// }
+				// if(i == num_cpus) /* process is not scheduled */
+				// exit_process(s, process);
+				// }
+				//	
+				// return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_EXEC
+	 * </p>
+	 * <p>
+	 * FIELDS: LTT_FIELD_FILENAME
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getProcessExecHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_EXEC;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// Long cpu = trcEvent.getCpuId();
+				// LttngProcessState process = traceSt.getRunning_process().get(
+				// cpu);
+				//
+				// // #if 0//how to use a sequence that must be transformed in a
+				// // string
+				// // /* PID of the process to release */
+				// // guint64 name_len = ltt_event_field_element_number(e,
+				// // lttv_trace_get_hook_field(th, 0));
+				// // //name = ltt_event_get_string(e,
+				// // lttv_trace_get_hook_field(th, 0));
+				// // LttField *child = ltt_event_field_element_select(e,
+				// // lttv_trace_get_hook_field(th, 0), 0);
+				// // gchar *name_begin =
+				// // (gchar*)(ltt_event_data(e)+ltt_event_field_offset(e,
+				// child));
+				// // gchar *null_term_name = g_new(gchar, name_len+1);
+				// // memcpy(null_term_name, name_begin, name_len);
+				// // null_term_name[name_len] = '\0';
+				// // process->name = g_quark_from_string(null_term_name);
+				// // #endif //0
+				//
+				// process.setName(getAFieldString(trcEvent, traceSt,
+				// Fields.LTT_FIELD_FILENAME));
+				// process.setBrand(StateStrings.LTTV_STATE_UNBRANDED);
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * LTT_EVENT_THREAD_BRAND
+	 * </p>
+	 * <p>
+	 * FIELDS: LTT_FIELD_NAME
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing GetThreadBrandHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_THREAD_BRAND;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// String name;
+				// Long cpu = trcEvent.getCpuId();
+				// LttngProcessState process = traceSt.getRunning_process().get(
+				// cpu);
+				//
+				// name = getAFieldString(trcEvent, traceSt,
+				// Fields.LTT_FIELD_NAME);
+				// process.setBrand(name);
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * @return
+	 */
+	final IEventProcessing getStateDumpEndHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_STATEDUMP_END;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// /* For all processes */
+				// /*
+				// * if kernel thread, if stack[0] is unknown, set to syscall
+				// * mode, wait
+				// */
+				// /* else, if stack[0] is unknown, set to user mode, running */
+				// List<LttngProcessState> processes = traceSt.getProcesses();
+				// TmfTimestamp time = trcEvent.getTimestamp();
+				//
+				// for (LttngProcessState process : processes) {
+				// fix_process(process, time);
+				// }
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * Private method used to establish the first execution state in the stack
+	 * for a given process
+	 * 
+	 * @param process
+	 * @param timestamp
+	 */
+	// private void fix_process(LttngProcessState process,
+	// TmfTimestamp timestamp) {
+	//
+	// LttngExecutionState es;
+	// Stack<LttngExecutionState> procStack = process
+	// .getExecution_stack();
+	//
+	// if (process.getType() == ProcessType.LTTV_STATE_KERNEL_THREAD) {
+	// es = procStack.firstElement();
+	//
+	// if (es.getExec_mode() == ExecutionMode.LTTV_STATE_MODE_UNKNOWN) {
+	// es.setExec_mode(ExecutionMode.LTTV_STATE_SYSCALL);
+	// es
+	// .setExec_submode(ExecutionSubMode.LTTV_STATE_SUBMODE_NONE
+	// .getInName());
+	// es.setEntry_Time(timestamp);
+	// es.setChage_Time(timestamp);
+	// es.setCum_cpu_time(0L);
+	// if (es.getProc_status() == ProcessStatus.LTTV_STATE_UNNAMED) {
+	// es.setProc_status(ProcessStatus.LTTV_STATE_WAIT);
+	// }
+	// }
+	// } else {
+	// es = procStack.firstElement();
+	// if (es.getExec_mode() == ExecutionMode.LTTV_STATE_MODE_UNKNOWN) {
+	// es.setExec_mode(ExecutionMode.LTTV_STATE_USER_MODE);
+	// es
+	// .setExec_submode(ExecutionSubMode.LTTV_STATE_SUBMODE_NONE
+	// .getInName());
+	// es.setEntry_Time(timestamp);
+	// es.setChage_Time(timestamp);
+	// es.setCum_cpu_time(0L);
+	// if (es.getProc_status() == ProcessStatus.LTTV_STATE_UNNAMED) {
+	// es.setProc_status(ProcessStatus.LTTV_STATE_RUN);
+	// }
+	//
+	// if (procStack.size() == 1) {
+	// /*
+	// * Still in bottom unknown mode, means never did a
+	// * system call May be either in user mode, syscall
+	// * mode, running or waiting.
+	// */
+	// /*
+	// * FIXME : we may be tagging syscall mode when being
+	// * user mode
+	// */
+	// // Get a new execution State
+	// es = new LttngExecutionState();
+	//
+	// // initialize values
+	// es.setExec_mode(ExecutionMode.LTTV_STATE_SYSCALL);
+	// es
+	// .setExec_submode(ExecutionSubMode.LTTV_STATE_SUBMODE_NONE
+	// .getInName());
+	// es.setEntry_Time(timestamp);
+	// es.setChage_Time(timestamp);
+	// es.setCum_cpu_time(0L);
+	// es.setProc_status(ProcessStatus.LTTV_STATE_UNNAMED);
+	//
+	// // Push the new state to the stack
+	// procStack.push(es);
+	// }
+	// }
+	// }
+	// }
+	// };
+	// return handler;
+	// }
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_PROCESS_STATE
+	 * </p>
+	 * <p>
+	 * FIELDS: LTT_FIELD_PID, LTT_FIELD_PARENT_PID, LTT_FIELD_NAME,
+	 * LTT_FIELD_TYPE, LTT_FIELD_MODE, LTT_FIELD_SUBMODE, LTT_FIELD_STATUS,
+	 * LTT_FIELD_TGID
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getEnumProcessStateHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_PROCESS_STATE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				//
+				// Long parent_pid;
+				// Long pid;
+				// Long tgid;
+				// String command;
+				// Long cpu = trcEvent.getCpuId();
+				// LttngProcessState process = traceSt.getRunning_process().get(
+				// cpu);
+				// LttngProcessState parent_process;
+				// String type;
+				// // String mode, submode, status;
+				// LttngExecutionState es;
+				//
+				// /* PID */
+				// pid = getAFieldLong(trcEvent, traceSt, Fields.LTT_FIELD_PID);
+				//
+				// /* Parent PID */
+				// parent_pid = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_PARENT_PID);
+				//
+				// /* Command name */
+				// command = getAFieldString(trcEvent, traceSt,
+				// Fields.LTT_FIELD_NAME);
+				//
+				// /* TODO: type field, Values need to be verified */
+				// /* type */
+				// Long typeVal = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_TYPE);
+				// if (typeVal == 0L) {
+				// type = ProcessType.LTTV_STATE_KERNEL_THREAD.getInName();
+				// } else {
+				// type = ProcessType.LTTV_STATE_USER_THREAD.getInName();
+				// }
+				//
+				// // FIXME: type is rarely used, enum must match possible
+				// types.
+				//
+				// // /* mode */
+				// // mode = getAFieldString(trcEvent, traceSt,
+				// // Fields.LTT_FIELD_MODE);
+				// //
+				// // /* submode */
+				// // submode = getAFieldString(trcEvent, traceSt,
+				// // Fields.LTT_FIELD_SUBMODE);
+				// //
+				// // /* status */
+				// // status = getAFieldString(trcEvent, traceSt,
+				// // Fields.LTT_FIELD_STATUS);
+				//
+				// /* TGID */
+				// tgid = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_TGID);
+				// if (tgid == null) {
+				// tgid = 0L;
+				// }
+				//
+				// if (pid == 0) {
+				// for (Long acpu : traceSt.getCpu_states().keySet()) {
+				// process = lttv_state_find_process(traceSt, acpu, pid);
+				// if (process != null) {
+				// process.setPpid(parent_pid);
+				// process.setTgid(tgid);
+				// process.setName(command);
+				// process
+				// .setType(ProcessType.LTTV_STATE_KERNEL_THREAD);
+				// } else {
+				// StringBuilder sb = new StringBuilder(
+				// "Unexpected, null process read from the TraceState list of processes, event time: "
+				// + trcEvent.getTimestamp());
+				// TraceDebug.debug(sb.toString());
+				// }
+				// }
+				// } else {
+				// /*
+				// * The process might exist if a process was forked while
+				// * performing the state dump.
+				// */
+				// process = lttv_state_find_process(traceSt, ANY_CPU, pid);
+				// if (process == null) {
+				// parent_process = lttv_state_find_process(traceSt,
+				// ANY_CPU, parent_pid);
+				// process = create_process(traceSt, cpu, pid, tgid,
+				// command, trcEvent.getTimestamp());
+				// if (parent_process != null) {
+				// process.setPpid(parent_process.getPid());
+				// }
+				//
+				// /* Keep the stack bottom : a running user mode */
+				// /*
+				// * Disabled because of inconsistencies in the current
+				// * statedump states.
+				// */
+				// if (type.equals(ProcessType.LTTV_STATE_KERNEL_THREAD
+				// .getInName())) {
+				// /*
+				// * FIXME Kernel thread : can be in syscall or
+				// * interrupt or trap.
+				// */
+				// /*
+				// * Will cause expected trap when in fact being
+				// * syscall (even after end of statedump event) Will
+				// * cause expected interrupt when being syscall.
+				// * (only before end of statedump event)
+				// */
+				// process
+				// .setType(ProcessType.LTTV_STATE_KERNEL_THREAD);
+				//
+				// // #if 0
+				// // es->t = LTTV_STATE_SYSCALL;
+				// // es->s = status;
+				// // es->n = submode;
+				// // #endif //0
+				// } else {
+				// /*
+				// * User space process : bottom : user mode either
+				// * currently running or scheduled out. can be
+				// * scheduled out because interrupted in (user mode
+				// * or in syscall) or because of an explicit call to
+				// * the scheduler in syscall. Note that the scheduler
+				// * call comes after the irq_exit, so never in
+				// * interrupt context.
+				// */
+				// // temp workaround : set size to 1 : only have user
+				// // mode
+				// // bottom of stack.
+				// // will cause g_info message of expected syscall
+				// // mode when
+				// // in fact being
+				// // in user mode. Can also cause expected trap when
+				// // in fact
+				// // being user
+				// // mode in the event of a page fault reenabling
+				// // interrupts
+				// // in the handler.
+				// // Expected syscall and trap can also happen after
+				// // the end
+				// // of statedump
+				// // This will cause a
+				// // "popping last state on stack, ignoring it."
+				//
+				// // process->execution_stack =
+				// // g_array_set_size(process->execution_stack, 1);
+				// // es = process->state =
+				// // &g_array_index(process->execution_stack,
+				// // LttvExecutionState, 0);
+				// // a new process must have only one state in the
+				// // stack and
+				// // be the same as the current state
+				// // es = process.getState();
+				// // es.setExec_mode(ExecutionMode.LTTV_STATE_MODE_UNKNOWN);
+				// // es.setProc_status(ProcessStatus.LTTV_STATE_UNNAMED);
+				// // es
+				// //
+				// .setExec_submode(ExecutionSubMode.LTTV_STATE_SUBMODE_UNKNOWN
+				// // .getInName());
+				//
+				// // #if 0
+				// // es->t = LTTV_STATE_USER_MODE;
+				// // es->s = status;
+				// // es->n = submode;
+				// // #endif //0
+				// }
+				// // TODO: clean up comments above: Moved repeated code
+				// // from both
+				// // if / else blocks above,
+				// // comments left temporarily for easier visualization
+				// // and
+				// // comparision with c code
+				// es = process.getState();
+				// es.setExec_mode(ExecutionMode.LTTV_STATE_MODE_UNKNOWN);
+				// es.setProc_status(ProcessStatus.LTTV_STATE_UNNAMED);
+				// es
+				// .setExec_submode(ExecutionSubMode.LTTV_STATE_SUBMODE_UNKNOWN
+				// .getInName());
+				// // #if 0
+				// // /* UNKNOWN STATE */
+				// // {
+				// // es = process->state =
+				// // &g_array_index(process->execution_stack,
+				// // LttvExecutionState, 1);
+				// // es->t = LTTV_STATE_MODE_UNKNOWN;
+				// // es->s = LTTV_STATE_UNNAMED;
+				// // es->n = LTTV_STATE_SUBMODE_UNKNOWN;
+				// // }
+				// // #endif //0
+				// } else {
+				// /*
+				// * The process has already been created : Probably was
+				// * forked while dumping the process state or was simply
+				// * scheduled in prior to get the state dump event.
+				// */
+				// process.setPpid(parent_pid);
+				// process.setTgid(tgid);
+				// process.setName(command);
+				// if (type.equals(ProcessType.LTTV_STATE_KERNEL_THREAD
+				// .getInName())) {
+				// process
+				// .setType(ProcessType.LTTV_STATE_KERNEL_THREAD);
+				// } else {
+				// process.setType(ProcessType.LTTV_STATE_USER_THREAD);
+				// }
+				//
+				// // es =
+				// // &g_array_index(process->execution_stack,
+				// // LttvExecutionState,
+				// // 0);
+				// // #if 0
+				// // if(es->t == LTTV_STATE_MODE_UNKNOWN) {
+				// // if(type == LTTV_STATE_KERNEL_THREAD)
+				// // es->t = LTTV_STATE_SYSCALL;
+				// // else
+				// // es->t = LTTV_STATE_USER_MODE;
+				// // }
+				// // #endif //0
+				// /*
+				// * Don't mess around with the stack, it will eventually
+				// * become ok after the end of state dump.
+				// */
+				// }
+				// }
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/tests/handlers/AbsStateUpdate.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/tests/handlers/AbsStateUpdate.java
new file mode 100644
index 0000000..4de68d4
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/tests/handlers/AbsStateUpdate.java
@@ -0,0 +1,568 @@
+package org.eclipse.linuxtools.lttng.tests.state.tests.handlers;
+
+import org.eclipse.linuxtools.lttng.TraceDebug;
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.event.LttngEventField;
+import org.eclipse.linuxtools.lttng.state.StateStrings.Fields;
+import org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing;
+import org.eclipse.linuxtools.lttng.state.model.LttngExecutionState;
+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.tmf.event.TmfEventField;
+
+public abstract class AbsStateUpdate implements IEventProcessing {
+
+	// ========================================================================
+	// Data
+	// =======================================================================
+	protected static LttngExecutionState exState = null;
+	protected static Long pid = null;
+	
+	// ========================================================================
+	// push and pop from stack
+	// =======================================================================
+
+//	protected static final Long ANY_CPU = 0L;
+	
+
+//	protected void push_state(Long cpu, StateStrings.ExecutionMode execMode,
+//			String submode, TmfTimestamp eventTime, LttngTraceState traceSt) {
+//
+//		LttngProcessState process = traceSt.getRunning_process().get(cpu);
+//		LttngExecutionState exe_state = new LttngExecutionState();
+//		exe_state.setExec_mode(execMode);
+//		exe_state.setExec_submode(submode);
+//		exe_state.setEntry_Time(eventTime);
+//		exe_state.setChage_Time(eventTime);
+//		exe_state.setCum_cpu_time(0L);
+//		exe_state.setProc_status(process.getState().getProc_status());
+//		process.setState(exe_state);
+//
+//		Stack<LttngExecutionState> exe_state_stack = process
+//				.getExecution_stack();
+//		exe_state_stack.push(exe_state);
+//	}
+//
+//	protected void pop_state(Long cpu, StateStrings.ExecutionMode execMode,
+//			LttngTraceState traceSt, TmfTimestamp eventTime) {
+//
+//		LttngProcessState process = traceSt.getRunning_process().get(cpu);
+//
+//		if (!process.getState().getExec_mode().equals(execMode)) {
+//			// Different execution mode
+//			TraceDebug.debug("Different Execution Mode type \n\tTime:"
+//					+ eventTime.toString() + "\n\tprocess state has: \n\t"
+//					+ process.getState().getExec_mode().toString()
+//					+ "\n\twhen pop_int is:\n\t" + execMode.toString());
+//			return;
+//		}
+//
+//		Stack<LttngExecutionState> exe_state_stack = process
+//				.getExecution_stack();
+//
+//		if (exe_state_stack.size() <= 1) {
+//			TraceDebug
+//					.debug("Removing last item from execution stack is not allowed");
+//		}
+//
+//		exe_state_stack.pop();
+//		process.setState(exe_state_stack.peek());
+//		process.getState().setChage_Time(eventTime);
+//	}
+//
+//	protected void irq_push_mode(LttngIRQState irqst, IRQMode state) {
+//		irqst.getMode_stack().push(state);
+//	}
+//
+//	protected void irq_set_base_mode(LttngIRQState irqst, IRQMode state) {
+//		Stack<IRQMode> irqModeStack = irqst.getMode_stack();
+//		irqModeStack.clear();
+//		irqModeStack.push(state);
+//	}
+//
+//	protected void irq_pop_mode(LttngIRQState irqst) {
+//		Stack<IRQMode> irq_stack = irqst.getMode_stack();
+//		if (irq_stack.size() <= 1)
+//			irq_set_base_mode(irqst, IRQMode.LTTV_IRQ_UNKNOWN);
+//		else
+//			irq_stack.pop();
+//	}
+//
+//	protected void cpu_push_mode(LTTngCPUState cpust, StateStrings.CpuMode state) {
+//		// The initialization (init) creates a LttngCPUState instance per
+//		// available cpu in the system
+//		Stack<CpuMode> cpuStack = cpust.getMode_stack();
+//		cpuStack.push(state);
+//	}
+//
+//	protected void cpu_pop_mode(LTTngCPUState cpust) {
+//		if (cpust.getMode_stack().size() <= 1)
+//			cpu_set_base_mode(cpust, StateStrings.CpuMode.LTTV_CPU_UNKNOWN);
+//		else
+//			cpust.getMode_stack().pop();
+//	}
+//
+//	/* clears the stack and sets the state passed as argument */
+//	protected void cpu_set_base_mode(LTTngCPUState cpust,
+//			StateStrings.CpuMode state) {
+//		Stack<CpuMode> cpuStack = cpust.getMode_stack();
+//		cpuStack.clear();
+//		cpuStack.push(state);
+//	}
+//
+//	protected void bdev_pop_mode(LttngBdevState bdevst) {
+//		Stack<BdevMode> bdevModeStack = bdevst.getMode_stack();
+//		if (bdevModeStack.size() <= 1) {
+//			bdev_set_base_mode(bdevModeStack, BdevMode.LTTV_BDEV_UNKNOWN);
+//		} else {
+//			bdevModeStack.pop();
+//		}
+//
+//	}
+//
+//	protected void bdev_set_base_mode(Stack<BdevMode> bdevModeStack,
+//			BdevMode state) {
+//		bdevModeStack.clear();
+//		bdevModeStack.push(state);
+//	}
+//
+//	/**
+//	 * Push a new received function pointer to the user_stack
+//	 * 
+//	 * @param traceSt
+//	 * @param funcptr
+//	 * @param cpu
+//	 */
+//	protected void push_function(LttngTraceState traceSt, Long funcptr, Long cpu) {
+//		// Get the related process
+//		LttngProcessState process = traceSt.getRunning_process().get(cpu);
+//
+//		// get the user_stack
+//		Stack<Long> user_stack = process.getUser_stack();
+//
+//		// update stack
+//		user_stack.push(funcptr);
+//
+//		// update the pointer to the current function on the corresponding
+//		// process
+//		process.setCurrent_function(funcptr);
+//	}
+//
+//	protected void pop_function(LttngTraceState traceSt, LttngEvent trcEvent,
+//			Long funcptr) {
+//		Long cpu = trcEvent.getCpuId();
+//		// LttvTraceState *ts = (LttvTraceState*)tfs->parent.t_context;
+//		// LttvProcessState *process = ts->running_process[cpu];
+//		LttngProcessState process = traceSt.getRunning_process().get(cpu);
+//		Long curr_function = process.getCurrent_function();
+//		if (curr_function != null && curr_function != funcptr) {
+//			TraceDebug.debug("Different functions: " + funcptr + " current: "
+//					+ curr_function + " time stamp: "
+//					+ trcEvent.getTimestamp().toString());
+//
+//			// g_info("Different functions (%lu.%09lu): ignore it\n",
+//			// tfs->parent.timestamp.tv_sec, tfs->parent.timestamp.tv_nsec);
+//			// g_info("process state has %" PRIu64 " when pop_function is %"
+//			// PRIu64
+//			// "\n",
+//			// process->current_function, funcptr);
+//			// g_info("{ %u, %u, %s, %s, %s }\n",
+//			// process->pid,
+//			// process->ppid,
+//			// g_quark_to_string(process->name),
+//			// g_quark_to_string(process->brand),
+//			// g_quark_to_string(process->state->s));
+//			return;
+//		}
+//
+//		Stack<Long> user_stack = process.getUser_stack();
+//		if (user_stack.size() == 0) {
+//			TraceDebug
+//					.debug("Trying to pop last function in stack. Ignored.  Time Stamp: "
+//							+ trcEvent.getTimestamp());
+//			return;
+//		}
+//		user_stack.pop();
+//		process.setCurrent_function(user_stack.peek());
+//	}
+//
+//	// ========================================================================
+//	// General methods
+//	// =======================================================================
+//	/**
+//	 * protected method used when only one Field is expected with Type "Long" if
+//	 * the number of fields is greater, the first field is returned and a
+//	 * tracing message is sent Null is returned if the value could not be
+//	 * extracted.
+//	 * 
+//	 * @param trcEvent
+//	 * @param traceSt
+//	 * @param expectedNumFields
+//	 * @return
+//	 */
+//	protected Long getDField(LttngEvent trcEvent, LttngTraceState traceSt,
+//			Fields expectedField) {
+//		Long fieldVal = null;
+//		TmfEventField[] fields = trcEvent.getContent().getFields();
+//		String[] fieldLabels = trcEvent.getContent().getFormat().getLabels();
+//
+//		// Only one field expected
+//		if (fields.length != 1 || fieldLabels.length != 1) {
+//			StringBuilder sb = new StringBuilder(
+//					"Unexpected number of fields received: " + fields.length
+//							+ " for Event: " + trcEvent.getMarkerName() + "\n\t\tFields: ");
+//
+//			for (TmfEventField field : fields) {
+//				sb.append(((LttngEventField)field).getName() + " ");				
+//			}
+//
+//			TraceDebug.debug(sb.toString());
+//			if (fields.length == 0) {
+//				return null;
+//			}
+//		}
+//
+//		LttngEventField field = (LttngEventField) fields[0];
+//		String fieldname = field.getName();
+//		String expectedFieldName = expectedField.getInName();
+//		if (fieldname.equals(expectedFieldName)) {
+//			Object fieldObj = field.getValue();
+//			if (fieldObj instanceof Long) {
+//				// Expected value found
+//				fieldVal = (Long) field.getValue();
+//			} else {
+//				if (TraceDebug.isDEBUG()) {
+//					TraceDebug
+//							.debug("Unexpected field Type. Expected: Long, Received: "
+//									+ fieldObj.getClass().getSimpleName());
+//				}
+//				return null;
+//			}
+//		} else {
+//			TraceDebug.debug("Unexpected field received: " + fieldname
+//					+ " Expected: " + expectedFieldName);
+//			return null;
+//		}
+//
+//		return fieldVal;
+//	}
+//
+	/**
+	 * protected method used when a Field is requested among several available
+	 * fields and the expected type is Long
+	 * 
+	 * @param trcEvent
+	 * @param traceSt
+	 * @param expectedNumFields
+	 * @return
+	 */
+	protected Long getAFieldLong(LttngEvent trcEvent, LttngTraceState traceSt,
+			Fields expectedField) {
+		Long fieldVal = null;
+		TmfEventField[] fields = trcEvent.getContent().getFields();
+
+		// At least one field expected
+		if (fields.length == 0) {
+			TraceDebug.debug("Unexpected number of fields received: "
+					+ fields.length);
+			return null;
+		}
+
+		LttngEventField field;
+		String fieldname;
+		String expectedFieldName = expectedField.getInName();
+		for (int i = 0; i < fields.length; i++) {
+			field = (LttngEventField) fields[i];
+			fieldname = field.getId();
+			if (fieldname.equals(expectedFieldName)) {
+				Object fieldObj = field.getValue();
+				if (fieldObj instanceof Long) {
+					// Expected value found
+					fieldVal = (Long) field.getValue();
+					// if (expectedField == Fields.LTT_FIELD_TYPE) {
+					// TraceDebug.debug("Field Type value is: " + fieldVal);
+					// }
+					break;
+				} else {
+					if (TraceDebug.isDEBUG()) {
+						TraceDebug
+								.debug("Unexpected field Type. Expected: Long, Received: "
+										+ fieldObj.getClass().getSimpleName());
+					}
+					return null;
+				}
+			}
+		}
+
+		if (fieldVal == null) {
+			if (TraceDebug.isDEBUG()) {
+				sendNoFieldFoundMsg(fields, expectedFieldName);
+			}
+		}
+		return fieldVal;
+	}
+
+	/**
+	 * protected method used when a Field is requested among several available
+	 * fields and the expected type is String
+	 * 
+	 * @param trcEvent
+	 * @param traceSt
+	 * @param expectedNumFields
+	 * @return
+	 */
+	protected String getAFieldString(LttngEvent trcEvent,
+			LttngTraceState traceSt, Fields expectedField) {
+		String fieldVal = null;
+		TmfEventField[] fields = trcEvent.getContent().getFields();
+
+		// Only one field expected
+		if (fields.length == 0) {
+			TraceDebug.debug("Unexpected number of fields received: "
+					+ fields.length);
+			return null;
+		}
+
+		LttngEventField field;
+		String fieldname;
+		String expectedFieldName = expectedField.getInName();
+		for (int i = 0; i < fields.length; i++) {
+			field = (LttngEventField) fields[i];
+			fieldname = field.getId();
+			if (fieldname.equals(expectedFieldName)) {
+				Object fieldObj = field.getValue();
+				if (fieldObj instanceof String) {
+					// Expected value found
+					fieldVal = (String) field.getValue();
+					break;
+				} else {
+					if (TraceDebug.isDEBUG()) {
+						TraceDebug
+								.debug("Unexpected field Type. Expected: String, Received: "
+										+ fieldObj.getClass().getSimpleName());
+					}
+					return null;
+				}
+			}
+		}
+
+		if (fieldVal == null) {
+			if (TraceDebug.isDEBUG()) {
+				sendNoFieldFoundMsg(fields, expectedFieldName);
+			}
+		}
+		return fieldVal;
+	}
+
+	protected void sendNoFieldFoundMsg(TmfEventField[] fields,
+			String expectedFieldName) {
+		LttngEventField field;
+		StringBuilder sb = new StringBuilder("Field not found, requested: "
+				+ expectedFieldName);
+		sb.append(" number of fields: " + fields.length + "Fields: ");
+		for (int i = 0; i < fields.length; i++) {
+			field = (LttngEventField) fields[i];
+			sb.append(field.getId() + " ");
+		}
+
+		TraceDebug.debug(sb.toString(), 5);
+	}
+
+//	// Adaption from MKDEV macro
+//	protected Long mkdev(Long major, Long minor) {
+//		Long result = null;
+//		if (major != null && minor != null) {
+//			result = (major << 20) | minor;
+//		}
+//		return result;
+//	}
+//
+//	/*
+//	 * FIXME : this function should be called when we receive an event telling
+//	 * that release_task has been called in the kernel. In happens generally
+//	 * when the parent waits for its child terminaison, but may also happen in
+//	 * special cases in the child's exit : when the parent ignores its children
+//	 * SIGCCHLD or has the flag SA_NOCLDWAIT. It can also happen when the child
+//	 * is part of a killed thread group, but isn't the leader.
+//	 */
+//	protected boolean exit_process(LttngTraceState ts, LttngProcessState process) {
+//		/*
+//		 * Wait for both schedule with exit dead and process free to happen.
+//		 * They can happen in any order.
+//		 */
+//		process.incrementFree_events();
+//		if (process.getFree_events() < 2) {
+//			return false;
+//		}
+//
+//		process.getExecution_stack().clear();
+//		process.getUser_stack().clear();
+//		ts.getProcesses().remove(process);
+//
+//		return true;
+//	}
+//
+//	// LttvProcessState *
+//	// lttv_state_create_process(LttvTraceState *tcs, LttvProcessState *parent,
+//	// guint cpu, guint pid, guint tgid, GQuark name, const LttTime *timestamp)
+//	// {
+//	// LttvProcessState *process = g_new(LttvProcessState, 1);
+//	//
+//	// LttvExecutionState *es;
+//	//
+//	// char buffer[128];
+//	//
+//	// process->pid = pid;
+//	// process->tgid = tgid;
+//	// process->cpu = cpu;
+//	// process->name = name;
+//	// process->brand = LTTV_STATE_UNBRANDED;
+//	// //process->last_cpu = tfs->cpu_name;
+//	// //process->last_cpu_index =
+//	// ltt_tracefile_num(((LttvTracefileContext*)tfs)->tf);
+//	// process->type = LTTV_STATE_USER_THREAD;
+//	// process->usertrace = ltt_state_usertrace_find(tcs, pid, timestamp);
+//	// process->current_function = 0; //function 0x0 by default.
+//	//
+//	// g_info("Process %u, core %p", process->pid, process);
+//	// g_hash_table_insert(tcs->processes, process, process);
+//	//
+//	// if(parent) {
+//	// process->ppid = parent->pid;
+//	// process->creation_time = *timestamp;
+//	// }
+//	//
+//	// /* No parent. This process exists but we are missing all information
+//	// about
+//	// its creation. The birth time is set to zero but we remember the time of
+//	// insertion */
+//	//
+//	// else {
+//	// process->ppid = 0;
+//	// process->creation_time = ltt_time_zero;
+//	// }
+//	//
+//	// process->insertion_time = *timestamp;
+//	// sprintf(buffer,"%d-%lu.%lu",pid, process->creation_time.tv_sec,
+//	// process->creation_time.tv_nsec);
+//	// process->pid_time = g_quark_from_string(buffer);
+//	// process->cpu = cpu;
+//	// process->free_events = 0;
+//	// //process->last_cpu = tfs->cpu_name;
+//	// //process->last_cpu_index =
+//	// ltt_tracefile_num(((LttvTracefileContext*)tfs)->tf);
+//	// process->execution_stack = g_array_sized_new(FALSE, FALSE,
+//	// sizeof(LttvExecutionState), PREALLOCATED_EXECUTION_STACK);
+//	// process->execution_stack = g_array_set_size(process->execution_stack, 2);
+//	// es = process->state = &g_array_index(process->execution_stack,
+//	// LttvExecutionState, 0);
+//	// es->t = LTTV_STATE_USER_MODE;
+//	// es->n = LTTV_STATE_SUBMODE_NONE;
+//	// es->entry = *timestamp;
+//	// //g_assert(timestamp->tv_sec != 0);
+//	// es->change = *timestamp;
+//	// es->cum_cpu_time = ltt_time_zero;
+//	// es->s = LTTV_STATE_RUN;
+//	//
+//	// es = process->state = &g_array_index(process->execution_stack,
+//	// LttvExecutionState, 1);
+//	// es->t = LTTV_STATE_SYSCALL;
+//	// es->n = LTTV_STATE_SUBMODE_NONE;
+//	// es->entry = *timestamp;
+//	// //g_assert(timestamp->tv_sec != 0);
+//	// es->change = *timestamp;
+//	// es->cum_cpu_time = ltt_time_zero;
+//	// es->s = LTTV_STATE_WAIT_FORK;
+//	//	  
+//	// /* Allocate an empty function call stack. If it's empty, use 0x0. */
+//	// process->user_stack = g_array_sized_new(FALSE, FALSE,
+//	// sizeof(guint64), 0);
+//	//	  
+//	// return process;
+//	// }
+//
+//	/**
+//	 * Find the process matching the given pid and cpu
+//	 * 
+//	 * If cpu is 0, the cpu value is not matched and the selection is based on
+//	 * pid value only
+//	 * 
+//	 * @param ts
+//	 * @param cpu
+//	 * @param pid
+//	 * @return
+//	 */
+//	protected LttngProcessState lttv_state_find_process(LttngTraceState ts,
+//			Long cpu, Long pid) {
+//		// Define the return value
+//		LttngProcessState process = null;
+//
+//		// Obtain the list of available processes
+//		List<LttngProcessState> processList = ts.getProcesses();
+//
+//		// find the process matching pid and cpu,
+//		// TODO: This may need to be improved since the pid may be re-used and
+//		// the creation time may need to be considered
+//		for (LttngProcessState dprocess : processList) {
+//			if (dprocess.getPid() == pid) {
+//				if (dprocess.getCpu() == cpu || cpu == 0) {
+//					return process;
+//				}
+//			}
+//		}
+//
+//		return process;
+//	}
+//
+//	/**
+//	 * @param ts
+//	 * @param cpu
+//	 * @param pid
+//	 * @param timestamp
+//	 *            , Used when a new process is needed
+//	 * @return
+//	 */
+//	protected LttngProcessState lttv_state_find_process_or_create(
+//			LttngTraceState ts, Long cpu, Long pid, final TmfTimestamp timestamp) {
+//
+//		LttngProcessState process = lttv_state_find_process(ts, cpu, pid);
+//		/* Put ltt_time_zero creation time for unexisting processes */
+//		if (process == null) {
+//			process = create_process(ts, cpu, pid, 0L, timestamp);
+//		}
+//		return process;
+//	}
+//
+//	/**
+//	 * @param traceSt
+//	 * @param cpu
+//	 * @param pid
+//	 * @param tgid
+//	 * @param timestamp
+//	 * @return
+//	 */
+//	protected LttngProcessState create_process(LttngTraceState traceSt,
+//			Long cpu, Long pid, Long tgid, final TmfTimestamp timestamp) {
+//		LttngProcessState process = create_process(traceSt, cpu, pid, tgid,
+//				ProcessStatus.LTTV_STATE_UNNAMED.getInName(), timestamp);
+//		return process;
+//	}
+//
+//	/**
+//	 * @param traceSt
+//	 * @param cpu
+//	 * @param pid
+//	 * @param tgid
+//	 * @param name
+//	 * @param timestamp
+//	 * @return
+//	 */
+//	protected LttngProcessState create_process(LttngTraceState traceSt,
+//			Long cpu, Long pid, Long tgid, String name,
+//			final TmfTimestamp timestamp) {
+//		LttngProcessState process;
+//		process = new LttngProcessState(cpu, pid, tgid, name, timestamp);
+//		traceSt.getProcesses().add(process);
+//		return process;
+//	}
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTextTraceTest.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTextTraceTest.java
new file mode 100644
index 0000000..ae54f34
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTextTraceTest.java
@@ -0,0 +1,264 @@
+package org.eclipse.linuxtools.lttng.tests.trace;
+
+import java.io.File;
+import java.net.URL;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin;
+import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace;
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.trace.TmfLocation;
+
+/*
+ Functions tested here :
+ 	public LTTngTextTrace(String path) throws Exception
+    public LTTngTextTrace(String path, boolean skipIndexing) throws Exception
+    
+    public TmfTraceContext seekLocation(Object location) {
+    public TmfTraceContext seekEvent(TmfTimestamp timestamp) {
+    public TmfTraceContext seekEvent(long position) {
+    
+    public TmfEvent getNextEvent(TmfTraceContext context) {
+    public Object getCurrentLocation() {
+    
+    public LttngEvent parseEvent(TmfTraceContext context) {
+    
+    public int getCpuNumber() {
+ */
+
+public class LTTngTextTraceTest extends TestCase {
+	
+    private final static String tracepath1="traceset/trace-15316events_nolost_newformat.txt";
+    private final static String wrongTracePath="/somewhere/that/does/not/exist";
+    
+    private final static int 	traceCpuNumber=1;
+    
+    private final static boolean skipIndexing=true;
+    
+    private final static long   firstEventTimestamp = 13589759412128L;
+    private final static long   secondEventTimestamp = 13589759419903L;
+    private final static Long   locationAfterFirstEvent = 311L;
+    
+    private final static String tracename = "traceset/trace-15316events_nolost_newformat";
+    
+    private final static long	indexToSeekFirst = 0;
+    private final static Long   locationToSeekFirst = 0L;
+    private final static long   contextValueAfterFirstEvent = 13589759412128L;
+    private final static String firstEventReference = tracename + "/metadata_0";
+    
+    
+    private final static long   timestampToSeekTest1 = 13589826657302L;
+    private final static Long	indexToSeekTest1 = 7497L;
+    private final static long   locationToSeekTest1 = 2177044;
+    private final static long   contextValueAfterSeekTest1 = 13589826657302L;
+    private final static String seek1EventReference = tracename + "/vm_state_0"; 
+    
+    private final static long   timestampToSeekLast = 13589906758692L;
+    private final static Long	indexToSeekLast = 15315L;
+    private final static long   locationToSeekLast = 4420634;
+    private final static long   contextValueAfterSeekLast = 13589906758692L;
+    private final static String seekLastEventReference = tracename + "/kernel_0"; 
+
+    private static LTTngTextTrace testStream = null;
+    private LTTngTextTrace prepareStreamToTest() {
+		if (testStream == null) {
+			try {
+				URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(tracepath1), null);
+				File testfile = new File(FileLocator.toFileURL(location).toURI());
+				LTTngTextTrace tmpStream = new LTTngTextTrace(testfile.getPath());
+				testStream = tmpStream;
+			} 
+			catch (Exception e) {
+				System.out.println("ERROR : Could not open " + tracepath1);
+				testStream = null;
+			}
+		}
+		else {
+			testStream.seekEvent(0);
+		}
+		
+		
+		return testStream;
+	}
+
+    public void testTraceConstructors() {
+		@SuppressWarnings("unused")
+		LTTngTextTrace testStream1 = null;
+        
+		// Default constructor
+		// Test constructor with argument on a wrong tracepath, skipping indexing
+        try {
+        		testStream1 = new LTTngTextTrace(wrongTracePath, skipIndexing);
+                fail("Construction with wrong tracepath should fail!");
+        }
+        catch( Exception e) { 
+        }
+        
+        // Test constructor with argument on a correct tracepath, skipping indexing
+        try {
+            URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(tracepath1), null);
+            File testfile = new File(FileLocator.toFileURL(location).toURI());
+            testStream1 = new LTTngTextTrace(testfile.getPath(), skipIndexing);
+        }
+        catch( Exception e) {
+                fail("Construction with correct tracepath failed!");
+        }
+	}
+	
+	public void testGetNextEvent() {
+		TmfEvent tmpEvent = null;
+		LTTngTextTrace testStream1 = prepareStreamToTest();
+		
+		TmfContext tmpContext = new TmfContext(null, 0);
+		// We should be at the beginning of the trace, so we will just read the first event now
+		tmpEvent = testStream1.getNextEvent(tmpContext );
+		assertNotSame("tmpEvent is null after first getNextEvent()",null,tmpEvent );
+		assertEquals("tmpEvent has wrong timestamp after first getNextEvent()",firstEventTimestamp,(long)tmpEvent.getTimestamp().getValue() );
+		
+		// Read the next event as well
+		tmpEvent = testStream1.getNextEvent( tmpContext);
+		assertNotSame("tmpEvent is null after second getNextEvent()",null,tmpEvent );
+		assertEquals("tmpEvent has wrong timestamp after second getNextEvent()",secondEventTimestamp,(long)tmpEvent.getTimestamp().getValue() );
+	}
+	
+	public void testParseEvent() {
+		TmfEvent tmpEvent = null;
+		LTTngTextTrace testStream1 = prepareStreamToTest();
+		
+		TmfContext tmpContext = new TmfContext(null, 0);
+		// We should be at the beginning of the trace, so we will just parse the first event now
+		tmpEvent = testStream1.parseEvent(tmpContext );
+		assertNotSame("tmpEvent is null after first parseEvent()",null,tmpEvent );
+		assertEquals("tmpEvent has wrong timestamp after first parseEvent()",firstEventTimestamp,(long)tmpEvent.getTimestamp().getValue() );
+		
+		// Use parseEvent again. Should be the same event
+		tmpEvent = testStream1.parseEvent(tmpContext );
+		assertNotSame("tmpEvent is null after first parseEvent()",null,tmpEvent );
+		assertEquals("tmpEvent has wrong timestamp after first parseEvent()",firstEventTimestamp,(long)tmpEvent.getTimestamp().getValue() );
+	}
+	
+	public void testSeekEventTimestamp() {
+		TmfEvent tmpEvent = null;
+		TmfContext tmpContext = new TmfContext(null, 0);
+		LTTngTextTrace testStream1 = prepareStreamToTest();
+		
+		// We should be at the beginning of the trace, we will seek at a certain timestamp
+		tmpContext = testStream1.seekEvent(new TmfTimestamp(timestampToSeekTest1, (byte) -9, 0));
+		tmpEvent = testStream1.getNextEvent(tmpContext);
+		assertNotSame("tmpContext is null after first seekEvent()",null,tmpContext );
+		assertEquals("tmpContext has wrong timestamp after first seekEvent()",contextValueAfterSeekTest1,(long)((TmfTimestamp)tmpEvent.getTimestamp()).getValue() );
+		assertNotSame("tmpEvent is null after first seekEvent()",null,tmpEvent );
+		assertTrue("tmpEvent has wrong reference after first seekEvent()", ((String)tmpEvent.getReference().getReference()).contains(seek1EventReference) );
+		
+		// Seek to the last timestamp
+		tmpContext = testStream1.seekEvent(new TmfTimestamp(timestampToSeekLast, (byte) -9, 0));
+		tmpEvent = testStream1.getNextEvent(tmpContext);
+		assertNotSame("tmpContext is null after seekEvent() to last",null,tmpContext );
+		assertEquals("tmpContext has wrong timestamp after seekEvent() to last",contextValueAfterSeekLast,(long)((TmfTimestamp)tmpEvent.getTimestamp()).getValue() );
+		assertNotSame("tmpEvent is null after seekEvent() to last ",null,tmpEvent );
+		assertTrue("tmpEvent has wrong reference after seekEvent() to last",((String)tmpEvent.getReference().getReference()).contains(seekLastEventReference) );
+		
+		// Seek to the first timestamp (startTime)
+		tmpContext = testStream1.seekEvent(new TmfTimestamp(firstEventTimestamp, (byte) -9, 0));
+		tmpEvent = testStream1.getNextEvent(tmpContext);
+		assertNotSame("tmpEvent is null after seekEvent() to start ",null,tmpEvent );
+		assertTrue("tmpEvent has wrong reference after seekEvent() to start",((String)tmpEvent.getReference().getReference()).contains(firstEventReference) );
+		assertNotSame("tmpContext is null after seekEvent() to first",null,tmpContext );
+		assertEquals("tmpContext has wrong timestamp after seekEvent() to first",contextValueAfterFirstEvent,(long)((TmfTimestamp)tmpEvent.getTimestamp()).getValue() );
+	}
+	
+	public void testSeekEventIndex() {
+		TmfEvent tmpEvent = null;
+		TmfContext tmpContext = new TmfContext(null, 0);
+		LTTngTextTrace testStream1 = prepareStreamToTest();
+		
+		// We should be at the beginning of the trace, we will seek at a certain timestamp
+		tmpContext = testStream1.seekEvent(indexToSeekTest1);
+		tmpEvent = testStream1.getNextEvent(tmpContext);
+		assertNotSame("tmpContext is null after first seekEvent()",null,tmpContext );
+		assertEquals("tmpContext has wrong timestamp after first seekEvent()",contextValueAfterSeekTest1,(long)((TmfTimestamp)tmpEvent.getTimestamp()).getValue() );
+		assertNotSame("tmpEvent is null after first seekEvent()",null,tmpEvent );
+		assertTrue("tmpEvent has wrong reference after first seekEvent()", ((String)tmpEvent.getReference().getReference()).contains(seek1EventReference) );
+		
+		// Seek to the last timestamp
+		tmpContext = testStream1.seekEvent(indexToSeekLast);
+		tmpEvent = testStream1.getNextEvent(tmpContext);
+		assertNotSame("tmpContext is null after first seekEvent()",null,tmpContext );
+		assertEquals("tmpContext has wrong timestamp after first seekEvent()",contextValueAfterSeekLast,(long)((TmfTimestamp)tmpEvent.getTimestamp()).getValue() );
+		assertNotSame("tmpEvent is null after seekEvent() to last ",null,tmpEvent );
+		assertTrue("tmpEvent has wrong reference after seekEvent() to last",((String)tmpEvent.getReference().getReference()).contains(seekLastEventReference) );
+		
+		// Seek to the first timestamp (startTime)
+		tmpContext = testStream1.seekEvent(indexToSeekFirst);
+		tmpEvent = testStream1.getNextEvent(tmpContext);
+		assertNotSame("tmpContext is null after first seekEvent()",null,tmpContext );
+		assertEquals("tmpContext has wrong timestamp after first seekEvent()",contextValueAfterFirstEvent,(long)((TmfTimestamp)tmpEvent.getTimestamp()).getValue() );
+		assertNotSame("tmpEvent is null after seekEvent() to start ",null,tmpEvent );
+		assertTrue("tmpEvent has wrong reference after seekEvent() to start",((String)tmpEvent.getReference().getReference()).contains(firstEventReference) );
+	}
+	
+	public void testSeekLocation() {
+		TmfEvent tmpEvent = null;
+		TmfContext tmpContext = new TmfContext(null, 0);
+		LTTngTextTrace testStream1 = prepareStreamToTest();
+		
+		// We should be at the beginning of the trace, we will seek at a certain timestamp
+		tmpContext = testStream1.seekLocation(new TmfLocation<Long>(locationToSeekTest1));
+		tmpEvent = testStream1.getNextEvent(tmpContext);
+		assertNotSame("tmpContext is null after first seekLocation()",null,tmpContext );
+		assertEquals("tmpContext has wrong timestamp after first seekLocation()",contextValueAfterSeekTest1,(long)((TmfTimestamp)tmpEvent.getTimestamp()).getValue() );
+		assertNotSame("tmpEvent is null after first seekLocation()",null,tmpEvent );
+		assertTrue("tmpEvent has wrong reference after first seekLocation()", ((String)tmpEvent.getReference().getReference()).contains(seek1EventReference) );
+		
+		// Seek to the last timestamp
+		tmpContext = testStream1.seekLocation(new TmfLocation<Long>(locationToSeekLast));
+		tmpEvent = testStream1.getNextEvent(tmpContext);
+		assertNotSame("tmpContext is null after first seekLocation()",null,tmpContext );
+		assertEquals("tmpContext has wrong timestamp after first seekLocation()",contextValueAfterSeekLast,(long)((TmfTimestamp)tmpEvent.getTimestamp()).getValue() );
+		assertNotSame("tmpEvent is null after seekLocation() to last ",null,tmpEvent );
+		assertTrue("tmpEvent has wrong reference after seekLocation() to last",((String)tmpEvent.getReference().getReference()).contains(seekLastEventReference) );
+		
+		// Seek to the first timestamp (startTime)
+		tmpContext = testStream1.seekLocation(new TmfLocation<Long>(locationToSeekFirst));
+		tmpEvent = testStream1.getNextEvent(tmpContext);
+		assertNotSame("tmpContext is null after first seekLocation()",null,tmpContext );
+		assertEquals("tmpContext has wrong timestamp after first seekLocation()",contextValueAfterFirstEvent,(long)((TmfTimestamp)tmpEvent.getTimestamp()).getValue() );
+		assertNotSame("tmpEvent is null after seekLocation() to start ",null,tmpEvent );
+		assertTrue("tmpEvent has wrong reference after seekLocation() to start",((String)tmpEvent.getReference().getReference()).contains(firstEventReference) );
+	}
+	
+	@SuppressWarnings("unchecked")
+	public void testGetter() {
+    	TmfEvent tmpEvent = null;
+    	LTTngTextTrace testStream1 = prepareStreamToTest();
+    	TmfContext tmpContext = new TmfContext(null, 0);
+    	
+		// Move to the first event to have something to play with
+		tmpEvent = testStream1.parseEvent( tmpContext );
+		
+		// Test current event
+		assertNotSame("tmpEvent is null after first event",null,tmpEvent );
+		assertTrue("tmpEvent has wrong reference after first event",((String)tmpEvent.getReference().getReference()).contains(firstEventReference) );
+		assertNotSame("tmpContext is null after first seekEvent()",null,testStream1.getCurrentLocation() );
+		assertEquals("tmpContext has wrong timestamp after first seekEvent()",locationAfterFirstEvent, ((TmfLocation<Long>) testStream1.getCurrentLocation()).getLocation());
+		// Test CPU number of the trace
+		assertSame("getCpuNumber() return wrong number of cpu",traceCpuNumber ,testStream1.getCpuNumber() );
+    }
+    
+	public void testToString() {
+		LTTngTextTrace testStream1 = prepareStreamToTest();
+		
+		// Move to the first event to have something to play with
+		testStream1.parseEvent( new TmfContext(null, 0) );
+		
+		// Just make sure toString() does not return null or the java reference
+		assertNotSame("toString returned null",null, testStream1.toString() );
+		assertNotSame("toString is not overridded!", testStream1.getClass().getName() + '@' + Integer.toHexString(testStream1.hashCode()), testStream1.toString() );
+    }
+	
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTraceTest.java b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTraceTest.java
new file mode 100644
index 0000000..3717266
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTraceTest.java
@@ -0,0 +1,263 @@
+package org.eclipse.linuxtools.lttng.tests.trace;
+
+import java.io.File;
+import java.net.URL;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.lttng.event.LttngLocation;
+import org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin;
+import org.eclipse.linuxtools.lttng.trace.LTTngTrace;
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.trace.TmfContext;
+
+/*
+ Functions tested here :
+ 	public LTTngTrace(String path) throws Exception
+    public LTTngTrace(String path, boolean skipIndexing) throws Exception
+    
+    public TmfTraceContext seekLocation(Object location) {
+    public TmfTraceContext seekEvent(TmfTimestamp timestamp) {
+    public TmfTraceContext seekEvent(long position) {
+    
+    public TmfEvent getNextEvent(TmfTraceContext context) {
+    public Object getCurrentLocation() {
+    
+    public LttngEvent parseEvent(TmfTraceContext context) {
+    
+    public int getCpuNumber() {
+ */
+
+public class LTTngTraceTest extends TestCase {
+	
+    private final static String tracepath1="traceset/trace-15316events_nolost_newformat";
+    private final static String wrongTracePath="/somewhere/that/does/not/exist";
+    
+    private final static int 	traceCpuNumber=1;
+    
+    private final static boolean skipIndexing=true;
+    
+    private final static long   firstEventTimestamp = 13589759412128L;
+    private final static long   secondEventTimestamp = 13589759419903L;
+    private final static Long   locationAfterFirstEvent = 13589759412128L;
+    
+    private final static String tracename = "traceset/trace-15316events_nolost_newformat";
+    
+    private final static long	indexToSeekFirst = 0;
+    private final static Long   locationToSeekFirst = 13589759412128L;
+    private final static long   contextValueAfterFirstEvent = 13589759412128L;
+    private final static String firstEventReference = tracename + "/metadata_0";
+    
+    
+    private final static long   timestampToSeekTest1 = 13589826657302L;
+    private final static Long	indexToSeekTest1 = 7497L;
+    private final static long   locationToSeekTest1 = 13589826657302L;
+    private final static long   contextValueAfterSeekTest1 = 13589826657302L;
+    private final static String seek1EventReference = tracename + "/vm_state_0"; 
+    
+    private final static long   timestampToSeekLast = 13589906758692L;
+    private final static Long	indexToSeekLast = 15315L;
+    private final static long   locationToSeekLast = 13589906758692L;
+    private final static long   contextValueAfterSeekLast = 13589906758692L;
+    private final static String seekLastEventReference = tracename + "/kernel_0"; 
+
+    private static LTTngTrace testStream = null;
+    private LTTngTrace prepareStreamToTest() {
+		if (testStream == null) {
+			try {
+				URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(tracepath1), null);
+				File testfile = new File(FileLocator.toFileURL(location).toURI());
+				LTTngTrace tmpStream = new LTTngTrace(testfile.getPath());
+				testStream = tmpStream;
+			} 
+			catch (Exception e) {
+				System.out.println("ERROR : Could not open " + tracepath1);
+				testStream = null;
+			}
+		}
+		else {
+			testStream.seekEvent(0L);
+		}
+		
+		
+		return testStream;
+	}
+
+    public void testTraceConstructors() {
+		@SuppressWarnings("unused")
+		LTTngTrace testStream1 = null;
+        
+		// Default constructor
+		// Test constructor with argument on a wrong tracepath, skipping indexing
+        try {
+        		testStream1 = new LTTngTrace(wrongTracePath, skipIndexing);
+                fail("Construction with wrong tracepath should fail!");
+        }
+        catch( Exception e) { 
+        }
+        
+        // Test constructor with argument on a correct tracepath, skipping indexing
+        try {
+            URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(tracepath1), null);
+            File testfile = new File(FileLocator.toFileURL(location).toURI());
+            testStream1 = new LTTngTrace(testfile.getPath(), skipIndexing);
+        }
+        catch( Exception e) {
+                fail("Construction with correct tracepath failed!");
+        }
+	}
+	
+	public void testGetNextEvent() {
+		TmfEvent tmpEvent = null;
+		LTTngTrace testStream1 = prepareStreamToTest();
+		
+		TmfContext tmpContext = new TmfContext(null, 0);
+		// We should be at the beginning of the trace, so we will just read the first event now
+		tmpEvent = testStream1.getNextEvent(tmpContext );
+		assertNotSame("tmpEvent is null after first getNextEvent()",null,tmpEvent );
+		assertEquals("tmpEvent has wrong timestamp after first getNextEvent()",firstEventTimestamp,(long)tmpEvent.getTimestamp().getValue() );
+		
+		// Read the next event as well
+		tmpEvent = testStream1.getNextEvent( tmpContext);
+		assertNotSame("tmpEvent is null after second getNextEvent()",null,tmpEvent );
+		assertEquals("tmpEvent has wrong timestamp after second getNextEvent()",secondEventTimestamp,(long)tmpEvent.getTimestamp().getValue() );
+	}
+	
+	public void testParseEvent() {
+		TmfEvent tmpEvent = null;
+		LTTngTrace testStream1 = prepareStreamToTest();
+		
+		TmfContext tmpContext = new TmfContext(null, 0);
+		// We should be at the beginning of the trace, so we will just parse the first event now
+		tmpEvent = testStream1.parseEvent(tmpContext );
+		assertNotSame("tmpEvent is null after first parseEvent()",null,tmpEvent );
+		assertEquals("tmpEvent has wrong timestamp after first parseEvent()",firstEventTimestamp,(long)tmpEvent.getTimestamp().getValue() );
+		
+		// Use parseEvent again. Should be the same event
+		tmpEvent = testStream1.parseEvent(tmpContext );
+		assertNotSame("tmpEvent is null after first parseEvent()",null,tmpEvent );
+		assertEquals("tmpEvent has wrong timestamp after first parseEvent()",firstEventTimestamp,(long)tmpEvent.getTimestamp().getValue() );
+	}
+	
+	public void testSeekEventTimestamp() {
+		TmfEvent tmpEvent = null;
+		TmfContext tmpContext = new TmfContext(null, 0);
+		LTTngTrace testStream1 = prepareStreamToTest();
+		
+		// We should be at the beginning of the trace, we will seek at a certain timestamp
+		tmpContext = testStream1.seekEvent(new TmfTimestamp(timestampToSeekTest1, (byte) -9, 0));
+		tmpEvent = testStream1.getNextEvent(tmpContext);
+		assertNotSame("tmpContext is null after first seekEvent()",null,tmpContext );
+		assertEquals("tmpContext has wrong timestamp after first seekEvent()",contextValueAfterSeekTest1,(long)((TmfTimestamp)tmpEvent.getTimestamp()).getValue() );
+		assertNotSame("tmpEvent is null after first seekEvent()",null,tmpEvent );
+		assertTrue("tmpEvent has wrong reference after first seekEvent()", ((String)tmpEvent.getReference().getReference()).contains(seek1EventReference) );
+		
+		// Seek to the last timestamp
+		tmpContext = testStream1.seekEvent(new TmfTimestamp(timestampToSeekLast, (byte) -9, 0));
+		tmpEvent = testStream1.getNextEvent(tmpContext);
+		assertNotSame("tmpContext is null after seekEvent() to last",null,tmpContext );
+		assertEquals("tmpContext has wrong timestamp after seekEvent() to last",contextValueAfterSeekLast,(long)((TmfTimestamp)tmpEvent.getTimestamp()).getValue() );
+		assertNotSame("tmpEvent is null after seekEvent() to last ",null,tmpEvent );
+		assertTrue("tmpEvent has wrong reference after seekEvent() to last",((String)tmpEvent.getReference().getReference()).contains(seekLastEventReference) );
+		
+		// Seek to the first timestamp (startTime)
+		tmpContext = testStream1.seekEvent(new TmfTimestamp(firstEventTimestamp, (byte) -9, 0));
+		tmpEvent = testStream1.getNextEvent(tmpContext);
+		assertNotSame("tmpEvent is null after seekEvent() to start ",null,tmpEvent );
+		assertTrue("tmpEvent has wrong reference after seekEvent() to start",((String)tmpEvent.getReference().getReference()).contains(firstEventReference) );
+		assertNotSame("tmpContext is null after seekEvent() to first",null,tmpContext );
+		assertEquals("tmpContext has wrong timestamp after seekEvent() to first",contextValueAfterFirstEvent,(long)((TmfTimestamp)tmpEvent.getTimestamp()).getValue() );
+	}
+	
+	public void testSeekEventIndex() {
+		TmfEvent tmpEvent = null;
+		TmfContext tmpContext = new TmfContext(null, 0);
+		LTTngTrace testStream1 = prepareStreamToTest();
+		
+		// We should be at the beginning of the trace, we will seek at a certain timestamp
+		tmpContext = testStream1.seekEvent(indexToSeekTest1);
+		tmpEvent = testStream1.getNextEvent(tmpContext);
+		assertNotSame("tmpContext is null after first seekEvent()",null,tmpContext );
+		assertEquals("tmpContext has wrong timestamp after first seekEvent()",contextValueAfterSeekTest1,(long)((TmfTimestamp)tmpEvent.getTimestamp()).getValue() );
+		assertNotSame("tmpEvent is null after first seekEvent()",null,tmpEvent );
+		assertTrue("tmpEvent has wrong reference after first seekEvent()", ((String)tmpEvent.getReference().getReference()).contains(seek1EventReference) );
+		
+		// Seek to the last timestamp
+		tmpContext = testStream1.seekEvent(indexToSeekLast);
+		tmpEvent = testStream1.getNextEvent(tmpContext);
+		assertNotSame("tmpContext is null after first seekEvent()",null,tmpContext );
+		assertEquals("tmpContext has wrong timestamp after first seekEvent()",contextValueAfterSeekLast,(long)((TmfTimestamp)tmpEvent.getTimestamp()).getValue() );
+		assertNotSame("tmpEvent is null after seekEvent() to last ",null,tmpEvent );
+		assertTrue("tmpEvent has wrong reference after seekEvent() to last",((String)tmpEvent.getReference().getReference()).contains(seekLastEventReference) );
+		
+		// Seek to the first timestamp (startTime)
+		tmpContext = testStream1.seekEvent(indexToSeekFirst);
+		tmpEvent = testStream1.getNextEvent(tmpContext);
+		assertNotSame("tmpContext is null after first seekEvent()",null,tmpContext );
+		assertEquals("tmpContext has wrong timestamp after first seekEvent()",contextValueAfterFirstEvent,(long)((TmfTimestamp)tmpEvent.getTimestamp()).getValue() );
+		assertNotSame("tmpEvent is null after seekEvent() to start ",null,tmpEvent );
+		assertTrue("tmpEvent has wrong reference after seekEvent() to start",((String)tmpEvent.getReference().getReference()).contains(firstEventReference) );
+	}
+	
+	public void testSeekLocation() {
+		TmfEvent tmpEvent = null;
+		TmfContext tmpContext = new TmfContext(null, 0);
+		LTTngTrace testStream1 = prepareStreamToTest();
+		
+		// We should be at the beginning of the trace, we will seek at a certain timestamp
+		tmpContext = testStream1.seekLocation(new LttngLocation(locationToSeekTest1));
+		tmpEvent = testStream1.getNextEvent(tmpContext);
+		assertNotSame("tmpContext is null after first seekLocation()",null,tmpContext );
+		assertEquals("tmpContext has wrong timestamp after first seekLocation()",contextValueAfterSeekTest1,(long)((TmfTimestamp)tmpEvent.getTimestamp()).getValue() );
+		assertNotSame("tmpEvent is null after first seekLocation()",null,tmpEvent );
+		assertTrue("tmpEvent has wrong reference after first seekLocation()", ((String)tmpEvent.getReference().getReference()).contains(seek1EventReference) );
+		
+		// Seek to the last timestamp
+		tmpContext = testStream1.seekLocation(new LttngLocation(locationToSeekLast));
+		tmpEvent = testStream1.getNextEvent(tmpContext);
+		assertNotSame("tmpContext is null after first seekLocation()",null,tmpContext );
+		assertEquals("tmpContext has wrong timestamp after first seekLocation()",contextValueAfterSeekLast,(long)((TmfTimestamp)tmpEvent.getTimestamp()).getValue() );
+		assertNotSame("tmpEvent is null after seekLocation() to last ",null,tmpEvent );
+		assertTrue("tmpEvent has wrong reference after seekLocation() to last",((String)tmpEvent.getReference().getReference()).contains(seekLastEventReference) );
+		
+		// Seek to the first timestamp (startTime)
+		tmpContext = testStream1.seekLocation(new LttngLocation(locationToSeekFirst));
+		tmpEvent = testStream1.getNextEvent(tmpContext);
+		assertNotSame("tmpContext is null after first seekLocation()",null,tmpContext );
+		assertEquals("tmpContext has wrong timestamp after first seekLocation()",contextValueAfterFirstEvent,(long)((TmfTimestamp)tmpEvent.getTimestamp()).getValue() );
+		assertNotSame("tmpEvent is null after seekLocation() to start ",null,tmpEvent );
+		assertTrue("tmpEvent has wrong reference after seekLocation() to start",((String)tmpEvent.getReference().getReference()).contains(firstEventReference) );
+	}
+	
+	public void testGetter() {
+    	TmfEvent tmpEvent = null;
+    	LTTngTrace testStream1 = prepareStreamToTest();
+		
+		// Move to the first event to have something to play with
+		tmpEvent = testStream1.parseEvent( new TmfContext(null, 0));
+		
+		// Test current event
+		assertNotSame("tmpEvent is null after first event",null,tmpEvent );
+		assertTrue("tmpEvent has wrong reference after first event",((String)tmpEvent.getReference().getReference()).contains(firstEventReference) );
+		assertNotSame("tmpContext is null after first seekEvent()",null,testStream1.getCurrentLocation() );
+		assertTrue("tmpContext has wrong timestamp after first seekEvent()",locationAfterFirstEvent.equals( ((LttngLocation)testStream1.getCurrentLocation()).getOperationTimeValue()) );
+		
+		// Test CPU number of the trace
+		assertSame("getCpuNumber() return wrong number of cpu",traceCpuNumber ,testStream1.getCpuNumber() );
+    }
+    
+	public void testToString() {
+		LTTngTrace testStream1 = prepareStreamToTest();
+		
+		// Move to the first event to have something to play with
+		testStream1.parseEvent( new TmfContext(null, 0) );
+		
+		// Just make sure toString() does not return null or the java reference
+		assertNotSame("toString returned null",null, testStream1.toString() );
+		assertNotSame("toString is not overridded!", testStream1.getClass().getName() + '@' + Integer.toHexString(testStream1.hashCode()), testStream1.toString() );
+    }
+	
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/test.xml b/lttng/org.eclipse.linuxtools.lttng.tests/test.xml
new file mode 100644
index 0000000..af6ee8d
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/test.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+
+<project name="testsuite" default="run" basedir=".">
+	<property name="classname" value="org.eclipse.linuxtools.lttng.tests" />
+	<property name="lttng-event-test-suite-classname" value="org.eclipse.linuxtools.lttng.tests.event.AllLttngTests" />
+	<property name="lttng-jni-test-suite-classname" value="org.eclipse.linuxtools.lttng.tests.jni.AllJniTests" />
+	<property name="plugin-name" value="org.eclipse.linuxtools.lttng.tests" />
+
+	<!-- The property ${eclipse-home} should be passed into this script -->
+	<!-- Set a meaningful default value for when it is not. -->
+	<property name="eclipse-home" value="${basedir}/../../" />
+
+	<property name="library-file" value="${eclipse-home}/dropins/${subProjectName2}/plugins/org.eclipse.test/library.xml" />
+
+	<!-- This target holds all initialization code that needs to be done for -->
+	<!-- all tests that are to be run. Initialization for individual tests -->
+	<!-- should be done within the body of the suite target. -->
+	<target name="init">
+		<tstamp />
+		<delete>
+			<fileset dir="${eclipse-home}" includes="org*.xml" />
+		</delete>
+	</target>
+
+	<!-- This target defines the tests that need to be run. -->
+	<target name="lttng_event_test_suite">
+		<property name="lttng-folder" value="${eclipse-home}/lttng_folder" />
+		<delete dir="${lttng-folder}" quiet="true" />
+		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="data-dir" value="${lttng-folder}" />
+			<property name="plugin-name" value="${plugin-name}" />
+			<property name="classname" value="${lttng-event-test-suite-classname}" />
+		</ant>
+	</target>
+
+	<target name="lttng_jni_test_suite">
+		<property name="lttng-folder" value="${eclipse-home}/lttng_folder" />
+		<delete dir="${lttng-folder}" quiet="true" />
+		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="data-dir" value="${lttng-folder}" />
+			<property name="plugin-name" value="${plugin-name}" />
+			<property name="classname" value="${lttng-jni-test-suite-classname}" />
+		</ant>
+	</target>
+
+	<!-- This target holds code to cleanup the testing environment after  -->
+	<!-- all of the tests have been run. You can use this target to -->
+	<!-- delete temporary files that have been created. -->
+	<target name="cleanup">
+		<mkdir dir="${results}/consolelogs" />
+		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
+	</target>
+
+	<!-- This target runs the test suite. Any actions that need to happen -->
+	<!-- after all the tests have been run should go here. -->
+	<target name="run" depends="init,lttng_event_test_suite,cleanup">
+		<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="includes" value="org*.xml" />
+			<property name="output-file" value="${plugin-name}.xml" />
+		</ant>
+	</target>
+
+    <target name="all" depends="run" description="Dummy target to run all tests">
+    </target>
+
+</project>
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat.tar.gz b/lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat.tar.gz
new file mode 100644
index 0000000..5b26f78
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat.tar.gz
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat.txt b/lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat.txt
new file mode 100644
index 0000000..7bfa8c2
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat.txt
@@ -0,0 +1,15320 @@
+Trace set contains 1 traces
+
+metadata.core_marker_id: 13589.759412128 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "vm_state", name = "vm_map", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759419903 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "vm_state", name = "vm_map", format = "pid %d start %lu end %lu flags %lu pgoff %lu inode %lu" }
+metadata.core_marker_id: 13589.759422785 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "page_fault_get_user_entry", event_id = 43, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759425598 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "page_fault_get_user_entry", format = "address #p%lu write_access #1u%u" }
+metadata.core_marker_id: 13589.759430979 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "swap_out", event_id = 7, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759433694 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "swap_out", format = "pfn %lu filp %p offset %lu" }
+metadata.core_marker_id: 13589.759436212 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "unplug_io", event_id = 20, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759438797 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "unplug_io", format = "pdu %u" }
+metadata.core_marker_id: 13589.759441253 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "bio_frontmerge", event_id = 13, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759444795 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "bio_frontmerge", format = "sector %llu size %u rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) %lX not_uptodate #1u%d" }
+metadata.core_marker_id: 13589.759447800 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "bio_complete", event_id = 11, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759450836 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "bio_complete", format = "sector %llu size %u rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) %lX not_uptodate #1u%d" }
+metadata.core_marker_id: 13589.759453835 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_issue_fs", event_id = 5, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759459351 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_issue_fs", format = "hard_sector %llu rw %d errors %d" }
+metadata.core_marker_id: 13589.759464411 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "llseek", event_id = 7, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759467021 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "llseek", format = "fd %u offset %lld origin %u" }
+metadata.core_marker_id: 13589.759469668 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_getpeername", event_id = 8, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759474938 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_getpeername", format = "fd %d usockaddr %p usockaddr_len %p ret %d" }
+metadata.core_marker_id: 13589.759477536 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "getrq_bio", event_id = 15, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759480485 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "getrq_bio", format = "sector %llu size %u rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) %lX not_uptodate #1u%d" }
+metadata.core_marker_id: 13589.759483682 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "netif_state", name = "insert_ifa_ipv4", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759486434 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "netif_state", name = "insert_ifa_ipv4", format = "label %s address #4u%u" }
+metadata.core_marker_id: 13589.759489395 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_socketpair", event_id = 9, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759495029 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_socketpair", format = "family %d type %d protocol %d usockvec %p ret %d" }
+metadata.core_marker_id: 13589.759497793 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "process_wait", event_id = 24, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759500410 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "process_wait", format = "pid %d" }
+metadata.core_marker_id: 13589.759502996 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "split", event_id = 22, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759505945 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "split", format = "sector %llu size %u rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) %lX not_uptodate #1u%d pdu %u" }
+metadata.core_marker_id: 13589.759508950 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fd_state", name = "file_descriptor", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759511640 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fd_state", name = "file_descriptor", format = "filename %s pid %d fd %u" }
+metadata.core_marker_id: 13589.759514145 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "page_fault_nosem_exit", event_id = 42, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759516725 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "page_fault_nosem_exit", format = " " }
+metadata.core_marker_id: 13589.759519199 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "page_fault_entry", event_id = 39, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759522006 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "page_fault_entry", format = "ip #p%lu address #p%lu trap_id #2u%u write_access #1u%u" }
+metadata.core_marker_id: 13589.759524704 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "timer_set", event_id = 29, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759527295 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "timer_set", format = "expires %lu function %p data %lu" }
+metadata.core_marker_id: 13589.759529806 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "irq_entry", event_id = 4, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759535453 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "irq_entry", format = "ip %lu handler %p irq_id #2u%u kernel_mode #1u%u" }
+metadata.core_marker_id: 13589.759538112 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "unplug_timer", event_id = 21, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759540802 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "unplug_timer", format = "pdu %u" }
+metadata.core_marker_id: 13589.759543370 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "timer_itimer_set", event_id = 28, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759546128 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "timer_itimer_set", format = "which %d interval_sec %ld interval_usec %ld value_sec %ld value_usec %ld" }
+metadata.core_marker_id: 13589.759548842 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "bio_backmerge", event_id = 12, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759551748 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "bio_backmerge", format = "sector %llu size %u rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) %lX not_uptodate #1u%d" }
+metadata.core_marker_id: 13589.759554878 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "irq_exit", event_id = 6, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759557420 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "irq_exit", format = "handled #1u%u" }
+metadata.core_marker_id: 13589.759559869 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_getsockopt", event_id = 13, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759565429 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_getsockopt", format = "fd %d level %d optname %d optval %p optlen %p ret %d" }
+metadata.core_marker_id: 13589.759568187 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "tasklet_high_entry", event_id = 12, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759570859 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "tasklet_high_entry", format = "func %p data %lu" }
+metadata.core_marker_id: 13589.759573309 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "huge_page_alloc", event_id = 3, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759576246 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "huge_page_alloc", format = "pfn %lu" }
+metadata.core_marker_id: 13589.759578652 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "send_signal", event_id = 21, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759581200 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "send_signal", format = "pid %d signal %d" }
+metadata.core_marker_id: 13589.759583663 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_issue_pc", event_id = 4, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759586310 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_issue_pc", format = "data_len %u rw %d errors %d" }
+metadata.core_marker_id: 13589.759588926 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "rcu", name = "tree_call_rcu_bh", event_id = 2, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759591555 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "rcu", name = "tree_call_rcu_bh", format = "func %p ip 0x%lX" }
+metadata.core_marker_id: 13589.759593987 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_abort_pc", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759596609 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_abort_pc", format = "data_len %u rw %d errors %d" }
+metadata.core_marker_id: 13589.759599237 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "trap_entry", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759601810 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "trap_entry", format = "ip #p%ld trap_id #2u%u" }
+metadata.core_marker_id: 13589.759604284 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "page_free", event_id = 4, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759606784 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "page_free", format = "pfn %lu order %u" }
+metadata.core_marker_id: 13589.759609178 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "pwrite64", event_id = 11, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759611874 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "pwrite64", format = "fd %u count %zu pos %llu" }
+metadata.core_marker_id: 13589.759614280 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "pread64", event_id = 10, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759617163 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "pread64", format = "fd %u count %zu pos %llu" }
+metadata.core_marker_id: 13589.759619618 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "open", event_id = 4, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759622080 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "open", format = "fd %d filename %s" }
+metadata.core_marker_id: 13589.759624444 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "remap", event_id = 23, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759627394 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "remap", format = "device_from %lu sector_from %llu device_to %lu size %u rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) %lX not_uptodate #1u%d" }
+metadata.core_marker_id: 13589.759630398 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_complete_fs", event_id = 9, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759633070 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_complete_fs", format = "hard_sector %llu rw %d errors %d" }
+metadata.core_marker_id: 13589.759635693 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "panic", event_id = 36, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759638161 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "panic", format = "info %s" }
+metadata.core_marker_id: 13589.759640518 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "softirq_raise", event_id = 9, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759643091 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "softirq_raise", format = "softirq_id #1u%u" }
+metadata.core_marker_id: 13589.759645566 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "trap_exit", event_id = 1, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759648182 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "trap_exit", format = " " }
+metadata.core_marker_id: 13589.759650595 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "rcu", name = "tree_call_rcu", event_id = 1, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759653125 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "rcu", name = "tree_call_rcu", format = "func %p ip 0x%lX" }
+metadata.core_marker_id: 13589.759655555 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_requeue_fs", event_id = 7, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759658592 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_requeue_fs", format = "hard_sector %llu rw %d errors %d" }
+metadata.core_marker_id: 13589.759661140 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "tasklet_low_entry", event_id = 10, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759663719 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "tasklet_low_entry", format = "func %p data %lu" }
+metadata.core_marker_id: 13589.759666637 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "remove_from_page_cache", event_id = 11, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759669359 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "remove_from_page_cache", format = "inode %lu sdev %u" }
+metadata.core_marker_id: 13589.759671833 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "swap_file_close", event_id = 8, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759674320 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "swap_file_close", format = "filp %p" }
+metadata.core_marker_id: 13589.759676678 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "lseek", event_id = 6, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759679201 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "lseek", format = "fd %u offset %ld origin %u" }
+metadata.core_marker_id: 13589.759681608 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "ipc", name = "call", event_id = 3, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759684168 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "ipc", name = "call", format = "call %u first %d" }
+metadata.core_marker_id: 13589.759686551 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "bio_queue", event_id = 14, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759689537 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "bio_queue", format = "sector %llu size %u rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) %lX not_uptodate #1u%d" }
+metadata.core_marker_id: 13589.759692505 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "timer_update_time", event_id = 30, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759695455 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "timer_update_time", format = "jiffies #8u%llu xtime_sec %ld xtime_nsec %ld walltomonotonic_sec %ld walltomonotonic_nsec %ld" }
+metadata.core_marker_id: 13589.759698299 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_bind", event_id = 3, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759701286 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_bind", format = "fd %d umyaddr %p addrlen %d ret %d" }
+metadata.core_marker_id: 13589.759703772 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "bio_bounce", event_id = 10, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759706660 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "bio_bounce", format = "sector %llu size %u rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) %lX not_uptodate #1u%d" }
+metadata.core_marker_id: 13589.759709536 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_complete_pc", event_id = 8, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759712090 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_complete_pc", format = "data_len %u rw %d errors %d" }
+metadata.core_marker_id: 13589.759714706 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "tasklet_low_exit", event_id = 11, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759717311 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "tasklet_low_exit", format = "func %p data %lu" }
+metadata.core_marker_id: 13589.759719785 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "jbd2", name = "end_commit", event_id = 2, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759722420 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "jbd2", name = "end_commit", format = "dev %s transaction %d head %d" }
+metadata.core_marker_id: 13589.759725005 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "readv", event_id = 12, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759727548 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "readv", format = "fd %lu vlen %lu" }
+metadata.core_marker_id: 13589.759729954 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_listen", event_id = 5, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759732478 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_listen", format = "fd %d backlog %d ret %d" }
+metadata.core_marker_id: 13589.759735087 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "huge_page_free", event_id = 2, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759737643 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "huge_page_free", format = "pfn %lu" }
+metadata.core_marker_id: 13589.759740000 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "getrq", event_id = 16, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759742875 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "getrq", format = "rw %d" }
+metadata.core_marker_id: 13589.759745319 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "module_load", event_id = 35, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759747830 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "module_load", format = "name %s" }
+metadata.core_marker_id: 13589.759750200 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "dev_xmit", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759752779 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "dev_xmit", format = "skb %p protocol #n2u%hu" }
+metadata.core_marker_id: 13589.759755340 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "softirq_exit", event_id = 8, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759757919 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "softirq_exit", format = "softirq_id #1u%lu" }
+metadata.core_marker_id: 13589.759760369 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "select", event_id = 14, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759765607 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "select", format = "fd %d end_time_sec %ld end_time_nsec %ld" }
+metadata.core_marker_id: 13589.759768162 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_requeue_pc", event_id = 6, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759770760 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_requeue_pc", format = "data_len %u rw %d errors %d" }
+metadata.core_marker_id: 13589.759773259 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "pm", name = "idle_exit", event_id = 1, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759775893 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "pm", name = "idle_exit", format = "irqstate #1%d" }
+metadata.core_marker_id: 13589.759778350 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "timer_itimer_expired", event_id = 27, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759780935 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "timer_itimer_expired", format = "pid %d" }
+metadata.core_marker_id: 13589.759783761 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "sched_wait_task", event_id = 16, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759786489 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "sched_wait_task", format = "pid %d state #2d%ld" }
+metadata.core_marker_id: 13589.759788988 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "syscall_exit", event_id = 3, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759791517 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "syscall_exit", format = "ret %ld" }
+metadata.core_marker_id: 13589.759794116 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "swap_state", name = "statedump_swap_files", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759796849 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "swap_state", name = "statedump_swap_files", format = "filp %p vfsmount %p dname %s" }
+metadata.core_marker_id: 13589.759799502 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "printk", event_id = 32, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759802081 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "printk", format = "ip 0x%lX" }
+metadata.core_marker_id: 13589.759804444 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "pm", name = "idle_entry", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759806932 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "pm", name = "idle_entry", format = "irqstate #1%d" }
+metadata.core_marker_id: 13589.759809344 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_shutdown", event_id = 14, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759811979 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_shutdown", format = "fd %d how %d ret %d" }
+metadata.core_marker_id: 13589.759814447 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "kthread_stop_ret", event_id = 15, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759817051 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "kthread_stop_ret", format = "ret %d" }
+metadata.core_marker_id: 13589.759819587 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "kthread_stop", event_id = 14, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759822105 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "kthread_stop", format = "pid %d" }
+metadata.core_marker_id: 13589.759824857 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "close", event_id = 5, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759827295 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "close", format = "fd %u" }
+metadata.core_marker_id: 13589.759829633 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_create", event_id = 2, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759832274 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_create", format = "family %d type %d protocol %d sock %p ret %d" }
+metadata.core_marker_id: 13589.759835051 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "swap_in", event_id = 6, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759837561 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "swap_in", format = "pfn %lu filp %p offset %lu" }
+metadata.core_marker_id: 13589.759840018 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "wait_on_page_start", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759842603 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "wait_on_page_start", format = "pfn %lu bit_nr %d" }
+metadata.core_marker_id: 13589.759845065 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "buffer_wait_start", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759847682 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "buffer_wait_start", format = "bh %p" }
+metadata.core_marker_id: 13589.759850088 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_recvmsg", event_id = 11, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759852828 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_recvmsg", format = "sock %p msg %p size %zu flags %d ret %d" }
+metadata.core_marker_id: 13589.759855530 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "irq_state", name = "idt_table", event_id = 1, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759875961 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "irq_state", name = "idt_table", format = "irq %d address %p symbol %s" }
+metadata.core_marker_id: 13589.759878596 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "swap_file_open", event_id = 9, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759881398 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "swap_file_open", format = "filp %p filename %s" }
+metadata.core_marker_id: 13589.759884316 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "page_alloc", event_id = 5, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759886902 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "page_alloc", format = "pfn %lu order %u" }
+metadata.core_marker_id: 13589.759889338 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_abort_fs", event_id = 1, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759891986 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_abort_fs", format = "hard_sector %llu rw %d errors %d" }
+metadata.core_marker_id: 13589.759894769 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "irq_state", name = "interrupt", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759897422 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "irq_state", name = "interrupt", format = "name %s action %s irq_id %u" }
+metadata.core_marker_id: 13589.759900002 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "module_free", event_id = 34, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759902637 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "module_free", format = "name %s" }
+metadata.core_marker_id: 13589.759905135 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "wait_on_page_end", event_id = 1, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759907802 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "wait_on_page_end", format = "pfn %lu bit_nr %d" }
+metadata.core_marker_id: 13589.759910325 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "vprintk", event_id = 33, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759913071 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "vprintk", format = "loglevel #1u%u string %s ip 0x%lX" }
+metadata.core_marker_id: 13589.759915613 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "exec", event_id = 2, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759918261 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "exec", format = "filename %s" }
+metadata.core_marker_id: 13589.759920766 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "udpv4_rcv", event_id = 17, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759923456 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "udpv4_rcv", format = "skb %p" }
+metadata.core_marker_id: 13589.759926362 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_call", event_id = 15, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759928973 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_call", format = "call %d a0 %lu" }
+metadata.core_marker_id: 13589.759931558 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "ipc", name = "shm_create", event_id = 2, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759934156 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "ipc", name = "shm_create", format = "id %ld flags %d" }
+metadata.core_marker_id: 13589.759936605 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_connect", event_id = 4, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759939363 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_connect", format = "fd %d uservaddr %p addrlen %d ret %d" }
+metadata.core_marker_id: 13589.759941968 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "netif_state", name = "insert_ifa_ipv6", event_id = 2, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759945312 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "netif_state", name = "insert_ifa_ipv6", format = "label %s a15 #1x%c a14 #1x%c a13 #1x%c a12 #1x%c a11 #1x%c a10 #1x%c a9 #1x%c a8 #1x%c a7 #1x%c a6 #1x%c a5 #1x%c a4 #1x%c a3 #1x%c a2 #1x%c a1 #1x%c a0 #1x%c" }
+metadata.core_marker_id: 13589.759948410 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "pm", name = "suspend_entry", event_id = 2, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759951076 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "pm", name = "suspend_entry", format = "irqstate #1%d" }
+metadata.core_marker_id: 13589.759953624 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "sleeprq_bio", event_id = 17, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759956604 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "sleeprq_bio", format = "sector %llu size %u rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) %lX not_uptodate #1u%d" }
+metadata.core_marker_id: 13589.759963052 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_insert_fs", event_id = 3, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759965847 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_insert_fs", format = "hard_sector %llu rw %d errors %d" }
+metadata.core_marker_id: 13589.759968526 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "timer_timeout", event_id = 31, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759971488 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "timer_timeout", format = "pid %d" }
+metadata.core_marker_id: 13589.759974122 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "metadata", name = "core_marker_format", event_id = 1, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759977053 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "metadata", name = "core_marker_format", format = "channel %s name %s format %s" }
+metadata.core_marker_id: 13589.759979799 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "sched_schedule", event_id = 19, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759982588 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "sched_schedule", format = "prev_pid %d next_pid %d prev_state #2d%ld" }
+metadata.core_marker_id: 13589.759985278 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "kthread_create", event_id = 26, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759987919 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "kthread_create", format = "fn %p pid %d" }
+metadata.core_marker_id: 13589.759990339 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "write", event_id = 9, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759992776 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "write", format = "count %zu fd %u" }
+metadata.core_marker_id: 13589.759995114 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "ioctl", event_id = 3, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.759997552 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "ioctl", format = "fd %u cmd %u arg %lu" }
+metadata.core_marker_id: 13589.759999946 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "jbd2", name = "checkpoint", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760002667 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "jbd2", name = "checkpoint", format = "dev %s need_checkpoint %d" }
+metadata.core_marker_id: 13589.760005203 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "softirq_state", name = "softirq_vec", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760007912 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "softirq_state", name = "softirq_vec", format = "id %d address %p symbol %s" }
+metadata.core_marker_id: 13589.760010424 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "napi_complete", event_id = 20, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760013330 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "napi_complete", format = "napi_struct %p name %s" }
+metadata.core_marker_id: 13589.760015952 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "page_fault_get_user_exit", event_id = 44, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760018631 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "page_fault_get_user_exit", format = "res %d" }
+metadata.core_marker_id: 13589.760021130 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_setsockopt", event_id = 12, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760023900 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_setsockopt", format = "fd %d level %d optname %d optval %p optlen %d ret %d" }
+metadata.core_marker_id: 13589.760026522 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_accept", event_id = 6, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760029243 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_accept", format = "fd %d upeer_sockaddr %p upeer_addrlen %p flags %d ret %d" }
+metadata.core_marker_id: 13589.760031885 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "process_exit", event_id = 23, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760034439 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "process_exit", format = "pid %d" }
+metadata.core_marker_id: 13589.760036895 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "metadata", name = "core_marker_id", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760039790 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "metadata", name = "core_marker_id", format = "channel %s name %s event_id %hu int #1u%zu long #1u%zu pointer #1u%zu size_t #1u%zu alignment #1u%u" }
+metadata.core_marker_id: 13589.760042578 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "sleeprq", event_id = 18, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760045040 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "sleeprq", format = "rw %d" }
+metadata.core_marker_id: 13589.760047453 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "sched_wakeup_new_task", event_id = 18, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760050138 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "sched_wakeup_new_task", format = "pid %d state #2d%ld cpu_id %u" }
+metadata.core_marker_id: 13589.760052711 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "irq_next_handler", event_id = 5, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760055691 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "irq_next_handler", format = "handler %p prev_ret #1u%u" }
+metadata.core_marker_id: 13589.760058202 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "napi_poll", event_id = 19, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760060775 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "napi_poll", format = "napi_struct %p name %s" }
+metadata.core_marker_id: 13589.760063305 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "global_state", name = "statedump_end", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760065989 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "global_state", name = "statedump_end", format = " " }
+metadata.core_marker_id: 13589.760068439 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "task_state", name = "process_state", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760071216 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "task_state", name = "process_state", format = "pid %d parent_pid %d name %s type %d mode %d submode %d status %d tgid %d" }
+metadata.core_marker_id: 13589.760073956 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "buffer_wait_end", event_id = 1, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760076677 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "buffer_wait_end", format = "bh %p" }
+metadata.core_marker_id: 13589.760079052 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "dev_receive", event_id = 1, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760081638 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "dev_receive", format = "skb %p protocol #n2u%hu" }
+metadata.core_marker_id: 13589.760084322 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "syscall_state", name = "sys_call_table", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760086950 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "syscall_state", name = "sys_call_table", format = "id %d address %p symbol %s" }
+metadata.core_marker_id: 13589.760089610 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_getsockname", event_id = 7, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760092344 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_getsockname", format = "fd %d usockaddr %p usockaddr_len %p ret %d" }
+metadata.core_marker_id: 13589.760095003 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "pollfd", event_id = 15, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760097829 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "pollfd", format = "fd %d" }
+metadata.core_marker_id: 13589.760100149 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "writev", event_id = 13, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760102605 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "writev", format = "fd %lu vlen %lu" }
+metadata.core_marker_id: 13589.760105000 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "tcpv4_rcv", event_id = 16, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760107474 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "tcpv4_rcv", format = "skb %p" }
+metadata.core_marker_id: 13589.760109850 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_sendmsg", event_id = 10, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760112527 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_sendmsg", format = "sock %p msg %p size %zu ret %d" }
+metadata.core_marker_id: 13589.760115187 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "netif_state", name = "network_ip_interface", event_id = 4, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760117865 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "netif_state", name = "network_ip_interface", format = "name %s address #n4u%lu up %d" }
+metadata.core_marker_id: 13589.760120445 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "netif_state", name = "del_ifa_ipv4", event_id = 1, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760123104 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "netif_state", name = "del_ifa_ipv4", format = "label %s address #4u%u" }
+metadata.core_marker_id: 13589.760125572 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "userspace", name = "event", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760128077 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "userspace", name = "event", format = "string %s" }
+metadata.core_marker_id: 13589.760130528 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "page_fault_nosem_entry", event_id = 41, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760133230 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "page_fault_nosem_entry", format = "ip #p%lu address #p%lu trap_id #2u%u" }
+metadata.core_marker_id: 13589.760135809 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "crash_kexec", event_id = 38, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760138758 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "crash_kexec", format = "image %p ip %p" }
+metadata.core_marker_id: 13589.760141258 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "pm", name = "suspend_exit", event_id = 3, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760143825 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "pm", name = "suspend_exit", format = "irqstate #1%d" }
+metadata.core_marker_id: 13589.760146299 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "page_fault_exit", event_id = 40, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760148859 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "page_fault_exit", format = "res %d" }
+metadata.core_marker_id: 13589.760151309 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "napi_schedule", event_id = 18, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760153877 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "napi_schedule", format = "napi_struct %p name %s" }
+metadata.core_marker_id: 13589.760156382 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "kernel_kexec", event_id = 37, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760158936 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "kernel_kexec", format = "image %p" }
+metadata.core_marker_id: 13589.760161374 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "process_fork", event_id = 25, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760164083 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "process_fork", format = "parent_pid %d child_pid %d child_tgid %d" }
+metadata.core_marker_id: 13589.760166600 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "jbd2", name = "start_commit", event_id = 1, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760169272 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "jbd2", name = "start_commit", format = "dev %s transaction %d" }
+metadata.core_marker_id: 13589.760171746 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "sched_try_wakeup", event_id = 17, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760174357 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "sched_try_wakeup", format = "pid %d cpu_id %u state #2d%ld" }
+metadata.core_marker_id: 13589.760176886 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "input", name = "input_event", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760179916 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "input", name = "input_event", format = "type %u code %u value %d" }
+metadata.core_marker_id: 13589.760182619 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "ipc", name = "sem_create", event_id = 1, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760188320 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "ipc", name = "sem_create", format = "id %ld flags %d" }
+metadata.core_marker_id: 13589.760190788 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "plug", event_id = 19, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760193484 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "plug", format = " " }
+metadata.core_marker_id: 13589.760195984 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_insert_pc", event_id = 2, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760198742 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_insert_pc", format = "data_len %u rw %d errors %d" }
+metadata.core_marker_id: 13589.760201371 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "process_free", event_id = 22, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760204006 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "process_free", format = "pid %d" }
+metadata.core_marker_id: 13589.760206511 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "sched_migrate_task", event_id = 20, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760209226 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "sched_migrate_task", format = "pid %d state #2d%ld dest_cpu %d" }
+metadata.core_marker_id: 13589.760211922 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "softirq_entry", event_id = 7, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760214595 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "softirq_entry", format = "softirq_id #1u%lu" }
+metadata.core_marker_id: 13589.760217248 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "add_to_page_cache", event_id = 10, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760220012 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "add_to_page_cache", format = "inode %lu sdev %u" }
+metadata.core_marker_id: 13589.760222820 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "read", event_id = 8, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760225331 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "read", format = "count %zu fd %u" }
+metadata.core_marker_id: 13589.760227769 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "netif_state", name = "network_ipv4_interface", event_id = 3, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760233420 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "netif_state", name = "network_ipv4_interface", format = "name %s address #n4u%lu up %d" }
+metadata.core_marker_id: 13589.760236037 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "tasklet_high_exit", event_id = 13, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760238746 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "tasklet_high_exit", format = "func %p data %lu" }
+metadata.core_marker_id: 13589.760241263 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "rcu", name = "tree_callback", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760243818 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "rcu", name = "tree_callback", format = "func %p" }
+metadata.core_marker_id: 13589.760246398 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "syscall_entry", event_id = 2, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760249131 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "syscall_entry", format = "ip #p%ld syscall_id #2u%u" }
+metadata.core_marker_id: 13589.760251765 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "ipc", name = "msg_create", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760254333 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "ipc", name = "msg_create", format = "id %ld flags %d" }
+metadata.core_marker_id: 13589.760257054 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "module_state", name = "list_module", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 13589.760259756 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "module_state", name = "list_module", format = "name %s state %d refcount %lu" }
+kernel.printk: 13589.760262237 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { ip = 0xC1421750 }
+kernel.vprintk: 13589.762149621 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { loglevel = 7, string = "LTT state dump begin", ip = 0xC158363B }
+kernel.printk: 13589.762917527 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { ip = 0xC142176D }
+kernel.vprintk: 13589.762922351 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { loglevel = 7, string = "LTT state dump thread start", ip = 0xC158363B }
+task_state.process_state: 13589.762937702 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1, parent_pid = 0, name = "init", type = 0, mode = 5, submode = 0, status = 5, tgid = 1 }
+task_state.process_state: 13589.762941602 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2, parent_pid = 0, name = "kthreadd", type = 1, mode = 5, submode = 0, status = 5, tgid = 2 }
+task_state.process_state: 13589.762944355 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 3, parent_pid = 2, name = "ksoftirqd/0", type = 1, mode = 5, submode = 0, status = 5, tgid = 3 }
+task_state.process_state: 13589.762947096 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 4, parent_pid = 2, name = "watchdog/0", type = 1, mode = 5, submode = 0, status = 5, tgid = 4 }
+task_state.process_state: 13589.762949776 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 5, parent_pid = 2, name = "events/0", type = 1, mode = 5, submode = 0, status = 5, tgid = 5 }
+task_state.process_state: 13589.762952461 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 6, parent_pid = 2, name = "cpuset", type = 1, mode = 5, submode = 0, status = 5, tgid = 6 }
+task_state.process_state: 13589.762955129 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 7, parent_pid = 2, name = "khelper", type = 1, mode = 5, submode = 0, status = 5, tgid = 7 }
+task_state.process_state: 13589.762958031 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 10, parent_pid = 2, name = "netns", type = 1, mode = 5, submode = 0, status = 5, tgid = 10 }
+task_state.process_state: 13589.762960833 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 13, parent_pid = 2, name = "async/mgr", type = 1, mode = 5, submode = 0, status = 5, tgid = 13 }
+task_state.process_state: 13589.762963840 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 122, parent_pid = 2, name = "sync_supers", type = 1, mode = 5, submode = 0, status = 5, tgid = 122 }
+task_state.process_state: 13589.762967253 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 124, parent_pid = 2, name = "bdi-default", type = 1, mode = 5, submode = 0, status = 5, tgid = 124 }
+task_state.process_state: 13589.762970111 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 126, parent_pid = 2, name = "kblockd/0", type = 1, mode = 5, submode = 0, status = 5, tgid = 126 }
+task_state.process_state: 13589.762972741 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 128, parent_pid = 2, name = "kacpid", type = 1, mode = 5, submode = 0, status = 5, tgid = 128 }
+task_state.process_state: 13589.762975612 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 129, parent_pid = 2, name = "kacpi_notify", type = 1, mode = 5, submode = 0, status = 5, tgid = 129 }
+task_state.process_state: 13589.762978538 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 130, parent_pid = 2, name = "kacpi_hotplug", type = 1, mode = 5, submode = 0, status = 5, tgid = 130 }
+task_state.process_state: 13589.762981686 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 171, parent_pid = 2, name = "kseriod", type = 1, mode = 5, submode = 0, status = 5, tgid = 171 }
+task_state.process_state: 13589.762984674 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 178, parent_pid = 2, name = "kslowd", type = 1, mode = 5, submode = 0, status = 5, tgid = 178 }
+task_state.process_state: 13589.762987754 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 179, parent_pid = 2, name = "kslowd", type = 1, mode = 5, submode = 0, status = 5, tgid = 179 }
+task_state.process_state: 13589.762990477 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 199, parent_pid = 2, name = "rpciod/0", type = 1, mode = 5, submode = 0, status = 5, tgid = 199 }
+task_state.process_state: 13589.762993299 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 216, parent_pid = 2, name = "khungtaskd", type = 1, mode = 5, submode = 0, status = 5, tgid = 216 }
+task_state.process_state: 13589.762996009 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 217, parent_pid = 2, name = "kswapd0", type = 1, mode = 5, submode = 0, status = 5, tgid = 217 }
+task_state.process_state: 13589.762998652 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 218, parent_pid = 2, name = "aio/0", type = 1, mode = 5, submode = 0, status = 5, tgid = 218 }
+task_state.process_state: 13589.763001516 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 228, parent_pid = 2, name = "nfsiod", type = 1, mode = 5, submode = 0, status = 5, tgid = 228 }
+task_state.process_state: 13589.763004238 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 233, parent_pid = 2, name = "jfsIO", type = 1, mode = 5, submode = 0, status = 5, tgid = 233 }
+task_state.process_state: 13589.763007098 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 234, parent_pid = 2, name = "jfsCommit", type = 1, mode = 5, submode = 0, status = 5, tgid = 234 }
+task_state.process_state: 13589.763010177 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 235, parent_pid = 2, name = "jfsSync", type = 1, mode = 5, submode = 0, status = 5, tgid = 235 }
+task_state.process_state: 13589.763013295 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 236, parent_pid = 2, name = "xfs_mru_cache", type = 1, mode = 5, submode = 0, status = 5, tgid = 236 }
+task_state.process_state: 13589.763016030 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 237, parent_pid = 2, name = "xfslogd/0", type = 1, mode = 5, submode = 0, status = 5, tgid = 237 }
+task_state.process_state: 13589.763018900 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 238, parent_pid = 2, name = "xfsdatad/0", type = 1, mode = 5, submode = 0, status = 5, tgid = 238 }
+task_state.process_state: 13589.763021641 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 239, parent_pid = 2, name = "xfsconvertd/0", type = 1, mode = 5, submode = 0, status = 5, tgid = 239 }
+task_state.process_state: 13589.763024303 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 240, parent_pid = 2, name = "ocfs2_wq", type = 1, mode = 5, submode = 0, status = 5, tgid = 240 }
+task_state.process_state: 13589.763027106 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 241, parent_pid = 2, name = "o2quot/0", type = 1, mode = 5, submode = 0, status = 5, tgid = 241 }
+task_state.process_state: 13589.763029767 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 244, parent_pid = 2, name = "user_dlm", type = 1, mode = 5, submode = 0, status = 5, tgid = 244 }
+task_state.process_state: 13589.763032453 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 246, parent_pid = 2, name = "glock_workqueue", type = 1, mode = 5, submode = 0, status = 5, tgid = 246 }
+task_state.process_state: 13589.763035335 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 247, parent_pid = 2, name = "delete_workqueu", type = 1, mode = 5, submode = 0, status = 5, tgid = 247 }
+task_state.process_state: 13589.763038090 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 248, parent_pid = 2, name = "crypto/0", type = 1, mode = 5, submode = 0, status = 5, tgid = 248 }
+task_state.process_state: 13589.763040973 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 394, parent_pid = 2, name = "krxrpcd/0", type = 1, mode = 5, submode = 0, status = 5, tgid = 394 }
+task_state.process_state: 13589.763043929 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 551, parent_pid = 2, name = "ksuspend_usbd", type = 1, mode = 5, submode = 0, status = 5, tgid = 551 }
+task_state.process_state: 13589.763046579 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 556, parent_pid = 2, name = "khubd", type = 1, mode = 5, submode = 0, status = 5, tgid = 556 }
+task_state.process_state: 13589.763049246 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 563, parent_pid = 2, name = "ata/0", type = 1, mode = 5, submode = 0, status = 5, tgid = 563 }
+task_state.process_state: 13589.763052141 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 564, parent_pid = 2, name = "ata_aux", type = 1, mode = 5, submode = 0, status = 5, tgid = 564 }
+task_state.process_state: 13589.763054938 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 569, parent_pid = 2, name = "scsi_eh_0", type = 1, mode = 5, submode = 0, status = 5, tgid = 569 }
+task_state.process_state: 13589.763057994 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 601, parent_pid = 2, name = "kjournald", type = 1, mode = 5, submode = 0, status = 5, tgid = 601 }
+task_state.process_state: 13589.763060993 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 730, parent_pid = 2, name = "kpsmoused", type = 1, mode = 5, submode = 0, status = 5, tgid = 730 }
+task_state.process_state: 13589.763063920 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1007, parent_pid = 2, name = "flush-3:0", type = 1, mode = 5, submode = 0, status = 5, tgid = 1007 }
+task_state.process_state: 13589.763066637 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1195, parent_pid = 1, name = "dhclient3", type = 0, mode = 5, submode = 0, status = 5, tgid = 1195 }
+task_state.process_state: 13589.763069723 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1220, parent_pid = 2, name = "cifsd", type = 1, mode = 5, submode = 0, status = 5, tgid = 1220 }
+task_state.process_state: 13589.763072415 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1238, parent_pid = 1, name = "dirmngr", type = 0, mode = 5, submode = 0, status = 5, tgid = 1238 }
+task_state.process_state: 13589.763075051 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1280, parent_pid = 1, name = "rsyslogd", type = 0, mode = 5, submode = 0, status = 5, tgid = 1280 }
+task_state.process_state: 13589.763078064 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1282, parent_pid = 1, name = "rsyslogd", type = 0, mode = 5, submode = 0, status = 5, tgid = 1280 }
+task_state.process_state: 13589.763080799 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1283, parent_pid = 1, name = "rsyslogd", type = 0, mode = 5, submode = 0, status = 5, tgid = 1280 }
+task_state.process_state: 13589.763083497 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 16858, parent_pid = 1, name = "rsyslogd", type = 0, mode = 5, submode = 0, status = 5, tgid = 1280 }
+task_state.process_state: 13589.763086356 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1336, parent_pid = 1, name = "xfstt", type = 0, mode = 5, submode = 0, status = 5, tgid = 1336 }
+task_state.process_state: 13589.763089189 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1368, parent_pid = 1, name = "cron", type = 0, mode = 5, submode = 0, status = 5, tgid = 1368 }
+task_state.process_state: 13589.763091924 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1378, parent_pid = 1, name = "dbus-daemon", type = 0, mode = 5, submode = 0, status = 5, tgid = 1378 }
+task_state.process_state: 13589.763094875 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1387, parent_pid = 1, name = "gpm", type = 0, mode = 5, submode = 0, status = 5, tgid = 1387 }
+task_state.process_state: 13589.763097740 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1417, parent_pid = 1, name = "mysqld_safe", type = 0, mode = 5, submode = 0, status = 5, tgid = 1417 }
+task_state.process_state: 13589.763100530 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1539, parent_pid = 1417, name = "mysqld", type = 0, mode = 5, submode = 0, status = 5, tgid = 1539 }
+task_state.process_state: 13589.763103697 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1552, parent_pid = 1417, name = "mysqld", type = 0, mode = 5, submode = 0, status = 5, tgid = 1539 }
+task_state.process_state: 13589.763106401 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1553, parent_pid = 1417, name = "mysqld", type = 0, mode = 5, submode = 0, status = 5, tgid = 1539 }
+task_state.process_state: 13589.763109093 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1554, parent_pid = 1417, name = "mysqld", type = 0, mode = 5, submode = 0, status = 5, tgid = 1539 }
+task_state.process_state: 13589.763112068 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1555, parent_pid = 1417, name = "mysqld", type = 0, mode = 5, submode = 0, status = 5, tgid = 1539 }
+task_state.process_state: 13589.763114767 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1557, parent_pid = 1417, name = "mysqld", type = 0, mode = 5, submode = 0, status = 5, tgid = 1539 }
+task_state.process_state: 13589.763117490 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1558, parent_pid = 1417, name = "mysqld", type = 0, mode = 5, submode = 0, status = 5, tgid = 1539 }
+task_state.process_state: 13589.763120342 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1559, parent_pid = 1417, name = "mysqld", type = 0, mode = 5, submode = 0, status = 5, tgid = 1539 }
+task_state.process_state: 13589.763123058 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1560, parent_pid = 1417, name = "mysqld", type = 0, mode = 5, submode = 0, status = 5, tgid = 1539 }
+task_state.process_state: 13589.763125862 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1563, parent_pid = 1417, name = "mysqld", type = 0, mode = 5, submode = 0, status = 5, tgid = 1539 }
+task_state.process_state: 13589.763128954 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1540, parent_pid = 1417, name = "logger", type = 0, mode = 5, submode = 0, status = 5, tgid = 1540 }
+task_state.process_state: 13589.763131744 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1637, parent_pid = 1, name = "vboxadd-service", type = 0, mode = 5, submode = 0, status = 5, tgid = 1637 }
+task_state.process_state: 13589.763134479 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1638, parent_pid = 1, name = "vboxadd-service", type = 0, mode = 5, submode = 0, status = 5, tgid = 1637 }
+task_state.process_state: 13589.763137375 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1658, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763140086 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1659, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763142820 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1660, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763145772 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1661, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763148926 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1662, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763151747 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1663, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763154557 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1664, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763157321 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1666, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763160057 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1667, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763162823 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1668, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763165725 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1669, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763168793 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1670, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763171885 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1671, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763174663 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1672, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763177436 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1673, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763180306 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1674, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763183035 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1675, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763185948 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1676, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763188801 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1677, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763191641 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1678, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763194678 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1679, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763197530 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1680, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763200278 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1681, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763203074 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1682, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763206037 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1683, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763208890 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1684, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763211693 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1685, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763214575 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1686, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763217490 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1687, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763220286 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1688, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763222990 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1689, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763225892 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1690, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763228738 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1691, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763231621 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1692, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763234596 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1693, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763237380 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1694, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763240683 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1695, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763243541 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1696, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763246387 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1697, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763249215 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1698, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763251919 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1699, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763254740 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1700, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763257427 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1701, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763260162 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1702, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763263186 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1703, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763265952 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1704, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763268682 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1705, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763271497 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1706, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763274170 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1707, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763276857 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1708, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763279844 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1709, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763282591 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1710, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763285671 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1711, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763288543 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1712, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763291253 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1713, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763293994 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1714, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763296958 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1715, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763299951 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1716, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763302705 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1717, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763305569 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1718, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763308408 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1719, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763311095 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1720, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763313972 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1723, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763316780 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1865, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 13589.763319523 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1848, parent_pid = 1, name = "kdm", type = 0, mode = 5, submode = 0, status = 5, tgid = 1848 }
+task_state.process_state: 13589.763322183 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1852, parent_pid = 1848, name = "Xorg", type = 0, mode = 5, submode = 0, status = 1, tgid = 1852 }
+task_state.process_state: 13589.763325017 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1883, parent_pid = 1, name = "gdm-emulatord", type = 0, mode = 5, submode = 0, status = 5, tgid = 1883 }
+task_state.process_state: 13589.763327764 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1906, parent_pid = 1, name = "getty", type = 0, mode = 5, submode = 0, status = 5, tgid = 1906 }
+task_state.process_state: 13589.763330987 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1907, parent_pid = 1, name = "getty", type = 0, mode = 5, submode = 0, status = 5, tgid = 1907 }
+task_state.process_state: 13589.763333894 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1908, parent_pid = 1, name = "getty", type = 0, mode = 5, submode = 0, status = 5, tgid = 1908 }
+task_state.process_state: 13589.763336715 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1909, parent_pid = 1, name = "getty", type = 0, mode = 5, submode = 0, status = 5, tgid = 1909 }
+task_state.process_state: 13589.763339592 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1910, parent_pid = 1, name = "getty", type = 0, mode = 5, submode = 0, status = 5, tgid = 1910 }
+task_state.process_state: 13589.763342303 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1911, parent_pid = 1, name = "getty", type = 0, mode = 5, submode = 0, status = 5, tgid = 1911 }
+task_state.process_state: 13589.763345136 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1913, parent_pid = 1848, name = "kdm", type = 0, mode = 5, submode = 0, status = 5, tgid = 1913 }
+task_state.process_state: 13589.763348025 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1921, parent_pid = 1, name = "dbus-launch", type = 0, mode = 5, submode = 0, status = 5, tgid = 1921 }
+task_state.process_state: 13589.763350724 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1922, parent_pid = 1, name = "dbus-daemon", type = 0, mode = 5, submode = 0, status = 5, tgid = 1922 }
+task_state.process_state: 13589.763353508 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1928, parent_pid = 1368, name = "cron", type = 0, mode = 5, submode = 0, status = 5, tgid = 1928 }
+task_state.process_state: 13589.763356422 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1935, parent_pid = 1928, name = "NetCheck.sh", type = 1, mode = 5, submode = 0, status = 4, tgid = 1935 }
+task_state.process_state: 13589.763359089 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1938, parent_pid = 1928, name = "sendmail", type = 0, mode = 5, submode = 0, status = 5, tgid = 1938 }
+task_state.process_state: 13589.763361825 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1963, parent_pid = 1, name = "ssh", type = 0, mode = 5, submode = 0, status = 5, tgid = 1963 }
+task_state.process_state: 13589.763364880 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1973, parent_pid = 1, name = "ssh", type = 0, mode = 5, submode = 0, status = 5, tgid = 1973 }
+task_state.process_state: 13589.763367763 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1989, parent_pid = 1, name = "ssh", type = 0, mode = 5, submode = 0, status = 5, tgid = 1989 }
+task_state.process_state: 13589.763370363 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2043, parent_pid = 1913, name = "startkde", type = 0, mode = 5, submode = 0, status = 5, tgid = 2043 }
+task_state.process_state: 13589.763373271 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2103, parent_pid = 1, name = "VBoxClient", type = 0, mode = 5, submode = 0, status = 5, tgid = 2103 }
+task_state.process_state: 13589.763376363 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2104, parent_pid = 1, name = "VBoxClient", type = 0, mode = 5, submode = 0, status = 5, tgid = 2103 }
+task_state.process_state: 13589.763379036 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2109, parent_pid = 1, name = "VBoxClient", type = 0, mode = 5, submode = 0, status = 5, tgid = 2109 }
+task_state.process_state: 13589.763381784 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2142, parent_pid = 1, name = "VBoxClient", type = 0, mode = 5, submode = 0, status = 5, tgid = 2109 }
+task_state.process_state: 13589.763384624 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2113, parent_pid = 1, name = "VBoxClient", type = 0, mode = 5, submode = 0, status = 5, tgid = 2113 }
+task_state.process_state: 13589.763387433 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2114, parent_pid = 1, name = "VBoxClient", type = 0, mode = 5, submode = 0, status = 5, tgid = 2113 }
+task_state.process_state: 13589.763390544 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2118, parent_pid = 2043, name = "ssh-agent", type = 0, mode = 5, submode = 0, status = 5, tgid = 2118 }
+task_state.process_state: 13589.763393212 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2124, parent_pid = 1, name = "dbus-launch", type = 0, mode = 5, submode = 0, status = 5, tgid = 2124 }
+task_state.process_state: 13589.763395903 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2128, parent_pid = 1, name = "dbus-daemon", type = 0, mode = 5, submode = 0, status = 5, tgid = 2128 }
+task_state.process_state: 13589.763398792 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2174, parent_pid = 1, name = "kdeinit4", type = 0, mode = 5, submode = 0, status = 5, tgid = 2174 }
+task_state.process_state: 13589.763401430 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2175, parent_pid = 2174, name = "klauncher", type = 0, mode = 5, submode = 0, status = 5, tgid = 2175 }
+task_state.process_state: 13589.763404171 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2177, parent_pid = 1, name = "kded4", type = 0, mode = 5, submode = 0, status = 5, tgid = 2177 }
+task_state.process_state: 13589.763407059 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2204, parent_pid = 2043, name = "kwrapper4", type = 0, mode = 5, submode = 0, status = 5, tgid = 2204 }
+task_state.process_state: 13589.763409740 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2205, parent_pid = 2174, name = "ksmserver", type = 0, mode = 5, submode = 0, status = 5, tgid = 2205 }
+task_state.process_state: 13589.763412475 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2206, parent_pid = 2174, name = "ksmserver", type = 0, mode = 5, submode = 0, status = 5, tgid = 2205 }
+task_state.process_state: 13589.763415321 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2207, parent_pid = 2205, name = "kwin", type = 0, mode = 5, submode = 0, status = 5, tgid = 2207 }
+task_state.process_state: 13589.763418074 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2209, parent_pid = 1, name = "kglobalaccel", type = 0, mode = 5, submode = 0, status = 5, tgid = 2209 }
+task_state.process_state: 13589.763421155 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2212, parent_pid = 1, name = "knotify4", type = 0, mode = 5, submode = 0, status = 5, tgid = 2212 }
+task_state.process_state: 13589.763424025 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2304, parent_pid = 1, name = "knotify4", type = 0, mode = 5, submode = 0, status = 5, tgid = 2212 }
+task_state.process_state: 13589.763426933 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2305, parent_pid = 1, name = "knotify4", type = 0, mode = 5, submode = 0, status = 5, tgid = 2212 }
+task_state.process_state: 13589.763430081 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2308, parent_pid = 1, name = "knotify4", type = 0, mode = 5, submode = 0, status = 5, tgid = 2212 }
+task_state.process_state: 13589.763432964 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2309, parent_pid = 1, name = "knotify4", type = 0, mode = 5, submode = 0, status = 5, tgid = 2212 }
+task_state.process_state: 13589.763435982 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2213, parent_pid = 1, name = "plasma-desktop", type = 0, mode = 5, submode = 0, status = 5, tgid = 2213 }
+task_state.process_state: 13589.763438840 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2214, parent_pid = 1, name = "plasma-desktop", type = 0, mode = 5, submode = 0, status = 5, tgid = 2213 }
+task_state.process_state: 13589.763441884 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2218, parent_pid = 2174, name = "kio_file", type = 0, mode = 5, submode = 0, status = 5, tgid = 2218 }
+task_state.process_state: 13589.763444878 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2224, parent_pid = 1, name = "kxkb", type = 0, mode = 5, submode = 0, status = 5, tgid = 2224 }
+task_state.process_state: 13589.763447834 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2232, parent_pid = 1, name = "kxkb", type = 0, mode = 5, submode = 0, status = 5, tgid = 2224 }
+task_state.process_state: 13589.763450613 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2227, parent_pid = 1, name = "krunner", type = 0, mode = 5, submode = 0, status = 5, tgid = 2227 }
+task_state.process_state: 13589.763453650 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2228, parent_pid = 1, name = "nepomukserver", type = 0, mode = 5, submode = 0, status = 5, tgid = 2228 }
+task_state.process_state: 13589.763456360 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2238, parent_pid = 1, name = "nepomukserver", type = 0, mode = 5, submode = 0, status = 5, tgid = 2228 }
+task_state.process_state: 13589.763459058 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2237, parent_pid = 1, name = "kmix", type = 0, mode = 5, submode = 0, status = 5, tgid = 2237 }
+task_state.process_state: 13589.763462182 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2239, parent_pid = 2228, name = "nepomukservices", type = 0, mode = 5, submode = 0, status = 5, tgid = 2239 }
+task_state.process_state: 13589.763465194 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2241, parent_pid = 1, name = "konsole", type = 0, mode = 5, submode = 0, status = 5, tgid = 2241 }
+task_state.process_state: 13589.763468336 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2249, parent_pid = 1, name = "konsole", type = 0, mode = 5, submode = 0, status = 5, tgid = 2241 }
+task_state.process_state: 13589.763471293 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2243, parent_pid = 2228, name = "nepomukservices", type = 0, mode = 5, submode = 0, status = 5, tgid = 2243 }
+task_state.process_state: 13589.763474139 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2245, parent_pid = 2228, name = "nepomukservices", type = 0, mode = 5, submode = 0, status = 5, tgid = 2245 }
+task_state.process_state: 13589.763476843 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2247, parent_pid = 2228, name = "nepomukservices", type = 0, mode = 5, submode = 0, status = 5, tgid = 2247 }
+task_state.process_state: 13589.763479671 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2260, parent_pid = 2228, name = "nepomukservices", type = 0, mode = 5, submode = 0, status = 5, tgid = 2247 }
+task_state.process_state: 13589.763482431 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2250, parent_pid = 2241, name = "bash", type = 0, mode = 5, submode = 0, status = 5, tgid = 2250 }
+task_state.process_state: 13589.763485178 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2259, parent_pid = 2174, name = "gkrellm", type = 0, mode = 5, submode = 0, status = 5, tgid = 2259 }
+task_state.process_state: 13589.763488178 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2266, parent_pid = 2174, name = "polkit-gnome-au", type = 0, mode = 5, submode = 0, status = 5, tgid = 2266 }
+task_state.process_state: 13589.763490945 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2281, parent_pid = 1, name = "polkitd", type = 0, mode = 5, submode = 0, status = 5, tgid = 2281 }
+task_state.process_state: 13589.763493667 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2288, parent_pid = 2174, name = "wish", type = 0, mode = 5, submode = 0, status = 5, tgid = 2288 }
+task_state.process_state: 13589.763496451 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2290, parent_pid = 2174, name = "wish", type = 0, mode = 5, submode = 0, status = 5, tgid = 2288 }
+task_state.process_state: 13589.763499119 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2315, parent_pid = 2174, name = "icedove", type = 0, mode = 5, submode = 0, status = 5, tgid = 2315 }
+task_state.process_state: 13589.763501873 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2327, parent_pid = 2315, name = "run-mozilla.sh", type = 0, mode = 5, submode = 0, status = 5, tgid = 2327 }
+task_state.process_state: 13589.763504787 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2332, parent_pid = 2327, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 2332 }
+task_state.process_state: 13589.763507638 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2333, parent_pid = 2327, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 2332 }
+task_state.process_state: 13589.763510515 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2336, parent_pid = 2327, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 2332 }
+task_state.process_state: 13589.763513682 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2341, parent_pid = 2327, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 2332 }
+task_state.process_state: 13589.763516355 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2342, parent_pid = 2327, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 2332 }
+task_state.process_state: 13589.763519041 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2347, parent_pid = 2327, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 2332 }
+task_state.process_state: 13589.763521856 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2351, parent_pid = 2327, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 2332 }
+task_state.process_state: 13589.763524617 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2353, parent_pid = 2327, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 2332 }
+task_state.process_state: 13589.763527370 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2358, parent_pid = 2327, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 2332 }
+task_state.process_state: 13589.763530191 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2359, parent_pid = 2327, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 2332 }
+task_state.process_state: 13589.763532945 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2711, parent_pid = 2327, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 2332 }
+task_state.process_state: 13589.763535631 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 23348, parent_pid = 2327, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 2332 }
+task_state.process_state: 13589.763538501 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 24301, parent_pid = 2327, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 2332 }
+task_state.process_state: 13589.763541243 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 16856, parent_pid = 2327, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 2332 }
+task_state.process_state: 13589.763544139 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2335, parent_pid = 1, name = "gconfd-2", type = 0, mode = 5, submode = 0, status = 5, tgid = 2335 }
+task_state.process_state: 13589.763547126 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2684, parent_pid = 2241, name = "bash", type = 0, mode = 5, submode = 0, status = 5, tgid = 2684 }
+task_state.process_state: 13589.763576172 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2805, parent_pid = 2174, name = "sh", type = 0, mode = 5, submode = 0, status = 5, tgid = 2805 }
+task_state.process_state: 13589.763579184 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2806, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763581907 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2816, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763585184 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2817, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763588036 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2818, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763590827 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2819, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763593815 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2820, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763596587 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2821, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763599334 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2822, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763602280 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2825, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763605058 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2826, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763607805 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2827, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763610749 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2830, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763613608 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2834, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763616275 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2837, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763619306 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2847, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763622176 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2859, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763624869 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2984, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763627900 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2985, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763630992 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2987, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763633727 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 7940, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763636487 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 7999, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763639247 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 8067, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763642092 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 8137, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763644908 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 10331, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763647625 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 10403, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763650471 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 10409, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763670910 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 10412, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763673769 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 10415, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763676800 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 10456, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763679578 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 10502, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763682350 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 30090, parent_pid = 2805, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 2806 }
+task_state.process_state: 13589.763685171 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 11121, parent_pid = 2250, name = "su", type = 0, mode = 5, submode = 0, status = 5, tgid = 11121 }
+task_state.process_state: 13589.763688203 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 11130, parent_pid = 11121, name = "bash", type = 0, mode = 5, submode = 0, status = 5, tgid = 11130 }
+task_state.process_state: 13589.763691011 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 11317, parent_pid = 2241, name = "bash", type = 0, mode = 5, submode = 0, status = 5, tgid = 11317 }
+task_state.process_state: 13589.763694074 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 11325, parent_pid = 11317, name = "ssh", type = 0, mode = 5, submode = 0, status = 5, tgid = 11325 }
+task_state.process_state: 13589.763696784 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 18054, parent_pid = 1, name = "udevd", type = 0, mode = 5, submode = 0, status = 5, tgid = 18054 }
+task_state.process_state: 13589.763699790 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 21983, parent_pid = 1, name = "exim4", type = 0, mode = 5, submode = 0, status = 5, tgid = 21983 }
+task_state.process_state: 13589.763702661 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 24399, parent_pid = 1, name = "sshd", type = 0, mode = 5, submode = 0, status = 5, tgid = 24399 }
+task_state.process_state: 13589.763705643 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 24464, parent_pid = 1, name = "acpid", type = 0, mode = 5, submode = 0, status = 5, tgid = 24464 }
+task_state.process_state: 13589.763708612 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 24616, parent_pid = 1, name = "hald", type = 0, mode = 5, submode = 0, status = 5, tgid = 24616 }
+task_state.process_state: 13589.763711747 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 24617, parent_pid = 24616, name = "hald-runner", type = 0, mode = 5, submode = 0, status = 5, tgid = 24617 }
+task_state.process_state: 13589.763714637 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 24668, parent_pid = 24617, name = "hald-addon-stor", type = 0, mode = 5, submode = 0, status = 5, tgid = 24668 }
+task_state.process_state: 13589.763717704 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 24670, parent_pid = 24617, name = "hald-addon-stor", type = 0, mode = 5, submode = 0, status = 5, tgid = 24670 }
+task_state.process_state: 13589.763720679 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 24672, parent_pid = 24617, name = "hald-addon-acpi", type = 0, mode = 5, submode = 0, status = 5, tgid = 24672 }
+task_state.process_state: 13589.763723457 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 24682, parent_pid = 24617, name = "hald-addon-inpu", type = 0, mode = 5, submode = 0, status = 5, tgid = 24682 }
+task_state.process_state: 13589.763726606 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 25001, parent_pid = 1, name = "nmbd", type = 0, mode = 5, submode = 0, status = 5, tgid = 25001 }
+task_state.process_state: 13589.763729347 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 25010, parent_pid = 1, name = "smbd", type = 0, mode = 5, submode = 0, status = 5, tgid = 25010 }
+task_state.process_state: 13589.763732076 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 25016, parent_pid = 25010, name = "smbd", type = 0, mode = 5, submode = 0, status = 5, tgid = 25016 }
+task_state.process_state: 13589.763735169 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 30050, parent_pid = 2241, name = "bash", type = 0, mode = 5, submode = 0, status = 5, tgid = 30050 }
+task_state.process_state: 13589.763737996 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 30060, parent_pid = 30050, name = "su", type = 0, mode = 5, submode = 0, status = 5, tgid = 30060 }
+task_state.process_state: 13589.763740996 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 30068, parent_pid = 30060, name = "bash", type = 0, mode = 5, submode = 0, status = 5, tgid = 30068 }
+task_state.process_state: 13589.763743879 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 16857, parent_pid = 1368, name = "cron", type = 0, mode = 5, submode = 0, status = 5, tgid = 16857 }
+task_state.process_state: 13589.763746719 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 16865, parent_pid = 16857, name = "NetCheck.sh", type = 0, mode = 5, submode = 0, status = 5, tgid = 16865 }
+task_state.process_state: 13589.763749454 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 16867, parent_pid = 16857, name = "sendmail", type = 0, mode = 5, submode = 0, status = 5, tgid = 16867 }
+task_state.process_state: 13589.763752479 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 16885, parent_pid = 16865, name = "ping", type = 0, mode = 5, submode = 0, status = 5, tgid = 16885 }
+task_state.process_state: 13589.763755140 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 16887, parent_pid = 30068, name = "lttctl", type = 0, mode = 5, submode = 0, status = 1, tgid = 16887 }
+task_state.process_state: 13589.763758054 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 16889, parent_pid = 1, name = "lttd", type = 0, mode = 5, submode = 0, status = 1, tgid = 16889 }
+task_state.process_state: 13589.763767880 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { pid = 0, parent_pid = 0, name = "swapper", type = 1, mode = 5, submode = 0, status = 1, tgid = 0 }
+fd_state.file_descriptor: 13589.763853230 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/initctl", pid = 1, fd = 10 }
+fd_state.file_descriptor: 13589.763871994 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1195, fd = 0 }
+fd_state.file_descriptor: 13589.763874170 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1195, fd = 1 }
+fd_state.file_descriptor: 13589.763879239 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1195, fd = 2 }
+fd_state.file_descriptor: 13589.763891301 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/dhcp3/dhclient.eth0.leases", pid = 1195, fd = 3 }
+fd_state.file_descriptor: 13589.763897843 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[4313]", pid = 1195, fd = 4 }
+fd_state.file_descriptor: 13589.763902617 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[4310]", pid = 1195, fd = 5 }
+fd_state.file_descriptor: 13589.763908230 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "pipe:[4556]", pid = 1238, fd = 3 }
+fd_state.file_descriptor: 13589.763910318 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "pipe:[4556]", pid = 1238, fd = 4 }
+fd_state.file_descriptor: 13589.763918222 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/log/dirmngr.log", pid = 1238, fd = 5 }
+fd_state.file_descriptor: 13589.763925373 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[4559]", pid = 1238, fd = 6 }
+fd_state.file_descriptor: 13589.763930487 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[4611]", pid = 1280, fd = 0 }
+fd_state.file_descriptor: 13589.763933006 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/log/auth.log", pid = 1280, fd = 3 }
+fd_state.file_descriptor: 13589.763935266 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/log/syslog", pid = 1280, fd = 4 }
+fd_state.file_descriptor: 13589.763937824 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/log/daemon.log", pid = 1280, fd = 5 }
+fd_state.file_descriptor: 13589.763942240 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/log/kern.log", pid = 1280, fd = 6 }
+fd_state.file_descriptor: 13589.763944439 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/log/lpr.log", pid = 1280, fd = 7 }
+fd_state.file_descriptor: 13589.763946583 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/log/mail.log", pid = 1280, fd = 8 }
+fd_state.file_descriptor: 13589.763948720 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/log/user.log", pid = 1280, fd = 9 }
+fd_state.file_descriptor: 13589.763951074 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/log/mail.info", pid = 1280, fd = 10 }
+fd_state.file_descriptor: 13589.763953267 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/log/mail.warn", pid = 1280, fd = 11 }
+fd_state.file_descriptor: 13589.763955454 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/log/mail.err", pid = 1280, fd = 12 }
+fd_state.file_descriptor: 13589.763957831 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/log/news/news.crit", pid = 1280, fd = 13 }
+fd_state.file_descriptor: 13589.763960105 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/log/news/news.err", pid = 1280, fd = 14 }
+fd_state.file_descriptor: 13589.763962335 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/log/news/news.notice", pid = 1280, fd = 15 }
+fd_state.file_descriptor: 13589.763964540 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/log/debug", pid = 1280, fd = 16 }
+fd_state.file_descriptor: 13589.763966665 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/log/messages", pid = 1280, fd = 17 }
+fd_state.file_descriptor: 13589.763968933 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/xconsole", pid = 1280, fd = 18 }
+fd_state.file_descriptor: 13589.763971502 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/proc/kmsg", pid = 1280, fd = 19 }
+fd_state.file_descriptor: 13589.763979498 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/cache/xfstt/ttinfo.dir", pid = 1336, fd = 0 }
+fd_state.file_descriptor: 13589.763984315 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/usr/share/fonts/truetype", pid = 1336, fd = 1 }
+fd_state.file_descriptor: 13589.763993438 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[4745]", pid = 1336, fd = 2 }
+fd_state.file_descriptor: 13589.763998163 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1368, fd = 0 }
+fd_state.file_descriptor: 13589.764000277 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1368, fd = 1 }
+fd_state.file_descriptor: 13589.764002346 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1368, fd = 2 }
+fd_state.file_descriptor: 13589.764009449 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/run/crond.pid", pid = 1368, fd = 3 }
+fd_state.file_descriptor: 13589.764012295 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1378, fd = 0 }
+fd_state.file_descriptor: 13589.764014278 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1378, fd = 1 }
+fd_state.file_descriptor: 13589.764016176 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1378, fd = 2 }
+fd_state.file_descriptor: 13589.764020981 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[4734]", pid = 1378, fd = 3 }
+fd_state.file_descriptor: 13589.764022983 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1378, fd = 4 }
+fd_state.file_descriptor: 13589.764025182 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 1378, fd = 5 }
+fd_state.file_descriptor: 13589.764029851 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[4737]", pid = 1378, fd = 6 }
+fd_state.file_descriptor: 13589.764032156 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[4738]", pid = 1378, fd = 7 }
+fd_state.file_descriptor: 13589.764037884 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[86310]", pid = 1378, fd = 8 }
+fd_state.file_descriptor: 13589.764045092 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[5314]", pid = 1378, fd = 9 }
+fd_state.file_descriptor: 13589.764050260 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[5264]", pid = 1378, fd = 10 }
+fd_state.file_descriptor: 13589.764058607 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[121184]", pid = 1378, fd = 11 }
+fd_state.file_descriptor: 13589.764065803 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[121490]", pid = 1378, fd = 12 }
+fd_state.file_descriptor: 13589.764070880 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[6007]", pid = 1378, fd = 13 }
+fd_state.file_descriptor: 13589.764078481 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[6132]", pid = 1378, fd = 14 }
+fd_state.file_descriptor: 13589.764086341 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[6804]", pid = 1378, fd = 15 }
+fd_state.file_descriptor: 13589.764113071 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[7141]", pid = 1378, fd = 16 }
+fd_state.file_descriptor: 13589.764121048 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[7381]", pid = 1378, fd = 17 }
+fd_state.file_descriptor: 13589.764129458 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[53719]", pid = 1378, fd = 18 }
+fd_state.file_descriptor: 13589.764134176 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[7895]", pid = 1378, fd = 19 }
+fd_state.file_descriptor: 13589.764141624 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[7632]", pid = 1378, fd = 20 }
+fd_state.file_descriptor: 13589.764150081 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[121509]", pid = 1378, fd = 21 }
+fd_state.file_descriptor: 13589.764155805 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[8194]", pid = 1378, fd = 22 }
+fd_state.file_descriptor: 13589.764163388 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[8532]", pid = 1378, fd = 23 }
+fd_state.file_descriptor: 13589.764170799 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[8226]", pid = 1378, fd = 24 }
+fd_state.file_descriptor: 13589.764173343 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[129957]", pid = 1378, fd = 25 }
+fd_state.file_descriptor: 13589.764180902 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[144771]", pid = 1378, fd = 26 }
+fd_state.file_descriptor: 13589.764183908 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1387, fd = 0 }
+fd_state.file_descriptor: 13589.764185990 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1387, fd = 1 }
+fd_state.file_descriptor: 13589.764188011 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1387, fd = 2 }
+fd_state.file_descriptor: 13589.764193241 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[4761]", pid = 1387, fd = 3 }
+fd_state.file_descriptor: 13589.764195687 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[4778]", pid = 1387, fd = 5 }
+fd_state.file_descriptor: 13589.764203461 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1417, fd = 0 }
+fd_state.file_descriptor: 13589.764205574 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1417, fd = 1 }
+fd_state.file_descriptor: 13589.764207570 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1417, fd = 2 }
+fd_state.file_descriptor: 13589.764213324 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/usr/bin/mysqld_safe", pid = 1417, fd = 255 }
+fd_state.file_descriptor: 13589.764218325 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1539, fd = 0 }
+fd_state.file_descriptor: 13589.764223278 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "pipe:[4877]", pid = 1539, fd = 1 }
+fd_state.file_descriptor: 13589.764225318 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "pipe:[4877]", pid = 1539, fd = 2 }
+fd_state.file_descriptor: 13589.764230751 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/ibdata1", pid = 1539, fd = 3 }
+fd_state.file_descriptor: 13589.764233486 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/tmp/ibT6xQFf (deleted)", pid = 1539, fd = 4 }
+fd_state.file_descriptor: 13589.764235698 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/tmp/ibL8578S (deleted)", pid = 1539, fd = 5 }
+fd_state.file_descriptor: 13589.764237977 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/tmp/ib2k4pCw (deleted)", pid = 1539, fd = 6 }
+fd_state.file_descriptor: 13589.764240133 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/tmp/ibtkC899 (deleted)", pid = 1539, fd = 7 }
+fd_state.file_descriptor: 13589.764242727 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/ib_logfile0", pid = 1539, fd = 8 }
+fd_state.file_descriptor: 13589.764245135 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/ib_logfile1", pid = 1539, fd = 9 }
+fd_state.file_descriptor: 13589.764247772 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[4900]", pid = 1539, fd = 10 }
+fd_state.file_descriptor: 13589.764249878 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/tmp/ibd3Pk3N (deleted)", pid = 1539, fd = 11 }
+fd_state.file_descriptor: 13589.764252139 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[4901]", pid = 1539, fd = 12 }
+fd_state.file_descriptor: 13589.764254561 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/host.MYI", pid = 1539, fd = 13 }
+fd_state.file_descriptor: 13589.764256963 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/host.MYD", pid = 1539, fd = 14 }
+fd_state.file_descriptor: 13589.764259285 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/user.MYI", pid = 1539, fd = 15 }
+fd_state.file_descriptor: 13589.764261608 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/user.MYD", pid = 1539, fd = 16 }
+fd_state.file_descriptor: 13589.764267140 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/db.MYI", pid = 1539, fd = 17 }
+fd_state.file_descriptor: 13589.764269542 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/db.MYD", pid = 1539, fd = 18 }
+fd_state.file_descriptor: 13589.764272400 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/tables_priv.MYI", pid = 1539, fd = 19 }
+fd_state.file_descriptor: 13589.764274779 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/tables_priv.MYD", pid = 1539, fd = 20 }
+fd_state.file_descriptor: 13589.764279694 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/columns_priv.MYI", pid = 1539, fd = 21 }
+fd_state.file_descriptor: 13589.764282116 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/columns_priv.MYD", pid = 1539, fd = 22 }
+fd_state.file_descriptor: 13589.764284690 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/procs_priv.MYI", pid = 1539, fd = 23 }
+fd_state.file_descriptor: 13589.764287228 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/procs_priv.MYD", pid = 1539, fd = 24 }
+fd_state.file_descriptor: 13589.764289785 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/servers.MYI", pid = 1539, fd = 25 }
+fd_state.file_descriptor: 13589.764292206 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/servers.MYD", pid = 1539, fd = 26 }
+fd_state.file_descriptor: 13589.764294713 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/event.MYI", pid = 1539, fd = 27 }
+fd_state.file_descriptor: 13589.764297109 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/event.MYD", pid = 1539, fd = 28 }
+fd_state.file_descriptor: 13589.764302383 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/func.MYI", pid = 1539, fd = 32 }
+fd_state.file_descriptor: 13589.764304791 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/func.MYD", pid = 1539, fd = 33 }
+fd_state.file_descriptor: 13589.764309861 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/general_log.CSM", pid = 1539, fd = 34 }
+fd_state.file_descriptor: 13589.764315011 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/general_log.CSV", pid = 1539, fd = 35 }
+fd_state.file_descriptor: 13589.764320099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/help_category.MYI", pid = 1539, fd = 36 }
+fd_state.file_descriptor: 13589.764322644 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/help_category.MYD", pid = 1539, fd = 37 }
+fd_state.file_descriptor: 13589.764325213 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/help_keyword.MYI", pid = 1539, fd = 38 }
+fd_state.file_descriptor: 13589.764327652 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/help_keyword.MYD", pid = 1539, fd = 39 }
+fd_state.file_descriptor: 13589.764330227 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/help_relation.MYI", pid = 1539, fd = 40 }
+fd_state.file_descriptor: 13589.764332771 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/help_relation.MYD", pid = 1539, fd = 41 }
+fd_state.file_descriptor: 13589.764337502 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/help_topic.MYI", pid = 1539, fd = 42 }
+fd_state.file_descriptor: 13589.764339929 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/help_topic.MYD", pid = 1539, fd = 43 }
+fd_state.file_descriptor: 13589.764342701 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/ndb_binlog_index.MYI", pid = 1539, fd = 44 }
+fd_state.file_descriptor: 13589.764345159 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/ndb_binlog_index.MYD", pid = 1539, fd = 45 }
+fd_state.file_descriptor: 13589.764347568 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/plugin.MYI", pid = 1539, fd = 46 }
+fd_state.file_descriptor: 13589.764349927 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/plugin.MYD", pid = 1539, fd = 47 }
+fd_state.file_descriptor: 13589.764352725 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/proc.MYI", pid = 1539, fd = 48 }
+fd_state.file_descriptor: 13589.764355189 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/proc.MYD", pid = 1539, fd = 49 }
+fd_state.file_descriptor: 13589.764357610 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/slow_log.CSM", pid = 1539, fd = 50 }
+fd_state.file_descriptor: 13589.764360067 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/slow_log.CSV", pid = 1539, fd = 51 }
+fd_state.file_descriptor: 13589.764362685 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/time_zone.MYI", pid = 1539, fd = 52 }
+fd_state.file_descriptor: 13589.764365076 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/time_zone.MYD", pid = 1539, fd = 53 }
+fd_state.file_descriptor: 13589.764367688 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/time_zone_leap_second.MYI", pid = 1539, fd = 54 }
+fd_state.file_descriptor: 13589.764370170 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/time_zone_leap_second.MYD", pid = 1539, fd = 55 }
+fd_state.file_descriptor: 13589.764372720 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/time_zone_name.MYI", pid = 1539, fd = 56 }
+fd_state.file_descriptor: 13589.764375130 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/time_zone_name.MYD", pid = 1539, fd = 57 }
+fd_state.file_descriptor: 13589.764377784 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/time_zone_transition.MYI", pid = 1539, fd = 58 }
+fd_state.file_descriptor: 13589.764380236 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/time_zone_transition.MYD", pid = 1539, fd = 59 }
+fd_state.file_descriptor: 13589.764382946 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/time_zone_transition_type.MYI", pid = 1539, fd = 60 }
+fd_state.file_descriptor: 13589.764385441 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/time_zone_transition_type.MYD", pid = 1539, fd = 61 }
+fd_state.file_descriptor: 13589.764391398 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "pipe:[4877]", pid = 1540, fd = 0 }
+fd_state.file_descriptor: 13589.764394079 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[4892]", pid = 1540, fd = 1 }
+fd_state.file_descriptor: 13589.764396087 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1540, fd = 2 }
+fd_state.file_descriptor: 13589.764399259 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1637, fd = 0 }
+fd_state.file_descriptor: 13589.764401298 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1637, fd = 1 }
+fd_state.file_descriptor: 13589.764403178 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1637, fd = 2 }
+fd_state.file_descriptor: 13589.764408031 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/vboxadd", pid = 1637, fd = 3 }
+fd_state.file_descriptor: 13589.764410317 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1658, fd = 0 }
+fd_state.file_descriptor: 13589.764412429 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1658, fd = 1 }
+fd_state.file_descriptor: 13589.764414376 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1658, fd = 2 }
+fd_state.file_descriptor: 13589.764416778 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "pipe:[5261]", pid = 1658, fd = 3 }
+fd_state.file_descriptor: 13589.764418775 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1658, fd = 4 }
+fd_state.file_descriptor: 13589.764420894 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "pipe:[5261]", pid = 1658, fd = 5 }
+fd_state.file_descriptor: 13589.764423253 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "pipe:[5262]", pid = 1658, fd = 6 }
+fd_state.file_descriptor: 13589.764425342 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "pipe:[5262]", pid = 1658, fd = 7 }
+fd_state.file_descriptor: 13589.764427455 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[5263]", pid = 1658, fd = 8 }
+fd_state.file_descriptor: 13589.764430104 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/run/console", pid = 1658, fd = 9 }
+fd_state.file_descriptor: 13589.764432407 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/log/ConsoleKit/history", pid = 1658, fd = 10 }
+fd_state.file_descriptor: 13589.764437225 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[5313]", pid = 1658, fd = 11 }
+fd_state.file_descriptor: 13589.764439529 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/tty0", pid = 1658, fd = 12 }
+fd_state.file_descriptor: 13589.764441888 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[6192]", pid = 1658, fd = 13 }
+fd_state.file_descriptor: 13589.764444285 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "pipe:[5296]", pid = 1658, fd = 14 }
+fd_state.file_descriptor: 13589.764446324 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "pipe:[5296]", pid = 1658, fd = 15 }
+fd_state.file_descriptor: 13589.764448363 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 1658, fd = 16 }
+fd_state.file_descriptor: 13589.764450593 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1848, fd = 0 }
+fd_state.file_descriptor: 13589.764455460 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/log/kdm.log", pid = 1848, fd = 1 }
+fd_state.file_descriptor: 13589.764457554 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/log/kdm.log", pid = 1848, fd = 2 }
+fd_state.file_descriptor: 13589.764459845 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/run/kdm.pid", pid = 1848, fd = 3 }
+fd_state.file_descriptor: 13589.764467281 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "pipe:[5857]", pid = 1848, fd = 4 }
+fd_state.file_descriptor: 13589.764469375 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "pipe:[5857]", pid = 1848, fd = 5 }
+fd_state.file_descriptor: 13589.764474180 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[6000]", pid = 1848, fd = 6 }
+fd_state.file_descriptor: 13589.764476620 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[5859]", pid = 1848, fd = 7 }
+fd_state.file_descriptor: 13589.764481702 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[7891]", pid = 1848, fd = 8 }
+fd_state.file_descriptor: 13589.764486797 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[6003]", pid = 1848, fd = 9 }
+fd_state.file_descriptor: 13589.764491429 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[6005]", pid = 1848, fd = 11 }
+fd_state.file_descriptor: 13589.764496623 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/log/Xorg.0.log", pid = 1852, fd = 0 }
+fd_state.file_descriptor: 13589.764498976 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[5877]", pid = 1852, fd = 1 }
+fd_state.file_descriptor: 13589.764501021 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/var/log/kdm.log", pid = 1852, fd = 2 }
+fd_state.file_descriptor: 13589.764503294 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[5878]", pid = 1852, fd = 3 }
+fd_state.file_descriptor: 13589.764508986 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/usr/lib/xorg/protocol.txt", pid = 1852, fd = 4 }
+fd_state.file_descriptor: 13589.764511469 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/tty7", pid = 1852, fd = 5 }
+fd_state.file_descriptor: 13589.764515960 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/proc/mtrr", pid = 1852, fd = 6 }
+fd_state.file_descriptor: 13589.764521257 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[120542]", pid = 1852, fd = 7 }
+fd_state.file_descriptor: 13589.764526069 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/vboxadd", pid = 1852, fd = 8 }
+fd_state.file_descriptor: 13589.764533978 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/sys/devices/pci0000:00/0000:00:02.0/config", pid = 1852, fd = 9 }
+fd_state.file_descriptor: 13589.764536208 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/proc/mtrr", pid = 1852, fd = 10 }
+fd_state.file_descriptor: 13589.764541106 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/dri/card0", pid = 1852, fd = 11 }
+kernel.irq_entry: 13589.764577563 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 0, 0, swapper, , 0, 0x0, IRQ { ip = 3238764448, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_update_time: 13589.764825828 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 0, 0, swapper, , 0, 0x0, IRQ { jiffies = 4296292859, xtime_sec = 1262715366, xtime_nsec = 301133042, walltomonotonic_sec = -1262701811, walltomonotonic_nsec = 148963639 }
+kernel.softirq_raise: 13589.764910045 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 0, 0, swapper, , 0, 0x0, IRQ { softirq_id = 1 [softirq 1] }
+kernel.softirq_raise: 13589.764984641 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 0, 0, swapper, , 0, 0x0, IRQ { softirq_id = 9 [softirq 9] }
+kernel.sched_try_wakeup: 13589.764997546 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 0, 0, swapper, , 0, 0x0, IRQ { pid = 1283, cpu_id = 0, state = 1 }
+kernel.irq_exit: 13589.765022071 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.softirq_entry: 13589.765027436 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 0, 0, swapper, , 0, 0x0, SOFTIRQ { softirq_id = 1 [softirq 1] }
+kernel.timer_set: 13589.765035716 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 0, 0, swapper, , 0, 0x0, SOFTIRQ { expires = 1325564, function = 0xc141d458, data = 0 }
+kernel.sched_try_wakeup: 13589.765047137 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 0, 0, swapper, , 0, 0x0, SOFTIRQ { pid = 5, cpu_id = 0, state = 1 }
+kernel.softirq_exit: 13589.765050931 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { softirq_id = 1 [softirq 1] }
+kernel.softirq_entry: 13589.765052286 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 0, 0, swapper, , 0, 0x0, SOFTIRQ { softirq_id = 9 [softirq 9] }
+rcu.tree_callback: 13589.765097867 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 0, 0, swapper, , 0, 0x0, SOFTIRQ { func = 0xc104364a }
+rcu.tree_callback: 13589.765102918 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 0, 0, swapper, , 0, 0x0, SOFTIRQ { func = 0xc104364a }
+rcu.tree_callback: 13589.765104668 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 0, 0, swapper, , 0, 0x0, SOFTIRQ { func = 0xc104364a }
+rcu.tree_callback: 13589.765106356 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 0, 0, swapper, , 0, 0x0, SOFTIRQ { func = 0xc10acb19 }
+kernel.softirq_exit: 13589.765108413 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { softirq_id = 9 [softirq 9] }
+fd_state.file_descriptor: 13589.765113126 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/input/mice", pid = 1852, fd = 12 }
+fd_state.file_descriptor: 13589.765116181 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[6006]", pid = 1852, fd = 13 }
+fd_state.file_descriptor: 13589.765118627 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/input/event0", pid = 1852, fd = 14 }
+fd_state.file_descriptor: 13589.765124769 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/input/event2", pid = 1852, fd = 15 }
+fd_state.file_descriptor: 13589.765127116 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/input/event1", pid = 1852, fd = 16 }
+fd_state.file_descriptor: 13589.765134360 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/input/event4", pid = 1852, fd = 17 }
+fd_state.file_descriptor: 13589.765136516 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "/dev/vboxadd", pid = 1852, fd = 18 }
+fd_state.file_descriptor: 13589.765138962 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[6024]", pid = 1852, fd = 19 }
+fd_state.file_descriptor: 13589.765144697 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[6946]", pid = 1852, fd = 20 }
+fd_state.file_descriptor: 13589.765149613 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[6955]", pid = 1852, fd = 21 }
+fd_state.file_descriptor: 13589.765154658 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[6061]", pid = 1852, fd = 22 }
+fd_state.file_descriptor: 13589.765156992 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[6958]", pid = 1852, fd = 23 }
+fd_state.file_descriptor: 13589.765159358 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[6966]", pid = 1852, fd = 24 }
+fd_state.file_descriptor: 13589.765164212 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[6980]", pid = 1852, fd = 25 }
+fd_state.file_descriptor: 13589.765166670 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[6995]", pid = 1852, fd = 26 }
+fd_state.file_descriptor: 13589.765171975 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[7533]", pid = 1852, fd = 27 }
+fd_state.file_descriptor: 13589.765176834 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[7086]", pid = 1852, fd = 28 }
+fd_state.file_descriptor: 13589.765181831 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[7103]", pid = 1852, fd = 29 }
+fd_state.file_descriptor: 13589.765186717 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[7216]", pid = 1852, fd = 31 }
+fd_state.file_descriptor: 13589.765191614 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[7244]", pid = 1852, fd = 32 }
+fd_state.file_descriptor: 13589.765196407 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[7334]", pid = 1852, fd = 33 }
+fd_state.file_descriptor: 13589.765201113 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[7274]", pid = 1852, fd = 34 }
+fd_state.file_descriptor: 13589.765206411 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[8481]", pid = 1852, fd = 35 }
+fd_state.file_descriptor: 13589.765211086 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[7338]", pid = 1852, fd = 36 }
+fd_state.file_descriptor: 13589.765215750 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[7573]", pid = 1852, fd = 37 }
+fd_state.file_descriptor: 13589.765220721 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[7595]", pid = 1852, fd = 38 }
+fd_state.file_descriptor: 13589.765225458 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[7842]", pid = 1852, fd = 39 }
+fd_state.file_descriptor: 13589.765230208 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[7858]", pid = 1852, fd = 40 }
+fd_state.file_descriptor: 13589.765232493 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[7889]", pid = 1852, fd = 41 }
+fd_state.file_descriptor: 13589.765237113 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[8002]", pid = 1852, fd = 42 }
+fd_state.file_descriptor: 13589.765241795 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[8019]", pid = 1852, fd = 43 }
+fd_state.file_descriptor: 13589.765244364 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[8113]", pid = 1852, fd = 44 }
+fd_state.file_descriptor: 13589.765248867 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[8041]", pid = 1852, fd = 45 }
+fd_state.file_descriptor: 13589.765253832 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[8179]", pid = 1852, fd = 46 }
+fd_state.file_descriptor: 13589.765259180 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[8263]", pid = 1852, fd = 47 }
+fd_state.file_descriptor: 13589.765264323 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[11872]", pid = 1852, fd = 48 }
+fd_state.file_descriptor: 13589.765269652 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 0, 0, swapper, , 0, 0x0, MODE_UNKNOWN { filename = "socket:[135886]", pid = 1852, fd = 49 }
+kernel.sched_schedule: 13589.765278203 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1283, 1280, rsyslogd, , 1, 0x0, MODE_UNKNOWN { prev_pid = 16887, next_pid = 1283, prev_state = 0 }
+fs.read: 13589.765392919 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1283, 1280, rsyslogd, , 1, 0x0, MODE_UNKNOWN { count = 4095, fd = 19 }
+kernel.syscall_exit: 13589.765398229 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1283, 1280, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 85 }
+kernel.syscall_entry: 13589.765477444 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1283, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 13589.765480579 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1283, 1280, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.765536848 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1283, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb76fc6a3, syscall_id = 240 [syscall 240] }
+kernel.sched_try_wakeup: 13589.765550222 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1283, 1280, rsyslogd, , 1, 0x0, SYSCALL { pid = 16858, cpu_id = 0, state = 1 }
+kernel.syscall_exit: 13589.765554017 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1283, 1280, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 13589.765566251 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1283, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 158 [syscall 158] }
+kernel.sched_schedule: 13589.765577112 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 5, 5, events/0, , 2, 0x0, MODE_UNKNOWN { prev_pid = 1283, next_pid = 5, prev_state = 0 }
+kernel.sched_schedule: 13589.765686050 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, MODE_UNKNOWN { prev_pid = 5, next_pid = 16858, prev_state = 1 }
+kernel.syscall_exit: 13589.765717381 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.765727989 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 240 [syscall 240] }
+kernel.syscall_exit: 13589.765729930 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.765733922 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 158 [syscall 158] }
+kernel.syscall_exit: 13589.765743280 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.765807314 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 4 [syscall 4] }
+fs.write: 13589.765934143 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { count = 68, fd = 4 }
+kernel.syscall_exit: 13589.765936065 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 68 }
+kernel.syscall_entry: 13589.765950505 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 4 [syscall 4] }
+fs.write: 13589.766046069 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { count = 68, fd = 6 }
+kernel.syscall_exit: 13589.766047758 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 68 }
+kernel.syscall_entry: 13589.766062123 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 4 [syscall 4] }
+fs.write: 13589.766154465 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { count = 68, fd = 16 }
+kernel.syscall_exit: 13589.766156079 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 68 }
+kernel.syscall_entry: 13589.766168295 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 13 [syscall 13] }
+kernel.syscall_exit: 13589.766169773 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 1262715366 }
+kernel.syscall_entry: 13589.766174640 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 158 [syscall 158] }
+kernel.sched_schedule: 13589.766185107 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1283, 1280, rsyslogd, , 1, 0x0, SYSCALL { prev_pid = 16858, next_pid = 1283, prev_state = 0 }
+kernel.syscall_exit: 13589.766210376 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1283, 1280, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.766216469 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1283, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 13589.766219186 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1283, 1280, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.766227495 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1283, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 158 [syscall 158] }
+kernel.syscall_exit: 13589.766236194 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1283, 1280, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.766241140 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1283, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 3 [syscall 3] }
+kernel.sched_schedule: 13589.766256634 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { prev_pid = 1283, next_pid = 16858, prev_state = 1 }
+kernel.syscall_exit: 13589.766280738 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.766294834 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 4 [syscall 4] }
+fs.write: 13589.766302972 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { count = 75, fd = 4 }
+kernel.syscall_exit: 13589.766304351 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 75 }
+kernel.syscall_entry: 13589.766313567 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 4 [syscall 4] }
+fs.write: 13589.766338565 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { count = 75, fd = 6 }
+kernel.syscall_exit: 13589.766340118 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 75 }
+kernel.syscall_entry: 13589.766350110 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 4 [syscall 4] }
+fs.write: 13589.766373709 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { count = 75, fd = 16 }
+kernel.syscall_exit: 13589.766375724 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 75 }
+kernel.syscall_entry: 13589.766386209 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 13 [syscall 13] }
+kernel.syscall_exit: 13589.766387651 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 1262715366 }
+kernel.syscall_entry: 13589.766391716 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 158 [syscall 158] }
+kernel.syscall_exit: 13589.766400451 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.766409988 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb76e7e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.766412767 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.766415988 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.766418193 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.766421292 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 240 [syscall 240] }
+kernel.sched_schedule: 13589.766442027 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { prev_pid = 16858, next_pid = 1852, prev_state = 1 }
+kernel.syscall_entry: 13589.766763132 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726408, syscall_id = 119 [syscall 119] }
+kernel.syscall_exit: 13589.766769699 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = -1377130952 }
+kernel.syscall_entry: 13589.768189470 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.768194910 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.768199833 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 13589.768204681 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 13589.768213693 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.768225958 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 142 [syscall 142] }
+fs.select: 13589.768234275 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 1, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768239215 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 3, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768241716 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 5, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768250100 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 7, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768252804 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 13, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768255965 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 19, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768258564 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 20, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768261219 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 21, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768263690 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 22, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768266173 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 23, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768268636 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 24, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768271150 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 25, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768273756 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 26, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768276152 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 27, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768278727 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 28, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768281425 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 29, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768283945 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 31, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768287284 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 32, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768342807 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 33, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768378635 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 34, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768413373 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 35, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768448388 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 36, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768486440 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 37, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768489415 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 38, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768492064 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 39, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768494633 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 40, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768497023 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 41, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768499573 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 42, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768502401 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 43, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768504890 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 44, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768506990 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 45, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768509288 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 46, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768511573 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 47, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768513829 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 48, end_time_sec = 13555, end_time_nsec = 784635172 }
+fs.select: 13589.768516311 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 49, end_time_sec = 13555, end_time_nsec = 784635172 }
+mm.page_free: 13589.768524553 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pfn = 79372, order = 0 }
+kernel.syscall_exit: 13589.768530356 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 13589.768538975 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 13589.768540909 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 13589.768548751 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.768552502 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.768554966 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.768561527 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [syscall 3] }
+kernel.sched_try_wakeup: 13589.768583402 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pid = 2241, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 13589.768596006 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { prev_pid = 1852, next_pid = 2241, prev_state = 0 }
+fs.pollfd: 13589.768851812 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { fd = 8 }
+kernel.sched_schedule: 13589.768864903 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { prev_pid = 2241, next_pid = 1852, prev_state = 1 }
+kernel.sched_try_wakeup: 13589.769026826 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pid = 2241, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 13589.769034711 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { prev_pid = 1852, next_pid = 2241, prev_state = 0 }
+fs.pollfd: 13589.769173618 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { fd = 8 }
+kernel.sched_schedule: 13589.769180931 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { prev_pid = 2241, next_pid = 1852, prev_state = 1 }
+fs.read: 13589.769325106 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4096, fd = 41 }
+kernel.syscall_exit: 13589.769326825 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 2908 }
+kernel.irq_entry: 13589.775701992 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { ip = 3077255552, handler = 0x0, irq_id = 239, kernel_mode = 0 }
+kernel.timer_update_time: 13589.775997341 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { jiffies = 4296292860, xtime_sec = 1262715366, xtime_nsec = 301133043, walltomonotonic_sec = -1262701811, walltomonotonic_nsec = 148963639 }
+kernel.softirq_raise: 13589.776024846 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { softirq_id = 1 [softirq 1] }
+kernel.softirq_raise: 13589.776040968 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { softirq_id = 9 [softirq 9] }
+kernel.sched_try_wakeup: 13589.776090010 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { pid = 2711, cpu_id = 0, state = 1 }
+kernel.irq_exit: 13589.776117152 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.softirq_entry: 13589.776127211 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { softirq_id = 1 [softirq 1] }
+kernel.timer_set: 13589.776152481 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { expires = 1325565, function = 0xc141d458, data = 0 }
+kernel.softirq_exit: 13589.776157163 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { softirq_id = 1 [softirq 1] }
+kernel.softirq_entry: 13589.776159035 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { softirq_id = 9 [softirq 9] }
+rcu.tree_callback: 13589.776338891 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { func = 0xc10acb19 }
+rcu.tree_callback: 13589.776347281 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { func = 0xc10bdc5f }
+rcu.tree_callback: 13589.776354619 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { func = 0xc103c96c }
+rcu.tree_callback: 13589.776357292 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { func = 0xc102b275 }
+kernel.process_free: 13589.776360711 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { pid = 16888 }
+rcu.tree_callback: 13589.776362306 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { func = 0xc10acb19 }
+kernel.softirq_exit: 13589.776365029 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { softirq_id = 9 [softirq 9] }
+kernel.sched_schedule: 13589.776385900 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2711, 2332, icedove-bin, , 2327, 0x0, MODE_UNKNOWN { prev_pid = 1852, next_pid = 2711, prev_state = 0 }
+kernel.syscall_exit: 13589.776806025 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2711, 2332, icedove-bin, , 2327, 0x0, MODE_UNKNOWN { ret = -110 }
+kernel.syscall_entry: 13589.776913085 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2711, 2332, icedove-bin, , 2327, 0x0, SYSCALL { ip = 0xb77a4416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 13589.776917705 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2711, 2332, icedove-bin, , 2327, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.776921937 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2711, 2332, icedove-bin, , 2327, 0x0, SYSCALL { ip = 0xb77a4416, syscall_id = 240 [syscall 240] }
+kernel.syscall_exit: 13589.776930924 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2711, 2332, icedove-bin, , 2327, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.776934381 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2711, 2332, icedove-bin, , 2327, 0x0, SYSCALL { ip = 0xb77a4416, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.776938903 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2711, 2332, icedove-bin, , 2327, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.776942051 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2711, 2332, icedove-bin, , 2327, 0x0, SYSCALL { ip = 0xb77a4416, syscall_id = 240 [syscall 240] }
+kernel.sched_schedule: 13589.776974700 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { prev_pid = 2711, next_pid = 16889, prev_state = 1 }
+kernel.page_fault_entry: 13589.777184606 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xc142b6ad, address = 0xb758a738, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.777222946 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.syscall_exit: 13589.777240109 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.page_fault_entry: 13589.777247360 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb7705416, address = 0xb7705416, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.777267122 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 0 }
+kernel.page_fault_entry: 13589.777294535 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb7625795, address = 0xb7625795, trap_id = 14, write_access = 0 }
+kernel.irq_entry: 13589.777374529 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, IRQ { ip = 3238105433, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.sched_try_wakeup: 13589.777415519 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, IRQ { pid = 2806, cpu_id = 0, state = 1 }
+kernel.irq_exit: 13589.777438343 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { handled = 1 }
+kernel.sched_schedule: 13589.777451834 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { prev_pid = 16889, next_pid = 2806, prev_state = 0 }
+fs.pollfd: 13589.777584521 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { fd = 3 }
+fs.pollfd: 13589.777598813 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { fd = 52 }
+fs.pollfd: 13589.777611368 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { fd = 131 }
+fs.pollfd: 13589.777620916 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { fd = 133 }
+fs.pollfd: 13589.777629706 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { fd = 134 }
+fs.pollfd: 13589.777632565 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { fd = 135 }
+fs.pollfd: 13589.777637265 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { fd = 123 }
+kernel.syscall_exit: 13589.777661500 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.777932952 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 13589.777938842 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.778110516 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.778129613 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { count = 4096, fd = 3 }
+kernel.syscall_exit: 13589.778131086 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.778140030 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 13589.778142574 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.778157802 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 13589.778162688 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 13589.778164751 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 52 }
+fs.pollfd: 13589.778167345 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 131 }
+fs.pollfd: 13589.778168664 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 133 }
+fs.pollfd: 13589.778170234 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 134 }
+fs.pollfd: 13589.778171589 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 135 }
+fs.pollfd: 13589.778172945 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 123 }
+kernel.syscall_exit: 13589.778174454 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.778231055 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.778234171 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { count = 4096, fd = 3 }
+kernel.syscall_exit: 13589.778235520 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.778240813 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 13589.778243258 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.778256391 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 13589.778258215 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 13589.778259743 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 52 }
+fs.pollfd: 13589.778261105 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 131 }
+fs.pollfd: 13589.778262386 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 133 }
+fs.pollfd: 13589.778263710 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 134 }
+fs.pollfd: 13589.778265041 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 135 }
+fs.pollfd: 13589.778266371 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 123 }
+kernel.syscall_exit: 13589.778267776 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.778539537 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.778542937 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { count = 4096, fd = 3 }
+kernel.syscall_exit: 13589.778544342 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.778549775 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 13589.778552904 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.778558997 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 13589.778560888 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 13589.778562398 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 52 }
+fs.pollfd: 13589.778563778 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 131 }
+fs.pollfd: 13589.778565047 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 133 }
+fs.pollfd: 13589.778566728 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 134 }
+fs.pollfd: 13589.778566730 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 135 }
+fs.pollfd: 13589.778566732 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 123 }
+kernel.syscall_exit: 13589.778566734 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.778566736 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 13589.778566740 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.778566742 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.778566744 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { count = 4096, fd = 3 }
+kernel.syscall_exit: 13589.778566746 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.778566748 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 13589.778566752 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.778566754 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 13589.778576091 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 13589.778580439 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 52 }
+fs.pollfd: 13589.778582089 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 131 }
+fs.pollfd: 13589.778583923 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 133 }
+fs.pollfd: 13589.778586191 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 134 }
+fs.pollfd: 13589.778588248 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 135 }
+fs.pollfd: 13589.778589755 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 123 }
+kernel.sched_schedule: 13589.778642788 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { prev_pid = 2806, next_pid = 16889, prev_state = 1 }
+kernel.page_fault_exit: 13589.779035565 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.779068602 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb762579d, address = 0xbfad2e0c, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.779109533 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.page_fault_entry: 13589.779123691 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb76257cd, address = 0xb76eb1cc, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.779135744 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.page_fault_entry: 13589.779147228 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb76257f1, address = 0xb7723288, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.779158909 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.page_fault_entry: 13589.779165445 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb75f5b20, address = 0xb75f5b20, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.779210842 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.779221467 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb7694f36, address = 0xb7694f36, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.779245553 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.779273190 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb7625813, address = 0xb76d036c, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.779284910 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.page_fault_entry: 13589.779294510 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb76d7b10, address = 0xb76d7b10, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.779308581 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.779322035 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb76d7c16, address = 0xb76e9120, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.779332747 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.page_fault_entry: 13589.779337739 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb762588e, address = 0xb76d1378, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.779348296 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.page_fault_entry: 13589.779353467 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb75f7240, address = 0xb75f7240, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.779360440 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.779370077 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb75f7273, address = 0xb76cf34c, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.779380430 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.page_fault_entry: 13589.779386181 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb765774c, address = 0xb765774c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.779393007 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.779402144 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb76267a0, address = 0xb76267a0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.779408556 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.syscall_entry: 13589.779419873 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, SYSCALL { ip = 0xb7705416, syscall_id = 66 [syscall 66] }
+kernel.syscall_exit: 13589.779432790 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { ret = 16889 }
+kernel.page_fault_entry: 13589.779438424 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb764cd60, address = 0xb764cd60, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.779445873 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.syscall_entry: 13589.779453774 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, SYSCALL { ip = 0xb7705416, syscall_id = 12 [syscall 12] }
+kernel.page_fault_entry: 13589.779464387 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xc142b874, address = 0xb76b1186, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.779476328 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, SYSCALL { res = 512 }
+kernel.syscall_exit: 13589.779502582 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.page_fault_entry: 13589.779508561 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb764be6a, address = 0xb764be6a, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.779515635 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.syscall_entry: 13589.779523653 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, SYSCALL { ip = 0xb7705416, syscall_id = 5 [syscall 5] }
+kernel.page_fault_entry: 13589.779529028 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xc142b874, address = 0xb76af329, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.779539597 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, SYSCALL { res = 512 }
+fs.open: 13589.779608295 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16889, 16889, lttd, , 1, 0x0, SYSCALL { fd = 5, filename = "/dev/null" }
+kernel.syscall_exit: 13589.779612941 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { ret = 5 }
+kernel.page_fault_entry: 13589.779620478 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb75a298f, address = 0xb75a298f, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.779629706 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.syscall_entry: 13589.779639065 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, SYSCALL { ip = 0xb7705416, syscall_id = 197 [syscall 197] }
+kernel.syscall_exit: 13589.779643797 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.779647349 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, SYSCALL { ip = 0xb7705416, syscall_id = 63 [syscall 63] }
+kernel.syscall_exit: 13589.779657406 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.779660668 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, SYSCALL { ip = 0xb7705416, syscall_id = 63 [syscall 63] }
+kernel.syscall_exit: 13589.779662033 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 13589.779665066 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, SYSCALL { ip = 0xb7705416, syscall_id = 63 [syscall 63] }
+kernel.syscall_exit: 13589.779666345 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { ret = 2 }
+kernel.syscall_entry: 13589.779669322 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, SYSCALL { ip = 0xb7705416, syscall_id = 6 [syscall 6] }
+fs.close: 13589.779671831 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16889, 16889, lttd, , 1, 0x0, SYSCALL { fd = 5 }
+kernel.syscall_exit: 13589.779673455 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.page_fault_entry: 13589.779683598 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0x804a80c, address = 0x804a80c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.779693532 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.779732270 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0x8048d00, address = 0x8048d00, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.779831244 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.779842938 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb7719b70, address = 0xb7719b70, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.779861532 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.779871329 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb7713ea0, address = 0xb7713ea0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.779877698 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.779887471 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb771d1eb, address = 0xb771d1eb, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.779893568 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.779907739 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb770f160, address = 0xb770f160, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.779914107 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.779923479 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb770eda0, address = 0xb770eda0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.779929909 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.779942437 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb7714e10, address = 0xb7714e10, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.779948281 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.779956540 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb771cb60, address = 0xb771cb60, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.779962371 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.779970730 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb771cb74, address = 0xb77200e3, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.779976741 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.779989972 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb770ee8e, address = 0xb76d324c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.779998219 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.780006664 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb770ee8e, address = 0xb758c76c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780013526 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.780022780 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb770effd, address = 0xb758d260, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780029508 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.780037786 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb770f01d, address = 0xb758ec7c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780043623 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.780051882 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb770ebe0, address = 0xb75949dc, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780058486 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.780066955 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb771cb70, address = 0xb759a3c1, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780073324 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.780081496 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb770ec45, address = 0xb759f1f6, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780087619 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.780098831 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb771cb70, address = 0xb759e766, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780105322 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.780114379 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb770f3f7, address = 0xb7704ca5, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.780131070 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.page_fault_entry: 13589.780136703 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb7713fc0, address = 0x804c478, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.780147384 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.page_fault_entry: 13589.780153593 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb75fc120, address = 0xb75fc120, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780161105 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.780170680 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb75f9c10, address = 0xb75f9c10, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780177525 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.780202450 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb75f9f03, address = 0x871e014, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.780216813 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.page_fault_entry: 13589.780222780 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb75fa0e0, address = 0xb75fa0e0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780229637 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.780241331 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb75fa47d, address = 0x8726020, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.780252110 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.page_fault_entry: 13589.780261123 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb770ebe0, address = 0xb76d4538, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780268011 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.780276572 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb771cb70, address = 0xb76d5368, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780330829 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.780342943 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb770ec45, address = 0xb76d6588, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780350102 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.780359337 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb76d8980, address = 0xb76d8980, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780365589 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.780378666 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb770f01d, address = 0xb758f74c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780385332 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.780393684 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb770ebe0, address = 0xb759752c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780399706 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.780408509 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb771cb70, address = 0xb759cc9a, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780414668 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.780423910 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb7654320, address = 0xb7654320, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780430290 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.780440372 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb76d89be, address = 0xb76e3ad4, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780446389 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.780457354 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb770ebe0, address = 0xb759287c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780463779 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.780472279 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb771cb70, address = 0xb759b605, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780478122 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.syscall_entry: 13589.780490186 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, SYSCALL { ip = 0xb7705416, syscall_id = 192 [syscall 192] }
+kernel.syscall_exit: 13589.780505396 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { ret = -1227321344 }
+kernel.page_fault_entry: 13589.780511152 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb76d8b33, address = 0xb7589de0, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.780585535 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 0 }
+kernel.page_fault_entry: 13589.780640130 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb770ee8e, address = 0xb7706204, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780651355 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.780661881 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb77173f0, address = 0xb77173f0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780668139 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.780677140 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb75fb830, address = 0xb75fb830, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780688481 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.780711177 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb7601510, address = 0xb7601510, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780717787 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.780728103 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb7716ba0, address = 0xb7716ba0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780734398 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.780747235 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb76d901e, address = 0xb76d901e, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780753553 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.syscall_entry: 13589.780775848 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, SYSCALL { ip = 0xb7705416, syscall_id = 125 [syscall 125] }
+kernel.syscall_exit: 13589.780928528 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.page_fault_entry: 13589.780940723 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb770ebe0, address = 0xb75961ac, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780949662 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 13589.780959249 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb765b220, address = 0xb765b220, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.780966470 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.syscall_entry: 13589.780974235 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, SYSCALL { ip = 0xb765b268, syscall_id = 120 [syscall 120] }
+kernel.process_fork: 13589.781038220 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, SYSCALL { parent_pid = 16889, child_pid = 16890, child_tgid = 16889 }
+kernel.sched_wakeup_new_task: 13589.781073500 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, SYSCALL { pid = 16890, state = 0, cpu_id = 0 }
+kernel.syscall_exit: 13589.781342500 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { ret = 16890 }
+kernel.page_fault_entry: 13589.781482826 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, TRAP { ip = 0xb76df630, address = 0xb76df630, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.781499635 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.syscall_entry: 13589.781513465 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16889, 16889, lttd, , 1, 0x0, SYSCALL { ip = 0xb7705416, syscall_id = 240 [syscall 240] }
+kernel.sched_schedule: 13589.781552921 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16888, 0, , , 0, 0x0, MODE_UNKNOWN { prev_pid = 16889, next_pid = 16888, prev_state = 1 }
+kernel.sched_schedule: 13589.781772737 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { prev_pid = 16888, next_pid = 16887, prev_state = 64 }
+mm.page_free: 13589.781953709 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pfn = 79400, order = 1 }
+fd_state.file_descriptor: 13589.782017603 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1883, fd = 0 }
+fd_state.file_descriptor: 13589.782022532 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1883, fd = 1 }
+fd_state.file_descriptor: 13589.782024874 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1883, fd = 2 }
+fd_state.file_descriptor: 13589.782039977 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[5933]", pid = 1883, fd = 3 }
+fd_state.file_descriptor: 13589.782043850 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[5936]", pid = 1883, fd = 4 }
+fd_state.file_descriptor: 13589.782052523 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/tty1", pid = 1906, fd = 0 }
+fd_state.file_descriptor: 13589.782054592 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/tty1", pid = 1906, fd = 1 }
+fd_state.file_descriptor: 13589.782056700 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/tty1", pid = 1906, fd = 2 }
+fd_state.file_descriptor: 13589.782061635 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/tty2", pid = 1907, fd = 0 }
+fd_state.file_descriptor: 13589.782063649 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/tty2", pid = 1907, fd = 1 }
+fd_state.file_descriptor: 13589.782065773 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/tty2", pid = 1907, fd = 2 }
+fd_state.file_descriptor: 13589.782072587 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/tty3", pid = 1908, fd = 0 }
+fd_state.file_descriptor: 13589.782074786 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/tty3", pid = 1908, fd = 1 }
+fd_state.file_descriptor: 13589.782077042 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/tty3", pid = 1908, fd = 2 }
+fd_state.file_descriptor: 13589.782083274 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/tty4", pid = 1909, fd = 0 }
+fd_state.file_descriptor: 13589.782085288 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/tty4", pid = 1909, fd = 1 }
+fd_state.file_descriptor: 13589.782087290 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/tty4", pid = 1909, fd = 2 }
+fd_state.file_descriptor: 13589.782091626 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/tty5", pid = 1910, fd = 0 }
+fd_state.file_descriptor: 13589.782093640 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/tty5", pid = 1910, fd = 1 }
+fd_state.file_descriptor: 13589.782095635 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/tty5", pid = 1910, fd = 2 }
+fd_state.file_descriptor: 13589.782102406 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/tty6", pid = 1911, fd = 0 }
+fd_state.file_descriptor: 13589.782104456 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/tty6", pid = 1911, fd = 1 }
+fd_state.file_descriptor: 13589.782106458 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/tty6", pid = 1911, fd = 2 }
+fd_state.file_descriptor: 13589.782110047 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1913, fd = 0 }
+fd_state.file_descriptor: 13589.782114020 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/log/kdm.log", pid = 1913, fd = 1 }
+fd_state.file_descriptor: 13589.782116176 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/log/kdm.log", pid = 1913, fd = 2 }
+fd_state.file_descriptor: 13589.782119746 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6010]", pid = 1913, fd = 3 }
+fd_state.file_descriptor: 13589.782130723 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6803]", pid = 1913, fd = 4 }
+fd_state.file_descriptor: 13589.782136647 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6889]", pid = 1913, fd = 5 }
+fd_state.file_descriptor: 13589.782140416 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6002]", pid = 1913, fd = 8 }
+fd_state.file_descriptor: 13589.782143238 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6004]", pid = 1913, fd = 10 }
+fd_state.file_descriptor: 13589.782147162 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1921, fd = 0 }
+fd_state.file_descriptor: 13589.782149305 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1921, fd = 1 }
+fd_state.file_descriptor: 13589.782151294 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1921, fd = 2 }
+fd_state.file_descriptor: 13589.782157583 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6044]", pid = 1921, fd = 3 }
+fd_state.file_descriptor: 13589.782159627 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1921, fd = 4 }
+fd_state.file_descriptor: 13589.782162617 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6060]", pid = 1921, fd = 5 }
+fd_state.file_descriptor: 13589.782168850 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[6050]", pid = 1921, fd = 8 }
+fd_state.file_descriptor: 13589.782171976 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1922, fd = 0 }
+fd_state.file_descriptor: 13589.782173946 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1922, fd = 1 }
+fd_state.file_descriptor: 13589.782175929 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1922, fd = 2 }
+fd_state.file_descriptor: 13589.782182051 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6055]", pid = 1922, fd = 3 }
+fd_state.file_descriptor: 13589.782184460 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1922, fd = 4 }
+fd_state.file_descriptor: 13589.782187111 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 1922, fd = 5 }
+fd_state.file_descriptor: 13589.782190002 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6063]", pid = 1922, fd = 6 }
+fd_state.file_descriptor: 13589.782193127 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6064]", pid = 1922, fd = 7 }
+fd_state.file_descriptor: 13589.782197006 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1928, fd = 0 }
+fd_state.file_descriptor: 13589.782199453 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1928, fd = 1 }
+fd_state.file_descriptor: 13589.782202263 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1928, fd = 2 }
+fd_state.file_descriptor: 13589.782208088 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[6197]", pid = 1928, fd = 4 }
+fd_state.file_descriptor: 13589.782216273 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[6129]", pid = 1928, fd = 5 }
+fd_state.file_descriptor: 13589.782219004 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6130]", pid = 1928, fd = 7 }
+fd_state.file_descriptor: 13589.782221512 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6131]", pid = 1928, fd = 8 }
+fd_state.file_descriptor: 13589.782225404 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[6197]", pid = 1938, fd = 0 }
+fd_state.file_descriptor: 13589.782227492 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1938, fd = 1 }
+fd_state.file_descriptor: 13589.782229988 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1938, fd = 2 }
+fd_state.file_descriptor: 13589.782232619 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[6129]", pid = 1938, fd = 5 }
+fd_state.file_descriptor: 13589.782237258 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[6128]", pid = 1963, fd = 0 }
+fd_state.file_descriptor: 13589.782239512 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[6129]", pid = 1963, fd = 1 }
+fd_state.file_descriptor: 13589.782241515 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[6129]", pid = 1963, fd = 2 }
+fd_state.file_descriptor: 13589.782250237 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6348]", pid = 1963, fd = 3 }
+fd_state.file_descriptor: 13589.782253190 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6352]", pid = 1963, fd = 4 }
+fd_state.file_descriptor: 13589.782256068 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[6128]", pid = 1973, fd = 0 }
+fd_state.file_descriptor: 13589.782258089 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[6129]", pid = 1973, fd = 1 }
+fd_state.file_descriptor: 13589.782260177 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[6129]", pid = 1973, fd = 2 }
+fd_state.file_descriptor: 13589.782265477 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6384]", pid = 1973, fd = 3 }
+fd_state.file_descriptor: 13589.782268597 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6389]", pid = 1973, fd = 4 }
+fd_state.file_descriptor: 13589.782276182 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[6128]", pid = 1989, fd = 0 }
+fd_state.file_descriptor: 13589.782278233 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[6129]", pid = 1989, fd = 1 }
+fd_state.file_descriptor: 13589.782280303 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[6129]", pid = 1989, fd = 2 }
+fd_state.file_descriptor: 13589.782282897 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6461]", pid = 1989, fd = 3 }
+fd_state.file_descriptor: 13589.782285633 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6466]", pid = 1989, fd = 4 }
+fd_state.file_descriptor: 13589.782292367 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8572]", pid = 1989, fd = 5 }
+fd_state.file_descriptor: 13589.782295023 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8585]", pid = 1989, fd = 6 }
+fd_state.file_descriptor: 13589.782297722 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8588]", pid = 1989, fd = 8 }
+fd_state.file_descriptor: 13589.782300125 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8590]", pid = 1989, fd = 9 }
+fd_state.file_descriptor: 13589.782309355 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[120084]", pid = 1989, fd = 10 }
+fd_state.file_descriptor: 13589.782315402 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[113500]", pid = 1989, fd = 11 }
+fd_state.file_descriptor: 13589.782327071 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[10118]", pid = 1989, fd = 17 }
+fd_state.file_descriptor: 13589.782361301 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[11199]", pid = 1989, fd = 26 }
+fd_state.file_descriptor: 13589.782371117 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2043, fd = 0 }
+fd_state.file_descriptor: 13589.782377009 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2043, fd = 1 }
+fd_state.file_descriptor: 13589.782379234 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2043, fd = 2 }
+fd_state.file_descriptor: 13589.782384460 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/bin/startkde", pid = 2043, fd = 255 }
+fd_state.file_descriptor: 13589.782388178 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2103, fd = 0 }
+fd_state.file_descriptor: 13589.782390334 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2103, fd = 1 }
+fd_state.file_descriptor: 13589.782392342 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2103, fd = 2 }
+fd_state.file_descriptor: 13589.782394986 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/vboxuser", pid = 2103, fd = 3 }
+fd_state.file_descriptor: 13589.782398642 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.vboxclient-clipboard.pid", pid = 2103, fd = 4 }
+fd_state.file_descriptor: 13589.782402158 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6945]", pid = 2103, fd = 5 }
+fd_state.file_descriptor: 13589.782404814 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[6947]", pid = 2103, fd = 6 }
+fd_state.file_descriptor: 13589.782407155 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[6947]", pid = 2103, fd = 7 }
+fd_state.file_descriptor: 13589.782410182 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2109, fd = 0 }
+fd_state.file_descriptor: 13589.782412221 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2109, fd = 1 }
+fd_state.file_descriptor: 13589.782414210 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2109, fd = 2 }
+fd_state.file_descriptor: 13589.782416582 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/vboxuser", pid = 2109, fd = 3 }
+fd_state.file_descriptor: 13589.782419683 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.vboxclient-autoresize.pid", pid = 2109, fd = 4 }
+fd_state.file_descriptor: 13589.782423001 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6994]", pid = 2109, fd = 5 }
+fd_state.file_descriptor: 13589.782426540 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2113, fd = 0 }
+fd_state.file_descriptor: 13589.782428628 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2113, fd = 1 }
+fd_state.file_descriptor: 13589.782430580 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2113, fd = 2 }
+fd_state.file_descriptor: 13589.782432631 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/vboxuser", pid = 2113, fd = 3 }
+fd_state.file_descriptor: 13589.782435565 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.vboxclient-seamless.pid", pid = 2113, fd = 4 }
+fd_state.file_descriptor: 13589.782438394 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6954]", pid = 2113, fd = 5 }
+fd_state.file_descriptor: 13589.782440853 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6957]", pid = 2113, fd = 6 }
+fd_state.file_descriptor: 13589.782444226 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2118, fd = 0 }
+fd_state.file_descriptor: 13589.782446190 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2118, fd = 1 }
+fd_state.file_descriptor: 13589.782448253 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2118, fd = 2 }
+fd_state.file_descriptor: 13589.782450724 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6961]", pid = 2118, fd = 3 }
+fd_state.file_descriptor: 13589.782453257 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2124, fd = 0 }
+fd_state.file_descriptor: 13589.782455456 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2124, fd = 1 }
+fd_state.file_descriptor: 13589.782457618 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2124, fd = 2 }
+fd_state.file_descriptor: 13589.782460009 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6965]", pid = 2124, fd = 3 }
+fd_state.file_descriptor: 13589.782461960 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2124, fd = 4 }
+fd_state.file_descriptor: 13589.782464420 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6979]", pid = 2124, fd = 5 }
+fd_state.file_descriptor: 13589.782469892 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[6971]", pid = 2124, fd = 8 }
+fd_state.file_descriptor: 13589.782472741 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2128, fd = 0 }
+fd_state.file_descriptor: 13589.782474755 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2128, fd = 1 }
+fd_state.file_descriptor: 13589.782476719 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2128, fd = 2 }
+fd_state.file_descriptor: 13589.782479376 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6978]", pid = 2128, fd = 3 }
+fd_state.file_descriptor: 13589.782481692 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2128, fd = 4 }
+fd_state.file_descriptor: 13589.782483768 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 2128, fd = 5 }
+fd_state.file_descriptor: 13589.782486164 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6981]", pid = 2128, fd = 6 }
+fd_state.file_descriptor: 13589.782488758 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[6982]", pid = 2128, fd = 7 }
+fd_state.file_descriptor: 13589.782494059 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7080]", pid = 2128, fd = 8 }
+fd_state.file_descriptor: 13589.782496579 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7093]", pid = 2128, fd = 9 }
+fd_state.file_descriptor: 13589.782504202 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8510]", pid = 2128, fd = 10 }
+fd_state.file_descriptor: 13589.782507019 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7218]", pid = 2128, fd = 11 }
+fd_state.file_descriptor: 13589.782513647 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7246]", pid = 2128, fd = 12 }
+fd_state.file_descriptor: 13589.782516396 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7261]", pid = 2128, fd = 13 }
+fd_state.file_descriptor: 13589.782519540 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7311]", pid = 2128, fd = 14 }
+fd_state.file_descriptor: 13589.782526503 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[12340]", pid = 2128, fd = 15 }
+fd_state.file_descriptor: 13589.782531444 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7323]", pid = 2128, fd = 16 }
+fd_state.file_descriptor: 13589.782536868 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7518]", pid = 2128, fd = 17 }
+fd_state.file_descriptor: 13589.782542026 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7866]", pid = 2128, fd = 18 }
+fd_state.file_descriptor: 13589.782544985 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7537]", pid = 2128, fd = 19 }
+fd_state.file_descriptor: 13589.782552601 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7876]", pid = 2128, fd = 20 }
+fd_state.file_descriptor: 13589.782557532 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7575]", pid = 2128, fd = 21 }
+fd_state.file_descriptor: 13589.782564932 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7826]", pid = 2128, fd = 23 }
+fd_state.file_descriptor: 13589.782570201 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7967]", pid = 2128, fd = 24 }
+fd_state.file_descriptor: 13589.782575137 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8053]", pid = 2128, fd = 25 }
+fd_state.file_descriptor: 13589.782577577 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8058]", pid = 2128, fd = 26 }
+fd_state.file_descriptor: 13589.782582408 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8074]", pid = 2128, fd = 28 }
+fd_state.file_descriptor: 13589.782587097 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8525]", pid = 2128, fd = 29 }
+fd_state.file_descriptor: 13589.782589808 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2174, fd = 0 }
+fd_state.file_descriptor: 13589.782591939 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2174, fd = 1 }
+fd_state.file_descriptor: 13589.782594158 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2174, fd = 2 }
+fd_state.file_descriptor: 13589.782599161 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7067]", pid = 2174, fd = 3 }
+fd_state.file_descriptor: 13589.782605666 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7071]", pid = 2174, fd = 4 }
+fd_state.file_descriptor: 13589.782608242 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7067]", pid = 2174, fd = 5 }
+fd_state.file_descriptor: 13589.782610750 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7068]", pid = 2174, fd = 6 }
+fd_state.file_descriptor: 13589.782612732 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7071]", pid = 2174, fd = 7 }
+fd_state.file_descriptor: 13589.782615402 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7085]", pid = 2174, fd = 8 }
+fd_state.file_descriptor: 13589.782622289 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7201]", pid = 2174, fd = 9 }
+fd_state.file_descriptor: 13589.782624322 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7071]", pid = 2174, fd = 10 }
+fd_state.file_descriptor: 13589.782626360 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7071]", pid = 2174, fd = 11 }
+fd_state.file_descriptor: 13589.782628510 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7071]", pid = 2174, fd = 12 }
+fd_state.file_descriptor: 13589.782630560 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7071]", pid = 2174, fd = 14 }
+fd_state.file_descriptor: 13589.782632636 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7071]", pid = 2174, fd = 15 }
+fd_state.file_descriptor: 13589.782636040 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2175, fd = 0 }
+fd_state.file_descriptor: 13589.782638233 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2175, fd = 1 }
+fd_state.file_descriptor: 13589.782640463 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2175, fd = 2 }
+fd_state.file_descriptor: 13589.782643391 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7076]", pid = 2175, fd = 3 }
+fd_state.file_descriptor: 13589.782645850 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7076]", pid = 2175, fd = 4 }
+fd_state.file_descriptor: 13589.782648568 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7078]", pid = 2175, fd = 5 }
+fd_state.file_descriptor: 13589.782650958 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7078]", pid = 2175, fd = 6 }
+fd_state.file_descriptor: 13589.782653417 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7079]", pid = 2175, fd = 7 }
+fd_state.file_descriptor: 13589.782656179 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7072]", pid = 2175, fd = 8 }
+fd_state.file_descriptor: 13589.782658903 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7083]", pid = 2175, fd = 9 }
+fd_state.file_descriptor: 13589.782661559 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7087]", pid = 2175, fd = 10 }
+fd_state.file_descriptor: 13589.782664111 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7087]", pid = 2175, fd = 11 }
+fd_state.file_descriptor: 13589.782675224 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/tmp/kdecache-william/ksycoca4", pid = 2175, fd = 12 }
+fd_state.file_descriptor: 13589.782681573 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[135885]", pid = 2175, fd = 13 }
+fd_state.file_descriptor: 13589.782687430 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[9382]", pid = 2175, fd = 15 }
+fd_state.file_descriptor: 13589.782690852 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2177, fd = 0 }
+fd_state.file_descriptor: 13589.782692903 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2177, fd = 1 }
+fd_state.file_descriptor: 13589.782695615 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2177, fd = 2 }
+fd_state.file_descriptor: 13589.782698907 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7096]", pid = 2177, fd = 3 }
+fd_state.file_descriptor: 13589.782701224 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7096]", pid = 2177, fd = 4 }
+fd_state.file_descriptor: 13589.782703819 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7092]", pid = 2177, fd = 5 }
+fd_state.file_descriptor: 13589.782706412 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7100]", pid = 2177, fd = 6 }
+fd_state.file_descriptor: 13589.782708686 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7100]", pid = 2177, fd = 7 }
+fd_state.file_descriptor: 13589.782711318 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7102]", pid = 2177, fd = 8 }
+fd_state.file_descriptor: 13589.782713554 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 2177, fd = 9 }
+fd_state.file_descriptor: 13589.782719033 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/tmp/kdecache-william/ksycoca4", pid = 2177, fd = 10 }
+fd_state.file_descriptor: 13589.782722647 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7140]", pid = 2177, fd = 11 }
+fd_state.file_descriptor: 13589.782725358 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/ptmx", pid = 2177, fd = 12 }
+fd_state.file_descriptor: 13589.782733031 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/1", pid = 2177, fd = 13 }
+fd_state.file_descriptor: 13589.782739789 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2204, fd = 0 }
+fd_state.file_descriptor: 13589.782742359 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2204, fd = 1 }
+fd_state.file_descriptor: 13589.782744837 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2204, fd = 2 }
+fd_state.file_descriptor: 13589.782747721 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7200]", pid = 2204, fd = 3 }
+fd_state.file_descriptor: 13589.782755758 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2205, fd = 0 }
+fd_state.file_descriptor: 13589.782757896 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2205, fd = 1 }
+fd_state.file_descriptor: 13589.782760119 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2205, fd = 2 }
+fd_state.file_descriptor: 13589.782762880 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7211]", pid = 2205, fd = 3 }
+fd_state.file_descriptor: 13589.782765147 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7211]", pid = 2205, fd = 4 }
+fd_state.file_descriptor: 13589.782768311 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7214]", pid = 2205, fd = 5 }
+fd_state.file_descriptor: 13589.782770547 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7214]", pid = 2205, fd = 6 }
+fd_state.file_descriptor: 13589.782773030 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7215]", pid = 2205, fd = 7 }
+fd_state.file_descriptor: 13589.782776156 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7217]", pid = 2205, fd = 8 }
+fd_state.file_descriptor: 13589.782784360 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7228]", pid = 2205, fd = 9 }
+fd_state.file_descriptor: 13589.782787109 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7229]", pid = 2205, fd = 10 }
+fd_state.file_descriptor: 13589.782789690 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7249]", pid = 2205, fd = 11 }
+fd_state.file_descriptor: 13589.782794701 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7237]", pid = 2205, fd = 12 }
+fd_state.file_descriptor: 13589.782797579 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7233]", pid = 2205, fd = 13 }
+fd_state.file_descriptor: 13589.782802632 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7233]", pid = 2205, fd = 14 }
+fd_state.file_descriptor: 13589.782804855 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7237]", pid = 2205, fd = 15 }
+fd_state.file_descriptor: 13589.782808229 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7234]", pid = 2205, fd = 16 }
+fd_state.file_descriptor: 13589.782810971 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7276]", pid = 2205, fd = 17 }
+fd_state.file_descriptor: 13589.782816538 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7300]", pid = 2205, fd = 18 }
+fd_state.file_descriptor: 13589.782821405 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7340]", pid = 2205, fd = 19 }
+fd_state.file_descriptor: 13589.782826828 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7577]", pid = 2205, fd = 20 }
+fd_state.file_descriptor: 13589.782830338 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7607]", pid = 2205, fd = 21 }
+fd_state.file_descriptor: 13589.782835626 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7851]", pid = 2205, fd = 22 }
+fd_state.file_descriptor: 13589.782843112 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7614]", pid = 2205, fd = 23 }
+fd_state.file_descriptor: 13589.782846041 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7869]", pid = 2205, fd = 24 }
+fd_state.file_descriptor: 13589.782848777 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7893]", pid = 2205, fd = 25 }
+fd_state.file_descriptor: 13589.782851427 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8056]", pid = 2205, fd = 26 }
+fd_state.file_descriptor: 13589.782854120 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8061]", pid = 2205, fd = 27 }
+fd_state.file_descriptor: 13589.782860366 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8084]", pid = 2205, fd = 29 }
+fd_state.file_descriptor: 13589.782866203 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8229]", pid = 2205, fd = 30 }
+fd_state.file_descriptor: 13589.782870960 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7234]", pid = 2207, fd = 0 }
+fd_state.file_descriptor: 13589.782873085 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2207, fd = 1 }
+fd_state.file_descriptor: 13589.782875605 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2207, fd = 2 }
+fd_state.file_descriptor: 13589.782878769 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7239]", pid = 2207, fd = 3 }
+fd_state.file_descriptor: 13589.782881110 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7239]", pid = 2207, fd = 4 }
+fd_state.file_descriptor: 13589.782883815 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7242]", pid = 2207, fd = 5 }
+fd_state.file_descriptor: 13589.782885965 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7242]", pid = 2207, fd = 6 }
+fd_state.file_descriptor: 13589.782888782 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7243]", pid = 2207, fd = 7 }
+fd_state.file_descriptor: 13589.782891642 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7245]", pid = 2207, fd = 8 }
+fd_state.file_descriptor: 13589.782894527 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7248]", pid = 2207, fd = 9 }
+fd_state.file_descriptor: 13589.782896900 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 2207, fd = 10 }
+fd_state.file_descriptor: 13589.782899858 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7299]", pid = 2207, fd = 12 }
+fd_state.file_descriptor: 13589.782902872 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2209, fd = 0 }
+fd_state.file_descriptor: 13589.782905034 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2209, fd = 1 }
+fd_state.file_descriptor: 13589.782907259 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2209, fd = 2 }
+fd_state.file_descriptor: 13589.782912651 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7266]", pid = 2209, fd = 3 }
+fd_state.file_descriptor: 13589.782914955 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7266]", pid = 2209, fd = 4 }
+fd_state.file_descriptor: 13589.782917896 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7260]", pid = 2209, fd = 5 }
+fd_state.file_descriptor: 13589.782920954 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7270]", pid = 2209, fd = 6 }
+fd_state.file_descriptor: 13589.782923215 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7270]", pid = 2209, fd = 7 }
+fd_state.file_descriptor: 13589.782925969 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7273]", pid = 2209, fd = 8 }
+fd_state.file_descriptor: 13589.782928855 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7275]", pid = 2209, fd = 9 }
+fd_state.file_descriptor: 13589.782931894 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2212, fd = 0 }
+fd_state.file_descriptor: 13589.782933988 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2212, fd = 1 }
+fd_state.file_descriptor: 13589.782936137 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2212, fd = 2 }
+fd_state.file_descriptor: 13589.782939190 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7335]", pid = 2212, fd = 3 }
+fd_state.file_descriptor: 13589.782941389 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7335]", pid = 2212, fd = 4 }
+fd_state.file_descriptor: 13589.782943989 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7310]", pid = 2212, fd = 5 }
+fd_state.file_descriptor: 13589.782949000 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7336]", pid = 2212, fd = 6 }
+fd_state.file_descriptor: 13589.782951229 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7336]", pid = 2212, fd = 7 }
+fd_state.file_descriptor: 13589.782954509 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7337]", pid = 2212, fd = 8 }
+fd_state.file_descriptor: 13589.782960168 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8398]", pid = 2212, fd = 10 }
+fd_state.file_descriptor: 13589.782964714 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8398]", pid = 2212, fd = 11 }
+fd_state.file_descriptor: 13589.782973733 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/snd/controlC0", pid = 2212, fd = 12 }
+fd_state.file_descriptor: 13589.782976717 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2213, fd = 0 }
+fd_state.file_descriptor: 13589.782978897 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2213, fd = 1 }
+fd_state.file_descriptor: 13589.782981079 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2213, fd = 2 }
+fd_state.file_descriptor: 13589.782984599 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7326]", pid = 2213, fd = 3 }
+fd_state.file_descriptor: 13589.782986934 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7326]", pid = 2213, fd = 4 }
+fd_state.file_descriptor: 13589.782989968 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7322]", pid = 2213, fd = 5 }
+fd_state.file_descriptor: 13589.782992513 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7328]", pid = 2213, fd = 6 }
+fd_state.file_descriptor: 13589.782994656 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7328]", pid = 2213, fd = 7 }
+fd_state.file_descriptor: 13589.782997287 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7333]", pid = 2213, fd = 8 }
+fd_state.file_descriptor: 13589.782999944 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7339]", pid = 2213, fd = 9 }
+fd_state.file_descriptor: 13589.783002372 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 2213, fd = 10 }
+fd_state.file_descriptor: 13589.783005151 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/tmp/kdecache-william/ksycoca4", pid = 2213, fd = 11 }
+fd_state.file_descriptor: 13589.783008556 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7380]", pid = 2213, fd = 12 }
+fd_state.file_descriptor: 13589.783014022 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7384]", pid = 2213, fd = 14 }
+fd_state.file_descriptor: 13589.783016265 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7384]", pid = 2213, fd = 15 }
+fd_state.file_descriptor: 13589.783019347 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2218, fd = 0 }
+fd_state.file_descriptor: 13589.783021460 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2218, fd = 1 }
+fd_state.file_descriptor: 13589.783023653 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2218, fd = 2 }
+fd_state.file_descriptor: 13589.783031578 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7458]", pid = 2218, fd = 3 }
+fd_state.file_descriptor: 13589.783036051 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7458]", pid = 2218, fd = 4 }
+fd_state.file_descriptor: 13589.783041617 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7461]", pid = 2218, fd = 5 }
+fd_state.file_descriptor: 13589.783046719 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7461]", pid = 2218, fd = 6 }
+fd_state.file_descriptor: 13589.783050210 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[9380]", pid = 2218, fd = 7 }
+fd_state.file_descriptor: 13589.783053372 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2224, fd = 0 }
+fd_state.file_descriptor: 13589.783055559 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2224, fd = 1 }
+fd_state.file_descriptor: 13589.783057715 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2224, fd = 2 }
+fd_state.file_descriptor: 13589.783060952 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7528]", pid = 2224, fd = 3 }
+fd_state.file_descriptor: 13589.783063201 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7528]", pid = 2224, fd = 4 }
+fd_state.file_descriptor: 13589.783066759 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7517]", pid = 2224, fd = 5 }
+fd_state.file_descriptor: 13589.783069422 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7529]", pid = 2224, fd = 6 }
+fd_state.file_descriptor: 13589.783071707 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7529]", pid = 2224, fd = 7 }
+fd_state.file_descriptor: 13589.783077032 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7532]", pid = 2224, fd = 8 }
+fd_state.file_descriptor: 13589.783079891 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7576]", pid = 2224, fd = 9 }
+fd_state.file_descriptor: 13589.783085328 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7643]", pid = 2224, fd = 11 }
+fd_state.file_descriptor: 13589.783087885 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7643]", pid = 2224, fd = 14 }
+fd_state.file_descriptor: 13589.783091481 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2227, fd = 0 }
+fd_state.file_descriptor: 13589.783093600 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2227, fd = 1 }
+fd_state.file_descriptor: 13589.783095910 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2227, fd = 2 }
+fd_state.file_descriptor: 13589.783098708 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7545]", pid = 2227, fd = 3 }
+fd_state.file_descriptor: 13589.783100920 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7545]", pid = 2227, fd = 4 }
+fd_state.file_descriptor: 13589.783103589 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7536]", pid = 2227, fd = 5 }
+fd_state.file_descriptor: 13589.783106177 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7553]", pid = 2227, fd = 6 }
+fd_state.file_descriptor: 13589.783108468 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7553]", pid = 2227, fd = 7 }
+fd_state.file_descriptor: 13589.783111044 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7572]", pid = 2227, fd = 8 }
+fd_state.file_descriptor: 13589.783114047 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7605]", pid = 2227, fd = 9 }
+fd_state.file_descriptor: 13589.783116888 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7631]", pid = 2227, fd = 10 }
+fd_state.file_descriptor: 13589.783119124 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 2227, fd = 11 }
+fd_state.file_descriptor: 13589.783124987 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7890]", pid = 2227, fd = 13 }
+fd_state.file_descriptor: 13589.783131405 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2228, fd = 0 }
+fd_state.file_descriptor: 13589.783133493 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2228, fd = 1 }
+fd_state.file_descriptor: 13589.783135674 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2228, fd = 2 }
+fd_state.file_descriptor: 13589.783141184 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7585]", pid = 2228, fd = 3 }
+fd_state.file_descriptor: 13589.783143445 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7585]", pid = 2228, fd = 4 }
+fd_state.file_descriptor: 13589.783146472 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7574]", pid = 2228, fd = 5 }
+fd_state.file_descriptor: 13589.783149430 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7587]", pid = 2228, fd = 6 }
+fd_state.file_descriptor: 13589.783151593 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7587]", pid = 2228, fd = 7 }
+fd_state.file_descriptor: 13589.783154373 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7594]", pid = 2228, fd = 8 }
+fd_state.file_descriptor: 13589.783157393 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7613]", pid = 2228, fd = 9 }
+fd_state.file_descriptor: 13589.783162823 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7837]", pid = 2228, fd = 13 }
+fd_state.file_descriptor: 13589.783165097 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7837]", pid = 2228, fd = 14 }
+fd_state.file_descriptor: 13589.783173398 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7917]", pid = 2228, fd = 15 }
+fd_state.file_descriptor: 13589.783176191 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7838]", pid = 2228, fd = 16 }
+fd_state.file_descriptor: 13589.783181028 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7839]", pid = 2228, fd = 17 }
+fd_state.file_descriptor: 13589.783183191 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7917]", pid = 2228, fd = 18 }
+fd_state.file_descriptor: 13589.783185791 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7840]", pid = 2228, fd = 19 }
+fd_state.file_descriptor: 13589.783193500 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7936]", pid = 2228, fd = 20 }
+fd_state.file_descriptor: 13589.783196194 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7843]", pid = 2228, fd = 21 }
+fd_state.file_descriptor: 13589.783198380 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7843]", pid = 2228, fd = 22 }
+fd_state.file_descriptor: 13589.783201030 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7918]", pid = 2228, fd = 23 }
+fd_state.file_descriptor: 13589.783203507 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7919]", pid = 2228, fd = 24 }
+fd_state.file_descriptor: 13589.783205991 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7936]", pid = 2228, fd = 25 }
+fd_state.file_descriptor: 13589.783208388 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7920]", pid = 2228, fd = 26 }
+fd_state.file_descriptor: 13589.783211118 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7937]", pid = 2228, fd = 28 }
+fd_state.file_descriptor: 13589.783214220 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7938]", pid = 2228, fd = 29 }
+fd_state.file_descriptor: 13589.783216604 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7939]", pid = 2228, fd = 31 }
+fd_state.file_descriptor: 13589.783219495 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7953]", pid = 2228, fd = 32 }
+fd_state.file_descriptor: 13589.783221780 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7953]", pid = 2228, fd = 35 }
+fd_state.file_descriptor: 13589.783224140 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7954]", pid = 2228, fd = 38 }
+fd_state.file_descriptor: 13589.783226778 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7955]", pid = 2228, fd = 39 }
+fd_state.file_descriptor: 13589.783229193 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7956]", pid = 2228, fd = 41 }
+fd_state.file_descriptor: 13589.783233549 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2237, fd = 0 }
+fd_state.file_descriptor: 13589.783235680 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2237, fd = 1 }
+fd_state.file_descriptor: 13589.783237959 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2237, fd = 2 }
+fd_state.file_descriptor: 13589.783240763 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7831]", pid = 2237, fd = 3 }
+fd_state.file_descriptor: 13589.783243030 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7831]", pid = 2237, fd = 4 }
+fd_state.file_descriptor: 13589.783248683 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7825]", pid = 2237, fd = 5 }
+fd_state.file_descriptor: 13589.783251475 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7833]", pid = 2237, fd = 6 }
+fd_state.file_descriptor: 13589.783253686 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7833]", pid = 2237, fd = 7 }
+fd_state.file_descriptor: 13589.783256745 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7841]", pid = 2237, fd = 8 }
+fd_state.file_descriptor: 13589.783259444 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7850]", pid = 2237, fd = 9 }
+fd_state.file_descriptor: 13589.783261859 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/snd/controlC0", pid = 2237, fd = 10 }
+fd_state.file_descriptor: 13589.783264837 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7894]", pid = 2237, fd = 11 }
+fd_state.file_descriptor: 13589.783267536 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7966]", pid = 2237, fd = 12 }
+fd_state.file_descriptor: 13589.783270958 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7838]", pid = 2239, fd = 0 }
+fd_state.file_descriptor: 13589.783273239 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7839]", pid = 2239, fd = 1 }
+fd_state.file_descriptor: 13589.783275529 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7840]", pid = 2239, fd = 2 }
+fd_state.file_descriptor: 13589.783277964 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7852]", pid = 2239, fd = 3 }
+fd_state.file_descriptor: 13589.783280305 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7852]", pid = 2239, fd = 4 }
+fd_state.file_descriptor: 13589.783283024 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7856]", pid = 2239, fd = 5 }
+fd_state.file_descriptor: 13589.783285223 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7856]", pid = 2239, fd = 6 }
+fd_state.file_descriptor: 13589.783290658 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7857]", pid = 2239, fd = 7 }
+fd_state.file_descriptor: 13589.783293462 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7865]", pid = 2239, fd = 8 }
+fd_state.file_descriptor: 13589.783296200 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7868]", pid = 2239, fd = 9 }
+fd_state.file_descriptor: 13589.783299103 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/urandom", pid = 2239, fd = 11 }
+fd_state.file_descriptor: 13589.783307696 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.kde/share/apps/nepomuk/repository/main/data/redland/soprano-sp2o.db", pid = 2239, fd = 12 }
+fd_state.file_descriptor: 13589.783311309 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.kde/share/apps/nepomuk/repository/main/data/redland/soprano-po2s.db", pid = 2239, fd = 13 }
+fd_state.file_descriptor: 13589.783314596 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.kde/share/apps/nepomuk/repository/main/data/redland/soprano-so2p.db", pid = 2239, fd = 14 }
+fd_state.file_descriptor: 13589.783317790 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.kde/share/apps/nepomuk/repository/main/data/redland/soprano-contexts.db", pid = 2239, fd = 15 }
+fd_state.file_descriptor: 13589.783321162 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7914]", pid = 2239, fd = 16 }
+fd_state.file_descriptor: 13589.783324276 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8070]", pid = 2239, fd = 17 }
+fd_state.file_descriptor: 13589.783327012 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8087]", pid = 2239, fd = 18 }
+fd_state.file_descriptor: 13589.783330039 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8108]", pid = 2239, fd = 20 }
+fd_state.file_descriptor: 13589.783333992 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2241, fd = 0 }
+fd_state.file_descriptor: 13589.783336148 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2241, fd = 1 }
+fd_state.file_descriptor: 13589.783338385 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2241, fd = 2 }
+fd_state.file_descriptor: 13589.783341677 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7885]", pid = 2241, fd = 3 }
+fd_state.file_descriptor: 13589.783344166 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7885]", pid = 2241, fd = 4 }
+fd_state.file_descriptor: 13589.783347219 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7875]", pid = 2241, fd = 5 }
+fd_state.file_descriptor: 13589.783350560 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7887]", pid = 2241, fd = 6 }
+fd_state.file_descriptor: 13589.783352827 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7887]", pid = 2241, fd = 7 }
+fd_state.file_descriptor: 13589.783355818 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7888]", pid = 2241, fd = 8 }
+fd_state.file_descriptor: 13589.783358616 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[7892]", pid = 2241, fd = 9 }
+fd_state.file_descriptor: 13589.783360833 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/ptmx", pid = 2241, fd = 10 }
+fd_state.file_descriptor: 13589.783515787 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/0", pid = 2241, fd = 11 }
+fd_state.file_descriptor: 13589.783518906 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/ptmx", pid = 2241, fd = 12 }
+fd_state.file_descriptor: 13589.783534999 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/2", pid = 2241, fd = 13 }
+fd_state.file_descriptor: 13589.783540349 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7974]", pid = 2241, fd = 14 }
+fd_state.file_descriptor: 13589.783542504 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7974]", pid = 2241, fd = 15 }
+fd_state.file_descriptor: 13589.783545043 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/ptmx", pid = 2241, fd = 16 }
+fd_state.file_descriptor: 13589.783548139 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7975]", pid = 2241, fd = 17 }
+fd_state.file_descriptor: 13589.783553556 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/3", pid = 2241, fd = 18 }
+fd_state.file_descriptor: 13589.783556657 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[10928]", pid = 2241, fd = 19 }
+fd_state.file_descriptor: 13589.783560320 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[10928]", pid = 2241, fd = 20 }
+fd_state.file_descriptor: 13589.783562840 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/ptmx", pid = 2241, fd = 21 }
+fd_state.file_descriptor: 13589.783565713 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7988]", pid = 2241, fd = 22 }
+fd_state.file_descriptor: 13589.783567882 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7988]", pid = 2241, fd = 23 }
+fd_state.file_descriptor: 13589.783570989 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[10929]", pid = 2241, fd = 24 }
+fd_state.file_descriptor: 13589.783574763 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 2241, fd = 25 }
+fd_state.file_descriptor: 13589.783578030 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[55693]", pid = 2241, fd = 26 }
+fd_state.file_descriptor: 13589.783580323 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[55693]", pid = 2241, fd = 27 }
+fd_state.file_descriptor: 13589.783587130 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[55694]", pid = 2241, fd = 29 }
+fd_state.file_descriptor: 13589.783590608 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[129890]", pid = 2241, fd = 31 }
+fd_state.file_descriptor: 13589.783593066 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[129890]", pid = 2241, fd = 32 }
+fd_state.file_descriptor: 13589.783595773 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[129891]", pid = 2241, fd = 34 }
+fd_state.file_descriptor: 13589.783600739 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7918]", pid = 2243, fd = 0 }
+fd_state.file_descriptor: 13589.783602932 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7919]", pid = 2243, fd = 1 }
+fd_state.file_descriptor: 13589.783605328 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7920]", pid = 2243, fd = 2 }
+fd_state.file_descriptor: 13589.783608566 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7993]", pid = 2243, fd = 3 }
+fd_state.file_descriptor: 13589.783610796 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7993]", pid = 2243, fd = 4 }
+fd_state.file_descriptor: 13589.783613557 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7996]", pid = 2243, fd = 5 }
+fd_state.file_descriptor: 13589.783615706 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7996]", pid = 2243, fd = 6 }
+fd_state.file_descriptor: 13589.783618875 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8001]", pid = 2243, fd = 7 }
+fd_state.file_descriptor: 13589.783621557 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8057]", pid = 2243, fd = 8 }
+fd_state.file_descriptor: 13589.783624268 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8060]", pid = 2243, fd = 9 }
+fd_state.file_descriptor: 13589.783627123 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8086]", pid = 2243, fd = 11 }
+fd_state.file_descriptor: 13589.783629532 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 2243, fd = 12 }
+fd_state.file_descriptor: 13589.783636425 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7937]", pid = 2245, fd = 0 }
+fd_state.file_descriptor: 13589.783638953 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7938]", pid = 2245, fd = 1 }
+fd_state.file_descriptor: 13589.783641275 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7939]", pid = 2245, fd = 2 }
+fd_state.file_descriptor: 13589.783643882 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7997]", pid = 2245, fd = 3 }
+fd_state.file_descriptor: 13589.783646167 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7997]", pid = 2245, fd = 4 }
+fd_state.file_descriptor: 13589.783648743 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8000]", pid = 2245, fd = 5 }
+fd_state.file_descriptor: 13589.783651245 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8000]", pid = 2245, fd = 6 }
+fd_state.file_descriptor: 13589.783653988 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8018]", pid = 2245, fd = 7 }
+fd_state.file_descriptor: 13589.783656953 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8052]", pid = 2245, fd = 8 }
+fd_state.file_descriptor: 13589.783660277 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8055]", pid = 2245, fd = 9 }
+fd_state.file_descriptor: 13589.783663149 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8069]", pid = 2245, fd = 11 }
+fd_state.file_descriptor: 13589.783671668 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7954]", pid = 2247, fd = 0 }
+fd_state.file_descriptor: 13589.783673935 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7955]", pid = 2247, fd = 1 }
+fd_state.file_descriptor: 13589.783676146 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[7956]", pid = 2247, fd = 2 }
+fd_state.file_descriptor: 13589.783678556 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8022]", pid = 2247, fd = 3 }
+fd_state.file_descriptor: 13589.783680712 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8022]", pid = 2247, fd = 4 }
+fd_state.file_descriptor: 13589.783683646 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8028]", pid = 2247, fd = 5 }
+fd_state.file_descriptor: 13589.783685746 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8028]", pid = 2247, fd = 6 }
+fd_state.file_descriptor: 13589.783688321 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8040]", pid = 2247, fd = 7 }
+fd_state.file_descriptor: 13589.783691503 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8073]", pid = 2247, fd = 8 }
+fd_state.file_descriptor: 13589.783694061 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8082]", pid = 2247, fd = 9 }
+fd_state.file_descriptor: 13589.783697237 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8107]", pid = 2247, fd = 11 }
+fd_state.file_descriptor: 13589.783699794 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8109]", pid = 2247, fd = 12 }
+fd_state.file_descriptor: 13589.783701943 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8109]", pid = 2247, fd = 13 }
+fd_state.file_descriptor: 13589.783709301 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/0", pid = 2250, fd = 0 }
+fd_state.file_descriptor: 13589.783711407 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/0", pid = 2250, fd = 1 }
+fd_state.file_descriptor: 13589.783713550 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/0", pid = 2250, fd = 2 }
+fd_state.file_descriptor: 13589.783717263 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/0", pid = 2250, fd = 255 }
+fd_state.file_descriptor: 13589.783719931 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2259, fd = 0 }
+fd_state.file_descriptor: 13589.783723027 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2259, fd = 1 }
+fd_state.file_descriptor: 13589.783725485 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2259, fd = 2 }
+fd_state.file_descriptor: 13589.783728271 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8112]", pid = 2259, fd = 3 }
+fd_state.file_descriptor: 13589.783731335 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8114]", pid = 2259, fd = 4 }
+fd_state.file_descriptor: 13589.783736283 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8114]", pid = 2259, fd = 5 }
+fd_state.file_descriptor: 13589.783740366 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/proc/diskstats", pid = 2259, fd = 6 }
+fd_state.file_descriptor: 13589.783745629 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/urandom", pid = 2259, fd = 7 }
+fd_state.file_descriptor: 13589.783753321 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/proc/2259/net/dev", pid = 2259, fd = 8 }
+fd_state.file_descriptor: 13589.783756520 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/proc/vmstat", pid = 2259, fd = 9 }
+fd_state.file_descriptor: 13589.783760720 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/lock/gkrellm/LCK..1000_:0", pid = 2259, fd = 10 }
+fd_state.file_descriptor: 13589.783767195 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8169]", pid = 2259, fd = 11 }
+fd_state.file_descriptor: 13589.783770073 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/proc/stat", pid = 2259, fd = 12 }
+fd_state.file_descriptor: 13589.783773014 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/proc/2259/net/route", pid = 2259, fd = 13 }
+fd_state.file_descriptor: 13589.783780693 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.cache/event-sound-cache.tdb.7f394062173ac92d2672d52e4ae5a068.i486-pc-linux-gnu", pid = 2259, fd = 16 }
+fd_state.file_descriptor: 13589.783784380 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2266, fd = 0 }
+fd_state.file_descriptor: 13589.783786536 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2266, fd = 1 }
+fd_state.file_descriptor: 13589.783788754 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2266, fd = 2 }
+fd_state.file_descriptor: 13589.783791725 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8178]", pid = 2266, fd = 3 }
+fd_state.file_descriptor: 13589.783794981 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8193]", pid = 2266, fd = 4 }
+fd_state.file_descriptor: 13589.783798446 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2281, fd = 0 }
+fd_state.file_descriptor: 13589.783800436 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2281, fd = 1 }
+fd_state.file_descriptor: 13589.783802406 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2281, fd = 2 }
+fd_state.file_descriptor: 13589.783805130 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8225]", pid = 2281, fd = 3 }
+fd_state.file_descriptor: 13589.783807094 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2281, fd = 4 }
+fd_state.file_descriptor: 13589.783809208 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 2281, fd = 5 }
+fd_state.file_descriptor: 13589.783812969 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2288, fd = 0 }
+fd_state.file_descriptor: 13589.783815051 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2288, fd = 1 }
+fd_state.file_descriptor: 13589.783817232 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2288, fd = 2 }
+fd_state.file_descriptor: 13589.783820197 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8236]", pid = 2288, fd = 3 }
+fd_state.file_descriptor: 13589.783822508 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8236]", pid = 2288, fd = 4 }
+fd_state.file_descriptor: 13589.783825411 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8262]", pid = 2288, fd = 5 }
+fd_state.file_descriptor: 13589.783831539 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8358]", pid = 2288, fd = 6 }
+fd_state.file_descriptor: 13589.783838068 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8571]", pid = 2288, fd = 7 }
+fd_state.file_descriptor: 13589.783856810 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.amsn/half_elf1_hotmail_com/logs/December 2009/keupondevin@hotmail.com.log", pid = 2288, fd = 8 }
+fd_state.file_descriptor: 13589.783865039 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2315, fd = 0 }
+fd_state.file_descriptor: 13589.783867219 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2315, fd = 1 }
+fd_state.file_descriptor: 13589.783869418 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2315, fd = 2 }
+fd_state.file_descriptor: 13589.783883985 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/lib/icedove/icedove", pid = 2315, fd = 255 }
+fd_state.file_descriptor: 13589.783887852 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2327, fd = 0 }
+fd_state.file_descriptor: 13589.783890038 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2327, fd = 1 }
+fd_state.file_descriptor: 13589.783892244 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2327, fd = 2 }
+fd_state.file_descriptor: 13589.783900188 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/lib/icedove/run-mozilla.sh", pid = 2327, fd = 255 }
+fd_state.file_descriptor: 13589.783903956 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2332, fd = 0 }
+fd_state.file_descriptor: 13589.783906032 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2332, fd = 1 }
+fd_state.file_descriptor: 13589.783908268 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2332, fd = 2 }
+fd_state.file_descriptor: 13589.783914242 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8480]", pid = 2332, fd = 3 }
+fd_state.file_descriptor: 13589.783917546 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8484]", pid = 2332, fd = 4 }
+fd_state.file_descriptor: 13589.783919782 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8484]", pid = 2332, fd = 5 }
+fd_state.file_descriptor: 13589.783923489 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/.parentlock", pid = 2332, fd = 6 }
+fd_state.file_descriptor: 13589.783928801 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8494]", pid = 2332, fd = 7 }
+fd_state.file_descriptor: 13589.783930994 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8494]", pid = 2332, fd = 8 }
+fd_state.file_descriptor: 13589.783939142 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8496]", pid = 2332, fd = 9 }
+fd_state.file_descriptor: 13589.783941769 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8496]", pid = 2332, fd = 10 }
+fd_state.file_descriptor: 13589.783953499 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/ImapMail/courriel.polymtl.ca/filterlog.html", pid = 2332, fd = 11 }
+fd_state.file_descriptor: 13589.783958243 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/share/icedove/chrome/en-US.jar", pid = 2332, fd = 12 }
+fd_state.file_descriptor: 13589.783964266 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/share/icedove/chrome/classic.jar", pid = 2332, fd = 13 }
+fd_state.file_descriptor: 13589.783969751 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8506]", pid = 2332, fd = 14 }
+fd_state.file_descriptor: 13589.783972038 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8506]", pid = 2332, fd = 15 }
+fd_state.file_descriptor: 13589.783975293 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8507]", pid = 2332, fd = 16 }
+fd_state.file_descriptor: 13589.784025082 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8507]", pid = 2332, fd = 17 }
+fd_state.file_descriptor: 13589.784028227 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8509]", pid = 2332, fd = 18 }
+fd_state.file_descriptor: 13589.784030877 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8533]", pid = 2332, fd = 19 }
+fd_state.file_descriptor: 13589.784033898 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8535]", pid = 2332, fd = 20 }
+fd_state.file_descriptor: 13589.784036925 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8538]", pid = 2332, fd = 21 }
+fd_state.file_descriptor: 13589.784040798 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/share/icedove/chrome/toolkit.jar", pid = 2332, fd = 22 }
+fd_state.file_descriptor: 13589.784044201 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/XUL.mfasl", pid = 2332, fd = 23 }
+fd_state.file_descriptor: 13589.784054208 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/extensions/{837cbf1c-a15b-11da-957a-00e08161165f}/chrome/SmtpSelect.jar", pid = 2332, fd = 24 }
+fd_state.file_descriptor: 13589.784057625 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/share/icedove/chrome/messenger.jar", pid = 2332, fd = 25 }
+fd_state.file_descriptor: 13589.784061306 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/extensions/{c1ac4523-76c2-9995-adbd-d93bf5141bea}/chrome/DisplayQuota.jar", pid = 2332, fd = 26 }
+fd_state.file_descriptor: 13589.784069047 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/lib/enigmail/extension/chrome/enigmail-skin-tbird.jar", pid = 2332, fd = 27 }
+fd_state.file_descriptor: 13589.784072827 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/extensions/{F8147CF4-B9E3-445B-AA87-081ED66548F8}/chrome/chrome.jar", pid = 2332, fd = 28 }
+fd_state.file_descriptor: 13589.784076090 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/lib/enigmail/extension/chrome/enigmail.jar", pid = 2332, fd = 29 }
+fd_state.file_descriptor: 13589.784078999 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/panacea.dat", pid = 2332, fd = 30 }
+fd_state.file_descriptor: 13589.784084849 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/cert8.db", pid = 2332, fd = 31 }
+fd_state.file_descriptor: 13589.784088283 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.cache/event-sound-cache.tdb.7f394062173ac92d2672d52e4ae5a068.i486-pc-linux-gnu", pid = 2332, fd = 32 }
+fd_state.file_descriptor: 13589.784091847 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/key3.db", pid = 2332, fd = 33 }
+fd_state.file_descriptor: 13589.784095208 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8559]", pid = 2332, fd = 34 }
+fd_state.file_descriptor: 13589.784097414 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8559]", pid = 2332, fd = 35 }
+fd_state.file_descriptor: 13589.784100848 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/ImapMail/courriel.polymtl.ca/INBOX.msf", pid = 2332, fd = 36 }
+fd_state.file_descriptor: 13589.784104605 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/ImapMail/nova.aep.polymtl.ca/INBOX.msf", pid = 2332, fd = 37 }
+fd_state.file_descriptor: 13589.784107865 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8584]", pid = 2332, fd = 38 }
+fd_state.file_descriptor: 13589.784115020 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/ImapMail/orion.aep.polymtl-3.ca/INBOX.msf", pid = 2332, fd = 39 }
+fd_state.file_descriptor: 13589.784118880 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8587]", pid = 2332, fd = 40 }
+fd_state.file_descriptor: 13589.784121573 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8589]", pid = 2332, fd = 41 }
+fd_state.file_descriptor: 13589.784127386 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/abook.mab", pid = 2332, fd = 42 }
+fd_state.file_descriptor: 13589.784130271 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[113499]", pid = 2332, fd = 43 }
+fd_state.file_descriptor: 13589.784133464 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/urlclassifier2.sqlite", pid = 2332, fd = 44 }
+fd_state.file_descriptor: 13589.784136264 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/urlclassifier2.sqlite", pid = 2332, fd = 45 }
+fd_state.file_descriptor: 13589.784140106 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/Mail/Local Folders/Trash.msf", pid = 2332, fd = 46 }
+fd_state.file_descriptor: 13589.784143756 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/Mail/Local Folders/Inbox.msf", pid = 2332, fd = 47 }
+fd_state.file_descriptor: 13589.784147894 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/ImapMail/nova.aep.polymtl.ca/Trash.msf", pid = 2332, fd = 48 }
+fd_state.file_descriptor: 13589.784151941 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/Mail/mail.aei.ca/Inbox.msf", pid = 2332, fd = 49 }
+fd_state.file_descriptor: 13589.784155573 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/ImapMail/courriel.polymtl.ca/INBOX.sbd/Trash.msf", pid = 2332, fd = 50 }
+fd_state.file_descriptor: 13589.784162684 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/ImapMail/imap.gmail-1.com/INBOX.msf", pid = 2332, fd = 51 }
+fd_state.file_descriptor: 13589.784166507 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[11198]", pid = 2332, fd = 52 }
+fd_state.file_descriptor: 13589.784169683 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/ImapMail/orion.aep.polymtl-3.ca/Trash.msf", pid = 2332, fd = 53 }
+fd_state.file_descriptor: 13589.784176434 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/ImapMail/imap.gmail-1.com/Trash.msf", pid = 2332, fd = 54 }
+fd_state.file_descriptor: 13589.784187937 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[120083]", pid = 2332, fd = 57 }
+fd_state.file_descriptor: 13589.784192527 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2335, fd = 0 }
+fd_state.file_descriptor: 13589.784194572 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2335, fd = 1 }
+fd_state.file_descriptor: 13589.784196549 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2335, fd = 2 }
+fd_state.file_descriptor: 13589.784199230 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2335, fd = 3 }
+fd_state.file_descriptor: 13589.784201886 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2335, fd = 4 }
+fd_state.file_descriptor: 13589.784204746 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8519]", pid = 2335, fd = 5 }
+fd_state.file_descriptor: 13589.784207025 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8519]", pid = 2335, fd = 6 }
+fd_state.file_descriptor: 13589.784209490 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8520]", pid = 2335, fd = 7 }
+fd_state.file_descriptor: 13589.784211788 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8520]", pid = 2335, fd = 8 }
+fd_state.file_descriptor: 13589.784214185 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8521]", pid = 2335, fd = 9 }
+fd_state.file_descriptor: 13589.784216489 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[8521]", pid = 2335, fd = 10 }
+fd_state.file_descriptor: 13589.784218928 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8522]", pid = 2335, fd = 11 }
+fd_state.file_descriptor: 13589.784221684 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8524]", pid = 2335, fd = 12 }
+fd_state.file_descriptor: 13589.784224383 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8531]", pid = 2335, fd = 13 }
+fd_state.file_descriptor: 13589.784227015 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8534]", pid = 2335, fd = 14 }
+fd_state.file_descriptor: 13589.784229715 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[8537]", pid = 2335, fd = 15 }
+fd_state.file_descriptor: 13589.784232618 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[12344]", pid = 2335, fd = 16 }
+fd_state.file_descriptor: 13589.784235682 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[12347]", pid = 2335, fd = 17 }
+fd_state.file_descriptor: 13589.784243731 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/2", pid = 2684, fd = 0 }
+fd_state.file_descriptor: 13589.784246523 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/2", pid = 2684, fd = 1 }
+fd_state.file_descriptor: 13589.784248593 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/2", pid = 2684, fd = 2 }
+fd_state.file_descriptor: 13589.784252021 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/2", pid = 2684, fd = 255 }
+fd_state.file_descriptor: 13589.784255239 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2805, fd = 0 }
+fd_state.file_descriptor: 13589.784257729 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2805, fd = 1 }
+fd_state.file_descriptor: 13589.784259953 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2805, fd = 2 }
+fd_state.file_descriptor: 13589.784263900 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2806, fd = 0 }
+fd_state.file_descriptor: 13589.784266241 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2806, fd = 1 }
+fd_state.file_descriptor: 13589.784268423 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2806, fd = 2 }
+fd_state.file_descriptor: 13589.784271987 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[11871]", pid = 2806, fd = 3 }
+fd_state.file_descriptor: 13589.784281438 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/jdk1.6.0_16/jre/lib/rt.jar", pid = 2806, fd = 4 }
+fd_state.file_descriptor: 13589.784294756 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.equinox.launcher_1.1.0.v20091023.jar", pid = 2806, fd = 5 }
+fd_state.file_descriptor: 13589.784298234 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/random", pid = 2806, fd = 6 }
+fd_state.file_descriptor: 13589.784300496 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/urandom", pid = 2806, fd = 7 }
+fd_state.file_descriptor: 13589.784306808 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.osgi_3.6.0.v20091023.jar", pid = 2806, fd = 8 }
+fd_state.file_descriptor: 13589.784317206 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.team.cvs.ui_3.3.300.I20091026-1300.jar", pid = 2806, fd = 9 }
+fd_state.file_descriptor: 13589.784321239 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[11917]", pid = 2806, fd = 10 }
+fd_state.file_descriptor: 13589.784325347 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/configuration/org.eclipse.osgi/.manager/.tmp2705294035615507285.instance", pid = 2806, fd = 11 }
+fd_state.file_descriptor: 13589.784331833 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.equinox.common_3.5.100.v20091023.jar", pid = 2806, fd = 12 }
+fd_state.file_descriptor: 13589.784340927 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.mylyn.monitor.core_3.3.0.v20091013-0200-e3x.jar", pid = 2806, fd = 13 }
+fd_state.file_descriptor: 13589.784344837 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.update.core_3.2.300.v20090525.jar", pid = 2806, fd = 14 }
+fd_state.file_descriptor: 13589.784351830 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.pde.api.tools_1.0.201.v20091028-1400.jar", pid = 2806, fd = 15 }
+fd_state.file_descriptor: 13589.784358483 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.tigris.subversion.subclipse.graph_1.0.7.jar", pid = 2806, fd = 16 }
+fd_state.file_descriptor: 13589.784368082 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/configuration/org.eclipse.osgi/bundles/384/1/.cp/svnkit.jar", pid = 2806, fd = 17 }
+fd_state.file_descriptor: 13589.784374568 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.equinox.registry_3.5.0.v20090911.jar", pid = 2806, fd = 18 }
+fd_state.file_descriptor: 13589.784378102 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.300.v20090810/runtime_registry_compatibility.jar", pid = 2806, fd = 19 }
+fd_state.file_descriptor: 13589.784385014 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.team.ui_3.5.100.I20091028-0800.jar", pid = 2806, fd = 20 }
+fd_state.file_descriptor: 13589.784388220 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.tmatesoft.svnkit_1.3.1.6109.jar", pid = 2806, fd = 21 }
+fd_state.file_descriptor: 13589.784417112 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.core.jobs_3.4.200.v20090921.jar", pid = 2806, fd = 22 }
+fd_state.file_descriptor: 13589.784428114 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.pde.build_3.5.100.v20091023/pdebuild.jar", pid = 2806, fd = 23 }
+fd_state.file_descriptor: 13589.784431728 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/configuration/org.eclipse.core.runtime/.extraData.5", pid = 2806, fd = 24 }
+fd_state.file_descriptor: 13589.784436274 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/configuration/org.eclipse.equinox.app/.manager/.tmp365058712806979164.instance", pid = 2806, fd = 25 }
+fd_state.file_descriptor: 13589.784440450 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/configuration/org.eclipse.core.runtime/.manager/.tmp8587982481307384051.instance", pid = 2806, fd = 26 }
+fd_state.file_descriptor: 13589.784444077 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/configuration/org.eclipse.core.runtime/.mainData.5", pid = 2806, fd = 27 }
+fd_state.file_descriptor: 13589.784447962 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/configuration/org.eclipse.osgi/bundles/384/1/.cp/svnkit-javahl.jar", pid = 2806, fd = 28 }
+fd_state.file_descriptor: 13589.784451884 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_1.0.200.v20090911-1356.jar", pid = 2806, fd = 29 }
+fd_state.file_descriptor: 13589.784469107 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/workspace/.metadata/.plugins/org.eclipse.pde.core/.extensions/.extraData.1", pid = 2806, fd = 30 }
+fd_state.file_descriptor: 13589.784472758 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/jdk1.6.0_16/jre/lib/jsse.jar", pid = 2806, fd = 31 }
+fd_state.file_descriptor: 13589.784476384 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ui.externaltools_3.2.0.v20091023.jar", pid = 2806, fd = 32 }
+fd_state.file_descriptor: 13589.784482778 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ant.core_3.2.100.v20091012.jar", pid = 2806, fd = 33 }
+fd_state.file_descriptor: 13589.784489017 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.equinox.frameworkadmin_1.0.200.v20091019.jar", pid = 2806, fd = 34 }
+fd_state.file_descriptor: 13589.784492866 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.core.commands_3.5.0.I20090525-2000.jar", pid = 2806, fd = 35 }
+fd_state.file_descriptor: 13589.784496294 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.update.scheduler_3.2.200.v20081127.jar", pid = 2806, fd = 36 }
+fd_state.file_descriptor: 13589.784499277 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/jdk1.6.0_16/jre/lib/jce.jar", pid = 2806, fd = 38 }
+fd_state.file_descriptor: 13589.784502299 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.tigris.subversion.subclipse.ui_1.6.5.jar", pid = 2806, fd = 39 }
+fd_state.file_descriptor: 13589.784505702 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.mylyn.resources.ui_3.3.0.v20091013-0200-e3x.jar", pid = 2806, fd = 40 }
+fd_state.file_descriptor: 13589.784509062 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.mylyn.commons.ui_3.3.0.v20091013-0200-e3x.jar", pid = 2806, fd = 41 }
+fd_state.file_descriptor: 13589.784512416 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jdt.apt.core_3.3.400.v20091027-0900.jar", pid = 2806, fd = 42 }
+fd_state.file_descriptor: 13589.784516667 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.core.filesystem.linux.x86_1.2.0.v20080604-1400.jar", pid = 2806, fd = 43 }
+fd_state.file_descriptor: 13589.784520534 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ui.ide.application_1.0.200.I20091013-0800.jar", pid = 2806, fd = 44 }
+fd_state.file_descriptor: 13589.784524204 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ui.workbench_3.6.0.I20091028-1300.jar", pid = 2806, fd = 45 }
+fd_state.file_descriptor: 13589.784527669 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ui.workbench.compatibility_3.2.0.I20090429-1800/compatibility.jar", pid = 2806, fd = 46 }
+fd_state.file_descriptor: 13589.784531177 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jface_3.6.0.I20091028-1300.jar", pid = 2806, fd = 47 }
+fd_state.file_descriptor: 13589.784535644 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.swt_3.6.0.v3617.jar", pid = 2806, fd = 48 }
+fd_state.file_descriptor: 13589.784538930 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.swt.gtk.linux.x86_3.6.0.v3617.jar", pid = 2806, fd = 49 }
+fd_state.file_descriptor: 13589.784542211 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ui_3.6.0.I20091030-1100.jar", pid = 2806, fd = 50 }
+fd_state.file_descriptor: 13589.784544674 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/configuration/org.eclipse.osgi/bundles/384/1/.cp/antlr-runtime-3.1.3.jar", pid = 2806, fd = 51 }
+kernel.irq_entry: 13589.784616177 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { ip = 3242331332, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_update_time: 13589.784653211 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { jiffies = 4296292861, xtime_sec = 1262715366, xtime_nsec = 301133044, walltomonotonic_sec = -1262701811, walltomonotonic_nsec = 148963639 }
+kernel.softirq_raise: 13589.784684296 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { softirq_id = 1 [softirq 1] }
+kernel.softirq_raise: 13589.784697639 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { softirq_id = 9 [softirq 9] }
+kernel.irq_exit: 13589.784745025 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.softirq_entry: 13589.784753136 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, SOFTIRQ { softirq_id = 1 [softirq 1] }
+kernel.timer_set: 13589.784777500 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, SOFTIRQ { expires = 1325566, function = 0xc141d458, data = 0 }
+kernel.softirq_exit: 13589.784782157 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { softirq_id = 1 [softirq 1] }
+kernel.softirq_entry: 13589.784784134 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, SOFTIRQ { softirq_id = 9 [softirq 9] }
+rcu.tree_callback: 13589.784966466 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 16887, 16887, lttctl, , 30068, 0x0, SOFTIRQ { func = 0xc14285e3 }
+kernel.softirq_exit: 13589.784974015 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { softirq_id = 9 [softirq 9] }
+fd_state.file_descriptor: 13589.784991040 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[11926]", pid = 2806, fd = 52 }
+fd_state.file_descriptor: 13589.784993912 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[11926]", pid = 2806, fd = 53 }
+fd_state.file_descriptor: 13589.784999225 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ui.ide_3.6.0.I20091030-1100.jar", pid = 2806, fd = 54 }
+fd_state.file_descriptor: 13589.785002635 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/workspace/.metadata/.lock", pid = 2806, fd = 55 }
+fd_state.file_descriptor: 13589.785006224 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.core.resources_3.6.0.v20091026-1217.jar", pid = 2806, fd = 56 }
+fd_state.file_descriptor: 13589.785009548 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.mylyn.tasks.core_3.3.0.v20091013-0200-e3x.jar", pid = 2806, fd = 57 }
+fd_state.file_descriptor: 13589.785013149 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.mylyn.commons.core_3.3.0.v20091013-0200-e3x.jar", pid = 2806, fd = 58 }
+fd_state.file_descriptor: 13589.785016429 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.core.contenttype_3.4.100.v20090928.jar", pid = 2806, fd = 59 }
+fd_state.file_descriptor: 13589.785019778 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.mylyn.monitor.ui_3.3.0.v20091013-0200-e3x.jar", pid = 2806, fd = 60 }
+fd_state.file_descriptor: 13589.785023132 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jdt.apt.pluggable.core_1.0.300.v20090922-0135.jar", pid = 2806, fd = 61 }
+fd_state.file_descriptor: 13589.785026572 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/com.ibm.icu_4.0.1.v20090822.jar", pid = 2806, fd = 62 }
+fd_state.file_descriptor: 13589.785030322 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.core.expressions_3.4.100.v20090429-1800.jar", pid = 2806, fd = 63 }
+fd_state.file_descriptor: 13589.785033979 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.core.variables_3.2.300.v20090911.jar", pid = 2806, fd = 64 }
+fd_state.file_descriptor: 13589.785036870 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.mylyn.context.core_3.3.0.v20091013-0200-e3x.jar", pid = 2806, fd = 65 }
+fd_state.file_descriptor: 13589.785040317 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.mylyn.commons.net_3.3.0.v20091013-0200-e3x.jar", pid = 2806, fd = 66 }
+fd_state.file_descriptor: 13589.785044054 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.compare_3.5.100.I20091026-1300.jar", pid = 2806, fd = 67 }
+fd_state.file_descriptor: 13589.785047916 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/configuration/org.eclipse.osgi/bundles/384/1/.cp/trilead.jar", pid = 2806, fd = 68 }
+fd_state.file_descriptor: 13589.785051542 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.update.configurator_3.3.100.v20090813.jar", pid = 2806, fd = 69 }
+fd_state.file_descriptor: 13589.785055069 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.apache.commons.httpclient_3.1.0.v20080605-1935.jar", pid = 2806, fd = 70 }
+fd_state.file_descriptor: 13589.785058411 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.apache.commons.logging_1.0.4.v200904062259.jar", pid = 2806, fd = 71 }
+fd_state.file_descriptor: 13589.785061401 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.tigris.subversion.clientadapter_1.6.4.1.jar", pid = 2806, fd = 72 }
+fd_state.file_descriptor: 13589.785064526 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.mylyn.context.ui_3.3.0.v20091013-0200-e3x.jar", pid = 2806, fd = 73 }
+fd_state.file_descriptor: 13589.785067541 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ui.forms_3.5.0.v20091012.jar", pid = 2806, fd = 74 }
+fd_state.file_descriptor: 13589.785071130 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.mylyn.team.ui_3.3.0.v20091013-0200-e3x.jar", pid = 2806, fd = 75 }
+fd_state.file_descriptor: 13589.785074614 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.equinox.util_1.0.100.v20090520-1800.jar", pid = 2806, fd = 76 }
+fd_state.file_descriptor: 13589.785077900 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.tigris.subversion.clientadapter.javahl_1.6.6.jar", pid = 2806, fd = 77 }
+fd_state.file_descriptor: 13589.785081452 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/com.collabnet.subversion.merge_1.10.0.jar", pid = 2806, fd = 78 }
+fd_state.file_descriptor: 13589.785084665 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.tigris.subversion.subclipse.mylyn_3.0.0.jar", pid = 2806, fd = 79 }
+fd_state.file_descriptor: 13589.785088377 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.tigris.subversion.subclipse.core_1.6.5.jar", pid = 2806, fd = 80 }
+fd_state.file_descriptor: 13589.785091206 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.tigris.subversion.clientadapter.svnkit_1.6.4.jar", pid = 2806, fd = 81 }
+fd_state.file_descriptor: 13589.785094938 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ant.ui_3.5.0.v20091023.jar", pid = 2806, fd = 82 }
+fd_state.file_descriptor: 13589.785098471 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/configuration/org.eclipse.osgi/bundles/384/1/.cp/sqljet.1.0.0.b616.jar", pid = 2806, fd = 83 }
+fd_state.file_descriptor: 13589.785102357 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.pde.ui_3.6.0.v20091023.jar", pid = 2806, fd = 84 }
+fd_state.file_descriptor: 13589.785106020 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jdt.ui_3.6.0.v20091026-1200.jar", pid = 2806, fd = 85 }
+fd_state.file_descriptor: 13589.785109256 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ui.workbench.texteditor_3.6.0.v20091026-1200.jar", pid = 2806, fd = 86 }
+fd_state.file_descriptor: 13589.785112753 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ui.editors_3.6.0.v20091028-1300.jar", pid = 2806, fd = 87 }
+fd_state.file_descriptor: 13589.785116280 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.text_3.5.0.v20091026-1200.jar", pid = 2806, fd = 88 }
+fd_state.file_descriptor: 13589.785120042 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jface.text_3.5.100.v20091026-1200.jar", pid = 2806, fd = 89 }
+fd_state.file_descriptor: 13589.785123323 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jdt.core_3.6.0.v_A19.jar", pid = 2806, fd = 90 }
+fd_state.file_descriptor: 13589.785134695 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jdt.compiler.apt_1.0.300.v20091027-0900.jar", pid = 2806, fd = 91 }
+fd_state.file_descriptor: 13589.785137883 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jdt.compiler.tool_1.0.100.v_A19.jar", pid = 2806, fd = 92 }
+fd_state.file_descriptor: 13589.785141657 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/jdk1.6.0_16/jre/lib/resources.jar", pid = 2806, fd = 93 }
+fd_state.file_descriptor: 13589.785145005 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.debug.ui_3.6.0.v20091026-1150.jar", pid = 2806, fd = 94 }
+fd_state.file_descriptor: 13589.785148989 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ltk.ui.refactoring_3.4.200.v20091026-1200.jar", pid = 2806, fd = 95 }
+fd_state.file_descriptor: 13589.785152313 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jdt.core.manipulation_1.3.0.v20091026-1200.jar", pid = 2806, fd = 96 }
+fd_state.file_descriptor: 13589.785156298 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.core.filebuffers_3.5.100.v20091026-1200.jar", pid = 2806, fd = 97 }
+fd_state.file_descriptor: 13589.785159497 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.team.core_3.5.0.I20091028-0800.jar", pid = 2806, fd = 98 }
+fd_state.file_descriptor: 13589.785162573 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/com.sun.jna_3.1.0.jar", pid = 2806, fd = 99 }
+fd_state.file_descriptor: 13589.785166039 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ui.views_3.5.0.I20090914-0830.jar", pid = 2806, fd = 100 }
+fd_state.file_descriptor: 13589.785170067 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ltk.core.refactoring_3.5.100.v20091026-1200.jar", pid = 2806, fd = 101 }
+fd_state.file_descriptor: 13589.785173175 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jdt.debug.ui_3.5.0.v20091026-1150.jar", pid = 2806, fd = 102 }
+fd_state.file_descriptor: 13589.785182947 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/configuration/org.eclipse.osgi/bundles/361/1/.cp/jna.jar", pid = 2806, fd = 103 }
+fd_state.file_descriptor: 13589.785186493 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.compare.core_3.5.100.I20090714-0800.jar", pid = 2806, fd = 104 }
+fd_state.file_descriptor: 13589.785190001 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jdt.launching_3.5.100.v20091026-1150.jar", pid = 2806, fd = 105 }
+fd_state.file_descriptor: 13589.785193330 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.debug.core_3.6.0.v20091019.jar", pid = 2806, fd = 106 }
+fd_state.file_descriptor: 13589.785196759 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.mylyn.tasks.ui_3.3.0.v20091013-0200-e3x.jar", pid = 2806, fd = 107 }
+fd_state.file_descriptor: 13589.785200305 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jdt.junit_3.6.0.v20091026-1200.jar", pid = 2806, fd = 108 }
+fd_state.file_descriptor: 13589.785203641 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ui.console_3.5.0.v20090907.jar", pid = 2806, fd = 109 }
+fd_state.file_descriptor: 13589.785207156 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.pde.core_3.5.100.v20091023.jar", pid = 2806, fd = 110 }
+fd_state.file_descriptor: 13589.785211609 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/random", pid = 2806, fd = 111 }
+fd_state.file_descriptor: 13589.785218671 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.equinox.p2.engine_1.1.0.v20091023.jar", pid = 2806, fd = 112 }
+fd_state.file_descriptor: 13589.785222402 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.core.filesystem_1.3.0.v20091026-1217.jar", pid = 2806, fd = 113 }
+fd_state.file_descriptor: 13589.785228536 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jdt.debug_3.5.100.v20091019/jdi.jar", pid = 2806, fd = 114 }
+fd_state.file_descriptor: 13589.785232163 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.pde.api.tools.ui_1.0.200.v20091023.jar", pid = 2806, fd = 115 }
+fd_state.file_descriptor: 13589.785235653 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jdt.debug_3.5.100.v20091019/jdimodel.jar", pid = 2806, fd = 116 }
+fd_state.file_descriptor: 13589.785238902 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/urandom", pid = 2806, fd = 117 }
+fd_state.file_descriptor: 13589.785243287 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/workspace/.metadata/.plugins/org.eclipse.pde.core/.extensions/.manager/.tmp24841759182796359.instance", pid = 2806, fd = 118 }
+fd_state.file_descriptor: 13589.785246957 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/workspace/.metadata/.plugins/org.eclipse.pde.core/.extensions/.mainData.1", pid = 2806, fd = 119 }
+fd_state.file_descriptor: 13589.785250596 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[12337]", pid = 2806, fd = 120 }
+fd_state.file_descriptor: 13589.785254142 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.core.net_1.2.100.I20090714-0800.jar", pid = 2806, fd = 121 }
+fd_state.file_descriptor: 13589.785256656 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[12337]", pid = 2806, fd = 122 }
+fd_state.file_descriptor: 13589.785259596 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[12338]", pid = 2806, fd = 123 }
+fd_state.file_descriptor: 13589.785261992 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[12338]", pid = 2806, fd = 124 }
+fd_state.file_descriptor: 13589.785266861 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[12339]", pid = 2806, fd = 125 }
+fd_state.file_descriptor: 13589.785270159 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[12341]", pid = 2806, fd = 126 }
+fd_state.file_descriptor: 13589.785272427 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[12341]", pid = 2806, fd = 127 }
+fd_state.file_descriptor: 13589.785275447 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.equinox.p2.updatechecker_1.1.0.v20091010.jar", pid = 2806, fd = 128 }
+fd_state.file_descriptor: 13589.785279363 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.cache/event-sound-cache.tdb.7f394062173ac92d2672d52e4ae5a068.i486-pc-linux-gnu", pid = 2806, fd = 129 }
+fd_state.file_descriptor: 13589.785283131 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.equinox.p2.ui.sdk.scheduler_1.0.0.v20091010.jar", pid = 2806, fd = 130 }
+fd_state.file_descriptor: 13589.785286357 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[12342]", pid = 2806, fd = 131 }
+fd_state.file_descriptor: 13589.785288562 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[12342]", pid = 2806, fd = 132 }
+fd_state.file_descriptor: 13589.785291076 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[12343]", pid = 2806, fd = 133 }
+fd_state.file_descriptor: 13589.785293825 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[12345]", pid = 2806, fd = 134 }
+fd_state.file_descriptor: 13589.785296568 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[12348]", pid = 2806, fd = 135 }
+fd_state.file_descriptor: 13589.785304438 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla/eclipse/places.sqlite", pid = 2806, fd = 136 }
+fd_state.file_descriptor: 13589.785317244 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/share/xulrunner-1.9.1/chrome/classic.jar (deleted)", pid = 2806, fd = 137 }
+fd_state.file_descriptor: 13589.785324075 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/share/xulrunner-1.9.1/chrome/toolkit.jar (deleted)", pid = 2806, fd = 138 }
+fd_state.file_descriptor: 13589.785327306 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/share/xulrunner-1.9.1/chrome/en-US.jar (deleted)", pid = 2806, fd = 139 }
+fd_state.file_descriptor: 13589.785330809 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla/eclipse/permissions.sqlite", pid = 2806, fd = 140 }
+fd_state.file_descriptor: 13589.785334232 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.pde.launching_3.6.0.v20091023.jar", pid = 2806, fd = 141 }
+fd_state.file_descriptor: 13589.785342255 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[29160]", pid = 2806, fd = 142 }
+fd_state.file_descriptor: 13589.785345820 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.equinox.preferences_3.3.0.v20091023.jar", pid = 2806, fd = 145 }
+kernel.sched_schedule: 13589.785371654 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { prev_pid = 16887, next_pid = 16890, prev_state = 0 }
+kernel.syscall_exit: 13589.785731290 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.785744145 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { ip = 0xb7705416, syscall_id = 311 [syscall 311] }
+kernel.syscall_exit: 13589.785745849 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.785764530 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, TRAP { ip = 0xb770ebe0, address = 0xb7593dec, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.785783173 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.785794639 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, TRAP { ip = 0xb771cb70, address = 0xb7598f34, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.785800988 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.785810254 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, TRAP { ip = 0xb75b6680, address = 0xb75b6680, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.785816753 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.785826767 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, TRAP { ip = 0x8049da0, address = 0x8049da0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.785834050 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.785845040 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, TRAP { ip = 0xb770ebe0, address = 0xb7590ddc, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.785851334 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.785863399 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { ip = 0xb7705416, syscall_id = 42 [syscall 42] }
+kernel.syscall_exit: 13589.785905826 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.785913795 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, TRAP { ip = 0xb76dc600, address = 0xb76dc600, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.785921862 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.785937806 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, TRAP { ip = 0xb764da80, address = 0xb764da80, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.785948264 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.785957085 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, TRAP { ip = 0xb7668c40, address = 0xb7668c40, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.785963083 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.785970311 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { ip = 0xb7705416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 13589.785976483 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 4 }
+fs.pollfd: 13589.785982832 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 6 }
+fs.pollfd: 13589.786030108 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 8 }
+fs.pollfd: 13589.786032418 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 10 }
+fs.pollfd: 13589.786034538 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 12 }
+fs.pollfd: 13589.786036440 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 14 }
+fs.pollfd: 13589.786038213 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 16 }
+fs.pollfd: 13589.786040035 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 18 }
+fs.pollfd: 13589.786041882 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 20 }
+fs.pollfd: 13589.786043519 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 22 }
+fs.pollfd: 13589.786045571 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 24 }
+fs.pollfd: 13589.786047368 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 26 }
+fs.pollfd: 13589.786049110 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 28 }
+fs.pollfd: 13589.786051012 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 30 }
+fs.pollfd: 13589.786053089 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 32 }
+fs.pollfd: 13589.786054806 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 34 }
+fs.pollfd: 13589.786056980 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 36 }
+fs.pollfd: 13589.786059297 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 38 }
+fs.pollfd: 13589.786061156 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 40 }
+fs.pollfd: 13589.786065913 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 42 }
+fs.pollfd: 13589.786067859 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 44 }
+fs.pollfd: 13589.786069817 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 46 }
+fs.pollfd: 13589.786071775 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 48 }
+kernel.sched_schedule: 13589.786082721 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { prev_pid = 16890, next_pid = 16887, prev_state = 1 }
+fd_state.file_descriptor: 13589.786154984 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/0", pid = 11121, fd = 0 }
+fd_state.file_descriptor: 13589.786157777 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/0", pid = 11121, fd = 1 }
+fd_state.file_descriptor: 13589.786159883 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/0", pid = 11121, fd = 2 }
+fd_state.file_descriptor: 13589.786166665 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[53718]", pid = 11121, fd = 4 }
+fd_state.file_descriptor: 13589.786173022 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/0", pid = 11130, fd = 0 }
+fd_state.file_descriptor: 13589.786175079 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/0", pid = 11130, fd = 1 }
+fd_state.file_descriptor: 13589.786177137 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/0", pid = 11130, fd = 2 }
+fd_state.file_descriptor: 13589.786180083 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/0", pid = 11130, fd = 255 }
+fd_state.file_descriptor: 13589.786186564 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/3", pid = 11317, fd = 0 }
+fd_state.file_descriptor: 13589.786188614 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/3", pid = 11317, fd = 1 }
+fd_state.file_descriptor: 13589.786190640 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/3", pid = 11317, fd = 2 }
+fd_state.file_descriptor: 13589.786193593 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/3", pid = 11317, fd = 255 }
+fd_state.file_descriptor: 13589.786196911 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/3", pid = 11325, fd = 0 }
+fd_state.file_descriptor: 13589.786198875 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/3", pid = 11325, fd = 1 }
+fd_state.file_descriptor: 13589.786200845 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/3", pid = 11325, fd = 2 }
+fd_state.file_descriptor: 13589.786203464 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[55736]", pid = 11325, fd = 3 }
+fd_state.file_descriptor: 13589.786205700 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/3", pid = 11325, fd = 4 }
+fd_state.file_descriptor: 13589.786207721 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/3", pid = 11325, fd = 5 }
+fd_state.file_descriptor: 13589.786209852 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/3", pid = 11325, fd = 6 }
+fd_state.file_descriptor: 13589.786213935 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 18054, fd = 0 }
+fd_state.file_descriptor: 13589.786215887 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 18054, fd = 1 }
+fd_state.file_descriptor: 13589.786217803 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 18054, fd = 2 }
+fd_state.file_descriptor: 13589.786224301 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[104554]", pid = 18054, fd = 4 }
+fd_state.file_descriptor: 13589.786226864 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[104555]", pid = 18054, fd = 5 }
+fd_state.file_descriptor: 13589.786229255 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 18054, fd = 6 }
+fd_state.file_descriptor: 13589.786232319 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "anon_inode:[signalfd]", pid = 18054, fd = 7 }
+fd_state.file_descriptor: 13589.786238145 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[104584]", pid = 18054, fd = 8 }
+fd_state.file_descriptor: 13589.786240609 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[104585]", pid = 18054, fd = 9 }
+fd_state.file_descriptor: 13589.786248344 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/.udev/queue.bin", pid = 18054, fd = 10 }
+fd_state.file_descriptor: 13589.786251469 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 21983, fd = 0 }
+fd_state.file_descriptor: 13589.786253440 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 21983, fd = 1 }
+fd_state.file_descriptor: 13589.786255355 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 21983, fd = 2 }
+fd_state.file_descriptor: 13589.786263632 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[109191]", pid = 21983, fd = 3 }
+fd_state.file_descriptor: 13589.786269290 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[109384]", pid = 21983, fd = 4 }
+fd_state.file_descriptor: 13589.786272163 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 24399, fd = 0 }
+fd_state.file_descriptor: 13589.786274158 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 24399, fd = 1 }
+fd_state.file_descriptor: 13589.786276079 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 24399, fd = 2 }
+fd_state.file_descriptor: 13589.786282035 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[120306]", pid = 24399, fd = 3 }
+fd_state.file_descriptor: 13589.786284802 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 24464, fd = 0 }
+fd_state.file_descriptor: 13589.786286742 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 24464, fd = 1 }
+fd_state.file_descriptor: 13589.786288632 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 24464, fd = 2 }
+fd_state.file_descriptor: 13589.786294704 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/proc/acpi/event", pid = 24464, fd = 3 }
+fd_state.file_descriptor: 13589.786297300 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[120515]", pid = 24464, fd = 4 }
+fd_state.file_descriptor: 13589.786300104 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[120543]", pid = 24464, fd = 5 }
+fd_state.file_descriptor: 13589.786302451 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[120517]", pid = 24464, fd = 6 }
+fd_state.file_descriptor: 13589.786305224 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[121534]", pid = 24464, fd = 7 }
+fd_state.file_descriptor: 13589.786311513 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 24616, fd = 0 }
+fd_state.file_descriptor: 13589.786313978 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 24616, fd = 1 }
+fd_state.file_descriptor: 13589.786315942 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 24616, fd = 2 }
+fd_state.file_descriptor: 13589.786318432 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[121558]", pid = 24616, fd = 3 }
+fd_state.file_descriptor: 13589.786321484 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[121181]", pid = 24616, fd = 5 }
+fd_state.file_descriptor: 13589.786323788 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[121181]", pid = 24616, fd = 6 }
+fd_state.file_descriptor: 13589.786326229 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[121182]", pid = 24616, fd = 7 }
+fd_state.file_descriptor: 13589.786328735 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[121183]", pid = 24616, fd = 8 }
+fd_state.file_descriptor: 13589.786331423 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[121187]", pid = 24616, fd = 9 }
+fd_state.file_descriptor: 13589.786334246 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[121204]", pid = 24616, fd = 10 }
+fd_state.file_descriptor: 13589.786336346 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 24616, fd = 11 }
+fd_state.file_descriptor: 13589.786343401 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[121224]", pid = 24616, fd = 12 }
+fd_state.file_descriptor: 13589.786350135 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/proc/24616/mounts", pid = 24616, fd = 13 }
+fd_state.file_descriptor: 13589.786352976 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[121520]", pid = 24616, fd = 14 }
+fd_state.file_descriptor: 13589.786355465 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[121522]", pid = 24616, fd = 15 }
+fd_state.file_descriptor: 13589.786358541 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[121516]", pid = 24616, fd = 19 }
+fd_state.file_descriptor: 13589.786361754 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 24617, fd = 0 }
+fd_state.file_descriptor: 13589.786363718 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 24617, fd = 1 }
+fd_state.file_descriptor: 13589.786366041 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 24617, fd = 2 }
+fd_state.file_descriptor: 13589.786373392 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[121203]", pid = 24617, fd = 3 }
+fd_state.file_descriptor: 13589.786376993 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 24668, fd = 0 }
+fd_state.file_descriptor: 13589.786379013 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 24668, fd = 1 }
+fd_state.file_descriptor: 13589.786380997 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 24668, fd = 2 }
+fd_state.file_descriptor: 13589.786384042 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[121489]", pid = 24668, fd = 3 }
+fd_state.file_descriptor: 13589.786387032 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[121503]", pid = 24668, fd = 4 }
+fd_state.file_descriptor: 13589.786390288 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 24670, fd = 0 }
+fd_state.file_descriptor: 13589.786392499 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 24670, fd = 1 }
+fd_state.file_descriptor: 13589.786394525 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 24670, fd = 2 }
+fd_state.file_descriptor: 13589.786397237 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[121508]", pid = 24670, fd = 3 }
+fd_state.file_descriptor: 13589.786405058 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[121519]", pid = 24670, fd = 4 }
+fd_state.file_descriptor: 13589.786408986 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 24672, fd = 0 }
+fd_state.file_descriptor: 13589.786411075 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 24672, fd = 1 }
+fd_state.file_descriptor: 13589.786413422 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 24672, fd = 2 }
+fd_state.file_descriptor: 13589.786416393 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[121521]", pid = 24672, fd = 3 }
+fd_state.file_descriptor: 13589.786419526 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[121533]", pid = 24672, fd = 4 }
+fd_state.file_descriptor: 13589.786423065 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 24682, fd = 0 }
+fd_state.file_descriptor: 13589.786425029 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 24682, fd = 1 }
+fd_state.file_descriptor: 13589.786427074 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 24682, fd = 2 }
+fd_state.file_descriptor: 13589.786429983 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[121557]", pid = 24682, fd = 3 }
+fd_state.file_descriptor: 13589.786459671 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/input/event0", pid = 24682, fd = 4 }
+fd_state.file_descriptor: 13589.786463292 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/input/event1", pid = 24682, fd = 5 }
+fd_state.file_descriptor: 13589.786465960 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/input/event2", pid = 24682, fd = 6 }
+fd_state.file_descriptor: 13589.786469197 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 25001, fd = 0 }
+fd_state.file_descriptor: 13589.786471563 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 25001, fd = 1 }
+fd_state.file_descriptor: 13589.786479594 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/log/samba/log.nmbd", pid = 25001, fd = 2 }
+fd_state.file_descriptor: 13589.786485666 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[122462]", pid = 25001, fd = 3 }
+fd_state.file_descriptor: 13589.786488366 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/log/samba/log.nmbd", pid = 25001, fd = 4 }
+fd_state.file_descriptor: 13589.786495223 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/messages.tdb", pid = 25001, fd = 5 }
+fd_state.file_descriptor: 13589.786501061 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[122523]", pid = 25001, fd = 6 }
+fd_state.file_descriptor: 13589.786503272 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[122523]", pid = 25001, fd = 7 }
+fd_state.file_descriptor: 13589.786505978 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/nmbd.pid", pid = 25001, fd = 8 }
+fd_state.file_descriptor: 13589.786508856 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/connections.tdb", pid = 25001, fd = 9 }
+fd_state.file_descriptor: 13589.786512192 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[122525]", pid = 25001, fd = 10 }
+fd_state.file_descriptor: 13589.786520057 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[122526]", pid = 25001, fd = 11 }
+fd_state.file_descriptor: 13589.786526283 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[122532]", pid = 25001, fd = 12 }
+fd_state.file_descriptor: 13589.786528716 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[122533]", pid = 25001, fd = 13 }
+fd_state.file_descriptor: 13589.786534734 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[122534]", pid = 25001, fd = 14 }
+fd_state.file_descriptor: 13589.786537433 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[122534]", pid = 25001, fd = 15 }
+fd_state.file_descriptor: 13589.786540694 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 25010, fd = 0 }
+fd_state.file_descriptor: 13589.786542882 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 25010, fd = 1 }
+fd_state.file_descriptor: 13589.786545612 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/log/samba/log.smbd", pid = 25010, fd = 2 }
+fd_state.file_descriptor: 13589.786547656 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[122462]", pid = 25010, fd = 3 }
+fd_state.file_descriptor: 13589.786550485 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/urandom", pid = 25010, fd = 4 }
+fd_state.file_descriptor: 13589.786556465 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/secrets.tdb", pid = 25010, fd = 5 }
+fd_state.file_descriptor: 13589.786559078 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/messages.tdb", pid = 25010, fd = 6 }
+fd_state.file_descriptor: 13589.786562438 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[122565]", pid = 25010, fd = 7 }
+fd_state.file_descriptor: 13589.786564836 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[122565]", pid = 25010, fd = 8 }
+fd_state.file_descriptor: 13589.786566979 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/log/samba/log.smbd", pid = 25010, fd = 9 }
+fd_state.file_descriptor: 13589.786569753 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/smbd.pid", pid = 25010, fd = 10 }
+fd_state.file_descriptor: 13589.786572589 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/sessionid.tdb", pid = 25010, fd = 11 }
+fd_state.file_descriptor: 13589.786575041 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/connections.tdb", pid = 25010, fd = 12 }
+fd_state.file_descriptor: 13589.786577567 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/brlock.tdb", pid = 25010, fd = 13 }
+fd_state.file_descriptor: 13589.786580909 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/locking.tdb", pid = 25010, fd = 14 }
+fd_state.file_descriptor: 13589.786583367 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/gencache.tdb", pid = 25010, fd = 15 }
+fd_state.file_descriptor: 13589.786586679 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/ntdrivers.tdb", pid = 25010, fd = 16 }
+fd_state.file_descriptor: 13589.786589681 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/passdb.tdb", pid = 25010, fd = 17 }
+fd_state.file_descriptor: 13589.786592344 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/account_policy.tdb", pid = 25010, fd = 18 }
+fd_state.file_descriptor: 13589.786595445 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/group_mapping.ldb", pid = 25010, fd = 19 }
+fd_state.file_descriptor: 13589.786598311 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/ntprinters.tdb", pid = 25010, fd = 20 }
+fd_state.file_descriptor: 13589.786600726 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/ntforms.tdb", pid = 25010, fd = 21 }
+fd_state.file_descriptor: 13589.786603382 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[122585]", pid = 25010, fd = 22 }
+fd_state.file_descriptor: 13589.786606187 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[122589]", pid = 25010, fd = 23 }
+fd_state.file_descriptor: 13589.786608930 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[122591]", pid = 25010, fd = 24 }
+fd_state.file_descriptor: 13589.786611839 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[122594]", pid = 25010, fd = 25 }
+fd_state.file_descriptor: 13589.786614211 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[122594]", pid = 25010, fd = 26 }
+fd_state.file_descriptor: 13589.786617443 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 25016, fd = 0 }
+fd_state.file_descriptor: 13589.786619450 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 25016, fd = 1 }
+fd_state.file_descriptor: 13589.786621550 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/log/samba/log.smbd", pid = 25016, fd = 2 }
+fd_state.file_descriptor: 13589.786623997 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[122462]", pid = 25016, fd = 3 }
+fd_state.file_descriptor: 13589.786626029 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/urandom", pid = 25016, fd = 4 }
+fd_state.file_descriptor: 13589.786628216 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/secrets.tdb", pid = 25016, fd = 5 }
+fd_state.file_descriptor: 13589.786630637 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/messages.tdb", pid = 25016, fd = 6 }
+fd_state.file_descriptor: 13589.786633905 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[122592]", pid = 25016, fd = 7 }
+fd_state.file_descriptor: 13589.786636092 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[122592]", pid = 25016, fd = 8 }
+fd_state.file_descriptor: 13589.786638409 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/log/samba/log.smbd", pid = 25016, fd = 9 }
+fd_state.file_descriptor: 13589.786640614 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/smbd.pid", pid = 25016, fd = 10 }
+fd_state.file_descriptor: 13589.786642937 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/sessionid.tdb", pid = 25016, fd = 11 }
+fd_state.file_descriptor: 13589.786645210 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/connections.tdb", pid = 25016, fd = 12 }
+fd_state.file_descriptor: 13589.786647440 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/brlock.tdb", pid = 25016, fd = 13 }
+fd_state.file_descriptor: 13589.786649670 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/locking.tdb", pid = 25016, fd = 14 }
+fd_state.file_descriptor: 13589.786652190 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/gencache.tdb", pid = 25016, fd = 15 }
+fd_state.file_descriptor: 13589.786654488 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/ntdrivers.tdb", pid = 25016, fd = 16 }
+fd_state.file_descriptor: 13589.786656731 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/passdb.tdb", pid = 25016, fd = 17 }
+fd_state.file_descriptor: 13589.786658930 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/account_policy.tdb", pid = 25016, fd = 18 }
+fd_state.file_descriptor: 13589.786661530 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/group_mapping.ldb", pid = 25016, fd = 19 }
+fd_state.file_descriptor: 13589.786663760 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/ntprinters.tdb", pid = 25016, fd = 20 }
+fd_state.file_descriptor: 13589.786665954 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/ntforms.tdb", pid = 25016, fd = 21 }
+fd_state.file_descriptor: 13589.786669481 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[122593]", pid = 25016, fd = 22 }
+fd_state.file_descriptor: 13589.786671686 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[122585]", pid = 25016, fd = 23 }
+fd_state.file_descriptor: 13589.786674163 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[122593]", pid = 25016, fd = 24 }
+fd_state.file_descriptor: 13589.786679037 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 30050, fd = 0 }
+fd_state.file_descriptor: 13589.786681174 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 30050, fd = 1 }
+fd_state.file_descriptor: 13589.786683220 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 30050, fd = 2 }
+fd_state.file_descriptor: 13589.786686815 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 30050, fd = 255 }
+fd_state.file_descriptor: 13589.786693609 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 30060, fd = 0 }
+fd_state.file_descriptor: 13589.786695636 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 30060, fd = 1 }
+fd_state.file_descriptor: 13589.786697730 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 30060, fd = 2 }
+fd_state.file_descriptor: 13589.786701276 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[129956]", pid = 30060, fd = 4 }
+fd_state.file_descriptor: 13589.786708899 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 30068, fd = 0 }
+fd_state.file_descriptor: 13589.786711265 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 30068, fd = 1 }
+fd_state.file_descriptor: 13589.786713346 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 30068, fd = 2 }
+fd_state.file_descriptor: 13589.786716726 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 30068, fd = 255 }
+fd_state.file_descriptor: 13589.786719956 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 16857, fd = 0 }
+fd_state.file_descriptor: 13589.786722334 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 16857, fd = 1 }
+fd_state.file_descriptor: 13589.786724527 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 16857, fd = 2 }
+fd_state.file_descriptor: 13589.786727505 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[144837]", pid = 16857, fd = 4 }
+fd_state.file_descriptor: 13589.786732898 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[144768]", pid = 16857, fd = 5 }
+fd_state.file_descriptor: 13589.786739452 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[144769]", pid = 16857, fd = 7 }
+fd_state.file_descriptor: 13589.786742139 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[144770]", pid = 16857, fd = 8 }
+fd_state.file_descriptor: 13589.786749348 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[144767]", pid = 16865, fd = 0 }
+fd_state.file_descriptor: 13589.786751788 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[144768]", pid = 16865, fd = 1 }
+fd_state.file_descriptor: 13589.786754210 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[144768]", pid = 16865, fd = 2 }
+fd_state.file_descriptor: 13589.786761561 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/etc/init.d/NetCheck.sh", pid = 16865, fd = 255 }
+fd_state.file_descriptor: 13589.786764557 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[144837]", pid = 16867, fd = 0 }
+fd_state.file_descriptor: 13589.786766670 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 16867, fd = 1 }
+fd_state.file_descriptor: 13589.786768752 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 16867, fd = 2 }
+fd_state.file_descriptor: 13589.786770852 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[144768]", pid = 16867, fd = 5 }
+fd_state.file_descriptor: 13589.786778061 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[144767]", pid = 16885, fd = 0 }
+fd_state.file_descriptor: 13589.786780260 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 16885, fd = 1 }
+fd_state.file_descriptor: 13589.786782274 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[144768]", pid = 16885, fd = 2 }
+fd_state.file_descriptor: 13589.786785548 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "socket:[144907]", pid = 16885, fd = 3 }
+fd_state.file_descriptor: 13589.786790601 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 16887, fd = 0 }
+fd_state.file_descriptor: 13589.786792843 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 16887, fd = 1 }
+fd_state.file_descriptor: 13589.786794993 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 16887, fd = 2 }
+fd_state.file_descriptor: 13589.786798280 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/proc/16887/mounts", pid = 16887, fd = 3 }
+fd_state.file_descriptor: 13589.786803376 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/control/trace/enabled", pid = 16887, fd = 4 }
+fd_state.file_descriptor: 13589.786807855 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 16889, fd = 0 }
+fd_state.file_descriptor: 13589.786809905 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 16889, fd = 1 }
+fd_state.file_descriptor: 13589.786811931 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 16889, fd = 2 }
+fd_state.file_descriptor: 13589.786814161 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/proc/16887/mounts", pid = 16889, fd = 3 }
+fd_state.file_descriptor: 13589.786816188 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 16889, fd = 4 }
+fd_state.file_descriptor: 13589.786818659 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[145101]", pid = 16889, fd = 5 }
+fd_state.file_descriptor: 13589.786821191 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/irq_state_0", pid = 16889, fd = 6 }
+fd_state.file_descriptor: 13589.786824380 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/irq_state_0", pid = 16889, fd = 7 }
+fd_state.file_descriptor: 13589.786826696 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/syscall_state_0", pid = 16889, fd = 8 }
+fd_state.file_descriptor: 13589.786829191 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/syscall_state_0", pid = 16889, fd = 9 }
+fd_state.file_descriptor: 13589.786831681 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/softirq_state_0", pid = 16889, fd = 10 }
+fd_state.file_descriptor: 13589.786834170 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/softirq_state_0", pid = 16889, fd = 11 }
+fd_state.file_descriptor: 13589.786836604 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/module_state_0", pid = 16889, fd = 12 }
+fd_state.file_descriptor: 13589.786839088 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/module_state_0", pid = 16889, fd = 13 }
+fd_state.file_descriptor: 13589.786841453 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/swap_state_0", pid = 16889, fd = 14 }
+fd_state.file_descriptor: 13589.786844987 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/swap_state_0", pid = 16889, fd = 15 }
+fd_state.file_descriptor: 13589.786847613 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/global_state_0", pid = 16889, fd = 16 }
+fd_state.file_descriptor: 13589.786850046 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/global_state_0", pid = 16889, fd = 17 }
+fd_state.file_descriptor: 13589.786852400 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/task_state_0", pid = 16889, fd = 18 }
+fd_state.file_descriptor: 13589.786854902 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/task_state_0", pid = 16889, fd = 19 }
+fd_state.file_descriptor: 13589.786857330 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/fd_state_0", pid = 16889, fd = 20 }
+fd_state.file_descriptor: 13589.786859689 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/fd_state_0", pid = 16889, fd = 21 }
+fd_state.file_descriptor: 13589.786861975 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/vm_state_0", pid = 16889, fd = 22 }
+fd_state.file_descriptor: 13589.786864415 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/vm_state_0", pid = 16889, fd = 23 }
+fd_state.file_descriptor: 13589.786866681 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/netif_state_0", pid = 16889, fd = 24 }
+fd_state.file_descriptor: 13589.786869054 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/netif_state_0", pid = 16889, fd = 25 }
+fd_state.file_descriptor: 13589.786871642 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/userspace_0", pid = 16889, fd = 26 }
+fd_state.file_descriptor: 13589.786874026 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/userspace_0", pid = 16889, fd = 27 }
+fd_state.file_descriptor: 13589.786876602 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/kernel_0", pid = 16889, fd = 28 }
+fd_state.file_descriptor: 13589.786879197 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/kernel_0", pid = 16889, fd = 29 }
+fd_state.file_descriptor: 13589.786881446 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/mm_0", pid = 16889, fd = 30 }
+fd_state.file_descriptor: 13589.786884164 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/mm_0", pid = 16889, fd = 31 }
+fd_state.file_descriptor: 13589.786886666 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/fs_0", pid = 16889, fd = 32 }
+fd_state.file_descriptor: 13589.786888982 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/fs_0", pid = 16889, fd = 33 }
+fd_state.file_descriptor: 13589.786891472 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/ipc_0", pid = 16889, fd = 34 }
+fd_state.file_descriptor: 13589.786893973 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/ipc_0", pid = 16889, fd = 35 }
+fd_state.file_descriptor: 13589.786896680 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/rcu_0", pid = 16889, fd = 36 }
+fd_state.file_descriptor: 13589.786899144 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/rcu_0", pid = 16889, fd = 37 }
+fd_state.file_descriptor: 13589.786901566 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/pm_0", pid = 16889, fd = 38 }
+fd_state.file_descriptor: 13589.786903907 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/pm_0", pid = 16889, fd = 39 }
+fd_state.file_descriptor: 13589.786906235 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/net_0", pid = 16889, fd = 40 }
+fd_state.file_descriptor: 13589.786908651 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/net_0", pid = 16889, fd = 41 }
+fd_state.file_descriptor: 13589.786910906 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/jbd2_0", pid = 16889, fd = 42 }
+fd_state.file_descriptor: 13589.786913321 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/jbd2_0", pid = 16889, fd = 43 }
+fd_state.file_descriptor: 13589.786915569 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/block_0", pid = 16889, fd = 44 }
+fd_state.file_descriptor: 13589.786917850 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/block_0", pid = 16889, fd = 45 }
+fd_state.file_descriptor: 13589.786920240 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/input_0", pid = 16889, fd = 46 }
+fd_state.file_descriptor: 13589.786922933 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/input_0", pid = 16889, fd = 47 }
+fd_state.file_descriptor: 13589.786925188 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/metadata_0", pid = 16889, fd = 48 }
+fd_state.file_descriptor: 13589.786927961 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/metadata_0", pid = 16889, fd = 49 }
+fd_state.file_descriptor: 13589.786930284 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filename = "pipe:[145101]", pid = 16889, fd = 50 }
+mm.page_free: 13589.786951806 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pfn = 79373, order = 0 }
+module_state.list_module: 13589.786982088 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "agpgart", state = 0, refcount = 1 }
+module_state.list_module: 13589.786989384 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "thermal_sys", state = 0, refcount = 3 }
+module_state.list_module: 13589.786995876 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "vboxvideo", state = 0, refcount = 1 }
+module_state.list_module: 13589.786997903 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "fan", state = 0, refcount = 0 }
+module_state.list_module: 13589.787004104 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "thermal", state = 0, refcount = 0 }
+module_state.list_module: 13589.787014593 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "drm", state = 0, refcount = 2 }
+module_state.list_module: 13589.787020573 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "ide_core", state = 0, refcount = 4 }
+module_state.list_module: 13589.787026491 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "usbcore", state = 0, refcount = 3 }
+module_state.list_module: 13589.787038110 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "mii", state = 0, refcount = 1 }
+module_state.list_module: 13589.787040112 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "pcnet32", state = 0, refcount = 0 }
+module_state.list_module: 13589.787046468 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "scsi_mod", state = 0, refcount = 1 }
+module_state.list_module: 13589.787052757 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "button", state = 0, refcount = 0 }
+module_state.list_module: 13589.787059441 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "floppy", state = 0, refcount = 0 }
+module_state.list_module: 13589.787065198 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "ehci_hcd", state = 0, refcount = 0 }
+module_state.list_module: 13589.787067231 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "piix", state = 0, refcount = 2 }
+module_state.list_module: 13589.787074088 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "libata", state = 0, refcount = 3 }
+module_state.list_module: 13589.787079381 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "ahci", state = 0, refcount = 0 }
+module_state.list_module: 13589.787084694 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "ide_pci_generic", state = 0, refcount = 0 }
+module_state.list_module: 13589.787090630 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "ohci_hcd", state = 0, refcount = 0 }
+module_state.list_module: 13589.787096301 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "ata_piix", state = 0, refcount = 0 }
+module_state.list_module: 13589.787101868 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "ata_generic", state = 0, refcount = 0 }
+module_state.list_module: 13589.787107459 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "cdrom", state = 0, refcount = 1 }
+module_state.list_module: 13589.787109596 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "ide_gd_mod", state = 0, refcount = 3 }
+module_state.list_module: 13589.787121265 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "ide_cd_mod", state = 0, refcount = 0 }
+module_state.list_module: 13589.787127998 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "vboxadd", state = 0, refcount = 7 }
+module_state.list_module: 13589.787133206 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "snd_page_alloc", state = 0, refcount = 2 }
+module_state.list_module: 13589.787138592 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "processor", state = 0, refcount = 0 }
+module_state.list_module: 13589.787143658 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "soundcore", state = 0, refcount = 1 }
+module_state.list_module: 13589.787149902 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "snd", state = 0, refcount = 10 }
+module_state.list_module: 13589.787154931 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "evdev", state = 0, refcount = 7 }
+module_state.list_module: 13589.787160021 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "i2c_core", state = 0, refcount = 2 }
+module_state.list_module: 13589.787164809 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "serio_raw", state = 0, refcount = 0 }
+module_state.list_module: 13589.787171611 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "psmouse", state = 0, refcount = 0 }
+module_state.list_module: 13589.787185194 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "pcspkr", state = 0, refcount = 0 }
+module_state.list_module: 13589.787190340 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "i2c_piix4", state = 0, refcount = 0 }
+module_state.list_module: 13589.787196258 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "snd_timer", state = 0, refcount = 1 }
+module_state.list_module: 13589.787201423 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "battery", state = 0, refcount = 0 }
+module_state.list_module: 13589.787206741 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "ac", state = 0, refcount = 0 }
+module_state.list_module: 13589.787213604 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "snd_pcm", state = 0, refcount = 3 }
+module_state.list_module: 13589.787219052 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "snd_mixer_oss", state = 0, refcount = 1 }
+module_state.list_module: 13589.787252632 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "snd_pcm_oss", state = 0, refcount = 0 }
+module_state.list_module: 13589.787259879 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "ac97_bus", state = 0, refcount = 1 }
+module_state.list_module: 13589.787271777 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "snd_ac97_codec", state = 0, refcount = 1 }
+module_state.list_module: 13589.787277905 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "snd_intel8x0", state = 0, refcount = 2 }
+module_state.list_module: 13589.787284329 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "loop", state = 0, refcount = 0 }
+module_state.list_module: 13589.787289536 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "vboxvfs", state = 0, refcount = 0 }
+vm_state.vm_map: 13589.787295541 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1, start = 134512640, end = 134545408, flags = 134223989, pgoff = 0, inode = 411603 }
+vm_state.vm_map: 13589.787303497 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1, start = 134545408, end = 134549504, flags = 135272563, pgoff = 28672, inode = 411603 }
+vm_state.vm_map: 13589.787305876 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1, start = 152862720, end = 152997888, flags = 1048691, pgoff = 152862720, inode = 0 }
+vm_state.vm_map: 13589.787308124 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1, start = 3076493312, end = 3076497408, flags = 1048691, pgoff = 3076493312, inode = 0 }
+vm_state.vm_map: 13589.787311634 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1, start = 3076497408, end = 3076505600, flags = 134217845, pgoff = 0, inode = 499911 }
+vm_state.vm_map: 13589.787314376 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1, start = 3076505600, end = 3076509696, flags = 135266417, pgoff = 4096, inode = 499911 }
+vm_state.vm_map: 13589.787316649 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1, start = 3076509696, end = 3076513792, flags = 135266419, pgoff = 8192, inode = 499911 }
+vm_state.vm_map: 13589.787323512 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1, start = 3076513792, end = 3077828608, flags = 134217845, pgoff = 0, inode = 499857 }
+vm_state.vm_map: 13589.787326070 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1, start = 3077828608, end = 3077836800, flags = 135266417, pgoff = 1314816, inode = 499857 }
+vm_state.vm_map: 13589.787328306 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1, start = 3077836800, end = 3077840896, flags = 135266419, pgoff = 1323008, inode = 499857 }
+vm_state.vm_map: 13589.787330394 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1, start = 3077840896, end = 3077857280, flags = 1048691, pgoff = 3077840896, inode = 0 }
+vm_state.vm_map: 13589.787333063 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1, start = 3077857280, end = 3077955584, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 13589.787335040 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1, start = 3077955584, end = 3077959680, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 13589.787337146 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1, start = 3077959680, end = 3077963776, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 13589.787340024 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1, start = 3077963776, end = 3078180864, flags = 134217845, pgoff = 0, inode = 499723 }
+vm_state.vm_map: 13589.787342501 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1, start = 3078180864, end = 3078184960, flags = 135266419, pgoff = 217088, inode = 499723 }
+vm_state.vm_map: 13589.787344578 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1, start = 3078279168, end = 3078283264, flags = 1048691, pgoff = 3078279168, inode = 0 }
+vm_state.vm_map: 13589.787346542 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1, start = 3078283264, end = 3078287360, flags = 67371125, pgoff = 3078283264, inode = 0 }
+vm_state.vm_map: 13589.787349859 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1, start = 3078287360, end = 3078402048, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 13589.787351997 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1, start = 3078402048, end = 3078406144, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 13589.787353948 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1, start = 3078406144, end = 3078410240, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 13589.787356512 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1, start = 3214368768, end = 3214454784, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.787390086 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1195, start = 134512640, end = 134873088, flags = 134223989, pgoff = 0, inode = 409611 }
+vm_state.vm_map: 13589.787395646 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1195, start = 134873088, end = 134881280, flags = 135272563, pgoff = 356352, inode = 409611 }
+vm_state.vm_map: 13589.787401032 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1195, start = 134881280, end = 134918144, flags = 1048691, pgoff = 134881280, inode = 0 }
+vm_state.vm_map: 13589.787404053 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1195, start = 156303360, end = 156438528, flags = 1048691, pgoff = 156303360, inode = 0 }
+vm_state.vm_map: 13589.787413098 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1195, start = 3077283840, end = 3077324800, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.787415908 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1195, start = 3077324800, end = 3077328896, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.787418162 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1195, start = 3077328896, end = 3077332992, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.787422814 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1195, start = 3077332992, end = 3077337088, flags = 1048691, pgoff = 3077332992, inode = 0 }
+vm_state.vm_map: 13589.787431579 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1195, start = 3077337088, end = 3078651904, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.787434261 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1195, start = 3078651904, end = 3078660096, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.787436682 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1195, start = 3078660096, end = 3078664192, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.787438986 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1195, start = 3078664192, end = 3078676480, flags = 1048691, pgoff = 3078664192, inode = 0 }
+vm_state.vm_map: 13589.787444237 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1195, start = 3078766592, end = 3078778880, flags = 1048691, pgoff = 3078766592, inode = 0 }
+vm_state.vm_map: 13589.787446202 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1195, start = 3078778880, end = 3078782976, flags = 67371125, pgoff = 3078778880, inode = 0 }
+vm_state.vm_map: 13589.787449290 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1195, start = 3078782976, end = 3078897664, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.787451755 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1195, start = 3078897664, end = 3078901760, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.787453917 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1195, start = 3078901760, end = 3078905856, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.787456339 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1195, start = 3217453056, end = 3217539072, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.787583895 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1238, start = 134512640, end = 134725632, flags = 134223989, pgoff = 0, inode = 22952 }
+vm_state.vm_map: 13589.787588764 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1238, start = 134725632, end = 134729728, flags = 135272563, pgoff = 208896, inode = 22952 }
+vm_state.vm_map: 13589.787594780 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1238, start = 134729728, end = 134733824, flags = 1048691, pgoff = 134729728, inode = 0 }
+vm_state.vm_map: 13589.787597053 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1238, start = 164823040, end = 164958208, flags = 1048691, pgoff = 164823040, inode = 0 }
+vm_state.vm_map: 13589.787602341 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1238, start = 3076730880, end = 3077001216, flags = 1048691, pgoff = 3076730880, inode = 0 }
+vm_state.vm_map: 13589.787607840 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1238, start = 3077001216, end = 3078316032, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.787612892 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1238, start = 3078316032, end = 3078324224, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.787615270 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1238, start = 3078324224, end = 3078328320, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.787617550 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1238, start = 3078328320, end = 3078340608, flags = 1048691, pgoff = 3078328320, inode = 0 }
+vm_state.vm_map: 13589.787622727 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1238, start = 3078340608, end = 3078402048, flags = 134217845, pgoff = 0, inode = 22689 }
+vm_state.vm_map: 13589.787625049 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1238, start = 3078402048, end = 3078406144, flags = 135266419, pgoff = 61440, inode = 22689 }
+vm_state.vm_map: 13589.787627385 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1238, start = 3078406144, end = 3078410240, flags = 1048691, pgoff = 3078406144, inode = 0 }
+vm_state.vm_map: 13589.787635805 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1238, start = 3078410240, end = 3078422528, flags = 134217845, pgoff = 0, inode = 20765 }
+vm_state.vm_map: 13589.787638041 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1238, start = 3078422528, end = 3078426624, flags = 135266419, pgoff = 8192, inode = 20765 }
+vm_state.vm_map: 13589.787640431 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1238, start = 3078426624, end = 3078430720, flags = 1048691, pgoff = 3078426624, inode = 0 }
+vm_state.vm_map: 13589.787643341 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1238, start = 3078430720, end = 3078615040, flags = 134217845, pgoff = 0, inode = 22949 }
+vm_state.vm_map: 13589.787645842 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1238, start = 3078615040, end = 3078619136, flags = 135266419, pgoff = 184320, inode = 22949 }
+vm_state.vm_map: 13589.787648481 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1238, start = 3078619136, end = 3079081984, flags = 134217845, pgoff = 0, inode = 20061 }
+vm_state.vm_map: 13589.787650704 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1238, start = 3079081984, end = 3079094272, flags = 135266419, pgoff = 458752, inode = 20061 }
+vm_state.vm_map: 13589.787653138 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1238, start = 3079180288, end = 3079196672, flags = 1048691, pgoff = 3079180288, inode = 0 }
+vm_state.vm_map: 13589.787655460 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1238, start = 3079196672, end = 3079200768, flags = 67371125, pgoff = 3079196672, inode = 0 }
+vm_state.vm_map: 13589.787657925 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1238, start = 3079200768, end = 3079315456, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.787660761 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1238, start = 3079315456, end = 3079319552, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.787665628 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1238, start = 3079319552, end = 3079323648, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.787667704 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1238, start = 3216420864, end = 3216506880, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.787675222 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 134512640, end = 134770688, flags = 134223989, pgoff = 0, inode = 19720 }
+vm_state.vm_map: 13589.787677446 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 134770688, end = 134782976, flags = 135272563, pgoff = 253952, inode = 19720 }
+vm_state.vm_map: 13589.787679515 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 134782976, end = 134787072, flags = 1048691, pgoff = 134782976, inode = 0 }
+vm_state.vm_map: 13589.787684556 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 157077504, end = 157483008, flags = 1048691, pgoff = 157077504, inode = 0 }
+vm_state.vm_map: 13589.787694323 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3050520576, end = 3050635264, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.787696404 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3050635264, end = 3050639360, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.787702057 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3050639360, end = 3050643456, flags = 1048688, pgoff = 3050639360, inode = 0 }
+vm_state.vm_map: 13589.787704120 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3050643456, end = 3059032064, flags = 1048691, pgoff = 3050643456, inode = 0 }
+vm_state.vm_map: 13589.787706158 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3059032064, end = 3059036160, flags = 1048688, pgoff = 3059032064, inode = 0 }
+vm_state.vm_map: 13589.787709069 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3059036160, end = 3067424768, flags = 1048691, pgoff = 3059036160, inode = 0 }
+vm_state.vm_map: 13589.787711478 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3067424768, end = 3067428864, flags = 1048688, pgoff = 3067424768, inode = 0 }
+vm_state.vm_map: 13589.787713423 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3067428864, end = 3075817472, flags = 1048691, pgoff = 3067428864, inode = 0 }
+vm_state.vm_map: 13589.787717216 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3075817472, end = 3075854336, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.787719477 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3075854336, end = 3075858432, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.787721565 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3075858432, end = 3075862528, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.787724617 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3075862528, end = 3075940352, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.787726854 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3075940352, end = 3075944448, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.787729224 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3075944448, end = 3075948544, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.787731418 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3075948544, end = 3075956736, flags = 1048691, pgoff = 3075948544, inode = 0 }
+vm_state.vm_map: 13589.787734136 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3075956736, end = 3075981312, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.787736353 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3075981312, end = 3075985408, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.787738367 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3075985408, end = 3075989504, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.787744051 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3076083712, end = 3076104192, flags = 134217845, pgoff = 0, inode = 33292 }
+vm_state.vm_map: 13589.787746120 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3076104192, end = 3076108288, flags = 135266419, pgoff = 16384, inode = 33292 }
+vm_state.vm_map: 13589.787751050 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3076108288, end = 3076116480, flags = 1048691, pgoff = 3076108288, inode = 0 }
+vm_state.vm_map: 13589.787753305 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3076116480, end = 3077431296, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.787756134 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077431296, end = 3077439488, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.787758549 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077439488, end = 3077443584, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.787761076 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077443584, end = 3077455872, flags = 1048691, pgoff = 3077443584, inode = 0 }
+vm_state.vm_map: 13589.787769137 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077455872, end = 3077484544, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.787771405 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077484544, end = 3077488640, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.787773579 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077488640, end = 3077492736, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.787776130 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077492736, end = 3077500928, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.787778384 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077500928, end = 3077505024, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.787780677 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077505024, end = 3077509120, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.787782635 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077509120, end = 3077513216, flags = 1048691, pgoff = 3077509120, inode = 0 }
+vm_state.vm_map: 13589.787785377 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077513216, end = 3077599232, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.787787768 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077599232, end = 3077603328, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.787790190 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077603328, end = 3077607424, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.787792167 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077607424, end = 3077615616, flags = 1048691, pgoff = 3077607424, inode = 0 }
+vm_state.vm_map: 13589.788528579 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077615616, end = 3077697536, flags = 134217845, pgoff = 0, inode = 1065249 }
+kernel.irq_entry: 13589.788635257 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { ip = 3242331332, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_itimer_expired: 13589.788673166 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { pid = 1852 }
+kernel.send_signal: 13589.788693578 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { pid = 1852, signal = 14 }
+kernel.irq_exit: 13589.788734904 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { handled = 1 }
+vm_state.vm_map: 13589.788746314 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077697536, end = 3077701632, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.788749526 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077701632, end = 3077709824, flags = 134217845, pgoff = 0, inode = 33286 }
+vm_state.vm_map: 13589.788751836 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077709824, end = 3077713920, flags = 135266419, pgoff = 4096, inode = 33286 }
+vm_state.vm_map: 13589.788754232 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077718016, end = 3077722112, flags = 1048691, pgoff = 3077718016, inode = 0 }
+vm_state.vm_map: 13589.788758576 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077722112, end = 3077763072, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.788762436 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077763072, end = 3077767168, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.788764660 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077767168, end = 3077771264, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.788767922 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077771264, end = 3077791744, flags = 134217845, pgoff = 0, inode = 33281 }
+vm_state.vm_map: 13589.788770393 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077791744, end = 3077795840, flags = 135266419, pgoff = 16384, inode = 33281 }
+vm_state.vm_map: 13589.788772716 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077795840, end = 3077804032, flags = 1048691, pgoff = 3077795840, inode = 0 }
+vm_state.vm_map: 13589.788774705 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077804032, end = 3077808128, flags = 67371125, pgoff = 3077804032, inode = 0 }
+vm_state.vm_map: 13589.788778016 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077808128, end = 3077922816, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.788780048 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077922816, end = 3077926912, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.788782451 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3077926912, end = 3077931008, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.788784459 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1280, start = 3218161664, end = 3218247680, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.788798648 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1336, start = 134512640, end = 134602752, flags = 134223989, pgoff = 0, inode = 1353012 }
+vm_state.vm_map: 13589.788803634 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1336, start = 134602752, end = 134606848, flags = 135272563, pgoff = 90112, inode = 1353012 }
+vm_state.vm_map: 13589.788806099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1336, start = 134606848, end = 134651904, flags = 1048691, pgoff = 134606848, inode = 0 }
+vm_state.vm_map: 13589.788808897 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1336, start = 152100864, end = 152236032, flags = 1048691, pgoff = 152100864, inode = 0 }
+vm_state.vm_map: 13589.788812084 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1336, start = 3075747840, end = 3075751936, flags = 1048691, pgoff = 3075747840, inode = 0 }
+vm_state.vm_map: 13589.788815402 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1336, start = 3075751936, end = 3077066752, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.788817533 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1336, start = 3077066752, end = 3077074944, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.788819664 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1336, start = 3077074944, end = 3077079040, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.788822023 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1336, start = 3077079040, end = 3077091328, flags = 1048691, pgoff = 3077079040, inode = 0 }
+vm_state.vm_map: 13589.788825533 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1336, start = 3077091328, end = 3077206016, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.788827911 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1336, start = 3077206016, end = 3077210112, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.788830042 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1336, start = 3077210112, end = 3077214208, flags = 1048691, pgoff = 3077210112, inode = 0 }
+vm_state.vm_map: 13589.788833717 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1336, start = 3077214208, end = 3077361664, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.788836362 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1336, start = 3077361664, end = 3077365760, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.788838752 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1336, start = 3077365760, end = 3077369856, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.788841816 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1336, start = 3077369856, end = 3078307840, flags = 134217845, pgoff = 0, inode = 16850 }
+vm_state.vm_map: 13589.788843848 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1336, start = 3078307840, end = 3078324224, flags = 135266417, pgoff = 937984, inode = 16850 }
+vm_state.vm_map: 13589.788845807 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1336, start = 3078324224, end = 3078328320, flags = 135266419, pgoff = 954368, inode = 16850 }
+vm_state.vm_map: 13589.788848414 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1336, start = 3078328320, end = 3078356992, flags = 1048691, pgoff = 3078328320, inode = 0 }
+vm_state.vm_map: 13589.788856000 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1336, start = 3078430720, end = 3078447104, flags = 134217937, pgoff = 0, inode = 1165299 }
+vm_state.vm_map: 13589.788859100 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1336, start = 3078447104, end = 3078451200, flags = 134217937, pgoff = 0, inode = 1165298 }
+vm_state.vm_map: 13589.788861923 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1336, start = 3078451200, end = 3078459392, flags = 1048691, pgoff = 3078451200, inode = 0 }
+vm_state.vm_map: 13589.788864253 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1336, start = 3078459392, end = 3078463488, flags = 67371125, pgoff = 3078459392, inode = 0 }
+vm_state.vm_map: 13589.788868107 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1336, start = 3078463488, end = 3078578176, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.788875519 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1336, start = 3078578176, end = 3078582272, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.788877854 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1336, start = 3078582272, end = 3078586368, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.788880332 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1336, start = 3219582976, end = 3219668992, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.788889431 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 134512640, end = 134545408, flags = 134223989, pgoff = 0, inode = 18385 }
+vm_state.vm_map: 13589.788892063 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 134545408, end = 134549504, flags = 135272563, pgoff = 28672, inode = 18385 }
+vm_state.vm_map: 13589.788894391 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 134549504, end = 134553600, flags = 1048691, pgoff = 134549504, inode = 0 }
+vm_state.vm_map: 13589.788896678 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 149598208, end = 149733376, flags = 1048691, pgoff = 149598208, inode = 0 }
+vm_state.vm_map: 13589.788899093 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3075035136, end = 3075076096, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.788902274 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3075076096, end = 3075080192, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.788904720 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3075080192, end = 3075084288, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.788907649 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3075084288, end = 3075162112, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.788909786 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3075162112, end = 3075166208, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.788912053 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3075166208, end = 3075170304, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.788914233 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3075170304, end = 3075178496, flags = 1048691, pgoff = 3075170304, inode = 0 }
+vm_state.vm_map: 13589.788922073 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3075272704, end = 3076603904, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.788924475 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3076603904, end = 3076608000, flags = 1048691, pgoff = 3076603904, inode = 0 }
+vm_state.vm_map: 13589.788927596 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3076608000, end = 3076616192, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.788929930 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3076616192, end = 3076620288, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.788931981 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3076620288, end = 3076624384, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.788934452 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3076624384, end = 3077939200, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.788936496 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3077939200, end = 3077947392, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.788938647 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3077947392, end = 3077951488, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.788941074 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3077951488, end = 3077967872, flags = 1048691, pgoff = 3077951488, inode = 0 }
+vm_state.vm_map: 13589.788943761 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3077967872, end = 3078066176, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 13589.788945831 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3078066176, end = 3078070272, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 13589.788948233 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3078070272, end = 3078074368, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 13589.788956480 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3078074368, end = 3078115328, flags = 134217845, pgoff = 0, inode = 499738 }
+vm_state.vm_map: 13589.788958989 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3078115328, end = 3078119424, flags = 135266419, pgoff = 40960, inode = 499738 }
+vm_state.vm_map: 13589.788962405 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3078123520, end = 3078160384, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.788964845 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3078160384, end = 3078164480, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.788967446 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3078164480, end = 3078168576, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.788970152 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3078168576, end = 3078193152, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.788972221 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3078193152, end = 3078197248, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.788974543 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3078197248, end = 3078201344, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.788976817 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3078205440, end = 3078221824, flags = 1048691, pgoff = 3078205440, inode = 0 }
+vm_state.vm_map: 13589.788978893 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3078221824, end = 3078225920, flags = 67371125, pgoff = 3078221824, inode = 0 }
+vm_state.vm_map: 13589.788981394 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3078225920, end = 3078340608, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.788983939 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3078340608, end = 3078344704, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.788986700 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3078344704, end = 3078348800, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.788988968 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1368, start = 3220443136, end = 3220529152, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.788995386 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3076579328, end = 3076620288, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.788998190 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3076620288, end = 3076624384, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.789000464 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3076624384, end = 3076628480, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.789003318 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3076628480, end = 3076665344, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.789005833 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3076665344, end = 3076669440, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.789008161 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3076669440, end = 3076673536, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.789010366 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3076673536, end = 3076751360, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.789012516 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3076751360, end = 3076755456, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.789014542 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3076755456, end = 3076759552, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.789017082 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3076759552, end = 3076767744, flags = 1048691, pgoff = 3076759552, inode = 0 }
+vm_state.vm_map: 13589.789019589 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3076767744, end = 3076792320, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.789021838 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3076792320, end = 3076796416, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.789024914 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3076796416, end = 3076800512, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.789027002 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3076800512, end = 3076808704, flags = 1048691, pgoff = 3076800512, inode = 0 }
+vm_state.vm_map: 13589.789029411 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3076808704, end = 3076816896, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.789031623 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3076816896, end = 3076820992, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.789033859 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3076820992, end = 3076825088, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.789036510 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3076825088, end = 3078139904, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.789038746 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3078139904, end = 3078148096, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.789040994 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3078148096, end = 3078152192, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.789043162 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3078152192, end = 3078164480, flags = 1048691, pgoff = 3078152192, inode = 0 }
+vm_state.vm_map: 13589.789046127 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3078164480, end = 3078193152, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.789048283 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3078193152, end = 3078197248, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.789050822 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3078197248, end = 3078201344, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.789053472 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3078201344, end = 3078287360, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.789055844 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3078287360, end = 3078291456, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.789058087 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3078291456, end = 3078295552, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.789060057 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3078295552, end = 3078307840, flags = 1048691, pgoff = 3078295552, inode = 0 }
+vm_state.vm_map: 13589.789062707 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3078307840, end = 3078406144, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 13589.789064993 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3078406144, end = 3078410240, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 13589.789065818 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3078410240, end = 3078414336, flags = 135266419, pgoff = 98304, inode = 499877 }
+kernel.irq_entry: 13589.789090442 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { ip = 3242331332, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.sched_try_wakeup: 13589.789718775 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { pid = 2259, cpu_id = 0, state = 1 }
+kernel.irq_exit: 13589.789753992 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.sched_schedule: 13589.789781723 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { prev_pid = 16887, next_pid = 2259, prev_state = 0 }
+fs.pollfd: 13589.790028522 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { fd = 4 }
+fs.pollfd: 13589.790039740 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { fd = 3 }
+fs.pollfd: 13589.790043509 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { fd = 11 }
+kernel.syscall_exit: 13589.790051354 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.790074272 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 13589.790078892 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.790092878 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 13 [syscall 13] }
+kernel.syscall_exit: 13589.790094707 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { ret = 1262715366 }
+kernel.syscall_entry: 13589.790112454 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.790206258 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { count = 1024, fd = 12 }
+kernel.syscall_exit: 13589.790207716 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { ret = 857 }
+kernel.syscall_entry: 13589.790238708 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.790240703 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { count = 1024, fd = 12 }
+kernel.syscall_exit: 13589.790241932 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.790249716 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 140 [syscall 140] }
+fs.llseek: 13589.790253459 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 12, offset = 0, origin = 0 }
+kernel.syscall_exit: 13589.790255294 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.790392364 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 5 [syscall 5] }
+fs.open: 13589.790453909 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 14, filename = "/proc/loadavg" }
+kernel.syscall_exit: 13589.790457808 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { ret = 14 }
+kernel.syscall_entry: 13589.790465708 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 197 [syscall 197] }
+kernel.syscall_exit: 13589.790469137 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.790473029 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 192 [syscall 192] }
+kernel.syscall_exit: 13589.790487946 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { ret = -1215705088 }
+kernel.syscall_entry: 13589.790491295 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 3 [syscall 3] }
+kernel.page_fault_entry: 13589.790509011 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, TRAP { ip = 0xc142bf44, address = 0xb789d000, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.790603965 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { res = 0 }
+fs.read: 13589.790689762 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { count = 1024, fd = 14 }
+kernel.syscall_exit: 13589.790691312 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { ret = 27 }
+kernel.syscall_entry: 13589.790722564 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 6 [syscall 6] }
+fs.close: 13589.790724696 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 14 }
+kernel.syscall_exit: 13589.790891436 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.790897243 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 91 [syscall 91] }
+mm.page_free: 13589.790937105 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { pfn = 16806, order = 0 }
+kernel.syscall_exit: 13589.791079488 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.791146185 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.791229654 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { count = 1024, fd = 6 }
+kernel.syscall_exit: 13589.791231508 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { ret = 1024 }
+kernel.syscall_entry: 13589.791328295 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.791351373 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { count = 1024, fd = 6 }
+kernel.syscall_exit: 13589.791353950 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { ret = 292 }
+kernel.syscall_entry: 13589.791375527 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.791378980 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { count = 1024, fd = 6 }
+kernel.syscall_exit: 13589.791380215 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.791386288 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 140 [syscall 140] }
+fs.llseek: 13589.791392188 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 6, offset = 0, origin = 0 }
+kernel.syscall_exit: 13589.791394529 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.791421524 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.791462010 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { count = 1024, fd = 8 }
+kernel.syscall_exit: 13589.791463369 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { ret = 447 }
+kernel.syscall_entry: 13589.791479301 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.791481024 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { count = 1024, fd = 8 }
+kernel.syscall_exit: 13589.791482284 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.791485788 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 140 [syscall 140] }
+fs.llseek: 13589.791488542 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 8, offset = 0, origin = 0 }
+kernel.syscall_exit: 13589.791490241 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.791500273 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.791530289 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { count = 1024, fd = 9 }
+kernel.syscall_exit: 13589.791531605 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { ret = 1024 }
+kernel.syscall_entry: 13589.791545857 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.791553992 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { count = 1024, fd = 9 }
+kernel.syscall_exit: 13589.791555178 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { ret = 375 }
+kernel.syscall_entry: 13589.791561250 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.791562696 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { count = 1024, fd = 9 }
+kernel.syscall_exit: 13589.791563919 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.791567317 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 140 [syscall 140] }
+fs.llseek: 13589.791569071 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 9, offset = 0, origin = 0 }
+kernel.syscall_exit: 13589.791570708 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.791823573 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 13589.791831097 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 3 }
+kernel.syscall_exit: 13589.791839764 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 13589.791844206 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 146 [syscall 146] }
+fs.writev: 13589.791866537 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 3, vlen = 3 }
+kernel.syscall_exit: 13589.791868118 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { ret = 672 }
+kernel.syscall_entry: 13589.791877199 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.791881047 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { count = 4096, fd = 3 }
+kernel.syscall_exit: 13589.791882240 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.791892526 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 13589.791897041 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.791902471 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 13589.791907419 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 4 }
+fs.pollfd: 13589.791911212 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 13589.791913115 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 11 }
+kernel.sched_schedule: 13589.791963640 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { prev_pid = 2259, next_pid = 1852, prev_state = 1 }
+kernel.syscall_entry: 13589.792473732 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726408, syscall_id = 119 [syscall 119] }
+kernel.syscall_exit: 13589.792480780 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = -1375854976 }
+kernel.syscall_entry: 13589.792664317 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 13589.792710103 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 13589.792719777 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.792745080 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 142 [syscall 142] }
+fs.select: 13589.792754834 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 1, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792760813 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 3, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792764113 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 5, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792775961 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 7, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792779735 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 13, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792783121 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 19, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792785956 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 20, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792789162 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 21, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792791935 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 22, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792794790 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 23, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792797291 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 24, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792801683 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 25, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792805050 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 26, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792807737 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 27, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792811443 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 28, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792814612 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 29, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792818554 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 31, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792822576 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 32, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792825466 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 33, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792829265 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 34, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792833614 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 35, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792836845 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 36, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792839680 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 37, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792843399 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 38, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792847075 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 39, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792850281 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 40, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792852955 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 42, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792857051 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 43, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792860442 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 44, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792863463 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 45, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792866478 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 46, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792869017 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 47, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792871716 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 48, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.792874378 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 49, end_time_sec = 0, end_time_nsec = 0 }
+kernel.syscall_exit: 13589.792878715 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 13589.792890743 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 13589.792892626 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 13589.792901361 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.792906321 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.792911035 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.793298157 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.793319384 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4096, fd = 41 }
+kernel.syscall_exit: 13589.793322431 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.793331571 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 146 [syscall 146] }
+kernel.sched_try_wakeup: 13589.793379632 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pid = 2241, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 13589.793405496 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { prev_pid = 1852, next_pid = 2241, prev_state = 0 }
+fs.pollfd: 13589.793869560 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { fd = 8 }
+kernel.syscall_exit: 13589.793878649 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 13589.793897105 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.793914624 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.793915874 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 64 }
+kernel.syscall_entry: 13589.793970685 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.793973512 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.793974774 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.794006143 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 13589.794008858 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 13589.794012115 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 13589.794016611 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 146 [syscall 146] }
+fs.writev: 13589.794027159 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8, vlen = 3 }
+kernel.syscall_exit: 13589.794028668 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 16 }
+kernel.syscall_entry: 13589.794036556 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 13589.794038139 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 13589.794058521 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { prev_pid = 2241, next_pid = 1852, prev_state = 1 }
+fs.writev: 13589.794312405 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 41, vlen = 1 }
+kernel.syscall_exit: 13589.794314800 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 64 }
+kernel.syscall_entry: 13589.794330657 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.794336101 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.794342055 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 13589.794346716 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 13589.794357764 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.794378406 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 142 [syscall 142] }
+fs.select: 13589.794388572 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 1, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794393252 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 3, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794396577 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 5, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794410913 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 7, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794415045 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 13, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794419226 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 19, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794422576 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 20, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794426005 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 21, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794428937 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 22, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794431917 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 23, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794434540 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 24, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794437921 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 25, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794441358 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 26, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794444652 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 27, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794448649 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 28, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794451777 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 29, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794455656 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 31, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794459604 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 32, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794469843 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 33, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794473883 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 34, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794478113 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 35, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794482117 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 36, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794485756 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 37, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794489488 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 38, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794492684 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 39, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794496587 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 40, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794499735 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 41, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794502468 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 42, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794505990 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 43, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794508977 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 44, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794511859 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 45, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794515566 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 46, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794518418 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 47, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794521693 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 48, end_time_sec = 13555, end_time_nsec = 784777073 }
+fs.select: 13589.794524606 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 49, end_time_sec = 13555, end_time_nsec = 784777073 }
+mm.page_free: 13589.794534662 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pfn = 79373, order = 0 }
+kernel.syscall_exit: 13589.794542624 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 2 }
+kernel.syscall_entry: 13589.794555352 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 13589.794557329 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 13589.794570648 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.794574097 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.794576535 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.irq_entry: 13589.794643900 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { ip = 3242336307, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_update_time: 13589.794667496 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { jiffies = 4296292862, xtime_sec = 1262715366, xtime_nsec = 301133045, walltomonotonic_sec = -1262701811, walltomonotonic_nsec = 148963639 }
+kernel.softirq_raise: 13589.794711962 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { softirq_id = 1 [softirq 1] }
+kernel.softirq_raise: 13589.794724463 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { softirq_id = 9 [softirq 9] }
+kernel.irq_exit: 13589.794764594 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.softirq_entry: 13589.794772038 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { softirq_id = 1 [softirq 1] }
+kernel.timer_set: 13589.794797526 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { expires = 1325616, function = 0xc10471de, data = 0 }
+kernel.timer_set: 13589.794818408 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { expires = 1325567, function = 0xc141d458, data = 0 }
+kernel.softirq_exit: 13589.794823014 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { softirq_id = 1 [softirq 1] }
+kernel.softirq_entry: 13589.794824774 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { softirq_id = 9 [softirq 9] }
+rcu.tree_callback: 13589.794916633 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { func = 0xc14285e3 }
+rcu.tree_callback: 13589.794923270 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { func = 0xc14285e3 }
+rcu.tree_callback: 13589.794924977 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { func = 0xc14285e3 }
+rcu.tree_callback: 13589.795082926 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { func = 0xc14285e3 }
+rcu.tree_callback: 13589.795091153 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { func = 0xc14285e3 }
+rcu.tree_callback: 13589.795092908 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { func = 0xc141a9af }
+kernel.softirq_exit: 13589.795096695 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { softirq_id = 9 [softirq 9] }
+kernel.syscall_entry: 13589.795101979 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [syscall 3] }
+kernel.sched_schedule: 13589.795113038 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { prev_pid = 1852, next_pid = 16887, prev_state = 0 }
+vm_state.vm_map: 13589.795354458 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3078414336, end = 3078561792, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.795357599 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3078561792, end = 3078569984, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.795359600 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3078664192, end = 3078672384, flags = 1048691, pgoff = 3078664192, inode = 0 }
+vm_state.vm_map: 13589.795361688 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3078672384, end = 3078676480, flags = 67371125, pgoff = 3078672384, inode = 0 }
+vm_state.vm_map: 13589.795364853 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3078676480, end = 3078791168, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.795366977 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3078791168, end = 3078795264, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.795369138 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3078795264, end = 3078799360, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.795374447 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3078799360, end = 3079090176, flags = 134223989, pgoff = 0, inode = 20940 }
+vm_state.vm_map: 13589.795376614 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3079090176, end = 3079094272, flags = 135272561, pgoff = 286720, inode = 20940 }
+vm_state.vm_map: 13589.795378628 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3079094272, end = 3079098368, flags = 135272563, pgoff = 290816, inode = 20940 }
+vm_state.vm_map: 13589.795380887 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3092787200, end = 3093331968, flags = 1048691, pgoff = 3092787200, inode = 0 }
+vm_state.vm_map: 13589.795383000 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1378, start = 3215458304, end = 3215544320, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.795412089 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1387, start = 134512640, end = 134594560, flags = 134223989, pgoff = 0, inode = 1327123 }
+vm_state.vm_map: 13589.795414602 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1387, start = 134594560, end = 134602752, flags = 135272563, pgoff = 81920, inode = 1327123 }
+vm_state.vm_map: 13589.795416844 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1387, start = 134602752, end = 134610944, flags = 1048691, pgoff = 134602752, inode = 0 }
+vm_state.vm_map: 13589.795419153 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1387, start = 156196864, end = 156332032, flags = 1048691, pgoff = 156196864, inode = 0 }
+vm_state.vm_map: 13589.795421481 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1387, start = 3077312512, end = 3077320704, flags = 1048691, pgoff = 3077312512, inode = 0 }
+vm_state.vm_map: 13589.795424270 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1387, start = 3077320704, end = 3078635520, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.795426703 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1387, start = 3078635520, end = 3078643712, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.795428858 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1387, start = 3078643712, end = 3078647808, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.795431080 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1387, start = 3078647808, end = 3078660096, flags = 1048691, pgoff = 3078647808, inode = 0 }
+vm_state.vm_map: 13589.795436672 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1387, start = 3078660096, end = 3078807552, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.795438950 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1387, start = 3078807552, end = 3078811648, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.795441105 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1387, start = 3078811648, end = 3078815744, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.795443280 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1387, start = 3078909952, end = 3078918144, flags = 1048691, pgoff = 3078909952, inode = 0 }
+vm_state.vm_map: 13589.795445570 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1387, start = 3078918144, end = 3078922240, flags = 67371125, pgoff = 3078918144, inode = 0 }
+vm_state.vm_map: 13589.795448286 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1387, start = 3078922240, end = 3079036928, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.795450693 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1387, start = 3079036928, end = 3079041024, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.795452800 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1387, start = 3079041024, end = 3079045120, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.795455238 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1387, start = 3216125952, end = 3216211968, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.795461322 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 134512640, end = 135290880, flags = 134223989, pgoff = 0, inode = 1048644 }
+vm_state.vm_map: 13589.795463484 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 135290880, end = 135311360, flags = 135272563, pgoff = 778240, inode = 1048644 }
+vm_state.vm_map: 13589.795465621 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 135311360, end = 135331840, flags = 1048691, pgoff = 135311360, inode = 0 }
+vm_state.vm_map: 13589.795467966 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 167739392, end = 167837696, flags = 1048691, pgoff = 167739392, inode = 0 }
+vm_state.vm_map: 13589.795470528 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3077042176, end = 3077083136, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.795472573 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3077083136, end = 3077087232, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.795474531 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3077087232, end = 3077091328, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.795477290 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3077091328, end = 3077128192, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.795479340 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3077128192, end = 3077132288, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.795481508 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3077132288, end = 3077136384, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.795483823 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3077136384, end = 3077214208, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.795486336 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3077214208, end = 3077218304, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.795488509 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3077218304, end = 3077222400, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.795490677 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3077222400, end = 3077230592, flags = 1048691, pgoff = 3077222400, inode = 0 }
+vm_state.vm_map: 13589.795493121 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3077230592, end = 3077255168, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.795495320 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3077255168, end = 3077259264, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.795497278 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3077259264, end = 3077263360, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.795499581 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3077263360, end = 3077267456, flags = 1048691, pgoff = 3077263360, inode = 0 }
+vm_state.vm_map: 13589.795501773 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3077267456, end = 3078582272, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.795503929 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3078582272, end = 3078590464, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.795505899 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3078590464, end = 3078594560, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.795508054 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3078594560, end = 3078610944, flags = 1048691, pgoff = 3078594560, inode = 0 }
+vm_state.vm_map: 13589.795510437 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3078610944, end = 3078619136, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.795512593 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3078619136, end = 3078623232, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.795514630 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3078623232, end = 3078627328, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.795517193 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3078627328, end = 3078844416, flags = 134217845, pgoff = 0, inode = 499784 }
+vm_state.vm_map: 13589.795519342 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3078844416, end = 3078856704, flags = 135266419, pgoff = 217088, inode = 499784 }
+vm_state.vm_map: 13589.795521725 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3078950912, end = 3078959104, flags = 1048691, pgoff = 3078950912, inode = 0 }
+vm_state.vm_map: 13589.795524022 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3078959104, end = 3078963200, flags = 67371125, pgoff = 3078959104, inode = 0 }
+vm_state.vm_map: 13589.795526245 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3078963200, end = 3079077888, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.795528419 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3079077888, end = 3079081984, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.795530623 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3079081984, end = 3079086080, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.795532883 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1417, start = 3219046400, end = 3219132416, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.795535519 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 2949386240, end = 2949390336, flags = 1048688, pgoff = 2949386240, inode = 0 }
+vm_state.vm_map: 13589.795537588 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 2949390336, end = 2957778944, flags = 1048691, pgoff = 2949390336, inode = 0 }
+vm_state.vm_map: 13589.795539921 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 2957778944, end = 2957783040, flags = 1048688, pgoff = 2957778944, inode = 0 }
+vm_state.vm_map: 13589.795541990 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 2957783040, end = 2966171648, flags = 1048691, pgoff = 2957783040, inode = 0 }
+vm_state.vm_map: 13589.795544282 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 2966171648, end = 2966175744, flags = 1048688, pgoff = 2966171648, inode = 0 }
+vm_state.vm_map: 13589.795546357 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 2966175744, end = 2974564352, flags = 1048691, pgoff = 2966175744, inode = 0 }
+vm_state.vm_map: 13589.795548660 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 2974564352, end = 2974568448, flags = 1048688, pgoff = 2974564352, inode = 0 }
+vm_state.vm_map: 13589.795550765 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 2974568448, end = 2985078784, flags = 1048691, pgoff = 2974568448, inode = 0 }
+vm_state.vm_map: 13589.795552859 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 2987335680, end = 2987339776, flags = 1048688, pgoff = 2987335680, inode = 0 }
+vm_state.vm_map: 13589.795554823 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 2987339776, end = 2987536384, flags = 1048691, pgoff = 2987339776, inode = 0 }
+vm_state.vm_map: 13589.795557662 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 2987536384, end = 2987540480, flags = 1048688, pgoff = 2987536384, inode = 0 }
+vm_state.vm_map: 13589.795560261 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 2987540480, end = 2987737088, flags = 1048691, pgoff = 2987540480, inode = 0 }
+vm_state.vm_map: 13589.795562557 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 2987737088, end = 2987741184, flags = 1048688, pgoff = 2987737088, inode = 0 }
+vm_state.vm_map: 13589.795564720 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 2987741184, end = 2996129792, flags = 1048691, pgoff = 2987741184, inode = 0 }
+vm_state.vm_map: 13589.795566801 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 2996129792, end = 2996133888, flags = 1048688, pgoff = 2996129792, inode = 0 }
+vm_state.vm_map: 13589.795569079 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 2996133888, end = 3004522496, flags = 1048691, pgoff = 2996133888, inode = 0 }
+vm_state.vm_map: 13589.795571253 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3004522496, end = 3004526592, flags = 1048688, pgoff = 3004522496, inode = 0 }
+vm_state.vm_map: 13589.795573408 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3004526592, end = 3058089984, flags = 1048691, pgoff = 3004526592, inode = 0 }
+vm_state.vm_map: 13589.795575895 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3058089984, end = 3058130944, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.795578174 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3058130944, end = 3058135040, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.795580336 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3058135040, end = 3058139136, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.795582540 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3058139136, end = 3058176000, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.795584622 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3058176000, end = 3058180096, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.795586937 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3058180096, end = 3058184192, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.795589197 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3058184192, end = 3058208768, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.795591407 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3058208768, end = 3058212864, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.795593753 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3058212864, end = 3058216960, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.795595952 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3058216960, end = 3058221056, flags = 1048688, pgoff = 3058216960, inode = 0 }
+vm_state.vm_map: 13589.795598138 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3058221056, end = 3066617856, flags = 1048691, pgoff = 3058221056, inode = 0 }
+vm_state.vm_map: 13589.795600441 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3066617856, end = 3067932672, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.795602553 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3067932672, end = 3067940864, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.795604850 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3067940864, end = 3067944960, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.795606950 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3067944960, end = 3067957248, flags = 1048691, pgoff = 3067944960, inode = 0 }
+vm_state.vm_map: 13589.795609629 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3067957248, end = 3068071936, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.795611913 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3068071936, end = 3068076032, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.795613963 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3068076032, end = 3068080128, flags = 1048691, pgoff = 3068076032, inode = 0 }
+vm_state.vm_map: 13589.795616317 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3068080128, end = 3068227584, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.795618410 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3068227584, end = 3068231680, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.795620584 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3068231680, end = 3068235776, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.795623034 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3068235776, end = 3069173760, flags = 134217845, pgoff = 0, inode = 16850 }
+vm_state.vm_map: 13589.795625208 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069173760, end = 3069190144, flags = 135266417, pgoff = 937984, inode = 16850 }
+vm_state.vm_map: 13589.795627185 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069190144, end = 3069194240, flags = 135266419, pgoff = 954368, inode = 16850 }
+vm_state.vm_map: 13589.795629820 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069194240, end = 3069222912, flags = 1048691, pgoff = 3069194240, inode = 0 }
+vm_state.vm_map: 13589.795632185 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069222912, end = 3069300736, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.795634340 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069300736, end = 3069304832, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.795636286 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069304832, end = 3069308928, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.795638737 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069308928, end = 3069317120, flags = 1048691, pgoff = 3069308928, inode = 0 }
+vm_state.vm_map: 13589.795643923 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069317120, end = 3069353984, flags = 134217845, pgoff = 0, inode = 508755 }
+vm_state.vm_map: 13589.795646101 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069353984, end = 3069358080, flags = 135266417, pgoff = 32768, inode = 508755 }
+vm_state.vm_map: 13589.795648270 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069358080, end = 3069362176, flags = 135266419, pgoff = 36864, inode = 508755 }
+vm_state.vm_map: 13589.795650560 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069362176, end = 3069521920, flags = 1048691, pgoff = 3069362176, inode = 0 }
+vm_state.vm_map: 13589.795652888 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069521920, end = 3069530112, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.795655043 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069530112, end = 3069534208, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.795657025 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069534208, end = 3069538304, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.795659631 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069538304, end = 3069566976, flags = 134217845, pgoff = 0, inode = 499851 }
+vm_state.vm_map: 13589.795661835 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069566976, end = 3069571072, flags = 135266419, pgoff = 28672, inode = 499851 }
+vm_state.vm_map: 13589.795663873 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069571072, end = 3069575168, flags = 1048691, pgoff = 3069571072, inode = 0 }
+vm_state.vm_map: 13589.795667021 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069575168, end = 3069657088, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.795669170 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069657088, end = 3069661184, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.795671768 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069661184, end = 3069747200, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.795673800 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069747200, end = 3069751296, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.795675845 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069751296, end = 3069755392, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.795678019 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069755392, end = 3069763584, flags = 1048691, pgoff = 3069755392, inode = 0 }
+vm_state.vm_map: 13589.795679983 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069857792, end = 3069865984, flags = 1048691, pgoff = 3069857792, inode = 0 }
+vm_state.vm_map: 13589.795682205 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069865984, end = 3069870080, flags = 67371125, pgoff = 3069865984, inode = 0 }
+vm_state.vm_map: 13589.795684416 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069870080, end = 3069984768, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.795686571 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069984768, end = 3069988864, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.795688530 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069988864, end = 3069992960, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.795693474 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3069992960, end = 3077795840, flags = 134223989, pgoff = 0, inode = 18505 }
+vm_state.vm_map: 13589.795695520 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3077795840, end = 3078008832, flags = 135272561, pgoff = 7802880, inode = 18505 }
+vm_state.vm_map: 13589.795697687 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3078008832, end = 3078397952, flags = 135272563, pgoff = 8015872, inode = 18505 }
+vm_state.vm_map: 13589.795699694 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3078397952, end = 3078471680, flags = 1048691, pgoff = 3078397952, inode = 0 }
+vm_state.vm_map: 13589.795702342 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3083501568, end = 3088711680, flags = 1048691, pgoff = 3083501568, inode = 0 }
+vm_state.vm_map: 13589.795704312 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1539, start = 3219337216, end = 3219423232, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.795710064 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1540, start = 134512640, end = 134520832, flags = 134223989, pgoff = 0, inode = 17712 }
+vm_state.vm_map: 13589.795712330 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1540, start = 134520832, end = 134524928, flags = 135272563, pgoff = 4096, inode = 17712 }
+vm_state.vm_map: 13589.795714337 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1540, start = 137973760, end = 138108928, flags = 1048691, pgoff = 137973760, inode = 0 }
+vm_state.vm_map: 13589.795716554 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1540, start = 3077447680, end = 3077451776, flags = 1048691, pgoff = 3077447680, inode = 0 }
+vm_state.vm_map: 13589.795719480 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1540, start = 3077451776, end = 3078766592, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.795721542 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1540, start = 3078766592, end = 3078774784, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.795723716 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1540, start = 3078774784, end = 3078778880, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.795725792 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1540, start = 3078778880, end = 3078791168, flags = 1048691, pgoff = 3078778880, inode = 0 }
+vm_state.vm_map: 13589.795727890 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1540, start = 3078881280, end = 3078893568, flags = 1048691, pgoff = 3078881280, inode = 0 }
+vm_state.vm_map: 13589.795729948 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1540, start = 3078893568, end = 3078897664, flags = 67371125, pgoff = 3078893568, inode = 0 }
+vm_state.vm_map: 13589.795732331 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1540, start = 3078897664, end = 3079012352, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.795734412 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1540, start = 3079012352, end = 3079016448, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.795736733 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1540, start = 3079016448, end = 3079020544, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.795739277 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1540, start = 3213615104, end = 3213701120, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.795747806 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 134512640, end = 134754304, flags = 134223989, pgoff = 0, inode = 17145 }
+vm_state.vm_map: 13589.795750447 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 134754304, end = 134758400, flags = 135272563, pgoff = 237568, inode = 17145 }
+vm_state.vm_map: 13589.795752683 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 134758400, end = 134770688, flags = 1048691, pgoff = 134758400, inode = 0 }
+vm_state.vm_map: 13589.795755102 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 153489408, end = 153624576, flags = 1048691, pgoff = 153489408, inode = 0 }
+vm_state.vm_map: 13589.795757382 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3076071424, end = 3076075520, flags = 1048688, pgoff = 3076071424, inode = 0 }
+vm_state.vm_map: 13589.795759561 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3076075520, end = 3076599808, flags = 1048691, pgoff = 3076075520, inode = 0 }
+vm_state.vm_map: 13589.795761870 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3076599808, end = 3076603904, flags = 1048688, pgoff = 3076599808, inode = 0 }
+vm_state.vm_map: 13589.795764222 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3076603904, end = 3076734976, flags = 1048691, pgoff = 3076603904, inode = 0 }
+vm_state.vm_map: 13589.795766704 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3076734976, end = 3076739072, flags = 1048688, pgoff = 3076734976, inode = 0 }
+vm_state.vm_map: 13589.795768780 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3076739072, end = 3076874240, flags = 1048691, pgoff = 3076739072, inode = 0 }
+vm_state.vm_map: 13589.795771403 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3076874240, end = 3078189056, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.795773681 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3078189056, end = 3078197248, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.795775873 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3078197248, end = 3078201344, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.795778256 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3078201344, end = 3078213632, flags = 1048691, pgoff = 3078201344, inode = 0 }
+vm_state.vm_map: 13589.795780578 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3078213632, end = 3078361088, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.795782659 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3078361088, end = 3078365184, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.795784956 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3078365184, end = 3078369280, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.795787019 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3078369280, end = 3078373376, flags = 1048691, pgoff = 3078369280, inode = 0 }
+vm_state.vm_map: 13589.795789643 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3078373376, end = 3078402048, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.795791859 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3078402048, end = 3078406144, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.795793922 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3078406144, end = 3078410240, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.795796077 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3078410240, end = 3078496256, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.795798127 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3078496256, end = 3078500352, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.795800080 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3078500352, end = 3078504448, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.795802063 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3078504448, end = 3078512640, flags = 1048691, pgoff = 3078504448, inode = 0 }
+vm_state.vm_map: 13589.795804045 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3078569984, end = 3078574080, flags = 1048691, pgoff = 3078569984, inode = 0 }
+vm_state.vm_map: 13589.795805997 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3078574080, end = 3078578176, flags = 1048695, pgoff = 3078574080, inode = 0 }
+vm_state.vm_map: 13589.795814877 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3078578176, end = 3078606848, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.795816971 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3078606848, end = 3078615040, flags = 1048691, pgoff = 3078606848, inode = 0 }
+vm_state.vm_map: 13589.795819157 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3078615040, end = 3078619136, flags = 67371125, pgoff = 3078615040, inode = 0 }
+vm_state.vm_map: 13589.795821811 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3078619136, end = 3078733824, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.795824176 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3078733824, end = 3078737920, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.795826232 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3078737920, end = 3078742016, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.795828573 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1637, start = 3216502784, end = 3216588800, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.795834940 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 134512640, end = 134635520, flags = 134223989, pgoff = 0, inode = 17179 }
+vm_state.vm_map: 13589.795837064 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 134635520, end = 134639616, flags = 135272563, pgoff = 118784, inode = 17179 }
+vm_state.vm_map: 13589.795839269 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 154742784, end = 155201536, flags = 1048691, pgoff = 154742784, inode = 0 }
+vm_state.vm_map: 13589.795841455 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3059744768, end = 3059879936, flags = 2097267, pgoff = 3059744768, inode = 0 }
+vm_state.vm_map: 13589.795843727 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3059879936, end = 3060793344, flags = 2097264, pgoff = 3059879936, inode = 0 }
+vm_state.vm_map: 13589.795849546 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3061432320, end = 3061436416, flags = 1048688, pgoff = 3061432320, inode = 0 }
+vm_state.vm_map: 13589.795851776 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3061436416, end = 3061501952, flags = 1048691, pgoff = 3061436416, inode = 0 }
+vm_state.vm_map: 13589.795854873 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3061501952, end = 3061616640, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.795857115 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3061616640, end = 3061620736, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.795863032 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3061686272, end = 3061714944, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.795865581 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3061714944, end = 3061719040, flags = 1048688, pgoff = 3061714944, inode = 0 }
+vm_state.vm_map: 13589.795868365 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3061719040, end = 3070107648, flags = 1048691, pgoff = 3061719040, inode = 0 }
+vm_state.vm_map: 13589.795870600 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3070107648, end = 3070111744, flags = 1048688, pgoff = 3070107648, inode = 0 }
+vm_state.vm_map: 13589.795872922 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3070111744, end = 3070177280, flags = 1048691, pgoff = 3070111744, inode = 0 }
+vm_state.vm_map: 13589.795875446 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3070177280, end = 3070181376, flags = 1048688, pgoff = 3070177280, inode = 0 }
+vm_state.vm_map: 13589.795877534 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3070181376, end = 3070246912, flags = 1048691, pgoff = 3070181376, inode = 0 }
+vm_state.vm_map: 13589.795879874 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3070246912, end = 3070251008, flags = 1048688, pgoff = 3070246912, inode = 0 }
+vm_state.vm_map: 13589.795881943 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3070251008, end = 3070316544, flags = 1048691, pgoff = 3070251008, inode = 0 }
+vm_state.vm_map: 13589.795884258 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3070316544, end = 3070320640, flags = 1048688, pgoff = 3070316544, inode = 0 }
+vm_state.vm_map: 13589.795886296 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3070320640, end = 3070386176, flags = 1048691, pgoff = 3070320640, inode = 0 }
+vm_state.vm_map: 13589.795888446 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3070386176, end = 3070390272, flags = 1048688, pgoff = 3070386176, inode = 0 }
+vm_state.vm_map: 13589.795890423 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3070390272, end = 3070455808, flags = 1048691, pgoff = 3070390272, inode = 0 }
+vm_state.vm_map: 13589.795892769 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3070455808, end = 3070459904, flags = 1048688, pgoff = 3070455808, inode = 0 }
+vm_state.vm_map: 13589.795895238 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3070459904, end = 3070525440, flags = 1048691, pgoff = 3070459904, inode = 0 }
+vm_state.vm_map: 13589.795897319 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3070525440, end = 3070529536, flags = 1048688, pgoff = 3070525440, inode = 0 }
+vm_state.vm_map: 13589.795899394 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3070529536, end = 3070595072, flags = 1048691, pgoff = 3070529536, inode = 0 }
+vm_state.vm_map: 13589.795901507 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3070595072, end = 3070599168, flags = 1048688, pgoff = 3070595072, inode = 0 }
+vm_state.vm_map: 13589.795903742 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3070599168, end = 3070664704, flags = 1048691, pgoff = 3070599168, inode = 0 }
+vm_state.vm_map: 13589.795905903 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3070664704, end = 3070668800, flags = 1048688, pgoff = 3070664704, inode = 0 }
+vm_state.vm_map: 13589.795907861 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3070668800, end = 3070734336, flags = 1048691, pgoff = 3070668800, inode = 0 }
+vm_state.vm_map: 13589.795910300 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3070734336, end = 3070738432, flags = 1048688, pgoff = 3070734336, inode = 0 }
+vm_state.vm_map: 13589.795912591 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3070738432, end = 3070803968, flags = 1048691, pgoff = 3070738432, inode = 0 }
+vm_state.vm_map: 13589.795914574 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3070803968, end = 3070808064, flags = 1048688, pgoff = 3070803968, inode = 0 }
+vm_state.vm_map: 13589.795916870 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3070808064, end = 3070873600, flags = 1048691, pgoff = 3070808064, inode = 0 }
+vm_state.vm_map: 13589.795919057 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3070873600, end = 3070877696, flags = 1048688, pgoff = 3070873600, inode = 0 }
+vm_state.vm_map: 13589.795921021 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3070877696, end = 3070943232, flags = 1048691, pgoff = 3070877696, inode = 0 }
+vm_state.vm_map: 13589.795923361 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3070943232, end = 3070947328, flags = 1048688, pgoff = 3070943232, inode = 0 }
+vm_state.vm_map: 13589.795925516 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3070947328, end = 3071012864, flags = 1048691, pgoff = 3070947328, inode = 0 }
+vm_state.vm_map: 13589.795928090 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071012864, end = 3071016960, flags = 1048688, pgoff = 3071012864, inode = 0 }
+vm_state.vm_map: 13589.795930251 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071016960, end = 3071082496, flags = 1048691, pgoff = 3071016960, inode = 0 }
+vm_state.vm_map: 13589.795932259 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071082496, end = 3071086592, flags = 1048688, pgoff = 3071082496, inode = 0 }
+vm_state.vm_map: 13589.795934470 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071086592, end = 3071152128, flags = 1048691, pgoff = 3071086592, inode = 0 }
+vm_state.vm_map: 13589.795936600 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071152128, end = 3071156224, flags = 1048688, pgoff = 3071152128, inode = 0 }
+vm_state.vm_map: 13589.795938700 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071156224, end = 3071221760, flags = 1048691, pgoff = 3071156224, inode = 0 }
+vm_state.vm_map: 13589.795940830 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071221760, end = 3071225856, flags = 1048688, pgoff = 3071221760, inode = 0 }
+vm_state.vm_map: 13589.795942992 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071225856, end = 3071291392, flags = 1048691, pgoff = 3071225856, inode = 0 }
+vm_state.vm_map: 13589.795945012 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071291392, end = 3071295488, flags = 1048688, pgoff = 3071291392, inode = 0 }
+vm_state.vm_map: 13589.795947032 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071295488, end = 3071361024, flags = 1048691, pgoff = 3071295488, inode = 0 }
+vm_state.vm_map: 13589.795948997 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071361024, end = 3071365120, flags = 1048688, pgoff = 3071361024, inode = 0 }
+vm_state.vm_map: 13589.795951009 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071365120, end = 3071430656, flags = 1048691, pgoff = 3071365120, inode = 0 }
+vm_state.vm_map: 13589.795952999 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071430656, end = 3071434752, flags = 1048688, pgoff = 3071430656, inode = 0 }
+vm_state.vm_map: 13589.795954945 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071434752, end = 3071500288, flags = 1048691, pgoff = 3071434752, inode = 0 }
+vm_state.vm_map: 13589.795957155 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071500288, end = 3071504384, flags = 1048688, pgoff = 3071500288, inode = 0 }
+vm_state.vm_map: 13589.795959089 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071504384, end = 3071569920, flags = 1048691, pgoff = 3071504384, inode = 0 }
+vm_state.vm_map: 13589.795984102 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071569920, end = 3071574016, flags = 1048688, pgoff = 3071569920, inode = 0 }
+vm_state.vm_map: 13589.795986264 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071574016, end = 3071639552, flags = 1048691, pgoff = 3071574016, inode = 0 }
+vm_state.vm_map: 13589.795988283 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071639552, end = 3071643648, flags = 1048688, pgoff = 3071639552, inode = 0 }
+vm_state.vm_map: 13589.795990475 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071643648, end = 3071709184, flags = 1048691, pgoff = 3071643648, inode = 0 }
+vm_state.vm_map: 13589.795992563 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071709184, end = 3071713280, flags = 1048688, pgoff = 3071709184, inode = 0 }
+vm_state.vm_map: 13589.795994762 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071713280, end = 3071778816, flags = 1048691, pgoff = 3071713280, inode = 0 }
+vm_state.vm_map: 13589.795997034 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071778816, end = 3071782912, flags = 1048688, pgoff = 3071778816, inode = 0 }
+vm_state.vm_map: 13589.795999139 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071782912, end = 3071848448, flags = 1048691, pgoff = 3071782912, inode = 0 }
+vm_state.vm_map: 13589.796001172 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071848448, end = 3071852544, flags = 1048688, pgoff = 3071848448, inode = 0 }
+vm_state.vm_map: 13589.796003561 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071852544, end = 3071918080, flags = 1048691, pgoff = 3071852544, inode = 0 }
+vm_state.vm_map: 13589.796005833 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071918080, end = 3071922176, flags = 1048688, pgoff = 3071918080, inode = 0 }
+vm_state.vm_map: 13589.796008001 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071922176, end = 3071987712, flags = 1048691, pgoff = 3071922176, inode = 0 }
+vm_state.vm_map: 13589.796010291 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071987712, end = 3071991808, flags = 1048688, pgoff = 3071987712, inode = 0 }
+vm_state.vm_map: 13589.796012737 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3071991808, end = 3072057344, flags = 1048691, pgoff = 3071991808, inode = 0 }
+vm_state.vm_map: 13589.796015335 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072057344, end = 3072061440, flags = 1048688, pgoff = 3072057344, inode = 0 }
+vm_state.vm_map: 13589.796017589 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072061440, end = 3072126976, flags = 1048691, pgoff = 3072061440, inode = 0 }
+vm_state.vm_map: 13589.796020304 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072126976, end = 3072131072, flags = 1048688, pgoff = 3072126976, inode = 0 }
+vm_state.vm_map: 13589.796022792 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072131072, end = 3072196608, flags = 1048691, pgoff = 3072131072, inode = 0 }
+vm_state.vm_map: 13589.796025046 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072196608, end = 3072200704, flags = 1048688, pgoff = 3072196608, inode = 0 }
+vm_state.vm_map: 13589.796027398 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072200704, end = 3072266240, flags = 1048691, pgoff = 3072200704, inode = 0 }
+vm_state.vm_map: 13589.796029984 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072266240, end = 3072270336, flags = 1048688, pgoff = 3072266240, inode = 0 }
+vm_state.vm_map: 13589.796032350 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072270336, end = 3072335872, flags = 1048691, pgoff = 3072270336, inode = 0 }
+vm_state.vm_map: 13589.796034665 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072335872, end = 3072339968, flags = 1048688, pgoff = 3072335872, inode = 0 }
+vm_state.vm_map: 13589.796036918 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072339968, end = 3072405504, flags = 1048691, pgoff = 3072339968, inode = 0 }
+vm_state.vm_map: 13589.796039492 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072405504, end = 3072409600, flags = 1048688, pgoff = 3072405504, inode = 0 }
+vm_state.vm_map: 13589.796041499 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072409600, end = 3072475136, flags = 1048691, pgoff = 3072409600, inode = 0 }
+vm_state.vm_map: 13589.796043865 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072475136, end = 3072479232, flags = 1048688, pgoff = 3072475136, inode = 0 }
+vm_state.vm_map: 13589.796045854 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072479232, end = 3072544768, flags = 1048691, pgoff = 3072479232, inode = 0 }
+vm_state.vm_map: 13589.796048249 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072544768, end = 3072548864, flags = 1048688, pgoff = 3072544768, inode = 0 }
+vm_state.vm_map: 13589.796050305 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072548864, end = 3072614400, flags = 1048691, pgoff = 3072548864, inode = 0 }
+vm_state.vm_map: 13589.796053256 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072614400, end = 3072618496, flags = 1048688, pgoff = 3072614400, inode = 0 }
+vm_state.vm_map: 13589.796055411 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072618496, end = 3072684032, flags = 1048691, pgoff = 3072618496, inode = 0 }
+vm_state.vm_map: 13589.796058200 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072684032, end = 3072688128, flags = 1048688, pgoff = 3072684032, inode = 0 }
+vm_state.vm_map: 13589.796060164 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072688128, end = 3072753664, flags = 1048691, pgoff = 3072688128, inode = 0 }
+vm_state.vm_map: 13589.796062382 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072753664, end = 3072757760, flags = 1048688, pgoff = 3072753664, inode = 0 }
+vm_state.vm_map: 13589.796064364 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072757760, end = 3072823296, flags = 1048691, pgoff = 3072757760, inode = 0 }
+vm_state.vm_map: 13589.796066803 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072823296, end = 3072827392, flags = 1048688, pgoff = 3072823296, inode = 0 }
+vm_state.vm_map: 13589.796068798 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072827392, end = 3072892928, flags = 1048691, pgoff = 3072827392, inode = 0 }
+vm_state.vm_map: 13589.796070990 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072892928, end = 3072897024, flags = 1048688, pgoff = 3072892928, inode = 0 }
+vm_state.vm_map: 13589.796073409 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072897024, end = 3072962560, flags = 1048691, pgoff = 3072897024, inode = 0 }
+vm_state.vm_map: 13589.796075467 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072962560, end = 3072966656, flags = 1048688, pgoff = 3072962560, inode = 0 }
+vm_state.vm_map: 13589.796078078 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3072966656, end = 3073032192, flags = 1048691, pgoff = 3072966656, inode = 0 }
+vm_state.vm_map: 13589.796080461 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073032192, end = 3073036288, flags = 1048688, pgoff = 3073032192, inode = 0 }
+vm_state.vm_map: 13589.796082825 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073036288, end = 3073101824, flags = 1048691, pgoff = 3073036288, inode = 0 }
+vm_state.vm_map: 13589.796085277 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073101824, end = 3073105920, flags = 1048688, pgoff = 3073101824, inode = 0 }
+vm_state.vm_map: 13589.796087505 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073105920, end = 3073171456, flags = 1048691, pgoff = 3073105920, inode = 0 }
+vm_state.vm_map: 13589.796089605 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073171456, end = 3073175552, flags = 1048688, pgoff = 3073171456, inode = 0 }
+vm_state.vm_map: 13589.796091884 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073175552, end = 3073241088, flags = 1048691, pgoff = 3073175552, inode = 0 }
+vm_state.vm_map: 13589.796094218 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073241088, end = 3073245184, flags = 1048688, pgoff = 3073241088, inode = 0 }
+vm_state.vm_map: 13589.796096564 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073245184, end = 3073310720, flags = 1048691, pgoff = 3073245184, inode = 0 }
+vm_state.vm_map: 13589.796098977 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073310720, end = 3073314816, flags = 1048688, pgoff = 3073310720, inode = 0 }
+vm_state.vm_map: 13589.796101182 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073314816, end = 3073380352, flags = 1048691, pgoff = 3073314816, inode = 0 }
+vm_state.vm_map: 13589.796103251 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073380352, end = 3073384448, flags = 1048688, pgoff = 3073380352, inode = 0 }
+vm_state.vm_map: 13589.796105320 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073384448, end = 3073449984, flags = 1048691, pgoff = 3073384448, inode = 0 }
+vm_state.vm_map: 13589.796107593 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073449984, end = 3073454080, flags = 1048688, pgoff = 3073449984, inode = 0 }
+vm_state.vm_map: 13589.796110246 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073454080, end = 3073519616, flags = 1048691, pgoff = 3073454080, inode = 0 }
+vm_state.vm_map: 13589.796112611 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073519616, end = 3073523712, flags = 1048688, pgoff = 3073519616, inode = 0 }
+vm_state.vm_map: 13589.796114711 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073523712, end = 3073589248, flags = 1048691, pgoff = 3073523712, inode = 0 }
+vm_state.vm_map: 13589.796116756 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073589248, end = 3073593344, flags = 1048688, pgoff = 3073589248, inode = 0 }
+vm_state.vm_map: 13589.796119089 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073593344, end = 3073658880, flags = 1048691, pgoff = 3073593344, inode = 0 }
+vm_state.vm_map: 13589.796121466 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073658880, end = 3073662976, flags = 1048688, pgoff = 3073658880, inode = 0 }
+vm_state.vm_map: 13589.796123634 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073662976, end = 3073728512, flags = 1048691, pgoff = 3073662976, inode = 0 }
+vm_state.vm_map: 13589.796125992 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073728512, end = 3073732608, flags = 1048688, pgoff = 3073728512, inode = 0 }
+vm_state.vm_map: 13589.796128425 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073732608, end = 3073798144, flags = 1048691, pgoff = 3073732608, inode = 0 }
+vm_state.vm_map: 13589.796131578 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073798144, end = 3073802240, flags = 1048688, pgoff = 3073798144, inode = 0 }
+vm_state.vm_map: 13589.796133579 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073802240, end = 3073867776, flags = 1048691, pgoff = 3073802240, inode = 0 }
+vm_state.vm_map: 13589.796135531 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073867776, end = 3073871872, flags = 1048688, pgoff = 3073867776, inode = 0 }
+vm_state.vm_map: 13589.796137631 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073871872, end = 3073937408, flags = 1048691, pgoff = 3073871872, inode = 0 }
+vm_state.vm_map: 13589.796139823 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073937408, end = 3073941504, flags = 1048688, pgoff = 3073937408, inode = 0 }
+vm_state.vm_map: 13589.796142132 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073941504, end = 3074007040, flags = 1048691, pgoff = 3073941504, inode = 0 }
+vm_state.vm_map: 13589.796144546 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3074007040, end = 3074011136, flags = 1048688, pgoff = 3074007040, inode = 0 }
+vm_state.vm_map: 13589.796146738 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3074011136, end = 3074076672, flags = 1048691, pgoff = 3074011136, inode = 0 }
+vm_state.vm_map: 13589.796148820 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3074076672, end = 3074080768, flags = 1048688, pgoff = 3074076672, inode = 0 }
+vm_state.vm_map: 13589.796151110 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3074080768, end = 3074146304, flags = 1048691, pgoff = 3074080768, inode = 0 }
+vm_state.vm_map: 13589.796153395 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3074146304, end = 3074150400, flags = 1048688, pgoff = 3074146304, inode = 0 }
+vm_state.vm_map: 13589.796155871 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3074150400, end = 3074215936, flags = 1048691, pgoff = 3074150400, inode = 0 }
+vm_state.vm_map: 13589.796157933 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3074215936, end = 3074220032, flags = 1048688, pgoff = 3074215936, inode = 0 }
+vm_state.vm_map: 13589.796159984 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3074220032, end = 3074285568, flags = 1048691, pgoff = 3074220032, inode = 0 }
+vm_state.vm_map: 13589.796162349 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3074285568, end = 3074289664, flags = 1048688, pgoff = 3074285568, inode = 0 }
+vm_state.vm_map: 13589.796164689 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3074289664, end = 3074363392, flags = 1048691, pgoff = 3074289664, inode = 0 }
+vm_state.vm_map: 13589.796168525 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3074363392, end = 3074461696, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 13589.796170612 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3074461696, end = 3074465792, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 13589.796173075 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3074465792, end = 3074469888, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 13589.796183175 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3074469888, end = 3074539520, flags = 134217845, pgoff = 0, inode = 508763 }
+vm_state.vm_map: 13589.796185250 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3074539520, end = 3074543616, flags = 135266417, pgoff = 65536, inode = 508763 }
+vm_state.vm_map: 13589.796187497 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3074543616, end = 3074547712, flags = 135266419, pgoff = 69632, inode = 508763 }
+vm_state.vm_map: 13589.796189726 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3074547712, end = 3074555904, flags = 1048691, pgoff = 3074547712, inode = 0 }
+vm_state.vm_map: 13589.796192491 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3074555904, end = 3074564096, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.796194566 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3074564096, end = 3074568192, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.796196630 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3074568192, end = 3074572288, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.796201636 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3074572288, end = 3074822144, flags = 134217845, pgoff = 0, inode = 17169 }
+vm_state.vm_map: 13589.796203921 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3074822144, end = 3074830336, flags = 135266419, pgoff = 245760, inode = 17169 }
+vm_state.vm_map: 13589.796206174 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3074830336, end = 3074834432, flags = 1048691, pgoff = 3074830336, inode = 0 }
+vm_state.vm_map: 13589.796212424 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3074834432, end = 3075026944, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.796214537 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3075026944, end = 3075031040, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.796217068 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3075031040, end = 3076345856, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.796219173 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3076345856, end = 3076354048, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.796221526 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3076354048, end = 3076358144, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.796223521 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3076358144, end = 3076370432, flags = 1048691, pgoff = 3076358144, inode = 0 }
+vm_state.vm_map: 13589.796229155 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3076370432, end = 3077115904, flags = 134217845, pgoff = 0, inode = 499794 }
+vm_state.vm_map: 13589.796231384 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3077115904, end = 3077120000, flags = 135266419, pgoff = 745472, inode = 499794 }
+vm_state.vm_map: 13589.796233909 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3077120000, end = 3077132288, flags = 134217845, pgoff = 0, inode = 19646 }
+vm_state.vm_map: 13589.796235984 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3077132288, end = 3077136384, flags = 135266419, pgoff = 8192, inode = 19646 }
+vm_state.vm_map: 13589.796241477 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3077136384, end = 3077382144, flags = 134217845, pgoff = 0, inode = 20603 }
+vm_state.vm_map: 13589.796243553 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3077382144, end = 3077386240, flags = 135266419, pgoff = 245760, inode = 20603 }
+vm_state.vm_map: 13589.796245684 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3077386240, end = 3077390336, flags = 1048691, pgoff = 3077386240, inode = 0 }
+vm_state.vm_map: 13589.796248972 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3077390336, end = 3077992448, flags = 134217845, pgoff = 0, inode = 19648 }
+vm_state.vm_map: 13589.796251324 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3077992448, end = 3078000640, flags = 135266419, pgoff = 602112, inode = 19648 }
+vm_state.vm_map: 13589.796254292 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078000640, end = 3078115328, flags = 134217845, pgoff = 0, inode = 17171 }
+vm_state.vm_map: 13589.796256416 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078115328, end = 3078119424, flags = 135266419, pgoff = 114688, inode = 17171 }
+vm_state.vm_map: 13589.796258997 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078119424, end = 3078148096, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.796261065 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078148096, end = 3078152192, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.796263190 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078152192, end = 3078156288, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.796266146 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078156288, end = 3078172672, flags = 134217845, pgoff = 0, inode = 20149 }
+vm_state.vm_map: 13589.796268381 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078172672, end = 3078176768, flags = 135266419, pgoff = 12288, inode = 20149 }
+vm_state.vm_map: 13589.796270967 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078176768, end = 3078262784, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.796272981 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078262784, end = 3078266880, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.796275179 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078266880, end = 3078270976, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.796277193 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078270976, end = 3078283264, flags = 1048691, pgoff = 3078270976, inode = 0 }
+vm_state.vm_map: 13589.796285530 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078283264, end = 3078508544, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.796287951 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078508544, end = 3078512640, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.796290069 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078512640, end = 3078516736, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.796295249 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078516736, end = 3078631424, flags = 134217845, pgoff = 0, inode = 17291 }
+vm_state.vm_map: 13589.796297527 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078631424, end = 3078635520, flags = 135266419, pgoff = 114688, inode = 17291 }
+vm_state.vm_map: 13589.796299596 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078656000, end = 3078660096, flags = 1048688, pgoff = 3078656000, inode = 0 }
+vm_state.vm_map: 13589.796301880 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078660096, end = 3078737920, flags = 1048691, pgoff = 3078660096, inode = 0 }
+vm_state.vm_map: 13589.796304258 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078737920, end = 3078742016, flags = 67371125, pgoff = 3078737920, inode = 0 }
+vm_state.vm_map: 13589.796306603 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078742016, end = 3078856704, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.796309017 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078856704, end = 3078860800, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.796311000 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078860800, end = 3078864896, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.796313186 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1658, start = 3214229504, end = 3214315520, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.796320483 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 134512640, end = 134647808, flags = 134223989, pgoff = 0, inode = 23928 }
+vm_state.vm_map: 13589.796322866 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 134647808, end = 134651904, flags = 135272563, pgoff = 135168, inode = 23928 }
+vm_state.vm_map: 13589.796325107 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 134651904, end = 134656000, flags = 1048691, pgoff = 134651904, inode = 0 }
+vm_state.vm_map: 13589.796327867 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 140304384, end = 140439552, flags = 1048691, pgoff = 140304384, inode = 0 }
+vm_state.vm_map: 13589.796330348 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3074375680, end = 3074383872, flags = 1048691, pgoff = 3074375680, inode = 0 }
+vm_state.vm_map: 13589.796332879 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3074383872, end = 3074412544, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.796335183 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3074412544, end = 3074416640, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.796337559 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3074416640, end = 3074420736, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.796340139 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3074420736, end = 3074506752, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.796342337 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3074506752, end = 3074510848, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.796344640 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3074510848, end = 3074514944, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.796347086 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3074514944, end = 3074523136, flags = 1048691, pgoff = 3074514944, inode = 0 }
+vm_state.vm_map: 13589.796349856 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3074523136, end = 3074531328, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.796352301 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3074531328, end = 3074535424, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.796354327 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3074535424, end = 3074539520, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.796356612 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3074539520, end = 3074543616, flags = 1048691, pgoff = 3074539520, inode = 0 }
+vm_state.vm_map: 13589.796362233 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3074543616, end = 3074641920, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.796364352 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3074641920, end = 3074646016, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.796367290 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3074646016, end = 3075960832, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.796369482 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3075960832, end = 3075969024, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.796371938 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3075969024, end = 3075973120, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.796374001 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3075973120, end = 3075985408, flags = 1048691, pgoff = 3075973120, inode = 0 }
+vm_state.vm_map: 13589.796376255 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3075985408, end = 3076210688, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.796378355 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3076210688, end = 3076214784, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.796380547 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3076214784, end = 3076218880, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.796383749 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3076218880, end = 3076227072, flags = 134217845, pgoff = 0, inode = 17167 }
+vm_state.vm_map: 13589.796389840 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3076227072, end = 3076231168, flags = 135266419, pgoff = 8192, inode = 17167 }
+vm_state.vm_map: 13589.796392647 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3076231168, end = 3076272128, flags = 134217845, pgoff = 0, inode = 499738 }
+vm_state.vm_map: 13589.796397819 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3076272128, end = 3076276224, flags = 135266419, pgoff = 40960, inode = 499738 }
+vm_state.vm_map: 13589.796400745 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3076276224, end = 3076292608, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.796403011 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3076292608, end = 3076296704, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.796405092 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3076296704, end = 3076300800, flags = 1048691, pgoff = 3076296704, inode = 0 }
+vm_state.vm_map: 13589.796408387 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3076300800, end = 3076308992, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.796410727 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3076308992, end = 3076313088, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.796413572 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3076313088, end = 3077464064, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.796415888 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3077464064, end = 3077480448, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.796418277 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3077570560, end = 3077582848, flags = 1048691, pgoff = 3077570560, inode = 0 }
+vm_state.vm_map: 13589.796420512 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3077582848, end = 3077586944, flags = 67371125, pgoff = 3077582848, inode = 0 }
+vm_state.vm_map: 13589.796423369 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3077586944, end = 3077701632, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.796425604 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3077701632, end = 3077705728, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.796427939 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3077705728, end = 3077709824, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.796429946 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1848, start = 3214938112, end = 3215024128, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.796436140 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 134512640, end = 136171520, flags = 134223989, pgoff = 0, inode = 1352187 }
+vm_state.vm_map: 13589.796438578 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 136171520, end = 136208384, flags = 135272563, pgoff = 1654784, inode = 1352187 }
+vm_state.vm_map: 13589.796440987 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 136208384, end = 136253440, flags = 1048691, pgoff = 136208384, inode = 0 }
+vm_state.vm_map: 13589.796443277 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 141950976, end = 175939584, flags = 1048691, pgoff = 141950976, inode = 0 }
+vm_state.vm_map: 13589.796445748 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2910973952, end = 2939408384, flags = 1048691, pgoff = 2910973952, inode = 0 }
+vm_state.vm_map: 13589.796453487 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2942861312, end = 2952945664, flags = 1048691, pgoff = 2942861312, inode = 0 }
+vm_state.vm_map: 13589.796459016 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2955751424, end = 2957307904, flags = 1048691, pgoff = 2955751424, inode = 0 }
+vm_state.vm_map: 13589.796461333 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2964537344, end = 2973757440, flags = 1048691, pgoff = 2964537344, inode = 0 }
+vm_state.vm_map: 13589.796466646 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2978971648, end = 2981863424, flags = 1048691, pgoff = 2978971648, inode = 0 }
+vm_state.vm_map: 13589.796481931 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2981863424, end = 2982256640, flags = 134217979, pgoff = 0, inode = 983045 }
+vm_state.vm_map: 13589.796492313 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2982256640, end = 2982649856, flags = 134217979, pgoff = 0, inode = 917507 }
+vm_state.vm_map: 13589.796502400 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2982649856, end = 2983043072, flags = 134217979, pgoff = 0, inode = 622594 }
+vm_state.vm_map: 13589.796508150 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2983043072, end = 2983436288, flags = 134217979, pgoff = 0, inode = 262145 }
+vm_state.vm_map: 13589.796511402 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2983436288, end = 2983829504, flags = 134217979, pgoff = 0, inode = 229376 }
+vm_state.vm_map: 13589.796523521 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2983829504, end = 2985967616, flags = 134217845, pgoff = 0, inode = 222350 }
+vm_state.vm_map: 13589.796525904 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2985967616, end = 2986000384, flags = 135266419, pgoff = 2134016, inode = 222350 }
+vm_state.vm_map: 13589.796528189 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2986000384, end = 2987315200, flags = 1048691, pgoff = 2986000384, inode = 0 }
+vm_state.vm_map: 13589.796535726 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2987315200, end = 2987671552, flags = 134217845, pgoff = 0, inode = 18637 }
+vm_state.vm_map: 13589.796537924 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2987671552, end = 2987675648, flags = 135266419, pgoff = 352256, inode = 18637 }
+vm_state.vm_map: 13589.796540203 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2987675648, end = 2987692032, flags = 1048691, pgoff = 2987675648, inode = 0 }
+vm_state.vm_map: 13589.796542432 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2987786240, end = 2989039616, flags = 1048691, pgoff = 2987786240, inode = 0 }
+vm_state.vm_map: 13589.796545468 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2989039616, end = 2989551616, flags = 134217845, pgoff = 0, inode = 18961 }
+vm_state.vm_map: 13589.796547604 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2989551616, end = 2989555712, flags = 135266419, pgoff = 512000, inode = 18961 }
+vm_state.vm_map: 13589.796549859 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2989555712, end = 2989576192, flags = 1048691, pgoff = 2989555712, inode = 0 }
+vm_state.vm_map: 13589.796555610 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2989670400, end = 2995544064, flags = 1048691, pgoff = 2989670400, inode = 0 }
+vm_state.vm_map: 13589.796561466 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2995544064, end = 2995625984, flags = 134217845, pgoff = 0, inode = 18954 }
+vm_state.vm_map: 13589.796563874 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2995625984, end = 2995634176, flags = 135266419, pgoff = 81920, inode = 18954 }
+vm_state.vm_map: 13589.796566484 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2995634176, end = 2997088256, flags = 134217845, pgoff = 0, inode = 19111 }
+vm_state.vm_map: 13589.796568628 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2997088256, end = 2997100544, flags = 135266419, pgoff = 1454080, inode = 19111 }
+vm_state.vm_map: 13589.796570789 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2997100544, end = 2997334016, flags = 1048691, pgoff = 2997100544, inode = 0 }
+vm_state.vm_map: 13589.796573277 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2997616640, end = 2997829632, flags = 1048691, pgoff = 2998902784, inode = 0 }
+vm_state.vm_map: 13589.796575709 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2997829632, end = 2998042624, flags = 1048691, pgoff = 2998902784, inode = 0 }
+vm_state.vm_map: 13589.796577890 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2998042624, end = 2998255616, flags = 1048691, pgoff = 2998902784, inode = 0 }
+vm_state.vm_map: 13589.796580365 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2998255616, end = 2998468608, flags = 1048691, pgoff = 2998902784, inode = 0 }
+vm_state.vm_map: 13589.796582329 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2998468608, end = 2998661120, flags = 1048691, pgoff = 2998968320, inode = 0 }
+vm_state.vm_map: 13589.796590420 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2998661120, end = 2998767616, flags = 134217845, pgoff = 0, inode = 18648 }
+vm_state.vm_map: 13589.796592557 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2998767616, end = 2998771712, flags = 135266419, pgoff = 106496, inode = 18648 }
+vm_state.vm_map: 13589.796594620 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2998771712, end = 2998808576, flags = 1048691, pgoff = 2998771712, inode = 0 }
+vm_state.vm_map: 13589.796597428 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2998861824, end = 2998894592, flags = 134217845, pgoff = 0, inode = 19432 }
+vm_state.vm_map: 13589.796599780 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2998894592, end = 2998898688, flags = 135266419, pgoff = 28672, inode = 19432 }
+vm_state.vm_map: 13589.796602250 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2998898688, end = 2998902784, flags = 1048691, pgoff = 2998898688, inode = 0 }
+vm_state.vm_map: 13589.796605211 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2999103488, end = 2999250944, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.796607194 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2999250944, end = 2999259136, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.796616363 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2999316480, end = 2999349248, flags = 134217845, pgoff = 0, inode = 255747 }
+vm_state.vm_map: 13589.796618789 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2999349248, end = 2999353344, flags = 135266419, pgoff = 32768, inode = 255747 }
+vm_state.vm_map: 13589.796622072 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 2999353344, end = 3003547648, flags = 1074283707, pgoff = 4030726144, inode = 2923 }
+vm_state.vm_map: 13589.796627915 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3003547648, end = 3003555840, flags = 786683, pgoff = 4165873664, inode = 5930 }
+vm_state.vm_map: 13589.796634566 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3003555840, end = 3003621376, flags = 1074283771, pgoff = 655360, inode = 2195 }
+vm_state.vm_map: 13589.796641894 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3003621376, end = 3070730240, flags = 1074283707, pgoff = 3758096384, inode = 2913 }
+vm_state.vm_map: 13589.796647528 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3070730240, end = 3070754816, flags = 134217845, pgoff = 0, inode = 255468 }
+vm_state.vm_map: 13589.796650011 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3070754816, end = 3070758912, flags = 135266419, pgoff = 20480, inode = 255468 }
+vm_state.vm_map: 13589.796652862 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3070758912, end = 3070877696, flags = 134217845, pgoff = 0, inode = 255488 }
+vm_state.vm_map: 13589.796654893 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3070877696, end = 3070881792, flags = 135266419, pgoff = 118784, inode = 255488 }
+vm_state.vm_map: 13589.796657289 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3070881792, end = 3071143936, flags = 1074283771, pgoff = 786432, inode = 2195 }
+vm_state.vm_map: 13589.796659782 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3071143936, end = 3071275008, flags = 1074283771, pgoff = 655360, inode = 2195 }
+vm_state.vm_map: 13589.796662382 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3071275008, end = 3072262144, flags = 1048691, pgoff = 3071275008, inode = 0 }
+vm_state.vm_map: 13589.796667652 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3072262144, end = 3072393216, flags = 134217845, pgoff = 0, inode = 255487 }
+vm_state.vm_map: 13589.796670232 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3072393216, end = 3072401408, flags = 135266419, pgoff = 126976, inode = 255487 }
+vm_state.vm_map: 13589.796675707 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3072401408, end = 3072589824, flags = 134217845, pgoff = 0, inode = 254157 }
+vm_state.vm_map: 13589.796677961 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3072589824, end = 3072606208, flags = 135266419, pgoff = 188416, inode = 254157 }
+vm_state.vm_map: 13589.796680060 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3072606208, end = 3072610304, flags = 1048691, pgoff = 3072606208, inode = 0 }
+vm_state.vm_map: 13589.796682697 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3072610304, end = 3072839680, flags = 134217845, pgoff = 0, inode = 254155 }
+vm_state.vm_map: 13589.796759842 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3072839680, end = 3072856064, flags = 135266419, pgoff = 225280, inode = 254155 }
+vm_state.vm_map: 13589.796763353 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3072856064, end = 3072864256, flags = 1048691, pgoff = 3072856064, inode = 0 }
+vm_state.vm_map: 13589.796771888 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3072864256, end = 3072897024, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 13589.796775102 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3072897024, end = 3072901120, flags = 135266419, pgoff = 32768, inode = 20716 }
+vm_state.vm_map: 13589.796778033 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3072925696, end = 3072946176, flags = 134217845, pgoff = 0, inode = 255466 }
+vm_state.vm_map: 13589.796780292 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3072946176, end = 3072950272, flags = 135266419, pgoff = 16384, inode = 255466 }
+vm_state.vm_map: 13589.796782978 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3072950272, end = 3072978944, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.796786130 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3072978944, end = 3072991232, flags = 134217845, pgoff = 0, inode = 255477 }
+vm_state.vm_map: 13589.796788575 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3072991232, end = 3072995328, flags = 135266419, pgoff = 8192, inode = 255477 }
+vm_state.vm_map: 13589.796791383 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3072995328, end = 3073028096, flags = 134217845, pgoff = 0, inode = 255475 }
+vm_state.vm_map: 13589.796794136 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3073028096, end = 3073032192, flags = 135266419, pgoff = 28672, inode = 255475 }
+vm_state.vm_map: 13589.796796937 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3073032192, end = 3073146880, flags = 134217845, pgoff = 0, inode = 255476 }
+vm_state.vm_map: 13589.796798988 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3073146880, end = 3073155072, flags = 135266419, pgoff = 110592, inode = 255476 }
+vm_state.vm_map: 13589.796804118 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3073155072, end = 3073482752, flags = 134217845, pgoff = 0, inode = 255473 }
+vm_state.vm_map: 13589.796806581 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3073482752, end = 3073495040, flags = 135266419, pgoff = 323584, inode = 255473 }
+vm_state.vm_map: 13589.796809210 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3073495040, end = 3073503232, flags = 1048691, pgoff = 3073495040, inode = 0 }
+vm_state.vm_map: 13589.796812665 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3073503232, end = 3073515520, flags = 134217845, pgoff = 0, inode = 20765 }
+vm_state.vm_map: 13589.796814906 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3073515520, end = 3073519616, flags = 135266419, pgoff = 8192, inode = 20765 }
+vm_state.vm_map: 13589.796820780 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3073519616, end = 3073581056, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 13589.796823232 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3073581056, end = 3073585152, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 13589.796825486 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3073585152, end = 3073589248, flags = 1048691, pgoff = 3073585152, inode = 0 }
+vm_state.vm_map: 13589.796828410 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3073589248, end = 3074060288, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 13589.796830485 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3074060288, end = 3074076672, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 13589.796833417 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3074076672, end = 3074158592, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.796836250 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3074158592, end = 3074162688, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.796838934 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3074162688, end = 3075477504, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.796841157 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3075477504, end = 3075485696, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.796843374 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3075485696, end = 3075489792, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.796845690 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3075489792, end = 3075502080, flags = 1048691, pgoff = 3075489792, inode = 0 }
+vm_state.vm_map: 13589.796849181 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3075502080, end = 3075616768, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.796851330 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3075616768, end = 3075620864, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.796854262 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3075620864, end = 3075649536, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.796856780 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3075649536, end = 3075653632, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.796859200 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3075653632, end = 3075657728, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.796862372 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3075657728, end = 3075805184, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.796864717 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3075805184, end = 3075809280, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.796866953 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3075809280, end = 3075813376, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.796869791 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3075813376, end = 3075817472, flags = 1048691, pgoff = 3075813376, inode = 0 }
+vm_state.vm_map: 13589.796872303 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3075817472, end = 3075915776, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 13589.796874921 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3075915776, end = 3075919872, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 13589.796877741 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3075919872, end = 3075923968, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 13589.796883166 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3075923968, end = 3076018176, flags = 134217845, pgoff = 0, inode = 500176 }
+vm_state.vm_map: 13589.796885414 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3076018176, end = 3076022272, flags = 135266417, pgoff = 90112, inode = 500176 }
+vm_state.vm_map: 13589.796887809 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3076022272, end = 3076026368, flags = 135266419, pgoff = 94208, inode = 500176 }
+vm_state.vm_map: 13589.796890666 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3076026368, end = 3076489216, flags = 134217845, pgoff = 0, inode = 20061 }
+vm_state.vm_map: 13589.796892668 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3076489216, end = 3076501504, flags = 135266419, pgoff = 458752, inode = 20061 }
+vm_state.vm_map: 13589.796895321 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3076501504, end = 3076517888, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.796897416 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3076517888, end = 3076521984, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.796900113 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3076521984, end = 3076608000, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.796902354 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3076608000, end = 3076612096, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.796904577 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3076612096, end = 3076616192, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.796907213 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3076616192, end = 3076628480, flags = 1048691, pgoff = 3076616192, inode = 0 }
+vm_state.vm_map: 13589.796909460 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3076628480, end = 3076853760, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.796911837 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3076853760, end = 3076857856, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.796914275 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3076857856, end = 3076861952, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.796922915 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3076861952, end = 3076923392, flags = 134217845, pgoff = 0, inode = 18962 }
+vm_state.vm_map: 13589.796925002 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3076923392, end = 3076927488, flags = 135266419, pgoff = 57344, inode = 18962 }
+vm_state.vm_map: 13589.796927793 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3076927488, end = 3077304320, flags = 134217845, pgoff = 0, inode = 21319 }
+vm_state.vm_map: 13589.796929806 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3077304320, end = 3077312512, flags = 135266419, pgoff = 376832, inode = 21319 }
+vm_state.vm_map: 13589.796932589 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3077312512, end = 3077332992, flags = 134217845, pgoff = 0, inode = 18616 }
+vm_state.vm_map: 13589.796934670 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3077332992, end = 3077337088, flags = 135266419, pgoff = 20480, inode = 18616 }
+vm_state.vm_map: 13589.796937011 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3077337088, end = 3077345280, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.796939265 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3077345280, end = 3077349376, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.796942405 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3077349376, end = 3077566464, flags = 134217845, pgoff = 0, inode = 22624 }
+vm_state.vm_map: 13589.796944487 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3077566464, end = 3077574656, flags = 135266419, pgoff = 212992, inode = 22624 }
+vm_state.vm_map: 13589.796946802 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3077574656, end = 3077578752, flags = 1048691, pgoff = 3077574656, inode = 0 }
+vm_state.vm_map: 13589.796949290 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3077578752, end = 3077586944, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.796951328 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3077586944, end = 3077591040, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.796953514 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3077591040, end = 3077595136, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.796956975 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3077595136, end = 3077619712, flags = 134217845, pgoff = 0, inode = 1065108 }
+vm_state.vm_map: 13589.796959038 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3077619712, end = 3077623808, flags = 135266419, pgoff = 20480, inode = 1065108 }
+vm_state.vm_map: 13589.796968478 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3077632000, end = 3077644288, flags = 134217979, pgoff = 0, inode = 950276 }
+vm_state.vm_map: 13589.796971187 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3077644288, end = 3077668864, flags = 134217845, pgoff = 0, inode = 255472 }
+vm_state.vm_map: 13589.796973441 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3077668864, end = 3077672960, flags = 135266419, pgoff = 20480, inode = 255472 }
+vm_state.vm_map: 13589.796976433 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3077672960, end = 3077689344, flags = 134217845, pgoff = 0, inode = 255474 }
+vm_state.vm_map: 13589.796978448 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3077689344, end = 3077693440, flags = 135266419, pgoff = 12288, inode = 255474 }
+vm_state.vm_map: 13589.796981194 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3077693440, end = 3077709824, flags = 134217845, pgoff = 0, inode = 255731 }
+vm_state.vm_map: 13589.796983176 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3077709824, end = 3077713920, flags = 135266419, pgoff = 12288, inode = 255731 }
+vm_state.vm_map: 13589.797044909 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3077713920, end = 3077726208, flags = 1048691, pgoff = 3077713920, inode = 0 }
+vm_state.vm_map: 13589.797047889 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3077726208, end = 3077730304, flags = 67371125, pgoff = 3077726208, inode = 0 }
+vm_state.vm_map: 13589.797050692 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3077730304, end = 3077844992, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.797052884 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3077844992, end = 3077849088, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.797055218 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3077849088, end = 3077853184, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.797057804 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1852, start = 3215638528, end = 3215724544, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.797062699 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 134512640, end = 135766016, flags = 134223989, pgoff = 0, inode = 17162 }
+vm_state.vm_map: 13589.797065219 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 135766016, end = 135774208, flags = 135272563, pgoff = 1253376, inode = 17162 }
+vm_state.vm_map: 13589.797067774 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 153870336, end = 155762688, flags = 1048691, pgoff = 153870336, inode = 0 }
+vm_state.vm_map: 13589.797076265 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3077193728, end = 3077292032, flags = 134217845, pgoff = 0, inode = 42087 }
+vm_state.vm_map: 13589.797078321 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3077292032, end = 3077300224, flags = 135266419, pgoff = 94208, inode = 42087 }
+vm_state.vm_map: 13589.797080441 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3077300224, end = 3077304320, flags = 1048691, pgoff = 3077300224, inode = 0 }
+vm_state.vm_map: 13589.797083532 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3077304320, end = 3077341184, flags = 134217845, pgoff = 0, inode = 508755 }
+vm_state.vm_map: 13589.797085613 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3077341184, end = 3077345280, flags = 135266417, pgoff = 32768, inode = 508755 }
+vm_state.vm_map: 13589.797087719 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3077345280, end = 3077349376, flags = 135266419, pgoff = 36864, inode = 508755 }
+vm_state.vm_map: 13589.797089979 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3077349376, end = 3077509120, flags = 1048691, pgoff = 3077349376, inode = 0 }
+vm_state.vm_map: 13589.797092578 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3077509120, end = 3078823936, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.797094739 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3078823936, end = 3078832128, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.797096857 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3078832128, end = 3078836224, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.797099056 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3078836224, end = 3078848512, flags = 1048691, pgoff = 3078836224, inode = 0 }
+vm_state.vm_map: 13589.797101790 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3078848512, end = 3078934528, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.797103803 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3078934528, end = 3078938624, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.797105996 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3078938624, end = 3078942720, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.797108219 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3078942720, end = 3078955008, flags = 1048691, pgoff = 3078942720, inode = 0 }
+vm_state.vm_map: 13589.797110639 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3078955008, end = 3079102464, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.797112652 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3079102464, end = 3079106560, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.797114844 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3079106560, end = 3079110656, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.797117333 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3079110656, end = 3079118848, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.797119414 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3079118848, end = 3079122944, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.797121489 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3079122944, end = 3079127040, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.797124358 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3079143424, end = 3079159808, flags = 134217845, pgoff = 0, inode = 43237 }
+vm_state.vm_map: 13589.797126593 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3079159808, end = 3079163904, flags = 135266419, pgoff = 16384, inode = 43237 }
+vm_state.vm_map: 13589.797134008 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3079163904, end = 3079180288, flags = 134217845, pgoff = 0, inode = 42092 }
+vm_state.vm_map: 13589.797136298 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3079180288, end = 3079184384, flags = 135266419, pgoff = 16384, inode = 42092 }
+vm_state.vm_map: 13589.797140357 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3079184384, end = 3079200768, flags = 134217845, pgoff = 0, inode = 42078 }
+vm_state.vm_map: 13589.797142395 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3079200768, end = 3079204864, flags = 135266419, pgoff = 12288, inode = 42078 }
+vm_state.vm_map: 13589.797150099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3079204864, end = 3079217152, flags = 134217845, pgoff = 0, inode = 42090 }
+vm_state.vm_map: 13589.797152260 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3079217152, end = 3079221248, flags = 135266419, pgoff = 8192, inode = 42090 }
+vm_state.vm_map: 13589.797154329 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3079221248, end = 3079229440, flags = 1048691, pgoff = 3079221248, inode = 0 }
+vm_state.vm_map: 13589.797156552 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3079229440, end = 3079233536, flags = 67371125, pgoff = 3079229440, inode = 0 }
+vm_state.vm_map: 13589.797158793 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3079233536, end = 3079348224, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.797160893 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3079348224, end = 3079352320, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.797163012 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3079352320, end = 3079356416, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.797165074 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1883, start = 3213361152, end = 3213447168, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.797176263 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1906, start = 134512640, end = 134529024, flags = 134223989, pgoff = 0, inode = 410997 }
+vm_state.vm_map: 13589.797178320 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1906, start = 134529024, end = 134533120, flags = 135272563, pgoff = 16384, inode = 410997 }
+vm_state.vm_map: 13589.797181282 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1906, start = 134533120, end = 134541312, flags = 1048691, pgoff = 134533120, inode = 0 }
+vm_state.vm_map: 13589.797183431 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1906, start = 146681856, end = 146817024, flags = 1048691, pgoff = 146681856, inode = 0 }
+vm_state.vm_map: 13589.797185919 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1906, start = 3076997120, end = 3077005312, flags = 1048691, pgoff = 3076997120, inode = 0 }
+vm_state.vm_map: 13589.797189201 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1906, start = 3077005312, end = 3078320128, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.797191800 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1906, start = 3078320128, end = 3078328320, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.797193875 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1906, start = 3078328320, end = 3078332416, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.797196376 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1906, start = 3078332416, end = 3078344704, flags = 1048691, pgoff = 3078332416, inode = 0 }
+vm_state.vm_map: 13589.797202262 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1906, start = 3078344704, end = 3078352896, flags = 134217845, pgoff = 0, inode = 508751 }
+vm_state.vm_map: 13589.797204756 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1906, start = 3078352896, end = 3078356992, flags = 135266417, pgoff = 4096, inode = 508751 }
+vm_state.vm_map: 13589.797207225 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1906, start = 3078356992, end = 3078361088, flags = 135266419, pgoff = 8192, inode = 508751 }
+vm_state.vm_map: 13589.797209817 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1906, start = 3078447104, end = 3078451200, flags = 1048691, pgoff = 3078447104, inode = 0 }
+vm_state.vm_map: 13589.797215797 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1906, start = 3078455296, end = 3078463488, flags = 1048691, pgoff = 3078455296, inode = 0 }
+vm_state.vm_map: 13589.797218149 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1906, start = 3078463488, end = 3078467584, flags = 67371125, pgoff = 3078463488, inode = 0 }
+vm_state.vm_map: 13589.797220453 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1906, start = 3078467584, end = 3078582272, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.797222909 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1906, start = 3078582272, end = 3078586368, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.797225366 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1906, start = 3078586368, end = 3078590464, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.797227583 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1906, start = 3215757312, end = 3215843328, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.797230859 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1907, start = 134512640, end = 134529024, flags = 134223989, pgoff = 0, inode = 410997 }
+vm_state.vm_map: 13589.797233495 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1907, start = 134529024, end = 134533120, flags = 135272563, pgoff = 16384, inode = 410997 }
+vm_state.vm_map: 13589.797235644 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1907, start = 134533120, end = 134541312, flags = 1048691, pgoff = 134533120, inode = 0 }
+vm_state.vm_map: 13589.797238020 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1907, start = 166658048, end = 166793216, flags = 1048691, pgoff = 166658048, inode = 0 }
+vm_state.vm_map: 13589.797240089 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1907, start = 3076587520, end = 3076595712, flags = 1048691, pgoff = 3076587520, inode = 0 }
+vm_state.vm_map: 13589.797242449 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1907, start = 3076595712, end = 3077910528, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.797244499 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1907, start = 3077910528, end = 3077918720, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.797247300 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1907, start = 3077918720, end = 3077922816, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.797249709 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1907, start = 3077922816, end = 3077935104, flags = 1048691, pgoff = 3077922816, inode = 0 }
+vm_state.vm_map: 13589.797252332 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1907, start = 3077935104, end = 3077943296, flags = 134217845, pgoff = 0, inode = 508751 }
+vm_state.vm_map: 13589.797254407 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1907, start = 3077943296, end = 3077947392, flags = 135266417, pgoff = 4096, inode = 508751 }
+vm_state.vm_map: 13589.797256476 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1907, start = 3077947392, end = 3077951488, flags = 135266419, pgoff = 8192, inode = 508751 }
+vm_state.vm_map: 13589.797258638 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1907, start = 3078037504, end = 3078041600, flags = 1048691, pgoff = 3078037504, inode = 0 }
+vm_state.vm_map: 13589.797261366 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1907, start = 3078045696, end = 3078053888, flags = 1048691, pgoff = 3078045696, inode = 0 }
+vm_state.vm_map: 13589.797263416 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1907, start = 3078053888, end = 3078057984, flags = 67371125, pgoff = 3078053888, inode = 0 }
+vm_state.vm_map: 13589.797266107 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1907, start = 3078057984, end = 3078172672, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.797268687 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1907, start = 3078172672, end = 3078176768, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.797270701 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1907, start = 3078176768, end = 3078180864, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.797272856 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1907, start = 3212795904, end = 3212881920, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.797275707 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1908, start = 134512640, end = 134529024, flags = 134223989, pgoff = 0, inode = 410997 }
+vm_state.vm_map: 13589.797277677 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1908, start = 134529024, end = 134533120, flags = 135272563, pgoff = 16384, inode = 410997 }
+vm_state.vm_map: 13589.797279869 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1908, start = 134533120, end = 134541312, flags = 1048691, pgoff = 134533120, inode = 0 }
+vm_state.vm_map: 13589.797282092 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1908, start = 136421376, end = 136556544, flags = 1048691, pgoff = 136421376, inode = 0 }
+vm_state.vm_map: 13589.797284150 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1908, start = 3077201920, end = 3077210112, flags = 1048691, pgoff = 3077201920, inode = 0 }
+vm_state.vm_map: 13589.797286428 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1908, start = 3077210112, end = 3078524928, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.797288848 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1908, start = 3078524928, end = 3078533120, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.797290917 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1908, start = 3078533120, end = 3078537216, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.797292992 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1908, start = 3078537216, end = 3078549504, flags = 1048691, pgoff = 3078537216, inode = 0 }
+vm_state.vm_map: 13589.797295400 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1908, start = 3078549504, end = 3078557696, flags = 134217845, pgoff = 0, inode = 508751 }
+vm_state.vm_map: 13589.797297875 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1908, start = 3078557696, end = 3078561792, flags = 135266417, pgoff = 4096, inode = 508751 }
+vm_state.vm_map: 13589.797300123 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1908, start = 3078561792, end = 3078565888, flags = 135266419, pgoff = 8192, inode = 508751 }
+vm_state.vm_map: 13589.797302598 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1908, start = 3078651904, end = 3078656000, flags = 1048691, pgoff = 3078651904, inode = 0 }
+vm_state.vm_map: 13589.797304581 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1908, start = 3078660096, end = 3078668288, flags = 1048691, pgoff = 3078660096, inode = 0 }
+vm_state.vm_map: 13589.797307026 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1908, start = 3078668288, end = 3078672384, flags = 67371125, pgoff = 3078668288, inode = 0 }
+vm_state.vm_map: 13589.797309366 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1908, start = 3078672384, end = 3078787072, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.797311773 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1908, start = 3078787072, end = 3078791168, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.797313781 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1908, start = 3078791168, end = 3078795264, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.797315986 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1908, start = 3215097856, end = 3215183872, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.797319231 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1909, start = 134512640, end = 134529024, flags = 134223989, pgoff = 0, inode = 410997 }
+vm_state.vm_map: 13589.797321658 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1909, start = 134529024, end = 134533120, flags = 135272563, pgoff = 16384, inode = 410997 }
+vm_state.vm_map: 13589.797324127 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1909, start = 134533120, end = 134541312, flags = 1048691, pgoff = 134533120, inode = 0 }
+vm_state.vm_map: 13589.797326368 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1909, start = 142258176, end = 142393344, flags = 1048691, pgoff = 142258176, inode = 0 }
+vm_state.vm_map: 13589.797328751 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1909, start = 3076583424, end = 3076591616, flags = 1048691, pgoff = 3076583424, inode = 0 }
+vm_state.vm_map: 13589.797331412 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1909, start = 3076591616, end = 3077906432, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.797333949 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1909, start = 3077906432, end = 3077914624, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.797336301 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1909, start = 3077914624, end = 3077918720, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.797338628 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1909, start = 3077918720, end = 3077931008, flags = 1048691, pgoff = 3077918720, inode = 0 }
+vm_state.vm_map: 13589.797340906 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1909, start = 3077931008, end = 3077939200, flags = 134217845, pgoff = 0, inode = 508751 }
+vm_state.vm_map: 13589.797342859 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1909, start = 3077939200, end = 3077943296, flags = 135266417, pgoff = 4096, inode = 508751 }
+vm_state.vm_map: 13589.797344885 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1909, start = 3077943296, end = 3077947392, flags = 135266419, pgoff = 8192, inode = 508751 }
+vm_state.vm_map: 13589.797346892 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1909, start = 3078033408, end = 3078037504, flags = 1048691, pgoff = 3078033408, inode = 0 }
+vm_state.vm_map: 13589.797349244 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1909, start = 3078041600, end = 3078049792, flags = 1048691, pgoff = 3078041600, inode = 0 }
+vm_state.vm_map: 13589.797351579 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1909, start = 3078049792, end = 3078053888, flags = 67371125, pgoff = 3078049792, inode = 0 }
+vm_state.vm_map: 13589.797354239 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1909, start = 3078053888, end = 3078168576, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.797356542 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1909, start = 3078168576, end = 3078172672, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.797358980 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1909, start = 3078172672, end = 3078176768, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.797360945 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1909, start = 3219058688, end = 3219144704, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.797364018 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1910, start = 134512640, end = 134529024, flags = 134223989, pgoff = 0, inode = 410997 }
+vm_state.vm_map: 13589.797366216 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1910, start = 134529024, end = 134533120, flags = 135272563, pgoff = 16384, inode = 410997 }
+vm_state.vm_map: 13589.797368186 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1910, start = 134533120, end = 134541312, flags = 1048691, pgoff = 134533120, inode = 0 }
+vm_state.vm_map: 13589.797370687 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1910, start = 153333760, end = 153468928, flags = 1048691, pgoff = 153333760, inode = 0 }
+vm_state.vm_map: 13589.797373310 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1910, start = 3076710400, end = 3076718592, flags = 1048691, pgoff = 3076710400, inode = 0 }
+vm_state.vm_map: 13589.797375933 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1910, start = 3076718592, end = 3078033408, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.797378223 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1910, start = 3078033408, end = 3078041600, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.797380409 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1910, start = 3078041600, end = 3078045696, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.797382535 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1910, start = 3078045696, end = 3078057984, flags = 1048691, pgoff = 3078045696, inode = 0 }
+vm_state.vm_map: 13589.797385238 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1910, start = 3078057984, end = 3078066176, flags = 134217845, pgoff = 0, inode = 508751 }
+vm_state.vm_map: 13589.797387559 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1910, start = 3078066176, end = 3078070272, flags = 135266417, pgoff = 4096, inode = 508751 }
+vm_state.vm_map: 13589.797389517 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1910, start = 3078070272, end = 3078074368, flags = 135266419, pgoff = 8192, inode = 508751 }
+vm_state.vm_map: 13589.797391698 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1910, start = 3078160384, end = 3078164480, flags = 1048691, pgoff = 3078160384, inode = 0 }
+vm_state.vm_map: 13589.797393693 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1910, start = 3078168576, end = 3078176768, flags = 1048691, pgoff = 3078168576, inode = 0 }
+vm_state.vm_map: 13589.797395835 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1910, start = 3078176768, end = 3078180864, flags = 67371125, pgoff = 3078176768, inode = 0 }
+vm_state.vm_map: 13589.797398169 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1910, start = 3078180864, end = 3078295552, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.797400146 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1910, start = 3078295552, end = 3078299648, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.797402417 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1910, start = 3078299648, end = 3078303744, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.797404610 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1910, start = 3217420288, end = 3217506304, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.797410713 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1911, start = 134512640, end = 134529024, flags = 134223989, pgoff = 0, inode = 410997 }
+vm_state.vm_map: 13589.797413035 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1911, start = 134529024, end = 134533120, flags = 135272563, pgoff = 16384, inode = 410997 }
+vm_state.vm_map: 13589.797415608 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1911, start = 134533120, end = 134541312, flags = 1048691, pgoff = 134533120, inode = 0 }
+vm_state.vm_map: 13589.797417862 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1911, start = 134971392, end = 135106560, flags = 1048691, pgoff = 134971392, inode = 0 }
+vm_state.vm_map: 13589.797419875 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1911, start = 3077324800, end = 3077332992, flags = 1048691, pgoff = 3077324800, inode = 0 }
+vm_state.vm_map: 13589.797422376 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1911, start = 3077332992, end = 3078647808, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.797424340 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1911, start = 3078647808, end = 3078656000, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.797426428 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1911, start = 3078656000, end = 3078660096, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.797428552 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1911, start = 3078660096, end = 3078672384, flags = 1048691, pgoff = 3078660096, inode = 0 }
+vm_state.vm_map: 13589.797431021 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1911, start = 3078672384, end = 3078680576, flags = 134217845, pgoff = 0, inode = 508751 }
+vm_state.vm_map: 13589.797433152 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1911, start = 3078680576, end = 3078684672, flags = 135266417, pgoff = 4096, inode = 508751 }
+vm_state.vm_map: 13589.797435215 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1911, start = 3078684672, end = 3078688768, flags = 135266419, pgoff = 8192, inode = 508751 }
+vm_state.vm_map: 13589.797437623 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1911, start = 3078774784, end = 3078778880, flags = 1048691, pgoff = 3078774784, inode = 0 }
+vm_state.vm_map: 13589.797439691 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1911, start = 3078782976, end = 3078791168, flags = 1048691, pgoff = 3078782976, inode = 0 }
+vm_state.vm_map: 13589.797441743 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1911, start = 3078791168, end = 3078795264, flags = 67371125, pgoff = 3078791168, inode = 0 }
+vm_state.vm_map: 13589.797444483 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1911, start = 3078795264, end = 3078909952, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.797446810 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1911, start = 3078909952, end = 3078914048, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.797449556 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1911, start = 3078914048, end = 3078918144, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.797451545 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1911, start = 3220238336, end = 3220324352, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.797458565 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 134512640, end = 134647808, flags = 134223989, pgoff = 0, inode = 23928 }
+vm_state.vm_map: 13589.797460794 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 134647808, end = 134651904, flags = 135272563, pgoff = 135168, inode = 23928 }
+vm_state.vm_map: 13589.797463061 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 134651904, end = 134656000, flags = 1048691, pgoff = 134651904, inode = 0 }
+vm_state.vm_map: 13589.797465370 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 140304384, end = 140500992, flags = 1048691, pgoff = 140304384, inode = 0 }
+vm_state.vm_map: 13589.797471005 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3073531904, end = 3073630208, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 13589.797473413 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3073630208, end = 3073634304, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 13589.797475592 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3073634304, end = 3073638400, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 13589.797478265 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3073638400, end = 3073675264, flags = 134217845, pgoff = 0, inode = 508755 }
+vm_state.vm_map: 13589.797480389 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3073675264, end = 3073679360, flags = 135266417, pgoff = 32768, inode = 508755 }
+vm_state.vm_map: 13589.797486184 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3073679360, end = 3073683456, flags = 135266419, pgoff = 36864, inode = 508755 }
+vm_state.vm_map: 13589.797488616 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3073683456, end = 3073843200, flags = 1048691, pgoff = 3073683456, inode = 0 }
+vm_state.vm_map: 13589.797494447 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3073925120, end = 3073933312, flags = 134217845, pgoff = 0, inode = 499908 }
+vm_state.vm_map: 13589.797496714 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3073933312, end = 3073937408, flags = 135266419, pgoff = 4096, inode = 499908 }
+vm_state.vm_map: 13589.797499780 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3073937408, end = 3073986560, flags = 134217845, pgoff = 0, inode = 500088 }
+vm_state.vm_map: 13589.797501948 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3073986560, end = 3073990656, flags = 135266419, pgoff = 45056, inode = 500088 }
+vm_state.vm_map: 13589.797504115 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3073990656, end = 3074039808, flags = 1048691, pgoff = 3073990656, inode = 0 }
+vm_state.vm_map: 13589.797509861 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074039808, end = 3074080768, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.797511843 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074080768, end = 3074084864, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.797513993 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074084864, end = 3074088960, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.797516579 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074088960, end = 3074125824, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.797518568 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074125824, end = 3074129920, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.797521031 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074129920, end = 3074134016, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.797523814 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074134016, end = 3074211840, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.797525859 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074211840, end = 3074215936, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.797528211 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074215936, end = 3074220032, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.797530200 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074220032, end = 3074228224, flags = 1048691, pgoff = 3074220032, inode = 0 }
+vm_state.vm_map: 13589.797532817 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074228224, end = 3074252800, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.797534788 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074252800, end = 3074256896, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.797536740 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074256896, end = 3074260992, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.797539591 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074260992, end = 3074277376, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 13589.797541845 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074277376, end = 3074281472, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 13589.797547399 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074281472, end = 3074318336, flags = 134217845, pgoff = 0, inode = 499730 }
+vm_state.vm_map: 13589.797549807 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074318336, end = 3074322432, flags = 135266419, pgoff = 32768, inode = 499730 }
+vm_state.vm_map: 13589.797552615 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074322432, end = 3074338816, flags = 134217845, pgoff = 0, inode = 500096 }
+vm_state.vm_map: 13589.797554598 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074338816, end = 3074342912, flags = 135266419, pgoff = 12288, inode = 500096 }
+vm_state.vm_map: 13589.797557363 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074342912, end = 3074347008, flags = 134217845, pgoff = 0, inode = 500082 }
+vm_state.vm_map: 13589.797559339 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074347008, end = 3074351104, flags = 135266419, pgoff = 0, inode = 500082 }
+vm_state.vm_map: 13589.797559374 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074351104, end = 3074355200, flags = 134217845, pgoff = 0, inode = 499797 }
+kernel.irq_entry: 13589.797622154 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { ip = 3242331332, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.sched_try_wakeup: 13589.797656995 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { pid = 2822, cpu_id = 0, state = 1 }
+kernel.irq_exit: 13589.797673707 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.sched_schedule: 13589.797690660 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { prev_pid = 16887, next_pid = 2822, prev_state = 0 }
+kernel.syscall_exit: 13589.797914007 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = -110 }
+kernel.syscall_entry: 13589.797937875 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 240 [syscall 240] }
+kernel.syscall_exit: 13589.797941347 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.797946508 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb690fe4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.797951583 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.797964551 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 13589.797967445 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.797971540 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb690fe4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.797973751 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.797976669 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb690fe4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.797978868 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.797982403 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 13589.797984613 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.797992600 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.797994860 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.797997834 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 240 [syscall 240] }
+kernel.sched_schedule: 13589.798014732 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { prev_pid = 2822, next_pid = 1852, prev_state = 1 }
+kernel.irq_entry: 13589.799079437 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { ip = 3238156110, handler = 0xc14a4a8c, irq_id = 1, kernel_mode = 1 }
+input.input_event: 13589.799693753 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/input_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { type = 4, code = 3, value = 156 }
+input.input_event: 13589.799707745 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/input_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { type = 4, code = 4, value = 28 }
+kernel.softirq_raise: 13589.799718909 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { softirq_id = 6 [softirq 6] }
+kernel.sched_try_wakeup: 13589.799733219 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { pid = 5, cpu_id = 0, state = 1 }
+kernel.send_signal: 13589.799762143 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { pid = 1852, signal = 29 }
+kernel.sched_try_wakeup: 13589.799792434 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { pid = 24682, cpu_id = 0, state = 1 }
+input.input_event: 13589.799800384 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/input_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { type = 1, code = 28, value = 0 }
+kernel.send_signal: 13589.799826765 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { pid = 1852, signal = 29 }
+input.input_event: 13589.799837369 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/input_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { type = 0, code = 0, value = 0 }
+kernel.send_signal: 13589.799845650 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { pid = 1852, signal = 29 }
+kernel.irq_exit: 13589.799855731 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { handled = 1 }
+kernel.softirq_entry: 13589.799864518 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { softirq_id = 6 [softirq 6] }
+kernel.tasklet_low_entry: 13589.799869439 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { func = 0xc148ac75, data = 0 }
+kernel.tasklet_low_exit: 13589.799871538 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { func = 0xc148ac75, data = 0 }
+kernel.softirq_exit: 13589.799873201 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { softirq_id = 6 [softirq 6] }
+kernel.sched_schedule: 13589.799882906 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 5, 5, events/0, , 2, 0x0, MODE_UNKNOWN { prev_pid = 1852, next_pid = 5, prev_state = 0 }
+kernel.sched_schedule: 13589.800011039 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 24682, 24682, hald-addon-inpu, , 24617, 0x0, MODE_UNKNOWN { prev_pid = 5, next_pid = 24682, prev_state = 1 }
+fs.pollfd: 13589.800084078 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 24682, 24682, hald-addon-inpu, , 24617, 0x0, MODE_UNKNOWN { fd = 3 }
+fs.pollfd: 13589.800092952 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 24682, 24682, hald-addon-inpu, , 24617, 0x0, MODE_UNKNOWN { fd = 5 }
+fs.pollfd: 13589.800117724 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 24682, 24682, hald-addon-inpu, , 24617, 0x0, MODE_UNKNOWN { fd = 6 }
+fs.pollfd: 13589.800123204 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 24682, 24682, hald-addon-inpu, , 24617, 0x0, MODE_UNKNOWN { fd = 4 }
+kernel.syscall_exit: 13589.800134819 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 24682, 24682, hald-addon-inpu, , 24617, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 13589.800241953 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 24682, 24682, hald-addon-inpu, , 24617, 0x0, SYSCALL { ip = 0xb7852416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.800257219 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 24682, 24682, hald-addon-inpu, , 24617, 0x0, SYSCALL { count = 1024, fd = 4 }
+kernel.syscall_exit: 13589.800258525 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 24682, 24682, hald-addon-inpu, , 24617, 0x0, MODE_UNKNOWN { ret = 48 }
+kernel.syscall_entry: 13589.800271788 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 24682, 24682, hald-addon-inpu, , 24617, 0x0, SYSCALL { ip = 0xb7852416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.800273543 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 24682, 24682, hald-addon-inpu, , 24617, 0x0, SYSCALL { count = 1024, fd = 4 }
+kernel.syscall_exit: 13589.800274707 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 24682, 24682, hald-addon-inpu, , 24617, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.800314660 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 24682, 24682, hald-addon-inpu, , 24617, 0x0, SYSCALL { ip = 0xb7852416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 13589.800316858 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 24682, 24682, hald-addon-inpu, , 24617, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 13589.800319143 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 24682, 24682, hald-addon-inpu, , 24617, 0x0, SYSCALL { fd = 5 }
+fs.pollfd: 13589.800320602 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 24682, 24682, hald-addon-inpu, , 24617, 0x0, SYSCALL { fd = 6 }
+fs.pollfd: 13589.800321981 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 24682, 24682, hald-addon-inpu, , 24617, 0x0, SYSCALL { fd = 4 }
+kernel.sched_schedule: 13589.800329285 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { prev_pid = 24682, next_pid = 16887, prev_state = 1 }
+vm_state.vm_map: 13589.800393290 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074355200, end = 3074359296, flags = 135266419, pgoff = 0, inode = 499797 }
+vm_state.vm_map: 13589.800396331 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074359296, end = 3074371584, flags = 134217845, pgoff = 0, inode = 500089 }
+vm_state.vm_map: 13589.800398500 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074371584, end = 3074375680, flags = 135266419, pgoff = 8192, inode = 500089 }
+vm_state.vm_map: 13589.800400562 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074375680, end = 3074383872, flags = 1048691, pgoff = 3074375680, inode = 0 }
+vm_state.vm_map: 13589.800403148 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074383872, end = 3074412544, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.800405537 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074412544, end = 3074416640, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.800407662 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074416640, end = 3074420736, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.800410390 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074420736, end = 3074506752, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.800412804 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074506752, end = 3074510848, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.800414836 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074510848, end = 3074514944, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.800417003 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074514944, end = 3074523136, flags = 1048691, pgoff = 3074514944, inode = 0 }
+vm_state.vm_map: 13589.800419541 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074523136, end = 3074531328, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.800421727 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074531328, end = 3074535424, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.800423808 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074535424, end = 3074539520, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.800425995 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074539520, end = 3074543616, flags = 1048691, pgoff = 3074539520, inode = 0 }
+vm_state.vm_map: 13589.800428396 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074543616, end = 3074641920, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.800430441 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074641920, end = 3074646016, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.800432676 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3074646016, end = 3075960832, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.800434868 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3075960832, end = 3075969024, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.800436907 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3075969024, end = 3075973120, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.800438945 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3075973120, end = 3075985408, flags = 1048691, pgoff = 3075973120, inode = 0 }
+vm_state.vm_map: 13589.800441365 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3075985408, end = 3076210688, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.800443464 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3076210688, end = 3076214784, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.800445453 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3076214784, end = 3076218880, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.800448058 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3076218880, end = 3076227072, flags = 134217845, pgoff = 0, inode = 17167 }
+vm_state.vm_map: 13589.800450121 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3076227072, end = 3076231168, flags = 135266419, pgoff = 8192, inode = 17167 }
+vm_state.vm_map: 13589.800452701 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3076231168, end = 3076272128, flags = 134217845, pgoff = 0, inode = 499738 }
+vm_state.vm_map: 13589.800454739 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3076272128, end = 3076276224, flags = 135266419, pgoff = 40960, inode = 499738 }
+vm_state.vm_map: 13589.800457185 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3076276224, end = 3076292608, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.800459136 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3076292608, end = 3076296704, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.800461310 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3076296704, end = 3076300800, flags = 1048691, pgoff = 3076296704, inode = 0 }
+vm_state.vm_map: 13589.800463422 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3076300800, end = 3076308992, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.800465386 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3076308992, end = 3076313088, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.800467954 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3076313088, end = 3077464064, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.800469980 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3077464064, end = 3077480448, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.800478885 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3077484544, end = 3077488640, flags = 134217845, pgoff = 0, inode = 500093 }
+vm_state.vm_map: 13589.800480948 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3077488640, end = 3077492736, flags = 135266419, pgoff = 0, inode = 500093 }
+vm_state.vm_map: 13589.800487087 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3077496832, end = 3077529600, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 13589.800489273 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3077529600, end = 3077533696, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 13589.800494396 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3077533696, end = 3077566464, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 13589.800496454 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3077566464, end = 3077570560, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 13589.800498498 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3077570560, end = 3077582848, flags = 1048691, pgoff = 3077570560, inode = 0 }
+vm_state.vm_map: 13589.800500604 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3077582848, end = 3077586944, flags = 67371125, pgoff = 3077582848, inode = 0 }
+vm_state.vm_map: 13589.800503571 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3077586944, end = 3077701632, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.800505745 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3077701632, end = 3077705728, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.800507944 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3077705728, end = 3077709824, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.800509970 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1913, start = 3214938112, end = 3215024128, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.800519144 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 134512640, end = 134533120, flags = 134223989, pgoff = 0, inode = 20943 }
+vm_state.vm_map: 13589.800521196 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 134533120, end = 134537216, flags = 135272563, pgoff = 16384, inode = 20943 }
+vm_state.vm_map: 13589.800523394 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 143081472, end = 143216640, flags = 1048691, pgoff = 143081472, inode = 0 }
+vm_state.vm_map: 13589.800528554 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3075207168, end = 3075248128, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.800530605 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3075248128, end = 3075252224, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.800532748 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3075252224, end = 3075256320, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.800535130 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3075256320, end = 3075293184, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.800537088 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3075293184, end = 3075297280, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.800539490 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3075297280, end = 3075301376, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.800541695 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3075301376, end = 3075379200, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.800543856 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3075379200, end = 3075383296, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.800546142 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3075383296, end = 3075387392, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.800548143 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3075387392, end = 3075395584, flags = 1048691, pgoff = 3075387392, inode = 0 }
+vm_state.vm_map: 13589.800550723 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3075395584, end = 3075420160, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.800552681 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3075420160, end = 3075424256, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.800554971 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3075424256, end = 3075428352, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.800557015 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3075428352, end = 3075436544, flags = 1048691, pgoff = 3075428352, inode = 0 }
+vm_state.vm_map: 13589.800559196 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3075436544, end = 3075452928, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.800561671 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3075452928, end = 3075457024, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.800563746 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3075457024, end = 3075465216, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.800565698 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3075465216, end = 3075469312, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.800567885 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3075469312, end = 3075477504, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.800569855 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3075477504, end = 3075481600, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.800571850 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3075481600, end = 3075485696, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.800574067 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3075485696, end = 3075584000, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.800576099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3075584000, end = 3075588096, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.800578156 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3075588096, end = 3076902912, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.800580341 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3076902912, end = 3076911104, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.800582282 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3076911104, end = 3076915200, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.800584234 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3076915200, end = 3076931584, flags = 1048691, pgoff = 3076915200, inode = 0 }
+vm_state.vm_map: 13589.800586327 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3076931584, end = 3077017600, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.800588397 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3077017600, end = 3077021696, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.800590324 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3077021696, end = 3077025792, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.800592258 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3077025792, end = 3077033984, flags = 1048691, pgoff = 3077025792, inode = 0 }
+vm_state.vm_map: 13589.800594770 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3077033984, end = 3078184960, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.800596703 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3078184960, end = 3078201344, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.800598644 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3078295552, end = 3078303744, flags = 1048691, pgoff = 3078295552, inode = 0 }
+vm_state.vm_map: 13589.800600675 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3078303744, end = 3078307840, flags = 67371125, pgoff = 3078303744, inode = 0 }
+vm_state.vm_map: 13589.800602732 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3078307840, end = 3078422528, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.800604659 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3078422528, end = 3078426624, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.800606697 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3078426624, end = 3078430720, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.800608631 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1921, start = 3218632704, end = 3218718720, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.800614155 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3076313088, end = 3076354048, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.800616396 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3076354048, end = 3076358144, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.800618434 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3076358144, end = 3076362240, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.800620516 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3076362240, end = 3076399104, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.800622597 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3076399104, end = 3076403200, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.800624537 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3076403200, end = 3076407296, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.800626772 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3076407296, end = 3076485120, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.800629094 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3076485120, end = 3076489216, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.800631279 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3076489216, end = 3076493312, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.800633226 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3076493312, end = 3076501504, flags = 1048691, pgoff = 3076493312, inode = 0 }
+vm_state.vm_map: 13589.800635270 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3076501504, end = 3076526080, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.800637302 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3076526080, end = 3076530176, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.800639235 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3076530176, end = 3076534272, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.800641170 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3076534272, end = 3076542464, flags = 1048691, pgoff = 3076534272, inode = 0 }
+vm_state.vm_map: 13589.800643251 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3076542464, end = 3076550656, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.800645191 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3076550656, end = 3076554752, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.800647210 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3076554752, end = 3076558848, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.800649304 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3076558848, end = 3077873664, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.800651423 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3077873664, end = 3077881856, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.800653356 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3077881856, end = 3077885952, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.800658523 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3077885952, end = 3077898240, flags = 1048691, pgoff = 3077885952, inode = 0 }
+vm_state.vm_map: 13589.800660708 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3077898240, end = 3077926912, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.800663258 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3077926912, end = 3077931008, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.800665198 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3077931008, end = 3077935104, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.800667340 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3077935104, end = 3078021120, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.800669421 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3078021120, end = 3078025216, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.800671356 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3078025216, end = 3078029312, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.800673345 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3078029312, end = 3078041600, flags = 1048691, pgoff = 3078029312, inode = 0 }
+vm_state.vm_map: 13589.800675666 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3078041600, end = 3078139904, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 13589.800677593 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3078139904, end = 3078144000, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 13589.800679521 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3078144000, end = 3078148096, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 13589.800681941 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3078148096, end = 3078295552, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.800684059 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3078295552, end = 3078303744, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.800685999 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3078397952, end = 3078406144, flags = 1048691, pgoff = 3078397952, inode = 0 }
+vm_state.vm_map: 13589.800687932 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3078406144, end = 3078410240, flags = 67371125, pgoff = 3078406144, inode = 0 }
+vm_state.vm_map: 13589.800690107 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3078410240, end = 3078524928, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.800692040 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3078524928, end = 3078529024, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.800693974 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3078529024, end = 3078533120, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.800696892 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3078533120, end = 3078823936, flags = 134223989, pgoff = 0, inode = 20940 }
+vm_state.vm_map: 13589.800698832 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3078823936, end = 3078828032, flags = 135272561, pgoff = 286720, inode = 20940 }
+vm_state.vm_map: 13589.800700827 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3078828032, end = 3078832128, flags = 135272563, pgoff = 290816, inode = 20940 }
+vm_state.vm_map: 13589.800703026 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3085512704, end = 3085647872, flags = 1048691, pgoff = 3085512704, inode = 0 }
+vm_state.vm_map: 13589.800704953 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1922, start = 3216969728, end = 3217055744, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.800708001 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 134512640, end = 134545408, flags = 134223989, pgoff = 0, inode = 18385 }
+vm_state.vm_map: 13589.800710046 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 134545408, end = 134549504, flags = 135272563, pgoff = 28672, inode = 18385 }
+vm_state.vm_map: 13589.800712090 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 134549504, end = 134553600, flags = 1048691, pgoff = 134549504, inode = 0 }
+vm_state.vm_map: 13589.800714171 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 149598208, end = 149733376, flags = 1048691, pgoff = 149598208, inode = 0 }
+vm_state.vm_map: 13589.800716437 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3074297856, end = 3074383872, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.800718371 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3074383872, end = 3074387968, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.800720471 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3074387968, end = 3074392064, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.800722404 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3074392064, end = 3074400256, flags = 1048691, pgoff = 3074392064, inode = 0 }
+vm_state.vm_map: 13589.800724474 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3074400256, end = 3074625536, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.800726536 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3074625536, end = 3074629632, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.800728531 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3074629632, end = 3074633728, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.800730983 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3074633728, end = 3074637824, flags = 1048691, pgoff = 3074633728, inode = 0 }
+vm_state.vm_map: 13589.800733575 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3074637824, end = 3074666496, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.800735669 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3074666496, end = 3074703360, flags = 134217845, pgoff = 0, inode = 499730 }
+vm_state.vm_map: 13589.800737596 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3074703360, end = 3074707456, flags = 135266419, pgoff = 32768, inode = 499730 }
+vm_state.vm_map: 13589.800739689 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3074707456, end = 3074723840, flags = 134217845, pgoff = 0, inode = 500096 }
+vm_state.vm_map: 13589.800741624 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3074723840, end = 3074727936, flags = 135266419, pgoff = 12288, inode = 500096 }
+vm_state.vm_map: 13589.800746654 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3074727936, end = 3074764800, flags = 134217845, pgoff = 0, inode = 508755 }
+vm_state.vm_map: 13589.800748895 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3074764800, end = 3074768896, flags = 135266417, pgoff = 32768, inode = 508755 }
+vm_state.vm_map: 13589.800750958 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3074768896, end = 3074772992, flags = 135266419, pgoff = 36864, inode = 508755 }
+vm_state.vm_map: 13589.800753182 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3074772992, end = 3074932736, flags = 1048691, pgoff = 3074772992, inode = 0 }
+vm_state.vm_map: 13589.800755318 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3074932736, end = 3074981888, flags = 134217845, pgoff = 0, inode = 500088 }
+vm_state.vm_map: 13589.800757486 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3074981888, end = 3074985984, flags = 135266419, pgoff = 45056, inode = 500088 }
+vm_state.vm_map: 13589.800759635 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3074985984, end = 3075035136, flags = 1048691, pgoff = 3074985984, inode = 0 }
+vm_state.vm_map: 13589.800761741 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3075035136, end = 3075076096, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.800763798 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3075076096, end = 3075080192, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.800766193 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3075080192, end = 3075084288, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.800768231 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3075084288, end = 3075162112, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.800770399 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3075162112, end = 3075166208, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.800772357 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3075166208, end = 3075170304, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.800774482 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3075170304, end = 3075178496, flags = 1048691, pgoff = 3075170304, inode = 0 }
+vm_state.vm_map: 13589.800776557 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3075178496, end = 3075207168, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.800778503 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3075207168, end = 3075211264, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.800780454 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3075211264, end = 3075215360, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.800782542 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3075215360, end = 3075223552, flags = 134217845, pgoff = 0, inode = 17167 }
+vm_state.vm_map: 13589.800784488 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3075223552, end = 3075227648, flags = 135266419, pgoff = 8192, inode = 17167 }
+vm_state.vm_map: 13589.800786742 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3075227648, end = 3075235840, flags = 134217845, pgoff = 0, inode = 499908 }
+vm_state.vm_map: 13589.800788675 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3075235840, end = 3075239936, flags = 135266419, pgoff = 4096, inode = 499908 }
+vm_state.vm_map: 13589.800790806 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3075239936, end = 3075252224, flags = 134217845, pgoff = 0, inode = 500089 }
+vm_state.vm_map: 13589.800792795 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3075252224, end = 3075256320, flags = 135266419, pgoff = 8192, inode = 500089 }
+vm_state.vm_map: 13589.800795049 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3075256320, end = 3075260416, flags = 134217845, pgoff = 0, inode = 500082 }
+vm_state.vm_map: 13589.800796983 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3075260416, end = 3075264512, flags = 135266419, pgoff = 0, inode = 500082 }
+vm_state.vm_map: 13589.800799489 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3075264512, end = 3075268608, flags = 134217845, pgoff = 0, inode = 499797 }
+vm_state.vm_map: 13589.800801423 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3075268608, end = 3075272704, flags = 135266419, pgoff = 0, inode = 499797 }
+vm_state.vm_map: 13589.800803818 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3075272704, end = 3076603904, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.800805788 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3076603904, end = 3076608000, flags = 1048691, pgoff = 3076603904, inode = 0 }
+vm_state.vm_map: 13589.800808153 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3076608000, end = 3076616192, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.800810099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3076616192, end = 3076620288, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.800812038 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3076620288, end = 3076624384, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.800814391 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3076624384, end = 3077939200, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.800816546 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3077939200, end = 3077947392, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.800818584 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3077947392, end = 3077951488, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.800820739 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3077951488, end = 3077967872, flags = 1048691, pgoff = 3077951488, inode = 0 }
+vm_state.vm_map: 13589.800823025 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3077967872, end = 3078066176, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 13589.800825192 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3078066176, end = 3078070272, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 13589.800827341 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3078070272, end = 3078074368, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 13589.800829625 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3078074368, end = 3078115328, flags = 134217845, pgoff = 0, inode = 499738 }
+vm_state.vm_map: 13589.800831589 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3078115328, end = 3078119424, flags = 135266419, pgoff = 40960, inode = 499738 }
+vm_state.vm_map: 13589.800834041 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3078123520, end = 3078160384, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.800836030 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3078160384, end = 3078164480, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.800838006 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3078164480, end = 3078168576, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.800840482 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3078168576, end = 3078193152, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.800842515 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3078193152, end = 3078197248, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.800844682 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3078197248, end = 3078201344, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.800846732 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3078205440, end = 3078221824, flags = 1048691, pgoff = 3078205440, inode = 0 }
+vm_state.vm_map: 13589.800848776 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3078221824, end = 3078225920, flags = 67371125, pgoff = 3078221824, inode = 0 }
+vm_state.vm_map: 13589.800850938 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3078225920, end = 3078340608, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.800852946 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3078340608, end = 3078344704, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.800855046 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3078344704, end = 3078348800, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.800857096 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1928, start = 3220443136, end = 3220529152, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.800864997 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 134512640, end = 135254016, flags = 134223989, pgoff = 0, inode = 21795 }
+vm_state.vm_map: 13589.800867213 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 135254016, end = 135270400, flags = 135272563, pgoff = 741376, inode = 21795 }
+vm_state.vm_map: 13589.800869806 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 135270400, end = 135282688, flags = 1048691, pgoff = 135270400, inode = 0 }
+vm_state.vm_map: 13589.800871962 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 167878656, end = 168013824, flags = 1048691, pgoff = 167878656, inode = 0 }
+vm_state.vm_map: 13589.800874388 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3073839104, end = 3073880064, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.800876567 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3073880064, end = 3073884160, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.800878538 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3073884160, end = 3073888256, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.800880828 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3073888256, end = 3073925120, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.800882768 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3073925120, end = 3073929216, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.800884844 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3073929216, end = 3073933312, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.800887091 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3073933312, end = 3073957888, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.800889283 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3073957888, end = 3073961984, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.800891352 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3073961984, end = 3073966080, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.800893403 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3073966080, end = 3073970176, flags = 1048691, pgoff = 3073966080, inode = 0 }
+vm_state.vm_map: 13589.800896303 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3073970176, end = 3073982464, flags = 134217845, pgoff = 0, inode = 20765 }
+vm_state.vm_map: 13589.800898243 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3073982464, end = 3073986560, flags = 135266419, pgoff = 8192, inode = 20765 }
+vm_state.vm_map: 13589.800900182 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3073986560, end = 3073990656, flags = 1048691, pgoff = 3073986560, inode = 0 }
+vm_state.vm_map: 13589.800902664 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3073990656, end = 3074453504, flags = 134217845, pgoff = 0, inode = 20061 }
+vm_state.vm_map: 13589.800905072 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3074453504, end = 3074465792, flags = 135266419, pgoff = 458752, inode = 20061 }
+vm_state.vm_map: 13589.800907566 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3074465792, end = 3074547712, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.800909512 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3074547712, end = 3074551808, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.800917283 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3074551808, end = 3074613248, flags = 134217845, pgoff = 0, inode = 19423 }
+vm_state.vm_map: 13589.800919444 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3074613248, end = 3074617344, flags = 135266419, pgoff = 57344, inode = 19423 }
+vm_state.vm_map: 13589.800921716 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3074617344, end = 3074703360, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.800923885 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3074703360, end = 3074707456, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.800925935 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3074707456, end = 3074711552, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.800928010 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3074711552, end = 3074719744, flags = 1048691, pgoff = 3074711552, inode = 0 }
+vm_state.vm_map: 13589.800930159 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3074719744, end = 3076034560, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.800932099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3076034560, end = 3076042752, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.800934064 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3076042752, end = 3076046848, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.800936003 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3076046848, end = 3076063232, flags = 1048691, pgoff = 3076046848, inode = 0 }
+vm_state.vm_map: 13589.800938811 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3076063232, end = 3076255744, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.800941194 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3076255744, end = 3076259840, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.800946232 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3076259840, end = 3076866048, flags = 134217845, pgoff = 0, inode = 22471 }
+vm_state.vm_map: 13589.800948270 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3076866048, end = 3076882432, flags = 135266419, pgoff = 602112, inode = 22471 }
+vm_state.vm_map: 13589.800950763 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3076882432, end = 3078123520, flags = 134217845, pgoff = 0, inode = 18970 }
+vm_state.vm_map: 13589.800952740 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3078123520, end = 3078135808, flags = 135266419, pgoff = 1236992, inode = 18970 }
+vm_state.vm_map: 13589.800954950 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3078135808, end = 3078144000, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.800956891 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3078144000, end = 3078148096, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.800958954 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3078148096, end = 3078152192, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.800961361 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3078152192, end = 3078299648, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.800963294 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3078299648, end = 3078303744, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.800965235 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3078303744, end = 3078307840, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.800967384 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3078307840, end = 3078344704, flags = 134217845, pgoff = 0, inode = 508755 }
+vm_state.vm_map: 13589.800969330 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3078344704, end = 3078348800, flags = 135266417, pgoff = 32768, inode = 508755 }
+vm_state.vm_map: 13589.800971466 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3078348800, end = 3078352896, flags = 135266419, pgoff = 36864, inode = 508755 }
+vm_state.vm_map: 13589.800973646 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3078352896, end = 3078516736, flags = 1048691, pgoff = 3078352896, inode = 0 }
+vm_state.vm_map: 13589.800976091 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3078516736, end = 3078594560, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.800978160 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3078594560, end = 3078598656, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.800980223 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3078598656, end = 3078602752, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.800982175 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3078602752, end = 3078610944, flags = 1048691, pgoff = 3078602752, inode = 0 }
+vm_state.vm_map: 13589.800984515 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3078610944, end = 3078680576, flags = 134217845, pgoff = 0, inode = 508763 }
+vm_state.vm_map: 13589.800986486 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3078680576, end = 3078684672, flags = 135266417, pgoff = 65536, inode = 508763 }
+vm_state.vm_map: 13589.800988419 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3078684672, end = 3078688768, flags = 135266419, pgoff = 69632, inode = 508763 }
+vm_state.vm_map: 13589.800990353 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3078688768, end = 3078696960, flags = 1048691, pgoff = 3078688768, inode = 0 }
+vm_state.vm_map: 13589.800995291 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3078758400, end = 3078778880, flags = 134217845, pgoff = 0, inode = 508634 }
+vm_state.vm_map: 13589.800997231 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3078778880, end = 3078782976, flags = 135266417, pgoff = 16384, inode = 508634 }
+vm_state.vm_map: 13589.800999282 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3078782976, end = 3078787072, flags = 135266419, pgoff = 20480, inode = 508634 }
+vm_state.vm_map: 13589.801001221 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3078787072, end = 3078799360, flags = 1048691, pgoff = 3078787072, inode = 0 }
+vm_state.vm_map: 13589.801003167 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3078799360, end = 3078803456, flags = 67371125, pgoff = 3078799360, inode = 0 }
+vm_state.vm_map: 13589.801005267 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3078803456, end = 3078918144, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.801007244 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3078918144, end = 3078922240, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.801012071 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3078922240, end = 3078926336, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.801014066 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1938, start = 3218399232, end = 3218935808, flags = 1048947, pgoff = 3220688896, inode = 0 }
+vm_state.vm_map: 13589.801016629 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3074318336, end = 3074338816, flags = 134217845, pgoff = 0, inode = 508634 }
+vm_state.vm_map: 13589.801018679 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3074338816, end = 3074342912, flags = 135266417, pgoff = 16384, inode = 508634 }
+vm_state.vm_map: 13589.801020619 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3074342912, end = 3074347008, flags = 135266419, pgoff = 20480, inode = 508634 }
+vm_state.vm_map: 13589.801022835 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3074347008, end = 3074387968, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.801024782 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3074387968, end = 3074392064, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.801026832 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3074392064, end = 3074396160, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.801028889 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3074396160, end = 3074433024, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.801030859 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3074433024, end = 3074437120, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.801032971 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3074437120, end = 3074441216, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.801035047 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3074441216, end = 3074465792, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.801036999 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3074465792, end = 3074469888, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.801039049 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3074469888, end = 3074473984, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.801040983 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3074473984, end = 3074482176, flags = 1048691, pgoff = 3074473984, inode = 0 }
+vm_state.vm_map: 13589.801043544 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3074482176, end = 3074568192, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.801045484 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3074568192, end = 3074572288, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.801047424 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3074572288, end = 3074576384, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.801049376 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3074576384, end = 3074584576, flags = 1048691, pgoff = 3074576384, inode = 0 }
+vm_state.vm_map: 13589.801054296 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3074584576, end = 3074592768, flags = 134217845, pgoff = 0, inode = 500018 }
+vm_state.vm_map: 13589.801056241 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3074592768, end = 3074596864, flags = 135266419, pgoff = 4096, inode = 500018 }
+vm_state.vm_map: 13589.801058200 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3074596864, end = 3074600960, flags = 1048691, pgoff = 3074596864, inode = 0 }
+vm_state.vm_map: 13589.801060503 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3074600960, end = 3074625536, flags = 134217845, pgoff = 0, inode = 18679 }
+vm_state.vm_map: 13589.801062474 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3074625536, end = 3074629632, flags = 135266419, pgoff = 20480, inode = 18679 }
+vm_state.vm_map: 13589.801064666 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3074629632, end = 3074637824, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.801066631 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3074637824, end = 3074641920, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.801068724 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3074641920, end = 3074646016, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.801070929 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3074646016, end = 3075960832, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.801072874 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3075960832, end = 3075969024, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.801074869 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3075969024, end = 3075973120, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.801080005 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3075973120, end = 3075985408, flags = 1048691, pgoff = 3075973120, inode = 0 }
+vm_state.vm_map: 13589.801085400 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3075985408, end = 3075993600, flags = 134217845, pgoff = 0, inode = 499720 }
+vm_state.vm_map: 13589.801087555 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3075993600, end = 3075997696, flags = 135266419, pgoff = 4096, inode = 499720 }
+vm_state.vm_map: 13589.801089938 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3075997696, end = 3076161536, flags = 134217845, pgoff = 0, inode = 18646 }
+vm_state.vm_map: 13589.801111952 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3076161536, end = 3076165632, flags = 135266419, pgoff = 163840, inode = 18646 }
+vm_state.vm_map: 13589.801114095 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3076165632, end = 3076169728, flags = 1048691, pgoff = 3076165632, inode = 0 }
+vm_state.vm_map: 13589.801116651 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3076169728, end = 3076833280, flags = 134217845, pgoff = 0, inode = 18913 }
+vm_state.vm_map: 13589.801118652 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3076833280, end = 3076857856, flags = 135266419, pgoff = 659456, inode = 18913 }
+vm_state.vm_map: 13589.801121312 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3076857856, end = 3077021696, flags = 134217845, pgoff = 0, inode = 18977 }
+vm_state.vm_map: 13589.801123351 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3077021696, end = 3077025792, flags = 135266419, pgoff = 163840, inode = 18977 }
+vm_state.vm_map: 13589.801125524 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3077025792, end = 3077062656, flags = 134217845, pgoff = 0, inode = 508755 }
+vm_state.vm_map: 13589.801127550 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3077062656, end = 3077066752, flags = 135266417, pgoff = 32768, inode = 508755 }
+vm_state.vm_map: 13589.801129835 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3077066752, end = 3077070848, flags = 135266419, pgoff = 36864, inode = 508755 }
+vm_state.vm_map: 13589.801131879 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3077070848, end = 3077230592, flags = 1048691, pgoff = 3077070848, inode = 0 }
+vm_state.vm_map: 13589.801134410 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3077230592, end = 3077308416, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.801136540 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3077308416, end = 3077312512, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.801138709 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3077312512, end = 3077316608, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.801140704 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3077316608, end = 3077324800, flags = 1048691, pgoff = 3077316608, inode = 0 }
+vm_state.vm_map: 13589.801143154 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3077324800, end = 3077406720, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.801145131 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3077406720, end = 3077410816, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.801147717 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3077410816, end = 3077419008, flags = 134217845, pgoff = 0, inode = 508751 }
+vm_state.vm_map: 13589.801149910 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3077419008, end = 3077423104, flags = 135266417, pgoff = 4096, inode = 508751 }
+vm_state.vm_map: 13589.801152003 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3077423104, end = 3077427200, flags = 135266419, pgoff = 8192, inode = 508751 }
+vm_state.vm_map: 13589.801153974 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3077427200, end = 3077431296, flags = 1048691, pgoff = 3077427200, inode = 0 }
+vm_state.vm_map: 13589.801156610 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3077431296, end = 3078733824, flags = 134217845, pgoff = 0, inode = 33850 }
+vm_state.vm_map: 13589.801158642 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3078733824, end = 3078828032, flags = 135266419, pgoff = 1302528, inode = 33850 }
+vm_state.vm_map: 13589.801160680 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3078828032, end = 3078840320, flags = 1048691, pgoff = 3078828032, inode = 0 }
+vm_state.vm_map: 13589.801162927 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3078840320, end = 3078909952, flags = 134217845, pgoff = 0, inode = 508763 }
+vm_state.vm_map: 13589.801165064 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3078909952, end = 3078914048, flags = 135266417, pgoff = 65536, inode = 508763 }
+vm_state.vm_map: 13589.801167145 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3078914048, end = 3078918144, flags = 135266419, pgoff = 69632, inode = 508763 }
+vm_state.vm_map: 13589.801169751 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3078918144, end = 3078926336, flags = 1048691, pgoff = 3078918144, inode = 0 }
+vm_state.vm_map: 13589.801171807 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3079020544, end = 3079028736, flags = 1048691, pgoff = 3079020544, inode = 0 }
+vm_state.vm_map: 13589.801191685 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3079028736, end = 3079032832, flags = 67371125, pgoff = 3079028736, inode = 0 }
+vm_state.vm_map: 13589.801194086 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3079032832, end = 3079147520, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.801196260 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3079147520, end = 3079151616, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.801198299 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3079151616, end = 3079155712, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.801203200 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3079155712, end = 3079483392, flags = 134223989, pgoff = 0, inode = 22406 }
+vm_state.vm_map: 13589.801205349 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3079483392, end = 3079487488, flags = 135272563, pgoff = 323584, inode = 22406 }
+vm_state.vm_map: 13589.801207394 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3079487488, end = 3079503872, flags = 1048691, pgoff = 3079487488, inode = 0 }
+vm_state.vm_map: 13589.801209438 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3095060480, end = 3095195648, flags = 1048691, pgoff = 3095060480, inode = 0 }
+vm_state.vm_map: 13589.801211581 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1963, start = 3214336000, end = 3214422016, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.801214555 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3073671168, end = 3073691648, flags = 134217845, pgoff = 0, inode = 508634 }
+vm_state.vm_map: 13589.801216747 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3073691648, end = 3073695744, flags = 135266417, pgoff = 16384, inode = 508634 }
+vm_state.vm_map: 13589.801218822 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3073695744, end = 3073699840, flags = 135266419, pgoff = 20480, inode = 508634 }
+vm_state.vm_map: 13589.801221557 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3073699840, end = 3073740800, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.801223607 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3073740800, end = 3073744896, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.801225855 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3073744896, end = 3073748992, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.801228077 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3073748992, end = 3073785856, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.801230178 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3073785856, end = 3073789952, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.801232155 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3073789952, end = 3073794048, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.801234396 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3073794048, end = 3073818624, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.801236354 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3073818624, end = 3073822720, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.801238527 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3073822720, end = 3073826816, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.801240511 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3073826816, end = 3073835008, flags = 1048691, pgoff = 3073826816, inode = 0 }
+vm_state.vm_map: 13589.801242826 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3073835008, end = 3073921024, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.801244864 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3073921024, end = 3073925120, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.801247136 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3073925120, end = 3073929216, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.801249180 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3073929216, end = 3073937408, flags = 1048691, pgoff = 3073929216, inode = 0 }
+vm_state.vm_map: 13589.801251256 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3073937408, end = 3073945600, flags = 134217845, pgoff = 0, inode = 500018 }
+vm_state.vm_map: 13589.801253578 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3073945600, end = 3073949696, flags = 135266419, pgoff = 4096, inode = 500018 }
+vm_state.vm_map: 13589.801256127 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3073949696, end = 3073953792, flags = 1048691, pgoff = 3073949696, inode = 0 }
+vm_state.vm_map: 13589.801258436 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3073953792, end = 3073978368, flags = 134217845, pgoff = 0, inode = 18679 }
+vm_state.vm_map: 13589.801260401 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3073978368, end = 3073982464, flags = 135266419, pgoff = 20480, inode = 18679 }
+vm_state.vm_map: 13589.801262759 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3073982464, end = 3073990656, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.801264797 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3073990656, end = 3073994752, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.801266774 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3073994752, end = 3073998848, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.801269027 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3073998848, end = 3075313664, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.801271066 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3075313664, end = 3075321856, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.801273123 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3075321856, end = 3075325952, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.801275253 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3075325952, end = 3075338240, flags = 1048691, pgoff = 3075325952, inode = 0 }
+vm_state.vm_map: 13589.801277445 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3075338240, end = 3075346432, flags = 134217845, pgoff = 0, inode = 499720 }
+vm_state.vm_map: 13589.801279398 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3075346432, end = 3075350528, flags = 135266419, pgoff = 4096, inode = 499720 }
+vm_state.vm_map: 13589.801281707 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3075350528, end = 3075514368, flags = 134217845, pgoff = 0, inode = 18646 }
+vm_state.vm_map: 13589.801283745 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3075514368, end = 3075518464, flags = 135266419, pgoff = 163840, inode = 18646 }
+vm_state.vm_map: 13589.801285777 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3075518464, end = 3075522560, flags = 1048691, pgoff = 3075518464, inode = 0 }
+vm_state.vm_map: 13589.801287938 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3075522560, end = 3076186112, flags = 134217845, pgoff = 0, inode = 18913 }
+vm_state.vm_map: 13589.801290556 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3076186112, end = 3076210688, flags = 135266419, pgoff = 659456, inode = 18913 }
+vm_state.vm_map: 13589.801292773 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3076210688, end = 3076374528, flags = 134217845, pgoff = 0, inode = 18977 }
+vm_state.vm_map: 13589.801294977 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3076374528, end = 3076378624, flags = 135266419, pgoff = 163840, inode = 18977 }
+vm_state.vm_map: 13589.801297138 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3076378624, end = 3076415488, flags = 134217845, pgoff = 0, inode = 508755 }
+vm_state.vm_map: 13589.801299405 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3076415488, end = 3076419584, flags = 135266417, pgoff = 32768, inode = 508755 }
+vm_state.vm_map: 13589.801301443 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3076419584, end = 3076423680, flags = 135266419, pgoff = 36864, inode = 508755 }
+vm_state.vm_map: 13589.801303487 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3076423680, end = 3076583424, flags = 1048691, pgoff = 3076423680, inode = 0 }
+vm_state.vm_map: 13589.801305643 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3076583424, end = 3076661248, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.801307810 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3076661248, end = 3076665344, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.801309843 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3076665344, end = 3076669440, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.801312016 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3076669440, end = 3076677632, flags = 1048691, pgoff = 3076669440, inode = 0 }
+vm_state.vm_map: 13589.801314178 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3076677632, end = 3076759552, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.801316246 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3076759552, end = 3076763648, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.801318420 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3076763648, end = 3076771840, flags = 134217845, pgoff = 0, inode = 508751 }
+vm_state.vm_map: 13589.801320594 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3076771840, end = 3076775936, flags = 135266417, pgoff = 4096, inode = 508751 }
+vm_state.vm_map: 13589.801322657 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3076775936, end = 3076780032, flags = 135266419, pgoff = 8192, inode = 508751 }
+vm_state.vm_map: 13589.801325052 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3076780032, end = 3076784128, flags = 1048691, pgoff = 3076780032, inode = 0 }
+vm_state.vm_map: 13589.801327374 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3076784128, end = 3078086656, flags = 134217845, pgoff = 0, inode = 33850 }
+vm_state.vm_map: 13589.801329412 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3078086656, end = 3078180864, flags = 135266419, pgoff = 1302528, inode = 33850 }
+vm_state.vm_map: 13589.801331445 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3078180864, end = 3078193152, flags = 1048691, pgoff = 3078180864, inode = 0 }
+vm_state.vm_map: 13589.801333747 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3078193152, end = 3078262784, flags = 134217845, pgoff = 0, inode = 508763 }
+vm_state.vm_map: 13589.801335730 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3078262784, end = 3078266880, flags = 135266417, pgoff = 65536, inode = 508763 }
+vm_state.vm_map: 13589.801337891 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3078266880, end = 3078270976, flags = 135266419, pgoff = 69632, inode = 508763 }
+vm_state.vm_map: 13589.801340115 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3078270976, end = 3078279168, flags = 1048691, pgoff = 3078270976, inode = 0 }
+vm_state.vm_map: 13589.801342184 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3078373376, end = 3078381568, flags = 1048691, pgoff = 3078373376, inode = 0 }
+vm_state.vm_map: 13589.801344210 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3078381568, end = 3078385664, flags = 67371125, pgoff = 3078381568, inode = 0 }
+vm_state.vm_map: 13589.801346451 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3078385664, end = 3078500352, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.801348501 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3078500352, end = 3078504448, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.801350546 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3078504448, end = 3078508544, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.801352665 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3078508544, end = 3078836224, flags = 134223989, pgoff = 0, inode = 22406 }
+vm_state.vm_map: 13589.801354937 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3078836224, end = 3078840320, flags = 135272563, pgoff = 323584, inode = 22406 }
+vm_state.vm_map: 13589.801356993 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3078840320, end = 3078856704, flags = 1048691, pgoff = 3078840320, inode = 0 }
+vm_state.vm_map: 13589.801359389 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3098804224, end = 3098939392, flags = 1048691, pgoff = 3098804224, inode = 0 }
+vm_state.vm_map: 13589.801361526 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1973, start = 3214684160, end = 3214770176, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.801367018 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073196032, end = 3073429504, flags = 1048691, pgoff = 3073429504, inode = 0 }
+vm_state.vm_map: 13589.801369321 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073630208, end = 3073650688, flags = 134217845, pgoff = 0, inode = 508634 }
+vm_state.vm_map: 13589.801371342 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073650688, end = 3073654784, flags = 135266417, pgoff = 16384, inode = 508634 }
+vm_state.vm_map: 13589.801373521 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073654784, end = 3073658880, flags = 135266419, pgoff = 20480, inode = 508634 }
+vm_state.vm_map: 13589.801375886 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073658880, end = 3073699840, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.801377930 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073699840, end = 3073703936, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.801379957 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073703936, end = 3073708032, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.801382216 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073708032, end = 3073744896, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.801384236 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073744896, end = 3073748992, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.801386299 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073748992, end = 3073753088, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.801388417 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073753088, end = 3073777664, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.801390548 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073777664, end = 3073781760, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.801392599 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073781760, end = 3073785856, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.801395154 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073785856, end = 3073794048, flags = 1048691, pgoff = 3073785856, inode = 0 }
+vm_state.vm_map: 13589.801397235 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073794048, end = 3073880064, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.801401847 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073880064, end = 3073884160, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.801403898 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073884160, end = 3073888256, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.801406035 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073888256, end = 3073896448, flags = 1048691, pgoff = 3073888256, inode = 0 }
+vm_state.vm_map: 13589.801408128 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073896448, end = 3073904640, flags = 134217845, pgoff = 0, inode = 500018 }
+vm_state.vm_map: 13589.801410289 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073904640, end = 3073908736, flags = 135266419, pgoff = 4096, inode = 500018 }
+vm_state.vm_map: 13589.801412432 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073908736, end = 3073912832, flags = 1048691, pgoff = 3073908736, inode = 0 }
+vm_state.vm_map: 13589.801414582 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073912832, end = 3073937408, flags = 134217845, pgoff = 0, inode = 18679 }
+vm_state.vm_map: 13589.801416534 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073937408, end = 3073941504, flags = 135266419, pgoff = 20480, inode = 18679 }
+vm_state.vm_map: 13589.801418818 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073941504, end = 3073949696, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.801420814 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073949696, end = 3073953792, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.801422951 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073953792, end = 3073957888, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.801425106 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073957888, end = 3075272704, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.801427224 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3075272704, end = 3075280896, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.801429773 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3075280896, end = 3075284992, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.801431831 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3075284992, end = 3075297280, flags = 1048691, pgoff = 3075284992, inode = 0 }
+vm_state.vm_map: 13589.801434152 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3075297280, end = 3075305472, flags = 134217845, pgoff = 0, inode = 499720 }
+vm_state.vm_map: 13589.801436116 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3075305472, end = 3075309568, flags = 135266419, pgoff = 4096, inode = 499720 }
+vm_state.vm_map: 13589.801438363 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3075309568, end = 3075473408, flags = 134217845, pgoff = 0, inode = 18646 }
+vm_state.vm_map: 13589.801440537 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3075473408, end = 3075477504, flags = 135266419, pgoff = 163840, inode = 18646 }
+vm_state.vm_map: 13589.801442582 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3075477504, end = 3075481600, flags = 1048691, pgoff = 3075477504, inode = 0 }
+vm_state.vm_map: 13589.801444645 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3075481600, end = 3076145152, flags = 134217845, pgoff = 0, inode = 18913 }
+vm_state.vm_map: 13589.801446954 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3076145152, end = 3076169728, flags = 135266419, pgoff = 659456, inode = 18913 }
+vm_state.vm_map: 13589.801449097 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3076169728, end = 3076333568, flags = 134217845, pgoff = 0, inode = 18977 }
+vm_state.vm_map: 13589.801451122 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3076333568, end = 3076337664, flags = 135266419, pgoff = 163840, inode = 18977 }
+vm_state.vm_map: 13589.801453364 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3076337664, end = 3076374528, flags = 134217845, pgoff = 0, inode = 508755 }
+vm_state.vm_map: 13589.801455396 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3076374528, end = 3076378624, flags = 135266417, pgoff = 32768, inode = 508755 }
+vm_state.vm_map: 13589.801457435 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3076378624, end = 3076382720, flags = 135266419, pgoff = 36864, inode = 508755 }
+vm_state.vm_map: 13589.801459614 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3076382720, end = 3076542464, flags = 1048691, pgoff = 3076382720, inode = 0 }
+vm_state.vm_map: 13589.801461800 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3076542464, end = 3076620288, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.801464289 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3076620288, end = 3076624384, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.801466339 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3076624384, end = 3076628480, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.801468500 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3076628480, end = 3076636672, flags = 1048691, pgoff = 3076628480, inode = 0 }
+vm_state.vm_map: 13589.801470698 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3076636672, end = 3076718592, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.801472731 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3076718592, end = 3076722688, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.801474972 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3076722688, end = 3076730880, flags = 134217845, pgoff = 0, inode = 508751 }
+vm_state.vm_map: 13589.801477017 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3076730880, end = 3076734976, flags = 135266417, pgoff = 4096, inode = 508751 }
+vm_state.vm_map: 13589.801479184 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3076734976, end = 3076739072, flags = 135266419, pgoff = 8192, inode = 508751 }
+vm_state.vm_map: 13589.801481260 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3076739072, end = 3076743168, flags = 1048691, pgoff = 3076739072, inode = 0 }
+vm_state.vm_map: 13589.801483463 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3076743168, end = 3078045696, flags = 134217845, pgoff = 0, inode = 33850 }
+vm_state.vm_map: 13589.801485429 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078045696, end = 3078139904, flags = 135266419, pgoff = 1302528, inode = 33850 }
+vm_state.vm_map: 13589.801487682 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078139904, end = 3078152192, flags = 1048691, pgoff = 3078139904, inode = 0 }
+vm_state.vm_map: 13589.801489782 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078152192, end = 3078221824, flags = 134217845, pgoff = 0, inode = 508763 }
+vm_state.vm_map: 13589.801491944 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078221824, end = 3078225920, flags = 135266417, pgoff = 65536, inode = 508763 }
+vm_state.vm_map: 13589.801493951 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078225920, end = 3078230016, flags = 135266419, pgoff = 69632, inode = 508763 }
+vm_state.vm_map: 13589.801496236 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078230016, end = 3078238208, flags = 1048691, pgoff = 3078230016, inode = 0 }
+vm_state.vm_map: 13589.801498545 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078332416, end = 3078340608, flags = 1048691, pgoff = 3078332416, inode = 0 }
+vm_state.vm_map: 13589.801500953 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078340608, end = 3078344704, flags = 67371125, pgoff = 3078340608, inode = 0 }
+vm_state.vm_map: 13589.801503070 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078344704, end = 3078459392, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.801505331 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078459392, end = 3078463488, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.801507277 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078463488, end = 3078467584, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.801509586 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078467584, end = 3078795264, flags = 134223989, pgoff = 0, inode = 22406 }
+vm_state.vm_map: 13589.801511636 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078795264, end = 3078799360, flags = 135272563, pgoff = 323584, inode = 22406 }
+vm_state.vm_map: 13589.801513798 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078799360, end = 3078815744, flags = 1048691, pgoff = 3078799360, inode = 0 }
+vm_state.vm_map: 13589.801515750 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3090386944, end = 3091320832, flags = 1048691, pgoff = 3090386944, inode = 0 }
+vm_state.vm_map: 13589.801518022 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 1989, start = 3217649664, end = 3217735680, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.801521255 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2043, start = 134512640, end = 135290880, flags = 134223989, pgoff = 0, inode = 1048644 }
+vm_state.vm_map: 13589.801523306 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2043, start = 135290880, end = 135311360, flags = 135272563, pgoff = 778240, inode = 1048644 }
+vm_state.vm_map: 13589.801525523 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2043, start = 135311360, end = 135331840, flags = 1048691, pgoff = 135311360, inode = 0 }
+vm_state.vm_map: 13589.801527561 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2043, start = 153161728, end = 153751552, flags = 1048691, pgoff = 153161728, inode = 0 }
+vm_state.vm_map: 13589.801532179 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2043, start = 3075936256, end = 3077267456, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.801536976 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2043, start = 3077267456, end = 3077271552, flags = 1048691, pgoff = 3077267456, inode = 0 }
+vm_state.vm_map: 13589.801539353 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2043, start = 3077271552, end = 3078586368, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.801541545 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2043, start = 3078586368, end = 3078594560, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.801543732 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2043, start = 3078594560, end = 3078598656, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.801545924 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2043, start = 3078598656, end = 3078615040, flags = 1048691, pgoff = 3078598656, inode = 0 }
+vm_state.vm_map: 13589.801548146 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2043, start = 3078615040, end = 3078623232, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.801550221 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2043, start = 3078623232, end = 3078627328, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.801552333 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2043, start = 3078627328, end = 3078631424, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.801554655 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2043, start = 3078631424, end = 3078848512, flags = 134217845, pgoff = 0, inode = 499784 }
+vm_state.vm_map: 13589.801556792 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2043, start = 3078848512, end = 3078860800, flags = 135266419, pgoff = 217088, inode = 499784 }
+vm_state.vm_map: 13589.801558917 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2043, start = 3078926336, end = 3078955008, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.801560985 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2043, start = 3078955008, end = 3078963200, flags = 1048691, pgoff = 3078955008, inode = 0 }
+vm_state.vm_map: 13589.801563097 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2043, start = 3078963200, end = 3078967296, flags = 67371125, pgoff = 3078963200, inode = 0 }
+vm_state.vm_map: 13589.801565166 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2043, start = 3078967296, end = 3079081984, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.801567396 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2043, start = 3079081984, end = 3079086080, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.801569859 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2043, start = 3079086080, end = 3079090176, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.801572088 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2043, start = 3214745600, end = 3214831616, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.801579890 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 134512640, end = 135143424, flags = 134223989, pgoff = 0, inode = 17159 }
+vm_state.vm_map: 13589.801581997 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 135143424, end = 135155712, flags = 135272563, pgoff = 630784, inode = 17159 }
+vm_state.vm_map: 13589.801584164 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 135155712, end = 135192576, flags = 1048691, pgoff = 135155712, inode = 0 }
+vm_state.vm_map: 13589.801586258 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 159911936, end = 160174080, flags = 1048691, pgoff = 159911936, inode = 0 }
+vm_state.vm_map: 13589.801588302 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3073032192, end = 3073036288, flags = 1048688, pgoff = 3073032192, inode = 0 }
+vm_state.vm_map: 13589.801590235 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3073036288, end = 3073560576, flags = 1048691, pgoff = 3073036288, inode = 0 }
+vm_state.vm_map: 13589.801592310 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3073560576, end = 3074891776, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.801594374 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3074891776, end = 3074895872, flags = 1048688, pgoff = 3074891776, inode = 0 }
+vm_state.vm_map: 13589.801596437 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3074895872, end = 3075035136, flags = 1048691, pgoff = 3074895872, inode = 0 }
+vm_state.vm_map: 13589.801598746 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3075035136, end = 3075047424, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 13589.801600833 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3075047424, end = 3075051520, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 13589.801602928 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3075051520, end = 3075067904, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.801605341 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3075067904, end = 3075072000, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.801607453 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3075072000, end = 3075080192, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.801609436 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3075080192, end = 3075084288, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.801611554 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3075084288, end = 3075088384, flags = 1048691, pgoff = 3075084288, inode = 0 }
+vm_state.vm_map: 13589.801619245 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3075088384, end = 3075174400, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 13589.801621382 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3075174400, end = 3075178496, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 13589.801623427 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3075178496, end = 3075186688, flags = 1048691, pgoff = 3075178496, inode = 0 }
+vm_state.vm_map: 13589.801625847 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3075186688, end = 3075215360, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 13589.801627891 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3075215360, end = 3075219456, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 13589.801630120 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3075219456, end = 3075317760, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.801632171 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3075317760, end = 3075321856, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.801634259 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3075321856, end = 3075330048, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.801636197 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3075330048, end = 3075334144, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.801638280 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3075334144, end = 3075338240, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.801640847 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3075338240, end = 3076653056, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.801642782 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3076653056, end = 3076661248, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.801644732 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3076661248, end = 3076665344, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.801646679 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3076665344, end = 3076681728, flags = 1048691, pgoff = 3076665344, inode = 0 }
+vm_state.vm_map: 13589.801649462 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3076681728, end = 3076796416, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.801651531 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3076796416, end = 3076800512, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.801653637 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3076800512, end = 3076947968, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.801655602 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3076947968, end = 3076952064, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.801657714 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3076952064, end = 3076956160, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.801659820 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3076956160, end = 3076984832, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.801661759 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3076984832, end = 3076988928, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.801663717 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3076988928, end = 3076993024, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.801665763 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3076993024, end = 3077079040, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.801667813 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3077079040, end = 3077083136, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.801669752 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3077083136, end = 3077087232, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.801671883 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3077087232, end = 3077095424, flags = 1048691, pgoff = 3077087232, inode = 0 }
+vm_state.vm_map: 13589.801674618 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3077095424, end = 3077181440, flags = 134217845, pgoff = 0, inode = 18950 }
+vm_state.vm_map: 13589.801676600 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3077181440, end = 3077185536, flags = 135266419, pgoff = 86016, inode = 18950 }
+vm_state.vm_map: 13589.801679131 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3077185536, end = 3077238784, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 13589.801681071 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3077238784, end = 3077242880, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 13589.801683022 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3077242880, end = 3077246976, flags = 1048691, pgoff = 3077242880, inode = 0 }
+vm_state.vm_map: 13589.801690295 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3077246976, end = 3077566464, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 13589.801692284 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3077566464, end = 3077582848, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 13589.801694619 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3077582848, end = 3078733824, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.801696656 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3078733824, end = 3078750208, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.801699070 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3078791168, end = 3078807552, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 13589.801701121 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3078807552, end = 3078811648, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 13589.801703097 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3078811648, end = 3078815744, flags = 1048695, pgoff = 3078811648, inode = 0 }
+vm_state.vm_map: 13589.801705376 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3078815744, end = 3078844416, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.801707359 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3078844416, end = 3078852608, flags = 1048691, pgoff = 3078844416, inode = 0 }
+vm_state.vm_map: 13589.801709760 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3078852608, end = 3078856704, flags = 67371125, pgoff = 3078852608, inode = 0 }
+vm_state.vm_map: 13589.801711940 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3078856704, end = 3078971392, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.801713899 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3078971392, end = 3078975488, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.801715943 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3078975488, end = 3078979584, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.801717883 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2103, start = 3213471744, end = 3213557760, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.801720931 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 134512640, end = 135143424, flags = 134223989, pgoff = 0, inode = 17159 }
+vm_state.vm_map: 13589.801723030 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 135143424, end = 135155712, flags = 135272563, pgoff = 630784, inode = 17159 }
+vm_state.vm_map: 13589.801725099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 135155712, end = 135192576, flags = 1048691, pgoff = 135155712, inode = 0 }
+vm_state.vm_map: 13589.801727218 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 160190464, end = 160325632, flags = 1048691, pgoff = 160190464, inode = 0 }
+vm_state.vm_map: 13589.801729164 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3073150976, end = 3073155072, flags = 1048688, pgoff = 3073150976, inode = 0 }
+vm_state.vm_map: 13589.801731264 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3073155072, end = 3073679360, flags = 1048691, pgoff = 3073155072, inode = 0 }
+vm_state.vm_map: 13589.801733412 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3073679360, end = 3075010560, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.801735580 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3075010560, end = 3075014656, flags = 1048688, pgoff = 3075010560, inode = 0 }
+vm_state.vm_map: 13589.801737785 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3075014656, end = 3075153920, flags = 1048691, pgoff = 3075014656, inode = 0 }
+vm_state.vm_map: 13589.801740063 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3075153920, end = 3075166208, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 13589.801742188 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3075166208, end = 3075170304, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 13589.801744792 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3075170304, end = 3075186688, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.801746880 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3075186688, end = 3075190784, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.801749208 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3075190784, end = 3075198976, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.801751283 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3075198976, end = 3075203072, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.801753364 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3075203072, end = 3075207168, flags = 1048691, pgoff = 3075203072, inode = 0 }
+vm_state.vm_map: 13589.801755415 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3075207168, end = 3075293184, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 13589.801757484 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3075293184, end = 3075297280, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 13589.801759590 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3075297280, end = 3075305472, flags = 1048691, pgoff = 3075297280, inode = 0 }
+vm_state.vm_map: 13589.801761825 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3075305472, end = 3075334144, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 13589.801763789 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3075334144, end = 3075338240, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 13589.801765944 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3075338240, end = 3075436544, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.801768039 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3075436544, end = 3075440640, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.801770132 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3075440640, end = 3075448832, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.801772078 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3075448832, end = 3075452928, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.801774005 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3075452928, end = 3075457024, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.801776426 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3075457024, end = 3076771840, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.801778760 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3076771840, end = 3076780032, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.801780705 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3076780032, end = 3076784128, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.801782750 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3076784128, end = 3076800512, flags = 1048691, pgoff = 3076784128, inode = 0 }
+vm_state.vm_map: 13589.801785016 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3076800512, end = 3076915200, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.801787073 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3076915200, end = 3076919296, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.801789357 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3076919296, end = 3077066752, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.801791309 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3077066752, end = 3077070848, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.801793236 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3077070848, end = 3077074944, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.801795472 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3077074944, end = 3077103616, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.801797591 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3077103616, end = 3077107712, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.801799721 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3077107712, end = 3077111808, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.801801938 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3077111808, end = 3077197824, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.801804000 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3077197824, end = 3077201920, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.801806045 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3077201920, end = 3077206016, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.801807991 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3077206016, end = 3077214208, flags = 1048691, pgoff = 3077206016, inode = 0 }
+vm_state.vm_map: 13589.801810085 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3077214208, end = 3077300224, flags = 134217845, pgoff = 0, inode = 18950 }
+vm_state.vm_map: 13589.801812375 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3077300224, end = 3077304320, flags = 135266419, pgoff = 86016, inode = 18950 }
+vm_state.vm_map: 13589.801814549 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3077304320, end = 3077357568, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 13589.801816600 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3077357568, end = 3077361664, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 13589.801818791 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3077361664, end = 3077365760, flags = 1048691, pgoff = 3077361664, inode = 0 }
+vm_state.vm_map: 13589.801821027 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3077365760, end = 3077685248, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 13589.801823139 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3077685248, end = 3077701632, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 13589.801825245 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3077701632, end = 3078852608, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.801827320 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3078852608, end = 3078868992, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.801829353 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3078930432, end = 3078934528, flags = 1048695, pgoff = 3078930432, inode = 0 }
+vm_state.vm_map: 13589.801831465 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3078934528, end = 3078963200, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.801833515 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3078963200, end = 3078971392, flags = 1048691, pgoff = 3078963200, inode = 0 }
+vm_state.vm_map: 13589.801835559 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3078971392, end = 3078975488, flags = 67371125, pgoff = 3078971392, inode = 0 }
+vm_state.vm_map: 13589.801837789 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3078975488, end = 3079090176, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.801839723 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3079090176, end = 3079094272, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.801841779 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3079094272, end = 3079098368, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.801843996 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2109, start = 3220582400, end = 3220668416, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.801846976 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 134512640, end = 135143424, flags = 134223989, pgoff = 0, inode = 17159 }
+vm_state.vm_map: 13589.801848903 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 135143424, end = 135155712, flags = 135272563, pgoff = 630784, inode = 17159 }
+vm_state.vm_map: 13589.801850905 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 135155712, end = 135192576, flags = 1048691, pgoff = 135155712, inode = 0 }
+vm_state.vm_map: 13589.801852894 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 147808256, end = 147943424, flags = 1048691, pgoff = 147808256, inode = 0 }
+vm_state.vm_map: 13589.801855049 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3072405504, end = 3072409600, flags = 1048688, pgoff = 3072405504, inode = 0 }
+vm_state.vm_map: 13589.801857266 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3072409600, end = 3072933888, flags = 1048691, pgoff = 3072409600, inode = 0 }
+vm_state.vm_map: 13589.801859366 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3072933888, end = 3074265088, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.801861448 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3074265088, end = 3074269184, flags = 1048688, pgoff = 3074265088, inode = 0 }
+vm_state.vm_map: 13589.801863436 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3074269184, end = 3074408448, flags = 1048691, pgoff = 3074269184, inode = 0 }
+vm_state.vm_map: 13589.801865684 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3074408448, end = 3074420736, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 13589.801867685 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3074420736, end = 3074424832, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 13589.801869735 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3074424832, end = 3074441216, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.801871670 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3074441216, end = 3074445312, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.801873732 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3074445312, end = 3074453504, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.801875666 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3074453504, end = 3074457600, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.801877612 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3074457600, end = 3074461696, flags = 1048691, pgoff = 3074457600, inode = 0 }
+vm_state.vm_map: 13589.801880014 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3074461696, end = 3074547712, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 13589.801882077 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3074547712, end = 3074551808, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 13589.801884016 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3074551808, end = 3074560000, flags = 1048691, pgoff = 3074551808, inode = 0 }
+vm_state.vm_map: 13589.801886263 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3074560000, end = 3074588672, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 13589.801888210 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3074588672, end = 3074592768, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 13589.801890501 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3074592768, end = 3074691072, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.801892625 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3074691072, end = 3074695168, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.801894694 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3074695168, end = 3074703360, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.801896621 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3074703360, end = 3074707456, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.801898579 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3074707456, end = 3074711552, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.801900643 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3074711552, end = 3076026368, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.801902712 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3076026368, end = 3076034560, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.801904645 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3076034560, end = 3076038656, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.801906615 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3076038656, end = 3076055040, flags = 1048691, pgoff = 3076038656, inode = 0 }
+vm_state.vm_map: 13589.801908747 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3076055040, end = 3076169728, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.801910686 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3076169728, end = 3076173824, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.801913131 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3076173824, end = 3076321280, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.801915064 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3076321280, end = 3076325376, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.801916998 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3076325376, end = 3076329472, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.801919135 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3076329472, end = 3076358144, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.801921081 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3076358144, end = 3076362240, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.801923014 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3076362240, end = 3076366336, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.801925071 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3076366336, end = 3076452352, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.801926999 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3076452352, end = 3076456448, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.801929148 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3076456448, end = 3076460544, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.801931118 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3076460544, end = 3076468736, flags = 1048691, pgoff = 3076460544, inode = 0 }
+vm_state.vm_map: 13589.801933218 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3076468736, end = 3076554752, flags = 134217845, pgoff = 0, inode = 18950 }
+vm_state.vm_map: 13589.801935237 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3076554752, end = 3076558848, flags = 135266419, pgoff = 86016, inode = 18950 }
+vm_state.vm_map: 13589.801937325 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3076558848, end = 3076612096, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 13589.801939253 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3076612096, end = 3076616192, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 13589.801941192 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3076616192, end = 3076620288, flags = 1048691, pgoff = 3076616192, inode = 0 }
+vm_state.vm_map: 13589.801943384 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3076620288, end = 3076939776, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 13589.801945656 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3076939776, end = 3076956160, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 13589.801947713 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3076956160, end = 3078107136, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.801949654 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3078107136, end = 3078123520, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.801951612 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3078184960, end = 3078189056, flags = 1048695, pgoff = 3078184960, inode = 0 }
+vm_state.vm_map: 13589.801953822 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3078189056, end = 3078217728, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.801955755 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3078217728, end = 3078225920, flags = 1048691, pgoff = 3078217728, inode = 0 }
+vm_state.vm_map: 13589.801957874 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3078225920, end = 3078230016, flags = 67371125, pgoff = 3078225920, inode = 0 }
+vm_state.vm_map: 13589.801959999 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3078230016, end = 3078344704, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.801961938 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3078344704, end = 3078348800, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.801963927 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3078348800, end = 3078352896, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.801965867 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2113, start = 3218173952, end = 3218259968, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.801968367 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3073015808, end = 3073024000, flags = 1048691, pgoff = 3073015808, inode = 0 }
+vm_state.vm_map: 13589.801970430 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3073024000, end = 3073110016, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.801972364 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3073110016, end = 3073114112, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.801974303 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3073114112, end = 3073118208, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.801976249 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3073118208, end = 3073126400, flags = 1048691, pgoff = 3073118208, inode = 0 }
+vm_state.vm_map: 13589.801978736 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3073126400, end = 3073134592, flags = 134217845, pgoff = 0, inode = 500018 }
+vm_state.vm_map: 13589.801980769 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3073134592, end = 3073138688, flags = 135266419, pgoff = 4096, inode = 500018 }
+vm_state.vm_map: 13589.801982814 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3073138688, end = 3073142784, flags = 1048691, pgoff = 3073138688, inode = 0 }
+vm_state.vm_map: 13589.801985055 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3073142784, end = 3073167360, flags = 134217845, pgoff = 0, inode = 18679 }
+vm_state.vm_map: 13589.801987056 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3073167360, end = 3073171456, flags = 135266419, pgoff = 20480, inode = 18679 }
+vm_state.vm_map: 13589.801989223 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3073171456, end = 3073179648, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.801991188 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3073179648, end = 3073183744, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.801993128 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3073183744, end = 3073187840, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.801995172 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3073187840, end = 3074502656, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.801997143 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3074502656, end = 3074510848, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.801999212 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3074510848, end = 3074514944, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.802001152 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3074514944, end = 3074527232, flags = 1048691, pgoff = 3074514944, inode = 0 }
+vm_state.vm_map: 13589.802003233 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3074527232, end = 3074535424, flags = 134217845, pgoff = 0, inode = 499720 }
+vm_state.vm_map: 13589.802005173 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3074535424, end = 3074539520, flags = 135266419, pgoff = 4096, inode = 499720 }
+vm_state.vm_map: 13589.802007229 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3074539520, end = 3074703360, flags = 134217845, pgoff = 0, inode = 18646 }
+vm_state.vm_map: 13589.802009175 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3074703360, end = 3074707456, flags = 135266419, pgoff = 163840, inode = 18646 }
+vm_state.vm_map: 13589.802011466 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3074707456, end = 3074711552, flags = 1048691, pgoff = 3074707456, inode = 0 }
+vm_state.vm_map: 13589.802013535 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3074711552, end = 3075375104, flags = 134217845, pgoff = 0, inode = 18913 }
+vm_state.vm_map: 13589.802015475 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3075375104, end = 3075399680, flags = 135266419, pgoff = 659456, inode = 18913 }
+vm_state.vm_map: 13589.802017599 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3075399680, end = 3075563520, flags = 134217845, pgoff = 0, inode = 18977 }
+vm_state.vm_map: 13589.802019540 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3075563520, end = 3075567616, flags = 135266419, pgoff = 163840, inode = 18977 }
+vm_state.vm_map: 13589.802021615 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3075567616, end = 3075604480, flags = 134217845, pgoff = 0, inode = 508755 }
+vm_state.vm_map: 13589.802023714 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3075604480, end = 3075608576, flags = 135266417, pgoff = 32768, inode = 508755 }
+vm_state.vm_map: 13589.802025654 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3075608576, end = 3075612672, flags = 135266419, pgoff = 36864, inode = 508755 }
+vm_state.vm_map: 13589.802027593 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3075612672, end = 3075772416, flags = 1048691, pgoff = 3075612672, inode = 0 }
+vm_state.vm_map: 13589.802029805 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3075772416, end = 3075850240, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.802031743 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3075850240, end = 3075854336, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.802033801 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3075854336, end = 3075858432, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.802035728 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3075858432, end = 3075866624, flags = 1048691, pgoff = 3075858432, inode = 0 }
+vm_state.vm_map: 13589.802037797 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3075866624, end = 3075948544, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.802039860 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3075948544, end = 3075952640, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.802041936 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3075952640, end = 3075960832, flags = 134217845, pgoff = 0, inode = 508751 }
+vm_state.vm_map: 13589.802044263 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3075960832, end = 3075964928, flags = 135266417, pgoff = 4096, inode = 508751 }
+vm_state.vm_map: 13589.802046258 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3075964928, end = 3075969024, flags = 135266419, pgoff = 8192, inode = 508751 }
+vm_state.vm_map: 13589.802048321 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3075969024, end = 3075973120, flags = 1048691, pgoff = 3075969024, inode = 0 }
+vm_state.vm_map: 13589.802050372 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3075973120, end = 3077275648, flags = 134217845, pgoff = 0, inode = 33850 }
+vm_state.vm_map: 13589.802052323 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3077275648, end = 3077369856, flags = 135266419, pgoff = 1302528, inode = 33850 }
+vm_state.vm_map: 13589.802054263 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3077369856, end = 3077382144, flags = 1048691, pgoff = 3077369856, inode = 0 }
+vm_state.vm_map: 13589.802056425 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3077382144, end = 3077451776, flags = 134217845, pgoff = 0, inode = 508763 }
+vm_state.vm_map: 13589.802058346 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3077451776, end = 3077455872, flags = 135266417, pgoff = 65536, inode = 508763 }
+vm_state.vm_map: 13589.802060459 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3077455872, end = 3077459968, flags = 135266419, pgoff = 69632, inode = 508763 }
+vm_state.vm_map: 13589.802062466 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3077459968, end = 3077468160, flags = 1048691, pgoff = 3077459968, inode = 0 }
+vm_state.vm_map: 13589.802064566 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3077562368, end = 3077570560, flags = 1048691, pgoff = 3077562368, inode = 0 }
+vm_state.vm_map: 13589.802066499 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3077570560, end = 3077574656, flags = 67371125, pgoff = 3077570560, inode = 0 }
+vm_state.vm_map: 13589.802068679 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3077574656, end = 3077689344, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.802070618 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3077689344, end = 3077693440, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.802072675 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3077693440, end = 3077697536, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.802075145 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3077697536, end = 3077779456, flags = 134223989, pgoff = 0, inode = 22404 }
+vm_state.vm_map: 13589.802077552 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3077779456, end = 3077783552, flags = 135272563, pgoff = 81920, inode = 22404 }
+vm_state.vm_map: 13589.802079493 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3077783552, end = 3077791744, flags = 1048691, pgoff = 3077783552, inode = 0 }
+vm_state.vm_map: 13589.802081463 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3109511168, end = 3109646336, flags = 1048691, pgoff = 3109511168, inode = 0 }
+vm_state.vm_map: 13589.802083384 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2118, start = 3217588224, end = 3217674240, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.802085964 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 134512640, end = 134533120, flags = 134223989, pgoff = 0, inode = 20943 }
+vm_state.vm_map: 13589.802088058 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 134533120, end = 134537216, flags = 135272563, pgoff = 16384, inode = 20943 }
+vm_state.vm_map: 13589.802090305 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 136941568, end = 137076736, flags = 1048691, pgoff = 136941568, inode = 0 }
+vm_state.vm_map: 13589.802092393 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3076067328, end = 3076108288, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.802094493 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3076108288, end = 3076112384, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.802096716 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3076112384, end = 3076116480, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.802098957 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3076116480, end = 3076153344, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.802101124 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3076153344, end = 3076157440, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.802103237 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3076157440, end = 3076161536, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.802105645 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3076161536, end = 3076239360, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.802107738 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3076239360, end = 3076243456, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.802109685 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3076243456, end = 3076247552, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.802112080 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3076247552, end = 3076255744, flags = 1048691, pgoff = 3076247552, inode = 0 }
+vm_state.vm_map: 13589.802128090 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3076255744, end = 3076280320, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.802130584 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3076280320, end = 3076284416, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.802132580 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3076284416, end = 3076288512, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.802134852 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3076288512, end = 3076296704, flags = 1048691, pgoff = 3076288512, inode = 0 }
+vm_state.vm_map: 13589.802137050 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3076296704, end = 3076313088, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.802139131 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3076313088, end = 3076317184, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.802141403 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3076317184, end = 3076325376, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.802143448 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3076325376, end = 3076329472, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.802145683 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3076329472, end = 3076337664, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.802147943 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3076337664, end = 3076341760, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.802149938 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3076341760, end = 3076345856, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.802152222 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3076345856, end = 3076444160, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.802154286 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3076444160, end = 3076448256, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.802156595 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3076448256, end = 3077763072, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.802158565 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3077763072, end = 3077771264, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.802161084 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3077771264, end = 3077775360, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.802163258 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3077775360, end = 3077791744, flags = 1048691, pgoff = 3077775360, inode = 0 }
+vm_state.vm_map: 13589.802165469 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3077791744, end = 3077877760, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.802167427 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3077877760, end = 3077881856, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.802169748 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3077881856, end = 3077885952, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.802171787 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3077885952, end = 3077894144, flags = 1048691, pgoff = 3077885952, inode = 0 }
+vm_state.vm_map: 13589.802174010 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3077894144, end = 3079045120, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.802176214 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3079045120, end = 3079061504, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.802178258 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3079155712, end = 3079163904, flags = 1048691, pgoff = 3079155712, inode = 0 }
+vm_state.vm_map: 13589.802180278 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3079163904, end = 3079168000, flags = 67371125, pgoff = 3079163904, inode = 0 }
+vm_state.vm_map: 13589.802182649 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3079168000, end = 3079282688, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.802184700 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3079282688, end = 3079286784, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.802186720 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3079286784, end = 3079290880, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.802189029 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2124, start = 3213328384, end = 3213414400, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.802191670 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3075633152, end = 3075674112, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.802193979 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3075674112, end = 3075678208, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.802196289 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3075678208, end = 3075682304, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.802198666 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3075682304, end = 3075719168, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.802200845 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3075719168, end = 3075723264, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.802202897 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3075723264, end = 3075727360, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.802205076 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3075727360, end = 3075805184, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.802207127 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3075805184, end = 3075809280, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.802209190 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3075809280, end = 3075813376, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.802211240 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3075813376, end = 3075821568, flags = 1048691, pgoff = 3075813376, inode = 0 }
+vm_state.vm_map: 13589.802213327 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3075821568, end = 3075846144, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.802215539 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3075846144, end = 3075850240, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.802217497 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3075850240, end = 3075854336, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.802219670 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3075854336, end = 3075862528, flags = 1048691, pgoff = 3075854336, inode = 0 }
+vm_state.vm_map: 13589.802221831 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3075862528, end = 3075870720, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.802224148 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3075870720, end = 3075874816, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.802226143 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3075874816, end = 3075878912, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.802228254 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3075878912, end = 3077193728, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.802230767 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3077193728, end = 3077201920, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.802232842 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3077201920, end = 3077206016, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.802235003 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3077206016, end = 3077218304, flags = 1048691, pgoff = 3077206016, inode = 0 }
+vm_state.vm_map: 13589.802237085 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3077218304, end = 3077246976, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.802242412 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3077246976, end = 3077251072, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.802244456 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3077251072, end = 3077255168, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.802246648 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3077255168, end = 3077341184, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.802248686 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3077341184, end = 3077345280, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.802250718 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3077345280, end = 3077349376, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.802252873 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3077349376, end = 3077361664, flags = 1048691, pgoff = 3077349376, inode = 0 }
+vm_state.vm_map: 13589.802255085 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3077361664, end = 3077459968, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 13589.802257117 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3077459968, end = 3077464064, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 13589.802259253 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3077464064, end = 3077468160, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 13589.802261439 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3077468160, end = 3077615616, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.802263478 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3077615616, end = 3077623808, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.802265812 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3077718016, end = 3077726208, flags = 1048691, pgoff = 3077718016, inode = 0 }
+vm_state.vm_map: 13589.802268145 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3077726208, end = 3077730304, flags = 67371125, pgoff = 3077726208, inode = 0 }
+vm_state.vm_map: 13589.802270300 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3077730304, end = 3077844992, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.802272339 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3077844992, end = 3077849088, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.802274444 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3077849088, end = 3077853184, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.802276754 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3077853184, end = 3078144000, flags = 134223989, pgoff = 0, inode = 20940 }
+vm_state.vm_map: 13589.802278792 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3078144000, end = 3078148096, flags = 135272561, pgoff = 286720, inode = 20940 }
+vm_state.vm_map: 13589.802280941 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3078148096, end = 3078152192, flags = 135272563, pgoff = 290816, inode = 20940 }
+vm_state.vm_map: 13589.802282985 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3109183488, end = 3109588992, flags = 1048691, pgoff = 3109183488, inode = 0 }
+vm_state.vm_map: 13589.802285023 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2128, start = 3219087360, end = 3219173376, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.802290535 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 134512640, end = 134553600, flags = 134223989, pgoff = 0, inode = 20759 }
+vm_state.vm_map: 13589.802292709 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 134553600, end = 134557696, flags = 135272563, pgoff = 36864, inode = 20759 }
+vm_state.vm_map: 13589.802294716 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 134557696, end = 134565888, flags = 1048691, pgoff = 134557696, inode = 0 }
+vm_state.vm_map: 13589.802296891 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 145301504, end = 145858560, flags = 1048691, pgoff = 145301504, inode = 0 }
+vm_state.vm_map: 13589.802301866 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3023667200, end = 3023904768, flags = 1048691, pgoff = 3023904768, inode = 0 }
+vm_state.vm_map: 13589.802306608 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3024576512, end = 3024609280, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 13589.802308658 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3024609280, end = 3024613376, flags = 135266419, pgoff = 32768, inode = 20716 }
+vm_state.vm_map: 13589.802313344 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3024613376, end = 3025133568, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 13589.802315382 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3025133568, end = 3025141760, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 13589.802317926 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3025141760, end = 3025506304, flags = 134217845, pgoff = 0, inode = 1065038 }
+vm_state.vm_map: 13589.802319915 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3025506304, end = 3025543168, flags = 135266423, pgoff = 364544, inode = 1065038 }
+vm_state.vm_map: 13589.802322063 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3025543168, end = 3025547264, flags = 1048695, pgoff = 3025543168, inode = 0 }
+vm_state.vm_map: 13589.802324563 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3025547264, end = 3026100224, flags = 134217845, pgoff = 0, inode = 18947 }
+vm_state.vm_map: 13589.802326738 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3026100224, end = 3026120704, flags = 135266419, pgoff = 548864, inode = 18947 }
+vm_state.vm_map: 13589.802331251 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3026120704, end = 3026436096, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 13589.802333296 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3026436096, end = 3026444288, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 13589.802335698 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3026444288, end = 3026513920, flags = 134217845, pgoff = 0, inode = 1065123 }
+vm_state.vm_map: 13589.802338087 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3026513920, end = 3026518016, flags = 135266419, pgoff = 69632, inode = 1065123 }
+vm_state.vm_map: 13589.802340562 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3026518016, end = 3041013760, flags = 134217845, pgoff = 0, inode = 20672 }
+vm_state.vm_map: 13589.802342538 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3041013760, end = 3041628160, flags = 135266419, pgoff = 14495744, inode = 20672 }
+vm_state.vm_map: 13589.802344755 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3041628160, end = 3041636352, flags = 1048691, pgoff = 3041628160, inode = 0 }
+vm_state.vm_map: 13589.802347342 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3041636352, end = 3042009088, flags = 134217845, pgoff = 0, inode = 20902 }
+vm_state.vm_map: 13589.802349380 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3042009088, end = 3042021376, flags = 135266419, pgoff = 368640, inode = 20902 }
+vm_state.vm_map: 13589.802351603 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3042115584, end = 3044098048, flags = 134217845, pgoff = 0, inode = 20915 }
+vm_state.vm_map: 13589.802353770 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3044098048, end = 3044139008, flags = 135266419, pgoff = 1978368, inode = 20915 }
+vm_state.vm_map: 13589.802356111 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3044139008, end = 3045470208, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.802358155 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3045470208, end = 3045486592, flags = 1048691, pgoff = 3045470208, inode = 0 }
+vm_state.vm_map: 13589.802360298 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3045486592, end = 3045634048, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.802362398 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3045634048, end = 3045642240, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.802364590 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3045642240, end = 3045961728, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 13589.802366832 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3045961728, end = 3045978112, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 13589.802369215 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3045978112, end = 3045990400, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 13589.802371277 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3045990400, end = 3045994496, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 13589.802378649 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3045994496, end = 3047251968, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 13589.802380693 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3047251968, end = 3047272448, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 13589.802382737 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3047272448, end = 3047280640, flags = 1048691, pgoff = 3047272448, inode = 0 }
+vm_state.vm_map: 13589.802385157 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3047280640, end = 3047518208, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 13589.802387122 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3047518208, end = 3047522304, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 13589.802389413 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3047522304, end = 3047538688, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.802391482 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3047538688, end = 3047542784, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.802393822 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3047542784, end = 3047550976, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.802395853 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3047550976, end = 3047555072, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.802398040 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3047555072, end = 3047747584, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.802400127 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3047747584, end = 3047751680, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.802402486 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3047751680, end = 3047804928, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 13589.802404562 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3047804928, end = 3047809024, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 13589.802406605 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3047809024, end = 3047813120, flags = 1048691, pgoff = 3047809024, inode = 0 }
+vm_state.vm_map: 13589.802411735 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3047813120, end = 3047985152, flags = 134217845, pgoff = 0, inode = 1065255 }
+vm_state.vm_map: 13589.802413804 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3047985152, end = 3047989248, flags = 135266419, pgoff = 172032, inode = 1065255 }
+vm_state.vm_map: 13589.802416212 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3047989248, end = 3048235008, flags = 134217845, pgoff = 0, inode = 20603 }
+vm_state.vm_map: 13589.802418244 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3048235008, end = 3048239104, flags = 135266419, pgoff = 245760, inode = 20603 }
+vm_state.vm_map: 13589.802420627 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3048239104, end = 3048710144, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 13589.802425122 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3048710144, end = 3048726528, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 13589.802427561 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3048726528, end = 3048869888, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 13589.802429772 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3048869888, end = 3048873984, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 13589.802432130 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3048873984, end = 3048960000, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 13589.802434223 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3048960000, end = 3048964096, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 13589.802436360 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3048964096, end = 3048968192, flags = 1048691, pgoff = 3048964096, inode = 0 }
+vm_state.vm_map: 13589.802438547 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3048968192, end = 3048984576, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 13589.802440511 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3048984576, end = 3048988672, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 13589.802442789 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3048988672, end = 3049021440, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 13589.802445227 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3049021440, end = 3049025536, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 13589.802449877 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3049025536, end = 3049041920, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 13589.802451915 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3049041920, end = 3049046016, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 13589.802454274 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3049046016, end = 3049132032, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 13589.802456318 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3049132032, end = 3049136128, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 13589.802458357 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3049136128, end = 3049144320, flags = 1048691, pgoff = 3049136128, inode = 0 }
+vm_state.vm_map: 13589.802460567 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3049144320, end = 3049172992, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 13589.802462728 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3049172992, end = 3049177088, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 13589.802464717 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3049177088, end = 3049181184, flags = 1048691, pgoff = 3049177088, inode = 0 }
+vm_state.vm_map: 13589.802467243 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3049181184, end = 3049512960, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 13589.802469188 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3049512960, end = 3049521152, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 13589.802471497 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3049521152, end = 3049553920, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 13589.802473658 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3049553920, end = 3049558016, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 13589.802481239 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3049558016, end = 3049574400, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 13589.802483271 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3049574400, end = 3049578496, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 13589.802485912 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3049578496, end = 3049603072, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 13589.802487895 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3049603072, end = 3049607168, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 13589.802490439 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3049607168, end = 3049639936, flags = 134217845, pgoff = 0, inode = 18621 }
+vm_state.vm_map: 13589.802492520 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3049639936, end = 3049644032, flags = 135266419, pgoff = 28672, inode = 18621 }
+vm_state.vm_map: 13589.802494811 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3049644032, end = 3049648128, flags = 1048691, pgoff = 3049644032, inode = 0 }
+vm_state.vm_map: 13589.802499331 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3049648128, end = 3050078208, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 13589.802501369 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3050078208, end = 3050106880, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 13589.802503561 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3050106880, end = 3050110976, flags = 1048691, pgoff = 3050106880, inode = 0 }
+vm_state.vm_map: 13589.802506147 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3050110976, end = 3050553344, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 13589.802508106 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3050553344, end = 3050561536, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 13589.802510569 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3050561536, end = 3050659840, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.802512601 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3050659840, end = 3050663936, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.802517496 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3050663936, end = 3050934272, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 13589.802519689 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3050934272, end = 3050942464, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 13589.802522398 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3050942464, end = 3051003904, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 13589.802524430 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3051003904, end = 3051008000, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 13589.802526591 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3051008000, end = 3051012096, flags = 1048691, pgoff = 3051008000, inode = 0 }
+vm_state.vm_map: 13589.802528980 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3051012096, end = 3051479040, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 13589.802531149 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3051479040, end = 3051487232, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 13589.802533575 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3051487232, end = 3052617728, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 13589.802535958 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3052617728, end = 3052634112, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 13589.802538212 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3052634112, end = 3052748800, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.802542602 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3052748800, end = 3052752896, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.802544794 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3052752896, end = 3052900352, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.802547029 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3052900352, end = 3052904448, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.802549069 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3052904448, end = 3052908544, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.802551217 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3052908544, end = 3052916736, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.802554007 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3052916736, end = 3052920832, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.802555984 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3052920832, end = 3052924928, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.802558152 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3052924928, end = 3052929024, flags = 1048691, pgoff = 3052924928, inode = 0 }
+vm_state.vm_map: 13589.802560325 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3052929024, end = 3053015040, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.802562363 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3053015040, end = 3053019136, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.802564358 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3053019136, end = 3053023232, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.802566452 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3053023232, end = 3053031424, flags = 1048691, pgoff = 3053023232, inode = 0 }
+vm_state.vm_map: 13589.802568959 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3053031424, end = 3053776896, flags = 134217845, pgoff = 0, inode = 499794 }
+vm_state.vm_map: 13589.802570990 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3053776896, end = 3053780992, flags = 135266419, pgoff = 745472, inode = 499794 }
+vm_state.vm_map: 13589.802573127 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3053780992, end = 3053809664, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.802575393 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3053809664, end = 3053813760, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.802577431 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3053813760, end = 3053817856, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.802579981 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3053817856, end = 3053834240, flags = 134217845, pgoff = 0, inode = 20149 }
+vm_state.vm_map: 13589.802582185 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3053834240, end = 3053838336, flags = 135266419, pgoff = 12288, inode = 20149 }
+vm_state.vm_map: 13589.802584433 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3053838336, end = 3053920256, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.802586495 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3053920256, end = 3053924352, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.802589126 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3053924352, end = 3055239168, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.802591305 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3055239168, end = 3055247360, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.802593288 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3055247360, end = 3055251456, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.802595695 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3055251456, end = 3055267840, flags = 1048691, pgoff = 3055251456, inode = 0 }
+vm_state.vm_map: 13589.802598159 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3055267840, end = 3056205824, flags = 134217845, pgoff = 0, inode = 16850 }
+vm_state.vm_map: 13589.802600190 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3056205824, end = 3056222208, flags = 135266417, pgoff = 937984, inode = 16850 }
+vm_state.vm_map: 13589.802602371 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3056222208, end = 3056226304, flags = 135266419, pgoff = 954368, inode = 16850 }
+vm_state.vm_map: 13589.802604575 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3056226304, end = 3056254976, flags = 1048691, pgoff = 3056226304, inode = 0 }
+vm_state.vm_map: 13589.802606878 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3056254976, end = 3066294272, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 13589.802609083 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3066294272, end = 3066454016, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 13589.802611238 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3066454016, end = 3066462208, flags = 1048691, pgoff = 3066454016, inode = 0 }
+vm_state.vm_map: 13589.802613664 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3066462208, end = 3070058496, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 13589.802615702 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3070058496, end = 3070156800, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 13589.802617913 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3070156800, end = 3070160896, flags = 1048691, pgoff = 3070156800, inode = 0 }
+vm_state.vm_map: 13589.802620229 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3070160896, end = 3072716800, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 13589.802622218 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3072716800, end = 3072765952, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 13589.802624804 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3072765952, end = 3072770048, flags = 1048691, pgoff = 3072765952, inode = 0 }
+vm_state.vm_map: 13589.802626977 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3072770048, end = 3073921024, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.802629029 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3073921024, end = 3073937408, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.802633832 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3073937408, end = 3074170880, flags = 134217845, pgoff = 0, inode = 1065180 }
+vm_state.vm_map: 13589.802635870 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3074170880, end = 3074179072, flags = 135266419, pgoff = 233472, inode = 1065180 }
+vm_state.vm_map: 13589.802637908 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3074179072, end = 3074183168, flags = 1048691, pgoff = 3074179072, inode = 0 }
+vm_state.vm_map: 13589.802640365 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3074183168, end = 3076485120, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 13589.802642582 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3076485120, end = 3076530176, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 13589.802644903 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3076530176, end = 3078840320, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 13589.802647071 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3078840320, end = 3078868992, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 13589.802649190 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3078868992, end = 3078873088, flags = 1048691, pgoff = 3078868992, inode = 0 }
+vm_state.vm_map: 13589.802654005 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3078889472, end = 3078897664, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 13589.802656049 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3078897664, end = 3078901760, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 13589.802658611 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3078901760, end = 3078918144, flags = 134217845, pgoff = 0, inode = 22094 }
+vm_state.vm_map: 13589.802660933 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3078918144, end = 3078922240, flags = 135266419, pgoff = 12288, inode = 22094 }
+vm_state.vm_map: 13589.802668100 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3078922240, end = 3078930432, flags = 134217845, pgoff = 0, inode = 1450546 }
+vm_state.vm_map: 13589.802670144 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3078930432, end = 3078934528, flags = 135266417, pgoff = 4096, inode = 1450546 }
+vm_state.vm_map: 13589.802672152 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3078934528, end = 3078938624, flags = 135266419, pgoff = 8192, inode = 1450546 }
+vm_state.vm_map: 13589.802674560 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3078938624, end = 3078967296, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.802676703 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3078967296, end = 3078975488, flags = 1048691, pgoff = 3078967296, inode = 0 }
+vm_state.vm_map: 13589.802678654 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3078975488, end = 3078979584, flags = 67371125, pgoff = 3078975488, inode = 0 }
+vm_state.vm_map: 13589.802680749 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3078979584, end = 3079094272, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.802682848 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3079094272, end = 3079098368, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.802684825 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3079098368, end = 3079102464, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.802686863 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2174, start = 3214217216, end = 3214303232, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.802689240 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 134512640, end = 134553600, flags = 134223989, pgoff = 0, inode = 20759 }
+vm_state.vm_map: 13589.802691310 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 134553600, end = 134557696, flags = 135272563, pgoff = 36864, inode = 20759 }
+vm_state.vm_map: 13589.802693292 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 134557696, end = 134565888, flags = 1048691, pgoff = 134557696, inode = 0 }
+vm_state.vm_map: 13589.802695632 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 145301504, end = 146120704, flags = 1048691, pgoff = 145301504, inode = 0 }
+vm_state.vm_map: 13589.802702018 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3022204928, end = 3024248832, flags = 134217937, pgoff = 0, inode = 1204686 }
+vm_state.vm_map: 13589.802704327 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3024248832, end = 3024474112, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.802706365 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3024474112, end = 3024478208, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.802708379 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3024478208, end = 3024482304, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.802710547 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3024576512, end = 3024609280, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 13589.802712585 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3024609280, end = 3024613376, flags = 135266419, pgoff = 32768, inode = 20716 }
+vm_state.vm_map: 13589.802714635 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3024613376, end = 3025133568, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 13589.802716667 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3025133568, end = 3025141760, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 13589.802718767 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3025141760, end = 3025506304, flags = 134217845, pgoff = 0, inode = 1065038 }
+vm_state.vm_map: 13589.802720714 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3025506304, end = 3025543168, flags = 135266423, pgoff = 364544, inode = 1065038 }
+vm_state.vm_map: 13589.802725442 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3025543168, end = 3025547264, flags = 1048695, pgoff = 3025543168, inode = 0 }
+vm_state.vm_map: 13589.802727505 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3025547264, end = 3026100224, flags = 134217845, pgoff = 0, inode = 18947 }
+vm_state.vm_map: 13589.802729803 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3026100224, end = 3026120704, flags = 135266419, pgoff = 548864, inode = 18947 }
+vm_state.vm_map: 13589.802732130 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3026120704, end = 3026436096, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 13589.802734070 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3026436096, end = 3026444288, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 13589.802736114 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3026444288, end = 3026513920, flags = 134217845, pgoff = 0, inode = 1065123 }
+vm_state.vm_map: 13589.802738054 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3026513920, end = 3026518016, flags = 135266419, pgoff = 69632, inode = 1065123 }
+vm_state.vm_map: 13589.802740000 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3026518016, end = 3041013760, flags = 134217845, pgoff = 0, inode = 20672 }
+vm_state.vm_map: 13589.802742044 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3041013760, end = 3041628160, flags = 135266419, pgoff = 14495744, inode = 20672 }
+vm_state.vm_map: 13589.802743990 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3041628160, end = 3041636352, flags = 1048691, pgoff = 3041628160, inode = 0 }
+vm_state.vm_map: 13589.802745948 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3041636352, end = 3042009088, flags = 134217845, pgoff = 0, inode = 20902 }
+vm_state.vm_map: 13589.802747894 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3042009088, end = 3042021376, flags = 135266419, pgoff = 368640, inode = 20902 }
+vm_state.vm_map: 13589.802750295 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3042041856, end = 3042111488, flags = 134217845, pgoff = 0, inode = 20910 }
+vm_state.vm_map: 13589.802752242 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3042111488, end = 3042115584, flags = 135266419, pgoff = 65536, inode = 20910 }
+vm_state.vm_map: 13589.802754317 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3042115584, end = 3044098048, flags = 134217845, pgoff = 0, inode = 20915 }
+vm_state.vm_map: 13589.802756269 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3044098048, end = 3044139008, flags = 135266419, pgoff = 1978368, inode = 20915 }
+vm_state.vm_map: 13589.802758239 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3044139008, end = 3045470208, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.802760407 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3045470208, end = 3045486592, flags = 1048691, pgoff = 3045470208, inode = 0 }
+vm_state.vm_map: 13589.802762402 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3045486592, end = 3045634048, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.802764681 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3045634048, end = 3045642240, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.802766749 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3045642240, end = 3045961728, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 13589.802768689 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3045961728, end = 3045978112, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 13589.802770654 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3045978112, end = 3045990400, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 13589.802772705 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3045990400, end = 3045994496, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 13589.802774663 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3045994496, end = 3047251968, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 13589.802776658 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3047251968, end = 3047272448, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 13589.802778757 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3047272448, end = 3047280640, flags = 1048691, pgoff = 3047272448, inode = 0 }
+vm_state.vm_map: 13589.802780715 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3047280640, end = 3047518208, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 13589.802782650 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3047518208, end = 3047522304, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 13589.802784700 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3047522304, end = 3047538688, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.802786750 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3047538688, end = 3047542784, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.802788714 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3047542784, end = 3047550976, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.802790654 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3047550976, end = 3047555072, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.802792681 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3047555072, end = 3047747584, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.802794645 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3047747584, end = 3047751680, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.802796954 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3047751680, end = 3047804928, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 13589.802799097 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3047804928, end = 3047809024, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 13589.802801036 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3047809024, end = 3047813120, flags = 1048691, pgoff = 3047809024, inode = 0 }
+vm_state.vm_map: 13589.802803001 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3047813120, end = 3047985152, flags = 134217845, pgoff = 0, inode = 1065255 }
+vm_state.vm_map: 13589.802805039 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3047985152, end = 3047989248, flags = 135266419, pgoff = 172032, inode = 1065255 }
+vm_state.vm_map: 13589.802807016 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3047989248, end = 3048235008, flags = 134217845, pgoff = 0, inode = 20603 }
+vm_state.vm_map: 13589.802808949 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3048235008, end = 3048239104, flags = 135266419, pgoff = 245760, inode = 20603 }
+vm_state.vm_map: 13589.802811000 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3048239104, end = 3048710144, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 13589.802812940 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3048710144, end = 3048726528, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 13589.802814904 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3048726528, end = 3048869888, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 13589.802816850 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3048869888, end = 3048873984, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 13589.802818925 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3048873984, end = 3048960000, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 13589.802820877 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3048960000, end = 3048964096, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 13589.802825151 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3048964096, end = 3048968192, flags = 1048691, pgoff = 3048964096, inode = 0 }
+vm_state.vm_map: 13589.802827115 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3048968192, end = 3048984576, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 13589.802829529 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3048984576, end = 3048988672, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 13589.802831481 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3048988672, end = 3049021440, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 13589.802833428 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3049021440, end = 3049025536, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 13589.802835478 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3049025536, end = 3049041920, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 13589.802837417 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3049041920, end = 3049046016, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 13589.802839375 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3049046016, end = 3049132032, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 13589.802841426 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3049132032, end = 3049136128, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 13589.802843366 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3049136128, end = 3049144320, flags = 1048691, pgoff = 3049136128, inode = 0 }
+vm_state.vm_map: 13589.802845318 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3049144320, end = 3049172992, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 13589.802847387 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3049172992, end = 3049177088, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 13589.802849444 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3049177088, end = 3049181184, flags = 1048691, pgoff = 3049177088, inode = 0 }
+vm_state.vm_map: 13589.802851395 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3049181184, end = 3049512960, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 13589.802853336 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3049512960, end = 3049521152, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 13589.802855429 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3049521152, end = 3049553920, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 13589.802857369 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3049553920, end = 3049558016, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 13589.802859321 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3049558016, end = 3049574400, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 13589.802861821 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3049574400, end = 3049578496, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 13589.802863884 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3049578496, end = 3049603072, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 13589.802865922 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3049603072, end = 3049607168, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 13589.802868065 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3049607168, end = 3049639936, flags = 134217845, pgoff = 0, inode = 18621 }
+vm_state.vm_map: 13589.802870017 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3049639936, end = 3049644032, flags = 135266419, pgoff = 28672, inode = 18621 }
+vm_state.vm_map: 13589.802871964 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3049644032, end = 3049648128, flags = 1048691, pgoff = 3049644032, inode = 0 }
+vm_state.vm_map: 13589.802874045 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3049648128, end = 3050078208, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 13589.802876046 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3050078208, end = 3050106880, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 13589.802877992 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3050106880, end = 3050110976, flags = 1048691, pgoff = 3050106880, inode = 0 }
+vm_state.vm_map: 13589.802880048 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3050110976, end = 3050553344, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 13589.802882093 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3050553344, end = 3050561536, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 13589.802884064 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3050561536, end = 3050659840, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.802886016 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3050659840, end = 3050663936, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.802888078 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3050663936, end = 3050934272, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 13589.802890024 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3050934272, end = 3050942464, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 13589.802891995 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3050942464, end = 3051003904, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 13589.802894409 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3051003904, end = 3051008000, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 13589.802896355 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3051008000, end = 3051012096, flags = 1048691, pgoff = 3051008000, inode = 0 }
+vm_state.vm_map: 13589.802898313 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3051012096, end = 3051479040, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 13589.802900363 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3051479040, end = 3051487232, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 13589.802902444 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3051487232, end = 3052617728, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 13589.802904391 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3052617728, end = 3052634112, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 13589.802906478 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3052634112, end = 3052748800, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.802908418 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3052748800, end = 3052752896, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.802910388 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3052752896, end = 3052900352, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.802912383 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3052900352, end = 3052904448, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.802914484 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3052904448, end = 3052908544, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.802916454 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3052908544, end = 3052916736, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.802920887 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3052916736, end = 3052920832, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.802922902 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3052920832, end = 3052924928, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.802924946 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3052924928, end = 3052929024, flags = 1048691, pgoff = 3052924928, inode = 0 }
+vm_state.vm_map: 13589.802927273 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3052929024, end = 3053015040, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.802929293 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3053015040, end = 3053019136, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.802931399 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3053019136, end = 3053023232, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.802933351 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3053023232, end = 3053031424, flags = 1048691, pgoff = 3053023232, inode = 0 }
+vm_state.vm_map: 13589.802935310 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3053031424, end = 3053776896, flags = 134217845, pgoff = 0, inode = 499794 }
+vm_state.vm_map: 13589.802937342 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3053776896, end = 3053780992, flags = 135266419, pgoff = 745472, inode = 499794 }
+vm_state.vm_map: 13589.802939312 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3053780992, end = 3053809664, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.802941271 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3053809664, end = 3053813760, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.802943321 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3053813760, end = 3053817856, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.802945403 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3053817856, end = 3053834240, flags = 134217845, pgoff = 0, inode = 20149 }
+vm_state.vm_map: 13589.802947410 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3053834240, end = 3053838336, flags = 135266419, pgoff = 12288, inode = 20149 }
+vm_state.vm_map: 13589.802949429 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3053838336, end = 3053920256, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.802951480 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3053920256, end = 3053924352, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.802953450 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3053924352, end = 3055239168, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.802955403 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3055239168, end = 3055247360, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.802957453 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3055247360, end = 3055251456, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.802959744 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3055251456, end = 3055267840, flags = 1048691, pgoff = 3055251456, inode = 0 }
+vm_state.vm_map: 13589.802961726 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3055267840, end = 3056205824, flags = 134217845, pgoff = 0, inode = 16850 }
+vm_state.vm_map: 13589.802963778 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3056205824, end = 3056222208, flags = 135266417, pgoff = 937984, inode = 16850 }
+vm_state.vm_map: 13589.802965724 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3056222208, end = 3056226304, flags = 135266419, pgoff = 954368, inode = 16850 }
+vm_state.vm_map: 13589.802967669 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3056226304, end = 3056254976, flags = 1048691, pgoff = 3056226304, inode = 0 }
+vm_state.vm_map: 13589.802969713 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3056254976, end = 3066294272, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 13589.802971653 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3066294272, end = 3066454016, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 13589.802973600 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3066454016, end = 3066462208, flags = 1048691, pgoff = 3066454016, inode = 0 }
+vm_state.vm_map: 13589.802975650 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3066462208, end = 3070058496, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 13589.802977688 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3070058496, end = 3070156800, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 13589.802979634 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3070156800, end = 3070160896, flags = 1048691, pgoff = 3070156800, inode = 0 }
+vm_state.vm_map: 13589.802981592 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3070160896, end = 3072716800, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 13589.802983773 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3072716800, end = 3072765952, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 13589.802985717 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3072765952, end = 3072770048, flags = 1048691, pgoff = 3072765952, inode = 0 }
+vm_state.vm_map: 13589.802987689 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3072770048, end = 3073921024, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.802989727 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3073921024, end = 3073937408, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.802992036 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3073937408, end = 3074170880, flags = 134217845, pgoff = 0, inode = 1065180 }
+vm_state.vm_map: 13589.802994000 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3074170880, end = 3074179072, flags = 135266419, pgoff = 233472, inode = 1065180 }
+vm_state.vm_map: 13589.802996039 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3074179072, end = 3074183168, flags = 1048691, pgoff = 3074179072, inode = 0 }
+vm_state.vm_map: 13589.802998015 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3074183168, end = 3076485120, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 13589.802999961 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3076485120, end = 3076530176, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 13589.803001999 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3076530176, end = 3078840320, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 13589.803003946 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3078840320, end = 3078868992, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 13589.803005891 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3078868992, end = 3078873088, flags = 1048691, pgoff = 3078868992, inode = 0 }
+vm_state.vm_map: 13589.803007862 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3078889472, end = 3078897664, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 13589.803009931 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3078897664, end = 3078901760, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 13589.803011889 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3078901760, end = 3078918144, flags = 134217845, pgoff = 0, inode = 22094 }
+vm_state.vm_map: 13589.803013959 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3078918144, end = 3078922240, flags = 135266419, pgoff = 12288, inode = 22094 }
+vm_state.vm_map: 13589.803016052 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3078922240, end = 3078930432, flags = 134217845, pgoff = 0, inode = 1450546 }
+vm_state.vm_map: 13589.803018102 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3078930432, end = 3078934528, flags = 135266417, pgoff = 4096, inode = 1450546 }
+vm_state.vm_map: 13589.803020054 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3078934528, end = 3078938624, flags = 135266419, pgoff = 8192, inode = 1450546 }
+vm_state.vm_map: 13589.803022025 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3078938624, end = 3078967296, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.803024414 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3078967296, end = 3078975488, flags = 1048691, pgoff = 3078967296, inode = 0 }
+vm_state.vm_map: 13589.803026379 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3078975488, end = 3078979584, flags = 67371125, pgoff = 3078975488, inode = 0 }
+vm_state.vm_map: 13589.803028374 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3078979584, end = 3079094272, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.803030424 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3079094272, end = 3079098368, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.803032370 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3079098368, end = 3079102464, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.803034317 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2175, start = 3214217216, end = 3214303232, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.803039168 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 134512640, end = 134553600, flags = 134223989, pgoff = 0, inode = 20759 }
+vm_state.vm_map: 13589.803041114 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 134553600, end = 134557696, flags = 135272563, pgoff = 36864, inode = 20759 }
+vm_state.vm_map: 13589.803043060 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 134557696, end = 134565888, flags = 1048691, pgoff = 134557696, inode = 0 }
+vm_state.vm_map: 13589.803045117 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 145301504, end = 147283968, flags = 1048691, pgoff = 145301504, inode = 0 }
+vm_state.vm_map: 13589.803049729 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2910978048, end = 2910982144, flags = 1048688, pgoff = 2910978048, inode = 0 }
+vm_state.vm_map: 13589.803054378 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2910982144, end = 2919370752, flags = 1048691, pgoff = 2910982144, inode = 0 }
+vm_state.vm_map: 13589.803059311 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2919370752, end = 2919374848, flags = 1048688, pgoff = 2919370752, inode = 0 }
+vm_state.vm_map: 13589.803061349 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2919374848, end = 2927763456, flags = 1048691, pgoff = 2919374848, inode = 0 }
+vm_state.vm_map: 13589.803069274 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2927763456, end = 2994876416, flags = 134217979, pgoff = 0, inode = 8314 }
+vm_state.vm_map: 13589.803071805 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2994876416, end = 2994946048, flags = 134217845, pgoff = 0, inode = 508763 }
+vm_state.vm_map: 13589.803073954 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2994946048, end = 2994950144, flags = 135266417, pgoff = 65536, inode = 508763 }
+vm_state.vm_map: 13589.803076128 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2994950144, end = 2994954240, flags = 135266419, pgoff = 69632, inode = 508763 }
+vm_state.vm_map: 13589.803078167 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2994954240, end = 2994962432, flags = 1048691, pgoff = 2994954240, inode = 0 }
+vm_state.vm_map: 13589.803084213 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2994962432, end = 2994982912, flags = 134217845, pgoff = 0, inode = 21278 }
+vm_state.vm_map: 13589.803086258 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2994982912, end = 2994987008, flags = 135266419, pgoff = 16384, inode = 21278 }
+vm_state.vm_map: 13589.803088857 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2994987008, end = 2995150848, flags = 134217845, pgoff = 0, inode = 21283 }
+vm_state.vm_map: 13589.803091024 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2995150848, end = 2995154944, flags = 135266419, pgoff = 159744, inode = 21283 }
+vm_state.vm_map: 13589.803093499 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2995154944, end = 2996117504, flags = 134217845, pgoff = 0, inode = 21285 }
+vm_state.vm_map: 13589.803095649 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2996117504, end = 2996174848, flags = 135266419, pgoff = 962560, inode = 21285 }
+vm_state.vm_map: 13589.803101129 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2996174848, end = 2996498432, flags = 134217845, pgoff = 0, inode = 21280 }
+vm_state.vm_map: 13589.803205554 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2996498432, end = 2996502528, flags = 135266419, pgoff = 323584, inode = 21280 }
+vm_state.vm_map: 13589.803211891 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2996502528, end = 2996514816, flags = 134217845, pgoff = 0, inode = 499779 }
+vm_state.vm_map: 13589.803214015 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2996514816, end = 2996518912, flags = 135266419, pgoff = 8192, inode = 499779 }
+vm_state.vm_map: 13589.803218979 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2996518912, end = 2996916224, flags = 134217845, pgoff = 0, inode = 24050 }
+vm_state.vm_map: 13589.803221153 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2996916224, end = 2996924416, flags = 135266419, pgoff = 397312, inode = 24050 }
+vm_state.vm_map: 13589.803223320 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2996924416, end = 2996940800, flags = 1048691, pgoff = 2996924416, inode = 0 }
+vm_state.vm_map: 13589.803225771 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2996940800, end = 2997243904, flags = 134217845, pgoff = 0, inode = 24049 }
+vm_state.vm_map: 13589.803227964 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2997243904, end = 2997248000, flags = 135266419, pgoff = 299008, inode = 24049 }
+vm_state.vm_map: 13589.803232772 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2997248000, end = 2997510144, flags = 134217845, pgoff = 0, inode = 24048 }
+vm_state.vm_map: 13589.803234823 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2997510144, end = 2997514240, flags = 135266419, pgoff = 262144, inode = 24048 }
+vm_state.vm_map: 13589.803237199 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2997514240, end = 2998317056, flags = 134217845, pgoff = 0, inode = 21274 }
+vm_state.vm_map: 13589.803239787 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2998317056, end = 2998333440, flags = 135266419, pgoff = 802816, inode = 21274 }
+vm_state.vm_map: 13589.803247095 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2998427648, end = 2998558720, flags = 134217845, pgoff = 0, inode = 1114250 }
+vm_state.vm_map: 13589.803249251 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2998558720, end = 2998562816, flags = 135266419, pgoff = 126976, inode = 1114250 }
+vm_state.vm_map: 13589.803254300 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2998562816, end = 2998693888, flags = 134217845, pgoff = 0, inode = 1065118 }
+vm_state.vm_map: 13589.803256345 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2998693888, end = 2998697984, flags = 135266419, pgoff = 131072, inode = 1065118 }
+vm_state.vm_map: 13589.803258673 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2998706176, end = 2998726656, flags = 134217845, pgoff = 0, inode = 18127 }
+vm_state.vm_map: 13589.803260963 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2998726656, end = 2998730752, flags = 135266419, pgoff = 16384, inode = 18127 }
+vm_state.vm_map: 13589.803263359 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2998730752, end = 2998759424, flags = 134217845, pgoff = 0, inode = 499851 }
+vm_state.vm_map: 13589.803265526 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2998759424, end = 2998763520, flags = 135266419, pgoff = 28672, inode = 499851 }
+vm_state.vm_map: 13589.803270428 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2998763520, end = 2998788096, flags = 134217845, pgoff = 0, inode = 1114248 }
+vm_state.vm_map: 13589.803272786 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2998788096, end = 2998792192, flags = 135266419, pgoff = 20480, inode = 1114248 }
+vm_state.vm_map: 13589.803277689 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2998792192, end = 2998829056, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.803279745 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2998829056, end = 2998833152, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.803281796 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2998833152, end = 2998837248, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.803284092 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2998837248, end = 2998915072, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.803286056 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2998915072, end = 2998919168, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.803288224 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2998919168, end = 2998923264, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.803290269 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2998923264, end = 2998931456, flags = 1048691, pgoff = 2998923264, inode = 0 }
+vm_state.vm_map: 13589.803297325 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2998931456, end = 2998964224, flags = 134217845, pgoff = 0, inode = 1065073 }
+vm_state.vm_map: 13589.803299494 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2998964224, end = 2998968320, flags = 135266419, pgoff = 28672, inode = 1065073 }
+vm_state.vm_map: 13589.803301993 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2998968320, end = 2999013376, flags = 134217845, pgoff = 0, inode = 1065186 }
+vm_state.vm_map: 13589.803304025 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2999013376, end = 2999017472, flags = 135266419, pgoff = 45056, inode = 1065186 }
+vm_state.vm_map: 13589.803311058 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2999017472, end = 2999058432, flags = 134217845, pgoff = 0, inode = 1114244 }
+vm_state.vm_map: 13589.803313416 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2999058432, end = 2999062528, flags = 135266419, pgoff = 36864, inode = 1114244 }
+vm_state.vm_map: 13589.803320683 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2999062528, end = 2999144448, flags = 134217845, pgoff = 0, inode = 23971 }
+vm_state.vm_map: 13589.803322850 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2999144448, end = 2999148544, flags = 135266419, pgoff = 81920, inode = 23971 }
+vm_state.vm_map: 13589.803327604 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2999148544, end = 2999406592, flags = 134217845, pgoff = 0, inode = 1066196 }
+vm_state.vm_map: 13589.803329654 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2999406592, end = 2999414784, flags = 135266419, pgoff = 253952, inode = 1066196 }
+vm_state.vm_map: 13589.803332062 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2999418880, end = 2999435264, flags = 134217845, pgoff = 0, inode = 21276 }
+vm_state.vm_map: 13589.803334100 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2999435264, end = 2999439360, flags = 135266419, pgoff = 12288, inode = 21276 }
+vm_state.vm_map: 13589.803336385 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2999439360, end = 2999463936, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.803338324 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2999463936, end = 2999468032, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.803340511 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2999468032, end = 2999472128, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.803342697 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2999472128, end = 2999480320, flags = 134217845, pgoff = 0, inode = 508751 }
+vm_state.vm_map: 13589.803344846 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2999480320, end = 2999484416, flags = 135266417, pgoff = 4096, inode = 508751 }
+vm_state.vm_map: 13589.803346896 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2999484416, end = 2999488512, flags = 135266419, pgoff = 8192, inode = 508751 }
+vm_state.vm_map: 13589.803349637 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2999488512, end = 2999504896, flags = 134217845, pgoff = 0, inode = 59036 }
+vm_state.vm_map: 13589.803351669 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2999504896, end = 2999508992, flags = 135266419, pgoff = 12288, inode = 59036 }
+vm_state.vm_map: 13589.803356306 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2999508992, end = 2999529472, flags = 134217845, pgoff = 0, inode = 58996 }
+vm_state.vm_map: 13589.803358350 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2999529472, end = 2999533568, flags = 135266419, pgoff = 20480, inode = 58996 }
+vm_state.vm_map: 13589.803368049 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2999533568, end = 2999586816, flags = 134217845, pgoff = 0, inode = 1114238 }
+vm_state.vm_map: 13589.803370229 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2999586816, end = 2999590912, flags = 135266419, pgoff = 53248, inode = 1114238 }
+vm_state.vm_map: 13589.803377144 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2999590912, end = 2999750656, flags = 134217845, pgoff = 0, inode = 59044 }
+vm_state.vm_map: 13589.803379300 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2999750656, end = 2999758848, flags = 135266419, pgoff = 159744, inode = 59044 }
+vm_state.vm_map: 13589.803381910 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2999758848, end = 2999791616, flags = 134217845, pgoff = 0, inode = 58974 }
+vm_state.vm_map: 13589.803384078 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2999791616, end = 2999795712, flags = 135266419, pgoff = 28672, inode = 58974 }
+vm_state.vm_map: 13589.803391357 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 2999795712, end = 3000180736, flags = 134217845, pgoff = 0, inode = 59002 }
+vm_state.vm_map: 13589.803393364 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3000180736, end = 3000193024, flags = 135266419, pgoff = 380928, inode = 59002 }
+vm_state.vm_map: 13589.803398469 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3000193024, end = 3000229888, flags = 134217845, pgoff = 0, inode = 59009 }
+vm_state.vm_map: 13589.803402798 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3000229888, end = 3000233984, flags = 135266419, pgoff = 32768, inode = 59009 }
+vm_state.vm_map: 13589.803409559 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3000233984, end = 3000270848, flags = 134217845, pgoff = 0, inode = 21288 }
+vm_state.vm_map: 13589.803411573 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3000270848, end = 3000274944, flags = 135266419, pgoff = 36864, inode = 21288 }
+vm_state.vm_map: 13589.803414147 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3000274944, end = 3000283136, flags = 134217845, pgoff = 0, inode = 23893 }
+vm_state.vm_map: 13589.803416123 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3000283136, end = 3000287232, flags = 135266419, pgoff = 4096, inode = 23893 }
+vm_state.vm_map: 13589.803420896 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3000287232, end = 3000471552, flags = 134217845, pgoff = 0, inode = 23888 }
+vm_state.vm_map: 13589.803423396 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3000471552, end = 3000479744, flags = 135266419, pgoff = 180224, inode = 23888 }
+vm_state.vm_map: 13589.803425890 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3000479744, end = 3000651776, flags = 134217845, pgoff = 0, inode = 58971 }
+vm_state.vm_map: 13589.803428224 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3000651776, end = 3000659968, flags = 135266419, pgoff = 167936, inode = 58971 }
+vm_state.vm_map: 13589.803430791 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3000659968, end = 3002703872, flags = 134217937, pgoff = 0, inode = 1204686 }
+vm_state.vm_map: 13589.803435404 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3002703872, end = 3002744832, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.803437584 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3002744832, end = 3002748928, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.803439628 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3002748928, end = 3002753024, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.803446833 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3002753024, end = 3018993664, flags = 134217979, pgoff = 0, inode = 1204527 }
+vm_state.vm_map: 13589.803449327 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3018993664, end = 3023290368, flags = 134217979, pgoff = 0, inode = 1204522 }
+vm_state.vm_map: 13589.803456421 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3023290368, end = 3023491072, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 13589.803458477 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3023491072, end = 3023495168, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 13589.803465498 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3023495168, end = 3023527936, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 13589.803467542 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3023527936, end = 3023532032, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 13589.803472129 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3023532032, end = 3023540224, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 13589.803474174 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3023540224, end = 3023544320, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 13589.803481028 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3023544320, end = 3023568896, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 13589.803483066 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3023568896, end = 3023572992, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 13589.803490117 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3023577088, end = 3023589376, flags = 134217845, pgoff = 0, inode = 1114259 }
+vm_state.vm_map: 13589.803492279 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3023589376, end = 3023593472, flags = 135266419, pgoff = 8192, inode = 1114259 }
+vm_state.vm_map: 13589.803497229 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3023593472, end = 3023663104, flags = 134217845, pgoff = 0, inode = 59034 }
+vm_state.vm_map: 13589.803499267 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3023663104, end = 3023667200, flags = 135266419, pgoff = 65536, inode = 59034 }
+vm_state.vm_map: 13589.803501355 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3023667200, end = 3023904768, flags = 1048691, pgoff = 3023904768, inode = 0 }
+vm_state.vm_map: 13589.803508073 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3023908864, end = 3023941632, flags = 134217937, pgoff = 0, inode = 1196200 }
+vm_state.vm_map: 13589.803512704 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3023941632, end = 3023953920, flags = 134217937, pgoff = 0, inode = 1196226 }
+vm_state.vm_map: 13589.803517224 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3023953920, end = 3023962112, flags = 134217937, pgoff = 0, inode = 1196225 }
+vm_state.vm_map: 13589.803519711 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3023962112, end = 3023966208, flags = 134217937, pgoff = 0, inode = 1196224 }
+vm_state.vm_map: 13589.803522088 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3023966208, end = 3023970304, flags = 134217937, pgoff = 0, inode = 1196223 }
+vm_state.vm_map: 13589.803524293 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3023970304, end = 3023974400, flags = 134217937, pgoff = 0, inode = 1196202 }
+vm_state.vm_map: 13589.803526799 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3023974400, end = 3024003072, flags = 134217937, pgoff = 0, inode = 1196222 }
+vm_state.vm_map: 13589.803529164 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3024003072, end = 3024015360, flags = 134217937, pgoff = 0, inode = 1196221 }
+vm_state.vm_map: 13589.803531534 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3024015360, end = 3024019456, flags = 134217937, pgoff = 0, inode = 1196220 }
+vm_state.vm_map: 13589.803534275 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3024019456, end = 3024027648, flags = 134217937, pgoff = 0, inode = 1196219 }
+vm_state.vm_map: 13589.803541104 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3024027648, end = 3024031744, flags = 134217937, pgoff = 0, inode = 1196210 }
+vm_state.vm_map: 13589.803543488 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3024031744, end = 3024035840, flags = 134217937, pgoff = 0, inode = 1196205 }
+vm_state.vm_map: 13589.803546117 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3024035840, end = 3024048128, flags = 134217937, pgoff = 0, inode = 1196244 }
+vm_state.vm_map: 13589.803548383 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3024048128, end = 3024056320, flags = 134217937, pgoff = 0, inode = 1196270 }
+vm_state.vm_map: 13589.803550784 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3024056320, end = 3024089088, flags = 134217937, pgoff = 0, inode = 1196246 }
+vm_state.vm_map: 13589.803553131 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3024089088, end = 3024109568, flags = 134217937, pgoff = 0, inode = 1196269 }
+vm_state.vm_map: 13589.803555452 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3024109568, end = 3024117760, flags = 134217937, pgoff = 0, inode = 1196316 }
+vm_state.vm_map: 13589.803557780 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3024117760, end = 3024146432, flags = 134217937, pgoff = 0, inode = 1196197 }
+vm_state.vm_map: 13589.803562386 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3024146432, end = 3024191488, flags = 134217937, pgoff = 0, inode = 1196312 }
+vm_state.vm_map: 13589.803564880 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3024191488, end = 3024248832, flags = 134217937, pgoff = 0, inode = 1196272 }
+vm_state.vm_map: 13589.803567300 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3024248832, end = 3024474112, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.803569344 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3024474112, end = 3024478208, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.803571746 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3024478208, end = 3024482304, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.803574177 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3024490496, end = 3024494592, flags = 134217937, pgoff = 0, inode = 1196317 }
+vm_state.vm_map: 13589.803576691 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3024494592, end = 3024519168, flags = 134217937, pgoff = 0, inode = 1196229 }
+vm_state.vm_map: 13589.803581290 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3024519168, end = 3024576512, flags = 134217937, pgoff = 0, inode = 1196231 }
+vm_state.vm_map: 13589.803585650 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3024576512, end = 3024609280, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 13589.803587689 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3024609280, end = 3024613376, flags = 135266419, pgoff = 32768, inode = 20716 }
+vm_state.vm_map: 13589.803589837 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3024613376, end = 3025133568, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 13589.803591869 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3025133568, end = 3025141760, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 13589.803593933 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3025141760, end = 3025506304, flags = 134217845, pgoff = 0, inode = 1065038 }
+vm_state.vm_map: 13589.803596094 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3025506304, end = 3025543168, flags = 135266423, pgoff = 364544, inode = 1065038 }
+vm_state.vm_map: 13589.803598138 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3025543168, end = 3025547264, flags = 1048695, pgoff = 3025543168, inode = 0 }
+vm_state.vm_map: 13589.803600189 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3025547264, end = 3026100224, flags = 134217845, pgoff = 0, inode = 18947 }
+vm_state.vm_map: 13589.803602325 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3026100224, end = 3026120704, flags = 135266419, pgoff = 548864, inode = 18947 }
+vm_state.vm_map: 13589.803604383 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3026120704, end = 3026436096, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 13589.803606772 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3026436096, end = 3026444288, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 13589.803608822 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3026444288, end = 3026513920, flags = 134217845, pgoff = 0, inode = 1065123 }
+vm_state.vm_map: 13589.803610940 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3026513920, end = 3026518016, flags = 135266419, pgoff = 69632, inode = 1065123 }
+vm_state.vm_map: 13589.803613059 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3026518016, end = 3041013760, flags = 134217845, pgoff = 0, inode = 20672 }
+vm_state.vm_map: 13589.803615091 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3041013760, end = 3041628160, flags = 135266419, pgoff = 14495744, inode = 20672 }
+vm_state.vm_map: 13589.803617173 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3041628160, end = 3041636352, flags = 1048691, pgoff = 3041628160, inode = 0 }
+vm_state.vm_map: 13589.803619124 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3041636352, end = 3042009088, flags = 134217845, pgoff = 0, inode = 20902 }
+vm_state.vm_map: 13589.803621052 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3042009088, end = 3042021376, flags = 135266419, pgoff = 368640, inode = 20902 }
+vm_state.vm_map: 13589.803625620 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3042021376, end = 3042025472, flags = 134217845, pgoff = 0, inode = 20890 }
+vm_state.vm_map: 13589.803627659 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3042025472, end = 3042029568, flags = 135266419, pgoff = 0, inode = 20890 }
+vm_state.vm_map: 13589.803630036 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3042029568, end = 3042033664, flags = 134217937, pgoff = 0, inode = 1196235 }
+vm_state.vm_map: 13589.803632425 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3042033664, end = 3042037760, flags = 134217937, pgoff = 0, inode = 1196204 }
+vm_state.vm_map: 13589.803634808 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3042037760, end = 3042041856, flags = 134217937, pgoff = 0, inode = 1196228 }
+vm_state.vm_map: 13589.803637038 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3042041856, end = 3042045952, flags = 134217937, pgoff = 0, inode = 1196227 }
+vm_state.vm_map: 13589.803639298 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3042045952, end = 3042054144, flags = 134217937, pgoff = 0, inode = 1196198 }
+vm_state.vm_map: 13589.803644249 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3042054144, end = 3042111488, flags = 134217845, pgoff = 0, inode = 22475 }
+vm_state.vm_map: 13589.803646292 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3042111488, end = 3042115584, flags = 135266419, pgoff = 57344, inode = 22475 }
+vm_state.vm_map: 13589.803648350 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3042115584, end = 3044098048, flags = 134217845, pgoff = 0, inode = 20915 }
+vm_state.vm_map: 13589.803650437 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3044098048, end = 3044139008, flags = 135266419, pgoff = 1978368, inode = 20915 }
+vm_state.vm_map: 13589.803652624 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3044139008, end = 3045470208, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.803654674 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3045470208, end = 3045486592, flags = 1048691, pgoff = 3045470208, inode = 0 }
+vm_state.vm_map: 13589.803656749 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3045486592, end = 3045634048, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.803658683 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3045634048, end = 3045642240, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.803660665 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3045642240, end = 3045961728, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 13589.803662711 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3045961728, end = 3045978112, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 13589.803664748 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3045978112, end = 3045990400, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 13589.803666768 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3045990400, end = 3045994496, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 13589.803668874 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3045994496, end = 3047251968, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 13589.803670906 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3047251968, end = 3047272448, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 13589.803672846 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3047272448, end = 3047280640, flags = 1048691, pgoff = 3047272448, inode = 0 }
+vm_state.vm_map: 13589.803675142 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3047280640, end = 3047518208, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 13589.803677175 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3047518208, end = 3047522304, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 13589.803679189 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3047522304, end = 3047538688, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.803681233 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3047538688, end = 3047542784, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.803683271 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3047542784, end = 3047550976, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.803685205 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3047550976, end = 3047555072, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.803687182 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3047555072, end = 3047747584, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.803689318 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3047747584, end = 3047751680, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.803691350 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3047751680, end = 3047804928, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 13589.803693284 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3047804928, end = 3047809024, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 13589.803695224 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3047809024, end = 3047813120, flags = 1048691, pgoff = 3047809024, inode = 0 }
+vm_state.vm_map: 13589.803697293 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3047813120, end = 3047985152, flags = 134217845, pgoff = 0, inode = 1065255 }
+vm_state.vm_map: 13589.803699226 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3047985152, end = 3047989248, flags = 135266419, pgoff = 172032, inode = 1065255 }
+vm_state.vm_map: 13589.803703660 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3047989248, end = 3048235008, flags = 134217845, pgoff = 0, inode = 20603 }
+vm_state.vm_map: 13589.803705643 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3048235008, end = 3048239104, flags = 135266419, pgoff = 245760, inode = 20603 }
+vm_state.vm_map: 13589.803708032 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3048239104, end = 3048710144, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 13589.803709978 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3048710144, end = 3048726528, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 13589.803711930 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3048726528, end = 3048869888, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 13589.803713975 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3048869888, end = 3048873984, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 13589.803715964 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3048873984, end = 3048960000, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 13589.803717903 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3048960000, end = 3048964096, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 13589.803719948 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3048964096, end = 3048968192, flags = 1048691, pgoff = 3048964096, inode = 0 }
+vm_state.vm_map: 13589.803721906 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3048968192, end = 3048984576, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 13589.803723925 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3048984576, end = 3048988672, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 13589.803725995 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3048988672, end = 3049021440, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 13589.803728107 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3049021440, end = 3049025536, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 13589.803730077 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3049025536, end = 3049041920, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 13589.803732017 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3049041920, end = 3049046016, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 13589.803734087 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3049046016, end = 3049132032, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 13589.803736125 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3049132032, end = 3049136128, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 13589.803738107 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3049136128, end = 3049144320, flags = 1048691, pgoff = 3049136128, inode = 0 }
+vm_state.vm_map: 13589.803740503 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3049144320, end = 3049172992, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 13589.803742436 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3049172992, end = 3049177088, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 13589.803744511 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3049177088, end = 3049181184, flags = 1048691, pgoff = 3049177088, inode = 0 }
+vm_state.vm_map: 13589.803746593 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3049181184, end = 3049512960, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 13589.803748594 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3049512960, end = 3049521152, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 13589.803750651 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3049521152, end = 3049553920, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 13589.803752824 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3049553920, end = 3049558016, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 13589.803754826 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3049558016, end = 3049574400, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 13589.803756783 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3049574400, end = 3049578496, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 13589.803758896 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3049578496, end = 3049603072, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 13589.803760953 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3049603072, end = 3049607168, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 13589.803763059 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3049607168, end = 3049639936, flags = 134217845, pgoff = 0, inode = 18621 }
+vm_state.vm_map: 13589.803764999 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3049639936, end = 3049644032, flags = 135266419, pgoff = 28672, inode = 18621 }
+vm_state.vm_map: 13589.803767044 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3049644032, end = 3049648128, flags = 1048691, pgoff = 3049644032, inode = 0 }
+vm_state.vm_map: 13589.803769045 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3049648128, end = 3050078208, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 13589.803770984 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3050078208, end = 3050106880, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 13589.803773361 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3050106880, end = 3050110976, flags = 1048691, pgoff = 3050106880, inode = 0 }
+vm_state.vm_map: 13589.803775325 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3050110976, end = 3050553344, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 13589.803777272 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3050553344, end = 3050561536, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 13589.803779304 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3050561536, end = 3050659840, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.803781256 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3050659840, end = 3050663936, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.803783207 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3050663936, end = 3050934272, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 13589.803785253 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3050934272, end = 3050942464, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 13589.803787328 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3050942464, end = 3051003904, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 13589.803789366 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3051003904, end = 3051008000, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 13589.803791305 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3051008000, end = 3051012096, flags = 1048691, pgoff = 3051008000, inode = 0 }
+vm_state.vm_map: 13589.803793380 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3051012096, end = 3051479040, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 13589.803795406 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3051479040, end = 3051487232, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 13589.803799896 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3051487232, end = 3052617728, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 13589.803801829 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3052617728, end = 3052634112, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 13589.803803904 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3052634112, end = 3052748800, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.803806207 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3052748800, end = 3052752896, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.803808197 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3052752896, end = 3052900352, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.803810241 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3052900352, end = 3052904448, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.803812242 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3052904448, end = 3052908544, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.803814305 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3052908544, end = 3052916736, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.803816368 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3052916736, end = 3052920832, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.803818314 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3052920832, end = 3052924928, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.803820254 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3052924928, end = 3052929024, flags = 1048691, pgoff = 3052924928, inode = 0 }
+vm_state.vm_map: 13589.803822224 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3052929024, end = 3053015040, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.803824330 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3053015040, end = 3053019136, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.803826263 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3053019136, end = 3053023232, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.803828241 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3053023232, end = 3053031424, flags = 1048691, pgoff = 3053023232, inode = 0 }
+vm_state.vm_map: 13589.803830482 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3053031424, end = 3053776896, flags = 134217845, pgoff = 0, inode = 499794 }
+vm_state.vm_map: 13589.803832514 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3053776896, end = 3053780992, flags = 135266419, pgoff = 745472, inode = 499794 }
+vm_state.vm_map: 13589.803834601 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3053780992, end = 3053809664, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.803836689 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3053809664, end = 3053813760, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.803838973 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3053813760, end = 3053817856, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.803840944 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3053817856, end = 3053834240, flags = 134217845, pgoff = 0, inode = 20149 }
+vm_state.vm_map: 13589.803843001 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3053834240, end = 3053838336, flags = 135266419, pgoff = 12288, inode = 20149 }
+vm_state.vm_map: 13589.803844972 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3053838336, end = 3053920256, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.803846904 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3053920256, end = 3053924352, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.803848979 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3053924352, end = 3055239168, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.803850914 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3055239168, end = 3055247360, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.803852847 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3055247360, end = 3055251456, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.803854941 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3055251456, end = 3055267840, flags = 1048691, pgoff = 3055251456, inode = 0 }
+vm_state.vm_map: 13589.803856973 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3055267840, end = 3056205824, flags = 134217845, pgoff = 0, inode = 16850 }
+vm_state.vm_map: 13589.803858906 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3056205824, end = 3056222208, flags = 135266417, pgoff = 937984, inode = 16850 }
+vm_state.vm_map: 13589.803860840 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3056222208, end = 3056226304, flags = 135266419, pgoff = 954368, inode = 16850 }
+vm_state.vm_map: 13589.803862891 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3056226304, end = 3056254976, flags = 1048691, pgoff = 3056226304, inode = 0 }
+vm_state.vm_map: 13589.803864855 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3056254976, end = 3066294272, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 13589.803866795 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3066294272, end = 3066454016, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 13589.803868876 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3066454016, end = 3066462208, flags = 1048691, pgoff = 3066454016, inode = 0 }
+vm_state.vm_map: 13589.803871185 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3066462208, end = 3070058496, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 13589.803873125 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3070058496, end = 3070156800, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 13589.803875158 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3070156800, end = 3070160896, flags = 1048691, pgoff = 3070156800, inode = 0 }
+vm_state.vm_map: 13589.803877128 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3070160896, end = 3072716800, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 13589.803879142 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3072716800, end = 3072765952, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 13589.803881284 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3072765952, end = 3072770048, flags = 1048691, pgoff = 3072765952, inode = 0 }
+vm_state.vm_map: 13589.803883249 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3072770048, end = 3073921024, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.803885176 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3073921024, end = 3073937408, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.803887147 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3073937408, end = 3074170880, flags = 134217845, pgoff = 0, inode = 1065180 }
+vm_state.vm_map: 13589.803889204 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3074170880, end = 3074179072, flags = 135266419, pgoff = 233472, inode = 1065180 }
+vm_state.vm_map: 13589.803891143 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3074179072, end = 3074183168, flags = 1048691, pgoff = 3074179072, inode = 0 }
+vm_state.vm_map: 13589.803893212 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3074183168, end = 3076485120, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 13589.803895158 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3076485120, end = 3076530176, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 13589.803897190 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3076530176, end = 3078840320, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 13589.803899124 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3078840320, end = 3078868992, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 13589.803901137 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3078868992, end = 3078873088, flags = 1048691, pgoff = 3078868992, inode = 0 }
+vm_state.vm_map: 13589.803903804 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3078877184, end = 3078889472, flags = 134217937, pgoff = 0, inode = 1196315 }
+vm_state.vm_map: 13589.803905860 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3078889472, end = 3078897664, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 13589.803907793 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3078897664, end = 3078901760, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 13589.803909758 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3078901760, end = 3078918144, flags = 134217845, pgoff = 0, inode = 22094 }
+vm_state.vm_map: 13589.803911797 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3078918144, end = 3078922240, flags = 135266419, pgoff = 12288, inode = 22094 }
+vm_state.vm_map: 13589.803913779 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3078922240, end = 3078930432, flags = 134217845, pgoff = 0, inode = 1450546 }
+vm_state.vm_map: 13589.803915719 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3078930432, end = 3078934528, flags = 135266417, pgoff = 4096, inode = 1450546 }
+vm_state.vm_map: 13589.803917659 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3078934528, end = 3078938624, flags = 135266419, pgoff = 8192, inode = 1450546 }
+vm_state.vm_map: 13589.803919753 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3078938624, end = 3078967296, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.803921766 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3078967296, end = 3078975488, flags = 1048691, pgoff = 3078967296, inode = 0 }
+vm_state.vm_map: 13589.803923804 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3078975488, end = 3078979584, flags = 67371125, pgoff = 3078975488, inode = 0 }
+vm_state.vm_map: 13589.803925916 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3078979584, end = 3079094272, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.803927862 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3079094272, end = 3079098368, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.803929790 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3079098368, end = 3079102464, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.803931736 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2177, start = 3214217216, end = 3214303232, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.803937468 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2204, start = 134512640, end = 134524928, flags = 134223989, pgoff = 0, inode = 18933 }
+vm_state.vm_map: 13589.803939575 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2204, start = 134524928, end = 134529024, flags = 135272563, pgoff = 8192, inode = 18933 }
+vm_state.vm_map: 13589.803941706 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2204, start = 147410944, end = 147546112, flags = 1048691, pgoff = 147410944, inode = 0 }
+vm_state.vm_map: 13589.803943664 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2204, start = 3076435968, end = 3076440064, flags = 1048691, pgoff = 3076435968, inode = 0 }
+vm_state.vm_map: 13589.803945763 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2204, start = 3076440064, end = 3077754880, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.803947715 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2204, start = 3077754880, end = 3077763072, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.803949662 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2204, start = 3077763072, end = 3077767168, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.803951608 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2204, start = 3077767168, end = 3077779456, flags = 1048691, pgoff = 3077767168, inode = 0 }
+vm_state.vm_map: 13589.803953670 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2204, start = 3077873664, end = 3077881856, flags = 1048691, pgoff = 3077873664, inode = 0 }
+vm_state.vm_map: 13589.803955610 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2204, start = 3077881856, end = 3077885952, flags = 67371125, pgoff = 3077881856, inode = 0 }
+vm_state.vm_map: 13589.803957686 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2204, start = 3077885952, end = 3078000640, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.803959624 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2204, start = 3078000640, end = 3078004736, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.803961577 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2204, start = 3078004736, end = 3078008832, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.803963523 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2204, start = 3217219584, end = 3217305600, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.803965900 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 134512640, end = 134553600, flags = 134223989, pgoff = 0, inode = 20759 }
+vm_state.vm_map: 13589.803967981 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 134553600, end = 134557696, flags = 135272563, pgoff = 36864, inode = 20759 }
+vm_state.vm_map: 13589.803970290 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 134557696, end = 134565888, flags = 1048691, pgoff = 134557696, inode = 0 }
+vm_state.vm_map: 13589.803972230 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 145301504, end = 147034112, flags = 1048691, pgoff = 145301504, inode = 0 }
+vm_state.vm_map: 13589.803977034 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 2993541120, end = 2993582080, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.803978985 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 2993582080, end = 2993586176, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.803981042 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 2993586176, end = 2993590272, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.803983210 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 2993590272, end = 2993627136, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.803985149 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 2993627136, end = 2993631232, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.803987181 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 2993631232, end = 2993635328, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.803989362 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 2993635328, end = 2993659904, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.803991363 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 2993659904, end = 2993664000, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.803993364 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 2993664000, end = 2993668096, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.803995310 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 2993762304, end = 2993766400, flags = 1048688, pgoff = 2993762304, inode = 0 }
+vm_state.vm_map: 13589.803997360 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 2993766400, end = 3002155008, flags = 1048691, pgoff = 2993766400, inode = 0 }
+vm_state.vm_map: 13589.803999553 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3002155008, end = 3018395648, flags = 134217979, pgoff = 0, inode = 1204527 }
+vm_state.vm_map: 13589.804001708 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3018395648, end = 3022692352, flags = 134217979, pgoff = 0, inode = 1204522 }
+vm_state.vm_map: 13589.804004140 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3022692352, end = 3022917632, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.804006111 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3022917632, end = 3022921728, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.804008099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3022921728, end = 3022925824, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.804010292 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3022925824, end = 3023126528, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 13589.804012232 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023126528, end = 3023130624, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 13589.804014313 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023130624, end = 3023163392, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 13589.804016247 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023163392, end = 3023167488, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 13589.804018298 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023167488, end = 3023175680, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 13589.804020236 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023175680, end = 3023179776, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 13589.804022294 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023179776, end = 3023257600, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.804024240 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023257600, end = 3023261696, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.804026173 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023261696, end = 3023265792, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.804028119 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023265792, end = 3023273984, flags = 1048691, pgoff = 3023265792, inode = 0 }
+vm_state.vm_map: 13589.804030207 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023273984, end = 3023278080, flags = 134217937, pgoff = 0, inode = 1196317 }
+vm_state.vm_map: 13589.804032381 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023278080, end = 3023302656, flags = 134217937, pgoff = 0, inode = 1196229 }
+vm_state.vm_map: 13589.804034474 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023302656, end = 3023306752, flags = 134217937, pgoff = 0, inode = 1196235 }
+vm_state.vm_map: 13589.804036888 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023306752, end = 3023310848, flags = 134217937, pgoff = 0, inode = 1196204 }
+vm_state.vm_map: 13589.804038957 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023310848, end = 3023314944, flags = 134217937, pgoff = 0, inode = 1196228 }
+vm_state.vm_map: 13589.804041051 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023314944, end = 3023319040, flags = 134217937, pgoff = 0, inode = 1196227 }
+vm_state.vm_map: 13589.804043206 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023319040, end = 3023327232, flags = 134217937, pgoff = 0, inode = 1196198 }
+vm_state.vm_map: 13589.804047806 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023327232, end = 3023360000, flags = 134217937, pgoff = 0, inode = 1196200 }
+vm_state.vm_map: 13589.804049764 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023360000, end = 3023372288, flags = 134217937, pgoff = 0, inode = 1196226 }
+vm_state.vm_map: 13589.804051827 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023372288, end = 3023380480, flags = 134217937, pgoff = 0, inode = 1196225 }
+vm_state.vm_map: 13589.804053915 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023380480, end = 3023384576, flags = 134217937, pgoff = 0, inode = 1196224 }
+vm_state.vm_map: 13589.804055990 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023384576, end = 3023388672, flags = 134217937, pgoff = 0, inode = 1196223 }
+vm_state.vm_map: 13589.804058071 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023388672, end = 3023392768, flags = 134217937, pgoff = 0, inode = 1196202 }
+vm_state.vm_map: 13589.804060239 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023392768, end = 3023421440, flags = 134217937, pgoff = 0, inode = 1196222 }
+vm_state.vm_map: 13589.804062382 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023421440, end = 3023433728, flags = 134217937, pgoff = 0, inode = 1196221 }
+vm_state.vm_map: 13589.804064494 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023433728, end = 3023437824, flags = 134217937, pgoff = 0, inode = 1196220 }
+vm_state.vm_map: 13589.804066563 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023437824, end = 3023446016, flags = 134217937, pgoff = 0, inode = 1196219 }
+vm_state.vm_map: 13589.804068650 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023446016, end = 3023450112, flags = 134217937, pgoff = 0, inode = 1196210 }
+vm_state.vm_map: 13589.804071157 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023450112, end = 3023454208, flags = 134217937, pgoff = 0, inode = 1196205 }
+vm_state.vm_map: 13589.804073281 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023454208, end = 3023466496, flags = 134217937, pgoff = 0, inode = 1196244 }
+vm_state.vm_map: 13589.804075362 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023466496, end = 3023474688, flags = 134217937, pgoff = 0, inode = 1196270 }
+vm_state.vm_map: 13589.804077450 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023474688, end = 3023507456, flags = 134217937, pgoff = 0, inode = 1196246 }
+vm_state.vm_map: 13589.804079549 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023507456, end = 3023527936, flags = 134217937, pgoff = 0, inode = 1196269 }
+vm_state.vm_map: 13589.804081606 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023527936, end = 3023536128, flags = 134217937, pgoff = 0, inode = 1196316 }
+vm_state.vm_map: 13589.804083676 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023536128, end = 3023564800, flags = 134217937, pgoff = 0, inode = 1196197 }
+vm_state.vm_map: 13589.804085745 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023564800, end = 3023609856, flags = 134217937, pgoff = 0, inode = 1196312 }
+vm_state.vm_map: 13589.804087795 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023609856, end = 3023667200, flags = 134217937, pgoff = 0, inode = 1196272 }
+vm_state.vm_map: 13589.804089748 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023667200, end = 3023904768, flags = 1048691, pgoff = 3023904768, inode = 0 }
+vm_state.vm_map: 13589.804092162 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023912960, end = 3023937536, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 13589.804094101 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023937536, end = 3023941632, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 13589.804096293 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023941632, end = 3023978496, flags = 134217845, pgoff = 0, inode = 21288 }
+vm_state.vm_map: 13589.804098233 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023978496, end = 3023982592, flags = 135266419, pgoff = 36864, inode = 21288 }
+vm_state.vm_map: 13589.804100523 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023982592, end = 3024097280, flags = 134217845, pgoff = 0, inode = 23885 }
+vm_state.vm_map: 13589.804102587 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3024097280, end = 3024101376, flags = 135266419, pgoff = 110592, inode = 23885 }
+vm_state.vm_map: 13589.804105105 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3024101376, end = 3024183296, flags = 134217845, pgoff = 0, inode = 23971 }
+vm_state.vm_map: 13589.804107045 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3024183296, end = 3024187392, flags = 135266419, pgoff = 81920, inode = 23971 }
+vm_state.vm_map: 13589.804109292 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3024187392, end = 3024371712, flags = 134217845, pgoff = 0, inode = 23888 }
+vm_state.vm_map: 13589.804111367 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3024371712, end = 3024379904, flags = 135266419, pgoff = 180224, inode = 23888 }
+vm_state.vm_map: 13589.804113763 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3024379904, end = 3024568320, flags = 134217845, pgoff = 0, inode = 1066195 }
+vm_state.vm_map: 13589.804115709 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3024568320, end = 3024576512, flags = 135266419, pgoff = 184320, inode = 1066195 }
+vm_state.vm_map: 13589.804117679 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3024576512, end = 3024609280, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 13589.804119637 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3024609280, end = 3024613376, flags = 135266419, pgoff = 32768, inode = 20716 }
+vm_state.vm_map: 13589.804121718 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3024613376, end = 3025133568, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 13589.804123671 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3025133568, end = 3025141760, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 13589.804125642 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3025141760, end = 3025506304, flags = 134217845, pgoff = 0, inode = 1065038 }
+vm_state.vm_map: 13589.804127587 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3025506304, end = 3025543168, flags = 135266423, pgoff = 364544, inode = 1065038 }
+vm_state.vm_map: 13589.804129545 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3025543168, end = 3025547264, flags = 1048695, pgoff = 3025543168, inode = 0 }
+vm_state.vm_map: 13589.804131597 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3025547264, end = 3026100224, flags = 134217845, pgoff = 0, inode = 18947 }
+vm_state.vm_map: 13589.804133555 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3026100224, end = 3026120704, flags = 135266419, pgoff = 548864, inode = 18947 }
+vm_state.vm_map: 13589.804135531 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3026120704, end = 3026436096, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 13589.804152317 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3026436096, end = 3026444288, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 13589.804154559 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3026444288, end = 3026513920, flags = 134217845, pgoff = 0, inode = 1065123 }
+vm_state.vm_map: 13589.804156887 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3026513920, end = 3026518016, flags = 135266419, pgoff = 69632, inode = 1065123 }
+vm_state.vm_map: 13589.804159103 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3026518016, end = 3041013760, flags = 134217845, pgoff = 0, inode = 20672 }
+vm_state.vm_map: 13589.804161364 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3041013760, end = 3041628160, flags = 135266419, pgoff = 14495744, inode = 20672 }
+vm_state.vm_map: 13589.804163525 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3041628160, end = 3041636352, flags = 1048691, pgoff = 3041628160, inode = 0 }
+vm_state.vm_map: 13589.804165563 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3041636352, end = 3042009088, flags = 134217845, pgoff = 0, inode = 20902 }
+vm_state.vm_map: 13589.804167731 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3042009088, end = 3042021376, flags = 135266419, pgoff = 368640, inode = 20902 }
+vm_state.vm_map: 13589.804169892 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3042045952, end = 3042058240, flags = 134217937, pgoff = 0, inode = 1196315 }
+vm_state.vm_map: 13589.804172307 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3042058240, end = 3042115584, flags = 134217937, pgoff = 0, inode = 1196231 }
+vm_state.vm_map: 13589.804174443 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3042115584, end = 3044098048, flags = 134217845, pgoff = 0, inode = 20915 }
+vm_state.vm_map: 13589.804176727 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3044098048, end = 3044139008, flags = 135266419, pgoff = 1978368, inode = 20915 }
+vm_state.vm_map: 13589.804178772 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3044139008, end = 3045470208, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.804180945 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3045470208, end = 3045486592, flags = 1048691, pgoff = 3045470208, inode = 0 }
+vm_state.vm_map: 13589.804183095 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3045486592, end = 3045634048, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.804185386 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3045634048, end = 3045642240, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.804187873 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3045642240, end = 3045961728, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 13589.804189973 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3045961728, end = 3045978112, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 13589.804192017 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3045978112, end = 3045990400, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 13589.804194161 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3045990400, end = 3045994496, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 13589.804196180 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3045994496, end = 3047251968, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 13589.804198477 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3047251968, end = 3047272448, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 13589.804200466 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3047272448, end = 3047280640, flags = 1048691, pgoff = 3047272448, inode = 0 }
+vm_state.vm_map: 13589.804202676 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3047280640, end = 3047518208, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 13589.804204641 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3047518208, end = 3047522304, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 13589.804206870 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3047522304, end = 3047538688, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.804208847 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3047538688, end = 3047542784, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.804211039 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3047542784, end = 3047550976, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.804212992 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3047550976, end = 3047555072, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.804215196 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3047555072, end = 3047747584, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.804217154 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3047747584, end = 3047751680, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.804219371 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3047751680, end = 3047804928, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 13589.804221667 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3047804928, end = 3047809024, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 13589.804223841 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3047809024, end = 3047813120, flags = 1048691, pgoff = 3047809024, inode = 0 }
+vm_state.vm_map: 13589.804225929 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3047813120, end = 3047985152, flags = 134217845, pgoff = 0, inode = 1065255 }
+vm_state.vm_map: 13589.804227973 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3047985152, end = 3047989248, flags = 135266419, pgoff = 172032, inode = 1065255 }
+vm_state.vm_map: 13589.804230042 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3047989248, end = 3048235008, flags = 134217845, pgoff = 0, inode = 20603 }
+vm_state.vm_map: 13589.804232075 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048235008, end = 3048239104, flags = 135266419, pgoff = 245760, inode = 20603 }
+vm_state.vm_map: 13589.804234138 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048239104, end = 3048710144, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 13589.804236182 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048710144, end = 3048726528, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 13589.804238245 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048726528, end = 3048869888, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 13589.804240394 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048869888, end = 3048873984, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 13589.804242476 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048873984, end = 3048960000, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 13589.804244471 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048960000, end = 3048964096, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 13589.804246583 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048964096, end = 3048968192, flags = 1048691, pgoff = 3048964096, inode = 0 }
+vm_state.vm_map: 13589.804248725 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048968192, end = 3048984576, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 13589.804250764 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048984576, end = 3048988672, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 13589.804252771 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048988672, end = 3049021440, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 13589.804255259 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3049021440, end = 3049025536, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 13589.804257322 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3049025536, end = 3049041920, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 13589.804259391 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3049041920, end = 3049046016, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 13589.804261355 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3049046016, end = 3049132032, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 13589.804263535 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3049132032, end = 3049136128, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 13589.804265580 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3049136128, end = 3049144320, flags = 1048691, pgoff = 3049136128, inode = 0 }
+vm_state.vm_map: 13589.804267655 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3049144320, end = 3049172992, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 13589.804269607 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3049172992, end = 3049177088, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 13589.804271879 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3049177088, end = 3049181184, flags = 1048691, pgoff = 3049177088, inode = 0 }
+vm_state.vm_map: 13589.804273856 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3049181184, end = 3049512960, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 13589.804276036 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3049512960, end = 3049521152, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 13589.804278099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3049521152, end = 3049553920, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 13589.804280118 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3049553920, end = 3049558016, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 13589.804282310 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3049558016, end = 3049574400, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 13589.804284459 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3049574400, end = 3049578496, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 13589.804286535 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3049578496, end = 3049603072, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 13589.804289023 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3049603072, end = 3049607168, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 13589.804291055 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3049607168, end = 3049639936, flags = 134217845, pgoff = 0, inode = 18621 }
+vm_state.vm_map: 13589.804293308 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3049639936, end = 3049644032, flags = 135266419, pgoff = 28672, inode = 18621 }
+vm_state.vm_map: 13589.804295353 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3049644032, end = 3049648128, flags = 1048691, pgoff = 3049644032, inode = 0 }
+vm_state.vm_map: 13589.804297428 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3049648128, end = 3050078208, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 13589.804299466 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050078208, end = 3050106880, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 13589.804301738 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050106880, end = 3050110976, flags = 1048691, pgoff = 3050106880, inode = 0 }
+vm_state.vm_map: 13589.804303813 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050110976, end = 3050553344, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 13589.804305945 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050553344, end = 3050561536, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 13589.804308020 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050561536, end = 3050659840, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.804310193 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050659840, end = 3050663936, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.804312385 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050663936, end = 3050934272, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 13589.804314424 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050934272, end = 3050942464, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 13589.804316401 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050942464, end = 3051003904, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 13589.804318568 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3051003904, end = 3051008000, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 13589.804320619 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3051008000, end = 3051012096, flags = 1048691, pgoff = 3051008000, inode = 0 }
+vm_state.vm_map: 13589.804323033 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3051012096, end = 3051479040, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 13589.804324972 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3051479040, end = 3051487232, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 13589.804327190 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3051487232, end = 3052617728, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 13589.804329234 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3052617728, end = 3052634112, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 13589.804331321 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3052634112, end = 3052748800, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.804333267 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3052748800, end = 3052752896, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.804335601 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3052752896, end = 3052900352, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.804337738 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3052900352, end = 3052904448, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.804339776 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3052904448, end = 3052908544, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.804341925 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3052908544, end = 3052916736, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.804344130 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3052916736, end = 3052920832, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.804346168 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3052920832, end = 3052924928, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.804348323 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3052924928, end = 3052929024, flags = 1048691, pgoff = 3052924928, inode = 0 }
+vm_state.vm_map: 13589.804350318 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3052929024, end = 3053015040, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.804352461 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053015040, end = 3053019136, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.804354636 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053019136, end = 3053023232, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.804357037 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053023232, end = 3053031424, flags = 1048691, pgoff = 3053023232, inode = 0 }
+vm_state.vm_map: 13589.804359007 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053031424, end = 3053776896, flags = 134217845, pgoff = 0, inode = 499794 }
+vm_state.vm_map: 13589.804364205 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053776896, end = 3053780992, flags = 135266419, pgoff = 745472, inode = 499794 }
+vm_state.vm_map: 13589.804366378 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053780992, end = 3053809664, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.804368417 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053809664, end = 3053813760, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.804370547 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053813760, end = 3053817856, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.804372616 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053817856, end = 3053834240, flags = 134217845, pgoff = 0, inode = 20149 }
+vm_state.vm_map: 13589.804374777 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053834240, end = 3053838336, flags = 135266419, pgoff = 12288, inode = 20149 }
+vm_state.vm_map: 13589.804376841 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053838336, end = 3053920256, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.804378885 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053920256, end = 3053924352, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.804380935 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053924352, end = 3055239168, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.804382973 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3055239168, end = 3055247360, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.804385129 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3055247360, end = 3055251456, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.804387340 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3055251456, end = 3055267840, flags = 1048691, pgoff = 3055251456, inode = 0 }
+vm_state.vm_map: 13589.804389396 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3055267840, end = 3056205824, flags = 134217845, pgoff = 0, inode = 16850 }
+vm_state.vm_map: 13589.804391804 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3056205824, end = 3056222208, flags = 135266417, pgoff = 937984, inode = 16850 }
+vm_state.vm_map: 13589.804393799 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3056222208, end = 3056226304, flags = 135266419, pgoff = 954368, inode = 16850 }
+vm_state.vm_map: 13589.804395955 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3056226304, end = 3056254976, flags = 1048691, pgoff = 3056226304, inode = 0 }
+vm_state.vm_map: 13589.804398042 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3056254976, end = 3066294272, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 13589.804400068 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3066294272, end = 3066454016, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 13589.804402112 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3066454016, end = 3066462208, flags = 1048691, pgoff = 3066454016, inode = 0 }
+vm_state.vm_map: 13589.804404157 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3066462208, end = 3070058496, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 13589.804406188 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3070058496, end = 3070156800, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 13589.804408350 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3070156800, end = 3070160896, flags = 1048691, pgoff = 3070156800, inode = 0 }
+vm_state.vm_map: 13589.804410376 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3070160896, end = 3072716800, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 13589.804412642 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3072716800, end = 3072765952, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 13589.804414749 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3072765952, end = 3072770048, flags = 1048691, pgoff = 3072765952, inode = 0 }
+vm_state.vm_map: 13589.804416953 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3072770048, end = 3073921024, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.804418924 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3073921024, end = 3073937408, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.804421245 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3073937408, end = 3074170880, flags = 134217845, pgoff = 0, inode = 1065180 }
+vm_state.vm_map: 13589.804423326 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3074170880, end = 3074179072, flags = 135266419, pgoff = 233472, inode = 1065180 }
+vm_state.vm_map: 13589.804425967 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3074179072, end = 3074183168, flags = 1048691, pgoff = 3074179072, inode = 0 }
+vm_state.vm_map: 13589.804428136 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3074183168, end = 3076485120, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 13589.804430291 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3076485120, end = 3076530176, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 13589.804432421 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3076530176, end = 3078840320, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 13589.804434570 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078840320, end = 3078868992, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 13589.804436812 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078868992, end = 3078873088, flags = 1048691, pgoff = 3078868992, inode = 0 }
+vm_state.vm_map: 13589.804438826 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078889472, end = 3078897664, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 13589.804440784 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078897664, end = 3078901760, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 13589.804442970 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078901760, end = 3078918144, flags = 134217845, pgoff = 0, inode = 22094 }
+vm_state.vm_map: 13589.804445009 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078918144, end = 3078922240, flags = 135266419, pgoff = 12288, inode = 22094 }
+vm_state.vm_map: 13589.804447084 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078922240, end = 3078930432, flags = 134217845, pgoff = 0, inode = 1450546 }
+vm_state.vm_map: 13589.804449054 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078930432, end = 3078934528, flags = 135266417, pgoff = 4096, inode = 1450546 }
+vm_state.vm_map: 13589.804451221 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078934528, end = 3078938624, flags = 135266419, pgoff = 8192, inode = 1450546 }
+vm_state.vm_map: 13589.804453284 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078938624, end = 3078967296, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.804455322 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078967296, end = 3078975488, flags = 1048691, pgoff = 3078967296, inode = 0 }
+vm_state.vm_map: 13589.804457411 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078975488, end = 3078979584, flags = 67371125, pgoff = 3078975488, inode = 0 }
+vm_state.vm_map: 13589.804459984 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078979584, end = 3079094272, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.804462035 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3079094272, end = 3079098368, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.804464073 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3079098368, end = 3079102464, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.804466043 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2205, start = 3214217216, end = 3214303232, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.804473827 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 134512640, end = 134516736, flags = 134223989, pgoff = 0, inode = 1352648 }
+vm_state.vm_map: 13589.804475872 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 134516736, end = 134520832, flags = 135272563, pgoff = 0, inode = 1352648 }
+vm_state.vm_map: 13589.804478027 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 155467776, end = 159428608, flags = 1048691, pgoff = 155467776, inode = 0 }
+vm_state.vm_map: 13589.804480595 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2836033536, end = 2836606976, flags = 134217841, pgoff = 0, inode = 49559 }
+vm_state.vm_map: 13589.804490176 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2836606976, end = 2836746240, flags = 134217841, pgoff = 0, inode = 254140 }
+vm_state.vm_map: 13589.804494838 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2836746240, end = 2836783104, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.804497351 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2836783104, end = 2836787200, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.804499376 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2836787200, end = 2836791296, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.804501710 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2836791296, end = 2836869120, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.804503754 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2836869120, end = 2836873216, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.804505799 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2836873216, end = 2836877312, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.804507750 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2836877312, end = 2836885504, flags = 1048691, pgoff = 2836877312, inode = 0 }
+vm_state.vm_map: 13589.804515177 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2836897792, end = 2836979712, flags = 134217841, pgoff = 0, inode = 98443 }
+vm_state.vm_map: 13589.804519593 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2839023616, end = 2839064576, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.804521760 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2839064576, end = 2839068672, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.804523774 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2839068672, end = 2839072768, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.804526076 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2839072768, end = 2839097344, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.804528048 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2839097344, end = 2839101440, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.804530215 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2839101440, end = 2839105536, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.804535209 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2839105536, end = 2839166976, flags = 134217841, pgoff = 0, inode = 649749 }
+vm_state.vm_map: 13589.804542026 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2839166976, end = 2965508096, flags = 134217979, pgoff = 0, inode = 73879 }
+vm_state.vm_map: 13589.804544384 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2965508096, end = 2999164928, flags = 134217979, pgoff = 0, inode = 73878 }
+vm_state.vm_map: 13589.804553212 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2999164928, end = 2999230464, flags = 134217845, pgoff = 0, inode = 57391 }
+kernel.irq_entry: 13589.804576445 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { ip = 3242331332, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.irq_exit: 13589.804589019 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { handled = 1 }
+vm_state.vm_map: 13589.804594513 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2999230464, end = 2999234560, flags = 135266419, pgoff = 61440, inode = 57391 }
+vm_state.vm_map: 13589.804596569 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2999234560, end = 2999250944, flags = 1048691, pgoff = 2999234560, inode = 0 }
+vm_state.vm_map: 13589.804603916 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2999250944, end = 2999533568, flags = 134217845, pgoff = 0, inode = 22693 }
+vm_state.vm_map: 13589.804605954 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2999533568, end = 2999545856, flags = 135266419, pgoff = 282624, inode = 22693 }
+vm_state.vm_map: 13589.804607980 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2999545856, end = 2999570432, flags = 1048691, pgoff = 2999545856, inode = 0 }
+vm_state.vm_map: 13589.804612648 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2999574528, end = 2999590912, flags = 134217845, pgoff = 0, inode = 57390 }
+vm_state.vm_map: 13589.804614680 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2999590912, end = 2999595008, flags = 135266419, pgoff = 12288, inode = 57390 }
+vm_state.vm_map: 13589.804617193 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2999595008, end = 2999615488, flags = 134217845, pgoff = 0, inode = 57392 }
+vm_state.vm_map: 13589.804619250 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2999615488, end = 2999619584, flags = 135266419, pgoff = 16384, inode = 57392 }
+vm_state.vm_map: 13589.804621737 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2999619584, end = 2999660544, flags = 134217845, pgoff = 0, inode = 57395 }
+vm_state.vm_map: 13589.804623707 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2999660544, end = 2999664640, flags = 135266419, pgoff = 36864, inode = 57395 }
+vm_state.vm_map: 13589.804628288 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2999664640, end = 2999934976, flags = 134217845, pgoff = 0, inode = 18916 }
+vm_state.vm_map: 13589.804630703 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2999934976, end = 2999939072, flags = 135266419, pgoff = 266240, inode = 18916 }
+vm_state.vm_map: 13589.804633184 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 2999939072, end = 3000020992, flags = 134217845, pgoff = 0, inode = 18915 }
+vm_state.vm_map: 13589.804635173 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3000020992, end = 3000029184, flags = 135266419, pgoff = 77824, inode = 18915 }
+vm_state.vm_map: 13589.804637482 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3000029184, end = 3000811520, flags = 134217845, pgoff = 0, inode = 18927 }
+vm_state.vm_map: 13589.804639417 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3000811520, end = 3000819712, flags = 135266419, pgoff = 778240, inode = 18927 }
+vm_state.vm_map: 13589.804644035 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3000819712, end = 3000832000, flags = 134217845, pgoff = 0, inode = 59166 }
+vm_state.vm_map: 13589.804645974 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3000832000, end = 3000836096, flags = 135266419, pgoff = 8192, inode = 59166 }
+vm_state.vm_map: 13589.804648266 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3000836096, end = 3000852480, flags = 134217845, pgoff = 0, inode = 57389 }
+vm_state.vm_map: 13589.804650199 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3000852480, end = 3000856576, flags = 135266419, pgoff = 12288, inode = 57389 }
+vm_state.vm_map: 13589.804652730 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3000856576, end = 3000889344, flags = 134217845, pgoff = 0, inode = 57396 }
+vm_state.vm_map: 13589.804654669 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3000889344, end = 3000893440, flags = 135266419, pgoff = 28672, inode = 57396 }
+vm_state.vm_map: 13589.804659602 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3000893440, end = 3000909824, flags = 134217845, pgoff = 0, inode = 57393 }
+vm_state.vm_map: 13589.804661677 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3000909824, end = 3000913920, flags = 135266419, pgoff = 12288, inode = 57393 }
+vm_state.vm_map: 13589.804667262 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3000913920, end = 3001278464, flags = 134217845, pgoff = 0, inode = 22572 }
+vm_state.vm_map: 13589.804669325 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3001278464, end = 3001286656, flags = 135266419, pgoff = 364544, inode = 22572 }
+vm_state.vm_map: 13589.804671715 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3001286656, end = 3001487360, flags = 134217845, pgoff = 0, inode = 20709 }
+vm_state.vm_map: 13589.804673771 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3001487360, end = 3001495552, flags = 135266419, pgoff = 196608, inode = 20709 }
+vm_state.vm_map: 13589.804675717 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3001495552, end = 3001503744, flags = 1048691, pgoff = 3001495552, inode = 0 }
+vm_state.vm_map: 13589.804678045 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3001503744, end = 3001954304, flags = 134217845, pgoff = 0, inode = 20711 }
+vm_state.vm_map: 13589.804679979 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3001954304, end = 3001966592, flags = 135266419, pgoff = 450560, inode = 20711 }
+vm_state.vm_map: 13589.804682281 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3001978880, end = 3002003456, flags = 134217845, pgoff = 0, inode = 18917 }
+vm_state.vm_map: 13589.804684258 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3002003456, end = 3002007552, flags = 135266419, pgoff = 20480, inode = 18917 }
+vm_state.vm_map: 13589.804686413 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3002007552, end = 3002023936, flags = 134217845, pgoff = 0, inode = 18914 }
+vm_state.vm_map: 13589.804688346 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3002023936, end = 3002028032, flags = 135266419, pgoff = 16384, inode = 18914 }
+vm_state.vm_map: 13589.804690754 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3002028032, end = 3002056704, flags = 134217845, pgoff = 0, inode = 57397 }
+vm_state.vm_map: 13589.804692701 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3002056704, end = 3002060800, flags = 135266419, pgoff = 24576, inode = 57397 }
+vm_state.vm_map: 13589.804695114 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3002060800, end = 3002187776, flags = 134217845, pgoff = 0, inode = 18923 }
+vm_state.vm_map: 13589.804697054 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3002187776, end = 3002191872, flags = 135266419, pgoff = 122880, inode = 18923 }
+vm_state.vm_map: 13589.804699395 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3002191872, end = 3002208256, flags = 134217845, pgoff = 0, inode = 57394 }
+vm_state.vm_map: 13589.804701679 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3002208256, end = 3002212352, flags = 135266419, pgoff = 16384, inode = 57394 }
+vm_state.vm_map: 13589.804704105 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3002212352, end = 3002236928, flags = 134217845, pgoff = 0, inode = 57398 }
+vm_state.vm_map: 13589.804706038 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3002236928, end = 3002241024, flags = 135266419, pgoff = 24576, inode = 57398 }
+vm_state.vm_map: 13589.804708366 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3002241024, end = 3002257408, flags = 134217845, pgoff = 0, inode = 52571 }
+vm_state.vm_map: 13589.804710294 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3002257408, end = 3002261504, flags = 135266419, pgoff = 12288, inode = 52571 }
+vm_state.vm_map: 13589.804712584 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3002261504, end = 3002281984, flags = 134217845, pgoff = 0, inode = 52570 }
+vm_state.vm_map: 13589.804714524 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3002281984, end = 3002286080, flags = 135266419, pgoff = 16384, inode = 52570 }
+vm_state.vm_map: 13589.804716895 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3002286080, end = 3002322944, flags = 134217845, pgoff = 0, inode = 52569 }
+vm_state.vm_map: 13589.804718829 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3002322944, end = 3002327040, flags = 135266419, pgoff = 32768, inode = 52569 }
+vm_state.vm_map: 13589.804721150 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3002327040, end = 3002351616, flags = 134217845, pgoff = 0, inode = 52572 }
+vm_state.vm_map: 13589.804723077 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3002351616, end = 3002355712, flags = 135266419, pgoff = 20480, inode = 52572 }
+vm_state.vm_map: 13589.804725263 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3002355712, end = 3002376192, flags = 134217845, pgoff = 0, inode = 52568 }
+vm_state.vm_map: 13589.804727209 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3002376192, end = 3002380288, flags = 135266419, pgoff = 16384, inode = 52568 }
+vm_state.vm_map: 13589.804729501 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3002380288, end = 3002466304, flags = 134217845, pgoff = 0, inode = 57557 }
+vm_state.vm_map: 13589.804731433 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3002466304, end = 3002470400, flags = 135266419, pgoff = 86016, inode = 57557 }
+vm_state.vm_map: 13589.804740707 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3002470400, end = 3018711040, flags = 134217979, pgoff = 0, inode = 1204696 }
+vm_state.vm_map: 13589.804746009 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3018711040, end = 3023007744, flags = 134217979, pgoff = 0, inode = 1204694 }
+vm_state.vm_map: 13589.804748098 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023007744, end = 3023233024, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.804750042 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023233024, end = 3023237120, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.804751989 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023237120, end = 3023241216, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.804754218 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023241216, end = 3023441920, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 13589.804756342 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023441920, end = 3023446016, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 13589.804758430 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023446016, end = 3023454208, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 13589.804760369 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023454208, end = 3023458304, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 13589.804762574 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023462400, end = 3023474688, flags = 134217845, pgoff = 0, inode = 49489 }
+vm_state.vm_map: 13589.804764643 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023474688, end = 3023478784, flags = 135266419, pgoff = 8192, inode = 49489 }
+vm_state.vm_map: 13589.804769532 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023478784, end = 3023552512, flags = 134217841, pgoff = 0, inode = 98526 }
+vm_state.vm_map: 13589.804771743 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023552512, end = 3023556608, flags = 134217937, pgoff = 0, inode = 1196317 }
+vm_state.vm_map: 13589.804774250 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023556608, end = 3023581184, flags = 134217937, pgoff = 0, inode = 1196229 }
+vm_state.vm_map: 13589.804776361 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023581184, end = 3023585280, flags = 134217937, pgoff = 0, inode = 1196235 }
+vm_state.vm_map: 13589.804778461 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023585280, end = 3023589376, flags = 134217937, pgoff = 0, inode = 1196204 }
+vm_state.vm_map: 13589.804780586 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023589376, end = 3023593472, flags = 134217937, pgoff = 0, inode = 1196228 }
+vm_state.vm_map: 13589.804782655 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023593472, end = 3023597568, flags = 134217937, pgoff = 0, inode = 1196227 }
+vm_state.vm_map: 13589.804784755 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023597568, end = 3023605760, flags = 134217937, pgoff = 0, inode = 1196198 }
+vm_state.vm_map: 13589.804786805 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023605760, end = 3023638528, flags = 134217937, pgoff = 0, inode = 1196200 }
+vm_state.vm_map: 13589.804788856 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023638528, end = 3023650816, flags = 134217937, pgoff = 0, inode = 1196226 }
+vm_state.vm_map: 13589.804791072 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023650816, end = 3023659008, flags = 134217937, pgoff = 0, inode = 1196225 }
+vm_state.vm_map: 13589.804793234 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023659008, end = 3023663104, flags = 134217937, pgoff = 0, inode = 1196224 }
+vm_state.vm_map: 13589.804795285 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023663104, end = 3023667200, flags = 134217937, pgoff = 0, inode = 1196223 }
+vm_state.vm_map: 13589.804797323 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023667200, end = 3023671296, flags = 134217937, pgoff = 0, inode = 1196202 }
+vm_state.vm_map: 13589.804799589 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023671296, end = 3023699968, flags = 134217937, pgoff = 0, inode = 1196222 }
+vm_state.vm_map: 13589.804801627 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023699968, end = 3023712256, flags = 134217937, pgoff = 0, inode = 1196221 }
+vm_state.vm_map: 13589.804803807 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023712256, end = 3023716352, flags = 134217937, pgoff = 0, inode = 1196220 }
+vm_state.vm_map: 13589.804805975 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023716352, end = 3023724544, flags = 134217937, pgoff = 0, inode = 1196219 }
+vm_state.vm_map: 13589.804808493 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023724544, end = 3023728640, flags = 134217937, pgoff = 0, inode = 1196210 }
+vm_state.vm_map: 13589.804810698 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023728640, end = 3023732736, flags = 134217937, pgoff = 0, inode = 1196205 }
+vm_state.vm_map: 13589.804812889 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023732736, end = 3023745024, flags = 134217937, pgoff = 0, inode = 1196244 }
+vm_state.vm_map: 13589.804814990 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023745024, end = 3023753216, flags = 134217937, pgoff = 0, inode = 1196270 }
+vm_state.vm_map: 13589.804817201 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023753216, end = 3023785984, flags = 134217937, pgoff = 0, inode = 1196246 }
+vm_state.vm_map: 13589.804819288 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023785984, end = 3023806464, flags = 134217937, pgoff = 0, inode = 1196269 }
+vm_state.vm_map: 13589.804821450 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023806464, end = 3023814656, flags = 134217937, pgoff = 0, inode = 1196316 }
+vm_state.vm_map: 13589.804823661 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023814656, end = 3023843328, flags = 134217937, pgoff = 0, inode = 1196197 }
+vm_state.vm_map: 13589.804825742 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023843328, end = 3023888384, flags = 134217937, pgoff = 0, inode = 1196312 }
+vm_state.vm_map: 13589.804827835 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023888384, end = 3023945728, flags = 134217937, pgoff = 0, inode = 1196272 }
+vm_state.vm_map: 13589.804829935 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023945728, end = 3023958016, flags = 134217937, pgoff = 0, inode = 1196315 }
+vm_state.vm_map: 13589.804832023 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3023958016, end = 3024015360, flags = 134217937, pgoff = 0, inode = 1196231 }
+vm_state.vm_map: 13589.804834141 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3024015360, end = 3025346560, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.804836087 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3025346560, end = 3025362944, flags = 1048691, pgoff = 3025346560, inode = 0 }
+vm_state.vm_map: 13589.804838304 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3025362944, end = 3026620416, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 13589.804840380 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3026620416, end = 3026640896, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 13589.804842669 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3026640896, end = 3026644992, flags = 1048691, pgoff = 3026640896, inode = 0 }
+vm_state.vm_map: 13589.804844751 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3026644992, end = 3026882560, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 13589.804846691 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3026882560, end = 3026886656, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 13589.804848907 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3026886656, end = 3027034112, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.804850847 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3027034112, end = 3027042304, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.804853028 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3027042304, end = 3027234816, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.804854961 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3027234816, end = 3027238912, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.804857245 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3027238912, end = 3027558400, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 13589.804859173 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3027558400, end = 3027574784, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 13589.804861218 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3027574784, end = 3027578880, flags = 1048691, pgoff = 3027574784, inode = 0 }
+vm_state.vm_map: 13589.804863379 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3027578880, end = 3027595264, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.804865306 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3027595264, end = 3027599360, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.804867387 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3027599360, end = 3028119552, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 13589.804869315 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3028119552, end = 3028127744, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 13589.804871617 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3028127744, end = 3028144128, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 13589.804873552 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3028144128, end = 3028148224, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 13589.804876082 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3028148224, end = 3028172800, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 13589.804878010 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3028172800, end = 3028176896, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 13589.804880072 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3028176896, end = 3028180992, flags = 1048691, pgoff = 3028176896, inode = 0 }
+vm_state.vm_map: 13589.804882271 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3028180992, end = 3028213760, flags = 134217845, pgoff = 0, inode = 18621 }
+vm_state.vm_map: 13589.804884205 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3028213760, end = 3028217856, flags = 135266419, pgoff = 28672, inode = 18621 }
+vm_state.vm_map: 13589.804886366 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3028217856, end = 3028660224, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 13589.804888306 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3028660224, end = 3028668416, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 13589.804890485 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3028668416, end = 3028697088, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.804892414 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3028697088, end = 3028701184, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.804894353 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3028701184, end = 3028705280, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.804896539 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3028705280, end = 3028721664, flags = 134217845, pgoff = 0, inode = 20149 }
+vm_state.vm_map: 13589.804898472 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3028721664, end = 3028725760, flags = 135266419, pgoff = 12288, inode = 20149 }
+vm_state.vm_map: 13589.804900652 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3028725760, end = 3028897792, flags = 134217845, pgoff = 0, inode = 1065255 }
+vm_state.vm_map: 13589.804902592 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3028897792, end = 3028901888, flags = 135266419, pgoff = 172032, inode = 1065255 }
+vm_state.vm_map: 13589.804904631 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3028901888, end = 3028905984, flags = 1048691, pgoff = 3028901888, inode = 0 }
+vm_state.vm_map: 13589.804906792 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3028905984, end = 3029651456, flags = 134217845, pgoff = 0, inode = 499794 }
+vm_state.vm_map: 13589.804909082 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3029651456, end = 3029655552, flags = 135266419, pgoff = 745472, inode = 499794 }
+vm_state.vm_map: 13589.804911139 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3029655552, end = 3029901312, flags = 134217845, pgoff = 0, inode = 20603 }
+vm_state.vm_map: 13589.804913189 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3029901312, end = 3029905408, flags = 135266419, pgoff = 245760, inode = 20603 }
+vm_state.vm_map: 13589.804915327 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3029905408, end = 3030376448, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 13589.804917260 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3030376448, end = 3030392832, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 13589.804919354 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3030392832, end = 3030536192, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 13589.804921293 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3030536192, end = 3030540288, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 13589.804921524 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3030540288, end = 3030626304, flags = 134217845, pgoff = 0, inode = 18951 }
+kernel.irq_entry: 13589.804937836 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { ip = 3242331332, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_update_time: 13589.804949641 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { jiffies = 4296292863, xtime_sec = 1262715366, xtime_nsec = 301133046, walltomonotonic_sec = -1262701811, walltomonotonic_nsec = 148963639 }
+kernel.softirq_raise: 13589.804961779 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { softirq_id = 1 [softirq 1] }
+kernel.softirq_raise: 13589.804968059 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { softirq_id = 9 [softirq 9] }
+kernel.irq_exit: 13589.804988867 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.softirq_entry: 13589.804991502 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, SOFTIRQ { softirq_id = 1 [softirq 1] }
+kernel.timer_set: 13589.805001521 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, SOFTIRQ { expires = 1325568, function = 0xc141d458, data = 0 }
+kernel.softirq_exit: 13589.805004434 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { softirq_id = 1 [softirq 1] }
+kernel.softirq_entry: 13589.805005888 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, SOFTIRQ { softirq_id = 9 [softirq 9] }
+rcu.tree_callback: 13589.805068655 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 16887, 16887, lttctl, , 30068, 0x0, SOFTIRQ { func = 0xc10acb19 }
+rcu.tree_callback: 13589.805072755 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 16887, 16887, lttctl, , 30068, 0x0, SOFTIRQ { func = 0xc10b8ec2 }
+kernel.softirq_exit: 13589.805075250 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { softirq_id = 9 [softirq 9] }
+kernel.sched_schedule: 13589.805084764 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { prev_pid = 16887, next_pid = 1852, prev_state = 0 }
+kernel.sched_try_wakeup: 13589.805271545 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pid = 2241, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 13589.805280154 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { prev_pid = 1852, next_pid = 2241, prev_state = 0 }
+fs.pollfd: 13589.805428923 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 13589.805436927 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { prev_pid = 2241, next_pid = 1852, prev_state = 1 }
+fs.read: 13589.805580818 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4096, fd = 41 }
+kernel.syscall_exit: 13589.805582592 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 16 }
+kernel.syscall_entry: 13589.805602241 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 142 [syscall 142] }
+fs.select: 13589.805606799 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 11, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.805614927 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 12, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.805620537 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 14, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.805622796 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 15, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.805627594 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 16, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.805632076 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 17, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.805636381 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 18, end_time_sec = 0, end_time_nsec = 0 }
+kernel.syscall_exit: 13589.805644356 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 2 }
+kernel.syscall_entry: 13589.805660760 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 175 [syscall 175] }
+kernel.syscall_exit: 13589.805663260 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.805692916 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 54 [syscall 54] }
+fs.ioctl: 13589.805695336 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 8, cmd = 3223606787, arg = 3215720368 }
+kernel.syscall_exit: 13589.805741792 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.805750007 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.805753091 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.805828489 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 175 [syscall 175] }
+kernel.syscall_exit: 13589.805831007 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.805835508 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.805838890 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 256, fd = 14 }
+kernel.syscall_exit: 13589.805840146 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 48 }
+kernel.syscall_entry: 13589.805847424 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.805849931 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.805853625 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726408, syscall_id = 119 [syscall 119] }
+kernel.syscall_exit: 13589.805860073 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 16 }
+kernel.syscall_entry: 13589.806065617 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 146 [syscall 146] }
+kernel.sched_try_wakeup: 13589.806082921 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pid = 2207, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 13589.806091947 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2207, 2207, kwin, , 2205, 0x0, MODE_UNKNOWN { prev_pid = 1852, next_pid = 2207, prev_state = 0 }
+fs.pollfd: 13589.806242915 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2207, 2207, kwin, , 2205, 0x0, MODE_UNKNOWN { fd = 3 }
+fs.pollfd: 13589.806249565 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2207, 2207, kwin, , 2205, 0x0, MODE_UNKNOWN { fd = 8 }
+fs.pollfd: 13589.806251443 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2207, 2207, kwin, , 2205, 0x0, MODE_UNKNOWN { fd = 9 }
+fs.pollfd: 13589.806256351 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2207, 2207, kwin, , 2205, 0x0, MODE_UNKNOWN { fd = 7 }
+fs.pollfd: 13589.806257724 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2207, 2207, kwin, , 2205, 0x0, MODE_UNKNOWN { fd = 10 }
+fs.pollfd: 13589.806259485 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2207, 2207, kwin, , 2205, 0x0, MODE_UNKNOWN { fd = 12 }
+kernel.syscall_exit: 13589.806269905 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2207, 2207, kwin, , 2205, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 13589.806453194 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2207, 2207, kwin, , 2205, 0x0, SYSCALL { ip = 0xb78bd416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.806458349 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2207, 2207, kwin, , 2205, 0x0, SYSCALL { count = 4096, fd = 7 }
+kernel.syscall_exit: 13589.806459611 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2207, 2207, kwin, , 2205, 0x0, MODE_UNKNOWN { ret = 32 }
+kernel.syscall_entry: 13589.806501041 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2207, 2207, kwin, , 2205, 0x0, SYSCALL { ip = 0xb78bd416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.806503061 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2207, 2207, kwin, , 2205, 0x0, SYSCALL { count = 4096, fd = 7 }
+kernel.syscall_exit: 13589.806504243 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2207, 2207, kwin, , 2205, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.806746722 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2207, 2207, kwin, , 2205, 0x0, SYSCALL { ip = 0xb78bd416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.806749506 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2207, 2207, kwin, , 2205, 0x0, SYSCALL { count = 4096, fd = 7 }
+kernel.syscall_exit: 13589.806750780 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2207, 2207, kwin, , 2205, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.806760392 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2207, 2207, kwin, , 2205, 0x0, SYSCALL { ip = 0xb4860e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.806762973 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2207, 2207, kwin, , 2205, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.806776625 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2207, 2207, kwin, , 2205, 0x0, SYSCALL { ip = 0xb78bd416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 13589.806778601 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2207, 2207, kwin, , 2205, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 13589.806780702 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2207, 2207, kwin, , 2205, 0x0, SYSCALL { fd = 8 }
+fs.pollfd: 13589.806782296 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2207, 2207, kwin, , 2205, 0x0, SYSCALL { fd = 9 }
+fs.pollfd: 13589.806783725 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2207, 2207, kwin, , 2205, 0x0, SYSCALL { fd = 7 }
+fs.pollfd: 13589.806785111 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2207, 2207, kwin, , 2205, 0x0, SYSCALL { fd = 10 }
+fs.pollfd: 13589.806786656 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2207, 2207, kwin, , 2205, 0x0, SYSCALL { fd = 12 }
+kernel.sched_schedule: 13589.806794021 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { prev_pid = 2207, next_pid = 1852, prev_state = 1 }
+fs.writev: 13589.806939218 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 32, vlen = 1 }
+kernel.syscall_exit: 13589.806941225 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 32 }
+kernel.syscall_entry: 13589.806947242 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 146 [syscall 146] }
+kernel.sched_try_wakeup: 13589.806956386 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pid = 2241, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 13589.806964509 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { prev_pid = 1852, next_pid = 2241, prev_state = 0 }
+fs.pollfd: 13589.807105480 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 13589.807108560 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 13589.807116344 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.807120950 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.807122218 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 96 }
+kernel.syscall_entry: 13589.807137675 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.807139657 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.807140858 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.808709285 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 13589.808712520 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 13589.808715382 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 13589.808719184 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 146 [syscall 146] }
+fs.writev: 13589.808727353 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8, vlen = 3 }
+kernel.syscall_exit: 13589.808728899 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 7140 }
+kernel.syscall_entry: 13589.808734253 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 13589.808735792 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 13589.808743843 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { prev_pid = 2241, next_pid = 1852, prev_state = 1 }
+fs.writev: 13589.808892745 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 41, vlen = 1 }
+kernel.syscall_exit: 13589.808894884 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 96 }
+kernel.syscall_entry: 13589.808901858 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.808906453 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4096, fd = 41 }
+kernel.syscall_exit: 13589.808907640 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 4096 }
+kernel.syscall_entry: 13589.809234454 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [syscall 3] }
+kernel.sched_try_wakeup: 13589.809267638 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pid = 2241, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 13589.809276907 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { prev_pid = 1852, next_pid = 2241, prev_state = 0 }
+fs.pollfd: 13589.809421073 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 13589.809428789 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { prev_pid = 2241, next_pid = 1852, prev_state = 1 }
+fs.read: 13589.809575292 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4092, fd = 41 }
+kernel.syscall_exit: 13589.809576999 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 3044 }
+kernel.syscall_entry: 13589.809653138 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.809655734 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4096, fd = 41 }
+kernel.syscall_exit: 13589.809656922 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.809661373 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 146 [syscall 146] }
+kernel.sched_try_wakeup: 13589.809670351 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pid = 2241, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 13589.809678451 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { prev_pid = 1852, next_pid = 2241, prev_state = 0 }
+fs.pollfd: 13589.809818431 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 13589.809821169 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 13589.809827155 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.809831501 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.809832732 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 32 }
+kernel.syscall_entry: 13589.809840572 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.809842402 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.809843558 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.809853173 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 13589.809854911 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 13589.809857162 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 13589.809860507 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 146 [syscall 146] }
+fs.writev: 13589.809864568 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8, vlen = 3 }
+kernel.syscall_exit: 13589.809866040 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 16 }
+kernel.syscall_entry: 13589.809870702 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 13589.809872192 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 13589.809879854 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { prev_pid = 2241, next_pid = 1852, prev_state = 1 }
+fs.writev: 13589.810024711 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 41, vlen = 1 }
+kernel.syscall_exit: 13589.810026714 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 32 }
+kernel.syscall_entry: 13589.810032824 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.810036088 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.810040417 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 13589.810043298 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 13589.810061755 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.810071889 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 142 [syscall 142] }
+fs.select: 13589.810077311 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 1, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810080508 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 3, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810082981 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 5, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810091236 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 7, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810093783 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 13, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810096658 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 19, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810099050 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 20, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810101358 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 21, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810103633 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 22, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810105902 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 23, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810107967 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 24, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810110242 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 25, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810112456 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 26, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810114713 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 27, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810117006 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 28, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810119411 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 29, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810121960 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 31, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810124488 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 32, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810126535 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 33, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810129107 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 34, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810131667 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 35, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810133998 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 36, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810136496 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 37, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810138809 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 38, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810140997 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 39, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810143161 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 40, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810145097 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 41, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810146939 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 42, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810149344 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 43, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810151608 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 44, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810153945 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 45, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810156245 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 46, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810158452 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 47, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810160716 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 48, end_time_sec = 13555, end_time_nsec = 784464017 }
+fs.select: 13589.810162886 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 49, end_time_sec = 13555, end_time_nsec = 784464017 }
+kernel.syscall_exit: 13589.810167553 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 3 }
+kernel.syscall_entry: 13589.810174015 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 54 [syscall 54] }
+fs.ioctl: 13589.810175963 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 5, cmd = 21515, arg = 2 }
+kernel.syscall_exit: 13589.810191402 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.810195205 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 13589.810197133 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 13589.810205586 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.810209215 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.810211658 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.810216641 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [syscall 3] }
+kernel.sched_try_wakeup: 13589.810224785 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pid = 2241, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 13589.810232928 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { prev_pid = 1852, next_pid = 2241, prev_state = 0 }
+fs.pollfd: 13589.810376178 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 13589.810383759 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { prev_pid = 2241, next_pid = 1852, prev_state = 1 }
+fs.read: 13589.810527293 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4096, fd = 41 }
+kernel.syscall_exit: 13589.810529012 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 16 }
+kernel.syscall_entry: 13589.810536383 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.810538584 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4096, fd = 41 }
+kernel.syscall_exit: 13589.810539746 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.810543579 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 146 [syscall 146] }
+kernel.sched_try_wakeup: 13589.810551803 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pid = 2241, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 13589.810559810 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { prev_pid = 1852, next_pid = 2241, prev_state = 0 }
+fs.pollfd: 13589.810698039 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 13589.810700705 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 13589.810706152 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.810710320 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.810711525 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 32 }
+kernel.syscall_entry: 13589.810718066 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.810719952 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.810721109 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.811907876 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 13589.811934315 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 13589.811937654 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 13589.811943046 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 146 [syscall 146] }
+fs.writev: 13589.811956494 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8, vlen = 3 }
+kernel.syscall_exit: 13589.811958084 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 19088 }
+kernel.syscall_entry: 13589.812177726 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 13589.812180738 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 13589.812183347 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 9 }
+fs.pollfd: 13589.812185177 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+fs.pollfd: 13589.812186623 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 10 }
+fs.pollfd: 13589.812191335 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 14 }
+fs.pollfd: 13589.812193202 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 5 }
+fs.pollfd: 13589.812195737 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 12 }
+fs.pollfd: 13589.812198848 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 19 }
+fs.pollfd: 13589.812200969 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 16 }
+fs.pollfd: 13589.812203745 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 26 }
+fs.pollfd: 13589.812206298 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 21 }
+fs.pollfd: 13589.812209094 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 31 }
+kernel.syscall_exit: 13589.812211627 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 13589.812227790 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 54 [syscall 54] }
+fs.ioctl: 13589.812229782 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 21, cmd = 21531, arg = 3214294504 }
+kernel.syscall_exit: 13589.812233152 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.812237652 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.812245530 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 175, fd = 21 }
+kernel.syscall_exit: 13589.812246804 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 175 }
+kernel.syscall_entry: 13589.812277973 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb6053e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.812280903 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.812290877 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb6053e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.812293238 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.812404299 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 13589.812406693 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 13589.812409246 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 13589.812412611 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 146 [syscall 146] }
+fs.writev: 13589.812422040 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8, vlen = 3 }
+kernel.syscall_exit: 13589.812423659 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1296 }
+kernel.syscall_entry: 13589.812429372 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 13589.812430949 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 13589.812440595 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { prev_pid = 2241, next_pid = 1852, prev_state = 1 }
+fs.writev: 13589.812605405 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 41, vlen = 1 }
+kernel.syscall_exit: 13589.812607545 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 32 }
+kernel.syscall_entry: 13589.812614618 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.812617191 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.812620913 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 13589.812623225 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 13589.812628036 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.812635072 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 142 [syscall 142] }
+fs.select: 13589.812640674 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 1, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812643227 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 3, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812645360 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 5, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812649460 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 7, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812651865 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 13, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812654505 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 19, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812656706 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 20, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812658679 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 21, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812660843 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 22, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812663013 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 23, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812664967 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 24, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812667058 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 25, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812669234 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 26, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812671287 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 27, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812673358 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 28, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812675695 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 29, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812678292 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 31, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812680500 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 32, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812686430 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 33, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812688501 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 34, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812690813 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 35, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812693354 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 36, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812695573 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 37, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812697516 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 38, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812699500 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 39, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812701745 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 40, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812703989 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 41, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812706035 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 42, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812708527 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 43, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812710556 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 44, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812712645 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 45, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812714525 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 46, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812716597 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 47, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812718594 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 48, end_time_sec = 13555, end_time_nsec = 784026237 }
+fs.select: 13589.812720436 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 49, end_time_sec = 13555, end_time_nsec = 784026237 }
+mm.page_free: 13589.812727368 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pfn = 79373, order = 0 }
+kernel.syscall_exit: 13589.812732308 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 2 }
+kernel.syscall_entry: 13589.812738349 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 13589.812740215 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 13589.812747103 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.812750641 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.812753046 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.812757610 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.812762011 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4096, fd = 41 }
+kernel.syscall_exit: 13589.812763254 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 4096 }
+kernel.syscall_entry: 13589.812983825 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.812988338 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 2652, fd = 41 }
+kernel.syscall_exit: 13589.812989686 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 2652 }
+kernel.syscall_entry: 13589.813311906 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.813317039 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4076, fd = 41 }
+kernel.syscall_exit: 13589.813318423 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 4076 }
+kernel.syscall_entry: 13589.813723182 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.813727652 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 3548, fd = 41 }
+kernel.syscall_exit: 13589.813728957 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 3548 }
+kernel.syscall_entry: 13589.813856719 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.813860156 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 956, fd = 41 }
+kernel.syscall_exit: 13589.813861399 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 956 }
+kernel.syscall_entry: 13589.813895679 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [syscall 3] }
+kernel.sched_try_wakeup: 13589.813906065 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pid = 2241, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 13589.813916194 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { prev_pid = 1852, next_pid = 2241, prev_state = 0 }
+fs.pollfd: 13589.814087305 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 13589.814095263 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { prev_pid = 2241, next_pid = 1852, prev_state = 1 }
+kernel.sched_try_wakeup: 13589.814253872 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pid = 2241, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 13589.814262047 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { prev_pid = 1852, next_pid = 2241, prev_state = 0 }
+fs.pollfd: 13589.814402396 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 13589.814409773 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { prev_pid = 2241, next_pid = 1852, prev_state = 1 }
+fs.read: 13589.814552225 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4004, fd = 41 }
+kernel.syscall_exit: 13589.814553901 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 4004 }
+kernel.irq_entry: 13589.814609561 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { ip = 3238019438, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_update_time: 13589.814623936 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { jiffies = 4296292864, xtime_sec = 1262715366, xtime_nsec = 301133047, walltomonotonic_sec = -1262701811, walltomonotonic_nsec = 148963639 }
+kernel.softirq_raise: 13589.814636316 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { softirq_id = 1 [softirq 1] }
+kernel.irq_exit: 13589.814663150 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.softirq_entry: 13589.814666421 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { softirq_id = 1 [softirq 1] }
+kernel.timer_set: 13589.814670681 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { expires = 1325579, function = 0xc103b8db, data = 3245689476 }
+kernel.timer_set: 13589.814677167 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { expires = 1325579, function = 0xc1035211, data = 4144953120 }
+kernel.timer_set: 13589.814679381 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { expires = 1325800, function = 0xc10940c0, data = 0 }
+kernel.timer_set: 13589.814684555 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { expires = 1325732, function = 0xc1035211, data = 4139182272 }
+kernel.timer_set: 13589.814686787 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { expires = 1325800, function = 0xc14d237a, data = 4147466240 }
+kernel.timer_set: 13589.814694832 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { expires = 1325569, function = 0xc141d458, data = 0 }
+kernel.softirq_exit: 13589.814697485 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { softirq_id = 1 [softirq 1] }
+kernel.syscall_entry: 13589.814726427 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [syscall 3] }
+kernel.sched_try_wakeup: 13589.814735276 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pid = 2241, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 13589.814743468 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { prev_pid = 1852, next_pid = 2241, prev_state = 0 }
+fs.pollfd: 13589.814880121 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 13589.814887640 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { prev_pid = 2241, next_pid = 1852, prev_state = 1 }
+fs.read: 13589.815030729 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4004, fd = 41 }
+kernel.syscall_exit: 13589.815032418 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 1052 }
+kernel.irq_entry: 13589.820716621 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { ip = 3077256468, handler = 0x0, irq_id = 239, kernel_mode = 0 }
+kernel.sched_try_wakeup: 13589.820745792 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { pid = 1558, cpu_id = 0, state = 1 }
+kernel.irq_exit: 13589.820761720 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.sched_schedule: 13589.820774766 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1558, 1539, mysqld, , 1417, 0x0, MODE_UNKNOWN { prev_pid = 1852, next_pid = 1558, prev_state = 0 }
+kernel.syscall_exit: 13589.821182487 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1558, 1539, mysqld, , 1417, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.821272136 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1558, 1539, mysqld, , 1417, 0x0, SYSCALL { ip = 0xb6fa7416, syscall_id = 13 [syscall 13] }
+kernel.syscall_exit: 13589.821274281 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1558, 1539, mysqld, , 1417, 0x0, MODE_UNKNOWN { ret = 1262715366 }
+kernel.syscall_entry: 13589.821582343 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1558, 1539, mysqld, , 1417, 0x0, SYSCALL { ip = 0xb6fa7416, syscall_id = 142 [syscall 142] }
+kernel.sched_schedule: 13589.821608319 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { prev_pid = 1558, next_pid = 16887, prev_state = 1 }
+vm_state.vm_map: 13589.821775849 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3030626304, end = 3030630400, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 13589.821779645 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3030630400, end = 3030634496, flags = 1048691, pgoff = 3030630400, inode = 0 }
+vm_state.vm_map: 13589.821782180 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3030634496, end = 3030695936, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 13589.821784191 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3030695936, end = 3030700032, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 13589.821787047 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3030700032, end = 3030781952, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.821789087 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3030781952, end = 3030786048, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.821791815 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3030786048, end = 3030872064, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.821793854 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3030872064, end = 3030876160, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.821796136 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3030876160, end = 3030880256, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.821798189 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3030880256, end = 3030888448, flags = 1048691, pgoff = 3030880256, inode = 0 }
+vm_state.vm_map: 13589.821800699 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3030888448, end = 3030921216, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 13589.821802901 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3030921216, end = 3030925312, flags = 135266419, pgoff = 32768, inode = 20716 }
+vm_state.vm_map: 13589.821805640 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3030925312, end = 3030941696, flags = 134217845, pgoff = 0, inode = 22094 }
+vm_state.vm_map: 13589.821807804 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3030941696, end = 3030945792, flags = 135266419, pgoff = 12288, inode = 22094 }
+vm_state.vm_map: 13589.821809813 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3030945792, end = 3030949888, flags = 1048691, pgoff = 3030945792, inode = 0 }
+vm_state.vm_map: 13589.821812435 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3030949888, end = 3030958080, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.821814890 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3030958080, end = 3030962176, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.821817418 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3030962176, end = 3031060480, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.821819415 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3031060480, end = 3031064576, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.821822266 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3031064576, end = 3031076864, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 13589.821824287 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3031076864, end = 3031080960, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 13589.821827008 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3031080960, end = 3031089152, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.821828987 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3031089152, end = 3031093248, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.821834880 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3031093248, end = 3031097344, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.821837501 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3031097344, end = 3031650304, flags = 134217845, pgoff = 0, inode = 18947 }
+vm_state.vm_map: 13589.821839541 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3031650304, end = 3031670784, flags = 135266419, pgoff = 548864, inode = 18947 }
+vm_state.vm_map: 13589.821842212 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3031670784, end = 3031986176, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 13589.821844408 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3031986176, end = 3031994368, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 13589.821846720 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3031994368, end = 3031998464, flags = 1048691, pgoff = 3031994368, inode = 0 }
+vm_state.vm_map: 13589.821849521 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3031998464, end = 3032428544, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 13589.821851505 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3032428544, end = 3032457216, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 13589.821854071 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3032457216, end = 3032461312, flags = 1048691, pgoff = 3032457216, inode = 0 }
+vm_state.vm_map: 13589.821856694 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3032461312, end = 3032530944, flags = 134217845, pgoff = 0, inode = 1065123 }
+vm_state.vm_map: 13589.821859154 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3032530944, end = 3032535040, flags = 135266419, pgoff = 69632, inode = 1065123 }
+vm_state.vm_map: 13589.821861844 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3032535040, end = 3047030784, flags = 134217845, pgoff = 0, inode = 20672 }
+vm_state.vm_map: 13589.821864236 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3047030784, end = 3047645184, flags = 135266419, pgoff = 14495744, inode = 20672 }
+vm_state.vm_map: 13589.821866352 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3047645184, end = 3047653376, flags = 1048691, pgoff = 3047645184, inode = 0 }
+vm_state.vm_map: 13589.821869128 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3047653376, end = 3048026112, flags = 134217845, pgoff = 0, inode = 20902 }
+vm_state.vm_map: 13589.821871236 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3048026112, end = 3048038400, flags = 135266419, pgoff = 368640, inode = 20902 }
+vm_state.vm_map: 13589.821873765 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3048038400, end = 3050594304, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 13589.821875756 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3050594304, end = 3050643456, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 13589.821877926 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3050643456, end = 3050651648, flags = 1048691, pgoff = 3050643456, inode = 0 }
+vm_state.vm_map: 13589.821880659 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3050651648, end = 3050766336, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.821882848 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3050766336, end = 3050770432, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.821885501 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3050770432, end = 3050917888, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.821887677 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3050917888, end = 3050921984, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.821889792 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3050921984, end = 3050926080, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.821892791 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3050926080, end = 3050958848, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 13589.821894750 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3050958848, end = 3050962944, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 13589.821897304 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3050962944, end = 3050979328, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 13589.821899332 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3050979328, end = 3050983424, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 13589.821901960 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3050983424, end = 3052113920, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 13589.821903920 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3052113920, end = 3052130304, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 13589.821906054 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3052130304, end = 3052134400, flags = 1048691, pgoff = 3052130304, inode = 0 }
+vm_state.vm_map: 13589.821908428 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3052134400, end = 3052404736, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 13589.821910604 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3052404736, end = 3052412928, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 13589.821912996 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3052412928, end = 3052744704, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 13589.821915173 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3052744704, end = 3052752896, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 13589.821917616 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3052752896, end = 3053690880, flags = 134217845, pgoff = 0, inode = 16850 }
+vm_state.vm_map: 13589.821919940 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3053690880, end = 3053707264, flags = 135266417, pgoff = 937984, inode = 16850 }
+vm_state.vm_map: 13589.821921914 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3053707264, end = 3053711360, flags = 135266419, pgoff = 954368, inode = 16850 }
+vm_state.vm_map: 13589.821924207 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3053711360, end = 3053740032, flags = 1048691, pgoff = 3053711360, inode = 0 }
+vm_state.vm_map: 13589.821926773 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3053740032, end = 3056050176, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 13589.821929302 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3056050176, end = 3056078848, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 13589.821931268 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3056078848, end = 3056082944, flags = 1048691, pgoff = 3056078848, inode = 0 }
+vm_state.vm_map: 13589.821934137 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3056082944, end = 3056549888, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 13589.821936171 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3056549888, end = 3056558080, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 13589.821938218 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3056558080, end = 3056562176, flags = 1048691, pgoff = 3056558080, inode = 0 }
+vm_state.vm_map: 13589.821940524 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3056562176, end = 3066601472, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 13589.821942700 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3066601472, end = 3066761216, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 13589.821944679 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3066761216, end = 3066769408, flags = 1048691, pgoff = 3066761216, inode = 0 }
+vm_state.vm_map: 13589.821947276 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3066769408, end = 3069071360, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 13589.821949267 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3069071360, end = 3069116416, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 13589.821951938 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3069116416, end = 3069132800, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 13589.821953917 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3069132800, end = 3069136896, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 13589.821956483 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3069136896, end = 3069169664, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 13589.821958430 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3069169664, end = 3069173760, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 13589.821961138 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3069173760, end = 3069181952, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 13589.821963166 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3069181952, end = 3069186048, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 13589.821965634 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3069186048, end = 3069190144, flags = 1048691, pgoff = 3069186048, inode = 0 }
+vm_state.vm_map: 13589.821968045 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3069190144, end = 3069198336, flags = 134217845, pgoff = 0, inode = 17721 }
+vm_state.vm_map: 13589.821970184 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3069198336, end = 3069202432, flags = 135266419, pgoff = 4096, inode = 17721 }
+vm_state.vm_map: 13589.821972546 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3069202432, end = 3069227008, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 13589.821974722 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3069227008, end = 3069231104, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 13589.821977203 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3069231104, end = 3069595648, flags = 134217845, pgoff = 0, inode = 1065038 }
+vm_state.vm_map: 13589.821979373 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3069595648, end = 3069632512, flags = 135266423, pgoff = 364544, inode = 1065038 }
+vm_state.vm_map: 13589.821981345 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3069632512, end = 3069636608, flags = 1048695, pgoff = 3069632512, inode = 0 }
+vm_state.vm_map: 13589.821983924 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3069636608, end = 3069689856, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 13589.821985915 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3069689856, end = 3069693952, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 13589.821988579 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3069693952, end = 3070844928, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.821990552 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3070844928, end = 3070861312, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.821993192 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3070861312, end = 3070947328, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 13589.821995245 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3070947328, end = 3070951424, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 13589.821997397 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3070951424, end = 3070963712, flags = 1048691, pgoff = 3070951424, inode = 0 }
+vm_state.vm_map: 13589.821999814 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3070963712, end = 3070992384, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 13589.822002194 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3070992384, end = 3070996480, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 13589.822004754 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3070996480, end = 3071152128, flags = 134217845, pgoff = 0, inode = 23969 }
+vm_state.vm_map: 13589.822006764 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3071152128, end = 3071160320, flags = 135266419, pgoff = 151552, inode = 23969 }
+vm_state.vm_map: 13589.822009293 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3071160320, end = 3071250432, flags = 134217845, pgoff = 0, inode = 23864 }
+vm_state.vm_map: 13589.822011271 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3071250432, end = 3071254528, flags = 135266419, pgoff = 90112, inode = 23864 }
+vm_state.vm_map: 13589.822013979 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3071254528, end = 3071414272, flags = 134217845, pgoff = 0, inode = 22541 }
+vm_state.vm_map: 13589.822016008 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3071414272, end = 3071418368, flags = 135266419, pgoff = 159744, inode = 22541 }
+vm_state.vm_map: 13589.822018469 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3071418368, end = 3073400832, flags = 134217845, pgoff = 0, inode = 20915 }
+vm_state.vm_map: 13589.822020620 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3073400832, end = 3073441792, flags = 135266419, pgoff = 1978368, inode = 20915 }
+vm_state.vm_map: 13589.822023143 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3073441792, end = 3077038080, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 13589.822025116 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3077038080, end = 3077136384, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 13589.822027249 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3077136384, end = 3077144576, flags = 1048691, pgoff = 3077136384, inode = 0 }
+vm_state.vm_map: 13589.822029716 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3077144576, end = 3078459392, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.822031879 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3078459392, end = 3078467584, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.822034099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3078467584, end = 3078471680, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.822036289 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3078471680, end = 3078483968, flags = 1048691, pgoff = 3078471680, inode = 0 }
+vm_state.vm_map: 13589.822039052 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3078483968, end = 3079278592, flags = 134217845, pgoff = 0, inode = 1065333 }
+vm_state.vm_map: 13589.822041216 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3079278592, end = 3079290880, flags = 135266419, pgoff = 790528, inode = 1065333 }
+vm_state.vm_map: 13589.822044153 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3079303168, end = 3079335936, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 13589.822046162 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3079335936, end = 3079340032, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 13589.822049069 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3079340032, end = 3079348224, flags = 134217845, pgoff = 0, inode = 1450546 }
+vm_state.vm_map: 13589.822051097 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3079348224, end = 3079352320, flags = 135266417, pgoff = 4096, inode = 1450546 }
+vm_state.vm_map: 13589.822053298 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3079352320, end = 3079356416, flags = 135266419, pgoff = 8192, inode = 1450546 }
+vm_state.vm_map: 13589.822055895 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3079356416, end = 3079385088, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.822058070 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3079385088, end = 3079393280, flags = 1048691, pgoff = 3079385088, inode = 0 }
+vm_state.vm_map: 13589.822060124 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3079393280, end = 3079397376, flags = 67371125, pgoff = 3079393280, inode = 0 }
+vm_state.vm_map: 13589.822062881 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3079397376, end = 3079512064, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.822064841 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3079512064, end = 3079516160, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.822067155 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3079516160, end = 3079520256, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.822069318 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2207, start = 3217727488, end = 3217813504, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.822073492 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 134512640, end = 134553600, flags = 134223989, pgoff = 0, inode = 20759 }
+vm_state.vm_map: 13589.822075433 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 134553600, end = 134557696, flags = 135272563, pgoff = 36864, inode = 20759 }
+vm_state.vm_map: 13589.822078085 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 134557696, end = 134565888, flags = 1048691, pgoff = 134557696, inode = 0 }
+vm_state.vm_map: 13589.822080133 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 145301504, end = 147542016, flags = 1048691, pgoff = 145301504, inode = 0 }
+vm_state.vm_map: 13589.822086037 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3002515456, end = 3002556416, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.822088202 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3002556416, end = 3002560512, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.822090230 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3002560512, end = 3002564608, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.822092659 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3002564608, end = 3002601472, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.822094693 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3002601472, end = 3002605568, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.822096728 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3002605568, end = 3002609664, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.822099245 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3002609664, end = 3002687488, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.822101297 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3002687488, end = 3002691584, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.822103338 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3002691584, end = 3002695680, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.822105378 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3002695680, end = 3002703872, flags = 1048691, pgoff = 3002695680, inode = 0 }
+vm_state.vm_map: 13589.822107895 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3002703872, end = 3002728448, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.822109941 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3002728448, end = 3002732544, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.822111976 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3002732544, end = 3002736640, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.822114839 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3002736640, end = 3018977280, flags = 134217979, pgoff = 0, inode = 1204527 }
+vm_state.vm_map: 13589.822117343 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3018977280, end = 3023273984, flags = 134217979, pgoff = 0, inode = 1204522 }
+vm_state.vm_map: 13589.822119902 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3023273984, end = 3023474688, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 13589.822121949 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3023474688, end = 3023478784, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 13589.822124218 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3023478784, end = 3023511552, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 13589.822126253 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3023511552, end = 3023515648, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 13589.822128423 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3023515648, end = 3023540224, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 13589.822130476 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3023540224, end = 3023544320, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 13589.822132843 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3023638528, end = 3023642624, flags = 134217937, pgoff = 0, inode = 1196317 }
+vm_state.vm_map: 13589.822135348 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3023642624, end = 3023667200, flags = 134217937, pgoff = 0, inode = 1196229 }
+vm_state.vm_map: 13589.822137388 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3023667200, end = 3023904768, flags = 1048691, pgoff = 3023904768, inode = 0 }
+vm_state.vm_map: 13589.822139880 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3023908864, end = 3023941632, flags = 134217937, pgoff = 0, inode = 1196200 }
+vm_state.vm_map: 13589.822142285 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3023941632, end = 3023953920, flags = 134217937, pgoff = 0, inode = 1196226 }
+vm_state.vm_map: 13589.822144820 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3023953920, end = 3023962112, flags = 134217937, pgoff = 0, inode = 1196225 }
+vm_state.vm_map: 13589.822147126 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3023962112, end = 3023966208, flags = 134217937, pgoff = 0, inode = 1196224 }
+vm_state.vm_map: 13589.822149631 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3023966208, end = 3023970304, flags = 134217937, pgoff = 0, inode = 1196223 }
+vm_state.vm_map: 13589.822152166 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3023970304, end = 3023974400, flags = 134217937, pgoff = 0, inode = 1196202 }
+vm_state.vm_map: 13589.822154682 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3023974400, end = 3024003072, flags = 134217937, pgoff = 0, inode = 1196222 }
+vm_state.vm_map: 13589.822156859 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3024003072, end = 3024015360, flags = 134217937, pgoff = 0, inode = 1196221 }
+vm_state.vm_map: 13589.822159375 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3024015360, end = 3024019456, flags = 134217937, pgoff = 0, inode = 1196220 }
+vm_state.vm_map: 13589.822161651 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3024019456, end = 3024027648, flags = 134217937, pgoff = 0, inode = 1196219 }
+vm_state.vm_map: 13589.822164186 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3024027648, end = 3024031744, flags = 134217937, pgoff = 0, inode = 1196210 }
+vm_state.vm_map: 13589.822166578 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3024031744, end = 3024035840, flags = 134217937, pgoff = 0, inode = 1196205 }
+vm_state.vm_map: 13589.822171748 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3024035840, end = 3024048128, flags = 134217937, pgoff = 0, inode = 1196244 }
+vm_state.vm_map: 13589.822174017 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3024048128, end = 3024056320, flags = 134217937, pgoff = 0, inode = 1196270 }
+vm_state.vm_map: 13589.822176545 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3024056320, end = 3024089088, flags = 134217937, pgoff = 0, inode = 1196246 }
+vm_state.vm_map: 13589.822178859 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3024089088, end = 3024109568, flags = 134217937, pgoff = 0, inode = 1196269 }
+vm_state.vm_map: 13589.822181276 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3024109568, end = 3024117760, flags = 134217937, pgoff = 0, inode = 1196316 }
+vm_state.vm_map: 13589.822183582 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3024117760, end = 3024146432, flags = 134217937, pgoff = 0, inode = 1196197 }
+vm_state.vm_map: 13589.822186259 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3024146432, end = 3024191488, flags = 134217937, pgoff = 0, inode = 1196312 }
+vm_state.vm_map: 13589.822188571 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3024191488, end = 3024248832, flags = 134217937, pgoff = 0, inode = 1196272 }
+vm_state.vm_map: 13589.822191824 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3024248832, end = 3024474112, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.822193865 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3024474112, end = 3024478208, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.822195899 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3024478208, end = 3024482304, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.822198223 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3024482304, end = 3024490496, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 13589.822200400 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3024490496, end = 3024494592, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 13589.822202694 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3024494592, end = 3024498688, flags = 134217937, pgoff = 0, inode = 1196235 }
+vm_state.vm_map: 13589.822205248 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3024498688, end = 3024502784, flags = 134217937, pgoff = 0, inode = 1196204 }
+vm_state.vm_map: 13589.822207745 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3024502784, end = 3024506880, flags = 134217937, pgoff = 0, inode = 1196228 }
+vm_state.vm_map: 13589.822210127 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3024506880, end = 3024510976, flags = 134217937, pgoff = 0, inode = 1196227 }
+vm_state.vm_map: 13589.822212315 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3024510976, end = 3024519168, flags = 134217937, pgoff = 0, inode = 1196198 }
+vm_state.vm_map: 13589.822214869 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3024519168, end = 3024576512, flags = 134217937, pgoff = 0, inode = 1196231 }
+vm_state.vm_map: 13589.822217088 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3024576512, end = 3024609280, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 13589.822219377 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3024609280, end = 3024613376, flags = 135266419, pgoff = 32768, inode = 20716 }
+vm_state.vm_map: 13589.822221670 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3024613376, end = 3025133568, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 13589.822223853 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3025133568, end = 3025141760, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 13589.822226134 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3025141760, end = 3025506304, flags = 134217845, pgoff = 0, inode = 1065038 }
+vm_state.vm_map: 13589.822228534 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3025506304, end = 3025543168, flags = 135266423, pgoff = 364544, inode = 1065038 }
+vm_state.vm_map: 13589.822230488 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3025543168, end = 3025547264, flags = 1048695, pgoff = 3025543168, inode = 0 }
+vm_state.vm_map: 13589.822232911 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3025547264, end = 3026100224, flags = 134217845, pgoff = 0, inode = 18947 }
+vm_state.vm_map: 13589.822234865 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3026100224, end = 3026120704, flags = 135266419, pgoff = 548864, inode = 18947 }
+vm_state.vm_map: 13589.822237147 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3026120704, end = 3026436096, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 13589.822239224 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3026436096, end = 3026444288, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 13589.822241512 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3026444288, end = 3026513920, flags = 134217845, pgoff = 0, inode = 1065123 }
+vm_state.vm_map: 13589.822243453 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3026513920, end = 3026518016, flags = 135266419, pgoff = 69632, inode = 1065123 }
+vm_state.vm_map: 13589.822245784 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3026518016, end = 3041013760, flags = 134217845, pgoff = 0, inode = 20672 }
+vm_state.vm_map: 13589.822247739 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3041013760, end = 3041628160, flags = 135266419, pgoff = 14495744, inode = 20672 }
+vm_state.vm_map: 13589.822249909 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3041628160, end = 3041636352, flags = 1048691, pgoff = 3041628160, inode = 0 }
+vm_state.vm_map: 13589.822252134 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3041636352, end = 3042009088, flags = 134217845, pgoff = 0, inode = 20902 }
+vm_state.vm_map: 13589.822254428 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3042009088, end = 3042021376, flags = 135266419, pgoff = 368640, inode = 20902 }
+vm_state.vm_map: 13589.822256864 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3042021376, end = 3042111488, flags = 134217845, pgoff = 0, inode = 1065189 }
+vm_state.vm_map: 13589.822259054 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3042111488, end = 3042115584, flags = 135266419, pgoff = 90112, inode = 1065189 }
+vm_state.vm_map: 13589.822261187 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3042115584, end = 3044098048, flags = 134217845, pgoff = 0, inode = 20915 }
+vm_state.vm_map: 13589.822263697 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3044098048, end = 3044139008, flags = 135266419, pgoff = 1978368, inode = 20915 }
+vm_state.vm_map: 13589.822266108 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3044139008, end = 3045470208, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.822268389 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3045470208, end = 3045486592, flags = 1048691, pgoff = 3045470208, inode = 0 }
+vm_state.vm_map: 13589.822270808 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3045486592, end = 3045634048, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.822272978 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3045634048, end = 3045642240, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.822275506 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3045642240, end = 3045961728, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 13589.822277602 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3045961728, end = 3045978112, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 13589.822279698 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3045978112, end = 3045990400, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 13589.822281937 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3045990400, end = 3045994496, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 13589.822284342 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3045994496, end = 3047251968, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 13589.822286512 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3047251968, end = 3047272448, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 13589.822288504 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3047272448, end = 3047280640, flags = 1048691, pgoff = 3047272448, inode = 0 }
+vm_state.vm_map: 13589.822291138 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3047280640, end = 3047518208, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 13589.822293085 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3047518208, end = 3047522304, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 13589.822298037 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3047522304, end = 3047538688, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.822300431 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3047538688, end = 3047542784, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.822302663 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3047542784, end = 3047550976, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.822304641 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3047550976, end = 3047555072, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.822307281 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3047555072, end = 3047747584, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.822309365 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3047747584, end = 3047751680, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.822311678 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3047751680, end = 3047804928, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 13589.822313644 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3047804928, end = 3047809024, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 13589.822315925 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3047809024, end = 3047813120, flags = 1048691, pgoff = 3047809024, inode = 0 }
+vm_state.vm_map: 13589.822318256 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3047813120, end = 3047985152, flags = 134217845, pgoff = 0, inode = 1065255 }
+vm_state.vm_map: 13589.822320433 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3047985152, end = 3047989248, flags = 135266419, pgoff = 172032, inode = 1065255 }
+vm_state.vm_map: 13589.822322826 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3047989248, end = 3048235008, flags = 134217845, pgoff = 0, inode = 20603 }
+vm_state.vm_map: 13589.822325120 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3048235008, end = 3048239104, flags = 135266419, pgoff = 245760, inode = 20603 }
+vm_state.vm_map: 13589.822327525 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3048239104, end = 3048710144, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 13589.822329565 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3048710144, end = 3048726528, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 13589.822332020 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3048726528, end = 3048869888, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 13589.822334209 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3048869888, end = 3048873984, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 13589.822336707 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3048873984, end = 3048960000, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 13589.822338952 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3048960000, end = 3048964096, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 13589.822340998 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3048964096, end = 3048968192, flags = 1048691, pgoff = 3048964096, inode = 0 }
+vm_state.vm_map: 13589.822343156 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3048968192, end = 3048984576, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 13589.822345320 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3048984576, end = 3048988672, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 13589.822347478 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3048988672, end = 3049021440, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 13589.822349512 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3049021440, end = 3049025536, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 13589.822351707 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3049025536, end = 3049041920, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 13589.822353686 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3049041920, end = 3049046016, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 13589.822355745 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3049046016, end = 3049132032, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 13589.822357797 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3049132032, end = 3049136128, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 13589.822359837 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3049136128, end = 3049144320, flags = 1048691, pgoff = 3049136128, inode = 0 }
+vm_state.vm_map: 13589.822361916 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3049144320, end = 3049172992, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 13589.822363851 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3049172992, end = 3049177088, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 13589.822365897 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3049177088, end = 3049181184, flags = 1048691, pgoff = 3049177088, inode = 0 }
+vm_state.vm_map: 13589.822367975 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3049181184, end = 3049512960, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 13589.822370256 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3049512960, end = 3049521152, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 13589.822372384 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3049521152, end = 3049553920, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 13589.822374325 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3049553920, end = 3049558016, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 13589.822376773 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3049558016, end = 3049574400, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 13589.822378814 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3049574400, end = 3049578496, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 13589.822381127 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3049578496, end = 3049603072, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 13589.822383062 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3049603072, end = 3049607168, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 13589.822385380 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3049607168, end = 3049639936, flags = 134217845, pgoff = 0, inode = 18621 }
+vm_state.vm_map: 13589.822387513 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3049639936, end = 3049644032, flags = 135266419, pgoff = 28672, inode = 18621 }
+vm_state.vm_map: 13589.822389641 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3049644032, end = 3049648128, flags = 1048691, pgoff = 3049644032, inode = 0 }
+vm_state.vm_map: 13589.822391774 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3049648128, end = 3050078208, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 13589.822393839 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3050078208, end = 3050106880, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 13589.822395793 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3050106880, end = 3050110976, flags = 1048691, pgoff = 3050106880, inode = 0 }
+vm_state.vm_map: 13589.822401117 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3050110976, end = 3050553344, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 13589.822403299 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3050553344, end = 3050561536, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 13589.822405890 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3050561536, end = 3050659840, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.822408060 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3050659840, end = 3050663936, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.822410144 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3050663936, end = 3050934272, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 13589.822412203 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3050934272, end = 3050942464, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 13589.822414287 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3050942464, end = 3051003904, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 13589.822416234 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3051003904, end = 3051008000, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 13589.822418299 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3051008000, end = 3051012096, flags = 1048691, pgoff = 3051008000, inode = 0 }
+vm_state.vm_map: 13589.822420382 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3051012096, end = 3051479040, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 13589.822422331 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3051479040, end = 3051487232, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 13589.822424408 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3051487232, end = 3052617728, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 13589.822426486 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3052617728, end = 3052634112, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 13589.822428594 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3052634112, end = 3052748800, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.822430541 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3052748800, end = 3052752896, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.822432873 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3052752896, end = 3052900352, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.822434827 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3052900352, end = 3052904448, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.822436774 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3052904448, end = 3052908544, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.822439352 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3052908544, end = 3052916736, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.822441300 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3052916736, end = 3052920832, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.822443248 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3052920832, end = 3052924928, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.822445320 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3052924928, end = 3052929024, flags = 1048691, pgoff = 3052924928, inode = 0 }
+vm_state.vm_map: 13589.822447391 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3052929024, end = 3053015040, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.822449344 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3053015040, end = 3053019136, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.822451423 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3053019136, end = 3053023232, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.822453370 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3053023232, end = 3053031424, flags = 1048691, pgoff = 3053023232, inode = 0 }
+vm_state.vm_map: 13589.822455664 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3053031424, end = 3053776896, flags = 134217845, pgoff = 0, inode = 499794 }
+vm_state.vm_map: 13589.822457716 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3053776896, end = 3053780992, flags = 135266419, pgoff = 745472, inode = 499794 }
+vm_state.vm_map: 13589.822460041 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3053780992, end = 3053809664, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.822462118 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3053809664, end = 3053813760, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.822464067 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3053813760, end = 3053817856, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.822466404 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3053817856, end = 3053834240, flags = 134217845, pgoff = 0, inode = 20149 }
+vm_state.vm_map: 13589.822468357 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3053834240, end = 3053838336, flags = 135266419, pgoff = 12288, inode = 20149 }
+vm_state.vm_map: 13589.822470430 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3053838336, end = 3053920256, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.822472945 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3053920256, end = 3053924352, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.822475023 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3053924352, end = 3055239168, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.822476971 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3055239168, end = 3055247360, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.822479017 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3055247360, end = 3055251456, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.822480983 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3055251456, end = 3055267840, flags = 1048691, pgoff = 3055251456, inode = 0 }
+vm_state.vm_map: 13589.822483074 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3055267840, end = 3056205824, flags = 134217845, pgoff = 0, inode = 16850 }
+vm_state.vm_map: 13589.822485126 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3056205824, end = 3056222208, flags = 135266417, pgoff = 937984, inode = 16850 }
+vm_state.vm_map: 13589.822487080 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3056222208, end = 3056226304, flags = 135266419, pgoff = 954368, inode = 16850 }
+vm_state.vm_map: 13589.822489028 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3056226304, end = 3056254976, flags = 1048691, pgoff = 3056226304, inode = 0 }
+vm_state.vm_map: 13589.822491112 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3056254976, end = 3066294272, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 13589.822493183 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3066294272, end = 3066454016, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 13589.822495254 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3066454016, end = 3066462208, flags = 1048691, pgoff = 3066454016, inode = 0 }
+vm_state.vm_map: 13589.822497443 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3066462208, end = 3070058496, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 13589.822499403 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3070058496, end = 3070156800, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 13589.822501450 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3070156800, end = 3070160896, flags = 1048691, pgoff = 3070156800, inode = 0 }
+vm_state.vm_map: 13589.822503528 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3070160896, end = 3072716800, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 13589.822505846 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3072716800, end = 3072765952, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 13589.822507892 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3072765952, end = 3072770048, flags = 1048691, pgoff = 3072765952, inode = 0 }
+vm_state.vm_map: 13589.822509970 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3072770048, end = 3073921024, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.822511923 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3073921024, end = 3073937408, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.822514280 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3073937408, end = 3074170880, flags = 134217845, pgoff = 0, inode = 1065180 }
+vm_state.vm_map: 13589.822516234 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3074170880, end = 3074179072, flags = 135266419, pgoff = 233472, inode = 1065180 }
+vm_state.vm_map: 13589.822518187 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3074179072, end = 3074183168, flags = 1048691, pgoff = 3074179072, inode = 0 }
+vm_state.vm_map: 13589.822520265 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3074183168, end = 3076485120, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 13589.822522336 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3076485120, end = 3076530176, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 13589.822524408 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3076530176, end = 3078840320, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 13589.822526362 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3078840320, end = 3078868992, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 13589.822528550 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3078868992, end = 3078873088, flags = 1048691, pgoff = 3078868992, inode = 0 }
+vm_state.vm_map: 13589.822530980 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3078877184, end = 3078889472, flags = 134217937, pgoff = 0, inode = 1196315 }
+vm_state.vm_map: 13589.822533076 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3078889472, end = 3078897664, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 13589.822535030 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3078897664, end = 3078901760, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 13589.822537324 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3078901760, end = 3078918144, flags = 134217845, pgoff = 0, inode = 22094 }
+vm_state.vm_map: 13589.822539643 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3078918144, end = 3078922240, flags = 135266419, pgoff = 12288, inode = 22094 }
+vm_state.vm_map: 13589.822541738 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3078922240, end = 3078930432, flags = 134217845, pgoff = 0, inode = 1450546 }
+vm_state.vm_map: 13589.822543798 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3078930432, end = 3078934528, flags = 135266417, pgoff = 4096, inode = 1450546 }
+vm_state.vm_map: 13589.822545746 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3078934528, end = 3078938624, flags = 135266419, pgoff = 8192, inode = 1450546 }
+vm_state.vm_map: 13589.822547848 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3078938624, end = 3078967296, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.822549931 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3078967296, end = 3078975488, flags = 1048691, pgoff = 3078967296, inode = 0 }
+vm_state.vm_map: 13589.822551886 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3078975488, end = 3078979584, flags = 67371125, pgoff = 3078975488, inode = 0 }
+vm_state.vm_map: 13589.822553982 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3078979584, end = 3079094272, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.822556047 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3079094272, end = 3079098368, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.822558000 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3079098368, end = 3079102464, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.822559948 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2209, start = 3214217216, end = 3214303232, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.822568802 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 134512640, end = 134627328, flags = 134223989, pgoff = 0, inode = 1352621 }
+vm_state.vm_map: 13589.822570849 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 134627328, end = 134631424, flags = 135272563, pgoff = 114688, inode = 1352621 }
+vm_state.vm_map: 13589.822572896 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 141119488, end = 149274624, flags = 1048691, pgoff = 141119488, inode = 0 }
+vm_state.vm_map: 13589.822579159 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2916810752, end = 2916818944, flags = 134217845, pgoff = 0, inode = 132462 }
+vm_state.vm_map: 13589.822581212 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2916818944, end = 2916823040, flags = 135266419, pgoff = 4096, inode = 132462 }
+vm_state.vm_map: 13589.822588644 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2916823040, end = 2916851712, flags = 134217845, pgoff = 0, inode = 133405 }
+vm_state.vm_map: 13589.822590690 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2916851712, end = 2916855808, flags = 135266419, pgoff = 24576, inode = 133405 }
+vm_state.vm_map: 13589.822597480 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2916855808, end = 2916876288, flags = 134217845, pgoff = 0, inode = 134577 }
+vm_state.vm_map: 13589.822599538 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2916876288, end = 2916880384, flags = 135266419, pgoff = 16384, inode = 134577 }
+vm_state.vm_map: 13589.822601987 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2916880384, end = 2916888576, flags = 134217845, pgoff = 0, inode = 133774 }
+vm_state.vm_map: 13589.822604033 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2916888576, end = 2916892672, flags = 135266419, pgoff = 4096, inode = 133774 }
+vm_state.vm_map: 13589.822608795 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2916892672, end = 2916933632, flags = 134217845, pgoff = 0, inode = 133487 }
+vm_state.vm_map: 13589.822610847 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2916933632, end = 2916937728, flags = 135266419, pgoff = 36864, inode = 133487 }
+vm_state.vm_map: 13589.822615813 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2916937728, end = 2916982784, flags = 134217845, pgoff = 0, inode = 132466 }
+vm_state.vm_map: 13589.822617865 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2916982784, end = 2916986880, flags = 135266419, pgoff = 40960, inode = 132466 }
+vm_state.vm_map: 13589.822620567 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2916986880, end = 2917019648, flags = 134217845, pgoff = 0, inode = 133402 }
+vm_state.vm_map: 13589.822622546 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2917019648, end = 2917023744, flags = 135266419, pgoff = 28672, inode = 133402 }
+vm_state.vm_map: 13589.822629156 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2917023744, end = 2917040128, flags = 134217845, pgoff = 0, inode = 133403 }
+vm_state.vm_map: 13589.822631326 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2917040128, end = 2917044224, flags = 135266419, pgoff = 12288, inode = 133403 }
+vm_state.vm_map: 13589.822640842 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2917044224, end = 2917060608, flags = 134217845, pgoff = 0, inode = 133404 }
+vm_state.vm_map: 13589.822642900 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2917060608, end = 2917064704, flags = 135266419, pgoff = 12288, inode = 133404 }
+vm_state.vm_map: 13589.822645807 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2917064704, end = 2917195776, flags = 134217937, pgoff = 0, inode = 156525 }
+vm_state.vm_map: 13589.822648478 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2917195776, end = 2917326848, flags = 134217937, pgoff = 0, inode = 156518 }
+vm_state.vm_map: 13589.822651557 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2917326848, end = 2917339136, flags = 134217845, pgoff = 0, inode = 20765 }
+vm_state.vm_map: 13589.822653640 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2917339136, end = 2917343232, flags = 135266419, pgoff = 8192, inode = 20765 }
+vm_state.vm_map: 13589.822655984 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2917343232, end = 2917806080, flags = 134217845, pgoff = 0, inode = 20061 }
+vm_state.vm_map: 13589.822658056 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2917806080, end = 2917818368, flags = 135266419, pgoff = 458752, inode = 20061 }
+vm_state.vm_map: 13589.822660393 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2917818368, end = 2917879808, flags = 134217845, pgoff = 0, inode = 19423 }
+vm_state.vm_map: 13589.822662352 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2917879808, end = 2917883904, flags = 135266419, pgoff = 57344, inode = 19423 }
+vm_state.vm_map: 13589.822664659 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2917883904, end = 2918490112, flags = 134217845, pgoff = 0, inode = 22471 }
+vm_state.vm_map: 13589.822666607 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2918490112, end = 2918506496, flags = 135266419, pgoff = 602112, inode = 22471 }
+vm_state.vm_map: 13589.822672122 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2918506496, end = 2918596608, flags = 134217845, pgoff = 0, inode = 19203 }
+vm_state.vm_map: 13589.822674069 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2918596608, end = 2918600704, flags = 135266419, pgoff = 86016, inode = 19203 }
+vm_state.vm_map: 13589.822676500 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2918600704, end = 2918608896, flags = 134217845, pgoff = 0, inode = 500018 }
+vm_state.vm_map: 13589.822678460 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2918608896, end = 2918612992, flags = 135266419, pgoff = 4096, inode = 500018 }
+vm_state.vm_map: 13589.822701504 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2918612992, end = 2918637568, flags = 134217845, pgoff = 0, inode = 18679 }
+vm_state.vm_map: 13589.822703638 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2918637568, end = 2918641664, flags = 135266419, pgoff = 20480, inode = 18679 }
+vm_state.vm_map: 13589.822709802 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2918641664, end = 2918690816, flags = 134217845, pgoff = 0, inode = 19447 }
+vm_state.vm_map: 13589.822711842 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2918690816, end = 2918694912, flags = 135266419, pgoff = 49152, inode = 19447 }
+vm_state.vm_map: 13589.822714445 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2918694912, end = 2918961152, flags = 134217845, pgoff = 0, inode = 19433 }
+vm_state.vm_map: 13589.822716635 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2918961152, end = 2918969344, flags = 135266419, pgoff = 262144, inode = 19433 }
+vm_state.vm_map: 13589.822718805 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2918969344, end = 2918973440, flags = 1048691, pgoff = 2918969344, inode = 0 }
+vm_state.vm_map: 13589.822721321 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2918973440, end = 2919137280, flags = 134217845, pgoff = 0, inode = 18646 }
+vm_state.vm_map: 13589.822723491 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2919137280, end = 2919141376, flags = 135266419, pgoff = 163840, inode = 18646 }
+vm_state.vm_map: 13589.822726026 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2919141376, end = 2919804928, flags = 134217845, pgoff = 0, inode = 18913 }
+vm_state.vm_map: 13589.822728067 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2919804928, end = 2919829504, flags = 135266419, pgoff = 659456, inode = 18913 }
+vm_state.vm_map: 13589.822730707 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2919829504, end = 2919993344, flags = 134217845, pgoff = 0, inode = 18977 }
+vm_state.vm_map: 13589.822732760 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2919993344, end = 2919997440, flags = 135266419, pgoff = 163840, inode = 18977 }
+vm_state.vm_map: 13589.822737651 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2919997440, end = 2920034304, flags = 134217845, pgoff = 0, inode = 21392 }
+vm_state.vm_map: 13589.822739697 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2920034304, end = 2920038400, flags = 135266417, pgoff = 36864, inode = 21392 }
+vm_state.vm_map: 13589.822741756 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2920038400, end = 2920042496, flags = 135266419, pgoff = 40960, inode = 21392 }
+vm_state.vm_map: 13589.822743963 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2920042496, end = 2920046592, flags = 1048691, pgoff = 2920042496, inode = 0 }
+vm_state.vm_map: 13589.822746776 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2920046592, end = 2920079360, flags = 134217845, pgoff = 0, inode = 22483 }
+vm_state.vm_map: 13589.822748842 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2920079360, end = 2920083456, flags = 135266419, pgoff = 28672, inode = 22483 }
+vm_state.vm_map: 13589.822756145 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2920083456, end = 2924834816, flags = 134217845, pgoff = 0, inode = 21393 }
+vm_state.vm_map: 13589.822758333 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2924834816, end = 2924871680, flags = 135266417, pgoff = 4747264, inode = 21393 }
+vm_state.vm_map: 13589.822760479 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2924871680, end = 2924892160, flags = 135266419, pgoff = 4784128, inode = 21393 }
+vm_state.vm_map: 13589.822762599 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2924892160, end = 2924896256, flags = 1048691, pgoff = 2924892160, inode = 0 }
+vm_state.vm_map: 13589.822765005 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2924900352, end = 2924904448, flags = 134217845, pgoff = 0, inode = 133407 }
+vm_state.vm_map: 13589.822767163 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2924904448, end = 2924908544, flags = 135266419, pgoff = 0, inode = 133407 }
+vm_state.vm_map: 13589.822772084 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2924908544, end = 2924974080, flags = 134217937, pgoff = 0, inode = 156520 }
+vm_state.vm_map: 13589.822774749 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2924974080, end = 2924982272, flags = 134217845, pgoff = 0, inode = 1450591 }
+vm_state.vm_map: 13589.822776920 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2924982272, end = 2924986368, flags = 135266417, pgoff = 4096, inode = 1450591 }
+vm_state.vm_map: 13589.822779072 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2924986368, end = 2924990464, flags = 135266419, pgoff = 8192, inode = 1450591 }
+vm_state.vm_map: 13589.822781619 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2924990464, end = 2925002752, flags = 134217845, pgoff = 0, inode = 133668 }
+vm_state.vm_map: 13589.822784061 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2925002752, end = 2925006848, flags = 135266419, pgoff = 8192, inode = 133668 }
+vm_state.vm_map: 13589.822786819 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2925006848, end = 2925056000, flags = 134217845, pgoff = 0, inode = 133399 }
+vm_state.vm_map: 13589.822788977 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2925056000, end = 2925060096, flags = 135266419, pgoff = 45056, inode = 133399 }
+vm_state.vm_map: 13589.822791153 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2925060096, end = 2925064192, flags = 1048688, pgoff = 2925060096, inode = 0 }
+vm_state.vm_map: 13589.822793249 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2925064192, end = 2933452800, flags = 1048691, pgoff = 2925064192, inode = 0 }
+vm_state.vm_map: 13589.822795549 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2933452800, end = 2933456896, flags = 1048688, pgoff = 2933452800, inode = 0 }
+vm_state.vm_map: 13589.822797640 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2933456896, end = 2941845504, flags = 1048691, pgoff = 2933456896, inode = 0 }
+vm_state.vm_map: 13589.822799933 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2943733760, end = 2943737856, flags = 1048688, pgoff = 2943733760, inode = 0 }
+vm_state.vm_map: 13589.822801906 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2943737856, end = 2952126464, flags = 1048691, pgoff = 2943737856, inode = 0 }
+vm_state.vm_map: 13589.822804323 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2956226560, end = 2956230656, flags = 1048688, pgoff = 2956226560, inode = 0 }
+vm_state.vm_map: 13589.822806456 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2956230656, end = 2964619264, flags = 1048691, pgoff = 2956230656, inode = 0 }
+vm_state.vm_map: 13589.822808769 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2968858624, end = 2968862720, flags = 1048688, pgoff = 2968858624, inode = 0 }
+vm_state.vm_map: 13589.822810871 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2968862720, end = 2977251328, flags = 1048691, pgoff = 2968862720, inode = 0 }
+vm_state.vm_map: 13589.822813146 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2977251328, end = 2977255424, flags = 1048688, pgoff = 2977251328, inode = 0 }
+vm_state.vm_map: 13589.822815174 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2977255424, end = 2985644032, flags = 1048691, pgoff = 2977255424, inode = 0 }
+vm_state.vm_map: 13589.822817394 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2985644032, end = 2985648128, flags = 1048688, pgoff = 2985644032, inode = 0 }
+vm_state.vm_map: 13589.822819818 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2985648128, end = 2994036736, flags = 1048691, pgoff = 2985648128, inode = 0 }
+vm_state.vm_map: 13589.822822662 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2994036736, end = 2994360320, flags = 134217845, pgoff = 0, inode = 21280 }
+vm_state.vm_map: 13589.822824628 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2994360320, end = 2994364416, flags = 135266419, pgoff = 323584, inode = 21280 }
+vm_state.vm_map: 13589.822827058 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2994364416, end = 2994376704, flags = 134217845, pgoff = 0, inode = 499779 }
+vm_state.vm_map: 13589.822829254 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2994376704, end = 2994380800, flags = 135266419, pgoff = 8192, inode = 499779 }
+vm_state.vm_map: 13589.822831789 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2994380800, end = 2994401280, flags = 134217845, pgoff = 0, inode = 18127 }
+vm_state.vm_map: 13589.822833847 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2994401280, end = 2994405376, flags = 135266419, pgoff = 16384, inode = 18127 }
+vm_state.vm_map: 13589.822836296 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2994405376, end = 2994421760, flags = 134217845, pgoff = 0, inode = 21276 }
+vm_state.vm_map: 13589.822838466 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2994421760, end = 2994425856, flags = 135266419, pgoff = 12288, inode = 21276 }
+vm_state.vm_map: 13589.822840853 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2994425856, end = 2994823168, flags = 134217845, pgoff = 0, inode = 24050 }
+vm_state.vm_map: 13589.822842906 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2994823168, end = 2994831360, flags = 135266419, pgoff = 397312, inode = 24050 }
+vm_state.vm_map: 13589.822844884 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2994831360, end = 2994847744, flags = 1048691, pgoff = 2994831360, inode = 0 }
+vm_state.vm_map: 13589.822847550 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2994847744, end = 2994876416, flags = 134217845, pgoff = 0, inode = 499851 }
+vm_state.vm_map: 13589.822849590 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2994876416, end = 2994880512, flags = 135266419, pgoff = 28672, inode = 499851 }
+vm_state.vm_map: 13589.822851989 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2994880512, end = 2995183616, flags = 134217845, pgoff = 0, inode = 24049 }
+vm_state.vm_map: 13589.822853967 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2995183616, end = 2995187712, flags = 135266419, pgoff = 299008, inode = 24049 }
+vm_state.vm_map: 13589.822856823 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2995187712, end = 2995449856, flags = 134217845, pgoff = 0, inode = 24048 }
+vm_state.vm_map: 13589.822858865 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2995449856, end = 2995453952, flags = 135266419, pgoff = 262144, inode = 24048 }
+vm_state.vm_map: 13589.822861264 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2995453952, end = 2995462144, flags = 134217845, pgoff = 0, inode = 499720 }
+vm_state.vm_map: 13589.822863254 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2995462144, end = 2995466240, flags = 135266419, pgoff = 4096, inode = 499720 }
+vm_state.vm_map: 13589.822868053 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2995466240, end = 2995478528, flags = 134217845, pgoff = 0, inode = 133766 }
+vm_state.vm_map: 13589.822870093 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2995478528, end = 2995482624, flags = 135266419, pgoff = 8192, inode = 133766 }
+vm_state.vm_map: 13589.822874637 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2995482624, end = 2995499008, flags = 134217845, pgoff = 0, inode = 132448 }
+vm_state.vm_map: 13589.822876690 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2995499008, end = 2995503104, flags = 135266419, pgoff = 16384, inode = 132448 }
+vm_state.vm_map: 13589.822879089 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2995503104, end = 2995507200, flags = 134217845, pgoff = 0, inode = 132458 }
+vm_state.vm_map: 13589.822881247 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2995507200, end = 2995511296, flags = 135266419, pgoff = 0, inode = 132458 }
+vm_state.vm_map: 13589.822885785 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2995511296, end = 2995544064, flags = 134217845, pgoff = 0, inode = 133778 }
+vm_state.vm_map: 13589.822887832 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2995544064, end = 2995548160, flags = 135266419, pgoff = 28672, inode = 133778 }
+vm_state.vm_map: 13589.822890225 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2995548160, end = 2995560448, flags = 134217845, pgoff = 0, inode = 133391 }
+vm_state.vm_map: 13589.822892612 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2995560448, end = 2995564544, flags = 135266419, pgoff = 12288, inode = 133391 }
+vm_state.vm_map: 13589.822894776 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2995564544, end = 2995568640, flags = 1048688, pgoff = 2995564544, inode = 0 }
+vm_state.vm_map: 13589.822896766 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 2995568640, end = 3003957248, flags = 1048691, pgoff = 2995568640, inode = 0 }
+vm_state.vm_map: 13589.822901621 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3003957248, end = 3004121088, flags = 134217845, pgoff = 0, inode = 133325 }
+vm_state.vm_map: 13589.822903679 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3004121088, end = 3004157952, flags = 135266419, pgoff = 159744, inode = 133325 }
+vm_state.vm_map: 13589.822905726 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3004157952, end = 3004235776, flags = 1048691, pgoff = 3004157952, inode = 0 }
+vm_state.vm_map: 13589.822908174 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3004235776, end = 3004256256, flags = 134217845, pgoff = 0, inode = 21278 }
+vm_state.vm_map: 13589.822910505 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3004256256, end = 3004260352, flags = 135266419, pgoff = 16384, inode = 21278 }
+vm_state.vm_map: 13589.822917660 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3004260352, end = 3004612608, flags = 134217845, pgoff = 0, inode = 22500 }
+vm_state.vm_map: 13589.822919836 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3004612608, end = 3004706816, flags = 135266419, pgoff = 348160, inode = 22500 }
+vm_state.vm_map: 13589.822921957 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3004706816, end = 3004719104, flags = 1048691, pgoff = 3004706816, inode = 0 }
+vm_state.vm_map: 13589.822924510 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3004719104, end = 3004882944, flags = 134217845, pgoff = 0, inode = 21283 }
+vm_state.vm_map: 13589.822926674 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3004882944, end = 3004887040, flags = 135266419, pgoff = 159744, inode = 21283 }
+vm_state.vm_map: 13589.822929501 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3004887040, end = 3005849600, flags = 134217845, pgoff = 0, inode = 21285 }
+vm_state.vm_map: 13589.822931541 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3005849600, end = 3005906944, flags = 135266419, pgoff = 962560, inode = 21285 }
+vm_state.vm_map: 13589.822938590 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3005906944, end = 3006230528, flags = 134217845, pgoff = 0, inode = 20454 }
+vm_state.vm_map: 13589.822940760 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3006230528, end = 3006234624, flags = 135266419, pgoff = 323584, inode = 20454 }
+vm_state.vm_map: 13589.822947870 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3006234624, end = 3006341120, flags = 134217845, pgoff = 0, inode = 92226 }
+vm_state.vm_map: 13589.822949998 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3006341120, end = 3006345216, flags = 135266419, pgoff = 102400, inode = 92226 }
+vm_state.vm_map: 13589.822957107 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3006345216, end = 3006844928, flags = 134217845, pgoff = 0, inode = 22502 }
+vm_state.vm_map: 13589.822959167 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3006844928, end = 3006853120, flags = 135266419, pgoff = 499712, inode = 22502 }
+vm_state.vm_map: 13589.822966630 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3006853120, end = 3006967808, flags = 134217845, pgoff = 0, inode = 22497 }
+vm_state.vm_map: 13589.822968776 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3006967808, end = 3006971904, flags = 135266419, pgoff = 114688, inode = 22497 }
+vm_state.vm_map: 13589.822975849 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3006971904, end = 3007021056, flags = 134217845, pgoff = 0, inode = 1065068 }
+vm_state.vm_map: 13589.822978130 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3007021056, end = 3007025152, flags = 135266419, pgoff = 45056, inode = 1065068 }
+vm_state.vm_map: 13589.822985068 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3007025152, end = 3007270912, flags = 134217845, pgoff = 0, inode = 1065036 }
+vm_state.vm_map: 13589.822987108 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3007270912, end = 3007283200, flags = 135266419, pgoff = 241664, inode = 1065036 }
+vm_state.vm_map: 13589.822993885 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3007283200, end = 3007901696, flags = 134217845, pgoff = 0, inode = 22491 }
+vm_state.vm_map: 13589.822995950 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3007901696, end = 3007909888, flags = 135266419, pgoff = 618496, inode = 22491 }
+vm_state.vm_map: 13589.822997996 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3007909888, end = 3007913984, flags = 1048691, pgoff = 3007909888, inode = 0 }
+vm_state.vm_map: 13589.823000469 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3007913984, end = 3007971328, flags = 135266421, pgoff = 0, inode = 33719 }
+vm_state.vm_map: 13589.823002999 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3007971328, end = 3007975424, flags = 135266419, pgoff = 57344, inode = 33719 }
+vm_state.vm_map: 13589.823007704 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3007975424, end = 3008028672, flags = 135266421, pgoff = 0, inode = 33713 }
+vm_state.vm_map: 13589.823009892 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3008028672, end = 3008032768, flags = 135266419, pgoff = 53248, inode = 33713 }
+vm_state.vm_map: 13589.823011903 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3008032768, end = 3008045056, flags = 1048691, pgoff = 3008032768, inode = 0 }
+vm_state.vm_map: 13589.823018976 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3008045056, end = 3013025792, flags = 135266421, pgoff = 0, inode = 33715 }
+vm_state.vm_map: 13589.823021035 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3013025792, end = 3013066752, flags = 135266419, pgoff = 4976640, inode = 33715 }
+vm_state.vm_map: 13589.823023082 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3013066752, end = 3016265728, flags = 1048691, pgoff = 3013066752, inode = 0 }
+vm_state.vm_map: 13589.823025443 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3016265728, end = 3016318976, flags = 135266421, pgoff = 0, inode = 133389 }
+vm_state.vm_map: 13589.823027428 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3016318976, end = 3016327168, flags = 135266419, pgoff = 49152, inode = 133389 }
+vm_state.vm_map: 13589.823029425 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3016327168, end = 3016339456, flags = 1048691, pgoff = 3016327168, inode = 0 }
+vm_state.vm_map: 13589.823031782 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3016339456, end = 3016355840, flags = 134217845, pgoff = 0, inode = 133398 }
+vm_state.vm_map: 13589.823033735 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3016355840, end = 3016359936, flags = 135266419, pgoff = 12288, inode = 133398 }
+vm_state.vm_map: 13589.823036282 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3016359936, end = 3016400896, flags = 134217845, pgoff = 0, inode = 134575 }
+vm_state.vm_map: 13589.823038570 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3016400896, end = 3016404992, flags = 135266419, pgoff = 36864, inode = 134575 }
+vm_state.vm_map: 13589.823041032 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3016404992, end = 3016491008, flags = 134217845, pgoff = 0, inode = 134584 }
+vm_state.vm_map: 13589.823042979 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3016491008, end = 3016527872, flags = 135266419, pgoff = 81920, inode = 134584 }
+vm_state.vm_map: 13589.823044927 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3016527872, end = 3016564736, flags = 1048691, pgoff = 3016527872, inode = 0 }
+vm_state.vm_map: 13589.823049625 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3016564736, end = 3016691712, flags = 134217845, pgoff = 0, inode = 134585 }
+vm_state.vm_map: 13589.823051648 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3016691712, end = 3016728576, flags = 135266419, pgoff = 122880, inode = 134585 }
+vm_state.vm_map: 13589.823053639 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3016728576, end = 3016765440, flags = 1048691, pgoff = 3016728576, inode = 0 }
+vm_state.vm_map: 13589.823058263 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3016765440, end = 3016810496, flags = 134217845, pgoff = 0, inode = 133836 }
+vm_state.vm_map: 13589.823060236 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3016810496, end = 3016814592, flags = 135266419, pgoff = 45056, inode = 133836 }
+vm_state.vm_map: 13589.823062178 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3016814592, end = 3016818688, flags = 1048691, pgoff = 3016814592, inode = 0 }
+vm_state.vm_map: 13589.823069009 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3016818688, end = 3016990720, flags = 134217845, pgoff = 0, inode = 132460 }
+vm_state.vm_map: 13589.823071143 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3016990720, end = 3016994816, flags = 135266419, pgoff = 167936, inode = 132460 }
+vm_state.vm_map: 13589.823074031 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3016994816, end = 3017027584, flags = 134217845, pgoff = 0, inode = 132451 }
+vm_state.vm_map: 13589.823075959 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017027584, end = 3017031680, flags = 135266419, pgoff = 28672, inode = 132451 }
+vm_state.vm_map: 13589.823078024 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017031680, end = 3017035776, flags = 1048691, pgoff = 3017031680, inode = 0 }
+vm_state.vm_map: 13589.823084950 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017035776, end = 3017146368, flags = 134217845, pgoff = 0, inode = 1065512 }
+vm_state.vm_map: 13589.823087163 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017146368, end = 3017150464, flags = 135266419, pgoff = 106496, inode = 1065512 }
+vm_state.vm_map: 13589.823089241 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017150464, end = 3017166848, flags = 1048691, pgoff = 3017150464, inode = 0 }
+vm_state.vm_map: 13589.823096395 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017166848, end = 3017207808, flags = 134217845, pgoff = 0, inode = 1066155 }
+vm_state.vm_map: 13589.823098361 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017207808, end = 3017211904, flags = 135266419, pgoff = 40960, inode = 1066155 }
+vm_state.vm_map: 13589.823105342 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017211904, end = 3017383936, flags = 134217845, pgoff = 0, inode = 1066157 }
+vm_state.vm_map: 13589.823107345 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017383936, end = 3017388032, flags = 135266419, pgoff = 167936, inode = 1066157 }
+vm_state.vm_map: 13589.823109639 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017388032, end = 3017392128, flags = 1048691, pgoff = 3017388032, inode = 0 }
+vm_state.vm_map: 13589.823111989 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017396224, end = 3017408512, flags = 134217845, pgoff = 0, inode = 133760 }
+vm_state.vm_map: 13589.823113949 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017408512, end = 3017412608, flags = 135266419, pgoff = 8192, inode = 133760 }
+vm_state.vm_map: 13589.823116552 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017412608, end = 3017433088, flags = 134217845, pgoff = 0, inode = 132459 }
+vm_state.vm_map: 13589.823118505 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017433088, end = 3017437184, flags = 135266419, pgoff = 16384, inode = 132459 }
+vm_state.vm_map: 13589.823120831 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017437184, end = 3017482240, flags = 134217845, pgoff = 0, inode = 133390 }
+vm_state.vm_map: 13589.823122777 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017482240, end = 3017486336, flags = 135266419, pgoff = 40960, inode = 133390 }
+vm_state.vm_map: 13589.823125505 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017486336, end = 3017531392, flags = 134217845, pgoff = 0, inode = 133776 }
+vm_state.vm_map: 13589.823127564 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017531392, end = 3017535488, flags = 135266419, pgoff = 40960, inode = 133776 }
+vm_state.vm_map: 13589.823130006 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017535488, end = 3017588736, flags = 134217845, pgoff = 0, inode = 133393 }
+vm_state.vm_map: 13589.823132078 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017588736, end = 3017592832, flags = 135266419, pgoff = 53248, inode = 133393 }
+vm_state.vm_map: 13589.823134242 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017592832, end = 3017633792, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.823154300 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017633792, end = 3017637888, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.823156439 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017637888, end = 3017641984, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.823158553 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017641984, end = 3017678848, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.823160723 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017678848, end = 3017682944, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.823163135 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017682944, end = 3017687040, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.823168434 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017687040, end = 3017711616, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.823170487 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017711616, end = 3017715712, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.823172534 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017715712, end = 3017719808, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.823174970 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017719808, end = 3017797632, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.823179483 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017797632, end = 3017801728, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.823181672 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017801728, end = 3017805824, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.823183719 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017805824, end = 3017814016, flags = 1048691, pgoff = 3017805824, inode = 0 }
+vm_state.vm_map: 13589.823188739 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017814016, end = 3017883648, flags = 134217845, pgoff = 0, inode = 508763 }
+vm_state.vm_map: 13589.823190916 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017883648, end = 3017887744, flags = 135266417, pgoff = 65536, inode = 508763 }
+vm_state.vm_map: 13589.823192974 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017887744, end = 3017891840, flags = 135266419, pgoff = 69632, inode = 508763 }
+vm_state.vm_map: 13589.823195102 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017891840, end = 3017900032, flags = 1048691, pgoff = 3017891840, inode = 0 }
+vm_state.vm_map: 13589.823202348 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3017900032, end = 3018190848, flags = 134217845, pgoff = 0, inode = 22627 }
+vm_state.vm_map: 13589.823204389 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3018190848, end = 3018207232, flags = 135266419, pgoff = 286720, inode = 22627 }
+vm_state.vm_map: 13589.823206436 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3018207232, end = 3018227712, flags = 1048691, pgoff = 3018207232, inode = 0 }
+vm_state.vm_map: 13589.823213615 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3018227712, end = 3018575872, flags = 134217845, pgoff = 0, inode = 41235 }
+vm_state.vm_map: 13589.823215673 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3018575872, end = 3018588160, flags = 135266419, pgoff = 348160, inode = 41235 }
+vm_state.vm_map: 13589.823217955 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3020632064, end = 3021889536, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 13589.823220224 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3021889536, end = 3021910016, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 13589.823222326 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3021910016, end = 3021914112, flags = 1048691, pgoff = 3021910016, inode = 0 }
+vm_state.vm_map: 13589.823224552 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3021914112, end = 3022151680, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 13589.823226889 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3022151680, end = 3022155776, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 13589.823229282 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3022155776, end = 3022188544, flags = 134217845, pgoff = 0, inode = 18621 }
+vm_state.vm_map: 13589.823231570 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3022188544, end = 3022192640, flags = 135266419, pgoff = 28672, inode = 18621 }
+vm_state.vm_map: 13589.823233821 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3022192640, end = 3022622720, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 13589.823236350 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3022622720, end = 3022651392, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 13589.823238309 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3022651392, end = 3022655488, flags = 1048691, pgoff = 3022651392, inode = 0 }
+vm_state.vm_map: 13589.823240721 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3022655488, end = 3023097856, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 13589.823242817 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3023097856, end = 3023106048, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 13589.823245705 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3023106048, end = 3023908864, flags = 134217845, pgoff = 0, inode = 21274 }
+vm_state.vm_map: 13589.823247838 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3023908864, end = 3023925248, flags = 135266419, pgoff = 802816, inode = 21274 }
+vm_state.vm_map: 13589.823250372 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3023925248, end = 3026481152, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 13589.823252345 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3026481152, end = 3026530304, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 13589.823254521 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3026530304, end = 3026534400, flags = 1048691, pgoff = 3026530304, inode = 0 }
+vm_state.vm_map: 13589.823256871 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3026534400, end = 3026550784, flags = 134217845, pgoff = 0, inode = 133777 }
+vm_state.vm_map: 13589.823259165 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3026550784, end = 3026554880, flags = 135266419, pgoff = 12288, inode = 133777 }
+vm_state.vm_map: 13589.823261700 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3026554880, end = 3026575360, flags = 134217845, pgoff = 0, inode = 133765 }
+vm_state.vm_map: 13589.823263944 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3026575360, end = 3026579456, flags = 135266419, pgoff = 20480, inode = 133765 }
+vm_state.vm_map: 13589.823268532 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3026579456, end = 3026591744, flags = 134217845, pgoff = 0, inode = 133767 }
+vm_state.vm_map: 13589.823270585 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3026591744, end = 3026595840, flags = 135266419, pgoff = 8192, inode = 133767 }
+vm_state.vm_map: 13589.823273114 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3026595840, end = 3026599936, flags = 1048691, pgoff = 3026595840, inode = 0 }
+vm_state.vm_map: 13589.823275495 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3026599936, end = 3026624512, flags = 134217845, pgoff = 0, inode = 132468 }
+vm_state.vm_map: 13589.823277455 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3026624512, end = 3026628608, flags = 135266419, pgoff = 24576, inode = 132468 }
+vm_state.vm_map: 13589.823282222 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3026628608, end = 3042869248, flags = 134217979, pgoff = 0, inode = 1204527 }
+vm_state.vm_map: 13589.823284510 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3042869248, end = 3047165952, flags = 134217979, pgoff = 0, inode = 1204522 }
+vm_state.vm_map: 13589.823286804 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047165952, end = 3047366656, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 13589.823288801 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047366656, end = 3047370752, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 13589.823291249 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047370752, end = 3047395328, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 13589.823293215 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047395328, end = 3047399424, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 13589.823295677 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047403520, end = 3047428096, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 13589.823297674 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047428096, end = 3047432192, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 13589.823302824 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047432192, end = 3047489536, flags = 134217845, pgoff = 0, inode = 123137 }
+vm_state.vm_map: 13589.823304882 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047489536, end = 3047493632, flags = 135266419, pgoff = 53248, inode = 123137 }
+vm_state.vm_map: 13589.823307202 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047493632, end = 3047497728, flags = 134217937, pgoff = 0, inode = 1196317 }
+vm_state.vm_map: 13589.823309650 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047497728, end = 3047522304, flags = 134217937, pgoff = 0, inode = 1196229 }
+vm_state.vm_map: 13589.823311962 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047522304, end = 3047526400, flags = 134217937, pgoff = 0, inode = 1196235 }
+vm_state.vm_map: 13589.823314238 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047526400, end = 3047530496, flags = 134217937, pgoff = 0, inode = 1196204 }
+vm_state.vm_map: 13589.823316526 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047530496, end = 3047534592, flags = 134217937, pgoff = 0, inode = 1196228 }
+vm_state.vm_map: 13589.823318653 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047534592, end = 3047538688, flags = 134217937, pgoff = 0, inode = 1196227 }
+vm_state.vm_map: 13589.823320990 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047538688, end = 3047546880, flags = 134217937, pgoff = 0, inode = 1196198 }
+vm_state.vm_map: 13589.823323204 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047546880, end = 3047579648, flags = 134217937, pgoff = 0, inode = 1196200 }
+vm_state.vm_map: 13589.823325466 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047579648, end = 3047591936, flags = 134217937, pgoff = 0, inode = 1196226 }
+vm_state.vm_map: 13589.823327705 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047591936, end = 3047600128, flags = 134217937, pgoff = 0, inode = 1196225 }
+vm_state.vm_map: 13589.823330042 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047600128, end = 3047604224, flags = 134217937, pgoff = 0, inode = 1196224 }
+vm_state.vm_map: 13589.823332138 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047604224, end = 3047608320, flags = 134217937, pgoff = 0, inode = 1196223 }
+vm_state.vm_map: 13589.823334451 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047608320, end = 3047612416, flags = 134217937, pgoff = 0, inode = 1196202 }
+vm_state.vm_map: 13589.823336590 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047612416, end = 3047641088, flags = 134217937, pgoff = 0, inode = 1196222 }
+vm_state.vm_map: 13589.823338896 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047641088, end = 3047653376, flags = 134217937, pgoff = 0, inode = 1196221 }
+vm_state.vm_map: 13589.823340974 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047653376, end = 3047657472, flags = 134217937, pgoff = 0, inode = 1196220 }
+vm_state.vm_map: 13589.823343311 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047657472, end = 3047665664, flags = 134217937, pgoff = 0, inode = 1196219 }
+vm_state.vm_map: 13589.823345791 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047665664, end = 3047669760, flags = 134217937, pgoff = 0, inode = 1196210 }
+vm_state.vm_map: 13589.823348097 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047669760, end = 3047673856, flags = 134217937, pgoff = 0, inode = 1196205 }
+vm_state.vm_map: 13589.823350193 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047673856, end = 3047686144, flags = 134217937, pgoff = 0, inode = 1196244 }
+vm_state.vm_map: 13589.823352629 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047686144, end = 3047694336, flags = 134217937, pgoff = 0, inode = 1196270 }
+vm_state.vm_map: 13589.823354855 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047694336, end = 3047727104, flags = 134217937, pgoff = 0, inode = 1196246 }
+vm_state.vm_map: 13589.823357273 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047727104, end = 3047747584, flags = 134217937, pgoff = 0, inode = 1196269 }
+vm_state.vm_map: 13589.823359369 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047747584, end = 3047755776, flags = 134217937, pgoff = 0, inode = 1196316 }
+vm_state.vm_map: 13589.823361817 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047755776, end = 3047784448, flags = 134217937, pgoff = 0, inode = 1196197 }
+vm_state.vm_map: 13589.823363919 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047784448, end = 3047829504, flags = 134217937, pgoff = 0, inode = 1196312 }
+vm_state.vm_map: 13589.823366220 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047829504, end = 3047886848, flags = 134217937, pgoff = 0, inode = 1196272 }
+vm_state.vm_map: 13589.823370838 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3047886848, end = 3048112128, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.823372885 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3048112128, end = 3048116224, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.823374883 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3048116224, end = 3048120320, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.823377213 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3048124416, end = 3048140800, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 13589.823379167 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3048140800, end = 3048144896, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 13589.823384162 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3048144896, end = 3048157184, flags = 134217937, pgoff = 0, inode = 1196315 }
+vm_state.vm_map: 13589.823386445 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3048157184, end = 3048214528, flags = 134217937, pgoff = 0, inode = 1196231 }
+vm_state.vm_map: 13589.823388788 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3048214528, end = 3049545728, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.823390859 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3049545728, end = 3049558016, flags = 1048691, pgoff = 3049545728, inode = 0 }
+vm_state.vm_map: 13589.823395360 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3049558016, end = 3049574400, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.823397419 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3049574400, end = 3049578496, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.823399639 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3049578496, end = 3049725952, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.823401679 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3049725952, end = 3049734144, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.823403843 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3049734144, end = 3049742336, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.823406118 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3049742336, end = 3049746432, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.823408296 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3049746432, end = 3050065920, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 13589.823410336 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3050065920, end = 3050082304, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 13589.823412518 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3050082304, end = 3050274816, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.823414565 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3050274816, end = 3050278912, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.823416971 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3050278912, end = 3050283008, flags = 1048691, pgoff = 3050278912, inode = 0 }
+vm_state.vm_map: 13589.823419042 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3050283008, end = 3050381312, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.823421360 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3050381312, end = 3050385408, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.823423537 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3050385408, end = 3050397696, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 13589.823425578 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3050397696, end = 3050401792, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 13589.823427852 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3050401792, end = 3050455040, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 13589.823429955 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3050455040, end = 3050459136, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 13589.823432125 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3050459136, end = 3050631168, flags = 134217845, pgoff = 0, inode = 1065255 }
+vm_state.vm_map: 13589.823434289 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3050631168, end = 3050635264, flags = 135266419, pgoff = 172032, inode = 1065255 }
+vm_state.vm_map: 13589.823436398 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3050635264, end = 3050881024, flags = 134217845, pgoff = 0, inode = 20603 }
+vm_state.vm_map: 13589.823438537 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3050881024, end = 3050885120, flags = 135266419, pgoff = 245760, inode = 20603 }
+vm_state.vm_map: 13589.823440707 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3050885120, end = 3050889216, flags = 1048691, pgoff = 3050885120, inode = 0 }
+vm_state.vm_map: 13589.823442884 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3050889216, end = 3051360256, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 13589.823444925 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3051360256, end = 3051376640, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 13589.823447112 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3051376640, end = 3051520000, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 13589.823449160 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3051520000, end = 3051524096, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 13589.823451701 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3051524096, end = 3051610112, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 13589.823453766 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3051610112, end = 3051614208, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 13589.823456159 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3051614208, end = 3051622400, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.823458193 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3051622400, end = 3051626496, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.823460228 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3051626496, end = 3051630592, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.823462459 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3051630592, end = 3051716608, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.823464636 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3051716608, end = 3051720704, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.823466671 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3051720704, end = 3051724800, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.823468822 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3051724800, end = 3051737088, flags = 1048691, pgoff = 3051724800, inode = 0 }
+vm_state.vm_map: 13589.823470924 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3051737088, end = 3052482560, flags = 134217845, pgoff = 0, inode = 499794 }
+vm_state.vm_map: 13589.823473101 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3052482560, end = 3052486656, flags = 135266419, pgoff = 745472, inode = 499794 }
+vm_state.vm_map: 13589.823475320 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3052486656, end = 3052515328, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.823477361 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3052515328, end = 3052519424, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.823479377 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3052519424, end = 3052523520, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.823481621 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3052523520, end = 3052539904, flags = 134217845, pgoff = 0, inode = 20149 }
+vm_state.vm_map: 13589.823483661 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3052539904, end = 3052544000, flags = 135266419, pgoff = 12288, inode = 20149 }
+vm_state.vm_map: 13589.823486191 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3052544000, end = 3052605440, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 13589.823488151 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3052605440, end = 3052609536, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 13589.823490593 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3052609536, end = 3052691456, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.823492621 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3052691456, end = 3052695552, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.823496986 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3052695552, end = 3052699648, flags = 1048691, pgoff = 3052695552, inode = 0 }
+vm_state.vm_map: 13589.823499188 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3052699648, end = 3052814336, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.823501345 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3052814336, end = 3052818432, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.823503521 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3052818432, end = 3052965888, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.823505568 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3052965888, end = 3052969984, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.823507639 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3052969984, end = 3052974080, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.823509946 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3052974080, end = 3053006848, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 13589.823511999 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3053006848, end = 3053010944, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 13589.823514169 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3053010944, end = 3053027328, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 13589.823516204 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3053027328, end = 3053031424, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 13589.823518386 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3053031424, end = 3053064192, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 13589.823520785 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3053064192, end = 3053068288, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 13589.823523079 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3053068288, end = 3053084672, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 13589.823525069 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3053084672, end = 3053088768, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 13589.823527264 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3053088768, end = 3053092864, flags = 1048691, pgoff = 3053088768, inode = 0 }
+vm_state.vm_map: 13589.823529497 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3053092864, end = 3054223360, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 13589.823531667 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3054223360, end = 3054239744, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 13589.823533825 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3054239744, end = 3054510080, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 13589.823536052 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3054510080, end = 3054518272, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 13589.823538141 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3054518272, end = 3055669248, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.823540287 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3055669248, end = 3055685632, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.823542494 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3055685632, end = 3055771648, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 13589.823544670 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3055771648, end = 3055775744, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 13589.823546637 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3055775744, end = 3055783936, flags = 1048691, pgoff = 3055775744, inode = 0 }
+vm_state.vm_map: 13589.823548949 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3055783936, end = 3055812608, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 13589.823550928 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3055812608, end = 3055816704, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 13589.823553228 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3055816704, end = 3056148480, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 13589.823555676 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3056148480, end = 3056156672, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 13589.823557958 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3056156672, end = 3056160768, flags = 1048691, pgoff = 3056156672, inode = 0 }
+vm_state.vm_map: 13589.823560066 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3056160768, end = 3057475584, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.823562317 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3057475584, end = 3057483776, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.823564444 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3057483776, end = 3057487872, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.823566391 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3057487872, end = 3057500160, flags = 1048691, pgoff = 3057487872, inode = 0 }
+vm_state.vm_map: 13589.823568704 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3057500160, end = 3058438144, flags = 134217845, pgoff = 0, inode = 16850 }
+vm_state.vm_map: 13589.823570856 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3058438144, end = 3058454528, flags = 135266417, pgoff = 937984, inode = 16850 }
+vm_state.vm_map: 13589.823572921 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3058454528, end = 3058458624, flags = 135266419, pgoff = 954368, inode = 16850 }
+vm_state.vm_map: 13589.823574893 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3058458624, end = 3058487296, flags = 1048691, pgoff = 3058458624, inode = 0 }
+vm_state.vm_map: 13589.823577237 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3058487296, end = 3068526592, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 13589.823579270 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3068526592, end = 3068686336, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 13589.823581318 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3068686336, end = 3068694528, flags = 1048691, pgoff = 3068686336, inode = 0 }
+vm_state.vm_map: 13589.823583488 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3068694528, end = 3071004672, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 13589.823585516 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3071004672, end = 3071033344, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 13589.823587555 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3071033344, end = 3071037440, flags = 1048691, pgoff = 3071033344, inode = 0 }
+kernel.irq_entry: 13589.823607365 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { ip = 3242331332, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.sched_try_wakeup: 13589.823619522 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { pid = 1238, cpu_id = 0, state = 1 }
+kernel.irq_exit: 13589.823630318 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.sched_schedule: 13589.823639654 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, MODE_UNKNOWN { prev_pid = 16887, next_pid = 1238, prev_state = 0 }
+fs.select: 13589.823700721 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1238, 1238, dirmngr, , 1, 0x0, MODE_UNKNOWN { fd = 3, end_time_sec = 13555, end_time_nsec = 688070988 }
+fs.select: 13589.823700723 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1238, 1238, dirmngr, , 1, 0x0, MODE_UNKNOWN { fd = 6, end_time_sec = 13555, end_time_nsec = 688070988 }
+kernel.syscall_exit: 13589.823700727 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.823700730 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, SYSCALL { ip = 0xb788d416, syscall_id = 175 [syscall 175] }
+kernel.syscall_exit: 13589.823700732 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.823700734 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, SYSCALL { ip = 0xb788d416, syscall_id = 174 [syscall 174] }
+kernel.syscall_exit: 13589.823700736 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.823700738 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, SYSCALL { ip = 0xb788d416, syscall_id = 174 [syscall 174] }
+kernel.syscall_exit: 13589.823700740 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.823700742 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, SYSCALL { ip = 0xb788d416, syscall_id = 174 [syscall 174] }
+kernel.syscall_exit: 13589.823700744 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.823700746 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, SYSCALL { ip = 0xb788d416, syscall_id = 174 [syscall 174] }
+kernel.syscall_exit: 13589.823700749 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.823704583 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, SYSCALL { ip = 0xb788d416, syscall_id = 174 [syscall 174] }
+kernel.syscall_exit: 13589.823706589 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.823728537 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, SYSCALL { ip = 0xb788d416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 13589.823731424 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.823744944 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, SYSCALL { ip = 0xb788d416, syscall_id = 126 [syscall 126] }
+kernel.syscall_exit: 13589.823747604 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.823774625 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, SYSCALL { ip = 0xb788d416, syscall_id = 13 [syscall 13] }
+kernel.syscall_exit: 13589.823775973 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, MODE_UNKNOWN { ret = 1262715366 }
+kernel.syscall_entry: 13589.823779962 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, SYSCALL { ip = 0xb788d416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 13589.823782345 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.823787411 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, SYSCALL { ip = 0xb788d416, syscall_id = 126 [syscall 126] }
+kernel.syscall_exit: 13589.823789375 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.823792515 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, SYSCALL { ip = 0xb788d416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 13589.823794744 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.823802039 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, SYSCALL { ip = 0xb788d416, syscall_id = 176 [syscall 176] }
+kernel.syscall_exit: 13589.823803615 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.823818304 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, SYSCALL { ip = 0xb788d416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.823822873 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1238, 1238, dirmngr, , 1, 0x0, SYSCALL { count = 128, fd = 3 }
+kernel.syscall_exit: 13589.823824473 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.823827835 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, SYSCALL { ip = 0xb788d416, syscall_id = 174 [syscall 174] }
+kernel.syscall_exit: 13589.823829657 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.823832840 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, SYSCALL { ip = 0xb788d416, syscall_id = 174 [syscall 174] }
+kernel.syscall_exit: 13589.823834373 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.823837531 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, SYSCALL { ip = 0xb788d416, syscall_id = 174 [syscall 174] }
+kernel.syscall_exit: 13589.823839051 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.823842118 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, SYSCALL { ip = 0xb788d416, syscall_id = 174 [syscall 174] }
+kernel.syscall_exit: 13589.823843663 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.823846760 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, SYSCALL { ip = 0xb788d416, syscall_id = 174 [syscall 174] }
+kernel.syscall_exit: 13589.823848305 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.823851802 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, SYSCALL { ip = 0xb788d416, syscall_id = 175 [syscall 175] }
+kernel.syscall_exit: 13589.823853686 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.823856665 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1238, 1238, dirmngr, , 1, 0x0, SYSCALL { ip = 0xb788d416, syscall_id = 142 [syscall 142] }
+fs.select: 13589.823862095 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1238, 1238, dirmngr, , 1, 0x0, SYSCALL { fd = 3, end_time_sec = 13556, end_time_nsec = 689230532 }
+fs.select: 13589.823864891 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1238, 1238, dirmngr, , 1, 0x0, SYSCALL { fd = 6, end_time_sec = 13556, end_time_nsec = 689230532 }
+kernel.sched_schedule: 13589.823879536 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { prev_pid = 1238, next_pid = 16887, prev_state = 1 }
+vm_state.vm_map: 13589.823999667 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3071037440, end = 3071504384, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 13589.824002148 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3071504384, end = 3071512576, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 13589.824004297 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3071512576, end = 3073814528, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 13589.824006483 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3073814528, end = 3073859584, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 13589.824008643 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3073859584, end = 3073863680, flags = 1048691, pgoff = 3073859584, inode = 0 }
+vm_state.vm_map: 13589.824011093 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3073863680, end = 3074179072, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 13589.824013132 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3074179072, end = 3074187264, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 13589.824015299 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3074187264, end = 3077783552, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 13589.824017392 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3077783552, end = 3077881856, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 13589.824019565 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3077881856, end = 3077885952, flags = 1048691, pgoff = 3077881856, inode = 0 }
+vm_state.vm_map: 13589.824021732 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3077885952, end = 3077918720, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 13589.824023899 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3077918720, end = 3077922816, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 13589.824026023 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3077922816, end = 3077931008, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 13589.824028190 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3077931008, end = 3077935104, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 13589.824030339 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3077935104, end = 3077943296, flags = 134217845, pgoff = 0, inode = 1450546 }
+vm_state.vm_map: 13589.824032752 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3077943296, end = 3077947392, flags = 135266417, pgoff = 4096, inode = 1450546 }
+vm_state.vm_map: 13589.824035177 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3077947392, end = 3077951488, flags = 135266419, pgoff = 8192, inode = 1450546 }
+vm_state.vm_map: 13589.824037474 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3077951488, end = 3077980160, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.824039493 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3077980160, end = 3077988352, flags = 1048691, pgoff = 3077980160, inode = 0 }
+vm_state.vm_map: 13589.824041796 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3077988352, end = 3077992448, flags = 67371125, pgoff = 3077988352, inode = 0 }
+vm_state.vm_map: 13589.824044018 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3077992448, end = 3078107136, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.824046192 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3078107136, end = 3078111232, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.824048168 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3078111232, end = 3078115328, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.824050329 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2212, start = 3219996672, end = 3220082688, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.824053136 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 134512640, end = 134553600, flags = 134223989, pgoff = 0, inode = 20759 }
+vm_state.vm_map: 13589.824055297 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 134553600, end = 134557696, flags = 135272563, pgoff = 36864, inode = 20759 }
+vm_state.vm_map: 13589.824057372 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 134557696, end = 134565888, flags = 1048691, pgoff = 134557696, inode = 0 }
+vm_state.vm_map: 13589.824059526 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 145301504, end = 157966336, flags = 1048691, pgoff = 145301504, inode = 0 }
+vm_state.vm_map: 13589.824071605 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2814652416, end = 2814722048, flags = 134217841, pgoff = 0, inode = 98449 }
+vm_state.vm_map: 13589.824082422 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2814722048, end = 2822496256, flags = 134217841, pgoff = 0, inode = 246513 }
+vm_state.vm_map: 13589.824085057 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2822496256, end = 2823069696, flags = 134217841, pgoff = 0, inode = 49559 }
+vm_state.vm_map: 13589.824087735 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2823069696, end = 2823213056, flags = 134217841, pgoff = 0, inode = 254199 }
+vm_state.vm_map: 13589.824092882 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2823213056, end = 2823835648, flags = 134217841, pgoff = 0, inode = 49164 }
+vm_state.vm_map: 13589.824097727 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2823835648, end = 2823897088, flags = 134217841, pgoff = 0, inode = 649750 }
+vm_state.vm_map: 13589.824103058 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2823897088, end = 2823933952, flags = 134217845, pgoff = 0, inode = 59304 }
+vm_state.vm_map: 13589.824105225 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2823933952, end = 2823938048, flags = 135266419, pgoff = 32768, inode = 59304 }
+vm_state.vm_map: 13589.824107658 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2823938048, end = 2823999488, flags = 134217841, pgoff = 0, inode = 649749 }
+vm_state.vm_map: 13589.824112878 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2823999488, end = 2824044544, flags = 134217845, pgoff = 0, inode = 1065861 }
+vm_state.vm_map: 13589.824115279 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2824044544, end = 2824048640, flags = 135266419, pgoff = 45056, inode = 1065861 }
+vm_state.vm_map: 13589.824117317 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2824048640, end = 2824056832, flags = 1048691, pgoff = 2824048640, inode = 0 }
+vm_state.vm_map: 13589.824119669 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2824065024, end = 2824105984, flags = 134217845, pgoff = 0, inode = 59318 }
+vm_state.vm_map: 13589.824121768 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2824105984, end = 2824110080, flags = 135266419, pgoff = 40960, inode = 59318 }
+vm_state.vm_map: 13589.824124089 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2824110080, end = 2824146944, flags = 134217845, pgoff = 0, inode = 59321 }
+vm_state.vm_map: 13589.824126324 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2824146944, end = 2824151040, flags = 135266419, pgoff = 32768, inode = 59321 }
+vm_state.vm_map: 13589.824129107 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2824151040, end = 2824220672, flags = 134217845, pgoff = 0, inode = 59034 }
+vm_state.vm_map: 13589.824131273 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2824220672, end = 2824224768, flags = 135266419, pgoff = 65536, inode = 59034 }
+vm_state.vm_map: 13589.824136057 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2824224768, end = 2824294400, flags = 134217845, pgoff = 0, inode = 499962 }
+vm_state.vm_map: 13589.824138218 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2824294400, end = 2824298496, flags = 135266417, pgoff = 65536, inode = 499962 }
+vm_state.vm_map: 13589.824140213 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2824298496, end = 2824302592, flags = 135266419, pgoff = 69632, inode = 499962 }
+vm_state.vm_map: 13589.824142392 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2824302592, end = 2824310784, flags = 1048691, pgoff = 2824302592, inode = 0 }
+vm_state.vm_map: 13589.824144873 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2824323072, end = 2824335360, flags = 134217845, pgoff = 0, inode = 23912 }
+vm_state.vm_map: 13589.824147058 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2824335360, end = 2824339456, flags = 135266419, pgoff = 8192, inode = 23912 }
+vm_state.vm_map: 13589.824149374 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2824339456, end = 2824359936, flags = 134217845, pgoff = 0, inode = 59302 }
+vm_state.vm_map: 13589.824151941 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2824359936, end = 2824364032, flags = 135266419, pgoff = 16384, inode = 59302 }
+vm_state.vm_map: 13589.824154243 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2824364032, end = 2824400896, flags = 134217845, pgoff = 0, inode = 59323 }
+vm_state.vm_map: 13589.824156404 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2824400896, end = 2824404992, flags = 135266419, pgoff = 36864, inode = 59323 }
+vm_state.vm_map: 13589.824158516 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2824404992, end = 2824409088, flags = 1048688, pgoff = 2824404992, inode = 0 }
+vm_state.vm_map: 13589.824160923 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2824409088, end = 2832797696, flags = 1048691, pgoff = 2824409088, inode = 0 }
+vm_state.vm_map: 13589.824165755 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2832797696, end = 2832879616, flags = 134217845, pgoff = 0, inode = 59299 }
+vm_state.vm_map: 13589.824167788 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2832879616, end = 2832883712, flags = 135266419, pgoff = 77824, inode = 59299 }
+vm_state.vm_map: 13589.824170281 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2832883712, end = 2832949248, flags = 134217845, pgoff = 0, inode = 57391 }
+vm_state.vm_map: 13589.824172565 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2832949248, end = 2832953344, flags = 135266419, pgoff = 61440, inode = 57391 }
+vm_state.vm_map: 13589.824174615 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2832953344, end = 2832969728, flags = 1048691, pgoff = 2832953344, inode = 0 }
+vm_state.vm_map: 13589.824177460 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2832969728, end = 2833252352, flags = 134217845, pgoff = 0, inode = 22693 }
+vm_state.vm_map: 13589.824179620 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2833252352, end = 2833264640, flags = 135266419, pgoff = 282624, inode = 22693 }
+vm_state.vm_map: 13589.824181756 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2833264640, end = 2833289216, flags = 1048691, pgoff = 2833264640, inode = 0 }
+vm_state.vm_map: 13589.824186342 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2833289216, end = 2833313792, flags = 134217845, pgoff = 0, inode = 59316 }
+vm_state.vm_map: 13589.824188757 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2833313792, end = 2833317888, flags = 135266419, pgoff = 20480, inode = 59316 }
+vm_state.vm_map: 13589.824191151 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2833317888, end = 2833334272, flags = 134217845, pgoff = 0, inode = 57390 }
+vm_state.vm_map: 13589.824193195 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2833334272, end = 2833338368, flags = 135266419, pgoff = 12288, inode = 57390 }
+vm_state.vm_map: 13589.824195646 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2833338368, end = 2833379328, flags = 134217845, pgoff = 0, inode = 57395 }
+vm_state.vm_map: 13589.824197813 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2833379328, end = 2833383424, flags = 135266419, pgoff = 36864, inode = 57395 }
+vm_state.vm_map: 13589.824200250 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2833383424, end = 2833408000, flags = 134217845, pgoff = 0, inode = 18917 }
+vm_state.vm_map: 13589.824202288 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2833408000, end = 2833412096, flags = 135266419, pgoff = 20480, inode = 18917 }
+vm_state.vm_map: 13589.824204720 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2833412096, end = 2833682432, flags = 134217845, pgoff = 0, inode = 18916 }
+vm_state.vm_map: 13589.824206985 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2833682432, end = 2833686528, flags = 135266419, pgoff = 266240, inode = 18916 }
+vm_state.vm_map: 13589.824209479 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2833686528, end = 2833768448, flags = 134217845, pgoff = 0, inode = 18915 }
+vm_state.vm_map: 13589.824211523 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2833768448, end = 2833776640, flags = 135266419, pgoff = 77824, inode = 18915 }
+vm_state.vm_map: 13589.824213930 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2833776640, end = 2834558976, flags = 134217845, pgoff = 0, inode = 18927 }
+vm_state.vm_map: 13589.824216207 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2834558976, end = 2834567168, flags = 135266419, pgoff = 778240, inode = 18927 }
+vm_state.vm_map: 13589.824218596 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2834579456, end = 2834599936, flags = 134217845, pgoff = 0, inode = 57392 }
+vm_state.vm_map: 13589.824220628 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2834599936, end = 2834604032, flags = 135266419, pgoff = 16384, inode = 57392 }
+vm_state.vm_map: 13589.824222961 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2834604032, end = 2834636800, flags = 134217845, pgoff = 0, inode = 57396 }
+vm_state.vm_map: 13589.824225498 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2834636800, end = 2834640896, flags = 135266419, pgoff = 28672, inode = 57396 }
+vm_state.vm_map: 13589.824228003 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2834640896, end = 2834657280, flags = 134217845, pgoff = 0, inode = 57393 }
+vm_state.vm_map: 13589.824230048 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2834657280, end = 2834661376, flags = 135266419, pgoff = 12288, inode = 57393 }
+vm_state.vm_map: 13589.824232430 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2834661376, end = 2835025920, flags = 134217845, pgoff = 0, inode = 22572 }
+vm_state.vm_map: 13589.824234597 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2835025920, end = 2835034112, flags = 135266419, pgoff = 364544, inode = 22572 }
+vm_state.vm_map: 13589.824237102 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2835034112, end = 2835234816, flags = 134217845, pgoff = 0, inode = 20709 }
+vm_state.vm_map: 13589.824239289 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2835234816, end = 2835243008, flags = 135266419, pgoff = 196608, inode = 20709 }
+vm_state.vm_map: 13589.824241222 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2835243008, end = 2835251200, flags = 1048691, pgoff = 2835243008, inode = 0 }
+vm_state.vm_map: 13589.824243826 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2835251200, end = 2835701760, flags = 134217845, pgoff = 0, inode = 20711 }
+vm_state.vm_map: 13589.824245857 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2835701760, end = 2835714048, flags = 135266419, pgoff = 450560, inode = 20711 }
+vm_state.vm_map: 13589.824248264 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2835714048, end = 2835730432, flags = 134217845, pgoff = 0, inode = 57389 }
+vm_state.vm_map: 13589.824250229 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2835730432, end = 2835734528, flags = 135266419, pgoff = 12288, inode = 57389 }
+vm_state.vm_map: 13589.824252746 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2835734528, end = 2835750912, flags = 134217845, pgoff = 0, inode = 18914 }
+vm_state.vm_map: 13589.824254907 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2835750912, end = 2835755008, flags = 135266419, pgoff = 16384, inode = 18914 }
+vm_state.vm_map: 13589.824257420 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2835755008, end = 2835771392, flags = 134217845, pgoff = 0, inode = 57394 }
+vm_state.vm_map: 13589.824259358 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2835771392, end = 2835775488, flags = 135266419, pgoff = 16384, inode = 57394 }
+vm_state.vm_map: 13589.824262240 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2835775488, end = 2835804160, flags = 134217845, pgoff = 0, inode = 57397 }
+vm_state.vm_map: 13589.824264271 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2835804160, end = 2835808256, flags = 135266419, pgoff = 24576, inode = 57397 }
+vm_state.vm_map: 13589.824266795 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2835808256, end = 2835935232, flags = 134217845, pgoff = 0, inode = 18923 }
+vm_state.vm_map: 13589.824268760 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2835935232, end = 2835939328, flags = 135266419, pgoff = 122880, inode = 18923 }
+vm_state.vm_map: 13589.824271277 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2835943424, end = 2835968000, flags = 134217845, pgoff = 0, inode = 57398 }
+vm_state.vm_map: 13589.824273303 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2835968000, end = 2835972096, flags = 135266419, pgoff = 24576, inode = 57398 }
+vm_state.vm_map: 13589.824290769 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2835972096, end = 2835988480, flags = 134217845, pgoff = 0, inode = 52571 }
+vm_state.vm_map: 13589.824293022 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2835988480, end = 2835992576, flags = 135266419, pgoff = 12288, inode = 52571 }
+vm_state.vm_map: 13589.824295269 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2835992576, end = 2836004864, flags = 134217845, pgoff = 0, inode = 49489 }
+vm_state.vm_map: 13589.824297443 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2836004864, end = 2836008960, flags = 135266419, pgoff = 8192, inode = 49489 }
+vm_state.vm_map: 13589.824299843 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2836008960, end = 2836029440, flags = 134217845, pgoff = 0, inode = 52570 }
+vm_state.vm_map: 13589.824301881 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2836029440, end = 2836033536, flags = 135266419, pgoff = 16384, inode = 52570 }
+vm_state.vm_map: 13589.824307447 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2836033536, end = 2836369408, flags = 134217845, pgoff = 0, inode = 59171 }
+vm_state.vm_map: 13589.824309620 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2836369408, end = 2836381696, flags = 135266419, pgoff = 331776, inode = 59171 }
+vm_state.vm_map: 13589.824311996 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2836381696, end = 2836512768, flags = 134217845, pgoff = 0, inode = 24420 }
+vm_state.vm_map: 13589.824314409 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2836512768, end = 2836516864, flags = 135266419, pgoff = 126976, inode = 24420 }
+vm_state.vm_map: 13589.824316915 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2836516864, end = 2836553728, flags = 134217845, pgoff = 0, inode = 52569 }
+vm_state.vm_map: 13589.824318941 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2836553728, end = 2836557824, flags = 135266419, pgoff = 32768, inode = 52569 }
+vm_state.vm_map: 13589.824321483 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2836557824, end = 2836582400, flags = 134217845, pgoff = 0, inode = 52572 }
+vm_state.vm_map: 13589.824323465 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2836582400, end = 2836586496, flags = 135266419, pgoff = 20480, inode = 52572 }
+vm_state.vm_map: 13589.824326088 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2836586496, end = 2836606976, flags = 134217845, pgoff = 0, inode = 52568 }
+vm_state.vm_map: 13589.824328070 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2836606976, end = 2836611072, flags = 135266419, pgoff = 16384, inode = 52568 }
+vm_state.vm_map: 13589.824330712 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2836611072, end = 2836668416, flags = 134217845, pgoff = 0, inode = 59183 }
+vm_state.vm_map: 13589.824332694 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2836668416, end = 2836672512, flags = 135266419, pgoff = 57344, inode = 59183 }
+vm_state.vm_map: 13589.824337668 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2836672512, end = 2836819968, flags = 134217845, pgoff = 0, inode = 59164 }
+vm_state.vm_map: 13589.824339707 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2836819968, end = 2836828160, flags = 135266419, pgoff = 143360, inode = 59164 }
+vm_state.vm_map: 13589.824344514 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2836828160, end = 2837065728, flags = 134217845, pgoff = 0, inode = 23890 }
+vm_state.vm_map: 13589.824346552 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2837065728, end = 2837073920, flags = 135266419, pgoff = 237568, inode = 23890 }
+vm_state.vm_map: 13589.824348966 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2837073920, end = 2837082112, flags = 134217845, pgoff = 0, inode = 23893 }
+vm_state.vm_map: 13589.824351367 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2837082112, end = 2837086208, flags = 135266419, pgoff = 4096, inode = 23893 }
+vm_state.vm_map: 13589.824353761 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2837086208, end = 2837164032, flags = 134217845, pgoff = 0, inode = 59155 }
+vm_state.vm_map: 13589.824355756 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2837164032, end = 2837168128, flags = 135266419, pgoff = 77824, inode = 59155 }
+vm_state.vm_map: 13589.824361154 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2837168128, end = 2837254144, flags = 134217845, pgoff = 0, inode = 59188 }
+vm_state.vm_map: 13589.824363298 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2837254144, end = 2837258240, flags = 135266419, pgoff = 81920, inode = 59188 }
+vm_state.vm_map: 13589.824368290 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2837258240, end = 2837344256, flags = 134217845, pgoff = 0, inode = 23716 }
+vm_state.vm_map: 13589.824370334 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2837344256, end = 2837348352, flags = 135266419, pgoff = 81920, inode = 23716 }
+vm_state.vm_map: 13589.824372656 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2837348352, end = 2837385216, flags = 134217845, pgoff = 0, inode = 21288 }
+vm_state.vm_map: 13589.824374829 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2837385216, end = 2837389312, flags = 135266419, pgoff = 36864, inode = 21288 }
+vm_state.vm_map: 13589.824377408 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2837389312, end = 2837618688, flags = 134217845, pgoff = 0, inode = 23913 }
+vm_state.vm_map: 13589.824379570 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2837618688, end = 2837626880, flags = 135266419, pgoff = 225280, inode = 23913 }
+vm_state.vm_map: 13589.824381989 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2837626880, end = 2837811200, flags = 134217845, pgoff = 0, inode = 23888 }
+vm_state.vm_map: 13589.824384156 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2837811200, end = 2837819392, flags = 135266419, pgoff = 180224, inode = 23888 }
+vm_state.vm_map: 13589.824386538 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2837819392, end = 2838106112, flags = 134217845, pgoff = 0, inode = 1065175 }
+vm_state.vm_map: 13589.824388926 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2838106112, end = 2838114304, flags = 135266419, pgoff = 286720, inode = 1065175 }
+vm_state.vm_map: 13589.824391199 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2838122496, end = 2838204416, flags = 134217845, pgoff = 0, inode = 59181 }
+vm_state.vm_map: 13589.824393526 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2838204416, end = 2838208512, flags = 135266419, pgoff = 81920, inode = 59181 }
+vm_state.vm_map: 13589.824396044 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2838208512, end = 2838331392, flags = 134217845, pgoff = 0, inode = 59187 }
+vm_state.vm_map: 13589.824398075 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2838331392, end = 2838335488, flags = 135266419, pgoff = 118784, inode = 59187 }
+vm_state.vm_map: 13589.824402699 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2838335488, end = 2838523904, flags = 134217845, pgoff = 0, inode = 22645 }
+vm_state.vm_map: 13589.824404743 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2838523904, end = 2838532096, flags = 135266419, pgoff = 184320, inode = 22645 }
+vm_state.vm_map: 13589.824407113 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2838540288, end = 2838564864, flags = 134217845, pgoff = 0, inode = 58146 }
+vm_state.vm_map: 13589.824409144 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2838564864, end = 2838568960, flags = 135266419, pgoff = 20480, inode = 58146 }
+vm_state.vm_map: 13589.824411638 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2838568960, end = 2838622208, flags = 134217845, pgoff = 0, inode = 59182 }
+vm_state.vm_map: 13589.824413818 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2838622208, end = 2838626304, flags = 135266419, pgoff = 53248, inode = 59182 }
+vm_state.vm_map: 13589.824416224 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2838626304, end = 2838990848, flags = 134217845, pgoff = 0, inode = 57823 }
+vm_state.vm_map: 13589.824418379 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2838990848, end = 2839003136, flags = 135266419, pgoff = 364544, inode = 57823 }
+vm_state.vm_map: 13589.824420750 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2839003136, end = 2839048192, flags = 134217845, pgoff = 0, inode = 59186 }
+vm_state.vm_map: 13589.824422843 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2839048192, end = 2839052288, flags = 135266419, pgoff = 40960, inode = 59186 }
+vm_state.vm_map: 13589.824425582 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2839052288, end = 2839068672, flags = 134217845, pgoff = 0, inode = 59014 }
+vm_state.vm_map: 13589.824427608 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2839068672, end = 2839072768, flags = 135266419, pgoff = 16384, inode = 59014 }
+vm_state.vm_map: 13589.824430021 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2839072768, end = 2839085056, flags = 134217845, pgoff = 0, inode = 59166 }
+vm_state.vm_map: 13589.824432065 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2839085056, end = 2839089152, flags = 135266419, pgoff = 8192, inode = 59166 }
+vm_state.vm_map: 13589.824434552 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2839089152, end = 2839175168, flags = 134217845, pgoff = 0, inode = 59165 }
+vm_state.vm_map: 13589.824436596 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2839175168, end = 2839179264, flags = 135266419, pgoff = 86016, inode = 59165 }
+vm_state.vm_map: 13589.824439423 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2839179264, end = 2841223168, flags = 134217937, pgoff = 0, inode = 1204686 }
+vm_state.vm_map: 13589.824441922 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2841223168, end = 2841296896, flags = 134217841, pgoff = 0, inode = 98526 }
+vm_state.vm_map: 13589.824444434 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2841296896, end = 2967638016, flags = 134217979, pgoff = 0, inode = 73879 }
+vm_state.vm_map: 13589.824446884 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 2967638016, end = 3001294848, flags = 134217979, pgoff = 0, inode = 73878 }
+vm_state.vm_map: 13589.824449327 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3001294848, end = 3001335808, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.824451354 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3001335808, end = 3001339904, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.824453385 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3001339904, end = 3001344000, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.824455632 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3001344000, end = 3001380864, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.824457590 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3001380864, end = 3001384960, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.824459750 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3001384960, end = 3001389056, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.824462366 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3001389056, end = 3001413632, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.824464528 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3001413632, end = 3001417728, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.824466578 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3001417728, end = 3001421824, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.824469003 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3001421824, end = 3001430016, flags = 134217845, pgoff = 0, inode = 17721 }
+vm_state.vm_map: 13589.824471041 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3001430016, end = 3001434112, flags = 135266419, pgoff = 4096, inode = 17721 }
+vm_state.vm_map: 13589.824473547 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3001434112, end = 3001516032, flags = 134217841, pgoff = 0, inode = 98443 }
+vm_state.vm_map: 13589.824481939 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3001516032, end = 3017756672, flags = 134217979, pgoff = 0, inode = 1204618 }
+vm_state.vm_map: 13589.824487424 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3017756672, end = 3022053376, flags = 134217979, pgoff = 0, inode = 1204425 }
+vm_state.vm_map: 13589.824489609 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022053376, end = 3022254080, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 13589.824491634 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022254080, end = 3022258176, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 13589.824493938 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022258176, end = 3022290944, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 13589.824495969 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022290944, end = 3022295040, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 13589.824498265 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022295040, end = 3022303232, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 13589.824500660 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022303232, end = 3022307328, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 13589.824502740 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022307328, end = 3022331904, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 13589.824504914 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022331904, end = 3022336000, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 13589.824507075 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022336000, end = 3022413824, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.824509119 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022413824, end = 3022417920, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.824511089 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022417920, end = 3022422016, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.824513263 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022422016, end = 3022430208, flags = 1048691, pgoff = 3022422016, inode = 0 }
+vm_state.vm_map: 13589.824515460 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022430208, end = 3022434304, flags = 134217937, pgoff = 0, inode = 1196317 }
+vm_state.vm_map: 13589.824517757 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022434304, end = 3022458880, flags = 134217937, pgoff = 0, inode = 1196229 }
+vm_state.vm_map: 13589.824519948 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022458880, end = 3022462976, flags = 134217937, pgoff = 0, inode = 1196235 }
+vm_state.vm_map: 13589.824522244 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022462976, end = 3022467072, flags = 134217937, pgoff = 0, inode = 1196204 }
+vm_state.vm_map: 13589.824524517 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022467072, end = 3022471168, flags = 134217937, pgoff = 0, inode = 1196228 }
+vm_state.vm_map: 13589.824526677 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022471168, end = 3022475264, flags = 134217937, pgoff = 0, inode = 1196227 }
+vm_state.vm_map: 13589.824528930 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022475264, end = 3022483456, flags = 134217937, pgoff = 0, inode = 1196198 }
+vm_state.vm_map: 13589.824531190 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022483456, end = 3022516224, flags = 134217937, pgoff = 0, inode = 1196200 }
+vm_state.vm_map: 13589.824533357 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022516224, end = 3022528512, flags = 134217937, pgoff = 0, inode = 1196226 }
+vm_state.vm_map: 13589.824535894 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022528512, end = 3022536704, flags = 134217937, pgoff = 0, inode = 1196225 }
+vm_state.vm_map: 13589.824538202 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022536704, end = 3022540800, flags = 134217937, pgoff = 0, inode = 1196224 }
+vm_state.vm_map: 13589.824540498 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022540800, end = 3022544896, flags = 134217937, pgoff = 0, inode = 1196223 }
+vm_state.vm_map: 13589.824542654 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022544896, end = 3022548992, flags = 134217937, pgoff = 0, inode = 1196202 }
+vm_state.vm_map: 13589.824544938 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022548992, end = 3022577664, flags = 134217937, pgoff = 0, inode = 1196222 }
+vm_state.vm_map: 13589.824547154 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022577664, end = 3022589952, flags = 134217937, pgoff = 0, inode = 1196221 }
+vm_state.vm_map: 13589.824549382 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022589952, end = 3022594048, flags = 134217937, pgoff = 0, inode = 1196220 }
+vm_state.vm_map: 13589.824551678 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022594048, end = 3022602240, flags = 134217937, pgoff = 0, inode = 1196219 }
+vm_state.vm_map: 13589.824553963 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022602240, end = 3022606336, flags = 134217937, pgoff = 0, inode = 1196210 }
+vm_state.vm_map: 13589.824556062 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022606336, end = 3022610432, flags = 134217937, pgoff = 0, inode = 1196205 }
+vm_state.vm_map: 13589.824558543 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022610432, end = 3022622720, flags = 134217937, pgoff = 0, inode = 1196244 }
+vm_state.vm_map: 13589.824560821 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022622720, end = 3022655488, flags = 134217937, pgoff = 0, inode = 1196246 }
+vm_state.vm_map: 13589.824563216 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022655488, end = 3022684160, flags = 134217937, pgoff = 0, inode = 1196197 }
+vm_state.vm_map: 13589.824565333 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022684160, end = 3022909440, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.824567495 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022909440, end = 3022913536, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.824569526 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022913536, end = 3022917632, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.824572099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3022917632, end = 3023077376, flags = 134217845, pgoff = 0, inode = 22541 }
+vm_state.vm_map: 13589.824574058 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3023077376, end = 3023081472, flags = 135266419, pgoff = 159744, inode = 22541 }
+vm_state.vm_map: 13589.824576471 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3023081472, end = 3023650816, flags = 134217845, pgoff = 0, inode = 20907 }
+vm_state.vm_map: 13589.824578502 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3023650816, end = 3023667200, flags = 135266419, pgoff = 565248, inode = 20907 }
+vm_state.vm_map: 13589.824580669 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3023667200, end = 3023904768, flags = 1048691, pgoff = 3023904768, inode = 0 }
+vm_state.vm_map: 13589.824582861 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3023912960, end = 3023958016, flags = 134217937, pgoff = 0, inode = 1196312 }
+vm_state.vm_map: 13589.824585170 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3023958016, end = 3024015360, flags = 134217937, pgoff = 0, inode = 1196272 }
+vm_state.vm_map: 13589.824587706 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3024015360, end = 3024097280, flags = 134217845, pgoff = 0, inode = 23971 }
+vm_state.vm_map: 13589.824589738 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3024097280, end = 3024101376, flags = 135266419, pgoff = 81920, inode = 23971 }
+vm_state.vm_map: 13589.824592114 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3024101376, end = 3024560128, flags = 134217845, pgoff = 0, inode = 1066197 }
+vm_state.vm_map: 13589.824594435 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3024560128, end = 3024576512, flags = 135266419, pgoff = 454656, inode = 1066197 }
+vm_state.vm_map: 13589.824596516 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3024576512, end = 3024609280, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 13589.824598566 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3024609280, end = 3024613376, flags = 135266419, pgoff = 32768, inode = 20716 }
+vm_state.vm_map: 13589.824600727 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3024613376, end = 3025133568, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 13589.824602857 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3025133568, end = 3025141760, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 13589.824604937 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3025141760, end = 3025506304, flags = 134217845, pgoff = 0, inode = 1065038 }
+vm_state.vm_map: 13589.824607475 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3025506304, end = 3025543168, flags = 135266423, pgoff = 364544, inode = 1065038 }
+vm_state.vm_map: 13589.824609444 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3025543168, end = 3025547264, flags = 1048695, pgoff = 3025543168, inode = 0 }
+vm_state.vm_map: 13589.824610751 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3025547264, end = 3026100224, flags = 134217845, pgoff = 0, inode = 18947 }
+kernel.irq_entry: 13589.824629399 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { ip = 3242331332, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_update_time: 13589.824644076 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { jiffies = 4296292865, xtime_sec = 1262715366, xtime_nsec = 301133048, walltomonotonic_sec = -1262701811, walltomonotonic_nsec = 148963639 }
+kernel.softirq_raise: 13589.824662718 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { softirq_id = 1 [softirq 1] }
+kernel.irq_exit: 13589.824689739 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.softirq_entry: 13589.824692995 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, SOFTIRQ { softirq_id = 1 [softirq 1] }
+kernel.timer_set: 13589.824705240 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, SOFTIRQ { expires = 1325570, function = 0xc141d458, data = 0 }
+kernel.softirq_exit: 13589.824708257 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { softirq_id = 1 [softirq 1] }
+vm_state.vm_map: 13589.824713798 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3026100224, end = 3026120704, flags = 135266419, pgoff = 548864, inode = 18947 }
+vm_state.vm_map: 13589.824715805 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3026120704, end = 3026436096, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 13589.824717738 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3026436096, end = 3026444288, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 13589.824719708 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3026444288, end = 3026513920, flags = 134217845, pgoff = 0, inode = 1065123 }
+vm_state.vm_map: 13589.824721783 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3026513920, end = 3026518016, flags = 135266419, pgoff = 69632, inode = 1065123 }
+vm_state.vm_map: 13589.824723956 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3026518016, end = 3041013760, flags = 134217845, pgoff = 0, inode = 20672 }
+vm_state.vm_map: 13589.824729282 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3041013760, end = 3041628160, flags = 135266419, pgoff = 14495744, inode = 20672 }
+vm_state.vm_map: 13589.824731245 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3041628160, end = 3041636352, flags = 1048691, pgoff = 3041628160, inode = 0 }
+vm_state.vm_map: 13589.824733295 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3041636352, end = 3042009088, flags = 134217845, pgoff = 0, inode = 20902 }
+vm_state.vm_map: 13589.824735629 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3042009088, end = 3042021376, flags = 135266419, pgoff = 368640, inode = 20902 }
+vm_state.vm_map: 13589.824737704 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3042021376, end = 3042025472, flags = 1048691, pgoff = 3042021376, inode = 0 }
+vm_state.vm_map: 13589.824739803 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3042025472, end = 3042045952, flags = 134217937, pgoff = 0, inode = 1196269 }
+vm_state.vm_map: 13589.824741994 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3042045952, end = 3042058240, flags = 134217937, pgoff = 0, inode = 1196315 }
+vm_state.vm_map: 13589.824744088 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3042058240, end = 3042115584, flags = 134217937, pgoff = 0, inode = 1196231 }
+vm_state.vm_map: 13589.824746039 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3042115584, end = 3044098048, flags = 134217845, pgoff = 0, inode = 20915 }
+vm_state.vm_map: 13589.824748077 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3044098048, end = 3044139008, flags = 135266419, pgoff = 1978368, inode = 20915 }
+vm_state.vm_map: 13589.824750053 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3044139008, end = 3045470208, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.824751992 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3045470208, end = 3045486592, flags = 1048691, pgoff = 3045470208, inode = 0 }
+vm_state.vm_map: 13589.824754030 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3045486592, end = 3045634048, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.824756062 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3045634048, end = 3045642240, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.824758285 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3045642240, end = 3045961728, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 13589.824760248 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3045961728, end = 3045978112, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 13589.824762378 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3045978112, end = 3045990400, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 13589.824764317 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3045990400, end = 3045994496, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 13589.824766361 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3045994496, end = 3047251968, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 13589.824768880 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3047251968, end = 3047272448, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 13589.824770837 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3047272448, end = 3047280640, flags = 1048691, pgoff = 3047272448, inode = 0 }
+vm_state.vm_map: 13589.824773035 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3047280640, end = 3047518208, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 13589.824775080 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3047518208, end = 3047522304, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 13589.824777160 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3047522304, end = 3047538688, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.824779093 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3047538688, end = 3047542784, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.824781162 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3047542784, end = 3047550976, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.824783095 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3047550976, end = 3047555072, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.824785225 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3047555072, end = 3047747584, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.824787411 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3047747584, end = 3047751680, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.824789381 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3047751680, end = 3047804928, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 13589.824791308 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3047804928, end = 3047809024, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 13589.824793327 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3047809024, end = 3047813120, flags = 1048691, pgoff = 3047809024, inode = 0 }
+vm_state.vm_map: 13589.824795407 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3047813120, end = 3047985152, flags = 134217845, pgoff = 0, inode = 1065255 }
+vm_state.vm_map: 13589.824797341 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3047985152, end = 3047989248, flags = 135266419, pgoff = 172032, inode = 1065255 }
+vm_state.vm_map: 13589.824799305 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3047989248, end = 3048235008, flags = 134217845, pgoff = 0, inode = 20603 }
+vm_state.vm_map: 13589.824801675 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3048235008, end = 3048239104, flags = 135266419, pgoff = 245760, inode = 20603 }
+vm_state.vm_map: 13589.824803750 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3048239104, end = 3048710144, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 13589.824805677 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3048710144, end = 3048726528, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 13589.824807714 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3048726528, end = 3048869888, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 13589.824809648 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3048869888, end = 3048873984, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 13589.824811618 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3048873984, end = 3048960000, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 13589.824813649 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3048960000, end = 3048964096, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 13589.824815576 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3048964096, end = 3048968192, flags = 1048691, pgoff = 3048964096, inode = 0 }
+vm_state.vm_map: 13589.824817632 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3048968192, end = 3048984576, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 13589.824819812 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3048984576, end = 3048988672, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 13589.824821819 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3048988672, end = 3049021440, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 13589.824823807 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3049021440, end = 3049025536, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 13589.824825765 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3049025536, end = 3049041920, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 13589.824827847 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3049041920, end = 3049046016, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 13589.824829798 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3049046016, end = 3049132032, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 13589.824834778 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3049132032, end = 3049136128, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 13589.824836729 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3049136128, end = 3049144320, flags = 1048691, pgoff = 3049136128, inode = 0 }
+vm_state.vm_map: 13589.824838786 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3049144320, end = 3049172992, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 13589.824840738 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3049172992, end = 3049177088, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 13589.824842689 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3049177088, end = 3049181184, flags = 1048691, pgoff = 3049177088, inode = 0 }
+vm_state.vm_map: 13589.824844745 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3049181184, end = 3049512960, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 13589.824846692 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3049512960, end = 3049521152, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 13589.824848668 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3049521152, end = 3049553920, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 13589.824850785 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3049553920, end = 3049558016, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 13589.824852804 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3049558016, end = 3049574400, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 13589.824854756 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3049574400, end = 3049578496, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 13589.824856732 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3049578496, end = 3049603072, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 13589.824858801 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3049603072, end = 3049607168, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 13589.824860882 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3049607168, end = 3049639936, flags = 134217845, pgoff = 0, inode = 18621 }
+vm_state.vm_map: 13589.824862833 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3049639936, end = 3049644032, flags = 135266419, pgoff = 28672, inode = 18621 }
+vm_state.vm_map: 13589.824864908 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3049644032, end = 3049648128, flags = 1048691, pgoff = 3049644032, inode = 0 }
+vm_state.vm_map: 13589.824867241 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3049648128, end = 3050078208, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 13589.824869187 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3050078208, end = 3050106880, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 13589.824871249 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3050106880, end = 3050110976, flags = 1048691, pgoff = 3050106880, inode = 0 }
+vm_state.vm_map: 13589.824873354 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3050110976, end = 3050553344, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 13589.824875306 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3050553344, end = 3050561536, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 13589.824877510 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3050561536, end = 3050659840, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.824879456 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3050659840, end = 3050663936, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.824881420 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3050663936, end = 3050934272, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 13589.824883488 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3050934272, end = 3050942464, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 13589.824885736 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3050942464, end = 3051003904, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 13589.824887724 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3051003904, end = 3051008000, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 13589.824889768 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3051008000, end = 3051012096, flags = 1048691, pgoff = 3051008000, inode = 0 }
+vm_state.vm_map: 13589.824891812 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3051012096, end = 3051479040, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 13589.824893745 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3051479040, end = 3051487232, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 13589.824895733 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3051487232, end = 3052617728, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 13589.824897796 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3052617728, end = 3052634112, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 13589.824900339 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3052634112, end = 3052748800, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.824902271 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3052748800, end = 3052752896, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.824904315 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3052752896, end = 3052900352, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.824906254 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3052900352, end = 3052904448, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.824908193 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3052904448, end = 3052908544, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.824910324 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3052908544, end = 3052916736, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.824912251 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3052916736, end = 3052920832, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.824914184 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3052920832, end = 3052924928, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.824916240 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3052924928, end = 3052929024, flags = 1048691, pgoff = 3052924928, inode = 0 }
+vm_state.vm_map: 13589.824918260 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3052929024, end = 3053015040, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.824920236 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3053015040, end = 3053019136, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.824922169 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3053019136, end = 3053023232, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.824924225 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3053023232, end = 3053031424, flags = 1048691, pgoff = 3053023232, inode = 0 }
+vm_state.vm_map: 13589.824926189 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3053031424, end = 3053776896, flags = 134217845, pgoff = 0, inode = 499794 }
+vm_state.vm_map: 13589.824930764 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3053776896, end = 3053780992, flags = 135266419, pgoff = 745472, inode = 499794 }
+vm_state.vm_map: 13589.824933054 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3053780992, end = 3053809664, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.824935091 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3053809664, end = 3053813760, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.824937024 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3053813760, end = 3053817856, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.824938995 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3053817856, end = 3053834240, flags = 134217845, pgoff = 0, inode = 20149 }
+vm_state.vm_map: 13589.824941033 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3053834240, end = 3053838336, flags = 135266419, pgoff = 12288, inode = 20149 }
+vm_state.vm_map: 13589.824943329 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3053838336, end = 3053920256, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.824945256 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3053920256, end = 3053924352, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.824947570 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3053924352, end = 3055239168, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.824949498 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3055239168, end = 3055247360, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.824951431 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3055247360, end = 3055251456, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.824953425 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3055251456, end = 3055267840, flags = 1048691, pgoff = 3055251456, inode = 0 }
+vm_state.vm_map: 13589.824955598 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3055267840, end = 3056205824, flags = 134217845, pgoff = 0, inode = 16850 }
+vm_state.vm_map: 13589.824957580 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3056205824, end = 3056222208, flags = 135266417, pgoff = 937984, inode = 16850 }
+vm_state.vm_map: 13589.824959564 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3056222208, end = 3056226304, flags = 135266419, pgoff = 954368, inode = 16850 }
+vm_state.vm_map: 13589.824961620 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3056226304, end = 3056254976, flags = 1048691, pgoff = 3056226304, inode = 0 }
+vm_state.vm_map: 13589.824963608 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3056254976, end = 3066294272, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 13589.824965880 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3066294272, end = 3066454016, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 13589.824967930 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3066454016, end = 3066462208, flags = 1048691, pgoff = 3066454016, inode = 0 }
+vm_state.vm_map: 13589.824969881 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3066462208, end = 3070058496, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 13589.824971815 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3070058496, end = 3070156800, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 13589.824973871 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3070156800, end = 3070160896, flags = 1048691, pgoff = 3070156800, inode = 0 }
+vm_state.vm_map: 13589.824975927 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3070160896, end = 3072716800, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 13589.824977861 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3072716800, end = 3072765952, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 13589.824979905 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3072765952, end = 3072770048, flags = 1048691, pgoff = 3072765952, inode = 0 }
+vm_state.vm_map: 13589.824981973 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3072770048, end = 3073921024, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.824983906 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3073921024, end = 3073937408, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.824986091 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3073937408, end = 3074170880, flags = 134217845, pgoff = 0, inode = 1065180 }
+vm_state.vm_map: 13589.824988178 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3074170880, end = 3074179072, flags = 135266419, pgoff = 233472, inode = 1065180 }
+vm_state.vm_map: 13589.824990124 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3074179072, end = 3074183168, flags = 1048691, pgoff = 3074179072, inode = 0 }
+vm_state.vm_map: 13589.824992082 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3074183168, end = 3076485120, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 13589.824994113 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3076485120, end = 3076530176, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 13589.824996200 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3076530176, end = 3078840320, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 13589.824998478 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3078840320, end = 3078868992, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 13589.825000516 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3078868992, end = 3078873088, flags = 1048691, pgoff = 3078868992, inode = 0 }
+vm_state.vm_map: 13589.825002585 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3078873088, end = 3078881280, flags = 134217937, pgoff = 0, inode = 1196270 }
+vm_state.vm_map: 13589.825004776 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3078881280, end = 3078889472, flags = 134217937, pgoff = 0, inode = 1196316 }
+vm_state.vm_map: 13589.825006740 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3078889472, end = 3078897664, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 13589.825008673 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3078897664, end = 3078901760, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 13589.825010711 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3078901760, end = 3078918144, flags = 134217845, pgoff = 0, inode = 22094 }
+vm_state.vm_map: 13589.825012638 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3078918144, end = 3078922240, flags = 135266419, pgoff = 12288, inode = 22094 }
+vm_state.vm_map: 13589.825014614 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3078922240, end = 3078930432, flags = 134217845, pgoff = 0, inode = 1450546 }
+vm_state.vm_map: 13589.825016713 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3078930432, end = 3078934528, flags = 135266417, pgoff = 4096, inode = 1450546 }
+vm_state.vm_map: 13589.825018689 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3078934528, end = 3078938624, flags = 135266419, pgoff = 8192, inode = 1450546 }
+vm_state.vm_map: 13589.825020653 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3078938624, end = 3078967296, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.825022605 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3078967296, end = 3078975488, flags = 1048691, pgoff = 3078967296, inode = 0 }
+vm_state.vm_map: 13589.825024649 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3078975488, end = 3078979584, flags = 67371125, pgoff = 3078975488, inode = 0 }
+vm_state.vm_map: 13589.825026638 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3078979584, end = 3079094272, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.825028725 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3079094272, end = 3079098368, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.825030996 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3079098368, end = 3079102464, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.825032936 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2213, start = 3214217216, end = 3214303232, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.825038575 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 134512640, end = 134553600, flags = 134223989, pgoff = 0, inode = 20759 }
+vm_state.vm_map: 13589.825040520 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 134553600, end = 134557696, flags = 135272563, pgoff = 36864, inode = 20759 }
+vm_state.vm_map: 13589.825042478 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 134557696, end = 134565888, flags = 1048691, pgoff = 134557696, inode = 0 }
+vm_state.vm_map: 13589.825044541 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 145301504, end = 146137088, flags = 1048691, pgoff = 145301504, inode = 0 }
+vm_state.vm_map: 13589.825046609 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3023667200, end = 3023904768, flags = 1048691, pgoff = 3023904768, inode = 0 }
+vm_state.vm_map: 13589.825051755 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3024261120, end = 3024302080, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.825053695 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3024302080, end = 3024306176, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.825055635 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3024306176, end = 3024310272, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.825057789 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3024310272, end = 3024347136, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.825059765 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3024347136, end = 3024351232, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.825061871 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3024351232, end = 3024355328, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.825064100 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3024355328, end = 3024433152, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.825066501 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3024433152, end = 3024437248, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.825068662 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3024437248, end = 3024441344, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.825070705 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3024441344, end = 3024449536, flags = 1048691, pgoff = 3024441344, inode = 0 }
+vm_state.vm_map: 13589.825072885 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3024449536, end = 3024474112, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.825074904 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3024474112, end = 3024478208, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.825076936 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3024478208, end = 3024482304, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.825078999 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3024576512, end = 3024609280, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 13589.825081036 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3024609280, end = 3024613376, flags = 135266419, pgoff = 32768, inode = 20716 }
+vm_state.vm_map: 13589.825083203 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3024613376, end = 3025133568, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 13589.825085235 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3025133568, end = 3025141760, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 13589.825087285 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3025141760, end = 3025506304, flags = 134217845, pgoff = 0, inode = 1065038 }
+vm_state.vm_map: 13589.825089428 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3025506304, end = 3025543168, flags = 135266423, pgoff = 364544, inode = 1065038 }
+vm_state.vm_map: 13589.825091466 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3025543168, end = 3025547264, flags = 1048695, pgoff = 3025543168, inode = 0 }
+vm_state.vm_map: 13589.825093442 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3025547264, end = 3026100224, flags = 134217845, pgoff = 0, inode = 18947 }
+vm_state.vm_map: 13589.825095738 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3026100224, end = 3026120704, flags = 135266419, pgoff = 548864, inode = 18947 }
+vm_state.vm_map: 13589.825097788 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3026120704, end = 3026436096, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 13589.825100165 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3026436096, end = 3026444288, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 13589.825102338 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3026444288, end = 3026513920, flags = 134217845, pgoff = 0, inode = 1065123 }
+vm_state.vm_map: 13589.825104369 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3026513920, end = 3026518016, flags = 135266419, pgoff = 69632, inode = 1065123 }
+vm_state.vm_map: 13589.825106413 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3026518016, end = 3041013760, flags = 134217845, pgoff = 0, inode = 20672 }
+vm_state.vm_map: 13589.825108518 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3041013760, end = 3041628160, flags = 135266419, pgoff = 14495744, inode = 20672 }
+vm_state.vm_map: 13589.825110451 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3041628160, end = 3041636352, flags = 1048691, pgoff = 3041628160, inode = 0 }
+vm_state.vm_map: 13589.825112397 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3041636352, end = 3042009088, flags = 134217845, pgoff = 0, inode = 20902 }
+vm_state.vm_map: 13589.825114478 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3042009088, end = 3042021376, flags = 135266419, pgoff = 368640, inode = 20902 }
+vm_state.vm_map: 13589.825119317 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3042037760, end = 3042111488, flags = 134217845, pgoff = 0, inode = 57409 }
+vm_state.vm_map: 13589.825121293 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3042111488, end = 3042115584, flags = 135266419, pgoff = 73728, inode = 57409 }
+vm_state.vm_map: 13589.825123540 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3042115584, end = 3044098048, flags = 134217845, pgoff = 0, inode = 20915 }
+vm_state.vm_map: 13589.825125578 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3044098048, end = 3044139008, flags = 135266419, pgoff = 1978368, inode = 20915 }
+vm_state.vm_map: 13589.825127646 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3044139008, end = 3045470208, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.825129789 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3045470208, end = 3045486592, flags = 1048691, pgoff = 3045470208, inode = 0 }
+vm_state.vm_map: 13589.825131821 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3045486592, end = 3045634048, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.825152704 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3045634048, end = 3045642240, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.825155043 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3045642240, end = 3045961728, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 13589.825157117 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3045961728, end = 3045978112, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 13589.825159186 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3045978112, end = 3045990400, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 13589.825161334 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3045990400, end = 3045994496, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 13589.825163367 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3045994496, end = 3047251968, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 13589.825165533 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3047251968, end = 3047272448, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 13589.825167682 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3047272448, end = 3047280640, flags = 1048691, pgoff = 3047272448, inode = 0 }
+vm_state.vm_map: 13589.825169750 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3047280640, end = 3047518208, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 13589.825171732 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3047518208, end = 3047522304, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 13589.825173925 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3047522304, end = 3047538688, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.825176067 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3047538688, end = 3047542784, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.825178117 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3047542784, end = 3047550976, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.825183387 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3047550976, end = 3047555072, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.825185462 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3047555072, end = 3047747584, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.825187992 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3047747584, end = 3047751680, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.825190048 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3047751680, end = 3047804928, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 13589.825192079 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3047804928, end = 3047809024, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 13589.825194247 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3047809024, end = 3047813120, flags = 1048691, pgoff = 3047809024, inode = 0 }
+vm_state.vm_map: 13589.825196297 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3047813120, end = 3047985152, flags = 134217845, pgoff = 0, inode = 1065255 }
+vm_state.vm_map: 13589.825198322 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3047985152, end = 3047989248, flags = 135266419, pgoff = 172032, inode = 1065255 }
+vm_state.vm_map: 13589.825200422 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3047989248, end = 3048235008, flags = 134217845, pgoff = 0, inode = 20603 }
+vm_state.vm_map: 13589.825202588 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3048235008, end = 3048239104, flags = 135266419, pgoff = 245760, inode = 20603 }
+vm_state.vm_map: 13589.825204652 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3048239104, end = 3048710144, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 13589.825206689 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3048710144, end = 3048726528, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 13589.825208862 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3048726528, end = 3048869888, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 13589.825210955 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3048869888, end = 3048873984, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 13589.825213031 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3048873984, end = 3048960000, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 13589.825215204 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3048960000, end = 3048964096, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 13589.825217143 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3048964096, end = 3048968192, flags = 1048691, pgoff = 3048964096, inode = 0 }
+vm_state.vm_map: 13589.825219297 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3048968192, end = 3048984576, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 13589.825221828 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3048984576, end = 3048988672, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 13589.825223909 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3048988672, end = 3049021440, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 13589.825225928 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3049021440, end = 3049025536, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 13589.825228126 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3049025536, end = 3049041920, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 13589.825230090 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3049041920, end = 3049046016, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 13589.825232275 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3049046016, end = 3049132032, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 13589.825234423 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3049132032, end = 3049136128, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 13589.825236462 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3049136128, end = 3049144320, flags = 1048691, pgoff = 3049136128, inode = 0 }
+vm_state.vm_map: 13589.825238450 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3049144320, end = 3049172992, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 13589.825240722 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3049172992, end = 3049177088, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 13589.825242852 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3049177088, end = 3049181184, flags = 1048691, pgoff = 3049177088, inode = 0 }
+vm_state.vm_map: 13589.825244902 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3049181184, end = 3049512960, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 13589.825246934 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3049512960, end = 3049521152, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 13589.825249076 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3049521152, end = 3049553920, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 13589.825251101 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3049553920, end = 3049558016, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 13589.825253171 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3049558016, end = 3049574400, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 13589.825255688 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3049574400, end = 3049578496, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 13589.825257763 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3049578496, end = 3049603072, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 13589.825259788 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3049603072, end = 3049607168, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 13589.825261955 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3049607168, end = 3049639936, flags = 134217845, pgoff = 0, inode = 18621 }
+vm_state.vm_map: 13589.825263926 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3049639936, end = 3049644032, flags = 135266419, pgoff = 28672, inode = 18621 }
+vm_state.vm_map: 13589.825266093 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3049644032, end = 3049648128, flags = 1048691, pgoff = 3049644032, inode = 0 }
+vm_state.vm_map: 13589.825268235 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3049648128, end = 3050078208, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 13589.825270260 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3050078208, end = 3050106880, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 13589.825272298 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3050106880, end = 3050110976, flags = 1048691, pgoff = 3050106880, inode = 0 }
+vm_state.vm_map: 13589.825274360 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3050110976, end = 3050553344, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 13589.825276510 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3050553344, end = 3050561536, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 13589.825278578 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3050561536, end = 3050659840, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.825282999 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3050659840, end = 3050663936, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.825285061 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3050663936, end = 3050934272, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 13589.825287185 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3050934272, end = 3050942464, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 13589.825289709 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3050942464, end = 3051003904, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 13589.825291703 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3051003904, end = 3051008000, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 13589.825308418 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3051008000, end = 3051012096, flags = 1048691, pgoff = 3051008000, inode = 0 }
+vm_state.vm_map: 13589.825310690 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3051012096, end = 3051479040, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 13589.825312691 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3051479040, end = 3051487232, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 13589.825314962 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3051487232, end = 3052617728, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 13589.825316982 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3052617728, end = 3052634112, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 13589.825319069 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3052634112, end = 3052748800, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.825321082 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3052748800, end = 3052752896, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.825323415 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3052752896, end = 3052900352, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.825325447 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3052900352, end = 3052904448, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.825327473 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3052904448, end = 3052908544, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.825329664 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3052908544, end = 3052916736, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.825331695 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3052916736, end = 3052920832, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.825333721 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3052920832, end = 3052924928, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.825335900 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3052924928, end = 3052929024, flags = 1048691, pgoff = 3052924928, inode = 0 }
+vm_state.vm_map: 13589.825338283 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3052929024, end = 3053015040, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.825340438 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3053015040, end = 3053019136, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.825342592 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3053019136, end = 3053023232, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.825344631 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3053023232, end = 3053031424, flags = 1048691, pgoff = 3053023232, inode = 0 }
+vm_state.vm_map: 13589.825346662 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3053031424, end = 3053776896, flags = 134217845, pgoff = 0, inode = 499794 }
+vm_state.vm_map: 13589.825348934 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3053776896, end = 3053780992, flags = 135266419, pgoff = 745472, inode = 499794 }
+vm_state.vm_map: 13589.825350996 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3053780992, end = 3053809664, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.825353040 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3053809664, end = 3053813760, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.825355183 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3053813760, end = 3053817856, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.825357387 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3053817856, end = 3053834240, flags = 134217845, pgoff = 0, inode = 20149 }
+vm_state.vm_map: 13589.825359418 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3053834240, end = 3053838336, flags = 135266419, pgoff = 12288, inode = 20149 }
+vm_state.vm_map: 13589.825361493 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3053838336, end = 3053920256, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.825363562 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3053920256, end = 3053924352, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.825365717 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3053924352, end = 3055239168, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.825367742 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3055239168, end = 3055247360, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.825369909 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3055247360, end = 3055251456, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.825372217 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3055251456, end = 3055267840, flags = 1048691, pgoff = 3055251456, inode = 0 }
+vm_state.vm_map: 13589.825374404 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3055267840, end = 3056205824, flags = 134217845, pgoff = 0, inode = 16850 }
+vm_state.vm_map: 13589.825376540 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3056205824, end = 3056222208, flags = 135266417, pgoff = 937984, inode = 16850 }
+vm_state.vm_map: 13589.825378565 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3056222208, end = 3056226304, flags = 135266419, pgoff = 954368, inode = 16850 }
+vm_state.vm_map: 13589.825380559 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3056226304, end = 3056254976, flags = 1048691, pgoff = 3056226304, inode = 0 }
+vm_state.vm_map: 13589.825382849 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3056254976, end = 3066294272, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 13589.825384868 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3066294272, end = 3066454016, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 13589.825386907 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3066454016, end = 3066462208, flags = 1048691, pgoff = 3066454016, inode = 0 }
+vm_state.vm_map: 13589.825388902 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3066462208, end = 3070058496, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 13589.825391204 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3070058496, end = 3070156800, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 13589.825393242 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3070156800, end = 3070160896, flags = 1048691, pgoff = 3070156800, inode = 0 }
+vm_state.vm_map: 13589.825398284 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3070160896, end = 3072716800, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 13589.825400322 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3072716800, end = 3072765952, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 13589.825402470 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3072765952, end = 3072770048, flags = 1048691, pgoff = 3072765952, inode = 0 }
+vm_state.vm_map: 13589.825404538 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3072770048, end = 3073921024, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.825406909 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3073921024, end = 3073937408, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.825409052 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3073937408, end = 3074170880, flags = 134217845, pgoff = 0, inode = 1065180 }
+vm_state.vm_map: 13589.825411089 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3074170880, end = 3074179072, flags = 135266419, pgoff = 233472, inode = 1065180 }
+vm_state.vm_map: 13589.825413127 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3074179072, end = 3074183168, flags = 1048691, pgoff = 3074179072, inode = 0 }
+vm_state.vm_map: 13589.825415269 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3074183168, end = 3076485120, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 13589.825417234 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3076485120, end = 3076530176, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 13589.825419419 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3076530176, end = 3078840320, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 13589.825421463 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3078840320, end = 3078868992, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 13589.825423617 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3078868992, end = 3078873088, flags = 1048691, pgoff = 3078868992, inode = 0 }
+vm_state.vm_map: 13589.825425692 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3078889472, end = 3078897664, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 13589.825427724 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3078897664, end = 3078901760, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 13589.825429891 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3078901760, end = 3078918144, flags = 134217845, pgoff = 0, inode = 22094 }
+vm_state.vm_map: 13589.825431916 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3078918144, end = 3078922240, flags = 135266419, pgoff = 12288, inode = 22094 }
+vm_state.vm_map: 13589.825434010 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3078922240, end = 3078930432, flags = 134217845, pgoff = 0, inode = 1450546 }
+vm_state.vm_map: 13589.825436201 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3078930432, end = 3078934528, flags = 135266417, pgoff = 4096, inode = 1450546 }
+vm_state.vm_map: 13589.825438295 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3078934528, end = 3078938624, flags = 135266419, pgoff = 8192, inode = 1450546 }
+vm_state.vm_map: 13589.825440634 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3078938624, end = 3078967296, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.825442887 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3078967296, end = 3078975488, flags = 1048691, pgoff = 3078967296, inode = 0 }
+vm_state.vm_map: 13589.825444863 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3078975488, end = 3078979584, flags = 67371125, pgoff = 3078975488, inode = 0 }
+vm_state.vm_map: 13589.825447080 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3078979584, end = 3079094272, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.825449235 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3079094272, end = 3079098368, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.825451272 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3079098368, end = 3079102464, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.825453310 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2218, start = 3214217216, end = 3214303232, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.825455995 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 134512640, end = 134553600, flags = 134223989, pgoff = 0, inode = 20759 }
+vm_state.vm_map: 13589.825458156 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 134553600, end = 134557696, flags = 135272563, pgoff = 36864, inode = 20759 }
+vm_state.vm_map: 13589.825460341 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 134557696, end = 134565888, flags = 1048691, pgoff = 134557696, inode = 0 }
+vm_state.vm_map: 13589.825462286 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 145301504, end = 147087360, flags = 1048691, pgoff = 145301504, inode = 0 }
+vm_state.vm_map: 13589.825467323 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2989592576, end = 2989654016, flags = 134217841, pgoff = 0, inode = 649743 }
+vm_state.vm_map: 13589.825469631 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2989654016, end = 2989719552, flags = 134217845, pgoff = 0, inode = 57391 }
+vm_state.vm_map: 13589.825471773 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2989719552, end = 2989723648, flags = 135266419, pgoff = 61440, inode = 57391 }
+vm_state.vm_map: 13589.825473897 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2989723648, end = 2989740032, flags = 1048691, pgoff = 2989723648, inode = 0 }
+vm_state.vm_map: 13589.825478933 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2989740032, end = 2990022656, flags = 134217845, pgoff = 0, inode = 22693 }
+vm_state.vm_map: 13589.825481100 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2990022656, end = 2990034944, flags = 135266419, pgoff = 282624, inode = 22693 }
+vm_state.vm_map: 13589.825483144 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2990034944, end = 2990059520, flags = 1048691, pgoff = 2990034944, inode = 0 }
+vm_state.vm_map: 13589.825485281 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2990063616, end = 2990080000, flags = 134217845, pgoff = 0, inode = 57390 }
+vm_state.vm_map: 13589.825487448 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2990080000, end = 2990084096, flags = 135266419, pgoff = 12288, inode = 57390 }
+vm_state.vm_map: 13589.825489695 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2990084096, end = 2990104576, flags = 134217845, pgoff = 0, inode = 57392 }
+vm_state.vm_map: 13589.825491813 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2990104576, end = 2990108672, flags = 135266419, pgoff = 16384, inode = 57392 }
+vm_state.vm_map: 13589.825493986 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2990108672, end = 2990149632, flags = 134217845, pgoff = 0, inode = 57395 }
+vm_state.vm_map: 13589.825496030 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2990149632, end = 2990153728, flags = 135266419, pgoff = 36864, inode = 57395 }
+vm_state.vm_map: 13589.825500690 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2990153728, end = 2990178304, flags = 134217845, pgoff = 0, inode = 18917 }
+vm_state.vm_map: 13589.825502740 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2990178304, end = 2990182400, flags = 135266419, pgoff = 20480, inode = 18917 }
+vm_state.vm_map: 13589.825504883 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2990182400, end = 2990198784, flags = 134217845, pgoff = 0, inode = 18914 }
+vm_state.vm_map: 13589.825507012 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2990198784, end = 2990202880, flags = 135266419, pgoff = 16384, inode = 18914 }
+vm_state.vm_map: 13589.825509217 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2990202880, end = 2990473216, flags = 134217845, pgoff = 0, inode = 18916 }
+vm_state.vm_map: 13589.825511599 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2990473216, end = 2990477312, flags = 135266419, pgoff = 266240, inode = 18916 }
+vm_state.vm_map: 13589.825513785 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2990477312, end = 2990559232, flags = 134217845, pgoff = 0, inode = 18915 }
+vm_state.vm_map: 13589.825515959 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2990559232, end = 2990567424, flags = 135266419, pgoff = 77824, inode = 18915 }
+vm_state.vm_map: 13589.825518095 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2990567424, end = 2991349760, flags = 134217845, pgoff = 0, inode = 18927 }
+vm_state.vm_map: 13589.825520262 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2991349760, end = 2991357952, flags = 135266419, pgoff = 778240, inode = 18927 }
+vm_state.vm_map: 13589.825522521 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2991357952, end = 2991722496, flags = 134217845, pgoff = 0, inode = 22572 }
+vm_state.vm_map: 13589.825524700 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2991722496, end = 2991730688, flags = 135266419, pgoff = 364544, inode = 22572 }
+vm_state.vm_map: 13589.825526818 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2991747072, end = 2991763456, flags = 134217845, pgoff = 0, inode = 57389 }
+vm_state.vm_map: 13589.825529010 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2991763456, end = 2991767552, flags = 135266419, pgoff = 12288, inode = 57389 }
+vm_state.vm_map: 13589.825531220 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2991767552, end = 2991800320, flags = 134217845, pgoff = 0, inode = 57396 }
+vm_state.vm_map: 13589.825533393 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2991800320, end = 2991804416, flags = 135266419, pgoff = 28672, inode = 57396 }
+vm_state.vm_map: 13589.825535541 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2991804416, end = 2991820800, flags = 134217845, pgoff = 0, inode = 57393 }
+vm_state.vm_map: 13589.825537709 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2991820800, end = 2991824896, flags = 135266419, pgoff = 12288, inode = 57393 }
+vm_state.vm_map: 13589.825539968 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2991824896, end = 2992025600, flags = 134217845, pgoff = 0, inode = 20709 }
+vm_state.vm_map: 13589.825542258 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2992025600, end = 2992033792, flags = 135266419, pgoff = 196608, inode = 20709 }
+vm_state.vm_map: 13589.825544216 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2992033792, end = 2992041984, flags = 1048691, pgoff = 2992033792, inode = 0 }
+vm_state.vm_map: 13589.825546955 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2992041984, end = 2992492544, flags = 134217845, pgoff = 0, inode = 20711 }
+vm_state.vm_map: 13589.825548988 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2992492544, end = 2992504832, flags = 135266419, pgoff = 450560, inode = 20711 }
+vm_state.vm_map: 13589.825551259 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2992504832, end = 2992631808, flags = 134217845, pgoff = 0, inode = 18923 }
+vm_state.vm_map: 13589.825553328 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2992631808, end = 2992635904, flags = 135266419, pgoff = 122880, inode = 18923 }
+vm_state.vm_map: 13589.825557982 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2992635904, end = 2992771072, flags = 2097267, pgoff = 2992635904, inode = 0 }
+vm_state.vm_map: 13589.825560026 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2992771072, end = 2993684480, flags = 2097264, pgoff = 2992771072, inode = 0 }
+vm_state.vm_map: 13589.825562199 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2993692672, end = 2993709056, flags = 134217845, pgoff = 0, inode = 57394 }
+vm_state.vm_map: 13589.825564188 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2993709056, end = 2993713152, flags = 135266419, pgoff = 16384, inode = 57394 }
+vm_state.vm_map: 13589.825566508 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2993713152, end = 2993741824, flags = 134217845, pgoff = 0, inode = 57397 }
+vm_state.vm_map: 13589.825568553 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2993741824, end = 2993745920, flags = 135266419, pgoff = 24576, inode = 57397 }
+vm_state.vm_map: 13589.825570714 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2993745920, end = 2993770496, flags = 134217845, pgoff = 0, inode = 57398 }
+vm_state.vm_map: 13589.825572659 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2993770496, end = 2993774592, flags = 135266419, pgoff = 24576, inode = 57398 }
+vm_state.vm_map: 13589.825574955 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2993774592, end = 2993790976, flags = 134217845, pgoff = 0, inode = 52571 }
+vm_state.vm_map: 13589.825576980 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2993790976, end = 2993795072, flags = 135266419, pgoff = 12288, inode = 52571 }
+vm_state.vm_map: 13589.825579154 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2993795072, end = 2993799168, flags = 1048688, pgoff = 2993795072, inode = 0 }
+vm_state.vm_map: 13589.825581494 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 2993799168, end = 3002187776, flags = 1048691, pgoff = 2993799168, inode = 0 }
+vm_state.vm_map: 13589.825583913 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3002187776, end = 3002228736, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.825585957 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3002228736, end = 3002232832, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.825587977 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3002232832, end = 3002236928, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.825590279 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3002236928, end = 3002273792, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.825592304 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3002273792, end = 3002277888, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.825594342 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3002277888, end = 3002281984, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.825596619 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3002281984, end = 3002359808, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.825598584 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3002359808, end = 3002363904, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.825600763 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3002363904, end = 3002368000, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.825602715 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3002368000, end = 3002376192, flags = 1048691, pgoff = 3002368000, inode = 0 }
+vm_state.vm_map: 13589.825605116 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3002376192, end = 3002400768, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.825607159 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3002400768, end = 3002404864, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.825609186 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3002404864, end = 3002408960, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.825613846 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3002408960, end = 3018649600, flags = 134217979, pgoff = 0, inode = 1204527 }
+vm_state.vm_map: 13589.825616493 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3018649600, end = 3022946304, flags = 134217979, pgoff = 0, inode = 1204522 }
+vm_state.vm_map: 13589.825621012 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3022946304, end = 3023147008, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 13589.825623179 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023147008, end = 3023151104, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 13589.825625475 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023151104, end = 3023175680, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 13589.825627648 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023175680, end = 3023179776, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 13589.825629933 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023179776, end = 3023200256, flags = 134217845, pgoff = 0, inode = 52570 }
+vm_state.vm_map: 13589.825631964 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023200256, end = 3023204352, flags = 135266419, pgoff = 16384, inode = 52570 }
+vm_state.vm_map: 13589.825634168 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023204352, end = 3023241216, flags = 134217845, pgoff = 0, inode = 52569 }
+vm_state.vm_map: 13589.825636446 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023241216, end = 3023245312, flags = 135266419, pgoff = 32768, inode = 52569 }
+vm_state.vm_map: 13589.825638601 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023245312, end = 3023269888, flags = 134217845, pgoff = 0, inode = 52572 }
+vm_state.vm_map: 13589.825640663 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023269888, end = 3023273984, flags = 135266419, pgoff = 20480, inode = 52572 }
+vm_state.vm_map: 13589.825642812 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023273984, end = 3023278080, flags = 134217937, pgoff = 0, inode = 1196317 }
+vm_state.vm_map: 13589.825645145 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023278080, end = 3023302656, flags = 134217937, pgoff = 0, inode = 1196229 }
+vm_state.vm_map: 13589.825647422 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023302656, end = 3023306752, flags = 134217937, pgoff = 0, inode = 1196235 }
+vm_state.vm_map: 13589.825649571 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023306752, end = 3023310848, flags = 134217937, pgoff = 0, inode = 1196204 }
+vm_state.vm_map: 13589.825652120 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023310848, end = 3023314944, flags = 134217937, pgoff = 0, inode = 1196228 }
+vm_state.vm_map: 13589.825654386 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023314944, end = 3023319040, flags = 134217937, pgoff = 0, inode = 1196227 }
+vm_state.vm_map: 13589.825656534 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023319040, end = 3023327232, flags = 134217937, pgoff = 0, inode = 1196198 }
+vm_state.vm_map: 13589.825658794 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023327232, end = 3023360000, flags = 134217937, pgoff = 0, inode = 1196200 }
+vm_state.vm_map: 13589.825660886 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023360000, end = 3023372288, flags = 134217937, pgoff = 0, inode = 1196226 }
+vm_state.vm_map: 13589.825663165 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023372288, end = 3023380480, flags = 134217937, pgoff = 0, inode = 1196225 }
+vm_state.vm_map: 13589.825665424 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023380480, end = 3023384576, flags = 134217937, pgoff = 0, inode = 1196224 }
+vm_state.vm_map: 13589.825667579 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023384576, end = 3023388672, flags = 134217937, pgoff = 0, inode = 1196223 }
+vm_state.vm_map: 13589.825669653 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023388672, end = 3023392768, flags = 134217937, pgoff = 0, inode = 1196202 }
+vm_state.vm_map: 13589.825672037 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023392768, end = 3023421440, flags = 134217937, pgoff = 0, inode = 1196222 }
+vm_state.vm_map: 13589.825674320 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023421440, end = 3023433728, flags = 134217937, pgoff = 0, inode = 1196221 }
+vm_state.vm_map: 13589.825676487 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023433728, end = 3023437824, flags = 134217937, pgoff = 0, inode = 1196220 }
+vm_state.vm_map: 13589.825678660 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023437824, end = 3023446016, flags = 134217937, pgoff = 0, inode = 1196219 }
+vm_state.vm_map: 13589.825681067 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023446016, end = 3023450112, flags = 134217937, pgoff = 0, inode = 1196210 }
+vm_state.vm_map: 13589.825683235 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023450112, end = 3023454208, flags = 134217937, pgoff = 0, inode = 1196205 }
+vm_state.vm_map: 13589.825685506 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023454208, end = 3023466496, flags = 134217937, pgoff = 0, inode = 1196244 }
+vm_state.vm_map: 13589.825687970 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023466496, end = 3023474688, flags = 134217937, pgoff = 0, inode = 1196270 }
+vm_state.vm_map: 13589.825690309 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023474688, end = 3023507456, flags = 134217937, pgoff = 0, inode = 1196246 }
+vm_state.vm_map: 13589.825692617 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023507456, end = 3023527936, flags = 134217937, pgoff = 0, inode = 1196269 }
+vm_state.vm_map: 13589.825694797 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023527936, end = 3023536128, flags = 134217937, pgoff = 0, inode = 1196316 }
+vm_state.vm_map: 13589.825696853 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023536128, end = 3023564800, flags = 134217937, pgoff = 0, inode = 1196197 }
+vm_state.vm_map: 13589.825699131 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023564800, end = 3023609856, flags = 134217937, pgoff = 0, inode = 1196312 }
+vm_state.vm_map: 13589.825701304 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023609856, end = 3023667200, flags = 134217937, pgoff = 0, inode = 1196272 }
+vm_state.vm_map: 13589.825703453 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023667200, end = 3023904768, flags = 1048691, pgoff = 3023904768, inode = 0 }
+vm_state.vm_map: 13589.825705533 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023908864, end = 3023921152, flags = 134217845, pgoff = 0, inode = 49489 }
+vm_state.vm_map: 13589.825707706 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023921152, end = 3023925248, flags = 135266419, pgoff = 8192, inode = 49489 }
+vm_state.vm_map: 13589.825712324 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3023925248, end = 3024150528, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.825714374 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3024150528, end = 3024154624, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.825716412 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3024154624, end = 3024158720, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.825721787 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3024158720, end = 3024293888, flags = 134217845, pgoff = 0, inode = 17864 }
+vm_state.vm_map: 13589.825724169 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3024293888, end = 3024297984, flags = 135266419, pgoff = 135168, inode = 17864 }
+vm_state.vm_map: 13589.825726404 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3024297984, end = 3024330752, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 13589.825728355 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3024330752, end = 3024334848, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 13589.825735799 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3024334848, end = 3024429056, flags = 134217845, pgoff = 0, inode = 1065551 }
+vm_state.vm_map: 13589.825737941 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3024429056, end = 3024437248, flags = 135266419, pgoff = 90112, inode = 1065551 }
+vm_state.vm_map: 13589.825742565 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3024437248, end = 3024572416, flags = 134217845, pgoff = 0, inode = 1066191 }
+vm_state.vm_map: 13589.825744602 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3024572416, end = 3024576512, flags = 135266419, pgoff = 135168, inode = 1066191 }
+vm_state.vm_map: 13589.825746665 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3024576512, end = 3024609280, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 13589.825748813 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3024609280, end = 3024613376, flags = 135266419, pgoff = 32768, inode = 20716 }
+vm_state.vm_map: 13589.825750875 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3024613376, end = 3025133568, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 13589.825752920 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3025133568, end = 3025141760, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 13589.825755087 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3025141760, end = 3025506304, flags = 134217845, pgoff = 0, inode = 1065038 }
+vm_state.vm_map: 13589.825757112 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3025506304, end = 3025543168, flags = 135266423, pgoff = 364544, inode = 1065038 }
+vm_state.vm_map: 13589.825759525 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3025543168, end = 3025547264, flags = 1048695, pgoff = 3025543168, inode = 0 }
+vm_state.vm_map: 13589.825761612 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3025547264, end = 3026100224, flags = 134217845, pgoff = 0, inode = 18947 }
+vm_state.vm_map: 13589.825763780 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3026100224, end = 3026120704, flags = 135266419, pgoff = 548864, inode = 18947 }
+vm_state.vm_map: 13589.825765830 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3026120704, end = 3026436096, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 13589.825767990 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3026436096, end = 3026444288, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 13589.825770040 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3026444288, end = 3026513920, flags = 134217845, pgoff = 0, inode = 1065123 }
+vm_state.vm_map: 13589.825772067 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3026513920, end = 3026518016, flags = 135266419, pgoff = 69632, inode = 1065123 }
+vm_state.vm_map: 13589.825774110 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3026518016, end = 3041013760, flags = 134217845, pgoff = 0, inode = 20672 }
+vm_state.vm_map: 13589.825776283 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3041013760, end = 3041628160, flags = 135266419, pgoff = 14495744, inode = 20672 }
+vm_state.vm_map: 13589.825778426 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3041628160, end = 3041636352, flags = 1048691, pgoff = 3041628160, inode = 0 }
+vm_state.vm_map: 13589.825780445 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3041636352, end = 3042009088, flags = 134217845, pgoff = 0, inode = 20902 }
+vm_state.vm_map: 13589.825782606 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3042009088, end = 3042021376, flags = 135266419, pgoff = 368640, inode = 20902 }
+vm_state.vm_map: 13589.825784896 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3042021376, end = 3042041856, flags = 134217845, pgoff = 0, inode = 52568 }
+vm_state.vm_map: 13589.825786995 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3042041856, end = 3042045952, flags = 135266419, pgoff = 16384, inode = 52568 }
+vm_state.vm_map: 13589.825789175 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3042045952, end = 3042058240, flags = 134217937, pgoff = 0, inode = 1196315 }
+vm_state.vm_map: 13589.825791343 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3042058240, end = 3042115584, flags = 134217937, pgoff = 0, inode = 1196231 }
+vm_state.vm_map: 13589.825793854 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3042115584, end = 3044098048, flags = 134217845, pgoff = 0, inode = 20915 }
+vm_state.vm_map: 13589.825795879 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3044098048, end = 3044139008, flags = 135266419, pgoff = 1978368, inode = 20915 }
+vm_state.vm_map: 13589.825797960 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3044139008, end = 3045470208, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.825800109 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3045470208, end = 3045486592, flags = 1048691, pgoff = 3045470208, inode = 0 }
+vm_state.vm_map: 13589.825802092 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3045486592, end = 3045634048, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.825804215 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3045634048, end = 3045642240, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.825806234 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3045642240, end = 3045961728, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 13589.825808395 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3045961728, end = 3045978112, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 13589.825810396 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3045978112, end = 3045990400, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 13589.825812550 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3045990400, end = 3045994496, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 13589.825814632 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3045994496, end = 3047251968, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 13589.825816842 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3047251968, end = 3047272448, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 13589.825818824 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3047272448, end = 3047280640, flags = 1048691, pgoff = 3047272448, inode = 0 }
+vm_state.vm_map: 13589.825821003 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3047280640, end = 3047518208, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 13589.825823165 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3047518208, end = 3047522304, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 13589.825825135 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3047522304, end = 3047538688, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.825827770 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3047538688, end = 3047542784, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.825829826 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3047542784, end = 3047550976, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.825831980 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3047550976, end = 3047555072, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.825833951 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3047555072, end = 3047747584, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.825836118 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3047747584, end = 3047751680, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.825838309 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3047751680, end = 3047804928, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 13589.825840347 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3047804928, end = 3047809024, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 13589.825842341 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3047809024, end = 3047813120, flags = 1048691, pgoff = 3047809024, inode = 0 }
+vm_state.vm_map: 13589.825844700 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3047813120, end = 3047985152, flags = 134217845, pgoff = 0, inode = 1065255 }
+vm_state.vm_map: 13589.825846744 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3047985152, end = 3047989248, flags = 135266419, pgoff = 172032, inode = 1065255 }
+vm_state.vm_map: 13589.825848812 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3047989248, end = 3048235008, flags = 134217845, pgoff = 0, inode = 20603 }
+vm_state.vm_map: 13589.825850745 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3048235008, end = 3048239104, flags = 135266419, pgoff = 245760, inode = 20603 }
+vm_state.vm_map: 13589.825852925 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3048239104, end = 3048710144, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 13589.825854969 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3048710144, end = 3048726528, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 13589.825857148 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3048726528, end = 3048869888, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 13589.825859223 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3048869888, end = 3048873984, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 13589.825861660 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3048873984, end = 3048960000, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 13589.825863594 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3048960000, end = 3048964096, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 13589.825865663 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3048964096, end = 3048968192, flags = 1048691, pgoff = 3048964096, inode = 0 }
+vm_state.vm_map: 13589.825867719 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3048968192, end = 3048984576, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 13589.825869664 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3048984576, end = 3048988672, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 13589.825871745 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3048988672, end = 3049021440, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 13589.825873691 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3049021440, end = 3049025536, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 13589.825875661 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3049025536, end = 3049041920, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 13589.825877698 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3049041920, end = 3049046016, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 13589.825879662 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3049046016, end = 3049132032, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 13589.825881601 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3049132032, end = 3049136128, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 13589.825883646 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3049136128, end = 3049144320, flags = 1048691, pgoff = 3049136128, inode = 0 }
+vm_state.vm_map: 13589.825885610 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3049144320, end = 3049172992, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 13589.825887549 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3049172992, end = 3049177088, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 13589.825889593 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3049177088, end = 3049181184, flags = 1048691, pgoff = 3049177088, inode = 0 }
+vm_state.vm_map: 13589.825891759 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3049181184, end = 3049512960, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 13589.825894112 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3049512960, end = 3049521152, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 13589.825896180 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3049521152, end = 3049553920, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 13589.825898113 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3049553920, end = 3049558016, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 13589.825900089 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3049558016, end = 3049574400, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 13589.825902159 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3049574400, end = 3049578496, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 13589.825904122 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3049578496, end = 3049603072, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 13589.825906055 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3049603072, end = 3049607168, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 13589.825908081 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3049607168, end = 3049639936, flags = 134217845, pgoff = 0, inode = 18621 }
+vm_state.vm_map: 13589.825910007 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3049639936, end = 3049644032, flags = 135266419, pgoff = 28672, inode = 18621 }
+vm_state.vm_map: 13589.825911959 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3049644032, end = 3049648128, flags = 1048691, pgoff = 3049644032, inode = 0 }
+vm_state.vm_map: 13589.825914015 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3049648128, end = 3050078208, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 13589.825915949 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3050078208, end = 3050106880, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 13589.825918011 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3050106880, end = 3050110976, flags = 1048691, pgoff = 3050106880, inode = 0 }
+vm_state.vm_map: 13589.825919975 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3050110976, end = 3050553344, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 13589.825922049 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3050553344, end = 3050561536, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 13589.825924019 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3050561536, end = 3050659840, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.825926458 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3050659840, end = 3050663936, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.825928477 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3050663936, end = 3050934272, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 13589.825930465 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3050934272, end = 3050942464, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 13589.825932424 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3050942464, end = 3051003904, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 13589.825934374 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3051003904, end = 3051008000, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 13589.825936314 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3051008000, end = 3051012096, flags = 1048691, pgoff = 3051008000, inode = 0 }
+vm_state.vm_map: 13589.825941357 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3051012096, end = 3051479040, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 13589.825943393 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3051479040, end = 3051487232, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 13589.825945457 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3051487232, end = 3052617728, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 13589.825947587 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3052617728, end = 3052634112, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 13589.825949796 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3052634112, end = 3052748800, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.825951946 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3052748800, end = 3052752896, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.825954118 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3052752896, end = 3052900352, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.825956150 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3052900352, end = 3052904448, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.825958293 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3052904448, end = 3052908544, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.825960767 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3052908544, end = 3052916736, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.825962935 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3052916736, end = 3052920832, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.825964965 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3052920832, end = 3052924928, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.825967010 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3052924928, end = 3052929024, flags = 1048691, pgoff = 3052924928, inode = 0 }
+vm_state.vm_map: 13589.825969202 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3052929024, end = 3053015040, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.825971362 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3053015040, end = 3053019136, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.825973506 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3053019136, end = 3053023232, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.825975660 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3053023232, end = 3053031424, flags = 1048691, pgoff = 3053023232, inode = 0 }
+vm_state.vm_map: 13589.825977852 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3053031424, end = 3053776896, flags = 134217845, pgoff = 0, inode = 499794 }
+vm_state.vm_map: 13589.825979809 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3053776896, end = 3053780992, flags = 135266419, pgoff = 745472, inode = 499794 }
+vm_state.vm_map: 13589.825981773 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3053780992, end = 3053809664, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.825983724 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3053809664, end = 3053813760, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.825985677 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3053813760, end = 3053817856, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.825987770 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3053817856, end = 3053834240, flags = 134217845, pgoff = 0, inode = 20149 }
+vm_state.vm_map: 13589.825989721 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3053834240, end = 3053838336, flags = 135266419, pgoff = 12288, inode = 20149 }
+vm_state.vm_map: 13589.825991703 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3053838336, end = 3053920256, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.825993987 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3053920256, end = 3053924352, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.825995983 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3053924352, end = 3055239168, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.825997922 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3055239168, end = 3055247360, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.825999873 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3055247360, end = 3055251456, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.826001917 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3055251456, end = 3055267840, flags = 1048691, pgoff = 3055251456, inode = 0 }
+vm_state.vm_map: 13589.826003893 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3055267840, end = 3056205824, flags = 134217845, pgoff = 0, inode = 16850 }
+vm_state.vm_map: 13589.826005839 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3056205824, end = 3056222208, flags = 135266417, pgoff = 937984, inode = 16850 }
+vm_state.vm_map: 13589.826007784 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3056222208, end = 3056226304, flags = 135266419, pgoff = 954368, inode = 16850 }
+vm_state.vm_map: 13589.826009847 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3056226304, end = 3056254976, flags = 1048691, pgoff = 3056226304, inode = 0 }
+vm_state.vm_map: 13589.826011823 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3056254976, end = 3066294272, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 13589.826013762 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3066294272, end = 3066454016, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 13589.826015824 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3066454016, end = 3066462208, flags = 1048691, pgoff = 3066454016, inode = 0 }
+vm_state.vm_map: 13589.826017776 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3066462208, end = 3070058496, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 13589.826019721 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3070058496, end = 3070156800, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 13589.826021796 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3070156800, end = 3070160896, flags = 1048691, pgoff = 3070156800, inode = 0 }
+vm_state.vm_map: 13589.826023747 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3070160896, end = 3072716800, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 13589.826026032 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3072716800, end = 3072765952, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 13589.826030643 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3072765952, end = 3072770048, flags = 1048691, pgoff = 3072765952, inode = 0 }
+vm_state.vm_map: 13589.826032705 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3072770048, end = 3073921024, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.826034657 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3073921024, end = 3073937408, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.826036714 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3073937408, end = 3074170880, flags = 134217845, pgoff = 0, inode = 1065180 }
+vm_state.vm_map: 13589.826038788 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3074170880, end = 3074179072, flags = 135266419, pgoff = 233472, inode = 1065180 }
+vm_state.vm_map: 13589.826040727 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3074179072, end = 3074183168, flags = 1048691, pgoff = 3074179072, inode = 0 }
+vm_state.vm_map: 13589.826042771 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3074183168, end = 3076485120, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 13589.826044711 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3076485120, end = 3076530176, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 13589.826046786 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3076530176, end = 3078840320, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 13589.826048725 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3078840320, end = 3078868992, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 13589.826050768 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3078868992, end = 3078873088, flags = 1048691, pgoff = 3078868992, inode = 0 }
+vm_state.vm_map: 13589.826053089 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3078877184, end = 3078885376, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 13589.826055028 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3078885376, end = 3078889472, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 13589.826056999 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3078889472, end = 3078897664, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 13589.826059283 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3078897664, end = 3078901760, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 13589.826061320 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3078901760, end = 3078918144, flags = 134217845, pgoff = 0, inode = 22094 }
+vm_state.vm_map: 13589.826063278 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3078918144, end = 3078922240, flags = 135266419, pgoff = 12288, inode = 22094 }
+vm_state.vm_map: 13589.826065249 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3078922240, end = 3078930432, flags = 134217845, pgoff = 0, inode = 1450546 }
+vm_state.vm_map: 13589.826067305 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3078930432, end = 3078934528, flags = 135266417, pgoff = 4096, inode = 1450546 }
+vm_state.vm_map: 13589.826069367 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3078934528, end = 3078938624, flags = 135266419, pgoff = 8192, inode = 1450546 }
+vm_state.vm_map: 13589.826071343 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3078938624, end = 3078967296, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.826073282 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3078967296, end = 3078975488, flags = 1048691, pgoff = 3078967296, inode = 0 }
+vm_state.vm_map: 13589.826075413 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3078975488, end = 3078979584, flags = 67371125, pgoff = 3078975488, inode = 0 }
+vm_state.vm_map: 13589.826077506 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3078979584, end = 3079094272, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.826079531 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3079094272, end = 3079098368, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.826081606 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3079098368, end = 3079102464, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.826083669 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2224, start = 3214217216, end = 3214303232, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.826086144 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 134512640, end = 134553600, flags = 134223989, pgoff = 0, inode = 20759 }
+vm_state.vm_map: 13589.826088261 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 134553600, end = 134557696, flags = 135272563, pgoff = 36864, inode = 20759 }
+vm_state.vm_map: 13589.826090262 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 134557696, end = 134565888, flags = 1048691, pgoff = 134557696, inode = 0 }
+vm_state.vm_map: 13589.826092558 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 145301504, end = 148606976, flags = 1048691, pgoff = 145301504, inode = 0 }
+vm_state.vm_map: 13589.826095102 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2831224832, end = 2831507456, flags = 134217845, pgoff = 0, inode = 22693 }
+vm_state.vm_map: 13589.826100149 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2831507456, end = 2831519744, flags = 135266419, pgoff = 282624, inode = 22693 }
+vm_state.vm_map: 13589.826104742 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2831519744, end = 2831544320, flags = 1048691, pgoff = 2831519744, inode = 0 }
+vm_state.vm_map: 13589.826107297 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2831544320, end = 2832326656, flags = 134217845, pgoff = 0, inode = 18927 }
+vm_state.vm_map: 13589.826109458 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2832326656, end = 2832334848, flags = 135266419, pgoff = 778240, inode = 18927 }
+vm_state.vm_map: 13589.826111729 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2832334848, end = 2832371712, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.826113884 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2832371712, end = 2832375808, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.826116045 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2832375808, end = 2832379904, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.826118360 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2832379904, end = 2832457728, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.826120527 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2832457728, end = 2832461824, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.826122559 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2832461824, end = 2832465920, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.826124596 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2832465920, end = 2832474112, flags = 1048691, pgoff = 2832465920, inode = 0 }
+vm_state.vm_map: 13589.826126764 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2832474112, end = 2832498688, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.826129146 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2832498688, end = 2832502784, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.826131258 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2832502784, end = 2832506880, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.826136484 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2832506880, end = 2832715776, flags = 134217845, pgoff = 0, inode = 23907 }
+vm_state.vm_map: 13589.826138510 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2832715776, end = 2832719872, flags = 135266419, pgoff = 208896, inode = 23907 }
+vm_state.vm_map: 13589.826140819 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2832728064, end = 2832793600, flags = 134217845, pgoff = 0, inode = 57391 }
+vm_state.vm_map: 13589.826143096 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2832793600, end = 2832797696, flags = 135266419, pgoff = 61440, inode = 57391 }
+vm_state.vm_map: 13589.826145269 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2832797696, end = 2832814080, flags = 1048691, pgoff = 2832797696, inode = 0 }
+vm_state.vm_map: 13589.826150158 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2832814080, end = 2832838656, flags = 134217845, pgoff = 0, inode = 58065 }
+vm_state.vm_map: 13589.826152196 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2832838656, end = 2832842752, flags = 135266419, pgoff = 20480, inode = 58065 }
+vm_state.vm_map: 13589.826159578 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2832842752, end = 2833965056, flags = 134217845, pgoff = 0, inode = 20685 }
+vm_state.vm_map: 13589.826161615 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2833965056, end = 2833981440, flags = 135266419, pgoff = 1122304, inode = 20685 }
+vm_state.vm_map: 13589.826168948 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2833989632, end = 2834014208, flags = 134217845, pgoff = 0, inode = 58067 }
+vm_state.vm_map: 13589.826171109 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2834014208, end = 2834018304, flags = 135266419, pgoff = 20480, inode = 58067 }
+vm_state.vm_map: 13589.826173596 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2834018304, end = 2834071552, flags = 134217845, pgoff = 0, inode = 59006 }
+vm_state.vm_map: 13589.826175738 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2834071552, end = 2834075648, flags = 135266419, pgoff = 53248, inode = 59006 }
+vm_state.vm_map: 13589.826178121 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2834075648, end = 2834100224, flags = 134217845, pgoff = 0, inode = 59000 }
+vm_state.vm_map: 13589.826180054 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2834100224, end = 2834104320, flags = 135266419, pgoff = 20480, inode = 59000 }
+vm_state.vm_map: 13589.826184985 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2834104320, end = 2834124800, flags = 134217845, pgoff = 0, inode = 58063 }
+vm_state.vm_map: 13589.826187036 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2834124800, end = 2834128896, flags = 135266419, pgoff = 16384, inode = 58063 }
+vm_state.vm_map: 13589.826191880 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2834128896, end = 2834165760, flags = 134217845, pgoff = 0, inode = 58986 }
+vm_state.vm_map: 13589.826193930 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2834165760, end = 2834169856, flags = 135266419, pgoff = 32768, inode = 58986 }
+vm_state.vm_map: 13589.826198868 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2834169856, end = 2834223104, flags = 134217845, pgoff = 0, inode = 1065850 }
+vm_state.vm_map: 13589.826200893 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2834223104, end = 2834227200, flags = 135266419, pgoff = 49152, inode = 1065850 }
+vm_state.vm_map: 13589.826203768 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2834227200, end = 2834239488, flags = 134217845, pgoff = 0, inode = 20765 }
+vm_state.vm_map: 13589.826205800 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2834239488, end = 2834243584, flags = 135266419, pgoff = 8192, inode = 20765 }
+vm_state.vm_map: 13589.826207997 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2834243584, end = 2834706432, flags = 134217845, pgoff = 0, inode = 20061 }
+vm_state.vm_map: 13589.826209962 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2834706432, end = 2834718720, flags = 135266419, pgoff = 458752, inode = 20061 }
+vm_state.vm_map: 13589.826212203 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2834718720, end = 2834780160, flags = 134217845, pgoff = 0, inode = 19423 }
+vm_state.vm_map: 13589.826214142 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2834780160, end = 2834784256, flags = 135266419, pgoff = 57344, inode = 19423 }
+vm_state.vm_map: 13589.826216253 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2834784256, end = 2835390464, flags = 134217845, pgoff = 0, inode = 22471 }
+vm_state.vm_map: 13589.826218192 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2835390464, end = 2835406848, flags = 135266419, pgoff = 602112, inode = 22471 }
+vm_state.vm_map: 13589.826220520 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2835406848, end = 2835476480, flags = 134217845, pgoff = 0, inode = 508763 }
+vm_state.vm_map: 13589.826222466 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2835476480, end = 2835480576, flags = 135266417, pgoff = 65536, inode = 508763 }
+vm_state.vm_map: 13589.826224602 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2835480576, end = 2835484672, flags = 135266419, pgoff = 69632, inode = 508763 }
+vm_state.vm_map: 13589.826226547 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2835484672, end = 2835492864, flags = 1048691, pgoff = 2835484672, inode = 0 }
+vm_state.vm_map: 13589.826228665 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2835492864, end = 2835582976, flags = 134217845, pgoff = 0, inode = 19203 }
+vm_state.vm_map: 13589.826230635 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2835582976, end = 2835587072, flags = 135266419, pgoff = 86016, inode = 19203 }
+vm_state.vm_map: 13589.826232851 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2835587072, end = 2835636224, flags = 134217845, pgoff = 0, inode = 19447 }
+vm_state.vm_map: 13589.826234926 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2835636224, end = 2835640320, flags = 135266419, pgoff = 49152, inode = 19447 }
+vm_state.vm_map: 13589.826237556 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2835640320, end = 2835906560, flags = 134217845, pgoff = 0, inode = 19433 }
+vm_state.vm_map: 13589.826239501 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2835906560, end = 2835914752, flags = 135266419, pgoff = 262144, inode = 19433 }
+vm_state.vm_map: 13589.826241440 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2835914752, end = 2835918848, flags = 1048691, pgoff = 2835914752, inode = 0 }
+vm_state.vm_map: 13589.826246667 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2835918848, end = 2836140032, flags = 134217845, pgoff = 0, inode = 1065907 }
+vm_state.vm_map: 13589.826248704 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2836140032, end = 2836144128, flags = 135266419, pgoff = 221184, inode = 1065907 }
+vm_state.vm_map: 13589.826251247 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2836144128, end = 2836283392, flags = 134217845, pgoff = 0, inode = 23998 }
+vm_state.vm_map: 13589.826253223 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2836283392, end = 2836287488, flags = 135266419, pgoff = 139264, inode = 23998 }
+vm_state.vm_map: 13589.826262876 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2836287488, end = 2836848640, flags = 134217845, pgoff = 0, inode = 23997 }
+vm_state.vm_map: 13589.826264920 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2836848640, end = 2836860928, flags = 135266419, pgoff = 557056, inode = 23997 }
+vm_state.vm_map: 13589.826267069 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2836860928, end = 2837430272, flags = 134217845, pgoff = 0, inode = 20907 }
+vm_state.vm_map: 13589.826269015 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2837430272, end = 2837446656, flags = 135266419, pgoff = 565248, inode = 20907 }
+vm_state.vm_map: 13589.826274315 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2837450752, end = 2837475328, flags = 134217845, pgoff = 0, inode = 59017 }
+vm_state.vm_map: 13589.826276360 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2837475328, end = 2837479424, flags = 135266419, pgoff = 20480, inode = 59017 }
+vm_state.vm_map: 13589.826283254 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2837479424, end = 2837504000, flags = 134217845, pgoff = 0, inode = 58066 }
+vm_state.vm_map: 13589.826285298 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2837504000, end = 2837508096, flags = 135266419, pgoff = 20480, inode = 58066 }
+vm_state.vm_map: 13589.826290254 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2837508096, end = 2837536768, flags = 134217845, pgoff = 0, inode = 58988 }
+vm_state.vm_map: 13589.826294754 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2837536768, end = 2837540864, flags = 135266419, pgoff = 28672, inode = 58988 }
+vm_state.vm_map: 13589.826297309 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2837540864, end = 2837827584, flags = 134217845, pgoff = 0, inode = 20877 }
+vm_state.vm_map: 13589.826299286 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2837827584, end = 2837835776, flags = 135266419, pgoff = 282624, inode = 20877 }
+vm_state.vm_map: 13589.826306365 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2837835776, end = 2837864448, flags = 134217845, pgoff = 0, inode = 23874 }
+vm_state.vm_map: 13589.826308397 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2837864448, end = 2837868544, flags = 135266419, pgoff = 24576, inode = 23874 }
+vm_state.vm_map: 13589.826315951 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2837868544, end = 2837942272, flags = 134217845, pgoff = 0, inode = 24212 }
+vm_state.vm_map: 13589.826332241 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2837942272, end = 2837946368, flags = 135266419, pgoff = 69632, inode = 24212 }
+vm_state.vm_map: 13589.826340084 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2837946368, end = 2838880256, flags = 134217845, pgoff = 0, inode = 20876 }
+vm_state.vm_map: 13589.826342190 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2838880256, end = 2838892544, flags = 135266419, pgoff = 933888, inode = 20876 }
+vm_state.vm_map: 13589.826349443 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2838892544, end = 2839306240, flags = 134217845, pgoff = 0, inode = 1065120 }
+vm_state.vm_map: 13589.826351485 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2839306240, end = 2839314432, flags = 135266419, pgoff = 409600, inode = 1065120 }
+vm_state.vm_map: 13589.826354060 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2839326720, end = 2839351296, flags = 134217845, pgoff = 0, inode = 58064 }
+vm_state.vm_map: 13589.826356171 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2839351296, end = 2839355392, flags = 135266419, pgoff = 20480, inode = 58064 }
+vm_state.vm_map: 13589.826365929 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2839355392, end = 2839379968, flags = 134217845, pgoff = 0, inode = 59003 }
+vm_state.vm_map: 13589.826370337 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2839379968, end = 2839384064, flags = 135266419, pgoff = 20480, inode = 59003 }
+vm_state.vm_map: 13589.826375151 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2839384064, end = 2839404544, flags = 134217845, pgoff = 0, inode = 59019 }
+vm_state.vm_map: 13589.826377208 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2839404544, end = 2839408640, flags = 135266419, pgoff = 16384, inode = 59019 }
+vm_state.vm_map: 13589.826384300 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2839408640, end = 2839437312, flags = 134217845, pgoff = 0, inode = 59007 }
+vm_state.vm_map: 13589.826386461 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2839437312, end = 2839441408, flags = 135266419, pgoff = 24576, inode = 59007 }
+vm_state.vm_map: 13589.826391294 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2839441408, end = 2839465984, flags = 134217845, pgoff = 0, inode = 58068 }
+vm_state.vm_map: 13589.826393455 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2839465984, end = 2839470080, flags = 135266419, pgoff = 20480, inode = 58068 }
+vm_state.vm_map: 13589.826395757 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2839498752, end = 2839515136, flags = 134217845, pgoff = 0, inode = 57390 }
+vm_state.vm_map: 13589.826397782 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2839515136, end = 2839519232, flags = 135266419, pgoff = 12288, inode = 57390 }
+vm_state.vm_map: 13589.826400540 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2839519232, end = 2839560192, flags = 134217845, pgoff = 0, inode = 57395 }
+vm_state.vm_map: 13589.826402616 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2839560192, end = 2839564288, flags = 135266419, pgoff = 36864, inode = 57395 }
+vm_state.vm_map: 13589.826405084 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2839564288, end = 2839588864, flags = 134217845, pgoff = 0, inode = 18917 }
+vm_state.vm_map: 13589.826407171 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2839588864, end = 2839592960, flags = 135266419, pgoff = 20480, inode = 18917 }
+vm_state.vm_map: 13589.826409713 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2839592960, end = 2839863296, flags = 134217845, pgoff = 0, inode = 18916 }
+vm_state.vm_map: 13589.826411894 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2839863296, end = 2839867392, flags = 135266419, pgoff = 266240, inode = 18916 }
+vm_state.vm_map: 13589.826414190 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2839867392, end = 2839949312, flags = 134217845, pgoff = 0, inode = 18915 }
+vm_state.vm_map: 13589.826416264 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2839949312, end = 2839957504, flags = 135266419, pgoff = 77824, inode = 18915 }
+vm_state.vm_map: 13589.826418727 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2839969792, end = 2839990272, flags = 134217845, pgoff = 0, inode = 57392 }
+vm_state.vm_map: 13589.826420808 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2839990272, end = 2839994368, flags = 135266419, pgoff = 16384, inode = 57392 }
+vm_state.vm_map: 13589.826423221 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2839994368, end = 2840027136, flags = 134217845, pgoff = 0, inode = 57396 }
+vm_state.vm_map: 13589.826425382 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2840027136, end = 2840031232, flags = 135266419, pgoff = 28672, inode = 57396 }
+vm_state.vm_map: 13589.826427678 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2840031232, end = 2840047616, flags = 134217845, pgoff = 0, inode = 57393 }
+vm_state.vm_map: 13589.826429630 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2840047616, end = 2840051712, flags = 135266419, pgoff = 12288, inode = 57393 }
+vm_state.vm_map: 13589.826432036 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2840051712, end = 2840416256, flags = 134217845, pgoff = 0, inode = 22572 }
+vm_state.vm_map: 13589.826434112 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2840416256, end = 2840424448, flags = 135266419, pgoff = 364544, inode = 22572 }
+vm_state.vm_map: 13589.826442731 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2840424448, end = 2840621056, flags = 134217845, pgoff = 0, inode = 20024 }
+vm_state.vm_map: 13589.826445021 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2840621056, end = 2840629248, flags = 135266419, pgoff = 192512, inode = 20024 }
+vm_state.vm_map: 13589.826447200 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2840629248, end = 2840637440, flags = 1048691, pgoff = 2840629248, inode = 0 }
+vm_state.vm_map: 13589.826449490 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2840637440, end = 2841088000, flags = 134217845, pgoff = 0, inode = 20711 }
+vm_state.vm_map: 13589.826451712 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841088000, end = 2841100288, flags = 135266419, pgoff = 450560, inode = 20711 }
+vm_state.vm_map: 13589.826453991 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841100288, end = 2841116672, flags = 134217845, pgoff = 0, inode = 57389 }
+vm_state.vm_map: 13589.826456170 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841116672, end = 2841120768, flags = 135266419, pgoff = 12288, inode = 57389 }
+vm_state.vm_map: 13589.826458386 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841120768, end = 2841137152, flags = 134217845, pgoff = 0, inode = 18914 }
+vm_state.vm_map: 13589.826460639 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841137152, end = 2841141248, flags = 135266419, pgoff = 16384, inode = 18914 }
+vm_state.vm_map: 13589.826462949 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841141248, end = 2841157632, flags = 134217845, pgoff = 0, inode = 57394 }
+vm_state.vm_map: 13589.826465134 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841157632, end = 2841161728, flags = 135266419, pgoff = 16384, inode = 57394 }
+vm_state.vm_map: 13589.826467350 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841161728, end = 2841190400, flags = 134217845, pgoff = 0, inode = 57397 }
+vm_state.vm_map: 13589.826469646 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841190400, end = 2841194496, flags = 135266419, pgoff = 24576, inode = 57397 }
+vm_state.vm_map: 13589.826471876 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841194496, end = 2841321472, flags = 134217845, pgoff = 0, inode = 18923 }
+vm_state.vm_map: 13589.826474492 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841321472, end = 2841325568, flags = 135266419, pgoff = 122880, inode = 18923 }
+vm_state.vm_map: 13589.826476825 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841329664, end = 2841354240, flags = 134217845, pgoff = 0, inode = 57398 }
+vm_state.vm_map: 13589.826479121 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841354240, end = 2841358336, flags = 135266419, pgoff = 24576, inode = 57398 }
+vm_state.vm_map: 13589.826481313 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841358336, end = 2841374720, flags = 134217845, pgoff = 0, inode = 52571 }
+vm_state.vm_map: 13589.826483358 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841374720, end = 2841378816, flags = 135266419, pgoff = 12288, inode = 52571 }
+vm_state.vm_map: 13589.826485598 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841378816, end = 2841391104, flags = 134217845, pgoff = 0, inode = 49489 }
+vm_state.vm_map: 13589.826487888 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841391104, end = 2841395200, flags = 135266419, pgoff = 8192, inode = 49489 }
+vm_state.vm_map: 13589.826490147 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841395200, end = 2841415680, flags = 134217845, pgoff = 0, inode = 52570 }
+vm_state.vm_map: 13589.826492334 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841415680, end = 2841419776, flags = 135266419, pgoff = 16384, inode = 52570 }
+vm_state.vm_map: 13589.826494538 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841419776, end = 2841456640, flags = 134217845, pgoff = 0, inode = 52569 }
+vm_state.vm_map: 13589.826496815 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841456640, end = 2841460736, flags = 135266419, pgoff = 32768, inode = 52569 }
+vm_state.vm_map: 13589.826501598 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841460736, end = 2841485312, flags = 134217845, pgoff = 0, inode = 52572 }
+vm_state.vm_map: 13589.826503760 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841485312, end = 2841489408, flags = 135266419, pgoff = 20480, inode = 52572 }
+vm_state.vm_map: 13589.826505914 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841489408, end = 2841509888, flags = 134217845, pgoff = 0, inode = 52568 }
+vm_state.vm_map: 13589.826508186 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841509888, end = 2841513984, flags = 135266419, pgoff = 16384, inode = 52568 }
+vm_state.vm_map: 13589.826510771 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841513984, end = 2841554944, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.826512810 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841554944, end = 2841559040, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.826514860 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841559040, end = 2841563136, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.826517181 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841575424, end = 2841657344, flags = 134217841, pgoff = 0, inode = 98443 }
+vm_state.vm_map: 13589.826519409 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2841657344, end = 2967998464, flags = 134217979, pgoff = 0, inode = 73879 }
+vm_state.vm_map: 13589.826521565 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 2967998464, end = 3001655296, flags = 134217979, pgoff = 0, inode = 73878 }
+vm_state.vm_map: 13589.826530441 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3001655296, end = 3017895936, flags = 134217979, pgoff = 0, inode = 1204624 }
+vm_state.vm_map: 13589.826536032 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3017895936, end = 3022192640, flags = 134217979, pgoff = 0, inode = 1204558 }
+vm_state.vm_map: 13589.826555025 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022192640, end = 3022393344, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 13589.826557155 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022393344, end = 3022397440, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 13589.826559475 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022397440, end = 3022422016, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 13589.826561507 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022422016, end = 3022426112, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 13589.826569793 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022426112, end = 3022446592, flags = 134217845, pgoff = 0, inode = 58972 }
+vm_state.vm_map: 13589.826571838 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022446592, end = 3022450688, flags = 135266419, pgoff = 16384, inode = 58972 }
+vm_state.vm_map: 13589.826579084 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022450688, end = 3022475264, flags = 134217845, pgoff = 0, inode = 58999 }
+vm_state.vm_map: 13589.826581121 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022475264, end = 3022479360, flags = 135266419, pgoff = 20480, inode = 58999 }
+vm_state.vm_map: 13589.826583492 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022479360, end = 3022499840, flags = 134217845, pgoff = 0, inode = 58997 }
+vm_state.vm_map: 13589.826585530 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022499840, end = 3022503936, flags = 135266419, pgoff = 16384, inode = 58997 }
+vm_state.vm_map: 13589.826587851 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022503936, end = 3022516224, flags = 134217845, pgoff = 0, inode = 59166 }
+vm_state.vm_map: 13589.826589962 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022516224, end = 3022520320, flags = 135266419, pgoff = 8192, inode = 59166 }
+vm_state.vm_map: 13589.826592351 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022520320, end = 3022524416, flags = 134217937, pgoff = 0, inode = 1196317 }
+vm_state.vm_map: 13589.826594561 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022524416, end = 3022548992, flags = 134217937, pgoff = 0, inode = 1196229 }
+vm_state.vm_map: 13589.826596876 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022548992, end = 3022553088, flags = 134217937, pgoff = 0, inode = 1196235 }
+vm_state.vm_map: 13589.826598963 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022553088, end = 3022557184, flags = 134217937, pgoff = 0, inode = 1196204 }
+vm_state.vm_map: 13589.826601247 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022557184, end = 3022561280, flags = 134217937, pgoff = 0, inode = 1196228 }
+vm_state.vm_map: 13589.826603765 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022561280, end = 3022565376, flags = 134217937, pgoff = 0, inode = 1196227 }
+vm_state.vm_map: 13589.826606185 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022565376, end = 3022573568, flags = 134217937, pgoff = 0, inode = 1196198 }
+vm_state.vm_map: 13589.826608370 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022573568, end = 3022606336, flags = 134217937, pgoff = 0, inode = 1196200 }
+vm_state.vm_map: 13589.826610666 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022606336, end = 3022618624, flags = 134217937, pgoff = 0, inode = 1196226 }
+vm_state.vm_map: 13589.826612939 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022618624, end = 3022626816, flags = 134217937, pgoff = 0, inode = 1196225 }
+vm_state.vm_map: 13589.826615117 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022626816, end = 3022630912, flags = 134217937, pgoff = 0, inode = 1196224 }
+vm_state.vm_map: 13589.826617420 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022630912, end = 3022635008, flags = 134217937, pgoff = 0, inode = 1196223 }
+vm_state.vm_map: 13589.826619593 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022635008, end = 3022639104, flags = 134217937, pgoff = 0, inode = 1196202 }
+vm_state.vm_map: 13589.826621889 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022639104, end = 3022667776, flags = 134217937, pgoff = 0, inode = 1196222 }
+vm_state.vm_map: 13589.826624038 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022667776, end = 3022680064, flags = 134217937, pgoff = 0, inode = 1196221 }
+vm_state.vm_map: 13589.826626298 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022680064, end = 3022684160, flags = 134217937, pgoff = 0, inode = 1196220 }
+vm_state.vm_map: 13589.826628360 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022684160, end = 3022692352, flags = 134217937, pgoff = 0, inode = 1196219 }
+vm_state.vm_map: 13589.826630662 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022692352, end = 3022696448, flags = 134217937, pgoff = 0, inode = 1196210 }
+vm_state.vm_map: 13589.826632867 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022696448, end = 3022700544, flags = 134217937, pgoff = 0, inode = 1196205 }
+vm_state.vm_map: 13589.826635169 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022700544, end = 3022712832, flags = 134217937, pgoff = 0, inode = 1196244 }
+vm_state.vm_map: 13589.826637429 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022712832, end = 3022721024, flags = 134217937, pgoff = 0, inode = 1196270 }
+vm_state.vm_map: 13589.826640051 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022721024, end = 3022753792, flags = 134217937, pgoff = 0, inode = 1196246 }
+vm_state.vm_map: 13589.826642200 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022753792, end = 3022774272, flags = 134217937, pgoff = 0, inode = 1196269 }
+vm_state.vm_map: 13589.826644453 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022774272, end = 3022782464, flags = 134217937, pgoff = 0, inode = 1196316 }
+vm_state.vm_map: 13589.826646719 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022782464, end = 3022811136, flags = 134217937, pgoff = 0, inode = 1196197 }
+vm_state.vm_map: 13589.826648879 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022811136, end = 3022856192, flags = 134217937, pgoff = 0, inode = 1196312 }
+vm_state.vm_map: 13589.826651059 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022856192, end = 3022913536, flags = 134217937, pgoff = 0, inode = 1196272 }
+vm_state.vm_map: 13589.826653238 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3022913536, end = 3023138816, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.826655264 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3023138816, end = 3023142912, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.826657302 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3023142912, end = 3023147008, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.826659739 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3023147008, end = 3023204352, flags = 134217845, pgoff = 0, inode = 23728 }
+vm_state.vm_map: 13589.826662017 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3023204352, end = 3023208448, flags = 135266419, pgoff = 53248, inode = 23728 }
+vm_state.vm_map: 13589.826664185 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3023208448, end = 3023495168, flags = 134217845, pgoff = 0, inode = 1065175 }
+vm_state.vm_map: 13589.826666222 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3023495168, end = 3023503360, flags = 135266419, pgoff = 286720, inode = 1065175 }
+vm_state.vm_map: 13589.826668377 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3023503360, end = 3023663104, flags = 134217845, pgoff = 0, inode = 22541 }
+vm_state.vm_map: 13589.826670544 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3023663104, end = 3023667200, flags = 135266419, pgoff = 159744, inode = 22541 }
+vm_state.vm_map: 13589.826672581 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3023667200, end = 3023904768, flags = 1048691, pgoff = 3023904768, inode = 0 }
+vm_state.vm_map: 13589.826675241 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3023912960, end = 3023945728, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 13589.826677273 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3023945728, end = 3023949824, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 13589.826682019 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3023949824, end = 3024179200, flags = 134217845, pgoff = 0, inode = 23730 }
+vm_state.vm_map: 13589.826684058 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3024179200, end = 3024187392, flags = 135266419, pgoff = 225280, inode = 23730 }
+vm_state.vm_map: 13589.826686329 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3024187392, end = 3024269312, flags = 134217845, pgoff = 0, inode = 23971 }
+vm_state.vm_map: 13589.826688472 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3024269312, end = 3024273408, flags = 135266419, pgoff = 81920, inode = 23971 }
+vm_state.vm_map: 13589.826690829 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3024273408, end = 3024564224, flags = 134217845, pgoff = 0, inode = 1066190 }
+vm_state.vm_map: 13589.826692861 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3024564224, end = 3024576512, flags = 135266419, pgoff = 290816, inode = 1066190 }
+vm_state.vm_map: 13589.826694991 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3024576512, end = 3024609280, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 13589.826697023 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3024609280, end = 3024613376, flags = 135266419, pgoff = 32768, inode = 20716 }
+vm_state.vm_map: 13589.826699091 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3024613376, end = 3025133568, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 13589.826701227 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3025133568, end = 3025141760, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 13589.826703277 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3025141760, end = 3025506304, flags = 134217845, pgoff = 0, inode = 1065038 }
+vm_state.vm_map: 13589.826705316 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3025506304, end = 3025543168, flags = 135266423, pgoff = 364544, inode = 1065038 }
+vm_state.vm_map: 13589.826707360 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3025543168, end = 3025547264, flags = 1048695, pgoff = 3025543168, inode = 0 }
+vm_state.vm_map: 13589.826709896 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3025547264, end = 3026100224, flags = 134217845, pgoff = 0, inode = 18947 }
+vm_state.vm_map: 13589.826711946 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3026100224, end = 3026120704, flags = 135266419, pgoff = 548864, inode = 18947 }
+vm_state.vm_map: 13589.826716748 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3026120704, end = 3026436096, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 13589.826718780 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3026436096, end = 3026444288, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 13589.826720928 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3026444288, end = 3026513920, flags = 134217845, pgoff = 0, inode = 1065123 }
+vm_state.vm_map: 13589.826722953 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3026513920, end = 3026518016, flags = 135266419, pgoff = 69632, inode = 1065123 }
+vm_state.vm_map: 13589.826724998 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3026518016, end = 3041013760, flags = 134217845, pgoff = 0, inode = 20672 }
+vm_state.vm_map: 13589.826727134 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3041013760, end = 3041628160, flags = 135266419, pgoff = 14495744, inode = 20672 }
+vm_state.vm_map: 13589.826729172 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3041628160, end = 3041636352, flags = 1048691, pgoff = 3041628160, inode = 0 }
+vm_state.vm_map: 13589.826731228 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3041636352, end = 3042009088, flags = 134217845, pgoff = 0, inode = 20902 }
+vm_state.vm_map: 13589.826733272 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3042009088, end = 3042021376, flags = 135266419, pgoff = 368640, inode = 20902 }
+vm_state.vm_map: 13589.826735863 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3042021376, end = 3042029568, flags = 134217845, pgoff = 0, inode = 57760 }
+vm_state.vm_map: 13589.826737933 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3042029568, end = 3042033664, flags = 135266419, pgoff = 4096, inode = 57760 }
+vm_state.vm_map: 13589.826740340 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3042033664, end = 3042041856, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 13589.826742297 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3042041856, end = 3042045952, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 13589.826744938 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3042045952, end = 3042058240, flags = 134217937, pgoff = 0, inode = 1196315 }
+vm_state.vm_map: 13589.826747013 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3042058240, end = 3042115584, flags = 134217937, pgoff = 0, inode = 1196231 }
+vm_state.vm_map: 13589.826749217 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3042115584, end = 3044098048, flags = 134217845, pgoff = 0, inode = 20915 }
+vm_state.vm_map: 13589.826751162 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3044098048, end = 3044139008, flags = 135266419, pgoff = 1978368, inode = 20915 }
+vm_state.vm_map: 13589.826753372 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3044139008, end = 3045470208, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.826755435 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3045470208, end = 3045486592, flags = 1048691, pgoff = 3045470208, inode = 0 }
+vm_state.vm_map: 13589.826757639 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3045486592, end = 3045634048, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.826759597 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3045634048, end = 3045642240, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.826761924 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3045642240, end = 3045961728, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 13589.826763894 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3045961728, end = 3045978112, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 13589.826766099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3045978112, end = 3045990400, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 13589.826768247 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3045990400, end = 3045994496, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 13589.826770340 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3045994496, end = 3047251968, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 13589.826772297 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3047251968, end = 3047272448, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 13589.826774588 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3047272448, end = 3047280640, flags = 1048691, pgoff = 3047272448, inode = 0 }
+vm_state.vm_map: 13589.826776644 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3047280640, end = 3047518208, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 13589.826779014 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3047518208, end = 3047522304, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 13589.826781169 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3047522304, end = 3047538688, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.826783207 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3047538688, end = 3047542784, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.826785264 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3047542784, end = 3047550976, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.826787400 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3047550976, end = 3047555072, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.826789530 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3047555072, end = 3047747584, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.826791555 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3047747584, end = 3047751680, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.826793623 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3047751680, end = 3047804928, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 13589.826795754 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3047804928, end = 3047809024, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 13589.826797791 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3047809024, end = 3047813120, flags = 1048691, pgoff = 3047809024, inode = 0 }
+vm_state.vm_map: 13589.826799842 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3047813120, end = 3047985152, flags = 134217845, pgoff = 0, inode = 1065255 }
+vm_state.vm_map: 13589.826801984 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3047985152, end = 3047989248, flags = 135266419, pgoff = 172032, inode = 1065255 }
+vm_state.vm_map: 13589.826804041 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3047989248, end = 3048235008, flags = 134217845, pgoff = 0, inode = 20603 }
+vm_state.vm_map: 13589.826806071 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3048235008, end = 3048239104, flags = 135266419, pgoff = 245760, inode = 20603 }
+vm_state.vm_map: 13589.826808208 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3048239104, end = 3048710144, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 13589.826810246 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3048710144, end = 3048726528, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 13589.826812647 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3048726528, end = 3048869888, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 13589.826814704 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3048869888, end = 3048873984, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 13589.826816926 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3048873984, end = 3048960000, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 13589.826818951 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3048960000, end = 3048964096, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 13589.826820989 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3048964096, end = 3048968192, flags = 1048691, pgoff = 3048964096, inode = 0 }
+vm_state.vm_map: 13589.826823070 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3048968192, end = 3048984576, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 13589.826825237 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3048984576, end = 3048988672, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 13589.826829676 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3048988672, end = 3049021440, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 13589.826831720 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3049021440, end = 3049025536, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 13589.826833899 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3049025536, end = 3049041920, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 13589.826835950 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3049041920, end = 3049046016, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 13589.826838006 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3049046016, end = 3049132032, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 13589.826840148 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3049132032, end = 3049136128, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 13589.826842167 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3049136128, end = 3049144320, flags = 1048691, pgoff = 3049136128, inode = 0 }
+vm_state.vm_map: 13589.826844279 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3049144320, end = 3049172992, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 13589.826846779 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3049172992, end = 3049177088, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 13589.826848815 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3049177088, end = 3049181184, flags = 1048691, pgoff = 3049177088, inode = 0 }
+vm_state.vm_map: 13589.826850768 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3049181184, end = 3049512960, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 13589.826852922 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3049512960, end = 3049521152, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 13589.826855095 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3049521152, end = 3049553920, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 13589.826857122 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3049553920, end = 3049558016, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 13589.826859184 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3049558016, end = 3049574400, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 13589.826861332 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3049574400, end = 3049578496, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 13589.826863394 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3049578496, end = 3049603072, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 13589.826865420 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3049603072, end = 3049607168, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 13589.826867587 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3049607168, end = 3049639936, flags = 134217845, pgoff = 0, inode = 18621 }
+vm_state.vm_map: 13589.826869613 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3049639936, end = 3049644032, flags = 135266419, pgoff = 28672, inode = 18621 }
+vm_state.vm_map: 13589.826871650 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3049644032, end = 3049648128, flags = 1048691, pgoff = 3049644032, inode = 0 }
+vm_state.vm_map: 13589.826873836 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3049648128, end = 3050078208, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 13589.826875941 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3050078208, end = 3050106880, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 13589.826877986 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3050106880, end = 3050110976, flags = 1048691, pgoff = 3050106880, inode = 0 }
+vm_state.vm_map: 13589.826880485 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3050110976, end = 3050553344, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 13589.826882486 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3050553344, end = 3050561536, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 13589.826884683 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3050561536, end = 3050659840, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.826886838 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3050659840, end = 3050663936, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.826888981 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3050663936, end = 3050934272, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 13589.826891006 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3050934272, end = 3050942464, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 13589.826893118 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3050942464, end = 3051003904, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 13589.826895180 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3051003904, end = 3051008000, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 13589.826897317 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3051008000, end = 3051012096, flags = 1048691, pgoff = 3051008000, inode = 0 }
+vm_state.vm_map: 13589.826899312 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3051012096, end = 3051479040, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 13589.826901583 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3051479040, end = 3051487232, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 13589.826903571 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3051487232, end = 3052617728, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 13589.826905738 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3052617728, end = 3052634112, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 13589.826907820 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3052634112, end = 3052748800, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.826909987 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3052748800, end = 3052752896, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.826911994 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3052752896, end = 3052900352, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.826914610 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3052900352, end = 3052904448, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.826916635 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3052904448, end = 3052908544, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.826918717 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3052908544, end = 3052916736, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.826920687 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3052916736, end = 3052920832, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.826922977 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3052920832, end = 3052924928, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.826925026 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3052924928, end = 3052929024, flags = 1048691, pgoff = 3052924928, inode = 0 }
+vm_state.vm_map: 13589.826929478 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3052929024, end = 3053015040, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.826931522 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3053015040, end = 3053019136, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.826933652 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3053019136, end = 3053023232, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.826935689 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3053023232, end = 3053031424, flags = 1048691, pgoff = 3053023232, inode = 0 }
+vm_state.vm_map: 13589.826937696 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3053031424, end = 3053776896, flags = 134217845, pgoff = 0, inode = 499794 }
+vm_state.vm_map: 13589.826939987 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3053776896, end = 3053780992, flags = 135266419, pgoff = 745472, inode = 499794 }
+vm_state.vm_map: 13589.826942031 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3053780992, end = 3053809664, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.826944062 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3053809664, end = 3053813760, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.826946137 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3053813760, end = 3053817856, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.826948686 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3053817856, end = 3053834240, flags = 134217845, pgoff = 0, inode = 20149 }
+vm_state.vm_map: 13589.826950718 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3053834240, end = 3053838336, flags = 135266419, pgoff = 12288, inode = 20149 }
+vm_state.vm_map: 13589.826952792 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3053838336, end = 3053920256, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.826954885 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3053920256, end = 3053924352, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.826957089 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3053924352, end = 3055239168, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.826959115 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3055239168, end = 3055247360, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.826961276 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3055247360, end = 3055251456, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.826963252 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3055251456, end = 3055267840, flags = 1048691, pgoff = 3055251456, inode = 0 }
+vm_state.vm_map: 13589.826965431 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3055267840, end = 3056205824, flags = 134217845, pgoff = 0, inode = 16850 }
+vm_state.vm_map: 13589.826967586 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3056205824, end = 3056222208, flags = 135266417, pgoff = 937984, inode = 16850 }
+vm_state.vm_map: 13589.826969624 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3056222208, end = 3056226304, flags = 135266419, pgoff = 954368, inode = 16850 }
+vm_state.vm_map: 13589.826971674 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3056226304, end = 3056254976, flags = 1048691, pgoff = 3056226304, inode = 0 }
+vm_state.vm_map: 13589.826973835 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3056254976, end = 3066294272, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 13589.826975860 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3066294272, end = 3066454016, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 13589.826977898 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3066454016, end = 3066462208, flags = 1048691, pgoff = 3066454016, inode = 0 }
+vm_state.vm_map: 13589.826979986 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3066462208, end = 3070058496, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 13589.826982491 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3070058496, end = 3070156800, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 13589.826984529 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3070156800, end = 3070160896, flags = 1048691, pgoff = 3070156800, inode = 0 }
+vm_state.vm_map: 13589.826986671 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3070160896, end = 3072716800, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 13589.826988716 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3072716800, end = 3072765952, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 13589.826990895 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3072765952, end = 3072770048, flags = 1048691, pgoff = 3072765952, inode = 0 }
+vm_state.vm_map: 13589.826992871 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3072770048, end = 3073921024, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.826995142 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3073921024, end = 3073937408, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.826997212 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3073937408, end = 3074170880, flags = 134217845, pgoff = 0, inode = 1065180 }
+vm_state.vm_map: 13589.826999230 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3074170880, end = 3074179072, flags = 135266419, pgoff = 233472, inode = 1065180 }
+vm_state.vm_map: 13589.827001379 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3074179072, end = 3074183168, flags = 1048691, pgoff = 3074179072, inode = 0 }
+vm_state.vm_map: 13589.827003441 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3074183168, end = 3076485120, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 13589.827005467 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3076485120, end = 3076530176, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 13589.827007609 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3076530176, end = 3078840320, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 13589.827009579 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3078840320, end = 3078868992, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 13589.827011740 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3078868992, end = 3078873088, flags = 1048691, pgoff = 3078868992, inode = 0 }
+vm_state.vm_map: 13589.827014049 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3078877184, end = 3078885376, flags = 134217845, pgoff = 0, inode = 23893 }
+vm_state.vm_map: 13589.827016425 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3078885376, end = 3078889472, flags = 135266419, pgoff = 4096, inode = 23893 }
+vm_state.vm_map: 13589.827018426 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3078889472, end = 3078897664, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 13589.827020586 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3078897664, end = 3078901760, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 13589.827022760 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3078901760, end = 3078918144, flags = 134217845, pgoff = 0, inode = 22094 }
+vm_state.vm_map: 13589.827024810 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3078918144, end = 3078922240, flags = 135266419, pgoff = 12288, inode = 22094 }
+vm_state.vm_map: 13589.827026928 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3078922240, end = 3078930432, flags = 134217845, pgoff = 0, inode = 1450546 }
+vm_state.vm_map: 13589.827029089 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3078930432, end = 3078934528, flags = 135266417, pgoff = 4096, inode = 1450546 }
+vm_state.vm_map: 13589.827031232 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3078934528, end = 3078938624, flags = 135266419, pgoff = 8192, inode = 1450546 }
+vm_state.vm_map: 13589.827033288 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3078938624, end = 3078967296, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.827035325 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3078967296, end = 3078975488, flags = 1048691, pgoff = 3078967296, inode = 0 }
+vm_state.vm_map: 13589.827037474 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3078975488, end = 3078979584, flags = 67371125, pgoff = 3078975488, inode = 0 }
+vm_state.vm_map: 13589.827039562 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3078979584, end = 3079094272, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.827041586 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3079094272, end = 3079098368, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.827043612 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3079098368, end = 3079102464, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.827045650 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2227, start = 3214217216, end = 3214303232, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.827051050 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 134512640, end = 134553600, flags = 134223989, pgoff = 0, inode = 20759 }
+vm_state.vm_map: 13589.827053075 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 134553600, end = 134557696, flags = 135272563, pgoff = 36864, inode = 20759 }
+vm_state.vm_map: 13589.827055254 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 134557696, end = 134565888, flags = 1048691, pgoff = 134557696, inode = 0 }
+vm_state.vm_map: 13589.827057304 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 145301504, end = 147046400, flags = 1048691, pgoff = 145301504, inode = 0 }
+vm_state.vm_map: 13589.827059631 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2981187584, end = 2981249024, flags = 134217845, pgoff = 0, inode = 19423 }
+vm_state.vm_map: 13589.827061786 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2981249024, end = 2981253120, flags = 135266419, pgoff = 57344, inode = 19423 }
+vm_state.vm_map: 13589.827064064 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2981253120, end = 2981277696, flags = 134217845, pgoff = 0, inode = 18679 }
+vm_state.vm_map: 13589.827066102 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2981277696, end = 2981281792, flags = 135266419, pgoff = 20480, inode = 18679 }
+vm_state.vm_map: 13589.827068385 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2981281792, end = 2981445632, flags = 134217845, pgoff = 0, inode = 18646 }
+vm_state.vm_map: 13589.827070332 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2981445632, end = 2981449728, flags = 135266419, pgoff = 163840, inode = 18646 }
+vm_state.vm_map: 13589.827072745 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2981449728, end = 2982113280, flags = 134217845, pgoff = 0, inode = 18913 }
+vm_state.vm_map: 13589.827074782 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2982113280, end = 2982137856, flags = 135266419, pgoff = 659456, inode = 18913 }
+vm_state.vm_map: 13589.827077072 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2982137856, end = 2982227968, flags = 134217845, pgoff = 0, inode = 19203 }
+vm_state.vm_map: 13589.827079098 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2982227968, end = 2982232064, flags = 135266419, pgoff = 86016, inode = 19203 }
+vm_state.vm_map: 13589.827081369 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2982232064, end = 2982301696, flags = 134217845, pgoff = 0, inode = 508763 }
+vm_state.vm_map: 13589.827083408 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2982301696, end = 2982305792, flags = 135266417, pgoff = 65536, inode = 508763 }
+vm_state.vm_map: 13589.827085821 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2982305792, end = 2982309888, flags = 135266419, pgoff = 69632, inode = 508763 }
+vm_state.vm_map: 13589.827087803 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2982309888, end = 2982318080, flags = 1048691, pgoff = 2982309888, inode = 0 }
+vm_state.vm_map: 13589.827090216 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2982318080, end = 2982780928, flags = 134217845, pgoff = 0, inode = 20061 }
+vm_state.vm_map: 13589.827092236 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2982780928, end = 2982793216, flags = 135266419, pgoff = 458752, inode = 20061 }
+vm_state.vm_map: 13589.827094526 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2982793216, end = 2983399424, flags = 134217845, pgoff = 0, inode = 22471 }
+vm_state.vm_map: 13589.827096570 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2983399424, end = 2983415808, flags = 135266419, pgoff = 602112, inode = 22471 }
+vm_state.vm_map: 13589.827098730 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2983415808, end = 2983579648, flags = 134217845, pgoff = 0, inode = 18977 }
+vm_state.vm_map: 13589.827100769 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2983579648, end = 2983583744, flags = 135266419, pgoff = 163840, inode = 18977 }
+vm_state.vm_map: 13589.827102973 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2983583744, end = 2983849984, flags = 134217845, pgoff = 0, inode = 19433 }
+vm_state.vm_map: 13589.827104924 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2983849984, end = 2983858176, flags = 135266419, pgoff = 262144, inode = 19433 }
+vm_state.vm_map: 13589.827106869 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2983858176, end = 2983862272, flags = 1048691, pgoff = 2983858176, inode = 0 }
+vm_state.vm_map: 13589.827111506 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2983862272, end = 2983911424, flags = 134217845, pgoff = 0, inode = 19447 }
+vm_state.vm_map: 13589.827113660 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2983911424, end = 2983915520, flags = 135266419, pgoff = 49152, inode = 19447 }
+vm_state.vm_map: 13589.827116301 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2983915520, end = 2984112128, flags = 134217845, pgoff = 0, inode = 19429 }
+vm_state.vm_map: 13589.827118333 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2984112128, end = 2984116224, flags = 135266419, pgoff = 192512, inode = 19429 }
+vm_state.vm_map: 13589.827121073 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2984116224, end = 2984341504, flags = 134217845, pgoff = 0, inode = 20835 }
+vm_state.vm_map: 13589.827123148 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2984341504, end = 2984345600, flags = 135266419, pgoff = 221184, inode = 20835 }
+vm_state.vm_map: 13589.827125530 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2984345600, end = 2984599552, flags = 134217845, pgoff = 0, inode = 18395 }
+vm_state.vm_map: 13589.827127481 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2984599552, end = 2984603648, flags = 135266419, pgoff = 249856, inode = 18395 }
+vm_state.vm_map: 13589.827135171 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2984603648, end = 2984988672, flags = 134217845, pgoff = 0, inode = 20862 }
+vm_state.vm_map: 13589.827137215 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2984988672, end = 2984992768, flags = 135266419, pgoff = 380928, inode = 20862 }
+vm_state.vm_map: 13589.827139726 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2984992768, end = 2985021440, flags = 134217845, pgoff = 0, inode = 1065218 }
+vm_state.vm_map: 13589.827141765 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2985021440, end = 2985025536, flags = 135266419, pgoff = 28672, inode = 1065218 }
+vm_state.vm_map: 13589.827160319 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2985025536, end = 2986471424, flags = 134217845, pgoff = 0, inode = 22753 }
+vm_state.vm_map: 13589.827162480 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2986471424, end = 2986483712, flags = 135266419, pgoff = 1441792, inode = 22753 }
+vm_state.vm_map: 13589.827165067 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2986483712, end = 2986876928, flags = 134217845, pgoff = 0, inode = 23655 }
+vm_state.vm_map: 13589.827167092 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2986876928, end = 2986885120, flags = 135266419, pgoff = 393216, inode = 23655 }
+vm_state.vm_map: 13589.827172424 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2986885120, end = 2987106304, flags = 134217845, pgoff = 0, inode = 20840 }
+vm_state.vm_map: 13589.827174837 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2987106304, end = 2987110400, flags = 135266419, pgoff = 221184, inode = 20840 }
+vm_state.vm_map: 13589.827181768 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2987110400, end = 2987315200, flags = 134217845, pgoff = 0, inode = 20867 }
+vm_state.vm_map: 13589.827183801 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2987315200, end = 2987319296, flags = 135266419, pgoff = 204800, inode = 20867 }
+vm_state.vm_map: 13589.827185974 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2987413504, end = 2987417600, flags = 1048688, pgoff = 2987413504, inode = 0 }
+vm_state.vm_map: 13589.827188011 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2987417600, end = 2995806208, flags = 1048691, pgoff = 2987417600, inode = 0 }
+vm_state.vm_map: 13589.827190264 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2997850112, end = 2997891072, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.827192413 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2997891072, end = 2997895168, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.827194470 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2997895168, end = 2997899264, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.827196637 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2997899264, end = 2997936128, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.827198767 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2997936128, end = 2997940224, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.827200860 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2997940224, end = 2997944320, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.827203028 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2997944320, end = 2998022144, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.827205194 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2998022144, end = 2998026240, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.827207269 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2998026240, end = 2998030336, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.827209762 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2998030336, end = 2998038528, flags = 1048691, pgoff = 2998030336, inode = 0 }
+vm_state.vm_map: 13589.827211881 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2998038528, end = 2998063104, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.827214054 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2998063104, end = 2998067200, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.827215999 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2998067200, end = 2998071296, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.827222913 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2998083584, end = 2998161408, flags = 134217845, pgoff = 0, inode = 50114 }
+vm_state.vm_map: 13589.827224944 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2998161408, end = 2998165504, flags = 135266419, pgoff = 77824, inode = 50114 }
+vm_state.vm_map: 13589.827231710 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2998165504, end = 2998231040, flags = 134217845, pgoff = 0, inode = 57391 }
+vm_state.vm_map: 13589.827233877 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2998231040, end = 2998235136, flags = 135266419, pgoff = 61440, inode = 57391 }
+vm_state.vm_map: 13589.827235921 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2998235136, end = 2998251520, flags = 1048691, pgoff = 2998235136, inode = 0 }
+vm_state.vm_map: 13589.827238359 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2998251520, end = 2998534144, flags = 134217845, pgoff = 0, inode = 22693 }
+vm_state.vm_map: 13589.827240403 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2998534144, end = 2998546432, flags = 135266419, pgoff = 282624, inode = 22693 }
+vm_state.vm_map: 13589.827242423 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2998546432, end = 2998571008, flags = 1048691, pgoff = 2998546432, inode = 0 }
+vm_state.vm_map: 13589.827245082 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2998575104, end = 2998591488, flags = 134217845, pgoff = 0, inode = 57390 }
+vm_state.vm_map: 13589.827247101 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2998591488, end = 2998595584, flags = 135266419, pgoff = 12288, inode = 57390 }
+vm_state.vm_map: 13589.827249397 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2998595584, end = 2998616064, flags = 134217845, pgoff = 0, inode = 57392 }
+vm_state.vm_map: 13589.827251424 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2998616064, end = 2998620160, flags = 135266419, pgoff = 16384, inode = 57392 }
+vm_state.vm_map: 13589.827253714 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2998620160, end = 2998661120, flags = 134217845, pgoff = 0, inode = 57395 }
+vm_state.vm_map: 13589.827255745 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2998661120, end = 2998665216, flags = 135266419, pgoff = 36864, inode = 57395 }
+vm_state.vm_map: 13589.827258066 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2998665216, end = 2998935552, flags = 134217845, pgoff = 0, inode = 18916 }
+vm_state.vm_map: 13589.827260091 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2998935552, end = 2998939648, flags = 135266419, pgoff = 266240, inode = 18916 }
+vm_state.vm_map: 13589.827262381 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2998939648, end = 2999021568, flags = 134217845, pgoff = 0, inode = 18915 }
+vm_state.vm_map: 13589.827264407 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2999021568, end = 2999029760, flags = 135266419, pgoff = 77824, inode = 18915 }
+vm_state.vm_map: 13589.827266716 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2999029760, end = 2999812096, flags = 134217845, pgoff = 0, inode = 18927 }
+vm_state.vm_map: 13589.827268747 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2999812096, end = 2999820288, flags = 135266419, pgoff = 778240, inode = 18927 }
+vm_state.vm_map: 13589.827270951 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2999820288, end = 2999832576, flags = 134217845, pgoff = 0, inode = 20765 }
+vm_state.vm_map: 13589.827272976 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2999832576, end = 2999836672, flags = 135266419, pgoff = 8192, inode = 20765 }
+vm_state.vm_map: 13589.827275144 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2999836672, end = 2999853056, flags = 134217845, pgoff = 0, inode = 57389 }
+vm_state.vm_map: 13589.827277200 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2999853056, end = 2999857152, flags = 135266419, pgoff = 12288, inode = 57389 }
+vm_state.vm_map: 13589.827279779 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2999857152, end = 2999889920, flags = 134217845, pgoff = 0, inode = 57396 }
+vm_state.vm_map: 13589.827281811 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2999889920, end = 2999894016, flags = 135266419, pgoff = 28672, inode = 57396 }
+vm_state.vm_map: 13589.827283978 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2999894016, end = 2999910400, flags = 134217845, pgoff = 0, inode = 57393 }
+vm_state.vm_map: 13589.827286078 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2999910400, end = 2999914496, flags = 135266419, pgoff = 12288, inode = 57393 }
+vm_state.vm_map: 13589.827288337 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 2999914496, end = 3000279040, flags = 134217845, pgoff = 0, inode = 22572 }
+vm_state.vm_map: 13589.827290282 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3000279040, end = 3000287232, flags = 135266419, pgoff = 364544, inode = 22572 }
+vm_state.vm_map: 13589.827292591 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3000287232, end = 3000295424, flags = 134217845, pgoff = 0, inode = 500018 }
+vm_state.vm_map: 13589.827294574 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3000295424, end = 3000299520, flags = 135266419, pgoff = 4096, inode = 500018 }
+vm_state.vm_map: 13589.827296993 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3000299520, end = 3000324096, flags = 134217845, pgoff = 0, inode = 18917 }
+vm_state.vm_map: 13589.827298932 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3000324096, end = 3000328192, flags = 135266419, pgoff = 20480, inode = 18917 }
+vm_state.vm_map: 13589.827301222 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3000328192, end = 3000344576, flags = 134217845, pgoff = 0, inode = 18914 }
+vm_state.vm_map: 13589.827303247 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3000344576, end = 3000348672, flags = 135266419, pgoff = 16384, inode = 18914 }
+vm_state.vm_map: 13589.827305446 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3000348672, end = 3000377344, flags = 134217845, pgoff = 0, inode = 57397 }
+vm_state.vm_map: 13589.827307471 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3000377344, end = 3000381440, flags = 135266419, pgoff = 24576, inode = 57397 }
+vm_state.vm_map: 13589.827309743 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3000381440, end = 3000582144, flags = 134217845, pgoff = 0, inode = 20709 }
+vm_state.vm_map: 13589.827311824 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3000582144, end = 3000590336, flags = 135266419, pgoff = 196608, inode = 20709 }
+vm_state.vm_map: 13589.827314329 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3000590336, end = 3000598528, flags = 1048691, pgoff = 3000590336, inode = 0 }
+vm_state.vm_map: 13589.827316497 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3000598528, end = 3001049088, flags = 134217845, pgoff = 0, inode = 20711 }
+vm_state.vm_map: 13589.827318664 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3001049088, end = 3001061376, flags = 135266419, pgoff = 450560, inode = 20711 }
+vm_state.vm_map: 13589.827320849 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3001061376, end = 3001188352, flags = 134217845, pgoff = 0, inode = 18923 }
+vm_state.vm_map: 13589.827323016 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3001188352, end = 3001192448, flags = 135266419, pgoff = 122880, inode = 18923 }
+vm_state.vm_map: 13589.827325110 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3001200640, end = 3001217024, flags = 134217845, pgoff = 0, inode = 57394 }
+vm_state.vm_map: 13589.827327277 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3001217024, end = 3001221120, flags = 135266419, pgoff = 16384, inode = 57394 }
+vm_state.vm_map: 13589.827329382 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3001221120, end = 3001245696, flags = 134217845, pgoff = 0, inode = 57398 }
+vm_state.vm_map: 13589.827331549 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3001245696, end = 3001249792, flags = 135266419, pgoff = 24576, inode = 57398 }
+vm_state.vm_map: 13589.827333630 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3001249792, end = 3001266176, flags = 134217845, pgoff = 0, inode = 52571 }
+vm_state.vm_map: 13589.827335803 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3001266176, end = 3001270272, flags = 135266419, pgoff = 12288, inode = 52571 }
+vm_state.vm_map: 13589.827337884 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3001270272, end = 3001282560, flags = 134217845, pgoff = 0, inode = 49489 }
+vm_state.vm_map: 13589.827340076 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3001282560, end = 3001286656, flags = 135266419, pgoff = 8192, inode = 49489 }
+vm_state.vm_map: 13589.827356772 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3001286656, end = 3017527296, flags = 134217979, pgoff = 0, inode = 1204527 }
+vm_state.vm_map: 13589.827359148 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3017527296, end = 3021824000, flags = 134217979, pgoff = 0, inode = 1204522 }
+vm_state.vm_map: 13589.827361531 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3021824000, end = 3022024704, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 13589.827363944 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022024704, end = 3022028800, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 13589.827366235 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022028800, end = 3022053376, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 13589.827368229 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022053376, end = 3022057472, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 13589.827370642 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022057472, end = 3022077952, flags = 134217845, pgoff = 0, inode = 52570 }
+vm_state.vm_map: 13589.827372649 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022077952, end = 3022082048, flags = 135266419, pgoff = 16384, inode = 52570 }
+vm_state.vm_map: 13589.827374959 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022082048, end = 3022118912, flags = 134217845, pgoff = 0, inode = 52569 }
+vm_state.vm_map: 13589.827376959 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022118912, end = 3022123008, flags = 135266419, pgoff = 32768, inode = 52569 }
+vm_state.vm_map: 13589.827379274 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022123008, end = 3022147584, flags = 134217845, pgoff = 0, inode = 52572 }
+vm_state.vm_map: 13589.827381385 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022147584, end = 3022151680, flags = 135266419, pgoff = 20480, inode = 52572 }
+vm_state.vm_map: 13589.827383798 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022151680, end = 3022155776, flags = 134217937, pgoff = 0, inode = 1196317 }
+vm_state.vm_map: 13589.827386034 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022155776, end = 3022180352, flags = 134217937, pgoff = 0, inode = 1196229 }
+vm_state.vm_map: 13589.827388435 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022180352, end = 3022184448, flags = 134217937, pgoff = 0, inode = 1196235 }
+vm_state.vm_map: 13589.827390559 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022184448, end = 3022188544, flags = 134217937, pgoff = 0, inode = 1196204 }
+vm_state.vm_map: 13589.827392959 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022188544, end = 3022192640, flags = 134217937, pgoff = 0, inode = 1196228 }
+vm_state.vm_map: 13589.827395146 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022192640, end = 3022196736, flags = 134217937, pgoff = 0, inode = 1196227 }
+vm_state.vm_map: 13589.827397460 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022196736, end = 3022204928, flags = 134217937, pgoff = 0, inode = 1196198 }
+vm_state.vm_map: 13589.827400064 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022204928, end = 3022237696, flags = 134217937, pgoff = 0, inode = 1196200 }
+vm_state.vm_map: 13589.827402225 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022237696, end = 3022249984, flags = 134217937, pgoff = 0, inode = 1196226 }
+vm_state.vm_map: 13589.827404331 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022249984, end = 3022258176, flags = 134217937, pgoff = 0, inode = 1196225 }
+vm_state.vm_map: 13589.827406738 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022258176, end = 3022262272, flags = 134217937, pgoff = 0, inode = 1196224 }
+vm_state.vm_map: 13589.827408905 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022262272, end = 3022266368, flags = 134217937, pgoff = 0, inode = 1196223 }
+vm_state.vm_map: 13589.827411078 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022266368, end = 3022270464, flags = 134217937, pgoff = 0, inode = 1196202 }
+vm_state.vm_map: 13589.827413269 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022270464, end = 3022299136, flags = 134217937, pgoff = 0, inode = 1196222 }
+vm_state.vm_map: 13589.827415579 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022299136, end = 3022311424, flags = 134217937, pgoff = 0, inode = 1196221 }
+vm_state.vm_map: 13589.827417653 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022311424, end = 3022315520, flags = 134217937, pgoff = 0, inode = 1196220 }
+vm_state.vm_map: 13589.827420042 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022315520, end = 3022323712, flags = 134217937, pgoff = 0, inode = 1196219 }
+vm_state.vm_map: 13589.827422326 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022323712, end = 3022327808, flags = 134217937, pgoff = 0, inode = 1196210 }
+vm_state.vm_map: 13589.827424492 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022327808, end = 3022331904, flags = 134217937, pgoff = 0, inode = 1196205 }
+vm_state.vm_map: 13589.827426574 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022331904, end = 3022344192, flags = 134217937, pgoff = 0, inode = 1196244 }
+vm_state.vm_map: 13589.827428876 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022344192, end = 3022352384, flags = 134217937, pgoff = 0, inode = 1196270 }
+vm_state.vm_map: 13589.827430982 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022352384, end = 3022385152, flags = 134217937, pgoff = 0, inode = 1196246 }
+vm_state.vm_map: 13589.827433401 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022385152, end = 3022405632, flags = 134217937, pgoff = 0, inode = 1196269 }
+vm_state.vm_map: 13589.827435876 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022405632, end = 3022413824, flags = 134217937, pgoff = 0, inode = 1196316 }
+vm_state.vm_map: 13589.827438173 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022413824, end = 3022442496, flags = 134217937, pgoff = 0, inode = 1196197 }
+vm_state.vm_map: 13589.827440272 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022442496, end = 3022487552, flags = 134217937, pgoff = 0, inode = 1196312 }
+vm_state.vm_map: 13589.827442605 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022487552, end = 3022712832, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.827444630 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022712832, end = 3022716928, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.827446675 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022716928, end = 3022721024, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.827448830 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3022721024, end = 3023654912, flags = 134217845, pgoff = 0, inode = 20876 }
+vm_state.vm_map: 13589.827451003 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3023654912, end = 3023667200, flags = 135266419, pgoff = 933888, inode = 20876 }
+vm_state.vm_map: 13589.827453040 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3023667200, end = 3023904768, flags = 1048691, pgoff = 3023904768, inode = 0 }
+vm_state.vm_map: 13589.827455244 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3023904768, end = 3023912960, flags = 134217845, pgoff = 0, inode = 499720 }
+vm_state.vm_map: 13589.827457233 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3023912960, end = 3023917056, flags = 135266419, pgoff = 4096, inode = 499720 }
+vm_state.vm_map: 13589.827459462 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3023917056, end = 3023937536, flags = 134217845, pgoff = 0, inode = 52568 }
+vm_state.vm_map: 13589.827461432 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3023937536, end = 3023941632, flags = 135266419, pgoff = 16384, inode = 52568 }
+vm_state.vm_map: 13589.827463709 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3023941632, end = 3023998976, flags = 134217937, pgoff = 0, inode = 1196272 }
+vm_state.vm_map: 13589.827465791 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3023998976, end = 3024285696, flags = 134217845, pgoff = 0, inode = 20877 }
+vm_state.vm_map: 13589.827468087 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3024285696, end = 3024293888, flags = 135266419, pgoff = 282624, inode = 20877 }
+vm_state.vm_map: 13589.827470820 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3024293888, end = 3024478208, flags = 134217845, pgoff = 0, inode = 20878 }
+vm_state.vm_map: 13589.827472852 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3024478208, end = 3024482304, flags = 135266419, pgoff = 184320, inode = 20878 }
+vm_state.vm_map: 13589.827475068 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3024482304, end = 3024515072, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 13589.827477235 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3024515072, end = 3024519168, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 13589.827479446 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3024519168, end = 3024576512, flags = 134217937, pgoff = 0, inode = 1196231 }
+vm_state.vm_map: 13589.827481526 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3024576512, end = 3024609280, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 13589.827483595 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3024609280, end = 3024613376, flags = 135266419, pgoff = 32768, inode = 20716 }
+vm_state.vm_map: 13589.827485793 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3024613376, end = 3025133568, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 13589.827487811 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3025133568, end = 3025141760, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 13589.827489985 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3025141760, end = 3025506304, flags = 134217845, pgoff = 0, inode = 1065038 }
+vm_state.vm_map: 13589.827491949 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3025506304, end = 3025543168, flags = 135266423, pgoff = 364544, inode = 1065038 }
+vm_state.vm_map: 13589.827494122 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3025543168, end = 3025547264, flags = 1048695, pgoff = 3025543168, inode = 0 }
+vm_state.vm_map: 13589.827496296 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3025547264, end = 3026100224, flags = 134217845, pgoff = 0, inode = 18947 }
+vm_state.vm_map: 13589.827498321 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3026100224, end = 3026120704, flags = 135266419, pgoff = 548864, inode = 18947 }
+vm_state.vm_map: 13589.827500377 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3026120704, end = 3026436096, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 13589.827502661 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3026436096, end = 3026444288, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 13589.827505063 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3026444288, end = 3026513920, flags = 134217845, pgoff = 0, inode = 1065123 }
+vm_state.vm_map: 13589.827507087 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3026513920, end = 3026518016, flags = 135266419, pgoff = 69632, inode = 1065123 }
+vm_state.vm_map: 13589.827509237 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3026518016, end = 3041013760, flags = 134217845, pgoff = 0, inode = 20672 }
+vm_state.vm_map: 13589.827511256 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3041013760, end = 3041628160, flags = 135266419, pgoff = 14495744, inode = 20672 }
+vm_state.vm_map: 13589.827513293 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3041628160, end = 3041636352, flags = 1048691, pgoff = 3041628160, inode = 0 }
+vm_state.vm_map: 13589.827515436 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3041636352, end = 3042009088, flags = 134217845, pgoff = 0, inode = 20902 }
+vm_state.vm_map: 13589.827517536 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3042009088, end = 3042021376, flags = 135266419, pgoff = 368640, inode = 20902 }
+vm_state.vm_map: 13589.827519887 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3042021376, end = 3042029568, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 13589.827521912 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3042029568, end = 3042033664, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 13589.827524282 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3042033664, end = 3042111488, flags = 134217845, pgoff = 0, inode = 22643 }
+vm_state.vm_map: 13589.827526246 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3042111488, end = 3042115584, flags = 135266419, pgoff = 73728, inode = 22643 }
+vm_state.vm_map: 13589.827528493 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3042115584, end = 3044098048, flags = 134217845, pgoff = 0, inode = 20915 }
+vm_state.vm_map: 13589.827530519 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3044098048, end = 3044139008, flags = 135266419, pgoff = 1978368, inode = 20915 }
+vm_state.vm_map: 13589.827532594 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3044139008, end = 3045470208, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.827534657 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3045470208, end = 3045486592, flags = 1048691, pgoff = 3045470208, inode = 0 }
+vm_state.vm_map: 13589.827536885 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3045486592, end = 3045634048, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.827539255 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3045634048, end = 3045642240, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.827541404 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3045642240, end = 3045961728, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 13589.827543361 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3045961728, end = 3045978112, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 13589.827545565 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3045978112, end = 3045990400, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 13589.827547721 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3045990400, end = 3045994496, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 13589.827549789 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3045994496, end = 3047251968, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 13589.827551747 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3047251968, end = 3047272448, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 13589.827553920 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3047272448, end = 3047280640, flags = 1048691, pgoff = 3047272448, inode = 0 }
+vm_state.vm_map: 13589.827556099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3047280640, end = 3047518208, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 13589.827558125 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3047518208, end = 3047522304, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 13589.827563247 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3047522304, end = 3047538688, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.827565284 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3047538688, end = 3047542784, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.827567428 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3047542784, end = 3047550976, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.827569459 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3047550976, end = 3047555072, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.827571454 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3047555072, end = 3047747584, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.827574107 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3047747584, end = 3047751680, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.827576170 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3047751680, end = 3047804928, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 13589.827578194 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3047804928, end = 3047809024, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 13589.827580350 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3047809024, end = 3047813120, flags = 1048691, pgoff = 3047809024, inode = 0 }
+vm_state.vm_map: 13589.827582406 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3047813120, end = 3047985152, flags = 134217845, pgoff = 0, inode = 1065255 }
+vm_state.vm_map: 13589.827584437 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3047985152, end = 3047989248, flags = 135266419, pgoff = 172032, inode = 1065255 }
+vm_state.vm_map: 13589.827586444 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3047989248, end = 3048235008, flags = 134217845, pgoff = 0, inode = 20603 }
+vm_state.vm_map: 13589.827588735 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3048235008, end = 3048239104, flags = 135266419, pgoff = 245760, inode = 20603 }
+vm_state.vm_map: 13589.827590729 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3048239104, end = 3048710144, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 13589.827592896 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3048710144, end = 3048726528, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 13589.827594971 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3048726528, end = 3048869888, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 13589.827597138 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3048869888, end = 3048873984, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 13589.827599126 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3048873984, end = 3048960000, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 13589.827601411 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3048960000, end = 3048964096, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 13589.827603448 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3048964096, end = 3048968192, flags = 1048691, pgoff = 3048964096, inode = 0 }
+vm_state.vm_map: 13589.827605498 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3048968192, end = 3048984576, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 13589.827608023 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3048984576, end = 3048988672, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 13589.827610079 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3048988672, end = 3049021440, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 13589.827612105 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3049021440, end = 3049025536, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 13589.827614253 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3049025536, end = 3049041920, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 13589.827616279 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3049041920, end = 3049046016, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 13589.827618329 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3049046016, end = 3049132032, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 13589.827620576 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3049132032, end = 3049136128, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 13589.827622761 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3049136128, end = 3049144320, flags = 1048691, pgoff = 3049136128, inode = 0 }
+vm_state.vm_map: 13589.827624947 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3049144320, end = 3049172992, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 13589.827626892 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3049172992, end = 3049177088, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 13589.827629164 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3049177088, end = 3049181184, flags = 1048691, pgoff = 3049177088, inode = 0 }
+vm_state.vm_map: 13589.827631122 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3049181184, end = 3049512960, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 13589.827633283 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3049512960, end = 3049521152, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 13589.827635339 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3049521152, end = 3049553920, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 13589.827637499 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3049553920, end = 3049558016, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 13589.827639475 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3049558016, end = 3049574400, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 13589.827642105 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3049574400, end = 3049578496, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 13589.827644161 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3049578496, end = 3049603072, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 13589.827646186 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3049603072, end = 3049607168, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 13589.827648328 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3049607168, end = 3049639936, flags = 134217845, pgoff = 0, inode = 18621 }
+vm_state.vm_map: 13589.827650355 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3049639936, end = 3049644032, flags = 135266419, pgoff = 28672, inode = 18621 }
+vm_state.vm_map: 13589.827652392 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3049644032, end = 3049648128, flags = 1048691, pgoff = 3049644032, inode = 0 }
+vm_state.vm_map: 13589.827654455 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3049648128, end = 3050078208, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 13589.827656584 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3050078208, end = 3050106880, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 13589.827658691 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3050106880, end = 3050110976, flags = 1048691, pgoff = 3050106880, inode = 0 }
+vm_state.vm_map: 13589.827663111 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3050110976, end = 3050553344, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 13589.827665154 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3050553344, end = 3050561536, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 13589.827667266 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3050561536, end = 3050659840, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.827669396 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3050659840, end = 3050663936, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.827671459 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3050663936, end = 3050934272, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 13589.827673607 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3050934272, end = 3050942464, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 13589.827675910 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3050942464, end = 3051003904, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 13589.827678113 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3051003904, end = 3051008000, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 13589.827680275 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3051008000, end = 3051012096, flags = 1048691, pgoff = 3051008000, inode = 0 }
+vm_state.vm_map: 13589.827682331 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3051012096, end = 3051479040, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 13589.827684270 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3051479040, end = 3051487232, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 13589.827686468 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3051487232, end = 3052617728, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 13589.827688530 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3052617728, end = 3052634112, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 13589.827690740 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3052634112, end = 3052748800, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.827692692 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3052748800, end = 3052752896, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.827695013 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3052752896, end = 3052900352, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.827696965 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3052900352, end = 3052904448, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.827699132 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3052904448, end = 3052908544, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.827701262 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3052908544, end = 3052916736, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.827703423 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3052916736, end = 3052920832, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.827705387 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3052920832, end = 3052924928, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.827707683 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3052924928, end = 3052929024, flags = 1048691, pgoff = 3052924928, inode = 0 }
+vm_state.vm_map: 13589.827709992 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3052929024, end = 3053015040, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.827712178 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3053015040, end = 3053019136, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.827714240 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3053019136, end = 3053023232, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.827716413 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3053023232, end = 3053031424, flags = 1048691, pgoff = 3053023232, inode = 0 }
+vm_state.vm_map: 13589.827718383 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3053031424, end = 3053776896, flags = 134217845, pgoff = 0, inode = 499794 }
+vm_state.vm_map: 13589.827720661 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3053776896, end = 3053780992, flags = 135266419, pgoff = 745472, inode = 499794 }
+vm_state.vm_map: 13589.827722699 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3053780992, end = 3053809664, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.827724860 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3053809664, end = 3053813760, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.827726799 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3053813760, end = 3053817856, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.827729077 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3053817856, end = 3053834240, flags = 134217845, pgoff = 0, inode = 20149 }
+vm_state.vm_map: 13589.827731016 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3053834240, end = 3053838336, flags = 135266419, pgoff = 12288, inode = 20149 }
+vm_state.vm_map: 13589.827733220 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3053838336, end = 3053920256, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.827735338 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3053920256, end = 3053924352, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.827737412 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3053924352, end = 3055239168, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.827739370 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3055239168, end = 3055247360, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.827741667 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3055247360, end = 3055251456, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.827743951 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3055251456, end = 3055267840, flags = 1048691, pgoff = 3055251456, inode = 0 }
+vm_state.vm_map: 13589.827746155 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3055267840, end = 3056205824, flags = 134217845, pgoff = 0, inode = 16850 }
+vm_state.vm_map: 13589.827748291 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3056205824, end = 3056222208, flags = 135266417, pgoff = 937984, inode = 16850 }
+vm_state.vm_map: 13589.827750323 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3056222208, end = 3056226304, flags = 135266419, pgoff = 954368, inode = 16850 }
+vm_state.vm_map: 13589.827752287 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3056226304, end = 3056254976, flags = 1048691, pgoff = 3056226304, inode = 0 }
+vm_state.vm_map: 13589.827754472 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3056254976, end = 3066294272, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 13589.827756534 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3066294272, end = 3066454016, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 13589.827758701 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3066454016, end = 3066462208, flags = 1048691, pgoff = 3066454016, inode = 0 }
+vm_state.vm_map: 13589.827760820 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3066462208, end = 3070058496, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 13589.827762987 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3070058496, end = 3070156800, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 13589.827765129 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3070156800, end = 3070160896, flags = 1048691, pgoff = 3070156800, inode = 0 }
+vm_state.vm_map: 13589.827767197 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3070160896, end = 3072716800, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 13589.827769241 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3072716800, end = 3072765952, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 13589.827771391 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3072765952, end = 3072770048, flags = 1048691, pgoff = 3072765952, inode = 0 }
+vm_state.vm_map: 13589.827773373 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3072770048, end = 3073921024, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.827775540 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3073921024, end = 3073937408, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.827777922 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3073937408, end = 3074170880, flags = 134217845, pgoff = 0, inode = 1065180 }
+vm_state.vm_map: 13589.827780114 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3074170880, end = 3074179072, flags = 135266419, pgoff = 233472, inode = 1065180 }
+vm_state.vm_map: 13589.827782140 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3074179072, end = 3074183168, flags = 1048691, pgoff = 3074179072, inode = 0 }
+vm_state.vm_map: 13589.827784208 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3074183168, end = 3076485120, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 13589.827786270 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3076485120, end = 3076530176, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 13589.827788456 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3076530176, end = 3078840320, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 13589.827790395 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3078840320, end = 3078868992, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 13589.827792722 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3078868992, end = 3078873088, flags = 1048691, pgoff = 3078868992, inode = 0 }
+vm_state.vm_map: 13589.827794852 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3078877184, end = 3078889472, flags = 134217937, pgoff = 0, inode = 1196315 }
+vm_state.vm_map: 13589.827797050 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3078889472, end = 3078897664, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 13589.827798989 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3078897664, end = 3078901760, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 13589.827801292 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3078901760, end = 3078918144, flags = 134217845, pgoff = 0, inode = 22094 }
+vm_state.vm_map: 13589.827803336 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3078918144, end = 3078922240, flags = 135266419, pgoff = 12288, inode = 22094 }
+vm_state.vm_map: 13589.827805398 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3078922240, end = 3078930432, flags = 134217845, pgoff = 0, inode = 1450546 }
+vm_state.vm_map: 13589.827807553 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3078930432, end = 3078934528, flags = 135266417, pgoff = 4096, inode = 1450546 }
+vm_state.vm_map: 13589.827809572 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3078934528, end = 3078938624, flags = 135266419, pgoff = 8192, inode = 1450546 }
+vm_state.vm_map: 13589.827811998 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3078938624, end = 3078967296, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.827814184 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3078967296, end = 3078975488, flags = 1048691, pgoff = 3078967296, inode = 0 }
+vm_state.vm_map: 13589.827816215 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3078975488, end = 3078979584, flags = 67371125, pgoff = 3078975488, inode = 0 }
+vm_state.vm_map: 13589.827818302 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3078979584, end = 3079094272, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.827820346 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3079094272, end = 3079098368, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.827822624 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3079098368, end = 3079102464, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.827824662 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2228, start = 3214217216, end = 3214303232, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.827827192 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 134512640, end = 134553600, flags = 134223989, pgoff = 0, inode = 20759 }
+vm_state.vm_map: 13589.827829138 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 134553600, end = 134557696, flags = 135272563, pgoff = 36864, inode = 20759 }
+vm_state.vm_map: 13589.827831421 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 134557696, end = 134565888, flags = 1048691, pgoff = 134557696, inode = 0 }
+vm_state.vm_map: 13589.827833466 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 145301504, end = 147578880, flags = 1048691, pgoff = 145301504, inode = 0 }
+vm_state.vm_map: 13589.827835780 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 2998648832, end = 2998689792, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.827837855 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 2998689792, end = 2998693888, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.827840022 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 2998693888, end = 2998697984, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.827842330 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 2998697984, end = 2998734848, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.827844375 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 2998734848, end = 2998738944, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.827846659 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 2998738944, end = 2998743040, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.827848998 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 2998743040, end = 2998767616, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.827851049 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 2998767616, end = 2998771712, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.827853068 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 2998771712, end = 2998775808, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.827855383 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 2998775808, end = 3015016448, flags = 134217979, pgoff = 0, inode = 1204527 }
+vm_state.vm_map: 13589.827857556 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3015016448, end = 3019313152, flags = 134217979, pgoff = 0, inode = 1204522 }
+vm_state.vm_map: 13589.827859790 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019313152, end = 3019513856, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 13589.827861834 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019513856, end = 3019517952, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 13589.827864063 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019517952, end = 3019550720, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 13589.827866162 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019550720, end = 3019554816, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 13589.827868366 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019554816, end = 3019579392, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 13589.827870527 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019579392, end = 3019583488, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 13589.827872749 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019595776, end = 3019677696, flags = 134217841, pgoff = 0, inode = 98443 }
+vm_state.vm_map: 13589.827875145 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019677696, end = 3019681792, flags = 134217937, pgoff = 0, inode = 1196317 }
+vm_state.vm_map: 13589.827877349 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019681792, end = 3019706368, flags = 134217937, pgoff = 0, inode = 1196229 }
+vm_state.vm_map: 13589.827879497 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019706368, end = 3019710464, flags = 134217937, pgoff = 0, inode = 1196235 }
+vm_state.vm_map: 13589.827881997 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019710464, end = 3019714560, flags = 134217937, pgoff = 0, inode = 1196204 }
+vm_state.vm_map: 13589.827884287 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019714560, end = 3019718656, flags = 134217937, pgoff = 0, inode = 1196228 }
+vm_state.vm_map: 13589.827886423 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019718656, end = 3019722752, flags = 134217937, pgoff = 0, inode = 1196227 }
+vm_state.vm_map: 13589.827888590 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019722752, end = 3019730944, flags = 134217937, pgoff = 0, inode = 1196198 }
+vm_state.vm_map: 13589.827890856 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019730944, end = 3019763712, flags = 134217937, pgoff = 0, inode = 1196200 }
+vm_state.vm_map: 13589.827892999 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019763712, end = 3019776000, flags = 134217937, pgoff = 0, inode = 1196226 }
+vm_state.vm_map: 13589.827895147 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019776000, end = 3019784192, flags = 134217937, pgoff = 0, inode = 1196225 }
+vm_state.vm_map: 13589.827897400 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019784192, end = 3019788288, flags = 134217937, pgoff = 0, inode = 1196224 }
+vm_state.vm_map: 13589.827899672 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019788288, end = 3019792384, flags = 134217937, pgoff = 0, inode = 1196223 }
+vm_state.vm_map: 13589.827901815 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019792384, end = 3019796480, flags = 134217937, pgoff = 0, inode = 1196202 }
+vm_state.vm_map: 13589.827903982 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019796480, end = 3019825152, flags = 134217937, pgoff = 0, inode = 1196222 }
+vm_state.vm_map: 13589.827906124 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019825152, end = 3019837440, flags = 134217937, pgoff = 0, inode = 1196221 }
+vm_state.vm_map: 13589.827908309 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019837440, end = 3019841536, flags = 134217937, pgoff = 0, inode = 1196220 }
+vm_state.vm_map: 13589.827910452 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019841536, end = 3019849728, flags = 134217937, pgoff = 0, inode = 1196219 }
+vm_state.vm_map: 13589.827912612 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019849728, end = 3019853824, flags = 134217937, pgoff = 0, inode = 1196210 }
+vm_state.vm_map: 13589.827914780 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019853824, end = 3019857920, flags = 134217937, pgoff = 0, inode = 1196205 }
+vm_state.vm_map: 13589.827917421 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019857920, end = 3019870208, flags = 134217937, pgoff = 0, inode = 1196244 }
+vm_state.vm_map: 13589.827919594 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019870208, end = 3019878400, flags = 134217937, pgoff = 0, inode = 1196270 }
+vm_state.vm_map: 13589.827921792 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019878400, end = 3019911168, flags = 134217937, pgoff = 0, inode = 1196246 }
+vm_state.vm_map: 13589.827923952 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019911168, end = 3019931648, flags = 134217937, pgoff = 0, inode = 1196269 }
+vm_state.vm_map: 13589.827926108 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019931648, end = 3019939840, flags = 134217937, pgoff = 0, inode = 1196316 }
+vm_state.vm_map: 13589.827928287 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019939840, end = 3019968512, flags = 134217937, pgoff = 0, inode = 1196197 }
+vm_state.vm_map: 13589.827930460 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3019968512, end = 3020013568, flags = 134217937, pgoff = 0, inode = 1196312 }
+vm_state.vm_map: 13589.827932621 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3020013568, end = 3020070912, flags = 134217937, pgoff = 0, inode = 1196272 }
+vm_state.vm_map: 13589.827934721 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3020070912, end = 3020140544, flags = 134217845, pgoff = 0, inode = 508763 }
+vm_state.vm_map: 13589.827936888 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3020140544, end = 3020144640, flags = 135266417, pgoff = 65536, inode = 508763 }
+vm_state.vm_map: 13589.827938981 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3020144640, end = 3020148736, flags = 135266419, pgoff = 69632, inode = 508763 }
+vm_state.vm_map: 13589.827941037 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3020148736, end = 3020156928, flags = 1048691, pgoff = 3020148736, inode = 0 }
+vm_state.vm_map: 13589.827943168 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3020156928, end = 3020177408, flags = 134217845, pgoff = 0, inode = 21278 }
+vm_state.vm_map: 13589.827945458 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3020177408, end = 3020181504, flags = 135266419, pgoff = 16384, inode = 21278 }
+vm_state.vm_map: 13589.827947754 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3020181504, end = 3020345344, flags = 134217845, pgoff = 0, inode = 21283 }
+vm_state.vm_map: 13589.827949705 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3020345344, end = 3020349440, flags = 135266419, pgoff = 159744, inode = 21283 }
+vm_state.vm_map: 13589.827952137 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3020349440, end = 3021312000, flags = 134217845, pgoff = 0, inode = 21285 }
+vm_state.vm_map: 13589.827954255 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3021312000, end = 3021369344, flags = 135266419, pgoff = 962560, inode = 21285 }
+vm_state.vm_map: 13589.827956342 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3021369344, end = 3021692928, flags = 134217845, pgoff = 0, inode = 21280 }
+vm_state.vm_map: 13589.827958478 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3021692928, end = 3021697024, flags = 135266419, pgoff = 323584, inode = 21280 }
+vm_state.vm_map: 13589.827960854 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3021697024, end = 3021774848, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.827962898 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3021774848, end = 3021778944, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.827964844 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3021778944, end = 3021783040, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.827967030 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3021783040, end = 3021791232, flags = 1048691, pgoff = 3021783040, inode = 0 }
+vm_state.vm_map: 13589.827969209 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3021791232, end = 3021803520, flags = 134217845, pgoff = 0, inode = 499779 }
+vm_state.vm_map: 13589.827971246 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3021803520, end = 3021807616, flags = 135266419, pgoff = 8192, inode = 499779 }
+vm_state.vm_map: 13589.827973377 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3021807616, end = 3021828096, flags = 134217845, pgoff = 0, inode = 18127 }
+vm_state.vm_map: 13589.827975538 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3021828096, end = 3021832192, flags = 135266419, pgoff = 16384, inode = 18127 }
+vm_state.vm_map: 13589.827977736 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3021832192, end = 3022057472, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.827979779 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3022057472, end = 3022061568, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.827981860 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3022061568, end = 3022065664, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.827984144 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3022065664, end = 3022082048, flags = 134217845, pgoff = 0, inode = 21276 }
+vm_state.vm_map: 13589.827986527 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3022082048, end = 3022086144, flags = 135266419, pgoff = 12288, inode = 21276 }
+vm_state.vm_map: 13589.827988700 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3022086144, end = 3022483456, flags = 134217845, pgoff = 0, inode = 24050 }
+vm_state.vm_map: 13589.827990744 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3022483456, end = 3022491648, flags = 135266419, pgoff = 397312, inode = 24050 }
+vm_state.vm_map: 13589.827992783 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3022491648, end = 3022508032, flags = 1048691, pgoff = 3022491648, inode = 0 }
+vm_state.vm_map: 13589.827994949 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3022508032, end = 3022536704, flags = 134217845, pgoff = 0, inode = 499851 }
+vm_state.vm_map: 13589.827996987 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3022536704, end = 3022540800, flags = 135266419, pgoff = 28672, inode = 499851 }
+vm_state.vm_map: 13589.827999339 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3022540800, end = 3022843904, flags = 134217845, pgoff = 0, inode = 24049 }
+vm_state.vm_map: 13589.828001505 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3022843904, end = 3022848000, flags = 135266419, pgoff = 299008, inode = 24049 }
+vm_state.vm_map: 13589.828003672 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3022848000, end = 3023650816, flags = 134217845, pgoff = 0, inode = 21274 }
+vm_state.vm_map: 13589.828005723 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3023650816, end = 3023667200, flags = 135266419, pgoff = 802816, inode = 21274 }
+vm_state.vm_map: 13589.828007668 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3023667200, end = 3023904768, flags = 1048691, pgoff = 3023904768, inode = 0 }
+vm_state.vm_map: 13589.828009958 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3023908864, end = 3024171008, flags = 134217845, pgoff = 0, inode = 24048 }
+vm_state.vm_map: 13589.828011985 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3024171008, end = 3024175104, flags = 135266419, pgoff = 262144, inode = 24048 }
+vm_state.vm_map: 13589.828014478 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3024175104, end = 3024257024, flags = 134217845, pgoff = 0, inode = 19186 }
+vm_state.vm_map: 13589.828016460 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3024257024, end = 3024261120, flags = 135266419, pgoff = 77824, inode = 19186 }
+vm_state.vm_map: 13589.828021914 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3024261120, end = 3024564224, flags = 134217845, pgoff = 0, inode = 24371 }
+vm_state.vm_map: 13589.828024063 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3024564224, end = 3024576512, flags = 135266419, pgoff = 303104, inode = 24371 }
+vm_state.vm_map: 13589.828026144 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3024576512, end = 3024609280, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 13589.828028188 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3024609280, end = 3024613376, flags = 135266419, pgoff = 32768, inode = 20716 }
+vm_state.vm_map: 13589.828030244 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3024613376, end = 3025133568, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 13589.828032281 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3025133568, end = 3025141760, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 13589.828034338 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3025141760, end = 3025506304, flags = 134217845, pgoff = 0, inode = 1065038 }
+vm_state.vm_map: 13589.828036376 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3025506304, end = 3025543168, flags = 135266423, pgoff = 364544, inode = 1065038 }
+vm_state.vm_map: 13589.828038420 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3025543168, end = 3025547264, flags = 1048695, pgoff = 3025543168, inode = 0 }
+vm_state.vm_map: 13589.828040470 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3025547264, end = 3026100224, flags = 134217845, pgoff = 0, inode = 18947 }
+vm_state.vm_map: 13589.828042513 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3026100224, end = 3026120704, flags = 135266419, pgoff = 548864, inode = 18947 }
+vm_state.vm_map: 13589.828044491 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3026120704, end = 3026436096, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 13589.828046651 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3026436096, end = 3026444288, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 13589.828048818 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3026444288, end = 3026513920, flags = 134217845, pgoff = 0, inode = 1065123 }
+vm_state.vm_map: 13589.828050843 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3026513920, end = 3026518016, flags = 135266419, pgoff = 69632, inode = 1065123 }
+vm_state.vm_map: 13589.828052899 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3026518016, end = 3041013760, flags = 134217845, pgoff = 0, inode = 20672 }
+vm_state.vm_map: 13589.828055406 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3041013760, end = 3041628160, flags = 135266419, pgoff = 14495744, inode = 20672 }
+vm_state.vm_map: 13589.828057443 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3041628160, end = 3041636352, flags = 1048691, pgoff = 3041628160, inode = 0 }
+vm_state.vm_map: 13589.828059512 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3041636352, end = 3042009088, flags = 134217845, pgoff = 0, inode = 20902 }
+vm_state.vm_map: 13589.828061599 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3042009088, end = 3042021376, flags = 135266419, pgoff = 368640, inode = 20902 }
+vm_state.vm_map: 13589.828064000 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3042033664, end = 3042041856, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 13589.828066031 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3042041856, end = 3042045952, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 13589.828068199 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3042045952, end = 3042058240, flags = 134217937, pgoff = 0, inode = 1196315 }
+vm_state.vm_map: 13589.828070415 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3042058240, end = 3042115584, flags = 134217937, pgoff = 0, inode = 1196231 }
+vm_state.vm_map: 13589.828072600 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3042115584, end = 3044098048, flags = 134217845, pgoff = 0, inode = 20915 }
+vm_state.vm_map: 13589.828074773 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3044098048, end = 3044139008, flags = 135266419, pgoff = 1978368, inode = 20915 }
+vm_state.vm_map: 13589.828076953 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3044139008, end = 3045470208, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.828078917 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3045470208, end = 3045486592, flags = 1048691, pgoff = 3045470208, inode = 0 }
+vm_state.vm_map: 13589.828081225 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3045486592, end = 3045634048, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.828083386 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3045634048, end = 3045642240, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.828085448 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3045642240, end = 3045961728, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 13589.828087493 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3045961728, end = 3045978112, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 13589.828089906 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3045978112, end = 3045990400, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 13589.828091944 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3045990400, end = 3045994496, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 13589.828094031 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3045994496, end = 3047251968, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 13589.828095989 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3047251968, end = 3047272448, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 13589.828098279 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3047272448, end = 3047280640, flags = 1048691, pgoff = 3047272448, inode = 0 }
+vm_state.vm_map: 13589.828100274 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3047280640, end = 3047518208, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 13589.828102440 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3047518208, end = 3047522304, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 13589.828104442 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3047522304, end = 3047538688, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.828106615 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3047538688, end = 3047542784, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.828108597 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3047542784, end = 3047550976, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.828110893 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3047550976, end = 3047555072, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.828112882 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3047555072, end = 3047747584, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.828115173 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3047747584, end = 3047751680, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.828117253 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3047751680, end = 3047804928, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 13589.828119420 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3047804928, end = 3047809024, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 13589.828121507 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3047809024, end = 3047813120, flags = 1048691, pgoff = 3047809024, inode = 0 }
+vm_state.vm_map: 13589.828124154 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3047813120, end = 3047985152, flags = 134217845, pgoff = 0, inode = 1065255 }
+vm_state.vm_map: 13589.828126125 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3047985152, end = 3047989248, flags = 135266419, pgoff = 172032, inode = 1065255 }
+vm_state.vm_map: 13589.828128433 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3047989248, end = 3048235008, flags = 134217845, pgoff = 0, inode = 20603 }
+vm_state.vm_map: 13589.828130391 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3048235008, end = 3048239104, flags = 135266419, pgoff = 245760, inode = 20603 }
+vm_state.vm_map: 13589.828132589 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3048239104, end = 3048710144, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 13589.828134675 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3048710144, end = 3048726528, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 13589.828136868 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3048726528, end = 3048869888, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 13589.828138838 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3048869888, end = 3048873984, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 13589.828141122 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3048873984, end = 3048960000, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 13589.828143098 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3048960000, end = 3048964096, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 13589.828145278 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3048964096, end = 3048968192, flags = 1048691, pgoff = 3048964096, inode = 0 }
+vm_state.vm_map: 13589.828147371 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3048968192, end = 3048984576, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 13589.828149642 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3048984576, end = 3048988672, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 13589.828151618 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3048988672, end = 3049021440, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 13589.828153896 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3049021440, end = 3049025536, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 13589.828155977 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3049025536, end = 3049041920, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 13589.828158489 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3049041920, end = 3049046016, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 13589.828160447 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3049046016, end = 3049132032, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 13589.828162638 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3049132032, end = 3049136128, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 13589.828164676 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3049136128, end = 3049144320, flags = 1048691, pgoff = 3049136128, inode = 0 }
+vm_state.vm_map: 13589.828166954 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3049144320, end = 3049172992, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 13589.828168900 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3049172992, end = 3049177088, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 13589.828171079 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3049177088, end = 3049181184, flags = 1048691, pgoff = 3049177088, inode = 0 }
+vm_state.vm_map: 13589.828173043 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3049181184, end = 3049512960, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 13589.828175217 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3049512960, end = 3049521152, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 13589.828177199 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3049521152, end = 3049553920, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 13589.828179359 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3049553920, end = 3049558016, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 13589.828181379 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3049558016, end = 3049574400, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 13589.828183410 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3049574400, end = 3049578496, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 13589.828185393 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3049578496, end = 3049603072, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 13589.828187566 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3049603072, end = 3049607168, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 13589.828189616 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3049607168, end = 3049639936, flags = 134217845, pgoff = 0, inode = 18621 }
+vm_state.vm_map: 13589.828192122 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3049639936, end = 3049644032, flags = 135266419, pgoff = 28672, inode = 18621 }
+vm_state.vm_map: 13589.828194165 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3049644032, end = 3049648128, flags = 1048691, pgoff = 3049644032, inode = 0 }
+vm_state.vm_map: 13589.828196252 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3049648128, end = 3050078208, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 13589.828198204 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3050078208, end = 3050106880, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 13589.828200482 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3050106880, end = 3050110976, flags = 1048691, pgoff = 3050106880, inode = 0 }
+vm_state.vm_map: 13589.828202458 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3050110976, end = 3050553344, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 13589.828204637 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3050553344, end = 3050561536, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 13589.828206687 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3050561536, end = 3050659840, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.828208732 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3050659840, end = 3050663936, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.828210788 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3050663936, end = 3050934272, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 13589.828212949 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3050934272, end = 3050942464, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 13589.828215011 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3050942464, end = 3051003904, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 13589.828217042 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3051003904, end = 3051008000, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 13589.828219087 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3051008000, end = 3051012096, flags = 1048691, pgoff = 3051008000, inode = 0 }
+vm_state.vm_map: 13589.828221069 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3051012096, end = 3051479040, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 13589.828223248 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3051479040, end = 3051487232, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 13589.828225582 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3051487232, end = 3052617728, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 13589.828227675 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3052617728, end = 3052634112, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 13589.828229768 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3052634112, end = 3052748800, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.828231806 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3052748800, end = 3052752896, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.828233954 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3052752896, end = 3052900352, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.828235949 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3052900352, end = 3052904448, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.828238049 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3052904448, end = 3052908544, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.828240111 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3052908544, end = 3052916736, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.828242149 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3052916736, end = 3052920832, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.828244125 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3052920832, end = 3052924928, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.828246262 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3052924928, end = 3052929024, flags = 1048691, pgoff = 3052924928, inode = 0 }
+vm_state.vm_map: 13589.828248440 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3052929024, end = 3053015040, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.828250485 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3053015040, end = 3053019136, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.828252646 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3053019136, end = 3053023232, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.828254757 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3053023232, end = 3053031424, flags = 1048691, pgoff = 3053023232, inode = 0 }
+vm_state.vm_map: 13589.828256825 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3053031424, end = 3053776896, flags = 134217845, pgoff = 0, inode = 499794 }
+vm_state.vm_map: 13589.828259233 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3053776896, end = 3053780992, flags = 135266419, pgoff = 745472, inode = 499794 }
+vm_state.vm_map: 13589.828261474 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3053780992, end = 3053809664, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.828263518 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3053809664, end = 3053813760, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.828265555 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3053813760, end = 3053817856, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.828267618 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3053817856, end = 3053834240, flags = 134217845, pgoff = 0, inode = 20149 }
+vm_state.vm_map: 13589.828269662 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3053834240, end = 3053838336, flags = 135266419, pgoff = 12288, inode = 20149 }
+vm_state.vm_map: 13589.828271724 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3053838336, end = 3053920256, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.828273768 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3053920256, end = 3053924352, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.828275818 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3053924352, end = 3055239168, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.828277857 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3055239168, end = 3055247360, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.828279894 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3055247360, end = 3055251456, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.828281938 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3055251456, end = 3055267840, flags = 1048691, pgoff = 3055251456, inode = 0 }
+vm_state.vm_map: 13589.828284099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3055267840, end = 3056205824, flags = 134217845, pgoff = 0, inode = 16850 }
+vm_state.vm_map: 13589.828286130 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3056205824, end = 3056222208, flags = 135266417, pgoff = 937984, inode = 16850 }
+vm_state.vm_map: 13589.828288273 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3056222208, end = 3056226304, flags = 135266419, pgoff = 954368, inode = 16850 }
+vm_state.vm_map: 13589.828290317 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3056226304, end = 3056254976, flags = 1048691, pgoff = 3056226304, inode = 0 }
+vm_state.vm_map: 13589.828292724 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3056254976, end = 3066294272, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 13589.828294762 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3066294272, end = 3066454016, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 13589.828296960 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3066454016, end = 3066462208, flags = 1048691, pgoff = 3066454016, inode = 0 }
+vm_state.vm_map: 13589.828299004 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3066462208, end = 3070058496, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 13589.828301146 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3070058496, end = 3070156800, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 13589.828303116 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3070156800, end = 3070160896, flags = 1048691, pgoff = 3070156800, inode = 0 }
+vm_state.vm_map: 13589.828305308 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3070160896, end = 3072716800, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 13589.828307333 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3072716800, end = 3072765952, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 13589.828309501 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3072765952, end = 3072770048, flags = 1048691, pgoff = 3072765952, inode = 0 }
+vm_state.vm_map: 13589.828311575 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3072770048, end = 3073921024, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.828313742 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3073921024, end = 3073937408, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.828315921 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3073937408, end = 3074170880, flags = 134217845, pgoff = 0, inode = 1065180 }
+vm_state.vm_map: 13589.828317948 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3074170880, end = 3074179072, flags = 135266419, pgoff = 233472, inode = 1065180 }
+vm_state.vm_map: 13589.828319984 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3074179072, end = 3074183168, flags = 1048691, pgoff = 3074179072, inode = 0 }
+vm_state.vm_map: 13589.828322164 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3074183168, end = 3076485120, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 13589.828324202 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3076485120, end = 3076530176, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 13589.828326603 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3076530176, end = 3078840320, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 13589.828328751 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3078840320, end = 3078868992, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 13589.828330808 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3078868992, end = 3078873088, flags = 1048691, pgoff = 3078868992, inode = 0 }
+vm_state.vm_map: 13589.828333190 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3078873088, end = 3078885376, flags = 134217845, pgoff = 0, inode = 24046 }
+vm_state.vm_map: 13589.828335345 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3078885376, end = 3078889472, flags = 135266419, pgoff = 8192, inode = 24046 }
+vm_state.vm_map: 13589.828337321 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3078889472, end = 3078897664, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 13589.828339488 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3078897664, end = 3078901760, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 13589.828341631 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3078901760, end = 3078918144, flags = 134217845, pgoff = 0, inode = 22094 }
+vm_state.vm_map: 13589.828343767 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3078918144, end = 3078922240, flags = 135266419, pgoff = 12288, inode = 22094 }
+vm_state.vm_map: 13589.828345829 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3078922240, end = 3078930432, flags = 134217845, pgoff = 0, inode = 1450546 }
+vm_state.vm_map: 13589.828347855 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3078930432, end = 3078934528, flags = 135266417, pgoff = 4096, inode = 1450546 }
+vm_state.vm_map: 13589.828349986 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3078934528, end = 3078938624, flags = 135266419, pgoff = 8192, inode = 1450546 }
+vm_state.vm_map: 13589.828352042 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3078938624, end = 3078967296, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.828354079 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3078967296, end = 3078975488, flags = 1048691, pgoff = 3078967296, inode = 0 }
+vm_state.vm_map: 13589.828356221 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3078975488, end = 3078979584, flags = 67371125, pgoff = 3078975488, inode = 0 }
+vm_state.vm_map: 13589.828358309 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3078979584, end = 3079094272, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.828360685 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3079094272, end = 3079098368, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.828362828 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3079098368, end = 3079102464, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.828378803 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2237, start = 3214217216, end = 3214303232, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.828385101 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 134512640, end = 134533120, flags = 134223989, pgoff = 0, inode = 1352628 }
+vm_state.vm_map: 13589.828387108 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 134533120, end = 134537216, flags = 135272563, pgoff = 16384, inode = 1352628 }
+vm_state.vm_map: 13589.828389275 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 160477184, end = 162349056, flags = 1048691, pgoff = 160477184, inode = 0 }
+vm_state.vm_map: 13589.828391332 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3033907200, end = 3034677248, flags = 1048691, pgoff = 3033907200, inode = 0 }
+vm_state.vm_map: 13589.828393677 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3034677248, end = 3034689536, flags = 134217845, pgoff = 0, inode = 20765 }
+vm_state.vm_map: 13589.828395654 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3034689536, end = 3034693632, flags = 135266419, pgoff = 8192, inode = 20765 }
+vm_state.vm_map: 13589.828398092 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3034693632, end = 3034755072, flags = 134217845, pgoff = 0, inode = 19423 }
+vm_state.vm_map: 13589.828400087 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3034755072, end = 3034759168, flags = 135266419, pgoff = 57344, inode = 19423 }
+vm_state.vm_map: 13589.828402518 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3034759168, end = 3034767360, flags = 134217845, pgoff = 0, inode = 500018 }
+vm_state.vm_map: 13589.828404513 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3034767360, end = 3034771456, flags = 135266419, pgoff = 4096, inode = 500018 }
+vm_state.vm_map: 13589.828406907 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3034771456, end = 3034796032, flags = 134217845, pgoff = 0, inode = 18679 }
+vm_state.vm_map: 13589.828408877 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3034796032, end = 3034800128, flags = 135266419, pgoff = 20480, inode = 18679 }
+vm_state.vm_map: 13589.828411770 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3034800128, end = 3034963968, flags = 134217845, pgoff = 0, inode = 18646 }
+vm_state.vm_map: 13589.828413791 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3034963968, end = 3034968064, flags = 135266419, pgoff = 163840, inode = 18646 }
+vm_state.vm_map: 13589.828415957 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3034968064, end = 3035631616, flags = 134217845, pgoff = 0, inode = 18913 }
+vm_state.vm_map: 13589.828417952 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3035631616, end = 3035656192, flags = 135266419, pgoff = 659456, inode = 18913 }
+vm_state.vm_map: 13589.828420371 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3035656192, end = 3035746304, flags = 134217845, pgoff = 0, inode = 19203 }
+vm_state.vm_map: 13589.828422397 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3035746304, end = 3035750400, flags = 135266419, pgoff = 86016, inode = 19203 }
+vm_state.vm_map: 13589.828424737 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3035750400, end = 3035820032, flags = 134217845, pgoff = 0, inode = 508763 }
+vm_state.vm_map: 13589.828426719 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3035820032, end = 3035824128, flags = 135266417, pgoff = 65536, inode = 508763 }
+vm_state.vm_map: 13589.828428960 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3035824128, end = 3035828224, flags = 135266419, pgoff = 69632, inode = 508763 }
+vm_state.vm_map: 13589.828430912 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3035828224, end = 3035836416, flags = 1048691, pgoff = 3035828224, inode = 0 }
+vm_state.vm_map: 13589.828433313 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3035836416, end = 3036299264, flags = 134217845, pgoff = 0, inode = 20061 }
+vm_state.vm_map: 13589.828435283 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3036299264, end = 3036311552, flags = 135266419, pgoff = 458752, inode = 20061 }
+vm_state.vm_map: 13589.828437579 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3036311552, end = 3036917760, flags = 134217845, pgoff = 0, inode = 22471 }
+vm_state.vm_map: 13589.828439536 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3036917760, end = 3036934144, flags = 135266419, pgoff = 602112, inode = 22471 }
+vm_state.vm_map: 13589.828441827 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3036934144, end = 3037097984, flags = 134217845, pgoff = 0, inode = 18977 }
+vm_state.vm_map: 13589.828443797 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3037097984, end = 3037102080, flags = 135266419, pgoff = 163840, inode = 18977 }
+vm_state.vm_map: 13589.828446617 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3037102080, end = 3037368320, flags = 134217845, pgoff = 0, inode = 19433 }
+vm_state.vm_map: 13589.828448654 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3037368320, end = 3037376512, flags = 135266419, pgoff = 262144, inode = 19433 }
+vm_state.vm_map: 13589.828450828 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3037376512, end = 3037380608, flags = 1048691, pgoff = 3037376512, inode = 0 }
+vm_state.vm_map: 13589.828452958 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3037380608, end = 3037429760, flags = 134217845, pgoff = 0, inode = 19447 }
+vm_state.vm_map: 13589.828455119 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3037429760, end = 3037433856, flags = 135266419, pgoff = 49152, inode = 19447 }
+vm_state.vm_map: 13589.828457353 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3037433856, end = 3037630464, flags = 134217845, pgoff = 0, inode = 19429 }
+vm_state.vm_map: 13589.828459514 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3037630464, end = 3037634560, flags = 135266419, pgoff = 192512, inode = 19429 }
+vm_state.vm_map: 13589.828461724 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3037634560, end = 3038892032, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 13589.828463886 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3038892032, end = 3038912512, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 13589.828465856 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3038912512, end = 3038916608, flags = 1048691, pgoff = 3038912512, inode = 0 }
+vm_state.vm_map: 13589.828468195 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3038916608, end = 3039141888, flags = 134217845, pgoff = 0, inode = 20835 }
+vm_state.vm_map: 13589.828470171 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3039141888, end = 3039145984, flags = 135266419, pgoff = 221184, inode = 20835 }
+vm_state.vm_map: 13589.828472473 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3039145984, end = 3039399936, flags = 134217845, pgoff = 0, inode = 18395 }
+vm_state.vm_map: 13589.828474419 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3039399936, end = 3039404032, flags = 135266419, pgoff = 249856, inode = 18395 }
+vm_state.vm_map: 13589.828476783 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3039404032, end = 3039789056, flags = 134217845, pgoff = 0, inode = 20862 }
+vm_state.vm_map: 13589.828478803 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3039789056, end = 3039793152, flags = 135266419, pgoff = 380928, inode = 20862 }
+vm_state.vm_map: 13589.828481426 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3039793152, end = 3039821824, flags = 134217845, pgoff = 0, inode = 1065218 }
+vm_state.vm_map: 13589.828483451 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3039821824, end = 3039825920, flags = 135266419, pgoff = 28672, inode = 1065218 }
+vm_state.vm_map: 13589.828485630 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3039825920, end = 3041271808, flags = 134217845, pgoff = 0, inode = 22753 }
+vm_state.vm_map: 13589.828487606 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3041271808, end = 3041284096, flags = 135266419, pgoff = 1441792, inode = 22753 }
+vm_state.vm_map: 13589.828489902 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3041284096, end = 3041677312, flags = 134217845, pgoff = 0, inode = 23655 }
+vm_state.vm_map: 13589.828491848 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3041677312, end = 3041685504, flags = 135266419, pgoff = 393216, inode = 23655 }
+vm_state.vm_map: 13589.828494194 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3041685504, end = 3041906688, flags = 134217845, pgoff = 0, inode = 20840 }
+vm_state.vm_map: 13589.828496158 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3041906688, end = 3041910784, flags = 135266419, pgoff = 221184, inode = 20840 }
+vm_state.vm_map: 13589.828498472 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3041910784, end = 3042115584, flags = 134217845, pgoff = 0, inode = 20867 }
+vm_state.vm_map: 13589.828500436 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3042115584, end = 3042119680, flags = 135266419, pgoff = 204800, inode = 20867 }
+vm_state.vm_map: 13589.828503151 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3042213888, end = 3043295232, flags = 134217845, pgoff = 0, inode = 20763 }
+vm_state.vm_map: 13589.828505257 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3043295232, end = 3043319808, flags = 135266419, pgoff = 1081344, inode = 20763 }
+vm_state.vm_map: 13589.828507424 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3043319808, end = 3043323904, flags = 1048691, pgoff = 3043319808, inode = 0 }
+vm_state.vm_map: 13589.828509751 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3043323904, end = 3043426304, flags = 134217845, pgoff = 0, inode = 20879 }
+vm_state.vm_map: 13589.828511918 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3043426304, end = 3043430400, flags = 135266419, pgoff = 98304, inode = 20879 }
+vm_state.vm_map: 13589.828514036 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3043430400, end = 3043614720, flags = 134217845, pgoff = 0, inode = 20878 }
+vm_state.vm_map: 13589.828516542 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3043614720, end = 3043618816, flags = 135266419, pgoff = 184320, inode = 20878 }
+vm_state.vm_map: 13589.828518881 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3043618816, end = 3043725312, flags = 134217845, pgoff = 0, inode = 1114215 }
+vm_state.vm_map: 13589.828521049 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3043725312, end = 3043729408, flags = 135266419, pgoff = 102400, inode = 1114215 }
+vm_state.vm_map: 13589.828523363 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3043729408, end = 3043770368, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.828525388 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3043770368, end = 3043774464, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.828527432 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3043774464, end = 3043778560, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.828529698 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3043778560, end = 3043815424, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.828531742 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3043815424, end = 3043819520, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.828533681 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3043819520, end = 3043823616, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.828536008 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3043823616, end = 3043901440, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.828538058 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3043901440, end = 3043905536, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.828540096 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3043905536, end = 3043909632, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.828542134 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3043909632, end = 3043917824, flags = 1048691, pgoff = 3043909632, inode = 0 }
+vm_state.vm_map: 13589.828544301 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3043917824, end = 3043942400, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.828546326 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3043942400, end = 3043946496, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.828548352 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3043946496, end = 3043950592, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.828551048 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3045994496, end = 3046219776, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.828553000 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046219776, end = 3046223872, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.828554940 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046223872, end = 3046227968, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.828557396 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046227968, end = 3046428672, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 13589.828559366 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046428672, end = 3046432768, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 13589.828561663 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046432768, end = 3046457344, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 13589.828563657 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046457344, end = 3046461440, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 13589.828565898 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046461440, end = 3046469632, flags = 134217845, pgoff = 0, inode = 499720 }
+vm_state.vm_map: 13589.828567868 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046469632, end = 3046473728, flags = 135266419, pgoff = 4096, inode = 499720 }
+vm_state.vm_map: 13589.828570207 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046473728, end = 3046551552, flags = 134217845, pgoff = 0, inode = 50114 }
+vm_state.vm_map: 13589.828572159 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046551552, end = 3046555648, flags = 135266419, pgoff = 77824, inode = 50114 }
+vm_state.vm_map: 13589.828574462 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046555648, end = 3046559744, flags = 134217937, pgoff = 0, inode = 1196317 }
+vm_state.vm_map: 13589.828576696 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046559744, end = 3046584320, flags = 134217937, pgoff = 0, inode = 1196229 }
+vm_state.vm_map: 13589.828579011 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046584320, end = 3046588416, flags = 134217937, pgoff = 0, inode = 1196235 }
+vm_state.vm_map: 13589.828581141 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046588416, end = 3046592512, flags = 134217937, pgoff = 0, inode = 1196204 }
+vm_state.vm_map: 13589.828583535 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046592512, end = 3046596608, flags = 134217937, pgoff = 0, inode = 1196228 }
+vm_state.vm_map: 13589.828586319 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046596608, end = 3046600704, flags = 134217937, pgoff = 0, inode = 1196227 }
+vm_state.vm_map: 13589.828588510 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046600704, end = 3046608896, flags = 134217937, pgoff = 0, inode = 1196198 }
+vm_state.vm_map: 13589.828590911 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046608896, end = 3046641664, flags = 134217937, pgoff = 0, inode = 1196200 }
+vm_state.vm_map: 13589.828593104 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046641664, end = 3046653952, flags = 134217937, pgoff = 0, inode = 1196226 }
+vm_state.vm_map: 13589.828595375 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046653952, end = 3046662144, flags = 134217937, pgoff = 0, inode = 1196225 }
+vm_state.vm_map: 13589.828597591 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046662144, end = 3046666240, flags = 134217937, pgoff = 0, inode = 1196224 }
+vm_state.vm_map: 13589.828600078 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046666240, end = 3046670336, flags = 134217937, pgoff = 0, inode = 1196223 }
+vm_state.vm_map: 13589.828602338 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046670336, end = 3046674432, flags = 134217937, pgoff = 0, inode = 1196202 }
+vm_state.vm_map: 13589.828604585 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046674432, end = 3046703104, flags = 134217937, pgoff = 0, inode = 1196222 }
+vm_state.vm_map: 13589.828606771 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046703104, end = 3046715392, flags = 134217937, pgoff = 0, inode = 1196221 }
+vm_state.vm_map: 13589.828609048 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046715392, end = 3046719488, flags = 134217937, pgoff = 0, inode = 1196220 }
+vm_state.vm_map: 13589.828611350 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046719488, end = 3046727680, flags = 134217937, pgoff = 0, inode = 1196219 }
+vm_state.vm_map: 13589.828613560 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046727680, end = 3046731776, flags = 134217937, pgoff = 0, inode = 1196210 }
+vm_state.vm_map: 13589.828615759 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046731776, end = 3046735872, flags = 134217937, pgoff = 0, inode = 1196205 }
+vm_state.vm_map: 13589.828617914 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046735872, end = 3046748160, flags = 134217937, pgoff = 0, inode = 1196244 }
+vm_state.vm_map: 13589.828620124 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046748160, end = 3046756352, flags = 134217937, pgoff = 0, inode = 1196270 }
+vm_state.vm_map: 13589.828622746 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046756352, end = 3046789120, flags = 134217937, pgoff = 0, inode = 1196246 }
+vm_state.vm_map: 13589.828625012 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046789120, end = 3046809600, flags = 134217937, pgoff = 0, inode = 1196269 }
+vm_state.vm_map: 13589.828627432 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046809600, end = 3046817792, flags = 134217937, pgoff = 0, inode = 1196316 }
+vm_state.vm_map: 13589.828629832 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046817792, end = 3046846464, flags = 134217937, pgoff = 0, inode = 1196197 }
+vm_state.vm_map: 13589.828632123 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046846464, end = 3046891520, flags = 134217937, pgoff = 0, inode = 1196312 }
+vm_state.vm_map: 13589.828634314 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046891520, end = 3046948864, flags = 134217937, pgoff = 0, inode = 1196272 }
+vm_state.vm_map: 13589.828636740 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046948864, end = 3046961152, flags = 134217937, pgoff = 0, inode = 1196315 }
+vm_state.vm_map: 13589.828638919 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3046961152, end = 3047018496, flags = 134217937, pgoff = 0, inode = 1196231 }
+vm_state.vm_map: 13589.828641172 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3047018496, end = 3048349696, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.828643222 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3048349696, end = 3048361984, flags = 1048691, pgoff = 3048349696, inode = 0 }
+vm_state.vm_map: 13589.828645427 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3048361984, end = 3048378368, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.828647471 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3048378368, end = 3048382464, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.828649693 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3048382464, end = 3048398848, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 13589.828651731 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3048398848, end = 3048402944, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 13589.828653916 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3048402944, end = 3048435712, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 13589.828655948 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3048435712, end = 3048439808, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 13589.828658337 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3048439808, end = 3048443904, flags = 1048691, pgoff = 3048439808, inode = 0 }
+vm_state.vm_map: 13589.828660424 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3048443904, end = 3048460288, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 13589.828662369 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3048460288, end = 3048464384, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 13589.828664672 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3048464384, end = 3048796160, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 13589.828666790 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3048796160, end = 3048804352, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 13589.828671634 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3048804352, end = 3048902656, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.828673672 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3048902656, end = 3048906752, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.828676037 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3048906752, end = 3049054208, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.828678068 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3049054208, end = 3049062400, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.828680321 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3049062400, end = 3049074688, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 13589.828682297 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3049074688, end = 3049078784, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 13589.828684441 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3049078784, end = 3049082880, flags = 1048691, pgoff = 3049078784, inode = 0 }
+vm_state.vm_map: 13589.828686601 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3049082880, end = 3049091072, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.828688633 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3049091072, end = 3049095168, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.828690787 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3049095168, end = 3049414656, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 13589.828693300 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3049414656, end = 3049431040, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 13589.828695516 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3049431040, end = 3049623552, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.828697547 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3049623552, end = 3049627648, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.828699770 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3049627648, end = 3053223936, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 13589.828701955 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3053223936, end = 3053322240, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 13589.828703994 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3053322240, end = 3053326336, flags = 1048691, pgoff = 3053322240, inode = 0 }
+vm_state.vm_map: 13589.828706191 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3053326336, end = 3053613056, flags = 134217845, pgoff = 0, inode = 20877 }
+vm_state.vm_map: 13589.828708235 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3053613056, end = 3053621248, flags = 135266419, pgoff = 282624, inode = 20877 }
+vm_state.vm_map: 13589.828710272 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3053621248, end = 3053625344, flags = 1048691, pgoff = 3053621248, inode = 0 }
+vm_state.vm_map: 13589.828712476 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3053625344, end = 3054559232, flags = 134217845, pgoff = 0, inode = 20876 }
+vm_state.vm_map: 13589.828714520 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3054559232, end = 3054571520, flags = 135266419, pgoff = 933888, inode = 20876 }
+vm_state.vm_map: 13589.828716651 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3054571520, end = 3054632960, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 13589.828718818 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3054632960, end = 3054637056, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 13589.828721028 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3054637056, end = 3055767552, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 13589.828723059 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3055767552, end = 3055783936, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 13589.828725263 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3055783936, end = 3056054272, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 13589.828727634 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3056054272, end = 3056062464, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 13589.828729819 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3056062464, end = 3057213440, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.828731845 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3057213440, end = 3057229824, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.828733882 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3057229824, end = 3057233920, flags = 1048691, pgoff = 3057229824, inode = 0 }
+vm_state.vm_map: 13589.828736136 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3057233920, end = 3057287168, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 13589.828738174 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3057287168, end = 3057291264, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 13589.828740359 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3057291264, end = 3057463296, flags = 134217845, pgoff = 0, inode = 1065255 }
+vm_state.vm_map: 13589.828742397 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3057463296, end = 3057467392, flags = 135266419, pgoff = 172032, inode = 1065255 }
+vm_state.vm_map: 13589.828744619 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3057467392, end = 3057500160, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 13589.828746651 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3057500160, end = 3057504256, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 13589.828748874 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3057504256, end = 3057590272, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 13589.828750880 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3057590272, end = 3057594368, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 13589.828752980 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3057594368, end = 3057602560, flags = 1048691, pgoff = 3057594368, inode = 0 }
+vm_state.vm_map: 13589.828755160 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3057602560, end = 3057631232, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 13589.828757185 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3057631232, end = 3057635328, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 13589.828759487 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3057635328, end = 3057881088, flags = 134217845, pgoff = 0, inode = 20603 }
+vm_state.vm_map: 13589.828761857 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3057881088, end = 3057885184, flags = 135266419, pgoff = 245760, inode = 20603 }
+vm_state.vm_map: 13589.828764031 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3057885184, end = 3057889280, flags = 1048691, pgoff = 3057885184, inode = 0 }
+vm_state.vm_map: 13589.828766309 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3057889280, end = 3058360320, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 13589.828768260 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3058360320, end = 3058376704, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 13589.828770649 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3058376704, end = 3058520064, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 13589.828772619 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3058520064, end = 3058524160, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 13589.828774916 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3058524160, end = 3058610176, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 13589.828776872 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3058610176, end = 3058614272, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 13589.828779206 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3058614272, end = 3058728960, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.828781182 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3058728960, end = 3058733056, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.828783657 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3058733056, end = 3058880512, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.828785603 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3058880512, end = 3058884608, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.828787770 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3058884608, end = 3058888704, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.828789943 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3058888704, end = 3058892800, flags = 1048691, pgoff = 3058888704, inode = 0 }
+vm_state.vm_map: 13589.828792325 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3058892800, end = 3058900992, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.828794265 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3058900992, end = 3058905088, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.828796893 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3058905088, end = 3058909184, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.828799079 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3058909184, end = 3058995200, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.828801246 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3058995200, end = 3058999296, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.828803185 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3058999296, end = 3059003392, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.828805372 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3059003392, end = 3059011584, flags = 1048691, pgoff = 3059003392, inode = 0 }
+vm_state.vm_map: 13589.828807569 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3059011584, end = 3059757056, flags = 134217845, pgoff = 0, inode = 499794 }
+vm_state.vm_map: 13589.828809730 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3059757056, end = 3059761152, flags = 135266419, pgoff = 745472, inode = 499794 }
+vm_state.vm_map: 13589.828812014 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3059761152, end = 3059789824, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.828814168 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3059789824, end = 3059793920, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.828816121 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3059793920, end = 3059798016, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.828818429 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3059798016, end = 3059814400, flags = 134217845, pgoff = 0, inode = 20149 }
+vm_state.vm_map: 13589.828820430 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3059814400, end = 3059818496, flags = 135266419, pgoff = 12288, inode = 20149 }
+vm_state.vm_map: 13589.828822646 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3059818496, end = 3059822592, flags = 1048691, pgoff = 3059818496, inode = 0 }
+vm_state.vm_map: 13589.828824862 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3059822592, end = 3059904512, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.828826992 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3059904512, end = 3059908608, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.828829197 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3059908608, end = 3061223424, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.828831702 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3061223424, end = 3061231616, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.828833641 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3061231616, end = 3061235712, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.828835809 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3061235712, end = 3061248000, flags = 1048691, pgoff = 3061235712, inode = 0 }
+vm_state.vm_map: 13589.828837914 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3061248000, end = 3062185984, flags = 134217845, pgoff = 0, inode = 16850 }
+vm_state.vm_map: 13589.828840100 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3062185984, end = 3062202368, flags = 135266417, pgoff = 937984, inode = 16850 }
+vm_state.vm_map: 13589.828842033 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3062202368, end = 3062206464, flags = 135266419, pgoff = 954368, inode = 16850 }
+vm_state.vm_map: 13589.828844206 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3062206464, end = 3062235136, flags = 1048691, pgoff = 3062206464, inode = 0 }
+vm_state.vm_map: 13589.828846404 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3062235136, end = 3062648832, flags = 134217845, pgoff = 0, inode = 1065120 }
+vm_state.vm_map: 13589.828848565 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3062648832, end = 3062657024, flags = 135266419, pgoff = 409600, inode = 1065120 }
+vm_state.vm_map: 13589.828850670 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3062657024, end = 3064958976, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 13589.828852831 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3064958976, end = 3065004032, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 13589.828854949 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3065004032, end = 3065470976, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 13589.828857117 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3065470976, end = 3065479168, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 13589.828859173 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3065479168, end = 3065483264, flags = 1048691, pgoff = 3065479168, inode = 0 }
+vm_state.vm_map: 13589.828861444 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3065483264, end = 3075522560, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 13589.828863463 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3075522560, end = 3075682304, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 13589.828865846 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3075682304, end = 3075690496, flags = 1048691, pgoff = 3075682304, inode = 0 }
+vm_state.vm_map: 13589.828868124 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3075690496, end = 3078000640, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 13589.828870156 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3078000640, end = 3078029312, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 13589.828872181 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3078029312, end = 3078033408, flags = 1048691, pgoff = 3078029312, inode = 0 }
+vm_state.vm_map: 13589.828874489 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3078033408, end = 3078066176, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 13589.828876503 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3078066176, end = 3078070272, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 13589.828878738 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3078070272, end = 3078078464, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 13589.828880689 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3078078464, end = 3078082560, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 13589.828883078 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3078082560, end = 3078090752, flags = 134217845, pgoff = 0, inode = 1450546 }
+vm_state.vm_map: 13589.828885029 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3078090752, end = 3078094848, flags = 135266417, pgoff = 4096, inode = 1450546 }
+vm_state.vm_map: 13589.828887190 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3078094848, end = 3078098944, flags = 135266419, pgoff = 8192, inode = 1450546 }
+vm_state.vm_map: 13589.828889284 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3078098944, end = 3078127616, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.828891457 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3078127616, end = 3078135808, flags = 1048691, pgoff = 3078127616, inode = 0 }
+vm_state.vm_map: 13589.828893408 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3078135808, end = 3078139904, flags = 67371125, pgoff = 3078135808, inode = 0 }
+vm_state.vm_map: 13589.828895723 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3078139904, end = 3078254592, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.828897693 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3078254592, end = 3078258688, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.828900205 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3078258688, end = 3078262784, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.828902169 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2239, start = 3219918848, end = 3220004864, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.828904791 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 134512640, end = 134553600, flags = 134223989, pgoff = 0, inode = 20759 }
+vm_state.vm_map: 13589.828906750 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 134553600, end = 134557696, flags = 135272563, pgoff = 36864, inode = 20759 }
+vm_state.vm_map: 13589.828908978 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 134557696, end = 134565888, flags = 1048691, pgoff = 134557696, inode = 0 }
+vm_state.vm_map: 13589.828910985 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 145301504, end = 164659200, flags = 1048691, pgoff = 145301504, inode = 0 }
+vm_state.vm_map: 13589.828913214 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2980995072, end = 2981068800, flags = 134217841, pgoff = 0, inode = 98526 }
+vm_state.vm_map: 13589.828915763 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2981068800, end = 2981134336, flags = 134217845, pgoff = 0, inode = 57391 }
+vm_state.vm_map: 13589.828917936 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2981134336, end = 2981138432, flags = 135266419, pgoff = 61440, inode = 57391 }
+vm_state.vm_map: 13589.828920041 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2981138432, end = 2981154816, flags = 1048691, pgoff = 2981138432, inode = 0 }
+vm_state.vm_map: 13589.828925003 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2981154816, end = 2981437440, flags = 134217845, pgoff = 0, inode = 22693 }
+vm_state.vm_map: 13589.828927183 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2981437440, end = 2981449728, flags = 135266419, pgoff = 282624, inode = 22693 }
+vm_state.vm_map: 13589.828929301 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2981449728, end = 2981474304, flags = 1048691, pgoff = 2981449728, inode = 0 }
+vm_state.vm_map: 13589.828931738 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2981502976, end = 2981519360, flags = 134217845, pgoff = 0, inode = 57390 }
+vm_state.vm_map: 13589.828933850 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2981519360, end = 2981523456, flags = 135266419, pgoff = 12288, inode = 57390 }
+vm_state.vm_map: 13589.828936657 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2981523456, end = 2981564416, flags = 134217845, pgoff = 0, inode = 57395 }
+vm_state.vm_map: 13589.828938739 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2981564416, end = 2981568512, flags = 135266419, pgoff = 36864, inode = 57395 }
+vm_state.vm_map: 13589.828941146 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2981568512, end = 2981593088, flags = 134217845, pgoff = 0, inode = 18917 }
+vm_state.vm_map: 13589.828943294 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2981593088, end = 2981597184, flags = 135266419, pgoff = 20480, inode = 18917 }
+vm_state.vm_map: 13589.828945702 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2981597184, end = 2981867520, flags = 134217845, pgoff = 0, inode = 18916 }
+vm_state.vm_map: 13589.828947672 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2981867520, end = 2981871616, flags = 135266419, pgoff = 266240, inode = 18916 }
+vm_state.vm_map: 13589.828950073 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2981871616, end = 2981953536, flags = 134217845, pgoff = 0, inode = 18915 }
+vm_state.vm_map: 13589.828952135 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2981953536, end = 2981961728, flags = 135266419, pgoff = 77824, inode = 18915 }
+vm_state.vm_map: 13589.828954579 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2981961728, end = 2982744064, flags = 134217845, pgoff = 0, inode = 18927 }
+vm_state.vm_map: 13589.828956531 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2982744064, end = 2982752256, flags = 135266419, pgoff = 778240, inode = 18927 }
+vm_state.vm_map: 13589.828958938 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2982764544, end = 2982785024, flags = 134217845, pgoff = 0, inode = 57392 }
+vm_state.vm_map: 13589.828961019 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2982785024, end = 2982789120, flags = 135266419, pgoff = 16384, inode = 57392 }
+vm_state.vm_map: 13589.828963444 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2982789120, end = 2982821888, flags = 134217845, pgoff = 0, inode = 57396 }
+vm_state.vm_map: 13589.828965555 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2982821888, end = 2982825984, flags = 135266419, pgoff = 28672, inode = 57396 }
+vm_state.vm_map: 13589.828967951 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2982825984, end = 2982842368, flags = 134217845, pgoff = 0, inode = 57393 }
+vm_state.vm_map: 13589.828969909 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2982842368, end = 2982846464, flags = 135266419, pgoff = 12288, inode = 57393 }
+vm_state.vm_map: 13589.828972654 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2982846464, end = 2983211008, flags = 134217845, pgoff = 0, inode = 22572 }
+vm_state.vm_map: 13589.828974636 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2983211008, end = 2983219200, flags = 135266419, pgoff = 364544, inode = 22572 }
+vm_state.vm_map: 13589.828976865 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2983219200, end = 2983419904, flags = 134217845, pgoff = 0, inode = 20709 }
+vm_state.vm_map: 13589.828979026 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2983419904, end = 2983428096, flags = 135266419, pgoff = 196608, inode = 20709 }
+vm_state.vm_map: 13589.828980978 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2983428096, end = 2983436288, flags = 1048691, pgoff = 2983428096, inode = 0 }
+vm_state.vm_map: 13589.828983182 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2983436288, end = 2983886848, flags = 134217845, pgoff = 0, inode = 20711 }
+vm_state.vm_map: 13589.828985256 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2983886848, end = 2983899136, flags = 135266419, pgoff = 450560, inode = 20711 }
+vm_state.vm_map: 13589.828987331 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2983899136, end = 2983915520, flags = 134217845, pgoff = 0, inode = 57389 }
+vm_state.vm_map: 13589.828989277 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2983915520, end = 2983919616, flags = 135266419, pgoff = 12288, inode = 57389 }
+vm_state.vm_map: 13589.828991345 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2983919616, end = 2983936000, flags = 134217845, pgoff = 0, inode = 18914 }
+vm_state.vm_map: 13589.828993291 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2983936000, end = 2983940096, flags = 135266419, pgoff = 16384, inode = 18914 }
+vm_state.vm_map: 13589.828995347 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2983940096, end = 2983956480, flags = 134217845, pgoff = 0, inode = 57394 }
+vm_state.vm_map: 13589.828997286 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2983956480, end = 2983960576, flags = 135266419, pgoff = 16384, inode = 57394 }
+vm_state.vm_map: 13589.828999355 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2983960576, end = 2983989248, flags = 134217845, pgoff = 0, inode = 57397 }
+vm_state.vm_map: 13589.829001294 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2983989248, end = 2983993344, flags = 135266419, pgoff = 24576, inode = 57397 }
+vm_state.vm_map: 13589.829003356 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2983993344, end = 2984120320, flags = 134217845, pgoff = 0, inode = 18923 }
+vm_state.vm_map: 13589.829005757 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2984120320, end = 2984124416, flags = 135266419, pgoff = 122880, inode = 18923 }
+vm_state.vm_map: 13589.829007825 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2984128512, end = 2984153088, flags = 134217845, pgoff = 0, inode = 57398 }
+vm_state.vm_map: 13589.829009772 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2984153088, end = 2984157184, flags = 135266419, pgoff = 24576, inode = 57398 }
+vm_state.vm_map: 13589.829011846 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2984157184, end = 2984173568, flags = 134217845, pgoff = 0, inode = 52571 }
+vm_state.vm_map: 13589.829013884 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2984173568, end = 2984177664, flags = 135266419, pgoff = 12288, inode = 52571 }
+vm_state.vm_map: 13589.829015977 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2984177664, end = 2984189952, flags = 134217845, pgoff = 0, inode = 49489 }
+vm_state.vm_map: 13589.829017916 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2984189952, end = 2984194048, flags = 135266419, pgoff = 8192, inode = 49489 }
+vm_state.vm_map: 13589.829019985 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2984194048, end = 2984214528, flags = 134217845, pgoff = 0, inode = 52570 }
+vm_state.vm_map: 13589.829021924 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2984214528, end = 2984218624, flags = 135266419, pgoff = 16384, inode = 52570 }
+vm_state.vm_map: 13589.829023993 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2984218624, end = 2984255488, flags = 134217845, pgoff = 0, inode = 52569 }
+vm_state.vm_map: 13589.829026055 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2984255488, end = 2984259584, flags = 135266419, pgoff = 32768, inode = 52569 }
+vm_state.vm_map: 13589.829028137 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2984259584, end = 2984284160, flags = 134217845, pgoff = 0, inode = 52572 }
+vm_state.vm_map: 13589.829030081 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2984284160, end = 2984288256, flags = 135266419, pgoff = 20480, inode = 52572 }
+vm_state.vm_map: 13589.829032150 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2984288256, end = 2984308736, flags = 134217845, pgoff = 0, inode = 52568 }
+vm_state.vm_map: 13589.829036718 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2984308736, end = 2984312832, flags = 135266419, pgoff = 16384, inode = 52568 }
+vm_state.vm_map: 13589.829044838 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2984312832, end = 2984415232, flags = 134217841, pgoff = 0, inode = 98439 }
+vm_state.vm_map: 13589.829047368 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2984415232, end = 2984521728, flags = 134217841, pgoff = 0, inode = 254143 }
+vm_state.vm_map: 13589.829049763 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2984521728, end = 2992295936, flags = 134217841, pgoff = 0, inode = 246513 }
+vm_state.vm_map: 13589.829052313 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2992295936, end = 2992599040, flags = 134217841, pgoff = 0, inode = 49556 }
+vm_state.vm_map: 13589.829054621 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2992599040, end = 2992922624, flags = 134217841, pgoff = 0, inode = 49558 }
+vm_state.vm_map: 13589.829060038 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2992922624, end = 2993020928, flags = 134217841, pgoff = 0, inode = 98501 }
+vm_state.vm_map: 13589.829062175 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2993020928, end = 2993025024, flags = 1048688, pgoff = 2993020928, inode = 0 }
+vm_state.vm_map: 13589.829064213 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 2993025024, end = 3001413632, flags = 1048691, pgoff = 2993025024, inode = 0 }
+vm_state.vm_map: 13589.829066743 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3001413632, end = 3001524224, flags = 134217841, pgoff = 0, inode = 254198 }
+vm_state.vm_map: 13589.829069039 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3001524224, end = 3001565184, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.829071084 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3001565184, end = 3001569280, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.829073041 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3001569280, end = 3001573376, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.829075245 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3001573376, end = 3001610240, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.829077535 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3001610240, end = 3001614336, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.829079468 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3001614336, end = 3001618432, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.829081776 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3001618432, end = 3001696256, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.829083729 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3001696256, end = 3001700352, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.829085668 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3001700352, end = 3001704448, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.829087619 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3001704448, end = 3001712640, flags = 1048691, pgoff = 3001704448, inode = 0 }
+vm_state.vm_map: 13589.829089805 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3001712640, end = 3001737216, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.829091745 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3001737216, end = 3001741312, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.829093690 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3001741312, end = 3001745408, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.829098633 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3001745408, end = 3017986048, flags = 134217979, pgoff = 0, inode = 1204624 }
+vm_state.vm_map: 13589.829100826 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3017986048, end = 3022282752, flags = 134217979, pgoff = 0, inode = 1204558 }
+vm_state.vm_map: 13589.829103060 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3022282752, end = 3022483456, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 13589.829105122 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3022483456, end = 3022487552, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 13589.829107209 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3022487552, end = 3022520320, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 13589.829109148 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3022520320, end = 3022524416, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 13589.829111575 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3022524416, end = 3022532608, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 13589.829113526 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3022532608, end = 3022536704, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 13589.829115601 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3022536704, end = 3022561280, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 13589.829117540 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3022561280, end = 3022565376, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 13589.829119626 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3022573568, end = 3022577664, flags = 1048691, pgoff = 3022573568, inode = 0 }
+vm_state.vm_map: 13589.829121991 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3022577664, end = 3022659584, flags = 134217841, pgoff = 0, inode = 98443 }
+vm_state.vm_map: 13589.829124072 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3022659584, end = 3022663680, flags = 134217937, pgoff = 0, inode = 1196317 }
+vm_state.vm_map: 13589.829126257 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3022663680, end = 3022688256, flags = 134217937, pgoff = 0, inode = 1196229 }
+vm_state.vm_map: 13589.829128566 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3022688256, end = 3022692352, flags = 134217937, pgoff = 0, inode = 1196235 }
+vm_state.vm_map: 13589.829130623 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3022692352, end = 3022696448, flags = 134217937, pgoff = 0, inode = 1196204 }
+vm_state.vm_map: 13589.829132814 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3022696448, end = 3022700544, flags = 134217937, pgoff = 0, inode = 1196228 }
+vm_state.vm_map: 13589.829134913 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3022700544, end = 3022704640, flags = 134217937, pgoff = 0, inode = 1196227 }
+vm_state.vm_map: 13589.829136976 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3022704640, end = 3022712832, flags = 134217937, pgoff = 0, inode = 1196198 }
+vm_state.vm_map: 13589.829139026 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3022712832, end = 3022745600, flags = 134217937, pgoff = 0, inode = 1196200 }
+vm_state.vm_map: 13589.829141113 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3022745600, end = 3022757888, flags = 134217937, pgoff = 0, inode = 1196226 }
+vm_state.vm_map: 13589.829143188 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3022757888, end = 3022766080, flags = 134217937, pgoff = 0, inode = 1196225 }
+vm_state.vm_map: 13589.829145601 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3022766080, end = 3022770176, flags = 134217937, pgoff = 0, inode = 1196224 }
+vm_state.vm_map: 13589.829147959 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3022770176, end = 3023634432, flags = 134217845, pgoff = 0, inode = 23975 }
+vm_state.vm_map: 13589.829150015 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3023634432, end = 3023654912, flags = 135266419, pgoff = 864256, inode = 23975 }
+vm_state.vm_map: 13589.829168164 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3023654912, end = 3023667200, flags = 1048691, pgoff = 3023654912, inode = 0 }
+vm_state.vm_map: 13589.829170325 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3023667200, end = 3023904768, flags = 1048691, pgoff = 3023904768, inode = 0 }
+vm_state.vm_map: 13589.829172733 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3023904768, end = 3023933440, flags = 134217937, pgoff = 0, inode = 1196222 }
+vm_state.vm_map: 13589.829175017 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3023933440, end = 3023945728, flags = 134217937, pgoff = 0, inode = 1196244 }
+vm_state.vm_map: 13589.829177153 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3023945728, end = 3023953920, flags = 134217937, pgoff = 0, inode = 1196270 }
+vm_state.vm_map: 13589.829179535 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3023953920, end = 3023986688, flags = 134217937, pgoff = 0, inode = 1196246 }
+vm_state.vm_map: 13589.829181641 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3023986688, end = 3024007168, flags = 134217937, pgoff = 0, inode = 1196269 }
+vm_state.vm_map: 13589.829183919 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3024007168, end = 3024015360, flags = 134217937, pgoff = 0, inode = 1196316 }
+vm_state.vm_map: 13589.829186036 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3024015360, end = 3024044032, flags = 134217937, pgoff = 0, inode = 1196197 }
+vm_state.vm_map: 13589.829188320 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3024044032, end = 3024089088, flags = 134217937, pgoff = 0, inode = 1196312 }
+vm_state.vm_map: 13589.829190463 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3024089088, end = 3024146432, flags = 134217937, pgoff = 0, inode = 1196272 }
+vm_state.vm_map: 13589.829192772 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3024146432, end = 3024371712, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.829194766 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3024371712, end = 3024375808, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.829197297 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3024375808, end = 3024379904, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.829199710 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3024379904, end = 3024412672, flags = 134217845, pgoff = 0, inode = 1065073 }
+vm_state.vm_map: 13589.829201871 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3024412672, end = 3024416768, flags = 135266419, pgoff = 28672, inode = 1065073 }
+vm_state.vm_map: 13589.829207449 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3024416768, end = 3024478208, flags = 134217845, pgoff = 0, inode = 20901 }
+vm_state.vm_map: 13589.829209597 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3024478208, end = 3024482304, flags = 135266419, pgoff = 61440, inode = 20901 }
+vm_state.vm_map: 13589.829211782 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3024482304, end = 3024486400, flags = 134217937, pgoff = 0, inode = 1196223 }
+vm_state.vm_map: 13589.829213932 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3024486400, end = 3024490496, flags = 134217937, pgoff = 0, inode = 1196202 }
+vm_state.vm_map: 13589.829216092 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3024490496, end = 3024502784, flags = 134217937, pgoff = 0, inode = 1196221 }
+vm_state.vm_map: 13589.829218388 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3024502784, end = 3024506880, flags = 134217937, pgoff = 0, inode = 1196220 }
+vm_state.vm_map: 13589.829220598 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3024506880, end = 3024515072, flags = 134217937, pgoff = 0, inode = 1196219 }
+vm_state.vm_map: 13589.829222778 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3024515072, end = 3024519168, flags = 134217937, pgoff = 0, inode = 1196210 }
+vm_state.vm_map: 13589.829224952 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3024519168, end = 3024576512, flags = 134217937, pgoff = 0, inode = 1196231 }
+vm_state.vm_map: 13589.829226995 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3024576512, end = 3024609280, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 13589.829229131 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3024609280, end = 3024613376, flags = 135266419, pgoff = 32768, inode = 20716 }
+vm_state.vm_map: 13589.829231200 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3024613376, end = 3025133568, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 13589.829233571 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3025133568, end = 3025141760, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 13589.829235639 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3025141760, end = 3025506304, flags = 134217845, pgoff = 0, inode = 1065038 }
+vm_state.vm_map: 13589.829237800 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3025506304, end = 3025543168, flags = 135266423, pgoff = 364544, inode = 1065038 }
+vm_state.vm_map: 13589.829239837 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3025543168, end = 3025547264, flags = 1048695, pgoff = 3025543168, inode = 0 }
+vm_state.vm_map: 13589.829241973 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3025547264, end = 3026100224, flags = 134217845, pgoff = 0, inode = 18947 }
+vm_state.vm_map: 13589.829244006 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3026100224, end = 3026120704, flags = 135266419, pgoff = 548864, inode = 18947 }
+vm_state.vm_map: 13589.829246050 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3026120704, end = 3026436096, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 13589.829248087 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3026436096, end = 3026444288, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 13589.829250242 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3026444288, end = 3026513920, flags = 134217845, pgoff = 0, inode = 1065123 }
+vm_state.vm_map: 13589.829252268 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3026513920, end = 3026518016, flags = 135266419, pgoff = 69632, inode = 1065123 }
+vm_state.vm_map: 13589.829254324 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3026518016, end = 3041013760, flags = 134217845, pgoff = 0, inode = 20672 }
+vm_state.vm_map: 13589.829256368 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3041013760, end = 3041628160, flags = 135266419, pgoff = 14495744, inode = 20672 }
+vm_state.vm_map: 13589.829258535 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3041628160, end = 3041636352, flags = 1048691, pgoff = 3041628160, inode = 0 }
+vm_state.vm_map: 13589.829260640 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3041636352, end = 3042009088, flags = 134217845, pgoff = 0, inode = 20902 }
+vm_state.vm_map: 13589.829262868 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3042009088, end = 3042021376, flags = 135266419, pgoff = 368640, inode = 20902 }
+vm_state.vm_map: 13589.829265024 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3042021376, end = 3042025472, flags = 134217937, pgoff = 0, inode = 1196205 }
+vm_state.vm_map: 13589.829267548 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3042025472, end = 3042037760, flags = 134217937, pgoff = 0, inode = 1196315 }
+vm_state.vm_map: 13589.829269998 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3042037760, end = 3042041856, flags = 134217845, pgoff = 0, inode = 20890 }
+vm_state.vm_map: 13589.829272012 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3042041856, end = 3042045952, flags = 135266419, pgoff = 0, inode = 20890 }
+vm_state.vm_map: 13589.829276776 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3042045952, end = 3042111488, flags = 134217845, pgoff = 0, inode = 23976 }
+vm_state.vm_map: 13589.829278820 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3042111488, end = 3042115584, flags = 135266419, pgoff = 65536, inode = 23976 }
+vm_state.vm_map: 13589.829280871 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3042115584, end = 3044098048, flags = 134217845, pgoff = 0, inode = 20915 }
+vm_state.vm_map: 13589.829282908 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3044098048, end = 3044139008, flags = 135266419, pgoff = 1978368, inode = 20915 }
+vm_state.vm_map: 13589.829285100 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3044139008, end = 3045470208, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.829287138 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3045470208, end = 3045486592, flags = 1048691, pgoff = 3045470208, inode = 0 }
+vm_state.vm_map: 13589.829289274 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3045486592, end = 3045634048, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.829291311 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3045634048, end = 3045642240, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.829293404 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3045642240, end = 3045961728, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 13589.829295572 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3045961728, end = 3045978112, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 13589.829297641 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3045978112, end = 3045990400, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 13589.829299666 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3045990400, end = 3045994496, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 13589.829302171 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3045994496, end = 3047251968, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 13589.829304204 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3047251968, end = 3047272448, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 13589.829306241 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3047272448, end = 3047280640, flags = 1048691, pgoff = 3047272448, inode = 0 }
+vm_state.vm_map: 13589.829308217 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3047280640, end = 3047518208, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 13589.829310495 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3047518208, end = 3047522304, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 13589.829312483 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3047522304, end = 3047538688, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.829314644 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3047538688, end = 3047542784, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.829316806 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3047542784, end = 3047550976, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.829318831 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3047550976, end = 3047555072, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.829320905 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3047555072, end = 3047747584, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.829323061 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3047747584, end = 3047751680, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.829325136 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3047751680, end = 3047804928, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 13589.829327185 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3047804928, end = 3047809024, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 13589.829329346 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3047809024, end = 3047813120, flags = 1048691, pgoff = 3047809024, inode = 0 }
+vm_state.vm_map: 13589.829331402 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3047813120, end = 3047985152, flags = 134217845, pgoff = 0, inode = 1065255 }
+vm_state.vm_map: 13589.829333434 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3047985152, end = 3047989248, flags = 135266419, pgoff = 172032, inode = 1065255 }
+vm_state.vm_map: 13589.829335928 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3047989248, end = 3048235008, flags = 134217845, pgoff = 0, inode = 20603 }
+vm_state.vm_map: 13589.829337953 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3048235008, end = 3048239104, flags = 135266419, pgoff = 245760, inode = 20603 }
+vm_state.vm_map: 13589.829340015 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3048239104, end = 3048710144, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 13589.829342053 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3048710144, end = 3048726528, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 13589.829346548 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3048726528, end = 3048869888, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 13589.829348579 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3048869888, end = 3048873984, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 13589.829350715 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3048873984, end = 3048960000, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 13589.829352741 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3048960000, end = 3048964096, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 13589.829354773 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3048964096, end = 3048968192, flags = 1048691, pgoff = 3048964096, inode = 0 }
+vm_state.vm_map: 13589.829356860 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3048968192, end = 3048984576, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 13589.829359014 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3048984576, end = 3048988672, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 13589.829361070 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3048988672, end = 3049021440, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 13589.829363232 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3049021440, end = 3049025536, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 13589.829365226 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3049025536, end = 3049041920, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 13589.829367387 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3049041920, end = 3049046016, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 13589.829369794 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3049046016, end = 3049132032, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 13589.829371948 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3049132032, end = 3049136128, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 13589.829373907 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3049136128, end = 3049144320, flags = 1048691, pgoff = 3049136128, inode = 0 }
+vm_state.vm_map: 13589.829376080 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3049144320, end = 3049172992, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 13589.829378167 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3049172992, end = 3049177088, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 13589.829380328 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3049177088, end = 3049181184, flags = 1048691, pgoff = 3049177088, inode = 0 }
+vm_state.vm_map: 13589.829382310 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3049181184, end = 3049512960, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 13589.829384582 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3049512960, end = 3049521152, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 13589.829386564 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3049521152, end = 3049553920, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 13589.829416583 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3049553920, end = 3049558016, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 13589.829419538 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3049558016, end = 3049574400, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 13589.829421576 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3049574400, end = 3049578496, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 13589.829423743 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3049578496, end = 3049603072, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 13589.829426015 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3049603072, end = 3049607168, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 13589.829428071 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3049607168, end = 3049639936, flags = 134217845, pgoff = 0, inode = 18621 }
+vm_state.vm_map: 13589.829430244 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3049639936, end = 3049644032, flags = 135266419, pgoff = 28672, inode = 18621 }
+vm_state.vm_map: 13589.829432781 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3049644032, end = 3049648128, flags = 1048691, pgoff = 3049644032, inode = 0 }
+vm_state.vm_map: 13589.829435070 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3049648128, end = 3050078208, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 13589.829437078 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3050078208, end = 3050106880, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 13589.829439251 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3050106880, end = 3050110976, flags = 1048691, pgoff = 3050106880, inode = 0 }
+vm_state.vm_map: 13589.829441406 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3050110976, end = 3050553344, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 13589.829443566 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3050553344, end = 3050561536, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 13589.829445667 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3050561536, end = 3050659840, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.829447889 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3050659840, end = 3050663936, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.829449933 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3050663936, end = 3050934272, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 13589.829452112 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3050934272, end = 3050942464, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 13589.829454476 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3050942464, end = 3051003904, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 13589.829456508 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3051003904, end = 3051008000, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 13589.829458546 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3051008000, end = 3051012096, flags = 1048691, pgoff = 3051008000, inode = 0 }
+vm_state.vm_map: 13589.829460768 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3051012096, end = 3051479040, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 13589.829462812 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3051479040, end = 3051487232, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 13589.829464881 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3051487232, end = 3052617728, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 13589.829467183 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3052617728, end = 3052634112, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 13589.829469510 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3052634112, end = 3052748800, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.829471461 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3052748800, end = 3052752896, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.829477366 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3052752896, end = 3052900352, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.829479428 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3052900352, end = 3052904448, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.829481583 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3052904448, end = 3052908544, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.829483645 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3052908544, end = 3052916736, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.829485818 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3052916736, end = 3052920832, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.829487967 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3052920832, end = 3052924928, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.829489949 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3052924928, end = 3052929024, flags = 1048691, pgoff = 3052924928, inode = 0 }
+vm_state.vm_map: 13589.829491950 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3052929024, end = 3053015040, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.829494215 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3053015040, end = 3053019136, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.829496241 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3053019136, end = 3053023232, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.829498285 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3053023232, end = 3053031424, flags = 1048691, pgoff = 3053023232, inode = 0 }
+vm_state.vm_map: 13589.829500360 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3053031424, end = 3053776896, flags = 134217845, pgoff = 0, inode = 499794 }
+vm_state.vm_map: 13589.829502822 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3053776896, end = 3053780992, flags = 135266419, pgoff = 745472, inode = 499794 }
+vm_state.vm_map: 13589.829504829 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3053780992, end = 3053809664, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.829506985 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3053809664, end = 3053813760, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.829509071 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3053813760, end = 3053817856, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.829511066 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3053817856, end = 3053834240, flags = 134217845, pgoff = 0, inode = 20149 }
+vm_state.vm_map: 13589.829513221 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3053834240, end = 3053838336, flags = 135266419, pgoff = 12288, inode = 20149 }
+vm_state.vm_map: 13589.829515350 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3053838336, end = 3053920256, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.829517511 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3053920256, end = 3053924352, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.829519568 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3053924352, end = 3055239168, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.829521717 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3055239168, end = 3055247360, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.829523711 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3055247360, end = 3055251456, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.829525878 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3055251456, end = 3055267840, flags = 1048691, pgoff = 3055251456, inode = 0 }
+vm_state.vm_map: 13589.829528021 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3055267840, end = 3056205824, flags = 134217845, pgoff = 0, inode = 16850 }
+vm_state.vm_map: 13589.829530053 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3056205824, end = 3056222208, flags = 135266417, pgoff = 937984, inode = 16850 }
+vm_state.vm_map: 13589.829532084 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3056222208, end = 3056226304, flags = 135266419, pgoff = 954368, inode = 16850 }
+vm_state.vm_map: 13589.829534159 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3056226304, end = 3056254976, flags = 1048691, pgoff = 3056226304, inode = 0 }
+vm_state.vm_map: 13589.829536554 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3056254976, end = 3066294272, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 13589.829538733 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3066294272, end = 3066454016, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 13589.829540789 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3066454016, end = 3066462208, flags = 1048691, pgoff = 3066454016, inode = 0 }
+vm_state.vm_map: 13589.829542932 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3066462208, end = 3070058496, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 13589.829544883 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3070058496, end = 3070156800, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 13589.829546842 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3070156800, end = 3070160896, flags = 1048691, pgoff = 3070156800, inode = 0 }
+vm_state.vm_map: 13589.829549113 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3070160896, end = 3072716800, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 13589.829551083 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3072716800, end = 3072765952, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 13589.829553034 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3072765952, end = 3072770048, flags = 1048691, pgoff = 3072765952, inode = 0 }
+vm_state.vm_map: 13589.829555306 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3072770048, end = 3073921024, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.829557282 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3073921024, end = 3073937408, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.829559493 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3073937408, end = 3074170880, flags = 134217845, pgoff = 0, inode = 1065180 }
+vm_state.vm_map: 13589.829561641 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3074170880, end = 3074179072, flags = 135266419, pgoff = 233472, inode = 1065180 }
+vm_state.vm_map: 13589.829563679 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3074179072, end = 3074183168, flags = 1048691, pgoff = 3074179072, inode = 0 }
+vm_state.vm_map: 13589.829565729 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3074183168, end = 3076485120, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 13589.829567890 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3076485120, end = 3076530176, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 13589.829570427 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3076530176, end = 3078840320, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 13589.829572427 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3078840320, end = 3078868992, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 13589.829574520 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3078868992, end = 3078873088, flags = 1048691, pgoff = 3078868992, inode = 0 }
+vm_state.vm_map: 13589.829577032 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3078873088, end = 3078881280, flags = 134217845, pgoff = 0, inode = 508751 }
+vm_state.vm_map: 13589.829579181 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3078881280, end = 3078885376, flags = 135266417, pgoff = 4096, inode = 508751 }
+vm_state.vm_map: 13589.829581237 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3078885376, end = 3078889472, flags = 135266419, pgoff = 8192, inode = 508751 }
+vm_state.vm_map: 13589.829583312 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3078889472, end = 3078897664, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 13589.829585454 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3078897664, end = 3078901760, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 13589.829587511 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3078901760, end = 3078918144, flags = 134217845, pgoff = 0, inode = 22094 }
+vm_state.vm_map: 13589.829589542 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3078918144, end = 3078922240, flags = 135266419, pgoff = 12288, inode = 22094 }
+vm_state.vm_map: 13589.829591672 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3078922240, end = 3078930432, flags = 134217845, pgoff = 0, inode = 1450546 }
+vm_state.vm_map: 13589.829593710 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3078930432, end = 3078934528, flags = 135266417, pgoff = 4096, inode = 1450546 }
+vm_state.vm_map: 13589.829595735 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3078934528, end = 3078938624, flags = 135266419, pgoff = 8192, inode = 1450546 }
+vm_state.vm_map: 13589.829597797 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3078938624, end = 3078967296, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.829599978 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3078967296, end = 3078975488, flags = 1048691, pgoff = 3078967296, inode = 0 }
+vm_state.vm_map: 13589.829602015 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3078975488, end = 3078979584, flags = 67371125, pgoff = 3078975488, inode = 0 }
+vm_state.vm_map: 13589.829604447 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3078979584, end = 3079094272, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.829606386 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3079094272, end = 3079098368, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.829608671 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3079098368, end = 3079102464, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.829610708 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2241, start = 3214217216, end = 3214303232, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.829613497 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 134512640, end = 134533120, flags = 134223989, pgoff = 0, inode = 1352628 }
+vm_state.vm_map: 13589.829615676 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 134533120, end = 134537216, flags = 135272563, pgoff = 16384, inode = 1352628 }
+vm_state.vm_map: 13589.829617744 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 150814720, end = 151908352, flags = 1048691, pgoff = 150814720, inode = 0 }
+vm_state.vm_map: 13589.829620165 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3039252480, end = 3040509952, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 13589.829622214 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3040509952, end = 3040530432, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 13589.829624369 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3040530432, end = 3040534528, flags = 1048691, pgoff = 3040530432, inode = 0 }
+vm_state.vm_map: 13589.829626499 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3040534528, end = 3040772096, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 13589.829628667 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3040772096, end = 3040776192, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 13589.829630883 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3040776192, end = 3040792576, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 13589.829633037 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3040792576, end = 3040796672, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 13589.829635235 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3040796672, end = 3040821248, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 13589.829637328 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3040821248, end = 3040825344, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 13589.829639809 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3040825344, end = 3040858112, flags = 134217845, pgoff = 0, inode = 18621 }
+vm_state.vm_map: 13589.829641927 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3040858112, end = 3040862208, flags = 135266419, pgoff = 28672, inode = 18621 }
+vm_state.vm_map: 13589.829644064 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3040862208, end = 3041292288, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 13589.829646230 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3041292288, end = 3041320960, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 13589.829648201 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3041320960, end = 3041325056, flags = 1048691, pgoff = 3041320960, inode = 0 }
+vm_state.vm_map: 13589.829650621 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3041325056, end = 3041767424, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 13589.829652578 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3041767424, end = 3041775616, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 13589.829654985 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3041775616, end = 3044331520, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 13589.829656955 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3044331520, end = 3044380672, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 13589.829659117 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3044380672, end = 3044384768, flags = 1048691, pgoff = 3044380672, inode = 0 }
+vm_state.vm_map: 13589.829661357 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3044478976, end = 3044519936, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.829663524 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3044519936, end = 3044524032, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.829665543 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3044524032, end = 3044528128, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.829667717 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3044528128, end = 3044564992, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.829669693 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3044564992, end = 3044569088, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.829671983 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3044569088, end = 3044573184, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.829674519 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3044573184, end = 3044651008, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.829676828 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3044651008, end = 3044655104, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.829678773 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3044655104, end = 3044659200, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.829680941 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3044659200, end = 3044667392, flags = 1048691, pgoff = 3044659200, inode = 0 }
+vm_state.vm_map: 13589.829683231 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3044667392, end = 3044691968, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.829685324 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3044691968, end = 3044696064, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.829687275 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3044696064, end = 3044700160, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.829689560 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3046744064, end = 3046969344, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.829691505 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3046969344, end = 3046973440, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.829693808 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3046973440, end = 3046977536, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.829696110 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3046977536, end = 3047178240, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 13589.829698395 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047178240, end = 3047182336, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 13589.829700636 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047182336, end = 3047206912, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 13589.829702587 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047206912, end = 3047211008, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 13589.829705166 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047227392, end = 3047301120, flags = 134217845, pgoff = 0, inode = 1114266 }
+vm_state.vm_map: 13589.829707136 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047301120, end = 3047305216, flags = 135266419, pgoff = 69632, inode = 1114266 }
+vm_state.vm_map: 13589.829709697 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047305216, end = 3047309312, flags = 134217937, pgoff = 0, inode = 1196317 }
+vm_state.vm_map: 13589.829711926 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047309312, end = 3047333888, flags = 134217937, pgoff = 0, inode = 1196229 }
+vm_state.vm_map: 13589.829714019 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047333888, end = 3047337984, flags = 134217937, pgoff = 0, inode = 1196235 }
+vm_state.vm_map: 13589.829716100 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047337984, end = 3047342080, flags = 134217937, pgoff = 0, inode = 1196204 }
+vm_state.vm_map: 13589.829718317 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047342080, end = 3047346176, flags = 134217937, pgoff = 0, inode = 1196228 }
+vm_state.vm_map: 13589.829720392 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047346176, end = 3047350272, flags = 134217937, pgoff = 0, inode = 1196227 }
+vm_state.vm_map: 13589.829722466 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047350272, end = 3047358464, flags = 134217937, pgoff = 0, inode = 1196198 }
+vm_state.vm_map: 13589.829724695 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047358464, end = 3047391232, flags = 134217937, pgoff = 0, inode = 1196200 }
+vm_state.vm_map: 13589.829726788 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047391232, end = 3047403520, flags = 134217937, pgoff = 0, inode = 1196226 }
+vm_state.vm_map: 13589.829728862 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047403520, end = 3047411712, flags = 134217937, pgoff = 0, inode = 1196225 }
+vm_state.vm_map: 13589.829731103 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047411712, end = 3047415808, flags = 134217937, pgoff = 0, inode = 1196224 }
+vm_state.vm_map: 13589.829733184 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047415808, end = 3047419904, flags = 134217937, pgoff = 0, inode = 1196223 }
+vm_state.vm_map: 13589.829735222 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047419904, end = 3047424000, flags = 134217937, pgoff = 0, inode = 1196202 }
+vm_state.vm_map: 13589.829737469 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047424000, end = 3047452672, flags = 134217937, pgoff = 0, inode = 1196222 }
+vm_state.vm_map: 13589.829739543 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047452672, end = 3047464960, flags = 134217937, pgoff = 0, inode = 1196221 }
+vm_state.vm_map: 13589.829741576 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047464960, end = 3047469056, flags = 134217937, pgoff = 0, inode = 1196220 }
+vm_state.vm_map: 13589.829743970 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047469056, end = 3047477248, flags = 134217937, pgoff = 0, inode = 1196219 }
+vm_state.vm_map: 13589.829746039 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047477248, end = 3047481344, flags = 134217937, pgoff = 0, inode = 1196210 }
+vm_state.vm_map: 13589.829748089 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047481344, end = 3047485440, flags = 134217937, pgoff = 0, inode = 1196205 }
+vm_state.vm_map: 13589.829750250 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047485440, end = 3047497728, flags = 134217937, pgoff = 0, inode = 1196244 }
+vm_state.vm_map: 13589.829752417 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047497728, end = 3047505920, flags = 134217937, pgoff = 0, inode = 1196270 }
+vm_state.vm_map: 13589.829754486 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047505920, end = 3047538688, flags = 134217937, pgoff = 0, inode = 1196246 }
+vm_state.vm_map: 13589.829756554 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047538688, end = 3047559168, flags = 134217937, pgoff = 0, inode = 1196269 }
+vm_state.vm_map: 13589.829758605 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047559168, end = 3047567360, flags = 134217937, pgoff = 0, inode = 1196316 }
+vm_state.vm_map: 13589.829760846 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047567360, end = 3047596032, flags = 134217937, pgoff = 0, inode = 1196197 }
+vm_state.vm_map: 13589.829763006 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047596032, end = 3047641088, flags = 134217937, pgoff = 0, inode = 1196312 }
+vm_state.vm_map: 13589.829765136 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047641088, end = 3047698432, flags = 134217937, pgoff = 0, inode = 1196272 }
+vm_state.vm_map: 13589.829767217 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047698432, end = 3047710720, flags = 134217937, pgoff = 0, inode = 1196315 }
+vm_state.vm_map: 13589.829769495 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047710720, end = 3047768064, flags = 134217937, pgoff = 0, inode = 1196231 }
+vm_state.vm_map: 13589.829771613 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3047768064, end = 3049099264, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.829776464 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3049099264, end = 3049111552, flags = 1048691, pgoff = 3049099264, inode = 0 }
+vm_state.vm_map: 13589.829778932 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3049111552, end = 3049127936, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.829780866 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3049127936, end = 3049132032, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.829783021 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3049132032, end = 3049148416, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 13589.829784966 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3049148416, end = 3049152512, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 13589.829789663 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3049152512, end = 3049185280, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 13589.829791645 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3049185280, end = 3049189376, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 13589.829793616 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3049189376, end = 3049193472, flags = 1048691, pgoff = 3049189376, inode = 0 }
+vm_state.vm_map: 13589.829795709 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3049193472, end = 3049209856, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 13589.829797654 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3049209856, end = 3049213952, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 13589.829799760 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3049213952, end = 3049545728, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 13589.829801718 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3049545728, end = 3049553920, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 13589.829803848 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3049553920, end = 3049652224, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.829805800 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3049652224, end = 3049656320, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.829807911 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3049656320, end = 3049803776, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.829809856 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3049803776, end = 3049811968, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.829812326 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3049811968, end = 3049824256, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 13589.829814277 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3049824256, end = 3049828352, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 13589.829816229 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3049828352, end = 3049832448, flags = 1048691, pgoff = 3049828352, inode = 0 }
+vm_state.vm_map: 13589.829818426 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3049832448, end = 3049840640, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.829820427 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3049840640, end = 3049844736, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.829822601 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3049844736, end = 3050164224, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 13589.829824552 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3050164224, end = 3050180608, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 13589.829826682 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3050180608, end = 3050373120, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.829828634 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3050373120, end = 3050377216, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.829830808 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3050377216, end = 3053973504, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 13589.829832753 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3053973504, end = 3054071808, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 13589.829834704 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3054071808, end = 3054075904, flags = 1048691, pgoff = 3054071808, inode = 0 }
+vm_state.vm_map: 13589.829837068 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3054075904, end = 3054362624, flags = 134217845, pgoff = 0, inode = 20877 }
+vm_state.vm_map: 13589.829839026 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3054362624, end = 3054370816, flags = 135266419, pgoff = 282624, inode = 20877 }
+vm_state.vm_map: 13589.829840984 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3054370816, end = 3054374912, flags = 1048691, pgoff = 3054370816, inode = 0 }
+vm_state.vm_map: 13589.829843176 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3054374912, end = 3055308800, flags = 134217845, pgoff = 0, inode = 20876 }
+vm_state.vm_map: 13589.829845478 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3055308800, end = 3055321088, flags = 135266419, pgoff = 933888, inode = 20876 }
+vm_state.vm_map: 13589.829847663 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3055321088, end = 3055382528, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 13589.829849609 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3055382528, end = 3055386624, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 13589.829851671 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3055386624, end = 3056517120, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 13589.829853623 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3056517120, end = 3056533504, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 13589.829858332 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3056533504, end = 3056803840, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 13589.829860482 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3056803840, end = 3056812032, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 13589.829862758 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3056812032, end = 3057963008, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.829864717 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3057963008, end = 3057979392, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.829866890 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3057979392, end = 3057983488, flags = 1048691, pgoff = 3057979392, inode = 0 }
+vm_state.vm_map: 13589.829869169 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3057983488, end = 3058036736, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 13589.829871125 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3058036736, end = 3058040832, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 13589.829873305 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3058040832, end = 3058212864, flags = 134217845, pgoff = 0, inode = 1065255 }
+vm_state.vm_map: 13589.829875238 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3058212864, end = 3058216960, flags = 135266419, pgoff = 172032, inode = 1065255 }
+vm_state.vm_map: 13589.829877325 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3058216960, end = 3058249728, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 13589.829879603 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3058249728, end = 3058253824, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 13589.829882028 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3058253824, end = 3058339840, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 13589.829884079 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3058339840, end = 3058343936, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 13589.829886117 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3058343936, end = 3058352128, flags = 1048691, pgoff = 3058343936, inode = 0 }
+vm_state.vm_map: 13589.829888394 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3058352128, end = 3058380800, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 13589.829890432 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3058380800, end = 3058384896, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 13589.829892717 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3058384896, end = 3058630656, flags = 134217845, pgoff = 0, inode = 20603 }
+vm_state.vm_map: 13589.829894748 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3058630656, end = 3058634752, flags = 135266419, pgoff = 245760, inode = 20603 }
+vm_state.vm_map: 13589.829896903 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3058634752, end = 3058638848, flags = 1048691, pgoff = 3058634752, inode = 0 }
+vm_state.vm_map: 13589.829899180 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3058638848, end = 3059109888, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 13589.829901206 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3059109888, end = 3059126272, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 13589.829903478 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3059126272, end = 3059269632, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 13589.829905423 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3059269632, end = 3059273728, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 13589.829907596 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3059273728, end = 3059359744, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 13589.829909529 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3059359744, end = 3059363840, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 13589.829911599 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3059363840, end = 3059478528, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.829913869 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3059478528, end = 3059482624, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.829916074 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3059482624, end = 3059630080, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.829918013 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3059630080, end = 3059634176, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.829920081 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3059634176, end = 3059638272, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.829922137 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3059638272, end = 3059642368, flags = 1048691, pgoff = 3059638272, inode = 0 }
+vm_state.vm_map: 13589.829924305 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3059642368, end = 3059650560, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.829926238 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3059650560, end = 3059654656, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.829931064 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3059654656, end = 3059658752, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.829933373 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3059658752, end = 3059744768, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.829935418 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3059744768, end = 3059748864, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.829937443 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3059748864, end = 3059752960, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.829939480 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3059752960, end = 3059761152, flags = 1048691, pgoff = 3059752960, inode = 0 }
+vm_state.vm_map: 13589.829941704 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3059761152, end = 3060506624, flags = 134217845, pgoff = 0, inode = 499794 }
+vm_state.vm_map: 13589.829943698 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3060506624, end = 3060510720, flags = 135266419, pgoff = 745472, inode = 499794 }
+vm_state.vm_map: 13589.829946013 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3060510720, end = 3060539392, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.829948395 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3060539392, end = 3060543488, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.829950365 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3060543488, end = 3060547584, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.829952785 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3060547584, end = 3060563968, flags = 134217845, pgoff = 0, inode = 20149 }
+vm_state.vm_map: 13589.829954810 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3060563968, end = 3060568064, flags = 135266419, pgoff = 12288, inode = 20149 }
+vm_state.vm_map: 13589.829956891 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3060568064, end = 3060572160, flags = 1048691, pgoff = 3060568064, inode = 0 }
+vm_state.vm_map: 13589.829958972 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3060572160, end = 3060654080, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.829960923 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3060654080, end = 3060658176, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.829963103 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3060658176, end = 3061972992, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.829965153 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3061972992, end = 3061981184, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.829967222 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3061981184, end = 3061985280, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.829969161 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3061985280, end = 3061997568, flags = 1048691, pgoff = 3061985280, inode = 0 }
+vm_state.vm_map: 13589.829971458 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3061997568, end = 3062935552, flags = 134217845, pgoff = 0, inode = 16850 }
+vm_state.vm_map: 13589.829973396 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3062935552, end = 3062951936, flags = 135266417, pgoff = 937984, inode = 16850 }
+vm_state.vm_map: 13589.829975330 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3062951936, end = 3062956032, flags = 135266419, pgoff = 954368, inode = 16850 }
+vm_state.vm_map: 13589.829977263 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3062956032, end = 3062984704, flags = 1048691, pgoff = 3062956032, inode = 0 }
+vm_state.vm_map: 13589.829979467 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3062984704, end = 3063398400, flags = 134217845, pgoff = 0, inode = 1065120 }
+vm_state.vm_map: 13589.829981738 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3063398400, end = 3063406592, flags = 135266419, pgoff = 409600, inode = 1065120 }
+vm_state.vm_map: 13589.829983917 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3063406592, end = 3065708544, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 13589.829985882 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3065708544, end = 3065753600, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 13589.829988061 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3065753600, end = 3066220544, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 13589.829989988 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3066220544, end = 3066228736, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 13589.829991927 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3066228736, end = 3066232832, flags = 1048691, pgoff = 3066228736, inode = 0 }
+vm_state.vm_map: 13589.829994088 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3066232832, end = 3076272128, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 13589.829996028 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3076272128, end = 3076431872, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 13589.829997967 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3076431872, end = 3076440064, flags = 1048691, pgoff = 3076431872, inode = 0 }
+vm_state.vm_map: 13589.830000023 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3076440064, end = 3078750208, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 13589.830001962 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3078750208, end = 3078778880, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 13589.830004025 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3078778880, end = 3078782976, flags = 1048691, pgoff = 3078778880, inode = 0 }
+vm_state.vm_map: 13589.830006112 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3078782976, end = 3078815744, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 13589.830008051 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3078815744, end = 3078819840, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 13589.830012885 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3078819840, end = 3078828032, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 13589.830015396 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3078828032, end = 3078832128, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 13589.830017637 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3078832128, end = 3078840320, flags = 134217845, pgoff = 0, inode = 1450546 }
+vm_state.vm_map: 13589.830019662 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3078840320, end = 3078844416, flags = 135266417, pgoff = 4096, inode = 1450546 }
+vm_state.vm_map: 13589.830021712 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3078844416, end = 3078848512, flags = 135266419, pgoff = 8192, inode = 1450546 }
+vm_state.vm_map: 13589.830023886 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3078848512, end = 3078877184, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.830026047 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3078877184, end = 3078885376, flags = 1048691, pgoff = 3078877184, inode = 0 }
+vm_state.vm_map: 13589.830028103 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3078885376, end = 3078889472, flags = 67371125, pgoff = 3078885376, inode = 0 }
+vm_state.vm_map: 13589.830030288 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3078889472, end = 3079004160, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.830032313 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3079004160, end = 3079008256, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.830034463 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3079008256, end = 3079012352, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.830036506 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2243, start = 3218235392, end = 3218321408, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.830039320 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 134512640, end = 134533120, flags = 134223989, pgoff = 0, inode = 1352628 }
+vm_state.vm_map: 13589.830041456 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 134533120, end = 134537216, flags = 135272563, pgoff = 16384, inode = 1352628 }
+vm_state.vm_map: 13589.830043518 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 148488192, end = 149569536, flags = 1048691, pgoff = 148488192, inode = 0 }
+vm_state.vm_map: 13589.830048616 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3044704256, end = 3044900864, flags = 134217845, pgoff = 0, inode = 1114220 }
+vm_state.vm_map: 13589.830050992 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3044900864, end = 3044904960, flags = 135266419, pgoff = 196608, inode = 1114220 }
+vm_state.vm_map: 13589.830053301 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3044904960, end = 3044945920, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.830055333 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3044945920, end = 3044950016, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.830057426 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3044950016, end = 3044954112, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.830059722 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3044954112, end = 3044990976, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.830061692 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3044990976, end = 3044995072, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.830063637 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3044995072, end = 3044999168, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.830065946 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3044999168, end = 3045076992, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.830068009 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3045076992, end = 3045081088, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.830069960 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3045081088, end = 3045085184, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.830071979 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3045085184, end = 3045093376, flags = 1048691, pgoff = 3045085184, inode = 0 }
+vm_state.vm_map: 13589.830074220 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3045093376, end = 3045117952, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.830076333 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3045117952, end = 3045122048, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.830078309 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3045122048, end = 3045126144, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.830080426 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047170048, end = 3047395328, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.830085315 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047395328, end = 3047399424, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.830087353 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047399424, end = 3047403520, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.830089679 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047403520, end = 3047604224, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 13589.830091723 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047604224, end = 3047608320, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 13589.830096224 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047608320, end = 3047632896, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 13589.830098391 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047632896, end = 3047636992, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 13589.830100699 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047731200, end = 3047735296, flags = 134217937, pgoff = 0, inode = 1196317 }
+vm_state.vm_map: 13589.830102835 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047735296, end = 3047759872, flags = 134217937, pgoff = 0, inode = 1196229 }
+vm_state.vm_map: 13589.830105089 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047759872, end = 3047763968, flags = 134217937, pgoff = 0, inode = 1196235 }
+vm_state.vm_map: 13589.830107361 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047763968, end = 3047768064, flags = 134217937, pgoff = 0, inode = 1196204 }
+vm_state.vm_map: 13589.830109546 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047768064, end = 3047772160, flags = 134217937, pgoff = 0, inode = 1196228 }
+vm_state.vm_map: 13589.830111670 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047772160, end = 3047776256, flags = 134217937, pgoff = 0, inode = 1196227 }
+vm_state.vm_map: 13589.830113972 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047776256, end = 3047784448, flags = 134217937, pgoff = 0, inode = 1196198 }
+vm_state.vm_map: 13589.830118504 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047784448, end = 3047817216, flags = 134217937, pgoff = 0, inode = 1196200 }
+vm_state.vm_map: 13589.830121003 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047817216, end = 3047829504, flags = 134217937, pgoff = 0, inode = 1196226 }
+vm_state.vm_map: 13589.830123294 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047829504, end = 3047837696, flags = 134217937, pgoff = 0, inode = 1196225 }
+vm_state.vm_map: 13589.830125430 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047837696, end = 3047841792, flags = 134217937, pgoff = 0, inode = 1196224 }
+vm_state.vm_map: 13589.830127486 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047841792, end = 3047845888, flags = 134217937, pgoff = 0, inode = 1196223 }
+vm_state.vm_map: 13589.830129549 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047845888, end = 3047849984, flags = 134217937, pgoff = 0, inode = 1196202 }
+vm_state.vm_map: 13589.830131605 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047849984, end = 3047878656, flags = 134217937, pgoff = 0, inode = 1196222 }
+vm_state.vm_map: 13589.830133765 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047878656, end = 3047890944, flags = 134217937, pgoff = 0, inode = 1196221 }
+vm_state.vm_map: 13589.830135895 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047890944, end = 3047895040, flags = 134217937, pgoff = 0, inode = 1196220 }
+vm_state.vm_map: 13589.830138075 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047895040, end = 3047903232, flags = 134217937, pgoff = 0, inode = 1196219 }
+vm_state.vm_map: 13589.830140125 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047903232, end = 3047907328, flags = 134217937, pgoff = 0, inode = 1196210 }
+vm_state.vm_map: 13589.830142335 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047907328, end = 3047911424, flags = 134217937, pgoff = 0, inode = 1196205 }
+vm_state.vm_map: 13589.830144398 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047911424, end = 3047923712, flags = 134217937, pgoff = 0, inode = 1196244 }
+vm_state.vm_map: 13589.830146455 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047923712, end = 3047931904, flags = 134217937, pgoff = 0, inode = 1196270 }
+vm_state.vm_map: 13589.830148609 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047931904, end = 3047964672, flags = 134217937, pgoff = 0, inode = 1196246 }
+vm_state.vm_map: 13589.830150659 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047964672, end = 3047985152, flags = 134217937, pgoff = 0, inode = 1196269 }
+vm_state.vm_map: 13589.830152703 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047985152, end = 3047993344, flags = 134217937, pgoff = 0, inode = 1196316 }
+vm_state.vm_map: 13589.830155245 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3047993344, end = 3048022016, flags = 134217937, pgoff = 0, inode = 1196197 }
+vm_state.vm_map: 13589.830157308 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3048022016, end = 3048067072, flags = 134217937, pgoff = 0, inode = 1196312 }
+vm_state.vm_map: 13589.830159481 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3048067072, end = 3048124416, flags = 134217937, pgoff = 0, inode = 1196272 }
+vm_state.vm_map: 13589.830161544 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3048124416, end = 3048136704, flags = 134217937, pgoff = 0, inode = 1196315 }
+vm_state.vm_map: 13589.830163612 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3048136704, end = 3048194048, flags = 134217937, pgoff = 0, inode = 1196231 }
+vm_state.vm_map: 13589.830165872 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3048194048, end = 3049525248, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.830167922 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3049525248, end = 3049537536, flags = 1048691, pgoff = 3049525248, inode = 0 }
+vm_state.vm_map: 13589.830170138 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3049537536, end = 3049553920, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.830172065 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3049553920, end = 3049558016, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.830174233 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3049558016, end = 3049574400, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 13589.830176165 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3049574400, end = 3049578496, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 13589.830178234 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3049578496, end = 3049611264, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 13589.830180167 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3049611264, end = 3049615360, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 13589.830182106 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3049615360, end = 3049619456, flags = 1048691, pgoff = 3049615360, inode = 0 }
+vm_state.vm_map: 13589.830186810 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3049619456, end = 3049635840, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 13589.830189112 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3049635840, end = 3049639936, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 13589.830191538 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3049639936, end = 3049971712, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 13589.830193532 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3049971712, end = 3049979904, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 13589.830195767 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3049979904, end = 3050078208, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.830197867 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3050078208, end = 3050082304, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.830200151 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3050082304, end = 3050229760, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.830202213 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3050229760, end = 3050237952, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.830204595 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3050237952, end = 3050250240, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 13589.830206652 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3050250240, end = 3050254336, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 13589.830208696 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3050254336, end = 3050258432, flags = 1048691, pgoff = 3050254336, inode = 0 }
+vm_state.vm_map: 13589.830210992 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3050258432, end = 3050266624, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.830213030 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3050266624, end = 3050270720, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.830215339 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3050270720, end = 3050590208, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 13589.830217364 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3050590208, end = 3050606592, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 13589.830219531 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3050606592, end = 3050799104, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.830221557 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3050799104, end = 3050803200, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.830224197 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3050803200, end = 3054399488, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 13589.830226156 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3054399488, end = 3054497792, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 13589.830228089 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3054497792, end = 3054501888, flags = 1048691, pgoff = 3054497792, inode = 0 }
+vm_state.vm_map: 13589.830230268 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3054501888, end = 3054788608, flags = 134217845, pgoff = 0, inode = 20877 }
+vm_state.vm_map: 13589.830232201 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3054788608, end = 3054796800, flags = 135266419, pgoff = 282624, inode = 20877 }
+vm_state.vm_map: 13589.830234152 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3054796800, end = 3054800896, flags = 1048691, pgoff = 3054796800, inode = 0 }
+vm_state.vm_map: 13589.830236319 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3054800896, end = 3055734784, flags = 134217845, pgoff = 0, inode = 20876 }
+vm_state.vm_map: 13589.830238247 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3055734784, end = 3055747072, flags = 135266419, pgoff = 933888, inode = 20876 }
+vm_state.vm_map: 13589.830240340 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3055747072, end = 3055808512, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 13589.830242273 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3055808512, end = 3055812608, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 13589.830244434 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3055812608, end = 3056943104, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 13589.830246373 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3056943104, end = 3056959488, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 13589.830248559 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3056959488, end = 3057229824, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 13589.830250486 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3057229824, end = 3057238016, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 13589.830252665 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3057238016, end = 3058388992, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.830254592 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3058388992, end = 3058405376, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.830256870 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3058405376, end = 3058409472, flags = 1048691, pgoff = 3058405376, inode = 0 }
+vm_state.vm_map: 13589.830259099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3058409472, end = 3058462720, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 13589.830261050 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3058462720, end = 3058466816, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 13589.830263205 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3058466816, end = 3058638848, flags = 134217845, pgoff = 0, inode = 1065255 }
+vm_state.vm_map: 13589.830265132 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3058638848, end = 3058642944, flags = 135266419, pgoff = 172032, inode = 1065255 }
+vm_state.vm_map: 13589.830267323 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3058642944, end = 3058675712, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 13589.830269257 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3058675712, end = 3058679808, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 13589.830271430 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3058679808, end = 3058765824, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 13589.830273394 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3058765824, end = 3058769920, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 13589.830275327 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3058769920, end = 3058778112, flags = 1048691, pgoff = 3058769920, inode = 0 }
+vm_state.vm_map: 13589.830277525 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3058778112, end = 3058806784, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 13589.830279463 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3058806784, end = 3058810880, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 13589.830284174 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3058810880, end = 3059056640, flags = 134217845, pgoff = 0, inode = 20603 }
+vm_state.vm_map: 13589.830286347 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3059056640, end = 3059060736, flags = 135266419, pgoff = 245760, inode = 20603 }
+vm_state.vm_map: 13589.830288390 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3059060736, end = 3059064832, flags = 1048691, pgoff = 3059060736, inode = 0 }
+vm_state.vm_map: 13589.830290946 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3059064832, end = 3059535872, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 13589.830292928 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3059535872, end = 3059552256, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 13589.830295243 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3059552256, end = 3059695616, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 13589.830297269 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3059695616, end = 3059699712, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 13589.830299541 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3059699712, end = 3059785728, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 13589.830301566 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3059785728, end = 3059789824, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 13589.830303850 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3059789824, end = 3059904512, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.830305882 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3059904512, end = 3059908608, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.830308171 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3059908608, end = 3060056064, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.830310216 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3060056064, end = 3060060160, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.830314605 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3060060160, end = 3060064256, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.830316655 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3060064256, end = 3060068352, flags = 1048691, pgoff = 3060064256, inode = 0 }
+vm_state.vm_map: 13589.830318884 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3060068352, end = 3060076544, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.830320823 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3060076544, end = 3060080640, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.830322762 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3060080640, end = 3060084736, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.830325286 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3060084736, end = 3060170752, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.830327226 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3060170752, end = 3060174848, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.830329152 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3060174848, end = 3060178944, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.830331086 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3060178944, end = 3060187136, flags = 1048691, pgoff = 3060178944, inode = 0 }
+vm_state.vm_map: 13589.830333142 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3060187136, end = 3060932608, flags = 134217845, pgoff = 0, inode = 499794 }
+vm_state.vm_map: 13589.830335069 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3060932608, end = 3060936704, flags = 135266419, pgoff = 745472, inode = 499794 }
+vm_state.vm_map: 13589.830337231 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3060936704, end = 3060965376, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.830339299 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3060965376, end = 3060969472, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.830341343 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3060969472, end = 3060973568, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.830343436 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3060973568, end = 3060989952, flags = 134217845, pgoff = 0, inode = 20149 }
+vm_state.vm_map: 13589.830345387 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3060989952, end = 3060994048, flags = 135266419, pgoff = 12288, inode = 20149 }
+vm_state.vm_map: 13589.830347327 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3060994048, end = 3060998144, flags = 1048691, pgoff = 3060994048, inode = 0 }
+vm_state.vm_map: 13589.830349425 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3060998144, end = 3061080064, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.830351353 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3061080064, end = 3061084160, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.830353514 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3061084160, end = 3062398976, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.830355447 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3062398976, end = 3062407168, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.830357732 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3062407168, end = 3062411264, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.830359665 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3062411264, end = 3062423552, flags = 1048691, pgoff = 3062411264, inode = 0 }
+vm_state.vm_map: 13589.830361831 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3062423552, end = 3063361536, flags = 134217845, pgoff = 0, inode = 16850 }
+vm_state.vm_map: 13589.830363764 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3063361536, end = 3063377920, flags = 135266417, pgoff = 937984, inode = 16850 }
+vm_state.vm_map: 13589.830365697 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3063377920, end = 3063382016, flags = 135266419, pgoff = 954368, inode = 16850 }
+vm_state.vm_map: 13589.830367630 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3063382016, end = 3063410688, flags = 1048691, pgoff = 3063382016, inode = 0 }
+vm_state.vm_map: 13589.830369755 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3063410688, end = 3063824384, flags = 134217845, pgoff = 0, inode = 1065120 }
+vm_state.vm_map: 13589.830371694 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3063824384, end = 3063832576, flags = 135266419, pgoff = 409600, inode = 1065120 }
+vm_state.vm_map: 13589.830373787 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3063832576, end = 3066134528, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 13589.830375714 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3066134528, end = 3066179584, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 13589.830377893 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3066179584, end = 3066646528, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 13589.830379821 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3066646528, end = 3066654720, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 13589.830381754 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3066654720, end = 3066658816, flags = 1048691, pgoff = 3066654720, inode = 0 }
+vm_state.vm_map: 13589.830383914 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3066658816, end = 3076698112, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 13589.830385853 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3076698112, end = 3076857856, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 13589.830387885 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3076857856, end = 3076866048, flags = 1048691, pgoff = 3076857856, inode = 0 }
+vm_state.vm_map: 13589.830390299 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3076866048, end = 3079176192, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 13589.830392232 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3079176192, end = 3079204864, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 13589.830394159 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3079204864, end = 3079208960, flags = 1048691, pgoff = 3079204864, inode = 0 }
+vm_state.vm_map: 13589.830396332 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3079208960, end = 3079241728, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 13589.830398382 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3079241728, end = 3079245824, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 13589.830400543 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3079245824, end = 3079254016, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 13589.830402476 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3079254016, end = 3079258112, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 13589.830404582 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3079258112, end = 3079266304, flags = 134217845, pgoff = 0, inode = 1450546 }
+vm_state.vm_map: 13589.830406619 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3079266304, end = 3079270400, flags = 135266417, pgoff = 4096, inode = 1450546 }
+vm_state.vm_map: 13589.830408558 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3079270400, end = 3079274496, flags = 135266419, pgoff = 8192, inode = 1450546 }
+vm_state.vm_map: 13589.830436392 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3079274496, end = 3079303168, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.830438639 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3079303168, end = 3079311360, flags = 1048691, pgoff = 3079303168, inode = 0 }
+vm_state.vm_map: 13589.830440683 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3079311360, end = 3079315456, flags = 67371125, pgoff = 3079311360, inode = 0 }
+vm_state.vm_map: 13589.830442998 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3079315456, end = 3079430144, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.830445060 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3079430144, end = 3079434240, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.830447073 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3079434240, end = 3079438336, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.830449665 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2245, start = 3217170432, end = 3217256448, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.830452387 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 134512640, end = 134533120, flags = 134223989, pgoff = 0, inode = 1352628 }
+vm_state.vm_map: 13589.830454566 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 134533120, end = 134537216, flags = 135272563, pgoff = 16384, inode = 1352628 }
+vm_state.vm_map: 13589.830456690 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 136228864, end = 137306112, flags = 1048691, pgoff = 136228864, inode = 0 }
+vm_state.vm_map: 13589.830458986 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3035512832, end = 3035516928, flags = 1048688, pgoff = 3035512832, inode = 0 }
+vm_state.vm_map: 13589.830460974 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3035516928, end = 3043905536, flags = 1048691, pgoff = 3035516928, inode = 0 }
+vm_state.vm_map: 13589.830463437 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3043905536, end = 3043946496, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.830465463 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3043946496, end = 3043950592, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.830467629 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3043950592, end = 3043954688, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.830469741 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3043954688, end = 3043991552, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.830471915 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3043991552, end = 3043995648, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.830474020 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3043995648, end = 3043999744, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.830476427 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3043999744, end = 3044077568, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.830478452 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3044077568, end = 3044081664, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.830480546 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3044081664, end = 3044085760, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.830482522 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3044085760, end = 3044093952, flags = 1048691, pgoff = 3044085760, inode = 0 }
+vm_state.vm_map: 13589.830485151 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3044093952, end = 3044118528, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.830487219 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3044118528, end = 3044122624, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.830489387 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3044122624, end = 3044126720, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.830491640 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046170624, end = 3046395904, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.830493795 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046395904, end = 3046400000, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.830495734 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046400000, end = 3046404096, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.830498061 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046404096, end = 3046604800, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 13589.830500031 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046604800, end = 3046608896, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 13589.830502371 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046608896, end = 3046633472, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 13589.830504415 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046633472, end = 3046637568, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 13589.830512978 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046678528, end = 3046727680, flags = 134217845, pgoff = 0, inode = 1114257 }
+vm_state.vm_map: 13589.830515145 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046727680, end = 3046731776, flags = 135266419, pgoff = 45056, inode = 1114257 }
+vm_state.vm_map: 13589.830517435 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046731776, end = 3046735872, flags = 134217937, pgoff = 0, inode = 1196317 }
+vm_state.vm_map: 13589.830519627 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046735872, end = 3046760448, flags = 134217937, pgoff = 0, inode = 1196229 }
+vm_state.vm_map: 13589.830522139 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046760448, end = 3046764544, flags = 134217937, pgoff = 0, inode = 1196235 }
+vm_state.vm_map: 13589.830524386 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046764544, end = 3046768640, flags = 134217937, pgoff = 0, inode = 1196204 }
+vm_state.vm_map: 13589.830526596 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046768640, end = 3046772736, flags = 134217937, pgoff = 0, inode = 1196228 }
+vm_state.vm_map: 13589.830528745 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046772736, end = 3046776832, flags = 134217937, pgoff = 0, inode = 1196227 }
+vm_state.vm_map: 13589.830530900 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046776832, end = 3046785024, flags = 134217937, pgoff = 0, inode = 1196198 }
+vm_state.vm_map: 13589.830533018 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046785024, end = 3046817792, flags = 134217937, pgoff = 0, inode = 1196200 }
+vm_state.vm_map: 13589.830535271 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046817792, end = 3046830080, flags = 134217937, pgoff = 0, inode = 1196226 }
+vm_state.vm_map: 13589.830537474 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046830080, end = 3046838272, flags = 134217937, pgoff = 0, inode = 1196225 }
+vm_state.vm_map: 13589.830539635 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046838272, end = 3046842368, flags = 134217937, pgoff = 0, inode = 1196224 }
+vm_state.vm_map: 13589.830541723 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046842368, end = 3046846464, flags = 134217937, pgoff = 0, inode = 1196223 }
+vm_state.vm_map: 13589.830544019 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046846464, end = 3046850560, flags = 134217937, pgoff = 0, inode = 1196202 }
+vm_state.vm_map: 13589.830546192 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046850560, end = 3046879232, flags = 134217937, pgoff = 0, inode = 1196222 }
+vm_state.vm_map: 13589.830548371 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046879232, end = 3046891520, flags = 134217937, pgoff = 0, inode = 1196221 }
+vm_state.vm_map: 13589.830550440 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046891520, end = 3046895616, flags = 134217937, pgoff = 0, inode = 1196220 }
+vm_state.vm_map: 13589.830552841 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046895616, end = 3046903808, flags = 134217937, pgoff = 0, inode = 1196219 }
+vm_state.vm_map: 13589.830555125 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046903808, end = 3046907904, flags = 134217937, pgoff = 0, inode = 1196210 }
+vm_state.vm_map: 13589.830557668 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046907904, end = 3046912000, flags = 134217937, pgoff = 0, inode = 1196205 }
+vm_state.vm_map: 13589.830559842 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046912000, end = 3046924288, flags = 134217937, pgoff = 0, inode = 1196244 }
+vm_state.vm_map: 13589.830561978 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046924288, end = 3046932480, flags = 134217937, pgoff = 0, inode = 1196270 }
+vm_state.vm_map: 13589.830564126 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046932480, end = 3046965248, flags = 134217937, pgoff = 0, inode = 1196246 }
+vm_state.vm_map: 13589.830566274 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046965248, end = 3046985728, flags = 134217937, pgoff = 0, inode = 1196269 }
+vm_state.vm_map: 13589.830568429 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046985728, end = 3046993920, flags = 134217937, pgoff = 0, inode = 1196316 }
+vm_state.vm_map: 13589.830570585 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046993920, end = 3047022592, flags = 134217937, pgoff = 0, inode = 1196197 }
+vm_state.vm_map: 13589.830572874 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3047022592, end = 3047067648, flags = 134217937, pgoff = 0, inode = 1196312 }
+vm_state.vm_map: 13589.830575085 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3047067648, end = 3047124992, flags = 134217937, pgoff = 0, inode = 1196272 }
+vm_state.vm_map: 13589.830577301 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3047124992, end = 3047137280, flags = 134217937, pgoff = 0, inode = 1196315 }
+vm_state.vm_map: 13589.830579418 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3047137280, end = 3047194624, flags = 134217937, pgoff = 0, inode = 1196231 }
+vm_state.vm_map: 13589.830581685 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3047194624, end = 3048525824, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.830583759 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3048525824, end = 3048538112, flags = 1048691, pgoff = 3048525824, inode = 0 }
+vm_state.vm_map: 13589.830585957 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3048538112, end = 3048554496, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.830587994 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3048554496, end = 3048558592, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.830590137 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3048558592, end = 3048574976, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 13589.830592642 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3048574976, end = 3048579072, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 13589.830594933 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3048579072, end = 3048611840, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 13589.830596971 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3048611840, end = 3048615936, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 13589.830598934 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3048615936, end = 3048620032, flags = 1048691, pgoff = 3048615936, inode = 0 }
+vm_state.vm_map: 13589.830601224 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3048620032, end = 3048636416, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 13589.830603250 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3048636416, end = 3048640512, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 13589.830605547 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3048640512, end = 3048972288, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 13589.830607621 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3048972288, end = 3048980480, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 13589.830609702 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3048980480, end = 3049078784, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.830611870 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049078784, end = 3049082880, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.830614030 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049082880, end = 3049230336, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.830615994 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049230336, end = 3049238528, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.830618536 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049238528, end = 3049250816, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 13589.830620568 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049250816, end = 3049254912, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 13589.830622606 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049254912, end = 3049259008, flags = 1048691, pgoff = 3049254912, inode = 0 }
+vm_state.vm_map: 13589.830624712 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049259008, end = 3049267200, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.830627217 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049267200, end = 3049271296, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.830629507 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049271296, end = 3049590784, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 13589.830631533 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049590784, end = 3049607168, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 13589.830633822 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049607168, end = 3049799680, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.830635855 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049799680, end = 3049803776, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.830638145 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049803776, end = 3053400064, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 13589.830640188 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3053400064, end = 3053498368, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 13589.830642146 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3053498368, end = 3053502464, flags = 1048691, pgoff = 3053498368, inode = 0 }
+vm_state.vm_map: 13589.830644565 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3053502464, end = 3053789184, flags = 134217845, pgoff = 0, inode = 20877 }
+vm_state.vm_map: 13589.830646598 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3053789184, end = 3053797376, flags = 135266419, pgoff = 282624, inode = 20877 }
+vm_state.vm_map: 13589.830648635 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3053797376, end = 3053801472, flags = 1048691, pgoff = 3053797376, inode = 0 }
+vm_state.vm_map: 13589.830650845 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3053801472, end = 3054735360, flags = 134217845, pgoff = 0, inode = 20876 }
+vm_state.vm_map: 13589.830653025 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3054735360, end = 3054747648, flags = 135266419, pgoff = 933888, inode = 20876 }
+vm_state.vm_map: 13589.830655198 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3054747648, end = 3054809088, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 13589.830657236 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3054809088, end = 3054813184, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 13589.830659483 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3054813184, end = 3055943680, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 13589.830661927 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3055943680, end = 3055960064, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 13589.830664212 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3055960064, end = 3056230400, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 13589.830666237 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3056230400, end = 3056238592, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 13589.830668502 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3056238592, end = 3057389568, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.830670534 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3057389568, end = 3057405952, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.830672682 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3057405952, end = 3057410048, flags = 1048691, pgoff = 3057405952, inode = 0 }
+vm_state.vm_map: 13589.830674837 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3057410048, end = 3057463296, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 13589.830676875 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3057463296, end = 3057467392, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 13589.830679171 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3057467392, end = 3057639424, flags = 134217845, pgoff = 0, inode = 1065255 }
+vm_state.vm_map: 13589.830681203 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3057639424, end = 3057643520, flags = 135266419, pgoff = 172032, inode = 1065255 }
+vm_state.vm_map: 13589.830686005 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3057643520, end = 3057676288, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 13589.830688049 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3057676288, end = 3057680384, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 13589.830690290 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3057680384, end = 3057766400, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 13589.830692328 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3057766400, end = 3057770496, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 13589.830694353 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3057770496, end = 3057778688, flags = 1048691, pgoff = 3057770496, inode = 0 }
+vm_state.vm_map: 13589.830696804 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3057778688, end = 3057807360, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 13589.830698946 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3057807360, end = 3057811456, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 13589.830701143 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3057811456, end = 3058057216, flags = 134217845, pgoff = 0, inode = 20603 }
+vm_state.vm_map: 13589.830703181 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3058057216, end = 3058061312, flags = 135266419, pgoff = 245760, inode = 20603 }
+vm_state.vm_map: 13589.830705182 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3058061312, end = 3058065408, flags = 1048691, pgoff = 3058061312, inode = 0 }
+vm_state.vm_map: 13589.830707430 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3058065408, end = 3058536448, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 13589.830709461 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3058536448, end = 3058552832, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 13589.830711659 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3058552832, end = 3058696192, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 13589.830713622 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3058696192, end = 3058700288, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 13589.830715895 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3058700288, end = 3058786304, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 13589.830717926 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3058786304, end = 3058790400, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 13589.830720142 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3058790400, end = 3058905088, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.830722101 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3058905088, end = 3058909184, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.830724458 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3058909184, end = 3059056640, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.830726496 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3059056640, end = 3059060736, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.830728546 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3059060736, end = 3059064832, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.830730848 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3059064832, end = 3059068928, flags = 1048691, pgoff = 3059064832, inode = 0 }
+vm_state.vm_map: 13589.830733200 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3059068928, end = 3059077120, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.830735238 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3059077120, end = 3059081216, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.830737282 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3059081216, end = 3059085312, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.830739424 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3059085312, end = 3059171328, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.830741585 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3059171328, end = 3059175424, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.830743623 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3059175424, end = 3059179520, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.830745667 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3059179520, end = 3059187712, flags = 1048691, pgoff = 3059179520, inode = 0 }
+vm_state.vm_map: 13589.830747754 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3059187712, end = 3059933184, flags = 134217845, pgoff = 0, inode = 499794 }
+vm_state.vm_map: 13589.830749921 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3059933184, end = 3059937280, flags = 135266419, pgoff = 745472, inode = 499794 }
+vm_state.vm_map: 13589.830752119 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3059937280, end = 3059965952, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.830754150 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3059965952, end = 3059970048, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.830756189 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3059970048, end = 3059974144, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.830758430 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3059974144, end = 3059990528, flags = 134217845, pgoff = 0, inode = 20149 }
+vm_state.vm_map: 13589.830760467 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3059990528, end = 3059994624, flags = 135266419, pgoff = 12288, inode = 20149 }
+vm_state.vm_map: 13589.830762505 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3059994624, end = 3059998720, flags = 1048691, pgoff = 3059994624, inode = 0 }
+vm_state.vm_map: 13589.830765103 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3059998720, end = 3060080640, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.830767233 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3060080640, end = 3060084736, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.830769431 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3060084736, end = 3061399552, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.830771475 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3061399552, end = 3061407744, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.830773512 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3061407744, end = 3061411840, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.830775514 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3061411840, end = 3061424128, flags = 1048691, pgoff = 3061411840, inode = 0 }
+vm_state.vm_map: 13589.830777779 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3061424128, end = 3062362112, flags = 134217845, pgoff = 0, inode = 16850 }
+vm_state.vm_map: 13589.830779737 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3062362112, end = 3062378496, flags = 135266417, pgoff = 937984, inode = 16850 }
+vm_state.vm_map: 13589.830781873 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3062378496, end = 3062382592, flags = 135266419, pgoff = 954368, inode = 16850 }
+vm_state.vm_map: 13589.830783818 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3062382592, end = 3062411264, flags = 1048691, pgoff = 3062382592, inode = 0 }
+vm_state.vm_map: 13589.830786165 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3062411264, end = 3062824960, flags = 134217845, pgoff = 0, inode = 1065120 }
+vm_state.vm_map: 13589.830788190 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3062824960, end = 3062833152, flags = 135266419, pgoff = 409600, inode = 1065120 }
+vm_state.vm_map: 13589.830790394 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3062833152, end = 3065135104, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 13589.830792363 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3065135104, end = 3065180160, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 13589.830794844 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3065180160, end = 3065647104, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 13589.830796871 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3065647104, end = 3065655296, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 13589.830799253 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3065655296, end = 3065659392, flags = 1048691, pgoff = 3065655296, inode = 0 }
+vm_state.vm_map: 13589.830801444 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3065659392, end = 3075698688, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 13589.830803617 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3075698688, end = 3075858432, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 13589.830805655 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3075858432, end = 3075866624, flags = 1048691, pgoff = 3075858432, inode = 0 }
+vm_state.vm_map: 13589.830807841 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3075866624, end = 3078176768, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 13589.830809799 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3078176768, end = 3078205440, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 13589.830811947 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3078205440, end = 3078209536, flags = 1048691, pgoff = 3078205440, inode = 0 }
+vm_state.vm_map: 13589.830814102 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3078209536, end = 3078242304, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 13589.830816288 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3078242304, end = 3078246400, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 13589.830818504 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3078246400, end = 3078254592, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 13589.830820671 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3078254592, end = 3078258688, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 13589.830822906 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3078258688, end = 3078266880, flags = 134217845, pgoff = 0, inode = 1450546 }
+vm_state.vm_map: 13589.830824869 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3078266880, end = 3078270976, flags = 135266417, pgoff = 4096, inode = 1450546 }
+vm_state.vm_map: 13589.830827049 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3078270976, end = 3078275072, flags = 135266419, pgoff = 8192, inode = 1450546 }
+vm_state.vm_map: 13589.830829339 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3078275072, end = 3078303744, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.830831377 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3078303744, end = 3078311936, flags = 1048691, pgoff = 3078303744, inode = 0 }
+vm_state.vm_map: 13589.830833710 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3078311936, end = 3078316032, flags = 67371125, pgoff = 3078311936, inode = 0 }
+vm_state.vm_map: 13589.830835939 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3078316032, end = 3078430720, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.830837983 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3078430720, end = 3078434816, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.830840027 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3078434816, end = 3078438912, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.830841985 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2247, start = 3212898304, end = 3212984320, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.830844952 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 134512640, end = 135290880, flags = 134223989, pgoff = 0, inode = 1048644 }
+vm_state.vm_map: 13589.830846996 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 135290880, end = 135311360, flags = 135272563, pgoff = 778240, inode = 1048644 }
+vm_state.vm_map: 13589.830849145 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 135311360, end = 135331840, flags = 1048691, pgoff = 135311360, inode = 0 }
+vm_state.vm_map: 13589.830851201 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 166080512, end = 166957056, flags = 1048691, pgoff = 166080512, inode = 0 }
+vm_state.vm_map: 13589.830853664 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3075723264, end = 3075764224, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.830855714 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3075764224, end = 3075768320, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.830857752 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3075768320, end = 3075772416, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.830859820 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3075772416, end = 3075809280, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.830861999 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3075809280, end = 3075813376, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.830863981 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3075813376, end = 3075817472, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.830866364 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3075817472, end = 3075895296, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.830868778 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3075895296, end = 3075899392, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.830870945 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3075899392, end = 3075903488, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.830872908 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3075903488, end = 3075911680, flags = 1048691, pgoff = 3075903488, inode = 0 }
+vm_state.vm_map: 13589.830875198 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3075911680, end = 3075936256, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.830877249 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3075936256, end = 3075940352, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.830879287 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3075940352, end = 3075944448, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.830881478 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3075944448, end = 3077275648, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.830883645 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3077275648, end = 3077279744, flags = 1048691, pgoff = 3077275648, inode = 0 }
+vm_state.vm_map: 13589.830885806 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3077279744, end = 3078594560, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.830887838 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3078594560, end = 3078602752, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.830889999 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3078602752, end = 3078606848, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.830891969 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3078606848, end = 3078623232, flags = 1048691, pgoff = 3078606848, inode = 0 }
+vm_state.vm_map: 13589.830894142 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3078623232, end = 3078631424, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.830896328 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3078631424, end = 3078635520, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.830898477 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3078635520, end = 3078639616, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.830900853 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3078639616, end = 3078856704, flags = 134217845, pgoff = 0, inode = 499784 }
+vm_state.vm_map: 13589.830903130 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3078856704, end = 3078868992, flags = 135266419, pgoff = 217088, inode = 499784 }
+vm_state.vm_map: 13589.830905408 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3078934528, end = 3078963200, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.830907446 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3078963200, end = 3078971392, flags = 1048691, pgoff = 3078963200, inode = 0 }
+vm_state.vm_map: 13589.830909589 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3078971392, end = 3078975488, flags = 67371125, pgoff = 3078971392, inode = 0 }
+vm_state.vm_map: 13589.830911676 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3078975488, end = 3079090176, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.830913836 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3079090176, end = 3079094272, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.830915979 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3079094272, end = 3079098368, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.830918023 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2250, start = 3215880192, end = 3215966208, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.830920873 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 134512640, end = 135245824, flags = 134223989, pgoff = 0, inode = 23493 }
+vm_state.vm_map: 13589.830923059 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 135245824, end = 135315456, flags = 135272563, pgoff = 729088, inode = 23493 }
+vm_state.vm_map: 13589.830925306 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 135315456, end = 135327744, flags = 1048691, pgoff = 135315456, inode = 0 }
+vm_state.vm_map: 13589.830927380 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 152678400, end = 153767936, flags = 1048691, pgoff = 152678400, inode = 0 }
+vm_state.vm_map: 13589.830929862 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3060264960, end = 3061067776, flags = 134217845, pgoff = 0, inode = 21274 }
+vm_state.vm_map: 13589.830931943 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061067776, end = 3061084160, flags = 135266419, pgoff = 802816, inode = 21274 }
+vm_state.vm_map: 13589.830937188 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061178368, end = 3061190656, flags = 134217845, pgoff = 0, inode = 141213 }
+vm_state.vm_map: 13589.830939675 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061190656, end = 3061194752, flags = 135266419, pgoff = 8192, inode = 141213 }
+vm_state.vm_map: 13589.830941978 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061194752, end = 3061215232, flags = 1048691, pgoff = 3061194752, inode = 0 }
+vm_state.vm_map: 13589.830944145 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061215232, end = 3061276672, flags = 134217841, pgoff = 0, inode = 649749 }
+vm_state.vm_map: 13589.830949064 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061276672, end = 3061284864, flags = 134217845, pgoff = 0, inode = 87435 }
+vm_state.vm_map: 13589.830951225 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061284864, end = 3061288960, flags = 135266419, pgoff = 4096, inode = 87435 }
+vm_state.vm_map: 13589.830953330 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061288960, end = 3061293056, flags = 134217937, pgoff = 0, inode = 1196317 }
+vm_state.vm_map: 13589.830955405 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061293056, end = 3061317632, flags = 134217937, pgoff = 0, inode = 1196229 }
+vm_state.vm_map: 13589.830957479 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061317632, end = 3061321728, flags = 134217937, pgoff = 0, inode = 1196235 }
+vm_state.vm_map: 13589.830959524 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061321728, end = 3061325824, flags = 134217937, pgoff = 0, inode = 1196204 }
+vm_state.vm_map: 13589.830961568 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061325824, end = 3061329920, flags = 134217937, pgoff = 0, inode = 1196228 }
+vm_state.vm_map: 13589.830963790 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061329920, end = 3061334016, flags = 134217937, pgoff = 0, inode = 1196227 }
+vm_state.vm_map: 13589.830965878 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061334016, end = 3061342208, flags = 134217937, pgoff = 0, inode = 1196198 }
+vm_state.vm_map: 13589.830967920 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061342208, end = 3061374976, flags = 134217937, pgoff = 0, inode = 1196200 }
+vm_state.vm_map: 13589.830969971 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061374976, end = 3061387264, flags = 134217937, pgoff = 0, inode = 1196226 }
+vm_state.vm_map: 13589.830972138 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061387264, end = 3061395456, flags = 134217937, pgoff = 0, inode = 1196225 }
+vm_state.vm_map: 13589.830974607 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061395456, end = 3061399552, flags = 134217937, pgoff = 0, inode = 1196224 }
+vm_state.vm_map: 13589.830976730 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061399552, end = 3061403648, flags = 134217937, pgoff = 0, inode = 1196223 }
+vm_state.vm_map: 13589.830978972 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061403648, end = 3061407744, flags = 134217937, pgoff = 0, inode = 1196202 }
+vm_state.vm_map: 13589.830981164 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061407744, end = 3061436416, flags = 134217937, pgoff = 0, inode = 1196222 }
+vm_state.vm_map: 13589.830983324 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061436416, end = 3061448704, flags = 134217937, pgoff = 0, inode = 1196221 }
+vm_state.vm_map: 13589.830985608 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061448704, end = 3061452800, flags = 134217937, pgoff = 0, inode = 1196220 }
+vm_state.vm_map: 13589.830987775 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061452800, end = 3061460992, flags = 134217937, pgoff = 0, inode = 1196219 }
+vm_state.vm_map: 13589.830989900 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061460992, end = 3061465088, flags = 134217937, pgoff = 0, inode = 1196210 }
+vm_state.vm_map: 13589.830991980 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061465088, end = 3061469184, flags = 134217937, pgoff = 0, inode = 1196205 }
+vm_state.vm_map: 13589.830994043 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061469184, end = 3061481472, flags = 134217937, pgoff = 0, inode = 1196244 }
+vm_state.vm_map: 13589.830996099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061481472, end = 3061489664, flags = 134217937, pgoff = 0, inode = 1196270 }
+vm_state.vm_map: 13589.830998150 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061489664, end = 3061522432, flags = 134217937, pgoff = 0, inode = 1196246 }
+vm_state.vm_map: 13589.831000341 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061522432, end = 3061542912, flags = 134217937, pgoff = 0, inode = 1196269 }
+vm_state.vm_map: 13589.831002397 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061542912, end = 3061551104, flags = 134217937, pgoff = 0, inode = 1196316 }
+vm_state.vm_map: 13589.831004453 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061551104, end = 3061579776, flags = 134217937, pgoff = 0, inode = 1196197 }
+vm_state.vm_map: 13589.831006534 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061579776, end = 3061624832, flags = 134217937, pgoff = 0, inode = 1196312 }
+vm_state.vm_map: 13589.831008942 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061624832, end = 3061682176, flags = 134217937, pgoff = 0, inode = 1196272 }
+vm_state.vm_map: 13589.831011016 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061682176, end = 3061694464, flags = 134217937, pgoff = 0, inode = 1196315 }
+vm_state.vm_map: 13589.831013208 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061694464, end = 3061751808, flags = 134217937, pgoff = 0, inode = 1196231 }
+vm_state.vm_map: 13589.831015492 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061751808, end = 3062145024, flags = 134217979, pgoff = 0, inode = 262145 }
+vm_state.vm_map: 13589.831017880 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3062145024, end = 3062538240, flags = 134217979, pgoff = 0, inode = 229376 }
+vm_state.vm_map: 13589.831020010 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3062538240, end = 3062566912, flags = 134217845, pgoff = 0, inode = 1065218 }
+vm_state.vm_map: 13589.831022073 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3062566912, end = 3062571008, flags = 135266419, pgoff = 28672, inode = 1065218 }
+vm_state.vm_map: 13589.831027287 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3062571008, end = 3062624256, flags = 134217845, pgoff = 0, inode = 24466 }
+vm_state.vm_map: 13589.831029449 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3062624256, end = 3062628352, flags = 135266419, pgoff = 49152, inode = 24466 }
+vm_state.vm_map: 13589.831031677 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3062628352, end = 3062648832, flags = 134217845, pgoff = 0, inode = 21278 }
+vm_state.vm_map: 13589.831033813 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3062648832, end = 3062652928, flags = 135266419, pgoff = 16384, inode = 21278 }
+vm_state.vm_map: 13589.831035980 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3062652928, end = 3062816768, flags = 134217845, pgoff = 0, inode = 21283 }
+vm_state.vm_map: 13589.831038012 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3062816768, end = 3062820864, flags = 135266419, pgoff = 159744, inode = 21283 }
+vm_state.vm_map: 13589.831042679 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3062820864, end = 3062882304, flags = 134217845, pgoff = 0, inode = 1065430 }
+vm_state.vm_map: 13589.831045073 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3062882304, end = 3062886400, flags = 135266419, pgoff = 57344, inode = 1065430 }
+vm_state.vm_map: 13589.831049710 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3062919168, end = 3062943744, flags = 134217845, pgoff = 0, inode = 87514 }
+vm_state.vm_map: 13589.831051858 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3062943744, end = 3062947840, flags = 135266419, pgoff = 20480, inode = 87514 }
+vm_state.vm_map: 13589.831054259 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3062947840, end = 3062980608, flags = 134217841, pgoff = 0, inode = 73897 }
+vm_state.vm_map: 13589.831056364 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3062980608, end = 3063021568, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.831058297 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3063021568, end = 3063025664, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.831060237 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3063025664, end = 3063029760, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.831062336 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3063029760, end = 3063066624, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.831064337 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3063066624, end = 3063070720, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.831066270 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3063070720, end = 3063074816, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.831068425 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3063074816, end = 3063152640, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.831070364 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3063152640, end = 3063156736, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.831072304 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3063156736, end = 3063160832, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.831074243 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3063160832, end = 3063169024, flags = 1048691, pgoff = 3063160832, inode = 0 }
+vm_state.vm_map: 13589.831076311 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3063169024, end = 3063193600, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.831078596 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3063193600, end = 3063197696, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.831080546 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3063197696, end = 3063201792, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.831083016 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3063218176, end = 3063246848, flags = 134217845, pgoff = 0, inode = 23696 }
+vm_state.vm_map: 13589.831085041 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3063246848, end = 3063250944, flags = 135266419, pgoff = 24576, inode = 23696 }
+vm_state.vm_map: 13589.831087331 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3063250944, end = 3063267328, flags = 134217845, pgoff = 0, inode = 1065432 }
+vm_state.vm_map: 13589.831089259 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3063267328, end = 3063271424, flags = 135266419, pgoff = 12288, inode = 1065432 }
+vm_state.vm_map: 13589.831091549 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3063271424, end = 3063291904, flags = 134217845, pgoff = 0, inode = 314599 }
+vm_state.vm_map: 13589.831093482 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3063291904, end = 3063296000, flags = 135266419, pgoff = 16384, inode = 314599 }
+vm_state.vm_map: 13589.831098474 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3063296000, end = 3063435264, flags = 134217841, pgoff = 0, inode = 74520 }
+vm_state.vm_map: 13589.831100747 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3063435264, end = 3064766464, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.831102901 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3064766464, end = 3064774656, flags = 1048691, pgoff = 3064766464, inode = 0 }
+vm_state.vm_map: 13589.831105093 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3064774656, end = 3064791040, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.831107130 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3064791040, end = 3064795136, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.831109107 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3064795136, end = 3064799232, flags = 1048691, pgoff = 3064795136, inode = 0 }
+vm_state.vm_map: 13589.831111206 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3064799232, end = 3064807424, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.831113626 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3064807424, end = 3064811520, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.831115780 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3064811520, end = 3064823808, flags = 134217845, pgoff = 0, inode = 20765 }
+vm_state.vm_map: 13589.831117719 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3064823808, end = 3064827904, flags = 135266419, pgoff = 8192, inode = 20765 }
+vm_state.vm_map: 13589.831119831 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3064827904, end = 3064889344, flags = 134217845, pgoff = 0, inode = 19423 }
+vm_state.vm_map: 13589.831121771 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3064889344, end = 3064893440, flags = 135266419, pgoff = 57344, inode = 19423 }
+vm_state.vm_map: 13589.831124005 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3064893440, end = 3064905728, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 13589.831126000 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3064905728, end = 3064909824, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 13589.831127945 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3064909824, end = 3064913920, flags = 1048691, pgoff = 3064909824, inode = 0 }
+vm_state.vm_map: 13589.831130087 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3064913920, end = 3065061376, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.831132034 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3065061376, end = 3065069568, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.831134219 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3065069568, end = 3065167872, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.831136158 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3065167872, end = 3065171968, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.831138522 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3065171968, end = 3065196544, flags = 134217845, pgoff = 0, inode = 22612 }
+vm_state.vm_map: 13589.831140462 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3065196544, end = 3065200640, flags = 135266419, pgoff = 20480, inode = 22612 }
+vm_state.vm_map: 13589.831142733 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3065200640, end = 3065212928, flags = 134217845, pgoff = 0, inode = 21323 }
+vm_state.vm_map: 13589.831144666 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3065212928, end = 3065217024, flags = 135266419, pgoff = 8192, inode = 21323 }
+vm_state.vm_map: 13589.831147289 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3065217024, end = 3065360384, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 13589.831149229 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3065360384, end = 3065364480, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 13589.831151161 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3065364480, end = 3065368576, flags = 1048691, pgoff = 3065364480, inode = 0 }
+vm_state.vm_map: 13589.831153569 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3065368576, end = 3065446400, flags = 134217845, pgoff = 0, inode = 24576 }
+vm_state.vm_map: 13589.831155502 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3065446400, end = 3065450496, flags = 135266419, pgoff = 77824, inode = 24576 }
+vm_state.vm_map: 13589.831160199 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3065450496, end = 3065483264, flags = 134217845, pgoff = 0, inode = 24194 }
+vm_state.vm_map: 13589.831179419 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3065483264, end = 3065487360, flags = 135266419, pgoff = 28672, inode = 24194 }
+vm_state.vm_map: 13589.831181938 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3065487360, end = 3065954304, flags = 134217845, pgoff = 0, inode = 23967 }
+vm_state.vm_map: 13589.831184105 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3065954304, end = 3065962496, flags = 135266419, pgoff = 462848, inode = 23967 }
+vm_state.vm_map: 13589.831186148 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3065962496, end = 3065966592, flags = 1048691, pgoff = 3065962496, inode = 0 }
+vm_state.vm_map: 13589.831188678 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3065966592, end = 3066343424, flags = 134217845, pgoff = 0, inode = 21319 }
+vm_state.vm_map: 13589.831190717 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066343424, end = 3066351616, flags = 135266419, pgoff = 376832, inode = 21319 }
+vm_state.vm_map: 13589.831193142 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066351616, end = 3066449920, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 13589.831195174 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066449920, end = 3066454016, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 13589.831197322 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066454016, end = 3066458112, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 13589.831199729 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066458112, end = 3066462208, flags = 1048691, pgoff = 3066458112, inode = 0 }
+vm_state.vm_map: 13589.831201989 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066462208, end = 3066531840, flags = 134217845, pgoff = 0, inode = 508763 }
+vm_state.vm_map: 13589.831204162 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066531840, end = 3066535936, flags = 135266417, pgoff = 65536, inode = 508763 }
+vm_state.vm_map: 13589.831206151 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066535936, end = 3066540032, flags = 135266419, pgoff = 69632, inode = 508763 }
+vm_state.vm_map: 13589.831208348 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066540032, end = 3066548224, flags = 1048691, pgoff = 3066540032, inode = 0 }
+vm_state.vm_map: 13589.831210528 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066548224, end = 3066740736, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.831212694 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066740736, end = 3066744832, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.831214899 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066744832, end = 3066753024, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.831216998 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066753024, end = 3066757120, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.831218974 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066757120, end = 3066761216, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.831221295 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066761216, end = 3066843136, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.831223260 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066843136, end = 3066847232, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.831225691 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066847232, end = 3066880000, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 13589.831227840 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066880000, end = 3066884096, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 13589.831229883 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066884096, end = 3066888192, flags = 1048691, pgoff = 3066884096, inode = 0 }
+vm_state.vm_map: 13589.831232050 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066888192, end = 3066912768, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 13589.831234563 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066912768, end = 3066916864, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 13589.831236754 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066916864, end = 3066949632, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 13589.831238810 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066949632, end = 3066953728, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 13589.831240946 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066953728, end = 3066961920, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 13589.831243256 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066961920, end = 3066966016, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 13589.831245460 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066966016, end = 3066998784, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 13589.831247627 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066998784, end = 3067002880, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 13589.831249873 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3067002880, end = 3067056128, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 13589.831252046 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3067056128, end = 3067060224, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 13589.831254257 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3067060224, end = 3067076608, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 13589.831256424 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3067076608, end = 3067080704, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 13589.831258388 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3067080704, end = 3067084800, flags = 1048691, pgoff = 3067080704, inode = 0 }
+vm_state.vm_map: 13589.831260691 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3067084800, end = 3067092992, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 13589.831262728 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3067092992, end = 3067097088, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 13589.831264976 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3067097088, end = 3067105280, flags = 134217845, pgoff = 0, inode = 17721 }
+vm_state.vm_map: 13589.831266946 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3067105280, end = 3067109376, flags = 135266419, pgoff = 4096, inode = 17721 }
+vm_state.vm_map: 13589.831269562 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3067109376, end = 3067572224, flags = 134217845, pgoff = 0, inode = 20061 }
+vm_state.vm_map: 13589.831271527 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3067572224, end = 3067584512, flags = 135266419, pgoff = 458752, inode = 20061 }
+vm_state.vm_map: 13589.831273963 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3067584512, end = 3068190720, flags = 134217845, pgoff = 0, inode = 22471 }
+vm_state.vm_map: 13589.831275934 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3068190720, end = 3068207104, flags = 135266419, pgoff = 602112, inode = 22471 }
+vm_state.vm_map: 13589.831278335 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3068207104, end = 3069358080, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.831280354 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3069358080, end = 3069374464, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.831282299 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3069374464, end = 3069378560, flags = 1048691, pgoff = 3069374464, inode = 0 }
+vm_state.vm_map: 13589.831284707 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3069378560, end = 3070693376, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.831286739 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3070693376, end = 3070701568, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.831288782 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3070701568, end = 3070705664, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.831290765 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3070705664, end = 3070717952, flags = 1048691, pgoff = 3070705664, inode = 0 }
+vm_state.vm_map: 13589.831293179 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3070717952, end = 3070803968, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.831295216 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3070803968, end = 3070808064, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.831297254 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3070808064, end = 3070812160, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.831299224 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3070812160, end = 3070820352, flags = 1048691, pgoff = 3070812160, inode = 0 }
+vm_state.vm_map: 13589.831301754 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3070820352, end = 3070844928, flags = 134217845, pgoff = 0, inode = 17404 }
+vm_state.vm_map: 13589.831304131 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3070844928, end = 3070849024, flags = 135266419, pgoff = 20480, inode = 17404 }
+vm_state.vm_map: 13589.831306636 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3070849024, end = 3070885888, flags = 134217845, pgoff = 0, inode = 22478 }
+vm_state.vm_map: 13589.831308606 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3070885888, end = 3070889984, flags = 135266419, pgoff = 32768, inode = 22478 }
+vm_state.vm_map: 13589.831310748 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3070889984, end = 3070976000, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 13589.831313014 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3070976000, end = 3070980096, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 13589.831315139 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3070980096, end = 3070992384, flags = 1048691, pgoff = 3070980096, inode = 0 }
+vm_state.vm_map: 13589.831317422 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3070992384, end = 3071021056, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 13589.831319429 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3071021056, end = 3071025152, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 13589.831321682 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3071025152, end = 3071770624, flags = 134217845, pgoff = 0, inode = 499794 }
+vm_state.vm_map: 13589.831323653 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3071770624, end = 3071774720, flags = 135266419, pgoff = 745472, inode = 499794 }
+vm_state.vm_map: 13589.831326023 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3071774720, end = 3071803392, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.831327999 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3071803392, end = 3071807488, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.831330258 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3071807488, end = 3071811584, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.831332364 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3071811584, end = 3071827968, flags = 134217845, pgoff = 0, inode = 20149 }
+vm_state.vm_map: 13589.831334538 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3071827968, end = 3071832064, flags = 135266419, pgoff = 12288, inode = 20149 }
+vm_state.vm_map: 13589.831336908 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3071832064, end = 3071844352, flags = 134217845, pgoff = 0, inode = 19646 }
+vm_state.vm_map: 13589.831339401 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3071844352, end = 3071848448, flags = 135266419, pgoff = 8192, inode = 19646 }
+vm_state.vm_map: 13589.831341518 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3071848448, end = 3072094208, flags = 134217845, pgoff = 0, inode = 20603 }
+vm_state.vm_map: 13589.831343685 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3072094208, end = 3072098304, flags = 135266419, pgoff = 245760, inode = 20603 }
+vm_state.vm_map: 13589.831345724 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3072098304, end = 3072102400, flags = 1048691, pgoff = 3072098304, inode = 0 }
+vm_state.vm_map: 13589.831347909 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3072102400, end = 3072274432, flags = 134217845, pgoff = 0, inode = 1065255 }
+vm_state.vm_map: 13589.831349953 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3072274432, end = 3072278528, flags = 135266419, pgoff = 172032, inode = 1065255 }
+vm_state.vm_map: 13589.831352238 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3072278528, end = 3072749568, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 13589.831354262 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3072749568, end = 3072765952, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 13589.831359748 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3072765952, end = 3073036288, flags = 134217845, pgoff = 0, inode = 22793 }
+vm_state.vm_map: 13589.831361773 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3073036288, end = 3073044480, flags = 135266419, pgoff = 266240, inode = 22793 }
+vm_state.vm_map: 13589.831364174 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3073044480, end = 3073523712, flags = 134217845, pgoff = 0, inode = 21325 }
+vm_state.vm_map: 13589.831366200 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3073523712, end = 3073531904, flags = 135266419, pgoff = 479232, inode = 21325 }
+vm_state.vm_map: 13589.831368570 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3073531904, end = 3074134016, flags = 134217845, pgoff = 0, inode = 19648 }
+vm_state.vm_map: 13589.831370546 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3074134016, end = 3074142208, flags = 135266419, pgoff = 602112, inode = 19648 }
+vm_state.vm_map: 13589.831372848 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3074142208, end = 3074146304, flags = 1048691, pgoff = 3074142208, inode = 0 }
+vm_state.vm_map: 13589.831375600 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3074146304, end = 3074187264, flags = 134217845, pgoff = 0, inode = 22795 }
+vm_state.vm_map: 13589.831377768 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3074187264, end = 3074191360, flags = 135266419, pgoff = 36864, inode = 22795 }
+vm_state.vm_map: 13589.831379892 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3074191360, end = 3074338816, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.831382058 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3074338816, end = 3074342912, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.831384239 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3074342912, end = 3074347008, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.831386639 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3074347008, end = 3074445312, flags = 134217845, pgoff = 0, inode = 22669 }
+vm_state.vm_map: 13589.831388683 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3074445312, end = 3074449408, flags = 135266419, pgoff = 94208, inode = 22669 }
+vm_state.vm_map: 13589.831393282 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3074449408, end = 3074596864, flags = 134217845, pgoff = 0, inode = 22796 }
+vm_state.vm_map: 13589.831395326 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3074596864, end = 3074600960, flags = 135266419, pgoff = 147456, inode = 22796 }
+vm_state.vm_map: 13589.831397690 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3074600960, end = 3074703360, flags = 134217845, pgoff = 0, inode = 21552 }
+vm_state.vm_map: 13589.831399728 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3074703360, end = 3074711552, flags = 135266419, pgoff = 98304, inode = 21552 }
+vm_state.vm_map: 13589.831401950 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3074711552, end = 3074715648, flags = 1048691, pgoff = 3074711552, inode = 0 }
+vm_state.vm_map: 13589.831404468 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3074715648, end = 3075313664, flags = 134217845, pgoff = 0, inode = 22668 }
+vm_state.vm_map: 13589.831406629 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3075313664, end = 3075325952, flags = 135266419, pgoff = 593920, inode = 22668 }
+vm_state.vm_map: 13589.831408956 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3075325952, end = 3079225344, flags = 134217845, pgoff = 0, inode = 21427 }
+vm_state.vm_map: 13589.831411443 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3079225344, end = 3079249920, flags = 135266419, pgoff = 3895296, inode = 21427 }
+vm_state.vm_map: 13589.831413487 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3079249920, end = 3079254016, flags = 1048691, pgoff = 3079249920, inode = 0 }
+vm_state.vm_map: 13589.831415543 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3079266304, end = 3079270400, flags = 1048691, pgoff = 3079266304, inode = 0 }
+vm_state.vm_map: 13589.831417662 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3079270400, end = 3079299072, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.831420167 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3079299072, end = 3079348224, flags = 134217841, pgoff = 0, inode = 74519 }
+vm_state.vm_map: 13589.831422205 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3079348224, end = 3079356416, flags = 1048691, pgoff = 3079348224, inode = 0 }
+vm_state.vm_map: 13589.831424390 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3079356416, end = 3079360512, flags = 67371125, pgoff = 3079356416, inode = 0 }
+vm_state.vm_map: 13589.831426582 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3079360512, end = 3079475200, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.831428620 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3079475200, end = 3079479296, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.831430645 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3079479296, end = 3079483392, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.831432812 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2259, start = 3213852672, end = 3213938688, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.831475459 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 134512640, end = 134545408, flags = 134223989, pgoff = 0, inode = 658091 }
+vm_state.vm_map: 13589.831477601 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 134545408, end = 134549504, flags = 135272563, pgoff = 32768, inode = 658091 }
+vm_state.vm_map: 13589.831479897 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 138887168, end = 139304960, flags = 1048691, pgoff = 138887168, inode = 0 }
+vm_state.vm_map: 13589.831482101 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3061420032, end = 3061448704, flags = 134217845, pgoff = 0, inode = 1065218 }
+vm_state.vm_map: 13589.831484354 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3061448704, end = 3061452800, flags = 135266419, pgoff = 28672, inode = 1065218 }
+vm_state.vm_map: 13589.831486959 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3061452800, end = 3061506048, flags = 134217845, pgoff = 0, inode = 24466 }
+vm_state.vm_map: 13589.831488941 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3061506048, end = 3061510144, flags = 135266419, pgoff = 49152, inode = 24466 }
+vm_state.vm_map: 13589.831491342 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3061510144, end = 3061673984, flags = 134217845, pgoff = 0, inode = 21283 }
+vm_state.vm_map: 13589.831493466 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3061673984, end = 3061678080, flags = 135266419, pgoff = 159744, inode = 21283 }
+vm_state.vm_map: 13589.831495774 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3061678080, end = 3061706752, flags = 134217845, pgoff = 0, inode = 23696 }
+vm_state.vm_map: 13589.831497782 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3061706752, end = 3061710848, flags = 135266419, pgoff = 24576, inode = 23696 }
+vm_state.vm_map: 13589.831500133 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3061710848, end = 3061772288, flags = 134217845, pgoff = 0, inode = 1065430 }
+vm_state.vm_map: 13589.831502128 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3061772288, end = 3061776384, flags = 135266419, pgoff = 57344, inode = 1065430 }
+vm_state.vm_map: 13589.831504541 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3061870592, end = 3061911552, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.831506659 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3061911552, end = 3061915648, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.831508820 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3061915648, end = 3061919744, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.831510975 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3061919744, end = 3061956608, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.831513068 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3061956608, end = 3061960704, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.831515191 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3061960704, end = 3061964800, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.831517562 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3061964800, end = 3062042624, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.831519526 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3062042624, end = 3062046720, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.831522050 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3062046720, end = 3062050816, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.831524038 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3062050816, end = 3062059008, flags = 1048691, pgoff = 3062050816, inode = 0 }
+vm_state.vm_map: 13589.831526323 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3062059008, end = 3062083584, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.831528299 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3062083584, end = 3062087680, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.831530460 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3062087680, end = 3062091776, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.831532571 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3062095872, end = 3062116352, flags = 134217845, pgoff = 0, inode = 21278 }
+vm_state.vm_map: 13589.831534752 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3062116352, end = 3062120448, flags = 135266419, pgoff = 16384, inode = 21278 }
+vm_state.vm_map: 13589.831536868 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3062120448, end = 3062136832, flags = 134217845, pgoff = 0, inode = 20149 }
+vm_state.vm_map: 13589.831539030 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3062136832, end = 3062140928, flags = 135266419, pgoff = 12288, inode = 20149 }
+vm_state.vm_map: 13589.831541141 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3062140928, end = 3062157312, flags = 134217845, pgoff = 0, inode = 1065432 }
+vm_state.vm_map: 13589.831543308 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3062157312, end = 3062161408, flags = 135266419, pgoff = 12288, inode = 1065432 }
+vm_state.vm_map: 13589.831545501 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3062161408, end = 3062181888, flags = 134217845, pgoff = 0, inode = 314599 }
+vm_state.vm_map: 13589.831547538 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3062181888, end = 3062185984, flags = 135266419, pgoff = 16384, inode = 314599 }
+vm_state.vm_map: 13589.831549644 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3062185984, end = 3062325248, flags = 134217841, pgoff = 0, inode = 74520 }
+vm_state.vm_map: 13589.831551989 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3062325248, end = 3063656448, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.831554162 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3063656448, end = 3063668736, flags = 1048691, pgoff = 3063656448, inode = 0 }
+vm_state.vm_map: 13589.831556692 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3063668736, end = 3063685120, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.831558731 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3063685120, end = 3063689216, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.831561021 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3063689216, end = 3063697408, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.831563058 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3063697408, end = 3063701504, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.831565360 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3063701504, end = 3063730176, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.831567325 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3063730176, end = 3063734272, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.831569510 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3063734272, end = 3063738368, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.831571696 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3063738368, end = 3063963648, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.831573733 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3063963648, end = 3063967744, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.831575692 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3063967744, end = 3063971840, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.831578277 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3063971840, end = 3064086528, flags = 134217845, pgoff = 0, inode = 17291 }
+vm_state.vm_map: 13589.831580315 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3064086528, end = 3064090624, flags = 135266419, pgoff = 114688, inode = 17291 }
+vm_state.vm_map: 13589.831582359 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3064090624, end = 3064094720, flags = 1048691, pgoff = 3064090624, inode = 0 }
+vm_state.vm_map: 13589.831584439 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3064094720, end = 3064119296, flags = 134217845, pgoff = 0, inode = 22612 }
+vm_state.vm_map: 13589.831586607 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3064119296, end = 3064123392, flags = 135266419, pgoff = 20480, inode = 22612 }
+vm_state.vm_map: 13589.831588774 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3064123392, end = 3064135680, flags = 134217845, pgoff = 0, inode = 21323 }
+vm_state.vm_map: 13589.831591169 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3064135680, end = 3064139776, flags = 135266419, pgoff = 8192, inode = 21323 }
+vm_state.vm_map: 13589.831593416 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3064139776, end = 3064283136, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 13589.831595465 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3064283136, end = 3064287232, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 13589.831597683 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3064287232, end = 3064373248, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.831599702 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3064373248, end = 3064377344, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.831601869 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3064377344, end = 3064381440, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.831603925 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3064381440, end = 3064389632, flags = 1048691, pgoff = 3064381440, inode = 0 }
+vm_state.vm_map: 13589.831606209 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3064389632, end = 3064467456, flags = 134217845, pgoff = 0, inode = 24576 }
+vm_state.vm_map: 13589.831608215 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3064467456, end = 3064471552, flags = 135266419, pgoff = 77824, inode = 24576 }
+vm_state.vm_map: 13589.831610315 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3064471552, end = 3064475648, flags = 1048691, pgoff = 3064471552, inode = 0 }
+vm_state.vm_map: 13589.831612513 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3064475648, end = 3064508416, flags = 134217845, pgoff = 0, inode = 24194 }
+vm_state.vm_map: 13589.831614649 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3064508416, end = 3064512512, flags = 135266419, pgoff = 28672, inode = 24194 }
+vm_state.vm_map: 13589.831616860 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3064512512, end = 3064979456, flags = 134217845, pgoff = 0, inode = 23967 }
+vm_state.vm_map: 13589.831619021 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3064979456, end = 3064987648, flags = 135266419, pgoff = 462848, inode = 23967 }
+vm_state.vm_map: 13589.831620991 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3064987648, end = 3064991744, flags = 1048691, pgoff = 3064987648, inode = 0 }
+vm_state.vm_map: 13589.831623397 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3064991744, end = 3065368576, flags = 134217845, pgoff = 0, inode = 21319 }
+vm_state.vm_map: 13589.831625724 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3065368576, end = 3065376768, flags = 135266419, pgoff = 376832, inode = 21319 }
+vm_state.vm_map: 13589.831628108 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3065376768, end = 3065475072, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.831630071 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3065475072, end = 3065479168, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.831632374 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3065479168, end = 3065561088, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.831634405 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3065561088, end = 3065565184, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.831636566 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3065565184, end = 3065569280, flags = 1048691, pgoff = 3065565184, inode = 0 }
+vm_state.vm_map: 13589.831638691 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3065569280, end = 3065602048, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 13589.831640857 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3065602048, end = 3065606144, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 13589.831643055 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3065606144, end = 3065630720, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 13589.831645006 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3065630720, end = 3065634816, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 13589.831647304 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3065634816, end = 3065667584, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 13589.831649328 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3065667584, end = 3065671680, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 13589.831651490 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3065671680, end = 3065679872, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 13589.831653472 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3065679872, end = 3065683968, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 13589.831655818 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3065683968, end = 3065716736, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 13589.831657855 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3065716736, end = 3065720832, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 13589.831660392 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3065720832, end = 3065774080, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 13589.831662429 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3065774080, end = 3065778176, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 13589.831664467 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3065778176, end = 3065782272, flags = 1048691, pgoff = 3065778176, inode = 0 }
+vm_state.vm_map: 13589.831666763 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3065782272, end = 3065880576, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 13589.831668789 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3065880576, end = 3065884672, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 13589.831670827 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3065884672, end = 3065888768, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 13589.831673068 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3065888768, end = 3065958400, flags = 134217845, pgoff = 0, inode = 508763 }
+vm_state.vm_map: 13589.831675099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3065958400, end = 3065962496, flags = 135266417, pgoff = 65536, inode = 508763 }
+vm_state.vm_map: 13589.831677131 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3065962496, end = 3065966592, flags = 135266419, pgoff = 69632, inode = 508763 }
+vm_state.vm_map: 13589.831679174 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3065966592, end = 3065974784, flags = 1048691, pgoff = 3065966592, inode = 0 }
+vm_state.vm_map: 13589.831681373 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3065974784, end = 3066167296, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.831683534 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3066167296, end = 3066171392, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.831685830 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3066171392, end = 3066179584, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.831687887 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3066179584, end = 3066183680, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.831690048 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3066183680, end = 3066187776, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.831692233 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3066187776, end = 3066335232, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.831694628 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3066335232, end = 3066343424, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.831696591 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3066343424, end = 3066347520, flags = 1048691, pgoff = 3066343424, inode = 0 }
+vm_state.vm_map: 13589.831699189 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3066347520, end = 3066597376, flags = 134217845, pgoff = 0, inode = 17169 }
+vm_state.vm_map: 13589.831701228 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3066597376, end = 3066605568, flags = 135266419, pgoff = 245760, inode = 17169 }
+vm_state.vm_map: 13589.831703419 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3066605568, end = 3066753024, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.831705383 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3066753024, end = 3066757120, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.831707821 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3066757120, end = 3066761216, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.831710087 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3066761216, end = 3066773504, flags = 134217845, pgoff = 0, inode = 19646 }
+vm_state.vm_map: 13589.831712229 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3066773504, end = 3066777600, flags = 135266419, pgoff = 8192, inode = 19646 }
+vm_state.vm_map: 13589.831714341 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3066777600, end = 3066949632, flags = 134217845, pgoff = 0, inode = 1065255 }
+vm_state.vm_map: 13589.831716501 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3066949632, end = 3066953728, flags = 135266419, pgoff = 172032, inode = 1065255 }
+vm_state.vm_map: 13589.831718779 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3066953728, end = 3067424768, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 13589.831720824 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3067424768, end = 3067441152, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 13589.831722775 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3067441152, end = 3067445248, flags = 1048691, pgoff = 3067441152, inode = 0 }
+vm_state.vm_map: 13589.831725077 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3067445248, end = 3067715584, flags = 134217845, pgoff = 0, inode = 22793 }
+vm_state.vm_map: 13589.831727226 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3067715584, end = 3067723776, flags = 135266419, pgoff = 266240, inode = 22793 }
+vm_state.vm_map: 13589.831729799 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3067723776, end = 3067871232, flags = 134217845, pgoff = 0, inode = 22796 }
+vm_state.vm_map: 13589.831731837 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3067871232, end = 3067875328, flags = 135266419, pgoff = 147456, inode = 22796 }
+vm_state.vm_map: 13589.831734017 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3067875328, end = 3068354560, flags = 134217845, pgoff = 0, inode = 21325 }
+vm_state.vm_map: 13589.831736060 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3068354560, end = 3068362752, flags = 135266419, pgoff = 479232, inode = 21325 }
+vm_state.vm_map: 13589.831738221 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3068362752, end = 3068465152, flags = 134217845, pgoff = 0, inode = 21552 }
+vm_state.vm_map: 13589.831740260 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3068465152, end = 3068473344, flags = 135266419, pgoff = 98304, inode = 21552 }
+vm_state.vm_map: 13589.831742500 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3068473344, end = 3068489728, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 13589.831744661 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3068489728, end = 3068493824, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 13589.831746859 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3068493824, end = 3068502016, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 13589.831748878 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3068502016, end = 3068506112, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 13589.831750972 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3068506112, end = 3068510208, flags = 1048691, pgoff = 3068506112, inode = 0 }
+vm_state.vm_map: 13589.831753274 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3068510208, end = 3068518400, flags = 134217845, pgoff = 0, inode = 17721 }
+vm_state.vm_map: 13589.831755305 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3068518400, end = 3068522496, flags = 135266419, pgoff = 4096, inode = 17721 }
+vm_state.vm_map: 13589.831757478 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3068522496, end = 3069673472, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.831759511 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3069673472, end = 3069689856, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.831761684 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3069689856, end = 3069730816, flags = 134217845, pgoff = 0, inode = 22795 }
+vm_state.vm_map: 13589.831764079 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3069730816, end = 3069734912, flags = 135266419, pgoff = 36864, inode = 22795 }
+vm_state.vm_map: 13589.831766159 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3069734912, end = 3070332928, flags = 134217845, pgoff = 0, inode = 22668 }
+vm_state.vm_map: 13589.831768295 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3070332928, end = 3070345216, flags = 135266419, pgoff = 593920, inode = 22668 }
+vm_state.vm_map: 13589.831770468 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3070345216, end = 3071660032, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.831772507 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3071660032, end = 3071668224, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.831774452 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3071668224, end = 3071672320, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.831776650 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3071672320, end = 3071688704, flags = 1048691, pgoff = 3071672320, inode = 0 }
+vm_state.vm_map: 13589.831778847 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3071688704, end = 3072434176, flags = 134217845, pgoff = 0, inode = 499794 }
+vm_state.vm_map: 13589.831780868 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3072434176, end = 3072438272, flags = 135266419, pgoff = 745472, inode = 499794 }
+vm_state.vm_map: 13589.831783041 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3072438272, end = 3072684032, flags = 134217845, pgoff = 0, inode = 20603 }
+vm_state.vm_map: 13589.831785189 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3072684032, end = 3072688128, flags = 135266419, pgoff = 245760, inode = 20603 }
+vm_state.vm_map: 13589.831787350 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3072688128, end = 3073290240, flags = 134217845, pgoff = 0, inode = 19648 }
+vm_state.vm_map: 13589.831789388 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3073290240, end = 3073298432, flags = 135266419, pgoff = 602112, inode = 19648 }
+vm_state.vm_map: 13589.831791697 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3073298432, end = 3073413120, flags = 134217845, pgoff = 0, inode = 17171 }
+vm_state.vm_map: 13589.831793863 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3073413120, end = 3073417216, flags = 135266419, pgoff = 114688, inode = 17171 }
+vm_state.vm_map: 13589.831796295 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3073417216, end = 3073495040, flags = 134217845, pgoff = 0, inode = 1065156 }
+vm_state.vm_map: 13589.831798690 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3073495040, end = 3073499136, flags = 135266419, pgoff = 73728, inode = 1065156 }
+vm_state.vm_map: 13589.831800733 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3073499136, end = 3073503232, flags = 1048691, pgoff = 3073499136, inode = 0 }
+vm_state.vm_map: 13589.831803031 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3073503232, end = 3073601536, flags = 134217845, pgoff = 0, inode = 22669 }
+vm_state.vm_map: 13589.831805062 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3073601536, end = 3073605632, flags = 135266419, pgoff = 94208, inode = 22669 }
+vm_state.vm_map: 13589.831807241 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3073605632, end = 3077505024, flags = 134217845, pgoff = 0, inode = 21427 }
+vm_state.vm_map: 13589.831809212 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3077505024, end = 3077529600, flags = 135266419, pgoff = 3895296, inode = 21427 }
+vm_state.vm_map: 13589.831811391 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3077529600, end = 3077533696, flags = 1048691, pgoff = 3077529600, inode = 0 }
+vm_state.vm_map: 13589.831813570 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3077550080, end = 3077578752, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.831815731 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3077578752, end = 3077627904, flags = 134217841, pgoff = 0, inode = 74519 }
+vm_state.vm_map: 13589.831817744 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3077627904, end = 3077636096, flags = 1048691, pgoff = 3077627904, inode = 0 }
+vm_state.vm_map: 13589.831819831 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3077636096, end = 3077640192, flags = 67371125, pgoff = 3077636096, inode = 0 }
+vm_state.vm_map: 13589.831822011 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3077640192, end = 3077754880, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.831824036 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3077754880, end = 3077758976, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.831826074 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3077758976, end = 3077763072, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.831828118 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2266, start = 3217485824, end = 3217571840, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.831831055 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 134512640, end = 134516736, flags = 134223989, pgoff = 0, inode = 655648 }
+vm_state.vm_map: 13589.831833566 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 134516736, end = 134520832, flags = 135272563, pgoff = 0, inode = 655648 }
+vm_state.vm_map: 13589.831835623 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 144269312, end = 144539648, flags = 1048691, pgoff = 144269312, inode = 0 }
+vm_state.vm_map: 13589.831837900 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3073585152, end = 3073626112, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.831840042 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3073626112, end = 3073630208, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.831842086 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3073630208, end = 3073634304, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.831844156 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3073634304, end = 3073671168, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.831846310 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3073671168, end = 3073675264, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.831848471 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3073675264, end = 3073679360, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.831850645 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3073679360, end = 3073757184, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.831852713 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3073757184, end = 3073761280, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.831854886 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3073761280, end = 3073765376, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.831856924 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3073765376, end = 3073773568, flags = 1048691, pgoff = 3073765376, inode = 0 }
+vm_state.vm_map: 13589.831865069 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3073773568, end = 3073884160, flags = 134217937, pgoff = 0, inode = 150388 }
+vm_state.vm_map: 13589.831867574 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3073884160, end = 3073966080, flags = 134217845, pgoff = 0, inode = 1065113 }
+vm_state.vm_map: 13589.831870104 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3073966080, end = 3073970176, flags = 135266419, pgoff = 77824, inode = 1065113 }
+vm_state.vm_map: 13589.831872482 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3074064384, end = 3074134016, flags = 134217845, pgoff = 0, inode = 429625 }
+vm_state.vm_map: 13589.831874525 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3074134016, end = 3074138112, flags = 135266419, pgoff = 65536, inode = 429625 }
+vm_state.vm_map: 13589.831876618 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3074138112, end = 3074146304, flags = 1048691, pgoff = 3074138112, inode = 0 }
+vm_state.vm_map: 13589.831878699 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3074146304, end = 3074244608, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 13589.831880657 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3074244608, end = 3074248704, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 13589.831882608 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3074248704, end = 3074252800, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 13589.831884794 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3074252800, end = 3074322432, flags = 134217845, pgoff = 0, inode = 508763 }
+vm_state.vm_map: 13589.831886887 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3074322432, end = 3074326528, flags = 135266417, pgoff = 65536, inode = 508763 }
+vm_state.vm_map: 13589.831888863 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3074326528, end = 3074330624, flags = 135266419, pgoff = 69632, inode = 508763 }
+vm_state.vm_map: 13589.831890895 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3074330624, end = 3074338816, flags = 1048691, pgoff = 3074330624, inode = 0 }
+vm_state.vm_map: 13589.831893111 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3074338816, end = 3074347008, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.831895051 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3074347008, end = 3074351104, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.831897113 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3074351104, end = 3074355200, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.831899305 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3074355200, end = 3074383872, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.831901257 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3074383872, end = 3074387968, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.831903534 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3074387968, end = 3074392064, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.831905615 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3074392064, end = 3074478080, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.831907561 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3074478080, end = 3074482176, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.831909493 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3074482176, end = 3074486272, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.831911537 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3074486272, end = 3074498560, flags = 1048691, pgoff = 3074486272, inode = 0 }
+vm_state.vm_map: 13589.831913680 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3074498560, end = 3074723840, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.831915767 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3074723840, end = 3074727936, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.831917842 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3074727936, end = 3074732032, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.831919966 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3074732032, end = 3074846720, flags = 134217845, pgoff = 0, inode = 17291 }
+vm_state.vm_map: 13589.831921918 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3074846720, end = 3074850816, flags = 135266419, pgoff = 114688, inode = 17291 }
+vm_state.vm_map: 13589.831924368 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3074850816, end = 3075043328, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.831926510 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3075043328, end = 3075047424, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.831928726 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3075047424, end = 3075194880, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.831930697 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3075194880, end = 3075203072, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.831933024 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3075203072, end = 3075215360, flags = 134217845, pgoff = 0, inode = 19646 }
+vm_state.vm_map: 13589.831935055 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3075215360, end = 3075219456, flags = 135266419, pgoff = 8192, inode = 19646 }
+vm_state.vm_map: 13589.831937444 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3075219456, end = 3075223552, flags = 1048691, pgoff = 3075219456, inode = 0 }
+vm_state.vm_map: 13589.831939697 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3075223552, end = 3075825664, flags = 134217845, pgoff = 0, inode = 19648 }
+vm_state.vm_map: 13589.831941722 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3075825664, end = 3075833856, flags = 135266419, pgoff = 602112, inode = 19648 }
+vm_state.vm_map: 13589.831943915 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3075833856, end = 3076083712, flags = 134217845, pgoff = 0, inode = 17169 }
+vm_state.vm_map: 13589.831945872 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3076083712, end = 3076091904, flags = 135266419, pgoff = 245760, inode = 17169 }
+vm_state.vm_map: 13589.831948168 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3076091904, end = 3076206592, flags = 134217845, pgoff = 0, inode = 17171 }
+vm_state.vm_map: 13589.831950114 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3076206592, end = 3076210688, flags = 135266419, pgoff = 114688, inode = 17171 }
+vm_state.vm_map: 13589.831952288 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3076210688, end = 3077525504, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.831954245 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3077525504, end = 3077533696, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.831956184 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3077533696, end = 3077537792, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.831958130 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3077537792, end = 3077550080, flags = 1048691, pgoff = 3077537792, inode = 0 }
+vm_state.vm_map: 13589.831960309 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3077550080, end = 3078295552, flags = 134217845, pgoff = 0, inode = 499794 }
+vm_state.vm_map: 13589.831962446 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3078295552, end = 3078299648, flags = 135266419, pgoff = 745472, inode = 499794 }
+vm_state.vm_map: 13589.831964379 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3078299648, end = 3078303744, flags = 1048691, pgoff = 3078299648, inode = 0 }
+vm_state.vm_map: 13589.831966552 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3078303744, end = 3078549504, flags = 134217845, pgoff = 0, inode = 20603 }
+vm_state.vm_map: 13589.831968491 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3078549504, end = 3078553600, flags = 135266419, pgoff = 245760, inode = 20603 }
+vm_state.vm_map: 13589.831971230 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3078553600, end = 3078774784, flags = 134217845, pgoff = 0, inode = 21370 }
+vm_state.vm_map: 13589.831973281 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3078774784, end = 3078782976, flags = 135266419, pgoff = 221184, inode = 21370 }
+vm_state.vm_map: 13589.831975214 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3078782976, end = 3078787072, flags = 1048691, pgoff = 3078782976, inode = 0 }
+vm_state.vm_map: 13589.831977492 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3078787072, end = 3078815744, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.831979659 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3078815744, end = 3078840320, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.831981598 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3078840320, end = 3078844416, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.831983532 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3078844416, end = 3078848512, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.831988856 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3078848512, end = 3078852608, flags = 134217937, pgoff = 0, inode = 237757 }
+vm_state.vm_map: 13589.831990981 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3078877184, end = 3078885376, flags = 1048691, pgoff = 3078877184, inode = 0 }
+vm_state.vm_map: 13589.831993012 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3078885376, end = 3078889472, flags = 67371125, pgoff = 3078885376, inode = 0 }
+vm_state.vm_map: 13589.831995198 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3078889472, end = 3079004160, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.831997217 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3079004160, end = 3079008256, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.831999242 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3079008256, end = 3079012352, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.832001384 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2281, start = 3214336000, end = 3214422016, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.832007018 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 134512640, end = 134516736, flags = 134223989, pgoff = 0, inode = 1352341 }
+vm_state.vm_map: 13589.832009179 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 134516736, end = 134520832, flags = 135272563, pgoff = 0, inode = 1352341 }
+vm_state.vm_map: 13589.832011284 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 142692352, end = 191832064, flags = 1048691, pgoff = 142692352, inode = 0 }
+vm_state.vm_map: 13589.832013340 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3023040512, end = 3023044608, flags = 1048688, pgoff = 3023040512, inode = 0 }
+vm_state.vm_map: 13589.832018050 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3023044608, end = 3031433216, flags = 1048691, pgoff = 3023044608, inode = 0 }
+vm_state.vm_map: 13589.832020223 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3031433216, end = 3031568384, flags = 2097267, pgoff = 3031433216, inode = 0 }
+vm_state.vm_map: 13589.832022397 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3031568384, end = 3032481792, flags = 2097264, pgoff = 3031568384, inode = 0 }
+vm_state.vm_map: 13589.832026916 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3032662016, end = 3032805376, flags = 134217841, pgoff = 0, inode = 254199 }
+vm_state.vm_map: 13589.832029470 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3032805376, end = 3032944640, flags = 134217841, pgoff = 0, inode = 254140 }
+vm_state.vm_map: 13589.832031459 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3032944640, end = 3033866240, flags = 1048691, pgoff = 3032944640, inode = 0 }
+vm_state.vm_map: 13589.832033565 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3050205184, end = 3050209280, flags = 1048688, pgoff = 3050205184, inode = 0 }
+vm_state.vm_map: 13589.832035498 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3050209280, end = 3058597888, flags = 1048691, pgoff = 3050209280, inode = 0 }
+vm_state.vm_map: 13589.832037751 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3058597888, end = 3058683904, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 13589.832039696 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3058683904, end = 3058688000, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 13589.832041980 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3058688000, end = 3058696192, flags = 1048691, pgoff = 3058688000, inode = 0 }
+vm_state.vm_map: 13589.832044184 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3058696192, end = 3058724864, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 13589.832046235 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3058724864, end = 3058728960, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 13589.832053518 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3058753536, end = 3058823168, flags = 134217841, pgoff = 0, inode = 98485 }
+vm_state.vm_map: 13589.832055808 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3058823168, end = 3058896896, flags = 134217841, pgoff = 0, inode = 98526 }
+vm_state.vm_map: 13589.832058258 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3058896896, end = 3058978816, flags = 134217841, pgoff = 0, inode = 98443 }
+vm_state.vm_map: 13589.832063178 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3058978816, end = 3060350976, flags = 135266421, pgoff = 0, inode = 542490 }
+vm_state.vm_map: 13589.832065332 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060350976, end = 3060416512, flags = 135266419, pgoff = 1368064, inode = 542490 }
+vm_state.vm_map: 13589.832067481 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060416512, end = 3060428800, flags = 1048691, pgoff = 3060416512, inode = 0 }
+vm_state.vm_map: 13589.832069980 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060428800, end = 3060436992, flags = 134217845, pgoff = 0, inode = 418295 }
+vm_state.vm_map: 13589.832072185 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060436992, end = 3060441088, flags = 135266419, pgoff = 4096, inode = 418295 }
+vm_state.vm_map: 13589.832074598 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060441088, end = 3060510720, flags = 134217841, pgoff = 0, inode = 98449 }
+vm_state.vm_map: 13589.832076906 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060563968, end = 3060568064, flags = 134217937, pgoff = 0, inode = 1196317 }
+vm_state.vm_map: 13589.832079479 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060568064, end = 3060592640, flags = 134217937, pgoff = 0, inode = 1196229 }
+vm_state.vm_map: 13589.832081572 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060592640, end = 3060596736, flags = 134217937, pgoff = 0, inode = 1196235 }
+vm_state.vm_map: 13589.832083665 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060596736, end = 3060600832, flags = 134217937, pgoff = 0, inode = 1196204 }
+vm_state.vm_map: 13589.832085735 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060600832, end = 3060604928, flags = 134217937, pgoff = 0, inode = 1196228 }
+vm_state.vm_map: 13589.832087797 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060604928, end = 3060609024, flags = 134217937, pgoff = 0, inode = 1196227 }
+vm_state.vm_map: 13589.832089853 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060609024, end = 3060617216, flags = 134217937, pgoff = 0, inode = 1196198 }
+vm_state.vm_map: 13589.832091909 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060617216, end = 3060649984, flags = 134217937, pgoff = 0, inode = 1196200 }
+vm_state.vm_map: 13589.832094089 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060649984, end = 3060662272, flags = 134217937, pgoff = 0, inode = 1196226 }
+vm_state.vm_map: 13589.832096157 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060662272, end = 3060670464, flags = 134217937, pgoff = 0, inode = 1196225 }
+vm_state.vm_map: 13589.832098324 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060670464, end = 3060674560, flags = 134217937, pgoff = 0, inode = 1196224 }
+vm_state.vm_map: 13589.832100374 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060674560, end = 3060678656, flags = 134217937, pgoff = 0, inode = 1196223 }
+vm_state.vm_map: 13589.832102547 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060678656, end = 3060682752, flags = 134217937, pgoff = 0, inode = 1196202 }
+vm_state.vm_map: 13589.832104604 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060682752, end = 3060711424, flags = 134217937, pgoff = 0, inode = 1196222 }
+vm_state.vm_map: 13589.832106654 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060711424, end = 3060723712, flags = 134217937, pgoff = 0, inode = 1196221 }
+vm_state.vm_map: 13589.832108698 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060723712, end = 3060727808, flags = 134217937, pgoff = 0, inode = 1196220 }
+vm_state.vm_map: 13589.832110889 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060727808, end = 3060736000, flags = 134217937, pgoff = 0, inode = 1196219 }
+vm_state.vm_map: 13589.832113315 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060736000, end = 3060740096, flags = 134217937, pgoff = 0, inode = 1196210 }
+vm_state.vm_map: 13589.832115372 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060740096, end = 3060744192, flags = 134217937, pgoff = 0, inode = 1196205 }
+vm_state.vm_map: 13589.832117508 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060744192, end = 3060756480, flags = 134217937, pgoff = 0, inode = 1196244 }
+vm_state.vm_map: 13589.832119613 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060756480, end = 3060764672, flags = 134217937, pgoff = 0, inode = 1196270 }
+vm_state.vm_map: 13589.832121700 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060764672, end = 3060797440, flags = 134217937, pgoff = 0, inode = 1196246 }
+vm_state.vm_map: 13589.832123756 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060797440, end = 3060817920, flags = 134217937, pgoff = 0, inode = 1196269 }
+vm_state.vm_map: 13589.832125812 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060817920, end = 3060826112, flags = 134217937, pgoff = 0, inode = 1196316 }
+vm_state.vm_map: 13589.832127962 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060826112, end = 3060854784, flags = 134217937, pgoff = 0, inode = 1196197 }
+vm_state.vm_map: 13589.832130073 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060854784, end = 3060899840, flags = 134217937, pgoff = 0, inode = 1196312 }
+vm_state.vm_map: 13589.832132283 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060899840, end = 3060957184, flags = 134217937, pgoff = 0, inode = 1196272 }
+vm_state.vm_map: 13589.832134351 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060957184, end = 3060969472, flags = 134217937, pgoff = 0, inode = 1196315 }
+vm_state.vm_map: 13589.832136458 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3060969472, end = 3061026816, flags = 134217937, pgoff = 0, inode = 1196231 }
+vm_state.vm_map: 13589.832138551 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3061026816, end = 3061964800, flags = 134217845, pgoff = 0, inode = 16850 }
+vm_state.vm_map: 13589.832140582 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3061964800, end = 3061981184, flags = 135266417, pgoff = 937984, inode = 16850 }
+vm_state.vm_map: 13589.832142632 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3061981184, end = 3061985280, flags = 135266419, pgoff = 954368, inode = 16850 }
+vm_state.vm_map: 13589.832144596 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3061985280, end = 3062013952, flags = 1048691, pgoff = 3061985280, inode = 0 }
+vm_state.vm_map: 13589.832146990 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3062013952, end = 3062251520, flags = 1048691, pgoff = 3062251520, inode = 0 }
+vm_state.vm_map: 13589.832154478 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3062288384, end = 3062292480, flags = 134217845, pgoff = 0, inode = 418261 }
+vm_state.vm_map: 13589.832156694 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3062292480, end = 3062296576, flags = 135266419, pgoff = 4096, inode = 418261 }
+vm_state.vm_map: 13589.832158978 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3062296576, end = 3062411264, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.832161003 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3062411264, end = 3062415360, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.832163256 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3062415360, end = 3062542336, flags = 134217845, pgoff = 0, inode = 18923 }
+vm_state.vm_map: 13589.832165281 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3062542336, end = 3062546432, flags = 135266419, pgoff = 122880, inode = 18923 }
+vm_state.vm_map: 13589.832167591 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3062546432, end = 3062689792, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 13589.832169628 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3062689792, end = 3062693888, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 13589.832176635 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3062693888, end = 3062919168, flags = 134217845, pgoff = 0, inode = 410985 }
+vm_state.vm_map: 13589.832178801 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3062919168, end = 3062923264, flags = 135266419, pgoff = 221184, inode = 410985 }
+vm_state.vm_map: 13589.832181067 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3062923264, end = 3062964224, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.832183394 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3062964224, end = 3062968320, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.832185462 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3062968320, end = 3062972416, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.832187544 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3062972416, end = 3063009280, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.832189507 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3063009280, end = 3063013376, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.832191551 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3063013376, end = 3063017472, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.832193724 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3063017472, end = 3063095296, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.832195768 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3063095296, end = 3063099392, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.832197702 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3063099392, end = 3063103488, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.832199635 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3063103488, end = 3063111680, flags = 1048691, pgoff = 3063103488, inode = 0 }
+vm_state.vm_map: 13589.832201703 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3063111680, end = 3063136256, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.832203636 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3063136256, end = 3063140352, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.832205570 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3063140352, end = 3063144448, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.832207607 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3063144448, end = 3063148544, flags = 1048688, pgoff = 3063144448, inode = 0 }
+vm_state.vm_map: 13589.832209547 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3063148544, end = 3071537152, flags = 1048691, pgoff = 3063148544, inode = 0 }
+vm_state.vm_map: 13589.832211615 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3071537152, end = 3072868352, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.832213665 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3072868352, end = 3072876544, flags = 1048691, pgoff = 3072868352, inode = 0 }
+vm_state.vm_map: 13589.832216227 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3072876544, end = 3072892928, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.832218154 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3072892928, end = 3072897024, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.832220456 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3072897024, end = 3073044480, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.832222420 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3073044480, end = 3073052672, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.832224629 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3073052672, end = 3073060864, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.832226687 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3073060864, end = 3073064960, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.832228853 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3073064960, end = 3073163264, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.832230792 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3073163264, end = 3073167360, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.832232861 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3073167360, end = 3074482176, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.832234788 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3074482176, end = 3074490368, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.832236727 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3074490368, end = 3074494464, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.832238661 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3074494464, end = 3074510848, flags = 1048691, pgoff = 3074494464, inode = 0 }
+vm_state.vm_map: 13589.832240858 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3074510848, end = 3074658304, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.832242791 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3074658304, end = 3074662400, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.832244730 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3074662400, end = 3074666496, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.832246891 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3074666496, end = 3074674688, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.832249182 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3074674688, end = 3074678784, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.832251115 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3074678784, end = 3074682880, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.832253282 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3074682880, end = 3074715648, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 13589.832255381 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3074715648, end = 3074719744, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 13589.832257646 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3074719744, end = 3074891776, flags = 134217845, pgoff = 0, inode = 1065255 }
+vm_state.vm_map: 13589.832259673 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3074891776, end = 3074895872, flags = 135266419, pgoff = 172032, inode = 1065255 }
+vm_state.vm_map: 13589.832261846 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3074895872, end = 3074977792, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.832263926 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3074977792, end = 3074981888, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.832266068 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3074981888, end = 3074985984, flags = 1048691, pgoff = 3074981888, inode = 0 }
+vm_state.vm_map: 13589.832268249 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3074985984, end = 3075457024, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 13589.832270286 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3075457024, end = 3075473408, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 13589.832272749 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3075473408, end = 3075547136, flags = 134217845, pgoff = 0, inode = 17860 }
+vm_state.vm_map: 13589.832274688 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3075547136, end = 3075551232, flags = 135266419, pgoff = 69632, inode = 17860 }
+vm_state.vm_map: 13589.832276874 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3075551232, end = 3075604480, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 13589.832278806 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3075604480, end = 3075608576, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 13589.832280924 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3075608576, end = 3075616768, flags = 134217845, pgoff = 0, inode = 23893 }
+vm_state.vm_map: 13589.832283214 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3075616768, end = 3075620864, flags = 135266419, pgoff = 4096, inode = 23893 }
+vm_state.vm_map: 13589.832285277 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3075620864, end = 3076771840, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.832287217 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3076771840, end = 3076788224, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.832289421 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3076788224, end = 3076874240, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.832291397 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3076874240, end = 3076878336, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.832293434 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3076878336, end = 3076882432, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.832295496 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3076882432, end = 3076894720, flags = 1048691, pgoff = 3076882432, inode = 0 }
+vm_state.vm_map: 13589.832297781 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3076894720, end = 3077906432, flags = 134217845, pgoff = 0, inode = 1064975 }
+vm_state.vm_map: 13589.832299831 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3077906432, end = 3077947392, flags = 135266419, pgoff = 1011712, inode = 1064975 }
+vm_state.vm_map: 13589.832304903 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3077947392, end = 3079016448, flags = 134217845, pgoff = 0, inode = 1064979 }
+vm_state.vm_map: 13589.832307059 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3079016448, end = 3079086080, flags = 135266419, pgoff = 1069056, inode = 1064979 }
+vm_state.vm_map: 13589.832309361 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3079090176, end = 3079102464, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 13589.832311393 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3079102464, end = 3079106560, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 13589.832316268 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3079106560, end = 3079118848, flags = 134217845, pgoff = 0, inode = 410992 }
+vm_state.vm_map: 13589.832318663 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3079118848, end = 3079122944, flags = 135266419, pgoff = 8192, inode = 410992 }
+vm_state.vm_map: 13589.832320769 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3079122944, end = 3079139328, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 13589.832322936 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3079139328, end = 3079143424, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 13589.832325109 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3079143424, end = 3079176192, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 13589.832327061 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3079176192, end = 3079180288, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 13589.832329062 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3079180288, end = 3079188480, flags = 1048691, pgoff = 3079180288, inode = 0 }
+vm_state.vm_map: 13589.832331180 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3079188480, end = 3079192576, flags = 67371125, pgoff = 3079188480, inode = 0 }
+vm_state.vm_map: 13589.832333371 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3079192576, end = 3079307264, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.832335415 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3079307264, end = 3079311360, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.832337459 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3079311360, end = 3079315456, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.832339466 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2288, start = 3218153472, end = 3218366464, flags = 1048947, pgoff = 3221012480, inode = 0 }
+vm_state.vm_map: 13589.832342120 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2315, start = 134512640, end = 135290880, flags = 134223989, pgoff = 0, inode = 1048644 }
+vm_state.vm_map: 13589.832344274 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2315, start = 135290880, end = 135311360, flags = 135272563, pgoff = 778240, inode = 1048644 }
+vm_state.vm_map: 13589.832346305 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2315, start = 135311360, end = 135331840, flags = 1048691, pgoff = 135311360, inode = 0 }
+vm_state.vm_map: 13589.832348572 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2315, start = 168464384, end = 168534016, flags = 1048691, pgoff = 168464384, inode = 0 }
+vm_state.vm_map: 13589.832350659 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2315, start = 3074740224, end = 3076071424, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.832352955 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2315, start = 3076071424, end = 3076075520, flags = 1048691, pgoff = 3076071424, inode = 0 }
+vm_state.vm_map: 13589.832355048 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2315, start = 3076075520, end = 3077390336, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.832356988 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2315, start = 3077390336, end = 3077398528, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.832358970 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2315, start = 3077398528, end = 3077402624, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.832361063 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2315, start = 3077402624, end = 3077419008, flags = 1048691, pgoff = 3077402624, inode = 0 }
+vm_state.vm_map: 13589.832363156 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2315, start = 3077419008, end = 3077427200, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.832365083 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2315, start = 3077427200, end = 3077431296, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.832367022 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2315, start = 3077431296, end = 3077435392, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.832369227 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2315, start = 3077435392, end = 3077652480, flags = 134217845, pgoff = 0, inode = 499784 }
+vm_state.vm_map: 13589.832371153 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2315, start = 3077652480, end = 3077664768, flags = 135266419, pgoff = 217088, inode = 499784 }
+vm_state.vm_map: 13589.832373339 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2315, start = 3077730304, end = 3077758976, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.832375272 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2315, start = 3077758976, end = 3077767168, flags = 1048691, pgoff = 3077758976, inode = 0 }
+vm_state.vm_map: 13589.832377211 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2315, start = 3077767168, end = 3077771264, flags = 67371125, pgoff = 3077767168, inode = 0 }
+vm_state.vm_map: 13589.832379262 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2315, start = 3077771264, end = 3077885952, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.832381195 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2315, start = 3077885952, end = 3077890048, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.832383128 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2315, start = 3077890048, end = 3077894144, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.832385411 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2315, start = 3217088512, end = 3217174528, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.832387912 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2327, start = 134512640, end = 135290880, flags = 134223989, pgoff = 0, inode = 1048644 }
+vm_state.vm_map: 13589.832389862 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2327, start = 135290880, end = 135311360, flags = 135272563, pgoff = 778240, inode = 1048644 }
+vm_state.vm_map: 13589.832391913 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2327, start = 135311360, end = 135331840, flags = 1048691, pgoff = 135311360, inode = 0 }
+vm_state.vm_map: 13589.832394049 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2327, start = 147787776, end = 147898368, flags = 1048691, pgoff = 147787776, inode = 0 }
+vm_state.vm_map: 13589.832396216 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2327, start = 3074928640, end = 3076259840, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.832398254 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2327, start = 3076259840, end = 3076263936, flags = 1048691, pgoff = 3076259840, inode = 0 }
+vm_state.vm_map: 13589.832400317 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2327, start = 3076263936, end = 3077578752, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.832402367 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2327, start = 3077578752, end = 3077586944, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.832404306 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2327, start = 3077586944, end = 3077591040, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.832406239 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2327, start = 3077591040, end = 3077607424, flags = 1048691, pgoff = 3077591040, inode = 0 }
+vm_state.vm_map: 13589.832408283 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2327, start = 3077607424, end = 3077615616, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.832410315 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2327, start = 3077615616, end = 3077619712, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.832412248 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2327, start = 3077619712, end = 3077623808, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.832414291 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2327, start = 3077623808, end = 3077840896, flags = 134217845, pgoff = 0, inode = 499784 }
+vm_state.vm_map: 13589.832416230 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2327, start = 3077840896, end = 3077853184, flags = 135266419, pgoff = 217088, inode = 499784 }
+vm_state.vm_map: 13589.832418625 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2327, start = 3077918720, end = 3077947392, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.832420565 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2327, start = 3077947392, end = 3077955584, flags = 1048691, pgoff = 3077947392, inode = 0 }
+vm_state.vm_map: 13589.832422609 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2327, start = 3077955584, end = 3077959680, flags = 67371125, pgoff = 3077955584, inode = 0 }
+vm_state.vm_map: 13589.832424659 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2327, start = 3077959680, end = 3078074368, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.832426592 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2327, start = 3078074368, end = 3078078464, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.832428549 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2327, start = 3078078464, end = 3078082560, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.832430606 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2327, start = 3218980864, end = 3219066880, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.832435925 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 134512640, end = 134586368, flags = 134223989, pgoff = 0, inode = 231137 }
+vm_state.vm_map: 13589.832437871 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 134586368, end = 134594560, flags = 135272563, pgoff = 69632, inode = 231137 }
+vm_state.vm_map: 13589.832439809 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 162680832, end = 190992384, flags = 1048691, pgoff = 162680832, inode = 0 }
+vm_state.vm_map: 13589.832447062 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2871136256, end = 2877706240, flags = 134217841, pgoff = 0, inode = 545462 }
+vm_state.vm_map: 13589.832455490 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2877706240, end = 2891042816, flags = 134217841, pgoff = 0, inode = 582110 }
+vm_state.vm_map: 13589.832475099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2891042816, end = 2904379392, flags = 134217841, pgoff = 0, inode = 582110 }
+vm_state.vm_map: 13589.832477684 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2904379392, end = 2904383488, flags = 1048688, pgoff = 2904379392, inode = 0 }
+vm_state.vm_map: 13589.832479820 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2904383488, end = 2912772096, flags = 1048691, pgoff = 2904383488, inode = 0 }
+vm_state.vm_map: 13589.832482197 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2912772096, end = 2912776192, flags = 1048688, pgoff = 2912772096, inode = 0 }
+vm_state.vm_map: 13589.832484235 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2912776192, end = 2921164800, flags = 1048691, pgoff = 2912776192, inode = 0 }
+vm_state.vm_map: 13589.832490114 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2921164800, end = 2921529344, flags = 134217845, pgoff = 0, inode = 264457 }
+vm_state.vm_map: 13589.832492164 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2921529344, end = 2921537536, flags = 135266419, pgoff = 364544, inode = 264457 }
+vm_state.vm_map: 13589.832494208 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2921537536, end = 2922065920, flags = 1048691, pgoff = 2921537536, inode = 0 }
+vm_state.vm_map: 13589.832499565 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2922065920, end = 2922172416, flags = 134217845, pgoff = 0, inode = 264532 }
+vm_state.vm_map: 13589.832501781 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2922172416, end = 2922176512, flags = 135266419, pgoff = 106496, inode = 264532 }
+vm_state.vm_map: 13589.832503899 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2922176512, end = 2922864640, flags = 1048691, pgoff = 2922176512, inode = 0 }
+vm_state.vm_map: 13589.832506053 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2922864640, end = 2922868736, flags = 1048688, pgoff = 2922864640, inode = 0 }
+vm_state.vm_map: 13589.832508171 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2922868736, end = 2931257344, flags = 1048691, pgoff = 2922868736, inode = 0 }
+vm_state.vm_map: 13589.832511095 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2932133888, end = 2932457472, flags = 134217841, pgoff = 0, inode = 49558 }
+vm_state.vm_map: 13589.832516236 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2932457472, end = 2939027456, flags = 134217841, pgoff = 0, inode = 545462 }
+vm_state.vm_map: 13589.832518717 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2939027456, end = 2939650048, flags = 134217841, pgoff = 0, inode = 49164 }
+vm_state.vm_map: 13589.832520718 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2939650048, end = 2939654144, flags = 1048688, pgoff = 2939650048, inode = 0 }
+vm_state.vm_map: 13589.832522879 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2939654144, end = 2948042752, flags = 1048691, pgoff = 2939654144, inode = 0 }
+vm_state.vm_map: 13589.832525483 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2948042752, end = 2948063232, flags = 134217845, pgoff = 0, inode = 508634 }
+vm_state.vm_map: 13589.832527964 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2948063232, end = 2948067328, flags = 135266417, pgoff = 16384, inode = 508634 }
+vm_state.vm_map: 13589.832529964 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2948067328, end = 2948071424, flags = 135266419, pgoff = 20480, inode = 508634 }
+vm_state.vm_map: 13589.832532286 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2948091904, end = 2948096000, flags = 1048691, pgoff = 2948091904, inode = 0 }
+vm_state.vm_map: 13589.832534496 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2948096000, end = 2948165632, flags = 134217841, pgoff = 0, inode = 98449 }
+vm_state.vm_map: 13589.832536805 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2948165632, end = 2948169728, flags = 1048688, pgoff = 2948165632, inode = 0 }
+vm_state.vm_map: 13589.832538849 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2948169728, end = 2956558336, flags = 1048691, pgoff = 2948169728, inode = 0 }
+vm_state.vm_map: 13589.832541072 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2956558336, end = 2956562432, flags = 1048688, pgoff = 2956558336, inode = 0 }
+vm_state.vm_map: 13589.832543017 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2956562432, end = 2965913600, flags = 1048691, pgoff = 2956562432, inode = 0 }
+vm_state.vm_map: 13589.832548169 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2965913600, end = 2965934080, flags = 134217845, pgoff = 0, inode = 264374 }
+vm_state.vm_map: 13589.832550231 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2965934080, end = 2965938176, flags = 135266419, pgoff = 20480, inode = 264374 }
+vm_state.vm_map: 13589.832555483 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2965938176, end = 2966003712, flags = 134217841, pgoff = 0, inode = 649744 }
+vm_state.vm_map: 13589.832560508 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2966003712, end = 2966028288, flags = 134217845, pgoff = 0, inode = 264552 }
+vm_state.vm_map: 13589.832562687 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2966028288, end = 2966032384, flags = 135266419, pgoff = 24576, inode = 264552 }
+vm_state.vm_map: 13589.832564891 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2966032384, end = 2966036480, flags = 1048688, pgoff = 2966032384, inode = 0 }
+vm_state.vm_map: 13589.832567180 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2966036480, end = 2974425088, flags = 1048691, pgoff = 2966036480, inode = 0 }
+vm_state.vm_map: 13589.832569200 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2974425088, end = 2974429184, flags = 1048688, pgoff = 2974425088, inode = 0 }
+vm_state.vm_map: 13589.832571231 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2974429184, end = 2982817792, flags = 1048691, pgoff = 2974429184, inode = 0 }
+vm_state.vm_map: 13589.832573854 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2982817792, end = 2983108608, flags = 134217845, pgoff = 0, inode = 82086 }
+vm_state.vm_map: 13589.832575997 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2983108608, end = 2983157760, flags = 135266419, pgoff = 286720, inode = 82086 }
+vm_state.vm_map: 13589.832581038 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2983157760, end = 2983419904, flags = 134217845, pgoff = 0, inode = 82085 }
+vm_state.vm_map: 13589.832583077 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2983419904, end = 2983424000, flags = 135266419, pgoff = 258048, inode = 82085 }
+vm_state.vm_map: 13589.832585601 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2983424000, end = 2983440384, flags = 1048691, pgoff = 2983424000, inode = 0 }
+vm_state.vm_map: 13589.832588469 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2983440384, end = 2983555072, flags = 134217845, pgoff = 0, inode = 82084 }
+vm_state.vm_map: 13589.832590513 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2983555072, end = 2983559168, flags = 135266419, pgoff = 114688, inode = 82084 }
+vm_state.vm_map: 13589.832592711 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2983559168, end = 2984079360, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 13589.832594743 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2984079360, end = 2984087552, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 13589.832597458 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2984087552, end = 2984267776, flags = 134217845, pgoff = 0, inode = 82083 }
+vm_state.vm_map: 13589.832599495 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2984267776, end = 2984271872, flags = 135266419, pgoff = 180224, inode = 82083 }
+vm_state.vm_map: 13589.832606908 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2984271872, end = 2984341504, flags = 134217845, pgoff = 0, inode = 21618 }
+vm_state.vm_map: 13589.832608940 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2984341504, end = 2984353792, flags = 135266419, pgoff = 69632, inode = 21618 }
+vm_state.vm_map: 13589.832616303 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2984353792, end = 2985205760, flags = 134217845, pgoff = 0, inode = 21616 }
+vm_state.vm_map: 13589.832618334 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2985205760, end = 2985222144, flags = 135266419, pgoff = 851968, inode = 21616 }
+vm_state.vm_map: 13589.832626535 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2985222144, end = 2985336832, flags = 134217845, pgoff = 0, inode = 21619 }
+vm_state.vm_map: 13589.832628579 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2985336832, end = 2985345024, flags = 135266419, pgoff = 114688, inode = 21619 }
+vm_state.vm_map: 13589.832633480 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2985345024, end = 2985496576, flags = 134217845, pgoff = 0, inode = 21617 }
+vm_state.vm_map: 13589.832635560 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2985496576, end = 2985504768, flags = 135266419, pgoff = 151552, inode = 21617 }
+vm_state.vm_map: 13589.832637758 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2985504768, end = 2985521152, flags = 1048691, pgoff = 2985504768, inode = 0 }
+vm_state.vm_map: 13589.832640202 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2985521152, end = 2985594880, flags = 134217845, pgoff = 0, inode = 264489 }
+vm_state.vm_map: 13589.832642388 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2985594880, end = 2985598976, flags = 135266419, pgoff = 73728, inode = 264489 }
+vm_state.vm_map: 13589.832644912 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2985598976, end = 2985967616, flags = 134217845, pgoff = 0, inode = 264542 }
+vm_state.vm_map: 13589.832647091 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2985967616, end = 2985984000, flags = 135266419, pgoff = 368640, inode = 264542 }
+vm_state.vm_map: 13589.832652399 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2985984000, end = 2986196992, flags = 134217845, pgoff = 0, inode = 264488 }
+vm_state.vm_map: 13589.832654448 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2986196992, end = 2986209280, flags = 135266419, pgoff = 208896, inode = 264488 }
+vm_state.vm_map: 13589.832657059 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2986209280, end = 2986225664, flags = 134217845, pgoff = 0, inode = 87517 }
+vm_state.vm_map: 13589.832659152 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2986225664, end = 2986229760, flags = 135266419, pgoff = 12288, inode = 87517 }
+vm_state.vm_map: 13589.832661978 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2986229760, end = 2986254336, flags = 134217845, pgoff = 0, inode = 87514 }
+vm_state.vm_map: 13589.832664002 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2986254336, end = 2986258432, flags = 135266419, pgoff = 20480, inode = 87514 }
+vm_state.vm_map: 13589.832666952 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2986258432, end = 2986651648, flags = 134217979, pgoff = 0, inode = 622594 }
+vm_state.vm_map: 13589.832672069 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2986651648, end = 2986725376, flags = 134217845, pgoff = 0, inode = 264471 }
+vm_state.vm_map: 13589.832674137 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2986725376, end = 2986733568, flags = 135266419, pgoff = 69632, inode = 264471 }
+vm_state.vm_map: 13589.832678871 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2986733568, end = 2987364352, flags = 134217845, pgoff = 0, inode = 264445 }
+vm_state.vm_map: 13589.832680933 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2987364352, end = 2987380736, flags = 135266419, pgoff = 630784, inode = 264445 }
+vm_state.vm_map: 13589.832682990 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2987380736, end = 2987384832, flags = 1048688, pgoff = 2987380736, inode = 0 }
+vm_state.vm_map: 13589.832684972 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2987384832, end = 2995773440, flags = 1048691, pgoff = 2987384832, inode = 0 }
+vm_state.vm_map: 13589.832687005 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2995773440, end = 2995777536, flags = 1048688, pgoff = 2995773440, inode = 0 }
+kernel.irq_entry: 13589.832712948 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { ip = 3242331332, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.irq_exit: 13589.832726173 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { handled = 1 }
+vm_state.vm_map: 13589.832731387 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 2995777536, end = 3004166144, flags = 1048691, pgoff = 2995777536, inode = 0 }
+vm_state.vm_map: 13589.832733467 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3004166144, end = 3004170240, flags = 1048688, pgoff = 3004166144, inode = 0 }
+vm_state.vm_map: 13589.832735641 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3004170240, end = 3012558848, flags = 1048691, pgoff = 3004170240, inode = 0 }
+vm_state.vm_map: 13589.832737851 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3012558848, end = 3012726784, flags = 2097267, pgoff = 3012558848, inode = 0 }
+vm_state.vm_map: 13589.832740000 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3012726784, end = 3013607424, flags = 2097264, pgoff = 3012726784, inode = 0 }
+vm_state.vm_map: 13589.832742198 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3013607424, end = 3013668864, flags = 134217841, pgoff = 0, inode = 649743 }
+vm_state.vm_map: 13589.832744807 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3013668864, end = 3013730304, flags = 134217845, pgoff = 0, inode = 264103 }
+vm_state.vm_map: 13589.832746864 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3013730304, end = 3013734400, flags = 135266419, pgoff = 61440, inode = 264103 }
+vm_state.vm_map: 13589.832749357 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3013734400, end = 3013754880, flags = 134217845, pgoff = 0, inode = 264512 }
+vm_state.vm_map: 13589.832751358 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3013754880, end = 3013758976, flags = 135266419, pgoff = 20480, inode = 264512 }
+vm_state.vm_map: 13589.832753747 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3013758976, end = 3013918720, flags = 134217845, pgoff = 0, inode = 106968 }
+vm_state.vm_map: 13589.832755687 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3013918720, end = 3013926912, flags = 135266419, pgoff = 159744, inode = 106968 }
+vm_state.vm_map: 13589.832757878 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3013926912, end = 3014008832, flags = 134217841, pgoff = 0, inode = 98443 }
+vm_state.vm_map: 13589.832765973 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014008832, end = 3014021120, flags = 134217845, pgoff = 0, inode = 264476 }
+vm_state.vm_map: 13589.832768012 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014021120, end = 3014025216, flags = 135266419, pgoff = 8192, inode = 264476 }
+vm_state.vm_map: 13589.832773282 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014025216, end = 3014078464, flags = 134217841, pgoff = 0, inode = 649748 }
+vm_state.vm_map: 13589.832775991 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014078464, end = 3014148096, flags = 134217841, pgoff = 0, inode = 649694 }
+vm_state.vm_map: 13589.832778348 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014148096, end = 3014156288, flags = 134217845, pgoff = 0, inode = 87435 }
+vm_state.vm_map: 13589.832780435 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014156288, end = 3014160384, flags = 135266419, pgoff = 4096, inode = 87435 }
+vm_state.vm_map: 13589.832783150 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014160384, end = 3014164480, flags = 134217937, pgoff = 0, inode = 1196317 }
+vm_state.vm_map: 13589.832785403 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014164480, end = 3014189056, flags = 134217937, pgoff = 0, inode = 1196229 }
+vm_state.vm_map: 13589.832787534 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014189056, end = 3014193152, flags = 134217937, pgoff = 0, inode = 1196235 }
+vm_state.vm_map: 13589.832789787 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014193152, end = 3014197248, flags = 134217937, pgoff = 0, inode = 1196204 }
+vm_state.vm_map: 13589.832792243 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014197248, end = 3014201344, flags = 134217937, pgoff = 0, inode = 1196228 }
+vm_state.vm_map: 13589.832794342 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014201344, end = 3014205440, flags = 134217937, pgoff = 0, inode = 1196227 }
+vm_state.vm_map: 13589.832796442 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014205440, end = 3014213632, flags = 134217937, pgoff = 0, inode = 1196198 }
+vm_state.vm_map: 13589.832798622 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014213632, end = 3014246400, flags = 134217937, pgoff = 0, inode = 1196200 }
+vm_state.vm_map: 13589.832801133 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014246400, end = 3014258688, flags = 134217937, pgoff = 0, inode = 1196226 }
+vm_state.vm_map: 13589.832803343 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014258688, end = 3014266880, flags = 134217937, pgoff = 0, inode = 1196225 }
+vm_state.vm_map: 13589.832805542 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014266880, end = 3014270976, flags = 134217937, pgoff = 0, inode = 1196224 }
+vm_state.vm_map: 13589.832807739 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014270976, end = 3014275072, flags = 134217937, pgoff = 0, inode = 1196223 }
+vm_state.vm_map: 13589.832809918 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014275072, end = 3014279168, flags = 134217937, pgoff = 0, inode = 1196202 }
+vm_state.vm_map: 13589.832811975 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014279168, end = 3014307840, flags = 134217937, pgoff = 0, inode = 1196222 }
+vm_state.vm_map: 13589.832814044 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014307840, end = 3014320128, flags = 134217937, pgoff = 0, inode = 1196221 }
+vm_state.vm_map: 13589.832816131 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014320128, end = 3014324224, flags = 134217937, pgoff = 0, inode = 1196220 }
+vm_state.vm_map: 13589.832818365 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014324224, end = 3014332416, flags = 134217937, pgoff = 0, inode = 1196219 }
+vm_state.vm_map: 13589.832820594 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014332416, end = 3014336512, flags = 134217937, pgoff = 0, inode = 1196210 }
+vm_state.vm_map: 13589.832822650 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014336512, end = 3014340608, flags = 134217937, pgoff = 0, inode = 1196205 }
+vm_state.vm_map: 13589.832824713 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014340608, end = 3014352896, flags = 134217937, pgoff = 0, inode = 1196244 }
+vm_state.vm_map: 13589.832826892 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014352896, end = 3014361088, flags = 134217937, pgoff = 0, inode = 1196270 }
+vm_state.vm_map: 13589.832828985 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014361088, end = 3014393856, flags = 134217937, pgoff = 0, inode = 1196246 }
+vm_state.vm_map: 13589.832831287 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014393856, end = 3014414336, flags = 134217937, pgoff = 0, inode = 1196269 }
+vm_state.vm_map: 13589.832833633 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014414336, end = 3014422528, flags = 134217937, pgoff = 0, inode = 1196316 }
+vm_state.vm_map: 13589.832836255 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014422528, end = 3014451200, flags = 134217937, pgoff = 0, inode = 1196197 }
+vm_state.vm_map: 13589.832838558 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014451200, end = 3014496256, flags = 134217937, pgoff = 0, inode = 1196312 }
+vm_state.vm_map: 13589.832840707 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014496256, end = 3014553600, flags = 134217937, pgoff = 0, inode = 1196272 }
+vm_state.vm_map: 13589.832842769 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014553600, end = 3014610944, flags = 134217937, pgoff = 0, inode = 1196231 }
+vm_state.vm_map: 13589.832844746 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014610944, end = 3014615040, flags = 1048688, pgoff = 3014610944, inode = 0 }
+vm_state.vm_map: 13589.832846876 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3014615040, end = 3023003648, flags = 1048691, pgoff = 3014615040, inode = 0 }
+vm_state.vm_map: 13589.832852349 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3023003648, end = 3028430848, flags = 134217845, pgoff = 0, inode = 264426 }
+vm_state.vm_map: 13589.832854386 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3028430848, end = 3028819968, flags = 135266419, pgoff = 5423104, inode = 264426 }
+vm_state.vm_map: 13589.832856436 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3028819968, end = 3028848640, flags = 1048691, pgoff = 3028819968, inode = 0 }
+vm_state.vm_map: 13589.832858752 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3028848640, end = 3028975616, flags = 134217845, pgoff = 0, inode = 18923 }
+vm_state.vm_map: 13589.832860801 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3028975616, end = 3028979712, flags = 135266419, pgoff = 122880, inode = 18923 }
+vm_state.vm_map: 13589.832862845 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3028979712, end = 3028996096, flags = 1048691, pgoff = 3028979712, inode = 0 }
+vm_state.vm_map: 13589.832865289 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3028996096, end = 3029065728, flags = 134217845, pgoff = 0, inode = 264390 }
+vm_state.vm_map: 13589.832867340 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3029065728, end = 3029073920, flags = 135266419, pgoff = 65536, inode = 264390 }
+vm_state.vm_map: 13589.832869845 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3029073920, end = 3029168128, flags = 134217845, pgoff = 0, inode = 264386 }
+vm_state.vm_map: 13589.832872449 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3029168128, end = 3029176320, flags = 135266419, pgoff = 90112, inode = 264386 }
+vm_state.vm_map: 13589.832874604 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3029176320, end = 3029250048, flags = 134217845, pgoff = 0, inode = 17860 }
+vm_state.vm_map: 13589.832876703 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3029250048, end = 3029254144, flags = 135266419, pgoff = 69632, inode = 17860 }
+vm_state.vm_map: 13589.832878797 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3029254144, end = 3029266432, flags = 134217845, pgoff = 0, inode = 141213 }
+vm_state.vm_map: 13589.832880736 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3029266432, end = 3029270528, flags = 135266419, pgoff = 8192, inode = 141213 }
+vm_state.vm_map: 13589.832882965 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3029270528, end = 3029282816, flags = 134217937, pgoff = 0, inode = 1196315 }
+vm_state.vm_map: 13589.832890346 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3029282816, end = 3029311488, flags = 134217845, pgoff = 0, inode = 264450 }
+vm_state.vm_map: 13589.832892390 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3029311488, end = 3029315584, flags = 135266419, pgoff = 24576, inode = 264450 }
+vm_state.vm_map: 13589.832894841 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3029315584, end = 3029348352, flags = 134217841, pgoff = 0, inode = 73897 }
+vm_state.vm_map: 13589.832899649 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3029348352, end = 3029581824, flags = 134217845, pgoff = 0, inode = 264491 }
+vm_state.vm_map: 13589.832901711 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3029581824, end = 3029594112, flags = 135266419, pgoff = 229376, inode = 264491 }
+vm_state.vm_map: 13589.832904340 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3029594112, end = 3029610496, flags = 134217845, pgoff = 0, inode = 264557 }
+vm_state.vm_map: 13589.832906280 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3029610496, end = 3029614592, flags = 135266419, pgoff = 16384, inode = 264557 }
+vm_state.vm_map: 13589.832911432 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3029614592, end = 3029704704, flags = 134217845, pgoff = 0, inode = 264497 }
+vm_state.vm_map: 13589.832913494 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3029704704, end = 3029712896, flags = 135266419, pgoff = 86016, inode = 264497 }
+vm_state.vm_map: 13589.832918555 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3029712896, end = 3029782528, flags = 134217845, pgoff = 0, inode = 264411 }
+vm_state.vm_map: 13589.832920593 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3029782528, end = 3029786624, flags = 135266419, pgoff = 65536, inode = 264411 }
+vm_state.vm_map: 13589.832923326 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3029786624, end = 3029807104, flags = 134217845, pgoff = 0, inode = 264467 }
+vm_state.vm_map: 13589.832925543 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3029807104, end = 3029811200, flags = 135266419, pgoff = 16384, inode = 264467 }
+vm_state.vm_map: 13589.832927858 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3029811200, end = 3029815296, flags = 1048688, pgoff = 3029811200, inode = 0 }
+vm_state.vm_map: 13589.832929902 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3029815296, end = 3038203904, flags = 1048691, pgoff = 3029815296, inode = 0 }
+vm_state.vm_map: 13589.832937203 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3038203904, end = 3038375936, flags = 134217845, pgoff = 0, inode = 264421 }
+vm_state.vm_map: 13589.832939241 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3038375936, end = 3038384128, flags = 135266419, pgoff = 167936, inode = 264421 }
+vm_state.vm_map: 13589.832944061 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3038384128, end = 3038494720, flags = 134217845, pgoff = 0, inode = 264459 }
+vm_state.vm_map: 13589.832946457 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3038494720, end = 3038502912, flags = 135266419, pgoff = 106496, inode = 264459 }
+vm_state.vm_map: 13589.832948759 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3038502912, end = 3038515200, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 13589.832950907 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3038515200, end = 3038519296, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 13589.832953099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3038519296, end = 3038605312, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 13589.832955266 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3038605312, end = 3038609408, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 13589.832957414 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3038609408, end = 3038617600, flags = 1048691, pgoff = 3038609408, inode = 0 }
+vm_state.vm_map: 13589.832959674 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3038617600, end = 3038646272, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 13589.832961644 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3038646272, end = 3038650368, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 13589.832963799 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3038650368, end = 3038969856, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 13589.832965738 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3038969856, end = 3038986240, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 13589.832968466 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3038986240, end = 3038994432, flags = 134217845, pgoff = 0, inode = 231125 }
+vm_state.vm_map: 13589.832970399 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3038994432, end = 3038998528, flags = 135266419, pgoff = 4096, inode = 231125 }
+vm_state.vm_map: 13589.832972818 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3038998528, end = 3039076352, flags = 134217845, pgoff = 0, inode = 264536 }
+vm_state.vm_map: 13589.832974794 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3039076352, end = 3039080448, flags = 135266419, pgoff = 77824, inode = 264536 }
+vm_state.vm_map: 13589.832977227 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3039080448, end = 3039092736, flags = 134217845, pgoff = 0, inode = 231124 }
+vm_state.vm_map: 13589.832979158 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3039092736, end = 3039096832, flags = 135266419, pgoff = 12288, inode = 231124 }
+vm_state.vm_map: 13589.832981813 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3039096832, end = 3039215616, flags = 134217845, pgoff = 0, inode = 229424 }
+vm_state.vm_map: 13589.832983752 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3039215616, end = 3039223808, flags = 135266419, pgoff = 114688, inode = 229424 }
+vm_state.vm_map: 13589.832986189 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3039223808, end = 3039404032, flags = 134217845, pgoff = 0, inode = 264408 }
+vm_state.vm_map: 13589.832988123 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3039404032, end = 3039420416, flags = 135266419, pgoff = 176128, inode = 264408 }
+vm_state.vm_map: 13589.832995350 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3039420416, end = 3039735808, flags = 134217845, pgoff = 0, inode = 264365 }
+vm_state.vm_map: 13589.832997277 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3039735808, end = 3039752192, flags = 135266419, pgoff = 315392, inode = 264365 }
+vm_state.vm_map: 13589.832999574 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3039752192, end = 3040215040, flags = 134217845, pgoff = 0, inode = 20061 }
+vm_state.vm_map: 13589.833001513 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3040215040, end = 3040227328, flags = 135266419, pgoff = 458752, inode = 20061 }
+vm_state.vm_map: 13589.833003705 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3040227328, end = 3040288768, flags = 134217845, pgoff = 0, inode = 19423 }
+vm_state.vm_map: 13589.833005687 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3040288768, end = 3040292864, flags = 135266419, pgoff = 57344, inode = 19423 }
+vm_state.vm_map: 13589.833008150 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3040292864, end = 3041095680, flags = 134217845, pgoff = 0, inode = 21274 }
+vm_state.vm_map: 13589.833010182 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3041095680, end = 3041112064, flags = 135266419, pgoff = 802816, inode = 21274 }
+vm_state.vm_map: 13589.833017570 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3041112064, end = 3041128448, flags = 134217845, pgoff = 0, inode = 1065421 }
+vm_state.vm_map: 13589.833019626 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3041128448, end = 3041132544, flags = 135266419, pgoff = 12288, inode = 1065421 }
+vm_state.vm_map: 13589.833026514 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3041132544, end = 3041193984, flags = 134217845, pgoff = 0, inode = 21268 }
+vm_state.vm_map: 13589.833028651 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3041193984, end = 3041198080, flags = 135266419, pgoff = 57344, inode = 21268 }
+vm_state.vm_map: 13589.833031212 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3041198080, end = 3041239040, flags = 134217845, pgoff = 0, inode = 22434 }
+vm_state.vm_map: 13589.833033250 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3041239040, end = 3041243136, flags = 135266419, pgoff = 40960, inode = 22434 }
+vm_state.vm_map: 13589.833035533 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3041243136, end = 3041849344, flags = 134217845, pgoff = 0, inode = 22471 }
+vm_state.vm_map: 13589.833037559 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3041849344, end = 3041865728, flags = 135266419, pgoff = 602112, inode = 22471 }
+vm_state.vm_map: 13589.833040096 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3041865728, end = 3043123200, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 13589.833042134 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3043123200, end = 3043143680, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 13589.833044097 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3043143680, end = 3043147776, flags = 1048691, pgoff = 3043143680, inode = 0 }
+vm_state.vm_map: 13589.833046375 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3043147776, end = 3043184640, flags = 134217845, pgoff = 0, inode = 499726 }
+vm_state.vm_map: 13589.833048308 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3043184640, end = 3043188736, flags = 135266419, pgoff = 32768, inode = 499726 }
+vm_state.vm_map: 13589.833053554 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3043188736, end = 3043319808, flags = 134217845, pgoff = 0, inode = 1065240 }
+vm_state.vm_map: 13589.833055585 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3043319808, end = 3043332096, flags = 135266419, pgoff = 131072, inode = 1065240 }
+vm_state.vm_map: 13589.833058350 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3043332096, end = 3043368960, flags = 134217845, pgoff = 0, inode = 22966 }
+vm_state.vm_map: 13589.833058825 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3043368960, end = 3043373056, flags = 135266419, pgoff = 36864, inode = 22966 }
+kernel.irq_entry: 13589.833075717 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { ip = 3242331332, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_itimer_expired: 13589.833083278 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { pid = 1852 }
+kernel.send_signal: 13589.833092580 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { pid = 1852, signal = 14 }
+kernel.irq_exit: 13589.833111358 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { handled = 1 }
+vm_state.vm_map: 13589.833120968 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3043373056, end = 3043450880, flags = 134217845, pgoff = 0, inode = 1065451 }
+vm_state.vm_map: 13589.833123430 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3043450880, end = 3043459072, flags = 135266419, pgoff = 77824, inode = 1065451 }
+vm_state.vm_map: 13589.833130283 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3043459072, end = 3043794944, flags = 134217845, pgoff = 0, inode = 1065452 }
+vm_state.vm_map: 13589.833132332 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3043794944, end = 3043835904, flags = 135266419, pgoff = 331776, inode = 1065452 }
+vm_state.vm_map: 13589.833139222 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3043835904, end = 3044196352, flags = 134217845, pgoff = 0, inode = 1065455 }
+vm_state.vm_map: 13589.833141259 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3044196352, end = 3044208640, flags = 135266419, pgoff = 356352, inode = 1065455 }
+vm_state.vm_map: 13589.833148235 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3044208640, end = 3044290560, flags = 134217845, pgoff = 0, inode = 1065819 }
+vm_state.vm_map: 13589.833150279 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3044290560, end = 3044294656, flags = 135266419, pgoff = 81920, inode = 1065819 }
+vm_state.vm_map: 13589.833152458 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3044294656, end = 3044519936, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.833154489 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3044519936, end = 3044524032, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.833156552 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3044524032, end = 3044528128, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.833178248 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3044528128, end = 3044642816, flags = 134217845, pgoff = 0, inode = 17291 }
+vm_state.vm_map: 13589.833180364 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3044642816, end = 3044646912, flags = 135266419, pgoff = 114688, inode = 17291 }
+vm_state.vm_map: 13589.833187931 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3044646912, end = 3044954112, flags = 134217845, pgoff = 0, inode = 1065420 }
+vm_state.vm_map: 13589.833189968 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3044954112, end = 3044995072, flags = 135266419, pgoff = 303104, inode = 1065420 }
+vm_state.vm_map: 13589.833194833 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3044995072, end = 3045191680, flags = 134217845, pgoff = 0, inode = 1065401 }
+vm_state.vm_map: 13589.833196889 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3045191680, end = 3045203968, flags = 135266419, pgoff = 192512, inode = 1065401 }
+vm_state.vm_map: 13589.833198945 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3045203968, end = 3045208064, flags = 1048691, pgoff = 3045203968, inode = 0 }
+vm_state.vm_map: 13589.833203766 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3045208064, end = 3045269504, flags = 134217841, pgoff = 0, inode = 76320 }
+vm_state.vm_map: 13589.833206154 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3045269504, end = 3045298176, flags = 134217841, pgoff = 0, inode = 73912 }
+vm_state.vm_map: 13589.833208561 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3045298176, end = 3045605376, flags = 134217845, pgoff = 0, inode = 264528 }
+vm_state.vm_map: 13589.833210735 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3045605376, end = 3045621760, flags = 135266419, pgoff = 307200, inode = 264528 }
+vm_state.vm_map: 13589.833215894 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3045621760, end = 3046395904, flags = 134217845, pgoff = 0, inode = 264478 }
+vm_state.vm_map: 13589.833218036 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3046395904, end = 3046420480, flags = 135266419, pgoff = 774144, inode = 264478 }
+vm_state.vm_map: 13589.833220049 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3046420480, end = 3046461440, flags = 1048691, pgoff = 3046420480, inode = 0 }
+vm_state.vm_map: 13589.833222782 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3046461440, end = 3046846464, flags = 134217845, pgoff = 0, inode = 264571 }
+vm_state.vm_map: 13589.833224858 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3046846464, end = 3046875136, flags = 135266419, pgoff = 385024, inode = 264571 }
+vm_state.vm_map: 13589.833227104 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3046875136, end = 3046879232, flags = 1048691, pgoff = 3046875136, inode = 0 }
+vm_state.vm_map: 13589.833229462 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3046879232, end = 3047034880, flags = 134217845, pgoff = 0, inode = 264449 }
+vm_state.vm_map: 13589.833231519 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3047034880, end = 3047043072, flags = 135266419, pgoff = 155648, inode = 264449 }
+vm_state.vm_map: 13589.833234031 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3047043072, end = 3047112704, flags = 134217845, pgoff = 0, inode = 264508 }
+vm_state.vm_map: 13589.833235982 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3047112704, end = 3047120896, flags = 135266419, pgoff = 65536, inode = 264508 }
+vm_state.vm_map: 13589.833238174 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3047120896, end = 3047124992, flags = 1048688, pgoff = 3047120896, inode = 0 }
+vm_state.vm_map: 13589.833240211 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3047124992, end = 3055513600, flags = 1048691, pgoff = 3047124992, inode = 0 }
+vm_state.vm_map: 13589.833244885 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3055513600, end = 3055730688, flags = 134217845, pgoff = 0, inode = 264108 }
+vm_state.vm_map: 13589.833246934 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3055730688, end = 3055742976, flags = 135266419, pgoff = 217088, inode = 264108 }
+vm_state.vm_map: 13589.833252130 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3055742976, end = 3056492544, flags = 134217845, pgoff = 0, inode = 264373 }
+vm_state.vm_map: 13589.833254181 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3056492544, end = 3056525312, flags = 135266419, pgoff = 749568, inode = 264373 }
+vm_state.vm_map: 13589.833261235 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3056525312, end = 3056787456, flags = 134217845, pgoff = 0, inode = 17293 }
+vm_state.vm_map: 13589.833263384 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3056787456, end = 3056803840, flags = 135266419, pgoff = 262144, inode = 17293 }
+vm_state.vm_map: 13589.833265601 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3056803840, end = 3056816128, flags = 134217845, pgoff = 0, inode = 20765 }
+vm_state.vm_map: 13589.833267645 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3056816128, end = 3056820224, flags = 135266419, pgoff = 8192, inode = 20765 }
+vm_state.vm_map: 13589.833269830 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3056820224, end = 3056828416, flags = 134217845, pgoff = 0, inode = 508751 }
+vm_state.vm_map: 13589.833271831 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3056828416, end = 3056832512, flags = 135266417, pgoff = 4096, inode = 508751 }
+vm_state.vm_map: 13589.833273931 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3056832512, end = 3056836608, flags = 135266419, pgoff = 8192, inode = 508751 }
+vm_state.vm_map: 13589.833276418 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3056836608, end = 3056893952, flags = 134217845, pgoff = 0, inode = 264553 }
+vm_state.vm_map: 13589.833278455 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3056893952, end = 3056898048, flags = 135266419, pgoff = 57344, inode = 264553 }
+vm_state.vm_map: 13589.833283129 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3056898048, end = 3056996352, flags = 134217845, pgoff = 0, inode = 229435 }
+vm_state.vm_map: 13589.833285314 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3056996352, end = 3057004544, flags = 135266419, pgoff = 94208, inode = 229435 }
+vm_state.vm_map: 13589.833288072 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3057004544, end = 3059937280, flags = 134217845, pgoff = 0, inode = 264105 }
+vm_state.vm_map: 13589.833290097 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3059937280, end = 3060047872, flags = 135266419, pgoff = 2928640, inode = 264105 }
+vm_state.vm_map: 13589.833292136 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060047872, end = 3060051968, flags = 1048691, pgoff = 3060047872, inode = 0 }
+vm_state.vm_map: 13589.833294438 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060051968, end = 3060080640, flags = 134217845, pgoff = 0, inode = 1065218 }
+vm_state.vm_map: 13589.833296586 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060080640, end = 3060084736, flags = 135266419, pgoff = 28672, inode = 1065218 }
+vm_state.vm_map: 13589.833298778 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060084736, end = 3060137984, flags = 134217845, pgoff = 0, inode = 24466 }
+vm_state.vm_map: 13589.833300724 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060137984, end = 3060142080, flags = 135266419, pgoff = 49152, inode = 24466 }
+vm_state.vm_map: 13589.833303032 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060142080, end = 3060162560, flags = 134217845, pgoff = 0, inode = 21278 }
+vm_state.vm_map: 13589.833305076 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060162560, end = 3060166656, flags = 135266419, pgoff = 16384, inode = 21278 }
+vm_state.vm_map: 13589.833307231 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060166656, end = 3060330496, flags = 134217845, pgoff = 0, inode = 21283 }
+vm_state.vm_map: 13589.833309274 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060330496, end = 3060334592, flags = 135266419, pgoff = 159744, inode = 21283 }
+vm_state.vm_map: 13589.833311509 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060334592, end = 3060396032, flags = 134217845, pgoff = 0, inode = 1065430 }
+vm_state.vm_map: 13589.833313554 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060396032, end = 3060400128, flags = 135266419, pgoff = 57344, inode = 1065430 }
+vm_state.vm_map: 13589.833315597 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060400128, end = 3060408320, flags = 1048691, pgoff = 3060400128, inode = 0 }
+vm_state.vm_map: 13589.833317937 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060408320, end = 3060469760, flags = 134217845, pgoff = 0, inode = 264564 }
+vm_state.vm_map: 13589.833320042 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060469760, end = 3060473856, flags = 135266419, pgoff = 57344, inode = 264564 }
+vm_state.vm_map: 13589.833322801 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060473856, end = 3060490240, flags = 134217845, pgoff = 0, inode = 264418 }
+vm_state.vm_map: 13589.833324838 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060490240, end = 3060494336, flags = 135266419, pgoff = 16384, inode = 264418 }
+vm_state.vm_map: 13589.833327030 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060494336, end = 3060535296, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.833329172 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060535296, end = 3060539392, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.833331142 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060539392, end = 3060543488, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.833333655 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060543488, end = 3060580352, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.833335735 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060580352, end = 3060584448, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.833337902 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060584448, end = 3060588544, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.833340118 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060588544, end = 3060666368, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.833342391 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060666368, end = 3060670464, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.833344354 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060670464, end = 3060674560, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.833346521 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060674560, end = 3060682752, flags = 1048691, pgoff = 3060674560, inode = 0 }
+vm_state.vm_map: 13589.833348750 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060682752, end = 3060707328, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.833351033 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060707328, end = 3060711424, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.833353108 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060711424, end = 3060715520, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.833355405 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060715520, end = 3060719616, flags = 1048691, pgoff = 3060715520, inode = 0 }
+vm_state.vm_map: 13589.833358095 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060719616, end = 3060727808, flags = 134217845, pgoff = 0, inode = 21270 }
+vm_state.vm_map: 13589.833360268 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060727808, end = 3060731904, flags = 135266419, pgoff = 8192, inode = 21270 }
+vm_state.vm_map: 13589.833362361 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060731904, end = 3060760576, flags = 134217845, pgoff = 0, inode = 23696 }
+vm_state.vm_map: 13589.833364535 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060760576, end = 3060764672, flags = 135266419, pgoff = 24576, inode = 23696 }
+vm_state.vm_map: 13589.833366684 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060764672, end = 3060781056, flags = 134217845, pgoff = 0, inode = 1065432 }
+vm_state.vm_map: 13589.833368949 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060781056, end = 3060785152, flags = 135266419, pgoff = 12288, inode = 1065432 }
+vm_state.vm_map: 13589.833371104 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060785152, end = 3060805632, flags = 134217845, pgoff = 0, inode = 314599 }
+vm_state.vm_map: 13589.833373339 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060805632, end = 3060809728, flags = 135266419, pgoff = 16384, inode = 314599 }
+vm_state.vm_map: 13589.833375543 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060809728, end = 3060948992, flags = 134217841, pgoff = 0, inode = 74520 }
+vm_state.vm_map: 13589.833377962 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3060948992, end = 3062280192, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.833379938 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3062280192, end = 3062292480, flags = 1048691, pgoff = 3062280192, inode = 0 }
+vm_state.vm_map: 13589.833382234 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3062292480, end = 3062308864, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.833384322 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3062308864, end = 3062312960, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.833386723 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3062312960, end = 3062321152, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.833388674 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3062321152, end = 3062325248, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.833391020 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3062325248, end = 3062353920, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.833393348 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3062353920, end = 3062358016, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.833395514 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3062358016, end = 3062362112, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.833397767 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3062362112, end = 3062509568, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.833399934 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3062509568, end = 3062517760, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.833401997 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3062517760, end = 3062521856, flags = 1048691, pgoff = 3062517760, inode = 0 }
+vm_state.vm_map: 13589.833404293 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3062521856, end = 3062620160, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.833406233 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3062620160, end = 3062624256, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.833408652 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3062624256, end = 3062648832, flags = 134217845, pgoff = 0, inode = 22612 }
+vm_state.vm_map: 13589.833410628 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3062648832, end = 3062652928, flags = 135266419, pgoff = 20480, inode = 22612 }
+vm_state.vm_map: 13589.833413090 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3062652928, end = 3062665216, flags = 134217845, pgoff = 0, inode = 21323 }
+vm_state.vm_map: 13589.833415054 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3062665216, end = 3062669312, flags = 135266419, pgoff = 8192, inode = 21323 }
+vm_state.vm_map: 13589.833417357 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3062669312, end = 3062812672, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 13589.833419340 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3062812672, end = 3062816768, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 13589.833421636 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3062816768, end = 3062894592, flags = 134217845, pgoff = 0, inode = 24576 }
+vm_state.vm_map: 13589.833423587 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3062894592, end = 3062898688, flags = 135266419, pgoff = 77824, inode = 24576 }
+vm_state.vm_map: 13589.833425792 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3062898688, end = 3062902784, flags = 1048691, pgoff = 3062898688, inode = 0 }
+vm_state.vm_map: 13589.833428236 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3062902784, end = 3062935552, flags = 134217845, pgoff = 0, inode = 24194 }
+vm_state.vm_map: 13589.833430403 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3062935552, end = 3062939648, flags = 135266419, pgoff = 28672, inode = 24194 }
+vm_state.vm_map: 13589.833432594 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3062939648, end = 3063406592, flags = 134217845, pgoff = 0, inode = 23967 }
+vm_state.vm_map: 13589.833434768 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3063406592, end = 3063414784, flags = 135266419, pgoff = 462848, inode = 23967 }
+vm_state.vm_map: 13589.833436916 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3063414784, end = 3063418880, flags = 1048691, pgoff = 3063414784, inode = 0 }
+vm_state.vm_map: 13589.833439206 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3063418880, end = 3063795712, flags = 134217845, pgoff = 0, inode = 21319 }
+vm_state.vm_map: 13589.833441145 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3063795712, end = 3063803904, flags = 135266419, pgoff = 376832, inode = 21319 }
+vm_state.vm_map: 13589.833443479 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3063803904, end = 3063902208, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 13589.833445419 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3063902208, end = 3063906304, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 13589.833447702 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3063906304, end = 3063910400, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 13589.833449980 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3063910400, end = 3063980032, flags = 134217845, pgoff = 0, inode = 508763 }
+vm_state.vm_map: 13589.833452018 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3063980032, end = 3063984128, flags = 135266417, pgoff = 65536, inode = 508763 }
+vm_state.vm_map: 13589.833453988 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3063984128, end = 3063988224, flags = 135266419, pgoff = 69632, inode = 508763 }
+vm_state.vm_map: 13589.833456154 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3063988224, end = 3064000512, flags = 1048691, pgoff = 3063988224, inode = 0 }
+vm_state.vm_map: 13589.833458365 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3064000512, end = 3064193024, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.833460551 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3064193024, end = 3064197120, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.833463124 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3064197120, end = 3064279040, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.833465149 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3064279040, end = 3064283136, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.833537690 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3064283136, end = 3064315904, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 13589.833540326 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3064315904, end = 3064320000, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 13589.833542579 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3064320000, end = 3064344576, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 13589.833544555 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3064344576, end = 3064348672, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 13589.833547196 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3064348672, end = 3064381440, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 13589.833549265 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3064381440, end = 3064385536, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 13589.833551512 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3064385536, end = 3064389632, flags = 1048691, pgoff = 3064385536, inode = 0 }
+vm_state.vm_map: 13589.833553895 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3064389632, end = 3064397824, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 13589.833555921 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3064397824, end = 3064401920, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 13589.833558112 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3064401920, end = 3064434688, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 13589.833560113 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3064434688, end = 3064438784, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 13589.833562428 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3064438784, end = 3064492032, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 13589.833564453 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3064492032, end = 3064496128, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 13589.833566750 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3064496128, end = 3064512512, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 13589.833569101 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3064512512, end = 3064516608, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 13589.833571410 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3064516608, end = 3064524800, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 13589.833573454 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3064524800, end = 3064528896, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 13589.833575491 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3064528896, end = 3064532992, flags = 1048691, pgoff = 3064528896, inode = 0 }
+vm_state.vm_map: 13589.833577782 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3064532992, end = 3064541184, flags = 134217845, pgoff = 0, inode = 17721 }
+vm_state.vm_map: 13589.833579949 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3064541184, end = 3064545280, flags = 135266419, pgoff = 4096, inode = 17721 }
+vm_state.vm_map: 13589.833582264 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3064545280, end = 3065860096, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.833584295 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3065860096, end = 3065868288, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.833586346 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3065868288, end = 3065872384, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.833588390 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3065872384, end = 3065884672, flags = 1048691, pgoff = 3065872384, inode = 0 }
+vm_state.vm_map: 13589.833590667 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3065884672, end = 3065999360, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.833592693 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3065999360, end = 3066003456, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.833595013 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3066003456, end = 3066941440, flags = 134217845, pgoff = 0, inode = 16850 }
+vm_state.vm_map: 13589.833597095 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3066941440, end = 3066957824, flags = 135266417, pgoff = 937984, inode = 16850 }
+vm_state.vm_map: 13589.833599053 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3066957824, end = 3066961920, flags = 135266419, pgoff = 954368, inode = 16850 }
+vm_state.vm_map: 13589.833601244 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3066961920, end = 3066990592, flags = 1048691, pgoff = 3066961920, inode = 0 }
+vm_state.vm_map: 13589.833603836 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3066990592, end = 3067138048, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.833605874 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3067138048, end = 3067142144, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.833607844 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3067142144, end = 3067146240, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.833610171 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3067146240, end = 3067162624, flags = 134217845, pgoff = 0, inode = 20149 }
+vm_state.vm_map: 13589.833612196 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3067162624, end = 3067166720, flags = 135266419, pgoff = 12288, inode = 20149 }
+vm_state.vm_map: 13589.833614234 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3067166720, end = 3067170816, flags = 1048691, pgoff = 3067166720, inode = 0 }
+vm_state.vm_map: 13589.833616487 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3067170816, end = 3068321792, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.833618698 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3068321792, end = 3068338176, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.833620877 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3068338176, end = 3069083648, flags = 134217845, pgoff = 0, inode = 499794 }
+vm_state.vm_map: 13589.833622915 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3069083648, end = 3069087744, flags = 135266419, pgoff = 745472, inode = 499794 }
+vm_state.vm_map: 13589.833625138 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3069087744, end = 3069100032, flags = 134217845, pgoff = 0, inode = 19646 }
+vm_state.vm_map: 13589.833627280 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3069100032, end = 3069104128, flags = 135266419, pgoff = 8192, inode = 19646 }
+vm_state.vm_map: 13589.833629595 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3069104128, end = 3069349888, flags = 134217845, pgoff = 0, inode = 20603 }
+vm_state.vm_map: 13589.833631749 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3069349888, end = 3069353984, flags = 135266419, pgoff = 245760, inode = 20603 }
+vm_state.vm_map: 13589.833634162 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3069353984, end = 3069526016, flags = 134217845, pgoff = 0, inode = 1065255 }
+vm_state.vm_map: 13589.833636133 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3069526016, end = 3069530112, flags = 135266419, pgoff = 172032, inode = 1065255 }
+vm_state.vm_map: 13589.833638656 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3069530112, end = 3069534208, flags = 1048691, pgoff = 3069530112, inode = 0 }
+vm_state.vm_map: 13589.833640990 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3069534208, end = 3070005248, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 13589.833643157 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3070005248, end = 3070021632, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 13589.833645281 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3070021632, end = 3070291968, flags = 134217845, pgoff = 0, inode = 22793 }
+vm_state.vm_map: 13589.833647583 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3070291968, end = 3070300160, flags = 135266419, pgoff = 266240, inode = 22793 }
+vm_state.vm_map: 13589.833649714 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3070300160, end = 3070779392, flags = 134217845, pgoff = 0, inode = 21325 }
+vm_state.vm_map: 13589.833651887 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3070779392, end = 3070787584, flags = 135266419, pgoff = 479232, inode = 21325 }
+vm_state.vm_map: 13589.833654011 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3070787584, end = 3071389696, flags = 134217845, pgoff = 0, inode = 19648 }
+vm_state.vm_map: 13589.833656171 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3071389696, end = 3071397888, flags = 135266419, pgoff = 602112, inode = 19648 }
+vm_state.vm_map: 13589.833658315 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3071397888, end = 3071438848, flags = 134217845, pgoff = 0, inode = 22795 }
+vm_state.vm_map: 13589.833660482 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3071438848, end = 3071442944, flags = 135266419, pgoff = 36864, inode = 22795 }
+vm_state.vm_map: 13589.833662636 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3071442944, end = 3071447040, flags = 1048691, pgoff = 3071442944, inode = 0 }
+vm_state.vm_map: 13589.833665043 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3071447040, end = 3071545344, flags = 134217845, pgoff = 0, inode = 22669 }
+vm_state.vm_map: 13589.833667191 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3071545344, end = 3071549440, flags = 135266419, pgoff = 94208, inode = 22669 }
+vm_state.vm_map: 13589.833669372 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3071549440, end = 3071696896, flags = 134217845, pgoff = 0, inode = 22796 }
+vm_state.vm_map: 13589.833671545 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3071696896, end = 3071700992, flags = 135266419, pgoff = 147456, inode = 22796 }
+vm_state.vm_map: 13589.833674155 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3071700992, end = 3071803392, flags = 134217845, pgoff = 0, inode = 21552 }
+vm_state.vm_map: 13589.833676192 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3071803392, end = 3071811584, flags = 135266419, pgoff = 98304, inode = 21552 }
+vm_state.vm_map: 13589.833678365 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3071811584, end = 3072409600, flags = 134217845, pgoff = 0, inode = 22668 }
+vm_state.vm_map: 13589.833680410 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3072409600, end = 3072421888, flags = 135266419, pgoff = 593920, inode = 22668 }
+vm_state.vm_map: 13589.833682565 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3072421888, end = 3076321280, flags = 134217845, pgoff = 0, inode = 21427 }
+vm_state.vm_map: 13589.833684534 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3076321280, end = 3076345856, flags = 135266419, pgoff = 3895296, inode = 21427 }
+vm_state.vm_map: 13589.833686701 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3076345856, end = 3076354048, flags = 1048691, pgoff = 3076345856, inode = 0 }
+vm_state.vm_map: 13589.833689035 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3076354048, end = 3076362240, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.833691184 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3076362240, end = 3076366336, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.833693147 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3076366336, end = 3076370432, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.833695480 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3076370432, end = 3076456448, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.833697513 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3076456448, end = 3076460544, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.833699563 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3076460544, end = 3076464640, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.833701533 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3076464640, end = 3076472832, flags = 1048691, pgoff = 3076464640, inode = 0 }
+vm_state.vm_map: 13589.833709850 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3076472832, end = 3076673536, flags = 134217845, pgoff = 0, inode = 21333 }
+vm_state.vm_map: 13589.833711912 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3076673536, end = 3076677632, flags = 135266419, pgoff = 200704, inode = 21333 }
+vm_state.vm_map: 13589.833713901 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3076677632, end = 3076685824, flags = 1048691, pgoff = 3076677632, inode = 0 }
+vm_state.vm_map: 13589.833718974 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3076685824, end = 3076698112, flags = 134217845, pgoff = 0, inode = 21332 }
+vm_state.vm_map: 13589.833721024 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3076698112, end = 3076702208, flags = 135266419, pgoff = 8192, inode = 21332 }
+vm_state.vm_map: 13589.833725838 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3076702208, end = 3076710400, flags = 134217845, pgoff = 0, inode = 21334 }
+vm_state.vm_map: 13589.833727875 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3076710400, end = 3076714496, flags = 135266419, pgoff = 4096, inode = 21334 }
+vm_state.vm_map: 13589.833730228 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3076714496, end = 3076722688, flags = 134217845, pgoff = 0, inode = 1450546 }
+vm_state.vm_map: 13589.833732284 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3076722688, end = 3076726784, flags = 135266417, pgoff = 4096, inode = 1450546 }
+vm_state.vm_map: 13589.833734266 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3076726784, end = 3076730880, flags = 135266419, pgoff = 8192, inode = 1450546 }
+vm_state.vm_map: 13589.833736556 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3076730880, end = 3076759552, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.833738841 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3076759552, end = 3076808704, flags = 134217841, pgoff = 0, inode = 74519 }
+vm_state.vm_map: 13589.833741143 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3076808704, end = 3077451776, flags = 134217845, pgoff = 0, inode = 231127 }
+vm_state.vm_map: 13589.833743310 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3077451776, end = 3077484544, flags = 135266419, pgoff = 638976, inode = 231127 }
+vm_state.vm_map: 13589.833745705 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3077484544, end = 3077488640, flags = 1048691, pgoff = 3077484544, inode = 0 }
+vm_state.vm_map: 13589.833748062 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3077488640, end = 3077500928, flags = 134217845, pgoff = 0, inode = 229423 }
+vm_state.vm_map: 13589.833750217 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3077500928, end = 3077505024, flags = 135266419, pgoff = 8192, inode = 229423 }
+vm_state.vm_map: 13589.833752625 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3077505024, end = 3078213632, flags = 134217845, pgoff = 0, inode = 231131 }
+vm_state.vm_map: 13589.833754656 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3078213632, end = 3078234112, flags = 135266419, pgoff = 704512, inode = 231131 }
+vm_state.vm_map: 13589.833756694 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3078234112, end = 3078242304, flags = 1048691, pgoff = 3078234112, inode = 0 }
+vm_state.vm_map: 13589.833758652 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3078242304, end = 3078246400, flags = 67371125, pgoff = 3078242304, inode = 0 }
+vm_state.vm_map: 13589.833761170 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3078246400, end = 3078361088, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.833763226 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3078361088, end = 3078365184, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.833765252 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3078365184, end = 3078369280, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.833767290 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2332, start = 3212992512, end = 3213078528, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.833770620 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 134512640, end = 134565888, flags = 134223989, pgoff = 0, inode = 239235 }
+vm_state.vm_map: 13589.833772800 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 134565888, end = 134569984, flags = 135272563, pgoff = 49152, inode = 239235 }
+vm_state.vm_map: 13589.833774843 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 152702976, end = 154198016, flags = 1048691, pgoff = 152702976, inode = 0 }
+vm_state.vm_map: 13589.833777152 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3072942080, end = 3072974848, flags = 134217841, pgoff = 0, inode = 73897 }
+vm_state.vm_map: 13589.833782318 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3072978944, end = 3073028096, flags = 134217845, pgoff = 0, inode = 418337 }
+vm_state.vm_map: 13589.833784484 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3073028096, end = 3073032192, flags = 135266419, pgoff = 49152, inode = 418337 }
+vm_state.vm_map: 13589.833786707 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3073032192, end = 3073073152, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.833788862 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3073073152, end = 3073077248, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.833790838 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3073077248, end = 3073081344, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.833793184 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3073081344, end = 3073118208, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.833795209 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3073118208, end = 3073122304, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.833797246 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3073122304, end = 3073126400, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.833799512 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3073126400, end = 3073204224, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.833801680 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3073204224, end = 3073208320, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.833803705 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3073208320, end = 3073212416, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.833805743 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3073212416, end = 3073220608, flags = 1048691, pgoff = 3073212416, inode = 0 }
+vm_state.vm_map: 13589.833807904 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3073220608, end = 3073245184, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.833809874 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3073245184, end = 3073249280, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.833811856 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3073249280, end = 3073253376, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.833814152 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3073253376, end = 3074584576, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.833816658 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3074584576, end = 3074592768, flags = 1048691, pgoff = 3074584576, inode = 0 }
+vm_state.vm_map: 13589.833818862 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3074592768, end = 3074600960, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.833820956 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3074600960, end = 3074605056, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.833823221 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3074605056, end = 3074609152, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.833825406 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3074609152, end = 3074801664, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.833827395 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3074801664, end = 3074805760, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.833829697 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3074805760, end = 3074834432, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.833831649 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3074834432, end = 3074838528, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.833833601 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3074838528, end = 3074842624, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.833835897 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3074842624, end = 3074859008, flags = 134217845, pgoff = 0, inode = 20149 }
+vm_state.vm_map: 13589.833837879 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3074859008, end = 3074863104, flags = 135266419, pgoff = 12288, inode = 20149 }
+vm_state.vm_map: 13589.833839985 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3074863104, end = 3075108864, flags = 134217845, pgoff = 0, inode = 20603 }
+vm_state.vm_map: 13589.833842152 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3075108864, end = 3075112960, flags = 135266419, pgoff = 245760, inode = 20603 }
+vm_state.vm_map: 13589.833844251 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3075112960, end = 3075125248, flags = 134217845, pgoff = 0, inode = 19646 }
+vm_state.vm_map: 13589.833846424 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3075125248, end = 3075129344, flags = 135266419, pgoff = 8192, inode = 19646 }
+vm_state.vm_map: 13589.833848462 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3075129344, end = 3075133440, flags = 1048691, pgoff = 3075129344, inode = 0 }
+vm_state.vm_map: 13589.833850907 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3075133440, end = 3076448256, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.833852883 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3076448256, end = 3076456448, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.833855050 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3076456448, end = 3076460544, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.833857136 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3076460544, end = 3076472832, flags = 1048691, pgoff = 3076460544, inode = 0 }
+vm_state.vm_map: 13589.833859266 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3076472832, end = 3076669440, flags = 134217845, pgoff = 0, inode = 1065401 }
+vm_state.vm_map: 13589.833861433 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3076669440, end = 3076681728, flags = 135266419, pgoff = 192512, inode = 1065401 }
+vm_state.vm_map: 13589.833863644 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3076681728, end = 3077427200, flags = 134217845, pgoff = 0, inode = 499794 }
+vm_state.vm_map: 13589.833865830 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3077427200, end = 3077431296, flags = 135266419, pgoff = 745472, inode = 499794 }
+vm_state.vm_map: 13589.833868070 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3077431296, end = 3077517312, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.833870097 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3077517312, end = 3077521408, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.833872054 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3077521408, end = 3077525504, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.833874332 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3077525504, end = 3077533696, flags = 1048691, pgoff = 3077525504, inode = 0 }
+vm_state.vm_map: 13589.833876505 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3077533696, end = 3077758976, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.833878536 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3077758976, end = 3077763072, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.833880561 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3077763072, end = 3077767168, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.833882600 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3077767168, end = 3077771264, flags = 1048691, pgoff = 3077767168, inode = 0 }
+vm_state.vm_map: 13589.833885025 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3077771264, end = 3077885952, flags = 134217845, pgoff = 0, inode = 17291 }
+vm_state.vm_map: 13589.833887303 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3077885952, end = 3077890048, flags = 135266419, pgoff = 114688, inode = 17291 }
+vm_state.vm_map: 13589.833889402 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3077890048, end = 3078197248, flags = 134217845, pgoff = 0, inode = 1065420 }
+vm_state.vm_map: 13589.833891348 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3078197248, end = 3078238208, flags = 135266419, pgoff = 303104, inode = 1065420 }
+vm_state.vm_map: 13589.833893663 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3078242304, end = 3078270976, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.833895818 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3078270976, end = 3078332416, flags = 134217841, pgoff = 0, inode = 76320 }
+vm_state.vm_map: 13589.833897781 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3078332416, end = 3078340608, flags = 1048691, pgoff = 3078332416, inode = 0 }
+vm_state.vm_map: 13589.833899960 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3078340608, end = 3078344704, flags = 67371125, pgoff = 3078340608, inode = 0 }
+vm_state.vm_map: 13589.833902053 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3078344704, end = 3078459392, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.833904012 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3078459392, end = 3078463488, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.833906179 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3078463488, end = 3078467584, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.833908173 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2335, start = 3217747968, end = 3217833984, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.833910808 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 134512640, end = 135290880, flags = 134223989, pgoff = 0, inode = 1048644 }
+vm_state.vm_map: 13589.833913198 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 135290880, end = 135311360, flags = 135272563, pgoff = 778240, inode = 1048644 }
+vm_state.vm_map: 13589.833915241 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 135311360, end = 135331840, flags = 1048691, pgoff = 135311360, inode = 0 }
+vm_state.vm_map: 13589.833920456 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 143818752, end = 144691200, flags = 1048691, pgoff = 143818752, inode = 0 }
+vm_state.vm_map: 13589.833922746 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3075284992, end = 3075325952, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.833924790 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3075325952, end = 3075330048, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.833926828 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3075330048, end = 3075334144, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.833929025 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3075334144, end = 3075371008, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.833931069 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3075371008, end = 3075375104, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.833933051 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3075375104, end = 3075379200, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.833935268 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3075379200, end = 3075457024, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.833937349 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3075457024, end = 3075461120, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.833939301 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3075461120, end = 3075465216, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.833941246 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3075465216, end = 3075473408, flags = 1048691, pgoff = 3075465216, inode = 0 }
+vm_state.vm_map: 13589.833943327 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3075473408, end = 3075497984, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.833945279 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3075497984, end = 3075502080, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.833947224 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3075502080, end = 3075506176, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.833949415 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3075506176, end = 3076837376, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.833951484 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3076837376, end = 3076841472, flags = 1048691, pgoff = 3076837376, inode = 0 }
+vm_state.vm_map: 13589.833953897 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3076841472, end = 3078156288, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.833955960 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3078156288, end = 3078164480, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.833957924 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3078164480, end = 3078168576, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.833959967 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3078168576, end = 3078184960, flags = 1048691, pgoff = 3078168576, inode = 0 }
+vm_state.vm_map: 13589.833962061 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3078184960, end = 3078193152, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.833964105 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3078193152, end = 3078197248, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.833966069 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3078197248, end = 3078201344, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.833968248 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3078201344, end = 3078418432, flags = 134217845, pgoff = 0, inode = 499784 }
+vm_state.vm_map: 13589.833970323 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3078418432, end = 3078430720, flags = 135266419, pgoff = 217088, inode = 499784 }
+vm_state.vm_map: 13589.833972434 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3078496256, end = 3078524928, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.833974571 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3078524928, end = 3078533120, flags = 1048691, pgoff = 3078524928, inode = 0 }
+vm_state.vm_map: 13589.833976541 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3078533120, end = 3078537216, flags = 67371125, pgoff = 3078533120, inode = 0 }
+vm_state.vm_map: 13589.833978720 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3078537216, end = 3078651904, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.833980678 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3078651904, end = 3078656000, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.833982636 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3078656000, end = 3078660096, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.833987616 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2684, start = 3219845120, end = 3219931136, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.833990240 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2805, start = 134512640, end = 135290880, flags = 134223989, pgoff = 0, inode = 1048644 }
+vm_state.vm_map: 13589.833992369 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2805, start = 135290880, end = 135311360, flags = 135272563, pgoff = 778240, inode = 1048644 }
+vm_state.vm_map: 13589.833994512 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2805, start = 135311360, end = 135331840, flags = 1048691, pgoff = 135311360, inode = 0 }
+vm_state.vm_map: 13589.833996611 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2805, start = 142045184, end = 142086144, flags = 1048691, pgoff = 142045184, inode = 0 }
+vm_state.vm_map: 13589.833998839 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2805, start = 3074658304, end = 3075989504, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.834000989 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2805, start = 3075989504, end = 3075993600, flags = 1048691, pgoff = 3075989504, inode = 0 }
+vm_state.vm_map: 13589.834003291 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2805, start = 3075993600, end = 3077308416, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.834005347 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2805, start = 3077308416, end = 3077316608, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.834007379 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2805, start = 3077316608, end = 3077320704, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.834009428 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2805, start = 3077320704, end = 3077337088, flags = 1048691, pgoff = 3077320704, inode = 0 }
+vm_state.vm_map: 13589.834011614 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2805, start = 3077337088, end = 3077345280, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.834013646 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2805, start = 3077345280, end = 3077349376, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.834015585 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2805, start = 3077349376, end = 3077353472, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.834017635 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2805, start = 3077353472, end = 3077570560, flags = 134217845, pgoff = 0, inode = 499784 }
+vm_state.vm_map: 13589.834019568 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2805, start = 3077570560, end = 3077582848, flags = 135266419, pgoff = 217088, inode = 499784 }
+vm_state.vm_map: 13589.834021957 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2805, start = 3077648384, end = 3077677056, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.834024014 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2805, start = 3077677056, end = 3077685248, flags = 1048691, pgoff = 3077677056, inode = 0 }
+vm_state.vm_map: 13589.834026057 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2805, start = 3077685248, end = 3077689344, flags = 67371125, pgoff = 3077685248, inode = 0 }
+vm_state.vm_map: 13589.834028237 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2805, start = 3077689344, end = 3077804032, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.834030176 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2805, start = 3077804032, end = 3077808128, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.834032102 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2805, start = 3077808128, end = 3077812224, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.834034067 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2805, start = 3216273408, end = 3216359424, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.834040044 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 134512640, end = 134529024, flags = 134223989, pgoff = 0, inode = 536165 }
+vm_state.vm_map: 13589.834042076 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 134529024, end = 134533120, flags = 135272563, pgoff = 12288, inode = 536165 }
+vm_state.vm_map: 13589.834044219 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 148402176, end = 169234432, flags = 1048691, pgoff = 148402176, inode = 0 }
+vm_state.vm_map: 13589.834046404 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 1802567680, end = 1808924672, flags = 1048695, pgoff = 1802567680, inode = 0 }
+vm_state.vm_map: 13589.834048584 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 1808924672, end = 1833500672, flags = 2097271, pgoff = 1808924672, inode = 0 }
+vm_state.vm_map: 13589.834050732 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 1833500672, end = 1909530624, flags = 1048695, pgoff = 1833500672, inode = 0 }
+vm_state.vm_map: 13589.834052880 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 1909530624, end = 2205220864, flags = 2097271, pgoff = 1909530624, inode = 0 }
+vm_state.vm_map: 13589.834055035 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2205220864, end = 2263154688, flags = 1048695, pgoff = 2205220864, inode = 0 }
+vm_state.vm_map: 13589.834057547 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2263154688, end = 2473656320, flags = 2097271, pgoff = 2263154688, inode = 0 }
+vm_state.vm_map: 13589.834063083 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2473656320, end = 2479927296, flags = 134217937, pgoff = 4096, inode = 207430 }
+vm_state.vm_map: 13589.834065385 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2479927296, end = 2482044928, flags = 2097271, pgoff = 2479927296, inode = 0 }
+vm_state.vm_map: 13589.834067441 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2482044928, end = 2489483264, flags = 135266419, pgoff = 6275072, inode = 207430 }
+vm_state.vm_map: 13589.834069485 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2489483264, end = 2494627840, flags = 2097271, pgoff = 2489483264, inode = 0 }
+vm_state.vm_map: 13589.834071529 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2494627840, end = 2495537152, flags = 135266419, pgoff = 13713408, inode = 207430 }
+vm_state.vm_map: 13589.834073622 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2495537152, end = 2498822144, flags = 2097271, pgoff = 2495537152, inode = 0 }
+vm_state.vm_map: 13589.834075574 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2498822144, end = 2498854912, flags = 134217941, pgoff = 14622720, inode = 207430 }
+vm_state.vm_map: 13589.834077661 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2498854912, end = 2503016448, flags = 2097271, pgoff = 2498854912, inode = 0 }
+vm_state.vm_map: 13589.834079630 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2888826880, end = 2889699328, flags = 2097267, pgoff = 2888826880, inode = 0 }
+vm_state.vm_map: 13589.834081717 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2889699328, end = 2889875456, flags = 2097264, pgoff = 2889699328, inode = 0 }
+vm_state.vm_map: 13589.834083810 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2890141696, end = 2890153984, flags = 2097271, pgoff = 2890141696, inode = 0 }
+vm_state.vm_map: 13589.834086034 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2890153984, end = 2890473472, flags = 1048695, pgoff = 2890153984, inode = 0 }
+vm_state.vm_map: 13589.834088127 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2890473472, end = 2890485760, flags = 2097271, pgoff = 2890473472, inode = 0 }
+vm_state.vm_map: 13589.834090084 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2890485760, end = 2890805248, flags = 1048695, pgoff = 2890485760, inode = 0 }
+vm_state.vm_map: 13589.834095539 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2890805248, end = 2890817536, flags = 2097271, pgoff = 2890805248, inode = 0 }
+vm_state.vm_map: 13589.834097626 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2890817536, end = 2891137024, flags = 1048695, pgoff = 2890817536, inode = 0 }
+vm_state.vm_map: 13589.834099694 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2891137024, end = 2891149312, flags = 1048688, pgoff = 2891137024, inode = 0 }
+vm_state.vm_map: 13589.834101763 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2891149312, end = 2891468800, flags = 1048695, pgoff = 2891149312, inode = 0 }
+vm_state.vm_map: 13589.834103831 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2891468800, end = 2891481088, flags = 2097271, pgoff = 2891468800, inode = 0 }
+vm_state.vm_map: 13589.834105907 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2891481088, end = 2891800576, flags = 1048695, pgoff = 2891481088, inode = 0 }
+vm_state.vm_map: 13589.834107975 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2891800576, end = 2891812864, flags = 2097271, pgoff = 2891800576, inode = 0 }
+vm_state.vm_map: 13589.834109976 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2891812864, end = 2892132352, flags = 1048695, pgoff = 2891812864, inode = 0 }
+vm_state.vm_map: 13589.834112062 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2892132352, end = 2892144640, flags = 2097271, pgoff = 2892132352, inode = 0 }
+vm_state.vm_map: 13589.834114138 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2892144640, end = 2892464128, flags = 1048695, pgoff = 2892144640, inode = 0 }
+vm_state.vm_map: 13589.834116206 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2892464128, end = 2892476416, flags = 2097271, pgoff = 2892464128, inode = 0 }
+vm_state.vm_map: 13589.834118275 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2892476416, end = 2892795904, flags = 1048695, pgoff = 2892476416, inode = 0 }
+vm_state.vm_map: 13589.834120361 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2892795904, end = 2892808192, flags = 2097271, pgoff = 2892795904, inode = 0 }
+vm_state.vm_map: 13589.834122430 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2892808192, end = 2893127680, flags = 1048695, pgoff = 2892808192, inode = 0 }
+vm_state.vm_map: 13589.834124462 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2893127680, end = 2893139968, flags = 2097271, pgoff = 2893127680, inode = 0 }
+vm_state.vm_map: 13589.834126758 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2893139968, end = 2893459456, flags = 1048695, pgoff = 2893139968, inode = 0 }
+vm_state.vm_map: 13589.834128821 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2893459456, end = 2893471744, flags = 2097271, pgoff = 2893459456, inode = 0 }
+vm_state.vm_map: 13589.834130889 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2893471744, end = 2893791232, flags = 1048695, pgoff = 2893471744, inode = 0 }
+vm_state.vm_map: 13589.834132951 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2893791232, end = 2893803520, flags = 2097271, pgoff = 2893791232, inode = 0 }
+vm_state.vm_map: 13589.834135027 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2893803520, end = 2894123008, flags = 1048695, pgoff = 2893803520, inode = 0 }
+vm_state.vm_map: 13589.834136960 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2894123008, end = 2894135296, flags = 2097271, pgoff = 2894123008, inode = 0 }
+vm_state.vm_map: 13589.834139034 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2894135296, end = 2894454784, flags = 1048695, pgoff = 2894135296, inode = 0 }
+vm_state.vm_map: 13589.834141146 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2894454784, end = 2894467072, flags = 2097271, pgoff = 2894454784, inode = 0 }
+vm_state.vm_map: 13589.834143208 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2894467072, end = 2894786560, flags = 1048695, pgoff = 2894467072, inode = 0 }
+vm_state.vm_map: 13589.834145450 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2894786560, end = 2894798848, flags = 2097271, pgoff = 2894786560, inode = 0 }
+vm_state.vm_map: 13589.834147518 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2894798848, end = 2895118336, flags = 1048695, pgoff = 2894798848, inode = 0 }
+vm_state.vm_map: 13589.834149722 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2895118336, end = 2896138240, flags = 2097267, pgoff = 2895118336, inode = 0 }
+vm_state.vm_map: 13589.834151809 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2896138240, end = 2896166912, flags = 2097264, pgoff = 2896138240, inode = 0 }
+vm_state.vm_map: 13589.834153797 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2896166912, end = 2897215488, flags = 2097267, pgoff = 2896166912, inode = 0 }
+vm_state.vm_map: 13589.834155834 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2897215488, end = 2898239488, flags = 2097267, pgoff = 2897215488, inode = 0 }
+vm_state.vm_map: 13589.834157898 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2898239488, end = 2898264064, flags = 2097264, pgoff = 2898239488, inode = 0 }
+vm_state.vm_map: 13589.834160188 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2898264064, end = 2898276352, flags = 2097271, pgoff = 2898264064, inode = 0 }
+vm_state.vm_map: 13589.834162139 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2898276352, end = 2898595840, flags = 1048695, pgoff = 2898276352, inode = 0 }
+vm_state.vm_map: 13589.834169761 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2898595840, end = 2898636800, flags = 134217937, pgoff = 647168, inode = 535784 }
+vm_state.vm_map: 13589.834171829 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2898636800, end = 2898649088, flags = 2097271, pgoff = 2898636800, inode = 0 }
+vm_state.vm_map: 13589.834173947 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2898649088, end = 2898968576, flags = 1048695, pgoff = 2898649088, inode = 0 }
+vm_state.vm_map: 13589.834175955 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2898968576, end = 2898980864, flags = 1048688, pgoff = 2898968576, inode = 0 }
+vm_state.vm_map: 13589.834177912 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2898980864, end = 2899300352, flags = 1048695, pgoff = 2898980864, inode = 0 }
+vm_state.vm_map: 13589.834179858 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2899300352, end = 2899312640, flags = 2097271, pgoff = 2899300352, inode = 0 }
+vm_state.vm_map: 13589.834181803 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2899312640, end = 2899632128, flags = 1048695, pgoff = 2899312640, inode = 0 }
+vm_state.vm_map: 13589.834183890 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2899632128, end = 2899644416, flags = 2097271, pgoff = 2899632128, inode = 0 }
+vm_state.vm_map: 13589.834185946 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2899644416, end = 2899963904, flags = 1048695, pgoff = 2899644416, inode = 0 }
+vm_state.vm_map: 13589.834187892 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2899963904, end = 2899976192, flags = 1048688, pgoff = 2899963904, inode = 0 }
+vm_state.vm_map: 13589.834189837 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2899976192, end = 2900295680, flags = 1048695, pgoff = 2899976192, inode = 0 }
+vm_state.vm_map: 13589.834194824 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2900295680, end = 2900414464, flags = 134217937, pgoff = 1544192, inode = 535672 }
+vm_state.vm_map: 13589.834196781 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2900414464, end = 2900418560, flags = 1048688, pgoff = 2900414464, inode = 0 }
+vm_state.vm_map: 13589.834198838 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2900418560, end = 2908807168, flags = 1048695, pgoff = 2900418560, inode = 0 }
+vm_state.vm_map: 13589.834200925 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2908807168, end = 2908811264, flags = 1048688, pgoff = 2908807168, inode = 0 }
+vm_state.vm_map: 13589.834202876 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2908811264, end = 2917199872, flags = 1048695, pgoff = 2908811264, inode = 0 }
+vm_state.vm_map: 13589.834205203 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2917199872, end = 2917314560, flags = 134217845, pgoff = 0, inode = 17291 }
+vm_state.vm_map: 13589.834207180 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2917314560, end = 2917318656, flags = 135266419, pgoff = 114688, inode = 17291 }
+vm_state.vm_map: 13589.834209587 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2917318656, end = 2917625856, flags = 134217845, pgoff = 0, inode = 1065420 }
+vm_state.vm_map: 13589.834211729 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2917625856, end = 2917666816, flags = 135266419, pgoff = 303104, inode = 1065420 }
+vm_state.vm_map: 13589.834213982 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2917666816, end = 2917863424, flags = 134217845, pgoff = 0, inode = 1065401 }
+vm_state.vm_map: 13589.834216051 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2917863424, end = 2917875712, flags = 135266419, pgoff = 192512, inode = 1065401 }
+vm_state.vm_map: 13589.834222694 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2917933056, end = 2917953536, flags = 134217937, pgoff = 389120, inode = 535921 }
+vm_state.vm_map: 13589.834227552 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2917953536, end = 2917969920, flags = 134217937, pgoff = 110592, inode = 535137 }
+vm_state.vm_map: 13589.834229491 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2917969920, end = 2917974016, flags = 1048688, pgoff = 2917969920, inode = 0 }
+vm_state.vm_map: 13589.834231775 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2917974016, end = 2926362624, flags = 1048695, pgoff = 2917974016, inode = 0 }
+vm_state.vm_map: 13589.834233702 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2926362624, end = 2926366720, flags = 1048688, pgoff = 2926362624, inode = 0 }
+vm_state.vm_map: 13589.834235759 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2926366720, end = 2934755328, flags = 1048695, pgoff = 2926366720, inode = 0 }
+vm_state.vm_map: 13589.834243250 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2934755328, end = 2934837248, flags = 134217845, pgoff = 0, inode = 870320 }
+vm_state.vm_map: 13589.834245220 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2934837248, end = 2934845440, flags = 135266419, pgoff = 81920, inode = 870320 }
+vm_state.vm_map: 13589.834247425 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2934845440, end = 2934857728, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 13589.834249604 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2934857728, end = 2934861824, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 13589.834251820 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2934861824, end = 2934947840, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 13589.834253870 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2934947840, end = 2934951936, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 13589.834256093 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2934951936, end = 2934960128, flags = 1048691, pgoff = 2934951936, inode = 0 }
+vm_state.vm_map: 13589.834258382 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2934960128, end = 2934988800, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 13589.834260544 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2934988800, end = 2934992896, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 13589.834262797 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2934992896, end = 2935312384, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 13589.834265081 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2935312384, end = 2935328768, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 13589.834267766 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2935328768, end = 2935554048, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.834269803 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2935554048, end = 2935558144, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.834271982 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2935558144, end = 2935562240, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.834274260 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2935562240, end = 2935762944, flags = 134217845, pgoff = 0, inode = 21333 }
+vm_state.vm_map: 13589.834276385 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2935762944, end = 2935767040, flags = 135266419, pgoff = 200704, inode = 21333 }
+vm_state.vm_map: 13589.834278619 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2935767040, end = 2935775232, flags = 1048691, pgoff = 2935767040, inode = 0 }
+vm_state.vm_map: 13589.834280799 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2935775232, end = 2936037376, flags = 134217845, pgoff = 0, inode = 17293 }
+vm_state.vm_map: 13589.834282849 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2936037376, end = 2936053760, flags = 135266419, pgoff = 262144, inode = 17293 }
+vm_state.vm_map: 13589.834285133 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2936053760, end = 2936123392, flags = 134217845, pgoff = 0, inode = 21618 }
+vm_state.vm_map: 13589.834287109 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2936123392, end = 2936135680, flags = 135266419, pgoff = 69632, inode = 21618 }
+vm_state.vm_map: 13589.834289282 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2936135680, end = 2936987648, flags = 134217845, pgoff = 0, inode = 21616 }
+vm_state.vm_map: 13589.834291221 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2936987648, end = 2937004032, flags = 135266419, pgoff = 851968, inode = 21616 }
+vm_state.vm_map: 13589.834293401 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2937004032, end = 2937118720, flags = 134217845, pgoff = 0, inode = 21619 }
+vm_state.vm_map: 13589.834295457 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2937118720, end = 2937126912, flags = 135266419, pgoff = 114688, inode = 21619 }
+vm_state.vm_map: 13589.834297827 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2937126912, end = 2937278464, flags = 134217845, pgoff = 0, inode = 21617 }
+vm_state.vm_map: 13589.834299816 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2937278464, end = 2937286656, flags = 135266419, pgoff = 151552, inode = 21617 }
+vm_state.vm_map: 13589.834307697 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2937286656, end = 2938093568, flags = 134217845, pgoff = 0, inode = 1065412 }
+vm_state.vm_map: 13589.834309839 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2938093568, end = 2938118144, flags = 135266419, pgoff = 802816, inode = 1065412 }
+vm_state.vm_map: 13589.834312430 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2938118144, end = 2938245120, flags = 134217845, pgoff = 0, inode = 18923 }
+vm_state.vm_map: 13589.834314406 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2938245120, end = 2938249216, flags = 135266419, pgoff = 122880, inode = 18923 }
+vm_state.vm_map: 13589.834316722 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2938249216, end = 2938769408, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 13589.834318889 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2938769408, end = 2938777600, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 13589.834325593 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2938777600, end = 2950725632, flags = 134217845, pgoff = 0, inode = 73924 }
+vm_state.vm_map: 13589.834327748 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2950725632, end = 2951692288, flags = 135266419, pgoff = 11943936, inode = 73924 }
+vm_state.vm_map: 13589.834329896 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2951692288, end = 2951757824, flags = 1048691, pgoff = 2951692288, inode = 0 }
+vm_state.vm_map: 13589.834332082 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2951757824, end = 2951872512, flags = 134217845, pgoff = 0, inode = 500249 }
+vm_state.vm_map: 13589.834334113 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2951872512, end = 2951876608, flags = 135266419, pgoff = 114688, inode = 500249 }
+vm_state.vm_map: 13589.834336292 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2951876608, end = 2952814592, flags = 134217845, pgoff = 0, inode = 16850 }
+vm_state.vm_map: 13589.834338687 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2952814592, end = 2952830976, flags = 135266417, pgoff = 937984, inode = 16850 }
+vm_state.vm_map: 13589.834340732 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2952830976, end = 2952835072, flags = 135266419, pgoff = 954368, inode = 16850 }
+vm_state.vm_map: 13589.834342763 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2952835072, end = 2952863744, flags = 1048691, pgoff = 2952835072, inode = 0 }
+vm_state.vm_map: 13589.834345065 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2952863744, end = 2952925184, flags = 134217841, pgoff = 0, inode = 649749 }
+vm_state.vm_map: 13589.834347275 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2952925184, end = 2952933376, flags = 134217845, pgoff = 0, inode = 1450546 }
+vm_state.vm_map: 13589.834349419 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2952933376, end = 2952937472, flags = 135266417, pgoff = 4096, inode = 1450546 }
+vm_state.vm_map: 13589.834351413 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2952937472, end = 2952941568, flags = 135266419, pgoff = 8192, inode = 1450546 }
+vm_state.vm_map: 13589.834356221 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2952941568, end = 2952953856, flags = 134217845, pgoff = 0, inode = 73923 }
+vm_state.vm_map: 13589.834358383 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2952953856, end = 2952957952, flags = 135266419, pgoff = 8192, inode = 73923 }
+vm_state.vm_map: 13589.834360703 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2952957952, end = 2959527936, flags = 134217841, pgoff = 0, inode = 545462 }
+vm_state.vm_map: 13589.834362852 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2959527936, end = 2966097920, flags = 134217841, pgoff = 0, inode = 545462 }
+vm_state.vm_map: 13589.834365308 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2966097920, end = 2979434496, flags = 134217841, pgoff = 0, inode = 50045 }
+vm_state.vm_map: 13589.834367513 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2979434496, end = 2992771072, flags = 134217841, pgoff = 0, inode = 50045 }
+vm_state.vm_map: 13589.834372271 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2992771072, end = 2992836608, flags = 134217937, pgoff = 888832, inode = 536064 }
+vm_state.vm_map: 13589.834374770 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2992836608, end = 2992848896, flags = 2097271, pgoff = 2992836608, inode = 0 }
+vm_state.vm_map: 13589.834376943 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2992848896, end = 2993168384, flags = 1048695, pgoff = 2992848896, inode = 0 }
+vm_state.vm_map: 13589.834378908 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2993168384, end = 2993180672, flags = 1048688, pgoff = 2993168384, inode = 0 }
+vm_state.vm_map: 13589.834381192 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2993180672, end = 2993500160, flags = 1048695, pgoff = 2993180672, inode = 0 }
+vm_state.vm_map: 13589.834386061 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2993500160, end = 2994814976, flags = 134217845, pgoff = 0, inode = 499948 }
+vm_state.vm_map: 13589.834388222 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2994814976, end = 2994823168, flags = 135266417, pgoff = 1314816, inode = 499948 }
+vm_state.vm_map: 13589.834390519 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2994823168, end = 2994827264, flags = 135266419, pgoff = 1323008, inode = 499948 }
+vm_state.vm_map: 13589.834392563 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2994827264, end = 2994839552, flags = 1048691, pgoff = 2994827264, inode = 0 }
+vm_state.vm_map: 13589.834395050 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2994839552, end = 2994921472, flags = 134217845, pgoff = 0, inode = 1196082 }
+vm_state.vm_map: 13589.834397021 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2994921472, end = 2994925568, flags = 135266419, pgoff = 81920, inode = 1196082 }
+vm_state.vm_map: 13589.834399070 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2994925568, end = 2994937856, flags = 1048688, pgoff = 2994925568, inode = 0 }
+vm_state.vm_map: 13589.834401016 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2994937856, end = 2995257344, flags = 1048695, pgoff = 2994937856, inode = 0 }
+vm_state.vm_map: 13589.834406408 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2995257344, end = 2995347456, flags = 134217937, pgoff = 1781760, inode = 737886 }
+vm_state.vm_map: 13589.834408447 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2995347456, end = 2995359744, flags = 1048688, pgoff = 2995347456, inode = 0 }
+vm_state.vm_map: 13589.834410971 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2995359744, end = 2995679232, flags = 1048695, pgoff = 2995359744, inode = 0 }
+vm_state.vm_map: 13589.834412904 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2995679232, end = 2995691520, flags = 1048688, pgoff = 2995679232, inode = 0 }
+vm_state.vm_map: 13589.834414849 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2995691520, end = 2996011008, flags = 1048695, pgoff = 2995691520, inode = 0 }
+vm_state.vm_map: 13589.834416783 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2996011008, end = 2996023296, flags = 2097271, pgoff = 2996011008, inode = 0 }
+vm_state.vm_map: 13589.834418727 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2996023296, end = 2996342784, flags = 1048695, pgoff = 2996023296, inode = 0 }
+vm_state.vm_map: 13589.834420796 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2996342784, end = 2996355072, flags = 1048688, pgoff = 2996342784, inode = 0 }
+vm_state.vm_map: 13589.834422735 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2996355072, end = 2996674560, flags = 1048695, pgoff = 2996355072, inode = 0 }
+vm_state.vm_map: 13589.834425167 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2996674560, end = 2996822016, flags = 134217937, pgoff = 1679360, inode = 535139 }
+vm_state.vm_map: 13589.834427126 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2996822016, end = 2996834304, flags = 1048688, pgoff = 2996822016, inode = 0 }
+vm_state.vm_map: 13589.834429176 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2996834304, end = 2997153792, flags = 1048695, pgoff = 2996834304, inode = 0 }
+vm_state.vm_map: 13589.834431219 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2997153792, end = 2997166080, flags = 1048688, pgoff = 2997153792, inode = 0 }
+vm_state.vm_map: 13589.834433158 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2997166080, end = 2997485568, flags = 1048695, pgoff = 2997166080, inode = 0 }
+vm_state.vm_map: 13589.834435344 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2997485568, end = 2997497856, flags = 1048688, pgoff = 2997485568, inode = 0 }
+vm_state.vm_map: 13589.834437283 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2997497856, end = 2997817344, flags = 1048695, pgoff = 2997497856, inode = 0 }
+vm_state.vm_map: 13589.834439223 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2997817344, end = 2997829632, flags = 2097271, pgoff = 2997817344, inode = 0 }
+vm_state.vm_map: 13589.834441156 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2997829632, end = 2998149120, flags = 1048695, pgoff = 2997829632, inode = 0 }
+vm_state.vm_map: 13589.834443569 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2998149120, end = 2998161408, flags = 1048688, pgoff = 2998149120, inode = 0 }
+vm_state.vm_map: 13589.834445637 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2998161408, end = 2998480896, flags = 1048695, pgoff = 2998161408, inode = 0 }
+vm_state.vm_map: 13589.834447835 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2998480896, end = 2999283712, flags = 134217845, pgoff = 0, inode = 21274 }
+vm_state.vm_map: 13589.834449787 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2999283712, end = 2999300096, flags = 135266419, pgoff = 802816, inode = 21274 }
+vm_state.vm_map: 13589.834454435 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2999312384, end = 2999341056, flags = 134217937, pgoff = 307200, inode = 535127 }
+vm_state.vm_map: 13589.834458973 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2999341056, end = 2999382016, flags = 134217937, pgoff = 557056, inode = 535904 }
+vm_state.vm_map: 13589.834461109 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2999394304, end = 2999406592, flags = 134217845, pgoff = 0, inode = 141213 }
+vm_state.vm_map: 13589.834463165 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2999406592, end = 2999410688, flags = 135266419, pgoff = 8192, inode = 141213 }
+vm_state.vm_map: 13589.834465584 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2999410688, end = 2999803904, flags = 134217979, pgoff = 0, inode = 983045 }
+vm_state.vm_map: 13589.834472707 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2999803904, end = 2999816192, flags = 134217845, pgoff = 0, inode = 23389 }
+vm_state.vm_map: 13589.834474659 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2999816192, end = 2999820288, flags = 135266419, pgoff = 8192, inode = 23389 }
+vm_state.vm_map: 13589.834480088 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2999820288, end = 2999869440, flags = 134217937, pgoff = 778240, inode = 535647 }
+vm_state.vm_map: 13589.834482613 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2999869440, end = 2999975936, flags = 134217937, pgoff = 1236992, inode = 535706 }
+vm_state.vm_map: 13589.834484792 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 2999975936, end = 3000999936, flags = 2097267, pgoff = 2999975936, inode = 0 }
+vm_state.vm_map: 13589.834486959 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3000999936, end = 3001024512, flags = 2097264, pgoff = 3000999936, inode = 0 }
+vm_state.vm_map: 13589.834508894 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3001024512, end = 3001032704, flags = 134217937, pgoff = 98304, inode = 535720 }
+vm_state.vm_map: 13589.834511647 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3001032704, end = 3001090048, flags = 134217937, pgoff = 655360, inode = 737889 }
+vm_state.vm_map: 13589.834517027 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3001090048, end = 3001106432, flags = 134217937, pgoff = 118784, inode = 536141 }
+vm_state.vm_map: 13589.834521934 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3001110528, end = 3001122816, flags = 134217937, pgoff = 98304, inode = 535870 }
+vm_state.vm_map: 13589.834523991 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3001122816, end = 3001135104, flags = 1048688, pgoff = 3001122816, inode = 0 }
+vm_state.vm_map: 13589.834526034 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3001135104, end = 3001454592, flags = 1048695, pgoff = 3001135104, inode = 0 }
+vm_state.vm_map: 13589.834533151 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3001454592, end = 3001462784, flags = 134217845, pgoff = 0, inode = 23393 }
+vm_state.vm_map: 13589.834535694 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3001462784, end = 3001466880, flags = 135266419, pgoff = 4096, inode = 23393 }
+vm_state.vm_map: 13589.834542423 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3001466880, end = 3001495552, flags = 134217845, pgoff = 0, inode = 23395 }
+vm_state.vm_map: 13589.834544498 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3001495552, end = 3001499648, flags = 135266419, pgoff = 28672, inode = 23395 }
+vm_state.vm_map: 13589.834546689 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3001499648, end = 3001511936, flags = 134217845, pgoff = 0, inode = 21332 }
+vm_state.vm_map: 13589.834548868 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3001511936, end = 3001516032, flags = 135266419, pgoff = 8192, inode = 21332 }
+vm_state.vm_map: 13589.834553542 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3001516032, end = 3001532416, flags = 134217937, pgoff = 147456, inode = 535865 }
+vm_state.vm_map: 13589.834555949 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3001536512, end = 3001597952, flags = 134217937, pgoff = 1003520, inode = 536157 }
+vm_state.vm_map: 13589.834558300 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3001597952, end = 3001614336, flags = 134217937, pgoff = 143360, inode = 535687 }
+vm_state.vm_map: 13589.834560485 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3001614336, end = 3001622528, flags = 1048695, pgoff = 3001614336, inode = 0 }
+vm_state.vm_map: 13589.834565134 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3001622528, end = 3001643008, flags = 134217845, pgoff = 0, inode = 870319 }
+vm_state.vm_map: 13589.834567178 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3001643008, end = 3001651200, flags = 135266419, pgoff = 20480, inode = 870319 }
+vm_state.vm_map: 13589.834569640 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3001651200, end = 3001778176, flags = 134217937, pgoff = 1445888, inode = 535128 }
+vm_state.vm_map: 13589.834574757 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3001778176, end = 3001810944, flags = 134217937, pgoff = 311296, inode = 535726 }
+vm_state.vm_map: 13589.834579300 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3001810944, end = 3001831424, flags = 134217937, pgoff = 274432, inode = 536160 }
+vm_state.vm_map: 13589.834581855 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3001831424, end = 3001839616, flags = 134217937, pgoff = 53248, inode = 536055 }
+vm_state.vm_map: 13589.834583856 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3001839616, end = 3001851904, flags = 1048688, pgoff = 3001839616, inode = 0 }
+vm_state.vm_map: 13589.834586023 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3001851904, end = 3002171392, flags = 1048695, pgoff = 3001851904, inode = 0 }
+vm_state.vm_map: 13589.834588374 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3002175488, end = 3002212352, flags = 134217937, pgoff = 368640, inode = 535630 }
+vm_state.vm_map: 13589.834590911 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3002212352, end = 3002269696, flags = 134217841, pgoff = 0, inode = 649745 }
+vm_state.vm_map: 13589.834593325 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3002269696, end = 3002327040, flags = 134217841, pgoff = 0, inode = 649747 }
+vm_state.vm_map: 13589.834595830 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3002327040, end = 3002376192, flags = 134217841, pgoff = 0, inode = 649746 }
+vm_state.vm_map: 13589.834600386 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3002376192, end = 3002478592, flags = 134217937, pgoff = 1208320, inode = 535864 }
+vm_state.vm_map: 13589.834604886 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3002478592, end = 3002507264, flags = 134217937, pgoff = 290816, inode = 536077 }
+vm_state.vm_map: 13589.834607275 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3002507264, end = 3002572800, flags = 134217841, pgoff = 0, inode = 649742 }
+vm_state.vm_map: 13589.834609792 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3002572800, end = 3002638336, flags = 134217841, pgoff = 0, inode = 649744 }
+vm_state.vm_map: 13589.834610166 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3002638336, end = 3002699776, flags = 134217841, pgoff = 0, inode = 649743 }
+kernel.irq_entry: 13589.834631443 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { ip = 3242331332, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_update_time: 13589.834641990 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { jiffies = 4296292866, xtime_sec = 1262715366, xtime_nsec = 301133049, walltomonotonic_sec = -1262701811, walltomonotonic_nsec = 148963639 }
+kernel.softirq_raise: 13589.834653151 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { softirq_id = 1 [softirq 1] }
+kernel.irq_exit: 13589.834678755 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.softirq_entry: 13589.834682087 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, SOFTIRQ { softirq_id = 1 [softirq 1] }
+kernel.timer_set: 13589.834690385 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, SOFTIRQ { expires = 1325571, function = 0xc141d458, data = 0 }
+kernel.softirq_exit: 13589.834693100 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { softirq_id = 1 [softirq 1] }
+kernel.sched_schedule: 13589.834703172 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { prev_pid = 16887, next_pid = 1852, prev_state = 0 }
+kernel.syscall_entry: 13589.834938755 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726408, syscall_id = 119 [syscall 119] }
+kernel.syscall_exit: 13589.834942461 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = -1377311560 }
+kernel.syscall_entry: 13589.836042038 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 13589.836049063 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 13589.836057602 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.836071047 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 142 [syscall 142] }
+fs.select: 13589.836077432 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 1, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836081785 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 3, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836084240 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 5, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836092589 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 7, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836095157 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 13, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836097755 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 19, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836100063 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 20, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836102408 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 21, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836104607 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 22, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836106774 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 23, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836109636 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 24, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836112160 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 25, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836114426 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 26, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836116716 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 27, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836119117 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 28, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836121524 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 29, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836123857 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 31, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836126838 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 32, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836129183 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 33, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836131627 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 34, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836133948 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 35, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836136233 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 36, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836138529 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 37, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836141151 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 38, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836143503 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 39, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836145787 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 40, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836148428 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 42, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836150860 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 43, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836153144 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 44, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836155453 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 45, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836157798 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 46, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836160058 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 47, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836162538 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 48, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.836164767 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 49, end_time_sec = 0, end_time_nsec = 0 }
+kernel.syscall_exit: 13589.836167403 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 13589.836174950 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 13589.836176760 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 13589.836184746 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.836188778 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.836192188 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.836206206 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.836214320 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4096, fd = 41 }
+kernel.syscall_exit: 13589.836215595 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.836220422 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 146 [syscall 146] }
+kernel.sched_try_wakeup: 13589.836242849 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pid = 2241, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 13589.836256129 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { prev_pid = 1852, next_pid = 2241, prev_state = 0 }
+fs.pollfd: 13589.836496310 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 13589.836500146 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 13589.836509866 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.836518930 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.836520167 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 32 }
+kernel.syscall_entry: 13589.836563126 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.836565897 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.836567245 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.836619359 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb6053e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.836622086 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.838758009 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 13589.838762380 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 13589.838765971 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 13589.838769982 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 146 [syscall 146] }
+fs.writev: 13589.838776189 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8, vlen = 3 }
+kernel.syscall_exit: 13589.838778161 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 16 }
+kernel.syscall_entry: 13589.838783686 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.838785906 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.838787099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.838804500 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb6053e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.838807250 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.838818964 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 13589.838820867 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 13589.838823099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 13589.838826351 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 146 [syscall 146] }
+fs.writev: 13589.838830387 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8, vlen = 3 }
+kernel.syscall_exit: 13589.838831846 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 16 }
+kernel.syscall_entry: 13589.838836902 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 13589.838838410 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 13589.838848504 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { prev_pid = 2241, next_pid = 1852, prev_state = 1 }
+fs.writev: 13589.839011735 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 41, vlen = 1 }
+kernel.syscall_exit: 13589.839013756 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 32 }
+kernel.syscall_entry: 13589.839020210 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.839022806 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.839026892 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 13589.839029297 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 13589.839033568 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.839039836 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 142 [syscall 142] }
+fs.select: 13589.839044904 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 1, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839047353 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 3, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839049596 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 5, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839053923 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 7, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839056112 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 13, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839058899 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 19, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839060976 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 20, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839063065 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 21, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839065018 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 22, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839067047 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 23, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839069259 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 24, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839071237 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 25, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839073135 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 26, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839075112 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 27, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839077097 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 28, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839079088 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 29, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839081344 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 31, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839083612 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 32, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839089188 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 33, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839091215 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 34, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839093100 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 35, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839095604 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 36, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839097650 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 37, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839099658 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 38, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839101736 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 39, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839103837 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 40, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839105803 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 41, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839107732 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 42, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839109512 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 43, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839111373 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 44, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839113239 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 45, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839115217 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 46, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839117147 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 47, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839118902 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 48, end_time_sec = 13555, end_time_nsec = 784420373 }
+fs.select: 13589.839120744 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 49, end_time_sec = 13555, end_time_nsec = 784420373 }
+mm.page_free: 13589.839127611 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pfn = 79373, order = 0 }
+kernel.syscall_exit: 13589.839133007 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 2 }
+kernel.syscall_entry: 13589.839138169 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 13589.839140016 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 13589.839146000 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.839149345 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.839151756 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.839156688 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [syscall 3] }
+kernel.sched_try_wakeup: 13589.839165397 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pid = 2241, cpu_id = 0, state = 1 }
+fs.read: 13589.839174855 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4096, fd = 41 }
+kernel.syscall_exit: 13589.839176153 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 32 }
+kernel.syscall_entry: 13589.839214521 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 54 [syscall 54] }
+fs.ioctl: 13589.839217271 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 8, cmd = 3223606787, arg = 3215721504 }
+kernel.syscall_exit: 13589.839263212 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.839270004 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 54 [syscall 54] }
+fs.ioctl: 13589.839271741 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 8, cmd = 3224393219, arg = 142043456 }
+kernel.syscall_exit: 13589.839317174 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.839343996 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 54 [syscall 54] }
+fs.ioctl: 13589.839345887 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 8, cmd = 3380106755, arg = 170840344 }
+kernel.syscall_exit: 13589.839396432 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.839402755 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 54 [syscall 54] }
+fs.ioctl: 13589.839404548 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 8, cmd = 3223606787, arg = 3215721440 }
+kernel.syscall_exit: 13589.839427975 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.839433069 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 54 [syscall 54] }
+fs.ioctl: 13589.839434812 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 8, cmd = 3223606787, arg = 3215721456 }
+kernel.syscall_exit: 13589.839456960 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.839461825 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 54 [syscall 54] }
+fs.ioctl: 13589.839463543 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 8, cmd = 3224393219, arg = 142043456 }
+kernel.syscall_exit: 13589.839490858 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.839499586 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.839502232 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4096, fd = 41 }
+kernel.syscall_exit: 13589.839503548 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.839508166 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 146 [syscall 146] }
+fs.writev: 13589.839516499 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 41, vlen = 1 }
+kernel.syscall_exit: 13589.839518130 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 32 }
+kernel.syscall_entry: 13589.839522302 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.839525029 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.839528256 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 13589.839530431 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 13589.839534640 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.839539493 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 142 [syscall 142] }
+fs.select: 13589.839544555 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 1, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839547158 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 3, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839549260 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 5, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839552974 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 7, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839555015 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 13, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839557061 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 19, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839559032 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 20, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839561122 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 21, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839563000 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 22, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839564904 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 23, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839566772 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 24, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839568657 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 25, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839570622 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 26, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839572687 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 27, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839574572 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 28, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839576878 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 29, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839578881 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 31, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839580927 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 32, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839584097 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 33, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839586008 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 34, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839588097 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 35, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839613979 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 36, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839616068 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 37, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839618355 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 38, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839620512 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 39, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839622768 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 40, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839624901 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 41, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839626892 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 42, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839628900 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 43, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839630915 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 44, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839632924 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 45, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839635199 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 46, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839637221 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 47, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839639155 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 48, end_time_sec = 13555, end_time_nsec = 784919794 }
+fs.select: 13589.839640985 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 49, end_time_sec = 13555, end_time_nsec = 784919794 }
+mm.page_free: 13589.839647970 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pfn = 79373, order = 0 }
+kernel.syscall_exit: 13589.839651907 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 13589.839658015 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 13589.839659906 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 13589.839666273 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.839669994 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.839672442 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.839677338 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [syscall 3] }
+kernel.sched_try_wakeup: 13589.839688272 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pid = 2259, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 13589.839697710 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { prev_pid = 1852, next_pid = 2259, prev_state = 0 }
+fs.pollfd: 13589.839873571 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 4 }
+fs.pollfd: 13589.839876451 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 13589.839877990 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 11 }
+kernel.sched_schedule: 13589.839888771 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { prev_pid = 2259, next_pid = 2241, prev_state = 1 }
+fs.pollfd: 13589.840003880 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 13589.840006803 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 13589.840014734 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.840019815 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.840021083 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 32 }
+kernel.syscall_entry: 13589.840030936 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.840032858 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.840034057 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.840192077 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.840194957 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.840196349 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.840201454 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.840203086 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.840204261 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.840239946 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.840242591 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.840243958 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.840261555 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.840263447 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.840264634 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.840270160 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb6053e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.840272966 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.840279599 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 13589.840281917 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 13589.840284316 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 9 }
+fs.pollfd: 13589.840286027 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+fs.pollfd: 13589.840287462 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 10 }
+fs.pollfd: 13589.840292444 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 14 }
+fs.pollfd: 13589.840294324 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 5 }
+fs.pollfd: 13589.840296233 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 12 }
+fs.pollfd: 13589.840298984 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 19 }
+fs.pollfd: 13589.840301320 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 16 }
+fs.pollfd: 13589.840304171 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 26 }
+fs.pollfd: 13589.840306334 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 21 }
+fs.pollfd: 13589.840309177 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 31 }
+kernel.syscall_exit: 13589.840312113 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.840337648 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.840340244 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.840341499 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.840347699 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb6053e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.840350289 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.841046247 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb6053e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.841049388 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.841058042 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 13589.841060304 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 13589.841063221 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 13589.841066857 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 146 [syscall 146] }
+fs.writev: 13589.841074910 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8, vlen = 3 }
+kernel.syscall_exit: 13589.841076907 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 52 }
+kernel.syscall_entry: 13589.841081463 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.841083515 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.841084689 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.841089554 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 13589.841091149 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 13589.841092824 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 9 }
+fs.pollfd: 13589.841094221 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+fs.pollfd: 13589.841095710 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 10 }
+fs.pollfd: 13589.841098629 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 14 }
+fs.pollfd: 13589.841099945 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 5 }
+fs.pollfd: 13589.841101330 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 12 }
+fs.pollfd: 13589.841103425 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 19 }
+fs.pollfd: 13589.841104976 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 16 }
+fs.pollfd: 13589.841106893 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 26 }
+fs.pollfd: 13589.841108198 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 21 }
+fs.pollfd: 13589.841110330 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 31 }
+kernel.syscall_exit: 13589.841112017 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.841116981 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.841118853 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.841120016 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.842552304 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 13589.842555406 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 13589.842558231 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 13589.842562064 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 146 [syscall 146] }
+fs.writev: 13589.842572115 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8, vlen = 3 }
+kernel.syscall_exit: 13589.842573734 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 12820 }
+kernel.syscall_entry: 13589.842579959 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 13589.842581572 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 13589.842594337 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { prev_pid = 2241, next_pid = 1852, prev_state = 1 }
+fs.read: 13589.842781112 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4096, fd = 44 }
+kernel.syscall_exit: 13589.842782807 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 672 }
+kernel.syscall_entry: 13589.842962517 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [syscall 3] }
+fs.read: 13589.842965892 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4096, fd = 44 }
+kernel.syscall_exit: 13589.842967233 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 13589.842971838 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.842974577 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.842978353 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 13589.842981030 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 13589.842986019 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.842994054 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 142 [syscall 142] }
+fs.select: 13589.843000279 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 1, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843003097 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 3, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843005483 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 5, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843010107 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 7, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843012449 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 13, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843014873 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 19, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843017128 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 20, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843019472 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 21, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843021740 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 22, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843023718 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 23, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843025777 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 24, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843028107 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 25, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843030444 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 26, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843032477 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 27, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843034549 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 28, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843037089 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 29, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843039469 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 31, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843042089 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 32, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843047232 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 33, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843049489 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 34, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843051794 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 35, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843053957 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 36, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843055898 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 37, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843058130 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 38, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843060207 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 39, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843062407 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 40, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843064595 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 41, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843066517 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 42, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843068515 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 43, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843070462 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 44, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843072149 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 45, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843074430 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 46, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843076241 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 47, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843078393 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 48, end_time_sec = 13555, end_time_nsec = 784373129 }
+fs.select: 13589.843080432 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 49, end_time_sec = 13555, end_time_nsec = 784373129 }
+mm.page_free: 13589.843087101 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pfn = 79373, order = 0 }
+kernel.syscall_exit: 13589.843091454 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 13589.843097796 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 13589.843099687 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 13589.843106548 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.843109849 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.843112266 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.843117353 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [syscall 3] }
+kernel.sched_try_wakeup: 13589.843127491 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pid = 2241, cpu_id = 0, state = 1 }
+fs.read: 13589.843135539 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4096, fd = 41 }
+kernel.syscall_exit: 13589.843136855 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 4096 }
+kernel.irq_entry: 13589.845655825 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { ip = 3077256468, handler = 0x0, irq_id = 239, kernel_mode = 0 }
+kernel.timer_update_time: 13589.845681823 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { jiffies = 4296292867, xtime_sec = 1262715366, xtime_nsec = 301133050, walltomonotonic_sec = -1262701811, walltomonotonic_nsec = 148963639 }
+kernel.softirq_raise: 13589.845698754 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { softirq_id = 1 [softirq 1] }
+kernel.irq_exit: 13589.845737957 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.softirq_entry: 13589.845743284 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { softirq_id = 1 [softirq 1] }
+kernel.timer_set: 13589.845758491 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { expires = 1325572, function = 0xc141d458, data = 0 }
+kernel.softirq_exit: 13589.845761928 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { softirq_id = 1 [softirq 1] }
+kernel.sched_schedule: 13589.845775416 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { prev_pid = 1852, next_pid = 2241, prev_state = 0 }
+fs.pollfd: 13589.846060908 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 13589.846074469 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { prev_pid = 2241, next_pid = 1852, prev_state = 1 }
+kernel.irq_entry: 13589.848140133 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { ip = 3077209744, handler = 0x0, irq_id = 239, kernel_mode = 0 }
+kernel.sched_try_wakeup: 13589.848181302 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { pid = 2822, cpu_id = 0, state = 1 }
+kernel.irq_exit: 13589.848199277 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.sched_schedule: 13589.848213005 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, SYSCALL { prev_pid = 1852, next_pid = 2822, prev_state = 0 }
+kernel.syscall_exit: 13589.848505148 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = -110 }
+kernel.syscall_entry: 13589.848526832 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 240 [syscall 240] }
+kernel.syscall_exit: 13589.848530338 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.848535363 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb690fe4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.848539727 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.848551663 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 13589.848554568 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.848558172 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb690fe4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.848560392 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.848563290 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb690fe4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.848565491 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.848568692 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 13589.848571370 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.848578429 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 13589.848580704 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.848583664 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 240 [syscall 240] }
+kernel.sched_schedule: 13589.848602153 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { prev_pid = 2822, next_pid = 16887, prev_state = 1 }
+vm_state.vm_map: 13589.848681120 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3002699776, end = 3002712064, flags = 134217937, pgoff = 77824, inode = 535722 }
+vm_state.vm_map: 13589.848686645 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3002712064, end = 3002744832, flags = 134217937, pgoff = 356352, inode = 535557 }
+vm_state.vm_map: 13589.848691881 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3002744832, end = 3002781696, flags = 134217937, pgoff = 352256, inode = 535637 }
+vm_state.vm_map: 13589.848696993 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3002781696, end = 3002793984, flags = 134217937, pgoff = 102400, inode = 536159 }
+vm_state.vm_map: 13589.848699491 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3002793984, end = 3002806272, flags = 134217937, pgoff = 73728, inode = 535562 }
+vm_state.vm_map: 13589.848702155 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3002806272, end = 3002847232, flags = 134217937, pgoff = 417792, inode = 535591 }
+vm_state.vm_map: 13589.848704695 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3002847232, end = 3003043840, flags = 134217937, pgoff = 2269184, inode = 535816 }
+vm_state.vm_map: 13589.848706871 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3003043840, end = 3003056128, flags = 1048688, pgoff = 3003043840, inode = 0 }
+vm_state.vm_map: 13589.848708911 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3003056128, end = 3003375616, flags = 1048695, pgoff = 3003056128, inode = 0 }
+vm_state.vm_map: 13589.848713973 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3003375616, end = 3003404288, flags = 134217937, pgoff = 1118208, inode = 198607 }
+vm_state.vm_map: 13589.848716514 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3003404288, end = 3003408384, flags = 134217937, pgoff = 53248, inode = 535718 }
+vm_state.vm_map: 13589.848719277 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3003408384, end = 3003416576, flags = 134217937, pgoff = 147456, inode = 535847 }
+vm_state.vm_map: 13589.848722102 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3003416576, end = 3003588608, flags = 134217937, pgoff = 4317184, inode = 535724 }
+vm_state.vm_map: 13589.848724890 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3003588608, end = 3003666432, flags = 134217937, pgoff = 901120, inode = 535818 }
+vm_state.vm_map: 13589.848727683 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3003666432, end = 3003691008, flags = 134217937, pgoff = 225280, inode = 535715 }
+vm_state.vm_map: 13589.848730341 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3003691008, end = 3003736064, flags = 134217937, pgoff = 512000, inode = 535841 }
+vm_state.vm_map: 13589.848733228 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3003736064, end = 3003781120, flags = 134217937, pgoff = 524288, inode = 535850 }
+vm_state.vm_map: 13589.848735732 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3003781120, end = 3004366848, flags = 134217937, pgoff = 9248768, inode = 535655 }
+vm_state.vm_map: 13589.848742247 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3004366848, end = 3004407808, flags = 134217845, pgoff = 0, inode = 871011 }
+vm_state.vm_map: 13589.848744435 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3004407808, end = 3004411904, flags = 135266419, pgoff = 36864, inode = 871011 }
+vm_state.vm_map: 13589.848747217 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3004411904, end = 3004432384, flags = 134217845, pgoff = 0, inode = 871006 }
+vm_state.vm_map: 13589.848749454 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3004432384, end = 3004436480, flags = 135266419, pgoff = 20480, inode = 871006 }
+vm_state.vm_map: 13589.848752205 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3004436480, end = 3004448768, flags = 134217979, pgoff = 0, inode = 950276 }
+vm_state.vm_map: 13589.848754739 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3004448768, end = 3004743680, flags = 134217937, pgoff = 3801088, inode = 535633 }
+vm_state.vm_map: 13589.848763443 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3004743680, end = 3004751872, flags = 134217845, pgoff = 0, inode = 23391 }
+vm_state.vm_map: 13589.848765761 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3004751872, end = 3004755968, flags = 135266419, pgoff = 4096, inode = 23391 }
+vm_state.vm_map: 13589.848768685 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3004755968, end = 3004772352, flags = 134217937, pgoff = 53248, inode = 535648 }
+vm_state.vm_map: 13589.848771151 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3004772352, end = 3004796928, flags = 134217937, pgoff = 266240, inode = 535135 }
+vm_state.vm_map: 13589.848773784 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3004796928, end = 3004805120, flags = 134217937, pgoff = 12288, inode = 535138 }
+vm_state.vm_map: 13589.848778667 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3004805120, end = 3004833792, flags = 134217937, pgoff = 413696, inode = 535130 }
+vm_state.vm_map: 13589.848781201 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3004833792, end = 3004841984, flags = 134217845, pgoff = 0, inode = 21334 }
+vm_state.vm_map: 13589.848783359 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3004841984, end = 3004846080, flags = 135266419, pgoff = 4096, inode = 21334 }
+vm_state.vm_map: 13589.848785825 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3004846080, end = 3004862464, flags = 134217937, pgoff = 90112, inode = 535129 }
+vm_state.vm_map: 13589.848788304 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3004862464, end = 3004887040, flags = 134217937, pgoff = 274432, inode = 535712 }
+vm_state.vm_map: 13589.848790685 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3004887040, end = 3004899328, flags = 134217937, pgoff = 69632, inode = 535132 }
+vm_state.vm_map: 13589.848793076 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3004903424, end = 3004919808, flags = 134217937, pgoff = 143360, inode = 535133 }
+vm_state.vm_map: 13589.848795641 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3004919808, end = 3004932096, flags = 134217937, pgoff = 90112, inode = 535574 }
+vm_state.vm_map: 13589.848797805 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3004932096, end = 3004944384, flags = 2097271, pgoff = 3004932096, inode = 0 }
+vm_state.vm_map: 13589.848799950 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3004944384, end = 3005263872, flags = 1048695, pgoff = 3004944384, inode = 0 }
+vm_state.vm_map: 13589.848802806 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3005267968, end = 3005288448, flags = 134217937, pgoff = 233472, inode = 737888 }
+vm_state.vm_map: 13589.848805408 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3005288448, end = 3005300736, flags = 134217937, pgoff = 65536, inode = 536078 }
+vm_state.vm_map: 13589.848810286 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3005300736, end = 3005333504, flags = 134217937, pgoff = 323584, inode = 535121 }
+vm_state.vm_map: 13589.848812967 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3005333504, end = 3005390848, flags = 134217937, pgoff = 667648, inode = 536080 }
+vm_state.vm_map: 13589.848815453 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3005390848, end = 3005399040, flags = 134217937, pgoff = 77824, inode = 535969 }
+vm_state.vm_map: 13589.848818178 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3005399040, end = 3005411328, flags = 2097271, pgoff = 3005399040, inode = 0 }
+vm_state.vm_map: 13589.848820336 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3005411328, end = 3005730816, flags = 1048695, pgoff = 3005411328, inode = 0 }
+vm_state.vm_map: 13589.848827698 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3005730816, end = 3005739008, flags = 134217841, pgoff = 0, inode = 76163 }
+vm_state.vm_map: 13589.848832494 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3005739008, end = 3005857792, flags = 134217937, pgoff = 5668864, inode = 535879 }
+vm_state.vm_map: 13589.848834893 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3005857792, end = 3005882368, flags = 134217937, pgoff = 204800, inode = 535123 }
+vm_state.vm_map: 13589.848839615 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3005882368, end = 3005906944, flags = 134217937, pgoff = 299008, inode = 535863 }
+vm_state.vm_map: 13589.848844709 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3005906944, end = 3005915136, flags = 134217937, pgoff = 24576, inode = 535782 }
+vm_state.vm_map: 13589.848847237 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3005915136, end = 3005923328, flags = 134217937, pgoff = 45056, inode = 535125 }
+vm_state.vm_map: 13589.848849821 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3005923328, end = 3005935616, flags = 134217937, pgoff = 81920, inode = 535728 }
+vm_state.vm_map: 13589.848857016 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3005935616, end = 3005943808, flags = 134217845, pgoff = 0, inode = 870982 }
+vm_state.vm_map: 13589.848859062 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3005943808, end = 3005947904, flags = 135266419, pgoff = 4096, inode = 870982 }
+vm_state.vm_map: 13589.848861634 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3005947904, end = 3005956096, flags = 134217937, pgoff = 40960, inode = 535834 }
+vm_state.vm_map: 13589.848866399 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3005956096, end = 3006001152, flags = 134217937, pgoff = 692224, inode = 535663 }
+vm_state.vm_map: 13589.848869100 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006001152, end = 3006152704, flags = 134217937, pgoff = 1990656, inode = 535881 }
+vm_state.vm_map: 13589.848871771 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006152704, end = 3006169088, flags = 134217845, pgoff = 0, inode = 87517 }
+vm_state.vm_map: 13589.848873960 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006169088, end = 3006173184, flags = 135266419, pgoff = 12288, inode = 87517 }
+vm_state.vm_map: 13589.848878960 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006173184, end = 3006193664, flags = 134217845, pgoff = 0, inode = 87510 }
+vm_state.vm_map: 13589.848881345 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006193664, end = 3006197760, flags = 135266419, pgoff = 16384, inode = 87510 }
+vm_state.vm_map: 13589.848884227 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006197760, end = 3006251008, flags = 134217841, pgoff = 0, inode = 649748 }
+vm_state.vm_map: 13589.848886767 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006251008, end = 3006320640, flags = 134217841, pgoff = 0, inode = 649694 }
+vm_state.vm_map: 13589.848889381 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006320640, end = 3006328832, flags = 134217845, pgoff = 0, inode = 87435 }
+vm_state.vm_map: 13589.848891404 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006328832, end = 3006332928, flags = 135266419, pgoff = 4096, inode = 87435 }
+vm_state.vm_map: 13589.848894135 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006332928, end = 3006337024, flags = 134217937, pgoff = 0, inode = 1196317 }
+vm_state.vm_map: 13589.848896657 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006337024, end = 3006361600, flags = 134217937, pgoff = 0, inode = 1196229 }
+vm_state.vm_map: 13589.848899031 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006361600, end = 3006365696, flags = 134217937, pgoff = 0, inode = 1196235 }
+vm_state.vm_map: 13589.848901411 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006365696, end = 3006369792, flags = 134217937, pgoff = 0, inode = 1196204 }
+vm_state.vm_map: 13589.848903896 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006369792, end = 3006373888, flags = 134217937, pgoff = 0, inode = 1196228 }
+vm_state.vm_map: 13589.848906263 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006373888, end = 3006377984, flags = 134217937, pgoff = 0, inode = 1196227 }
+vm_state.vm_map: 13589.848908525 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006377984, end = 3006386176, flags = 134217937, pgoff = 0, inode = 1196198 }
+vm_state.vm_map: 13589.848911115 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006386176, end = 3006418944, flags = 134217937, pgoff = 0, inode = 1196200 }
+vm_state.vm_map: 13589.848913397 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006418944, end = 3006431232, flags = 134217937, pgoff = 0, inode = 1196226 }
+vm_state.vm_map: 13589.848915912 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006431232, end = 3006439424, flags = 134217937, pgoff = 0, inode = 1196225 }
+vm_state.vm_map: 13589.848918453 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006439424, end = 3006443520, flags = 134217937, pgoff = 0, inode = 1196224 }
+vm_state.vm_map: 13589.848921444 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006443520, end = 3006447616, flags = 134217937, pgoff = 0, inode = 1196223 }
+vm_state.vm_map: 13589.848923854 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006447616, end = 3006451712, flags = 134217937, pgoff = 0, inode = 1196202 }
+vm_state.vm_map: 13589.848926223 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006451712, end = 3006480384, flags = 134217937, pgoff = 0, inode = 1196222 }
+vm_state.vm_map: 13589.848928720 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006480384, end = 3006492672, flags = 134217937, pgoff = 0, inode = 1196221 }
+vm_state.vm_map: 13589.848930982 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006492672, end = 3006496768, flags = 134217937, pgoff = 0, inode = 1196220 }
+vm_state.vm_map: 13589.848933257 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006496768, end = 3006504960, flags = 134217937, pgoff = 0, inode = 1196219 }
+vm_state.vm_map: 13589.848935656 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006504960, end = 3006509056, flags = 134217937, pgoff = 0, inode = 1196210 }
+vm_state.vm_map: 13589.848938035 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006509056, end = 3006513152, flags = 134217937, pgoff = 0, inode = 1196205 }
+vm_state.vm_map: 13589.848940439 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006513152, end = 3006525440, flags = 134217937, pgoff = 0, inode = 1196244 }
+vm_state.vm_map: 13589.848943098 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006525440, end = 3006533632, flags = 134217937, pgoff = 0, inode = 1196270 }
+vm_state.vm_map: 13589.848945373 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006533632, end = 3006566400, flags = 134217937, pgoff = 0, inode = 1196246 }
+vm_state.vm_map: 13589.848947907 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006566400, end = 3006586880, flags = 134217937, pgoff = 0, inode = 1196269 }
+vm_state.vm_map: 13589.848950472 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006586880, end = 3006615552, flags = 134217937, pgoff = 0, inode = 1196197 }
+vm_state.vm_map: 13589.848952882 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006615552, end = 3006660608, flags = 134217937, pgoff = 0, inode = 1196312 }
+vm_state.vm_map: 13589.848955176 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006660608, end = 3006717952, flags = 134217937, pgoff = 0, inode = 1196272 }
+vm_state.vm_map: 13589.848958019 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006717952, end = 3006734336, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 13589.848960436 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006734336, end = 3006738432, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 13589.848962754 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006738432, end = 3006746624, flags = 134217937, pgoff = 0, inode = 1196316 }
+vm_state.vm_map: 13589.848965053 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006746624, end = 3006758912, flags = 134217937, pgoff = 0, inode = 1196315 }
+vm_state.vm_map: 13589.848967545 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006758912, end = 3006816256, flags = 134217937, pgoff = 0, inode = 1196231 }
+vm_state.vm_map: 13589.848969708 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006816256, end = 3006832640, flags = 1048695, pgoff = 3006816256, inode = 0 }
+vm_state.vm_map: 13589.848974839 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3006832640, end = 3007180800, flags = 134217845, pgoff = 0, inode = 870964 }
+vm_state.vm_map: 13589.848977027 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3007180800, end = 3007188992, flags = 135266419, pgoff = 344064, inode = 870964 }
+vm_state.vm_map: 13589.848979011 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3007188992, end = 3007193088, flags = 1048691, pgoff = 3007188992, inode = 0 }
+vm_state.vm_map: 13589.848981428 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3007193088, end = 3007205376, flags = 134217845, pgoff = 0, inode = 870963 }
+vm_state.vm_map: 13589.848983549 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3007205376, end = 3007209472, flags = 135266419, pgoff = 8192, inode = 870963 }
+vm_state.vm_map: 13589.848985637 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3007209472, end = 3007213568, flags = 1048691, pgoff = 3007209472, inode = 0 }
+vm_state.vm_map: 13589.848988073 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3007213568, end = 3007225856, flags = 134217937, pgoff = 761856, inode = 737915 }
+vm_state.vm_map: 13589.848990564 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3007225856, end = 3007242240, flags = 134217937, pgoff = 135168, inode = 535896 }
+vm_state.vm_map: 13589.848992857 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3007242240, end = 3007320064, flags = 134217937, pgoff = 2056192, inode = 535693 }
+vm_state.vm_map: 13589.848995150 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3007320064, end = 3007324160, flags = 134217937, pgoff = 16384, inode = 535975 }
+vm_state.vm_map: 13589.848998025 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3007324160, end = 3007406080, flags = 134217937, pgoff = 978944, inode = 535986 }
+vm_state.vm_map: 13589.849000331 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3007406080, end = 3007410176, flags = 134217937, pgoff = 4096, inode = 535700 }
+vm_state.vm_map: 13589.849002631 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3007410176, end = 3007696896, flags = 134217937, pgoff = 3801088, inode = 535984 }
+vm_state.vm_map: 13589.849005258 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3007696896, end = 3007705088, flags = 134217937, pgoff = 53248, inode = 535626 }
+vm_state.vm_map: 13589.849007223 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3007705088, end = 3007717376, flags = 1048688, pgoff = 3007705088, inode = 0 }
+vm_state.vm_map: 13589.849009182 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3007717376, end = 3008045056, flags = 1048695, pgoff = 3007717376, inode = 0 }
+vm_state.vm_map: 13589.849011642 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3008045056, end = 3008073728, flags = 134217937, pgoff = 335872, inode = 535565 }
+vm_state.vm_map: 13589.849014140 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3008073728, end = 3008086016, flags = 134217937, pgoff = 77824, inode = 198594 }
+vm_state.vm_map: 13589.849016205 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3008086016, end = 3008098304, flags = 1048688, pgoff = 3008086016, inode = 0 }
+vm_state.vm_map: 13589.849018152 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3008098304, end = 3008417792, flags = 1048695, pgoff = 3008098304, inode = 0 }
+vm_state.vm_map: 13589.849020099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3008417792, end = 3008430080, flags = 1048688, pgoff = 3008417792, inode = 0 }
+vm_state.vm_map: 13589.849022182 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3008430080, end = 3008749568, flags = 1048695, pgoff = 3008430080, inode = 0 }
+vm_state.vm_map: 13589.849024136 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3008749568, end = 3008761856, flags = 1048688, pgoff = 3008749568, inode = 0 }
+vm_state.vm_map: 13589.849026200 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3008761856, end = 3009081344, flags = 1048695, pgoff = 3008761856, inode = 0 }
+vm_state.vm_map: 13589.849028147 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3009081344, end = 3009093632, flags = 1048688, pgoff = 3009081344, inode = 0 }
+vm_state.vm_map: 13589.849030218 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3009093632, end = 3009413120, flags = 1048695, pgoff = 3009093632, inode = 0 }
+vm_state.vm_map: 13589.849032758 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3009413120, end = 3010453504, flags = 2097267, pgoff = 3009413120, inode = 0 }
+vm_state.vm_map: 13589.849034817 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010453504, end = 3010461696, flags = 2097264, pgoff = 3010453504, inode = 0 }
+vm_state.vm_map: 13589.849037635 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010461696, end = 3010469888, flags = 134217845, pgoff = 0, inode = 23893 }
+vm_state.vm_map: 13589.849039836 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010469888, end = 3010473984, flags = 135266419, pgoff = 4096, inode = 23893 }
+vm_state.vm_map: 13589.849042283 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010473984, end = 3010482176, flags = 134217937, pgoff = 69632, inode = 535134 }
+vm_state.vm_map: 13589.849044583 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010482176, end = 3010490368, flags = 134217937, pgoff = 24576, inode = 535592 }
+vm_state.vm_map: 13589.849073023 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010490368, end = 3010494464, flags = 134217937, pgoff = 12288, inode = 535588 }
+vm_state.vm_map: 13589.849075799 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010494464, end = 3010506752, flags = 134217937, pgoff = 94208, inode = 536143 }
+vm_state.vm_map: 13589.849078463 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010506752, end = 3010514944, flags = 134217937, pgoff = 57344, inode = 535587 }
+vm_state.vm_map: 13589.849081164 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010514944, end = 3010523136, flags = 134217937, pgoff = 90112, inode = 535846 }
+vm_state.vm_map: 13589.849083618 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010523136, end = 3010531328, flags = 134217937, pgoff = 61440, inode = 535120 }
+vm_state.vm_map: 13589.849086017 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010531328, end = 3010560000, flags = 134217937, pgoff = 593920, inode = 198593 }
+vm_state.vm_map: 13589.849088421 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010564096, end = 3010572288, flags = 134217937, pgoff = 57344, inode = 535836 }
+vm_state.vm_map: 13589.849093898 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010572288, end = 3010580480, flags = 134217937, pgoff = 28672, inode = 535877 }
+vm_state.vm_map: 13589.849096680 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010580480, end = 3010592768, flags = 134217937, pgoff = 139264, inode = 737890 }
+vm_state.vm_map: 13589.849099078 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010592768, end = 3010600960, flags = 134217937, pgoff = 16384, inode = 535657 }
+vm_state.vm_map: 13589.849101476 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010600960, end = 3010609152, flags = 134217937, pgoff = 73728, inode = 536155 }
+vm_state.vm_map: 13589.849104010 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010609152, end = 3010621440, flags = 134217937, pgoff = 98304, inode = 737887 }
+vm_state.vm_map: 13589.849106193 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010625536, end = 3010629632, flags = 2097265, pgoff = 3010625536, inode = 0 }
+vm_state.vm_map: 13589.849108585 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010629632, end = 3010646016, flags = 134217937, pgoff = 159744, inode = 536148 }
+vm_state.vm_map: 13589.849110903 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010646016, end = 3010654208, flags = 134217937, pgoff = 49152, inode = 535126 }
+vm_state.vm_map: 13589.849113616 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010654208, end = 3010658304, flags = 134217937, pgoff = 28672, inode = 535734 }
+vm_state.vm_map: 13589.849115947 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010658304, end = 3010670592, flags = 134217937, pgoff = 98304, inode = 535122 }
+vm_state.vm_map: 13589.849118488 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010670592, end = 3010678784, flags = 134217937, pgoff = 20480, inode = 535118 }
+vm_state.vm_map: 13589.849120861 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010678784, end = 3010682880, flags = 134217937, pgoff = 4190208, inode = 535140 }
+vm_state.vm_map: 13589.849123420 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010682880, end = 3010686976, flags = 134217937, pgoff = 40960, inode = 535558 }
+vm_state.vm_map: 13589.849125744 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010686976, end = 3010691072, flags = 134217937, pgoff = 32768, inode = 535124 }
+vm_state.vm_map: 13589.849130535 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010691072, end = 3010703360, flags = 134217937, pgoff = 90112, inode = 535774 }
+vm_state.vm_map: 13589.849135659 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010703360, end = 3010732032, flags = 134217845, pgoff = 0, inode = 198542 }
+vm_state.vm_map: 13589.849137706 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010732032, end = 3010736128, flags = 135266419, pgoff = 24576, inode = 198542 }
+vm_state.vm_map: 13589.849140246 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010736128, end = 3010813952, flags = 134217845, pgoff = 0, inode = 198541 }
+vm_state.vm_map: 13589.849142236 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010813952, end = 3010818048, flags = 135266419, pgoff = 77824, inode = 198541 }
+vm_state.vm_map: 13589.849144999 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010818048, end = 3010887680, flags = 134217937, pgoff = 1064960, inode = 535890 }
+vm_state.vm_map: 13589.849147126 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010887680, end = 3010891776, flags = 1048688, pgoff = 3010887680, inode = 0 }
+vm_state.vm_map: 13589.849149240 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3010891776, end = 3011416064, flags = 1048695, pgoff = 3010891776, inode = 0 }
+vm_state.vm_map: 13589.849151527 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3011416064, end = 3011428352, flags = 1048688, pgoff = 3011416064, inode = 0 }
+vm_state.vm_map: 13589.849153647 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3011428352, end = 3011747840, flags = 1048695, pgoff = 3011428352, inode = 0 }
+vm_state.vm_map: 13589.849155816 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3011747840, end = 3011760128, flags = 1048688, pgoff = 3011747840, inode = 0 }
+vm_state.vm_map: 13589.849157993 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3011760128, end = 3012276224, flags = 1048695, pgoff = 3011760128, inode = 0 }
+vm_state.vm_map: 13589.849160181 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3012276224, end = 3012288512, flags = 1048688, pgoff = 3012276224, inode = 0 }
+vm_state.vm_map: 13589.849162140 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3012288512, end = 3012608000, flags = 1048695, pgoff = 3012288512, inode = 0 }
+vm_state.vm_map: 13589.849164304 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3012608000, end = 3012816896, flags = 1048691, pgoff = 3012608000, inode = 0 }
+vm_state.vm_map: 13589.849166899 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3012816896, end = 3014479872, flags = 134217937, pgoff = 50016256, inode = 198631 }
+vm_state.vm_map: 13589.849169094 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3014479872, end = 3014492160, flags = 1048688, pgoff = 3014479872, inode = 0 }
+vm_state.vm_map: 13589.849171486 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3014492160, end = 3014811648, flags = 1048695, pgoff = 3014492160, inode = 0 }
+vm_state.vm_map: 13589.849173656 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3014811648, end = 3014823936, flags = 1048688, pgoff = 3014811648, inode = 0 }
+vm_state.vm_map: 13589.849175782 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3014823936, end = 3015143424, flags = 1048695, pgoff = 3014823936, inode = 0 }
+vm_state.vm_map: 13589.849177946 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3015143424, end = 3015147520, flags = 1048688, pgoff = 3015143424, inode = 0 }
+vm_state.vm_map: 13589.849180128 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3015147520, end = 3015835648, flags = 1048695, pgoff = 3015147520, inode = 0 }
+vm_state.vm_map: 13589.849182260 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3015835648, end = 3016249344, flags = 2097271, pgoff = 3015835648, inode = 0 }
+vm_state.vm_map: 13589.849184547 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3016249344, end = 3016400896, flags = 1048695, pgoff = 3016249344, inode = 0 }
+vm_state.vm_map: 13589.849186711 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3016400896, end = 3016978432, flags = 2097271, pgoff = 3016400896, inode = 0 }
+vm_state.vm_map: 13589.849188943 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3016978432, end = 3016994816, flags = 1048695, pgoff = 3016978432, inode = 0 }
+vm_state.vm_map: 13589.849191106 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3016994816, end = 3017035776, flags = 2097271, pgoff = 3016994816, inode = 0 }
+vm_state.vm_map: 13589.849193195 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3017035776, end = 3017191424, flags = 1048695, pgoff = 3017035776, inode = 0 }
+vm_state.vm_map: 13589.849195297 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3017191424, end = 3017764864, flags = 2097271, pgoff = 3017191424, inode = 0 }
+vm_state.vm_map: 13589.849197547 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3017764864, end = 3017879552, flags = 1048695, pgoff = 3017764864, inode = 0 }
+vm_state.vm_map: 13589.849199667 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3017879552, end = 3018289152, flags = 2097271, pgoff = 3017879552, inode = 0 }
+vm_state.vm_map: 13589.849201756 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3018289152, end = 3018567680, flags = 1048695, pgoff = 3018289152, inode = 0 }
+vm_state.vm_map: 13589.849204049 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3018567680, end = 3018858496, flags = 2097271, pgoff = 3018567680, inode = 0 }
+vm_state.vm_map: 13589.849206509 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3018858496, end = 3033702400, flags = 1048695, pgoff = 3018858496, inode = 0 }
+vm_state.vm_map: 13589.849208680 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3033702400, end = 3052412928, flags = 2097271, pgoff = 3033702400, inode = 0 }
+vm_state.vm_map: 13589.849211121 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3052412928, end = 3052474368, flags = 134217845, pgoff = 0, inode = 198537 }
+vm_state.vm_map: 13589.849213099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3052474368, end = 3052482560, flags = 135266419, pgoff = 57344, inode = 198537 }
+vm_state.vm_map: 13589.849215405 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3052482560, end = 3052515328, flags = 134217979, pgoff = 0, inode = 1368969 }
+vm_state.vm_map: 13589.849220406 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3052515328, end = 3052658688, flags = 134217845, pgoff = 0, inode = 198535 }
+vm_state.vm_map: 13589.849222538 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3052658688, end = 3052666880, flags = 135266419, pgoff = 143360, inode = 198535 }
+vm_state.vm_map: 13589.849224874 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3052666880, end = 3052711936, flags = 134217845, pgoff = 0, inode = 198534 }
+vm_state.vm_map: 13589.849227168 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3052711936, end = 3052716032, flags = 135266419, pgoff = 45056, inode = 198534 }
+vm_state.vm_map: 13589.849234394 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3052716032, end = 3057328128, flags = 135266421, pgoff = 0, inode = 207418 }
+vm_state.vm_map: 13589.849236440 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3057328128, end = 3057459200, flags = 135266419, pgoff = 4608000, inode = 207418 }
+vm_state.vm_map: 13589.849238505 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3057459200, end = 3061784576, flags = 1048691, pgoff = 3057459200, inode = 0 }
+vm_state.vm_map: 13589.849241113 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3061784576, end = 3062177792, flags = 134217979, pgoff = 0, inode = 917507 }
+vm_state.vm_map: 13589.849243660 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3062177792, end = 3062583296, flags = 1048691, pgoff = 3062177792, inode = 0 }
+vm_state.vm_map: 13589.849246498 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3062583296, end = 3062611968, flags = 134217845, pgoff = 0, inode = 1065218 }
+vm_state.vm_map: 13589.849248661 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3062611968, end = 3062616064, flags = 135266419, pgoff = 28672, inode = 1065218 }
+vm_state.vm_map: 13589.849251251 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3062616064, end = 3062669312, flags = 134217845, pgoff = 0, inode = 24466 }
+vm_state.vm_map: 13589.849253402 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3062669312, end = 3062673408, flags = 135266419, pgoff = 49152, inode = 24466 }
+vm_state.vm_map: 13589.849256158 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3062673408, end = 3062837248, flags = 134217845, pgoff = 0, inode = 21283 }
+vm_state.vm_map: 13589.849258316 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3062837248, end = 3062841344, flags = 135266419, pgoff = 159744, inode = 21283 }
+vm_state.vm_map: 13589.849260881 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3062841344, end = 3062870016, flags = 134217845, pgoff = 0, inode = 23696 }
+vm_state.vm_map: 13589.849263014 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3062870016, end = 3062874112, flags = 135266419, pgoff = 24576, inode = 23696 }
+vm_state.vm_map: 13589.849265585 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3062874112, end = 3062935552, flags = 134217845, pgoff = 0, inode = 1065430 }
+vm_state.vm_map: 13589.849267556 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3062935552, end = 3062939648, flags = 135266419, pgoff = 57344, inode = 1065430 }
+vm_state.vm_map: 13589.849270506 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3062939648, end = 3062968320, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.849272780 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3062968320, end = 3062972416, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.849274820 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3062972416, end = 3062976512, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.849277182 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3062976512, end = 3062980608, flags = 134217937, pgoff = 4096, inode = 536090 }
+vm_state.vm_map: 13589.849279815 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3062980608, end = 3062984704, flags = 134217937, pgoff = 757760, inode = 535131 }
+vm_state.vm_map: 13589.849282114 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3062984704, end = 3062992896, flags = 1048695, pgoff = 3062984704, inode = 0 }
+vm_state.vm_map: 13589.849284623 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3062992896, end = 3063017472, flags = 134217845, pgoff = 0, inode = 198525 }
+vm_state.vm_map: 13589.849286725 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063017472, end = 3063021568, flags = 135266419, pgoff = 24576, inode = 198525 }
+vm_state.vm_map: 13589.849289489 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063021568, end = 3063033856, flags = 134217845, pgoff = 0, inode = 87515 }
+vm_state.vm_map: 13589.849291541 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063033856, end = 3063037952, flags = 135266419, pgoff = 8192, inode = 87515 }
+vm_state.vm_map: 13589.849293951 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063037952, end = 3063070720, flags = 134217841, pgoff = 0, inode = 73897 }
+vm_state.vm_map: 13589.849296504 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063070720, end = 3063111680, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.849298674 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063111680, end = 3063115776, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.849300726 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063115776, end = 3063119872, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.849303131 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063119872, end = 3063156736, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.849305078 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063156736, end = 3063160832, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.849307253 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063160832, end = 3063164928, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.849309832 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063164928, end = 3063242752, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.849311884 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063242752, end = 3063246848, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.849313843 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063246848, end = 3063250944, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.849316012 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063250944, end = 3063259136, flags = 1048691, pgoff = 3063250944, inode = 0 }
+vm_state.vm_map: 13589.849318893 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063259136, end = 3063283712, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.849320946 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063283712, end = 3063287808, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.849322899 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063287808, end = 3063291904, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.849327721 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063291904, end = 3063296000, flags = 134217937, pgoff = 8192, inode = 536067 }
+vm_state.vm_map: 13589.849330279 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063296000, end = 3063316480, flags = 134217845, pgoff = 0, inode = 21278 }
+vm_state.vm_map: 13589.849332325 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063316480, end = 3063320576, flags = 135266419, pgoff = 16384, inode = 21278 }
+vm_state.vm_map: 13589.849334859 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063320576, end = 3063336960, flags = 134217845, pgoff = 0, inode = 20149 }
+vm_state.vm_map: 13589.849336894 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063336960, end = 3063341056, flags = 135266419, pgoff = 12288, inode = 20149 }
+vm_state.vm_map: 13589.849339280 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063341056, end = 3063357440, flags = 134217845, pgoff = 0, inode = 1065432 }
+vm_state.vm_map: 13589.849341313 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063357440, end = 3063361536, flags = 135266419, pgoff = 12288, inode = 1065432 }
+vm_state.vm_map: 13589.849343699 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063361536, end = 3063382016, flags = 134217845, pgoff = 0, inode = 314599 }
+vm_state.vm_map: 13589.849345738 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063382016, end = 3063386112, flags = 135266419, pgoff = 16384, inode = 314599 }
+vm_state.vm_map: 13589.849348118 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063386112, end = 3063525376, flags = 134217841, pgoff = 0, inode = 74520 }
+vm_state.vm_map: 13589.849350505 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063525376, end = 3063627776, flags = 134217845, pgoff = 0, inode = 21552 }
+vm_state.vm_map: 13589.849352582 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063627776, end = 3063635968, flags = 135266419, pgoff = 98304, inode = 21552 }
+vm_state.vm_map: 13589.849355357 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3063635968, end = 3067535360, flags = 134217845, pgoff = 0, inode = 21427 }
+vm_state.vm_map: 13589.849357397 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3067535360, end = 3067559936, flags = 135266419, pgoff = 3895296, inode = 21427 }
+vm_state.vm_map: 13589.849359449 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3067559936, end = 3067564032, flags = 1048691, pgoff = 3067559936, inode = 0 }
+vm_state.vm_map: 13589.849362064 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3067564032, end = 3067580416, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 13589.849364357 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3067580416, end = 3067584512, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 13589.849366786 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3067584512, end = 3067682816, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 13589.849368838 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3067682816, end = 3067686912, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 13589.849371107 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3067686912, end = 3067711488, flags = 134217845, pgoff = 0, inode = 22612 }
+vm_state.vm_map: 13589.849373394 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3067711488, end = 3067715584, flags = 135266419, pgoff = 20480, inode = 22612 }
+vm_state.vm_map: 13589.849375978 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3067715584, end = 3067727872, flags = 134217845, pgoff = 0, inode = 21323 }
+vm_state.vm_map: 13589.849378166 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3067727872, end = 3067731968, flags = 135266419, pgoff = 8192, inode = 21323 }
+vm_state.vm_map: 13589.849380664 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3067731968, end = 3067875328, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 13589.849382994 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3067875328, end = 3067879424, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 13589.849385608 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3067879424, end = 3067957248, flags = 134217845, pgoff = 0, inode = 24576 }
+vm_state.vm_map: 13589.849387765 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3067957248, end = 3067961344, flags = 135266419, pgoff = 77824, inode = 24576 }
+vm_state.vm_map: 13589.849390256 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3067961344, end = 3067994112, flags = 134217845, pgoff = 0, inode = 24194 }
+vm_state.vm_map: 13589.849392915 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3067994112, end = 3067998208, flags = 135266419, pgoff = 28672, inode = 24194 }
+vm_state.vm_map: 13589.849395338 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3067998208, end = 3068465152, flags = 134217845, pgoff = 0, inode = 23967 }
+vm_state.vm_map: 13589.849397390 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3068465152, end = 3068473344, flags = 135266419, pgoff = 462848, inode = 23967 }
+vm_state.vm_map: 13589.849399535 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3068473344, end = 3068477440, flags = 1048691, pgoff = 3068473344, inode = 0 }
+vm_state.vm_map: 13589.849402039 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3068477440, end = 3068854272, flags = 134217845, pgoff = 0, inode = 21319 }
+vm_state.vm_map: 13589.849404072 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3068854272, end = 3068862464, flags = 135266419, pgoff = 376832, inode = 21319 }
+vm_state.vm_map: 13589.849406711 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3068862464, end = 3068870656, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 13589.849408794 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3068870656, end = 3068874752, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 13589.849411459 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3068874752, end = 3069022208, flags = 134217845, pgoff = 0, inode = 20774 }
+vm_state.vm_map: 13589.849413616 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3069022208, end = 3069030400, flags = 135266419, pgoff = 143360, inode = 20774 }
+vm_state.vm_map: 13589.849416070 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3069030400, end = 3069128704, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 13589.849418227 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3069128704, end = 3069132800, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 13589.849420404 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3069132800, end = 3069136896, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 13589.849423204 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3069136896, end = 3069206528, flags = 134217845, pgoff = 0, inode = 508763 }
+vm_state.vm_map: 13589.849425249 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3069206528, end = 3069210624, flags = 135266417, pgoff = 65536, inode = 508763 }
+vm_state.vm_map: 13589.849427314 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3069210624, end = 3069214720, flags = 135266419, pgoff = 69632, inode = 508763 }
+vm_state.vm_map: 13589.849429718 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3069214720, end = 3069222912, flags = 1048691, pgoff = 3069214720, inode = 0 }
+vm_state.vm_map: 13589.849432358 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3069222912, end = 3069304832, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.849434392 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3069304832, end = 3069308928, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.849436951 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3069308928, end = 3069779968, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 13589.849439120 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3069779968, end = 3069796352, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 13589.849441692 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3069796352, end = 3069943808, flags = 134217845, pgoff = 0, inode = 22796 }
+vm_state.vm_map: 13589.849443738 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3069943808, end = 3069947904, flags = 135266419, pgoff = 147456, inode = 22796 }
+vm_state.vm_map: 13589.849446074 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3069947904, end = 3070046208, flags = 134217845, pgoff = 0, inode = 22669 }
+vm_state.vm_map: 13589.849448157 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3070046208, end = 3070050304, flags = 135266419, pgoff = 94208, inode = 22669 }
+vm_state.vm_map: 13589.849450674 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3070050304, end = 3070197760, flags = 134217845, pgoff = 0, inode = 507933 }
+vm_state.vm_map: 13589.849452620 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3070197760, end = 3070201856, flags = 135266417, pgoff = 143360, inode = 507933 }
+vm_state.vm_map: 13589.849454561 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3070201856, end = 3070205952, flags = 135266419, pgoff = 147456, inode = 507933 }
+vm_state.vm_map: 13589.849456873 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3070205952, end = 3071356928, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 13589.849458820 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3071356928, end = 3071373312, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 13589.849461108 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3071373312, end = 3071852544, flags = 134217845, pgoff = 0, inode = 21325 }
+vm_state.vm_map: 13589.849463080 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3071852544, end = 3071860736, flags = 135266419, pgoff = 479232, inode = 21325 }
+vm_state.vm_map: 13589.849466114 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3071860736, end = 3071877120, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 13589.849468055 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3071877120, end = 3071881216, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 13589.849470484 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3071881216, end = 3071889408, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 13589.849472426 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3071889408, end = 3071893504, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 13589.849474750 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3071893504, end = 3071901696, flags = 134217845, pgoff = 0, inode = 17721 }
+vm_state.vm_map: 13589.849476740 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3071901696, end = 3071905792, flags = 135266419, pgoff = 4096, inode = 17721 }
+vm_state.vm_map: 13589.849479039 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3071905792, end = 3071938560, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 13589.849480974 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3071938560, end = 3071942656, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 13589.849483311 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3071942656, end = 3071967232, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 13589.849485258 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3071967232, end = 3071971328, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 13589.849487545 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3071971328, end = 3072004096, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 13589.849489486 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3072004096, end = 3072008192, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 13589.849491909 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3072008192, end = 3072016384, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 13589.849494048 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3072016384, end = 3072020480, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 13589.849496489 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3072020480, end = 3072053248, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 13589.849498449 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3072053248, end = 3072057344, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 13589.849501094 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3072057344, end = 3072110592, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 13589.849503152 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3072110592, end = 3072114688, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 13589.849505446 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3072114688, end = 3072286720, flags = 134217845, pgoff = 0, inode = 1065255 }
+vm_state.vm_map: 13589.849507381 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3072286720, end = 3072290816, flags = 135266419, pgoff = 172032, inode = 1065255 }
+vm_state.vm_map: 13589.849509798 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3072290816, end = 3072303104, flags = 134217845, pgoff = 0, inode = 19646 }
+vm_state.vm_map: 13589.849511814 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3072303104, end = 3072307200, flags = 135266419, pgoff = 8192, inode = 19646 }
+vm_state.vm_map: 13589.849514236 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3072307200, end = 3072909312, flags = 134217845, pgoff = 0, inode = 19648 }
+vm_state.vm_map: 13589.849516387 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3072909312, end = 3072917504, flags = 135266419, pgoff = 602112, inode = 19648 }
+vm_state.vm_map: 13589.849518897 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3072917504, end = 3073187840, flags = 134217845, pgoff = 0, inode = 22793 }
+vm_state.vm_map: 13589.849520856 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3073187840, end = 3073196032, flags = 135266419, pgoff = 266240, inode = 22793 }
+vm_state.vm_map: 13589.849523354 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3073196032, end = 3073794048, flags = 134217845, pgoff = 0, inode = 22668 }
+vm_state.vm_map: 13589.849525295 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3073794048, end = 3073806336, flags = 135266419, pgoff = 593920, inode = 22668 }
+vm_state.vm_map: 13589.849527940 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3073806336, end = 3073998848, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.849530011 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3073998848, end = 3074002944, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.849532299 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3074002944, end = 3074748416, flags = 134217845, pgoff = 0, inode = 499794 }
+vm_state.vm_map: 13589.849534270 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3074748416, end = 3074752512, flags = 135266419, pgoff = 745472, inode = 499794 }
+vm_state.vm_map: 13589.849536940 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3074752512, end = 3074998272, flags = 134217845, pgoff = 0, inode = 20603 }
+vm_state.vm_map: 13589.849538881 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3074998272, end = 3075002368, flags = 135266419, pgoff = 245760, inode = 20603 }
+vm_state.vm_map: 13589.849541292 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3075002368, end = 3075010560, flags = 134217937, pgoff = 40960, inode = 535980 }
+vm_state.vm_map: 13589.849543344 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3075010560, end = 3075014656, flags = 1048691, pgoff = 3075010560, inode = 0 }
+vm_state.vm_map: 13589.849545285 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3075014656, end = 3075018752, flags = 113, pgoff = 3075014656, inode = 0 }
+vm_state.vm_map: 13589.849547727 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3075018752, end = 3075047424, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.849550038 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3075047424, end = 3075096576, flags = 134217841, pgoff = 0, inode = 74519 }
+vm_state.vm_map: 13589.849552623 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3075096576, end = 3076427776, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.849554687 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3076427776, end = 3076431872, flags = 1048691, pgoff = 3076427776, inode = 0 }
+vm_state.vm_map: 13589.849557085 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3076431872, end = 3077746688, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.849559038 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3077746688, end = 3077754880, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.849561085 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3077754880, end = 3077758976, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.849563266 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3077758976, end = 3077775360, flags = 1048691, pgoff = 3077758976, inode = 0 }
+vm_state.vm_map: 13589.849565665 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3077775360, end = 3077783552, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.849567600 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3077783552, end = 3077787648, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.849569571 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3077787648, end = 3077791744, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.849572211 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3077791744, end = 3077877760, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.849574152 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3077877760, end = 3077881856, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.849576099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3077881856, end = 3077885952, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.849578170 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3077885952, end = 3077894144, flags = 1048691, pgoff = 3077885952, inode = 0 }
+vm_state.vm_map: 13589.849580444 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3077894144, end = 3077935104, flags = 134217845, pgoff = 0, inode = 22795 }
+vm_state.vm_map: 13589.849582391 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3077935104, end = 3077939200, flags = 135266419, pgoff = 36864, inode = 22795 }
+vm_state.vm_map: 13589.849587677 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3077939200, end = 3077984256, flags = 134217845, pgoff = 0, inode = 535829 }
+vm_state.vm_map: 13589.849589822 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3077984256, end = 3077988352, flags = 135266419, pgoff = 40960, inode = 535829 }
+vm_state.vm_map: 13589.849591924 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3077988352, end = 3077996544, flags = 1048691, pgoff = 3077988352, inode = 0 }
+vm_state.vm_map: 13589.849593976 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3077996544, end = 3078000640, flags = 67371125, pgoff = 3077996544, inode = 0 }
+vm_state.vm_map: 13589.849596702 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3078000640, end = 3078115328, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.849598803 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3078115328, end = 3078119424, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.849600856 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3078119424, end = 3078123520, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.849603026 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3219558400, end = 3219570688, flags = 1048688, pgoff = 3219558400, inode = 0 }
+vm_state.vm_map: 13589.849605177 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 2806, start = 3219570688, end = 3219886080, flags = 1048951, pgoff = 3220910080, inode = 0 }
+vm_state.vm_map: 13589.849613979 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 134512640, end = 134541312, flags = 134223989, pgoff = 0, inode = 1048590 }
+vm_state.vm_map: 13589.849616167 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 134541312, end = 134545408, flags = 135272563, pgoff = 24576, inode = 1048590 }
+vm_state.vm_map: 13589.849618602 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 134545408, end = 134561792, flags = 1048691, pgoff = 134545408, inode = 0 }
+vm_state.vm_map: 13589.849620598 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 146329600, end = 146464768, flags = 1048691, pgoff = 146329600, inode = 0 }
+vm_state.vm_map: 13589.849623052 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3073552384, end = 3073581056, flags = 134217845, pgoff = 0, inode = 507930 }
+vm_state.vm_map: 13589.849625229 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3073581056, end = 3073585152, flags = 135266417, pgoff = 24576, inode = 507930 }
+vm_state.vm_map: 13589.849627355 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3073585152, end = 3073589248, flags = 135266419, pgoff = 28672, inode = 507930 }
+vm_state.vm_map: 13589.849629864 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3073589248, end = 3073675264, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.849632029 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3073675264, end = 3073679360, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.849634204 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3073679360, end = 3073683456, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.849636374 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3073683456, end = 3073691648, flags = 1048691, pgoff = 3073683456, inode = 0 }
+vm_state.vm_map: 13589.849639007 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3073691648, end = 3073916928, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.849641170 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3073916928, end = 3073921024, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.849643339 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3073921024, end = 3073925120, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.849646029 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3073925120, end = 3073961984, flags = 134217845, pgoff = 0, inode = 508755 }
+vm_state.vm_map: 13589.849648557 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3073961984, end = 3073966080, flags = 135266417, pgoff = 32768, inode = 508755 }
+vm_state.vm_map: 13589.849650733 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3073966080, end = 3073970176, flags = 135266419, pgoff = 36864, inode = 508755 }
+vm_state.vm_map: 13589.849652952 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3073970176, end = 3074129920, flags = 1048691, pgoff = 3073970176, inode = 0 }
+vm_state.vm_map: 13589.849655592 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3074129920, end = 3074179072, flags = 134217845, pgoff = 0, inode = 500088 }
+vm_state.vm_map: 13589.849657563 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3074179072, end = 3074183168, flags = 135266419, pgoff = 45056, inode = 500088 }
+vm_state.vm_map: 13589.849659523 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3074183168, end = 3074232320, flags = 1048691, pgoff = 3074183168, inode = 0 }
+vm_state.vm_map: 13589.849661847 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3074232320, end = 3074330624, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 13589.849663937 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3074330624, end = 3074334720, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 13589.849666020 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3074334720, end = 3074338816, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 13589.849668659 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3074392064, end = 3074428928, flags = 134217845, pgoff = 0, inode = 499730 }
+vm_state.vm_map: 13589.849670760 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3074428928, end = 3074433024, flags = 135266419, pgoff = 32768, inode = 499730 }
+vm_state.vm_map: 13589.849673152 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3074433024, end = 3074473984, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.849675397 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3074473984, end = 3074478080, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.849677436 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3074478080, end = 3074482176, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.849679674 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3074482176, end = 3074519040, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.849681751 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3074519040, end = 3074523136, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.849687129 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3074523136, end = 3074527232, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.849689298 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3074527232, end = 3074605056, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.849691301 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3074605056, end = 3074609152, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.849693359 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3074609152, end = 3074613248, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.849695449 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3074613248, end = 3074621440, flags = 1048691, pgoff = 3074613248, inode = 0 }
+vm_state.vm_map: 13589.849697699 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3074621440, end = 3074646016, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.849699763 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3074646016, end = 3074650112, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.849701809 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3074650112, end = 3074654208, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.849703948 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3074654208, end = 3075985408, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.849705889 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3075985408, end = 3075989504, flags = 1048691, pgoff = 3075985408, inode = 0 }
+vm_state.vm_map: 13589.849707954 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3075989504, end = 3075997696, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.849710018 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3075997696, end = 3076001792, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.849711965 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3076001792, end = 3076005888, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.849714042 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3076005888, end = 3077320704, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.849716013 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3077320704, end = 3077328896, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.849718419 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3077328896, end = 3077332992, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.849720495 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3077332992, end = 3077349376, flags = 1048691, pgoff = 3077332992, inode = 0 }
+vm_state.vm_map: 13589.849725434 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3077349376, end = 3077357568, flags = 134217845, pgoff = 0, inode = 499739 }
+vm_state.vm_map: 13589.849727499 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3077357568, end = 3077361664, flags = 135266419, pgoff = 4096, inode = 499739 }
+vm_state.vm_map: 13589.849730138 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3077361664, end = 3077402624, flags = 134217845, pgoff = 0, inode = 499738 }
+vm_state.vm_map: 13589.849732092 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3077402624, end = 3077406720, flags = 135266419, pgoff = 40960, inode = 499738 }
+vm_state.vm_map: 13589.849734577 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3077414912, end = 3077423104, flags = 134217845, pgoff = 0, inode = 17167 }
+vm_state.vm_map: 13589.849736629 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3077423104, end = 3077427200, flags = 135266419, pgoff = 8192, inode = 17167 }
+vm_state.vm_map: 13589.849738916 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3077427200, end = 3077435392, flags = 134217845, pgoff = 0, inode = 499908 }
+vm_state.vm_map: 13589.849740993 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3077435392, end = 3077439488, flags = 135266419, pgoff = 4096, inode = 499908 }
+vm_state.vm_map: 13589.849743484 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3077439488, end = 3077443584, flags = 134217845, pgoff = 0, inode = 500082 }
+vm_state.vm_map: 13589.849745425 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3077443584, end = 3077447680, flags = 135266419, pgoff = 0, inode = 500082 }
+vm_state.vm_map: 13589.849747793 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3077447680, end = 3077451776, flags = 134217845, pgoff = 0, inode = 499797 }
+vm_state.vm_map: 13589.849749937 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3077451776, end = 3077455872, flags = 135266419, pgoff = 0, inode = 499797 }
+vm_state.vm_map: 13589.849755334 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3077459968, end = 3077468160, flags = 134217845, pgoff = 0, inode = 500086 }
+vm_state.vm_map: 13589.849757386 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3077468160, end = 3077472256, flags = 135266419, pgoff = 4096, inode = 500086 }
+vm_state.vm_map: 13589.849760013 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3077472256, end = 3077484544, flags = 134217845, pgoff = 0, inode = 500089 }
+vm_state.vm_map: 13589.849762170 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3077484544, end = 3077488640, flags = 135266419, pgoff = 8192, inode = 500089 }
+vm_state.vm_map: 13589.849764520 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3077488640, end = 3077492736, flags = 134217845, pgoff = 0, inode = 499772 }
+vm_state.vm_map: 13589.849766701 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3077492736, end = 3077496832, flags = 135266419, pgoff = 0, inode = 499772 }
+vm_state.vm_map: 13589.849768865 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3077500928, end = 3077509120, flags = 1048691, pgoff = 3077500928, inode = 0 }
+vm_state.vm_map: 13589.849770836 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3077509120, end = 3077513216, flags = 67371125, pgoff = 3077509120, inode = 0 }
+vm_state.vm_map: 13589.849772944 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3077513216, end = 3077627904, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.849775003 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3077627904, end = 3077632000, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.849776955 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3077632000, end = 3077636096, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.849778910 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11121, start = 3216674816, end = 3216760832, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.849782056 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 134512640, end = 135290880, flags = 134223989, pgoff = 0, inode = 1048644 }
+vm_state.vm_map: 13589.849784121 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 135290880, end = 135311360, flags = 135272563, pgoff = 778240, inode = 1048644 }
+vm_state.vm_map: 13589.849786191 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 135311360, end = 135331840, flags = 1048691, pgoff = 135311360, inode = 0 }
+vm_state.vm_map: 13589.849788132 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 165994496, end = 166264832, flags = 1048691, pgoff = 165994496, inode = 0 }
+vm_state.vm_map: 13589.849790555 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3074707456, end = 3074748416, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.849792613 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3074748416, end = 3074752512, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.849794678 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3074752512, end = 3074756608, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.849796971 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3074756608, end = 3074793472, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.849798943 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3074793472, end = 3074797568, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.849801026 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3074797568, end = 3074801664, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.849803115 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3074801664, end = 3074879488, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.849805180 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3074879488, end = 3074883584, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.849807128 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3074883584, end = 3074887680, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.849809075 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3074887680, end = 3074895872, flags = 1048691, pgoff = 3074887680, inode = 0 }
+vm_state.vm_map: 13589.849811157 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3074895872, end = 3074920448, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.849813234 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3074920448, end = 3074924544, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.849815181 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3074924544, end = 3074928640, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.849817432 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3074928640, end = 3076259840, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.849819614 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3076259840, end = 3076263936, flags = 1048691, pgoff = 3076259840, inode = 0 }
+vm_state.vm_map: 13589.849821950 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3076263936, end = 3077578752, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.849824354 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3077578752, end = 3077586944, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.849826308 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3077586944, end = 3077591040, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.849828367 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3077591040, end = 3077607424, flags = 1048691, pgoff = 3077591040, inode = 0 }
+vm_state.vm_map: 13589.849830579 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3077607424, end = 3077615616, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.849832557 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3077615616, end = 3077619712, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.849834492 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3077619712, end = 3077623808, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.849837021 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3077623808, end = 3077840896, flags = 134217845, pgoff = 0, inode = 499784 }
+vm_state.vm_map: 13589.849838968 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3077840896, end = 3077853184, flags = 135266419, pgoff = 217088, inode = 499784 }
+vm_state.vm_map: 13589.849841180 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3077918720, end = 3077947392, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.849843127 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3077947392, end = 3077955584, flags = 1048691, pgoff = 3077947392, inode = 0 }
+vm_state.vm_map: 13589.849845074 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3077955584, end = 3077959680, flags = 67371125, pgoff = 3077955584, inode = 0 }
+vm_state.vm_map: 13589.849847276 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3077959680, end = 3078074368, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.849849334 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3078074368, end = 3078078464, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.849851565 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3078078464, end = 3078082560, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.849853734 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11130, start = 3214569472, end = 3214655488, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.849856244 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 134512640, end = 135290880, flags = 134223989, pgoff = 0, inode = 1048644 }
+vm_state.vm_map: 13589.849858668 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 135290880, end = 135311360, flags = 135272563, pgoff = 778240, inode = 1048644 }
+vm_state.vm_map: 13589.849860627 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 135311360, end = 135331840, flags = 1048691, pgoff = 135311360, inode = 0 }
+vm_state.vm_map: 13589.849862698 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 158515200, end = 159387648, flags = 1048691, pgoff = 158515200, inode = 0 }
+vm_state.vm_map: 13589.849865046 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3075555328, end = 3075596288, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.849867136 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3075596288, end = 3075600384, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.849869194 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3075600384, end = 3075604480, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.849871488 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3075604480, end = 3075641344, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.849873428 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3075641344, end = 3075645440, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.849875456 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3075645440, end = 3075649536, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.849877638 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3075649536, end = 3075727360, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.849879703 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3075727360, end = 3075731456, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.849881637 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3075731456, end = 3075735552, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.849883683 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3075735552, end = 3075743744, flags = 1048691, pgoff = 3075735552, inode = 0 }
+vm_state.vm_map: 13589.849885890 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3075743744, end = 3075768320, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.849887838 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3075768320, end = 3075772416, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.849889902 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3075772416, end = 3075776512, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.849892312 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3075776512, end = 3077107712, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.849894507 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3077107712, end = 3077111808, flags = 1048691, pgoff = 3077107712, inode = 0 }
+vm_state.vm_map: 13589.849896559 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3077111808, end = 3078426624, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.849898507 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3078426624, end = 3078434816, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.849900534 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3078434816, end = 3078438912, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.849902524 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3078438912, end = 3078455296, flags = 1048691, pgoff = 3078438912, inode = 0 }
+vm_state.vm_map: 13589.849904607 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3078455296, end = 3078463488, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.849906554 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3078463488, end = 3078467584, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.849908508 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3078467584, end = 3078471680, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.849910702 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3078471680, end = 3078688768, flags = 134217845, pgoff = 0, inode = 499784 }
+vm_state.vm_map: 13589.849912637 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3078688768, end = 3078701056, flags = 135266419, pgoff = 217088, inode = 499784 }
+vm_state.vm_map: 13589.849914707 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3078766592, end = 3078795264, flags = 134217937, pgoff = 0, inode = 20522 }
+vm_state.vm_map: 13589.849916654 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3078795264, end = 3078803456, flags = 1048691, pgoff = 3078795264, inode = 0 }
+vm_state.vm_map: 13589.849918602 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3078803456, end = 3078807552, flags = 67371125, pgoff = 3078803456, inode = 0 }
+vm_state.vm_map: 13589.849920673 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3078807552, end = 3078922240, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.849922620 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3078922240, end = 3078926336, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.849924907 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3078926336, end = 3078930432, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.849927119 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11317, start = 3215605760, end = 3215691776, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.849929790 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3073204224, end = 3073224704, flags = 134217845, pgoff = 0, inode = 508634 }
+vm_state.vm_map: 13589.849931855 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3073224704, end = 3073228800, flags = 135266417, pgoff = 16384, inode = 508634 }
+vm_state.vm_map: 13589.849933826 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3073228800, end = 3073232896, flags = 135266419, pgoff = 20480, inode = 508634 }
+vm_state.vm_map: 13589.849936002 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3073232896, end = 3073273856, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.849937944 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3073273856, end = 3073277952, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.849940008 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3073277952, end = 3073282048, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.849942097 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3073282048, end = 3073318912, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.849944038 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3073318912, end = 3073323008, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.849946109 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3073323008, end = 3073327104, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.849948383 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3073327104, end = 3073351680, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.849950331 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3073351680, end = 3073355776, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.849952272 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3073355776, end = 3073359872, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.849954330 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3073359872, end = 3073368064, flags = 1048691, pgoff = 3073359872, inode = 0 }
+vm_state.vm_map: 13589.849956394 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3073368064, end = 3073454080, flags = 134217845, pgoff = 0, inode = 507929 }
+vm_state.vm_map: 13589.849958682 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3073454080, end = 3073458176, flags = 135266417, pgoff = 81920, inode = 507929 }
+vm_state.vm_map: 13589.849960771 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3073458176, end = 3073462272, flags = 135266419, pgoff = 86016, inode = 507929 }
+vm_state.vm_map: 13589.849962712 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3073462272, end = 3073470464, flags = 1048691, pgoff = 3073462272, inode = 0 }
+vm_state.vm_map: 13589.849965024 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3073470464, end = 3073478656, flags = 134217845, pgoff = 0, inode = 500018 }
+vm_state.vm_map: 13589.849966995 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3073478656, end = 3073482752, flags = 135266419, pgoff = 4096, inode = 500018 }
+vm_state.vm_map: 13589.849968937 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3073482752, end = 3073486848, flags = 1048691, pgoff = 3073482752, inode = 0 }
+vm_state.vm_map: 13589.849971218 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3073486848, end = 3073511424, flags = 134217845, pgoff = 0, inode = 18679 }
+vm_state.vm_map: 13589.849973165 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3073511424, end = 3073515520, flags = 135266419, pgoff = 20480, inode = 18679 }
+vm_state.vm_map: 13589.849975229 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3073515520, end = 3073523712, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.849977170 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3073523712, end = 3073527808, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.849979118 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3073527808, end = 3073531904, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.849981534 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3073531904, end = 3074846720, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.849983574 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3074846720, end = 3074854912, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.849985515 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3074854912, end = 3074859008, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.849987573 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3074859008, end = 3074871296, flags = 1048691, pgoff = 3074859008, inode = 0 }
+vm_state.vm_map: 13589.849990077 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3074871296, end = 3074879488, flags = 134217845, pgoff = 0, inode = 499720 }
+vm_state.vm_map: 13589.849992481 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3074879488, end = 3074883584, flags = 135266419, pgoff = 4096, inode = 499720 }
+vm_state.vm_map: 13589.849995077 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3074883584, end = 3075047424, flags = 134217845, pgoff = 0, inode = 18646 }
+vm_state.vm_map: 13589.849997137 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3075047424, end = 3075051520, flags = 135266419, pgoff = 163840, inode = 18646 }
+vm_state.vm_map: 13589.849999195 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3075051520, end = 3075055616, flags = 1048691, pgoff = 3075051520, inode = 0 }
+vm_state.vm_map: 13589.850001809 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3075055616, end = 3075719168, flags = 134217845, pgoff = 0, inode = 18913 }
+vm_state.vm_map: 13589.850003855 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3075719168, end = 3075743744, flags = 135266419, pgoff = 659456, inode = 18913 }
+vm_state.vm_map: 13589.850006204 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3075743744, end = 3075907584, flags = 134217845, pgoff = 0, inode = 18977 }
+vm_state.vm_map: 13589.850008256 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3075907584, end = 3075911680, flags = 135266419, pgoff = 163840, inode = 18977 }
+vm_state.vm_map: 13589.850010326 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3075911680, end = 3075948544, flags = 134217845, pgoff = 0, inode = 508755 }
+vm_state.vm_map: 13589.850012274 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3075948544, end = 3075952640, flags = 135266417, pgoff = 32768, inode = 508755 }
+vm_state.vm_map: 13589.850014339 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3075952640, end = 3075956736, flags = 135266419, pgoff = 36864, inode = 508755 }
+vm_state.vm_map: 13589.850016273 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3075956736, end = 3076116480, flags = 1048691, pgoff = 3075956736, inode = 0 }
+vm_state.vm_map: 13589.850018487 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3076116480, end = 3076194304, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.850020428 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3076194304, end = 3076198400, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.850022480 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3076198400, end = 3076202496, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.850024414 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3076202496, end = 3076210688, flags = 1048691, pgoff = 3076202496, inode = 0 }
+vm_state.vm_map: 13589.850026831 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3076210688, end = 3076292608, flags = 134217845, pgoff = 0, inode = 1065249 }
+vm_state.vm_map: 13589.850028914 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3076292608, end = 3076296704, flags = 135266419, pgoff = 77824, inode = 1065249 }
+vm_state.vm_map: 13589.850031301 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3076296704, end = 3076304896, flags = 134217845, pgoff = 0, inode = 508751 }
+vm_state.vm_map: 13589.850033254 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3076304896, end = 3076308992, flags = 135266417, pgoff = 4096, inode = 508751 }
+vm_state.vm_map: 13589.850035367 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3076308992, end = 3076313088, flags = 135266419, pgoff = 8192, inode = 508751 }
+vm_state.vm_map: 13589.850037302 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3076313088, end = 3076317184, flags = 1048691, pgoff = 3076313088, inode = 0 }
+vm_state.vm_map: 13589.850039583 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3076317184, end = 3077619712, flags = 134217845, pgoff = 0, inode = 33850 }
+vm_state.vm_map: 13589.850041531 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3077619712, end = 3077713920, flags = 135266419, pgoff = 1302528, inode = 33850 }
+vm_state.vm_map: 13589.850043465 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3077713920, end = 3077726208, flags = 1048691, pgoff = 3077713920, inode = 0 }
+vm_state.vm_map: 13589.850045690 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3077726208, end = 3077795840, flags = 134217845, pgoff = 0, inode = 508763 }
+vm_state.vm_map: 13589.850047625 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3077795840, end = 3077799936, flags = 135266417, pgoff = 65536, inode = 508763 }
+vm_state.vm_map: 13589.850049709 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3077799936, end = 3077804032, flags = 135266419, pgoff = 69632, inode = 508763 }
+vm_state.vm_map: 13589.850051650 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3077804032, end = 3077812224, flags = 1048691, pgoff = 3077804032, inode = 0 }
+vm_state.vm_map: 13589.850053590 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3077906432, end = 3077914624, flags = 1048691, pgoff = 3077906432, inode = 0 }
+vm_state.vm_map: 13589.850055525 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3077914624, end = 3077918720, flags = 67371125, pgoff = 3077914624, inode = 0 }
+vm_state.vm_map: 13589.850057595 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3077918720, end = 3078033408, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.850059889 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3078033408, end = 3078037504, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.850061972 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3078037504, end = 3078041600, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.850090017 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3078041600, end = 3078369280, flags = 134223989, pgoff = 0, inode = 22406 }
+vm_state.vm_map: 13589.850092310 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3078369280, end = 3078373376, flags = 135272563, pgoff = 323584, inode = 22406 }
+vm_state.vm_map: 13589.850094517 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3078373376, end = 3078389760, flags = 1048691, pgoff = 3078373376, inode = 0 }
+vm_state.vm_map: 13589.850096594 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3087708160, end = 3087982592, flags = 1048691, pgoff = 3087708160, inode = 0 }
+vm_state.vm_map: 13589.850098652 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 11325, start = 3219963904, end = 3220049920, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.850106360 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 134512640, end = 134631424, flags = 134223989, pgoff = 0, inode = 409694 }
+vm_state.vm_map: 13589.850108542 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 134631424, end = 134635520, flags = 135272563, pgoff = 118784, inode = 409694 }
+vm_state.vm_map: 13589.850110589 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 167378944, end = 167583744, flags = 1048691, pgoff = 167378944, inode = 0 }
+vm_state.vm_map: 13589.850112752 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3075694592, end = 3075817472, flags = 1048691, pgoff = 3075694592, inode = 0 }
+vm_state.vm_map: 13589.850115348 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3075895296, end = 3075936256, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 13589.850117530 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3075936256, end = 3075940352, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 13589.850119644 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3075940352, end = 3075944448, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 13589.850122272 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3075944448, end = 3076022272, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 13589.850124620 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3076022272, end = 3076026368, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 13589.850126901 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3076026368, end = 3076030464, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 13589.850129052 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3076030464, end = 3076038656, flags = 1048691, pgoff = 3076030464, inode = 0 }
+vm_state.vm_map: 13589.850131198 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3076132864, end = 3076136960, flags = 1048691, pgoff = 3076132864, inode = 0 }
+vm_state.vm_map: 13589.850133874 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3076136960, end = 3076145152, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 13589.850136148 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3076145152, end = 3076149248, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 13589.850138299 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3076149248, end = 3076153344, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 13589.850140580 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3076153344, end = 3076157440, flags = 1048691, pgoff = 3076153344, inode = 0 }
+vm_state.vm_map: 13589.850143103 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3076157440, end = 3077472256, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 13589.850145470 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3077472256, end = 3077480448, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 13589.850147578 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3077480448, end = 3077484544, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 13589.850149728 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3077484544, end = 3077496832, flags = 1048691, pgoff = 3077484544, inode = 0 }
+vm_state.vm_map: 13589.850152016 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3077496832, end = 3077595136, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 13589.850154322 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3077595136, end = 3077599232, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 13589.850156386 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3077599232, end = 3077603328, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 13589.850159155 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3077615616, end = 3077652480, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 13589.850161468 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3077652480, end = 3077656576, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 13589.850163872 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3077656576, end = 3077660672, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 13589.850170516 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3077660672, end = 3077685248, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 13589.850172681 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3077685248, end = 3077689344, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 13589.850174813 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3077689344, end = 3077693440, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 13589.850177044 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3077693440, end = 3077705728, flags = 1048691, pgoff = 3077693440, inode = 0 }
+vm_state.vm_map: 13589.850179233 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3077705728, end = 3077709824, flags = 67371125, pgoff = 3077705728, inode = 0 }
+vm_state.vm_map: 13589.850182242 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3077709824, end = 3077824512, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 13589.850184450 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3077824512, end = 3077828608, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 13589.850186631 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3077828608, end = 3077832704, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 13589.850188733 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 18054, start = 3216945152, end = 3217031168, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.850194655 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 134512640, end = 135254016, flags = 134223989, pgoff = 0, inode = 20038 }
+vm_state.vm_map: 13589.850196960 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 135254016, end = 135270400, flags = 135272563, pgoff = 741376, inode = 20038 }
+vm_state.vm_map: 13589.850199118 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 135270400, end = 135282688, flags = 1048691, pgoff = 135270400, inode = 0 }
+vm_state.vm_map: 13589.850201628 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 168751104, end = 168886272, flags = 1048691, pgoff = 168751104, inode = 0 }
+vm_state.vm_map: 13589.850204051 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3073126400, end = 3073167360, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 13589.850206214 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3073167360, end = 3073171456, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 13589.850208383 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3073171456, end = 3073175552, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 13589.850210590 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3073175552, end = 3073212416, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 13589.850212785 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3073212416, end = 3073216512, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 13589.850215016 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3073216512, end = 3073220608, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 13589.850217353 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3073220608, end = 3073245184, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 13589.850219510 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3073245184, end = 3073249280, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 13589.850221710 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3073249280, end = 3073253376, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 13589.850223967 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3073253376, end = 3073257472, flags = 1048691, pgoff = 3073253376, inode = 0 }
+vm_state.vm_map: 13589.850226625 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3073257472, end = 3073269760, flags = 134217845, pgoff = 0, inode = 20765 }
+vm_state.vm_map: 13589.850228794 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3073269760, end = 3073273856, flags = 135266419, pgoff = 8192, inode = 20765 }
+vm_state.vm_map: 13589.850230890 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3073273856, end = 3073277952, flags = 1048691, pgoff = 3073273856, inode = 0 }
+vm_state.vm_map: 13589.850233456 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3073277952, end = 3073740800, flags = 134217845, pgoff = 0, inode = 20061 }
+vm_state.vm_map: 13589.850235495 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3073740800, end = 3073753088, flags = 135266419, pgoff = 458752, inode = 20061 }
+vm_state.vm_map: 13589.850241757 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3073753088, end = 3073830912, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 13589.850243952 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3073830912, end = 3073835008, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 13589.850246708 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3073835008, end = 3073896448, flags = 134217845, pgoff = 0, inode = 19423 }
+vm_state.vm_map: 13589.850248896 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3073896448, end = 3073900544, flags = 135266419, pgoff = 57344, inode = 19423 }
+vm_state.vm_map: 13589.850251288 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3073900544, end = 3073986560, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 13589.850253341 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3073986560, end = 3073990656, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 13589.850255510 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3073990656, end = 3073994752, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 13589.850257698 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3073994752, end = 3074002944, flags = 1048691, pgoff = 3073994752, inode = 0 }
+vm_state.vm_map: 13589.850259868 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3074002944, end = 3075317760, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 13589.850261976 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3075317760, end = 3075325952, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 13589.850264195 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3075325952, end = 3075330048, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 13589.850266359 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3075330048, end = 3075346432, flags = 1048691, pgoff = 3075330048, inode = 0 }
+vm_state.vm_map: 13589.850268800 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3075346432, end = 3075538944, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.850271187 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3075538944, end = 3075543040, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.850273845 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3075543040, end = 3076149248, flags = 134217845, pgoff = 0, inode = 22471 }
+vm_state.vm_map: 13589.850276521 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3076149248, end = 3076165632, flags = 135266419, pgoff = 602112, inode = 22471 }
+vm_state.vm_map: 13589.850284742 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3076165632, end = 3077619712, flags = 134217845, pgoff = 0, inode = 17110 }
+vm_state.vm_map: 13589.850286893 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3077619712, end = 3077632000, flags = 135266419, pgoff = 1454080, inode = 17110 }
+vm_state.vm_map: 13589.850289155 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3077632000, end = 3077640192, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 13589.850291232 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3077640192, end = 3077644288, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 13589.850293389 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3077644288, end = 3077648384, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 13589.850295875 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3077648384, end = 3077795840, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 13589.850297970 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3077795840, end = 3077799936, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 13589.850300269 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3077799936, end = 3077804032, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 13589.850305165 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3077804032, end = 3077840896, flags = 134217845, pgoff = 0, inode = 508391 }
+vm_state.vm_map: 13589.850307329 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3077840896, end = 3077844992, flags = 135266417, pgoff = 32768, inode = 508391 }
+vm_state.vm_map: 13589.850309486 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3077844992, end = 3077849088, flags = 135266419, pgoff = 36864, inode = 508391 }
+vm_state.vm_map: 13589.850311476 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3077849088, end = 3078012928, flags = 1048691, pgoff = 3077849088, inode = 0 }
+vm_state.vm_map: 13589.850314048 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3078012928, end = 3078090752, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 13589.850316088 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3078090752, end = 3078094848, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 13589.850318134 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3078094848, end = 3078098944, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 13589.850320291 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3078098944, end = 3078107136, flags = 1048691, pgoff = 3078098944, inode = 0 }
+vm_state.vm_map: 13589.850322769 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3078107136, end = 3078176768, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 13589.850324815 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3078176768, end = 3078180864, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 13589.850326775 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3078180864, end = 3078184960, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 13589.850328951 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3078184960, end = 3078193152, flags = 1048691, pgoff = 3078184960, inode = 0 }
+vm_state.vm_map: 13589.850331293 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3078254592, end = 3078275072, flags = 134217845, pgoff = 0, inode = 508374 }
+vm_state.vm_map: 13589.850333586 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3078275072, end = 3078279168, flags = 135266417, pgoff = 16384, inode = 508374 }
+vm_state.vm_map: 13589.850335751 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3078279168, end = 3078283264, flags = 135266419, pgoff = 20480, inode = 508374 }
+vm_state.vm_map: 13589.850337871 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3078287360, end = 3078295552, flags = 1048691, pgoff = 3078287360, inode = 0 }
+vm_state.vm_map: 13589.850339947 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3078295552, end = 3078299648, flags = 67371125, pgoff = 3078295552, inode = 0 }
+vm_state.vm_map: 13589.850342352 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3078299648, end = 3078414336, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 13589.850344312 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3078414336, end = 3078418432, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 13589.850346389 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3078418432, end = 3078422528, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 13589.850348744 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 21983, start = 3215204352, end = 3215745024, flags = 1048947, pgoff = 3220684800, inode = 0 }
+vm_state.vm_map: 13589.850351667 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3074174976, end = 3074215936, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 13589.850353807 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3074215936, end = 3074220032, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 13589.850355989 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3074220032, end = 3074224128, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 13589.850358455 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3074224128, end = 3074260992, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 13589.850360587 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3074260992, end = 3074265088, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 13589.850362701 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3074265088, end = 3074269184, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 13589.850364779 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3074269184, end = 3074293760, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 13589.850366849 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3074293760, end = 3074297856, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 13589.850368932 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3074297856, end = 3074301952, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 13589.850370879 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3074301952, end = 3074310144, flags = 1048691, pgoff = 3074301952, inode = 0 }
+vm_state.vm_map: 13589.850373116 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3074310144, end = 3074396160, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 13589.850375305 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3074396160, end = 3074400256, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 13589.850377246 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3074400256, end = 3074404352, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 13589.850379317 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3074404352, end = 3074412544, flags = 1048691, pgoff = 3074404352, inode = 0 }
+vm_state.vm_map: 13589.850381523 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3074412544, end = 3074420736, flags = 134217845, pgoff = 0, inode = 500018 }
+vm_state.vm_map: 13589.850383940 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3074420736, end = 3074424832, flags = 135266419, pgoff = 4096, inode = 500018 }
+vm_state.vm_map: 13589.850389133 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3074424832, end = 3074449408, flags = 134217845, pgoff = 0, inode = 19420 }
+vm_state.vm_map: 13589.850391209 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3074449408, end = 3074453504, flags = 135266419, pgoff = 20480, inode = 19420 }
+vm_state.vm_map: 13589.850393658 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3074453504, end = 3075768320, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 13589.850395604 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3075768320, end = 3075776512, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 13589.850397669 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3075776512, end = 3075780608, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 13589.850399789 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3075780608, end = 3075792896, flags = 1048691, pgoff = 3075780608, inode = 0 }
+vm_state.vm_map: 13589.850402021 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3075792896, end = 3075801088, flags = 134217845, pgoff = 0, inode = 499720 }
+vm_state.vm_map: 13589.850404080 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3075801088, end = 3075805184, flags = 135266419, pgoff = 4096, inode = 499720 }
+vm_state.vm_map: 13589.850406175 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3075805184, end = 3075809280, flags = 1048691, pgoff = 3075805184, inode = 0 }
+vm_state.vm_map: 13589.850416090 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3075809280, end = 3075969024, flags = 134217845, pgoff = 0, inode = 18680 }
+vm_state.vm_map: 13589.850418408 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3075969024, end = 3075973120, flags = 135266419, pgoff = 159744, inode = 18680 }
+vm_state.vm_map: 13589.850426629 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3075973120, end = 3076632576, flags = 134217845, pgoff = 0, inode = 19419 }
+vm_state.vm_map: 13589.850428879 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3076632576, end = 3076657152, flags = 135266419, pgoff = 659456, inode = 19419 }
+vm_state.vm_map: 13589.850437471 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3076657152, end = 3076820992, flags = 134217845, pgoff = 0, inode = 17950 }
+vm_state.vm_map: 13589.850439523 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3076820992, end = 3076825088, flags = 135266419, pgoff = 163840, inode = 17950 }
+vm_state.vm_map: 13589.850441946 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3076825088, end = 3076861952, flags = 134217845, pgoff = 0, inode = 508391 }
+vm_state.vm_map: 13589.850444060 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3076861952, end = 3076866048, flags = 135266417, pgoff = 32768, inode = 508391 }
+vm_state.vm_map: 13589.850446008 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3076866048, end = 3076870144, flags = 135266419, pgoff = 36864, inode = 508391 }
+vm_state.vm_map: 13589.850447955 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3076870144, end = 3077029888, flags = 1048691, pgoff = 3076870144, inode = 0 }
+vm_state.vm_map: 13589.850450031 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3077029888, end = 3077107712, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 13589.850451978 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3077107712, end = 3077111808, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 13589.850453925 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3077111808, end = 3077115904, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 13589.850456009 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3077115904, end = 3077124096, flags = 1048691, pgoff = 3077115904, inode = 0 }
+vm_state.vm_map: 13589.850458111 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3077124096, end = 3077201920, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 13589.850460509 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3077201920, end = 3077206016, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 13589.850462449 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3077206016, end = 3077210112, flags = 1048691, pgoff = 3077206016, inode = 0 }
+vm_state.vm_map: 13589.850464873 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3077210112, end = 3077218304, flags = 134217845, pgoff = 0, inode = 508383 }
+vm_state.vm_map: 13589.850466807 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3077218304, end = 3077222400, flags = 135266417, pgoff = 4096, inode = 508383 }
+vm_state.vm_map: 13589.850468878 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3077222400, end = 3077226496, flags = 135266419, pgoff = 8192, inode = 508383 }
+vm_state.vm_map: 13589.850471153 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3077226496, end = 3078529024, flags = 134217845, pgoff = 0, inode = 33850 }
+vm_state.vm_map: 13589.850473218 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3078529024, end = 3078623232, flags = 135266419, pgoff = 1302528, inode = 33850 }
+vm_state.vm_map: 13589.850475277 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3078623232, end = 3078635520, flags = 1048691, pgoff = 3078623232, inode = 0 }
+vm_state.vm_map: 13589.850477607 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3078635520, end = 3078705152, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 13589.850479547 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3078705152, end = 3078709248, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 13589.850481612 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3078709248, end = 3078713344, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 13589.850483664 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3078713344, end = 3078721536, flags = 1048691, pgoff = 3078713344, inode = 0 }
+vm_state.vm_map: 13589.850485907 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3078721536, end = 3078819840, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 13589.850487849 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3078819840, end = 3078823936, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 13589.850489920 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3078823936, end = 3078828032, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 13589.850491990 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3078828032, end = 3078836224, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 13589.850494283 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3078836224, end = 3078840320, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 13589.850496348 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3078840320, end = 3078844416, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 13589.850498425 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3078844416, end = 3078848512, flags = 1048691, pgoff = 3078844416, inode = 0 }
+vm_state.vm_map: 13589.850500570 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3078848512, end = 3078889472, flags = 134217845, pgoff = 0, inode = 499738 }
+vm_state.vm_map: 13589.850502616 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3078889472, end = 3078893568, flags = 135266419, pgoff = 40960, inode = 499738 }
+vm_state.vm_map: 13589.850504940 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3078893568, end = 3078922240, flags = 134217845, pgoff = 0, inode = 499851 }
+vm_state.vm_map: 13589.850506888 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3078922240, end = 3078926336, flags = 135266419, pgoff = 28672, inode = 499851 }
+vm_state.vm_map: 13589.850508829 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3079020544, end = 3079028736, flags = 1048691, pgoff = 3079020544, inode = 0 }
+vm_state.vm_map: 13589.850510776 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3079028736, end = 3079032832, flags = 67371125, pgoff = 3079028736, inode = 0 }
+vm_state.vm_map: 13589.850512846 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3079032832, end = 3079147520, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 13589.850514781 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3079147520, end = 3079151616, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 13589.850516839 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3079151616, end = 3079155712, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 13589.850525122 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3079155712, end = 3079565312, flags = 134223989, pgoff = 0, inode = 18427 }
+vm_state.vm_map: 13589.850527360 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3079569408, end = 3079573504, flags = 135272561, pgoff = 409600, inode = 18427 }
+vm_state.vm_map: 13589.850529864 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3079573504, end = 3079577600, flags = 135272563, pgoff = 413696, inode = 18427 }
+vm_state.vm_map: 13589.850531916 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3079577600, end = 3079598080, flags = 1048691, pgoff = 3079577600, inode = 0 }
+vm_state.vm_map: 13589.850533968 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3089727488, end = 3089862656, flags = 1048691, pgoff = 3089727488, inode = 0 }
+vm_state.vm_map: 13589.850536001 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24399, start = 3219390464, end = 3219476480, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.850541348 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24464, start = 134512640, end = 134545408, flags = 134223989, pgoff = 0, inode = 19558 }
+vm_state.vm_map: 13589.850543413 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24464, start = 134545408, end = 134549504, flags = 135272563, pgoff = 32768, inode = 19558 }
+vm_state.vm_map: 13589.850545595 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24464, start = 134549504, end = 134553600, flags = 1048691, pgoff = 134549504, inode = 0 }
+vm_state.vm_map: 13589.850547690 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24464, start = 149254144, end = 149389312, flags = 1048691, pgoff = 149254144, inode = 0 }
+vm_state.vm_map: 13589.850549749 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24464, start = 3076616192, end = 3076620288, flags = 1048691, pgoff = 3076616192, inode = 0 }
+vm_state.vm_map: 13589.850551974 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24464, start = 3076620288, end = 3077935104, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 13589.850554051 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24464, start = 3077935104, end = 3077943296, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 13589.850556115 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24464, start = 3077943296, end = 3077947392, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 13589.850558174 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24464, start = 3077947392, end = 3077959680, flags = 1048691, pgoff = 3077947392, inode = 0 }
+vm_state.vm_map: 13589.850560233 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24464, start = 3078053888, end = 3078062080, flags = 1048691, pgoff = 3078053888, inode = 0 }
+vm_state.vm_map: 13589.850562340 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24464, start = 3078062080, end = 3078066176, flags = 67371125, pgoff = 3078062080, inode = 0 }
+vm_state.vm_map: 13589.850564800 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24464, start = 3078066176, end = 3078180864, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 13589.850566761 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24464, start = 3078180864, end = 3078184960, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 13589.850568899 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24464, start = 3078184960, end = 3078189056, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 13589.850571198 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24464, start = 3218345984, end = 3218432000, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.850576891 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 134512640, end = 134832128, flags = 134223989, pgoff = 0, inode = 1327116 }
+vm_state.vm_map: 13589.850578999 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 134832128, end = 134840320, flags = 135272563, pgoff = 315392, inode = 1327116 }
+vm_state.vm_map: 13589.850581206 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 134840320, end = 134852608, flags = 1048691, pgoff = 134840320, inode = 0 }
+vm_state.vm_map: 13589.850583635 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 156643328, end = 157048832, flags = 1048691, pgoff = 156643328, inode = 0 }
+vm_state.vm_map: 13589.850589106 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3074084864, end = 3074879488, flags = 134217937, pgoff = 0, inode = 1236999 }
+vm_state.vm_map: 13589.850594594 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3074879488, end = 3075248128, flags = 134217937, pgoff = 0, inode = 1131233 }
+vm_state.vm_map: 13589.850597030 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3075248128, end = 3075883008, flags = 134217937, pgoff = 0, inode = 19219 }
+vm_state.vm_map: 13589.850599342 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3075883008, end = 3075923968, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 13589.850601444 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3075923968, end = 3075928064, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 13589.850603743 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3075928064, end = 3075932160, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 13589.850606036 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3075932160, end = 3075969024, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 13589.850608002 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3075969024, end = 3075973120, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 13589.850610104 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3075973120, end = 3075977216, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 13589.850612372 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3075977216, end = 3076055040, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 13589.850614647 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3076055040, end = 3076059136, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 13589.850616649 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3076059136, end = 3076063232, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 13589.850618820 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3076063232, end = 3076071424, flags = 1048691, pgoff = 3076063232, inode = 0 }
+vm_state.vm_map: 13589.850621026 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3076071424, end = 3076096000, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 13589.850623190 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3076096000, end = 3076100096, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 13589.850625167 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3076100096, end = 3076104192, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 13589.850627276 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3076198400, end = 3076202496, flags = 1048691, pgoff = 3076198400, inode = 0 }
+vm_state.vm_map: 13589.850629860 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3076202496, end = 3076395008, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.850631899 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3076395008, end = 3076399104, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.850634075 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3076399104, end = 3076403200, flags = 1048691, pgoff = 3076399104, inode = 0 }
+vm_state.vm_map: 13589.850636597 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3076403200, end = 3076431872, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 13589.850638902 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3076431872, end = 3076435968, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 13589.850640844 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3076435968, end = 3076440064, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 13589.850642920 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3076440064, end = 3077754880, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 13589.850644861 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3077754880, end = 3077763072, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 13589.850646808 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3077763072, end = 3077767168, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 13589.850648762 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3077767168, end = 3077779456, flags = 1048691, pgoff = 3077767168, inode = 0 }
+vm_state.vm_map: 13589.850650907 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3077779456, end = 3077926912, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 13589.850652965 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3077926912, end = 3077931008, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 13589.850654925 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3077931008, end = 3077935104, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 13589.850657323 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3077935104, end = 3078021120, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 13589.850659492 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3078021120, end = 3078025216, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 13589.850661440 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3078025216, end = 3078029312, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 13589.850663498 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3078029312, end = 3078037504, flags = 1048691, pgoff = 3078029312, inode = 0 }
+vm_state.vm_map: 13589.850665581 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3078037504, end = 3078262784, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.850667781 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3078262784, end = 3078266880, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.850669865 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3078266880, end = 3078270976, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.850679236 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3078270976, end = 3079008256, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 13589.850681288 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3079008256, end = 3079012352, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 13589.850683334 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3079012352, end = 3079016448, flags = 1048691, pgoff = 3079012352, inode = 0 }
+vm_state.vm_map: 13589.850688385 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3079016448, end = 3079258112, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 13589.850690443 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3079258112, end = 3079262208, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 13589.850693064 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3079262208, end = 3079376896, flags = 134217845, pgoff = 0, inode = 17291 }
+vm_state.vm_map: 13589.850695023 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3079376896, end = 3079380992, flags = 135266419, pgoff = 114688, inode = 17291 }
+vm_state.vm_map: 13589.850697323 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3079393280, end = 3079409664, flags = 1048691, pgoff = 3079393280, inode = 0 }
+vm_state.vm_map: 13589.850705210 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3079409664, end = 3079438336, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 13589.850707268 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3079438336, end = 3079483392, flags = 1048691, pgoff = 3079438336, inode = 0 }
+vm_state.vm_map: 13589.850709327 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3079483392, end = 3079487488, flags = 67371125, pgoff = 3079483392, inode = 0 }
+vm_state.vm_map: 13589.850711966 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3079487488, end = 3079602176, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 13589.850714136 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3079602176, end = 3079606272, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 13589.850716200 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3079606272, end = 3079610368, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 13589.850718382 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24616, start = 3213799424, end = 3213885440, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.850724298 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 134512640, end = 134524928, flags = 134223989, pgoff = 0, inode = 134326 }
+vm_state.vm_map: 13589.850726356 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 134524928, end = 134529024, flags = 135272563, pgoff = 8192, inode = 134326 }
+vm_state.vm_map: 13589.850728538 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 163594240, end = 163729408, flags = 1048691, pgoff = 163594240, inode = 0 }
+vm_state.vm_map: 13589.850730597 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3074437120, end = 3074441216, flags = 1048691, pgoff = 3074437120, inode = 0 }
+vm_state.vm_map: 13589.850732791 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3074441216, end = 3074633728, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.850734918 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3074633728, end = 3074637824, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.850737173 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3074637824, end = 3074641920, flags = 1048691, pgoff = 3074637824, inode = 0 }
+vm_state.vm_map: 13589.850739350 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3074641920, end = 3074883584, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 13589.850741334 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3074883584, end = 3074887680, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 13589.850743436 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3074887680, end = 3074916352, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 13589.850745383 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3074916352, end = 3074920448, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 13589.850747683 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3074920448, end = 3074924544, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 13589.850749753 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3074924544, end = 3076239360, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 13589.850751706 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3076239360, end = 3076247552, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 13589.850753660 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3076247552, end = 3076251648, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 13589.850755619 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3076251648, end = 3076263936, flags = 1048691, pgoff = 3076251648, inode = 0 }
+vm_state.vm_map: 13589.850757689 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3076263936, end = 3076349952, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 13589.850759636 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3076349952, end = 3076354048, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 13589.850761584 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3076354048, end = 3076358144, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 13589.850763537 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3076358144, end = 3076366336, flags = 1048691, pgoff = 3076358144, inode = 0 }
+vm_state.vm_map: 13589.850765602 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3076366336, end = 3076591616, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.850767678 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3076591616, end = 3076595712, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.850769632 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3076595712, end = 3076599808, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.850771586 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3076599808, end = 3076603904, flags = 1048691, pgoff = 3076599808, inode = 0 }
+vm_state.vm_map: 13589.850773656 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3076603904, end = 3077341184, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 13589.850775634 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3077341184, end = 3077345280, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 13589.850777698 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3077345280, end = 3077459968, flags = 134217845, pgoff = 0, inode = 17291 }
+vm_state.vm_map: 13589.850779985 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3077459968, end = 3077464064, flags = 135266419, pgoff = 114688, inode = 17291 }
+vm_state.vm_map: 13589.850782057 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3077554176, end = 3077566464, flags = 1048691, pgoff = 3077554176, inode = 0 }
+vm_state.vm_map: 13589.850784016 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3077566464, end = 3077570560, flags = 67371125, pgoff = 3077566464, inode = 0 }
+vm_state.vm_map: 13589.850786210 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3077570560, end = 3077685248, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 13589.850788157 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3077685248, end = 3077689344, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 13589.850790111 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3077689344, end = 3077693440, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 13589.850792157 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24617, start = 3216760832, end = 3216846848, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.850798517 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 134512640, end = 134533120, flags = 134223989, pgoff = 0, inode = 134332 }
+vm_state.vm_map: 13589.850800780 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 134533120, end = 134537216, flags = 135272563, pgoff = 16384, inode = 134332 }
+vm_state.vm_map: 13589.850802907 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 163999744, end = 164134912, flags = 1048691, pgoff = 163999744, inode = 0 }
+vm_state.vm_map: 13589.850804977 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3076227072, end = 3076231168, flags = 1048691, pgoff = 3076227072, inode = 0 }
+vm_state.vm_map: 13589.850807227 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3076231168, end = 3076423680, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.850809409 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3076423680, end = 3076427776, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.850811598 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3076427776, end = 3076669440, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 13589.850813860 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3076669440, end = 3076673536, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 13589.850816400 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3076673536, end = 3076677632, flags = 1048691, pgoff = 3076673536, inode = 0 }
+vm_state.vm_map: 13589.850818675 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3076677632, end = 3076706304, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 13589.850820844 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3076706304, end = 3076710400, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 13589.850822816 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3076710400, end = 3076714496, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 13589.850825029 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3076714496, end = 3078029312, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 13589.850827125 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3078029312, end = 3078037504, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 13589.850829195 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3078037504, end = 3078041600, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 13589.850831143 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3078041600, end = 3078053888, flags = 1048691, pgoff = 3078041600, inode = 0 }
+vm_state.vm_map: 13589.850833201 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3078053888, end = 3078791168, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 13589.850835148 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3078791168, end = 3078795264, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 13589.850837225 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3078795264, end = 3078881280, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 13589.850839178 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3078881280, end = 3078885376, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 13589.850841249 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3078885376, end = 3078889472, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 13589.850843320 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3078889472, end = 3078897664, flags = 1048691, pgoff = 3078889472, inode = 0 }
+vm_state.vm_map: 13589.850845508 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3078897664, end = 3079122944, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.850847597 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3079122944, end = 3079127040, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.850850033 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3079127040, end = 3079131136, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.850851987 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3079131136, end = 3079135232, flags = 1048691, pgoff = 3079131136, inode = 0 }
+vm_state.vm_map: 13589.850854280 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3079135232, end = 3079249920, flags = 134217845, pgoff = 0, inode = 17291 }
+vm_state.vm_map: 13589.850856276 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3079249920, end = 3079254016, flags = 135266419, pgoff = 114688, inode = 17291 }
+vm_state.vm_map: 13589.850865128 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3079254016, end = 3079315456, flags = 134217845, pgoff = 0, inode = 22552 }
+vm_state.vm_map: 13589.850867304 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3079315456, end = 3079319552, flags = 135266419, pgoff = 57344, inode = 22552 }
+vm_state.vm_map: 13589.850869479 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3079413760, end = 3079421952, flags = 1048691, pgoff = 3079413760, inode = 0 }
+vm_state.vm_map: 13589.850871637 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3079421952, end = 3079426048, flags = 67371125, pgoff = 3079421952, inode = 0 }
+vm_state.vm_map: 13589.850874110 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3079426048, end = 3079540736, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 13589.850876260 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3079540736, end = 3079544832, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 13589.850878492 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3079544832, end = 3079548928, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 13589.850880544 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24668, start = 3216773120, end = 3216859136, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.850883413 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 134512640, end = 134533120, flags = 134223989, pgoff = 0, inode = 134332 }
+vm_state.vm_map: 13589.850885594 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 134533120, end = 134537216, flags = 135272563, pgoff = 16384, inode = 134332 }
+vm_state.vm_map: 13589.850888116 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 161239040, end = 161374208, flags = 1048691, pgoff = 161239040, inode = 0 }
+vm_state.vm_map: 13589.850890187 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3074994176, end = 3074998272, flags = 1048691, pgoff = 3074994176, inode = 0 }
+vm_state.vm_map: 13589.850892320 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3074998272, end = 3075190784, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.850894316 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3075190784, end = 3075194880, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.850896820 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3075194880, end = 3075436544, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 13589.850898878 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3075436544, end = 3075440640, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 13589.850901060 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3075440640, end = 3075444736, flags = 1048691, pgoff = 3075440640, inode = 0 }
+vm_state.vm_map: 13589.850903372 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3075444736, end = 3075473408, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 13589.850905467 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3075473408, end = 3075477504, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 13589.850907421 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3075477504, end = 3075481600, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 13589.850909596 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3075481600, end = 3076796416, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 13589.850911654 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3076796416, end = 3076804608, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 13589.850913726 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3076804608, end = 3076808704, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 13589.850915796 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3076808704, end = 3076820992, flags = 1048691, pgoff = 3076808704, inode = 0 }
+vm_state.vm_map: 13589.850917873 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3076820992, end = 3077558272, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 13589.850919962 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3077558272, end = 3077562368, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 13589.850922379 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3077562368, end = 3077648384, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 13589.850924475 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3077648384, end = 3077652480, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 13589.850926682 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3077652480, end = 3077656576, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 13589.850928660 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3077656576, end = 3077664768, flags = 1048691, pgoff = 3077656576, inode = 0 }
+vm_state.vm_map: 13589.850930781 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3077664768, end = 3077890048, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.850932752 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3077890048, end = 3077894144, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.850934823 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3077894144, end = 3077898240, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.850936912 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3077898240, end = 3077902336, flags = 1048691, pgoff = 3077898240, inode = 0 }
+vm_state.vm_map: 13589.850938989 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3077902336, end = 3078017024, flags = 134217845, pgoff = 0, inode = 17291 }
+vm_state.vm_map: 13589.850940943 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3078017024, end = 3078021120, flags = 135266419, pgoff = 114688, inode = 17291 }
+vm_state.vm_map: 13589.850943019 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3078021120, end = 3078082560, flags = 134217845, pgoff = 0, inode = 22552 }
+vm_state.vm_map: 13589.850944966 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3078082560, end = 3078086656, flags = 135266419, pgoff = 57344, inode = 22552 }
+vm_state.vm_map: 13589.850946920 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3078180864, end = 3078189056, flags = 1048691, pgoff = 3078180864, inode = 0 }
+vm_state.vm_map: 13589.850948873 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3078189056, end = 3078193152, flags = 67371125, pgoff = 3078189056, inode = 0 }
+vm_state.vm_map: 13589.850951067 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3078193152, end = 3078307840, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 13589.850953114 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3078307840, end = 3078311936, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 13589.850955530 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3078311936, end = 3078316032, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 13589.850957527 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24670, start = 3219943424, end = 3220029440, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.850963665 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 134512640, end = 134524928, flags = 134223989, pgoff = 0, inode = 134268 }
+vm_state.vm_map: 13589.850965692 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 134524928, end = 134529024, flags = 135272563, pgoff = 8192, inode = 134268 }
+vm_state.vm_map: 13589.850967905 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 149143552, end = 149278720, flags = 1048691, pgoff = 149143552, inode = 0 }
+vm_state.vm_map: 13589.850970334 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3076395008, end = 3076435968, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 13589.850972677 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3076435968, end = 3076440064, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 13589.850975199 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3076440064, end = 3076444160, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 13589.850977406 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3076444160, end = 3076481024, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 13589.850979390 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3076481024, end = 3076485120, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 13589.850981683 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3076485120, end = 3076489216, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 13589.850984138 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3076489216, end = 3076567040, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 13589.850986196 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3076567040, end = 3076571136, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 13589.850988199 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3076571136, end = 3076575232, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 13589.850990337 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3076575232, end = 3076583424, flags = 1048691, pgoff = 3076575232, inode = 0 }
+vm_state.vm_map: 13589.850992902 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3076583424, end = 3076608000, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 13589.850994869 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3076608000, end = 3076612096, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 13589.850997069 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3076612096, end = 3076616192, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 13589.850999263 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3076616192, end = 3076624384, flags = 1048691, pgoff = 3076616192, inode = 0 }
+vm_state.vm_map: 13589.851001494 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3076624384, end = 3076816896, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.851003435 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3076816896, end = 3076820992, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.851005507 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3076820992, end = 3076849664, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 13589.851007466 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3076849664, end = 3076853760, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 13589.851009543 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3076853760, end = 3076857856, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 13589.851011607 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3076857856, end = 3078172672, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 13589.851013561 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3078172672, end = 3078180864, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 13589.851015619 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3078180864, end = 3078184960, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 13589.851017572 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3078184960, end = 3078197248, flags = 1048691, pgoff = 3078184960, inode = 0 }
+vm_state.vm_map: 13589.851019637 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3078197248, end = 3078258688, flags = 134217845, pgoff = 0, inode = 22552 }
+vm_state.vm_map: 13589.851021670 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3078258688, end = 3078262784, flags = 135266419, pgoff = 57344, inode = 22552 }
+vm_state.vm_map: 13589.851023864 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3078262784, end = 3079000064, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 13589.851026245 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3079000064, end = 3079004160, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 13589.851028254 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3079004160, end = 3079008256, flags = 1048691, pgoff = 3079004160, inode = 0 }
+vm_state.vm_map: 13589.851030355 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3079008256, end = 3079094272, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 13589.851032302 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3079094272, end = 3079098368, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 13589.851034255 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3079098368, end = 3079102464, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 13589.851036203 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3079102464, end = 3079110656, flags = 1048691, pgoff = 3079102464, inode = 0 }
+vm_state.vm_map: 13589.851038410 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3079110656, end = 3079335936, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.851040350 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3079335936, end = 3079340032, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.851042304 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3079340032, end = 3079344128, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.851044374 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3079434240, end = 3079446528, flags = 1048691, pgoff = 3079434240, inode = 0 }
+vm_state.vm_map: 13589.851046328 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3079446528, end = 3079450624, flags = 67371125, pgoff = 3079446528, inode = 0 }
+vm_state.vm_map: 13589.851048405 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3079450624, end = 3079565312, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 13589.851050469 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3079565312, end = 3079569408, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 13589.851052423 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3079569408, end = 3079573504, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 13589.851054488 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24672, start = 3217379328, end = 3217465344, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.851060545 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 134512640, end = 134529024, flags = 134223989, pgoff = 0, inode = 134324 }
+vm_state.vm_map: 13589.851062714 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 134529024, end = 134533120, flags = 135272563, pgoff = 12288, inode = 134324 }
+vm_state.vm_map: 13589.851064766 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 157446144, end = 157581312, flags = 1048691, pgoff = 157446144, inode = 0 }
+vm_state.vm_map: 13589.851066943 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3075760128, end = 3075764224, flags = 1048691, pgoff = 3075760128, inode = 0 }
+vm_state.vm_map: 13589.851069248 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3075764224, end = 3075956736, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.851071294 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3075956736, end = 3075960832, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.851073502 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3075960832, end = 3076202496, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 13589.851075540 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3076202496, end = 3076206592, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 13589.851077587 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3076206592, end = 3076210688, flags = 1048691, pgoff = 3076206592, inode = 0 }
+vm_state.vm_map: 13589.851079862 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3076210688, end = 3076239360, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 13589.851082056 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3076239360, end = 3076243456, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 13589.851084103 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3076243456, end = 3076247552, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 13589.851086284 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3076247552, end = 3077562368, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 13589.851088460 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3077562368, end = 3077570560, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 13589.851090512 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3077570560, end = 3077574656, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 13589.851092558 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3077574656, end = 3077586944, flags = 1048691, pgoff = 3077574656, inode = 0 }
+vm_state.vm_map: 13589.851095087 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3077586944, end = 3078324224, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 13589.851097158 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3078324224, end = 3078328320, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 13589.851099587 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3078328320, end = 3078414336, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 13589.851101669 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3078414336, end = 3078418432, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 13589.851122247 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3078418432, end = 3078422528, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 13589.851124478 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3078422528, end = 3078430720, flags = 1048691, pgoff = 3078422528, inode = 0 }
+vm_state.vm_map: 13589.851126802 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3078430720, end = 3078656000, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.851129084 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3078656000, end = 3078660096, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.851131136 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3078660096, end = 3078664192, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.851133275 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3078664192, end = 3078668288, flags = 1048691, pgoff = 3078664192, inode = 0 }
+vm_state.vm_map: 13589.851135747 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3078668288, end = 3078782976, flags = 134217845, pgoff = 0, inode = 17291 }
+vm_state.vm_map: 13589.851137750 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3078782976, end = 3078787072, flags = 135266419, pgoff = 114688, inode = 17291 }
+vm_state.vm_map: 13589.851140093 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3078787072, end = 3078848512, flags = 134217845, pgoff = 0, inode = 22552 }
+vm_state.vm_map: 13589.851142225 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3078848512, end = 3078852608, flags = 135266419, pgoff = 57344, inode = 22552 }
+vm_state.vm_map: 13589.851144518 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3078946816, end = 3078955008, flags = 1048691, pgoff = 3078946816, inode = 0 }
+vm_state.vm_map: 13589.851146522 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3078955008, end = 3078959104, flags = 67371125, pgoff = 3078955008, inode = 0 }
+vm_state.vm_map: 13589.851149384 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3078959104, end = 3079073792, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 13589.851151423 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3079073792, end = 3079077888, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 13589.851153587 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3079077888, end = 3079081984, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 13589.851155609 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 24682, start = 3219673088, end = 3219759104, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.851162920 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 134512640, end = 137146368, flags = 134223989, pgoff = 0, inode = 20802 }
+vm_state.vm_map: 13589.851165066 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 137150464, end = 137170944, flags = 135272561, pgoff = 2633728, inode = 20802 }
+vm_state.vm_map: 13589.851167241 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 137170944, end = 137191424, flags = 135272563, pgoff = 2654208, inode = 20802 }
+vm_state.vm_map: 13589.851169251 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 137191424, end = 137195520, flags = 1048691, pgoff = 137191424, inode = 0 }
+vm_state.vm_map: 13589.851171562 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 143040512, end = 143486976, flags = 1048691, pgoff = 143040512, inode = 0 }
+vm_state.vm_map: 13589.851174102 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3072049152, end = 3072139264, flags = 134217979, pgoff = 0, inode = 1204276 }
+vm_state.vm_map: 13589.851179777 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3072139264, end = 3072204800, flags = 134217937, pgoff = 0, inode = 156491 }
+vm_state.vm_map: 13589.851187702 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3072204800, end = 3073536000, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 13589.851193104 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3073536000, end = 3073667072, flags = 134217937, pgoff = 0, inode = 156496 }
+vm_state.vm_map: 13589.851198118 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3073667072, end = 3073798144, flags = 134217937, pgoff = 0, inode = 156489 }
+vm_state.vm_map: 13589.851200306 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3073798144, end = 3073806336, flags = 1048691, pgoff = 3073798144, inode = 0 }
+vm_state.vm_map: 13589.851202722 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3073806336, end = 3073818624, flags = 134217845, pgoff = 0, inode = 20765 }
+vm_state.vm_map: 13589.851204873 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3073818624, end = 3073822720, flags = 135266419, pgoff = 8192, inode = 20765 }
+vm_state.vm_map: 13589.851207050 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3073822720, end = 3074285568, flags = 134217845, pgoff = 0, inode = 20061 }
+vm_state.vm_map: 13589.851209089 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3074285568, end = 3074297856, flags = 135266419, pgoff = 458752, inode = 20061 }
+vm_state.vm_map: 13589.851211271 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3074297856, end = 3074359296, flags = 134217845, pgoff = 0, inode = 19423 }
+vm_state.vm_map: 13589.851213441 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3074359296, end = 3074363392, flags = 135266419, pgoff = 57344, inode = 19423 }
+vm_state.vm_map: 13589.851215851 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3074363392, end = 3074969600, flags = 134217845, pgoff = 0, inode = 22471 }
+vm_state.vm_map: 13589.851218021 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3074969600, end = 3074985984, flags = 135266419, pgoff = 602112, inode = 22471 }
+vm_state.vm_map: 13589.851220129 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3074985984, end = 3074990080, flags = 1048691, pgoff = 3074985984, inode = 0 }
+vm_state.vm_map: 13589.851229272 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3074990080, end = 3075080192, flags = 134217845, pgoff = 0, inode = 18560 }
+vm_state.vm_map: 13589.851231441 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3075080192, end = 3075084288, flags = 135266419, pgoff = 86016, inode = 18560 }
+vm_state.vm_map: 13589.851233617 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3075084288, end = 3075170304, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 13589.851235712 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3075170304, end = 3075174400, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 13589.851238012 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3075174400, end = 3075178496, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 13589.851240095 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3075178496, end = 3075186688, flags = 1048691, pgoff = 3075178496, inode = 0 }
+vm_state.vm_map: 13589.851242530 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3075186688, end = 3075194880, flags = 134217845, pgoff = 0, inode = 500018 }
+vm_state.vm_map: 13589.851244626 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3075194880, end = 3075198976, flags = 135266419, pgoff = 4096, inode = 500018 }
+vm_state.vm_map: 13589.851247185 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3075198976, end = 3075223552, flags = 134217845, pgoff = 0, inode = 19420 }
+vm_state.vm_map: 13589.851249206 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3075223552, end = 3075227648, flags = 135266419, pgoff = 20480, inode = 19420 }
+vm_state.vm_map: 13589.851251691 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3075227648, end = 3075244032, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 13589.851253873 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3075244032, end = 3075248128, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 13589.851256203 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3075248128, end = 3076562944, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 13589.851258373 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3076562944, end = 3076571136, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 13589.851260450 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3076571136, end = 3076575232, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 13589.851262725 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3076575232, end = 3076591616, flags = 1048691, pgoff = 3076575232, inode = 0 }
+vm_state.vm_map: 13589.851265413 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3076591616, end = 3076669440, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 13589.851267459 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3076669440, end = 3076673536, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 13589.851269753 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3076673536, end = 3076722688, flags = 134217845, pgoff = 0, inode = 19447 }
+vm_state.vm_map: 13589.851271935 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3076722688, end = 3076726784, flags = 135266419, pgoff = 49152, inode = 19447 }
+vm_state.vm_map: 13589.851274339 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3076726784, end = 3076993024, flags = 134217845, pgoff = 0, inode = 19433 }
+vm_state.vm_map: 13589.851276391 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3076993024, end = 3077001216, flags = 135266419, pgoff = 262144, inode = 19433 }
+vm_state.vm_map: 13589.851278370 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3077001216, end = 3077005312, flags = 1048691, pgoff = 3077001216, inode = 0 }
+vm_state.vm_map: 13589.851280682 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3077005312, end = 3077013504, flags = 134217845, pgoff = 0, inode = 499720 }
+vm_state.vm_map: 13589.851282746 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3077013504, end = 3077017600, flags = 135266419, pgoff = 4096, inode = 499720 }
+vm_state.vm_map: 13589.851285052 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3077017600, end = 3077177344, flags = 134217845, pgoff = 0, inode = 18680 }
+vm_state.vm_map: 13589.851287111 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3077177344, end = 3077181440, flags = 135266419, pgoff = 159744, inode = 18680 }
+vm_state.vm_map: 13589.851289317 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3077181440, end = 3077185536, flags = 1048691, pgoff = 3077181440, inode = 0 }
+vm_state.vm_map: 13589.851291444 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3077185536, end = 3077844992, flags = 134217845, pgoff = 0, inode = 19419 }
+vm_state.vm_map: 13589.851293743 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3077844992, end = 3077869568, flags = 135266419, pgoff = 659456, inode = 19419 }
+vm_state.vm_map: 13589.851295943 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3077869568, end = 3078033408, flags = 134217845, pgoff = 0, inode = 17950 }
+vm_state.vm_map: 13589.851297989 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078033408, end = 3078037504, flags = 135266419, pgoff = 163840, inode = 17950 }
+vm_state.vm_map: 13589.851300858 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078037504, end = 3078074368, flags = 134217845, pgoff = 0, inode = 499726 }
+vm_state.vm_map: 13589.851302910 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078074368, end = 3078078464, flags = 135266419, pgoff = 32768, inode = 499726 }
+vm_state.vm_map: 13589.851310278 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078078464, end = 3078111232, flags = 134217845, pgoff = 0, inode = 20850 }
+vm_state.vm_map: 13589.851312330 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078111232, end = 3078115328, flags = 135266419, pgoff = 28672, inode = 20850 }
+vm_state.vm_map: 13589.851314444 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078115328, end = 3078123520, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 13589.851316410 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078123520, end = 3078127616, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 13589.851318591 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078127616, end = 3078131712, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 13589.851320854 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078131712, end = 3078209536, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 13589.851322931 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078209536, end = 3078213632, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 13589.851325101 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078213632, end = 3078217728, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 13589.851327276 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078217728, end = 3078230016, flags = 1048691, pgoff = 3078217728, inode = 0 }
+vm_state.vm_map: 13589.851329762 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078230016, end = 3078299648, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 13589.851331814 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078299648, end = 3078303744, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 13589.851333909 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078303744, end = 3078307840, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 13589.851336524 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078307840, end = 3078316032, flags = 1048691, pgoff = 3078307840, inode = 0 }
+vm_state.vm_map: 13589.851339133 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078316032, end = 3078328320, flags = 134217845, pgoff = 0, inode = 499779 }
+vm_state.vm_map: 13589.851341105 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078328320, end = 3078332416, flags = 135266419, pgoff = 8192, inode = 499779 }
+vm_state.vm_map: 13589.851343521 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078361088, end = 3078365184, flags = 134217979, pgoff = 0, inode = 1204274 }
+vm_state.vm_map: 13589.851348479 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078365184, end = 3078373376, flags = 134217845, pgoff = 0, inode = 1450400 }
+vm_state.vm_map: 13589.851350655 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078373376, end = 3078377472, flags = 135266417, pgoff = 4096, inode = 1450400 }
+vm_state.vm_map: 13589.851352892 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078377472, end = 3078381568, flags = 135266419, pgoff = 8192, inode = 1450400 }
+vm_state.vm_map: 13589.851358202 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078381568, end = 3078389760, flags = 134217845, pgoff = 0, inode = 1450327 }
+vm_state.vm_map: 13589.851360254 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078389760, end = 3078393856, flags = 135266417, pgoff = 4096, inode = 1450327 }
+vm_state.vm_map: 13589.851362288 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078393856, end = 3078397952, flags = 135266419, pgoff = 8192, inode = 1450327 }
+vm_state.vm_map: 13589.851364495 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078397952, end = 3078426624, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 13589.851366665 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078426624, end = 3078434816, flags = 1048691, pgoff = 3078426624, inode = 0 }
+vm_state.vm_map: 13589.851368643 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078434816, end = 3078438912, flags = 67371125, pgoff = 3078434816, inode = 0 }
+vm_state.vm_map: 13589.851370942 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078438912, end = 3078553600, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 13589.851373285 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078553600, end = 3078557696, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 13589.851375466 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3078557696, end = 3078561792, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 13589.851377654 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25001, start = 3217707008, end = 3217793024, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.851385721 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 134512640, end = 142159872, flags = 134223989, pgoff = 0, inode = 20798 }
+vm_state.vm_map: 13589.851387891 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 142159872, end = 142204928, flags = 135272561, pgoff = 7643136, inode = 20798 }
+vm_state.vm_map: 13589.851389936 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 142204928, end = 142237696, flags = 135272563, pgoff = 7688192, inode = 20798 }
+vm_state.vm_map: 13589.851392057 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 142237696, end = 142241792, flags = 1048691, pgoff = 142237696, inode = 0 }
+vm_state.vm_map: 13589.851394159 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 146509824, end = 147070976, flags = 1048691, pgoff = 146509824, inode = 0 }
+vm_state.vm_map: 13589.851399426 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3070267392, end = 3070345216, flags = 134217979, pgoff = 0, inode = 1206047 }
+vm_state.vm_map: 13589.851401756 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3070345216, end = 3070386176, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 13589.851403950 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3070386176, end = 3070390272, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 13589.851406101 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3070390272, end = 3070394368, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 13589.851408593 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3070394368, end = 3070431232, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 13589.851410979 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3070431232, end = 3070435328, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 13589.851413037 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3070435328, end = 3070439424, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 13589.851415213 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3070439424, end = 3070464000, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 13589.851417487 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3070464000, end = 3070468096, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 13589.851419658 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3070468096, end = 3070472192, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 13589.851422198 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3070513152, end = 3070529536, flags = 134217979, pgoff = 0, inode = 1206050 }
+vm_state.vm_map: 13589.851424528 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3070529536, end = 3070566400, flags = 134217979, pgoff = 0, inode = 1206049 }
+vm_state.vm_map: 13589.851429380 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3070599168, end = 3070603264, flags = 134217979, pgoff = 0, inode = 1206071 }
+vm_state.vm_map: 13589.851431790 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3070603264, end = 3070611456, flags = 134217979, pgoff = 0, inode = 1206070 }
+vm_state.vm_map: 13589.851434183 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3070611456, end = 3070619648, flags = 134217979, pgoff = 0, inode = 1206069 }
+vm_state.vm_map: 13589.851436495 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3070619648, end = 3070660608, flags = 134217979, pgoff = 0, inode = 1204285 }
+vm_state.vm_map: 13589.851439146 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3070660608, end = 3070701568, flags = 134217979, pgoff = 0, inode = 1204281 }
+vm_state.vm_map: 13589.851441372 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3070701568, end = 3070791680, flags = 134217979, pgoff = 0, inode = 1204276 }
+vm_state.vm_map: 13589.851443900 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3070791680, end = 3070816256, flags = 134217979, pgoff = 0, inode = 1206046 }
+vm_state.vm_map: 13589.851446101 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3070820352, end = 3070885888, flags = 134217937, pgoff = 0, inode = 156491 }
+vm_state.vm_map: 13589.851449006 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3070885888, end = 3072217088, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 13589.851451385 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3072217088, end = 3072348160, flags = 134217937, pgoff = 0, inode = 156496 }
+vm_state.vm_map: 13589.851453828 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3072348160, end = 3072479232, flags = 134217937, pgoff = 0, inode = 156489 }
+vm_state.vm_map: 13589.851455904 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3072479232, end = 3072491520, flags = 1048691, pgoff = 3072479232, inode = 0 }
+vm_state.vm_map: 13589.851458099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3072491520, end = 3072503808, flags = 134217845, pgoff = 0, inode = 20765 }
+vm_state.vm_map: 13589.851460269 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3072503808, end = 3072507904, flags = 135266419, pgoff = 8192, inode = 20765 }
+vm_state.vm_map: 13589.851462568 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3072507904, end = 3072536576, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 13589.851464626 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3072536576, end = 3072540672, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 13589.851466672 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3072540672, end = 3072544768, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 13589.851468860 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3072544768, end = 3072770048, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.851470906 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3072770048, end = 3072774144, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.851472953 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3072774144, end = 3072778240, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.851475135 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3072778240, end = 3072782336, flags = 1048691, pgoff = 3072778240, inode = 0 }
+vm_state.vm_map: 13589.851477317 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3072782336, end = 3073245184, flags = 134217845, pgoff = 0, inode = 20061 }
+vm_state.vm_map: 13589.851479376 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3073245184, end = 3073257472, flags = 135266419, pgoff = 458752, inode = 20061 }
+vm_state.vm_map: 13589.851481471 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3073257472, end = 3073318912, flags = 134217845, pgoff = 0, inode = 19423 }
+vm_state.vm_map: 13589.851483770 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3073318912, end = 3073323008, flags = 135266419, pgoff = 57344, inode = 19423 }
+vm_state.vm_map: 13589.851486094 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3073323008, end = 3073384448, flags = 134217845, pgoff = 0, inode = 21268 }
+vm_state.vm_map: 13589.851488103 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3073384448, end = 3073388544, flags = 135266419, pgoff = 57344, inode = 21268 }
+vm_state.vm_map: 13589.851490408 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3073388544, end = 3073429504, flags = 134217845, pgoff = 0, inode = 22434 }
+vm_state.vm_map: 13589.851492474 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3073429504, end = 3073433600, flags = 135266419, pgoff = 40960, inode = 22434 }
+vm_state.vm_map: 13589.851494569 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3073433600, end = 3073441792, flags = 134217845, pgoff = 0, inode = 500018 }
+vm_state.vm_map: 13589.851496516 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3073441792, end = 3073445888, flags = 135266419, pgoff = 4096, inode = 500018 }
+vm_state.vm_map: 13589.851498599 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3073445888, end = 3073449984, flags = 1048691, pgoff = 3073445888, inode = 0 }
+vm_state.vm_map: 13589.851500676 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3073449984, end = 3073474560, flags = 134217845, pgoff = 0, inode = 19420 }
+vm_state.vm_map: 13589.851502630 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3073474560, end = 3073478656, flags = 135266419, pgoff = 20480, inode = 19420 }
+vm_state.vm_map: 13589.851504879 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3073478656, end = 3073568768, flags = 134217845, pgoff = 0, inode = 18560 }
+vm_state.vm_map: 13589.851506833 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3073568768, end = 3073572864, flags = 135266419, pgoff = 86016, inode = 18560 }
+vm_state.vm_map: 13589.851509076 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3073572864, end = 3074887680, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 13589.851511148 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3074887680, end = 3074895872, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 13589.851513231 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3074895872, end = 3074899968, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 13589.851515227 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3074899968, end = 3074912256, flags = 1048691, pgoff = 3074899968, inode = 0 }
+vm_state.vm_map: 13589.851520462 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3074912256, end = 3074949120, flags = 134217845, pgoff = 0, inode = 20852 }
+vm_state.vm_map: 13589.851522410 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3074949120, end = 3074953216, flags = 135266417, pgoff = 36864, inode = 20852 }
+vm_state.vm_map: 13589.851524610 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3074953216, end = 3074957312, flags = 135266419, pgoff = 40960, inode = 20852 }
+vm_state.vm_map: 13589.851526582 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3074957312, end = 3074961408, flags = 1048691, pgoff = 3074957312, inode = 0 }
+vm_state.vm_map: 13589.851528653 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3074961408, end = 3074994176, flags = 134217845, pgoff = 0, inode = 20850 }
+vm_state.vm_map: 13589.851530606 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3074994176, end = 3074998272, flags = 135266419, pgoff = 28672, inode = 20850 }
+vm_state.vm_map: 13589.851532676 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3074998272, end = 3075035136, flags = 134217845, pgoff = 0, inode = 499726 }
+vm_state.vm_map: 13589.851534742 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075035136, end = 3075039232, flags = 135266419, pgoff = 32768, inode = 499726 }
+vm_state.vm_map: 13589.851536689 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075039232, end = 3075043328, flags = 1048691, pgoff = 3075039232, inode = 0 }
+vm_state.vm_map: 13589.851538759 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075043328, end = 3075051520, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 13589.851540706 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075051520, end = 3075055616, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 13589.851542764 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075055616, end = 3075059712, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 13589.851544848 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075059712, end = 3075137536, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 13589.851546801 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075137536, end = 3075141632, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 13589.851548742 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075141632, end = 3075145728, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 13589.851551035 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075145728, end = 3075153920, flags = 1048691, pgoff = 3075145728, inode = 0 }
+vm_state.vm_map: 13589.851553447 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075153920, end = 3075223552, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 13589.851555622 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075223552, end = 3075227648, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 13589.851557687 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075227648, end = 3075231744, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 13589.851559764 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075231744, end = 3075239936, flags = 1048691, pgoff = 3075231744, inode = 0 }
+vm_state.vm_map: 13589.851561977 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075239936, end = 3075252224, flags = 134217845, pgoff = 0, inode = 499779 }
+vm_state.vm_map: 13589.851564041 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075252224, end = 3075256320, flags = 135266419, pgoff = 8192, inode = 499779 }
+vm_state.vm_map: 13589.851566273 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075256320, end = 3075272704, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 13589.851568220 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075272704, end = 3075276800, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 13589.851570333 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075276800, end = 3075280896, flags = 1048691, pgoff = 3075276800, inode = 0 }
+vm_state.vm_map: 13589.851572980 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075280896, end = 3075305472, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 13589.851575050 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075305472, end = 3075309568, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 13589.851577275 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075309568, end = 3075350528, flags = 134217845, pgoff = 0, inode = 499738 }
+vm_state.vm_map: 13589.851579272 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075350528, end = 3075354624, flags = 135266419, pgoff = 40960, inode = 499738 }
+vm_state.vm_map: 13589.851581516 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075354624, end = 3075391488, flags = 134217845, pgoff = 0, inode = 508391 }
+vm_state.vm_map: 13589.851583462 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075391488, end = 3075395584, flags = 135266417, pgoff = 32768, inode = 508391 }
+vm_state.vm_map: 13589.851585762 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075395584, end = 3075399680, flags = 135266419, pgoff = 36864, inode = 508391 }
+vm_state.vm_map: 13589.851587722 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075399680, end = 3075559424, flags = 1048691, pgoff = 3075399680, inode = 0 }
+vm_state.vm_map: 13589.851589805 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075559424, end = 3075706880, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 13589.851591980 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075706880, end = 3075710976, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 13589.851593947 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075710976, end = 3075715072, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 13589.851596160 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075715072, end = 3075801088, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 13589.851598224 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075801088, end = 3075805184, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 13589.851600177 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075805184, end = 3075809280, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 13589.851602142 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075809280, end = 3075817472, flags = 1048691, pgoff = 3075809280, inode = 0 }
+vm_state.vm_map: 13589.851604270 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075817472, end = 3075895296, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 13589.851606223 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075895296, end = 3075899392, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 13589.851608188 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075899392, end = 3075903488, flags = 1048691, pgoff = 3075899392, inode = 0 }
+vm_state.vm_map: 13589.851610389 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3075903488, end = 3076509696, flags = 134217845, pgoff = 0, inode = 22471 }
+vm_state.vm_map: 13589.851612454 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3076509696, end = 3076526080, flags = 135266419, pgoff = 602112, inode = 22471 }
+vm_state.vm_map: 13589.851617714 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3076526080, end = 3076792320, flags = 134217845, pgoff = 0, inode = 19427 }
+vm_state.vm_map: 13589.851620174 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3076792320, end = 3076804608, flags = 135266417, pgoff = 266240, inode = 19427 }
+vm_state.vm_map: 13589.851622133 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3076804608, end = 3076808704, flags = 135266419, pgoff = 278528, inode = 19427 }
+vm_state.vm_map: 13589.851624248 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3076808704, end = 3076816896, flags = 134217845, pgoff = 0, inode = 499720 }
+vm_state.vm_map: 13589.851626331 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3076816896, end = 3076820992, flags = 135266419, pgoff = 4096, inode = 499720 }
+vm_state.vm_map: 13589.851628500 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3076820992, end = 3076980736, flags = 134217845, pgoff = 0, inode = 18680 }
+vm_state.vm_map: 13589.851630577 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3076980736, end = 3076984832, flags = 135266419, pgoff = 159744, inode = 18680 }
+vm_state.vm_map: 13589.851632686 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3076984832, end = 3077644288, flags = 134217845, pgoff = 0, inode = 19419 }
+vm_state.vm_map: 13589.851634781 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3077644288, end = 3077668864, flags = 135266419, pgoff = 659456, inode = 19419 }
+vm_state.vm_map: 13589.851636901 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3077668864, end = 3077832704, flags = 134217845, pgoff = 0, inode = 17950 }
+vm_state.vm_map: 13589.851639083 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3077832704, end = 3077836800, flags = 135266419, pgoff = 163840, inode = 17950 }
+vm_state.vm_map: 13589.851641141 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3077836800, end = 3077840896, flags = 1048691, pgoff = 3077836800, inode = 0 }
+vm_state.vm_map: 13589.851643385 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3077840896, end = 3077890048, flags = 134217845, pgoff = 0, inode = 19447 }
+vm_state.vm_map: 13589.851645462 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3077890048, end = 3077894144, flags = 135266419, pgoff = 49152, inode = 19447 }
+vm_state.vm_map: 13589.851647792 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3077894144, end = 3078160384, flags = 134217845, pgoff = 0, inode = 19433 }
+vm_state.vm_map: 13589.851649838 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3078160384, end = 3078168576, flags = 135266419, pgoff = 262144, inode = 19433 }
+vm_state.vm_map: 13589.851651891 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3078168576, end = 3078172672, flags = 1048691, pgoff = 3078168576, inode = 0 }
+vm_state.vm_map: 13589.851654549 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3078193152, end = 3078197248, flags = 134217979, pgoff = 0, inode = 1204461 }
+vm_state.vm_map: 13589.851657120 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3078197248, end = 3078201344, flags = 134217979, pgoff = 0, inode = 1204278 }
+vm_state.vm_map: 13589.851659283 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3078201344, end = 3078205440, flags = 134217979, pgoff = 0, inode = 1204274 }
+vm_state.vm_map: 13589.851661392 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3078205440, end = 3078213632, flags = 134217845, pgoff = 0, inode = 1450400 }
+vm_state.vm_map: 13589.851663561 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3078213632, end = 3078217728, flags = 135266417, pgoff = 4096, inode = 1450400 }
+vm_state.vm_map: 13589.851665552 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3078217728, end = 3078221824, flags = 135266419, pgoff = 8192, inode = 1450400 }
+vm_state.vm_map: 13589.851667783 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3078221824, end = 3078230016, flags = 134217845, pgoff = 0, inode = 1450327 }
+vm_state.vm_map: 13589.851669829 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3078230016, end = 3078234112, flags = 135266417, pgoff = 4096, inode = 1450327 }
+vm_state.vm_map: 13589.851671874 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3078234112, end = 3078238208, flags = 135266419, pgoff = 8192, inode = 1450327 }
+vm_state.vm_map: 13589.851674051 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3078238208, end = 3078266880, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 13589.851676103 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3078266880, end = 3078275072, flags = 1048691, pgoff = 3078266880, inode = 0 }
+vm_state.vm_map: 13589.851678093 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3078275072, end = 3078279168, flags = 67371125, pgoff = 3078275072, inode = 0 }
+vm_state.vm_map: 13589.851680343 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3078279168, end = 3078393856, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 13589.851682383 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3078393856, end = 3078397952, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 13589.851684435 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3078397952, end = 3078402048, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 13589.851686420 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25010, start = 3220881408, end = 3220967424, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.851689454 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 134512640, end = 142159872, flags = 134223989, pgoff = 0, inode = 20798 }
+vm_state.vm_map: 13589.851691618 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 142159872, end = 142204928, flags = 135272561, pgoff = 7643136, inode = 20798 }
+vm_state.vm_map: 13589.851693739 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 142204928, end = 142237696, flags = 135272563, pgoff = 7688192, inode = 20798 }
+vm_state.vm_map: 13589.851695927 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 142237696, end = 142241792, flags = 1048691, pgoff = 142237696, inode = 0 }
+vm_state.vm_map: 13589.851698096 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 146509824, end = 147070976, flags = 1048691, pgoff = 146509824, inode = 0 }
+vm_state.vm_map: 13589.851700191 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3070267392, end = 3070345216, flags = 134217979, pgoff = 0, inode = 1206047 }
+vm_state.vm_map: 13589.851702175 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3070345216, end = 3070386176, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 13589.851704241 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3070386176, end = 3070390272, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 13589.851706194 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3070390272, end = 3070394368, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 13589.851708289 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3070394368, end = 3070431232, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 13589.851710236 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3070431232, end = 3070435328, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 13589.851712294 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3070435328, end = 3070439424, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 13589.851714278 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3070439424, end = 3070464000, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 13589.851716232 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3070464000, end = 3070468096, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 13589.851718186 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3070468096, end = 3070472192, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 13589.851720170 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3070513152, end = 3070529536, flags = 134217979, pgoff = 0, inode = 1206050 }
+vm_state.vm_map: 13589.851722513 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3070529536, end = 3070566400, flags = 134217979, pgoff = 0, inode = 1206049 }
+vm_state.vm_map: 13589.851724485 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3070599168, end = 3070603264, flags = 134217979, pgoff = 0, inode = 1206071 }
+vm_state.vm_map: 13589.851726574 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3070603264, end = 3070611456, flags = 134217979, pgoff = 0, inode = 1206070 }
+vm_state.vm_map: 13589.851728546 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3070611456, end = 3070619648, flags = 134217979, pgoff = 0, inode = 1206069 }
+vm_state.vm_map: 13589.851730523 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3070619648, end = 3070660608, flags = 134217979, pgoff = 0, inode = 1204285 }
+vm_state.vm_map: 13589.851732508 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3070660608, end = 3070701568, flags = 134217979, pgoff = 0, inode = 1204281 }
+vm_state.vm_map: 13589.851734528 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3070701568, end = 3070791680, flags = 134217979, pgoff = 0, inode = 1204276 }
+vm_state.vm_map: 13589.851736538 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3070791680, end = 3070816256, flags = 134217979, pgoff = 0, inode = 1206046 }
+vm_state.vm_map: 13589.851738566 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3070820352, end = 3070885888, flags = 134217937, pgoff = 0, inode = 156491 }
+vm_state.vm_map: 13589.851740580 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3070885888, end = 3072217088, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 13589.851742689 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3072217088, end = 3072348160, flags = 134217937, pgoff = 0, inode = 156496 }
+vm_state.vm_map: 13589.851744741 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3072348160, end = 3072479232, flags = 134217937, pgoff = 0, inode = 156489 }
+vm_state.vm_map: 13589.851746693 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3072479232, end = 3072491520, flags = 1048691, pgoff = 3072479232, inode = 0 }
+vm_state.vm_map: 13589.851748666 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3072491520, end = 3072503808, flags = 134217845, pgoff = 0, inode = 20765 }
+vm_state.vm_map: 13589.851750619 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3072503808, end = 3072507904, flags = 135266419, pgoff = 8192, inode = 20765 }
+vm_state.vm_map: 13589.851752683 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3072507904, end = 3072536576, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 13589.851754984 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3072536576, end = 3072540672, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 13589.851756937 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3072540672, end = 3072544768, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 13589.851758908 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3072544768, end = 3072770048, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.851760985 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3072770048, end = 3072774144, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.851762938 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3072774144, end = 3072778240, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.851765040 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3072778240, end = 3072782336, flags = 1048691, pgoff = 3072778240, inode = 0 }
+vm_state.vm_map: 13589.851767062 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3072782336, end = 3073245184, flags = 134217845, pgoff = 0, inode = 20061 }
+vm_state.vm_map: 13589.851769176 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3073245184, end = 3073257472, flags = 135266419, pgoff = 458752, inode = 20061 }
+vm_state.vm_map: 13589.851771258 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3073257472, end = 3073318912, flags = 134217845, pgoff = 0, inode = 19423 }
+vm_state.vm_map: 13589.851773212 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3073318912, end = 3073323008, flags = 135266419, pgoff = 57344, inode = 19423 }
+vm_state.vm_map: 13589.851775184 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3073323008, end = 3073384448, flags = 134217845, pgoff = 0, inode = 21268 }
+vm_state.vm_map: 13589.851777249 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3073384448, end = 3073388544, flags = 135266419, pgoff = 57344, inode = 21268 }
+vm_state.vm_map: 13589.851779220 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3073388544, end = 3073429504, flags = 134217845, pgoff = 0, inode = 22434 }
+vm_state.vm_map: 13589.851781223 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3073429504, end = 3073433600, flags = 135266419, pgoff = 40960, inode = 22434 }
+vm_state.vm_map: 13589.851783380 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3073433600, end = 3073441792, flags = 134217845, pgoff = 0, inode = 500018 }
+vm_state.vm_map: 13589.851785334 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3073441792, end = 3073445888, flags = 135266419, pgoff = 4096, inode = 500018 }
+vm_state.vm_map: 13589.851787627 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3073445888, end = 3073449984, flags = 1048691, pgoff = 3073445888, inode = 0 }
+vm_state.vm_map: 13589.851789593 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3073449984, end = 3073474560, flags = 134217845, pgoff = 0, inode = 19420 }
+vm_state.vm_map: 13589.851791706 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3073474560, end = 3073478656, flags = 135266419, pgoff = 20480, inode = 19420 }
+vm_state.vm_map: 13589.851793814 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3073478656, end = 3073568768, flags = 134217845, pgoff = 0, inode = 18560 }
+vm_state.vm_map: 13589.851795879 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3073568768, end = 3073572864, flags = 135266419, pgoff = 86016, inode = 18560 }
+vm_state.vm_map: 13589.851797968 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3073572864, end = 3074887680, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 13589.851800014 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3074887680, end = 3074895872, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 13589.851802079 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3074895872, end = 3074899968, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 13589.851804119 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3074899968, end = 3074912256, flags = 1048691, pgoff = 3074899968, inode = 0 }
+vm_state.vm_map: 13589.851806238 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3074912256, end = 3074949120, flags = 134217845, pgoff = 0, inode = 20852 }
+vm_state.vm_map: 13589.851808310 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3074949120, end = 3074953216, flags = 135266417, pgoff = 36864, inode = 20852 }
+vm_state.vm_map: 13589.851810380 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3074953216, end = 3074957312, flags = 135266419, pgoff = 40960, inode = 20852 }
+vm_state.vm_map: 13589.851812334 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3074957312, end = 3074961408, flags = 1048691, pgoff = 3074957312, inode = 0 }
+vm_state.vm_map: 13589.851814404 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3074961408, end = 3074994176, flags = 134217845, pgoff = 0, inode = 20850 }
+vm_state.vm_map: 13589.851816352 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3074994176, end = 3074998272, flags = 135266419, pgoff = 28672, inode = 20850 }
+vm_state.vm_map: 13589.851818317 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3074998272, end = 3075035136, flags = 134217845, pgoff = 0, inode = 499726 }
+vm_state.vm_map: 13589.851820716 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075035136, end = 3075039232, flags = 135266419, pgoff = 32768, inode = 499726 }
+vm_state.vm_map: 13589.851822681 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075039232, end = 3075043328, flags = 1048691, pgoff = 3075039232, inode = 0 }
+vm_state.vm_map: 13589.851824648 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075043328, end = 3075051520, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 13589.851826601 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075051520, end = 3075055616, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 13589.851828548 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075055616, end = 3075059712, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 13589.851830525 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075059712, end = 3075137536, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 13589.851832528 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075137536, end = 3075141632, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 13589.851834531 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075141632, end = 3075145728, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 13589.851836478 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075145728, end = 3075153920, flags = 1048691, pgoff = 3075145728, inode = 0 }
+vm_state.vm_map: 13589.851838574 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075153920, end = 3075223552, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 13589.851840576 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075223552, end = 3075227648, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 13589.851842690 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075227648, end = 3075231744, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 13589.851844644 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075231744, end = 3075239936, flags = 1048691, pgoff = 3075231744, inode = 0 }
+vm_state.vm_map: 13589.851846622 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075239936, end = 3075252224, flags = 134217845, pgoff = 0, inode = 499779 }
+vm_state.vm_map: 13589.851848668 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075252224, end = 3075256320, flags = 135266419, pgoff = 8192, inode = 499779 }
+vm_state.vm_map: 13589.851850621 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075256320, end = 3075272704, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 13589.851853019 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075272704, end = 3075276800, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 13589.851855121 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075276800, end = 3075280896, flags = 1048691, pgoff = 3075276800, inode = 0 }
+vm_state.vm_map: 13589.851857130 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075280896, end = 3075305472, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 13589.851859077 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075305472, end = 3075309568, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 13589.851861185 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075309568, end = 3075350528, flags = 134217845, pgoff = 0, inode = 499738 }
+vm_state.vm_map: 13589.851863150 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075350528, end = 3075354624, flags = 135266419, pgoff = 40960, inode = 499738 }
+vm_state.vm_map: 13589.851865116 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075354624, end = 3075391488, flags = 134217845, pgoff = 0, inode = 508391 }
+vm_state.vm_map: 13589.851867070 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075391488, end = 3075395584, flags = 135266417, pgoff = 32768, inode = 508391 }
+vm_state.vm_map: 13589.851869011 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075395584, end = 3075399680, flags = 135266419, pgoff = 36864, inode = 508391 }
+vm_state.vm_map: 13589.851870964 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075399680, end = 3075559424, flags = 1048691, pgoff = 3075399680, inode = 0 }
+vm_state.vm_map: 13589.851872936 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075559424, end = 3075706880, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 13589.851874901 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075706880, end = 3075710976, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 13589.851876848 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075710976, end = 3075715072, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 13589.851879006 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075715072, end = 3075801088, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 13589.851881058 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075801088, end = 3075805184, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 13589.851883005 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075805184, end = 3075809280, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 13589.851885298 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075809280, end = 3075817472, flags = 1048691, pgoff = 3075809280, inode = 0 }
+vm_state.vm_map: 13589.851887270 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075817472, end = 3075895296, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 13589.851889230 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075895296, end = 3075899392, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 13589.851891301 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075899392, end = 3075903488, flags = 1048691, pgoff = 3075899392, inode = 0 }
+vm_state.vm_map: 13589.851893272 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3075903488, end = 3076509696, flags = 134217845, pgoff = 0, inode = 22471 }
+vm_state.vm_map: 13589.851895374 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3076509696, end = 3076526080, flags = 135266419, pgoff = 602112, inode = 22471 }
+vm_state.vm_map: 13589.851897352 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3076526080, end = 3076792320, flags = 134217845, pgoff = 0, inode = 19427 }
+vm_state.vm_map: 13589.851899417 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3076792320, end = 3076804608, flags = 135266417, pgoff = 266240, inode = 19427 }
+vm_state.vm_map: 13589.851901370 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3076804608, end = 3076808704, flags = 135266419, pgoff = 278528, inode = 19427 }
+vm_state.vm_map: 13589.851903441 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3076808704, end = 3076816896, flags = 134217845, pgoff = 0, inode = 499720 }
+vm_state.vm_map: 13589.851905506 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3076816896, end = 3076820992, flags = 135266419, pgoff = 4096, inode = 499720 }
+vm_state.vm_map: 13589.851907490 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3076820992, end = 3076980736, flags = 134217845, pgoff = 0, inode = 18680 }
+vm_state.vm_map: 13589.851909437 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3076980736, end = 3076984832, flags = 135266419, pgoff = 159744, inode = 18680 }
+vm_state.vm_map: 13589.851911402 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3076984832, end = 3077644288, flags = 134217845, pgoff = 0, inode = 19419 }
+vm_state.vm_map: 13589.851913460 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3077644288, end = 3077668864, flags = 135266419, pgoff = 659456, inode = 19419 }
+vm_state.vm_map: 13589.851915580 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3077668864, end = 3077832704, flags = 134217845, pgoff = 0, inode = 17950 }
+vm_state.vm_map: 13589.851917912 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3077832704, end = 3077836800, flags = 135266419, pgoff = 163840, inode = 17950 }
+vm_state.vm_map: 13589.851919976 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3077836800, end = 3077840896, flags = 1048691, pgoff = 3077836800, inode = 0 }
+vm_state.vm_map: 13589.851922108 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3077840896, end = 3077890048, flags = 134217845, pgoff = 0, inode = 19447 }
+vm_state.vm_map: 13589.851924111 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3077890048, end = 3077894144, flags = 135266419, pgoff = 49152, inode = 19447 }
+vm_state.vm_map: 13589.851926195 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3077894144, end = 3078160384, flags = 134217845, pgoff = 0, inode = 19433 }
+vm_state.vm_map: 13589.851928209 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3078160384, end = 3078168576, flags = 135266419, pgoff = 262144, inode = 19433 }
+vm_state.vm_map: 13589.851930336 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3078168576, end = 3078172672, flags = 1048691, pgoff = 3078168576, inode = 0 }
+vm_state.vm_map: 13589.851932301 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3078193152, end = 3078197248, flags = 134217979, pgoff = 0, inode = 1204461 }
+vm_state.vm_map: 13589.851934267 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3078197248, end = 3078201344, flags = 134217979, pgoff = 0, inode = 1204278 }
+vm_state.vm_map: 13589.851936530 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3078201344, end = 3078205440, flags = 134217979, pgoff = 0, inode = 1204274 }
+vm_state.vm_map: 13589.851938706 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3078205440, end = 3078213632, flags = 134217845, pgoff = 0, inode = 1450400 }
+vm_state.vm_map: 13589.851940721 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3078213632, end = 3078217728, flags = 135266417, pgoff = 4096, inode = 1450400 }
+vm_state.vm_map: 13589.851942841 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3078217728, end = 3078221824, flags = 135266419, pgoff = 8192, inode = 1450400 }
+vm_state.vm_map: 13589.851944911 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3078221824, end = 3078230016, flags = 134217845, pgoff = 0, inode = 1450327 }
+vm_state.vm_map: 13589.851946877 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3078230016, end = 3078234112, flags = 135266417, pgoff = 4096, inode = 1450327 }
+vm_state.vm_map: 13589.851948961 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3078234112, end = 3078238208, flags = 135266419, pgoff = 8192, inode = 1450327 }
+vm_state.vm_map: 13589.851951414 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3078238208, end = 3078266880, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 13589.851953485 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3078266880, end = 3078275072, flags = 1048691, pgoff = 3078266880, inode = 0 }
+vm_state.vm_map: 13589.851955432 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3078275072, end = 3078279168, flags = 67371125, pgoff = 3078275072, inode = 0 }
+vm_state.vm_map: 13589.851957583 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3078279168, end = 3078393856, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 13589.851959667 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3078393856, end = 3078397952, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 13589.851961632 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3078397952, end = 3078402048, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 13589.851963678 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 25016, start = 3220881408, end = 3220967424, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.851969328 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 134512640, end = 135303168, flags = 134223989, pgoff = 0, inode = 1048715 }
+vm_state.vm_map: 13589.851971287 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 135303168, end = 135323648, flags = 135272563, pgoff = 790528, inode = 1048715 }
+vm_state.vm_map: 13589.851973389 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 135323648, end = 135344128, flags = 1048691, pgoff = 135323648, inode = 0 }
+vm_state.vm_map: 13589.851975515 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 155627520, end = 155979776, flags = 1048691, pgoff = 155627520, inode = 0 }
+vm_state.vm_map: 13589.851977919 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3075928064, end = 3075969024, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 13589.851979991 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3075969024, end = 3075973120, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 13589.851982055 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3075973120, end = 3075977216, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 13589.851984231 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3075977216, end = 3076014080, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 13589.851986672 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3076014080, end = 3076018176, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 13589.851988886 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3076018176, end = 3076022272, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 13589.851991228 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3076022272, end = 3076100096, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 13589.851993367 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3076100096, end = 3076104192, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 13589.851995444 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3076104192, end = 3076108288, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 13589.851997520 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3076108288, end = 3076116480, flags = 1048691, pgoff = 3076108288, inode = 0 }
+vm_state.vm_map: 13589.851999641 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3076116480, end = 3076141056, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 13589.852001706 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3076141056, end = 3076145152, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 13589.852003764 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3076145152, end = 3076149248, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 13589.852005859 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3076149248, end = 3077480448, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 13589.852007801 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3077480448, end = 3077484544, flags = 1048691, pgoff = 3077480448, inode = 0 }
+vm_state.vm_map: 13589.852009872 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3077484544, end = 3078799360, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 13589.852011942 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3078799360, end = 3078807552, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 13589.852014013 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3078807552, end = 3078811648, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 13589.852016003 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3078811648, end = 3078828032, flags = 1048691, pgoff = 3078811648, inode = 0 }
+vm_state.vm_map: 13589.852018297 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3078828032, end = 3078836224, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 13589.852020583 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3078836224, end = 3078840320, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 13589.852022525 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3078840320, end = 3078844416, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 13589.852024626 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3078844416, end = 3079061504, flags = 134217845, pgoff = 0, inode = 499784 }
+vm_state.vm_map: 13589.852026573 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3079061504, end = 3079073792, flags = 135266419, pgoff = 217088, inode = 499784 }
+vm_state.vm_map: 13589.852028638 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3079139328, end = 3079168000, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 13589.852030579 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3079168000, end = 3079176192, flags = 1048691, pgoff = 3079168000, inode = 0 }
+vm_state.vm_map: 13589.852032551 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3079176192, end = 3079180288, flags = 67371125, pgoff = 3079176192, inode = 0 }
+vm_state.vm_map: 13589.852034751 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3079180288, end = 3079294976, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 13589.852036692 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3079294976, end = 3079299072, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 13589.852038633 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3079299072, end = 3079303168, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 13589.852043683 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30050, start = 3217379328, end = 3217465344, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.852049289 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 134512640, end = 134541312, flags = 134223989, pgoff = 0, inode = 1048590 }
+vm_state.vm_map: 13589.852051249 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 134541312, end = 134545408, flags = 135272563, pgoff = 24576, inode = 1048590 }
+vm_state.vm_map: 13589.852053369 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 134545408, end = 134561792, flags = 1048691, pgoff = 134545408, inode = 0 }
+vm_state.vm_map: 13589.852055823 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 152788992, end = 152924160, flags = 1048691, pgoff = 152788992, inode = 0 }
+vm_state.vm_map: 13589.852058017 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3074134016, end = 3074162688, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 13589.852059996 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3074162688, end = 3074166784, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 13589.852061949 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3074166784, end = 3074170880, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 13589.852064020 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3074170880, end = 3074256896, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 13589.852065973 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3074256896, end = 3074260992, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 13589.852067921 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3074260992, end = 3074265088, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 13589.852069861 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3074265088, end = 3074273280, flags = 1048691, pgoff = 3074265088, inode = 0 }
+vm_state.vm_map: 13589.852071945 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3074273280, end = 3074498560, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.852091329 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3074498560, end = 3074502656, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.852093474 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3074502656, end = 3074506752, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.852095829 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3074506752, end = 3074543616, flags = 134217845, pgoff = 0, inode = 508391 }
+vm_state.vm_map: 13589.852097881 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3074543616, end = 3074547712, flags = 135266417, pgoff = 32768, inode = 508391 }
+vm_state.vm_map: 13589.852100050 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3074547712, end = 3074551808, flags = 135266419, pgoff = 36864, inode = 508391 }
+vm_state.vm_map: 13589.852102097 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3074551808, end = 3074711552, flags = 1048691, pgoff = 3074551808, inode = 0 }
+vm_state.vm_map: 13589.852104409 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3074711552, end = 3074760704, flags = 134217845, pgoff = 0, inode = 500088 }
+vm_state.vm_map: 13589.852106931 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3074760704, end = 3074764800, flags = 135266419, pgoff = 45056, inode = 500088 }
+vm_state.vm_map: 13589.852108983 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3074764800, end = 3074813952, flags = 1048691, pgoff = 3074764800, inode = 0 }
+vm_state.vm_map: 13589.852111209 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3074813952, end = 3074912256, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 13589.852113255 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3074912256, end = 3074916352, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 13589.852115307 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3074916352, end = 3074920448, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 13589.852117501 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3074973696, end = 3075010560, flags = 134217845, pgoff = 0, inode = 499730 }
+vm_state.vm_map: 13589.852119547 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3075010560, end = 3075014656, flags = 135266419, pgoff = 32768, inode = 499730 }
+vm_state.vm_map: 13589.852121742 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3075014656, end = 3075055616, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 13589.852123818 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3075055616, end = 3075059712, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 13589.852125864 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3075059712, end = 3075063808, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 13589.852128250 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3075063808, end = 3075100672, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 13589.852130259 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3075100672, end = 3075104768, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 13589.852149620 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3075104768, end = 3075108864, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 13589.852152066 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3075108864, end = 3075186688, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 13589.852154360 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3075186688, end = 3075190784, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 13589.852156412 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3075190784, end = 3075194880, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 13589.852159045 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3075194880, end = 3075203072, flags = 1048691, pgoff = 3075194880, inode = 0 }
+vm_state.vm_map: 13589.852161345 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3075203072, end = 3075227648, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 13589.852163392 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3075227648, end = 3075231744, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 13589.852165555 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3075231744, end = 3075235840, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 13589.852167916 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3075235840, end = 3076567040, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 13589.852170104 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3076567040, end = 3076571136, flags = 1048691, pgoff = 3076567040, inode = 0 }
+vm_state.vm_map: 13589.852172386 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3076571136, end = 3076579328, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 13589.852174549 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3076579328, end = 3076583424, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 13589.852176663 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3076583424, end = 3076587520, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 13589.852178974 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3076587520, end = 3077902336, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 13589.852180990 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3077902336, end = 3077910528, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 13589.852183271 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3077910528, end = 3077914624, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 13589.852185261 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3077914624, end = 3077931008, flags = 1048691, pgoff = 3077914624, inode = 0 }
+vm_state.vm_map: 13589.852187579 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3077931008, end = 3077939200, flags = 134217845, pgoff = 0, inode = 499739 }
+vm_state.vm_map: 13589.852189625 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3077939200, end = 3077943296, flags = 135266419, pgoff = 4096, inode = 499739 }
+vm_state.vm_map: 13589.852192061 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3077943296, end = 3077984256, flags = 134217845, pgoff = 0, inode = 499738 }
+vm_state.vm_map: 13589.852194372 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3077984256, end = 3077988352, flags = 135266419, pgoff = 40960, inode = 499738 }
+vm_state.vm_map: 13589.852196684 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3077996544, end = 3078004736, flags = 134217845, pgoff = 0, inode = 17167 }
+vm_state.vm_map: 13589.852198650 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3078004736, end = 3078008832, flags = 135266419, pgoff = 8192, inode = 17167 }
+vm_state.vm_map: 13589.852200961 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3078008832, end = 3078017024, flags = 134217845, pgoff = 0, inode = 499908 }
+vm_state.vm_map: 13589.852202996 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3078017024, end = 3078021120, flags = 135266419, pgoff = 4096, inode = 499908 }
+vm_state.vm_map: 13589.852205474 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3078021120, end = 3078025216, flags = 134217845, pgoff = 0, inode = 500082 }
+vm_state.vm_map: 13589.852207532 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3078025216, end = 3078029312, flags = 135266419, pgoff = 0, inode = 500082 }
+vm_state.vm_map: 13589.852209708 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3078029312, end = 3078033408, flags = 134217845, pgoff = 0, inode = 499797 }
+vm_state.vm_map: 13589.852211778 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3078033408, end = 3078037504, flags = 135266419, pgoff = 0, inode = 499797 }
+vm_state.vm_map: 13589.852213974 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3078041600, end = 3078049792, flags = 134217845, pgoff = 0, inode = 500086 }
+vm_state.vm_map: 13589.852216118 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3078049792, end = 3078053888, flags = 135266419, pgoff = 4096, inode = 500086 }
+vm_state.vm_map: 13589.852218473 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3078053888, end = 3078066176, flags = 134217845, pgoff = 0, inode = 500089 }
+vm_state.vm_map: 13589.852220439 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3078066176, end = 3078070272, flags = 135266419, pgoff = 8192, inode = 500089 }
+vm_state.vm_map: 13589.852222745 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3078070272, end = 3078074368, flags = 134217845, pgoff = 0, inode = 499772 }
+vm_state.vm_map: 13589.852224785 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3078074368, end = 3078078464, flags = 135266419, pgoff = 0, inode = 499772 }
+vm_state.vm_map: 13589.852226837 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3078082560, end = 3078090752, flags = 1048691, pgoff = 3078082560, inode = 0 }
+vm_state.vm_map: 13589.852229154 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3078090752, end = 3078094848, flags = 67371125, pgoff = 3078090752, inode = 0 }
+vm_state.vm_map: 13589.852231486 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3078094848, end = 3078209536, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 13589.852233550 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3078209536, end = 3078213632, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 13589.852235583 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3078213632, end = 3078217728, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 13589.852237629 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30060, start = 3220029440, end = 3220115456, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.852240361 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 134512640, end = 135303168, flags = 134223989, pgoff = 0, inode = 1048715 }
+vm_state.vm_map: 13589.852242414 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 135303168, end = 135323648, flags = 135272563, pgoff = 790528, inode = 1048715 }
+vm_state.vm_map: 13589.852244472 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 135323648, end = 135344128, flags = 1048691, pgoff = 135323648, inode = 0 }
+vm_state.vm_map: 13589.852246456 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 153812992, end = 154083328, flags = 1048691, pgoff = 153812992, inode = 0 }
+vm_state.vm_map: 13589.852248780 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3074777088, end = 3074818048, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 13589.852250950 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3074818048, end = 3074822144, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 13589.852252997 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3074822144, end = 3074826240, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 13589.852255086 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3074826240, end = 3074863104, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 13589.852257261 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3074863104, end = 3074867200, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 13589.852259227 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3074867200, end = 3074871296, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 13589.852261515 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3074871296, end = 3074949120, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 13589.852264030 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3074949120, end = 3074953216, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 13589.852266064 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3074953216, end = 3074957312, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 13589.852268116 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3074957312, end = 3074965504, flags = 1048691, pgoff = 3074957312, inode = 0 }
+vm_state.vm_map: 13589.852270310 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3074965504, end = 3074990080, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 13589.852272357 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3074990080, end = 3074994176, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 13589.852274409 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3074994176, end = 3074998272, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 13589.852276492 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3074998272, end = 3076329472, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 13589.852278445 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3076329472, end = 3076333568, flags = 1048691, pgoff = 3076329472, inode = 0 }
+vm_state.vm_map: 13589.852280769 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3076333568, end = 3077648384, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 13589.852282778 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3077648384, end = 3077656576, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 13589.852284948 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3077656576, end = 3077660672, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 13589.852287037 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3077660672, end = 3077677056, flags = 1048691, pgoff = 3077660672, inode = 0 }
+vm_state.vm_map: 13589.852289336 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3077677056, end = 3077685248, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 13589.852291438 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3077685248, end = 3077689344, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 13589.852293608 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3077689344, end = 3077693440, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 13589.852295722 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3077693440, end = 3077910528, flags = 134217845, pgoff = 0, inode = 499784 }
+vm_state.vm_map: 13589.852298244 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3077910528, end = 3077922816, flags = 135266419, pgoff = 217088, inode = 499784 }
+vm_state.vm_map: 13589.852300450 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3077988352, end = 3078017024, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 13589.852302627 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3078017024, end = 3078025216, flags = 1048691, pgoff = 3078017024, inode = 0 }
+vm_state.vm_map: 13589.852304679 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3078025216, end = 3078029312, flags = 67371125, pgoff = 3078025216, inode = 0 }
+vm_state.vm_map: 13589.852306854 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3078029312, end = 3078144000, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 13589.852309012 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3078144000, end = 3078148096, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 13589.852311070 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3078148096, end = 3078152192, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 13589.852313066 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 30068, start = 3220430848, end = 3220516864, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.852316386 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 134512640, end = 134545408, flags = 134223989, pgoff = 0, inode = 18385 }
+vm_state.vm_map: 13589.852318549 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 134545408, end = 134549504, flags = 135272563, pgoff = 28672, inode = 18385 }
+vm_state.vm_map: 13589.852320787 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 134549504, end = 134553600, flags = 1048691, pgoff = 134549504, inode = 0 }
+vm_state.vm_map: 13589.852322877 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 149598208, end = 149733376, flags = 1048691, pgoff = 149598208, inode = 0 }
+vm_state.vm_map: 13589.852325355 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3074297856, end = 3074383872, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 13589.852327463 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3074383872, end = 3074387968, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 13589.852329775 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3074387968, end = 3074392064, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 13589.852331752 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3074392064, end = 3074400256, flags = 1048691, pgoff = 3074392064, inode = 0 }
+vm_state.vm_map: 13589.852334436 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3074400256, end = 3074625536, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 13589.852336544 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3074625536, end = 3074629632, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 13589.852338738 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3074629632, end = 3074633728, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 13589.852340728 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3074633728, end = 3074637824, flags = 1048691, pgoff = 3074633728, inode = 0 }
+vm_state.vm_map: 13589.852343033 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3074637824, end = 3074666496, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 13589.852345278 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3074666496, end = 3074703360, flags = 134217845, pgoff = 0, inode = 499730 }
+vm_state.vm_map: 13589.852348597 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3074703360, end = 3074707456, flags = 135266419, pgoff = 32768, inode = 499730 }
+vm_state.vm_map: 13589.852353535 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3074707456, end = 3074723840, flags = 134217845, pgoff = 0, inode = 500096 }
+vm_state.vm_map: 13589.852356460 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3074723840, end = 3074727936, flags = 135266419, pgoff = 12288, inode = 500096 }
+vm_state.vm_map: 13589.852358592 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3074727936, end = 3074764800, flags = 134217845, pgoff = 0, inode = 508391 }
+vm_state.vm_map: 13589.852361021 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3074764800, end = 3074768896, flags = 135266417, pgoff = 32768, inode = 508391 }
+vm_state.vm_map: 13589.852362988 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3074768896, end = 3074772992, flags = 135266419, pgoff = 36864, inode = 508391 }
+vm_state.vm_map: 13589.852365175 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3074772992, end = 3074932736, flags = 1048691, pgoff = 3074772992, inode = 0 }
+vm_state.vm_map: 13589.852367518 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3074932736, end = 3074981888, flags = 134217845, pgoff = 0, inode = 500088 }
+vm_state.vm_map: 13589.852370145 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3074981888, end = 3074985984, flags = 135266419, pgoff = 45056, inode = 500088 }
+vm_state.vm_map: 13589.852372222 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3074985984, end = 3075035136, flags = 1048691, pgoff = 3074985984, inode = 0 }
+vm_state.vm_map: 13589.852374572 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3075035136, end = 3075076096, flags = 134217845, pgoff = 0, inode = 507921 }
+vm_state.vm_map: 13589.852376759 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3075076096, end = 3075080192, flags = 135266417, pgoff = 36864, inode = 507921 }
+vm_state.vm_map: 13589.852378731 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3075080192, end = 3075084288, flags = 135266419, pgoff = 40960, inode = 507921 }
+vm_state.vm_map: 13589.852381030 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3075084288, end = 3075162112, flags = 134217845, pgoff = 0, inode = 508760 }
+vm_state.vm_map: 13589.852383194 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3075162112, end = 3075166208, flags = 135266417, pgoff = 73728, inode = 508760 }
+vm_state.vm_map: 13589.852385240 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3075166208, end = 3075170304, flags = 135266419, pgoff = 77824, inode = 508760 }
+vm_state.vm_map: 13589.852387194 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3075170304, end = 3075178496, flags = 1048691, pgoff = 3075170304, inode = 0 }
+vm_state.vm_map: 13589.852389635 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3075178496, end = 3075207168, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 13589.852391693 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3075207168, end = 3075211264, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 13589.852393752 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3075211264, end = 3075215360, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 13589.852395996 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3075215360, end = 3075223552, flags = 134217845, pgoff = 0, inode = 17167 }
+vm_state.vm_map: 13589.852398289 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3075223552, end = 3075227648, flags = 135266419, pgoff = 8192, inode = 17167 }
+vm_state.vm_map: 13589.852400458 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3075227648, end = 3075235840, flags = 134217845, pgoff = 0, inode = 499908 }
+vm_state.vm_map: 13589.852402511 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3075235840, end = 3075239936, flags = 135266419, pgoff = 4096, inode = 499908 }
+vm_state.vm_map: 13589.852404941 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3075239936, end = 3075252224, flags = 134217845, pgoff = 0, inode = 500089 }
+vm_state.vm_map: 13589.852407116 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3075252224, end = 3075256320, flags = 135266419, pgoff = 8192, inode = 500089 }
+vm_state.vm_map: 13589.852409279 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3075256320, end = 3075260416, flags = 134217845, pgoff = 0, inode = 500082 }
+vm_state.vm_map: 13589.852411455 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3075260416, end = 3075264512, flags = 135266419, pgoff = 0, inode = 500082 }
+vm_state.vm_map: 13589.852413532 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3075264512, end = 3075268608, flags = 134217845, pgoff = 0, inode = 499797 }
+vm_state.vm_map: 13589.852415707 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3075268608, end = 3075272704, flags = 135266419, pgoff = 0, inode = 499797 }
+vm_state.vm_map: 13589.852417927 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3075272704, end = 3076603904, flags = 134217841, pgoff = 0, inode = 33544 }
+vm_state.vm_map: 13589.852420091 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3076603904, end = 3076608000, flags = 1048691, pgoff = 3076603904, inode = 0 }
+vm_state.vm_map: 13589.852422204 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3076608000, end = 3076616192, flags = 134217845, pgoff = 0, inode = 508752 }
+vm_state.vm_map: 13589.852424505 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3076616192, end = 3076620288, flags = 135266417, pgoff = 4096, inode = 508752 }
+vm_state.vm_map: 13589.852426569 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3076620288, end = 3076624384, flags = 135266419, pgoff = 8192, inode = 508752 }
+vm_state.vm_map: 13589.852428738 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3076624384, end = 3077939200, flags = 134217845, pgoff = 0, inode = 508213 }
+vm_state.vm_map: 13589.852430790 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3077939200, end = 3077947392, flags = 135266417, pgoff = 1314816, inode = 508213 }
+vm_state.vm_map: 13589.852432960 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3077947392, end = 3077951488, flags = 135266419, pgoff = 1323008, inode = 508213 }
+vm_state.vm_map: 13589.852435007 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3077951488, end = 3077967872, flags = 1048691, pgoff = 3077951488, inode = 0 }
+vm_state.vm_map: 13589.852437201 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3077967872, end = 3078066176, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 13589.852439599 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3078066176, end = 3078070272, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 13589.852441632 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3078070272, end = 3078074368, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 13589.852443939 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3078074368, end = 3078115328, flags = 134217845, pgoff = 0, inode = 499738 }
+vm_state.vm_map: 13589.852446121 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3078115328, end = 3078119424, flags = 135266419, pgoff = 40960, inode = 499738 }
+vm_state.vm_map: 13589.852448197 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3078123520, end = 3078160384, flags = 134217845, pgoff = 0, inode = 508754 }
+vm_state.vm_map: 13589.852450373 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3078160384, end = 3078164480, flags = 135266417, pgoff = 32768, inode = 508754 }
+vm_state.vm_map: 13589.852452413 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3078164480, end = 3078168576, flags = 135266419, pgoff = 36864, inode = 508754 }
+vm_state.vm_map: 13589.852454799 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3078168576, end = 3078193152, flags = 134217845, pgoff = 0, inode = 508106 }
+vm_state.vm_map: 13589.852456765 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3078193152, end = 3078197248, flags = 135266417, pgoff = 24576, inode = 508106 }
+vm_state.vm_map: 13589.852458940 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3078197248, end = 3078201344, flags = 135266419, pgoff = 28672, inode = 508106 }
+vm_state.vm_map: 13589.852460993 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3078205440, end = 3078221824, flags = 1048691, pgoff = 3078205440, inode = 0 }
+vm_state.vm_map: 13589.852463032 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3078221824, end = 3078225920, flags = 67371125, pgoff = 3078221824, inode = 0 }
+vm_state.vm_map: 13589.852465135 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3078225920, end = 3078340608, flags = 134219893, pgoff = 0, inode = 499953 }
+vm_state.vm_map: 13589.852467304 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3078340608, end = 3078344704, flags = 135268465, pgoff = 110592, inode = 499953 }
+vm_state.vm_map: 13589.852469492 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3078344704, end = 3078348800, flags = 135268467, pgoff = 114688, inode = 499953 }
+vm_state.vm_map: 13589.852471538 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16857, start = 3220443136, end = 3220529152, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.852474456 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16865, start = 134512640, end = 135303168, flags = 134223989, pgoff = 0, inode = 1048715 }
+vm_state.vm_map: 13589.852476632 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16865, start = 135303168, end = 135323648, flags = 135272563, pgoff = 790528, inode = 1048715 }
+vm_state.vm_map: 13589.852478684 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16865, start = 135323648, end = 135344128, flags = 1048691, pgoff = 135323648, inode = 0 }
+vm_state.vm_map: 13589.852480872 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16865, start = 165560320, end = 165691392, flags = 1048691, pgoff = 165560320, inode = 0 }
+vm_state.vm_map: 13589.852482911 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16865, start = 3076657152, end = 3076661248, flags = 1048691, pgoff = 3076657152, inode = 0 }
+vm_state.vm_map: 13589.852485106 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16865, start = 3076661248, end = 3077976064, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 13589.852487158 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16865, start = 3077976064, end = 3077984256, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 13589.852489340 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16865, start = 3077984256, end = 3077988352, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 13589.852491405 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16865, start = 3077988352, end = 3078004736, flags = 1048691, pgoff = 3077988352, inode = 0 }
+vm_state.vm_map: 13589.852493723 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16865, start = 3078004736, end = 3078012928, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 13589.852495893 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16865, start = 3078012928, end = 3078017024, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 13589.852497945 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16865, start = 3078017024, end = 3078021120, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 13589.852500046 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16865, start = 3078021120, end = 3078238208, flags = 134217845, pgoff = 0, inode = 499784 }
+vm_state.vm_map: 13589.852502228 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16865, start = 3078238208, end = 3078250496, flags = 135266419, pgoff = 217088, inode = 499784 }
+vm_state.vm_map: 13589.852504385 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16865, start = 3078344704, end = 3078352896, flags = 1048691, pgoff = 3078344704, inode = 0 }
+vm_state.vm_map: 13589.852506437 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16865, start = 3078352896, end = 3078356992, flags = 67371125, pgoff = 3078352896, inode = 0 }
+vm_state.vm_map: 13589.852509090 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16865, start = 3078356992, end = 3078471680, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 13589.852511204 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16865, start = 3078471680, end = 3078475776, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 13589.852513231 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16865, start = 3078475776, end = 3078479872, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 13589.852515309 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16865, start = 3212824576, end = 3212910592, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.852517830 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 134512640, end = 135254016, flags = 134223989, pgoff = 0, inode = 20038 }
+vm_state.vm_map: 13589.852519981 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 135254016, end = 135270400, flags = 135272563, pgoff = 741376, inode = 20038 }
+vm_state.vm_map: 13589.852522033 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 135270400, end = 135282688, flags = 1048691, pgoff = 135270400, inode = 0 }
+vm_state.vm_map: 13589.852524184 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 158466048, end = 158601216, flags = 1048691, pgoff = 158466048, inode = 0 }
+vm_state.vm_map: 13589.852526446 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3073646592, end = 3073687552, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 13589.852528629 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3073687552, end = 3073691648, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 13589.852530681 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3073691648, end = 3073695744, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 13589.852532851 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3073695744, end = 3073732608, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 13589.852534922 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3073732608, end = 3073736704, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 13589.852537209 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3073736704, end = 3073740800, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 13589.852539539 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3073740800, end = 3073765376, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 13589.852541567 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3073765376, end = 3073769472, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 13589.852544082 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3073769472, end = 3073773568, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 13589.852546134 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3073773568, end = 3073777664, flags = 1048691, pgoff = 3073773568, inode = 0 }
+vm_state.vm_map: 13589.852548347 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3073777664, end = 3073789952, flags = 134217845, pgoff = 0, inode = 20765 }
+vm_state.vm_map: 13589.852550554 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3073789952, end = 3073794048, flags = 135266419, pgoff = 8192, inode = 20765 }
+vm_state.vm_map: 13589.852552625 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3073794048, end = 3073798144, flags = 1048691, pgoff = 3073794048, inode = 0 }
+vm_state.vm_map: 13589.852554702 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3073798144, end = 3074260992, flags = 134217845, pgoff = 0, inode = 20061 }
+vm_state.vm_map: 13589.852556643 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3074260992, end = 3074273280, flags = 135266419, pgoff = 458752, inode = 20061 }
+vm_state.vm_map: 13589.852558732 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3074273280, end = 3074351104, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 13589.852560673 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3074351104, end = 3074355200, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 13589.852562768 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3074355200, end = 3074416640, flags = 134217845, pgoff = 0, inode = 19423 }
+vm_state.vm_map: 13589.852564715 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3074416640, end = 3074420736, flags = 135266419, pgoff = 57344, inode = 19423 }
+vm_state.vm_map: 13589.852566768 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3074420736, end = 3074506752, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 13589.852568709 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3074506752, end = 3074510848, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 13589.852570656 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3074510848, end = 3074514944, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 13589.852572597 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3074514944, end = 3074523136, flags = 1048691, pgoff = 3074514944, inode = 0 }
+vm_state.vm_map: 13589.852574723 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3074523136, end = 3075837952, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 13589.852577097 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3075837952, end = 3075846144, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 13589.852579038 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3075846144, end = 3075850240, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 13589.852580979 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3075850240, end = 3075866624, flags = 1048691, pgoff = 3075850240, inode = 0 }
+vm_state.vm_map: 13589.852583099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3075866624, end = 3076059136, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 13589.852585169 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3076059136, end = 3076063232, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 13589.852587272 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3076063232, end = 3076669440, flags = 134217845, pgoff = 0, inode = 22471 }
+vm_state.vm_map: 13589.852589219 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3076669440, end = 3076685824, flags = 135266419, pgoff = 602112, inode = 22471 }
+vm_state.vm_map: 13589.852591314 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3076685824, end = 3078139904, flags = 134217845, pgoff = 0, inode = 17110 }
+vm_state.vm_map: 13589.852593249 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3078139904, end = 3078152192, flags = 135266419, pgoff = 1454080, inode = 17110 }
+vm_state.vm_map: 13589.852595480 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3078152192, end = 3078160384, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 13589.852597422 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3078160384, end = 3078164480, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 13589.852599480 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3078164480, end = 3078168576, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 13589.852601693 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3078168576, end = 3078316032, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 13589.852603633 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3078316032, end = 3078320128, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 13589.852605722 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3078320128, end = 3078324224, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 13589.852607911 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3078324224, end = 3078361088, flags = 134217845, pgoff = 0, inode = 508391 }
+vm_state.vm_map: 13589.852610340 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3078361088, end = 3078365184, flags = 135266417, pgoff = 32768, inode = 508391 }
+vm_state.vm_map: 13589.852612392 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3078365184, end = 3078369280, flags = 135266419, pgoff = 36864, inode = 508391 }
+vm_state.vm_map: 13589.852614451 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3078369280, end = 3078533120, flags = 1048691, pgoff = 3078369280, inode = 0 }
+vm_state.vm_map: 13589.852616881 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3078533120, end = 3078610944, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 13589.852619025 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3078610944, end = 3078615040, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 13589.852621195 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3078615040, end = 3078619136, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 13589.852623327 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3078619136, end = 3078627328, flags = 1048691, pgoff = 3078619136, inode = 0 }
+vm_state.vm_map: 13589.852625639 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3078627328, end = 3078696960, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 13589.852627679 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3078696960, end = 3078701056, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 13589.852629855 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3078701056, end = 3078705152, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 13589.852631901 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3078705152, end = 3078713344, flags = 1048691, pgoff = 3078705152, inode = 0 }
+vm_state.vm_map: 13589.852634330 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3078774784, end = 3078795264, flags = 134217845, pgoff = 0, inode = 508374 }
+vm_state.vm_map: 13589.852636326 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3078795264, end = 3078799360, flags = 135266417, pgoff = 16384, inode = 508374 }
+vm_state.vm_map: 13589.852638540 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3078799360, end = 3078803456, flags = 135266419, pgoff = 20480, inode = 508374 }
+vm_state.vm_map: 13589.852640580 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3078803456, end = 3078815744, flags = 1048691, pgoff = 3078803456, inode = 0 }
+vm_state.vm_map: 13589.852642545 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3078815744, end = 3078819840, flags = 67371125, pgoff = 3078815744, inode = 0 }
+vm_state.vm_map: 13589.852645283 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3078819840, end = 3078934528, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 13589.852647335 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3078934528, end = 3078938624, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 13589.852649456 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3078938624, end = 3078942720, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 13589.852651527 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16867, start = 3219210240, end = 3219746816, flags = 1048947, pgoff = 3220688896, inode = 0 }
+vm_state.vm_map: 13589.852657888 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16885, start = 134512640, end = 134541312, flags = 134223989, pgoff = 0, inode = 1048607 }
+vm_state.vm_map: 13589.852660045 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16885, start = 134541312, end = 134545408, flags = 135272563, pgoff = 28672, inode = 1048607 }
+vm_state.vm_map: 13589.852662091 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16885, start = 134545408, end = 134623232, flags = 1048691, pgoff = 134545408, inode = 0 }
+vm_state.vm_map: 13589.852664093 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16885, start = 141565952, end = 141701120, flags = 1048691, pgoff = 141565952, inode = 0 }
+vm_state.vm_map: 13589.852666201 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16885, start = 3076284416, end = 3076304896, flags = 134217845, pgoff = 0, inode = 508374 }
+vm_state.vm_map: 13589.852668352 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16885, start = 3076304896, end = 3076308992, flags = 135266417, pgoff = 16384, inode = 508374 }
+vm_state.vm_map: 13589.852670386 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16885, start = 3076308992, end = 3076313088, flags = 135266419, pgoff = 20480, inode = 508374 }
+vm_state.vm_map: 13589.852672537 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16885, start = 3076313088, end = 3076354048, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 13589.852674484 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16885, start = 3076354048, end = 3076358144, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 13589.852676431 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16885, start = 3076358144, end = 3076362240, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 13589.852678379 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16885, start = 3076362240, end = 3076370432, flags = 1048691, pgoff = 3076362240, inode = 0 }
+vm_state.vm_map: 13589.852680796 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16885, start = 3076370432, end = 3077685248, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 13589.852682749 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16885, start = 3077685248, end = 3077693440, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 13589.852684813 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16885, start = 3077693440, end = 3077697536, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 13589.852686760 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16885, start = 3077697536, end = 3077709824, flags = 1048691, pgoff = 3077697536, inode = 0 }
+vm_state.vm_map: 13589.852688855 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16885, start = 3077709824, end = 3077779456, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 13589.852690921 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16885, start = 3077779456, end = 3077783552, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 13589.852692868 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16885, start = 3077783552, end = 3077787648, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 13589.852694808 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16885, start = 3077787648, end = 3077795840, flags = 1048691, pgoff = 3077787648, inode = 0 }
+vm_state.vm_map: 13589.852696811 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16885, start = 3077885952, end = 3077898240, flags = 1048691, pgoff = 3077885952, inode = 0 }
+vm_state.vm_map: 13589.852698875 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16885, start = 3077898240, end = 3077902336, flags = 67371125, pgoff = 3077898240, inode = 0 }
+vm_state.vm_map: 13589.852701070 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16885, start = 3077902336, end = 3078017024, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 13589.852703017 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16885, start = 3078017024, end = 3078021120, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 13589.852704970 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16885, start = 3078021120, end = 3078025216, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 13589.852707060 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16885, start = 3217518592, end = 3217604608, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.852709699 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16887, start = 134512640, end = 134529024, flags = 134223989, pgoff = 0, inode = 32921 }
+vm_state.vm_map: 13589.852711659 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16887, start = 134529024, end = 134533120, flags = 135272563, pgoff = 12288, inode = 32921 }
+vm_state.vm_map: 13589.852713952 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16887, start = 134533120, end = 134537216, flags = 1048691, pgoff = 134533120, inode = 0 }
+vm_state.vm_map: 13589.852715905 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16887, start = 151330816, end = 151465984, flags = 1048691, pgoff = 151330816, inode = 0 }
+vm_state.vm_map: 13589.852717951 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16887, start = 3076509696, end = 3076517888, flags = 1048691, pgoff = 3076509696, inode = 0 }
+vm_state.vm_map: 13589.852720034 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16887, start = 3076517888, end = 3077832704, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 13589.852722013 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16887, start = 3077832704, end = 3077840896, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 13589.852723954 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16887, start = 3077840896, end = 3077844992, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 13589.852725913 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16887, start = 3077844992, end = 3077857280, flags = 1048691, pgoff = 3077844992, inode = 0 }
+vm_state.vm_map: 13589.852728453 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16887, start = 3077857280, end = 3077869568, flags = 134217845, pgoff = 0, inode = 32917 }
+vm_state.vm_map: 13589.852730407 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16887, start = 3077869568, end = 3077873664, flags = 135266419, pgoff = 8192, inode = 32917 }
+vm_state.vm_map: 13589.852732472 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16887, start = 3077873664, end = 3077877760, flags = 1048691, pgoff = 3077873664, inode = 0 }
+vm_state.vm_map: 13589.852734561 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16887, start = 3077963776, end = 3077980160, flags = 1048691, pgoff = 3077963776, inode = 0 }
+vm_state.vm_map: 13589.852736613 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16887, start = 3077980160, end = 3077984256, flags = 67371125, pgoff = 3077980160, inode = 0 }
+vm_state.vm_map: 13589.852738833 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16887, start = 3077984256, end = 3078098944, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 13589.852740804 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16887, start = 3078098944, end = 3078103040, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 13589.852742862 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16887, start = 3078103040, end = 3078107136, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 13589.852744809 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16887, start = 3219714048, end = 3219800064, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 13589.852747838 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16889, start = 134512640, end = 134529024, flags = 134223989, pgoff = 0, inode = 33221 }
+vm_state.vm_map: 13589.852749791 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16889, start = 134529024, end = 134533120, flags = 135272563, pgoff = 12288, inode = 33221 }
+vm_state.vm_map: 13589.852751739 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16889, start = 141680640, end = 141848576, flags = 1048691, pgoff = 141680640, inode = 0 }
+vm_state.vm_map: 13589.852753686 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16889, start = 3067645952, end = 3067650048, flags = 1048688, pgoff = 3067645952, inode = 0 }
+vm_state.vm_map: 13589.852755645 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16889, start = 3067650048, end = 3076046848, flags = 1048691, pgoff = 3067650048, inode = 0 }
+vm_state.vm_map: 13589.852757747 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16889, start = 3076046848, end = 3077361664, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 13589.852759775 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16889, start = 3077361664, end = 3077369856, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 13589.852761710 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16889, start = 3077369856, end = 3077373952, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 13589.852763656 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16889, start = 3077373952, end = 3077386240, flags = 1048691, pgoff = 3077373952, inode = 0 }
+vm_state.vm_map: 13589.852765721 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16889, start = 3077386240, end = 3077472256, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 13589.852767668 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16889, start = 3077472256, end = 3077476352, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 13589.852769610 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16889, start = 3077476352, end = 3077480448, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 13589.852771556 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16889, start = 3077480448, end = 3077488640, flags = 1048691, pgoff = 3077480448, inode = 0 }
+vm_state.vm_map: 13589.852773503 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16889, start = 3077578752, end = 3077591040, flags = 1048691, pgoff = 3077578752, inode = 0 }
+vm_state.vm_map: 13589.852775438 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16889, start = 3077591040, end = 3077595136, flags = 67371125, pgoff = 3077591040, inode = 0 }
+vm_state.vm_map: 13589.852777669 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16889, start = 3077595136, end = 3077709824, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 13589.852779963 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16889, start = 3077709824, end = 3077713920, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 13589.852781910 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16889, start = 3077713920, end = 3077718016, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 13589.852783851 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { pid = 16889, start = 3215716352, end = 3215802368, flags = 1048947, pgoff = 3221139456, inode = 0 }
+irq_state.interrupt: 13589.852830829 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "timer", irq_id = 0 }
+irq_state.interrupt: 13589.852900524 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "i8042", irq_id = 1 }
+irq_state.interrupt: 13589.852905599 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "floppy", irq_id = 6 }
+irq_state.interrupt: 13589.852913827 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "rtc0", irq_id = 8 }
+irq_state.interrupt: 13589.852917696 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "acpi", irq_id = 9 }
+irq_state.interrupt: 13589.852921442 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "i8042", irq_id = 12 }
+irq_state.interrupt: 13589.852925392 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "ide0", irq_id = 14 }
+irq_state.interrupt: 13589.852932686 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "ide1", irq_id = 15 }
+irq_state.interrupt: 13589.852939880 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "ehci_hcd:usb1", irq_id = 19 }
+irq_state.interrupt: 13589.852946248 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "eth0", irq_id = 19 }
+irq_state.interrupt: 13589.852950191 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "vboxadd", irq_id = 20 }
+irq_state.interrupt: 13589.852953999 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "ahci", irq_id = 21 }
+irq_state.interrupt: 13589.852963030 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "Intel 82801AA-ICH", irq_id = 21 }
+irq_state.interrupt: 13589.852969186 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "ohci_hcd:usb2", irq_id = 22 }
+netif_state.network_ipv4_interface: 13589.853014490 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/netif_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "lo", address = 2130706433, up = 0 }
+netif_state.network_ipv4_interface: 13589.853017525 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/netif_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { name = "eth0", address = 167772687, up = 0 }
+swap_state.statedump_swap_files: 13589.853027161 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/swap_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { filp = 0xf70be740, vfsmount = 0xf700eec0, dname = "hda1" }
+syscall_state.sys_call_table: 13589.853070480 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 0, address = 0xc10358fe, symbol = "sys_restart_syscall+0x0/0xf" }
+syscall_state.sys_call_table: 13589.853080253 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 1, address = 0xc102d16d, symbol = "sys_exit+0x0/0x11" }
+syscall_state.sys_call_table: 13589.853086583 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 2, address = 0xc1003448, symbol = "ptregs_fork+0x0/0xc" }
+syscall_state.sys_call_table: 13589.853098723 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 3, address = 0xc10ac4c3, symbol = "sys_read+0x0/0x9d" }
+syscall_state.sys_call_table: 13589.853101962 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 4, address = 0xc10ac29b, symbol = "sys_write+0x0/0x9d" }
+syscall_state.sys_call_table: 13589.853104972 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 5, address = 0xc10aa0ec, symbol = "sys_open+0x0/0x23" }
+syscall_state.sys_call_table: 13589.853107754 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 6, address = 0xc10a9ea9, symbol = "sys_close+0x0/0x112" }
+syscall_state.sys_call_table: 13589.853110412 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 7, address = 0xc102c96e, symbol = "sys_waitpid+0x0/0x17" }
+syscall_state.sys_call_table: 13589.853113113 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 8, address = 0xc10aa10f, symbol = "sys_creat+0x0/0x16" }
+syscall_state.sys_call_table: 13589.853122805 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 9, address = 0xc10b5ccb, symbol = "sys_link+0x0/0x19" }
+syscall_state.sys_call_table: 13589.853125654 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 10, address = 0xc10b5760, symbol = "sys_unlink+0x0/0xe" }
+syscall_state.sys_call_table: 13589.853128431 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 11, address = 0xc100346c, symbol = "ptregs_execve+0x0/0xc" }
+syscall_state.sys_call_table: 13589.853131323 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 12, address = 0xc10aa8e8, symbol = "sys_chdir+0x0/0x59" }
+syscall_state.sys_call_table: 13589.853134395 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 13, address = 0xc102de69, symbol = "sys_time+0x0/0x27" }
+syscall_state.sys_call_table: 13589.853137282 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 14, address = 0xc10b5ab2, symbol = "sys_mknod+0x0/0x17" }
+syscall_state.sys_call_table: 13589.853140002 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 15, address = 0xc10aa805, symbol = "sys_chmod+0x0/0x15" }
+syscall_state.sys_call_table: 13589.853145875 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 16, address = 0xc104e167, symbol = "sys_lchown16+0x0/0x35" }
+syscall_state.sys_call_table: 13589.853150115 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 17, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 13589.853152896 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 18, address = 0xc10af0b2, symbol = "sys_stat+0x0/0x23" }
+syscall_state.sys_call_table: 13589.853155665 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 19, address = 0xc10ab3fb, symbol = "sys_lseek+0x0/0x9b" }
+syscall_state.sys_call_table: 13589.853155667 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 20, address = 0xc103529a, symbol = "sys_getpid+0x0/0x16" }
+syscall_state.sys_call_table: 13589.853155669 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 21, address = 0xc10c0a14, symbol = "sys_mount+0x0/0x98" }
+syscall_state.sys_call_table: 13589.853155671 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 22, address = 0xc10bf90c, symbol = "sys_oldumount+0x0/0xe" }
+syscall_state.sys_call_table: 13589.853155673 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 23, address = 0xc104e09e, symbol = "sys_setuid16+0x0/0x1d" }
+syscall_state.sys_call_table: 13589.853155675 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 24, address = 0xc104dea0, symbol = "sys_getuid16+0x0/0x22" }
+syscall_state.sys_call_table: 13589.853155677 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 25, address = 0xc102dc82, symbol = "sys_stime+0x0/0x3f" }
+syscall_state.sys_call_table: 13589.853155679 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 26, address = 0xc1031d71, symbol = "sys_ptrace+0x0/0xae" }
+syscall_state.sys_call_table: 13589.853155681 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 27, address = 0xc10352b0, symbol = "sys_alarm+0x0/0x9" }
+syscall_state.sys_call_table: 13589.853155683 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 28, address = 0xc10af14c, symbol = "sys_fstat+0x0/0x24" }
+syscall_state.sys_call_table: 13589.853155685 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 29, address = 0xc1035a45, symbol = "sys_pause+0x0/0x16" }
+syscall_state.sys_call_table: 13589.853155687 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 30, address = 0xc10c741f, symbol = "sys_utime+0x0/0x5d" }
+syscall_state.sys_call_table: 13589.853155690 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 31, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 13589.853155693 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 32, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 13589.853155695 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 33, address = 0xc10aaa87, symbol = "sys_access+0x0/0x13" }
+syscall_state.sys_call_table: 13589.853155697 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 34, address = 0xc1026f47, symbol = "sys_nice+0x0/0x7c" }
+syscall_state.sys_call_table: 13589.853155699 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 35, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 13589.853155701 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 36, address = 0xc10c70f9, symbol = "sys_sync+0x0/0x29" }
+syscall_state.sys_call_table: 13589.853155703 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 37, address = 0xc1037e1c, symbol = "sys_kill+0x0/0x14c" }
+syscall_state.sys_call_table: 13589.853155705 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 38, address = 0xc10b5650, symbol = "sys_rename+0x0/0x15" }
+syscall_state.sys_call_table: 13589.853155707 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 39, address = 0xc10b590c, symbol = "sys_mkdir+0x0/0x13" }
+syscall_state.sys_call_table: 13589.853155709 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 40, address = 0xc10b5849, symbol = "sys_rmdir+0x0/0xe" }
+syscall_state.sys_call_table: 13589.853155711 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 41, address = 0xc10b6808, symbol = "sys_dup+0x0/0x36" }
+syscall_state.sys_call_table: 13589.853155713 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 42, address = 0xc10b1dac, symbol = "sys_pipe+0x0/0xe" }
+syscall_state.sys_call_table: 13589.853155715 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 43, address = 0xc10394a7, symbol = "sys_times+0x0/0x3f" }
+syscall_state.sys_call_table: 13589.853166399 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 44, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 13589.853173726 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 45, address = 0xc109c43a, symbol = "sys_brk+0x0/0xd3" }
+syscall_state.sys_call_table: 13589.853176688 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 46, address = 0xc104e0e8, symbol = "sys_setgid16+0x0/0x1d" }
+syscall_state.sys_call_table: 13589.853179120 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 47, address = 0xc104dee4, symbol = "sys_getgid16+0x0/0x22" }
+syscall_state.sys_call_table: 13589.853181484 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 48, address = 0xc10362d2, symbol = "sys_signal+0x0/0x3c" }
+syscall_state.sys_call_table: 13589.853184101 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 49, address = 0xc104dec2, symbol = "sys_geteuid16+0x0/0x22" }
+syscall_state.sys_call_table: 13589.853186594 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 50, address = 0xc104df06, symbol = "sys_getegid16+0x0/0x22" }
+syscall_state.sys_call_table: 13589.853192290 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 51, address = 0xc1057e28, symbol = "sys_acct+0x0/0x238" }
+syscall_state.sys_call_table: 13589.853195368 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 52, address = 0xc10bf635, symbol = "sys_umount+0x0/0x2d7" }
+syscall_state.sys_call_table: 13589.853198207 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 53, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 13589.853200651 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 54, address = 0xc10b709b, symbol = "sys_ioctl+0x0/0x9d" }
+syscall_state.sys_call_table: 13589.853203570 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 55, address = 0xc10b67b5, symbol = "sys_fcntl+0x0/0x53" }
+syscall_state.sys_call_table: 13589.853206323 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 56, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 13589.853208994 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 57, address = 0xc103929e, symbol = "sys_setpgid+0x0/0x175" }
+syscall_state.sys_call_table: 13589.853211753 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 58, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 13589.853215317 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 59, address = 0xc1006380, symbol = "sys_olduname+0x0/0x11d" }
+syscall_state.sys_call_table: 13589.853217854 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 60, address = 0xc10387e4, symbol = "sys_umask+0x0/0x19" }
+syscall_state.sys_call_table: 13589.853221099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 61, address = 0xc10aa81a, symbol = "sys_chroot+0x0/0x6c" }
+syscall_state.sys_call_table: 13589.853223519 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 62, address = 0xc10ad850, symbol = "sys_ustat+0x0/0x89" }
+syscall_state.sys_call_table: 13589.853226382 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 63, address = 0xc10b6978, symbol = "sys_dup2+0x0/0x5c" }
+syscall_state.sys_call_table: 13589.853229412 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 64, address = 0xc1035249, symbol = "sys_getppid+0x0/0x51" }
+syscall_state.sys_call_table: 13589.853231997 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 65, address = 0xc1039295, symbol = "sys_getpgrp+0x0/0x9" }
+syscall_state.sys_call_table: 13589.853234503 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 66, address = 0xc103911e, symbol = "sys_setsid+0x0/0xa1" }
+syscall_state.sys_call_table: 13589.853237330 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 67, address = 0xc1002f1f, symbol = "sys_sigaction+0x0/0xe7" }
+syscall_state.sys_call_table: 13589.853240254 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 68, address = 0xc1035a36, symbol = "sys_sgetmask+0x0/0xf" }
+syscall_state.sys_call_table: 13589.853243203 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 69, address = 0xc1035ca8, symbol = "sys_ssetmask+0x0/0x6b" }
+syscall_state.sys_call_table: 13589.853245752 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 70, address = 0xc104e0bb, symbol = "sys_setreuid16+0x0/0x2d" }
+syscall_state.sys_call_table: 13589.853248295 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 71, address = 0xc104e105, symbol = "sys_setregid16+0x0/0x2d" }
+syscall_state.sys_call_table: 13589.853250980 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 72, address = 0xc1003006, symbol = "sys_sigsuspend+0x0/0xba" }
+syscall_state.sys_call_table: 13589.853254003 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 73, address = 0xc1035fe8, symbol = "sys_sigpending+0x0/0xe" }
+syscall_state.sys_call_table: 13589.853256614 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 74, address = 0xc1038fda, symbol = "sys_sethostname+0x0/0xa5" }
+syscall_state.sys_call_table: 13589.853259205 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 75, address = 0xc1038d61, symbol = "sys_setrlimit+0x0/0xe4" }
+syscall_state.sys_call_table: 13589.853261823 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 76, address = 0xc1038e45, symbol = "sys_old_getrlimit+0x0/0x81" }
+syscall_state.sys_call_table: 13589.853264741 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 77, address = 0xc1038cf2, symbol = "sys_getrusage+0x0/0x25" }
+syscall_state.sys_call_table: 13589.853267641 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 78, address = 0xc102de16, symbol = "sys_gettimeofday+0x0/0x53" }
+syscall_state.sys_call_table: 13589.853270498 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 79, address = 0xc102dda2, symbol = "sys_settimeofday+0x0/0x74" }
+syscall_state.sys_call_table: 13589.853273047 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 80, address = 0xc104de0a, symbol = "sys_getgroups16+0x0/0x96" }
+syscall_state.sys_call_table: 13589.853275571 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 81, address = 0xc104df28, symbol = "sys_setgroups16+0x0/0xba" }
+syscall_state.sys_call_table: 13589.853278607 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 82, address = 0xc10066a7, symbol = "old_select+0x0/0x40" }
+syscall_state.sys_call_table: 13589.853281526 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 83, address = 0xc10b5b76, symbol = "sys_symlink+0x0/0x13" }
+syscall_state.sys_call_table: 13589.853284068 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 84, address = 0xc10af037, symbol = "sys_lstat+0x0/0x23" }
+syscall_state.sys_call_table: 13589.853286630 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 85, address = 0xc10aedc9, symbol = "sys_readlink+0x0/0x17" }
+syscall_state.sys_call_table: 13589.853289290 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 86, address = 0xc10b13e1, symbol = "sys_uselib+0x0/0x13f" }
+syscall_state.sys_call_table: 13589.853291987 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 87, address = 0xc10a285b, symbol = "sys_swapon+0x0/0xb3f" }
+syscall_state.sys_call_table: 13589.853294800 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 88, address = 0xc1039d01, symbol = "sys_reboot+0x0/0x15c" }
+syscall_state.sys_call_table: 13589.853297330 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 89, address = 0xc10b788f, symbol = "sys_old_readdir+0x0/0x51" }
+syscall_state.sys_call_table: 13589.853300317 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 90, address = 0xc100675d, symbol = "old_mmap+0x0/0x57" }
+syscall_state.sys_call_table: 13589.853303100 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 91, address = 0xc109bdc6, symbol = "sys_munmap+0x0/0x3d" }
+syscall_state.sys_call_table: 13589.853306068 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 92, address = 0xc10aafba, symbol = "sys_truncate+0x0/0x12" }
+syscall_state.sys_call_table: 13589.853309252 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 93, address = 0xc10aadb3, symbol = "sys_ftruncate+0x0/0x1b" }
+syscall_state.sys_call_table: 13589.853312010 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 94, address = 0xc10aa595, symbol = "sys_fchmod+0x0/0xbc" }
+syscall_state.sys_call_table: 13589.853314528 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 95, address = 0xc104e132, symbol = "sys_fchown16+0x0/0x35" }
+syscall_state.sys_call_table: 13589.853317207 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 96, address = 0xc1039e62, symbol = "sys_getpriority+0x0/0x1ab" }
+syscall_state.sys_call_table: 13589.853320051 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 97, address = 0xc103a08c, symbol = "sys_setpriority+0x0/0x1cc" }
+syscall_state.sys_call_table: 13589.853322914 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 98, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 13589.853325746 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 99, address = 0xc10ab259, symbol = "sys_statfs+0x0/0x63" }
+syscall_state.sys_call_table: 13589.853328567 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 100, address = 0xc10ab205, symbol = "sys_fstatfs+0x0/0x54" }
+syscall_state.sys_call_table: 13589.853331559 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 101, address = 0xc100532f, symbol = "sys_ioperm+0x0/0x1a5" }
+syscall_state.sys_call_table: 13589.853350369 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 102, address = 0xc14b72ad, symbol = "sys_socketcall+0x0/0x1ea" }
+syscall_state.sys_call_table: 13589.853353066 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 103, address = 0xc102af4d, symbol = "sys_syslog+0x0/0x11" }
+syscall_state.sys_call_table: 13589.853356156 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 104, address = 0xc102d607, symbol = "sys_setitimer+0x0/0x6f" }
+syscall_state.sys_call_table: 13589.853358878 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 105, address = 0xc102d8ae, symbol = "sys_getitimer+0x0/0x42" }
+syscall_state.sys_call_table: 13589.853361501 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 106, address = 0xc10af08f, symbol = "sys_newstat+0x0/0x23" }
+syscall_state.sys_call_table: 13589.853364068 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 107, address = 0xc10af014, symbol = "sys_newlstat+0x0/0x23" }
+syscall_state.sys_call_table: 13589.853366629 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 108, address = 0xc10af129, symbol = "sys_newfstat+0x0/0x23" }
+syscall_state.sys_call_table: 13589.853369549 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 109, address = 0xc100649d, symbol = "sys_uname+0x0/0x49" }
+syscall_state.sys_call_table: 13589.853372264 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 110, address = 0xc100343c, symbol = "ptregs_iopl+0x0/0xc" }
+syscall_state.sys_call_table: 13589.853375016 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 111, address = 0xc10a9e3a, symbol = "sys_vhangup+0x0/0x1b" }
+syscall_state.sys_call_table: 13589.853377872 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 112, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 13589.853380650 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 113, address = 0xc10034a8, symbol = "ptregs_vm86old+0x0/0x18" }
+syscall_state.sys_call_table: 13589.853383279 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 114, address = 0xc102c8cd, symbol = "sys_wait4+0x0/0xa1" }
+syscall_state.sys_call_table: 13589.853385741 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 115, address = 0xc10a37d9, symbol = "sys_swapoff+0x0/0x9eb" }
+syscall_state.sys_call_table: 13589.853388783 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 116, address = 0xc1034f23, symbol = "sys_sysinfo+0x0/0x2a" }
+syscall_state.sys_call_table: 13589.853391739 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 117, address = 0xc10064e6, symbol = "sys_ipc+0x0/0x1c1" }
+syscall_state.sys_call_table: 13589.853394565 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 118, address = 0xc10c6ec3, symbol = "sys_fsync+0x0/0x8" }
+syscall_state.sys_call_table: 13589.853397317 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 119, address = 0xc1003484, symbol = "ptregs_sigreturn+0x0/0xc" }
+syscall_state.sys_call_table: 13589.853400353 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 120, address = 0xc1003454, symbol = "ptregs_clone+0x0/0xc" }
+syscall_state.sys_call_table: 13589.853403037 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 121, address = 0xc1038f2b, symbol = "sys_setdomainname+0x0/0xaf" }
+syscall_state.sys_call_table: 13589.853405851 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 122, address = 0xc10390dc, symbol = "sys_newuname+0x0/0x42" }
+syscall_state.sys_call_table: 13589.853408720 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 123, address = 0xc100583a, symbol = "sys_modify_ldt+0x0/0x111" }
+syscall_state.sys_call_table: 13589.853411743 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 124, address = 0xc102dc39, symbol = "sys_adjtimex+0x0/0x49" }
+syscall_state.sys_call_table: 13589.853414489 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 125, address = 0xc109d119, symbol = "sys_mprotect+0x0/0x1df" }
+syscall_state.sys_call_table: 13589.853417537 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 126, address = 0xc1035e43, symbol = "sys_sigprocmask+0x0/0xfc" }
+syscall_state.sys_call_table: 13589.853420381 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 127, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 13589.853423787 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 128, address = 0xc1052845, symbol = "sys_init_module+0x0/0x1fb" }
+syscall_state.sys_call_table: 13589.853426662 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 129, address = 0xc1052661, symbol = "sys_delete_module+0x0/0x1e4" }
+syscall_state.sys_call_table: 13589.853429452 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 130, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 13589.853435891 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 131, address = 0xc10e1bea, symbol = "sys_quotactl+0x0/0x6b6" }
+syscall_state.sys_call_table: 13589.853438490 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 132, address = 0xc103922a, symbol = "sys_getpgid+0x0/0x6b" }
+syscall_state.sys_call_table: 13589.853441396 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 133, address = 0xc10aa886, symbol = "sys_fchdir+0x0/0x62" }
+syscall_state.sys_call_table: 13589.853444339 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 134, address = 0xc10c7d7d, symbol = "sys_bdflush+0x0/0x54" }
+syscall_state.sys_call_table: 13589.853447615 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 135, address = 0xc10be0da, symbol = "sys_sysfs+0x0/0x162" }
+syscall_state.sys_call_table: 13589.853450397 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 136, address = 0xc1029b63, symbol = "sys_personality+0x0/0x3d" }
+syscall_state.sys_call_table: 13589.853453200 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 137, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 13589.853455730 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 138, address = 0xc104dfff, symbol = "sys_setfsuid16+0x0/0x1d" }
+syscall_state.sys_call_table: 13589.853458471 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 139, address = 0xc104dfe2, symbol = "sys_setfsgid16+0x0/0x1d" }
+syscall_state.sys_call_table: 13589.853461364 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 140, address = 0xc10ac560, symbol = "sys_llseek+0x0/0xc1" }
+syscall_state.sys_call_table: 13589.853463851 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 141, address = 0xc10b77f1, symbol = "sys_getdents+0x0/0x9e" }
+syscall_state.sys_call_table: 13589.853466351 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 142, address = 0xc10b8a79, symbol = "sys_select+0x0/0x8f" }
+syscall_state.sys_call_table: 13589.853472601 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 143, address = 0xc10d8b43, symbol = "sys_flock+0x0/0x12d" }
+syscall_state.sys_call_table: 13589.853475279 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 144, address = 0xc109dba8, symbol = "sys_msync+0x0/0x164" }
+syscall_state.sys_call_table: 13589.853478136 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 145, address = 0xc10ac040, symbol = "sys_readv+0x0/0xcd" }
+syscall_state.sys_call_table: 13589.853480962 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 146, address = 0xc10abe9c, symbol = "sys_writev+0x0/0xcd" }
+syscall_state.sys_call_table: 13589.853483585 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 147, address = 0xc10391bf, symbol = "sys_getsid+0x0/0x6b" }
+syscall_state.sys_call_table: 13589.853486393 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 148, address = 0xc10c6eb8, symbol = "sys_fdatasync+0x0/0xb" }
+syscall_state.sys_call_table: 13589.853488899 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 149, address = 0xc103133d, symbol = "sys_sysctl+0x0/0xfb" }
+syscall_state.sys_call_table: 13589.853491891 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 150, address = 0xc109a6b7, symbol = "sys_mlock+0x0/0xac" }
+syscall_state.sys_call_table: 13589.853494428 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 151, address = 0xc109a661, symbol = "sys_munlock+0x0/0x56" }
+syscall_state.sys_call_table: 13589.853496958 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 152, address = 0xc109a519, symbol = "sys_mlockall+0x0/0x98" }
+syscall_state.sys_call_table: 13589.853499532 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 153, address = 0xc109a4e7, symbol = "sys_munlockall+0x0/0x32" }
+syscall_state.sys_call_table: 13589.853502745 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 154, address = 0xc10275aa, symbol = "sys_sched_setparam+0x0/0xd" }
+syscall_state.sys_call_table: 13589.853505825 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 155, address = 0xc1024eb0, symbol = "sys_sched_getparam+0x0/0xc4" }
+syscall_state.sys_call_table: 13589.853509032 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 156, address = 0xc10275b7, symbol = "sys_sched_setscheduler+0x0/0x1b" }
+syscall_state.sys_call_table: 13589.853512044 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 157, address = 0xc1024f74, symbol = "sys_sched_getscheduler+0x0/0x88" }
+syscall_state.sys_call_table: 13589.853514919 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 158, address = 0xc10226cb, symbol = "sys_sched_yield+0x0/0x32" }
+syscall_state.sys_call_table: 13589.853519328 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 159, address = 0xc101ee30, symbol = "sys_sched_get_priority_max+0x0/0x24" }
+syscall_state.sys_call_table: 13589.853522560 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 160, address = 0xc101ee54, symbol = "sys_sched_get_priority_min+0x0/0x24" }
+syscall_state.sys_call_table: 13589.853525632 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 161, address = 0xc1024b89, symbol = "sys_sched_rr_get_interval+0x0/0xcb" }
+syscall_state.sys_call_table: 13589.853531764 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 162, address = 0xc1041a4a, symbol = "sys_nanosleep+0x0/0x51" }
+syscall_state.sys_call_table: 13589.853534492 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 163, address = 0xc109db62, symbol = "sys_mremap+0x0/0x46" }
+syscall_state.sys_call_table: 13589.853537084 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 164, address = 0xc104e05d, symbol = "sys_setresuid16+0x0/0x41" }
+syscall_state.sys_call_table: 13589.853540010 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 165, address = 0xc104dd2c, symbol = "sys_getresuid16+0x0/0x6f" }
+syscall_state.sys_call_table: 13589.853542762 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 166, address = 0xc100349c, symbol = "ptregs_vm86+0x0/0xc" }
+syscall_state.sys_call_table: 13589.853545526 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 167, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 13589.853548007 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 168, address = 0xc10b821d, symbol = "sys_poll+0x0/0x8d" }
+syscall_state.sys_call_table: 13589.853550938 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 169, address = 0xc10d9520, symbol = "sys_nfsservctl+0x0/0x170" }
+syscall_state.sys_call_table: 13589.853553506 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 170, address = 0xc104e01c, symbol = "sys_setresgid16+0x0/0x41" }
+syscall_state.sys_call_table: 13589.853556042 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 171, address = 0xc104dd9b, symbol = "sys_getresgid16+0x0/0x6f" }
+syscall_state.sys_call_table: 13589.853558647 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 172, address = 0xc1038838, symbol = "sys_prctl+0x0/0x1fe" }
+syscall_state.sys_call_table: 13589.853561454 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 173, address = 0xc1003490, symbol = "ptregs_rt_sigreturn+0x0/0xc" }
+syscall_state.sys_call_table: 13589.853564028 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 174, address = 0xc103630e, symbol = "sys_rt_sigaction+0x0/0x79" }
+syscall_state.sys_call_table: 13589.853567285 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 175, address = 0xc1036003, symbol = "sys_rt_sigprocmask+0x0/0xcf" }
+syscall_state.sys_call_table: 13589.853570346 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 176, address = 0xc1035ff6, symbol = "sys_rt_sigpending+0x0/0xd" }
+syscall_state.sys_call_table: 13589.853573030 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 177, address = 0xc1038110, symbol = "sys_rt_sigtimedwait+0x0/0x245" }
+syscall_state.sys_call_table: 13589.853575727 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 178, address = 0xc1037fae, symbol = "sys_rt_sigqueueinfo+0x0/0x4f" }
+syscall_state.sys_call_table: 13589.853578750 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 179, address = 0xc1035bd5, symbol = "sys_rt_sigsuspend+0x0/0xd3" }
+syscall_state.sys_call_table: 13589.853581774 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 180, address = 0xc10ac409, symbol = "sys_pread64+0x0/0xba" }
+syscall_state.sys_call_table: 13589.853584969 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 181, address = 0xc10ac1e1, symbol = "sys_pwrite64+0x0/0xba" }
+syscall_state.sys_call_table: 13589.853587450 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 182, address = 0xc104e19c, symbol = "sys_chown16+0x0/0x38" }
+syscall_state.sys_call_table: 13589.853590103 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 183, address = 0xc10ba068, symbol = "sys_getcwd+0x0/0x18d" }
+syscall_state.sys_call_table: 13589.853592566 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 184, address = 0xc1031668, symbol = "sys_capget+0x0/0x114" }
+syscall_state.sys_call_table: 13589.853594962 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 185, address = 0xc1031525, symbol = "sys_capset+0x0/0x143" }
+syscall_state.sys_call_table: 13589.853597856 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 186, address = 0xc1003478, symbol = "ptregs_sigaltstack+0x0/0xc" }
+syscall_state.sys_call_table: 13589.853600775 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 187, address = 0xc10abc70, symbol = "sys_sendfile+0x0/0x7c" }
+syscall_state.sys_call_table: 13589.853603693 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 188, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 13589.853606420 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 189, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 13589.853609098 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 190, address = 0xc1003460, symbol = "ptregs_vfork+0x0/0xc" }
+syscall_state.sys_call_table: 13589.853611851 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 191, address = 0xc1038ec6, symbol = "sys_getrlimit+0x0/0x65" }
+syscall_state.sys_call_table: 13589.853614862 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 192, address = 0xc10066e7, symbol = "sys_mmap2+0x0/0x76" }
+syscall_state.sys_call_table: 13589.853617712 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 193, address = 0xc10aafa9, symbol = "sys_truncate64+0x0/0x11" }
+syscall_state.sys_call_table: 13589.853620526 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 194, address = 0xc10aad92, symbol = "sys_ftruncate64+0x0/0x21" }
+syscall_state.sys_call_table: 13589.853623119 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 195, address = 0xc10af06c, symbol = "sys_stat64+0x0/0x23" }
+syscall_state.sys_call_table: 13589.853625649 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 196, address = 0xc10aeff1, symbol = "sys_lstat64+0x0/0x23" }
+syscall_state.sys_call_table: 13589.853628549 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 197, address = 0xc10af106, symbol = "sys_fstat64+0x0/0x23" }
+syscall_state.sys_call_table: 13589.853631282 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 198, address = 0xc10aa651, symbol = "sys_lchown+0x0/0x54" }
+syscall_state.sys_call_table: 13589.853633943 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 199, address = 0xc10324ee, symbol = "sys_getuid+0x0/0xf" }
+syscall_state.sys_call_table: 13589.853636449 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 200, address = 0xc103250c, symbol = "sys_getgid+0x0/0xf" }
+syscall_state.sys_call_table: 13589.853638905 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 201, address = 0xc10324fd, symbol = "sys_geteuid+0x0/0xf" }
+syscall_state.sys_call_table: 13589.853641547 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 202, address = 0xc103251b, symbol = "sys_getegid+0x0/0xf" }
+syscall_state.sys_call_table: 13589.853644133 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 203, address = 0xc1039a7c, symbol = "sys_setreuid+0x0/0xf8" }
+syscall_state.sys_call_table: 13589.853646824 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 204, address = 0xc10396da, symbol = "sys_setregid+0x0/0xce" }
+syscall_state.sys_call_table: 13589.853650253 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 205, address = 0xc1043e1b, symbol = "sys_getgroups+0x0/0x83" }
+syscall_state.sys_call_table: 13589.853652864 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 206, address = 0xc10440e9, symbol = "sys_setgroups+0x0/0xbf" }
+syscall_state.sys_call_table: 13589.853655616 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 207, address = 0xc10aa52d, symbol = "sys_fchown+0x0/0x68" }
+syscall_state.sys_call_table: 13589.853658263 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 208, address = 0xc10398bc, symbol = "sys_setresuid+0x0/0x11b" }
+syscall_state.sys_call_table: 13589.853660954 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 209, address = 0xc1038770, symbol = "sys_getresuid+0x0/0x3a" }
+syscall_state.sys_call_table: 13589.853663571 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 210, address = 0xc1039568, symbol = "sys_setresgid+0x0/0xf1" }
+syscall_state.sys_call_table: 13589.853666096 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 211, address = 0xc10387aa, symbol = "sys_getresgid+0x0/0x3a" }
+syscall_state.sys_call_table: 13589.853668786 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 212, address = 0xc10aa710, symbol = "sys_chown+0x0/0x57" }
+syscall_state.sys_call_table: 13589.853671828 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 213, address = 0xc10399d7, symbol = "sys_setuid+0x0/0xa5" }
+syscall_state.sys_call_table: 13589.853674371 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 214, address = 0xc1039659, symbol = "sys_setgid+0x0/0x81" }
+syscall_state.sys_call_table: 13589.853676944 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 215, address = 0xc10397a8, symbol = "sys_setfsuid+0x0/0x97" }
+syscall_state.sys_call_table: 13589.853679475 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 216, address = 0xc10394e6, symbol = "sys_setfsgid+0x0/0x82" }
+syscall_state.sys_call_table: 13589.853682554 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 217, address = 0xc10bea88, symbol = "sys_pivot_root+0x0/0x392" }
+syscall_state.sys_call_table: 13589.853685336 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 218, address = 0xc1099c29, symbol = "sys_mincore+0x0/0x33f" }
+syscall_state.sys_call_table: 13589.853687799 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 219, address = 0xc109599c, symbol = "sys_madvise+0x0/0x424" }
+syscall_state.sys_call_table: 13589.853690354 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 220, address = 0xc10b774c, symbol = "sys_getdents64+0x0/0xa5" }
+syscall_state.sys_call_table: 13589.853693340 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 221, address = 0xc10b673c, symbol = "sys_fcntl64+0x0/0x79" }
+syscall_state.sys_call_table: 13589.853696112 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 222, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 13589.853698907 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 223, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 13589.853701887 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 224, address = 0xc1034f4d, symbol = "sys_gettid+0x0/0xe" }
+syscall_state.sys_call_table: 13589.853707816 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 225, address = 0xc1082f0d, symbol = "sys_readahead+0x0/0xa3" }
+syscall_state.sys_call_table: 13589.853710581 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 226, address = 0xc10c23ce, symbol = "sys_setxattr+0x0/0x62" }
+syscall_state.sys_call_table: 13589.853713148 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 227, address = 0xc10c236f, symbol = "sys_lsetxattr+0x0/0x5f" }
+syscall_state.sys_call_table: 13589.853716079 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 228, address = 0xc10c230f, symbol = "sys_fsetxattr+0x0/0x60" }
+syscall_state.sys_call_table: 13589.853718616 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 229, address = 0xc10c2116, symbol = "sys_getxattr+0x0/0x48" }
+syscall_state.sys_call_table: 13589.853721097 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 230, address = 0xc10c20d1, symbol = "sys_lgetxattr+0x0/0x45" }
+syscall_state.sys_call_table: 13589.853723733 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 231, address = 0xc10c208e, symbol = "sys_fgetxattr+0x0/0x43" }
+syscall_state.sys_call_table: 13589.853726263 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 232, address = 0xc10c1eab, symbol = "sys_listxattr+0x0/0x43" }
+syscall_state.sys_call_table: 13589.853728781 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 233, address = 0xc10c1e6b, symbol = "sys_llistxattr+0x0/0x40" }
+syscall_state.sys_call_table: 13589.853731306 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 234, address = 0xc10c1e2d, symbol = "sys_flistxattr+0x0/0x3e" }
+syscall_state.sys_call_table: 13589.853733873 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 235, address = 0xc10c1cf8, symbol = "sys_removexattr+0x0/0x53" }
+syscall_state.sys_call_table: 13589.853736466 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 236, address = 0xc10c1ca8, symbol = "sys_lremovexattr+0x0/0x50" }
+syscall_state.sys_call_table: 13589.853758256 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 237, address = 0xc10c1c56, symbol = "sys_fremovexattr+0x0/0x52" }
+syscall_state.sys_call_table: 13589.853761291 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 238, address = 0xc1037320, symbol = "sys_tkill+0x0/0x16" }
+syscall_state.sys_call_table: 13589.853764358 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 239, address = 0xc10abbf4, symbol = "sys_sendfile64+0x0/0x7c" }
+syscall_state.sys_call_table: 13589.853768261 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 240, address = 0xc104ce90, symbol = "sys_futex+0x0/0x111" }
+syscall_state.sys_call_table: 13589.853771401 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 241, address = 0xc1024e71, symbol = "sys_sched_setaffinity+0x0/0x3f" }
+syscall_state.sys_call_table: 13589.853774418 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 242, address = 0xc1024d0f, symbol = "sys_sched_getaffinity+0x0/0x3d" }
+syscall_state.sys_call_table: 13589.853781874 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 243, address = 0xc100aebd, symbol = "sys_set_thread_area+0x0/0x1b" }
+syscall_state.sys_call_table: 13589.853784769 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 244, address = 0xc100adf1, symbol = "sys_get_thread_area+0x0/0x16" }
+syscall_state.sys_call_table: 13589.853787779 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 245, address = 0xc10d621a, symbol = "sys_io_setup+0x0/0x30a" }
+syscall_state.sys_call_table: 13589.853790427 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 246, address = 0xc10d6182, symbol = "sys_io_destroy+0x0/0x1c" }
+syscall_state.sys_call_table: 13589.853793160 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 247, address = 0xc10d6816, symbol = "sys_io_getevents+0x0/0x2f9" }
+syscall_state.sys_call_table: 13589.853795839 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 248, address = 0xc10d6ba2, symbol = "sys_io_submit+0x0/0x47e" }
+syscall_state.sys_call_table: 13589.853798481 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 249, address = 0xc10d5db8, symbol = "sys_io_cancel+0x0/0x131" }
+syscall_state.sys_call_table: 13589.853801510 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 250, address = 0xc1085cc2, symbol = "sys_fadvise64+0x0/0x22" }
+syscall_state.sys_call_table: 13589.853804342 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 251, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 13589.853807156 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 252, address = 0xc102d159, symbol = "sys_exit_group+0x0/0x14" }
+syscall_state.sys_call_table: 13589.853814599 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 253, address = 0xc10f5b26, symbol = "sys_lookup_dcookie+0x0/0x13a" }
+syscall_state.sys_call_table: 13589.853817328 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 254, address = 0xc10d3ed5, symbol = "sys_epoll_create+0x0/0x1b" }
+syscall_state.sys_call_table: 13589.853819852 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 255, address = 0xc10d38e5, symbol = "sys_epoll_ctl+0x0/0x472" }
+syscall_state.sys_call_table: 13589.853822327 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 256, address = 0xc10d35c2, symbol = "sys_epoll_wait+0x0/0x26d" }
+syscall_state.sys_call_table: 13589.853826299 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 257, address = 0xc1094eac, symbol = "sys_remap_file_pages+0x0/0x440" }
+syscall_state.sys_call_table: 13589.853829433 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 258, address = 0xc1027c0e, symbol = "sys_set_tid_address+0x0/0x18" }
+syscall_state.sys_call_table: 13589.853832037 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 259, address = 0xc103ddae, symbol = "sys_timer_create+0x0/0x2f5" }
+syscall_state.sys_call_table: 13589.853834598 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 260, address = 0xc103db03, symbol = "sys_timer_settime+0x0/0x235" }
+syscall_state.sys_call_table: 13589.853837129 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 261, address = 0xc103dd38, symbol = "sys_timer_gettime+0x0/0x76" }
+syscall_state.sys_call_table: 13589.853839783 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 262, address = 0xc103d9d5, symbol = "sys_timer_getoverrun+0x0/0x28" }
+syscall_state.sys_call_table: 13589.853842319 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 263, address = 0xc103d93c, symbol = "sys_timer_delete+0x0/0x99" }
+syscall_state.sys_call_table: 13589.853844850 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 264, address = 0xc103d668, symbol = "sys_clock_settime+0x0/0x7d" }
+syscall_state.sys_call_table: 13589.853847387 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 265, address = 0xc103d5ea, symbol = "sys_clock_gettime+0x0/0x7e" }
+syscall_state.sys_call_table: 13589.853849930 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 266, address = 0xc103d56a, symbol = "sys_clock_getres+0x0/0x80" }
+syscall_state.sys_call_table: 13589.853852534 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 267, address = 0xc103d4b7, symbol = "sys_clock_nanosleep+0x0/0xb3" }
+syscall_state.sys_call_table: 13589.853855526 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 268, address = 0xc10ab0aa, symbol = "sys_statfs64+0x0/0x95" }
+syscall_state.sys_call_table: 13589.853858359 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 269, address = 0xc10ab02a, symbol = "sys_fstatfs64+0x0/0x80" }
+syscall_state.sys_call_table: 13589.853860877 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 270, address = 0xc1037336, symbol = "sys_tgkill+0x0/0x1f" }
+syscall_state.sys_call_table: 13589.853863783 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 271, address = 0xc10c73b8, symbol = "sys_utimes+0x0/0x13" }
+syscall_state.sys_call_table: 13589.853866535 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 272, address = 0xc1085b24, symbol = "sys_fadvise64_64+0x0/0x19e" }
+syscall_state.sys_call_table: 13589.853869362 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 273, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 13589.853872428 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 274, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 13589.853875143 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 275, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 13589.853877828 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 276, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 13589.853892482 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 277, address = 0xc13e52ba, symbol = "sys_mq_open+0x0/0x2e2" }
+syscall_state.sys_call_table: 13589.853895215 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 278, address = 0xc13e513d, symbol = "sys_mq_unlink+0x0/0xdf" }
+syscall_state.sys_call_table: 13589.853898005 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 279, address = 0xc13e4d62, symbol = "sys_mq_timedsend+0x0/0x3db" }
+syscall_state.sys_call_table: 13589.853900849 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 280, address = 0xc13e4a51, symbol = "sys_mq_timedreceive+0x0/0x311" }
+syscall_state.sys_call_table: 13589.853903620 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 281, address = 0xc13e45e9, symbol = "sys_mq_notify+0x0/0x2a0" }
+syscall_state.sys_call_table: 13589.853906428 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 282, address = 0xc13e4475, symbol = "sys_mq_getsetattr+0x0/0x174" }
+syscall_state.sys_call_table: 13589.853909359 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 283, address = 0xc1058be3, symbol = "sys_kexec_load+0x0/0x4ad" }
+syscall_state.sys_call_table: 13589.853912178 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 284, address = 0xc102c985, symbol = "sys_waitid+0x0/0x111" }
+syscall_state.sys_call_table: 13589.853915024 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 285, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 13589.853918779 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 286, address = 0xc13e8487, symbol = "sys_add_key+0x0/0x139" }
+syscall_state.sys_call_table: 13589.853921673 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 287, address = 0xc13e837b, symbol = "sys_request_key+0x0/0x10c" }
+syscall_state.sys_call_table: 13589.853924529 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 288, address = 0xc13e82c4, symbol = "sys_keyctl+0x0/0xb7" }
+syscall_state.sys_call_table: 13589.853928077 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 289, address = 0xc10cfe26, symbol = "sys_ioprio_set+0x0/0x1d6" }
+syscall_state.sys_call_table: 13589.853930853 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 290, address = 0xc10cfae3, symbol = "sys_ioprio_get+0x0/0x28b" }
+syscall_state.sys_call_table: 13589.853934098 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 291, address = 0xc10d2dd7, symbol = "sys_inotify_init+0x0/0x9" }
+syscall_state.sys_call_table: 13589.853937158 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 292, address = 0xc10d2994, symbol = "sys_inotify_add_watch+0x0/0x2ed" }
+syscall_state.sys_call_table: 13589.853940255 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 293, address = 0xc10d282e, symbol = "sys_inotify_rm_watch+0x0/0xc4" }
+syscall_state.sys_call_table: 13589.853943210 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 294, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 13589.853946050 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 295, address = 0xc10aa0c6, symbol = "sys_openat+0x0/0x26" }
+syscall_state.sys_call_table: 13589.853949036 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 296, address = 0xc10b5857, symbol = "sys_mkdirat+0x0/0xb5" }
+syscall_state.sys_call_table: 13589.853951960 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 297, address = 0xc10b591f, symbol = "sys_mknodat+0x0/0x193" }
+syscall_state.sys_call_table: 13589.853954767 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 298, address = 0xc10aa6a5, symbol = "sys_fchownat+0x0/0x6b" }
+syscall_state.sys_call_table: 13589.853957797 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 299, address = 0xc10c7334, symbol = "sys_futimesat+0x0/0x84" }
+syscall_state.sys_call_table: 13589.853960420 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 300, address = 0xc10aefae, symbol = "sys_fstatat64+0x0/0x2e" }
+syscall_state.sys_call_table: 13589.853963283 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 301, address = 0xc10b5820, symbol = "sys_unlinkat+0x0/0x29" }
+syscall_state.sys_call_table: 13589.853966553 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 302, address = 0xc10b5493, symbol = "sys_renameat+0x0/0x1bd" }
+syscall_state.sys_call_table: 13589.853969422 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 303, address = 0xc10b5be8, symbol = "sys_linkat+0x0/0xe3" }
+syscall_state.sys_call_table: 13589.853972328 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 304, address = 0xc10b5ac9, symbol = "sys_symlinkat+0x0/0xad" }
+syscall_state.sys_call_table: 13589.853974944 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 305, address = 0xc10aed48, symbol = "sys_readlinkat+0x0/0x81" }
+syscall_state.sys_call_table: 13589.853977764 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 306, address = 0xc10aa767, symbol = "sys_fchmodat+0x0/0x9e" }
+syscall_state.sys_call_table: 13589.853980597 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 307, address = 0xc10aa941, symbol = "sys_faccessat+0x0/0x146" }
+syscall_state.sys_call_table: 13589.853983164 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 308, address = 0xc10b8926, symbol = "sys_pselect6+0x0/0x153" }
+syscall_state.sys_call_table: 13589.853985627 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 309, address = 0xc10b8111, symbol = "sys_ppoll+0x0/0x10c" }
+syscall_state.sys_call_table: 13589.853988134 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 310, address = 0xc1027ea0, symbol = "sys_unshare+0x0/0x280" }
+syscall_state.sys_call_table: 13589.853991544 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 311, address = 0xc104a70f, symbol = "sys_set_robust_list+0x0/0x2d" }
+syscall_state.sys_call_table: 13589.853994610 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 312, address = 0xc104cfa1, symbol = "sys_get_robust_list+0x0/0xaf" }
+syscall_state.sys_call_table: 13589.853997436 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 313, address = 0xc10c54f1, symbol = "sys_splice+0x0/0x3fa" }
+syscall_state.sys_call_table: 13589.854000325 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 314, address = 0xc10c6c69, symbol = "sys_sync_file_range+0x0/0x101" }
+syscall_state.sys_call_table: 13589.854003033 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 315, address = 0xc10c51ed, symbol = "sys_tee+0x0/0x242" }
+syscall_state.sys_call_table: 13589.854005902 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 316, address = 0xc10c61b8, symbol = "sys_vmsplice+0x0/0x38f" }
+syscall_state.sys_call_table: 13589.854008685 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 317, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 13589.854011611 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 318, address = 0xc10387fd, symbol = "sys_getcpu+0x0/0x36" }
+syscall_state.sys_call_table: 13589.854014141 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 319, address = 0xc10d382f, symbol = "sys_epoll_pwait+0x0/0xb6" }
+syscall_state.sys_call_table: 13589.854017010 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 320, address = 0xc10c73cb, symbol = "sys_utimensat+0x0/0x54" }
+syscall_state.sys_call_table: 13589.854019535 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 321, address = 0xc10d474f, symbol = "sys_signalfd+0x0/0x19" }
+syscall_state.sys_call_table: 13589.854022090 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 322, address = 0xc10d4da0, symbol = "sys_timerfd_create+0x0/0xdc" }
+syscall_state.sys_call_table: 13589.854024626 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 323, address = 0xc10d5483, symbol = "sys_eventfd+0x0/0xe" }
+syscall_state.sys_call_table: 13589.854027452 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 324, address = 0xc10aab7d, symbol = "sys_fallocate+0x0/0x40" }
+syscall_state.sys_call_table: 13589.854030082 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 325, address = 0xc10d4b1a, symbol = "sys_timerfd_settime+0x0/0x217" }
+syscall_state.sys_call_table: 13589.854032717 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 326, address = 0xc10d4805, symbol = "sys_timerfd_gettime+0x0/0xe9" }
+syscall_state.sys_call_table: 13589.854035278 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 327, address = 0xc10d45a1, symbol = "sys_signalfd4+0x0/0x1ae" }
+syscall_state.sys_call_table: 13589.854037840 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 328, address = 0xc10d543b, symbol = "sys_eventfd2+0x0/0x48" }
+syscall_state.sys_call_table: 13589.854040377 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 329, address = 0xc10d3dbf, symbol = "sys_epoll_create1+0x0/0x116" }
+syscall_state.sys_call_table: 13589.854043375 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 330, address = 0xc10b683e, symbol = "sys_dup3+0x0/0x13a" }
+syscall_state.sys_call_table: 13589.854046078 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 331, address = 0xc10b1d63, symbol = "sys_pipe2+0x0/0x49" }
+syscall_state.sys_call_table: 13589.854049170 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 332, address = 0xc10d2c81, symbol = "sys_inotify_init1+0x0/0x156" }
+syscall_state.sys_call_table: 13589.854052100 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 333, address = 0xc10abfa9, symbol = "sys_preadv+0x0/0x97" }
+syscall_state.sys_call_table: 13589.854055252 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 334, address = 0xc10abe05, symbol = "sys_pwritev+0x0/0x97" }
+syscall_state.sys_call_table: 13589.854057893 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 335, address = 0xc1037278, symbol = "sys_rt_tgsigqueueinfo+0x0/0x47" }
+syscall_state.sys_call_table: 13589.854064691 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 336, address = 0xc108053d, symbol = "sys_perf_event_open+0x0/0x6a7" }
+softirq_state.softirq_vec: 13589.854068373 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 0, address = 0xc102e1f2, symbol = "tasklet_hi_action+0x0/0xec" }
+softirq_state.softirq_vec: 13589.854072117 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 1, address = 0xc1034c2c, symbol = "run_timer_softirq+0x0/0x254" }
+softirq_state.softirq_vec: 13589.854079142 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 2, address = 0xc14c0a3f, symbol = "net_tx_action+0x0/0xca" }
+softirq_state.softirq_vec: 13589.854084874 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 3, address = 0xc14c285c, symbol = "net_rx_action+0x0/0x1e8" }
+softirq_state.softirq_vec: 13589.854139094 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 4, address = 0xc1414d50, symbol = "blk_done_softirq+0x0/0x6c" }
+softirq_state.softirq_vec: 13589.854141841 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 5, address = 0xc141520d, symbol = "blk_iopoll_softirq+0x0/0xba" }
+softirq_state.softirq_vec: 13589.854144808 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 6, address = 0xc102e2de, symbol = "tasklet_action+0x0/0xec" }
+softirq_state.softirq_vec: 13589.854172571 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 7, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 13589.854175908 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 8, address = 0xc104160e, symbol = "run_hrtimer_softirq+0x0/0x5" }
+softirq_state.softirq_vec: 13589.854184707 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 9, address = 0xc106a2c7, symbol = "rcu_process_callbacks+0x0/0x1f" }
+softirq_state.softirq_vec: 13589.854189872 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 10, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 13589.854192028 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 11, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 13589.854194139 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 12, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 13589.854196251 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 13, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 13589.854198363 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 14, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 13589.854200476 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 15, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 13589.854202593 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 16, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 13589.854204711 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 17, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 13589.854206829 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 18, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 13589.854208941 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 19, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 13589.854211417 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 20, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 13589.854213535 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 21, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 13589.854215671 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 22, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 13589.854217795 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 23, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 13589.854219900 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 24, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 13589.854222149 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 25, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 13589.854224266 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 26, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 13589.854226403 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 27, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 13589.854228515 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 28, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 13589.854230626 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 29, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 13589.854232739 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 30, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 13589.854234832 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { id = 31, address = 0x0, symbol = "0x0" }
+irq_state.idt_table: 13589.854238267 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 0, address = 0xc1003b04, symbol = "divide_error+0x0/0xc" }
+irq_state.idt_table: 13589.854253445 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 1, address = 0xc1584ec4, symbol = "debug+0x0/0x11" }
+irq_state.idt_table: 13589.854256006 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 2, address = 0xc1584f14, symbol = "nmi+0x0/0x31" }
+irq_state.idt_table: 13589.854258531 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 3, address = 0xc158502c, symbol = "int3+0x0/0x30" }
+irq_state.idt_table: 13589.854261233 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 4, address = 0xc1003aa4, symbol = "overflow+0x0/0xc" }
+irq_state.idt_table: 13589.854264017 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 5, address = 0xc1003ab0, symbol = "bounds+0x0/0xc" }
+irq_state.idt_table: 13589.854266677 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 6, address = 0xc1003abc, symbol = "invalid_op+0x0/0xc" }
+irq_state.idt_table: 13589.854269627 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 7, address = 0xc1003a88, symbol = "device_not_available+0x0/0xc" }
+irq_state.idt_table: 13589.854273241 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 8, address = 0x0, symbol = "0x0" }
+irq_state.idt_table: 13589.854276177 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 9, address = 0xc1003ac8, symbol = "coprocessor_segment_overrun+0x0/0xc" }
+irq_state.idt_table: 13589.854278960 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 10, address = 0xc1003ad4, symbol = "invalid_TSS+0x0/0xc" }
+irq_state.idt_table: 13589.854281749 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 11, address = 0xc1003ae0, symbol = "segment_not_present+0x0/0xc" }
+irq_state.idt_table: 13589.854284514 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 12, address = 0xc1003aec, symbol = "stack_segment+0x0/0xc" }
+irq_state.idt_table: 13589.854287377 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 13, address = 0xc158505c, symbol = "general_protection+0x0/0xa" }
+irq_state.idt_table: 13589.854290006 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 14, address = 0xc1584e58, symbol = "page_fault+0x0/0x8" }
+irq_state.idt_table: 13589.854293005 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 15, address = 0xc1003b20, symbol = "spurious_interrupt_bug+0x0/0xc" }
+irq_state.idt_table: 13589.854296336 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 16, address = 0xc1003a70, symbol = "coprocessor_error+0x0/0xc" }
+irq_state.idt_table: 13589.854299131 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 17, address = 0xc1003af8, symbol = "alignment_check+0x0/0xc" }
+irq_state.idt_table: 13589.854301958 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 18, address = 0xc1003b10, symbol = "machine_check+0x0/0x10" }
+irq_state.idt_table: 13589.854304796 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 19, address = 0xc1003a7c, symbol = "simd_coprocessor_error+0x0/0xc" }
+irq_state.idt_table: 13589.854308958 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 20, address = 0xc17973a8, symbol = "ignore_int+0x0/0x46" }
+irq_state.idt_table: 13589.854311637 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 21, address = 0xc17973a8, symbol = "ignore_int+0x0/0x46" }
+irq_state.idt_table: 13589.854314284 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 22, address = 0xc17973a8, symbol = "ignore_int+0x0/0x46" }
+irq_state.idt_table: 13589.854316876 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 23, address = 0xc17973a8, symbol = "ignore_int+0x0/0x46" }
+irq_state.idt_table: 13589.854319400 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 24, address = 0xc17973a8, symbol = "ignore_int+0x0/0x46" }
+irq_state.idt_table: 13589.854322055 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 25, address = 0xc17973a8, symbol = "ignore_int+0x0/0x46" }
+irq_state.idt_table: 13589.854324604 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 26, address = 0xc17973a8, symbol = "ignore_int+0x0/0x46" }
+irq_state.idt_table: 13589.854327245 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 27, address = 0xc17973a8, symbol = "ignore_int+0x0/0x46" }
+irq_state.idt_table: 13589.854329794 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 28, address = 0xc17973a8, symbol = "ignore_int+0x0/0x46" }
+irq_state.idt_table: 13589.854332355 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 29, address = 0xc17973a8, symbol = "ignore_int+0x0/0x46" }
+irq_state.idt_table: 13589.854335034 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 30, address = 0xc17973a8, symbol = "ignore_int+0x0/0x46" }
+irq_state.idt_table: 13589.854337607 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 31, address = 0xc17973a8, symbol = "ignore_int+0x0/0x46" }
+irq_state.idt_table: 13589.854340858 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 32, address = 0xc10034c0, symbol = "irq_entries_start+0x0/0x400" }
+irq_state.idt_table: 13589.854343722 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 33, address = 0xc10034c4, symbol = "irq_entries_start+0x4/0x400" }
+irq_state.idt_table: 13589.854346560 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 34, address = 0xc10034c8, symbol = "irq_entries_start+0x8/0x400" }
+irq_state.idt_table: 13589.854349330 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 35, address = 0xc10034cc, symbol = "irq_entries_start+0xc/0x400" }
+irq_state.idt_table: 13589.854352151 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 36, address = 0xc10034d0, symbol = "irq_entries_start+0x10/0x400" }
+irq_state.idt_table: 13589.854354983 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 37, address = 0xc10034d4, symbol = "irq_entries_start+0x14/0x400" }
+irq_state.idt_table: 13589.854357772 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 38, address = 0xc10034d8, symbol = "irq_entries_start+0x18/0x400" }
+irq_state.idt_table: 13589.854360727 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 39, address = 0xc10034e0, symbol = "irq_entries_start+0x20/0x400" }
+irq_state.idt_table: 13589.854363522 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 40, address = 0xc10034e4, symbol = "irq_entries_start+0x24/0x400" }
+irq_state.idt_table: 13589.854366331 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 41, address = 0xc10034e8, symbol = "irq_entries_start+0x28/0x400" }
+irq_state.idt_table: 13589.854369360 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 42, address = 0xc10034ec, symbol = "irq_entries_start+0x2c/0x400" }
+irq_state.idt_table: 13589.854372094 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 43, address = 0xc10034f0, symbol = "irq_entries_start+0x30/0x400" }
+irq_state.idt_table: 13589.854375031 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 44, address = 0xc10034f4, symbol = "irq_entries_start+0x34/0x400" }
+irq_state.idt_table: 13589.854378121 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 45, address = 0xc10034f8, symbol = "irq_entries_start+0x38/0x400" }
+irq_state.idt_table: 13589.854381193 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 46, address = 0xc1003500, symbol = "irq_entries_start+0x40/0x400" }
+irq_state.idt_table: 13589.854384143 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 47, address = 0xc1003504, symbol = "irq_entries_start+0x44/0x400" }
+irq_state.idt_table: 13589.854387493 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 48, address = 0xc1003508, symbol = "irq_entries_start+0x48/0x400" }
+irq_state.idt_table: 13589.854390257 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 49, address = 0xc100350c, symbol = "irq_entries_start+0x4c/0x400" }
+irq_state.idt_table: 13589.854393612 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 50, address = 0xc1003510, symbol = "irq_entries_start+0x50/0x400" }
+irq_state.idt_table: 13589.854396488 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 51, address = 0xc1003514, symbol = "irq_entries_start+0x54/0x400" }
+irq_state.idt_table: 13589.854399277 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 52, address = 0xc1003518, symbol = "irq_entries_start+0x58/0x400" }
+irq_state.idt_table: 13589.854402060 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 53, address = 0xc1003520, symbol = "irq_entries_start+0x60/0x400" }
+irq_state.idt_table: 13589.854405028 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 54, address = 0xc1003524, symbol = "irq_entries_start+0x64/0x400" }
+irq_state.idt_table: 13589.854407836 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 55, address = 0xc1003528, symbol = "irq_entries_start+0x68/0x400" }
+irq_state.idt_table: 13589.854410939 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 56, address = 0xc100352c, symbol = "irq_entries_start+0x6c/0x400" }
+irq_state.idt_table: 13589.854413746 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 57, address = 0xc1003530, symbol = "irq_entries_start+0x70/0x400" }
+irq_state.idt_table: 13589.854416739 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 58, address = 0xc1003534, symbol = "irq_entries_start+0x74/0x400" }
+irq_state.idt_table: 13589.854419657 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 59, address = 0xc1003538, symbol = "irq_entries_start+0x78/0x400" }
+irq_state.idt_table: 13589.854422447 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 60, address = 0xc1003540, symbol = "irq_entries_start+0x80/0x400" }
+irq_state.idt_table: 13589.854425249 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 61, address = 0xc1003544, symbol = "irq_entries_start+0x84/0x400" }
+irq_state.idt_table: 13589.854428228 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 62, address = 0xc1003548, symbol = "irq_entries_start+0x88/0x400" }
+irq_state.idt_table: 13589.854431011 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 63, address = 0xc100354c, symbol = "irq_entries_start+0x8c/0x400" }
+irq_state.idt_table: 13589.854434355 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 64, address = 0xc1003550, symbol = "irq_entries_start+0x90/0x400" }
+irq_state.idt_table: 13589.854437193 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 65, address = 0xc1003554, symbol = "irq_entries_start+0x94/0x400" }
+irq_state.idt_table: 13589.854439921 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 66, address = 0xc1003558, symbol = "irq_entries_start+0x98/0x400" }
+irq_state.idt_table: 13589.854442777 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 67, address = 0xc1003560, symbol = "irq_entries_start+0xa0/0x400" }
+irq_state.idt_table: 13589.854445580 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 68, address = 0xc1003564, symbol = "irq_entries_start+0xa4/0x400" }
+irq_state.idt_table: 13589.854448467 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 69, address = 0xc1003568, symbol = "irq_entries_start+0xa8/0x400" }
+irq_state.idt_table: 13589.854451453 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 70, address = 0xc100356c, symbol = "irq_entries_start+0xac/0x400" }
+irq_state.idt_table: 13589.854454180 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 71, address = 0xc1003570, symbol = "irq_entries_start+0xb0/0x400" }
+irq_state.idt_table: 13589.854457253 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 72, address = 0xc1003574, symbol = "irq_entries_start+0xb4/0x400" }
+irq_state.idt_table: 13589.854460227 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 73, address = 0xc1003578, symbol = "irq_entries_start+0xb8/0x400" }
+irq_state.idt_table: 13589.854463090 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 74, address = 0xc1003580, symbol = "irq_entries_start+0xc0/0x400" }
+irq_state.idt_table: 13589.854465989 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 75, address = 0xc1003584, symbol = "irq_entries_start+0xc4/0x400" }
+irq_state.idt_table: 13589.854468946 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 76, address = 0xc1003588, symbol = "irq_entries_start+0xc8/0x400" }
+irq_state.idt_table: 13589.854471747 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 77, address = 0xc100358c, symbol = "irq_entries_start+0xcc/0x400" }
+irq_state.idt_table: 13589.854474844 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 78, address = 0xc1003590, symbol = "irq_entries_start+0xd0/0x400" }
+irq_state.idt_table: 13589.854477855 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 79, address = 0xc1003594, symbol = "irq_entries_start+0xd4/0x400" }
+irq_state.idt_table: 13589.854481210 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 80, address = 0xc1003598, symbol = "irq_entries_start+0xd8/0x400" }
+irq_state.idt_table: 13589.854483993 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 81, address = 0xc10035a0, symbol = "irq_entries_start+0xe0/0x400" }
+irq_state.idt_table: 13589.854486783 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 82, address = 0xc10035a4, symbol = "irq_entries_start+0xe4/0x400" }
+irq_state.idt_table: 13589.854489818 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 83, address = 0xc10035a8, symbol = "irq_entries_start+0xe8/0x400" }
+irq_state.idt_table: 13589.854492804 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 84, address = 0xc10035ac, symbol = "irq_entries_start+0xec/0x400" }
+irq_state.idt_table: 13589.854495613 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 85, address = 0xc10035b0, symbol = "irq_entries_start+0xf0/0x400" }
+irq_state.idt_table: 13589.854498592 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 86, address = 0xc10035b4, symbol = "irq_entries_start+0xf4/0x400" }
+irq_state.idt_table: 13589.854501541 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 87, address = 0xc10035b8, symbol = "irq_entries_start+0xf8/0x400" }
+irq_state.idt_table: 13589.854504380 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 88, address = 0xc10035c0, symbol = "irq_entries_start+0x100/0x400" }
+irq_state.idt_table: 13589.854507317 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 89, address = 0xc10035c4, symbol = "irq_entries_start+0x104/0x400" }
+irq_state.idt_table: 13589.854510180 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 90, address = 0xc10035c8, symbol = "irq_entries_start+0x108/0x400" }
+irq_state.idt_table: 13589.854512987 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 91, address = 0xc10035cc, symbol = "irq_entries_start+0x10c/0x400" }
+irq_state.idt_table: 13589.854515734 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 92, address = 0xc10035d0, symbol = "irq_entries_start+0x110/0x400" }
+irq_state.idt_table: 13589.854518646 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 93, address = 0xc10035d4, symbol = "irq_entries_start+0x114/0x400" }
+irq_state.idt_table: 13589.854521423 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 94, address = 0xc10035d8, symbol = "irq_entries_start+0x118/0x400" }
+irq_state.idt_table: 13589.854524200 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 95, address = 0xc10035e0, symbol = "irq_entries_start+0x120/0x400" }
+irq_state.idt_table: 13589.854527882 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 96, address = 0xc10035e4, symbol = "irq_entries_start+0x124/0x400" }
+irq_state.idt_table: 13589.854530665 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 97, address = 0xc10035e8, symbol = "irq_entries_start+0x128/0x400" }
+irq_state.idt_table: 13589.854533589 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 98, address = 0xc10035ec, symbol = "irq_entries_start+0x12c/0x400" }
+irq_state.idt_table: 13589.854536398 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 99, address = 0xc10035f0, symbol = "irq_entries_start+0x130/0x400" }
+irq_state.idt_table: 13589.854539107 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 100, address = 0xc10035f4, symbol = "irq_entries_start+0x134/0x400" }
+irq_state.idt_table: 13589.854541840 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 101, address = 0xc10035f8, symbol = "irq_entries_start+0x138/0x400" }
+irq_state.idt_table: 13589.854544604 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 102, address = 0xc1003600, symbol = "irq_entries_start+0x140/0x400" }
+irq_state.idt_table: 13589.854547356 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 103, address = 0xc1003604, symbol = "irq_entries_start+0x144/0x400" }
+irq_state.idt_table: 13589.854550473 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 104, address = 0xc1003608, symbol = "irq_entries_start+0x148/0x400" }
+irq_state.idt_table: 13589.854553268 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 105, address = 0xc100360c, symbol = "irq_entries_start+0x14c/0x400" }
+irq_state.idt_table: 13589.854556168 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 106, address = 0xc1003610, symbol = "irq_entries_start+0x150/0x400" }
+irq_state.idt_table: 13589.854559099 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 107, address = 0xc1003614, symbol = "irq_entries_start+0x154/0x400" }
+irq_state.idt_table: 13589.854561869 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 108, address = 0xc1003618, symbol = "irq_entries_start+0x158/0x400" }
+irq_state.idt_table: 13589.854564658 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 109, address = 0xc1003620, symbol = "irq_entries_start+0x160/0x400" }
+irq_state.idt_table: 13589.854567379 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 110, address = 0xc1003624, symbol = "irq_entries_start+0x164/0x400" }
+irq_state.idt_table: 13589.854570120 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 111, address = 0xc1003628, symbol = "irq_entries_start+0x168/0x400" }
+irq_state.idt_table: 13589.854573389 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 112, address = 0xc100362c, symbol = "irq_entries_start+0x16c/0x400" }
+irq_state.idt_table: 13589.854576111 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 113, address = 0xc1003630, symbol = "irq_entries_start+0x170/0x400" }
+irq_state.idt_table: 13589.854577764 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 114, address = 0xc1003634, symbol = "irq_entries_start+0x174/0x400" }
+kernel.irq_entry: 13589.854625272 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { ip = 3242331332, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_update_time: 13589.854651921 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { jiffies = 4296292868, xtime_sec = 1262715366, xtime_nsec = 301133051, walltomonotonic_sec = -1262701811, walltomonotonic_nsec = 148963639 }
+kernel.softirq_raise: 13589.854672165 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, IRQ { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.irq_exit: 13589.854716730 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.softirq_entry: 13589.854722451 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, SOFTIRQ { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.sched_try_wakeup: 13589.854749592 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, SOFTIRQ { pid = 16890, cpu_id = 0, state = 1 }
+kernel.timer_set: 13589.854777311 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, SOFTIRQ { expires = 1325573, function = 0xc141d458, data = 0 }
+kernel.softirq_exit: 13589.854782311 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.sched_schedule: 13589.854800252 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { prev_pid = 16887, next_pid = 16890, prev_state = 0 }
+fs.pollfd: 13589.854988151 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 4 }
+fs.pollfd: 13589.854993286 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 6 }
+fs.pollfd: 13589.854996820 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 8 }
+fs.pollfd: 13589.854998975 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 10 }
+fs.pollfd: 13589.855001216 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 12 }
+fs.pollfd: 13589.855003119 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 14 }
+fs.pollfd: 13589.855004923 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 16 }
+fs.pollfd: 13589.855006573 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 18 }
+fs.pollfd: 13589.855008315 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 20 }
+fs.pollfd: 13589.855010156 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 22 }
+fs.pollfd: 13589.855012095 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 24 }
+fs.pollfd: 13589.855013844 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 26 }
+fs.pollfd: 13589.855015692 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 28 }
+fs.pollfd: 13589.855017760 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 30 }
+fs.pollfd: 13589.855019884 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 32 }
+fs.pollfd: 13589.855022224 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 34 }
+fs.pollfd: 13589.855024367 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 36 }
+fs.pollfd: 13589.855026190 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 38 }
+fs.pollfd: 13589.855027920 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 40 }
+fs.pollfd: 13589.855030087 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 42 }
+fs.pollfd: 13589.855031977 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 44 }
+fs.pollfd: 13589.855033688 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 46 }
+fs.pollfd: 13589.855035967 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 48 }
+mm.page_free: 13589.855046527 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { pfn = 79372, order = 0 }
+kernel.syscall_exit: 13589.855055720 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { ret = 1 }
+kernel.page_fault_entry: 13589.855076605 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, TRAP { ip = 0x8049932, address = 0x804b1d0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.855100161 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.855129131 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, TRAP { ip = 0xb76db090, address = 0xb76db090, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.855140540 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.855152337 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, TRAP { ip = 0xb76db18f, address = 0x87281a4, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.855174047 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 13589.855181184 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, TRAP { ip = 0xb76534b0, address = 0xb76534b0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.855189588 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.855199704 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { ip = 0xb7705416, syscall_id = 54 [sys_ioctl+0x0/0x9d] }
+fs.ioctl: 13589.855203651 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 22, cmd = 2147808512, arg = 3076035380 }
+kernel.syscall_exit: 13589.855209913 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.855213773 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { ip = 0xb7705416, syscall_id = 54 [sys_ioctl+0x0/0x9d] }
+fs.ioctl: 13589.855215288 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 22, cmd = 2147808515, arg = 3076035376 }
+kernel.syscall_exit: 13589.855224911 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.855232879 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, TRAP { ip = 0xb771cb70, address = 0xb7599a3b, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.855241087 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.855252212 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { ip = 0xb7705416, syscall_id = 313 [sys_splice+0x0/0x3fa] }
+kernel.syscall_exit: 13589.855929180 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { ret = 65536 }
+kernel.page_fault_entry: 13589.855956486 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, TRAP { ip = 0xb765c000, address = 0xb765c000, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.855990086 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.856006323 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { ip = 0xb7705416, syscall_id = 313 [sys_splice+0x0/0x3fa] }
+mm.add_to_page_cache: 13589.856109591 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.856494136 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.856539459 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.856578846 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.856648638 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.856703183 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.856754891 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.857039013 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.857114285 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.857195830 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.857256177 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.857302367 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.857363200 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.857449105 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.857518785 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.857604474 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+kernel.syscall_exit: 13589.857682732 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { ret = 65536 }
+kernel.syscall_entry: 13589.857707514 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { ip = 0xb7705416, syscall_id = 313 [sys_splice+0x0/0x3fa] }
+kernel.syscall_exit: 13589.857718714 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { ret = 65536 }
+kernel.syscall_entry: 13589.857722334 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { ip = 0xb7705416, syscall_id = 313 [sys_splice+0x0/0x3fa] }
+mm.add_to_page_cache: 13589.857739673 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.857768944 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.857978762 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.858046356 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.858102601 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.858166758 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.858223238 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.858327269 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.858400879 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.858425451 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.858474585 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.858498691 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.858549592 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.858606502 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.858656751 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.858746115 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+kernel.syscall_exit: 13589.858802202 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { ret = 65536 }
+kernel.syscall_entry: 13589.858826072 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { ip = 0xb7705416, syscall_id = 313 [sys_splice+0x0/0x3fa] }
+kernel.syscall_exit: 13589.858835579 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { ret = 65536 }
+kernel.syscall_entry: 13589.858839643 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { ip = 0xb7705416, syscall_id = 313 [sys_splice+0x0/0x3fa] }
+mm.add_to_page_cache: 13589.858956641 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.859010276 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.859089556 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.859115157 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.859200311 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.859225462 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.859311472 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.859336113 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.859391331 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.859414998 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.859496217 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.859521382 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.859545062 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.859570104 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.859616578 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.859640676 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+kernel.syscall_exit: 13589.859696984 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { ret = 65536 }
+kernel.syscall_entry: 13589.859717136 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { ip = 0xb7705416, syscall_id = 313 [sys_splice+0x0/0x3fa] }
+kernel.syscall_exit: 13589.859726557 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { ret = 65536 }
+kernel.syscall_entry: 13589.859729734 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { ip = 0xb7705416, syscall_id = 313 [sys_splice+0x0/0x3fa] }
+mm.add_to_page_cache: 13589.859740761 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.859765575 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.859821001 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.859844798 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.860027513 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.860051612 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.860074516 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.860097519 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.860125565 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.860148463 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.860171424 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.860195498 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.860245334 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.860268085 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.860436520 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+mm.add_to_page_cache: 13589.860459209 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { inode = 1392939, sdev = 3145730 }
+kernel.syscall_exit: 13589.860487292 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { ret = 65536 }
+kernel.syscall_entry: 13589.860506090 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { ip = 0xb7705416, syscall_id = 54 [sys_ioctl+0x0/0x9d] }
+fs.ioctl: 13589.860515781 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 22, cmd = 1074066689, arg = 3076035380 }
+kernel.syscall_exit: 13589.860525047 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.860544536 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { ip = 0xb7705416, syscall_id = 168 [sys_poll+0x0/0x8d] }
+fs.pollfd: 13589.860550729 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 4 }
+fs.pollfd: 13589.860556757 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 6 }
+fs.pollfd: 13589.860560944 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 8 }
+fs.pollfd: 13589.860563955 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 10 }
+fs.pollfd: 13589.860566381 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 12 }
+fs.pollfd: 13589.860569053 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 14 }
+fs.pollfd: 13589.860570986 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 16 }
+fs.pollfd: 13589.860573216 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 18 }
+fs.pollfd: 13589.860575567 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 20 }
+fs.pollfd: 13589.860578344 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 22 }
+fs.pollfd: 13589.860579976 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 24 }
+fs.pollfd: 13589.860582204 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 26 }
+fs.pollfd: 13589.860585264 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 28 }
+fs.pollfd: 13589.860587912 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 30 }
+fs.pollfd: 13589.860590080 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 32 }
+fs.pollfd: 13589.860592228 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 34 }
+fs.pollfd: 13589.860595417 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 36 }
+fs.pollfd: 13589.860597789 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 38 }
+fs.pollfd: 13589.860599900 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 40 }
+fs.pollfd: 13589.860603508 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 42 }
+fs.pollfd: 13589.860606236 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 44 }
+fs.pollfd: 13589.860608754 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 46 }
+fs.pollfd: 13589.860611673 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16890, 16889, lttd, , 16889, 0x0, SYSCALL { fd = 48 }
+kernel.sched_schedule: 13589.860649392 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { prev_pid = 16890, next_pid = 1852, prev_state = 1 }
+kernel.syscall_entry: 13589.861862727 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.861889350 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 3808, fd = 41 }
+kernel.syscall_exit: 13589.861892460 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 3808 }
+kernel.irq_entry: 13589.864174128 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { ip = 3077276131, handler = 0x0, irq_id = 239, kernel_mode = 0 }
+kernel.timer_itimer_expired: 13589.864256929 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { pid = 1852 }
+kernel.send_signal: 13589.864298715 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { pid = 1852, signal = 14 }
+kernel.irq_exit: 13589.864414783 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.syscall_entry: 13589.864536066 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726408, syscall_id = 119 [ptregs_sigreturn+0x0/0xc] }
+kernel.syscall_exit: 13589.864558383 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.irq_entry: 13589.864752868 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { ip = 3242336307, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_update_time: 13589.864771536 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { jiffies = 4296292869, xtime_sec = 1262715366, xtime_nsec = 301133052, walltomonotonic_sec = -1262701811, walltomonotonic_nsec = 148963639 }
+kernel.softirq_raise: 13589.864793640 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.irq_exit: 13589.864836303 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.softirq_entry: 13589.864840183 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.timer_set: 13589.864861917 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { expires = 1325574, function = 0xc141d458, data = 0 }
+kernel.softirq_exit: 13589.864866881 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.syscall_entry: 13589.864874453 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [sys_setitimer+0x0/0x6f] }
+kernel.timer_itimer_set: 13589.864893971 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 13589.864904143 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.864926419 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 142 [sys_select+0x0/0x8f] }
+fs.select: 13589.864937699 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 1, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.864943783 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 3, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.864947921 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 5, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.864960592 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 7, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.864963763 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 13, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.864967586 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 19, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.864970832 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 20, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.864974532 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 21, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.864977555 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 22, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.864979882 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 23, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.864982432 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 24, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.864985411 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 25, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.864988213 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 26, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.864990676 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 27, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.864994672 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 28, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.864998323 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 29, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.865002110 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 31, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.865005761 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 32, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.865008833 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 33, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.865012072 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 34, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.865015458 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 35, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.865018777 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 36, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.865022170 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 37, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.865025987 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 38, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.865028991 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 39, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.865032028 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 40, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.865035592 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 42, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.865038904 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 43, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.865041983 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 44, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.865045271 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 45, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.865048263 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 46, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.865051163 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 47, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.865054039 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 48, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 13589.865057044 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 49, end_time_sec = 0, end_time_nsec = 0 }
+kernel.syscall_exit: 13589.865060548 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.865072708 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [sys_setitimer+0x0/0x6f] }
+kernel.timer_itimer_set: 13589.865074629 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 13589.865081339 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 13589.865378879 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.865404781 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 3540, fd = 41 }
+kernel.syscall_exit: 13589.865406690 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, MODE_UNKNOWN { ret = 3540 }
+kernel.syscall_entry: 13589.868110052 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [sys_read+0x0/0x9d] }
+kernel.sched_try_wakeup: 13589.868171278 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pid = 2241, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 13589.868198801 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { prev_pid = 1852, next_pid = 2241, prev_state = 0 }
+fs.pollfd: 13589.868340612 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 13589.868386207 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { prev_pid = 2241, next_pid = 16887, prev_state = 1 }
+irq_state.idt_table: 13589.868524818 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 115, address = 0xc1003638, symbol = "irq_entries_start+0x178/0x400" }
+irq_state.idt_table: 13589.868530403 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 116, address = 0xc1003640, symbol = "irq_entries_start+0x180/0x400" }
+irq_state.idt_table: 13589.868533442 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 117, address = 0xc1003644, symbol = "irq_entries_start+0x184/0x400" }
+irq_state.idt_table: 13589.868536302 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 118, address = 0xc1003648, symbol = "irq_entries_start+0x188/0x400" }
+irq_state.idt_table: 13589.868539144 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 119, address = 0xc100364c, symbol = "irq_entries_start+0x18c/0x400" }
+irq_state.idt_table: 13589.868543578 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 120, address = 0xc1003650, symbol = "irq_entries_start+0x190/0x400" }
+irq_state.idt_table: 13589.868546384 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 121, address = 0xc1003654, symbol = "irq_entries_start+0x194/0x400" }
+irq_state.idt_table: 13589.868549208 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 122, address = 0xc1003658, symbol = "irq_entries_start+0x198/0x400" }
+irq_state.idt_table: 13589.868551927 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 123, address = 0xc1003660, symbol = "irq_entries_start+0x1a0/0x400" }
+irq_state.idt_table: 13589.868554653 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 124, address = 0xc1003664, symbol = "irq_entries_start+0x1a4/0x400" }
+irq_state.idt_table: 13589.868557685 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 125, address = 0xc1003668, symbol = "irq_entries_start+0x1a8/0x400" }
+irq_state.idt_table: 13589.868560502 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 126, address = 0xc100366c, symbol = "irq_entries_start+0x1ac/0x400" }
+irq_state.idt_table: 13589.868563302 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 127, address = 0xc1003670, symbol = "irq_entries_start+0x1b0/0x400" }
+irq_state.idt_table: 13589.868567265 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 128, address = 0xc10032ac, symbol = "system_call+0x0/0x3e" }
+irq_state.idt_table: 13589.868570131 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 129, address = 0xc1003678, symbol = "irq_entries_start+0x1b8/0x400" }
+irq_state.idt_table: 13589.868573028 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 130, address = 0xc1003680, symbol = "irq_entries_start+0x1c0/0x400" }
+irq_state.idt_table: 13589.868575846 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 131, address = 0xc1003684, symbol = "irq_entries_start+0x1c4/0x400" }
+irq_state.idt_table: 13589.868578669 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 132, address = 0xc1003688, symbol = "irq_entries_start+0x1c8/0x400" }
+irq_state.idt_table: 13589.868581462 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 133, address = 0xc100368c, symbol = "irq_entries_start+0x1cc/0x400" }
+irq_state.idt_table: 13589.868584261 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 134, address = 0xc1003690, symbol = "irq_entries_start+0x1d0/0x400" }
+irq_state.idt_table: 13589.868587092 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 135, address = 0xc1003694, symbol = "irq_entries_start+0x1d4/0x400" }
+irq_state.idt_table: 13589.868590319 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 136, address = 0xc1003698, symbol = "irq_entries_start+0x1d8/0x400" }
+irq_state.idt_table: 13589.868593143 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 137, address = 0xc10036a0, symbol = "irq_entries_start+0x1e0/0x400" }
+irq_state.idt_table: 13589.868596040 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 138, address = 0xc10036a4, symbol = "irq_entries_start+0x1e4/0x400" }
+irq_state.idt_table: 13589.868598833 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 139, address = 0xc10036a8, symbol = "irq_entries_start+0x1e8/0x400" }
+irq_state.idt_table: 13589.868601620 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 140, address = 0xc10036ac, symbol = "irq_entries_start+0x1ec/0x400" }
+irq_state.idt_table: 13589.868604407 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 141, address = 0xc10036b0, symbol = "irq_entries_start+0x1f0/0x400" }
+irq_state.idt_table: 13589.868607145 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 142, address = 0xc10036b4, symbol = "irq_entries_start+0x1f4/0x400" }
+irq_state.idt_table: 13589.868609944 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 143, address = 0xc10036b8, symbol = "irq_entries_start+0x1f8/0x400" }
+irq_state.idt_table: 13589.868612902 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 144, address = 0xc10036c0, symbol = "irq_entries_start+0x200/0x400" }
+irq_state.idt_table: 13589.868615702 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 145, address = 0xc10036c4, symbol = "irq_entries_start+0x204/0x400" }
+irq_state.idt_table: 13589.868618476 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 146, address = 0xc10036c8, symbol = "irq_entries_start+0x208/0x400" }
+irq_state.idt_table: 13589.868621238 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 147, address = 0xc10036cc, symbol = "irq_entries_start+0x20c/0x400" }
+irq_state.idt_table: 13589.868624149 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 148, address = 0xc10036d0, symbol = "irq_entries_start+0x210/0x400" }
+irq_state.idt_table: 13589.868626917 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 149, address = 0xc10036d4, symbol = "irq_entries_start+0x214/0x400" }
+irq_state.idt_table: 13589.868629703 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 150, address = 0xc10036d8, symbol = "irq_entries_start+0x218/0x400" }
+irq_state.idt_table: 13589.868632404 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 151, address = 0xc10036e0, symbol = "irq_entries_start+0x220/0x400" }
+irq_state.idt_table: 13589.868635798 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 152, address = 0xc10036e4, symbol = "irq_entries_start+0x224/0x400" }
+irq_state.idt_table: 13589.868638677 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 153, address = 0xc10036e8, symbol = "irq_entries_start+0x228/0x400" }
+irq_state.idt_table: 13589.868641439 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 154, address = 0xc10036ec, symbol = "irq_entries_start+0x22c/0x400" }
+irq_state.idt_table: 13589.868644190 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 155, address = 0xc10036f0, symbol = "irq_entries_start+0x230/0x400" }
+irq_state.idt_table: 13589.868647215 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 156, address = 0xc10036f4, symbol = "irq_entries_start+0x234/0x400" }
+irq_state.idt_table: 13589.868650535 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 157, address = 0xc10036f8, symbol = "irq_entries_start+0x238/0x400" }
+irq_state.idt_table: 13589.868653634 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 158, address = 0xc1003700, symbol = "irq_entries_start+0x240/0x400" }
+irq_state.idt_table: 13589.868656463 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 159, address = 0xc1003704, symbol = "irq_entries_start+0x244/0x400" }
+irq_state.idt_table: 13589.868659496 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 160, address = 0xc1003708, symbol = "irq_entries_start+0x248/0x400" }
+irq_state.idt_table: 13589.868662541 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 161, address = 0xc100370c, symbol = "irq_entries_start+0x24c/0x400" }
+irq_state.idt_table: 13589.868665340 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 162, address = 0xc1003710, symbol = "irq_entries_start+0x250/0x400" }
+irq_state.idt_table: 13589.868668267 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 163, address = 0xc1003714, symbol = "irq_entries_start+0x254/0x400" }
+irq_state.idt_table: 13589.868671054 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 164, address = 0xc1003718, symbol = "irq_entries_start+0x258/0x400" }
+irq_state.idt_table: 13589.868674050 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 165, address = 0xc1003720, symbol = "irq_entries_start+0x260/0x400" }
+irq_state.idt_table: 13589.868676898 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 166, address = 0xc1003724, symbol = "irq_entries_start+0x264/0x400" }
+irq_state.idt_table: 13589.868679972 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 167, address = 0xc1003728, symbol = "irq_entries_start+0x268/0x400" }
+irq_state.idt_table: 13589.868683206 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 168, address = 0xc100372c, symbol = "irq_entries_start+0x26c/0x400" }
+irq_state.idt_table: 13589.868686018 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 169, address = 0xc1003730, symbol = "irq_entries_start+0x270/0x400" }
+irq_state.idt_table: 13589.868688872 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 170, address = 0xc1003734, symbol = "irq_entries_start+0x274/0x400" }
+irq_state.idt_table: 13589.868691861 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 171, address = 0xc1003738, symbol = "irq_entries_start+0x278/0x400" }
+irq_state.idt_table: 13589.868694660 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 172, address = 0xc1003740, symbol = "irq_entries_start+0x280/0x400" }
+irq_state.idt_table: 13589.868697662 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 173, address = 0xc1003744, symbol = "irq_entries_start+0x284/0x400" }
+irq_state.idt_table: 13589.868700663 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 174, address = 0xc1003748, symbol = "irq_entries_start+0x288/0x400" }
+irq_state.idt_table: 13589.868703468 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 175, address = 0xc100374c, symbol = "irq_entries_start+0x28c/0x400" }
+irq_state.idt_table: 13589.868706555 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 176, address = 0xc1003750, symbol = "irq_entries_start+0x290/0x400" }
+irq_state.idt_table: 13589.868709385 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 177, address = 0xc1003754, symbol = "irq_entries_start+0x294/0x400" }
+irq_state.idt_table: 13589.868712202 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 178, address = 0xc1003758, symbol = "irq_entries_start+0x298/0x400" }
+irq_state.idt_table: 13589.868715160 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 179, address = 0xc1003760, symbol = "irq_entries_start+0x2a0/0x400" }
+irq_state.idt_table: 13589.868717972 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 180, address = 0xc1003764, symbol = "irq_entries_start+0x2a4/0x400" }
+irq_state.idt_table: 13589.868720771 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 181, address = 0xc1003768, symbol = "irq_entries_start+0x2a8/0x400" }
+irq_state.idt_table: 13589.868723577 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 182, address = 0xc100376c, symbol = "irq_entries_start+0x2ac/0x400" }
+irq_state.idt_table: 13589.868726388 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 183, address = 0xc1003770, symbol = "irq_entries_start+0x2b0/0x400" }
+irq_state.idt_table: 13589.868729855 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 184, address = 0xc1003774, symbol = "irq_entries_start+0x2b4/0x400" }
+irq_state.idt_table: 13589.868732678 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 185, address = 0xc1003778, symbol = "irq_entries_start+0x2b8/0x400" }
+irq_state.idt_table: 13589.868735484 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 186, address = 0xc1003780, symbol = "irq_entries_start+0x2c0/0x400" }
+irq_state.idt_table: 13589.868738442 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 187, address = 0xc1003784, symbol = "irq_entries_start+0x2c4/0x400" }
+irq_state.idt_table: 13589.868741266 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 188, address = 0xc1003788, symbol = "irq_entries_start+0x2c8/0x400" }
+irq_state.idt_table: 13589.868744078 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 189, address = 0xc100378c, symbol = "irq_entries_start+0x2cc/0x400" }
+irq_state.idt_table: 13589.868746931 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 190, address = 0xc1003790, symbol = "irq_entries_start+0x2d0/0x400" }
+irq_state.idt_table: 13589.868749737 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 191, address = 0xc1003794, symbol = "irq_entries_start+0x2d4/0x400" }
+irq_state.idt_table: 13589.868752824 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 192, address = 0xc1003798, symbol = "irq_entries_start+0x2d8/0x400" }
+irq_state.idt_table: 13589.868755610 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 193, address = 0xc10037a0, symbol = "irq_entries_start+0x2e0/0x400" }
+irq_state.idt_table: 13589.868759133 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 194, address = 0xc10037a4, symbol = "irq_entries_start+0x2e4/0x400" }
+irq_state.idt_table: 13589.868761901 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 195, address = 0xc10037a8, symbol = "irq_entries_start+0x2e8/0x400" }
+irq_state.idt_table: 13589.868764645 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 196, address = 0xc10037ac, symbol = "irq_entries_start+0x2ec/0x400" }
+irq_state.idt_table: 13589.868767364 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 197, address = 0xc10037b0, symbol = "irq_entries_start+0x2f0/0x400" }
+irq_state.idt_table: 13589.868770078 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 198, address = 0xc10037b4, symbol = "irq_entries_start+0x2f4/0x400" }
+irq_state.idt_table: 13589.868773000 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 199, address = 0xc10037b8, symbol = "irq_entries_start+0x2f8/0x400" }
+irq_state.idt_table: 13589.868776651 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 200, address = 0xc10037c0, symbol = "irq_entries_start+0x300/0x400" }
+irq_state.idt_table: 13589.868779444 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 201, address = 0xc10037c4, symbol = "irq_entries_start+0x304/0x400" }
+irq_state.idt_table: 13589.868782267 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 202, address = 0xc10037c8, symbol = "irq_entries_start+0x308/0x400" }
+irq_state.idt_table: 13589.868785054 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 203, address = 0xc10037cc, symbol = "irq_entries_start+0x30c/0x400" }
+irq_state.idt_table: 13589.868787896 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 204, address = 0xc10037d0, symbol = "irq_entries_start+0x310/0x400" }
+irq_state.idt_table: 13589.868790775 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 205, address = 0xc10037d4, symbol = "irq_entries_start+0x314/0x400" }
+irq_state.idt_table: 13589.868793519 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 206, address = 0xc10037d8, symbol = "irq_entries_start+0x318/0x400" }
+irq_state.idt_table: 13589.868796458 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 207, address = 0xc10037e0, symbol = "irq_entries_start+0x320/0x400" }
+irq_state.idt_table: 13589.868799515 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 208, address = 0xc10037e4, symbol = "irq_entries_start+0x324/0x400" }
+irq_state.idt_table: 13589.868802284 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 209, address = 0xc10037e8, symbol = "irq_entries_start+0x328/0x400" }
+irq_state.idt_table: 13589.868805353 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 210, address = 0xc10037ec, symbol = "irq_entries_start+0x32c/0x400" }
+irq_state.idt_table: 13589.868808091 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 211, address = 0xc10037f0, symbol = "irq_entries_start+0x330/0x400" }
+irq_state.idt_table: 13589.868810853 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 212, address = 0xc10037f4, symbol = "irq_entries_start+0x334/0x400" }
+irq_state.idt_table: 13589.868813560 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 213, address = 0xc10037f8, symbol = "irq_entries_start+0x338/0x400" }
+irq_state.idt_table: 13589.868816322 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 214, address = 0xc1003800, symbol = "irq_entries_start+0x340/0x400" }
+irq_state.idt_table: 13589.868819036 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 215, address = 0xc1003804, symbol = "irq_entries_start+0x344/0x400" }
+irq_state.idt_table: 13589.868822429 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 216, address = 0xc1003808, symbol = "irq_entries_start+0x348/0x400" }
+irq_state.idt_table: 13589.868825222 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 217, address = 0xc100380c, symbol = "irq_entries_start+0x34c/0x400" }
+irq_state.idt_table: 13589.868828051 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 218, address = 0xc1003810, symbol = "irq_entries_start+0x350/0x400" }
+irq_state.idt_table: 13589.868830857 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 219, address = 0xc1003814, symbol = "irq_entries_start+0x354/0x400" }
+irq_state.idt_table: 13589.868921251 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 220, address = 0xc1003818, symbol = "irq_entries_start+0x358/0x400" }
+irq_state.idt_table: 13589.868925416 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 221, address = 0xc1003820, symbol = "irq_entries_start+0x360/0x400" }
+irq_state.idt_table: 13589.868928221 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 222, address = 0xc1003824, symbol = "irq_entries_start+0x364/0x400" }
+irq_state.idt_table: 13589.868931094 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 223, address = 0xc1003828, symbol = "irq_entries_start+0x368/0x400" }
+irq_state.idt_table: 13589.868934126 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 224, address = 0xc100382c, symbol = "irq_entries_start+0x36c/0x400" }
+irq_state.idt_table: 13589.868936894 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 225, address = 0xc1003830, symbol = "irq_entries_start+0x370/0x400" }
+irq_state.idt_table: 13589.868939682 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 226, address = 0xc1003834, symbol = "irq_entries_start+0x374/0x400" }
+irq_state.idt_table: 13589.868942469 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 227, address = 0xc1003838, symbol = "irq_entries_start+0x378/0x400" }
+irq_state.idt_table: 13589.868945237 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 228, address = 0xc1003840, symbol = "irq_entries_start+0x380/0x400" }
+irq_state.idt_table: 13589.868947987 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 229, address = 0xc1003844, symbol = "irq_entries_start+0x384/0x400" }
+irq_state.idt_table: 13589.868950707 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 230, address = 0xc1003848, symbol = "irq_entries_start+0x388/0x400" }
+irq_state.idt_table: 13589.868953659 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 231, address = 0xc100384c, symbol = "irq_entries_start+0x38c/0x400" }
+irq_state.idt_table: 13589.868957070 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 232, address = 0xc1003850, symbol = "irq_entries_start+0x390/0x400" }
+irq_state.idt_table: 13589.868959840 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 233, address = 0xc1003854, symbol = "irq_entries_start+0x394/0x400" }
+irq_state.idt_table: 13589.868962779 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 234, address = 0xc1003858, symbol = "irq_entries_start+0x398/0x400" }
+irq_state.idt_table: 13589.868966834 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 235, address = 0xc1003a40, symbol = "mce_self_interrupt+0x0/0x30" }
+irq_state.idt_table: 13589.868970369 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 236, address = 0xc10039b0, symbol = "perf_pending_interrupt+0x0/0x30" }
+irq_state.idt_table: 13589.868973284 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 237, address = 0xc10038f0, symbol = "generic_interrupt+0x0/0x30" }
+irq_state.idt_table: 13589.868976113 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 238, address = 0xc100386c, symbol = "irq_entries_start+0x3ac/0x400" }
+irq_state.idt_table: 13589.868979237 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 239, address = 0xc1003920, symbol = "apic_timer_interrupt+0x0/0x30" }
+irq_state.idt_table: 13589.868982251 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 240, address = 0xc1003874, symbol = "irq_entries_start+0x3b4/0x400" }
+irq_state.idt_table: 13589.868985056 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 241, address = 0xc1003878, symbol = "irq_entries_start+0x3b8/0x400" }
+irq_state.idt_table: 13589.868987849 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 242, address = 0xc1003880, symbol = "irq_entries_start+0x3c0/0x400" }
+irq_state.idt_table: 13589.868990612 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 243, address = 0xc1003884, symbol = "irq_entries_start+0x3c4/0x400" }
+irq_state.idt_table: 13589.868993356 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 244, address = 0xc1003888, symbol = "irq_entries_start+0x3c8/0x400" }
+irq_state.idt_table: 13589.868996167 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 245, address = 0xc100388c, symbol = "irq_entries_start+0x3cc/0x400" }
+irq_state.idt_table: 13589.868999114 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 246, address = 0xc1003890, symbol = "irq_entries_start+0x3d0/0x400" }
+irq_state.idt_table: 13589.869001907 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 247, address = 0xc1003894, symbol = "irq_entries_start+0x3d4/0x400" }
+irq_state.idt_table: 13589.869005097 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 248, address = 0xc1003898, symbol = "irq_entries_start+0x3d8/0x400" }
+irq_state.idt_table: 13589.869007994 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 249, address = 0xc1003a10, symbol = "threshold_interrupt+0x0/0x30" }
+irq_state.idt_table: 13589.869010751 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 250, address = 0xc10039e0, symbol = "thermal_interrupt+0x0/0x30" }
+irq_state.idt_table: 13589.869013758 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 251, address = 0xc10038a8, symbol = "irq_entries_start+0x3e8/0x400" }
+irq_state.idt_table: 13589.869016570 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 252, address = 0xc10038ac, symbol = "irq_entries_start+0x3ec/0x400" }
+irq_state.idt_table: 13589.869019284 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 253, address = 0xc10038b0, symbol = "irq_entries_start+0x3f0/0x400" }
+irq_state.idt_table: 13589.869021978 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 254, address = 0xc1003950, symbol = "error_interrupt+0x0/0x30" }
+irq_state.idt_table: 13589.869024900 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { irq = 255, address = 0xc1003980, symbol = "spurious_interrupt+0x0/0x30" }
+kernel.timer_set: 13589.869037915 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { expires = 1325573, function = 0xc103b8db, data = 3246882648 }
+kernel.printk: 13589.869052175 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { ip = 0xC1421E18 }
+kernel.vprintk: 13589.869070661 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, MODE_UNKNOWN { loglevel = 7, string = "LTT state dump end", ip = 0xC158363B }
+global_state.statedump_end: 13589.869106774 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/global_state_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL
+mm.page_free: 13589.869116127 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 79374, order = 0 }
+mm.page_free: 13589.869123887 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 223091, order = 0 }
+fs.write: 13589.869131892 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { count = 1, fd = 4 }
+kernel.syscall_exit: 13589.869136725 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, USER_MODE { ret = 1 }
+kernel.syscall_entry: 13589.869158947 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { ip = 0xb7764416, syscall_id = 6 [sys_close+0x0/0x112] }
+fs.close: 13589.869163479 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { fd = 4 }
+kernel.syscall_exit: 13589.869328532 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.869384625 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, TRAP { ip = 0xb7772fc0, address = 0xb7749b38, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.869431868 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, USER_MODE { res = 8 }
+kernel.syscall_entry: 13589.869448847 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { ip = 0xb7764416, syscall_id = 252 [sys_exit_group+0x0/0x14] }
+mm.page_free: 13589.869502405 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 156444, order = 0 }
+mm.page_free: 13589.869509731 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 123809, order = 0 }
+mm.page_free: 13589.869519218 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 166833, order = 0 }
+mm.page_free: 13589.869525257 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 30747, order = 0 }
+mm.page_free: 13589.869622542 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 213832, order = 0 }
+mm.page_free: 13589.869629224 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 108940, order = 0 }
+mm.page_free: 13589.870298604 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 27323, order = 0 }
+mm.page_free: 13589.870305470 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 54930, order = 0 }
+mm.page_free: 13589.870311926 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 105861, order = 0 }
+mm.page_free: 13589.870318046 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 152049, order = 0 }
+mm.page_free: 13589.870323821 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 107793, order = 0 }
+mm.page_free: 13589.870384392 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 53988, order = 0 }
+mm.page_free: 13589.870420242 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 73971, order = 0 }
+mm.page_free: 13589.870426048 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 158640, order = 0 }
+mm.page_free: 13589.870431598 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 29207, order = 0 }
+mm.page_free: 13589.870437398 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 69588, order = 0 }
+mm.page_free: 13589.870624814 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 164866, order = 0 }
+mm.page_free: 13589.870659500 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 135416, order = 0 }
+mm.page_free: 13589.870666832 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 170752, order = 0 }
+mm.page_free: 13589.870672674 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 104244, order = 0 }
+mm.page_free: 13589.870678402 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 217066, order = 0 }
+mm.page_free: 13589.870687002 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 25242, order = 0 }
+mm.page_free: 13589.870700672 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 215269, order = 0 }
+mm.page_free: 13589.870708274 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 224201, order = 0 }
+mm.page_free: 13589.870719434 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 215158, order = 0 }
+mm.page_free: 13589.870726312 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pfn = 215191, order = 0 }
+kernel.process_exit: 13589.870869076 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pid = 16887 }
+kernel.send_signal: 13589.870924372 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pid = 30068, signal = 17 }
+kernel.sched_try_wakeup: 13589.870950582 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { pid = 30068, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 13589.870965674 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { prev_pid = 16887, next_pid = 30068, prev_state = 0 }
+mm.page_free: 13589.871037723 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { pfn = 215287, order = 0 }
+kernel.syscall_exit: 13589.871155931 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { ret = 16887 }
+kernel.syscall_entry: 13589.871243324 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 175 [sys_rt_sigprocmask+0x0/0xcf] }
+kernel.syscall_exit: 13589.871247471 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.871255636 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 54 [sys_ioctl+0x0/0x9d] }
+fs.ioctl: 13589.871258655 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { fd = 255, cmd = 21520, arg = 3220511636 }
+kernel.syscall_exit: 13589.871269919 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.871273337 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 175 [sys_rt_sigprocmask+0x0/0xcf] }
+kernel.syscall_exit: 13589.871275107 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.871279002 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 54 [sys_ioctl+0x0/0x9d] }
+fs.ioctl: 13589.871280478 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { fd = 255, cmd = 21505, arg = 3220511848 }
+kernel.syscall_exit: 13589.871286218 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.871329534 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 175 [sys_rt_sigprocmask+0x0/0xcf] }
+kernel.syscall_exit: 13589.871331347 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.871348345 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 7 [sys_waitpid+0x0/0x17] }
+kernel.process_wait: 13589.871350151 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { pid = 0 }
+kernel.syscall_exit: 13589.871352521 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { ret = -10 }
+kernel.syscall_entry: 13589.871355743 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { ip = 0xb776f408, syscall_id = 119 [ptregs_sigreturn+0x0/0xc] }
+kernel.syscall_exit: 13589.871358377 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.871376545 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, TRAP { ip = 0xb7647a66, address = 0x92bf008, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.871415028 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 13589.871480144 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, TRAP { ip = 0x80b382d, address = 0x8112460, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.871514634 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { res = 8 }
+kernel.syscall_entry: 13589.871536770 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 175 [sys_rt_sigprocmask+0x0/0xcf] }
+kernel.syscall_exit: 13589.871539129 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.871547324 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 42 [sys_pipe+0x0/0xe] }
+kernel.syscall_exit: 13589.871593537 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.871606149 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 120 [ptregs_clone+0x0/0xc] }
+kernel.process_fork: 13589.873239052 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { parent_pid = 30068, child_pid = 16891, child_tgid = 16891 }
+kernel.sched_wakeup_new_task: 13589.873251706 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { pid = 16891, state = 0, cpu_id = 0 }
+kernel.syscall_exit: 13589.873257281 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { ret = 16891 }
+kernel.page_fault_entry: 13589.873267938 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, TRAP { ip = 0xb766b79d, address = 0xbff51c28, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.873334628 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 13589.873347589 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, TRAP { ip = 0xb766b8e2, address = 0xb75d172c, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.873399836 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 13589.873412735 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, TRAP { ip = 0xb763bbd9, address = 0xb771633c, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.873464969 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 13589.873480968 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, TRAP { ip = 0x8087608, address = 0x810ee70, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.873534668 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { res = 8 }
+kernel.syscall_entry: 13589.873542997 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 57 [sys_setpgid+0x0/0x175] }
+kernel.syscall_exit: 13589.873548878 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.873553746 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, TRAP { ip = 0x80edc4d, address = 0x8111b5a, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.873610104 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 13589.873627725 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, TRAP { ip = 0x80edcd2, address = 0x92c7aa0, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.873682674 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 13589.873692039 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, TRAP { ip = 0x808741a, address = 0x81097f4, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.873745547 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { res = 8 }
+kernel.syscall_entry: 13589.873753608 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 175 [sys_rt_sigprocmask+0x0/0xcf] }
+kernel.syscall_exit: 13589.873755923 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.873761368 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, TRAP { ip = 0x80edae6, address = 0x92c6c88, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.873815134 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 13589.873829185 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, TRAP { ip = 0x8098934, address = 0x92b0cd8, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.873883417 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 13589.873896200 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, TRAP { ip = 0x807e760, address = 0x92b625c, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.874057547 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 13589.874071205 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, TRAP { ip = 0x8074895, address = 0x92ba428, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.874126350 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 13589.874134918 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, TRAP { ip = 0x80748bf, address = 0x92b25ec, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.874188862 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 13589.874197805 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, TRAP { ip = 0x80749a8, address = 0x92b97a8, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.874270730 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 13589.874279998 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, TRAP { ip = 0x80edaf8, address = 0x92b3ca8, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.874337316 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 13589.874347392 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, TRAP { ip = 0x809b579, address = 0x81101dc, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.874401666 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 13589.874411313 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, TRAP { ip = 0x8077893, address = 0x810d878, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.874466010 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { res = 8 }
+kernel.syscall_entry: 13589.874474683 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 175 [sys_rt_sigprocmask+0x0/0xcf] }
+kernel.syscall_exit: 13589.874477072 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.874480711 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 6 [sys_close+0x0/0x112] }
+fs.close: 13589.874482891 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { fd = 3 }
+kernel.syscall_exit: 13589.874485543 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.874488629 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 6 [sys_close+0x0/0x112] }
+fs.close: 13589.874489842 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { fd = 4 }
+kernel.syscall_exit: 13589.874491478 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.874495888 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, TRAP { ip = 0x80886d3, address = 0x810fee8, trap_id = 14, write_access = 1 }
+kernel.irq_entry: 13589.874592717 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, IRQ { ip = 3242336307, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.irq_exit: 13589.874607626 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, TRAP { handled = 1 }
+kernel.page_fault_exit: 13589.874612330 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { res = 8 }
+kernel.syscall_entry: 13589.874625132 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 54 [sys_ioctl+0x0/0x9d] }
+fs.ioctl: 13589.874627368 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { fd = 255, cmd = 21519, arg = 3220511632 }
+kernel.syscall_exit: 13589.874631514 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.874635141 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 175 [sys_rt_sigprocmask+0x0/0xcf] }
+kernel.syscall_exit: 13589.874637143 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.874640083 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 54 [sys_ioctl+0x0/0x9d] }
+fs.ioctl: 13589.874641516 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { fd = 255, cmd = 21520, arg = 3220511348 }
+kernel.syscall_exit: 13589.874644641 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.874647648 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 175 [sys_rt_sigprocmask+0x0/0xcf] }
+kernel.syscall_exit: 13589.874649344 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.874652272 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 175 [sys_rt_sigprocmask+0x0/0xcf] }
+kernel.syscall_exit: 13589.874653877 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.874657068 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 175 [sys_rt_sigprocmask+0x0/0xcf] }
+kernel.syscall_exit: 13589.874658728 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.874662409 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 7 [sys_waitpid+0x0/0x17] }
+kernel.process_wait: 13589.874664265 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 30068, 30068, bash, , 30060, 0x0, SYSCALL { pid = 0 }
+kernel.sched_schedule: 13589.874676166 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { prev_pid = 30068, next_pid = 1852, prev_state = 1 }
+fs.read: 13589.874863207 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 3540, fd = 41 }
+kernel.syscall_exit: 13589.874864941 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 1428 }
+kernel.irq_entry: 13589.874962028 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { ip = 3238019438, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_update_time: 13589.874976268 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { jiffies = 4296292870, xtime_sec = 1262715366, xtime_nsec = 301133053, walltomonotonic_sec = -1262701811, walltomonotonic_nsec = 148963639 }
+kernel.softirq_raise: 13589.874988420 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.softirq_raise: 13589.874994675 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { softirq_id = 9 [rcu_process_callbacks+0x0/0x1f] }
+kernel.sched_try_wakeup: 13589.875002858 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { pid = 1283, cpu_id = 0, state = 1 }
+kernel.irq_exit: 13589.875027346 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { handled = 1 }
+kernel.softirq_entry: 13589.875030727 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.timer_set: 13589.875043400 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { expires = 1325575, function = 0xc141d458, data = 0 }
+kernel.sched_try_wakeup: 13589.875051840 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { pid = 5, cpu_id = 0, state = 1 }
+kernel.softirq_exit: 13589.875139448 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.softirq_entry: 13589.875141199 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { softirq_id = 9 [rcu_process_callbacks+0x0/0x1f] }
+rcu.tree_callback: 13589.875185428 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { func = 0xc10acb19 }
+kernel.softirq_exit: 13589.875188846 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { softirq_id = 9 [rcu_process_callbacks+0x0/0x1f] }
+kernel.sched_schedule: 13589.875198695 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1283, 1280, rsyslogd, , 1, 0x0, SYSCALL { prev_pid = 1852, next_pid = 1283, prev_state = 0 }
+fs.read: 13589.875354830 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1283, 1280, rsyslogd, , 1, 0x0, SYSCALL { count = 4095, fd = 19 }
+kernel.syscall_exit: 13589.875356808 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1283, 1280, rsyslogd, , 1, 0x0, USER_MODE { ret = 37 }
+kernel.syscall_entry: 13589.875371857 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1283, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 78 [sys_gettimeofday+0x0/0x53] }
+kernel.syscall_exit: 13589.875374871 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1283, 1280, rsyslogd, , 1, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.875393049 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1283, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb76fc6a3, syscall_id = 240 [sys_futex+0x0/0x111] }
+kernel.sched_try_wakeup: 13589.875403512 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1283, 1280, rsyslogd, , 1, 0x0, SYSCALL { pid = 16858, cpu_id = 0, state = 1 }
+kernel.syscall_exit: 13589.875406997 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1283, 1280, rsyslogd, , 1, 0x0, USER_MODE { ret = 1 }
+kernel.syscall_entry: 13589.875412264 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1283, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 158 [sys_sched_yield+0x0/0x32] }
+kernel.sched_schedule: 13589.875422873 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 5, 5, events/0, , 2, 0x0, SYSCALL { prev_pid = 1283, next_pid = 5, prev_state = 0 }
+kernel.sched_schedule: 13589.875481741 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { prev_pid = 5, next_pid = 16858, prev_state = 1 }
+kernel.syscall_exit: 13589.875508741 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.875514755 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 240 [sys_futex+0x0/0x111] }
+kernel.syscall_exit: 13589.875516678 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.875520439 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 158 [sys_sched_yield+0x0/0x32] }
+kernel.syscall_exit: 13589.875528904 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.875562182 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 4 [sys_write+0x0/0x9d] }
+fs.write: 13589.875598711 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { count = 66, fd = 4 }
+kernel.syscall_exit: 13589.875600206 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, USER_MODE { ret = 66 }
+kernel.syscall_entry: 13589.875610717 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 4 [sys_write+0x0/0x9d] }
+fs.write: 13589.875642506 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { count = 66, fd = 6 }
+kernel.syscall_exit: 13589.875644013 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, USER_MODE { ret = 66 }
+kernel.syscall_entry: 13589.875655387 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 4 [sys_write+0x0/0x9d] }
+fs.write: 13589.875681958 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { count = 66, fd = 16 }
+kernel.syscall_exit: 13589.875683372 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, USER_MODE { ret = 66 }
+kernel.syscall_entry: 13589.875695157 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 13 [sys_time+0x0/0x27] }
+kernel.syscall_exit: 13589.875696792 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, USER_MODE { ret = 1262715366 }
+kernel.syscall_entry: 13589.875700995 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 158 [sys_sched_yield+0x0/0x32] }
+kernel.sched_schedule: 13589.875710182 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1283, 1280, rsyslogd, , 1, 0x0, SYSCALL { prev_pid = 16858, next_pid = 1283, prev_state = 0 }
+kernel.syscall_exit: 13589.875734431 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1283, 1280, rsyslogd, , 1, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.875740177 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1283, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 3 [sys_read+0x0/0x9d] }
+kernel.sched_schedule: 13589.875749290 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { prev_pid = 1283, next_pid = 16858, prev_state = 1 }
+kernel.syscall_exit: 13589.875771378 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.875776296 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb76e7e4c, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 13589.875779022 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.875782281 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 13589.875784890 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.875787866 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16858, 1280, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7739416, syscall_id = 240 [sys_futex+0x0/0x111] }
+kernel.sched_schedule: 13589.875799093 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { prev_pid = 16858, next_pid = 1852, prev_state = 1 }
+kernel.syscall_entry: 13589.876454079 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.876459225 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4096, fd = 41 }
+kernel.syscall_exit: 13589.876460583 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = -11 }
+kernel.syscall_entry: 13589.876466323 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 146 [sys_writev+0x0/0xcd] }
+kernel.sched_try_wakeup: 13589.876481232 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pid = 2241, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 13589.876489831 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { prev_pid = 1852, next_pid = 2241, prev_state = 0 }
+fs.pollfd: 13589.876639344 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 13589.876655643 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, USER_MODE { ret = 1 }
+kernel.syscall_entry: 13589.876722657 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.876729193 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.876730461 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, USER_MODE { ret = 64 }
+kernel.syscall_entry: 13589.876906060 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.876908597 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.876909865 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, USER_MODE { ret = -11 }
+kernel.syscall_entry: 13589.877158745 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [sys_poll+0x0/0x8d] }
+fs.pollfd: 13589.877161857 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 13589.877165268 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, USER_MODE { ret = 1 }
+kernel.syscall_entry: 13589.877174462 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 146 [sys_writev+0x0/0xcd] }
+fs.writev: 13589.877182264 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8, vlen = 3 }
+kernel.syscall_exit: 13589.877183797 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, USER_MODE { ret = 16 }
+kernel.syscall_entry: 13589.877190841 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [sys_poll+0x0/0x8d] }
+fs.pollfd: 13589.877192439 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 13589.877203911 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16887, 16887, lttctl, , 30068, 0x0, SYSCALL { prev_pid = 2241, next_pid = 16887, prev_state = 1 }
+kernel.sched_schedule: 13589.877241078 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { prev_pid = 16887, next_pid = 1852, prev_state = 64 }
+fs.writev: 13589.877610341 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 41, vlen = 1 }
+kernel.syscall_exit: 13589.877614977 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 64 }
+kernel.syscall_entry: 13589.877631632 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 13589.877636286 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.877642332 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [sys_setitimer+0x0/0x6f] }
+kernel.timer_itimer_set: 13589.877646209 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 13589.877658154 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.877674489 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 142 [sys_select+0x0/0x8f] }
+fs.select: 13589.877683529 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 1, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.877686492 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 3, end_time_sec = 13555, end_time_nsec = 785039963 }
+kernel.irq_entry: 13589.877727743 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { ip = 3242331332, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.sched_try_wakeup: 13589.877751454 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { pid = 2806, cpu_id = 0, state = 1 }
+kernel.irq_exit: 13589.877769940 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { handled = 1 }
+kernel.sched_schedule: 13589.877783807 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { prev_pid = 1852, next_pid = 2806, prev_state = 0 }
+fs.pollfd: 13589.878029802 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 13589.878034494 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 52 }
+fs.pollfd: 13589.878038224 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 131 }
+fs.pollfd: 13589.878040588 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 133 }
+fs.pollfd: 13589.878043400 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 134 }
+fs.pollfd: 13589.878046089 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 135 }
+fs.pollfd: 13589.878048710 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 123 }
+kernel.syscall_exit: 13589.878054425 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.878088419 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 78 [sys_gettimeofday+0x0/0x53] }
+kernel.syscall_exit: 13589.878091898 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.878127381 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.878137512 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { count = 4096, fd = 3 }
+kernel.syscall_exit: 13589.878138743 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, USER_MODE { ret = -11 }
+kernel.syscall_entry: 13589.878146032 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 78 [sys_gettimeofday+0x0/0x53] }
+kernel.syscall_exit: 13589.878149309 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.878162851 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 168 [sys_poll+0x0/0x8d] }
+fs.pollfd: 13589.878165282 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 13589.878166790 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 52 }
+fs.pollfd: 13589.878168186 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 131 }
+fs.pollfd: 13589.878169509 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 133 }
+fs.pollfd: 13589.878170856 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 134 }
+fs.pollfd: 13589.878172179 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 135 }
+fs.pollfd: 13589.878173459 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 123 }
+kernel.syscall_exit: 13589.878174924 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.878191357 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.878193679 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { count = 4096, fd = 3 }
+kernel.syscall_exit: 13589.878194929 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, USER_MODE { ret = -11 }
+kernel.syscall_entry: 13589.878199859 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 78 [sys_gettimeofday+0x0/0x53] }
+kernel.syscall_exit: 13589.878202247 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.878207050 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 168 [sys_poll+0x0/0x8d] }
+fs.pollfd: 13589.878208704 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 13589.878210192 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 52 }
+fs.pollfd: 13589.878211533 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 131 }
+fs.pollfd: 13589.878212770 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 133 }
+fs.pollfd: 13589.878214075 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 134 }
+fs.pollfd: 13589.878215367 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 135 }
+fs.pollfd: 13589.878216660 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 123 }
+kernel.syscall_exit: 13589.878218106 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.878273764 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.878276416 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { count = 4096, fd = 3 }
+kernel.syscall_exit: 13589.878277666 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, USER_MODE { ret = -11 }
+kernel.syscall_entry: 13589.878281819 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 78 [sys_gettimeofday+0x0/0x53] }
+kernel.syscall_exit: 13589.878284293 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.878289824 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 168 [sys_poll+0x0/0x8d] }
+fs.pollfd: 13589.878291680 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 13589.878293254 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 52 }
+fs.pollfd: 13589.878294566 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 131 }
+fs.pollfd: 13589.878295857 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 133 }
+fs.pollfd: 13589.878297211 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 134 }
+fs.pollfd: 13589.878298576 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 135 }
+fs.pollfd: 13589.878299869 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 123 }
+kernel.syscall_exit: 13589.878301272 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.878304959 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 78 [sys_gettimeofday+0x0/0x53] }
+kernel.syscall_exit: 13589.878307238 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.878318214 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.878320468 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { count = 4096, fd = 3 }
+kernel.syscall_exit: 13589.878321681 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, USER_MODE { ret = -11 }
+kernel.syscall_entry: 13589.878325816 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 78 [sys_gettimeofday+0x0/0x53] }
+kernel.syscall_exit: 13589.878328559 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.878334745 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 168 [sys_poll+0x0/0x8d] }
+fs.pollfd: 13589.878339983 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 13589.878342255 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 52 }
+fs.pollfd: 13589.878343743 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 131 }
+fs.pollfd: 13589.878345158 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 133 }
+fs.pollfd: 13589.878346640 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 134 }
+fs.pollfd: 13589.878348080 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 135 }
+fs.pollfd: 13589.878349562 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2806, 2806, eclipse, , 2805, 0x0, SYSCALL { fd = 123 }
+kernel.sched_schedule: 13589.878374675 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { prev_pid = 2806, next_pid = 16891, prev_state = 1 }
+kernel.page_fault_entry: 13589.878817328 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xc142b6ad, address = 0xb75d1728, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.878858777 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { res = 8 }
+kernel.syscall_exit: 13589.878883907 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.878891056 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb776f416, address = 0xb776f416, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.878907857 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 0 }
+kernel.page_fault_entry: 13589.878936087 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb766b795, address = 0xb766b795, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.879001705 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.879014433 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb766b79d, address = 0xbff51c28, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.879032698 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 13589.879049786 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb766b7f1, address = 0xb778d288, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.879114854 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 13589.879125101 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb763bb20, address = 0xb763bb20, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.879137676 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.879147500 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb76daf36, address = 0xb76daf36, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.879159352 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.879172956 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb766b813, address = 0xb771636c, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.879183412 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 13589.879189200 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb766b89f, address = 0xb7717340, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.879241460 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 13589.879254892 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0x80872a3, address = 0x80872a3, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.879276072 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.879298765 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0x80615fc, address = 0x80615fc, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.879313251 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.879330352 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb766c3f0, address = 0xb766c3f0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.879337574 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.879347521 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0x80623f0, address = 0x80623f0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.879353922 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.879365247 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb75fcb30, address = 0xb75fcb30, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.879372964 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.879383456 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb75e898f, address = 0xb75e898f, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.879389919 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.879406028 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 175 [sys_rt_sigprocmask+0x0/0xcf] }
+kernel.syscall_exit: 13589.879419883 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.879429615 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0x8087536, address = 0x810ee70, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.879440916 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 13589.879446049 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0x8084d10, address = 0x8084d10, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.879456376 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.879465521 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0x809c350, address = 0x809c350, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.879479400 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.879490554 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb75fd3e0, address = 0xb75fd3e0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.879497488 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.879511538 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 174 [sys_rt_sigaction+0x0/0x79] }
+kernel.syscall_exit: 13589.879515850 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.879519550 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 174 [sys_rt_sigaction+0x0/0x79] }
+kernel.syscall_exit: 13589.879521136 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.879524474 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 174 [sys_rt_sigaction+0x0/0x79] }
+kernel.syscall_exit: 13589.879526012 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.879529859 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 57 [sys_setpgid+0x0/0x175] }
+kernel.syscall_exit: 13589.879537142 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.879546403 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0x8085c70, address = 0x8085c70, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.879556509 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.879565121 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 175 [sys_rt_sigprocmask+0x0/0xcf] }
+kernel.syscall_exit: 13589.879567436 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.879573604 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb7698b00, address = 0xb7698b00, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.879581573 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.879590785 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb76994b0, address = 0xb76994b0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.879597186 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.879605369 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 54 [sys_ioctl+0x0/0x9d] }
+fs.ioctl: 13589.879619695 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { fd = 255, cmd = 21520, arg = 3220511524 }
+kernel.syscall_exit: 13589.879645781 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.879651368 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0x8085d15, address = 0x81097e4, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.879662809 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 8 }
+kernel.syscall_entry: 13589.879667006 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 175 [sys_rt_sigprocmask+0x0/0xcf] }
+kernel.syscall_exit: 13589.879669155 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.879675323 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb76922e0, address = 0xb76922e0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.879682710 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.879691255 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 6 [sys_close+0x0/0x112] }
+fs.close: 13589.879694366 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { fd = 4 }
+kernel.syscall_exit: 13589.879869017 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.879877916 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.879882810 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { count = 1, fd = 3 }
+kernel.syscall_exit: 13589.879884005 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.879890455 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0x8070800, address = 0x8070800, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.879903311 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.879913044 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 6 [sys_close+0x0/0x112] }
+fs.close: 13589.879914648 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { fd = 3 }
+kernel.syscall_exit: 13589.879972806 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.879979090 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0x807a707, address = 0x807a707, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.879990274 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.879999462 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0x8099a70, address = 0x8099a70, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880008601 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.880022677 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 174 [sys_rt_sigaction+0x0/0x79] }
+kernel.syscall_exit: 13589.880025733 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.880030835 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0x8099acc, address = 0x81121e8, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.880086279 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 13589.880095804 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0x8099ad3, address = 0x8110008, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.880106578 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 8 }
+kernel.syscall_entry: 13589.880111000 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 174 [sys_rt_sigaction+0x0/0x79] }
+kernel.syscall_exit: 13589.880113065 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.880117101 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 174 [sys_rt_sigaction+0x0/0x79] }
+kernel.syscall_exit: 13589.880118858 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.880122148 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 174 [sys_rt_sigaction+0x0/0x79] }
+kernel.syscall_exit: 13589.880123979 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.880129387 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0x8075290, address = 0x8075290, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880139243 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880195680 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0x807a5fb, address = 0x8111d84, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.880206852 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 13589.880212315 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0x80ce5c0, address = 0x80ce5c0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880239541 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880248704 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0x80aaf50, address = 0x80aaf50, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880257684 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880276126 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0x80b1950, address = 0x80b1950, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880285270 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880294758 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0x80ee5b0, address = 0x80ee5b0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880303842 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880312478 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0x80edba0, address = 0x80edba0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880318322 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880326529 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0x80edbd9, address = 0x8108dc4, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880332997 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880346484 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0x80edcd2, address = 0x92c7aa0, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.880360615 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 13589.880372216 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb7783b70, address = 0xb7783b70, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880381367 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880392074 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb777dea0, address = 0xb777dea0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880398406 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880407963 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb77871eb, address = 0xb77871eb, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880413714 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880425596 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb777def2, address = 0x80500ed, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880434869 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880443739 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb777df10, address = 0x805feae, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880449515 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880463247 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb7779160, address = 0xb7779160, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880469751 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880479638 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb7779185, address = 0x8058dea, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880490865 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880500695 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb7778da0, address = 0xb7778da0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880507097 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880516823 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb7778e8e, address = 0x804c6cc, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880525698 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880534592 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb777ee10, address = 0xb777ee10, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880540662 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880550254 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb7786b60, address = 0xb7786b60, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880556158 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880565138 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb7786b70, address = 0x8057e12, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880574332 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880583403 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb7786b74, address = 0xb778a0e3, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880589706 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880608417 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb7778e8e, address = 0xb771f404, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880627350 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880640758 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb7778e8e, address = 0xb771a190, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880655330 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880665283 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb7778e8e, address = 0xb75d25c0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880672676 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880682017 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb7778ffd, address = 0xb75d3434, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880688699 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880696803 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb777901d, address = 0xb75d5084, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880703400 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880711693 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb7778be0, address = 0xb75dba0c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880718020 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880726172 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb7786b70, address = 0xb75e33e5, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880732083 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880740492 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb7778c45, address = 0xb75e53fc, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880861224 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880872445 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb7786b70, address = 0xb75e4766, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.880879018 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.880889528 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xb77793f7, address = 0xb7719195, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.880953308 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, USER_MODE { res = 8 }
+kernel.syscall_entry: 13589.880966501 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { ip = 0xb776f416, syscall_id = 11 [ptregs_execve+0x0/0xc] }
+kernel.page_fault_get_user_entry: 13589.881280150 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { address = 0xbfffffe6, write_access = 1 }
+kernel.page_fault_get_user_exit: 13589.881297912 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { res = 0 }
+mm.page_free: 13589.881831602 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { pfn = 212199, order = 0 }
+mm.page_free: 13589.881890838 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { pfn = 163934, order = 0 }
+mm.page_free: 13589.881899205 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { pfn = 212104, order = 0 }
+mm.page_free: 13589.881904748 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { pfn = 106073, order = 0 }
+mm.page_free: 13589.881910750 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { pfn = 169976, order = 0 }
+mm.page_free: 13589.881917010 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { pfn = 15110, order = 0 }
+mm.page_free: 13589.881923350 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { pfn = 166833, order = 0 }
+mm.page_free: 13589.881948352 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { pfn = 55663, order = 0 }
+mm.page_free: 13589.881958556 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { pfn = 169002, order = 0 }
+mm.page_free: 13589.881965025 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { pfn = 64379, order = 0 }
+mm.page_free: 13589.881978040 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { pfn = 189298, order = 0 }
+mm.page_free: 13589.881993415 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { pfn = 24610, order = 0 }
+mm.page_free: 13589.882115010 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { pfn = 159988, order = 0 }
+mm.page_free: 13589.882164108 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { pfn = 100470, order = 0 }
+mm.page_free: 13589.882170080 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { pfn = 34676, order = 0 }
+mm.page_free: 13589.882337216 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { pfn = 88915, order = 0 }
+mm.page_free: 13589.882433906 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { pfn = 102782, order = 0 }
+mm.page_free: 13589.882440558 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { pfn = 30747, order = 0 }
+mm.page_free: 13589.882451711 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { pfn = 123809, order = 0 }
+mm.page_free: 13589.882553718 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { pfn = 213832, order = 0 }
+mm.page_free: 13589.882587620 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { pfn = 59881, order = 0 }
+mm.page_free: 13589.882645147 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { pfn = 215191, order = 0 }
+mm.page_free: 13589.882651818 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { pfn = 215158, order = 0 }
+mm.page_free: 13589.882718948 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { pfn = 224201, order = 0 }
+mm.page_free: 13589.882726954 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { pfn = 215269, order = 0 }
+mm.page_free: 13589.882747945 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { pfn = 215287, order = 0 }
+fs.close: 13589.882807781 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { fd = 255 }
+mm.page_free: 13589.883091605 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { pfn = 79374, order = 0 }
+kernel.page_fault_entry: 13589.883200304 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xc142b8ac, address = 0x804c500, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.883235335 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { res = 512 }
+kernel.page_fault_entry: 13589.883295943 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xc142b8ac, address = 0xb786a5bc, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.883399090 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { res = 512 }
+kernel.page_fault_entry: 13589.883428356 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, TRAP { ip = 0xc142b9d2, address = 0xbf8156cb, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.883435673 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, bash, , 30068, 0x0, SYSCALL { res = 0 }
+fs.exec: 13589.883470952 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { filename = "/usr/local/bin/lttctl" }
+kernel.syscall_exit: 13589.883477560 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.883484877 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb784d850, address = 0xb784d850, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.883494908 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.883504591 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb78641eb, address = 0xb78641eb, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.883510411 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.883518703 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb784dab7, address = 0xb7869ff4, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.883524330 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.883532361 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb784db34, address = 0xb7869f38, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.883573583 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 13589.883583701 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7855b00, address = 0xb7855b00, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.883589695 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.883598136 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7861840, address = 0xb7861840, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.883603701 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.883612725 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb78623f0, address = 0xb78623f0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.883618210 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.883626453 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb786240b, syscall_id = 45 [sys_brk+0x0/0xd3] }
+kernel.syscall_exit: 13589.883628049 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 148353024 }
+kernel.page_fault_entry: 13589.883632439 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7863be0, address = 0xb7863be0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.883638446 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.883647334 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb784edf0, address = 0xb784edf0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.883653010 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.883662389 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb784f01e, address = 0xb784f01e, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.883668744 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.883677115 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7856f20, address = 0xb7856f20, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.883682718 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.883690867 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7863beb, address = 0xb78670e3, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.883696340 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.883704301 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7857118, address = 0xb7857118, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.883709929 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.883721407 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb784f11a, address = 0x8048034, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.883732040 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.883744878 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb784f49d, address = 0xb784c01c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.883751413 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 0 }
+kernel.page_fault_entry: 13589.883761866 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7860c60, address = 0xb7860c60, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.883767685 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.883776499 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7854e90, address = 0xb7854e90, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.883781984 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.883791350 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb78635e1, syscall_id = 33 [sys_access+0x0/0x13] }
+kernel.syscall_exit: 13589.883903068 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = -2 }
+kernel.syscall_entry: 13589.883912472 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb7863723, syscall_id = 192 [sys_mmap2+0x0/0x76] }
+kernel.syscall_exit: 13589.883917043 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = -1216045056 }
+kernel.page_fault_entry: 13589.883921906 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7854f6e, address = 0xb784a00c, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.883940043 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 0 }
+kernel.page_fault_entry: 13589.883950913 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb785bd70, address = 0xb785bd70, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.883957539 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.883966775 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7850469, address = 0xb7850469, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.883972701 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.883981465 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb78635e1, syscall_id = 33 [sys_access+0x0/0x13] }
+kernel.syscall_exit: 13589.884015240 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = -2 }
+kernel.page_fault_entry: 13589.884021675 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7859700, address = 0xb7859700, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.884029525 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.884038215 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb785a19f, address = 0xb785a19f, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.884043991 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.884055196 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb785448c, address = 0xbf814f14, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.884073531 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 0 }
+kernel.page_fault_entry: 13589.884087475 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb785c480, address = 0xb785c480, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.884094425 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.884102685 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb78634a4, syscall_id = 5 [sys_open+0x0/0x23] }
+fs.open: 13589.884129412 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { fd = 3, filename = "/etc/ld.so.cache" }
+kernel.syscall_exit: 13589.884132455 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 3 }
+kernel.syscall_entry: 13589.884136704 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb786346e, syscall_id = 197 [sys_fstat64+0x0/0x23] }
+kernel.syscall_exit: 13589.884140169 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.884143263 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb7863723, syscall_id = 192 [sys_mmap2+0x0/0x76] }
+kernel.syscall_exit: 13589.884149144 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = -1216139264 }
+kernel.syscall_entry: 13589.884152355 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb78634dd, syscall_id = 6 [sys_close+0x0/0x112] }
+fs.close: 13589.884154567 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { fd = 3 }
+kernel.syscall_exit: 13589.884156728 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.884161399 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb78554fe, address = 0xb7833000, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.884170206 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.884179206 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7855957, address = 0xb7836550, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.884185703 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.884193392 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb78635e1, syscall_id = 33 [sys_access+0x0/0x13] }
+kernel.syscall_exit: 13589.884222248 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = -2 }
+kernel.page_fault_entry: 13589.884228125 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb78555fc, address = 0xb7839c5c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.884235528 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.884243515 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb78553b7, address = 0xb784394c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.884249385 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.884256851 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7855637, address = 0xb78380e4, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.884262982 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.884270409 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb78553b7, address = 0xb7840547, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.884276340 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.884284607 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb78553b7, address = 0xb7841d49, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.884294894 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.884305290 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7852260, address = 0xb7852260, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.884336937 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.884345197 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb78634a4, syscall_id = 5 [sys_open+0x0/0x23] }
+fs.open: 13589.884368427 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { fd = 3, filename = "/usr/local/lib/liblttctl.so.0" }
+kernel.syscall_exit: 13589.884370768 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 3 }
+kernel.syscall_entry: 13589.884374935 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb7863524, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.884393208 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { count = 512, fd = 3 }
+kernel.syscall_exit: 13589.884394475 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 512 }
+kernel.page_fault_entry: 13589.884400078 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7851a80, address = 0xb7851a80, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.884406997 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.884415754 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb78640bf, address = 0xb784b838, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.884429457 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 0 }
+kernel.syscall_entry: 13589.884438401 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb786346e, syscall_id = 197 [sys_fstat64+0x0/0x23] }
+kernel.syscall_exit: 13589.884440798 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.884446685 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7853028, address = 0xb7853028, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.884452828 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.884459642 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb7863723, syscall_id = 192 [sys_mmap2+0x0/0x76] }
+kernel.syscall_exit: 13589.884463605 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = -1216159744 }
+kernel.syscall_entry: 13589.884467090 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb7863723, syscall_id = 192 [sys_mmap2+0x0/0x76] }
+kernel.syscall_exit: 13589.884476586 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = -1216147456 }
+kernel.page_fault_entry: 13589.884481735 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7863fcf, address = 0xb7831b48, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.884503877 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.884512654 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb7863723, syscall_id = 192 [sys_mmap2+0x0/0x76] }
+kernel.syscall_exit: 13589.884517827 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = -1216143360 }
+kernel.syscall_entry: 13589.884521685 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb78634dd, syscall_id = 6 [sys_close+0x0/0x112] }
+fs.close: 13589.884523330 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { fd = 3 }
+kernel.syscall_exit: 13589.884525026 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.884529511 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7855b29, address = 0xb782e248, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.884535858 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.884545268 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb78635e1, syscall_id = 33 [sys_access+0x0/0x13] }
+kernel.syscall_exit: 13589.884573795 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = -2 }
+kernel.page_fault_entry: 13589.884579906 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7855637, address = 0xb783b7d4, trap_id = 14, write_access = 0 }
+kernel.irq_entry: 13589.884621974 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, IRQ { ip = 3242336307, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.irq_exit: 13589.884640893 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { handled = 1 }
+kernel.page_fault_exit: 13589.884646607 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.884656445 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb78553b7, address = 0xb7846eb1, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.884663358 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.884672010 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7855637, address = 0xb783c584, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.884677848 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.884685600 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb78553b7, address = 0xb78487ad, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.884691400 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.884698860 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb78553b7, address = 0xb7847b0a, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.884704451 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.884712804 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb78634a4, syscall_id = 5 [sys_open+0x0/0x23] }
+fs.open: 13589.884731512 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { fd = 3, filename = "/lib/i686/cmov/libc.so.6" }
+kernel.syscall_exit: 13589.884734307 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 3 }
+kernel.syscall_entry: 13589.884738133 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb7863524, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.884762717 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { count = 512, fd = 3 }
+kernel.syscall_exit: 13589.884764169 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 512 }
+kernel.syscall_entry: 13589.884768816 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb786346e, syscall_id = 197 [sys_fstat64+0x0/0x23] }
+kernel.syscall_exit: 13589.884770704 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.884777207 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb785d9a0, address = 0xb785d9a0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.884784007 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.884791952 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb7863723, syscall_id = 192 [sys_mmap2+0x0/0x76] }
+kernel.syscall_exit: 13589.884796741 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = -1217499136 }
+kernel.syscall_entry: 13589.884800299 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb7863723, syscall_id = 192 [sys_mmap2+0x0/0x76] }
+kernel.syscall_exit: 13589.884806896 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = -1216184320 }
+kernel.page_fault_entry: 13589.884811592 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7863fcf, address = 0xb782a99c, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.884844889 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.884854124 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb7863723, syscall_id = 192 [sys_mmap2+0x0/0x76] }
+kernel.syscall_exit: 13589.884859187 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = -1216172032 }
+kernel.page_fault_entry: 13589.884863858 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb78532ee, address = 0xb7829d7c, trap_id = 14, write_access = 0 }
+kernel.irq_entry: 13589.884994803 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, IRQ { ip = 3242336307, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_update_time: 13589.885023424 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, IRQ { jiffies = 4296292871, xtime_sec = 1262715366, xtime_nsec = 301133054, walltomonotonic_sec = -1262701811, walltomonotonic_nsec = 148963639 }
+kernel.softirq_raise: 13589.885042747 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, IRQ { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.softirq_raise: 13589.885051964 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, IRQ { softirq_id = 9 [rcu_process_callbacks+0x0/0x1f] }
+kernel.sched_try_wakeup: 13589.885082448 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, IRQ { pid = 2259, cpu_id = 0, state = 1 }
+kernel.irq_exit: 13589.885096244 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { handled = 1 }
+kernel.softirq_entry: 13589.885099877 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SOFTIRQ { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.timer_set: 13589.885115975 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SOFTIRQ { expires = 1325576, function = 0xc141d458, data = 0 }
+kernel.softirq_exit: 13589.885119018 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.softirq_entry: 13589.885120603 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SOFTIRQ { softirq_id = 9 [rcu_process_callbacks+0x0/0x1f] }
+rcu.tree_callback: 13589.885168154 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SOFTIRQ { func = 0xc10acb19 }
+rcu.tree_callback: 13589.885170944 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SOFTIRQ { func = 0xc10acb19 }
+rcu.tree_callback: 13589.885172608 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SOFTIRQ { func = 0xc10acb19 }
+rcu.tree_callback: 13589.885174186 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SOFTIRQ { func = 0xc10acb19 }
+rcu.tree_callback: 13589.885193142 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SOFTIRQ { func = 0xc10bdc5f }
+rcu.tree_callback: 13589.885197216 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SOFTIRQ { func = 0xc103c96c }
+rcu.tree_callback: 13589.885198857 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SOFTIRQ { func = 0xc102b275 }
+kernel.process_free: 13589.885201707 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SOFTIRQ { pid = 16887 }
+mm.page_free: 13589.885207875 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SOFTIRQ { pfn = 215404, order = 1 }
+kernel.softirq_exit: 13589.885214086 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { softirq_id = 9 [rcu_process_callbacks+0x0/0x1f] }
+kernel.page_fault_exit: 13589.885218130 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.sched_schedule: 13589.885227259 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { prev_pid = 16891, next_pid = 2259, prev_state = 0 }
+fs.pollfd: 13589.885363350 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 4 }
+fs.pollfd: 13589.885366723 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 13589.885369947 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 11 }
+kernel.syscall_exit: 13589.885374704 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.885389821 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 78 [sys_gettimeofday+0x0/0x53] }
+kernel.syscall_exit: 13589.885393027 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.885402691 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 13 [sys_time+0x0/0x27] }
+kernel.syscall_exit: 13589.885404076 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, USER_MODE { ret = 1262715366 }
+kernel.syscall_entry: 13589.885418827 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.885493794 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { count = 1024, fd = 12 }
+kernel.syscall_exit: 13589.885495193 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, USER_MODE { ret = 857 }
+kernel.syscall_entry: 13589.885520074 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.885521732 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { count = 1024, fd = 12 }
+kernel.syscall_exit: 13589.885522938 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.885528490 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 140 [sys_llseek+0x0/0xc1] }
+fs.llseek: 13589.885531415 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 12, offset = 0, origin = 0 }
+kernel.syscall_exit: 13589.885533211 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.885602364 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 5 [sys_open+0x0/0x23] }
+fs.open: 13589.885627426 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 14, filename = "/proc/loadavg" }
+kernel.syscall_exit: 13589.885629687 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, USER_MODE { ret = 14 }
+kernel.syscall_entry: 13589.885635575 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 197 [sys_fstat64+0x0/0x23] }
+kernel.syscall_exit: 13589.885637420 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.885640631 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 192 [sys_mmap2+0x0/0x76] }
+kernel.syscall_exit: 13589.885645817 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, USER_MODE { ret = -1215705088 }
+kernel.syscall_entry: 13589.885649028 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 3 [sys_read+0x0/0x9d] }
+kernel.page_fault_entry: 13589.885659071 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, TRAP { ip = 0xc142bf44, address = 0xb789d000, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.885708077 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { res = 0 }
+fs.read: 13589.885716934 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { count = 1024, fd = 14 }
+kernel.syscall_exit: 13589.885718350 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, USER_MODE { ret = 27 }
+kernel.syscall_entry: 13589.885739766 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 6 [sys_close+0x0/0x112] }
+fs.close: 13589.885741585 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 14 }
+kernel.syscall_exit: 13589.885828348 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.885833335 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 91 [sys_munmap+0x0/0x3d] }
+mm.page_free: 13589.885855086 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { pfn = 24610, order = 0 }
+kernel.syscall_exit: 13589.885895272 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.885904818 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.885969034 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { count = 1024, fd = 6 }
+kernel.syscall_exit: 13589.885970476 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, USER_MODE { ret = 1024 }
+kernel.syscall_entry: 13589.886026766 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.886047151 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { count = 1024, fd = 6 }
+kernel.syscall_exit: 13589.886048884 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, USER_MODE { ret = 292 }
+kernel.syscall_entry: 13589.886069331 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.886072672 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { count = 1024, fd = 6 }
+kernel.syscall_exit: 13589.886073896 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.886077598 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 140 [sys_llseek+0x0/0xc1] }
+fs.llseek: 13589.886079672 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 6, offset = 0, origin = 0 }
+kernel.syscall_exit: 13589.886081474 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.886103890 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.886131795 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { count = 1024, fd = 8 }
+kernel.syscall_exit: 13589.886133175 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, USER_MODE { ret = 447 }
+kernel.syscall_entry: 13589.886146336 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.886148050 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { count = 1024, fd = 8 }
+kernel.syscall_exit: 13589.886149280 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.886152765 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 140 [sys_llseek+0x0/0xc1] }
+fs.llseek: 13589.886155137 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 8, offset = 0, origin = 0 }
+kernel.syscall_exit: 13589.886156851 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.886163845 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.886208962 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { count = 1024, fd = 9 }
+kernel.syscall_exit: 13589.886210558 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, USER_MODE { ret = 1024 }
+kernel.syscall_entry: 13589.886225627 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.886234098 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { count = 1024, fd = 9 }
+kernel.syscall_exit: 13589.886235291 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, USER_MODE { ret = 375 }
+kernel.syscall_entry: 13589.886241216 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.886242613 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { count = 1024, fd = 9 }
+kernel.syscall_exit: 13589.886243781 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.886247198 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 140 [sys_llseek+0x0/0xc1] }
+fs.llseek: 13589.886249104 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 9, offset = 0, origin = 0 }
+kernel.syscall_exit: 13589.886250775 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.886426990 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 168 [sys_poll+0x0/0x8d] }
+fs.pollfd: 13589.886429964 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 3 }
+kernel.syscall_exit: 13589.886433144 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, USER_MODE { ret = 1 }
+kernel.syscall_entry: 13589.886436902 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 146 [sys_writev+0x0/0xcd] }
+fs.writev: 13589.886454684 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 3, vlen = 3 }
+kernel.syscall_exit: 13589.886456237 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, USER_MODE { ret = 448 }
+kernel.syscall_entry: 13589.886465280 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.886468603 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { count = 4096, fd = 3 }
+kernel.syscall_exit: 13589.886469784 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, USER_MODE { ret = -11 }
+kernel.syscall_entry: 13589.886477405 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 78 [sys_gettimeofday+0x0/0x53] }
+kernel.syscall_exit: 13589.886480231 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.886484864 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { ip = 0xb78b4416, syscall_id = 168 [sys_poll+0x0/0x8d] }
+fs.pollfd: 13589.886489355 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 4 }
+fs.pollfd: 13589.886491634 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 13589.886493193 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 11 }
+kernel.sched_schedule: 13589.886511373 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { prev_pid = 2259, next_pid = 1852, prev_state = 1 }
+fs.select: 13589.886694165 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 5, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886704195 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 7, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886707189 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 13, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886709766 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 19, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886712393 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 20, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886715096 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 21, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886717773 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 22, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886720257 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 23, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886722723 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 24, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886725394 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 25, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886727934 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 26, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886730505 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 27, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886733419 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 28, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886736275 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 29, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886739101 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 31, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886742238 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 32, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886746449 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 33, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886749145 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 34, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886752232 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 35, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886754828 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 36, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886757554 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 37, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886760281 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 38, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886762990 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 39, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886765890 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 40, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886768430 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 41, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886771194 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 42, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886773791 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 43, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886776188 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 44, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886778250 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 45, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886780673 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 46, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886782878 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 47, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886785132 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 48, end_time_sec = 13555, end_time_nsec = 785039963 }
+fs.select: 13589.886787771 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 49, end_time_sec = 13555, end_time_nsec = 785039963 }
+mm.page_free: 13589.886794262 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pfn = 224201, order = 0 }
+kernel.syscall_exit: 13589.886799479 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 2 }
+kernel.syscall_entry: 13589.886819535 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [sys_setitimer+0x0/0x6f] }
+kernel.timer_itimer_set: 13589.886822510 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 13589.886830778 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.886836280 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 13589.886839472 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.886850466 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [sys_read+0x0/0x9d] }
+kernel.sched_try_wakeup: 13589.886864696 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pid = 2241, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 13589.886874409 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { prev_pid = 1852, next_pid = 2241, prev_state = 0 }
+fs.pollfd: 13589.887026699 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 13589.887034916 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { prev_pid = 2241, next_pid = 1852, prev_state = 1 }
+fs.read: 13589.887195490 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4096, fd = 41 }
+kernel.syscall_exit: 13589.887197206 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 16 }
+kernel.syscall_entry: 13589.887211646 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.887213894 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4096, fd = 41 }
+kernel.syscall_exit: 13589.887215062 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = -11 }
+kernel.syscall_entry: 13589.887220322 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 146 [sys_writev+0x0/0xcd] }
+kernel.sched_try_wakeup: 13589.887229546 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pid = 2241, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 13589.887237856 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { prev_pid = 1852, next_pid = 2241, prev_state = 0 }
+fs.pollfd: 13589.887373836 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 13589.887376891 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, USER_MODE { ret = 1 }
+kernel.syscall_entry: 13589.887385469 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.887390176 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.887391438 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, USER_MODE { ret = 32 }
+kernel.syscall_entry: 13589.887402922 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.887404698 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.887405891 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, USER_MODE { ret = -11 }
+kernel.syscall_entry: 13589.890440749 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [sys_poll+0x0/0x8d] }
+fs.pollfd: 13589.890444419 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 13589.890447674 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, USER_MODE { ret = 1 }
+kernel.syscall_entry: 13589.890451699 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 146 [sys_writev+0x0/0xcd] }
+fs.writev: 13589.890460842 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8, vlen = 3 }
+kernel.syscall_exit: 13589.890462407 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, USER_MODE { ret = 7140 }
+kernel.syscall_entry: 13589.890467972 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [sys_poll+0x0/0x8d] }
+fs.pollfd: 13589.890469972 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 13589.890479059 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { prev_pid = 2241, next_pid = 1852, prev_state = 1 }
+fs.writev: 13589.890641627 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 41, vlen = 1 }
+kernel.syscall_exit: 13589.890643720 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 32 }
+kernel.syscall_entry: 13589.890650571 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 13589.890653428 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.890657167 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [sys_setitimer+0x0/0x6f] }
+kernel.timer_itimer_set: 13589.890659205 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 13589.890664633 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.890674508 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 142 [sys_select+0x0/0x8f] }
+fs.select: 13589.890680602 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 1, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890683583 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 3, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890685595 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 5, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890690229 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 7, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890692508 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 13, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890695117 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 19, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890697129 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 20, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890699116 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 21, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890701085 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 22, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890703160 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 23, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890705117 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 24, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890707110 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 25, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890709303 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 26, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890711477 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 27, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890713464 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 28, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890715663 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 29, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890717886 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 31, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890720197 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 32, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890723713 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 33, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890725899 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 34, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890727992 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 35, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890730303 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 36, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890732483 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 37, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890734725 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 38, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890737023 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 39, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890739141 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 40, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890741216 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 41, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890743216 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 42, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890745197 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 43, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890747072 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 44, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890749079 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 45, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890750954 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 46, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890752799 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 47, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890754557 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 48, end_time_sec = 13555, end_time_nsec = 784034511 }
+fs.select: 13589.890756401 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 49, end_time_sec = 13555, end_time_nsec = 784034511 }
+mm.page_free: 13589.890762190 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pfn = 224201, order = 0 }
+kernel.syscall_exit: 13589.890765923 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 2 }
+kernel.syscall_entry: 13589.890771376 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [sys_setitimer+0x0/0x6f] }
+kernel.timer_itimer_set: 13589.890773215 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 13589.890780178 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.890783631 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 13589.890786053 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.890790687 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.890795364 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4096, fd = 41 }
+kernel.syscall_exit: 13589.890796593 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 4096 }
+kernel.syscall_entry: 13589.891068700 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [sys_read+0x0/0x9d] }
+kernel.sched_try_wakeup: 13589.891103724 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pid = 2241, cpu_id = 0, state = 1 }
+fs.read: 13589.891110532 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4092, fd = 41 }
+kernel.syscall_exit: 13589.891112252 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 3044 }
+kernel.syscall_entry: 13589.891187083 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.891207294 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4096, fd = 41 }
+kernel.syscall_exit: 13589.891208847 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = -11 }
+kernel.syscall_entry: 13589.891214604 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 146 [sys_writev+0x0/0xcd] }
+fs.writev: 13589.891223585 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 41, vlen = 1 }
+kernel.syscall_exit: 13589.891225213 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 32 }
+kernel.syscall_entry: 13589.891229375 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 13589.891231896 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.891235188 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [sys_setitimer+0x0/0x6f] }
+kernel.timer_itimer_set: 13589.891237038 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 13589.891240635 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.891245548 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 142 [sys_select+0x0/0x8f] }
+fs.select: 13589.891250554 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 1, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891252927 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 3, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891254970 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 5, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891258573 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 7, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891260598 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 13, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891262672 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 19, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891264572 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 20, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891266840 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 21, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891268795 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 22, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891270703 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 23, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891272560 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 24, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891274442 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 25, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891276317 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 26, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891278175 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 27, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891280044 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 28, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891282268 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 29, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891284386 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 31, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891286367 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 32, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891289007 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 33, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891290895 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 34, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891292777 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 35, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891294758 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 36, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891296714 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 37, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891298585 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 38, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891300459 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 39, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891302323 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 40, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891304168 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 41, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891306031 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 42, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891307913 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 43, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891309783 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 44, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891311684 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 45, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891313807 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 46, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891315540 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 47, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891317279 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 48, end_time_sec = 13555, end_time_nsec = 784605311 }
+fs.select: 13589.891319013 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 49, end_time_sec = 13555, end_time_nsec = 784605311 }
+mm.page_free: 13589.891325068 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pfn = 224201, order = 0 }
+kernel.syscall_exit: 13589.891328193 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 1 }
+kernel.syscall_entry: 13589.891333043 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [sys_setitimer+0x0/0x6f] }
+kernel.timer_itimer_set: 13589.891334888 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 13589.891340621 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.891343993 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 13589.891346422 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.891351006 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [sys_read+0x0/0x9d] }
+kernel.sched_try_wakeup: 13589.891360453 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pid = 2259, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 13589.891369353 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { prev_pid = 1852, next_pid = 2259, prev_state = 0 }
+fs.pollfd: 13589.891526593 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 4 }
+fs.pollfd: 13589.891528909 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 13589.891530455 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2259, 2259, gkrellm, , 2174, 0x0, SYSCALL { fd = 11 }
+kernel.sched_schedule: 13589.891540014 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { prev_pid = 2259, next_pid = 2241, prev_state = 1 }
+fs.pollfd: 13589.891648162 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 13589.891650913 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, USER_MODE { ret = 1 }
+kernel.syscall_entry: 13589.891657503 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.891661802 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.891663038 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, USER_MODE { ret = 32 }
+kernel.syscall_entry: 13589.891670391 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.891672235 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.891673403 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, USER_MODE { ret = -11 }
+kernel.syscall_entry: 13589.891683589 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [sys_poll+0x0/0x8d] }
+fs.pollfd: 13589.891685391 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 13589.891687577 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, USER_MODE { ret = 1 }
+kernel.syscall_entry: 13589.891690925 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 146 [sys_writev+0x0/0xcd] }
+fs.writev: 13589.891695092 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8, vlen = 3 }
+kernel.syscall_exit: 13589.891696583 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, USER_MODE { ret = 16 }
+kernel.syscall_entry: 13589.891701316 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [sys_poll+0x0/0x8d] }
+fs.pollfd: 13589.891702831 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 13589.891710564 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { prev_pid = 2241, next_pid = 1852, prev_state = 1 }
+fs.read: 13589.891867263 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4096, fd = 44 }
+kernel.syscall_exit: 13589.891868947 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 448 }
+kernel.syscall_entry: 13589.891961964 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.891964957 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4096, fd = 44 }
+kernel.syscall_exit: 13589.891966224 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = -11 }
+kernel.syscall_entry: 13589.891970405 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 13589.891973007 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.891976205 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [sys_setitimer+0x0/0x6f] }
+kernel.timer_itimer_set: 13589.891978355 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 13589.891982373 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.891987634 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 142 [sys_select+0x0/0x8f] }
+fs.select: 13589.891992888 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 1, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.891995559 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 3, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.891997559 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 5, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892001087 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 7, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892003236 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 13, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892005391 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 19, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892007496 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 20, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892009509 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 21, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892011485 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 22, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892013404 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 23, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892015528 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 24, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892017472 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 25, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892019379 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 26, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892021255 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 27, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892023149 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 28, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892025416 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 29, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892027335 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 31, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892029379 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 32, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892032074 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 33, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892034130 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 34, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892036111 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 35, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892038062 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 36, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892039943 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 37, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892041838 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 38, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892044130 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 39, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892046210 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 40, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892048353 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 41, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892050559 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 42, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892052527 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 43, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892054465 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 44, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892056272 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 45, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892058384 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 46, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892060136 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 47, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892061894 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 48, end_time_sec = 13555, end_time_nsec = 784347114 }
+fs.select: 13589.892063645 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 49, end_time_sec = 13555, end_time_nsec = 784347114 }
+mm.page_free: 13589.892069514 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pfn = 224201, order = 0 }
+kernel.syscall_exit: 13589.892072465 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 1 }
+kernel.syscall_entry: 13589.892077297 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [sys_setitimer+0x0/0x6f] }
+kernel.timer_itimer_set: 13589.892079153 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 13589.892085154 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.892088588 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 13589.892091011 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.892095135 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [sys_read+0x0/0x9d] }
+kernel.sched_try_wakeup: 13589.892103501 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pid = 2241, cpu_id = 0, state = 1 }
+fs.read: 13589.892108775 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4096, fd = 41 }
+kernel.syscall_exit: 13589.892110116 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 16 }
+kernel.syscall_entry: 13589.892115737 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.892117513 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4096, fd = 41 }
+kernel.syscall_exit: 13589.892118668 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = -11 }
+kernel.syscall_entry: 13589.892122457 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 146 [sys_writev+0x0/0xcd] }
+fs.writev: 13589.892129500 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 41, vlen = 1 }
+kernel.syscall_exit: 13589.892131116 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 32 }
+kernel.syscall_entry: 13589.892134923 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 13589.892137401 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.892140581 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [sys_setitimer+0x0/0x6f] }
+kernel.timer_itimer_set: 13589.892142388 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 13589.892145811 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.892150694 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 142 [sys_select+0x0/0x8f] }
+fs.select: 13589.892155103 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 1, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892157376 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 3, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892159394 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 5, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892162712 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 7, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892164724 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 13, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892166891 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 19, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892168798 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 20, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892170692 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 21, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892172568 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 22, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892174451 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 23, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892176320 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 24, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892178226 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 25, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892180146 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 26, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892182457 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 27, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892184419 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 28, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892186456 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 29, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892188456 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 31, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892190518 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 32, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892193103 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 33, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892195065 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 34, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892197034 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 35, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892198947 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 36, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892200817 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 37, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892202699 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 38, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892204568 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 39, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892206444 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 40, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892208307 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 41, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892210263 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 42, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892212281 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 43, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892214512 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 44, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892216381 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 45, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892218282 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 46, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892220145 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 47, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892240306 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 48, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.892242536 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 49, end_time_sec = 13555, end_time_nsec = 784510040 }
+kernel.sched_schedule: 13589.892251374 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { prev_pid = 1852, next_pid = 2241, prev_state = 1 }
+fs.pollfd: 13589.892390838 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 13589.892393503 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, USER_MODE { ret = 1 }
+kernel.syscall_entry: 13589.892399322 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [sys_read+0x0/0x9d] }
+kernel.sched_try_wakeup: 13589.892406974 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { pid = 1852, cpu_id = 0, state = 1 }
+fs.read: 13589.892412011 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.892413328 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, USER_MODE { ret = 32 }
+kernel.syscall_entry: 13589.892420079 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.892422011 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.892423186 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, USER_MODE { ret = -11 }
+kernel.syscall_entry: 13589.894223376 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [sys_poll+0x0/0x8d] }
+fs.pollfd: 13589.894227401 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 13589.894231836 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, USER_MODE { ret = 1 }
+kernel.syscall_entry: 13589.894235891 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 146 [sys_writev+0x0/0xcd] }
+fs.writev: 13589.894258040 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8, vlen = 3 }
+kernel.syscall_exit: 13589.894259735 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, USER_MODE { ret = 19000 }
+kernel.irq_entry: 13589.894599835 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, IRQ { ip = 3242336307, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.irq_exit: 13589.894613418 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, USER_MODE { handled = 1 }
+kernel.syscall_entry: 13589.894617698 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [sys_poll+0x0/0x8d] }
+fs.pollfd: 13589.894620871 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 13589.894623561 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 9 }
+fs.pollfd: 13589.894625430 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+fs.pollfd: 13589.894626872 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 10 }
+fs.pollfd: 13589.894631790 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 14 }
+fs.pollfd: 13589.894633585 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 5 }
+fs.pollfd: 13589.894635492 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 12 }
+fs.pollfd: 13589.894638375 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 19 }
+fs.pollfd: 13589.894640846 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 16 }
+fs.pollfd: 13589.894643473 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 26 }
+fs.pollfd: 13589.894645964 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 21 }
+fs.pollfd: 13589.894648877 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 31 }
+kernel.syscall_exit: 13589.894651237 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.894688944 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [sys_poll+0x0/0x8d] }
+fs.pollfd: 13589.894690976 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 13589.894693218 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, USER_MODE { ret = 1 }
+kernel.syscall_entry: 13589.894696789 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 146 [sys_writev+0x0/0xcd] }
+fs.writev: 13589.894706037 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8, vlen = 3 }
+kernel.syscall_exit: 13589.894707596 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, USER_MODE { ret = 1296 }
+kernel.syscall_entry: 13589.894712596 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.894715695 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.894716919 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, USER_MODE { ret = -11 }
+kernel.syscall_entry: 13589.894725254 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.894727211 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 13589.894728429 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, USER_MODE { ret = -11 }
+kernel.syscall_entry: 13589.894737490 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb6053e4c, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 13589.894740459 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.894745030 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { ip = 0xb7857416, syscall_id = 168 [sys_poll+0x0/0x8d] }
+fs.pollfd: 13589.894749067 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 13589.894750975 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 9 }
+fs.pollfd: 13589.894752546 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+fs.pollfd: 13589.894753993 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 10 }
+fs.pollfd: 13589.894757185 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 14 }
+fs.pollfd: 13589.894758651 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 5 }
+fs.pollfd: 13589.894760155 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 12 }
+fs.pollfd: 13589.894762285 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 19 }
+fs.pollfd: 13589.894763800 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 16 }
+fs.pollfd: 13589.894765856 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 26 }
+fs.pollfd: 13589.894767278 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 21 }
+fs.pollfd: 13589.894769377 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 31 }
+kernel.sched_schedule: 13589.894782248 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { prev_pid = 2241, next_pid = 1852, prev_state = 1 }
+kernel.irq_entry: 13589.894968323 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { ip = 3238156110, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_update_time: 13589.894981802 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { jiffies = 4296292872, xtime_sec = 1262715366, xtime_nsec = 301133055, walltomonotonic_sec = -1262701811, walltomonotonic_nsec = 148963639 }
+kernel.softirq_raise: 13589.894994509 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.softirq_raise: 13589.895000385 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { softirq_id = 9 [rcu_process_callbacks+0x0/0x1f] }
+kernel.irq_exit: 13589.895021359 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { handled = 1 }
+kernel.softirq_entry: 13589.895024850 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.timer_set: 13589.895034999 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { expires = 1325577, function = 0xc141d458, data = 0 }
+kernel.softirq_exit: 13589.895038185 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.softirq_entry: 13589.895039521 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { softirq_id = 9 [rcu_process_callbacks+0x0/0x1f] }
+rcu.tree_callback: 13589.895085669 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { func = 0xc10acb19 }
+rcu.tree_callback: 13589.895088980 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { func = 0xc10acb19 }
+rcu.tree_callback: 13589.895090631 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { func = 0xc104364a }
+rcu.tree_callback: 13589.895093917 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { func = 0xc104364a }
+rcu.tree_callback: 13589.895095637 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { func = 0xc104364a }
+rcu.tree_callback: 13589.895097234 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 1852, 1852, Xorg, , 1848, 0x0, SOFTIRQ { func = 0xc104364a }
+kernel.softirq_exit: 13589.895099172 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { softirq_id = 9 [rcu_process_callbacks+0x0/0x1f] }
+fs.select: 13589.895111072 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 1, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895113960 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 3, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895115849 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 5, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895119588 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 7, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895121594 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 13, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895123562 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 19, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895125594 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 20, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895127637 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 21, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895130010 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 22, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895132028 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 23, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895133978 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 24, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895136035 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 25, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895137966 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 26, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895139997 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 27, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895142078 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 28, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895163804 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 29, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895166009 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 31, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895168550 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 32, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895170382 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 33, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895172605 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 34, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895174741 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 35, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895176562 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 36, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895178581 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 37, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895180748 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 38, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895183288 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 39, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895185369 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 40, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895187382 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 41, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895189481 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 42, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895191549 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 43, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895193698 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 44, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895195753 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 45, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895197903 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 46, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895199711 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 47, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895201735 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 48, end_time_sec = 13555, end_time_nsec = 784510040 }
+fs.select: 13589.895203673 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 49, end_time_sec = 13555, end_time_nsec = 784510040 }
+mm.page_free: 13589.895211611 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pfn = 224201, order = 0 }
+kernel.syscall_exit: 13589.895216455 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 1 }
+kernel.syscall_entry: 13589.895227119 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [sys_setitimer+0x0/0x6f] }
+kernel.timer_itimer_set: 13589.895229499 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 13589.895236542 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.895240741 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 13589.895243244 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.895249654 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.895254572 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4096, fd = 41 }
+kernel.syscall_exit: 13589.895271926 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 4096 }
+kernel.syscall_entry: 13589.895443514 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.895447892 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 2652, fd = 41 }
+kernel.syscall_exit: 13589.895449165 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 2652 }
+kernel.syscall_entry: 13589.895692285 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.895696484 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4076, fd = 41 }
+kernel.syscall_exit: 13589.895697795 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 4076 }
+kernel.syscall_entry: 13589.896107955 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.896112166 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 3548, fd = 41 }
+kernel.syscall_exit: 13589.896113464 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 3548 }
+kernel.syscall_entry: 13589.896239977 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.896243400 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 956, fd = 41 }
+kernel.syscall_exit: 13589.896244648 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 956 }
+kernel.syscall_entry: 13589.896275275 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [sys_read+0x0/0x9d] }
+kernel.sched_try_wakeup: 13589.896284939 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { pid = 2241, cpu_id = 0, state = 1 }
+fs.read: 13589.896309336 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 3960, fd = 41 }
+kernel.syscall_exit: 13589.896310827 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 3960 }
+kernel.syscall_entry: 13589.896344783 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.896352802 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 3960, fd = 41 }
+kernel.syscall_exit: 13589.896354093 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 1008 }
+kernel.irq_entry: 13589.898690474 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { ip = 3077256468, handler = 0x0, irq_id = 239, kernel_mode = 0 }
+kernel.sched_try_wakeup: 13589.898720044 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, IRQ { pid = 2822, cpu_id = 0, state = 1 }
+kernel.irq_exit: 13589.898735491 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { handled = 1 }
+kernel.sched_schedule: 13589.898747932 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, SYSCALL { prev_pid = 1852, next_pid = 2822, prev_state = 0 }
+kernel.syscall_exit: 13589.899034044 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, USER_MODE { ret = -110 }
+kernel.syscall_entry: 13589.899076660 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 240 [sys_futex+0x0/0x111] }
+kernel.syscall_exit: 13589.899080130 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.899084479 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb690fe4c, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 13589.899088377 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.899098745 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 78 [sys_gettimeofday+0x0/0x53] }
+kernel.syscall_exit: 13589.899101658 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.899105290 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb690fe4c, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 13589.899107511 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.899110486 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb690fe4c, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 13589.899112694 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.899115949 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 78 [sys_gettimeofday+0x0/0x53] }
+kernel.syscall_exit: 13589.899118609 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.899124795 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 13589.899127078 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.899130140 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2822, 2806, eclipse, , 2805, 0x0, SYSCALL { ip = 0xb7768416, syscall_id = 240 [sys_futex+0x0/0x111] }
+kernel.sched_schedule: 13589.899146125 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { prev_pid = 2822, next_pid = 2241, prev_state = 1 }
+fs.pollfd: 13589.899221708 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 13589.899225742 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 9 }
+fs.pollfd: 13589.899228785 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+fs.pollfd: 13589.899230715 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 10 }
+fs.pollfd: 13589.899238906 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 14 }
+fs.pollfd: 13589.899240681 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 5 }
+fs.pollfd: 13589.899242518 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 12 }
+fs.pollfd: 13589.899245475 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 19 }
+fs.pollfd: 13589.899247511 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 16 }
+fs.pollfd: 13589.899250226 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 26 }
+fs.pollfd: 13589.899252082 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 21 }
+fs.pollfd: 13589.899255076 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 2241, 2241, konsole, , 1, 0x0, SYSCALL { fd = 31 }
+kernel.sched_schedule: 13589.899265054 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { prev_pid = 2241, next_pid = 1852, prev_state = 1 }
+kernel.syscall_entry: 13589.902191865 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 13589.902208208 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { count = 4096, fd = 41 }
+kernel.syscall_exit: 13589.902210800 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = -11 }
+kernel.syscall_entry: 13589.902218942 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7527e4c, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 13589.902223631 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.902227985 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 104 [sys_setitimer+0x0/0x6f] }
+kernel.timer_itimer_set: 13589.902233863 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 13589.902243396 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.902256918 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { ip = 0xb7726416, syscall_id = 142 [sys_select+0x0/0x8f] }
+fs.select: 13589.902266334 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 1, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902270837 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 3, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902273362 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 5, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902281775 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 7, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902284404 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 13, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902287157 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 19, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902289693 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 20, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902292391 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 21, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902294939 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 22, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902297488 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 23, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902300030 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 24, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902302796 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 25, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902305313 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 26, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902307794 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 27, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902310447 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 28, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902313059 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 29, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902316182 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 31, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902319349 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 32, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902326241 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 33, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902329043 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 34, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902331828 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 35, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902334568 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 36, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902337246 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 37, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902339906 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 38, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902342394 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 39, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902344775 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 40, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902347027 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 41, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902349074 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 42, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902351691 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 43, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902354029 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 44, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902356659 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 45, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902359207 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 46, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902361930 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 47, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902364348 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 48, end_time_sec = 13555, end_time_nsec = 784612772 }
+fs.select: 13589.902366773 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 1852, 1852, Xorg, , 1848, 0x0, SYSCALL { fd = 49, end_time_sec = 13555, end_time_nsec = 784612772 }
+kernel.sched_schedule: 13589.902392267 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { prev_pid = 1852, next_pid = 16891, prev_state = 1 }
+kernel.page_fault_entry: 13589.902710231 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7853371, address = 0xb7829da8, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.902883556 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 8 }
+kernel.syscall_entry: 13589.902894394 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb78634dd, syscall_id = 6 [sys_close+0x0/0x112] }
+fs.close: 13589.902897456 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { fd = 3 }
+kernel.syscall_exit: 13589.902900767 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.902906290 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7855b29, address = 0xb76e71b8, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.902923043 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.902962690 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7863a07, address = 0xb76f974e, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.902972329 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.902985022 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb785c595, address = 0xb76faa88, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.902991234 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.903001854 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb7863723, syscall_id = 192 [sys_mmap2+0x0/0x76] }
+kernel.syscall_exit: 13589.903012872 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = -1217503232 }
+kernel.page_fault_entry: 13589.903017456 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb785cbd1, address = 0xb76e61c4, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.903035013 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 0 }
+kernel.page_fault_entry: 13589.903046086 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb785e470, address = 0xb785e470, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.903053485 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.903062041 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb7863723, syscall_id = 192 [sys_mmap2+0x0/0x76] }
+kernel.syscall_exit: 13589.903065146 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = -1217507328 }
+kernel.page_fault_entry: 13589.903069804 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb785e3b0, address = 0xb76e5000, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.903084521 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 0 }
+kernel.syscall_entry: 13589.903092185 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb784ec40, syscall_id = 243 [sys_set_thread_area+0x0/0x1b] }
+kernel.syscall_exit: 13589.903113937 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.903120951 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb78580a8, address = 0xb78580a8, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.903127404 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.903136213 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7857d23, address = 0xb78281d0, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.903180024 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.903190256 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7857d08, address = 0xb76fb000, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.903196770 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.903206946 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7857d08, address = 0xb76fc000, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.903212810 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.903222968 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7857d08, address = 0xb76fd000, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.903228678 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.903238477 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7857e01, address = 0xb76ec75c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.903244621 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.903252538 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7856185, address = 0xb76f8d69, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.903258255 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.903267120 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb785601d, address = 0xb76e8fd4, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.903272693 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.903281329 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7857e01, address = 0xb76f0eec, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.903287076 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.903294685 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7856185, address = 0xb76f7986, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.903300655 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.903308722 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb785601d, address = 0xb76ea1bc, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.903314474 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.903323754 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7856185, address = 0xb76f4204, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.903329544 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.903337574 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb785601d, address = 0xb76e9e34, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.903343055 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.903351666 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7857e01, address = 0xb76efa5c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.903357902 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.903366704 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7857e01, address = 0xb76f334c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.903372545 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.903381119 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7856185, address = 0xb76f5511, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.903386642 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.903395198 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7857e01, address = 0xb76edd1c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.903401113 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.903410095 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7857e01, address = 0xb76f203c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.903416089 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.903424694 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7857e01, address = 0xb76ebafc, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.903430361 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.903448764 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7857e01, address = 0xb76f12fc, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.903454864 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.903464663 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7856185, address = 0xb76f6050, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.903470435 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.903490454 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7857e01, address = 0xb76ee2fc, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.903496683 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.903520173 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb78637a4, syscall_id = 125 [sys_mprotect+0x0/0x1df] }
+kernel.syscall_exit: 13589.903575792 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.903591202 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb78640c7, address = 0xb782d6c0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.903597283 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 0 }
+kernel.syscall_entry: 13589.903609909 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb78637a4, syscall_id = 125 [sys_mprotect+0x0/0x1df] }
+kernel.syscall_exit: 13589.903653633 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.903662678 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb7863761, syscall_id = 91 [sys_munmap+0x0/0x3d] }
+kernel.syscall_exit: 13589.903867268 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.903875731 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb76fda17, address = 0xb782d55c, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.903908356 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 13589.903917617 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb76fda29, address = 0xb782bd64, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.903938898 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 0 }
+kernel.page_fault_entry: 13589.903948666 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb77b6010, address = 0xb77b6010, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.903955686 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.903964917 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb775adc0, address = 0xb775adc0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.903984180 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.903994171 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7752010, address = 0xb7752010, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.904000104 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.904008629 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb77ed900, address = 0xb77ed900, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.904014425 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.904024434 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7830430, address = 0xb7830430, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.904031734 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.904042312 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7716720, address = 0xb7716720, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.904048300 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.904058174 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0x804a1f0, address = 0x804a1f0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.904065671 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.904075224 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7711680, address = 0xb7711680, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.904081174 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.904090132 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0x8049680, address = 0x8049680, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.904096429 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.904108510 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb775ca20, address = 0xb775ca20, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.904114629 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.904124552 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0x8049181, address = 0x804d58c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.904129934 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 0 }
+kernel.page_fault_entry: 13589.904139640 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7757120, address = 0xb7757120, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.904145950 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.904155093 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb77af320, address = 0xb77af320, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.904161279 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.904169525 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb77eff36, address = 0xb77eff36, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.904175050 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.904183104 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7752ffb, address = 0xb7753000, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.904188733 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.904196621 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb77ecc10, address = 0xb77ecc10, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.904202183 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.904251450 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb77c3cb0, address = 0xb77c3cb0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.904258025 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.904266673 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7754c10, address = 0xb7754c10, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.904272136 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.904280196 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb77555d7, address = 0xb77555d7, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.904285727 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.904295644 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7758a70, address = 0xb7758a70, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.904301379 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.904309228 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb77ae3f0, address = 0xb77ae3f0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.904315464 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.904322925 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb784c416, syscall_id = 45 [sys_brk+0x0/0xd3] }
+kernel.syscall_exit: 13589.904324607 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 148353024 }
+kernel.syscall_entry: 13589.904327812 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb784c416, syscall_id = 45 [sys_brk+0x0/0xd3] }
+kernel.syscall_exit: 13589.904330787 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 148488192 }
+kernel.page_fault_entry: 13589.904335557 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7755c42, address = 0x8d7b004, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.904448158 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 0 }
+kernel.page_fault_entry: 13589.904469896 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0x80492e4, address = 0x804d58c, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.904499052 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 13589.904510527 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb778d2c0, address = 0xb778d2c0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.904517363 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.904526674 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb778bff0, address = 0xb778bff0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.904532402 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.904540258 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb778bfff, address = 0xb778c000, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.904545640 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.904553428 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7715b70, address = 0xb7715b70, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.904559071 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.904567063 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb775a9cb, address = 0xb780c44b, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.904572891 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.904582813 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0x80496e8, address = 0x804b17c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.904589049 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.904599825 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7744d70, address = 0xb7744d70, trap_id = 14, write_access = 0 }
+kernel.irq_entry: 13589.905382032 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, IRQ { ip = 3242336307, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_update_time: 13589.905400257 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, IRQ { jiffies = 4296292873, xtime_sec = 1262715366, xtime_nsec = 301133056, walltomonotonic_sec = -1262701811, walltomonotonic_nsec = 148963639 }
+kernel.softirq_raise: 13589.905414912 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, IRQ { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.softirq_raise: 13589.905422682 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, IRQ { softirq_id = 9 [rcu_process_callbacks+0x0/0x1f] }
+kernel.irq_exit: 13589.905447785 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { handled = 1 }
+kernel.softirq_entry: 13589.905452667 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SOFTIRQ { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.timer_set: 13589.905465781 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SOFTIRQ { expires = 1325578, function = 0xc141d458, data = 0 }
+kernel.softirq_exit: 13589.905468671 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.softirq_entry: 13589.905470093 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SOFTIRQ { softirq_id = 9 [rcu_process_callbacks+0x0/0x1f] }
+rcu.tree_callback: 13589.905518871 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SOFTIRQ { func = 0xc104364a }
+rcu.tree_callback: 13589.905543870 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SOFTIRQ { func = 0xc10acb19 }
+rcu.tree_callback: 13589.905546233 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SOFTIRQ { func = 0xc10b8ec2 }
+kernel.softirq_exit: 13589.905548696 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { softirq_id = 9 [rcu_process_callbacks+0x0/0x1f] }
+kernel.page_fault_exit: 13589.905553273 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.905570118 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb774e200, address = 0xb774e200, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.905577776 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.905586777 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb774ff80, address = 0xb774ff80, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.905592475 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.905600486 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7742800, address = 0xb7742800, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.905606536 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.905614782 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb77a6630, address = 0xb77a6630, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.905620349 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.905627686 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb784c416, syscall_id = 197 [sys_fstat64+0x0/0x23] }
+kernel.syscall_exit: 13589.905631429 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 13589.905636094 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb77b28b0, address = 0xb77b28b0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.905642218 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.905649400 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb784c416, syscall_id = 192 [sys_mmap2+0x0/0x76] }
+kernel.syscall_exit: 13589.905652160 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = -1216049152 }
+kernel.page_fault_entry: 13589.905656576 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7750c40, address = 0xb7750c40, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.905663078 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.905671931 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb774eef4, address = 0xb7849000, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.905690897 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 0 }
+kernel.page_fault_entry: 13589.905701556 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7751700, address = 0xb7751700, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.905707717 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.905716186 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb77a73d0, address = 0xb77a73d0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.905721711 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.905728930 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb784c416, syscall_id = 4 [sys_write+0x0/0x9d] }
+kernel.timer_set: 13589.905740430 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { expires = 1325578, function = 0xc103b8db, data = 4134550692 }
+kernel.sched_try_wakeup: 13589.905747235 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { pid = 16891, cpu_id = 0, state = 1 }
+fs.write: 13589.905758407 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { count = 48, fd = 1 }
+kernel.syscall_exit: 13589.905760040 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 48 }
+kernel.page_fault_entry: 13589.905766796 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7745cd0, address = 0xb7745cd0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.905773513 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.905780937 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb784c416, syscall_id = 4 [sys_write+0x0/0x9d] }
+kernel.sched_try_wakeup: 13589.905786821 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { pid = 16891, cpu_id = 0, state = 1 }
+fs.write: 13589.905791838 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { count = 1, fd = 1 }
+kernel.syscall_exit: 13589.905793179 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 1 }
+kernel.page_fault_entry: 13589.905799552 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb772ecb0, address = 0xb772ecb0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.905806920 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.905815048 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7724710, address = 0xb7724710, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.905820721 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.905828559 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7726ea0, address = 0xb7726ea0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.905833991 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.905841580 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7728de2, address = 0xb7728de2, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.905847012 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.905855024 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb775f420, address = 0xb775f420, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.905860894 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.905869777 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7724a85, address = 0xb7805193, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.905875364 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.905883399 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7725d36, address = 0xb7725d36, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.905889004 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.905896892 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb77277fb, address = 0xb77277fb, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.905902286 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.905910582 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb784c416, syscall_id = 4 [sys_write+0x0/0x9d] }
+kernel.sched_try_wakeup: 13589.905917028 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { pid = 16891, cpu_id = 0, state = 1 }
+fs.write: 13589.905924915 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { count = 26, fd = 1 }
+kernel.syscall_exit: 13589.905926276 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 26 }
+kernel.syscall_entry: 13589.905930674 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb784c416, syscall_id = 4 [sys_write+0x0/0x9d] }
+kernel.sched_try_wakeup: 13589.905935636 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { pid = 16891, cpu_id = 0, state = 1 }
+fs.write: 13589.905939880 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { count = 1, fd = 1 }
+kernel.syscall_exit: 13589.905941160 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 1 }
+kernel.page_fault_entry: 13589.905948528 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb782ec8d, address = 0xbf813484, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.905969450 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 0 }
+kernel.page_fault_entry: 13589.905980684 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7743350, address = 0xb7743350, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.905987681 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.905998185 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb784c416, syscall_id = 5 [sys_open+0x0/0x23] }
+fs.open: 13589.906165274 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { fd = 3, filename = "/proc/mounts" }
+kernel.syscall_exit: 13589.906167854 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 3 }
+kernel.page_fault_entry: 13589.906174386 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb775ba00, address = 0xb775ba00, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.906182150 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.906190879 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb775ba5d, address = 0xb780bb0c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.906196928 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.906206616 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb77366a0, address = 0xb77366a0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.906212605 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.906220893 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb77320ba, address = 0xb77320ba, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.906227030 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.906234664 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb77344c4, address = 0xb77344c4, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.906240318 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.906247903 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb772ee5b, address = 0xb780aa47, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.906253588 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.906261402 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb772f35e, address = 0xb772f35e, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.906266913 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.906274937 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7730d78, address = 0xb7730d78, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.906280901 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.906290185 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7742815, address = 0xbf812fc4, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.906309455 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 0 }
+kernel.syscall_entry: 13589.906318252 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb784c416, syscall_id = 197 [sys_fstat64+0x0/0x23] }
+kernel.syscall_exit: 13589.906320325 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.906323672 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb784c416, syscall_id = 192 [sys_mmap2+0x0/0x76] }
+kernel.syscall_exit: 13589.906326115 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = -1216053248 }
+kernel.syscall_entry: 13589.906329616 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb784c416, syscall_id = 3 [sys_read+0x0/0x9d] }
+kernel.page_fault_entry: 13589.906411213 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xc142bf44, address = 0xb7848000, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.906420034 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { res = 0 }
+fs.read: 13589.906426542 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { count = 1024, fd = 3 }
+kernel.syscall_exit: 13589.906427934 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 717 }
+kernel.page_fault_entry: 13589.906433885 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb772f494, address = 0xb77f74a5, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.906440485 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.906449783 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb7731899, address = 0xb7731899, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.906455289 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 13589.906479236 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb777c1e0, address = 0xb777c1e0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.906485466 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.906493055 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb784c416, syscall_id = 5 [sys_open+0x0/0x23] }
+fs.open: 13589.906502205 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { fd = 4, filename = "/media/debugfs/ltt/control/" }
+kernel.syscall_exit: 13589.906544550 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 4 }
+kernel.syscall_entry: 13589.906549864 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb784c416, syscall_id = 221 [sys_fcntl64+0x0/0x79] }
+kernel.syscall_exit: 13589.906552710 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 1 }
+kernel.page_fault_entry: 13589.906558419 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb775564c, address = 0x8d832ac, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 13589.906594101 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 0 }
+kernel.syscall_entry: 13589.906606838 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb784c416, syscall_id = 6 [sys_close+0x0/0x112] }
+fs.close: 13589.906608744 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { fd = 4 }
+kernel.syscall_exit: 13589.906648973 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.906654800 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb784c416, syscall_id = 4 [sys_write+0x0/0x9d] }
+kernel.sched_try_wakeup: 13589.906662205 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { pid = 16891, cpu_id = 0, state = 1 }
+fs.write: 13589.906670891 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { count = 22, fd = 1 }
+kernel.syscall_exit: 13589.906672252 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 22 }
+kernel.page_fault_entry: 13589.906679805 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, TRAP { ip = 0xb782f4e0, address = 0xb782f4e0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 13589.906687705 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 13589.906697045 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb784c416, syscall_id = 5 [sys_open+0x0/0x23] }
+fs.open: 13589.906704619 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { fd = 4, filename = "/media/debugfs/ltt/control/trace" }
+kernel.syscall_exit: 13589.906706845 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 4 }
+kernel.syscall_entry: 13589.906711237 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb784c416, syscall_id = 6 [sys_close+0x0/0x112] }
+fs.close: 13589.906712678 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { fd = 4 }
+kernel.syscall_exit: 13589.906737312 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 13589.906744506 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb784c416, syscall_id = 5 [sys_open+0x0/0x23] }
+fs.open: 13589.906751720 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { fd = 4, filename = "/media/debugfs/ltt/control/trace/enabled" }
+kernel.syscall_exit: 13589.906753823 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, USER_MODE { ret = 4 }
+kernel.syscall_entry: 13589.906758692 (/home/william/workspace-virgin/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0), 16891, 16891, /usr/local/bin/lttctl, , 30068, 0x0, SYSCALL { ip = 0xb784c416, syscall_id = 4 [sys_write+0x0/0x9d] }
+End trace set
+
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat.tar.gz b/lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat.tar.gz
new file mode 100644
index 0000000..a61c4d5
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat.tar.gz
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat.txt b/lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat.txt
new file mode 100644
index 0000000..c3eb631
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat.txt
@@ -0,0 +1,15475 @@
+Trace set contains 1 traces
+
+metadata.core_marker_id: 23329.092137812 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "vm_state", name = "vm_map", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092145004 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "vm_state", name = "vm_map", format = "pid %d start %lu end %lu flags %lu pgoff %lu inode %lu" }
+metadata.core_marker_id: 23329.092151727 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "page_fault_get_user_entry", event_id = 43, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092154886 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "page_fault_get_user_entry", format = "address #p%lu write_access #1u%u" }
+metadata.core_marker_id: 23329.092157982 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "swap_out", event_id = 7, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092160801 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "swap_out", format = "pfn %lu filp %p offset %lu" }
+metadata.core_marker_id: 23329.092163601 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "unplug_io", event_id = 20, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092166846 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "unplug_io", format = "pdu %u" }
+metadata.core_marker_id: 23329.092172595 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "bio_frontmerge", event_id = 13, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092175963 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "bio_frontmerge", format = "sector %llu size %u rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) %lX not_uptodate #1u%d" }
+metadata.core_marker_id: 23329.092179917 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "bio_complete", event_id = 11, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092183069 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "bio_complete", format = "sector %llu size %u rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) %lX not_uptodate #1u%d" }
+metadata.core_marker_id: 23329.092186511 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_issue_fs", event_id = 5, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092189465 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_issue_fs", format = "hard_sector %llu rw %d errors %d" }
+metadata.core_marker_id: 23329.092195510 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "llseek", event_id = 7, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092198175 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "llseek", format = "fd %u offset %lld origin %u" }
+metadata.core_marker_id: 23329.092203831 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_getpeername", event_id = 8, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092209752 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_getpeername", format = "fd %d usockaddr %p usockaddr_len %p ret %d" }
+metadata.core_marker_id: 23329.092212534 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "getrq_bio", event_id = 15, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092215544 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "getrq_bio", format = "sector %llu size %u rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) %lX not_uptodate #1u%d" }
+metadata.core_marker_id: 23329.092221959 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "netif_state", name = "insert_ifa_ipv4", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092224938 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "netif_state", name = "insert_ifa_ipv4", format = "label %s address #4u%u" }
+metadata.core_marker_id: 23329.092230990 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_socketpair", event_id = 9, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092238188 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_socketpair", format = "family %d type %d protocol %d usockvec %p ret %d" }
+metadata.core_marker_id: 23329.092241476 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "process_wait", event_id = 24, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092244467 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "process_wait", format = "pid %d" }
+metadata.core_marker_id: 23329.092250580 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "split", event_id = 22, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092253819 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "split", format = "sector %llu size %u rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) %lX not_uptodate #1u%d pdu %u" }
+metadata.core_marker_id: 23329.092257008 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fd_state", name = "file_descriptor", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092259894 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fd_state", name = "file_descriptor", format = "filename %s pid %d fd %u" }
+metadata.core_marker_id: 23329.092262676 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "page_fault_nosem_exit", event_id = 42, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092265434 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "page_fault_nosem_exit", format = " " }
+metadata.core_marker_id: 23329.092268444 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "page_fault_entry", event_id = 39, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092271435 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "page_fault_entry", format = "ip #p%lu address #p%lu trap_id #2u%u write_access #1u%u" }
+metadata.core_marker_id: 23329.092274384 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "timer_set", event_id = 29, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092277917 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "timer_set", format = "expires %lu function %p data %lu" }
+metadata.core_marker_id: 23329.092280460 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "irq_entry", event_id = 4, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092283419 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "irq_entry", format = "ip %lu handler %p irq_id #2u%u kernel_mode #1u%u" }
+metadata.core_marker_id: 23329.092286263 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "unplug_timer", event_id = 21, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092288971 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "unplug_timer", format = "pdu %u" }
+metadata.core_marker_id: 23329.092291796 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "timer_itimer_set", event_id = 28, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092294849 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "timer_itimer_set", format = "which %d interval_sec %ld interval_usec %ld value_sec %ld value_usec %ld" }
+metadata.core_marker_id: 23329.092297866 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "bio_backmerge", event_id = 12, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092300944 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "bio_backmerge", format = "sector %llu size %u rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) %lX not_uptodate #1u%d" }
+metadata.core_marker_id: 23329.092304108 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "irq_exit", event_id = 6, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092307180 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "irq_exit", format = "handled #1u%u" }
+metadata.core_marker_id: 23329.092312793 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_getsockopt", event_id = 13, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092315778 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_getsockopt", format = "fd %d level %d optname %d optval %p optlen %p ret %d" }
+metadata.core_marker_id: 23329.092318881 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "tasklet_high_entry", event_id = 12, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092321799 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "tasklet_high_entry", format = "func %p data %lu" }
+metadata.core_marker_id: 23329.092324821 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "huge_page_alloc", event_id = 3, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092327616 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "huge_page_alloc", format = "pfn %lu" }
+metadata.core_marker_id: 23329.092330299 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "send_signal", event_id = 21, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092332859 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "send_signal", format = "pid %d signal %d" }
+metadata.core_marker_id: 23329.092335380 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_issue_pc", event_id = 4, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092338052 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_issue_pc", format = "data_len %u rw %d errors %d" }
+metadata.core_marker_id: 23329.092341161 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "rcu", name = "tree_call_rcu_bh", event_id = 2, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092344202 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "rcu", name = "tree_call_rcu_bh", format = "func %p ip 0x%lX" }
+metadata.core_marker_id: 23329.092346996 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_abort_pc", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092350179 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_abort_pc", format = "data_len %u rw %d errors %d" }
+metadata.core_marker_id: 23329.092353171 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "trap_entry", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092355866 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "trap_entry", format = "ip #p%ld trap_id #2u%u" }
+metadata.core_marker_id: 23329.092358346 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "page_free", event_id = 4, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092361110 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "page_free", format = "pfn %lu order %u" }
+metadata.core_marker_id: 23329.092363675 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "pwrite64", event_id = 11, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092366518 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "pwrite64", format = "fd %u count %zu pos %llu" }
+metadata.core_marker_id: 23329.092369473 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "pread64", event_id = 10, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092371983 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "pread64", format = "fd %u count %zu pos %llu" }
+metadata.core_marker_id: 23329.092374697 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "open", event_id = 4, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092377504 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "open", format = "fd %d filename %s" }
+metadata.core_marker_id: 23329.092382901 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "remap", event_id = 23, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092386103 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "remap", format = "device_from %lu sector_from %llu device_to %lu size %u rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) %lX not_uptodate #1u%d" }
+metadata.core_marker_id: 23329.092389637 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_complete_fs", event_id = 9, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092392505 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_complete_fs", format = "hard_sector %llu rw %d errors %d" }
+metadata.core_marker_id: 23329.092395133 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "panic", event_id = 36, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092397761 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "panic", format = "info %s" }
+metadata.core_marker_id: 23329.092400765 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "softirq_raise", event_id = 9, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092403701 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "softirq_raise", format = "softirq_id #1u%u" }
+metadata.core_marker_id: 23329.092406477 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "trap_exit", event_id = 1, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092409049 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "trap_exit", format = " " }
+metadata.core_marker_id: 23329.092411652 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "rcu", name = "tree_call_rcu", event_id = 1, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092414755 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "rcu", name = "tree_call_rcu", format = "func %p ip 0x%lX" }
+metadata.core_marker_id: 23329.092417333 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_requeue_fs", event_id = 7, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092420479 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_requeue_fs", format = "hard_sector %llu rw %d errors %d" }
+metadata.core_marker_id: 23329.092423396 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "tasklet_low_entry", event_id = 10, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092426061 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "tasklet_low_entry", format = "func %p data %lu" }
+metadata.core_marker_id: 23329.092429416 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "remove_from_page_cache", event_id = 11, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092432222 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "remove_from_page_cache", format = "inode %lu sdev %u" }
+metadata.core_marker_id: 23329.092435092 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "swap_file_close", event_id = 8, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092437755 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "swap_file_close", format = "filp %p" }
+metadata.core_marker_id: 23329.092440260 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "lseek", event_id = 6, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092442850 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "lseek", format = "fd %u offset %ld origin %u" }
+metadata.core_marker_id: 23329.092445466 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "ipc", name = "call", event_id = 3, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092448260 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "ipc", name = "call", format = "call %u first %d" }
+metadata.core_marker_id: 23329.092450900 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "bio_queue", event_id = 14, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092454027 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "bio_queue", format = "sector %llu size %u rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) %lX not_uptodate #1u%d" }
+metadata.core_marker_id: 23329.092457408 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "timer_update_time", event_id = 30, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092461164 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "timer_update_time", format = "jiffies #8u%llu xtime_sec %ld xtime_nsec %ld walltomonotonic_sec %ld walltomonotonic_nsec %ld" }
+metadata.core_marker_id: 23329.092464063 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_bind", event_id = 3, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092469652 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_bind", format = "fd %d umyaddr %p addrlen %d ret %d" }
+metadata.core_marker_id: 23329.092472452 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "bio_bounce", event_id = 10, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092475475 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "bio_bounce", format = "sector %llu size %u rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) %lX not_uptodate #1u%d" }
+metadata.core_marker_id: 23329.092478590 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_complete_pc", event_id = 8, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092481260 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_complete_pc", format = "data_len %u rw %d errors %d" }
+metadata.core_marker_id: 23329.092515062 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "tasklet_low_exit", event_id = 11, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092518461 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "tasklet_low_exit", format = "func %p data %lu" }
+metadata.core_marker_id: 23329.092521434 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "jbd2", name = "end_commit", event_id = 2, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092555994 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "jbd2", name = "end_commit", format = "dev %s transaction %d head %d" }
+metadata.core_marker_id: 23329.092558882 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "readv", event_id = 12, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092561700 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "readv", format = "fd %lu vlen %lu" }
+metadata.core_marker_id: 23329.092564329 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_listen", event_id = 5, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092567301 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_listen", format = "fd %d backlog %d ret %d" }
+metadata.core_marker_id: 23329.092570403 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "huge_page_free", event_id = 2, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092573094 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "huge_page_free", format = "pfn %lu" }
+metadata.core_marker_id: 23329.092575573 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "getrq", event_id = 16, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092578423 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "getrq", format = "rw %d" }
+metadata.core_marker_id: 23329.092580871 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "module_load", event_id = 35, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092583517 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "module_load", format = "name %s" }
+metadata.core_marker_id: 23329.092586034 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "dev_xmit", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092588674 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "dev_xmit", format = "skb %p protocol #n2u%hu" }
+metadata.core_marker_id: 23329.092591382 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "softirq_exit", event_id = 8, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092594293 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "softirq_exit", format = "softirq_id #1u%lu" }
+metadata.core_marker_id: 23329.092596804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "select", event_id = 14, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092599685 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "select", format = "fd %d end_time_sec %ld end_time_nsec %ld" }
+metadata.core_marker_id: 23329.092602318 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_requeue_pc", event_id = 6, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092605298 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_requeue_pc", format = "data_len %u rw %d errors %d" }
+metadata.core_marker_id: 23329.092607981 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "pm", name = "idle_exit", event_id = 1, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092610572 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "pm", name = "idle_exit", format = "irqstate #1%d" }
+metadata.core_marker_id: 23329.092613625 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "timer_itimer_expired", event_id = 27, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092616635 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "timer_itimer_expired", format = "pid %d" }
+metadata.core_marker_id: 23329.092619244 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "sched_wait_task", event_id = 16, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092622069 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "sched_wait_task", format = "pid %d state #2d%ld" }
+metadata.core_marker_id: 23329.092624642 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "syscall_exit", event_id = 3, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092627238 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "syscall_exit", format = "ret %ld" }
+metadata.core_marker_id: 23329.092629953 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "swap_state", name = "statedump_swap_files", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092632932 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "swap_state", name = "statedump_swap_files", format = "filp %p vfsmount %p dname %s" }
+metadata.core_marker_id: 23329.092635515 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "printk", event_id = 32, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092638279 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "printk", format = "ip 0x%lX" }
+metadata.core_marker_id: 23329.092640821 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "pm", name = "idle_entry", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092643399 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "pm", name = "idle_entry", format = "irqstate #1%d" }
+metadata.core_marker_id: 23329.092646132 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_shutdown", event_id = 14, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092649019 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_shutdown", format = "fd %d how %d ret %d" }
+metadata.core_marker_id: 23329.092651874 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "kthread_stop_ret", event_id = 15, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092654558 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "kthread_stop_ret", format = "ret %d" }
+metadata.core_marker_id: 23329.092657573 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "kthread_stop", event_id = 14, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092660170 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "kthread_stop", format = "pid %d" }
+metadata.core_marker_id: 23329.092662631 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "close", event_id = 5, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092665222 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "close", format = "fd %u" }
+metadata.core_marker_id: 23329.092667609 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_create", event_id = 2, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092670391 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_create", format = "family %d type %d protocol %d sock %p ret %d" }
+metadata.core_marker_id: 23329.092673562 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "swap_in", event_id = 6, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092676152 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "swap_in", format = "pfn %lu filp %p offset %lu" }
+metadata.core_marker_id: 23329.092679267 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "wait_on_page_start", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092682056 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "wait_on_page_start", format = "pfn %lu bit_nr %d" }
+metadata.core_marker_id: 23329.092684782 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "buffer_wait_start", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092687582 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "buffer_wait_start", format = "bh %p" }
+metadata.core_marker_id: 23329.092690050 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_recvmsg", event_id = 11, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092692721 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_recvmsg", format = "sock %p msg %p size %zu flags %d ret %d" }
+metadata.core_marker_id: 23329.092696132 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "irq_state", name = "idt_table", event_id = 1, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092699123 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "irq_state", name = "idt_table", format = "irq %d address %p symbol %s" }
+metadata.core_marker_id: 23329.092701973 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "swap_file_open", event_id = 9, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092704588 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "swap_file_open", format = "filp %p filename %s" }
+metadata.core_marker_id: 23329.092706994 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "page_alloc", event_id = 5, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092709727 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "page_alloc", format = "pfn %lu order %u" }
+metadata.core_marker_id: 23329.092712385 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_abort_fs", event_id = 1, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092715291 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_abort_fs", format = "hard_sector %llu rw %d errors %d" }
+metadata.core_marker_id: 23329.092717931 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "irq_state", name = "interrupt", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092720589 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "irq_state", name = "interrupt", format = "name %s action %s irq_id %u" }
+metadata.core_marker_id: 23329.092723427 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "module_free", event_id = 34, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092726133 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "module_free", format = "name %s" }
+metadata.core_marker_id: 23329.092729033 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "wait_on_page_end", event_id = 1, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092731703 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "wait_on_page_end", format = "pfn %lu bit_nr %d" }
+metadata.core_marker_id: 23329.092734646 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "vprintk", event_id = 33, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092737668 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "vprintk", format = "loglevel #1u%u string %s ip 0x%lX" }
+metadata.core_marker_id: 23329.092740290 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "exec", event_id = 2, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092742868 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "exec", format = "filename %s" }
+metadata.core_marker_id: 23329.092745897 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "udpv4_rcv", event_id = 17, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092748660 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "udpv4_rcv", format = "skb %p" }
+metadata.core_marker_id: 23329.092751276 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_call", event_id = 15, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092753965 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_call", format = "call %d a0 %lu" }
+metadata.core_marker_id: 23329.092756772 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "ipc", name = "shm_create", event_id = 2, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092759381 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "ipc", name = "shm_create", format = "id %ld flags %d" }
+metadata.core_marker_id: 23329.092761885 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_connect", event_id = 4, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092764593 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_connect", format = "fd %d uservaddr %p addrlen %d ret %d" }
+metadata.core_marker_id: 23329.092767424 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "netif_state", name = "insert_ifa_ipv6", event_id = 2, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092770700 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "netif_state", name = "insert_ifa_ipv6", format = "label %s a15 #1x%c a14 #1x%c a13 #1x%c a12 #1x%c a11 #1x%c a10 #1x%c a9 #1x%c a8 #1x%c a7 #1x%c a6 #1x%c a5 #1x%c a4 #1x%c a3 #1x%c a2 #1x%c a1 #1x%c a0 #1x%c" }
+metadata.core_marker_id: 23329.092773932 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "pm", name = "suspend_entry", event_id = 2, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092776794 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "pm", name = "suspend_entry", format = "irqstate #1%d" }
+metadata.core_marker_id: 23329.092779582 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "sleeprq_bio", event_id = 17, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092782777 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "sleeprq_bio", format = "sector %llu size %u rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) %lX not_uptodate #1u%d" }
+metadata.core_marker_id: 23329.092786312 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_insert_fs", event_id = 3, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092789396 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_insert_fs", format = "hard_sector %llu rw %d errors %d" }
+metadata.core_marker_id: 23329.092792338 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "timer_timeout", event_id = 31, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092795009 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "timer_timeout", format = "pid %d" }
+metadata.core_marker_id: 23329.092797618 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "metadata", name = "core_marker_format", event_id = 1, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092811564 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "metadata", name = "core_marker_format", format = "channel %s name %s format %s" }
+metadata.core_marker_id: 23329.092814475 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "sched_schedule", event_id = 19, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092822217 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "sched_schedule", format = "prev_pid %d next_pid %d prev_state #2d%ld" }
+metadata.core_marker_id: 23329.092825054 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "kthread_create", event_id = 26, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092827762 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "kthread_create", format = "fn %p pid %d" }
+metadata.core_marker_id: 23329.092830309 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "write", event_id = 9, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092832863 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "write", format = "count %zu fd %u" }
+metadata.core_marker_id: 23329.092835281 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "ioctl", event_id = 3, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092837792 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "ioctl", format = "fd %u cmd %u arg %lu" }
+metadata.core_marker_id: 23329.092840352 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "jbd2", name = "checkpoint", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092842979 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "jbd2", name = "checkpoint", format = "dev %s need_checkpoint %d" }
+metadata.core_marker_id: 23329.092846409 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "softirq_state", name = "softirq_vec", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092849400 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "softirq_state", name = "softirq_vec", format = "id %d address %p symbol %s" }
+metadata.core_marker_id: 23329.092852028 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "napi_complete", event_id = 20, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092854717 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "napi_complete", format = "napi_struct %p name %s" }
+metadata.core_marker_id: 23329.092857444 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "page_fault_get_user_exit", event_id = 44, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092860177 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "page_fault_get_user_exit", format = "res %d" }
+metadata.core_marker_id: 23329.092862760 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_setsockopt", event_id = 12, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092865813 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_setsockopt", format = "fd %d level %d optname %d optval %p optlen %d ret %d" }
+metadata.core_marker_id: 23329.092869090 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_accept", event_id = 6, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092872032 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_accept", format = "fd %d upeer_sockaddr %p upeer_addrlen %p flags %d ret %d" }
+metadata.core_marker_id: 23329.092874671 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "process_exit", event_id = 23, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092877231 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "process_exit", format = "pid %d" }
+metadata.core_marker_id: 23329.092880001 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "metadata", name = "core_marker_id", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092883529 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "metadata", name = "core_marker_id", format = "channel %s name %s event_id %hu int #1u%zu long #1u%zu pointer #1u%zu size_t #1u%zu alignment #1u%u" }
+metadata.core_marker_id: 23329.092886576 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "sleeprq", event_id = 18, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092889216 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "sleeprq", format = "rw %d" }
+metadata.core_marker_id: 23329.092892313 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "sched_wakeup_new_task", event_id = 18, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092894977 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "sched_wakeup_new_task", format = "pid %d state #2d%ld cpu_id %u" }
+metadata.core_marker_id: 23329.092897895 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "irq_next_handler", event_id = 5, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092900615 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "irq_next_handler", format = "handler %p prev_ret #1u%u" }
+metadata.core_marker_id: 23329.092903323 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "napi_poll", event_id = 19, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092905963 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "napi_poll", format = "napi_struct %p name %s" }
+metadata.core_marker_id: 23329.092912403 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "global_state", name = "statedump_end", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092915049 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "global_state", name = "statedump_end", format = " " }
+metadata.core_marker_id: 23329.092917708 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "task_state", name = "process_state", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092920718 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "task_state", name = "process_state", format = "pid %d parent_pid %d name %s type %d mode %d submode %d status %d tgid %d" }
+metadata.core_marker_id: 23329.092923802 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "buffer_wait_end", event_id = 1, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092926417 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "buffer_wait_end", format = "bh %p" }
+metadata.core_marker_id: 23329.092928897 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "dev_receive", event_id = 1, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092932049 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "dev_receive", format = "skb %p protocol #n2u%hu" }
+metadata.core_marker_id: 23329.092934713 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "syscall_state", name = "sys_call_table", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092937920 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "syscall_state", name = "sys_call_table", format = "id %d address %p symbol %s" }
+metadata.core_marker_id: 23329.092940605 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_getsockname", event_id = 7, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092943448 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_getsockname", format = "fd %d usockaddr %p usockaddr_len %p ret %d" }
+metadata.core_marker_id: 23329.092946186 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "pollfd", event_id = 15, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092948696 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "pollfd", format = "fd %d" }
+metadata.core_marker_id: 23329.092951299 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "writev", event_id = 13, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092954026 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "writev", format = "fd %lu vlen %lu" }
+metadata.core_marker_id: 23329.092956493 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "tcpv4_rcv", event_id = 16, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092958998 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "tcpv4_rcv", format = "skb %p" }
+metadata.core_marker_id: 23329.092961576 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_sendmsg", event_id = 10, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092964253 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "socket_sendmsg", format = "sock %p msg %p size %zu ret %d" }
+metadata.core_marker_id: 23329.092966868 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "netif_state", name = "network_ip_interface", event_id = 4, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092969607 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "netif_state", name = "network_ip_interface", format = "name %s address #n4u%lu up %d" }
+metadata.core_marker_id: 23329.092972512 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "netif_state", name = "del_ifa_ipv4", event_id = 1, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092975504 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "netif_state", name = "del_ifa_ipv4", format = "label %s address #4u%u" }
+metadata.core_marker_id: 23329.092978594 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "userspace", name = "event", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092981641 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "userspace", name = "event", format = "string %s" }
+metadata.core_marker_id: 23329.092986761 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "page_fault_nosem_entry", event_id = 41, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092989876 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "page_fault_nosem_entry", format = "ip #p%lu address #p%lu trap_id #2u%u" }
+metadata.core_marker_id: 23329.092992578 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "crash_kexec", event_id = 38, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.092995366 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "crash_kexec", format = "image %p ip %p" }
+metadata.core_marker_id: 23329.092997926 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "pm", name = "suspend_exit", event_id = 3, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.093000745 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "pm", name = "suspend_exit", format = "irqstate #1%d" }
+metadata.core_marker_id: 23329.093003465 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "page_fault_exit", event_id = 40, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.093006333 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "page_fault_exit", format = "res %d" }
+metadata.core_marker_id: 23329.093008972 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "napi_schedule", event_id = 18, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.093011607 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "net", name = "napi_schedule", format = "napi_struct %p name %s" }
+metadata.core_marker_id: 23329.093014204 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "kernel_kexec", event_id = 37, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.093016732 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "kernel_kexec", format = "image %p" }
+metadata.core_marker_id: 23329.093019187 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "process_fork", event_id = 25, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.093022032 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "process_fork", format = "parent_pid %d child_pid %d child_tgid %d" }
+metadata.core_marker_id: 23329.093025023 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "jbd2", name = "start_commit", event_id = 1, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.093027601 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "jbd2", name = "start_commit", format = "dev %s transaction %d" }
+metadata.core_marker_id: 23329.093030303 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "sched_try_wakeup", event_id = 17, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.093032986 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "sched_try_wakeup", format = "pid %d cpu_id %u state #2d%ld" }
+metadata.core_marker_id: 23329.093035521 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "input", name = "input_event", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.093038272 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "input", name = "input_event", format = "type %u code %u value %d" }
+metadata.core_marker_id: 23329.093041183 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "ipc", name = "sem_create", event_id = 1, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.093043793 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "ipc", name = "sem_create", format = "id %ld flags %d" }
+metadata.core_marker_id: 23329.093046248 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "plug", event_id = 19, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.093048937 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "plug", format = " " }
+metadata.core_marker_id: 23329.093051830 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_insert_pc", event_id = 2, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.093054612 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "block", name = "rq_insert_pc", format = "data_len %u rw %d errors %d" }
+metadata.core_marker_id: 23329.093057221 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "process_free", event_id = 22, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.093059898 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "process_free", format = "pid %d" }
+metadata.core_marker_id: 23329.093062569 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "sched_migrate_task", event_id = 20, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.093065351 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "sched_migrate_task", format = "pid %d state #2d%ld dest_cpu %d" }
+metadata.core_marker_id: 23329.093068373 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "softirq_entry", event_id = 7, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.093071051 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "softirq_entry", format = "softirq_id #1u%lu" }
+metadata.core_marker_id: 23329.093073660 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "add_to_page_cache", event_id = 10, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.093076337 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "mm", name = "add_to_page_cache", format = "inode %lu sdev %u" }
+metadata.core_marker_id: 23329.093078914 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "read", event_id = 8, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.093081432 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "fs", name = "read", format = "count %zu fd %u" }
+metadata.core_marker_id: 23329.093084152 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "netif_state", name = "network_ipv4_interface", event_id = 3, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.093087329 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "netif_state", name = "network_ipv4_interface", format = "name %s address #n4u%lu up %d" }
+metadata.core_marker_id: 23329.093089999 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "tasklet_high_exit", event_id = 13, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.093092670 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "tasklet_high_exit", format = "func %p data %lu" }
+metadata.core_marker_id: 23329.093095162 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "rcu", name = "tree_callback", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.093097907 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "rcu", name = "tree_callback", format = "func %p" }
+metadata.core_marker_id: 23329.093100368 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "syscall_entry", event_id = 2, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.093103094 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "kernel", name = "syscall_entry", format = "ip #p%ld syscall_id #2u%u" }
+metadata.core_marker_id: 23329.093105642 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "ipc", name = "msg_create", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.093108300 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "ipc", name = "msg_create", format = "id %ld flags %d" }
+metadata.core_marker_id: 23329.093111353 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "module_state", name = "list_module", event_id = 0, int = 4, long = 4, pointer = 4, size_t = 4, alignment = 0 }
+metadata.core_marker_format: 23329.093114080 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { channel = "module_state", name = "list_module", format = "name %s state %d refcount %lu" }
+kernel.printk: 23329.093118601 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { ip = 0xC1421750 }
+kernel.vprintk: 23329.095196624 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { loglevel = 7, string = "LTT state dump begin", ip = 0xC158363B }
+kernel.irq_entry: 23329.098276705 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 0, 0, , , 0, 0x0, IRQ { ip = 3238176841, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_update_time: 23329.098527487 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 0, 0, , , 0, 0x0, IRQ { jiffies = 4297269580, xtime_sec = 1264196274, xtime_nsec = 637521999, walltomonotonic_sec = -1264172952, walltomonotonic_nsec = 189579727 }
+kernel.softirq_raise: 23329.098623151 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 0, 0, , , 0, 0x0, IRQ { softirq_id = 1 [softirq 1] }
+kernel.softirq_raise: 23329.098708889 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 0, 0, , , 0, 0x0, IRQ { softirq_id = 9 [softirq 9] }
+kernel.sched_try_wakeup: 23329.098725155 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 0, 0, , , 0, 0x0, IRQ { pid = 1304, cpu_id = 0, state = 1 }
+kernel.irq_exit: 23329.098751648 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.softirq_entry: 23329.098757218 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 0, 0, , , 0, 0x0, SOFTIRQ { softirq_id = 1 [softirq 1] }
+kernel.timer_set: 23329.098767482 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 0, 0, , , 0, 0x0, SOFTIRQ { expires = 2302285, function = 0xc141d458, data = 0 }
+kernel.sched_try_wakeup: 23329.098778393 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 0, 0, , , 0, 0x0, SOFTIRQ { pid = 5, cpu_id = 0, state = 1 }
+kernel.softirq_exit: 23329.098782260 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { softirq_id = 1 [softirq 1] }
+kernel.softirq_entry: 23329.098783938 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 0, 0, , , 0, 0x0, SOFTIRQ { softirq_id = 9 [softirq 9] }
+rcu.tree_callback: 23329.098851055 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 0, 0, , , 0, 0x0, SOFTIRQ { func = 0xc10acb19 }
+kernel.softirq_exit: 23329.098855713 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 0, 0, , , 0, 0x0, MODE_UNKNOWN { softirq_id = 9 [softirq 9] }
+kernel.sched_schedule: 23329.098866839 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 0, , , 0, 0x0, MODE_UNKNOWN { prev_pid = 16927, next_pid = 1304, prev_state = 0 }
+kernel.page_fault_entry: 23329.099077967 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 0, , , 0, 0x0, TRAP { ip = 0xc102ace0, address = 0xb7609ca0, trap_id = 14, write_access = 1 }
+block.remap: 23329.099182290 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { device_from = 3145728, sector_from = 2240, device_to = 3145729, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_queue: 23329.099191722 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { sector = 2303, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.getrq_bio: 23329.099220929 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { sector = 2303, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+kernel.timer_set: 23329.099265420 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 0, , , 0, 0x0, TRAP { expires = 2302285, function = 0xc1410312, data = 4147888232 }
+block.plug: 23329.099269620 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP
+block.rq_insert_fs: 23329.099278201 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { hard_sector = 2303, rw = 0, errors = 0 }
+block.remap: 23329.099306304 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { device_from = 3145728, sector_from = 2248, device_to = 3145729, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_queue: 23329.099309351 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { sector = 2311, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_backmerge: 23329.099317338 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { sector = 2311, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.remap: 23329.099326930 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { device_from = 3145728, sector_from = 2256, device_to = 3145729, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_queue: 23329.099329896 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { sector = 2319, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_backmerge: 23329.099334695 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { sector = 2319, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.remap: 23329.099341894 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { device_from = 3145728, sector_from = 2264, device_to = 3145729, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_queue: 23329.099344836 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { sector = 2327, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_backmerge: 23329.099349487 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { sector = 2327, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.remap: 23329.099356426 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { device_from = 3145728, sector_from = 2272, device_to = 3145729, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_queue: 23329.099359282 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { sector = 2335, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_backmerge: 23329.099364174 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { sector = 2335, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.remap: 23329.099371231 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { device_from = 3145728, sector_from = 2280, device_to = 3145729, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_queue: 23329.099374167 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { sector = 2343, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_backmerge: 23329.099378861 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { sector = 2343, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.remap: 23329.099385930 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { device_from = 3145728, sector_from = 2288, device_to = 3145729, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_queue: 23329.099388933 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { sector = 2351, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_backmerge: 23329.099393645 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { sector = 2351, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.remap: 23329.099405088 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { device_from = 3145728, sector_from = 2296, device_to = 3145729, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_queue: 23329.099407937 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { sector = 2359, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_backmerge: 23329.099412742 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { sector = 2359, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+mm.swap_in: 23329.099427115 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 1304, 0, , , 0, 0x0, TRAP { pfn = 257085, filp = 0xf7101940, offset = 286 }
+block.unplug_io: 23329.099450234 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { pdu = 1 }
+block.rq_issue_fs: 23329.099469589 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { hard_sector = 2303, rw = 0, errors = 0 }
+kernel.timer_set: 23329.099498111 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 0, , , 0, 0x0, TRAP { expires = 2302285, function = 0xc14b0234, data = 0 }
+kernel.timer_set: 23329.099525949 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 0, , , 0, 0x0, TRAP { expires = 2304284, function = 0xf8a23e85, data = 4136733696 }
+kernel.sched_schedule: 23329.099598086 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 5, 0, , , 0, 0x0, MODE_UNKNOWN { prev_pid = 1304, next_pid = 5, prev_state = 2 }
+kernel.sched_schedule: 23329.099726164 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { prev_pid = 5, next_pid = 16929, prev_state = 1 }
+kernel.page_fault_entry: 23329.099873314 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xc142b6ad, address = 0xb76a8738, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.099912254 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.syscall_exit: 23329.099934922 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.page_fault_entry: 23329.099942645 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb7823416, address = 0xb7823416, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.099981054 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 0 }
+kernel.page_fault_entry: 23329.100019477 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb7743795, address = 0xb7743795, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.100062580 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.100072918 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb774379d, address = 0xbf8013dc, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.100099991 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.page_fault_entry: 23329.100109212 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb77437cd, address = 0xb78091cc, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.100136130 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.page_fault_entry: 23329.100146351 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb77437f1, address = 0xb7841288, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.100172986 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.page_fault_entry: 23329.100178519 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb7713b20, address = 0xb7713b20, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.100214677 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.100224034 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb77b2f36, address = 0xb77b2f36, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.100260082 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.100272079 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb7743813, address = 0xb77ee36c, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.100298942 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.page_fault_entry: 23329.100308441 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb77f5b10, address = 0xb77f5b10, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.100344809 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.100358181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb77f5c16, address = 0xb7807120, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.100384273 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.page_fault_entry: 23329.100389560 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb774388e, address = 0xb77ef378, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.100415522 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.page_fault_entry: 23329.100421234 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb7715240, address = 0xb7715240, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.100455936 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.100464874 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb7715273, address = 0xb77ed34c, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.100491663 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.page_fault_entry: 23329.100497133 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb777574c, address = 0xb777574c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.100531769 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.100541218 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb77447a0, address = 0xb77447a0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.100576772 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.syscall_entry: 23329.100585525 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, SYSCALL { ip = 0xb7823416, syscall_id = 66 [syscall 66] }
+kernel.syscall_exit: 23329.100590354 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { ret = 16929 }
+kernel.page_fault_entry: 23329.100594944 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb776ad60, address = 0xb776ad60, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.100699421 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.syscall_entry: 23329.100707873 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, SYSCALL { ip = 0xb7823416, syscall_id = 12 [syscall 12] }
+kernel.page_fault_entry: 23329.100713830 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xc142b874, address = 0xb77cf186, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.100750600 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, SYSCALL { res = 512 }
+kernel.syscall_exit: 23329.100769950 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.page_fault_entry: 23329.100775352 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb7769e6a, address = 0xb7769e6a, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.100812615 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.syscall_entry: 23329.100820757 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, SYSCALL { ip = 0xb7823416, syscall_id = 5 [syscall 5] }
+kernel.page_fault_entry: 23329.100825587 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xc142b874, address = 0xb77cd329, trap_id = 14, write_access = 0 }
+kernel.irq_entry: 23329.100878559 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, IRQ { ip = 3238105433, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_itimer_expired: 23329.100892117 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, IRQ { pid = 1989 }
+kernel.send_signal: 23329.100900382 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, IRQ { pid = 1989, signal = 14 }
+kernel.irq_exit: 23329.100919701 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { handled = 1 }
+kernel.page_fault_exit: 23329.100927042 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, SYSCALL { res = 512 }
+fs.open: 23329.100962928 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16929, 0, , , 0, 0x0, SYSCALL { fd = 5, filename = "/dev/null" }
+kernel.syscall_exit: 23329.100966080 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { ret = 5 }
+kernel.page_fault_entry: 23329.100971996 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb76c098f, address = 0xb76c098f, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.101009609 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.syscall_entry: 23329.101018128 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, SYSCALL { ip = 0xb7823416, syscall_id = 197 [syscall 197] }
+kernel.syscall_exit: 23329.101021101 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.101024543 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, SYSCALL { ip = 0xb7823416, syscall_id = 63 [syscall 63] }
+kernel.syscall_exit: 23329.101033240 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.101036472 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, SYSCALL { ip = 0xb7823416, syscall_id = 63 [syscall 63] }
+kernel.syscall_exit: 23329.101037792 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.101040846 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, SYSCALL { ip = 0xb7823416, syscall_id = 63 [syscall 63] }
+kernel.syscall_exit: 23329.101042129 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { ret = 2 }
+kernel.syscall_entry: 23329.101045324 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, SYSCALL { ip = 0xb7823416, syscall_id = 6 [syscall 6] }
+fs.close: 23329.101047020 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16929, 0, , , 0, 0x0, SYSCALL { fd = 5 }
+kernel.syscall_exit: 23329.101048599 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.page_fault_entry: 23329.101063212 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0x804a80c, address = 0x804a80c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.101101473 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.101126072 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0x8048d00, address = 0x8048d00, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.101163229 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.101173131 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb7837b70, address = 0xb7837b70, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.101209726 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.101219374 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb7831ea0, address = 0xb7831ea0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.101254322 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.101292097 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb783b1eb, address = 0xb783b1eb, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.101329655 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.101342109 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb782d160, address = 0xb782d160, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.101378131 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.101387581 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb782cda0, address = 0xb782cda0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.101423647 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.101435774 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb7832e10, address = 0xb7832e10, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.101482431 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.101492035 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb783ab60, address = 0xb783ab60, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.101528125 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.101537286 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb783ab74, address = 0xb783e0e3, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.101573110 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.101585404 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb782ce8e, address = 0xb77f124c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.101621821 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.101631036 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb782ce8e, address = 0xb76aa76c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.101631038 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.101631042 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb782cffd, address = 0xb76ab260, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.101631044 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.101631046 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb782d01d, address = 0xb76acc7c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.101631050 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.101631052 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb782cbe0, address = 0xb76b29dc, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.101631056 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.101631058 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb783ab70, address = 0xb76b83c1, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.101641365 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.101650810 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb782cc45, address = 0xb76bd1f6, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.101686471 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.101697817 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb783ab70, address = 0xb76bc766, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.101733819 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.101742930 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb782d3f7, address = 0xb7822ca5, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.101770036 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.page_fault_entry: 23329.101775684 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb7831fc0, address = 0x804c478, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.101802309 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.page_fault_entry: 23329.101807976 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb771a120, address = 0xb771a120, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.101849644 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.101859348 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb7717c10, address = 0xb7717c10, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.101900269 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.101924720 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb7717f03, address = 0x87d7014, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.101952283 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.page_fault_entry: 23329.101958123 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb77180e0, address = 0xb77180e0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.101994315 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.102004087 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb771847d, address = 0x87df020, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.102030373 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.page_fault_entry: 23329.102037175 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb782cbe0, address = 0xb77f2538, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.102073448 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.102082152 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb783ab70, address = 0xb77f3368, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.102117974 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.102126696 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb782cc45, address = 0xb77f4588, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.102162408 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.102171538 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb77f6980, address = 0xb77f6980, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.102207057 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.102217860 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb782d01d, address = 0xb76ad74c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.102254009 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.102262566 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb782cbe0, address = 0xb76b552c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.102298332 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.102306956 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb783ab70, address = 0xb76bac9a, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.102381835 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.102393120 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb7772320, address = 0xb7772320, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.102430164 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.102439862 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb77f69be, address = 0xb7801ad4, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.102476030 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.102486690 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb782cbe0, address = 0xb76b087c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.102535390 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.102544761 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb783ab70, address = 0xb76b9605, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.102581188 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.syscall_entry: 23329.102589750 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, SYSCALL { ip = 0xb7823416, syscall_id = 192 [syscall 192] }
+kernel.syscall_exit: 23329.102595046 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { ret = -1226149888 }
+kernel.page_fault_entry: 23329.102599510 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb77f6b33, address = 0xb76a7de0, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.102653524 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 0 }
+kernel.page_fault_entry: 23329.102663925 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb782ce8e, address = 0xb7824204, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.102699526 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.102709963 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb78353f0, address = 0xb78353f0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.102745681 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.102755540 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb7719830, address = 0xb7719830, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.102791541 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.102804782 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb771f510, address = 0xb771f510, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.102840907 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.102850599 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb7834ba0, address = 0xb7834ba0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.102885661 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.102899748 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb77f701e, address = 0xb77f701e, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.102935602 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.syscall_entry: 23329.102945237 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, SYSCALL { ip = 0xb7823416, syscall_id = 125 [syscall 125] }
+kernel.syscall_exit: 23329.102979733 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.page_fault_entry: 23329.102987264 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb782cbe0, address = 0xb76b41ac, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.103024333 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.103033895 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb7779220, address = 0xb7779220, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.103069909 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.syscall_entry: 23329.103078106 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, SYSCALL { ip = 0xb7779268, syscall_id = 120 [syscall 120] }
+kernel.process_fork: 23329.103106885 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, SYSCALL { parent_pid = 16929, child_pid = 16930, child_tgid = 16929 }
+kernel.sched_wakeup_new_task: 23329.103116713 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, SYSCALL { pid = 16930, state = 0, cpu_id = 0 }
+kernel.syscall_exit: 23329.103263310 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { ret = 16930 }
+kernel.page_fault_entry: 23329.103271854 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, TRAP { ip = 0xb77fd630, address = 0xb77fd630, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.103329269 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.syscall_entry: 23329.103338251 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16929, 0, , , 0, 0x0, SYSCALL { ip = 0xb7823416, syscall_id = 240 [syscall 240] }
+kernel.sched_schedule: 23329.103383672 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16928, 0, , , 0, 0x0, MODE_UNKNOWN { prev_pid = 16929, next_pid = 16928, prev_state = 1 }
+kernel.sched_schedule: 23329.103495535 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, MODE_UNKNOWN { prev_pid = 16928, next_pid = 1989, prev_state = 64 }
+kernel.syscall_entry: 23329.103673233 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, SYSCALL { ip = 0xb7851408, syscall_id = 119 [syscall 119] }
+kernel.syscall_exit: 23329.103676460 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, MODE_UNKNOWN { ret = 116 }
+kernel.syscall_entry: 23329.104171379 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 23329.104176299 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 23329.104183491 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.104195571 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 142 [syscall 142] }
+fs.select: 23329.104200930 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 1, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104205116 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 3, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104207602 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 5, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104214529 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 7, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104216986 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 13, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104219301 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 19, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104221690 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 20, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104224196 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 21, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104226647 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 22, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104228980 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 23, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104231147 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 24, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104234098 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 25, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104236573 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 26, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104238919 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 27, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104241252 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 28, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104243913 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 29, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104246413 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 30, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104248870 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 31, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104251654 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 32, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104254055 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 33, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104256345 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 34, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104258629 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 35, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104261247 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 37, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104263623 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 38, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104266012 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 39, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104268433 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 40, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104270889 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 41, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104273927 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 42, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104276062 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 43, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104278463 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 44, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104281124 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 45, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104283568 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 46, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104286025 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 49, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104288550 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 50, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.104291105 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { fd = 52, end_time_sec = 0, end_time_nsec = 0 }
+kernel.syscall_exit: 23329.104293883 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.104300896 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 23329.104302692 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 23329.104309909 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.104329416 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.104341292 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { count = 4096, fd = 48 }
+kernel.syscall_exit: 23329.104342571 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, MODE_UNKNOWN { ret = 4096 }
+kernel.irq_entry: 23329.105462667 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, IRQ { ip = 3078444278, handler = 0x0, irq_id = 239, kernel_mode = 0 }
+kernel.timer_update_time: 23329.105487763 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, IRQ { jiffies = 4297269581, xtime_sec = 1264196274, xtime_nsec = 637522000, walltomonotonic_sec = -1264172952, walltomonotonic_nsec = 189579727 }
+kernel.softirq_raise: 23329.105502214 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, IRQ { softirq_id = 1 [softirq 1] }
+kernel.softirq_raise: 23329.105513848 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, IRQ { softirq_id = 9 [softirq 9] }
+kernel.irq_exit: 23329.105546829 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.softirq_entry: 23329.105551978 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, SOFTIRQ { softirq_id = 1 [softirq 1] }
+kernel.timer_set: 23329.105563897 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, SOFTIRQ { expires = 2302286, function = 0xc141d458, data = 0 }
+kernel.timer_set: 23329.105569838 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, SOFTIRQ { expires = 2302286, function = 0xc14b0234, data = 0 }
+kernel.softirq_exit: 23329.105573246 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, MODE_UNKNOWN { softirq_id = 1 [softirq 1] }
+kernel.softirq_entry: 23329.105575583 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, SOFTIRQ { softirq_id = 9 [softirq 9] }
+rcu.tree_callback: 23329.105642628 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 1989, 0, , , 0, 0x0, SOFTIRQ { func = 0xc10bdc5f }
+rcu.tree_callback: 23329.105649024 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 1989, 0, , , 0, 0x0, SOFTIRQ { func = 0xc103c96c }
+rcu.tree_callback: 23329.105651773 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 1989, 0, , , 0, 0x0, SOFTIRQ { func = 0xc102b275 }
+kernel.process_free: 23329.105654832 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, SOFTIRQ { pid = 16928 }
+mm.page_free: 23329.105661044 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 1989, 0, , , 0, 0x0, SOFTIRQ { pfn = 198338, order = 1 }
+rcu.tree_callback: 23329.105672694 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 1989, 0, , , 0, 0x0, SOFTIRQ { func = 0xc10acb19 }
+kernel.softirq_exit: 23329.105675449 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, MODE_UNKNOWN { softirq_id = 9 [softirq 9] }
+kernel.sched_schedule: 23329.105688127 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, , , 16929, 0x0, SYSCALL { prev_pid = 1989, next_pid = 16930, prev_state = 0 }
+kernel.syscall_exit: 23329.105919817 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, , , 16929, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.105928959 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, , , 16929, 0x0, SYSCALL { ip = 0xb7823416, syscall_id = 311 [syscall 311] }
+kernel.syscall_exit: 23329.105930620 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, , , 16929, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.105942836 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, , , 16929, 0x0, TRAP { ip = 0xb782cbe0, address = 0xb76b1dec, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.105989609 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, , , 16929, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.106000437 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, , , 16929, 0x0, TRAP { ip = 0xb783ab70, address = 0xb76b6f34, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.106036790 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, , , 16929, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.106047413 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, , , 16929, 0x0, TRAP { ip = 0xb76d4680, address = 0xb76d4680, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.106083927 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, , , 16929, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.106094780 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, , , 16929, 0x0, TRAP { ip = 0x8049da0, address = 0x8049da0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.106132207 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, , , 16929, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.106143293 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, , , 16929, 0x0, TRAP { ip = 0xb782cbe0, address = 0xb76aeddc, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.106179374 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, , , 16929, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.106188295 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, , , 16929, 0x0, SYSCALL { ip = 0xb7823416, syscall_id = 42 [syscall 42] }
+kernel.syscall_exit: 23329.106226932 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, , , 16929, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.106234087 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, , , 16929, 0x0, TRAP { ip = 0xb77fa600, address = 0xb77fa600, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.106271539 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, , , 16929, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.106286181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, , , 16929, 0x0, TRAP { ip = 0xb776ba80, address = 0xb776ba80, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.106322393 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, , , 16929, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.106331313 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, , , 16929, 0x0, TRAP { ip = 0xb7786c40, address = 0xb7786c40, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.106367771 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, , , 16929, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.106375771 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, , , 16929, 0x0, SYSCALL { ip = 0xb7823416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.106379092 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, , , 16929, 0x0, SYSCALL { fd = 4 }
+fs.pollfd: 23329.106382821 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, , , 16929, 0x0, SYSCALL { fd = 6 }
+fs.pollfd: 23329.106411833 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, , , 16929, 0x0, SYSCALL { fd = 8 }
+fs.pollfd: 23329.106413890 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, , , 16929, 0x0, SYSCALL { fd = 10 }
+fs.pollfd: 23329.106415766 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, , , 16929, 0x0, SYSCALL { fd = 12 }
+fs.pollfd: 23329.106417798 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, , , 16929, 0x0, SYSCALL { fd = 14 }
+fs.pollfd: 23329.106419679 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, , , 16929, 0x0, SYSCALL { fd = 16 }
+fs.pollfd: 23329.106421513 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, , , 16929, 0x0, SYSCALL { fd = 18 }
+fs.pollfd: 23329.106423402 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, , , 16929, 0x0, SYSCALL { fd = 20 }
+fs.pollfd: 23329.106425298 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, , , 16929, 0x0, SYSCALL { fd = 22 }
+fs.pollfd: 23329.106427186 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, , , 16929, 0x0, SYSCALL { fd = 24 }
+fs.pollfd: 23329.106429087 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, , , 16929, 0x0, SYSCALL { fd = 26 }
+fs.pollfd: 23329.106430902 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, , , 16929, 0x0, SYSCALL { fd = 28 }
+fs.pollfd: 23329.106432686 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, , , 16929, 0x0, SYSCALL { fd = 30 }
+fs.pollfd: 23329.106434476 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, , , 16929, 0x0, SYSCALL { fd = 32 }
+fs.pollfd: 23329.106443144 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, , , 16929, 0x0, SYSCALL { fd = 34 }
+fs.pollfd: 23329.106450767 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, , , 16929, 0x0, SYSCALL { fd = 36 }
+fs.pollfd: 23329.106452545 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, , , 16929, 0x0, SYSCALL { fd = 38 }
+fs.pollfd: 23329.106454490 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, , , 16929, 0x0, SYSCALL { fd = 40 }
+fs.pollfd: 23329.106466385 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, , , 16929, 0x0, SYSCALL { fd = 42 }
+fs.pollfd: 23329.106468324 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, , , 16929, 0x0, SYSCALL { fd = 44 }
+fs.pollfd: 23329.106470194 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, , , 16929, 0x0, SYSCALL { fd = 46 }
+fs.pollfd: 23329.106499145 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, , , 16929, 0x0, SYSCALL { fd = 48 }
+kernel.sched_schedule: 23329.106509559 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, MODE_UNKNOWN { prev_pid = 16930, next_pid = 1989, prev_state = 1 }
+kernel.syscall_entry: 23329.106909296 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.106917333 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { count = 4080, fd = 48 }
+kernel.syscall_exit: 23329.106918710 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, MODE_UNKNOWN { ret = 4080 }
+kernel.syscall_entry: 23329.107932609 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.107938017 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 0, , , 0, 0x0, SYSCALL { count = 3576, fd = 48 }
+kernel.syscall_exit: 23329.107939387 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, MODE_UNKNOWN { ret = 3576 }
+kernel.syscall_entry: 23329.109525152 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+kernel.sched_try_wakeup: 23329.109582612 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 0, , , 0, 0x0, SYSCALL { pid = 2336, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 23329.109593871 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 0, , , 0, 0x0, MODE_UNKNOWN { prev_pid = 1989, next_pid = 2336, prev_state = 0 }
+fs.pollfd: 23329.109786705 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 0, , , 0, 0x0, MODE_UNKNOWN { fd = 8 }
+kernel.sched_schedule: 23329.109796631 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { prev_pid = 2336, next_pid = 16927, prev_state = 1 }
+kernel.printk: 23329.109863183 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { ip = 0xC142176D }
+kernel.vprintk: 23329.109874912 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { loglevel = 7, string = "LTT state dump thread start", ip = 0xC158363B }
+task_state.process_state: 23329.109899560 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1, parent_pid = 0, name = "init", type = 0, mode = 5, submode = 0, status = 5, tgid = 1 }
+task_state.process_state: 23329.109903918 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2, parent_pid = 0, name = "kthreadd", type = 1, mode = 5, submode = 0, status = 5, tgid = 2 }
+task_state.process_state: 23329.109907357 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 3, parent_pid = 2, name = "ksoftirqd/0", type = 1, mode = 5, submode = 0, status = 5, tgid = 3 }
+task_state.process_state: 23329.109910721 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 4, parent_pid = 2, name = "watchdog/0", type = 1, mode = 5, submode = 0, status = 5, tgid = 4 }
+task_state.process_state: 23329.109913666 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 5, parent_pid = 2, name = "events/0", type = 1, mode = 5, submode = 0, status = 5, tgid = 5 }
+task_state.process_state: 23329.109916641 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 6, parent_pid = 2, name = "cpuset", type = 1, mode = 5, submode = 0, status = 5, tgid = 6 }
+task_state.process_state: 23329.109919666 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 7, parent_pid = 2, name = "khelper", type = 1, mode = 5, submode = 0, status = 5, tgid = 7 }
+task_state.process_state: 23329.109922889 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 10, parent_pid = 2, name = "netns", type = 1, mode = 5, submode = 0, status = 5, tgid = 10 }
+task_state.process_state: 23329.109925901 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 13, parent_pid = 2, name = "async/mgr", type = 1, mode = 5, submode = 0, status = 5, tgid = 13 }
+task_state.process_state: 23329.109929006 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 122, parent_pid = 2, name = "sync_supers", type = 1, mode = 5, submode = 0, status = 5, tgid = 122 }
+task_state.process_state: 23329.109932395 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 124, parent_pid = 2, name = "bdi-default", type = 1, mode = 5, submode = 0, status = 5, tgid = 124 }
+task_state.process_state: 23329.109935352 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 126, parent_pid = 2, name = "kblockd/0", type = 1, mode = 5, submode = 0, status = 5, tgid = 126 }
+task_state.process_state: 23329.109938247 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 128, parent_pid = 2, name = "kacpid", type = 1, mode = 5, submode = 0, status = 5, tgid = 128 }
+task_state.process_state: 23329.109941439 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 129, parent_pid = 2, name = "kacpi_notify", type = 1, mode = 5, submode = 0, status = 5, tgid = 129 }
+task_state.process_state: 23329.109944235 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 130, parent_pid = 2, name = "kacpi_hotplug", type = 1, mode = 5, submode = 0, status = 5, tgid = 130 }
+task_state.process_state: 23329.109946890 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 171, parent_pid = 2, name = "kseriod", type = 1, mode = 5, submode = 0, status = 5, tgid = 171 }
+task_state.process_state: 23329.109949723 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 178, parent_pid = 2, name = "kslowd", type = 1, mode = 5, submode = 0, status = 5, tgid = 178 }
+task_state.process_state: 23329.109952859 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 179, parent_pid = 2, name = "kslowd", type = 1, mode = 5, submode = 0, status = 5, tgid = 179 }
+task_state.process_state: 23329.109957063 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 199, parent_pid = 2, name = "rpciod/0", type = 1, mode = 5, submode = 0, status = 5, tgid = 199 }
+task_state.process_state: 23329.109959945 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 216, parent_pid = 2, name = "khungtaskd", type = 1, mode = 5, submode = 0, status = 5, tgid = 216 }
+task_state.process_state: 23329.109962878 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 217, parent_pid = 2, name = "kswapd0", type = 1, mode = 5, submode = 0, status = 5, tgid = 217 }
+task_state.process_state: 23329.109965599 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 218, parent_pid = 2, name = "aio/0", type = 1, mode = 5, submode = 0, status = 5, tgid = 218 }
+task_state.process_state: 23329.109968625 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 228, parent_pid = 2, name = "nfsiod", type = 1, mode = 5, submode = 0, status = 5, tgid = 228 }
+task_state.process_state: 23329.109971594 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 233, parent_pid = 2, name = "jfsIO", type = 1, mode = 5, submode = 0, status = 5, tgid = 233 }
+kernel.irq_entry: 23329.110021553 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 0, , , 0, 0x0, IRQ { ip = 3242331332, handler = 0xf8a23c7f, irq_id = 14, kernel_mode = 1 }
+block.rq_complete_fs: 23329.110048831 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16927, 0, , , 0, 0x0, IRQ { hard_sector = 2303, rw = 0, errors = 0 }
+kernel.sched_try_wakeup: 23329.110072517 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 0, , , 0, 0x0, IRQ { pid = 1304, cpu_id = 0, state = 2 }
+kernel.timer_set: 23329.110089882 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 0, , , 0, 0x0, IRQ { expires = 2302286, function = 0xc141b0a5, data = 4136835584 }
+kernel.irq_exit: 23329.110101037 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.sched_schedule: 23329.110113636 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 0, , , 0, 0x0, TRAP { prev_pid = 16927, next_pid = 1304, prev_state = 0 }
+kernel.page_fault_exit: 23329.110209442 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 0, , , 0, 0x0, MODE_UNKNOWN { res = 4 }
+fs.read: 23329.110287512 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1304, 0, , , 0, 0x0, MODE_UNKNOWN { count = 4095, fd = 19 }
+kernel.syscall_exit: 23329.110289272 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 0, , , 0, 0x0, MODE_UNKNOWN { ret = 85 }
+kernel.page_fault_entry: 23329.110323791 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 0, , , 0, 0x0, TRAP { ip = 0xb76065f3, address = 0xb76065f3, trap_id = 14, write_access = 0 }
+mm.add_to_page_cache: 23329.110362101 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 1304, 0, , , 0, 0x0, TRAP { inode = 33292, sdev = 3145730 }
+mm.add_to_page_cache: 23329.110372991 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 1304, 0, , , 0, 0x0, TRAP { inode = 33292, sdev = 3145730 }
+mm.add_to_page_cache: 23329.110376608 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 1304, 0, , , 0, 0x0, TRAP { inode = 33292, sdev = 3145730 }
+mm.add_to_page_cache: 23329.110379917 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 1304, 0, , , 0, 0x0, TRAP { inode = 33292, sdev = 3145730 }
+block.remap: 23329.110386640 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { device_from = 3145728, sector_from = 1157472, device_to = 3145730, size = 16384, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_queue: 23329.110390485 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { sector = 4081302, size = 16384, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.getrq_bio: 23329.110402608 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { sector = 4081302, size = 16384, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+kernel.timer_set: 23329.110410140 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 0, , , 0, 0x0, TRAP { expires = 2302286, function = 0xc1410312, data = 4147888232 }
+block.plug: 23329.110414214 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP
+block.rq_insert_fs: 23329.110419325 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { hard_sector = 4081302, rw = 0, errors = 0 }
+block.rq_issue_fs: 23329.110438203 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { hard_sector = 4081302, rw = 0, errors = 0 }
+kernel.timer_set: 23329.110477660 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 0, , , 0, 0x0, TRAP { expires = 2304285, function = 0xf8a23e85, data = 4136733696 }
+block.unplug_io: 23329.110557169 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 0, , , 0, 0x0, TRAP { pdu = 1 }
+kernel.sched_schedule: 23329.110567392 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { prev_pid = 1304, next_pid = 16927, prev_state = 2 }
+task_state.process_state: 23329.110658433 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 234, parent_pid = 2, name = "jfsCommit", type = 1, mode = 5, submode = 0, status = 5, tgid = 234 }
+task_state.process_state: 23329.110661945 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 235, parent_pid = 2, name = "jfsSync", type = 1, mode = 5, submode = 0, status = 5, tgid = 235 }
+task_state.process_state: 23329.110664847 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 236, parent_pid = 2, name = "xfs_mru_cache", type = 1, mode = 5, submode = 0, status = 5, tgid = 236 }
+task_state.process_state: 23329.110667915 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 237, parent_pid = 2, name = "xfslogd/0", type = 1, mode = 5, submode = 0, status = 5, tgid = 237 }
+task_state.process_state: 23329.110671205 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 238, parent_pid = 2, name = "xfsdatad/0", type = 1, mode = 5, submode = 0, status = 5, tgid = 238 }
+task_state.process_state: 23329.110674193 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 239, parent_pid = 2, name = "xfsconvertd/0", type = 1, mode = 5, submode = 0, status = 5, tgid = 239 }
+task_state.process_state: 23329.110676989 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 240, parent_pid = 2, name = "ocfs2_wq", type = 1, mode = 5, submode = 0, status = 5, tgid = 240 }
+task_state.process_state: 23329.110679798 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 241, parent_pid = 2, name = "o2quot/0", type = 1, mode = 5, submode = 0, status = 5, tgid = 241 }
+task_state.process_state: 23329.110682668 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 244, parent_pid = 2, name = "user_dlm", type = 1, mode = 5, submode = 0, status = 5, tgid = 244 }
+task_state.process_state: 23329.110685397 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 246, parent_pid = 2, name = "glock_workqueue", type = 1, mode = 5, submode = 0, status = 5, tgid = 246 }
+task_state.process_state: 23329.110688168 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 247, parent_pid = 2, name = "delete_workqueu", type = 1, mode = 5, submode = 0, status = 5, tgid = 247 }
+task_state.process_state: 23329.110690910 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 248, parent_pid = 2, name = "crypto/0", type = 1, mode = 5, submode = 0, status = 5, tgid = 248 }
+task_state.process_state: 23329.110693792 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 394, parent_pid = 2, name = "krxrpcd/0", type = 1, mode = 5, submode = 0, status = 5, tgid = 394 }
+task_state.process_state: 23329.110696879 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 543, parent_pid = 2, name = "ksuspend_usbd", type = 1, mode = 5, submode = 0, status = 5, tgid = 543 }
+task_state.process_state: 23329.110699736 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 547, parent_pid = 2, name = "khubd", type = 1, mode = 5, submode = 0, status = 5, tgid = 547 }
+task_state.process_state: 23329.110702786 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 561, parent_pid = 2, name = "ata/0", type = 1, mode = 5, submode = 0, status = 5, tgid = 561 }
+task_state.process_state: 23329.110705835 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 563, parent_pid = 2, name = "ata_aux", type = 1, mode = 5, submode = 0, status = 5, tgid = 563 }
+task_state.process_state: 23329.110708724 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 568, parent_pid = 2, name = "scsi_eh_0", type = 1, mode = 5, submode = 0, status = 5, tgid = 568 }
+task_state.process_state: 23329.110711638 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 600, parent_pid = 2, name = "flush-3:0", type = 1, mode = 5, submode = 0, status = 5, tgid = 600 }
+task_state.process_state: 23329.110714780 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 601, parent_pid = 2, name = "kjournald", type = 1, mode = 5, submode = 0, status = 5, tgid = 601 }
+task_state.process_state: 23329.110718169 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 654, parent_pid = 1, name = "udevd", type = 0, mode = 5, submode = 0, status = 5, tgid = 654 }
+task_state.process_state: 23329.110721145 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 757, parent_pid = 654, name = "udevd", type = 0, mode = 5, submode = 0, status = 5, tgid = 757 }
+task_state.process_state: 23329.110723898 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 758, parent_pid = 654, name = "udevd", type = 0, mode = 5, submode = 0, status = 5, tgid = 758 }
+task_state.process_state: 23329.110726892 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 795, parent_pid = 2, name = "kpsmoused", type = 1, mode = 5, submode = 0, status = 5, tgid = 795 }
+task_state.process_state: 23329.110729787 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1219, parent_pid = 1, name = "dhclient3", type = 0, mode = 5, submode = 0, status = 5, tgid = 1219 }
+task_state.process_state: 23329.110732732 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1244, parent_pid = 2, name = "cifsd", type = 1, mode = 5, submode = 0, status = 5, tgid = 1244 }
+task_state.process_state: 23329.110735818 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1259, parent_pid = 1, name = "dirmngr", type = 0, mode = 5, submode = 0, status = 5, tgid = 1259 }
+task_state.process_state: 23329.110738676 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1301, parent_pid = 1, name = "rsyslogd", type = 0, mode = 5, submode = 0, status = 5, tgid = 1301 }
+task_state.process_state: 23329.110741337 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1303, parent_pid = 1, name = "rsyslogd", type = 0, mode = 5, submode = 0, status = 5, tgid = 1301 }
+task_state.process_state: 23329.110744035 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1304, parent_pid = 1, name = "rsyslogd", type = 0, mode = 5, submode = 0, status = 5, tgid = 1301 }
+task_state.process_state: 23329.110747016 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 16834, parent_pid = 1, name = "rsyslogd", type = 0, mode = 5, submode = 0, status = 5, tgid = 1301 }
+task_state.process_state: 23329.110749899 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1340, parent_pid = 1, name = "xfstt", type = 0, mode = 5, submode = 0, status = 5, tgid = 1340 }
+task_state.process_state: 23329.110752745 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1347, parent_pid = 1, name = "acpid", type = 0, mode = 5, submode = 0, status = 5, tgid = 1347 }
+task_state.process_state: 23329.110755646 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1372, parent_pid = 1, name = "cron", type = 0, mode = 5, submode = 0, status = 5, tgid = 1372 }
+task_state.process_state: 23329.110758517 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1382, parent_pid = 1, name = "dbus-daemon", type = 0, mode = 5, submode = 0, status = 5, tgid = 1382 }
+task_state.process_state: 23329.110761505 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1391, parent_pid = 1, name = "gpm", type = 0, mode = 5, submode = 0, status = 5, tgid = 1391 }
+task_state.process_state: 23329.110764653 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1421, parent_pid = 1, name = "mysqld_safe", type = 0, mode = 5, submode = 0, status = 5, tgid = 1421 }
+task_state.process_state: 23329.110767394 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1545, parent_pid = 1421, name = "mysqld", type = 0, mode = 5, submode = 0, status = 5, tgid = 1545 }
+task_state.process_state: 23329.110770468 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1556, parent_pid = 1421, name = "mysqld", type = 0, mode = 5, submode = 0, status = 5, tgid = 1545 }
+task_state.process_state: 23329.110773295 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1557, parent_pid = 1421, name = "mysqld", type = 0, mode = 5, submode = 0, status = 5, tgid = 1545 }
+task_state.process_state: 23329.110776066 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1558, parent_pid = 1421, name = "mysqld", type = 0, mode = 5, submode = 0, status = 5, tgid = 1545 }
+task_state.process_state: 23329.110778975 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1559, parent_pid = 1421, name = "mysqld", type = 0, mode = 5, submode = 0, status = 5, tgid = 1545 }
+task_state.process_state: 23329.110782006 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1561, parent_pid = 1421, name = "mysqld", type = 0, mode = 5, submode = 0, status = 5, tgid = 1545 }
+task_state.process_state: 23329.110785363 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1562, parent_pid = 1421, name = "mysqld", type = 0, mode = 5, submode = 0, status = 5, tgid = 1545 }
+task_state.process_state: 23329.110788338 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1563, parent_pid = 1421, name = "mysqld", type = 0, mode = 5, submode = 0, status = 5, tgid = 1545 }
+task_state.process_state: 23329.110791382 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1564, parent_pid = 1421, name = "mysqld", type = 0, mode = 5, submode = 0, status = 5, tgid = 1545 }
+task_state.process_state: 23329.110794346 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1567, parent_pid = 1421, name = "mysqld", type = 0, mode = 5, submode = 0, status = 5, tgid = 1545 }
+task_state.process_state: 23329.110797271 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1546, parent_pid = 1421, name = "logger", type = 0, mode = 5, submode = 0, status = 5, tgid = 1546 }
+task_state.process_state: 23329.110800209 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1623, parent_pid = 1, name = "sshd", type = 0, mode = 5, submode = 0, status = 5, tgid = 1623 }
+task_state.process_state: 23329.110803185 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1642, parent_pid = 1, name = "VBoxService", type = 0, mode = 5, submode = 0, status = 5, tgid = 1642 }
+task_state.process_state: 23329.110806037 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1643, parent_pid = 1, name = "VBoxService", type = 0, mode = 5, submode = 0, status = 5, tgid = 1642 }
+task_state.process_state: 23329.110808796 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1658, parent_pid = 1, name = "hald", type = 0, mode = 5, submode = 0, status = 5, tgid = 1658 }
+task_state.process_state: 23329.110811932 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1659, parent_pid = 1658, name = "hald-runner", type = 0, mode = 5, submode = 0, status = 5, tgid = 1659 }
+task_state.process_state: 23329.110814741 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1732, parent_pid = 1659, name = "hald-addon-stor", type = 0, mode = 5, submode = 0, status = 5, tgid = 1732 }
+task_state.process_state: 23329.110817803 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1734, parent_pid = 1659, name = "hald-addon-stor", type = 0, mode = 5, submode = 0, status = 5, tgid = 1734 }
+task_state.process_state: 23329.110820778 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1736, parent_pid = 1659, name = "hald-addon-acpi", type = 0, mode = 5, submode = 0, status = 5, tgid = 1736 }
+task_state.process_state: 23329.110823624 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1741, parent_pid = 1659, name = "hald-addon-inpu", type = 0, mode = 5, submode = 0, status = 5, tgid = 1741 }
+task_state.process_state: 23329.110826482 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1758, parent_pid = 1, name = "nmbd", type = 0, mode = 5, submode = 0, status = 5, tgid = 1758 }
+task_state.process_state: 23329.110829291 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1767, parent_pid = 1, name = "smbd", type = 0, mode = 5, submode = 0, status = 5, tgid = 1767 }
+task_state.process_state: 23329.110832063 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1777, parent_pid = 1767, name = "smbd", type = 0, mode = 5, submode = 0, status = 5, tgid = 1777 }
+task_state.process_state: 23329.110834914 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1815, parent_pid = 1, name = "gdm-emulatord", type = 0, mode = 5, submode = 0, status = 5, tgid = 1815 }
+task_state.process_state: 23329.110837822 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1840, parent_pid = 1, name = "login", type = 0, mode = 5, submode = 0, status = 5, tgid = 1840 }
+task_state.process_state: 23329.110840693 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1841, parent_pid = 1, name = "getty", type = 0, mode = 5, submode = 0, status = 5, tgid = 1841 }
+task_state.process_state: 23329.110843495 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1842, parent_pid = 1, name = "getty", type = 0, mode = 5, submode = 0, status = 5, tgid = 1842 }
+task_state.process_state: 23329.110846272 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1843, parent_pid = 1, name = "getty", type = 0, mode = 5, submode = 0, status = 5, tgid = 1843 }
+task_state.process_state: 23329.110849032 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1844, parent_pid = 1, name = "getty", type = 0, mode = 5, submode = 0, status = 5, tgid = 1844 }
+task_state.process_state: 23329.110851749 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1845, parent_pid = 1, name = "getty", type = 0, mode = 5, submode = 0, status = 5, tgid = 1845 }
+task_state.process_state: 23329.110854891 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1881, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.110858533 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1882, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.110861507 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1884, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.110864322 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1885, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.110867384 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1886, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.110898213 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1887, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.110901559 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1888, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.110904892 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1890, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.110907732 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1891, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.110910695 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1892, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.110954455 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1893, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.110957431 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1894, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.110960320 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1895, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.110963141 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1896, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.110966011 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1897, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.110968999 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1898, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.110971820 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1899, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.110975086 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1900, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.110977969 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1901, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.110980876 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1902, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.110983734 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1903, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.110986549 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1904, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.110989692 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1905, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.110992536 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1906, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.110995284 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1907, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.110998173 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1908, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111001018 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1909, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111003773 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1910, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111006654 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1911, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111009562 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1912, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111012525 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1913, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111015285 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1914, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111018056 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1915, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111021260 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1916, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111024001 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1917, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111026896 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1918, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111029835 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1919, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111032612 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1920, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111035285 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1921, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111038224 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1922, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111041039 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1923, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111043996 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1924, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111046712 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1925, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111049737 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1926, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111052447 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1927, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111055218 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1928, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111058040 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1929, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111060910 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1930, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111063669 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1931, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111066849 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1932, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111069694 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1933, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111072595 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1934, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111075454 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1935, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111078268 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1936, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111081151 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1937, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111084041 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1938, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111086725 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1939, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111089620 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1940, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111092361 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1941, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111095213 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1942, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111098059 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1943, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111100868 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1945, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111103578 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1949, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111106479 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1990, parent_pid = 1, name = "console-kit-dae", type = 0, mode = 5, submode = 0, status = 5, tgid = 1881 }
+task_state.process_state: 23329.111109461 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1957, parent_pid = 1840, name = "bash", type = 0, mode = 5, submode = 0, status = 5, tgid = 1957 }
+task_state.process_state: 23329.111112554 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1987, parent_pid = 1, name = "kdm", type = 0, mode = 5, submode = 0, status = 5, tgid = 1987 }
+task_state.process_state: 23329.111115325 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1989, parent_pid = 1987, name = "Xorg", type = 0, mode = 5, submode = 0, status = 1, tgid = 1989 }
+task_state.process_state: 23329.111118146 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 1993, parent_pid = 1987, name = "kdm", type = 0, mode = 5, submode = 0, status = 5, tgid = 1993 }
+task_state.process_state: 23329.111121005 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2001, parent_pid = 1, name = "dbus-launch", type = 0, mode = 5, submode = 0, status = 5, tgid = 2001 }
+task_state.process_state: 23329.111124060 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2002, parent_pid = 1, name = "dbus-daemon", type = 0, mode = 5, submode = 0, status = 5, tgid = 2002 }
+task_state.process_state: 23329.111127011 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2015, parent_pid = 1993, name = "startkde", type = 0, mode = 5, submode = 0, status = 5, tgid = 2015 }
+task_state.process_state: 23329.111129838 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2086, parent_pid = 1, name = "VBoxClient", type = 0, mode = 5, submode = 0, status = 5, tgid = 2086 }
+task_state.process_state: 23329.111132530 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2090, parent_pid = 1, name = "VBoxClient", type = 0, mode = 5, submode = 0, status = 5, tgid = 2086 }
+task_state.process_state: 23329.111135561 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2095, parent_pid = 1, name = "VBoxClient", type = 0, mode = 5, submode = 0, status = 5, tgid = 2095 }
+task_state.process_state: 23329.111138362 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2128, parent_pid = 1, name = "VBoxClient", type = 0, mode = 5, submode = 0, status = 5, tgid = 2095 }
+task_state.process_state: 23329.111141307 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2099, parent_pid = 1, name = "VBoxClient", type = 0, mode = 5, submode = 0, status = 5, tgid = 2099 }
+task_state.process_state: 23329.111143974 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2100, parent_pid = 1, name = "VBoxClient", type = 0, mode = 5, submode = 0, status = 5, tgid = 2099 }
+task_state.process_state: 23329.111146949 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2104, parent_pid = 2015, name = "ssh-agent", type = 0, mode = 5, submode = 0, status = 5, tgid = 2104 }
+task_state.process_state: 23329.111150037 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2110, parent_pid = 1, name = "dbus-launch", type = 0, mode = 5, submode = 0, status = 5, tgid = 2110 }
+task_state.process_state: 23329.111153030 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2114, parent_pid = 1, name = "dbus-daemon", type = 0, mode = 5, submode = 0, status = 5, tgid = 2114 }
+task_state.process_state: 23329.111155814 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2161, parent_pid = 1, name = "kdeinit4", type = 0, mode = 5, submode = 0, status = 5, tgid = 2161 }
+task_state.process_state: 23329.111159030 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2162, parent_pid = 2161, name = "klauncher", type = 0, mode = 5, submode = 0, status = 5, tgid = 2162 }
+task_state.process_state: 23329.111161814 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2164, parent_pid = 1, name = "kded4", type = 0, mode = 5, submode = 0, status = 5, tgid = 2164 }
+task_state.process_state: 23329.111164642 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2182, parent_pid = 2015, name = "kwrapper4", type = 0, mode = 5, submode = 0, status = 5, tgid = 2182 }
+task_state.process_state: 23329.111167617 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2185, parent_pid = 2161, name = "ksmserver", type = 0, mode = 5, submode = 0, status = 5, tgid = 2185 }
+task_state.process_state: 23329.111170413 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2198, parent_pid = 2161, name = "ksmserver", type = 0, mode = 5, submode = 0, status = 5, tgid = 2185 }
+task_state.process_state: 23329.111173210 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2199, parent_pid = 2185, name = "kwin", type = 0, mode = 5, submode = 0, status = 5, tgid = 2199 }
+task_state.process_state: 23329.111176025 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2201, parent_pid = 1, name = "kglobalaccel", type = 0, mode = 5, submode = 0, status = 5, tgid = 2201 }
+task_state.process_state: 23329.111178852 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2203, parent_pid = 1, name = "plasma-desktop", type = 0, mode = 5, submode = 0, status = 5, tgid = 2203 }
+task_state.process_state: 23329.111181587 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2207, parent_pid = 1, name = "plasma-desktop", type = 0, mode = 5, submode = 0, status = 5, tgid = 2203 }
+task_state.process_state: 23329.111184389 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2205, parent_pid = 1, name = "knotify4", type = 0, mode = 5, submode = 0, status = 5, tgid = 2205 }
+task_state.process_state: 23329.111187303 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2321, parent_pid = 1, name = "knotify4", type = 0, mode = 5, submode = 0, status = 5, tgid = 2205 }
+task_state.process_state: 23329.111190161 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2322, parent_pid = 1, name = "knotify4", type = 0, mode = 5, submode = 0, status = 5, tgid = 2205 }
+task_state.process_state: 23329.111192884 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2325, parent_pid = 1, name = "knotify4", type = 0, mode = 5, submode = 0, status = 5, tgid = 2205 }
+task_state.process_state: 23329.111195649 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2326, parent_pid = 1, name = "knotify4", type = 0, mode = 5, submode = 0, status = 5, tgid = 2205 }
+task_state.process_state: 23329.111198378 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2238, parent_pid = 2161, name = "kio_file", type = 0, mode = 5, submode = 0, status = 5, tgid = 2238 }
+task_state.process_state: 23329.111201279 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2244, parent_pid = 1, name = "kxkb", type = 0, mode = 5, submode = 0, status = 5, tgid = 2244 }
+task_state.process_state: 23329.111204390 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2252, parent_pid = 1, name = "kxkb", type = 0, mode = 5, submode = 0, status = 5, tgid = 2244 }
+task_state.process_state: 23329.111207088 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2247, parent_pid = 1, name = "krunner", type = 0, mode = 5, submode = 0, status = 5, tgid = 2247 }
+task_state.process_state: 23329.111209817 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2248, parent_pid = 1, name = "nepomukserver", type = 0, mode = 5, submode = 0, status = 5, tgid = 2248 }
+task_state.process_state: 23329.111212828 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2254, parent_pid = 1, name = "nepomukserver", type = 0, mode = 5, submode = 0, status = 5, tgid = 2248 }
+task_state.process_state: 23329.111215613 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2255, parent_pid = 2248, name = "nepomukservices", type = 0, mode = 5, submode = 0, status = 5, tgid = 2255 }
+task_state.process_state: 23329.111218385 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2259, parent_pid = 2248, name = "nepomukservices", type = 0, mode = 5, submode = 0, status = 5, tgid = 2259 }
+task_state.process_state: 23329.111221193 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2260, parent_pid = 2248, name = "nepomukservices", type = 0, mode = 5, submode = 0, status = 5, tgid = 2260 }
+task_state.process_state: 23329.111224225 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2261, parent_pid = 2248, name = "nepomukservices", type = 0, mode = 5, submode = 0, status = 5, tgid = 2261 }
+task_state.process_state: 23329.111226984 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2265, parent_pid = 2248, name = "nepomukservices", type = 0, mode = 5, submode = 0, status = 5, tgid = 2261 }
+task_state.process_state: 23329.111229867 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2263, parent_pid = 1, name = "kmix", type = 0, mode = 5, submode = 0, status = 5, tgid = 2263 }
+task_state.process_state: 23329.111232625 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2269, parent_pid = 2161, name = "gkrellm", type = 0, mode = 5, submode = 0, status = 5, tgid = 2269 }
+task_state.process_state: 23329.111235700 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2275, parent_pid = 2161, name = "polkit-gnome-au", type = 0, mode = 5, submode = 0, status = 5, tgid = 2275 }
+task_state.process_state: 23329.111238724 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2290, parent_pid = 1, name = "polkitd", type = 0, mode = 5, submode = 0, status = 5, tgid = 2290 }
+task_state.process_state: 23329.111241434 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2336, parent_pid = 1, name = "konsole", type = 0, mode = 5, submode = 0, status = 5, tgid = 2336 }
+task_state.process_state: 23329.111244416 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2342, parent_pid = 1, name = "konsole", type = 0, mode = 5, submode = 0, status = 5, tgid = 2336 }
+task_state.process_state: 23329.111247231 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2536, parent_pid = 2336, name = "bash", type = 0, mode = 5, submode = 0, status = 5, tgid = 2536 }
+task_state.process_state: 23329.111250583 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2630, parent_pid = 2536, name = "su", type = 0, mode = 5, submode = 0, status = 5, tgid = 2630 }
+task_state.process_state: 23329.111253404 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2639, parent_pid = 2630, name = "bash", type = 0, mode = 5, submode = 0, status = 5, tgid = 2639 }
+task_state.process_state: 23329.111256305 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2748, parent_pid = 1, name = "ssh", type = 0, mode = 5, submode = 0, status = 5, tgid = 2748 }
+task_state.process_state: 23329.111259336 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2757, parent_pid = 1, name = "ssh", type = 0, mode = 5, submode = 0, status = 5, tgid = 2757 }
+task_state.process_state: 23329.111262343 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2782, parent_pid = 1372, name = "cron", type = 0, mode = 5, submode = 0, status = 5, tgid = 2782 }
+task_state.process_state: 23329.111265102 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2791, parent_pid = 2782, name = "NetCheck.sh", type = 1, mode = 5, submode = 0, status = 4, tgid = 2791 }
+task_state.process_state: 23329.111267985 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2794, parent_pid = 2782, name = "sendmail", type = 0, mode = 5, submode = 0, status = 5, tgid = 2794 }
+task_state.process_state: 23329.111270794 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2838, parent_pid = 1, name = "ssh", type = 0, mode = 5, submode = 0, status = 5, tgid = 2838 }
+task_state.process_state: 23329.111273714 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2853, parent_pid = 1, name = "ssh", type = 0, mode = 5, submode = 0, status = 5, tgid = 2853 }
+task_state.process_state: 23329.111276646 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 2864, parent_pid = 1, name = "ssh", type = 0, mode = 5, submode = 0, status = 5, tgid = 2864 }
+task_state.process_state: 23329.111279399 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 3380, parent_pid = 1, name = "gvfsd", type = 0, mode = 5, submode = 0, status = 5, tgid = 3380 }
+task_state.process_state: 23329.111282109 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 3384, parent_pid = 1, name = "gvfs-hal-volume", type = 0, mode = 5, submode = 0, status = 5, tgid = 3384 }
+task_state.process_state: 23329.111285097 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 3386, parent_pid = 1, name = "gvfs-gphoto2-vo", type = 0, mode = 5, submode = 0, status = 5, tgid = 3386 }
+task_state.process_state: 23329.111288035 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 3701, parent_pid = 2336, name = "bash", type = 0, mode = 5, submode = 0, status = 5, tgid = 3701 }
+task_state.process_state: 23329.111290949 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 4080, parent_pid = 2161, name = "sh", type = 0, mode = 5, submode = 0, status = 5, tgid = 4080 }
+task_state.process_state: 23329.111293596 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 4081, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111297147 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 8990, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111300158 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 8991, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111303054 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 8992, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111305782 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 8993, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111308518 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 8994, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111311461 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 8995, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111314338 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 8996, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111321517 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 8999, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111324357 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 9000, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111327135 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 9001, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111330061 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 9004, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111332956 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 9020, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111335802 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 9043, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111338592 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 9044, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111341488 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 9070, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111344772 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 9212, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111347630 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 9238, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111350488 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 9239, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111353241 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 9241, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111356198 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 11610, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111358987 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 11966, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111361896 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 11967, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111364655 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 13119, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111367384 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 13120, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111370192 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 14209, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111373032 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 14402, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111375723 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 16658, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111378618 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 16826, parent_pid = 4080, name = "eclipse", type = 0, mode = 5, submode = 0, status = 5, tgid = 4081 }
+task_state.process_state: 23329.111381501 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 4182, parent_pid = 1, name = "gconfd-2", type = 0, mode = 5, submode = 0, status = 5, tgid = 4182 }
+task_state.process_state: 23329.111384384 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 5051, parent_pid = 2161, name = "icedove", type = 0, mode = 5, submode = 0, status = 5, tgid = 5051 }
+task_state.process_state: 23329.111387211 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 5063, parent_pid = 5051, name = "run-mozilla.sh", type = 0, mode = 5, submode = 0, status = 5, tgid = 5063 }
+task_state.process_state: 23329.111390625 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 5064, parent_pid = 2161, name = "wish", type = 0, mode = 5, submode = 0, status = 5, tgid = 5064 }
+task_state.process_state: 23329.111393508 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 5070, parent_pid = 2161, name = "wish", type = 0, mode = 5, submode = 0, status = 5, tgid = 5064 }
+task_state.process_state: 23329.111396551 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 5069, parent_pid = 5063, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 5069 }
+task_state.process_state: 23329.111399471 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 5073, parent_pid = 5063, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 5069 }
+task_state.process_state: 23329.111402514 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 5074, parent_pid = 5063, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 5069 }
+task_state.process_state: 23329.111405311 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 5082, parent_pid = 5063, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 5069 }
+task_state.process_state: 23329.111408101 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 5083, parent_pid = 5063, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 5069 }
+task_state.process_state: 23329.111411039 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 5089, parent_pid = 5063, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 5069 }
+task_state.process_state: 23329.111413928 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 5090, parent_pid = 5063, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 5069 }
+task_state.process_state: 23329.111416867 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 5091, parent_pid = 5063, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 5069 }
+task_state.process_state: 23329.111419922 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 5124, parent_pid = 5063, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 5069 }
+task_state.process_state: 23329.111422904 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 5705, parent_pid = 5063, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 5069 }
+task_state.process_state: 23329.111425663 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 5709, parent_pid = 5063, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 5069 }
+task_state.process_state: 23329.111428435 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 5847, parent_pid = 5063, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 5069 }
+task_state.process_state: 23329.111431300 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 5848, parent_pid = 5063, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 5069 }
+task_state.process_state: 23329.111434065 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 5850, parent_pid = 5063, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 5069 }
+task_state.process_state: 23329.111437399 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 7980, parent_pid = 5063, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 5069 }
+task_state.process_state: 23329.111440281 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 7981, parent_pid = 5063, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 5069 }
+task_state.process_state: 23329.111443065 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 15364, parent_pid = 5063, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 5069 }
+task_state.process_state: 23329.111445930 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 15511, parent_pid = 5063, name = "icedove-bin", type = 0, mode = 5, submode = 0, status = 5, tgid = 5069 }
+task_state.process_state: 23329.111449090 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 6239, parent_pid = 5064, name = "firefox-bin", type = 1, mode = 5, submode = 0, status = 4, tgid = 6239 }
+task_state.process_state: 23329.111452066 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 16884, parent_pid = 2336, name = "bash", type = 0, mode = 5, submode = 0, status = 5, tgid = 16884 }
+task_state.process_state: 23329.111454937 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 16900, parent_pid = 16884, name = "su", type = 0, mode = 5, submode = 0, status = 5, tgid = 16900 }
+task_state.process_state: 23329.111457855 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 0, , , 0, 0x0, MODE_UNKNOWN { pid = 16908, parent_pid = 16900, name = "bash", type = 0, mode = 5, submode = 0, status = 5, tgid = 16908 }
+task_state.process_state: 23329.111460633 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16927, parent_pid = 16908, name = "lttctl", type = 0, mode = 5, submode = 0, status = 1, tgid = 16927 }
+task_state.process_state: 23329.111463436 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16929, parent_pid = 1, name = "lttd", type = 0, mode = 5, submode = 0, status = 5, tgid = 16929 }
+task_state.process_state: 23329.111466047 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16930, parent_pid = 1, name = "lttd", type = 0, mode = 5, submode = 0, status = 5, tgid = 16929 }
+task_state.process_state: 23329.111474875 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 0, parent_pid = 0, name = "swapper", type = 1, mode = 5, submode = 0, status = 1, tgid = 0 }
+fd_state.file_descriptor: 23329.111498746 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/initctl", pid = 1, fd = 10 }
+fd_state.file_descriptor: 23329.111509925 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 654, fd = 0 }
+fd_state.file_descriptor: 23329.111511937 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 654, fd = 1 }
+fd_state.file_descriptor: 23329.111513876 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 654, fd = 2 }
+fd_state.file_descriptor: 23329.111521852 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/.udev/queue.bin", pid = 654, fd = 3 }
+fd_state.file_descriptor: 23329.111531704 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[2755]", pid = 654, fd = 4 }
+fd_state.file_descriptor: 23329.111538778 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[2756]", pid = 654, fd = 5 }
+fd_state.file_descriptor: 23329.111560884 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 654, fd = 6 }
+fd_state.file_descriptor: 23329.111567286 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "anon_inode:[signalfd]", pid = 654, fd = 7 }
+fd_state.file_descriptor: 23329.111570033 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[2759]", pid = 654, fd = 8 }
+fd_state.file_descriptor: 23329.111572397 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[2760]", pid = 654, fd = 9 }
+fd_state.file_descriptor: 23329.111574842 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 757, fd = 0 }
+fd_state.file_descriptor: 23329.111576922 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 757, fd = 1 }
+fd_state.file_descriptor: 23329.111578959 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 757, fd = 2 }
+fd_state.file_descriptor: 23329.111587015 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[2912]", pid = 757, fd = 3 }
+fd_state.file_descriptor: 23329.111589040 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 757, fd = 6 }
+fd_state.file_descriptor: 23329.111591108 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[2760]", pid = 757, fd = 9 }
+fd_state.file_descriptor: 23329.111593484 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 758, fd = 0 }
+fd_state.file_descriptor: 23329.111595503 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 758, fd = 1 }
+fd_state.file_descriptor: 23329.111597410 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 758, fd = 2 }
+fd_state.file_descriptor: 23329.111602503 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[2917]", pid = 758, fd = 3 }
+fd_state.file_descriptor: 23329.111622287 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 758, fd = 6 }
+fd_state.file_descriptor: 23329.111624806 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[2760]", pid = 758, fd = 9 }
+fd_state.file_descriptor: 23329.111627621 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1219, fd = 0 }
+fd_state.file_descriptor: 23329.111629769 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1219, fd = 1 }
+fd_state.file_descriptor: 23329.111631961 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1219, fd = 2 }
+fd_state.file_descriptor: 23329.111638091 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/dhcp3/dhclient.eth0.leases", pid = 1219, fd = 3 }
+fd_state.file_descriptor: 23329.111643085 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[4291]", pid = 1219, fd = 4 }
+fd_state.file_descriptor: 23329.111650622 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[4288]", pid = 1219, fd = 5 }
+fd_state.file_descriptor: 23329.111654091 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[4515]", pid = 1259, fd = 3 }
+fd_state.file_descriptor: 23329.111656221 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[4515]", pid = 1259, fd = 4 }
+fd_state.file_descriptor: 23329.111661265 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/dirmngr.log", pid = 1259, fd = 5 }
+fd_state.file_descriptor: 23329.111663975 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[4518]", pid = 1259, fd = 6 }
+fd_state.file_descriptor: 23329.111669148 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[4570]", pid = 1301, fd = 0 }
+fd_state.file_descriptor: 23329.111673821 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/auth.log", pid = 1301, fd = 3 }
+fd_state.file_descriptor: 23329.111676043 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/syslog", pid = 1301, fd = 4 }
+fd_state.file_descriptor: 23329.111678301 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/daemon.log", pid = 1301, fd = 5 }
+fd_state.file_descriptor: 23329.111680598 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/kern.log", pid = 1301, fd = 6 }
+fd_state.file_descriptor: 23329.111682814 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/lpr.log", pid = 1301, fd = 7 }
+fd_state.file_descriptor: 23329.111685117 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/mail.log", pid = 1301, fd = 8 }
+fd_state.file_descriptor: 23329.111687296 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/user.log", pid = 1301, fd = 9 }
+fd_state.file_descriptor: 23329.111689475 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/mail.info", pid = 1301, fd = 10 }
+fd_state.file_descriptor: 23329.111691648 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/mail.warn", pid = 1301, fd = 11 }
+fd_state.file_descriptor: 23329.111693969 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/mail.err", pid = 1301, fd = 12 }
+fd_state.file_descriptor: 23329.111696389 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/news/news.crit", pid = 1301, fd = 13 }
+fd_state.file_descriptor: 23329.111698679 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/news/news.err", pid = 1301, fd = 14 }
+fd_state.file_descriptor: 23329.111701290 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/news/news.notice", pid = 1301, fd = 15 }
+fd_state.file_descriptor: 23329.111703691 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/debug", pid = 1301, fd = 16 }
+fd_state.file_descriptor: 23329.111705840 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/messages", pid = 1301, fd = 17 }
+fd_state.file_descriptor: 23329.111708105 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/xconsole", pid = 1301, fd = 18 }
+fd_state.file_descriptor: 23329.111710488 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/proc/kmsg", pid = 1301, fd = 19 }
+fd_state.file_descriptor: 23329.111718587 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/cache/xfstt/ttinfo.dir", pid = 1340, fd = 0 }
+fd_state.file_descriptor: 23329.111721161 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/share/fonts/truetype", pid = 1340, fd = 1 }
+fd_state.file_descriptor: 23329.111728495 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[4718]", pid = 1340, fd = 2 }
+fd_state.file_descriptor: 23329.111730977 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1347, fd = 0 }
+fd_state.file_descriptor: 23329.111732989 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1347, fd = 1 }
+fd_state.file_descriptor: 23329.111734952 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1347, fd = 2 }
+fd_state.file_descriptor: 23329.111740322 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/proc/acpi/event", pid = 1347, fd = 3 }
+fd_state.file_descriptor: 23329.111745168 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[4629]", pid = 1347, fd = 4 }
+fd_state.file_descriptor: 23329.111750008 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5624]", pid = 1347, fd = 5 }
+fd_state.file_descriptor: 23329.111752299 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[4631]", pid = 1347, fd = 6 }
+fd_state.file_descriptor: 23329.111757477 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6278]", pid = 1347, fd = 7 }
+fd_state.file_descriptor: 23329.111759903 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1372, fd = 0 }
+fd_state.file_descriptor: 23329.111762051 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1372, fd = 1 }
+fd_state.file_descriptor: 23329.111764119 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1372, fd = 2 }
+fd_state.file_descriptor: 23329.111771348 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/run/crond.pid", pid = 1372, fd = 3 }
+fd_state.file_descriptor: 23329.111773947 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1382, fd = 0 }
+fd_state.file_descriptor: 23329.111776033 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1382, fd = 1 }
+fd_state.file_descriptor: 23329.111778361 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1382, fd = 2 }
+fd_state.file_descriptor: 23329.111783182 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[4684]", pid = 1382, fd = 3 }
+fd_state.file_descriptor: 23329.111785201 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1382, fd = 4 }
+fd_state.file_descriptor: 23329.111787250 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 1382, fd = 5 }
+fd_state.file_descriptor: 23329.111795090 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[4687]", pid = 1382, fd = 6 }
+fd_state.file_descriptor: 23329.111797553 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[4688]", pid = 1382, fd = 7 }
+fd_state.file_descriptor: 23329.111802652 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5202]", pid = 1382, fd = 8 }
+fd_state.file_descriptor: 23329.111810251 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5579]", pid = 1382, fd = 9 }
+fd_state.file_descriptor: 23329.111815134 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5596]", pid = 1382, fd = 10 }
+fd_state.file_descriptor: 23329.111820616 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6118]", pid = 1382, fd = 11 }
+fd_state.file_descriptor: 23329.111826146 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6083]", pid = 1382, fd = 12 }
+fd_state.file_descriptor: 23329.111831054 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6290]", pid = 1382, fd = 13 }
+fd_state.file_descriptor: 23329.111838122 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6056]", pid = 1382, fd = 14 }
+fd_state.file_descriptor: 23329.111842943 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6371]", pid = 1382, fd = 15 }
+fd_state.file_descriptor: 23329.111848684 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6817]", pid = 1382, fd = 16 }
+fd_state.file_descriptor: 23329.111856475 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7140]", pid = 1382, fd = 17 }
+fd_state.file_descriptor: 23329.111862487 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[284224]", pid = 1382, fd = 18 }
+fd_state.file_descriptor: 23329.111870444 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[10556]", pid = 1382, fd = 19 }
+fd_state.file_descriptor: 23329.111877610 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7616]", pid = 1382, fd = 20 }
+fd_state.file_descriptor: 23329.111882680 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7817]", pid = 1382, fd = 21 }
+fd_state.file_descriptor: 23329.111893148 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[38299]", pid = 1382, fd = 22 }
+fd_state.file_descriptor: 23329.111898253 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[8055]", pid = 1382, fd = 23 }
+fd_state.file_descriptor: 23329.111906056 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[11683]", pid = 1382, fd = 24 }
+fd_state.file_descriptor: 23329.111913174 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[8117]", pid = 1382, fd = 25 }
+fd_state.file_descriptor: 23329.111921699 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[71978]", pid = 1382, fd = 26 }
+fd_state.file_descriptor: 23329.111924255 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1391, fd = 0 }
+fd_state.file_descriptor: 23329.111926267 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1391, fd = 1 }
+fd_state.file_descriptor: 23329.111928224 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1391, fd = 2 }
+fd_state.file_descriptor: 23329.111930533 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[4709]", pid = 1391, fd = 3 }
+fd_state.file_descriptor: 23329.111935712 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[4729]", pid = 1391, fd = 5 }
+fd_state.file_descriptor: 23329.111944175 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1421, fd = 0 }
+fd_state.file_descriptor: 23329.111946293 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1421, fd = 1 }
+fd_state.file_descriptor: 23329.111948355 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1421, fd = 2 }
+fd_state.file_descriptor: 23329.111951663 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/bin/mysqld_safe", pid = 1421, fd = 255 }
+fd_state.file_descriptor: 23329.111956589 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1545, fd = 0 }
+fd_state.file_descriptor: 23329.111963676 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[4832]", pid = 1545, fd = 1 }
+fd_state.file_descriptor: 23329.111965756 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[4832]", pid = 1545, fd = 2 }
+fd_state.file_descriptor: 23329.111968416 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/ibdata1", pid = 1545, fd = 3 }
+fd_state.file_descriptor: 23329.111971288 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/tmp/ibWgsRL4 (deleted)", pid = 1545, fd = 4 }
+fd_state.file_descriptor: 23329.111973546 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/tmp/ib6QYFtU (deleted)", pid = 1545, fd = 5 }
+fd_state.file_descriptor: 23329.111975806 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/tmp/ibZZTubK (deleted)", pid = 1545, fd = 6 }
+fd_state.file_descriptor: 23329.111977979 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/tmp/ibeqovYz (deleted)", pid = 1545, fd = 7 }
+fd_state.file_descriptor: 23329.111983257 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/ib_logfile0", pid = 1545, fd = 8 }
+fd_state.file_descriptor: 23329.111985658 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/ib_logfile1", pid = 1545, fd = 9 }
+fd_state.file_descriptor: 23329.111988170 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[4852]", pid = 1545, fd = 10 }
+fd_state.file_descriptor: 23329.111990362 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/tmp/ib8hyH7p (deleted)", pid = 1545, fd = 11 }
+fd_state.file_descriptor: 23329.111992640 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[4853]", pid = 1545, fd = 12 }
+fd_state.file_descriptor: 23329.111995226 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/host.MYI", pid = 1545, fd = 13 }
+fd_state.file_descriptor: 23329.111997646 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/host.MYD", pid = 1545, fd = 14 }
+fd_state.file_descriptor: 23329.112000091 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/user.MYI", pid = 1545, fd = 15 }
+fd_state.file_descriptor: 23329.112002554 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/user.MYD", pid = 1545, fd = 16 }
+fd_state.file_descriptor: 23329.112004986 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/db.MYI", pid = 1545, fd = 17 }
+fd_state.file_descriptor: 23329.112007332 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/db.MYD", pid = 1545, fd = 18 }
+fd_state.file_descriptor: 23329.112012351 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/tables_priv.MYI", pid = 1545, fd = 19 }
+fd_state.file_descriptor: 23329.112014943 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/tables_priv.MYD", pid = 1545, fd = 20 }
+fd_state.file_descriptor: 23329.112017468 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/columns_priv.MYI", pid = 1545, fd = 21 }
+fd_state.file_descriptor: 23329.112020295 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/columns_priv.MYD", pid = 1545, fd = 22 }
+fd_state.file_descriptor: 23329.112022876 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/procs_priv.MYI", pid = 1545, fd = 23 }
+fd_state.file_descriptor: 23329.112025296 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/procs_priv.MYD", pid = 1545, fd = 24 }
+fd_state.file_descriptor: 23329.112027771 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/servers.MYI", pid = 1545, fd = 25 }
+fd_state.file_descriptor: 23329.112030289 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/servers.MYD", pid = 1545, fd = 26 }
+fd_state.file_descriptor: 23329.112035358 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/event.MYI", pid = 1545, fd = 27 }
+fd_state.file_descriptor: 23329.112037827 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/event.MYD", pid = 1545, fd = 28 }
+fd_state.file_descriptor: 23329.112040537 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/func.MYI", pid = 1545, fd = 32 }
+fd_state.file_descriptor: 23329.112043005 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/func.MYD", pid = 1545, fd = 33 }
+fd_state.file_descriptor: 23329.112048024 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/general_log.CSM", pid = 1545, fd = 34 }
+fd_state.file_descriptor: 23329.112052827 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/general_log.CSV", pid = 1545, fd = 35 }
+fd_state.file_descriptor: 23329.112057790 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/help_category.MYI", pid = 1545, fd = 36 }
+fd_state.file_descriptor: 23329.112060914 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/help_category.MYD", pid = 1545, fd = 37 }
+fd_state.file_descriptor: 23329.112063519 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/help_keyword.MYI", pid = 1545, fd = 38 }
+fd_state.file_descriptor: 23329.112066111 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/help_keyword.MYD", pid = 1545, fd = 39 }
+fd_state.file_descriptor: 23329.112068754 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/help_relation.MYI", pid = 1545, fd = 40 }
+fd_state.file_descriptor: 23329.112073636 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/help_relation.MYD", pid = 1545, fd = 41 }
+fd_state.file_descriptor: 23329.112076205 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/help_topic.MYI", pid = 1545, fd = 42 }
+fd_state.file_descriptor: 23329.112078921 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/help_topic.MYD", pid = 1545, fd = 43 }
+fd_state.file_descriptor: 23329.112084186 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/ndb_binlog_index.MYI", pid = 1545, fd = 44 }
+fd_state.file_descriptor: 23329.112086724 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/ndb_binlog_index.MYD", pid = 1545, fd = 45 }
+fd_state.file_descriptor: 23329.112089224 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/plugin.MYI", pid = 1545, fd = 46 }
+fd_state.file_descriptor: 23329.112091668 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/plugin.MYD", pid = 1545, fd = 47 }
+fd_state.file_descriptor: 23329.112094260 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/proc.MYI", pid = 1545, fd = 48 }
+fd_state.file_descriptor: 23329.112096760 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/proc.MYD", pid = 1545, fd = 49 }
+fd_state.file_descriptor: 23329.112099212 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/slow_log.CSM", pid = 1545, fd = 50 }
+fd_state.file_descriptor: 23329.112101934 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/slow_log.CSV", pid = 1545, fd = 51 }
+fd_state.file_descriptor: 23329.112104447 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/time_zone.MYI", pid = 1545, fd = 52 }
+fd_state.file_descriptor: 23329.112106965 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/time_zone.MYD", pid = 1545, fd = 53 }
+fd_state.file_descriptor: 23329.112109669 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/time_zone_leap_second.MYI", pid = 1545, fd = 54 }
+fd_state.file_descriptor: 23329.112112205 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/time_zone_leap_second.MYD", pid = 1545, fd = 55 }
+fd_state.file_descriptor: 23329.112114755 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/time_zone_name.MYI", pid = 1545, fd = 56 }
+fd_state.file_descriptor: 23329.112117231 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/time_zone_name.MYD", pid = 1545, fd = 57 }
+fd_state.file_descriptor: 23329.112120020 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/time_zone_transition.MYI", pid = 1545, fd = 58 }
+fd_state.file_descriptor: 23329.112122564 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/time_zone_transition.MYD", pid = 1545, fd = 59 }
+fd_state.file_descriptor: 23329.112125317 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/time_zone_transition_type.MYI", pid = 1545, fd = 60 }
+fd_state.file_descriptor: 23329.112127848 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/mysql/mysql/time_zone_transition_type.MYD", pid = 1545, fd = 61 }
+fd_state.file_descriptor: 23329.112133774 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[4832]", pid = 1546, fd = 0 }
+fd_state.file_descriptor: 23329.112135978 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[4845]", pid = 1546, fd = 1 }
+fd_state.file_descriptor: 23329.112138003 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1546, fd = 2 }
+fd_state.file_descriptor: 23329.112141342 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1623, fd = 0 }
+fd_state.file_descriptor: 23329.112143694 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1623, fd = 1 }
+fd_state.file_descriptor: 23329.112145713 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1623, fd = 2 }
+fd_state.file_descriptor: 23329.112148121 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[4999]", pid = 1623, fd = 3 }
+fd_state.file_descriptor: 23329.112150577 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1642, fd = 0 }
+fd_state.file_descriptor: 23329.112152547 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1642, fd = 1 }
+fd_state.file_descriptor: 23329.112154460 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1642, fd = 2 }
+fd_state.file_descriptor: 23329.112156664 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/vboxguest", pid = 1642, fd = 3 }
+fd_state.file_descriptor: 23329.112159282 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1658, fd = 0 }
+fd_state.file_descriptor: 23329.112161350 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1658, fd = 1 }
+fd_state.file_descriptor: 23329.112163368 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1658, fd = 2 }
+fd_state.file_descriptor: 23329.112165782 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[5199]", pid = 1658, fd = 5 }
+fd_state.file_descriptor: 23329.112167912 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[5199]", pid = 1658, fd = 6 }
+fd_state.file_descriptor: 23329.112170146 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5200]", pid = 1658, fd = 7 }
+fd_state.file_descriptor: 23329.112172578 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5201]", pid = 1658, fd = 8 }
+fd_state.file_descriptor: 23329.112175078 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5205]", pid = 1658, fd = 9 }
+fd_state.file_descriptor: 23329.112180022 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5235]", pid = 1658, fd = 10 }
+fd_state.file_descriptor: 23329.112182073 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 1658, fd = 11 }
+fd_state.file_descriptor: 23329.112186906 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5248]", pid = 1658, fd = 12 }
+fd_state.file_descriptor: 23329.112189573 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/proc/1658/mounts", pid = 1658, fd = 13 }
+fd_state.file_descriptor: 23329.112194512 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5612]", pid = 1658, fd = 14 }
+fd_state.file_descriptor: 23329.112199233 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5639]", pid = 1658, fd = 17 }
+fd_state.file_descriptor: 23329.112201616 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5608]", pid = 1658, fd = 19 }
+fd_state.file_descriptor: 23329.112204005 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5610]", pid = 1658, fd = 21 }
+fd_state.file_descriptor: 23329.112206234 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1659, fd = 0 }
+fd_state.file_descriptor: 23329.112208190 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1659, fd = 1 }
+fd_state.file_descriptor: 23329.112210160 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1659, fd = 2 }
+fd_state.file_descriptor: 23329.112212456 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5234]", pid = 1659, fd = 3 }
+fd_state.file_descriptor: 23329.112215259 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1732, fd = 0 }
+fd_state.file_descriptor: 23329.112217808 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1732, fd = 1 }
+fd_state.file_descriptor: 23329.112219808 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1732, fd = 2 }
+fd_state.file_descriptor: 23329.112222154 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5578]", pid = 1732, fd = 3 }
+fd_state.file_descriptor: 23329.112224506 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5585]", pid = 1732, fd = 4 }
+fd_state.file_descriptor: 23329.112226858 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1734, fd = 0 }
+fd_state.file_descriptor: 23329.112228815 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1734, fd = 1 }
+fd_state.file_descriptor: 23329.112230871 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1734, fd = 2 }
+fd_state.file_descriptor: 23329.112233204 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5595]", pid = 1734, fd = 3 }
+fd_state.file_descriptor: 23329.112235753 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5607]", pid = 1734, fd = 4 }
+fd_state.file_descriptor: 23329.112238062 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1736, fd = 0 }
+fd_state.file_descriptor: 23329.112240019 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1736, fd = 1 }
+fd_state.file_descriptor: 23329.112241927 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1736, fd = 2 }
+fd_state.file_descriptor: 23329.112244371 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5611]", pid = 1736, fd = 3 }
+fd_state.file_descriptor: 23329.112249549 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5623]", pid = 1736, fd = 4 }
+fd_state.file_descriptor: 23329.112251902 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1741, fd = 0 }
+fd_state.file_descriptor: 23329.112254254 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1741, fd = 1 }
+fd_state.file_descriptor: 23329.112256216 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1741, fd = 2 }
+fd_state.file_descriptor: 23329.112258421 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5638]", pid = 1741, fd = 3 }
+fd_state.file_descriptor: 23329.112263390 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/input/event2", pid = 1741, fd = 4 }
+fd_state.file_descriptor: 23329.112265823 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/input/event1", pid = 1741, fd = 5 }
+fd_state.file_descriptor: 23329.112268242 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/input/event0", pid = 1741, fd = 6 }
+fd_state.file_descriptor: 23329.112270649 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1758, fd = 0 }
+fd_state.file_descriptor: 23329.112272693 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1758, fd = 1 }
+fd_state.file_descriptor: 23329.112275143 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/samba/log.nmbd", pid = 1758, fd = 2 }
+fd_state.file_descriptor: 23329.112277310 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/samba/log.nmbd", pid = 1758, fd = 3 }
+fd_state.file_descriptor: 23329.112279853 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/messages.tdb", pid = 1758, fd = 4 }
+fd_state.file_descriptor: 23329.112282292 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[5688]", pid = 1758, fd = 5 }
+fd_state.file_descriptor: 23329.112284477 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[5688]", pid = 1758, fd = 6 }
+fd_state.file_descriptor: 23329.112289959 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/nmbd.pid", pid = 1758, fd = 7 }
+fd_state.file_descriptor: 23329.112295342 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/connections.tdb", pid = 1758, fd = 8 }
+fd_state.file_descriptor: 23329.112297854 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5691]", pid = 1758, fd = 9 }
+fd_state.file_descriptor: 23329.112300182 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5692]", pid = 1758, fd = 10 }
+fd_state.file_descriptor: 23329.112302478 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5694]", pid = 1758, fd = 11 }
+fd_state.file_descriptor: 23329.112304774 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5695]", pid = 1758, fd = 12 }
+fd_state.file_descriptor: 23329.112309454 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[5700]", pid = 1758, fd = 13 }
+fd_state.file_descriptor: 23329.112311522 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[5700]", pid = 1758, fd = 14 }
+fd_state.file_descriptor: 23329.112314256 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1767, fd = 0 }
+fd_state.file_descriptor: 23329.112316367 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1767, fd = 1 }
+fd_state.file_descriptor: 23329.112321090 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/samba/log.smbd", pid = 1767, fd = 2 }
+fd_state.file_descriptor: 23329.112323404 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/urandom", pid = 1767, fd = 3 }
+fd_state.file_descriptor: 23329.112328416 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/secrets.tdb", pid = 1767, fd = 4 }
+fd_state.file_descriptor: 23329.112331263 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/messages.tdb", pid = 1767, fd = 5 }
+fd_state.file_descriptor: 23329.112335881 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[5730]", pid = 1767, fd = 6 }
+fd_state.file_descriptor: 23329.112337893 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[5730]", pid = 1767, fd = 7 }
+fd_state.file_descriptor: 23329.112340077 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/samba/log.smbd", pid = 1767, fd = 8 }
+fd_state.file_descriptor: 23329.112342491 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/smbd.pid", pid = 1767, fd = 9 }
+fd_state.file_descriptor: 23329.112344899 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/sessionid.tdb", pid = 1767, fd = 10 }
+fd_state.file_descriptor: 23329.112347238 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/connections.tdb", pid = 1767, fd = 11 }
+fd_state.file_descriptor: 23329.112349603 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/brlock.tdb", pid = 1767, fd = 12 }
+fd_state.file_descriptor: 23329.112352115 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/locking.tdb", pid = 1767, fd = 13 }
+fd_state.file_descriptor: 23329.112354455 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/gencache.tdb", pid = 1767, fd = 14 }
+fd_state.file_descriptor: 23329.112356831 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/ntdrivers.tdb", pid = 1767, fd = 15 }
+fd_state.file_descriptor: 23329.112359239 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/passdb.tdb", pid = 1767, fd = 16 }
+fd_state.file_descriptor: 23329.112361813 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/account_policy.tdb", pid = 1767, fd = 17 }
+fd_state.file_descriptor: 23329.112364202 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/group_mapping.ldb", pid = 1767, fd = 18 }
+fd_state.file_descriptor: 23329.112369517 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/ntprinters.tdb", pid = 1767, fd = 19 }
+fd_state.file_descriptor: 23329.112371844 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/ntforms.tdb", pid = 1767, fd = 20 }
+fd_state.file_descriptor: 23329.112374159 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[5750]", pid = 1767, fd = 21 }
+fd_state.file_descriptor: 23329.112376548 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5756]", pid = 1767, fd = 22 }
+fd_state.file_descriptor: 23329.112378802 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5758]", pid = 1767, fd = 23 }
+fd_state.file_descriptor: 23329.112383283 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[5759]", pid = 1767, fd = 24 }
+fd_state.file_descriptor: 23329.112385376 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[5759]", pid = 1767, fd = 25 }
+fd_state.file_descriptor: 23329.112387642 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1777, fd = 0 }
+fd_state.file_descriptor: 23329.112389710 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1777, fd = 1 }
+fd_state.file_descriptor: 23329.112392024 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/samba/log.smbd", pid = 1777, fd = 2 }
+fd_state.file_descriptor: 23329.112394129 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/urandom", pid = 1777, fd = 3 }
+fd_state.file_descriptor: 23329.112396377 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/secrets.tdb", pid = 1777, fd = 4 }
+fd_state.file_descriptor: 23329.112398766 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/messages.tdb", pid = 1777, fd = 5 }
+fd_state.file_descriptor: 23329.112403395 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[5751]", pid = 1777, fd = 6 }
+fd_state.file_descriptor: 23329.112405951 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[5751]", pid = 1777, fd = 7 }
+fd_state.file_descriptor: 23329.112408148 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/samba/log.smbd", pid = 1777, fd = 8 }
+fd_state.file_descriptor: 23329.112410402 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/smbd.pid", pid = 1777, fd = 9 }
+fd_state.file_descriptor: 23329.112412654 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/sessionid.tdb", pid = 1777, fd = 10 }
+fd_state.file_descriptor: 23329.112414975 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/connections.tdb", pid = 1777, fd = 11 }
+fd_state.file_descriptor: 23329.112417185 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/brlock.tdb", pid = 1777, fd = 12 }
+fd_state.file_descriptor: 23329.112419482 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/locking.tdb", pid = 1777, fd = 13 }
+fd_state.file_descriptor: 23329.112421679 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/run/samba/gencache.tdb", pid = 1777, fd = 14 }
+fd_state.file_descriptor: 23329.112423883 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/ntdrivers.tdb", pid = 1777, fd = 15 }
+fd_state.file_descriptor: 23329.112426068 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/passdb.tdb", pid = 1777, fd = 16 }
+fd_state.file_descriptor: 23329.112428235 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/account_policy.tdb", pid = 1777, fd = 17 }
+fd_state.file_descriptor: 23329.112430439 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/group_mapping.ldb", pid = 1777, fd = 18 }
+fd_state.file_descriptor: 23329.112432729 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/ntprinters.tdb", pid = 1777, fd = 19 }
+fd_state.file_descriptor: 23329.112434890 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lib/samba/ntforms.tdb", pid = 1777, fd = 20 }
+fd_state.file_descriptor: 23329.112439631 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[5752]", pid = 1777, fd = 21 }
+fd_state.file_descriptor: 23329.112442081 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[5750]", pid = 1777, fd = 22 }
+fd_state.file_descriptor: 23329.112444168 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[5752]", pid = 1777, fd = 23 }
+fd_state.file_descriptor: 23329.112449267 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1815, fd = 0 }
+fd_state.file_descriptor: 23329.112451415 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1815, fd = 1 }
+fd_state.file_descriptor: 23329.112453440 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1815, fd = 2 }
+fd_state.file_descriptor: 23329.112458551 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5836]", pid = 1815, fd = 3 }
+fd_state.file_descriptor: 23329.112461002 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[5839]", pid = 1815, fd = 4 }
+fd_state.file_descriptor: 23329.112463526 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/tty1", pid = 1840, fd = 0 }
+fd_state.file_descriptor: 23329.112465459 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/tty1", pid = 1840, fd = 1 }
+fd_state.file_descriptor: 23329.112467373 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/tty1", pid = 1840, fd = 2 }
+fd_state.file_descriptor: 23329.112472367 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6116]", pid = 1840, fd = 3 }
+fd_state.file_descriptor: 23329.112474570 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6117]", pid = 1840, fd = 4 }
+fd_state.file_descriptor: 23329.112479792 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/tty2", pid = 1841, fd = 0 }
+fd_state.file_descriptor: 23329.112481775 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/tty2", pid = 1841, fd = 1 }
+fd_state.file_descriptor: 23329.112483731 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/tty2", pid = 1841, fd = 2 }
+fd_state.file_descriptor: 23329.112488510 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/tty3", pid = 1842, fd = 0 }
+fd_state.file_descriptor: 23329.112490540 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/tty3", pid = 1842, fd = 1 }
+fd_state.file_descriptor: 23329.112492484 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/tty3", pid = 1842, fd = 2 }
+fd_state.file_descriptor: 23329.112497417 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/tty4", pid = 1843, fd = 0 }
+fd_state.file_descriptor: 23329.112499392 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/tty4", pid = 1843, fd = 1 }
+fd_state.file_descriptor: 23329.112501330 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/tty4", pid = 1843, fd = 2 }
+fd_state.file_descriptor: 23329.112505917 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/tty5", pid = 1844, fd = 0 }
+fd_state.file_descriptor: 23329.112507898 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/tty5", pid = 1844, fd = 1 }
+fd_state.file_descriptor: 23329.112509806 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/tty5", pid = 1844, fd = 2 }
+fd_state.file_descriptor: 23329.112512454 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/tty6", pid = 1845, fd = 0 }
+fd_state.file_descriptor: 23329.112514775 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/tty6", pid = 1845, fd = 1 }
+fd_state.file_descriptor: 23329.112516701 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/tty6", pid = 1845, fd = 2 }
+fd_state.file_descriptor: 23329.112519029 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1881, fd = 0 }
+fd_state.file_descriptor: 23329.112520955 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1881, fd = 1 }
+fd_state.file_descriptor: 23329.112522856 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1881, fd = 2 }
+fd_state.file_descriptor: 23329.112527819 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6053]", pid = 1881, fd = 3 }
+fd_state.file_descriptor: 23329.112529807 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1881, fd = 4 }
+fd_state.file_descriptor: 23329.112531912 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6053]", pid = 1881, fd = 5 }
+fd_state.file_descriptor: 23329.112534227 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6054]", pid = 1881, fd = 6 }
+fd_state.file_descriptor: 23329.112536350 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6054]", pid = 1881, fd = 7 }
+fd_state.file_descriptor: 23329.112538634 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6055]", pid = 1881, fd = 8 }
+fd_state.file_descriptor: 23329.112540906 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/run/console", pid = 1881, fd = 9 }
+fd_state.file_descriptor: 23329.112543419 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/ConsoleKit/history", pid = 1881, fd = 10 }
+fd_state.file_descriptor: 23329.112545868 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6082]", pid = 1881, fd = 11 }
+fd_state.file_descriptor: 23329.112550580 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/tty0", pid = 1881, fd = 12 }
+fd_state.file_descriptor: 23329.112555264 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 1881, fd = 13 }
+fd_state.file_descriptor: 23329.112559931 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6080]", pid = 1881, fd = 14 }
+fd_state.file_descriptor: 23329.112562054 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6080]", pid = 1881, fd = 15 }
+fd_state.file_descriptor: 23329.112564488 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/tty1", pid = 1957, fd = 0 }
+fd_state.file_descriptor: 23329.112566450 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/tty1", pid = 1957, fd = 1 }
+fd_state.file_descriptor: 23329.112568332 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/tty1", pid = 1957, fd = 2 }
+fd_state.file_descriptor: 23329.112571160 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/tty1", pid = 1957, fd = 255 }
+fd_state.file_descriptor: 23329.112573623 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1987, fd = 0 }
+fd_state.file_descriptor: 23329.112575864 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/kdm.log", pid = 1987, fd = 1 }
+fd_state.file_descriptor: 23329.112577944 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/kdm.log", pid = 1987, fd = 2 }
+fd_state.file_descriptor: 23329.112580333 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/run/kdm.pid", pid = 1987, fd = 3 }
+fd_state.file_descriptor: 23329.112585216 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6237]", pid = 1987, fd = 4 }
+fd_state.file_descriptor: 23329.112587728 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6237]", pid = 1987, fd = 5 }
+fd_state.file_descriptor: 23329.112590099 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6283]", pid = 1987, fd = 6 }
+fd_state.file_descriptor: 23329.112594939 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6239]", pid = 1987, fd = 7 }
+fd_state.file_descriptor: 23329.112597352 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7815]", pid = 1987, fd = 8 }
+fd_state.file_descriptor: 23329.112601970 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6286]", pid = 1987, fd = 9 }
+fd_state.file_descriptor: 23329.112606661 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6288]", pid = 1987, fd = 11 }
+fd_state.file_descriptor: 23329.112611730 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/Xorg.0.log", pid = 1989, fd = 0 }
+fd_state.file_descriptor: 23329.112616365 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6244]", pid = 1989, fd = 1 }
+fd_state.file_descriptor: 23329.112618421 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/kdm.log", pid = 1989, fd = 2 }
+fd_state.file_descriptor: 23329.112620915 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6245]", pid = 1989, fd = 3 }
+fd_state.file_descriptor: 23329.112628724 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/lib/xorg/protocol.txt", pid = 1989, fd = 4 }
+fd_state.file_descriptor: 23329.112650002 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/tty8", pid = 1989, fd = 5 }
+fd_state.file_descriptor: 23329.112652539 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/proc/mtrr", pid = 1989, fd = 6 }
+fd_state.file_descriptor: 23329.112655311 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6277]", pid = 1989, fd = 7 }
+fd_state.file_descriptor: 23329.112657546 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/vboxguest", pid = 1989, fd = 8 }
+fd_state.file_descriptor: 23329.112668151 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/sys/devices/pci0000:00/0000:00:02.0/config", pid = 1989, fd = 9 }
+fd_state.file_descriptor: 23329.112670410 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/proc/mtrr", pid = 1989, fd = 10 }
+fd_state.file_descriptor: 23329.112672886 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/dri/card0", pid = 1989, fd = 11 }
+fd_state.file_descriptor: 23329.112675139 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/input/mice", pid = 1989, fd = 12 }
+fd_state.file_descriptor: 23329.112677540 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6289]", pid = 1989, fd = 13 }
+fd_state.file_descriptor: 23329.112679744 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/input/event0", pid = 1989, fd = 14 }
+fd_state.file_descriptor: 23329.112682207 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/input/event2", pid = 1989, fd = 15 }
+fd_state.file_descriptor: 23329.112684973 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/input/event1", pid = 1989, fd = 16 }
+fd_state.file_descriptor: 23329.112689603 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/input/event4", pid = 1989, fd = 17 }
+fd_state.file_descriptor: 23329.112691739 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/vboxguest", pid = 1989, fd = 18 }
+fd_state.file_descriptor: 23329.112694115 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6300]", pid = 1989, fd = 19 }
+fd_state.file_descriptor: 23329.112698856 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6610]", pid = 1989, fd = 20 }
+fd_state.file_descriptor: 23329.112703585 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6622]", pid = 1989, fd = 21 }
+fd_state.file_descriptor: 23329.112705739 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6337]", pid = 1989, fd = 22 }
+fd_state.file_descriptor: 23329.112708066 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6624]", pid = 1989, fd = 23 }
+fd_state.file_descriptor: 23329.112710369 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6632]", pid = 1989, fd = 24 }
+fd_state.file_descriptor: 23329.112714838 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6650]", pid = 1989, fd = 25 }
+fd_state.file_descriptor: 23329.112717190 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6662]", pid = 1989, fd = 26 }
+fd_state.file_descriptor: 23329.112719511 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6665]", pid = 1989, fd = 27 }
+fd_state.file_descriptor: 23329.112724980 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7480]", pid = 1989, fd = 28 }
+fd_state.file_descriptor: 23329.112729610 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6759]", pid = 1989, fd = 29 }
+fd_state.file_descriptor: 23329.112734184 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6776]", pid = 1989, fd = 30 }
+fd_state.file_descriptor: 23329.112736857 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[188220]", pid = 1989, fd = 31 }
+fd_state.file_descriptor: 23329.112741789 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6886]", pid = 1989, fd = 32 }
+fd_state.file_descriptor: 23329.112744191 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7009]", pid = 1989, fd = 33 }
+fd_state.file_descriptor: 23329.112749012 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7089]", pid = 1989, fd = 34 }
+fd_state.file_descriptor: 23329.112753809 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7040]", pid = 1989, fd = 35 }
+fd_state.file_descriptor: 23329.112758513 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7111]", pid = 1989, fd = 37 }
+fd_state.file_descriptor: 23329.112763820 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7503]", pid = 1989, fd = 38 }
+fd_state.file_descriptor: 23329.112768500 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7522]", pid = 1989, fd = 39 }
+fd_state.file_descriptor: 23329.112773205 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7732]", pid = 1989, fd = 40 }
+fd_state.file_descriptor: 23329.112777927 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7667]", pid = 1989, fd = 41 }
+fd_state.file_descriptor: 23329.112782513 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7742]", pid = 1989, fd = 42 }
+fd_state.file_descriptor: 23329.112787081 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7748]", pid = 1989, fd = 43 }
+fd_state.file_descriptor: 23329.112789445 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7753]", pid = 1989, fd = 44 }
+fd_state.file_descriptor: 23329.112791914 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7914]", pid = 1989, fd = 45 }
+fd_state.file_descriptor: 23329.112796983 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7973]", pid = 1989, fd = 46 }
+fd_state.file_descriptor: 23329.112799872 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[8459]", pid = 1989, fd = 48 }
+fd_state.file_descriptor: 23329.112802575 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[284025]", pid = 1989, fd = 49 }
+fd_state.file_descriptor: 23329.112808298 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[79255]", pid = 1989, fd = 50 }
+fd_state.file_descriptor: 23329.112814557 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[79260]", pid = 1989, fd = 52 }
+fd_state.file_descriptor: 23329.112817545 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 1993, fd = 0 }
+fd_state.file_descriptor: 23329.112819700 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/kdm.log", pid = 1993, fd = 1 }
+fd_state.file_descriptor: 23329.112821724 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/log/kdm.log", pid = 1993, fd = 2 }
+fd_state.file_descriptor: 23329.112824021 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6291]", pid = 1993, fd = 3 }
+fd_state.file_descriptor: 23329.112826435 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6370]", pid = 1993, fd = 4 }
+fd_state.file_descriptor: 23329.112828768 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6456]", pid = 1993, fd = 5 }
+fd_state.file_descriptor: 23329.112833972 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6285]", pid = 1993, fd = 8 }
+fd_state.file_descriptor: 23329.112836404 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6287]", pid = 1993, fd = 10 }
+fd_state.file_descriptor: 23329.112842188 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2001, fd = 0 }
+fd_state.file_descriptor: 23329.112844330 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2001, fd = 1 }
+fd_state.file_descriptor: 23329.112846318 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2001, fd = 2 }
+fd_state.file_descriptor: 23329.112848646 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6319]", pid = 2001, fd = 3 }
+fd_state.file_descriptor: 23329.112850632 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2001, fd = 4 }
+fd_state.file_descriptor: 23329.112852972 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6336]", pid = 2001, fd = 5 }
+fd_state.file_descriptor: 23329.112857819 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6325]", pid = 2001, fd = 8 }
+fd_state.file_descriptor: 23329.112862509 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2002, fd = 0 }
+fd_state.file_descriptor: 23329.112864503 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2002, fd = 1 }
+fd_state.file_descriptor: 23329.112866442 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2002, fd = 2 }
+fd_state.file_descriptor: 23329.112868769 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6330]", pid = 2002, fd = 3 }
+fd_state.file_descriptor: 23329.112870695 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2002, fd = 4 }
+fd_state.file_descriptor: 23329.112872775 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 2002, fd = 5 }
+fd_state.file_descriptor: 23329.112875090 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6331]", pid = 2002, fd = 6 }
+fd_state.file_descriptor: 23329.112877609 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6332]", pid = 2002, fd = 7 }
+fd_state.file_descriptor: 23329.112882560 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2015, fd = 0 }
+fd_state.file_descriptor: 23329.112887782 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2015, fd = 1 }
+fd_state.file_descriptor: 23329.112890005 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2015, fd = 2 }
+fd_state.file_descriptor: 23329.112893455 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/bin/startkde", pid = 2015, fd = 255 }
+fd_state.file_descriptor: 23329.112895746 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2086, fd = 0 }
+fd_state.file_descriptor: 23329.112897696 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2086, fd = 1 }
+fd_state.file_descriptor: 23329.112899659 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2086, fd = 2 }
+fd_state.file_descriptor: 23329.112904783 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/vboxuser", pid = 2086, fd = 3 }
+fd_state.file_descriptor: 23329.112909771 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.vboxclient-clipboard.pid", pid = 2086, fd = 4 }
+fd_state.file_descriptor: 23329.112912185 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6609]", pid = 2086, fd = 5 }
+fd_state.file_descriptor: 23329.112914561 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6613]", pid = 2086, fd = 6 }
+fd_state.file_descriptor: 23329.112916956 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6613]", pid = 2086, fd = 7 }
+fd_state.file_descriptor: 23329.112919450 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2095, fd = 0 }
+fd_state.file_descriptor: 23329.112921505 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2095, fd = 1 }
+fd_state.file_descriptor: 23329.112923432 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2095, fd = 2 }
+fd_state.file_descriptor: 23329.112925445 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/vboxuser", pid = 2095, fd = 3 }
+fd_state.file_descriptor: 23329.112927857 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.vboxclient-display.pid", pid = 2095, fd = 4 }
+fd_state.file_descriptor: 23329.112930425 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6661]", pid = 2095, fd = 5 }
+fd_state.file_descriptor: 23329.112932840 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6664]", pid = 2095, fd = 6 }
+fd_state.file_descriptor: 23329.112935118 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2099, fd = 0 }
+fd_state.file_descriptor: 23329.112937024 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2099, fd = 1 }
+fd_state.file_descriptor: 23329.112938901 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2099, fd = 2 }
+fd_state.file_descriptor: 23329.112940889 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/vboxuser", pid = 2099, fd = 3 }
+fd_state.file_descriptor: 23329.112945636 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.vboxclient-seamless.pid", pid = 2099, fd = 4 }
+fd_state.file_descriptor: 23329.112948161 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6621]", pid = 2099, fd = 5 }
+fd_state.file_descriptor: 23329.112950531 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6623]", pid = 2099, fd = 6 }
+fd_state.file_descriptor: 23329.112953210 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2104, fd = 0 }
+fd_state.file_descriptor: 23329.112955235 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2104, fd = 1 }
+fd_state.file_descriptor: 23329.112957161 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2104, fd = 2 }
+fd_state.file_descriptor: 23329.112959439 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6629]", pid = 2104, fd = 3 }
+fd_state.file_descriptor: 23329.112961680 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2110, fd = 0 }
+fd_state.file_descriptor: 23329.112963877 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2110, fd = 1 }
+fd_state.file_descriptor: 23329.112965828 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2110, fd = 2 }
+fd_state.file_descriptor: 23329.112968155 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6631]", pid = 2110, fd = 3 }
+fd_state.file_descriptor: 23329.112970075 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2110, fd = 4 }
+fd_state.file_descriptor: 23329.112972569 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6649]", pid = 2110, fd = 5 }
+fd_state.file_descriptor: 23329.112975026 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6638]", pid = 2110, fd = 8 }
+fd_state.file_descriptor: 23329.112980280 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2114, fd = 0 }
+fd_state.file_descriptor: 23329.112982273 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2114, fd = 1 }
+fd_state.file_descriptor: 23329.112984212 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2114, fd = 2 }
+fd_state.file_descriptor: 23329.112986521 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6644]", pid = 2114, fd = 3 }
+fd_state.file_descriptor: 23329.112988922 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2114, fd = 4 }
+fd_state.file_descriptor: 23329.112991075 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 2114, fd = 5 }
+fd_state.file_descriptor: 23329.112993422 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6647]", pid = 2114, fd = 6 }
+fd_state.file_descriptor: 23329.112995792 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6648]", pid = 2114, fd = 7 }
+fd_state.file_descriptor: 23329.113000929 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6753]", pid = 2114, fd = 8 }
+fd_state.file_descriptor: 23329.113003281 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6766]", pid = 2114, fd = 9 }
+fd_state.file_descriptor: 23329.113005533 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6977]", pid = 2114, fd = 11 }
+fd_state.file_descriptor: 23329.113008008 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7011]", pid = 2114, fd = 12 }
+fd_state.file_descriptor: 23329.113015817 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7027]", pid = 2114, fd = 13 }
+fd_state.file_descriptor: 23329.113018336 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7078]", pid = 2114, fd = 14 }
+fd_state.file_descriptor: 23329.113023244 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7092]", pid = 2114, fd = 16 }
+fd_state.file_descriptor: 23329.113028373 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7469]", pid = 2114, fd = 17 }
+fd_state.file_descriptor: 23329.113033238 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7721]", pid = 2114, fd = 18 }
+fd_state.file_descriptor: 23329.113040281 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7489]", pid = 2114, fd = 19 }
+fd_state.file_descriptor: 23329.113047769 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[8421]", pid = 2114, fd = 20 }
+fd_state.file_descriptor: 23329.113050134 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7508]", pid = 2114, fd = 21 }
+fd_state.file_descriptor: 23329.113052480 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7670]", pid = 2114, fd = 22 }
+fd_state.file_descriptor: 23329.113057474 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7760]", pid = 2114, fd = 23 }
+fd_state.file_descriptor: 23329.113064670 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7766]", pid = 2114, fd = 24 }
+fd_state.file_descriptor: 23329.113069845 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7778]", pid = 2114, fd = 25 }
+fd_state.file_descriptor: 23329.113077122 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7864]", pid = 2114, fd = 27 }
+fd_state.file_descriptor: 23329.113082332 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[38268]", pid = 2114, fd = 28 }
+fd_state.file_descriptor: 23329.113087548 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[38303]", pid = 2114, fd = 30 }
+fd_state.file_descriptor: 23329.113094542 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[38316]", pid = 2114, fd = 31 }
+fd_state.file_descriptor: 23329.113099771 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[38308]", pid = 2114, fd = 32 }
+fd_state.file_descriptor: 23329.113102512 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[188702]", pid = 2114, fd = 33 }
+fd_state.file_descriptor: 23329.113108222 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[71973]", pid = 2114, fd = 35 }
+fd_state.file_descriptor: 23329.113113160 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[79275]", pid = 2114, fd = 37 }
+fd_state.file_descriptor: 23329.113116124 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2161, fd = 0 }
+fd_state.file_descriptor: 23329.113118297 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2161, fd = 1 }
+fd_state.file_descriptor: 23329.113120463 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2161, fd = 2 }
+fd_state.file_descriptor: 23329.113128735 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6742]", pid = 2161, fd = 3 }
+fd_state.file_descriptor: 23329.113133390 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6745]", pid = 2161, fd = 4 }
+fd_state.file_descriptor: 23329.113135550 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6742]", pid = 2161, fd = 5 }
+fd_state.file_descriptor: 23329.113137890 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6743]", pid = 2161, fd = 6 }
+fd_state.file_descriptor: 23329.113139878 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6745]", pid = 2161, fd = 7 }
+fd_state.file_descriptor: 23329.113142173 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6758]", pid = 2161, fd = 8 }
+fd_state.file_descriptor: 23329.113147538 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6867]", pid = 2161, fd = 9 }
+fd_state.file_descriptor: 23329.113149526 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6745]", pid = 2161, fd = 10 }
+fd_state.file_descriptor: 23329.113151545 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6745]", pid = 2161, fd = 11 }
+fd_state.file_descriptor: 23329.113153538 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6745]", pid = 2161, fd = 12 }
+fd_state.file_descriptor: 23329.113155514 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6745]", pid = 2161, fd = 13 }
+fd_state.file_descriptor: 23329.113157464 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6745]", pid = 2161, fd = 14 }
+fd_state.file_descriptor: 23329.113159705 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2162, fd = 0 }
+fd_state.file_descriptor: 23329.113161804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2162, fd = 1 }
+fd_state.file_descriptor: 23329.113163940 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2162, fd = 2 }
+fd_state.file_descriptor: 23329.113166483 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6750]", pid = 2162, fd = 3 }
+fd_state.file_descriptor: 23329.113168563 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6750]", pid = 2162, fd = 4 }
+fd_state.file_descriptor: 23329.113170817 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6751]", pid = 2162, fd = 5 }
+fd_state.file_descriptor: 23329.113172953 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6751]", pid = 2162, fd = 6 }
+fd_state.file_descriptor: 23329.113175125 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6752]", pid = 2162, fd = 7 }
+fd_state.file_descriptor: 23329.113177348 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6746]", pid = 2162, fd = 8 }
+fd_state.file_descriptor: 23329.113179638 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6756]", pid = 2162, fd = 9 }
+fd_state.file_descriptor: 23329.113182163 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6760]", pid = 2162, fd = 10 }
+fd_state.file_descriptor: 23329.113184336 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6760]", pid = 2162, fd = 11 }
+fd_state.file_descriptor: 23329.113192034 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/tmp/kdecache-william/ksycoca4", pid = 2162, fd = 12 }
+fd_state.file_descriptor: 23329.113199799 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[264345]", pid = 2162, fd = 13 }
+fd_state.file_descriptor: 23329.113202232 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[284024]", pid = 2162, fd = 14 }
+fd_state.file_descriptor: 23329.113204510 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2164, fd = 0 }
+fd_state.file_descriptor: 23329.113206646 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2164, fd = 1 }
+fd_state.file_descriptor: 23329.113208825 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2164, fd = 2 }
+fd_state.file_descriptor: 23329.113211238 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6769]", pid = 2164, fd = 3 }
+fd_state.file_descriptor: 23329.113213399 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6769]", pid = 2164, fd = 4 }
+fd_state.file_descriptor: 23329.113215621 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6765]", pid = 2164, fd = 5 }
+fd_state.file_descriptor: 23329.113217899 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6773]", pid = 2164, fd = 6 }
+fd_state.file_descriptor: 23329.113220275 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6773]", pid = 2164, fd = 7 }
+fd_state.file_descriptor: 23329.113222491 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6775]", pid = 2164, fd = 8 }
+fd_state.file_descriptor: 23329.113224640 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 2164, fd = 9 }
+fd_state.file_descriptor: 23329.113229813 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/tmp/kdecache-william/ksycoca4", pid = 2164, fd = 10 }
+fd_state.file_descriptor: 23329.113232331 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6816]", pid = 2164, fd = 11 }
+fd_state.file_descriptor: 23329.113234603 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/ptmx", pid = 2164, fd = 12 }
+fd_state.file_descriptor: 23329.113245097 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/0", pid = 2164, fd = 13 }
+fd_state.file_descriptor: 23329.113247548 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2182, fd = 0 }
+fd_state.file_descriptor: 23329.113249721 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2182, fd = 1 }
+fd_state.file_descriptor: 23329.113251863 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2182, fd = 2 }
+fd_state.file_descriptor: 23329.113254270 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6866]", pid = 2182, fd = 3 }
+fd_state.file_descriptor: 23329.113260221 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2185, fd = 0 }
+fd_state.file_descriptor: 23329.113262369 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2185, fd = 1 }
+fd_state.file_descriptor: 23329.113264653 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2185, fd = 2 }
+fd_state.file_descriptor: 23329.113267265 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6881]", pid = 2185, fd = 3 }
+fd_state.file_descriptor: 23329.113269339 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6881]", pid = 2185, fd = 4 }
+fd_state.file_descriptor: 23329.113271598 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6884]", pid = 2185, fd = 5 }
+fd_state.file_descriptor: 23329.113273790 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6884]", pid = 2185, fd = 6 }
+fd_state.file_descriptor: 23329.113276234 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6885]", pid = 2185, fd = 7 }
+fd_state.file_descriptor: 23329.113278741 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6976]", pid = 2185, fd = 8 }
+fd_state.file_descriptor: 23329.113281031 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6989]", pid = 2185, fd = 9 }
+fd_state.file_descriptor: 23329.113283370 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[6990]", pid = 2185, fd = 10 }
+fd_state.file_descriptor: 23329.113288166 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7014]", pid = 2185, fd = 11 }
+fd_state.file_descriptor: 23329.113292950 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7042]", pid = 2185, fd = 12 }
+fd_state.file_descriptor: 23329.113295321 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6994]", pid = 2185, fd = 13 }
+fd_state.file_descriptor: 23329.113297833 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6994]", pid = 2185, fd = 14 }
+fd_state.file_descriptor: 23329.113302889 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7067]", pid = 2185, fd = 15 }
+fd_state.file_descriptor: 23329.113305161 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6995]", pid = 2185, fd = 16 }
+fd_state.file_descriptor: 23329.113307692 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7098]", pid = 2185, fd = 17 }
+fd_state.file_descriptor: 23329.113310118 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7501]", pid = 2185, fd = 18 }
+fd_state.file_descriptor: 23329.113317278 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7553]", pid = 2185, fd = 19 }
+fd_state.file_descriptor: 23329.113321902 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7594]", pid = 2185, fd = 20 }
+fd_state.file_descriptor: 23329.113324248 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6998]", pid = 2185, fd = 21 }
+fd_state.file_descriptor: 23329.113326372 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6998]", pid = 2185, fd = 22 }
+fd_state.file_descriptor: 23329.113331254 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7674]", pid = 2185, fd = 23 }
+fd_state.file_descriptor: 23329.113336298 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7763]", pid = 2185, fd = 24 }
+fd_state.file_descriptor: 23329.113340977 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7771]", pid = 2185, fd = 25 }
+fd_state.file_descriptor: 23329.113345774 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7776]", pid = 2185, fd = 26 }
+fd_state.file_descriptor: 23329.113350552 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7792]", pid = 2185, fd = 27 }
+fd_state.file_descriptor: 23329.113355219 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/tmp/kdecache-william/ksycoca4", pid = 2185, fd = 28 }
+fd_state.file_descriptor: 23329.113357688 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[8103]", pid = 2185, fd = 29 }
+fd_state.file_descriptor: 23329.113360064 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[8461]", pid = 2185, fd = 30 }
+fd_state.file_descriptor: 23329.113363096 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[6995]", pid = 2199, fd = 0 }
+fd_state.file_descriptor: 23329.113365256 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2199, fd = 1 }
+fd_state.file_descriptor: 23329.113367386 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2199, fd = 2 }
+fd_state.file_descriptor: 23329.113369694 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7004]", pid = 2199, fd = 3 }
+fd_state.file_descriptor: 23329.113371867 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7004]", pid = 2199, fd = 4 }
+fd_state.file_descriptor: 23329.113374570 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7007]", pid = 2199, fd = 5 }
+fd_state.file_descriptor: 23329.113376694 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7007]", pid = 2199, fd = 6 }
+fd_state.file_descriptor: 23329.113378947 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7008]", pid = 2199, fd = 7 }
+fd_state.file_descriptor: 23329.113381349 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7010]", pid = 2199, fd = 8 }
+fd_state.file_descriptor: 23329.113383762 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7013]", pid = 2199, fd = 9 }
+fd_state.file_descriptor: 23329.113385787 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 2199, fd = 10 }
+fd_state.file_descriptor: 23329.113388009 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/tmp/kdecache-william/ksycoca4", pid = 2199, fd = 11 }
+fd_state.file_descriptor: 23329.113390435 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7066]", pid = 2199, fd = 12 }
+fd_state.file_descriptor: 23329.113392682 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2201, fd = 0 }
+fd_state.file_descriptor: 23329.113394868 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2201, fd = 1 }
+fd_state.file_descriptor: 23329.113397096 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2201, fd = 2 }
+fd_state.file_descriptor: 23329.113399516 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7032]", pid = 2201, fd = 3 }
+fd_state.file_descriptor: 23329.113401701 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7032]", pid = 2201, fd = 4 }
+fd_state.file_descriptor: 23329.113404004 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7026]", pid = 2201, fd = 5 }
+fd_state.file_descriptor: 23329.113406424 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7034]", pid = 2201, fd = 6 }
+fd_state.file_descriptor: 23329.113408516 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7034]", pid = 2201, fd = 7 }
+fd_state.file_descriptor: 23329.113411251 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7039]", pid = 2201, fd = 8 }
+fd_state.file_descriptor: 23329.113413714 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7041]", pid = 2201, fd = 9 }
+fd_state.file_descriptor: 23329.113415943 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2203, fd = 0 }
+fd_state.file_descriptor: 23329.113418060 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2203, fd = 1 }
+fd_state.file_descriptor: 23329.113420190 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2203, fd = 2 }
+fd_state.file_descriptor: 23329.113422721 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7081]", pid = 2203, fd = 3 }
+fd_state.file_descriptor: 23329.113424752 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7081]", pid = 2203, fd = 4 }
+fd_state.file_descriptor: 23329.113427067 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7077]", pid = 2203, fd = 5 }
+fd_state.file_descriptor: 23329.113429468 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7083]", pid = 2203, fd = 6 }
+fd_state.file_descriptor: 23329.113431492 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7083]", pid = 2203, fd = 7 }
+fd_state.file_descriptor: 23329.113433789 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7088]", pid = 2203, fd = 8 }
+fd_state.file_descriptor: 23329.113436123 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7097]", pid = 2203, fd = 9 }
+fd_state.file_descriptor: 23329.113438177 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 2203, fd = 10 }
+fd_state.file_descriptor: 23329.113440487 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/tmp/kdecache-william/ksycoca4", pid = 2203, fd = 11 }
+fd_state.file_descriptor: 23329.113442932 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7139]", pid = 2203, fd = 12 }
+fd_state.file_descriptor: 23329.113453024 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7145]", pid = 2203, fd = 14 }
+fd_state.file_descriptor: 23329.113455178 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7145]", pid = 2203, fd = 15 }
+fd_state.file_descriptor: 23329.113457468 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2205, fd = 0 }
+fd_state.file_descriptor: 23329.113459629 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2205, fd = 1 }
+fd_state.file_descriptor: 23329.113461808 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2205, fd = 2 }
+fd_state.file_descriptor: 23329.113464302 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7104]", pid = 2205, fd = 3 }
+fd_state.file_descriptor: 23329.113466407 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7104]", pid = 2205, fd = 4 }
+fd_state.file_descriptor: 23329.113468771 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7091]", pid = 2205, fd = 5 }
+fd_state.file_descriptor: 23329.113470957 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7105]", pid = 2205, fd = 6 }
+fd_state.file_descriptor: 23329.113472988 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7105]", pid = 2205, fd = 7 }
+fd_state.file_descriptor: 23329.113475321 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7110]", pid = 2205, fd = 8 }
+fd_state.file_descriptor: 23329.113477550 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/tmp/kdecache-william/ksycoca4", pid = 2205, fd = 9 }
+fd_state.file_descriptor: 23329.113485501 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[8272]", pid = 2205, fd = 10 }
+fd_state.file_descriptor: 23329.113487606 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[8272]", pid = 2205, fd = 11 }
+fd_state.file_descriptor: 23329.113492563 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/snd/controlC0", pid = 2205, fd = 12 }
+fd_state.file_descriptor: 23329.113494828 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2238, fd = 0 }
+fd_state.file_descriptor: 23329.113496995 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2238, fd = 1 }
+fd_state.file_descriptor: 23329.113499168 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2238, fd = 2 }
+fd_state.file_descriptor: 23329.113506495 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7303]", pid = 2238, fd = 3 }
+fd_state.file_descriptor: 23329.113508594 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7303]", pid = 2238, fd = 4 }
+fd_state.file_descriptor: 23329.113510896 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7306]", pid = 2238, fd = 5 }
+fd_state.file_descriptor: 23329.113512958 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7306]", pid = 2238, fd = 6 }
+fd_state.file_descriptor: 23329.113517934 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[10337]", pid = 2238, fd = 7 }
+fd_state.file_descriptor: 23329.113524077 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[72356]", pid = 2238, fd = 8 }
+fd_state.file_descriptor: 23329.113532002 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[77164]", pid = 2238, fd = 9 }
+fd_state.file_descriptor: 23329.113540792 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[118724]", pid = 2238, fd = 10 }
+fd_state.file_descriptor: 23329.113549021 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[264344]", pid = 2238, fd = 11 }
+fd_state.file_descriptor: 23329.113568238 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2244, fd = 0 }
+fd_state.file_descriptor: 23329.113570596 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2244, fd = 1 }
+fd_state.file_descriptor: 23329.113572769 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2244, fd = 2 }
+fd_state.file_descriptor: 23329.113575529 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7475]", pid = 2244, fd = 3 }
+fd_state.file_descriptor: 23329.113577720 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7475]", pid = 2244, fd = 4 }
+fd_state.file_descriptor: 23329.113580188 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7468]", pid = 2244, fd = 5 }
+fd_state.file_descriptor: 23329.113586127 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7476]", pid = 2244, fd = 6 }
+fd_state.file_descriptor: 23329.113588221 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7476]", pid = 2244, fd = 7 }
+fd_state.file_descriptor: 23329.113590584 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7479]", pid = 2244, fd = 8 }
+fd_state.file_descriptor: 23329.113592993 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7500]", pid = 2244, fd = 9 }
+fd_state.file_descriptor: 23329.113600061 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7646]", pid = 2244, fd = 11 }
+fd_state.file_descriptor: 23329.113602184 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7646]", pid = 2244, fd = 14 }
+fd_state.file_descriptor: 23329.113604548 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2247, fd = 0 }
+fd_state.file_descriptor: 23329.113606708 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2247, fd = 1 }
+fd_state.file_descriptor: 23329.113608869 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2247, fd = 2 }
+fd_state.file_descriptor: 23329.113611350 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7493]", pid = 2247, fd = 3 }
+fd_state.file_descriptor: 23329.113616233 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7493]", pid = 2247, fd = 4 }
+fd_state.file_descriptor: 23329.113618592 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7488]", pid = 2247, fd = 5 }
+fd_state.file_descriptor: 23329.113621308 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7499]", pid = 2247, fd = 6 }
+fd_state.file_descriptor: 23329.113623425 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7499]", pid = 2247, fd = 7 }
+fd_state.file_descriptor: 23329.113625833 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7502]", pid = 2247, fd = 8 }
+fd_state.file_descriptor: 23329.113628265 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7552]", pid = 2247, fd = 9 }
+fd_state.file_descriptor: 23329.113630672 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7615]", pid = 2247, fd = 10 }
+fd_state.file_descriptor: 23329.113632777 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 2247, fd = 11 }
+fd_state.file_descriptor: 23329.113637864 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/tmp/kdecache-william/ksycoca4", pid = 2247, fd = 12 }
+fd_state.file_descriptor: 23329.113640278 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7749]", pid = 2247, fd = 13 }
+fd_state.file_descriptor: 23329.113642654 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7814]", pid = 2247, fd = 14 }
+fd_state.file_descriptor: 23329.113647525 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2248, fd = 0 }
+fd_state.file_descriptor: 23329.113649679 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2248, fd = 1 }
+fd_state.file_descriptor: 23329.113651827 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2248, fd = 2 }
+fd_state.file_descriptor: 23329.113654222 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7511]", pid = 2248, fd = 3 }
+fd_state.file_descriptor: 23329.113675359 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7511]", pid = 2248, fd = 4 }
+fd_state.file_descriptor: 23329.113678519 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7507]", pid = 2248, fd = 5 }
+fd_state.file_descriptor: 23329.113680890 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7520]", pid = 2248, fd = 6 }
+fd_state.file_descriptor: 23329.113683001 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7520]", pid = 2248, fd = 7 }
+fd_state.file_descriptor: 23329.113685439 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7521]", pid = 2248, fd = 8 }
+fd_state.file_descriptor: 23329.113691008 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7572]", pid = 2248, fd = 9 }
+fd_state.file_descriptor: 23329.113693687 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/tmp/kdecache-william/ksycoca4", pid = 2248, fd = 10 }
+fd_state.file_descriptor: 23329.113698564 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7649]", pid = 2248, fd = 13 }
+fd_state.file_descriptor: 23329.113700669 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7649]", pid = 2248, fd = 14 }
+fd_state.file_descriptor: 23329.113707854 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7700]", pid = 2248, fd = 15 }
+fd_state.file_descriptor: 23329.113710070 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7650]", pid = 2248, fd = 16 }
+fd_state.file_descriptor: 23329.113712280 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7651]", pid = 2248, fd = 17 }
+fd_state.file_descriptor: 23329.113714379 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7700]", pid = 2248, fd = 18 }
+fd_state.file_descriptor: 23329.113717046 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7652]", pid = 2248, fd = 19 }
+fd_state.file_descriptor: 23329.113721842 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7705]", pid = 2248, fd = 20 }
+fd_state.file_descriptor: 23329.113726503 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7654]", pid = 2248, fd = 21 }
+fd_state.file_descriptor: 23329.113728596 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7654]", pid = 2248, fd = 22 }
+fd_state.file_descriptor: 23329.113733521 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7701]", pid = 2248, fd = 23 }
+fd_state.file_descriptor: 23329.113735837 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7702]", pid = 2248, fd = 24 }
+fd_state.file_descriptor: 23329.113737948 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7705]", pid = 2248, fd = 25 }
+fd_state.file_descriptor: 23329.113740200 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7703]", pid = 2248, fd = 26 }
+fd_state.file_descriptor: 23329.113742566 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7710]", pid = 2248, fd = 27 }
+fd_state.file_descriptor: 23329.113747517 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7706]", pid = 2248, fd = 28 }
+fd_state.file_descriptor: 23329.113749745 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7707]", pid = 2248, fd = 29 }
+fd_state.file_descriptor: 23329.113751831 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7710]", pid = 2248, fd = 30 }
+fd_state.file_descriptor: 23329.113754399 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7708]", pid = 2248, fd = 31 }
+fd_state.file_descriptor: 23329.113756794 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7711]", pid = 2248, fd = 33 }
+fd_state.file_descriptor: 23329.113759041 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7712]", pid = 2248, fd = 34 }
+fd_state.file_descriptor: 23329.113761331 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7713]", pid = 2248, fd = 36 }
+fd_state.file_descriptor: 23329.113764467 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7650]", pid = 2255, fd = 0 }
+fd_state.file_descriptor: 23329.113766516 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7651]", pid = 2255, fd = 1 }
+fd_state.file_descriptor: 23329.113768560 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7652]", pid = 2255, fd = 2 }
+fd_state.file_descriptor: 23329.113770862 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7661]", pid = 2255, fd = 3 }
+fd_state.file_descriptor: 23329.113772949 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7661]", pid = 2255, fd = 4 }
+fd_state.file_descriptor: 23329.113775282 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7664]", pid = 2255, fd = 5 }
+fd_state.file_descriptor: 23329.113777319 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7664]", pid = 2255, fd = 6 }
+fd_state.file_descriptor: 23329.113779795 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7665]", pid = 2255, fd = 7 }
+fd_state.file_descriptor: 23329.113782239 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7669]", pid = 2255, fd = 8 }
+fd_state.file_descriptor: 23329.113784598 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7673]", pid = 2255, fd = 9 }
+fd_state.file_descriptor: 23329.113786931 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/tmp/kdecache-william/ksycoca4", pid = 2255, fd = 10 }
+fd_state.file_descriptor: 23329.113789351 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/urandom", pid = 2255, fd = 11 }
+fd_state.file_descriptor: 23329.113798277 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.kde/share/apps/nepomuk/repository/main/data/redland/soprano-sp2o.db", pid = 2255, fd = 12 }
+fd_state.file_descriptor: 23329.113801684 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.kde/share/apps/nepomuk/repository/main/data/redland/soprano-po2s.db", pid = 2255, fd = 13 }
+fd_state.file_descriptor: 23329.113807277 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.kde/share/apps/nepomuk/repository/main/data/redland/soprano-so2p.db", pid = 2255, fd = 14 }
+fd_state.file_descriptor: 23329.113810437 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.kde/share/apps/nepomuk/repository/main/data/redland/soprano-contexts.db", pid = 2255, fd = 15 }
+fd_state.file_descriptor: 23329.113813104 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7697]", pid = 2255, fd = 16 }
+fd_state.file_descriptor: 23329.113815364 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7750]", pid = 2255, fd = 17 }
+fd_state.file_descriptor: 23329.113820493 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7796]", pid = 2255, fd = 18 }
+fd_state.file_descriptor: 23329.113825068 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7802]", pid = 2255, fd = 19 }
+fd_state.file_descriptor: 23329.113827414 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7812]", pid = 2255, fd = 20 }
+fd_state.file_descriptor: 23329.113829728 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7701]", pid = 2259, fd = 0 }
+fd_state.file_descriptor: 23329.113831870 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7702]", pid = 2259, fd = 1 }
+fd_state.file_descriptor: 23329.113834253 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7703]", pid = 2259, fd = 2 }
+fd_state.file_descriptor: 23329.113836513 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7733]", pid = 2259, fd = 3 }
+fd_state.file_descriptor: 23329.113838636 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7733]", pid = 2259, fd = 4 }
+fd_state.file_descriptor: 23329.113843507 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7736]", pid = 2259, fd = 5 }
+fd_state.file_descriptor: 23329.113845581 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7736]", pid = 2259, fd = 6 }
+fd_state.file_descriptor: 23329.113850297 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7741]", pid = 2259, fd = 7 }
+fd_state.file_descriptor: 23329.113852717 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7759]", pid = 2259, fd = 8 }
+fd_state.file_descriptor: 23329.113855063 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7767]", pid = 2259, fd = 9 }
+fd_state.file_descriptor: 23329.113857359 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/tmp/kdecache-william/ksycoca4", pid = 2259, fd = 10 }
+fd_state.file_descriptor: 23329.113859767 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7795]", pid = 2259, fd = 11 }
+fd_state.file_descriptor: 23329.113864866 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7706]", pid = 2260, fd = 0 }
+fd_state.file_descriptor: 23329.113867027 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7707]", pid = 2260, fd = 1 }
+fd_state.file_descriptor: 23329.113869125 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7708]", pid = 2260, fd = 2 }
+fd_state.file_descriptor: 23329.113871811 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7737]", pid = 2260, fd = 3 }
+fd_state.file_descriptor: 23329.113873879 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7737]", pid = 2260, fd = 4 }
+fd_state.file_descriptor: 23329.113876218 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7740]", pid = 2260, fd = 5 }
+fd_state.file_descriptor: 23329.113880564 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7740]", pid = 2260, fd = 6 }
+fd_state.file_descriptor: 23329.113882842 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7747]", pid = 2260, fd = 7 }
+fd_state.file_descriptor: 23329.113885243 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7765]", pid = 2260, fd = 8 }
+fd_state.file_descriptor: 23329.113887613 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7775]", pid = 2260, fd = 9 }
+fd_state.file_descriptor: 23329.113889885 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/tmp/kdecache-william/ksycoca4", pid = 2260, fd = 10 }
+fd_state.file_descriptor: 23329.113892385 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7801]", pid = 2260, fd = 11 }
+fd_state.file_descriptor: 23329.113894582 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 2260, fd = 12 }
+fd_state.file_descriptor: 23329.113897978 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7711]", pid = 2261, fd = 0 }
+fd_state.file_descriptor: 23329.113900163 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7712]", pid = 2261, fd = 1 }
+fd_state.file_descriptor: 23329.113902268 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7713]", pid = 2261, fd = 2 }
+fd_state.file_descriptor: 23329.113904577 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7743]", pid = 2261, fd = 3 }
+fd_state.file_descriptor: 23329.113906601 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7743]", pid = 2261, fd = 4 }
+fd_state.file_descriptor: 23329.113909244 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7746]", pid = 2261, fd = 5 }
+fd_state.file_descriptor: 23329.113911330 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7746]", pid = 2261, fd = 6 }
+fd_state.file_descriptor: 23329.113913731 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7752]", pid = 2261, fd = 7 }
+fd_state.file_descriptor: 23329.113916145 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7777]", pid = 2261, fd = 8 }
+fd_state.file_descriptor: 23329.113918528 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7791]", pid = 2261, fd = 9 }
+fd_state.file_descriptor: 23329.113920868 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/tmp/kdecache-william/ksycoca4", pid = 2261, fd = 10 }
+fd_state.file_descriptor: 23329.113923300 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7811]", pid = 2261, fd = 11 }
+fd_state.file_descriptor: 23329.113925615 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7813]", pid = 2261, fd = 12 }
+fd_state.file_descriptor: 23329.113927732 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7813]", pid = 2261, fd = 13 }
+fd_state.file_descriptor: 23329.113930831 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2263, fd = 0 }
+fd_state.file_descriptor: 23329.113933041 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2263, fd = 1 }
+fd_state.file_descriptor: 23329.113935263 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2263, fd = 2 }
+fd_state.file_descriptor: 23329.113940048 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7728]", pid = 2263, fd = 3 }
+fd_state.file_descriptor: 23329.113942140 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7728]", pid = 2263, fd = 4 }
+fd_state.file_descriptor: 23329.113947122 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7720]", pid = 2263, fd = 5 }
+fd_state.file_descriptor: 23329.113949499 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7730]", pid = 2263, fd = 6 }
+fd_state.file_descriptor: 23329.113951567 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7730]", pid = 2263, fd = 7 }
+fd_state.file_descriptor: 23329.113953894 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7731]", pid = 2263, fd = 8 }
+fd_state.file_descriptor: 23329.113956208 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7762]", pid = 2263, fd = 9 }
+fd_state.file_descriptor: 23329.113958450 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/snd/controlC0", pid = 2263, fd = 10 }
+fd_state.file_descriptor: 23329.113960974 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7816]", pid = 2263, fd = 11 }
+fd_state.file_descriptor: 23329.113963332 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7863]", pid = 2263, fd = 12 }
+fd_state.file_descriptor: 23329.113965511 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2269, fd = 0 }
+fd_state.file_descriptor: 23329.113967641 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2269, fd = 1 }
+fd_state.file_descriptor: 23329.113969888 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2269, fd = 2 }
+fd_state.file_descriptor: 23329.113972265 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7913]", pid = 2269, fd = 3 }
+fd_state.file_descriptor: 23329.113974605 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7915]", pid = 2269, fd = 4 }
+fd_state.file_descriptor: 23329.113976820 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[7915]", pid = 2269, fd = 5 }
+fd_state.file_descriptor: 23329.113979073 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/proc/diskstats", pid = 2269, fd = 6 }
+fd_state.file_descriptor: 23329.113981289 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/urandom", pid = 2269, fd = 7 }
+fd_state.file_descriptor: 23329.113986672 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/proc/2269/net/dev", pid = 2269, fd = 8 }
+fd_state.file_descriptor: 23329.113989000 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/proc/vmstat", pid = 2269, fd = 9 }
+fd_state.file_descriptor: 23329.113994376 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/var/lock/gkrellm/LCK..1000_:0", pid = 2269, fd = 10 }
+fd_state.file_descriptor: 23329.113999198 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7962]", pid = 2269, fd = 11 }
+fd_state.file_descriptor: 23329.114001451 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/proc/stat", pid = 2269, fd = 12 }
+fd_state.file_descriptor: 23329.114003908 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/proc/2269/net/route", pid = 2269, fd = 13 }
+fd_state.file_descriptor: 23329.114006118 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2275, fd = 0 }
+fd_state.file_descriptor: 23329.114008321 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2275, fd = 1 }
+fd_state.file_descriptor: 23329.114010519 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2275, fd = 2 }
+fd_state.file_descriptor: 23329.114012914 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[7972]", pid = 2275, fd = 3 }
+fd_state.file_descriptor: 23329.114015334 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[8054]", pid = 2275, fd = 4 }
+fd_state.file_descriptor: 23329.114017526 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2290, fd = 0 }
+fd_state.file_descriptor: 23329.114019445 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2290, fd = 1 }
+fd_state.file_descriptor: 23329.114021723 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2290, fd = 2 }
+fd_state.file_descriptor: 23329.114024069 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[8116]", pid = 2290, fd = 3 }
+fd_state.file_descriptor: 23329.114026075 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2290, fd = 4 }
+fd_state.file_descriptor: 23329.114030594 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 2290, fd = 5 }
+fd_state.file_descriptor: 23329.114032878 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2336, fd = 0 }
+fd_state.file_descriptor: 23329.114035056 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2336, fd = 1 }
+fd_state.file_descriptor: 23329.114037329 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 2336, fd = 2 }
+fd_state.file_descriptor: 23329.114039853 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[8455]", pid = 2336, fd = 3 }
+fd_state.file_descriptor: 23329.114042063 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[8455]", pid = 2336, fd = 4 }
+fd_state.file_descriptor: 23329.114044372 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[8420]", pid = 2336, fd = 5 }
+fd_state.file_descriptor: 23329.114046804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[8457]", pid = 2336, fd = 6 }
+fd_state.file_descriptor: 23329.114048909 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[8457]", pid = 2336, fd = 7 }
+fd_state.file_descriptor: 23329.114051057 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[8458]", pid = 2336, fd = 8 }
+fd_state.file_descriptor: 23329.114053428 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[8460]", pid = 2336, fd = 9 }
+fd_state.file_descriptor: 23329.114055570 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/ptmx", pid = 2336, fd = 10 }
+fd_state.file_descriptor: 23329.114058434 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 2336, fd = 11 }
+fd_state.file_descriptor: 23329.114060644 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/ptmx", pid = 2336, fd = 12 }
+fd_state.file_descriptor: 23329.114068262 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/2", pid = 2336, fd = 13 }
+fd_state.file_descriptor: 23329.114070459 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/ptmx", pid = 2336, fd = 16 }
+fd_state.file_descriptor: 23329.114072953 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[284061]", pid = 2336, fd = 17 }
+fd_state.file_descriptor: 23329.114077626 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/3", pid = 2336, fd = 18 }
+fd_state.file_descriptor: 23329.114080299 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[9950]", pid = 2336, fd = 19 }
+fd_state.file_descriptor: 23329.114082367 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[9950]", pid = 2336, fd = 20 }
+fd_state.file_descriptor: 23329.114084466 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[284061]", pid = 2336, fd = 21 }
+fd_state.file_descriptor: 23329.114089145 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[8487]", pid = 2336, fd = 22 }
+fd_state.file_descriptor: 23329.114091257 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[8487]", pid = 2336, fd = 23 }
+fd_state.file_descriptor: 23329.114093541 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[9951]", pid = 2336, fd = 24 }
+fd_state.file_descriptor: 23329.114096484 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[43982]", pid = 2336, fd = 26 }
+fd_state.file_descriptor: 23329.114098633 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[43982]", pid = 2336, fd = 27 }
+fd_state.file_descriptor: 23329.114103183 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[284062]", pid = 2336, fd = 28 }
+fd_state.file_descriptor: 23329.114105454 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[43983]", pid = 2336, fd = 29 }
+fd_state.file_descriptor: 23329.114111263 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/2", pid = 2536, fd = 0 }
+fd_state.file_descriptor: 23329.114113386 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/2", pid = 2536, fd = 1 }
+fd_state.file_descriptor: 23329.114115399 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/2", pid = 2536, fd = 2 }
+fd_state.file_descriptor: 23329.114118300 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/2", pid = 2536, fd = 255 }
+fd_state.file_descriptor: 23329.114120597 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/2", pid = 2630, fd = 0 }
+fd_state.file_descriptor: 23329.114122652 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/2", pid = 2630, fd = 1 }
+fd_state.file_descriptor: 23329.114124671 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/2", pid = 2630, fd = 2 }
+fd_state.file_descriptor: 23329.114129393 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[10555]", pid = 2630, fd = 4 }
+fd_state.file_descriptor: 23329.114135153 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/2", pid = 2639, fd = 0 }
+fd_state.file_descriptor: 23329.114137221 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/2", pid = 2639, fd = 1 }
+fd_state.file_descriptor: 23329.114139258 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/2", pid = 2639, fd = 2 }
+fd_state.file_descriptor: 23329.114142209 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/2", pid = 2639, fd = 255 }
+fd_state.file_descriptor: 23329.114144740 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/1 (deleted)", pid = 2748, fd = 0 }
+fd_state.file_descriptor: 23329.114146950 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/1 (deleted)", pid = 2748, fd = 1 }
+fd_state.file_descriptor: 23329.114149129 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/1 (deleted)", pid = 2748, fd = 2 }
+fd_state.file_descriptor: 23329.114153999 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[11278]", pid = 2748, fd = 3 }
+fd_state.file_descriptor: 23329.114156537 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[11284]", pid = 2748, fd = 4 }
+fd_state.file_descriptor: 23329.114158907 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/1 (deleted)", pid = 2757, fd = 0 }
+fd_state.file_descriptor: 23329.114161000 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/1 (deleted)", pid = 2757, fd = 1 }
+fd_state.file_descriptor: 23329.114163074 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/1 (deleted)", pid = 2757, fd = 2 }
+fd_state.file_descriptor: 23329.114169889 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[11322]", pid = 2757, fd = 3 }
+fd_state.file_descriptor: 23329.114174908 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[11329]", pid = 2757, fd = 4 }
+fd_state.file_descriptor: 23329.114177167 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2782, fd = 0 }
+fd_state.file_descriptor: 23329.114179166 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2782, fd = 1 }
+fd_state.file_descriptor: 23329.114181061 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2782, fd = 2 }
+fd_state.file_descriptor: 23329.114186068 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[11755]", pid = 2782, fd = 4 }
+fd_state.file_descriptor: 23329.114193797 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[11680]", pid = 2782, fd = 5 }
+fd_state.file_descriptor: 23329.114198698 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[11681]", pid = 2782, fd = 7 }
+fd_state.file_descriptor: 23329.114201136 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[11682]", pid = 2782, fd = 8 }
+fd_state.file_descriptor: 23329.114203667 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[11755]", pid = 2794, fd = 0 }
+fd_state.file_descriptor: 23329.114205680 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2794, fd = 1 }
+fd_state.file_descriptor: 23329.114207723 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 2794, fd = 2 }
+fd_state.file_descriptor: 23329.114210254 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[11680]", pid = 2794, fd = 5 }
+fd_state.file_descriptor: 23329.114212674 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/2", pid = 2838, fd = 0 }
+fd_state.file_descriptor: 23329.114214717 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/2", pid = 2838, fd = 1 }
+fd_state.file_descriptor: 23329.114216693 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/2", pid = 2838, fd = 2 }
+fd_state.file_descriptor: 23329.114221705 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[11900]", pid = 2838, fd = 3 }
+fd_state.file_descriptor: 23329.114226348 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[11905]", pid = 2838, fd = 4 }
+fd_state.file_descriptor: 23329.114228595 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/2", pid = 2853, fd = 0 }
+fd_state.file_descriptor: 23329.114230663 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/2", pid = 2853, fd = 1 }
+fd_state.file_descriptor: 23329.114232687 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/2", pid = 2853, fd = 2 }
+fd_state.file_descriptor: 23329.114235101 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[11945]", pid = 2853, fd = 3 }
+fd_state.file_descriptor: 23329.114237533 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[11968]", pid = 2853, fd = 4 }
+fd_state.file_descriptor: 23329.114250065 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[11679]", pid = 2864, fd = 0 }
+fd_state.file_descriptor: 23329.114252200 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[11680]", pid = 2864, fd = 1 }
+fd_state.file_descriptor: 23329.114254201 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[11680]", pid = 2864, fd = 2 }
+fd_state.file_descriptor: 23329.114258990 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[12029]", pid = 2864, fd = 3 }
+fd_state.file_descriptor: 23329.114261404 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[12033]", pid = 2864, fd = 4 }
+fd_state.file_descriptor: 23329.114271367 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[272930]", pid = 2864, fd = 5 }
+fd_state.file_descriptor: 23329.114279695 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[274175]", pid = 2864, fd = 6 }
+fd_state.file_descriptor: 23329.114284825 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[79374]", pid = 2864, fd = 7 }
+fd_state.file_descriptor: 23329.114292424 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[79380]", pid = 2864, fd = 8 }
+fd_state.file_descriptor: 23329.114294782 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[79382]", pid = 2864, fd = 9 }
+fd_state.file_descriptor: 23329.114299918 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[146014]", pid = 2864, fd = 10 }
+fd_state.file_descriptor: 23329.114308412 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[80923]", pid = 2864, fd = 11 }
+fd_state.file_descriptor: 23329.114315794 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[81175]", pid = 2864, fd = 12 }
+fd_state.file_descriptor: 23329.114323566 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[79432]", pid = 2864, fd = 13 }
+fd_state.file_descriptor: 23329.114331301 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[79820]", pid = 2864, fd = 14 }
+fd_state.file_descriptor: 23329.114335974 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[93387]", pid = 2864, fd = 15 }
+fd_state.file_descriptor: 23329.114340870 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[82567]", pid = 2864, fd = 16 }
+fd_state.file_descriptor: 23329.114343339 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[93117]", pid = 2864, fd = 17 }
+fd_state.file_descriptor: 23329.114348240 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[146088]", pid = 2864, fd = 18 }
+fd_state.file_descriptor: 23329.114360846 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[174185]", pid = 2864, fd = 19 }
+fd_state.file_descriptor: 23329.114366346 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[272327]", pid = 2864, fd = 20 }
+fd_state.file_descriptor: 23329.114374871 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[192688]", pid = 2864, fd = 21 }
+fd_state.file_descriptor: 23329.114379946 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[126320]", pid = 2864, fd = 22 }
+fd_state.file_descriptor: 23329.114385119 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[194954]", pid = 2864, fd = 23 }
+fd_state.file_descriptor: 23329.114390082 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[256314]", pid = 2864, fd = 24 }
+fd_state.file_descriptor: 23329.114397804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[281807]", pid = 2864, fd = 25 }
+fd_state.file_descriptor: 23329.114402731 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[249768]", pid = 2864, fd = 26 }
+fd_state.file_descriptor: 23329.114407810 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[214772]", pid = 2864, fd = 29 }
+fd_state.file_descriptor: 23329.114416132 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[239772]", pid = 2864, fd = 31 }
+fd_state.file_descriptor: 23329.114418533 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[239934]", pid = 2864, fd = 33 }
+fd_state.file_descriptor: 23329.114424255 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[277910]", pid = 2864, fd = 36 }
+fd_state.file_descriptor: 23329.114426632 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[277912]", pid = 2864, fd = 37 }
+fd_state.file_descriptor: 23329.114429743 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 3380, fd = 0 }
+fd_state.file_descriptor: 23329.114431713 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 3380, fd = 1 }
+fd_state.file_descriptor: 23329.114433639 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 3380, fd = 2 }
+fd_state.file_descriptor: 23329.114436046 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[38267]", pid = 3380, fd = 3 }
+fd_state.file_descriptor: 23329.114437978 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 3380, fd = 4 }
+fd_state.file_descriptor: 23329.114443281 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[38271]", pid = 3380, fd = 5 }
+fd_state.file_descriptor: 23329.114445479 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[38271]", pid = 3380, fd = 6 }
+fd_state.file_descriptor: 23329.114450750 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[38272]", pid = 3380, fd = 7 }
+fd_state.file_descriptor: 23329.114453220 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[38272]", pid = 3380, fd = 8 }
+fd_state.file_descriptor: 23329.114461232 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 3384, fd = 0 }
+fd_state.file_descriptor: 23329.114463220 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 3384, fd = 1 }
+fd_state.file_descriptor: 23329.114465177 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 3384, fd = 2 }
+fd_state.file_descriptor: 23329.114465631 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[38297]", pid = 3384, fd = 3 }
+kernel.irq_entry: 23329.114490705 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { ip = 3242331332, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_update_time: 23329.114505379 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { jiffies = 4297269582, xtime_sec = 1264196274, xtime_nsec = 637522001, walltomonotonic_sec = -1264172952, walltomonotonic_nsec = 189579727 }
+kernel.softirq_raise: 23329.114516392 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { softirq_id = 1 [softirq 1] }
+kernel.softirq_raise: 23329.114523096 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { softirq_id = 9 [softirq 9] }
+kernel.irq_exit: 23329.114546763 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.softirq_entry: 23329.114550269 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, SOFTIRQ { softirq_id = 1 [softirq 1] }
+kernel.timer_set: 23329.114558979 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, SOFTIRQ { expires = 2302287, function = 0xc141d458, data = 0 }
+kernel.timer_set: 23329.114563295 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, SOFTIRQ { expires = 2302287, function = 0xc14b0234, data = 0 }
+kernel.softirq_exit: 23329.114565560 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { softirq_id = 1 [softirq 1] }
+kernel.softirq_entry: 23329.114566881 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, SOFTIRQ { softirq_id = 9 [softirq 9] }
+rcu.tree_callback: 23329.114625543 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16927, 16927, lttctl, , 16908, 0x0, SOFTIRQ { func = 0xc14285e3 }
+rcu.tree_callback: 23329.114629123 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16927, 16927, lttctl, , 16908, 0x0, SOFTIRQ { func = 0xc14285e3 }
+rcu.tree_callback: 23329.114630883 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16927, 16927, lttctl, , 16908, 0x0, SOFTIRQ { func = 0xc14285e3 }
+rcu.tree_callback: 23329.114632451 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16927, 16927, lttctl, , 16908, 0x0, SOFTIRQ { func = 0xc14285e3 }
+rcu.tree_callback: 23329.114634031 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16927, 16927, lttctl, , 16908, 0x0, SOFTIRQ { func = 0xc14285e3 }
+rcu.tree_callback: 23329.114635599 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16927, 16927, lttctl, , 16908, 0x0, SOFTIRQ { func = 0xc14285e3 }
+rcu.tree_callback: 23329.114637148 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16927, 16927, lttctl, , 16908, 0x0, SOFTIRQ { func = 0xc141a9af }
+kernel.softirq_exit: 23329.114639414 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { softirq_id = 9 [softirq 9] }
+fd_state.file_descriptor: 23329.114644365 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 3384, fd = 4 }
+fd_state.file_descriptor: 23329.114650649 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[38297]", pid = 3384, fd = 5 }
+fd_state.file_descriptor: 23329.114653112 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[38298]", pid = 3384, fd = 6 }
+fd_state.file_descriptor: 23329.114655427 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[38302]", pid = 3384, fd = 7 }
+fd_state.file_descriptor: 23329.114657538 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 3384, fd = 8 }
+fd_state.file_descriptor: 23329.114659915 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[38307]", pid = 3384, fd = 9 }
+kernel.sched_schedule: 23329.114668452 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { prev_pid = 16927, next_pid = 1989, prev_state = 0 }
+fs.read: 23329.114878429 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 3540, fd = 48 }
+kernel.syscall_exit: 23329.114880707 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 1428 }
+kernel.syscall_entry: 23329.115426442 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.115431300 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 4096, fd = 48 }
+kernel.syscall_exit: 23329.115432688 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.115438418 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 146 [syscall 146] }
+kernel.sched_try_wakeup: 23329.115453220 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pid = 2336, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 23329.115462338 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { prev_pid = 1989, next_pid = 2336, prev_state = 0 }
+fs.pollfd: 23329.115613720 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { fd = 8 }
+kernel.syscall_exit: 23329.115617269 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.115626554 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.115632134 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 23329.115633344 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 64 }
+kernel.syscall_entry: 23329.115650672 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.115652679 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 23329.115653900 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.115671715 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.115673771 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 23329.115676129 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.115679463 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 146 [syscall 146] }
+fs.writev: 23329.115684401 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8, vlen = 3 }
+kernel.syscall_exit: 23329.115685858 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 16 }
+kernel.syscall_entry: 23329.115691111 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.115692612 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 23329.115716032 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { prev_pid = 2336, next_pid = 1989, prev_state = 1 }
+fs.writev: 23329.115944960 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 48, vlen = 1 }
+kernel.syscall_exit: 23329.115947120 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 64 }
+kernel.syscall_entry: 23329.115954652 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7657e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.115958275 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.115962133 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 23329.115965190 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 23329.115981708 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.115992412 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 142 [syscall 142] }
+fs.select: 23329.115996233 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 1, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.115998919 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 3, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116001357 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 5, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116008203 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 7, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116010178 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 13, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116012740 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 19, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116015160 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 20, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116017062 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 21, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116019290 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 22, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116021530 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 23, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116023457 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 24, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116025537 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 25, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116027833 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 26, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116029845 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 27, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116031864 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 28, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116034142 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 29, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116036321 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 30, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116038364 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 31, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116040765 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 32, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116042932 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 33, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116044828 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 34, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116047334 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 35, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116049371 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 37, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116051334 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 38, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116053359 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 39, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116055322 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 40, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116057279 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 41, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116059205 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 42, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116061229 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 43, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116063347 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 44, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116065433 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 45, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116067489 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 46, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116069322 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 48, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116071051 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 49, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116073205 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 50, end_time_sec = 0, end_time_nsec = 0 }
+fs.select: 23329.116075304 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 52, end_time_sec = 0, end_time_nsec = 0 }
+kernel.syscall_exit: 23329.116077681 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.116084311 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 23329.116086107 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 23329.116093052 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.116096638 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7657e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.116099058 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.116103761 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7657e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.116106022 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.116109268 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 23329.116110979 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 23329.116114083 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.116118280 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 142 [syscall 142] }
+fs.select: 23329.116123238 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 1, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116125750 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 3, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116127664 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 5, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116130954 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 7, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116132948 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 13, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116134929 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 19, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116136880 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 20, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116138775 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 21, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116140843 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 22, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116142788 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 23, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116144720 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 24, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116146677 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 25, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116148634 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 26, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116150585 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 27, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116152548 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 28, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116154535 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 29, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116156924 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 30, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116158894 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 31, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116166715 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 32, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116168752 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 33, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116170666 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 34, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116172752 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 35, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116174715 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 37, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116176603 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 38, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116178437 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 39, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116180301 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 40, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116182147 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 41, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116184123 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 42, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116185969 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 43, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116187827 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 44, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116189690 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 45, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116192098 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 46, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116194178 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 48, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116196178 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 49, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116197999 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 50, end_time_sec = 23660, end_time_nsec = 559698425 }
+fs.select: 23329.116199895 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 52, end_time_sec = 23660, end_time_nsec = 559698425 }
+mm.page_free: 23329.116207315 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pfn = 198104, order = 0 }
+kernel.syscall_exit: 23329.116211710 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.116216358 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 23329.116218210 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 23329.116223612 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.116227032 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7657e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.116229384 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.116233822 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+kernel.sched_try_wakeup: 23329.116242847 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pid = 2336, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 23329.116251625 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { prev_pid = 1989, next_pid = 2336, prev_state = 0 }
+fs.pollfd: 23329.116398574 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 23329.116406297 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { prev_pid = 2336, next_pid = 1989, prev_state = 1 }
+fs.read: 23329.116550364 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 4096, fd = 48 }
+kernel.syscall_exit: 23329.116552067 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 16 }
+kernel.syscall_entry: 23329.116559654 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.116561852 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 4096, fd = 48 }
+kernel.syscall_exit: 23329.116563069 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.116566994 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 146 [syscall 146] }
+kernel.sched_try_wakeup: 23329.116575358 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pid = 2336, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 23329.116583402 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { prev_pid = 1989, next_pid = 2336, prev_state = 0 }
+fs.pollfd: 23329.116713544 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 23329.116713546 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.116713548 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.116713550 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 23329.116713552 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 32 }
+kernel.syscall_entry: 23329.116713554 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.116713556 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 23329.116713558 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.118615359 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.118618548 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 23329.118621587 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.118625677 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 146 [syscall 146] }
+fs.writev: 23329.118634582 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8, vlen = 3 }
+kernel.syscall_exit: 23329.118636198 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 7140 }
+kernel.syscall_entry: 23329.118641354 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.118642921 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 23329.118652634 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { prev_pid = 2336, next_pid = 1989, prev_state = 1 }
+fs.writev: 23329.118811901 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 48, vlen = 1 }
+kernel.syscall_exit: 23329.118814059 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 32 }
+kernel.syscall_entry: 23329.118820356 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7657e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.118823594 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.118827603 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 23329.118829527 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 23329.118833925 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.118840376 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 142 [syscall 142] }
+fs.select: 23329.118845519 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 1, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118848127 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 3, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118850224 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 5, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118854745 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 7, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118856867 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 13, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118859389 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 19, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118861492 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 20, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118863762 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 21, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118865927 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 22, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118867999 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 23, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118869942 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 24, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118872310 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 25, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118874370 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 26, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118876516 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 27, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118878515 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 28, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118880531 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 29, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118882980 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 30, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118885299 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 31, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118893181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 32, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118895308 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 33, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118897634 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 34, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118899835 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 35, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118901920 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 37, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118903942 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 38, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118906102 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 39, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118908094 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 40, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118910265 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 41, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118912596 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 42, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118914674 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 43, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118916753 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 44, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118918824 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 45, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118921050 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 46, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118923086 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 48, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118925227 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 49, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118927218 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 50, end_time_sec = 23660, end_time_nsec = 559420563 }
+fs.select: 23329.118929056 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 52, end_time_sec = 23660, end_time_nsec = 559420563 }
+mm.page_free: 23329.118936753 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pfn = 198051, order = 0 }
+kernel.syscall_exit: 23329.118940607 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.118945998 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 23329.118947830 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 23329.118954194 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.118957543 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7657e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.118959967 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.118964580 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.118969083 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 4096, fd = 48 }
+kernel.syscall_exit: 23329.118970291 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 4096 }
+kernel.syscall_entry: 23329.119279659 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+kernel.sched_try_wakeup: 23329.119290693 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pid = 2336, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 23329.119299894 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { prev_pid = 1989, next_pid = 2336, prev_state = 0 }
+fs.pollfd: 23329.119449786 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 23329.119457551 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { prev_pid = 2336, next_pid = 1989, prev_state = 1 }
+fs.read: 23329.119617403 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 4092, fd = 48 }
+kernel.syscall_exit: 23329.119619210 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 3044 }
+kernel.syscall_entry: 23329.119699133 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.119721101 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 4096, fd = 48 }
+kernel.syscall_exit: 23329.119722606 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.119728287 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 146 [syscall 146] }
+kernel.sched_try_wakeup: 23329.119737951 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pid = 2336, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 23329.119746220 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { prev_pid = 1989, next_pid = 2336, prev_state = 0 }
+fs.pollfd: 23329.119891197 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 23329.119894274 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.119899949 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.119904340 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 23329.119905604 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 32 }
+kernel.syscall_entry: 23329.119912672 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.119914553 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 23329.119915743 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.119925883 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.119927745 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 23329.119929867 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.119933123 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 146 [syscall 146] }
+fs.writev: 23329.119937138 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8, vlen = 3 }
+kernel.syscall_exit: 23329.119938631 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 16 }
+kernel.syscall_entry: 23329.119943010 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.119944521 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 23329.119952063 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { prev_pid = 2336, next_pid = 1989, prev_state = 1 }
+fs.writev: 23329.120096238 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 48, vlen = 1 }
+kernel.syscall_exit: 23329.120098261 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 32 }
+kernel.syscall_entry: 23329.120103872 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7657e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.120106507 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.120109904 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 23329.120111891 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 23329.120116429 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.120121690 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 142 [syscall 142] }
+fs.select: 23329.120126384 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 1, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120128993 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 3, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120131176 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 5, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120135228 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 7, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120137349 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 13, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120139779 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 19, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120141870 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 20, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120143788 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 21, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120145922 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 22, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120147883 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 23, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120149826 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 24, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120151794 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 25, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120153780 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 26, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120155741 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 27, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120157788 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 28, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120159774 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 29, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120161859 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 30, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120164024 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 31, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120171331 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 32, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120173478 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 33, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120175816 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 34, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120177795 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 35, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120179886 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 37, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120181946 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 38, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120183957 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 39, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120185936 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 40, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120187891 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 41, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120189877 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 42, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120191832 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 43, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120193805 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 44, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120195976 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 45, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120198061 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 46, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120200133 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 48, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120202230 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 49, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120204148 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 50, end_time_sec = 23660, end_time_nsec = 559701878 }
+fs.select: 23329.120205968 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 52, end_time_sec = 23660, end_time_nsec = 559701878 }
+mm.page_free: 23329.120213276 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pfn = 198049, order = 0 }
+kernel.syscall_exit: 23329.120216847 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.120221676 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 23329.120223526 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 23329.120229429 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.120232870 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7657e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.120235269 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.120239395 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+kernel.sched_try_wakeup: 23329.120247222 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pid = 2336, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 23329.120255554 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { prev_pid = 1989, next_pid = 2336, prev_state = 0 }
+fs.pollfd: 23329.120398865 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 23329.120406433 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { prev_pid = 2336, next_pid = 1989, prev_state = 1 }
+fs.read: 23329.120640502 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 4096, fd = 48 }
+kernel.syscall_exit: 23329.120642278 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 16 }
+kernel.syscall_entry: 23329.120649661 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.120651838 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 4096, fd = 48 }
+kernel.syscall_exit: 23329.120653090 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.120656944 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 146 [syscall 146] }
+kernel.sched_try_wakeup: 23329.120665295 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pid = 2336, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 23329.120673029 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { prev_pid = 1989, next_pid = 2336, prev_state = 0 }
+fs.pollfd: 23329.120816112 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 23329.120818900 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.120824272 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.120828521 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 23329.120829730 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 32 }
+kernel.syscall_entry: 23329.120835416 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.120837322 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 23329.120838525 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.page_fault_entry: 23329.121824687 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, TRAP { ip = 0xb6427f29, address = 0x9ba8000, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.121874457 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.page_fault_entry: 23329.121882846 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, TRAP { ip = 0xb6427f29, address = 0x9ba9000, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.121897326 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.page_fault_entry: 23329.122079073 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, TRAP { ip = 0xb6128a66, address = 0xa3dd000, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.122117446 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.page_fault_entry: 23329.122126537 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, TRAP { ip = 0xb6128a66, address = 0xa3de000, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.122153328 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.syscall_entry: 23329.122166730 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.122169424 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 23329.122172409 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.122176080 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 146 [syscall 146] }
+fs.writev: 23329.122189117 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8, vlen = 3 }
+kernel.syscall_exit: 23329.122190782 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 23400 }
+kernel.irq_entry: 23329.122705061 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, IRQ { ip = 3059708304, handler = 0xf8a23c7f, irq_id = 14, kernel_mode = 0 }
+block.rq_complete_fs: 23329.122731427 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 2336, 2336, konsole, , 1, 0x0, IRQ { hard_sector = 4081302, rw = 0, errors = 0 }
+kernel.sched_try_wakeup: 23329.122749245 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, IRQ { pid = 1304, cpu_id = 0, state = 2 }
+kernel.timer_set: 23329.122772003 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, IRQ { expires = 2302287, function = 0xc141b0a5, data = 4136835584 }
+kernel.irq_exit: 23329.122783380 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.sched_schedule: 23329.122795826 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { prev_pid = 2336, next_pid = 1304, prev_state = 0 }
+kernel.page_fault_exit: 23329.122970111 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { res = 516 }
+kernel.page_fault_entry: 23329.122982026 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { ip = 0xb76055b7, address = 0xb76055b7, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.123020516 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.page_fault_entry: 23329.123034270 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { ip = 0xb767f2b7, address = 0xb7607fad, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.123069955 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { res = 512 }
+kernel.syscall_entry: 23329.123191371 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 23329.123194911 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.page_fault_entry: 23329.123238471 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { ip = 0x80661dc, address = 0xb65bfdac, trap_id = 14, write_access = 1 }
+block.remap: 23329.123273853 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { device_from = 3145728, sector_from = 2368, device_to = 3145729, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_queue: 23329.123277924 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { sector = 2431, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.getrq_bio: 23329.123288365 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { sector = 2431, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+kernel.timer_set: 23329.123295144 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { expires = 2302287, function = 0xc1410312, data = 4147888232 }
+block.plug: 23329.123299004 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP
+block.rq_insert_fs: 23329.123304036 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { hard_sector = 2431, rw = 0, errors = 0 }
+block.remap: 23329.123315711 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { device_from = 3145728, sector_from = 2376, device_to = 3145729, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_queue: 23329.123318715 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { sector = 2439, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_backmerge: 23329.123325925 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { sector = 2439, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.remap: 23329.123338987 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { device_from = 3145728, sector_from = 2384, device_to = 3145729, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_queue: 23329.123341898 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { sector = 2447, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_backmerge: 23329.123346794 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { sector = 2447, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.remap: 23329.123354245 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { device_from = 3145728, sector_from = 2392, device_to = 3145729, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_queue: 23329.123357186 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { sector = 2455, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_backmerge: 23329.123361943 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { sector = 2455, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.remap: 23329.123368960 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { device_from = 3145728, sector_from = 2400, device_to = 3145729, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_queue: 23329.123371902 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { sector = 2463, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_backmerge: 23329.123377015 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { sector = 2463, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.remap: 23329.123384095 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { device_from = 3145728, sector_from = 2408, device_to = 3145729, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_queue: 23329.123387043 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { sector = 2471, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_backmerge: 23329.123391749 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { sector = 2471, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.remap: 23329.123402234 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { device_from = 3145728, sector_from = 2416, device_to = 3145729, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_queue: 23329.123405175 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { sector = 2479, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_backmerge: 23329.123410042 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { sector = 2479, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.remap: 23329.123417233 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { device_from = 3145728, sector_from = 2424, device_to = 3145729, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_queue: 23329.123420174 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { sector = 2487, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_backmerge: 23329.123424868 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { sector = 2487, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+mm.swap_in: 23329.123433040 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { pfn = 282290, filp = 0xf7101940, offset = 296 }
+block.unplug_io: 23329.123437104 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { pdu = 1 }
+block.rq_issue_fs: 23329.123448266 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { hard_sector = 2431, rw = 0, errors = 0 }
+kernel.timer_set: 23329.123490477 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { expires = 2304286, function = 0xf8a23e85, data = 4136733696 }
+kernel.sched_schedule: 23329.123570264 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { prev_pid = 1304, next_pid = 16927, prev_state = 2 }
+fd_state.file_descriptor: 23329.123682818 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 3386, fd = 0 }
+fd_state.file_descriptor: 23329.123685600 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 3386, fd = 1 }
+fd_state.file_descriptor: 23329.123687653 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 3386, fd = 2 }
+fd_state.file_descriptor: 23329.123692550 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[38313]", pid = 3386, fd = 3 }
+fd_state.file_descriptor: 23329.123694586 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 3386, fd = 4 }
+fd_state.file_descriptor: 23329.123697151 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[38313]", pid = 3386, fd = 5 }
+fd_state.file_descriptor: 23329.123703652 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[38314]", pid = 3386, fd = 6 }
+fd_state.file_descriptor: 23329.123706032 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[38315]", pid = 3386, fd = 7 }
+fd_state.file_descriptor: 23329.123713168 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/3", pid = 3701, fd = 0 }
+fd_state.file_descriptor: 23329.123715265 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/3", pid = 3701, fd = 1 }
+fd_state.file_descriptor: 23329.123717325 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/3", pid = 3701, fd = 2 }
+fd_state.file_descriptor: 23329.123720247 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/3", pid = 3701, fd = 255 }
+fd_state.file_descriptor: 23329.123722868 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 4080, fd = 0 }
+fd_state.file_descriptor: 23329.123725576 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 4080, fd = 1 }
+fd_state.file_descriptor: 23329.123727951 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 4080, fd = 2 }
+fd_state.file_descriptor: 23329.123730837 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 4081, fd = 0 }
+fd_state.file_descriptor: 23329.123732878 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 4081, fd = 1 }
+fd_state.file_descriptor: 23329.123735118 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 4081, fd = 2 }
+fd_state.file_descriptor: 23329.123737862 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[188219]", pid = 4081, fd = 3 }
+fd_state.file_descriptor: 23329.123744646 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/jdk1.6.0_16/jre/lib/rt.jar", pid = 4081, fd = 4 }
+fd_state.file_descriptor: 23329.123750400 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.equinox.launcher_1.1.0.v20091023.jar", pid = 4081, fd = 5 }
+fd_state.file_descriptor: 23329.123752990 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/random", pid = 4081, fd = 6 }
+fd_state.file_descriptor: 23329.123758060 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/urandom", pid = 4081, fd = 7 }
+fd_state.file_descriptor: 23329.123760188 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/random", pid = 4081, fd = 8 }
+fd_state.file_descriptor: 23329.123762285 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/urandom", pid = 4081, fd = 9 }
+fd_state.file_descriptor: 23329.123764783 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[70778]", pid = 4081, fd = 10 }
+fd_state.file_descriptor: 23329.123770438 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.osgi_3.6.0.v20091023.jar", pid = 4081, fd = 11 }
+fd_state.file_descriptor: 23329.123776094 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jdt.ui_3.6.0.v20091026-1200.jar", pid = 4081, fd = 12 }
+fd_state.file_descriptor: 23329.123779159 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[188241]", pid = 4081, fd = 13 }
+fd_state.file_descriptor: 23329.123787866 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/configuration/org.eclipse.osgi/.manager/.tmp4250888468523630486.instance", pid = 4081, fd = 14 }
+fd_state.file_descriptor: 23329.123793381 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.equinox.common_3.5.100.v20091023.jar", pid = 4081, fd = 15 }
+fd_state.file_descriptor: 23329.123802071 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.mylyn.commons.core_3.3.0.v20091013-0200-e3x.jar", pid = 4081, fd = 16 }
+fd_state.file_descriptor: 23329.123805148 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jdt.debug.ui_3.5.0.v20091026-1150.jar", pid = 4081, fd = 17 }
+fd_state.file_descriptor: 23329.123813128 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ui.views_3.5.0.I20090914-0830.jar", pid = 4081, fd = 18 }
+fd_state.file_descriptor: 23329.123818586 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.mylyn.tasks.ui_3.3.0.v20091013-0200-e3x.jar", pid = 4081, fd = 19 }
+fd_state.file_descriptor: 23329.123832001 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jdt.debug_3.5.100.v20091019/jdimodel.jar", pid = 4081, fd = 20 }
+fd_state.file_descriptor: 23329.123838143 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.equinox.registry_3.5.0.v20090911.jar", pid = 4081, fd = 21 }
+fd_state.file_descriptor: 23329.123866594 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.300.v20090810/runtime_registry_compatibility.jar", pid = 4081, fd = 22 }
+fd_state.file_descriptor: 23329.123869912 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jdt.junit_3.6.0.v20091026-1200.jar", pid = 4081, fd = 23 }
+fd_state.file_descriptor: 23329.123873064 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/configuration/org.eclipse.core.runtime/.extraData.9", pid = 4081, fd = 24 }
+fd_state.file_descriptor: 23329.123884195 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ui.externaltools_3.2.0.v20091023.jar", pid = 4081, fd = 25 }
+fd_state.file_descriptor: 23329.123890603 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.pde.api.tools_1.0.201.v20091028-1400.jar", pid = 4081, fd = 26 }
+fd_state.file_descriptor: 23329.123895746 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/configuration/org.eclipse.core.runtime/.mainData.9", pid = 4081, fd = 27 }
+fd_state.file_descriptor: 23329.123905195 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jdt.junit.core_3.6.0.v20091026-1200.jar", pid = 4081, fd = 28 }
+fd_state.file_descriptor: 23329.123908020 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/configuration/org.eclipse.core.runtime/.extraData.9", pid = 4081, fd = 29 }
+fd_state.file_descriptor: 23329.123914489 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/configuration/org.eclipse.equinox.app/.manager/.tmp8207493735468441416.instance", pid = 4081, fd = 30 }
+fd_state.file_descriptor: 23329.123917869 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/configuration/org.eclipse.core.runtime/.manager/.tmp7260807215584531017.instance", pid = 4081, fd = 31 }
+fd_state.file_descriptor: 23329.123920904 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/configuration/org.eclipse.core.runtime/.mainData.9", pid = 4081, fd = 32 }
+fd_state.file_descriptor: 23329.123926189 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ui.forms_3.5.0.v20091012.jar", pid = 4081, fd = 33 }
+fd_state.file_descriptor: 23329.123931851 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.tigris.subversion.subclipse.graph_1.0.7.jar", pid = 4081, fd = 34 }
+fd_state.file_descriptor: 23329.123935083 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ui.console_3.5.0.v20090907.jar", pid = 4081, fd = 35 }
+fd_state.file_descriptor: 23329.123938431 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/jdk1.6.0_16/jre/lib/jsse.jar", pid = 4081, fd = 36 }
+fd_state.file_descriptor: 23329.123941336 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.debug.ui_3.6.0.v20091026-1150.jar", pid = 4081, fd = 37 }
+fd_state.file_descriptor: 23329.123946887 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ui.workbench.texteditor_3.6.0.v20091026-1200.jar", pid = 4081, fd = 38 }
+fd_state.file_descriptor: 23329.123950088 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jface.text_3.5.100.v20091026-1200.jar", pid = 4081, fd = 39 }
+fd_state.file_descriptor: 23329.123959202 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jdt.apt.pluggable.core_1.0.300.v20090922-0135.jar", pid = 4081, fd = 40 }
+fd_state.file_descriptor: 23329.123962187 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jdt.core.manipulation_1.3.0.v20091026-1200.jar", pid = 4081, fd = 41 }
+fd_state.file_descriptor: 23329.123965148 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ui.editors_3.6.0.v20091028-1300.jar", pid = 4081, fd = 42 }
+fd_state.file_descriptor: 23329.123968207 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.core.filebuffers_3.5.100.v20091026-1200.jar", pid = 4081, fd = 43 }
+fd_state.file_descriptor: 23329.123971254 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ltk.ui.refactoring_3.4.200.v20091026-1200.jar", pid = 4081, fd = 44 }
+fd_state.file_descriptor: 23329.123982929 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.compare.core_3.5.100.I20090714-0800.jar", pid = 4081, fd = 45 }
+fd_state.file_descriptor: 23329.123985932 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.team.cvs.ui_3.3.300.I20091026-1300.jar", pid = 4081, fd = 46 }
+fd_state.file_descriptor: 23329.123988812 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.team.ui_3.5.100.I20091028-0800.jar", pid = 4081, fd = 47 }
+fd_state.file_descriptor: 23329.123991933 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.core.runtime_3.6.0.v20090925.jar", pid = 4081, fd = 48 }
+fd_state.file_descriptor: 23329.123997731 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.pde.launching_3.6.0.v20091023.jar", pid = 4081, fd = 49 }
+fd_state.file_descriptor: 23329.124001308 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ui.workbench_3.6.0.I20091028-1300.jar", pid = 4081, fd = 50 }
+fd_state.file_descriptor: 23329.124007056 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ui.workbench.compatibility_3.2.0.I20090429-1800/compatibility.jar", pid = 4081, fd = 51 }
+fd_state.file_descriptor: 23329.124010078 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jface_3.6.0.I20091028-1300.jar", pid = 4081, fd = 52 }
+fd_state.file_descriptor: 23329.124012970 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.swt_3.6.0.v3617.jar", pid = 4081, fd = 53 }
+fd_state.file_descriptor: 23329.124015844 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.swt.gtk.linux.x86_3.6.0.v3617.jar", pid = 4081, fd = 54 }
+fd_state.file_descriptor: 23329.124018725 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ui_3.6.0.I20091030-1100.jar", pid = 4081, fd = 55 }
+fd_state.file_descriptor: 23329.124021739 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.core.commands_3.5.0.I20090525-2000.jar", pid = 4081, fd = 56 }
+fd_state.file_descriptor: 23329.124024910 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[188248]", pid = 4081, fd = 57 }
+fd_state.file_descriptor: 23329.124027106 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[188248]", pid = 4081, fd = 58 }
+fd_state.file_descriptor: 23329.124032563 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ui.ide_3.6.0.I20091030-1100.jar", pid = 4081, fd = 59 }
+fd_state.file_descriptor: 23329.124048044 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/workspace/.metadata/.lock", pid = 4081, fd = 60 }
+fd_state.file_descriptor: 23329.124050912 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.core.resources_3.6.0.v20091026-1217.jar", pid = 4081, fd = 61 }
+fd_state.file_descriptor: 23329.124053786 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jdt.debug_3.5.100.v20091019/jdi.jar", pid = 4081, fd = 62 }
+fd_state.file_descriptor: 23329.124056629 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.mylyn.resources.ui_3.3.0.v20091013-0200-e3x.jar", pid = 4081, fd = 63 }
+fd_state.file_descriptor: 23329.124059620 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.core.contenttype_3.4.100.v20090928.jar", pid = 4081, fd = 64 }
+fd_state.file_descriptor: 23329.124072744 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.core.net_1.2.100.I20090714-0800.jar", pid = 4081, fd = 65 }
+fd_state.file_descriptor: 23329.124075797 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.core.variables_3.2.300.v20090911.jar", pid = 4081, fd = 66 }
+fd_state.file_descriptor: 23329.124078776 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/com.ibm.icu_4.0.1.v20090822.jar", pid = 4081, fd = 67 }
+fd_state.file_descriptor: 23329.124081613 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.team.core_3.5.0.I20091028-0800.jar", pid = 4081, fd = 68 }
+fd_state.file_descriptor: 23329.124084635 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.core.expressions_3.4.100.v20090429-1800.jar", pid = 4081, fd = 69 }
+fd_state.file_descriptor: 23329.124087540 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.tigris.subversion.subclipse.core_1.6.5.jar", pid = 4081, fd = 70 }
+fd_state.file_descriptor: 23329.124090359 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.tigris.subversion.clientadapter_1.6.4.1.jar", pid = 4081, fd = 71 }
+fd_state.file_descriptor: 23329.124171058 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.pde.ua.ui_1.0.0.v20090914.jar", pid = 4081, fd = 72 }
+fd_state.file_descriptor: 23329.124174352 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.tigris.subversion.clientadapter.svnkit_1.6.4.jar", pid = 4081, fd = 73 }
+fd_state.file_descriptor: 23329.124177404 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.tmatesoft.svnkit_1.3.1.6109.jar", pid = 4081, fd = 74 }
+fd_state.file_descriptor: 23329.124314728 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.equinox.p2.updatechecker_1.1.0.v20091010.jar", pid = 4081, fd = 75 }
+fd_state.file_descriptor: 23329.124464194 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.update.scheduler_3.2.200.v20081127.jar", pid = 4081, fd = 76 }
+kernel.irq_entry: 23329.124517640 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { ip = 3242331332, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_update_time: 23329.124531166 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { jiffies = 4297269583, xtime_sec = 1264196274, xtime_nsec = 637522002, walltomonotonic_sec = -1264172952, walltomonotonic_nsec = 189579727 }
+kernel.softirq_raise: 23329.124542094 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { softirq_id = 1 [softirq 1] }
+kernel.irq_exit: 23329.124569514 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.irq_entry: 23329.124582206 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { ip = 3238195230, handler = 0xf8a23c7f, irq_id = 14, kernel_mode = 1 }
+block.rq_complete_fs: 23329.124599241 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { hard_sector = 2431, rw = 0, errors = 0 }
+kernel.sched_try_wakeup: 23329.124609664 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { pid = 1304, cpu_id = 0, state = 2 }
+kernel.timer_set: 23329.124626927 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { expires = 2302288, function = 0xc141b0a5, data = 4136835584 }
+kernel.irq_exit: 23329.124634351 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.softirq_entry: 23329.124638699 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, SOFTIRQ { softirq_id = 1 [softirq 1] }
+kernel.timer_set: 23329.124646964 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, SOFTIRQ { expires = 2302288, function = 0xc141d458, data = 0 }
+kernel.timer_set: 23329.124651102 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, SOFTIRQ { expires = 2302288, function = 0xc14b0234, data = 0 }
+kernel.softirq_exit: 23329.124653316 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { softirq_id = 1 [softirq 1] }
+fd_state.file_descriptor: 23329.124666465 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jdt.junit.runtime_3.4.100.v20091026-1200.jar", pid = 4081, fd = 77 }
+fd_state.file_descriptor: 23329.124669549 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.update.core_3.2.300.v20090525.jar", pid = 4081, fd = 78 }
+fd_state.file_descriptor: 23329.124672799 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.mylyn.tasks.core_3.3.0.v20091013-0200-e3x.jar", pid = 4081, fd = 79 }
+fd_state.file_descriptor: 23329.124676019 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_1.0.200.v20090911-1356.jar", pid = 4081, fd = 80 }
+fd_state.file_descriptor: 23329.124679027 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.tigris.subversion.subclipse.ui_1.6.5.jar", pid = 4081, fd = 81 }
+fd_state.file_descriptor: 23329.124682544 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.mylyn.monitor.ui_3.3.0.v20091013-0200-e3x.jar", pid = 4081, fd = 82 }
+fd_state.file_descriptor: 23329.124691689 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.mylyn.context.core_3.3.0.v20091013-0200-e3x.jar", pid = 4081, fd = 83 }
+fd_state.file_descriptor: 23329.124697573 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.debug.core_3.6.0.v20091019.jar", pid = 4081, fd = 84 }
+fd_state.file_descriptor: 23329.124700502 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ant.ui_3.5.0.v20091023.jar", pid = 4081, fd = 85 }
+fd_state.file_descriptor: 23329.124709112 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.equinox.frameworkadmin_1.0.200.v20091019.jar", pid = 4081, fd = 86 }
+fd_state.file_descriptor: 23329.124715113 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.pde.core_3.5.100.v20091023.jar", pid = 4081, fd = 87 }
+fd_state.file_descriptor: 23329.124718030 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jdt.core_3.6.0.v_A19.jar", pid = 4081, fd = 88 }
+fd_state.file_descriptor: 23329.124721305 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jdt.launching_3.5.100.v20091026-1150.jar", pid = 4081, fd = 89 }
+fd_state.file_descriptor: 23329.124724272 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.pde.api.tools.ui_1.0.200.v20091023.jar", pid = 4081, fd = 90 }
+fd_state.file_descriptor: 23329.124727164 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.update.configurator_3.3.100.v20090813.jar", pid = 4081, fd = 91 }
+fd_state.file_descriptor: 23329.124729927 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jdt.compiler.apt_1.0.300.v20091027-0900.jar", pid = 4081, fd = 92 }
+fd_state.file_descriptor: 23329.124732931 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.mylyn.commons.net_3.3.0.v20091013-0200-e3x.jar", pid = 4081, fd = 93 }
+fd_state.file_descriptor: 23329.124735762 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jdt.compiler.tool_1.0.100.v_A19.jar", pid = 4081, fd = 94 }
+fd_state.file_descriptor: 23329.124741343 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.jdt.apt.core_3.3.400.v20091027-0900.jar", pid = 4081, fd = 95 }
+fd_state.file_descriptor: 23329.124744785 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.mylyn.monitor.core_3.3.0.v20091013-0200-e3x.jar", pid = 4081, fd = 96 }
+fd_state.file_descriptor: 23329.124750582 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.apache.commons.httpclient_3.1.0.v20080605-1935.jar", pid = 4081, fd = 97 }
+fd_state.file_descriptor: 23329.124756212 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.apache.commons.logging_1.0.4.v200904062259.jar", pid = 4081, fd = 98 }
+fd_state.file_descriptor: 23329.124759135 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.mylyn.context.ui_3.3.0.v20091013-0200-e3x.jar", pid = 4081, fd = 99 }
+fd_state.file_descriptor: 23329.124762120 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.mylyn.commons.ui_3.3.0.v20091013-0200-e3x.jar", pid = 4081, fd = 100 }
+fd_state.file_descriptor: 23329.124772045 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/workspace/.metadata/.plugins/org.eclipse.pde.core/.extensions/.manager/.tmp284147286907703089.instance", pid = 4081, fd = 101 }
+fd_state.file_descriptor: 23329.124775098 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.mylyn.team.ui_3.3.0.v20091013-0200-e3x.jar", pid = 4081, fd = 102 }
+fd_state.file_descriptor: 23329.124780814 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.equinox.util_1.0.100.v20090520-1800.jar", pid = 4081, fd = 103 }
+fd_state.file_descriptor: 23329.124790053 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/configuration/org.eclipse.osgi/bundles/361/1/.cp/jna.jar", pid = 4081, fd = 104 }
+fd_state.file_descriptor: 23329.124796356 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/configuration/org.eclipse.osgi/bundles/384/1/.cp/svnkit.jar", pid = 4081, fd = 105 }
+fd_state.file_descriptor: 23329.124799446 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/configuration/org.eclipse.osgi/bundles/384/1/.cp/svnkit-javahl.jar", pid = 4081, fd = 106 }
+fd_state.file_descriptor: 23329.124802474 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.equinox.preferences_3.3.0.v20091023.jar", pid = 4081, fd = 107 }
+fd_state.file_descriptor: 23329.124808105 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.text_3.5.0.v20091026-1200.jar", pid = 4081, fd = 108 }
+fd_state.file_descriptor: 23329.124811183 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/com.collabnet.subversion.merge_1.10.0.jar", pid = 4081, fd = 109 }
+fd_state.file_descriptor: 23329.124814161 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.tigris.subversion.subclipse.mylyn_3.0.0.jar", pid = 4081, fd = 110 }
+fd_state.file_descriptor: 23329.124817338 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/jdk1.6.0_16/jre/lib/resources.jar", pid = 4081, fd = 111 }
+fd_state.file_descriptor: 23329.124822555 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.pde_3.4.100.v200910301201.jar", pid = 4081, fd = 112 }
+fd_state.file_descriptor: 23329.124825485 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.pde.ui_3.6.0.v20091023.jar", pid = 4081, fd = 113 }
+fd_state.file_descriptor: 23329.124828322 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.core.filesystem_1.3.0.v20091026-1217.jar", pid = 4081, fd = 114 }
+fd_state.file_descriptor: 23329.124831258 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.pde.build_3.5.100.v20091023/pdebuild.jar", pid = 4081, fd = 115 }
+fd_state.file_descriptor: 23329.124836284 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/random", pid = 4081, fd = 116 }
+fd_state.file_descriptor: 23329.124842230 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.equinox.p2.engine_1.1.0.v20091023.jar", pid = 4081, fd = 117 }
+fd_state.file_descriptor: 23329.124845195 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.core.filesystem.linux.x86_1.2.0.v20080604-1400.jar", pid = 4081, fd = 118 }
+fd_state.file_descriptor: 23329.124850659 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ui.source_3.6.0.I20091030-1100.jar", pid = 4081, fd = 119 }
+fd_state.file_descriptor: 23329.124853231 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/urandom", pid = 4081, fd = 120 }
+fd_state.file_descriptor: 23329.124861860 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[71955]", pid = 4081, fd = 121 }
+fd_state.file_descriptor: 23329.124864043 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[71955]", pid = 4081, fd = 122 }
+fd_state.file_descriptor: 23329.124868853 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[71956]", pid = 4081, fd = 123 }
+fd_state.file_descriptor: 23329.124870950 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[71956]", pid = 4081, fd = 124 }
+fd_state.file_descriptor: 23329.124873843 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.equinox.p2.metadata_1.0.100.v20091019.jar", pid = 4081, fd = 125 }
+fd_state.file_descriptor: 23329.124876958 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ltk.core.refactoring_3.5.100.v20091026-1200.jar", pid = 4081, fd = 126 }
+fd_state.file_descriptor: 23329.124883063 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.core.resources.source_3.6.0.v20091026-1217.jar", pid = 4081, fd = 127 }
+fd_state.file_descriptor: 23329.124885950 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[71980]", pid = 4081, fd = 128 }
+fd_state.file_descriptor: 23329.124888071 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[71980]", pid = 4081, fd = 129 }
+fd_state.file_descriptor: 23329.124890705 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.ant.core_3.2.100.v20091012.jar", pid = 4081, fd = 130 }
+fd_state.file_descriptor: 23329.124893523 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/jdk1.6.0_16/jre/lib/jce.jar", pid = 4081, fd = 131 }
+fd_state.file_descriptor: 23329.124902798 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.equinox.p2.ui.sdk.scheduler_1.0.0.v20091010.jar", pid = 4081, fd = 132 }
+fd_state.file_descriptor: 23329.124909095 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.cache/event-sound-cache.tdb.7f394062173ac92d2672d52e4ae5a068.i486-pc-linux-gnu", pid = 4081, fd = 133 }
+fd_state.file_descriptor: 23329.124915436 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.core.expressions.source_3.4.100.v20090429-1800.jar", pid = 4081, fd = 134 }
+fd_state.file_descriptor: 23329.124921257 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/share/xulrunner-1.9.1/chrome/classic.jar", pid = 4081, fd = 135 }
+fd_state.file_descriptor: 23329.124923903 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/share/xulrunner-1.9.1/chrome/toolkit.jar", pid = 4081, fd = 136 }
+fd_state.file_descriptor: 23329.124926500 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/share/xulrunner-1.9.1/chrome/en-US.jar", pid = 4081, fd = 137 }
+fd_state.file_descriptor: 23329.124929275 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.compare_3.5.100.I20091026-1300.jar", pid = 4081, fd = 138 }
+fd_state.file_descriptor: 23329.124931699 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/urandom", pid = 4081, fd = 139 }
+fd_state.file_descriptor: 23329.124934302 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[188699]", pid = 4081, fd = 140 }
+fd_state.file_descriptor: 23329.124936306 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[188699]", pid = 4081, fd = 141 }
+fd_state.file_descriptor: 23329.124938680 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[188700]", pid = 4081, fd = 142 }
+fd_state.file_descriptor: 23329.124943633 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[72611]", pid = 4081, fd = 143 }
+fd_state.file_descriptor: 23329.124945810 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[188700]", pid = 4081, fd = 144 }
+fd_state.file_descriptor: 23329.124948684 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[188701]", pid = 4081, fd = 145 }
+fd_state.file_descriptor: 23329.124954074 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[188704]", pid = 4081, fd = 146 }
+fd_state.file_descriptor: 23329.124956245 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[188704]", pid = 4081, fd = 147 }
+fd_state.file_descriptor: 23329.124958718 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[188705]", pid = 4081, fd = 148 }
+fd_state.file_descriptor: 23329.124960828 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[188705]", pid = 4081, fd = 149 }
+fd_state.file_descriptor: 23329.124963276 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[188706]", pid = 4081, fd = 150 }
+fd_state.file_descriptor: 23329.124965805 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[188708]", pid = 4081, fd = 151 }
+fd_state.file_descriptor: 23329.124968272 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[188711]", pid = 4081, fd = 152 }
+fd_state.file_descriptor: 23329.124976037 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla/eclipse/places.sqlite", pid = 4081, fd = 153 }
+fd_state.file_descriptor: 23329.124978620 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/share/xulrunner-1.9.1/chrome/classic.jar", pid = 4081, fd = 154 }
+fd_state.file_descriptor: 23329.124981124 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/share/xulrunner-1.9.1/chrome/toolkit.jar", pid = 4081, fd = 155 }
+fd_state.file_descriptor: 23329.124983647 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/share/xulrunner-1.9.1/chrome/en-US.jar", pid = 4081, fd = 156 }
+fd_state.file_descriptor: 23329.124988833 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla/eclipse/permissions.sqlite", pid = 4081, fd = 157 }
+fd_state.file_descriptor: 23329.124994792 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/dropins/JOIE/eclipse/plugins/org.eclipse.rse.core.source_3.1.1.v200909160005.jar", pid = 4081, fd = 158 }
+fd_state.file_descriptor: 23329.125000237 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/local/eclipse-3.6/plugins/org.eclipse.help.source_3.5.0.v20091019.jar", pid = 4081, fd = 159 }
+fd_state.file_descriptor: 23329.125002765 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/random", pid = 4081, fd = 160 }
+fd_state.file_descriptor: 23329.125005226 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[237992]", pid = 4081, fd = 161 }
+fd_state.file_descriptor: 23329.125010789 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla/eclipse/places.sqlite-journal", pid = 4081, fd = 162 }
+fd_state.file_descriptor: 23329.125013238 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla/eclipse", pid = 4081, fd = 163 }
+kernel.sched_schedule: 23329.125021003 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { prev_pid = 16927, next_pid = 1304, prev_state = 0 }
+kernel.page_fault_exit: 23329.125112070 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { res = 4 }
+kernel.syscall_entry: 23329.125132583 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb776b6a3, syscall_id = 240 [syscall 240] }
+kernel.sched_try_wakeup: 23329.125146114 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, SYSCALL { pid = 16834, cpu_id = 0, state = 1 }
+kernel.syscall_exit: 23329.125149567 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.125162235 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 158 [syscall 158] }
+kernel.sched_schedule: 23329.125172911 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { prev_pid = 1304, next_pid = 16834, prev_state = 0 }
+kernel.syscall_exit: 23329.125202756 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.125229108 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 240 [syscall 240] }
+kernel.syscall_exit: 23329.125231205 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.125235017 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 158 [syscall 158] }
+kernel.syscall_exit: 23329.125243669 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.125302494 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 4 [syscall 4] }
+fs.write: 23329.125450252 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { count = 68, fd = 4 }
+kernel.syscall_exit: 23329.125451911 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 68 }
+kernel.syscall_entry: 23329.125463758 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 4 [syscall 4] }
+mm.add_to_page_cache: 23329.125477752 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { inode = 0, sdev = 2 }
+mm.add_to_page_cache: 23329.125485172 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { inode = 0, sdev = 2 }
+block.remap: 23329.125491685 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { device_from = 3145728, sector_from = 36176128, device_to = 3145730, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 100, not_uptodate = 0 }
+block.bio_queue: 23329.125494903 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { sector = 39099958, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 100, not_uptodate = 0 }
+block.getrq_bio: 23329.125533456 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { sector = 39099958, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 100, not_uptodate = 0 }
+kernel.timer_set: 23329.125539444 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { expires = 2302288, function = 0xc1410312, data = 4147888232 }
+block.plug: 23329.125542941 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL
+block.rq_insert_fs: 23329.125547518 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { hard_sector = 39099958, rw = 0, errors = 0 }
+block.rq_issue_fs: 23329.125561129 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { hard_sector = 39099958, rw = 0, errors = 0 }
+kernel.timer_set: 23329.125595678 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { expires = 2304287, function = 0xf8a23e85, data = 4136733696 }
+fs.buffer_wait_start: 23329.125647954 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { bh = 0xe9709208 }
+block.unplug_io: 23329.125651160 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { pdu = 1 }
+kernel.irq_entry: 23329.125682120 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, IRQ { ip = 3243785178, handler = 0xf8a23c7f, irq_id = 14, kernel_mode = 1 }
+block.rq_complete_fs: 23329.125697570 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, IRQ { hard_sector = 39099958, rw = 0, errors = 0 }
+kernel.sched_try_wakeup: 23329.125705168 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, IRQ { pid = 16834, cpu_id = 0, state = 2 }
+kernel.timer_set: 23329.125716447 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, IRQ { expires = 2302288, function = 0xc141b0a5, data = 4136835584 }
+kernel.irq_exit: 23329.125723498 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { handled = 1 }
+fs.buffer_wait_end: 23329.125735500 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { bh = 0xe9709208 }
+mm.add_to_page_cache: 23329.125754316 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { inode = 1130989, sdev = 3145730 }
+mm.add_to_page_cache: 23329.125780706 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { inode = 0, sdev = 2 }
+block.remap: 23329.125786479 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { device_from = 3145728, sector_from = 36421840, device_to = 3145730, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_queue: 23329.125789507 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { sector = 39345670, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.getrq_bio: 23329.125794884 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { sector = 39345670, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+kernel.timer_set: 23329.125798905 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { expires = 2302288, function = 0xc1410312, data = 4147888232 }
+block.plug: 23329.125816446 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL
+block.rq_insert_fs: 23329.125820553 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { hard_sector = 39345670, rw = 0, errors = 0 }
+fs.buffer_wait_start: 23329.125826221 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { bh = 0xe9709160 }
+block.unplug_io: 23329.125828386 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { pdu = 1 }
+block.rq_issue_fs: 23329.125834825 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { hard_sector = 39345670, rw = 0, errors = 0 }
+kernel.timer_set: 23329.125867086 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { expires = 2304287, function = 0xf8a23e85, data = 4136733696 }
+kernel.sched_schedule: 23329.125919275 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, SYSCALL { prev_pid = 16834, next_pid = 1304, prev_state = 2 }
+kernel.syscall_exit: 23329.125981380 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.125989336 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 23329.125992284 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.126002275 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 158 [syscall 158] }
+kernel.syscall_exit: 23329.126012106 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.page_fault_entry: 23329.126022326 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { ip = 0xb760659a, address = 0xb760aca0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.126062678 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { res = 0 }
+kernel.page_fault_entry: 23329.126072392 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, TRAP { ip = 0xb76065d7, address = 0xb760a000, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.126101588 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { res = 8 }
+kernel.syscall_entry: 23329.126106540 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 3 [syscall 3] }
+kernel.sched_schedule: 23329.126120756 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { prev_pid = 1304, next_pid = 1989, prev_state = 1 }
+fs.writev: 23329.126290088 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 48, vlen = 1 }
+kernel.syscall_exit: 23329.126292364 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 32 }
+kernel.syscall_entry: 23329.126300616 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7657e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.126303804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.126307776 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 23329.126310248 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 23329.126315743 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.126324384 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 142 [syscall 142] }
+fs.select: 23329.126330200 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 1, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126333642 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 3, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126336091 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 5, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126342091 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 7, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126344336 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 13, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126347204 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 19, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126349609 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 20, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126351724 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 21, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126354191 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 22, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126356344 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 23, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126358379 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 24, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126360433 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 25, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126362783 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 26, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126365206 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 27, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126367439 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 28, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126370060 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 29, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126372472 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 30, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126374889 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 31, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126382303 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 32, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126384739 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 33, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126387169 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 34, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126389574 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 35, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126391978 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 37, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126394495 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 38, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126396882 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 39, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126399071 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 40, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126401544 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 41, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126404031 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 42, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126406342 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 43, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126408618 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 44, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126410900 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 45, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126413336 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 46, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126415433 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 48, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126417666 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 49, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126420114 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 50, end_time_sec = 23660, end_time_nsec = 559904604 }
+fs.select: 23329.126422261 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 52, end_time_sec = 23660, end_time_nsec = 559904604 }
+mm.page_free: 23329.126429921 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pfn = 198016, order = 0 }
+kernel.syscall_exit: 23329.126433899 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.126441034 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 23329.126442848 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 23329.126449354 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.126453024 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7657e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.126455416 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.126460832 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.126466937 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 4096, fd = 48 }
+kernel.syscall_exit: 23329.126468189 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 4096 }
+kernel.syscall_entry: 23329.126692397 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.126697085 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 2652, fd = 48 }
+kernel.syscall_exit: 23329.126698472 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 2652 }
+kernel.syscall_entry: 23329.126938291 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.126942953 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 4076, fd = 48 }
+kernel.syscall_exit: 23329.126944279 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 4076 }
+kernel.syscall_entry: 23329.127634489 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.127639046 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 3548, fd = 48 }
+kernel.syscall_exit: 23329.127640582 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 3548 }
+kernel.syscall_entry: 23329.127895381 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.127929647 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 9028, fd = 48 }
+kernel.syscall_exit: 23329.127931208 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 9028 }
+kernel.syscall_entry: 23329.127953860 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.127956123 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 12168, fd = 48 }
+kernel.syscall_exit: 23329.127957375 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.127961279 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7657e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.127964054 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.127967403 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 23329.127970333 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 23329.127974773 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.127979855 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 142 [syscall 142] }
+fs.select: 23329.127985301 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 1, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.127988169 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 3, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.127990285 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 5, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.127994275 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 7, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.127996409 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 13, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.127998629 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 19, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128000695 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 20, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128002650 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 21, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128004587 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 22, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128006622 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 23, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128008639 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 24, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128010662 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 25, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128012845 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 26, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128014886 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 27, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128017291 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 28, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128019494 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 29, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128021566 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 30, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128023718 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 31, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128031044 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 32, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128033185 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 33, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128035141 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 34, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128037107 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 35, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128039093 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 37, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128041079 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 38, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128043231 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 39, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128045217 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 40, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128047234 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 41, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128049300 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 42, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128051261 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 43, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128053691 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 44, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128055844 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 45, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128057830 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 46, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128059791 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 48, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128061832 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 49, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128063861 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 50, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.128065903 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 52, end_time_sec = 23660, end_time_nsec = 559560532 }
+kernel.sched_schedule: 23329.128085299 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { prev_pid = 1989, next_pid = 2336, prev_state = 1 }
+kernel.syscall_entry: 23329.128543770 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.128547575 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 23329.128549868 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 9 }
+fs.pollfd: 23329.128551953 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+fs.pollfd: 23329.128553447 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 5 }
+fs.pollfd: 23329.128555394 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 12 }
+fs.pollfd: 23329.128559687 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 19 }
+fs.pollfd: 23329.128561821 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 16 }
+fs.pollfd: 23329.128564584 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 26 }
+fs.pollfd: 23329.128566570 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 10 }
+fs.pollfd: 23329.128569308 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 17 }
+kernel.syscall_exit: 23329.128571584 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.128668289 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 54 [syscall 54] }
+fs.ioctl: 23329.128671083 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 10, cmd = 21531, arg = 3215728168 }
+kernel.syscall_exit: 23329.128675301 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.128680438 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.128688640 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { count = 24, fd = 10 }
+kernel.syscall_exit: 23329.128689930 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 24 }
+kernel.syscall_entry: 23329.128724251 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb6094e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.128727298 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.128732429 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb6094e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.128734662 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.128785308 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.128787565 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 23329.128790199 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.128793825 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 146 [syscall 146] }
+kernel.sched_try_wakeup: 23329.128823793 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { pid = 1989, cpu_id = 0, state = 1 }
+fs.writev: 23329.128829294 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8, vlen = 3 }
+kernel.syscall_exit: 23329.128830940 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 15136 }
+kernel.syscall_entry: 23329.128837109 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.128839427 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 23329.128840611 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.128849560 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.128851496 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 23329.128852699 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.128856732 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb6094e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.128859212 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.128863307 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.128867297 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 23329.128869277 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 9 }
+fs.pollfd: 23329.128871257 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+fs.pollfd: 23329.128872706 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 5 }
+fs.pollfd: 23329.128874180 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 12 }
+fs.pollfd: 23329.128877171 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 19 }
+fs.pollfd: 23329.128878800 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 16 }
+fs.pollfd: 23329.128880934 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 26 }
+fs.pollfd: 23329.128882475 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 10 }
+fs.pollfd: 23329.128884671 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 17 }
+kernel.sched_schedule: 23329.128895100 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { prev_pid = 2336, next_pid = 16927, prev_state = 1 }
+fd_state.file_descriptor: 23329.129021167 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 4182, fd = 0 }
+fd_state.file_descriptor: 23329.129023949 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 4182, fd = 1 }
+fd_state.file_descriptor: 23329.129026033 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 4182, fd = 2 }
+fd_state.file_descriptor: 23329.129028013 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 4182, fd = 3 }
+fd_state.file_descriptor: 23329.129030079 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 4182, fd = 4 }
+fd_state.file_descriptor: 23329.129034594 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[71966]", pid = 4182, fd = 5 }
+fd_state.file_descriptor: 23329.129036771 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[71966]", pid = 4182, fd = 6 }
+fd_state.file_descriptor: 23329.129039121 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[71967]", pid = 4182, fd = 7 }
+fd_state.file_descriptor: 23329.129041248 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[71967]", pid = 4182, fd = 8 }
+fd_state.file_descriptor: 23329.129047581 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[71968]", pid = 4182, fd = 9 }
+fd_state.file_descriptor: 23329.129049716 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[71968]", pid = 4182, fd = 10 }
+fd_state.file_descriptor: 23329.129052510 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[71970]", pid = 4182, fd = 11 }
+fd_state.file_descriptor: 23329.129054976 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[71972]", pid = 4182, fd = 12 }
+fd_state.file_descriptor: 23329.129057493 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[71977]", pid = 4182, fd = 13 }
+fd_state.file_descriptor: 23329.129060108 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[188707]", pid = 4182, fd = 14 }
+fd_state.file_descriptor: 23329.129063006 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[188710]", pid = 4182, fd = 15 }
+fd_state.file_descriptor: 23329.129069266 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[79279]", pid = 4182, fd = 16 }
+fd_state.file_descriptor: 23329.129071802 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[79282]", pid = 4182, fd = 17 }
+fd_state.file_descriptor: 23329.129075853 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 5051, fd = 0 }
+fd_state.file_descriptor: 23329.129078246 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 5051, fd = 1 }
+fd_state.file_descriptor: 23329.129080460 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 5051, fd = 2 }
+fd_state.file_descriptor: 23329.129087466 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/lib/icedove/icedove", pid = 5051, fd = 255 }
+fd_state.file_descriptor: 23329.129093295 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 5063, fd = 0 }
+fd_state.file_descriptor: 23329.129095490 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 5063, fd = 1 }
+fd_state.file_descriptor: 23329.129097643 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 5063, fd = 2 }
+fd_state.file_descriptor: 23329.129107011 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/lib/icedove/run-mozilla.sh", pid = 5063, fd = 255 }
+fd_state.file_descriptor: 23329.129110181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 5064, fd = 0 }
+fd_state.file_descriptor: 23329.129112370 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 5064, fd = 1 }
+fd_state.file_descriptor: 23329.129114572 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 5064, fd = 2 }
+fd_state.file_descriptor: 23329.129122719 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[79249]", pid = 5064, fd = 3 }
+fd_state.file_descriptor: 23329.129124921 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[79249]", pid = 5064, fd = 4 }
+fd_state.file_descriptor: 23329.129130293 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[79259]", pid = 5064, fd = 5 }
+fd_state.file_descriptor: 23329.129137755 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[79297]", pid = 5064, fd = 6 }
+fd_state.file_descriptor: 23329.129140259 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[79431]", pid = 5064, fd = 7 }
+fd_state.file_descriptor: 23329.129142782 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[146087]", pid = 5064, fd = 8 }
+fd_state.file_descriptor: 23329.129145384 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[81174]", pid = 5064, fd = 9 }
+fd_state.file_descriptor: 23329.129151471 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[126319]", pid = 5064, fd = 10 }
+fd_state.file_descriptor: 23329.129154086 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[82566]", pid = 5064, fd = 11 }
+fd_state.file_descriptor: 23329.129156825 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[146013]", pid = 5064, fd = 12 }
+fd_state.file_descriptor: 23329.129162147 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[174184]", pid = 5064, fd = 13 }
+fd_state.file_descriptor: 23329.129167383 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[194953]", pid = 5064, fd = 14 }
+fd_state.file_descriptor: 23329.129172804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[192687]", pid = 5064, fd = 15 }
+fd_state.file_descriptor: 23329.129182037 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.amsn/half_elf1_hotmail_com/logs/mehitabel_@hotmail.com.log", pid = 5064, fd = 16 }
+fd_state.file_descriptor: 23329.129184911 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[80922]", pid = 5064, fd = 17 }
+fd_state.file_descriptor: 23329.129187631 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[214771]", pid = 5064, fd = 18 }
+fd_state.file_descriptor: 23329.129189981 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[249767]", pid = 5064, fd = 19 }
+fd_state.file_descriptor: 23329.129196000 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[256313]", pid = 5064, fd = 20 }
+fd_state.file_descriptor: 23329.129198603 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[272326]", pid = 5064, fd = 21 }
+fd_state.file_descriptor: 23329.129204726 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[281806]", pid = 5064, fd = 22 }
+fd_state.file_descriptor: 23329.129208125 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 5069, fd = 0 }
+fd_state.file_descriptor: 23329.129210284 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 5069, fd = 1 }
+fd_state.file_descriptor: 23329.129212418 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.xsession-errors", pid = 5069, fd = 2 }
+fd_state.file_descriptor: 23329.129215260 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[79254]", pid = 5069, fd = 3 }
+fd_state.file_descriptor: 23329.129217758 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[79256]", pid = 5069, fd = 4 }
+fd_state.file_descriptor: 23329.129219941 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[79256]", pid = 5069, fd = 5 }
+fd_state.file_descriptor: 23329.129225942 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/.parentlock", pid = 5069, fd = 6 }
+fd_state.file_descriptor: 23329.129234552 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[79267]", pid = 5069, fd = 7 }
+fd_state.file_descriptor: 23329.129236686 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[79267]", pid = 5069, fd = 8 }
+fd_state.file_descriptor: 23329.129244759 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[79269]", pid = 5069, fd = 9 }
+fd_state.file_descriptor: 23329.129246893 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[79269]", pid = 5069, fd = 10 }
+fd_state.file_descriptor: 23329.129256379 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/extensions/{c1ac4523-76c2-9995-adbd-d93bf5141bea}/chrome/DisplayQuota.jar", pid = 5069, fd = 11 }
+fd_state.file_descriptor: 23329.129265451 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/share/icedove/chrome/en-US.jar", pid = 5069, fd = 12 }
+fd_state.file_descriptor: 23329.129268245 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/share/icedove/chrome/classic.jar", pid = 5069, fd = 13 }
+fd_state.file_descriptor: 23329.129276237 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[79272]", pid = 5069, fd = 14 }
+fd_state.file_descriptor: 23329.129278384 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[79272]", pid = 5069, fd = 15 }
+fd_state.file_descriptor: 23329.129283713 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[79273]", pid = 5069, fd = 16 }
+fd_state.file_descriptor: 23329.129285841 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[79273]", pid = 5069, fd = 17 }
+fd_state.file_descriptor: 23329.129291020 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[79274]", pid = 5069, fd = 18 }
+fd_state.file_descriptor: 23329.129295763 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[79278]", pid = 5069, fd = 19 }
+fd_state.file_descriptor: 23329.129298199 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[79280]", pid = 5069, fd = 20 }
+fd_state.file_descriptor: 23329.129303417 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[79283]", pid = 5069, fd = 21 }
+fd_state.file_descriptor: 23329.129309042 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/share/icedove/chrome/toolkit.jar", pid = 5069, fd = 22 }
+fd_state.file_descriptor: 23329.129314592 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/XUL.mfasl", pid = 5069, fd = 23 }
+fd_state.file_descriptor: 23329.129319847 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/share/icedove/chrome/messenger.jar", pid = 5069, fd = 24 }
+fd_state.file_descriptor: 23329.129323103 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/lib/enigmail/extension/chrome/enigmail-skin-tbird.jar", pid = 5069, fd = 25 }
+fd_state.file_descriptor: 23329.129329925 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/extensions/{F8147CF4-B9E3-445B-AA87-081ED66548F8}/chrome/chrome.jar", pid = 5069, fd = 26 }
+fd_state.file_descriptor: 23329.129335895 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/lib/enigmail/extension/chrome/enigmail.jar", pid = 5069, fd = 27 }
+fd_state.file_descriptor: 23329.129338719 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/panacea.dat", pid = 5069, fd = 28 }
+fd_state.file_descriptor: 23329.129344603 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/ImapMail/courriel.polymtl.ca/filterlog.html", pid = 5069, fd = 29 }
+fd_state.file_descriptor: 23329.129347798 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.cache/event-sound-cache.tdb.7f394062173ac92d2672d52e4ae5a068.i486-pc-linux-gnu", pid = 5069, fd = 30 }
+fd_state.file_descriptor: 23329.129353626 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/cert8.db", pid = 5069, fd = 31 }
+fd_state.file_descriptor: 23329.129356500 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/key3.db", pid = 5069, fd = 32 }
+fd_state.file_descriptor: 23329.129359208 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[79326]", pid = 5069, fd = 33 }
+fd_state.file_descriptor: 23329.129361297 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[79326]", pid = 5069, fd = 34 }
+fd_state.file_descriptor: 23329.129364196 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/ImapMail/courriel.polymtl.ca/INBOX.msf", pid = 5069, fd = 35 }
+fd_state.file_descriptor: 23329.129369728 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[272929]", pid = 5069, fd = 36 }
+fd_state.file_descriptor: 23329.129375359 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[274174]", pid = 5069, fd = 37 }
+fd_state.file_descriptor: 23329.129381798 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/ImapMail/nova.aep.polymtl.ca/INBOX.msf", pid = 5069, fd = 38 }
+fd_state.file_descriptor: 23329.129384715 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[79373]", pid = 5069, fd = 39 }
+fd_state.file_descriptor: 23329.129390488 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/ImapMail/orion.aep.polymtl-3.ca/INBOX.msf", pid = 5069, fd = 40 }
+fd_state.file_descriptor: 23329.129393232 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[79381]", pid = 5069, fd = 41 }
+fd_state.file_descriptor: 23329.129398425 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[79379]", pid = 5069, fd = 42 }
+fd_state.file_descriptor: 23329.129403945 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/urlclassifier2.sqlite", pid = 5069, fd = 43 }
+fd_state.file_descriptor: 23329.129406875 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/abook.mab", pid = 5069, fd = 44 }
+fd_state.file_descriptor: 23329.129412178 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[79819]", pid = 5069, fd = 45 }
+fd_state.file_descriptor: 23329.129418470 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/ImapMail/courriel.polymtl.ca/INBOX.sbd/Trash.msf", pid = 5069, fd = 46 }
+fd_state.file_descriptor: 23329.129421874 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/Mail/Local Folders/Trash.msf", pid = 5069, fd = 47 }
+fd_state.file_descriptor: 23329.129427326 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/Mail/Local Folders/Inbox.msf", pid = 5069, fd = 48 }
+fd_state.file_descriptor: 23329.129430367 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/ImapMail/nova.aep.polymtl.ca/Trash.msf", pid = 5069, fd = 49 }
+fd_state.file_descriptor: 23329.129433332 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/Mail/mail.aei.ca/Inbox.msf", pid = 5069, fd = 50 }
+fd_state.file_descriptor: 23329.129439105 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/usr/share/icedove/chrome/comm.jar", pid = 5069, fd = 51 }
+fd_state.file_descriptor: 23329.129441726 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[93386]", pid = 5069, fd = 52 }
+fd_state.file_descriptor: 23329.129444712 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/ImapMail/imap.gmail-1.com/INBOX.msf", pid = 5069, fd = 53 }
+fd_state.file_descriptor: 23329.129447419 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[93116]", pid = 5069, fd = 54 }
+fd_state.file_descriptor: 23329.129450317 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/ImapMail/courriel.polymtl.ca/INBOX.sbd/Sent.msf", pid = 5069, fd = 55 }
+fd_state.file_descriptor: 23329.129453309 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/urlclassifier2.sqlite", pid = 5069, fd = 56 }
+fd_state.file_descriptor: 23329.129462455 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[100246]", pid = 5069, fd = 57 }
+fd_state.file_descriptor: 23329.129465021 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[100246]", pid = 5069, fd = 58 }
+fd_state.file_descriptor: 23329.129467451 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[100247]", pid = 5069, fd = 59 }
+fd_state.file_descriptor: 23329.129469615 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[100247]", pid = 5069, fd = 60 }
+fd_state.file_descriptor: 23329.129475579 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/ImapMail/courriel.polymtl.ca/INBOX.sbd/Drafts.msf", pid = 5069, fd = 61 }
+fd_state.file_descriptor: 23329.129481549 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/ImapMail/orion.aep.polymtl-3.ca/Trash.msf", pid = 5069, fd = 62 }
+fd_state.file_descriptor: 23329.129484763 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/ImapMail/imap.gmail-1.com/Trash.msf", pid = 5069, fd = 63 }
+fd_state.file_descriptor: 23329.129487914 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/ImapMail/imap.gmail-1.com/Facebook.msf", pid = 5069, fd = 64 }
+fd_state.file_descriptor: 23329.129493835 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/home/william/.mozilla-thunderbird/e8zhg55p.default/ImapMail/courriel.polymtl.ca/INBOX.sbd/B43.msf", pid = 5069, fd = 65 }
+fd_state.file_descriptor: 23329.129496629 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[100251]", pid = 5069, fd = 67 }
+fd_state.file_descriptor: 23329.129498843 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[100251]", pid = 5069, fd = 68 }
+fd_state.file_descriptor: 23329.129505757 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 16884, fd = 0 }
+fd_state.file_descriptor: 23329.129507840 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 16884, fd = 1 }
+fd_state.file_descriptor: 23329.129510246 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 16884, fd = 2 }
+fd_state.file_descriptor: 23329.129513139 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 16884, fd = 255 }
+fd_state.file_descriptor: 23329.129515846 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 16900, fd = 0 }
+fd_state.file_descriptor: 23329.129517825 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 16900, fd = 1 }
+fd_state.file_descriptor: 23329.129519805 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 16900, fd = 2 }
+fd_state.file_descriptor: 23329.129522574 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "socket:[284223]", pid = 16900, fd = 4 }
+fd_state.file_descriptor: 23329.129526330 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 16908, fd = 0 }
+fd_state.file_descriptor: 23329.129528341 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 16908, fd = 1 }
+fd_state.file_descriptor: 23329.129530395 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 16908, fd = 2 }
+fd_state.file_descriptor: 23329.129533275 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 16908, fd = 255 }
+fd_state.file_descriptor: 23329.129535760 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 16927, fd = 0 }
+fd_state.file_descriptor: 23329.129537740 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 16927, fd = 1 }
+fd_state.file_descriptor: 23329.129539720 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/pts/4", pid = 16927, fd = 2 }
+fd_state.file_descriptor: 23329.129542791 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/proc/16927/mounts", pid = 16927, fd = 3 }
+fd_state.file_descriptor: 23329.129546214 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/control/trace/enabled", pid = 16927, fd = 4 }
+fd_state.file_descriptor: 23329.129570064 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 16929, fd = 0 }
+fd_state.file_descriptor: 23329.129572611 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 16929, fd = 1 }
+fd_state.file_descriptor: 23329.129574603 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/dev/null", pid = 16929, fd = 2 }
+fd_state.file_descriptor: 23329.129576792 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/proc/16927/mounts", pid = 16929, fd = 3 }
+fd_state.file_descriptor: 23329.129579221 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "inotify", pid = 16929, fd = 4 }
+fd_state.file_descriptor: 23329.129581991 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[284543]", pid = 16929, fd = 5 }
+fd_state.file_descriptor: 23329.129584773 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/irq_state_0", pid = 16929, fd = 6 }
+fd_state.file_descriptor: 23329.129587438 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/irq_state_0", pid = 16929, fd = 7 }
+fd_state.file_descriptor: 23329.129589873 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/syscall_state_0", pid = 16929, fd = 8 }
+fd_state.file_descriptor: 23329.129592290 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/syscall_state_0", pid = 16929, fd = 9 }
+fd_state.file_descriptor: 23329.129594726 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/softirq_state_0", pid = 16929, fd = 10 }
+fd_state.file_descriptor: 23329.129597132 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/softirq_state_0", pid = 16929, fd = 11 }
+fd_state.file_descriptor: 23329.129599568 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/module_state_0", pid = 16929, fd = 12 }
+fd_state.file_descriptor: 23329.129601979 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/module_state_0", pid = 16929, fd = 13 }
+fd_state.file_descriptor: 23329.129604434 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/swap_state_0", pid = 16929, fd = 14 }
+fd_state.file_descriptor: 23329.129606790 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/swap_state_0", pid = 16929, fd = 15 }
+fd_state.file_descriptor: 23329.129624182 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/global_state_0", pid = 16929, fd = 16 }
+fd_state.file_descriptor: 23329.129627093 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/global_state_0", pid = 16929, fd = 17 }
+fd_state.file_descriptor: 23329.129629542 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/task_state_0", pid = 16929, fd = 18 }
+fd_state.file_descriptor: 23329.129632021 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/task_state_0", pid = 16929, fd = 19 }
+fd_state.file_descriptor: 23329.129634445 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/fd_state_0", pid = 16929, fd = 20 }
+fd_state.file_descriptor: 23329.129636758 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/fd_state_0", pid = 16929, fd = 21 }
+fd_state.file_descriptor: 23329.129639267 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/vm_state_0", pid = 16929, fd = 22 }
+fd_state.file_descriptor: 23329.129641581 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/vm_state_0", pid = 16929, fd = 23 }
+fd_state.file_descriptor: 23329.129644029 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/netif_state_0", pid = 16929, fd = 24 }
+fd_state.file_descriptor: 23329.129646544 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/netif_state_0", pid = 16929, fd = 25 }
+fd_state.file_descriptor: 23329.129649086 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/userspace_0", pid = 16929, fd = 26 }
+fd_state.file_descriptor: 23329.129651491 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/userspace_0", pid = 16929, fd = 27 }
+fd_state.file_descriptor: 23329.129653909 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/kernel_0", pid = 16929, fd = 28 }
+fd_state.file_descriptor: 23329.129656221 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/kernel_0", pid = 16929, fd = 29 }
+fd_state.file_descriptor: 23329.129658503 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/mm_0", pid = 16929, fd = 30 }
+fd_state.file_descriptor: 23329.129660791 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/mm_0", pid = 16929, fd = 31 }
+fd_state.file_descriptor: 23329.129663437 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/fs_0", pid = 16929, fd = 32 }
+fd_state.file_descriptor: 23329.129666101 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/fs_0", pid = 16929, fd = 33 }
+fd_state.file_descriptor: 23329.129668464 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/ipc_0", pid = 16929, fd = 34 }
+fd_state.file_descriptor: 23329.129670918 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/ipc_0", pid = 16929, fd = 35 }
+fd_state.file_descriptor: 23329.129673342 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/rcu_0", pid = 16929, fd = 36 }
+fd_state.file_descriptor: 23329.129675686 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/rcu_0", pid = 16929, fd = 37 }
+fd_state.file_descriptor: 23329.129678054 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/pm_0", pid = 16929, fd = 38 }
+fd_state.file_descriptor: 23329.129680311 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/pm_0", pid = 16929, fd = 39 }
+fd_state.file_descriptor: 23329.129682618 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/net_0", pid = 16929, fd = 40 }
+fd_state.file_descriptor: 23329.129684857 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/net_0", pid = 16929, fd = 41 }
+fd_state.file_descriptor: 23329.129687206 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/jbd2_0", pid = 16929, fd = 42 }
+fd_state.file_descriptor: 23329.129689519 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/jbd2_0", pid = 16929, fd = 43 }
+fd_state.file_descriptor: 23329.129691875 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/block_0", pid = 16929, fd = 44 }
+fd_state.file_descriptor: 23329.129694089 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/block_0", pid = 16929, fd = 45 }
+fd_state.file_descriptor: 23329.129696532 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/input_0", pid = 16929, fd = 46 }
+fd_state.file_descriptor: 23329.129698764 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/input_0", pid = 16929, fd = 47 }
+fd_state.file_descriptor: 23329.129701102 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/media/debugfs/ltt/trace/metadata_0", pid = 16929, fd = 48 }
+fd_state.file_descriptor: 23329.129703711 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "/tmp/trace1/metadata_0", pid = 16929, fd = 49 }
+fd_state.file_descriptor: 23329.129706097 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filename = "pipe:[284543]", pid = 16929, fd = 50 }
+mm.page_free: 23329.129716871 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pfn = 198132, order = 0 }
+module_state.list_module: 23329.129734609 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "agpgart", state = 0, refcount = 1 }
+module_state.list_module: 23329.129740720 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "thermal_sys", state = 0, refcount = 3 }
+module_state.list_module: 23329.129742768 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "vboxvideo", state = 0, refcount = 1 }
+module_state.list_module: 23329.129744668 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "fan", state = 0, refcount = 0 }
+module_state.list_module: 23329.129749965 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "thermal", state = 0, refcount = 0 }
+module_state.list_module: 23329.129756534 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "drm", state = 0, refcount = 2 }
+module_state.list_module: 23329.129761690 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "ide_core", state = 0, refcount = 4 }
+module_state.list_module: 23329.129766982 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "usbcore", state = 0, refcount = 3 }
+module_state.list_module: 23329.129772088 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "scsi_mod", state = 0, refcount = 1 }
+module_state.list_module: 23329.129777392 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "mii", state = 0, refcount = 1 }
+module_state.list_module: 23329.129782653 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "button", state = 0, refcount = 0 }
+module_state.list_module: 23329.129784596 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "pcnet32", state = 0, refcount = 0 }
+module_state.list_module: 23329.129789863 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "ehci_hcd", state = 0, refcount = 0 }
+module_state.list_module: 23329.129795141 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "floppy", state = 0, refcount = 0 }
+module_state.list_module: 23329.129797393 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "piix", state = 0, refcount = 2 }
+module_state.list_module: 23329.129802641 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "libata", state = 0, refcount = 3 }
+module_state.list_module: 23329.129809049 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "ahci", state = 0, refcount = 0 }
+module_state.list_module: 23329.129814360 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "ohci_hcd", state = 0, refcount = 0 }
+module_state.list_module: 23329.129820422 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "ide_pci_generic", state = 0, refcount = 0 }
+module_state.list_module: 23329.129825615 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "ata_piix", state = 0, refcount = 0 }
+module_state.list_module: 23329.129830653 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "ata_generic", state = 0, refcount = 0 }
+module_state.list_module: 23329.129835482 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "cdrom", state = 0, refcount = 1 }
+module_state.list_module: 23329.129840484 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "ide_cd_mod", state = 0, refcount = 0 }
+module_state.list_module: 23329.129842396 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "ide_gd_mod", state = 0, refcount = 3 }
+module_state.list_module: 23329.129848015 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "i2c_core", state = 0, refcount = 2 }
+module_state.list_module: 23329.129853880 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "i2c_piix4", state = 0, refcount = 0 }
+module_state.list_module: 23329.129858844 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "battery", state = 0, refcount = 0 }
+module_state.list_module: 23329.129864143 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "ac", state = 0, refcount = 0 }
+module_state.list_module: 23329.129866011 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "vboxguest", state = 0, refcount = 7 }
+module_state.list_module: 23329.129871228 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "snd_page_alloc", state = 0, refcount = 2 }
+module_state.list_module: 23329.129876212 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "processor", state = 0, refcount = 0 }
+module_state.list_module: 23329.129878118 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "evdev", state = 0, refcount = 7 }
+module_state.list_module: 23329.129883712 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "serio_raw", state = 0, refcount = 0 }
+module_state.list_module: 23329.129889095 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "pcspkr", state = 0, refcount = 0 }
+module_state.list_module: 23329.129894066 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "soundcore", state = 0, refcount = 1 }
+module_state.list_module: 23329.129899395 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "psmouse", state = 0, refcount = 0 }
+module_state.list_module: 23329.129904440 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "snd", state = 0, refcount = 10 }
+module_state.list_module: 23329.129913321 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "snd_timer", state = 0, refcount = 1 }
+module_state.list_module: 23329.129937146 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "snd_pcm", state = 0, refcount = 3 }
+module_state.list_module: 23329.129942962 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "snd_mixer_oss", state = 0, refcount = 1 }
+module_state.list_module: 23329.129948445 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "snd_pcm_oss", state = 0, refcount = 0 }
+module_state.list_module: 23329.129953902 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "ac97_bus", state = 0, refcount = 1 }
+module_state.list_module: 23329.129959046 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "snd_ac97_codec", state = 0, refcount = 1 }
+module_state.list_module: 23329.129964214 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "snd_intel8x0", state = 0, refcount = 2 }
+module_state.list_module: 23329.129969567 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "loop", state = 0, refcount = 0 }
+module_state.list_module: 23329.129974439 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "vboxvfs", state = 0, refcount = 0 }
+vm_state.vm_map: 23329.129977992 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1, start = 134512640, end = 134545408, flags = 134223989, pgoff = 0, inode = 411603 }
+vm_state.vm_map: 23329.129980971 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1, start = 134545408, end = 134549504, flags = 135272563, pgoff = 28672, inode = 411603 }
+vm_state.vm_map: 23329.129983055 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1, start = 148803584, end = 148938752, flags = 1048691, pgoff = 148803584, inode = 0 }
+vm_state.vm_map: 23329.129985578 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1, start = 3076284416, end = 3076288512, flags = 1048691, pgoff = 3076284416, inode = 0 }
+vm_state.vm_map: 23329.129990981 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1, start = 3076288512, end = 3076296704, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.129993065 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1, start = 3076296704, end = 3076300800, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.129995187 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1, start = 3076300800, end = 3076304896, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.129997555 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1, start = 3076304896, end = 3077619712, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.129999843 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1, start = 3077619712, end = 3077627904, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.130001983 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1, start = 3077627904, end = 3077632000, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.130004105 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1, start = 3077632000, end = 3077648384, flags = 1048691, pgoff = 3077632000, inode = 0 }
+vm_state.vm_map: 23329.130006584 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1, start = 3077648384, end = 3077746688, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 23329.130008730 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1, start = 3077746688, end = 3077750784, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 23329.130010834 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1, start = 3077750784, end = 3077754880, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 23329.130013109 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1, start = 3077754880, end = 3077971968, flags = 134217845, pgoff = 0, inode = 499723 }
+vm_state.vm_map: 23329.130015057 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1, start = 3077971968, end = 3077976064, flags = 135266419, pgoff = 217088, inode = 499723 }
+vm_state.vm_map: 23329.130017137 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1, start = 3078070272, end = 3078078464, flags = 1048691, pgoff = 3078070272, inode = 0 }
+vm_state.vm_map: 23329.130019085 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1, start = 3078078464, end = 3078082560, flags = 67371125, pgoff = 3078078464, inode = 0 }
+vm_state.vm_map: 23329.130021848 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1, start = 3078082560, end = 3078197248, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.130023846 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1, start = 3078197248, end = 3078201344, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.130026110 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1, start = 3078201344, end = 3078205440, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.130028183 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1, start = 3220606976, end = 3220692992, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.130047621 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 134512640, end = 134631424, flags = 134223989, pgoff = 0, inode = 409694 }
+vm_state.vm_map: 23329.130052068 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 134631424, end = 134635520, flags = 135272563, pgoff = 118784, inode = 409694 }
+vm_state.vm_map: 23329.130054097 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 142200832, end = 142454784, flags = 1048691, pgoff = 142200832, inode = 0 }
+vm_state.vm_map: 23329.130056188 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3076026368, end = 3076149248, flags = 1048691, pgoff = 3076026368, inode = 0 }
+vm_state.vm_map: 23329.130061116 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3076427776, end = 3076468736, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.130063262 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3076468736, end = 3076472832, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.130065359 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3076472832, end = 3076476928, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.130068295 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3076476928, end = 3076554752, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.130070416 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3076554752, end = 3076558848, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.130072513 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3076558848, end = 3076562944, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.130074616 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3076562944, end = 3076571136, flags = 1048691, pgoff = 3076562944, inode = 0 }
+vm_state.vm_map: 23329.130076713 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3076665344, end = 3076669440, flags = 1048691, pgoff = 3076665344, inode = 0 }
+vm_state.vm_map: 23329.130079063 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3076669440, end = 3076677632, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.130081097 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3076677632, end = 3076681728, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.130083219 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3076681728, end = 3076685824, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.130085279 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3076685824, end = 3076689920, flags = 1048691, pgoff = 3076685824, inode = 0 }
+vm_state.vm_map: 23329.130087351 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3076689920, end = 3078004736, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.130089676 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3078004736, end = 3078012928, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.130091742 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3078012928, end = 3078017024, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.130093797 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3078017024, end = 3078029312, flags = 1048691, pgoff = 3078017024, inode = 0 }
+vm_state.vm_map: 23329.130095936 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3078029312, end = 3078127616, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 23329.130098200 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3078127616, end = 3078131712, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 23329.130100144 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3078131712, end = 3078135808, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 23329.130102825 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3078148096, end = 3078184960, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.130104867 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3078184960, end = 3078189056, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.130106958 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3078189056, end = 3078193152, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.130109246 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3078193152, end = 3078217728, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.130111170 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3078217728, end = 3078221824, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.130113162 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3078221824, end = 3078225920, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.130115321 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3078225920, end = 3078238208, flags = 1048691, pgoff = 3078225920, inode = 0 }
+vm_state.vm_map: 23329.130117381 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3078238208, end = 3078242304, flags = 67371125, pgoff = 3078238208, inode = 0 }
+vm_state.vm_map: 23329.130119582 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3078242304, end = 3078356992, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.130121790 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3078356992, end = 3078361088, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.130123937 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3078361088, end = 3078365184, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.130126040 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 654, start = 3213598720, end = 3213684736, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.130128599 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 134512640, end = 134631424, flags = 134223989, pgoff = 0, inode = 409694 }
+vm_state.vm_map: 23329.130130628 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 134631424, end = 134635520, flags = 135272563, pgoff = 118784, inode = 409694 }
+vm_state.vm_map: 23329.130132707 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 142200832, end = 142454784, flags = 1048691, pgoff = 142200832, inode = 0 }
+vm_state.vm_map: 23329.130138042 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3076026368, end = 3076149248, flags = 1048691, pgoff = 3076026368, inode = 0 }
+vm_state.vm_map: 23329.130140200 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3076427776, end = 3076468736, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.130142266 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3076468736, end = 3076472832, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.130144419 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3076472832, end = 3076476928, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.130146620 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3076476928, end = 3076554752, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.130148643 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3076554752, end = 3076558848, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.130150888 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3076558848, end = 3076562944, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.130153028 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3076562944, end = 3076571136, flags = 1048691, pgoff = 3076562944, inode = 0 }
+vm_state.vm_map: 23329.130154990 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3076665344, end = 3076669440, flags = 1048691, pgoff = 3076665344, inode = 0 }
+vm_state.vm_map: 23329.130157068 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3076669440, end = 3076677632, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.130159005 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3076677632, end = 3076681728, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.130160947 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3076681728, end = 3076685824, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.130162989 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3076685824, end = 3076689920, flags = 1048691, pgoff = 3076685824, inode = 0 }
+vm_state.vm_map: 23329.130164944 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3076689920, end = 3078004736, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.130167021 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3078004736, end = 3078012928, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.130169075 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3078012928, end = 3078017024, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.130171457 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3078017024, end = 3078029312, flags = 1048691, pgoff = 3078017024, inode = 0 }
+vm_state.vm_map: 23329.130173406 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3078029312, end = 3078127616, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 23329.130175458 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3078127616, end = 3078131712, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 23329.130177506 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3078131712, end = 3078135808, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 23329.130179449 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3078148096, end = 3078184960, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.130181472 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3078184960, end = 3078189056, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.130183618 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3078189056, end = 3078193152, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.130185721 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3078193152, end = 3078217728, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.130187849 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3078217728, end = 3078221824, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.130192752 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3078221824, end = 3078225920, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.130194793 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3078230016, end = 3078238208, flags = 1048691, pgoff = 3078230016, inode = 0 }
+vm_state.vm_map: 23329.130196841 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3078238208, end = 3078242304, flags = 67371125, pgoff = 3078238208, inode = 0 }
+vm_state.vm_map: 23329.130198808 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3078242304, end = 3078356992, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.130200764 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3078356992, end = 3078361088, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.130202805 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3078361088, end = 3078365184, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.130207862 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 757, start = 3213598720, end = 3213684736, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.130210200 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 134512640, end = 134631424, flags = 134223989, pgoff = 0, inode = 409694 }
+vm_state.vm_map: 23329.130212297 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 134631424, end = 134635520, flags = 135272563, pgoff = 118784, inode = 409694 }
+vm_state.vm_map: 23329.130214239 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 142200832, end = 142454784, flags = 1048691, pgoff = 142200832, inode = 0 }
+vm_state.vm_map: 23329.130216188 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3076026368, end = 3076149248, flags = 1048691, pgoff = 3076026368, inode = 0 }
+vm_state.vm_map: 23329.130218137 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3076427776, end = 3076468736, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.130220074 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3076468736, end = 3076472832, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.130222128 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3076472832, end = 3076476928, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.130224070 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3076476928, end = 3076554752, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.130226001 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3076554752, end = 3076558848, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.130228060 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3076558848, end = 3076562944, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.130230003 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3076562944, end = 3076571136, flags = 1048691, pgoff = 3076562944, inode = 0 }
+vm_state.vm_map: 23329.130231946 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3076665344, end = 3076669440, flags = 1048691, pgoff = 3076665344, inode = 0 }
+vm_state.vm_map: 23329.130233993 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3076669440, end = 3076677632, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.130235930 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3076677632, end = 3076681728, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.130238206 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3076681728, end = 3076685824, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.130240339 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3076685824, end = 3076689920, flags = 1048691, pgoff = 3076685824, inode = 0 }
+vm_state.vm_map: 23329.130242300 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3076689920, end = 3078004736, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.130244244 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3078004736, end = 3078012928, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.130246298 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3078012928, end = 3078017024, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.130248233 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3078017024, end = 3078029312, flags = 1048691, pgoff = 3078017024, inode = 0 }
+vm_state.vm_map: 23329.130250182 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3078029312, end = 3078127616, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 23329.130252230 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3078127616, end = 3078131712, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 23329.130254278 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3078131712, end = 3078135808, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 23329.130256220 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3078148096, end = 3078184960, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.130258151 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3078184960, end = 3078189056, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.130260211 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3078189056, end = 3078193152, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.130262203 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3078193152, end = 3078217728, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.130264226 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3078217728, end = 3078221824, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.130266378 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3078221824, end = 3078225920, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.130268598 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3078230016, end = 3078238208, flags = 1048691, pgoff = 3078230016, inode = 0 }
+vm_state.vm_map: 23329.130271041 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3078238208, end = 3078242304, flags = 67371125, pgoff = 3078238208, inode = 0 }
+vm_state.vm_map: 23329.130275506 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3078242304, end = 3078356992, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.130277572 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3078356992, end = 3078361088, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.130279657 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3078361088, end = 3078365184, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.130281815 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 758, start = 3213598720, end = 3213684736, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.130293231 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1219, start = 134512640, end = 134873088, flags = 134223989, pgoff = 0, inode = 409611 }
+vm_state.vm_map: 23329.130295279 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1219, start = 134873088, end = 134881280, flags = 135272563, pgoff = 356352, inode = 409611 }
+vm_state.vm_map: 23329.130299971 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1219, start = 134881280, end = 134918144, flags = 1048691, pgoff = 134881280, inode = 0 }
+vm_state.vm_map: 23329.130302137 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1219, start = 144068608, end = 144203776, flags = 1048691, pgoff = 144068608, inode = 0 }
+vm_state.vm_map: 23329.130304666 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1219, start = 3077447680, end = 3077488640, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.130309586 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1219, start = 3077488640, end = 3077492736, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.130314156 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1219, start = 3077492736, end = 3077496832, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.130316327 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1219, start = 3077496832, end = 3077500928, flags = 1048691, pgoff = 3077496832, inode = 0 }
+vm_state.vm_map: 23329.130321090 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1219, start = 3077500928, end = 3078815744, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.130323254 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1219, start = 3078815744, end = 3078823936, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.130325432 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1219, start = 3078823936, end = 3078828032, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.130327534 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1219, start = 3078828032, end = 3078840320, flags = 1048691, pgoff = 3078828032, inode = 0 }
+vm_state.vm_map: 23329.130331943 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1219, start = 3078930432, end = 3078942720, flags = 1048691, pgoff = 3078930432, inode = 0 }
+vm_state.vm_map: 23329.130334090 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1219, start = 3078942720, end = 3078946816, flags = 67371125, pgoff = 3078942720, inode = 0 }
+vm_state.vm_map: 23329.130336353 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1219, start = 3078946816, end = 3079061504, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.130338481 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1219, start = 3079061504, end = 3079065600, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.130343020 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1219, start = 3079065600, end = 3079069696, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.130345635 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1219, start = 3219910656, end = 3219996672, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.130351291 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1259, start = 134512640, end = 134725632, flags = 134223989, pgoff = 0, inode = 22952 }
+vm_state.vm_map: 23329.130353431 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1259, start = 134725632, end = 134729728, flags = 135272563, pgoff = 208896, inode = 22952 }
+vm_state.vm_map: 23329.130355404 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1259, start = 134729728, end = 134733824, flags = 1048691, pgoff = 134729728, inode = 0 }
+vm_state.vm_map: 23329.130357409 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1259, start = 145321984, end = 145457152, flags = 1048691, pgoff = 145321984, inode = 0 }
+vm_state.vm_map: 23329.130359561 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1259, start = 3076091904, end = 3076362240, flags = 1048691, pgoff = 3076091904, inode = 0 }
+vm_state.vm_map: 23329.130361640 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1259, start = 3076362240, end = 3077677056, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.130363693 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1259, start = 3077677056, end = 3077685248, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.130365642 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1259, start = 3077685248, end = 3077689344, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.130367696 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1259, start = 3077689344, end = 3077701632, flags = 1048691, pgoff = 3077689344, inode = 0 }
+vm_state.vm_map: 23329.130375079 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1259, start = 3077701632, end = 3077763072, flags = 134217845, pgoff = 0, inode = 22689 }
+vm_state.vm_map: 23329.130377219 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1259, start = 3077763072, end = 3077767168, flags = 135266419, pgoff = 61440, inode = 22689 }
+vm_state.vm_map: 23329.130379365 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1259, start = 3077767168, end = 3077771264, flags = 1048691, pgoff = 3077767168, inode = 0 }
+vm_state.vm_map: 23329.130382177 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1259, start = 3077771264, end = 3077783552, flags = 134217845, pgoff = 0, inode = 20765 }
+vm_state.vm_map: 23329.130384218 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1259, start = 3077783552, end = 3077787648, flags = 135266419, pgoff = 8192, inode = 20765 }
+vm_state.vm_map: 23329.130386309 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1259, start = 3077787648, end = 3077791744, flags = 1048691, pgoff = 3077787648, inode = 0 }
+vm_state.vm_map: 23329.130388690 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1259, start = 3077791744, end = 3077976064, flags = 134217845, pgoff = 0, inode = 22949 }
+vm_state.vm_map: 23329.130390731 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1259, start = 3077976064, end = 3077980160, flags = 135266419, pgoff = 184320, inode = 22949 }
+vm_state.vm_map: 23329.130393112 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1259, start = 3077980160, end = 3078443008, flags = 134217845, pgoff = 0, inode = 20061 }
+vm_state.vm_map: 23329.130395202 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1259, start = 3078443008, end = 3078455296, flags = 135266419, pgoff = 458752, inode = 20061 }
+vm_state.vm_map: 23329.130397157 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1259, start = 3078541312, end = 3078557696, flags = 1048691, pgoff = 3078541312, inode = 0 }
+vm_state.vm_map: 23329.130399211 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1259, start = 3078557696, end = 3078561792, flags = 67371125, pgoff = 3078557696, inode = 0 }
+vm_state.vm_map: 23329.130401394 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1259, start = 3078561792, end = 3078676480, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.130403368 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1259, start = 3078676480, end = 3078680576, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.130405441 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1259, start = 3078680576, end = 3078684672, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.130407401 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1259, start = 3221082112, end = 3221168128, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.130412705 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 134512640, end = 134770688, flags = 134223989, pgoff = 0, inode = 19720 }
+vm_state.vm_map: 23329.130414919 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 134770688, end = 134782976, flags = 135272563, pgoff = 253952, inode = 19720 }
+vm_state.vm_map: 23329.130417442 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 134782976, end = 134787072, flags = 1048691, pgoff = 134782976, inode = 0 }
+vm_state.vm_map: 23329.130419557 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 138625024, end = 139030528, flags = 1048691, pgoff = 138625024, inode = 0 }
+vm_state.vm_map: 23329.130427507 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3050975232, end = 3051089920, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.130429678 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3051089920, end = 3051094016, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.130431837 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3051094016, end = 3051098112, flags = 1048688, pgoff = 3051094016, inode = 0 }
+vm_state.vm_map: 23329.130433977 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3051098112, end = 3059486720, flags = 1048691, pgoff = 3051098112, inode = 0 }
+vm_state.vm_map: 23329.130436012 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3059486720, end = 3059490816, flags = 1048688, pgoff = 3059486720, inode = 0 }
+vm_state.vm_map: 23329.130437986 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3059490816, end = 3067879424, flags = 1048691, pgoff = 3059490816, inode = 0 }
+vm_state.vm_map: 23329.130440052 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3067879424, end = 3067883520, flags = 1048688, pgoff = 3067879424, inode = 0 }
+vm_state.vm_map: 23329.130442105 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3067883520, end = 3076272128, flags = 1048691, pgoff = 3067883520, inode = 0 }
+vm_state.vm_map: 23329.130444209 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3076272128, end = 3076308992, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.130446164 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3076308992, end = 3076313088, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.130448106 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3076313088, end = 3076317184, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.130450277 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3076317184, end = 3076395008, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.130452707 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3076395008, end = 3076399104, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.130454760 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3076399104, end = 3076403200, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.130456815 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3076403200, end = 3076411392, flags = 1048691, pgoff = 3076403200, inode = 0 }
+vm_state.vm_map: 23329.130458948 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3076411392, end = 3076435968, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.130460996 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3076435968, end = 3076440064, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.130463001 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3076440064, end = 3076444160, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.130465381 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3076538368, end = 3076558848, flags = 134217845, pgoff = 0, inode = 33292 }
+vm_state.vm_map: 23329.130467379 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3076558848, end = 3076562944, flags = 135266419, pgoff = 16384, inode = 33292 }
+vm_state.vm_map: 23329.130469526 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3076562944, end = 3076571136, flags = 1048691, pgoff = 3076562944, inode = 0 }
+vm_state.vm_map: 23329.130471863 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3076571136, end = 3077885952, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.130473985 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3077885952, end = 3077894144, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.130475982 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3077894144, end = 3077898240, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.130478233 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3077898240, end = 3077910528, flags = 1048691, pgoff = 3077898240, inode = 0 }
+vm_state.vm_map: 23329.130481052 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3077910528, end = 3077939200, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.130483056 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3077939200, end = 3077943296, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.130485277 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3077943296, end = 3077947392, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.130487768 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3077947392, end = 3077955584, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.130490013 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3077955584, end = 3077959680, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.130492116 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3077959680, end = 3077963776, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.130494201 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3077963776, end = 3077967872, flags = 1048691, pgoff = 3077963776, inode = 0 }
+vm_state.vm_map: 23329.130496810 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3077967872, end = 3078053888, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.130498919 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3078053888, end = 3078057984, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.130501047 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3078057984, end = 3078062080, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.130503168 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3078062080, end = 3078070272, flags = 1048691, pgoff = 3078062080, inode = 0 }
+vm_state.vm_map: 23329.130505746 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3078070272, end = 3078148096, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.130507936 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3078148096, end = 3078152192, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.130510366 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3078152192, end = 3078160384, flags = 134217845, pgoff = 0, inode = 33286 }
+vm_state.vm_map: 23329.130512407 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3078160384, end = 3078164480, flags = 135266419, pgoff = 4096, inode = 33286 }
+vm_state.vm_map: 23329.130514498 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3078168576, end = 3078172672, flags = 1048691, pgoff = 3078168576, inode = 0 }
+vm_state.vm_map: 23329.130516694 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3078172672, end = 3078213632, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.130518686 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3078213632, end = 3078217728, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.130520777 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3078217728, end = 3078221824, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.130523520 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3078221824, end = 3078242304, flags = 134217845, pgoff = 0, inode = 33281 }
+vm_state.vm_map: 23329.130525636 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3078242304, end = 3078246400, flags = 135266419, pgoff = 16384, inode = 33281 }
+vm_state.vm_map: 23329.130527678 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3078246400, end = 3078254592, flags = 1048691, pgoff = 3078246400, inode = 0 }
+vm_state.vm_map: 23329.130529774 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3078254592, end = 3078258688, flags = 67371125, pgoff = 3078254592, inode = 0 }
+vm_state.vm_map: 23329.130532088 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3078258688, end = 3078373376, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.130534154 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3078373376, end = 3078377472, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.130536188 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3078377472, end = 3078381568, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.130538267 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1301, start = 3212951552, end = 3213037568, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.130548313 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1340, start = 134512640, end = 134602752, flags = 134223989, pgoff = 0, inode = 1353012 }
+vm_state.vm_map: 23329.130550367 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1340, start = 134602752, end = 134606848, flags = 135272563, pgoff = 90112, inode = 1353012 }
+vm_state.vm_map: 23329.130552532 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1340, start = 134606848, end = 134651904, flags = 1048691, pgoff = 134606848, inode = 0 }
+vm_state.vm_map: 23329.130554752 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1340, start = 137347072, end = 137482240, flags = 1048691, pgoff = 137347072, inode = 0 }
+vm_state.vm_map: 23329.130556775 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1340, start = 3075100672, end = 3075104768, flags = 1048691, pgoff = 3075100672, inode = 0 }
+vm_state.vm_map: 23329.130559464 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1340, start = 3075104768, end = 3076419584, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.130561518 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1340, start = 3076419584, end = 3076427776, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.130563713 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1340, start = 3076427776, end = 3076431872, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.130565841 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1340, start = 3076431872, end = 3076444160, flags = 1048691, pgoff = 3076431872, inode = 0 }
+vm_state.vm_map: 23329.130568166 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1340, start = 3076444160, end = 3076558848, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.130570177 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1340, start = 3076558848, end = 3076562944, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.130572268 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1340, start = 3076562944, end = 3076567040, flags = 1048691, pgoff = 3076562944, inode = 0 }
+vm_state.vm_map: 23329.130577368 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1340, start = 3076567040, end = 3076714496, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.130579527 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1340, start = 3076714496, end = 3076718592, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.130581556 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1340, start = 3076718592, end = 3076722688, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.130584023 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1340, start = 3076722688, end = 3077660672, flags = 134217845, pgoff = 0, inode = 16400 }
+vm_state.vm_map: 23329.130585990 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1340, start = 3077660672, end = 3077677056, flags = 135266417, pgoff = 937984, inode = 16400 }
+vm_state.vm_map: 23329.130588081 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1340, start = 3077677056, end = 3077681152, flags = 135266419, pgoff = 954368, inode = 16400 }
+vm_state.vm_map: 23329.130590178 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1340, start = 3077681152, end = 3077709824, flags = 1048691, pgoff = 3077681152, inode = 0 }
+vm_state.vm_map: 23329.130595340 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1340, start = 3077783552, end = 3077799936, flags = 134217937, pgoff = 0, inode = 1165299 }
+vm_state.vm_map: 23329.130597801 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1340, start = 3077799936, end = 3077804032, flags = 134217937, pgoff = 0, inode = 1165298 }
+vm_state.vm_map: 23329.130599960 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1340, start = 3077804032, end = 3077812224, flags = 1048691, pgoff = 3077804032, inode = 0 }
+vm_state.vm_map: 23329.130602055 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1340, start = 3077812224, end = 3077816320, flags = 67371125, pgoff = 3077812224, inode = 0 }
+vm_state.vm_map: 23329.130604332 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1340, start = 3077816320, end = 3077931008, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.130606368 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1340, start = 3077931008, end = 3077935104, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.130608574 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1340, start = 3077935104, end = 3077939200, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.130610629 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1340, start = 3213680640, end = 3213766656, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.130620336 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1347, start = 134512640, end = 134545408, flags = 134223989, pgoff = 0, inode = 19558 }
+vm_state.vm_map: 23329.130622383 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1347, start = 134545408, end = 134549504, flags = 135272563, pgoff = 32768, inode = 19558 }
+vm_state.vm_map: 23329.130624542 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1347, start = 134549504, end = 134553600, flags = 1048691, pgoff = 134549504, inode = 0 }
+vm_state.vm_map: 23329.130626688 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1347, start = 159870976, end = 160006144, flags = 1048691, pgoff = 159870976, inode = 0 }
+vm_state.vm_map: 23329.130628835 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1347, start = 3077165056, end = 3077169152, flags = 1048691, pgoff = 3077165056, inode = 0 }
+vm_state.vm_map: 23329.130631394 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1347, start = 3077169152, end = 3078483968, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.130653060 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1347, start = 3078483968, end = 3078492160, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.130655404 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1347, start = 3078492160, end = 3078496256, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.130657655 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1347, start = 3078496256, end = 3078508544, flags = 1048691, pgoff = 3078496256, inode = 0 }
+vm_state.vm_map: 23329.130659832 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1347, start = 3078602752, end = 3078610944, flags = 1048691, pgoff = 3078602752, inode = 0 }
+vm_state.vm_map: 23329.130665087 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1347, start = 3078610944, end = 3078615040, flags = 67371125, pgoff = 3078610944, inode = 0 }
+vm_state.vm_map: 23329.130667289 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1347, start = 3078615040, end = 3078729728, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.130671988 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1347, start = 3078729728, end = 3078733824, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.130674048 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1347, start = 3078733824, end = 3078737920, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.130678531 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1347, start = 3213504512, end = 3213590528, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.130683866 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 134512640, end = 134545408, flags = 134223989, pgoff = 0, inode = 18385 }
+vm_state.vm_map: 23329.130686031 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 134545408, end = 134549504, flags = 135272563, pgoff = 28672, inode = 18385 }
+vm_state.vm_map: 23329.130690878 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 134549504, end = 134553600, flags = 1048691, pgoff = 134549504, inode = 0 }
+vm_state.vm_map: 23329.130692908 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 161918976, end = 162054144, flags = 1048691, pgoff = 161918976, inode = 0 }
+vm_state.vm_map: 23329.130695214 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3074863104, end = 3074904064, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.130697262 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3074904064, end = 3074908160, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.130699322 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3074908160, end = 3074912256, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.130701603 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3074912256, end = 3074990080, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.130703811 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3074990080, end = 3074994176, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.130705908 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3074994176, end = 3074998272, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.130708079 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3074998272, end = 3075006464, flags = 1048691, pgoff = 3074998272, inode = 0 }
+vm_state.vm_map: 23329.130710552 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3075100672, end = 3076431872, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.130712649 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3076431872, end = 3076435968, flags = 1048691, pgoff = 3076431872, inode = 0 }
+vm_state.vm_map: 23329.130714931 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3076435968, end = 3076444160, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.130716893 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3076444160, end = 3076448256, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.130718903 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3076448256, end = 3076452352, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.130721148 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3076452352, end = 3077767168, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.130723646 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3077767168, end = 3077775360, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.130725860 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3077775360, end = 3077779456, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.130727975 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3077779456, end = 3077795840, flags = 1048691, pgoff = 3077779456, inode = 0 }
+vm_state.vm_map: 23329.130730319 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3077795840, end = 3077894144, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 23329.130732459 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3077894144, end = 3077898240, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 23329.130734766 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3077898240, end = 3077902336, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 23329.130741821 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3077902336, end = 3077943296, flags = 134217845, pgoff = 0, inode = 499738 }
+vm_state.vm_map: 23329.130743973 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3077943296, end = 3077947392, flags = 135266419, pgoff = 40960, inode = 499738 }
+vm_state.vm_map: 23329.130746262 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3077951488, end = 3077988352, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.130748365 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3077988352, end = 3077992448, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.130750351 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3077992448, end = 3077996544, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.130752651 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3077996544, end = 3078021120, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.130754618 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3078021120, end = 3078025216, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.130756573 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3078025216, end = 3078029312, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.130759103 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3078033408, end = 3078049792, flags = 1048691, pgoff = 3078033408, inode = 0 }
+vm_state.vm_map: 23329.130761100 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3078049792, end = 3078053888, flags = 67371125, pgoff = 3078049792, inode = 0 }
+vm_state.vm_map: 23329.130763352 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3078053888, end = 3078168576, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.130765461 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3078168576, end = 3078172672, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.130767514 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3078172672, end = 3078176768, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.130769611 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1372, start = 3219382272, end = 3219468288, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.130772127 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3076362240, end = 3076403200, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.130774230 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3076403200, end = 3076407296, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.130776185 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3076407296, end = 3076411392, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.130778221 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3076411392, end = 3076448256, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.130780170 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3076448256, end = 3076452352, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.130782452 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3076452352, end = 3076456448, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.130784746 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3076456448, end = 3076534272, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.130786738 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3076534272, end = 3076538368, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.130788958 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3076538368, end = 3076542464, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.130791117 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3076542464, end = 3076550656, flags = 1048691, pgoff = 3076542464, inode = 0 }
+vm_state.vm_map: 23329.130793516 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3076550656, end = 3076575232, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.130795502 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3076575232, end = 3076579328, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.130797525 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3076579328, end = 3076583424, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.130799572 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3076583424, end = 3076591616, flags = 1048691, pgoff = 3076583424, inode = 0 }
+vm_state.vm_map: 23329.130801817 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3076591616, end = 3076599808, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.130803902 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3076599808, end = 3076603904, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.130805925 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3076603904, end = 3076608000, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.130808207 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3076608000, end = 3077922816, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.130810187 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3077922816, end = 3077931008, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.130812216 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3077931008, end = 3077935104, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.130814387 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3077935104, end = 3077947392, flags = 1048691, pgoff = 3077935104, inode = 0 }
+vm_state.vm_map: 23329.130816693 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3077947392, end = 3077976064, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.130818642 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3077976064, end = 3077980160, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.130820566 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3077980160, end = 3077984256, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.130822855 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3077984256, end = 3078070272, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.130824810 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3078070272, end = 3078074368, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.130827092 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3078074368, end = 3078078464, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.130829360 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3078078464, end = 3078090752, flags = 1048691, pgoff = 3078078464, inode = 0 }
+vm_state.vm_map: 23329.130831551 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3078090752, end = 3078189056, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 23329.130833499 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3078189056, end = 3078193152, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 23329.130835602 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3078193152, end = 3078197248, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 23329.130843021 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3078197248, end = 3078344704, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.130845069 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3078344704, end = 3078352896, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.130847227 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3078447104, end = 3078455296, flags = 1048691, pgoff = 3078447104, inode = 0 }
+vm_state.vm_map: 23329.130849275 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3078455296, end = 3078459392, flags = 67371125, pgoff = 3078455296, inode = 0 }
+vm_state.vm_map: 23329.130851440 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3078459392, end = 3078574080, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.130853438 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3078574080, end = 3078578176, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.130855387 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3078578176, end = 3078582272, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.130860068 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3078582272, end = 3078873088, flags = 134223989, pgoff = 0, inode = 20940 }
+vm_state.vm_map: 23329.130862498 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3078873088, end = 3078877184, flags = 135272561, pgoff = 286720, inode = 20940 }
+vm_state.vm_map: 23329.130864533 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3078877184, end = 3078881280, flags = 135272563, pgoff = 290816, inode = 20940 }
+vm_state.vm_map: 23329.130866655 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3099119616, end = 3099566080, flags = 1048691, pgoff = 3099119616, inode = 0 }
+vm_state.vm_map: 23329.130868776 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1382, start = 3213758464, end = 3213844480, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.130876739 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1391, start = 134512640, end = 134594560, flags = 134223989, pgoff = 0, inode = 1327123 }
+vm_state.vm_map: 23329.130878786 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1391, start = 134594560, end = 134602752, flags = 135272563, pgoff = 81920, inode = 1327123 }
+vm_state.vm_map: 23329.130880982 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1391, start = 134602752, end = 134610944, flags = 1048691, pgoff = 134602752, inode = 0 }
+vm_state.vm_map: 23329.130883054 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1391, start = 147980288, end = 148115456, flags = 1048691, pgoff = 147980288, inode = 0 }
+vm_state.vm_map: 23329.130884985 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1391, start = 3077668864, end = 3077677056, flags = 1048691, pgoff = 3077668864, inode = 0 }
+vm_state.vm_map: 23329.130887069 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1391, start = 3077677056, end = 3078991872, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.130889326 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1391, start = 3078991872, end = 3079000064, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.130891429 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1391, start = 3079000064, end = 3079004160, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.130893508 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1391, start = 3079004160, end = 3079016448, flags = 1048691, pgoff = 3079004160, inode = 0 }
+vm_state.vm_map: 23329.130895710 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1391, start = 3079016448, end = 3079163904, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.130898214 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1391, start = 3079163904, end = 3079168000, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.130900285 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1391, start = 3079168000, end = 3079172096, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.130902327 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1391, start = 3079266304, end = 3079274496, flags = 1048691, pgoff = 3079266304, inode = 0 }
+vm_state.vm_map: 23329.130904263 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1391, start = 3079274496, end = 3079278592, flags = 67371125, pgoff = 3079274496, inode = 0 }
+vm_state.vm_map: 23329.130906460 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1391, start = 3079278592, end = 3079393280, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.130908526 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1391, start = 3079393280, end = 3079397376, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.130910572 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1391, start = 3079397376, end = 3079401472, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.130912614 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1391, start = 3219996672, end = 3220082688, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.130918010 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 134512640, end = 135303168, flags = 134223989, pgoff = 0, inode = 1048715 }
+vm_state.vm_map: 23329.130920213 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 135303168, end = 135323648, flags = 135272563, pgoff = 790528, inode = 1048715 }
+vm_state.vm_map: 23329.130922235 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 135323648, end = 135344128, flags = 1048691, pgoff = 135323648, inode = 0 }
+vm_state.vm_map: 23329.130924387 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 145805312, end = 145903616, flags = 1048691, pgoff = 145805312, inode = 0 }
+vm_state.vm_map: 23329.130926546 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3076485120, end = 3076526080, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.130928655 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3076526080, end = 3076530176, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.130930826 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3076530176, end = 3076534272, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.130933497 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3076534272, end = 3076571136, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.130935625 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3076571136, end = 3076575232, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.130937721 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3076575232, end = 3076579328, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.130939966 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3076579328, end = 3076657152, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.130942094 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3076657152, end = 3076661248, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.130944284 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3076661248, end = 3076665344, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.130946609 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3076665344, end = 3076673536, flags = 1048691, pgoff = 3076665344, inode = 0 }
+vm_state.vm_map: 23329.130948755 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3076673536, end = 3076698112, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.130950846 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3076698112, end = 3076702208, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.130953011 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3076702208, end = 3076706304, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.130954972 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3076706304, end = 3076710400, flags = 1048691, pgoff = 3076706304, inode = 0 }
+vm_state.vm_map: 23329.130957026 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3076710400, end = 3078025216, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.130959104 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3078025216, end = 3078033408, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.130961059 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3078033408, end = 3078037504, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.130963020 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3078037504, end = 3078053888, flags = 1048691, pgoff = 3078037504, inode = 0 }
+vm_state.vm_map: 23329.130965315 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3078053888, end = 3078062080, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.130967806 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3078062080, end = 3078066176, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.130969891 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3078066176, end = 3078070272, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.130972167 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3078070272, end = 3078287360, flags = 134217845, pgoff = 0, inode = 499784 }
+vm_state.vm_map: 23329.130974350 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3078287360, end = 3078299648, flags = 135266419, pgoff = 217088, inode = 499784 }
+vm_state.vm_map: 23329.130976305 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3078393856, end = 3078402048, flags = 1048691, pgoff = 3078393856, inode = 0 }
+vm_state.vm_map: 23329.130978519 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3078402048, end = 3078406144, flags = 67371125, pgoff = 3078402048, inode = 0 }
+vm_state.vm_map: 23329.130980732 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3078406144, end = 3078520832, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.130982687 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3078520832, end = 3078524928, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.130984630 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3078524928, end = 3078529024, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.130986734 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1421, start = 3214856192, end = 3214942208, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.130989052 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 2951155712, end = 2951159808, flags = 1048688, pgoff = 2951155712, inode = 0 }
+vm_state.vm_map: 23329.130991088 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 2951159808, end = 2959548416, flags = 1048691, pgoff = 2951159808, inode = 0 }
+vm_state.vm_map: 23329.130993135 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 2959548416, end = 2959552512, flags = 1048688, pgoff = 2959548416, inode = 0 }
+vm_state.vm_map: 23329.130995127 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 2959552512, end = 2967941120, flags = 1048691, pgoff = 2959552512, inode = 0 }
+vm_state.vm_map: 23329.130997317 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 2967941120, end = 2967945216, flags = 1048688, pgoff = 2967941120, inode = 0 }
+vm_state.vm_map: 23329.130999438 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 2967945216, end = 2976333824, flags = 1048691, pgoff = 2967945216, inode = 0 }
+vm_state.vm_map: 23329.131001973 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 2976333824, end = 2976337920, flags = 1048688, pgoff = 2976333824, inode = 0 }
+vm_state.vm_map: 23329.131004162 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 2976337920, end = 2986848256, flags = 1048691, pgoff = 2976337920, inode = 0 }
+vm_state.vm_map: 23329.131006204 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 2989105152, end = 2989109248, flags = 1048688, pgoff = 2989105152, inode = 0 }
+vm_state.vm_map: 23329.131008208 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 2989109248, end = 2989305856, flags = 1048691, pgoff = 2989109248, inode = 0 }
+vm_state.vm_map: 23329.131010410 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 2989305856, end = 2989309952, flags = 1048688, pgoff = 2989305856, inode = 0 }
+vm_state.vm_map: 23329.131012526 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 2989309952, end = 2989506560, flags = 1048691, pgoff = 2989309952, inode = 0 }
+vm_state.vm_map: 23329.131014752 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 2989506560, end = 2989510656, flags = 1048688, pgoff = 2989506560, inode = 0 }
+vm_state.vm_map: 23329.131016769 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 2989510656, end = 2997899264, flags = 1048691, pgoff = 2989510656, inode = 0 }
+vm_state.vm_map: 23329.131018847 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 2997899264, end = 2997903360, flags = 1048688, pgoff = 2997899264, inode = 0 }
+vm_state.vm_map: 23329.131021074 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 2997903360, end = 3006291968, flags = 1048691, pgoff = 2997903360, inode = 0 }
+vm_state.vm_map: 23329.131023226 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3006291968, end = 3006296064, flags = 1048688, pgoff = 3006291968, inode = 0 }
+vm_state.vm_map: 23329.131025360 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3006296064, end = 3059859456, flags = 1048691, pgoff = 3006296064, inode = 0 }
+vm_state.vm_map: 23329.131027457 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3059859456, end = 3059900416, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.131029548 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3059900416, end = 3059904512, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.131031694 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3059904512, end = 3059908608, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.131034112 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3059908608, end = 3059945472, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.131036634 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3059945472, end = 3059949568, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.131038682 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3059949568, end = 3059953664, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.131040760 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3059953664, end = 3059978240, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.131043054 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3059978240, end = 3059982336, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.131045121 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3059982336, end = 3059986432, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.131047069 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3059986432, end = 3059990528, flags = 1048688, pgoff = 3059986432, inode = 0 }
+vm_state.vm_map: 23329.131049018 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3059990528, end = 3068387328, flags = 1048691, pgoff = 3059990528, inode = 0 }
+vm_state.vm_map: 23329.131051300 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3068387328, end = 3069702144, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.131053379 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3069702144, end = 3069710336, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.131055433 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3069710336, end = 3069714432, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.131057473 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3069714432, end = 3069726720, flags = 1048691, pgoff = 3069714432, inode = 0 }
+vm_state.vm_map: 23329.131059656 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3069726720, end = 3069841408, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.131061575 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3069841408, end = 3069845504, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.131063616 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3069845504, end = 3069849600, flags = 1048691, pgoff = 3069845504, inode = 0 }
+vm_state.vm_map: 23329.131065756 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3069849600, end = 3069997056, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.131067816 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3069997056, end = 3070001152, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.131070326 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3070001152, end = 3070005248, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.131072663 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3070005248, end = 3070943232, flags = 134217845, pgoff = 0, inode = 16400 }
+vm_state.vm_map: 23329.131074693 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3070943232, end = 3070959616, flags = 135266417, pgoff = 937984, inode = 16400 }
+vm_state.vm_map: 23329.131076931 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3070959616, end = 3070963712, flags = 135266419, pgoff = 954368, inode = 16400 }
+vm_state.vm_map: 23329.131079065 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3070963712, end = 3070992384, flags = 1048691, pgoff = 3070963712, inode = 0 }
+vm_state.vm_map: 23329.131081298 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3070992384, end = 3071070208, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.131083518 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3071070208, end = 3071074304, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.131088144 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3071074304, end = 3071078400, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.131090302 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3071078400, end = 3071086592, flags = 1048691, pgoff = 3071078400, inode = 0 }
+vm_state.vm_map: 23329.131095279 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3071086592, end = 3071123456, flags = 134217845, pgoff = 0, inode = 508391 }
+vm_state.vm_map: 23329.131097321 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3071123456, end = 3071127552, flags = 135266417, pgoff = 32768, inode = 508391 }
+vm_state.vm_map: 23329.131099412 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3071127552, end = 3071131648, flags = 135266419, pgoff = 36864, inode = 508391 }
+vm_state.vm_map: 23329.131101361 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3071131648, end = 3071291392, flags = 1048691, pgoff = 3071131648, inode = 0 }
+vm_state.vm_map: 23329.131103482 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3071291392, end = 3071299584, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.131105820 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3071299584, end = 3071303680, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.131107880 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3071303680, end = 3071307776, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.131112604 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3071307776, end = 3071336448, flags = 134217845, pgoff = 0, inode = 499851 }
+vm_state.vm_map: 23329.131114645 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3071336448, end = 3071340544, flags = 135266419, pgoff = 28672, inode = 499851 }
+vm_state.vm_map: 23329.131116699 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3071340544, end = 3071344640, flags = 1048691, pgoff = 3071340544, inode = 0 }
+vm_state.vm_map: 23329.131118802 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3071344640, end = 3071422464, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.131120744 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3071422464, end = 3071426560, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.131123107 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3071426560, end = 3071512576, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.131125050 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3071512576, end = 3071516672, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.131127103 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3071516672, end = 3071520768, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.131129156 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3071520768, end = 3071528960, flags = 1048691, pgoff = 3071520768, inode = 0 }
+vm_state.vm_map: 23329.131131185 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3071623168, end = 3071631360, flags = 1048691, pgoff = 3071623168, inode = 0 }
+vm_state.vm_map: 23329.131133122 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3071631360, end = 3071635456, flags = 67371125, pgoff = 3071631360, inode = 0 }
+vm_state.vm_map: 23329.131135256 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3071635456, end = 3071750144, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.131137378 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3071750144, end = 3071754240, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.131139790 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3071754240, end = 3071758336, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.131144606 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3071758336, end = 3079561216, flags = 134223989, pgoff = 0, inode = 18505 }
+vm_state.vm_map: 23329.131146587 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3079561216, end = 3079774208, flags = 135272561, pgoff = 7802880, inode = 18505 }
+vm_state.vm_map: 23329.131148652 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3079774208, end = 3080163328, flags = 135272563, pgoff = 8015872, inode = 18505 }
+vm_state.vm_map: 23329.131150594 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3080163328, end = 3080237056, flags = 1048691, pgoff = 3080163328, inode = 0 }
+vm_state.vm_map: 23329.131152537 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3083247616, end = 3088457728, flags = 1048691, pgoff = 3083247616, inode = 0 }
+vm_state.vm_map: 23329.131154474 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1545, start = 3213942784, end = 3214028800, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.131159827 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1546, start = 134512640, end = 134520832, flags = 134223989, pgoff = 0, inode = 17712 }
+vm_state.vm_map: 23329.131161912 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1546, start = 134520832, end = 134524928, flags = 135272563, pgoff = 4096, inode = 17712 }
+vm_state.vm_map: 23329.131164107 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1546, start = 141946880, end = 142082048, flags = 1048691, pgoff = 141946880, inode = 0 }
+vm_state.vm_map: 23329.131166124 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1546, start = 3076194304, end = 3076198400, flags = 1048691, pgoff = 3076194304, inode = 0 }
+vm_state.vm_map: 23329.131168443 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1546, start = 3076198400, end = 3077513216, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.131170503 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1546, start = 3077513216, end = 3077521408, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.131172680 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1546, start = 3077521408, end = 3077525504, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.131175036 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1546, start = 3077525504, end = 3077537792, flags = 1048691, pgoff = 3077525504, inode = 0 }
+vm_state.vm_map: 23329.131177108 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1546, start = 3077627904, end = 3077640192, flags = 1048691, pgoff = 3077627904, inode = 0 }
+vm_state.vm_map: 23329.131179113 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1546, start = 3077640192, end = 3077644288, flags = 67371125, pgoff = 3077640192, inode = 0 }
+vm_state.vm_map: 23329.131181432 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1546, start = 3077644288, end = 3077758976, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.131183504 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1546, start = 3077758976, end = 3077763072, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.131185558 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1546, start = 3077763072, end = 3077767168, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.131187655 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1546, start = 3219279872, end = 3219365888, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.131192527 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3074084864, end = 3074125824, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.131194686 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3074125824, end = 3074129920, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.131196726 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3074129920, end = 3074134016, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.131198897 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3074134016, end = 3074170880, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.131201012 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3074170880, end = 3074174976, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.131202974 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3074174976, end = 3074179072, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.131205189 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3074179072, end = 3074203648, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.131207278 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3074203648, end = 3074207744, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.131209764 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3074207744, end = 3074211840, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.131211763 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3074211840, end = 3074220032, flags = 1048691, pgoff = 3074211840, inode = 0 }
+vm_state.vm_map: 23329.131213958 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3074220032, end = 3074306048, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.131215981 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3074306048, end = 3074310144, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.131218158 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3074310144, end = 3074314240, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.131220316 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3074314240, end = 3074322432, flags = 1048691, pgoff = 3074314240, inode = 0 }
+vm_state.vm_map: 23329.131227520 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3074322432, end = 3074330624, flags = 134217845, pgoff = 0, inode = 500018 }
+vm_state.vm_map: 23329.131229666 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3074330624, end = 3074334720, flags = 135266419, pgoff = 4096, inode = 500018 }
+vm_state.vm_map: 23329.131231985 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3074334720, end = 3074359296, flags = 134217845, pgoff = 0, inode = 19420 }
+vm_state.vm_map: 23329.131234113 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3074359296, end = 3074363392, flags = 135266419, pgoff = 20480, inode = 19420 }
+vm_state.vm_map: 23329.131236296 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3074363392, end = 3075678208, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.131238332 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3075678208, end = 3075686400, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.131240533 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3075686400, end = 3075690496, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.131242674 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3075690496, end = 3075702784, flags = 1048691, pgoff = 3075690496, inode = 0 }
+vm_state.vm_map: 23329.131247978 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3075702784, end = 3075710976, flags = 134217845, pgoff = 0, inode = 499720 }
+vm_state.vm_map: 23329.131250130 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3075710976, end = 3075715072, flags = 135266419, pgoff = 4096, inode = 499720 }
+vm_state.vm_map: 23329.131252258 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3075715072, end = 3075719168, flags = 1048691, pgoff = 3075715072, inode = 0 }
+vm_state.vm_map: 23329.131257075 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3075719168, end = 3075878912, flags = 134217845, pgoff = 0, inode = 18680 }
+vm_state.vm_map: 23329.131259116 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3075878912, end = 3075883008, flags = 135266419, pgoff = 159744, inode = 18680 }
+vm_state.vm_map: 23329.131261540 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3075883008, end = 3076542464, flags = 134217845, pgoff = 0, inode = 19419 }
+vm_state.vm_map: 23329.131263563 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3076542464, end = 3076567040, flags = 135266419, pgoff = 659456, inode = 19419 }
+vm_state.vm_map: 23329.131265993 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3076567040, end = 3076730880, flags = 134217845, pgoff = 0, inode = 17950 }
+vm_state.vm_map: 23329.131268028 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3076730880, end = 3076734976, flags = 135266419, pgoff = 163840, inode = 17950 }
+vm_state.vm_map: 23329.131270321 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3076734976, end = 3076771840, flags = 134217845, pgoff = 0, inode = 508391 }
+vm_state.vm_map: 23329.131272364 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3076771840, end = 3076775936, flags = 135266417, pgoff = 32768, inode = 508391 }
+vm_state.vm_map: 23329.131274503 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3076775936, end = 3076780032, flags = 135266419, pgoff = 36864, inode = 508391 }
+vm_state.vm_map: 23329.131276595 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3076780032, end = 3076939776, flags = 1048691, pgoff = 3076780032, inode = 0 }
+vm_state.vm_map: 23329.131278808 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3076939776, end = 3077017600, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.131281392 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3077017600, end = 3077021696, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.131283440 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3077021696, end = 3077025792, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.131285457 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3077025792, end = 3077033984, flags = 1048691, pgoff = 3077025792, inode = 0 }
+vm_state.vm_map: 23329.131287646 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3077033984, end = 3077111808, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.131289656 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3077111808, end = 3077115904, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.131291753 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3077115904, end = 3077120000, flags = 1048691, pgoff = 3077115904, inode = 0 }
+vm_state.vm_map: 23329.131294134 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3077120000, end = 3077128192, flags = 134217845, pgoff = 0, inode = 508383 }
+vm_state.vm_map: 23329.131296157 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3077128192, end = 3077132288, flags = 135266417, pgoff = 4096, inode = 508383 }
+vm_state.vm_map: 23329.131298247 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3077132288, end = 3077136384, flags = 135266419, pgoff = 8192, inode = 508383 }
+vm_state.vm_map: 23329.131302898 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3077136384, end = 3078438912, flags = 134217845, pgoff = 0, inode = 33850 }
+vm_state.vm_map: 23329.131304970 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3078438912, end = 3078533120, flags = 135266419, pgoff = 1302528, inode = 33850 }
+vm_state.vm_map: 23329.131307116 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3078533120, end = 3078545408, flags = 1048691, pgoff = 3078533120, inode = 0 }
+vm_state.vm_map: 23329.131309515 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3078545408, end = 3078615040, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 23329.131311538 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3078615040, end = 3078619136, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 23329.131313752 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3078619136, end = 3078623232, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 23329.131316090 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3078623232, end = 3078631424, flags = 1048691, pgoff = 3078623232, inode = 0 }
+vm_state.vm_map: 23329.131318335 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3078631424, end = 3078729728, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 23329.131320370 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3078729728, end = 3078733824, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 23329.131322467 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3078733824, end = 3078737920, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 23329.131324706 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3078737920, end = 3078746112, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.131326797 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3078746112, end = 3078750208, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.131328850 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3078750208, end = 3078754304, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.131330873 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3078754304, end = 3078758400, flags = 1048691, pgoff = 3078754304, inode = 0 }
+vm_state.vm_map: 23329.131333137 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3078758400, end = 3078799360, flags = 134217845, pgoff = 0, inode = 499738 }
+vm_state.vm_map: 23329.131335178 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3078799360, end = 3078803456, flags = 135266419, pgoff = 40960, inode = 499738 }
+vm_state.vm_map: 23329.131337496 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3078803456, end = 3078832128, flags = 134217845, pgoff = 0, inode = 499851 }
+vm_state.vm_map: 23329.131339526 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3078832128, end = 3078836224, flags = 135266419, pgoff = 28672, inode = 499851 }
+vm_state.vm_map: 23329.131341611 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3078930432, end = 3078938624, flags = 1048691, pgoff = 3078930432, inode = 0 }
+vm_state.vm_map: 23329.131343621 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3078938624, end = 3078942720, flags = 67371125, pgoff = 3078938624, inode = 0 }
+vm_state.vm_map: 23329.131345848 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3078942720, end = 3079057408, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.131347908 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3079057408, end = 3079061504, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.131350374 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3079061504, end = 3079065600, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.131355247 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3079065600, end = 3079475200, flags = 134223989, pgoff = 0, inode = 18427 }
+vm_state.vm_map: 23329.131357288 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3079479296, end = 3079483392, flags = 135272561, pgoff = 409600, inode = 18427 }
+vm_state.vm_map: 23329.131359304 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3079483392, end = 3079487488, flags = 135272563, pgoff = 413696, inode = 18427 }
+vm_state.vm_map: 23329.131361531 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3079487488, end = 3079507968, flags = 1048691, pgoff = 3079487488, inode = 0 }
+vm_state.vm_map: 23329.131363578 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3084861440, end = 3084996608, flags = 1048691, pgoff = 3084861440, inode = 0 }
+vm_state.vm_map: 23329.131365675 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1623, start = 3219972096, end = 3220058112, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.131370893 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 134512640, end = 134758400, flags = 134223989, pgoff = 0, inode = 122894 }
+vm_state.vm_map: 23329.131373045 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 134758400, end = 134762496, flags = 135272563, pgoff = 245760, inode = 122894 }
+vm_state.vm_map: 23329.131375198 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 134762496, end = 134774784, flags = 1048691, pgoff = 134762496, inode = 0 }
+vm_state.vm_map: 23329.131377338 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 143687680, end = 143822848, flags = 1048691, pgoff = 143687680, inode = 0 }
+vm_state.vm_map: 23329.131379386 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3076005888, end = 3076009984, flags = 1048688, pgoff = 3076005888, inode = 0 }
+vm_state.vm_map: 23329.131381538 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3076009984, end = 3076534272, flags = 1048691, pgoff = 3076009984, inode = 0 }
+vm_state.vm_map: 23329.131383635 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3076534272, end = 3076538368, flags = 1048688, pgoff = 3076534272, inode = 0 }
+vm_state.vm_map: 23329.131385985 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3076538368, end = 3076669440, flags = 1048691, pgoff = 3076538368, inode = 0 }
+vm_state.vm_map: 23329.131388075 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3076669440, end = 3076673536, flags = 1048688, pgoff = 3076669440, inode = 0 }
+vm_state.vm_map: 23329.131390080 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3076673536, end = 3076808704, flags = 1048691, pgoff = 3076673536, inode = 0 }
+vm_state.vm_map: 23329.131392411 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3076808704, end = 3078123520, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.131394570 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3078123520, end = 3078131712, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.131396679 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3078131712, end = 3078135808, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.131398955 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3078135808, end = 3078148096, flags = 1048691, pgoff = 3078135808, inode = 0 }
+vm_state.vm_map: 23329.131401101 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3078148096, end = 3078295552, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.131403303 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3078295552, end = 3078299648, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.131405240 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3078299648, end = 3078303744, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.131407250 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3078303744, end = 3078307840, flags = 1048691, pgoff = 3078303744, inode = 0 }
+vm_state.vm_map: 23329.131409452 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3078307840, end = 3078336512, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.131411604 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3078336512, end = 3078340608, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.131413645 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3078340608, end = 3078344704, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.131415885 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3078344704, end = 3078430720, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.131418054 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3078430720, end = 3078434816, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.131420627 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3078434816, end = 3078438912, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.131422767 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3078438912, end = 3078447104, flags = 1048691, pgoff = 3078438912, inode = 0 }
+vm_state.vm_map: 23329.131424809 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3078508544, end = 3078512640, flags = 1048691, pgoff = 3078508544, inode = 0 }
+vm_state.vm_map: 23329.131429470 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3078512640, end = 3078541312, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.131431512 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3078541312, end = 3078549504, flags = 1048691, pgoff = 3078541312, inode = 0 }
+vm_state.vm_map: 23329.131433646 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3078549504, end = 3078553600, flags = 67371125, pgoff = 3078549504, inode = 0 }
+vm_state.vm_map: 23329.131435878 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3078553600, end = 3078668288, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.131437938 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3078668288, end = 3078672384, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.131439974 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3078672384, end = 3078676480, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.131442077 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1642, start = 3219480576, end = 3219566592, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.131444815 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 134512640, end = 134832128, flags = 134223989, pgoff = 0, inode = 1327116 }
+vm_state.vm_map: 23329.131446943 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 134832128, end = 134840320, flags = 135272563, pgoff = 315392, inode = 1327116 }
+vm_state.vm_map: 23329.131448997 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 134840320, end = 134852608, flags = 1048691, pgoff = 134840320, inode = 0 }
+vm_state.vm_map: 23329.131451131 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 141115392, end = 141520896, flags = 1048691, pgoff = 141115392, inode = 0 }
+vm_state.vm_map: 23329.131456354 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3073916928, end = 3074711552, flags = 134217937, pgoff = 0, inode = 1196246 }
+vm_state.vm_map: 23329.131458772 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3074711552, end = 3075080192, flags = 134217937, pgoff = 0, inode = 1131233 }
+vm_state.vm_map: 23329.131461233 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3075080192, end = 3075715072, flags = 134217937, pgoff = 0, inode = 19219 }
+vm_state.vm_map: 23329.131463361 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3075715072, end = 3075756032, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.131465581 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3075756032, end = 3075760128, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.131467591 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3075760128, end = 3075764224, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.131469799 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3075764224, end = 3075801088, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.131471853 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3075801088, end = 3075805184, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.131473876 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3075805184, end = 3075809280, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.131476072 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3075809280, end = 3075887104, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.131478070 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3075887104, end = 3075891200, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.131480118 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3075891200, end = 3075895296, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.131482165 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3075895296, end = 3075903488, flags = 1048691, pgoff = 3075895296, inode = 0 }
+vm_state.vm_map: 23329.131484287 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3075903488, end = 3075928064, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.131486378 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3075928064, end = 3075932160, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.131488394 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3075932160, end = 3075936256, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.131490904 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3076030464, end = 3076034560, flags = 1048691, pgoff = 3076030464, inode = 0 }
+vm_state.vm_map: 23329.131495758 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3076034560, end = 3076227072, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.131497800 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3076227072, end = 3076231168, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.131499852 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3076231168, end = 3076235264, flags = 1048691, pgoff = 3076231168, inode = 0 }
+vm_state.vm_map: 23329.131502006 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3076235264, end = 3076263936, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.131504226 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3076263936, end = 3076268032, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.131506359 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3076268032, end = 3076272128, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.131508709 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3076272128, end = 3077586944, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.131510738 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3077586944, end = 3077595136, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.131512946 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3077595136, end = 3077599232, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.131515024 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3077599232, end = 3077611520, flags = 1048691, pgoff = 3077599232, inode = 0 }
+vm_state.vm_map: 23329.131517134 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3077611520, end = 3077758976, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.131519348 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3077758976, end = 3077763072, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.131521488 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3077763072, end = 3077767168, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.131523727 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3077767168, end = 3077853184, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.131528654 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3077853184, end = 3077857280, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.131530696 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3077857280, end = 3077861376, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.131532756 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3077861376, end = 3077869568, flags = 1048691, pgoff = 3077861376, inode = 0 }
+vm_state.vm_map: 23329.131537511 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3077869568, end = 3078094848, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.131539663 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078094848, end = 3078098944, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.131541810 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078098944, end = 3078103040, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.131546626 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078103040, end = 3078840320, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.131548674 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078840320, end = 3078844416, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.131550833 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078844416, end = 3078848512, flags = 1048691, pgoff = 3078844416, inode = 0 }
+vm_state.vm_map: 23329.131555649 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3078848512, end = 3079090176, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.131557691 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3079090176, end = 3079094272, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.131560170 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3079094272, end = 3079208960, flags = 134217845, pgoff = 0, inode = 17291 }
+vm_state.vm_map: 23329.131562545 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3079208960, end = 3079213056, flags = 135266419, pgoff = 114688, inode = 17291 }
+vm_state.vm_map: 23329.131564790 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3079241728, end = 3079270400, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.131566911 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3079270400, end = 3079315456, flags = 1048691, pgoff = 3079270400, inode = 0 }
+vm_state.vm_map: 23329.131569044 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3079315456, end = 3079319552, flags = 67371125, pgoff = 3079315456, inode = 0 }
+vm_state.vm_map: 23329.131571346 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3079319552, end = 3079434240, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.131573386 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3079434240, end = 3079438336, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.131575484 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3079438336, end = 3079442432, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.131577580 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1658, start = 3216498688, end = 3216584704, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.131585437 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 134512640, end = 134524928, flags = 134223989, pgoff = 0, inode = 134326 }
+vm_state.vm_map: 23329.131587577 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 134524928, end = 134529024, flags = 135272563, pgoff = 8192, inode = 134326 }
+vm_state.vm_map: 23329.131589576 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 150622208, end = 150757376, flags = 1048691, pgoff = 150622208, inode = 0 }
+vm_state.vm_map: 23329.131591691 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3075604480, end = 3075608576, flags = 1048691, pgoff = 3075604480, inode = 0 }
+vm_state.vm_map: 23329.131593985 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3075608576, end = 3075801088, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.131596058 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3075801088, end = 3075805184, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.131598414 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3075805184, end = 3075809280, flags = 1048691, pgoff = 3075805184, inode = 0 }
+vm_state.vm_map: 23329.131600671 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3075809280, end = 3076050944, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.131602811 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3076050944, end = 3076055040, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.131604939 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3076055040, end = 3076083712, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.131607030 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3076083712, end = 3076087808, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.131609028 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3076087808, end = 3076091904, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.131611396 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3076091904, end = 3077406720, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.131613555 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3077406720, end = 3077414912, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.131615584 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3077414912, end = 3077419008, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.131617681 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3077419008, end = 3077431296, flags = 1048691, pgoff = 3077419008, inode = 0 }
+vm_state.vm_map: 23329.131619734 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3077431296, end = 3077517312, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.131621905 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3077517312, end = 3077521408, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.131623941 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3077521408, end = 3077525504, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.131626044 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3077525504, end = 3077533696, flags = 1048691, pgoff = 3077525504, inode = 0 }
+vm_state.vm_map: 23329.131628159 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3077533696, end = 3077758976, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.131630256 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3077758976, end = 3077763072, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.131632655 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3077763072, end = 3077767168, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.131634654 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3077767168, end = 3077771264, flags = 1048691, pgoff = 3077767168, inode = 0 }
+vm_state.vm_map: 23329.131636855 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3077771264, end = 3078508544, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.131638817 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3078508544, end = 3078512640, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.131640926 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3078512640, end = 3078627328, flags = 134217845, pgoff = 0, inode = 17291 }
+vm_state.vm_map: 23329.131643022 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3078627328, end = 3078631424, flags = 135266419, pgoff = 114688, inode = 17291 }
+vm_state.vm_map: 23329.131645095 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3078721536, end = 3078733824, flags = 1048691, pgoff = 3078721536, inode = 0 }
+vm_state.vm_map: 23329.131647247 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3078733824, end = 3078737920, flags = 67371125, pgoff = 3078733824, inode = 0 }
+vm_state.vm_map: 23329.131649505 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3078737920, end = 3078852608, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.131651601 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3078852608, end = 3078856704, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.131653588 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3078856704, end = 3078860800, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.131655604 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1659, start = 3218362368, end = 3218448384, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.131998228 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 134512640, end = 134533120, flags = 134223989, pgoff = 0, inode = 134332 }
+vm_state.vm_map: 23329.132017163 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 134533120, end = 134537216, flags = 135272563, pgoff = 16384, inode = 134332 }
+vm_state.vm_map: 23329.132019353 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 154587136, end = 154722304, flags = 1048691, pgoff = 154587136, inode = 0 }
+vm_state.vm_map: 23329.132021894 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3075784704, end = 3075788800, flags = 1048691, pgoff = 3075784704, inode = 0 }
+vm_state.vm_map: 23329.132024090 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3075788800, end = 3075981312, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.132026164 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3075981312, end = 3075985408, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.132028420 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3075985408, end = 3076227072, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.132030463 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3076227072, end = 3076231168, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.132032522 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3076231168, end = 3076235264, flags = 1048691, pgoff = 3076231168, inode = 0 }
+vm_state.vm_map: 23329.132034743 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3076235264, end = 3076263936, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.132036877 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3076263936, end = 3076268032, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.132038863 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3076268032, end = 3076272128, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.132041207 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3076272128, end = 3077586944, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.132043279 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3077586944, end = 3077595136, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.132045377 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3077595136, end = 3077599232, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.132047548 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3077599232, end = 3077611520, flags = 1048691, pgoff = 3077599232, inode = 0 }
+vm_state.vm_map: 23329.132049707 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3077611520, end = 3078348800, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.132051909 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3078348800, end = 3078352896, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.132054068 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3078352896, end = 3078438912, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.132056652 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3078438912, end = 3078443008, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.132058663 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3078443008, end = 3078447104, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.132060859 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3078447104, end = 3078455296, flags = 1048691, pgoff = 3078447104, inode = 0 }
+vm_state.vm_map: 23329.132063042 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3078455296, end = 3078680576, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.132065257 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3078680576, end = 3078684672, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.132067311 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3078684672, end = 3078688768, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.132069469 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3078688768, end = 3078692864, flags = 1048691, pgoff = 3078688768, inode = 0 }
+vm_state.vm_map: 23329.132071635 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3078692864, end = 3078807552, flags = 134217845, pgoff = 0, inode = 17291 }
+vm_state.vm_map: 23329.132073689 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3078807552, end = 3078811648, flags = 135266419, pgoff = 114688, inode = 17291 }
+vm_state.vm_map: 23329.132079505 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3078811648, end = 3078873088, flags = 134217845, pgoff = 0, inode = 22552 }
+vm_state.vm_map: 23329.132081658 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3078873088, end = 3078877184, flags = 135266419, pgoff = 57344, inode = 22552 }
+vm_state.vm_map: 23329.132083754 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3078971392, end = 3078979584, flags = 1048691, pgoff = 3078971392, inode = 0 }
+vm_state.vm_map: 23329.132085753 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3078979584, end = 3078983680, flags = 67371125, pgoff = 3078979584, inode = 0 }
+vm_state.vm_map: 23329.132088122 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3078983680, end = 3079098368, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.132090238 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3079098368, end = 3079102464, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.132092816 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3079102464, end = 3079106560, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.132094981 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1732, start = 3213758464, end = 3213844480, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.132097848 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 134512640, end = 134533120, flags = 134223989, pgoff = 0, inode = 134332 }
+vm_state.vm_map: 23329.132100001 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 134533120, end = 134537216, flags = 135272563, pgoff = 16384, inode = 134332 }
+vm_state.vm_map: 23329.132101975 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 140877824, end = 141012992, flags = 1048691, pgoff = 140877824, inode = 0 }
+vm_state.vm_map: 23329.132104005 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3075698688, end = 3075702784, flags = 1048691, pgoff = 3075698688, inode = 0 }
+vm_state.vm_map: 23329.132106249 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3075702784, end = 3075895296, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.132108396 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3075895296, end = 3075899392, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.132110715 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3075899392, end = 3076141056, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.132112726 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3076141056, end = 3076145152, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.132114829 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3076145152, end = 3076149248, flags = 1048691, pgoff = 3076145152, inode = 0 }
+vm_state.vm_map: 23329.132116945 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3076149248, end = 3076177920, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.132119369 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3076177920, end = 3076182016, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.132121423 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3076182016, end = 3076186112, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.132123613 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3076186112, end = 3077500928, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.132125617 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3077500928, end = 3077509120, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.132128276 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3077509120, end = 3077513216, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.132130311 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3077513216, end = 3077525504, flags = 1048691, pgoff = 3077513216, inode = 0 }
+vm_state.vm_map: 23329.132132655 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3077525504, end = 3078262784, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.132134746 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3078262784, end = 3078266880, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.132137078 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3078266880, end = 3078352896, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.132139052 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3078352896, end = 3078356992, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.132141013 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3078356992, end = 3078361088, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.132143147 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3078361088, end = 3078369280, flags = 1048691, pgoff = 3078361088, inode = 0 }
+vm_state.vm_map: 23329.132145491 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3078369280, end = 3078594560, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.132147453 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3078594560, end = 3078598656, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.132149629 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3078598656, end = 3078602752, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.132151592 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3078602752, end = 3078606848, flags = 1048691, pgoff = 3078602752, inode = 0 }
+vm_state.vm_map: 23329.132153769 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3078606848, end = 3078721536, flags = 134217845, pgoff = 0, inode = 17291 }
+vm_state.vm_map: 23329.132155952 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3078721536, end = 3078725632, flags = 135266419, pgoff = 114688, inode = 17291 }
+vm_state.vm_map: 23329.132158148 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3078725632, end = 3078787072, flags = 134217845, pgoff = 0, inode = 22552 }
+vm_state.vm_map: 23329.132160183 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3078787072, end = 3078791168, flags = 135266419, pgoff = 57344, inode = 22552 }
+vm_state.vm_map: 23329.132162459 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3078885376, end = 3078893568, flags = 1048691, pgoff = 3078885376, inode = 0 }
+vm_state.vm_map: 23329.132164519 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3078893568, end = 3078897664, flags = 67371125, pgoff = 3078893568, inode = 0 }
+vm_state.vm_map: 23329.132166617 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3078897664, end = 3079012352, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.132168609 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3079012352, end = 3079016448, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.132170552 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3079016448, end = 3079020544, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.132172624 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1734, start = 3217080320, end = 3217166336, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.132175431 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 134512640, end = 134524928, flags = 134223989, pgoff = 0, inode = 134268 }
+vm_state.vm_map: 23329.132177361 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 134524928, end = 134529024, flags = 135272563, pgoff = 8192, inode = 134268 }
+vm_state.vm_map: 23329.132179421 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 140742656, end = 140877824, flags = 1048691, pgoff = 140742656, inode = 0 }
+vm_state.vm_map: 23329.132181623 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3076239360, end = 3076280320, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.132183554 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3076280320, end = 3076284416, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.132185491 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3076284416, end = 3076288512, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.132187681 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3076288512, end = 3076325376, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.132189605 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3076325376, end = 3076329472, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.132191647 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3076329472, end = 3076333568, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.132193799 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3076333568, end = 3076411392, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.132196304 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3076411392, end = 3076415488, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.132198234 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3076415488, end = 3076419584, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.132200208 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3076419584, end = 3076427776, flags = 1048691, pgoff = 3076419584, inode = 0 }
+vm_state.vm_map: 23329.132202311 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3076427776, end = 3076452352, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.132204421 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3076452352, end = 3076456448, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.132206444 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3076456448, end = 3076460544, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.132208436 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3076460544, end = 3076468736, flags = 1048691, pgoff = 3076460544, inode = 0 }
+vm_state.vm_map: 23329.132210515 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3076468736, end = 3076661248, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.132212600 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3076661248, end = 3076665344, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.132214635 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3076665344, end = 3076694016, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.132216585 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3076694016, end = 3076698112, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.132218645 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3076698112, end = 3076702208, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.132220841 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3076702208, end = 3078017024, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.132222889 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3078017024, end = 3078025216, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.132224980 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3078025216, end = 3078029312, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.132226922 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3078029312, end = 3078041600, flags = 1048691, pgoff = 3078029312, inode = 0 }
+vm_state.vm_map: 23329.132229402 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3078041600, end = 3078103040, flags = 134217845, pgoff = 0, inode = 22552 }
+vm_state.vm_map: 23329.132231456 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3078103040, end = 3078107136, flags = 135266419, pgoff = 57344, inode = 22552 }
+vm_state.vm_map: 23329.132233657 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3078107136, end = 3078844416, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.132235706 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3078844416, end = 3078848512, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.132237877 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3078848512, end = 3078852608, flags = 1048691, pgoff = 3078848512, inode = 0 }
+vm_state.vm_map: 23329.132240010 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3078852608, end = 3078938624, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.132242034 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3078938624, end = 3078942720, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.132244094 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3078942720, end = 3078946816, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.132246061 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3078946816, end = 3078955008, flags = 1048691, pgoff = 3078946816, inode = 0 }
+vm_state.vm_map: 23329.132248103 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3078955008, end = 3079180288, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.132250027 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3079180288, end = 3079184384, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.132252113 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3079184384, end = 3079188480, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.132254043 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3079278592, end = 3079290880, flags = 1048691, pgoff = 3079278592, inode = 0 }
+vm_state.vm_map: 23329.132255980 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3079290880, end = 3079294976, flags = 67371125, pgoff = 3079290880, inode = 0 }
+vm_state.vm_map: 23329.132258046 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3079294976, end = 3079409664, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.132260119 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3079409664, end = 3079413760, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.132262407 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3079413760, end = 3079417856, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.132264393 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1736, start = 3212963840, end = 3213049856, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.132267015 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 134512640, end = 134529024, flags = 134223989, pgoff = 0, inode = 134324 }
+vm_state.vm_map: 23329.132269217 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 134529024, end = 134533120, flags = 135272563, pgoff = 12288, inode = 134324 }
+vm_state.vm_map: 23329.132271166 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 135680000, end = 135815168, flags = 1048691, pgoff = 135680000, inode = 0 }
+vm_state.vm_map: 23329.132273109 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3075239936, end = 3075244032, flags = 1048691, pgoff = 3075239936, inode = 0 }
+vm_state.vm_map: 23329.132275274 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3075244032, end = 3075436544, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.132277334 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3075436544, end = 3075440640, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.132279444 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3075440640, end = 3075682304, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.132281461 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3075682304, end = 3075686400, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.132283391 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3075686400, end = 3075690496, flags = 1048691, pgoff = 3075686400, inode = 0 }
+vm_state.vm_map: 23329.132285556 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3075690496, end = 3075719168, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.132287499 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3075719168, end = 3075723264, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.132289430 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3075723264, end = 3075727360, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.132291508 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3075727360, end = 3077042176, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.132293581 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3077042176, end = 3077050368, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.132295968 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3077050368, end = 3077054464, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.132297954 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3077054464, end = 3077066752, flags = 1048691, pgoff = 3077054464, inode = 0 }
+vm_state.vm_map: 23329.132300193 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3077066752, end = 3077804032, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.132321263 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3077804032, end = 3077808128, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.132323675 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3077808128, end = 3077894144, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.132325796 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3077894144, end = 3077898240, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.132328103 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3077898240, end = 3077902336, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.132330157 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3077902336, end = 3077910528, flags = 1048691, pgoff = 3077902336, inode = 0 }
+vm_state.vm_map: 23329.132332365 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3077910528, end = 3078135808, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.132334487 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3078135808, end = 3078139904, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.132336578 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3078139904, end = 3078144000, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.132338706 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3078144000, end = 3078148096, flags = 1048691, pgoff = 3078144000, inode = 0 }
+vm_state.vm_map: 23329.132340902 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3078148096, end = 3078262784, flags = 134217845, pgoff = 0, inode = 17291 }
+vm_state.vm_map: 23329.132343080 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3078262784, end = 3078266880, flags = 135266419, pgoff = 114688, inode = 17291 }
+vm_state.vm_map: 23329.132345201 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3078266880, end = 3078328320, flags = 134217845, pgoff = 0, inode = 22552 }
+vm_state.vm_map: 23329.132347329 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3078328320, end = 3078332416, flags = 135266419, pgoff = 57344, inode = 22552 }
+vm_state.vm_map: 23329.132349939 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3078426624, end = 3078434816, flags = 1048691, pgoff = 3078426624, inode = 0 }
+vm_state.vm_map: 23329.132351949 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3078434816, end = 3078438912, flags = 67371125, pgoff = 3078434816, inode = 0 }
+vm_state.vm_map: 23329.132354090 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3078438912, end = 3078553600, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.132356218 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3078553600, end = 3078557696, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.132358278 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3078557696, end = 3078561792, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.132360480 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1741, start = 3216084992, end = 3216171008, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.132368924 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 134512640, end = 137146368, flags = 134223989, pgoff = 0, inode = 20802 }
+vm_state.vm_map: 23329.132371089 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 137150464, end = 137170944, flags = 135272561, pgoff = 2633728, inode = 20802 }
+vm_state.vm_map: 23329.132373279 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 137170944, end = 137191424, flags = 135272563, pgoff = 2654208, inode = 20802 }
+vm_state.vm_map: 23329.132375493 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 137191424, end = 137195520, flags = 1048691, pgoff = 137191424, inode = 0 }
+vm_state.vm_map: 23329.132377547 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 163663872, end = 164384768, flags = 1048691, pgoff = 163663872, inode = 0 }
+vm_state.vm_map: 23329.132382358 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3074371584, end = 3074461696, flags = 134217979, pgoff = 0, inode = 1237059 }
+vm_state.vm_map: 23329.132387378 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3074461696, end = 3074527232, flags = 134217937, pgoff = 0, inode = 156491 }
+vm_state.vm_map: 23329.132392067 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3074527232, end = 3074658304, flags = 134217937, pgoff = 0, inode = 156496 }
+vm_state.vm_map: 23329.132394441 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3074658304, end = 3074789376, flags = 134217937, pgoff = 0, inode = 156489 }
+vm_state.vm_map: 23329.132396483 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3074789376, end = 3074797568, flags = 1048691, pgoff = 3074789376, inode = 0 }
+vm_state.vm_map: 23329.132398691 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3074797568, end = 3074809856, flags = 134217845, pgoff = 0, inode = 20765 }
+vm_state.vm_map: 23329.132400800 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3074809856, end = 3074813952, flags = 135266419, pgoff = 8192, inode = 20765 }
+vm_state.vm_map: 23329.132403033 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3074813952, end = 3075276800, flags = 134217845, pgoff = 0, inode = 20061 }
+vm_state.vm_map: 23329.132405143 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3075276800, end = 3075289088, flags = 135266419, pgoff = 458752, inode = 20061 }
+vm_state.vm_map: 23329.132407536 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3075289088, end = 3075350528, flags = 134217845, pgoff = 0, inode = 19423 }
+vm_state.vm_map: 23329.132409602 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3075350528, end = 3075354624, flags = 135266419, pgoff = 57344, inode = 19423 }
+vm_state.vm_map: 23329.132414420 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3075354624, end = 3075960832, flags = 134217845, pgoff = 0, inode = 22471 }
+vm_state.vm_map: 23329.132416585 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3075960832, end = 3075977216, flags = 135266419, pgoff = 602112, inode = 22471 }
+vm_state.vm_map: 23329.132418651 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3075977216, end = 3075981312, flags = 1048691, pgoff = 3075977216, inode = 0 }
+vm_state.vm_map: 23329.132421051 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3075981312, end = 3076071424, flags = 134217845, pgoff = 0, inode = 18560 }
+vm_state.vm_map: 23329.132423561 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3076071424, end = 3076075520, flags = 135266419, pgoff = 86016, inode = 18560 }
+vm_state.vm_map: 23329.132425837 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3076075520, end = 3076161536, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.132427885 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3076161536, end = 3076165632, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.132429933 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3076165632, end = 3076169728, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.132431987 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3076169728, end = 3076177920, flags = 1048691, pgoff = 3076169728, inode = 0 }
+vm_state.vm_map: 23329.132434318 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3076177920, end = 3076186112, flags = 134217845, pgoff = 0, inode = 500018 }
+vm_state.vm_map: 23329.132436360 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3076186112, end = 3076190208, flags = 135266419, pgoff = 4096, inode = 500018 }
+vm_state.vm_map: 23329.132438451 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3076190208, end = 3076214784, flags = 134217845, pgoff = 0, inode = 19420 }
+vm_state.vm_map: 23329.132440375 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3076214784, end = 3076218880, flags = 135266419, pgoff = 20480, inode = 19420 }
+vm_state.vm_map: 23329.132447500 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3076218880, end = 3076235264, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 23329.132449541 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3076235264, end = 3076239360, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 23329.132451713 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3076239360, end = 3077554176, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.132453846 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3077554176, end = 3077562368, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.132455882 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3077562368, end = 3077566464, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.132458355 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3077566464, end = 3077582848, flags = 1048691, pgoff = 3077566464, inode = 0 }
+vm_state.vm_map: 23329.132460458 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3077582848, end = 3077660672, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.132462414 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3077660672, end = 3077664768, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.132467212 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3077664768, end = 3077713920, flags = 134217845, pgoff = 0, inode = 19447 }
+vm_state.vm_map: 23329.132469260 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3077713920, end = 3077718016, flags = 135266419, pgoff = 49152, inode = 19447 }
+vm_state.vm_map: 23329.132471636 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3077718016, end = 3077984256, flags = 134217845, pgoff = 0, inode = 19433 }
+vm_state.vm_map: 23329.132473708 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3077984256, end = 3077992448, flags = 135266419, pgoff = 262144, inode = 19433 }
+vm_state.vm_map: 23329.132475700 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3077992448, end = 3077996544, flags = 1048691, pgoff = 3077992448, inode = 0 }
+vm_state.vm_map: 23329.132477772 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3077996544, end = 3078004736, flags = 134217845, pgoff = 0, inode = 499720 }
+vm_state.vm_map: 23329.132479845 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3078004736, end = 3078008832, flags = 135266419, pgoff = 4096, inode = 499720 }
+vm_state.vm_map: 23329.132481917 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3078008832, end = 3078168576, flags = 134217845, pgoff = 0, inode = 18680 }
+vm_state.vm_map: 23329.132483854 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3078168576, end = 3078172672, flags = 135266419, pgoff = 159744, inode = 18680 }
+vm_state.vm_map: 23329.132485791 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3078172672, end = 3078176768, flags = 1048691, pgoff = 3078172672, inode = 0 }
+vm_state.vm_map: 23329.132487999 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3078176768, end = 3078836224, flags = 134217845, pgoff = 0, inode = 19419 }
+vm_state.vm_map: 23329.132489936 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3078836224, end = 3078860800, flags = 135266419, pgoff = 659456, inode = 19419 }
+vm_state.vm_map: 23329.132492341 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3078860800, end = 3079024640, flags = 134217845, pgoff = 0, inode = 17950 }
+vm_state.vm_map: 23329.132494303 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079024640, end = 3079028736, flags = 135266419, pgoff = 163840, inode = 17950 }
+vm_state.vm_map: 23329.132496696 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079028736, end = 3079065600, flags = 134217845, pgoff = 0, inode = 499726 }
+vm_state.vm_map: 23329.132498682 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079065600, end = 3079069696, flags = 135266419, pgoff = 32768, inode = 499726 }
+vm_state.vm_map: 23329.132501112 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079069696, end = 3079102464, flags = 134217845, pgoff = 0, inode = 20850 }
+vm_state.vm_map: 23329.132503173 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079102464, end = 3079106560, flags = 135266419, pgoff = 28672, inode = 20850 }
+vm_state.vm_map: 23329.132505375 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079106560, end = 3079114752, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.132507484 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079114752, end = 3079118848, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.132509520 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079118848, end = 3079122944, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.132511635 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079122944, end = 3079200768, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.132513887 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079200768, end = 3079204864, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.132515861 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079204864, end = 3079208960, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.132517791 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079208960, end = 3079221248, flags = 1048691, pgoff = 3079208960, inode = 0 }
+vm_state.vm_map: 23329.132519888 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079221248, end = 3079290880, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 23329.132522090 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079290880, end = 3079294976, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 23329.132524027 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079294976, end = 3079299072, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 23329.132526456 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079299072, end = 3079307264, flags = 1048691, pgoff = 3079299072, inode = 0 }
+vm_state.vm_map: 23329.132528961 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079307264, end = 3079319552, flags = 134217845, pgoff = 0, inode = 499779 }
+vm_state.vm_map: 23329.132531145 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079319552, end = 3079323648, flags = 135266419, pgoff = 8192, inode = 499779 }
+vm_state.vm_map: 23329.132535882 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079352320, end = 3079356416, flags = 134217979, pgoff = 0, inode = 1236999 }
+vm_state.vm_map: 23329.132538244 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079356416, end = 3079364608, flags = 134217845, pgoff = 0, inode = 1450400 }
+vm_state.vm_map: 23329.132540384 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079364608, end = 3079368704, flags = 135266417, pgoff = 4096, inode = 1450400 }
+vm_state.vm_map: 23329.132542432 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079368704, end = 3079372800, flags = 135266419, pgoff = 8192, inode = 1450400 }
+vm_state.vm_map: 23329.132544720 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079372800, end = 3079380992, flags = 134217845, pgoff = 0, inode = 1450327 }
+vm_state.vm_map: 23329.132546657 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079380992, end = 3079385088, flags = 135266417, pgoff = 4096, inode = 1450327 }
+vm_state.vm_map: 23329.132548754 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079385088, end = 3079389184, flags = 135266419, pgoff = 8192, inode = 1450327 }
+vm_state.vm_map: 23329.132551061 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079389184, end = 3079417856, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.132553047 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079417856, end = 3079426048, flags = 1048691, pgoff = 3079417856, inode = 0 }
+vm_state.vm_map: 23329.132554984 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079426048, end = 3079430144, flags = 67371125, pgoff = 3079426048, inode = 0 }
+vm_state.vm_map: 23329.132557205 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079430144, end = 3079544832, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.132559506 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079544832, end = 3079548928, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.132561942 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3079548928, end = 3079553024, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.132563879 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1758, start = 3218640896, end = 3218726912, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.132568968 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 134512640, end = 142159872, flags = 134223989, pgoff = 0, inode = 20798 }
+vm_state.vm_map: 23329.132571028 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 142159872, end = 142204928, flags = 135272561, pgoff = 7643136, inode = 20798 }
+vm_state.vm_map: 23329.132573020 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 142204928, end = 142237696, flags = 135272563, pgoff = 7688192, inode = 20798 }
+vm_state.vm_map: 23329.132574982 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 142237696, end = 142241792, flags = 1048691, pgoff = 142237696, inode = 0 }
+vm_state.vm_map: 23329.132576986 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 142274560, end = 143097856, flags = 1048691, pgoff = 142274560, inode = 0 }
+vm_state.vm_map: 23329.132581952 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3071086592, end = 3071164416, flags = 134217979, pgoff = 0, inode = 1206047 }
+vm_state.vm_map: 23329.132584147 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3071164416, end = 3071205376, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.132586146 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3071205376, end = 3071209472, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.132588138 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3071209472, end = 3071213568, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.132590365 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3071213568, end = 3071250432, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.132592431 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3071250432, end = 3071254528, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.132594380 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3071254528, end = 3071258624, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.132596798 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3071258624, end = 3071283200, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.132598871 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3071283200, end = 3071287296, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.132600862 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3071287296, end = 3071291392, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.132605619 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3071332352, end = 3071348736, flags = 134217979, pgoff = 0, inode = 1206050 }
+vm_state.vm_map: 23329.132607895 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3071348736, end = 3071385600, flags = 134217979, pgoff = 0, inode = 1206049 }
+vm_state.vm_map: 23329.132612583 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3071418368, end = 3071422464, flags = 134217979, pgoff = 0, inode = 1206071 }
+vm_state.vm_map: 23329.132615061 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3071422464, end = 3071430656, flags = 134217979, pgoff = 0, inode = 1206070 }
+vm_state.vm_map: 23329.132617252 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3071430656, end = 3071438848, flags = 134217979, pgoff = 0, inode = 1206069 }
+vm_state.vm_map: 23329.132622019 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3071438848, end = 3071479808, flags = 134217979, pgoff = 0, inode = 1237134 }
+vm_state.vm_map: 23329.132624431 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3071479808, end = 3071520768, flags = 134217979, pgoff = 0, inode = 1237063 }
+vm_state.vm_map: 23329.132626781 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3071520768, end = 3071610880, flags = 134217979, pgoff = 0, inode = 1237059 }
+vm_state.vm_map: 23329.132629069 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3071610880, end = 3071635456, flags = 134217979, pgoff = 0, inode = 1206046 }
+vm_state.vm_map: 23329.132631142 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3071639552, end = 3071705088, flags = 134217937, pgoff = 0, inode = 156491 }
+vm_state.vm_map: 23329.132633554 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3071705088, end = 3071836160, flags = 134217937, pgoff = 0, inode = 156496 }
+vm_state.vm_map: 23329.132635608 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3071836160, end = 3071967232, flags = 134217937, pgoff = 0, inode = 156489 }
+vm_state.vm_map: 23329.132637600 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3071967232, end = 3071979520, flags = 1048691, pgoff = 3071967232, inode = 0 }
+vm_state.vm_map: 23329.132639709 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3071979520, end = 3071991808, flags = 134217845, pgoff = 0, inode = 20765 }
+vm_state.vm_map: 23329.132641658 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3071991808, end = 3071995904, flags = 135266419, pgoff = 8192, inode = 20765 }
+vm_state.vm_map: 23329.132643898 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3071995904, end = 3072024576, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.132646019 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3072024576, end = 3072028672, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.132647993 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3072028672, end = 3072032768, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.132650251 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3072032768, end = 3072258048, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.132652237 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3072258048, end = 3072262144, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.132654235 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3072262144, end = 3072266240, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.132656296 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3072266240, end = 3072270336, flags = 1048691, pgoff = 3072266240, inode = 0 }
+vm_state.vm_map: 23329.132658504 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3072270336, end = 3072733184, flags = 134217845, pgoff = 0, inode = 20061 }
+vm_state.vm_map: 23329.132660459 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3072733184, end = 3072745472, flags = 135266419, pgoff = 458752, inode = 20061 }
+vm_state.vm_map: 23329.132662575 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3072745472, end = 3072806912, flags = 134217845, pgoff = 0, inode = 19423 }
+vm_state.vm_map: 23329.132664666 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3072806912, end = 3072811008, flags = 135266419, pgoff = 57344, inode = 19423 }
+vm_state.vm_map: 23329.132667306 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3072811008, end = 3072872448, flags = 134217845, pgoff = 0, inode = 21268 }
+vm_state.vm_map: 23329.132669483 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3072872448, end = 3072876544, flags = 135266419, pgoff = 57344, inode = 21268 }
+vm_state.vm_map: 23329.132671802 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3072876544, end = 3072917504, flags = 134217845, pgoff = 0, inode = 22434 }
+vm_state.vm_map: 23329.132673887 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3072917504, end = 3072921600, flags = 135266419, pgoff = 40960, inode = 22434 }
+vm_state.vm_map: 23329.132676033 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3072921600, end = 3072929792, flags = 134217845, pgoff = 0, inode = 500018 }
+vm_state.vm_map: 23329.132678131 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3072929792, end = 3072933888, flags = 135266419, pgoff = 4096, inode = 500018 }
+vm_state.vm_map: 23329.132680129 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3072933888, end = 3072937984, flags = 1048691, pgoff = 3072933888, inode = 0 }
+vm_state.vm_map: 23329.132682350 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3072937984, end = 3072962560, flags = 134217845, pgoff = 0, inode = 19420 }
+vm_state.vm_map: 23329.132684619 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3072962560, end = 3072966656, flags = 135266419, pgoff = 20480, inode = 19420 }
+vm_state.vm_map: 23329.132686773 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3072966656, end = 3073056768, flags = 134217845, pgoff = 0, inode = 18560 }
+vm_state.vm_map: 23329.132688863 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3073056768, end = 3073060864, flags = 135266419, pgoff = 86016, inode = 18560 }
+vm_state.vm_map: 23329.132691015 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3073060864, end = 3074375680, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.132693137 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074375680, end = 3074383872, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.132695327 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074383872, end = 3074387968, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.132697350 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074387968, end = 3074400256, flags = 1048691, pgoff = 3074387968, inode = 0 }
+vm_state.vm_map: 23329.132699774 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074400256, end = 3074437120, flags = 134217845, pgoff = 0, inode = 20852 }
+vm_state.vm_map: 23329.132702075 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074437120, end = 3074441216, flags = 135266417, pgoff = 36864, inode = 20852 }
+vm_state.vm_map: 23329.132704073 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074441216, end = 3074445312, flags = 135266419, pgoff = 40960, inode = 20852 }
+vm_state.vm_map: 23329.132706170 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074445312, end = 3074449408, flags = 1048691, pgoff = 3074445312, inode = 0 }
+vm_state.vm_map: 23329.132708434 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074449408, end = 3074482176, flags = 134217845, pgoff = 0, inode = 20850 }
+vm_state.vm_map: 23329.132710414 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074482176, end = 3074486272, flags = 135266419, pgoff = 28672, inode = 20850 }
+vm_state.vm_map: 23329.132712474 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074486272, end = 3074523136, flags = 134217845, pgoff = 0, inode = 499726 }
+vm_state.vm_map: 23329.132714411 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074523136, end = 3074527232, flags = 135266419, pgoff = 32768, inode = 499726 }
+vm_state.vm_map: 23329.132716471 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074527232, end = 3074531328, flags = 1048691, pgoff = 3074527232, inode = 0 }
+vm_state.vm_map: 23329.132718538 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074531328, end = 3074539520, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.132720585 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074539520, end = 3074543616, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.132722627 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074543616, end = 3074547712, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.132724693 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074547712, end = 3074625536, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.132726630 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074625536, end = 3074629632, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.132728678 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074629632, end = 3074633728, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.132730621 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074633728, end = 3074641920, flags = 1048691, pgoff = 3074633728, inode = 0 }
+vm_state.vm_map: 23329.132732687 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074641920, end = 3074711552, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 23329.132734976 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074711552, end = 3074715648, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 23329.132736906 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074715648, end = 3074719744, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 23329.132738849 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074719744, end = 3074727936, flags = 1048691, pgoff = 3074719744, inode = 0 }
+vm_state.vm_map: 23329.132740953 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074727936, end = 3074740224, flags = 134217845, pgoff = 0, inode = 499779 }
+vm_state.vm_map: 23329.132743013 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074740224, end = 3074744320, flags = 135266419, pgoff = 8192, inode = 499779 }
+vm_state.vm_map: 23329.132744261 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074744320, end = 3074760704, flags = 134217845, pgoff = 0, inode = 499714 }
+kernel.irq_entry: 23329.132769273 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { ip = 3242331332, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.sched_try_wakeup: 23329.132782811 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { pid = 2269, cpu_id = 0, state = 1 }
+kernel.irq_exit: 23329.132794882 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.sched_schedule: 23329.132804665 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { prev_pid = 16927, next_pid = 2269, prev_state = 0 }
+fs.pollfd: 23329.132878565 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { fd = 4 }
+fs.pollfd: 23329.132881291 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { fd = 3 }
+fs.pollfd: 23329.132883271 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { fd = 11 }
+kernel.syscall_exit: 23329.132886892 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.132899074 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 23329.132901948 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.132909164 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 13 [syscall 13] }
+kernel.syscall_exit: 23329.132910990 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { ret = 1264196274 }
+kernel.syscall_entry: 23329.132921426 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.132983145 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { count = 1024, fd = 12 }
+kernel.syscall_exit: 23329.132984470 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { ret = 861 }
+kernel.syscall_entry: 23329.133002722 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.133004461 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { count = 1024, fd = 12 }
+kernel.syscall_exit: 23329.133005682 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.133010697 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 140 [syscall 140] }
+fs.llseek: 23329.133013275 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 12, offset = 0, origin = 0 }
+kernel.syscall_exit: 23329.133015015 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.133062781 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 5 [syscall 5] }
+fs.open: 23329.133089976 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 14, filename = "/proc/loadavg" }
+kernel.syscall_exit: 23329.133092653 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { ret = 14 }
+kernel.syscall_entry: 23329.133097951 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 197 [syscall 197] }
+kernel.syscall_exit: 23329.133100215 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.133103441 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 192 [syscall 192] }
+kernel.syscall_exit: 23329.133110948 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { ret = -1234268160 }
+kernel.syscall_entry: 23329.133114055 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 3 [syscall 3] }
+kernel.page_fault_entry: 23329.133125430 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, TRAP { ip = 0xc142bf44, address = 0xb66e9000, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.133192231 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { res = 0 }
+fs.read: 23329.133199595 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { count = 1024, fd = 14 }
+kernel.syscall_exit: 23329.133201039 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { ret = 27 }
+kernel.syscall_entry: 23329.133283037 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 6 [syscall 6] }
+fs.close: 23329.133285177 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 14 }
+kernel.syscall_exit: 23329.133364968 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.133370155 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 91 [syscall 91] }
+mm.page_free: 23329.133394248 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { pfn = 273165, order = 0 }
+kernel.syscall_exit: 23329.133435303 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.133457717 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.133517313 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { count = 1024, fd = 6 }
+kernel.syscall_exit: 23329.133518726 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { ret = 1024 }
+kernel.syscall_entry: 23329.133573148 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.133592101 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { count = 1024, fd = 6 }
+kernel.syscall_exit: 23329.133593853 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { ret = 305 }
+kernel.syscall_entry: 23329.133614085 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.133617342 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { count = 1024, fd = 6 }
+kernel.syscall_exit: 23329.133618618 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.133622326 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 140 [syscall 140] }
+fs.llseek: 23329.133624497 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 6, offset = 0, origin = 0 }
+kernel.syscall_exit: 23329.133626360 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.133644912 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.133666254 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { count = 1024, fd = 8 }
+kernel.syscall_exit: 23329.133667648 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { ret = 449 }
+kernel.syscall_entry: 23329.133678955 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.133680675 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { count = 1024, fd = 8 }
+kernel.syscall_exit: 23329.133681872 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.133685425 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 140 [syscall 140] }
+fs.llseek: 23329.133687757 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 8, offset = 0, origin = 0 }
+kernel.syscall_exit: 23329.133689428 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.133695781 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.133719831 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { count = 1024, fd = 9 }
+kernel.syscall_exit: 23329.133721014 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { ret = 1024 }
+kernel.syscall_entry: 23329.133734455 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.133742819 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { count = 1024, fd = 9 }
+kernel.syscall_exit: 23329.133744120 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { ret = 383 }
+kernel.syscall_entry: 23329.133749962 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.133751325 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { count = 1024, fd = 9 }
+kernel.syscall_exit: 23329.133752497 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.133755840 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 140 [syscall 140] }
+fs.llseek: 23329.133757616 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 9, offset = 0, origin = 0 }
+kernel.syscall_exit: 23329.133759276 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.133895418 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.133898391 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 3 }
+kernel.syscall_exit: 23329.133901401 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.133904997 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 146 [syscall 146] }
+fs.writev: 23329.133933611 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 3, vlen = 3 }
+kernel.syscall_exit: 23329.133935312 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { ret = 944 }
+kernel.syscall_entry: 23329.133940753 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.133943178 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { count = 4096, fd = 3 }
+kernel.syscall_exit: 23329.133944355 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.133949067 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 23329.133951548 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.133955692 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.133960189 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 4 }
+fs.pollfd: 23329.133962021 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 23329.133963501 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 11 }
+kernel.sched_schedule: 23329.133974616 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { prev_pid = 2269, next_pid = 1989, prev_state = 1 }
+fs.select: 23329.134138391 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 1, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134141512 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 3, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134143400 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 5, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134148279 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 7, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134150413 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 13, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134152745 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 19, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134154971 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 20, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134157044 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 21, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134159350 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 22, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134161238 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 23, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134163390 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 24, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134165493 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 25, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134167647 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 26, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134169688 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 27, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134171564 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 28, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134173691 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 29, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134176349 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 30, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134178571 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 31, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134180593 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 32, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134182727 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 33, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134184886 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 34, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134186792 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 35, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134188815 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 37, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134190844 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 38, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134192936 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 39, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134194854 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 40, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134196828 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 41, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134198993 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 42, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134200800 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 43, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134202583 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 44, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134204526 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 45, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134206561 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 46, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134209435 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 48, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134211570 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 49, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134213562 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 50, end_time_sec = 23660, end_time_nsec = 559560532 }
+fs.select: 23329.134215591 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 52, end_time_sec = 23660, end_time_nsec = 559560532 }
+mm.page_free: 23329.134223807 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pfn = 198013, order = 0 }
+kernel.syscall_exit: 23329.134228187 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 2 }
+kernel.syscall_entry: 23329.134239394 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 23329.134241775 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 23329.134250138 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.134254284 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7657e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.134257047 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.134263751 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+kernel.sched_try_wakeup: 23329.134274237 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pid = 2269, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 23329.134282792 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { prev_pid = 1989, next_pid = 2269, prev_state = 0 }
+fs.pollfd: 23329.134466823 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 4 }
+fs.pollfd: 23329.134468556 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 23329.134470069 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 11 }
+kernel.sched_schedule: 23329.134478413 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { prev_pid = 2269, next_pid = 1989, prev_state = 1 }
+fs.read: 23329.134623518 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 4096, fd = 45 }
+kernel.syscall_exit: 23329.134625275 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 944 }
+kernel.irq_entry: 23329.134921515 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, IRQ { ip = 3242336307, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_update_time: 23329.134934160 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, IRQ { jiffies = 4297269584, xtime_sec = 1264196274, xtime_nsec = 637522003, walltomonotonic_sec = -1264172952, walltomonotonic_nsec = 189579727 }
+kernel.softirq_raise: 23329.134945448 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, IRQ { softirq_id = 1 [softirq 1] }
+kernel.softirq_raise: 23329.134951727 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, IRQ { softirq_id = 9 [softirq 9] }
+kernel.irq_exit: 23329.134971391 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.softirq_entry: 23329.134974685 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SOFTIRQ { softirq_id = 1 [softirq 1] }
+kernel.timer_set: 23329.134983326 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SOFTIRQ { expires = 2302289, function = 0xc141d458, data = 0 }
+kernel.timer_set: 23329.134987323 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SOFTIRQ { expires = 2302289, function = 0xc14b0234, data = 0 }
+kernel.softirq_exit: 23329.134990715 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { softirq_id = 1 [softirq 1] }
+kernel.softirq_entry: 23329.134992085 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SOFTIRQ { softirq_id = 9 [softirq 9] }
+rcu.tree_callback: 23329.135034738 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 1989, 1989, Xorg, , 1987, 0x0, SOFTIRQ { func = 0xc10acb19 }
+kernel.softirq_exit: 23329.135037902 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { softirq_id = 9 [softirq 9] }
+kernel.syscall_entry: 23329.135041486 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.135049756 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 4096, fd = 45 }
+kernel.syscall_exit: 23329.135051188 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.135056857 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7657e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.135059780 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.135063204 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 23329.135065318 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 23329.135069408 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.135076094 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 142 [syscall 142] }
+fs.select: 23329.135080924 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 1, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135084063 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 3, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135086043 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 5, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135089849 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 7, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135091872 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 13, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135093883 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 19, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135095962 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 20, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135098078 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 21, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135100051 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 22, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135101988 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 23, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135104005 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 24, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135105973 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 25, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135107891 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 26, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135110124 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 27, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135112079 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 28, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135114127 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 29, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135116206 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 30, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135118839 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 31, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135126617 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 32, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135128627 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 33, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135130583 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 34, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135132550 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 35, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135134543 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 37, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135136536 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 38, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135138564 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 39, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135140668 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 40, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135142666 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 41, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135144622 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 42, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135146620 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 43, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135148594 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 44, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135150716 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 45, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135152677 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 46, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135155083 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 48, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135157094 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 49, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135158864 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 50, end_time_sec = 23660, end_time_nsec = 559656272 }
+fs.select: 23329.135160634 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 52, end_time_sec = 23660, end_time_nsec = 559656272 }
+mm.page_free: 23329.135167623 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pfn = 197993, order = 0 }
+kernel.syscall_exit: 23329.135170892 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.135175777 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 23329.135177640 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 23329.135183555 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.135186991 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7657e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.135189383 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.135193793 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.135200813 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 12168, fd = 48 }
+kernel.syscall_exit: 23329.135202454 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 12168 }
+kernel.syscall_entry: 23329.135274170 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.135277642 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 152, fd = 48 }
+kernel.syscall_exit: 23329.135278956 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 152 }
+kernel.syscall_entry: 23329.135294691 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+kernel.sched_try_wakeup: 23329.135303746 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pid = 2336, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 23329.135312190 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { prev_pid = 1989, next_pid = 2336, prev_state = 0 }
+fs.pollfd: 23329.135475627 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 23329.135477878 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 9 }
+fs.pollfd: 23329.135479710 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+fs.pollfd: 23329.135481092 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 5 }
+fs.pollfd: 23329.135482614 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 12 }
+fs.pollfd: 23329.135486475 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 19 }
+fs.pollfd: 23329.135488031 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 16 }
+fs.pollfd: 23329.135490010 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 26 }
+fs.pollfd: 23329.135491935 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 10 }
+fs.pollfd: 23329.135494142 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 17 }
+kernel.sched_schedule: 23329.135503049 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { prev_pid = 2336, next_pid = 1989, prev_state = 1 }
+fs.read: 23329.135650924 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 12168, fd = 48 }
+kernel.syscall_exit: 23329.135652675 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 2816 }
+kernel.irq_entry: 23329.137136513 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, IRQ { ip = 3078487783, handler = 0x0, irq_id = 239, kernel_mode = 0 }
+kernel.sched_try_wakeup: 23329.137159983 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, IRQ { pid = 8996, cpu_id = 0, state = 1 }
+kernel.irq_exit: 23329.137173843 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.sched_schedule: 23329.137186333 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { prev_pid = 1989, next_pid = 8996, prev_state = 0 }
+kernel.syscall_exit: 23329.137448927 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = -110 }
+kernel.syscall_entry: 23329.137466056 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 240 [syscall 240] }
+kernel.syscall_exit: 23329.137469091 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.137473674 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb6a53e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.137477196 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.137487003 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 23329.137489685 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.137493368 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb6a53e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.137495607 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.137498624 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb6a53e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.137500837 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.137504230 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 23329.137506925 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.137512804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.137515061 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.137518127 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 240 [syscall 240] }
+kernel.sched_schedule: 23329.137533979 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { prev_pid = 8996, next_pid = 1989, prev_state = 1 }
+kernel.irq_entry: 23329.138566727 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, IRQ { ip = 3078487783, handler = 0xf8a23c7f, irq_id = 14, kernel_mode = 0 }
+block.rq_complete_fs: 23329.138601257 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1989, 1989, Xorg, , 1987, 0x0, IRQ { hard_sector = 39345670, rw = 0, errors = 0 }
+kernel.sched_try_wakeup: 23329.138624553 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, IRQ { pid = 16834, cpu_id = 0, state = 2 }
+kernel.timer_set: 23329.138646950 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, IRQ { expires = 2302289, function = 0xc141b0a5, data = 4136835584 }
+kernel.irq_exit: 23329.138660495 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.sched_schedule: 23329.138672269 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { prev_pid = 1989, next_pid = 16834, prev_state = 0 }
+fs.buffer_wait_end: 23329.138882016 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { bh = 0xe9709160 }
+block.remap: 23329.138894407 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { device_from = 3145728, sector_from = 44606600, device_to = 3145730, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_queue: 23329.138898022 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { sector = 47530430, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.getrq_bio: 23329.138910240 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { sector = 47530430, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+kernel.timer_set: 23329.138917716 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { expires = 2302289, function = 0xc1410312, data = 4147888232 }
+block.plug: 23329.138921479 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL
+block.rq_insert_fs: 23329.138926703 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { hard_sector = 47530430, rw = 0, errors = 0 }
+fs.buffer_wait_start: 23329.138936967 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { bh = 0xe9709128 }
+block.unplug_io: 23329.138940033 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { pdu = 1 }
+block.rq_issue_fs: 23329.138952369 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { hard_sector = 47530430, rw = 0, errors = 0 }
+kernel.timer_set: 23329.138991653 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { expires = 2304288, function = 0xf8a23e85, data = 4136733696 }
+kernel.sched_schedule: 23329.139062340 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { prev_pid = 16834, next_pid = 16927, prev_state = 2 }
+kernel.irq_entry: 23329.139334629 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { ip = 3238156110, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.sched_try_wakeup: 23329.139348181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { pid = 2336, cpu_id = 0, state = 1 }
+kernel.irq_exit: 23329.139360140 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.sched_schedule: 23329.139368560 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { prev_pid = 16927, next_pid = 2336, prev_state = 0 }
+fs.pollfd: 23329.139435385 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 23329.139438574 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 9 }
+fs.pollfd: 23329.139441867 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+fs.pollfd: 23329.139443736 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 5 }
+fs.pollfd: 23329.139445722 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 12 }
+fs.pollfd: 23329.139453624 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 19 }
+fs.pollfd: 23329.139455573 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 16 }
+fs.pollfd: 23329.139458386 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 26 }
+fs.pollfd: 23329.139460501 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 10 }
+fs.pollfd: 23329.139463431 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 17 }
+kernel.syscall_exit: 23329.139469815 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.139495518 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.139502377 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 23329.139503628 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.139511110 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb6094e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.139514410 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.139521608 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb6094e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.139524273 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.140219300 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb6094e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.140255500 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.140268984 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.140271951 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 23329.140275078 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.140278656 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 146 [syscall 146] }
+fs.writev: 23329.140290517 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8, vlen = 3 }
+kernel.syscall_exit: 23329.140292016 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 52 }
+kernel.syscall_entry: 23329.140296974 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.140299367 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 23329.140300547 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.140305814 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.140307646 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 23329.140309669 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 9 }
+fs.pollfd: 23329.140311198 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+fs.pollfd: 23329.140312506 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 5 }
+fs.pollfd: 23329.140313845 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 12 }
+fs.pollfd: 23329.140316472 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 19 }
+fs.pollfd: 23329.140317798 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 16 }
+fs.pollfd: 23329.140319655 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 26 }
+fs.pollfd: 23329.140320987 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 10 }
+fs.pollfd: 23329.140322868 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 17 }
+kernel.syscall_exit: 23329.140324299 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.140329178 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.140331115 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 23329.140332318 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.140842320 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.140845145 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 23329.140848001 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.140851758 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 146 [syscall 146] }
+fs.writev: 23329.140863724 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8, vlen = 3 }
+kernel.syscall_exit: 23329.140865352 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 2856 }
+kernel.syscall_entry: 23329.140870558 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.140872063 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 23329.140882925 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { prev_pid = 2336, next_pid = 16927, prev_state = 1 }
+vm_state.vm_map: 23329.141025501 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074760704, end = 3074764800, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 23329.141028634 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074764800, end = 3074768896, flags = 1048691, pgoff = 3074764800, inode = 0 }
+vm_state.vm_map: 23329.141031287 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074768896, end = 3074793472, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 23329.141033519 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074793472, end = 3074797568, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 23329.141036042 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074797568, end = 3074838528, flags = 134217845, pgoff = 0, inode = 499738 }
+vm_state.vm_map: 23329.141038195 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074838528, end = 3074842624, flags = 135266419, pgoff = 40960, inode = 499738 }
+vm_state.vm_map: 23329.141040804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074842624, end = 3074879488, flags = 134217845, pgoff = 0, inode = 508391 }
+vm_state.vm_map: 23329.141043122 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074879488, end = 3074883584, flags = 135266417, pgoff = 32768, inode = 508391 }
+vm_state.vm_map: 23329.141045159 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074883584, end = 3074887680, flags = 135266419, pgoff = 36864, inode = 508391 }
+vm_state.vm_map: 23329.141047311 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3074887680, end = 3075047424, flags = 1048691, pgoff = 3074887680, inode = 0 }
+vm_state.vm_map: 23329.141050018 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3075047424, end = 3075194880, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.141052301 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3075194880, end = 3075198976, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.141054448 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3075198976, end = 3075203072, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.141057063 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3075203072, end = 3075289088, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.141059246 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3075289088, end = 3075293184, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.141061343 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3075293184, end = 3075297280, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.141064088 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3075297280, end = 3075305472, flags = 1048691, pgoff = 3075297280, inode = 0 }
+vm_state.vm_map: 23329.141066839 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3075305472, end = 3075383296, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.141068955 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3075383296, end = 3075387392, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.141071033 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3075387392, end = 3075391488, flags = 1048691, pgoff = 3075387392, inode = 0 }
+vm_state.vm_map: 23329.141073673 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3075391488, end = 3075997696, flags = 134217845, pgoff = 0, inode = 22471 }
+vm_state.vm_map: 23329.141075814 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3075997696, end = 3076014080, flags = 135266419, pgoff = 602112, inode = 22471 }
+vm_state.vm_map: 23329.141078195 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3076014080, end = 3076280320, flags = 134217845, pgoff = 0, inode = 19427 }
+vm_state.vm_map: 23329.141080360 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3076280320, end = 3076292608, flags = 135266417, pgoff = 266240, inode = 19427 }
+vm_state.vm_map: 23329.141082370 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3076292608, end = 3076296704, flags = 135266419, pgoff = 278528, inode = 19427 }
+vm_state.vm_map: 23329.141084918 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3076296704, end = 3076304896, flags = 134217845, pgoff = 0, inode = 499720 }
+vm_state.vm_map: 23329.141087595 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3076304896, end = 3076308992, flags = 135266419, pgoff = 4096, inode = 499720 }
+vm_state.vm_map: 23329.141089945 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3076308992, end = 3076468736, flags = 134217845, pgoff = 0, inode = 18680 }
+vm_state.vm_map: 23329.141091906 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3076468736, end = 3076472832, flags = 135266419, pgoff = 159744, inode = 18680 }
+vm_state.vm_map: 23329.141094694 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3076472832, end = 3077132288, flags = 134217845, pgoff = 0, inode = 19419 }
+vm_state.vm_map: 23329.141096792 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3077132288, end = 3077156864, flags = 135266419, pgoff = 659456, inode = 19419 }
+vm_state.vm_map: 23329.141099401 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3077156864, end = 3077320704, flags = 134217845, pgoff = 0, inode = 17950 }
+vm_state.vm_map: 23329.141101998 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3077320704, end = 3077324800, flags = 135266419, pgoff = 163840, inode = 17950 }
+vm_state.vm_map: 23329.141104113 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3077324800, end = 3077328896, flags = 1048691, pgoff = 3077324800, inode = 0 }
+vm_state.vm_map: 23329.141106506 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3077328896, end = 3077378048, flags = 134217845, pgoff = 0, inode = 19447 }
+vm_state.vm_map: 23329.141108813 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3077378048, end = 3077382144, flags = 135266419, pgoff = 49152, inode = 19447 }
+vm_state.vm_map: 23329.141111213 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3077382144, end = 3077648384, flags = 134217845, pgoff = 0, inode = 19433 }
+vm_state.vm_map: 23329.141113224 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3077648384, end = 3077656576, flags = 135266419, pgoff = 262144, inode = 19433 }
+vm_state.vm_map: 23329.141115450 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3077656576, end = 3077660672, flags = 1048691, pgoff = 3077656576, inode = 0 }
+vm_state.vm_map: 23329.141118146 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3077681152, end = 3077685248, flags = 134217979, pgoff = 0, inode = 1237135 }
+vm_state.vm_map: 23329.141120631 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3077685248, end = 3077689344, flags = 134217979, pgoff = 0, inode = 1237061 }
+vm_state.vm_map: 23329.141123412 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3077689344, end = 3077693440, flags = 134217979, pgoff = 0, inode = 1236999 }
+vm_state.vm_map: 23329.141126152 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3077693440, end = 3077701632, flags = 134217845, pgoff = 0, inode = 1450400 }
+vm_state.vm_map: 23329.141128273 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3077701632, end = 3077705728, flags = 135266417, pgoff = 4096, inode = 1450400 }
+vm_state.vm_map: 23329.141130506 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3077705728, end = 3077709824, flags = 135266419, pgoff = 8192, inode = 1450400 }
+vm_state.vm_map: 23329.141132948 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3077709824, end = 3077718016, flags = 134217845, pgoff = 0, inode = 1450327 }
+vm_state.vm_map: 23329.141135033 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3077718016, end = 3077722112, flags = 135266417, pgoff = 4096, inode = 1450327 }
+vm_state.vm_map: 23329.141137316 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3077722112, end = 3077726208, flags = 135266419, pgoff = 8192, inode = 1450327 }
+vm_state.vm_map: 23329.141139937 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3077726208, end = 3077754880, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.141141960 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3077754880, end = 3077763072, flags = 1048691, pgoff = 3077754880, inode = 0 }
+vm_state.vm_map: 23329.141144384 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3077763072, end = 3077767168, flags = 67371125, pgoff = 3077763072, inode = 0 }
+vm_state.vm_map: 23329.141146993 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3077767168, end = 3077881856, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.141149091 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3077881856, end = 3077885952, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.141151138 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3077885952, end = 3077890048, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.141153451 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1767, start = 3214790656, end = 3214876672, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.141157368 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 134512640, end = 142159872, flags = 134223989, pgoff = 0, inode = 20798 }
+vm_state.vm_map: 23329.141159583 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 142159872, end = 142204928, flags = 135272561, pgoff = 7643136, inode = 20798 }
+vm_state.vm_map: 23329.141161544 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 142204928, end = 142237696, flags = 135272563, pgoff = 7688192, inode = 20798 }
+vm_state.vm_map: 23329.141163833 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 142237696, end = 142241792, flags = 1048691, pgoff = 142237696, inode = 0 }
+vm_state.vm_map: 23329.141165782 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 142274560, end = 143097856, flags = 1048691, pgoff = 142274560, inode = 0 }
+vm_state.vm_map: 23329.141168175 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3071086592, end = 3071164416, flags = 134217979, pgoff = 0, inode = 1206047 }
+vm_state.vm_map: 23329.141170469 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3071164416, end = 3071205376, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.141172653 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3071205376, end = 3071209472, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.141174577 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3071209472, end = 3071213568, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.141177298 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3071213568, end = 3071250432, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.141179352 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3071250432, end = 3071254528, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.141181523 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3071254528, end = 3071258624, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.141184162 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3071258624, end = 3071283200, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.141186316 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3071283200, end = 3071287296, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.141188548 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3071287296, end = 3071291392, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.141191108 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3071332352, end = 3071348736, flags = 134217979, pgoff = 0, inode = 1206050 }
+vm_state.vm_map: 23329.141193656 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3071348736, end = 3071385600, flags = 134217979, pgoff = 0, inode = 1206049 }
+vm_state.vm_map: 23329.141195993 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3071418368, end = 3071422464, flags = 134217979, pgoff = 0, inode = 1206071 }
+vm_state.vm_map: 23329.141198528 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3071422464, end = 3071430656, flags = 134217979, pgoff = 0, inode = 1206070 }
+vm_state.vm_map: 23329.141201075 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3071430656, end = 3071438848, flags = 134217979, pgoff = 0, inode = 1206069 }
+vm_state.vm_map: 23329.141203622 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3071438848, end = 3071479808, flags = 134217979, pgoff = 0, inode = 1237134 }
+vm_state.vm_map: 23329.141206164 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3071479808, end = 3071520768, flags = 134217979, pgoff = 0, inode = 1237063 }
+vm_state.vm_map: 23329.141208612 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3071520768, end = 3071610880, flags = 134217979, pgoff = 0, inode = 1237059 }
+vm_state.vm_map: 23329.141211148 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3071610880, end = 3071635456, flags = 134217979, pgoff = 0, inode = 1206046 }
+vm_state.vm_map: 23329.141213855 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3071639552, end = 3071705088, flags = 134217937, pgoff = 0, inode = 156491 }
+vm_state.vm_map: 23329.141216588 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3071705088, end = 3071836160, flags = 134217937, pgoff = 0, inode = 156496 }
+vm_state.vm_map: 23329.141219031 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3071836160, end = 3071967232, flags = 134217937, pgoff = 0, inode = 156489 }
+vm_state.vm_map: 23329.141221226 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3071967232, end = 3071979520, flags = 1048691, pgoff = 3071967232, inode = 0 }
+vm_state.vm_map: 23329.141223688 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3071979520, end = 3071991808, flags = 134217845, pgoff = 0, inode = 20765 }
+vm_state.vm_map: 23329.141225785 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3071991808, end = 3071995904, flags = 135266419, pgoff = 8192, inode = 20765 }
+vm_state.vm_map: 23329.141228190 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3071995904, end = 3072024576, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.141230269 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3072024576, end = 3072028672, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.141232409 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3072028672, end = 3072032768, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.141234883 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3072032768, end = 3072258048, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.141236894 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3072258048, end = 3072262144, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.141238985 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3072262144, end = 3072266240, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.141241026 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3072266240, end = 3072270336, flags = 1048691, pgoff = 3072266240, inode = 0 }
+vm_state.vm_map: 23329.141243475 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3072270336, end = 3072733184, flags = 134217845, pgoff = 0, inode = 20061 }
+vm_state.vm_map: 23329.141245671 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3072733184, end = 3072745472, flags = 135266419, pgoff = 458752, inode = 20061 }
+vm_state.vm_map: 23329.141248150 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3072745472, end = 3072806912, flags = 134217845, pgoff = 0, inode = 19423 }
+vm_state.vm_map: 23329.141250309 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3072806912, end = 3072811008, flags = 135266419, pgoff = 57344, inode = 19423 }
+vm_state.vm_map: 23329.141275055 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3072811008, end = 3072872448, flags = 134217845, pgoff = 0, inode = 21268 }
+vm_state.vm_map: 23329.141277368 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3072872448, end = 3072876544, flags = 135266419, pgoff = 57344, inode = 21268 }
+vm_state.vm_map: 23329.141279934 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3072876544, end = 3072917504, flags = 134217845, pgoff = 0, inode = 22434 }
+vm_state.vm_map: 23329.141282099 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3072917504, end = 3072921600, flags = 135266419, pgoff = 40960, inode = 22434 }
+vm_state.vm_map: 23329.141284733 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3072921600, end = 3072929792, flags = 134217845, pgoff = 0, inode = 500018 }
+vm_state.vm_map: 23329.141286929 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3072929792, end = 3072933888, flags = 135266419, pgoff = 4096, inode = 500018 }
+vm_state.vm_map: 23329.141289137 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3072933888, end = 3072937984, flags = 1048691, pgoff = 3072933888, inode = 0 }
+vm_state.vm_map: 23329.141291518 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3072937984, end = 3072962560, flags = 134217845, pgoff = 0, inode = 19420 }
+vm_state.vm_map: 23329.141293738 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3072962560, end = 3072966656, flags = 135266419, pgoff = 20480, inode = 19420 }
+vm_state.vm_map: 23329.141296156 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3072966656, end = 3073056768, flags = 134217845, pgoff = 0, inode = 18560 }
+vm_state.vm_map: 23329.141298352 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3073056768, end = 3073060864, flags = 135266419, pgoff = 86016, inode = 18560 }
+vm_state.vm_map: 23329.141300955 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3073060864, end = 3074375680, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.141303188 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074375680, end = 3074383872, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.141305359 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074383872, end = 3074387968, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.141307580 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074387968, end = 3074400256, flags = 1048691, pgoff = 3074387968, inode = 0 }
+vm_state.vm_map: 23329.141310306 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074400256, end = 3074437120, flags = 134217845, pgoff = 0, inode = 20852 }
+vm_state.vm_map: 23329.141312922 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074437120, end = 3074441216, flags = 135266417, pgoff = 36864, inode = 20852 }
+vm_state.vm_map: 23329.141314976 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074441216, end = 3074445312, flags = 135266419, pgoff = 40960, inode = 20852 }
+vm_state.vm_map: 23329.141317184 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074445312, end = 3074449408, flags = 1048691, pgoff = 3074445312, inode = 0 }
+vm_state.vm_map: 23329.141319466 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074449408, end = 3074482176, flags = 134217845, pgoff = 0, inode = 20850 }
+vm_state.vm_map: 23329.141321575 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074482176, end = 3074486272, flags = 135266419, pgoff = 28672, inode = 20850 }
+vm_state.vm_map: 23329.141323913 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074486272, end = 3074523136, flags = 134217845, pgoff = 0, inode = 499726 }
+vm_state.vm_map: 23329.141326010 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074523136, end = 3074527232, flags = 135266419, pgoff = 32768, inode = 499726 }
+vm_state.vm_map: 23329.141328163 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074527232, end = 3074531328, flags = 1048691, pgoff = 3074527232, inode = 0 }
+vm_state.vm_map: 23329.141330562 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074531328, end = 3074539520, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.141332678 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074539520, end = 3074543616, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.141334899 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074543616, end = 3074547712, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.141337229 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074547712, end = 3074625536, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.141339327 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074625536, end = 3074629632, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.141341516 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074629632, end = 3074633728, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.141343559 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074633728, end = 3074641920, flags = 1048691, pgoff = 3074633728, inode = 0 }
+vm_state.vm_map: 23329.141346074 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074641920, end = 3074711552, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 23329.141348647 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074711552, end = 3074715648, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 23329.141350701 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074715648, end = 3074719744, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 23329.141352668 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074719744, end = 3074727936, flags = 1048691, pgoff = 3074719744, inode = 0 }
+vm_state.vm_map: 23329.141355043 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074727936, end = 3074740224, flags = 134217845, pgoff = 0, inode = 499779 }
+vm_state.vm_map: 23329.141357141 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074740224, end = 3074744320, flags = 135266419, pgoff = 8192, inode = 499779 }
+vm_state.vm_map: 23329.141359274 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074744320, end = 3074760704, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 23329.141361335 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074760704, end = 3074764800, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 23329.141363604 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074764800, end = 3074768896, flags = 1048691, pgoff = 3074764800, inode = 0 }
+vm_state.vm_map: 23329.141365702 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074768896, end = 3074793472, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 23329.141367823 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074793472, end = 3074797568, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 23329.141369951 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074797568, end = 3074838528, flags = 134217845, pgoff = 0, inode = 499738 }
+vm_state.vm_map: 23329.141372104 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074838528, end = 3074842624, flags = 135266419, pgoff = 40960, inode = 499738 }
+vm_state.vm_map: 23329.141374238 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074842624, end = 3074879488, flags = 134217845, pgoff = 0, inode = 508391 }
+vm_state.vm_map: 23329.141376329 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074879488, end = 3074883584, flags = 135266417, pgoff = 32768, inode = 508391 }
+vm_state.vm_map: 23329.141378544 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074883584, end = 3074887680, flags = 135266419, pgoff = 36864, inode = 508391 }
+vm_state.vm_map: 23329.141380518 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3074887680, end = 3075047424, flags = 1048691, pgoff = 3074887680, inode = 0 }
+vm_state.vm_map: 23329.141382923 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3075047424, end = 3075194880, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.141384977 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3075194880, end = 3075198976, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.141387099 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3075198976, end = 3075203072, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.141389202 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3075203072, end = 3075289088, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.141391158 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3075289088, end = 3075293184, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.141393230 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3075293184, end = 3075297280, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.141395395 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3075297280, end = 3075305472, flags = 1048691, pgoff = 3075297280, inode = 0 }
+vm_state.vm_map: 23329.141397566 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3075305472, end = 3075383296, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.141399559 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3075383296, end = 3075387392, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.141401637 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3075387392, end = 3075391488, flags = 1048691, pgoff = 3075387392, inode = 0 }
+vm_state.vm_map: 23329.141403704 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3075391488, end = 3075997696, flags = 134217845, pgoff = 0, inode = 22471 }
+vm_state.vm_map: 23329.141405826 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3075997696, end = 3076014080, flags = 135266419, pgoff = 602112, inode = 22471 }
+vm_state.vm_map: 23329.141407879 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3076014080, end = 3076280320, flags = 134217845, pgoff = 0, inode = 19427 }
+vm_state.vm_map: 23329.141410007 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3076280320, end = 3076292608, flags = 135266417, pgoff = 266240, inode = 19427 }
+vm_state.vm_map: 23329.141412025 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3076292608, end = 3076296704, flags = 135266419, pgoff = 278528, inode = 19427 }
+vm_state.vm_map: 23329.141414325 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3076296704, end = 3076304896, flags = 134217845, pgoff = 0, inode = 499720 }
+vm_state.vm_map: 23329.141416719 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3076304896, end = 3076308992, flags = 135266419, pgoff = 4096, inode = 499720 }
+vm_state.vm_map: 23329.141418846 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3076308992, end = 3076468736, flags = 134217845, pgoff = 0, inode = 18680 }
+vm_state.vm_map: 23329.141420956 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3076468736, end = 3076472832, flags = 135266419, pgoff = 159744, inode = 18680 }
+vm_state.vm_map: 23329.141423083 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3076472832, end = 3077132288, flags = 134217845, pgoff = 0, inode = 19419 }
+vm_state.vm_map: 23329.141425045 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3077132288, end = 3077156864, flags = 135266419, pgoff = 659456, inode = 19419 }
+vm_state.vm_map: 23329.141426982 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3077156864, end = 3077320704, flags = 134217845, pgoff = 0, inode = 17950 }
+vm_state.vm_map: 23329.141429072 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3077320704, end = 3077324800, flags = 135266419, pgoff = 163840, inode = 17950 }
+vm_state.vm_map: 23329.141431281 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3077324800, end = 3077328896, flags = 1048691, pgoff = 3077324800, inode = 0 }
+vm_state.vm_map: 23329.141433242 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3077328896, end = 3077378048, flags = 134217845, pgoff = 0, inode = 19447 }
+vm_state.vm_map: 23329.141435179 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3077378048, end = 3077382144, flags = 135266419, pgoff = 49152, inode = 19447 }
+vm_state.vm_map: 23329.141437239 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3077382144, end = 3077648384, flags = 134217845, pgoff = 0, inode = 19433 }
+vm_state.vm_map: 23329.141439293 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3077648384, end = 3077656576, flags = 135266419, pgoff = 262144, inode = 19433 }
+vm_state.vm_map: 23329.141441495 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3077656576, end = 3077660672, flags = 1048691, pgoff = 3077656576, inode = 0 }
+vm_state.vm_map: 23329.141443611 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3077681152, end = 3077685248, flags = 134217979, pgoff = 0, inode = 1237135 }
+vm_state.vm_map: 23329.141445572 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3077685248, end = 3077689344, flags = 134217979, pgoff = 0, inode = 1237061 }
+vm_state.vm_map: 23329.141447787 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3077689344, end = 3077693440, flags = 134217979, pgoff = 0, inode = 1236999 }
+vm_state.vm_map: 23329.141450186 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3077693440, end = 3077701632, flags = 134217845, pgoff = 0, inode = 1450400 }
+vm_state.vm_map: 23329.141452259 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3077701632, end = 3077705728, flags = 135266417, pgoff = 4096, inode = 1450400 }
+vm_state.vm_map: 23329.141454306 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3077705728, end = 3077709824, flags = 135266419, pgoff = 8192, inode = 1450400 }
+vm_state.vm_map: 23329.141456595 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3077709824, end = 3077718016, flags = 134217845, pgoff = 0, inode = 1450327 }
+vm_state.vm_map: 23329.141458636 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3077718016, end = 3077722112, flags = 135266417, pgoff = 4096, inode = 1450327 }
+vm_state.vm_map: 23329.141460678 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3077722112, end = 3077726208, flags = 135266419, pgoff = 8192, inode = 1450327 }
+vm_state.vm_map: 23329.141462874 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3077726208, end = 3077754880, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.141464922 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3077754880, end = 3077763072, flags = 1048691, pgoff = 3077754880, inode = 0 }
+vm_state.vm_map: 23329.141466853 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3077763072, end = 3077767168, flags = 67371125, pgoff = 3077763072, inode = 0 }
+vm_state.vm_map: 23329.141468944 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3077767168, end = 3077881856, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.141471244 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3077881856, end = 3077885952, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.141473341 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3077885952, end = 3077890048, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.141475426 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1777, start = 3214790656, end = 3214876672, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.141490631 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 134512640, end = 135766016, flags = 134223989, pgoff = 0, inode = 17162 }
+vm_state.vm_map: 23329.141492844 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 135766016, end = 135774208, flags = 135272563, pgoff = 1253376, inode = 17162 }
+vm_state.vm_map: 23329.141494886 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 148815872, end = 150708224, flags = 1048691, pgoff = 148815872, inode = 0 }
+vm_state.vm_map: 23329.141502405 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3075710976, end = 3075809280, flags = 134217845, pgoff = 0, inode = 42087 }
+vm_state.vm_map: 23329.141504595 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3075809280, end = 3075817472, flags = 135266419, pgoff = 94208, inode = 42087 }
+vm_state.vm_map: 23329.141506630 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3075817472, end = 3075821568, flags = 1048691, pgoff = 3075817472, inode = 0 }
+vm_state.vm_map: 23329.141508807 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3075821568, end = 3075858432, flags = 134217845, pgoff = 0, inode = 508391 }
+vm_state.vm_map: 23329.141510849 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3075858432, end = 3075862528, flags = 135266417, pgoff = 32768, inode = 508391 }
+vm_state.vm_map: 23329.141512885 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3075862528, end = 3075866624, flags = 135266419, pgoff = 36864, inode = 508391 }
+vm_state.vm_map: 23329.141514963 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3075866624, end = 3076026368, flags = 1048691, pgoff = 3075866624, inode = 0 }
+vm_state.vm_map: 23329.141517073 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3076026368, end = 3077341184, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.141519022 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3077341184, end = 3077349376, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.141521094 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3077349376, end = 3077353472, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.141523025 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3077353472, end = 3077365760, flags = 1048691, pgoff = 3077353472, inode = 0 }
+vm_state.vm_map: 23329.141525412 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3077365760, end = 3077451776, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.141527337 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3077451776, end = 3077455872, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.141529551 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3077455872, end = 3077459968, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.141531494 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3077459968, end = 3077472256, flags = 1048691, pgoff = 3077459968, inode = 0 }
+vm_state.vm_map: 23329.141533591 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3077472256, end = 3077619712, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.141535571 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3077619712, end = 3077623808, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.141537755 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3077623808, end = 3077627904, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.141539864 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3077627904, end = 3077636096, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.141541887 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3077636096, end = 3077640192, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.141543911 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3077640192, end = 3077644288, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.141552231 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3077660672, end = 3077677056, flags = 134217845, pgoff = 0, inode = 43237 }
+vm_state.vm_map: 23329.141554285 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3077677056, end = 3077681152, flags = 135266419, pgoff = 16384, inode = 43237 }
+vm_state.vm_map: 23329.141561724 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3077681152, end = 3077697536, flags = 134217845, pgoff = 0, inode = 42092 }
+vm_state.vm_map: 23329.141563876 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3077697536, end = 3077701632, flags = 135266419, pgoff = 16384, inode = 42092 }
+vm_state.vm_map: 23329.141568699 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3077701632, end = 3077718016, flags = 134217845, pgoff = 0, inode = 42078 }
+vm_state.vm_map: 23329.141570735 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3077718016, end = 3077722112, flags = 135266419, pgoff = 12288, inode = 42078 }
+vm_state.vm_map: 23329.141577804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3077722112, end = 3077734400, flags = 134217845, pgoff = 0, inode = 42090 }
+vm_state.vm_map: 23329.141579963 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3077734400, end = 3077738496, flags = 135266419, pgoff = 8192, inode = 42090 }
+vm_state.vm_map: 23329.141582245 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3077738496, end = 3077746688, flags = 1048691, pgoff = 3077738496, inode = 0 }
+vm_state.vm_map: 23329.141584385 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3077746688, end = 3077750784, flags = 67371125, pgoff = 3077746688, inode = 0 }
+vm_state.vm_map: 23329.141586729 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3077750784, end = 3077865472, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.141588888 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3077865472, end = 3077869568, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.141590997 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3077869568, end = 3077873664, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.141592928 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1815, start = 3212754944, end = 3212840960, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.141604783 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 134512640, end = 134549504, flags = 134223989, pgoff = 0, inode = 1048589 }
+vm_state.vm_map: 23329.141609835 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 134549504, end = 134553600, flags = 135272563, pgoff = 32768, inode = 1048589 }
+vm_state.vm_map: 23329.141611994 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 160948224, end = 161083392, flags = 1048691, pgoff = 160948224, inode = 0 }
+vm_state.vm_map: 23329.141614214 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3075907584, end = 3075948544, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.141616324 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3075948544, end = 3075952640, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.141618483 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3075952640, end = 3075956736, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.141620623 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3075956736, end = 3075993600, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.141622677 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3075993600, end = 3075997696, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.141624737 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3075997696, end = 3076001792, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.141626834 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076096000, end = 3076124672, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.141628901 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076124672, end = 3076128768, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.141631177 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076128768, end = 3076132864, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.141633390 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076132864, end = 3076218880, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.141635803 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076218880, end = 3076222976, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.141637980 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076222976, end = 3076227072, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.141640070 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076227072, end = 3076235264, flags = 1048691, pgoff = 3076227072, inode = 0 }
+vm_state.vm_map: 23329.141642242 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076235264, end = 3076460544, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.141644474 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076460544, end = 3076464640, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.141646573 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076464640, end = 3076468736, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.141651402 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076468736, end = 3076476928, flags = 134217845, pgoff = 0, inode = 17167 }
+vm_state.vm_map: 23329.141653566 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076476928, end = 3076481024, flags = 135266419, pgoff = 8192, inode = 17167 }
+vm_state.vm_map: 23329.141655670 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076501504, end = 3076526080, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.141657613 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076526080, end = 3076530176, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.141659759 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076530176, end = 3076534272, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.141664848 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076534272, end = 3076571136, flags = 134217845, pgoff = 0, inode = 499730 }
+vm_state.vm_map: 23329.141666896 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076571136, end = 3076575232, flags = 135266419, pgoff = 32768, inode = 499730 }
+vm_state.vm_map: 23329.141671978 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076575232, end = 3076612096, flags = 134217845, pgoff = 0, inode = 508391 }
+vm_state.vm_map: 23329.141674026 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076612096, end = 3076616192, flags = 135266417, pgoff = 32768, inode = 508391 }
+vm_state.vm_map: 23329.141676000 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076616192, end = 3076620288, flags = 135266419, pgoff = 36864, inode = 508391 }
+vm_state.vm_map: 23329.141677918 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076620288, end = 3076780032, flags = 1048691, pgoff = 3076620288, inode = 0 }
+vm_state.vm_map: 23329.141680028 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076780032, end = 3076857856, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.141682088 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076857856, end = 3076861952, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.141684025 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076861952, end = 3076866048, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.141685962 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076866048, end = 3076874240, flags = 1048691, pgoff = 3076866048, inode = 0 }
+vm_state.vm_map: 23329.141690884 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076874240, end = 3076923392, flags = 134217845, pgoff = 0, inode = 500088 }
+vm_state.vm_map: 23329.141692938 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076923392, end = 3076927488, flags = 135266419, pgoff = 45056, inode = 500088 }
+vm_state.vm_map: 23329.141694973 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076927488, end = 3076976640, flags = 1048691, pgoff = 3076927488, inode = 0 }
+vm_state.vm_map: 23329.141697428 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3076976640, end = 3077074944, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 23329.141699445 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3077074944, end = 3077079040, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 23329.141701567 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3077079040, end = 3077083136, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 23329.141703948 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3077087232, end = 3077095424, flags = 134217845, pgoff = 0, inode = 499908 }
+vm_state.vm_map: 23329.141706354 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3077095424, end = 3077099520, flags = 135266419, pgoff = 4096, inode = 499908 }
+vm_state.vm_map: 23329.141711552 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3077099520, end = 3077107712, flags = 134217845, pgoff = 0, inode = 500086 }
+vm_state.vm_map: 23329.141713717 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3077107712, end = 3077111808, flags = 135266419, pgoff = 4096, inode = 500086 }
+vm_state.vm_map: 23329.141716203 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3077111808, end = 3077120000, flags = 134217845, pgoff = 0, inode = 508383 }
+vm_state.vm_map: 23329.141718159 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3077120000, end = 3077124096, flags = 135266417, pgoff = 4096, inode = 508383 }
+vm_state.vm_map: 23329.141720126 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3077124096, end = 3077128192, flags = 135266419, pgoff = 8192, inode = 508383 }
+vm_state.vm_map: 23329.141725049 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3077128192, end = 3077136384, flags = 134217845, pgoff = 0, inode = 500085 }
+vm_state.vm_map: 23329.141727078 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3077136384, end = 3077140480, flags = 135266419, pgoff = 8192, inode = 500085 }
+vm_state.vm_map: 23329.141729557 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3077140480, end = 3077156864, flags = 134217845, pgoff = 0, inode = 500096 }
+vm_state.vm_map: 23329.141731525 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3077156864, end = 3077160960, flags = 135266419, pgoff = 12288, inode = 500096 }
+vm_state.vm_map: 23329.141738865 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3077160960, end = 3077173248, flags = 134217845, pgoff = 0, inode = 500105 }
+vm_state.vm_map: 23329.141740919 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3077173248, end = 3077177344, flags = 135266419, pgoff = 8192, inode = 500105 }
+vm_state.vm_map: 23329.141743473 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3077177344, end = 3077181440, flags = 1048691, pgoff = 3077177344, inode = 0 }
+vm_state.vm_map: 23329.141745669 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3077181440, end = 3077189632, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.141747864 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3077189632, end = 3077193728, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.141749992 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3077193728, end = 3077197824, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.141752262 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3077197824, end = 3078512640, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.141754218 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078512640, end = 3078520832, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.141756179 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078520832, end = 3078524928, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.141758110 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078524928, end = 3078541312, flags = 1048691, pgoff = 3078524928, inode = 0 }
+vm_state.vm_map: 23329.141762872 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078541312, end = 3078549504, flags = 134217845, pgoff = 0, inode = 499739 }
+vm_state.vm_map: 23329.141764926 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078549504, end = 3078553600, flags = 135266419, pgoff = 4096, inode = 499739 }
+vm_state.vm_map: 23329.141767047 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078553600, end = 3078594560, flags = 134217845, pgoff = 0, inode = 499738 }
+vm_state.vm_map: 23329.141769299 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078594560, end = 3078598656, flags = 135266419, pgoff = 40960, inode = 499738 }
+vm_state.vm_map: 23329.141771698 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078598656, end = 3078602752, flags = 134217845, pgoff = 0, inode = 500092 }
+vm_state.vm_map: 23329.141773629 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078602752, end = 3078606848, flags = 135266419, pgoff = 0, inode = 500092 }
+vm_state.vm_map: 23329.141775936 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078606848, end = 3078610944, flags = 134217845, pgoff = 0, inode = 500082 }
+vm_state.vm_map: 23329.141778280 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078610944, end = 3078615040, flags = 135266419, pgoff = 0, inode = 500082 }
+vm_state.vm_map: 23329.141780599 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078615040, end = 3078619136, flags = 134217845, pgoff = 0, inode = 499797 }
+vm_state.vm_map: 23329.141782695 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078619136, end = 3078623232, flags = 135266419, pgoff = 0, inode = 499797 }
+vm_state.vm_map: 23329.141785151 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078627328, end = 3078639616, flags = 134217845, pgoff = 0, inode = 500089 }
+vm_state.vm_map: 23329.141787253 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078639616, end = 3078643712, flags = 135266419, pgoff = 8192, inode = 500089 }
+vm_state.vm_map: 23329.141789734 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078643712, end = 3078660096, flags = 134217845, pgoff = 0, inode = 499749 }
+vm_state.vm_map: 23329.141791775 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078660096, end = 3078664192, flags = 135266419, pgoff = 12288, inode = 499749 }
+vm_state.vm_map: 23329.141794194 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078664192, end = 3078668288, flags = 134217845, pgoff = 0, inode = 500093 }
+vm_state.vm_map: 23329.141796129 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078668288, end = 3078672384, flags = 135266419, pgoff = 0, inode = 500093 }
+vm_state.vm_map: 23329.141798510 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078672384, end = 3078676480, flags = 134217845, pgoff = 0, inode = 500104 }
+vm_state.vm_map: 23329.141800472 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078676480, end = 3078680576, flags = 135266419, pgoff = 4096, inode = 500104 }
+vm_state.vm_map: 23329.141805604 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078680576, end = 3078684672, flags = 134217845, pgoff = 0, inode = 500080 }
+vm_state.vm_map: 23329.141807652 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078684672, end = 3078688768, flags = 135266419, pgoff = 0, inode = 500080 }
+vm_state.vm_map: 23329.141812259 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078688768, end = 3078701056, flags = 1048691, pgoff = 3078688768, inode = 0 }
+vm_state.vm_map: 23329.141817231 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078701056, end = 3078705152, flags = 67371125, pgoff = 3078701056, inode = 0 }
+vm_state.vm_map: 23329.141819402 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078705152, end = 3078819840, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.141821413 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078819840, end = 3078823936, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.141823430 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3078823936, end = 3078828032, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.141825527 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1840, start = 3216424960, end = 3216510976, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.141830893 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1841, start = 134512640, end = 134529024, flags = 134223989, pgoff = 0, inode = 410997 }
+vm_state.vm_map: 23329.141832941 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1841, start = 134529024, end = 134533120, flags = 135272563, pgoff = 16384, inode = 410997 }
+vm_state.vm_map: 23329.141835001 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1841, start = 134533120, end = 134541312, flags = 1048691, pgoff = 134533120, inode = 0 }
+vm_state.vm_map: 23329.141837105 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1841, start = 136343552, end = 136478720, flags = 1048691, pgoff = 136343552, inode = 0 }
+vm_state.vm_map: 23329.141839270 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1841, start = 3076980736, end = 3076988928, flags = 1048691, pgoff = 3076980736, inode = 0 }
+vm_state.vm_map: 23329.141841515 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1841, start = 3076988928, end = 3078303744, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.141843655 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1841, start = 3078303744, end = 3078311936, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.141845722 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1841, start = 3078311936, end = 3078316032, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.141847757 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1841, start = 3078316032, end = 3078328320, flags = 1048691, pgoff = 3078316032, inode = 0 }
+vm_state.vm_map: 23329.141850335 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1841, start = 3078328320, end = 3078336512, flags = 134217845, pgoff = 0, inode = 508383 }
+vm_state.vm_map: 23329.141852419 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1841, start = 3078336512, end = 3078340608, flags = 135266417, pgoff = 4096, inode = 508383 }
+vm_state.vm_map: 23329.141854530 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1841, start = 3078340608, end = 3078344704, flags = 135266419, pgoff = 8192, inode = 508383 }
+vm_state.vm_map: 23329.141856620 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1841, start = 3078430720, end = 3078434816, flags = 1048691, pgoff = 3078430720, inode = 0 }
+vm_state.vm_map: 23329.141858742 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1841, start = 3078438912, end = 3078447104, flags = 1048691, pgoff = 3078438912, inode = 0 }
+vm_state.vm_map: 23329.141860834 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1841, start = 3078447104, end = 3078451200, flags = 67371125, pgoff = 3078447104, inode = 0 }
+vm_state.vm_map: 23329.141862967 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1841, start = 3078451200, end = 3078565888, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.141865193 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1841, start = 3078565888, end = 3078569984, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.141867247 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1841, start = 3078569984, end = 3078574080, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.141869277 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1841, start = 3220160512, end = 3220246528, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.141872052 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1842, start = 134512640, end = 134529024, flags = 134223989, pgoff = 0, inode = 410997 }
+vm_state.vm_map: 23329.141874150 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1842, start = 134529024, end = 134533120, flags = 135272563, pgoff = 16384, inode = 410997 }
+vm_state.vm_map: 23329.141876167 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1842, start = 134533120, end = 134541312, flags = 1048691, pgoff = 134533120, inode = 0 }
+vm_state.vm_map: 23329.141880984 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1842, start = 158932992, end = 159068160, flags = 1048691, pgoff = 158932992, inode = 0 }
+vm_state.vm_map: 23329.141883155 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1842, start = 3076825088, end = 3076833280, flags = 1048691, pgoff = 3076825088, inode = 0 }
+vm_state.vm_map: 23329.141885764 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1842, start = 3076833280, end = 3078148096, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.141887825 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1842, start = 3078148096, end = 3078156288, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.141889928 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1842, start = 3078156288, end = 3078160384, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.141891889 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1842, start = 3078160384, end = 3078172672, flags = 1048691, pgoff = 3078160384, inode = 0 }
+vm_state.vm_map: 23329.141894270 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1842, start = 3078172672, end = 3078180864, flags = 134217845, pgoff = 0, inode = 508383 }
+vm_state.vm_map: 23329.141896300 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1842, start = 3078180864, end = 3078184960, flags = 135266417, pgoff = 4096, inode = 508383 }
+vm_state.vm_map: 23329.141898391 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1842, start = 3078184960, end = 3078189056, flags = 135266419, pgoff = 8192, inode = 508383 }
+vm_state.vm_map: 23329.141900408 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1842, start = 3078275072, end = 3078279168, flags = 1048691, pgoff = 3078275072, inode = 0 }
+vm_state.vm_map: 23329.141905404 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1842, start = 3078283264, end = 3078291456, flags = 1048691, pgoff = 3078283264, inode = 0 }
+vm_state.vm_map: 23329.141907569 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1842, start = 3078291456, end = 3078295552, flags = 67371125, pgoff = 3078291456, inode = 0 }
+vm_state.vm_map: 23329.141909709 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1842, start = 3078295552, end = 3078410240, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.141911782 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1842, start = 3078410240, end = 3078414336, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.141913743 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1842, start = 3078414336, end = 3078418432, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.141915890 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1842, start = 3216994304, end = 3217080320, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.141918604 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1843, start = 134512640, end = 134529024, flags = 134223989, pgoff = 0, inode = 410997 }
+vm_state.vm_map: 23329.141920917 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1843, start = 134529024, end = 134533120, flags = 135272563, pgoff = 16384, inode = 410997 }
+vm_state.vm_map: 23329.141922854 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1843, start = 134533120, end = 134541312, flags = 1048691, pgoff = 134533120, inode = 0 }
+vm_state.vm_map: 23329.141924876 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1843, start = 137175040, end = 137310208, flags = 1048691, pgoff = 137175040, inode = 0 }
+vm_state.vm_map: 23329.141926814 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1843, start = 3077922816, end = 3077931008, flags = 1048691, pgoff = 3077922816, inode = 0 }
+vm_state.vm_map: 23329.141928979 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1843, start = 3077931008, end = 3079245824, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.141931002 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1843, start = 3079245824, end = 3079254016, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.141933024 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1843, start = 3079254016, end = 3079258112, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.141934968 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1843, start = 3079258112, end = 3079270400, flags = 1048691, pgoff = 3079258112, inode = 0 }
+vm_state.vm_map: 23329.141937200 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1843, start = 3079270400, end = 3079278592, flags = 134217845, pgoff = 0, inode = 508383 }
+vm_state.vm_map: 23329.141939310 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1843, start = 3079278592, end = 3079282688, flags = 135266417, pgoff = 4096, inode = 508383 }
+vm_state.vm_map: 23329.141941246 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1843, start = 3079282688, end = 3079286784, flags = 135266419, pgoff = 8192, inode = 508383 }
+vm_state.vm_map: 23329.141943201 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1843, start = 3079372800, end = 3079376896, flags = 1048691, pgoff = 3079372800, inode = 0 }
+vm_state.vm_map: 23329.141945249 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1843, start = 3079380992, end = 3079389184, flags = 1048691, pgoff = 3079380992, inode = 0 }
+vm_state.vm_map: 23329.141947303 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1843, start = 3079389184, end = 3079393280, flags = 67371125, pgoff = 3079389184, inode = 0 }
+vm_state.vm_map: 23329.141953070 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1843, start = 3079393280, end = 3079507968, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.141955482 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1843, start = 3079507968, end = 3079512064, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.141957524 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1843, start = 3079512064, end = 3079516160, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.141959732 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1843, start = 3215454208, end = 3215540224, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.141962199 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1844, start = 134512640, end = 134529024, flags = 134223989, pgoff = 0, inode = 410997 }
+vm_state.vm_map: 23329.141964136 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1844, start = 134529024, end = 134533120, flags = 135272563, pgoff = 16384, inode = 410997 }
+vm_state.vm_map: 23329.141966073 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1844, start = 134533120, end = 134541312, flags = 1048691, pgoff = 134533120, inode = 0 }
+vm_state.vm_map: 23329.141968016 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1844, start = 157933568, end = 158068736, flags = 1048691, pgoff = 157933568, inode = 0 }
+vm_state.vm_map: 23329.141970064 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1844, start = 3077189632, end = 3077197824, flags = 1048691, pgoff = 3077189632, inode = 0 }
+vm_state.vm_map: 23329.141972130 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1844, start = 3077197824, end = 3078512640, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.141974092 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1844, start = 3078512640, end = 3078520832, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.141976195 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1844, start = 3078520832, end = 3078524928, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.141978138 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1844, start = 3078524928, end = 3078537216, flags = 1048691, pgoff = 3078524928, inode = 0 }
+vm_state.vm_map: 23329.141980272 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1844, start = 3078537216, end = 3078545408, flags = 134217845, pgoff = 0, inode = 508383 }
+vm_state.vm_map: 23329.141982388 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1844, start = 3078545408, end = 3078549504, flags = 135266417, pgoff = 4096, inode = 508383 }
+vm_state.vm_map: 23329.141984442 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1844, start = 3078549504, end = 3078553600, flags = 135266419, pgoff = 8192, inode = 508383 }
+vm_state.vm_map: 23329.141986422 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1844, start = 3078639616, end = 3078643712, flags = 1048691, pgoff = 3078639616, inode = 0 }
+vm_state.vm_map: 23329.141988704 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1844, start = 3078647808, end = 3078656000, flags = 1048691, pgoff = 3078647808, inode = 0 }
+vm_state.vm_map: 23329.141990666 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1844, start = 3078656000, end = 3078660096, flags = 67371125, pgoff = 3078656000, inode = 0 }
+vm_state.vm_map: 23329.141992744 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1844, start = 3078660096, end = 3078774784, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.141994700 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1844, start = 3078774784, end = 3078778880, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.141996754 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1844, start = 3078778880, end = 3078782976, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.141998820 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1844, start = 3217580032, end = 3217666048, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.142001639 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1845, start = 134512640, end = 134529024, flags = 134223989, pgoff = 0, inode = 410997 }
+vm_state.vm_map: 23329.142003779 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1845, start = 134529024, end = 134533120, flags = 135272563, pgoff = 16384, inode = 410997 }
+vm_state.vm_map: 23329.142005839 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1845, start = 134533120, end = 134541312, flags = 1048691, pgoff = 134533120, inode = 0 }
+vm_state.vm_map: 23329.142007880 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1845, start = 164167680, end = 164302848, flags = 1048691, pgoff = 164167680, inode = 0 }
+vm_state.vm_map: 23329.142009812 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1845, start = 3076263936, end = 3076272128, flags = 1048691, pgoff = 3076263936, inode = 0 }
+vm_state.vm_map: 23329.142011915 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1845, start = 3076272128, end = 3077586944, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.142013994 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1845, start = 3077586944, end = 3077595136, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.142015949 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1845, start = 3077595136, end = 3077599232, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.142017885 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1845, start = 3077599232, end = 3077611520, flags = 1048691, pgoff = 3077599232, inode = 0 }
+vm_state.vm_map: 23329.142019982 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1845, start = 3077611520, end = 3077619712, flags = 134217845, pgoff = 0, inode = 508383 }
+vm_state.vm_map: 23329.142022307 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1845, start = 3077619712, end = 3077623808, flags = 135266417, pgoff = 4096, inode = 508383 }
+vm_state.vm_map: 23329.142024275 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1845, start = 3077623808, end = 3077627904, flags = 135266419, pgoff = 8192, inode = 508383 }
+vm_state.vm_map: 23329.142026273 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1845, start = 3077713920, end = 3077718016, flags = 1048691, pgoff = 3077713920, inode = 0 }
+vm_state.vm_map: 23329.142028260 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1845, start = 3077722112, end = 3077730304, flags = 1048691, pgoff = 3077722112, inode = 0 }
+vm_state.vm_map: 23329.142030190 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1845, start = 3077730304, end = 3077734400, flags = 67371125, pgoff = 3077730304, inode = 0 }
+vm_state.vm_map: 23329.142032417 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1845, start = 3077734400, end = 3077849088, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.142034459 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1845, start = 3077849088, end = 3077853184, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.142036531 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1845, start = 3077853184, end = 3077857280, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.142038480 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1845, start = 3215814656, end = 3215900672, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.142046474 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 134512640, end = 134635520, flags = 134223989, pgoff = 0, inode = 17179 }
+vm_state.vm_map: 23329.142048682 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 134635520, end = 134639616, flags = 135272563, pgoff = 118784, inode = 17179 }
+vm_state.vm_map: 23329.142050699 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 166301696, end = 166952960, flags = 1048691, pgoff = 166301696, inode = 0 }
+vm_state.vm_map: 23329.142053179 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3060416512, end = 3060531200, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.142055338 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3060531200, end = 3060535296, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.142060945 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3060600832, end = 3060629504, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.142065818 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3060629504, end = 3060633600, flags = 1048688, pgoff = 3060629504, inode = 0 }
+vm_state.vm_map: 23329.142067970 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3060633600, end = 3069022208, flags = 1048691, pgoff = 3060633600, inode = 0 }
+vm_state.vm_map: 23329.142073670 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069022208, end = 3069026304, flags = 1048688, pgoff = 3069022208, inode = 0 }
+vm_state.vm_map: 23329.142075704 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069026304, end = 3069091840, flags = 1048691, pgoff = 3069026304, inode = 0 }
+vm_state.vm_map: 23329.142077832 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069091840, end = 3069095936, flags = 1048688, pgoff = 3069091840, inode = 0 }
+vm_state.vm_map: 23329.142079764 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069095936, end = 3069161472, flags = 1048691, pgoff = 3069095936, inode = 0 }
+vm_state.vm_map: 23329.142082046 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069161472, end = 3069165568, flags = 1048688, pgoff = 3069161472, inode = 0 }
+vm_state.vm_map: 23329.142084007 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069165568, end = 3069231104, flags = 1048691, pgoff = 3069165568, inode = 0 }
+vm_state.vm_map: 23329.142086068 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069231104, end = 3069235200, flags = 1048688, pgoff = 3069231104, inode = 0 }
+vm_state.vm_map: 23329.142087991 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069235200, end = 3069300736, flags = 1048691, pgoff = 3069235200, inode = 0 }
+vm_state.vm_map: 23329.142089917 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069300736, end = 3069304832, flags = 1048688, pgoff = 3069300736, inode = 0 }
+vm_state.vm_map: 23329.142091840 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069304832, end = 3069370368, flags = 1048691, pgoff = 3069304832, inode = 0 }
+vm_state.vm_map: 23329.142094227 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069370368, end = 3069374464, flags = 1048688, pgoff = 3069370368, inode = 0 }
+vm_state.vm_map: 23329.142096152 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069374464, end = 3069440000, flags = 1048691, pgoff = 3069374464, inode = 0 }
+vm_state.vm_map: 23329.142098200 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069440000, end = 3069444096, flags = 1048688, pgoff = 3069440000, inode = 0 }
+vm_state.vm_map: 23329.142100130 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069444096, end = 3069509632, flags = 1048691, pgoff = 3069444096, inode = 0 }
+vm_state.vm_map: 23329.142102166 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069509632, end = 3069513728, flags = 1048688, pgoff = 3069509632, inode = 0 }
+vm_state.vm_map: 23329.142104090 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069513728, end = 3069579264, flags = 1048691, pgoff = 3069513728, inode = 0 }
+vm_state.vm_map: 23329.142106045 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069579264, end = 3069583360, flags = 1048688, pgoff = 3069579264, inode = 0 }
+vm_state.vm_map: 23329.142107970 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069583360, end = 3069648896, flags = 1048691, pgoff = 3069583360, inode = 0 }
+vm_state.vm_map: 23329.142112787 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069648896, end = 3069652992, flags = 1048688, pgoff = 3069648896, inode = 0 }
+vm_state.vm_map: 23329.142114829 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069652992, end = 3069718528, flags = 1048691, pgoff = 3069652992, inode = 0 }
+vm_state.vm_map: 23329.142116969 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069718528, end = 3069722624, flags = 1048688, pgoff = 3069718528, inode = 0 }
+vm_state.vm_map: 23329.142119011 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069722624, end = 3069788160, flags = 1048691, pgoff = 3069722624, inode = 0 }
+vm_state.vm_map: 23329.142121096 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069788160, end = 3069792256, flags = 1048688, pgoff = 3069788160, inode = 0 }
+vm_state.vm_map: 23329.142123020 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069792256, end = 3069857792, flags = 1048691, pgoff = 3069792256, inode = 0 }
+vm_state.vm_map: 23329.142125050 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069857792, end = 3069861888, flags = 1048688, pgoff = 3069857792, inode = 0 }
+vm_state.vm_map: 23329.142127511 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069861888, end = 3069927424, flags = 1048691, pgoff = 3069861888, inode = 0 }
+vm_state.vm_map: 23329.142129663 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069927424, end = 3069931520, flags = 1048688, pgoff = 3069927424, inode = 0 }
+vm_state.vm_map: 23329.142131699 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069931520, end = 3069997056, flags = 1048691, pgoff = 3069931520, inode = 0 }
+vm_state.vm_map: 23329.142133790 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3069997056, end = 3070001152, flags = 1048688, pgoff = 3069997056, inode = 0 }
+vm_state.vm_map: 23329.142135856 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070001152, end = 3070066688, flags = 1048691, pgoff = 3070001152, inode = 0 }
+vm_state.vm_map: 23329.142137892 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070066688, end = 3070070784, flags = 1048688, pgoff = 3070066688, inode = 0 }
+vm_state.vm_map: 23329.142139816 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070070784, end = 3070136320, flags = 1048691, pgoff = 3070070784, inode = 0 }
+vm_state.vm_map: 23329.142142098 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070136320, end = 3070140416, flags = 1048688, pgoff = 3070136320, inode = 0 }
+vm_state.vm_map: 23329.142144072 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070140416, end = 3070205952, flags = 1048691, pgoff = 3070140416, inode = 0 }
+vm_state.vm_map: 23329.142146120 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070205952, end = 3070210048, flags = 1048688, pgoff = 3070205952, inode = 0 }
+vm_state.vm_map: 23329.142148044 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070210048, end = 3070275584, flags = 1048691, pgoff = 3070210048, inode = 0 }
+vm_state.vm_map: 23329.142150080 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070275584, end = 3070279680, flags = 1048688, pgoff = 3070275584, inode = 0 }
+vm_state.vm_map: 23329.142152005 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070279680, end = 3070345216, flags = 1048691, pgoff = 3070279680, inode = 0 }
+vm_state.vm_map: 23329.142154052 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070345216, end = 3070349312, flags = 1048688, pgoff = 3070345216, inode = 0 }
+vm_state.vm_map: 23329.142155976 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070349312, end = 3070414848, flags = 1048691, pgoff = 3070349312, inode = 0 }
+vm_state.vm_map: 23329.142158031 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070414848, end = 3070418944, flags = 1048688, pgoff = 3070414848, inode = 0 }
+vm_state.vm_map: 23329.142160287 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070418944, end = 3070484480, flags = 1048691, pgoff = 3070418944, inode = 0 }
+vm_state.vm_map: 23329.142162440 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070484480, end = 3070488576, flags = 1048688, pgoff = 3070484480, inode = 0 }
+vm_state.vm_map: 23329.142164506 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070488576, end = 3070554112, flags = 1048691, pgoff = 3070488576, inode = 0 }
+vm_state.vm_map: 23329.142166622 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070554112, end = 3070558208, flags = 1048688, pgoff = 3070554112, inode = 0 }
+vm_state.vm_map: 23329.142168627 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070558208, end = 3070623744, flags = 1048691, pgoff = 3070558208, inode = 0 }
+vm_state.vm_map: 23329.142170619 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070623744, end = 3070627840, flags = 1048688, pgoff = 3070623744, inode = 0 }
+vm_state.vm_map: 23329.142172556 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070627840, end = 3070693376, flags = 1048691, pgoff = 3070627840, inode = 0 }
+vm_state.vm_map: 23329.142177256 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070693376, end = 3070697472, flags = 1048688, pgoff = 3070693376, inode = 0 }
+vm_state.vm_map: 23329.142179483 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070697472, end = 3070763008, flags = 1048691, pgoff = 3070697472, inode = 0 }
+vm_state.vm_map: 23329.142181642 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070763008, end = 3070767104, flags = 1048688, pgoff = 3070763008, inode = 0 }
+vm_state.vm_map: 23329.142183702 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070767104, end = 3070832640, flags = 1048691, pgoff = 3070767104, inode = 0 }
+vm_state.vm_map: 23329.142185916 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070832640, end = 3070836736, flags = 1048688, pgoff = 3070832640, inode = 0 }
+vm_state.vm_map: 23329.142187884 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070836736, end = 3070902272, flags = 1048691, pgoff = 3070836736, inode = 0 }
+vm_state.vm_map: 23329.142190178 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070902272, end = 3070906368, flags = 1048688, pgoff = 3070902272, inode = 0 }
+vm_state.vm_map: 23329.142192232 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070906368, end = 3070971904, flags = 1048691, pgoff = 3070906368, inode = 0 }
+vm_state.vm_map: 23329.142194632 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070971904, end = 3070976000, flags = 1048688, pgoff = 3070971904, inode = 0 }
+vm_state.vm_map: 23329.142196569 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3070976000, end = 3071041536, flags = 1048691, pgoff = 3070976000, inode = 0 }
+vm_state.vm_map: 23329.142198641 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071041536, end = 3071045632, flags = 1048688, pgoff = 3071041536, inode = 0 }
+vm_state.vm_map: 23329.142200584 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071045632, end = 3071111168, flags = 1048691, pgoff = 3071045632, inode = 0 }
+vm_state.vm_map: 23329.142202687 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071111168, end = 3071115264, flags = 1048688, pgoff = 3071111168, inode = 0 }
+vm_state.vm_map: 23329.142204698 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071115264, end = 3071180800, flags = 1048691, pgoff = 3071115264, inode = 0 }
+vm_state.vm_map: 23329.142206950 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071180800, end = 3071184896, flags = 1048688, pgoff = 3071180800, inode = 0 }
+vm_state.vm_map: 23329.142209047 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071184896, end = 3071250432, flags = 1048691, pgoff = 3071184896, inode = 0 }
+vm_state.vm_map: 23329.142211082 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071250432, end = 3071254528, flags = 1048688, pgoff = 3071250432, inode = 0 }
+vm_state.vm_map: 23329.142213167 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071254528, end = 3071320064, flags = 1048691, pgoff = 3071254528, inode = 0 }
+vm_state.vm_map: 23329.142215337 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071320064, end = 3071324160, flags = 1048688, pgoff = 3071320064, inode = 0 }
+vm_state.vm_map: 23329.142217306 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071324160, end = 3071389696, flags = 1048691, pgoff = 3071324160, inode = 0 }
+vm_state.vm_map: 23329.142221833 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071389696, end = 3071393792, flags = 1048688, pgoff = 3071389696, inode = 0 }
+vm_state.vm_map: 23329.142226490 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071393792, end = 3071459328, flags = 1048691, pgoff = 3071393792, inode = 0 }
+vm_state.vm_map: 23329.142228981 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071459328, end = 3071463424, flags = 1048688, pgoff = 3071459328, inode = 0 }
+vm_state.vm_map: 23329.142231073 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071463424, end = 3071528960, flags = 1048691, pgoff = 3071463424, inode = 0 }
+vm_state.vm_map: 23329.142233003 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071528960, end = 3071533056, flags = 1048688, pgoff = 3071528960, inode = 0 }
+vm_state.vm_map: 23329.142234935 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071533056, end = 3071598592, flags = 1048691, pgoff = 3071533056, inode = 0 }
+vm_state.vm_map: 23329.142237106 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071598592, end = 3071602688, flags = 1048688, pgoff = 3071598592, inode = 0 }
+vm_state.vm_map: 23329.142261062 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071602688, end = 3071668224, flags = 1048691, pgoff = 3071602688, inode = 0 }
+vm_state.vm_map: 23329.142263344 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071668224, end = 3071672320, flags = 1048688, pgoff = 3071668224, inode = 0 }
+vm_state.vm_map: 23329.142265540 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071672320, end = 3071737856, flags = 1048691, pgoff = 3071672320, inode = 0 }
+vm_state.vm_map: 23329.142267631 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071737856, end = 3071741952, flags = 1048688, pgoff = 3071737856, inode = 0 }
+vm_state.vm_map: 23329.142269741 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071741952, end = 3071807488, flags = 1048691, pgoff = 3071741952, inode = 0 }
+vm_state.vm_map: 23329.142271795 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071807488, end = 3071811584, flags = 1048688, pgoff = 3071807488, inode = 0 }
+vm_state.vm_map: 23329.142273855 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071811584, end = 3071877120, flags = 1048691, pgoff = 3071811584, inode = 0 }
+vm_state.vm_map: 23329.142275940 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071877120, end = 3071881216, flags = 1048688, pgoff = 3071877120, inode = 0 }
+vm_state.vm_map: 23329.142295498 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071881216, end = 3071946752, flags = 1048691, pgoff = 3071881216, inode = 0 }
+vm_state.vm_map: 23329.142297855 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071946752, end = 3071950848, flags = 1048688, pgoff = 3071946752, inode = 0 }
+vm_state.vm_map: 23329.142299847 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3071950848, end = 3072016384, flags = 1048691, pgoff = 3071950848, inode = 0 }
+vm_state.vm_map: 23329.142302561 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072016384, end = 3072020480, flags = 1048688, pgoff = 3072016384, inode = 0 }
+vm_state.vm_map: 23329.142304597 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072020480, end = 3072086016, flags = 1048691, pgoff = 3072020480, inode = 0 }
+vm_state.vm_map: 23329.142306737 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072086016, end = 3072090112, flags = 1048688, pgoff = 3072086016, inode = 0 }
+vm_state.vm_map: 23329.142308964 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072090112, end = 3072155648, flags = 1048691, pgoff = 3072090112, inode = 0 }
+vm_state.vm_map: 23329.142311159 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072155648, end = 3072159744, flags = 1048688, pgoff = 3072155648, inode = 0 }
+vm_state.vm_map: 23329.142313373 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072159744, end = 3072225280, flags = 1048691, pgoff = 3072159744, inode = 0 }
+vm_state.vm_map: 23329.142315428 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072225280, end = 3072229376, flags = 1048688, pgoff = 3072225280, inode = 0 }
+vm_state.vm_map: 23329.142317537 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072229376, end = 3072294912, flags = 1048691, pgoff = 3072229376, inode = 0 }
+vm_state.vm_map: 23329.142319523 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072294912, end = 3072299008, flags = 1048688, pgoff = 3072294912, inode = 0 }
+vm_state.vm_map: 23329.142321528 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072299008, end = 3072364544, flags = 1048691, pgoff = 3072299008, inode = 0 }
+vm_state.vm_map: 23329.142323625 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072364544, end = 3072368640, flags = 1048688, pgoff = 3072364544, inode = 0 }
+vm_state.vm_map: 23329.142325611 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072368640, end = 3072434176, flags = 1048691, pgoff = 3072368640, inode = 0 }
+vm_state.vm_map: 23329.142327603 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072434176, end = 3072438272, flags = 1048688, pgoff = 3072434176, inode = 0 }
+vm_state.vm_map: 23329.142329830 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072438272, end = 3072503808, flags = 1048691, pgoff = 3072438272, inode = 0 }
+vm_state.vm_map: 23329.142331989 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072503808, end = 3072507904, flags = 1048688, pgoff = 3072503808, inode = 0 }
+vm_state.vm_map: 23329.142334086 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072507904, end = 3072573440, flags = 1048691, pgoff = 3072507904, inode = 0 }
+vm_state.vm_map: 23329.142336467 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072573440, end = 3072577536, flags = 1048688, pgoff = 3072573440, inode = 0 }
+vm_state.vm_map: 23329.142338416 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072577536, end = 3072643072, flags = 1048691, pgoff = 3072577536, inode = 0 }
+vm_state.vm_map: 23329.142340408 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072643072, end = 3072647168, flags = 1048688, pgoff = 3072643072, inode = 0 }
+vm_state.vm_map: 23329.142342691 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072647168, end = 3072712704, flags = 1048691, pgoff = 3072647168, inode = 0 }
+vm_state.vm_map: 23329.142344843 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072712704, end = 3072716800, flags = 1048688, pgoff = 3072712704, inode = 0 }
+vm_state.vm_map: 23329.142346934 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072716800, end = 3072782336, flags = 1048691, pgoff = 3072716800, inode = 0 }
+vm_state.vm_map: 23329.142349075 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072782336, end = 3072786432, flags = 1048688, pgoff = 3072782336, inode = 0 }
+vm_state.vm_map: 23329.142351178 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072786432, end = 3072851968, flags = 1048691, pgoff = 3072786432, inode = 0 }
+vm_state.vm_map: 23329.142353201 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072851968, end = 3072856064, flags = 1048688, pgoff = 3072851968, inode = 0 }
+vm_state.vm_map: 23329.142355292 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072856064, end = 3072921600, flags = 1048691, pgoff = 3072856064, inode = 0 }
+vm_state.vm_map: 23329.142357328 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072921600, end = 3072925696, flags = 1048688, pgoff = 3072921600, inode = 0 }
+vm_state.vm_map: 23329.142359437 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072925696, end = 3072991232, flags = 1048691, pgoff = 3072925696, inode = 0 }
+vm_state.vm_map: 23329.142361405 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072991232, end = 3072995328, flags = 1048688, pgoff = 3072991232, inode = 0 }
+vm_state.vm_map: 23329.142363354 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3072995328, end = 3073060864, flags = 1048691, pgoff = 3072995328, inode = 0 }
+vm_state.vm_map: 23329.142365531 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3073060864, end = 3073064960, flags = 1048688, pgoff = 3073060864, inode = 0 }
+vm_state.vm_map: 23329.142367511 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3073064960, end = 3073130496, flags = 1048691, pgoff = 3073064960, inode = 0 }
+vm_state.vm_map: 23329.142369965 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3073130496, end = 3073134592, flags = 1048688, pgoff = 3073130496, inode = 0 }
+vm_state.vm_map: 23329.142372057 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3073134592, end = 3073200128, flags = 1048691, pgoff = 3073134592, inode = 0 }
+vm_state.vm_map: 23329.142374104 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3073200128, end = 3073204224, flags = 1048688, pgoff = 3073200128, inode = 0 }
+vm_state.vm_map: 23329.142376325 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3073204224, end = 3073277952, flags = 1048691, pgoff = 3073204224, inode = 0 }
+vm_state.vm_map: 23329.142378545 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3073277952, end = 3073376256, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 23329.142380748 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3073376256, end = 3073380352, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 23329.142382833 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3073380352, end = 3073384448, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 23329.142384937 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3073384448, end = 3073454080, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 23329.142386990 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3073454080, end = 3073458176, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 23329.142389025 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3073458176, end = 3073462272, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 23329.142390975 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3073462272, end = 3073470464, flags = 1048691, pgoff = 3073462272, inode = 0 }
+vm_state.vm_map: 23329.142393182 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3073470464, end = 3073478656, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.142395113 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3073478656, end = 3073482752, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.142397179 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3073482752, end = 3073486848, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.142403230 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3073486848, end = 3073736704, flags = 134217845, pgoff = 0, inode = 17169 }
+vm_state.vm_map: 23329.142405667 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3073736704, end = 3073744896, flags = 135266419, pgoff = 245760, inode = 17169 }
+vm_state.vm_map: 23329.142407653 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3073744896, end = 3073748992, flags = 1048691, pgoff = 3073744896, inode = 0 }
+vm_state.vm_map: 23329.142410034 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3073748992, end = 3073941504, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.142411964 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3073941504, end = 3073945600, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.142414284 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3073945600, end = 3075260416, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.142416325 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3075260416, end = 3075268608, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.142418268 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3075268608, end = 3075272704, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.142420396 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3075272704, end = 3075284992, flags = 1048691, pgoff = 3075272704, inode = 0 }
+vm_state.vm_map: 23329.142422820 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3075284992, end = 3076022272, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.142424856 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3076022272, end = 3076026368, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.142427181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3076026368, end = 3076038656, flags = 134217845, pgoff = 0, inode = 19626 }
+vm_state.vm_map: 23329.142429445 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3076038656, end = 3076042752, flags = 135266419, pgoff = 8192, inode = 19626 }
+vm_state.vm_map: 23329.142431980 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3076042752, end = 3076284416, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.142433923 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3076284416, end = 3076288512, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.142435915 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3076288512, end = 3076292608, flags = 1048691, pgoff = 3076288512, inode = 0 }
+vm_state.vm_map: 23329.142438284 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3076292608, end = 3076890624, flags = 134217845, pgoff = 0, inode = 19628 }
+vm_state.vm_map: 23329.142440676 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3076890624, end = 3076898816, flags = 135266419, pgoff = 598016, inode = 19628 }
+vm_state.vm_map: 23329.142443064 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3076898816, end = 3077013504, flags = 134217845, pgoff = 0, inode = 17171 }
+vm_state.vm_map: 23329.142445162 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3077013504, end = 3077017600, flags = 135266419, pgoff = 114688, inode = 17171 }
+vm_state.vm_map: 23329.142447345 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3077017600, end = 3077046272, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.142449448 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3077046272, end = 3077050368, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.142451478 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3077050368, end = 3077054464, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.142456135 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3077054464, end = 3077070848, flags = 134217845, pgoff = 0, inode = 19625 }
+vm_state.vm_map: 23329.142458312 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3077070848, end = 3077074944, flags = 135266419, pgoff = 12288, inode = 19625 }
+vm_state.vm_map: 23329.142460482 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3077074944, end = 3077160960, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.142462697 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3077160960, end = 3077165056, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.142464769 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3077165056, end = 3077169152, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.142467088 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3077169152, end = 3077181440, flags = 1048691, pgoff = 3077169152, inode = 0 }
+vm_state.vm_map: 23329.142469216 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3077181440, end = 3077406720, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.142471221 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3077406720, end = 3077410816, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.142473423 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3077410816, end = 3077414912, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.142476174 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3077414912, end = 3077529600, flags = 134217845, pgoff = 0, inode = 17291 }
+vm_state.vm_map: 23329.142478179 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3077529600, end = 3077533696, flags = 135266419, pgoff = 114688, inode = 17291 }
+vm_state.vm_map: 23329.142480375 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3077554176, end = 3077558272, flags = 1048688, pgoff = 3077554176, inode = 0 }
+vm_state.vm_map: 23329.142482379 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3077558272, end = 3077636096, flags = 1048691, pgoff = 3077558272, inode = 0 }
+vm_state.vm_map: 23329.142484514 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3077636096, end = 3077640192, flags = 67371125, pgoff = 3077636096, inode = 0 }
+vm_state.vm_map: 23329.142486691 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3077640192, end = 3077754880, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.142488924 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3077754880, end = 3077758976, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.142491039 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3077758976, end = 3077763072, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.142493137 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1881, start = 3213963264, end = 3214049280, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.142496319 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 134512640, end = 135303168, flags = 134223989, pgoff = 0, inode = 1048715 }
+vm_state.vm_map: 23329.142498423 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 135303168, end = 135323648, flags = 135272563, pgoff = 790528, inode = 1048715 }
+vm_state.vm_map: 23329.142500514 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 135323648, end = 135344128, flags = 1048691, pgoff = 135323648, inode = 0 }
+vm_state.vm_map: 23329.142502703 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 141185024, end = 141443072, flags = 1048691, pgoff = 141185024, inode = 0 }
+vm_state.vm_map: 23329.142504912 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3075334144, end = 3075375104, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.142507015 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3075375104, end = 3075379200, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.142509044 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3075379200, end = 3075383296, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.142511512 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3075383296, end = 3075420160, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.142513695 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3075420160, end = 3075424256, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.142515866 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3075424256, end = 3075428352, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.142518044 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3075428352, end = 3075506176, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.142520129 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3075506176, end = 3075510272, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.142522416 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3075510272, end = 3075514368, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.142524619 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3075514368, end = 3075522560, flags = 1048691, pgoff = 3075514368, inode = 0 }
+vm_state.vm_map: 23329.142526839 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3075522560, end = 3075547136, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.142529065 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3075547136, end = 3075551232, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.142531145 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3075551232, end = 3075555328, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.142533679 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3075555328, end = 3076886528, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.142535912 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3076886528, end = 3076890624, flags = 1048691, pgoff = 3076886528, inode = 0 }
+vm_state.vm_map: 23329.142538046 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3076890624, end = 3078205440, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.142539995 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3078205440, end = 3078213632, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.142542117 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3078213632, end = 3078217728, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.142544288 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3078217728, end = 3078234112, flags = 1048691, pgoff = 3078217728, inode = 0 }
+vm_state.vm_map: 23329.142546737 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3078234112, end = 3078242304, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.142548729 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3078242304, end = 3078246400, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.142550839 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3078246400, end = 3078250496, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.142553201 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3078250496, end = 3078467584, flags = 134217845, pgoff = 0, inode = 499784 }
+vm_state.vm_map: 23329.142555299 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3078467584, end = 3078479872, flags = 135266419, pgoff = 217088, inode = 499784 }
+vm_state.vm_map: 23329.142557451 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3078545408, end = 3078574080, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.142559548 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3078574080, end = 3078582272, flags = 1048691, pgoff = 3078574080, inode = 0 }
+vm_state.vm_map: 23329.142561590 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3078582272, end = 3078586368, flags = 67371125, pgoff = 3078582272, inode = 0 }
+vm_state.vm_map: 23329.142563767 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3078586368, end = 3078701056, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.142565729 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3078701056, end = 3078705152, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.142567906 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3078705152, end = 3078709248, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.142569868 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1957, start = 3219304448, end = 3219390464, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.142572619 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 134512640, end = 134647808, flags = 134223989, pgoff = 0, inode = 23928 }
+vm_state.vm_map: 23329.142574741 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 134647808, end = 134651904, flags = 135272563, pgoff = 135168, inode = 23928 }
+vm_state.vm_map: 23329.142577035 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 134651904, end = 134656000, flags = 1048691, pgoff = 134651904, inode = 0 }
+vm_state.vm_map: 23329.142579089 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 136007680, end = 136142848, flags = 1048691, pgoff = 136007680, inode = 0 }
+vm_state.vm_map: 23329.142581470 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3076276224, end = 3076284416, flags = 1048691, pgoff = 3076276224, inode = 0 }
+vm_state.vm_map: 23329.142583549 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3076284416, end = 3076313088, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.142585683 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3076313088, end = 3076317184, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.142587786 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3076317184, end = 3076321280, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.142589945 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3076321280, end = 3076407296, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.142591870 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3076407296, end = 3076411392, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.142594041 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3076411392, end = 3076415488, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.142596113 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3076415488, end = 3076423680, flags = 1048691, pgoff = 3076415488, inode = 0 }
+vm_state.vm_map: 23329.142598155 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3076423680, end = 3076431872, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.142600097 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3076431872, end = 3076435968, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.142602151 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3076435968, end = 3076440064, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.142604200 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3076440064, end = 3076444160, flags = 1048691, pgoff = 3076440064, inode = 0 }
+vm_state.vm_map: 23329.142606493 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3076444160, end = 3076542464, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.142608437 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3076542464, end = 3076546560, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.142610781 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3076546560, end = 3077861376, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.142612841 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3077861376, end = 3077869568, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.142615141 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3077869568, end = 3077873664, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.142617331 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3077873664, end = 3077885952, flags = 1048691, pgoff = 3077873664, inode = 0 }
+vm_state.vm_map: 23329.142619373 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3077885952, end = 3078111232, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.142621322 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3078111232, end = 3078115328, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.142623265 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3078115328, end = 3078119424, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.142625448 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3078119424, end = 3078127616, flags = 134217845, pgoff = 0, inode = 17167 }
+vm_state.vm_map: 23329.142627428 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3078127616, end = 3078131712, flags = 135266419, pgoff = 8192, inode = 17167 }
+vm_state.vm_map: 23329.142629606 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3078131712, end = 3078172672, flags = 134217845, pgoff = 0, inode = 499738 }
+vm_state.vm_map: 23329.142631684 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3078172672, end = 3078176768, flags = 135266419, pgoff = 40960, inode = 499738 }
+vm_state.vm_map: 23329.142634306 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3078176768, end = 3078193152, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.142636341 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3078193152, end = 3078197248, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.142638272 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3078197248, end = 3078201344, flags = 1048691, pgoff = 3078197248, inode = 0 }
+vm_state.vm_map: 23329.142640659 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3078201344, end = 3078209536, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.142642707 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3078209536, end = 3078213632, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.142645162 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3078213632, end = 3079364608, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.142647284 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3079364608, end = 3079380992, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.142649572 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3079471104, end = 3079483392, flags = 1048691, pgoff = 3079471104, inode = 0 }
+vm_state.vm_map: 23329.142651688 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3079483392, end = 3079487488, flags = 67371125, pgoff = 3079483392, inode = 0 }
+vm_state.vm_map: 23329.142653927 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3079487488, end = 3079602176, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.142655888 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3079602176, end = 3079606272, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.142658127 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3079606272, end = 3079610368, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.142660211 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1987, start = 3212898304, end = 3212984320, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.142665714 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 134512640, end = 136171520, flags = 134223989, pgoff = 0, inode = 1352187 }
+vm_state.vm_map: 23329.142667910 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 136171520, end = 136208384, flags = 135272563, pgoff = 1654784, inode = 1352187 }
+vm_state.vm_map: 23329.142670007 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 136208384, end = 136253440, flags = 1048691, pgoff = 136208384, inode = 0 }
+vm_state.vm_map: 23329.142672073 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 136720384, end = 172679168, flags = 1048691, pgoff = 136720384, inode = 0 }
+vm_state.vm_map: 23329.142683873 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2917122048, end = 2917515264, flags = 134217979, pgoff = 0, inode = 1572872 }
+vm_state.vm_map: 23329.142688967 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2925301760, end = 2934022144, flags = 1048691, pgoff = 2925301760, inode = 0 }
+vm_state.vm_map: 23329.142691249 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2937151488, end = 2955956224, flags = 1048691, pgoff = 2937151488, inode = 0 }
+vm_state.vm_map: 23329.142696215 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2958761984, end = 2960318464, flags = 1048691, pgoff = 2958761984, inode = 0 }
+vm_state.vm_map: 23329.142706984 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2965975040, end = 2966368256, flags = 134217979, pgoff = 0, inode = 1933319 }
+vm_state.vm_map: 23329.142715533 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2966368256, end = 2966761472, flags = 134217979, pgoff = 0, inode = 1867781 }
+vm_state.vm_map: 23329.142718278 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2966761472, end = 2967154688, flags = 134217979, pgoff = 0, inode = 262145 }
+vm_state.vm_map: 23329.142726568 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2967154688, end = 2967547904, flags = 134217979, pgoff = 0, inode = 229376 }
+vm_state.vm_map: 23329.142731373 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2967547904, end = 2976768000, flags = 1048691, pgoff = 2967547904, inode = 0 }
+vm_state.vm_map: 23329.142738658 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2986840064, end = 2988978176, flags = 134217845, pgoff = 0, inode = 222213 }
+vm_state.vm_map: 23329.142740829 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2988978176, end = 2989010944, flags = 135266419, pgoff = 2134016, inode = 222213 }
+vm_state.vm_map: 23329.142743036 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2989010944, end = 2990342144, flags = 1048691, pgoff = 2989010944, inode = 0 }
+vm_state.vm_map: 23329.142747811 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2990342144, end = 2990878720, flags = 134217845, pgoff = 0, inode = 117753 }
+vm_state.vm_map: 23329.142749970 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2990878720, end = 2990886912, flags = 135266419, pgoff = 532480, inode = 117753 }
+vm_state.vm_map: 23329.142752067 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2990886912, end = 2990903296, flags = 1048691, pgoff = 2990886912, inode = 0 }
+vm_state.vm_map: 23329.142754016 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2990997504, end = 2996879360, flags = 1048691, pgoff = 2990997504, inode = 0 }
+vm_state.vm_map: 23329.142756298 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2996879360, end = 2996965376, flags = 134217845, pgoff = 0, inode = 117751 }
+vm_state.vm_map: 23329.142758347 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2996965376, end = 2996973568, flags = 135266419, pgoff = 81920, inode = 117751 }
+vm_state.vm_map: 23329.142763089 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2996973568, end = 2998292480, flags = 134217845, pgoff = 0, inode = 117754 }
+vm_state.vm_map: 23329.142765242 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2998292480, end = 2998304768, flags = 135266419, pgoff = 1318912, inode = 117754 }
+vm_state.vm_map: 23329.142767629 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2998304768, end = 2998538240, flags = 1048691, pgoff = 2998304768, inode = 0 }
+vm_state.vm_map: 23329.142769812 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2998841344, end = 2999054336, flags = 1048691, pgoff = 3000135680, inode = 0 }
+vm_state.vm_map: 23329.142771829 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2999054336, end = 2999267328, flags = 1048691, pgoff = 3000135680, inode = 0 }
+vm_state.vm_map: 23329.142773920 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2999267328, end = 2999480320, flags = 1048691, pgoff = 3000135680, inode = 0 }
+vm_state.vm_map: 23329.142776042 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2999480320, end = 2999693312, flags = 1048691, pgoff = 3000135680, inode = 0 }
+vm_state.vm_map: 23329.142778096 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2999693312, end = 2999885824, flags = 1048691, pgoff = 3000201216, inode = 0 }
+vm_state.vm_map: 23329.142782729 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2999885824, end = 2999992320, flags = 134217845, pgoff = 0, inode = 115024 }
+vm_state.vm_map: 23329.142784776 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2999992320, end = 2999996416, flags = 135266419, pgoff = 106496, inode = 115024 }
+vm_state.vm_map: 23329.142786793 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 2999996416, end = 3000033280, flags = 1048691, pgoff = 2999996416, inode = 0 }
+vm_state.vm_map: 23329.142789396 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3000086528, end = 3000119296, flags = 134217845, pgoff = 0, inode = 117755 }
+vm_state.vm_map: 23329.142791438 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3000119296, end = 3000123392, flags = 135266419, pgoff = 28672, inode = 117755 }
+vm_state.vm_map: 23329.142793541 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3000123392, end = 3000127488, flags = 1048691, pgoff = 3000123392, inode = 0 }
+vm_state.vm_map: 23329.142795842 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3000336384, end = 3000483840, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.142797773 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3000483840, end = 3000492032, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.142803639 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3000537088, end = 3000549376, flags = 134217979, pgoff = 0, inode = 1900550 }
+vm_state.vm_map: 23329.142808857 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3000549376, end = 3000582144, flags = 134217845, pgoff = 0, inode = 255747 }
+vm_state.vm_map: 23329.142810899 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3000582144, end = 3000586240, flags = 135266419, pgoff = 32768, inode = 255747 }
+vm_state.vm_map: 23329.142813199 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3000586240, end = 3004780544, flags = 1074283707, pgoff = 4030726144, inode = 2925 }
+vm_state.vm_map: 23329.142818171 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3004780544, end = 3004788736, flags = 786683, pgoff = 4165799936, inode = 5935 }
+vm_state.vm_map: 23329.142822993 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3004788736, end = 3004854272, flags = 1074283771, pgoff = 655360, inode = 2164 }
+vm_state.vm_map: 23329.142825504 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3004854272, end = 3071963136, flags = 1074283707, pgoff = 3758096384, inode = 2915 }
+vm_state.vm_map: 23329.142827885 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3071963136, end = 3071987712, flags = 134217845, pgoff = 0, inode = 255468 }
+vm_state.vm_map: 23329.142829939 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3071987712, end = 3071991808, flags = 135266419, pgoff = 20480, inode = 255468 }
+vm_state.vm_map: 23329.142832468 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3071991808, end = 3072110592, flags = 134217845, pgoff = 0, inode = 255488 }
+vm_state.vm_map: 23329.142834528 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3072110592, end = 3072114688, flags = 135266419, pgoff = 118784, inode = 255488 }
+vm_state.vm_map: 23329.142836570 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3072114688, end = 3072376832, flags = 1074283771, pgoff = 786432, inode = 2164 }
+vm_state.vm_map: 23329.142838710 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3072376832, end = 3072507904, flags = 1074283771, pgoff = 655360, inode = 2164 }
+vm_state.vm_map: 23329.142841183 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3072507904, end = 3073495040, flags = 1048691, pgoff = 3072507904, inode = 0 }
+vm_state.vm_map: 23329.142846044 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073495040, end = 3073626112, flags = 134217845, pgoff = 0, inode = 255487 }
+vm_state.vm_map: 23329.142848079 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073626112, end = 3073634304, flags = 135266419, pgoff = 126976, inode = 255487 }
+vm_state.vm_map: 23329.142853088 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073634304, end = 3073830912, flags = 134217845, pgoff = 0, inode = 114819 }
+vm_state.vm_map: 23329.142855253 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073830912, end = 3073851392, flags = 135266419, pgoff = 192512, inode = 114819 }
+vm_state.vm_map: 23329.142857251 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073851392, end = 3073855488, flags = 1048691, pgoff = 3073851392, inode = 0 }
+vm_state.vm_map: 23329.142861970 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3073855488, end = 3074088960, flags = 134217845, pgoff = 0, inode = 114829 }
+vm_state.vm_map: 23329.142864117 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3074088960, end = 3074109440, flags = 135266419, pgoff = 229376, inode = 114829 }
+vm_state.vm_map: 23329.142866158 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3074109440, end = 3074113536, flags = 1048691, pgoff = 3074109440, inode = 0 }
+vm_state.vm_map: 23329.142873159 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3074113536, end = 3074146304, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 23329.142875195 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3074146304, end = 3074150400, flags = 135266419, pgoff = 32768, inode = 20716 }
+vm_state.vm_map: 23329.142877865 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3074150400, end = 3074170880, flags = 134217845, pgoff = 0, inode = 255490 }
+vm_state.vm_map: 23329.142879963 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3074170880, end = 3074174976, flags = 135266419, pgoff = 20480, inode = 255490 }
+vm_state.vm_map: 23329.142882319 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3074174976, end = 3074195456, flags = 134217845, pgoff = 0, inode = 255466 }
+vm_state.vm_map: 23329.142884348 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3074195456, end = 3074199552, flags = 135266419, pgoff = 16384, inode = 255466 }
+vm_state.vm_map: 23329.142886575 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3074199552, end = 3074228224, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.142891212 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3074228224, end = 3074240512, flags = 134217845, pgoff = 0, inode = 255477 }
+vm_state.vm_map: 23329.142893249 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3074240512, end = 3074244608, flags = 135266419, pgoff = 8192, inode = 255477 }
+vm_state.vm_map: 23329.142895660 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3074244608, end = 3074277376, flags = 134217845, pgoff = 0, inode = 255475 }
+vm_state.vm_map: 23329.142897696 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3074277376, end = 3074281472, flags = 135266419, pgoff = 28672, inode = 255475 }
+vm_state.vm_map: 23329.142902358 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3074281472, end = 3074396160, flags = 134217845, pgoff = 0, inode = 255476 }
+vm_state.vm_map: 23329.142904511 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3074396160, end = 3074404352, flags = 135266419, pgoff = 110592, inode = 255476 }
+vm_state.vm_map: 23329.142906881 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3074404352, end = 3074732032, flags = 134217845, pgoff = 0, inode = 255473 }
+vm_state.vm_map: 23329.142908884 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3074732032, end = 3074744320, flags = 135266419, pgoff = 323584, inode = 255473 }
+vm_state.vm_map: 23329.142910994 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3074744320, end = 3074752512, flags = 1048691, pgoff = 3074744320, inode = 0 }
+vm_state.vm_map: 23329.142913671 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3074752512, end = 3074764800, flags = 134217845, pgoff = 0, inode = 20765 }
+vm_state.vm_map: 23329.142915805 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3074764800, end = 3074768896, flags = 135266419, pgoff = 8192, inode = 20765 }
+vm_state.vm_map: 23329.142920616 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3074768896, end = 3074830336, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 23329.142922793 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3074830336, end = 3074834432, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 23329.142924847 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3074834432, end = 3074838528, flags = 1048691, pgoff = 3074834432, inode = 0 }
+vm_state.vm_map: 23329.142929467 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3074838528, end = 3075309568, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 23329.142931515 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3075309568, end = 3075325952, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 23329.142933680 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3075325952, end = 3075403776, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.142935864 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3075403776, end = 3075407872, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.142938251 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3075407872, end = 3076722688, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.142940410 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3076722688, end = 3076730880, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.142942624 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3076730880, end = 3076734976, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.142944629 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3076734976, end = 3076747264, flags = 1048691, pgoff = 3076734976, inode = 0 }
+vm_state.vm_map: 23329.142946936 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3076747264, end = 3076861952, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.142949495 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3076861952, end = 3076866048, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.142951654 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3076866048, end = 3076894720, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.142953758 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3076894720, end = 3076898816, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.142955947 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3076898816, end = 3076902912, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.142958167 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3076902912, end = 3077050368, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.142960302 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3077050368, end = 3077054464, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.142962331 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3077054464, end = 3077058560, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.142964471 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3077058560, end = 3077062656, flags = 1048691, pgoff = 3077058560, inode = 0 }
+vm_state.vm_map: 23329.142966797 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3077062656, end = 3077160960, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 23329.142968881 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3077160960, end = 3077165056, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 23329.142970898 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3077165056, end = 3077169152, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 23329.142973471 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3077169152, end = 3077263360, flags = 134217845, pgoff = 0, inode = 500176 }
+vm_state.vm_map: 23329.142975604 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3077263360, end = 3077267456, flags = 135266417, pgoff = 90112, inode = 500176 }
+vm_state.vm_map: 23329.142977831 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3077267456, end = 3077271552, flags = 135266419, pgoff = 94208, inode = 500176 }
+vm_state.vm_map: 23329.142980070 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3077271552, end = 3077734400, flags = 134217845, pgoff = 0, inode = 20061 }
+vm_state.vm_map: 23329.142982168 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3077734400, end = 3077746688, flags = 135266419, pgoff = 458752, inode = 20061 }
+vm_state.vm_map: 23329.142984573 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3077746688, end = 3077763072, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.142986689 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3077763072, end = 3077767168, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.142989014 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3077767168, end = 3077853184, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.142991111 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3077853184, end = 3077857280, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.143216321 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3077857280, end = 3077861376, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.143219146 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3077861376, end = 3077873664, flags = 1048691, pgoff = 3077861376, inode = 0 }
+vm_state.vm_map: 23329.143221385 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3077873664, end = 3078098944, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.143223470 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078098944, end = 3078103040, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.143225616 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078103040, end = 3078107136, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.143228244 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078107136, end = 3078168576, flags = 134217845, pgoff = 0, inode = 22552 }
+vm_state.vm_map: 23329.143230255 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078168576, end = 3078172672, flags = 135266419, pgoff = 57344, inode = 22552 }
+vm_state.vm_map: 23329.143232783 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078172672, end = 3078529024, flags = 134217845, pgoff = 0, inode = 1065307 }
+vm_state.vm_map: 23329.143234856 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078529024, end = 3078537216, flags = 135266419, pgoff = 356352, inode = 1065307 }
+vm_state.vm_map: 23329.143332337 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078537216, end = 3078557696, flags = 134217845, pgoff = 0, inode = 18616 }
+vm_state.vm_map: 23329.143334638 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078557696, end = 3078561792, flags = 135266419, pgoff = 20480, inode = 18616 }
+vm_state.vm_map: 23329.143336932 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078561792, end = 3078569984, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.143339448 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078569984, end = 3078574080, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.143341940 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078574080, end = 3078791168, flags = 134217845, pgoff = 0, inode = 22624 }
+vm_state.vm_map: 23329.143344038 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078791168, end = 3078799360, flags = 135266419, pgoff = 212992, inode = 22624 }
+vm_state.vm_map: 23329.143346160 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078799360, end = 3078803456, flags = 1048691, pgoff = 3078799360, inode = 0 }
+vm_state.vm_map: 23329.143348442 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078803456, end = 3078811648, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.143350637 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078811648, end = 3078815744, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.143352691 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078815744, end = 3078819840, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.143355084 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078819840, end = 3078844416, flags = 134217845, pgoff = 0, inode = 1065108 }
+vm_state.vm_map: 23329.143357076 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078844416, end = 3078848512, flags = 135266419, pgoff = 20480, inode = 1065108 }
+vm_state.vm_map: 23329.143359618 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078868992, end = 3078893568, flags = 134217845, pgoff = 0, inode = 255472 }
+vm_state.vm_map: 23329.143361777 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078893568, end = 3078897664, flags = 135266419, pgoff = 20480, inode = 255472 }
+vm_state.vm_map: 23329.143367766 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078897664, end = 3078914048, flags = 134217845, pgoff = 0, inode = 255474 }
+vm_state.vm_map: 23329.143369814 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078914048, end = 3078918144, flags = 135266419, pgoff = 12288, inode = 255474 }
+vm_state.vm_map: 23329.143372201 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078918144, end = 3078934528, flags = 134217845, pgoff = 0, inode = 255731 }
+vm_state.vm_map: 23329.143374261 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078934528, end = 3078938624, flags = 135266419, pgoff = 12288, inode = 255731 }
+vm_state.vm_map: 23329.143432617 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078938624, end = 3078950912, flags = 1048691, pgoff = 3078938624, inode = 0 }
+vm_state.vm_map: 23329.143435004 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078950912, end = 3078955008, flags = 67371125, pgoff = 3078950912, inode = 0 }
+vm_state.vm_map: 23329.143437249 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3078955008, end = 3079069696, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.143439390 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3079069696, end = 3079073792, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.143441456 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3079073792, end = 3079077888, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.143443535 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1989, start = 3215933440, end = 3216019456, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.143446415 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 134512640, end = 134647808, flags = 134223989, pgoff = 0, inode = 23928 }
+vm_state.vm_map: 23329.143448568 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 134647808, end = 134651904, flags = 135272563, pgoff = 135168, inode = 23928 }
+vm_state.vm_map: 23329.143450733 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 134651904, end = 134656000, flags = 1048691, pgoff = 134651904, inode = 0 }
+vm_state.vm_map: 23329.143452805 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 136007680, end = 136204288, flags = 1048691, pgoff = 136007680, inode = 0 }
+vm_state.vm_map: 23329.143455180 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3075432448, end = 3075530752, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 23329.143457370 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3075530752, end = 3075534848, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 23329.143459560 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3075534848, end = 3075538944, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 23329.143461817 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3075538944, end = 3075575808, flags = 134217845, pgoff = 0, inode = 508391 }
+vm_state.vm_map: 23329.143463797 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3075575808, end = 3075579904, flags = 135266417, pgoff = 32768, inode = 508391 }
+vm_state.vm_map: 23329.143465765 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3075579904, end = 3075584000, flags = 135266419, pgoff = 36864, inode = 508391 }
+vm_state.vm_map: 23329.143468368 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3075584000, end = 3075743744, flags = 1048691, pgoff = 3075584000, inode = 0 }
+vm_state.vm_map: 23329.143474079 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3075825664, end = 3075833856, flags = 134217845, pgoff = 0, inode = 499908 }
+vm_state.vm_map: 23329.143476220 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3075833856, end = 3075837952, flags = 135266419, pgoff = 4096, inode = 499908 }
+vm_state.vm_map: 23329.143481426 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3075837952, end = 3075887104, flags = 134217845, pgoff = 0, inode = 500088 }
+vm_state.vm_map: 23329.143483590 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3075887104, end = 3075891200, flags = 135266419, pgoff = 45056, inode = 500088 }
+vm_state.vm_map: 23329.143485601 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3075891200, end = 3075940352, flags = 1048691, pgoff = 3075891200, inode = 0 }
+vm_state.vm_map: 23329.143487883 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3075940352, end = 3075981312, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.143489992 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3075981312, end = 3075985408, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.143491992 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3075985408, end = 3075989504, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.143494193 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3075989504, end = 3076026368, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.143496376 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076026368, end = 3076030464, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.143498375 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076030464, end = 3076034560, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.143500602 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076034560, end = 3076112384, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.143502822 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076112384, end = 3076116480, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.143505222 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076116480, end = 3076120576, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.143507331 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076120576, end = 3076128768, flags = 1048691, pgoff = 3076120576, inode = 0 }
+vm_state.vm_map: 23329.143509570 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076128768, end = 3076153344, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.143511667 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076153344, end = 3076157440, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.143513635 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076157440, end = 3076161536, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.143516071 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076161536, end = 3076177920, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 23329.143518360 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076177920, end = 3076182016, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 23329.143520500 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076182016, end = 3076218880, flags = 134217845, pgoff = 0, inode = 499730 }
+vm_state.vm_map: 23329.143522517 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076218880, end = 3076222976, flags = 135266419, pgoff = 32768, inode = 499730 }
+vm_state.vm_map: 23329.143524991 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076222976, end = 3076239360, flags = 134217845, pgoff = 0, inode = 500096 }
+vm_state.vm_map: 23329.143526971 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076239360, end = 3076243456, flags = 135266419, pgoff = 12288, inode = 500096 }
+vm_state.vm_map: 23329.143529043 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076243456, end = 3076247552, flags = 134217845, pgoff = 0, inode = 500082 }
+vm_state.vm_map: 23329.143530986 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076247552, end = 3076251648, flags = 135266419, pgoff = 0, inode = 500082 }
+vm_state.vm_map: 23329.143533182 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076251648, end = 3076255744, flags = 134217845, pgoff = 0, inode = 499797 }
+vm_state.vm_map: 23329.143535119 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076255744, end = 3076259840, flags = 135266419, pgoff = 0, inode = 499797 }
+vm_state.vm_map: 23329.143537346 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076259840, end = 3076272128, flags = 134217845, pgoff = 0, inode = 500089 }
+vm_state.vm_map: 23329.143539714 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076272128, end = 3076276224, flags = 135266419, pgoff = 8192, inode = 500089 }
+vm_state.vm_map: 23329.143541811 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076276224, end = 3076284416, flags = 1048691, pgoff = 3076276224, inode = 0 }
+vm_state.vm_map: 23329.143543970 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076284416, end = 3076313088, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.143546018 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076313088, end = 3076317184, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.143547955 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076317184, end = 3076321280, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.143550268 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076321280, end = 3076407296, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.143552365 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076407296, end = 3076411392, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.143554301 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076411392, end = 3076415488, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.143610770 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076415488, end = 3076423680, flags = 1048691, pgoff = 3076415488, inode = 0 }
+vm_state.vm_map: 23329.143613953 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076423680, end = 3076431872, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.143616013 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076431872, end = 3076435968, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.143618117 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076435968, end = 3076440064, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.143620331 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076440064, end = 3076444160, flags = 1048691, pgoff = 3076440064, inode = 0 }
+vm_state.vm_map: 23329.143622576 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076444160, end = 3076542464, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.143624778 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076542464, end = 3076546560, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.143626937 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3076546560, end = 3077861376, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.143629422 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3077861376, end = 3077869568, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.143631476 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3077869568, end = 3077873664, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.143633666 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3077873664, end = 3077885952, flags = 1048691, pgoff = 3077873664, inode = 0 }
+vm_state.vm_map: 23329.143635912 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3077885952, end = 3078111232, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.143637903 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3078111232, end = 3078115328, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.143640205 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3078115328, end = 3078119424, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.143642278 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3078119424, end = 3078127616, flags = 134217845, pgoff = 0, inode = 17167 }
+vm_state.vm_map: 23329.143644355 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3078127616, end = 3078131712, flags = 135266419, pgoff = 8192, inode = 17167 }
+vm_state.vm_map: 23329.143646576 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3078131712, end = 3078172672, flags = 134217845, pgoff = 0, inode = 499738 }
+vm_state.vm_map: 23329.143648778 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3078172672, end = 3078176768, flags = 135266419, pgoff = 40960, inode = 499738 }
+vm_state.vm_map: 23329.143650943 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3078176768, end = 3078193152, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.143653052 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3078193152, end = 3078197248, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.143655199 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3078197248, end = 3078201344, flags = 1048691, pgoff = 3078197248, inode = 0 }
+vm_state.vm_map: 23329.143657321 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3078201344, end = 3078209536, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.143659436 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3078209536, end = 3078213632, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.143661694 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3078213632, end = 3079364608, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.143664241 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3079364608, end = 3079380992, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.143670015 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3079385088, end = 3079389184, flags = 134217845, pgoff = 0, inode = 500093 }
+vm_state.vm_map: 23329.143672168 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3079389184, end = 3079393280, flags = 135266419, pgoff = 0, inode = 500093 }
+vm_state.vm_map: 23329.143674678 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3079397376, end = 3079430144, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 23329.143676843 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3079430144, end = 3079434240, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 23329.143679273 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3079434240, end = 3079467008, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 23329.143681377 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3079467008, end = 3079471104, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 23329.143683431 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3079471104, end = 3079483392, flags = 1048691, pgoff = 3079471104, inode = 0 }
+vm_state.vm_map: 23329.143685645 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3079483392, end = 3079487488, flags = 67371125, pgoff = 3079483392, inode = 0 }
+vm_state.vm_map: 23329.143687829 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3079487488, end = 3079602176, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.143689938 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3079602176, end = 3079606272, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.143691974 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3079606272, end = 3079610368, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.143694083 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 1993, start = 3212898304, end = 3212984320, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.143699653 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 134512640, end = 134533120, flags = 134223989, pgoff = 0, inode = 20943 }
+vm_state.vm_map: 23329.143702065 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 134533120, end = 134537216, flags = 135272563, pgoff = 16384, inode = 20943 }
+vm_state.vm_map: 23329.143704162 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 145100800, end = 145235968, flags = 1048691, pgoff = 145100800, inode = 0 }
+vm_state.vm_map: 23329.143706480 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3075481600, end = 3075522560, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.143708509 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3075522560, end = 3075526656, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.143710756 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3075526656, end = 3075530752, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.143712927 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3075530752, end = 3075567616, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.143714938 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3075567616, end = 3075571712, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.143717367 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3075571712, end = 3075575808, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.143719544 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3075575808, end = 3075653632, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.143721598 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3075653632, end = 3075657728, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.143723658 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3075657728, end = 3075661824, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.143725762 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3075661824, end = 3075670016, flags = 1048691, pgoff = 3075661824, inode = 0 }
+vm_state.vm_map: 23329.143728075 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3075670016, end = 3075694592, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.143730228 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3075694592, end = 3075698688, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.143732294 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3075698688, end = 3075702784, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.143734299 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3075702784, end = 3075710976, flags = 1048691, pgoff = 3075702784, inode = 0 }
+vm_state.vm_map: 23329.143737025 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3075710976, end = 3075727360, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.143739085 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3075727360, end = 3075731456, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.143741324 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3075731456, end = 3075739648, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.143796164 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3075739648, end = 3075743744, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.143798903 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3075743744, end = 3075751936, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.143800963 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3075751936, end = 3075756032, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.143803060 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3075756032, end = 3075760128, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.143805256 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3075760128, end = 3075858432, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.143807329 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3075858432, end = 3075862528, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.143809555 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3075862528, end = 3077177344, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.143811603 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3077177344, end = 3077185536, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.143813873 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3077185536, end = 3077189632, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.143816038 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3077189632, end = 3077206016, flags = 1048691, pgoff = 3077189632, inode = 0 }
+vm_state.vm_map: 23329.143818271 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3077206016, end = 3077292032, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.143820424 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3077292032, end = 3077296128, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.143822718 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3077296128, end = 3077300224, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.143825297 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3077300224, end = 3077308416, flags = 1048691, pgoff = 3077300224, inode = 0 }
+vm_state.vm_map: 23329.143827493 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3077308416, end = 3078459392, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.143829466 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3078459392, end = 3078475776, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.143831638 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3078569984, end = 3078578176, flags = 1048691, pgoff = 3078569984, inode = 0 }
+vm_state.vm_map: 23329.143833729 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3078578176, end = 3078582272, flags = 67371125, pgoff = 3078578176, inode = 0 }
+vm_state.vm_map: 23329.143835875 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3078582272, end = 3078696960, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.143837978 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3078696960, end = 3078701056, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.143840131 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3078701056, end = 3078705152, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.143842228 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2001, start = 3216130048, end = 3216216064, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.143845220 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3076358144, end = 3076399104, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.143847286 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3076399104, end = 3076403200, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.143849285 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3076403200, end = 3076407296, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.143851592 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3076407296, end = 3076444160, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.143853639 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3076444160, end = 3076448256, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.143855724 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3076448256, end = 3076452352, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.143858161 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3076452352, end = 3076530176, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.143860578 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3076530176, end = 3076534272, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.143862620 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3076534272, end = 3076538368, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.143864809 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3076538368, end = 3076546560, flags = 1048691, pgoff = 3076538368, inode = 0 }
+vm_state.vm_map: 23329.143866907 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3076546560, end = 3076571136, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.143868980 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3076571136, end = 3076575232, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.143871156 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3076575232, end = 3076579328, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.143873148 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3076579328, end = 3076587520, flags = 1048691, pgoff = 3076579328, inode = 0 }
+vm_state.vm_map: 23329.143875276 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3076587520, end = 3076595712, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.143877380 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3076595712, end = 3076599808, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.143879366 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3076599808, end = 3076603904, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.143881469 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3076603904, end = 3077918720, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.143883653 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3077918720, end = 3077926912, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.143885657 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3077926912, end = 3077931008, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.143887662 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3077931008, end = 3077943296, flags = 1048691, pgoff = 3077931008, inode = 0 }
+vm_state.vm_map: 23329.143889926 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3077943296, end = 3077971968, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.143892078 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3077971968, end = 3077976064, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.143894385 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3077976064, end = 3077980160, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.143896698 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3077980160, end = 3078066176, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.143898678 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3078066176, end = 3078070272, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.143900782 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3078070272, end = 3078074368, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.143902891 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3078074368, end = 3078086656, flags = 1048691, pgoff = 3078074368, inode = 0 }
+vm_state.vm_map: 23329.143905019 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3078086656, end = 3078184960, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 23329.143906968 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3078184960, end = 3078189056, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 23329.143908955 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3078189056, end = 3078193152, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 23329.143911262 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3078193152, end = 3078340608, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.143913211 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3078340608, end = 3078348800, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.143915146 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3078443008, end = 3078451200, flags = 1048691, pgoff = 3078443008, inode = 0 }
+vm_state.vm_map: 23329.143917078 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3078451200, end = 3078455296, flags = 67371125, pgoff = 3078451200, inode = 0 }
+vm_state.vm_map: 23329.143919274 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3078455296, end = 3078569984, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.143921272 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3078569984, end = 3078574080, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.143923271 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3078574080, end = 3078578176, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.143925516 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3078578176, end = 3078868992, flags = 134223989, pgoff = 0, inode = 20940 }
+vm_state.vm_map: 23329.143927903 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3078868992, end = 3078873088, flags = 135272561, pgoff = 286720, inode = 20940 }
+vm_state.vm_map: 23329.143929870 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3078873088, end = 3078877184, flags = 135272563, pgoff = 290816, inode = 20940 }
+vm_state.vm_map: 23329.143931795 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3097956352, end = 3098091520, flags = 1048691, pgoff = 3097956352, inode = 0 }
+vm_state.vm_map: 23329.143933725 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2002, start = 3216900096, end = 3216986112, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.143939691 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2015, start = 134512640, end = 135303168, flags = 134223989, pgoff = 0, inode = 1048715 }
+vm_state.vm_map: 23329.143941818 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2015, start = 135303168, end = 135323648, flags = 135272563, pgoff = 790528, inode = 1048715 }
+vm_state.vm_map: 23329.143946728 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2015, start = 135323648, end = 135344128, flags = 1048691, pgoff = 135323648, inode = 0 }
+vm_state.vm_map: 23329.143951230 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2015, start = 148566016, end = 148631552, flags = 1048691, pgoff = 148566016, inode = 0 }
+vm_state.vm_map: 23329.143953525 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2015, start = 3075379200, end = 3076710400, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.143955585 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2015, start = 3076710400, end = 3076714496, flags = 1048691, pgoff = 3076710400, inode = 0 }
+vm_state.vm_map: 23329.143957725 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2015, start = 3076714496, end = 3078029312, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.144013904 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2015, start = 3078029312, end = 3078037504, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.144016279 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2015, start = 3078037504, end = 3078041600, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.144018937 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2015, start = 3078041600, end = 3078057984, flags = 1048691, pgoff = 3078041600, inode = 0 }
+vm_state.vm_map: 23329.144021232 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2015, start = 3078057984, end = 3078066176, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.144023397 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2015, start = 3078066176, end = 3078070272, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.144025556 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2015, start = 3078070272, end = 3078074368, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.144027820 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2015, start = 3078074368, end = 3078291456, flags = 134217845, pgoff = 0, inode = 499784 }
+vm_state.vm_map: 23329.144029985 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2015, start = 3078291456, end = 3078303744, flags = 135266419, pgoff = 217088, inode = 499784 }
+vm_state.vm_map: 23329.144032310 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2015, start = 3078369280, end = 3078397952, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.144034419 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2015, start = 3078397952, end = 3078406144, flags = 1048691, pgoff = 3078397952, inode = 0 }
+vm_state.vm_map: 23329.144036486 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2015, start = 3078406144, end = 3078410240, flags = 67371125, pgoff = 3078406144, inode = 0 }
+vm_state.vm_map: 23329.144038799 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2015, start = 3078410240, end = 3078524928, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.144040902 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2015, start = 3078524928, end = 3078529024, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.144043104 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2015, start = 3078529024, end = 3078533120, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.144045208 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2015, start = 3220008960, end = 3220094976, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.144054071 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 134512640, end = 135151616, flags = 134223989, pgoff = 0, inode = 114742 }
+vm_state.vm_map: 23329.144056594 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 135151616, end = 135163904, flags = 135272563, pgoff = 638976, inode = 114742 }
+vm_state.vm_map: 23329.144061430 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 135163904, end = 135200768, flags = 1048691, pgoff = 135163904, inode = 0 }
+vm_state.vm_map: 23329.144063576 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 136486912, end = 136749056, flags = 1048691, pgoff = 136486912, inode = 0 }
+vm_state.vm_map: 23329.144065643 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3073282048, end = 3073286144, flags = 1048688, pgoff = 3073282048, inode = 0 }
+vm_state.vm_map: 23329.144067870 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3073286144, end = 3073810432, flags = 1048691, pgoff = 3073286144, inode = 0 }
+vm_state.vm_map: 23329.144070090 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3073810432, end = 3075141632, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.144072187 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3075141632, end = 3075145728, flags = 1048688, pgoff = 3075141632, inode = 0 }
+vm_state.vm_map: 23329.144074334 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3075145728, end = 3075284992, flags = 1048691, pgoff = 3075145728, inode = 0 }
+vm_state.vm_map: 23329.144079465 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3075284992, end = 3075297280, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 23329.144081612 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3075297280, end = 3075301376, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 23329.144083894 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3075301376, end = 3075317760, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.144085837 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3075317760, end = 3075321856, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.144088205 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3075321856, end = 3075330048, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.144090364 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3075330048, end = 3075334144, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.144092801 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3075334144, end = 3075338240, flags = 1048691, pgoff = 3075334144, inode = 0 }
+vm_state.vm_map: 23329.144097618 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3075338240, end = 3075424256, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 23329.144099770 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3075424256, end = 3075428352, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 23329.144101812 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3075428352, end = 3075436544, flags = 1048691, pgoff = 3075428352, inode = 0 }
+vm_state.vm_map: 23329.144104273 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3075436544, end = 3075465216, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 23329.144106315 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3075465216, end = 3075469312, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 23329.144108659 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3075469312, end = 3075567616, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.144110719 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3075567616, end = 3075571712, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.144112964 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3075571712, end = 3076886528, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.144115000 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3076886528, end = 3076894720, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.144117220 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3076894720, end = 3076898816, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.144172153 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3076898816, end = 3076911104, flags = 1048691, pgoff = 3076898816, inode = 0 }
+vm_state.vm_map: 23329.144175218 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3076911104, end = 3077025792, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.144177297 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3077025792, end = 3077029888, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.144179542 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3077029888, end = 3077033984, flags = 1048691, pgoff = 3077029888, inode = 0 }
+vm_state.vm_map: 23329.144182337 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3077033984, end = 3077181440, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.144184489 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3077181440, end = 3077185536, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.144186654 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3077185536, end = 3077189632, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.144188838 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3077189632, end = 3077218304, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.144191046 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3077218304, end = 3077222400, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.144193100 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3077222400, end = 3077226496, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.144195413 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3077226496, end = 3077312512, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.144197658 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3077312512, end = 3077316608, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.144199823 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3077316608, end = 3077320704, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.144201902 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3077320704, end = 3077328896, flags = 1048691, pgoff = 3077320704, inode = 0 }
+vm_state.vm_map: 23329.144204425 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3077328896, end = 3077414912, flags = 134217845, pgoff = 0, inode = 18950 }
+vm_state.vm_map: 23329.144206429 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3077414912, end = 3077419008, flags = 135266419, pgoff = 86016, inode = 18950 }
+vm_state.vm_map: 23329.144208989 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3077419008, end = 3077472256, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 23329.144210982 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3077472256, end = 3077476352, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 23329.144213307 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3077476352, end = 3077795840, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 23329.144215429 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3077795840, end = 3077812224, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 23329.144217742 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3077812224, end = 3077816320, flags = 1048691, pgoff = 3077812224, inode = 0 }
+vm_state.vm_map: 23329.144219938 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3077816320, end = 3078967296, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.144222312 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3078967296, end = 3078983680, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.144224680 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3078983680, end = 3078991872, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.144226857 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3078991872, end = 3078995968, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.144228930 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3078995968, end = 3079000064, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.144231349 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3079045120, end = 3079061504, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 23329.144233415 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3079061504, end = 3079065600, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 23329.144235536 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3079065600, end = 3079094272, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.144237738 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3079094272, end = 3079102464, flags = 1048691, pgoff = 3079094272, inode = 0 }
+vm_state.vm_map: 23329.144239798 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3079102464, end = 3079106560, flags = 67371125, pgoff = 3079102464, inode = 0 }
+vm_state.vm_map: 23329.144242062 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3079106560, end = 3079221248, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.144244073 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3079221248, end = 3079225344, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.144246182 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3079225344, end = 3079229440, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.144264415 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2086, start = 3219668992, end = 3219755008, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.144267364 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 134512640, end = 135151616, flags = 134223989, pgoff = 0, inode = 114742 }
+vm_state.vm_map: 23329.144269868 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 135151616, end = 135163904, flags = 135272563, pgoff = 638976, inode = 114742 }
+vm_state.vm_map: 23329.144271941 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 135163904, end = 135200768, flags = 1048691, pgoff = 135163904, inode = 0 }
+vm_state.vm_map: 23329.144274050 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 154562560, end = 154828800, flags = 1048691, pgoff = 154562560, inode = 0 }
+vm_state.vm_map: 23329.144276240 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3072638976, end = 3072643072, flags = 1048688, pgoff = 3072638976, inode = 0 }
+vm_state.vm_map: 23329.144278497 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3072643072, end = 3073167360, flags = 1048691, pgoff = 3072643072, inode = 0 }
+vm_state.vm_map: 23329.144280712 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3073167360, end = 3073200128, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 23329.144282938 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3073200128, end = 3073204224, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 23329.144285233 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3073298432, end = 3074629632, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.144287298 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3074629632, end = 3074633728, flags = 1048688, pgoff = 3074629632, inode = 0 }
+vm_state.vm_map: 23329.144289532 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3074633728, end = 3074772992, flags = 1048691, pgoff = 3074633728, inode = 0 }
+vm_state.vm_map: 23329.144291685 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3074772992, end = 3074785280, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 23329.144293955 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3074785280, end = 3074789376, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 23329.144296188 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3074789376, end = 3074805760, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.144298272 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3074805760, end = 3074809856, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.144300357 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3074809856, end = 3074818048, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.144302658 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3074818048, end = 3074822144, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.144304990 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3074822144, end = 3074826240, flags = 1048691, pgoff = 3074822144, inode = 0 }
+vm_state.vm_map: 23329.144307129 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3074826240, end = 3074912256, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 23329.144309338 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3074912256, end = 3074916352, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 23329.144311385 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3074916352, end = 3074924544, flags = 1048691, pgoff = 3074916352, inode = 0 }
+vm_state.vm_map: 23329.144313631 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3074924544, end = 3074953216, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 23329.144315635 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3074953216, end = 3074957312, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 23329.144317862 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3074957312, end = 3075055616, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.144319879 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3075055616, end = 3075059712, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.144322124 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3075059712, end = 3076374528, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.144324184 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3076374528, end = 3076382720, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.144326164 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3076382720, end = 3076386816, flags = 135266419, pgoff = 1323008, inode = 508370 }
+kernel.irq_entry: 23329.144563958 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { ip = 3242333838, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_update_time: 23329.144633201 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { jiffies = 4297269585, xtime_sec = 1264196274, xtime_nsec = 637522004, walltomonotonic_sec = -1264172952, walltomonotonic_nsec = 189579727 }
+kernel.softirq_raise: 23329.144647881 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { softirq_id = 1 [softirq 1] }
+kernel.softirq_raise: 23329.144655067 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { softirq_id = 9 [softirq 9] }
+kernel.irq_exit: 23329.144680171 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.softirq_entry: 23329.144683859 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, SOFTIRQ { softirq_id = 1 [softirq 1] }
+kernel.timer_set: 23329.144694956 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, SOFTIRQ { expires = 2302290, function = 0xc141d458, data = 0 }
+kernel.timer_set: 23329.144699779 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, SOFTIRQ { expires = 2302290, function = 0xc14b0234, data = 0 }
+kernel.softirq_exit: 23329.144703647 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { softirq_id = 1 [softirq 1] }
+kernel.softirq_entry: 23329.144705158 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, SOFTIRQ { softirq_id = 9 [softirq 9] }
+rcu.tree_callback: 23329.144756322 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16927, 16927, lttctl, , 16908, 0x0, SOFTIRQ { func = 0xc10b8ec2 }
+kernel.softirq_exit: 23329.144760936 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { softirq_id = 9 [softirq 9] }
+kernel.sched_schedule: 23329.144771779 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { prev_pid = 16927, next_pid = 1989, prev_state = 0 }
+kernel.syscall_entry: 23329.147838831 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+kernel.sched_try_wakeup: 23329.147874547 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pid = 2336, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 23329.147890284 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { prev_pid = 1989, next_pid = 2336, prev_state = 0 }
+fs.pollfd: 23329.148230962 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 23329.148242283 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { prev_pid = 2336, next_pid = 1989, prev_state = 1 }
+kernel.sched_try_wakeup: 23329.148417919 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pid = 2336, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 23329.148426084 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { prev_pid = 1989, next_pid = 2336, prev_state = 0 }
+fs.pollfd: 23329.148953151 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 23329.148984551 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { prev_pid = 2336, next_pid = 1989, prev_state = 1 }
+fs.read: 23329.149130932 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 4096, fd = 48 }
+kernel.syscall_exit: 23329.149133146 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 2908 }
+kernel.irq_entry: 23329.154523965 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, IRQ { ip = 3242336307, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_update_time: 23329.154551098 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, IRQ { jiffies = 4297269586, xtime_sec = 1264196274, xtime_nsec = 637522005, walltomonotonic_sec = -1264172952, walltomonotonic_nsec = 189579727 }
+kernel.softirq_raise: 23329.154571793 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, IRQ { softirq_id = 1 [softirq 1] }
+kernel.irq_exit: 23329.154613281 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.softirq_entry: 23329.154618227 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SOFTIRQ { softirq_id = 1 [softirq 1] }
+kernel.timer_set: 23329.154637818 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SOFTIRQ { expires = 2302291, function = 0xc141d458, data = 0 }
+kernel.softirq_exit: 23329.154643158 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { softirq_id = 1 [softirq 1] }
+kernel.syscall_entry: 23329.154648153 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+kernel.sched_schedule: 23329.154659777 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { prev_pid = 1989, next_pid = 16927, prev_state = 0 }
+kernel.irq_entry: 23329.155455262 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { ip = 3238156110, handler = 0xf8a23c7f, irq_id = 14, kernel_mode = 1 }
+block.rq_complete_fs: 23329.155985721 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { hard_sector = 47530430, rw = 0, errors = 0 }
+kernel.sched_try_wakeup: 23329.156020518 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { pid = 16834, cpu_id = 0, state = 2 }
+kernel.timer_set: 23329.156044877 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { expires = 2302291, function = 0xc141b0a5, data = 4136835584 }
+kernel.irq_exit: 23329.156056433 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.sched_schedule: 23329.156070727 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { prev_pid = 16927, next_pid = 16834, prev_state = 0 }
+fs.buffer_wait_end: 23329.156147143 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { bh = 0xe9709128 }
+fs.write: 23329.156215153 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { count = 68, fd = 6 }
+kernel.syscall_exit: 23329.156217502 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 68 }
+kernel.syscall_entry: 23329.156258862 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 4 [syscall 4] }
+mm.add_to_page_cache: 23329.156284965 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { inode = 0, sdev = 2 }
+block.remap: 23329.156319874 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { device_from = 3145728, sector_from = 36176184, device_to = 3145730, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 100, not_uptodate = 0 }
+block.bio_queue: 23329.156323814 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { sector = 39100014, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 100, not_uptodate = 0 }
+block.getrq_bio: 23329.156338053 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { sector = 39100014, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 100, not_uptodate = 0 }
+kernel.timer_set: 23329.156343998 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { expires = 2302291, function = 0xc1410312, data = 4147888232 }
+block.plug: 23329.156347889 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL
+block.rq_insert_fs: 23329.156353642 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { hard_sector = 39100014, rw = 0, errors = 0 }
+fs.buffer_wait_start: 23329.156364735 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { bh = 0xf6e0a358 }
+block.unplug_io: 23329.156371026 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { pdu = 1 }
+block.rq_issue_fs: 23329.156383833 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { hard_sector = 39100014, rw = 0, errors = 0 }
+kernel.timer_set: 23329.156404016 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { expires = 2302291, function = 0xc14b0234, data = 0 }
+kernel.timer_set: 23329.156426654 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { expires = 2304290, function = 0xf8a23e85, data = 4136733696 }
+kernel.sched_schedule: 23329.156501010 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { prev_pid = 16834, next_pid = 16927, prev_state = 2 }
+kernel.irq_entry: 23329.156675307 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { ip = 3238156110, handler = 0xf8a23c7f, irq_id = 14, kernel_mode = 1 }
+block.rq_complete_fs: 23329.156692327 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { hard_sector = 39100014, rw = 0, errors = 0 }
+kernel.sched_try_wakeup: 23329.156702003 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { pid = 16834, cpu_id = 0, state = 2 }
+kernel.irq_exit: 23329.156715421 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.sched_schedule: 23329.156729137 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { prev_pid = 16927, next_pid = 16834, prev_state = 0 }
+kernel.irq_entry: 23329.156797832 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, IRQ { ip = 3238156110, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_itimer_expired: 23329.156805614 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, IRQ { pid = 1989 }
+kernel.send_signal: 23329.156815381 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, IRQ { pid = 1989, signal = 14 }
+kernel.irq_exit: 23329.156834886 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { handled = 1 }
+fs.buffer_wait_end: 23329.156840449 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { bh = 0xf6e0a358 }
+mm.add_to_page_cache: 23329.156851678 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { inode = 1131091, sdev = 3145730 }
+mm.add_to_page_cache: 23329.156864794 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { inode = 0, sdev = 2 }
+block.remap: 23329.156870616 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { device_from = 3145728, sector_from = 38160168, device_to = 3145730, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_queue: 23329.156873668 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { sector = 41083998, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.getrq_bio: 23329.156879501 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { sector = 41083998, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+kernel.timer_set: 23329.156883627 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { expires = 2302291, function = 0xc1410312, data = 4147888232 }
+block.plug: 23329.156886913 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL
+block.rq_insert_fs: 23329.156890842 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { hard_sector = 41083998, rw = 0, errors = 0 }
+fs.buffer_wait_start: 23329.156896539 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { bh = 0xf6e0a2b0 }
+block.unplug_io: 23329.156898704 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { pdu = 1 }
+block.rq_issue_fs: 23329.156905265 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { hard_sector = 41083998, rw = 0, errors = 0 }
+kernel.timer_set: 23329.156937880 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { expires = 2304290, function = 0xf8a23e85, data = 4136733696 }
+kernel.sched_schedule: 23329.156992325 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { prev_pid = 16834, next_pid = 16927, prev_state = 2 }
+vm_state.vm_map: 23329.157104142 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3076386816, end = 3076399104, flags = 1048691, pgoff = 3076386816, inode = 0 }
+vm_state.vm_map: 23329.157107830 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3076399104, end = 3076513792, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.157110081 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3076513792, end = 3076517888, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.157112288 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3076517888, end = 3076521984, flags = 1048691, pgoff = 3076517888, inode = 0 }
+vm_state.vm_map: 23329.157115101 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3076521984, end = 3076669440, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.157117635 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3076669440, end = 3076673536, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.157119849 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3076673536, end = 3076677632, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.157122605 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3076677632, end = 3076706304, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.157124708 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3076706304, end = 3076710400, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.157127051 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3076710400, end = 3076714496, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.157129746 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3076714496, end = 3076800512, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.157132096 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3076800512, end = 3076804608, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.157134260 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3076804608, end = 3076808704, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.157136443 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3076808704, end = 3076816896, flags = 1048691, pgoff = 3076808704, inode = 0 }
+vm_state.vm_map: 23329.157139255 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3076816896, end = 3076902912, flags = 134217845, pgoff = 0, inode = 18950 }
+vm_state.vm_map: 23329.157141352 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3076902912, end = 3076907008, flags = 135266419, pgoff = 86016, inode = 18950 }
+vm_state.vm_map: 23329.157143794 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3076907008, end = 3076960256, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 23329.157146094 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3076960256, end = 3076964352, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 23329.157148505 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3076964352, end = 3077283840, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 23329.157150577 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3077283840, end = 3077300224, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 23329.157152883 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3077300224, end = 3077304320, flags = 1048691, pgoff = 3077300224, inode = 0 }
+vm_state.vm_map: 23329.157155788 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3077304320, end = 3078455296, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.157157743 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3078455296, end = 3078471680, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.157160259 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3078471680, end = 3078479872, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.157162195 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3078479872, end = 3078483968, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.157164544 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3078483968, end = 3078488064, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.157171160 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3078496256, end = 3078512640, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 23329.157173381 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3078512640, end = 3078516736, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 23329.157175823 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3078516736, end = 3078549504, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 23329.157178136 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3078549504, end = 3078553600, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 23329.157180607 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3078553600, end = 3078582272, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.157182563 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3078582272, end = 3078590464, flags = 1048691, pgoff = 3078582272, inode = 0 }
+vm_state.vm_map: 23329.157184634 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3078590464, end = 3078594560, flags = 67371125, pgoff = 3078590464, inode = 0 }
+vm_state.vm_map: 23329.157187298 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3078594560, end = 3078709248, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.157189463 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3078709248, end = 3078713344, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.157191573 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3078713344, end = 3078717440, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.157194026 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2095, start = 3214987264, end = 3215073280, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.157198010 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 134512640, end = 135151616, flags = 134223989, pgoff = 0, inode = 114742 }
+vm_state.vm_map: 23329.157200168 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 135151616, end = 135163904, flags = 135272563, pgoff = 638976, inode = 114742 }
+vm_state.vm_map: 23329.157202308 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 135163904, end = 135200768, flags = 1048691, pgoff = 135163904, inode = 0 }
+vm_state.vm_map: 23329.157204343 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 160059392, end = 160194560, flags = 1048691, pgoff = 160059392, inode = 0 }
+vm_state.vm_map: 23329.157206520 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3072176128, end = 3072180224, flags = 1048688, pgoff = 3072176128, inode = 0 }
+vm_state.vm_map: 23329.157208573 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3072180224, end = 3072704512, flags = 1048691, pgoff = 3072180224, inode = 0 }
+vm_state.vm_map: 23329.157211089 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3072704512, end = 3074035712, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.157213025 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3074035712, end = 3074039808, flags = 1048688, pgoff = 3074035712, inode = 0 }
+vm_state.vm_map: 23329.157215245 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3074039808, end = 3074179072, flags = 1048691, pgoff = 3074039808, inode = 0 }
+vm_state.vm_map: 23329.157217848 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3074179072, end = 3074191360, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 23329.157219809 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3074191360, end = 3074195456, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 23329.157222214 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3074195456, end = 3074211840, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.157224384 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3074211840, end = 3074215936, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.157226851 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3074215936, end = 3074224128, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.157228960 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3074224128, end = 3074228224, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.157231605 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3074228224, end = 3074232320, flags = 1048691, pgoff = 3074228224, inode = 0 }
+vm_state.vm_map: 23329.157233992 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3074232320, end = 3074318336, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 23329.157236045 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3074318336, end = 3074322432, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 23329.157238087 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3074322432, end = 3074330624, flags = 1048691, pgoff = 3074322432, inode = 0 }
+vm_state.vm_map: 23329.157240646 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3074330624, end = 3074359296, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 23329.157242748 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3074359296, end = 3074363392, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 23329.157245117 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3074363392, end = 3074461696, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.157247115 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3074461696, end = 3074465792, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.157249717 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3074465792, end = 3075780608, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.157251789 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3075780608, end = 3075788800, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.157253934 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3075788800, end = 3075792896, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.157255970 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3075792896, end = 3075805184, flags = 1048691, pgoff = 3075792896, inode = 0 }
+vm_state.vm_map: 23329.157258288 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3075805184, end = 3075919872, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.157260415 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3075919872, end = 3075923968, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.157262611 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3075923968, end = 3075928064, flags = 1048691, pgoff = 3075923968, inode = 0 }
+vm_state.vm_map: 23329.157264929 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3075928064, end = 3076075520, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.157267531 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3076075520, end = 3076079616, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.157269678 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3076079616, end = 3076083712, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.157271848 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3076083712, end = 3076112384, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.157274074 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3076112384, end = 3076116480, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.157276294 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3076116480, end = 3076120576, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.157278693 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3076120576, end = 3076206592, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.157280759 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3076206592, end = 3076210688, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.157282751 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3076210688, end = 3076214784, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.157284952 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3076214784, end = 3076222976, flags = 1048691, pgoff = 3076214784, inode = 0 }
+vm_state.vm_map: 23329.157287147 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3076222976, end = 3076308992, flags = 134217845, pgoff = 0, inode = 18950 }
+vm_state.vm_map: 23329.157289275 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3076308992, end = 3076313088, flags = 135266419, pgoff = 86016, inode = 18950 }
+vm_state.vm_map: 23329.157291513 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3076313088, end = 3076366336, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 23329.157293548 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3076366336, end = 3076370432, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 23329.157295688 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3076370432, end = 3076689920, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 23329.157297772 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3076689920, end = 3076706304, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 23329.157299955 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3076706304, end = 3076710400, flags = 1048691, pgoff = 3076706304, inode = 0 }
+vm_state.vm_map: 23329.157302570 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3076710400, end = 3077861376, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.157304568 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3077861376, end = 3077877760, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.157306763 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3077877760, end = 3077885952, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.157308798 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3077885952, end = 3077890048, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.157310846 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3077890048, end = 3077894144, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.157313047 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3077959680, end = 3077988352, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.157315113 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3077988352, end = 3077996544, flags = 1048691, pgoff = 3077988352, inode = 0 }
+vm_state.vm_map: 23329.157317247 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3077996544, end = 3078000640, flags = 67371125, pgoff = 3077996544, inode = 0 }
+vm_state.vm_map: 23329.157319441 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3078000640, end = 3078115328, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.157321384 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3078115328, end = 3078119424, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.157323364 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3078119424, end = 3078123520, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.157325430 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2099, start = 3215757312, end = 3215843328, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.157327920 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3073486848, end = 3073495040, flags = 1048691, pgoff = 3073486848, inode = 0 }
+vm_state.vm_map: 23329.157330116 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3073495040, end = 3073581056, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.157332261 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3073581056, end = 3073585152, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.157334327 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3073585152, end = 3073589248, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.157336615 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3073589248, end = 3073597440, flags = 1048691, pgoff = 3073589248, inode = 0 }
+vm_state.vm_map: 23329.157339008 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3073597440, end = 3073605632, flags = 134217845, pgoff = 0, inode = 500018 }
+vm_state.vm_map: 23329.157340938 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3073605632, end = 3073609728, flags = 135266419, pgoff = 4096, inode = 500018 }
+vm_state.vm_map: 23329.157343232 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3073609728, end = 3073613824, flags = 1048691, pgoff = 3073609728, inode = 0 }
+vm_state.vm_map: 23329.157345618 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3073613824, end = 3073638400, flags = 134217845, pgoff = 0, inode = 19420 }
+vm_state.vm_map: 23329.157348091 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3073638400, end = 3073642496, flags = 135266419, pgoff = 20480, inode = 19420 }
+vm_state.vm_map: 23329.157350299 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3073642496, end = 3073650688, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.157352482 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3073650688, end = 3073654784, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.157354467 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3073654784, end = 3073658880, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.157356607 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3073658880, end = 3074973696, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.157358587 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3074973696, end = 3074981888, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.157360714 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3074981888, end = 3074985984, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.157362657 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3074985984, end = 3074998272, flags = 1048691, pgoff = 3074985984, inode = 0 }
+vm_state.vm_map: 23329.157365080 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3074998272, end = 3075006464, flags = 134217845, pgoff = 0, inode = 499720 }
+vm_state.vm_map: 23329.157367066 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3075006464, end = 3075010560, flags = 135266419, pgoff = 4096, inode = 499720 }
+vm_state.vm_map: 23329.157369496 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3075010560, end = 3075170304, flags = 134217845, pgoff = 0, inode = 18680 }
+vm_state.vm_map: 23329.157371876 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3075170304, end = 3075174400, flags = 135266419, pgoff = 159744, inode = 18680 }
+vm_state.vm_map: 23329.157373923 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3075174400, end = 3075178496, flags = 1048691, pgoff = 3075174400, inode = 0 }
+vm_state.vm_map: 23329.157376334 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3075178496, end = 3075837952, flags = 134217845, pgoff = 0, inode = 19419 }
+vm_state.vm_map: 23329.157378394 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3075837952, end = 3075862528, flags = 135266419, pgoff = 659456, inode = 19419 }
+vm_state.vm_map: 23329.157380731 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3075862528, end = 3076026368, flags = 134217845, pgoff = 0, inode = 17950 }
+vm_state.vm_map: 23329.157382717 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3076026368, end = 3076030464, flags = 135266419, pgoff = 163840, inode = 17950 }
+vm_state.vm_map: 23329.157385079 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3076030464, end = 3076067328, flags = 134217845, pgoff = 0, inode = 508391 }
+vm_state.vm_map: 23329.157387262 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3076067328, end = 3076071424, flags = 135266417, pgoff = 32768, inode = 508391 }
+vm_state.vm_map: 23329.157389198 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3076071424, end = 3076075520, flags = 135266419, pgoff = 36864, inode = 508391 }
+vm_state.vm_map: 23329.157391127 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3076075520, end = 3076235264, flags = 1048691, pgoff = 3076075520, inode = 0 }
+vm_state.vm_map: 23329.157393539 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3076235264, end = 3076313088, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.157395592 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3076313088, end = 3076317184, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.157397560 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3076317184, end = 3076321280, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.157399551 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3076321280, end = 3076329472, flags = 1048691, pgoff = 3076321280, inode = 0 }
+vm_state.vm_map: 23329.157401969 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3076329472, end = 3076407296, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.157404134 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3076407296, end = 3076411392, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.157406735 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3076411392, end = 3076419584, flags = 134217845, pgoff = 0, inode = 508383 }
+vm_state.vm_map: 23329.157408671 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3076419584, end = 3076423680, flags = 135266417, pgoff = 4096, inode = 508383 }
+vm_state.vm_map: 23329.157410720 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3076423680, end = 3076427776, flags = 135266419, pgoff = 8192, inode = 508383 }
+vm_state.vm_map: 23329.157412908 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3076427776, end = 3076431872, flags = 1048691, pgoff = 3076427776, inode = 0 }
+vm_state.vm_map: 23329.157415394 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3076431872, end = 3077734400, flags = 134217845, pgoff = 0, inode = 33850 }
+vm_state.vm_map: 23329.157417329 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3077734400, end = 3077828608, flags = 135266419, pgoff = 1302528, inode = 33850 }
+vm_state.vm_map: 23329.157419259 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3077828608, end = 3077840896, flags = 1048691, pgoff = 3077828608, inode = 0 }
+vm_state.vm_map: 23329.157421843 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3077840896, end = 3077910528, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 23329.157423786 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3077910528, end = 3077914624, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 23329.157425845 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3077914624, end = 3077918720, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 23329.157427800 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3077918720, end = 3077926912, flags = 1048691, pgoff = 3077918720, inode = 0 }
+vm_state.vm_map: 23329.157429971 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3078021120, end = 3078029312, flags = 1048691, pgoff = 3078021120, inode = 0 }
+vm_state.vm_map: 23329.157431932 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3078029312, end = 3078033408, flags = 67371125, pgoff = 3078029312, inode = 0 }
+vm_state.vm_map: 23329.157434096 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3078033408, end = 3078148096, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.157436119 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3078148096, end = 3078152192, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.157438308 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3078152192, end = 3078156288, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.157444721 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3078156288, end = 3078234112, flags = 134223989, pgoff = 0, inode = 19232 }
+vm_state.vm_map: 23329.157446775 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3078234112, end = 3078238208, flags = 135272561, pgoff = 73728, inode = 19232 }
+vm_state.vm_map: 23329.157448804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3078238208, end = 3078242304, flags = 135272563, pgoff = 77824, inode = 19232 }
+vm_state.vm_map: 23329.157450857 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3078242304, end = 3078250496, flags = 1048691, pgoff = 3078242304, inode = 0 }
+vm_state.vm_map: 23329.157452824 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3105247232, end = 3105382400, flags = 1048691, pgoff = 3105247232, inode = 0 }
+vm_state.vm_map: 23329.157454748 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2104, start = 3213828096, end = 3213914112, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.157479519 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 134512640, end = 134533120, flags = 134223989, pgoff = 0, inode = 20943 }
+vm_state.vm_map: 23329.157481709 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 134533120, end = 134537216, flags = 135272563, pgoff = 16384, inode = 20943 }
+vm_state.vm_map: 23329.157483941 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 147365888, end = 147501056, flags = 1048691, pgoff = 147365888, inode = 0 }
+vm_state.vm_map: 23329.157486439 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3076263936, end = 3076304896, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.157488522 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3076304896, end = 3076308992, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.157490625 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3076308992, end = 3076313088, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.157493073 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3076313088, end = 3076349952, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.157495262 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3076349952, end = 3076354048, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.157497340 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3076354048, end = 3076358144, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.157499967 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3076358144, end = 3076435968, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.157501990 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3076435968, end = 3076440064, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.157504290 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3076440064, end = 3076444160, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.157506448 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3076444160, end = 3076452352, flags = 1048691, pgoff = 3076444160, inode = 0 }
+vm_state.vm_map: 23329.157508859 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3076452352, end = 3076476928, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.157510962 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3076476928, end = 3076481024, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.157513306 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3076481024, end = 3076485120, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.157515464 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3076485120, end = 3076493312, flags = 1048691, pgoff = 3076485120, inode = 0 }
+vm_state.vm_map: 23329.157517931 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3076493312, end = 3076509696, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.157519959 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3076509696, end = 3076513792, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.157522364 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3076513792, end = 3076521984, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.157524350 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3076521984, end = 3076526080, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.157526533 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3076526080, end = 3076534272, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.157528624 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3076534272, end = 3076538368, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.157530665 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3076538368, end = 3076542464, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.157532916 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3076542464, end = 3076640768, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.157538817 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3076640768, end = 3076644864, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.157541000 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3076644864, end = 3077959680, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.157543109 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3077959680, end = 3077967872, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.157545076 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3077967872, end = 3077971968, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.157547221 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3077971968, end = 3077988352, flags = 1048691, pgoff = 3077971968, inode = 0 }
+vm_state.vm_map: 23329.157549547 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3077988352, end = 3078074368, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.157551557 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3078074368, end = 3078078464, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.157553653 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3078078464, end = 3078082560, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.157555743 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3078082560, end = 3078090752, flags = 1048691, pgoff = 3078082560, inode = 0 }
+vm_state.vm_map: 23329.157557933 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3078090752, end = 3079241728, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.157559961 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3079241728, end = 3079258112, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.157562138 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3079352320, end = 3079360512, flags = 1048691, pgoff = 3079352320, inode = 0 }
+vm_state.vm_map: 23329.157564223 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3079360512, end = 3079364608, flags = 67371125, pgoff = 3079360512, inode = 0 }
+vm_state.vm_map: 23329.157566301 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3079364608, end = 3079479296, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.157568243 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3079479296, end = 3079483392, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.157570765 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3079483392, end = 3079487488, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.157572695 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2110, start = 3220213760, end = 3220299776, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.157575181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3075735552, end = 3075776512, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.157577253 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3075776512, end = 3075780608, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.157579189 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3075780608, end = 3075784704, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.157581335 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3075784704, end = 3075821568, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.157583265 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3075821568, end = 3075825664, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.157585325 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3075825664, end = 3075829760, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.157587391 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3075829760, end = 3075907584, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.157589370 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3075907584, end = 3075911680, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.157591356 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3075911680, end = 3075915776, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.157593514 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3075915776, end = 3075923968, flags = 1048691, pgoff = 3075915776, inode = 0 }
+vm_state.vm_map: 23329.157595623 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3075923968, end = 3075948544, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.157597547 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3075948544, end = 3075952640, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.157599471 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3075952640, end = 3075956736, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.157601623 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3075956736, end = 3075964928, flags = 1048691, pgoff = 3075956736, inode = 0 }
+vm_state.vm_map: 23329.157604071 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3075964928, end = 3075973120, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.157606051 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3075973120, end = 3075977216, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.157608308 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3075977216, end = 3075981312, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.157610429 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3075981312, end = 3077296128, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.157612421 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3077296128, end = 3077304320, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.157614474 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3077304320, end = 3077308416, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.157616638 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3077308416, end = 3077320704, flags = 1048691, pgoff = 3077308416, inode = 0 }
+vm_state.vm_map: 23329.157618753 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3077320704, end = 3077349376, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.157620789 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3077349376, end = 3077353472, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.157622835 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3077353472, end = 3077357568, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.157625026 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3077357568, end = 3077443584, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.157627010 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3077443584, end = 3077447680, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.157629144 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3077447680, end = 3077451776, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.157631111 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3077451776, end = 3077464064, flags = 1048691, pgoff = 3077451776, inode = 0 }
+vm_state.vm_map: 23329.157633782 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3077464064, end = 3077562368, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 23329.157635804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3077562368, end = 3077566464, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 23329.157638352 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3077566464, end = 3077570560, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 23329.157640885 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3077570560, end = 3077718016, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.157643068 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3077718016, end = 3077726208, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.157645226 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3077820416, end = 3077828608, flags = 1048691, pgoff = 3077820416, inode = 0 }
+vm_state.vm_map: 23329.157647268 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3077828608, end = 3077832704, flags = 67371125, pgoff = 3077828608, inode = 0 }
+vm_state.vm_map: 23329.157649432 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3077832704, end = 3077947392, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.157651492 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3077947392, end = 3077951488, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.157653570 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3077951488, end = 3077955584, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.157655993 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3077955584, end = 3078246400, flags = 134223989, pgoff = 0, inode = 20940 }
+vm_state.vm_map: 23329.157658127 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3078246400, end = 3078250496, flags = 135272561, pgoff = 286720, inode = 20940 }
+vm_state.vm_map: 23329.157660211 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3078250496, end = 3078254592, flags = 135272563, pgoff = 290816, inode = 20940 }
+vm_state.vm_map: 23329.157662148 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3102511104, end = 3102892032, flags = 1048691, pgoff = 3102511104, inode = 0 }
+vm_state.vm_map: 23329.157664102 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2114, start = 3214618624, end = 3214704640, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.157670244 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 134512640, end = 134553600, flags = 134223989, pgoff = 0, inode = 20759 }
+vm_state.vm_map: 23329.157672390 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 134553600, end = 134557696, flags = 135272563, pgoff = 36864, inode = 20759 }
+vm_state.vm_map: 23329.157674820 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 134557696, end = 134565888, flags = 1048691, pgoff = 134557696, inode = 0 }
+vm_state.vm_map: 23329.157676898 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 153337856, end = 153894912, flags = 1048691, pgoff = 153337856, inode = 0 }
+vm_state.vm_map: 23329.157681702 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3023929344, end = 3024166912, flags = 1048691, pgoff = 3024166912, inode = 0 }
+vm_state.vm_map: 23329.157687283 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3024838656, end = 3024871424, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 23329.157689435 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3024871424, end = 3024875520, flags = 135266419, pgoff = 32768, inode = 20716 }
+vm_state.vm_map: 23329.157694312 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3024875520, end = 3025395712, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 23329.157696348 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3025395712, end = 3025403904, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 23329.157698734 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3025403904, end = 3025768448, flags = 134217845, pgoff = 0, inode = 23376 }
+vm_state.vm_map: 23329.157700787 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3025768448, end = 3025805312, flags = 135266423, pgoff = 364544, inode = 23376 }
+vm_state.vm_map: 23329.157702872 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3025805312, end = 3025809408, flags = 1048695, pgoff = 3025805312, inode = 0 }
+vm_state.vm_map: 23329.157705474 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3025809408, end = 3026362368, flags = 134217845, pgoff = 0, inode = 18947 }
+vm_state.vm_map: 23329.157707397 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3026362368, end = 3026382848, flags = 135266419, pgoff = 548864, inode = 18947 }
+vm_state.vm_map: 23329.157712516 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3026382848, end = 3026698240, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 23329.157714582 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3026698240, end = 3026706432, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 23329.157716888 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3026706432, end = 3026776064, flags = 134217845, pgoff = 0, inode = 1065123 }
+vm_state.vm_map: 23329.157718818 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3026776064, end = 3026780160, flags = 135266419, pgoff = 69632, inode = 1065123 }
+vm_state.vm_map: 23329.157721433 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3026780160, end = 3041275904, flags = 134217845, pgoff = 0, inode = 20672 }
+vm_state.vm_map: 23329.157723394 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3041275904, end = 3041890304, flags = 135266419, pgoff = 14495744, inode = 20672 }
+vm_state.vm_map: 23329.157725324 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3041890304, end = 3041898496, flags = 1048691, pgoff = 3041890304, inode = 0 }
+vm_state.vm_map: 23329.157727673 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3041898496, end = 3042271232, flags = 134217845, pgoff = 0, inode = 20902 }
+vm_state.vm_map: 23329.157729850 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3042271232, end = 3042283520, flags = 135266419, pgoff = 368640, inode = 20902 }
+vm_state.vm_map: 23329.157735375 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3042377728, end = 3044360192, flags = 134217845, pgoff = 0, inode = 20915 }
+vm_state.vm_map: 23329.157737404 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3044360192, end = 3044401152, flags = 135266419, pgoff = 1978368, inode = 20915 }
+vm_state.vm_map: 23329.157739643 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3044401152, end = 3045732352, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.157741937 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3045732352, end = 3045748736, flags = 1048691, pgoff = 3045732352, inode = 0 }
+vm_state.vm_map: 23329.157744181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3045748736, end = 3045896192, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.157746278 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3045896192, end = 3045904384, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.157748874 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3045904384, end = 3046223872, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 23329.157751026 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3046223872, end = 3046240256, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 23329.157753333 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3046240256, end = 3046252544, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 23329.157755417 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3046252544, end = 3046256640, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 23329.157760245 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3046256640, end = 3047514112, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 23329.157762287 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3047514112, end = 3047534592, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 23329.157764340 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3047534592, end = 3047542784, flags = 1048691, pgoff = 3047534592, inode = 0 }
+vm_state.vm_map: 23329.157766800 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3047542784, end = 3047780352, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 23329.157768737 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3047780352, end = 3047784448, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 23329.157771153 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3047784448, end = 3047800832, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.157773257 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3047800832, end = 3047804928, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.157775323 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3047804928, end = 3047813120, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.157777500 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3047813120, end = 3047817216, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.157779886 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3047817216, end = 3048009728, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.157781815 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3048009728, end = 3048013824, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.157784251 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3048013824, end = 3048067072, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 23329.157786305 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3048067072, end = 3048071168, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 23329.157788321 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3048071168, end = 3048075264, flags = 1048691, pgoff = 3048071168, inode = 0 }
+vm_state.vm_map: 23329.157790769 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3048075264, end = 3048259584, flags = 134217845, pgoff = 0, inode = 22064 }
+vm_state.vm_map: 23329.157792699 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3048259584, end = 3048267776, flags = 135266419, pgoff = 180224, inode = 22064 }
+vm_state.vm_map: 23329.157795222 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3048267776, end = 3048509440, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.157797152 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3048509440, end = 3048513536, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.157799433 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3048513536, end = 3048984576, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 23329.157801481 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3048984576, end = 3049000960, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 23329.157804065 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049000960, end = 3049144320, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 23329.157806081 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049144320, end = 3049148416, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 23329.157808529 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049148416, end = 3049234432, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 23329.157810570 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049234432, end = 3049238528, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 23329.157812642 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049238528, end = 3049242624, flags = 1048691, pgoff = 3049238528, inode = 0 }
+vm_state.vm_map: 23329.157814720 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049242624, end = 3049259008, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 23329.157816762 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049259008, end = 3049263104, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 23329.157819327 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049263104, end = 3049295872, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 23329.157821331 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049295872, end = 3049299968, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 23329.157826135 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049299968, end = 3049316352, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 23329.157828207 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049316352, end = 3049320448, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 23329.157830371 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049320448, end = 3049406464, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 23329.157832406 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049406464, end = 3049410560, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 23329.157837080 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049410560, end = 3049418752, flags = 1048691, pgoff = 3049410560, inode = 0 }
+vm_state.vm_map: 23329.157839239 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049418752, end = 3049447424, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 23329.157841378 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049447424, end = 3049451520, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 23329.157843426 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049451520, end = 3049455616, flags = 1048691, pgoff = 3049451520, inode = 0 }
+vm_state.vm_map: 23329.157845830 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049455616, end = 3049787392, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 23329.157847896 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049787392, end = 3049795584, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 23329.157850431 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049795584, end = 3049828352, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 23329.157852380 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049828352, end = 3049832448, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 23329.157855062 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049832448, end = 3049848832, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 23329.157856992 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049848832, end = 3049852928, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 23329.157859378 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049852928, end = 3049877504, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 23329.157861303 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049877504, end = 3049881600, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 23329.157863720 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049881600, end = 3049914368, flags = 134217845, pgoff = 0, inode = 21180 }
+vm_state.vm_map: 23329.157865687 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049914368, end = 3049918464, flags = 135266419, pgoff = 28672, inode = 21180 }
+vm_state.vm_map: 23329.157867740 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049918464, end = 3049922560, flags = 1048691, pgoff = 3049918464, inode = 0 }
+vm_state.vm_map: 23329.157870121 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3049922560, end = 3050352640, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 23329.157872045 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3050352640, end = 3050381312, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 23329.157874098 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3050381312, end = 3050385408, flags = 1048691, pgoff = 3050381312, inode = 0 }
+vm_state.vm_map: 23329.157878939 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3050385408, end = 3050827776, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 23329.157881035 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3050827776, end = 3050835968, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 23329.157883200 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3050835968, end = 3050934272, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.157885284 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3050934272, end = 3050938368, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.157890150 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3050938368, end = 3051208704, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 23329.157892185 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3051208704, end = 3051216896, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 23329.157894867 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3051216896, end = 3051278336, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 23329.157896841 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3051278336, end = 3051282432, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 23329.157898777 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3051282432, end = 3051286528, flags = 1048691, pgoff = 3051282432, inode = 0 }
+vm_state.vm_map: 23329.157901052 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3051286528, end = 3051753472, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 23329.157903260 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3051753472, end = 3051761664, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 23329.157905721 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3051761664, end = 3052892160, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 23329.157907663 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3052892160, end = 3052908544, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 23329.157909988 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3052908544, end = 3053023232, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.157912040 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3053023232, end = 3053027328, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.157914106 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3053027328, end = 3053174784, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.157916247 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3053174784, end = 3053178880, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.157918368 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3053178880, end = 3053182976, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.157920532 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3053182976, end = 3053191168, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.157922598 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3053191168, end = 3053195264, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.157924966 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3053195264, end = 3053199360, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.157927081 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3053199360, end = 3053203456, flags = 1048691, pgoff = 3053199360, inode = 0 }
+vm_state.vm_map: 23329.157929246 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3053203456, end = 3053289472, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.157931243 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3053289472, end = 3053293568, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.157933334 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3053293568, end = 3053297664, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.157935332 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3053297664, end = 3053305856, flags = 1048691, pgoff = 3053297664, inode = 0 }
+vm_state.vm_map: 23329.157937848 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3053305856, end = 3054043136, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.157939870 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3054043136, end = 3054047232, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.157942189 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3054047232, end = 3054075904, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.157944138 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3054075904, end = 3054080000, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.157946413 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3054080000, end = 3054084096, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.157948756 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3054084096, end = 3054100480, flags = 134217845, pgoff = 0, inode = 19625 }
+vm_state.vm_map: 23329.157950828 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3054100480, end = 3054104576, flags = 135266419, pgoff = 12288, inode = 19625 }
+vm_state.vm_map: 23329.157953024 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3054104576, end = 3054182400, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.157955114 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3054182400, end = 3054186496, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.157957279 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3054186496, end = 3055501312, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.157959838 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3055501312, end = 3055509504, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.157961799 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3055509504, end = 3055513600, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.157963970 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3055513600, end = 3055529984, flags = 1048691, pgoff = 3055513600, inode = 0 }
+vm_state.vm_map: 23329.157966356 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3055529984, end = 3056467968, flags = 134217845, pgoff = 0, inode = 16400 }
+vm_state.vm_map: 23329.157968582 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3056467968, end = 3056484352, flags = 135266417, pgoff = 937984, inode = 16400 }
+vm_state.vm_map: 23329.157970611 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3056484352, end = 3056488448, flags = 135266419, pgoff = 954368, inode = 16400 }
+vm_state.vm_map: 23329.157972621 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3056488448, end = 3056517120, flags = 1048691, pgoff = 3056488448, inode = 0 }
+vm_state.vm_map: 23329.157975285 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3056517120, end = 3066556416, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 23329.157977271 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3066556416, end = 3066716160, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 23329.157979361 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3066716160, end = 3066724352, flags = 1048691, pgoff = 3066716160, inode = 0 }
+vm_state.vm_map: 23329.157981827 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3066724352, end = 3070320640, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 23329.157983906 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3070320640, end = 3070418944, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 23329.157985836 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3070418944, end = 3070423040, flags = 1048691, pgoff = 3070418944, inode = 0 }
+vm_state.vm_map: 23329.157988462 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3070423040, end = 3072978944, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 23329.157990449 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3072978944, end = 3073028096, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 23329.157992532 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3073028096, end = 3073032192, flags = 1048691, pgoff = 3073028096, inode = 0 }
+vm_state.vm_map: 23329.157995117 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3073032192, end = 3074183168, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.157997145 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3074183168, end = 3074199552, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.157999526 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3074199552, end = 3074433024, flags = 134217845, pgoff = 0, inode = 1065180 }
+vm_state.vm_map: 23329.158001659 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3074433024, end = 3074441216, flags = 135266419, pgoff = 233472, inode = 1065180 }
+vm_state.vm_map: 23329.158003818 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3074441216, end = 3074445312, flags = 1048691, pgoff = 3074441216, inode = 0 }
+vm_state.vm_map: 23329.158006173 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3074445312, end = 3076747264, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 23329.158008202 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3076747264, end = 3076792320, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 23329.158010718 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3076792320, end = 3079102464, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 23329.158012734 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3079102464, end = 3079131136, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 23329.158014831 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3079131136, end = 3079135232, flags = 1048691, pgoff = 3079131136, inode = 0 }
+vm_state.vm_map: 23329.158019481 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3079151616, end = 3079159808, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 23329.158021522 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3079159808, end = 3079163904, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 23329.158023877 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3079163904, end = 3079180288, flags = 134217845, pgoff = 0, inode = 22094 }
+vm_state.vm_map: 23329.158025980 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3079180288, end = 3079184384, flags = 135266419, pgoff = 12288, inode = 22094 }
+vm_state.vm_map: 23329.158028657 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3079184384, end = 3079192576, flags = 134217845, pgoff = 0, inode = 1450327 }
+vm_state.vm_map: 23329.158031018 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3079192576, end = 3079196672, flags = 135266417, pgoff = 4096, inode = 1450327 }
+vm_state.vm_map: 23329.158033115 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3079196672, end = 3079200768, flags = 135266419, pgoff = 8192, inode = 1450327 }
+vm_state.vm_map: 23329.158067869 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3079200768, end = 3079229440, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.158070484 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3079229440, end = 3079237632, flags = 1048691, pgoff = 3079229440, inode = 0 }
+vm_state.vm_map: 23329.158072563 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3079237632, end = 3079241728, flags = 67371125, pgoff = 3079237632, inode = 0 }
+vm_state.vm_map: 23329.158074807 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3079241728, end = 3079356416, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.158076983 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3079356416, end = 3079360512, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.158079025 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3079360512, end = 3079364608, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.158081275 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2161, start = 3215650816, end = 3215736832, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.158084013 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 134512640, end = 134553600, flags = 134223989, pgoff = 0, inode = 20759 }
+vm_state.vm_map: 23329.158086104 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 134553600, end = 134557696, flags = 135272563, pgoff = 36864, inode = 20759 }
+vm_state.vm_map: 23329.158088207 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 134557696, end = 134565888, flags = 1048691, pgoff = 134557696, inode = 0 }
+vm_state.vm_map: 23329.158090211 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 153337856, end = 154501120, flags = 1048691, pgoff = 153337856, inode = 0 }
+vm_state.vm_map: 23329.158099997 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3022475264, end = 3024510976, flags = 134217937, pgoff = 0, inode = 41242 }
+vm_state.vm_map: 23329.158102951 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3024510976, end = 3024736256, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.158105011 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3024736256, end = 3024740352, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.158106996 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3024740352, end = 3024744448, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.158109216 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3024838656, end = 3024871424, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 23329.158111387 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3024871424, end = 3024875520, flags = 135266419, pgoff = 32768, inode = 20716 }
+vm_state.vm_map: 23329.158113644 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3024875520, end = 3025395712, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 23329.158115667 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3025395712, end = 3025403904, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 23329.158117776 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3025403904, end = 3025768448, flags = 134217845, pgoff = 0, inode = 23376 }
+vm_state.vm_map: 23329.158119897 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3025768448, end = 3025805312, flags = 135266423, pgoff = 364544, inode = 23376 }
+vm_state.vm_map: 23329.158122000 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3025805312, end = 3025809408, flags = 1048695, pgoff = 3025805312, inode = 0 }
+vm_state.vm_map: 23329.158123998 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3025809408, end = 3026362368, flags = 134217845, pgoff = 0, inode = 18947 }
+vm_state.vm_map: 23329.158126236 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3026362368, end = 3026382848, flags = 135266419, pgoff = 548864, inode = 18947 }
+vm_state.vm_map: 23329.158128247 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3026382848, end = 3026698240, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 23329.158130201 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3026698240, end = 3026706432, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 23329.158132477 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3026706432, end = 3026776064, flags = 134217845, pgoff = 0, inode = 1065123 }
+vm_state.vm_map: 23329.158134455 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3026776064, end = 3026780160, flags = 135266419, pgoff = 69632, inode = 1065123 }
+vm_state.vm_map: 23329.158136757 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3026780160, end = 3041275904, flags = 134217845, pgoff = 0, inode = 20672 }
+vm_state.vm_map: 23329.158138791 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3041275904, end = 3041890304, flags = 135266419, pgoff = 14495744, inode = 20672 }
+vm_state.vm_map: 23329.158140850 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3041890304, end = 3041898496, flags = 1048691, pgoff = 3041890304, inode = 0 }
+vm_state.vm_map: 23329.158142800 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3041898496, end = 3042271232, flags = 134217845, pgoff = 0, inode = 20902 }
+vm_state.vm_map: 23329.158144729 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3042271232, end = 3042283520, flags = 135266419, pgoff = 368640, inode = 20902 }
+vm_state.vm_map: 23329.158149756 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3042304000, end = 3042373632, flags = 134217845, pgoff = 0, inode = 20910 }
+vm_state.vm_map: 23329.158151796 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3042373632, end = 3042377728, flags = 135266419, pgoff = 65536, inode = 20910 }
+vm_state.vm_map: 23329.158153886 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3042377728, end = 3044360192, flags = 134217845, pgoff = 0, inode = 20915 }
+vm_state.vm_map: 23329.158155841 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3044360192, end = 3044401152, flags = 135266419, pgoff = 1978368, inode = 20915 }
+vm_state.vm_map: 23329.158160466 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3044401152, end = 3045732352, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.158162526 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3045732352, end = 3045748736, flags = 1048691, pgoff = 3045732352, inode = 0 }
+vm_state.vm_map: 23329.158164697 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3045748736, end = 3045896192, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.158166762 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3045896192, end = 3045904384, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.158168828 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3045904384, end = 3046223872, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 23329.158171227 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3046223872, end = 3046240256, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 23329.158173188 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3046240256, end = 3046252544, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 23329.158175371 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3046252544, end = 3046256640, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 23329.158177443 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3046256640, end = 3047514112, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 23329.158179416 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3047514112, end = 3047534592, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 23329.158181501 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3047534592, end = 3047542784, flags = 1048691, pgoff = 3047534592, inode = 0 }
+vm_state.vm_map: 23329.158183566 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3047542784, end = 3047780352, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 23329.158185645 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3047780352, end = 3047784448, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 23329.158187612 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3047784448, end = 3047800832, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.158189548 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3047800832, end = 3047804928, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.158191836 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3047804928, end = 3047813120, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.158193760 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3047813120, end = 3047817216, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.158195752 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3047817216, end = 3048009728, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.158197811 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3048009728, end = 3048013824, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.158199914 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3048013824, end = 3048067072, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 23329.158201838 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3048067072, end = 3048071168, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 23329.158204219 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3048071168, end = 3048075264, flags = 1048691, pgoff = 3048071168, inode = 0 }
+vm_state.vm_map: 23329.158206161 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3048075264, end = 3048259584, flags = 134217845, pgoff = 0, inode = 22064 }
+vm_state.vm_map: 23329.158208276 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3048259584, end = 3048267776, flags = 135266419, pgoff = 180224, inode = 22064 }
+vm_state.vm_map: 23329.158210316 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3048267776, end = 3048509440, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.158212290 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3048509440, end = 3048513536, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.158214300 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3048513536, end = 3048984576, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 23329.158216464 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3048984576, end = 3049000960, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 23329.158218500 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049000960, end = 3049144320, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 23329.158220423 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049144320, end = 3049148416, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 23329.158222372 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049148416, end = 3049234432, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 23329.158224518 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049234432, end = 3049238528, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 23329.158226461 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049238528, end = 3049242624, flags = 1048691, pgoff = 3049238528, inode = 0 }
+vm_state.vm_map: 23329.158228428 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049242624, end = 3049259008, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 23329.158230450 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049259008, end = 3049263104, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 23329.158232615 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049263104, end = 3049295872, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 23329.158234539 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049295872, end = 3049299968, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 23329.158236907 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049299968, end = 3049316352, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 23329.158238960 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049316352, end = 3049320448, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 23329.158240915 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049320448, end = 3049406464, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 23329.158242944 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049406464, end = 3049410560, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 23329.158244874 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049410560, end = 3049418752, flags = 1048691, pgoff = 3049410560, inode = 0 }
+vm_state.vm_map: 23329.158247002 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049418752, end = 3049447424, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 23329.158248981 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049447424, end = 3049451520, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 23329.158251022 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049451520, end = 3049455616, flags = 1048691, pgoff = 3049451520, inode = 0 }
+vm_state.vm_map: 23329.158252971 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049455616, end = 3049787392, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 23329.158257670 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049787392, end = 3049795584, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 23329.158259674 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049795584, end = 3049828352, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 23329.158261752 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049828352, end = 3049832448, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 23329.158263769 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049832448, end = 3049848832, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 23329.158265939 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049848832, end = 3049852928, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 23329.158268024 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049852928, end = 3049877504, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 23329.158270299 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049877504, end = 3049881600, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 23329.158272260 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049881600, end = 3049914368, flags = 134217845, pgoff = 0, inode = 21180 }
+vm_state.vm_map: 23329.158274431 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049914368, end = 3049918464, flags = 135266419, pgoff = 28672, inode = 21180 }
+vm_state.vm_map: 23329.158276373 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049918464, end = 3049922560, flags = 1048691, pgoff = 3049918464, inode = 0 }
+vm_state.vm_map: 23329.158278321 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3049922560, end = 3050352640, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 23329.158280252 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3050352640, end = 3050381312, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 23329.158282417 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3050381312, end = 3050385408, flags = 1048691, pgoff = 3050381312, inode = 0 }
+vm_state.vm_map: 23329.158284365 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3050385408, end = 3050827776, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 23329.158286289 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3050827776, end = 3050835968, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 23329.158288404 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3050835968, end = 3050934272, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.158290464 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3050934272, end = 3050938368, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.158292406 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3050938368, end = 3051208704, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 23329.158294442 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3051208704, end = 3051216896, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 23329.158296457 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3051216896, end = 3051278336, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 23329.158298591 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3051278336, end = 3051282432, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 23329.158300675 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3051282432, end = 3051286528, flags = 1048691, pgoff = 3051282432, inode = 0 }
+vm_state.vm_map: 23329.158302970 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3051286528, end = 3051753472, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 23329.158304955 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3051753472, end = 3051761664, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 23329.158307125 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3051761664, end = 3052892160, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 23329.158309068 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3052892160, end = 3052908544, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 23329.158311084 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3052908544, end = 3053023232, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.158313113 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3053023232, end = 3053027328, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.158315321 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3053027328, end = 3053174784, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.158317356 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3053174784, end = 3053178880, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.158319385 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3053178880, end = 3053182976, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.158321469 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3053182976, end = 3053191168, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.158323627 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3053191168, end = 3053195264, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.158325705 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3053195264, end = 3053199360, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.158327901 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3053199360, end = 3053203456, flags = 1048691, pgoff = 3053199360, inode = 0 }
+vm_state.vm_map: 23329.158329973 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3053203456, end = 3053289472, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.158332051 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3053289472, end = 3053293568, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.158334185 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3053293568, end = 3053297664, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.158336534 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3053297664, end = 3053305856, flags = 1048691, pgoff = 3053297664, inode = 0 }
+vm_state.vm_map: 23329.158338594 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3053305856, end = 3054043136, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.158340863 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3054043136, end = 3054047232, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.158342836 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3054047232, end = 3054075904, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.158344760 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3054075904, end = 3054080000, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.158346684 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3054080000, end = 3054084096, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.158348855 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3054084096, end = 3054100480, flags = 134217845, pgoff = 0, inode = 19625 }
+vm_state.vm_map: 23329.158350816 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3054100480, end = 3054104576, flags = 135266419, pgoff = 12288, inode = 19625 }
+vm_state.vm_map: 23329.158353085 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3054104576, end = 3054182400, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.158355125 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3054182400, end = 3054186496, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.158357272 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3054186496, end = 3055501312, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.158359251 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3055501312, end = 3055509504, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.158361330 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3055509504, end = 3055513600, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.158363487 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3055513600, end = 3055529984, flags = 1048691, pgoff = 3055513600, inode = 0 }
+vm_state.vm_map: 23329.158365553 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3055529984, end = 3056467968, flags = 134217845, pgoff = 0, inode = 16400 }
+vm_state.vm_map: 23329.158367540 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3056467968, end = 3056484352, flags = 135266417, pgoff = 937984, inode = 16400 }
+vm_state.vm_map: 23329.158369913 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3056484352, end = 3056488448, flags = 135266419, pgoff = 954368, inode = 16400 }
+vm_state.vm_map: 23329.158371905 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3056488448, end = 3056517120, flags = 1048691, pgoff = 3056488448, inode = 0 }
+vm_state.vm_map: 23329.158374100 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3056517120, end = 3066556416, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 23329.158376049 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3066556416, end = 3066716160, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 23329.158378090 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3066716160, end = 3066724352, flags = 1048691, pgoff = 3066716160, inode = 0 }
+vm_state.vm_map: 23329.158380040 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3066724352, end = 3070320640, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 23329.158382086 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3070320640, end = 3070418944, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 23329.158384176 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3070418944, end = 3070423040, flags = 1048691, pgoff = 3070418944, inode = 0 }
+vm_state.vm_map: 23329.158386174 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3070423040, end = 3072978944, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 23329.158388098 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3072978944, end = 3073028096, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 23329.158390294 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3073028096, end = 3073032192, flags = 1048691, pgoff = 3073028096, inode = 0 }
+vm_state.vm_map: 23329.158392249 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3073032192, end = 3074183168, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.158394173 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3074183168, end = 3074199552, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.158396269 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3074199552, end = 3074433024, flags = 134217845, pgoff = 0, inode = 1065180 }
+vm_state.vm_map: 23329.158398323 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3074433024, end = 3074441216, flags = 135266419, pgoff = 233472, inode = 1065180 }
+vm_state.vm_map: 23329.158400364 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3074441216, end = 3074445312, flags = 1048691, pgoff = 3074441216, inode = 0 }
+vm_state.vm_map: 23329.158402775 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3074445312, end = 3076747264, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 23329.158404717 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3076747264, end = 3076792320, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 23329.158406802 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3076792320, end = 3079102464, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 23329.158408837 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3079102464, end = 3079131136, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 23329.158410859 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3079131136, end = 3079135232, flags = 1048691, pgoff = 3079131136, inode = 0 }
+vm_state.vm_map: 23329.158412944 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3079151616, end = 3079159808, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 23329.158414874 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3079159808, end = 3079163904, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 23329.158416952 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3079163904, end = 3079180288, flags = 134217845, pgoff = 0, inode = 22094 }
+vm_state.vm_map: 23329.158418932 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3079180288, end = 3079184384, flags = 135266419, pgoff = 12288, inode = 22094 }
+vm_state.vm_map: 23329.158421053 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3079184384, end = 3079192576, flags = 134217845, pgoff = 0, inode = 1450327 }
+vm_state.vm_map: 23329.158423143 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3079192576, end = 3079196672, flags = 135266417, pgoff = 4096, inode = 1450327 }
+vm_state.vm_map: 23329.158425141 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3079196672, end = 3079200768, flags = 135266419, pgoff = 8192, inode = 1450327 }
+vm_state.vm_map: 23329.158427213 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3079200768, end = 3079229440, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.158429260 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3079229440, end = 3079237632, flags = 1048691, pgoff = 3079229440, inode = 0 }
+vm_state.vm_map: 23329.158431191 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3079237632, end = 3079241728, flags = 67371125, pgoff = 3079237632, inode = 0 }
+vm_state.vm_map: 23329.158433158 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3079241728, end = 3079356416, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.158435679 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3079356416, end = 3079360512, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.158437622 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3079360512, end = 3079364608, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.158439559 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2162, start = 3215650816, end = 3215736832, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.158444861 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 134512640, end = 134553600, flags = 134223989, pgoff = 0, inode = 20759 }
+vm_state.vm_map: 23329.158446958 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 134553600, end = 134557696, flags = 135272563, pgoff = 36864, inode = 20759 }
+vm_state.vm_map: 23329.158448987 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 134557696, end = 134565888, flags = 1048691, pgoff = 134557696, inode = 0 }
+vm_state.vm_map: 23329.158451090 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 153337856, end = 155320320, flags = 1048691, pgoff = 153337856, inode = 0 }
+vm_state.vm_map: 23329.158456276 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2911248384, end = 2911252480, flags = 1048688, pgoff = 2911248384, inode = 0 }
+vm_state.vm_map: 23329.158458422 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2911252480, end = 2919641088, flags = 1048691, pgoff = 2911252480, inode = 0 }
+vm_state.vm_map: 23329.158463417 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2919641088, end = 2919645184, flags = 1048688, pgoff = 2919641088, inode = 0 }
+vm_state.vm_map: 23329.158465464 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2919645184, end = 2928033792, flags = 1048691, pgoff = 2919645184, inode = 0 }
+vm_state.vm_map: 23329.158468060 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2928033792, end = 2995146752, flags = 134217979, pgoff = 0, inode = 8197 }
+vm_state.vm_map: 23329.158473814 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2995146752, end = 2995216384, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 23329.158475879 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2995216384, end = 2995220480, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 23329.158477976 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2995220480, end = 2995224576, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 23329.158479912 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2995224576, end = 2995232768, flags = 1048691, pgoff = 2995224576, inode = 0 }
+vm_state.vm_map: 23329.158485129 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2995232768, end = 2995253248, flags = 134217845, pgoff = 0, inode = 23692 }
+vm_state.vm_map: 23329.158487171 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2995253248, end = 2995257344, flags = 135266419, pgoff = 16384, inode = 23692 }
+vm_state.vm_map: 23329.158489761 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2995257344, end = 2995421184, flags = 134217845, pgoff = 0, inode = 21283 }
+vm_state.vm_map: 23329.158491715 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2995421184, end = 2995425280, flags = 135266419, pgoff = 159744, inode = 21283 }
+vm_state.vm_map: 23329.158494120 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2995425280, end = 2996387840, flags = 134217845, pgoff = 0, inode = 21285 }
+vm_state.vm_map: 23329.158496057 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2996387840, end = 2996445184, flags = 135266419, pgoff = 962560, inode = 21285 }
+vm_state.vm_map: 23329.158501039 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2996445184, end = 2996768768, flags = 134217845, pgoff = 0, inode = 21280 }
+vm_state.vm_map: 23329.158503087 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2996768768, end = 2996772864, flags = 135266419, pgoff = 323584, inode = 21280 }
+vm_state.vm_map: 23329.158505603 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2996772864, end = 2996785152, flags = 134217845, pgoff = 0, inode = 499779 }
+vm_state.vm_map: 23329.158507545 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2996785152, end = 2996789248, flags = 135266419, pgoff = 8192, inode = 499779 }
+vm_state.vm_map: 23329.158515260 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2996789248, end = 2997186560, flags = 134217845, pgoff = 0, inode = 24050 }
+vm_state.vm_map: 23329.158517300 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2997186560, end = 2997194752, flags = 135266419, pgoff = 397312, inode = 24050 }
+vm_state.vm_map: 23329.158519286 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2997194752, end = 2997211136, flags = 1048691, pgoff = 2997194752, inode = 0 }
+vm_state.vm_map: 23329.158521845 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2997211136, end = 2997514240, flags = 134217845, pgoff = 0, inode = 24049 }
+vm_state.vm_map: 23329.158524022 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2997514240, end = 2997518336, flags = 135266419, pgoff = 299008, inode = 24049 }
+vm_state.vm_map: 23329.158526291 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2997518336, end = 2997780480, flags = 134217845, pgoff = 0, inode = 24048 }
+vm_state.vm_map: 23329.158530903 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2997780480, end = 2997784576, flags = 135266419, pgoff = 262144, inode = 24048 }
+vm_state.vm_map: 23329.158535793 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2997784576, end = 2998587392, flags = 134217845, pgoff = 0, inode = 21274 }
+vm_state.vm_map: 23329.158537835 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2998587392, end = 2998603776, flags = 135266419, pgoff = 802816, inode = 21274 }
+vm_state.vm_map: 23329.158543378 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2998697984, end = 2998829056, flags = 134217845, pgoff = 0, inode = 1114250 }
+vm_state.vm_map: 23329.158545531 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2998829056, end = 2998833152, flags = 135266419, pgoff = 126976, inode = 1114250 }
+vm_state.vm_map: 23329.158553171 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2998833152, end = 2998964224, flags = 134217845, pgoff = 0, inode = 1065118 }
+vm_state.vm_map: 23329.158555342 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2998964224, end = 2998968320, flags = 135266419, pgoff = 131072, inode = 1065118 }
+vm_state.vm_map: 23329.158557784 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2998976512, end = 2998996992, flags = 134217845, pgoff = 0, inode = 18127 }
+vm_state.vm_map: 23329.158559708 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2998996992, end = 2999001088, flags = 135266419, pgoff = 16384, inode = 18127 }
+vm_state.vm_map: 23329.158562335 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999001088, end = 2999029760, flags = 134217845, pgoff = 0, inode = 499851 }
+vm_state.vm_map: 23329.158564351 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999029760, end = 2999033856, flags = 135266419, pgoff = 28672, inode = 499851 }
+vm_state.vm_map: 23329.158569513 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999033856, end = 2999058432, flags = 134217845, pgoff = 0, inode = 1114248 }
+vm_state.vm_map: 23329.158571677 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999058432, end = 2999062528, flags = 135266419, pgoff = 20480, inode = 1114248 }
+vm_state.vm_map: 23329.158576462 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999062528, end = 2999099392, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.158578620 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999099392, end = 2999103488, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.158580705 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999103488, end = 2999107584, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.158585774 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999107584, end = 2999185408, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.158590220 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999185408, end = 2999189504, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.158592266 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999189504, end = 2999193600, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.158594320 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999193600, end = 2999201792, flags = 1048691, pgoff = 2999193600, inode = 0 }
+vm_state.vm_map: 23329.158601584 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999201792, end = 2999234560, flags = 134217845, pgoff = 0, inode = 1065073 }
+vm_state.vm_map: 23329.158603743 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999234560, end = 2999238656, flags = 135266419, pgoff = 28672, inode = 1065073 }
+vm_state.vm_map: 23329.158606228 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999238656, end = 2999283712, flags = 134217845, pgoff = 0, inode = 1065186 }
+vm_state.vm_map: 23329.158608546 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999283712, end = 2999287808, flags = 135266419, pgoff = 45056, inode = 1065186 }
+vm_state.vm_map: 23329.158613319 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999287808, end = 2999328768, flags = 134217845, pgoff = 0, inode = 1114244 }
+vm_state.vm_map: 23329.158615484 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999328768, end = 2999332864, flags = 135266419, pgoff = 36864, inode = 1114244 }
+vm_state.vm_map: 23329.158620473 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999332864, end = 2999414784, flags = 134217845, pgoff = 0, inode = 23971 }
+vm_state.vm_map: 23329.158622902 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999414784, end = 2999418880, flags = 135266419, pgoff = 81920, inode = 23971 }
+vm_state.vm_map: 23329.158627657 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999418880, end = 2999676928, flags = 134217845, pgoff = 0, inode = 1066196 }
+vm_state.vm_map: 23329.158629710 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999676928, end = 2999685120, flags = 135266419, pgoff = 253952, inode = 1066196 }
+vm_state.vm_map: 23329.158632060 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999689216, end = 2999705600, flags = 134217845, pgoff = 0, inode = 21276 }
+vm_state.vm_map: 23329.158634058 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999705600, end = 2999709696, flags = 135266419, pgoff = 12288, inode = 21276 }
+vm_state.vm_map: 23329.158636401 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999709696, end = 2999734272, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.158638399 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999734272, end = 2999738368, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.158640446 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999738368, end = 2999742464, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.158642716 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999742464, end = 2999750656, flags = 134217845, pgoff = 0, inode = 508383 }
+vm_state.vm_map: 23329.158644917 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999750656, end = 2999754752, flags = 135266417, pgoff = 4096, inode = 508383 }
+vm_state.vm_map: 23329.158646958 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999754752, end = 2999758848, flags = 135266419, pgoff = 8192, inode = 508383 }
+vm_state.vm_map: 23329.158651861 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999758848, end = 2999775232, flags = 134217845, pgoff = 0, inode = 59036 }
+vm_state.vm_map: 23329.158653901 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999775232, end = 2999779328, flags = 135266419, pgoff = 12288, inode = 59036 }
+vm_state.vm_map: 23329.158659070 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999779328, end = 2999799808, flags = 134217845, pgoff = 0, inode = 58996 }
+vm_state.vm_map: 23329.158661105 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999799808, end = 2999803904, flags = 135266419, pgoff = 20480, inode = 58996 }
+vm_state.vm_map: 23329.158670489 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999803904, end = 2999857152, flags = 134217845, pgoff = 0, inode = 1114238 }
+vm_state.vm_map: 23329.158672648 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999857152, end = 2999861248, flags = 135266419, pgoff = 53248, inode = 1114238 }
+vm_state.vm_map: 23329.158680189 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 2999861248, end = 3000020992, flags = 134217845, pgoff = 0, inode = 59044 }
+vm_state.vm_map: 23329.158682360 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3000020992, end = 3000029184, flags = 135266419, pgoff = 159744, inode = 59044 }
+vm_state.vm_map: 23329.158689470 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3000029184, end = 3000061952, flags = 134217845, pgoff = 0, inode = 58974 }
+vm_state.vm_map: 23329.158691517 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3000061952, end = 3000066048, flags = 135266419, pgoff = 28672, inode = 58974 }
+vm_state.vm_map: 23329.158699189 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3000066048, end = 3000451072, flags = 134217845, pgoff = 0, inode = 59002 }
+vm_state.vm_map: 23329.158701347 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3000451072, end = 3000463360, flags = 135266419, pgoff = 380928, inode = 59002 }
+vm_state.vm_map: 23329.158706182 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3000463360, end = 3000500224, flags = 134217845, pgoff = 0, inode = 59009 }
+vm_state.vm_map: 23329.158708352 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3000500224, end = 3000504320, flags = 135266419, pgoff = 32768, inode = 59009 }
+vm_state.vm_map: 23329.158715358 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3000504320, end = 3000541184, flags = 134217845, pgoff = 0, inode = 20855 }
+vm_state.vm_map: 23329.158717343 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3000541184, end = 3000545280, flags = 135266419, pgoff = 36864, inode = 20855 }
+vm_state.vm_map: 23329.158722178 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3000545280, end = 3000553472, flags = 134217845, pgoff = 0, inode = 23893 }
+vm_state.vm_map: 23329.158724207 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3000553472, end = 3000557568, flags = 135266419, pgoff = 4096, inode = 23893 }
+vm_state.vm_map: 23329.158726735 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3000557568, end = 3000741888, flags = 134217845, pgoff = 0, inode = 23888 }
+vm_state.vm_map: 23329.158728832 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3000741888, end = 3000750080, flags = 135266419, pgoff = 180224, inode = 23888 }
+vm_state.vm_map: 23329.158731402 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3000750080, end = 3000922112, flags = 134217845, pgoff = 0, inode = 58971 }
+vm_state.vm_map: 23329.158736249 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3000922112, end = 3000930304, flags = 135266419, pgoff = 167936, inode = 58971 }
+vm_state.vm_map: 23329.158738538 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3000930304, end = 3002966016, flags = 134217937, pgoff = 0, inode = 41242 }
+vm_state.vm_map: 23329.158740770 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3002966016, end = 3003006976, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.158742947 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3003006976, end = 3003011072, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.158745074 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3003011072, end = 3003015168, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.158752652 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3003015168, end = 3019255808, flags = 134217979, pgoff = 0, inode = 1204696 }
+vm_state.vm_map: 23329.158755144 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3019255808, end = 3023552512, flags = 134217979, pgoff = 0, inode = 1204694 }
+vm_state.vm_map: 23329.158757666 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3023552512, end = 3023753216, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 23329.158759713 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3023753216, end = 3023757312, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 23329.158764622 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3023757312, end = 3023790080, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 23329.158766682 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3023790080, end = 3023794176, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 23329.158771584 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3023794176, end = 3023802368, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 23329.158773637 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3023802368, end = 3023806464, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 23329.158780526 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3023806464, end = 3023831040, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 23329.158782616 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3023831040, end = 3023835136, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 23329.158790065 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3023839232, end = 3023851520, flags = 134217845, pgoff = 0, inode = 1114259 }
+vm_state.vm_map: 23329.158792100 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3023851520, end = 3023855616, flags = 135266419, pgoff = 8192, inode = 1114259 }
+vm_state.vm_map: 23329.158794487 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3023855616, end = 3023925248, flags = 134217845, pgoff = 0, inode = 59034 }
+vm_state.vm_map: 23329.158796497 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3023925248, end = 3023929344, flags = 135266419, pgoff = 65536, inode = 59034 }
+vm_state.vm_map: 23329.158798588 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3023929344, end = 3024166912, flags = 1048691, pgoff = 3024166912, inode = 0 }
+vm_state.vm_map: 23329.158805611 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024171008, end = 3024203776, flags = 134217937, pgoff = 0, inode = 1196328 }
+vm_state.vm_map: 23329.158808459 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024203776, end = 3024216064, flags = 134217937, pgoff = 0, inode = 1196327 }
+vm_state.vm_map: 23329.158810815 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024216064, end = 3024224256, flags = 134217937, pgoff = 0, inode = 1196320 }
+vm_state.vm_map: 23329.158815434 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024224256, end = 3024228352, flags = 134217937, pgoff = 0, inode = 1196318 }
+vm_state.vm_map: 23329.158817864 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024228352, end = 3024232448, flags = 134217937, pgoff = 0, inode = 1196278 }
+vm_state.vm_map: 23329.158820330 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024232448, end = 3024236544, flags = 134217937, pgoff = 0, inode = 1196251 }
+vm_state.vm_map: 23329.158822736 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024236544, end = 3024265216, flags = 134217937, pgoff = 0, inode = 1196236 }
+vm_state.vm_map: 23329.158825072 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024265216, end = 3024277504, flags = 134217937, pgoff = 0, inode = 1196234 }
+vm_state.vm_map: 23329.158827416 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024277504, end = 3024281600, flags = 134217937, pgoff = 0, inode = 1196201 }
+vm_state.vm_map: 23329.158829666 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024281600, end = 3024289792, flags = 134217937, pgoff = 0, inode = 1196170 }
+vm_state.vm_map: 23329.158831997 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024289792, end = 3024293888, flags = 134217937, pgoff = 0, inode = 1196157 }
+vm_state.vm_map: 23329.158836561 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024293888, end = 3024297984, flags = 134217937, pgoff = 0, inode = 1196171 }
+vm_state.vm_map: 23329.158838855 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024297984, end = 3024310272, flags = 134217937, pgoff = 0, inode = 1196172 }
+vm_state.vm_map: 23329.158841229 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024310272, end = 3024318464, flags = 134217937, pgoff = 0, inode = 1196173 }
+vm_state.vm_map: 23329.158843702 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024318464, end = 3024351232, flags = 134217937, pgoff = 0, inode = 1196352 }
+vm_state.vm_map: 23329.158846366 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024351232, end = 3024371712, flags = 134217937, pgoff = 0, inode = 1196196 }
+vm_state.vm_map: 23329.158848580 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024371712, end = 3024379904, flags = 134217937, pgoff = 0, inode = 1196343 }
+vm_state.vm_map: 23329.158850923 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024379904, end = 3024408576, flags = 134217937, pgoff = 0, inode = 1196314 }
+vm_state.vm_map: 23329.158855684 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024408576, end = 3024453632, flags = 134217937, pgoff = 0, inode = 1196147 }
+vm_state.vm_map: 23329.158858107 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024453632, end = 3024510976, flags = 134217937, pgoff = 0, inode = 1196094 }
+vm_state.vm_map: 23329.158860463 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024510976, end = 3024736256, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.158862479 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024736256, end = 3024740352, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.158864570 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024740352, end = 3024744448, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.158869275 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024752640, end = 3024756736, flags = 134217937, pgoff = 0, inode = 1196150 }
+vm_state.vm_map: 23329.158871637 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024756736, end = 3024781312, flags = 134217937, pgoff = 0, inode = 1196354 }
+vm_state.vm_map: 23329.158878684 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024781312, end = 3024838656, flags = 134217937, pgoff = 0, inode = 1196355 }
+vm_state.vm_map: 23329.158880762 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024838656, end = 3024871424, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 23329.158883076 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024871424, end = 3024875520, flags = 135266419, pgoff = 32768, inode = 20716 }
+vm_state.vm_map: 23329.158885171 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3024875520, end = 3025395712, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 23329.158887263 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3025395712, end = 3025403904, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 23329.158889254 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3025403904, end = 3025768448, flags = 134217845, pgoff = 0, inode = 23376 }
+vm_state.vm_map: 23329.158891350 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3025768448, end = 3025805312, flags = 135266423, pgoff = 364544, inode = 23376 }
+vm_state.vm_map: 23329.158893441 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3025805312, end = 3025809408, flags = 1048695, pgoff = 3025805312, inode = 0 }
+vm_state.vm_map: 23329.158895457 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3025809408, end = 3026362368, flags = 134217845, pgoff = 0, inode = 18947 }
+vm_state.vm_map: 23329.158897677 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3026362368, end = 3026382848, flags = 135266419, pgoff = 548864, inode = 18947 }
+vm_state.vm_map: 23329.158899701 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3026382848, end = 3026698240, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 23329.158901803 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3026698240, end = 3026706432, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 23329.158903862 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3026706432, end = 3026776064, flags = 134217845, pgoff = 0, inode = 1065123 }
+vm_state.vm_map: 23329.158905990 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3026776064, end = 3026780160, flags = 135266419, pgoff = 69632, inode = 1065123 }
+vm_state.vm_map: 23329.158908087 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3026780160, end = 3041275904, flags = 134217845, pgoff = 0, inode = 20672 }
+vm_state.vm_map: 23329.158912520 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3041275904, end = 3041890304, flags = 135266419, pgoff = 14495744, inode = 20672 }
+vm_state.vm_map: 23329.158914574 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3041890304, end = 3041898496, flags = 1048691, pgoff = 3041890304, inode = 0 }
+vm_state.vm_map: 23329.158917065 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3041898496, end = 3042271232, flags = 134217845, pgoff = 0, inode = 20902 }
+vm_state.vm_map: 23329.158919131 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3042271232, end = 3042283520, flags = 135266419, pgoff = 368640, inode = 20902 }
+vm_state.vm_map: 23329.158926173 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3042283520, end = 3042287616, flags = 134217845, pgoff = 0, inode = 20890 }
+vm_state.vm_map: 23329.158928338 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3042287616, end = 3042291712, flags = 135266419, pgoff = 0, inode = 20890 }
+vm_state.vm_map: 23329.158930848 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3042291712, end = 3042295808, flags = 134217937, pgoff = 0, inode = 1196334 }
+vm_state.vm_map: 23329.158933216 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3042295808, end = 3042299904, flags = 134217937, pgoff = 0, inode = 1196333 }
+vm_state.vm_map: 23329.158935633 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3042299904, end = 3042304000, flags = 134217937, pgoff = 0, inode = 1196331 }
+vm_state.vm_map: 23329.158938038 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3042304000, end = 3042308096, flags = 134217937, pgoff = 0, inode = 1196330 }
+vm_state.vm_map: 23329.158940295 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3042308096, end = 3042316288, flags = 134217937, pgoff = 0, inode = 1196329 }
+vm_state.vm_map: 23329.158942638 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3042316288, end = 3042373632, flags = 134217845, pgoff = 0, inode = 22475 }
+vm_state.vm_map: 23329.158944858 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3042373632, end = 3042377728, flags = 135266419, pgoff = 57344, inode = 22475 }
+vm_state.vm_map: 23329.158946844 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3042377728, end = 3044360192, flags = 134217845, pgoff = 0, inode = 20915 }
+vm_state.vm_map: 23329.158948842 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3044360192, end = 3044401152, flags = 135266419, pgoff = 1978368, inode = 20915 }
+vm_state.vm_map: 23329.158951025 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3044401152, end = 3045732352, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.158953411 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3045732352, end = 3045748736, flags = 1048691, pgoff = 3045732352, inode = 0 }
+vm_state.vm_map: 23329.158955439 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3045748736, end = 3045896192, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.158957524 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3045896192, end = 3045904384, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.158959646 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3045904384, end = 3046223872, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 23329.158961754 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3046223872, end = 3046240256, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 23329.158963801 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3046240256, end = 3046252544, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 23329.158966021 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3046252544, end = 3046256640, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 23329.158968068 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3046256640, end = 3047514112, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 23329.158970153 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3047514112, end = 3047534592, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 23329.158972280 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3047534592, end = 3047542784, flags = 1048691, pgoff = 3047534592, inode = 0 }
+vm_state.vm_map: 23329.158974377 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3047542784, end = 3047780352, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 23329.158976412 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3047780352, end = 3047784448, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 23329.158978558 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3047784448, end = 3047800832, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.158980642 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3047800832, end = 3047804928, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.158982659 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3047804928, end = 3047813120, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.158984866 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3047813120, end = 3047817216, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.158987271 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3047817216, end = 3048009728, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.158989282 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3048009728, end = 3048013824, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.158991471 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3048013824, end = 3048067072, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 23329.158993580 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3048067072, end = 3048071168, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 23329.158995683 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3048071168, end = 3048075264, flags = 1048691, pgoff = 3048071168, inode = 0 }
+vm_state.vm_map: 23329.158997829 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3048075264, end = 3048259584, flags = 134217845, pgoff = 0, inode = 22064 }
+vm_state.vm_map: 23329.158999938 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3048259584, end = 3048267776, flags = 135266419, pgoff = 180224, inode = 22064 }
+vm_state.vm_map: 23329.159002047 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3048267776, end = 3048509440, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.159004038 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3048509440, end = 3048513536, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.159084956 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3048513536, end = 3048984576, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 23329.159087176 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3048984576, end = 3049000960, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 23329.159089353 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049000960, end = 3049144320, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 23329.159091548 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049144320, end = 3049148416, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 23329.159093632 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049148416, end = 3049234432, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 23329.159095728 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049234432, end = 3049238528, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 23329.159097986 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049238528, end = 3049242624, flags = 1048691, pgoff = 3049238528, inode = 0 }
+vm_state.vm_map: 23329.159100612 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049242624, end = 3049259008, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 23329.159102690 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049259008, end = 3049263104, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 23329.159104898 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049263104, end = 3049295872, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 23329.159107149 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049295872, end = 3049299968, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 23329.159109234 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049299968, end = 3049316352, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 23329.159114820 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049316352, end = 3049320448, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 23329.159116904 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049320448, end = 3049406464, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 23329.159119050 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049406464, end = 3049410560, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 23329.159121104 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049410560, end = 3049418752, flags = 1048691, pgoff = 3049410560, inode = 0 }
+vm_state.vm_map: 23329.159123225 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049418752, end = 3049447424, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 23329.159125414 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049447424, end = 3049451520, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 23329.159127585 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049451520, end = 3049455616, flags = 1048691, pgoff = 3049451520, inode = 0 }
+vm_state.vm_map: 23329.159129620 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049455616, end = 3049787392, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 23329.159131729 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049787392, end = 3049795584, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 23329.159133930 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049795584, end = 3049828352, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 23329.159136268 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049828352, end = 3049832448, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 23329.159138549 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049832448, end = 3049848832, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 23329.159140775 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049848832, end = 3049852928, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 23329.159142847 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049852928, end = 3049877504, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 23329.159144962 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049877504, end = 3049881600, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 23329.159147090 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049881600, end = 3049914368, flags = 134217845, pgoff = 0, inode = 21180 }
+vm_state.vm_map: 23329.159149267 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049914368, end = 3049918464, flags = 135266419, pgoff = 28672, inode = 21180 }
+vm_state.vm_map: 23329.159151302 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049918464, end = 3049922560, flags = 1048691, pgoff = 3049918464, inode = 0 }
+vm_state.vm_map: 23329.159153627 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3049922560, end = 3050352640, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 23329.159155668 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3050352640, end = 3050381312, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 23329.159157764 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3050381312, end = 3050385408, flags = 1048691, pgoff = 3050381312, inode = 0 }
+vm_state.vm_map: 23329.159159978 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3050385408, end = 3050827776, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 23329.159162075 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3050827776, end = 3050835968, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 23329.159164178 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3050835968, end = 3050934272, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.159166614 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3050934272, end = 3050938368, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.159168636 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3050938368, end = 3051208704, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 23329.159170948 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3051208704, end = 3051216896, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 23329.159173132 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3051216896, end = 3051278336, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 23329.159175204 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3051278336, end = 3051282432, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 23329.159177133 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3051282432, end = 3051286528, flags = 1048691, pgoff = 3051282432, inode = 0 }
+vm_state.vm_map: 23329.159179280 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3051286528, end = 3051753472, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 23329.159181375 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3051753472, end = 3051761664, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 23329.159183343 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3051761664, end = 3052892160, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 23329.159185490 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3052892160, end = 3052908544, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 23329.159187561 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3052908544, end = 3053023232, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.159189552 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3053023232, end = 3053027328, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.159191526 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3053027328, end = 3053174784, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.159193691 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3053174784, end = 3053178880, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.159195688 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3053178880, end = 3053182976, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.159197773 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3053182976, end = 3053191168, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.159199820 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3053191168, end = 3053195264, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.159201873 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3053195264, end = 3053199360, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.159204180 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3053199360, end = 3053203456, flags = 1048691, pgoff = 3053199360, inode = 0 }
+vm_state.vm_map: 23329.159206159 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3053203456, end = 3053289472, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.159208225 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3053289472, end = 3053293568, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.159210297 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3053293568, end = 3053297664, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.159214786 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3053297664, end = 3053305856, flags = 1048691, pgoff = 3053297664, inode = 0 }
+vm_state.vm_map: 23329.159216871 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3053305856, end = 3054043136, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.159219078 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3054043136, end = 3054047232, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.159221187 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3054047232, end = 3054075904, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.159223228 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3054075904, end = 3054080000, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.159225374 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3054080000, end = 3054084096, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.159227348 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3054084096, end = 3054100480, flags = 134217845, pgoff = 0, inode = 19625 }
+vm_state.vm_map: 23329.159229531 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3054100480, end = 3054104576, flags = 135266419, pgoff = 12288, inode = 19625 }
+vm_state.vm_map: 23329.159231664 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3054104576, end = 3054182400, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.159233675 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3054182400, end = 3054186496, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.159235808 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3054186496, end = 3055501312, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.159238145 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3055501312, end = 3055509504, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.159240217 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3055509504, end = 3055513600, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.159242147 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3055513600, end = 3055529984, flags = 1048691, pgoff = 3055513600, inode = 0 }
+vm_state.vm_map: 23329.159244226 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3055529984, end = 3056467968, flags = 134217845, pgoff = 0, inode = 16400 }
+vm_state.vm_map: 23329.159246267 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3056467968, end = 3056484352, flags = 135266417, pgoff = 937984, inode = 16400 }
+vm_state.vm_map: 23329.159248271 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3056484352, end = 3056488448, flags = 135266419, pgoff = 954368, inode = 16400 }
+vm_state.vm_map: 23329.159250269 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3056488448, end = 3056517120, flags = 1048691, pgoff = 3056488448, inode = 0 }
+vm_state.vm_map: 23329.159252630 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3056517120, end = 3066556416, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 23329.159254751 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3066556416, end = 3066716160, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 23329.159256712 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3066716160, end = 3066724352, flags = 1048691, pgoff = 3066716160, inode = 0 }
+vm_state.vm_map: 23329.159259081 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3066724352, end = 3070320640, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 23329.159261164 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3070320640, end = 3070418944, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 23329.159263199 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3070418944, end = 3070423040, flags = 1048691, pgoff = 3070418944, inode = 0 }
+vm_state.vm_map: 23329.159265439 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3070423040, end = 3072978944, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 23329.159267596 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3072978944, end = 3073028096, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 23329.159269662 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3073028096, end = 3073032192, flags = 1048691, pgoff = 3073028096, inode = 0 }
+vm_state.vm_map: 23329.159272160 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3073032192, end = 3074183168, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.159274398 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3074183168, end = 3074199552, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.159276501 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3074199552, end = 3074433024, flags = 134217845, pgoff = 0, inode = 1065180 }
+vm_state.vm_map: 23329.159278548 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3074433024, end = 3074441216, flags = 135266419, pgoff = 233472, inode = 1065180 }
+vm_state.vm_map: 23329.159280750 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3074441216, end = 3074445312, flags = 1048691, pgoff = 3074441216, inode = 0 }
+vm_state.vm_map: 23329.159282754 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3074445312, end = 3076747264, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 23329.159284931 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3076747264, end = 3076792320, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 23329.159287089 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3076792320, end = 3079102464, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 23329.159289173 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3079102464, end = 3079131136, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 23329.159291221 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3079131136, end = 3079135232, flags = 1048691, pgoff = 3079131136, inode = 0 }
+vm_state.vm_map: 23329.159293780 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3079139328, end = 3079151616, flags = 134217937, pgoff = 0, inode = 1196342 }
+vm_state.vm_map: 23329.159296006 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3079151616, end = 3079159808, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 23329.159298133 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3079159808, end = 3079163904, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 23329.159300094 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3079163904, end = 3079180288, flags = 134217845, pgoff = 0, inode = 22094 }
+vm_state.vm_map: 23329.159302203 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3079180288, end = 3079184384, flags = 135266419, pgoff = 12288, inode = 22094 }
+vm_state.vm_map: 23329.159304411 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3079184384, end = 3079192576, flags = 134217845, pgoff = 0, inode = 1450327 }
+vm_state.vm_map: 23329.159306804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3079192576, end = 3079196672, flags = 135266417, pgoff = 4096, inode = 1450327 }
+vm_state.vm_map: 23329.159309116 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3079196672, end = 3079200768, flags = 135266419, pgoff = 8192, inode = 1450327 }
+vm_state.vm_map: 23329.159311429 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3079200768, end = 3079229440, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.159313636 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3079229440, end = 3079237632, flags = 1048691, pgoff = 3079229440, inode = 0 }
+vm_state.vm_map: 23329.159315949 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3079237632, end = 3079241728, flags = 67371125, pgoff = 3079237632, inode = 0 }
+vm_state.vm_map: 23329.159318069 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3079241728, end = 3079356416, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.159320135 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3079356416, end = 3079360512, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.159322171 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3079360512, end = 3079364608, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.159324384 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2164, start = 3215650816, end = 3215736832, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.159328176 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2182, start = 134512640, end = 134524928, flags = 134223989, pgoff = 0, inode = 18933 }
+vm_state.vm_map: 23329.159330347 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2182, start = 134524928, end = 134529024, flags = 135272563, pgoff = 8192, inode = 18933 }
+vm_state.vm_map: 23329.159332684 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2182, start = 139386880, end = 139522048, flags = 1048691, pgoff = 139386880, inode = 0 }
+vm_state.vm_map: 23329.159334978 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2182, start = 3076870144, end = 3076874240, flags = 1048691, pgoff = 3076870144, inode = 0 }
+vm_state.vm_map: 23329.159337254 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2182, start = 3076874240, end = 3078189056, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.159339350 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2182, start = 3078189056, end = 3078197248, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.159341687 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2182, start = 3078197248, end = 3078201344, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.159344308 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2182, start = 3078201344, end = 3078213632, flags = 1048691, pgoff = 3078201344, inode = 0 }
+vm_state.vm_map: 23329.159346960 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2182, start = 3078307840, end = 3078316032, flags = 1048691, pgoff = 3078307840, inode = 0 }
+vm_state.vm_map: 23329.159348909 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2182, start = 3078316032, end = 3078320128, flags = 67371125, pgoff = 3078316032, inode = 0 }
+vm_state.vm_map: 23329.159351344 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2182, start = 3078320128, end = 3078434816, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.159354002 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2182, start = 3078434816, end = 3078438912, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.159356389 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2182, start = 3078438912, end = 3078443008, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.159358639 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2182, start = 3220574208, end = 3220660224, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.159364387 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 134512640, end = 134553600, flags = 134223989, pgoff = 0, inode = 20759 }
+vm_state.vm_map: 23329.159366718 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 134553600, end = 134557696, flags = 135272563, pgoff = 36864, inode = 20759 }
+vm_state.vm_map: 23329.159368987 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 134557696, end = 134565888, flags = 1048691, pgoff = 134557696, inode = 0 }
+vm_state.vm_map: 23329.159371275 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 153337856, end = 155066368, flags = 1048691, pgoff = 153337856, inode = 0 }
+vm_state.vm_map: 23329.159373927 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 2991767552, end = 2993803264, flags = 134217937, pgoff = 0, inode = 41242 }
+vm_state.vm_map: 23329.159376609 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 2993803264, end = 2993844224, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.159378841 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 2993844224, end = 2993848320, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.159380920 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 2993848320, end = 2993852416, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.159383559 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 2993852416, end = 2993889280, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.159385686 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 2993889280, end = 2993893376, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.159388048 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 2993893376, end = 2993897472, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.159393154 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 2993897472, end = 2993922048, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.159395220 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 2993922048, end = 2993926144, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.159397698 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 2993926144, end = 2993930240, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.159400300 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 2994024448, end = 2994028544, flags = 1048688, pgoff = 2994024448, inode = 0 }
+vm_state.vm_map: 23329.159402509 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 2994028544, end = 3002417152, flags = 1048691, pgoff = 2994028544, inode = 0 }
+vm_state.vm_map: 23329.159404914 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3002417152, end = 3018657792, flags = 134217979, pgoff = 0, inode = 1204696 }
+vm_state.vm_map: 23329.159407344 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3018657792, end = 3022954496, flags = 134217979, pgoff = 0, inode = 1204694 }
+vm_state.vm_map: 23329.159409822 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3022954496, end = 3023179776, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.159411919 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023179776, end = 3023183872, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.159413966 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023183872, end = 3023187968, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.159416494 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023187968, end = 3023388672, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 23329.159418714 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023388672, end = 3023392768, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 23329.159421606 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023392768, end = 3023425536, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 23329.159423690 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023425536, end = 3023429632, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 23329.159426089 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023429632, end = 3023437824, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 23329.159430942 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023437824, end = 3023441920, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 23329.159433316 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023441920, end = 3023519744, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.159435401 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023519744, end = 3023523840, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.159437380 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023523840, end = 3023527936, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.159439384 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023527936, end = 3023536128, flags = 1048691, pgoff = 3023527936, inode = 0 }
+vm_state.vm_map: 23329.159441820 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023536128, end = 3023540224, flags = 134217937, pgoff = 0, inode = 1196150 }
+vm_state.vm_map: 23329.159444133 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023540224, end = 3023564800, flags = 134217937, pgoff = 0, inode = 1196354 }
+vm_state.vm_map: 23329.159446815 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023564800, end = 3023568896, flags = 134217937, pgoff = 0, inode = 1196334 }
+vm_state.vm_map: 23329.159449442 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023568896, end = 3023572992, flags = 134217937, pgoff = 0, inode = 1196333 }
+vm_state.vm_map: 23329.159451773 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023572992, end = 3023577088, flags = 134217937, pgoff = 0, inode = 1196331 }
+vm_state.vm_map: 23329.159454369 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023577088, end = 3023581184, flags = 134217937, pgoff = 0, inode = 1196330 }
+vm_state.vm_map: 23329.159456528 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023581184, end = 3023589376, flags = 134217937, pgoff = 0, inode = 1196329 }
+vm_state.vm_map: 23329.159459056 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023589376, end = 3023622144, flags = 134217937, pgoff = 0, inode = 1196328 }
+vm_state.vm_map: 23329.159461251 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023622144, end = 3023634432, flags = 134217937, pgoff = 0, inode = 1196327 }
+vm_state.vm_map: 23329.159463613 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023634432, end = 3023642624, flags = 134217937, pgoff = 0, inode = 1196320 }
+vm_state.vm_map: 23329.159487243 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023642624, end = 3023646720, flags = 134217937, pgoff = 0, inode = 1196318 }
+vm_state.vm_map: 23329.159489617 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023646720, end = 3023650816, flags = 134217937, pgoff = 0, inode = 1196278 }
+vm_state.vm_map: 23329.159492318 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023650816, end = 3023654912, flags = 134217937, pgoff = 0, inode = 1196251 }
+vm_state.vm_map: 23329.159494630 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023654912, end = 3023683584, flags = 134217937, pgoff = 0, inode = 1196236 }
+vm_state.vm_map: 23329.159497189 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023683584, end = 3023695872, flags = 134217937, pgoff = 0, inode = 1196234 }
+vm_state.vm_map: 23329.159499958 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023695872, end = 3023699968, flags = 134217937, pgoff = 0, inode = 1196201 }
+vm_state.vm_map: 23329.159502308 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023699968, end = 3023708160, flags = 134217937, pgoff = 0, inode = 1196170 }
+vm_state.vm_map: 23329.159504953 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023708160, end = 3023712256, flags = 134217937, pgoff = 0, inode = 1196157 }
+vm_state.vm_map: 23329.159507623 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023712256, end = 3023716352, flags = 134217937, pgoff = 0, inode = 1196171 }
+vm_state.vm_map: 23329.159510269 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023716352, end = 3023728640, flags = 134217937, pgoff = 0, inode = 1196172 }
+vm_state.vm_map: 23329.159512723 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023728640, end = 3023736832, flags = 134217937, pgoff = 0, inode = 1196173 }
+vm_state.vm_map: 23329.159514974 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023736832, end = 3023769600, flags = 134217937, pgoff = 0, inode = 1196352 }
+vm_state.vm_map: 23329.159517219 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023769600, end = 3023790080, flags = 134217937, pgoff = 0, inode = 1196196 }
+vm_state.vm_map: 23329.159519821 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023790080, end = 3023798272, flags = 134217937, pgoff = 0, inode = 1196343 }
+vm_state.vm_map: 23329.159522460 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023798272, end = 3023826944, flags = 134217937, pgoff = 0, inode = 1196314 }
+vm_state.vm_map: 23329.159524674 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023826944, end = 3023872000, flags = 134217937, pgoff = 0, inode = 1196147 }
+vm_state.vm_map: 23329.159527110 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023872000, end = 3023929344, flags = 134217937, pgoff = 0, inode = 1196094 }
+vm_state.vm_map: 23329.159529207 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3023929344, end = 3024166912, flags = 1048691, pgoff = 3024166912, inode = 0 }
+vm_state.vm_map: 23329.159532019 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3024175104, end = 3024199680, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 23329.159534140 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3024199680, end = 3024203776, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 23329.159536656 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3024203776, end = 3024240640, flags = 134217845, pgoff = 0, inode = 20855 }
+vm_state.vm_map: 23329.159538956 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3024240640, end = 3024244736, flags = 135266419, pgoff = 36864, inode = 20855 }
+vm_state.vm_map: 23329.159541700 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3024244736, end = 3024359424, flags = 134217845, pgoff = 0, inode = 23885 }
+vm_state.vm_map: 23329.159543703 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3024359424, end = 3024363520, flags = 135266419, pgoff = 110592, inode = 23885 }
+vm_state.vm_map: 23329.159545917 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3024363520, end = 3024445440, flags = 134217845, pgoff = 0, inode = 23971 }
+vm_state.vm_map: 23329.159548143 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3024445440, end = 3024449536, flags = 135266419, pgoff = 81920, inode = 23971 }
+vm_state.vm_map: 23329.159550647 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3024449536, end = 3024633856, flags = 134217845, pgoff = 0, inode = 23888 }
+vm_state.vm_map: 23329.159552800 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3024633856, end = 3024642048, flags = 135266419, pgoff = 180224, inode = 23888 }
+vm_state.vm_map: 23329.159555753 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3024642048, end = 3024830464, flags = 134217845, pgoff = 0, inode = 1066195 }
+vm_state.vm_map: 23329.159558455 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3024830464, end = 3024838656, flags = 135266419, pgoff = 184320, inode = 1066195 }
+vm_state.vm_map: 23329.159560773 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3024838656, end = 3024871424, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 23329.159563011 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3024871424, end = 3024875520, flags = 135266419, pgoff = 32768, inode = 20716 }
+vm_state.vm_map: 23329.159565379 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3024875520, end = 3025395712, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 23329.159567642 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3025395712, end = 3025403904, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 23329.159569782 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3025403904, end = 3025768448, flags = 134217845, pgoff = 0, inode = 23376 }
+vm_state.vm_map: 23329.159572181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3025768448, end = 3025805312, flags = 135266423, pgoff = 364544, inode = 23376 }
+vm_state.vm_map: 23329.159574395 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3025805312, end = 3025809408, flags = 1048695, pgoff = 3025805312, inode = 0 }
+vm_state.vm_map: 23329.159576645 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3025809408, end = 3026362368, flags = 134217845, pgoff = 0, inode = 18947 }
+vm_state.vm_map: 23329.159578872 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3026362368, end = 3026382848, flags = 135266419, pgoff = 548864, inode = 18947 }
+vm_state.vm_map: 23329.159581092 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3026382848, end = 3026698240, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 23329.159583447 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3026698240, end = 3026706432, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 23329.159585673 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3026706432, end = 3026776064, flags = 134217845, pgoff = 0, inode = 1065123 }
+vm_state.vm_map: 23329.159588109 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3026776064, end = 3026780160, flags = 135266419, pgoff = 69632, inode = 1065123 }
+vm_state.vm_map: 23329.159590397 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3026780160, end = 3041275904, flags = 134217845, pgoff = 0, inode = 20672 }
+vm_state.vm_map: 23329.159592494 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3041275904, end = 3041890304, flags = 135266419, pgoff = 14495744, inode = 20672 }
+vm_state.vm_map: 23329.159595115 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3041890304, end = 3041898496, flags = 1048691, pgoff = 3041890304, inode = 0 }
+vm_state.vm_map: 23329.159597365 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3041898496, end = 3042271232, flags = 134217845, pgoff = 0, inode = 20902 }
+vm_state.vm_map: 23329.159599443 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3042271232, end = 3042283520, flags = 135266419, pgoff = 368640, inode = 20902 }
+vm_state.vm_map: 23329.159601922 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3042308096, end = 3042320384, flags = 134217937, pgoff = 0, inode = 1196342 }
+vm_state.vm_map: 23329.159604506 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3042320384, end = 3042377728, flags = 134217937, pgoff = 0, inode = 1196355 }
+vm_state.vm_map: 23329.159606924 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3042377728, end = 3044360192, flags = 134217845, pgoff = 0, inode = 20915 }
+vm_state.vm_map: 23329.159609002 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3044360192, end = 3044401152, flags = 135266419, pgoff = 1978368, inode = 20915 }
+vm_state.vm_map: 23329.159611529 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3044401152, end = 3045732352, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.159613621 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3045732352, end = 3045748736, flags = 1048691, pgoff = 3045732352, inode = 0 }
+vm_state.vm_map: 23329.159616180 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3045748736, end = 3045896192, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.159618301 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3045896192, end = 3045904384, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.159620767 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3045904384, end = 3046223872, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 23329.159623042 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3046223872, end = 3046240256, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 23329.159625207 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3046240256, end = 3046252544, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 23329.159627501 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3046252544, end = 3046256640, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 23329.159629795 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3046256640, end = 3047514112, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 23329.159632318 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3047514112, end = 3047534592, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 23329.159634457 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3047534592, end = 3047542784, flags = 1048691, pgoff = 3047534592, inode = 0 }
+vm_state.vm_map: 23329.159636554 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3047542784, end = 3047780352, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 23329.159638773 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3047780352, end = 3047784448, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 23329.159641184 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3047784448, end = 3047800832, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.159643540 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3047800832, end = 3047804928, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.159645686 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3047804928, end = 3047813120, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.159647962 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3047813120, end = 3047817216, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.159650656 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3047817216, end = 3048009728, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.159652759 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3048009728, end = 3048013824, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.159654893 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3048013824, end = 3048067072, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 23329.159656971 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3048067072, end = 3048071168, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 23329.159659351 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3048071168, end = 3048075264, flags = 1048691, pgoff = 3048071168, inode = 0 }
+vm_state.vm_map: 23329.159661719 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3048075264, end = 3048259584, flags = 134217845, pgoff = 0, inode = 22064 }
+vm_state.vm_map: 23329.159663723 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3048259584, end = 3048267776, flags = 135266419, pgoff = 180224, inode = 22064 }
+vm_state.vm_map: 23329.159665950 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3048267776, end = 3048509440, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.159668336 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3048509440, end = 3048513536, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.159670371 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3048513536, end = 3048984576, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 23329.159672690 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3048984576, end = 3049000960, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 23329.159674743 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049000960, end = 3049144320, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 23329.159676877 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049144320, end = 3049148416, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 23329.159678980 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049148416, end = 3049234432, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 23329.159686824 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049234432, end = 3049238528, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 23329.159689141 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049238528, end = 3049242624, flags = 1048691, pgoff = 3049238528, inode = 0 }
+vm_state.vm_map: 23329.159691756 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049242624, end = 3049259008, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 23329.159694180 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049259008, end = 3049263104, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 23329.159696652 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049263104, end = 3049295872, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 23329.159698817 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049295872, end = 3049299968, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 23329.159701118 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049299968, end = 3049316352, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 23329.159703406 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049316352, end = 3049320448, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 23329.159705680 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049320448, end = 3049406464, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 23329.159708511 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049406464, end = 3049410560, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 23329.159710706 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049410560, end = 3049418752, flags = 1048691, pgoff = 3049410560, inode = 0 }
+vm_state.vm_map: 23329.159713099 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049418752, end = 3049447424, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 23329.159715134 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049447424, end = 3049451520, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 23329.159717274 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049451520, end = 3049455616, flags = 1048691, pgoff = 3049451520, inode = 0 }
+vm_state.vm_map: 23329.159719555 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049455616, end = 3049787392, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 23329.159721541 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049787392, end = 3049795584, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 23329.159723619 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049795584, end = 3049828352, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 23329.159725944 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049828352, end = 3049832448, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 23329.159728380 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049832448, end = 3049848832, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 23329.159730661 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049848832, end = 3049852928, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 23329.159732943 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049852928, end = 3049877504, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 23329.159735440 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049877504, end = 3049881600, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 23329.159737716 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049881600, end = 3049914368, flags = 134217845, pgoff = 0, inode = 21180 }
+vm_state.vm_map: 23329.159739905 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049914368, end = 3049918464, flags = 135266419, pgoff = 28672, inode = 21180 }
+vm_state.vm_map: 23329.159742181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049918464, end = 3049922560, flags = 1048691, pgoff = 3049918464, inode = 0 }
+vm_state.vm_map: 23329.159744795 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3049922560, end = 3050352640, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 23329.159746849 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3050352640, end = 3050381312, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 23329.159749198 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3050381312, end = 3050385408, flags = 1048691, pgoff = 3050381312, inode = 0 }
+vm_state.vm_map: 23329.159751862 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3050385408, end = 3050827776, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 23329.159753934 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3050827776, end = 3050835968, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 23329.159756327 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3050835968, end = 3050934272, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.159758356 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3050934272, end = 3050938368, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.159760539 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3050938368, end = 3051208704, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 23329.159762808 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3051208704, end = 3051216896, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 23329.159765213 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3051216896, end = 3051278336, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 23329.159767649 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3051278336, end = 3051282432, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 23329.159769875 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3051282432, end = 3051286528, flags = 1048691, pgoff = 3051282432, inode = 0 }
+vm_state.vm_map: 23329.159772539 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3051286528, end = 3051753472, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 23329.159774739 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3051753472, end = 3051761664, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 23329.159777292 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3051761664, end = 3052892160, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 23329.159779420 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3052892160, end = 3052908544, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 23329.159781868 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3052908544, end = 3053023232, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.159783977 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3053023232, end = 3053027328, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.159786419 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3053027328, end = 3053174784, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.159788454 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3053174784, end = 3053178880, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.159790748 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3053178880, end = 3053182976, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.159792925 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3053182976, end = 3053191168, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.159797630 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3053191168, end = 3053195264, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.159799899 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3053195264, end = 3053199360, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.159802064 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3053199360, end = 3053203456, flags = 1048691, pgoff = 3053199360, inode = 0 }
+vm_state.vm_map: 23329.159804487 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3053203456, end = 3053289472, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.159806868 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3053289472, end = 3053293568, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.159809094 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3053293568, end = 3053297664, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.159811493 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3053297664, end = 3053305856, flags = 1048691, pgoff = 3053297664, inode = 0 }
+vm_state.vm_map: 23329.159813756 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3053305856, end = 3054043136, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.159816056 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3054043136, end = 3054047232, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.159818738 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3054047232, end = 3054075904, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.159820977 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3054075904, end = 3054080000, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.159823369 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3054080000, end = 3054084096, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.159825454 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3054084096, end = 3054100480, flags = 134217845, pgoff = 0, inode = 19625 }
+vm_state.vm_map: 23329.159827581 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3054100480, end = 3054104576, flags = 135266419, pgoff = 12288, inode = 19625 }
+vm_state.vm_map: 23329.159830343 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3054104576, end = 3054182400, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.159832656 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3054182400, end = 3054186496, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.159834895 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3054186496, end = 3055501312, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.159837127 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3055501312, end = 3055509504, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.159839551 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3055509504, end = 3055513600, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.159841839 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3055513600, end = 3055529984, flags = 1048691, pgoff = 3055513600, inode = 0 }
+vm_state.vm_map: 23329.159844231 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3055529984, end = 3056467968, flags = 134217845, pgoff = 0, inode = 16400 }
+vm_state.vm_map: 23329.159846414 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3056467968, end = 3056484352, flags = 135266417, pgoff = 937984, inode = 16400 }
+vm_state.vm_map: 23329.159848751 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3056484352, end = 3056488448, flags = 135266419, pgoff = 954368, inode = 16400 }
+vm_state.vm_map: 23329.159850952 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3056488448, end = 3056517120, flags = 1048691, pgoff = 3056488448, inode = 0 }
+vm_state.vm_map: 23329.159853197 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3056517120, end = 3066556416, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 23329.159856045 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3066556416, end = 3066716160, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 23329.159858352 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3066716160, end = 3066724352, flags = 1048691, pgoff = 3066716160, inode = 0 }
+vm_state.vm_map: 23329.159860683 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3066724352, end = 3070320640, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 23329.159863131 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3070320640, end = 3070418944, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 23329.159865363 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3070418944, end = 3070423040, flags = 1048691, pgoff = 3070418944, inode = 0 }
+vm_state.vm_map: 23329.159867707 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3070423040, end = 3072978944, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 23329.159870364 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3072978944, end = 3073028096, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 23329.159872449 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3073028096, end = 3073032192, flags = 1048691, pgoff = 3073028096, inode = 0 }
+vm_state.vm_map: 23329.159874891 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3073032192, end = 3074183168, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.159877024 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3074183168, end = 3074199552, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.159879522 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3074199552, end = 3074433024, flags = 134217845, pgoff = 0, inode = 1065180 }
+vm_state.vm_map: 23329.159881631 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3074433024, end = 3074441216, flags = 135266419, pgoff = 233472, inode = 1065180 }
+vm_state.vm_map: 23329.159884116 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3074441216, end = 3074445312, flags = 1048691, pgoff = 3074441216, inode = 0 }
+vm_state.vm_map: 23329.159886194 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3074445312, end = 3076747264, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 23329.159888334 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3076747264, end = 3076792320, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 23329.159890542 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3076792320, end = 3079102464, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 23329.159893027 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3079102464, end = 3079131136, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 23329.159895296 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3079131136, end = 3079135232, flags = 1048691, pgoff = 3079131136, inode = 0 }
+vm_state.vm_map: 23329.159897584 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3079151616, end = 3079159808, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 23329.159899872 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3079159808, end = 3079163904, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 23329.159902307 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3079163904, end = 3079180288, flags = 134217845, pgoff = 0, inode = 22094 }
+vm_state.vm_map: 23329.159904323 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3079180288, end = 3079184384, flags = 135266419, pgoff = 12288, inode = 22094 }
+vm_state.vm_map: 23329.159906951 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3079184384, end = 3079192576, flags = 134217845, pgoff = 0, inode = 1450327 }
+vm_state.vm_map: 23329.159909023 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3079192576, end = 3079196672, flags = 135266417, pgoff = 4096, inode = 1450327 }
+vm_state.vm_map: 23329.159911138 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3079196672, end = 3079200768, flags = 135266419, pgoff = 8192, inode = 1450327 }
+vm_state.vm_map: 23329.159913740 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3079200768, end = 3079229440, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.159915936 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3079229440, end = 3079237632, flags = 1048691, pgoff = 3079229440, inode = 0 }
+vm_state.vm_map: 23329.159918088 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3079237632, end = 3079241728, flags = 67371125, pgoff = 3079237632, inode = 0 }
+vm_state.vm_map: 23329.159920406 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3079241728, end = 3079356416, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.159922743 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3079356416, end = 3079360512, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.159924907 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3079360512, end = 3079364608, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.159927257 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2185, start = 3215650816, end = 3215736832, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.159938794 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 134512640, end = 134516736, flags = 134223989, pgoff = 0, inode = 1352648 }
+vm_state.vm_map: 23329.159940891 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 134516736, end = 134520832, flags = 135272563, pgoff = 0, inode = 1352648 }
+vm_state.vm_map: 23329.159943493 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 159334400, end = 163192832, flags = 1048691, pgoff = 159334400, inode = 0 }
+vm_state.vm_map: 23329.159951066 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2835415040, end = 2835988480, flags = 134217841, pgoff = 0, inode = 49559 }
+vm_state.vm_map: 23329.159959095 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2835988480, end = 2836127744, flags = 134217841, pgoff = 0, inode = 254140 }
+vm_state.vm_map: 23329.159961969 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2836127744, end = 2836164608, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.159964096 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2836164608, end = 2836168704, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.159966668 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2836168704, end = 2836172800, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.159969079 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2836172800, end = 2836250624, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.159971225 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2836250624, end = 2836254720, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.159973420 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2836254720, end = 2836258816, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.159975474 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2836258816, end = 2836267008, flags = 1048691, pgoff = 2836258816, inode = 0 }
+vm_state.vm_map: 23329.159986061 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2836279296, end = 2836361216, flags = 134217841, pgoff = 0, inode = 98443 }
+vm_state.vm_map: 23329.159991783 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2836361216, end = 2838396928, flags = 134217937, pgoff = 0, inode = 41242 }
+vm_state.vm_map: 23329.159994892 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2838396928, end = 2838437888, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.159997204 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2838437888, end = 2838441984, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.159999191 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2838441984, end = 2838446080, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.160001694 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2838446080, end = 2838470656, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.160003642 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2838470656, end = 2838474752, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.160006047 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2838474752, end = 2838478848, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.160014187 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2838478848, end = 2838540288, flags = 134217841, pgoff = 0, inode = 649749 }
+vm_state.vm_map: 23329.160023289 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2838540288, end = 2964881408, flags = 134217979, pgoff = 0, inode = 73879 }
+vm_state.vm_map: 23329.160028530 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2964881408, end = 2998538240, flags = 134217979, pgoff = 0, inode = 73878 }
+vm_state.vm_map: 23329.160037367 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2998538240, end = 2998603776, flags = 134217845, pgoff = 0, inode = 57391 }
+vm_state.vm_map: 23329.160039686 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2998603776, end = 2998607872, flags = 135266419, pgoff = 61440, inode = 57391 }
+vm_state.vm_map: 23329.160041739 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2998607872, end = 2998624256, flags = 1048691, pgoff = 2998607872, inode = 0 }
+vm_state.vm_map: 23329.160047431 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2998624256, end = 2998906880, flags = 134217845, pgoff = 0, inode = 22693 }
+vm_state.vm_map: 23329.160049515 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2998906880, end = 2998919168, flags = 135266419, pgoff = 282624, inode = 22693 }
+vm_state.vm_map: 23329.160051587 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2998919168, end = 2998943744, flags = 1048691, pgoff = 2998919168, inode = 0 }
+vm_state.vm_map: 23329.160056903 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2998947840, end = 2998964224, flags = 134217845, pgoff = 0, inode = 57390 }
+vm_state.vm_map: 23329.160058981 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2998964224, end = 2998968320, flags = 135266419, pgoff = 12288, inode = 57390 }
+vm_state.vm_map: 23329.160062040 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2998968320, end = 2998988800, flags = 134217845, pgoff = 0, inode = 57392 }
+vm_state.vm_map: 23329.160064482 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2998988800, end = 2998992896, flags = 135266419, pgoff = 16384, inode = 57392 }
+vm_state.vm_map: 23329.160067843 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2998992896, end = 2999033856, flags = 134217845, pgoff = 0, inode = 57395 }
+vm_state.vm_map: 23329.160069804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2999033856, end = 2999037952, flags = 135266419, pgoff = 36864, inode = 57395 }
+vm_state.vm_map: 23329.160074976 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2999037952, end = 2999308288, flags = 134217845, pgoff = 0, inode = 18916 }
+vm_state.vm_map: 23329.160077074 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2999308288, end = 2999312384, flags = 135266419, pgoff = 266240, inode = 18916 }
+vm_state.vm_map: 23329.160079941 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2999312384, end = 2999394304, flags = 134217845, pgoff = 0, inode = 18915 }
+vm_state.vm_map: 23329.160082062 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2999394304, end = 2999402496, flags = 135266419, pgoff = 77824, inode = 18915 }
+vm_state.vm_map: 23329.160157442 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 2999402496, end = 3000184832, flags = 134217845, pgoff = 0, inode = 18927 }
+vm_state.vm_map: 23329.160161049 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3000184832, end = 3000193024, flags = 135266419, pgoff = 778240, inode = 18927 }
+vm_state.vm_map: 23329.160169047 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3000193024, end = 3000205312, flags = 134217845, pgoff = 0, inode = 59166 }
+vm_state.vm_map: 23329.160171372 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3000205312, end = 3000209408, flags = 135266419, pgoff = 8192, inode = 59166 }
+vm_state.vm_map: 23329.160174178 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3000209408, end = 3000225792, flags = 134217845, pgoff = 0, inode = 57389 }
+vm_state.vm_map: 23329.160176330 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3000225792, end = 3000229888, flags = 135266419, pgoff = 12288, inode = 57389 }
+vm_state.vm_map: 23329.160179494 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3000229888, end = 3000262656, flags = 134217845, pgoff = 0, inode = 57396 }
+vm_state.vm_map: 23329.160182386 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3000262656, end = 3000266752, flags = 135266419, pgoff = 28672, inode = 57396 }
+vm_state.vm_map: 23329.160185192 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3000266752, end = 3000283136, flags = 134217845, pgoff = 0, inode = 57393 }
+vm_state.vm_map: 23329.160187634 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3000283136, end = 3000287232, flags = 135266419, pgoff = 12288, inode = 57393 }
+vm_state.vm_map: 23329.160193307 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3000287232, end = 3000651776, flags = 134217845, pgoff = 0, inode = 22572 }
+vm_state.vm_map: 23329.160195385 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3000651776, end = 3000659968, flags = 135266419, pgoff = 364544, inode = 22572 }
+vm_state.vm_map: 23329.160201046 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3000659968, end = 3000856576, flags = 134217845, pgoff = 0, inode = 20024 }
+vm_state.vm_map: 23329.160203562 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3000856576, end = 3000864768, flags = 135266419, pgoff = 192512, inode = 20024 }
+vm_state.vm_map: 23329.160205867 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3000864768, end = 3000872960, flags = 1048691, pgoff = 3000864768, inode = 0 }
+vm_state.vm_map: 23329.160208741 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3000872960, end = 3001323520, flags = 134217845, pgoff = 0, inode = 20711 }
+vm_state.vm_map: 23329.160210764 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3001323520, end = 3001335808, flags = 135266419, pgoff = 450560, inode = 20711 }
+vm_state.vm_map: 23329.160213879 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3001348096, end = 3001372672, flags = 134217845, pgoff = 0, inode = 18917 }
+vm_state.vm_map: 23329.160215987 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3001372672, end = 3001376768, flags = 135266419, pgoff = 20480, inode = 18917 }
+vm_state.vm_map: 23329.160218682 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3001376768, end = 3001393152, flags = 134217845, pgoff = 0, inode = 18914 }
+vm_state.vm_map: 23329.160220741 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3001393152, end = 3001397248, flags = 135266419, pgoff = 16384, inode = 18914 }
+vm_state.vm_map: 23329.160223855 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3001397248, end = 3001425920, flags = 134217845, pgoff = 0, inode = 57397 }
+vm_state.vm_map: 23329.160226365 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3001425920, end = 3001430016, flags = 135266419, pgoff = 24576, inode = 57397 }
+vm_state.vm_map: 23329.160229399 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3001430016, end = 3001556992, flags = 134217845, pgoff = 0, inode = 18923 }
+vm_state.vm_map: 23329.160231564 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3001556992, end = 3001561088, flags = 135266419, pgoff = 122880, inode = 18923 }
+vm_state.vm_map: 23329.160234209 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3001561088, end = 3001577472, flags = 134217845, pgoff = 0, inode = 57394 }
+vm_state.vm_map: 23329.160236361 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3001577472, end = 3001581568, flags = 135266419, pgoff = 16384, inode = 57394 }
+vm_state.vm_map: 23329.160239050 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3001581568, end = 3001606144, flags = 134217845, pgoff = 0, inode = 57398 }
+vm_state.vm_map: 23329.160241239 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3001606144, end = 3001610240, flags = 135266419, pgoff = 24576, inode = 57398 }
+vm_state.vm_map: 23329.160244070 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3001610240, end = 3001626624, flags = 134217845, pgoff = 0, inode = 52571 }
+vm_state.vm_map: 23329.160246142 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3001626624, end = 3001630720, flags = 135266419, pgoff = 12288, inode = 52571 }
+vm_state.vm_map: 23329.160249058 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3001630720, end = 3001651200, flags = 134217845, pgoff = 0, inode = 52570 }
+vm_state.vm_map: 23329.160251112 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3001651200, end = 3001655296, flags = 135266419, pgoff = 16384, inode = 52570 }
+vm_state.vm_map: 23329.160254041 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3001655296, end = 3001692160, flags = 134217845, pgoff = 0, inode = 52569 }
+vm_state.vm_map: 23329.160256397 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3001692160, end = 3001696256, flags = 135266419, pgoff = 32768, inode = 52569 }
+vm_state.vm_map: 23329.160259455 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3001696256, end = 3001720832, flags = 134217845, pgoff = 0, inode = 52572 }
+vm_state.vm_map: 23329.160261503 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3001720832, end = 3001724928, flags = 135266419, pgoff = 20480, inode = 52572 }
+vm_state.vm_map: 23329.160264309 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3001724928, end = 3001745408, flags = 134217845, pgoff = 0, inode = 52568 }
+vm_state.vm_map: 23329.160266473 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3001745408, end = 3001749504, flags = 135266419, pgoff = 16384, inode = 52568 }
+vm_state.vm_map: 23329.160269667 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3001749504, end = 3001835520, flags = 134217845, pgoff = 0, inode = 57557 }
+vm_state.vm_map: 23329.160271887 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3001835520, end = 3001839616, flags = 135266419, pgoff = 86016, inode = 57557 }
+vm_state.vm_map: 23329.160274391 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3001839616, end = 3018080256, flags = 134217979, pgoff = 0, inode = 1204696 }
+vm_state.vm_map: 23329.160276734 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3018080256, end = 3022376960, flags = 134217979, pgoff = 0, inode = 1204694 }
+vm_state.vm_map: 23329.160279508 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3022376960, end = 3022602240, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.160281809 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3022602240, end = 3022606336, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.160283751 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3022606336, end = 3022610432, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.160286193 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3022610432, end = 3022811136, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 23329.160288419 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3022811136, end = 3022815232, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 23329.160291404 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3022815232, end = 3022823424, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 23329.160293901 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3022823424, end = 3022827520, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 23329.160296473 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3022831616, end = 3022843904, flags = 134217845, pgoff = 0, inode = 49489 }
+vm_state.vm_map: 23329.160298465 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3022843904, end = 3022848000, flags = 135266419, pgoff = 8192, inode = 49489 }
+vm_state.vm_map: 23329.160304687 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3022848000, end = 3022921728, flags = 134217841, pgoff = 0, inode = 98526 }
+vm_state.vm_map: 23329.160306931 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3022921728, end = 3022925824, flags = 134217937, pgoff = 0, inode = 1196150 }
+vm_state.vm_map: 23329.160309645 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3022925824, end = 3022950400, flags = 134217937, pgoff = 0, inode = 1196354 }
+vm_state.vm_map: 23329.160312426 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3022950400, end = 3022954496, flags = 134217937, pgoff = 0, inode = 1196334 }
+vm_state.vm_map: 23329.160315151 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3022954496, end = 3022958592, flags = 134217937, pgoff = 0, inode = 1196333 }
+vm_state.vm_map: 23329.160317655 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3022958592, end = 3022962688, flags = 134217937, pgoff = 0, inode = 1196331 }
+vm_state.vm_map: 23329.160320288 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3022962688, end = 3022966784, flags = 134217937, pgoff = 0, inode = 1196330 }
+vm_state.vm_map: 23329.160322730 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3022966784, end = 3022974976, flags = 134217937, pgoff = 0, inode = 1196329 }
+vm_state.vm_map: 23329.160325308 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3022974976, end = 3023007744, flags = 134217937, pgoff = 0, inode = 1196328 }
+vm_state.vm_map: 23329.160328064 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3023007744, end = 3023020032, flags = 134217937, pgoff = 0, inode = 1196327 }
+vm_state.vm_map: 23329.160331179 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3023020032, end = 3023028224, flags = 134217937, pgoff = 0, inode = 1196320 }
+vm_state.vm_map: 23329.160333830 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3023028224, end = 3023032320, flags = 134217937, pgoff = 0, inode = 1196318 }
+vm_state.vm_map: 23329.160336130 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3023032320, end = 3023036416, flags = 134217937, pgoff = 0, inode = 1196278 }
+vm_state.vm_map: 23329.160338708 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3023036416, end = 3023040512, flags = 134217937, pgoff = 0, inode = 1196251 }
+vm_state.vm_map: 23329.160341236 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3023040512, end = 3023069184, flags = 134217937, pgoff = 0, inode = 1196236 }
+vm_state.vm_map: 23329.160344301 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3023069184, end = 3023081472, flags = 134217937, pgoff = 0, inode = 1196234 }
+vm_state.vm_map: 23329.160347346 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3023081472, end = 3023085568, flags = 134217937, pgoff = 0, inode = 1196201 }
+vm_state.vm_map: 23329.160350024 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3023085568, end = 3023093760, flags = 134217937, pgoff = 0, inode = 1196170 }
+vm_state.vm_map: 23329.160352706 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3023093760, end = 3023097856, flags = 134217937, pgoff = 0, inode = 1196157 }
+vm_state.vm_map: 23329.160355259 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3023097856, end = 3023101952, flags = 134217937, pgoff = 0, inode = 1196171 }
+vm_state.vm_map: 23329.160357966 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3023101952, end = 3023114240, flags = 134217937, pgoff = 0, inode = 1196172 }
+vm_state.vm_map: 23329.160360519 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3023114240, end = 3023122432, flags = 134217937, pgoff = 0, inode = 1196173 }
+vm_state.vm_map: 23329.160363059 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3023122432, end = 3023155200, flags = 134217937, pgoff = 0, inode = 1196352 }
+vm_state.vm_map: 23329.160365588 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3023155200, end = 3023175680, flags = 134217937, pgoff = 0, inode = 1196196 }
+vm_state.vm_map: 23329.160368122 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3023175680, end = 3023183872, flags = 134217937, pgoff = 0, inode = 1196343 }
+vm_state.vm_map: 23329.160370625 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3023183872, end = 3023212544, flags = 134217937, pgoff = 0, inode = 1196314 }
+vm_state.vm_map: 23329.160373081 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3023212544, end = 3023257600, flags = 134217937, pgoff = 0, inode = 1196147 }
+vm_state.vm_map: 23329.160376009 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3023257600, end = 3023314944, flags = 134217937, pgoff = 0, inode = 1196094 }
+vm_state.vm_map: 23329.160378667 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3023314944, end = 3023327232, flags = 134217937, pgoff = 0, inode = 1196342 }
+vm_state.vm_map: 23329.160381713 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3023327232, end = 3023384576, flags = 134217937, pgoff = 0, inode = 1196355 }
+vm_state.vm_map: 23329.160384704 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3023384576, end = 3024715776, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.160386986 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3024715776, end = 3024732160, flags = 1048691, pgoff = 3024715776, inode = 0 }
+vm_state.vm_map: 23329.160390377 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3024732160, end = 3025989632, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 23329.160392696 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3025989632, end = 3026010112, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 23329.160394971 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3026010112, end = 3026014208, flags = 1048691, pgoff = 3026010112, inode = 0 }
+vm_state.vm_map: 23329.160398160 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3026014208, end = 3026251776, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 23329.160400293 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3026251776, end = 3026255872, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 23329.160403296 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3026255872, end = 3026403328, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.160405424 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3026403328, end = 3026411520, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.160408501 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3026411520, end = 3026604032, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.160410542 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3026604032, end = 3026608128, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.160413052 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3026608128, end = 3026927616, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 23329.160415179 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3026927616, end = 3026944000, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 23329.160417165 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3026944000, end = 3026948096, flags = 1048691, pgoff = 3026944000, inode = 0 }
+vm_state.vm_map: 23329.160419928 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3026948096, end = 3026964480, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.160422043 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3026964480, end = 3026968576, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.160424423 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3026968576, end = 3027488768, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 23329.160426476 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3027488768, end = 3027496960, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 23329.160429548 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3027496960, end = 3027513344, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 23329.160431538 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3027513344, end = 3027517440, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 23329.160434424 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3027517440, end = 3027542016, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 23329.160436553 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3027542016, end = 3027546112, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 23329.160438655 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3027546112, end = 3027550208, flags = 1048691, pgoff = 3027546112, inode = 0 }
+vm_state.vm_map: 23329.160441184 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3027550208, end = 3027582976, flags = 134217845, pgoff = 0, inode = 21180 }
+vm_state.vm_map: 23329.160443367 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3027582976, end = 3027587072, flags = 135266419, pgoff = 28672, inode = 21180 }
+vm_state.vm_map: 23329.160445987 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3027587072, end = 3028029440, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 23329.160448232 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3028029440, end = 3028037632, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 23329.160451124 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3028037632, end = 3028066304, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.160453190 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3028066304, end = 3028070400, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.160455434 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3028070400, end = 3028074496, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.160457691 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3028074496, end = 3028090880, flags = 134217845, pgoff = 0, inode = 19625 }
+vm_state.vm_map: 23329.160459899 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3028090880, end = 3028094976, flags = 135266419, pgoff = 12288, inode = 19625 }
+vm_state.vm_map: 23329.160462600 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3028094976, end = 3028279296, flags = 134217845, pgoff = 0, inode = 22064 }
+vm_state.vm_map: 23329.160464604 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3028279296, end = 3028287488, flags = 135266419, pgoff = 180224, inode = 22064 }
+vm_state.vm_map: 23329.160466941 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3028287488, end = 3028291584, flags = 1048691, pgoff = 3028287488, inode = 0 }
+vm_state.vm_map: 23329.160469630 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3028291584, end = 3029028864, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.160471640 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3029028864, end = 3029032960, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.160473928 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3029032960, end = 3029274624, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.160476049 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3029274624, end = 3029278720, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.160478898 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3029278720, end = 3029749760, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 23329.160480946 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3029749760, end = 3029766144, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 23329.160483702 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3029766144, end = 3029909504, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 23329.160485663 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3029909504, end = 3029913600, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 23329.160488321 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3029913600, end = 3029999616, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 23329.160490553 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3029999616, end = 3030003712, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 23329.160493020 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3030003712, end = 3030007808, flags = 1048691, pgoff = 3030003712, inode = 0 }
+vm_state.vm_map: 23329.160495610 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3030007808, end = 3030069248, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 23329.160497903 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3030069248, end = 3030073344, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 23329.160500870 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3030073344, end = 3030151168, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.160503545 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3030151168, end = 3030155264, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.160507091 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3030155264, end = 3030241280, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.160509220 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3030241280, end = 3030245376, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.160511476 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3030245376, end = 3030249472, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.160513740 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3030249472, end = 3030257664, flags = 1048691, pgoff = 3030249472, inode = 0 }
+vm_state.vm_map: 23329.160516570 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3030257664, end = 3030290432, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 23329.160518592 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3030290432, end = 3030294528, flags = 135266419, pgoff = 32768, inode = 20716 }
+vm_state.vm_map: 23329.160521134 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3030294528, end = 3030310912, flags = 134217845, pgoff = 0, inode = 22094 }
+vm_state.vm_map: 23329.160523439 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3030310912, end = 3030315008, flags = 135266419, pgoff = 12288, inode = 22094 }
+vm_state.vm_map: 23329.160525887 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3030315008, end = 3030319104, flags = 1048691, pgoff = 3030315008, inode = 0 }
+vm_state.vm_map: 23329.160528896 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3030319104, end = 3030327296, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.160531036 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3030327296, end = 3030331392, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.160533638 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3030331392, end = 3030429696, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.160536031 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3030429696, end = 3030433792, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.160539133 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3030433792, end = 3030446080, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 23329.160541260 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3030446080, end = 3030450176, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 23329.160544492 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3030450176, end = 3030458368, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.160547507 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3030458368, end = 3030462464, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.160549826 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3030462464, end = 3030466560, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.160552354 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3030466560, end = 3031019520, flags = 134217845, pgoff = 0, inode = 18947 }
+vm_state.vm_map: 23329.160554889 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3031019520, end = 3031040000, flags = 135266419, pgoff = 548864, inode = 18947 }
+vm_state.vm_map: 23329.160557497 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3031040000, end = 3031355392, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 23329.160559526 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3031355392, end = 3031363584, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 23329.160561912 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3031363584, end = 3031367680, flags = 1048691, pgoff = 3031363584, inode = 0 }
+vm_state.vm_map: 23329.160564681 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3031367680, end = 3031797760, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 23329.160566815 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3031797760, end = 3031826432, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 23329.160569023 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3031826432, end = 3031830528, flags = 1048691, pgoff = 3031826432, inode = 0 }
+vm_state.vm_map: 23329.160572253 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3031830528, end = 3031900160, flags = 134217845, pgoff = 0, inode = 1065123 }
+vm_state.vm_map: 23329.160574745 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3031900160, end = 3031904256, flags = 135266419, pgoff = 69632, inode = 1065123 }
+vm_state.vm_map: 23329.160577846 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3031904256, end = 3046400000, flags = 134217845, pgoff = 0, inode = 20672 }
+vm_state.vm_map: 23329.160579819 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3046400000, end = 3047014400, flags = 135266419, pgoff = 14495744, inode = 20672 }
+vm_state.vm_map: 23329.160581768 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3047014400, end = 3047022592, flags = 1048691, pgoff = 3047014400, inode = 0 }
+vm_state.vm_map: 23329.160584648 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3047022592, end = 3047395328, flags = 134217845, pgoff = 0, inode = 20902 }
+vm_state.vm_map: 23329.160586955 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3047395328, end = 3047407616, flags = 135266419, pgoff = 368640, inode = 20902 }
+vm_state.vm_map: 23329.160589698 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3047407616, end = 3049963520, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 23329.160592006 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3049963520, end = 3050012672, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 23329.160594095 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3050012672, end = 3050020864, flags = 1048691, pgoff = 3050012672, inode = 0 }
+vm_state.vm_map: 23329.160597209 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3050020864, end = 3050135552, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.160599337 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3050135552, end = 3050139648, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.160602500 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3050139648, end = 3050287104, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.160604498 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3050287104, end = 3050291200, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.160606909 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3050291200, end = 3050295296, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.160609629 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3050295296, end = 3050328064, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 23329.160611695 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3050328064, end = 3050332160, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 23329.160614365 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3050332160, end = 3050348544, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 23329.160616696 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3050348544, end = 3050352640, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 23329.160619317 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3050352640, end = 3051483136, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 23329.160621352 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3051483136, end = 3051499520, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 23329.160623787 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3051499520, end = 3051503616, flags = 1048691, pgoff = 3051499520, inode = 0 }
+vm_state.vm_map: 23329.160627204 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3051503616, end = 3051773952, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 23329.160629448 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3051773952, end = 3051782144, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 23329.160632704 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3051782144, end = 3052113920, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 23329.160635227 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3052113920, end = 3052122112, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 23329.160637921 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3052122112, end = 3053060096, flags = 134217845, pgoff = 0, inode = 16400 }
+vm_state.vm_map: 23329.160640493 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3053060096, end = 3053076480, flags = 135266417, pgoff = 937984, inode = 16400 }
+vm_state.vm_map: 23329.160642818 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3053076480, end = 3053080576, flags = 135266419, pgoff = 954368, inode = 16400 }
+vm_state.vm_map: 23329.160645124 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3053080576, end = 3053109248, flags = 1048691, pgoff = 3053080576, inode = 0 }
+vm_state.vm_map: 23329.160648404 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3053109248, end = 3055419392, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 23329.160650723 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3055419392, end = 3055448064, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 23329.160653048 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3055448064, end = 3055452160, flags = 1048691, pgoff = 3055448064, inode = 0 }
+vm_state.vm_map: 23329.160655613 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3055452160, end = 3055919104, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 23329.160657906 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3055919104, end = 3055927296, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 23329.160660127 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3055927296, end = 3055931392, flags = 1048691, pgoff = 3055927296, inode = 0 }
+vm_state.vm_map: 23329.160662982 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3055931392, end = 3065970688, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 23329.160665516 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3065970688, end = 3066130432, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 23329.160668180 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3066130432, end = 3066138624, flags = 1048691, pgoff = 3066130432, inode = 0 }
+vm_state.vm_map: 23329.160670468 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3066138624, end = 3068440576, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 23329.160672595 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3068440576, end = 3068485632, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 23329.160676308 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3068485632, end = 3068502016, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 23329.160678478 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3068502016, end = 3068506112, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 23329.160681303 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3068506112, end = 3068538880, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 23329.160683338 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3068538880, end = 3068542976, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 23329.160685749 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3068542976, end = 3068551168, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 23329.160688296 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3068551168, end = 3068555264, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 23329.160690509 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3068555264, end = 3068559360, flags = 1048691, pgoff = 3068555264, inode = 0 }
+vm_state.vm_map: 23329.160693223 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3068559360, end = 3068567552, flags = 134217845, pgoff = 0, inode = 17721 }
+vm_state.vm_map: 23329.160695326 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3068567552, end = 3068571648, flags = 135266419, pgoff = 4096, inode = 17721 }
+vm_state.vm_map: 23329.160698168 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3068571648, end = 3068596224, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 23329.160700111 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3068596224, end = 3068600320, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 23329.160703318 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3068600320, end = 3068964864, flags = 134217845, pgoff = 0, inode = 23376 }
+vm_state.vm_map: 23329.160705377 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3068964864, end = 3069001728, flags = 135266423, pgoff = 364544, inode = 23376 }
+vm_state.vm_map: 23329.160707887 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3069001728, end = 3069005824, flags = 1048695, pgoff = 3069001728, inode = 0 }
+vm_state.vm_map: 23329.160710563 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3069005824, end = 3069059072, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 23329.160712672 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3069059072, end = 3069063168, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 23329.160715503 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3069063168, end = 3070214144, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.160717599 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3070214144, end = 3070230528, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.160720461 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3070230528, end = 3070316544, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 23329.160722427 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3070316544, end = 3070320640, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 23329.160724382 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3070320640, end = 3070332928, flags = 1048691, pgoff = 3070320640, inode = 0 }
+vm_state.vm_map: 23329.160727688 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3070332928, end = 3070361600, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 23329.160729964 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3070361600, end = 3070365696, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 23329.160732942 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3070365696, end = 3070521344, flags = 134217845, pgoff = 0, inode = 23969 }
+vm_state.vm_map: 23329.160735403 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3070521344, end = 3070529536, flags = 135266419, pgoff = 151552, inode = 23969 }
+vm_state.vm_map: 23329.160738078 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3070529536, end = 3070619648, flags = 134217845, pgoff = 0, inode = 23864 }
+vm_state.vm_map: 23329.160740144 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3070619648, end = 3070623744, flags = 135266419, pgoff = 90112, inode = 23864 }
+vm_state.vm_map: 23329.160743147 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3070623744, end = 3070783488, flags = 134217845, pgoff = 0, inode = 23579 }
+vm_state.vm_map: 23329.160745293 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3070783488, end = 3070787584, flags = 135266419, pgoff = 159744, inode = 23579 }
+vm_state.vm_map: 23329.160748302 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3070787584, end = 3072770048, flags = 134217845, pgoff = 0, inode = 20915 }
+vm_state.vm_map: 23329.160750368 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3072770048, end = 3072811008, flags = 135266419, pgoff = 1978368, inode = 20915 }
+vm_state.vm_map: 23329.160752995 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3072811008, end = 3076407296, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 23329.160755073 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3076407296, end = 3076505600, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 23329.160757225 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3076505600, end = 3076513792, flags = 1048691, pgoff = 3076505600, inode = 0 }
+vm_state.vm_map: 23329.160759963 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3076513792, end = 3077828608, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.160762097 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3077828608, end = 3077836800, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.160764471 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3077836800, end = 3077840896, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.160766574 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3077840896, end = 3077853184, flags = 1048691, pgoff = 3077840896, inode = 0 }
+vm_state.vm_map: 23329.160769762 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3077853184, end = 3078647808, flags = 134217845, pgoff = 0, inode = 1065333 }
+vm_state.vm_map: 23329.160771963 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3078647808, end = 3078660096, flags = 135266419, pgoff = 790528, inode = 1065333 }
+vm_state.vm_map: 23329.160774652 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3078672384, end = 3078705152, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 23329.160776835 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3078705152, end = 3078709248, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 23329.160779653 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3078709248, end = 3078717440, flags = 134217845, pgoff = 0, inode = 1450327 }
+vm_state.vm_map: 23329.160781762 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3078717440, end = 3078721536, flags = 135266417, pgoff = 4096, inode = 1450327 }
+vm_state.vm_map: 23329.160783884 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3078721536, end = 3078725632, flags = 135266419, pgoff = 8192, inode = 1450327 }
+vm_state.vm_map: 23329.160787078 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3078725632, end = 3078754304, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.160789372 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3078754304, end = 3078762496, flags = 1048691, pgoff = 3078754304, inode = 0 }
+vm_state.vm_map: 23329.160791925 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3078762496, end = 3078766592, flags = 67371125, pgoff = 3078762496, inode = 0 }
+vm_state.vm_map: 23329.160794620 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3078766592, end = 3078881280, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.160796815 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3078881280, end = 3078885376, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.160798838 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3078885376, end = 3078889472, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.160801064 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2199, start = 3214757888, end = 3214843904, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.160807001 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 134512640, end = 134553600, flags = 134223989, pgoff = 0, inode = 20759 }
+vm_state.vm_map: 23329.160809087 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 134553600, end = 134557696, flags = 135272563, pgoff = 36864, inode = 20759 }
+vm_state.vm_map: 23329.160811201 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 134557696, end = 134565888, flags = 1048691, pgoff = 134557696, inode = 0 }
+vm_state.vm_map: 23329.160813291 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 153337856, end = 155586560, flags = 1048691, pgoff = 153337856, inode = 0 }
+vm_state.vm_map: 23329.160823417 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3002777600, end = 3002818560, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.160825557 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3002818560, end = 3002822656, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.160827795 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3002822656, end = 3002826752, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.160830817 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3002826752, end = 3002863616, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.160833647 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3002863616, end = 3002867712, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.160835658 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3002867712, end = 3002871808, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.160840801 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3002871808, end = 3002949632, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.160843434 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3002949632, end = 3002953728, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.160845493 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3002953728, end = 3002957824, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.160847861 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3002957824, end = 3002966016, flags = 1048691, pgoff = 3002957824, inode = 0 }
+vm_state.vm_map: 23329.160850803 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3002966016, end = 3002990592, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.160852881 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3002990592, end = 3002994688, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.160854904 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3002994688, end = 3002998784, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.160857506 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3002998784, end = 3019239424, flags = 134217979, pgoff = 0, inode = 1204696 }
+vm_state.vm_map: 23329.160859997 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3019239424, end = 3023536128, flags = 134217979, pgoff = 0, inode = 1204694 }
+vm_state.vm_map: 23329.160862680 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3023536128, end = 3023736832, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 23329.160864937 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3023736832, end = 3023740928, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 23329.160867613 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3023740928, end = 3023773696, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 23329.160869642 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3023773696, end = 3023777792, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 23329.160872213 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3023777792, end = 3023802368, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 23329.160874489 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3023802368, end = 3023806464, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 23329.160877196 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3023900672, end = 3023904768, flags = 134217937, pgoff = 0, inode = 1196150 }
+vm_state.vm_map: 23329.160880242 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3023904768, end = 3023929344, flags = 134217937, pgoff = 0, inode = 1196354 }
+vm_state.vm_map: 23329.160882697 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3023929344, end = 3024166912, flags = 1048691, pgoff = 3024166912, inode = 0 }
+vm_state.vm_map: 23329.160885175 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024171008, end = 3024203776, flags = 134217937, pgoff = 0, inode = 1196328 }
+vm_state.vm_map: 23329.160887846 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024203776, end = 3024216064, flags = 134217937, pgoff = 0, inode = 1196327 }
+vm_state.vm_map: 23329.160890411 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024216064, end = 3024224256, flags = 134217937, pgoff = 0, inode = 1196320 }
+vm_state.vm_map: 23329.160892883 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024224256, end = 3024228352, flags = 134217937, pgoff = 0, inode = 1196318 }
+vm_state.vm_map: 23329.160895214 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024228352, end = 3024232448, flags = 134217937, pgoff = 0, inode = 1196278 }
+vm_state.vm_map: 23329.160897514 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024232448, end = 3024236544, flags = 134217937, pgoff = 0, inode = 1196251 }
+vm_state.vm_map: 23329.160899938 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024236544, end = 3024265216, flags = 134217937, pgoff = 0, inode = 1196236 }
+vm_state.vm_map: 23329.160902318 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024265216, end = 3024277504, flags = 134217937, pgoff = 0, inode = 1196234 }
+vm_state.vm_map: 23329.160904717 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024277504, end = 3024281600, flags = 134217937, pgoff = 0, inode = 1196201 }
+vm_state.vm_map: 23329.160907153 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024281600, end = 3024289792, flags = 134217937, pgoff = 0, inode = 1196170 }
+vm_state.vm_map: 23329.160909638 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024289792, end = 3024293888, flags = 134217937, pgoff = 0, inode = 1196157 }
+vm_state.vm_map: 23329.160912326 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024293888, end = 3024297984, flags = 134217937, pgoff = 0, inode = 1196171 }
+vm_state.vm_map: 23329.160914781 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024297984, end = 3024310272, flags = 134217937, pgoff = 0, inode = 1196172 }
+vm_state.vm_map: 23329.160917235 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024310272, end = 3024318464, flags = 134217937, pgoff = 0, inode = 1196173 }
+vm_state.vm_map: 23329.160919899 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024318464, end = 3024351232, flags = 134217937, pgoff = 0, inode = 1196352 }
+vm_state.vm_map: 23329.160922446 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024351232, end = 3024371712, flags = 134217937, pgoff = 0, inode = 1196196 }
+vm_state.vm_map: 23329.160924980 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024371712, end = 3024379904, flags = 134217937, pgoff = 0, inode = 1196343 }
+vm_state.vm_map: 23329.160927459 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024379904, end = 3024408576, flags = 134217937, pgoff = 0, inode = 1196314 }
+vm_state.vm_map: 23329.160929803 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024408576, end = 3024453632, flags = 134217937, pgoff = 0, inode = 1196147 }
+vm_state.vm_map: 23329.160932960 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024453632, end = 3024510976, flags = 134217937, pgoff = 0, inode = 1196094 }
+vm_state.vm_map: 23329.160938997 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024510976, end = 3024736256, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.160941131 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024736256, end = 3024740352, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.160943757 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024740352, end = 3024744448, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.160946193 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024744448, end = 3024752640, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 23329.160948198 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024752640, end = 3024756736, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 23329.160950392 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024756736, end = 3024760832, flags = 134217937, pgoff = 0, inode = 1196334 }
+vm_state.vm_map: 23329.160953125 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024760832, end = 3024764928, flags = 134217937, pgoff = 0, inode = 1196333 }
+vm_state.vm_map: 23329.160955524 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024764928, end = 3024769024, flags = 134217937, pgoff = 0, inode = 1196331 }
+vm_state.vm_map: 23329.160957841 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024769024, end = 3024773120, flags = 134217937, pgoff = 0, inode = 1196330 }
+vm_state.vm_map: 23329.160960025 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024773120, end = 3024781312, flags = 134217937, pgoff = 0, inode = 1196329 }
+vm_state.vm_map: 23329.160962497 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024781312, end = 3024838656, flags = 134217937, pgoff = 0, inode = 1196355 }
+vm_state.vm_map: 23329.160965304 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024838656, end = 3024871424, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 23329.160967264 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024871424, end = 3024875520, flags = 135266419, pgoff = 32768, inode = 20716 }
+vm_state.vm_map: 23329.160970305 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3024875520, end = 3025395712, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 23329.160972734 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3025395712, end = 3025403904, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 23329.160975478 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3025403904, end = 3025768448, flags = 134217845, pgoff = 0, inode = 23376 }
+vm_state.vm_map: 23329.160977494 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3025768448, end = 3025805312, flags = 135266423, pgoff = 364544, inode = 23376 }
+vm_state.vm_map: 23329.160979671 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3025805312, end = 3025809408, flags = 1048695, pgoff = 3025805312, inode = 0 }
+vm_state.vm_map: 23329.160982304 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3025809408, end = 3026362368, flags = 134217845, pgoff = 0, inode = 18947 }
+vm_state.vm_map: 23329.160984327 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3026362368, end = 3026382848, flags = 135266419, pgoff = 548864, inode = 18947 }
+vm_state.vm_map: 23329.160986800 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3026382848, end = 3026698240, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 23329.160989248 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3026698240, end = 3026706432, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 23329.160992011 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3026706432, end = 3026776064, flags = 134217845, pgoff = 0, inode = 1065123 }
+vm_state.vm_map: 23329.160994083 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3026776064, end = 3026780160, flags = 135266419, pgoff = 69632, inode = 1065123 }
+vm_state.vm_map: 23329.160996858 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3026780160, end = 3041275904, flags = 134217845, pgoff = 0, inode = 20672 }
+vm_state.vm_map: 23329.160998911 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3041275904, end = 3041890304, flags = 135266419, pgoff = 14495744, inode = 20672 }
+vm_state.vm_map: 23329.161000946 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3041890304, end = 3041898496, flags = 1048691, pgoff = 3041890304, inode = 0 }
+vm_state.vm_map: 23329.161003487 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3041898496, end = 3042271232, flags = 134217845, pgoff = 0, inode = 20902 }
+vm_state.vm_map: 23329.161005559 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3042271232, end = 3042283520, flags = 135266419, pgoff = 368640, inode = 20902 }
+vm_state.vm_map: 23329.161008654 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3042283520, end = 3042373632, flags = 134217845, pgoff = 0, inode = 1065189 }
+vm_state.vm_map: 23329.161010930 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3042373632, end = 3042377728, flags = 135266419, pgoff = 90112, inode = 1065189 }
+vm_state.vm_map: 23329.161013377 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3042377728, end = 3044360192, flags = 134217845, pgoff = 0, inode = 20915 }
+vm_state.vm_map: 23329.161015345 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3044360192, end = 3044401152, flags = 135266419, pgoff = 1978368, inode = 20915 }
+vm_state.vm_map: 23329.161020833 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3044401152, end = 3045732352, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.161022898 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3045732352, end = 3045748736, flags = 1048691, pgoff = 3045732352, inode = 0 }
+vm_state.vm_map: 23329.161025267 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3045748736, end = 3045896192, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.161027376 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3045896192, end = 3045904384, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.161030083 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3045904384, end = 3046223872, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 23329.161032704 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3046223872, end = 3046240256, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 23329.161034899 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3046240256, end = 3046252544, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 23329.161037174 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3046252544, end = 3046256640, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 23329.161039622 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3046256640, end = 3047514112, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 23329.161041602 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3047514112, end = 3047534592, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 23329.161043625 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3047534592, end = 3047542784, flags = 1048691, pgoff = 3047534592, inode = 0 }
+vm_state.vm_map: 23329.161046362 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3047542784, end = 3047780352, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 23329.161048946 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3047780352, end = 3047784448, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 23329.161051413 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3047784448, end = 3047800832, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.161053935 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3047800832, end = 3047804928, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.161056568 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3047804928, end = 3047813120, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.161058831 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3047813120, end = 3047817216, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.161061551 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3047817216, end = 3048009728, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.161063839 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3048009728, end = 3048013824, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.161066046 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3048013824, end = 3048067072, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 23329.161068377 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3048067072, end = 3048071168, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 23329.161070659 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3048071168, end = 3048075264, flags = 1048691, pgoff = 3048071168, inode = 0 }
+vm_state.vm_map: 23329.161072910 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3048075264, end = 3048259584, flags = 134217845, pgoff = 0, inode = 22064 }
+vm_state.vm_map: 23329.161074963 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3048259584, end = 3048267776, flags = 135266419, pgoff = 180224, inode = 22064 }
+vm_state.vm_map: 23329.161077424 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3048267776, end = 3048509440, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.161079613 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3048509440, end = 3048513536, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.161081956 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3048513536, end = 3048984576, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 23329.161084244 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3048984576, end = 3049000960, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 23329.161086865 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049000960, end = 3049144320, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 23329.161089134 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049144320, end = 3049148416, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 23329.161091706 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049148416, end = 3049234432, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 23329.161093963 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049234432, end = 3049238528, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 23329.161096189 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049238528, end = 3049242624, flags = 1048691, pgoff = 3049238528, inode = 0 }
+vm_state.vm_map: 23329.161098304 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049242624, end = 3049259008, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 23329.161100560 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049259008, end = 3049263104, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 23329.161102780 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049263104, end = 3049295872, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 23329.161105111 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049295872, end = 3049299968, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 23329.161107565 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049299968, end = 3049316352, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 23329.161107567 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049316352, end = 3049320448, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 23329.161107569 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049320448, end = 3049406464, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 23329.161107571 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049406464, end = 3049410560, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 23329.161107573 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049410560, end = 3049418752, flags = 1048691, pgoff = 3049410560, inode = 0 }
+vm_state.vm_map: 23329.161107575 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049418752, end = 3049447424, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 23329.161107577 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049447424, end = 3049451520, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 23329.161107579 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049451520, end = 3049455616, flags = 1048691, pgoff = 3049451520, inode = 0 }
+vm_state.vm_map: 23329.161107581 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049455616, end = 3049787392, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 23329.161107583 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049787392, end = 3049795584, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 23329.161107585 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049795584, end = 3049828352, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 23329.161107588 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049828352, end = 3049832448, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 23329.161107590 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049832448, end = 3049848832, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 23329.161107592 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049848832, end = 3049852928, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 23329.161107595 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049852928, end = 3049877504, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 23329.161107597 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049877504, end = 3049881600, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 23329.161107599 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049881600, end = 3049914368, flags = 134217845, pgoff = 0, inode = 21180 }
+vm_state.vm_map: 23329.161107601 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049914368, end = 3049918464, flags = 135266419, pgoff = 28672, inode = 21180 }
+vm_state.vm_map: 23329.161107603 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049918464, end = 3049922560, flags = 1048691, pgoff = 3049918464, inode = 0 }
+vm_state.vm_map: 23329.161107605 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3049922560, end = 3050352640, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 23329.161119855 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3050352640, end = 3050381312, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 23329.161122321 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3050381312, end = 3050385408, flags = 1048691, pgoff = 3050381312, inode = 0 }
+vm_state.vm_map: 23329.161125176 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3050385408, end = 3050827776, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 23329.161127525 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3050827776, end = 3050835968, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 23329.161130669 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3050835968, end = 3050934272, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.161132834 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3050934272, end = 3050938368, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.161135571 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3050938368, end = 3051208704, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 23329.161137748 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3051208704, end = 3051216896, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 23329.161140831 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3051216896, end = 3051278336, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 23329.161142915 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3051278336, end = 3051282432, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 23329.161145911 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3051282432, end = 3051286528, flags = 1048691, pgoff = 3051282432, inode = 0 }
+vm_state.vm_map: 23329.161148507 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3051286528, end = 3051753472, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 23329.161150603 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3051753472, end = 3051761664, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 23329.161153588 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3051761664, end = 3052892160, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 23329.161155776 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3052892160, end = 3052908544, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 23329.161158705 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3052908544, end = 3053023232, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.161160980 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3053023232, end = 3053027328, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.161164309 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3053027328, end = 3053174784, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.161166369 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3053174784, end = 3053178880, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.161168367 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3053178880, end = 3053182976, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.161171400 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3053182976, end = 3053191168, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.161173694 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3053191168, end = 3053195264, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.161175766 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3053195264, end = 3053199360, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.161178423 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3053199360, end = 3053203456, flags = 1048691, pgoff = 3053199360, inode = 0 }
+vm_state.vm_map: 23329.161181715 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3053203456, end = 3053289472, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.161183836 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3053289472, end = 3053293568, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.161186574 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3053293568, end = 3053297664, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.161188657 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3053297664, end = 3053305856, flags = 1048691, pgoff = 3053297664, inode = 0 }
+vm_state.vm_map: 23329.161192270 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3053305856, end = 3054043136, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.161194601 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3054043136, end = 3054047232, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.161197259 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3054047232, end = 3054075904, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.161199318 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3054075904, end = 3054080000, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.161201328 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3054080000, end = 3054084096, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.161204861 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3054084096, end = 3054100480, flags = 134217845, pgoff = 0, inode = 19625 }
+vm_state.vm_map: 23329.161206914 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3054100480, end = 3054104576, flags = 135266419, pgoff = 12288, inode = 19625 }
+vm_state.vm_map: 23329.161210681 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3054104576, end = 3054182400, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.161212679 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3054182400, end = 3054186496, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.161216280 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3054186496, end = 3055501312, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.161218284 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3055501312, end = 3055509504, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.161220442 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3055509504, end = 3055513600, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.161222908 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3055513600, end = 3055529984, flags = 1048691, pgoff = 3055513600, inode = 0 }
+vm_state.vm_map: 23329.161225825 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3055529984, end = 3056467968, flags = 134217845, pgoff = 0, inode = 16400 }
+vm_state.vm_map: 23329.161228525 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3056467968, end = 3056484352, flags = 135266417, pgoff = 937984, inode = 16400 }
+vm_state.vm_map: 23329.161231102 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3056484352, end = 3056488448, flags = 135266419, pgoff = 954368, inode = 16400 }
+vm_state.vm_map: 23329.161233470 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3056488448, end = 3056517120, flags = 1048691, pgoff = 3056488448, inode = 0 }
+vm_state.vm_map: 23329.161236047 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3056517120, end = 3066556416, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 23329.161238390 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3066556416, end = 3066716160, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 23329.161240801 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3066716160, end = 3066724352, flags = 1048691, pgoff = 3066716160, inode = 0 }
+vm_state.vm_map: 23329.161243261 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3066724352, end = 3070320640, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 23329.161245438 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3070320640, end = 3070418944, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 23329.161247860 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3070418944, end = 3070423040, flags = 1048691, pgoff = 3070418944, inode = 0 }
+vm_state.vm_map: 23329.161250462 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3070423040, end = 3072978944, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 23329.161252675 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3072978944, end = 3073028096, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 23329.161254939 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3073028096, end = 3073032192, flags = 1048691, pgoff = 3073028096, inode = 0 }
+vm_state.vm_map: 23329.161257509 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3073032192, end = 3074183168, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.161259871 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3074183168, end = 3074199552, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.161263022 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3074199552, end = 3074433024, flags = 134217845, pgoff = 0, inode = 1065180 }
+vm_state.vm_map: 23329.161265019 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3074433024, end = 3074441216, flags = 135266419, pgoff = 233472, inode = 1065180 }
+vm_state.vm_map: 23329.161267436 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3074441216, end = 3074445312, flags = 1048691, pgoff = 3074441216, inode = 0 }
+vm_state.vm_map: 23329.161269946 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3074445312, end = 3076747264, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 23329.161272128 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3076747264, end = 3076792320, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 23329.161275002 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3076792320, end = 3079102464, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 23329.161277400 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3079102464, end = 3079131136, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 23329.161279626 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3079131136, end = 3079135232, flags = 1048691, pgoff = 3079131136, inode = 0 }
+vm_state.vm_map: 23329.161282401 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3079139328, end = 3079151616, flags = 134217937, pgoff = 0, inode = 1196342 }
+vm_state.vm_map: 23329.161285157 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3079151616, end = 3079159808, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 23329.161287370 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3079159808, end = 3079163904, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 23329.161289997 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3079163904, end = 3079180288, flags = 134217845, pgoff = 0, inode = 22094 }
+vm_state.vm_map: 23329.161291964 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3079180288, end = 3079184384, flags = 135266419, pgoff = 12288, inode = 22094 }
+vm_state.vm_map: 23329.161294905 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3079184384, end = 3079192576, flags = 134217845, pgoff = 0, inode = 1450327 }
+vm_state.vm_map: 23329.161297069 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3079192576, end = 3079196672, flags = 135266417, pgoff = 4096, inode = 1450327 }
+vm_state.vm_map: 23329.161299097 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3079196672, end = 3079200768, flags = 135266419, pgoff = 8192, inode = 1450327 }
+vm_state.vm_map: 23329.161301736 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3079200768, end = 3079229440, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.161303981 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3079229440, end = 3079237632, flags = 1048691, pgoff = 3079229440, inode = 0 }
+vm_state.vm_map: 23329.161306330 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3079237632, end = 3079241728, flags = 67371125, pgoff = 3079237632, inode = 0 }
+vm_state.vm_map: 23329.161309234 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3079241728, end = 3079356416, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.161311577 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3079356416, end = 3079360512, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.161313642 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3079360512, end = 3079364608, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.161315640 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2201, start = 3215650816, end = 3215736832, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.161321891 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 134512640, end = 134553600, flags = 134223989, pgoff = 0, inode = 20759 }
+vm_state.vm_map: 23329.161329525 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 134553600, end = 134557696, flags = 135272563, pgoff = 36864, inode = 20759 }
+vm_state.vm_map: 23329.161331707 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 134557696, end = 134565888, flags = 1048691, pgoff = 134557696, inode = 0 }
+vm_state.vm_map: 23329.161334013 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 153337856, end = 166522880, flags = 1048691, pgoff = 153337856, inode = 0 }
+vm_state.vm_map: 23329.161351006 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2814787584, end = 2814857216, flags = 134217841, pgoff = 0, inode = 98449 }
+vm_state.vm_map: 23329.161357597 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2814857216, end = 2814996480, flags = 134217841, pgoff = 0, inode = 254140 }
+vm_state.vm_map: 23329.161364749 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2814996480, end = 2822770688, flags = 134217841, pgoff = 0, inode = 249255 }
+vm_state.vm_map: 23329.161368436 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2822770688, end = 2823344128, flags = 134217841, pgoff = 0, inode = 49559 }
+vm_state.vm_map: 23329.161371797 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2823344128, end = 2823487488, flags = 134217841, pgoff = 0, inode = 254199 }
+vm_state.vm_map: 23329.161378499 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2823487488, end = 2823548928, flags = 134217841, pgoff = 0, inode = 649750 }
+vm_state.vm_map: 23329.161381582 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2823548928, end = 2824171520, flags = 134217841, pgoff = 0, inode = 49164 }
+vm_state.vm_map: 23329.161391700 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2824171520, end = 2824208384, flags = 134217845, pgoff = 0, inode = 59304 }
+vm_state.vm_map: 23329.161393969 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2824208384, end = 2824212480, flags = 135266419, pgoff = 32768, inode = 59304 }
+vm_state.vm_map: 23329.161399518 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2824212480, end = 2824273920, flags = 134217841, pgoff = 0, inode = 649749 }
+vm_state.vm_map: 23329.161408266 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2824273920, end = 2824318976, flags = 134217845, pgoff = 0, inode = 1065861 }
+vm_state.vm_map: 23329.161410955 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2824318976, end = 2824323072, flags = 135266419, pgoff = 45056, inode = 1065861 }
+vm_state.vm_map: 23329.161413464 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2824323072, end = 2824331264, flags = 1048691, pgoff = 2824323072, inode = 0 }
+vm_state.vm_map: 23329.161417145 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2824339456, end = 2824380416, flags = 134217845, pgoff = 0, inode = 59318 }
+vm_state.vm_map: 23329.161419605 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2824380416, end = 2824384512, flags = 135266419, pgoff = 40960, inode = 59318 }
+vm_state.vm_map: 23329.161422509 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2824384512, end = 2824421376, flags = 134217845, pgoff = 0, inode = 59321 }
+vm_state.vm_map: 23329.161424834 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2824421376, end = 2824425472, flags = 135266419, pgoff = 32768, inode = 59321 }
+vm_state.vm_map: 23329.161427861 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2824425472, end = 2824495104, flags = 134217845, pgoff = 0, inode = 59034 }
+vm_state.vm_map: 23329.161430062 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2824495104, end = 2824499200, flags = 135266419, pgoff = 65536, inode = 59034 }
+vm_state.vm_map: 23329.161435883 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2824499200, end = 2824568832, flags = 134217845, pgoff = 0, inode = 499966 }
+vm_state.vm_map: 23329.161438016 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2824568832, end = 2824572928, flags = 135266417, pgoff = 65536, inode = 499966 }
+vm_state.vm_map: 23329.161440396 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2824572928, end = 2824577024, flags = 135266419, pgoff = 69632, inode = 499966 }
+vm_state.vm_map: 23329.161442400 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2824577024, end = 2824585216, flags = 1048691, pgoff = 2824577024, inode = 0 }
+vm_state.vm_map: 23329.161445551 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2824597504, end = 2824609792, flags = 134217845, pgoff = 0, inode = 23912 }
+vm_state.vm_map: 23329.161447955 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2824609792, end = 2824613888, flags = 135266419, pgoff = 8192, inode = 23912 }
+vm_state.vm_map: 23329.161454312 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2824613888, end = 2824634368, flags = 134217845, pgoff = 0, inode = 59302 }
+vm_state.vm_map: 23329.161456728 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2824634368, end = 2824638464, flags = 135266419, pgoff = 16384, inode = 59302 }
+vm_state.vm_map: 23329.161464330 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2824638464, end = 2824675328, flags = 134217845, pgoff = 0, inode = 59323 }
+vm_state.vm_map: 23329.161466408 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2824675328, end = 2824679424, flags = 135266419, pgoff = 36864, inode = 59323 }
+vm_state.vm_map: 23329.161471723 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2824679424, end = 2824683520, flags = 1048688, pgoff = 2824679424, inode = 0 }
+vm_state.vm_map: 23329.161474203 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2824683520, end = 2833072128, flags = 1048691, pgoff = 2824683520, inode = 0 }
+vm_state.vm_map: 23329.161536988 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2833072128, end = 2833154048, flags = 134217845, pgoff = 0, inode = 59299 }
+vm_state.vm_map: 23329.161540132 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2833154048, end = 2833158144, flags = 135266419, pgoff = 77824, inode = 59299 }
+vm_state.vm_map: 23329.161546531 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2833158144, end = 2833223680, flags = 134217845, pgoff = 0, inode = 57391 }
+vm_state.vm_map: 23329.161548813 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2833223680, end = 2833227776, flags = 135266419, pgoff = 61440, inode = 57391 }
+vm_state.vm_map: 23329.161551698 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2833227776, end = 2833244160, flags = 1048691, pgoff = 2833227776, inode = 0 }
+vm_state.vm_map: 23329.161557426 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2833244160, end = 2833526784, flags = 134217845, pgoff = 0, inode = 22693 }
+vm_state.vm_map: 23329.161559757 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2833526784, end = 2833539072, flags = 135266419, pgoff = 282624, inode = 22693 }
+vm_state.vm_map: 23329.161561810 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2833539072, end = 2833563648, flags = 1048691, pgoff = 2833539072, inode = 0 }
+vm_state.vm_map: 23329.161565497 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2833563648, end = 2833588224, flags = 134217845, pgoff = 0, inode = 59316 }
+vm_state.vm_map: 23329.161570239 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2833588224, end = 2833592320, flags = 135266419, pgoff = 20480, inode = 59316 }
+vm_state.vm_map: 23329.161572989 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2833592320, end = 2833608704, flags = 134217845, pgoff = 0, inode = 57390 }
+vm_state.vm_map: 23329.161575110 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2833608704, end = 2833612800, flags = 135266419, pgoff = 12288, inode = 57390 }
+vm_state.vm_map: 23329.161578155 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2833612800, end = 2833653760, flags = 134217845, pgoff = 0, inode = 57395 }
+vm_state.vm_map: 23329.161580505 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2833653760, end = 2833657856, flags = 135266419, pgoff = 36864, inode = 57395 }
+vm_state.vm_map: 23329.161583668 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2833657856, end = 2833682432, flags = 134217845, pgoff = 0, inode = 18917 }
+vm_state.vm_map: 23329.161585863 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2833682432, end = 2833686528, flags = 135266419, pgoff = 20480, inode = 18917 }
+vm_state.vm_map: 23329.161588896 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2833686528, end = 2833956864, flags = 134217845, pgoff = 0, inode = 18916 }
+vm_state.vm_map: 23329.161591492 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2833956864, end = 2833960960, flags = 135266419, pgoff = 266240, inode = 18916 }
+vm_state.vm_map: 23329.161594538 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2833960960, end = 2834042880, flags = 134217845, pgoff = 0, inode = 18915 }
+vm_state.vm_map: 23329.161596973 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2834042880, end = 2834051072, flags = 135266419, pgoff = 77824, inode = 18915 }
+vm_state.vm_map: 23329.161599853 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2834051072, end = 2834833408, flags = 134217845, pgoff = 0, inode = 18927 }
+vm_state.vm_map: 23329.161602165 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2834833408, end = 2834841600, flags = 135266419, pgoff = 778240, inode = 18927 }
+vm_state.vm_map: 23329.161604878 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2834853888, end = 2834874368, flags = 134217845, pgoff = 0, inode = 57392 }
+vm_state.vm_map: 23329.161606869 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2834874368, end = 2834878464, flags = 135266419, pgoff = 16384, inode = 57392 }
+vm_state.vm_map: 23329.161609896 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2834878464, end = 2834911232, flags = 134217845, pgoff = 0, inode = 57396 }
+vm_state.vm_map: 23329.161612135 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2834911232, end = 2834915328, flags = 135266419, pgoff = 28672, inode = 57396 }
+vm_state.vm_map: 23329.161615409 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2834915328, end = 2834931712, flags = 134217845, pgoff = 0, inode = 57393 }
+vm_state.vm_map: 23329.161617462 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2834931712, end = 2834935808, flags = 135266419, pgoff = 12288, inode = 57393 }
+vm_state.vm_map: 23329.161620267 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2834935808, end = 2835300352, flags = 134217845, pgoff = 0, inode = 22572 }
+vm_state.vm_map: 23329.161622813 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2835300352, end = 2835308544, flags = 135266419, pgoff = 364544, inode = 22572 }
+vm_state.vm_map: 23329.161625483 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2835308544, end = 2835505152, flags = 134217845, pgoff = 0, inode = 20024 }
+vm_state.vm_map: 23329.161627598 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2835505152, end = 2835513344, flags = 135266419, pgoff = 192512, inode = 20024 }
+vm_state.vm_map: 23329.161629842 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2835513344, end = 2835521536, flags = 1048691, pgoff = 2835513344, inode = 0 }
+vm_state.vm_map: 23329.161632531 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2835521536, end = 2835972096, flags = 134217845, pgoff = 0, inode = 20711 }
+vm_state.vm_map: 23329.161634873 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2835972096, end = 2835984384, flags = 135266419, pgoff = 450560, inode = 20711 }
+vm_state.vm_map: 23329.161637784 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2835984384, end = 2836000768, flags = 134217845, pgoff = 0, inode = 57389 }
+vm_state.vm_map: 23329.161639775 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836000768, end = 2836004864, flags = 135266419, pgoff = 12288, inode = 57389 }
+vm_state.vm_map: 23329.161642482 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836004864, end = 2836021248, flags = 134217845, pgoff = 0, inode = 18914 }
+vm_state.vm_map: 23329.161644874 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836021248, end = 2836025344, flags = 135266419, pgoff = 16384, inode = 18914 }
+vm_state.vm_map: 23329.161647747 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836025344, end = 2836041728, flags = 134217845, pgoff = 0, inode = 57394 }
+vm_state.vm_map: 23329.161649825 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836041728, end = 2836045824, flags = 135266419, pgoff = 16384, inode = 57394 }
+vm_state.vm_map: 23329.161652982 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836045824, end = 2836074496, flags = 134217845, pgoff = 0, inode = 57397 }
+vm_state.vm_map: 23329.161655233 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836074496, end = 2836078592, flags = 135266419, pgoff = 24576, inode = 57397 }
+vm_state.vm_map: 23329.161658377 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836078592, end = 2836205568, flags = 134217845, pgoff = 0, inode = 18923 }
+vm_state.vm_map: 23329.161660714 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836205568, end = 2836209664, flags = 135266419, pgoff = 122880, inode = 18923 }
+vm_state.vm_map: 23329.161663822 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836213760, end = 2836238336, flags = 134217845, pgoff = 0, inode = 57398 }
+vm_state.vm_map: 23329.161665893 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836238336, end = 2836242432, flags = 135266419, pgoff = 24576, inode = 57398 }
+vm_state.vm_map: 23329.161668760 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836242432, end = 2836258816, flags = 134217845, pgoff = 0, inode = 52571 }
+vm_state.vm_map: 23329.161670881 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836258816, end = 2836262912, flags = 135266419, pgoff = 12288, inode = 52571 }
+vm_state.vm_map: 23329.161673619 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836262912, end = 2836275200, flags = 134217845, pgoff = 0, inode = 49489 }
+vm_state.vm_map: 23329.161676104 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836275200, end = 2836279296, flags = 135266419, pgoff = 8192, inode = 49489 }
+vm_state.vm_map: 23329.161678644 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836279296, end = 2836299776, flags = 134217845, pgoff = 0, inode = 52570 }
+vm_state.vm_map: 23329.161680703 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836299776, end = 2836303872, flags = 135266419, pgoff = 16384, inode = 52570 }
+vm_state.vm_map: 23329.161684421 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836303872, end = 2836639744, flags = 134217845, pgoff = 0, inode = 59171 }
+vm_state.vm_map: 23329.161686487 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836639744, end = 2836652032, flags = 135266419, pgoff = 331776, inode = 59171 }
+vm_state.vm_map: 23329.161689773 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836652032, end = 2836783104, flags = 134217845, pgoff = 0, inode = 24420 }
+vm_state.vm_map: 23329.161691981 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836783104, end = 2836787200, flags = 135266419, pgoff = 126976, inode = 24420 }
+vm_state.vm_map: 23329.161694774 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836787200, end = 2836824064, flags = 134217845, pgoff = 0, inode = 52569 }
+vm_state.vm_map: 23329.161696827 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836824064, end = 2836828160, flags = 135266419, pgoff = 32768, inode = 52569 }
+vm_state.vm_map: 23329.161699804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836828160, end = 2836852736, flags = 134217845, pgoff = 0, inode = 52572 }
+vm_state.vm_map: 23329.161702259 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836852736, end = 2836856832, flags = 135266419, pgoff = 20480, inode = 52572 }
+vm_state.vm_map: 23329.161705125 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836856832, end = 2836877312, flags = 134217845, pgoff = 0, inode = 52568 }
+vm_state.vm_map: 23329.161707369 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836877312, end = 2836881408, flags = 135266419, pgoff = 16384, inode = 52568 }
+vm_state.vm_map: 23329.161716155 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836881408, end = 2836938752, flags = 134217845, pgoff = 0, inode = 59183 }
+vm_state.vm_map: 23329.161718474 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836938752, end = 2836942848, flags = 135266419, pgoff = 57344, inode = 59183 }
+vm_state.vm_map: 23329.161727235 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2836942848, end = 2837090304, flags = 134217845, pgoff = 0, inode = 59164 }
+vm_state.vm_map: 23329.161729313 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2837090304, end = 2837098496, flags = 135266419, pgoff = 143360, inode = 59164 }
+vm_state.vm_map: 23329.161733161 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2837098496, end = 2837336064, flags = 134217845, pgoff = 0, inode = 23890 }
+vm_state.vm_map: 23329.161735189 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2837336064, end = 2837344256, flags = 135266419, pgoff = 237568, inode = 23890 }
+vm_state.vm_map: 23329.161738438 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2837344256, end = 2837352448, flags = 134217845, pgoff = 0, inode = 23893 }
+vm_state.vm_map: 23329.161740436 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2837352448, end = 2837356544, flags = 135266419, pgoff = 4096, inode = 23893 }
+vm_state.vm_map: 23329.161743260 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2837356544, end = 2837434368, flags = 134217845, pgoff = 0, inode = 59155 }
+vm_state.vm_map: 23329.161745541 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2837434368, end = 2837438464, flags = 135266419, pgoff = 77824, inode = 59155 }
+vm_state.vm_map: 23329.161787344 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2837438464, end = 2837524480, flags = 134217845, pgoff = 0, inode = 59188 }
+vm_state.vm_map: 23329.161790107 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2837524480, end = 2837528576, flags = 135266419, pgoff = 81920, inode = 59188 }
+vm_state.vm_map: 23329.161793529 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2837528576, end = 2837614592, flags = 134217845, pgoff = 0, inode = 23716 }
+vm_state.vm_map: 23329.161795613 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2837614592, end = 2837618688, flags = 135266419, pgoff = 81920, inode = 23716 }
+vm_state.vm_map: 23329.161798572 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2837618688, end = 2837655552, flags = 134217845, pgoff = 0, inode = 20855 }
+vm_state.vm_map: 23329.161801291 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2837655552, end = 2837659648, flags = 135266419, pgoff = 36864, inode = 20855 }
+vm_state.vm_map: 23329.161804522 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2837659648, end = 2837889024, flags = 134217845, pgoff = 0, inode = 23913 }
+vm_state.vm_map: 23329.161806662 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2837889024, end = 2837897216, flags = 135266419, pgoff = 225280, inode = 23913 }
+vm_state.vm_map: 23329.161809418 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2837897216, end = 2838081536, flags = 134217845, pgoff = 0, inode = 23888 }
+vm_state.vm_map: 23329.161811828 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2838081536, end = 2838089728, flags = 135266419, pgoff = 180224, inode = 23888 }
+vm_state.vm_map: 23329.161814424 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2838089728, end = 2838376448, flags = 134217845, pgoff = 0, inode = 1065175 }
+vm_state.vm_map: 23329.161816508 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2838376448, end = 2838384640, flags = 135266419, pgoff = 286720, inode = 1065175 }
+vm_state.vm_map: 23329.161819394 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2838392832, end = 2838474752, flags = 134217845, pgoff = 0, inode = 59181 }
+vm_state.vm_map: 23329.161821533 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2838474752, end = 2838478848, flags = 135266419, pgoff = 81920, inode = 59181 }
+vm_state.vm_map: 23329.161826750 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2838478848, end = 2838601728, flags = 134217845, pgoff = 0, inode = 59187 }
+vm_state.vm_map: 23329.161828957 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2838601728, end = 2838605824, flags = 135266419, pgoff = 118784, inode = 59187 }
+vm_state.vm_map: 23329.161832126 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2838605824, end = 2838794240, flags = 134217845, pgoff = 0, inode = 22645 }
+vm_state.vm_map: 23329.161834395 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2838794240, end = 2838802432, flags = 135266419, pgoff = 184320, inode = 22645 }
+vm_state.vm_map: 23329.161837127 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2838810624, end = 2838835200, flags = 134217845, pgoff = 0, inode = 58146 }
+vm_state.vm_map: 23329.161839432 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2838835200, end = 2838839296, flags = 135266419, pgoff = 20480, inode = 58146 }
+vm_state.vm_map: 23329.161842891 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2838839296, end = 2838892544, flags = 134217845, pgoff = 0, inode = 59182 }
+vm_state.vm_map: 23329.161844883 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2838892544, end = 2838896640, flags = 135266419, pgoff = 53248, inode = 59182 }
+vm_state.vm_map: 23329.161848002 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2838896640, end = 2839261184, flags = 134217845, pgoff = 0, inode = 57823 }
+vm_state.vm_map: 23329.161850704 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2839261184, end = 2839273472, flags = 135266419, pgoff = 364544, inode = 57823 }
+vm_state.vm_map: 23329.161853533 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2839273472, end = 2839318528, flags = 134217845, pgoff = 0, inode = 59186 }
+vm_state.vm_map: 23329.161855586 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2839318528, end = 2839322624, flags = 135266419, pgoff = 40960, inode = 59186 }
+vm_state.vm_map: 23329.161858607 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2839322624, end = 2839339008, flags = 134217845, pgoff = 0, inode = 59014 }
+vm_state.vm_map: 23329.161860753 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2839339008, end = 2839343104, flags = 135266419, pgoff = 16384, inode = 59014 }
+vm_state.vm_map: 23329.161863848 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2839343104, end = 2839355392, flags = 134217845, pgoff = 0, inode = 59166 }
+vm_state.vm_map: 23329.161865876 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2839355392, end = 2839359488, flags = 135266419, pgoff = 8192, inode = 59166 }
+vm_state.vm_map: 23329.161868670 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2839359488, end = 2839445504, flags = 134217845, pgoff = 0, inode = 59165 }
+vm_state.vm_map: 23329.161870988 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2839445504, end = 2839449600, flags = 135266419, pgoff = 86016, inode = 59165 }
+vm_state.vm_map: 23329.161874108 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2839449600, end = 2841485312, flags = 134217937, pgoff = 0, inode = 41242 }
+vm_state.vm_map: 23329.161877055 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2841485312, end = 2841559040, flags = 134217841, pgoff = 0, inode = 98526 }
+vm_state.vm_map: 23329.161883591 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2841559040, end = 2967900160, flags = 134217979, pgoff = 0, inode = 73879 }
+vm_state.vm_map: 23329.161887420 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 2967900160, end = 3001556992, flags = 134217979, pgoff = 0, inode = 73878 }
+vm_state.vm_map: 23329.161890052 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3001556992, end = 3001597952, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.161892192 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3001597952, end = 3001602048, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.161894307 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3001602048, end = 3001606144, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.161897513 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3001606144, end = 3001643008, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.161899579 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3001643008, end = 3001647104, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.161901743 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3001647104, end = 3001651200, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.161905097 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3001651200, end = 3001675776, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.161907440 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3001675776, end = 3001679872, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.161909518 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3001679872, end = 3001683968, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.161913908 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3001683968, end = 3001692160, flags = 134217845, pgoff = 0, inode = 17721 }
+vm_state.vm_map: 23329.161916152 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3001692160, end = 3001696256, flags = 135266419, pgoff = 4096, inode = 17721 }
+vm_state.vm_map: 23329.161919363 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3001696256, end = 3001778176, flags = 134217841, pgoff = 0, inode = 98443 }
+vm_state.vm_map: 23329.161921899 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3001778176, end = 3018018816, flags = 134217979, pgoff = 0, inode = 1204696 }
+vm_state.vm_map: 23329.161924475 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3018018816, end = 3022315520, flags = 134217979, pgoff = 0, inode = 1204694 }
+vm_state.vm_map: 23329.161927188 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022315520, end = 3022516224, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 23329.161929722 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022516224, end = 3022520320, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 23329.161932879 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022520320, end = 3022553088, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 23329.161934876 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022553088, end = 3022557184, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 23329.161937873 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022557184, end = 3022565376, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 23329.161939908 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022565376, end = 3022569472, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 23329.161942325 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022569472, end = 3022594048, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 23329.161944292 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022594048, end = 3022598144, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 23329.161947430 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022598144, end = 3022675968, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.161949489 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022675968, end = 3022680064, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.161951530 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022680064, end = 3022684160, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.161953485 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022684160, end = 3022692352, flags = 1048691, pgoff = 3022684160, inode = 0 }
+vm_state.vm_map: 23329.161956352 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022692352, end = 3022696448, flags = 134217937, pgoff = 0, inode = 1196150 }
+vm_state.vm_map: 23329.161958911 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022696448, end = 3022721024, flags = 134217937, pgoff = 0, inode = 1196354 }
+vm_state.vm_map: 23329.161961278 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022721024, end = 3022725120, flags = 134217937, pgoff = 0, inode = 1196334 }
+vm_state.vm_map: 23329.161963769 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022725120, end = 3022729216, flags = 134217937, pgoff = 0, inode = 1196333 }
+vm_state.vm_map: 23329.161966932 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022729216, end = 3022733312, flags = 134217937, pgoff = 0, inode = 1196331 }
+vm_state.vm_map: 23329.161969990 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022733312, end = 3022737408, flags = 134217937, pgoff = 0, inode = 1196330 }
+vm_state.vm_map: 23329.161973018 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022737408, end = 3022745600, flags = 134217937, pgoff = 0, inode = 1196329 }
+vm_state.vm_map: 23329.161976279 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022745600, end = 3022778368, flags = 134217937, pgoff = 0, inode = 1196328 }
+vm_state.vm_map: 23329.161978820 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022778368, end = 3022790656, flags = 134217937, pgoff = 0, inode = 1196327 }
+vm_state.vm_map: 23329.161982001 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022790656, end = 3022798848, flags = 134217937, pgoff = 0, inode = 1196320 }
+vm_state.vm_map: 23329.161984727 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022798848, end = 3022802944, flags = 134217937, pgoff = 0, inode = 1196318 }
+vm_state.vm_map: 23329.161987137 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022802944, end = 3022807040, flags = 134217937, pgoff = 0, inode = 1196278 }
+vm_state.vm_map: 23329.161990017 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022807040, end = 3022811136, flags = 134217937, pgoff = 0, inode = 1196251 }
+vm_state.vm_map: 23329.161992747 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022811136, end = 3022839808, flags = 134217937, pgoff = 0, inode = 1196236 }
+vm_state.vm_map: 23329.161995559 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022839808, end = 3022852096, flags = 134217937, pgoff = 0, inode = 1196234 }
+vm_state.vm_map: 23329.161997995 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022852096, end = 3022856192, flags = 134217937, pgoff = 0, inode = 1196201 }
+vm_state.vm_map: 23329.162000726 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022856192, end = 3022864384, flags = 134217937, pgoff = 0, inode = 1196170 }
+vm_state.vm_map: 23329.162003470 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022864384, end = 3022868480, flags = 134217937, pgoff = 0, inode = 1196157 }
+vm_state.vm_map: 23329.162008303 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022868480, end = 3022872576, flags = 134217937, pgoff = 0, inode = 1196171 }
+vm_state.vm_map: 23329.162011257 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022872576, end = 3022884864, flags = 134217937, pgoff = 0, inode = 1196172 }
+vm_state.vm_map: 23329.162014303 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022884864, end = 3022917632, flags = 134217937, pgoff = 0, inode = 1196352 }
+vm_state.vm_map: 23329.162017786 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022917632, end = 3022946304, flags = 134217937, pgoff = 0, inode = 1196314 }
+vm_state.vm_map: 23329.162020358 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3022946304, end = 3023171584, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.162022528 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3023171584, end = 3023175680, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.162024495 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3023175680, end = 3023179776, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.162027639 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3023179776, end = 3023339520, flags = 134217845, pgoff = 0, inode = 23579 }
+vm_state.vm_map: 23329.162029742 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3023339520, end = 3023343616, flags = 135266419, pgoff = 159744, inode = 23579 }
+vm_state.vm_map: 23329.162032590 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3023343616, end = 3023912960, flags = 134217845, pgoff = 0, inode = 20907 }
+vm_state.vm_map: 23329.162034674 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3023912960, end = 3023929344, flags = 135266419, pgoff = 565248, inode = 20907 }
+vm_state.vm_map: 23329.162036660 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3023929344, end = 3024166912, flags = 1048691, pgoff = 3024166912, inode = 0 }
+vm_state.vm_map: 23329.162039564 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3024175104, end = 3024220160, flags = 134217937, pgoff = 0, inode = 1196147 }
+vm_state.vm_map: 23329.162042234 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3024220160, end = 3024277504, flags = 134217937, pgoff = 0, inode = 1196094 }
+vm_state.vm_map: 23329.162045095 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3024277504, end = 3024359424, flags = 134217845, pgoff = 0, inode = 23971 }
+vm_state.vm_map: 23329.162047154 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3024359424, end = 3024363520, flags = 135266419, pgoff = 81920, inode = 23971 }
+vm_state.vm_map: 23329.162052536 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3024363520, end = 3024822272, flags = 134217845, pgoff = 0, inode = 1066197 }
+vm_state.vm_map: 23329.162054947 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3024822272, end = 3024838656, flags = 135266419, pgoff = 454656, inode = 1066197 }
+vm_state.vm_map: 23329.162058072 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3024838656, end = 3024871424, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 23329.162060101 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3024871424, end = 3024875520, flags = 135266419, pgoff = 32768, inode = 20716 }
+vm_state.vm_map: 23329.162065459 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3024875520, end = 3025395712, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 23329.162067569 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3025395712, end = 3025403904, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 23329.162070177 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3025403904, end = 3025768448, flags = 134217845, pgoff = 0, inode = 23376 }
+vm_state.vm_map: 23329.162072187 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3025768448, end = 3025805312, flags = 135266423, pgoff = 364544, inode = 23376 }
+vm_state.vm_map: 23329.162074399 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3025805312, end = 3025809408, flags = 1048695, pgoff = 3025805312, inode = 0 }
+vm_state.vm_map: 23329.162077340 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3025809408, end = 3026362368, flags = 134217845, pgoff = 0, inode = 18947 }
+vm_state.vm_map: 23329.162079344 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3026362368, end = 3026382848, flags = 135266419, pgoff = 548864, inode = 18947 }
+vm_state.vm_map: 23329.162081959 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3026382848, end = 3026698240, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 23329.162084628 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3026698240, end = 3026706432, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 23329.162087409 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3026706432, end = 3026776064, flags = 134217845, pgoff = 0, inode = 1065123 }
+vm_state.vm_map: 23329.162089579 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3026776064, end = 3026780160, flags = 135266419, pgoff = 69632, inode = 1065123 }
+vm_state.vm_map: 23329.162092120 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3026780160, end = 3041275904, flags = 134217845, pgoff = 0, inode = 20672 }
+vm_state.vm_map: 23329.162094352 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3041275904, end = 3041890304, flags = 135266419, pgoff = 14495744, inode = 20672 }
+vm_state.vm_map: 23329.162096824 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3041890304, end = 3041898496, flags = 1048691, pgoff = 3041890304, inode = 0 }
+vm_state.vm_map: 23329.162099260 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3041898496, end = 3042271232, flags = 134217845, pgoff = 0, inode = 20902 }
+vm_state.vm_map: 23329.162102108 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3042271232, end = 3042283520, flags = 135266419, pgoff = 368640, inode = 20902 }
+vm_state.vm_map: 23329.162104760 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3042283520, end = 3042287616, flags = 1048691, pgoff = 3042283520, inode = 0 }
+vm_state.vm_map: 23329.162107497 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3042287616, end = 3042308096, flags = 134217937, pgoff = 0, inode = 1196196 }
+vm_state.vm_map: 23329.162109988 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3042308096, end = 3042320384, flags = 134217937, pgoff = 0, inode = 1196342 }
+vm_state.vm_map: 23329.162112886 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3042320384, end = 3042377728, flags = 134217937, pgoff = 0, inode = 1196355 }
+vm_state.vm_map: 23329.162115266 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3042377728, end = 3044360192, flags = 134217845, pgoff = 0, inode = 20915 }
+vm_state.vm_map: 23329.162117381 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3044360192, end = 3044401152, flags = 135266419, pgoff = 1978368, inode = 20915 }
+vm_state.vm_map: 23329.162120310 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3044401152, end = 3045732352, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.162122394 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3045732352, end = 3045748736, flags = 1048691, pgoff = 3045732352, inode = 0 }
+vm_state.vm_map: 23329.162124860 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3045748736, end = 3045896192, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.162127024 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3045896192, end = 3045904384, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.162129822 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3045904384, end = 3046223872, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 23329.162132048 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3046223872, end = 3046240256, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 23329.162134910 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3046240256, end = 3046252544, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 23329.162137413 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3046252544, end = 3046256640, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 23329.162140002 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3046256640, end = 3047514112, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 23329.162142339 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3047514112, end = 3047534592, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 23329.162144620 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3047534592, end = 3047542784, flags = 1048691, pgoff = 3047534592, inode = 0 }
+vm_state.vm_map: 23329.162147481 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3047542784, end = 3047780352, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 23329.162149480 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3047780352, end = 3047784448, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 23329.162153007 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3047784448, end = 3047800832, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.162155207 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3047800832, end = 3047804928, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.162157827 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3047804928, end = 3047813120, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.162160361 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3047813120, end = 3047817216, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.162163420 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3047817216, end = 3048009728, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.162165954 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3048009728, end = 3048013824, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.162169092 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3048013824, end = 3048067072, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 23329.162171176 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3048067072, end = 3048071168, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 23329.162173309 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3048071168, end = 3048075264, flags = 1048691, pgoff = 3048071168, inode = 0 }
+vm_state.vm_map: 23329.162175874 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3048075264, end = 3048259584, flags = 134217845, pgoff = 0, inode = 22064 }
+vm_state.vm_map: 23329.162178322 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3048259584, end = 3048267776, flags = 135266419, pgoff = 180224, inode = 22064 }
+vm_state.vm_map: 23329.162181251 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3048267776, end = 3048509440, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.162183588 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3048509440, end = 3048513536, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.162187121 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3048513536, end = 3048984576, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 23329.162189532 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3048984576, end = 3049000960, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 23329.162195352 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049000960, end = 3049144320, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 23329.162197448 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049144320, end = 3049148416, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 23329.162200192 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049148416, end = 3049234432, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 23329.162202170 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049234432, end = 3049238528, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 23329.162204144 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049238528, end = 3049242624, flags = 1048691, pgoff = 3049238528, inode = 0 }
+vm_state.vm_map: 23329.162207147 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049242624, end = 3049259008, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 23329.162209311 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049259008, end = 3049263104, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 23329.162212191 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049263104, end = 3049295872, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 23329.162214638 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049295872, end = 3049299968, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 23329.162217727 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049299968, end = 3049316352, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 23329.162220156 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049316352, end = 3049320448, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 23329.162222887 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049320448, end = 3049406464, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 23329.162225107 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049406464, end = 3049410560, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 23329.162227333 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049410560, end = 3049418752, flags = 1048691, pgoff = 3049410560, inode = 0 }
+vm_state.vm_map: 23329.162230089 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049418752, end = 3049447424, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 23329.162232383 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049447424, end = 3049451520, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 23329.162234491 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049451520, end = 3049455616, flags = 1048691, pgoff = 3049451520, inode = 0 }
+vm_state.vm_map: 23329.162237130 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049455616, end = 3049787392, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 23329.162239886 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049787392, end = 3049795584, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 23329.162242575 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049795584, end = 3049828352, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 23329.162244751 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049828352, end = 3049832448, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 23329.162248198 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049832448, end = 3049848832, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 23329.162250220 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049848832, end = 3049852928, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 23329.162253352 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049852928, end = 3049877504, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 23329.162255757 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049877504, end = 3049881600, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 23329.162258729 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049881600, end = 3049914368, flags = 134217845, pgoff = 0, inode = 21180 }
+vm_state.vm_map: 23329.162261189 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049914368, end = 3049918464, flags = 135266419, pgoff = 28672, inode = 21180 }
+vm_state.vm_map: 23329.162263557 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049918464, end = 3049922560, flags = 1048691, pgoff = 3049918464, inode = 0 }
+vm_state.vm_map: 23329.162266541 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3049922560, end = 3050352640, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 23329.162268730 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3050352640, end = 3050381312, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 23329.162270758 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3050381312, end = 3050385408, flags = 1048691, pgoff = 3050381312, inode = 0 }
+vm_state.vm_map: 23329.162273570 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3050385408, end = 3050827776, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 23329.162275555 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3050827776, end = 3050835968, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 23329.162278287 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3050835968, end = 3050934272, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.162280426 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3050934272, end = 3050938368, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.162282917 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3050938368, end = 3051208704, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 23329.162285087 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3051208704, end = 3051216896, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 23329.162288379 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3051216896, end = 3051278336, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 23329.162290951 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3051278336, end = 3051282432, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 23329.162292935 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3051282432, end = 3051286528, flags = 1048691, pgoff = 3051282432, inode = 0 }
+vm_state.vm_map: 23329.162295531 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3051286528, end = 3051753472, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 23329.162297530 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3051753472, end = 3051761664, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 23329.162300532 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3051761664, end = 3052892160, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 23329.162302930 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3052892160, end = 3052908544, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 23329.162306087 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3052908544, end = 3053023232, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.162308553 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3053023232, end = 3053027328, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.162311420 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3053027328, end = 3053174784, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.162313523 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3053174784, end = 3053178880, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.162315854 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3053178880, end = 3053182976, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.162318727 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3053182976, end = 3053191168, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.162320792 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3053191168, end = 3053195264, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.162323012 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3053195264, end = 3053199360, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.162324979 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3053199360, end = 3053203456, flags = 1048691, pgoff = 3053199360, inode = 0 }
+vm_state.vm_map: 23329.162327932 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3053203456, end = 3053289472, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.162330214 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3053289472, end = 3053293568, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.162332310 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3053293568, end = 3053297664, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.162334437 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3053297664, end = 3053305856, flags = 1048691, pgoff = 3053297664, inode = 0 }
+vm_state.vm_map: 23329.162336940 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3053305856, end = 3054043136, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.162339475 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3054043136, end = 3054047232, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.162342755 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3054047232, end = 3054075904, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.162344796 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3054075904, end = 3054080000, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.162347065 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3054080000, end = 3054084096, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.162349216 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3054084096, end = 3054100480, flags = 134217845, pgoff = 0, inode = 19625 }
+vm_state.vm_map: 23329.162351405 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3054100480, end = 3054104576, flags = 135266419, pgoff = 12288, inode = 19625 }
+vm_state.vm_map: 23329.162355037 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3054104576, end = 3054182400, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.162357293 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3054182400, end = 3054186496, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.162359994 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3054186496, end = 3055501312, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.162362325 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3055501312, end = 3055509504, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.162364335 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3055509504, end = 3055513600, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.162366289 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3055513600, end = 3055529984, flags = 1048691, pgoff = 3055513600, inode = 0 }
+vm_state.vm_map: 23329.162369310 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3055529984, end = 3056467968, flags = 134217845, pgoff = 0, inode = 16400 }
+vm_state.vm_map: 23329.162371357 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3056467968, end = 3056484352, flags = 135266417, pgoff = 937984, inode = 16400 }
+vm_state.vm_map: 23329.162373539 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3056484352, end = 3056488448, flags = 135266419, pgoff = 954368, inode = 16400 }
+vm_state.vm_map: 23329.162375742 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3056488448, end = 3056517120, flags = 1048691, pgoff = 3056488448, inode = 0 }
+vm_state.vm_map: 23329.162378922 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3056517120, end = 3066556416, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 23329.162381043 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3066556416, end = 3066716160, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 23329.162383139 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3066716160, end = 3066724352, flags = 1048691, pgoff = 3066716160, inode = 0 }
+vm_state.vm_map: 23329.162385630 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3066724352, end = 3070320640, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 23329.162387591 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3070320640, end = 3070418944, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 23329.162389552 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3070418944, end = 3070423040, flags = 1048691, pgoff = 3070418944, inode = 0 }
+vm_state.vm_map: 23329.162392462 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3070423040, end = 3072978944, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 23329.162394762 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3072978944, end = 3073028096, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 23329.162396760 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3073028096, end = 3073032192, flags = 1048691, pgoff = 3073028096, inode = 0 }
+vm_state.vm_map: 23329.162400009 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3073032192, end = 3074183168, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.162402025 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3074183168, end = 3074199552, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.162405170 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3074199552, end = 3074433024, flags = 134217845, pgoff = 0, inode = 1065180 }
+vm_state.vm_map: 23329.162407611 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3074433024, end = 3074441216, flags = 135266419, pgoff = 233472, inode = 1065180 }
+vm_state.vm_map: 23329.162409683 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3074441216, end = 3074445312, flags = 1048691, pgoff = 3074441216, inode = 0 }
+vm_state.vm_map: 23329.162412384 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3074445312, end = 3076747264, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 23329.162414622 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3076747264, end = 3076792320, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 23329.162417748 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3076792320, end = 3079102464, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 23329.162419986 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3079102464, end = 3079131136, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 23329.162422095 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3079131136, end = 3079135232, flags = 1048691, pgoff = 3079131136, inode = 0 }
+vm_state.vm_map: 23329.162424925 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3079135232, end = 3079143424, flags = 134217937, pgoff = 0, inode = 1196173 }
+vm_state.vm_map: 23329.162427416 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3079143424, end = 3079151616, flags = 134217937, pgoff = 0, inode = 1196343 }
+vm_state.vm_map: 23329.162430301 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3079151616, end = 3079159808, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 23329.162432391 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3079159808, end = 3079163904, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 23329.162435344 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3079163904, end = 3079180288, flags = 134217845, pgoff = 0, inode = 22094 }
+vm_state.vm_map: 23329.162437651 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3079180288, end = 3079184384, flags = 135266419, pgoff = 12288, inode = 22094 }
+vm_state.vm_map: 23329.162440659 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3079184384, end = 3079192576, flags = 134217845, pgoff = 0, inode = 1450327 }
+vm_state.vm_map: 23329.162442749 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3079192576, end = 3079196672, flags = 135266417, pgoff = 4096, inode = 1450327 }
+vm_state.vm_map: 23329.162445289 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3079196672, end = 3079200768, flags = 135266419, pgoff = 8192, inode = 1450327 }
+vm_state.vm_map: 23329.162447669 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3079200768, end = 3079229440, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.162449698 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3079229440, end = 3079237632, flags = 1048691, pgoff = 3079229440, inode = 0 }
+vm_state.vm_map: 23329.162452109 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3079237632, end = 3079241728, flags = 67371125, pgoff = 3079237632, inode = 0 }
+vm_state.vm_map: 23329.162455105 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3079241728, end = 3079356416, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.162457695 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3079356416, end = 3079360512, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.162459988 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3079360512, end = 3079364608, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.162461980 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2203, start = 3215650816, end = 3215736832, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.162468429 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 134512640, end = 134627328, flags = 134223989, pgoff = 0, inode = 1352621 }
+vm_state.vm_map: 23329.162470501 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 134627328, end = 134631424, flags = 135272563, pgoff = 114688, inode = 1352621 }
+vm_state.vm_map: 23329.162472468 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 149712896, end = 157863936, flags = 1048691, pgoff = 149712896, inode = 0 }
+vm_state.vm_map: 23329.162485219 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2917318656, end = 2917326848, flags = 134217845, pgoff = 0, inode = 132462 }
+vm_state.vm_map: 23329.162487290 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2917326848, end = 2917330944, flags = 135266419, pgoff = 4096, inode = 132462 }
+vm_state.vm_map: 23329.162494985 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2917330944, end = 2917359616, flags = 134217845, pgoff = 0, inode = 133405 }
+vm_state.vm_map: 23329.162497081 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2917359616, end = 2917363712, flags = 135266419, pgoff = 24576, inode = 133405 }
+vm_state.vm_map: 23329.162502988 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2917363712, end = 2917384192, flags = 134217845, pgoff = 0, inode = 134577 }
+vm_state.vm_map: 23329.162505411 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2917384192, end = 2917388288, flags = 135266419, pgoff = 16384, inode = 134577 }
+vm_state.vm_map: 23329.162511256 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2917388288, end = 2917396480, flags = 134217845, pgoff = 0, inode = 133774 }
+vm_state.vm_map: 23329.162513321 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2917396480, end = 2917400576, flags = 135266419, pgoff = 4096, inode = 133774 }
+vm_state.vm_map: 23329.162516189 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2917400576, end = 2917441536, flags = 134217845, pgoff = 0, inode = 133487 }
+vm_state.vm_map: 23329.162518241 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2917441536, end = 2917445632, flags = 135266419, pgoff = 36864, inode = 133487 }
+vm_state.vm_map: 23329.162523439 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2917445632, end = 2917490688, flags = 134217845, pgoff = 0, inode = 132466 }
+vm_state.vm_map: 23329.162525579 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2917490688, end = 2917494784, flags = 135266419, pgoff = 40960, inode = 132466 }
+vm_state.vm_map: 23329.162532151 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2917494784, end = 2917527552, flags = 134217845, pgoff = 0, inode = 133402 }
+vm_state.vm_map: 23329.162534420 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2917527552, end = 2917531648, flags = 135266419, pgoff = 28672, inode = 133402 }
+vm_state.vm_map: 23329.162540259 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2917531648, end = 2917548032, flags = 134217845, pgoff = 0, inode = 133403 }
+vm_state.vm_map: 23329.162542504 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2917548032, end = 2917552128, flags = 135266419, pgoff = 12288, inode = 133403 }
+vm_state.vm_map: 23329.162545679 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2917552128, end = 2917568512, flags = 134217845, pgoff = 0, inode = 133404 }
+vm_state.vm_map: 23329.162548263 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2917568512, end = 2917572608, flags = 135266419, pgoff = 12288, inode = 133404 }
+vm_state.vm_map: 23329.162551641 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2917572608, end = 2917703680, flags = 134217937, pgoff = 0, inode = 156496 }
+vm_state.vm_map: 23329.162558146 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2917703680, end = 2917834752, flags = 134217937, pgoff = 0, inode = 156489 }
+vm_state.vm_map: 23329.162561266 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2917834752, end = 2917847040, flags = 134217845, pgoff = 0, inode = 20765 }
+vm_state.vm_map: 23329.162563436 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2917847040, end = 2917851136, flags = 135266419, pgoff = 8192, inode = 20765 }
+vm_state.vm_map: 23329.162566925 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2917851136, end = 2918313984, flags = 134217845, pgoff = 0, inode = 20061 }
+vm_state.vm_map: 23329.162568973 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2918313984, end = 2918326272, flags = 135266419, pgoff = 458752, inode = 20061 }
+vm_state.vm_map: 23329.162572408 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2918326272, end = 2918387712, flags = 134217845, pgoff = 0, inode = 19423 }
+vm_state.vm_map: 23329.162574516 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2918387712, end = 2918391808, flags = 135266419, pgoff = 57344, inode = 19423 }
+vm_state.vm_map: 23329.162577315 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2918391808, end = 2918998016, flags = 134217845, pgoff = 0, inode = 22471 }
+vm_state.vm_map: 23329.162579473 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2918998016, end = 2919014400, flags = 135266419, pgoff = 602112, inode = 22471 }
+vm_state.vm_map: 23329.162583037 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2919014400, end = 2919104512, flags = 134217845, pgoff = 0, inode = 18560 }
+vm_state.vm_map: 23329.162585392 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2919104512, end = 2919108608, flags = 135266419, pgoff = 86016, inode = 18560 }
+vm_state.vm_map: 23329.162588838 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2919108608, end = 2919116800, flags = 134217845, pgoff = 0, inode = 500018 }
+vm_state.vm_map: 23329.162591206 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2919116800, end = 2919120896, flags = 135266419, pgoff = 4096, inode = 500018 }
+vm_state.vm_map: 23329.162594462 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2919120896, end = 2919145472, flags = 134217845, pgoff = 0, inode = 19420 }
+vm_state.vm_map: 23329.162596897 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2919145472, end = 2919149568, flags = 135266419, pgoff = 20480, inode = 19420 }
+vm_state.vm_map: 23329.162600060 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2919149568, end = 2919198720, flags = 134217845, pgoff = 0, inode = 19447 }
+vm_state.vm_map: 23329.162602187 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2919198720, end = 2919202816, flags = 135266419, pgoff = 49152, inode = 19447 }
+vm_state.vm_map: 23329.162605122 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2919202816, end = 2919469056, flags = 134217845, pgoff = 0, inode = 19433 }
+vm_state.vm_map: 23329.162607101 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2919469056, end = 2919477248, flags = 135266419, pgoff = 262144, inode = 19433 }
+vm_state.vm_map: 23329.162609629 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2919477248, end = 2919481344, flags = 1048691, pgoff = 2919477248, inode = 0 }
+vm_state.vm_map: 23329.162612441 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2919481344, end = 2919641088, flags = 134217845, pgoff = 0, inode = 18680 }
+vm_state.vm_map: 23329.162614630 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2919641088, end = 2919645184, flags = 135266419, pgoff = 159744, inode = 18680 }
+vm_state.vm_map: 23329.162617466 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2919645184, end = 2920304640, flags = 134217845, pgoff = 0, inode = 19419 }
+vm_state.vm_map: 23329.162619439 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2920304640, end = 2920329216, flags = 135266419, pgoff = 659456, inode = 19419 }
+vm_state.vm_map: 23329.162622787 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2920329216, end = 2920493056, flags = 134217845, pgoff = 0, inode = 17950 }
+vm_state.vm_map: 23329.162624803 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2920493056, end = 2920497152, flags = 135266419, pgoff = 163840, inode = 17950 }
+vm_state.vm_map: 23329.162627707 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2920497152, end = 2920534016, flags = 134217845, pgoff = 0, inode = 20852 }
+vm_state.vm_map: 23329.162629804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2920534016, end = 2920538112, flags = 135266417, pgoff = 36864, inode = 20852 }
+vm_state.vm_map: 23329.162632140 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2920538112, end = 2920542208, flags = 135266419, pgoff = 40960, inode = 20852 }
+vm_state.vm_map: 23329.162634607 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2920542208, end = 2920546304, flags = 1048691, pgoff = 2920542208, inode = 0 }
+vm_state.vm_map: 23329.162637258 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2920546304, end = 2920579072, flags = 134217845, pgoff = 0, inode = 20850 }
+vm_state.vm_map: 23329.162639213 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2920579072, end = 2920583168, flags = 135266419, pgoff = 28672, inode = 20850 }
+vm_state.vm_map: 23329.162645303 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2920583168, end = 2925334528, flags = 134217845, pgoff = 0, inode = 20853 }
+vm_state.vm_map: 23329.162647529 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2925334528, end = 2925371392, flags = 135266417, pgoff = 4751360, inode = 20853 }
+vm_state.vm_map: 23329.162649595 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2925371392, end = 2925391872, flags = 135266419, pgoff = 4788224, inode = 20853 }
+vm_state.vm_map: 23329.162651809 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2925391872, end = 2925395968, flags = 1048691, pgoff = 2925391872, inode = 0 }
+vm_state.vm_map: 23329.162657136 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2925400064, end = 2925404160, flags = 134217845, pgoff = 0, inode = 133407 }
+vm_state.vm_map: 23329.162659700 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2925404160, end = 2925408256, flags = 135266419, pgoff = 0, inode = 133407 }
+vm_state.vm_map: 23329.162662507 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2925408256, end = 2925473792, flags = 134217937, pgoff = 0, inode = 156491 }
+vm_state.vm_map: 23329.162665176 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2925473792, end = 2925481984, flags = 134217845, pgoff = 0, inode = 1450400 }
+vm_state.vm_map: 23329.162667926 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2925481984, end = 2925486080, flags = 135266417, pgoff = 4096, inode = 1450400 }
+vm_state.vm_map: 23329.162670115 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2925486080, end = 2925490176, flags = 135266419, pgoff = 8192, inode = 1450400 }
+vm_state.vm_map: 23329.162673253 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2925490176, end = 2925502464, flags = 134217845, pgoff = 0, inode = 133668 }
+vm_state.vm_map: 23329.162675694 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2925502464, end = 2925506560, flags = 135266419, pgoff = 8192, inode = 133668 }
+vm_state.vm_map: 23329.162679215 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2925506560, end = 2925555712, flags = 134217845, pgoff = 0, inode = 133399 }
+vm_state.vm_map: 23329.162681244 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2925555712, end = 2925559808, flags = 135266419, pgoff = 45056, inode = 133399 }
+vm_state.vm_map: 23329.162684012 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2925559808, end = 2925563904, flags = 1048688, pgoff = 2925559808, inode = 0 }
+vm_state.vm_map: 23329.162686380 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2925563904, end = 2933952512, flags = 1048691, pgoff = 2925563904, inode = 0 }
+vm_state.vm_map: 23329.162688593 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2933952512, end = 2933956608, flags = 1048688, pgoff = 2933952512, inode = 0 }
+vm_state.vm_map: 23329.162690579 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2933956608, end = 2942345216, flags = 1048691, pgoff = 2933956608, inode = 0 }
+vm_state.vm_map: 23329.162692743 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2944233472, end = 2944237568, flags = 1048688, pgoff = 2944233472, inode = 0 }
+vm_state.vm_map: 23329.162695597 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2944237568, end = 2952626176, flags = 1048691, pgoff = 2944237568, inode = 0 }
+vm_state.vm_map: 23329.162698014 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2956726272, end = 2956730368, flags = 1048688, pgoff = 2956726272, inode = 0 }
+vm_state.vm_map: 23329.162700351 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2956730368, end = 2965118976, flags = 1048691, pgoff = 2956730368, inode = 0 }
+vm_state.vm_map: 23329.162702818 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2969358336, end = 2969362432, flags = 1048688, pgoff = 2969358336, inode = 0 }
+vm_state.vm_map: 23329.162705074 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2969362432, end = 2977751040, flags = 1048691, pgoff = 2969362432, inode = 0 }
+vm_state.vm_map: 23329.162708028 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2977751040, end = 2977755136, flags = 1048688, pgoff = 2977751040, inode = 0 }
+vm_state.vm_map: 23329.162710303 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2977755136, end = 2986143744, flags = 1048691, pgoff = 2977755136, inode = 0 }
+vm_state.vm_map: 23329.162712960 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2986143744, end = 2986147840, flags = 1048688, pgoff = 2986143744, inode = 0 }
+vm_state.vm_map: 23329.162716185 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2986147840, end = 2994536448, flags = 1048691, pgoff = 2986147840, inode = 0 }
+vm_state.vm_map: 23329.162720353 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2994536448, end = 2994860032, flags = 134217845, pgoff = 0, inode = 21280 }
+vm_state.vm_map: 23329.162722474 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2994860032, end = 2994864128, flags = 135266419, pgoff = 323584, inode = 21280 }
+vm_state.vm_map: 23329.162725796 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2994864128, end = 2994876416, flags = 134217845, pgoff = 0, inode = 499779 }
+vm_state.vm_map: 23329.162727917 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2994876416, end = 2994880512, flags = 135266419, pgoff = 8192, inode = 499779 }
+vm_state.vm_map: 23329.162730692 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2994880512, end = 2994900992, flags = 134217845, pgoff = 0, inode = 18127 }
+vm_state.vm_map: 23329.162732734 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2994900992, end = 2994905088, flags = 135266419, pgoff = 16384, inode = 18127 }
+vm_state.vm_map: 23329.162736100 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2994905088, end = 2994921472, flags = 134217845, pgoff = 0, inode = 21276 }
+vm_state.vm_map: 23329.162738233 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2994921472, end = 2994925568, flags = 135266419, pgoff = 12288, inode = 21276 }
+vm_state.vm_map: 23329.162741309 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2994925568, end = 2995322880, flags = 134217845, pgoff = 0, inode = 24050 }
+vm_state.vm_map: 23329.162743393 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2995322880, end = 2995331072, flags = 135266419, pgoff = 397312, inode = 24050 }
+vm_state.vm_map: 23329.162745767 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2995331072, end = 2995347456, flags = 1048691, pgoff = 2995331072, inode = 0 }
+vm_state.vm_map: 23329.162748980 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2995347456, end = 2995376128, flags = 134217845, pgoff = 0, inode = 499851 }
+vm_state.vm_map: 23329.162750971 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2995376128, end = 2995380224, flags = 135266419, pgoff = 28672, inode = 499851 }
+vm_state.vm_map: 23329.162753703 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2995380224, end = 2995683328, flags = 134217845, pgoff = 0, inode = 24049 }
+vm_state.vm_map: 23329.162756015 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2995683328, end = 2995687424, flags = 135266419, pgoff = 299008, inode = 24049 }
+vm_state.vm_map: 23329.162759381 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2995687424, end = 2995949568, flags = 134217845, pgoff = 0, inode = 24048 }
+vm_state.vm_map: 23329.162761638 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2995949568, end = 2995953664, flags = 135266419, pgoff = 262144, inode = 24048 }
+vm_state.vm_map: 23329.162765165 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2995953664, end = 2995961856, flags = 134217845, pgoff = 0, inode = 499720 }
+vm_state.vm_map: 23329.162767606 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2995961856, end = 2995965952, flags = 135266419, pgoff = 4096, inode = 499720 }
+vm_state.vm_map: 23329.162868391 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2995965952, end = 2995978240, flags = 134217845, pgoff = 0, inode = 133766 }
+vm_state.vm_map: 23329.162874549 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2995978240, end = 2995982336, flags = 135266419, pgoff = 8192, inode = 133766 }
+vm_state.vm_map: 23329.162889866 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2995982336, end = 2995998720, flags = 134217845, pgoff = 0, inode = 132448 }
+vm_state.vm_map: 23329.162892560 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2995998720, end = 2996002816, flags = 135266419, pgoff = 16384, inode = 132448 }
+vm_state.vm_map: 23329.162895149 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2996002816, end = 2996006912, flags = 134217845, pgoff = 0, inode = 132458 }
+vm_state.vm_map: 23329.162897196 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2996006912, end = 2996011008, flags = 135266419, pgoff = 0, inode = 132458 }
+vm_state.vm_map: 23329.162904799 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2996011008, end = 2996043776, flags = 134217845, pgoff = 0, inode = 133778 }
+vm_state.vm_map: 23329.162906870 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2996043776, end = 2996047872, flags = 135266419, pgoff = 28672, inode = 133778 }
+vm_state.vm_map: 23329.162915108 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2996047872, end = 2996060160, flags = 134217845, pgoff = 0, inode = 133391 }
+vm_state.vm_map: 23329.162917223 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2996060160, end = 2996064256, flags = 135266419, pgoff = 12288, inode = 133391 }
+vm_state.vm_map: 23329.162919424 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2996064256, end = 2996068352, flags = 1048688, pgoff = 2996064256, inode = 0 }
+vm_state.vm_map: 23329.162924504 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 2996068352, end = 3004456960, flags = 1048691, pgoff = 2996068352, inode = 0 }
+vm_state.vm_map: 23329.162930393 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3004456960, end = 3004620800, flags = 134217845, pgoff = 0, inode = 133325 }
+vm_state.vm_map: 23329.162932797 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3004620800, end = 3004657664, flags = 135266419, pgoff = 159744, inode = 133325 }
+vm_state.vm_map: 23329.162934837 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3004657664, end = 3004735488, flags = 1048691, pgoff = 3004657664, inode = 0 }
+vm_state.vm_map: 23329.162938075 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3004735488, end = 3004755968, flags = 134217845, pgoff = 0, inode = 23692 }
+vm_state.vm_map: 23329.162940572 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3004755968, end = 3004760064, flags = 135266419, pgoff = 16384, inode = 23692 }
+vm_state.vm_map: 23329.162946547 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3004760064, end = 3005112320, flags = 134217845, pgoff = 0, inode = 22500 }
+vm_state.vm_map: 23329.162948612 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3005112320, end = 3005206528, flags = 135266419, pgoff = 348160, inode = 22500 }
+vm_state.vm_map: 23329.162951005 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3005206528, end = 3005218816, flags = 1048691, pgoff = 3005206528, inode = 0 }
+vm_state.vm_map: 23329.162954063 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3005218816, end = 3005382656, flags = 134217845, pgoff = 0, inode = 21283 }
+vm_state.vm_map: 23329.162956078 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3005382656, end = 3005386752, flags = 135266419, pgoff = 159744, inode = 21283 }
+vm_state.vm_map: 23329.162958946 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3005386752, end = 3006349312, flags = 134217845, pgoff = 0, inode = 21285 }
+vm_state.vm_map: 23329.162961072 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3006349312, end = 3006406656, flags = 135266419, pgoff = 962560, inode = 21285 }
+vm_state.vm_map: 23329.162966196 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3006406656, end = 3006730240, flags = 134217845, pgoff = 0, inode = 20860 }
+vm_state.vm_map: 23329.162968521 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3006730240, end = 3006734336, flags = 135266419, pgoff = 323584, inode = 20860 }
+vm_state.vm_map: 23329.162971240 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3006734336, end = 3006840832, flags = 134217845, pgoff = 0, inode = 92226 }
+vm_state.vm_map: 23329.162973607 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3006840832, end = 3006844928, flags = 135266419, pgoff = 102400, inode = 92226 }
+vm_state.vm_map: 23329.162976345 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3006844928, end = 3007344640, flags = 134217845, pgoff = 0, inode = 22502 }
+vm_state.vm_map: 23329.162978466 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3007344640, end = 3007352832, flags = 135266419, pgoff = 499712, inode = 22502 }
+vm_state.vm_map: 23329.162983676 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3007352832, end = 3007467520, flags = 134217845, pgoff = 0, inode = 22497 }
+vm_state.vm_map: 23329.162985772 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3007467520, end = 3007471616, flags = 135266419, pgoff = 114688, inode = 22497 }
+vm_state.vm_map: 23329.162989108 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3007471616, end = 3007520768, flags = 134217845, pgoff = 0, inode = 1065068 }
+vm_state.vm_map: 23329.162991223 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3007520768, end = 3007524864, flags = 135266419, pgoff = 45056, inode = 1065068 }
+vm_state.vm_map: 23329.162994337 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3007524864, end = 3007770624, flags = 134217845, pgoff = 0, inode = 1065036 }
+vm_state.vm_map: 23329.162996427 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3007770624, end = 3007782912, flags = 135266419, pgoff = 241664, inode = 1065036 }
+vm_state.vm_map: 23329.162999670 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3007782912, end = 3008401408, flags = 134217845, pgoff = 0, inode = 22491 }
+vm_state.vm_map: 23329.163001766 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3008401408, end = 3008409600, flags = 135266419, pgoff = 618496, inode = 22491 }
+vm_state.vm_map: 23329.163003850 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3008409600, end = 3008413696, flags = 1048691, pgoff = 3008409600, inode = 0 }
+vm_state.vm_map: 23329.163008993 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3008413696, end = 3008471040, flags = 135266421, pgoff = 0, inode = 33719 }
+vm_state.vm_map: 23329.163011064 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3008471040, end = 3008475136, flags = 135266419, pgoff = 57344, inode = 33719 }
+vm_state.vm_map: 23329.163013697 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3008475136, end = 3008528384, flags = 135266421, pgoff = 0, inode = 33713 }
+vm_state.vm_map: 23329.163015683 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3008528384, end = 3008532480, flags = 135266419, pgoff = 53248, inode = 33713 }
+vm_state.vm_map: 23329.163017865 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3008532480, end = 3008544768, flags = 1048691, pgoff = 3008532480, inode = 0 }
+vm_state.vm_map: 23329.163020862 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3008544768, end = 3013525504, flags = 135266421, pgoff = 0, inode = 33715 }
+vm_state.vm_map: 23329.163023236 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3013525504, end = 3013566464, flags = 135266419, pgoff = 4976640, inode = 33715 }
+vm_state.vm_map: 23329.163025363 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3013566464, end = 3016765440, flags = 1048691, pgoff = 3013566464, inode = 0 }
+vm_state.vm_map: 23329.163027971 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3016765440, end = 3016818688, flags = 135266421, pgoff = 0, inode = 133389 }
+vm_state.vm_map: 23329.163029937 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3016818688, end = 3016826880, flags = 135266419, pgoff = 49152, inode = 133389 }
+vm_state.vm_map: 23329.163032502 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3016826880, end = 3016839168, flags = 1048691, pgoff = 3016826880, inode = 0 }
+vm_state.vm_map: 23329.163037861 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3016839168, end = 3016855552, flags = 134217845, pgoff = 0, inode = 133398 }
+vm_state.vm_map: 23329.163039944 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3016855552, end = 3016859648, flags = 135266419, pgoff = 12288, inode = 133398 }
+vm_state.vm_map: 23329.163042940 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3016859648, end = 3016900608, flags = 134217845, pgoff = 0, inode = 134575 }
+vm_state.vm_map: 23329.163044994 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3016900608, end = 3016904704, flags = 135266419, pgoff = 36864, inode = 134575 }
+vm_state.vm_map: 23329.163047873 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3016904704, end = 3016990720, flags = 134217845, pgoff = 0, inode = 134584 }
+vm_state.vm_map: 23329.163049938 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3016990720, end = 3017027584, flags = 135266419, pgoff = 81920, inode = 134584 }
+vm_state.vm_map: 23329.163052004 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3017027584, end = 3017064448, flags = 1048691, pgoff = 3017027584, inode = 0 }
+vm_state.vm_map: 23329.163054816 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3017064448, end = 3017191424, flags = 134217845, pgoff = 0, inode = 134585 }
+vm_state.vm_map: 23329.163056813 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3017191424, end = 3017228288, flags = 135266419, pgoff = 122880, inode = 134585 }
+vm_state.vm_map: 23329.163058811 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3017228288, end = 3017265152, flags = 1048691, pgoff = 3017228288, inode = 0 }
+vm_state.vm_map: 23329.163066604 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3017265152, end = 3017310208, flags = 134217845, pgoff = 0, inode = 133836 }
+vm_state.vm_map: 23329.163068935 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3017310208, end = 3017314304, flags = 135266419, pgoff = 45056, inode = 133836 }
+vm_state.vm_map: 23329.163071383 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3017314304, end = 3017318400, flags = 1048691, pgoff = 3017314304, inode = 0 }
+vm_state.vm_map: 23329.163074867 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3017318400, end = 3017490432, flags = 134217845, pgoff = 0, inode = 132460 }
+vm_state.vm_map: 23329.163077018 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3017490432, end = 3017494528, flags = 135266419, pgoff = 167936, inode = 132460 }
+vm_state.vm_map: 23329.163080268 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3017494528, end = 3017527296, flags = 134217845, pgoff = 0, inode = 132451 }
+vm_state.vm_map: 23329.163085194 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3017527296, end = 3017531392, flags = 135266419, pgoff = 28672, inode = 132451 }
+vm_state.vm_map: 23329.163087254 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3017531392, end = 3017535488, flags = 1048691, pgoff = 3017531392, inode = 0 }
+vm_state.vm_map: 23329.163092567 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3017535488, end = 3017646080, flags = 134217845, pgoff = 0, inode = 1065512 }
+vm_state.vm_map: 23329.163095029 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3017646080, end = 3017650176, flags = 135266419, pgoff = 106496, inode = 1065512 }
+vm_state.vm_map: 23329.163097340 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3017650176, end = 3017666560, flags = 1048691, pgoff = 3017650176, inode = 0 }
+vm_state.vm_map: 23329.163100812 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3017666560, end = 3017707520, flags = 134217845, pgoff = 0, inode = 1066155 }
+vm_state.vm_map: 23329.163103099 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3017707520, end = 3017711616, flags = 135266419, pgoff = 40960, inode = 1066155 }
+vm_state.vm_map: 23329.163107125 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3017711616, end = 3017883648, flags = 134217845, pgoff = 0, inode = 1066157 }
+vm_state.vm_map: 23329.163111879 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3017883648, end = 3017887744, flags = 135266419, pgoff = 167936, inode = 1066157 }
+vm_state.vm_map: 23329.163114437 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3017887744, end = 3017891840, flags = 1048691, pgoff = 3017887744, inode = 0 }
+vm_state.vm_map: 23329.163117126 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3017895936, end = 3017908224, flags = 134217845, pgoff = 0, inode = 133760 }
+vm_state.vm_map: 23329.163119111 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3017908224, end = 3017912320, flags = 135266419, pgoff = 8192, inode = 133760 }
+vm_state.vm_map: 23329.163122558 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3017912320, end = 3017932800, flags = 134217845, pgoff = 0, inode = 132459 }
+vm_state.vm_map: 23329.163125154 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3017932800, end = 3017936896, flags = 135266419, pgoff = 16384, inode = 132459 }
+vm_state.vm_map: 23329.163128014 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3017936896, end = 3017981952, flags = 134217845, pgoff = 0, inode = 133390 }
+vm_state.vm_map: 23329.163130512 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3017981952, end = 3017986048, flags = 135266419, pgoff = 40960, inode = 133390 }
+vm_state.vm_map: 23329.163133841 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3017986048, end = 3018031104, flags = 134217845, pgoff = 0, inode = 133776 }
+vm_state.vm_map: 23329.163135937 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3018031104, end = 3018035200, flags = 135266419, pgoff = 40960, inode = 133776 }
+vm_state.vm_map: 23329.163141086 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3018035200, end = 3018088448, flags = 134217845, pgoff = 0, inode = 133393 }
+vm_state.vm_map: 23329.163143176 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3018088448, end = 3018092544, flags = 135266419, pgoff = 53248, inode = 133393 }
+vm_state.vm_map: 23329.163146623 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3018092544, end = 3018133504, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.163149015 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3018133504, end = 3018137600, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.163151481 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3018137600, end = 3018141696, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.163154182 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3018141696, end = 3018178560, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.163156506 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3018178560, end = 3018182656, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.163159158 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3018182656, end = 3018186752, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.163161852 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3018186752, end = 3018211328, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.163164022 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3018211328, end = 3018215424, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.163166692 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3018215424, end = 3018219520, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.163169775 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3018219520, end = 3018297344, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.163172050 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3018297344, end = 3018301440, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.163174332 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3018301440, end = 3018305536, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.163176453 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3018305536, end = 3018313728, flags = 1048691, pgoff = 3018305536, inode = 0 }
+vm_state.vm_map: 23329.163179005 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3018313728, end = 3018383360, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 23329.163181156 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3018383360, end = 3018387456, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 23329.163183351 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3018387456, end = 3018391552, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 23329.163185343 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3018391552, end = 3018399744, flags = 1048691, pgoff = 3018391552, inode = 0 }
+vm_state.vm_map: 23329.163193074 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3018399744, end = 3018690560, flags = 134217845, pgoff = 0, inode = 22627 }
+vm_state.vm_map: 23329.163195528 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3018690560, end = 3018706944, flags = 135266419, pgoff = 286720, inode = 22627 }
+vm_state.vm_map: 23329.163197680 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3018706944, end = 3018727424, flags = 1048691, pgoff = 3018706944, inode = 0 }
+vm_state.vm_map: 23329.163203525 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3018727424, end = 3019075584, flags = 134217845, pgoff = 0, inode = 41235 }
+vm_state.vm_map: 23329.163205597 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3019075584, end = 3019087872, flags = 135266419, pgoff = 348160, inode = 41235 }
+vm_state.vm_map: 23329.163208427 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3019087872, end = 3021123584, flags = 134217937, pgoff = 0, inode = 41242 }
+vm_state.vm_map: 23329.163211775 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3021123584, end = 3022381056, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 23329.163214081 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3022381056, end = 3022401536, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 23329.163216467 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3022401536, end = 3022405632, flags = 1048691, pgoff = 3022401536, inode = 0 }
+vm_state.vm_map: 23329.163218650 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3022405632, end = 3022643200, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 23329.163220642 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3022643200, end = 3022647296, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 23329.163223176 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3022647296, end = 3022680064, flags = 134217845, pgoff = 0, inode = 21180 }
+vm_state.vm_map: 23329.163225383 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3022680064, end = 3022684160, flags = 135266419, pgoff = 28672, inode = 21180 }
+vm_state.vm_map: 23329.163228361 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3022684160, end = 3023114240, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 23329.163230698 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023114240, end = 3023142912, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 23329.163232862 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023142912, end = 3023147008, flags = 1048691, pgoff = 3023142912, inode = 0 }
+vm_state.vm_map: 23329.163235982 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023147008, end = 3023589376, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 23329.163238430 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023589376, end = 3023597568, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 23329.163241254 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3023597568, end = 3024400384, flags = 134217845, pgoff = 0, inode = 21274 }
+vm_state.vm_map: 23329.163249775 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3024400384, end = 3024416768, flags = 135266419, pgoff = 802816, inode = 21274 }
+vm_state.vm_map: 23329.163253270 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3024416768, end = 3026972672, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 23329.163255645 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3026972672, end = 3027021824, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 23329.163260983 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3027021824, end = 3027025920, flags = 1048691, pgoff = 3027021824, inode = 0 }
+vm_state.vm_map: 23329.163263642 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3027025920, end = 3027042304, flags = 134217845, pgoff = 0, inode = 133777 }
+vm_state.vm_map: 23329.163265780 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3027042304, end = 3027046400, flags = 135266419, pgoff = 12288, inode = 133777 }
+vm_state.vm_map: 23329.163268900 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3027046400, end = 3027066880, flags = 134217845, pgoff = 0, inode = 133765 }
+vm_state.vm_map: 23329.163270965 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3027066880, end = 3027070976, flags = 135266419, pgoff = 20480, inode = 133765 }
+vm_state.vm_map: 23329.163273740 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3027070976, end = 3027083264, flags = 134217845, pgoff = 0, inode = 133767 }
+vm_state.vm_map: 23329.163275954 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3027083264, end = 3027087360, flags = 135266419, pgoff = 8192, inode = 133767 }
+vm_state.vm_map: 23329.163278260 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3027087360, end = 3027091456, flags = 1048691, pgoff = 3027087360, inode = 0 }
+vm_state.vm_map: 23329.163281299 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3027091456, end = 3027116032, flags = 134217845, pgoff = 0, inode = 132468 }
+vm_state.vm_map: 23329.163283624 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3027116032, end = 3027120128, flags = 135266419, pgoff = 24576, inode = 132468 }
+vm_state.vm_map: 23329.163287027 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3027120128, end = 3043360768, flags = 134217979, pgoff = 0, inode = 1204696 }
+vm_state.vm_map: 23329.163290153 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3043360768, end = 3047657472, flags = 134217979, pgoff = 0, inode = 1204694 }
+vm_state.vm_map: 23329.163293292 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3047657472, end = 3047858176, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 23329.163295894 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3047858176, end = 3047862272, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 23329.163299069 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3047862272, end = 3047886848, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 23329.163301147 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3047886848, end = 3047890944, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 23329.163303872 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3047895040, end = 3047919616, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 23329.163306320 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3047919616, end = 3047923712, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 23329.163312880 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3047923712, end = 3047981056, flags = 134217845, pgoff = 0, inode = 123137 }
+vm_state.vm_map: 23329.163315174 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3047981056, end = 3047985152, flags = 135266419, pgoff = 53248, inode = 123137 }
+vm_state.vm_map: 23329.163317793 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3047985152, end = 3047989248, flags = 134217937, pgoff = 0, inode = 1196150 }
+vm_state.vm_map: 23329.163320525 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3047989248, end = 3048013824, flags = 134217937, pgoff = 0, inode = 1196354 }
+vm_state.vm_map: 23329.163323441 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048013824, end = 3048017920, flags = 134217937, pgoff = 0, inode = 1196334 }
+vm_state.vm_map: 23329.163326741 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048017920, end = 3048022016, flags = 134217937, pgoff = 0, inode = 1196333 }
+vm_state.vm_map: 23329.163329718 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048022016, end = 3048026112, flags = 134217937, pgoff = 0, inode = 1196331 }
+vm_state.vm_map: 23329.163332567 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048026112, end = 3048030208, flags = 134217937, pgoff = 0, inode = 1196330 }
+vm_state.vm_map: 23329.163335441 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048030208, end = 3048038400, flags = 134217937, pgoff = 0, inode = 1196329 }
+vm_state.vm_map: 23329.163338085 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048038400, end = 3048071168, flags = 134217937, pgoff = 0, inode = 1196328 }
+vm_state.vm_map: 23329.163340644 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048071168, end = 3048083456, flags = 134217937, pgoff = 0, inode = 1196327 }
+vm_state.vm_map: 23329.163343400 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048083456, end = 3048091648, flags = 134217937, pgoff = 0, inode = 1196320 }
+vm_state.vm_map: 23329.163345848 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048091648, end = 3048095744, flags = 134217937, pgoff = 0, inode = 1196318 }
+vm_state.vm_map: 23329.163348628 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048095744, end = 3048099840, flags = 134217937, pgoff = 0, inode = 1196278 }
+vm_state.vm_map: 23329.163351421 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048099840, end = 3048103936, flags = 134217937, pgoff = 0, inode = 1196251 }
+vm_state.vm_map: 23329.163353869 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048103936, end = 3048132608, flags = 134217937, pgoff = 0, inode = 1196236 }
+vm_state.vm_map: 23329.163356354 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048132608, end = 3048144896, flags = 134217937, pgoff = 0, inode = 1196234 }
+vm_state.vm_map: 23329.163358931 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048144896, end = 3048148992, flags = 134217937, pgoff = 0, inode = 1196201 }
+vm_state.vm_map: 23329.163361305 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048148992, end = 3048157184, flags = 134217937, pgoff = 0, inode = 1196170 }
+vm_state.vm_map: 23329.163363882 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048157184, end = 3048161280, flags = 134217937, pgoff = 0, inode = 1196157 }
+vm_state.vm_map: 23329.163366540 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048161280, end = 3048165376, flags = 134217937, pgoff = 0, inode = 1196171 }
+vm_state.vm_map: 23329.163369586 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048165376, end = 3048177664, flags = 134217937, pgoff = 0, inode = 1196172 }
+vm_state.vm_map: 23329.163372299 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048177664, end = 3048185856, flags = 134217937, pgoff = 0, inode = 1196173 }
+vm_state.vm_map: 23329.163374938 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048185856, end = 3048218624, flags = 134217937, pgoff = 0, inode = 1196352 }
+vm_state.vm_map: 23329.163377675 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048218624, end = 3048239104, flags = 134217937, pgoff = 0, inode = 1196196 }
+vm_state.vm_map: 23329.163380382 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048239104, end = 3048247296, flags = 134217937, pgoff = 0, inode = 1196343 }
+vm_state.vm_map: 23329.163383465 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048247296, end = 3048275968, flags = 134217937, pgoff = 0, inode = 1196314 }
+vm_state.vm_map: 23329.163386461 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048275968, end = 3048321024, flags = 134217937, pgoff = 0, inode = 1196147 }
+vm_state.vm_map: 23329.163389389 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048321024, end = 3048378368, flags = 134217937, pgoff = 0, inode = 1196094 }
+vm_state.vm_map: 23329.163393046 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048378368, end = 3048603648, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.163395069 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048603648, end = 3048607744, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.163397059 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048607744, end = 3048611840, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.163399754 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048615936, end = 3048632320, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 23329.163401887 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048632320, end = 3048636416, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 23329.163404477 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048636416, end = 3048648704, flags = 134217937, pgoff = 0, inode = 1196342 }
+vm_state.vm_map: 23329.163407406 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048648704, end = 3048706048, flags = 134217937, pgoff = 0, inode = 1196355 }
+vm_state.vm_map: 23329.163410396 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3048706048, end = 3050037248, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.163412998 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050037248, end = 3050049536, flags = 1048691, pgoff = 3050037248, inode = 0 }
+vm_state.vm_map: 23329.163416229 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050049536, end = 3050065920, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.163418399 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050065920, end = 3050070016, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.163421130 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050070016, end = 3050217472, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.163423171 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050217472, end = 3050225664, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.163426032 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050225664, end = 3050233856, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.163428196 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050233856, end = 3050237952, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.163431384 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050237952, end = 3050557440, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 23329.163433493 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050557440, end = 3050573824, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 23329.163436915 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050573824, end = 3050766336, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.163443685 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050766336, end = 3050770432, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.163445738 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050770432, end = 3050774528, flags = 1048691, pgoff = 3050770432, inode = 0 }
+vm_state.vm_map: 23329.163448494 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050774528, end = 3050872832, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.163450547 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050872832, end = 3050876928, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.163453302 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050876928, end = 3050889216, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 23329.163456071 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050889216, end = 3050893312, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 23329.163459303 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050893312, end = 3050946560, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 23329.163461368 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050946560, end = 3050950656, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 23329.163464204 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3050950656, end = 3051134976, flags = 134217845, pgoff = 0, inode = 22064 }
+vm_state.vm_map: 23329.163466258 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3051134976, end = 3051143168, flags = 135266419, pgoff = 180224, inode = 22064 }
+vm_state.vm_map: 23329.163469094 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3051143168, end = 3051384832, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.163471480 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3051384832, end = 3051388928, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.163473736 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3051388928, end = 3051393024, flags = 1048691, pgoff = 3051388928, inode = 0 }
+vm_state.vm_map: 23329.163476171 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3051393024, end = 3051864064, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 23329.163478237 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3051864064, end = 3051880448, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 23329.163481105 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3051880448, end = 3052023808, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 23329.163483120 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3052023808, end = 3052027904, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 23329.163486030 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3052027904, end = 3052113920, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 23329.163488472 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3052113920, end = 3052118016, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 23329.163491536 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3052118016, end = 3052126208, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.163493719 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3052126208, end = 3052130304, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.163496537 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3052130304, end = 3052134400, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.163499034 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3052134400, end = 3052220416, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.163500970 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3052220416, end = 3052224512, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.163572744 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3052224512, end = 3052228608, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.163576333 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3052228608, end = 3052240896, flags = 1048691, pgoff = 3052228608, inode = 0 }
+vm_state.vm_map: 23329.163578984 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3052240896, end = 3052978176, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.163581265 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3052978176, end = 3052982272, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.163584287 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3052982272, end = 3053010944, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.163586710 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053010944, end = 3053015040, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.163588843 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053015040, end = 3053019136, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.163591605 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053019136, end = 3053035520, flags = 134217845, pgoff = 0, inode = 19625 }
+vm_state.vm_map: 23329.163593714 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053035520, end = 3053039616, flags = 135266419, pgoff = 12288, inode = 19625 }
+vm_state.vm_map: 23329.163596427 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053039616, end = 3053101056, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 23329.163598708 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053101056, end = 3053105152, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 23329.163601637 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053105152, end = 3053182976, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.163603894 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053182976, end = 3053187072, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.163607624 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053187072, end = 3053191168, flags = 1048691, pgoff = 3053187072, inode = 0 }
+vm_state.vm_map: 23329.163610817 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053191168, end = 3053305856, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.163612964 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053305856, end = 3053309952, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.163616053 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053309952, end = 3053457408, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.163618105 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053457408, end = 3053461504, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.163620103 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053461504, end = 3053465600, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.163622606 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053465600, end = 3053498368, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 23329.163624900 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053498368, end = 3053502464, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 23329.163628032 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053502464, end = 3053518848, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 23329.163641658 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053518848, end = 3053522944, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 23329.163644679 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053522944, end = 3053555712, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 23329.163646917 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053555712, end = 3053559808, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 23329.163649526 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053559808, end = 3053576192, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 23329.163651634 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053576192, end = 3053580288, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 23329.163653934 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053580288, end = 3053584384, flags = 1048691, pgoff = 3053580288, inode = 0 }
+vm_state.vm_map: 23329.163656715 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3053584384, end = 3054714880, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 23329.163658713 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3054714880, end = 3054731264, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 23329.163661265 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3054731264, end = 3055001600, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 23329.163663318 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3055001600, end = 3055009792, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 23329.163666142 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3055009792, end = 3056160768, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.163668479 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3056160768, end = 3056177152, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.163671482 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3056177152, end = 3056263168, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 23329.163673486 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3056263168, end = 3056267264, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 23329.163675477 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3056267264, end = 3056275456, flags = 1048691, pgoff = 3056267264, inode = 0 }
+vm_state.vm_map: 23329.163678671 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3056275456, end = 3056304128, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 23329.163680655 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3056304128, end = 3056308224, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 23329.163683252 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3056308224, end = 3056640000, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 23329.163685577 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3056640000, end = 3056648192, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 23329.163687685 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3056648192, end = 3056652288, flags = 1048691, pgoff = 3056648192, inode = 0 }
+vm_state.vm_map: 23329.163690755 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3056652288, end = 3057967104, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.163693264 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3057967104, end = 3057975296, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.163695712 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3057975296, end = 3057979392, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.163697728 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3057979392, end = 3057991680, flags = 1048691, pgoff = 3057979392, inode = 0 }
+vm_state.vm_map: 23329.163700467 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3057991680, end = 3058929664, flags = 134217845, pgoff = 0, inode = 16400 }
+vm_state.vm_map: 23329.163702525 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3058929664, end = 3058946048, flags = 135266417, pgoff = 937984, inode = 16400 }
+vm_state.vm_map: 23329.163704616 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3058946048, end = 3058950144, flags = 135266419, pgoff = 954368, inode = 16400 }
+vm_state.vm_map: 23329.163706872 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3058950144, end = 3058978816, flags = 1048691, pgoff = 3058950144, inode = 0 }
+vm_state.vm_map: 23329.163710097 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3058978816, end = 3069018112, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 23329.163712255 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3069018112, end = 3069177856, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 23329.163714327 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3069177856, end = 3069186048, flags = 1048691, pgoff = 3069177856, inode = 0 }
+vm_state.vm_map: 23329.163717508 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3069186048, end = 3071496192, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 23329.163719635 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3071496192, end = 3071524864, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 23329.163721935 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3071524864, end = 3071528960, flags = 1048691, pgoff = 3071524864, inode = 0 }
+vm_state.vm_map: 23329.163724710 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3071528960, end = 3071995904, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 23329.163726929 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3071995904, end = 3072004096, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 23329.163729630 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3072004096, end = 3074306048, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 23329.163731844 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3074306048, end = 3074351104, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 23329.163734446 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3074351104, end = 3074355200, flags = 1048691, pgoff = 3074351104, inode = 0 }
+vm_state.vm_map: 23329.163737516 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3074355200, end = 3074670592, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 23329.163739952 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3074670592, end = 3074678784, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 23329.163742936 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3074678784, end = 3078275072, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 23329.163745125 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078275072, end = 3078373376, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 23329.163747498 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078373376, end = 3078377472, flags = 1048691, pgoff = 3078373376, inode = 0 }
+vm_state.vm_map: 23329.163750347 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078377472, end = 3078410240, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 23329.163752702 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078410240, end = 3078414336, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 23329.163755816 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078414336, end = 3078422528, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 23329.163758085 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078422528, end = 3078426624, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 23329.163761753 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078426624, end = 3078434816, flags = 134217845, pgoff = 0, inode = 1450327 }
+vm_state.vm_map: 23329.163763844 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078434816, end = 3078438912, flags = 135266417, pgoff = 4096, inode = 1450327 }
+vm_state.vm_map: 23329.163766242 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078438912, end = 3078443008, flags = 135266419, pgoff = 8192, inode = 1450327 }
+vm_state.vm_map: 23329.163768597 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078443008, end = 3078471680, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.163771044 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078471680, end = 3078479872, flags = 1048691, pgoff = 3078471680, inode = 0 }
+vm_state.vm_map: 23329.163773098 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078479872, end = 3078483968, flags = 67371125, pgoff = 3078479872, inode = 0 }
+vm_state.vm_map: 23329.163776218 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078483968, end = 3078598656, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.163778622 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078598656, end = 3078602752, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.163780700 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3078602752, end = 3078606848, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.163782747 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2205, start = 3215572992, end = 3215659008, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.163789307 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 134512640, end = 134553600, flags = 134223989, pgoff = 0, inode = 20759 }
+vm_state.vm_map: 23329.163791361 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 134553600, end = 134557696, flags = 135272563, pgoff = 36864, inode = 20759 }
+vm_state.vm_map: 23329.163793574 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 134557696, end = 134565888, flags = 1048691, pgoff = 134557696, inode = 0 }
+vm_state.vm_map: 23329.163795633 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 153337856, end = 154927104, flags = 1048691, pgoff = 153337856, inode = 0 }
+vm_state.vm_map: 23329.163867679 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3023929344, end = 3024166912, flags = 1048691, pgoff = 3024166912, inode = 0 }
+vm_state.vm_map: 23329.163871299 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3024523264, end = 3024564224, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.163873592 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3024564224, end = 3024568320, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.163876176 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3024568320, end = 3024572416, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.163878784 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3024572416, end = 3024609280, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.163880825 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3024609280, end = 3024613376, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.163882866 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3024613376, end = 3024617472, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.163885264 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3024617472, end = 3024695296, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.163888384 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3024695296, end = 3024699392, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.163890443 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3024699392, end = 3024703488, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.163892484 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3024703488, end = 3024711680, flags = 1048691, pgoff = 3024703488, inode = 0 }
+vm_state.vm_map: 23329.163894858 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3024711680, end = 3024736256, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.163896942 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3024736256, end = 3024740352, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.163899063 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3024740352, end = 3024744448, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.163901881 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3024838656, end = 3024871424, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 23329.163904107 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3024871424, end = 3024875520, flags = 135266419, pgoff = 32768, inode = 20716 }
+vm_state.vm_map: 23329.163906616 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3024875520, end = 3025395712, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 23329.163908662 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3025395712, end = 3025403904, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 23329.163911548 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3025403904, end = 3025768448, flags = 134217845, pgoff = 0, inode = 23376 }
+vm_state.vm_map: 23329.163914162 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3025768448, end = 3025805312, flags = 135266423, pgoff = 364544, inode = 23376 }
+vm_state.vm_map: 23329.163916302 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3025805312, end = 3025809408, flags = 1048695, pgoff = 3025805312, inode = 0 }
+vm_state.vm_map: 23329.163919144 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3025809408, end = 3026362368, flags = 134217845, pgoff = 0, inode = 18947 }
+vm_state.vm_map: 23329.163921203 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3026362368, end = 3026382848, flags = 135266419, pgoff = 548864, inode = 18947 }
+vm_state.vm_map: 23329.163923646 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3026382848, end = 3026698240, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 23329.163926068 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3026698240, end = 3026706432, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 23329.163928818 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3026706432, end = 3026776064, flags = 134217845, pgoff = 0, inode = 1065123 }
+vm_state.vm_map: 23329.163931488 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3026776064, end = 3026780160, flags = 135266419, pgoff = 69632, inode = 1065123 }
+vm_state.vm_map: 23329.163933923 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3026780160, end = 3041275904, flags = 134217845, pgoff = 0, inode = 20672 }
+vm_state.vm_map: 23329.163935970 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3041275904, end = 3041890304, flags = 135266419, pgoff = 14495744, inode = 20672 }
+vm_state.vm_map: 23329.163938215 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3041890304, end = 3041898496, flags = 1048691, pgoff = 3041890304, inode = 0 }
+vm_state.vm_map: 23329.163940891 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3041898496, end = 3042271232, flags = 134217845, pgoff = 0, inode = 20902 }
+vm_state.vm_map: 23329.163943197 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3042271232, end = 3042283520, flags = 135266419, pgoff = 368640, inode = 20902 }
+vm_state.vm_map: 23329.163946563 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3042299904, end = 3042373632, flags = 134217845, pgoff = 0, inode = 57409 }
+vm_state.vm_map: 23329.163948838 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3042373632, end = 3042377728, flags = 135266419, pgoff = 73728, inode = 57409 }
+vm_state.vm_map: 23329.163951317 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3042377728, end = 3044360192, flags = 134217845, pgoff = 0, inode = 20915 }
+vm_state.vm_map: 23329.163953345 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3044360192, end = 3044401152, flags = 135266419, pgoff = 1978368, inode = 20915 }
+vm_state.vm_map: 23329.163955343 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3044401152, end = 3045732352, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.163957686 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3045732352, end = 3045748736, flags = 1048691, pgoff = 3045732352, inode = 0 }
+vm_state.vm_map: 23329.163960448 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3045748736, end = 3045896192, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.163962508 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3045896192, end = 3045904384, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.163971713 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3045904384, end = 3046223872, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 23329.163973791 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3046223872, end = 3046240256, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 23329.163976288 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3046240256, end = 3046252544, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 23329.163978428 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3046252544, end = 3046256640, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 23329.163980808 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3046256640, end = 3047514112, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 23329.163983563 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3047514112, end = 3047534592, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 23329.163985654 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3047534592, end = 3047542784, flags = 1048691, pgoff = 3047534592, inode = 0 }
+vm_state.vm_map: 23329.163988163 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3047542784, end = 3047780352, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 23329.163990334 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3047780352, end = 3047784448, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 23329.163993015 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3047784448, end = 3047800832, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.163995087 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3047800832, end = 3047804928, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.163997455 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3047804928, end = 3047813120, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.163999809 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3047813120, end = 3047817216, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.164002387 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3047817216, end = 3048009728, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.164004465 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3048009728, end = 3048013824, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.164007455 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3048013824, end = 3048067072, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 23329.164009459 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3048067072, end = 3048071168, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 23329.164011623 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3048071168, end = 3048075264, flags = 1048691, pgoff = 3048071168, inode = 0 }
+vm_state.vm_map: 23329.164014546 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3048075264, end = 3048259584, flags = 134217845, pgoff = 0, inode = 22064 }
+vm_state.vm_map: 23329.164016574 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3048259584, end = 3048267776, flags = 135266419, pgoff = 180224, inode = 22064 }
+vm_state.vm_map: 23329.164018843 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3048267776, end = 3048509440, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.164021390 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3048509440, end = 3048513536, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.164023628 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3048513536, end = 3048984576, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 23329.164025891 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3048984576, end = 3049000960, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 23329.164028283 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049000960, end = 3049144320, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 23329.164030484 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049144320, end = 3049148416, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 23329.164032673 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049148416, end = 3049234432, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 23329.164035084 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049234432, end = 3049238528, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 23329.164037334 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049238528, end = 3049242624, flags = 1048691, pgoff = 3049238528, inode = 0 }
+vm_state.vm_map: 23329.164039628 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049242624, end = 3049259008, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 23329.164041669 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049259008, end = 3049263104, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 23329.164044696 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049263104, end = 3049295872, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 23329.164046829 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049295872, end = 3049299968, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 23329.164049253 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049299968, end = 3049316352, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 23329.164051552 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049316352, end = 3049320448, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 23329.164053988 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049320448, end = 3049406464, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 23329.164056386 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049406464, end = 3049410560, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 23329.164058637 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049410560, end = 3049418752, flags = 1048691, pgoff = 3049410560, inode = 0 }
+vm_state.vm_map: 23329.164060894 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049418752, end = 3049447424, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 23329.164063113 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049447424, end = 3049451520, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 23329.164065327 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049451520, end = 3049455616, flags = 1048691, pgoff = 3049451520, inode = 0 }
+vm_state.vm_map: 23329.164067664 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049455616, end = 3049787392, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 23329.164069722 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049787392, end = 3049795584, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 23329.164072046 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049795584, end = 3049828352, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 23329.164074360 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049828352, end = 3049832448, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 23329.164076776 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049832448, end = 3049848832, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 23329.164082047 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049848832, end = 3049852928, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 23329.164084446 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049852928, end = 3049877504, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 23329.164086795 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049877504, end = 3049881600, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 23329.164089681 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049881600, end = 3049914368, flags = 134217845, pgoff = 0, inode = 21180 }
+vm_state.vm_map: 23329.164091857 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049914368, end = 3049918464, flags = 135266419, pgoff = 28672, inode = 21180 }
+vm_state.vm_map: 23329.164094428 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049918464, end = 3049922560, flags = 1048691, pgoff = 3049918464, inode = 0 }
+vm_state.vm_map: 23329.164097240 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3049922560, end = 3050352640, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 23329.164099305 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3050352640, end = 3050381312, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 23329.164101833 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3050381312, end = 3050385408, flags = 1048691, pgoff = 3050381312, inode = 0 }
+vm_state.vm_map: 23329.164104731 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3050385408, end = 3050827776, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 23329.164106754 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3050827776, end = 3050835968, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 23329.164109670 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3050835968, end = 3050934272, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.164111945 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3050934272, end = 3050938368, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.164114313 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3050938368, end = 3051208704, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 23329.164116304 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3051208704, end = 3051216896, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 23329.164119517 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3051216896, end = 3051278336, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 23329.164122100 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3051278336, end = 3051282432, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 23329.164124104 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3051282432, end = 3051286528, flags = 1048691, pgoff = 3051282432, inode = 0 }
+vm_state.vm_map: 23329.164126774 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3051286528, end = 3051753472, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 23329.164128838 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3051753472, end = 3051761664, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 23329.164131409 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3051761664, end = 3052892160, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 23329.164133839 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3052892160, end = 3052908544, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 23329.164136331 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3052908544, end = 3053023232, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.164138401 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3053023232, end = 3053027328, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.164140782 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3053027328, end = 3053174784, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.164142786 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3053174784, end = 3053178880, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.164144789 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3053178880, end = 3053182976, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.164147250 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3053182976, end = 3053191168, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.164149660 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3053191168, end = 3053195264, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.164151639 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3053195264, end = 3053199360, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.164153600 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3053199360, end = 3053203456, flags = 1048691, pgoff = 3053199360, inode = 0 }
+vm_state.vm_map: 23329.164156763 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3053203456, end = 3053289472, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.164159272 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3053289472, end = 3053293568, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.164161313 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3053293568, end = 3053297664, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.164163749 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3053297664, end = 3053305856, flags = 1048691, pgoff = 3053297664, inode = 0 }
+vm_state.vm_map: 23329.164166141 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3053305856, end = 3054043136, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.164168225 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3054043136, end = 3054047232, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.164171394 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3054047232, end = 3054075904, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.164173392 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3054075904, end = 3054080000, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.164175347 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3054080000, end = 3054084096, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.164177881 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3054084096, end = 3054100480, flags = 134217845, pgoff = 0, inode = 19625 }
+vm_state.vm_map: 23329.164179922 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3054100480, end = 3054104576, flags = 135266419, pgoff = 12288, inode = 19625 }
+vm_state.vm_map: 23329.164182671 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3054104576, end = 3054182400, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.164185027 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3054182400, end = 3054186496, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.164187863 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3054186496, end = 3055501312, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.164189984 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3055501312, end = 3055509504, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.164194885 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3055509504, end = 3055513600, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.164197395 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3055513600, end = 3055529984, flags = 1048691, pgoff = 3055513600, inode = 0 }
+vm_state.vm_map: 23329.164199874 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3055529984, end = 3056467968, flags = 134217845, pgoff = 0, inode = 16400 }
+vm_state.vm_map: 23329.164202075 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3056467968, end = 3056484352, flags = 135266417, pgoff = 937984, inode = 16400 }
+vm_state.vm_map: 23329.164204141 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3056484352, end = 3056488448, flags = 135266419, pgoff = 954368, inode = 16400 }
+vm_state.vm_map: 23329.164206644 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3056488448, end = 3056517120, flags = 1048691, pgoff = 3056488448, inode = 0 }
+vm_state.vm_map: 23329.164209399 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3056517120, end = 3066556416, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 23329.164211595 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3066556416, end = 3066716160, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 23329.164213968 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3066716160, end = 3066724352, flags = 1048691, pgoff = 3066716160, inode = 0 }
+vm_state.vm_map: 23329.164216243 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3066724352, end = 3070320640, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 23329.164218296 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3070320640, end = 3070418944, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 23329.164220844 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3070418944, end = 3070423040, flags = 1048691, pgoff = 3070418944, inode = 0 }
+vm_state.vm_map: 23329.164223828 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3070423040, end = 3072978944, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 23329.164226139 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3072978944, end = 3073028096, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 23329.164228322 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3073028096, end = 3073032192, flags = 1048691, pgoff = 3073028096, inode = 0 }
+vm_state.vm_map: 23329.164230844 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3073032192, end = 3074183168, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.164232909 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3074183168, end = 3074199552, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.164236269 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3074199552, end = 3074433024, flags = 134217845, pgoff = 0, inode = 1065180 }
+vm_state.vm_map: 23329.164238674 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3074433024, end = 3074441216, flags = 135266419, pgoff = 233472, inode = 1065180 }
+vm_state.vm_map: 23329.164240733 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3074441216, end = 3074445312, flags = 1048691, pgoff = 3074441216, inode = 0 }
+vm_state.vm_map: 23329.164242916 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3074445312, end = 3076747264, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 23329.164245167 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3076747264, end = 3076792320, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 23329.164247997 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3076792320, end = 3079102464, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 23329.164250050 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3079102464, end = 3079131136, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 23329.164252529 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3079131136, end = 3079135232, flags = 1048691, pgoff = 3079131136, inode = 0 }
+vm_state.vm_map: 23329.164255722 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3079151616, end = 3079159808, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 23329.164257769 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3079159808, end = 3079163904, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 23329.164260482 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3079163904, end = 3079180288, flags = 134217845, pgoff = 0, inode = 22094 }
+vm_state.vm_map: 23329.164262671 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3079180288, end = 3079184384, flags = 135266419, pgoff = 12288, inode = 22094 }
+vm_state.vm_map: 23329.164265014 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3079184384, end = 3079192576, flags = 134217845, pgoff = 0, inode = 1450327 }
+vm_state.vm_map: 23329.164266981 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3079192576, end = 3079196672, flags = 135266417, pgoff = 4096, inode = 1450327 }
+vm_state.vm_map: 23329.164269145 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3079196672, end = 3079200768, flags = 135266419, pgoff = 8192, inode = 1450327 }
+vm_state.vm_map: 23329.164271507 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3079200768, end = 3079229440, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.164273972 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3079229440, end = 3079237632, flags = 1048691, pgoff = 3079229440, inode = 0 }
+vm_state.vm_map: 23329.164276421 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3079237632, end = 3079241728, flags = 67371125, pgoff = 3079237632, inode = 0 }
+vm_state.vm_map: 23329.164278750 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3079241728, end = 3079356416, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.164280903 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3079356416, end = 3079360512, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.164283036 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3079360512, end = 3079364608, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.164285151 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2238, start = 3215650816, end = 3215736832, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.164288839 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 134512640, end = 134553600, flags = 134223989, pgoff = 0, inode = 20759 }
+vm_state.vm_map: 23329.164291039 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 134553600, end = 134557696, flags = 135272563, pgoff = 36864, inode = 20759 }
+vm_state.vm_map: 23329.164293506 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 134557696, end = 134565888, flags = 1048691, pgoff = 134557696, inode = 0 }
+vm_state.vm_map: 23329.164296065 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 153337856, end = 155193344, flags = 1048691, pgoff = 153337856, inode = 0 }
+vm_state.vm_map: 23329.164303494 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2990907392, end = 2990968832, flags = 134217841, pgoff = 0, inode = 649743 }
+vm_state.vm_map: 23329.164309709 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2990968832, end = 2990985216, flags = 134217845, pgoff = 0, inode = 57390 }
+vm_state.vm_map: 23329.164312144 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2990985216, end = 2990989312, flags = 135266419, pgoff = 12288, inode = 57390 }
+vm_state.vm_map: 23329.164315301 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2990989312, end = 2991054848, flags = 134217845, pgoff = 0, inode = 57391 }
+vm_state.vm_map: 23329.164317934 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2991054848, end = 2991058944, flags = 135266419, pgoff = 61440, inode = 57391 }
+vm_state.vm_map: 23329.164320067 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2991058944, end = 2991075328, flags = 1048691, pgoff = 2991058944, inode = 0 }
+vm_state.vm_map: 23329.164323002 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2991075328, end = 2991116288, flags = 134217845, pgoff = 0, inode = 57395 }
+vm_state.vm_map: 23329.164325006 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2991116288, end = 2991120384, flags = 135266419, pgoff = 36864, inode = 57395 }
+vm_state.vm_map: 23329.164328095 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2991120384, end = 2991403008, flags = 134217845, pgoff = 0, inode = 22693 }
+vm_state.vm_map: 23329.164330493 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2991403008, end = 2991415296, flags = 135266419, pgoff = 282624, inode = 22693 }
+vm_state.vm_map: 23329.164332491 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2991415296, end = 2991439872, flags = 1048691, pgoff = 2991415296, inode = 0 }
+vm_state.vm_map: 23329.164335950 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2991439872, end = 2991710208, flags = 134217845, pgoff = 0, inode = 18916 }
+vm_state.vm_map: 23329.164338330 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2991710208, end = 2991714304, flags = 135266419, pgoff = 266240, inode = 18916 }
+vm_state.vm_map: 23329.164341308 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2991714304, end = 2991796224, flags = 134217845, pgoff = 0, inode = 18915 }
+vm_state.vm_map: 23329.164343306 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2991796224, end = 2991804416, flags = 135266419, pgoff = 77824, inode = 18915 }
+vm_state.vm_map: 23329.164345920 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2991804416, end = 2992586752, flags = 134217845, pgoff = 0, inode = 18927 }
+vm_state.vm_map: 23329.164348108 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2992586752, end = 2992594944, flags = 135266419, pgoff = 778240, inode = 18927 }
+vm_state.vm_map: 23329.164350520 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2992607232, end = 2992627712, flags = 134217845, pgoff = 0, inode = 57392 }
+vm_state.vm_map: 23329.164352604 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2992627712, end = 2992631808, flags = 135266419, pgoff = 16384, inode = 57392 }
+vm_state.vm_map: 23329.164355181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2992631808, end = 2992648192, flags = 134217845, pgoff = 0, inode = 57389 }
+vm_state.vm_map: 23329.164357913 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2992648192, end = 2992652288, flags = 135266419, pgoff = 12288, inode = 57389 }
+vm_state.vm_map: 23329.164361076 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2992652288, end = 2992685056, flags = 134217845, pgoff = 0, inode = 57396 }
+vm_state.vm_map: 23329.164365761 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2992685056, end = 2992689152, flags = 135266419, pgoff = 28672, inode = 57396 }
+vm_state.vm_map: 23329.164368739 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2992689152, end = 2993053696, flags = 134217845, pgoff = 0, inode = 22572 }
+vm_state.vm_map: 23329.164370977 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2993053696, end = 2993061888, flags = 135266419, pgoff = 364544, inode = 22572 }
+vm_state.vm_map: 23329.164373603 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2993065984, end = 2993082368, flags = 134217845, pgoff = 0, inode = 57393 }
+vm_state.vm_map: 23329.164375607 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2993082368, end = 2993086464, flags = 135266419, pgoff = 12288, inode = 57393 }
+vm_state.vm_map: 23329.164378388 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2993086464, end = 2993111040, flags = 134217845, pgoff = 0, inode = 18917 }
+vm_state.vm_map: 23329.164380429 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2993111040, end = 2993115136, flags = 135266419, pgoff = 20480, inode = 18917 }
+vm_state.vm_map: 23329.164383395 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2993115136, end = 2993131520, flags = 134217845, pgoff = 0, inode = 18914 }
+vm_state.vm_map: 23329.164385503 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2993131520, end = 2993135616, flags = 135266419, pgoff = 16384, inode = 18914 }
+vm_state.vm_map: 23329.164388321 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2993135616, end = 2993152000, flags = 134217845, pgoff = 0, inode = 57394 }
+vm_state.vm_map: 23329.164390387 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2993152000, end = 2993156096, flags = 135266419, pgoff = 16384, inode = 57394 }
+vm_state.vm_map: 23329.164393414 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2993156096, end = 2993352704, flags = 134217845, pgoff = 0, inode = 20024 }
+vm_state.vm_map: 23329.164395880 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2993352704, end = 2993360896, flags = 135266419, pgoff = 192512, inode = 20024 }
+vm_state.vm_map: 23329.164398340 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2993360896, end = 2993369088, flags = 1048691, pgoff = 2993360896, inode = 0 }
+vm_state.vm_map: 23329.164400992 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2993369088, end = 2993819648, flags = 134217845, pgoff = 0, inode = 20711 }
+vm_state.vm_map: 23329.164402983 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2993819648, end = 2993831936, flags = 135266419, pgoff = 450560, inode = 20711 }
+vm_state.vm_map: 23329.164406516 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2993831936, end = 2993958912, flags = 134217845, pgoff = 0, inode = 18923 }
+vm_state.vm_map: 23329.164408890 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2993958912, end = 2993963008, flags = 135266419, pgoff = 122880, inode = 18923 }
+vm_state.vm_map: 23329.164411732 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2993979392, end = 2994008064, flags = 134217845, pgoff = 0, inode = 57397 }
+vm_state.vm_map: 23329.164414100 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2994008064, end = 2994012160, flags = 135266419, pgoff = 24576, inode = 57397 }
+vm_state.vm_map: 23329.164417257 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2994012160, end = 2994036736, flags = 134217845, pgoff = 0, inode = 57398 }
+vm_state.vm_map: 23329.164419409 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2994036736, end = 2994040832, flags = 135266419, pgoff = 24576, inode = 57398 }
+vm_state.vm_map: 23329.164421949 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2994040832, end = 2994053120, flags = 134217845, pgoff = 0, inode = 49489 }
+vm_state.vm_map: 23329.164424378 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2994053120, end = 2994057216, flags = 135266419, pgoff = 8192, inode = 49489 }
+vm_state.vm_map: 23329.164426654 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2994057216, end = 2994061312, flags = 1048688, pgoff = 2994057216, inode = 0 }
+vm_state.vm_map: 23329.164428953 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 2994061312, end = 3002449920, flags = 1048691, pgoff = 2994061312, inode = 0 }
+vm_state.vm_map: 23329.164431739 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3002449920, end = 3002490880, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.164433738 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3002490880, end = 3002494976, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.164435810 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3002494976, end = 3002499072, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.164438448 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3002499072, end = 3002535936, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.164440501 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3002535936, end = 3002540032, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.164442690 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3002540032, end = 3002544128, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.164445680 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3002544128, end = 3002621952, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.164447814 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3002621952, end = 3002626048, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.164449824 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3002626048, end = 3002630144, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.164451883 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3002630144, end = 3002638336, flags = 1048691, pgoff = 3002630144, inode = 0 }
+vm_state.vm_map: 23329.164454355 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3002638336, end = 3002662912, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.164456483 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3002662912, end = 3002667008, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.164458171 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3002667008, end = 3002671104, flags = 135266419, pgoff = 28672, inode = 508366 }
+kernel.irq_entry: 23329.164551044 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { ip = 3242331332, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_update_time: 23329.164594894 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { jiffies = 4297269587, xtime_sec = 1264196274, xtime_nsec = 637522006, walltomonotonic_sec = -1264172952, walltomonotonic_nsec = 189579727 }
+kernel.softirq_raise: 23329.164621987 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { softirq_id = 1 [softirq 1] }
+kernel.irq_exit: 23329.164677650 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.softirq_entry: 23329.164686264 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, SOFTIRQ { softirq_id = 1 [softirq 1] }
+kernel.timer_set: 23329.164710674 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, SOFTIRQ { expires = 2302292, function = 0xc141d458, data = 0 }
+kernel.timer_set: 23329.164722901 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, SOFTIRQ { expires = 2302292, function = 0xc14b0234, data = 0 }
+kernel.softirq_exit: 23329.164725736 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { softirq_id = 1 [softirq 1] }
+kernel.sched_schedule: 23329.164751663 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { prev_pid = 16927, next_pid = 1989, prev_state = 0 }
+fs.read: 23329.165263673 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 4096, fd = 48 }
+kernel.syscall_exit: 23329.165271392 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.165319823 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851408, syscall_id = 119 [syscall 119] }
+kernel.syscall_exit: 23329.165325570 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.165342988 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 146 [syscall 146] }
+kernel.sched_try_wakeup: 23329.165377115 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pid = 2336, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 23329.165395113 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { prev_pid = 1989, next_pid = 2336, prev_state = 0 }
+fs.pollfd: 23329.165656870 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 23329.165663665 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.165675201 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.165686756 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 23329.165688020 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 64 }
+kernel.syscall_entry: 23329.165713434 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.165715358 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 23329.165716554 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.165740532 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.165742789 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 23329.165745564 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.165749134 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 146 [syscall 146] }
+fs.writev: 23329.165755219 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8, vlen = 3 }
+kernel.syscall_exit: 23329.165756717 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 16 }
+kernel.syscall_entry: 23329.165762199 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.165763691 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 23329.165774967 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { prev_pid = 2336, next_pid = 1989, prev_state = 1 }
+fs.writev: 23329.165965308 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 48, vlen = 1 }
+kernel.syscall_exit: 23329.165968151 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 64 }
+kernel.syscall_entry: 23329.165981105 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7657e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.165986061 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.165992339 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 23329.165996623 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 23329.166007610 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.166030165 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 142 [syscall 142] }
+fs.select: 23329.166039882 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 1, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166044401 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 3, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166047663 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 5, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166060697 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 7, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166063964 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 13, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166068164 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 19, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166072109 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 20, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166075698 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 21, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166079588 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 22, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166082936 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 23, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166086007 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 24, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166089799 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 25, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166093505 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 26, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166097056 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 27, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166100805 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 28, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166104239 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 29, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166107871 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 30, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166111262 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 31, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166129802 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 32, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166133483 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 33, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166137189 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 34, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166140617 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 35, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166144520 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 37, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166147972 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 38, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166151431 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 39, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166154631 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 40, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166157911 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 41, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166161197 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 42, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166164410 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 43, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166167856 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 44, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166171032 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 45, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166174386 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 46, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166177592 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 48, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166180441 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 49, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166183881 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 50, end_time_sec = 23660, end_time_nsec = 559610913 }
+fs.select: 23329.166187260 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 52, end_time_sec = 23660, end_time_nsec = 559610913 }
+mm.page_free: 23329.166197921 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pfn = 197983, order = 0 }
+kernel.syscall_exit: 23329.166205479 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.166216375 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 23329.166218371 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 23329.166228970 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.166232935 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7657e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.166235401 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.166244471 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+kernel.sched_try_wakeup: 23329.166266742 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pid = 2336, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 23329.166282291 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { prev_pid = 1989, next_pid = 2336, prev_state = 0 }
+fs.pollfd: 23329.166563101 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 23329.166576721 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { prev_pid = 2336, next_pid = 1989, prev_state = 1 }
+fs.read: 23329.166752670 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 4096, fd = 48 }
+kernel.syscall_exit: 23329.166755975 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 16 }
+kernel.syscall_entry: 23329.166781390 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.166785355 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 4096, fd = 48 }
+kernel.syscall_exit: 23329.166786594 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.166793622 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 146 [syscall 146] }
+kernel.sched_try_wakeup: 23329.166815350 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pid = 2336, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 23329.166826042 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { prev_pid = 1989, next_pid = 2336, prev_state = 0 }
+fs.pollfd: 23329.167014409 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 23329.167019392 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.167032851 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.167041705 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 23329.167042981 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 32 }
+kernel.syscall_entry: 23329.167062872 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.167064851 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 23329.167066133 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.169420347 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.169477860 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 23329.169492196 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.169499996 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 146 [syscall 146] }
+fs.writev: 23329.169532693 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8, vlen = 3 }
+kernel.syscall_exit: 23329.169534357 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 7140 }
+kernel.syscall_entry: 23329.169543495 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.169545214 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 23329.169576771 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { prev_pid = 2336, next_pid = 1989, prev_state = 1 }
+fs.writev: 23329.170008318 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 48, vlen = 1 }
+kernel.syscall_exit: 23329.170011709 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 32 }
+kernel.syscall_entry: 23329.170030324 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7657e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.170035632 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.170042674 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 23329.170046571 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 23329.170058100 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.170080148 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 142 [syscall 142] }
+fs.select: 23329.170090106 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 1, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170094527 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 3, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170098004 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 5, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170112130 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 7, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170114880 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 13, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170120337 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 19, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170123671 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 20, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170126828 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 21, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170130177 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 22, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170133450 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 23, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170136508 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 24, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170139635 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 25, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170143100 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 26, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170146287 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 27, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170149543 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 28, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170152811 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 29, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170156387 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 30, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170159537 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 31, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170180557 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 32, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170184059 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 33, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170187641 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 34, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170191888 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 35, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170196186 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 37, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170200010 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 38, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170203363 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 39, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170206852 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 40, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170209850 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 41, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170213550 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 42, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170216409 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 43, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170219093 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 44, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170222538 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 45, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170225874 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 46, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170229018 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 48, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170231885 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 49, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170235801 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 50, end_time_sec = 23660, end_time_nsec = 559660743 }
+fs.select: 23329.170238988 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 52, end_time_sec = 23660, end_time_nsec = 559660743 }
+mm.page_free: 23329.170250000 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pfn = 197964, order = 0 }
+kernel.syscall_exit: 23329.170257726 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.170268954 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 23329.170270983 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 23329.170284640 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.170288234 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7657e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.170290718 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.170299837 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.170315578 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 4096, fd = 48 }
+kernel.syscall_exit: 23329.170316824 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 4096 }
+kernel.syscall_entry: 23329.170883961 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+kernel.sched_try_wakeup: 23329.170926517 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pid = 2336, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 23329.170950981 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { prev_pid = 1989, next_pid = 2336, prev_state = 0 }
+fs.pollfd: 23329.171382739 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 23329.171401311 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { prev_pid = 2336, next_pid = 1989, prev_state = 1 }
+fs.read: 23329.171617307 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 4092, fd = 48 }
+kernel.syscall_exit: 23329.171621591 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 3044 }
+kernel.syscall_entry: 23329.171756712 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.171763370 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 4096, fd = 48 }
+kernel.syscall_exit: 23329.171764648 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.171772872 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 146 [syscall 146] }
+kernel.sched_try_wakeup: 23329.171802079 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pid = 2336, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 23329.171817543 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { prev_pid = 1989, next_pid = 2336, prev_state = 0 }
+fs.pollfd: 23329.172059711 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 23329.172067492 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.172082592 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.172092618 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 23329.172094091 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 32 }
+kernel.syscall_entry: 23329.172115807 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.172117762 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 23329.172118976 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.172156340 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.172159953 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 23329.172162894 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.172166668 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 146 [syscall 146] }
+fs.writev: 23329.172174751 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8, vlen = 3 }
+kernel.syscall_exit: 23329.172176292 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 16 }
+kernel.syscall_entry: 23329.172183778 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.172185362 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 23329.172200325 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { prev_pid = 2336, next_pid = 1989, prev_state = 1 }
+fs.writev: 23329.172391850 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 48, vlen = 1 }
+kernel.syscall_exit: 23329.172394150 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 32 }
+kernel.syscall_entry: 23329.172408529 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7657e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.172413511 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.172419220 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 23329.172423832 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 23329.172435275 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.172455924 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 142 [syscall 142] }
+fs.select: 23329.172465129 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 1, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172469464 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 3, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172472978 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 5, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172485754 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 7, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172489447 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 13, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172493972 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 19, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172497881 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 20, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172500903 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 21, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172504244 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 22, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172507056 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 23, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172509812 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 24, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172513123 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 25, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172516877 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 26, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172520176 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 27, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172523339 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 28, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172527063 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 29, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172530535 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 30, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172534024 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 31, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172552133 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 32, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172555302 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 33, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172558589 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 34, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172562177 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 35, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172565310 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 37, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172568972 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 38, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172572437 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 39, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172576198 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 40, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172579625 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 41, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172583565 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 42, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172586796 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 43, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172589386 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 44, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172593141 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 45, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172596427 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 46, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172599399 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 48, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172602593 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 49, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172606076 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 50, end_time_sec = 23660, end_time_nsec = 560036420 }
+fs.select: 23329.172608863 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 52, end_time_sec = 23660, end_time_nsec = 560036420 }
+mm.page_free: 23329.172619598 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pfn = 197949, order = 0 }
+kernel.syscall_exit: 23329.172627324 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.172637818 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 23329.172639697 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 23329.172652011 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.172655574 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7657e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.172658022 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.172666537 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+kernel.sched_try_wakeup: 23329.172690127 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pid = 2336, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 23329.172706300 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { prev_pid = 1989, next_pid = 2336, prev_state = 0 }
+fs.pollfd: 23329.172966207 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.sched_schedule: 23329.172980302 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { prev_pid = 2336, next_pid = 1989, prev_state = 1 }
+fs.read: 23329.173200910 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 4096, fd = 48 }
+kernel.syscall_exit: 23329.173204708 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 16 }
+kernel.syscall_entry: 23329.173230216 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.173235782 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 4096, fd = 48 }
+kernel.syscall_exit: 23329.173237016 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.173244599 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 146 [syscall 146] }
+kernel.sched_try_wakeup: 23329.173269564 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pid = 2336, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 23329.173280638 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { prev_pid = 1989, next_pid = 2336, prev_state = 0 }
+fs.pollfd: 23329.173453986 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 23329.173461318 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.173476090 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.173484222 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 23329.173485751 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 32 }
+kernel.syscall_entry: 23329.173507023 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.173508910 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 23329.173510229 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.irq_entry: 23329.175747217 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, IRQ { ip = 3058876320, handler = 0x0, irq_id = 239, kernel_mode = 0 }
+kernel.timer_update_time: 23329.175771849 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, IRQ { jiffies = 4297269588, xtime_sec = 1264196274, xtime_nsec = 637522007, walltomonotonic_sec = -1264172952, walltomonotonic_nsec = 189579727 }
+kernel.softirq_raise: 23329.175787602 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, IRQ { softirq_id = 1 [softirq 1] }
+kernel.irq_exit: 23329.175822149 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.softirq_entry: 23329.175827044 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SOFTIRQ { softirq_id = 1 [softirq 1] }
+kernel.timer_set: 23329.175841699 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SOFTIRQ { expires = 2302293, function = 0xc141d458, data = 0 }
+kernel.softirq_exit: 23329.175846577 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { softirq_id = 1 [softirq 1] }
+kernel.sched_schedule: 23329.175859932 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { prev_pid = 2336, next_pid = 16927, prev_state = 0 }
+vm_state.vm_map: 23329.176081415 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3002671104, end = 3018911744, flags = 134217979, pgoff = 0, inode = 1204696 }
+vm_state.vm_map: 23329.176085121 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3018911744, end = 3023208448, flags = 134217979, pgoff = 0, inode = 1204694 }
+vm_state.vm_map: 23329.176090454 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023208448, end = 3023409152, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 23329.176092569 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023409152, end = 3023413248, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 23329.176095559 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023413248, end = 3023437824, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 23329.176097569 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023437824, end = 3023441920, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 23329.176100375 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023441920, end = 3023462400, flags = 134217845, pgoff = 0, inode = 52570 }
+vm_state.vm_map: 23329.176102582 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023462400, end = 3023466496, flags = 135266419, pgoff = 16384, inode = 52570 }
+vm_state.vm_map: 23329.176104987 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023466496, end = 3023503360, flags = 134217845, pgoff = 0, inode = 52569 }
+vm_state.vm_map: 23329.176107052 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023503360, end = 3023507456, flags = 135266419, pgoff = 32768, inode = 52569 }
+vm_state.vm_map: 23329.176109636 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023507456, end = 3023532032, flags = 134217845, pgoff = 0, inode = 52572 }
+vm_state.vm_map: 23329.176111689 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023532032, end = 3023536128, flags = 135266419, pgoff = 20480, inode = 52572 }
+vm_state.vm_map: 23329.176114143 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023536128, end = 3023540224, flags = 134217937, pgoff = 0, inode = 1196150 }
+vm_state.vm_map: 23329.176116553 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023540224, end = 3023564800, flags = 134217937, pgoff = 0, inode = 1196354 }
+vm_state.vm_map: 23329.176119408 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023564800, end = 3023568896, flags = 134217937, pgoff = 0, inode = 1196334 }
+vm_state.vm_map: 23329.176121745 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023568896, end = 3023572992, flags = 134217937, pgoff = 0, inode = 1196333 }
+vm_state.vm_map: 23329.176124181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023572992, end = 3023577088, flags = 134217937, pgoff = 0, inode = 1196331 }
+vm_state.vm_map: 23329.176126547 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023577088, end = 3023581184, flags = 134217937, pgoff = 0, inode = 1196330 }
+vm_state.vm_map: 23329.176128811 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023581184, end = 3023589376, flags = 134217937, pgoff = 0, inode = 1196329 }
+vm_state.vm_map: 23329.176134828 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023589376, end = 3023622144, flags = 134217937, pgoff = 0, inode = 1196328 }
+vm_state.vm_map: 23329.176137202 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023622144, end = 3023634432, flags = 134217937, pgoff = 0, inode = 1196327 }
+vm_state.vm_map: 23329.176139785 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023634432, end = 3023642624, flags = 134217937, pgoff = 0, inode = 1196320 }
+vm_state.vm_map: 23329.176142461 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023642624, end = 3023646720, flags = 134217937, pgoff = 0, inode = 1196318 }
+vm_state.vm_map: 23329.176144656 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023646720, end = 3023650816, flags = 134217937, pgoff = 0, inode = 1196278 }
+vm_state.vm_map: 23329.176147153 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023650816, end = 3023654912, flags = 134217937, pgoff = 0, inode = 1196251 }
+vm_state.vm_map: 23329.176149583 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023654912, end = 3023683584, flags = 134217937, pgoff = 0, inode = 1196236 }
+vm_state.vm_map: 23329.176151802 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023683584, end = 3023695872, flags = 134217937, pgoff = 0, inode = 1196234 }
+vm_state.vm_map: 23329.176154312 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023695872, end = 3023699968, flags = 134217937, pgoff = 0, inode = 1196201 }
+vm_state.vm_map: 23329.176156556 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023699968, end = 3023708160, flags = 134217937, pgoff = 0, inode = 1196170 }
+vm_state.vm_map: 23329.176159355 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023708160, end = 3023712256, flags = 134217937, pgoff = 0, inode = 1196157 }
+vm_state.vm_map: 23329.176161649 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023712256, end = 3023716352, flags = 134217937, pgoff = 0, inode = 1196171 }
+vm_state.vm_map: 23329.176164047 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023716352, end = 3023728640, flags = 134217937, pgoff = 0, inode = 1196172 }
+vm_state.vm_map: 23329.176166230 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023728640, end = 3023736832, flags = 134217937, pgoff = 0, inode = 1196173 }
+vm_state.vm_map: 23329.176168511 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023736832, end = 3023769600, flags = 134217937, pgoff = 0, inode = 1196352 }
+vm_state.vm_map: 23329.176170959 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023769600, end = 3023790080, flags = 134217937, pgoff = 0, inode = 1196196 }
+vm_state.vm_map: 23329.176173167 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023790080, end = 3023798272, flags = 134217937, pgoff = 0, inode = 1196343 }
+vm_state.vm_map: 23329.176175522 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023798272, end = 3023826944, flags = 134217937, pgoff = 0, inode = 1196314 }
+vm_state.vm_map: 23329.176178105 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023826944, end = 3023872000, flags = 134217937, pgoff = 0, inode = 1196147 }
+vm_state.vm_map: 23329.176180405 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023872000, end = 3023929344, flags = 134217937, pgoff = 0, inode = 1196094 }
+vm_state.vm_map: 23329.176182477 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3023929344, end = 3024166912, flags = 1048691, pgoff = 3024166912, inode = 0 }
+vm_state.vm_map: 23329.176185184 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3024166912, end = 3024183296, flags = 134217845, pgoff = 0, inode = 52571 }
+vm_state.vm_map: 23329.176187181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3024183296, end = 3024187392, flags = 135266419, pgoff = 12288, inode = 52571 }
+vm_state.vm_map: 23329.176189869 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3024187392, end = 3024412672, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.176191966 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3024412672, end = 3024416768, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.176194061 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3024416768, end = 3024420864, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.176202718 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3024420864, end = 3024556032, flags = 134217845, pgoff = 0, inode = 17864 }
+vm_state.vm_map: 23329.176204882 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3024556032, end = 3024560128, flags = 135266419, pgoff = 135168, inode = 17864 }
+vm_state.vm_map: 23329.176207510 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3024560128, end = 3024592896, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 23329.176209520 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3024592896, end = 3024596992, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 23329.176217602 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3024596992, end = 3024691200, flags = 134217845, pgoff = 0, inode = 1065551 }
+vm_state.vm_map: 23329.176219643 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3024691200, end = 3024699392, flags = 135266419, pgoff = 90112, inode = 1065551 }
+vm_state.vm_map: 23329.176224458 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3024699392, end = 3024834560, flags = 134217845, pgoff = 0, inode = 1066191 }
+vm_state.vm_map: 23329.176226505 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3024834560, end = 3024838656, flags = 135266419, pgoff = 135168, inode = 1066191 }
+vm_state.vm_map: 23329.176231531 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3024838656, end = 3024871424, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 23329.176233559 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3024871424, end = 3024875520, flags = 135266419, pgoff = 32768, inode = 20716 }
+vm_state.vm_map: 23329.176236439 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3024875520, end = 3025395712, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 23329.176238393 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3025395712, end = 3025403904, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 23329.176240835 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3025403904, end = 3025768448, flags = 134217845, pgoff = 0, inode = 23376 }
+vm_state.vm_map: 23329.176243030 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3025768448, end = 3025805312, flags = 135266423, pgoff = 364544, inode = 23376 }
+vm_state.vm_map: 23329.176245071 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3025805312, end = 3025809408, flags = 1048695, pgoff = 3025805312, inode = 0 }
+vm_state.vm_map: 23329.176247611 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3025809408, end = 3026362368, flags = 134217845, pgoff = 0, inode = 18947 }
+vm_state.vm_map: 23329.176249652 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3026362368, end = 3026382848, flags = 135266419, pgoff = 548864, inode = 18947 }
+vm_state.vm_map: 23329.176251822 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3026382848, end = 3026698240, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 23329.176254048 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3026698240, end = 3026706432, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 23329.176256305 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3026706432, end = 3026776064, flags = 134217845, pgoff = 0, inode = 1065123 }
+vm_state.vm_map: 23329.176258345 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3026776064, end = 3026780160, flags = 135266419, pgoff = 69632, inode = 1065123 }
+vm_state.vm_map: 23329.176260510 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3026780160, end = 3041275904, flags = 134217845, pgoff = 0, inode = 20672 }
+vm_state.vm_map: 23329.176262593 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3041275904, end = 3041890304, flags = 135266419, pgoff = 14495744, inode = 20672 }
+vm_state.vm_map: 23329.176264628 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3041890304, end = 3041898496, flags = 1048691, pgoff = 3041890304, inode = 0 }
+vm_state.vm_map: 23329.176266762 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3041898496, end = 3042271232, flags = 134217845, pgoff = 0, inode = 20902 }
+vm_state.vm_map: 23329.176268691 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3042271232, end = 3042283520, flags = 135266419, pgoff = 368640, inode = 20902 }
+vm_state.vm_map: 23329.176271657 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3042283520, end = 3042304000, flags = 134217845, pgoff = 0, inode = 52568 }
+vm_state.vm_map: 23329.176273586 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3042304000, end = 3042308096, flags = 135266419, pgoff = 16384, inode = 52568 }
+vm_state.vm_map: 23329.176275949 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3042308096, end = 3042320384, flags = 134217937, pgoff = 0, inode = 1196342 }
+vm_state.vm_map: 23329.176278587 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3042320384, end = 3042377728, flags = 134217937, pgoff = 0, inode = 1196355 }
+vm_state.vm_map: 23329.176280923 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3042377728, end = 3044360192, flags = 134217845, pgoff = 0, inode = 20915 }
+vm_state.vm_map: 23329.176283020 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3044360192, end = 3044401152, flags = 135266419, pgoff = 1978368, inode = 20915 }
+vm_state.vm_map: 23329.176285486 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3044401152, end = 3045732352, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.176287478 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3045732352, end = 3045748736, flags = 1048691, pgoff = 3045732352, inode = 0 }
+vm_state.vm_map: 23329.176289932 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3045748736, end = 3045896192, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.176291917 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3045896192, end = 3045904384, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.176294402 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3045904384, end = 3046223872, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 23329.176296480 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3046223872, end = 3046240256, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 23329.176299143 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3046240256, end = 3046252544, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 23329.176301135 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3046252544, end = 3046256640, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 23329.176303613 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3046256640, end = 3047514112, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 23329.176305593 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3047514112, end = 3047534592, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 23329.176308047 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3047534592, end = 3047542784, flags = 1048691, pgoff = 3047534592, inode = 0 }
+vm_state.vm_map: 23329.176310519 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3047542784, end = 3047780352, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 23329.176312461 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3047780352, end = 3047784448, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 23329.176314810 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3047784448, end = 3047800832, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.176316870 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3047800832, end = 3047804928, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.176319108 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3047804928, end = 3047813120, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.176321272 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3047813120, end = 3047817216, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.176323917 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3047817216, end = 3048009728, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.176325977 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3048009728, end = 3048013824, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.176328677 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3048013824, end = 3048067072, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 23329.176330706 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3048067072, end = 3048071168, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 23329.176332734 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3048071168, end = 3048075264, flags = 1048691, pgoff = 3048071168, inode = 0 }
+vm_state.vm_map: 23329.176335275 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3048075264, end = 3048259584, flags = 134217845, pgoff = 0, inode = 22064 }
+vm_state.vm_map: 23329.176337327 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3048259584, end = 3048267776, flags = 135266419, pgoff = 180224, inode = 22064 }
+vm_state.vm_map: 23329.176340219 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3048267776, end = 3048509440, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.176342538 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3048509440, end = 3048513536, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.176345385 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3048513536, end = 3048984576, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 23329.176347667 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3048984576, end = 3049000960, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 23329.176352649 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049000960, end = 3049144320, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 23329.176354683 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049144320, end = 3049148416, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 23329.176357040 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049148416, end = 3049234432, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 23329.176359036 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049234432, end = 3049238528, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 23329.176361096 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049238528, end = 3049242624, flags = 1048691, pgoff = 3049238528, inode = 0 }
+vm_state.vm_map: 23329.176363341 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049242624, end = 3049259008, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 23329.176365480 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049259008, end = 3049263104, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 23329.176368168 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049263104, end = 3049295872, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 23329.176370196 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049295872, end = 3049299968, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 23329.176372472 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049299968, end = 3049316352, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 23329.176374771 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049316352, end = 3049320448, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 23329.176377188 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049320448, end = 3049406464, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 23329.176379242 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049406464, end = 3049410560, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 23329.176382029 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049410560, end = 3049418752, flags = 1048691, pgoff = 3049410560, inode = 0 }
+vm_state.vm_map: 23329.176384507 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049418752, end = 3049447424, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 23329.176386443 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049447424, end = 3049451520, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 23329.176388743 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049451520, end = 3049455616, flags = 1048691, pgoff = 3049451520, inode = 0 }
+vm_state.vm_map: 23329.176391179 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049455616, end = 3049787392, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 23329.176393281 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049787392, end = 3049795584, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 23329.176396549 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049795584, end = 3049828352, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 23329.176398750 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049828352, end = 3049832448, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 23329.176401284 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049832448, end = 3049848832, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 23329.176403270 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049848832, end = 3049852928, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 23329.176405576 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049852928, end = 3049877504, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 23329.176407900 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049877504, end = 3049881600, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 23329.176410217 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049881600, end = 3049914368, flags = 134217845, pgoff = 0, inode = 21180 }
+vm_state.vm_map: 23329.176412185 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049914368, end = 3049918464, flags = 135266419, pgoff = 28672, inode = 21180 }
+vm_state.vm_map: 23329.176414121 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049918464, end = 3049922560, flags = 1048691, pgoff = 3049918464, inode = 0 }
+vm_state.vm_map: 23329.176416594 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3049922560, end = 3050352640, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 23329.176418868 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3050352640, end = 3050381312, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 23329.176420799 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3050381312, end = 3050385408, flags = 1048691, pgoff = 3050381312, inode = 0 }
+vm_state.vm_map: 23329.176423091 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3050385408, end = 3050827776, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 23329.176425169 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3050827776, end = 3050835968, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 23329.176427543 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3050835968, end = 3050934272, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.176429479 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3050934272, end = 3050938368, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.176431724 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3050938368, end = 3051208704, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 23329.176433778 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3051208704, end = 3051216896, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 23329.176436317 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3051216896, end = 3051278336, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 23329.176438302 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3051278336, end = 3051282432, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 23329.176440399 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3051282432, end = 3051286528, flags = 1048691, pgoff = 3051282432, inode = 0 }
+vm_state.vm_map: 23329.176442951 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3051286528, end = 3051753472, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 23329.176444875 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3051753472, end = 3051761664, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 23329.176447243 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3051761664, end = 3052892160, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 23329.176449173 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3052892160, end = 3052908544, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 23329.176451633 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3052908544, end = 3053023232, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.176454056 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3053023232, end = 3053027328, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.176456454 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3053027328, end = 3053174784, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.176458384 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3053174784, end = 3053178880, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.176460511 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3053178880, end = 3053182976, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.176463076 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3053182976, end = 3053191168, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.176465006 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3053191168, end = 3053195264, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.176466930 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3053195264, end = 3053199360, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.176469156 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3053199360, end = 3053203456, flags = 1048691, pgoff = 3053199360, inode = 0 }
+vm_state.vm_map: 23329.176471678 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3053203456, end = 3053289472, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.176473657 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3053289472, end = 3053293568, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.176475698 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3053293568, end = 3053297664, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.176477800 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3053297664, end = 3053305856, flags = 1048691, pgoff = 3053297664, inode = 0 }
+vm_state.vm_map: 23329.176480180 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3053305856, end = 3054043136, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.176482239 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3054043136, end = 3054047232, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.176484613 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3054047232, end = 3054075904, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.176486790 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3054075904, end = 3054080000, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.176489053 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3054080000, end = 3054084096, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.176491303 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3054084096, end = 3054100480, flags = 134217845, pgoff = 0, inode = 19625 }
+vm_state.vm_map: 23329.176493412 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3054100480, end = 3054104576, flags = 135266419, pgoff = 12288, inode = 19625 }
+vm_state.vm_map: 23329.176496014 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3054104576, end = 3054182400, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.176498178 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3054182400, end = 3054186496, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.176500533 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3054186496, end = 3055501312, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.176502549 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3055501312, end = 3055509504, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.176504811 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3055509504, end = 3055513600, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.176506926 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3055513600, end = 3055529984, flags = 1048691, pgoff = 3055513600, inode = 0 }
+vm_state.vm_map: 23329.176509349 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3055529984, end = 3056467968, flags = 134217845, pgoff = 0, inode = 16400 }
+vm_state.vm_map: 23329.176511594 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3056467968, end = 3056484352, flags = 135266417, pgoff = 937984, inode = 16400 }
+vm_state.vm_map: 23329.176513598 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3056484352, end = 3056488448, flags = 135266419, pgoff = 954368, inode = 16400 }
+vm_state.vm_map: 23329.176515694 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3056488448, end = 3056517120, flags = 1048691, pgoff = 3056488448, inode = 0 }
+vm_state.vm_map: 23329.176518043 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3056517120, end = 3066556416, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 23329.176520257 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3066556416, end = 3066716160, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 23329.176522291 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3066716160, end = 3066724352, flags = 1048691, pgoff = 3066716160, inode = 0 }
+vm_state.vm_map: 23329.176525146 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3066724352, end = 3070320640, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 23329.176527384 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3070320640, end = 3070418944, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 23329.176529431 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3070418944, end = 3070423040, flags = 1048691, pgoff = 3070418944, inode = 0 }
+vm_state.vm_map: 23329.176531854 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3070423040, end = 3072978944, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 23329.176533920 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3072978944, end = 3073028096, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 23329.176535930 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3073028096, end = 3073032192, flags = 1048691, pgoff = 3073028096, inode = 0 }
+vm_state.vm_map: 23329.176538347 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3073032192, end = 3074183168, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.176540271 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3074183168, end = 3074199552, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.176542577 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3074199552, end = 3074433024, flags = 134217845, pgoff = 0, inode = 1065180 }
+vm_state.vm_map: 23329.176544507 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3074433024, end = 3074441216, flags = 135266419, pgoff = 233472, inode = 1065180 }
+vm_state.vm_map: 23329.176546578 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3074441216, end = 3074445312, flags = 1048691, pgoff = 3074441216, inode = 0 }
+vm_state.vm_map: 23329.176548921 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3074445312, end = 3076747264, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 23329.176550851 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3076747264, end = 3076792320, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 23329.176553225 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3076792320, end = 3079102464, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 23329.176555278 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3079102464, end = 3079131136, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 23329.176557368 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3079131136, end = 3079135232, flags = 1048691, pgoff = 3079131136, inode = 0 }
+vm_state.vm_map: 23329.176560074 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3079139328, end = 3079147520, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 23329.176562005 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3079147520, end = 3079151616, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 23329.176564490 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3079151616, end = 3079159808, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 23329.176566549 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3079159808, end = 3079163904, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 23329.176568928 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3079163904, end = 3079180288, flags = 134217845, pgoff = 0, inode = 22094 }
+vm_state.vm_map: 23329.176570914 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3079180288, end = 3079184384, flags = 135266419, pgoff = 12288, inode = 22094 }
+vm_state.vm_map: 23329.176573491 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3079184384, end = 3079192576, flags = 134217845, pgoff = 0, inode = 1450327 }
+vm_state.vm_map: 23329.176575533 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3079192576, end = 3079196672, flags = 135266417, pgoff = 4096, inode = 1450327 }
+vm_state.vm_map: 23329.176577523 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3079196672, end = 3079200768, flags = 135266419, pgoff = 8192, inode = 1450327 }
+vm_state.vm_map: 23329.176579817 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3079200768, end = 3079229440, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.176581876 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3079229440, end = 3079237632, flags = 1048691, pgoff = 3079229440, inode = 0 }
+vm_state.vm_map: 23329.176583973 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3079237632, end = 3079241728, flags = 67371125, pgoff = 3079237632, inode = 0 }
+vm_state.vm_map: 23329.176586445 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3079241728, end = 3079356416, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.176588498 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3079356416, end = 3079360512, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.176590644 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3079360512, end = 3079364608, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.176592827 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2244, start = 3215650816, end = 3215736832, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.176596649 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 134512640, end = 134553600, flags = 134223989, pgoff = 0, inode = 20759 }
+vm_state.vm_map: 23329.176598832 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 134553600, end = 134557696, flags = 135272563, pgoff = 36864, inode = 20759 }
+vm_state.vm_map: 23329.176600978 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 134557696, end = 134565888, flags = 1048691, pgoff = 134557696, inode = 0 }
+vm_state.vm_map: 23329.176602914 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 153337856, end = 156786688, flags = 1048691, pgoff = 153337856, inode = 0 }
+vm_state.vm_map: 23329.176608148 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2832605184, end = 2832642048, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.176610195 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2832642048, end = 2832646144, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.176612360 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2832646144, end = 2832650240, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.176614838 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2832650240, end = 2832728064, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.176617033 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2832728064, end = 2832732160, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.176619087 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2832732160, end = 2832736256, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.176621047 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2832736256, end = 2832744448, flags = 1048691, pgoff = 2832736256, inode = 0 }
+vm_state.vm_map: 23329.176623563 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2832744448, end = 2832769024, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.176625499 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2832769024, end = 2832773120, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.176627589 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2832773120, end = 2832777216, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.176635975 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2832777216, end = 2832986112, flags = 134217845, pgoff = 0, inode = 23907 }
+vm_state.vm_map: 23329.176638008 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2832986112, end = 2832990208, flags = 135266419, pgoff = 208896, inode = 23907 }
+vm_state.vm_map: 23329.176640629 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2833084416, end = 2833108992, flags = 134217845, pgoff = 0, inode = 58065 }
+vm_state.vm_map: 23329.176642799 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2833108992, end = 2833113088, flags = 135266419, pgoff = 20480, inode = 58065 }
+vm_state.vm_map: 23329.176649884 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2833113088, end = 2834235392, flags = 134217845, pgoff = 0, inode = 20685 }
+vm_state.vm_map: 23329.176651924 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2834235392, end = 2834251776, flags = 135266419, pgoff = 1122304, inode = 20685 }
+vm_state.vm_map: 23329.176658916 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2834259968, end = 2834284544, flags = 134217845, pgoff = 0, inode = 58067 }
+vm_state.vm_map: 23329.176661062 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2834284544, end = 2834288640, flags = 135266419, pgoff = 20480, inode = 58067 }
+vm_state.vm_map: 23329.176663541 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2834288640, end = 2834341888, flags = 134217845, pgoff = 0, inode = 59006 }
+vm_state.vm_map: 23329.176665464 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2834341888, end = 2834345984, flags = 135266419, pgoff = 53248, inode = 59006 }
+vm_state.vm_map: 23329.176667875 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2834345984, end = 2834370560, flags = 134217845, pgoff = 0, inode = 59000 }
+vm_state.vm_map: 23329.176670348 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2834370560, end = 2834374656, flags = 135266419, pgoff = 20480, inode = 59000 }
+vm_state.vm_map: 23329.176672962 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2834374656, end = 2834395136, flags = 134217845, pgoff = 0, inode = 58063 }
+vm_state.vm_map: 23329.176675003 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2834395136, end = 2834399232, flags = 135266419, pgoff = 16384, inode = 58063 }
+vm_state.vm_map: 23329.176677451 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2834399232, end = 2834436096, flags = 134217845, pgoff = 0, inode = 58986 }
+vm_state.vm_map: 23329.176679559 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2834436096, end = 2834440192, flags = 135266419, pgoff = 32768, inode = 58986 }
+vm_state.vm_map: 23329.176689055 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2834440192, end = 2834493440, flags = 134217845, pgoff = 0, inode = 1065850 }
+vm_state.vm_map: 23329.176691108 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2834493440, end = 2834497536, flags = 135266419, pgoff = 49152, inode = 1065850 }
+vm_state.vm_map: 23329.176693580 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2834497536, end = 2834509824, flags = 134217845, pgoff = 0, inode = 20765 }
+vm_state.vm_map: 23329.176695621 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2834509824, end = 2834513920, flags = 135266419, pgoff = 8192, inode = 20765 }
+vm_state.vm_map: 23329.176698087 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2834513920, end = 2834976768, flags = 134217845, pgoff = 0, inode = 20061 }
+vm_state.vm_map: 23329.176698089 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2834976768, end = 2834989056, flags = 135266419, pgoff = 458752, inode = 20061 }
+vm_state.vm_map: 23329.176698091 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2834989056, end = 2835050496, flags = 134217845, pgoff = 0, inode = 19423 }
+vm_state.vm_map: 23329.176698093 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2835050496, end = 2835054592, flags = 135266419, pgoff = 57344, inode = 19423 }
+vm_state.vm_map: 23329.176698096 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2835054592, end = 2835660800, flags = 134217845, pgoff = 0, inode = 22471 }
+vm_state.vm_map: 23329.176698098 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2835660800, end = 2835677184, flags = 135266419, pgoff = 602112, inode = 22471 }
+vm_state.vm_map: 23329.176698100 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2835677184, end = 2835746816, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 23329.176698102 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2835746816, end = 2835750912, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 23329.176698104 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2835750912, end = 2835755008, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 23329.176698106 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2835755008, end = 2835763200, flags = 1048691, pgoff = 2835755008, inode = 0 }
+vm_state.vm_map: 23329.176698108 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2835763200, end = 2835853312, flags = 134217845, pgoff = 0, inode = 18560 }
+vm_state.vm_map: 23329.176698110 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2835853312, end = 2835857408, flags = 135266419, pgoff = 86016, inode = 18560 }
+vm_state.vm_map: 23329.176698112 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2835857408, end = 2835906560, flags = 134217845, pgoff = 0, inode = 19447 }
+vm_state.vm_map: 23329.176698114 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2835906560, end = 2835910656, flags = 135266419, pgoff = 49152, inode = 19447 }
+vm_state.vm_map: 23329.176698116 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2835910656, end = 2836176896, flags = 134217845, pgoff = 0, inode = 19433 }
+vm_state.vm_map: 23329.176698118 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2836176896, end = 2836185088, flags = 135266419, pgoff = 262144, inode = 19433 }
+vm_state.vm_map: 23329.176698120 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2836185088, end = 2836189184, flags = 1048691, pgoff = 2836185088, inode = 0 }
+vm_state.vm_map: 23329.176698122 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2836189184, end = 2836410368, flags = 134217845, pgoff = 0, inode = 1065907 }
+vm_state.vm_map: 23329.176698125 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2836410368, end = 2836414464, flags = 135266419, pgoff = 221184, inode = 1065907 }
+vm_state.vm_map: 23329.176698127 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2836414464, end = 2836553728, flags = 134217845, pgoff = 0, inode = 23998 }
+vm_state.vm_map: 23329.176698129 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2836553728, end = 2836557824, flags = 135266419, pgoff = 139264, inode = 23998 }
+vm_state.vm_map: 23329.176698131 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2836557824, end = 2837118976, flags = 134217845, pgoff = 0, inode = 23997 }
+vm_state.vm_map: 23329.176698133 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2837118976, end = 2837131264, flags = 135266419, pgoff = 557056, inode = 23997 }
+vm_state.vm_map: 23329.176698135 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2837131264, end = 2837700608, flags = 134217845, pgoff = 0, inode = 20907 }
+vm_state.vm_map: 23329.176698137 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2837700608, end = 2837716992, flags = 135266419, pgoff = 565248, inode = 20907 }
+vm_state.vm_map: 23329.176713325 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2837721088, end = 2837745664, flags = 134217845, pgoff = 0, inode = 59017 }
+vm_state.vm_map: 23329.176733132 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2837745664, end = 2837749760, flags = 135266419, pgoff = 20480, inode = 59017 }
+vm_state.vm_map: 23329.176738745 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2837749760, end = 2837774336, flags = 134217845, pgoff = 0, inode = 58066 }
+vm_state.vm_map: 23329.176740856 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2837774336, end = 2837778432, flags = 135266419, pgoff = 20480, inode = 58066 }
+vm_state.vm_map: 23329.176745852 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2837778432, end = 2837807104, flags = 134217845, pgoff = 0, inode = 58988 }
+vm_state.vm_map: 23329.176747994 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2837807104, end = 2837811200, flags = 135266419, pgoff = 28672, inode = 58988 }
+vm_state.vm_map: 23329.176750544 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2837811200, end = 2838097920, flags = 134217845, pgoff = 0, inode = 20877 }
+vm_state.vm_map: 23329.176752600 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2838097920, end = 2838106112, flags = 135266419, pgoff = 282624, inode = 20877 }
+vm_state.vm_map: 23329.176760121 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2838106112, end = 2838134784, flags = 134217845, pgoff = 0, inode = 23874 }
+vm_state.vm_map: 23329.176762276 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2838134784, end = 2838138880, flags = 135266419, pgoff = 24576, inode = 23874 }
+vm_state.vm_map: 23329.176769537 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2838138880, end = 2838212608, flags = 134217845, pgoff = 0, inode = 24212 }
+vm_state.vm_map: 23329.176771680 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2838212608, end = 2838216704, flags = 135266419, pgoff = 69632, inode = 24212 }
+vm_state.vm_map: 23329.176776724 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2838216704, end = 2839150592, flags = 134217845, pgoff = 0, inode = 20876 }
+vm_state.vm_map: 23329.176778867 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2839150592, end = 2839162880, flags = 135266419, pgoff = 933888, inode = 20876 }
+vm_state.vm_map: 23329.176784225 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2839162880, end = 2839576576, flags = 134217845, pgoff = 0, inode = 1065120 }
+vm_state.vm_map: 23329.176786270 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2839576576, end = 2839584768, flags = 135266419, pgoff = 409600, inode = 1065120 }
+vm_state.vm_map: 23329.176793371 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2839597056, end = 2839621632, flags = 134217845, pgoff = 0, inode = 58064 }
+vm_state.vm_map: 23329.176795420 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2839621632, end = 2839625728, flags = 135266419, pgoff = 20480, inode = 58064 }
+vm_state.vm_map: 23329.176800180 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2839625728, end = 2839650304, flags = 134217845, pgoff = 0, inode = 59003 }
+vm_state.vm_map: 23329.176802212 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2839650304, end = 2839654400, flags = 135266419, pgoff = 20480, inode = 59003 }
+vm_state.vm_map: 23329.176807022 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2839654400, end = 2839674880, flags = 134217845, pgoff = 0, inode = 59019 }
+vm_state.vm_map: 23329.176809097 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2839674880, end = 2839678976, flags = 135266419, pgoff = 16384, inode = 59019 }
+vm_state.vm_map: 23329.176811603 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2839678976, end = 2839707648, flags = 134217845, pgoff = 0, inode = 59007 }
+vm_state.vm_map: 23329.176813585 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2839707648, end = 2839711744, flags = 135266419, pgoff = 24576, inode = 59007 }
+vm_state.vm_map: 23329.176818661 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2839711744, end = 2839736320, flags = 134217845, pgoff = 0, inode = 58068 }
+vm_state.vm_map: 23329.176821057 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2839736320, end = 2839740416, flags = 135266419, pgoff = 20480, inode = 58068 }
+vm_state.vm_map: 23329.176823749 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2839740416, end = 2841776128, flags = 134217937, pgoff = 0, inode = 41242 }
+vm_state.vm_map: 23329.176826392 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2841776128, end = 2841817088, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.176828565 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2841817088, end = 2841821184, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.176830658 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2841821184, end = 2841825280, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.176833381 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2841837568, end = 2841919488, flags = 134217841, pgoff = 0, inode = 98443 }
+vm_state.vm_map: 23329.176835894 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2841919488, end = 2968260608, flags = 134217979, pgoff = 0, inode = 73879 }
+vm_state.vm_map: 23329.176838370 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 2968260608, end = 3001917440, flags = 134217979, pgoff = 0, inode = 73878 }
+vm_state.vm_map: 23329.176840809 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3001917440, end = 3018158080, flags = 134217979, pgoff = 0, inode = 1204696 }
+vm_state.vm_map: 23329.176843242 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3018158080, end = 3022454784, flags = 134217979, pgoff = 0, inode = 1204694 }
+vm_state.vm_map: 23329.176845576 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022454784, end = 3022655488, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 23329.176847632 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022655488, end = 3022659584, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 23329.176849861 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022659584, end = 3022684160, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 23329.176851911 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022684160, end = 3022688256, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 23329.176857061 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022688256, end = 3022708736, flags = 134217845, pgoff = 0, inode = 58972 }
+vm_state.vm_map: 23329.176859443 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022708736, end = 3022712832, flags = 135266419, pgoff = 16384, inode = 58972 }
+vm_state.vm_map: 23329.176864303 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022712832, end = 3022737408, flags = 134217845, pgoff = 0, inode = 58999 }
+vm_state.vm_map: 23329.176866471 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022737408, end = 3022741504, flags = 135266419, pgoff = 20480, inode = 58999 }
+vm_state.vm_map: 23329.176871329 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022741504, end = 3022761984, flags = 134217845, pgoff = 0, inode = 58997 }
+vm_state.vm_map: 23329.176873485 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022761984, end = 3022766080, flags = 135266419, pgoff = 16384, inode = 58997 }
+vm_state.vm_map: 23329.176875986 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022766080, end = 3022778368, flags = 134217845, pgoff = 0, inode = 59166 }
+vm_state.vm_map: 23329.176878065 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022778368, end = 3022782464, flags = 135266419, pgoff = 8192, inode = 59166 }
+vm_state.vm_map: 23329.176882956 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022782464, end = 3022786560, flags = 134217937, pgoff = 0, inode = 1196150 }
+vm_state.vm_map: 23329.176885117 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022786560, end = 3022811136, flags = 134217937, pgoff = 0, inode = 1196354 }
+vm_state.vm_map: 23329.176887259 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022811136, end = 3022815232, flags = 134217937, pgoff = 0, inode = 1196334 }
+vm_state.vm_map: 23329.176889383 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022815232, end = 3022819328, flags = 134217937, pgoff = 0, inode = 1196333 }
+vm_state.vm_map: 23329.176891569 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022819328, end = 3022823424, flags = 134217937, pgoff = 0, inode = 1196331 }
+vm_state.vm_map: 23329.176893786 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022823424, end = 3022827520, flags = 134217937, pgoff = 0, inode = 1196330 }
+vm_state.vm_map: 23329.176896293 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022827520, end = 3022835712, flags = 134217937, pgoff = 0, inode = 1196329 }
+vm_state.vm_map: 23329.176898516 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022835712, end = 3022868480, flags = 134217937, pgoff = 0, inode = 1196328 }
+vm_state.vm_map: 23329.176900646 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022868480, end = 3022880768, flags = 134217937, pgoff = 0, inode = 1196327 }
+vm_state.vm_map: 23329.176902850 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022880768, end = 3022888960, flags = 134217937, pgoff = 0, inode = 1196320 }
+vm_state.vm_map: 23329.176905079 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022888960, end = 3022893056, flags = 134217937, pgoff = 0, inode = 1196318 }
+vm_state.vm_map: 23329.176907246 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022893056, end = 3022897152, flags = 134217937, pgoff = 0, inode = 1196278 }
+vm_state.vm_map: 23329.176909383 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022897152, end = 3022901248, flags = 134217937, pgoff = 0, inode = 1196251 }
+vm_state.vm_map: 23329.176911643 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022901248, end = 3022929920, flags = 134217937, pgoff = 0, inode = 1196236 }
+vm_state.vm_map: 23329.176913903 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022929920, end = 3022942208, flags = 134217937, pgoff = 0, inode = 1196234 }
+vm_state.vm_map: 23329.176916045 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022942208, end = 3022946304, flags = 134217937, pgoff = 0, inode = 1196201 }
+vm_state.vm_map: 23329.176918367 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022946304, end = 3022954496, flags = 134217937, pgoff = 0, inode = 1196170 }
+vm_state.vm_map: 23329.176920497 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022954496, end = 3022958592, flags = 134217937, pgoff = 0, inode = 1196157 }
+vm_state.vm_map: 23329.176922706 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022958592, end = 3022962688, flags = 134217937, pgoff = 0, inode = 1196171 }
+vm_state.vm_map: 23329.176924974 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022962688, end = 3022974976, flags = 134217937, pgoff = 0, inode = 1196172 }
+vm_state.vm_map: 23329.176927178 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022974976, end = 3022983168, flags = 134217937, pgoff = 0, inode = 1196173 }
+vm_state.vm_map: 23329.176929357 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3022983168, end = 3023015936, flags = 134217937, pgoff = 0, inode = 1196352 }
+vm_state.vm_map: 23329.176932061 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3023015936, end = 3023036416, flags = 134217937, pgoff = 0, inode = 1196196 }
+vm_state.vm_map: 23329.176934173 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3023036416, end = 3023044608, flags = 134217937, pgoff = 0, inode = 1196343 }
+vm_state.vm_map: 23329.176936495 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3023044608, end = 3023073280, flags = 134217937, pgoff = 0, inode = 1196314 }
+vm_state.vm_map: 23329.176938729 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3023073280, end = 3023118336, flags = 134217937, pgoff = 0, inode = 1196147 }
+vm_state.vm_map: 23329.176940958 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3023118336, end = 3023175680, flags = 134217937, pgoff = 0, inode = 1196094 }
+vm_state.vm_map: 23329.176943367 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3023175680, end = 3023400960, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.177042029 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3023400960, end = 3023405056, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.177044381 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3023405056, end = 3023409152, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.177050229 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3023409152, end = 3023466496, flags = 134217845, pgoff = 0, inode = 23728 }
+vm_state.vm_map: 23329.177052297 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3023466496, end = 3023470592, flags = 135266419, pgoff = 53248, inode = 23728 }
+vm_state.vm_map: 23329.177055131 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3023470592, end = 3023757312, flags = 134217845, pgoff = 0, inode = 1065175 }
+vm_state.vm_map: 23329.177057249 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3023757312, end = 3023765504, flags = 135266419, pgoff = 286720, inode = 1065175 }
+vm_state.vm_map: 23329.177059799 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3023765504, end = 3023925248, flags = 134217845, pgoff = 0, inode = 23579 }
+vm_state.vm_map: 23329.177061917 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3023925248, end = 3023929344, flags = 135266419, pgoff = 159744, inode = 23579 }
+vm_state.vm_map: 23329.177064004 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3023929344, end = 3024166912, flags = 1048691, pgoff = 3024166912, inode = 0 }
+vm_state.vm_map: 23329.177069271 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3024175104, end = 3024207872, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 23329.177071611 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3024207872, end = 3024211968, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 23329.177074407 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3024211968, end = 3024441344, flags = 134217845, pgoff = 0, inode = 23730 }
+vm_state.vm_map: 23329.177076446 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3024441344, end = 3024449536, flags = 135266419, pgoff = 225280, inode = 23730 }
+vm_state.vm_map: 23329.177079150 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3024449536, end = 3024531456, flags = 134217845, pgoff = 0, inode = 23971 }
+vm_state.vm_map: 23329.177081348 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3024531456, end = 3024535552, flags = 135266419, pgoff = 81920, inode = 23971 }
+vm_state.vm_map: 23329.177083805 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3024535552, end = 3024826368, flags = 134217845, pgoff = 0, inode = 1066190 }
+vm_state.vm_map: 23329.177085978 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3024826368, end = 3024838656, flags = 135266419, pgoff = 290816, inode = 1066190 }
+vm_state.vm_map: 23329.177088041 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3024838656, end = 3024871424, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 23329.177090504 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3024871424, end = 3024875520, flags = 135266419, pgoff = 32768, inode = 20716 }
+kernel.irq_entry: 23329.177134455 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { ip = 3242331332, handler = 0xf8a23c7f, irq_id = 14, kernel_mode = 1 }
+block.rq_complete_fs: 23329.177164370 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { hard_sector = 41083998, rw = 0, errors = 0 }
+kernel.sched_try_wakeup: 23329.177183770 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { pid = 16834, cpu_id = 0, state = 2 }
+kernel.timer_set: 23329.177206313 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { expires = 2302293, function = 0xc141b0a5, data = 4136835584 }
+kernel.irq_exit: 23329.177217131 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.sched_schedule: 23329.177229850 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { prev_pid = 16927, next_pid = 16834, prev_state = 0 }
+fs.buffer_wait_end: 23329.177303593 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { bh = 0xf6e0a2b0 }
+block.remap: 23329.177315237 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { device_from = 3145728, sector_from = 42463632, device_to = 3145730, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.bio_queue: 23329.177319114 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { sector = 45387462, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+block.getrq_bio: 23329.177330513 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { sector = 45387462, size = 4096, rw(FAILFAST_DRIVER,FAILFAST_TRANSPORT,FAILFAST_DEV,DISCARD,META,SYNC,BARRIER,AHEAD,RW) = 0, not_uptodate = 0 }
+kernel.timer_set: 23329.177337348 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { expires = 2302293, function = 0xc1410312, data = 4147888232 }
+block.plug: 23329.177341108 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL
+block.rq_insert_fs: 23329.177346338 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { hard_sector = 45387462, rw = 0, errors = 0 }
+fs.buffer_wait_start: 23329.177356372 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { bh = 0xf6e0a320 }
+block.unplug_io: 23329.177359231 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { pdu = 1 }
+block.rq_issue_fs: 23329.177384738 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { hard_sector = 45387462, rw = 0, errors = 0 }
+kernel.timer_set: 23329.177404792 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { expires = 2302293, function = 0xc14b0234, data = 0 }
+kernel.timer_set: 23329.177426952 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { expires = 2304292, function = 0xf8a23e85, data = 4136733696 }
+kernel.sched_schedule: 23329.177504442 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { prev_pid = 16834, next_pid = 1989, prev_state = 2 }
+fs.writev: 23329.177701500 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 48, vlen = 1 }
+kernel.syscall_exit: 23329.177704501 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 32 }
+kernel.syscall_entry: 23329.177717696 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7657e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.177721049 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.177726087 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 23329.177728866 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 23329.177735176 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.177748203 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 142 [syscall 142] }
+fs.select: 23329.177755662 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 1, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177759830 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 3, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177762183 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 5, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177770407 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 7, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177772840 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 13, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177775779 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 19, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177778514 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 20, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177780885 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 21, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177783571 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 22, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177785936 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 23, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177788369 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 24, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177790907 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 25, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177793234 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 26, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177795599 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 27, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177798174 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 28, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177801008 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 29, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177803620 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 30, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177806010 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 31, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177816308 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 32, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177818779 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 33, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177821674 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 34, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177824262 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 35, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177826749 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 37, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177829498 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 38, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177831763 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 39, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177834271 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 40, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177836653 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 41, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177839215 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 42, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177841593 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 43, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177843667 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 44, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177846174 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 45, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177848842 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 46, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177851225 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 48, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177853590 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 49, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177856325 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 50, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.177859030 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 52, end_time_sec = 23660, end_time_nsec = 559328907 }
+kernel.sched_schedule: 23329.177872268 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { prev_pid = 1989, next_pid = 16927, prev_state = 1 }
+vm_state.vm_map: 23329.178021468 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3024875520, end = 3025395712, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 23329.178027822 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3025395712, end = 3025403904, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 23329.178030032 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3025403904, end = 3025768448, flags = 134217845, pgoff = 0, inode = 23376 }
+vm_state.vm_map: 23329.178032230 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3025768448, end = 3025805312, flags = 135266423, pgoff = 364544, inode = 23376 }
+vm_state.vm_map: 23329.178034274 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3025805312, end = 3025809408, flags = 1048695, pgoff = 3025805312, inode = 0 }
+vm_state.vm_map: 23329.178036392 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3025809408, end = 3026362368, flags = 134217845, pgoff = 0, inode = 18947 }
+vm_state.vm_map: 23329.178038607 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3026362368, end = 3026382848, flags = 135266419, pgoff = 548864, inode = 18947 }
+vm_state.vm_map: 23329.178040665 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3026382848, end = 3026698240, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 23329.178042702 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3026698240, end = 3026706432, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 23329.178044944 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3026706432, end = 3026776064, flags = 134217845, pgoff = 0, inode = 1065123 }
+vm_state.vm_map: 23329.178047030 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3026776064, end = 3026780160, flags = 135266419, pgoff = 69632, inode = 1065123 }
+vm_state.vm_map: 23329.178049036 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3026780160, end = 3041275904, flags = 134217845, pgoff = 0, inode = 20672 }
+vm_state.vm_map: 23329.178051205 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3041275904, end = 3041890304, flags = 135266419, pgoff = 14495744, inode = 20672 }
+vm_state.vm_map: 23329.178053366 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3041890304, end = 3041898496, flags = 1048691, pgoff = 3041890304, inode = 0 }
+vm_state.vm_map: 23329.178055452 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3041898496, end = 3042271232, flags = 134217845, pgoff = 0, inode = 20902 }
+vm_state.vm_map: 23329.178057835 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3042271232, end = 3042283520, flags = 135266419, pgoff = 368640, inode = 20902 }
+vm_state.vm_map: 23329.178063188 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3042283520, end = 3042291712, flags = 134217845, pgoff = 0, inode = 57760 }
+vm_state.vm_map: 23329.178065368 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3042291712, end = 3042295808, flags = 135266419, pgoff = 4096, inode = 57760 }
+vm_state.vm_map: 23329.178067579 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3042295808, end = 3042304000, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 23329.178069530 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3042304000, end = 3042308096, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 23329.178071888 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3042308096, end = 3042320384, flags = 134217937, pgoff = 0, inode = 1196342 }
+vm_state.vm_map: 23329.178074019 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3042320384, end = 3042377728, flags = 134217937, pgoff = 0, inode = 1196355 }
+vm_state.vm_map: 23329.178076149 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3042377728, end = 3044360192, flags = 134217845, pgoff = 0, inode = 20915 }
+vm_state.vm_map: 23329.178078248 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3044360192, end = 3044401152, flags = 135266419, pgoff = 1978368, inode = 20915 }
+vm_state.vm_map: 23329.178080687 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3044401152, end = 3045732352, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.178082780 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3045732352, end = 3045748736, flags = 1048691, pgoff = 3045732352, inode = 0 }
+vm_state.vm_map: 23329.178085102 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3045748736, end = 3045896192, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.178087146 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3045896192, end = 3045904384, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.178089424 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3045904384, end = 3046223872, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 23329.178091462 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046223872, end = 3046240256, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 23329.178094246 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046240256, end = 3046252544, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 23329.178096395 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046252544, end = 3046256640, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 23329.178098575 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3046256640, end = 3047514112, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 23329.178100532 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3047514112, end = 3047534592, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 23329.178102792 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3047534592, end = 3047542784, flags = 1048691, pgoff = 3047534592, inode = 0 }
+vm_state.vm_map: 23329.178104848 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3047542784, end = 3047780352, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 23329.178106873 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3047780352, end = 3047784448, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 23329.178109004 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3047784448, end = 3047800832, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.178111140 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3047800832, end = 3047804928, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.178113252 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3047804928, end = 3047813120, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.178115245 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3047813120, end = 3047817216, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.178117431 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3047817216, end = 3048009728, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.178119463 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3048009728, end = 3048013824, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.178121605 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3048013824, end = 3048067072, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 23329.178123699 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3048067072, end = 3048071168, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 23329.178125797 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3048071168, end = 3048075264, flags = 1048691, pgoff = 3048071168, inode = 0 }
+vm_state.vm_map: 23329.178128268 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3048075264, end = 3048259584, flags = 134217845, pgoff = 0, inode = 22064 }
+vm_state.vm_map: 23329.178130465 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3048259584, end = 3048267776, flags = 135266419, pgoff = 180224, inode = 22064 }
+vm_state.vm_map: 23329.178132639 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3048267776, end = 3048509440, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.178134856 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3048509440, end = 3048513536, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.178136844 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3048513536, end = 3048984576, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 23329.178139110 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3048984576, end = 3049000960, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 23329.178141246 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049000960, end = 3049144320, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 23329.178143438 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049144320, end = 3049148416, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 23329.178145618 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049148416, end = 3049234432, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 23329.178147748 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049234432, end = 3049238528, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 23329.178149804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049238528, end = 3049242624, flags = 1048691, pgoff = 3049238528, inode = 0 }
+vm_state.vm_map: 23329.178151768 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049242624, end = 3049259008, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 23329.178154046 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049259008, end = 3049263104, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 23329.178156547 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049263104, end = 3049295872, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 23329.178158757 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049295872, end = 3049299968, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 23329.178160881 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049299968, end = 3049316352, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 23329.178163326 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049316352, end = 3049320448, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 23329.178165358 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049320448, end = 3049406464, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 23329.178167556 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049406464, end = 3049410560, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 23329.178169575 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049410560, end = 3049418752, flags = 1048691, pgoff = 3049410560, inode = 0 }
+vm_state.vm_map: 23329.178171810 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049418752, end = 3049447424, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 23329.178173947 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049447424, end = 3049451520, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 23329.178176040 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049451520, end = 3049455616, flags = 1048691, pgoff = 3049451520, inode = 0 }
+vm_state.vm_map: 23329.178178053 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049455616, end = 3049787392, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 23329.178180288 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049787392, end = 3049795584, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 23329.178182616 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049795584, end = 3049828352, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 23329.178184659 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049828352, end = 3049832448, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 23329.178186950 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049832448, end = 3049848832, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 23329.178189074 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049848832, end = 3049852928, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 23329.178191248 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049852928, end = 3049877504, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 23329.178193285 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049877504, end = 3049881600, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 23329.178195310 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049881600, end = 3049914368, flags = 134217845, pgoff = 0, inode = 21180 }
+vm_state.vm_map: 23329.178197725 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049914368, end = 3049918464, flags = 135266419, pgoff = 28672, inode = 21180 }
+vm_state.vm_map: 23329.178199663 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049918464, end = 3049922560, flags = 1048691, pgoff = 3049918464, inode = 0 }
+vm_state.vm_map: 23329.178201695 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3049922560, end = 3050352640, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 23329.178203757 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3050352640, end = 3050381312, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 23329.178205695 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3050381312, end = 3050385408, flags = 1048691, pgoff = 3050381312, inode = 0 }
+vm_state.vm_map: 23329.178207734 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3050385408, end = 3050827776, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 23329.178209820 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3050827776, end = 3050835968, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 23329.178211765 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3050835968, end = 3050934272, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.178213790 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3050934272, end = 3050938368, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.178215852 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3050938368, end = 3051208704, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 23329.178217791 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3051208704, end = 3051216896, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 23329.178220181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3051216896, end = 3051278336, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 23329.178222175 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3051278336, end = 3051282432, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 23329.178224219 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3051282432, end = 3051286528, flags = 1048691, pgoff = 3051282432, inode = 0 }
+vm_state.vm_map: 23329.178226257 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3051286528, end = 3051753472, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 23329.178228442 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3051753472, end = 3051761664, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 23329.178230795 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3051761664, end = 3052892160, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 23329.178235389 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3052892160, end = 3052908544, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 23329.178237673 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3052908544, end = 3053023232, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.178239822 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3053023232, end = 3053027328, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.178242002 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3053027328, end = 3053174784, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.178244101 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3053174784, end = 3053178880, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.178246225 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3053178880, end = 3053182976, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.178248466 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3053182976, end = 3053191168, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.178250486 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3053191168, end = 3053195264, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.178252684 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3053195264, end = 3053199360, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.178254734 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3053199360, end = 3053203456, flags = 1048691, pgoff = 3053199360, inode = 0 }
+vm_state.vm_map: 23329.178257006 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3053203456, end = 3053289472, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.178259061 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3053289472, end = 3053293568, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.178261106 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3053293568, end = 3053297664, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.178263045 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3053297664, end = 3053305856, flags = 1048691, pgoff = 3053297664, inode = 0 }
+vm_state.vm_map: 23329.178265675 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3053305856, end = 3054043136, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.178267712 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3054043136, end = 3054047232, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.178269787 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3054047232, end = 3054075904, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.178271781 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3054075904, end = 3054080000, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.178273942 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3054080000, end = 3054084096, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.178275993 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3054084096, end = 3054100480, flags = 134217845, pgoff = 0, inode = 19625 }
+vm_state.vm_map: 23329.178277918 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3054100480, end = 3054104576, flags = 135266419, pgoff = 12288, inode = 19625 }
+vm_state.vm_map: 23329.178280030 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3054104576, end = 3054182400, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.178282092 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3054182400, end = 3054186496, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.178284173 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3054186496, end = 3055501312, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.178286223 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3055501312, end = 3055509504, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.178288168 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3055509504, end = 3055513600, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.178290224 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3055513600, end = 3055529984, flags = 1048691, pgoff = 3055513600, inode = 0 }
+vm_state.vm_map: 23329.178292299 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3055529984, end = 3056467968, flags = 134217845, pgoff = 0, inode = 16400 }
+vm_state.vm_map: 23329.178294392 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3056467968, end = 3056484352, flags = 135266417, pgoff = 937984, inode = 16400 }
+vm_state.vm_map: 23329.178296374 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3056484352, end = 3056488448, flags = 135266419, pgoff = 954368, inode = 16400 }
+vm_state.vm_map: 23329.178298770 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3056488448, end = 3056517120, flags = 1048691, pgoff = 3056488448, inode = 0 }
+vm_state.vm_map: 23329.178300925 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3056517120, end = 3066556416, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 23329.178302907 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3066556416, end = 3066716160, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 23329.178304932 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3066716160, end = 3066724352, flags = 1048691, pgoff = 3066716160, inode = 0 }
+vm_state.vm_map: 23329.178307210 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3066724352, end = 3070320640, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 23329.178309137 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3070320640, end = 3070418944, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 23329.178311069 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3070418944, end = 3070423040, flags = 1048691, pgoff = 3070418944, inode = 0 }
+vm_state.vm_map: 23329.178313193 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3070423040, end = 3072978944, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 23329.178315256 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3072978944, end = 3073028096, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 23329.178317182 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3073028096, end = 3073032192, flags = 1048691, pgoff = 3073028096, inode = 0 }
+vm_state.vm_map: 23329.178319238 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3073032192, end = 3074183168, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.178321301 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3074183168, end = 3074199552, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.178323388 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3074199552, end = 3074433024, flags = 134217845, pgoff = 0, inode = 1065180 }
+vm_state.vm_map: 23329.178325333 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3074433024, end = 3074441216, flags = 135266419, pgoff = 233472, inode = 1065180 }
+vm_state.vm_map: 23329.178327376 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3074441216, end = 3074445312, flags = 1048691, pgoff = 3074441216, inode = 0 }
+vm_state.vm_map: 23329.178329450 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3074445312, end = 3076747264, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 23329.178331834 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3076747264, end = 3076792320, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 23329.178333792 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3076792320, end = 3079102464, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 23329.178335823 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3079102464, end = 3079131136, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 23329.178337928 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3079131136, end = 3079135232, flags = 1048691, pgoff = 3079131136, inode = 0 }
+vm_state.vm_map: 23329.178340176 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3079139328, end = 3079147520, flags = 134217845, pgoff = 0, inode = 23893 }
+vm_state.vm_map: 23329.178342201 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3079147520, end = 3079151616, flags = 135266419, pgoff = 4096, inode = 23893 }
+vm_state.vm_map: 23329.178344165 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3079151616, end = 3079159808, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 23329.178346257 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3079159808, end = 3079163904, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 23329.178348418 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3079163904, end = 3079180288, flags = 134217845, pgoff = 0, inode = 22094 }
+vm_state.vm_map: 23329.178350395 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3079180288, end = 3079184384, flags = 135266419, pgoff = 12288, inode = 22094 }
+vm_state.vm_map: 23329.178352623 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3079184384, end = 3079192576, flags = 134217845, pgoff = 0, inode = 1450327 }
+vm_state.vm_map: 23329.178354611 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3079192576, end = 3079196672, flags = 135266417, pgoff = 4096, inode = 1450327 }
+vm_state.vm_map: 23329.178356717 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3079196672, end = 3079200768, flags = 135266419, pgoff = 8192, inode = 1450327 }
+vm_state.vm_map: 23329.178358841 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3079200768, end = 3079229440, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.178360823 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3079229440, end = 3079237632, flags = 1048691, pgoff = 3079229440, inode = 0 }
+vm_state.vm_map: 23329.178363003 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3079237632, end = 3079241728, flags = 67371125, pgoff = 3079237632, inode = 0 }
+vm_state.vm_map: 23329.178365324 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3079241728, end = 3079356416, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.178367269 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3079356416, end = 3079360512, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.178369220 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3079360512, end = 3079364608, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.178371326 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2247, start = 3215650816, end = 3215736832, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.178376383 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 134512640, end = 134553600, flags = 134223989, pgoff = 0, inode = 20759 }
+vm_state.vm_map: 23329.178378371 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 134553600, end = 134557696, flags = 135272563, pgoff = 36864, inode = 20759 }
+vm_state.vm_map: 23329.178380396 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 134557696, end = 134565888, flags = 1048691, pgoff = 134557696, inode = 0 }
+vm_state.vm_map: 23329.178382496 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 153337856, end = 154787840, flags = 1048691, pgoff = 153337856, inode = 0 }
+vm_state.vm_map: 23329.178384904 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2984677376, end = 2984689664, flags = 134217845, pgoff = 0, inode = 20765 }
+vm_state.vm_map: 23329.178386843 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2984689664, end = 2984693760, flags = 135266419, pgoff = 8192, inode = 20765 }
+vm_state.vm_map: 23329.178389034 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2984693760, end = 2984755200, flags = 134217845, pgoff = 0, inode = 19423 }
+vm_state.vm_map: 23329.178412559 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2984755200, end = 2984759296, flags = 135266419, pgoff = 57344, inode = 19423 }
+vm_state.vm_map: 23329.178415979 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2984759296, end = 2984767488, flags = 134217845, pgoff = 0, inode = 500018 }
+vm_state.vm_map: 23329.178418048 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2984767488, end = 2984771584, flags = 135266419, pgoff = 4096, inode = 500018 }
+vm_state.vm_map: 23329.178420253 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2984771584, end = 2984796160, flags = 134217845, pgoff = 0, inode = 19420 }
+vm_state.vm_map: 23329.178422710 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2984796160, end = 2984800256, flags = 135266419, pgoff = 20480, inode = 19420 }
+vm_state.vm_map: 23329.178425458 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2984800256, end = 2984960000, flags = 134217845, pgoff = 0, inode = 18680 }
+vm_state.vm_map: 23329.178427507 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2984960000, end = 2984964096, flags = 135266419, pgoff = 159744, inode = 18680 }
+vm_state.vm_map: 23329.178429946 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2984964096, end = 2985623552, flags = 134217845, pgoff = 0, inode = 19419 }
+vm_state.vm_map: 23329.178432002 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2985623552, end = 2985648128, flags = 135266419, pgoff = 659456, inode = 19419 }
+vm_state.vm_map: 23329.178434336 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2985648128, end = 2985738240, flags = 134217845, pgoff = 0, inode = 18560 }
+vm_state.vm_map: 23329.178436374 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2985738240, end = 2985742336, flags = 135266419, pgoff = 86016, inode = 18560 }
+vm_state.vm_map: 23329.178438739 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2985742336, end = 2985811968, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 23329.178440850 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2985811968, end = 2985816064, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 23329.178442913 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2985816064, end = 2985820160, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 23329.178444969 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2985820160, end = 2985828352, flags = 1048691, pgoff = 2985820160, inode = 0 }
+vm_state.vm_map: 23329.178447204 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2985828352, end = 2986291200, flags = 134217845, pgoff = 0, inode = 20061 }
+vm_state.vm_map: 23329.178449248 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2986291200, end = 2986303488, flags = 135266419, pgoff = 458752, inode = 20061 }
+vm_state.vm_map: 23329.178451390 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2986303488, end = 2986909696, flags = 134217845, pgoff = 0, inode = 22471 }
+vm_state.vm_map: 23329.178453403 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2986909696, end = 2986926080, flags = 135266419, pgoff = 602112, inode = 22471 }
+vm_state.vm_map: 23329.178455873 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2986926080, end = 2987089920, flags = 134217845, pgoff = 0, inode = 17950 }
+vm_state.vm_map: 23329.178458269 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2987089920, end = 2987094016, flags = 135266419, pgoff = 163840, inode = 17950 }
+vm_state.vm_map: 23329.178460609 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2987094016, end = 2987360256, flags = 134217845, pgoff = 0, inode = 19433 }
+vm_state.vm_map: 23329.178462628 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2987360256, end = 2987368448, flags = 135266419, pgoff = 262144, inode = 19433 }
+vm_state.vm_map: 23329.178464727 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2987368448, end = 2987372544, flags = 1048691, pgoff = 2987368448, inode = 0 }
+vm_state.vm_map: 23329.178470291 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2987372544, end = 2987421696, flags = 134217845, pgoff = 0, inode = 19447 }
+vm_state.vm_map: 23329.178472334 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2987421696, end = 2987425792, flags = 135266419, pgoff = 49152, inode = 19447 }
+vm_state.vm_map: 23329.178477509 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2987425792, end = 2987622400, flags = 134217845, pgoff = 0, inode = 19429 }
+vm_state.vm_map: 23329.178479553 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2987622400, end = 2987626496, flags = 135266419, pgoff = 192512, inode = 19429 }
+vm_state.vm_map: 23329.178484313 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2987626496, end = 2987851776, flags = 134217845, pgoff = 0, inode = 20835 }
+vm_state.vm_map: 23329.178486368 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2987851776, end = 2987855872, flags = 135266419, pgoff = 221184, inode = 20835 }
+vm_state.vm_map: 23329.178488845 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2987855872, end = 2988109824, flags = 134217845, pgoff = 0, inode = 18395 }
+vm_state.vm_map: 23329.178490957 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2988109824, end = 2988113920, flags = 135266419, pgoff = 249856, inode = 18395 }
+vm_state.vm_map: 23329.178496730 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2988113920, end = 2988498944, flags = 134217845, pgoff = 0, inode = 20862 }
+vm_state.vm_map: 23329.178498786 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2988498944, end = 2988503040, flags = 135266419, pgoff = 380928, inode = 20862 }
+vm_state.vm_map: 23329.178501193 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2988503040, end = 2988531712, flags = 134217845, pgoff = 0, inode = 1065218 }
+vm_state.vm_map: 23329.178503373 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2988531712, end = 2988535808, flags = 135266419, pgoff = 28672, inode = 1065218 }
+vm_state.vm_map: 23329.178505856 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2988535808, end = 2989989888, flags = 134217845, pgoff = 0, inode = 17110 }
+vm_state.vm_map: 23329.178507942 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2989989888, end = 2990002176, flags = 135266419, pgoff = 1454080, inode = 17110 }
+vm_state.vm_map: 23329.178512690 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2990002176, end = 2990395392, flags = 134217845, pgoff = 0, inode = 23653 }
+vm_state.vm_map: 23329.178514728 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2990395392, end = 2990403584, flags = 135266419, pgoff = 393216, inode = 23653 }
+vm_state.vm_map: 23329.178517229 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2990403584, end = 2990624768, flags = 134217845, pgoff = 0, inode = 20840 }
+vm_state.vm_map: 23329.178519489 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2990624768, end = 2990628864, flags = 135266419, pgoff = 221184, inode = 20840 }
+vm_state.vm_map: 23329.178521958 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2990628864, end = 2990833664, flags = 134217845, pgoff = 0, inode = 20867 }
+vm_state.vm_map: 23329.178523910 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2990833664, end = 2990837760, flags = 135266419, pgoff = 204800, inode = 20867 }
+vm_state.vm_map: 23329.178526077 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2990931968, end = 2990936064, flags = 1048688, pgoff = 2990931968, inode = 0 }
+vm_state.vm_map: 23329.178528176 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2990936064, end = 2999324672, flags = 1048691, pgoff = 2990936064, inode = 0 }
+vm_state.vm_map: 23329.178530473 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 2999324672, end = 3001360384, flags = 134217937, pgoff = 0, inode = 41242 }
+vm_state.vm_map: 23329.178533190 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3001360384, end = 3001401344, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.178535129 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3001401344, end = 3001405440, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.178537302 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3001405440, end = 3001409536, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.178539494 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3001409536, end = 3001446400, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.178541427 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3001446400, end = 3001450496, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.178543366 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3001450496, end = 3001454592, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.178545650 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3001454592, end = 3001532416, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.178547589 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3001532416, end = 3001536512, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.178549633 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3001536512, end = 3001540608, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.178551621 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3001540608, end = 3001548800, flags = 1048691, pgoff = 3001540608, inode = 0 }
+vm_state.vm_map: 23329.178553998 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3001548800, end = 3017789440, flags = 134217979, pgoff = 0, inode = 1204696 }
+vm_state.vm_map: 23329.178556190 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3017789440, end = 3022086144, flags = 134217979, pgoff = 0, inode = 1204694 }
+vm_state.vm_map: 23329.178558481 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022086144, end = 3022286848, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 23329.178560488 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022286848, end = 3022290944, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 23329.178562828 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022290944, end = 3022315520, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 23329.178564828 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022315520, end = 3022319616, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 23329.178567791 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022319616, end = 3022327808, flags = 134217845, pgoff = 0, inode = 499720 }
+vm_state.vm_map: 23329.178569786 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022327808, end = 3022331904, flags = 135266419, pgoff = 4096, inode = 499720 }
+vm_state.vm_map: 23329.178572380 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022331904, end = 3022409728, flags = 134217845, pgoff = 0, inode = 50114 }
+vm_state.vm_map: 23329.178574404 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022409728, end = 3022413824, flags = 135266419, pgoff = 77824, inode = 50114 }
+vm_state.vm_map: 23329.178576744 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022413824, end = 3022417920, flags = 134217937, pgoff = 0, inode = 1196150 }
+vm_state.vm_map: 23329.178579116 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022417920, end = 3022442496, flags = 134217937, pgoff = 0, inode = 1196354 }
+vm_state.vm_map: 23329.178581443 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022442496, end = 3022446592, flags = 134217937, pgoff = 0, inode = 1196334 }
+vm_state.vm_map: 23329.178583586 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022446592, end = 3022450688, flags = 134217937, pgoff = 0, inode = 1196333 }
+vm_state.vm_map: 23329.178585901 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022450688, end = 3022454784, flags = 134217937, pgoff = 0, inode = 1196331 }
+vm_state.vm_map: 23329.178588130 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022454784, end = 3022458880, flags = 134217937, pgoff = 0, inode = 1196330 }
+vm_state.vm_map: 23329.178590347 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022458880, end = 3022467072, flags = 134217937, pgoff = 0, inode = 1196329 }
+vm_state.vm_map: 23329.178592601 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022467072, end = 3022499840, flags = 134217937, pgoff = 0, inode = 1196328 }
+vm_state.vm_map: 23329.178594885 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022499840, end = 3022512128, flags = 134217937, pgoff = 0, inode = 1196327 }
+vm_state.vm_map: 23329.178596991 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022512128, end = 3022520320, flags = 134217937, pgoff = 0, inode = 1196320 }
+vm_state.vm_map: 23329.178599386 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022520320, end = 3022524416, flags = 134217937, pgoff = 0, inode = 1196318 }
+vm_state.vm_map: 23329.178601529 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022524416, end = 3022528512, flags = 134217937, pgoff = 0, inode = 1196278 }
+vm_state.vm_map: 23329.178604196 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022528512, end = 3022532608, flags = 134217937, pgoff = 0, inode = 1196251 }
+vm_state.vm_map: 23329.178606308 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022532608, end = 3022561280, flags = 134217937, pgoff = 0, inode = 1196236 }
+vm_state.vm_map: 23329.178608519 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022561280, end = 3022573568, flags = 134217937, pgoff = 0, inode = 1196234 }
+vm_state.vm_map: 23329.178610636 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022573568, end = 3022577664, flags = 134217937, pgoff = 0, inode = 1196201 }
+vm_state.vm_map: 23329.178612847 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022577664, end = 3022585856, flags = 134217937, pgoff = 0, inode = 1196170 }
+vm_state.vm_map: 23329.178615039 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022585856, end = 3022589952, flags = 134217937, pgoff = 0, inode = 1196157 }
+vm_state.vm_map: 23329.178617169 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022589952, end = 3022594048, flags = 134217937, pgoff = 0, inode = 1196171 }
+vm_state.vm_map: 23329.178619380 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022594048, end = 3022606336, flags = 134217937, pgoff = 0, inode = 1196172 }
+vm_state.vm_map: 23329.178621646 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022606336, end = 3022614528, flags = 134217937, pgoff = 0, inode = 1196173 }
+vm_state.vm_map: 23329.178623862 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022614528, end = 3022647296, flags = 134217937, pgoff = 0, inode = 1196352 }
+vm_state.vm_map: 23329.178626172 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022647296, end = 3022667776, flags = 134217937, pgoff = 0, inode = 1196196 }
+vm_state.vm_map: 23329.178628339 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022667776, end = 3022675968, flags = 134217937, pgoff = 0, inode = 1196343 }
+vm_state.vm_map: 23329.178630815 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022675968, end = 3022704640, flags = 134217937, pgoff = 0, inode = 1196314 }
+vm_state.vm_map: 23329.178633100 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022704640, end = 3022749696, flags = 134217937, pgoff = 0, inode = 1196147 }
+vm_state.vm_map: 23329.178635329 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022749696, end = 3022974976, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.178637372 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022974976, end = 3022979072, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.178639853 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022979072, end = 3022983168, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.178642095 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3022983168, end = 3023917056, flags = 134217845, pgoff = 0, inode = 20876 }
+vm_state.vm_map: 23329.178644095 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3023917056, end = 3023929344, flags = 135266419, pgoff = 933888, inode = 20876 }
+vm_state.vm_map: 23329.178646213 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3023929344, end = 3024166912, flags = 1048691, pgoff = 3024166912, inode = 0 }
+vm_state.vm_map: 23329.178648436 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3024171008, end = 3024195584, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.178650523 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3024195584, end = 3024199680, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.178652605 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3024199680, end = 3024203776, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.178655050 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3024203776, end = 3024261120, flags = 134217937, pgoff = 0, inode = 1196094 }
+vm_state.vm_map: 23329.178657216 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3024261120, end = 3024547840, flags = 134217845, pgoff = 0, inode = 20877 }
+vm_state.vm_map: 23329.178661878 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3024547840, end = 3024556032, flags = 135266419, pgoff = 282624, inode = 20877 }
+vm_state.vm_map: 23329.178664255 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3024556032, end = 3024740352, flags = 134217845, pgoff = 0, inode = 20878 }
+vm_state.vm_map: 23329.178666404 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3024740352, end = 3024744448, flags = 135266419, pgoff = 184320, inode = 20878 }
+vm_state.vm_map: 23329.178668713 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3024744448, end = 3024777216, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 23329.178670763 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3024777216, end = 3024781312, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 23329.178672992 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3024781312, end = 3024838656, flags = 134217937, pgoff = 0, inode = 1196355 }
+vm_state.vm_map: 23329.178675481 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3024838656, end = 3024871424, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 23329.178677667 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3024871424, end = 3024875520, flags = 135266419, pgoff = 32768, inode = 20716 }
+vm_state.vm_map: 23329.178679716 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3024875520, end = 3025395712, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 23329.178681655 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3025395712, end = 3025403904, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 23329.178683853 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3025403904, end = 3025768448, flags = 134217845, pgoff = 0, inode = 23376 }
+vm_state.vm_map: 23329.178685971 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3025768448, end = 3025805312, flags = 135266423, pgoff = 364544, inode = 23376 }
+vm_state.vm_map: 23329.178688071 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3025805312, end = 3025809408, flags = 1048695, pgoff = 3025805312, inode = 0 }
+vm_state.vm_map: 23329.178690053 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3025809408, end = 3026362368, flags = 134217845, pgoff = 0, inode = 18947 }
+vm_state.vm_map: 23329.178692220 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3026362368, end = 3026382848, flags = 135266419, pgoff = 548864, inode = 18947 }
+vm_state.vm_map: 23329.178694313 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3026382848, end = 3026698240, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 23329.178696246 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3026698240, end = 3026706432, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 23329.178698197 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3026706432, end = 3026776064, flags = 134217845, pgoff = 0, inode = 1065123 }
+vm_state.vm_map: 23329.178700377 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3026776064, end = 3026780160, flags = 135266419, pgoff = 69632, inode = 1065123 }
+vm_state.vm_map: 23329.178702328 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3026780160, end = 3041275904, flags = 134217845, pgoff = 0, inode = 20672 }
+vm_state.vm_map: 23329.178704285 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3041275904, end = 3041890304, flags = 135266419, pgoff = 14495744, inode = 20672 }
+vm_state.vm_map: 23329.178706328 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3041890304, end = 3041898496, flags = 1048691, pgoff = 3041890304, inode = 0 }
+vm_state.vm_map: 23329.178708792 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3041898496, end = 3042271232, flags = 134217845, pgoff = 0, inode = 20902 }
+vm_state.vm_map: 23329.178710812 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3042271232, end = 3042283520, flags = 135266419, pgoff = 368640, inode = 20902 }
+vm_state.vm_map: 23329.178712985 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3042283520, end = 3042291712, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 23329.178715041 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3042291712, end = 3042295808, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 23329.178717640 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3042295808, end = 3042373632, flags = 134217845, pgoff = 0, inode = 22643 }
+vm_state.vm_map: 23329.178719623 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3042373632, end = 3042377728, flags = 135266419, pgoff = 73728, inode = 22643 }
+vm_state.vm_map: 23329.178721629 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3042377728, end = 3044360192, flags = 134217845, pgoff = 0, inode = 20915 }
+vm_state.vm_map: 23329.178723672 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3044360192, end = 3044401152, flags = 135266419, pgoff = 1978368, inode = 20915 }
+vm_state.vm_map: 23329.178743499 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3044401152, end = 3045732352, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.178745666 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3045732352, end = 3045748736, flags = 1048691, pgoff = 3045732352, inode = 0 }
+vm_state.vm_map: 23329.178747870 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3045748736, end = 3045896192, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.178750019 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3045896192, end = 3045904384, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.178752094 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3045904384, end = 3046223872, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 23329.178754162 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3046223872, end = 3046240256, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 23329.178756373 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3046240256, end = 3046252544, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 23329.178758429 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3046252544, end = 3046256640, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 23329.178760942 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3046256640, end = 3047514112, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 23329.178763084 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3047514112, end = 3047534592, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 23329.178765134 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3047534592, end = 3047542784, flags = 1048691, pgoff = 3047534592, inode = 0 }
+vm_state.vm_map: 23329.178767246 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3047542784, end = 3047780352, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 23329.178769333 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3047780352, end = 3047784448, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 23329.178771537 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3047784448, end = 3047800832, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.178773587 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3047800832, end = 3047804928, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.178775767 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3047804928, end = 3047813120, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.178777737 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3047813120, end = 3047817216, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.178779941 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3047817216, end = 3048009728, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.178781984 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3048009728, end = 3048013824, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.178784201 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3048013824, end = 3048067072, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 23329.178786239 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3048067072, end = 3048071168, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 23329.178791376 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3048071168, end = 3048075264, flags = 1048691, pgoff = 3048071168, inode = 0 }
+vm_state.vm_map: 23329.178793456 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3048075264, end = 3048259584, flags = 134217845, pgoff = 0, inode = 22064 }
+vm_state.vm_map: 23329.178795976 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3048259584, end = 3048267776, flags = 135266419, pgoff = 180224, inode = 22064 }
+vm_state.vm_map: 23329.178798087 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3048267776, end = 3048509440, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.178800125 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3048509440, end = 3048513536, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.178802317 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3048513536, end = 3048984576, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 23329.178804366 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3048984576, end = 3049000960, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 23329.178806491 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049000960, end = 3049144320, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 23329.178808633 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049144320, end = 3049148416, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 23329.178810739 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049148416, end = 3049234432, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 23329.178812770 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049234432, end = 3049238528, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 23329.178814758 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049238528, end = 3049242624, flags = 1048691, pgoff = 3049238528, inode = 0 }
+vm_state.vm_map: 23329.178816895 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049242624, end = 3049259008, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 23329.178818982 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049259008, end = 3049263104, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 23329.178821062 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049263104, end = 3049295872, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 23329.178823267 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049295872, end = 3049299968, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 23329.178825317 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049299968, end = 3049316352, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 23329.178827422 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049316352, end = 3049320448, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 23329.178829935 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049320448, end = 3049406464, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 23329.178832164 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049406464, end = 3049410560, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 23329.178834264 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049410560, end = 3049418752, flags = 1048691, pgoff = 3049410560, inode = 0 }
+vm_state.vm_map: 23329.178836431 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049418752, end = 3049447424, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 23329.178838456 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049447424, end = 3049451520, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 23329.178840556 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049451520, end = 3049455616, flags = 1048691, pgoff = 3049451520, inode = 0 }
+vm_state.vm_map: 23329.178842673 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049455616, end = 3049787392, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 23329.178844785 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049787392, end = 3049795584, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 23329.178846749 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049795584, end = 3049828352, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 23329.178849021 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049828352, end = 3049832448, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 23329.178851096 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049832448, end = 3049848832, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 23329.178853027 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049848832, end = 3049852928, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 23329.178855115 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049852928, end = 3049877504, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 23329.178857387 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049877504, end = 3049881600, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 23329.178859387 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049881600, end = 3049914368, flags = 134217845, pgoff = 0, inode = 21180 }
+vm_state.vm_map: 23329.178861344 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049914368, end = 3049918464, flags = 135266419, pgoff = 28672, inode = 21180 }
+vm_state.vm_map: 23329.178863710 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049918464, end = 3049922560, flags = 1048691, pgoff = 3049918464, inode = 0 }
+vm_state.vm_map: 23329.178865784 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3049922560, end = 3050352640, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 23329.178867766 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3050352640, end = 3050381312, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 23329.178869933 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3050381312, end = 3050385408, flags = 1048691, pgoff = 3050381312, inode = 0 }
+vm_state.vm_map: 23329.178872014 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3050385408, end = 3050827776, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 23329.178873978 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3050827776, end = 3050835968, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 23329.178876009 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3050835968, end = 3050934272, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.178878182 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3050934272, end = 3050938368, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.178880152 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3050938368, end = 3051208704, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 23329.178882085 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3051208704, end = 3051216896, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 23329.178884178 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3051216896, end = 3051278336, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 23329.178886253 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3051278336, end = 3051282432, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 23329.178890624 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3051282432, end = 3051286528, flags = 1048691, pgoff = 3051282432, inode = 0 }
+vm_state.vm_map: 23329.178892686 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3051286528, end = 3051753472, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 23329.178894817 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3051753472, end = 3051761664, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 23329.178897243 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3051761664, end = 3052892160, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 23329.178899281 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3052892160, end = 3052908544, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 23329.178901467 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3052908544, end = 3053023232, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.178903504 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3053023232, end = 3053027328, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.178905641 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3053027328, end = 3053174784, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.178907777 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3053174784, end = 3053178880, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.178909802 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3053178880, end = 3053182976, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.178911933 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3053182976, end = 3053191168, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.178913964 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3053191168, end = 3053195264, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.178916094 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3053195264, end = 3053199360, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.178918194 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3053199360, end = 3053203456, flags = 1048691, pgoff = 3053199360, inode = 0 }
+vm_state.vm_map: 23329.178920268 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3053203456, end = 3053289472, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.178922368 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3053289472, end = 3053293568, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.178924461 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3053293568, end = 3053297664, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.178926542 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3053297664, end = 3053305856, flags = 1048691, pgoff = 3053297664, inode = 0 }
+vm_state.vm_map: 23329.178928777 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3053305856, end = 3054043136, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.178931079 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3054043136, end = 3054047232, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.178933036 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3054047232, end = 3054075904, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.178935081 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3054075904, end = 3054080000, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.178937137 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3054080000, end = 3054084096, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.178939075 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3054084096, end = 3054100480, flags = 134217845, pgoff = 0, inode = 19625 }
+vm_state.vm_map: 23329.178941107 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3054100480, end = 3054104576, flags = 135266419, pgoff = 12288, inode = 19625 }
+vm_state.vm_map: 23329.178943120 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3054104576, end = 3054182400, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.178945194 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3054182400, end = 3054186496, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.178947238 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3054186496, end = 3055501312, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.178949281 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3055501312, end = 3055509504, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.178951226 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3055509504, end = 3055513600, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.178953276 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3055513600, end = 3055529984, flags = 1048691, pgoff = 3055513600, inode = 0 }
+vm_state.vm_map: 23329.178955302 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3055529984, end = 3056467968, flags = 134217845, pgoff = 0, inode = 16400 }
+vm_state.vm_map: 23329.178957234 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3056467968, end = 3056484352, flags = 135266417, pgoff = 937984, inode = 16400 }
+vm_state.vm_map: 23329.178959161 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3056484352, end = 3056488448, flags = 135266419, pgoff = 954368, inode = 16400 }
+vm_state.vm_map: 23329.178961309 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3056488448, end = 3056517120, flags = 1048691, pgoff = 3056488448, inode = 0 }
+vm_state.vm_map: 23329.178963674 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3056517120, end = 3066556416, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 23329.178965706 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3066556416, end = 3066716160, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 23329.178967787 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3066716160, end = 3066724352, flags = 1048691, pgoff = 3066716160, inode = 0 }
+vm_state.vm_map: 23329.178969991 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3066724352, end = 3070320640, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 23329.178972084 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3070320640, end = 3070418944, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 23329.178974196 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3070418944, end = 3070423040, flags = 1048691, pgoff = 3070418944, inode = 0 }
+vm_state.vm_map: 23329.178976320 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3070423040, end = 3072978944, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 23329.178978283 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3072978944, end = 3073028096, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 23329.178980296 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3073028096, end = 3073032192, flags = 1048691, pgoff = 3073028096, inode = 0 }
+vm_state.vm_map: 23329.178982476 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3073032192, end = 3074183168, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.178984600 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3074183168, end = 3074199552, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.178988984 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3074199552, end = 3074433024, flags = 134217845, pgoff = 0, inode = 1065180 }
+vm_state.vm_map: 23329.178991021 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3074433024, end = 3074441216, flags = 135266419, pgoff = 233472, inode = 1065180 }
+vm_state.vm_map: 23329.178993170 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3074441216, end = 3074445312, flags = 1048691, pgoff = 3074441216, inode = 0 }
+vm_state.vm_map: 23329.178995251 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3074445312, end = 3076747264, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 23329.178997566 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3076747264, end = 3076792320, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 23329.178999671 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3076792320, end = 3079102464, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 23329.179001765 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3079102464, end = 3079131136, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 23329.179003723 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3079131136, end = 3079135232, flags = 1048691, pgoff = 3079131136, inode = 0 }
+vm_state.vm_map: 23329.179005822 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3079139328, end = 3079151616, flags = 134217937, pgoff = 0, inode = 1196342 }
+vm_state.vm_map: 23329.179007859 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3079151616, end = 3079159808, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 23329.179009916 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3079159808, end = 3079163904, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 23329.179011873 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3079163904, end = 3079180288, flags = 134217845, pgoff = 0, inode = 22094 }
+vm_state.vm_map: 23329.179013854 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3079180288, end = 3079184384, flags = 135266419, pgoff = 12288, inode = 22094 }
+vm_state.vm_map: 23329.179015978 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3079184384, end = 3079192576, flags = 134217845, pgoff = 0, inode = 1450327 }
+vm_state.vm_map: 23329.179018034 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3079192576, end = 3079196672, flags = 135266417, pgoff = 4096, inode = 1450327 }
+vm_state.vm_map: 23329.179019968 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3079196672, end = 3079200768, flags = 135266419, pgoff = 8192, inode = 1450327 }
+vm_state.vm_map: 23329.179022023 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3079200768, end = 3079229440, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.179023956 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3079229440, end = 3079237632, flags = 1048691, pgoff = 3079229440, inode = 0 }
+vm_state.vm_map: 23329.179026024 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3079237632, end = 3079241728, flags = 67371125, pgoff = 3079237632, inode = 0 }
+vm_state.vm_map: 23329.179028105 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3079241728, end = 3079356416, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.179030396 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3079356416, end = 3079360512, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.179032365 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3079360512, end = 3079364608, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.179034539 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2248, start = 3215650816, end = 3215736832, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.179037490 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 134512640, end = 134533120, flags = 134223989, pgoff = 0, inode = 1352628 }
+vm_state.vm_map: 23329.179039417 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 134533120, end = 134537216, flags = 135272563, pgoff = 16384, inode = 1352628 }
+vm_state.vm_map: 23329.179041362 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 150847488, end = 152977408, flags = 1048691, pgoff = 150847488, inode = 0 }
+vm_state.vm_map: 23329.179043523 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3033620480, end = 3034390528, flags = 1048691, pgoff = 3033620480, inode = 0 }
+vm_state.vm_map: 23329.179048666 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3034390528, end = 3034402816, flags = 134217845, pgoff = 0, inode = 20765 }
+vm_state.vm_map: 23329.179050784 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3034402816, end = 3034406912, flags = 135266419, pgoff = 8192, inode = 20765 }
+vm_state.vm_map: 23329.179052995 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3034406912, end = 3034468352, flags = 134217845, pgoff = 0, inode = 19423 }
+vm_state.vm_map: 23329.179055051 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3034468352, end = 3034472448, flags = 135266419, pgoff = 57344, inode = 19423 }
+vm_state.vm_map: 23329.179057329 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3034472448, end = 3034480640, flags = 134217845, pgoff = 0, inode = 500018 }
+vm_state.vm_map: 23329.179059293 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3034480640, end = 3034484736, flags = 135266419, pgoff = 4096, inode = 500018 }
+vm_state.vm_map: 23329.179061398 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3034484736, end = 3034509312, flags = 134217845, pgoff = 0, inode = 19420 }
+vm_state.vm_map: 23329.179063337 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3034509312, end = 3034513408, flags = 135266419, pgoff = 20480, inode = 19420 }
+vm_state.vm_map: 23329.179066097 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3034513408, end = 3034673152, flags = 134217845, pgoff = 0, inode = 18680 }
+vm_state.vm_map: 23329.179068030 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3034673152, end = 3034677248, flags = 135266419, pgoff = 159744, inode = 18680 }
+vm_state.vm_map: 23329.179070184 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3034677248, end = 3035336704, flags = 134217845, pgoff = 0, inode = 19419 }
+vm_state.vm_map: 23329.179072111 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3035336704, end = 3035361280, flags = 135266419, pgoff = 659456, inode = 19419 }
+vm_state.vm_map: 23329.179074407 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3035361280, end = 3035451392, flags = 134217845, pgoff = 0, inode = 18560 }
+vm_state.vm_map: 23329.179076334 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3035451392, end = 3035455488, flags = 135266419, pgoff = 86016, inode = 18560 }
+vm_state.vm_map: 23329.179078532 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3035455488, end = 3035525120, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 23329.179080582 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3035525120, end = 3035529216, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 23329.179084923 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3035529216, end = 3035533312, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 23329.179086960 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3035533312, end = 3035541504, flags = 1048691, pgoff = 3035533312, inode = 0 }
+vm_state.vm_map: 23329.179089208 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3035541504, end = 3036004352, flags = 134217845, pgoff = 0, inode = 20061 }
+vm_state.vm_map: 23329.179091251 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3036004352, end = 3036016640, flags = 135266419, pgoff = 458752, inode = 20061 }
+vm_state.vm_map: 23329.179093412 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3036016640, end = 3036622848, flags = 134217845, pgoff = 0, inode = 22471 }
+vm_state.vm_map: 23329.179095505 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3036622848, end = 3036639232, flags = 135266419, pgoff = 602112, inode = 22471 }
+vm_state.vm_map: 23329.179097679 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3036639232, end = 3036803072, flags = 134217845, pgoff = 0, inode = 17950 }
+vm_state.vm_map: 23329.179100087 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3036803072, end = 3036807168, flags = 135266419, pgoff = 163840, inode = 17950 }
+vm_state.vm_map: 23329.179102371 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3036807168, end = 3037073408, flags = 134217845, pgoff = 0, inode = 19433 }
+vm_state.vm_map: 23329.179104403 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3037073408, end = 3037081600, flags = 135266419, pgoff = 262144, inode = 19433 }
+vm_state.vm_map: 23329.179106410 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3037081600, end = 3037085696, flags = 1048691, pgoff = 3037081600, inode = 0 }
+vm_state.vm_map: 23329.179108552 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3037085696, end = 3037134848, flags = 134217845, pgoff = 0, inode = 19447 }
+vm_state.vm_map: 23329.179110645 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3037134848, end = 3037138944, flags = 135266419, pgoff = 49152, inode = 19447 }
+vm_state.vm_map: 23329.179112887 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3037138944, end = 3037335552, flags = 134217845, pgoff = 0, inode = 19429 }
+vm_state.vm_map: 23329.179114986 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3037335552, end = 3037339648, flags = 135266419, pgoff = 192512, inode = 19429 }
+vm_state.vm_map: 23329.179117172 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3037339648, end = 3038597120, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 23329.179119271 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3038597120, end = 3038617600, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 23329.179121315 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3038617600, end = 3038621696, flags = 1048691, pgoff = 3038617600, inode = 0 }
+vm_state.vm_map: 23329.179123390 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3038621696, end = 3038846976, flags = 134217845, pgoff = 0, inode = 20835 }
+vm_state.vm_map: 23329.179125328 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3038846976, end = 3038851072, flags = 135266419, pgoff = 221184, inode = 20835 }
+vm_state.vm_map: 23329.179127545 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3038851072, end = 3039105024, flags = 134217845, pgoff = 0, inode = 18395 }
+vm_state.vm_map: 23329.179129484 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3039105024, end = 3039109120, flags = 135266419, pgoff = 249856, inode = 18395 }
+vm_state.vm_map: 23329.179131664 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3039109120, end = 3039494144, flags = 134217845, pgoff = 0, inode = 20862 }
+vm_state.vm_map: 23329.179133942 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3039494144, end = 3039498240, flags = 135266419, pgoff = 380928, inode = 20862 }
+vm_state.vm_map: 23329.179136251 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3039498240, end = 3039526912, flags = 134217845, pgoff = 0, inode = 1065218 }
+vm_state.vm_map: 23329.179138184 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3039526912, end = 3039531008, flags = 135266419, pgoff = 28672, inode = 1065218 }
+vm_state.vm_map: 23329.179140302 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3039531008, end = 3040985088, flags = 134217845, pgoff = 0, inode = 17110 }
+vm_state.vm_map: 23329.179142233 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3040985088, end = 3040997376, flags = 135266419, pgoff = 1454080, inode = 17110 }
+vm_state.vm_map: 23329.179144462 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3040997376, end = 3041390592, flags = 134217845, pgoff = 0, inode = 23653 }
+vm_state.vm_map: 23329.179146402 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3041390592, end = 3041398784, flags = 135266419, pgoff = 393216, inode = 23653 }
+vm_state.vm_map: 23329.179148643 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3041398784, end = 3041619968, flags = 134217845, pgoff = 0, inode = 20840 }
+vm_state.vm_map: 23329.179150582 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3041619968, end = 3041624064, flags = 135266419, pgoff = 221184, inode = 20840 }
+vm_state.vm_map: 23329.179152878 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3041624064, end = 3041828864, flags = 134217845, pgoff = 0, inode = 20867 }
+vm_state.vm_map: 23329.179154923 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3041828864, end = 3041832960, flags = 135266419, pgoff = 204800, inode = 20867 }
+vm_state.vm_map: 23329.179157386 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3041927168, end = 3043008512, flags = 134217845, pgoff = 0, inode = 20763 }
+vm_state.vm_map: 23329.179159467 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3043008512, end = 3043033088, flags = 135266419, pgoff = 1081344, inode = 20763 }
+vm_state.vm_map: 23329.179161597 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3043033088, end = 3043037184, flags = 1048691, pgoff = 3043033088, inode = 0 }
+vm_state.vm_map: 23329.179166556 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3043037184, end = 3043139584, flags = 134217845, pgoff = 0, inode = 20879 }
+vm_state.vm_map: 23329.179168946 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3043139584, end = 3043143680, flags = 135266419, pgoff = 98304, inode = 20879 }
+vm_state.vm_map: 23329.179171452 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3043143680, end = 3043328000, flags = 134217845, pgoff = 0, inode = 20878 }
+vm_state.vm_map: 23329.179173613 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3043328000, end = 3043332096, flags = 135266419, pgoff = 184320, inode = 20878 }
+vm_state.vm_map: 23329.179178700 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3043332096, end = 3043438592, flags = 134217845, pgoff = 0, inode = 1114215 }
+vm_state.vm_map: 23329.179180763 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3043438592, end = 3043442688, flags = 135266419, pgoff = 102400, inode = 1114215 }
+vm_state.vm_map: 23329.179183047 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3043442688, end = 3043483648, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.179185252 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3043483648, end = 3043487744, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.179187400 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3043487744, end = 3043491840, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.179189617 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3043491840, end = 3043528704, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.179191611 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3043528704, end = 3043532800, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.179193748 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3043532800, end = 3043536896, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.179195915 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3043536896, end = 3043614720, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.179198014 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3043614720, end = 3043618816, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.179200027 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3043618816, end = 3043622912, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.179202133 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3043622912, end = 3043631104, flags = 1048691, pgoff = 3043622912, inode = 0 }
+vm_state.vm_map: 23329.179204590 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3043631104, end = 3043655680, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.179206788 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3043655680, end = 3043659776, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.179208758 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3043659776, end = 3043663872, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.179210888 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3043663872, end = 3045699584, flags = 134217937, pgoff = 0, inode = 41242 }
+vm_state.vm_map: 23329.179213173 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3045699584, end = 3045924864, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.179215241 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3045924864, end = 3045928960, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.179217236 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3045928960, end = 3045933056, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.179219575 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3045933056, end = 3046133760, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 23329.179221743 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046133760, end = 3046137856, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 23329.179224003 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046137856, end = 3046162432, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 23329.179226095 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046162432, end = 3046166528, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 23329.179228281 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046166528, end = 3046174720, flags = 134217845, pgoff = 0, inode = 499720 }
+vm_state.vm_map: 23329.179230276 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046174720, end = 3046178816, flags = 135266419, pgoff = 4096, inode = 499720 }
+vm_state.vm_map: 23329.179232536 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046178816, end = 3046256640, flags = 134217845, pgoff = 0, inode = 50114 }
+vm_state.vm_map: 23329.179234536 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046256640, end = 3046260736, flags = 135266419, pgoff = 77824, inode = 50114 }
+vm_state.vm_map: 23329.179236802 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046260736, end = 3046264832, flags = 134217937, pgoff = 0, inode = 1196150 }
+vm_state.vm_map: 23329.179239253 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046264832, end = 3046289408, flags = 134217937, pgoff = 0, inode = 1196354 }
+vm_state.vm_map: 23329.179241564 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046289408, end = 3046293504, flags = 134217937, pgoff = 0, inode = 1196334 }
+vm_state.vm_map: 23329.179243705 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046293504, end = 3046297600, flags = 134217937, pgoff = 0, inode = 1196333 }
+vm_state.vm_map: 23329.179245879 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046297600, end = 3046301696, flags = 134217937, pgoff = 0, inode = 1196331 }
+vm_state.vm_map: 23329.179247990 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046301696, end = 3046305792, flags = 134217937, pgoff = 0, inode = 1196330 }
+vm_state.vm_map: 23329.179250219 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046305792, end = 3046313984, flags = 134217937, pgoff = 0, inode = 1196329 }
+vm_state.vm_map: 23329.179252343 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046313984, end = 3046346752, flags = 134217937, pgoff = 0, inode = 1196328 }
+vm_state.vm_map: 23329.179254579 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046346752, end = 3046359040, flags = 134217937, pgoff = 0, inode = 1196327 }
+vm_state.vm_map: 23329.179256709 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046359040, end = 3046367232, flags = 134217937, pgoff = 0, inode = 1196320 }
+vm_state.vm_map: 23329.179258963 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046367232, end = 3046371328, flags = 134217937, pgoff = 0, inode = 1196318 }
+vm_state.vm_map: 23329.179261142 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046371328, end = 3046375424, flags = 134217937, pgoff = 0, inode = 1196278 }
+vm_state.vm_map: 23329.179263538 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046375424, end = 3046379520, flags = 134217937, pgoff = 0, inode = 1196251 }
+vm_state.vm_map: 23329.179265656 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046379520, end = 3046408192, flags = 134217937, pgoff = 0, inode = 1196236 }
+vm_state.vm_map: 23329.179267897 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046408192, end = 3046420480, flags = 134217937, pgoff = 0, inode = 1196234 }
+vm_state.vm_map: 23329.179270052 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046420480, end = 3046424576, flags = 134217937, pgoff = 0, inode = 1196201 }
+vm_state.vm_map: 23329.179272201 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046424576, end = 3046432768, flags = 134217937, pgoff = 0, inode = 1196170 }
+vm_state.vm_map: 23329.179274992 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046432768, end = 3046436864, flags = 134217937, pgoff = 0, inode = 1196157 }
+vm_state.vm_map: 23329.179277171 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046436864, end = 3046440960, flags = 134217937, pgoff = 0, inode = 1196171 }
+vm_state.vm_map: 23329.179279413 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046440960, end = 3046453248, flags = 134217937, pgoff = 0, inode = 1196172 }
+vm_state.vm_map: 23329.179281617 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046453248, end = 3046461440, flags = 134217937, pgoff = 0, inode = 1196173 }
+vm_state.vm_map: 23329.179283741 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046461440, end = 3046494208, flags = 134217937, pgoff = 0, inode = 1196352 }
+vm_state.vm_map: 23329.179286112 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046494208, end = 3046514688, flags = 134217937, pgoff = 0, inode = 1196196 }
+vm_state.vm_map: 23329.179288267 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046514688, end = 3046522880, flags = 134217937, pgoff = 0, inode = 1196343 }
+vm_state.vm_map: 23329.179290496 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046522880, end = 3046551552, flags = 134217937, pgoff = 0, inode = 1196314 }
+vm_state.vm_map: 23329.179292811 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046551552, end = 3046596608, flags = 134217937, pgoff = 0, inode = 1196147 }
+vm_state.vm_map: 23329.179295096 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046596608, end = 3046653952, flags = 134217937, pgoff = 0, inode = 1196094 }
+vm_state.vm_map: 23329.179297226 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046653952, end = 3046666240, flags = 134217937, pgoff = 0, inode = 1196342 }
+vm_state.vm_map: 23329.179299449 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046666240, end = 3046723584, flags = 134217937, pgoff = 0, inode = 1196355 }
+vm_state.vm_map: 23329.179301567 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3046723584, end = 3048054784, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.179303629 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3048054784, end = 3048067072, flags = 1048691, pgoff = 3048054784, inode = 0 }
+vm_state.vm_map: 23329.179305789 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3048067072, end = 3048083456, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.179307877 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3048083456, end = 3048087552, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.179310372 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3048087552, end = 3048103936, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 23329.179312470 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3048103936, end = 3048108032, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 23329.179314631 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3048108032, end = 3048140800, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 23329.179316706 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3048140800, end = 3048144896, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 23329.179318694 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3048144896, end = 3048148992, flags = 1048691, pgoff = 3048144896, inode = 0 }
+vm_state.vm_map: 23329.179320997 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3048148992, end = 3048165376, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 23329.179323004 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3048165376, end = 3048169472, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 23329.179325233 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3048169472, end = 3048501248, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 23329.179327265 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3048501248, end = 3048509440, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 23329.179329432 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3048509440, end = 3048607744, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.179331519 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3048607744, end = 3048611840, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.179333816 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3048611840, end = 3048759296, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.179335841 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3048759296, end = 3048767488, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.179338107 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3048767488, end = 3048779776, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 23329.179340145 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3048779776, end = 3048783872, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 23329.179342158 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3048783872, end = 3048787968, flags = 1048691, pgoff = 3048783872, inode = 0 }
+vm_state.vm_map: 23329.179344769 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3048787968, end = 3048796160, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.179346943 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3048796160, end = 3048800256, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.179349104 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3048800256, end = 3049119744, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 23329.179351191 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3049119744, end = 3049136128, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 23329.179353500 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3049136128, end = 3049328640, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.179355532 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3049328640, end = 3049332736, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.179357847 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3049332736, end = 3052929024, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 23329.179359817 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3052929024, end = 3053027328, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 23329.179361928 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3053027328, end = 3053031424, flags = 1048691, pgoff = 3053027328, inode = 0 }
+vm_state.vm_map: 23329.179364083 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3053031424, end = 3053318144, flags = 134217845, pgoff = 0, inode = 20877 }
+vm_state.vm_map: 23329.179366170 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3053318144, end = 3053326336, flags = 135266419, pgoff = 282624, inode = 20877 }
+vm_state.vm_map: 23329.179368196 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3053326336, end = 3053330432, flags = 1048691, pgoff = 3053326336, inode = 0 }
+vm_state.vm_map: 23329.179370455 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3053330432, end = 3054264320, flags = 134217845, pgoff = 0, inode = 20876 }
+vm_state.vm_map: 23329.179372462 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3054264320, end = 3054276608, flags = 135266419, pgoff = 933888, inode = 20876 }
+vm_state.vm_map: 23329.179374716 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3054276608, end = 3054338048, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 23329.179376686 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3054338048, end = 3054342144, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 23329.179379440 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3054342144, end = 3055472640, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 23329.179381427 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3055472640, end = 3055489024, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 23329.179383668 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3055489024, end = 3055759360, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 23329.179385596 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3055759360, end = 3055767552, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 23329.179387930 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3055767552, end = 3056918528, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.179389960 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3056918528, end = 3056934912, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.179392041 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3056934912, end = 3056939008, flags = 1048691, pgoff = 3056934912, inode = 0 }
+vm_state.vm_map: 23329.179394190 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3056939008, end = 3056992256, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 23329.179396289 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3056992256, end = 3056996352, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 23329.179398475 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3056996352, end = 3057180672, flags = 134217845, pgoff = 0, inode = 22064 }
+vm_state.vm_map: 23329.179400469 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3057180672, end = 3057188864, flags = 135266419, pgoff = 180224, inode = 22064 }
+vm_state.vm_map: 23329.179402735 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3057188864, end = 3057221632, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 23329.179404785 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3057221632, end = 3057225728, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 23329.179407014 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3057225728, end = 3057311744, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 23329.179409095 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3057311744, end = 3057315840, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 23329.179411102 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3057315840, end = 3057324032, flags = 1048691, pgoff = 3057315840, inode = 0 }
+vm_state.vm_map: 23329.179413652 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3057324032, end = 3057352704, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 23329.179415640 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3057352704, end = 3057356800, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 23329.179436059 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3057356800, end = 3057598464, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.179438319 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3057598464, end = 3057602560, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.179440394 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3057602560, end = 3057606656, flags = 1048691, pgoff = 3057602560, inode = 0 }
+vm_state.vm_map: 23329.179442808 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3057606656, end = 3058077696, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 23329.179444846 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3058077696, end = 3058094080, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 23329.179447203 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3058094080, end = 3058237440, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 23329.179449272 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3058237440, end = 3058241536, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 23329.179451822 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3058241536, end = 3058327552, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 23329.179453867 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3058327552, end = 3058331648, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 23329.179456090 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3058331648, end = 3058446336, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.179458132 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3058446336, end = 3058450432, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.179460398 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3058450432, end = 3058597888, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.179462467 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3058597888, end = 3058601984, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.179464770 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3058601984, end = 3058606080, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.179467246 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3058606080, end = 3058610176, flags = 1048691, pgoff = 3058606080, inode = 0 }
+vm_state.vm_map: 23329.179469519 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3058610176, end = 3058618368, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.179471568 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3058618368, end = 3058622464, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.179473630 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3058622464, end = 3058626560, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.179475989 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3058626560, end = 3058712576, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.179478027 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3058712576, end = 3058716672, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.179480274 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3058716672, end = 3058720768, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.179482281 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3058720768, end = 3058728960, flags = 1048691, pgoff = 3058720768, inode = 0 }
+vm_state.vm_map: 23329.179484578 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3058728960, end = 3059466240, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.179486616 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3059466240, end = 3059470336, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.179489017 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3059470336, end = 3059499008, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.179491111 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3059499008, end = 3059503104, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.179493303 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3059503104, end = 3059507200, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.179495649 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3059507200, end = 3059523584, flags = 134217845, pgoff = 0, inode = 19625 }
+vm_state.vm_map: 23329.179497761 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3059523584, end = 3059527680, flags = 135266419, pgoff = 12288, inode = 19625 }
+vm_state.vm_map: 23329.179499730 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3059527680, end = 3059531776, flags = 1048691, pgoff = 3059527680, inode = 0 }
+vm_state.vm_map: 23329.179502466 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3059531776, end = 3059609600, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.179504491 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3059609600, end = 3059613696, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.179506905 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3059613696, end = 3060928512, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.179508949 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3060928512, end = 3060936704, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.179511048 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3060936704, end = 3060940800, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.179513092 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3060940800, end = 3060953088, flags = 1048691, pgoff = 3060940800, inode = 0 }
+vm_state.vm_map: 23329.179515457 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3060953088, end = 3061891072, flags = 134217845, pgoff = 0, inode = 16400 }
+vm_state.vm_map: 23329.179517445 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3061891072, end = 3061907456, flags = 135266417, pgoff = 937984, inode = 16400 }
+vm_state.vm_map: 23329.179519421 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3061907456, end = 3061911552, flags = 135266419, pgoff = 954368, inode = 16400 }
+vm_state.vm_map: 23329.179521606 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3061911552, end = 3061940224, flags = 1048691, pgoff = 3061911552, inode = 0 }
+vm_state.vm_map: 23329.179523811 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3061940224, end = 3062353920, flags = 134217845, pgoff = 0, inode = 1065120 }
+vm_state.vm_map: 23329.179525867 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3062353920, end = 3062362112, flags = 135266419, pgoff = 409600, inode = 1065120 }
+vm_state.vm_map: 23329.179528109 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3062362112, end = 3064664064, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 23329.179530165 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3064664064, end = 3064709120, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 23329.179532263 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3064709120, end = 3065176064, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 23329.179534276 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3065176064, end = 3065184256, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 23329.179536733 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3065184256, end = 3065188352, flags = 1048691, pgoff = 3065184256, inode = 0 }
+vm_state.vm_map: 23329.179538932 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3065188352, end = 3075227648, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 23329.179540901 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3075227648, end = 3075387392, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 23329.179543069 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3075387392, end = 3075395584, flags = 1048691, pgoff = 3075387392, inode = 0 }
+vm_state.vm_map: 23329.179545298 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3075395584, end = 3077705728, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 23329.179547323 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3077705728, end = 3077734400, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 23329.179549422 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3077734400, end = 3077738496, flags = 1048691, pgoff = 3077734400, inode = 0 }
+vm_state.vm_map: 23329.179551620 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3077738496, end = 3077771264, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 23329.179553726 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3077771264, end = 3077775360, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 23329.179556146 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3077775360, end = 3077783552, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 23329.179558128 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3077783552, end = 3077787648, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 23329.179560246 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3077787648, end = 3077795840, flags = 134217845, pgoff = 0, inode = 1450327 }
+vm_state.vm_map: 23329.179562173 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3077795840, end = 3077799936, flags = 135266417, pgoff = 4096, inode = 1450327 }
+vm_state.vm_map: 23329.179564235 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3077799936, end = 3077804032, flags = 135266419, pgoff = 8192, inode = 1450327 }
+vm_state.vm_map: 23329.179566310 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3077804032, end = 3077832704, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.179568242 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3077832704, end = 3077840896, flags = 1048691, pgoff = 3077832704, inode = 0 }
+vm_state.vm_map: 23329.179570514 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3077840896, end = 3077844992, flags = 67371125, pgoff = 3077840896, inode = 0 }
+vm_state.vm_map: 23329.179572737 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3077844992, end = 3077959680, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.179574695 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3077959680, end = 3077963776, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.179576646 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3077963776, end = 3077967872, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.179578708 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2255, start = 3218862080, end = 3218948096, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.179581567 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 134512640, end = 134533120, flags = 134223989, pgoff = 0, inode = 1352628 }
+vm_state.vm_map: 23329.179583543 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 134533120, end = 134537216, flags = 135272563, pgoff = 16384, inode = 1352628 }
+vm_state.vm_map: 23329.179585636 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 156323840, end = 157405184, flags = 1048691, pgoff = 156323840, inode = 0 }
+vm_state.vm_map: 23329.179587970 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3044220928, end = 3044417536, flags = 134217845, pgoff = 0, inode = 1114220 }
+vm_state.vm_map: 23329.179590032 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3044417536, end = 3044421632, flags = 135266419, pgoff = 196608, inode = 1114220 }
+vm_state.vm_map: 23329.179592217 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3044421632, end = 3044462592, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.179594163 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3044462592, end = 3044466688, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.179596082 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3044466688, end = 3044470784, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.179598355 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3044470784, end = 3044507648, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.179600282 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3044507648, end = 3044511744, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.179602202 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3044511744, end = 3044515840, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.179604714 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3044515840, end = 3044593664, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.179606875 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3044593664, end = 3044597760, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.179608808 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3044597760, end = 3044601856, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.179610779 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3044601856, end = 3044610048, flags = 1048691, pgoff = 3044601856, inode = 0 }
+vm_state.vm_map: 23329.179612852 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3044610048, end = 3044634624, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.179614970 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3044634624, end = 3044638720, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.179616946 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3044638720, end = 3044642816, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.179619027 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3044642816, end = 3046678528, flags = 134217937, pgoff = 0, inode = 41242 }
+vm_state.vm_map: 23329.179621200 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3046678528, end = 3046903808, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.179623399 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3046903808, end = 3046907904, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.179625331 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3046907904, end = 3046912000, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.179627468 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3046912000, end = 3047112704, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 23329.179629388 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047112704, end = 3047116800, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 23329.179631710 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047116800, end = 3047141376, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 23329.179633766 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047141376, end = 3047145472, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 23329.179635896 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047239680, end = 3047243776, flags = 134217937, pgoff = 0, inode = 1196150 }
+vm_state.vm_map: 23329.179638397 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047243776, end = 3047268352, flags = 134217937, pgoff = 0, inode = 1196354 }
+vm_state.vm_map: 23329.179640613 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047268352, end = 3047272448, flags = 134217937, pgoff = 0, inode = 1196334 }
+vm_state.vm_map: 23329.179642731 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047272448, end = 3047276544, flags = 134217937, pgoff = 0, inode = 1196333 }
+vm_state.vm_map: 23329.179644874 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047276544, end = 3047280640, flags = 134217937, pgoff = 0, inode = 1196331 }
+vm_state.vm_map: 23329.179647053 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047280640, end = 3047284736, flags = 134217937, pgoff = 0, inode = 1196330 }
+vm_state.vm_map: 23329.179649363 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047284736, end = 3047292928, flags = 134217937, pgoff = 0, inode = 1196329 }
+vm_state.vm_map: 23329.179651573 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047292928, end = 3047325696, flags = 134217937, pgoff = 0, inode = 1196328 }
+vm_state.vm_map: 23329.179653685 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047325696, end = 3047337984, flags = 134217937, pgoff = 0, inode = 1196327 }
+vm_state.vm_map: 23329.179655994 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047337984, end = 3047346176, flags = 134217937, pgoff = 0, inode = 1196320 }
+vm_state.vm_map: 23329.179658211 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047346176, end = 3047350272, flags = 134217937, pgoff = 0, inode = 1196318 }
+vm_state.vm_map: 23329.179660594 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047350272, end = 3047354368, flags = 134217937, pgoff = 0, inode = 1196278 }
+vm_state.vm_map: 23329.179662959 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047354368, end = 3047358464, flags = 134217937, pgoff = 0, inode = 1196251 }
+vm_state.vm_map: 23329.179665200 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047358464, end = 3047387136, flags = 134217937, pgoff = 0, inode = 1196236 }
+vm_state.vm_map: 23329.179667399 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047387136, end = 3047399424, flags = 134217937, pgoff = 0, inode = 1196234 }
+vm_state.vm_map: 23329.179669658 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047399424, end = 3047403520, flags = 134217937, pgoff = 0, inode = 1196201 }
+vm_state.vm_map: 23329.179671869 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047403520, end = 3047411712, flags = 134217937, pgoff = 0, inode = 1196170 }
+vm_state.vm_map: 23329.179674481 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047411712, end = 3047415808, flags = 134217937, pgoff = 0, inode = 1196157 }
+vm_state.vm_map: 23329.179676648 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047415808, end = 3047419904, flags = 134217937, pgoff = 0, inode = 1196171 }
+vm_state.vm_map: 23329.179678962 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047419904, end = 3047432192, flags = 134217937, pgoff = 0, inode = 1196172 }
+vm_state.vm_map: 23329.179681142 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047432192, end = 3047440384, flags = 134217937, pgoff = 0, inode = 1196173 }
+vm_state.vm_map: 23329.179683341 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047440384, end = 3047473152, flags = 134217937, pgoff = 0, inode = 1196352 }
+vm_state.vm_map: 23329.179685421 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047473152, end = 3047493632, flags = 134217937, pgoff = 0, inode = 1196196 }
+vm_state.vm_map: 23329.179687744 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047493632, end = 3047501824, flags = 134217937, pgoff = 0, inode = 1196343 }
+vm_state.vm_map: 23329.179689848 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047501824, end = 3047530496, flags = 134217937, pgoff = 0, inode = 1196314 }
+vm_state.vm_map: 23329.179692065 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047530496, end = 3047575552, flags = 134217937, pgoff = 0, inode = 1196147 }
+vm_state.vm_map: 23329.179694189 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047575552, end = 3047632896, flags = 134217937, pgoff = 0, inode = 1196094 }
+vm_state.vm_map: 23329.179696399 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047632896, end = 3047645184, flags = 134217937, pgoff = 0, inode = 1196342 }
+vm_state.vm_map: 23329.179698554 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047645184, end = 3047702528, flags = 134217937, pgoff = 0, inode = 1196355 }
+vm_state.vm_map: 23329.179700888 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3047702528, end = 3049033728, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.179703056 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3049033728, end = 3049046016, flags = 1048691, pgoff = 3049033728, inode = 0 }
+vm_state.vm_map: 23329.179705451 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3049046016, end = 3049062400, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.179707520 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3049062400, end = 3049066496, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.179710051 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3049066496, end = 3049082880, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 23329.179712268 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3049082880, end = 3049086976, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 23329.179714442 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3049086976, end = 3049119744, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 23329.179716442 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3049119744, end = 3049123840, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 23329.179718523 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3049123840, end = 3049127936, flags = 1048691, pgoff = 3049123840, inode = 0 }
+vm_state.vm_map: 23329.179720727 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3049127936, end = 3049144320, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 23329.179722740 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3049144320, end = 3049148416, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 23329.179724994 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3049148416, end = 3049480192, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 23329.179727099 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3049480192, end = 3049488384, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 23329.179729440 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3049488384, end = 3049586688, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.179731446 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3049586688, end = 3049590784, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.179733774 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3049590784, end = 3049738240, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.179735725 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3049738240, end = 3049746432, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.179738028 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3049746432, end = 3049758720, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 23329.179739961 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3049758720, end = 3049762816, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 23329.179741974 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3049762816, end = 3049766912, flags = 1048691, pgoff = 3049762816, inode = 0 }
+vm_state.vm_map: 23329.179744517 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3049766912, end = 3049775104, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.179746690 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3049775104, end = 3049779200, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.179749012 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3049779200, end = 3050098688, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 23329.179750946 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3050098688, end = 3050115072, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 23329.179753050 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3050115072, end = 3050307584, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.179755132 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3050307584, end = 3050311680, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.179757218 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3050311680, end = 3053907968, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 23329.179759324 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3053907968, end = 3054006272, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 23329.179761373 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3054006272, end = 3054010368, flags = 1048691, pgoff = 3054006272, inode = 0 }
+vm_state.vm_map: 23329.179763590 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3054010368, end = 3054297088, flags = 134217845, pgoff = 0, inode = 20877 }
+vm_state.vm_map: 23329.179765547 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3054297088, end = 3054305280, flags = 135266419, pgoff = 282624, inode = 20877 }
+vm_state.vm_map: 23329.179767641 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3054305280, end = 3054309376, flags = 1048691, pgoff = 3054305280, inode = 0 }
+vm_state.vm_map: 23329.179769839 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3054309376, end = 3055243264, flags = 134217845, pgoff = 0, inode = 20876 }
+vm_state.vm_map: 23329.179771821 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3055243264, end = 3055255552, flags = 135266419, pgoff = 933888, inode = 20876 }
+vm_state.vm_map: 23329.179774173 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3055255552, end = 3055316992, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 23329.179776192 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3055316992, end = 3055321088, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 23329.179778810 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3055321088, end = 3056451584, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 23329.179780768 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3056451584, end = 3056467968, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 23329.179783145 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3056467968, end = 3056738304, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 23329.179785102 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3056738304, end = 3056746496, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 23329.179787276 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3056746496, end = 3057897472, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.179789239 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3057897472, end = 3057913856, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.179791301 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3057913856, end = 3057917952, flags = 1048691, pgoff = 3057913856, inode = 0 }
+vm_state.vm_map: 23329.179793376 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3057917952, end = 3057971200, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 23329.179795303 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3057971200, end = 3057975296, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 23329.179797408 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3057975296, end = 3058159616, flags = 134217845, pgoff = 0, inode = 22064 }
+vm_state.vm_map: 23329.179799470 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3058159616, end = 3058167808, flags = 135266419, pgoff = 180224, inode = 22064 }
+vm_state.vm_map: 23329.179801594 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3058167808, end = 3058200576, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 23329.179803527 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3058200576, end = 3058204672, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 23329.179805620 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3058204672, end = 3058290688, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 23329.179808053 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3058290688, end = 3058294784, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 23329.179810165 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3058294784, end = 3058302976, flags = 1048691, pgoff = 3058294784, inode = 0 }
+vm_state.vm_map: 23329.179812733 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3058302976, end = 3058331648, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 23329.179814759 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3058331648, end = 3058335744, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 23329.179816994 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3058335744, end = 3058577408, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.179819030 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3058577408, end = 3058581504, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.179821063 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3058581504, end = 3058585600, flags = 1048691, pgoff = 3058581504, inode = 0 }
+vm_state.vm_map: 23329.179823360 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3058585600, end = 3059056640, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 23329.179825299 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3059056640, end = 3059073024, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 23329.179827619 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3059073024, end = 3059216384, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 23329.179829564 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3059216384, end = 3059220480, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 23329.179831633 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3059220480, end = 3059306496, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 23329.179833684 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3059306496, end = 3059310592, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 23329.179836047 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3059310592, end = 3059425280, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.179837999 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3059425280, end = 3059429376, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.179840093 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3059429376, end = 3059576832, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.179842211 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3059576832, end = 3059580928, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.179844315 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3059580928, end = 3059585024, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.179846606 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3059585024, end = 3059589120, flags = 1048691, pgoff = 3059585024, inode = 0 }
+vm_state.vm_map: 23329.179848687 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3059589120, end = 3059597312, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.179850761 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3059597312, end = 3059601408, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.179852706 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3059601408, end = 3059605504, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.179854824 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3059605504, end = 3059691520, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.179856837 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3059691520, end = 3059695616, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.179859029 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3059695616, end = 3059699712, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.179860974 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3059699712, end = 3059707904, flags = 1048691, pgoff = 3059699712, inode = 0 }
+vm_state.vm_map: 23329.179863092 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3059707904, end = 3060445184, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.179865031 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3060445184, end = 3060449280, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.179867254 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3060449280, end = 3060477952, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.179869199 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3060477952, end = 3060482048, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.179871150 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3060482048, end = 3060486144, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.179873280 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3060486144, end = 3060502528, flags = 134217845, pgoff = 0, inode = 19625 }
+vm_state.vm_map: 23329.179875361 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3060502528, end = 3060506624, flags = 135266419, pgoff = 12288, inode = 19625 }
+vm_state.vm_map: 23329.179877306 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3060506624, end = 3060510720, flags = 1048691, pgoff = 3060506624, inode = 0 }
+vm_state.vm_map: 23329.179879770 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3060510720, end = 3060588544, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.179881727 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3060588544, end = 3060592640, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.179883931 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3060592640, end = 3061907456, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.179886185 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061907456, end = 3061915648, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.179888142 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061915648, end = 3061919744, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.179890284 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061919744, end = 3061932032, flags = 1048691, pgoff = 3061919744, inode = 0 }
+vm_state.vm_map: 23329.179892507 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3061932032, end = 3062870016, flags = 134217845, pgoff = 0, inode = 16400 }
+vm_state.vm_map: 23329.179894619 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3062870016, end = 3062886400, flags = 135266417, pgoff = 937984, inode = 16400 }
+vm_state.vm_map: 23329.179896601 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3062886400, end = 3062890496, flags = 135266419, pgoff = 954368, inode = 16400 }
+vm_state.vm_map: 23329.179898545 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3062890496, end = 3062919168, flags = 1048691, pgoff = 3062890496, inode = 0 }
+vm_state.vm_map: 23329.179900640 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3062919168, end = 3063332864, flags = 134217845, pgoff = 0, inode = 1065120 }
+vm_state.vm_map: 23329.179902714 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3063332864, end = 3063341056, flags = 135266419, pgoff = 409600, inode = 1065120 }
+vm_state.vm_map: 23329.179904862 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3063341056, end = 3065643008, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 23329.179906783 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3065643008, end = 3065688064, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 23329.179908875 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3065688064, end = 3066155008, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 23329.179910925 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066155008, end = 3066163200, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 23329.179913248 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066163200, end = 3066167296, flags = 1048691, pgoff = 3066163200, inode = 0 }
+vm_state.vm_map: 23329.179915482 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3066167296, end = 3076206592, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 23329.179917501 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3076206592, end = 3076366336, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 23329.179919632 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3076366336, end = 3076374528, flags = 1048691, pgoff = 3076366336, inode = 0 }
+vm_state.vm_map: 23329.179921879 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3076374528, end = 3078684672, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 23329.179923948 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3078684672, end = 3078713344, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 23329.179926028 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3078713344, end = 3078717440, flags = 1048691, pgoff = 3078713344, inode = 0 }
+vm_state.vm_map: 23329.179928294 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3078717440, end = 3078750208, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 23329.179930400 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3078750208, end = 3078754304, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 23329.179932536 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3078754304, end = 3078762496, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 23329.179934636 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3078762496, end = 3078766592, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 23329.179936908 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3078766592, end = 3078774784, flags = 134217845, pgoff = 0, inode = 1450327 }
+vm_state.vm_map: 23329.179938995 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3078774784, end = 3078778880, flags = 135266417, pgoff = 4096, inode = 1450327 }
+vm_state.vm_map: 23329.179941144 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3078778880, end = 3078782976, flags = 135266419, pgoff = 8192, inode = 1450327 }
+vm_state.vm_map: 23329.179943576 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3078782976, end = 3078811648, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.179945719 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3078811648, end = 3078819840, flags = 1048691, pgoff = 3078811648, inode = 0 }
+vm_state.vm_map: 23329.179948158 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3078819840, end = 3078823936, flags = 67371125, pgoff = 3078819840, inode = 0 }
+vm_state.vm_map: 23329.179950350 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3078823936, end = 3078938624, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.179952369 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3078938624, end = 3078942720, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.179954475 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3078942720, end = 3078946816, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.179956629 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2259, start = 3217076224, end = 3217162240, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.179959297 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 134512640, end = 134533120, flags = 134223989, pgoff = 0, inode = 1352628 }
+vm_state.vm_map: 23329.179961390 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 134533120, end = 134537216, flags = 135272563, pgoff = 16384, inode = 1352628 }
+vm_state.vm_map: 23329.179963489 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 161394688, end = 162488320, flags = 1048691, pgoff = 161394688, inode = 0 }
+vm_state.vm_map: 23329.179965946 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3038744576, end = 3040002048, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 23329.179967966 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3040002048, end = 3040022528, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 23329.179970053 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3040022528, end = 3040026624, flags = 1048691, pgoff = 3040022528, inode = 0 }
+vm_state.vm_map: 23329.179972338 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3040026624, end = 3040264192, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 23329.179974283 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3040264192, end = 3040268288, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 23329.179976418 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3040268288, end = 3040284672, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 23329.179978511 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3040284672, end = 3040288768, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 23329.179980920 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3040288768, end = 3040313344, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 23329.179983191 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3040313344, end = 3040317440, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 23329.179985396 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3040317440, end = 3040350208, flags = 134217845, pgoff = 0, inode = 21180 }
+vm_state.vm_map: 23329.179987427 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3040350208, end = 3040354304, flags = 135266419, pgoff = 28672, inode = 21180 }
+vm_state.vm_map: 23329.179989922 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3040354304, end = 3040784384, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 23329.179991941 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3040784384, end = 3040813056, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 23329.179994059 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3040813056, end = 3040817152, flags = 1048691, pgoff = 3040813056, inode = 0 }
+vm_state.vm_map: 23329.179996288 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3040817152, end = 3041259520, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 23329.179998325 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3041259520, end = 3041267712, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 23329.180000585 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3041267712, end = 3043823616, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 23329.180002678 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3043823616, end = 3043872768, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 23329.180004679 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3043872768, end = 3043876864, flags = 1048691, pgoff = 3043872768, inode = 0 }
+vm_state.vm_map: 23329.180007186 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3043971072, end = 3044012032, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.180009186 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3044012032, end = 3044016128, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.180011273 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3044016128, end = 3044020224, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.180013428 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3044020224, end = 3044057088, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.180015614 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3044057088, end = 3044061184, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.180017979 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3044061184, end = 3044065280, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.180020294 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3044065280, end = 3044143104, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.180022455 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3044143104, end = 3044147200, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.180024475 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3044147200, end = 3044151296, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.180026555 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3044151296, end = 3044159488, flags = 1048691, pgoff = 3044151296, inode = 0 }
+vm_state.vm_map: 23329.180028636 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3044159488, end = 3044184064, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.180030816 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3044184064, end = 3044188160, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.180032835 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3044188160, end = 3044192256, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.180035200 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3044192256, end = 3046227968, flags = 134217937, pgoff = 0, inode = 41242 }
+vm_state.vm_map: 23329.180037342 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046227968, end = 3046453248, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.180039466 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046453248, end = 3046457344, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.180041491 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046457344, end = 3046461440, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.180043775 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046461440, end = 3046662144, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 23329.180045936 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046662144, end = 3046666240, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 23329.180048221 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046666240, end = 3046690816, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 23329.180050339 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046690816, end = 3046694912, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 23329.180053173 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046711296, end = 3046785024, flags = 134217845, pgoff = 0, inode = 1114266 }
+vm_state.vm_map: 23329.180077093 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046785024, end = 3046789120, flags = 135266419, pgoff = 69632, inode = 1114266 }
+vm_state.vm_map: 23329.180079421 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046789120, end = 3046793216, flags = 134217937, pgoff = 0, inode = 1196150 }
+vm_state.vm_map: 23329.180081681 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046793216, end = 3046817792, flags = 134217937, pgoff = 0, inode = 1196354 }
+vm_state.vm_map: 23329.180083928 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046817792, end = 3046821888, flags = 134217937, pgoff = 0, inode = 1196334 }
+vm_state.vm_map: 23329.180086330 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046821888, end = 3046825984, flags = 134217937, pgoff = 0, inode = 1196333 }
+vm_state.vm_map: 23329.180088522 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046825984, end = 3046830080, flags = 134217937, pgoff = 0, inode = 1196331 }
+vm_state.vm_map: 23329.180090764 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046830080, end = 3046834176, flags = 134217937, pgoff = 0, inode = 1196330 }
+vm_state.vm_map: 23329.180092962 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046834176, end = 3046842368, flags = 134217937, pgoff = 0, inode = 1196329 }
+vm_state.vm_map: 23329.180095215 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046842368, end = 3046875136, flags = 134217937, pgoff = 0, inode = 1196328 }
+vm_state.vm_map: 23329.180097302 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046875136, end = 3046887424, flags = 134217937, pgoff = 0, inode = 1196327 }
+vm_state.vm_map: 23329.180099464 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046887424, end = 3046895616, flags = 134217937, pgoff = 0, inode = 1196320 }
+vm_state.vm_map: 23329.180101686 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046895616, end = 3046899712, flags = 134217937, pgoff = 0, inode = 1196318 }
+vm_state.vm_map: 23329.180104088 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046899712, end = 3046903808, flags = 134217937, pgoff = 0, inode = 1196278 }
+vm_state.vm_map: 23329.180106256 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046903808, end = 3046907904, flags = 134217937, pgoff = 0, inode = 1196251 }
+vm_state.vm_map: 23329.180108546 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046907904, end = 3046936576, flags = 134217937, pgoff = 0, inode = 1196236 }
+vm_state.vm_map: 23329.180111109 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046936576, end = 3046948864, flags = 134217937, pgoff = 0, inode = 1196234 }
+vm_state.vm_map: 23329.180113276 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046948864, end = 3046952960, flags = 134217937, pgoff = 0, inode = 1196201 }
+vm_state.vm_map: 23329.180115505 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046952960, end = 3046961152, flags = 134217937, pgoff = 0, inode = 1196170 }
+vm_state.vm_map: 23329.180117634 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046961152, end = 3046965248, flags = 134217937, pgoff = 0, inode = 1196157 }
+vm_state.vm_map: 23329.180119852 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046965248, end = 3046969344, flags = 134217937, pgoff = 0, inode = 1196171 }
+vm_state.vm_map: 23329.180122037 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046969344, end = 3046981632, flags = 134217937, pgoff = 0, inode = 1196172 }
+vm_state.vm_map: 23329.180124284 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046981632, end = 3046989824, flags = 134217937, pgoff = 0, inode = 1196173 }
+vm_state.vm_map: 23329.180126495 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3046989824, end = 3047022592, flags = 134217937, pgoff = 0, inode = 1196352 }
+vm_state.vm_map: 23329.180128724 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3047022592, end = 3047043072, flags = 134217937, pgoff = 0, inode = 1196196 }
+vm_state.vm_map: 23329.180131015 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3047043072, end = 3047051264, flags = 134217937, pgoff = 0, inode = 1196343 }
+vm_state.vm_map: 23329.180133214 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3047051264, end = 3047079936, flags = 134217937, pgoff = 0, inode = 1196314 }
+vm_state.vm_map: 23329.180135392 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3047079936, end = 3047124992, flags = 134217937, pgoff = 0, inode = 1196147 }
+vm_state.vm_map: 23329.180137628 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3047124992, end = 3047182336, flags = 134217937, pgoff = 0, inode = 1196094 }
+vm_state.vm_map: 23329.180139764 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3047182336, end = 3047194624, flags = 134217937, pgoff = 0, inode = 1196342 }
+vm_state.vm_map: 23329.180141999 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3047194624, end = 3047251968, flags = 134217937, pgoff = 0, inode = 1196355 }
+vm_state.vm_map: 23329.180144166 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3047251968, end = 3048583168, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.180146803 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3048583168, end = 3048595456, flags = 1048691, pgoff = 3048583168, inode = 0 }
+vm_state.vm_map: 23329.180149112 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3048595456, end = 3048611840, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.180151168 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3048611840, end = 3048615936, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.180153428 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3048615936, end = 3048632320, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 23329.180155521 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3048632320, end = 3048636416, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 23329.180157720 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3048636416, end = 3048669184, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 23329.180159683 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3048669184, end = 3048673280, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 23329.180161696 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3048673280, end = 3048677376, flags = 1048691, pgoff = 3048673280, inode = 0 }
+vm_state.vm_map: 23329.180163919 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3048677376, end = 3048693760, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 23329.180165956 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3048693760, end = 3048697856, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 23329.180168222 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3048697856, end = 3049029632, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 23329.180170242 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3049029632, end = 3049037824, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 23329.180172495 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3049037824, end = 3049136128, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.180174453 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3049136128, end = 3049140224, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.180176552 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3049140224, end = 3049287680, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.180178725 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3049287680, end = 3049295872, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.180181208 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3049295872, end = 3049308160, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 23329.180183208 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3049308160, end = 3049312256, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 23329.180185450 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3049312256, end = 3049316352, flags = 1048691, pgoff = 3049312256, inode = 0 }
+vm_state.vm_map: 23329.180187623 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3049316352, end = 3049324544, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.180189728 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3049324544, end = 3049328640, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.180191876 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3049328640, end = 3049648128, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 23329.180194050 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3049648128, end = 3049664512, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 23329.180196249 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3049664512, end = 3049857024, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.180198180 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3049857024, end = 3049861120, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.180200336 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3049861120, end = 3053457408, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 23329.180202399 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3053457408, end = 3053555712, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 23329.180204356 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3053555712, end = 3053559808, flags = 1048691, pgoff = 3053555712, inode = 0 }
+vm_state.vm_map: 23329.180206491 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3053559808, end = 3053846528, flags = 134217845, pgoff = 0, inode = 20877 }
+vm_state.vm_map: 23329.180208473 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3053846528, end = 3053854720, flags = 135266419, pgoff = 282624, inode = 20877 }
+vm_state.vm_map: 23329.180210733 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3053854720, end = 3053858816, flags = 1048691, pgoff = 3053854720, inode = 0 }
+vm_state.vm_map: 23329.180212950 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3053858816, end = 3054792704, flags = 134217845, pgoff = 0, inode = 20876 }
+vm_state.vm_map: 23329.180215395 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3054792704, end = 3054804992, flags = 135266419, pgoff = 933888, inode = 20876 }
+vm_state.vm_map: 23329.180217674 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3054804992, end = 3054866432, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 23329.180219884 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3054866432, end = 3054870528, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 23329.180222181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3054870528, end = 3056001024, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 23329.180224169 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3056001024, end = 3056017408, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 23329.180226503 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3056017408, end = 3056287744, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 23329.180228677 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3056287744, end = 3056295936, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 23329.180230949 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3056295936, end = 3057446912, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.180233147 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3057446912, end = 3057463296, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.180235141 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3057463296, end = 3057467392, flags = 1048691, pgoff = 3057463296, inode = 0 }
+vm_state.vm_map: 23329.180237574 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3057467392, end = 3057520640, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 23329.180239599 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3057520640, end = 3057524736, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 23329.180241915 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3057524736, end = 3057709056, flags = 134217845, pgoff = 0, inode = 22064 }
+vm_state.vm_map: 23329.180244014 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3057709056, end = 3057717248, flags = 135266419, pgoff = 180224, inode = 22064 }
+vm_state.vm_map: 23329.180246428 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3057717248, end = 3057750016, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 23329.180248497 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3057750016, end = 3057754112, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 23329.180251103 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3057754112, end = 3057840128, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 23329.180253300 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3057840128, end = 3057844224, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 23329.180255400 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3057844224, end = 3057852416, flags = 1048691, pgoff = 3057844224, inode = 0 }
+vm_state.vm_map: 23329.180257617 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3057852416, end = 3057881088, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 23329.180259709 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3057881088, end = 3057885184, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 23329.180262055 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3057885184, end = 3058126848, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.180264088 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3058126848, end = 3058130944, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.180266180 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3058130944, end = 3058135040, flags = 1048691, pgoff = 3058130944, inode = 0 }
+vm_state.vm_map: 23329.180268323 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3058135040, end = 3058606080, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 23329.180270422 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3058606080, end = 3058622464, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 23329.180272700 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3058622464, end = 3058765824, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 23329.180274707 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3058765824, end = 3058769920, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 23329.180276942 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3058769920, end = 3058855936, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 23329.180278981 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3058855936, end = 3058860032, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 23329.180281141 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3058860032, end = 3058974720, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.180283223 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3058974720, end = 3058978816, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.180285753 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3058978816, end = 3059126272, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.180287927 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3059126272, end = 3059130368, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.180290088 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3059130368, end = 3059134464, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.180292181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3059134464, end = 3059138560, flags = 1048691, pgoff = 3059134464, inode = 0 }
+vm_state.vm_map: 23329.180294472 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3059138560, end = 3059146752, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.180296516 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3059146752, end = 3059150848, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.180298615 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3059150848, end = 3059154944, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.180300739 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3059154944, end = 3059240960, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.180302795 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3059240960, end = 3059245056, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.180304870 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3059245056, end = 3059249152, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.180306988 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3059249152, end = 3059257344, flags = 1048691, pgoff = 3059249152, inode = 0 }
+vm_state.vm_map: 23329.180309161 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3059257344, end = 3059994624, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.180311378 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3059994624, end = 3059998720, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.180313656 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3059998720, end = 3060027392, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.180315768 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3060027392, end = 3060031488, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.180317805 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3060031488, end = 3060035584, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.180320454 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3060035584, end = 3060051968, flags = 134217845, pgoff = 0, inode = 19625 }
+vm_state.vm_map: 23329.180322393 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3060051968, end = 3060056064, flags = 135266419, pgoff = 12288, inode = 19625 }
+vm_state.vm_map: 23329.180324437 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3060056064, end = 3060060160, flags = 1048691, pgoff = 3060056064, inode = 0 }
+vm_state.vm_map: 23329.180326851 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3060060160, end = 3060137984, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.180328802 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3060137984, end = 3060142080, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.180330951 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3060142080, end = 3061456896, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.180332896 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3061456896, end = 3061465088, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.180334977 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3061465088, end = 3061469184, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.180336916 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3061469184, end = 3061481472, flags = 1048691, pgoff = 3061469184, inode = 0 }
+vm_state.vm_map: 23329.180339027 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3061481472, end = 3062419456, flags = 134217845, pgoff = 0, inode = 16400 }
+vm_state.vm_map: 23329.180341096 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3062419456, end = 3062435840, flags = 135266417, pgoff = 937984, inode = 16400 }
+vm_state.vm_map: 23329.180343046 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3062435840, end = 3062439936, flags = 135266419, pgoff = 954368, inode = 16400 }
+vm_state.vm_map: 23329.180344980 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3062439936, end = 3062468608, flags = 1048691, pgoff = 3062439936, inode = 0 }
+vm_state.vm_map: 23329.180347053 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3062468608, end = 3062882304, flags = 134217845, pgoff = 0, inode = 1065120 }
+vm_state.vm_map: 23329.180349116 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3062882304, end = 3062890496, flags = 135266419, pgoff = 409600, inode = 1065120 }
+vm_state.vm_map: 23329.180351172 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3062890496, end = 3065192448, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 23329.180353445 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3065192448, end = 3065237504, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 23329.180355599 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3065237504, end = 3065704448, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 23329.180357729 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3065704448, end = 3065712640, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 23329.180359785 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3065712640, end = 3065716736, flags = 1048691, pgoff = 3065712640, inode = 0 }
+vm_state.vm_map: 23329.180361848 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3065716736, end = 3075756032, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 23329.180363811 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3075756032, end = 3075915776, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 23329.180365830 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3075915776, end = 3075923968, flags = 1048691, pgoff = 3075915776, inode = 0 }
+vm_state.vm_map: 23329.180367985 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3075923968, end = 3078234112, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 23329.180369924 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3078234112, end = 3078262784, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 23329.180371857 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3078262784, end = 3078266880, flags = 1048691, pgoff = 3078262784, inode = 0 }
+vm_state.vm_map: 23329.180374110 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3078266880, end = 3078299648, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 23329.180376068 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3078299648, end = 3078303744, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 23329.180378222 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3078303744, end = 3078311936, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 23329.180380155 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3078311936, end = 3078316032, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 23329.180385891 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3078316032, end = 3078324224, flags = 134217845, pgoff = 0, inode = 1450327 }
+vm_state.vm_map: 23329.180388355 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3078324224, end = 3078328320, flags = 135266417, pgoff = 4096, inode = 1450327 }
+vm_state.vm_map: 23329.180390300 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3078328320, end = 3078332416, flags = 135266419, pgoff = 8192, inode = 1450327 }
+vm_state.vm_map: 23329.180392529 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3078332416, end = 3078361088, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.180394610 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3078361088, end = 3078369280, flags = 1048691, pgoff = 3078361088, inode = 0 }
+vm_state.vm_map: 23329.180396592 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3078369280, end = 3078373376, flags = 67371125, pgoff = 3078369280, inode = 0 }
+vm_state.vm_map: 23329.180398728 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3078373376, end = 3078488064, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.180400883 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3078488064, end = 3078492160, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.180403038 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3078492160, end = 3078496256, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.180405020 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2260, start = 3219922944, end = 3220008960, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.180407873 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 134512640, end = 134533120, flags = 134223989, pgoff = 0, inode = 1352628 }
+vm_state.vm_map: 23329.180410133 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 134533120, end = 134537216, flags = 135272563, pgoff = 16384, inode = 1352628 }
+vm_state.vm_map: 23329.180412108 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 161308672, end = 162385920, flags = 1048691, pgoff = 161308672, inode = 0 }
+vm_state.vm_map: 23329.180414287 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3036438528, end = 3036442624, flags = 1048688, pgoff = 3036438528, inode = 0 }
+vm_state.vm_map: 23329.180416332 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3036442624, end = 3044831232, flags = 1048691, pgoff = 3036442624, inode = 0 }
+vm_state.vm_map: 23329.180418610 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3044831232, end = 3044872192, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.180420659 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3044872192, end = 3044876288, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.180422957 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3044876288, end = 3044880384, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.180425265 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3044880384, end = 3044917248, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.180427278 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3044917248, end = 3044921344, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.180429464 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3044921344, end = 3044925440, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.180431804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3044925440, end = 3045003264, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.180433743 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3045003264, end = 3045007360, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.180435707 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3045007360, end = 3045011456, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.180437818 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3045011456, end = 3045019648, flags = 1048691, pgoff = 3045011456, inode = 0 }
+vm_state.vm_map: 23329.180440035 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3045019648, end = 3045044224, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.180441986 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3045044224, end = 3045048320, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.180444166 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3045048320, end = 3045052416, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.180463387 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3045052416, end = 3047088128, flags = 134217937, pgoff = 0, inode = 41242 }
+vm_state.vm_map: 23329.180465826 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047088128, end = 3047313408, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.180467932 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047313408, end = 3047317504, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.180469963 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047317504, end = 3047321600, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.180472279 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047321600, end = 3047522304, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 23329.180474822 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047522304, end = 3047526400, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 23329.180477156 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047526400, end = 3047550976, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 23329.180479250 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047550976, end = 3047555072, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 23329.180481749 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047596032, end = 3047645184, flags = 134217845, pgoff = 0, inode = 1114257 }
+vm_state.vm_map: 23329.180483812 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047645184, end = 3047649280, flags = 135266419, pgoff = 45056, inode = 1114257 }
+vm_state.vm_map: 23329.180486103 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047649280, end = 3047653376, flags = 134217937, pgoff = 0, inode = 1196150 }
+vm_state.vm_map: 23329.180488240 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047653376, end = 3047677952, flags = 134217937, pgoff = 0, inode = 1196354 }
+vm_state.vm_map: 23329.180490568 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047677952, end = 3047682048, flags = 134217937, pgoff = 0, inode = 1196334 }
+vm_state.vm_map: 23329.180492722 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047682048, end = 3047686144, flags = 134217937, pgoff = 0, inode = 1196333 }
+vm_state.vm_map: 23329.180494944 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047686144, end = 3047690240, flags = 134217937, pgoff = 0, inode = 1196331 }
+vm_state.vm_map: 23329.180497235 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047690240, end = 3047694336, flags = 134217937, pgoff = 0, inode = 1196330 }
+vm_state.vm_map: 23329.180499427 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047694336, end = 3047702528, flags = 134217937, pgoff = 0, inode = 1196329 }
+vm_state.vm_map: 23329.180501526 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047702528, end = 3047735296, flags = 134217937, pgoff = 0, inode = 1196328 }
+vm_state.vm_map: 23329.180504027 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047735296, end = 3047747584, flags = 134217937, pgoff = 0, inode = 1196327 }
+vm_state.vm_map: 23329.180506139 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047747584, end = 3047755776, flags = 134217937, pgoff = 0, inode = 1196320 }
+vm_state.vm_map: 23329.180508386 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047755776, end = 3047759872, flags = 134217937, pgoff = 0, inode = 1196318 }
+vm_state.vm_map: 23329.180510875 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047759872, end = 3047763968, flags = 134217937, pgoff = 0, inode = 1196278 }
+vm_state.vm_map: 23329.180513085 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047763968, end = 3047768064, flags = 134217937, pgoff = 0, inode = 1196251 }
+vm_state.vm_map: 23329.180515320 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047768064, end = 3047796736, flags = 134217937, pgoff = 0, inode = 1196236 }
+vm_state.vm_map: 23329.180517531 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047796736, end = 3047809024, flags = 134217937, pgoff = 0, inode = 1196234 }
+vm_state.vm_map: 23329.180519667 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047809024, end = 3047813120, flags = 134217937, pgoff = 0, inode = 1196201 }
+vm_state.vm_map: 23329.180521915 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047813120, end = 3047821312, flags = 134217937, pgoff = 0, inode = 1196170 }
+vm_state.vm_map: 23329.180524076 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047821312, end = 3047825408, flags = 134217937, pgoff = 0, inode = 1196157 }
+vm_state.vm_map: 23329.180526274 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047825408, end = 3047829504, flags = 134217937, pgoff = 0, inode = 1196171 }
+vm_state.vm_map: 23329.180528386 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047829504, end = 3047841792, flags = 134217937, pgoff = 0, inode = 1196172 }
+vm_state.vm_map: 23329.180530627 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047841792, end = 3047849984, flags = 134217937, pgoff = 0, inode = 1196173 }
+vm_state.vm_map: 23329.180532899 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047849984, end = 3047882752, flags = 134217937, pgoff = 0, inode = 1196352 }
+vm_state.vm_map: 23329.180535141 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047882752, end = 3047903232, flags = 134217937, pgoff = 0, inode = 1196196 }
+vm_state.vm_map: 23329.180537302 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047903232, end = 3047911424, flags = 134217937, pgoff = 0, inode = 1196343 }
+vm_state.vm_map: 23329.180539543 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047911424, end = 3047940096, flags = 134217937, pgoff = 0, inode = 1196314 }
+vm_state.vm_map: 23329.180541785 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047940096, end = 3047985152, flags = 134217937, pgoff = 0, inode = 1196147 }
+vm_state.vm_map: 23329.180544026 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3047985152, end = 3048042496, flags = 134217937, pgoff = 0, inode = 1196094 }
+vm_state.vm_map: 23329.180546471 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3048042496, end = 3048054784, flags = 134217937, pgoff = 0, inode = 1196342 }
+vm_state.vm_map: 23329.180548558 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3048054784, end = 3048112128, flags = 134217937, pgoff = 0, inode = 1196355 }
+vm_state.vm_map: 23329.180550861 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3048112128, end = 3049443328, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.180552979 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3049443328, end = 3049455616, flags = 1048691, pgoff = 3049443328, inode = 0 }
+vm_state.vm_map: 23329.180555301 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3049455616, end = 3049472000, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.180557338 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3049472000, end = 3049476096, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.180559512 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3049476096, end = 3049492480, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 23329.180561605 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3049492480, end = 3049496576, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 23329.180563882 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3049496576, end = 3049529344, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 23329.180565847 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3049529344, end = 3049533440, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 23329.180567965 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3049533440, end = 3049537536, flags = 1048691, pgoff = 3049533440, inode = 0 }
+vm_state.vm_map: 23329.180570285 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3049537536, end = 3049553920, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 23329.180572341 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3049553920, end = 3049558016, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 23329.180574664 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3049558016, end = 3049889792, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 23329.180576608 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3049889792, end = 3049897984, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 23329.180579005 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3049897984, end = 3049996288, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.180581350 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3049996288, end = 3050000384, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.180583678 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3050000384, end = 3050147840, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.180585716 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3050147840, end = 3050156032, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.180587926 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3050156032, end = 3050168320, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 23329.180589920 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3050168320, end = 3050172416, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 23329.180592199 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3050172416, end = 3050176512, flags = 1048691, pgoff = 3050172416, inode = 0 }
+vm_state.vm_map: 23329.180594378 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3050176512, end = 3050184704, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.180596478 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3050184704, end = 3050188800, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.180598713 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3050188800, end = 3050508288, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 23329.180600819 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3050508288, end = 3050524672, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 23329.180606234 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3050524672, end = 3050717184, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.180608284 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3050717184, end = 3050721280, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.180610574 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3050721280, end = 3054317568, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 23329.180612674 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3054317568, end = 3054415872, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 23329.180614613 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3054415872, end = 3054419968, flags = 1048691, pgoff = 3054415872, inode = 0 }
+vm_state.vm_map: 23329.180617076 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3054419968, end = 3054706688, flags = 134217845, pgoff = 0, inode = 20877 }
+vm_state.vm_map: 23329.180619138 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3054706688, end = 3054714880, flags = 135266419, pgoff = 282624, inode = 20877 }
+vm_state.vm_map: 23329.180621182 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3054714880, end = 3054718976, flags = 1048691, pgoff = 3054714880, inode = 0 }
+vm_state.vm_map: 23329.180623362 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3054718976, end = 3055652864, flags = 134217845, pgoff = 0, inode = 20876 }
+vm_state.vm_map: 23329.180625295 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3055652864, end = 3055665152, flags = 135266419, pgoff = 933888, inode = 20876 }
+vm_state.vm_map: 23329.180627567 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3055665152, end = 3055726592, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 23329.180629623 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3055726592, end = 3055730688, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 23329.180631919 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3055730688, end = 3056861184, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 23329.180634025 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3056861184, end = 3056877568, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 23329.180636298 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3056877568, end = 3057147904, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 23329.180638235 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3057147904, end = 3057156096, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 23329.180640353 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3057156096, end = 3058307072, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.180642447 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3058307072, end = 3058323456, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.180644609 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3058323456, end = 3058327552, flags = 1048691, pgoff = 3058323456, inode = 0 }
+vm_state.vm_map: 23329.180646844 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3058327552, end = 3058380800, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 23329.180648936 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3058380800, end = 3058384896, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 23329.180651554 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3058384896, end = 3058569216, flags = 134217845, pgoff = 0, inode = 22064 }
+vm_state.vm_map: 23329.180653542 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3058569216, end = 3058577408, flags = 135266419, pgoff = 180224, inode = 22064 }
+vm_state.vm_map: 23329.180655864 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3058577408, end = 3058610176, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 23329.180657858 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3058610176, end = 3058614272, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 23329.180660186 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3058614272, end = 3058700288, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 23329.180662273 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3058700288, end = 3058704384, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 23329.180664372 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3058704384, end = 3058712576, flags = 1048691, pgoff = 3058704384, inode = 0 }
+vm_state.vm_map: 23329.180666620 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3058712576, end = 3058741248, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 23329.180668713 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3058741248, end = 3058745344, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 23329.180670961 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3058745344, end = 3058987008, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.180673066 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3058987008, end = 3058991104, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.180675184 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3058991104, end = 3058995200, flags = 1048691, pgoff = 3058991104, inode = 0 }
+vm_state.vm_map: 23329.180677524 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3058995200, end = 3059466240, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 23329.180679475 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3059466240, end = 3059482624, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 23329.180681704 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3059482624, end = 3059625984, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 23329.180683797 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3059625984, end = 3059630080, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 23329.180686415 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3059630080, end = 3059716096, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 23329.180688330 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3059716096, end = 3059720192, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 23329.180690552 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3059720192, end = 3059834880, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.180692639 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3059834880, end = 3059838976, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.180694844 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3059838976, end = 3059986432, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.180696875 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3059986432, end = 3059990528, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.180698975 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3059990528, end = 3059994624, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.180701247 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3059994624, end = 3059998720, flags = 1048691, pgoff = 3059994624, inode = 0 }
+vm_state.vm_map: 23329.180703494 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3059998720, end = 3060006912, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.180705433 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3060006912, end = 3060011008, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.180707545 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3060011008, end = 3060015104, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.180712027 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3060015104, end = 3060101120, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.180714176 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3060101120, end = 3060105216, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.180716213 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3060105216, end = 3060109312, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.180718300 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3060109312, end = 3060117504, flags = 1048691, pgoff = 3060109312, inode = 0 }
+vm_state.vm_map: 23329.180721011 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3060117504, end = 3060854784, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.180723184 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3060854784, end = 3060858880, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.180725321 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3060858880, end = 3060887552, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.180727358 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3060887552, end = 3060891648, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.180729531 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3060891648, end = 3060895744, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.180731699 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3060895744, end = 3060912128, flags = 134217845, pgoff = 0, inode = 19625 }
+vm_state.vm_map: 23329.180749667 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3060912128, end = 3060916224, flags = 135266419, pgoff = 12288, inode = 19625 }
+vm_state.vm_map: 23329.180751840 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3060916224, end = 3060920320, flags = 1048691, pgoff = 3060916224, inode = 0 }
+vm_state.vm_map: 23329.180754106 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3060920320, end = 3060998144, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.180756150 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3060998144, end = 3061002240, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.180758379 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3061002240, end = 3062317056, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.180760472 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3062317056, end = 3062325248, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.180762491 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3062325248, end = 3062329344, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.180764659 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3062329344, end = 3062341632, flags = 1048691, pgoff = 3062329344, inode = 0 }
+vm_state.vm_map: 23329.180766974 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3062341632, end = 3063279616, flags = 134217845, pgoff = 0, inode = 16400 }
+vm_state.vm_map: 23329.180769154 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3063279616, end = 3063296000, flags = 135266417, pgoff = 937984, inode = 16400 }
+vm_state.vm_map: 23329.180771512 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3063296000, end = 3063300096, flags = 135266419, pgoff = 954368, inode = 16400 }
+vm_state.vm_map: 23329.180773698 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3063300096, end = 3063328768, flags = 1048691, pgoff = 3063300096, inode = 0 }
+vm_state.vm_map: 23329.180776001 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3063328768, end = 3063742464, flags = 134217845, pgoff = 0, inode = 1065120 }
+vm_state.vm_map: 23329.180778039 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3063742464, end = 3063750656, flags = 135266419, pgoff = 409600, inode = 1065120 }
+vm_state.vm_map: 23329.180780347 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3063750656, end = 3066052608, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 23329.180782428 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3066052608, end = 3066097664, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 23329.180784595 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3066097664, end = 3066564608, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 23329.180786591 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3066564608, end = 3066572800, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 23329.180788863 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3066572800, end = 3066576896, flags = 1048691, pgoff = 3066572800, inode = 0 }
+vm_state.vm_map: 23329.180791154 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3066576896, end = 3076616192, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 23329.180793184 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3076616192, end = 3076775936, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 23329.180795284 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3076775936, end = 3076784128, flags = 1048691, pgoff = 3076775936, inode = 0 }
+vm_state.vm_map: 23329.180797452 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3076784128, end = 3079094272, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 23329.180799409 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3079094272, end = 3079122944, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 23329.180801427 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3079122944, end = 3079127040, flags = 1048691, pgoff = 3079122944, inode = 0 }
+vm_state.vm_map: 23329.180803804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3079127040, end = 3079159808, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 23329.180806169 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3079159808, end = 3079163904, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 23329.180808262 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3079163904, end = 3079172096, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 23329.180810436 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3079172096, end = 3079176192, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 23329.180812622 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3079176192, end = 3079184384, flags = 134217845, pgoff = 0, inode = 1450327 }
+vm_state.vm_map: 23329.180814622 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3079184384, end = 3079188480, flags = 135266417, pgoff = 4096, inode = 1450327 }
+vm_state.vm_map: 23329.180816728 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3079188480, end = 3079192576, flags = 135266419, pgoff = 8192, inode = 1450327 }
+vm_state.vm_map: 23329.180818920 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3079192576, end = 3079221248, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.180820877 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3079221248, end = 3079229440, flags = 1048691, pgoff = 3079221248, inode = 0 }
+vm_state.vm_map: 23329.180823131 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3079229440, end = 3079233536, flags = 67371125, pgoff = 3079229440, inode = 0 }
+vm_state.vm_map: 23329.180825495 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3079233536, end = 3079348224, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.180827521 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3079348224, end = 3079352320, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.180829731 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3079352320, end = 3079356416, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.180831781 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2261, start = 3217543168, end = 3217629184, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.180834387 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 134512640, end = 134553600, flags = 134223989, pgoff = 0, inode = 20759 }
+vm_state.vm_map: 23329.180836573 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 134553600, end = 134557696, flags = 135272563, pgoff = 36864, inode = 20759 }
+vm_state.vm_map: 23329.180838530 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 134557696, end = 134565888, flags = 1048691, pgoff = 134557696, inode = 0 }
+vm_state.vm_map: 23329.180840864 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 153337856, end = 155615232, flags = 1048691, pgoff = 153337856, inode = 0 }
+vm_state.vm_map: 23329.180843315 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 2998910976, end = 2998951936, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.180845316 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 2998951936, end = 2998956032, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.180847279 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 2998956032, end = 2998960128, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.180849681 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 2998960128, end = 2998996992, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.180851668 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 2998996992, end = 2999001088, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.180853675 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 2999001088, end = 2999005184, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.180855918 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 2999005184, end = 2999029760, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.180857973 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 2999029760, end = 2999033856, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.180860073 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 2999033856, end = 2999037952, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.180862202 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 2999037952, end = 3015278592, flags = 134217979, pgoff = 0, inode = 1204696 }
+vm_state.vm_map: 23329.180864493 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3015278592, end = 3019575296, flags = 134217979, pgoff = 0, inode = 1204694 }
+vm_state.vm_map: 23329.180866686 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3019575296, end = 3019776000, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 23329.180868618 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3019776000, end = 3019780096, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 23329.180870840 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3019780096, end = 3019812864, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 23329.180872798 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3019812864, end = 3019816960, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 23329.180875317 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3019816960, end = 3019841536, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 23329.180877256 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3019841536, end = 3019845632, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 23329.180879559 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3019857920, end = 3019939840, flags = 134217841, pgoff = 0, inode = 98443 }
+vm_state.vm_map: 23329.180881597 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3019939840, end = 3019943936, flags = 134217937, pgoff = 0, inode = 1196150 }
+vm_state.vm_map: 23329.180883653 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3019943936, end = 3019968512, flags = 134217937, pgoff = 0, inode = 1196354 }
+vm_state.vm_map: 23329.180885740 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3019968512, end = 3019972608, flags = 134217937, pgoff = 0, inode = 1196334 }
+vm_state.vm_map: 23329.180887956 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3019972608, end = 3019976704, flags = 134217937, pgoff = 0, inode = 1196333 }
+vm_state.vm_map: 23329.180890093 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3019976704, end = 3019980800, flags = 134217937, pgoff = 0, inode = 1196331 }
+vm_state.vm_map: 23329.180892334 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3019980800, end = 3019984896, flags = 134217937, pgoff = 0, inode = 1196330 }
+vm_state.vm_map: 23329.180894495 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3019984896, end = 3019993088, flags = 134217937, pgoff = 0, inode = 1196329 }
+vm_state.vm_map: 23329.180896774 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3019993088, end = 3020025856, flags = 134217937, pgoff = 0, inode = 1196328 }
+vm_state.vm_map: 23329.180898929 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020025856, end = 3020038144, flags = 134217937, pgoff = 0, inode = 1196327 }
+vm_state.vm_map: 23329.180901028 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020038144, end = 3020046336, flags = 134217937, pgoff = 0, inode = 1196320 }
+vm_state.vm_map: 23329.180903214 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020046336, end = 3020050432, flags = 134217937, pgoff = 0, inode = 1196318 }
+vm_state.vm_map: 23329.180905696 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020050432, end = 3020054528, flags = 134217937, pgoff = 0, inode = 1196278 }
+vm_state.vm_map: 23329.180907937 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020054528, end = 3020058624, flags = 134217937, pgoff = 0, inode = 1196251 }
+vm_state.vm_map: 23329.180910493 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020058624, end = 3020087296, flags = 134217937, pgoff = 0, inode = 1196236 }
+vm_state.vm_map: 23329.180912587 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020087296, end = 3020099584, flags = 134217937, pgoff = 0, inode = 1196234 }
+vm_state.vm_map: 23329.180914877 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020099584, end = 3020103680, flags = 134217937, pgoff = 0, inode = 1196201 }
+vm_state.vm_map: 23329.180916995 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020103680, end = 3020111872, flags = 134217937, pgoff = 0, inode = 1196170 }
+vm_state.vm_map: 23329.180919181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020111872, end = 3020115968, flags = 134217937, pgoff = 0, inode = 1196157 }
+vm_state.vm_map: 23329.180921367 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020115968, end = 3020120064, flags = 134217937, pgoff = 0, inode = 1196171 }
+vm_state.vm_map: 23329.180923491 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020120064, end = 3020132352, flags = 134217937, pgoff = 0, inode = 1196172 }
+vm_state.vm_map: 23329.180925683 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020132352, end = 3020140544, flags = 134217937, pgoff = 0, inode = 1196173 }
+vm_state.vm_map: 23329.180927862 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020140544, end = 3020173312, flags = 134217937, pgoff = 0, inode = 1196352 }
+vm_state.vm_map: 23329.180929979 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020173312, end = 3020193792, flags = 134217937, pgoff = 0, inode = 1196196 }
+vm_state.vm_map: 23329.180932141 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020193792, end = 3020201984, flags = 134217937, pgoff = 0, inode = 1196343 }
+vm_state.vm_map: 23329.180934358 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020201984, end = 3020230656, flags = 134217937, pgoff = 0, inode = 1196314 }
+vm_state.vm_map: 23329.180936587 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020230656, end = 3020275712, flags = 134217937, pgoff = 0, inode = 1196147 }
+vm_state.vm_map: 23329.180938767 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020275712, end = 3020333056, flags = 134217937, pgoff = 0, inode = 1196094 }
+vm_state.vm_map: 23329.180940982 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020333056, end = 3020402688, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 23329.180942983 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020402688, end = 3020406784, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 23329.180945416 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020406784, end = 3020410880, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 23329.180947534 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020410880, end = 3020419072, flags = 1048691, pgoff = 3020410880, inode = 0 }
+vm_state.vm_map: 23329.180949961 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020419072, end = 3020439552, flags = 134217845, pgoff = 0, inode = 23692 }
+vm_state.vm_map: 23329.180951974 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020439552, end = 3020443648, flags = 135266419, pgoff = 16384, inode = 23692 }
+vm_state.vm_map: 23329.180954486 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020443648, end = 3020607488, flags = 134217845, pgoff = 0, inode = 21283 }
+vm_state.vm_map: 23329.180956524 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020607488, end = 3020611584, flags = 135266419, pgoff = 159744, inode = 21283 }
+vm_state.vm_map: 23329.180958833 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3020611584, end = 3021574144, flags = 134217845, pgoff = 0, inode = 21285 }
+vm_state.vm_map: 23329.180961031 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3021574144, end = 3021631488, flags = 135266419, pgoff = 962560, inode = 21285 }
+vm_state.vm_map: 23329.180963415 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3021631488, end = 3021955072, flags = 134217845, pgoff = 0, inode = 21280 }
+vm_state.vm_map: 23329.180965421 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3021955072, end = 3021959168, flags = 135266419, pgoff = 323584, inode = 21280 }
+vm_state.vm_map: 23329.180967687 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3021959168, end = 3022036992, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.180969953 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3022036992, end = 3022041088, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.180971991 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3022041088, end = 3022045184, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.180974029 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3022045184, end = 3022053376, flags = 1048691, pgoff = 3022045184, inode = 0 }
+vm_state.vm_map: 23329.180976480 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3022053376, end = 3022065664, flags = 134217845, pgoff = 0, inode = 499779 }
+vm_state.vm_map: 23329.180978400 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3022065664, end = 3022069760, flags = 135266419, pgoff = 8192, inode = 499779 }
+vm_state.vm_map: 23329.180981265 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3022069760, end = 3022090240, flags = 134217845, pgoff = 0, inode = 18127 }
+vm_state.vm_map: 23329.180983315 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3022090240, end = 3022094336, flags = 135266419, pgoff = 16384, inode = 18127 }
+vm_state.vm_map: 23329.180985384 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3022094336, end = 3022319616, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.180987310 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3022319616, end = 3022323712, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.180989502 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3022323712, end = 3022327808, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.180991774 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3022327808, end = 3022344192, flags = 134217845, pgoff = 0, inode = 21276 }
+vm_state.vm_map: 23329.180993695 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3022344192, end = 3022348288, flags = 135266419, pgoff = 12288, inode = 21276 }
+vm_state.vm_map: 23329.180995961 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3022348288, end = 3022745600, flags = 134217845, pgoff = 0, inode = 24050 }
+vm_state.vm_map: 23329.180998042 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3022745600, end = 3022753792, flags = 135266419, pgoff = 397312, inode = 24050 }
+vm_state.vm_map: 23329.181000011 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3022753792, end = 3022770176, flags = 1048691, pgoff = 3022753792, inode = 0 }
+vm_state.vm_map: 23329.181002395 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3022770176, end = 3022798848, flags = 134217845, pgoff = 0, inode = 499851 }
+vm_state.vm_map: 23329.181004432 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3022798848, end = 3022802944, flags = 135266419, pgoff = 28672, inode = 499851 }
+vm_state.vm_map: 23329.181006803 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3022802944, end = 3023106048, flags = 134217845, pgoff = 0, inode = 24049 }
+vm_state.vm_map: 23329.181008866 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3023106048, end = 3023110144, flags = 135266419, pgoff = 299008, inode = 24049 }
+vm_state.vm_map: 23329.181011186 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3023110144, end = 3023912960, flags = 134217845, pgoff = 0, inode = 21274 }
+vm_state.vm_map: 23329.181013175 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3023912960, end = 3023929344, flags = 135266419, pgoff = 802816, inode = 21274 }
+vm_state.vm_map: 23329.181015848 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3023929344, end = 3024166912, flags = 1048691, pgoff = 3024166912, inode = 0 }
+vm_state.vm_map: 23329.181018423 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3024171008, end = 3024433152, flags = 134217845, pgoff = 0, inode = 24048 }
+vm_state.vm_map: 23329.181020528 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3024433152, end = 3024437248, flags = 135266419, pgoff = 262144, inode = 24048 }
+vm_state.vm_map: 23329.181022956 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3024437248, end = 3024519168, flags = 134217845, pgoff = 0, inode = 19186 }
+vm_state.vm_map: 23329.181025178 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3024519168, end = 3024523264, flags = 135266419, pgoff = 77824, inode = 19186 }
+vm_state.vm_map: 23329.181027802 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3024523264, end = 3024826368, flags = 134217845, pgoff = 0, inode = 24371 }
+vm_state.vm_map: 23329.181029938 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3024826368, end = 3024838656, flags = 135266419, pgoff = 303104, inode = 24371 }
+vm_state.vm_map: 23329.181032081 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3024838656, end = 3024871424, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 23329.181034304 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3024871424, end = 3024875520, flags = 135266419, pgoff = 32768, inode = 20716 }
+vm_state.vm_map: 23329.181036292 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3024875520, end = 3025395712, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 23329.181038397 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3025395712, end = 3025403904, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 23329.181040497 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3025403904, end = 3025768448, flags = 134217845, pgoff = 0, inode = 23376 }
+vm_state.vm_map: 23329.181042639 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3025768448, end = 3025805312, flags = 135266423, pgoff = 364544, inode = 23376 }
+vm_state.vm_map: 23329.181044745 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3025805312, end = 3025809408, flags = 1048695, pgoff = 3025805312, inode = 0 }
+vm_state.vm_map: 23329.181046943 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3025809408, end = 3026362368, flags = 134217845, pgoff = 0, inode = 18947 }
+vm_state.vm_map: 23329.181048888 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3026362368, end = 3026382848, flags = 135266419, pgoff = 548864, inode = 18947 }
+vm_state.vm_map: 23329.181051438 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3026382848, end = 3026698240, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 23329.181053426 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3026698240, end = 3026706432, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 23329.181055520 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3026706432, end = 3026776064, flags = 134217845, pgoff = 0, inode = 1065123 }
+vm_state.vm_map: 23329.181057570 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3026776064, end = 3026780160, flags = 135266419, pgoff = 69632, inode = 1065123 }
+vm_state.vm_map: 23329.181059866 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3026780160, end = 3041275904, flags = 134217845, pgoff = 0, inode = 20672 }
+vm_state.vm_map: 23329.181065109 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3041275904, end = 3041890304, flags = 135266419, pgoff = 14495744, inode = 20672 }
+vm_state.vm_map: 23329.181067159 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3041890304, end = 3041898496, flags = 1048691, pgoff = 3041890304, inode = 0 }
+vm_state.vm_map: 23329.181069264 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3041898496, end = 3042271232, flags = 134217845, pgoff = 0, inode = 20902 }
+vm_state.vm_map: 23329.181071555 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3042271232, end = 3042283520, flags = 135266419, pgoff = 368640, inode = 20902 }
+vm_state.vm_map: 23329.181073827 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3042295808, end = 3042304000, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 23329.181075939 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3042304000, end = 3042308096, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 23329.181078050 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3042308096, end = 3042320384, flags = 134217937, pgoff = 0, inode = 1196342 }
+vm_state.vm_map: 23329.181080347 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3042320384, end = 3042377728, flags = 134217937, pgoff = 0, inode = 1196355 }
+vm_state.vm_map: 23329.181082378 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3042377728, end = 3044360192, flags = 134217845, pgoff = 0, inode = 20915 }
+vm_state.vm_map: 23329.181084602 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3044360192, end = 3044401152, flags = 135266419, pgoff = 1978368, inode = 20915 }
+vm_state.vm_map: 23329.181087003 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3044401152, end = 3045732352, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.181089188 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3045732352, end = 3045748736, flags = 1048691, pgoff = 3045732352, inode = 0 }
+vm_state.vm_map: 23329.181091362 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3045748736, end = 3045896192, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.181093356 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3045896192, end = 3045904384, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.181095493 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3045904384, end = 3046223872, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 23329.181097654 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3046223872, end = 3046240256, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 23329.181099753 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3046240256, end = 3046252544, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 23329.181101815 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3046252544, end = 3046256640, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 23329.181104051 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3046256640, end = 3047514112, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 23329.181106119 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3047514112, end = 3047534592, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 23329.181108120 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3047534592, end = 3047542784, flags = 1048691, pgoff = 3047534592, inode = 0 }
+vm_state.vm_map: 23329.181110231 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3047542784, end = 3047780352, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 23329.181112454 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3047780352, end = 3047784448, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 23329.181114535 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3047784448, end = 3047800832, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.181116591 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3047800832, end = 3047804928, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.181118635 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3047804928, end = 3047813120, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.181121154 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3047813120, end = 3047817216, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.181123297 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3047817216, end = 3048009728, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.181125408 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3048009728, end = 3048013824, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.181127502 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3048013824, end = 3048067072, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 23329.181129459 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3048067072, end = 3048071168, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 23329.181131404 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3048071168, end = 3048075264, flags = 1048691, pgoff = 3048071168, inode = 0 }
+vm_state.vm_map: 23329.181133367 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3048075264, end = 3048259584, flags = 134217845, pgoff = 0, inode = 22064 }
+vm_state.vm_map: 23329.181135454 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3048259584, end = 3048267776, flags = 135266419, pgoff = 180224, inode = 22064 }
+vm_state.vm_map: 23329.181137430 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3048267776, end = 3048509440, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.181139388 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3048509440, end = 3048513536, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.181141362 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3048513536, end = 3048984576, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 23329.181143617 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3048984576, end = 3049000960, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 23329.181145840 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049000960, end = 3049144320, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 23329.181147909 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049144320, end = 3049148416, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 23329.181149860 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049148416, end = 3049234432, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 23329.181152113 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049234432, end = 3049238528, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 23329.181154724 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049238528, end = 3049242624, flags = 1048691, pgoff = 3049238528, inode = 0 }
+vm_state.vm_map: 23329.181156842 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049242624, end = 3049259008, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 23329.181158985 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049259008, end = 3049263104, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 23329.181160942 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049263104, end = 3049295872, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 23329.181162936 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049295872, end = 3049299968, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 23329.181165148 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049299968, end = 3049316352, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 23329.181167197 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049316352, end = 3049320448, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 23329.181169234 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049320448, end = 3049406464, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 23329.181171457 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049406464, end = 3049410560, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 23329.181173489 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049410560, end = 3049418752, flags = 1048691, pgoff = 3049410560, inode = 0 }
+vm_state.vm_map: 23329.181175631 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049418752, end = 3049447424, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 23329.181177626 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049447424, end = 3049451520, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 23329.181179706 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049451520, end = 3049455616, flags = 1048691, pgoff = 3049451520, inode = 0 }
+vm_state.vm_map: 23329.181181781 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049455616, end = 3049787392, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 23329.181183893 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049787392, end = 3049795584, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 23329.181185961 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049795584, end = 3049828352, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 23329.181188400 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049828352, end = 3049832448, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 23329.181190512 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049832448, end = 3049848832, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 23329.181195013 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049848832, end = 3049852928, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 23329.181197076 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049852928, end = 3049877504, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 23329.181199206 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049877504, end = 3049881600, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 23329.181201274 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049881600, end = 3049914368, flags = 134217845, pgoff = 0, inode = 21180 }
+vm_state.vm_map: 23329.181203306 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049914368, end = 3049918464, flags = 135266419, pgoff = 28672, inode = 21180 }
+vm_state.vm_map: 23329.181205454 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049918464, end = 3049922560, flags = 1048691, pgoff = 3049918464, inode = 0 }
+vm_state.vm_map: 23329.181207554 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3049922560, end = 3050352640, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 23329.181209548 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3050352640, end = 3050381312, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 23329.181211641 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3050381312, end = 3050385408, flags = 1048691, pgoff = 3050381312, inode = 0 }
+vm_state.vm_map: 23329.181213747 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3050385408, end = 3050827776, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 23329.181215784 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3050827776, end = 3050835968, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 23329.181217810 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3050835968, end = 3050934272, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.181220013 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3050934272, end = 3050938368, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.181222434 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3050938368, end = 3051208704, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 23329.181224441 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3051208704, end = 3051216896, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 23329.181226688 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3051216896, end = 3051278336, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 23329.181228677 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3051278336, end = 3051282432, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 23329.181230819 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3051282432, end = 3051286528, flags = 1048691, pgoff = 3051282432, inode = 0 }
+vm_state.vm_map: 23329.181232949 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3051286528, end = 3051753472, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 23329.181235054 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3051753472, end = 3051761664, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 23329.181237099 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3051761664, end = 3052892160, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 23329.181239309 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3052892160, end = 3052908544, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 23329.181241371 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3052908544, end = 3053023232, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.181243483 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3053023232, end = 3053027328, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.181245625 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3053027328, end = 3053174784, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.181247805 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3053174784, end = 3053178880, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.181249818 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3053178880, end = 3053182976, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.181252016 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3053182976, end = 3053191168, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.181254158 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3053191168, end = 3053195264, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.181256523 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3053195264, end = 3053199360, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.181258616 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3053199360, end = 3053203456, flags = 1048691, pgoff = 3053199360, inode = 0 }
+vm_state.vm_map: 23329.181260765 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3053203456, end = 3053289472, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.181262753 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3053289472, end = 3053293568, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.181264847 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3053293568, end = 3053297664, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.181266964 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3053297664, end = 3053305856, flags = 1048691, pgoff = 3053297664, inode = 0 }
+vm_state.vm_map: 23329.181269051 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3053305856, end = 3054043136, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.181271070 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3054043136, end = 3054047232, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.181273250 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3054047232, end = 3054075904, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.181275288 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3054075904, end = 3054080000, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.181277313 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3054080000, end = 3054084096, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.181279499 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3054084096, end = 3054100480, flags = 134217845, pgoff = 0, inode = 19625 }
+vm_state.vm_map: 23329.181281493 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3054100480, end = 3054104576, flags = 135266419, pgoff = 12288, inode = 19625 }
+vm_state.vm_map: 23329.181283562 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3054104576, end = 3054182400, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.181285587 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3054182400, end = 3054186496, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.181287822 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3054186496, end = 3055501312, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.181290156 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3055501312, end = 3055509504, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.181292409 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3055509504, end = 3055513600, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.181294447 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3055513600, end = 3055529984, flags = 1048691, pgoff = 3055513600, inode = 0 }
+vm_state.vm_map: 23329.181296589 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3055529984, end = 3056467968, flags = 134217845, pgoff = 0, inode = 16400 }
+vm_state.vm_map: 23329.181298762 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3056467968, end = 3056484352, flags = 135266417, pgoff = 937984, inode = 16400 }
+vm_state.vm_map: 23329.181300752 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3056484352, end = 3056488448, flags = 135266419, pgoff = 954368, inode = 16400 }
+vm_state.vm_map: 23329.181302981 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3056488448, end = 3056517120, flags = 1048691, pgoff = 3056488448, inode = 0 }
+vm_state.vm_map: 23329.181305011 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3056517120, end = 3066556416, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 23329.181307105 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3066556416, end = 3066716160, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 23329.181309229 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3066716160, end = 3066724352, flags = 1048691, pgoff = 3066716160, inode = 0 }
+vm_state.vm_map: 23329.181311359 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3066724352, end = 3070320640, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 23329.181313390 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3070320640, end = 3070418944, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 23329.181315397 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3070418944, end = 3070423040, flags = 1048691, pgoff = 3070418944, inode = 0 }
+vm_state.vm_map: 23329.181317607 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3070423040, end = 3072978944, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 23329.181319609 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3072978944, end = 3073028096, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 23329.181321713 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3073028096, end = 3073032192, flags = 1048691, pgoff = 3073028096, inode = 0 }
+vm_state.vm_map: 23329.181324189 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3073032192, end = 3074183168, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.181326276 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3074183168, end = 3074199552, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.181328258 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3074199552, end = 3074433024, flags = 134217845, pgoff = 0, inode = 1065180 }
+vm_state.vm_map: 23329.181330561 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3074433024, end = 3074441216, flags = 135266419, pgoff = 233472, inode = 1065180 }
+vm_state.vm_map: 23329.181332574 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3074441216, end = 3074445312, flags = 1048691, pgoff = 3074441216, inode = 0 }
+vm_state.vm_map: 23329.181334680 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3074445312, end = 3076747264, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 23329.181336798 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3076747264, end = 3076792320, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 23329.181338866 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3076792320, end = 3079102464, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 23329.181340879 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3079102464, end = 3079131136, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 23329.181343102 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3079131136, end = 3079135232, flags = 1048691, pgoff = 3079131136, inode = 0 }
+vm_state.vm_map: 23329.181345491 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3079135232, end = 3079147520, flags = 134217845, pgoff = 0, inode = 24046 }
+vm_state.vm_map: 23329.181347498 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3079147520, end = 3079151616, flags = 135266419, pgoff = 8192, inode = 24046 }
+vm_state.vm_map: 23329.181349715 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3079151616, end = 3079159808, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 23329.181351808 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3079159808, end = 3079163904, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 23329.181353938 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3079163904, end = 3079180288, flags = 134217845, pgoff = 0, inode = 22094 }
+vm_state.vm_map: 23329.181355976 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3079180288, end = 3079184384, flags = 135266419, pgoff = 12288, inode = 22094 }
+vm_state.vm_map: 23329.181358427 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3079184384, end = 3079192576, flags = 134217845, pgoff = 0, inode = 1450327 }
+vm_state.vm_map: 23329.181360514 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3079192576, end = 3079196672, flags = 135266417, pgoff = 4096, inode = 1450327 }
+vm_state.vm_map: 23329.181362546 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3079196672, end = 3079200768, flags = 135266419, pgoff = 8192, inode = 1450327 }
+vm_state.vm_map: 23329.181364663 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3079200768, end = 3079229440, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.181366750 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3079229440, end = 3079237632, flags = 1048691, pgoff = 3079229440, inode = 0 }
+vm_state.vm_map: 23329.181368695 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3079237632, end = 3079241728, flags = 67371125, pgoff = 3079237632, inode = 0 }
+vm_state.vm_map: 23329.181371023 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3079241728, end = 3079356416, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.181373060 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3079356416, end = 3079360512, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.181375173 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3079360512, end = 3079364608, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.181377118 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2263, start = 3215650816, end = 3215736832, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.181382650 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 134512640, end = 135245824, flags = 134223989, pgoff = 0, inode = 1368228 }
+vm_state.vm_map: 23329.181384681 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 135245824, end = 135315456, flags = 135272563, pgoff = 729088, inode = 1368228 }
+vm_state.vm_map: 23329.181386787 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 135315456, end = 135327744, flags = 1048691, pgoff = 135315456, inode = 0 }
+vm_state.vm_map: 23329.181388935 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 159870976, end = 160952320, flags = 1048691, pgoff = 159870976, inode = 0 }
+vm_state.vm_map: 23329.181391145 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3060703232, end = 3060723712, flags = 1048691, pgoff = 3060703232, inode = 0 }
+vm_state.vm_map: 23329.181393973 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3060723712, end = 3060785152, flags = 134217841, pgoff = 0, inode = 649749 }
+vm_state.vm_map: 23329.181398956 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3060785152, end = 3060793344, flags = 134217845, pgoff = 0, inode = 87435 }
+vm_state.vm_map: 23329.181400994 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3060793344, end = 3060797440, flags = 135266419, pgoff = 4096, inode = 87435 }
+vm_state.vm_map: 23329.181403136 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3060797440, end = 3060801536, flags = 134217937, pgoff = 0, inode = 1196150 }
+vm_state.vm_map: 23329.181405347 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3060801536, end = 3060826112, flags = 134217937, pgoff = 0, inode = 1196354 }
+vm_state.vm_map: 23329.181407551 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3060826112, end = 3060830208, flags = 134217937, pgoff = 0, inode = 1196334 }
+vm_state.vm_map: 23329.181409724 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3060830208, end = 3060834304, flags = 134217937, pgoff = 0, inode = 1196333 }
+vm_state.vm_map: 23329.181411861 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3060834304, end = 3060838400, flags = 134217937, pgoff = 0, inode = 1196331 }
+vm_state.vm_map: 23329.181414182 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3060838400, end = 3060842496, flags = 134217937, pgoff = 0, inode = 1196330 }
+vm_state.vm_map: 23329.181416344 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3060842496, end = 3060850688, flags = 134217937, pgoff = 0, inode = 1196329 }
+vm_state.vm_map: 23329.181418597 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3060850688, end = 3060883456, flags = 134217937, pgoff = 0, inode = 1196328 }
+vm_state.vm_map: 23329.181420888 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3060883456, end = 3060895744, flags = 134217937, pgoff = 0, inode = 1196327 }
+vm_state.vm_map: 23329.181423265 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3060895744, end = 3060903936, flags = 134217937, pgoff = 0, inode = 1196320 }
+vm_state.vm_map: 23329.181425432 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3060903936, end = 3060908032, flags = 134217937, pgoff = 0, inode = 1196318 }
+vm_state.vm_map: 23329.181427859 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3060908032, end = 3060912128, flags = 134217937, pgoff = 0, inode = 1196278 }
+vm_state.vm_map: 23329.181430514 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3060912128, end = 3060916224, flags = 134217937, pgoff = 0, inode = 1196251 }
+vm_state.vm_map: 23329.181432737 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3060916224, end = 3060944896, flags = 134217937, pgoff = 0, inode = 1196236 }
+vm_state.vm_map: 23329.181435089 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3060944896, end = 3060957184, flags = 134217937, pgoff = 0, inode = 1196234 }
+vm_state.vm_map: 23329.181437256 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3060957184, end = 3060961280, flags = 134217937, pgoff = 0, inode = 1196201 }
+vm_state.vm_map: 23329.181439399 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3060961280, end = 3060969472, flags = 134217937, pgoff = 0, inode = 1196170 }
+vm_state.vm_map: 23329.181441553 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3060969472, end = 3060973568, flags = 134217937, pgoff = 0, inode = 1196157 }
+vm_state.vm_map: 23329.181443887 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3060973568, end = 3060977664, flags = 134217937, pgoff = 0, inode = 1196171 }
+vm_state.vm_map: 23329.181446025 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3060977664, end = 3060989952, flags = 134217937, pgoff = 0, inode = 1196172 }
+vm_state.vm_map: 23329.181448234 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3060989952, end = 3060998144, flags = 134217937, pgoff = 0, inode = 1196173 }
+vm_state.vm_map: 23329.181450364 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3060998144, end = 3061030912, flags = 134217937, pgoff = 0, inode = 1196352 }
+vm_state.vm_map: 23329.181452570 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3061030912, end = 3061051392, flags = 134217937, pgoff = 0, inode = 1196196 }
+vm_state.vm_map: 23329.181454600 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3061051392, end = 3061059584, flags = 134217937, pgoff = 0, inode = 1196343 }
+vm_state.vm_map: 23329.181456849 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3061059584, end = 3061088256, flags = 134217937, pgoff = 0, inode = 1196314 }
+vm_state.vm_map: 23329.181458979 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3061088256, end = 3061133312, flags = 134217937, pgoff = 0, inode = 1196147 }
+vm_state.vm_map: 23329.181461202 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3061133312, end = 3061190656, flags = 134217937, pgoff = 0, inode = 1196094 }
+vm_state.vm_map: 23329.181463436 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3061190656, end = 3061202944, flags = 134217937, pgoff = 0, inode = 1196342 }
+vm_state.vm_map: 23329.181466184 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3061202944, end = 3061260288, flags = 134217937, pgoff = 0, inode = 1196355 }
+vm_state.vm_map: 23329.181468660 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3061260288, end = 3061653504, flags = 134217979, pgoff = 0, inode = 262145 }
+vm_state.vm_map: 23329.181518927 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3061653504, end = 3062046720, flags = 134217979, pgoff = 0, inode = 229376 }
+vm_state.vm_map: 23329.181521539 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062046720, end = 3062075392, flags = 134217845, pgoff = 0, inode = 1065218 }
+vm_state.vm_map: 23329.181523693 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062075392, end = 3062079488, flags = 135266419, pgoff = 28672, inode = 1065218 }
+vm_state.vm_map: 23329.181529163 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062079488, end = 3062132736, flags = 134217845, pgoff = 0, inode = 24466 }
+vm_state.vm_map: 23329.181531214 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062132736, end = 3062136832, flags = 135266419, pgoff = 49152, inode = 24466 }
+vm_state.vm_map: 23329.181533437 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062136832, end = 3062157312, flags = 134217845, pgoff = 0, inode = 23692 }
+vm_state.vm_map: 23329.181535493 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062157312, end = 3062161408, flags = 135266419, pgoff = 16384, inode = 23692 }
+vm_state.vm_map: 23329.181537770 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062161408, end = 3062325248, flags = 134217845, pgoff = 0, inode = 21283 }
+vm_state.vm_map: 23329.181539802 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062325248, end = 3062329344, flags = 135266419, pgoff = 159744, inode = 21283 }
+vm_state.vm_map: 23329.181542370 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062329344, end = 3062390784, flags = 134217845, pgoff = 0, inode = 1065430 }
+vm_state.vm_map: 23329.181544470 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062390784, end = 3062394880, flags = 135266419, pgoff = 57344, inode = 1065430 }
+vm_state.vm_map: 23329.181549076 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062427648, end = 3062452224, flags = 134217845, pgoff = 0, inode = 87514 }
+vm_state.vm_map: 23329.181551663 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062452224, end = 3062456320, flags = 135266419, pgoff = 20480, inode = 87514 }
+vm_state.vm_map: 23329.181554028 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062456320, end = 3062489088, flags = 134217841, pgoff = 0, inode = 74138 }
+vm_state.vm_map: 23329.181556479 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062489088, end = 3062530048, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.181558554 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062530048, end = 3062534144, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.181560548 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062534144, end = 3062538240, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.181562889 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062538240, end = 3062575104, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.181564920 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062575104, end = 3062579200, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.181567007 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062579200, end = 3062583296, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.181569341 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062583296, end = 3062661120, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.181571311 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062661120, end = 3062665216, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.181573317 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062665216, end = 3062669312, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.181575423 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062669312, end = 3062677504, flags = 1048691, pgoff = 3062669312, inode = 0 }
+vm_state.vm_map: 23329.181577689 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062677504, end = 3062702080, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.181579628 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062702080, end = 3062706176, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.181581832 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062706176, end = 3062710272, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.181584123 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062726656, end = 3062755328, flags = 134217845, pgoff = 0, inode = 23696 }
+vm_state.vm_map: 23329.181586494 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062755328, end = 3062759424, flags = 135266419, pgoff = 24576, inode = 23696 }
+vm_state.vm_map: 23329.181588945 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062759424, end = 3062775808, flags = 134217845, pgoff = 0, inode = 1065432 }
+vm_state.vm_map: 23329.181590933 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062775808, end = 3062779904, flags = 135266419, pgoff = 12288, inode = 1065432 }
+vm_state.vm_map: 23329.181595576 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062779904, end = 3062800384, flags = 134217845, pgoff = 0, inode = 314599 }
+vm_state.vm_map: 23329.181597732 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062800384, end = 3062804480, flags = 135266419, pgoff = 16384, inode = 314599 }
+vm_state.vm_map: 23329.181600084 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062804480, end = 3062943744, flags = 134217841, pgoff = 0, inode = 74520 }
+vm_state.vm_map: 23329.181602239 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3062943744, end = 3064274944, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.181604350 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064274944, end = 3064287232, flags = 1048691, pgoff = 3064274944, inode = 0 }
+vm_state.vm_map: 23329.181606537 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064287232, end = 3064303616, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.181608641 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064303616, end = 3064307712, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.181610765 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064307712, end = 3064315904, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.181612864 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064315904, end = 3064320000, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.181615075 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064320000, end = 3064332288, flags = 134217845, pgoff = 0, inode = 20765 }
+vm_state.vm_map: 23329.181617045 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064332288, end = 3064336384, flags = 135266419, pgoff = 8192, inode = 20765 }
+vm_state.vm_map: 23329.181619372 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064336384, end = 3064397824, flags = 134217845, pgoff = 0, inode = 19423 }
+vm_state.vm_map: 23329.181621768 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064397824, end = 3064401920, flags = 135266419, pgoff = 57344, inode = 19423 }
+vm_state.vm_map: 23329.181623775 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064401920, end = 3064406016, flags = 1048691, pgoff = 3064401920, inode = 0 }
+vm_state.vm_map: 23329.181626041 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064406016, end = 3064418304, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 23329.181628066 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064418304, end = 3064422400, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 23329.181630326 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064422400, end = 3064569856, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.181632438 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064569856, end = 3064578048, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.181634667 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064578048, end = 3064676352, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.181636618 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064676352, end = 3064680448, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.181638933 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064680448, end = 3064705024, flags = 134217845, pgoff = 0, inode = 22612 }
+vm_state.vm_map: 23329.181712163 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064705024, end = 3064709120, flags = 135266419, pgoff = 20480, inode = 22612 }
+vm_state.vm_map: 23329.181718461 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064709120, end = 3064721408, flags = 134217845, pgoff = 0, inode = 21323 }
+vm_state.vm_map: 23329.181720529 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064721408, end = 3064725504, flags = 135266419, pgoff = 8192, inode = 21323 }
+vm_state.vm_map: 23329.181722789 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064725504, end = 3064729600, flags = 1048691, pgoff = 3064725504, inode = 0 }
+vm_state.vm_map: 23329.181725228 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064729600, end = 3064872960, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 23329.181727272 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064872960, end = 3064877056, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 23329.181730396 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064877056, end = 3064954880, flags = 134217845, pgoff = 0, inode = 24576 }
+vm_state.vm_map: 23329.181732625 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064954880, end = 3064958976, flags = 135266419, pgoff = 77824, inode = 24576 }
+vm_state.vm_map: 23329.181735120 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064958976, end = 3064991744, flags = 134217845, pgoff = 0, inode = 24194 }
+vm_state.vm_map: 23329.181737169 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064991744, end = 3064995840, flags = 135266419, pgoff = 28672, inode = 24194 }
+vm_state.vm_map: 23329.181739609 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3064995840, end = 3065462784, flags = 134217845, pgoff = 0, inode = 23967 }
+vm_state.vm_map: 23329.181741702 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3065462784, end = 3065470976, flags = 135266419, pgoff = 462848, inode = 23967 }
+vm_state.vm_map: 23329.181743770 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3065470976, end = 3065475072, flags = 1048691, pgoff = 3065470976, inode = 0 }
+vm_state.vm_map: 23329.181746245 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3065475072, end = 3065831424, flags = 134217845, pgoff = 0, inode = 1065307 }
+vm_state.vm_map: 23329.181748320 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3065831424, end = 3065839616, flags = 135266419, pgoff = 356352, inode = 1065307 }
+vm_state.vm_map: 23329.181750333 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3065839616, end = 3065843712, flags = 1048691, pgoff = 3065839616, inode = 0 }
+vm_state.vm_map: 23329.181752710 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3065843712, end = 3065942016, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 23329.181754822 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3065942016, end = 3065946112, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 23329.181756823 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3065946112, end = 3065950208, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 23329.181759144 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3065950208, end = 3066019840, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 23329.181761317 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066019840, end = 3066023936, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 23329.181763312 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066023936, end = 3066028032, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 23329.181765726 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066028032, end = 3066036224, flags = 1048691, pgoff = 3066028032, inode = 0 }
+vm_state.vm_map: 23329.181768103 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066036224, end = 3066228736, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.181770147 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066228736, end = 3066232832, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.181772370 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066232832, end = 3066241024, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.181774543 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066241024, end = 3066245120, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.181776532 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066245120, end = 3066249216, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.181778828 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066249216, end = 3066327040, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.181780922 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066327040, end = 3066331136, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.181782972 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066331136, end = 3066335232, flags = 1048691, pgoff = 3066331136, inode = 0 }
+vm_state.vm_map: 23329.181785423 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066335232, end = 3066368000, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 23329.181787436 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066368000, end = 3066372096, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 23329.181789794 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066372096, end = 3066396672, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 23329.181791956 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066396672, end = 3066400768, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 23329.181794222 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066400768, end = 3066433536, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 23329.181796358 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066433536, end = 3066437632, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 23329.181798612 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066437632, end = 3066445824, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 23329.181801100 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066445824, end = 3066449920, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 23329.181803335 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066449920, end = 3066482688, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 23329.181805385 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066482688, end = 3066486784, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 23329.181807491 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066486784, end = 3066540032, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 23329.181809609 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066540032, end = 3066544128, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 23329.181811714 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066544128, end = 3066548224, flags = 1048691, pgoff = 3066544128, inode = 0 }
+vm_state.vm_map: 23329.181813900 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066548224, end = 3066564608, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 23329.181816147 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066564608, end = 3066568704, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 23329.181818309 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066568704, end = 3066576896, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 23329.181820408 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066576896, end = 3066580992, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 23329.181822939 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066580992, end = 3066589184, flags = 134217845, pgoff = 0, inode = 17721 }
+vm_state.vm_map: 23329.181825033 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066589184, end = 3066593280, flags = 135266419, pgoff = 4096, inode = 17721 }
+vm_state.vm_map: 23329.181827273 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3066593280, end = 3067056128, flags = 134217845, pgoff = 0, inode = 20061 }
+vm_state.vm_map: 23329.181829261 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3067056128, end = 3067068416, flags = 135266419, pgoff = 458752, inode = 20061 }
+vm_state.vm_map: 23329.181831521 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3067068416, end = 3067674624, flags = 134217845, pgoff = 0, inode = 22471 }
+vm_state.vm_map: 23329.181833701 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3067674624, end = 3067691008, flags = 135266419, pgoff = 602112, inode = 22471 }
+vm_state.vm_map: 23329.181836227 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3067691008, end = 3069005824, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.181838177 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3069005824, end = 3069014016, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.181840129 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3069014016, end = 3069018112, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.181842259 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3069018112, end = 3069034496, flags = 1048691, pgoff = 3069018112, inode = 0 }
+vm_state.vm_map: 23329.181844494 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3069034496, end = 3069120512, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.181846451 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3069120512, end = 3069124608, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.181848526 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3069124608, end = 3069128704, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.181850638 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3069128704, end = 3069136896, flags = 1048691, pgoff = 3069128704, inode = 0 }
+vm_state.vm_map: 23329.181853009 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3069136896, end = 3070287872, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.181855127 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3070287872, end = 3070304256, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.181859720 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3070304256, end = 3070328832, flags = 134217845, pgoff = 0, inode = 17404 }
+vm_state.vm_map: 23329.181861777 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3070328832, end = 3070332928, flags = 135266419, pgoff = 20480, inode = 17404 }
+vm_state.vm_map: 23329.181864166 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3070332928, end = 3070369792, flags = 134217845, pgoff = 0, inode = 22478 }
+vm_state.vm_map: 23329.181866284 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3070369792, end = 3070373888, flags = 135266419, pgoff = 32768, inode = 22478 }
+vm_state.vm_map: 23329.181868464 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3070373888, end = 3070459904, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 23329.181870970 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3070459904, end = 3070464000, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 23329.181873107 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3070464000, end = 3070476288, flags = 1048691, pgoff = 3070464000, inode = 0 }
+vm_state.vm_map: 23329.181875293 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3070476288, end = 3070504960, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 23329.181877349 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3070504960, end = 3070509056, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 23329.181879652 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3070509056, end = 3071246336, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.181881862 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3071246336, end = 3071250432, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.181884195 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3071250432, end = 3071279104, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.181886228 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3071279104, end = 3071283200, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.181888444 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3071283200, end = 3071287296, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.181890593 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3071287296, end = 3071303680, flags = 134217845, pgoff = 0, inode = 19625 }
+vm_state.vm_map: 23329.181892798 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3071303680, end = 3071307776, flags = 135266419, pgoff = 12288, inode = 19625 }
+vm_state.vm_map: 23329.181895162 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3071307776, end = 3071320064, flags = 134217845, pgoff = 0, inode = 19626 }
+vm_state.vm_map: 23329.181897256 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3071320064, end = 3071324160, flags = 135266419, pgoff = 8192, inode = 19626 }
+vm_state.vm_map: 23329.181899477 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3071324160, end = 3071565824, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.181901484 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3071565824, end = 3071569920, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.181903583 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3071569920, end = 3071574016, flags = 1048691, pgoff = 3071569920, inode = 0 }
+vm_state.vm_map: 23329.181906178 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3071574016, end = 3071758336, flags = 134217845, pgoff = 0, inode = 22064 }
+vm_state.vm_map: 23329.181908326 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3071758336, end = 3071766528, flags = 135266419, pgoff = 180224, inode = 22064 }
+vm_state.vm_map: 23329.181910487 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3071766528, end = 3072237568, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 23329.181912593 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3072237568, end = 3072253952, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 23329.181917501 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3072253952, end = 3072524288, flags = 134217845, pgoff = 0, inode = 22793 }
+vm_state.vm_map: 23329.181919551 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3072524288, end = 3072532480, flags = 135266419, pgoff = 266240, inode = 22793 }
+vm_state.vm_map: 23329.181922144 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3072532480, end = 3073011712, flags = 134217845, pgoff = 0, inode = 21325 }
+vm_state.vm_map: 23329.181924237 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3073011712, end = 3073019904, flags = 135266419, pgoff = 479232, inode = 21325 }
+vm_state.vm_map: 23329.181926516 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3073019904, end = 3073617920, flags = 134217845, pgoff = 0, inode = 19628 }
+vm_state.vm_map: 23329.181928609 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3073617920, end = 3073626112, flags = 135266419, pgoff = 598016, inode = 19628 }
+vm_state.vm_map: 23329.181930677 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3073626112, end = 3073630208, flags = 1048691, pgoff = 3073626112, inode = 0 }
+vm_state.vm_map: 23329.181935419 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3073630208, end = 3073671168, flags = 134217845, pgoff = 0, inode = 22795 }
+vm_state.vm_map: 23329.181937525 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3073671168, end = 3073675264, flags = 135266419, pgoff = 36864, inode = 22795 }
+vm_state.vm_map: 23329.181939655 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3073675264, end = 3073822720, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.181942162 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3073822720, end = 3073826816, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.181944181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3073826816, end = 3073830912, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.181946620 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3073830912, end = 3073929216, flags = 134217845, pgoff = 0, inode = 22669 }
+vm_state.vm_map: 23329.181948590 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3073929216, end = 3073933312, flags = 135266419, pgoff = 94208, inode = 22669 }
+vm_state.vm_map: 23329.181951115 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3073933312, end = 3074080768, flags = 134217845, pgoff = 0, inode = 22796 }
+vm_state.vm_map: 23329.181953085 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3074080768, end = 3074084864, flags = 135266419, pgoff = 147456, inode = 22796 }
+vm_state.vm_map: 23329.181955345 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3074084864, end = 3074187264, flags = 134217845, pgoff = 0, inode = 21552 }
+vm_state.vm_map: 23329.181957271 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3074187264, end = 3074195456, flags = 135266419, pgoff = 98304, inode = 21552 }
+vm_state.vm_map: 23329.181959340 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3074195456, end = 3074199552, flags = 1048691, pgoff = 3074195456, inode = 0 }
+vm_state.vm_map: 23329.181961853 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3074199552, end = 3074797568, flags = 134217845, pgoff = 0, inode = 22668 }
+vm_state.vm_map: 23329.181963909 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3074797568, end = 3074809856, flags = 135266419, pgoff = 593920, inode = 22668 }
+vm_state.vm_map: 23329.181966433 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3074809856, end = 3078709248, flags = 134217845, pgoff = 0, inode = 21427 }
+vm_state.vm_map: 23329.181968502 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3078709248, end = 3078733824, flags = 135266419, pgoff = 3895296, inode = 21427 }
+vm_state.vm_map: 23329.181970547 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3078733824, end = 3078737920, flags = 1048691, pgoff = 3078733824, inode = 0 }
+vm_state.vm_map: 23329.181972769 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3078750208, end = 3078754304, flags = 1048691, pgoff = 3078750208, inode = 0 }
+vm_state.vm_map: 23329.181974954 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3078754304, end = 3078782976, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.181977720 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3078782976, end = 3078832128, flags = 134217841, pgoff = 0, inode = 74519 }
+vm_state.vm_map: 23329.181979814 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3078832128, end = 3078840320, flags = 1048691, pgoff = 3078832128, inode = 0 }
+vm_state.vm_map: 23329.181982112 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3078840320, end = 3078844416, flags = 67371125, pgoff = 3078840320, inode = 0 }
+vm_state.vm_map: 23329.181984259 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3078844416, end = 3078959104, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.181986223 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3078959104, end = 3078963200, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.181988433 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3078963200, end = 3078967296, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.181990409 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2269, start = 3213529088, end = 3213615104, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.181993311 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 134512640, end = 134545408, flags = 134223989, pgoff = 0, inode = 658091 }
+vm_state.vm_map: 23329.181995608 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 134545408, end = 134549504, flags = 135272563, pgoff = 32768, inode = 658091 }
+vm_state.vm_map: 23329.181997677 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 134635520, end = 135053312, flags = 1048691, pgoff = 134635520, inode = 0 }
+vm_state.vm_map: 23329.182002338 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063250944, end = 3063279616, flags = 134217845, pgoff = 0, inode = 1065218 }
+vm_state.vm_map: 23329.182004382 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063279616, end = 3063283712, flags = 135266419, pgoff = 28672, inode = 1065218 }
+vm_state.vm_map: 23329.182006790 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063283712, end = 3063336960, flags = 134217845, pgoff = 0, inode = 24466 }
+vm_state.vm_map: 23329.182008754 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063336960, end = 3063341056, flags = 135266419, pgoff = 49152, inode = 24466 }
+vm_state.vm_map: 23329.182011082 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063341056, end = 3063504896, flags = 134217845, pgoff = 0, inode = 21283 }
+vm_state.vm_map: 23329.182013385 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063504896, end = 3063508992, flags = 135266419, pgoff = 159744, inode = 21283 }
+vm_state.vm_map: 23329.182015712 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063508992, end = 3063537664, flags = 134217845, pgoff = 0, inode = 23696 }
+vm_state.vm_map: 23329.182017645 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063537664, end = 3063541760, flags = 135266419, pgoff = 24576, inode = 23696 }
+vm_state.vm_map: 23329.182019837 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063541760, end = 3063603200, flags = 134217845, pgoff = 0, inode = 1065430 }
+vm_state.vm_map: 23329.182021862 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063603200, end = 3063607296, flags = 135266419, pgoff = 57344, inode = 1065430 }
+vm_state.vm_map: 23329.182024357 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063701504, end = 3063742464, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.182026469 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063742464, end = 3063746560, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.182028654 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063746560, end = 3063750656, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.182030896 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063750656, end = 3063787520, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.182032952 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063787520, end = 3063791616, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.182034922 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063791616, end = 3063795712, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.182037268 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063795712, end = 3063873536, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.182039460 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063873536, end = 3063877632, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.182041496 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063877632, end = 3063881728, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.182043473 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063881728, end = 3063889920, flags = 1048691, pgoff = 3063881728, inode = 0 }
+vm_state.vm_map: 23329.182045633 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063889920, end = 3063914496, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.182048165 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063914496, end = 3063918592, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.182050190 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063918592, end = 3063922688, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.182052419 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063926784, end = 3063947264, flags = 134217845, pgoff = 0, inode = 23692 }
+vm_state.vm_map: 23329.182054463 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063947264, end = 3063951360, flags = 135266419, pgoff = 16384, inode = 23692 }
+vm_state.vm_map: 23329.182056717 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063951360, end = 3063967744, flags = 134217845, pgoff = 0, inode = 19625 }
+vm_state.vm_map: 23329.182058805 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063967744, end = 3063971840, flags = 135266419, pgoff = 12288, inode = 19625 }
+vm_state.vm_map: 23329.182061101 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063971840, end = 3063988224, flags = 134217845, pgoff = 0, inode = 1065432 }
+vm_state.vm_map: 23329.182063089 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063988224, end = 3063992320, flags = 135266419, pgoff = 12288, inode = 1065432 }
+vm_state.vm_map: 23329.182065306 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3063992320, end = 3064012800, flags = 134217845, pgoff = 0, inode = 314599 }
+vm_state.vm_map: 23329.182067232 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3064012800, end = 3064016896, flags = 135266419, pgoff = 16384, inode = 314599 }
+vm_state.vm_map: 23329.182069554 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3064016896, end = 3064156160, flags = 134217841, pgoff = 0, inode = 74520 }
+vm_state.vm_map: 23329.182071851 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3064156160, end = 3065487360, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.182074098 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3065487360, end = 3065499648, flags = 1048691, pgoff = 3065487360, inode = 0 }
+vm_state.vm_map: 23329.182076377 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3065499648, end = 3065516032, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.182078513 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3065516032, end = 3065520128, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.182080686 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3065520128, end = 3065528320, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.182083144 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3065528320, end = 3065532416, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.182085435 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3065532416, end = 3065561088, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.182087472 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3065561088, end = 3065565184, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.182089522 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3065565184, end = 3065569280, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.182091973 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3065569280, end = 3065794560, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.182094023 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3065794560, end = 3065798656, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.182096080 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3065798656, end = 3065802752, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.182098623 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3065802752, end = 3065917440, flags = 134217845, pgoff = 0, inode = 17291 }
+vm_state.vm_map: 23329.182100618 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3065917440, end = 3065921536, flags = 135266419, pgoff = 114688, inode = 17291 }
+vm_state.vm_map: 23329.182102822 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3065921536, end = 3065925632, flags = 1048691, pgoff = 3065921536, inode = 0 }
+vm_state.vm_map: 23329.182105236 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3065925632, end = 3065950208, flags = 134217845, pgoff = 0, inode = 22612 }
+vm_state.vm_map: 23329.182107255 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3065950208, end = 3065954304, flags = 135266419, pgoff = 20480, inode = 22612 }
+vm_state.vm_map: 23329.182109571 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3065954304, end = 3065966592, flags = 134217845, pgoff = 0, inode = 21323 }
+vm_state.vm_map: 23329.182111732 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3065966592, end = 3065970688, flags = 135266419, pgoff = 8192, inode = 21323 }
+vm_state.vm_map: 23329.182113824 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3065970688, end = 3066114048, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 23329.182115758 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3066114048, end = 3066118144, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 23329.182118814 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3066118144, end = 3066204160, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.182120827 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3066204160, end = 3066208256, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.182122933 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3066208256, end = 3066212352, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.182125001 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3066212352, end = 3066220544, flags = 1048691, pgoff = 3066212352, inode = 0 }
+vm_state.vm_map: 23329.182127309 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3066220544, end = 3066298368, flags = 134217845, pgoff = 0, inode = 24576 }
+vm_state.vm_map: 23329.182129446 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3066298368, end = 3066302464, flags = 135266419, pgoff = 77824, inode = 24576 }
+vm_state.vm_map: 23329.182131496 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3066302464, end = 3066306560, flags = 1048691, pgoff = 3066302464, inode = 0 }
+vm_state.vm_map: 23329.182133799 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3066306560, end = 3066339328, flags = 134217845, pgoff = 0, inode = 24194 }
+vm_state.vm_map: 23329.182135787 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3066339328, end = 3066343424, flags = 135266419, pgoff = 28672, inode = 24194 }
+vm_state.vm_map: 23329.182138121 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3066343424, end = 3066810368, flags = 134217845, pgoff = 0, inode = 23967 }
+vm_state.vm_map: 23329.182140146 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3066810368, end = 3066818560, flags = 135266419, pgoff = 462848, inode = 23967 }
+vm_state.vm_map: 23329.182142240 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3066818560, end = 3066822656, flags = 1048691, pgoff = 3066818560, inode = 0 }
+vm_state.vm_map: 23329.182144401 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3066822656, end = 3067179008, flags = 134217845, pgoff = 0, inode = 1065307 }
+vm_state.vm_map: 23329.182146494 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067179008, end = 3067187200, flags = 135266419, pgoff = 356352, inode = 1065307 }
+vm_state.vm_map: 23329.182148717 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067187200, end = 3067285504, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.182150822 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067285504, end = 3067289600, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.182153446 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067289600, end = 3067367424, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.182155490 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067367424, end = 3067371520, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.182157460 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067371520, end = 3067375616, flags = 1048691, pgoff = 3067371520, inode = 0 }
+vm_state.vm_map: 23329.182159788 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067375616, end = 3067408384, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 23329.182161831 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067408384, end = 3067412480, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 23329.182164227 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067412480, end = 3067437056, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 23329.182166197 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067437056, end = 3067441152, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 23329.182168642 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067441152, end = 3067473920, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 23329.182170710 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067473920, end = 3067478016, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 23329.182172896 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067478016, end = 3067486208, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 23329.182174891 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067486208, end = 3067490304, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 23329.182177237 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067490304, end = 3067523072, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 23329.182179201 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067523072, end = 3067527168, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 23329.182181355 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067527168, end = 3067580416, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 23329.182183523 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067580416, end = 3067584512, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 23329.182185542 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067584512, end = 3067588608, flags = 1048691, pgoff = 3067584512, inode = 0 }
+vm_state.vm_map: 23329.182188301 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067588608, end = 3067686912, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 23329.182190284 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067686912, end = 3067691008, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 23329.182192575 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067691008, end = 3067695104, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 23329.182194766 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067695104, end = 3067764736, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 23329.182196729 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067764736, end = 3067768832, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 23329.182198922 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067768832, end = 3067772928, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 23329.182201064 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067772928, end = 3067781120, flags = 1048691, pgoff = 3067772928, inode = 0 }
+vm_state.vm_map: 23329.182203361 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067781120, end = 3067973632, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.182205398 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067973632, end = 3067977728, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.182207584 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067977728, end = 3067985920, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.182209665 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067985920, end = 3067990016, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.182211715 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067990016, end = 3067994112, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.182214012 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3067994112, end = 3068141568, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.182216006 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3068141568, end = 3068149760, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.182217945 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3068149760, end = 3068153856, flags = 1048691, pgoff = 3068149760, inode = 0 }
+vm_state.vm_map: 23329.182220359 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3068153856, end = 3068403712, flags = 134217845, pgoff = 0, inode = 17169 }
+vm_state.vm_map: 23329.182222878 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3068403712, end = 3068411904, flags = 135266419, pgoff = 245760, inode = 17169 }
+vm_state.vm_map: 23329.182225114 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3068411904, end = 3068559360, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.182227201 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3068559360, end = 3068563456, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.182229250 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3068563456, end = 3068567552, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.182231436 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3068567552, end = 3068579840, flags = 134217845, pgoff = 0, inode = 19626 }
+vm_state.vm_map: 23329.182233529 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3068579840, end = 3068583936, flags = 135266419, pgoff = 8192, inode = 19626 }
+vm_state.vm_map: 23329.182235709 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3068583936, end = 3068768256, flags = 134217845, pgoff = 0, inode = 22064 }
+vm_state.vm_map: 23329.182237883 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3068768256, end = 3068776448, flags = 135266419, pgoff = 180224, inode = 22064 }
+vm_state.vm_map: 23329.182240136 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3068776448, end = 3069247488, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 23329.182242217 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3069247488, end = 3069263872, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 23329.182244384 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3069263872, end = 3069267968, flags = 1048691, pgoff = 3069263872, inode = 0 }
+vm_state.vm_map: 23329.182246620 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3069267968, end = 3069538304, flags = 134217845, pgoff = 0, inode = 22793 }
+vm_state.vm_map: 23329.182248713 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3069538304, end = 3069546496, flags = 135266419, pgoff = 266240, inode = 22793 }
+vm_state.vm_map: 23329.182251003 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3069546496, end = 3069693952, flags = 134217845, pgoff = 0, inode = 22796 }
+vm_state.vm_map: 23329.182253152 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3069693952, end = 3069698048, flags = 135266419, pgoff = 147456, inode = 22796 }
+vm_state.vm_map: 23329.182255437 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3069698048, end = 3070177280, flags = 134217845, pgoff = 0, inode = 21325 }
+vm_state.vm_map: 23329.182257931 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3070177280, end = 3070185472, flags = 135266419, pgoff = 479232, inode = 21325 }
+vm_state.vm_map: 23329.182260080 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3070185472, end = 3070287872, flags = 134217845, pgoff = 0, inode = 21552 }
+vm_state.vm_map: 23329.182262166 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3070287872, end = 3070296064, flags = 135266419, pgoff = 98304, inode = 21552 }
+vm_state.vm_map: 23329.182264333 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3070296064, end = 3070312448, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 23329.182266451 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3070312448, end = 3070316544, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 23329.182268607 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3070316544, end = 3070324736, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 23329.182270713 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3070324736, end = 3070328832, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 23329.182272867 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3070328832, end = 3070332928, flags = 1048691, pgoff = 3070328832, inode = 0 }
+vm_state.vm_map: 23329.182275133 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3070332928, end = 3070341120, flags = 134217845, pgoff = 0, inode = 17721 }
+vm_state.vm_map: 23329.182277257 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3070341120, end = 3070345216, flags = 135266419, pgoff = 4096, inode = 17721 }
+vm_state.vm_map: 23329.182279480 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3070345216, end = 3071496192, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.182281492 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3071496192, end = 3071512576, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.182283697 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3071512576, end = 3071553536, flags = 134217845, pgoff = 0, inode = 22795 }
+vm_state.vm_map: 23329.182285703 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3071553536, end = 3071557632, flags = 135266419, pgoff = 36864, inode = 22795 }
+vm_state.vm_map: 23329.182288031 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3071557632, end = 3072155648, flags = 134217845, pgoff = 0, inode = 22668 }
+vm_state.vm_map: 23329.182289982 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3072155648, end = 3072167936, flags = 135266419, pgoff = 593920, inode = 22668 }
+vm_state.vm_map: 23329.182292607 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3072167936, end = 3073482752, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.182294786 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3073482752, end = 3073490944, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.182296960 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3073490944, end = 3073495040, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.182299059 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3073495040, end = 3073511424, flags = 1048691, pgoff = 3073495040, inode = 0 }
+vm_state.vm_map: 23329.182301300 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3073511424, end = 3074248704, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.182303282 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3074248704, end = 3074252800, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.182305530 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3074252800, end = 3074494464, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.182307524 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3074494464, end = 3074498560, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.182309877 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3074498560, end = 3075096576, flags = 134217845, pgoff = 0, inode = 19628 }
+vm_state.vm_map: 23329.182311877 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3075096576, end = 3075104768, flags = 135266419, pgoff = 598016, inode = 19628 }
+vm_state.vm_map: 23329.182314452 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3075104768, end = 3075219456, flags = 134217845, pgoff = 0, inode = 17171 }
+vm_state.vm_map: 23329.182316471 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3075219456, end = 3075223552, flags = 135266419, pgoff = 114688, inode = 17171 }
+vm_state.vm_map: 23329.182318879 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3075223552, end = 3075301376, flags = 134217845, pgoff = 0, inode = 1065156 }
+vm_state.vm_map: 23329.182320942 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3075301376, end = 3075305472, flags = 135266419, pgoff = 73728, inode = 1065156 }
+vm_state.vm_map: 23329.182323053 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3075305472, end = 3075309568, flags = 1048691, pgoff = 3075305472, inode = 0 }
+vm_state.vm_map: 23329.182325276 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3075309568, end = 3075407872, flags = 134217845, pgoff = 0, inode = 22669 }
+vm_state.vm_map: 23329.182327586 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3075407872, end = 3075411968, flags = 135266419, pgoff = 94208, inode = 22669 }
+vm_state.vm_map: 23329.182329913 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3075411968, end = 3079311360, flags = 134217845, pgoff = 0, inode = 21427 }
+vm_state.vm_map: 23329.182331926 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3079311360, end = 3079335936, flags = 135266419, pgoff = 3895296, inode = 21427 }
+vm_state.vm_map: 23329.182334012 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3079335936, end = 3079340032, flags = 1048691, pgoff = 3079335936, inode = 0 }
+vm_state.vm_map: 23329.182336205 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3079356416, end = 3079385088, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.182338434 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3079385088, end = 3079434240, flags = 134217841, pgoff = 0, inode = 74519 }
+vm_state.vm_map: 23329.182340515 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3079434240, end = 3079442432, flags = 1048691, pgoff = 3079434240, inode = 0 }
+vm_state.vm_map: 23329.182342522 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3079442432, end = 3079446528, flags = 67371125, pgoff = 3079442432, inode = 0 }
+vm_state.vm_map: 23329.182344879 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3079446528, end = 3079561216, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.182346905 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3079561216, end = 3079565312, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.182349016 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3079565312, end = 3079569408, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.182351060 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2275, start = 3221004288, end = 3221090304, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.182356463 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 134512640, end = 134516736, flags = 134223989, pgoff = 0, inode = 655648 }
+vm_state.vm_map: 23329.182358513 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 134516736, end = 134520832, flags = 135272563, pgoff = 0, inode = 655648 }
+vm_state.vm_map: 23329.182360674 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 141574144, end = 141844480, flags = 1048691, pgoff = 141574144, inode = 0 }
+vm_state.vm_map: 23329.182363378 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3072720896, end = 3072761856, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.182365478 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3072761856, end = 3072765952, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.182367719 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3072765952, end = 3072770048, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.182369985 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3072770048, end = 3072806912, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.182372078 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3072806912, end = 3072811008, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.182374159 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3072811008, end = 3072815104, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.182376561 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3072815104, end = 3072892928, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.182378605 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3072892928, end = 3072897024, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.182380599 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3072897024, end = 3072901120, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.182382810 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3072901120, end = 3072909312, flags = 1048691, pgoff = 3072901120, inode = 0 }
+vm_state.vm_map: 23329.182390275 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3072909312, end = 3073019904, flags = 134217937, pgoff = 0, inode = 32874 }
+vm_state.vm_map: 23329.182395072 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073019904, end = 3073101824, flags = 134217845, pgoff = 0, inode = 1065113 }
+vm_state.vm_map: 23329.182397122 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073101824, end = 3073105920, flags = 135266419, pgoff = 77824, inode = 1065113 }
+vm_state.vm_map: 23329.182400104 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073200128, end = 3073269760, flags = 134217845, pgoff = 0, inode = 429625 }
+vm_state.vm_map: 23329.182402346 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073269760, end = 3073273856, flags = 135266419, pgoff = 65536, inode = 429625 }
+vm_state.vm_map: 23329.182404489 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073273856, end = 3073282048, flags = 1048691, pgoff = 3073273856, inode = 0 }
+vm_state.vm_map: 23329.182406724 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073282048, end = 3073380352, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 23329.182408891 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073380352, end = 3073384448, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 23329.182411065 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073384448, end = 3073388544, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 23329.182413349 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073388544, end = 3073458176, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 23329.182415429 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073458176, end = 3073462272, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 23329.182417573 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073462272, end = 3073466368, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 23329.182419770 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073466368, end = 3073474560, flags = 1048691, pgoff = 3073466368, inode = 0 }
+vm_state.vm_map: 23329.182421987 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073474560, end = 3073482752, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.182424197 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073482752, end = 3073486848, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.182426339 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073486848, end = 3073490944, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.182428482 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073490944, end = 3073519616, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.182430705 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073519616, end = 3073523712, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.182432699 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073523712, end = 3073527808, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.182435515 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073527808, end = 3073613824, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.182437540 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073613824, end = 3073617920, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.182439627 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073617920, end = 3073622016, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.182441770 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073622016, end = 3073634304, flags = 1048691, pgoff = 3073622016, inode = 0 }
+vm_state.vm_map: 23329.182443968 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073634304, end = 3073859584, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.182445981 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073859584, end = 3073863680, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.182448074 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073863680, end = 3073867776, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.182450235 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073867776, end = 3073982464, flags = 134217845, pgoff = 0, inode = 17291 }
+vm_state.vm_map: 23329.182452266 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073982464, end = 3073986560, flags = 135266419, pgoff = 114688, inode = 17291 }
+vm_state.vm_map: 23329.182454483 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3073986560, end = 3074179072, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.182456601 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3074179072, end = 3074183168, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.182458997 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3074183168, end = 3074330624, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.182461121 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3074330624, end = 3074338816, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.182463350 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3074338816, end = 3074351104, flags = 134217845, pgoff = 0, inode = 19626 }
+vm_state.vm_map: 23329.182465406 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3074351104, end = 3074355200, flags = 135266419, pgoff = 8192, inode = 19626 }
+vm_state.vm_map: 23329.182467400 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3074355200, end = 3074359296, flags = 1048691, pgoff = 3074355200, inode = 0 }
+vm_state.vm_map: 23329.182469963 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3074359296, end = 3074957312, flags = 134217845, pgoff = 0, inode = 19628 }
+vm_state.vm_map: 23329.182471908 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3074957312, end = 3074965504, flags = 135266419, pgoff = 598016, inode = 19628 }
+vm_state.vm_map: 23329.182474347 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3074965504, end = 3075215360, flags = 134217845, pgoff = 0, inode = 17169 }
+vm_state.vm_map: 23329.182476359 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3075215360, end = 3075223552, flags = 135266419, pgoff = 245760, inode = 17169 }
+vm_state.vm_map: 23329.182478594 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3075223552, end = 3075338240, flags = 134217845, pgoff = 0, inode = 17171 }
+vm_state.vm_map: 23329.182480645 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3075338240, end = 3075342336, flags = 135266419, pgoff = 114688, inode = 17171 }
+vm_state.vm_map: 23329.182482911 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3075342336, end = 3076657152, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.182485120 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3076657152, end = 3076665344, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.182487270 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3076665344, end = 3076669440, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.182489412 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3076669440, end = 3076681728, flags = 1048691, pgoff = 3076669440, inode = 0 }
+vm_state.vm_map: 23329.182491573 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3076681728, end = 3077419008, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.182493660 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3077419008, end = 3077423104, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.182495673 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3077423104, end = 3077427200, flags = 1048691, pgoff = 3077423104, inode = 0 }
+vm_state.vm_map: 23329.182515604 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3077427200, end = 3077668864, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.182517987 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3077668864, end = 3077672960, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.182524168 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3077672960, end = 3077894144, flags = 134217845, pgoff = 0, inode = 21370 }
+vm_state.vm_map: 23329.182526274 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3077894144, end = 3077902336, flags = 135266419, pgoff = 221184, inode = 21370 }
+vm_state.vm_map: 23329.182528318 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3077902336, end = 3077906432, flags = 1048691, pgoff = 3077902336, inode = 0 }
+vm_state.vm_map: 23329.182530633 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3077906432, end = 3077935104, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.182532881 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3077935104, end = 3077959680, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.182534930 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3077959680, end = 3077963776, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.182537011 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3077963776, end = 3077967872, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.182544427 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3077967872, end = 3077971968, flags = 134217937, pgoff = 0, inode = 237757 }
+vm_state.vm_map: 23329.182546471 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3077996544, end = 3078004736, flags = 1048691, pgoff = 3077996544, inode = 0 }
+vm_state.vm_map: 23329.182548496 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3078004736, end = 3078008832, flags = 67371125, pgoff = 3078004736, inode = 0 }
+vm_state.vm_map: 23329.182550662 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3078008832, end = 3078123520, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.182552786 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3078123520, end = 3078127616, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.182554849 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3078127616, end = 3078131712, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.182556960 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2290, start = 3215253504, end = 3215339520, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.182562389 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 134512640, end = 134553600, flags = 134223989, pgoff = 0, inode = 20759 }
+vm_state.vm_map: 23329.182564556 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 134553600, end = 134557696, flags = 135272563, pgoff = 36864, inode = 20759 }
+vm_state.vm_map: 23329.182566563 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 134557696, end = 134565888, flags = 1048691, pgoff = 134557696, inode = 0 }
+vm_state.vm_map: 23329.182568760 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 153337856, end = 174231552, flags = 1048691, pgoff = 153337856, inode = 0 }
+vm_state.vm_map: 23329.182571279 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2981335040, end = 2981400576, flags = 134217845, pgoff = 0, inode = 57391 }
+vm_state.vm_map: 23329.182573502 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2981400576, end = 2981404672, flags = 135266419, pgoff = 61440, inode = 57391 }
+vm_state.vm_map: 23329.182575725 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2981404672, end = 2981421056, flags = 1048691, pgoff = 2981404672, inode = 0 }
+vm_state.vm_map: 23329.182578201 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2981421056, end = 2981703680, flags = 134217845, pgoff = 0, inode = 22693 }
+vm_state.vm_map: 23329.182580417 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2981703680, end = 2981715968, flags = 135266419, pgoff = 282624, inode = 22693 }
+vm_state.vm_map: 23329.182582579 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2981715968, end = 2981740544, flags = 1048691, pgoff = 2981715968, inode = 0 }
+vm_state.vm_map: 23329.182585011 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2981769216, end = 2981785600, flags = 134217845, pgoff = 0, inode = 57390 }
+vm_state.vm_map: 23329.182587209 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2981785600, end = 2981789696, flags = 135266419, pgoff = 12288, inode = 57390 }
+vm_state.vm_map: 23329.182589932 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2981789696, end = 2981830656, flags = 134217845, pgoff = 0, inode = 57395 }
+vm_state.vm_map: 23329.182592118 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2981830656, end = 2981834752, flags = 135266419, pgoff = 36864, inode = 57395 }
+vm_state.vm_map: 23329.182594742 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2981834752, end = 2981859328, flags = 134217845, pgoff = 0, inode = 18917 }
+vm_state.vm_map: 23329.182597305 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2981859328, end = 2981863424, flags = 135266419, pgoff = 20480, inode = 18917 }
+vm_state.vm_map: 23329.182599898 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2981863424, end = 2982133760, flags = 134217845, pgoff = 0, inode = 18916 }
+vm_state.vm_map: 23329.182602059 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2982133760, end = 2982137856, flags = 135266419, pgoff = 266240, inode = 18916 }
+vm_state.vm_map: 23329.182604591 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2982137856, end = 2982219776, flags = 134217845, pgoff = 0, inode = 18915 }
+vm_state.vm_map: 23329.182606758 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2982219776, end = 2982227968, flags = 135266419, pgoff = 77824, inode = 18915 }
+vm_state.vm_map: 23329.182609148 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2982227968, end = 2983010304, flags = 134217845, pgoff = 0, inode = 18927 }
+vm_state.vm_map: 23329.182611173 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2983010304, end = 2983018496, flags = 135266419, pgoff = 778240, inode = 18927 }
+vm_state.vm_map: 23329.182613692 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2983030784, end = 2983051264, flags = 134217845, pgoff = 0, inode = 57392 }
+vm_state.vm_map: 23329.182615748 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2983051264, end = 2983055360, flags = 135266419, pgoff = 16384, inode = 57392 }
+vm_state.vm_map: 23329.182618119 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2983055360, end = 2983088128, flags = 134217845, pgoff = 0, inode = 57396 }
+vm_state.vm_map: 23329.182620262 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2983088128, end = 2983092224, flags = 135266419, pgoff = 28672, inode = 57396 }
+vm_state.vm_map: 23329.182622676 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2983092224, end = 2983108608, flags = 134217845, pgoff = 0, inode = 57393 }
+vm_state.vm_map: 23329.182624862 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2983108608, end = 2983112704, flags = 135266419, pgoff = 12288, inode = 57393 }
+vm_state.vm_map: 23329.182627133 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2983112704, end = 2983477248, flags = 134217845, pgoff = 0, inode = 22572 }
+vm_state.vm_map: 23329.182631653 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2983477248, end = 2983485440, flags = 135266419, pgoff = 364544, inode = 22572 }
+vm_state.vm_map: 23329.182634592 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2983485440, end = 2983682048, flags = 134217845, pgoff = 0, inode = 20024 }
+vm_state.vm_map: 23329.182636686 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2983682048, end = 2983690240, flags = 135266419, pgoff = 192512, inode = 20024 }
+vm_state.vm_map: 23329.182638772 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2983690240, end = 2983698432, flags = 1048691, pgoff = 2983690240, inode = 0 }
+vm_state.vm_map: 23329.182641410 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2983698432, end = 2984148992, flags = 134217845, pgoff = 0, inode = 20711 }
+vm_state.vm_map: 23329.182643577 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984148992, end = 2984161280, flags = 135266419, pgoff = 450560, inode = 20711 }
+vm_state.vm_map: 23329.182645855 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984161280, end = 2984177664, flags = 134217845, pgoff = 0, inode = 57389 }
+vm_state.vm_map: 23329.182648146 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984177664, end = 2984181760, flags = 135266419, pgoff = 12288, inode = 57389 }
+vm_state.vm_map: 23329.182650436 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984181760, end = 2984198144, flags = 134217845, pgoff = 0, inode = 18914 }
+vm_state.vm_map: 23329.182652480 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984198144, end = 2984202240, flags = 135266419, pgoff = 16384, inode = 18914 }
+vm_state.vm_map: 23329.182655079 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984202240, end = 2984218624, flags = 134217845, pgoff = 0, inode = 57394 }
+vm_state.vm_map: 23329.182657179 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984218624, end = 2984222720, flags = 135266419, pgoff = 16384, inode = 57394 }
+vm_state.vm_map: 23329.182659445 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984222720, end = 2984251392, flags = 134217845, pgoff = 0, inode = 57397 }
+vm_state.vm_map: 23329.182661433 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984251392, end = 2984255488, flags = 135266419, pgoff = 24576, inode = 57397 }
+vm_state.vm_map: 23329.182664063 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984255488, end = 2984382464, flags = 134217845, pgoff = 0, inode = 18923 }
+vm_state.vm_map: 23329.182666132 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984382464, end = 2984386560, flags = 135266419, pgoff = 122880, inode = 18923 }
+vm_state.vm_map: 23329.182668398 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984390656, end = 2984415232, flags = 134217845, pgoff = 0, inode = 57398 }
+vm_state.vm_map: 23329.182670806 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984415232, end = 2984419328, flags = 135266419, pgoff = 24576, inode = 57398 }
+vm_state.vm_map: 23329.182673029 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984419328, end = 2984435712, flags = 134217845, pgoff = 0, inode = 52571 }
+vm_state.vm_map: 23329.182674955 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984435712, end = 2984439808, flags = 135266419, pgoff = 12288, inode = 52571 }
+vm_state.vm_map: 23329.182677178 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984439808, end = 2984452096, flags = 134217845, pgoff = 0, inode = 49489 }
+vm_state.vm_map: 23329.182679240 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984452096, end = 2984456192, flags = 135266419, pgoff = 8192, inode = 49489 }
+vm_state.vm_map: 23329.182681389 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984456192, end = 2984476672, flags = 134217845, pgoff = 0, inode = 52570 }
+vm_state.vm_map: 23329.182683377 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984476672, end = 2984480768, flags = 135266419, pgoff = 16384, inode = 52570 }
+vm_state.vm_map: 23329.182685649 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984480768, end = 2984517632, flags = 134217845, pgoff = 0, inode = 52569 }
+vm_state.vm_map: 23329.182690250 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984517632, end = 2984521728, flags = 135266419, pgoff = 32768, inode = 52569 }
+vm_state.vm_map: 23329.182692676 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984521728, end = 2984546304, flags = 134217845, pgoff = 0, inode = 52572 }
+vm_state.vm_map: 23329.182694837 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984546304, end = 2984550400, flags = 135266419, pgoff = 20480, inode = 52572 }
+vm_state.vm_map: 23329.182697264 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984550400, end = 2984570880, flags = 134217845, pgoff = 0, inode = 52568 }
+vm_state.vm_map: 23329.182699357 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984570880, end = 2984574976, flags = 135266419, pgoff = 16384, inode = 52568 }
+vm_state.vm_map: 23329.182704308 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984574976, end = 2984677376, flags = 134217841, pgoff = 0, inode = 98439 }
+vm_state.vm_map: 23329.182707198 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984677376, end = 2984783872, flags = 134217841, pgoff = 0, inode = 254143 }
+vm_state.vm_map: 23329.182709773 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2984783872, end = 2992558080, flags = 134217841, pgoff = 0, inode = 249255 }
+vm_state.vm_map: 23329.182712187 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2992558080, end = 2992861184, flags = 134217841, pgoff = 0, inode = 49556 }
+vm_state.vm_map: 23329.182718418 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2992861184, end = 2993184768, flags = 134217841, pgoff = 0, inode = 49558 }
+vm_state.vm_map: 23329.182720893 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2993184768, end = 2993283072, flags = 134217841, pgoff = 0, inode = 98501 }
+vm_state.vm_map: 23329.182723054 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2993283072, end = 2993287168, flags = 1048688, pgoff = 2993283072, inode = 0 }
+vm_state.vm_map: 23329.182725197 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 2993287168, end = 3001675776, flags = 1048691, pgoff = 2993287168, inode = 0 }
+vm_state.vm_map: 23329.182727666 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3001675776, end = 3001786368, flags = 134217841, pgoff = 0, inode = 254198 }
+vm_state.vm_map: 23329.182732328 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3001786368, end = 3001827328, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.182734366 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3001827328, end = 3001831424, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.182736397 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3001831424, end = 3001835520, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.182738725 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3001835520, end = 3001872384, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.182757125 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3001872384, end = 3001876480, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.182759255 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3001876480, end = 3001880576, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.182764806 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3001880576, end = 3001958400, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.182766856 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3001958400, end = 3001962496, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.182769011 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3001962496, end = 3001966592, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.182771024 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3001966592, end = 3001974784, flags = 1048691, pgoff = 3001966592, inode = 0 }
+vm_state.vm_map: 23329.182773259 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3001974784, end = 3001999360, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.182775254 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3001999360, end = 3002003456, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.182777396 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3002003456, end = 3002007552, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.182779767 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3002007552, end = 3018248192, flags = 134217979, pgoff = 0, inode = 1204696 }
+vm_state.vm_map: 23329.182782039 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3018248192, end = 3022544896, flags = 134217979, pgoff = 0, inode = 1204694 }
+vm_state.vm_map: 23329.182784311 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3022544896, end = 3022745600, flags = 134217845, pgoff = 0, inode = 124536 }
+vm_state.vm_map: 23329.182786349 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3022745600, end = 3022749696, flags = 135266419, pgoff = 196608, inode = 124536 }
+vm_state.vm_map: 23329.182788597 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3022749696, end = 3022782464, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 23329.182790702 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3022782464, end = 3022786560, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 23329.182792893 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3022786560, end = 3022794752, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 23329.182794987 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3022794752, end = 3022798848, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 23329.182797605 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3022798848, end = 3022823424, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 23329.182799704 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3022823424, end = 3022827520, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 23329.182802014 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3022839808, end = 3022921728, flags = 134217841, pgoff = 0, inode = 98443 }
+vm_state.vm_map: 23329.182806848 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3022921728, end = 3022925824, flags = 134217937, pgoff = 0, inode = 1196150 }
+vm_state.vm_map: 23329.182809003 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3022925824, end = 3022950400, flags = 134217937, pgoff = 0, inode = 1196354 }
+vm_state.vm_map: 23329.182811145 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3022950400, end = 3022954496, flags = 134217937, pgoff = 0, inode = 1196334 }
+vm_state.vm_map: 23329.182813381 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3022954496, end = 3022958592, flags = 134217937, pgoff = 0, inode = 1196333 }
+vm_state.vm_map: 23329.182815554 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3022958592, end = 3022962688, flags = 134217937, pgoff = 0, inode = 1196331 }
+vm_state.vm_map: 23329.182817703 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3022962688, end = 3022966784, flags = 134217937, pgoff = 0, inode = 1196330 }
+vm_state.vm_map: 23329.182819919 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3022966784, end = 3022974976, flags = 134217937, pgoff = 0, inode = 1196329 }
+vm_state.vm_map: 23329.182822093 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3022974976, end = 3023007744, flags = 134217937, pgoff = 0, inode = 1196328 }
+vm_state.vm_map: 23329.182824192 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3023007744, end = 3023020032, flags = 134217937, pgoff = 0, inode = 1196327 }
+vm_state.vm_map: 23329.182826323 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3023020032, end = 3023028224, flags = 134217937, pgoff = 0, inode = 1196320 }
+vm_state.vm_map: 23329.182828632 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3023028224, end = 3023032320, flags = 134217937, pgoff = 0, inode = 1196318 }
+vm_state.vm_map: 23329.182833849 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3023032320, end = 3023896576, flags = 134217845, pgoff = 0, inode = 23975 }
+vm_state.vm_map: 23329.182835893 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3023896576, end = 3023917056, flags = 135266419, pgoff = 864256, inode = 23975 }
+vm_state.vm_map: 23329.182838048 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3023917056, end = 3023929344, flags = 1048691, pgoff = 3023917056, inode = 0 }
+vm_state.vm_map: 23329.182840092 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3023929344, end = 3024166912, flags = 1048691, pgoff = 3024166912, inode = 0 }
+vm_state.vm_map: 23329.182842364 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3024166912, end = 3024195584, flags = 134217937, pgoff = 0, inode = 1196236 }
+vm_state.vm_map: 23329.182844598 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3024195584, end = 3024207872, flags = 134217937, pgoff = 0, inode = 1196172 }
+vm_state.vm_map: 23329.182846760 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3024207872, end = 3024216064, flags = 134217937, pgoff = 0, inode = 1196173 }
+vm_state.vm_map: 23329.182848934 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3024216064, end = 3024248832, flags = 134217937, pgoff = 0, inode = 1196352 }
+vm_state.vm_map: 23329.182851113 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3024248832, end = 3024269312, flags = 134217937, pgoff = 0, inode = 1196196 }
+vm_state.vm_map: 23329.182853336 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3024269312, end = 3024277504, flags = 134217937, pgoff = 0, inode = 1196343 }
+vm_state.vm_map: 23329.182855632 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3024277504, end = 3024306176, flags = 134217937, pgoff = 0, inode = 1196314 }
+vm_state.vm_map: 23329.182857855 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3024306176, end = 3024351232, flags = 134217937, pgoff = 0, inode = 1196147 }
+vm_state.vm_map: 23329.182860110 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3024351232, end = 3024408576, flags = 134217937, pgoff = 0, inode = 1196094 }
+vm_state.vm_map: 23329.182864728 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3024408576, end = 3024633856, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.182866765 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3024633856, end = 3024637952, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.182869056 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3024637952, end = 3024642048, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.182871693 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3024642048, end = 3024674816, flags = 134217845, pgoff = 0, inode = 1065073 }
+vm_state.vm_map: 23329.182873662 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3024674816, end = 3024678912, flags = 135266419, pgoff = 28672, inode = 1065073 }
+vm_state.vm_map: 23329.182880831 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3024678912, end = 3024740352, flags = 134217845, pgoff = 0, inode = 20901 }
+vm_state.vm_map: 23329.182882862 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3024740352, end = 3024744448, flags = 135266419, pgoff = 61440, inode = 20901 }
+vm_state.vm_map: 23329.182885060 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3024744448, end = 3024748544, flags = 134217937, pgoff = 0, inode = 1196278 }
+vm_state.vm_map: 23329.182887271 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3024748544, end = 3024752640, flags = 134217937, pgoff = 0, inode = 1196251 }
+vm_state.vm_map: 23329.182889438 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3024752640, end = 3024764928, flags = 134217937, pgoff = 0, inode = 1196234 }
+vm_state.vm_map: 23329.182891827 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3024764928, end = 3024769024, flags = 134217937, pgoff = 0, inode = 1196201 }
+vm_state.vm_map: 23329.182894106 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3024769024, end = 3024777216, flags = 134217937, pgoff = 0, inode = 1196170 }
+vm_state.vm_map: 23329.182896156 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3024777216, end = 3024781312, flags = 134217937, pgoff = 0, inode = 1196157 }
+vm_state.vm_map: 23329.182898397 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3024781312, end = 3024838656, flags = 134217937, pgoff = 0, inode = 1196355 }
+vm_state.vm_map: 23329.182900731 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3024838656, end = 3024871424, flags = 134217845, pgoff = 0, inode = 20716 }
+vm_state.vm_map: 23329.182902732 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3024871424, end = 3024875520, flags = 135266419, pgoff = 32768, inode = 20716 }
+vm_state.vm_map: 23329.182905220 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3024875520, end = 3025395712, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 23329.182907381 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3025395712, end = 3025403904, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 23329.182909345 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3025403904, end = 3025768448, flags = 134217845, pgoff = 0, inode = 23376 }
+vm_state.vm_map: 23329.182911333 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3025768448, end = 3025805312, flags = 135266423, pgoff = 364544, inode = 23376 }
+vm_state.vm_map: 23329.182913543 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3025805312, end = 3025809408, flags = 1048695, pgoff = 3025805312, inode = 0 }
+vm_state.vm_map: 23329.182915562 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3025809408, end = 3026362368, flags = 134217845, pgoff = 0, inode = 18947 }
+vm_state.vm_map: 23329.182917656 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3026362368, end = 3026382848, flags = 135266419, pgoff = 548864, inode = 18947 }
+vm_state.vm_map: 23329.182919841 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3026382848, end = 3026698240, flags = 134217845, pgoff = 0, inode = 20676 }
+vm_state.vm_map: 23329.182921935 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3026698240, end = 3026706432, flags = 135266419, pgoff = 311296, inode = 20676 }
+vm_state.vm_map: 23329.182923897 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3026706432, end = 3026776064, flags = 134217845, pgoff = 0, inode = 1065123 }
+vm_state.vm_map: 23329.182926004 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3026776064, end = 3026780160, flags = 135266419, pgoff = 69632, inode = 1065123 }
+vm_state.vm_map: 23329.182928109 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3026780160, end = 3041275904, flags = 134217845, pgoff = 0, inode = 20672 }
+vm_state.vm_map: 23329.182930054 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3041275904, end = 3041890304, flags = 135266419, pgoff = 14495744, inode = 20672 }
+vm_state.vm_map: 23329.182932197 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3041890304, end = 3041898496, flags = 1048691, pgoff = 3041890304, inode = 0 }
+vm_state.vm_map: 23329.182934344 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3041898496, end = 3042271232, flags = 134217845, pgoff = 0, inode = 20902 }
+vm_state.vm_map: 23329.182936377 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3042271232, end = 3042283520, flags = 135266419, pgoff = 368640, inode = 20902 }
+vm_state.vm_map: 23329.182938914 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3042283520, end = 3042287616, flags = 134217937, pgoff = 0, inode = 1196171 }
+vm_state.vm_map: 23329.182941229 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3042287616, end = 3042299904, flags = 134217937, pgoff = 0, inode = 1196342 }
+vm_state.vm_map: 23329.182943601 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3042299904, end = 3042304000, flags = 134217845, pgoff = 0, inode = 20890 }
+vm_state.vm_map: 23329.182945804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3042304000, end = 3042308096, flags = 135266419, pgoff = 0, inode = 20890 }
+vm_state.vm_map: 23329.182950540 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3042308096, end = 3042373632, flags = 134217845, pgoff = 0, inode = 23976 }
+vm_state.vm_map: 23329.182952572 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3042373632, end = 3042377728, flags = 135266419, pgoff = 65536, inode = 23976 }
+vm_state.vm_map: 23329.182954683 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3042377728, end = 3044360192, flags = 134217845, pgoff = 0, inode = 20915 }
+vm_state.vm_map: 23329.182956801 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3044360192, end = 3044401152, flags = 135266419, pgoff = 1978368, inode = 20915 }
+vm_state.vm_map: 23329.182958790 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3044401152, end = 3045732352, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.182960827 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3045732352, end = 3045748736, flags = 1048691, pgoff = 3045732352, inode = 0 }
+vm_state.vm_map: 23329.182962791 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3045748736, end = 3045896192, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.182964853 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3045896192, end = 3045904384, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.182966891 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3045904384, end = 3046223872, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 23329.182968836 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3046223872, end = 3046240256, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 23329.182970811 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3046240256, end = 3046252544, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 23329.182973213 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3046252544, end = 3046256640, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 23329.182975288 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3046256640, end = 3047514112, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 23329.182977214 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3047514112, end = 3047534592, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 23329.182981691 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3047534592, end = 3047542784, flags = 1048691, pgoff = 3047534592, inode = 0 }
+vm_state.vm_map: 23329.182983815 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3047542784, end = 3047780352, flags = 134217845, pgoff = 0, inode = 20886 }
+vm_state.vm_map: 23329.182985964 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3047780352, end = 3047784448, flags = 135266419, pgoff = 237568, inode = 20886 }
+vm_state.vm_map: 23329.182987946 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3047784448, end = 3047800832, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.182989878 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3047800832, end = 3047804928, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.182992070 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3047804928, end = 3047813120, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.182994064 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3047813120, end = 3047817216, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.182996127 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3047817216, end = 3048009728, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.182998331 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3048009728, end = 3048013824, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.183000418 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3048013824, end = 3048067072, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 23329.183002456 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3048067072, end = 3048071168, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 23329.183004666 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3048071168, end = 3048075264, flags = 1048691, pgoff = 3048071168, inode = 0 }
+vm_state.vm_map: 23329.183007123 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3048075264, end = 3048259584, flags = 134217845, pgoff = 0, inode = 22064 }
+vm_state.vm_map: 23329.183009296 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3048259584, end = 3048267776, flags = 135266419, pgoff = 180224, inode = 22064 }
+vm_state.vm_map: 23329.183011335 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3048267776, end = 3048509440, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.183013415 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3048509440, end = 3048513536, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.183015594 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3048513536, end = 3048984576, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 23329.183017601 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3048984576, end = 3049000960, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 23329.183019707 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049000960, end = 3049144320, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 23329.183021862 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049144320, end = 3049148416, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 23329.183023887 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049148416, end = 3049234432, flags = 134217845, pgoff = 0, inode = 18951 }
+vm_state.vm_map: 23329.183025992 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049234432, end = 3049238528, flags = 135266419, pgoff = 86016, inode = 18951 }
+vm_state.vm_map: 23329.183028154 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049238528, end = 3049242624, flags = 1048691, pgoff = 3049238528, inode = 0 }
+vm_state.vm_map: 23329.183030160 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049242624, end = 3049259008, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 23329.183032192 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049259008, end = 3049263104, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 23329.183034421 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049263104, end = 3049295872, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 23329.183036427 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049295872, end = 3049299968, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 23329.183038632 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049299968, end = 3049316352, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 23329.183041052 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049316352, end = 3049320448, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 23329.183043182 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049320448, end = 3049406464, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 23329.183045171 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049406464, end = 3049410560, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 23329.183047375 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049410560, end = 3049418752, flags = 1048691, pgoff = 3049410560, inode = 0 }
+vm_state.vm_map: 23329.183049394 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049418752, end = 3049447424, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 23329.183051493 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049447424, end = 3049451520, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 23329.183053593 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049451520, end = 3049455616, flags = 1048691, pgoff = 3049451520, inode = 0 }
+vm_state.vm_map: 23329.183055803 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049455616, end = 3049787392, flags = 134217845, pgoff = 0, inode = 20692 }
+vm_state.vm_map: 23329.183057730 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049787392, end = 3049795584, flags = 135266419, pgoff = 327680, inode = 20692 }
+vm_state.vm_map: 23329.183060027 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049795584, end = 3049828352, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 23329.183062040 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049828352, end = 3049832448, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 23329.183064151 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049832448, end = 3049848832, flags = 134217845, pgoff = 0, inode = 499714 }
+vm_state.vm_map: 23329.183066189 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049848832, end = 3049852928, flags = 135266419, pgoff = 12288, inode = 499714 }
+vm_state.vm_map: 23329.183068331 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049852928, end = 3049877504, flags = 134217845, pgoff = 0, inode = 500174 }
+vm_state.vm_map: 23329.183070418 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049877504, end = 3049881600, flags = 135266419, pgoff = 20480, inode = 500174 }
+vm_state.vm_map: 23329.183075228 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049881600, end = 3049914368, flags = 134217845, pgoff = 0, inode = 21180 }
+vm_state.vm_map: 23329.183077284 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049914368, end = 3049918464, flags = 135266419, pgoff = 28672, inode = 21180 }
+vm_state.vm_map: 23329.183079415 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049918464, end = 3049922560, flags = 1048691, pgoff = 3049918464, inode = 0 }
+vm_state.vm_map: 23329.183081532 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3049922560, end = 3050352640, flags = 134217845, pgoff = 0, inode = 1065119 }
+vm_state.vm_map: 23329.183083582 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3050352640, end = 3050381312, flags = 135266419, pgoff = 425984, inode = 1065119 }
+vm_state.vm_map: 23329.183085860 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3050381312, end = 3050385408, flags = 1048691, pgoff = 3050381312, inode = 0 }
+vm_state.vm_map: 23329.183088010 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3050385408, end = 3050827776, flags = 134217845, pgoff = 0, inode = 20888 }
+vm_state.vm_map: 23329.183090114 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3050827776, end = 3050835968, flags = 135266419, pgoff = 442368, inode = 20888 }
+vm_state.vm_map: 23329.183092232 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3050835968, end = 3050934272, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.183094369 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3050934272, end = 3050938368, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.183096443 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3050938368, end = 3051208704, flags = 134217845, pgoff = 0, inode = 18942 }
+vm_state.vm_map: 23329.183098543 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3051208704, end = 3051216896, flags = 135266419, pgoff = 266240, inode = 18942 }
+vm_state.vm_map: 23329.183100759 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3051216896, end = 3051278336, flags = 134217845, pgoff = 0, inode = 500012 }
+vm_state.vm_map: 23329.183102797 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3051278336, end = 3051282432, flags = 135266419, pgoff = 61440, inode = 500012 }
+vm_state.vm_map: 23329.183104909 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3051282432, end = 3051286528, flags = 1048691, pgoff = 3051282432, inode = 0 }
+vm_state.vm_map: 23329.183107100 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3051286528, end = 3051753472, flags = 134217845, pgoff = 0, inode = 20735 }
+vm_state.vm_map: 23329.183109397 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3051753472, end = 3051761664, flags = 135266419, pgoff = 462848, inode = 20735 }
+vm_state.vm_map: 23329.183111367 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3051761664, end = 3052892160, flags = 134217845, pgoff = 0, inode = 20751 }
+vm_state.vm_map: 23329.183113429 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3052892160, end = 3052908544, flags = 135266419, pgoff = 1130496, inode = 20751 }
+vm_state.vm_map: 23329.183115535 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3052908544, end = 3053023232, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.183117480 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3053023232, end = 3053027328, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.183119579 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3053027328, end = 3053174784, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.183121530 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3053174784, end = 3053178880, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.183123617 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3053178880, end = 3053182976, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.183125723 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3053182976, end = 3053191168, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.183127668 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3053191168, end = 3053195264, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.183129638 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3053195264, end = 3053199360, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.183131823 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3053199360, end = 3053203456, flags = 1048691, pgoff = 3053199360, inode = 0 }
+vm_state.vm_map: 23329.183133873 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3053203456, end = 3053289472, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.183135818 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3053289472, end = 3053293568, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.183137800 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3053293568, end = 3053297664, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.183140036 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3053297664, end = 3053305856, flags = 1048691, pgoff = 3053297664, inode = 0 }
+vm_state.vm_map: 23329.183142437 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3053305856, end = 3054043136, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.183144506 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3054043136, end = 3054047232, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.183146568 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3054047232, end = 3054075904, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.183148648 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3054075904, end = 3054080000, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.183150593 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3054080000, end = 3054084096, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.183152632 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3054084096, end = 3054100480, flags = 134217845, pgoff = 0, inode = 19625 }
+vm_state.vm_map: 23329.183154576 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3054100480, end = 3054104576, flags = 135266419, pgoff = 12288, inode = 19625 }
+vm_state.vm_map: 23329.183156786 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3054104576, end = 3054182400, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.183158831 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3054182400, end = 3054186496, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.183160818 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3054186496, end = 3055501312, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.183162801 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3055501312, end = 3055509504, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.183164876 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3055509504, end = 3055513600, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.183166943 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3055513600, end = 3055529984, flags = 1048691, pgoff = 3055513600, inode = 0 }
+vm_state.vm_map: 23329.183168956 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3055529984, end = 3056467968, flags = 134217845, pgoff = 0, inode = 16400 }
+vm_state.vm_map: 23329.183171086 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3056467968, end = 3056484352, flags = 135266417, pgoff = 937984, inode = 16400 }
+vm_state.vm_map: 23329.183173155 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3056484352, end = 3056488448, flags = 135266419, pgoff = 954368, inode = 16400 }
+vm_state.vm_map: 23329.183175612 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3056488448, end = 3056517120, flags = 1048691, pgoff = 3056488448, inode = 0 }
+vm_state.vm_map: 23329.183177656 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3056517120, end = 3066556416, flags = 134217845, pgoff = 0, inode = 20739 }
+vm_state.vm_map: 23329.183179694 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3066556416, end = 3066716160, flags = 135266419, pgoff = 10035200, inode = 20739 }
+vm_state.vm_map: 23329.183181923 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3066716160, end = 3066724352, flags = 1048691, pgoff = 3066716160, inode = 0 }
+vm_state.vm_map: 23329.183183923 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3066724352, end = 3070320640, flags = 134217845, pgoff = 0, inode = 1065074 }
+vm_state.vm_map: 23329.183185856 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3070320640, end = 3070418944, flags = 135266419, pgoff = 3596288, inode = 1065074 }
+vm_state.vm_map: 23329.183188085 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3070418944, end = 3070423040, flags = 1048691, pgoff = 3070418944, inode = 0 }
+vm_state.vm_map: 23329.183190092 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3070423040, end = 3072978944, flags = 134217845, pgoff = 0, inode = 20899 }
+vm_state.vm_map: 23329.183192024 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3072978944, end = 3073028096, flags = 135266419, pgoff = 2551808, inode = 20899 }
+vm_state.vm_map: 23329.183194155 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3073028096, end = 3073032192, flags = 1048691, pgoff = 3073028096, inode = 0 }
+vm_state.vm_map: 23329.183196291 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3073032192, end = 3074183168, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.183198224 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3074183168, end = 3074199552, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.183200403 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3074199552, end = 3074433024, flags = 134217845, pgoff = 0, inode = 1065180 }
+vm_state.vm_map: 23329.183202601 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3074433024, end = 3074441216, flags = 135266419, pgoff = 233472, inode = 1065180 }
+vm_state.vm_map: 23329.183204608 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3074441216, end = 3074445312, flags = 1048691, pgoff = 3074441216, inode = 0 }
+vm_state.vm_map: 23329.183206738 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3074445312, end = 3076747264, flags = 134217845, pgoff = 0, inode = 1065125 }
+vm_state.vm_map: 23329.183209245 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3076747264, end = 3076792320, flags = 135266419, pgoff = 2297856, inode = 1065125 }
+vm_state.vm_map: 23329.183211270 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3076792320, end = 3079102464, flags = 134217845, pgoff = 0, inode = 20754 }
+vm_state.vm_map: 23329.183213351 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3079102464, end = 3079131136, flags = 135266419, pgoff = 2306048, inode = 20754 }
+vm_state.vm_map: 23329.183215512 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3079131136, end = 3079135232, flags = 1048691, pgoff = 3079131136, inode = 0 }
+vm_state.vm_map: 23329.183217865 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3079135232, end = 3079143424, flags = 134217845, pgoff = 0, inode = 508383 }
+vm_state.vm_map: 23329.183219951 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3079143424, end = 3079147520, flags = 135266417, pgoff = 4096, inode = 508383 }
+vm_state.vm_map: 23329.183222057 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3079147520, end = 3079151616, flags = 135266419, pgoff = 8192, inode = 508383 }
+vm_state.vm_map: 23329.183224163 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3079151616, end = 3079159808, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 23329.183226188 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3079159808, end = 3079163904, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 23329.183228379 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3079163904, end = 3079180288, flags = 134217845, pgoff = 0, inode = 22094 }
+vm_state.vm_map: 23329.183230485 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3079180288, end = 3079184384, flags = 135266419, pgoff = 12288, inode = 22094 }
+vm_state.vm_map: 23329.183232627 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3079184384, end = 3079192576, flags = 134217845, pgoff = 0, inode = 1450327 }
+vm_state.vm_map: 23329.183234671 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3079192576, end = 3079196672, flags = 135266417, pgoff = 4096, inode = 1450327 }
+vm_state.vm_map: 23329.183236778 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3079196672, end = 3079200768, flags = 135266419, pgoff = 8192, inode = 1450327 }
+vm_state.vm_map: 23329.183238876 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3079200768, end = 3079229440, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.183240920 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3079229440, end = 3079237632, flags = 1048691, pgoff = 3079229440, inode = 0 }
+vm_state.vm_map: 23329.183243383 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3079237632, end = 3079241728, flags = 67371125, pgoff = 3079237632, inode = 0 }
+vm_state.vm_map: 23329.183245501 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3079241728, end = 3079356416, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.183247477 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3079356416, end = 3079360512, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.183249663 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3079360512, end = 3079364608, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.183251707 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2336, start = 3215650816, end = 3215736832, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.183257264 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 134512640, end = 135303168, flags = 134223989, pgoff = 0, inode = 1048715 }
+vm_state.vm_map: 23329.183259419 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 135303168, end = 135323648, flags = 135272563, pgoff = 790528, inode = 1048715 }
+vm_state.vm_map: 23329.183261691 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 135323648, end = 135344128, flags = 1048691, pgoff = 135323648, inode = 0 }
+vm_state.vm_map: 23329.183263858 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 163319808, end = 163581952, flags = 1048691, pgoff = 163319808, inode = 0 }
+vm_state.vm_map: 23329.183266260 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3074785280, end = 3074826240, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.183268372 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3074826240, end = 3074830336, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.183270545 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3074830336, end = 3074834432, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.183272805 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3074834432, end = 3074871296, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.183274898 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3074871296, end = 3074875392, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.183276843 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3074875392, end = 3074879488, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.183282629 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3074879488, end = 3074957312, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.183284679 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3074957312, end = 3074961408, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.183286667 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3074961408, end = 3074965504, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.183288785 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3074965504, end = 3074973696, flags = 1048691, pgoff = 3074965504, inode = 0 }
+vm_state.vm_map: 23329.183291008 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3074973696, end = 3074998272, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.183293021 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3074998272, end = 3075002368, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.183295119 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3075002368, end = 3075006464, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.183297398 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3075006464, end = 3076337664, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.183302486 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3076337664, end = 3076341760, flags = 1048691, pgoff = 3076337664, inode = 0 }
+vm_state.vm_map: 23329.183304783 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3076341760, end = 3077656576, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.183306901 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3077656576, end = 3077664768, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.183309124 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3077664768, end = 3077668864, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.183311364 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3077668864, end = 3077685248, flags = 1048691, pgoff = 3077668864, inode = 0 }
+vm_state.vm_map: 23329.183313593 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3077685248, end = 3077693440, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.183315972 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3077693440, end = 3077697536, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.183318181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3077697536, end = 3077701632, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.183320577 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3077701632, end = 3077918720, flags = 134217845, pgoff = 0, inode = 499784 }
+vm_state.vm_map: 23329.183322775 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3077918720, end = 3077931008, flags = 135266419, pgoff = 217088, inode = 499784 }
+vm_state.vm_map: 23329.183324948 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3077996544, end = 3078025216, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.183326998 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3078025216, end = 3078033408, flags = 1048691, pgoff = 3078025216, inode = 0 }
+vm_state.vm_map: 23329.183329085 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3078033408, end = 3078037504, flags = 67371125, pgoff = 3078033408, inode = 0 }
+vm_state.vm_map: 23329.183331672 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3078037504, end = 3078152192, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.183333747 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3078152192, end = 3078156288, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.183335840 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3078156288, end = 3078160384, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.183337798 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2536, start = 3214131200, end = 3214217216, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.183344404 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 134512640, end = 134541312, flags = 134223989, pgoff = 0, inode = 1048590 }
+vm_state.vm_map: 23329.183346565 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 134541312, end = 134545408, flags = 135272563, pgoff = 24576, inode = 1048590 }
+vm_state.vm_map: 23329.183348566 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 134545408, end = 134561792, flags = 1048691, pgoff = 134545408, inode = 0 }
+vm_state.vm_map: 23329.183350622 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 135610368, end = 135745536, flags = 1048691, pgoff = 135610368, inode = 0 }
+vm_state.vm_map: 23329.183353395 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3074928640, end = 3074957312, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.183355549 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3074957312, end = 3074961408, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.183357519 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3074961408, end = 3074965504, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.183359674 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3074965504, end = 3075051520, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.183361965 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075051520, end = 3075055616, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.183363978 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075055616, end = 3075059712, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.183366170 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075059712, end = 3075067904, flags = 1048691, pgoff = 3075059712, inode = 0 }
+vm_state.vm_map: 23329.183368269 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075067904, end = 3075293184, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.183370565 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075293184, end = 3075297280, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.183372584 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075297280, end = 3075301376, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.183375098 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075301376, end = 3075338240, flags = 134217845, pgoff = 0, inode = 508391 }
+vm_state.vm_map: 23329.183377184 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075338240, end = 3075342336, flags = 135266417, pgoff = 32768, inode = 508391 }
+vm_state.vm_map: 23329.183379358 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075342336, end = 3075346432, flags = 135266419, pgoff = 36864, inode = 508391 }
+vm_state.vm_map: 23329.183381426 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075346432, end = 3075506176, flags = 1048691, pgoff = 3075346432, inode = 0 }
+vm_state.vm_map: 23329.183383834 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075506176, end = 3075555328, flags = 134217845, pgoff = 0, inode = 500088 }
+vm_state.vm_map: 23329.183385767 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075555328, end = 3075559424, flags = 135266419, pgoff = 45056, inode = 500088 }
+vm_state.vm_map: 23329.183388169 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075559424, end = 3075608576, flags = 1048691, pgoff = 3075559424, inode = 0 }
+vm_state.vm_map: 23329.183390287 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075608576, end = 3075706880, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 23329.183392232 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075706880, end = 3075710976, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 23329.183394405 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075710976, end = 3075715072, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 23329.183396708 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075768320, end = 3075805184, flags = 134217845, pgoff = 0, inode = 499730 }
+vm_state.vm_map: 23329.183398844 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075805184, end = 3075809280, flags = 135266419, pgoff = 32768, inode = 499730 }
+vm_state.vm_map: 23329.183404050 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075809280, end = 3075850240, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.183406217 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075850240, end = 3075854336, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.183410910 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075854336, end = 3075858432, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.183415670 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075858432, end = 3075895296, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.183420208 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075895296, end = 3075899392, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.183422265 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075899392, end = 3075903488, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.183424895 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075903488, end = 3075981312, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.183426840 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075981312, end = 3075985408, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.183428915 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075985408, end = 3075989504, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.183430866 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075989504, end = 3075997696, flags = 1048691, pgoff = 3075989504, inode = 0 }
+vm_state.vm_map: 23329.183433014 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3075997696, end = 3076022272, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.183434953 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3076022272, end = 3076026368, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.183437016 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3076026368, end = 3076030464, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.183439195 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3076030464, end = 3077361664, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.183441146 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3077361664, end = 3077365760, flags = 1048691, pgoff = 3077361664, inode = 0 }
+vm_state.vm_map: 23329.183443246 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3077365760, end = 3077373952, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.183445290 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3077373952, end = 3077378048, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.183447314 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3077378048, end = 3077382144, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.183449432 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3077382144, end = 3078696960, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.183451389 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3078696960, end = 3078705152, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.183453334 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3078705152, end = 3078709248, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.183455514 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3078709248, end = 3078725632, flags = 1048691, pgoff = 3078709248, inode = 0 }
+vm_state.vm_map: 23329.183458318 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3078725632, end = 3078733824, flags = 134217845, pgoff = 0, inode = 499739 }
+vm_state.vm_map: 23329.183460503 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3078733824, end = 3078737920, flags = 135266419, pgoff = 4096, inode = 499739 }
+vm_state.vm_map: 23329.183462972 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3078737920, end = 3078778880, flags = 134217845, pgoff = 0, inode = 499738 }
+vm_state.vm_map: 23329.183465005 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3078778880, end = 3078782976, flags = 135266419, pgoff = 40960, inode = 499738 }
+vm_state.vm_map: 23329.183467400 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3078791168, end = 3078799360, flags = 134217845, pgoff = 0, inode = 17167 }
+vm_state.vm_map: 23329.183469456 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3078799360, end = 3078803456, flags = 135266419, pgoff = 8192, inode = 17167 }
+vm_state.vm_map: 23329.183471827 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3078803456, end = 3078811648, flags = 134217845, pgoff = 0, inode = 499908 }
+vm_state.vm_map: 23329.183473772 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3078811648, end = 3078815744, flags = 135266419, pgoff = 4096, inode = 499908 }
+vm_state.vm_map: 23329.183476291 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3078815744, end = 3078819840, flags = 134217845, pgoff = 0, inode = 500082 }
+vm_state.vm_map: 23329.183478224 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3078819840, end = 3078823936, flags = 135266419, pgoff = 0, inode = 500082 }
+vm_state.vm_map: 23329.183480490 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3078823936, end = 3078828032, flags = 134217845, pgoff = 0, inode = 499797 }
+vm_state.vm_map: 23329.183482428 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3078828032, end = 3078832128, flags = 135266419, pgoff = 0, inode = 499797 }
+vm_state.vm_map: 23329.183484843 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3078836224, end = 3078844416, flags = 134217845, pgoff = 0, inode = 500086 }
+vm_state.vm_map: 23329.183486782 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3078844416, end = 3078848512, flags = 135266419, pgoff = 4096, inode = 500086 }
+vm_state.vm_map: 23329.183489041 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3078848512, end = 3078860800, flags = 134217845, pgoff = 0, inode = 500089 }
+vm_state.vm_map: 23329.183490980 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3078860800, end = 3078864896, flags = 135266419, pgoff = 8192, inode = 500089 }
+vm_state.vm_map: 23329.183496334 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3078864896, end = 3078868992, flags = 134217845, pgoff = 0, inode = 499772 }
+vm_state.vm_map: 23329.183498402 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3078868992, end = 3078873088, flags = 135266419, pgoff = 0, inode = 499772 }
+vm_state.vm_map: 23329.183500471 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3078877184, end = 3078885376, flags = 1048691, pgoff = 3078877184, inode = 0 }
+vm_state.vm_map: 23329.183502539 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3078885376, end = 3078889472, flags = 67371125, pgoff = 3078885376, inode = 0 }
+vm_state.vm_map: 23329.183504620 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3078889472, end = 3079004160, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.183506806 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3079004160, end = 3079008256, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.183508831 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3079008256, end = 3079012352, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.183510936 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2630, start = 3220340736, end = 3220426752, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.183513455 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 134512640, end = 135303168, flags = 134223989, pgoff = 0, inode = 1048715 }
+vm_state.vm_map: 23329.183515512 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 135303168, end = 135323648, flags = 135272563, pgoff = 790528, inode = 1048715 }
+vm_state.vm_map: 23329.183517568 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 135323648, end = 135344128, flags = 1048691, pgoff = 135323648, inode = 0 }
+vm_state.vm_map: 23329.183519748 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 142737408, end = 142987264, flags = 1048691, pgoff = 142737408, inode = 0 }
+vm_state.vm_map: 23329.183521909 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3074293760, end = 3074334720, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.183540944 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3074334720, end = 3074338816, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.183543414 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3074338816, end = 3074342912, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.183546063 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3074342912, end = 3074379776, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.183548242 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3074379776, end = 3074383872, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.183550403 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3074383872, end = 3074387968, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.183552669 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3074387968, end = 3074465792, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.183554787 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3074465792, end = 3074469888, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.183556880 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3074469888, end = 3074473984, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.183558887 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3074473984, end = 3074482176, flags = 1048691, pgoff = 3074473984, inode = 0 }
+vm_state.vm_map: 23329.183561017 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3074482176, end = 3074506752, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.183563117 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3074506752, end = 3074510848, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.183565117 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3074510848, end = 3074514944, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.183567254 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3074514944, end = 3075846144, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.183569433 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3075846144, end = 3075850240, flags = 1048691, pgoff = 3075846144, inode = 0 }
+vm_state.vm_map: 23329.183571693 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3075850240, end = 3077165056, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.183573774 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3077165056, end = 3077173248, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.183576059 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3077173248, end = 3077177344, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.183578220 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3077177344, end = 3077193728, flags = 1048691, pgoff = 3077177344, inode = 0 }
+vm_state.vm_map: 23329.183580844 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3077193728, end = 3077201920, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.183582973 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3077201920, end = 3077206016, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.183585018 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3077206016, end = 3077210112, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.183587179 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3077210112, end = 3077427200, flags = 134217845, pgoff = 0, inode = 499784 }
+vm_state.vm_map: 23329.183589277 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3077427200, end = 3077439488, flags = 135266419, pgoff = 217088, inode = 499784 }
+vm_state.vm_map: 23329.183591464 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3077505024, end = 3077533696, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.183593618 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3077533696, end = 3077541888, flags = 1048691, pgoff = 3077533696, inode = 0 }
+vm_state.vm_map: 23329.183595675 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3077541888, end = 3077545984, flags = 67371125, pgoff = 3077541888, inode = 0 }
+vm_state.vm_map: 23329.183597928 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3077545984, end = 3077660672, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.183603565 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3077660672, end = 3077664768, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.183605727 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3077664768, end = 3077668864, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.183607845 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2639, start = 3220750336, end = 3220836352, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.183610678 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3073134592, end = 3073925120, flags = 1048691, pgoff = 3074293760, inode = 0 }
+vm_state.vm_map: 23329.183615698 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3074428928, end = 3074449408, flags = 134217845, pgoff = 0, inode = 508374 }
+vm_state.vm_map: 23329.183618094 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3074449408, end = 3074453504, flags = 135266417, pgoff = 16384, inode = 508374 }
+vm_state.vm_map: 23329.183620150 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3074453504, end = 3074457600, flags = 135266419, pgoff = 20480, inode = 508374 }
+vm_state.vm_map: 23329.183622428 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3074457600, end = 3074498560, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.183624478 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3074498560, end = 3074502656, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.183626640 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3074502656, end = 3074506752, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.183628869 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3074506752, end = 3074543616, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.183630863 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3074543616, end = 3074547712, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.183633043 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3074547712, end = 3074551808, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.183635290 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3074551808, end = 3074576384, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.183637377 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3074576384, end = 3074580480, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.183639409 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3074580480, end = 3074584576, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.183641514 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3074584576, end = 3074592768, flags = 1048691, pgoff = 3074584576, inode = 0 }
+vm_state.vm_map: 23329.183643768 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3074592768, end = 3074678784, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.183645799 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3074678784, end = 3074682880, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.183647818 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3074682880, end = 3074686976, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.183652702 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3074686976, end = 3074695168, flags = 1048691, pgoff = 3074686976, inode = 0 }
+vm_state.vm_map: 23329.183657519 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3074695168, end = 3074703360, flags = 134217845, pgoff = 0, inode = 500018 }
+vm_state.vm_map: 23329.183659568 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3074703360, end = 3074707456, flags = 135266419, pgoff = 4096, inode = 500018 }
+vm_state.vm_map: 23329.183661617 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3074707456, end = 3074711552, flags = 1048691, pgoff = 3074707456, inode = 0 }
+vm_state.vm_map: 23329.183663835 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3074711552, end = 3074736128, flags = 134217845, pgoff = 0, inode = 19420 }
+vm_state.vm_map: 23329.183665904 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3074736128, end = 3074740224, flags = 135266419, pgoff = 20480, inode = 19420 }
+vm_state.vm_map: 23329.183668213 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3074740224, end = 3074748416, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.183670170 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3074748416, end = 3074752512, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.183672318 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3074752512, end = 3074756608, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.183674386 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3074756608, end = 3076071424, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.183676461 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3076071424, end = 3076079616, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.183678511 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3076079616, end = 3076083712, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.183680556 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3076083712, end = 3076096000, flags = 1048691, pgoff = 3076083712, inode = 0 }
+vm_state.vm_map: 23329.183682771 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3076096000, end = 3076104192, flags = 134217845, pgoff = 0, inode = 499720 }
+vm_state.vm_map: 23329.183684748 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3076104192, end = 3076108288, flags = 135266419, pgoff = 4096, inode = 499720 }
+vm_state.vm_map: 23329.183687347 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3076108288, end = 3076268032, flags = 134217845, pgoff = 0, inode = 18680 }
+vm_state.vm_map: 23329.183689341 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3076268032, end = 3076272128, flags = 135266419, pgoff = 159744, inode = 18680 }
+vm_state.vm_map: 23329.183691521 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3076272128, end = 3076276224, flags = 1048691, pgoff = 3076272128, inode = 0 }
+vm_state.vm_map: 23329.183693639 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3076276224, end = 3076935680, flags = 134217845, pgoff = 0, inode = 19419 }
+vm_state.vm_map: 23329.183797247 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3076935680, end = 3076960256, flags = 135266419, pgoff = 659456, inode = 19419 }
+vm_state.vm_map: 23329.183799457 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3076960256, end = 3077124096, flags = 134217845, pgoff = 0, inode = 17950 }
+vm_state.vm_map: 23329.183801563 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3077124096, end = 3077128192, flags = 135266419, pgoff = 163840, inode = 17950 }
+vm_state.vm_map: 23329.183803792 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3077128192, end = 3077165056, flags = 134217845, pgoff = 0, inode = 508391 }
+vm_state.vm_map: 23329.183805897 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3077165056, end = 3077169152, flags = 135266417, pgoff = 32768, inode = 508391 }
+vm_state.vm_map: 23329.183808052 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3077169152, end = 3077173248, flags = 135266419, pgoff = 36864, inode = 508391 }
+vm_state.vm_map: 23329.183810133 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3077173248, end = 3077332992, flags = 1048691, pgoff = 3077173248, inode = 0 }
+vm_state.vm_map: 23329.183812381 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3077332992, end = 3077410816, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.183814418 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3077410816, end = 3077414912, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.183816598 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3077414912, end = 3077419008, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.183818679 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3077419008, end = 3077427200, flags = 1048691, pgoff = 3077419008, inode = 0 }
+vm_state.vm_map: 23329.183820925 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3077427200, end = 3077505024, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.183823494 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3077505024, end = 3077509120, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.183825798 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3077509120, end = 3077517312, flags = 134217845, pgoff = 0, inode = 508383 }
+vm_state.vm_map: 23329.183827890 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3077517312, end = 3077521408, flags = 135266417, pgoff = 4096, inode = 508383 }
+vm_state.vm_map: 23329.183830028 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3077521408, end = 3077525504, flags = 135266419, pgoff = 8192, inode = 508383 }
+vm_state.vm_map: 23329.183832126 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3077525504, end = 3077529600, flags = 1048691, pgoff = 3077525504, inode = 0 }
+vm_state.vm_map: 23329.183834541 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3077529600, end = 3078832128, flags = 134217845, pgoff = 0, inode = 33850 }
+vm_state.vm_map: 23329.183836504 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3078832128, end = 3078926336, flags = 135266419, pgoff = 1302528, inode = 33850 }
+vm_state.vm_map: 23329.183838665 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3078926336, end = 3078938624, flags = 1048691, pgoff = 3078926336, inode = 0 }
+vm_state.vm_map: 23329.183840807 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3078938624, end = 3079008256, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 23329.183842814 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3079008256, end = 3079012352, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 23329.183844926 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3079012352, end = 3079016448, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 23329.183847013 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3079016448, end = 3079024640, flags = 1048691, pgoff = 3079016448, inode = 0 }
+vm_state.vm_map: 23329.183848982 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3079118848, end = 3079127040, flags = 1048691, pgoff = 3079118848, inode = 0 }
+vm_state.vm_map: 23329.183851174 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3079127040, end = 3079131136, flags = 67371125, pgoff = 3079127040, inode = 0 }
+vm_state.vm_map: 23329.183853366 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3079131136, end = 3079245824, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.183855503 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3079245824, end = 3079249920, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.183857973 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3079249920, end = 3079254016, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.183864048 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3079254016, end = 3079565312, flags = 134223989, pgoff = 0, inode = 19234 }
+vm_state.vm_map: 23329.183866203 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3079565312, end = 3079569408, flags = 135272561, pgoff = 311296, inode = 19234 }
+vm_state.vm_map: 23329.183868192 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3079569408, end = 3079573504, flags = 135272563, pgoff = 315392, inode = 19234 }
+vm_state.vm_map: 23329.183870353 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3079573504, end = 3079585792, flags = 1048691, pgoff = 3079573504, inode = 0 }
+vm_state.vm_map: 23329.183872514 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3088822272, end = 3089399808, flags = 1048691, pgoff = 3088822272, inode = 0 }
+vm_state.vm_map: 23329.183874440 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2748, start = 3215134720, end = 3215220736, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.183877546 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3070738432, end = 3071627264, flags = 1048691, pgoff = 3071631360, inode = 0 }
+vm_state.vm_map: 23329.183879645 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3073454080, end = 3073474560, flags = 134217845, pgoff = 0, inode = 508374 }
+vm_state.vm_map: 23329.183881763 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3073474560, end = 3073478656, flags = 135266417, pgoff = 16384, inode = 508374 }
+vm_state.vm_map: 23329.183884042 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3073478656, end = 3073482752, flags = 135266419, pgoff = 20480, inode = 508374 }
+vm_state.vm_map: 23329.183886159 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3073482752, end = 3073523712, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.183888117 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3073523712, end = 3073527808, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.183890426 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3073527808, end = 3073531904, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.183892637 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3073531904, end = 3073568768, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.183895105 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3073568768, end = 3073572864, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.183897347 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3073572864, end = 3073576960, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.183899465 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3073576960, end = 3073601536, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.183901404 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3073601536, end = 3073605632, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.183903490 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3073605632, end = 3073609728, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.183905795 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3073609728, end = 3073617920, flags = 1048691, pgoff = 3073609728, inode = 0 }
+vm_state.vm_map: 23329.183908103 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3073617920, end = 3073703936, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.183910140 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3073703936, end = 3073708032, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.183912105 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3073708032, end = 3073712128, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.183914407 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3073712128, end = 3073720320, flags = 1048691, pgoff = 3073712128, inode = 0 }
+vm_state.vm_map: 23329.183916494 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3073720320, end = 3073728512, flags = 134217845, pgoff = 0, inode = 500018 }
+vm_state.vm_map: 23329.183918433 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3073728512, end = 3073732608, flags = 135266419, pgoff = 4096, inode = 500018 }
+vm_state.vm_map: 23329.183920366 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3073732608, end = 3073736704, flags = 1048691, pgoff = 3073732608, inode = 0 }
+vm_state.vm_map: 23329.183922625 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3073736704, end = 3073761280, flags = 134217845, pgoff = 0, inode = 19420 }
+vm_state.vm_map: 23329.183924861 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3073761280, end = 3073765376, flags = 135266419, pgoff = 20480, inode = 19420 }
+vm_state.vm_map: 23329.183927046 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3073765376, end = 3073773568, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.183929590 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3073773568, end = 3073777664, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.183931696 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3073777664, end = 3073781760, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.183933808 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3073781760, end = 3075096576, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.183935753 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3075096576, end = 3075104768, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.183937698 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3075104768, end = 3075108864, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.183939859 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3075108864, end = 3075121152, flags = 1048691, pgoff = 3075108864, inode = 0 }
+vm_state.vm_map: 23329.183942224 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3075121152, end = 3075129344, flags = 134217845, pgoff = 0, inode = 499720 }
+vm_state.vm_map: 23329.183944434 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3075129344, end = 3075133440, flags = 135266419, pgoff = 4096, inode = 499720 }
+vm_state.vm_map: 23329.183946521 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3075133440, end = 3075293184, flags = 134217845, pgoff = 0, inode = 18680 }
+vm_state.vm_map: 23329.183948688 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3075293184, end = 3075297280, flags = 135266419, pgoff = 159744, inode = 18680 }
+vm_state.vm_map: 23329.183950831 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3075297280, end = 3075301376, flags = 1048691, pgoff = 3075297280, inode = 0 }
+vm_state.vm_map: 23329.183952992 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3075301376, end = 3075960832, flags = 134217845, pgoff = 0, inode = 19419 }
+vm_state.vm_map: 23329.183955023 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3075960832, end = 3075985408, flags = 135266419, pgoff = 659456, inode = 19419 }
+vm_state.vm_map: 23329.183957308 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3075985408, end = 3076149248, flags = 134217845, pgoff = 0, inode = 17950 }
+vm_state.vm_map: 23329.183959339 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3076149248, end = 3076153344, flags = 135266419, pgoff = 163840, inode = 17950 }
+vm_state.vm_map: 23329.183961396 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3076153344, end = 3076190208, flags = 134217845, pgoff = 0, inode = 508391 }
+vm_state.vm_map: 23329.183963661 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3076190208, end = 3076194304, flags = 135266417, pgoff = 32768, inode = 508391 }
+vm_state.vm_map: 23329.183965854 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3076194304, end = 3076198400, flags = 135266419, pgoff = 36864, inode = 508391 }
+vm_state.vm_map: 23329.183967779 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3076198400, end = 3076358144, flags = 1048691, pgoff = 3076198400, inode = 0 }
+vm_state.vm_map: 23329.183969941 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3076358144, end = 3076435968, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.183971984 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3076435968, end = 3076440064, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.183974244 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3076440064, end = 3076444160, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.183976177 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3076444160, end = 3076452352, flags = 1048691, pgoff = 3076444160, inode = 0 }
+vm_state.vm_map: 23329.183978208 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3076452352, end = 3076530176, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.183980270 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3076530176, end = 3076534272, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.183982450 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3076534272, end = 3076542464, flags = 134217845, pgoff = 0, inode = 508383 }
+vm_state.vm_map: 23329.183984395 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3076542464, end = 3076546560, flags = 135266417, pgoff = 4096, inode = 508383 }
+vm_state.vm_map: 23329.183986327 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3076546560, end = 3076550656, flags = 135266419, pgoff = 8192, inode = 508383 }
+vm_state.vm_map: 23329.183988254 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3076550656, end = 3076554752, flags = 1048691, pgoff = 3076550656, inode = 0 }
+vm_state.vm_map: 23329.183990471 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3076554752, end = 3077857280, flags = 134217845, pgoff = 0, inode = 33850 }
+vm_state.vm_map: 23329.183992570 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3077857280, end = 3077951488, flags = 135266419, pgoff = 1302528, inode = 33850 }
+vm_state.vm_map: 23329.183994496 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3077951488, end = 3077963776, flags = 1048691, pgoff = 3077951488, inode = 0 }
+vm_state.vm_map: 23329.183996892 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3077963776, end = 3078033408, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 23329.183999035 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3078033408, end = 3078037504, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 23329.184001072 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3078037504, end = 3078041600, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 23329.184003011 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3078041600, end = 3078049792, flags = 1048691, pgoff = 3078041600, inode = 0 }
+vm_state.vm_map: 23329.184004938 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3078144000, end = 3078152192, flags = 1048691, pgoff = 3078144000, inode = 0 }
+vm_state.vm_map: 23329.184007000 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3078152192, end = 3078156288, flags = 67371125, pgoff = 3078152192, inode = 0 }
+vm_state.vm_map: 23329.184009198 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3078156288, end = 3078270976, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.184011155 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3078270976, end = 3078275072, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.184013224 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3078275072, end = 3078279168, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.184015459 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3078279168, end = 3078590464, flags = 134223989, pgoff = 0, inode = 19234 }
+vm_state.vm_map: 23329.184017385 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3078590464, end = 3078594560, flags = 135272561, pgoff = 311296, inode = 19234 }
+vm_state.vm_map: 23329.184019318 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3078594560, end = 3078598656, flags = 135272563, pgoff = 315392, inode = 19234 }
+vm_state.vm_map: 23329.184021245 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3078598656, end = 3078610944, flags = 1048691, pgoff = 3078598656, inode = 0 }
+vm_state.vm_map: 23329.184023461 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3103694848, end = 3104108544, flags = 1048691, pgoff = 3103694848, inode = 0 }
+vm_state.vm_map: 23329.184025449 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2757, start = 3214385152, end = 3214471168, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.184028271 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 134512640, end = 134545408, flags = 134223989, pgoff = 0, inode = 18385 }
+vm_state.vm_map: 23329.184030655 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 134545408, end = 134549504, flags = 135272563, pgoff = 28672, inode = 18385 }
+vm_state.vm_map: 23329.184032884 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 134549504, end = 134553600, flags = 1048691, pgoff = 134549504, inode = 0 }
+vm_state.vm_map: 23329.184034866 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 161918976, end = 162054144, flags = 1048691, pgoff = 161918976, inode = 0 }
+vm_state.vm_map: 23329.184036927 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3074125824, end = 3074211840, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.184038861 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3074211840, end = 3074215936, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.184041096 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3074215936, end = 3074220032, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.184043435 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3074220032, end = 3074228224, flags = 1048691, pgoff = 3074220032, inode = 0 }
+vm_state.vm_map: 23329.184045732 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3074228224, end = 3074453504, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.184050567 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3074453504, end = 3074457600, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.184052758 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3074457600, end = 3074461696, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.184054907 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3074461696, end = 3074465792, flags = 1048691, pgoff = 3074461696, inode = 0 }
+vm_state.vm_map: 23329.184057113 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3074465792, end = 3074494464, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.184059297 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3074494464, end = 3074531328, flags = 134217845, pgoff = 0, inode = 499730 }
+vm_state.vm_map: 23329.184061372 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3074531328, end = 3074535424, flags = 135266419, pgoff = 32768, inode = 499730 }
+vm_state.vm_map: 23329.184063780 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3074535424, end = 3074551808, flags = 134217845, pgoff = 0, inode = 500096 }
+vm_state.vm_map: 23329.184066194 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3074551808, end = 3074555904, flags = 135266419, pgoff = 12288, inode = 500096 }
+vm_state.vm_map: 23329.184068374 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3074555904, end = 3074592768, flags = 134217845, pgoff = 0, inode = 508391 }
+vm_state.vm_map: 23329.184070325 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3074592768, end = 3074596864, flags = 135266417, pgoff = 32768, inode = 508391 }
+vm_state.vm_map: 23329.184072381 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3074596864, end = 3074600960, flags = 135266419, pgoff = 36864, inode = 508391 }
+vm_state.vm_map: 23329.184074456 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3074600960, end = 3074760704, flags = 1048691, pgoff = 3074600960, inode = 0 }
+vm_state.vm_map: 23329.184076654 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3074760704, end = 3074809856, flags = 134217845, pgoff = 0, inode = 500088 }
+vm_state.vm_map: 23329.184078723 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3074809856, end = 3074813952, flags = 135266419, pgoff = 45056, inode = 500088 }
+vm_state.vm_map: 23329.184080785 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3074813952, end = 3074863104, flags = 1048691, pgoff = 3074813952, inode = 0 }
+vm_state.vm_map: 23329.184083181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3074863104, end = 3074904064, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.184085181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3074904064, end = 3074908160, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.184087169 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3074908160, end = 3074912256, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.184089361 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3074912256, end = 3074990080, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.184091535 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3074990080, end = 3074994176, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.184093708 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3074994176, end = 3074998272, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.184095777 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3074998272, end = 3075006464, flags = 1048691, pgoff = 3074998272, inode = 0 }
+vm_state.vm_map: 23329.184097882 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3075006464, end = 3075035136, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.184100420 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3075035136, end = 3075039232, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.184102470 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3075039232, end = 3075043328, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.184104600 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3075043328, end = 3075051520, flags = 134217845, pgoff = 0, inode = 17167 }
+vm_state.vm_map: 23329.184106693 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3075051520, end = 3075055616, flags = 135266419, pgoff = 8192, inode = 17167 }
+vm_state.vm_map: 23329.184109021 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3075055616, end = 3075063808, flags = 134217845, pgoff = 0, inode = 499908 }
+vm_state.vm_map: 23329.184111127 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3075063808, end = 3075067904, flags = 135266419, pgoff = 4096, inode = 499908 }
+vm_state.vm_map: 23329.184113263 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3075067904, end = 3075080192, flags = 134217845, pgoff = 0, inode = 500089 }
+vm_state.vm_map: 23329.184115411 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3075080192, end = 3075084288, flags = 135266419, pgoff = 8192, inode = 500089 }
+vm_state.vm_map: 23329.184117653 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3075084288, end = 3075088384, flags = 134217845, pgoff = 0, inode = 500082 }
+vm_state.vm_map: 23329.184119839 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3075088384, end = 3075092480, flags = 135266419, pgoff = 0, inode = 500082 }
+vm_state.vm_map: 23329.184122098 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3075092480, end = 3075096576, flags = 134217845, pgoff = 0, inode = 499797 }
+vm_state.vm_map: 23329.184124043 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3075096576, end = 3075100672, flags = 135266419, pgoff = 0, inode = 499797 }
+vm_state.vm_map: 23329.184126377 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3075100672, end = 3076431872, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.184128402 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3076431872, end = 3076435968, flags = 1048691, pgoff = 3076431872, inode = 0 }
+vm_state.vm_map: 23329.184130841 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3076435968, end = 3076444160, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.184132811 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3076444160, end = 3076448256, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.184135429 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3076448256, end = 3076452352, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.184137794 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3076452352, end = 3077767168, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.184140023 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3077767168, end = 3077775360, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.184142097 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3077775360, end = 3077779456, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.184144277 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3077779456, end = 3077795840, flags = 1048691, pgoff = 3077779456, inode = 0 }
+vm_state.vm_map: 23329.184146561 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3077795840, end = 3077894144, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 23329.184148790 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3077894144, end = 3077898240, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 23329.184150766 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3077898240, end = 3077902336, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 23329.184153174 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3077902336, end = 3077943296, flags = 134217845, pgoff = 0, inode = 499738 }
+vm_state.vm_map: 23329.184155218 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3077943296, end = 3077947392, flags = 135266419, pgoff = 40960, inode = 499738 }
+vm_state.vm_map: 23329.184157441 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3077951488, end = 3077988352, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.184159454 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3077988352, end = 3077992448, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.184161553 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3077992448, end = 3077996544, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.184163782 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3077996544, end = 3078021120, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.184165888 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3078021120, end = 3078025216, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.184167907 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3078025216, end = 3078029312, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.184170389 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3078033408, end = 3078049792, flags = 1048691, pgoff = 3078033408, inode = 0 }
+vm_state.vm_map: 23329.184172495 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3078049792, end = 3078053888, flags = 67371125, pgoff = 3078049792, inode = 0 }
+vm_state.vm_map: 23329.184174724 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3078053888, end = 3078168576, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.184176804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3078168576, end = 3078172672, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.184178990 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3078172672, end = 3078176768, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.184181014 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2782, start = 3219382272, end = 3219468288, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.184184239 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 134512640, end = 135254016, flags = 134223989, pgoff = 0, inode = 20038 }
+vm_state.vm_map: 23329.184186369 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 135254016, end = 135270400, flags = 135272563, pgoff = 741376, inode = 20038 }
+vm_state.vm_map: 23329.184188487 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 135270400, end = 135282688, flags = 1048691, pgoff = 135270400, inode = 0 }
+vm_state.vm_map: 23329.184190684 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 159780864, end = 159916032, flags = 1048691, pgoff = 159780864, inode = 0 }
+vm_state.vm_map: 23329.184192863 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3073626112, end = 3073667072, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.184194926 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3073667072, end = 3073671168, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.184197087 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3073671168, end = 3073675264, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.184199291 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3073675264, end = 3073712128, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.184201347 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3073712128, end = 3073716224, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.184203596 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3073716224, end = 3073720320, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.184206028 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3073720320, end = 3073744896, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.184207966 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3073744896, end = 3073748992, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.184210023 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3073748992, end = 3073753088, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.184212190 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3073753088, end = 3073757184, flags = 1048691, pgoff = 3073753088, inode = 0 }
+vm_state.vm_map: 23329.184214252 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3073757184, end = 3073769472, flags = 134217845, pgoff = 0, inode = 20765 }
+vm_state.vm_map: 23329.184216277 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3073769472, end = 3073773568, flags = 135266419, pgoff = 8192, inode = 20765 }
+vm_state.vm_map: 23329.184218321 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3073773568, end = 3073777664, flags = 1048691, pgoff = 3073773568, inode = 0 }
+vm_state.vm_map: 23329.184220550 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3073777664, end = 3074240512, flags = 134217845, pgoff = 0, inode = 20061 }
+vm_state.vm_map: 23329.184222600 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3074240512, end = 3074252800, flags = 135266419, pgoff = 458752, inode = 20061 }
+vm_state.vm_map: 23329.184224885 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3074252800, end = 3074330624, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.184226867 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3074330624, end = 3074334720, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.184229232 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3074334720, end = 3074396160, flags = 134217845, pgoff = 0, inode = 19423 }
+vm_state.vm_map: 23329.184231220 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3074396160, end = 3074400256, flags = 135266419, pgoff = 57344, inode = 19423 }
+vm_state.vm_map: 23329.184233362 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3074400256, end = 3074486272, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.184235338 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3074486272, end = 3074490368, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.184237592 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3074490368, end = 3074494464, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.184239988 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3074494464, end = 3074502656, flags = 1048691, pgoff = 3074494464, inode = 0 }
+vm_state.vm_map: 23329.184242198 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3074502656, end = 3075817472, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.184244248 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3075817472, end = 3075825664, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.184246403 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3075825664, end = 3075829760, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.184248509 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3075829760, end = 3075846144, flags = 1048691, pgoff = 3075829760, inode = 0 }
+vm_state.vm_map: 23329.184250582 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3075846144, end = 3076038656, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.184252584 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3076038656, end = 3076042752, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.184254942 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3076042752, end = 3076648960, flags = 134217845, pgoff = 0, inode = 22471 }
+vm_state.vm_map: 23329.184256955 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3076648960, end = 3076665344, flags = 135266419, pgoff = 602112, inode = 22471 }
+vm_state.vm_map: 23329.184259401 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3076665344, end = 3078119424, flags = 134217845, pgoff = 0, inode = 17110 }
+vm_state.vm_map: 23329.184261456 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3078119424, end = 3078131712, flags = 135266419, pgoff = 1454080, inode = 17110 }
+vm_state.vm_map: 23329.184263567 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3078131712, end = 3078139904, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.184265662 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3078139904, end = 3078144000, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.184267748 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3078144000, end = 3078148096, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.184270076 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3078148096, end = 3078295552, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.184272244 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3078295552, end = 3078299648, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.184274509 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3078299648, end = 3078303744, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.184276725 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3078303744, end = 3078340608, flags = 134217845, pgoff = 0, inode = 508391 }
+vm_state.vm_map: 23329.184278899 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3078340608, end = 3078344704, flags = 135266417, pgoff = 32768, inode = 508391 }
+vm_state.vm_map: 23329.184281023 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3078344704, end = 3078348800, flags = 135266419, pgoff = 36864, inode = 508391 }
+vm_state.vm_map: 23329.184283233 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3078348800, end = 3078512640, flags = 1048691, pgoff = 3078348800, inode = 0 }
+vm_state.vm_map: 23329.184285604 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3078512640, end = 3078590464, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.184287648 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3078590464, end = 3078594560, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.184289852 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3078594560, end = 3078598656, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.184292026 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3078598656, end = 3078606848, flags = 1048691, pgoff = 3078598656, inode = 0 }
+vm_state.vm_map: 23329.184294144 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3078606848, end = 3078676480, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 23329.184296255 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3078676480, end = 3078680576, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 23329.184298342 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3078680576, end = 3078684672, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 23329.184300615 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3078684672, end = 3078692864, flags = 1048691, pgoff = 3078684672, inode = 0 }
+vm_state.vm_map: 23329.184302794 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3078754304, end = 3078774784, flags = 134217845, pgoff = 0, inode = 508374 }
+vm_state.vm_map: 23329.184304887 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3078774784, end = 3078778880, flags = 135266417, pgoff = 16384, inode = 508374 }
+vm_state.vm_map: 23329.184307036 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3078778880, end = 3078782976, flags = 135266419, pgoff = 20480, inode = 508374 }
+vm_state.vm_map: 23329.184309426 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3078782976, end = 3078795264, flags = 1048691, pgoff = 3078782976, inode = 0 }
+vm_state.vm_map: 23329.184311420 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3078795264, end = 3078799360, flags = 67371125, pgoff = 3078795264, inode = 0 }
+vm_state.vm_map: 23329.184313587 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3078799360, end = 3078914048, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.184315724 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3078914048, end = 3078918144, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.184317755 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3078918144, end = 3078922240, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.184319953 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2794, start = 3214393344, end = 3214921728, flags = 1048947, pgoff = 3220697088, inode = 0 }
+vm_state.vm_map: 23329.184322553 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3073204224, end = 3073224704, flags = 134217845, pgoff = 0, inode = 508374 }
+vm_state.vm_map: 23329.184327412 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3073224704, end = 3073228800, flags = 135266417, pgoff = 16384, inode = 508374 }
+vm_state.vm_map: 23329.184329580 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3073228800, end = 3073232896, flags = 135266419, pgoff = 20480, inode = 508374 }
+vm_state.vm_map: 23329.184331821 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3073232896, end = 3073273856, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.184333950 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3073273856, end = 3073277952, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.184336112 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3073277952, end = 3073282048, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.184338440 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3073282048, end = 3073318912, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.184340620 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3073318912, end = 3073323008, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.184342804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3073323008, end = 3073327104, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.184345399 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3073327104, end = 3073351680, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.184347497 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3073351680, end = 3073355776, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.184349547 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3073355776, end = 3073359872, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.184351566 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3073359872, end = 3073368064, flags = 1048691, pgoff = 3073359872, inode = 0 }
+vm_state.vm_map: 23329.184353882 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3073368064, end = 3073454080, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.184355889 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3073454080, end = 3073458176, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.184358056 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3073458176, end = 3073462272, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.184360118 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3073462272, end = 3073470464, flags = 1048691, pgoff = 3073462272, inode = 0 }
+vm_state.vm_map: 23329.184362291 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3073470464, end = 3073478656, flags = 134217845, pgoff = 0, inode = 500018 }
+vm_state.vm_map: 23329.184364286 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3073478656, end = 3073482752, flags = 135266419, pgoff = 4096, inode = 500018 }
+vm_state.vm_map: 23329.184366521 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3073482752, end = 3073486848, flags = 1048691, pgoff = 3073482752, inode = 0 }
+vm_state.vm_map: 23329.184368750 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3073486848, end = 3073511424, flags = 134217845, pgoff = 0, inode = 19420 }
+vm_state.vm_map: 23329.184370954 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3073511424, end = 3073515520, flags = 135266419, pgoff = 20480, inode = 19420 }
+vm_state.vm_map: 23329.184375517 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3073515520, end = 3073523712, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.184377691 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3073523712, end = 3073527808, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.184380198 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3073527808, end = 3073531904, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.184382451 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3073531904, end = 3074846720, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.184384662 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3074846720, end = 3074854912, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.184386829 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3074854912, end = 3074859008, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.184389003 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3074859008, end = 3074871296, flags = 1048691, pgoff = 3074859008, inode = 0 }
+vm_state.vm_map: 23329.184391077 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3074871296, end = 3074879488, flags = 134217845, pgoff = 0, inode = 499720 }
+vm_state.vm_map: 23329.184393195 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3074879488, end = 3074883584, flags = 135266419, pgoff = 4096, inode = 499720 }
+vm_state.vm_map: 23329.184395412 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3074883584, end = 3075043328, flags = 134217845, pgoff = 0, inode = 18680 }
+vm_state.vm_map: 23329.184397598 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3075043328, end = 3075047424, flags = 135266419, pgoff = 159744, inode = 18680 }
+vm_state.vm_map: 23329.184399752 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3075047424, end = 3075051520, flags = 1048691, pgoff = 3075047424, inode = 0 }
+vm_state.vm_map: 23329.184401956 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3075051520, end = 3075710976, flags = 134217845, pgoff = 0, inode = 19419 }
+vm_state.vm_map: 23329.184404067 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3075710976, end = 3075735552, flags = 135266419, pgoff = 659456, inode = 19419 }
+vm_state.vm_map: 23329.184406247 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3075735552, end = 3075899392, flags = 134217845, pgoff = 0, inode = 17950 }
+vm_state.vm_map: 23329.184408260 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3075899392, end = 3075903488, flags = 135266419, pgoff = 163840, inode = 17950 }
+vm_state.vm_map: 23329.184410471 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3075903488, end = 3075940352, flags = 134217845, pgoff = 0, inode = 508391 }
+vm_state.vm_map: 23329.184412502 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3075940352, end = 3075944448, flags = 135266417, pgoff = 32768, inode = 508391 }
+vm_state.vm_map: 23329.184414848 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3075944448, end = 3075948544, flags = 135266419, pgoff = 36864, inode = 508391 }
+vm_state.vm_map: 23329.184417134 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3075948544, end = 3076108288, flags = 1048691, pgoff = 3075948544, inode = 0 }
+vm_state.vm_map: 23329.184419431 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3076108288, end = 3076186112, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.184421487 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3076186112, end = 3076190208, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.184423611 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3076190208, end = 3076194304, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.184425703 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3076194304, end = 3076202496, flags = 1048691, pgoff = 3076194304, inode = 0 }
+vm_state.vm_map: 23329.184427877 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3076202496, end = 3076280320, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.184430161 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3076280320, end = 3076284416, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.184432415 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3076284416, end = 3076292608, flags = 134217845, pgoff = 0, inode = 508383 }
+vm_state.vm_map: 23329.184434527 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3076292608, end = 3076296704, flags = 135266417, pgoff = 4096, inode = 508383 }
+vm_state.vm_map: 23329.184436558 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3076296704, end = 3076300800, flags = 135266419, pgoff = 8192, inode = 508383 }
+vm_state.vm_map: 23329.184438583 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3076300800, end = 3076304896, flags = 1048691, pgoff = 3076300800, inode = 0 }
+vm_state.vm_map: 23329.184440899 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3076304896, end = 3077607424, flags = 134217845, pgoff = 0, inode = 33850 }
+vm_state.vm_map: 23329.184442850 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3077607424, end = 3077701632, flags = 135266419, pgoff = 1302528, inode = 33850 }
+vm_state.vm_map: 23329.184445036 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3077701632, end = 3077713920, flags = 1048691, pgoff = 3077701632, inode = 0 }
+vm_state.vm_map: 23329.184447184 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3077713920, end = 3077783552, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 23329.184449759 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3077783552, end = 3077787648, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 23329.184451803 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3077787648, end = 3077791744, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 23329.184453989 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3077791744, end = 3077799936, flags = 1048691, pgoff = 3077791744, inode = 0 }
+vm_state.vm_map: 23329.184456014 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3077894144, end = 3077902336, flags = 1048691, pgoff = 3077894144, inode = 0 }
+vm_state.vm_map: 23329.184458083 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3077902336, end = 3077906432, flags = 67371125, pgoff = 3077902336, inode = 0 }
+vm_state.vm_map: 23329.184460225 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3077906432, end = 3078021120, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.184462337 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3078021120, end = 3078025216, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.184463552 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3078025216, end = 3078029312, flags = 135268467, pgoff = 114688, inode = 499899 }
+kernel.irq_entry: 23329.184489626 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { ip = 3242331332, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_update_time: 23329.184504105 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { jiffies = 4297269589, xtime_sec = 1264196274, xtime_nsec = 637522008, walltomonotonic_sec = -1264172952, walltomonotonic_nsec = 189579727 }
+kernel.softirq_raise: 23329.184516146 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { softirq_id = 1 [softirq 1] }
+kernel.irq_exit: 23329.184543517 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.softirq_entry: 23329.184582620 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, SOFTIRQ { softirq_id = 1 [softirq 1] }
+kernel.timer_set: 23329.184593228 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, SOFTIRQ { expires = 2302294, function = 0xc141d458, data = 0 }
+kernel.timer_set: 23329.184598865 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, SOFTIRQ { expires = 2302294, function = 0xc14b0234, data = 0 }
+kernel.softirq_exit: 23329.184601137 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { softirq_id = 1 [softirq 1] }
+kernel.sched_schedule: 23329.184611850 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { prev_pid = 16927, next_pid = 2336, prev_state = 0 }
+kernel.syscall_entry: 23329.184995897 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.185000139 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 23329.185004991 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.185009603 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 146 [syscall 146] }
+kernel.sched_try_wakeup: 23329.185034629 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { pid = 1989, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 23329.185043705 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { prev_pid = 2336, next_pid = 1989, prev_state = 0 }
+fs.select: 23329.185200173 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 1, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185203131 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 3, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185205143 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 5, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185209898 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 7, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185211880 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 13, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185213998 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 19, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185216134 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 20, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185218246 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 21, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185220246 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 22, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185222266 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 23, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185224197 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 24, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185226192 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 25, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185228383 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 26, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185230501 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 27, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185232440 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 28, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185234331 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 29, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185237133 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 30, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185239047 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 31, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185241400 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 32, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185243338 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 33, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185245252 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 34, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185247352 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 35, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185249599 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 37, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185251476 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 38, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185253415 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 39, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185255181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 40, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185257293 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 41, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185259293 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 42, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185261362 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 43, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185263264 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 44, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185265523 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 45, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185267691 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 46, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185270031 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 48, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185271908 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 49, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185273933 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 50, end_time_sec = 23660, end_time_nsec = 559328907 }
+fs.select: 23329.185276175 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 52, end_time_sec = 23660, end_time_nsec = 559328907 }
+mm.page_free: 23329.185284992 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pfn = 197942, order = 0 }
+kernel.syscall_exit: 23329.185290987 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.185301872 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 23329.185304138 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 23329.185311702 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.185315796 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7657e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.185318631 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.185325965 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.185333924 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 4096, fd = 48 }
+kernel.syscall_exit: 23329.185335523 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 4096 }
+kernel.syscall_entry: 23329.185557305 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.185561763 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 2652, fd = 48 }
+kernel.syscall_exit: 23329.185563133 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 2652 }
+kernel.syscall_entry: 23329.185835347 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.185840095 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 4076, fd = 48 }
+kernel.syscall_exit: 23329.185841417 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 4076 }
+kernel.syscall_entry: 23329.186455987 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.186460260 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 3548, fd = 48 }
+kernel.syscall_exit: 23329.186461575 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 3548 }
+kernel.irq_entry: 23329.186673047 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, IRQ { ip = 3242336307, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.sched_try_wakeup: 23329.186686817 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, IRQ { pid = 4081, cpu_id = 0, state = 1 }
+kernel.irq_exit: 23329.186712693 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.syscall_entry: 23329.186716126 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+kernel.sched_schedule: 23329.186723616 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { prev_pid = 1989, next_pid = 4081, prev_state = 0 }
+fs.pollfd: 23329.186926522 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { fd = 3 }
+fs.pollfd: 23329.186929337 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { fd = 57 }
+fs.pollfd: 23329.186932109 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { fd = 148 }
+fs.pollfd: 23329.186934054 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { fd = 150 }
+fs.pollfd: 23329.186935889 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { fd = 151 }
+fs.pollfd: 23329.186937636 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { fd = 152 }
+fs.pollfd: 23329.186939513 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { fd = 142 }
+kernel.syscall_exit: 23329.186943928 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.186962803 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 23329.186965810 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.186987316 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.186990496 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { count = 4096, fd = 3 }
+kernel.syscall_exit: 23329.186991737 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.186997374 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 23329.187000172 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.187008185 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.187010119 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 23329.187011631 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 57 }
+fs.pollfd: 23329.187013002 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 148 }
+fs.pollfd: 23329.187014361 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 150 }
+fs.pollfd: 23329.187015650 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 151 }
+fs.pollfd: 23329.187016910 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 152 }
+fs.pollfd: 23329.187018268 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 142 }
+kernel.syscall_exit: 23329.187019695 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.187030377 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.187032389 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { count = 4096, fd = 3 }
+kernel.syscall_exit: 23329.187033624 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.187037934 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 23329.187040287 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.187044732 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.187046400 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 23329.187047801 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 57 }
+fs.pollfd: 23329.187049153 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 148 }
+fs.pollfd: 23329.187050462 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 150 }
+fs.pollfd: 23329.187051771 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 151 }
+fs.pollfd: 23329.187053056 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 152 }
+fs.pollfd: 23329.187054334 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 142 }
+kernel.syscall_exit: 23329.187055717 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.187089417 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.187091862 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { count = 4096, fd = 3 }
+kernel.syscall_exit: 23329.187093122 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.187097024 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 23329.187099370 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.187104563 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.187106310 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 23329.187107786 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 57 }
+fs.pollfd: 23329.187109151 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 148 }
+fs.pollfd: 23329.187110497 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 150 }
+fs.pollfd: 23329.187111874 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 151 }
+fs.pollfd: 23329.187113201 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 152 }
+fs.pollfd: 23329.187114516 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 142 }
+kernel.syscall_exit: 23329.187115924 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.187119444 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 23329.187121710 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.187129780 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.187131811 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { count = 4096, fd = 3 }
+kernel.syscall_exit: 23329.187133034 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.187136646 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 23329.187139369 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.187145271 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.187149673 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 23329.187151581 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 57 }
+fs.pollfd: 23329.187153162 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 148 }
+fs.pollfd: 23329.187154668 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 150 }
+fs.pollfd: 23329.187156132 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 151 }
+fs.pollfd: 23329.187157584 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 152 }
+fs.pollfd: 23329.187159059 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 4081, 4081, eclipse, , 4080, 0x0, SYSCALL { fd = 142 }
+kernel.sched_schedule: 23329.187170444 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { prev_pid = 4081, next_pid = 2336, prev_state = 1 }
+fs.writev: 23329.187288000 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8, vlen = 3 }
+kernel.syscall_exit: 23329.187290211 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 23312 }
+kernel.syscall_entry: 23329.187948985 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.187952665 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 23329.187955115 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 9 }
+fs.pollfd: 23329.187957012 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+fs.pollfd: 23329.187958426 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 5 }
+fs.pollfd: 23329.187960519 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 12 }
+fs.pollfd: 23329.187966712 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 19 }
+fs.pollfd: 23329.187968761 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 16 }
+fs.pollfd: 23329.187971756 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 26 }
+fs.pollfd: 23329.187973806 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 10 }
+fs.pollfd: 23329.187976578 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 17 }
+kernel.syscall_exit: 23329.187978887 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.187994262 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.187996083 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+kernel.syscall_exit: 23329.187998942 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 1 }
+kernel.syscall_entry: 23329.188002443 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 146 [syscall 146] }
+fs.writev: 23329.188024159 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8, vlen = 3 }
+kernel.syscall_exit: 23329.188025913 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 15008 }
+kernel.syscall_entry: 23329.188030976 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.188033291 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 23329.188034514 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.188042361 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.188044233 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 23329.188045430 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.188050233 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb6094e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.188053797 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.188058482 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 168 [syscall 168] }
+fs.pollfd: 23329.188062428 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 23329.188064305 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 9 }
+fs.pollfd: 23329.188065892 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+fs.pollfd: 23329.188067380 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 5 }
+fs.pollfd: 23329.188068880 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 12 }
+fs.pollfd: 23329.188071653 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 19 }
+fs.pollfd: 23329.188073215 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 16 }
+fs.pollfd: 23329.188075333 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 26 }
+fs.pollfd: 23329.188076833 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 10 }
+fs.pollfd: 23329.188078982 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 17 }
+kernel.sched_schedule: 23329.188089917 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { prev_pid = 2336, next_pid = 1989, prev_state = 1 }
+kernel.sched_try_wakeup: 23329.188251324 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pid = 2336, cpu_id = 0, state = 1 }
+fs.read: 23329.188264321 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 8940, fd = 48 }
+kernel.syscall_exit: 23329.188265872 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 8940 }
+kernel.syscall_entry: 23329.188288519 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.188293323 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 12080, fd = 48 }
+kernel.syscall_exit: 23329.188294650 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 12080 }
+kernel.syscall_entry: 23329.188382390 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.188386088 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 152, fd = 48 }
+kernel.syscall_exit: 23329.188387428 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 152 }
+kernel.syscall_entry: 23329.188402155 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.188410329 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 12080, fd = 48 }
+kernel.syscall_exit: 23329.188411681 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 2776 }
+kernel.irq_entry: 23329.189681249 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, IRQ { ip = 3078487783, handler = 0x0, irq_id = 239, kernel_mode = 0 }
+kernel.sched_try_wakeup: 23329.189830664 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, IRQ { pid = 8996, cpu_id = 0, state = 1 }
+kernel.irq_exit: 23329.189941961 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.sched_schedule: 23329.190011797 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, SYSCALL { prev_pid = 1989, next_pid = 8996, prev_state = 0 }
+kernel.syscall_exit: 23329.190495671 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = -110 }
+kernel.syscall_entry: 23329.190549572 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 240 [syscall 240] }
+kernel.syscall_exit: 23329.190574055 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.190599577 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb6a53e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.190641220 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.190673937 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 23329.190708057 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.190727095 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb6a53e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.190755594 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.190770888 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb6a53e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.190795687 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.190810429 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 78 [syscall 78] }
+kernel.syscall_exit: 23329.190833155 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.190850734 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.190869667 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.190880548 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 240 [syscall 240] }
+kernel.sched_schedule: 23329.190934439 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { prev_pid = 8996, next_pid = 2336, prev_state = 1 }
+fs.pollfd: 23329.191069074 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 23329.191081597 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 9 }
+fs.pollfd: 23329.191092024 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+fs.pollfd: 23329.191099592 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 5 }
+fs.pollfd: 23329.191107290 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 12 }
+fs.pollfd: 23329.191125047 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 19 }
+fs.pollfd: 23329.191132384 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 16 }
+fs.pollfd: 23329.191140922 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 26 }
+fs.pollfd: 23329.191148199 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 10 }
+fs.pollfd: 23329.191156466 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 17 }
+kernel.sched_schedule: 23329.191177315 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { prev_pid = 2336, next_pid = 1989, prev_state = 1 }
+kernel.irq_entry: 23329.194515191 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, IRQ { ip = 3078487776, handler = 0xf8a23c7f, irq_id = 14, kernel_mode = 0 }
+kernel.irq_entry: 23329.194549558 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, IRQ { ip = 3238425739, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_update_time: 23329.194578434 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, IRQ { jiffies = 4297269590, xtime_sec = 1264196274, xtime_nsec = 637522009, walltomonotonic_sec = -1264172952, walltomonotonic_nsec = 189579727 }
+kernel.softirq_raise: 23329.194612241 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, IRQ { softirq_id = 1 [softirq 1] }
+kernel.irq_exit: 23329.194671072 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, IRQ { handled = 1 }
+block.rq_complete_fs: 23329.194723412 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0), 1989, 1989, Xorg, , 1987, 0x0, IRQ { hard_sector = 45387462, rw = 0, errors = 0 }
+kernel.sched_try_wakeup: 23329.194761808 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, IRQ { pid = 16834, cpu_id = 0, state = 2 }
+kernel.timer_set: 23329.194801489 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, IRQ { expires = 2302295, function = 0xc141b0a5, data = 4136835584 }
+kernel.irq_exit: 23329.194820067 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.softirq_entry: 23329.194831167 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SOFTIRQ { softirq_id = 1 [softirq 1] }
+kernel.timer_set: 23329.194851268 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SOFTIRQ { expires = 2302295, function = 0xc141d458, data = 0 }
+kernel.softirq_exit: 23329.194858734 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { softirq_id = 1 [softirq 1] }
+kernel.sched_schedule: 23329.194879022 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { prev_pid = 1989, next_pid = 16834, prev_state = 0 }
+fs.buffer_wait_end: 23329.195345510 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { bh = 0xf6e0a320 }
+fs.write: 23329.195480240 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { count = 68, fd = 16 }
+kernel.syscall_exit: 23329.195485737 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 68 }
+kernel.syscall_entry: 23329.195551140 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 13 [syscall 13] }
+kernel.syscall_exit: 23329.195553614 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 1264196274 }
+kernel.syscall_entry: 23329.195558729 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 4 [syscall 4] }
+fs.write: 23329.195571588 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { count = 68, fd = 18 }
+kernel.syscall_exit: 23329.195572847 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.195669599 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 13 [syscall 13] }
+kernel.syscall_exit: 23329.195671302 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 1264196274 }
+kernel.syscall_entry: 23329.195680409 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 158 [syscall 158] }
+kernel.syscall_exit: 23329.195707922 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.195741252 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 4 [syscall 4] }
+fs.write: 23329.195795543 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { count = 75, fd = 4 }
+kernel.syscall_exit: 23329.195798807 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 75 }
+kernel.syscall_entry: 23329.195811388 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 4 [syscall 4] }
+fs.write: 23329.195844070 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { count = 75, fd = 6 }
+kernel.syscall_exit: 23329.195845823 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 75 }
+kernel.syscall_entry: 23329.195859008 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 4 [syscall 4] }
+fs.write: 23329.195884829 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { count = 75, fd = 16 }
+kernel.syscall_exit: 23329.195886360 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 75 }
+kernel.syscall_entry: 23329.195899625 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 13 [syscall 13] }
+kernel.syscall_exit: 23329.195901538 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 1264196274 }
+kernel.syscall_entry: 23329.195905826 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 158 [syscall 158] }
+kernel.syscall_exit: 23329.195915322 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.195926200 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7756e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.195930587 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.195934055 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.195936319 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.195939374 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 240 [syscall 240] }
+kernel.sched_schedule: 23329.195971303 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { prev_pid = 16834, next_pid = 1989, prev_state = 1 }
+kernel.syscall_entry: 23329.202998521 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [syscall 3] }
+fs.read: 23329.203019222 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 4096, fd = 48 }
+kernel.syscall_exit: 23329.203022011 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = -11 }
+kernel.syscall_entry: 23329.203031889 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7657e4c, syscall_id = 265 [syscall 265] }
+kernel.syscall_exit: 23329.203037239 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.203041539 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 104 [syscall 104] }
+kernel.timer_itimer_set: 23329.203048129 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 23329.203059310 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, MODE_UNKNOWN { ret = 0 }
+kernel.syscall_entry: 23329.203077159 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 142 [syscall 142] }
+fs.select: 23329.203086389 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 1, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203091177 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 3, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203094201 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 5, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203106325 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 7, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203109003 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 13, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203111699 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 19, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203114858 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 20, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203117271 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 21, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203120029 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 22, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203122725 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 23, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203125385 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 24, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203128328 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 25, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203131172 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 26, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203134486 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 27, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203137287 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 28, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203140149 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 29, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203143024 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 30, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203146041 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 31, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203164817 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 32, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203167692 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 33, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203170185 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 34, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203172746 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 35, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203175559 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 37, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203178558 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 38, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203181353 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 39, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203183982 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 40, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203186585 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 41, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203189516 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 42, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203192546 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 43, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203195230 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 44, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203197957 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 45, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203200857 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 46, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203203381 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 48, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203205583 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 49, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203208335 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 50, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.203211260 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 52, end_time_sec = 23660, end_time_nsec = 559657919 }
+kernel.sched_schedule: 23329.203245479 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { prev_pid = 1989, next_pid = 16927, prev_state = 1 }
+vm_state.vm_map: 23329.203611000 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3078029312, end = 3078340608, flags = 134223989, pgoff = 0, inode = 19234 }
+vm_state.vm_map: 23329.203614449 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3078340608, end = 3078344704, flags = 135272561, pgoff = 311296, inode = 19234 }
+vm_state.vm_map: 23329.203616510 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3078344704, end = 3078348800, flags = 135272563, pgoff = 315392, inode = 19234 }
+vm_state.vm_map: 23329.203618626 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3078348800, end = 3078361088, flags = 1048691, pgoff = 3078348800, inode = 0 }
+vm_state.vm_map: 23329.203620829 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3090329600, end = 3090464768, flags = 1048691, pgoff = 3090329600, inode = 0 }
+vm_state.vm_map: 23329.203622865 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2838, start = 3220611072, end = 3220697088, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.203627832 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3073392640, end = 3073413120, flags = 134217845, pgoff = 0, inode = 508374 }
+vm_state.vm_map: 23329.203630047 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3073413120, end = 3073417216, flags = 135266417, pgoff = 16384, inode = 508374 }
+vm_state.vm_map: 23329.203632244 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3073417216, end = 3073421312, flags = 135266419, pgoff = 20480, inode = 508374 }
+vm_state.vm_map: 23329.203635211 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3073421312, end = 3073462272, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.203637390 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3073462272, end = 3073466368, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.203639598 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3073466368, end = 3073470464, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.203642270 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3073470464, end = 3073507328, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.203644435 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3073507328, end = 3073511424, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.203646645 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3073511424, end = 3073515520, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.203649001 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3073515520, end = 3073540096, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.203651754 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3073540096, end = 3073544192, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.203653975 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3073544192, end = 3073548288, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.203656115 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3073548288, end = 3073556480, flags = 1048691, pgoff = 3073548288, inode = 0 }
+vm_state.vm_map: 23329.203658935 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3073556480, end = 3073642496, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.203661125 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3073642496, end = 3073646592, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.203663198 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3073646592, end = 3073650688, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.203665358 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3073650688, end = 3073658880, flags = 1048691, pgoff = 3073650688, inode = 0 }
+vm_state.vm_map: 23329.203668190 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3073658880, end = 3073667072, flags = 134217845, pgoff = 0, inode = 500018 }
+vm_state.vm_map: 23329.203670399 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3073667072, end = 3073671168, flags = 135266419, pgoff = 4096, inode = 500018 }
+vm_state.vm_map: 23329.203672855 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3073671168, end = 3073675264, flags = 1048691, pgoff = 3073671168, inode = 0 }
+vm_state.vm_map: 23329.203675483 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3073675264, end = 3073699840, flags = 134217845, pgoff = 0, inode = 19420 }
+vm_state.vm_map: 23329.203677785 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3073699840, end = 3073703936, flags = 135266419, pgoff = 20480, inode = 19420 }
+vm_state.vm_map: 23329.203680851 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3073703936, end = 3073712128, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.203683079 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3073712128, end = 3073716224, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.203685127 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3073716224, end = 3073720320, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.203688089 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3073720320, end = 3075035136, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.203690711 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3075035136, end = 3075043328, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.203692920 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3075043328, end = 3075047424, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.203695098 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3075047424, end = 3075059712, flags = 1048691, pgoff = 3075047424, inode = 0 }
+vm_state.vm_map: 23329.203697689 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3075059712, end = 3075067904, flags = 134217845, pgoff = 0, inode = 499720 }
+vm_state.vm_map: 23329.203699929 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3075067904, end = 3075072000, flags = 135266419, pgoff = 4096, inode = 499720 }
+vm_state.vm_map: 23329.203702687 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3075072000, end = 3075231744, flags = 134217845, pgoff = 0, inode = 18680 }
+vm_state.vm_map: 23329.203704736 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3075231744, end = 3075235840, flags = 135266419, pgoff = 159744, inode = 18680 }
+vm_state.vm_map: 23329.203706969 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3075235840, end = 3075239936, flags = 1048691, pgoff = 3075235840, inode = 0 }
+vm_state.vm_map: 23329.203709444 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3075239936, end = 3075899392, flags = 134217845, pgoff = 0, inode = 19419 }
+vm_state.vm_map: 23329.203711560 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3075899392, end = 3075923968, flags = 135266419, pgoff = 659456, inode = 19419 }
+vm_state.vm_map: 23329.203713954 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3075923968, end = 3076087808, flags = 134217845, pgoff = 0, inode = 17950 }
+vm_state.vm_map: 23329.203716052 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3076087808, end = 3076091904, flags = 135266419, pgoff = 163840, inode = 17950 }
+vm_state.vm_map: 23329.203718847 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3076091904, end = 3076128768, flags = 134217845, pgoff = 0, inode = 508391 }
+vm_state.vm_map: 23329.203720815 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3076128768, end = 3076132864, flags = 135266417, pgoff = 32768, inode = 508391 }
+vm_state.vm_map: 23329.203722820 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3076132864, end = 3076136960, flags = 135266419, pgoff = 36864, inode = 508391 }
+vm_state.vm_map: 23329.203724923 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3076136960, end = 3076296704, flags = 1048691, pgoff = 3076136960, inode = 0 }
+vm_state.vm_map: 23329.203727843 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3076296704, end = 3076374528, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.203730169 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3076374528, end = 3076378624, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.203732315 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3076378624, end = 3076382720, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.203734438 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3076382720, end = 3076390912, flags = 1048691, pgoff = 3076382720, inode = 0 }
+vm_state.vm_map: 23329.203737135 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3076390912, end = 3076468736, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.203739226 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3076468736, end = 3076472832, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.203741651 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3076472832, end = 3076481024, flags = 134217845, pgoff = 0, inode = 508383 }
+vm_state.vm_map: 23329.203743884 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3076481024, end = 3076485120, flags = 135266417, pgoff = 4096, inode = 508383 }
+vm_state.vm_map: 23329.203746106 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3076485120, end = 3076489216, flags = 135266419, pgoff = 8192, inode = 508383 }
+vm_state.vm_map: 23329.203748210 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3076489216, end = 3076493312, flags = 1048691, pgoff = 3076489216, inode = 0 }
+vm_state.vm_map: 23329.203750943 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3076493312, end = 3077795840, flags = 134217845, pgoff = 0, inode = 33850 }
+vm_state.vm_map: 23329.203753109 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3077795840, end = 3077890048, flags = 135266419, pgoff = 1302528, inode = 33850 }
+vm_state.vm_map: 23329.203755213 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3077890048, end = 3077902336, flags = 1048691, pgoff = 3077890048, inode = 0 }
+vm_state.vm_map: 23329.203757891 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3077902336, end = 3077971968, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 23329.203760118 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3077971968, end = 3077976064, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 23329.203762265 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3077976064, end = 3077980160, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 23329.203764881 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3077980160, end = 3077988352, flags = 1048691, pgoff = 3077980160, inode = 0 }
+vm_state.vm_map: 23329.203767084 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3078082560, end = 3078090752, flags = 1048691, pgoff = 3078082560, inode = 0 }
+vm_state.vm_map: 23329.203769256 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3078090752, end = 3078094848, flags = 67371125, pgoff = 3078090752, inode = 0 }
+vm_state.vm_map: 23329.203771650 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3078094848, end = 3078209536, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.203773847 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3078209536, end = 3078213632, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.203776012 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3078213632, end = 3078217728, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.203778369 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3078217728, end = 3078529024, flags = 134223989, pgoff = 0, inode = 19234 }
+vm_state.vm_map: 23329.203780523 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3078529024, end = 3078533120, flags = 135272561, pgoff = 311296, inode = 19234 }
+vm_state.vm_map: 23329.203782571 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3078533120, end = 3078537216, flags = 135272563, pgoff = 315392, inode = 19234 }
+vm_state.vm_map: 23329.203784577 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3078537216, end = 3078549504, flags = 1048691, pgoff = 3078537216, inode = 0 }
+vm_state.vm_map: 23329.203786656 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3100426240, end = 3100561408, flags = 1048691, pgoff = 3100426240, inode = 0 }
+vm_state.vm_map: 23329.203788606 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2853, start = 3216293888, end = 3216379904, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.203870482 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3071856640, end = 3072942080, flags = 1048691, pgoff = 3073015808, inode = 0 }
+vm_state.vm_map: 23329.203876863 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3072983040, end = 3073150976, flags = 1048691, pgoff = 3072983040, inode = 0 }
+vm_state.vm_map: 23329.203879577 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3073150976, end = 3073171456, flags = 134217845, pgoff = 0, inode = 508374 }
+vm_state.vm_map: 23329.203881700 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3073171456, end = 3073175552, flags = 135266417, pgoff = 16384, inode = 508374 }
+vm_state.vm_map: 23329.203884062 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3073175552, end = 3073179648, flags = 135266419, pgoff = 20480, inode = 508374 }
+vm_state.vm_map: 23329.203886605 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3073179648, end = 3073220608, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.203888782 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3073220608, end = 3073224704, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.203891034 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3073224704, end = 3073228800, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.203893293 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3073228800, end = 3073265664, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.203895508 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3073265664, end = 3073269760, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.203897692 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3073269760, end = 3073273856, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.203899981 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3073273856, end = 3073298432, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.203901980 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3073298432, end = 3073302528, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.203904189 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3073302528, end = 3073306624, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.203906238 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3073306624, end = 3073314816, flags = 1048691, pgoff = 3073306624, inode = 0 }
+vm_state.vm_map: 23329.203908434 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3073314816, end = 3073400832, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.203910538 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3073400832, end = 3073404928, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.203912827 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3073404928, end = 3073409024, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.203915252 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3073409024, end = 3073417216, flags = 1048691, pgoff = 3073409024, inode = 0 }
+vm_state.vm_map: 23329.203917399 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3073417216, end = 3073425408, flags = 134217845, pgoff = 0, inode = 500018 }
+vm_state.vm_map: 23329.203919633 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3073425408, end = 3073429504, flags = 135266419, pgoff = 4096, inode = 500018 }
+vm_state.vm_map: 23329.203921688 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3073429504, end = 3073433600, flags = 1048691, pgoff = 3073429504, inode = 0 }
+vm_state.vm_map: 23329.203923940 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3073433600, end = 3073458176, flags = 134217845, pgoff = 0, inode = 19420 }
+vm_state.vm_map: 23329.203925927 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3073458176, end = 3073462272, flags = 135266419, pgoff = 20480, inode = 19420 }
+vm_state.vm_map: 23329.203928185 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3073462272, end = 3073470464, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.203930480 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3073470464, end = 3073474560, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.203932634 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3073474560, end = 3073478656, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.203934954 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3073478656, end = 3074793472, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.203937118 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3074793472, end = 3074801664, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.203939180 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3074801664, end = 3074805760, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.203941407 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3074805760, end = 3074818048, flags = 1048691, pgoff = 3074805760, inode = 0 }
+vm_state.vm_map: 23329.203943745 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3074818048, end = 3074826240, flags = 134217845, pgoff = 0, inode = 499720 }
+vm_state.vm_map: 23329.203945961 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3074826240, end = 3074830336, flags = 135266419, pgoff = 4096, inode = 499720 }
+vm_state.vm_map: 23329.203948163 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3074830336, end = 3074990080, flags = 134217845, pgoff = 0, inode = 18680 }
+vm_state.vm_map: 23329.203950551 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3074990080, end = 3074994176, flags = 135266419, pgoff = 159744, inode = 18680 }
+vm_state.vm_map: 23329.203952945 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3074994176, end = 3074998272, flags = 1048691, pgoff = 3074994176, inode = 0 }
+vm_state.vm_map: 23329.203955271 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3074998272, end = 3075657728, flags = 134217845, pgoff = 0, inode = 19419 }
+vm_state.vm_map: 23329.203957430 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3075657728, end = 3075682304, flags = 135266419, pgoff = 659456, inode = 19419 }
+vm_state.vm_map: 23329.203959769 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3075682304, end = 3075846144, flags = 134217845, pgoff = 0, inode = 17950 }
+vm_state.vm_map: 23329.203961854 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3075846144, end = 3075850240, flags = 135266419, pgoff = 163840, inode = 17950 }
+vm_state.vm_map: 23329.203964039 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3075850240, end = 3075887104, flags = 134217845, pgoff = 0, inode = 508391 }
+vm_state.vm_map: 23329.203965970 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3075887104, end = 3075891200, flags = 135266417, pgoff = 32768, inode = 508391 }
+vm_state.vm_map: 23329.203968154 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3075891200, end = 3075895296, flags = 135266419, pgoff = 36864, inode = 508391 }
+vm_state.vm_map: 23329.203970314 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3075895296, end = 3076055040, flags = 1048691, pgoff = 3075895296, inode = 0 }
+vm_state.vm_map: 23329.203972529 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3076055040, end = 3076132864, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.203974627 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3076132864, end = 3076136960, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.203977008 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3076136960, end = 3076141056, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.203978970 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3076141056, end = 3076149248, flags = 1048691, pgoff = 3076141056, inode = 0 }
+vm_state.vm_map: 23329.203981679 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3076149248, end = 3076227072, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.203983641 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3076227072, end = 3076231168, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.203986035 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3076231168, end = 3076239360, flags = 134217845, pgoff = 0, inode = 508383 }
+vm_state.vm_map: 23329.203988207 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3076239360, end = 3076243456, flags = 135266417, pgoff = 4096, inode = 508383 }
+vm_state.vm_map: 23329.203990342 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3076243456, end = 3076247552, flags = 135266419, pgoff = 8192, inode = 508383 }
+vm_state.vm_map: 23329.203992317 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3076247552, end = 3076251648, flags = 1048691, pgoff = 3076247552, inode = 0 }
+vm_state.vm_map: 23329.203994519 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3076251648, end = 3077554176, flags = 134217845, pgoff = 0, inode = 33850 }
+vm_state.vm_map: 23329.203996494 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3077554176, end = 3077648384, flags = 135266419, pgoff = 1302528, inode = 33850 }
+vm_state.vm_map: 23329.203998487 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3077648384, end = 3077660672, flags = 1048691, pgoff = 3077648384, inode = 0 }
+vm_state.vm_map: 23329.204000572 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3077660672, end = 3077730304, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 23329.204002719 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3077730304, end = 3077734400, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 23329.204004823 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3077734400, end = 3077738496, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 23329.204006940 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3077738496, end = 3077746688, flags = 1048691, pgoff = 3077738496, inode = 0 }
+vm_state.vm_map: 23329.204008914 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3077840896, end = 3077849088, flags = 1048691, pgoff = 3077840896, inode = 0 }
+vm_state.vm_map: 23329.204011086 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3077849088, end = 3077853184, flags = 67371125, pgoff = 3077849088, inode = 0 }
+vm_state.vm_map: 23329.204013381 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3077853184, end = 3077967872, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.204015448 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3077967872, end = 3077971968, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.204017397 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3077971968, end = 3077976064, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.204020236 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3077976064, end = 3078287360, flags = 134223989, pgoff = 0, inode = 19234 }
+vm_state.vm_map: 23329.204022278 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3078287360, end = 3078291456, flags = 135272561, pgoff = 311296, inode = 19234 }
+vm_state.vm_map: 23329.204024229 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3078291456, end = 3078295552, flags = 135272563, pgoff = 315392, inode = 19234 }
+vm_state.vm_map: 23329.204026412 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3078295552, end = 3078307840, flags = 1048691, pgoff = 3078295552, inode = 0 }
+vm_state.vm_map: 23329.204028356 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3105570816, end = 3106885632, flags = 1048691, pgoff = 3105570816, inode = 0 }
+vm_state.vm_map: 23329.204030306 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 2864, start = 3216633856, end = 3216719872, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.204037475 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 134512640, end = 134631424, flags = 134223989, pgoff = 0, inode = 429632 }
+vm_state.vm_map: 23329.204039567 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 134631424, end = 134635520, flags = 135272563, pgoff = 118784, inode = 429632 }
+vm_state.vm_map: 23329.204041726 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 164012032, end = 164147200, flags = 1048691, pgoff = 164012032, inode = 0 }
+vm_state.vm_map: 23329.204044015 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3072811008, end = 3072851968, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.204046385 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3072851968, end = 3072856064, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.204048587 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3072856064, end = 3072860160, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.204050864 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3072860160, end = 3072897024, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.204052937 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3072897024, end = 3072901120, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.204055239 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3072901120, end = 3072905216, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.204060792 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3072905216, end = 3072983040, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.204062945 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3072983040, end = 3072987136, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.204064981 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3072987136, end = 3072991232, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.204067153 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3072991232, end = 3072999424, flags = 1048691, pgoff = 3072991232, inode = 0 }
+vm_state.vm_map: 23329.204069504 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3072999424, end = 3073024000, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.204071682 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3073024000, end = 3073028096, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.204073897 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3073028096, end = 3073032192, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.204076711 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3073126400, end = 3074457600, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.204078803 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3074457600, end = 3074461696, flags = 1048691, pgoff = 3074457600, inode = 0 }
+vm_state.vm_map: 23329.204081499 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3074461696, end = 3074560000, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 23329.204083467 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3074560000, end = 3074564096, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 23329.204085763 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3074564096, end = 3074568192, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 23329.204087811 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3074568192, end = 3074572288, flags = 1048691, pgoff = 3074568192, inode = 0 }
+vm_state.vm_map: 23329.204090001 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3074572288, end = 3074641920, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 23329.204092302 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3074641920, end = 3074646016, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 23329.204094604 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3074646016, end = 3074650112, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 23329.204096528 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3074650112, end = 3074658304, flags = 1048691, pgoff = 3074650112, inode = 0 }
+vm_state.vm_map: 23329.204098657 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3074658304, end = 3074666496, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.204100718 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3074666496, end = 3074670592, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.204102804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3074670592, end = 3074674688, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.204105637 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3074674688, end = 3074686976, flags = 134217845, pgoff = 0, inode = 19626 }
+vm_state.vm_map: 23329.204107567 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3074686976, end = 3074691072, flags = 135266419, pgoff = 8192, inode = 19626 }
+vm_state.vm_map: 23329.204110405 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3074691072, end = 3074883584, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.204112349 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3074883584, end = 3074887680, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.204114922 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3074887680, end = 3074916352, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.204117094 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3074916352, end = 3074920448, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.204119136 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3074920448, end = 3074924544, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.204121474 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3074924544, end = 3076239360, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.204123597 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3076239360, end = 3076247552, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.204125547 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3076247552, end = 3076251648, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.204127694 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3076251648, end = 3076268032, flags = 1048691, pgoff = 3076251648, inode = 0 }
+vm_state.vm_map: 23329.204130575 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3076268032, end = 3077005312, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.204132840 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3077005312, end = 3077009408, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.204135166 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3077009408, end = 3077095424, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.204137184 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3077095424, end = 3077099520, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.204139423 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3077099520, end = 3077103616, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.204141595 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3077103616, end = 3077111808, flags = 1048691, pgoff = 3077103616, inode = 0 }
+vm_state.vm_map: 23329.204144168 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3077111808, end = 3077337088, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.204146371 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3077337088, end = 3077341184, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.204148568 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3077341184, end = 3077345280, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.204151073 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3077345280, end = 3077586944, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.204153263 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3077586944, end = 3077591040, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.204155608 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3077591040, end = 3078189056, flags = 134217845, pgoff = 0, inode = 19628 }
+vm_state.vm_map: 23329.204157706 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3078189056, end = 3078197248, flags = 135266419, pgoff = 598016, inode = 19628 }
+vm_state.vm_map: 23329.204159840 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3078197248, end = 3078201344, flags = 1048691, pgoff = 3078197248, inode = 0 }
+vm_state.vm_map: 23329.204165770 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3078201344, end = 3078217728, flags = 134217845, pgoff = 0, inode = 19625 }
+vm_state.vm_map: 23329.204168163 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3078217728, end = 3078221824, flags = 135266419, pgoff = 12288, inode = 19625 }
+vm_state.vm_map: 23329.204170755 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3078221824, end = 3078303744, flags = 134217845, pgoff = 0, inode = 1065113 }
+vm_state.vm_map: 23329.204172829 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3078303744, end = 3078307840, flags = 135266419, pgoff = 77824, inode = 1065113 }
+vm_state.vm_map: 23329.204175339 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3078340608, end = 3078369280, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.204178203 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3078369280, end = 3078402048, flags = 134217841, pgoff = 0, inode = 74138 }
+vm_state.vm_map: 23329.204180244 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3078402048, end = 3078410240, flags = 1048691, pgoff = 3078402048, inode = 0 }
+vm_state.vm_map: 23329.204182286 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3078410240, end = 3078414336, flags = 67371125, pgoff = 3078410240, inode = 0 }
+vm_state.vm_map: 23329.204184532 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3078414336, end = 3078529024, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.204186538 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3078529024, end = 3078533120, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.204188481 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3078533120, end = 3078537216, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.204190456 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3380, start = 3216216064, end = 3216302080, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.204197033 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 134512640, end = 134598656, flags = 134223989, pgoff = 0, inode = 429635 }
+vm_state.vm_map: 23329.204199242 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 134598656, end = 134602752, flags = 135272563, pgoff = 81920, inode = 429635 }
+vm_state.vm_map: 23329.204201377 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 162709504, end = 163016704, flags = 1048691, pgoff = 162709504, inode = 0 }
+vm_state.vm_map: 23329.204203857 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3072983040, end = 3073024000, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.204206406 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3073024000, end = 3073028096, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.204208460 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3073028096, end = 3073032192, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.204210786 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3073032192, end = 3073110016, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.204212748 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3073110016, end = 3073114112, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.204215142 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3073114112, end = 3073118208, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.204217111 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3073118208, end = 3073126400, flags = 1048691, pgoff = 3073118208, inode = 0 }
+vm_state.vm_map: 23329.204222436 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3073126400, end = 3073171456, flags = 134217845, pgoff = 0, inode = 499915 }
+vm_state.vm_map: 23329.204224490 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3073171456, end = 3073175552, flags = 135266419, pgoff = 45056, inode = 499915 }
+vm_state.vm_map: 23329.204226755 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3073191936, end = 3073228800, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.204228957 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3073228800, end = 3073232896, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.204230895 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3073232896, end = 3073236992, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.204233091 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3073236992, end = 3073261568, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.204235158 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3073261568, end = 3073265664, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.204237144 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3073265664, end = 3073269760, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.204239885 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3073269760, end = 3073417216, flags = 134217845, pgoff = 0, inode = 429627 }
+vm_state.vm_map: 23329.204242550 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3073417216, end = 3073421312, flags = 135266419, pgoff = 143360, inode = 429627 }
+vm_state.vm_map: 23329.204244697 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3073421312, end = 3074752512, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.204246906 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3074752512, end = 3074760704, flags = 1048691, pgoff = 3074752512, inode = 0 }
+vm_state.vm_map: 23329.204249085 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3074760704, end = 3074859008, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 23329.204251052 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3074859008, end = 3074863104, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 23329.204253125 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3074863104, end = 3074867200, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 23329.204255218 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3074867200, end = 3074936832, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 23329.204257290 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3074936832, end = 3074940928, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 23329.204259277 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3074940928, end = 3074945024, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 23329.204261344 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3074945024, end = 3074957312, flags = 1048691, pgoff = 3074945024, inode = 0 }
+vm_state.vm_map: 23329.204263701 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3074957312, end = 3074965504, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.204265971 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3074965504, end = 3074969600, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.204268094 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3074969600, end = 3074973696, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.204270543 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3074973696, end = 3074985984, flags = 134217845, pgoff = 0, inode = 19626 }
+vm_state.vm_map: 23329.204272579 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3074985984, end = 3074990080, flags = 135266419, pgoff = 8192, inode = 19626 }
+vm_state.vm_map: 23329.204274788 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3074990080, end = 3075182592, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.204277226 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3075182592, end = 3075186688, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.204279687 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3075186688, end = 3075215360, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.204281724 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3075215360, end = 3075219456, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.204283871 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3075219456, end = 3075223552, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.204286098 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3075223552, end = 3076538368, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.204288221 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3076538368, end = 3076546560, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.204290214 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3076546560, end = 3076550656, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.204292398 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3076550656, end = 3076562944, flags = 1048691, pgoff = 3076550656, inode = 0 }
+vm_state.vm_map: 23329.204294514 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3076562944, end = 3077300224, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.204296618 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3077300224, end = 3077304320, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.204298611 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3077304320, end = 3077308416, flags = 1048691, pgoff = 3077304320, inode = 0 }
+vm_state.vm_map: 23329.204300931 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3077308416, end = 3077550080, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.204302881 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3077550080, end = 3077554176, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.204305047 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3077554176, end = 3078152192, flags = 134217845, pgoff = 0, inode = 19628 }
+vm_state.vm_map: 23329.204306978 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3078152192, end = 3078160384, flags = 135266419, pgoff = 598016, inode = 19628 }
+vm_state.vm_map: 23329.204309272 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3078160384, end = 3078176768, flags = 134217845, pgoff = 0, inode = 19625 }
+vm_state.vm_map: 23329.204311549 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3078176768, end = 3078180864, flags = 135266419, pgoff = 12288, inode = 19625 }
+vm_state.vm_map: 23329.204313753 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3078180864, end = 3078266880, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.204315814 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3078266880, end = 3078270976, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.204317930 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3078270976, end = 3078275072, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.204319922 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3078275072, end = 3078283264, flags = 1048691, pgoff = 3078275072, inode = 0 }
+vm_state.vm_map: 23329.204322415 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3078283264, end = 3078508544, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.204324403 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3078508544, end = 3078512640, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.204326512 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3078512640, end = 3078516736, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.204328505 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3078516736, end = 3078520832, flags = 1048691, pgoff = 3078516736, inode = 0 }
+vm_state.vm_map: 23329.204330800 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3078520832, end = 3078602752, flags = 134217845, pgoff = 0, inode = 1065113 }
+vm_state.vm_map: 23329.204332910 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3078602752, end = 3078606848, flags = 135266419, pgoff = 77824, inode = 1065113 }
+vm_state.vm_map: 23329.204335421 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3078606848, end = 3078668288, flags = 134217845, pgoff = 0, inode = 22552 }
+vm_state.vm_map: 23329.204337526 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3078668288, end = 3078672384, flags = 135266419, pgoff = 57344, inode = 22552 }
+vm_state.vm_map: 23329.204339617 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3078705152, end = 3078733824, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.204341752 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3078733824, end = 3078766592, flags = 134217841, pgoff = 0, inode = 74138 }
+vm_state.vm_map: 23329.204343844 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3078766592, end = 3078774784, flags = 1048691, pgoff = 3078766592, inode = 0 }
+vm_state.vm_map: 23329.204346244 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3078774784, end = 3078778880, flags = 67371125, pgoff = 3078774784, inode = 0 }
+vm_state.vm_map: 23329.204348564 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3078778880, end = 3078893568, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.204350656 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3078893568, end = 3078897664, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.204352624 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3078897664, end = 3078901760, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.204354808 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3384, start = 3213447168, end = 3213533184, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.204361342 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 134512640, end = 134557696, flags = 134223989, pgoff = 0, inode = 429621 }
+vm_state.vm_map: 23329.204363378 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 134557696, end = 134561792, flags = 135272563, pgoff = 45056, inode = 429621 }
+vm_state.vm_map: 23329.204365550 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 134561792, end = 134565888, flags = 1048691, pgoff = 134561792, inode = 0 }
+vm_state.vm_map: 23329.204367858 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 155820032, end = 155955200, flags = 1048691, pgoff = 155820032, inode = 0 }
+vm_state.vm_map: 23329.204370147 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3071193088, end = 3072524288, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.204372387 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3072524288, end = 3072532480, flags = 1048691, pgoff = 3072524288, inode = 0 }
+vm_state.vm_map: 23329.204374713 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3072532480, end = 3072577536, flags = 134217845, pgoff = 0, inode = 499915 }
+vm_state.vm_map: 23329.204376922 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3072577536, end = 3072581632, flags = 135266419, pgoff = 45056, inode = 499915 }
+vm_state.vm_map: 23329.204379205 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3072581632, end = 3072679936, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 23329.204381210 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3072679936, end = 3072684032, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 23329.204383721 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3072684032, end = 3072688128, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 23329.204386071 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3072688128, end = 3072757760, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 23329.204388126 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3072757760, end = 3072761856, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 23329.204390175 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3072761856, end = 3072765952, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 23329.204392488 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3072765952, end = 3072778240, flags = 1048691, pgoff = 3072765952, inode = 0 }
+vm_state.vm_map: 23329.204394748 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3072778240, end = 3072786432, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.204396844 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3072786432, end = 3072790528, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.204398881 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3072790528, end = 3072794624, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.204401319 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3072794624, end = 3072806912, flags = 134217845, pgoff = 0, inode = 19626 }
+vm_state.vm_map: 23329.204403459 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3072806912, end = 3072811008, flags = 135266419, pgoff = 8192, inode = 19626 }
+vm_state.vm_map: 23329.204405767 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3072811008, end = 3073003520, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.204407920 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3073003520, end = 3073007616, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.204410536 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3073007616, end = 3073036288, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.204412584 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3073036288, end = 3073040384, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.204414781 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3073040384, end = 3073044480, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.204417397 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3073044480, end = 3073191936, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.204419847 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3073191936, end = 3073196032, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.204421932 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3073196032, end = 3073200128, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.204423913 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3073200128, end = 3073204224, flags = 1048691, pgoff = 3073200128, inode = 0 }
+vm_state.vm_map: 23329.204429768 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3073204224, end = 3073372160, flags = 134217845, pgoff = 0, inode = 1065327 }
+vm_state.vm_map: 23329.204431959 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3073372160, end = 3073421312, flags = 135266419, pgoff = 167936, inode = 1065327 }
+vm_state.vm_map: 23329.204434544 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3073421312, end = 3073449984, flags = 134217845, pgoff = 0, inode = 1065218 }
+vm_state.vm_map: 23329.204436642 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3073449984, end = 3073454080, flags = 135266419, pgoff = 28672, inode = 1065218 }
+vm_state.vm_map: 23329.204438993 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3073454080, end = 3074768896, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.204441134 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3074768896, end = 3074777088, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.204443232 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3074777088, end = 3074781184, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.204445385 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3074781184, end = 3074793472, flags = 1048691, pgoff = 3074781184, inode = 0 }
+vm_state.vm_map: 23329.204447631 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3074793472, end = 3074879488, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.204449828 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3074879488, end = 3074883584, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.204451943 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3074883584, end = 3074887680, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.204454048 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3074887680, end = 3074895872, flags = 1048691, pgoff = 3074887680, inode = 0 }
+vm_state.vm_map: 23329.204456522 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3074895872, end = 3075633152, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.204458719 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3075633152, end = 3075637248, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.204460897 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3075637248, end = 3075878912, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.204463180 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3075878912, end = 3075883008, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.204465290 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3075883008, end = 3075887104, flags = 1048691, pgoff = 3075883008, inode = 0 }
+vm_state.vm_map: 23329.204467701 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3075887104, end = 3075911680, flags = 134217845, pgoff = 0, inode = 23404 }
+vm_state.vm_map: 23329.204469768 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3075911680, end = 3075915776, flags = 135266419, pgoff = 20480, inode = 23404 }
+vm_state.vm_map: 23329.204471230 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3075915776, end = 3076513792, flags = 134217845, pgoff = 0, inode = 19628 }
+kernel.irq_entry: 23329.204502994 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { ip = 3242331332, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_update_time: 23329.204519585 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { jiffies = 4297269591, xtime_sec = 1264196274, xtime_nsec = 637522010, walltomonotonic_sec = -1264172952, walltomonotonic_nsec = 189579727 }
+kernel.softirq_raise: 23329.204534343 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, IRQ { softirq_id = 1 [softirq 1] }
+kernel.irq_exit: 23329.204562640 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { handled = 1 }
+kernel.softirq_entry: 23329.204566323 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, SOFTIRQ { softirq_id = 1 [softirq 1] }
+kernel.timer_set: 23329.204579719 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, SOFTIRQ { expires = 2302296, function = 0xc141d458, data = 0 }
+kernel.softirq_exit: 23329.204582711 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { softirq_id = 1 [softirq 1] }
+vm_state.vm_map: 23329.204588147 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3076513792, end = 3076521984, flags = 135266419, pgoff = 598016, inode = 19628 }
+vm_state.vm_map: 23329.204610286 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3076521984, end = 3076538368, flags = 134217845, pgoff = 0, inode = 19625 }
+vm_state.vm_map: 23329.204648213 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3076538368, end = 3076542464, flags = 135266419, pgoff = 12288, inode = 19625 }
+vm_state.vm_map: 23329.204650563 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3076542464, end = 3076767744, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.204652760 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3076767744, end = 3076771840, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.204654975 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3076771840, end = 3076775936, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.204726536 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3076775936, end = 3076857856, flags = 134217845, pgoff = 0, inode = 1065113 }
+vm_state.vm_map: 23329.204729867 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3076857856, end = 3076861952, flags = 135266419, pgoff = 77824, inode = 1065113 }
+vm_state.vm_map: 23329.204732083 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3076861952, end = 3076866048, flags = 1048691, pgoff = 3076861952, inode = 0 }
+vm_state.vm_map: 23329.204738944 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3076866048, end = 3076894720, flags = 134217845, pgoff = 0, inode = 23788 }
+vm_state.vm_map: 23329.204741091 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3076894720, end = 3076898816, flags = 135266419, pgoff = 24576, inode = 23788 }
+vm_state.vm_map: 23329.204743596 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3076898816, end = 3077005312, flags = 134217845, pgoff = 0, inode = 23808 }
+vm_state.vm_map: 23329.204745675 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3077005312, end = 3077009408, flags = 135266419, pgoff = 102400, inode = 23808 }
+vm_state.vm_map: 23329.204747798 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3077009408, end = 3077402624, flags = 1048691, pgoff = 3077009408, inode = 0 }
+vm_state.vm_map: 23329.204750124 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3077468160, end = 3077496832, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.204752184 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3077496832, end = 3077505024, flags = 1048691, pgoff = 3077496832, inode = 0 }
+vm_state.vm_map: 23329.204754190 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3077505024, end = 3077509120, flags = 67371125, pgoff = 3077505024, inode = 0 }
+vm_state.vm_map: 23329.204756627 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3077509120, end = 3077623808, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.204758861 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3077623808, end = 3077627904, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.204760878 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3077627904, end = 3077632000, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.204762976 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3386, start = 3214983168, end = 3215069184, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.204766968 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 134512640, end = 135303168, flags = 134223989, pgoff = 0, inode = 1048715 }
+vm_state.vm_map: 23329.204769017 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 135303168, end = 135323648, flags = 135272563, pgoff = 790528, inode = 1048715 }
+vm_state.vm_map: 23329.204771194 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 135323648, end = 135344128, flags = 1048691, pgoff = 135323648, inode = 0 }
+vm_state.vm_map: 23329.204773366 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 137248768, end = 137510912, flags = 1048691, pgoff = 137248768, inode = 0 }
+vm_state.vm_map: 23329.204778672 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3075186688, end = 3075227648, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.204780943 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3075227648, end = 3075231744, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.204783072 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3075231744, end = 3075235840, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.204785250 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3075235840, end = 3075272704, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.204787409 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3075272704, end = 3075276800, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.204789452 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3075276800, end = 3075280896, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.204791802 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3075280896, end = 3075358720, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.204793820 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3075358720, end = 3075362816, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.204795930 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3075362816, end = 3075366912, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.204797948 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3075366912, end = 3075375104, flags = 1048691, pgoff = 3075366912, inode = 0 }
+vm_state.vm_map: 23329.204800200 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3075375104, end = 3075399680, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.204802650 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3075399680, end = 3075403776, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.204804612 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3075403776, end = 3075407872, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.204806821 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3075407872, end = 3076739072, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.204809141 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3076739072, end = 3076743168, flags = 1048691, pgoff = 3076739072, inode = 0 }
+vm_state.vm_map: 23329.204811436 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3076743168, end = 3078057984, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.204813540 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3078057984, end = 3078066176, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.204815558 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3078066176, end = 3078070272, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.204817655 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3078070272, end = 3078086656, flags = 1048691, pgoff = 3078070272, inode = 0 }
+vm_state.vm_map: 23329.204819914 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3078086656, end = 3078094848, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.204822018 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3078094848, end = 3078098944, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.204824017 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3078098944, end = 3078103040, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.204826479 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3078103040, end = 3078320128, flags = 134217845, pgoff = 0, inode = 499784 }
+vm_state.vm_map: 23329.204828429 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3078320128, end = 3078332416, flags = 135266419, pgoff = 217088, inode = 499784 }
+vm_state.vm_map: 23329.204830483 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3078397952, end = 3078426624, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.204832413 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3078426624, end = 3078434816, flags = 1048691, pgoff = 3078426624, inode = 0 }
+vm_state.vm_map: 23329.204834635 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3078434816, end = 3078438912, flags = 67371125, pgoff = 3078434816, inode = 0 }
+vm_state.vm_map: 23329.204837233 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3078438912, end = 3078553600, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.204839177 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3078553600, end = 3078557696, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.204841107 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3078557696, end = 3078561792, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.204845915 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 3701, start = 3215183872, end = 3215269888, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.204848647 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4080, start = 134512640, end = 135303168, flags = 134223989, pgoff = 0, inode = 1048715 }
+vm_state.vm_map: 23329.204850745 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4080, start = 135303168, end = 135323648, flags = 135272563, pgoff = 790528, inode = 1048715 }
+vm_state.vm_map: 23329.204853164 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4080, start = 135323648, end = 135344128, flags = 1048691, pgoff = 135323648, inode = 0 }
+vm_state.vm_map: 23329.204855342 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4080, start = 145723392, end = 145764352, flags = 1048691, pgoff = 145723392, inode = 0 }
+vm_state.vm_map: 23329.204857730 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4080, start = 3075346432, end = 3076677632, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.204859871 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4080, start = 3076677632, end = 3076681728, flags = 1048691, pgoff = 3076677632, inode = 0 }
+vm_state.vm_map: 23329.204862110 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4080, start = 3076681728, end = 3077996544, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.204864202 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4080, start = 3077996544, end = 3078004736, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.204866343 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4080, start = 3078004736, end = 3078008832, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.204868601 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4080, start = 3078008832, end = 3078025216, flags = 1048691, pgoff = 3078008832, inode = 0 }
+vm_state.vm_map: 23329.204871008 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4080, start = 3078025216, end = 3078033408, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.204873303 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4080, start = 3078033408, end = 3078037504, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.204875265 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4080, start = 3078037504, end = 3078041600, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.204877715 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4080, start = 3078041600, end = 3078258688, flags = 134217845, pgoff = 0, inode = 499784 }
+vm_state.vm_map: 23329.204879806 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4080, start = 3078258688, end = 3078270976, flags = 135266419, pgoff = 217088, inode = 499784 }
+vm_state.vm_map: 23329.204881947 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4080, start = 3078336512, end = 3078365184, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.204884107 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4080, start = 3078365184, end = 3078373376, flags = 1048691, pgoff = 3078365184, inode = 0 }
+vm_state.vm_map: 23329.204886384 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4080, start = 3078373376, end = 3078377472, flags = 67371125, pgoff = 3078373376, inode = 0 }
+vm_state.vm_map: 23329.204888488 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4080, start = 3078377472, end = 3078492160, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.204890431 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4080, start = 3078492160, end = 3078496256, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.204892381 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4080, start = 3078496256, end = 3078500352, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.204894559 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4080, start = 3220840448, end = 3220926464, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.204900995 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 134512640, end = 134529024, flags = 134223989, pgoff = 0, inode = 536165 }
+vm_state.vm_map: 23329.204903043 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 134529024, end = 134533120, flags = 135272563, pgoff = 12288, inode = 536165 }
+vm_state.vm_map: 23329.204905036 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 135516160, end = 155324416, flags = 1048691, pgoff = 135516160, inode = 0 }
+vm_state.vm_map: 23329.204911027 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 1802567680, end = 1809252352, flags = 1048695, pgoff = 1802567680, inode = 0 }
+vm_state.vm_map: 23329.204916525 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 1809252352, end = 1833500672, flags = 2097271, pgoff = 1809252352, inode = 0 }
+vm_state.vm_map: 23329.204918691 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 1833500672, end = 1912897536, flags = 1048695, pgoff = 1833500672, inode = 0 }
+vm_state.vm_map: 23329.204923368 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 1912897536, end = 2205220864, flags = 2097271, pgoff = 1912897536, inode = 0 }
+vm_state.vm_map: 23329.204925520 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2205220864, end = 2260008960, flags = 1048695, pgoff = 2205220864, inode = 0 }
+vm_state.vm_map: 23329.204927680 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2260008960, end = 2473656320, flags = 2097271, pgoff = 2260008960, inode = 0 }
+vm_state.vm_map: 23329.204932930 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2473656320, end = 2479927296, flags = 134217937, pgoff = 4096, inode = 207430 }
+vm_state.vm_map: 23329.204937947 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2479927296, end = 2482044928, flags = 2097271, pgoff = 2479927296, inode = 0 }
+vm_state.vm_map: 23329.204940112 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2482044928, end = 2489483264, flags = 135266419, pgoff = 6275072, inode = 207430 }
+vm_state.vm_map: 23329.204942260 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2489483264, end = 2494627840, flags = 2097271, pgoff = 2489483264, inode = 0 }
+vm_state.vm_map: 23329.204944327 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2494627840, end = 2495537152, flags = 135266419, pgoff = 13713408, inode = 207430 }
+vm_state.vm_map: 23329.204946369 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2495537152, end = 2498822144, flags = 2097271, pgoff = 2495537152, inode = 0 }
+vm_state.vm_map: 23329.204948745 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2498822144, end = 2498854912, flags = 134217941, pgoff = 14622720, inode = 207430 }
+vm_state.vm_map: 23329.204953341 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2498854912, end = 2503016448, flags = 2097271, pgoff = 2498854912, inode = 0 }
+vm_state.vm_map: 23329.204955501 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2866380800, end = 2866393088, flags = 2097271, pgoff = 2866380800, inode = 0 }
+vm_state.vm_map: 23329.204957623 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2866393088, end = 2866712576, flags = 1048695, pgoff = 2866393088, inode = 0 }
+vm_state.vm_map: 23329.204962387 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2866712576, end = 2866724864, flags = 2097271, pgoff = 2866712576, inode = 0 }
+vm_state.vm_map: 23329.204964546 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2866724864, end = 2867044352, flags = 1048695, pgoff = 2866724864, inode = 0 }
+vm_state.vm_map: 23329.204966706 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2869952512, end = 2870120448, flags = 2097267, pgoff = 2869952512, inode = 0 }
+vm_state.vm_map: 23329.204968810 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2870120448, end = 2871001088, flags = 2097264, pgoff = 2870120448, inode = 0 }
+vm_state.vm_map: 23329.204970871 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2872049664, end = 2873098240, flags = 2097267, pgoff = 2872049664, inode = 0 }
+vm_state.vm_map: 23329.204976719 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2873888768, end = 2873929728, flags = 134217937, pgoff = 647168, inode = 535784 }
+vm_state.vm_map: 23329.204981891 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2873929728, end = 2874048512, flags = 134217937, pgoff = 1544192, inode = 535672 }
+vm_state.vm_map: 23329.204984055 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2874048512, end = 2874060800, flags = 1048688, pgoff = 2874048512, inode = 0 }
+vm_state.vm_map: 23329.204986481 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2874060800, end = 2874380288, flags = 1048695, pgoff = 2874060800, inode = 0 }
+vm_state.vm_map: 23329.204988553 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2874380288, end = 2874392576, flags = 2097271, pgoff = 2874380288, inode = 0 }
+vm_state.vm_map: 23329.204990855 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2874392576, end = 2874712064, flags = 1048695, pgoff = 2874392576, inode = 0 }
+vm_state.vm_map: 23329.204992941 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2874712064, end = 2874724352, flags = 2097271, pgoff = 2874712064, inode = 0 }
+vm_state.vm_map: 23329.204995058 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2874724352, end = 2875043840, flags = 1048695, pgoff = 2874724352, inode = 0 }
+vm_state.vm_map: 23329.204997272 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2875043840, end = 2875056128, flags = 1048688, pgoff = 2875043840, inode = 0 }
+vm_state.vm_map: 23329.204999457 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2875056128, end = 2875375616, flags = 1048695, pgoff = 2875056128, inode = 0 }
+vm_state.vm_map: 23329.205012851 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2875387904, end = 2875437056, flags = 134217937, pgoff = 778240, inode = 535647 }
+vm_state.vm_map: 23329.205014906 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2875437056, end = 2875441152, flags = 1048688, pgoff = 2875437056, inode = 0 }
+vm_state.vm_map: 23329.205017066 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2875441152, end = 2883829760, flags = 1048695, pgoff = 2875441152, inode = 0 }
+vm_state.vm_map: 23329.205019108 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2883829760, end = 2883833856, flags = 1048688, pgoff = 2883829760, inode = 0 }
+vm_state.vm_map: 23329.205021237 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2883833856, end = 2892222464, flags = 1048695, pgoff = 2883833856, inode = 0 }
+vm_state.vm_map: 23329.205023341 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2892222464, end = 2892226560, flags = 1048688, pgoff = 2892222464, inode = 0 }
+vm_state.vm_map: 23329.205025371 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2892226560, end = 2900615168, flags = 1048695, pgoff = 2892226560, inode = 0 }
+vm_state.vm_map: 23329.205028024 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2900615168, end = 2900619264, flags = 1048688, pgoff = 2900615168, inode = 0 }
+vm_state.vm_map: 23329.205032904 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2900619264, end = 2909007872, flags = 1048695, pgoff = 2900619264, inode = 0 }
+vm_state.vm_map: 23329.205035064 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2909007872, end = 2909011968, flags = 1048688, pgoff = 2909007872, inode = 0 }
+vm_state.vm_map: 23329.205037224 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2909011968, end = 2917400576, flags = 1048695, pgoff = 2909011968, inode = 0 }
+vm_state.vm_map: 23329.205039673 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2917400576, end = 2917515264, flags = 134217845, pgoff = 0, inode = 17291 }
+vm_state.vm_map: 23329.205041629 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2917515264, end = 2917519360, flags = 135266419, pgoff = 114688, inode = 17291 }
+vm_state.vm_map: 23329.205046510 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2917519360, end = 2917826560, flags = 134217845, pgoff = 0, inode = 1065420 }
+vm_state.vm_map: 23329.205048663 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2917826560, end = 2917867520, flags = 135266419, pgoff = 303104, inode = 1065420 }
+vm_state.vm_map: 23329.205051082 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2917867520, end = 2918064128, flags = 134217845, pgoff = 0, inode = 1065401 }
+vm_state.vm_map: 23329.205053290 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2918064128, end = 2918076416, flags = 135266419, pgoff = 192512, inode = 1065401 }
+vm_state.vm_map: 23329.205058208 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2918076416, end = 2918109184, flags = 134217937, pgoff = 311296, inode = 535726 }
+vm_state.vm_map: 23329.205060737 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2918109184, end = 2918170624, flags = 134217841, pgoff = 0, inode = 649749 }
+vm_state.vm_map: 23329.205062903 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2918170624, end = 2918174720, flags = 1048688, pgoff = 2918170624, inode = 0 }
+vm_state.vm_map: 23329.205068191 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2918174720, end = 2926563328, flags = 1048695, pgoff = 2918174720, inode = 0 }
+vm_state.vm_map: 23329.205070344 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2926563328, end = 2926567424, flags = 1048688, pgoff = 2926563328, inode = 0 }
+vm_state.vm_map: 23329.205072429 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2926567424, end = 2934956032, flags = 1048695, pgoff = 2926567424, inode = 0 }
+vm_state.vm_map: 23329.205075002 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2934956032, end = 2935037952, flags = 134217845, pgoff = 0, inode = 870320 }
+vm_state.vm_map: 23329.205077187 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2935037952, end = 2935046144, flags = 135266419, pgoff = 81920, inode = 870320 }
+vm_state.vm_map: 23329.205082579 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2935046144, end = 2935058432, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 23329.205084776 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2935058432, end = 2935062528, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 23329.205087201 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2935062528, end = 2935074816, flags = 134217845, pgoff = 0, inode = 23389 }
+vm_state.vm_map: 23329.205089249 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2935074816, end = 2935078912, flags = 135266419, pgoff = 8192, inode = 23389 }
+vm_state.vm_map: 23329.205091804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2935078912, end = 2935164928, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 23329.205093772 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2935164928, end = 2935169024, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 23329.205095821 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2935169024, end = 2935177216, flags = 1048691, pgoff = 2935169024, inode = 0 }
+vm_state.vm_map: 23329.205098122 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2935177216, end = 2935205888, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 23329.205100115 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2935205888, end = 2935209984, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 23329.205105619 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2935209984, end = 2935238656, flags = 134217845, pgoff = 0, inode = 23395 }
+vm_state.vm_map: 23329.205107778 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2935238656, end = 2935242752, flags = 135266419, pgoff = 28672, inode = 23395 }
+vm_state.vm_map: 23329.205110438 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2935242752, end = 2935562240, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 23329.205112480 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2935562240, end = 2935578624, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 23329.205114701 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2935578624, end = 2935803904, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.205116750 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2935803904, end = 2935808000, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.205118773 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2935808000, end = 2935812096, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.205124518 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2935812096, end = 2936012800, flags = 134217845, pgoff = 0, inode = 21333 }
+vm_state.vm_map: 23329.205126684 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2936012800, end = 2936016896, flags = 135266419, pgoff = 200704, inode = 21333 }
+vm_state.vm_map: 23329.205128646 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2936016896, end = 2936025088, flags = 1048691, pgoff = 2936016896, inode = 0 }
+vm_state.vm_map: 23329.205134870 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2936025088, end = 2936287232, flags = 134217845, pgoff = 0, inode = 17293 }
+vm_state.vm_map: 23329.205137048 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2936287232, end = 2936303616, flags = 135266419, pgoff = 262144, inode = 17293 }
+vm_state.vm_map: 23329.205142510 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2936303616, end = 2936377344, flags = 134217845, pgoff = 0, inode = 19902 }
+vm_state.vm_map: 23329.205144669 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2936377344, end = 2936389632, flags = 135266419, pgoff = 69632, inode = 19902 }
+vm_state.vm_map: 23329.205147174 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2936389632, end = 2937245696, flags = 134217845, pgoff = 0, inode = 19901 }
+vm_state.vm_map: 23329.205149161 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2937245696, end = 2937262080, flags = 135266419, pgoff = 856064, inode = 19901 }
+vm_state.vm_map: 23329.205154245 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2937262080, end = 2937376768, flags = 134217845, pgoff = 0, inode = 19899 }
+vm_state.vm_map: 23329.205156515 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2937376768, end = 2937384960, flags = 135266419, pgoff = 114688, inode = 19899 }
+vm_state.vm_map: 23329.205164567 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2937384960, end = 2937536512, flags = 134217845, pgoff = 0, inode = 19900 }
+vm_state.vm_map: 23329.205166733 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2937536512, end = 2937544704, flags = 135266419, pgoff = 147456, inode = 19900 }
+vm_state.vm_map: 23329.205169337 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2937544704, end = 2938339328, flags = 134217845, pgoff = 0, inode = 21530 }
+vm_state.vm_map: 23329.205171361 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2938339328, end = 2938363904, flags = 135266419, pgoff = 790528, inode = 21530 }
+vm_state.vm_map: 23329.205173798 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2938363904, end = 2938490880, flags = 134217845, pgoff = 0, inode = 18923 }
+vm_state.vm_map: 23329.205175945 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2938490880, end = 2938494976, flags = 135266419, pgoff = 122880, inode = 18923 }
+vm_state.vm_map: 23329.205178469 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2938494976, end = 2939015168, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 23329.205180850 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2939015168, end = 2939023360, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 23329.205183170 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2939023360, end = 2950975488, flags = 134217845, pgoff = 0, inode = 73814 }
+vm_state.vm_map: 23329.205185170 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2950975488, end = 2951942144, flags = 135266419, pgoff = 11952128, inode = 73814 }
+vm_state.vm_map: 23329.205187230 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2951942144, end = 2952007680, flags = 1048691, pgoff = 2951942144, inode = 0 }
+vm_state.vm_map: 23329.205189624 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2952007680, end = 2952122368, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.205191735 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2952122368, end = 2952126464, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.205194258 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2952126464, end = 2953064448, flags = 134217845, pgoff = 0, inode = 16400 }
+vm_state.vm_map: 23329.205196288 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2953064448, end = 2953080832, flags = 135266417, pgoff = 937984, inode = 16400 }
+vm_state.vm_map: 23329.205198380 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2953080832, end = 2953084928, flags = 135266419, pgoff = 954368, inode = 16400 }
+vm_state.vm_map: 23329.205200354 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2953084928, end = 2953113600, flags = 1048691, pgoff = 2953084928, inode = 0 }
+vm_state.vm_map: 23329.205206204 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2953121792, end = 2953138176, flags = 134217937, pgoff = 135168, inode = 535573 }
+vm_state.vm_map: 23329.205211780 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2953138176, end = 2953166848, flags = 134217937, pgoff = 487424, inode = 811519 }
+vm_state.vm_map: 23329.205213941 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2953166848, end = 2953175040, flags = 1048695, pgoff = 2953166848, inode = 0 }
+vm_state.vm_map: 23329.205216729 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2953175040, end = 2953183232, flags = 134217845, pgoff = 0, inode = 1450327 }
+vm_state.vm_map: 23329.205219123 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2953183232, end = 2953187328, flags = 135266417, pgoff = 4096, inode = 1450327 }
+vm_state.vm_map: 23329.205221153 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2953187328, end = 2953191424, flags = 135266419, pgoff = 8192, inode = 1450327 }
+vm_state.vm_map: 23329.205223800 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2953191424, end = 2953203712, flags = 134217845, pgoff = 0, inode = 73813 }
+vm_state.vm_map: 23329.205225855 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2953203712, end = 2953207808, flags = 135266419, pgoff = 8192, inode = 73813 }
+vm_state.vm_map: 23329.205233882 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2953207808, end = 2953248768, flags = 134217937, pgoff = 417792, inode = 535591 }
+vm_state.vm_map: 23329.205236430 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2953248768, end = 2953306112, flags = 134217841, pgoff = 0, inode = 649745 }
+vm_state.vm_map: 23329.205238744 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2953306112, end = 2953363456, flags = 134217841, pgoff = 0, inode = 649747 }
+vm_state.vm_map: 23329.205241595 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2953363456, end = 2953428992, flags = 134217841, pgoff = 0, inode = 649742 }
+vm_state.vm_map: 23329.205246790 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2953428992, end = 2953494528, flags = 134217841, pgoff = 0, inode = 649744 }
+vm_state.vm_map: 23329.205249147 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2953494528, end = 2953555968, flags = 134217841, pgoff = 0, inode = 649743 }
+vm_state.vm_map: 23329.205251115 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2953555968, end = 2953568256, flags = 1048688, pgoff = 2953555968, inode = 0 }
+vm_state.vm_map: 23329.205253441 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2953568256, end = 2953887744, flags = 1048695, pgoff = 2953568256, inode = 0 }
+vm_state.vm_map: 23329.205264393 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2953887744, end = 2960457728, flags = 134217841, pgoff = 0, inode = 545462 }
+vm_state.vm_map: 23329.205266670 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2960457728, end = 2967027712, flags = 134217841, pgoff = 0, inode = 545462 }
+vm_state.vm_map: 23329.205271532 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2967027712, end = 2980356096, flags = 134217841, pgoff = 0, inode = 49306 }
+vm_state.vm_map: 23329.205273679 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2980356096, end = 2993684480, flags = 134217841, pgoff = 0, inode = 49306 }
+vm_state.vm_map: 23329.205275697 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2993684480, end = 2994720768, flags = 2097267, pgoff = 2993684480, inode = 0 }
+vm_state.vm_map: 23329.205277775 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2994720768, end = 2994733056, flags = 2097264, pgoff = 2994720768, inode = 0 }
+vm_state.vm_map: 23329.205280343 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2994737152, end = 2994757632, flags = 134217845, pgoff = 0, inode = 870319 }
+vm_state.vm_map: 23329.205282460 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2994757632, end = 2994765824, flags = 135266419, pgoff = 20480, inode = 870319 }
+vm_state.vm_map: 23329.205284735 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2994765824, end = 2994778112, flags = 1048688, pgoff = 2994765824, inode = 0 }
+vm_state.vm_map: 23329.205286808 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2994778112, end = 2995097600, flags = 1048695, pgoff = 2994778112, inode = 0 }
+vm_state.vm_map: 23329.205288845 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2995097600, end = 2995109888, flags = 1048688, pgoff = 2995097600, inode = 0 }
+vm_state.vm_map: 23329.205290936 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2995109888, end = 2995429376, flags = 1048695, pgoff = 2995109888, inode = 0 }
+vm_state.vm_map: 23329.205296409 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2995429376, end = 2995576832, flags = 134217937, pgoff = 1679360, inode = 535139 }
+vm_state.vm_map: 23329.205298564 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2995576832, end = 2995589120, flags = 1048688, pgoff = 2995576832, inode = 0 }
+vm_state.vm_map: 23329.205300716 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2995589120, end = 2995908608, flags = 1048695, pgoff = 2995589120, inode = 0 }
+vm_state.vm_map: 23329.205302777 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2995908608, end = 2995920896, flags = 2097271, pgoff = 2995908608, inode = 0 }
+vm_state.vm_map: 23329.205304906 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2995920896, end = 2996240384, flags = 1048695, pgoff = 2995920896, inode = 0 }
+vm_state.vm_map: 23329.205307090 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2996240384, end = 2996252672, flags = 1048688, pgoff = 2996240384, inode = 0 }
+vm_state.vm_map: 23329.205309231 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2996252672, end = 2996572160, flags = 1048695, pgoff = 2996252672, inode = 0 }
+vm_state.vm_map: 23329.205311767 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2996572160, end = 2997374976, flags = 134217845, pgoff = 0, inode = 21274 }
+vm_state.vm_map: 23329.205313877 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2997374976, end = 2997391360, flags = 135266419, pgoff = 802816, inode = 21274 }
+vm_state.vm_map: 23329.205318961 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2997395456, end = 2997485568, flags = 134217937, pgoff = 1781760, inode = 737886 }
+vm_state.vm_map: 23329.205321614 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2997485568, end = 2997878784, flags = 134217979, pgoff = 0, inode = 1933319 }
+vm_state.vm_map: 23329.205323780 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2997878784, end = 2998927360, flags = 2097267, pgoff = 2997878784, inode = 0 }
+vm_state.vm_map: 23329.205326230 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2998931456, end = 2998980608, flags = 134217841, pgoff = 0, inode = 649746 }
+vm_state.vm_map: 23329.205333893 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2998980608, end = 2998992896, flags = 134217845, pgoff = 0, inode = 141213 }
+vm_state.vm_map: 23329.205336059 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2998992896, end = 2998996992, flags = 135266419, pgoff = 8192, inode = 141213 }
+vm_state.vm_map: 23329.205343431 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2998996992, end = 2999099392, flags = 134217937, pgoff = 1208320, inode = 535864 }
+vm_state.vm_map: 23329.205348189 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2999115776, end = 2999132160, flags = 134217937, pgoff = 118784, inode = 536141 }
+vm_state.vm_map: 23329.205350676 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2999132160, end = 2999238656, flags = 134217937, pgoff = 1236992, inode = 535706 }
+vm_state.vm_map: 23329.205355494 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2999238656, end = 2999283712, flags = 134217937, pgoff = 524288, inode = 535850 }
+vm_state.vm_map: 23329.205358142 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2999283712, end = 2999328768, flags = 134217937, pgoff = 512000, inode = 535841 }
+vm_state.vm_map: 23329.205362924 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2999328768, end = 2999406592, flags = 134217937, pgoff = 901120, inode = 535818 }
+vm_state.vm_map: 23329.205367704 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2999406592, end = 2999603200, flags = 134217937, pgoff = 2269184, inode = 535816 }
+vm_state.vm_map: 23329.205370248 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2999611392, end = 2999627776, flags = 134217937, pgoff = 53248, inode = 535648 }
+vm_state.vm_map: 23329.205375207 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2999627776, end = 2999644160, flags = 134217937, pgoff = 110592, inode = 535137 }
+vm_state.vm_map: 23329.205377700 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2999644160, end = 2999660544, flags = 134217937, pgoff = 143360, inode = 535687 }
+vm_state.vm_map: 23329.205380020 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2999660544, end = 2999697408, flags = 134217937, pgoff = 368640, inode = 535630 }
+vm_state.vm_map: 23329.205382451 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2999697408, end = 2999824384, flags = 134217937, pgoff = 1445888, inode = 535128 }
+vm_state.vm_map: 23329.205384975 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 2999824384, end = 3000410112, flags = 134217937, pgoff = 9248768, inode = 535655 }
+vm_state.vm_map: 23329.205392181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3000410112, end = 3000451072, flags = 134217845, pgoff = 0, inode = 871011 }
+vm_state.vm_map: 23329.205394341 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3000451072, end = 3000455168, flags = 135266419, pgoff = 36864, inode = 871011 }
+vm_state.vm_map: 23329.205401350 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3000455168, end = 3000475648, flags = 134217845, pgoff = 0, inode = 871006 }
+vm_state.vm_map: 23329.205403534 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3000475648, end = 3000479744, flags = 135266419, pgoff = 20480, inode = 871006 }
+vm_state.vm_map: 23329.205408329 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3000479744, end = 3000487936, flags = 134217937, pgoff = 90112, inode = 535846 }
+vm_state.vm_map: 23329.205410729 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3000487936, end = 3000500224, flags = 1048688, pgoff = 3000487936, inode = 0 }
+vm_state.vm_map: 23329.205412888 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3000500224, end = 3000819712, flags = 1048695, pgoff = 3000500224, inode = 0 }
+vm_state.vm_map: 23329.205415005 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3000823808, end = 3000832000, flags = 1048695, pgoff = 3000823808, inode = 0 }
+vm_state.vm_map: 23329.205417509 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3000832000, end = 3000844288, flags = 134217979, pgoff = 0, inode = 1900550 }
+vm_state.vm_map: 23329.205420063 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3000848384, end = 3000856576, flags = 134217845, pgoff = 0, inode = 23393 }
+vm_state.vm_map: 23329.205422291 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3000856576, end = 3000860672, flags = 135266419, pgoff = 4096, inode = 23393 }
+vm_state.vm_map: 23329.205427085 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3000860672, end = 3000877056, flags = 134217937, pgoff = 118784, inode = 535971 }
+vm_state.vm_map: 23329.205429473 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3000881152, end = 3000909824, flags = 134217937, pgoff = 290816, inode = 536077 }
+vm_state.vm_map: 23329.205440221 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3000909824, end = 3000926208, flags = 134217937, pgoff = 147456, inode = 535865 }
+vm_state.vm_map: 23329.205445034 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3000930304, end = 3001225216, flags = 134217937, pgoff = 3801088, inode = 535633 }
+vm_state.vm_map: 23329.205447194 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3001225216, end = 3001237504, flags = 1048688, pgoff = 3001225216, inode = 0 }
+vm_state.vm_map: 23329.205449242 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3001237504, end = 3001556992, flags = 1048695, pgoff = 3001237504, inode = 0 }
+vm_state.vm_map: 23329.205452012 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3001561088, end = 3001569280, flags = 134217937, pgoff = 65536, inode = 535705 }
+vm_state.vm_map: 23329.205454406 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3001569280, end = 3001597952, flags = 134217937, pgoff = 1118208, inode = 198607 }
+vm_state.vm_map: 23329.205456800 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3001597952, end = 3001606144, flags = 134217937, pgoff = 12288, inode = 535138 }
+vm_state.vm_map: 23329.205461737 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3001606144, end = 3001634816, flags = 134217937, pgoff = 413696, inode = 535130 }
+vm_state.vm_map: 23329.205464254 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3001634816, end = 3001659392, flags = 134217937, pgoff = 225280, inode = 535715 }
+vm_state.vm_map: 23329.205466741 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3001659392, end = 3001671680, flags = 134217845, pgoff = 0, inode = 21332 }
+vm_state.vm_map: 23329.205468814 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3001671680, end = 3001675776, flags = 135266419, pgoff = 8192, inode = 21332 }
+vm_state.vm_map: 23329.205473990 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3001675776, end = 3001708544, flags = 134217937, pgoff = 679936, inode = 535795 }
+vm_state.vm_map: 23329.205479309 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3001708544, end = 3001729024, flags = 134217937, pgoff = 389120, inode = 535921 }
+vm_state.vm_map: 23329.205481814 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3001729024, end = 3001769984, flags = 134217937, pgoff = 380928, inode = 535606 }
+vm_state.vm_map: 23329.205484356 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3001769984, end = 3001835520, flags = 134217937, pgoff = 888832, inode = 536064 }
+vm_state.vm_map: 23329.205486769 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3001835520, end = 3001847808, flags = 134217937, pgoff = 90112, inode = 535574 }
+vm_state.vm_map: 23329.205491841 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3001847808, end = 3002019840, flags = 134217937, pgoff = 4317184, inode = 535724 }
+vm_state.vm_map: 23329.205494358 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3002019840, end = 3002052608, flags = 134217937, pgoff = 356352, inode = 535557 }
+vm_state.vm_map: 23329.205496894 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3002052608, end = 3002073088, flags = 134217937, pgoff = 274432, inode = 536160 }
+vm_state.vm_map: 23329.205498985 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3002073088, end = 3002085376, flags = 1048688, pgoff = 3002073088, inode = 0 }
+vm_state.vm_map: 23329.205501040 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3002085376, end = 3002404864, flags = 1048695, pgoff = 3002085376, inode = 0 }
+vm_state.vm_map: 23329.205505804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3002404864, end = 3002466304, flags = 134217937, pgoff = 1003520, inode = 536157 }
+vm_state.vm_map: 23329.205507970 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3002466304, end = 3002478592, flags = 2097271, pgoff = 3002466304, inode = 0 }
+vm_state.vm_map: 23329.205509949 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3002478592, end = 3002798080, flags = 1048695, pgoff = 3002478592, inode = 0 }
+vm_state.vm_map: 23329.205515089 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3002798080, end = 3004112896, flags = 134217845, pgoff = 0, inode = 499857 }
+vm_state.vm_map: 23329.205517137 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3004112896, end = 3004121088, flags = 135266417, pgoff = 1314816, inode = 499857 }
+vm_state.vm_map: 23329.205519397 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3004121088, end = 3004125184, flags = 135266419, pgoff = 1323008, inode = 499857 }
+vm_state.vm_map: 23329.205521339 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3004125184, end = 3004137472, flags = 1048691, pgoff = 3004125184, inode = 0 }
+vm_state.vm_map: 23329.205529817 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3004137472, end = 3004219392, flags = 134217845, pgoff = 0, inode = 944151 }
+vm_state.vm_map: 23329.205531964 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3004219392, end = 3004223488, flags = 135266419, pgoff = 81920, inode = 944151 }
+vm_state.vm_map: 23329.205534617 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3004223488, end = 3004231680, flags = 134217845, pgoff = 0, inode = 23391 }
+vm_state.vm_map: 23329.205536573 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3004231680, end = 3004235776, flags = 135266419, pgoff = 4096, inode = 23391 }
+vm_state.vm_map: 23329.205539165 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3004239872, end = 3004248064, flags = 134217845, pgoff = 0, inode = 23893 }
+vm_state.vm_map: 23329.205541318 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3004248064, end = 3004252160, flags = 135266419, pgoff = 4096, inode = 23893 }
+vm_state.vm_map: 23329.205543509 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3004252160, end = 3004264448, flags = 1048688, pgoff = 3004252160, inode = 0 }
+vm_state.vm_map: 23329.205545526 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3004264448, end = 3004583936, flags = 1048695, pgoff = 3004264448, inode = 0 }
+vm_state.vm_map: 23329.205547754 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3004583936, end = 3004596224, flags = 1048688, pgoff = 3004583936, inode = 0 }
+vm_state.vm_map: 23329.205549926 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3004596224, end = 3004915712, flags = 1048695, pgoff = 3004596224, inode = 0 }
+vm_state.vm_map: 23329.205555806 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3004919808, end = 3004928000, flags = 134217937, pgoff = 69632, inode = 535597 }
+vm_state.vm_map: 23329.205561161 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3004928000, end = 3004936192, flags = 134217937, pgoff = 135168, inode = 535636 }
+vm_state.vm_map: 23329.205563704 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3004936192, end = 3004952576, flags = 134217937, pgoff = 90112, inode = 535129 }
+vm_state.vm_map: 23329.205569157 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3004952576, end = 3004960768, flags = 134217937, pgoff = 40960, inode = 535834 }
+vm_state.vm_map: 23329.205574767 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3004960768, end = 3004989440, flags = 134217937, pgoff = 335872, inode = 535565 }
+vm_state.vm_map: 23329.205580029 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3004989440, end = 3005001728, flags = 134217937, pgoff = 761856, inode = 737915 }
+vm_state.vm_map: 23329.205582615 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3005001728, end = 3005026304, flags = 134217937, pgoff = 274432, inode = 535712 }
+vm_state.vm_map: 23329.205587303 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3005026304, end = 3005050880, flags = 134217937, pgoff = 204800, inode = 535123 }
+vm_state.vm_map: 23329.205589901 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3005050880, end = 3005083648, flags = 134217937, pgoff = 323584, inode = 535121 }
+vm_state.vm_map: 23329.205594930 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3005083648, end = 3005108224, flags = 134217937, pgoff = 299008, inode = 535863 }
+vm_state.vm_map: 23329.205597299 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3005108224, end = 3005165568, flags = 134217937, pgoff = 667648, inode = 536080 }
+vm_state.vm_map: 23329.205599786 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3005169664, end = 3005181952, flags = 134217937, pgoff = 98304, inode = 737887 }
+vm_state.vm_map: 23329.205602445 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3005181952, end = 3005190144, flags = 134217937, pgoff = 45056, inode = 535125 }
+vm_state.vm_map: 23329.205604839 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3005190144, end = 3005218816, flags = 134217937, pgoff = 307200, inode = 535127 }
+vm_state.vm_map: 23329.205606887 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3005218816, end = 3006263296, flags = 2097267, pgoff = 3005218816, inode = 0 }
+vm_state.vm_map: 23329.205609275 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3006263296, end = 3006267392, flags = 2097264, pgoff = 3006263296, inode = 0 }
+vm_state.vm_map: 23329.205611750 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3006267392, end = 3006275584, flags = 134217937, pgoff = 147456, inode = 535847 }
+vm_state.vm_map: 23329.205614131 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3006275584, end = 3006283776, flags = 134217937, pgoff = 69632, inode = 535134 }
+vm_state.vm_map: 23329.205619012 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3006287872, end = 3006300160, flags = 134217937, pgoff = 98304, inode = 535870 }
+vm_state.vm_map: 23329.205621178 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3006300160, end = 3006312448, flags = 2097271, pgoff = 3006300160, inode = 0 }
+vm_state.vm_map: 23329.205623257 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3006312448, end = 3006631936, flags = 1048695, pgoff = 3006312448, inode = 0 }
+vm_state.vm_map: 23329.205625700 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3006631936, end = 3006636032, flags = 134217937, pgoff = 53248, inode = 535718 }
+vm_state.vm_map: 23329.205628267 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3006640128, end = 3006644224, flags = 134217937, pgoff = 4190208, inode = 535140 }
+vm_state.vm_map: 23329.205630747 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3006644224, end = 3006652416, flags = 134217937, pgoff = 77824, inode = 535969 }
+vm_state.vm_map: 23329.205632808 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3006652416, end = 3006664704, flags = 2097271, pgoff = 3006652416, inode = 0 }
+vm_state.vm_map: 23329.205654132 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3006664704, end = 3006984192, flags = 1048695, pgoff = 3006664704, inode = 0 }
+vm_state.vm_map: 23329.205662721 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3006984192, end = 3006992384, flags = 134217841, pgoff = 0, inode = 76163 }
+vm_state.vm_map: 23329.205665305 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3006992384, end = 3007004672, flags = 134217937, pgoff = 69632, inode = 535132 }
+vm_state.vm_map: 23329.205668318 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007004672, end = 3007029248, flags = 134217937, pgoff = 266240, inode = 535135 }
+vm_state.vm_map: 23329.205670797 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007029248, end = 3007066112, flags = 134217937, pgoff = 352256, inode = 535637 }
+vm_state.vm_map: 23329.205675517 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007066112, end = 3007184896, flags = 134217937, pgoff = 5668864, inode = 535879 }
+vm_state.vm_map: 23329.205680972 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007188992, end = 3007201280, flags = 134217937, pgoff = 65536, inode = 536078 }
+vm_state.vm_map: 23329.205683427 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007201280, end = 3007209472, flags = 134217937, pgoff = 61440, inode = 535120 }
+vm_state.vm_map: 23329.205685877 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007209472, end = 3007250432, flags = 134217937, pgoff = 557056, inode = 535904 }
+vm_state.vm_map: 23329.205690659 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007250432, end = 3007262720, flags = 134217937, pgoff = 81920, inode = 535728 }
+vm_state.vm_map: 23329.205697828 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007262720, end = 3007270912, flags = 134217845, pgoff = 0, inode = 870982 }
+vm_state.vm_map: 23329.205700006 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007270912, end = 3007275008, flags = 135266419, pgoff = 4096, inode = 870982 }
+vm_state.vm_map: 23329.205704770 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007275008, end = 3007283200, flags = 134217937, pgoff = 24576, inode = 535592 }
+vm_state.vm_map: 23329.205707657 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007283200, end = 3007328256, flags = 134217937, pgoff = 692224, inode = 535663 }
+vm_state.vm_map: 23329.205713007 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007328256, end = 3007479808, flags = 134217937, pgoff = 1990656, inode = 535881 }
+vm_state.vm_map: 23329.205720145 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007479808, end = 3007496192, flags = 134217845, pgoff = 0, inode = 87517 }
+vm_state.vm_map: 23329.205722194 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007496192, end = 3007500288, flags = 135266419, pgoff = 12288, inode = 87517 }
+vm_state.vm_map: 23329.205724743 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007500288, end = 3007520768, flags = 134217845, pgoff = 0, inode = 87510 }
+vm_state.vm_map: 23329.205726827 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007520768, end = 3007524864, flags = 135266419, pgoff = 16384, inode = 87510 }
+vm_state.vm_map: 23329.205729475 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007524864, end = 3007578112, flags = 134217841, pgoff = 0, inode = 649748 }
+vm_state.vm_map: 23329.205731887 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007578112, end = 3007647744, flags = 134217841, pgoff = 0, inode = 649694 }
+vm_state.vm_map: 23329.205734330 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007647744, end = 3007655936, flags = 134217845, pgoff = 0, inode = 87435 }
+vm_state.vm_map: 23329.205736534 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007655936, end = 3007660032, flags = 135266419, pgoff = 4096, inode = 87435 }
+vm_state.vm_map: 23329.205739161 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007660032, end = 3007664128, flags = 134217937, pgoff = 0, inode = 1196150 }
+vm_state.vm_map: 23329.205741568 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007664128, end = 3007688704, flags = 134217937, pgoff = 0, inode = 1196354 }
+vm_state.vm_map: 23329.205747158 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007688704, end = 3007692800, flags = 134217937, pgoff = 0, inode = 1196334 }
+vm_state.vm_map: 23329.205749576 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007692800, end = 3007696896, flags = 134217937, pgoff = 0, inode = 1196333 }
+vm_state.vm_map: 23329.205751933 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007696896, end = 3007700992, flags = 134217937, pgoff = 0, inode = 1196331 }
+vm_state.vm_map: 23329.205754266 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007700992, end = 3007705088, flags = 134217937, pgoff = 0, inode = 1196330 }
+vm_state.vm_map: 23329.205756647 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007705088, end = 3007713280, flags = 134217937, pgoff = 0, inode = 1196329 }
+vm_state.vm_map: 23329.205758961 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007713280, end = 3007746048, flags = 134217937, pgoff = 0, inode = 1196328 }
+vm_state.vm_map: 23329.205761442 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007746048, end = 3007758336, flags = 134217937, pgoff = 0, inode = 1196327 }
+vm_state.vm_map: 23329.205763873 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007758336, end = 3007766528, flags = 134217937, pgoff = 0, inode = 1196320 }
+vm_state.vm_map: 23329.205766359 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007766528, end = 3007770624, flags = 134217937, pgoff = 0, inode = 1196318 }
+vm_state.vm_map: 23329.205768568 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007770624, end = 3007774720, flags = 134217937, pgoff = 0, inode = 1196278 }
+vm_state.vm_map: 23329.205770962 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007774720, end = 3007778816, flags = 134217937, pgoff = 0, inode = 1196251 }
+vm_state.vm_map: 23329.205773313 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007778816, end = 3007807488, flags = 134217937, pgoff = 0, inode = 1196236 }
+vm_state.vm_map: 23329.205775534 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007807488, end = 3007819776, flags = 134217937, pgoff = 0, inode = 1196234 }
+vm_state.vm_map: 23329.205777873 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007819776, end = 3007823872, flags = 134217937, pgoff = 0, inode = 1196201 }
+vm_state.vm_map: 23329.205780174 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007823872, end = 3007832064, flags = 134217937, pgoff = 0, inode = 1196170 }
+vm_state.vm_map: 23329.205782581 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007832064, end = 3007836160, flags = 134217937, pgoff = 0, inode = 1196157 }
+vm_state.vm_map: 23329.205785302 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007836160, end = 3007840256, flags = 134217937, pgoff = 0, inode = 1196171 }
+vm_state.vm_map: 23329.205787566 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007840256, end = 3007852544, flags = 134217937, pgoff = 0, inode = 1196172 }
+vm_state.vm_map: 23329.205789837 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007852544, end = 3007860736, flags = 134217937, pgoff = 0, inode = 1196173 }
+vm_state.vm_map: 23329.205792100 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007860736, end = 3007893504, flags = 134217937, pgoff = 0, inode = 1196352 }
+vm_state.vm_map: 23329.205794433 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007893504, end = 3007913984, flags = 134217937, pgoff = 0, inode = 1196196 }
+vm_state.vm_map: 23329.205797055 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007913984, end = 3007942656, flags = 134217937, pgoff = 0, inode = 1196314 }
+vm_state.vm_map: 23329.205799560 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007942656, end = 3007987712, flags = 134217937, pgoff = 0, inode = 1196147 }
+vm_state.vm_map: 23329.205801837 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3007987712, end = 3008045056, flags = 134217937, pgoff = 0, inode = 1196094 }
+vm_state.vm_map: 23329.205804447 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3008045056, end = 3008061440, flags = 134217845, pgoff = 0, inode = 20897 }
+vm_state.vm_map: 23329.205806612 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3008061440, end = 3008065536, flags = 135266419, pgoff = 12288, inode = 20897 }
+vm_state.vm_map: 23329.205808803 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3008065536, end = 3008073728, flags = 134217937, pgoff = 0, inode = 1196343 }
+vm_state.vm_map: 23329.205811073 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3008073728, end = 3008086016, flags = 134217937, pgoff = 0, inode = 1196342 }
+vm_state.vm_map: 23329.205813591 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3008086016, end = 3008143360, flags = 134217937, pgoff = 0, inode = 1196355 }
+vm_state.vm_map: 23329.205815616 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3008143360, end = 3008159744, flags = 1048695, pgoff = 3008143360, inode = 0 }
+vm_state.vm_map: 23329.205820804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3008159744, end = 3008507904, flags = 134217845, pgoff = 0, inode = 870964 }
+vm_state.vm_map: 23329.205823210 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3008507904, end = 3008516096, flags = 135266419, pgoff = 344064, inode = 870964 }
+vm_state.vm_map: 23329.205825363 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3008516096, end = 3008520192, flags = 1048691, pgoff = 3008516096, inode = 0 }
+vm_state.vm_map: 23329.205827677 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3008520192, end = 3008532480, flags = 134217845, pgoff = 0, inode = 870963 }
+vm_state.vm_map: 23329.205829689 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3008532480, end = 3008536576, flags = 135266419, pgoff = 8192, inode = 870963 }
+vm_state.vm_map: 23329.205831873 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3008536576, end = 3008540672, flags = 1048691, pgoff = 3008536576, inode = 0 }
+vm_state.vm_map: 23329.205834489 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3008540672, end = 3008552960, flags = 134217937, pgoff = 94208, inode = 536143 }
+vm_state.vm_map: 23329.205836883 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3008552960, end = 3008569344, flags = 134217937, pgoff = 135168, inode = 535896 }
+vm_state.vm_map: 23329.205839228 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3008569344, end = 3008647168, flags = 134217937, pgoff = 2056192, inode = 535693 }
+vm_state.vm_map: 23329.205841640 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3008647168, end = 3008651264, flags = 134217937, pgoff = 16384, inode = 535975 }
+vm_state.vm_map: 23329.205844078 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3008651264, end = 3008733184, flags = 134217937, pgoff = 978944, inode = 535986 }
+vm_state.vm_map: 23329.205846435 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3008733184, end = 3008737280, flags = 134217937, pgoff = 4096, inode = 535700 }
+vm_state.vm_map: 23329.205848872 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3008737280, end = 3009024000, flags = 134217937, pgoff = 3801088, inode = 535984 }
+vm_state.vm_map: 23329.205850889 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3009032192, end = 3009044480, flags = 1048688, pgoff = 3009032192, inode = 0 }
+vm_state.vm_map: 23329.205852993 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3009044480, end = 3009368064, flags = 1048695, pgoff = 3009044480, inode = 0 }
+vm_state.vm_map: 23329.205855276 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3009368064, end = 3009376256, flags = 134217937, pgoff = 65536, inode = 535787 }
+vm_state.vm_map: 23329.205857757 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3009376256, end = 3009380352, flags = 134217937, pgoff = 40960, inode = 535558 }
+vm_state.vm_map: 23329.205860651 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3009388544, end = 3009396736, flags = 134217937, pgoff = 49152, inode = 535126 }
+vm_state.vm_map: 23329.205862718 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3009396736, end = 3009400832, flags = 1048695, pgoff = 3009396736, inode = 0 }
+vm_state.vm_map: 23329.205865149 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3009400832, end = 3009409024, flags = 134217845, pgoff = 0, inode = 21334 }
+vm_state.vm_map: 23329.205867234 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3009409024, end = 3009413120, flags = 135266419, pgoff = 4096, inode = 21334 }
+vm_state.vm_map: 23329.205869406 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3009413120, end = 3010453504, flags = 2097267, pgoff = 3009413120, inode = 0 }
+vm_state.vm_map: 23329.205871368 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3010453504, end = 3010461696, flags = 2097264, pgoff = 3010453504, inode = 0 }
+vm_state.vm_map: 23329.205876878 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3010461696, end = 3010465792, flags = 134217937, pgoff = 12288, inode = 535588 }
+vm_state.vm_map: 23329.205882072 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3010465792, end = 3010473984, flags = 134217937, pgoff = 28672, inode = 535877 }
+vm_state.vm_map: 23329.205890914 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3010478080, end = 3010494464, flags = 134217937, pgoff = 126976, inode = 535589 }
+vm_state.vm_map: 23329.205893401 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3010494464, end = 3010498560, flags = 134217937, pgoff = 4096, inode = 536090 }
+vm_state.vm_map: 23329.205895875 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3010498560, end = 3010506752, flags = 134217937, pgoff = 24576, inode = 535782 }
+vm_state.vm_map: 23329.205898139 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3010519040, end = 3010531328, flags = 134217937, pgoff = 102400, inode = 536159 }
+vm_state.vm_map: 23329.205900768 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3010531328, end = 3010560000, flags = 134217937, pgoff = 593920, inode = 198593 }
+vm_state.vm_map: 23329.205903125 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3010560000, end = 3010568192, flags = 134217937, pgoff = 16384, inode = 535657 }
+vm_state.vm_map: 23329.205905550 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3010568192, end = 3010580480, flags = 134217937, pgoff = 73728, inode = 535562 }
+vm_state.vm_map: 23329.205911054 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3010580480, end = 3010592768, flags = 134217937, pgoff = 98304, inode = 535122 }
+vm_state.vm_map: 23329.205916582 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3010592768, end = 3010600960, flags = 134217937, pgoff = 57344, inode = 535587 }
+vm_state.vm_map: 23329.205921537 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3010609152, end = 3010617344, flags = 134217937, pgoff = 98304, inode = 535720 }
+vm_state.vm_map: 23329.205923980 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3010617344, end = 3010629632, flags = 134217937, pgoff = 77824, inode = 198594 }
+vm_state.vm_map: 23329.205926393 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3010629632, end = 3010646016, flags = 134217937, pgoff = 159744, inode = 536148 }
+vm_state.vm_map: 23329.205928497 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3010646016, end = 3010658304, flags = 1048688, pgoff = 3010646016, inode = 0 }
+vm_state.vm_map: 23329.205930545 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3010658304, end = 3010977792, flags = 1048695, pgoff = 3010658304, inode = 0 }
+vm_state.vm_map: 23329.205936067 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3010977792, end = 3010985984, flags = 134217937, pgoff = 57344, inode = 535836 }
+vm_state.vm_map: 23329.205941232 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3010985984, end = 3010998272, flags = 134217937, pgoff = 77824, inode = 535722 }
+vm_state.vm_map: 23329.205946568 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3011002368, end = 3011010560, flags = 134217937, pgoff = 45056, inode = 535708 }
+vm_state.vm_map: 23329.205951832 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3011010560, end = 3011014656, flags = 134217937, pgoff = 32768, inode = 535124 }
+vm_state.vm_map: 23329.205956984 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3011014656, end = 3011022848, flags = 134217937, pgoff = 20480, inode = 535118 }
+vm_state.vm_map: 23329.205961907 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3011022848, end = 3011035136, flags = 134217937, pgoff = 90112, inode = 535774 }
+vm_state.vm_map: 23329.205963949 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3011035136, end = 3011047424, flags = 1048688, pgoff = 3011035136, inode = 0 }
+vm_state.vm_map: 23329.205966232 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3011047424, end = 3011366912, flags = 1048695, pgoff = 3011047424, inode = 0 }
+vm_state.vm_map: 23329.205968361 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3011366912, end = 3011379200, flags = 1048688, pgoff = 3011366912, inode = 0 }
+vm_state.vm_map: 23329.205970459 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3011379200, end = 3011698688, flags = 1048695, pgoff = 3011379200, inode = 0 }
+vm_state.vm_map: 23329.205972526 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3011698688, end = 3011710976, flags = 1048688, pgoff = 3011698688, inode = 0 }
+vm_state.vm_map: 23329.205974525 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3011710976, end = 3012030464, flags = 1048695, pgoff = 3011710976, inode = 0 }
+vm_state.vm_map: 23329.205979770 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3012030464, end = 3012059136, flags = 134217845, pgoff = 0, inode = 198542 }
+vm_state.vm_map: 23329.205981843 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3012059136, end = 3012063232, flags = 135266419, pgoff = 24576, inode = 198542 }
+vm_state.vm_map: 23329.205984194 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3012063232, end = 3012141056, flags = 134217845, pgoff = 0, inode = 198541 }
+vm_state.vm_map: 23329.205986242 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3012141056, end = 3012145152, flags = 135266419, pgoff = 77824, inode = 198541 }
+vm_state.vm_map: 23329.205988636 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3012145152, end = 3012214784, flags = 134217937, pgoff = 1064960, inode = 535890 }
+vm_state.vm_map: 23329.205990660 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3012214784, end = 3012218880, flags = 1048688, pgoff = 3012214784, inode = 0 }
+vm_state.vm_map: 23329.205992758 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3012218880, end = 3012743168, flags = 1048695, pgoff = 3012218880, inode = 0 }
+vm_state.vm_map: 23329.205994714 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3012743168, end = 3012755456, flags = 1048688, pgoff = 3012743168, inode = 0 }
+vm_state.vm_map: 23329.205996818 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3012755456, end = 3013074944, flags = 1048695, pgoff = 3012755456, inode = 0 }
+vm_state.vm_map: 23329.205999014 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3013074944, end = 3013087232, flags = 1048688, pgoff = 3013074944, inode = 0 }
+vm_state.vm_map: 23329.206001050 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3013087232, end = 3013603328, flags = 1048695, pgoff = 3013087232, inode = 0 }
+vm_state.vm_map: 23329.206003000 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3013603328, end = 3013615616, flags = 1048688, pgoff = 3013603328, inode = 0 }
+vm_state.vm_map: 23329.206004944 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3013615616, end = 3013935104, flags = 1048695, pgoff = 3013615616, inode = 0 }
+vm_state.vm_map: 23329.206006875 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3013935104, end = 3014144000, flags = 1048691, pgoff = 3013935104, inode = 0 }
+vm_state.vm_map: 23329.206009263 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3014144000, end = 3015806976, flags = 134217937, pgoff = 50016256, inode = 198631 }
+vm_state.vm_map: 23329.206011324 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3015806976, end = 3015819264, flags = 1048688, pgoff = 3015806976, inode = 0 }
+vm_state.vm_map: 23329.206013593 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3015819264, end = 3016138752, flags = 1048695, pgoff = 3015819264, inode = 0 }
+vm_state.vm_map: 23329.206015563 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3016138752, end = 3016151040, flags = 1048688, pgoff = 3016138752, inode = 0 }
+vm_state.vm_map: 23329.206017482 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3016151040, end = 3016470528, flags = 1048695, pgoff = 3016151040, inode = 0 }
+vm_state.vm_map: 23329.206019425 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3016470528, end = 3016474624, flags = 1048688, pgoff = 3016470528, inode = 0 }
+vm_state.vm_map: 23329.206021355 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3016474624, end = 3017158656, flags = 1048695, pgoff = 3016474624, inode = 0 }
+vm_state.vm_map: 23329.206023288 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3017158656, end = 3017576448, flags = 2097271, pgoff = 3017158656, inode = 0 }
+vm_state.vm_map: 23329.206025349 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3017576448, end = 3017732096, flags = 1048695, pgoff = 3017576448, inode = 0 }
+vm_state.vm_map: 23329.206027390 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3017732096, end = 3018305536, flags = 2097271, pgoff = 3017732096, inode = 0 }
+vm_state.vm_map: 23329.206029495 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3018305536, end = 3018321920, flags = 1048695, pgoff = 3018305536, inode = 0 }
+vm_state.vm_map: 23329.206031605 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3018321920, end = 3018362880, flags = 2097271, pgoff = 3018321920, inode = 0 }
+vm_state.vm_map: 23329.206033665 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3018362880, end = 3018522624, flags = 1048695, pgoff = 3018362880, inode = 0 }
+vm_state.vm_map: 23329.206035769 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3018522624, end = 3019091968, flags = 2097271, pgoff = 3018522624, inode = 0 }
+vm_state.vm_map: 23329.206037756 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3019091968, end = 3019202560, flags = 1048695, pgoff = 3019091968, inode = 0 }
+vm_state.vm_map: 23329.206039687 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3019202560, end = 3019616256, flags = 2097271, pgoff = 3019202560, inode = 0 }
+vm_state.vm_map: 23329.206041810 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3019616256, end = 3019890688, flags = 1048695, pgoff = 3019616256, inode = 0 }
+vm_state.vm_map: 23329.206043790 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3019890688, end = 3020185600, flags = 2097271, pgoff = 3019890688, inode = 0 }
+vm_state.vm_map: 23329.206046197 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3020185600, end = 3034636288, flags = 1048695, pgoff = 3020185600, inode = 0 }
+vm_state.vm_map: 23329.206048510 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3034636288, end = 3053740032, flags = 2097271, pgoff = 3034636288, inode = 0 }
+vm_state.vm_map: 23329.206050904 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3053740032, end = 3053801472, flags = 134217845, pgoff = 0, inode = 198537 }
+vm_state.vm_map: 23329.206052866 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3053801472, end = 3053809664, flags = 135266419, pgoff = 57344, inode = 198537 }
+vm_state.vm_map: 23329.206061252 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3053809664, end = 3053842432, flags = 134217979, pgoff = 0, inode = 1392951 }
+vm_state.vm_map: 23329.206066194 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3053842432, end = 3053985792, flags = 134217845, pgoff = 0, inode = 198535 }
+vm_state.vm_map: 23329.206068360 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3053985792, end = 3053993984, flags = 135266419, pgoff = 143360, inode = 198535 }
+vm_state.vm_map: 23329.206070785 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3053993984, end = 3054039040, flags = 134217845, pgoff = 0, inode = 198534 }
+vm_state.vm_map: 23329.206072889 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3054039040, end = 3054043136, flags = 135266419, pgoff = 45056, inode = 198534 }
+vm_state.vm_map: 23329.206077794 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3054043136, end = 3058655232, flags = 135266421, pgoff = 0, inode = 207418 }
+vm_state.vm_map: 23329.206079941 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3058655232, end = 3058786304, flags = 135266419, pgoff = 4608000, inode = 207418 }
+vm_state.vm_map: 23329.206081996 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3058786304, end = 3063111680, flags = 1048691, pgoff = 3058786304, inode = 0 }
+vm_state.vm_map: 23329.206085172 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3063111680, end = 3063504896, flags = 134217979, pgoff = 0, inode = 1867781 }
+vm_state.vm_map: 23329.206087222 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3063504896, end = 3063910400, flags = 1048691, pgoff = 3063504896, inode = 0 }
+vm_state.vm_map: 23329.206089417 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3063910400, end = 3063939072, flags = 134217845, pgoff = 0, inode = 1065218 }
+vm_state.vm_map: 23329.206091467 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3063939072, end = 3063943168, flags = 135266419, pgoff = 28672, inode = 1065218 }
+vm_state.vm_map: 23329.206093855 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3063943168, end = 3063996416, flags = 134217845, pgoff = 0, inode = 24466 }
+vm_state.vm_map: 23329.206095822 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3063996416, end = 3064000512, flags = 135266419, pgoff = 49152, inode = 24466 }
+vm_state.vm_map: 23329.206098248 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064000512, end = 3064164352, flags = 134217845, pgoff = 0, inode = 21283 }
+vm_state.vm_map: 23329.206100315 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064164352, end = 3064168448, flags = 135266419, pgoff = 159744, inode = 21283 }
+vm_state.vm_map: 23329.206102598 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064168448, end = 3064197120, flags = 134217845, pgoff = 0, inode = 23696 }
+vm_state.vm_map: 23329.206104534 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064197120, end = 3064201216, flags = 135266419, pgoff = 24576, inode = 23696 }
+vm_state.vm_map: 23329.206107053 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064201216, end = 3064262656, flags = 134217845, pgoff = 0, inode = 1065430 }
+vm_state.vm_map: 23329.206109003 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064262656, end = 3064266752, flags = 135266419, pgoff = 57344, inode = 1065430 }
+vm_state.vm_map: 23329.206111186 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064266752, end = 3064295424, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.206113123 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064295424, end = 3064299520, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.206115221 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064299520, end = 3064303616, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.206117263 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064303616, end = 3064307712, flags = 2097265, pgoff = 3064303616, inode = 0 }
+vm_state.vm_map: 23329.206119941 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064307712, end = 3064311808, flags = 134217937, pgoff = 28672, inode = 535734 }
+vm_state.vm_map: 23329.206122434 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064311808, end = 3064320000, flags = 134217937, pgoff = 53248, inode = 536055 }
+vm_state.vm_map: 23329.206124717 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064320000, end = 3064344576, flags = 134217845, pgoff = 0, inode = 198525 }
+vm_state.vm_map: 23329.206126778 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064344576, end = 3064348672, flags = 135266419, pgoff = 24576, inode = 198525 }
+vm_state.vm_map: 23329.206131584 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064348672, end = 3064360960, flags = 134217845, pgoff = 0, inode = 87515 }
+vm_state.vm_map: 23329.206133707 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064360960, end = 3064365056, flags = 135266419, pgoff = 8192, inode = 87515 }
+vm_state.vm_map: 23329.206135842 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064365056, end = 3064397824, flags = 134217841, pgoff = 0, inode = 74138 }
+vm_state.vm_map: 23329.206138094 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064397824, end = 3064438784, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.206140087 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064438784, end = 3064442880, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.206142086 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064442880, end = 3064446976, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.206144159 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064446976, end = 3064483840, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.206146109 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064483840, end = 3064487936, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.206148046 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064487936, end = 3064492032, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.206150342 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064492032, end = 3064569856, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.206152458 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064569856, end = 3064573952, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.206154858 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064573952, end = 3064578048, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.206156862 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064578048, end = 3064586240, flags = 1048691, pgoff = 3064578048, inode = 0 }
+vm_state.vm_map: 23329.206159072 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064586240, end = 3064610816, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.206161312 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064610816, end = 3064614912, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.206163373 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064614912, end = 3064619008, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.206168044 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064619008, end = 3064623104, flags = 134217937, pgoff = 8192, inode = 536067 }
+vm_state.vm_map: 23329.206170543 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064623104, end = 3064643584, flags = 134217845, pgoff = 0, inode = 23692 }
+vm_state.vm_map: 23329.206172492 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064643584, end = 3064647680, flags = 135266419, pgoff = 16384, inode = 23692 }
+vm_state.vm_map: 23329.206174831 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064647680, end = 3064664064, flags = 134217845, pgoff = 0, inode = 19625 }
+vm_state.vm_map: 23329.206176878 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064664064, end = 3064668160, flags = 135266419, pgoff = 12288, inode = 19625 }
+vm_state.vm_map: 23329.206179371 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064668160, end = 3064684544, flags = 134217845, pgoff = 0, inode = 1065432 }
+vm_state.vm_map: 23329.206181438 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064684544, end = 3064688640, flags = 135266419, pgoff = 12288, inode = 1065432 }
+vm_state.vm_map: 23329.206183943 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064688640, end = 3064709120, flags = 134217845, pgoff = 0, inode = 314599 }
+vm_state.vm_map: 23329.206186140 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064709120, end = 3064713216, flags = 135266419, pgoff = 16384, inode = 314599 }
+vm_state.vm_map: 23329.206188626 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064713216, end = 3064852480, flags = 134217841, pgoff = 0, inode = 74520 }
+vm_state.vm_map: 23329.206191465 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064852480, end = 3064954880, flags = 134217845, pgoff = 0, inode = 21552 }
+vm_state.vm_map: 23329.206193723 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064954880, end = 3064963072, flags = 135266419, pgoff = 98304, inode = 21552 }
+vm_state.vm_map: 23329.206196228 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3064963072, end = 3068862464, flags = 134217845, pgoff = 0, inode = 21427 }
+vm_state.vm_map: 23329.206198388 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3068862464, end = 3068887040, flags = 135266419, pgoff = 3895296, inode = 21427 }
+vm_state.vm_map: 23329.206200405 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3068887040, end = 3068891136, flags = 1048691, pgoff = 3068887040, inode = 0 }
+vm_state.vm_map: 23329.206202960 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3068891136, end = 3068907520, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.206205045 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3068907520, end = 3068911616, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.206207414 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3068911616, end = 3069009920, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.206209759 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3069009920, end = 3069014016, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.206212252 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3069014016, end = 3069038592, flags = 134217845, pgoff = 0, inode = 22612 }
+vm_state.vm_map: 23329.206214387 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3069038592, end = 3069042688, flags = 135266419, pgoff = 20480, inode = 22612 }
+vm_state.vm_map: 23329.206217040 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3069042688, end = 3069054976, flags = 134217845, pgoff = 0, inode = 21323 }
+vm_state.vm_map: 23329.206219206 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3069054976, end = 3069059072, flags = 135266419, pgoff = 8192, inode = 21323 }
+vm_state.vm_map: 23329.206221563 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3069059072, end = 3069202432, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 23329.206223661 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3069202432, end = 3069206528, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 23329.206226042 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3069206528, end = 3069284352, flags = 134217845, pgoff = 0, inode = 24576 }
+vm_state.vm_map: 23329.206228375 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3069284352, end = 3069288448, flags = 135266419, pgoff = 77824, inode = 24576 }
+vm_state.vm_map: 23329.206230830 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3069288448, end = 3069321216, flags = 134217845, pgoff = 0, inode = 24194 }
+vm_state.vm_map: 23329.206232922 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3069321216, end = 3069325312, flags = 135266419, pgoff = 28672, inode = 24194 }
+vm_state.vm_map: 23329.206235464 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3069325312, end = 3069792256, flags = 134217845, pgoff = 0, inode = 23967 }
+vm_state.vm_map: 23329.206237593 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3069792256, end = 3069800448, flags = 135266419, pgoff = 462848, inode = 23967 }
+vm_state.vm_map: 23329.206239690 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3069800448, end = 3069804544, flags = 1048691, pgoff = 3069800448, inode = 0 }
+vm_state.vm_map: 23329.206242220 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3069804544, end = 3070160896, flags = 134217845, pgoff = 0, inode = 1065307 }
+vm_state.vm_map: 23329.206244337 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3070160896, end = 3070169088, flags = 135266419, pgoff = 356352, inode = 1065307 }
+vm_state.vm_map: 23329.206246717 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3070169088, end = 3070177280, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.206248736 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3070177280, end = 3070181376, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.206251160 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3070181376, end = 3070328832, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.206253110 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3070328832, end = 3070337024, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.206255312 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3070337024, end = 3070435328, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 23329.206257416 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3070435328, end = 3070439424, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 23329.206259601 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3070439424, end = 3070443520, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 23329.206261766 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3070443520, end = 3070513152, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 23329.206264210 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3070513152, end = 3070517248, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 23329.206266271 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3070517248, end = 3070521344, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 23329.206268412 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3070521344, end = 3070529536, flags = 1048691, pgoff = 3070521344, inode = 0 }
+vm_state.vm_map: 23329.206270744 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3070529536, end = 3070607360, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.206272792 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3070607360, end = 3070611456, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.206275131 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3070611456, end = 3071082496, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 23329.206277223 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3071082496, end = 3071098880, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 23329.206279765 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3071098880, end = 3071246336, flags = 134217845, pgoff = 0, inode = 22796 }
+vm_state.vm_map: 23329.206281782 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3071246336, end = 3071250432, flags = 135266419, pgoff = 147456, inode = 22796 }
+vm_state.vm_map: 23329.206284244 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3071250432, end = 3071348736, flags = 134217845, pgoff = 0, inode = 22669 }
+vm_state.vm_map: 23329.206286299 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3071348736, end = 3071352832, flags = 135266419, pgoff = 94208, inode = 22669 }
+vm_state.vm_map: 23329.206288452 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3071352832, end = 3071500288, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.206290637 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3071500288, end = 3071504384, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.206292741 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3071504384, end = 3071508480, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.206295289 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3071508480, end = 3072659456, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.206297331 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3072659456, end = 3072675840, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.206300058 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3072675840, end = 3073155072, flags = 134217845, pgoff = 0, inode = 21325 }
+vm_state.vm_map: 23329.206302150 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3073155072, end = 3073163264, flags = 135266419, pgoff = 479232, inode = 21325 }
+vm_state.vm_map: 23329.206304575 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3073163264, end = 3073179648, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 23329.206306753 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3073179648, end = 3073183744, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 23329.206309203 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3073183744, end = 3073191936, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 23329.206311430 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3073191936, end = 3073196032, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 23329.206313812 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3073196032, end = 3073204224, flags = 134217845, pgoff = 0, inode = 17721 }
+vm_state.vm_map: 23329.206316045 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3073204224, end = 3073208320, flags = 135266419, pgoff = 4096, inode = 17721 }
+vm_state.vm_map: 23329.206318463 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3073208320, end = 3073241088, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 23329.206320611 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3073241088, end = 3073245184, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 23329.206323072 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3073245184, end = 3073269760, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 23329.206325066 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3073269760, end = 3073273856, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 23329.206327595 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3073273856, end = 3073306624, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 23329.206329723 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3073306624, end = 3073310720, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 23329.206332236 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3073310720, end = 3073318912, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 23329.206334222 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3073318912, end = 3073323008, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 23329.206337183 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3073323008, end = 3073355776, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 23329.206339293 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3073355776, end = 3073359872, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 23329.206341724 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3073359872, end = 3073413120, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 23329.206343779 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3073413120, end = 3073417216, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 23329.206346395 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3073417216, end = 3073601536, flags = 134217845, pgoff = 0, inode = 22064 }
+vm_state.vm_map: 23329.206348481 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3073601536, end = 3073609728, flags = 135266419, pgoff = 180224, inode = 22064 }
+vm_state.vm_map: 23329.206350566 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3073609728, end = 3073622016, flags = 134217845, pgoff = 0, inode = 19626 }
+vm_state.vm_map: 23329.206352701 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3073622016, end = 3073626112, flags = 135266419, pgoff = 8192, inode = 19626 }
+vm_state.vm_map: 23329.206354910 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3073626112, end = 3074224128, flags = 134217845, pgoff = 0, inode = 19628 }
+vm_state.vm_map: 23329.206356860 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3074224128, end = 3074232320, flags = 135266419, pgoff = 598016, inode = 19628 }
+vm_state.vm_map: 23329.206359180 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3074232320, end = 3074502656, flags = 134217845, pgoff = 0, inode = 22793 }
+vm_state.vm_map: 23329.206361370 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3074502656, end = 3074510848, flags = 135266419, pgoff = 266240, inode = 22793 }
+vm_state.vm_map: 23329.206363752 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3074510848, end = 3075108864, flags = 134217845, pgoff = 0, inode = 22668 }
+vm_state.vm_map: 23329.206365862 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3075108864, end = 3075121152, flags = 135266419, pgoff = 593920, inode = 22668 }
+vm_state.vm_map: 23329.206368096 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3075121152, end = 3075313664, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.206370335 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3075313664, end = 3075317760, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.206372945 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3075317760, end = 3076055040, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.206375117 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3076055040, end = 3076059136, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.206377265 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3076059136, end = 3076300800, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.206379356 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3076300800, end = 3076304896, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.206381713 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3076304896, end = 3076313088, flags = 134217937, pgoff = 40960, inode = 535980 }
+vm_state.vm_map: 23329.206383817 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3076313088, end = 3076317184, flags = 1048691, pgoff = 3076313088, inode = 0 }
+vm_state.vm_map: 23329.206385957 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3076317184, end = 3076321280, flags = 113, pgoff = 3076317184, inode = 0 }
+vm_state.vm_map: 23329.206388129 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3076321280, end = 3076349952, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.206390529 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3076349952, end = 3076399104, flags = 134217841, pgoff = 0, inode = 74519 }
+vm_state.vm_map: 23329.206392684 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3076399104, end = 3077730304, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.206394788 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3077730304, end = 3077734400, flags = 1048691, pgoff = 3077730304, inode = 0 }
+vm_state.vm_map: 23329.206396983 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3077734400, end = 3079049216, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.206399019 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3079049216, end = 3079057408, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.206401155 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3079057408, end = 3079061504, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.206403172 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3079061504, end = 3079077888, flags = 1048691, pgoff = 3079061504, inode = 0 }
+vm_state.vm_map: 23329.206405406 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3079077888, end = 3079086080, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.206407793 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3079086080, end = 3079090176, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.206409811 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3079090176, end = 3079094272, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.206412076 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3079094272, end = 3079180288, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.206414081 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3079180288, end = 3079184384, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.206416179 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3079184384, end = 3079188480, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.206418227 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3079188480, end = 3079196672, flags = 1048691, pgoff = 3079188480, inode = 0 }
+vm_state.vm_map: 23329.206420615 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3079196672, end = 3079237632, flags = 134217845, pgoff = 0, inode = 22795 }
+vm_state.vm_map: 23329.206422738 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3079237632, end = 3079241728, flags = 135266419, pgoff = 36864, inode = 22795 }
+vm_state.vm_map: 23329.206427501 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3079241728, end = 3079286784, flags = 134217845, pgoff = 0, inode = 535829 }
+vm_state.vm_map: 23329.206429562 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3079286784, end = 3079290880, flags = 135266419, pgoff = 40960, inode = 535829 }
+vm_state.vm_map: 23329.206431604 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3079290880, end = 3079299072, flags = 1048691, pgoff = 3079290880, inode = 0 }
+vm_state.vm_map: 23329.206433659 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3079299072, end = 3079303168, flags = 67371125, pgoff = 3079299072, inode = 0 }
+vm_state.vm_map: 23329.206435843 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3079303168, end = 3079417856, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.206437953 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3079417856, end = 3079421952, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.206439977 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3079421952, end = 3079426048, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.206442451 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3214716928, end = 3214729216, flags = 1048688, pgoff = 3214716928, inode = 0 }
+vm_state.vm_map: 23329.206444450 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3214729216, end = 3215044608, flags = 1048951, pgoff = 3220905984, inode = 0 }
+vm_state.vm_map: 23329.206446536 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4081, start = 3215044608, end = 3215048704, flags = 1048947, pgoff = 3221221376, inode = 0 }
+vm_state.vm_map: 23329.206452589 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 134512640, end = 134565888, flags = 134223989, pgoff = 0, inode = 239235 }
+vm_state.vm_map: 23329.206454779 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 134565888, end = 134569984, flags = 135272563, pgoff = 49152, inode = 239235 }
+vm_state.vm_map: 23329.206456976 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 154087424, end = 155582464, flags = 1048691, pgoff = 154087424, inode = 0 }
+vm_state.vm_map: 23329.206459332 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3073544192, end = 3073576960, flags = 134217841, pgoff = 0, inode = 74138 }
+vm_state.vm_map: 23329.206464453 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3073581056, end = 3073630208, flags = 134217845, pgoff = 0, inode = 418337 }
+vm_state.vm_map: 23329.206466638 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3073630208, end = 3073634304, flags = 135266419, pgoff = 49152, inode = 418337 }
+vm_state.vm_map: 23329.206468902 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3073634304, end = 3073675264, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.206471112 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3073675264, end = 3073679360, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.206473178 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3073679360, end = 3073683456, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.206475610 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3073683456, end = 3073720320, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.206477632 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3073720320, end = 3073724416, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.206480298 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3073724416, end = 3073728512, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.206482470 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3073728512, end = 3073806336, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.206484599 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3073806336, end = 3073810432, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.206486807 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3073810432, end = 3073814528, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.206488986 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3073814528, end = 3073822720, flags = 1048691, pgoff = 3073814528, inode = 0 }
+vm_state.vm_map: 23329.206491108 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3073822720, end = 3073847296, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.206493194 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3073847296, end = 3073851392, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.206495285 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3073851392, end = 3073855488, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.206497611 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3073855488, end = 3075186688, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.206499629 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3075186688, end = 3075194880, flags = 1048691, pgoff = 3075186688, inode = 0 }
+vm_state.vm_map: 23329.206501980 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3075194880, end = 3075203072, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.206504139 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3075203072, end = 3075207168, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.206506293 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3075207168, end = 3075211264, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.206508409 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3075211264, end = 3075403776, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.206510513 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3075403776, end = 3075407872, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.206512734 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3075407872, end = 3075436544, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.206515320 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3075436544, end = 3075440640, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.206517344 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3075440640, end = 3075444736, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.206519713 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3075444736, end = 3075461120, flags = 134217845, pgoff = 0, inode = 19625 }
+vm_state.vm_map: 23329.206521731 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3075461120, end = 3075465216, flags = 135266419, pgoff = 12288, inode = 19625 }
+vm_state.vm_map: 23329.206524044 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3075465216, end = 3075706880, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.206526099 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3075706880, end = 3075710976, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.206528215 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3075710976, end = 3075723264, flags = 134217845, pgoff = 0, inode = 19626 }
+vm_state.vm_map: 23329.206530406 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3075723264, end = 3075727360, flags = 135266419, pgoff = 8192, inode = 19626 }
+vm_state.vm_map: 23329.206532405 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3075727360, end = 3075731456, flags = 1048691, pgoff = 3075727360, inode = 0 }
+vm_state.vm_map: 23329.206534601 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3075731456, end = 3077046272, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.206536667 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3077046272, end = 3077054464, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.206538674 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3077054464, end = 3077058560, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.206540758 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3077058560, end = 3077070848, flags = 1048691, pgoff = 3077058560, inode = 0 }
+vm_state.vm_map: 23329.206542907 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3077070848, end = 3077267456, flags = 134217845, pgoff = 0, inode = 1065401 }
+vm_state.vm_map: 23329.206545134 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3077267456, end = 3077279744, flags = 135266419, pgoff = 192512, inode = 1065401 }
+vm_state.vm_map: 23329.206547300 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3077279744, end = 3078017024, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.206549773 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3078017024, end = 3078021120, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.206551988 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3078021120, end = 3078107136, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.206554129 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3078107136, end = 3078111232, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.206556245 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3078111232, end = 3078115328, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.206558300 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3078115328, end = 3078123520, flags = 1048691, pgoff = 3078115328, inode = 0 }
+vm_state.vm_map: 23329.206560595 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3078123520, end = 3078348800, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.206562792 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3078348800, end = 3078352896, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.206564853 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3078352896, end = 3078356992, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.206567006 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3078356992, end = 3078361088, flags = 1048691, pgoff = 3078356992, inode = 0 }
+vm_state.vm_map: 23329.206569252 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3078361088, end = 3078475776, flags = 134217845, pgoff = 0, inode = 17291 }
+vm_state.vm_map: 23329.206571375 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3078475776, end = 3078479872, flags = 135266419, pgoff = 114688, inode = 17291 }
+vm_state.vm_map: 23329.206573553 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3078479872, end = 3078787072, flags = 134217845, pgoff = 0, inode = 1065420 }
+vm_state.vm_map: 23329.206575675 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3078787072, end = 3078828032, flags = 135266419, pgoff = 303104, inode = 1065420 }
+vm_state.vm_map: 23329.206578014 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3078832128, end = 3078860800, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.206583073 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3078860800, end = 3078922240, flags = 134217841, pgoff = 0, inode = 76320 }
+vm_state.vm_map: 23329.206585609 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3078922240, end = 3078930432, flags = 1048691, pgoff = 3078922240, inode = 0 }
+vm_state.vm_map: 23329.206587744 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3078930432, end = 3078934528, flags = 67371125, pgoff = 3078930432, inode = 0 }
+vm_state.vm_map: 23329.206590015 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3078934528, end = 3079049216, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.206592082 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3079049216, end = 3079053312, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.206594112 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3079053312, end = 3079057408, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.206596209 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 4182, start = 3214024704, end = 3214110720, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.206601652 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5051, start = 134512640, end = 135303168, flags = 134223989, pgoff = 0, inode = 1048715 }
+vm_state.vm_map: 23329.206621148 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5051, start = 135303168, end = 135323648, flags = 135272563, pgoff = 790528, inode = 1048715 }
+vm_state.vm_map: 23329.206623457 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5051, start = 135323648, end = 135344128, flags = 1048691, pgoff = 135323648, inode = 0 }
+vm_state.vm_map: 23329.206625684 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5051, start = 165335040, end = 165404672, flags = 1048691, pgoff = 165335040, inode = 0 }
+vm_state.vm_map: 23329.206628028 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5051, start = 3076132864, end = 3077464064, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.206630280 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5051, start = 3077464064, end = 3077468160, flags = 1048691, pgoff = 3077464064, inode = 0 }
+vm_state.vm_map: 23329.206632619 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5051, start = 3077468160, end = 3078782976, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.206634846 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5051, start = 3078782976, end = 3078791168, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.206636925 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5051, start = 3078791168, end = 3078795264, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.206639461 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5051, start = 3078795264, end = 3078811648, flags = 1048691, pgoff = 3078795264, inode = 0 }
+vm_state.vm_map: 23329.206641726 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5051, start = 3078811648, end = 3078819840, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.206643830 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5051, start = 3078819840, end = 3078823936, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.206646069 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5051, start = 3078823936, end = 3078828032, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.206648241 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5051, start = 3078828032, end = 3079045120, flags = 134217845, pgoff = 0, inode = 499784 }
+vm_state.vm_map: 23329.206650271 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5051, start = 3079045120, end = 3079057408, flags = 135266419, pgoff = 217088, inode = 499784 }
+vm_state.vm_map: 23329.206652505 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5051, start = 3079122944, end = 3079151616, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.206654566 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5051, start = 3079151616, end = 3079159808, flags = 1048691, pgoff = 3079151616, inode = 0 }
+vm_state.vm_map: 23329.206656664 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5051, start = 3079159808, end = 3079163904, flags = 67371125, pgoff = 3079159808, inode = 0 }
+vm_state.vm_map: 23329.206658947 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5051, start = 3079163904, end = 3079278592, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.206658949 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5051, start = 3079278592, end = 3079282688, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.206658951 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5051, start = 3079282688, end = 3079286784, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.206658953 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5051, start = 3219410944, end = 3219496960, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.206658955 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5063, start = 134512640, end = 135303168, flags = 134223989, pgoff = 0, inode = 1048715 }
+vm_state.vm_map: 23329.206658957 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5063, start = 135303168, end = 135323648, flags = 135272563, pgoff = 790528, inode = 1048715 }
+vm_state.vm_map: 23329.206658959 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5063, start = 135323648, end = 135344128, flags = 1048691, pgoff = 135323648, inode = 0 }
+vm_state.vm_map: 23329.206658962 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5063, start = 148074496, end = 148185088, flags = 1048691, pgoff = 148074496, inode = 0 }
+vm_state.vm_map: 23329.206658964 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5063, start = 3075608576, end = 3076939776, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.206658966 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5063, start = 3076939776, end = 3076943872, flags = 1048691, pgoff = 3076939776, inode = 0 }
+vm_state.vm_map: 23329.206658968 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5063, start = 3076943872, end = 3078258688, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.206658970 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5063, start = 3078258688, end = 3078266880, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.206658972 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5063, start = 3078266880, end = 3078270976, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.206658974 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5063, start = 3078270976, end = 3078287360, flags = 1048691, pgoff = 3078270976, inode = 0 }
+vm_state.vm_map: 23329.206658976 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5063, start = 3078287360, end = 3078295552, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.206658978 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5063, start = 3078295552, end = 3078299648, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.206658980 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5063, start = 3078299648, end = 3078303744, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.206658982 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5063, start = 3078303744, end = 3078520832, flags = 134217845, pgoff = 0, inode = 499784 }
+vm_state.vm_map: 23329.206658984 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5063, start = 3078520832, end = 3078533120, flags = 135266419, pgoff = 217088, inode = 499784 }
+vm_state.vm_map: 23329.206658986 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5063, start = 3078598656, end = 3078627328, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.206658988 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5063, start = 3078627328, end = 3078635520, flags = 1048691, pgoff = 3078627328, inode = 0 }
+vm_state.vm_map: 23329.206658990 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5063, start = 3078635520, end = 3078639616, flags = 67371125, pgoff = 3078635520, inode = 0 }
+vm_state.vm_map: 23329.206658992 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5063, start = 3078639616, end = 3078754304, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.206658995 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5063, start = 3078754304, end = 3078758400, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.206658997 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5063, start = 3078758400, end = 3078762496, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.206658999 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5063, start = 3212931072, end = 3213017088, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.206659001 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 134512640, end = 134516736, flags = 134223989, pgoff = 0, inode = 1352341 }
+vm_state.vm_map: 23329.206659003 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 134516736, end = 134520832, flags = 135272563, pgoff = 0, inode = 1352341 }
+vm_state.vm_map: 23329.206674495 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 141873152, end = 193757184, flags = 1048691, pgoff = 141873152, inode = 0 }
+vm_state.vm_map: 23329.206679985 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3040997376, end = 3041067008, flags = 134217841, pgoff = 0, inode = 649694 }
+vm_state.vm_map: 23329.206681978 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3041067008, end = 3041988608, flags = 1048691, pgoff = 3041067008, inode = 0 }
+vm_state.vm_map: 23329.206687497 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3041988608, end = 3058327552, flags = 134217841, pgoff = 0, inode = 532630 }
+vm_state.vm_map: 23329.206692088 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3058327552, end = 3058413568, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 23329.206694648 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3058413568, end = 3058417664, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 23329.206696714 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3058417664, end = 3058425856, flags = 1048691, pgoff = 3058417664, inode = 0 }
+vm_state.vm_map: 23329.206698983 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3058425856, end = 3058454528, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 23329.206701142 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3058454528, end = 3058458624, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 23329.206706250 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3058544640, end = 3058548736, flags = 134217845, pgoff = 0, inode = 378352 }
+vm_state.vm_map: 23329.206708428 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3058548736, end = 3058552832, flags = 135266419, pgoff = 4096, inode = 378352 }
+vm_state.vm_map: 23329.206711179 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3058552832, end = 3058626560, flags = 134217841, pgoff = 0, inode = 98526 }
+vm_state.vm_map: 23329.206713658 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3058626560, end = 3058708480, flags = 134217841, pgoff = 0, inode = 98443 }
+vm_state.vm_map: 23329.206721789 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3058708480, end = 3060080640, flags = 135266421, pgoff = 0, inode = 542490 }
+vm_state.vm_map: 23329.206723948 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060080640, end = 3060146176, flags = 135266419, pgoff = 1368064, inode = 542490 }
+vm_state.vm_map: 23329.206726008 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060146176, end = 3060158464, flags = 1048691, pgoff = 3060146176, inode = 0 }
+vm_state.vm_map: 23329.206731134 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060158464, end = 3060166656, flags = 134217845, pgoff = 0, inode = 378371 }
+vm_state.vm_map: 23329.206733521 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060166656, end = 3060170752, flags = 135266419, pgoff = 4096, inode = 378371 }
+vm_state.vm_map: 23329.206736020 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060170752, end = 3060240384, flags = 134217841, pgoff = 0, inode = 98449 }
+vm_state.vm_map: 23329.206740591 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060240384, end = 3060293632, flags = 134217841, pgoff = 0, inode = 649748 }
+vm_state.vm_map: 23329.206742885 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060293632, end = 3060297728, flags = 134217937, pgoff = 0, inode = 1196150 }
+vm_state.vm_map: 23329.206745334 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060297728, end = 3060322304, flags = 134217937, pgoff = 0, inode = 1196354 }
+vm_state.vm_map: 23329.206747455 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060322304, end = 3060326400, flags = 134217937, pgoff = 0, inode = 1196334 }
+vm_state.vm_map: 23329.206749726 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060326400, end = 3060330496, flags = 134217937, pgoff = 0, inode = 1196333 }
+vm_state.vm_map: 23329.206752064 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060330496, end = 3060334592, flags = 134217937, pgoff = 0, inode = 1196331 }
+vm_state.vm_map: 23329.206754168 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060334592, end = 3060338688, flags = 134217937, pgoff = 0, inode = 1196330 }
+vm_state.vm_map: 23329.206756363 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060338688, end = 3060346880, flags = 134217937, pgoff = 0, inode = 1196329 }
+vm_state.vm_map: 23329.206758677 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060346880, end = 3060379648, flags = 134217937, pgoff = 0, inode = 1196328 }
+vm_state.vm_map: 23329.206760799 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060379648, end = 3060391936, flags = 134217937, pgoff = 0, inode = 1196327 }
+vm_state.vm_map: 23329.206762927 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060391936, end = 3060400128, flags = 134217937, pgoff = 0, inode = 1196320 }
+vm_state.vm_map: 23329.206765159 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060400128, end = 3060404224, flags = 134217937, pgoff = 0, inode = 1196318 }
+vm_state.vm_map: 23329.206767337 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060404224, end = 3060408320, flags = 134217937, pgoff = 0, inode = 1196278 }
+vm_state.vm_map: 23329.206769897 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060408320, end = 3060412416, flags = 134217937, pgoff = 0, inode = 1196251 }
+vm_state.vm_map: 23329.206772037 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060412416, end = 3060441088, flags = 134217937, pgoff = 0, inode = 1196236 }
+vm_state.vm_map: 23329.206774245 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060441088, end = 3060453376, flags = 134217937, pgoff = 0, inode = 1196234 }
+vm_state.vm_map: 23329.206776361 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060453376, end = 3060457472, flags = 134217937, pgoff = 0, inode = 1196201 }
+vm_state.vm_map: 23329.206778600 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060457472, end = 3060465664, flags = 134217937, pgoff = 0, inode = 1196170 }
+vm_state.vm_map: 23329.206780858 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060465664, end = 3060469760, flags = 134217937, pgoff = 0, inode = 1196157 }
+vm_state.vm_map: 23329.206783060 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060469760, end = 3060473856, flags = 134217937, pgoff = 0, inode = 1196171 }
+vm_state.vm_map: 23329.206785337 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060473856, end = 3060486144, flags = 134217937, pgoff = 0, inode = 1196172 }
+vm_state.vm_map: 23329.206787712 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060486144, end = 3060494336, flags = 134217937, pgoff = 0, inode = 1196173 }
+vm_state.vm_map: 23329.206789938 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060494336, end = 3060527104, flags = 134217937, pgoff = 0, inode = 1196352 }
+vm_state.vm_map: 23329.206791993 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060527104, end = 3060547584, flags = 134217937, pgoff = 0, inode = 1196196 }
+vm_state.vm_map: 23329.206794219 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060547584, end = 3060555776, flags = 134217937, pgoff = 0, inode = 1196343 }
+vm_state.vm_map: 23329.206796539 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060555776, end = 3060584448, flags = 134217937, pgoff = 0, inode = 1196314 }
+vm_state.vm_map: 23329.206798673 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060584448, end = 3060629504, flags = 134217937, pgoff = 0, inode = 1196147 }
+vm_state.vm_map: 23329.206803392 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060629504, end = 3060686848, flags = 134217937, pgoff = 0, inode = 1196094 }
+vm_state.vm_map: 23329.206805921 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060686848, end = 3060699136, flags = 134217937, pgoff = 0, inode = 1196342 }
+vm_state.vm_map: 23329.206811140 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060699136, end = 3060756480, flags = 134217937, pgoff = 0, inode = 1196355 }
+vm_state.vm_map: 23329.206813428 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3060756480, end = 3061694464, flags = 134217845, pgoff = 0, inode = 16400 }
+vm_state.vm_map: 23329.206815563 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3061694464, end = 3061710848, flags = 135266417, pgoff = 937984, inode = 16400 }
+vm_state.vm_map: 23329.206817716 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3061710848, end = 3061714944, flags = 135266419, pgoff = 954368, inode = 16400 }
+vm_state.vm_map: 23329.206819745 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3061714944, end = 3061743616, flags = 1048691, pgoff = 3061714944, inode = 0 }
+vm_state.vm_map: 23329.206821861 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3061743616, end = 3061981184, flags = 1048691, pgoff = 3061981184, inode = 0 }
+vm_state.vm_map: 23329.206823958 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3062026240, end = 3062140928, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.206826153 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3062140928, end = 3062145024, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.206828430 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3062145024, end = 3062272000, flags = 134217845, pgoff = 0, inode = 18923 }
+vm_state.vm_map: 23329.206830528 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3062272000, end = 3062276096, flags = 135266419, pgoff = 122880, inode = 18923 }
+vm_state.vm_map: 23329.206832816 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3062276096, end = 3062419456, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 23329.206834857 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3062419456, end = 3062423552, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 23329.206840268 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3062423552, end = 3062648832, flags = 134217845, pgoff = 0, inode = 378345 }
+vm_state.vm_map: 23329.206842661 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3062648832, end = 3062652928, flags = 135266419, pgoff = 221184, inode = 378345 }
+vm_state.vm_map: 23329.206844955 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3062652928, end = 3062693888, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.206847004 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3062693888, end = 3062697984, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.206848989 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3062697984, end = 3062702080, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.206851082 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3062702080, end = 3062738944, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.206853190 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3062738944, end = 3062743040, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.206855374 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3062743040, end = 3062747136, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.206857521 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3062747136, end = 3062824960, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.206859457 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3062824960, end = 3062829056, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.206861388 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3062829056, end = 3062833152, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.206863479 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3062833152, end = 3062841344, flags = 1048691, pgoff = 3062833152, inode = 0 }
+vm_state.vm_map: 23329.206865540 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3062841344, end = 3062865920, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.206867464 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3062865920, end = 3062870016, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.206869549 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3062870016, end = 3062874112, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.206871622 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3062874112, end = 3062878208, flags = 1048688, pgoff = 3062874112, inode = 0 }
+vm_state.vm_map: 23329.206873688 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3062878208, end = 3071266816, flags = 1048691, pgoff = 3062878208, inode = 0 }
+vm_state.vm_map: 23329.206876181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3071266816, end = 3072598016, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.206878346 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3072598016, end = 3072606208, flags = 1048691, pgoff = 3072598016, inode = 0 }
+vm_state.vm_map: 23329.206880554 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3072606208, end = 3072622592, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.206882923 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3072622592, end = 3072626688, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.206885224 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3072626688, end = 3072774144, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.206887407 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3072774144, end = 3072782336, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.206889776 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3072782336, end = 3072790528, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.206891756 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3072790528, end = 3072794624, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.206894008 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3072794624, end = 3072892928, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.206896117 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3072892928, end = 3072897024, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.206898357 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3072897024, end = 3074211840, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.206900473 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3074211840, end = 3074220032, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.206902680 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3074220032, end = 3074224128, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.206904834 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3074224128, end = 3074240512, flags = 1048691, pgoff = 3074224128, inode = 0 }
+vm_state.vm_map: 23329.206907209 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3074240512, end = 3074387968, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.206909343 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3074387968, end = 3074392064, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.206911920 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3074392064, end = 3074396160, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.206914030 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3074396160, end = 3074404352, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.206916152 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3074404352, end = 3074408448, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.206918374 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3074408448, end = 3074412544, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.206920668 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3074412544, end = 3074445312, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 23329.206922697 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3074445312, end = 3074449408, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 23329.206924936 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3074449408, end = 3074633728, flags = 134217845, pgoff = 0, inode = 22064 }
+vm_state.vm_map: 23329.206927101 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3074633728, end = 3074641920, flags = 135266419, pgoff = 180224, inode = 22064 }
+vm_state.vm_map: 23329.206929279 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3074641920, end = 3074719744, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.206931382 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3074719744, end = 3074723840, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.206933406 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3074723840, end = 3074727936, flags = 1048691, pgoff = 3074723840, inode = 0 }
+vm_state.vm_map: 23329.206935663 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3074727936, end = 3075198976, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 23329.206937606 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3075198976, end = 3075215360, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 23329.206942955 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3075215360, end = 3075289088, flags = 134217845, pgoff = 0, inode = 17860 }
+vm_state.vm_map: 23329.206945021 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3075289088, end = 3075293184, flags = 135266419, pgoff = 69632, inode = 17860 }
+vm_state.vm_map: 23329.206947593 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3075293184, end = 3075346432, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 23329.206949666 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3075346432, end = 3075350528, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 23329.206951751 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3075350528, end = 3075358720, flags = 134217845, pgoff = 0, inode = 23893 }
+vm_state.vm_map: 23329.206953707 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3075358720, end = 3075362816, flags = 135266419, pgoff = 4096, inode = 23893 }
+vm_state.vm_map: 23329.206955940 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3075362816, end = 3076513792, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.206958012 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3076513792, end = 3076530176, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.206960190 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3076530176, end = 3076616192, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.206962238 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3076616192, end = 3076620288, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.206964335 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3076620288, end = 3076624384, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.206966395 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3076624384, end = 3076636672, flags = 1048691, pgoff = 3076624384, inode = 0 }
+vm_state.vm_map: 23329.206973822 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3076636672, end = 3077648384, flags = 134217845, pgoff = 0, inode = 1064975 }
+vm_state.vm_map: 23329.206975889 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3077648384, end = 3077689344, flags = 135266419, pgoff = 1011712, inode = 1064975 }
+vm_state.vm_map: 23329.206981230 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3077689344, end = 3078758400, flags = 134217845, pgoff = 0, inode = 1064979 }
+vm_state.vm_map: 23329.206983637 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3078758400, end = 3078828032, flags = 135266419, pgoff = 1069056, inode = 1064979 }
+vm_state.vm_map: 23329.206986042 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3078832128, end = 3078844416, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 23329.206988103 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3078844416, end = 3078848512, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 23329.206996059 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3078848512, end = 3078860800, flags = 134217845, pgoff = 0, inode = 378355 }
+vm_state.vm_map: 23329.206998126 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3078860800, end = 3078864896, flags = 135266419, pgoff = 8192, inode = 378355 }
+vm_state.vm_map: 23329.207000297 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3078864896, end = 3078881280, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 23329.207002252 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3078881280, end = 3078885376, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 23329.207004566 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3078885376, end = 3078918144, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 23329.207006595 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3078918144, end = 3078922240, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 23329.207008705 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3078922240, end = 3078930432, flags = 1048691, pgoff = 3078922240, inode = 0 }
+vm_state.vm_map: 23329.207010728 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3078930432, end = 3078934528, flags = 67371125, pgoff = 3078930432, inode = 0 }
+vm_state.vm_map: 23329.207012998 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3078934528, end = 3079049216, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.207015132 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3079049216, end = 3079053312, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.207017353 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3079053312, end = 3079057408, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.207019814 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5064, start = 3214143488, end = 3214393344, flags = 1048947, pgoff = 3220975616, inode = 0 }
+vm_state.vm_map: 23329.207025564 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 134512640, end = 134586368, flags = 134223989, pgoff = 0, inode = 231137 }
+vm_state.vm_map: 23329.207027630 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 134586368, end = 134594560, flags = 135272563, pgoff = 69632, inode = 231137 }
+vm_state.vm_map: 23329.207029801 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 137633792, end = 181157888, flags = 1048691, pgoff = 137633792, inode = 0 }
+vm_state.vm_map: 23329.207031806 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2813673472, end = 2813677568, flags = 1048688, pgoff = 2813673472, inode = 0 }
+vm_state.vm_map: 23329.207033860 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2813677568, end = 2822066176, flags = 1048691, pgoff = 2813677568, inode = 0 }
+vm_state.vm_map: 23329.207035982 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2822066176, end = 2828636160, flags = 134217841, pgoff = 0, inode = 545462 }
+vm_state.vm_map: 23329.207038098 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2828636160, end = 2835206144, flags = 134217841, pgoff = 0, inode = 545462 }
+vm_state.vm_map: 23329.207040183 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2835206144, end = 2848534528, flags = 134217841, pgoff = 0, inode = 49306 }
+vm_state.vm_map: 23329.207042261 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2848534528, end = 2861862912, flags = 134217841, pgoff = 0, inode = 49306 }
+vm_state.vm_map: 23329.207044680 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2869932032, end = 2870255616, flags = 134217841, pgoff = 0, inode = 49558 }
+vm_state.vm_map: 23329.207046770 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2870255616, end = 2870259712, flags = 1048688, pgoff = 2870255616, inode = 0 }
+vm_state.vm_map: 23329.207048732 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2870259712, end = 2878648320, flags = 1048691, pgoff = 2870259712, inode = 0 }
+vm_state.vm_map: 23329.207050812 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2878648320, end = 2878652416, flags = 1048688, pgoff = 2878648320, inode = 0 }
+vm_state.vm_map: 23329.207052884 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2878652416, end = 2887041024, flags = 1048691, pgoff = 2878652416, inode = 0 }
+vm_state.vm_map: 23329.207055190 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2887041024, end = 2887045120, flags = 1048688, pgoff = 2887041024, inode = 0 }
+vm_state.vm_map: 23329.207057269 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2887045120, end = 2895433728, flags = 1048691, pgoff = 2887045120, inode = 0 }
+vm_state.vm_map: 23329.207059218 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2895433728, end = 2895437824, flags = 1048688, pgoff = 2895433728, inode = 0 }
+vm_state.vm_map: 23329.207061495 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2895437824, end = 2904354816, flags = 1048691, pgoff = 2895437824, inode = 0 }
+vm_state.vm_map: 23329.207069224 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2904354816, end = 2904461312, flags = 134217845, pgoff = 0, inode = 264532 }
+vm_state.vm_map: 23329.207071284 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2904461312, end = 2904465408, flags = 135266419, pgoff = 106496, inode = 264532 }
+vm_state.vm_map: 23329.207073795 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2904526848, end = 2905149440, flags = 134217841, pgoff = 0, inode = 49164 }
+vm_state.vm_map: 23329.207075898 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2905149440, end = 2905153536, flags = 1048691, pgoff = 2905149440, inode = 0 }
+vm_state.vm_map: 23329.207077940 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2905153536, end = 2905157632, flags = 1048688, pgoff = 2905153536, inode = 0 }
+vm_state.vm_map: 23329.207079889 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2905157632, end = 2913546240, flags = 1048691, pgoff = 2905157632, inode = 0 }
+vm_state.vm_map: 23329.207081826 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2913546240, end = 2913550336, flags = 1048688, pgoff = 2913546240, inode = 0 }
+vm_state.vm_map: 23329.207083769 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2913550336, end = 2921938944, flags = 1048691, pgoff = 2913550336, inode = 0 }
+vm_state.vm_map: 23329.207085713 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2921938944, end = 2921943040, flags = 1048688, pgoff = 2921938944, inode = 0 }
+vm_state.vm_map: 23329.207087822 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2921943040, end = 2930331648, flags = 1048691, pgoff = 2921943040, inode = 0 }
+vm_state.vm_map: 23329.207090216 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2930331648, end = 2930335744, flags = 1048688, pgoff = 2930331648, inode = 0 }
+vm_state.vm_map: 23329.207092165 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2930335744, end = 2938724352, flags = 1048691, pgoff = 2930335744, inode = 0 }
+vm_state.vm_map: 23329.207098457 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2938753024, end = 2939117568, flags = 134217845, pgoff = 0, inode = 264457 }
+vm_state.vm_map: 23329.207100542 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2939117568, end = 2939125760, flags = 135266419, pgoff = 364544, inode = 264457 }
+vm_state.vm_map: 23329.207102769 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2939125760, end = 2939146240, flags = 134217845, pgoff = 0, inode = 508374 }
+vm_state.vm_map: 23329.207104804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2939146240, end = 2939150336, flags = 135266417, pgoff = 16384, inode = 508374 }
+vm_state.vm_map: 23329.207106908 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2939150336, end = 2939154432, flags = 135266419, pgoff = 20480, inode = 508374 }
+vm_state.vm_map: 23329.207108869 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2939183104, end = 2939187200, flags = 1048691, pgoff = 2939183104, inode = 0 }
+vm_state.vm_map: 23329.207111072 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2939187200, end = 2939248640, flags = 134217841, pgoff = 0, inode = 76320 }
+vm_state.vm_map: 23329.207113027 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2939248640, end = 2939252736, flags = 1048688, pgoff = 2939248640, inode = 0 }
+vm_state.vm_map: 23329.207114989 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2939252736, end = 2947641344, flags = 1048691, pgoff = 2939252736, inode = 0 }
+vm_state.vm_map: 23329.207116975 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2947641344, end = 2947645440, flags = 1048688, pgoff = 2947641344, inode = 0 }
+vm_state.vm_map: 23329.207118992 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2947645440, end = 2956034048, flags = 1048691, pgoff = 2947645440, inode = 0 }
+vm_state.vm_map: 23329.207120935 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2956034048, end = 2956038144, flags = 1048688, pgoff = 2956034048, inode = 0 }
+vm_state.vm_map: 23329.207122885 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2956038144, end = 2965389312, flags = 1048691, pgoff = 2956038144, inode = 0 }
+vm_state.vm_map: 23329.207131236 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2965389312, end = 2965409792, flags = 134217845, pgoff = 0, inode = 264374 }
+vm_state.vm_map: 23329.207133358 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2965409792, end = 2965413888, flags = 135266419, pgoff = 20480, inode = 264374 }
+vm_state.vm_map: 23329.207135529 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2965413888, end = 2965479424, flags = 134217841, pgoff = 0, inode = 649744 }
+vm_state.vm_map: 23329.207143333 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2965479424, end = 2965504000, flags = 134217845, pgoff = 0, inode = 264552 }
+vm_state.vm_map: 23329.207145430 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2965504000, end = 2965508096, flags = 135266419, pgoff = 24576, inode = 264552 }
+vm_state.vm_map: 23329.207147583 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2965508096, end = 2965512192, flags = 1048688, pgoff = 2965508096, inode = 0 }
+vm_state.vm_map: 23329.207149743 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2965512192, end = 2973900800, flags = 1048691, pgoff = 2965512192, inode = 0 }
+vm_state.vm_map: 23329.207151703 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2973900800, end = 2973904896, flags = 1048688, pgoff = 2973900800, inode = 0 }
+vm_state.vm_map: 23329.207153652 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2973904896, end = 2982293504, flags = 1048691, pgoff = 2973904896, inode = 0 }
+vm_state.vm_map: 23329.207156132 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2982293504, end = 2982592512, flags = 134217845, pgoff = 0, inode = 82147 }
+vm_state.vm_map: 23329.207158100 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2982592512, end = 2982641664, flags = 135266419, pgoff = 299008, inode = 82147 }
+vm_state.vm_map: 23329.207163547 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2982641664, end = 2982887424, flags = 134217845, pgoff = 0, inode = 87480 }
+vm_state.vm_map: 23329.207165607 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2982887424, end = 2982891520, flags = 135266419, pgoff = 245760, inode = 87480 }
+vm_state.vm_map: 23329.207167581 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2982891520, end = 2982907904, flags = 1048691, pgoff = 2982891520, inode = 0 }
+vm_state.vm_map: 23329.207172713 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2982907904, end = 2983018496, flags = 134217845, pgoff = 0, inode = 87481 }
+vm_state.vm_map: 23329.207174755 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2983018496, end = 2983022592, flags = 135266419, pgoff = 110592, inode = 87481 }
+vm_state.vm_map: 23329.207176920 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2983022592, end = 2983542784, flags = 134217845, pgoff = 0, inode = 18976 }
+vm_state.vm_map: 23329.207179055 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2983542784, end = 2983550976, flags = 135266419, pgoff = 516096, inode = 18976 }
+vm_state.vm_map: 23329.207184415 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2983550976, end = 2983727104, flags = 134217845, pgoff = 0, inode = 82145 }
+vm_state.vm_map: 23329.207186476 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2983727104, end = 2983731200, flags = 135266419, pgoff = 176128, inode = 82145 }
+vm_state.vm_map: 23329.207188746 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2983731200, end = 2983804928, flags = 134217845, pgoff = 0, inode = 19902 }
+vm_state.vm_map: 23329.207190695 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2983804928, end = 2983817216, flags = 135266419, pgoff = 69632, inode = 19902 }
+vm_state.vm_map: 23329.207192879 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2983817216, end = 2984673280, flags = 134217845, pgoff = 0, inode = 19901 }
+vm_state.vm_map: 23329.207194951 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2984673280, end = 2984689664, flags = 135266419, pgoff = 856064, inode = 19901 }
+vm_state.vm_map: 23329.207197178 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2984689664, end = 2984804352, flags = 134217845, pgoff = 0, inode = 19899 }
+vm_state.vm_map: 23329.207199578 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2984804352, end = 2984812544, flags = 135266419, pgoff = 114688, inode = 19899 }
+vm_state.vm_map: 23329.207201761 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2984812544, end = 2984964096, flags = 134217845, pgoff = 0, inode = 19900 }
+vm_state.vm_map: 23329.207203754 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2984964096, end = 2984972288, flags = 135266419, pgoff = 147456, inode = 19900 }
+vm_state.vm_map: 23329.207206055 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2984972288, end = 2984988672, flags = 1048691, pgoff = 2984972288, inode = 0 }
+vm_state.vm_map: 23329.207214005 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2984988672, end = 2985062400, flags = 134217845, pgoff = 0, inode = 264489 }
+vm_state.vm_map: 23329.207216060 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2985062400, end = 2985066496, flags = 135266419, pgoff = 73728, inode = 264489 }
+vm_state.vm_map: 23329.207220821 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2985066496, end = 2985435136, flags = 134217845, pgoff = 0, inode = 264542 }
+vm_state.vm_map: 23329.207222863 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2985435136, end = 2985451520, flags = 135266419, pgoff = 368640, inode = 264542 }
+vm_state.vm_map: 23329.207228069 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2985451520, end = 2985664512, flags = 134217845, pgoff = 0, inode = 264488 }
+vm_state.vm_map: 23329.207230228 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2985664512, end = 2985676800, flags = 135266419, pgoff = 208896, inode = 264488 }
+vm_state.vm_map: 23329.207232443 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2985676800, end = 2985693184, flags = 134217845, pgoff = 0, inode = 87517 }
+vm_state.vm_map: 23329.207234472 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2985693184, end = 2985697280, flags = 135266419, pgoff = 12288, inode = 87517 }
+vm_state.vm_map: 23329.207237218 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2985697280, end = 2985721856, flags = 134217845, pgoff = 0, inode = 87514 }
+vm_state.vm_map: 23329.207239315 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2985721856, end = 2985725952, flags = 135266419, pgoff = 20480, inode = 87514 }
+vm_state.vm_map: 23329.207241418 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2985725952, end = 2985730048, flags = 1048691, pgoff = 2985725952, inode = 0 }
+vm_state.vm_map: 23329.207243935 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2985730048, end = 2986123264, flags = 134217979, pgoff = 0, inode = 1572872 }
+vm_state.vm_map: 23329.207246205 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2986123264, end = 2986184704, flags = 134217841, pgoff = 0, inode = 649743 }
+vm_state.vm_map: 23329.207253854 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2986184704, end = 2986258432, flags = 134217845, pgoff = 0, inode = 264471 }
+vm_state.vm_map: 23329.207256032 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2986258432, end = 2986266624, flags = 135266419, pgoff = 69632, inode = 264471 }
+vm_state.vm_map: 23329.207258635 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2986266624, end = 2986328064, flags = 134217845, pgoff = 0, inode = 264103 }
+vm_state.vm_map: 23329.207260664 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2986328064, end = 2986332160, flags = 135266419, pgoff = 61440, inode = 264103 }
+vm_state.vm_map: 23329.207262885 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2986332160, end = 2986336256, flags = 1048688, pgoff = 2986332160, inode = 0 }
+vm_state.vm_map: 23329.207264939 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2986336256, end = 2994724864, flags = 1048691, pgoff = 2986336256, inode = 0 }
+vm_state.vm_map: 23329.207266913 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2994724864, end = 2994728960, flags = 1048688, pgoff = 2994724864, inode = 0 }
+vm_state.vm_map: 23329.207268998 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 2994728960, end = 3003117568, flags = 1048691, pgoff = 2994728960, inode = 0 }
+vm_state.vm_map: 23329.207271095 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3003117568, end = 3003121664, flags = 1048688, pgoff = 3003117568, inode = 0 }
+vm_state.vm_map: 23329.207273390 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3003121664, end = 3011510272, flags = 1048691, pgoff = 3003121664, inode = 0 }
+vm_state.vm_map: 23329.207275420 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3011510272, end = 3011780608, flags = 2097267, pgoff = 3011510272, inode = 0 }
+vm_state.vm_map: 23329.207277406 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3011780608, end = 3012558848, flags = 2097264, pgoff = 3011780608, inode = 0 }
+vm_state.vm_map: 23329.207279491 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3012558848, end = 3012571136, flags = 1048691, pgoff = 3012558848, inode = 0 }
+vm_state.vm_map: 23329.207281995 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3012571136, end = 3012591616, flags = 134217845, pgoff = 0, inode = 264512 }
+vm_state.vm_map: 23329.207283988 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3012591616, end = 3012595712, flags = 135266419, pgoff = 20480, inode = 264512 }
+vm_state.vm_map: 23329.207291309 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3012595712, end = 3013226496, flags = 134217845, pgoff = 0, inode = 264445 }
+vm_state.vm_map: 23329.207293375 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013226496, end = 3013242880, flags = 135266419, pgoff = 630784, inode = 264445 }
+vm_state.vm_map: 23329.207298156 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013242880, end = 3013402624, flags = 134217845, pgoff = 0, inode = 106968 }
+vm_state.vm_map: 23329.207317020 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013402624, end = 3013410816, flags = 135266419, pgoff = 159744, inode = 106968 }
+vm_state.vm_map: 23329.207319345 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013410816, end = 3013492736, flags = 134217841, pgoff = 0, inode = 98443 }
+vm_state.vm_map: 23329.207328419 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013492736, end = 3013505024, flags = 134217845, pgoff = 0, inode = 264476 }
+vm_state.vm_map: 23329.207330467 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013505024, end = 3013509120, flags = 135266419, pgoff = 8192, inode = 264476 }
+vm_state.vm_map: 23329.207332780 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013509120, end = 3013562368, flags = 134217841, pgoff = 0, inode = 649748 }
+vm_state.vm_map: 23329.207334995 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013562368, end = 3013632000, flags = 134217841, pgoff = 0, inode = 649694 }
+vm_state.vm_map: 23329.207337364 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013632000, end = 3013640192, flags = 134217845, pgoff = 0, inode = 87435 }
+vm_state.vm_map: 23329.207339362 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013640192, end = 3013644288, flags = 135266419, pgoff = 4096, inode = 87435 }
+vm_state.vm_map: 23329.207341682 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013644288, end = 3013648384, flags = 134217937, pgoff = 0, inode = 1196150 }
+vm_state.vm_map: 23329.207343864 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013648384, end = 3013672960, flags = 134217937, pgoff = 0, inode = 1196354 }
+vm_state.vm_map: 23329.207346135 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013672960, end = 3013677056, flags = 134217937, pgoff = 0, inode = 1196334 }
+vm_state.vm_map: 23329.207348307 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013677056, end = 3013681152, flags = 134217937, pgoff = 0, inode = 1196333 }
+vm_state.vm_map: 23329.207350404 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013681152, end = 3013685248, flags = 134217937, pgoff = 0, inode = 1196331 }
+vm_state.vm_map: 23329.207352526 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013685248, end = 3013689344, flags = 134217937, pgoff = 0, inode = 1196330 }
+vm_state.vm_map: 23329.207354821 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013689344, end = 3013697536, flags = 134217937, pgoff = 0, inode = 1196329 }
+vm_state.vm_map: 23329.207356986 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013697536, end = 3013730304, flags = 134217937, pgoff = 0, inode = 1196328 }
+vm_state.vm_map: 23329.207359237 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013730304, end = 3013742592, flags = 134217937, pgoff = 0, inode = 1196327 }
+vm_state.vm_map: 23329.207361470 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013742592, end = 3013750784, flags = 134217937, pgoff = 0, inode = 1196320 }
+vm_state.vm_map: 23329.207364141 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013750784, end = 3013754880, flags = 134217937, pgoff = 0, inode = 1196318 }
+vm_state.vm_map: 23329.207366293 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013754880, end = 3013758976, flags = 134217937, pgoff = 0, inode = 1196278 }
+vm_state.vm_map: 23329.207368625 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013758976, end = 3013763072, flags = 134217937, pgoff = 0, inode = 1196251 }
+vm_state.vm_map: 23329.207370852 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013763072, end = 3013791744, flags = 134217937, pgoff = 0, inode = 1196236 }
+vm_state.vm_map: 23329.207373060 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013791744, end = 3013804032, flags = 134217937, pgoff = 0, inode = 1196234 }
+vm_state.vm_map: 23329.207375293 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013804032, end = 3013808128, flags = 134217937, pgoff = 0, inode = 1196201 }
+vm_state.vm_map: 23329.207377520 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013808128, end = 3013816320, flags = 134217937, pgoff = 0, inode = 1196170 }
+vm_state.vm_map: 23329.207379642 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013816320, end = 3013820416, flags = 134217937, pgoff = 0, inode = 1196157 }
+vm_state.vm_map: 23329.207381956 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013820416, end = 3013824512, flags = 134217937, pgoff = 0, inode = 1196171 }
+vm_state.vm_map: 23329.207384022 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013824512, end = 3013836800, flags = 134217937, pgoff = 0, inode = 1196172 }
+vm_state.vm_map: 23329.207386101 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013836800, end = 3013844992, flags = 134217937, pgoff = 0, inode = 1196173 }
+vm_state.vm_map: 23329.207388457 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013844992, end = 3013877760, flags = 134217937, pgoff = 0, inode = 1196352 }
+vm_state.vm_map: 23329.207390696 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013877760, end = 3013898240, flags = 134217937, pgoff = 0, inode = 1196196 }
+vm_state.vm_map: 23329.207392936 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013898240, end = 3013906432, flags = 134217937, pgoff = 0, inode = 1196343 }
+vm_state.vm_map: 23329.207395372 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013906432, end = 3013935104, flags = 134217937, pgoff = 0, inode = 1196314 }
+vm_state.vm_map: 23329.207397611 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013935104, end = 3013980160, flags = 134217937, pgoff = 0, inode = 1196147 }
+vm_state.vm_map: 23329.207400153 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3013980160, end = 3014037504, flags = 134217937, pgoff = 0, inode = 1196094 }
+vm_state.vm_map: 23329.207402596 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3014037504, end = 3014094848, flags = 134217937, pgoff = 0, inode = 1196355 }
+vm_state.vm_map: 23329.207404582 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3014094848, end = 3014098944, flags = 1048688, pgoff = 3014094848, inode = 0 }
+vm_state.vm_map: 23329.207406605 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3014098944, end = 3022487552, flags = 1048691, pgoff = 3014098944, inode = 0 }
+vm_state.vm_map: 23329.207412034 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3022487552, end = 3027914752, flags = 134217845, pgoff = 0, inode = 264426 }
+vm_state.vm_map: 23329.207414082 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3027914752, end = 3028303872, flags = 135266419, pgoff = 5423104, inode = 264426 }
+vm_state.vm_map: 23329.207416153 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3028303872, end = 3028332544, flags = 1048691, pgoff = 3028303872, inode = 0 }
+vm_state.vm_map: 23329.207418511 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3028332544, end = 3028459520, flags = 134217845, pgoff = 0, inode = 18923 }
+vm_state.vm_map: 23329.207420565 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3028459520, end = 3028463616, flags = 135266419, pgoff = 122880, inode = 18923 }
+vm_state.vm_map: 23329.207422556 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3028463616, end = 3028480000, flags = 1048691, pgoff = 3028463616, inode = 0 }
+vm_state.vm_map: 23329.207424969 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3028480000, end = 3028549632, flags = 134217845, pgoff = 0, inode = 264390 }
+vm_state.vm_map: 23329.207427116 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3028549632, end = 3028557824, flags = 135266419, pgoff = 65536, inode = 264390 }
+vm_state.vm_map: 23329.207432142 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3028557824, end = 3028652032, flags = 134217845, pgoff = 0, inode = 264386 }
+vm_state.vm_map: 23329.207434307 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3028652032, end = 3028660224, flags = 135266419, pgoff = 90112, inode = 264386 }
+vm_state.vm_map: 23329.207436782 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3028660224, end = 3028733952, flags = 134217845, pgoff = 0, inode = 17860 }
+vm_state.vm_map: 23329.207438934 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3028733952, end = 3028738048, flags = 135266419, pgoff = 69632, inode = 17860 }
+vm_state.vm_map: 23329.207441125 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3028738048, end = 3028750336, flags = 134217845, pgoff = 0, inode = 141213 }
+vm_state.vm_map: 23329.207443215 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3028750336, end = 3028754432, flags = 135266419, pgoff = 8192, inode = 141213 }
+vm_state.vm_map: 23329.207445313 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3028754432, end = 3028766720, flags = 134217937, pgoff = 0, inode = 1196342 }
+vm_state.vm_map: 23329.207450198 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3028766720, end = 3028795392, flags = 134217845, pgoff = 0, inode = 264450 }
+vm_state.vm_map: 23329.207452246 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3028795392, end = 3028799488, flags = 135266419, pgoff = 24576, inode = 264450 }
+vm_state.vm_map: 23329.207454460 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3028799488, end = 3028832256, flags = 134217841, pgoff = 0, inode = 74138 }
+vm_state.vm_map: 23329.207461363 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3028832256, end = 3029065728, flags = 134217845, pgoff = 0, inode = 264491 }
+vm_state.vm_map: 23329.207463510 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3029065728, end = 3029078016, flags = 135266419, pgoff = 229376, inode = 264491 }
+vm_state.vm_map: 23329.207468358 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3029078016, end = 3029094400, flags = 134217845, pgoff = 0, inode = 264557 }
+vm_state.vm_map: 23329.207470523 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3029094400, end = 3029098496, flags = 135266419, pgoff = 16384, inode = 264557 }
+vm_state.vm_map: 23329.207476032 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3029098496, end = 3029188608, flags = 134217845, pgoff = 0, inode = 264497 }
+vm_state.vm_map: 23329.207478074 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3029188608, end = 3029196800, flags = 135266419, pgoff = 86016, inode = 264497 }
+vm_state.vm_map: 23329.207482842 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3029196800, end = 3029266432, flags = 134217845, pgoff = 0, inode = 264411 }
+vm_state.vm_map: 23329.207484890 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3029266432, end = 3029270528, flags = 135266419, pgoff = 65536, inode = 264411 }
+vm_state.vm_map: 23329.207489523 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3029270528, end = 3029291008, flags = 134217845, pgoff = 0, inode = 264467 }
+vm_state.vm_map: 23329.207491558 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3029291008, end = 3029295104, flags = 135266419, pgoff = 16384, inode = 264467 }
+vm_state.vm_map: 23329.207493618 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3029295104, end = 3029299200, flags = 1048688, pgoff = 3029295104, inode = 0 }
+vm_state.vm_map: 23329.207495697 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3029299200, end = 3037687808, flags = 1048691, pgoff = 3029299200, inode = 0 }
+vm_state.vm_map: 23329.207503032 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3037687808, end = 3037859840, flags = 134217845, pgoff = 0, inode = 264421 }
+vm_state.vm_map: 23329.207505209 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3037859840, end = 3037868032, flags = 135266419, pgoff = 167936, inode = 264421 }
+vm_state.vm_map: 23329.207507652 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3037868032, end = 3037978624, flags = 134217845, pgoff = 0, inode = 264459 }
+vm_state.vm_map: 23329.207510107 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3037978624, end = 3037986816, flags = 135266419, pgoff = 106496, inode = 264459 }
+vm_state.vm_map: 23329.207512395 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3037986816, end = 3038072832, flags = 134217845, pgoff = 0, inode = 17131 }
+vm_state.vm_map: 23329.207514362 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3038072832, end = 3038076928, flags = 135266419, pgoff = 81920, inode = 17131 }
+vm_state.vm_map: 23329.207516546 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3038076928, end = 3038085120, flags = 1048691, pgoff = 3038076928, inode = 0 }
+vm_state.vm_map: 23329.207518619 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3038085120, end = 3038404608, flags = 134217845, pgoff = 0, inode = 1065171 }
+vm_state.vm_map: 23329.207520550 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3038404608, end = 3038420992, flags = 135266419, pgoff = 315392, inode = 1065171 }
+vm_state.vm_map: 23329.207525429 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3038420992, end = 3038429184, flags = 134217845, pgoff = 0, inode = 231125 }
+vm_state.vm_map: 23329.207527465 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3038429184, end = 3038433280, flags = 135266419, pgoff = 4096, inode = 231125 }
+vm_state.vm_map: 23329.207529833 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3038433280, end = 3038511104, flags = 134217845, pgoff = 0, inode = 264536 }
+vm_state.vm_map: 23329.207531955 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3038511104, end = 3038515200, flags = 135266419, pgoff = 77824, inode = 264536 }
+vm_state.vm_map: 23329.207540073 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3038515200, end = 3038633984, flags = 134217845, pgoff = 0, inode = 229424 }
+vm_state.vm_map: 23329.207542115 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3038633984, end = 3038642176, flags = 135266419, pgoff = 114688, inode = 229424 }
+vm_state.vm_map: 23329.207547105 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3038642176, end = 3038822400, flags = 134217845, pgoff = 0, inode = 264408 }
+vm_state.vm_map: 23329.207549258 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3038822400, end = 3038838784, flags = 135266419, pgoff = 176128, inode = 264408 }
+vm_state.vm_map: 23329.207554360 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3038838784, end = 3039154176, flags = 134217845, pgoff = 0, inode = 264365 }
+vm_state.vm_map: 23329.207556401 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3039154176, end = 3039170560, flags = 135266419, pgoff = 315392, inode = 264365 }
+vm_state.vm_map: 23329.207558758 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3039170560, end = 3039633408, flags = 134217845, pgoff = 0, inode = 20061 }
+vm_state.vm_map: 23329.207560942 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3039633408, end = 3039645696, flags = 135266419, pgoff = 458752, inode = 20061 }
+vm_state.vm_map: 23329.207563409 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3039645696, end = 3039707136, flags = 134217845, pgoff = 0, inode = 19423 }
+vm_state.vm_map: 23329.207565500 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3039707136, end = 3039711232, flags = 135266419, pgoff = 57344, inode = 19423 }
+vm_state.vm_map: 23329.207567604 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3039711232, end = 3040514048, flags = 134217845, pgoff = 0, inode = 21274 }
+vm_state.vm_map: 23329.207569541 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3040514048, end = 3040530432, flags = 135266419, pgoff = 802816, inode = 21274 }
+vm_state.vm_map: 23329.207574474 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3040530432, end = 3040546816, flags = 134217845, pgoff = 0, inode = 1065421 }
+vm_state.vm_map: 23329.207576523 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3040546816, end = 3040550912, flags = 135266419, pgoff = 12288, inode = 1065421 }
+vm_state.vm_map: 23329.207579071 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3040550912, end = 3040612352, flags = 134217845, pgoff = 0, inode = 21268 }
+vm_state.vm_map: 23329.207581155 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3040612352, end = 3040616448, flags = 135266419, pgoff = 57344, inode = 21268 }
+vm_state.vm_map: 23329.207583777 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3040616448, end = 3040657408, flags = 134217845, pgoff = 0, inode = 22434 }
+vm_state.vm_map: 23329.207585720 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3040657408, end = 3040661504, flags = 135266419, pgoff = 40960, inode = 22434 }
+vm_state.vm_map: 23329.207588145 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3040661504, end = 3041267712, flags = 134217845, pgoff = 0, inode = 22471 }
+vm_state.vm_map: 23329.207590218 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3041267712, end = 3041284096, flags = 135266419, pgoff = 602112, inode = 22471 }
+vm_state.vm_map: 23329.207592567 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3041284096, end = 3042541568, flags = 134217845, pgoff = 0, inode = 20833 }
+vm_state.vm_map: 23329.207594652 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3042541568, end = 3042562048, flags = 135266419, pgoff = 1253376, inode = 20833 }
+vm_state.vm_map: 23329.207596589 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3042562048, end = 3042566144, flags = 1048691, pgoff = 3042562048, inode = 0 }
+vm_state.vm_map: 23329.207598877 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3042566144, end = 3042603008, flags = 134217845, pgoff = 0, inode = 499726 }
+vm_state.vm_map: 23329.207600808 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3042603008, end = 3042607104, flags = 135266419, pgoff = 32768, inode = 499726 }
+vm_state.vm_map: 23329.207605786 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3042607104, end = 3042738176, flags = 134217845, pgoff = 0, inode = 1065240 }
+vm_state.vm_map: 23329.207607828 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3042738176, end = 3042750464, flags = 135266419, pgoff = 131072, inode = 1065240 }
+vm_state.vm_map: 23329.207610110 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3042750464, end = 3042787328, flags = 134217845, pgoff = 0, inode = 22966 }
+vm_state.vm_map: 23329.207612282 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3042787328, end = 3042791424, flags = 135266419, pgoff = 36864, inode = 22966 }
+vm_state.vm_map: 23329.207614817 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3042791424, end = 3042869248, flags = 134217845, pgoff = 0, inode = 1065451 }
+vm_state.vm_map: 23329.207616865 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3042869248, end = 3042877440, flags = 135266419, pgoff = 77824, inode = 1065451 }
+vm_state.vm_map: 23329.207622479 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3042877440, end = 3043213312, flags = 134217845, pgoff = 0, inode = 1065452 }
+vm_state.vm_map: 23329.207624644 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3043213312, end = 3043254272, flags = 135266419, pgoff = 331776, inode = 1065452 }
+vm_state.vm_map: 23329.207631941 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3043254272, end = 3043614720, flags = 134217845, pgoff = 0, inode = 1065455 }
+vm_state.vm_map: 23329.207633983 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3043614720, end = 3043627008, flags = 135266419, pgoff = 356352, inode = 1065455 }
+vm_state.vm_map: 23329.207638775 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3043627008, end = 3043708928, flags = 134217845, pgoff = 0, inode = 1065819 }
+vm_state.vm_map: 23329.207640960 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3043708928, end = 3043713024, flags = 135266419, pgoff = 81920, inode = 1065819 }
+vm_state.vm_map: 23329.207643290 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3043713024, end = 3043938304, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.207645339 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3043938304, end = 3043942400, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.207647400 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3043942400, end = 3043946496, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.207649682 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3043946496, end = 3044061184, flags = 134217845, pgoff = 0, inode = 17291 }
+vm_state.vm_map: 23329.207651730 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3044061184, end = 3044065280, flags = 135266419, pgoff = 114688, inode = 17291 }
+vm_state.vm_map: 23329.207653864 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3044065280, end = 3044372480, flags = 134217845, pgoff = 0, inode = 1065420 }
+vm_state.vm_map: 23329.207656301 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3044372480, end = 3044413440, flags = 135266419, pgoff = 303104, inode = 1065420 }
+vm_state.vm_map: 23329.207658410 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3044413440, end = 3044610048, flags = 134217845, pgoff = 0, inode = 1065401 }
+vm_state.vm_map: 23329.207660539 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3044610048, end = 3044622336, flags = 135266419, pgoff = 192512, inode = 1065401 }
+vm_state.vm_map: 23329.207662722 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3044622336, end = 3044634624, flags = 134217845, pgoff = 0, inode = 499878 }
+vm_state.vm_map: 23329.207664745 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3044634624, end = 3044638720, flags = 135266419, pgoff = 8192, inode = 499878 }
+vm_state.vm_map: 23329.207666960 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3044638720, end = 3044667392, flags = 134217845, pgoff = 0, inode = 18629 }
+vm_state.vm_map: 23329.207668952 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3044667392, end = 3044671488, flags = 135266419, pgoff = 24576, inode = 18629 }
+vm_state.vm_map: 23329.207671388 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3044671488, end = 3044683776, flags = 134217845, pgoff = 0, inode = 231124 }
+vm_state.vm_map: 23329.207673541 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3044683776, end = 3044687872, flags = 135266419, pgoff = 12288, inode = 231124 }
+vm_state.vm_map: 23329.207676373 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3044687872, end = 3044716544, flags = 134217841, pgoff = 0, inode = 73912 }
+vm_state.vm_map: 23329.207678840 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3044716544, end = 3045023744, flags = 134217845, pgoff = 0, inode = 264528 }
+vm_state.vm_map: 23329.207680789 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3045023744, end = 3045040128, flags = 135266419, pgoff = 307200, inode = 264528 }
+vm_state.vm_map: 23329.207688765 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3045040128, end = 3045814272, flags = 134217845, pgoff = 0, inode = 264478 }
+vm_state.vm_map: 23329.207690807 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3045814272, end = 3045838848, flags = 135266419, pgoff = 774144, inode = 264478 }
+vm_state.vm_map: 23329.207693145 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3045838848, end = 3045879808, flags = 1048691, pgoff = 3045838848, inode = 0 }
+vm_state.vm_map: 23329.207698074 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3045879808, end = 3046264832, flags = 134217845, pgoff = 0, inode = 264571 }
+vm_state.vm_map: 23329.207700122 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3046264832, end = 3046293504, flags = 135266419, pgoff = 385024, inode = 264571 }
+vm_state.vm_map: 23329.207702262 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3046293504, end = 3046297600, flags = 1048691, pgoff = 3046293504, inode = 0 }
+vm_state.vm_map: 23329.207707191 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3046297600, end = 3046453248, flags = 134217845, pgoff = 0, inode = 264449 }
+vm_state.vm_map: 23329.207709220 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3046453248, end = 3046461440, flags = 135266419, pgoff = 155648, inode = 264449 }
+vm_state.vm_map: 23329.207714137 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3046461440, end = 3046531072, flags = 134217845, pgoff = 0, inode = 264508 }
+vm_state.vm_map: 23329.207716185 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3046531072, end = 3046539264, flags = 135266419, pgoff = 65536, inode = 264508 }
+vm_state.vm_map: 23329.207718177 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3046539264, end = 3046543360, flags = 1048688, pgoff = 3046539264, inode = 0 }
+vm_state.vm_map: 23329.207720231 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3046543360, end = 3054931968, flags = 1048691, pgoff = 3046543360, inode = 0 }
+vm_state.vm_map: 23329.207722563 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3054931968, end = 3055149056, flags = 134217845, pgoff = 0, inode = 264108 }
+vm_state.vm_map: 23329.207724506 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3055149056, end = 3055161344, flags = 135266419, pgoff = 217088, inode = 264108 }
+vm_state.vm_map: 23329.207730038 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3055161344, end = 3055910912, flags = 134217845, pgoff = 0, inode = 264373 }
+vm_state.vm_map: 23329.207732131 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3055910912, end = 3055943680, flags = 135266419, pgoff = 749568, inode = 264373 }
+vm_state.vm_map: 23329.207734363 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3055943680, end = 3056205824, flags = 134217845, pgoff = 0, inode = 17293 }
+vm_state.vm_map: 23329.207736398 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3056205824, end = 3056222208, flags = 135266419, pgoff = 262144, inode = 17293 }
+vm_state.vm_map: 23329.207738835 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3056222208, end = 3056234496, flags = 134217845, pgoff = 0, inode = 20765 }
+vm_state.vm_map: 23329.207740833 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3056234496, end = 3056238592, flags = 135266419, pgoff = 8192, inode = 20765 }
+vm_state.vm_map: 23329.207743023 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3056238592, end = 3056246784, flags = 134217845, pgoff = 0, inode = 508383 }
+vm_state.vm_map: 23329.207745047 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3056246784, end = 3056250880, flags = 135266417, pgoff = 4096, inode = 508383 }
+vm_state.vm_map: 23329.207747138 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3056250880, end = 3056254976, flags = 135266419, pgoff = 8192, inode = 508383 }
+vm_state.vm_map: 23329.207752677 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3056254976, end = 3056312320, flags = 134217845, pgoff = 0, inode = 264553 }
+vm_state.vm_map: 23329.207754725 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3056312320, end = 3056316416, flags = 135266419, pgoff = 57344, inode = 264553 }
+vm_state.vm_map: 23329.207762652 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3056316416, end = 3056414720, flags = 134217845, pgoff = 0, inode = 229435 }
+vm_state.vm_map: 23329.207764817 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3056414720, end = 3056422912, flags = 135266419, pgoff = 94208, inode = 229435 }
+vm_state.vm_map: 23329.207770159 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3056422912, end = 3059355648, flags = 134217845, pgoff = 0, inode = 264105 }
+vm_state.vm_map: 23329.207772435 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3059355648, end = 3059466240, flags = 135266419, pgoff = 2928640, inode = 264105 }
+vm_state.vm_map: 23329.207774600 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3059466240, end = 3059470336, flags = 1048691, pgoff = 3059466240, inode = 0 }
+vm_state.vm_map: 23329.207776889 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3059470336, end = 3059499008, flags = 134217845, pgoff = 0, inode = 1065218 }
+vm_state.vm_map: 23329.207778931 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3059499008, end = 3059503104, flags = 135266419, pgoff = 28672, inode = 1065218 }
+vm_state.vm_map: 23329.207781059 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3059503104, end = 3059556352, flags = 134217845, pgoff = 0, inode = 24466 }
+vm_state.vm_map: 23329.207783119 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3059556352, end = 3059560448, flags = 135266419, pgoff = 49152, inode = 24466 }
+vm_state.vm_map: 23329.207785328 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3059560448, end = 3059580928, flags = 134217845, pgoff = 0, inode = 23692 }
+vm_state.vm_map: 23329.207787258 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3059580928, end = 3059585024, flags = 135266419, pgoff = 16384, inode = 23692 }
+vm_state.vm_map: 23329.207789325 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3059585024, end = 3059748864, flags = 134217845, pgoff = 0, inode = 21283 }
+vm_state.vm_map: 23329.207791262 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3059748864, end = 3059752960, flags = 135266419, pgoff = 159744, inode = 21283 }
+vm_state.vm_map: 23329.207793334 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3059752960, end = 3059814400, flags = 134217845, pgoff = 0, inode = 1065430 }
+vm_state.vm_map: 23329.207795278 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3059814400, end = 3059818496, flags = 135266419, pgoff = 57344, inode = 1065430 }
+vm_state.vm_map: 23329.207797233 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3059818496, end = 3059826688, flags = 1048691, pgoff = 3059818496, inode = 0 }
+vm_state.vm_map: 23329.207799508 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3059826688, end = 3059888128, flags = 134217845, pgoff = 0, inode = 264564 }
+vm_state.vm_map: 23329.207801784 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3059888128, end = 3059892224, flags = 135266419, pgoff = 57344, inode = 264564 }
+vm_state.vm_map: 23329.207809915 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3059892224, end = 3059908608, flags = 134217845, pgoff = 0, inode = 264418 }
+vm_state.vm_map: 23329.207812006 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3059908608, end = 3059912704, flags = 135266419, pgoff = 16384, inode = 264418 }
+vm_state.vm_map: 23329.207814189 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3059912704, end = 3059953664, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.207816355 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3059953664, end = 3059957760, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.207818353 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3059957760, end = 3059961856, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.207820697 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3059961856, end = 3059998720, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.207822653 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3059998720, end = 3060002816, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.207824812 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3060002816, end = 3060006912, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.207826897 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3060006912, end = 3060084736, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.207828939 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3060084736, end = 3060088832, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.207830869 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3060088832, end = 3060092928, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.207832812 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3060092928, end = 3060101120, flags = 1048691, pgoff = 3060092928, inode = 0 }
+vm_state.vm_map: 23329.207834860 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3060101120, end = 3060125696, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.207837124 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3060125696, end = 3060129792, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.207839061 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3060129792, end = 3060133888, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.207841010 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3060133888, end = 3060137984, flags = 1048691, pgoff = 3060133888, inode = 0 }
+vm_state.vm_map: 23329.207843324 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3060137984, end = 3060146176, flags = 134217845, pgoff = 0, inode = 21270 }
+vm_state.vm_map: 23329.207845254 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3060146176, end = 3060150272, flags = 135266419, pgoff = 8192, inode = 21270 }
+vm_state.vm_map: 23329.207847414 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3060150272, end = 3060178944, flags = 134217845, pgoff = 0, inode = 23696 }
+vm_state.vm_map: 23329.207849474 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3060178944, end = 3060183040, flags = 135266419, pgoff = 24576, inode = 23696 }
+vm_state.vm_map: 23329.207851553 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3060183040, end = 3060199424, flags = 134217845, pgoff = 0, inode = 1065432 }
+vm_state.vm_map: 23329.207853508 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3060199424, end = 3060203520, flags = 135266419, pgoff = 12288, inode = 1065432 }
+vm_state.vm_map: 23329.207855599 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3060203520, end = 3060224000, flags = 134217845, pgoff = 0, inode = 314599 }
+vm_state.vm_map: 23329.207857623 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3060224000, end = 3060228096, flags = 135266419, pgoff = 16384, inode = 314599 }
+vm_state.vm_map: 23329.207859714 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3060228096, end = 3060367360, flags = 134217841, pgoff = 0, inode = 74520 }
+vm_state.vm_map: 23329.207861785 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3060367360, end = 3061698560, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.207863834 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3061698560, end = 3061710848, flags = 1048691, pgoff = 3061698560, inode = 0 }
+vm_state.vm_map: 23329.207865901 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3061710848, end = 3061727232, flags = 134217845, pgoff = 0, inode = 22606 }
+vm_state.vm_map: 23329.207867832 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3061727232, end = 3061731328, flags = 135266419, pgoff = 12288, inode = 22606 }
+vm_state.vm_map: 23329.207870323 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3061731328, end = 3061739520, flags = 134217845, pgoff = 0, inode = 18631 }
+vm_state.vm_map: 23329.207872254 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3061739520, end = 3061743616, flags = 135266419, pgoff = 4096, inode = 18631 }
+vm_state.vm_map: 23329.207874326 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3061743616, end = 3061772288, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.207876258 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3061772288, end = 3061776384, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.207878188 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3061776384, end = 3061780480, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.207880298 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3061780480, end = 3061927936, flags = 134217845, pgoff = 0, inode = 19962 }
+vm_state.vm_map: 23329.207882364 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3061927936, end = 3061936128, flags = 135266419, pgoff = 143360, inode = 19962 }
+vm_state.vm_map: 23329.207884301 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3061936128, end = 3061940224, flags = 1048691, pgoff = 3061936128, inode = 0 }
+vm_state.vm_map: 23329.207886497 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3061940224, end = 3062038528, flags = 134217845, pgoff = 0, inode = 22609 }
+vm_state.vm_map: 23329.207888428 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3062038528, end = 3062042624, flags = 135266419, pgoff = 94208, inode = 22609 }
+vm_state.vm_map: 23329.207890494 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3062042624, end = 3062067200, flags = 134217845, pgoff = 0, inode = 22612 }
+vm_state.vm_map: 23329.207892425 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3062067200, end = 3062071296, flags = 135266419, pgoff = 20480, inode = 22612 }
+vm_state.vm_map: 23329.207894559 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3062071296, end = 3062083584, flags = 134217845, pgoff = 0, inode = 21323 }
+vm_state.vm_map: 23329.207896706 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3062083584, end = 3062087680, flags = 135266419, pgoff = 8192, inode = 21323 }
+vm_state.vm_map: 23329.207898809 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3062087680, end = 3062231040, flags = 134217845, pgoff = 0, inode = 17737 }
+vm_state.vm_map: 23329.207900919 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3062231040, end = 3062235136, flags = 135266419, pgoff = 139264, inode = 17737 }
+vm_state.vm_map: 23329.207903454 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3062235136, end = 3062312960, flags = 134217845, pgoff = 0, inode = 24576 }
+vm_state.vm_map: 23329.207905502 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3062312960, end = 3062317056, flags = 135266419, pgoff = 77824, inode = 24576 }
+vm_state.vm_map: 23329.207907575 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3062317056, end = 3062321152, flags = 1048691, pgoff = 3062317056, inode = 0 }
+vm_state.vm_map: 23329.207909839 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3062321152, end = 3062353920, flags = 134217845, pgoff = 0, inode = 24194 }
+vm_state.vm_map: 23329.207911887 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3062353920, end = 3062358016, flags = 135266419, pgoff = 28672, inode = 24194 }
+vm_state.vm_map: 23329.207913966 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3062358016, end = 3062824960, flags = 134217845, pgoff = 0, inode = 23967 }
+vm_state.vm_map: 23329.207915902 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3062824960, end = 3062833152, flags = 135266419, pgoff = 462848, inode = 23967 }
+vm_state.vm_map: 23329.207917950 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3062833152, end = 3062837248, flags = 1048691, pgoff = 3062833152, inode = 0 }
+vm_state.vm_map: 23329.207920146 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3062837248, end = 3063193600, flags = 134217845, pgoff = 0, inode = 1065307 }
+vm_state.vm_map: 23329.207922077 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063193600, end = 3063201792, flags = 135266419, pgoff = 356352, inode = 1065307 }
+vm_state.vm_map: 23329.207924162 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063201792, end = 3063300096, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 23329.207926216 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063300096, end = 3063304192, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 23329.207928190 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063304192, end = 3063308288, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 23329.207930263 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063308288, end = 3063377920, flags = 134217845, pgoff = 0, inode = 508438 }
+vm_state.vm_map: 23329.207932200 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063377920, end = 3063382016, flags = 135266417, pgoff = 65536, inode = 508438 }
+vm_state.vm_map: 23329.207934137 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063382016, end = 3063386112, flags = 135266419, pgoff = 69632, inode = 508438 }
+vm_state.vm_map: 23329.207936572 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063386112, end = 3063398400, flags = 1048691, pgoff = 3063386112, inode = 0 }
+vm_state.vm_map: 23329.207938694 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063398400, end = 3063590912, flags = 134217845, pgoff = 0, inode = 500014 }
+vm_state.vm_map: 23329.207940632 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063590912, end = 3063595008, flags = 135266419, pgoff = 192512, inode = 500014 }
+vm_state.vm_map: 23329.207942766 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063595008, end = 3063672832, flags = 134217845, pgoff = 0, inode = 17715 }
+vm_state.vm_map: 23329.207944747 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063672832, end = 3063676928, flags = 135266419, pgoff = 77824, inode = 17715 }
+vm_state.vm_map: 23329.207946918 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063676928, end = 3063709696, flags = 134217845, pgoff = 0, inode = 17846 }
+vm_state.vm_map: 23329.207948916 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063709696, end = 3063713792, flags = 135266419, pgoff = 28672, inode = 17846 }
+vm_state.vm_map: 23329.207951087 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063713792, end = 3063738368, flags = 134217845, pgoff = 0, inode = 21580 }
+vm_state.vm_map: 23329.207953141 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063738368, end = 3063742464, flags = 135266419, pgoff = 24576, inode = 21580 }
+vm_state.vm_map: 23329.207955246 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063742464, end = 3063775232, flags = 134217845, pgoff = 0, inode = 21294 }
+vm_state.vm_map: 23329.207957201 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063775232, end = 3063779328, flags = 135266419, pgoff = 28672, inode = 21294 }
+vm_state.vm_map: 23329.207959137 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063779328, end = 3063783424, flags = 1048691, pgoff = 3063779328, inode = 0 }
+vm_state.vm_map: 23329.207961204 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063783424, end = 3063791616, flags = 134217845, pgoff = 0, inode = 21578 }
+vm_state.vm_map: 23329.207963134 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063791616, end = 3063795712, flags = 135266419, pgoff = 4096, inode = 21578 }
+vm_state.vm_map: 23329.207965219 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063795712, end = 3063828480, flags = 134217845, pgoff = 0, inode = 17840 }
+vm_state.vm_map: 23329.207967156 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063828480, end = 3063832576, flags = 135266419, pgoff = 28672, inode = 17840 }
+vm_state.vm_map: 23329.207969562 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063832576, end = 3063885824, flags = 134217845, pgoff = 0, inode = 20719 }
+vm_state.vm_map: 23329.207971604 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063885824, end = 3063889920, flags = 135266419, pgoff = 49152, inode = 20719 }
+vm_state.vm_map: 23329.207973738 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063889920, end = 3063906304, flags = 134217845, pgoff = 0, inode = 16916 }
+vm_state.vm_map: 23329.207975829 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063906304, end = 3063910400, flags = 135266419, pgoff = 12288, inode = 16916 }
+vm_state.vm_map: 23329.207977933 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063910400, end = 3063918592, flags = 134217845, pgoff = 0, inode = 22665 }
+vm_state.vm_map: 23329.207979888 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063918592, end = 3063922688, flags = 135266419, pgoff = 4096, inode = 22665 }
+vm_state.vm_map: 23329.207981831 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063922688, end = 3063926784, flags = 1048691, pgoff = 3063922688, inode = 0 }
+vm_state.vm_map: 23329.207983972 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063926784, end = 3063934976, flags = 134217845, pgoff = 0, inode = 17721 }
+vm_state.vm_map: 23329.207986082 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063934976, end = 3063939072, flags = 135266419, pgoff = 4096, inode = 17721 }
+vm_state.vm_map: 23329.207988167 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3063939072, end = 3065253888, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.207990190 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3065253888, end = 3065262080, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.207992189 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3065262080, end = 3065266176, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.207994132 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3065266176, end = 3065278464, flags = 1048691, pgoff = 3065266176, inode = 0 }
+vm_state.vm_map: 23329.207996260 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3065278464, end = 3065393152, flags = 134217845, pgoff = 0, inode = 499763 }
+vm_state.vm_map: 23329.207998314 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3065393152, end = 3065397248, flags = 135266419, pgoff = 114688, inode = 499763 }
+vm_state.vm_map: 23329.208000473 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3065397248, end = 3066335232, flags = 134217845, pgoff = 0, inode = 16400 }
+vm_state.vm_map: 23329.208002805 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3066335232, end = 3066351616, flags = 135266417, pgoff = 937984, inode = 16400 }
+vm_state.vm_map: 23329.208004784 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3066351616, end = 3066355712, flags = 135266419, pgoff = 954368, inode = 16400 }
+vm_state.vm_map: 23329.208006728 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3066355712, end = 3066384384, flags = 1048691, pgoff = 3066355712, inode = 0 }
+vm_state.vm_map: 23329.208008875 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3066384384, end = 3066531840, flags = 134217845, pgoff = 0, inode = 508364 }
+vm_state.vm_map: 23329.208010855 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3066531840, end = 3066535936, flags = 135266417, pgoff = 143360, inode = 508364 }
+vm_state.vm_map: 23329.208012859 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3066535936, end = 3066540032, flags = 135266419, pgoff = 147456, inode = 508364 }
+vm_state.vm_map: 23329.208016277 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3066540032, end = 3066556416, flags = 134217845, pgoff = 0, inode = 19625 }
+vm_state.vm_map: 23329.208020606 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3066556416, end = 3066560512, flags = 135266419, pgoff = 12288, inode = 19625 }
+vm_state.vm_map: 23329.208023291 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3066560512, end = 3066564608, flags = 1048691, pgoff = 3066560512, inode = 0 }
+vm_state.vm_map: 23329.208025442 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3066564608, end = 3067715584, flags = 134217845, pgoff = 0, inode = 1065145 }
+vm_state.vm_map: 23329.208027546 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3067715584, end = 3067731968, flags = 135266419, pgoff = 1146880, inode = 1065145 }
+vm_state.vm_map: 23329.208029657 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3067731968, end = 3068469248, flags = 134217845, pgoff = 0, inode = 499737 }
+vm_state.vm_map: 23329.208031759 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3068469248, end = 3068473344, flags = 135266419, pgoff = 733184, inode = 499737 }
+vm_state.vm_map: 23329.208033961 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3068473344, end = 3068485632, flags = 134217845, pgoff = 0, inode = 19626 }
+vm_state.vm_map: 23329.208036324 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3068485632, end = 3068489728, flags = 135266419, pgoff = 8192, inode = 19626 }
+vm_state.vm_map: 23329.208038532 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3068489728, end = 3068731392, flags = 134217845, pgoff = 0, inode = 19627 }
+vm_state.vm_map: 23329.208040488 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3068731392, end = 3068735488, flags = 135266419, pgoff = 241664, inode = 19627 }
+vm_state.vm_map: 23329.208042659 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3068735488, end = 3068919808, flags = 134217845, pgoff = 0, inode = 22064 }
+vm_state.vm_map: 23329.208044744 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3068919808, end = 3068928000, flags = 135266419, pgoff = 180224, inode = 22064 }
+vm_state.vm_map: 23329.208046922 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3068928000, end = 3068932096, flags = 1048691, pgoff = 3068928000, inode = 0 }
+vm_state.vm_map: 23329.208049179 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3068932096, end = 3069403136, flags = 134217845, pgoff = 0, inode = 18958 }
+vm_state.vm_map: 23329.208051264 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3069403136, end = 3069419520, flags = 135266419, pgoff = 471040, inode = 18958 }
+vm_state.vm_map: 23329.208053374 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3069419520, end = 3069689856, flags = 134217845, pgoff = 0, inode = 22793 }
+vm_state.vm_map: 23329.208055477 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3069689856, end = 3069698048, flags = 135266419, pgoff = 266240, inode = 22793 }
+vm_state.vm_map: 23329.208057698 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3069698048, end = 3070177280, flags = 134217845, pgoff = 0, inode = 21325 }
+vm_state.vm_map: 23329.208059869 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3070177280, end = 3070185472, flags = 135266419, pgoff = 479232, inode = 21325 }
+vm_state.vm_map: 23329.208062010 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3070185472, end = 3070783488, flags = 134217845, pgoff = 0, inode = 19628 }
+vm_state.vm_map: 23329.208064095 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3070783488, end = 3070791680, flags = 135266419, pgoff = 598016, inode = 19628 }
+vm_state.vm_map: 23329.208066248 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3070791680, end = 3070832640, flags = 134217845, pgoff = 0, inode = 22795 }
+vm_state.vm_map: 23329.208068345 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3070832640, end = 3070836736, flags = 135266419, pgoff = 36864, inode = 22795 }
+vm_state.vm_map: 23329.208070745 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3070836736, end = 3070840832, flags = 1048691, pgoff = 3070836736, inode = 0 }
+vm_state.vm_map: 23329.208072836 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3070840832, end = 3070939136, flags = 134217845, pgoff = 0, inode = 22669 }
+vm_state.vm_map: 23329.208074791 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3070939136, end = 3070943232, flags = 135266419, pgoff = 94208, inode = 22669 }
+vm_state.vm_map: 23329.208076895 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3070943232, end = 3071090688, flags = 134217845, pgoff = 0, inode = 22796 }
+vm_state.vm_map: 23329.208078844 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3071090688, end = 3071094784, flags = 135266419, pgoff = 147456, inode = 22796 }
+vm_state.vm_map: 23329.208080892 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3071094784, end = 3071197184, flags = 134217845, pgoff = 0, inode = 21552 }
+vm_state.vm_map: 23329.208082817 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3071197184, end = 3071205376, flags = 135266419, pgoff = 98304, inode = 21552 }
+vm_state.vm_map: 23329.208084877 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3071205376, end = 3071803392, flags = 134217845, pgoff = 0, inode = 22668 }
+vm_state.vm_map: 23329.208086814 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3071803392, end = 3071815680, flags = 135266419, pgoff = 593920, inode = 22668 }
+vm_state.vm_map: 23329.208088880 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3071815680, end = 3075715072, flags = 134217845, pgoff = 0, inode = 21427 }
+vm_state.vm_map: 23329.208090816 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3075715072, end = 3075739648, flags = 135266419, pgoff = 3895296, inode = 21427 }
+vm_state.vm_map: 23329.208092748 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3075739648, end = 3075747840, flags = 1048691, pgoff = 3075739648, inode = 0 }
+vm_state.vm_map: 23329.208094919 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3075747840, end = 3075756032, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.208096855 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3075756032, end = 3075760128, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.208098793 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3075760128, end = 3075764224, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.208100854 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3075764224, end = 3075850240, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.208103185 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3075850240, end = 3075854336, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.208105214 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3075854336, end = 3075858432, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.208107163 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3075858432, end = 3075866624, flags = 1048691, pgoff = 3075858432, inode = 0 }
+vm_state.vm_map: 23329.208109335 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3075866624, end = 3076067328, flags = 134217845, pgoff = 0, inode = 21333 }
+vm_state.vm_map: 23329.208111321 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3076067328, end = 3076071424, flags = 135266419, pgoff = 200704, inode = 21333 }
+vm_state.vm_map: 23329.208113264 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3076071424, end = 3076079616, flags = 1048691, pgoff = 3076071424, inode = 0 }
+vm_state.vm_map: 23329.208115404 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3076079616, end = 3076091904, flags = 134217845, pgoff = 0, inode = 21332 }
+vm_state.vm_map: 23329.208117415 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3076091904, end = 3076096000, flags = 135266419, pgoff = 8192, inode = 21332 }
+vm_state.vm_map: 23329.208119519 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3076096000, end = 3076104192, flags = 134217845, pgoff = 0, inode = 21334 }
+vm_state.vm_map: 23329.208121635 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3076104192, end = 3076108288, flags = 135266419, pgoff = 4096, inode = 21334 }
+vm_state.vm_map: 23329.208123750 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3076108288, end = 3076116480, flags = 134217845, pgoff = 0, inode = 1450327 }
+vm_state.vm_map: 23329.208125835 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3076116480, end = 3076120576, flags = 135266417, pgoff = 4096, inode = 1450327 }
+vm_state.vm_map: 23329.208127896 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3076120576, end = 3076124672, flags = 135266419, pgoff = 8192, inode = 1450327 }
+vm_state.vm_map: 23329.208129975 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3076124672, end = 3076153344, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.208132029 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3076153344, end = 3076202496, flags = 134217841, pgoff = 0, inode = 74519 }
+vm_state.vm_map: 23329.208137784 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3076202496, end = 3076845568, flags = 134217845, pgoff = 0, inode = 231127 }
+vm_state.vm_map: 23329.208139838 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3076845568, end = 3076878336, flags = 135266419, pgoff = 638976, inode = 231127 }
+vm_state.vm_map: 23329.208141929 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3076878336, end = 3076882432, flags = 1048691, pgoff = 3076878336, inode = 0 }
+vm_state.vm_map: 23329.208144304 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3076882432, end = 3076894720, flags = 134217845, pgoff = 0, inode = 229423 }
+vm_state.vm_map: 23329.208146290 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3076894720, end = 3076898816, flags = 135266419, pgoff = 8192, inode = 229423 }
+vm_state.vm_map: 23329.208151583 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3076898816, end = 3077607424, flags = 134217845, pgoff = 0, inode = 231131 }
+vm_state.vm_map: 23329.208153631 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3077607424, end = 3077627904, flags = 135266419, pgoff = 704512, inode = 231131 }
+vm_state.vm_map: 23329.208155617 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3077627904, end = 3077636096, flags = 1048691, pgoff = 3077627904, inode = 0 }
+vm_state.vm_map: 23329.208157554 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3077636096, end = 3077640192, flags = 67371125, pgoff = 3077636096, inode = 0 }
+vm_state.vm_map: 23329.208159874 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3077640192, end = 3077754880, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.208161885 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3077754880, end = 3077758976, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.208163834 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3077758976, end = 3077763072, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.208165770 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 5069, start = 3213340672, end = 3213549568, flags = 1048947, pgoff = 3221016576, inode = 0 }
+vm_state.vm_map: 23329.208168651 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 134512640, end = 135303168, flags = 134223989, pgoff = 0, inode = 1048715 }
+vm_state.vm_map: 23329.208170595 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 135303168, end = 135323648, flags = 135272563, pgoff = 790528, inode = 1048715 }
+vm_state.vm_map: 23329.208172982 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 135323648, end = 135344128, flags = 1048691, pgoff = 135323648, inode = 0 }
+vm_state.vm_map: 23329.208175054 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 149463040, end = 149745664, flags = 1048691, pgoff = 149463040, inode = 0 }
+vm_state.vm_map: 23329.208177256 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3075342336, end = 3075383296, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.208179193 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3075383296, end = 3075387392, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.208181131 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3075387392, end = 3075391488, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.208183239 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3075391488, end = 3075428352, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.208185176 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3075428352, end = 3075432448, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.208187107 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3075432448, end = 3075436544, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.208189303 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3075436544, end = 3075514368, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.208191240 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3075514368, end = 3075518464, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.208193171 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3075518464, end = 3075522560, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.208195114 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3075522560, end = 3075530752, flags = 1048691, pgoff = 3075522560, inode = 0 }
+vm_state.vm_map: 23329.208197230 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3075530752, end = 3075555328, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.208199222 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3075555328, end = 3075559424, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.208201159 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3075559424, end = 3075563520, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.208203275 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3075563520, end = 3076894720, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.208205662 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3076894720, end = 3076898816, flags = 1048691, pgoff = 3076894720, inode = 0 }
+vm_state.vm_map: 23329.208207735 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3076898816, end = 3078213632, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.208209826 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3078213632, end = 3078221824, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.208211899 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3078221824, end = 3078225920, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.208213959 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3078225920, end = 3078242304, flags = 1048691, pgoff = 3078225920, inode = 0 }
+vm_state.vm_map: 23329.208216174 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3078242304, end = 3078250496, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.208218104 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3078250496, end = 3078254592, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.208220035 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3078254592, end = 3078258688, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.208222200 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3078258688, end = 3078475776, flags = 134217845, pgoff = 0, inode = 499784 }
+vm_state.vm_map: 23329.208224242 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3078475776, end = 3078488064, flags = 135266419, pgoff = 217088, inode = 499784 }
+vm_state.vm_map: 23329.208226383 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3078553600, end = 3078582272, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.208228332 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3078582272, end = 3078590464, flags = 1048691, pgoff = 3078582272, inode = 0 }
+vm_state.vm_map: 23329.208230263 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3078590464, end = 3078594560, flags = 67371125, pgoff = 3078590464, inode = 0 }
+vm_state.vm_map: 23329.208232335 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3078594560, end = 3078709248, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.208234389 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3078709248, end = 3078713344, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.208236511 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3078713344, end = 3078717440, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.208238996 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16884, start = 3219709952, end = 3219795968, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.208242087 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 134512640, end = 134541312, flags = 134223989, pgoff = 0, inode = 1048590 }
+vm_state.vm_map: 23329.208244333 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 134541312, end = 134545408, flags = 135272563, pgoff = 24576, inode = 1048590 }
+vm_state.vm_map: 23329.208246423 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 134545408, end = 134561792, flags = 1048691, pgoff = 134545408, inode = 0 }
+vm_state.vm_map: 23329.208248367 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 165720064, end = 165855232, flags = 1048691, pgoff = 165720064, inode = 0 }
+vm_state.vm_map: 23329.208250656 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3073937408, end = 3073966080, flags = 134217845, pgoff = 0, inode = 508362 }
+vm_state.vm_map: 23329.208252661 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3073966080, end = 3073970176, flags = 135266417, pgoff = 24576, inode = 508362 }
+vm_state.vm_map: 23329.208254708 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3073970176, end = 3073974272, flags = 135266419, pgoff = 28672, inode = 508362 }
+vm_state.vm_map: 23329.208256873 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3073974272, end = 3074060288, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.208258965 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074060288, end = 3074064384, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.208260907 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074064384, end = 3074068480, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.208263017 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074068480, end = 3074076672, flags = 1048691, pgoff = 3074068480, inode = 0 }
+vm_state.vm_map: 23329.208265164 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074076672, end = 3074301952, flags = 134217845, pgoff = 0, inode = 499985 }
+vm_state.vm_map: 23329.208267236 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074301952, end = 3074306048, flags = 135266417, pgoff = 225280, inode = 499985 }
+vm_state.vm_map: 23329.208269358 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074306048, end = 3074310144, flags = 135266419, pgoff = 229376, inode = 499985 }
+vm_state.vm_map: 23329.208271493 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074310144, end = 3074347008, flags = 134217845, pgoff = 0, inode = 508391 }
+vm_state.vm_map: 23329.208273917 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074347008, end = 3074351104, flags = 135266417, pgoff = 32768, inode = 508391 }
+vm_state.vm_map: 23329.208276033 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074351104, end = 3074355200, flags = 135266419, pgoff = 36864, inode = 508391 }
+vm_state.vm_map: 23329.208278136 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074355200, end = 3074514944, flags = 1048691, pgoff = 3074355200, inode = 0 }
+vm_state.vm_map: 23329.208280437 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074514944, end = 3074564096, flags = 134217845, pgoff = 0, inode = 500088 }
+vm_state.vm_map: 23329.208282676 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074564096, end = 3074568192, flags = 135266419, pgoff = 45056, inode = 500088 }
+vm_state.vm_map: 23329.208284996 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074568192, end = 3074617344, flags = 1048691, pgoff = 3074568192, inode = 0 }
+vm_state.vm_map: 23329.208287278 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074617344, end = 3074715648, flags = 134217845, pgoff = 0, inode = 499877 }
+vm_state.vm_map: 23329.208289455 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074715648, end = 3074719744, flags = 135266417, pgoff = 94208, inode = 499877 }
+vm_state.vm_map: 23329.208291473 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074719744, end = 3074723840, flags = 135266419, pgoff = 98304, inode = 499877 }
+vm_state.vm_map: 23329.208294076 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074777088, end = 3074813952, flags = 134217845, pgoff = 0, inode = 499730 }
+vm_state.vm_map: 23329.208296235 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074813952, end = 3074818048, flags = 135266419, pgoff = 32768, inode = 499730 }
+vm_state.vm_map: 23329.208298536 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074818048, end = 3074859008, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.208300590 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074859008, end = 3074863104, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.208302736 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074863104, end = 3074867200, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.208305050 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074867200, end = 3074904064, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.208307233 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074904064, end = 3074908160, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.208309682 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074908160, end = 3074912256, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.208311915 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074912256, end = 3074990080, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.208313882 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074990080, end = 3074994176, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.208315993 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074994176, end = 3074998272, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.208318306 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3074998272, end = 3075006464, flags = 1048691, pgoff = 3074998272, inode = 0 }
+vm_state.vm_map: 23329.208320545 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3075006464, end = 3075031040, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.208322580 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3075031040, end = 3075035136, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.208344460 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3075035136, end = 3075039232, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.208347026 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3075039232, end = 3076370432, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.208349105 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3076370432, end = 3076374528, flags = 1048691, pgoff = 3076370432, inode = 0 }
+vm_state.vm_map: 23329.208351486 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3076374528, end = 3076382720, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.208353744 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3076382720, end = 3076386816, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.208355946 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3076386816, end = 3076390912, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.208358278 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3076390912, end = 3077705728, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.208360455 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3077705728, end = 3077713920, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.208362571 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3077713920, end = 3077718016, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.208365045 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3077718016, end = 3077734400, flags = 1048691, pgoff = 3077718016, inode = 0 }
+vm_state.vm_map: 23329.208367530 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3077734400, end = 3077742592, flags = 134217845, pgoff = 0, inode = 499739 }
+vm_state.vm_map: 23329.208369659 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3077742592, end = 3077746688, flags = 135266419, pgoff = 4096, inode = 499739 }
+vm_state.vm_map: 23329.208372046 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3077746688, end = 3077787648, flags = 134217845, pgoff = 0, inode = 499738 }
+vm_state.vm_map: 23329.208374094 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3077787648, end = 3077791744, flags = 135266419, pgoff = 40960, inode = 499738 }
+vm_state.vm_map: 23329.208376549 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3077799936, end = 3077808128, flags = 134217845, pgoff = 0, inode = 17167 }
+vm_state.vm_map: 23329.208378670 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3077808128, end = 3077812224, flags = 135266419, pgoff = 8192, inode = 17167 }
+vm_state.vm_map: 23329.208381095 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3077812224, end = 3077820416, flags = 134217845, pgoff = 0, inode = 499908 }
+vm_state.vm_map: 23329.208383074 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3077820416, end = 3077824512, flags = 135266419, pgoff = 4096, inode = 499908 }
+vm_state.vm_map: 23329.208385598 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3077824512, end = 3077828608, flags = 134217845, pgoff = 0, inode = 500082 }
+vm_state.vm_map: 23329.208387708 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3077828608, end = 3077832704, flags = 135266419, pgoff = 0, inode = 500082 }
+vm_state.vm_map: 23329.208390076 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3077832704, end = 3077836800, flags = 134217845, pgoff = 0, inode = 499797 }
+vm_state.vm_map: 23329.208392279 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3077836800, end = 3077840896, flags = 135266419, pgoff = 0, inode = 499797 }
+vm_state.vm_map: 23329.208394672 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3077844992, end = 3077853184, flags = 134217845, pgoff = 0, inode = 500086 }
+vm_state.vm_map: 23329.208396955 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3077853184, end = 3077857280, flags = 135266419, pgoff = 4096, inode = 500086 }
+vm_state.vm_map: 23329.208399329 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3077857280, end = 3077869568, flags = 134217845, pgoff = 0, inode = 500089 }
+vm_state.vm_map: 23329.208401648 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3077869568, end = 3077873664, flags = 135266419, pgoff = 8192, inode = 500089 }
+vm_state.vm_map: 23329.208404331 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3077873664, end = 3077877760, flags = 134217845, pgoff = 0, inode = 499772 }
+vm_state.vm_map: 23329.208406330 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3077877760, end = 3077881856, flags = 135266419, pgoff = 0, inode = 499772 }
+vm_state.vm_map: 23329.208408483 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3077885952, end = 3077894144, flags = 1048691, pgoff = 3077885952, inode = 0 }
+vm_state.vm_map: 23329.208410592 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3077894144, end = 3077898240, flags = 67371125, pgoff = 3077894144, inode = 0 }
+vm_state.vm_map: 23329.208412807 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3077898240, end = 3078012928, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.208414781 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3078012928, end = 3078017024, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.208416971 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3078017024, end = 3078021120, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.208418939 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16900, start = 3220688896, end = 3220774912, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.208421665 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 134512640, end = 135303168, flags = 134223989, pgoff = 0, inode = 1048715 }
+vm_state.vm_map: 23329.208423787 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 135303168, end = 135323648, flags = 135272563, pgoff = 790528, inode = 1048715 }
+vm_state.vm_map: 23329.208425792 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 135323648, end = 135344128, flags = 1048691, pgoff = 135323648, inode = 0 }
+vm_state.vm_map: 23329.208427889 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 153083904, end = 153329664, flags = 1048691, pgoff = 153083904, inode = 0 }
+vm_state.vm_map: 23329.208430209 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3075641344, end = 3075682304, flags = 134217845, pgoff = 0, inode = 507911 }
+vm_state.vm_map: 23329.208432312 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3075682304, end = 3075686400, flags = 135266417, pgoff = 36864, inode = 507911 }
+vm_state.vm_map: 23329.208434323 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3075686400, end = 3075690496, flags = 135266419, pgoff = 40960, inode = 507911 }
+vm_state.vm_map: 23329.208437000 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3075690496, end = 3075727360, flags = 134217845, pgoff = 0, inode = 508389 }
+vm_state.vm_map: 23329.208439085 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3075727360, end = 3075731456, flags = 135266417, pgoff = 32768, inode = 508389 }
+vm_state.vm_map: 23329.208441053 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3075731456, end = 3075735552, flags = 135266419, pgoff = 36864, inode = 508389 }
+vm_state.vm_map: 23329.208443348 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3075735552, end = 3075813376, flags = 134217845, pgoff = 0, inode = 508435 }
+vm_state.vm_map: 23329.208445340 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3075813376, end = 3075817472, flags = 135266417, pgoff = 73728, inode = 508435 }
+vm_state.vm_map: 23329.208447370 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3075817472, end = 3075821568, flags = 135266419, pgoff = 77824, inode = 508435 }
+vm_state.vm_map: 23329.208449479 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3075821568, end = 3075829760, flags = 1048691, pgoff = 3075821568, inode = 0 }
+vm_state.vm_map: 23329.208451577 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3075829760, end = 3075854336, flags = 134217845, pgoff = 0, inode = 508366 }
+vm_state.vm_map: 23329.208453538 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3075854336, end = 3075858432, flags = 135266417, pgoff = 24576, inode = 508366 }
+vm_state.vm_map: 23329.208455722 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3075858432, end = 3075862528, flags = 135266419, pgoff = 28672, inode = 508366 }
+vm_state.vm_map: 23329.208457825 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3075862528, end = 3077193728, flags = 134217841, pgoff = 0, inode = 32876 }
+vm_state.vm_map: 23329.208459879 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3077193728, end = 3077197824, flags = 1048691, pgoff = 3077193728, inode = 0 }
+vm_state.vm_map: 23329.208461939 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3077197824, end = 3078512640, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.208464018 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3078512640, end = 3078520832, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.208465955 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3078520832, end = 3078524928, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.208467942 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3078524928, end = 3078541312, flags = 1048691, pgoff = 3078524928, inode = 0 }
+vm_state.vm_map: 23329.208470433 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3078541312, end = 3078549504, flags = 134217845, pgoff = 0, inode = 508385 }
+vm_state.vm_map: 23329.208472611 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3078549504, end = 3078553600, flags = 135266417, pgoff = 4096, inode = 508385 }
+vm_state.vm_map: 23329.208474629 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3078553600, end = 3078557696, flags = 135266419, pgoff = 8192, inode = 508385 }
+vm_state.vm_map: 23329.208476959 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3078557696, end = 3078774784, flags = 134217845, pgoff = 0, inode = 499784 }
+vm_state.vm_map: 23329.208479007 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3078774784, end = 3078787072, flags = 135266419, pgoff = 217088, inode = 499784 }
+vm_state.vm_map: 23329.208481105 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3078852608, end = 3078881280, flags = 134217937, pgoff = 0, inode = 1450218 }
+vm_state.vm_map: 23329.208483091 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3078881280, end = 3078889472, flags = 1048691, pgoff = 3078881280, inode = 0 }
+vm_state.vm_map: 23329.208485114 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3078889472, end = 3078893568, flags = 67371125, pgoff = 3078889472, inode = 0 }
+vm_state.vm_map: 23329.208487390 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3078893568, end = 3079008256, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.208489438 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3079008256, end = 3079012352, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.208491659 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3079012352, end = 3079016448, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.208493695 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16908, start = 3218653184, end = 3218739200, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.208496502 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16927, start = 134512640, end = 134529024, flags = 134223989, pgoff = 0, inode = 32921 }
+vm_state.vm_map: 23329.208498531 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16927, start = 134529024, end = 134533120, flags = 135272563, pgoff = 12288, inode = 32921 }
+vm_state.vm_map: 23329.208500628 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16927, start = 134533120, end = 134537216, flags = 1048691, pgoff = 134533120, inode = 0 }
+vm_state.vm_map: 23329.208502787 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16927, start = 160788480, end = 160923648, flags = 1048691, pgoff = 160788480, inode = 0 }
+vm_state.vm_map: 23329.208505131 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16927, start = 3076546560, end = 3076554752, flags = 1048691, pgoff = 3076546560, inode = 0 }
+vm_state.vm_map: 23329.208507358 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16927, start = 3076554752, end = 3077869568, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.208509425 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16927, start = 3077869568, end = 3077877760, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.208511707 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16927, start = 3077877760, end = 3077881856, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.208513638 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16927, start = 3077881856, end = 3077894144, flags = 1048691, pgoff = 3077881856, inode = 0 }
+vm_state.vm_map: 23329.208516068 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16927, start = 3077894144, end = 3077906432, flags = 134217845, pgoff = 0, inode = 32917 }
+vm_state.vm_map: 23329.208518135 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16927, start = 3077906432, end = 3077910528, flags = 135266419, pgoff = 8192, inode = 32917 }
+vm_state.vm_map: 23329.208520066 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16927, start = 3077910528, end = 3077914624, flags = 1048691, pgoff = 3077910528, inode = 0 }
+vm_state.vm_map: 23329.208522003 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16927, start = 3078000640, end = 3078017024, flags = 1048691, pgoff = 3078000640, inode = 0 }
+vm_state.vm_map: 23329.208523983 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16927, start = 3078017024, end = 3078021120, flags = 67371125, pgoff = 3078017024, inode = 0 }
+vm_state.vm_map: 23329.208526376 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16927, start = 3078021120, end = 3078135808, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.208528344 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16927, start = 3078135808, end = 3078139904, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.208530398 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16927, start = 3078139904, end = 3078144000, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.208532322 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16927, start = 3217395712, end = 3217481728, flags = 1048947, pgoff = 3221139456, inode = 0 }
+vm_state.vm_map: 23329.208535246 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16929, start = 134512640, end = 134529024, flags = 134223989, pgoff = 0, inode = 33221 }
+vm_state.vm_map: 23329.208537176 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16929, start = 134529024, end = 134533120, flags = 135272563, pgoff = 12288, inode = 33221 }
+vm_state.vm_map: 23329.208539540 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16929, start = 142438400, end = 142606336, flags = 1048691, pgoff = 142438400, inode = 0 }
+vm_state.vm_map: 23329.208541606 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16929, start = 3068817408, end = 3068821504, flags = 1048688, pgoff = 3068817408, inode = 0 }
+vm_state.vm_map: 23329.208543667 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16929, start = 3068821504, end = 3077218304, flags = 1048691, pgoff = 3068821504, inode = 0 }
+vm_state.vm_map: 23329.208545763 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16929, start = 3077218304, end = 3078533120, flags = 134217845, pgoff = 0, inode = 508370 }
+vm_state.vm_map: 23329.208547725 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16929, start = 3078533120, end = 3078541312, flags = 135266417, pgoff = 1314816, inode = 508370 }
+vm_state.vm_map: 23329.208549804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16929, start = 3078541312, end = 3078545408, flags = 135266419, pgoff = 1323008, inode = 508370 }
+vm_state.vm_map: 23329.208551865 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16929, start = 3078545408, end = 3078557696, flags = 1048691, pgoff = 3078545408, inode = 0 }
+vm_state.vm_map: 23329.208553949 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16929, start = 3078557696, end = 3078643712, flags = 134217845, pgoff = 0, inode = 508360 }
+vm_state.vm_map: 23329.208555935 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16929, start = 3078643712, end = 3078647808, flags = 135266417, pgoff = 81920, inode = 508360 }
+vm_state.vm_map: 23329.208557915 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16929, start = 3078647808, end = 3078651904, flags = 135266419, pgoff = 86016, inode = 508360 }
+vm_state.vm_map: 23329.208559982 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16929, start = 3078651904, end = 3078660096, flags = 1048691, pgoff = 3078651904, inode = 0 }
+vm_state.vm_map: 23329.208562017 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16929, start = 3078750208, end = 3078762496, flags = 1048691, pgoff = 3078750208, inode = 0 }
+vm_state.vm_map: 23329.208564108 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16929, start = 3078762496, end = 3078766592, flags = 67371125, pgoff = 3078762496, inode = 0 }
+vm_state.vm_map: 23329.208566261 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16929, start = 3078766592, end = 3078881280, flags = 134219893, pgoff = 0, inode = 499899 }
+vm_state.vm_map: 23329.208568488 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16929, start = 3078881280, end = 3078885376, flags = 135268465, pgoff = 110592, inode = 499899 }
+vm_state.vm_map: 23329.208570592 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16929, start = 3078885376, end = 3078889472, flags = 135268467, pgoff = 114688, inode = 499899 }
+vm_state.vm_map: 23329.208572929 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { pid = 16929, start = 3212763136, end = 3212849152, flags = 1048947, pgoff = 3221139456, inode = 0 }
+irq_state.interrupt: 23329.208617941 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "timer", irq_id = 0 }
+irq_state.interrupt: 23329.208687010 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "i8042", irq_id = 1 }
+irq_state.interrupt: 23329.208695701 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "floppy", irq_id = 6 }
+irq_state.interrupt: 23329.208702758 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "rtc0", irq_id = 8 }
+irq_state.interrupt: 23329.208706582 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "acpi", irq_id = 9 }
+irq_state.interrupt: 23329.208710339 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "i8042", irq_id = 12 }
+irq_state.interrupt: 23329.208714219 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "ide0", irq_id = 14 }
+irq_state.interrupt: 23329.208721005 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "ide1", irq_id = 15 }
+irq_state.interrupt: 23329.208727957 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "ehci_hcd:usb1", irq_id = 19 }
+irq_state.interrupt: 23329.208731713 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "eth0", irq_id = 19 }
+irq_state.interrupt: 23329.208738092 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "vboxguest", irq_id = 20 }
+irq_state.interrupt: 23329.208741996 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "ahci", irq_id = 21 }
+irq_state.interrupt: 23329.208748899 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "Intel 82801AA-ICH", irq_id = 21 }
+irq_state.interrupt: 23329.208755025 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "IO-APIC", action = "ohci_hcd:usb2", irq_id = 22 }
+netif_state.network_ipv4_interface: 23329.208796951 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/netif_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "lo", address = 2130706433, up = 0 }
+netif_state.network_ipv4_interface: 23329.208800406 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/netif_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { name = "eth0", address = 167772687, up = 0 }
+swap_state.statedump_swap_files: 23329.208806248 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/swap_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { filp = 0xf7101940, vfsmount = 0xf700eec0, dname = "hda1" }
+syscall_state.sys_call_table: 23329.208849106 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 0, address = 0xc10358fe, symbol = "sys_restart_syscall+0x0/0xf" }
+syscall_state.sys_call_table: 23329.208858550 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 1, address = 0xc102d16d, symbol = "sys_exit+0x0/0x11" }
+syscall_state.sys_call_table: 23329.208864910 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 2, address = 0xc1003448, symbol = "ptregs_fork+0x0/0xc" }
+syscall_state.sys_call_table: 23329.208876828 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 3, address = 0xc10ac4c3, symbol = "sys_read+0x0/0x9d" }
+syscall_state.sys_call_table: 23329.208879702 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 4, address = 0xc10ac29b, symbol = "sys_write+0x0/0x9d" }
+syscall_state.sys_call_table: 23329.208882756 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 5, address = 0xc10aa0ec, symbol = "sys_open+0x0/0x23" }
+syscall_state.sys_call_table: 23329.208885939 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 6, address = 0xc10a9ea9, symbol = "sys_close+0x0/0x112" }
+syscall_state.sys_call_table: 23329.208888678 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 7, address = 0xc102c96e, symbol = "sys_waitpid+0x0/0x17" }
+syscall_state.sys_call_table: 23329.208891453 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 8, address = 0xc10aa10f, symbol = "sys_creat+0x0/0x16" }
+syscall_state.sys_call_table: 23329.208900466 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 9, address = 0xc10b5ccb, symbol = "sys_link+0x0/0x19" }
+syscall_state.sys_call_table: 23329.208903309 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 10, address = 0xc10b5760, symbol = "sys_unlink+0x0/0xe" }
+syscall_state.sys_call_table: 23329.208906109 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 11, address = 0xc100346c, symbol = "ptregs_execve+0x0/0xc" }
+syscall_state.sys_call_table: 23329.208908954 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 12, address = 0xc10aa8e8, symbol = "sys_chdir+0x0/0x59" }
+syscall_state.sys_call_table: 23329.208912001 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 13, address = 0xc102de69, symbol = "sys_time+0x0/0x27" }
+syscall_state.sys_call_table: 23329.208914955 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 14, address = 0xc10b5ab2, symbol = "sys_mknod+0x0/0x17" }
+syscall_state.sys_call_table: 23329.208917724 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 15, address = 0xc10aa805, symbol = "sys_chmod+0x0/0x15" }
+syscall_state.sys_call_table: 23329.208923671 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 16, address = 0xc104e167, symbol = "sys_lchown16+0x0/0x35" }
+syscall_state.sys_call_table: 23329.208927286 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 17, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 23329.208930068 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 18, address = 0xc10af0b2, symbol = "sys_stat+0x0/0x23" }
+syscall_state.sys_call_table: 23329.208933226 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 19, address = 0xc10ab3fb, symbol = "sys_lseek+0x0/0x9b" }
+syscall_state.sys_call_table: 23329.208936280 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 20, address = 0xc103529a, symbol = "sys_getpid+0x0/0x16" }
+syscall_state.sys_call_table: 23329.208941751 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 21, address = 0xc10c0a14, symbol = "sys_mount+0x0/0x98" }
+syscall_state.sys_call_table: 23329.208945372 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 22, address = 0xc10bf90c, symbol = "sys_oldumount+0x0/0xe" }
+syscall_state.sys_call_table: 23329.208947907 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 23, address = 0xc104e09e, symbol = "sys_setuid16+0x0/0x1d" }
+syscall_state.sys_call_table: 23329.208950424 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 24, address = 0xc104dea0, symbol = "sys_getuid16+0x0/0x22" }
+syscall_state.sys_call_table: 23329.208953225 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 25, address = 0xc102dc82, symbol = "sys_stime+0x0/0x3f" }
+syscall_state.sys_call_table: 23329.208955957 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 26, address = 0xc1031d71, symbol = "sys_ptrace+0x0/0xae" }
+syscall_state.sys_call_table: 23329.208958857 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 27, address = 0xc10352b0, symbol = "sys_alarm+0x0/0x9" }
+syscall_state.sys_call_table: 23329.208961472 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 28, address = 0xc10af14c, symbol = "sys_fstat+0x0/0x24" }
+syscall_state.sys_call_table: 23329.208964260 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 29, address = 0xc1035a45, symbol = "sys_pause+0x0/0x16" }
+syscall_state.sys_call_table: 23329.208967689 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 30, address = 0xc10c741f, symbol = "sys_utime+0x0/0x5d" }
+syscall_state.sys_call_table: 23329.208970811 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 31, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 23329.208973575 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 32, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 23329.208976425 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 33, address = 0xc10aaa87, symbol = "sys_access+0x0/0x13" }
+syscall_state.sys_call_table: 23329.208983616 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 34, address = 0xc1026f47, symbol = "sys_nice+0x0/0x7c" }
+syscall_state.sys_call_table: 23329.208986392 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 35, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 23329.208989304 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 36, address = 0xc10c70f9, symbol = "sys_sync+0x0/0x29" }
+syscall_state.sys_call_table: 23329.208992291 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 37, address = 0xc1037e1c, symbol = "sys_kill+0x0/0x14c" }
+syscall_state.sys_call_table: 23329.208995201 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 38, address = 0xc10b5650, symbol = "sys_rename+0x0/0x15" }
+syscall_state.sys_call_table: 23329.208998026 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 39, address = 0xc10b590c, symbol = "sys_mkdir+0x0/0x13" }
+syscall_state.sys_call_table: 23329.209000907 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 40, address = 0xc10b5849, symbol = "sys_rmdir+0x0/0xe" }
+syscall_state.sys_call_table: 23329.209003843 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 41, address = 0xc10b6808, symbol = "sys_dup+0x0/0x36" }
+syscall_state.sys_call_table: 23329.209006539 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 42, address = 0xc10b1dac, symbol = "sys_pipe+0x0/0xe" }
+syscall_state.sys_call_table: 23329.209009117 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 43, address = 0xc10394a7, symbol = "sys_times+0x0/0x3f" }
+syscall_state.sys_call_table: 23329.209011980 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 44, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 23329.209018241 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 45, address = 0xc109c43a, symbol = "sys_brk+0x0/0xd3" }
+syscall_state.sys_call_table: 23329.209020758 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 46, address = 0xc104e0e8, symbol = "sys_setgid16+0x0/0x1d" }
+syscall_state.sys_call_table: 23329.209023213 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 47, address = 0xc104dee4, symbol = "sys_getgid16+0x0/0x22" }
+syscall_state.sys_call_table: 23329.209026032 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 48, address = 0xc10362d2, symbol = "sys_signal+0x0/0x3c" }
+syscall_state.sys_call_table: 23329.209028524 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 49, address = 0xc104dec2, symbol = "sys_geteuid16+0x0/0x22" }
+syscall_state.sys_call_table: 23329.209031059 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 50, address = 0xc104df06, symbol = "sys_getegid16+0x0/0x22" }
+syscall_state.sys_call_table: 23329.209036734 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 51, address = 0xc1057e28, symbol = "sys_acct+0x0/0x238" }
+syscall_state.sys_call_table: 23329.209039788 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 52, address = 0xc10bf635, symbol = "sys_umount+0x0/0x2d7" }
+syscall_state.sys_call_table: 23329.209042638 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 53, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 23329.209045086 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 54, address = 0xc10b709b, symbol = "sys_ioctl+0x0/0x9d" }
+syscall_state.sys_call_table: 23329.209047955 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 55, address = 0xc10b67b5, symbol = "sys_fcntl+0x0/0x53" }
+syscall_state.sys_call_table: 23329.209050657 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 56, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 23329.209053322 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 57, address = 0xc103929e, symbol = "sys_setpgid+0x0/0x175" }
+syscall_state.sys_call_table: 23329.209056183 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 58, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 23329.209059675 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 59, address = 0xc1006380, symbol = "sys_olduname+0x0/0x11d" }
+syscall_state.sys_call_table: 23329.209062340 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 60, address = 0xc10387e4, symbol = "sys_umask+0x0/0x19" }
+syscall_state.sys_call_table: 23329.209065189 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 61, address = 0xc10aa81a, symbol = "sys_chroot+0x0/0x6c" }
+syscall_state.sys_call_table: 23329.209067559 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 62, address = 0xc10ad850, symbol = "sys_ustat+0x0/0x89" }
+syscall_state.sys_call_table: 23329.209070846 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 63, address = 0xc10b6978, symbol = "sys_dup2+0x0/0x5c" }
+syscall_state.sys_call_table: 23329.209073905 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 64, address = 0xc1035249, symbol = "sys_getppid+0x0/0x51" }
+syscall_state.sys_call_table: 23329.209076502 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 65, address = 0xc1039295, symbol = "sys_getpgrp+0x0/0x9" }
+syscall_state.sys_call_table: 23329.209079179 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 66, address = 0xc103911e, symbol = "sys_setsid+0x0/0xa1" }
+syscall_state.sys_call_table: 23329.209081986 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 67, address = 0xc1002f1f, symbol = "sys_sigaction+0x0/0xe7" }
+syscall_state.sys_call_table: 23329.209084935 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 68, address = 0xc1035a36, symbol = "sys_sgetmask+0x0/0xf" }
+syscall_state.sys_call_table: 23329.209087908 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 69, address = 0xc1035ca8, symbol = "sys_ssetmask+0x0/0x6b" }
+syscall_state.sys_call_table: 23329.209090462 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 70, address = 0xc104e0bb, symbol = "sys_setreuid16+0x0/0x2d" }
+syscall_state.sys_call_table: 23329.209092948 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 71, address = 0xc104e105, symbol = "sys_setregid16+0x0/0x2d" }
+syscall_state.sys_call_table: 23329.209095576 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 72, address = 0xc1003006, symbol = "sys_sigsuspend+0x0/0xba" }
+syscall_state.sys_call_table: 23329.209098691 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 73, address = 0xc1035fe8, symbol = "sys_sigpending+0x0/0xe" }
+syscall_state.sys_call_table: 23329.209101294 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 74, address = 0xc1038fda, symbol = "sys_sethostname+0x0/0xa5" }
+syscall_state.sys_call_table: 23329.209103885 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 75, address = 0xc1038d61, symbol = "sys_setrlimit+0x0/0xe4" }
+syscall_state.sys_call_table: 23329.209106556 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 76, address = 0xc1038e45, symbol = "sys_old_getrlimit+0x0/0x81" }
+syscall_state.sys_call_table: 23329.209109116 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 77, address = 0xc1038cf2, symbol = "sys_getrusage+0x0/0x25" }
+syscall_state.sys_call_table: 23329.209111972 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 78, address = 0xc102de16, symbol = "sys_gettimeofday+0x0/0x53" }
+syscall_state.sys_call_table: 23329.209115118 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 79, address = 0xc102dda2, symbol = "sys_settimeofday+0x0/0x74" }
+syscall_state.sys_call_table: 23329.209117832 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 80, address = 0xc104de0a, symbol = "sys_getgroups16+0x0/0x96" }
+syscall_state.sys_call_table: 23329.209120360 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 81, address = 0xc104df28, symbol = "sys_setgroups16+0x0/0xba" }
+syscall_state.sys_call_table: 23329.209123377 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 82, address = 0xc10066a7, symbol = "old_select+0x0/0x40" }
+syscall_state.sys_call_table: 23329.209126301 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 83, address = 0xc10b5b76, symbol = "sys_symlink+0x0/0x13" }
+syscall_state.sys_call_table: 23329.209128929 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 84, address = 0xc10af037, symbol = "sys_lstat+0x0/0x23" }
+syscall_state.sys_call_table: 23329.209131471 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 85, address = 0xc10aedc9, symbol = "sys_readlink+0x0/0x17" }
+syscall_state.sys_call_table: 23329.209134073 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 86, address = 0xc10b13e1, symbol = "sys_uselib+0x0/0x13f" }
+syscall_state.sys_call_table: 23329.209136911 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 87, address = 0xc10a285b, symbol = "sys_swapon+0x0/0xb3f" }
+syscall_state.sys_call_table: 23329.209139687 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 88, address = 0xc1039d01, symbol = "sys_reboot+0x0/0x15c" }
+syscall_state.sys_call_table: 23329.209142221 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 89, address = 0xc10b788f, symbol = "sys_old_readdir+0x0/0x51" }
+syscall_state.sys_call_table: 23329.209145213 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 90, address = 0xc100675d, symbol = "old_mmap+0x0/0x57" }
+syscall_state.sys_call_table: 23329.209148045 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 91, address = 0xc109bdc6, symbol = "sys_munmap+0x0/0x3d" }
+syscall_state.sys_call_table: 23329.209150851 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 92, address = 0xc10aafba, symbol = "sys_truncate+0x0/0x12" }
+syscall_state.sys_call_table: 23329.209153812 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 93, address = 0xc10aadb3, symbol = "sys_ftruncate+0x0/0x1b" }
+syscall_state.sys_call_table: 23329.209156570 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 94, address = 0xc10aa595, symbol = "sys_fchmod+0x0/0xbc" }
+syscall_state.sys_call_table: 23329.209159339 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 95, address = 0xc104e132, symbol = "sys_fchown16+0x0/0x35" }
+syscall_state.sys_call_table: 23329.209162078 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 96, address = 0xc1039e62, symbol = "sys_getpriority+0x0/0x1ab" }
+syscall_state.sys_call_table: 23329.209164762 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 97, address = 0xc103a08c, symbol = "sys_setpriority+0x0/0x1cc" }
+syscall_state.sys_call_table: 23329.209167648 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 98, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 23329.209170548 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 99, address = 0xc10ab259, symbol = "sys_statfs+0x0/0x63" }
+syscall_state.sys_call_table: 23329.209173361 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 100, address = 0xc10ab205, symbol = "sys_fstatfs+0x0/0x54" }
+syscall_state.sys_call_table: 23329.209176389 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 101, address = 0xc100532f, symbol = "sys_ioperm+0x0/0x1a5" }
+syscall_state.sys_call_table: 23329.209194061 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 102, address = 0xc14b72ad, symbol = "sys_socketcall+0x0/0x1ea" }
+syscall_state.sys_call_table: 23329.209196740 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 103, address = 0xc102af4d, symbol = "sys_syslog+0x0/0x11" }
+syscall_state.sys_call_table: 23329.209199496 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 104, address = 0xc102d607, symbol = "sys_setitimer+0x0/0x6f" }
+syscall_state.sys_call_table: 23329.209202210 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 105, address = 0xc102d8ae, symbol = "sys_getitimer+0x0/0x42" }
+syscall_state.sys_call_table: 23329.209205146 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 106, address = 0xc10af08f, symbol = "sys_newstat+0x0/0x23" }
+syscall_state.sys_call_table: 23329.209207726 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 107, address = 0xc10af014, symbol = "sys_newlstat+0x0/0x23" }
+syscall_state.sys_call_table: 23329.209210309 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 108, address = 0xc10af129, symbol = "sys_newfstat+0x0/0x23" }
+syscall_state.sys_call_table: 23329.209213203 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 109, address = 0xc100649d, symbol = "sys_uname+0x0/0x49" }
+syscall_state.sys_call_table: 23329.209215960 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 110, address = 0xc100343c, symbol = "ptregs_iopl+0x0/0xc" }
+syscall_state.sys_call_table: 23329.209218748 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 111, address = 0xc10a9e3a, symbol = "sys_vhangup+0x0/0x1b" }
+syscall_state.sys_call_table: 23329.209221573 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 112, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 23329.209224343 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 113, address = 0xc10034a8, symbol = "ptregs_vm86old+0x0/0x18" }
+syscall_state.sys_call_table: 23329.209227002 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 114, address = 0xc102c8cd, symbol = "sys_wait4+0x0/0xa1" }
+syscall_state.sys_call_table: 23329.209229537 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 115, address = 0xc10a37d9, symbol = "sys_swapoff+0x0/0x9eb" }
+syscall_state.sys_call_table: 23329.209232553 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 116, address = 0xc1034f23, symbol = "sys_sysinfo+0x0/0x2a" }
+syscall_state.sys_call_table: 23329.209235558 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 117, address = 0xc10064e6, symbol = "sys_ipc+0x0/0x1c1" }
+syscall_state.sys_call_table: 23329.209238407 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 118, address = 0xc10c6ec3, symbol = "sys_fsync+0x0/0x8" }
+syscall_state.sys_call_table: 23329.209241171 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 119, address = 0xc1003484, symbol = "ptregs_sigreturn+0x0/0xc" }
+syscall_state.sys_call_table: 23329.209243897 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 120, address = 0xc1003454, symbol = "ptregs_clone+0x0/0xc" }
+syscall_state.sys_call_table: 23329.209246673 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 121, address = 0xc1038f2b, symbol = "sys_setdomainname+0x0/0xaf" }
+syscall_state.sys_call_table: 23329.209249832 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 122, address = 0xc10390dc, symbol = "sys_newuname+0x0/0x42" }
+syscall_state.sys_call_table: 23329.209252712 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 123, address = 0xc100583a, symbol = "sys_modify_ldt+0x0/0x111" }
+syscall_state.sys_call_table: 23329.209255655 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 124, address = 0xc102dc39, symbol = "sys_adjtimex+0x0/0x49" }
+syscall_state.sys_call_table: 23329.209258425 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 125, address = 0xc109d119, symbol = "sys_mprotect+0x0/0x1df" }
+syscall_state.sys_call_table: 23329.209261472 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 126, address = 0xc1035e43, symbol = "sys_sigprocmask+0x0/0xfc" }
+syscall_state.sys_call_table: 23329.209264322 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 127, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 23329.209267634 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 128, address = 0xc1052845, symbol = "sys_init_module+0x0/0x1fb" }
+syscall_state.sys_call_table: 23329.209270453 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 129, address = 0xc1052661, symbol = "sys_delete_module+0x0/0x1e4" }
+syscall_state.sys_call_table: 23329.209273408 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 130, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 23329.209279181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 131, address = 0xc10e1bea, symbol = "sys_quotactl+0x0/0x6b6" }
+syscall_state.sys_call_table: 23329.209281828 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 132, address = 0xc103922a, symbol = "sys_getpgid+0x0/0x6b" }
+syscall_state.sys_call_table: 23329.209284763 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 133, address = 0xc10aa886, symbol = "sys_fchdir+0x0/0x62" }
+syscall_state.sys_call_table: 23329.209287657 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 134, address = 0xc10c7d7d, symbol = "sys_bdflush+0x0/0x54" }
+syscall_state.sys_call_table: 23329.209290753 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 135, address = 0xc10be0da, symbol = "sys_sysfs+0x0/0x162" }
+syscall_state.sys_call_table: 23329.209293450 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 136, address = 0xc1029b63, symbol = "sys_personality+0x0/0x3d" }
+syscall_state.sys_call_table: 23329.209296687 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 137, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 23329.209299167 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 138, address = 0xc104dfff, symbol = "sys_setfsuid16+0x0/0x1d" }
+syscall_state.sys_call_table: 23329.209301665 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 139, address = 0xc104dfe2, symbol = "sys_setfsgid16+0x0/0x1d" }
+syscall_state.sys_call_table: 23329.209304608 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 140, address = 0xc10ac560, symbol = "sys_llseek+0x0/0xc1" }
+syscall_state.sys_call_table: 23329.209307100 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 141, address = 0xc10b77f1, symbol = "sys_getdents+0x0/0x9e" }
+syscall_state.sys_call_table: 23329.209309580 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 142, address = 0xc10b8a79, symbol = "sys_select+0x0/0x8f" }
+syscall_state.sys_call_table: 23329.209315428 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 143, address = 0xc10d8b43, symbol = "sys_flock+0x0/0x12d" }
+syscall_state.sys_call_table: 23329.209318148 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 144, address = 0xc109dba8, symbol = "sys_msync+0x0/0x164" }
+syscall_state.sys_call_table: 23329.209321016 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 145, address = 0xc10ac040, symbol = "sys_readv+0x0/0xcd" }
+syscall_state.sys_call_table: 23329.209323916 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 146, address = 0xc10abe9c, symbol = "sys_writev+0x0/0xcd" }
+syscall_state.sys_call_table: 23329.209326439 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 147, address = 0xc10391bf, symbol = "sys_getsid+0x0/0x6b" }
+syscall_state.sys_call_table: 23329.209329221 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 148, address = 0xc10c6eb8, symbol = "sys_fdatasync+0x0/0xb" }
+syscall_state.sys_call_table: 23329.209331867 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 149, address = 0xc103133d, symbol = "sys_sysctl+0x0/0xfb" }
+syscall_state.sys_call_table: 23329.209334402 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 150, address = 0xc109a6b7, symbol = "sys_mlock+0x0/0xac" }
+syscall_state.sys_call_table: 23329.209337005 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 151, address = 0xc109a661, symbol = "sys_munlock+0x0/0x56" }
+syscall_state.sys_call_table: 23329.209339911 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 152, address = 0xc109a519, symbol = "sys_mlockall+0x0/0x98" }
+syscall_state.sys_call_table: 23329.209342545 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 153, address = 0xc109a4e7, symbol = "sys_munlockall+0x0/0x32" }
+syscall_state.sys_call_table: 23329.209345808 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 154, address = 0xc10275aa, symbol = "sys_sched_setparam+0x0/0xd" }
+syscall_state.sys_call_table: 23329.209348892 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 155, address = 0xc1024eb0, symbol = "sys_sched_getparam+0x0/0xc4" }
+syscall_state.sys_call_table: 23329.209371067 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 156, address = 0xc10275b7, symbol = "sys_sched_setscheduler+0x0/0x1b" }
+syscall_state.sys_call_table: 23329.209374281 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 157, address = 0xc1024f74, symbol = "sys_sched_getscheduler+0x0/0x88" }
+syscall_state.sys_call_table: 23329.209377187 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 158, address = 0xc10226cb, symbol = "sys_sched_yield+0x0/0x32" }
+syscall_state.sys_call_table: 23329.209381326 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 159, address = 0xc101ee30, symbol = "sys_sched_get_priority_max+0x0/0x24" }
+syscall_state.sys_call_table: 23329.209384521 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 160, address = 0xc101ee54, symbol = "sys_sched_get_priority_min+0x0/0x24" }
+syscall_state.sys_call_table: 23329.209387716 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 161, address = 0xc1024b89, symbol = "sys_sched_rr_get_interval+0x0/0xcb" }
+syscall_state.sys_call_table: 23329.209394496 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 162, address = 0xc1041a4a, symbol = "sys_nanosleep+0x0/0x51" }
+syscall_state.sys_call_table: 23329.209397315 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 163, address = 0xc109db62, symbol = "sys_mremap+0x0/0x46" }
+syscall_state.sys_call_table: 23329.209399973 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 164, address = 0xc104e05d, symbol = "sys_setresuid16+0x0/0x41" }
+syscall_state.sys_call_table: 23329.209402577 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 165, address = 0xc104dd2c, symbol = "sys_getresuid16+0x0/0x6f" }
+syscall_state.sys_call_table: 23329.209405433 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 166, address = 0xc100349c, symbol = "ptregs_vm86+0x0/0xc" }
+syscall_state.sys_call_table: 23329.209408733 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 167, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 23329.209411268 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 168, address = 0xc10b821d, symbol = "sys_poll+0x0/0x8d" }
+syscall_state.sys_call_table: 23329.209414118 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 169, address = 0xc10d9520, symbol = "sys_nfsservctl+0x0/0x170" }
+syscall_state.sys_call_table: 23329.209416684 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 170, address = 0xc104e01c, symbol = "sys_setresgid16+0x0/0x41" }
+syscall_state.sys_call_table: 23329.209419275 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 171, address = 0xc104dd9b, symbol = "sys_getresgid16+0x0/0x6f" }
+syscall_state.sys_call_table: 23329.209421989 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 172, address = 0xc1038838, symbol = "sys_prctl+0x0/0x1fe" }
+syscall_state.sys_call_table: 23329.209424821 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 173, address = 0xc1003490, symbol = "ptregs_rt_sigreturn+0x0/0xc" }
+syscall_state.sys_call_table: 23329.209427331 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 174, address = 0xc103630e, symbol = "sys_rt_sigaction+0x0/0x79" }
+syscall_state.sys_call_table: 23329.209430760 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 175, address = 0xc1036003, symbol = "sys_rt_sigprocmask+0x0/0xcf" }
+syscall_state.sys_call_table: 23329.209433801 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 176, address = 0xc1035ff6, symbol = "sys_rt_sigpending+0x0/0xd" }
+syscall_state.sys_call_table: 23329.209436466 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 177, address = 0xc1038110, symbol = "sys_rt_sigtimedwait+0x0/0x245" }
+syscall_state.sys_call_table: 23329.209439137 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 178, address = 0xc1037fae, symbol = "sys_rt_sigqueueinfo+0x0/0x4f" }
+syscall_state.sys_call_table: 23329.209442203 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 179, address = 0xc1035bd5, symbol = "sys_rt_sigsuspend+0x0/0xd3" }
+syscall_state.sys_call_table: 23329.209445268 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 180, address = 0xc10ac409, symbol = "sys_pread64+0x0/0xba" }
+syscall_state.sys_call_table: 23329.209448100 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 181, address = 0xc10ac1e1, symbol = "sys_pwrite64+0x0/0xba" }
+syscall_state.sys_call_table: 23329.209450573 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 182, address = 0xc104e19c, symbol = "sys_chown16+0x0/0x38" }
+syscall_state.sys_call_table: 23329.209453763 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 183, address = 0xc10ba068, symbol = "sys_getcwd+0x0/0x18d" }
+syscall_state.sys_call_table: 23329.209456316 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 184, address = 0xc1031668, symbol = "sys_capget+0x0/0x114" }
+syscall_state.sys_call_table: 23329.209458778 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 185, address = 0xc1031525, symbol = "sys_capset+0x0/0x143" }
+syscall_state.sys_call_table: 23329.209461584 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 186, address = 0xc1003478, symbol = "ptregs_sigaltstack+0x0/0xc" }
+syscall_state.sys_call_table: 23329.209464502 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 187, address = 0xc10abc70, symbol = "sys_sendfile+0x0/0x7c" }
+syscall_state.sys_call_table: 23329.209467420 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 188, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 23329.209470282 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 189, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 23329.209473002 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 190, address = 0xc1003460, symbol = "ptregs_vfork+0x0/0xc" }
+syscall_state.sys_call_table: 23329.209475606 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 191, address = 0xc1038ec6, symbol = "sys_getrlimit+0x0/0x65" }
+syscall_state.sys_call_table: 23329.209478585 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 192, address = 0xc10066e7, symbol = "sys_mmap2+0x0/0x76" }
+syscall_state.sys_call_table: 23329.209481552 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 193, address = 0xc10aafa9, symbol = "sys_truncate64+0x0/0x11" }
+syscall_state.sys_call_table: 23329.209484371 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 194, address = 0xc10aad92, symbol = "sys_ftruncate64+0x0/0x21" }
+syscall_state.sys_call_table: 23329.209486974 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 195, address = 0xc10af06c, symbol = "sys_stat64+0x0/0x23" }
+syscall_state.sys_call_table: 23329.209489521 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 196, address = 0xc10aeff1, symbol = "sys_lstat64+0x0/0x23" }
+syscall_state.sys_call_table: 23329.209492130 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 197, address = 0xc10af106, symbol = "sys_fstat64+0x0/0x23" }
+syscall_state.sys_call_table: 23329.209494900 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 198, address = 0xc10aa651, symbol = "sys_lchown+0x0/0x54" }
+syscall_state.sys_call_table: 23329.209497898 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 199, address = 0xc10324ee, symbol = "sys_getuid+0x0/0xf" }
+syscall_state.sys_call_table: 23329.209500563 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 200, address = 0xc103250c, symbol = "sys_getgid+0x0/0xf" }
+syscall_state.sys_call_table: 23329.209503093 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 201, address = 0xc10324fd, symbol = "sys_geteuid+0x0/0xf" }
+syscall_state.sys_call_table: 23329.209505627 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 202, address = 0xc103251b, symbol = "sys_getegid+0x0/0xf" }
+syscall_state.sys_call_table: 23329.209508224 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 203, address = 0xc1039a7c, symbol = "sys_setreuid+0x0/0xf8" }
+syscall_state.sys_call_table: 23329.209510827 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 204, address = 0xc10396da, symbol = "sys_setregid+0x0/0xce" }
+syscall_state.sys_call_table: 23329.209513956 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 205, address = 0xc1043e1b, symbol = "sys_getgroups+0x0/0x83" }
+syscall_state.sys_call_table: 23329.209516539 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 206, address = 0xc10440e9, symbol = "sys_setgroups+0x0/0xbf" }
+syscall_state.sys_call_table: 23329.209519328 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 207, address = 0xc10aa52d, symbol = "sys_fchown+0x0/0x68" }
+syscall_state.sys_call_table: 23329.209521986 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 208, address = 0xc10398bc, symbol = "sys_setresuid+0x0/0x11b" }
+syscall_state.sys_call_table: 23329.209524559 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 209, address = 0xc1038770, symbol = "sys_getresuid+0x0/0x3a" }
+syscall_state.sys_call_table: 23329.209527186 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 210, address = 0xc1039568, symbol = "sys_setresgid+0x0/0xf1" }
+syscall_state.sys_call_table: 23329.209529765 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 211, address = 0xc10387aa, symbol = "sys_getresgid+0x0/0x3a" }
+syscall_state.sys_call_table: 23329.209532584 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 212, address = 0xc10aa710, symbol = "sys_chown+0x0/0x57" }
+syscall_state.sys_call_table: 23329.209535162 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 213, address = 0xc10399d7, symbol = "sys_setuid+0x0/0xa5" }
+syscall_state.sys_call_table: 23329.209537716 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 214, address = 0xc1039659, symbol = "sys_setgid+0x0/0x81" }
+syscall_state.sys_call_table: 23329.209540646 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 215, address = 0xc10397a8, symbol = "sys_setfsuid+0x0/0x97" }
+syscall_state.sys_call_table: 23329.209543231 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 216, address = 0xc10394e6, symbol = "sys_setfsgid+0x0/0x82" }
+syscall_state.sys_call_table: 23329.209546334 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 217, address = 0xc10bea88, symbol = "sys_pivot_root+0x0/0x392" }
+syscall_state.sys_call_table: 23329.209549091 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 218, address = 0xc1099c29, symbol = "sys_mincore+0x0/0x33f" }
+syscall_state.sys_call_table: 23329.209551540 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 219, address = 0xc109599c, symbol = "sys_madvise+0x0/0x424" }
+syscall_state.sys_call_table: 23329.209554267 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 220, address = 0xc10b774c, symbol = "sys_getdents64+0x0/0xa5" }
+syscall_state.sys_call_table: 23329.209557283 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 221, address = 0xc10b673c, symbol = "sys_fcntl64+0x0/0x79" }
+syscall_state.sys_call_table: 23329.209560096 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 222, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 23329.209562977 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 223, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 23329.209565956 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 224, address = 0xc1034f4d, symbol = "sys_gettid+0x0/0xe" }
+syscall_state.sys_call_table: 23329.209571779 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 225, address = 0xc1082f0d, symbol = "sys_readahead+0x0/0xa3" }
+syscall_state.sys_call_table: 23329.209574536 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 226, address = 0xc10c23ce, symbol = "sys_setxattr+0x0/0x62" }
+syscall_state.sys_call_table: 23329.209577121 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 227, address = 0xc10c236f, symbol = "sys_lsetxattr+0x0/0x5f" }
+syscall_state.sys_call_table: 23329.209579705 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 228, address = 0xc10c230f, symbol = "sys_fsetxattr+0x0/0x60" }
+syscall_state.sys_call_table: 23329.209582314 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 229, address = 0xc10c2116, symbol = "sys_getxattr+0x0/0x48" }
+syscall_state.sys_call_table: 23329.209585214 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 230, address = 0xc10c20d1, symbol = "sys_lgetxattr+0x0/0x45" }
+syscall_state.sys_call_table: 23329.209587755 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 231, address = 0xc10c208e, symbol = "sys_fgetxattr+0x0/0x43" }
+syscall_state.sys_call_table: 23329.209590259 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 232, address = 0xc10c1eab, symbol = "sys_listxattr+0x0/0x43" }
+syscall_state.sys_call_table: 23329.209592770 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 233, address = 0xc10c1e6b, symbol = "sys_llistxattr+0x0/0x40" }
+syscall_state.sys_call_table: 23329.209595287 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 234, address = 0xc10c1e2d, symbol = "sys_flistxattr+0x0/0x3e" }
+syscall_state.sys_call_table: 23329.209598026 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 235, address = 0xc10c1cf8, symbol = "sys_removexattr+0x0/0x53" }
+syscall_state.sys_call_table: 23329.209600715 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 236, address = 0xc10c1ca8, symbol = "sys_lremovexattr+0x0/0x50" }
+syscall_state.sys_call_table: 23329.209603386 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 237, address = 0xc10c1c56, symbol = "sys_fremovexattr+0x0/0x52" }
+syscall_state.sys_call_table: 23329.209606002 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 238, address = 0xc1037320, symbol = "sys_tkill+0x0/0x16" }
+syscall_state.sys_call_table: 23329.209609037 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 239, address = 0xc10abbf4, symbol = "sys_sendfile64+0x0/0x7c" }
+syscall_state.sys_call_table: 23329.209612688 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 240, address = 0xc104ce90, symbol = "sys_futex+0x0/0x111" }
+syscall_state.sys_call_table: 23329.209615847 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 241, address = 0xc1024e71, symbol = "sys_sched_setaffinity+0x0/0x3f" }
+syscall_state.sys_call_table: 23329.209618888 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 242, address = 0xc1024d0f, symbol = "sys_sched_getaffinity+0x0/0x3d" }
+syscall_state.sys_call_table: 23329.209624915 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 243, address = 0xc100aebd, symbol = "sys_set_thread_area+0x0/0x1b" }
+syscall_state.sys_call_table: 23329.209627808 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 244, address = 0xc100adf1, symbol = "sys_get_thread_area+0x0/0x16" }
+syscall_state.sys_call_table: 23329.209631114 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 245, address = 0xc10d621a, symbol = "sys_io_setup+0x0/0x30a" }
+syscall_state.sys_call_table: 23329.209633711 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 246, address = 0xc10d6182, symbol = "sys_io_destroy+0x0/0x1c" }
+syscall_state.sys_call_table: 23329.209636407 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 247, address = 0xc10d6816, symbol = "sys_io_getevents+0x0/0x2f9" }
+syscall_state.sys_call_table: 23329.209639262 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 248, address = 0xc10d6ba2, symbol = "sys_io_submit+0x0/0x47e" }
+syscall_state.sys_call_table: 23329.209641940 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 249, address = 0xc10d5db8, symbol = "sys_io_cancel+0x0/0x131" }
+syscall_state.sys_call_table: 23329.209644950 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 250, address = 0xc1085cc2, symbol = "sys_fadvise64+0x0/0x22" }
+syscall_state.sys_call_table: 23329.209647793 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 251, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 23329.209650723 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 252, address = 0xc102d159, symbol = "sys_exit_group+0x0/0x14" }
+syscall_state.sys_call_table: 23329.209657465 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 253, address = 0xc10f5b26, symbol = "sys_lookup_dcookie+0x0/0x13a" }
+syscall_state.sys_call_table: 23329.209660198 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 254, address = 0xc10d3ed5, symbol = "sys_epoll_create+0x0/0x1b" }
+syscall_state.sys_call_table: 23329.209662752 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 255, address = 0xc10d38e5, symbol = "sys_epoll_ctl+0x0/0x472" }
+syscall_state.sys_call_table: 23329.209665281 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 256, address = 0xc10d35c2, symbol = "sys_epoll_wait+0x0/0x26d" }
+syscall_state.sys_call_table: 23329.209669093 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 257, address = 0xc1094eac, symbol = "sys_remap_file_pages+0x0/0x440" }
+syscall_state.sys_call_table: 23329.209671776 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 258, address = 0xc1027c0e, symbol = "sys_set_tid_address+0x0/0x18" }
+syscall_state.sys_call_table: 23329.209674380 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 259, address = 0xc103ddae, symbol = "sys_timer_create+0x0/0x2f5" }
+syscall_state.sys_call_table: 23329.209677334 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 260, address = 0xc103db03, symbol = "sys_timer_settime+0x0/0x235" }
+syscall_state.sys_call_table: 23329.209679956 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 261, address = 0xc103dd38, symbol = "sys_timer_gettime+0x0/0x76" }
+syscall_state.sys_call_table: 23329.209682627 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 262, address = 0xc103d9d5, symbol = "sys_timer_getoverrun+0x0/0x28" }
+syscall_state.sys_call_table: 23329.209685113 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 263, address = 0xc103d93c, symbol = "sys_timer_delete+0x0/0x99" }
+syscall_state.sys_call_table: 23329.209687611 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 264, address = 0xc103d668, symbol = "sys_clock_settime+0x0/0x7d" }
+syscall_state.sys_call_table: 23329.209690288 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 265, address = 0xc103d5ea, symbol = "sys_clock_gettime+0x0/0x7e" }
+syscall_state.sys_call_table: 23329.209692793 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 266, address = 0xc103d56a, symbol = "sys_clock_getres+0x0/0x80" }
+syscall_state.sys_call_table: 23329.209695414 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 267, address = 0xc103d4b7, symbol = "sys_clock_nanosleep+0x0/0xb3" }
+syscall_state.sys_call_table: 23329.209698394 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 268, address = 0xc10ab0aa, symbol = "sys_statfs64+0x0/0x95" }
+syscall_state.sys_call_table: 23329.209701250 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 269, address = 0xc10ab02a, symbol = "sys_fstatfs64+0x0/0x80" }
+syscall_state.sys_call_table: 23329.209703668 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 270, address = 0xc1037336, symbol = "sys_tgkill+0x0/0x1f" }
+syscall_state.sys_call_table: 23329.209706684 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 271, address = 0xc10c73b8, symbol = "sys_utimes+0x0/0x13" }
+syscall_state.sys_call_table: 23329.209709460 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 272, address = 0xc1085b24, symbol = "sys_fadvise64_64+0x0/0x19e" }
+syscall_state.sys_call_table: 23329.209712292 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 273, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 23329.209715049 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 274, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 23329.209717776 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 275, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 23329.209720964 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 276, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 23329.209735152 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 277, address = 0xc13e52ba, symbol = "sys_mq_open+0x0/0x2e2" }
+syscall_state.sys_call_table: 23329.209737909 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 278, address = 0xc13e513d, symbol = "sys_mq_unlink+0x0/0xdf" }
+syscall_state.sys_call_table: 23329.209740740 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 279, address = 0xc13e4d62, symbol = "sys_mq_timedsend+0x0/0x3db" }
+syscall_state.sys_call_table: 23329.209743596 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 280, address = 0xc13e4a51, symbol = "sys_mq_timedreceive+0x0/0x311" }
+syscall_state.sys_call_table: 23329.209746360 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 281, address = 0xc13e45e9, symbol = "sys_mq_notify+0x0/0x2a0" }
+syscall_state.sys_call_table: 23329.209749142 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 282, address = 0xc13e4475, symbol = "sys_mq_getsetattr+0x0/0x174" }
+syscall_state.sys_call_table: 23329.209752023 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 283, address = 0xc1058be3, symbol = "sys_kexec_load+0x0/0x4ad" }
+syscall_state.sys_call_table: 23329.209754780 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 284, address = 0xc102c985, symbol = "sys_waitid+0x0/0x111" }
+syscall_state.sys_call_table: 23329.209757587 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 285, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 23329.209761066 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 286, address = 0xc13e8487, symbol = "sys_add_key+0x0/0x139" }
+syscall_state.sys_call_table: 23329.209763971 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 287, address = 0xc13e837b, symbol = "sys_request_key+0x0/0x10c" }
+syscall_state.sys_call_table: 23329.209767222 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 288, address = 0xc13e82c4, symbol = "sys_keyctl+0x0/0xb7" }
+syscall_state.sys_call_table: 23329.209770800 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 289, address = 0xc10cfe26, symbol = "sys_ioprio_set+0x0/0x1d6" }
+syscall_state.sys_call_table: 23329.209773588 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 290, address = 0xc10cfae3, symbol = "sys_ioprio_get+0x0/0x28b" }
+syscall_state.sys_call_table: 23329.209776759 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 291, address = 0xc10d2dd7, symbol = "sys_inotify_init+0x0/0x9" }
+syscall_state.sys_call_table: 23329.209779794 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 292, address = 0xc10d2994, symbol = "sys_inotify_add_watch+0x0/0x2ed" }
+syscall_state.sys_call_table: 23329.209782903 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 293, address = 0xc10d282e, symbol = "sys_inotify_rm_watch+0x0/0xc4" }
+syscall_state.sys_call_table: 23329.209785759 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 294, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 23329.209788584 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 295, address = 0xc10aa0c6, symbol = "sys_openat+0x0/0x26" }
+syscall_state.sys_call_table: 23329.209791489 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 296, address = 0xc10b5857, symbol = "sys_mkdirat+0x0/0xb5" }
+syscall_state.sys_call_table: 23329.209794345 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 297, address = 0xc10b591f, symbol = "sys_mknodat+0x0/0x193" }
+syscall_state.sys_call_table: 23329.209797084 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 298, address = 0xc10aa6a5, symbol = "sys_fchownat+0x0/0x6b" }
+syscall_state.sys_call_table: 23329.209800050 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 299, address = 0xc10c7334, symbol = "sys_futimesat+0x0/0x84" }
+syscall_state.sys_call_table: 23329.209802715 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 300, address = 0xc10aefae, symbol = "sys_fstatat64+0x0/0x2e" }
+syscall_state.sys_call_table: 23329.209805627 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 301, address = 0xc10b5820, symbol = "sys_unlinkat+0x0/0x29" }
+syscall_state.sys_call_table: 23329.209808601 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 302, address = 0xc10b5493, symbol = "sys_renameat+0x0/0x1bd" }
+syscall_state.sys_call_table: 23329.209811450 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 303, address = 0xc10b5be8, symbol = "sys_linkat+0x0/0xe3" }
+syscall_state.sys_call_table: 23329.209814861 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 304, address = 0xc10b5ac9, symbol = "sys_symlinkat+0x0/0xad" }
+syscall_state.sys_call_table: 23329.209817477 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 305, address = 0xc10aed48, symbol = "sys_readlinkat+0x0/0x81" }
+syscall_state.sys_call_table: 23329.209820407 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 306, address = 0xc10aa767, symbol = "sys_fchmodat+0x0/0x9e" }
+syscall_state.sys_call_table: 23329.209823251 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 307, address = 0xc10aa941, symbol = "sys_faccessat+0x0/0x146" }
+syscall_state.sys_call_table: 23329.209825878 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 308, address = 0xc10b8926, symbol = "sys_pselect6+0x0/0x153" }
+syscall_state.sys_call_table: 23329.209828333 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 309, address = 0xc10b8111, symbol = "sys_ppoll+0x0/0x10c" }
+syscall_state.sys_call_table: 23329.209830850 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 310, address = 0xc1027ea0, symbol = "sys_unshare+0x0/0x280" }
+syscall_state.sys_call_table: 23329.209834181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 311, address = 0xc104a70f, symbol = "sys_set_robust_list+0x0/0x2d" }
+syscall_state.sys_call_table: 23329.209837451 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 312, address = 0xc104cfa1, symbol = "sys_get_robust_list+0x0/0xaf" }
+syscall_state.sys_call_table: 23329.209840251 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 313, address = 0xc10c54f1, symbol = "sys_splice+0x0/0x3fa" }
+syscall_state.sys_call_table: 23329.209843107 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 314, address = 0xc10c6c69, symbol = "sys_sync_file_range+0x0/0x101" }
+syscall_state.sys_call_table: 23329.209845766 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 315, address = 0xc10c51ed, symbol = "sys_tee+0x0/0x242" }
+syscall_state.sys_call_table: 23329.209848801 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 316, address = 0xc10c61b8, symbol = "sys_vmsplice+0x0/0x38f" }
+syscall_state.sys_call_table: 23329.209851620 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 317, address = 0xc103ec14, symbol = "sys_ni_syscall+0x0/0x8" }
+syscall_state.sys_call_table: 23329.209854272 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 318, address = 0xc10387fd, symbol = "sys_getcpu+0x0/0x36" }
+syscall_state.sys_call_table: 23329.209856826 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 319, address = 0xc10d382f, symbol = "sys_epoll_pwait+0x0/0xb6" }
+syscall_state.sys_call_table: 23329.209860034 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 320, address = 0xc10c73cb, symbol = "sys_utimensat+0x0/0x54" }
+syscall_state.sys_call_table: 23329.209862563 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 321, address = 0xc10d474f, symbol = "sys_signalfd+0x0/0x19" }
+syscall_state.sys_call_table: 23329.209865147 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 322, address = 0xc10d4da0, symbol = "sys_timerfd_create+0x0/0xdc" }
+syscall_state.sys_call_table: 23329.209867707 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 323, address = 0xc10d5483, symbol = "sys_eventfd+0x0/0xe" }
+syscall_state.sys_call_table: 23329.209870564 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 324, address = 0xc10aab7d, symbol = "sys_fallocate+0x0/0x40" }
+syscall_state.sys_call_table: 23329.209873153 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 325, address = 0xc10d4b1a, symbol = "sys_timerfd_settime+0x0/0x217" }
+syscall_state.sys_call_table: 23329.209875954 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 326, address = 0xc10d4805, symbol = "sys_timerfd_gettime+0x0/0xe9" }
+syscall_state.sys_call_table: 23329.209878546 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 327, address = 0xc10d45a1, symbol = "sys_signalfd4+0x0/0x1ae" }
+syscall_state.sys_call_table: 23329.209881117 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 328, address = 0xc10d543b, symbol = "sys_eventfd2+0x0/0x48" }
+syscall_state.sys_call_table: 23329.209883696 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 329, address = 0xc10d3dbf, symbol = "sys_epoll_create1+0x0/0x116" }
+syscall_state.sys_call_table: 23329.209886749 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 330, address = 0xc10b683e, symbol = "sys_dup3+0x0/0x13a" }
+syscall_state.sys_call_table: 23329.209889500 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 331, address = 0xc10b1d63, symbol = "sys_pipe2+0x0/0x49" }
+syscall_state.sys_call_table: 23329.209892572 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 332, address = 0xc10d2c81, symbol = "sys_inotify_init1+0x0/0x156" }
+syscall_state.sys_call_table: 23329.209895428 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 333, address = 0xc10abfa9, symbol = "sys_preadv+0x0/0x97" }
+syscall_state.sys_call_table: 23329.209898192 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 334, address = 0xc10abe05, symbol = "sys_pwritev+0x0/0x97" }
+syscall_state.sys_call_table: 23329.209900752 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 335, address = 0xc1037278, symbol = "sys_rt_tgsigqueueinfo+0x0/0x47" }
+syscall_state.sys_call_table: 23329.209908025 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 336, address = 0xc108053d, symbol = "sys_perf_event_open+0x0/0x6a7" }
+softirq_state.softirq_vec: 23329.209911300 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 0, address = 0xc102e1f2, symbol = "tasklet_hi_action+0x0/0xec" }
+softirq_state.softirq_vec: 23329.209914977 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 1, address = 0xc1034c2c, symbol = "run_timer_softirq+0x0/0x254" }
+softirq_state.softirq_vec: 23329.209921725 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 2, address = 0xc14c0a3f, symbol = "net_tx_action+0x0/0xca" }
+softirq_state.softirq_vec: 23329.209927345 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 3, address = 0xc14c285c, symbol = "net_rx_action+0x0/0x1e8" }
+softirq_state.softirq_vec: 23329.209938416 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 4, address = 0xc1414d50, symbol = "blk_done_softirq+0x0/0x6c" }
+softirq_state.softirq_vec: 23329.209941008 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 5, address = 0xc141520d, symbol = "blk_iopoll_softirq+0x0/0xba" }
+softirq_state.softirq_vec: 23329.209943912 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 6, address = 0xc102e2de, symbol = "tasklet_action+0x0/0xec" }
+softirq_state.softirq_vec: 23329.209965318 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 7, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 23329.209968624 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 8, address = 0xc104160e, symbol = "run_hrtimer_softirq+0x0/0x5" }
+softirq_state.softirq_vec: 23329.209975564 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 9, address = 0xc106a2c7, symbol = "rcu_process_callbacks+0x0/0x1f" }
+softirq_state.softirq_vec: 23329.209980449 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 10, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 23329.209982830 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 11, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 23329.209985094 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 12, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 23329.209987346 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 13, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 23329.209989579 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 14, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 23329.209991972 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 15, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 23329.209994236 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 16, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 23329.209996500 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 17, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 23329.209998696 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 18, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 23329.210000768 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 19, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 23329.210002940 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 20, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 23329.210005333 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 21, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 23329.210007838 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 22, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 23329.210010021 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 23, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 23329.210012094 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 24, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 23329.210014376 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 25, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 23329.210016757 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 26, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 23329.210019014 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 27, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 23329.210021279 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 28, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 23329.210023506 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 29, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 23329.210025579 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 30, address = 0x0, symbol = "0x0" }
+softirq_state.softirq_vec: 23329.210027872 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { id = 31, address = 0x0, symbol = "0x0" }
+irq_state.idt_table: 23329.210031118 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 0, address = 0xc1003b04, symbol = "divide_error+0x0/0xc" }
+irq_state.idt_table: 23329.210045200 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 1, address = 0xc1584ec4, symbol = "debug+0x0/0x11" }
+irq_state.idt_table: 23329.210048161 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 2, address = 0xc1584f14, symbol = "nmi+0x0/0x31" }
+irq_state.idt_table: 23329.210050752 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 3, address = 0xc158502c, symbol = "int3+0x0/0x30" }
+irq_state.idt_table: 23329.210053694 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 4, address = 0xc1003aa4, symbol = "overflow+0x0/0xc" }
+irq_state.idt_table: 23329.210056365 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 5, address = 0xc1003ab0, symbol = "bounds+0x0/0xc" }
+irq_state.idt_table: 23329.210059018 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 6, address = 0xc1003abc, symbol = "invalid_op+0x0/0xc" }
+irq_state.idt_table: 23329.210061874 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 7, address = 0xc1003a88, symbol = "device_not_available+0x0/0xc" }
+irq_state.idt_table: 23329.210065451 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 8, address = 0x0, symbol = "0x0" }
+irq_state.idt_table: 23329.210068455 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 9, address = 0xc1003ac8, symbol = "coprocessor_segment_overrun+0x0/0xc" }
+irq_state.idt_table: 23329.210071268 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 10, address = 0xc1003ad4, symbol = "invalid_TSS+0x0/0xc" }
+irq_state.idt_table: 23329.210074112 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 11, address = 0xc1003ae0, symbol = "segment_not_present+0x0/0xc" }
+irq_state.idt_table: 23329.210076863 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 12, address = 0xc1003aec, symbol = "stack_segment+0x0/0xc" }
+irq_state.idt_table: 23329.210079719 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 13, address = 0xc158505c, symbol = "general_protection+0x0/0xa" }
+irq_state.idt_table: 23329.210082384 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 14, address = 0xc1584e58, symbol = "page_fault+0x0/0x8" }
+irq_state.idt_table: 23329.210085259 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 15, address = 0xc1003b20, symbol = "spurious_interrupt_bug+0x0/0xc" }
+irq_state.idt_table: 23329.210088151 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 16, address = 0xc1003a70, symbol = "coprocessor_error+0x0/0xc" }
+irq_state.idt_table: 23329.210090921 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 17, address = 0xc1003af8, symbol = "alignment_check+0x0/0xc" }
+irq_state.idt_table: 23329.210094029 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 18, address = 0xc1003b10, symbol = "machine_check+0x0/0x10" }
+irq_state.idt_table: 23329.210096930 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 19, address = 0xc1003a7c, symbol = "simd_coprocessor_error+0x0/0xc" }
+irq_state.idt_table: 23329.210100588 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 20, address = 0xc17973a8, symbol = "ignore_int+0x0/0x46" }
+irq_state.idt_table: 23329.210103332 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 21, address = 0xc17973a8, symbol = "ignore_int+0x0/0x46" }
+irq_state.idt_table: 23329.210105898 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 22, address = 0xc17973a8, symbol = "ignore_int+0x0/0x46" }
+irq_state.idt_table: 23329.210108433 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 23, address = 0xc17973a8, symbol = "ignore_int+0x0/0x46" }
+irq_state.idt_table: 23329.210110975 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 24, address = 0xc17973a8, symbol = "ignore_int+0x0/0x46" }
+irq_state.idt_table: 23329.210113547 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 25, address = 0xc17973a8, symbol = "ignore_int+0x0/0x46" }
+irq_state.idt_table: 23329.210116230 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 26, address = 0xc17973a8, symbol = "ignore_int+0x0/0x46" }
+irq_state.idt_table: 23329.210118766 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 27, address = 0xc17973a8, symbol = "ignore_int+0x0/0x46" }
+irq_state.idt_table: 23329.210121295 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 28, address = 0xc17973a8, symbol = "ignore_int+0x0/0x46" }
+irq_state.idt_table: 23329.210123824 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 29, address = 0xc17973a8, symbol = "ignore_int+0x0/0x46" }
+irq_state.idt_table: 23329.210126359 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 30, address = 0xc17973a8, symbol = "ignore_int+0x0/0x46" }
+irq_state.idt_table: 23329.210128888 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 31, address = 0xc17973a8, symbol = "ignore_int+0x0/0x46" }
+irq_state.idt_table: 23329.210131750 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 32, address = 0xc10034c0, symbol = "irq_entries_start+0x0/0x400" }
+irq_state.idt_table: 23329.210134600 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 33, address = 0xc10034c4, symbol = "irq_entries_start+0x4/0x400" }
+irq_state.idt_table: 23329.210137765 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 34, address = 0xc10034c8, symbol = "irq_entries_start+0x8/0x400" }
+irq_state.idt_table: 23329.210140510 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 35, address = 0xc10034cc, symbol = "irq_entries_start+0xc/0x400" }
+irq_state.idt_table: 23329.210143477 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 36, address = 0xc10034d0, symbol = "irq_entries_start+0x10/0x400" }
+irq_state.idt_table: 23329.210146284 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 37, address = 0xc10034d4, symbol = "irq_entries_start+0x14/0x400" }
+irq_state.idt_table: 23329.210149047 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 38, address = 0xc10034d8, symbol = "irq_entries_start+0x18/0x400" }
+irq_state.idt_table: 23329.210151817 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 39, address = 0xc10034e0, symbol = "irq_entries_start+0x20/0x400" }
+irq_state.idt_table: 23329.210154587 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 40, address = 0xc10034e4, symbol = "irq_entries_start+0x24/0x400" }
+irq_state.idt_table: 23329.210157399 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 41, address = 0xc10034e8, symbol = "irq_entries_start+0x28/0x400" }
+irq_state.idt_table: 23329.210160274 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 42, address = 0xc10034ec, symbol = "irq_entries_start+0x2c/0x400" }
+irq_state.idt_table: 23329.210163049 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 43, address = 0xc10034f0, symbol = "irq_entries_start+0x30/0x400" }
+irq_state.idt_table: 23329.210165844 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 44, address = 0xc10034f4, symbol = "irq_entries_start+0x34/0x400" }
+irq_state.idt_table: 23329.210168613 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 45, address = 0xc10034f8, symbol = "irq_entries_start+0x38/0x400" }
+irq_state.idt_table: 23329.210171390 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 46, address = 0xc1003500, symbol = "irq_entries_start+0x40/0x400" }
+irq_state.idt_table: 23329.210174159 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 47, address = 0xc1003504, symbol = "irq_entries_start+0x44/0x400" }
+irq_state.idt_table: 23329.210177033 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 48, address = 0xc1003508, symbol = "irq_entries_start+0x48/0x400" }
+irq_state.idt_table: 23329.210179878 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 49, address = 0xc100350c, symbol = "irq_entries_start+0x4c/0x400" }
+irq_state.idt_table: 23329.210183066 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 50, address = 0xc1003510, symbol = "irq_entries_start+0x50/0x400" }
+irq_state.idt_table: 23329.210185971 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 51, address = 0xc1003514, symbol = "irq_entries_start+0x54/0x400" }
+irq_state.idt_table: 23329.210188741 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 52, address = 0xc1003518, symbol = "irq_entries_start+0x58/0x400" }
+irq_state.idt_table: 23329.210191517 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 53, address = 0xc1003520, symbol = "irq_entries_start+0x60/0x400" }
+irq_state.idt_table: 23329.210194287 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 54, address = 0xc1003524, symbol = "irq_entries_start+0x64/0x400" }
+irq_state.idt_table: 23329.210197056 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 55, address = 0xc1003528, symbol = "irq_entries_start+0x68/0x400" }
+irq_state.idt_table: 23329.210199832 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 56, address = 0xc100352c, symbol = "irq_entries_start+0x6c/0x400" }
+irq_state.idt_table: 23329.210202645 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 57, address = 0xc1003530, symbol = "irq_entries_start+0x70/0x400" }
+irq_state.idt_table: 23329.210205495 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 58, address = 0xc1003534, symbol = "irq_entries_start+0x74/0x400" }
+irq_state.idt_table: 23329.210208265 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 59, address = 0xc1003538, symbol = "irq_entries_start+0x78/0x400" }
+irq_state.idt_table: 23329.210211034 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 60, address = 0xc1003540, symbol = "irq_entries_start+0x80/0x400" }
+irq_state.idt_table: 23329.210213810 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 61, address = 0xc1003544, symbol = "irq_entries_start+0x84/0x400" }
+irq_state.idt_table: 23329.210216586 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 62, address = 0xc1003548, symbol = "irq_entries_start+0x88/0x400" }
+irq_state.idt_table: 23329.210219356 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 63, address = 0xc100354c, symbol = "irq_entries_start+0x8c/0x400" }
+irq_state.idt_table: 23329.210222268 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 64, address = 0xc1003550, symbol = "irq_entries_start+0x90/0x400" }
+irq_state.idt_table: 23329.210225198 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 65, address = 0xc1003554, symbol = "irq_entries_start+0x94/0x400" }
+irq_state.idt_table: 23329.210228381 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 66, address = 0xc1003558, symbol = "irq_entries_start+0x98/0x400" }
+irq_state.idt_table: 23329.210231155 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 67, address = 0xc1003560, symbol = "irq_entries_start+0xa0/0x400" }
+irq_state.idt_table: 23329.210233925 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 68, address = 0xc1003564, symbol = "irq_entries_start+0xa4/0x400" }
+irq_state.idt_table: 23329.210236701 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 69, address = 0xc1003568, symbol = "irq_entries_start+0xa8/0x400" }
+irq_state.idt_table: 23329.210239471 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 70, address = 0xc100356c, symbol = "irq_entries_start+0xac/0x400" }
+irq_state.idt_table: 23329.210242240 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 71, address = 0xc1003570, symbol = "irq_entries_start+0xb0/0x400" }
+irq_state.idt_table: 23329.210245059 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 72, address = 0xc1003574, symbol = "irq_entries_start+0xb4/0x400" }
+irq_state.idt_table: 23329.210247880 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 73, address = 0xc1003578, symbol = "irq_entries_start+0xb8/0x400" }
+irq_state.idt_table: 23329.210250649 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 74, address = 0xc1003580, symbol = "irq_entries_start+0xc0/0x400" }
+irq_state.idt_table: 23329.210253424 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 75, address = 0xc1003584, symbol = "irq_entries_start+0xc4/0x400" }
+irq_state.idt_table: 23329.210256194 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 76, address = 0xc1003588, symbol = "irq_entries_start+0xc8/0x400" }
+irq_state.idt_table: 23329.210258970 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 77, address = 0xc100358c, symbol = "irq_entries_start+0xcc/0x400" }
+irq_state.idt_table: 23329.210261807 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 78, address = 0xc1003590, symbol = "irq_entries_start+0xd0/0x400" }
+irq_state.idt_table: 23329.210264811 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 79, address = 0xc1003594, symbol = "irq_entries_start+0xd4/0x400" }
+irq_state.idt_table: 23329.210267754 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 80, address = 0xc1003598, symbol = "irq_entries_start+0xd8/0x400" }
+irq_state.idt_table: 23329.210270715 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 81, address = 0xc10035a0, symbol = "irq_entries_start+0xe0/0x400" }
+irq_state.idt_table: 23329.210273892 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 82, address = 0xc10035a4, symbol = "irq_entries_start+0xe4/0x400" }
+irq_state.idt_table: 23329.210276698 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 83, address = 0xc10035a8, symbol = "irq_entries_start+0xe8/0x400" }
+irq_state.idt_table: 23329.210279468 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 84, address = 0xc10035ac, symbol = "irq_entries_start+0xec/0x400" }
+irq_state.idt_table: 23329.210282238 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 85, address = 0xc10035b0, symbol = "irq_entries_start+0xf0/0x400" }
+irq_state.idt_table: 23329.210285013 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 86, address = 0xc10035b4, symbol = "irq_entries_start+0xf4/0x400" }
+irq_state.idt_table: 23329.210287808 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 87, address = 0xc10035b8, symbol = "irq_entries_start+0xf8/0x400" }
+irq_state.idt_table: 23329.210290602 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 88, address = 0xc10035c0, symbol = "irq_entries_start+0x100/0x400" }
+irq_state.idt_table: 23329.210293539 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 89, address = 0xc10035c4, symbol = "irq_entries_start+0x104/0x400" }
+irq_state.idt_table: 23329.210296333 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 90, address = 0xc10035c8, symbol = "irq_entries_start+0x108/0x400" }
+irq_state.idt_table: 23329.210299133 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 91, address = 0xc10035cc, symbol = "irq_entries_start+0x10c/0x400" }
+irq_state.idt_table: 23329.210301934 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 92, address = 0xc10035d0, symbol = "irq_entries_start+0x110/0x400" }
+irq_state.idt_table: 23329.210304735 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 93, address = 0xc10035d4, symbol = "irq_entries_start+0x114/0x400" }
+irq_state.idt_table: 23329.210307572 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 94, address = 0xc10035d8, symbol = "irq_entries_start+0x118/0x400" }
+irq_state.idt_table: 23329.210310366 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 95, address = 0xc10035e0, symbol = "irq_entries_start+0x120/0x400" }
+irq_state.idt_table: 23329.210313394 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 96, address = 0xc10035e4, symbol = "irq_entries_start+0x124/0x400" }
+irq_state.idt_table: 23329.210316226 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 97, address = 0xc10035e8, symbol = "irq_entries_start+0x128/0x400" }
+irq_state.idt_table: 23329.210319439 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 98, address = 0xc10035ec, symbol = "irq_entries_start+0x12c/0x400" }
+irq_state.idt_table: 23329.210322240 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 99, address = 0xc10035f0, symbol = "irq_entries_start+0x130/0x400" }
+irq_state.idt_table: 23329.210325084 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 100, address = 0xc10035f4, symbol = "irq_entries_start+0x134/0x400" }
+irq_state.idt_table: 23329.210327935 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 101, address = 0xc10035f8, symbol = "irq_entries_start+0x138/0x400" }
+irq_state.idt_table: 23329.210330734 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 102, address = 0xc1003600, symbol = "irq_entries_start+0x140/0x400" }
+irq_state.idt_table: 23329.210333535 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 103, address = 0xc1003604, symbol = "irq_entries_start+0x144/0x400" }
+irq_state.idt_table: 23329.210336465 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 104, address = 0xc1003608, symbol = "irq_entries_start+0x148/0x400" }
+irq_state.idt_table: 23329.210339265 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 105, address = 0xc100360c, symbol = "irq_entries_start+0x14c/0x400" }
+irq_state.idt_table: 23329.210342091 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 106, address = 0xc1003610, symbol = "irq_entries_start+0x150/0x400" }
+irq_state.idt_table: 23329.210344891 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 107, address = 0xc1003614, symbol = "irq_entries_start+0x154/0x400" }
+irq_state.idt_table: 23329.210347692 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 108, address = 0xc1003618, symbol = "irq_entries_start+0x158/0x400" }
+irq_state.idt_table: 23329.210350554 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 109, address = 0xc1003620, symbol = "irq_entries_start+0x160/0x400" }
+irq_state.idt_table: 23329.210353354 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 110, address = 0xc1003624, symbol = "irq_entries_start+0x164/0x400" }
+irq_state.idt_table: 23329.210356155 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 111, address = 0xc1003628, symbol = "irq_entries_start+0x168/0x400" }
+irq_state.idt_table: 23329.210359079 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 112, address = 0xc100362c, symbol = "irq_entries_start+0x16c/0x400" }
+irq_state.idt_table: 23329.210361892 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 113, address = 0xc1003630, symbol = "irq_entries_start+0x170/0x400" }
+irq_state.idt_table: 23329.210365069 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 114, address = 0xc1003634, symbol = "irq_entries_start+0x174/0x400" }
+irq_state.idt_table: 23329.210367986 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 115, address = 0xc1003638, symbol = "irq_entries_start+0x178/0x400" }
+irq_state.idt_table: 23329.210370836 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 116, address = 0xc1003640, symbol = "irq_entries_start+0x180/0x400" }
+irq_state.idt_table: 23329.210373637 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 117, address = 0xc1003644, symbol = "irq_entries_start+0x184/0x400" }
+irq_state.idt_table: 23329.210394949 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 118, address = 0xc1003648, symbol = "irq_entries_start+0x188/0x400" }
+irq_state.idt_table: 23329.210398151 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 119, address = 0xc100364c, symbol = "irq_entries_start+0x18c/0x400" }
+irq_state.idt_table: 23329.210401000 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 120, address = 0xc1003650, symbol = "irq_entries_start+0x190/0x400" }
+irq_state.idt_table: 23329.210403856 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 121, address = 0xc1003654, symbol = "irq_entries_start+0x194/0x400" }
+irq_state.idt_table: 23329.210406699 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 122, address = 0xc1003658, symbol = "irq_entries_start+0x198/0x400" }
+irq_state.idt_table: 23329.210409605 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 123, address = 0xc1003660, symbol = "irq_entries_start+0x1a0/0x400" }
+irq_state.idt_table: 23329.210412516 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 124, address = 0xc1003664, symbol = "irq_entries_start+0x1a4/0x400" }
+irq_state.idt_table: 23329.210415366 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 125, address = 0xc1003668, symbol = "irq_entries_start+0x1a8/0x400" }
+irq_state.idt_table: 23329.210418210 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 126, address = 0xc100366c, symbol = "irq_entries_start+0x1ac/0x400" }
+irq_state.idt_table: 23329.210421054 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 127, address = 0xc1003670, symbol = "irq_entries_start+0x1b0/0x400" }
+irq_state.idt_table: 23329.210423830 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 128, address = 0xc10032ac, symbol = "system_call+0x0/0x3e" }
+irq_state.idt_table: 23329.210426661 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 129, address = 0xc1003678, symbol = "irq_entries_start+0x1b8/0x400" }
+irq_state.idt_table: 23329.210429949 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 130, address = 0xc1003680, symbol = "irq_entries_start+0x1c0/0x400" }
+irq_state.idt_table: 23329.210432793 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 131, address = 0xc1003684, symbol = "irq_entries_start+0x1c4/0x400" }
+irq_state.idt_table: 23329.210435606 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 132, address = 0xc1003688, symbol = "irq_entries_start+0x1c8/0x400" }
+irq_state.idt_table: 23329.210438412 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 133, address = 0xc100368c, symbol = "irq_entries_start+0x1cc/0x400" }
+irq_state.idt_table: 23329.210441213 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 134, address = 0xc1003690, symbol = "irq_entries_start+0x1d0/0x400" }
+irq_state.idt_table: 23329.210444019 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 135, address = 0xc1003694, symbol = "irq_entries_start+0x1d4/0x400" }
+irq_state.idt_table: 23329.210446826 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 136, address = 0xc1003698, symbol = "irq_entries_start+0x1d8/0x400" }
+irq_state.idt_table: 23329.210449565 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 137, address = 0xc10036a0, symbol = "irq_entries_start+0x1e0/0x400" }
+irq_state.idt_table: 23329.210452377 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 138, address = 0xc10036a4, symbol = "irq_entries_start+0x1e4/0x400" }
+irq_state.idt_table: 23329.210455240 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 139, address = 0xc10036a8, symbol = "irq_entries_start+0x1e8/0x400" }
+irq_state.idt_table: 23329.210458047 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 140, address = 0xc10036ac, symbol = "irq_entries_start+0x1ec/0x400" }
+irq_state.idt_table: 23329.210460846 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 141, address = 0xc10036b0, symbol = "irq_entries_start+0x1f0/0x400" }
+irq_state.idt_table: 23329.210463654 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 142, address = 0xc10036b4, symbol = "irq_entries_start+0x1f4/0x400" }
+irq_state.idt_table: 23329.210466430 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 143, address = 0xc10036b8, symbol = "irq_entries_start+0x1f8/0x400" }
+irq_state.idt_table: 23329.210469291 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 144, address = 0xc10036c0, symbol = "irq_entries_start+0x200/0x400" }
+irq_state.idt_table: 23329.210472055 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 145, address = 0xc10036c4, symbol = "irq_entries_start+0x204/0x400" }
+irq_state.idt_table: 23329.210475207 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 146, address = 0xc10036c8, symbol = "irq_entries_start+0x208/0x400" }
+irq_state.idt_table: 23329.210478143 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 147, address = 0xc10036cc, symbol = "irq_entries_start+0x20c/0x400" }
+irq_state.idt_table: 23329.210480950 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 148, address = 0xc10036d0, symbol = "irq_entries_start+0x210/0x400" }
+irq_state.idt_table: 23329.210483750 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 149, address = 0xc10036d4, symbol = "irq_entries_start+0x214/0x400" }
+irq_state.idt_table: 23329.210486606 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 150, address = 0xc10036d8, symbol = "irq_entries_start+0x218/0x400" }
+irq_state.idt_table: 23329.210489475 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 151, address = 0xc10036e0, symbol = "irq_entries_start+0x220/0x400" }
+irq_state.idt_table: 23329.210492288 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 152, address = 0xc10036e4, symbol = "irq_entries_start+0x224/0x400" }
+irq_state.idt_table: 23329.210495045 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 153, address = 0xc10036e8, symbol = "irq_entries_start+0x228/0x400" }
+irq_state.idt_table: 23329.210497981 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 154, address = 0xc10036ec, symbol = "irq_entries_start+0x22c/0x400" }
+irq_state.idt_table: 23329.210500807 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 155, address = 0xc10036f0, symbol = "irq_entries_start+0x230/0x400" }
+irq_state.idt_table: 23329.210503638 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 156, address = 0xc10036f4, symbol = "irq_entries_start+0x234/0x400" }
+irq_state.idt_table: 23329.210506445 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 157, address = 0xc10036f8, symbol = "irq_entries_start+0x238/0x400" }
+irq_state.idt_table: 23329.210509301 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 158, address = 0xc1003700, symbol = "irq_entries_start+0x240/0x400" }
+irq_state.idt_table: 23329.210512163 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 159, address = 0xc1003704, symbol = "irq_entries_start+0x244/0x400" }
+irq_state.idt_table: 23329.210515075 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 160, address = 0xc1003708, symbol = "irq_entries_start+0x248/0x400" }
+irq_state.idt_table: 23329.210517875 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 161, address = 0xc100370c, symbol = "irq_entries_start+0x24c/0x400" }
+irq_state.idt_table: 23329.210521027 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 162, address = 0xc1003710, symbol = "irq_entries_start+0x250/0x400" }
+irq_state.idt_table: 23329.210523859 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 163, address = 0xc1003714, symbol = "irq_entries_start+0x254/0x400" }
+irq_state.idt_table: 23329.210526659 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 164, address = 0xc1003718, symbol = "irq_entries_start+0x258/0x400" }
+irq_state.idt_table: 23329.210529534 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 165, address = 0xc1003720, symbol = "irq_entries_start+0x260/0x400" }
+irq_state.idt_table: 23329.210532421 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 166, address = 0xc1003724, symbol = "irq_entries_start+0x264/0x400" }
+irq_state.idt_table: 23329.210535227 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 167, address = 0xc1003728, symbol = "irq_entries_start+0x268/0x400" }
+irq_state.idt_table: 23329.210538039 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 168, address = 0xc100372c, symbol = "irq_entries_start+0x26c/0x400" }
+irq_state.idt_table: 23329.210540841 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 169, address = 0xc1003730, symbol = "irq_entries_start+0x270/0x400" }
+irq_state.idt_table: 23329.210543666 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 170, address = 0xc1003734, symbol = "irq_entries_start+0x274/0x400" }
+irq_state.idt_table: 23329.210546479 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 171, address = 0xc1003738, symbol = "irq_entries_start+0x278/0x400" }
+irq_state.idt_table: 23329.210549261 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 172, address = 0xc1003740, symbol = "irq_entries_start+0x280/0x400" }
+irq_state.idt_table: 23329.210552017 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 173, address = 0xc1003744, symbol = "irq_entries_start+0x284/0x400" }
+irq_state.idt_table: 23329.210554775 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 174, address = 0xc1003748, symbol = "irq_entries_start+0x288/0x400" }
+irq_state.idt_table: 23329.210557705 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 175, address = 0xc100374c, symbol = "irq_entries_start+0x28c/0x400" }
+irq_state.idt_table: 23329.210560697 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 176, address = 0xc1003750, symbol = "irq_entries_start+0x290/0x400" }
+irq_state.idt_table: 23329.210563503 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 177, address = 0xc1003754, symbol = "irq_entries_start+0x294/0x400" }
+irq_state.idt_table: 23329.210566699 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 178, address = 0xc1003758, symbol = "irq_entries_start+0x298/0x400" }
+irq_state.idt_table: 23329.210569499 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 179, address = 0xc1003760, symbol = "irq_entries_start+0x2a0/0x400" }
+irq_state.idt_table: 23329.210572312 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 180, address = 0xc1003764, symbol = "irq_entries_start+0x2a4/0x400" }
+irq_state.idt_table: 23329.210575125 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 181, address = 0xc1003768, symbol = "irq_entries_start+0x2a8/0x400" }
+irq_state.idt_table: 23329.210578012 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 182, address = 0xc100376c, symbol = "irq_entries_start+0x2ac/0x400" }
+irq_state.idt_table: 23329.210580831 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 183, address = 0xc1003770, symbol = "irq_entries_start+0x2b0/0x400" }
+irq_state.idt_table: 23329.210583644 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 184, address = 0xc1003774, symbol = "irq_entries_start+0x2b4/0x400" }
+irq_state.idt_table: 23329.210586444 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 185, address = 0xc1003778, symbol = "irq_entries_start+0x2b8/0x400" }
+irq_state.idt_table: 23329.210589282 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 186, address = 0xc1003780, symbol = "irq_entries_start+0x2c0/0x400" }
+irq_state.idt_table: 23329.210592107 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 187, address = 0xc1003784, symbol = "irq_entries_start+0x2c4/0x400" }
+irq_state.idt_table: 23329.210594908 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 188, address = 0xc1003788, symbol = "irq_entries_start+0x2c8/0x400" }
+irq_state.idt_table: 23329.210597677 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 189, address = 0xc100378c, symbol = "irq_entries_start+0x2cc/0x400" }
+irq_state.idt_table: 23329.210600453 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 190, address = 0xc1003790, symbol = "irq_entries_start+0x2d0/0x400" }
+irq_state.idt_table: 23329.210603197 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 191, address = 0xc1003794, symbol = "irq_entries_start+0x2d4/0x400" }
+irq_state.idt_table: 23329.210606183 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 192, address = 0xc1003798, symbol = "irq_entries_start+0x2d8/0x400" }
+irq_state.idt_table: 23329.210608984 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 193, address = 0xc10037a0, symbol = "irq_entries_start+0x2e0/0x400" }
+irq_state.idt_table: 23329.210612284 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 194, address = 0xc10037a4, symbol = "irq_entries_start+0x2e4/0x400" }
+irq_state.idt_table: 23329.210615035 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 195, address = 0xc10037a8, symbol = "irq_entries_start+0x2e8/0x400" }
+irq_state.idt_table: 23329.210617842 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 196, address = 0xc10037ac, symbol = "irq_entries_start+0x2ec/0x400" }
+irq_state.idt_table: 23329.210620642 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 197, address = 0xc10037b0, symbol = "irq_entries_start+0x2f0/0x400" }
+irq_state.idt_table: 23329.210623418 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 198, address = 0xc10037b4, symbol = "irq_entries_start+0x2f4/0x400" }
+irq_state.idt_table: 23329.210626138 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 199, address = 0xc10037b8, symbol = "irq_entries_start+0x2f8/0x400" }
+irq_state.idt_table: 23329.210645372 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 200, address = 0xc10037c0, symbol = "irq_entries_start+0x300/0x400" }
+irq_state.idt_table: 23329.210664525 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 201, address = 0xc10037c4, symbol = "irq_entries_start+0x304/0x400" }
+irq_state.idt_table: 23329.210667455 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 202, address = 0xc10037c8, symbol = "irq_entries_start+0x308/0x400" }
+irq_state.idt_table: 23329.210670262 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 203, address = 0xc10037cc, symbol = "irq_entries_start+0x30c/0x400" }
+irq_state.idt_table: 23329.210673069 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 204, address = 0xc10037d0, symbol = "irq_entries_start+0x310/0x400" }
+irq_state.idt_table: 23329.210675930 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 205, address = 0xc10037d4, symbol = "irq_entries_start+0x314/0x400" }
+irq_state.idt_table: 23329.210678787 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 206, address = 0xc10037d8, symbol = "irq_entries_start+0x318/0x400" }
+irq_state.idt_table: 23329.210681587 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 207, address = 0xc10037e0, symbol = "irq_entries_start+0x320/0x400" }
+irq_state.idt_table: 23329.210684499 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 208, address = 0xc10037e4, symbol = "irq_entries_start+0x324/0x400" }
+irq_state.idt_table: 23329.210687318 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 209, address = 0xc10037e8, symbol = "irq_entries_start+0x328/0x400" }
+irq_state.idt_table: 23329.210690514 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 210, address = 0xc10037ec, symbol = "irq_entries_start+0x32c/0x400" }
+irq_state.idt_table: 23329.210693319 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 211, address = 0xc10037f0, symbol = "irq_entries_start+0x330/0x400" }
+irq_state.idt_table: 23329.210696132 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 212, address = 0xc10037f4, symbol = "irq_entries_start+0x334/0x400" }
+irq_state.idt_table: 23329.210698946 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 213, address = 0xc10037f8, symbol = "irq_entries_start+0x338/0x400" }
+irq_state.idt_table: 23329.210701795 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 214, address = 0xc1003800, symbol = "irq_entries_start+0x340/0x400" }
+irq_state.idt_table: 23329.210704602 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 215, address = 0xc1003804, symbol = "irq_entries_start+0x344/0x400" }
+irq_state.idt_table: 23329.210707415 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 216, address = 0xc1003808, symbol = "irq_entries_start+0x348/0x400" }
+irq_state.idt_table: 23329.210710184 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 217, address = 0xc100380c, symbol = "irq_entries_start+0x34c/0x400" }
+irq_state.idt_table: 23329.210712948 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 218, address = 0xc1003810, symbol = "irq_entries_start+0x350/0x400" }
+irq_state.idt_table: 23329.210715730 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 219, address = 0xc1003814, symbol = "irq_entries_start+0x354/0x400" }
+irq_state.idt_table: 23329.210718549 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 220, address = 0xc1003818, symbol = "irq_entries_start+0x358/0x400" }
+irq_state.idt_table: 23329.210721498 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 221, address = 0xc1003820, symbol = "irq_entries_start+0x360/0x400" }
+irq_state.idt_table: 23329.210724323 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 222, address = 0xc1003824, symbol = "irq_entries_start+0x364/0x400" }
+irq_state.idt_table: 23329.210727160 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 223, address = 0xc1003828, symbol = "irq_entries_start+0x368/0x400" }
+irq_state.idt_table: 23329.210729973 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 224, address = 0xc100382c, symbol = "irq_entries_start+0x36c/0x400" }
+irq_state.idt_table: 23329.210732761 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 225, address = 0xc1003830, symbol = "irq_entries_start+0x370/0x400" }
+irq_state.idt_table: 23329.210735870 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 226, address = 0xc1003834, symbol = "irq_entries_start+0x374/0x400" }
+irq_state.idt_table: 23329.210738807 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 227, address = 0xc1003838, symbol = "irq_entries_start+0x378/0x400" }
+irq_state.idt_table: 23329.210741613 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 228, address = 0xc1003840, symbol = "irq_entries_start+0x380/0x400" }
+irq_state.idt_table: 23329.210744420 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 229, address = 0xc1003844, symbol = "irq_entries_start+0x384/0x400" }
+irq_state.idt_table: 23329.210747282 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 230, address = 0xc1003848, symbol = "irq_entries_start+0x388/0x400" }
+irq_state.idt_table: 23329.210750089 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 231, address = 0xc100384c, symbol = "irq_entries_start+0x38c/0x400" }
+irq_state.idt_table: 23329.210752902 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 232, address = 0xc1003850, symbol = "irq_entries_start+0x390/0x400" }
+irq_state.idt_table: 23329.210755702 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 233, address = 0xc1003854, symbol = "irq_entries_start+0x394/0x400" }
+irq_state.idt_table: 23329.210758571 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 234, address = 0xc1003858, symbol = "irq_entries_start+0x398/0x400" }
+irq_state.idt_table: 23329.210761463 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 235, address = 0xc1003a40, symbol = "mce_self_interrupt+0x0/0x30" }
+irq_state.idt_table: 23329.210764338 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 236, address = 0xc10039b0, symbol = "perf_pending_interrupt+0x0/0x30" }
+irq_state.idt_table: 23329.210767144 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 237, address = 0xc10038f0, symbol = "generic_interrupt+0x0/0x30" }
+irq_state.idt_table: 23329.210770099 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 238, address = 0xc100386c, symbol = "irq_entries_start+0x3ac/0x400" }
+irq_state.idt_table: 23329.210773024 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 239, address = 0xc1003920, symbol = "apic_timer_interrupt+0x0/0x30" }
+irq_state.idt_table: 23329.210775978 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 240, address = 0xc1003874, symbol = "irq_entries_start+0x3b4/0x400" }
+irq_state.idt_table: 23329.210778920 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 241, address = 0xc1003878, symbol = "irq_entries_start+0x3b8/0x400" }
+irq_state.idt_table: 23329.210782072 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 242, address = 0xc1003880, symbol = "irq_entries_start+0x3c0/0x400" }
+irq_state.idt_table: 23329.210784830 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 243, address = 0xc1003884, symbol = "irq_entries_start+0x3c4/0x400" }
+irq_state.idt_table: 23329.210787587 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 244, address = 0xc1003888, symbol = "irq_entries_start+0x3c8/0x400" }
+irq_state.idt_table: 23329.210790437 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 245, address = 0xc100388c, symbol = "irq_entries_start+0x3cc/0x400" }
+irq_state.idt_table: 23329.210793244 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 246, address = 0xc1003890, symbol = "irq_entries_start+0x3d0/0x400" }
+irq_state.idt_table: 23329.210796044 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 247, address = 0xc1003894, symbol = "irq_entries_start+0x3d4/0x400" }
+irq_state.idt_table: 23329.210798875 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 248, address = 0xc1003898, symbol = "irq_entries_start+0x3d8/0x400" }
+irq_state.idt_table: 23329.210801744 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 249, address = 0xc1003a10, symbol = "threshold_interrupt+0x0/0x30" }
+irq_state.idt_table: 23329.210804612 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 250, address = 0xc10039e0, symbol = "thermal_interrupt+0x0/0x30" }
+irq_state.idt_table: 23329.210807518 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 251, address = 0xc10038a8, symbol = "irq_entries_start+0x3e8/0x400" }
+irq_state.idt_table: 23329.210810411 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 252, address = 0xc10038ac, symbol = "irq_entries_start+0x3ec/0x400" }
+irq_state.idt_table: 23329.210813211 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 253, address = 0xc10038b0, symbol = "irq_entries_start+0x3f0/0x400" }
+irq_state.idt_table: 23329.210815981 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 254, address = 0xc1003950, symbol = "error_interrupt+0x0/0x30" }
+irq_state.idt_table: 23329.210818862 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { irq = 255, address = 0xc1003980, symbol = "spurious_interrupt+0x0/0x30" }
+kernel.timer_set: 23329.210823686 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { expires = 2302295, function = 0xc103b8db, data = 3246882648 }
+kernel.printk: 23329.210828552 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { ip = 0xC1421E18 }
+kernel.vprintk: 23329.210835869 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, MODE_UNKNOWN { loglevel = 7, string = "LTT state dump end", ip = 0xC158363B }
+global_state.statedump_end: 23329.210853806 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/global_state_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL
+mm.page_free: 23329.210857236 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 214063, order = 0 }
+mm.page_free: 23329.210860863 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 198145, order = 0 }
+fs.write: 23329.210865119 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { count = 1, fd = 4 }
+kernel.syscall_exit: 23329.210867031 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, USER_MODE { ret = 1 }
+kernel.syscall_entry: 23329.210875618 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { ip = 0xb776d416, syscall_id = 6 [sys_close+0x0/0x112] }
+fs.close: 23329.210878351 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { fd = 4 }
+kernel.syscall_exit: 23329.210940122 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.210966857 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, TRAP { ip = 0xb777bfc0, address = 0xb7752b38, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.211004540 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, USER_MODE { res = 8 }
+kernel.syscall_entry: 23329.211019394 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { ip = 0xb776d416, syscall_id = 252 [sys_exit_group+0x0/0x14] }
+mm.page_free: 23329.211085779 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 240989, order = 0 }
+mm.page_free: 23329.211107961 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 282765, order = 0 }
+mm.page_free: 23329.211130656 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 282116, order = 0 }
+mm.page_free: 23329.211137582 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 240945, order = 0 }
+mm.page_free: 23329.211222566 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 282598, order = 0 }
+mm.page_free: 23329.211229277 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 282732, order = 0 }
+mm.page_free: 23329.212058554 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 260416, order = 0 }
+mm.page_free: 23329.212065377 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 359173, order = 0 }
+mm.page_free: 23329.212086443 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 271461, order = 0 }
+mm.page_free: 23329.212106545 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 271462, order = 0 }
+mm.page_free: 23329.212112991 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 283493, order = 0 }
+mm.page_free: 23329.212204723 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 249462, order = 0 }
+mm.page_free: 23329.212239322 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 282567, order = 0 }
+mm.page_free: 23329.212245590 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 284409, order = 0 }
+mm.page_free: 23329.212251518 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 284408, order = 0 }
+mm.page_free: 23329.212257519 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 271459, order = 0 }
+mm.page_free: 23329.212582545 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 284411, order = 0 }
+mm.page_free: 23329.212632417 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 271460, order = 0 }
+mm.page_free: 23329.212673000 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 283495, order = 0 }
+mm.page_free: 23329.212680007 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 230933, order = 0 }
+mm.page_free: 23329.212686034 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 282767, order = 0 }
+mm.page_free: 23329.212692308 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 271463, order = 0 }
+mm.page_free: 23329.212712158 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 377752, order = 0 }
+mm.page_free: 23329.212719091 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 377730, order = 0 }
+mm.page_free: 23329.212729232 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 377568, order = 0 }
+mm.page_free: 23329.212735901 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pfn = 377733, order = 0 }
+kernel.process_exit: 23329.212873829 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pid = 16927 }
+kernel.send_signal: 23329.212917069 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pid = 16908, signal = 17 }
+kernel.sched_try_wakeup: 23329.212935884 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { pid = 16908, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 23329.212947382 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { prev_pid = 16927, next_pid = 16908, prev_state = 0 }
+mm.page_free: 23329.213014156 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { pfn = 31279, order = 0 }
+kernel.syscall_exit: 23329.213102866 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { ret = 16927 }
+kernel.syscall_entry: 23329.213172483 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 175 [sys_rt_sigprocmask+0x0/0xcf] }
+kernel.syscall_exit: 23329.213176481 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.213183871 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 54 [sys_ioctl+0x0/0x9d] }
+fs.ioctl: 23329.213186918 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { fd = 255, cmd = 21520, arg = 3218730852 }
+kernel.syscall_exit: 23329.213193648 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.213196911 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 175 [sys_rt_sigprocmask+0x0/0xcf] }
+kernel.syscall_exit: 23329.213198725 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.213202314 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 54 [sys_ioctl+0x0/0x9d] }
+fs.ioctl: 23329.213203800 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { fd = 255, cmd = 21505, arg = 3218731064 }
+kernel.syscall_exit: 23329.213208094 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.213213886 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, TRAP { ip = 0x8086562, address = 0x9206548, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.213251317 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { res = 8 }
+kernel.syscall_entry: 23329.213294546 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 175 [sys_rt_sigprocmask+0x0/0xcf] }
+kernel.syscall_exit: 23329.213296760 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.213312694 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 7 [sys_waitpid+0x0/0x17] }
+kernel.process_wait: 23329.213314877 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { pid = 0 }
+kernel.syscall_exit: 23329.213317098 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { ret = -10 }
+kernel.syscall_entry: 23329.213320269 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { ip = 0xb7842408, syscall_id = 119 [ptregs_sigreturn+0x0/0xc] }
+kernel.syscall_exit: 23329.213322767 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.213342537 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, TRAP { ip = 0xb771aa66, address = 0x920d008, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.213374175 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.213437834 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, TRAP { ip = 0x80b382d, address = 0x8112460, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.213490421 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { res = 8 }
+kernel.syscall_entry: 23329.213512930 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 175 [sys_rt_sigprocmask+0x0/0xcf] }
+kernel.syscall_exit: 23329.213515459 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.213523009 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 42 [sys_pipe+0x0/0xe] }
+kernel.syscall_exit: 23329.213539251 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.213550262 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 120 [ptregs_clone+0x0/0xc] }
+kernel.irq_entry: 23329.214492483 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, IRQ { ip = 3238105423, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_update_time: 23329.214505098 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, IRQ { jiffies = 4297269592, xtime_sec = 1264196274, xtime_nsec = 637522011, walltomonotonic_sec = -1264172952, walltomonotonic_nsec = 189579727 }
+kernel.softirq_raise: 23329.214514018 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, IRQ { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.softirq_raise: 23329.214519693 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, IRQ { softirq_id = 9 [rcu_process_callbacks+0x0/0x1f] }
+kernel.sched_try_wakeup: 23329.214527416 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, IRQ { pid = 1304, cpu_id = 0, state = 1 }
+kernel.irq_exit: 23329.214549838 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { handled = 1 }
+kernel.softirq_entry: 23329.214553231 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SOFTIRQ { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.sched_try_wakeup: 23329.214565130 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SOFTIRQ { pid = 16930, cpu_id = 0, state = 1 }
+kernel.timer_set: 23329.214570219 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SOFTIRQ { expires = 2302297, function = 0xc141d458, data = 0 }
+kernel.sched_try_wakeup: 23329.214578133 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SOFTIRQ { pid = 5, cpu_id = 0, state = 1 }
+kernel.softirq_exit: 23329.214581625 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.softirq_entry: 23329.214583099 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SOFTIRQ { softirq_id = 9 [rcu_process_callbacks+0x0/0x1f] }
+rcu.tree_callback: 23329.214638227 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16908, 16908, bash, , 16900, 0x0, SOFTIRQ { func = 0xc10acb19 }
+kernel.softirq_exit: 23329.214641552 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { softirq_id = 9 [rcu_process_callbacks+0x0/0x1f] }
+kernel.sched_schedule: 23329.214680653 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, SYSCALL { prev_pid = 16908, next_pid = 1304, prev_state = 0 }
+fs.read: 23329.214757212 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1304, 1301, rsyslogd, , 1, 0x0, SYSCALL { count = 4095, fd = 19 }
+kernel.syscall_exit: 23329.214758864 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, USER_MODE { ret = 37 }
+kernel.syscall_entry: 23329.214774199 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 78 [sys_gettimeofday+0x0/0x53] }
+kernel.syscall_exit: 23329.214777129 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.214794599 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb776b6a3, syscall_id = 240 [sys_futex+0x0/0x111] }
+kernel.sched_try_wakeup: 23329.214804956 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, SYSCALL { pid = 16834, cpu_id = 0, state = 1 }
+kernel.syscall_exit: 23329.214808392 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, USER_MODE { ret = 1 }
+kernel.syscall_entry: 23329.214813215 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 158 [sys_sched_yield+0x0/0x32] }
+kernel.sched_schedule: 23329.214823690 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { prev_pid = 1304, next_pid = 16930, prev_state = 0 }
+fs.pollfd: 23329.214888163 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 4 }
+fs.pollfd: 23329.214890680 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 6 }
+fs.pollfd: 23329.214892573 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 8 }
+fs.pollfd: 23329.214894171 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 10 }
+fs.pollfd: 23329.214895780 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 12 }
+fs.pollfd: 23329.214897484 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 14 }
+fs.pollfd: 23329.214899119 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 16 }
+fs.pollfd: 23329.214900735 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 18 }
+fs.pollfd: 23329.214902745 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 20 }
+fs.pollfd: 23329.214904484 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 22 }
+fs.pollfd: 23329.214906205 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 24 }
+fs.pollfd: 23329.214907846 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 26 }
+fs.pollfd: 23329.214909351 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 28 }
+fs.pollfd: 23329.214910949 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 30 }
+fs.pollfd: 23329.214912645 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 32 }
+fs.pollfd: 23329.214914329 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 34 }
+fs.pollfd: 23329.214915933 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 36 }
+fs.pollfd: 23329.214917469 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 38 }
+fs.pollfd: 23329.214919129 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 40 }
+fs.pollfd: 23329.214920572 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 42 }
+fs.pollfd: 23329.214922275 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 44 }
+fs.pollfd: 23329.214923983 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 46 }
+fs.pollfd: 23329.214925556 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 48 }
+mm.page_free: 23329.214931583 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { pfn = 198135, order = 0 }
+kernel.syscall_exit: 23329.214935130 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, USER_MODE { ret = 1 }
+kernel.page_fault_entry: 23329.214943328 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, TRAP { ip = 0x8049932, address = 0x804b1d0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.214984244 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.215000349 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, TRAP { ip = 0xb77f9090, address = 0xb77f9090, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.215039909 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.215050099 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, TRAP { ip = 0xb77f918f, address = 0x87e11a4, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.215078369 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.215084519 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, TRAP { ip = 0xb77714b0, address = 0xb77714b0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.215121352 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.215129759 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { ip = 0xb7823416, syscall_id = 54 [sys_ioctl+0x0/0x9d] }
+fs.ioctl: 23329.215131769 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 22, cmd = 2147808512, arg = 3077206836 }
+kernel.syscall_exit: 23329.215134601 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.215138401 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { ip = 0xb7823416, syscall_id = 54 [sys_ioctl+0x0/0x9d] }
+fs.ioctl: 23329.215139845 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 22, cmd = 2147808515, arg = 3077206832 }
+kernel.syscall_exit: 23329.215146432 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.215153026 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, TRAP { ip = 0xb783ab70, address = 0xb76b7a3b, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.215190384 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.215199519 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { ip = 0xb7823416, syscall_id = 313 [sys_splice+0x0/0x3fa] }
+kernel.syscall_exit: 23329.215731824 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, USER_MODE { ret = 65536 }
+kernel.page_fault_entry: 23329.215738425 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, TRAP { ip = 0xb777a000, address = 0xb777a000, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.215777836 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.215786286 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { ip = 0xb7823416, syscall_id = 313 [sys_splice+0x0/0x3fa] }
+mm.add_to_page_cache: 23329.215802108 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.215892977 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.215927990 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.215962262 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.215995159 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.216027272 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.216063136 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.216094965 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.216127041 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.216159667 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.216192280 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.216224239 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.216256839 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.216270675 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 0, sdev = 2 }
+mm.add_to_page_cache: 23329.216322910 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.216390671 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.216423840 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+kernel.syscall_exit: 23329.216455818 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, USER_MODE { ret = 65536 }
+kernel.syscall_entry: 23329.216460893 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { ip = 0xb7823416, syscall_id = 313 [sys_splice+0x0/0x3fa] }
+kernel.syscall_exit: 23329.216463663 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, USER_MODE { ret = 65536 }
+kernel.syscall_entry: 23329.216467272 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { ip = 0xb7823416, syscall_id = 313 [sys_splice+0x0/0x3fa] }
+mm.add_to_page_cache: 23329.216471867 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.216534078 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.216567393 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.216600445 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.216633402 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.216682301 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.216715105 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.216747834 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.216780398 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.216812506 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.216845513 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.216879175 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.216911590 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.216944697 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.216977014 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.217009244 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+kernel.syscall_exit: 23329.217041012 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, USER_MODE { ret = 65536 }
+kernel.syscall_entry: 23329.217045935 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { ip = 0xb7823416, syscall_id = 313 [sys_splice+0x0/0x3fa] }
+kernel.syscall_exit: 23329.217048716 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, USER_MODE { ret = 65536 }
+kernel.syscall_entry: 23329.217051783 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { ip = 0xb7823416, syscall_id = 313 [sys_splice+0x0/0x3fa] }
+mm.add_to_page_cache: 23329.217056150 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.217089256 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.217125514 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.217157529 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.217189593 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.217221786 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.217265039 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.217304481 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.217337576 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.217371502 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.217403789 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.217435903 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.217468651 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.217500845 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.217562752 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.217595716 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+kernel.syscall_exit: 23329.217626565 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, USER_MODE { ret = 65536 }
+kernel.syscall_entry: 23329.217631604 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { ip = 0xb7823416, syscall_id = 313 [sys_splice+0x0/0x3fa] }
+kernel.syscall_exit: 23329.217634262 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, USER_MODE { ret = 65536 }
+kernel.syscall_entry: 23329.217637372 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { ip = 0xb7823416, syscall_id = 313 [sys_splice+0x0/0x3fa] }
+mm.add_to_page_cache: 23329.217641763 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.217675542 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.217707601 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.217739497 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.217774159 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.217807635 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.217839428 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.217871807 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.217903932 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.217940967 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.217975641 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.218009734 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.218041644 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.218073400 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.218105321 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+mm.add_to_page_cache: 23329.218142610 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { inode = 1469205, sdev = 3145730 }
+kernel.syscall_exit: 23329.218178548 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, USER_MODE { ret = 65536 }
+kernel.syscall_entry: 23329.218183341 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { ip = 0xb7823416, syscall_id = 54 [sys_ioctl+0x0/0x9d] }
+fs.ioctl: 23329.218185642 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 22, cmd = 1074066689, arg = 3077206836 }
+kernel.syscall_exit: 23329.218188751 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.218195746 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { ip = 0xb7823416, syscall_id = 168 [sys_poll+0x0/0x8d] }
+fs.pollfd: 23329.218197726 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 4 }
+fs.pollfd: 23329.218199724 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 6 }
+fs.pollfd: 23329.218201587 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 8 }
+fs.pollfd: 23329.218203136 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 10 }
+fs.pollfd: 23329.218204666 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 12 }
+fs.pollfd: 23329.218206078 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 14 }
+fs.pollfd: 23329.218207602 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 16 }
+fs.pollfd: 23329.218208996 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 18 }
+fs.pollfd: 23329.218210384 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 20 }
+fs.pollfd: 23329.218211870 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 22 }
+fs.pollfd: 23329.218213246 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 24 }
+fs.pollfd: 23329.218214757 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 26 }
+fs.pollfd: 23329.218216417 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 28 }
+fs.pollfd: 23329.218217848 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 30 }
+fs.pollfd: 23329.218219908 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 32 }
+fs.pollfd: 23329.218221580 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 34 }
+fs.pollfd: 23329.218223053 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 36 }
+fs.pollfd: 23329.218224498 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 38 }
+fs.pollfd: 23329.218225947 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 40 }
+fs.pollfd: 23329.218228304 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 42 }
+fs.pollfd: 23329.218229784 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 44 }
+fs.pollfd: 23329.218231234 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 46 }
+fs.pollfd: 23329.218232725 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16930, 16929, lttd, , 1, 0x0, SYSCALL { fd = 48 }
+kernel.sched_schedule: 23329.218242535 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 5, 5, events/0, , 2, 0x0, SYSCALL { prev_pid = 16930, next_pid = 5, prev_state = 1 }
+kernel.sched_schedule: 23329.218351322 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { prev_pid = 5, next_pid = 16834, prev_state = 1 }
+kernel.syscall_exit: 23329.218422618 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.218429095 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 240 [sys_futex+0x0/0x111] }
+kernel.syscall_exit: 23329.218431223 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.218435430 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 158 [sys_sched_yield+0x0/0x32] }
+kernel.syscall_exit: 23329.218444991 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.218476697 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 4 [sys_write+0x0/0x9d] }
+fs.write: 23329.218512869 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { count = 66, fd = 4 }
+kernel.syscall_exit: 23329.218514553 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, USER_MODE { ret = 66 }
+kernel.syscall_entry: 23329.218525644 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 4 [sys_write+0x0/0x9d] }
+fs.write: 23329.218575202 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { count = 66, fd = 6 }
+kernel.syscall_exit: 23329.218576874 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, USER_MODE { ret = 66 }
+kernel.syscall_entry: 23329.218588711 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 4 [sys_write+0x0/0x9d] }
+fs.write: 23329.218614743 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { count = 66, fd = 16 }
+kernel.syscall_exit: 23329.218616302 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, USER_MODE { ret = 66 }
+kernel.syscall_entry: 23329.218628128 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 13 [sys_time+0x0/0x27] }
+kernel.syscall_exit: 23329.218629713 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, USER_MODE { ret = 1264196274 }
+kernel.syscall_entry: 23329.218633834 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 158 [sys_sched_yield+0x0/0x32] }
+kernel.sched_schedule: 23329.218642852 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, SYSCALL { prev_pid = 16834, next_pid = 1304, prev_state = 0 }
+kernel.syscall_exit: 23329.218681498 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.218688924 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1304, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 3 [sys_read+0x0/0x9d] }
+kernel.sched_schedule: 23329.218699257 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { prev_pid = 1304, next_pid = 16834, prev_state = 1 }
+kernel.syscall_exit: 23329.218721544 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.218726541 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb7756e4c, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 23329.218729896 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.218733122 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 23329.218735343 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.218738315 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16834, 1301, rsyslogd, , 1, 0x0, SYSCALL { ip = 0xb77a7416, syscall_id = 240 [sys_futex+0x0/0x111] }
+kernel.sched_schedule: 23329.218749309 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { prev_pid = 16834, next_pid = 16908, prev_state = 1 }
+kernel.process_fork: 23329.219647913 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { parent_pid = 16908, child_pid = 16931, child_tgid = 16931 }
+kernel.sched_wakeup_new_task: 23329.219657739 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { pid = 16931, state = 0, cpu_id = 0 }
+kernel.syscall_exit: 23329.219662804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { ret = 16931 }
+kernel.page_fault_entry: 23329.219675110 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, TRAP { ip = 0xb773e79d, address = 0xbfd9eff8, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.219752543 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.219761451 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, TRAP { ip = 0xb773e7ab, address = 0xbfd9f000, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.219834758 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.219847218 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, TRAP { ip = 0xb773e8e2, address = 0xb76a472c, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.219920876 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.219933293 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, TRAP { ip = 0xb770ebd9, address = 0xb77e933c, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.220007216 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.220023552 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, TRAP { ip = 0x8087608, address = 0x810ee70, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.220096635 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { res = 8 }
+kernel.syscall_entry: 23329.220105086 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 57 [sys_setpgid+0x0/0x175] }
+kernel.syscall_exit: 23329.220109460 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.220114697 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, TRAP { ip = 0x80edc4d, address = 0x8111b5a, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.220188238 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.220207601 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, TRAP { ip = 0x80edcd2, address = 0x92140c0, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.220297316 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.220306655 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, TRAP { ip = 0x808741a, address = 0x81097f4, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.220378838 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { res = 8 }
+kernel.syscall_entry: 23329.220386791 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 175 [sys_rt_sigprocmask+0x0/0xcf] }
+kernel.syscall_exit: 23329.220389701 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.220395815 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, TRAP { ip = 0x80edae6, address = 0x9213a48, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.220469763 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.220486800 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, TRAP { ip = 0x8098934, address = 0x91fecf8, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.220560785 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.220569841 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, TRAP { ip = 0x807e760, address = 0x920425c, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.220710847 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.220740685 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, TRAP { ip = 0x80edae6, address = 0x9207008, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.220816476 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.220826790 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, TRAP { ip = 0x8074895, address = 0x91ffd28, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.220910485 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.220919787 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, TRAP { ip = 0x80748bf, address = 0x92005ec, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.220999731 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.221008990 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, TRAP { ip = 0x80edaf8, address = 0x9201a38, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.221086547 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.221096669 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, TRAP { ip = 0x809b579, address = 0x81101dc, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.221175879 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.221186088 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, TRAP { ip = 0x8077893, address = 0x810d878, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.221263459 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { res = 8 }
+kernel.syscall_entry: 23329.221274279 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 175 [sys_rt_sigprocmask+0x0/0xcf] }
+kernel.syscall_exit: 23329.221278319 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.221282853 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 6 [sys_close+0x0/0x112] }
+fs.close: 23329.221288041 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { fd = 3 }
+kernel.syscall_exit: 23329.221292822 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.221295937 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 6 [sys_close+0x0/0x112] }
+fs.close: 23329.221297189 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { fd = 4 }
+kernel.syscall_exit: 23329.221298768 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.221304548 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, TRAP { ip = 0x80886d3, address = 0x810fee8, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.221383536 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.221397724 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, TRAP { ip = 0x80889ce, address = 0x9208a08, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.221523086 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { res = 8 }
+kernel.syscall_entry: 23329.221532783 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 54 [sys_ioctl+0x0/0x9d] }
+fs.ioctl: 23329.221536139 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { fd = 255, cmd = 21519, arg = 3218730848 }
+kernel.syscall_exit: 23329.221545306 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.221550068 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 175 [sys_rt_sigprocmask+0x0/0xcf] }
+kernel.syscall_exit: 23329.221552116 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.221555299 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 54 [sys_ioctl+0x0/0x9d] }
+fs.ioctl: 23329.221556835 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { fd = 255, cmd = 21520, arg = 3218730564 }
+kernel.syscall_exit: 23329.221563483 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.221566759 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 175 [sys_rt_sigprocmask+0x0/0xcf] }
+kernel.syscall_exit: 23329.221568524 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.221571595 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 175 [sys_rt_sigprocmask+0x0/0xcf] }
+kernel.syscall_exit: 23329.221573243 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.221577085 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 175 [sys_rt_sigprocmask+0x0/0xcf] }
+kernel.syscall_exit: 23329.221578856 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.221584198 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 7 [sys_waitpid+0x0/0x17] }
+kernel.process_wait: 23329.221587171 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16908, 16908, bash, , 16900, 0x0, SYSCALL { pid = 0 }
+kernel.sched_schedule: 23329.221596339 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16927, 16927, lttctl, , 16908, 0x0, SYSCALL { prev_pid = 16908, next_pid = 16927, prev_state = 1 }
+kernel.sched_schedule: 23329.221596346 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { prev_pid = 16927, next_pid = 16931, prev_state = 64 }
+kernel.page_fault_entry: 23329.221793990 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xc142b6ad, address = 0xb76a4728, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.221839775 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { res = 8 }
+kernel.syscall_exit: 23329.221862368 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.221871015 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb7842416, address = 0xb7842416, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.221912031 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 0 }
+kernel.page_fault_entry: 23329.221944553 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb773e795, address = 0xb773e795, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.221990752 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.222008008 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb773e79d, address = 0xbfd9eff8, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.222036919 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.222042650 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb773e7ab, address = 0xbfd9f000, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.222068423 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.222085643 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb773e7f1, address = 0xb7860288, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.222176043 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.222187143 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb770eb20, address = 0xb770eb20, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.222224602 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.222301067 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb77adf36, address = 0xb77adf36, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.222342667 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.222365317 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb773e813, address = 0xb77e936c, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.222393253 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.222399084 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb773e89f, address = 0xb77ea340, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.222477305 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.222492553 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0x80872a3, address = 0x80872a3, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.222533969 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.222569227 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0x80615fc, address = 0x80615fc, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.222607388 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.222624355 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb773f3f0, address = 0xb773f3f0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.222805728 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.222818295 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0x80623f0, address = 0x80623f0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.222855661 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.222867802 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb76cfb30, address = 0xb76cfb30, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.222905396 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.222916299 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb76bb98f, address = 0xb76bb98f, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.222953253 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.222971009 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 175 [sys_rt_sigprocmask+0x0/0xcf] }
+kernel.syscall_exit: 23329.222979747 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.222989337 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0x8087536, address = 0x810ee70, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.223017354 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.223023209 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0x8084d10, address = 0x8084d10, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.223058887 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.223069869 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0x809c350, address = 0x809c350, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.223106324 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.223116942 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb76d03e0, address = 0xb76d03e0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.223153946 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.223167671 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 174 [sys_rt_sigaction+0x0/0x79] }
+kernel.syscall_exit: 23329.223172620 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.223176571 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 174 [sys_rt_sigaction+0x0/0x79] }
+kernel.syscall_exit: 23329.223178161 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.223181440 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 174 [sys_rt_sigaction+0x0/0x79] }
+kernel.syscall_exit: 23329.223183036 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.223186998 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 57 [sys_setpgid+0x0/0x175] }
+kernel.syscall_exit: 23329.223194357 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.223202880 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0x8085c70, address = 0x8085c70, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.223344261 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.223354935 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 175 [sys_rt_sigprocmask+0x0/0xcf] }
+kernel.syscall_exit: 23329.223358534 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.223365061 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb776bb00, address = 0xb776bb00, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.223402619 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.223412856 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb776c4b0, address = 0xb776c4b0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.223450068 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.223458314 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 54 [sys_ioctl+0x0/0x9d] }
+fs.ioctl: 23329.223510194 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { fd = 255, cmd = 21520, arg = 3218730740 }
+kernel.syscall_exit: 23329.223535580 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.223542199 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0x8085d15, address = 0x81097e4, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.223573865 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 8 }
+kernel.syscall_entry: 23329.223578216 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 175 [sys_rt_sigprocmask+0x0/0xcf] }
+kernel.syscall_exit: 23329.223580533 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.223586819 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb77652e0, address = 0xb77652e0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.223624445 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.223633325 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 6 [sys_close+0x0/0x112] }
+fs.close: 23329.223636562 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { fd = 4 }
+kernel.syscall_exit: 23329.223807888 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.223813053 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 23329.223818784 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { count = 1, fd = 3 }
+kernel.syscall_exit: 23329.223820091 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.223827567 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0x8070800, address = 0x8070800, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.223941558 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.223952004 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 6 [sys_close+0x0/0x112] }
+fs.close: 23329.223953884 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { fd = 3 }
+kernel.syscall_exit: 23329.224029030 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.224035785 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0x807a707, address = 0x807a707, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.224075007 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.224085947 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0x8099a70, address = 0x8099a70, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.224123744 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.224141346 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 174 [sys_rt_sigaction+0x0/0x79] }
+kernel.syscall_exit: 23329.224146473 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.224151651 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0x8099acc, address = 0x81121e8, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.224359456 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.224370617 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0x8099ad3, address = 0x8110008, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.224398948 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 8 }
+kernel.syscall_entry: 23329.224404002 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 174 [sys_rt_sigaction+0x0/0x79] }
+kernel.syscall_exit: 23329.224406689 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.224410788 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 174 [sys_rt_sigaction+0x0/0x79] }
+kernel.syscall_exit: 23329.224412532 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.224415916 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 174 [sys_rt_sigaction+0x0/0x79] }
+kernel.syscall_exit: 23329.224418023 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.224423545 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0x8075290, address = 0x8075290, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.224461700 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.irq_entry: 23329.224521737 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, IRQ { ip = 3242336307, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_update_time: 23329.224553674 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, IRQ { jiffies = 4297269593, xtime_sec = 1264196274, xtime_nsec = 637522012, walltomonotonic_sec = -1264172952, walltomonotonic_nsec = 189579727 }
+kernel.softirq_raise: 23329.224579134 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, IRQ { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.softirq_raise: 23329.224593642 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, IRQ { softirq_id = 9 [rcu_process_callbacks+0x0/0x1f] }
+kernel.irq_exit: 23329.224633997 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { handled = 1 }
+kernel.softirq_entry: 23329.224640548 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SOFTIRQ { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.timer_set: 23329.224659457 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SOFTIRQ { expires = 2302298, function = 0xc141d458, data = 0 }
+kernel.softirq_exit: 23329.224663376 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.softirq_entry: 23329.224665626 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SOFTIRQ { softirq_id = 9 [rcu_process_callbacks+0x0/0x1f] }
+rcu.tree_callback: 23329.224775759 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16931, 16931, bash, , 16908, 0x0, SOFTIRQ { func = 0xc10acb19 }
+rcu.tree_callback: 23329.224781620 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16931, 16931, bash, , 16908, 0x0, SOFTIRQ { func = 0xc10acb19 }
+rcu.tree_callback: 23329.224783691 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16931, 16931, bash, , 16908, 0x0, SOFTIRQ { func = 0xc10acb19 }
+rcu.tree_callback: 23329.224785158 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16931, 16931, bash, , 16908, 0x0, SOFTIRQ { func = 0xc10acb19 }
+rcu.tree_callback: 23329.224817896 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16931, 16931, bash, , 16908, 0x0, SOFTIRQ { func = 0xc10bdc5f }
+rcu.tree_callback: 23329.224823881 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16931, 16931, bash, , 16908, 0x0, SOFTIRQ { func = 0xc103c96c }
+rcu.tree_callback: 23329.224825693 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16931, 16931, bash, , 16908, 0x0, SOFTIRQ { func = 0xc102b275 }
+kernel.process_free: 23329.224828816 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SOFTIRQ { pid = 16927 }
+mm.page_free: 23329.224837150 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SOFTIRQ { pfn = 31456, order = 1 }
+kernel.softirq_exit: 23329.224847657 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { softirq_id = 9 [rcu_process_callbacks+0x0/0x1f] }
+kernel.page_fault_entry: 23329.224855299 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0x807a5fb, address = 0x8111d84, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.224905133 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.224914902 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0x80ce5c0, address = 0x80ce5c0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.224953631 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.224964053 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0x80aaf50, address = 0x80aaf50, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.225001154 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.225017449 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0x80b1950, address = 0x80b1950, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.225055068 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.225066242 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0x80ee5b0, address = 0x80ee5b0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.225102974 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.225113482 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0x80edba0, address = 0x80edba0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.225149412 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.225158829 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0x80edbd9, address = 0x8108dc4, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.225295033 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.225309109 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0x80edcd2, address = 0x92140c0, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.225364059 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.225401925 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb7856b70, address = 0xb7856b70, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.225443007 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.225454347 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb7850ea0, address = 0xb7850ea0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.225491787 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.225501828 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb785a1eb, address = 0xb785a1eb, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.225538849 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.225549659 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb7850ef2, address = 0x80500ed, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.225587968 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.225597416 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb7850f10, address = 0x805feae, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.225633834 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.225650018 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb784c160, address = 0xb784c160, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.225687717 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.225697831 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb784c185, address = 0x8058dea, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.225735166 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.225745373 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb784bda0, address = 0xb784bda0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.225782196 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.225792618 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb784be8e, address = 0x804c6cc, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.225829005 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.225839026 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb7851e10, address = 0xb7851e10, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.225876867 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.225886518 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb7859b60, address = 0xb7859b60, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.225923275 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.225933074 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb7859b70, address = 0x8057e12, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.226001978 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.226015332 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb7859b74, address = 0xb785d0e3, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.226067842 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.226089769 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb784be8e, address = 0xb77f2404, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.226129583 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.226143666 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb784be8e, address = 0xb77ed190, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.226182295 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.226193358 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb784be8e, address = 0xb76a55c0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.226233165 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.226243217 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb784bffd, address = 0xb76a6434, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.226381257 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.226392153 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb784c01d, address = 0xb76a8084, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.226428706 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.226438665 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb784bbe0, address = 0xb76aea0c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.226476303 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.226485123 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb7859b70, address = 0xb76b63e5, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.226521922 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.226531068 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb784bc45, address = 0xb76b83fc, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.226567208 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.226576385 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb7859b70, address = 0xb76b7766, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.226612432 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.226624142 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xb784c3f7, address = 0xb77ec195, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.226717112 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, USER_MODE { res = 8 }
+kernel.syscall_entry: 23329.226733099 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { ip = 0xb7842416, syscall_id = 11 [ptregs_execve+0x0/0xc] }
+kernel.irq_entry: 23329.227138029 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, IRQ { ip = 3242336307, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.sched_try_wakeup: 23329.227165485 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, IRQ { pid = 2269, cpu_id = 0, state = 1 }
+kernel.irq_exit: 23329.227181934 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { handled = 1 }
+kernel.page_fault_get_user_entry: 23329.227187734 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { address = 0xbfffffe6, write_access = 1 }
+kernel.sched_schedule: 23329.227200195 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { prev_pid = 16931, next_pid = 2269, prev_state = 0 }
+fs.pollfd: 23329.227429122 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 4 }
+fs.pollfd: 23329.227435827 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 23329.227440591 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 11 }
+kernel.syscall_exit: 23329.227448258 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.227472615 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 78 [sys_gettimeofday+0x0/0x53] }
+kernel.syscall_exit: 23329.227477452 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.227500793 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 23329.227508613 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { count = 4096, fd = 3 }
+kernel.syscall_exit: 23329.227509968 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = -11 }
+kernel.syscall_entry: 23329.227516773 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 78 [sys_gettimeofday+0x0/0x53] }
+kernel.syscall_exit: 23329.227519620 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.227525124 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 168 [sys_poll+0x0/0x8d] }
+fs.pollfd: 23329.227527940 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 4 }
+fs.pollfd: 23329.227529308 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 23329.227530640 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 11 }
+kernel.syscall_exit: 23329.227532248 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.227541068 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 13 [sys_time+0x0/0x27] }
+kernel.syscall_exit: 23329.227542602 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = 1264196274 }
+kernel.syscall_entry: 23329.227558915 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 23329.227643343 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { count = 1024, fd = 12 }
+kernel.syscall_exit: 23329.227644853 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = 861 }
+kernel.syscall_entry: 23329.227672205 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 23329.227673844 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { count = 1024, fd = 12 }
+kernel.syscall_exit: 23329.227675058 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.227681745 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 140 [sys_llseek+0x0/0xc1] }
+fs.llseek: 23329.227686047 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 12, offset = 0, origin = 0 }
+kernel.syscall_exit: 23329.227688266 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.227776705 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 5 [sys_open+0x0/0x23] }
+fs.open: 23329.227828401 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 14, filename = "/proc/loadavg" }
+kernel.syscall_exit: 23329.227832222 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = 14 }
+kernel.syscall_entry: 23329.227838823 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 197 [sys_fstat64+0x0/0x23] }
+kernel.syscall_exit: 23329.227842182 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.227845756 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 192 [sys_mmap2+0x0/0x76] }
+kernel.syscall_exit: 23329.227860350 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = -1234268160 }
+kernel.syscall_entry: 23329.227863604 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 3 [sys_read+0x0/0x9d] }
+kernel.page_fault_entry: 23329.227880509 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, TRAP { ip = 0xc142bf44, address = 0xb66e9000, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.227970416 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { res = 0 }
+fs.read: 23329.227980973 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { count = 1024, fd = 14 }
+kernel.syscall_exit: 23329.227982422 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = 27 }
+kernel.syscall_entry: 23329.228202504 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 6 [sys_close+0x0/0x112] }
+fs.close: 23329.228205851 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 14 }
+kernel.syscall_exit: 23329.228297045 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.228302752 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 91 [sys_munmap+0x0/0x3d] }
+mm.page_free: 23329.228346257 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { pfn = 280724, order = 0 }
+kernel.syscall_exit: 23329.228586147 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.228600161 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 23329.228665614 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { count = 1024, fd = 6 }
+kernel.syscall_exit: 23329.228667068 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = 1024 }
+kernel.syscall_entry: 23329.228727065 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 23329.228746338 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { count = 1024, fd = 6 }
+kernel.syscall_exit: 23329.228748216 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = 305 }
+kernel.syscall_entry: 23329.228768474 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 23329.228771784 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { count = 1024, fd = 6 }
+kernel.syscall_exit: 23329.228773035 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.228778033 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 140 [sys_llseek+0x0/0xc1] }
+fs.llseek: 23329.228780893 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 6, offset = 0, origin = 0 }
+kernel.syscall_exit: 23329.228782841 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.228824687 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 23329.228854030 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { count = 1024, fd = 8 }
+kernel.syscall_exit: 23329.228855374 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = 449 }
+kernel.syscall_entry: 23329.228867367 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 23329.228869068 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { count = 1024, fd = 8 }
+kernel.syscall_exit: 23329.228870294 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.228873783 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 140 [sys_llseek+0x0/0xc1] }
+fs.llseek: 23329.228876174 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 8, offset = 0, origin = 0 }
+kernel.syscall_exit: 23329.228877875 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.228884864 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 23329.228910619 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { count = 1024, fd = 9 }
+kernel.syscall_exit: 23329.228911796 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = 1024 }
+kernel.syscall_entry: 23329.228925139 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 23329.228933466 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { count = 1024, fd = 9 }
+kernel.syscall_exit: 23329.228934686 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = 383 }
+kernel.syscall_entry: 23329.228940559 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 23329.228941921 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { count = 1024, fd = 9 }
+kernel.syscall_exit: 23329.228943105 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.228946402 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 140 [sys_llseek+0x0/0xc1] }
+fs.llseek: 23329.228948115 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 9, offset = 0, origin = 0 }
+kernel.syscall_exit: 23329.228949761 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.229107460 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 168 [sys_poll+0x0/0x8d] }
+fs.pollfd: 23329.229141647 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 3 }
+kernel.syscall_exit: 23329.229147588 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = 1 }
+kernel.syscall_entry: 23329.229152981 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 146 [sys_writev+0x0/0xcd] }
+kernel.sched_try_wakeup: 23329.229184714 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { pid = 1989, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 23329.229201003 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { prev_pid = 2269, next_pid = 1989, prev_state = 0 }
+fs.select: 23329.229532865 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 1, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229537888 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 3, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229541363 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 5, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229553006 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 7, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229556007 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 13, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229558935 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 19, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229562097 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 20, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229564925 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 21, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229567852 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 22, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229570705 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 23, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229573990 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 24, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229576782 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 25, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229580080 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 26, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229583056 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 27, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229585928 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 28, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229589719 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 29, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229593823 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 30, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229597608 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 31, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229600923 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 32, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229604405 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 33, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229606975 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 34, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229609891 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 35, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229613373 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 37, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229616239 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 38, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229619394 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 39, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229622433 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 40, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229625550 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 41, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229629009 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 42, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229631818 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 43, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229634419 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 44, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229637408 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 45, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229639621 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 46, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229643645 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 48, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229646776 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 49, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229649851 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 50, end_time_sec = 23660, end_time_nsec = 559657919 }
+fs.select: 23329.229653075 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 52, end_time_sec = 23660, end_time_nsec = 559657919 }
+mm.page_free: 23329.229664359 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { pfn = 197912, order = 0 }
+kernel.syscall_exit: 23329.229675767 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, USER_MODE { ret = 1 }
+kernel.syscall_entry: 23329.229706274 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 104 [sys_setitimer+0x0/0x6f] }
+kernel.timer_itimer_set: 23329.229710508 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 20000, value_sec = 0, value_usec = 20000 }
+kernel.syscall_exit: 23329.229725916 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.229732079 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7657e4c, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 23329.229735684 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.229749835 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 23329.229766038 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 4096, fd = 45 }
+kernel.syscall_exit: 23329.229767917 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, USER_MODE { ret = 724 }
+kernel.syscall_entry: 23329.230129466 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 23329.230136936 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { count = 4096, fd = 45 }
+kernel.syscall_exit: 23329.230138907 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, USER_MODE { ret = -11 }
+kernel.syscall_entry: 23329.230143925 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7657e4c, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 23329.230147635 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.230151905 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 104 [sys_setitimer+0x0/0x6f] }
+kernel.timer_itimer_set: 23329.230155363 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { which = 0, interval_sec = 0, interval_usec = 0, value_sec = 0, value_usec = 0 }
+kernel.syscall_exit: 23329.230161649 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.230173082 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { ip = 0xb7851416, syscall_id = 142 [sys_select+0x0/0x8f] }
+fs.select: 23329.230182579 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 1, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230186647 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 3, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230189685 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 5, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230196717 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 7, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230198825 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 13, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230201506 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 19, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230203940 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 20, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230206387 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 21, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230208697 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 22, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230211133 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 23, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230213159 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 24, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230215940 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 25, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230218350 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 26, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230220525 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 27, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230223205 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 28, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230225530 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 29, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230228562 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 30, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230230835 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 31, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230246983 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 32, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230249485 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 33, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230251858 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 34, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230254274 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 35, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230256579 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 37, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230259389 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 38, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230261318 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 39, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230263488 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 40, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230265910 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 41, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230268381 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 42, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230270550 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 43, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230273583 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 44, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230275993 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 45, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230278156 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 46, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230281102 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 48, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230283838 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 49, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230287203 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 50, end_time_sec = 23660, end_time_nsec = 559754442 }
+fs.select: 23329.230289434 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 1989, 1989, Xorg, , 1987, 0x0, SYSCALL { fd = 52, end_time_sec = 23660, end_time_nsec = 559754442 }
+kernel.sched_schedule: 23329.230327275 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { prev_pid = 1989, next_pid = 2269, prev_state = 1 }
+fs.writev: 23329.230794699 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 3, vlen = 3 }
+kernel.syscall_exit: 23329.230799814 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = 724 }
+kernel.syscall_entry: 23329.230823339 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 23329.230831541 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { count = 4096, fd = 3 }
+kernel.syscall_exit: 23329.230832780 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = -11 }
+kernel.syscall_entry: 23329.230847140 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 78 [sys_gettimeofday+0x0/0x53] }
+kernel.syscall_exit: 23329.230851232 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.230859540 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { ip = 0xb7836416, syscall_id = 168 [sys_poll+0x0/0x8d] }
+fs.pollfd: 23329.230866702 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 4 }
+fs.pollfd: 23329.230872224 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 23329.230874110 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2269, 2269, gkrellm, , 2161, 0x0, SYSCALL { fd = 11 }
+kernel.sched_schedule: 23329.230910496 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { prev_pid = 2269, next_pid = 16931, prev_state = 1 }
+kernel.page_fault_get_user_exit: 23329.231272575 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { res = 0 }
+mm.page_free: 23329.232062357 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 262679, order = 0 }
+mm.page_free: 23329.232111704 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 284414, order = 0 }
+mm.page_free: 23329.232134033 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 277138, order = 0 }
+mm.page_free: 23329.232139998 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 284413, order = 0 }
+mm.page_free: 23329.232146470 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 284415, order = 0 }
+mm.page_free: 23329.232152645 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 277137, order = 0 }
+mm.page_free: 23329.232160072 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 354206, order = 0 }
+mm.page_free: 23329.232183522 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 262677, order = 0 }
+mm.page_free: 23329.232206899 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 262672, order = 0 }
+mm.page_free: 23329.232213973 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 262674, order = 0 }
+mm.page_free: 23329.232220803 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 262673, order = 0 }
+mm.page_free: 23329.232235452 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 262676, order = 0 }
+mm.page_free: 23329.232268160 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 262675, order = 0 }
+mm.page_free: 23329.232274988 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 284412, order = 0 }
+mm.page_free: 23329.232343145 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 277136, order = 0 }
+mm.page_free: 23329.232350295 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 262678, order = 0 }
+mm.page_free: 23329.233099086 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 277140, order = 0 }
+mm.page_free: 23329.233302787 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 277139, order = 0 }
+mm.page_free: 23329.233424482 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 261814, order = 0 }
+mm.page_free: 23329.233437468 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 232881, order = 0 }
+mm.page_free: 23329.233871845 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 261815, order = 0 }
+mm.page_free: 23329.233909496 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 277142, order = 0 }
+mm.page_free: 23329.233917224 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 277141, order = 0 }
+mm.page_free: 23329.233990392 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 377733, order = 0 }
+mm.page_free: 23329.233997589 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 377568, order = 0 }
+mm.page_free: 23329.234026840 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 377730, order = 0 }
+mm.page_free: 23329.234033619 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 377752, order = 0 }
+mm.page_free: 23329.234041631 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 377665, order = 0 }
+mm.page_free: 23329.234063350 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { pfn = 31279, order = 0 }
+fs.close: 23329.234106842 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { fd = 255 }
+kernel.page_fault_entry: 23329.234215336 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xc142b8ac, address = 0x804c500, trap_id = 14, write_access = 1 }
+kernel.irq_entry: 23329.234431000 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, IRQ { ip = 3238617874, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.sched_try_wakeup: 23329.234470863 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, IRQ { pid = 5705, cpu_id = 0, state = 1 }
+kernel.timer_update_time: 23329.234497870 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, IRQ { jiffies = 4297269594, xtime_sec = 1264196274, xtime_nsec = 637522013, walltomonotonic_sec = -1264172952, walltomonotonic_nsec = 189579727 }
+kernel.softirq_raise: 23329.234522183 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, IRQ { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.softirq_raise: 23329.234532136 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, IRQ { softirq_id = 9 [rcu_process_callbacks+0x0/0x1f] }
+kernel.irq_exit: 23329.234566409 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { handled = 1 }
+kernel.softirq_entry: 23329.234573257 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SOFTIRQ { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.timer_set: 23329.234596558 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SOFTIRQ { expires = 2302299, function = 0xc141d458, data = 0 }
+kernel.softirq_exit: 23329.234600688 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.softirq_entry: 23329.234602592 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SOFTIRQ { softirq_id = 9 [rcu_process_callbacks+0x0/0x1f] }
+rcu.tree_callback: 23329.234724529 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16931, 16931, bash, , 16908, 0x0, SOFTIRQ { func = 0xc14285e3 }
+rcu.tree_callback: 23329.234731524 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16931, 16931, bash, , 16908, 0x0, SOFTIRQ { func = 0xc14285e3 }
+rcu.tree_callback: 23329.234733046 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16931, 16931, bash, , 16908, 0x0, SOFTIRQ { func = 0xc14285e3 }
+rcu.tree_callback: 23329.234734624 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16931, 16931, bash, , 16908, 0x0, SOFTIRQ { func = 0xc14285e3 }
+rcu.tree_callback: 23329.234736269 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16931, 16931, bash, , 16908, 0x0, SOFTIRQ { func = 0xc14285e3 }
+rcu.tree_callback: 23329.234738124 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16931, 16931, bash, , 16908, 0x0, SOFTIRQ { func = 0xc14285e3 }
+rcu.tree_callback: 23329.234739862 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16931, 16931, bash, , 16908, 0x0, SOFTIRQ { func = 0xc141a9af }
+rcu.tree_callback: 23329.234743251 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16931, 16931, bash, , 16908, 0x0, SOFTIRQ { func = 0xc10acb19 }
+rcu.tree_callback: 23329.234746062 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16931, 16931, bash, , 16908, 0x0, SOFTIRQ { func = 0xc10acb19 }
+kernel.softirq_exit: 23329.234748115 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { softirq_id = 9 [rcu_process_callbacks+0x0/0x1f] }
+kernel.sched_schedule: 23329.234791508 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 5705, 5069, icedove-bin, , 5063, 0x0, SYSCALL { prev_pid = 16931, next_pid = 5705, prev_state = 0 }
+kernel.syscall_exit: 23329.234964578 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 5705, 5069, icedove-bin, , 5063, 0x0, USER_MODE { ret = -110 }
+kernel.syscall_entry: 23329.235020219 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 5705, 5069, icedove-bin, , 5063, 0x0, SYSCALL { ip = 0xb7710416, syscall_id = 78 [sys_gettimeofday+0x0/0x53] }
+kernel.syscall_exit: 23329.235023590 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 5705, 5069, icedove-bin, , 5063, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.235027042 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 5705, 5069, icedove-bin, , 5063, 0x0, SYSCALL { ip = 0xb7710416, syscall_id = 240 [sys_futex+0x0/0x111] }
+kernel.syscall_exit: 23329.235029871 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 5705, 5069, icedove-bin, , 5063, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.235032828 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 5705, 5069, icedove-bin, , 5063, 0x0, SYSCALL { ip = 0xb7710416, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 23329.235035584 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 5705, 5069, icedove-bin, , 5063, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.235038584 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 5705, 5069, icedove-bin, , 5063, 0x0, SYSCALL { ip = 0xb7710416, syscall_id = 240 [sys_futex+0x0/0x111] }
+kernel.sched_schedule: 23329.235058275 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { prev_pid = 5705, next_pid = 16931, prev_state = 1 }
+kernel.page_fault_exit: 23329.235223833 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { res = 512 }
+kernel.page_fault_entry: 23329.235303349 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xc142b8ac, address = 0xb77b25bc, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.235478725 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { res = 512 }
+kernel.page_fault_entry: 23329.235544508 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, TRAP { ip = 0xc10db75b, address = 0xbfc2df30, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.235599138 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, bash, , 16908, 0x0, SYSCALL { res = 0 }
+fs.exec: 23329.235615896 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { filename = "/usr/local/bin/lttctl" }
+kernel.syscall_exit: 23329.235620370 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.235627051 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb7795850, address = 0xb7795850, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.235664319 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.235673958 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb77ac1eb, address = 0xb77ac1eb, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.235709801 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.235719348 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb7795ab7, address = 0xb77b1ff4, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.235754891 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.235764129 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb7795b34, address = 0xb77b1f38, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.235839915 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.235850209 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779db00, address = 0xb779db00, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.235885979 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.235895143 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb77a9840, address = 0xb77a9840, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.235931560 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.235941378 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb77aa3f0, address = 0xb77aa3f0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.235977482 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.235985660 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77aa40b, syscall_id = 45 [sys_brk+0x0/0xd3] }
+kernel.syscall_exit: 23329.235987268 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 146923520 }
+kernel.page_fault_entry: 23329.235991835 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb77abbe0, address = 0xb77abbe0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.236058563 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.236068325 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb7796df0, address = 0xb7796df0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.236104249 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.236114289 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779701e, address = 0xb779701e, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.236149807 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.236158866 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779ef20, address = 0xb779ef20, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.236194495 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.236203320 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb77abbeb, address = 0xb77af0e3, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.236239189 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.236248174 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779f118, address = 0xb779f118, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.236283730 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.236294964 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779711a, address = 0x8048034, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.236331049 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.236342149 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779749d, address = 0xb779401c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.236378184 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 0 }
+kernel.page_fault_entry: 23329.236378186 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb77a8c60, address = 0xb77a8c60, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.236378191 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.236378193 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779ce90, address = 0xb779ce90, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.236378195 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.236378198 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab5e1, syscall_id = 33 [sys_access+0x0/0x13] }
+kernel.syscall_exit: 23329.236378201 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = -2 }
+kernel.syscall_entry: 23329.236378203 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab723, syscall_id = 192 [sys_mmap2+0x0/0x76] }
+kernel.syscall_exit: 23329.236378205 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = -1216798720 }
+kernel.page_fault_entry: 23329.236378207 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779cf6e, address = 0xb779200c, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.236437626 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 0 }
+kernel.page_fault_entry: 23329.236448162 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb77a3d70, address = 0xb77a3d70, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.236489690 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.236499806 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb7798469, address = 0xb7798469, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.236541877 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.236550197 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab5e1, syscall_id = 33 [sys_access+0x0/0x13] }
+kernel.syscall_exit: 23329.236594842 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = -2 }
+kernel.page_fault_entry: 23329.236601217 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb77a1700, address = 0xb77a1700, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.236639005 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.236648325 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb77a219f, address = 0xb77a219f, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.236684185 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.236696444 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb77a4480, address = 0xb77a4480, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.236732892 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.236740990 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab4a4, syscall_id = 5 [sys_open+0x0/0x23] }
+fs.open: 23329.236751599 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { fd = 3, filename = "/etc/ld.so.cache" }
+kernel.syscall_exit: 23329.236753858 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 3 }
+kernel.syscall_entry: 23329.236757531 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab46e, syscall_id = 197 [sys_fstat64+0x0/0x23] }
+kernel.syscall_exit: 23329.236759852 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.236762913 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab723, syscall_id = 192 [sys_mmap2+0x0/0x76] }
+kernel.syscall_exit: 23329.236766320 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = -1216892928 }
+kernel.syscall_entry: 23329.236769431 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab4dd, syscall_id = 6 [sys_close+0x0/0x112] }
+fs.close: 23329.236770863 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { fd = 3 }
+kernel.syscall_exit: 23329.236772777 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.236777338 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779d4fe, address = 0xb777b000, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.236814557 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.236823531 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779d957, address = 0xb777e568, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.236859387 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.236867645 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab5e1, syscall_id = 33 [sys_access+0x0/0x13] }
+kernel.syscall_exit: 23329.236891414 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = -2 }
+kernel.page_fault_entry: 23329.236897377 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779d5fc, address = 0xb7781c8c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.236934306 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.236942985 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779d3b7, address = 0xb778b9b1, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.236978672 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.236987332 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779d637, address = 0xb77800fc, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.237023051 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.237031453 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779d3b7, address = 0xb778857b, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.237085645 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.237095428 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779d3b7, address = 0xb7789dae, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.237130264 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.237140899 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779a260, address = 0xb779a260, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.237176675 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.237184636 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab4a4, syscall_id = 5 [sys_open+0x0/0x23] }
+fs.open: 23329.237259265 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { fd = 3, filename = "/usr/local/lib/liblttctl.so.0" }
+kernel.syscall_exit: 23329.237261809 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 3 }
+kernel.syscall_entry: 23329.237265982 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab524, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 23329.237292942 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { count = 512, fd = 3 }
+kernel.syscall_exit: 23329.237294448 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 512 }
+kernel.page_fault_entry: 23329.237300769 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb7799a80, address = 0xb7799a80, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.237344092 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.237353258 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb77ac0bf, address = 0xb7793838, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.237405204 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 0 }
+kernel.syscall_entry: 23329.237413327 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab46e, syscall_id = 197 [sys_fstat64+0x0/0x23] }
+kernel.syscall_exit: 23329.237415308 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.237421005 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779b028, address = 0xb779b028, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.237457675 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.237465181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab723, syscall_id = 192 [sys_mmap2+0x0/0x76] }
+kernel.syscall_exit: 23329.237468934 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = -1216913408 }
+kernel.syscall_entry: 23329.237472409 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab723, syscall_id = 192 [sys_mmap2+0x0/0x76] }
+kernel.syscall_exit: 23329.237497344 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = -1216901120 }
+kernel.page_fault_entry: 23329.237503498 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb77abfcf, address = 0xb7779b48, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.237570745 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.237579565 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab723, syscall_id = 192 [sys_mmap2+0x0/0x76] }
+kernel.syscall_exit: 23329.237601181 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = -1216897024 }
+kernel.syscall_entry: 23329.237605669 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab4dd, syscall_id = 6 [sys_close+0x0/0x112] }
+fs.close: 23329.237607360 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { fd = 3 }
+kernel.syscall_exit: 23329.237609076 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.237614279 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779db29, address = 0xb7776248, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.237650948 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.237660478 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab5e1, syscall_id = 33 [sys_access+0x0/0x13] }
+kernel.syscall_exit: 23329.237706955 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = -2 }
+kernel.page_fault_entry: 23329.237713338 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779d637, address = 0xb7783804, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.237750940 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.237759625 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779d3b7, address = 0xb778ef16, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.237795843 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.237804089 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779d637, address = 0xb77845cc, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.237840290 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.237848426 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779d3b7, address = 0xb7790835, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.237883484 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.237892131 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779d3b7, address = 0xb778fb6f, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.237933048 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.237942164 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab4a4, syscall_id = 5 [sys_open+0x0/0x23] }
+fs.open: 23329.237956441 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { fd = 3, filename = "/lib/i686/cmov/libc.so.6" }
+kernel.syscall_exit: 23329.237959194 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 3 }
+kernel.syscall_entry: 23329.237962841 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab524, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 23329.237988444 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { count = 512, fd = 3 }
+kernel.syscall_exit: 23329.237989919 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 512 }
+kernel.syscall_entry: 23329.237994443 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab46e, syscall_id = 197 [sys_fstat64+0x0/0x23] }
+kernel.syscall_exit: 23329.237996259 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.238002603 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb77a59a0, address = 0xb77a59a0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.238040057 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.238048211 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab723, syscall_id = 192 [sys_mmap2+0x0/0x76] }
+kernel.syscall_exit: 23329.238052432 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = -1218252800 }
+kernel.syscall_entry: 23329.238055784 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab723, syscall_id = 192 [sys_mmap2+0x0/0x76] }
+kernel.syscall_exit: 23329.238110829 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = -1216937984 }
+kernel.page_fault_entry: 23329.238117180 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb77abfcf, address = 0xb777299c, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.238185557 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.238194544 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab723, syscall_id = 192 [sys_mmap2+0x0/0x76] }
+kernel.syscall_exit: 23329.238216209 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = -1216925696 }
+kernel.page_fault_entry: 23329.238221937 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779b2ee, address = 0xb7771d7c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.238258563 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.238267451 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779b371, address = 0xb7771da8, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.238341766 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 8 }
+kernel.syscall_entry: 23329.238349518 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab4dd, syscall_id = 6 [sys_close+0x0/0x112] }
+fs.close: 23329.238351313 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { fd = 3 }
+kernel.syscall_exit: 23329.238353185 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.238357771 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779db29, address = 0xb762f1b8, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.238393588 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.238404038 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb77aba07, address = 0xb764174e, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.238440170 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.238452503 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb77a4595, address = 0xb7642a88, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.238498092 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.238534786 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab723, syscall_id = 192 [sys_mmap2+0x0/0x76] }
+kernel.syscall_exit: 23329.238538798 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = -1218256896 }
+kernel.page_fault_entry: 23329.238543594 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb77a4bd1, address = 0xb762e1c4, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.238597825 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 0 }
+kernel.page_fault_entry: 23329.238611785 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb77a6470, address = 0xb77a6470, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.238659435 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.238668652 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab723, syscall_id = 192 [sys_mmap2+0x0/0x76] }
+kernel.syscall_exit: 23329.238671348 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = -1218260992 }
+kernel.page_fault_entry: 23329.238675829 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb77a63b0, address = 0xb762d000, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.238729035 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 0 }
+kernel.syscall_entry: 23329.238736774 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb7796c40, syscall_id = 243 [sys_set_thread_area+0x0/0x1b] }
+kernel.syscall_exit: 23329.238757835 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.238767025 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb77a00a8, address = 0xb77a00a8, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.238802856 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.238811774 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779fd23, address = 0xb77701d0, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.238876658 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.238885546 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779fd08, address = 0xb7643000, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.238921728 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.238932277 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779fd08, address = 0xb7644000, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.238968588 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.238979211 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779fd08, address = 0xb7645000, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.239014899 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.239024515 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779fe01, address = 0xb763475c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.239059599 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.239067833 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779e185, address = 0xb7640d69, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.239135284 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.239145487 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779e01d, address = 0xb7630fd4, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.239182558 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.239192087 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779fe01, address = 0xb7638eec, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.239244281 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.239253891 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779e185, address = 0xb763f986, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.239301757 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.239311238 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779e01d, address = 0xb76321bc, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.239347161 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.239356728 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779e185, address = 0xb763c204, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.239393447 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.239402254 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779e01d, address = 0xb7631e34, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.239437894 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.239447708 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779fe01, address = 0xb7637a5c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.239483075 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.239492234 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779fe01, address = 0xb763b34c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.239528065 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.239537410 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779e185, address = 0xb763d511, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.239573437 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.239582616 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779fe01, address = 0xb7635d1c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.239618600 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.239627883 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779fe01, address = 0xb763a03c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.239663060 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.239672287 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779fe01, address = 0xb7633afc, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.239707981 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.239725863 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779fe01, address = 0xb76392fc, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.239762311 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.239772636 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779e185, address = 0xb763e050, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.239808510 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.239826293 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb779fe01, address = 0xb76362fc, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.239866906 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.239890923 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab7a4, syscall_id = 125 [sys_mprotect+0x0/0x1df] }
+kernel.syscall_exit: 23329.239966348 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.239980928 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb77ac0c7, address = 0xb77756c0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.240003851 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 0 }
+kernel.syscall_entry: 23329.240016418 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab7a4, syscall_id = 125 [sys_mprotect+0x0/0x1df] }
+kernel.syscall_exit: 23329.240072092 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.240080110 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb77ab761, syscall_id = 91 [sys_munmap+0x0/0x3d] }
+kernel.syscall_exit: 23329.240307726 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.240316244 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb7645a17, address = 0xb777555c, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.240381059 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.240390398 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb7645a29, address = 0xb7773d64, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.240442498 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 0 }
+kernel.page_fault_entry: 23329.240451442 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb76fe010, address = 0xb76fe010, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.240487322 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.240496927 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb76a2dc0, address = 0xb76a2dc0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.240533046 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.240542435 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb769a010, address = 0xb769a010, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.240602837 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.240612558 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb7735900, address = 0xb7735900, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.240649221 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.240659962 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb7778430, address = 0xb7778430, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.240695243 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.240706297 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb765e720, address = 0xb765e720, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.240741788 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.240752083 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0x804a1f0, address = 0x804a1f0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.240788389 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.240797993 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb7659680, address = 0xb7659680, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.240833866 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.240843563 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0x8049680, address = 0x8049680, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.240878973 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.240891694 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb76a4a20, address = 0xb76a4a20, trap_id = 14, write_access = 0 }
+kernel.irq_entry: 23329.240959464 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, IRQ { ip = 3242336307, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.sched_try_wakeup: 23329.240973920 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, IRQ { pid = 8996, cpu_id = 0, state = 1 }
+kernel.irq_exit: 23329.240986240 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { handled = 1 }
+kernel.page_fault_exit: 23329.240990024 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.sched_schedule: 23329.240997240 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, SYSCALL { prev_pid = 16931, next_pid = 8996, prev_state = 0 }
+kernel.syscall_exit: 23329.241063116 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, USER_MODE { ret = -110 }
+kernel.syscall_entry: 23329.241074103 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 240 [sys_futex+0x0/0x111] }
+kernel.syscall_exit: 23329.241076480 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.241081313 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb6a53e4c, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 23329.241084214 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.241094127 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 78 [sys_gettimeofday+0x0/0x53] }
+kernel.syscall_exit: 23329.241096595 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.241100632 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb6a53e4c, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 23329.241102873 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.241105872 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb6a53e4c, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 23329.241108075 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.241111593 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 78 [sys_gettimeofday+0x0/0x53] }
+kernel.syscall_exit: 23329.241113964 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.241119988 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 23329.241122228 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.241125271 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 8996, 4081, eclipse, , 4080, 0x0, SYSCALL { ip = 0xb78a6416, syscall_id = 240 [sys_futex+0x0/0x111] }
+kernel.sched_schedule: 23329.241150924 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { prev_pid = 8996, next_pid = 16931, prev_state = 1 }
+kernel.page_fault_entry: 23329.241221763 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0x8049181, address = 0x804d58c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.241265309 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 0 }
+kernel.page_fault_entry: 23329.241276333 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb769f120, address = 0xb769f120, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.241313225 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.241322792 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb76f7320, address = 0xb76f7320, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.241358523 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.241367844 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb7737f36, address = 0xb7737f36, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.241403013 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.241411981 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb769affb, address = 0xb769b000, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.241447849 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.241457361 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb7734c10, address = 0xb7734c10, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.241493339 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.241543920 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb770bcb0, address = 0xb770bcb0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.241580140 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.241590170 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb769cc10, address = 0xb769cc10, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.241625488 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.241634308 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb769d5d7, address = 0xb769d5d7, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.241669916 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.241680477 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb76a0a70, address = 0xb76a0a70, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.241716258 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.241725072 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb76f63f0, address = 0xb76f63f0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.241760434 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.241769049 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb7794416, syscall_id = 45 [sys_brk+0x0/0xd3] }
+kernel.syscall_exit: 23329.241770660 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 146923520 }
+kernel.syscall_entry: 23329.241774013 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb7794416, syscall_id = 45 [sys_brk+0x0/0xd3] }
+kernel.syscall_exit: 23329.241777086 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 147058688 }
+kernel.page_fault_entry: 23329.241781937 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb769dc42, address = 0x8c1e004, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.241927777 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 0 }
+kernel.page_fault_entry: 23329.241945658 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0x80492e4, address = 0x804d58c, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.242008986 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 8 }
+kernel.page_fault_entry: 23329.242020960 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb76d52c0, address = 0xb76d52c0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.242057235 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.242066777 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb76d3ff0, address = 0xb76d3ff0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.242108237 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.242117279 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb76d3fff, address = 0xb76d4000, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.242153621 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.242191952 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb765db70, address = 0xb765db70, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.242230079 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.242239275 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb76a29cb, address = 0xb775444b, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.242275044 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.242285845 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0x80496e8, address = 0x804b17c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.242321564 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.242333088 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb768cd70, address = 0xb768cd70, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.242369448 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.242379102 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb7696200, address = 0xb7696200, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.242415643 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.242425191 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb7697f80, address = 0xb7697f80, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.242474378 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.242484513 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb768a800, address = 0xb768a800, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.242519911 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.242529392 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb76ee630, address = 0xb76ee630, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.242565136 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.242573358 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb7794416, syscall_id = 197 [sys_fstat64+0x0/0x23] }
+kernel.syscall_exit: 23329.242576697 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.page_fault_entry: 23329.242581430 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb76fa8b0, address = 0xb76fa8b0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.242617644 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.242625939 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb7794416, syscall_id = 192 [sys_mmap2+0x0/0x76] }
+kernel.syscall_exit: 23329.242628618 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = -1216802816 }
+kernel.page_fault_entry: 23329.242633284 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb7698c40, address = 0xb7698c40, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.242669565 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.242678934 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb7696ef4, address = 0xb7791000, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.242730800 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 0 }
+kernel.page_fault_entry: 23329.242740812 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb7699700, address = 0xb7699700, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.242776056 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.242785870 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb76ef3d0, address = 0xb76ef3d0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.242821175 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.242829199 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb7794416, syscall_id = 4 [sys_write+0x0/0x9d] }
+kernel.timer_set: 23329.242843013 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { expires = 2302299, function = 0xc103b8db, data = 4057105572 }
+kernel.sched_try_wakeup: 23329.242850043 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { pid = 16931, cpu_id = 0, state = 1 }
+fs.write: 23329.242860858 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { count = 48, fd = 1 }
+kernel.syscall_exit: 23329.242862388 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 48 }
+kernel.page_fault_entry: 23329.242869098 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb768dcd0, address = 0xb768dcd0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.242906112 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.242914760 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb7794416, syscall_id = 4 [sys_write+0x0/0x9d] }
+kernel.sched_try_wakeup: 23329.242921389 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { pid = 16931, cpu_id = 0, state = 1 }
+fs.write: 23329.242926253 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { count = 1, fd = 1 }
+kernel.syscall_exit: 23329.242927673 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 1 }
+kernel.page_fault_entry: 23329.242934166 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb7676cb0, address = 0xb7676cb0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.242970508 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.242980199 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb766c710, address = 0xb766c710, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.243015331 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.243024436 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb766eea0, address = 0xb766eea0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.243060081 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.243069278 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb7670de2, address = 0xb7670de2, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.243116502 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.243126698 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb76a7420, address = 0xb76a7420, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.243161862 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.243172170 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb766ca85, address = 0xb774d193, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.243242535 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.243270643 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb766dd36, address = 0xb766dd36, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.243308071 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.243317250 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb766f7fb, address = 0xb766f7fb, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.243353130 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.243362894 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb7794416, syscall_id = 4 [sys_write+0x0/0x9d] }
+kernel.sched_try_wakeup: 23329.243369832 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { pid = 16931, cpu_id = 0, state = 1 }
+fs.write: 23329.243378220 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { count = 26, fd = 1 }
+kernel.syscall_exit: 23329.243379597 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 26 }
+kernel.syscall_entry: 23329.243384225 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb7794416, syscall_id = 4 [sys_write+0x0/0x9d] }
+kernel.sched_try_wakeup: 23329.243389072 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { pid = 16931, cpu_id = 0, state = 1 }
+fs.write: 23329.243393237 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { count = 1, fd = 1 }
+kernel.syscall_exit: 23329.243394595 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 1 }
+kernel.page_fault_entry: 23329.243401736 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb7776c8d, address = 0xbfc2be04, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.243455702 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 0 }
+kernel.page_fault_entry: 23329.243466651 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb768b350, address = 0xb768b350, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.243502981 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.243513912 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb7794416, syscall_id = 5 [sys_open+0x0/0x23] }
+fs.open: 23329.243635155 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { fd = 3, filename = "/proc/mounts" }
+kernel.syscall_exit: 23329.243637938 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 3 }
+kernel.page_fault_entry: 23329.243644864 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb76a3a00, address = 0xb76a3a00, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.243683133 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.243692736 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb76a3a5d, address = 0xb7753b0c, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.243728721 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.243739263 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb767e6a0, address = 0xb767e6a0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.243775255 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.243784852 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb767a0ba, address = 0xb767a0ba, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.243820652 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.243829676 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb767c4c4, address = 0xb767c4c4, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.243865055 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.243874350 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb7676e5b, address = 0xb7752a47, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.243922031 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.243931790 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb767735e, address = 0xb767735e, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.243967509 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.243977120 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb7678d78, address = 0xb7678d78, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.244013024 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.244022603 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb7794416, syscall_id = 197 [sys_fstat64+0x0/0x23] }
+kernel.syscall_exit: 23329.244024689 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.244028164 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb7794416, syscall_id = 192 [sys_mmap2+0x0/0x76] }
+kernel.syscall_exit: 23329.244030615 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = -1216806912 }
+kernel.syscall_entry: 23329.244034016 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb7794416, syscall_id = 3 [sys_read+0x0/0x9d] }
+kernel.page_fault_entry: 23329.244127804 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xc142bf44, address = 0xb7790000, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.244182559 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { res = 0 }
+fs.read: 23329.244188885 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { count = 1024, fd = 3 }
+kernel.syscall_exit: 23329.244190330 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 717 }
+kernel.page_fault_entry: 23329.244195817 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb7677494, address = 0xb773f4a5, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.244281939 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.244292734 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb7679899, address = 0xb7679899, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.244329410 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.page_fault_entry: 23329.244339243 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb7677fee, address = 0xbfc2ce3c, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.244392269 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 0 }
+kernel.page_fault_entry: 23329.244416366 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb76c41e0, address = 0xb76c41e0, trap_id = 14, write_access = 0 }
+kernel.irq_entry: 23329.244461048 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, IRQ { ip = 3242336307, handler = 0x0, irq_id = 239, kernel_mode = 1 }
+kernel.timer_update_time: 23329.244474392 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, IRQ { jiffies = 4297269595, xtime_sec = 1264196274, xtime_nsec = 637522014, walltomonotonic_sec = -1264172952, walltomonotonic_nsec = 189579727 }
+kernel.softirq_raise: 23329.244484034 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, IRQ { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.softirq_raise: 23329.244489879 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, IRQ { softirq_id = 9 [rcu_process_callbacks+0x0/0x1f] }
+kernel.irq_exit: 23329.244508988 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { handled = 1 }
+kernel.softirq_entry: 23329.244511902 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SOFTIRQ { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.timer_set: 23329.244519925 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SOFTIRQ { expires = 2302300, function = 0xc141d458, data = 0 }
+kernel.sched_try_wakeup: 23329.244529023 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SOFTIRQ { pid = 5, cpu_id = 0, state = 1 }
+kernel.softirq_exit: 23329.244533548 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { softirq_id = 1 [run_timer_softirq+0x0/0x254] }
+kernel.softirq_entry: 23329.244535041 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SOFTIRQ { softirq_id = 9 [rcu_process_callbacks+0x0/0x1f] }
+rcu.tree_callback: 23329.244583166 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SOFTIRQ { func = 0xc104364a }
+rcu.tree_callback: 23329.244604461 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SOFTIRQ { func = 0xc10acb19 }
+rcu.tree_callback: 23329.244606782 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SOFTIRQ { func = 0xc10b8ec2 }
+kernel.softirq_exit: 23329.244608800 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { softirq_id = 9 [rcu_process_callbacks+0x0/0x1f] }
+kernel.page_fault_exit: 23329.244612022 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.sched_schedule: 23329.244619244 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 5, 5, events/0, , 2, 0x0, SYSCALL { prev_pid = 16931, next_pid = 5, prev_state = 0 }
+kernel.sched_try_wakeup: 23329.244701564 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 5, 5, events/0, , 2, 0x0, SYSCALL { pid = 2336, cpu_id = 0, state = 1 }
+kernel.sched_schedule: 23329.244715002 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { prev_pid = 5, next_pid = 2336, prev_state = 1 }
+fs.pollfd: 23329.244788582 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 23329.244791617 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 9 }
+fs.pollfd: 23329.244794710 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+fs.pollfd: 23329.244796550 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 5 }
+fs.pollfd: 23329.244798606 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 12 }
+fs.pollfd: 23329.244803056 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 19 }
+fs.pollfd: 23329.244804914 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 16 }
+fs.pollfd: 23329.244807758 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 26 }
+fs.pollfd: 23329.244809826 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 10 }
+fs.pollfd: 23329.244812128 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 17 }
+kernel.syscall_exit: 23329.244817159 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, USER_MODE { ret = 1 }
+kernel.syscall_entry: 23329.244840972 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 23329.244845601 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 23329.244846873 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, USER_MODE { ret = -11 }
+kernel.syscall_entry: 23329.244875229 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 54 [sys_ioctl+0x0/0x9d] }
+fs.ioctl: 23329.244877561 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 10, cmd = 21531, arg = 3215728168 }
+kernel.syscall_exit: 23329.244881345 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.244885512 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 23329.244892091 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { count = 80, fd = 10 }
+kernel.syscall_exit: 23329.244893331 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, USER_MODE { ret = 80 }
+kernel.syscall_entry: 23329.244947394 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb6094e4c, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 23329.244950863 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.244956654 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb6094e4c, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 23329.244958931 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.245032233 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 3 [sys_read+0x0/0x9d] }
+fs.read: 23329.245035245 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { count = 4096, fd = 8 }
+kernel.syscall_exit: 23329.245036555 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, USER_MODE { ret = -11 }
+kernel.syscall_entry: 23329.245041004 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb6094e4c, syscall_id = 265 [sys_clock_gettime+0x0/0x7e] }
+kernel.syscall_exit: 23329.245043430 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.245048028 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { ip = 0xb7897416, syscall_id = 168 [sys_poll+0x0/0x8d] }
+fs.pollfd: 23329.245052713 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 3 }
+fs.pollfd: 23329.245054750 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 9 }
+fs.pollfd: 23329.245056342 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 8 }
+fs.pollfd: 23329.245057762 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 5 }
+fs.pollfd: 23329.245059243 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 12 }
+fs.pollfd: 23329.245062212 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 19 }
+fs.pollfd: 23329.245063743 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 16 }
+fs.pollfd: 23329.245066311 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 26 }
+fs.pollfd: 23329.245067786 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 10 }
+fs.pollfd: 23329.245069983 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 2336, 2336, konsole, , 1, 0x0, SYSCALL { fd = 17 }
+kernel.sched_schedule: 23329.245079662 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { prev_pid = 2336, next_pid = 16931, prev_state = 1 }
+kernel.syscall_entry: 23329.245148347 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb7794416, syscall_id = 5 [sys_open+0x0/0x23] }
+fs.open: 23329.245171358 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { fd = 4, filename = "/media/debugfs/ltt/control/" }
+kernel.syscall_exit: 23329.245173702 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 4 }
+kernel.syscall_entry: 23329.245177931 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb7794416, syscall_id = 221 [sys_fcntl64+0x0/0x79] }
+kernel.syscall_exit: 23329.245180091 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 1 }
+kernel.page_fault_entry: 23329.245185985 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb769d64c, address = 0x8c262ac, trap_id = 14, write_access = 1 }
+kernel.page_fault_exit: 23329.245281027 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 0 }
+kernel.syscall_entry: 23329.245292705 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb7794416, syscall_id = 6 [sys_close+0x0/0x112] }
+fs.close: 23329.245294600 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { fd = 4 }
+kernel.syscall_exit: 23329.245558330 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.245565144 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb7794416, syscall_id = 4 [sys_write+0x0/0x9d] }
+kernel.timer_set: 23329.245571835 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { expires = 2302300, function = 0xc103b8db, data = 4057105572 }
+kernel.sched_try_wakeup: 23329.245577933 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { pid = 16931, cpu_id = 0, state = 1 }
+fs.write: 23329.245587303 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { count = 22, fd = 1 }
+kernel.syscall_exit: 23329.245588698 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 22 }
+kernel.page_fault_entry: 23329.245596864 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, TRAP { ip = 0xb77774e0, address = 0xb77774e0, trap_id = 14, write_access = 0 }
+kernel.page_fault_exit: 23329.245637070 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { res = 512 }
+kernel.syscall_entry: 23329.245647730 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb7794416, syscall_id = 5 [sys_open+0x0/0x23] }
+fs.open: 23329.245656223 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { fd = 4, filename = "/media/debugfs/ltt/control/trace" }
+kernel.syscall_exit: 23329.245658531 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 4 }
+kernel.syscall_entry: 23329.245662969 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb7794416, syscall_id = 6 [sys_close+0x0/0x112] }
+fs.close: 23329.245664445 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { fd = 4 }
+kernel.syscall_exit: 23329.245690756 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 0 }
+kernel.syscall_entry: 23329.245698065 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb7794416, syscall_id = 5 [sys_open+0x0/0x23] }
+fs.open: 23329.245705188 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { fd = 4, filename = "/media/debugfs/ltt/control/trace/enabled" }
+kernel.syscall_exit: 23329.245707342 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, USER_MODE { ret = 4 }
+kernel.syscall_entry: 23329.245712199 (/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0), 16931, 16931, /usr/local/bin/lttctl, , 16908, 0x0, SYSCALL { ip = 0xb7794416, syscall_id = 4 [sys_write+0x0/0x9d] }
+End trace set
+
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui.tests/.classpath b/lttng/org.eclipse.linuxtools.lttng.ui.tests/.classpath
new file mode 100644
index 0000000..978c0d2
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui.tests/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="stubs"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui.tests/.project b/lttng/org.eclipse.linuxtools.lttng.ui.tests/.project
new file mode 100644
index 0000000..364e4e5
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.lttng.ui.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..bd6d7de
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.linuxtools.lttng.ui.tests
+Bundle-Version: 0.2.0.qualifier
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Vendor: %Bundle-Vendor
+Require-Bundle: org.junit,
+ org.eclipse.linuxtools.lttng;bundle-version="0.2.0",
+ org.eclipse.linuxtools.lttng.ui;bundle-version="0.2.0",
+ org.eclipse.linuxtools.tmf;bundle-version="0.2.0"
+Bundle-Localization: plugin
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui.tests/build.properties b/lttng/org.eclipse.linuxtools.lttng.ui.tests/build.properties
new file mode 100644
index 0000000..0a6de54
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui.tests/build.properties
@@ -0,0 +1,7 @@
+source.. = src/,\
+           stubs/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.properties,\
+               test.xml
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui.tests/plugin.properties b/lttng/org.eclipse.linuxtools.lttng.ui.tests/plugin.properties
new file mode 100644
index 0000000..ed73a38
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui.tests/plugin.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.linuxtools.lttng.ui.tests
+Bundle-Vendor = Eclipse
+Bundle-Name = Linux Tracing Toolkit (LTTng) UI Unit Test Suite
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngEventParserStub.java b/lttng/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngEventParserStub.java
new file mode 100644
index 0000000..8ad81c3
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngEventParserStub.java
@@ -0,0 +1,139 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.stubs;
+
+import java.io.IOException;
+
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.parser.ITmfEventParser;
+import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
+import org.eclipse.linuxtools.tmf.trace.TmfContext;
+
+/**
+ * <b><u>TmfEventParserStub</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class LTTngEventParserStub implements ITmfEventParser {
+
+	public TmfEvent parseNextEvent(ITmfTrace stream, TmfContext context)
+			throws IOException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+//    // ========================================================================
+//    // Attributes
+//    // ========================================================================
+//
+//	private final int NB_FORMATS = 10;
+//    private final TmfEventFormat[] fFormats;
+//
+//    // ========================================================================
+//    // Constructors
+//    // ========================================================================
+//
+//    public LTTngEventParserStub() {
+//    	fFormats = new TmfEventFormat[NB_FORMATS];
+//    	for (int i = 0; i < NB_FORMATS; i++) {
+//    		Vector<String> format = new Vector<String>();
+//    		for (int j = 1; j <= i; j++) {
+//    			format.add(new String("Fmt-" + i + "-Fld-" + j));
+//    		}
+//    		String[] fields = new String[i];
+//    		fFormats[i] = new TmfEventFormat(format.toArray(fields));
+//    	}
+//    }
+//
+//    // ========================================================================
+//    // Accessors
+//    // ========================================================================
+//
+//    // ========================================================================
+//    // Operators
+//    // ========================================================================
+//
+//    /* (non-Javadoc)
+//     * @see org.eclipse.linuxtools.tmf.eventlog.ITmfEventParser#parseNextEvent()
+//     */
+//    static final String typePrefix = "Type-";
+//    public TmfEvent parseNextEvent(ITmfTrace eventStream, TmfTraceContext context) throws IOException {
+//
+//        if (! (eventStream instanceof LTTngTraceStub)) {
+//            return null;
+//        }
+//
+//       	// Highly inefficient...
+//       	RandomAccessFile stream = ((LTTngTraceStub) eventStream).getStream();
+//       	String name = eventStream.getName();
+//       	name = name.substring(name.lastIndexOf('/') + 1);
+//
+//		synchronized(stream) {
+//        	long location = 0;
+//        	if (context != null)
+//        		location = (Long) (context.getLocation());
+//        	stream.seek(location);
+//
+//    		try {
+//    			// Read the individual fields
+//        		long ts       = stream.readLong();
+//        		String source = stream.readUTF();
+//        		String type   = stream.readUTF();
+//    			@SuppressWarnings("unused")
+//    			int reference = stream.readInt();
+//
+//        		// Read the event parts
+//        		int typeIndex  = Integer.parseInt(type.substring(typePrefix.length()));
+//        		String[] fields = new String[typeIndex];
+//        		for (int i = 0; i < typeIndex; i++) {
+//        			fields[i] = stream.readUTF();
+//        		}
+//
+//        		// Format the content from the individual fields
+//        		String content = "[";
+//        		if (typeIndex > 0) {
+//        			content += fields[0];
+//        		}
+//        		for (int i = 1; i < typeIndex; i++) {
+//        			content += ", " + fields[i];
+//        		}
+//        		content += "]";
+//
+//        		// Update the context
+//        		context.setLocation(stream.getFilePointer());
+//        		context.incrIndex();
+//       			try {
+//       				long ts2 = stream.readLong();
+//           			context.setTimestamp(new LTTngTimestampStub(ts2));
+//        		} catch (EOFException e) {
+//        			context.setTimestamp(null);
+//            	}
+//
+//       	    	// Create the event
+//       			TmfEvent event = new TmfEvent(
+//       					new LTTngTimestampStub(ts),
+//       					new TmfEventSource(source),
+//       					new TmfEventType(type, fFormats[typeIndex]),
+//       					new TmfEventContent(content, fFormats[typeIndex]),
+//       					new TmfEventReference(name));
+//
+//       			return event;
+//
+//    		} catch (EOFException e) {
+//    			context.setTimestamp(null);
+//        	}
+//        }
+//        return null;
+//    }
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTimestampStub.java b/lttng/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTimestampStub.java
new file mode 100644
index 0000000..77cdee6
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTimestampStub.java
@@ -0,0 +1,52 @@
+/**
+ * 
+ */
+package org.eclipse.linuxtools.lttng.stubs;
+
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+
+/**
+ * @author francois
+ *
+ */
+public class LTTngTimestampStub extends TmfTimestamp {
+
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 216576768443708259L;
+
+	/**
+     * @param value
+     * @param scale
+     * @param precision
+     */
+    public LTTngTimestampStub(long value) {
+		super(value, (byte) -3, 0);	// millisecs
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.tmf.event.TmfTimestamp#toString()
+	 */
+	@Override
+    public String toString() {
+
+		// If we are dealing with units of seconds (or higher),
+		// use the plain formatter
+		if (fScale >= 0) {
+	    	Double value = fValue * Math.pow(10, fScale);
+	        return value.toString();
+		}
+
+		// Define a format string
+        String format = String.format("%%1d.%%0%dd", -fScale);
+
+        // And format the timestamp value
+        double scale = Math.pow(10, fScale);
+        long seconds = (long) (fValue * scale);
+        long fracts  = fValue - (long) ((double) seconds / scale); 
+        String result = String.format(format, seconds, fracts);
+
+        return result;
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java b/lttng/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java
new file mode 100644
index 0000000..5cbf591
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java
@@ -0,0 +1,157 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard (fchouinard@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.stubs;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.parser.ITmfEventParser;
+import org.eclipse.linuxtools.tmf.trace.ITmfLocation;
+import org.eclipse.linuxtools.tmf.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.trace.TmfLocation;
+import org.eclipse.linuxtools.tmf.trace.TmfTrace;
+
+/**
+ * <b><u>LTTngTraceStub</u></b>
+ * <p>
+ * Dummy test trace. Use in conjunction with LTTngEventParserStub.
+ */
+public class LTTngTraceStub extends TmfTrace<LttngEvent> {
+
+    // ========================================================================
+    // Attributes
+    // ========================================================================
+
+    // The actual stream
+    private final RandomAccessFile fTrace;
+
+    // The associated event parser
+    private final ITmfEventParser fParser;
+
+    // ========================================================================
+    // Constructors
+    // ========================================================================
+
+    /**
+     * @param filename
+     * @param parser
+     * @throws FileNotFoundException
+     */
+    public LTTngTraceStub(String filename) throws FileNotFoundException {
+        this(filename, DEFAULT_CACHE_SIZE);
+    }
+
+    /**
+     * @param filename
+     * @param parser
+     * @param cacheSize
+     * @throws FileNotFoundException
+     */
+    public LTTngTraceStub(String filename, int cacheSize) throws FileNotFoundException {
+        super(LttngEvent.class, filename, cacheSize);
+        fTrace = new RandomAccessFile(filename, "r");
+    	fParser = new LTTngEventParserStub();
+    	indexTrace(true);
+    }
+
+    // ========================================================================
+    // Accessors
+    // ========================================================================
+
+    public RandomAccessFile getStream() {
+        return fTrace;
+    }
+
+    // ========================================================================
+    // Operators
+    // ========================================================================
+
+    /* (non-Javadoc)
+     * @see org.eclipse.linuxtools.tmf.eventlog.ITmfStreamLocator#seekLocation(java.lang.Object)
+     */
+	@Override
+	@SuppressWarnings("unchecked")
+	public TmfContext seekLocation(ITmfLocation<?> location) {
+        TmfContext context = null;
+       	try {
+       		synchronized(fTrace) {
+        		fTrace.seek((location != null) ? ((TmfLocation<Long>) location).getLocation() : 0);
+        		context = new TmfContext(getCurrentLocation(), 0);
+//        		TmfTraceContext context2 = new TmfTraceContext(getCurrentLocation(), 0);
+//        		TmfEvent event = parseEvent(context2);
+//        		context.setTimestamp(event.getTimestamp());
+       		}
+        } catch (IOException e) {
+        	// TODO Auto-generated catch block
+        	e.printStackTrace();
+        }
+        return context;
+    }
+
+    /* (non-Javadoc)
+     * @see org.eclipse.linuxtools.tmf.eventlog.ITmfStreamLocator#getCurrentLocation()
+     */
+    @Override
+	public ITmfLocation<?> getCurrentLocation() {
+       	try {
+       		return new TmfLocation<Long>(fTrace.getFilePointer());
+       	} catch (IOException e) {
+       		// TODO Auto-generated catch block
+       		e.printStackTrace();
+       	}
+        return null;
+    }
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.tmf.trace.ITmfTrace#parseEvent()
+	 */
+	@Override
+	public TmfEvent parseEvent(TmfContext context) {
+       	try {
+   			// paserNextEvent updates the context
+   			TmfEvent event = fParser.parseNextEvent(this, context);
+//   			if (event != null) {
+//   				context.setTimestamp(event.getTimestamp());
+//   			}
+       		return event;
+       	}
+       	catch (IOException e) {
+       		e.printStackTrace();
+       	}
+       	return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return "[LTTngTraceStub]";
+	}
+
+//    // ========================================================================
+//    // Helper functions
+//    // ========================================================================
+//
+//    /* (non-Javadoc)
+//     * @see org.eclipse.linuxtools.tmf.eventlog.ITmfEventStream#getAttributes()
+//     */
+//    public Map<String, Object> getAttributes() {
+//        // TODO Auto-generated method stub
+//        return null;
+//    }
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui.tests/test.xml b/lttng/org.eclipse.linuxtools.lttng.ui.tests/test.xml
new file mode 100644
index 0000000..6023af7
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui.tests/test.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+
+<project name="testsuite" default="run" basedir=".">
+	<property name="classname" value="org.eclipse.linuxtools.lttng.ui.tests" />
+	<property name="lttng-ui-test-suite-classname" value="org.eclipse.linuxtools.lttng.ui.tests.TBD" />
+	<property name="plugin-name" value="org.eclipse.linuxtools.lttng.ui.tests" />
+
+	<!-- The property ${eclipse-home} should be passed into this script -->
+	<!-- Set a meaningful default value for when it is not. -->
+	<property name="eclipse-home" value="${basedir}/../../" />
+
+	<property name="library-file" value="${eclipse-home}/dropins/${subProjectName2}/plugins/org.eclipse.test/library.xml" />
+
+	<!-- This target holds all initialization code that needs to be done for -->
+	<!-- all tests that are to be run. Initialization for individual tests -->
+	<!-- should be done within the body of the suite target. -->
+	<target name="init">
+		<tstamp />
+		<delete>
+			<fileset dir="${eclipse-home}" includes="org*.xml" />
+		</delete>
+	</target>
+
+	<!-- This target defines the tests that need to be run. -->
+	<target name="lttng_ui_test_suite">
+		<property name="lttng-folder" value="${eclipse-home}/lttng_folder" />
+		<delete dir="${lttng-folder}" quiet="true" />
+		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="data-dir" value="${lttng-folder}" />
+			<property name="plugin-name" value="${plugin-name}" />
+			<property name="classname" value="${lttng-ui-test-suite-classname}" />
+		</ant>
+	</target>
+
+	<!-- This target holds code to cleanup the testing environment after  -->
+	<!-- all of the tests have been run. You can use this target to -->
+	<!-- delete temporary files that have been created. -->
+	<target name="cleanup">
+		<mkdir dir="${results}/consolelogs" />
+		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
+	</target>
+
+	<!-- This target runs the test suite. Any actions that need to happen -->
+	<!-- after all the tests have been run should go here. -->
+	<target name="run" depends="init,cleanup">
+		<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="includes" value="org*.xml" />
+			<property name="output-file" value="${plugin-name}.xml" />
+		</ant>
+	</target>
+
+    <target name="all" depends="run" description="Dummy target to run all tests">
+    </target>
+
+</project>
diff --git a/profiling/.classpath b/lttng/org.eclipse.linuxtools.lttng.ui/.classpath
similarity index 100%
copy from profiling/.classpath
copy to lttng/org.eclipse.linuxtools.lttng.ui/.classpath
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/.project b/lttng/org.eclipse.linuxtools.lttng.ui/.project
new file mode 100644
index 0000000..b6f70c2
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.lttng.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..dfce508
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.linuxtools.lttng.ui;singleton:=true
+Bundle-Version: 0.2.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin
+Bundle-Vendor: %Bundle-Vendor
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.ui.ide,
+ org.eclipse.core.resources,
+ org.eclipse.core.filesystem,
+ org.eclipse.core.runtime,
+ org.eclipse.linuxtools.tmf;bundle-version="0.2.0",
+ org.eclipse.linuxtools.tmf.ui;bundle-version="0.2.0",
+ org.eclipse.linuxtools.lttng;bundle-version="0.2.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/build.properties b/lttng/org.eclipse.linuxtools.lttng.ui/build.properties
new file mode 100644
index 0000000..6b4afb7
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/build.properties
@@ -0,0 +1,7 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               icons/,\
+               plugin.properties
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/icons/LTTng.png b/lttng/org.eclipse.linuxtools.lttng.ui/icons/LTTng.png
new file mode 100644
index 0000000..3083054
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/icons/LTTng.png
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/icons/control_flow_view.gif b/lttng/org.eclipse.linuxtools.lttng.ui/icons/control_flow_view.gif
new file mode 100644
index 0000000..3971b50
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/icons/control_flow_view.gif
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/icons/control_view.gif b/lttng/org.eclipse.linuxtools.lttng.ui/icons/control_view.gif
new file mode 100644
index 0000000..0dc862c
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/icons/control_view.gif
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/icons/events_view.gif b/lttng/org.eclipse.linuxtools.lttng.ui/icons/events_view.gif
new file mode 100644
index 0000000..1ef74cf
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/icons/events_view.gif
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/icons/garland16.png b/lttng/org.eclipse.linuxtools.lttng.ui/icons/garland16.png
new file mode 100644
index 0000000..74f9751
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/icons/garland16.png
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/icons/garland32.png b/lttng/org.eclipse.linuxtools.lttng.ui/icons/garland32.png
new file mode 100644
index 0000000..3083054
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/icons/garland32.png
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/icons/histogram.gif b/lttng/org.eclipse.linuxtools.lttng.ui/icons/histogram.gif
new file mode 100644
index 0000000..dd2dda5
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/icons/histogram.gif
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/icons/project_view.gif b/lttng/org.eclipse.linuxtools.lttng.ui/icons/project_view.gif
new file mode 100644
index 0000000..4b98a62
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/icons/project_view.gif
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/icons/resources_view.gif b/lttng/org.eclipse.linuxtools.lttng.ui/icons/resources_view.gif
new file mode 100644
index 0000000..2344861
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/icons/resources_view.gif
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/icons/statistics_view.gif b/lttng/org.eclipse.linuxtools.lttng.ui/icons/statistics_view.gif
new file mode 100644
index 0000000..d11c996
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/icons/statistics_view.gif
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/icons/time_frame_view.gif b/lttng/org.eclipse.linuxtools.lttng.ui/icons/time_frame_view.gif
new file mode 100644
index 0000000..c984fba
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/icons/time_frame_view.gif
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/plugin.properties b/lttng/org.eclipse.linuxtools.lttng.ui/plugin.properties
new file mode 100644
index 0000000..232b7bc
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/plugin.properties
@@ -0,0 +1,28 @@
+#Properties file for org.eclipse.linuxtools.lttng.ui
+Bundle-Name = Linux Tracing Toolkit (LTTng) UI (Incubation)
+Bundle-Vendor = Eclipse
+
+# org.eclipse.ui.perspectives
+extension.name.0 = LTTng Perspective
+perspective.name = LTTng
+
+# org.eclipse.ui.views
+extension.name.1 = LTTng Views
+category.name = LTTng
+view.name.0 = Project
+view.name.1 = Control
+view.name.2 = Events
+view.name.3 = Time Frame
+view.name.4 = Control Flow
+view.name.5 = Resources
+view.name.6 = Statistics
+view.name.7 = Histogram
+
+# org.eclipse.ui.newWizards
+extension.name.2 = LTTng New Wizards
+category.name.0 = LTTng
+wizard.name.0 = LTTng Project
+wizard.description.0 = Create an LTTng project
+
+# org.eclipse.core.resources.natures
+extension.name.3 = LTTng Project Nature
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/plugin.xml b/lttng/org.eclipse.linuxtools.lttng.ui/plugin.xml
new file mode 100644
index 0000000..55bf508
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/plugin.xml
@@ -0,0 +1,416 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         id="org,eclipse.linuxtools.lttng.ui.perspective"
+         name="%extension.name.0"
+         point="org.eclipse.ui.perspectives">
+      <perspective
+            class="org.eclipse.linuxtools.lttng.ui.views.PerspectiveFactory"
+            icon="icons/garland32.png"
+            id="org.eclipse.linuxtools.lttng.ui.perspective"
+            name="%perspective.name">
+      </perspective>
+   </extension>
+   <extension
+         id="org.eclipse.linuxtools.lttng.ui.views"
+         name="%extension.name.1"
+         point="org.eclipse.ui.views">
+      <category
+            id="org.eclipse.linuxtools.lttng.ui.views.category"
+            name="%category.name">
+      </category>
+      <view
+            allowMultiple="false"
+            category="org.eclipse.linuxtools.lttng.ui.views.category"
+            class="org.eclipse.linuxtools.lttng.ui.views.project.ProjectView"
+            icon="icons/project_view.gif"
+            id="org.eclipse.linuxtools.lttng.ui.views.project"
+            name="%view.name.0"
+            restorable="true">
+      </view>
+      <view
+            allowMultiple="false"
+            category="org.eclipse.linuxtools.lttng.ui.views.category"
+            class="org.eclipse.linuxtools.lttng.ui.views.control.ControlView"
+            icon="icons/control_view.gif"
+            id="org.eclipse.linuxtools.lttng.ui.views.control"
+            name="%view.name.1"
+            restorable="true">
+      </view>
+      <view
+            allowMultiple="false"
+            category="org.eclipse.linuxtools.lttng.ui.views.category"
+            class="org.eclipse.linuxtools.lttng.ui.views.events.EventsView"
+            icon="icons/events_view.gif"
+            id="org.eclipse.linuxtools.lttng.ui.views.events"
+            name="%view.name.2"
+            restorable="true">
+      </view>
+      <view
+            allowMultiple="false"
+            category="org.eclipse.linuxtools.lttng.ui.views.category"
+            class="org.eclipse.linuxtools.lttng.ui.views.timeframe.TimeFrameView"
+            icon="icons/time_frame_view.gif"
+            id="org.eclipse.linuxtools.lttng.ui.views.timeframe"
+            name="%view.name.3"
+            restorable="true">
+      </view>
+      <view
+            allowMultiple="false"
+            category="org.eclipse.linuxtools.lttng.ui.views.category"
+            class="org.eclipse.linuxtools.lttng.ui.views.controlflow.ControlFlowView"
+            icon="icons/control_flow_view.gif"
+            id="org.eclipse.linuxtools.lttng.ui.views.controlflow"
+            name="%view.name.4"
+            restorable="true">
+      </view>
+      <view
+            allowMultiple="false"
+            category="org.eclipse.linuxtools.lttng.ui.views.category"
+            class="org.eclipse.linuxtools.lttng.ui.views.resources.ResourcesView"
+            icon="icons/resources_view.gif"
+            id="org.eclipse.linuxtools.lttng.ui.views.resources"
+            name="%view.name.5"
+            restorable="true">
+      </view>
+      <view
+            allowMultiple="false"
+            category="org.eclipse.linuxtools.lttng.ui.views.category"
+            class="org.eclipse.linuxtools.lttng.ui.views.statistics.StatisticsView"
+            icon="icons/statistics_view.gif"
+            id="org.eclipse.linuxtools.lttng.ui.views.statistics"
+            name="%view.name.6"
+            restorable="true">
+      </view>
+      <view
+            allowMultiple="false"
+            category="org.eclipse.linuxtools.lttng.ui.views.category"
+            class="org.eclipse.linuxtools.lttng.ui.views.histogram.HistogramView"
+            icon="icons/histogram.gif"
+            id="org.eclipse.linuxtools.lttng.ui.views.histogram"
+            name="%view.name.7"
+            restorable="true">
+      </view>
+   </extension>
+   <extension
+         id="org.eclipse.linuxtools.lttng.wizards.new"
+         name="%extension.name.2"
+         point="org.eclipse.ui.newWizards">
+      <category
+            id="org.eclipse.linuxtools.lttng.ui.wizards.new"
+            name="%category.name.0">
+      </category>
+      <wizard
+            category="org.eclipse.linuxtools.lttng.ui.wizards.new"
+            class="org.eclipse.linuxtools.lttng.ui.views.project.dialogs.NewProjectWizard"
+            descriptionImage="icons/garland16.png"
+            finalPerspective="org.eclipse.linuxtools.lttng.ui.perspective"
+            icon="icons/garland16.png"
+            id="org.eclipse.linuxtools.lttng.ui.views.ui.wizards.newProject"
+            name="%wizard.name.0"
+            project="true">
+         <description>
+            %wizard.description.0
+         </description>
+      </wizard>
+   </extension>
+   <extension
+         id="org.eclipse.linuxtools.lttng.ui.views.project.LTTngProjectNature"
+         name="%extension.name.3"
+         point="org.eclipse.core.resources.natures">
+      <runtime>
+         <run
+               class="org.eclipse.linuxtools.lttng.ui.views.project.LTTngProjectNature">
+         </run>
+      </runtime>
+   </extension>
+   <extension
+         id="org.eclipse.linuxtools.lttng.ui.actionSets"
+         name="LTTng Action Sets"
+         point="org.eclipse.ui.actionSets">
+      <actionSet
+            description="LTTng Action Set"
+            id="org.eclipse.linuxtools.lttng.ui.actionSet"
+            label="LTTng Action Set"
+            visible="true">
+      </actionSet>
+   </extension>
+   <extension
+         id="org.eclipse.linuxtools.lttng.ui.commands"
+         name="LTTng Commands"
+         point="org.eclipse.ui.commands">
+      <category
+            description="LTTng Project Commands"
+            id="org.eclipse.linuxtools.lttng.ui.commands.project.category"
+            name="LTTng Project Commands">
+      </category>
+      <command
+            categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
+            description="Create an LTTng Project"
+            id="org.eclipse.linuxtools.lttng.ui.command.project.new"
+            name="New Project">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
+            description="Open an LTTng Project"
+            id="org.eclipse.linuxtools.lttng.ui.command.project.open"
+            name="Open Project">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
+            description="Close an LTTng Project"
+            id="org.eclipse.linuxtools.lttng.ui.command.project.close"
+            name="Close Project">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
+            description="Rename an LTTng Project"
+            id="org.eclipse.linuxtools.lttng.ui.command.project.rename"
+            name="Rename Project">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
+            description="Delete an LTTng Project"
+            id="org.eclipse.linuxtools.lttng.ui.command.project.delete"
+            name="Delete Project">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
+            description="Import an LTTng Trace"
+            id="org.eclipse.linuxtools.lttng.ui.command.project.trace.import"
+            name="Import Trace">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
+            description="Open an LTTng Trace"
+            id="org.eclipse.linuxtools.lttng.ui.command.project.trace.open"
+            name="Open Trace">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
+            description="Rename an LTTng Trace"
+            id="org.eclipse.linuxtools.lttng.ui.command.project.trace.rename"
+            name="Rename Trace">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
+            description="Delete an LTTng Trace"
+            id="org.eclipse.linuxtools.lttng.ui.command.project.trace.delete"
+            name="Delete Trace">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
+            description="Create an LTTng Experiment"
+            id="org.eclipse.linuxtools.lttng.ui.command.project.experiment.new"
+            name="New Experiment">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
+            description="Select LTTng Traces"
+            id="org.eclipse.linuxtools.lttng.ui.command.project.experiment.select"
+            name="Select Traces">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
+            description="Open an LTTng Experiment"
+            id="org.eclipse.linuxtools.lttng.ui.command.project.experiment.open"
+            name="Open Experiment">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
+            description="Rename an LTTng Experiment"
+            id="org.eclipse.linuxtools.lttng.ui.command.project.experiment.rename"
+            name="Rename Experiment">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
+            description="Delete an LTTng Experiment"
+            id="org.eclipse.linuxtools.lttng.ui.command.project.experiment.delete"
+            name="Delete Experiment">
+      </command>
+      <command
+            categoryId="org.eclipse.linuxtools.lttng.ui.commands.project.category"
+            description="Refresh View"
+            id="org.eclipse.linuxtools.lttng.ui.command.project.refresh"
+            name="Refresh View">
+      </command>
+   </extension>
+   <extension
+         id="org.eclipse.linuxtools.lttng.ui.menus"
+         name="LTTng Menus"
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            locationURI="popup:org.eclipse.linuxtools.lttng.ui.views.project?after=additions">
+         <command
+               commandId="org.eclipse.linuxtools.lttng.ui.command.project.new"
+               icon="icons/garland16.png"
+               id="org.eclipse.linuxtools.lttng.ui.menu.popup.project.new"
+               label="New Project"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.linuxtools.lttng.ui.command.project.open"
+               id="org.eclipse.linuxtools.lttng.ui.menu.popup.project.open"
+               label="Open Project"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.linuxtools.lttng.ui.command.project.close"
+               id="org.eclipse.linuxtools.lttng.ui.menu.popup.project.close"
+               label="Close Project"
+               style="push">
+         </command>
+         <!-- command
+               commandId="org.eclipse.linuxtools.lttng.ui.command.project.rename"
+               id="org.eclipse.linuxtools.lttng.ui.menu.popup.project.rename"
+               label="Rename Project"
+               style="push">
+         </command -->
+         <command
+               commandId="org.eclipse.linuxtools.lttng.ui.command.project.delete"
+               id="org.eclipse.linuxtools.lttng.ui.menu.popup.project.delete"
+               label="Delete Project"
+               style="push">
+         </command>
+         <separator
+               name="org.eclipse.linuxtools.lttng.ui.menu.popup.project.separator1"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.linuxtools.lttng.ui.command.project.experiment.new"
+               id="org.eclipse.linuxtools.lttng.ui.menu.popup.project.experiment.new"
+               label="New Experiment"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.linuxtools.lttng.ui.command.project.experiment.select"
+               id="org.eclipse.linuxtools.lttng.ui.menu.popup.project.experiment.select"
+               label="Select Traces"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.linuxtools.lttng.ui.command.project.experiment.open"
+               id="org.eclipse.linuxtools.lttng.ui.menu.popup.project.experiment.open"
+               label="Open Experiment"
+               style="push">
+         </command>
+         <!-- command
+               commandId="org.eclipse.linuxtools.lttng.ui.command.project.experiment.rename"
+               id="org.eclipse.linuxtools.lttng.ui.menu.popup.project.experiment.rename"
+               label="Rename Experiment"
+               style="push">
+         </command -->
+         <command
+               commandId="org.eclipse.linuxtools.lttng.ui.command.project.experiment.delete"
+               id="org.eclipse.linuxtools.lttng.ui.menu.popup.project.experiment.delete"
+               label="Delete Experiment"
+               style="push">
+         </command>
+         <separator
+               name="org.eclipse.linuxtools.lttng.ui.menu.popup.project.separator2"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.linuxtools.lttng.ui.command.project.trace.import"
+               id="org.eclipse.linuxtools.lttng.ui.menu.popup.project.trace.import"
+               label="Import Traces"
+               style="push">
+         </command>
+         <!-- command
+               commandId="org.eclipse.linuxtools.lttng.ui.command.project.trace.open"
+               id="org.eclipse.linuxtools.lttng.ui.menu.popup.project.trace.open"
+               label="Open Trace"
+               style="push">
+         </command -->
+         <!-- command
+               commandId="org.eclipse.linuxtools.lttng.ui.command.project.trace.rename"
+               id="org.eclipse.linuxtools.lttng.ui.menu.popup.project.trace.rename"
+               label="Rename Trace"
+               style="push">
+         </command -->
+         <command
+               commandId="org.eclipse.linuxtools.lttng.ui.command.project.trace.delete"
+               id="org.eclipse.linuxtools.lttng.ui.menu.popup.project.trace.delete"
+               label="Delete Trace"
+               style="push">
+         </command>
+         <separator
+               name="org.eclipse.linuxtools.lttng.ui.menu.popup.project.separator3"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.linuxtools.lttng.ui.command.project.refresh"
+               id="org.eclipse.linuxtools.lttng.ui.menu.popup.project.refresh"
+               label="Refresh View"
+               style="push">
+         </command>
+      </menuContribution>
+   </extension>
+   <extension
+         id="org.eclipse.linuxtools.lttng.ui.handlers"
+         name="LTTng Command Handlers"
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.eclipse.linuxtools.lttng.ui.views.project.handlers.NewProjectHandler"
+            commandId="org.eclipse.linuxtools.lttng.ui.command.project.new">
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.lttng.ui.views.project.handlers.OpenProjectHandler"
+            commandId="org.eclipse.linuxtools.lttng.ui.command.project.open">
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.lttng.ui.views.project.handlers.CloseProjectHandler"
+            commandId="org.eclipse.linuxtools.lttng.ui.command.project.close">
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.lttng.ui.views.project.handlers.RenameProjectHandler"
+            commandId="org.eclipse.linuxtools.lttng.ui.command.project.rename">
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.lttng.ui.views.project.handlers.DeleteProjectHandler"
+            commandId="org.eclipse.linuxtools.lttng.ui.command.project.delete">
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.lttng.ui.views.project.handlers.ImportTraceHandler"
+            commandId="org.eclipse.linuxtools.lttng.ui.command.project.trace.import">
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.lttng.ui.views.project.handlers.OpenTraceHandler"
+            commandId="org.eclipse.linuxtools.lttng.ui.command.project.trace.open">
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.lttng.ui.views.project.handlers.RenameTraceHandler"
+            commandId="org.eclipse.linuxtools.lttng.ui.command.project.trace.rename">
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.lttng.ui.views.project.handlers.DeleteTraceHandler"
+            commandId="org.eclipse.linuxtools.lttng.ui.command.project.trace.delete">
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.lttng.ui.views.project.handlers.NewExperimentHandler"
+            commandId="org.eclipse.linuxtools.lttng.ui.command.project.experiment.new">
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.lttng.ui.views.project.handlers.SelectTracesHandler"
+            commandId="org.eclipse.linuxtools.lttng.ui.command.project.experiment.select">
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.lttng.ui.views.project.handlers.OpenExperimentHandler"
+            commandId="org.eclipse.linuxtools.lttng.ui.command.project.experiment.open">
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.lttng.ui.views.project.handlers.RenameExperimentHandler"
+            commandId="org.eclipse.linuxtools.lttng.ui.command.project.experiment.rename">
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.lttng.ui.views.project.handlers.DeleteExperimentHandler"
+            commandId="org.eclipse.linuxtools.lttng.ui.command.project.experiment.delete">
+      </handler>
+      <handler
+            class="org.eclipse.linuxtools.lttng.ui.views.project.handlers.RefreshHandler"
+            commandId="org.eclipse.linuxtools.lttng.ui.command.project.refresh">
+      </handler>
+   </extension>
+
+</plugin>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/LTTngUiPlugin.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/LTTngUiPlugin.java
new file mode 100644
index 0000000..460ed6a
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/LTTngUiPlugin.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class LTTngUiPlugin extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng.ui";
+
+	// The shared instance
+	private static LTTngUiPlugin plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public LTTngUiPlugin() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		TraceDebug.init();
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static LTTngUiPlugin getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/TraceDebug.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/TraceDebug.java
new file mode 100644
index 0000000..a8f27ed
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/TraceDebug.java
@@ -0,0 +1,130 @@
+package org.eclipse.linuxtools.lttng.ui;

+

+import java.text.SimpleDateFormat;

+import java.util.Date;

+

+import org.eclipse.core.runtime.ILog;

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.Platform;

+import org.eclipse.core.runtime.Plugin;

+import org.eclipse.core.runtime.Status;

+

+public class TraceDebug {

+	static boolean DEBUG = false;

+	static boolean INFO = false;

+	static boolean WARN = false;

+

+	private static Plugin plugin = LTTngUiPlugin.getDefault();

+	private static String pluginID = LTTngUiPlugin.PLUGIN_ID;

+	private static SimpleDateFormat stimeformat = new SimpleDateFormat(

+			"HH:mm:ss:SSS");

+

+	public static void init() {

+		// Update Trace configuration options

+		String debugTrace = Platform.getDebugOption(pluginID + "/debug");

+		String infoTrace = Platform.getDebugOption(pluginID + "/info");

+		String warnTrace = Platform.getDebugOption(pluginID + "/warn");

+

+		if (debugTrace != null) {

+			DEBUG = (new Boolean(debugTrace)).booleanValue();

+		}

+

+		if (infoTrace != null) {

+			INFO = (new Boolean(infoTrace)).booleanValue();

+		}

+

+		if (warnTrace != null) {

+			WARN = (new Boolean(warnTrace)).booleanValue();

+		}

+	}

+

+	public static void info(String message) {

+		if (INFO) {

+			ILog logger = plugin.getLog();

+			logger.log(new Status(IStatus.INFO, LTTngUiPlugin.PLUGIN_ID,

+					IStatus.OK, message, null));

+		}

+	}

+

+	public static void warn(String message) {

+		if (WARN) {

+			ILog logger = plugin.getLog();

+			logger.log(new Status(IStatus.WARNING, LTTngUiPlugin.PLUGIN_ID,

+					IStatus.WARNING, message, null));

+		}

+	}

+

+	public static void debug(String message) {

+		if (DEBUG) {

+			String location = getCallingLocation();

+			System.out.println(location + "\n\t-> " + message);

+

+		}

+	}

+

+	public static void debug(String message, int additionalStackLines) {

+		if (DEBUG) {

+			String location = getCallingLocation(additionalStackLines);

+			System.out.println(location + "\n\t-> " + message);

+		}

+	}

+

+	public static void throwException(String message) {

+		if (DEBUG) {

+			try {

+				triggerException(message);

+			} catch (Exception e) {

+				e.printStackTrace();

+			}

+		}

+	}

+

+	private static void triggerException(String message) throws Exception {

+		throw new Exception(message);

+	}

+

+	private static String getCallingLocation() {

+		StringBuilder sb = new StringBuilder();

+		sb.append(trace(Thread.currentThread().getStackTrace(), 4));

+		sb.append("\n" + trace(Thread.currentThread().getStackTrace(), 3));

+		return sb.toString();

+	}

+

+	private static String getCallingLocation(int numOfStackLines) {

+		int stackCalledFromIdx = 3;

+		int earliestRequested = numOfStackLines > 0 ? stackCalledFromIdx

+				+ numOfStackLines : stackCalledFromIdx;

+		StringBuilder sb = new StringBuilder();

+		for (int i = earliestRequested; i >= stackCalledFromIdx; i--) {

+			sb.append(trace(Thread.currentThread().getStackTrace(), i) + "\n");

+		}

+		return sb.toString();

+	}

+

+	private static String trace(StackTraceElement e[], int level) {

+		if (e != null && e.length >= level) {

+			StackTraceElement s = e[level];

+			if (s != null) {

+				String simpleClassName = s.getClassName();

+				String[] clsNameSegs = simpleClassName.split("\\.");

+				if (clsNameSegs.length > 0)

+					simpleClassName = clsNameSegs[clsNameSegs.length - 1];

+				return stimeformat.format(new Date()) + " " + simpleClassName

+						+ "." + s.getLineNumber() + "." + s.getMethodName();

+			}

+		}

+		return null;

+	}

+

+	public static boolean isDEBUG() {

+		return DEBUG;

+	}

+

+	public static boolean isINFO() {

+		return INFO;

+	}

+

+	public static boolean isWARN() {

+		return WARN;

+	}

+}

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/ITimeRangeComponent.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/ITimeRangeComponent.java
new file mode 100644
index 0000000..9cb42a5
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/ITimeRangeComponent.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.model.trange;
+
+/**
+ * The common component of the Composite related to time-range events its
+ * components or containers
+ * 
+ * @author alvaro
+ * 
+ */
+public interface ITimeRangeComponent {
+
+	public long getStartTime();
+
+	public void setStartTime(long startTime);
+
+	public long getStopTime();
+
+	public void setStopTime(long endTime);
+
+	public ITimeRangeComponent getEventParent();
+
+	public String getName();
+
+	/**
+	 * Flag to indicate if this Time Range is visible within the GUI, May not be
+	 * visible if the duration can not be represented in one pixel
+	 * 
+	 * @return true if visible i.e. represented at least in one pixel
+	 */
+	public boolean isVisible();
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeComponent.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeComponent.java
new file mode 100644
index 0000000..d7a4fc2
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeComponent.java
@@ -0,0 +1,93 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.model.trange;
+
+
+/**
+ * @author alvaro
+ * 
+ */
+public abstract class TimeRangeComponent implements ITimeRangeComponent {
+
+	// ========================================================================
+	// Data
+	// =======================================================================
+	protected Long startTime = 0L;
+	protected Long stopTime = Long.MAX_VALUE;
+	protected TimeRangeComposite eventParent = null;
+	private boolean visible = true;
+	
+
+
+	// ========================================================================
+	// Constructor
+	// =======================================================================
+	public TimeRangeComponent(Long stime, Long etime,
+			TimeRangeComposite eventParent) {
+		this.startTime = stime;
+		this.stopTime = etime;
+		this.eventParent = eventParent;
+	}
+
+	// ========================================================================
+	// Methods
+	// =======================================================================
+	/**
+	 * This method shall not be used to estimate the starting drawing point of
+	 * the time range-event. see interface method getTime(). However this method
+	 * can be used to retrieve the tool tip information where we need to reflect
+	 * that the actual start of this event is unknown
+	 * 
+	 * @param time
+	 */
+	public long getStartTime() {
+		return startTime.longValue();
+	}
+
+	public void setStartTime(long time) {
+		if (time > -1) {
+			startTime = time;
+		}
+	}
+
+	public long getStopTime() {
+		return stopTime.longValue();
+	}
+
+	public void setStopTime(long stopTime) {
+		if (stopTime > -1) {
+			this.stopTime = stopTime;
+		}
+	}
+
+	public ITimeRangeComponent getEventParent() {
+		return eventParent;
+	}
+
+	public void setEventParent(TimeRangeComposite eventParent) {
+		this.eventParent = eventParent;
+	}
+
+	public abstract String getName();
+
+	
+	public void setVisible(boolean visible) {
+		this.visible = visible;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.lttng.ui.model.trange.ITimeRangeComponent#isVisible()
+	 */
+	public boolean isVisible() {
+		return visible;
+	}
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeComposite.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeComposite.java
new file mode 100644
index 0000000..7cf42f2
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeComposite.java
@@ -0,0 +1,205 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.model.trange;
+
+import java.util.Vector;
+
+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITmfTimeAnalysisEntry;
+
+public class TimeRangeComposite extends TimeRangeComponent implements
+ITmfTimeAnalysisEntry {
+
+	// ========================================================================
+	// Data
+	// =======================================================================
+	/**
+	 * Type of Composites or Containers
+	 * <p>
+	 * PROPERTY: Refers to a sub-composite of a RESOURCE or a PROCESS e.g the
+	 * cpu which can vary over time and can have time range events associated to
+	 * it, and at the same time PROPERTY is associated to a Composite parent
+	 * like a PROCESS
+	 * </p>
+	 * <p>
+	 * PROCESS: A composite of time range events representing a Process
+	 * </p>
+	 * <p>
+	 * RESOURCE: A composite of time range events representing a resource i.g.
+	 * irq, softIrq, trap, bdev, cpu
+	 * </p>
+	 * 
+	 * @author alvaro
+	 * 
+	 */
+	public static enum CompositeType {
+		UNKNOWN, PROPERTY, PROCESS, RESOURCE
+	}
+
+	protected final Vector<TimeRangeComponent> ChildEventLeafs = new Vector<TimeRangeComponent>();
+	protected final Vector<TimeRangeComponent> ChildEventComposites = new Vector<TimeRangeComponent>();
+	protected Integer id = 0;
+	protected String name;
+	protected String groupName = "";
+	protected String className = "";
+	protected CompositeType contType = CompositeType.UNKNOWN;
+	protected Long next_good_time = -1L;
+	/*Time of first event which trigger the creation of this local resource */
+	protected Long insertionTime = -1L; 
+
+	// ========================================================================
+	// Constructors
+	// =======================================================================
+	public TimeRangeComposite(Integer id, Long stime, Long etime, String name,
+			CompositeType type, long insertionTime) {
+		super(stime, etime, null);
+		this.id = id;
+		this.name = name;
+		contType = type;
+		this.insertionTime = insertionTime;
+		// Adjust the first good drawing position to the event time creating this resource
+		next_good_time = insertionTime;
+	}
+
+	public TimeRangeComposite(Integer id, Long stime, Long etime, String name,
+			String groupName, String className, CompositeType type,
+			long insertionTime) {
+		this(id, stime, etime, name, type, insertionTime);
+		this.groupName = groupName;
+		this.className = className;
+    }
+	
+	// ========================================================================
+	// Methods
+	// =======================================================================
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeComponent#getName()
+	 */
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * @param name
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @seeorg.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.
+	 * ITmfTimeAnalysisEntry#getGroupName()
+	 */
+	public String getGroupName() {
+		return groupName;
+	}
+
+	/**
+	 * @param groupName
+	 */
+	public void setGroupName(String groupName) {
+		this.groupName = groupName;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @seeorg.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.
+	 * ITmfTimeAnalysisEntry#getId()
+	 */
+	public int getId() {
+		return id;
+	}
+
+	/**
+	 * @param id
+	 */
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	/**
+	 * @return
+	 */
+	public String getClassName() {
+		return className;
+	}
+
+	/**
+	 * @param className
+	 */
+	public void setClassName(String className) {
+		this.className = className;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @seeorg.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.
+	 * ITmfTimeAnalysisEntry#getTraceEvents()
+	 */
+	@SuppressWarnings("unchecked")
+	public Vector<TimeRangeComponent> getTraceEvents() {
+		return ChildEventLeafs;
+	}
+
+	/**
+	 * @return
+	 */
+	public Vector<TimeRangeComponent> getChildEventComposites() {
+		return ChildEventComposites;
+	}
+
+	/**
+	 * Represents the time where the next time range can start the drawing i.e.
+	 * right after previous time range.
+	 * 
+	 * @return
+	 */
+	public long getNext_good_time() {
+		return next_good_time;
+	}
+
+	/**
+	 * Represents the time where the next time range can start the drawing i.e.
+	 * right after previous time range.
+	 * 
+	 * @param nextGoodTime
+	 */
+	public void setNext_good_time(long nextGoodTime) {
+		next_good_time = nextGoodTime;
+	}
+
+	/**
+	 * Reset this resource to the construction state
+	 */
+	public void reset() {
+		getChildEventComposites().clear();
+		getTraceEvents().clear();
+		next_good_time = insertionTime;
+	}
+
+	/**
+	 * Event Time reflecting the creation of this local resource e.g. at Reception of Fork, etc.
+	 * 
+	 * @return
+	 */
+	public long getInsertionTime() {
+		return insertionTime;
+	}
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEvent.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEvent.java
new file mode 100644
index 0000000..acf57fb
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEvent.java
@@ -0,0 +1,156 @@
+/*******************************************************************************

+ * Copyright (c) 2009 Ericsson

+ * 

+ * All rights reserved. This program and the accompanying materials are

+ * made available under the terms of the Eclipse Public License v1.0 which

+ * accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation

+ *******************************************************************************/

+

+package org.eclipse.linuxtools.lttng.ui.model.trange;

+

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITimeEvent;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITmfTimeAnalysisEntry;

+

+/**

+ * @author alvaro

+ * 

+ */

+public class TimeRangeEvent extends TimeRangeComponent implements ITimeEvent {

+	// =======================================================================

+	// Data

+	// =======================================================================

+	TimeRangeComposite parent = null;

+

+	public static enum Type {

+		UNKNOWN, PROPERTY, PROCESS_MODE, BDEV_MODE, TRAP_MODE, SOFT_IRQ_MODE, IRQ_MODE, CPU_MODE

+	}

+

+	protected Type eventType = Type.UNKNOWN;

+	protected String stateMode = "";

+

+	// =======================================================================

+	// Constructors

+	// =======================================================================

+	/**

+	 * @param stime

+	 *            Event Start Time (may be unknown)

+	 * @param etime

+	 *            Event EndTime (may be unknown)

+	 * @param eventParent

+	 * @param type

+	 * @param duration

+	 */

+	public TimeRangeEvent(Long stime, Long etime,

+			TimeRangeComposite eventParent, Type type, String stateMode) {

+		super(stime, etime, eventParent);

+

+		this.eventType = type;

+		this.stateMode = stateMode;

+	}

+

+	// =======================================================================

+	// Methods

+	// =======================================================================

+	

+	// @Override

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see

+	 * org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITimeEvent#getTime

+	 * ()

+	 */

+	public long getTime() {

+		// The value provided by this method is used to start drawing the

+		// time-range,

+		// so a null value shall not be provided.

+		// If the actual start time is unknown then use the start of the Trace

+		// as the

+		// starting reference point.

+		if (startTime == null) {

+			return eventParent.getStartTime();

+		}

+		return startTime;

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see

+	 * org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITimeEvent#getEntry

+	 * ()

+	 */

+	public ITmfTimeAnalysisEntry getEntry() {

+		return parent;

+	}

+

+	/**

+	 * return the duration between end and start time , if the start time or end

+	 * time are unknown, use the Trace start and End times to estimate it, this

+	 * value will be used to draw the time range and need to provide a valid

+	 * time width.

+	 * 

+	 * @return the duration

+	 */

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @seeorg.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITimeEvent#

+	 * getDuration()

+	 */

+	public long getDuration() {

+		long duration = -1;

+		long endT = (stopTime == null) ? parent.getStopTime() : stopTime;

+		long startT = (startTime == null) ? parent.getStartTime() : startTime;

+

+		if (endT > startT) {

+			return stopTime - startTime;

+		}

+		return duration;

+	}

+

+	/**

+	 * @return

+	 */

+	public String getStateMode() {

+		return stateMode;

+	}

+

+	/**

+	 * @param stateMode

+	 */

+	public void setStateMode(String stateMode) {

+		if (stateMode != null) {

+			this.stateMode = stateMode;

+		}

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.linuxtools.lttng.ui.model.ITimeRangeComponent#getName()

+	 */

+	@Override

+	public String getName() {

+		return stateMode;

+	}

+

+	/**

+	 * @return

+	 */

+	public Type getEventType() {

+		return eventType;

+	}

+

+	/**

+	 * @param eventType

+	 */

+	public void setEventType(Type eventType) {

+		this.eventType = eventType;

+	}

+

+}

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEventProcess.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEventProcess.java
new file mode 100644
index 0000000..bceef5f
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEventProcess.java
@@ -0,0 +1,222 @@
+/*******************************************************************************

+ * Copyright (c) 2009 Ericsson

+ * 

+ * All rights reserved. This program and the accompanying materials are

+ * made available under the terms of the Eclipse Public License v1.0 which

+ * accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.lttng.ui.model.trange;

+

+public class TimeRangeEventProcess extends TimeRangeComposite implements

+		Comparable<TimeRangeEventProcess> {

+	// ========================================================================

+	// Data

+	// =======================================================================

+	// GUI information

+	private Long pid = 0L;

+	private Long tgid = 0L;

+	private Long ppid = 0L;

+	private Long creationTime = 0L;

+	private String traceID = "";

+	private String processType = "User"; // Kernel or user thread

+	private Long cpu = 0L;

+	private String brand = "";

+

+	// ========================================================================

+	// Constructor

+	// =======================================================================

+	/**

+	 * @param id

+	 * @param name

+	 * @param sTime

+	 *            normally set to the Trace start time

+	 * @param stopTime

+	 *            normally set to the Trace end time

+	 * @param groupName

+	 * @param className

+	 */

+	public TimeRangeEventProcess(int id, String name, long startTime,

+			long stopTime, String groupName, String className, Long cpu,

+			long insertionTime) {

+

+		super(id, startTime, stopTime, name, CompositeType.PROCESS,

+				insertionTime);

+		this.cpu = cpu;

+	}

+

+	// ========================================================================

+	// Methods

+	// =======================================================================

+	

+	

+	/**

+     * Interface to add children to this process

+     * 

+     * @param newEvent

+     */

+    public void addChildren(TimeRangeEvent newEvent) {

+        if ((newEvent != null)) {

+            this.ChildEventLeafs.add(newEvent);

+        }

+    }

+	

+	/**

+	 * @return

+	 */

+	public Long getPid() {

+		return pid;

+	}

+

+	/**

+	 * @param pid

+	 */

+	public void setPid(Long pid) {

+		this.pid = pid;

+	}

+

+	/**

+	 * @return

+	 */

+	public Long getTgid() {

+		return tgid;

+	}

+

+	/**

+	 * @param tgid

+	 */

+	public void setTgid(Long tgid) {

+		this.tgid = tgid;

+	}

+

+	/**

+	 * @return

+	 */

+	public Long getPpid() {

+		return ppid;

+	}

+

+	/**

+	 * @param ppid

+	 */

+	public void setPpid(Long ppid) {

+		this.ppid = ppid;

+	}

+

+	/**

+	 * @return

+	 */

+	public Long getCreationTime() {

+		return creationTime;

+	}

+

+	/**

+	 * @param creationTime

+	 */

+	public void setCreationTime(Long creationTime) {

+		this.creationTime = creationTime;

+	}

+

+	/**

+	 * @return

+	 */

+	public String getTraceID() {

+		return traceID;

+	}

+

+	/**

+	 * @param traceID

+	 */

+	public void setTraceID(String traceID) {

+		if (traceID != null) {

+			this.traceID = traceID;

+		} else {

+			this.traceID = "";

+		}

+	}

+

+	/**

+	 * @return

+	 */

+	public String getProcessType() {

+		return processType;

+	}

+

+	/**

+	 * @param processType

+	 */

+	public void setProcessType(String processType) {

+		if (processType != null) {

+			this.processType = processType;

+		}

+	}

+

+	/**

+	 * @return

+	 */

+	public Long getCpu() {

+		return cpu;

+	}

+

+	/**

+	 * @param cpu

+	 */

+	public void setCpu(Long cpu) {

+		if (cpu != null) {

+			this.cpu = cpu;

+		} else {

+			cpu = 0L;

+		}

+	}

+

+	/**

+	 * @return

+	 */

+	public String getBrand() {

+        return brand;

+    }

+

+	/**

+	 * @param brand

+	 */

+    public void setBrand(String brand) {

+        if (brand != null) {

+            this.brand = brand;

+        } else {

+            brand = "";

+        }

+    }

+	

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see java.lang.Comparable#compareTo(java.lang.Object)

+	 */

+	public int compareTo(TimeRangeEventProcess process) {

+		if (process != null) {

+			int result = 0;

+			// Compare by trace first

+			String anotherTraceId = process.getTraceID();

+			result = traceID.compareTo(anotherTraceId);

+			if (result != 0) {

+				return result;

+			}

+

+			// Then by CPU

+			Long anotherCpu = process.getCpu();

+			result = cpu.compareTo(anotherCpu);

+			if (result != 0) {

+				return result;

+			}

+

+			// finally Compare by pid

+			Long anotherPid = process.getPid();

+			return pid.compareTo(anotherPid);

+		}

+

+		return 0;

+	}

+}

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEventResource.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEventResource.java
new file mode 100644
index 0000000..b7a417a
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEventResource.java
@@ -0,0 +1,176 @@
+/*******************************************************************************

+ * Copyright (c) 2009 Ericsson

+ * 

+ * All rights reserved. This program and the accompanying materials are

+ * made available under the terms of the Eclipse Public License v1.0 which

+ * accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.lttng.ui.model.trange;

+

+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;

+

+/**

+ * @author alvaro

+ * 

+ */

+public abstract class TimeRangeEventResource extends TimeRangeComposite

+		implements

+		Comparable<TimeRangeEventResource> {

+

+	// ========================================================================

+	// Data

+	// =======================================================================

+	public static enum ResourceTypes {

+		UNKNOWN, IRQ, TRAP, SOFT_IRQ, BDEV, CPU

+	}

+

+	private ResourceTypes type = ResourceTypes.UNKNOWN;

+	private Long resourceId = null;

+

+	// ========================================================================

+	// Constructor

+	// =======================================================================

+	/**

+	 * Constructor<br>

+	 * 

+	 * @param newId            Id used by the UI

+	 * @param newStartTime     normally set to the Trace start time

+	 * @param newStopTime      normally set to the Trace end time

+	 * @param newName          the name of this resource

+	 * @param newGroupName     the group name of this resource. Should be same as the traceId

+	 * @param newClassName     the classname of this resource.

+	 * @param newType          the type of the resource, as defined in the ResourceTypes enum

+	 * @param newResourceId    the resourceId, unique id identifying this resource 

+	 * 

+	 */

+	public TimeRangeEventResource(int newId, long newStartTime,

+			long newStopTime, String newName, String newGroupName,

+			String newClassName, ResourceTypes newType, Long newResourceId,

+			long insertionTime) {

+

+		super(newId, newStartTime, newStopTime, newName, newGroupName,

+				newClassName, CompositeType.RESOURCE, insertionTime);

+

+		type = newType;

+		resourceId = newResourceId;

+	}

+

+	// ========================================================================

+	// Methods

+	// =======================================================================

+

+	/**

+	 * Interface to add children to this resource

+	 * 

+	 * @param newEvent

+	 */

+	public void addChildren(TimeRangeEvent newEvent) {

+		if ((newEvent != null)) {

+			this.ChildEventLeafs.add(newEvent);

+		}

+	}

+

+	/**

+	 * @return

+	 */

+	public Long getResourceId() {

+		return resourceId;

+	}

+

+	/**

+	 * @param newResId

+	 */

+	public void setResourceId(Long newResId) {

+		this.resourceId = newResId;

+	}

+

+	/**

+	 * @return

+	 */

+	public ResourceTypes getType() {

+		return type;

+	}

+

+	/**

+	 * @param type

+	 */

+	public void setType(ResourceTypes type) {

+		this.type = type;

+	}

+

+	/**

+	 * Getter for traceId.<br>

+	 * Note : traceId and groupName are the same for EventResource

+	 * 

+	 * @return String

+	 */

+	public String getTraceId() {

+		return groupName;

+	}

+

+	/**

+	 * Getter for traceId.<br>

+	 * Note : traceId and groupName are the same for EventResource

+	 * 

+	 * @return String

+	 */

+	public void setTraceId(String traceId) {

+		this.groupName = traceId;

+	}

+

+	// @Override

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see java.lang.Object#toString()

+	 */

+	@Override

+	public String toString() {

+		return getResourceId().toString() + ":" + getTraceId().toString() + ":"

+				+ getType().toString();

+	}

+

+	/**

+	 * Compare function to implement Comparable<br>

+	 * <br>

+	 * Compare by traceId THEN IF EQUAL by resourceType THEN IF EQUAL by

+	 * resourceId

+	 * 

+	 * @param comparedResource

+	 *            The resource to compare to

+	 * 

+	 * @return int 0 if equals, negative number if "smaller", positive if

+	 *         "bigger".

+	 */

+	// @Override

+	public int compareTo(TimeRangeEventResource comparedResource) {

+		int returnedValue = 0;

+

+		if (comparedResource != null) {

+			// Compare by trace id first

+			returnedValue = this.getTraceId().compareTo(

+					comparedResource.getTraceId());

+

+			// If same, compare by resourceName

+			if (returnedValue == 0) {

+				returnedValue = this.getName().compareTo(

+						comparedResource.getName());

+

+				// Finally, if same, compare by ResourceId

+				if (returnedValue == 0) {

+					returnedValue = this.getResourceId().compareTo(

+							comparedResource.getResourceId());

+				}

+			}

+

+		}

+

+		return returnedValue;

+	}

+

+	public abstract String getStateMode(LttngTraceState traceState);

+}

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeResourceFactory.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeResourceFactory.java
new file mode 100644
index 0000000..94f2340
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeResourceFactory.java
@@ -0,0 +1,248 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.model.trange;
+
+
+import org.eclipse.linuxtools.lttng.state.StateStrings;
+import org.eclipse.linuxtools.lttng.state.model.LttngIRQState;
+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.state.model.LttngTrapState;
+import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource.ResourceTypes;
+
+/**
+ * Creates Resources with custom implementation to obtain its corresponding
+ * state mode
+ * <p>
+ * The state mode resolution is needed at the end of a data request, as well as
+ * in the before and after handlers
+ * </p>
+ * 
+ * @author alvaro
+ * 
+ */
+public class TimeRangeResourceFactory {
+	// ========================================================================
+	// Data
+	// =======================================================================
+	private static TimeRangeResourceFactory instance = null;
+
+	// ========================================================================
+	// Create instance
+	// =======================================================================
+	/**
+	 * Factory singleton
+	 * 
+	 * @return
+	 */
+	public static TimeRangeResourceFactory getInstance() {
+		if (instance == null) {
+			instance = new TimeRangeResourceFactory();
+		}
+		return instance;
+	}
+
+	// ========================================================================
+	// Public methods
+	// =======================================================================
+	public TimeRangeEventResource createResource(int newId, long newStartTime,
+			long newStopTime, String newName, String newGroupName,
+			String newClassName, ResourceTypes type, Long newResourceId,
+			long insertionTime) {
+
+		TimeRangeEventResource resource = null;
+		switch (type) {
+		case CPU:
+			resource = createCpuResource(newId, newStartTime, newStopTime,
+					newName, newGroupName, newClassName, type, newResourceId,
+					insertionTime);
+			break;
+		case IRQ:
+			resource = createIrqResource(newId, newStartTime, newStopTime,
+					newName, newGroupName, newClassName, type, newResourceId,
+					insertionTime);
+			break;
+		case SOFT_IRQ:
+			resource = createSoftIrqResource(newId, newStartTime, newStopTime,
+					newName, newGroupName, newClassName, type, newResourceId,
+					insertionTime);
+			break;
+		case TRAP:
+			resource = createTrapResource(newId, newStartTime, newStopTime,
+					newName, newGroupName, newClassName, type, newResourceId,
+					insertionTime);
+			break;
+		case BDEV:
+			resource = createBdevResource(newId, newStartTime, newStopTime,
+					newName, newGroupName, newClassName, type, newResourceId,
+					insertionTime);
+			break;
+		default:
+			break;
+		}
+
+		return resource;
+	}
+
+	// ========================================================================
+	// Private methods
+	// =======================================================================
+	private TimeRangeEventResource createIrqResource(int newId,
+			long newStartTime, long newStopTime, String newName,
+			String newGroupName, String newClassName, ResourceTypes newType,
+			Long newResourceId, long insertionTime) {
+
+		TimeRangeEventResource resource = new TimeRangeEventResource(newId,
+				newStartTime, newStopTime, newName, newGroupName, newClassName,
+				newType, newResourceId, insertionTime) {
+
+			@Override
+			public String getStateMode(LttngTraceState traceSt) {
+				LttngIRQState irqState = traceSt.getIrq_states().get(
+						getResourceId());
+				String statemode = "";
+				if (irqState != null) {
+					statemode = irqState.peekFromIrqStack().getInName();
+				}
+
+				return statemode;
+			}
+		};
+		
+		return resource;
+	}
+
+	private TimeRangeEventResource createTrapResource(int newId,
+			long newStartTime, long newStopTime, String newName,
+			String newGroupName, String newClassName, ResourceTypes newType,
+			Long newResourceId, long insertionTime) {
+
+		TimeRangeEventResource resource = new TimeRangeEventResource(newId,
+				newStartTime, newStopTime, newName, newGroupName, newClassName,
+				newType, newResourceId, insertionTime) {
+
+			@Override
+			public String getStateMode(LttngTraceState traceSt) {
+				// Determine the trap state.
+				String trapStateMode = "";
+				LttngTrapState ts = traceSt.getTrap_states().get(getResourceId());
+				
+				// *** Note : 
+				//	Ts might not have been created yet.
+				//	This is because the state system will be updated next to this before hook
+				//	It should be correct to create it here as Busy 
+				//		(traps are created with running++ so it wont be idle)
+				if ( ts != null ) {
+					Long trapState = ts.getRunning();
+					
+					if (trapState == 0) {
+						trapStateMode = StateStrings.TrapMode.LTTV_TRAP_IDLE.getInName();
+					} else {
+						trapStateMode = StateStrings.TrapMode.LTTV_TRAP_BUSY.getInName();
+					}
+				}
+				else {
+					trapStateMode = StateStrings.TrapMode.LTTV_TRAP_BUSY.getInName();
+				}
+				
+				return trapStateMode;
+			}
+		};
+
+		return resource;
+	}
+
+	private TimeRangeEventResource createSoftIrqResource(int newId,
+			long newStartTime, long newStopTime, String newName,
+			String newGroupName, String newClassName, ResourceTypes newType,
+			Long newResourceId, long insertionTime) {
+
+		TimeRangeEventResource resource = new TimeRangeEventResource(newId,
+				newStartTime, newStopTime, newName, newGroupName, newClassName,
+				newType, newResourceId, insertionTime) {
+
+			@Override
+			public String getStateMode(LttngTraceState traceSt) {
+				// Get the resource id.
+				Long softIrqId = getResourceId();
+				// Get the resource state mode
+				long running = traceSt.getSoft_irq_states().get(softIrqId)
+						.getRunning().longValue();
+				long pending = traceSt.getSoft_irq_states().get(softIrqId)
+						.getPending().longValue();
+
+				String softIrqStateMode;
+				if (running > 0) {
+					softIrqStateMode = StateStrings.SoftIRQMode.LTTV_SOFT_IRQ_BUSY
+							.getInName();
+				} else if (pending > 0) {
+					softIrqStateMode = StateStrings.SoftIRQMode.LTTV_SOFT_IRQ_PENDING
+							.getInName();
+				} else {
+					softIrqStateMode = StateStrings.SoftIRQMode.LTTV_SOFT_IRQ_IDLE
+							.getInName();
+				}
+
+				return softIrqStateMode;
+			}
+
+		};
+
+		return resource;
+	}
+
+	private TimeRangeEventResource createBdevResource(int newId,
+			long newStartTime, long newStopTime, String newName,
+			String newGroupName, String newClassName, ResourceTypes newType,
+			Long newResourceId, long insertionTime) {
+
+		TimeRangeEventResource resource = new TimeRangeEventResource(newId,
+				newStartTime, newStopTime, newName, newGroupName, newClassName,
+				newType, newResourceId, insertionTime) {
+
+			@Override
+			public String getStateMode(LttngTraceState traceSt) {
+				// Get the resource state mode
+				String bdevStateMode = traceSt.getBdev_states().get(
+						getResourceId()).peekFromBdevStack().getInName();
+
+				return bdevStateMode;
+			}
+
+		};
+
+		return resource;
+	}
+
+	private TimeRangeEventResource createCpuResource(int newId,
+			long newStartTime, long newStopTime, String newName,
+			String newGroupName, String newClassName, ResourceTypes newType,
+			Long newResourceId, long insertionTime) {
+
+		TimeRangeEventResource resource = new TimeRangeEventResource(newId,
+				newStartTime, newStopTime, newName, newGroupName, newClassName,
+				newType, newResourceId, insertionTime) {
+
+			@Override
+			public String getStateMode(LttngTraceState traceSt) {
+				// Get the resource state mode
+				String cpuStateMode = traceSt.getCpu_states().get(
+						getResourceId())
+						.peekFromCpuStack().getInName();
+
+				return cpuStateMode;
+			}
+
+		};
+
+		return resource;
+	}
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeViewerProvider.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeViewerProvider.java
new file mode 100644
index 0000000..c071627
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeViewerProvider.java
@@ -0,0 +1,229 @@
+/*******************************************************************************

+ * Copyright (c) 2009 Ericsson

+ * 

+ * All rights reserved. This program and the accompanying materials are

+ * made available under the terms of the Eclipse Public License v1.0 which

+ * accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.lttng.ui.model.trange;

+

+import java.util.HashMap;

+import java.util.Map;

+

+import org.eclipse.linuxtools.lttng.state.StateStrings.BdevMode;

+import org.eclipse.linuxtools.lttng.state.StateStrings.CpuMode;

+import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionMode;

+import org.eclipse.linuxtools.lttng.state.StateStrings.IRQMode;

+import org.eclipse.linuxtools.lttng.state.StateStrings.ProcessStatus;

+import org.eclipse.linuxtools.lttng.state.StateStrings.SoftIRQMode;

+import org.eclipse.linuxtools.lttng.state.StateStrings.TrapMode;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.TmfTimeAnalysisProvider;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITimeEvent;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITmfTimeAnalysisEntry;

+

+public class TimeRangeViewerProvider extends TmfTimeAnalysisProvider {

+	// ========================================================================

+	// Data

+	// =======================================================================

+	Map<String, StateColor> procStateToColor = new HashMap<String, StateColor>(

+			16);

+	Map<String, StateColor> bdevStateToColor = new HashMap<String, StateColor>(

+			4);

+	Map<String, StateColor> softIrqStateToColor = new HashMap<String, StateColor>(

+			4);

+	Map<String, StateColor> trapStateToColor = new HashMap<String, StateColor>(

+			4);

+	Map<String, StateColor> irqStateToColor = new HashMap<String, StateColor>(4);

+	Map<String, StateColor> cpuStateToColor = new HashMap<String, StateColor>(8);

+

+	// ========================================================================

+	// Constructors

+	// =======================================================================

+	public TimeRangeViewerProvider() {

+		// Fill the statemode to color maps

+		fillProcessStateToColor();

+		fillBdevStateToColor();

+		fillSoftIRQStateToColor();

+		fillTrapStateToColor();

+		fillIrqStateToColor();

+		fillCpuStateToColor();

+	}

+

+	// ========================================================================

+	// Methods

+	// =======================================================================

+	@Override

+	public StateColor getEventColor(ITimeEvent event) {

+		StateColor retColor = null;

+		

+		if (event instanceof TimeRangeEvent) {

+			TimeRangeEvent devent = (TimeRangeEvent) event;

+			String stateMode = devent.getStateMode();

+			switch (devent.getEventType()) {

+			case PROCESS_MODE:

+				retColor = procStateToColor.get(stateMode);

+				break;

+			case BDEV_MODE:

+				retColor = bdevStateToColor.get(stateMode);

+				break;

+			case IRQ_MODE:

+				retColor = irqStateToColor.get(stateMode);

+				break;

+			case SOFT_IRQ_MODE:

+				retColor = softIrqStateToColor.get(stateMode);

+				break;

+			case CPU_MODE:

+				retColor = cpuStateToColor.get(stateMode);

+				break;

+			case TRAP_MODE:

+				retColor = trapStateToColor.get(stateMode);

+				break;

+			}

+		}

+		

+		if (retColor == null) {

+			return StateColor.MAGENTA3;

+		}

+		return retColor;

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.linuxtools.tmf.ui.widgets.timeAnalysis.api.TsfTmAbstractImplProvider#getStateName(org.eclipse.linuxtools.tmf.ui.widgets.timeAnalysis.api.TsfTmAbstractImplProvider.StateColor)

+	 */

+	@Override

+	public String getStateName(StateColor color) {

+		//Override to multiple instances of the widget, the same color can have multiple meanings

+		return "Not mapped";

+	}

+

+	@Override

+	public Map<String, String> getEventHoverToolTipInfo(ITimeEvent revent) {

+		Map<String, String> toolTipEventMsgs = new HashMap<String, String>();

+		//if the selected resource is a Process, add the Process type to the tool tip

+		if (revent instanceof TimeRangeComponent) {

+			ITimeRangeComponent parent = ((TimeRangeComponent) revent)

+					.getEventParent();

+			if (parent != null && parent instanceof TimeRangeEventProcess) {

+				TimeRangeEventProcess localProcess = (TimeRangeEventProcess) parent;

+				toolTipEventMsgs.put("Process Type", localProcess

+						.getProcessType());

+			}

+		}

+

+		return toolTipEventMsgs;

+	}

+

+	@Override

+	public String getEventName(ITimeEvent event, boolean upper, boolean extInfo) {

+		String name = null;

+		//The relevant event name for the time range is the actual state mode

+		if (event instanceof TimeRangeEvent) {

+			TimeRangeEvent devent = (TimeRangeEvent) event;

+			StringBuilder sb = new StringBuilder(devent.getStateMode());

+			name = sb.toString();

+		}

+		

+		if (name == null) {

+			return "Unknown";

+		}

+		return name;

+	}

+

+	@Override

+	public String getTraceClassName(ITmfTimeAnalysisEntry trace) {

+		String name = "";

+		if (trace instanceof TimeRangeComposite) {

+			TimeRangeComposite dTrace = (TimeRangeComposite) trace;

+			name = dTrace.getClassName();

+		}

+		return name;

+	}

+

+	private void fillCpuStateToColor() {

+		cpuStateToColor.put(CpuMode.LTTV_CPU_UNKNOWN.getInName(),

+				StateColor.BLACK);

+		cpuStateToColor.put(CpuMode.LTTV_CPU_IDLE.getInName(), StateColor.GRAY);

+		cpuStateToColor.put(CpuMode.LTTV_CPU_BUSY.getInName(),

+				StateColor.LIGHT_BLUE);

+		cpuStateToColor

+				.put(CpuMode.LTTV_CPU_IRQ.getInName(), StateColor.ORANGE);

+		cpuStateToColor.put(CpuMode.LTTV_CPU_SOFT_IRQ.getInName(),

+				StateColor.PURPLE1);

+		cpuStateToColor.put(CpuMode.LTTV_CPU_TRAP.getInName(), StateColor.GOLD);

+	}

+

+	private void fillIrqStateToColor() {

+		irqStateToColor.put(IRQMode.LTTV_IRQ_UNKNOWN.getInName(),

+				StateColor.BLACK);

+		irqStateToColor.put(IRQMode.LTTV_IRQ_IDLE.getInName(), StateColor.GRAY);

+		irqStateToColor.put(IRQMode.LTTV_IRQ_BUSY.getInName(),

+				StateColor.ORANGE);

+	}

+

+	private void fillTrapStateToColor() {

+		trapStateToColor.put(TrapMode.LTTV_TRAP_UNKNOWN.getInName(),

+				StateColor.BLACK);

+		trapStateToColor.put(TrapMode.LTTV_TRAP_IDLE.getInName(),

+				StateColor.BLACK);

+		trapStateToColor.put(TrapMode.LTTV_TRAP_BUSY.getInName(),

+				StateColor.GOLD);

+	}

+

+	private void fillSoftIRQStateToColor() {

+		softIrqStateToColor.put(SoftIRQMode.LTTV_SOFT_IRQ_UNKNOWN.getInName(),

+				StateColor.BLACK);

+		softIrqStateToColor.put(SoftIRQMode.LTTV_SOFT_IRQ_IDLE.getInName(),

+				StateColor.BLACK);

+		softIrqStateToColor.put(SoftIRQMode.LTTV_SOFT_IRQ_PENDING.getInName(),

+				StateColor.PINK1);

+		softIrqStateToColor.put(SoftIRQMode.LTTV_SOFT_IRQ_BUSY.getInName(),

+				StateColor.PURPLE1);

+	}

+

+	private void fillBdevStateToColor() {

+		softIrqStateToColor.put(BdevMode.LTTV_BDEV_UNKNOWN.getInName(),

+				StateColor.BLACK);

+		softIrqStateToColor.put(BdevMode.LTTV_BDEV_IDLE.getInName(),

+				StateColor.BLACK);

+		softIrqStateToColor.put(BdevMode.LTTV_BDEV_BUSY_READING.getInName(),

+				StateColor.DARK_BLUE);

+		softIrqStateToColor.put(BdevMode.LTTV_BDEV_BUSY_WRITING.getInName(),

+				StateColor.RED);

+	}

+

+	private void fillProcessStateToColor() {

+		// Process Status

+		procStateToColor.put(ProcessStatus.LTTV_STATE_UNNAMED.getInName(),

+				StateColor.GRAY);

+		procStateToColor.put(ProcessStatus.LTTV_STATE_DEAD.getInName(),

+				StateColor.BLACK);

+		procStateToColor.put(ProcessStatus.LTTV_STATE_WAIT_FORK.getInName(),

+				StateColor.DARK_GREEN);

+		procStateToColor.put(ProcessStatus.LTTV_STATE_WAIT_CPU.getInName(),

+				StateColor.DARK_YELLOW);

+		procStateToColor.put(ProcessStatus.LTTV_STATE_EXIT.getInName(),

+				StateColor.MAGENTA3);

+		procStateToColor.put(ProcessStatus.LTTV_STATE_ZOMBIE.getInName(),

+				StateColor.PURPLE1);

+		procStateToColor.put(ProcessStatus.LTTV_STATE_WAIT.getInName(),

+				StateColor.RED);

+

+		// Execution Mode

+		procStateToColor.put(ExecutionMode.LTTV_STATE_MODE_UNKNOWN.getInName(),

+				StateColor.BLACK);

+		procStateToColor.put(ExecutionMode.LTTV_STATE_USER_MODE.getInName(),

+				StateColor.GREEN);

+		procStateToColor.put(ExecutionMode.LTTV_STATE_SYSCALL.getInName(),

+				StateColor.DARK_BLUE);

+		procStateToColor.put(ExecutionMode.LTTV_STATE_TRAP.getInName(),

+				StateColor.GOLD);

+		procStateToColor.put(ExecutionMode.LTTV_STATE_IRQ.getInName(),

+				StateColor.ORANGE);

+		procStateToColor.put(ExecutionMode.LTTV_STATE_SOFT_IRQ.getInName(),

+				StateColor.PINK1);

+	}

+}

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/PerspectiveFactory.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/PerspectiveFactory.java
new file mode 100644
index 0000000..bd28bc3
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/PerspectiveFactory.java
@@ -0,0 +1,113 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views;
+
+import org.eclipse.linuxtools.lttng.ui.views.control.ControlView;
+import org.eclipse.linuxtools.lttng.ui.views.controlflow.ControlFlowView;
+import org.eclipse.linuxtools.lttng.ui.views.events.EventsView;
+import org.eclipse.linuxtools.lttng.ui.views.histogram.HistogramView;
+import org.eclipse.linuxtools.lttng.ui.views.project.ProjectView;
+import org.eclipse.linuxtools.lttng.ui.views.resources.ResourcesView;
+import org.eclipse.linuxtools.lttng.ui.views.statistics.StatisticsView;
+import org.eclipse.linuxtools.lttng.ui.views.timeframe.TimeFrameView;
+import org.eclipse.ui.IFolderLayout;
+import org.eclipse.ui.IPageLayout;
+import org.eclipse.ui.IPerspectiveFactory;
+
+/**
+ * <b><u>PerspectiveFactory</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class PerspectiveFactory implements IPerspectiveFactory {
+
+    // LTTng views
+    private static final String PROJECT_VIEW_ID      = ProjectView.ID;
+    private static final String CONTROL_VIEW_ID      = ControlView.ID;
+    private static final String EVENTS_VIEW_ID       = EventsView.ID;
+    private static final String TIME_FRAME_VIEW_ID   = TimeFrameView.ID;
+    private static final String CONTROL_FLOW_VIEW_ID = ControlFlowView.ID;
+    private static final String RESOURCES_VIEW_ID    = ResourcesView.ID;
+    private static final String STATISTICS_VIEW_ID   = StatisticsView.ID;
+    private static final String HISTOGRAM_VIEW_ID    = HistogramView.ID;
+
+    // Standard Eclipse views
+    private static final String PROPERTIES_VIEW_ID   = IPageLayout.ID_PROP_SHEET;
+    private static final String PROBLEM_VIEW_ID      = IPageLayout.ID_PROBLEM_VIEW;
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IPerspectiveFactory#createInitialLayout(org.eclipse.ui.IPageLayout)
+	 */
+	public void createInitialLayout(IPageLayout layout) {
+
+        layout.setEditorAreaVisible(false);
+
+        addFastViews(layout);
+        addViewShortcuts(layout);
+        addPerspectiveShortcuts(layout);
+
+        // Create the top left folder
+        IFolderLayout topLeftFolder = layout.createFolder("topLeftFolder", IPageLayout.LEFT, 0.15f, IPageLayout.ID_EDITOR_AREA);
+        topLeftFolder.addView(PROJECT_VIEW_ID);
+        topLeftFolder.addView(CONTROL_VIEW_ID);
+
+        // Create the bottom left folder
+        IFolderLayout bottomLeftFolder = layout.createFolder("bottomLeftFolder", IPageLayout.BOTTOM, 0.50f, "topLeftFolder");
+        bottomLeftFolder.addView(PROPERTIES_VIEW_ID);
+   
+        // Create the middle right folder
+        IFolderLayout topRightFolder = layout.createFolder("topRightFolder", IPageLayout.TOP, 0.50f, IPageLayout.ID_EDITOR_AREA);
+        topRightFolder.addView(CONTROL_FLOW_VIEW_ID);
+        topRightFolder.addView(RESOURCES_VIEW_ID);
+        topRightFolder.addView(STATISTICS_VIEW_ID);
+
+        // Create the middle right folder
+        IFolderLayout middleRightFolder = layout.createFolder("middleRightFolder", IPageLayout.BOTTOM, 0.50f, "topRightFolder");
+        middleRightFolder.addView(EVENTS_VIEW_ID);
+
+        // Create the bottom right folder
+        IFolderLayout bottomRightFolder = layout.createFolder("bottomRightFolder", IPageLayout.BOTTOM, 0.65f, "middleRightFolder");
+        bottomRightFolder.addView(TIME_FRAME_VIEW_ID);
+        bottomRightFolder.addView(HISTOGRAM_VIEW_ID);
+        bottomRightFolder.addView(PROBLEM_VIEW_ID);
+
+	}
+
+    /**
+     * Add fast views to the perspective
+     * 
+     * @param layout
+     */
+    private void addFastViews(IPageLayout layout) {
+        // TODO Auto-generated method stub
+    }
+
+    /**
+     * Add view shortcuts to the perspective
+     * 
+     * @param layout
+     */
+    private void addViewShortcuts(IPageLayout layout) {
+        // TODO Auto-generated method stub
+    }
+
+    /**
+     * Add perspective shortcuts to the perspective
+     * 
+     * @param layout
+     */
+    private void addPerspectiveShortcuts(IPageLayout layout) {
+        // TODO Auto-generated method stub
+    }
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTRangeUpdate.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTRangeUpdate.java
new file mode 100644
index 0000000..f1757be
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTRangeUpdate.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors: Alvaro Sanchez-Leon - Initial implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.common;
+
+import org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing;
+import org.eclipse.linuxtools.lttng.state.evProcessor.state.AbsStateProcessing;
+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+
+public abstract class AbsTRangeUpdate extends AbsStateProcessing implements
+		IEventProcessing {
+
+    private static final long MINORBITS = 20;
+    
+	// ========================================================================
+	// General methods
+	// =======================================================================
+    
+    /**
+     * Get the mkdev node id<br>
+     * <br>
+     * This is an implementation of a KERNEL macro used in Lttv
+     * 
+     */
+    public long getMkdevId(long major, long minor) {
+        return (((major) << MINORBITS) | (minor));
+    }
+
+	/**
+	 * Get the pixels per Nano second, either from active widgets or initialise
+	 * with the experiment time range values
+	 * 
+	 * @param traceSt
+	 * @param params
+	 * 
+	 * @return double
+	 */
+    protected double getPixelsPerNs(LttngTraceState traceSt, ParamsUpdater params) {
+        double pixPerNs = params.getPixelsPerNs();
+        if (pixPerNs == 0) {
+            TmfTimeRange tsetRange = traceSt.getInputDataRef().getExperimentTimeWindow();
+            
+            long startTime = tsetRange.getStartTime().getValue();
+            long endTime = tsetRange.getEndTime().getValue();
+            long delta = endTime - startTime;
+            
+            if (delta > 0) {
+                pixPerNs = (double) params.getWidth() / (double) delta;
+                params.setPixelsPerNs(pixPerNs);
+            }
+        }
+        return pixPerNs;
+	}
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java
new file mode 100644
index 0000000..359111b
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java
@@ -0,0 +1,245 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.common;
+
+import org.eclipse.linuxtools.lttng.state.IStateDataRequestListener;
+import org.eclipse.linuxtools.lttng.state.RequestCompletedSignal;
+import org.eclipse.linuxtools.lttng.state.RequestStartedSignal;
+import org.eclipse.linuxtools.lttng.state.StateDataRequest;
+import org.eclipse.linuxtools.lttng.state.StateManager;
+import org.eclipse.linuxtools.lttng.state.experiment.StateManagerFactory;
+import org.eclipse.linuxtools.lttng.ui.TraceDebug;
+import org.eclipse.linuxtools.lttng.ui.views.common.DataRequestState.RequestState;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler;
+import org.eclipse.linuxtools.tmf.ui.views.TmfView;
+
+/**
+ * <p>
+ * Abstract class used as a base for views handling specific time range data
+ * requests
+ * </p>
+ * <p>
+ * The class handles a single element queue of data requests, and a list of
+ * requests in progress i.e. request can be triggered from different sources
+ * e.g. opening a file as well as a new selected time window
+ * </p>
+ * 
+ * @author alvaro
+ * 
+ */
+public abstract class AbsTimeUpdateView extends TmfView implements
+		IStateDataRequestListener {
+
+	// ========================================================================
+	// Data
+	// ========================================================================
+	private DataRequestState reqState = new DataRequestState();
+	private String viewID = "";
+
+	// ========================================================================
+	// Constructor
+	// ========================================================================
+	public AbsTimeUpdateView(String viewID) {
+		super("AbsTimeUpdateView");
+		this.viewID = viewID;
+	}
+
+	// ========================================================================
+	// Methods
+	// ========================================================================
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @seeorg.eclipse.linuxtools.lttng.state.IStateDataRequestListener#
+	 * processingStarted(org.eclipse.linuxtools.lttng.state.StateDataRequest)
+	 */
+	@TmfSignalHandler
+	public synchronized void processingStarted(RequestStartedSignal signal) {
+		StateDataRequest request = signal.getRequest();
+		if (request != null) {
+			// Check if a newer request is in the queue
+			TmfTimeRange newerReq = reqState.peekQueued();
+			if (newerReq == null) {
+				reqState.setState(DataRequestState.RequestState.BUSY);
+				reqState.setCurrentRequest(request);
+
+				waitCursor(true);
+
+				StateManager smanager = request.getStateManager();
+				// Clear the children on the Processes related to this
+				// manager.
+				// Leave the GUI in charge of the updated data.
+				String traceId = smanager.getEventLog().getName();
+
+				// indicate if the data model needs to be cleared e.g. a new
+				// experiment is being selected
+				boolean clearData = request.isclearDataInd();
+				// no new time range for zoom orders
+				TmfTimeRange trange = null;
+				if (clearData) {
+					// Time Range will be used to filter out events which are
+					// not visible in one pixel
+					trange = StateManagerFactory.getExperimentManager()
+							.getExperimentTimeRange();
+				}
+				
+				//Indicate if current data needs to be cleared and if so 
+				//specify the new experiment time range that applies
+				ModelUpdatePrep(traceId, clearData, trange);
+			} else {
+				// clean up any possible pending request
+				request.cancel();
+
+				// Start the new request.
+				StateManagerFactory.getExperimentManager()
+						.readExperimentTimeWindow(newerReq, viewID, this);
+			}
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @seeorg.eclipse.linuxtools.lttng.state.IStateDataRequestListener#
+	 * processingCompleted(org.eclipse.linuxtools.lttng.state.StateDataRequest)
+	 */
+	@TmfSignalHandler
+	public synchronized void processingCompleted(RequestCompletedSignal signal) {
+		StateDataRequest request = signal.getRequest();
+
+		if (request == null) {
+			return;
+		} else {
+			reqState.setCurrentRequest(null);
+
+		}
+
+		// No data refresh actions for cancelled requests.
+		if (request.isCancelled() || request.isFailed()) {
+
+			requestStateUpdate();
+
+			if (TraceDebug.isDEBUG()) {
+				TmfTimeRange trange = request.getRange();
+				if (request.isCancelled()) {
+					TraceDebug.debug("Request cancelled "
+							+ trange.getStartTime() + "-" + trange.getEndTime()
+							+ " Handled Events: " + request.getNumOfEvents());
+				} else if (request.isFailed()) {
+					TraceDebug.debug("Request Failed " + trange.getStartTime()
+							+ "-" + trange.getEndTime() + " Handled Events: "
+							+ request.getNumOfEvents());
+				}
+			}
+
+			return;
+		} else {
+			ModelUpdateComplete(request);
+			requestStateUpdate();
+		}
+	}
+
+	/**
+	 * Evaluates the need to either send a new data request or queue the request
+	 * till next available opportunity. One element queue to keep the latest
+	 * request only.
+	 * 
+	 * @param trange
+	 */
+	public synchronized void dataRequest(TmfTimeRange trange) {
+		if (trange != null) {
+			// cancelPendingRequests();
+			StateDataRequest currentRequest = reqState.getCurrentRequest();
+			// If a request is ongoing queue the new request
+			if (reqState.getState().equals(RequestState.BUSY)) {
+				reqState.setQueued(trange);
+				currentRequest = reqState.getCurrentRequest();
+				if (currentRequest != null) {
+					currentRequest.cancel();
+				} else {
+					TraceDebug
+							.debug("Exception : State busy but current request is null");
+				}
+			} else {
+				// Set the state to busy
+				reqState.setState(DataRequestState.RequestState.BUSY);
+				waitCursor(true);
+				if (TraceDebug.isDEBUG()) {
+					TraceDebug
+							.debug("Requesting data: " + trange.getStartTime()
+									+ "-" + trange.getEndTime());
+				}
+				// no request is ongoing, proceed with request
+				StateManagerFactory.getExperimentManager()
+						.readExperimentTimeWindow(trange, viewID, this);
+
+			}
+		}
+	}
+
+	/**
+	 * Check for pending request an either send a new request or change the
+	 * state to idle
+	 */
+	private synchronized void requestStateUpdate() {
+		// Check if a new time range update is waiting to be processed
+		TmfTimeRange queuedRequest = reqState.popQueued();
+		if (queuedRequest != null) {
+			// Trigger the pending request
+			if (TraceDebug.isDEBUG()) {
+				TmfTimestamp start = queuedRequest.getStartTime();
+				TmfTimestamp end = queuedRequest.getEndTime();
+				TraceDebug.debug("New request about to start: " + start + "-"
+						+ end);
+			}
+
+			StateManagerFactory.getExperimentManager()
+					.readExperimentTimeWindow(queuedRequest, viewID, this);
+		} else {
+			// All requests cancelled and no more pending requests
+			TraceDebug.debug("No requests pending in the queue");
+			reqState.setState(RequestState.IDLE);
+			waitCursor(false);
+		}
+	}
+
+	/**
+	 * Request the Time Analysis widget to enable or disable the wait cursor
+	 * e.g. data request in progress or data request completed
+	 * 
+	 * @param waitInd
+	 */
+	protected abstract void waitCursor(boolean waitInd);
+
+	/**
+	 * View preparation to override the current local information related to the
+	 * given traceId
+	 * 
+	 * @param traceId
+	 * @param clearAllData
+	 *            - reset all data e.g when a new experiment is selected
+	 * @param timeRange
+	 *            - new total time range e.g. Experiment level
+	 */
+	public abstract void ModelUpdatePrep(String traceId, boolean clearAllData,
+			TmfTimeRange timeRange);
+
+	/**
+	 * Actions taken by the view to refresh its widget(s) with the updated data
+	 * model
+	 * 
+	 * @param request
+	 */
+	public abstract void ModelUpdateComplete(StateDataRequest request);
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/DataRequestState.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/DataRequestState.java
new file mode 100644
index 0000000..6a1fee4
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/DataRequestState.java
@@ -0,0 +1,110 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.common;
+
+import org.eclipse.linuxtools.lttng.state.StateDataRequest;
+import org.eclipse.linuxtools.lttng.ui.TraceDebug;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+
+/**
+ * One instance to keep track of the state of data request and a single time
+ * range data request pending in queue
+ * 
+ * @author alvaro
+ * 
+ */
+public class DataRequestState {
+
+	// ========================================================================
+	// Data
+	// ========================================================================
+	public enum RequestState {
+		IDLE, BUSY
+	}
+
+	private TmfTimeRange queued = null;
+	RequestState state = RequestState.IDLE;
+	private StateDataRequest currentRequest = null;
+
+	// ========================================================================
+	// Methods
+	// ========================================================================
+	/**
+	 * @return the data request time range in queue
+	 */
+	public synchronized TmfTimeRange peekQueued() {
+		return queued;
+	}
+
+	/**
+	 * @return the data request time range in queue and reset it reference to
+	 *         null to get ready for a new entry in queue
+	 */
+	public synchronized TmfTimeRange popQueued() {
+		// Save the reference to current request
+		TmfTimeRange result = queued;
+		// remove from queue
+		queued = null;
+		// Send original reference
+		return result;
+	}
+
+	/**
+	 * @param queued
+	 *            <p>
+	 *            Set the data request time range to be waiting for processing
+	 *            </p>
+	 *            <p>
+	 *            Only the latest request is preserved
+	 *            </p>
+	 */
+	public synchronized void setQueued(TmfTimeRange nqueued) {
+		if (TraceDebug.isDEBUG()) {
+			if (this.queued != null) {
+				StringBuilder sb = new StringBuilder(
+						"Queued request replaced from: "
+
+						+ queued.getStartTime() + "-"
+								+ queued.getEndTime() + "\n\t\t to: "
+								+ nqueued.getStartTime() + "-"
+								+ nqueued.getEndTime());
+				TraceDebug.debug(sb.toString());
+			}
+		}
+
+		this.queued = nqueued;
+	}
+
+	/**
+	 * @return the state
+	 */
+	public synchronized RequestState getState() {
+		return state;
+	}
+
+	/**
+	 * @param state
+	 *            the state to set
+	 */
+	public synchronized void setState(RequestState state) {
+		this.state = state;
+	}
+
+	public synchronized void setCurrentRequest(StateDataRequest currentRequest) {
+		this.currentRequest = currentRequest;
+	}
+
+	public synchronized StateDataRequest getCurrentRequest() {
+		return currentRequest;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/ParamsUpdater.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/ParamsUpdater.java
new file mode 100644
index 0000000..5659066
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/ParamsUpdater.java
@@ -0,0 +1,256 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.common;
+
+import org.eclipse.linuxtools.lttng.event.LttngTimestamp;
+import org.eclipse.linuxtools.lttng.ui.TraceDebug;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.TmfTimeScaleSelectionEvent;
+
+/**
+ * 
+ * Preserve the time and space width parameters applicable to a particular view
+ * in order to facilitate filtering of events and request handling.
+ * 
+ * @author alvaro
+ * 
+ */
+public class ParamsUpdater {
+	// ========================================================================
+	// Data
+	// ========================================================================
+
+	private long startTime = 0;
+	private long endTime = Long.MAX_VALUE;
+	private Long selectedTime = null;
+	private final int defaultWidth = 2000; // number of estimated pixels that
+	// can hold the time range space
+	private int width = defaultWidth; // width in pixels used to represent the
+	// time interval
+	private double pixelsPerNs = 0;
+	private int eventsDiscarded = 0;
+	private int eventsDiscardedWrongOrder = 0;
+	private TmfTimeRange trange = null;
+
+	// ========================================================================
+	// Methods
+	// ========================================================================
+
+	/**
+	 * @param event
+	 * @return
+	 */
+	public synchronized boolean processTimeScaleEvent(
+			TmfTimeScaleSelectionEvent event) {
+
+		boolean updated = false;
+		if (event != null) {
+			long time0 = event.getTime0();
+			long time1 = event.getTime1();
+			int dwidth = event.getWidth();
+
+			updated = update(time0, time1, dwidth);
+			setSelectedTime(event.getSelectedTime());
+		}
+
+		return updated;
+
+	}
+
+	/**
+	 * Save the selected time
+	 * @param selTime
+	 */
+	public void setSelectedTime(long selTime) {
+		if (selTime > startTime && selTime < endTime) {
+			selectedTime = selTime;
+		} else {
+			selectedTime = null;
+		}
+	}
+
+	/**
+	 * May return null, if the selected time is invalid
+	 * 
+	 * @return
+	 */
+	public Long getSelectedTime() {
+		return selectedTime;
+	}
+
+	/**
+	 * Update time range but keep width as is
+	 * 
+	 * @param time0
+	 * @param time1
+	 * @return
+	 */
+	public boolean update(long time0, long time1) {
+		return update(time0, time1, width);
+	}
+
+	/**
+	 * Only positive attributes are expected
+	 * 
+	 * @param time0
+	 * @param time1
+	 * @param dwidth
+	 * @return
+	 */
+	public boolean update(long time0, long time1, int dwidth) {
+		boolean updated = false;
+
+		if (time0 == startTime && time1 == endTime && dwidth == width) {
+			// No updated needed
+			return updated;
+		}
+
+		// Negatives are invalid
+		time0 = time0 > 0 ? time0 : 0;
+		time1 = time1 > 0 ? time1 : 0;
+		dwidth = dwidth > 0 ? dwidth : 0;
+
+		if (time1 > time0) {
+			// Store the new values as long as they are within range
+			startTime = time0;
+			endTime = time1;
+			width = dwidth;
+
+			pixelsPerNs = (double) width / (double) (endTime - startTime);
+
+			TmfTimestamp fTimeStart = new LttngTimestamp(startTime);
+			TmfTimestamp fTimeEnd = new LttngTimestamp(endTime);
+			trange = new TmfTimeRange(fTimeStart, fTimeEnd);
+
+			// make sure the selected time is within the new range or else set
+			// mark it as invalid
+			if (selectedTime != null) {
+				setSelectedTime(selectedTime);
+			}
+
+			// update succeeded
+			updated = true;
+
+			TraceDebug.debug("Configuration updated to: StartTime: " /* */
+					+ fTimeStart /* */
+					+ "-" /* */
+					+ fTimeEnd /* */
+					+ " width: " /* */
+					+ width + " k: " + pixelsPerNs); /* */
+		} else {
+			TraceDebug
+					.debug("End time is not greater than start time, start time: "
+							+ time0 + " end time: " + time1);
+		}
+
+		return updated;
+	}
+
+	/**
+	 * @return
+	 */
+	public long getStartTime() {
+		return startTime;
+	}
+
+	/**
+	 * @return
+	 */
+	public long getEndTime() {
+		return endTime;
+	}
+
+	/**
+	 * @return
+	 */
+	public int getWidth() {
+		if (width == 0) {
+			return defaultWidth;
+		} else {
+			TraceDebug.debug("Unexpected width value of 0 pixels");
+		}
+
+		return width;
+	}
+
+	/**
+	 * Return the current constant "K" of pixels per nano second used for the
+	 * widest time space widget registered in this instance.
+	 * 
+	 * @return
+	 */
+	public double getPixelsPerNs() {
+		return pixelsPerNs;
+	}
+
+	/**
+	 * Set the value of pixels per nano second as long as the value is grater
+	 * positive
+	 * 
+	 * @return
+	 */
+	public void setPixelsPerNs(double pixperNsec) {
+		if (pixperNsec > 0) {
+			pixelsPerNs = pixperNsec;
+		}
+	}
+
+	/**
+	 * @param value
+	 */
+	public void setEventsDiscarded(int value) {
+		eventsDiscarded = value;
+		if (value == 0) {
+			eventsDiscardedWrongOrder = 0;
+		}
+	}
+
+	/**
+	 * 
+	 */
+	public void incrementEventsDiscarded() {
+		this.eventsDiscarded++;
+	}
+
+	/**
+	 * @return
+	 */
+	public int getEventsDiscarded() {
+		return eventsDiscarded;
+	}
+
+	/**
+	 * increase the number of events discarder since they were not received in a
+	 * later time than previous events
+	 */
+	public void incrementEventsDiscardedWrongOrder() {
+		this.eventsDiscarded++;
+		this.eventsDiscardedWrongOrder++;
+	}
+
+	/**
+	 * @return
+	 */
+	public int getEventsDiscardedWrongOrder() {
+		return eventsDiscardedWrongOrder;
+
+	}
+
+	/**
+	 * @return
+	 */
+	public TmfTimeRange getTrange() {
+		return trange;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/ControlView.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/ControlView.java
new file mode 100644
index 0000000..5571fac
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/ControlView.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.control;
+
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.part.ViewPart;
+
+/**
+ * <b><u>ControlView</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class ControlView extends ViewPart {
+
+    public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.control";
+
+	/**
+	 * 
+	 */
+	public ControlView() {
+		// TODO Auto-generated constructor stub
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
+	 */
+	@Override
+	public void createPartControl(Composite parent) {
+		// TODO Auto-generated method stub
+
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
+	 */
+	@Override
+	public void setFocus() {
+		// TODO Auto-generated method stub
+
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java
new file mode 100644
index 0000000..fe6adac
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java
@@ -0,0 +1,1238 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors: Alvaro Sanchez-Leon - Initial implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.controlflow;
+
+import java.util.Arrays;
+import java.util.Vector;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerFilter;
+import org.eclipse.linuxtools.lttng.event.LttngTimestamp;
+import org.eclipse.linuxtools.lttng.state.StateDataRequest;
+import org.eclipse.linuxtools.lttng.state.StateManager;
+import org.eclipse.linuxtools.lttng.state.evProcessor.EventProcessorProxy;
+import org.eclipse.linuxtools.lttng.state.experiment.StateExperimentManager;
+import org.eclipse.linuxtools.lttng.state.experiment.StateManagerFactory;
+import org.eclipse.linuxtools.lttng.ui.TraceDebug;
+import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventProcess;
+import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeViewerProvider;
+import org.eclipse.linuxtools.lttng.ui.views.common.AbsTimeUpdateView;
+import org.eclipse.linuxtools.lttng.ui.views.common.ParamsUpdater;
+import org.eclipse.linuxtools.lttng.ui.views.controlflow.evProcessor.FlowTRangeUpdateFactory;
+import org.eclipse.linuxtools.lttng.ui.views.controlflow.model.FlowModelFactory;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler;
+import org.eclipse.linuxtools.tmf.signal.TmfSignalManager;
+import org.eclipse.linuxtools.tmf.signal.TmfTimeSynchSignal;
+import org.eclipse.linuxtools.tmf.ui.viewers.TmfViewerFactory;
+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.ITimeAnalysisViewer;
+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.ITmfTimeFilterSelectionListener;
+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.ITmfTimeScaleSelectionListener;
+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.ITmfTimeSelectionListener;
+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.TmfTimeFilterSelectionEvent;
+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.TmfTimeScaleSelectionEvent;
+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.TmfTimeSelectionEvent;
+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITmfTimeAnalysisEntry;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.custom.ScrolledComposite;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.events.ControlListener;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.KeyListener;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.ScrollBar;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IWorkbenchActionConstants;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+
+/**
+ * <b><u>ControlFlowView</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+/**
+ * @author alvaro
+ * 
+ */
+public class ControlFlowView extends AbsTimeUpdateView implements
+		ITmfTimeSelectionListener, ITmfTimeScaleSelectionListener,
+		ITmfTimeFilterSelectionListener {
+
+    public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.controlflow";
+    
+	// ========================================================================
+	// Table data
+	// ========================================================================
+	private final String PROCESS_COLUMN = "Process";
+	private final String BRAND_COLUMN = "Brand";
+	private final String PID_COLUMN = "PID";
+	private final String TGID_COLUMN = "TGID";
+	private final String PPID_COLUMN = "PPID";
+	private final String CPU_COLUMN = "CPU";
+	private final String BIRTH_SEC_COLUMN = "Birth sec";
+	private final String BIRTH_NSEC_COLUMN = "Birth nsec";
+	private final String TRACE = "TRACE";
+
+	private final String[] columnNames = new String[] { PROCESS_COLUMN, /* */
+	BRAND_COLUMN,/* */
+	PID_COLUMN,/* */
+	TGID_COLUMN,/* */
+	PPID_COLUMN,/* */
+	CPU_COLUMN, /* */
+	BIRTH_SEC_COLUMN,/* */
+	BIRTH_NSEC_COLUMN,/* */
+	TRACE /* */
+	};
+
+	// ========================================================================
+	// Data
+	// ========================================================================
+	private TableViewer tableViewer;
+	// private int totalNumItems = 0;
+	// Actions
+	private Action doubleClickAction;
+	private Action resetScale;
+	private Action nextEvent;
+	private Action prevEvent;
+	private Action nextTrace;
+	private Action prevTrace;
+	private Action showLegend;
+	private Action filterTraces;
+	private Action zoomIn;
+	private Action zoomOut;
+	private Action synch;
+
+	private ITimeAnalysisViewer tsfviewer;
+	private ViewProcessFilter tableFilter = null;
+	private ScrolledComposite scrollFrame = null;
+	private Composite wrapper = null;
+	private Composite top;
+
+	// private static SimpleDateFormat stimeformat = new SimpleDateFormat(
+	// "yy/MM/dd HH:mm:ss");
+
+	// private TraceModelImplFactory fact;
+
+	// ========================================================================
+	// Methods
+	// ========================================================================
+	/*
+	 * The content provider class is responsible for providing objects to the
+	 * view. It can wrap existing objects in adapters or simply return objects
+	 * as-is. These objects may be sensitive to the current input of the view,
+	 * or ignore it and always show the same content (like Task List, for
+	 * example).
+	 */
+
+	class ViewContentProvider implements
+	/* ILazyContentProvider, */IStructuredContentProvider {
+		private TableViewer cviewer = null;
+		private ITmfTimeAnalysisEntry[] elements = null;
+
+		public ViewContentProvider(TableViewer v) {
+			cviewer = v;
+		}
+
+		public void inputChanged(Viewer v, Object oldInput, Object newInput) {
+			this.elements = (ITmfTimeAnalysisEntry[]) newInput;
+			if (elements != null) {
+				TraceDebug
+						.debug("Total number of processes provided to Control Flow view: "
+								+ elements.length);
+			} else {
+				TraceDebug.debug("New input = null");
+			}
+		}
+
+		public void dispose() {
+
+		}
+
+		// Needed with the use of virtual tables in order to initialize items
+		// which were not initially visible.
+		public void updateElement(int index) {
+			cviewer.replace(elements[index], index);
+		}
+
+		// @Override
+		public Object[] getElements(Object inputElement) {
+			// TODO Auto-generated method stub
+			return elements;
+		}
+	}
+
+	class ViewLabelProvider extends LabelProvider implements
+			ITableLabelProvider {
+		public String getColumnText(Object obj, int index) {
+			String strRes = ""; //$NON-NLS-1$
+			LttngTimestamp time;
+			if (obj instanceof TimeRangeEventProcess) {
+				TimeRangeEventProcess process = (TimeRangeEventProcess) obj;
+				switch (index) {
+				case 0:
+					strRes = process.getName();
+					break;
+				case 1:
+					strRes = process.getBrand();
+					break;
+				case 2:
+					strRes = process.getPid().toString();
+					break;
+				case 3:
+					strRes = process.getTgid().toString();
+					break;
+				case 4:
+					strRes = process.getPpid().toString();
+					break;
+				case 5:
+					strRes = process.getCpu().toString();
+					break;
+				case 6:
+					time = new LttngTimestamp(process.getCreationTime()
+							.longValue());
+					strRes = time.getSeconds();
+					break;
+				case 7:
+					time = new LttngTimestamp(process.getCreationTime()
+							.longValue());
+					strRes = time.getNanoSeconds();
+					break;
+				case 8:
+					strRes = process.getTraceID();
+					break;
+				default:
+					break;
+				}
+			} else {
+				return getText(obj);
+			}
+
+			return strRes;
+		}
+
+		public Image getColumnImage(Object obj, int index) {
+			return getImage(obj);
+		}
+
+		@Override
+		public Image getImage(Object obj) {
+			// No image needed for the time being
+			// return PlatformUI.getWorkbench().getSharedImages().getImage(
+			// ISharedImages.IMG_OBJ_ELEMENT);
+			return null;
+		}
+	}
+
+	class ViewProcessFilter extends ViewerFilter {
+
+		private Vector<ITmfTimeAnalysisEntry> filteredSet = new Vector<ITmfTimeAnalysisEntry>();
+		StructuredViewer viewer;
+
+		public ViewProcessFilter(StructuredViewer rviewer) {
+			this.viewer = rviewer;
+		}
+
+		public void setFilter(Vector<ITmfTimeAnalysisEntry> filtered) {
+			if (filtered != null) {
+				this.filteredSet = filtered;
+				viewer.refresh();
+			}
+		}
+
+		@Override
+		public boolean select(Viewer viewer, Object parentElement,
+				Object element) {
+			boolean filteredIn = true;
+			if (element instanceof ITmfTimeAnalysisEntry) {
+				ITmfTimeAnalysisEntry process = (ITmfTimeAnalysisEntry) element;
+				if (filteredSet.contains(process)) {
+					// The element is marked to be filtered out
+					return false;
+				}
+			} else {
+				TraceDebug.debug("Unexpected type of filter element received: "
+						+ element.toString());
+			}
+			// Compare element versus a list of filtered out
+			return filteredIn;
+		}
+	}
+
+	/**
+	 * The constructor.
+	 */
+	public ControlFlowView() {
+		super(ID);
+	}
+
+	/**
+	 * This is a callback that will allow us to create the viewer and initialize
+	 * it.
+	 */
+	@Override
+	public void createPartControl(Composite parent) {
+		top = new Composite(parent, SWT.BORDER);
+
+		top.setLayout(new FillLayout());
+
+		scrollFrame = new ScrolledComposite(top, SWT.V_SCROLL | SWT.H_SCROLL);
+		scrollFrame.setBounds(top.getClientArea());
+
+		wrapper = new Composite(scrollFrame, SWT.NONE);
+		scrollFrame.setEnabled(true);
+		scrollFrame.setRedraw(true);
+		scrollFrame.setExpandVertical(true);
+		scrollFrame.setExpandHorizontal(true);
+		scrollFrame.setContent(wrapper);
+		scrollFrame.setAlwaysShowScrollBars(true);
+		wrapper.setLayout(new FillLayout());
+
+		SashForm sash = new SashForm(wrapper, SWT.NONE);
+		final Composite tableComposite = new Composite(sash, SWT.NO_SCROLL);
+		FillLayout layout = new FillLayout();
+		tableComposite.setLayout(layout);
+		tableViewer = new TableViewer(tableComposite, SWT.FULL_SELECTION
+				| SWT.H_SCROLL);
+		tableViewer.setContentProvider(new ViewContentProvider(tableViewer));
+		tableViewer.setLabelProvider(new ViewLabelProvider());
+		Table table = tableViewer.getTable();
+		tableViewer
+				.addSelectionChangedListener(new ISelectionChangedListener() {
+					public void selectionChanged(SelectionChangedEvent event) {
+						ISelection sel = event.getSelection();
+						if (!sel.isEmpty()) {
+							Object firstSel = null;
+							if (sel instanceof IStructuredSelection) {
+								firstSel = ((IStructuredSelection) sel)
+										.getFirstElement();
+
+								// Make sure the selection is visible
+								updateScrollOrigin();
+
+								if (firstSel instanceof ITmfTimeAnalysisEntry) {
+									ITmfTimeAnalysisEntry trace = (ITmfTimeAnalysisEntry) firstSel;
+									tsfviewer.setSelectedTrace(trace);
+								}
+							}
+						}
+					}
+
+					/**
+					 * Make sure the selected item is visible
+					 */
+					private void updateScrollOrigin() {
+						Table table = tableViewer.getTable();
+						if (table != null && table.getItemCount() > 0) {
+							TableItem item = table.getSelection()[0];
+							if (item == null) {
+								// no selected reference to go up or down
+								return;
+							}
+
+							Rectangle itemRect = item.getBounds();
+							int step = itemRect.height;
+
+							// calculate height of horizontal bar
+							int hscrolly = 0;
+							ScrollBar hbar = scrollFrame.getHorizontalBar();
+							if (hbar != null) {
+								hscrolly = hbar.getSize().y;
+							}
+
+							int visibleHeight = scrollFrame.getSize().y
+									- hscrolly;
+
+							// the current scrollbar offset to adjust i.e. start
+							// of
+							// the visible window
+							Point origin = scrollFrame.getOrigin();
+							// end of visible window
+							int endy = origin.y + visibleHeight;
+
+							int itemStartPos = itemRect.y
+									+ table.getHeaderHeight()
+									+ table.getBorderWidth()
+									+ table.getParent().getBorderWidth();
+
+							// Item End Position
+							int itemEndPos = itemStartPos + step;
+
+							// check if need to go up
+							if (origin.y >= step && itemStartPos < origin.y) {
+								// one step up
+								scrollFrame
+										.setOrigin(origin.x, origin.y - step);
+
+							}
+
+							// check if it needs to go down
+							if (itemEndPos > endy) {
+								// one step down
+								scrollFrame
+										.setOrigin(origin.x, origin.y + step);
+
+							}
+						}
+					}
+				});
+
+		// Listen to page up /down and Home / Enc keys
+		tableViewer.getTable().addKeyListener(new KeyListener() {
+			public void keyPressed(KeyEvent e) {
+				Table table = tableViewer.getTable();
+				Point origin = scrollFrame.getOrigin();
+				if (table == null || table.getItemCount() < 1) {
+					// nothing to page
+					return;
+				}
+
+				TableItem item;
+				int count;
+
+				switch (e.keyCode) {
+				case SWT.PAGE_DOWN:
+					updateScrollPageDown();
+					break;
+				case SWT.PAGE_UP:
+					updateScrollUp();
+					break;
+				case SWT.HOME:
+					// Home
+					count = table.getItemCount();
+					item = table.getItem(0);
+					// Go to the top
+					scrollFrame.setOrigin(origin.x, 0);
+					break;
+				case SWT.END:
+					// End Selected
+					count = table.getItemCount();
+					item = table.getItem(count - 1);
+					int itemStartPos = item.getBounds().y;
+					// Get to the bottom
+					scrollFrame.setOrigin(origin.x, itemStartPos);
+					break;
+				default:
+					break;
+				}
+			}
+
+			public void keyReleased(KeyEvent e) {
+				// Nothing to do
+
+			}
+
+			/**
+			 * Scroll one page down
+			 */
+			private void updateScrollPageDown() {
+				// null protection before calling private method
+				Table table = tableViewer.getTable();
+				int step = table.getItemHeight();
+
+				int hscrolly = 0;
+				ScrollBar hbar = scrollFrame.getHorizontalBar();
+				if (hbar != null) {
+					hscrolly = hbar.getSize().y;
+				}
+
+				Point origin = scrollFrame.getOrigin();
+				int visibleHeight = scrollFrame.getSize().y - hscrolly;
+				int endy = origin.y + visibleHeight;
+
+				scrollFrame.setOrigin(origin.x, endy - step);
+			}
+
+			/**
+			 * Scroll one page up
+			 */
+			private void updateScrollUp() {
+				// null protection before calling private method
+				Table table = tableViewer.getTable();
+				int step = table.getItemHeight();
+
+				int hscrolly = 0;
+				ScrollBar hbar = scrollFrame.getHorizontalBar();
+				if (hbar != null) {
+					hscrolly = hbar.getSize().y;
+				}
+
+				Point origin = scrollFrame.getOrigin();
+				int visibleHeight = scrollFrame.getSize().y - hscrolly;
+				int pageUpPos = origin.y - visibleHeight + step;
+				pageUpPos = pageUpPos > 0 ? pageUpPos : 0;
+				scrollFrame.setOrigin(origin.x, pageUpPos);
+			}
+
+		});
+		// Describe table
+		applyTableLayout(table);
+
+		int borderWidth = table.getBorderWidth();
+
+		int itemHeight = table.getItemHeight();
+		int headerHeight = table.getHeaderHeight();
+		table.getVerticalBar().setVisible(false);
+
+		tsfviewer = TmfViewerFactory.createViewer(sash,
+				new TimeRangeViewerProvider());
+
+		tsfviewer.addWidgetSelectionListner(this);
+		tsfviewer.addWidgetTimeScaleSelectionListner(this);
+
+		// Traces shall not be grouped to allow synchronisation
+		tsfviewer.groupTraces(false);
+		tsfviewer.setItemHeight(itemHeight);
+		tsfviewer.setBorderWidth(borderWidth);
+		tsfviewer.setHeaderHeight(headerHeight);
+		tsfviewer.setVisibleVerticalScroll(false);
+		// Names provided by the table
+		tsfviewer.setNameWidthPref(0);
+		tsfviewer.setAcceptSelectionAPIcalls(true);
+
+		// Viewer to notify selection to this class
+		// This class will synchronise selections with table.
+		tsfviewer.addWidgetSelectionListner(this);
+		tsfviewer.addFilterSelectionListner(this);
+		tsfviewer.addWidgetTimeScaleSelectionListner(this);
+
+		sash.setWeights(new int[] { 1, 1 });
+		// Create the help context id for the viewer's control
+		// TODO: Associate with help system
+		PlatformUI.getWorkbench().getHelpSystem().setHelp(
+				tableViewer.getControl(),
+				"org.eclipse.linuxtools.lttnng.ui.views.flow.viewer"); //$NON-NLS-1$
+
+		makeActions();
+		hookContextMenu();
+		hookDoubleClickAction();
+		contributeToActionBars();
+
+		scrollFrame.addControlListener(new ControlAdapter() {
+			@Override
+			public void controlResized(ControlEvent e) {
+				tsfviewer.resizeControls();
+				updateScrolls(scrollFrame, wrapper);
+			}
+		});
+
+		tableComposite.addControlListener(new ControlListener() {
+			public void controlResized(ControlEvent e) {
+				scrollFrame.getParent().update();
+			}
+
+			public void controlMoved(ControlEvent e) {
+
+			}
+		});
+
+		// Register the updater in charge to refresh elements as we update the
+		// time ranges
+		// FlowParamsUpdater listener = FlowModelFactory.getParamsUpdater();
+		// tsfviewer.addWidgetTimeScaleSelectionListner(listener);
+
+		// Register this view to receive updates when the model is updated with
+		// fresh info
+		// ModelListenFactory.getRegister().addFlowModelUpdatesListener(this);
+
+		// Register the event processor factory in charge of event handling
+		EventProcessorProxy.getInstance().addEventProcessorFactory(
+				FlowTRangeUpdateFactory.getInstance());
+
+		// set the initial view parameter values
+		// Experiment start and end time
+		// as well as time space width in pixels, used by the time analysis
+		// widget
+		ParamsUpdater paramUpdater = FlowModelFactory.getParamsUpdater();
+		StateExperimentManager experimentManger = StateManagerFactory
+				.getExperimentManager();
+		// Read relevant values
+		int timeSpaceWidth = tsfviewer.getTimeSpace();
+		TmfTimeRange timeRange = experimentManger.getExperimentTimeRange();
+		if (timeRange != null) {
+			long time0 = timeRange.getStartTime().getValue();
+			long time1 = timeRange.getEndTime().getValue();
+			paramUpdater.update(time0, time1, timeSpaceWidth);
+		}
+
+		experimentManger.readExperiment("flowView", this);
+	}
+
+	private void hookContextMenu() {
+		MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
+		menuMgr.setRemoveAllWhenShown(true);
+		menuMgr.addMenuListener(new IMenuListener() {
+			public void menuAboutToShow(IMenuManager manager) {
+				ControlFlowView.this.fillContextMenu(manager);
+			}
+		});
+		Menu menu = menuMgr.createContextMenu(tableViewer.getControl());
+		tableViewer.getControl().setMenu(menu);
+		getSite().registerContextMenu(menuMgr, tableViewer);
+	}
+
+	private void contributeToActionBars() {
+		IActionBars bars = getViewSite().getActionBars();
+		fillLocalPullDown(bars.getMenuManager());
+		fillLocalToolBar(bars.getToolBarManager());
+	}
+
+	private void fillLocalPullDown(IMenuManager manager) {
+		manager.add(new Separator());
+		// manager.add(showLegend);
+		manager.add(new Separator());
+		manager.add(resetScale);
+		manager.add(nextEvent);
+		manager.add(prevEvent);
+		manager.add(nextTrace);
+		manager.add(prevTrace);
+		// manager.add(filterTraces);
+		manager.add(zoomIn);
+		manager.add(zoomOut);
+		manager.add(synch);
+		manager.add(new Separator());
+	}
+
+	private void fillContextMenu(IMenuManager manager) {
+		// manager.add(showLegend);
+		manager.add(new Separator());
+		manager.add(resetScale);
+		manager.add(nextEvent);
+		manager.add(prevEvent);
+		manager.add(nextTrace);
+		manager.add(prevTrace);
+		// manager.add(showLegend);
+		// manager.add(filterTraces);
+		manager.add(zoomIn);
+		manager.add(zoomOut);
+		manager.add(synch);
+		manager.add(new Separator());
+		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
+	}
+
+	private void fillLocalToolBar(IToolBarManager manager) {
+		// manager.add(showLegend);
+		manager.add(new Separator());
+		manager.add(resetScale);
+		manager.add(nextEvent);
+		manager.add(prevEvent);
+		manager.add(nextTrace);
+		manager.add(prevTrace);
+		// manager.add(filterTraces);
+		manager.add(zoomIn);
+		manager.add(zoomOut);
+		manager.add(synch);
+		manager.add(new Separator());
+	}
+
+	private void makeActions() {
+		// resetScale
+		resetScale = new Action() {
+			@Override
+			public void run() {
+				if (tsfviewer != null) {
+					tsfviewer.resetStartFinishTime();
+				}
+
+			}
+		};
+		resetScale.setText(Messages.getString("ControlFlowView.Action.Reset")); //$NON-NLS-1$
+		resetScale.setToolTipText(Messages
+				.getString("ControlFlowView.Action.Reset.ToolTip")); //$NON-NLS-1$
+		resetScale.setImageDescriptor(AbstractUIPlugin
+				.imageDescriptorFromPlugin(Messages
+						.getString("ControlFlowView.tmf.UI"),
+						"icons/home_nav.gif"));
+
+		// nextEvent
+		nextEvent = new Action() {
+			@Override
+			public void run() {
+				if (tsfviewer != null) {
+					tsfviewer.selectNextEvent();
+				}
+			}
+		};
+		nextEvent.setText(Messages
+				.getString("ControlFlowView.Action.NextEvent")); //$NON-NLS-1$
+		nextEvent.setToolTipText(Messages
+				.getString("ControlFlowView.Action.NextEvent.Tooltip")); //$NON-NLS-1$
+		nextEvent.setImageDescriptor(AbstractUIPlugin
+				.imageDescriptorFromPlugin(Messages
+						.getString("ControlFlowView.tmf.UI"),
+						"icons/next_event.gif"));
+
+		// prevEvent
+		prevEvent = new Action() {
+		@Override
+		public void run() {
+				if (tsfviewer != null) {
+					tsfviewer.selectPrevEvent();
+				}
+			}
+		};
+		prevEvent.setText(Messages
+				.getString("ControlFlowView.Action.PrevEvent")); //$NON-NLS-1$
+		prevEvent.setToolTipText(Messages
+				.getString("ControlFlowView.Action.PrevEvent.Tooltip")); //$NON-NLS-1$
+		prevEvent.setImageDescriptor(AbstractUIPlugin
+				.imageDescriptorFromPlugin(Messages
+						.getString("ControlFlowView.tmf.UI"),
+						"icons/prev_event.gif"));
+
+		// nextTrace
+		nextTrace = new Action() {
+			@Override
+			public void run() {
+				if (tsfviewer != null) {
+					tsfviewer.selectNextTrace();
+				}
+			}
+		};
+		nextTrace.setText(Messages
+				.getString("ControlFlowView.Action.NextProcess")); //$NON-NLS-1$
+		nextTrace.setToolTipText(Messages
+				.getString("ControlFlowView.Action.NextProcess.ToolTip")); //$NON-NLS-1$
+		nextTrace.setImageDescriptor(AbstractUIPlugin
+				.imageDescriptorFromPlugin(Messages
+						.getString("ControlFlowView.tmf.UI"),
+						"icons/next_item.gif"));
+
+		// prevTrace
+		prevTrace = new Action() {
+			@Override
+			public void run() {
+				if (tsfviewer != null) {
+					tsfviewer.selectPrevTrace();
+				}
+			}
+		};
+		prevTrace.setText(Messages
+				.getString("ControlFlowView.Action.PreviousProcess")); //$NON-NLS-1$
+		prevTrace.setToolTipText(Messages
+				.getString("ControlFlowView.Action.PreviousProcess.Tooltip")); //$NON-NLS-1$
+		prevTrace.setImageDescriptor(AbstractUIPlugin
+				.imageDescriptorFromPlugin(Messages
+						.getString("ControlFlowView.tmf.UI"),
+						"icons/prev_item.gif"));
+
+		// showLegend
+		showLegend = new Action() {
+			@Override
+			public void run() {
+				if (tsfviewer != null) {
+					tsfviewer.showLegend();
+				}
+			}
+		};
+		showLegend.setText(Messages.getString("ControlFlowView.Action.Legend")); //$NON-NLS-1$
+		showLegend.setToolTipText(Messages
+				.getString("ControlFlowView.Action.Legend.ToolTip")); //$NON-NLS-1$
+
+		// filterTraces
+		filterTraces = new Action() {
+			@Override
+			public void run() {
+				if (tsfviewer != null) {
+					tsfviewer.filterTraces();
+				}
+			}
+		};
+		filterTraces.setText(Messages
+				.getString("ControlFlowView.Action.Filter")); //$NON-NLS-1$
+		filterTraces.setToolTipText(Messages
+				.getString("ControlFlowView.Action.Filter.ToolTip")); //$NON-NLS-1$
+		filterTraces.setImageDescriptor(AbstractUIPlugin
+				.imageDescriptorFromPlugin(Messages
+						.getString("ControlFlowView.tmf.UI"),
+						"icons/filter_items.gif"));
+
+		// zoomIn
+		zoomIn = new Action() {
+			@Override
+			public void run() {
+				if (tsfviewer != null) {
+					tsfviewer.zoomIn();
+				}
+			}
+		};
+		zoomIn.setText(Messages.getString("ControlFlowView.Action.ZoomIn")); //$NON-NLS-1$
+		zoomIn.setToolTipText(Messages
+				.getString("ControlFlowView.Action.ZoomIn.Tooltip")); //$NON-NLS-1$
+		zoomIn.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(
+				Messages.getString("ControlFlowView.tmf.UI"),
+				"icons/zoomin_nav.gif"));
+
+		// zoomOut
+		zoomOut = new Action() {
+			@Override
+			public void run() {
+				if (tsfviewer != null) {
+					tsfviewer.zoomOut();
+				}
+			}
+		};
+		zoomOut.setText(Messages.getString("ControlFlowView.Action.ZoomOut")); //$NON-NLS-1$
+		zoomOut.setToolTipText(Messages
+				.getString("ControlFlowView.Action.ZoomOut.tooltip")); //$NON-NLS-1$
+		zoomOut.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(
+				Messages.getString("ControlFlowView.tmf.UI"),
+				"icons/zoomout_nav.gif"));
+		
+		// synch
+		synch = new Action() {
+			@Override
+			public void run() {
+				// Note: No action since the synch flag is used by Control flow
+				// view
+				// the actual viewer is set to accept api selections in
+				// createpartcontrol.
+
+				// if (synch.isChecked()) {
+				// tsfviewer.setAcceptSelectionAPIcalls(true);
+				// } else {
+				// tsfviewer.setAcceptSelectionAPIcalls(false);
+				// }
+			}
+		};
+		synch.setText(Messages.getString("ControlFlowView.Action.Synchronize")); //$NON-NLS-1$
+		synch.setToolTipText(Messages
+				.getString("ControlFlowView.Action.Synchronize.ToolTip")); //$NON-NLS-1$
+		synch.setChecked(false);
+		synch.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(
+				Messages.getString("ControlFlowView.tmf.UI"),
+				"icons/synced.gif"));
+		// PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_ELCL_SYNCED);
+
+		doubleClickAction = new Action() {
+			@Override
+			public void run() {
+				ISelection selection = tableViewer.getSelection();
+				Object obj = ((IStructuredSelection) selection)
+						.getFirstElement();
+				showMessage("Double-click detected on " + obj.toString()); //$NON-NLS-1$
+			}
+		};
+	}
+
+	private void hookDoubleClickAction() {
+		tableViewer.addDoubleClickListener(new IDoubleClickListener() {
+			public void doubleClick(DoubleClickEvent event) {
+				doubleClickAction.run();
+			}
+		});
+	}
+
+	private void showMessage(String message) {
+		MessageDialog.openInformation(tableViewer.getControl().getShell(),
+				Messages.getString("ControlFlowView.msgSlogan"), message); //$NON-NLS-1$
+	}
+
+	/**
+	 * Passing the focus request to the viewer's control.
+	 */
+	@Override
+	public void setFocus() {
+		tableViewer.getControl().setFocus();
+	}
+
+	public void tsfTmProcessSelEvent(TmfTimeSelectionEvent event) {
+		Object source = event.getSource();
+		if (source == null) {
+			return;
+		}
+
+		// Reselect the table viewer to widget selection
+		ISelection sel = tsfviewer.getSelectionTrace();
+		if (sel != null && !sel.isEmpty()) {
+			tableViewer.setSelection(sel);
+		}
+
+		ParamsUpdater paramUpdater = FlowModelFactory.getParamsUpdater();
+		Long savedSelTime = paramUpdater.getSelectedTime();
+
+		long selTimens = event.getSelectedTime();
+
+		// make sure the new selected time is different than saved before
+		// executing update
+		if (savedSelTime == null || savedSelTime != selTimens) {
+			// Notify listener views.
+			synchTimeNotification(selTimens);
+
+			// Update the parameter updater to save the selected time
+			paramUpdater.setSelectedTime(selTimens);
+
+			if (TraceDebug.isDEBUG()) {
+				// Object selection = event.getSelection();
+				TraceDebug.debug("Selected Time in control Flow View: "
+						+ new LttngTimestamp(selTimens));
+			}
+		}
+	}
+
+	public synchronized void tsfTmProcessTimeScaleEvent(
+			TmfTimeScaleSelectionEvent event) {
+		// source needed to keep track of source values
+		Object source = event.getSource();
+
+		if (source != null) {
+			// Update the parameter updater before carrying out a read request
+			ParamsUpdater paramUpdater = FlowModelFactory.getParamsUpdater();
+			boolean newParams = paramUpdater.processTimeScaleEvent(event);
+
+			if (newParams) {
+				// Read the updated time window
+				TmfTimeRange trange = paramUpdater.getTrange();
+				if (trange != null) {
+					// Request new data for specified time range
+					dataRequest(trange);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Obtains the remainder fraction on unit Seconds of the entered value in
+	 * nanoseconds. e.g. input: 1241207054171080214 ns The number of seconds can
+	 * be obtain by removing the last 9 digits: 1241207054 the fractional
+	 * portion of seconds, expressed in ns is: 171080214
+	 * 
+	 * @param v
+	 * @return
+	 */
+	public String formatNs(long v) {
+		StringBuffer str = new StringBuffer();
+		boolean neg = v < 0;
+		if (neg) {
+			v = -v;
+			str.append('-');
+		}
+
+		String strVal = String.valueOf(v);
+		if (v < 1000000000) {
+			return strVal;
+		}
+
+		// Extract the last nine digits (e.g. fraction of a S expressed in ns
+		return strVal.substring(strVal.length() - 9);
+	}
+
+	private void applyTableLayout(Table table) {
+		for (int i = 0; i < columnNames.length; i++) {
+			TableColumn tableColumn = new TableColumn(table, SWT.LEFT);
+			tableColumn.setText(columnNames[i]);
+			tableColumn.pack();
+		}
+		table.setHeaderVisible(true);
+		table.setLinesVisible(true);
+	}
+
+	/**
+	 * @param items
+	 * @param startTime
+	 * @param endTime
+	 * @param updateTimeBounds - Update needed e.g. a new Experiment or trace selected
+	 */
+	public void flowModelUpdates(final ITmfTimeAnalysisEntry[] items,
+			final long startTime, final long endTime,
+			final boolean updateTimeBounds) {
+		final Table table = tableViewer.getTable();
+		Display display = table.getDisplay();
+
+		// Perform the updates on the UI thread)
+		display.asyncExec(new Runnable() {
+			public void run() {
+
+				tableViewer.setInput(items); // This shall be the minimal
+				// initial
+				tableFilter = new ViewProcessFilter(tableViewer);
+				tableViewer.setFilters(new ViewerFilter[] { tableFilter });
+
+				resizeTableColumns(table);
+				table.update();
+				tableViewer.refresh();
+
+				tsfviewer.display(items, startTime, endTime, updateTimeBounds);
+				tsfviewer.resizeControls();
+
+				// Adjust the size of the vertical scroll bar to fit the
+				// contents
+				if (scrollFrame != null && wrapper != null) {
+					updateScrolls(scrollFrame, wrapper);
+					// scrollFrame.update();
+				}
+			}
+		});
+	}
+
+	@Override
+	public void dispose() {
+		// dispose parent resources
+		super.dispose();
+		// Remove the event processor factory
+		EventProcessorProxy.getInstance().removeEventProcessorFactory(
+				FlowTRangeUpdateFactory.getInstance());
+
+		// Remove listener to model updates
+		// ModelListenFactory.getRegister().removeFlowModelUpdatesListener(this);
+		tsfviewer.removeFilterSelectionListner(this);
+		tsfviewer.removeWidgetSelectionListner(this);
+		tsfviewer.removeWidgetTimeScaleSelectionListner(this);
+		tableViewer = null;
+		tsfviewer = null;
+	}
+
+	/**
+	 * @param tableComposite
+	 * @param table
+	 */
+	private synchronized void resizeTableColumns(Table table) {
+		if (table != null) {
+			Composite parent = table.getParent();
+			int tableWidthSum = parent.getBorderWidth();
+
+			TableColumn[] columns = table.getColumns();
+			for (TableColumn column : columns) {
+				column.pack();
+				tableWidthSum += column.getWidth();
+			}
+		}
+	}
+
+	// @Override
+	public void tmfTaProcessFilterSelection(TmfTimeFilterSelectionEvent event) {
+		if (tableFilter != null) {
+			Vector<ITmfTimeAnalysisEntry> filteredout = event.getFilteredOut();
+			if (filteredout != null) {
+				tableFilter.setFilter(filteredout);
+			} else {
+				tableFilter.setFilter(new Vector<ITmfTimeAnalysisEntry>());
+			}
+			tableViewer.refresh();
+		}
+	}
+
+	/**
+	 * @param scrollFrame
+	 * @param wrapper
+	 */
+	private void updateScrolls(final ScrolledComposite scrollFrame,
+			final Composite wrapper) {
+
+		Point ptSize = wrapper.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+		wrapper.setSize(ptSize);
+		scrollFrame.setMinSize(ptSize);
+
+		// calculate the increment area considering the table header height and
+		// borders
+		Rectangle area = top.getBounds();
+		int marginsHeight = tableViewer.getTable().getHeaderHeight();
+		marginsHeight -= top.getBorderWidth() + wrapper.getBorderWidth();
+		area.height -= marginsHeight;
+
+		// set page vertical increment area
+		ScrollBar verBar = scrollFrame.getVerticalBar();
+		ScrollBar horBar = scrollFrame.getHorizontalBar();
+		if (verBar != null) {
+			verBar.setPageIncrement(area.height);
+		}
+		if (horBar != null) {
+			horBar.setPageIncrement(area.width);
+		}
+
+	}
+
+	/**
+	 * Trigger time synchronisation to other views this method shall be called
+	 * when a check has been performed to note that an actual change of time has
+	 * been performed vs a pure re-selection of the same time
+	 * 
+	 * @param time
+	 */
+	private void synchTimeNotification(long time) {
+		// if synchronisation selected
+		if (synch.isChecked()) {
+			// Notify other views
+			TmfSignalManager.dispatchSignal(new TmfTimeSynchSignal(this,
+					new LttngTimestamp(time)));
+		}
+	}
+
+	/**
+	 * Registers as listener of time selection from other tmf views
+	 * 
+	 * @param signal
+	 */
+	@TmfSignalHandler
+	public void synchToTime(TmfTimeSynchSignal signal) {
+		if (synch.isChecked()) {
+			Object source = signal.getSource();
+			if (signal != null && source != null && source != this) {
+				// Internal value is expected in nano seconds.
+				long selectedTime = signal.getCurrentTime().getValue();
+				if (tsfviewer != null) {
+					tsfviewer.setSelectedTime(selectedTime, true, source);
+				}
+			}
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.linuxtools.lttng.ui.views.common.LttngTimeUpdateView#waitCursor
+	 * (boolean)
+	 */
+	@Override
+	protected synchronized void waitCursor(final boolean waitInd) {
+		if (tsfviewer != null) {
+			Display display = tsfviewer.getControl().getDisplay();
+
+			// Perform the updates on the UI thread
+			display.asyncExec(new Runnable() {
+				public void run() {
+					tsfviewer.waitCursor(waitInd);
+				}
+			});
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @seeorg.eclipse.linuxtools.lttng.ui.views.common.AbsTimeUpdateView#
+	 * ModelUpdatePrep(java.lang.String, boolean)
+	 */
+	@Override
+	public void ModelUpdatePrep(String traceId, boolean clearAllData,
+			TmfTimeRange trange) {
+		if (clearAllData) {
+			FlowModelFactory.getProcContainer().clearProcesses();
+			// Obtain the current process array
+			TimeRangeEventProcess[] processArr = FlowModelFactory
+					.getProcContainer().readProcesses();
+			
+
+			// initialise to an empty model
+			flowModelUpdates(processArr, -1, -1, false);
+		} else {
+			FlowModelFactory.getProcContainer().clearChildren(traceId);
+		}
+
+		ParamsUpdater updater = FlowModelFactory.getParamsUpdater();
+		// Start over
+		updater.setEventsDiscarded(0);
+
+		// Update new visible time range if available
+		if (trange != null) {
+			updater.update(trange.getStartTime().getValue(), trange
+					.getEndTime().getValue());
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @seeorg.eclipse.linuxtools.lttng.ui.views.common.LttngTimeUpdateView#
+	 * ModelUpdateComplete(org.eclipse.linuxtools.lttng.state.StateDataRequest)
+	 */
+	@Override
+	public void ModelUpdateComplete(StateDataRequest request) {
+		long experimentStartTime = -1;
+		long experimentEndTime = -1;
+		StateManager smanager = request.getStateManager();
+		TmfTimeRange experimentTimeRange = smanager.getExperimentTimeWindow();
+		if (experimentTimeRange != null) {
+			experimentStartTime = experimentTimeRange.getStartTime().getValue();
+			experimentEndTime = experimentTimeRange.getEndTime().getValue();
+		}
+		// Obtain the current process array
+		TimeRangeEventProcess[] processArr = FlowModelFactory
+				.getProcContainer().readProcesses();
+		// Sort the array by pid
+		Arrays.sort(processArr);
+
+		// Update the view part
+		flowModelUpdates(processArr, experimentStartTime, experimentEndTime,
+				request.isclearDataInd());
+
+		// get back to user selected time if still within range
+		ParamsUpdater paramUpdater = FlowModelFactory.getParamsUpdater();
+		final Long selTime = paramUpdater.getSelectedTime();
+		if (selTime != null) {
+			Display display = tsfviewer.getControl().getDisplay();
+			display.asyncExec(new Runnable() {
+				public void run() {
+					tsfviewer.setSelectedTime(selTime, false, this);
+				}
+			});
+		}
+
+		if (TraceDebug.isDEBUG()) {
+			int eventCount = 0;
+			Long count = smanager.getEventCount();
+			for ( int pos = 0; pos<processArr.length; pos++ ) {
+				eventCount += processArr[pos].getTraceEvents().size();
+			}
+
+			int discarded = FlowModelFactory.getParamsUpdater()
+					.getEventsDiscarded();
+			int discardedOutofOrder = FlowModelFactory.getParamsUpdater()
+					.getEventsDiscardedWrongOrder();
+			TmfTimeRange range = request.getRange();
+			StringBuilder sb = new StringBuilder(
+					"Events handled: "
+							+ count
+							+ " Events loaded in Control Flow view: "
+							+ eventCount
+							+ " Number of events discarded: "
+							+ discarded
+							+ "\n\tNumber of events discarded with start time earlier than next good time: "
+							+ discardedOutofOrder);
+
+			sb.append("\n\t\tRequested Time Range: " + range.getStartTime()
+					+ "-" + range.getEndTime());
+			sb.append("\n\t\tExperiment Time Range: " + experimentStartTime
+					+ "-" + experimentEndTime);
+			TraceDebug.debug(sb.toString());
+		}
+	}
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/Messages.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/Messages.java
new file mode 100644
index 0000000..a7c8bc9
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/Messages.java
@@ -0,0 +1,33 @@
+/*******************************************************************************

+ * Copyright (c) 2009 Ericsson

+ * 

+ * All rights reserved. This program and the accompanying materials are

+ * made available under the terms of the Eclipse Public License v1.0 which

+ * accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.lttng.ui.views.controlflow;

+

+import java.util.MissingResourceException;

+import java.util.ResourceBundle;

+

+public class Messages {

+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.lttng.ui.views.controlflow.messages"; //$NON-NLS-1$

+

+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle

+			.getBundle(BUNDLE_NAME);

+

+	private Messages() {

+	}

+

+	public static String getString(String key) {

+		try {

+			return RESOURCE_BUNDLE.getString(key);

+		} catch (MissingResourceException e) {

+			return '!' + key + '!';

+		}

+	}

+}

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/AbsFlowTRangeUpdate.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/AbsFlowTRangeUpdate.java
new file mode 100644
index 0000000..ceab028
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/AbsFlowTRangeUpdate.java
@@ -0,0 +1,231 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors: Alvaro Sanchez-Leon - Initial implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.controlflow.evProcessor;
+
+import java.util.Vector;
+
+import org.eclipse.linuxtools.lttng.state.StateStrings.ProcessStatus;
+import org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing;
+import org.eclipse.linuxtools.lttng.state.model.LttngProcessState;
+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeComponent;
+import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEvent;
+import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventProcess;
+import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEvent.Type;
+import org.eclipse.linuxtools.lttng.ui.views.common.AbsTRangeUpdate;
+import org.eclipse.linuxtools.lttng.ui.views.common.ParamsUpdater;
+import org.eclipse.linuxtools.lttng.ui.views.controlflow.model.FlowModelFactory;
+import org.eclipse.linuxtools.lttng.ui.views.controlflow.model.FlowProcessContainer;
+
+public abstract class AbsFlowTRangeUpdate extends AbsTRangeUpdate implements IEventProcessing {
+
+	// ========================================================================
+	// Data
+	// =======================================================================
+
+	protected FlowProcessContainer procContainer = FlowModelFactory.getProcContainer();
+	protected ParamsUpdater params = FlowModelFactory.getParamsUpdater();
+	protected static final Long ANY_CPU = 0L;
+
+
+	// ========================================================================
+	// Methods
+	// =======================================================================
+	protected TimeRangeEventProcess addLocalProcess(LttngProcessState stateProcess, long traceStartTime, long traceEndTime, String traceId) {
+		// TimeRangeEventProcess localProcess = new TimeRangeEventProcess(id, name, startTime, stopTime, groupName, className)
+		TimeRangeEventProcess localProcess = new TimeRangeEventProcess(
+				procContainer.getUniqueId(), stateProcess.getName(),
+				traceStartTime, traceEndTime, "", stateProcess.getType()
+						.getInName(), stateProcess.getCpu(), stateProcess
+						.getInsertion_time());
+		
+		
+		localProcess.setCreationTime(stateProcess.getCreation_time());
+		localProcess.setPid(stateProcess.getPid());
+		localProcess.setTgid(stateProcess.getTgid());
+		localProcess.setPpid(stateProcess.getPpid());
+		localProcess.setName(stateProcess.getName());
+		localProcess.setBrand(stateProcess.getBrand());
+		localProcess.setTraceID(traceId);
+		localProcess.setProcessType(stateProcess.getType().getInName());
+		procContainer.addProcess(localProcess);
+		return localProcess;
+	}
+	
+	/**
+	 * Used to check if the event is visible within the current visible time
+	 * window
+	 * 
+	 * @return
+	 */
+	protected boolean withinViewRange(long stime, long etime) {
+		long windowStartTime = params.getStartTime();
+		long windowEndTime = params.getEndTime();
+
+		// start time is within window
+		if (stime >= windowStartTime && stime <= windowEndTime) {
+			// The event or part of it shall be displayed.
+			return true;
+		}
+
+		// end time is within window
+		if (etime >= windowStartTime && etime <= windowEndTime) {
+			// The event or part of it shall be displayed.
+			return true;
+		}
+
+		// check that a portion is within the window
+		if (stime < windowStartTime && etime > windowEndTime) {
+			// The time range is bigger than the selected time window and
+			// crosses it
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * @param traceSt
+	 * @param startTime
+	 * @param endTime
+	 * @param localProcess
+	 * @param params
+	 * @param stateMode
+	 * @return
+	 */
+	protected boolean makeDraw(LttngTraceState traceSt, long startTime,
+			long endTime, TimeRangeEventProcess localProcess,
+			ParamsUpdater params, String stateMode) {
+
+		// Determine start and end times to establish duration
+		Long stime = startTime;
+		Long etime = endTime;
+
+		if (etime < stime) {
+			// Validate the sequential order of events
+			params.incrementEventsDiscardedWrongOrder();
+			return false;
+		}
+
+		if (!withinViewRange(stime, etime)) {
+			// No use to process the event since it's outside
+			// the visible time range of the window
+			params.incrementEventsDiscarded();
+			return false;
+		}
+
+		// Determine if the time range event will fit it the current
+		// pixel map
+		double duration = etime - stime;
+		double k = getPixelsPerNs(traceSt, params);
+		double pixels = duration * k;
+
+		// ***VERIFY***
+		// Is all this equivalent to this call in C??
+		// if(ltt_time_compare(hashed_process_data->next_good_time,evtime) > 0)
+		// ***
+		// Visibility check
+		// Display a "more information" indication by allowing non visible event
+		// as long as its previous event is visible.
+		boolean visible = true;
+		if (pixels < 1) {
+			boolean prevEventVisibility = true;
+			// Get the visibility indication on previous event for
+			// this process
+			Vector<TimeRangeComponent> inMemEvents = localProcess
+					.getTraceEvents();
+			if (inMemEvents.size() != 0) {
+				TimeRangeComponent prevEvent = inMemEvents.get(inMemEvents
+						.size() - 1);
+				prevEventVisibility = prevEvent.isVisible();
+
+				// ***VERIFY***
+				// This replace all C Call like this one ?
+				// #ifdef EXTRA_CHECK if(ltt_time_compare(evtime,
+				// time_window.start_time) == -1 || ltt_time_compare(evtime,
+				// time_window.end_time) == 1)
+
+				// if previous event visibility is false and the time span
+				// between events less than two pixels, there is no need to
+				// load it in memory i.e. not visible and a more indicator is
+				// within two pixels.
+				// return i.e. event discarded to free up memory
+				Long eventSpan = stime - prevEvent.getStartTime();
+				if (prevEventVisibility == false
+						&& ((double) eventSpan * k) < 2) {
+
+					// discard the item
+					params.incrementEventsDiscarded();
+					return false;
+
+				}
+			}
+
+			// if previous event is visible, set this one to not
+			// visible and continue
+			visible = false;
+		}
+
+		// Create the time-range event
+		// *** VERIFY ***
+		// This should replace this C call, right?
+		// TimeWindow time_window =
+		// lttvwindow_get_time_window(control_flow_data->tab);
+		TimeRangeEvent time_window = new TimeRangeEvent(stime, etime,
+				localProcess, Type.PROCESS_MODE, stateMode);
+
+		// *** VERIFY ***
+		// This is added to replace the multiple draw and gtk/glib command but
+		// I'm not sure about it
+		time_window.setVisible(visible);
+		localProcess.getTraceEvents().add(time_window);
+		localProcess.setNext_good_time(etime);
+
+		// *** VERIFY ***
+		// Missing checks like this one?
+		// #ifdef EXTRA_CHECK if(ltt_time_compare(evtime,
+		// time_window.start_time) == -1 || ltt_time_compare(evtime,
+		// time_window.end_time) == 1)
+
+		return false;
+	}
+
+	/**
+	 * @param traceSt
+	 * @param evTime
+	 * @param process
+	 * @param localProcess
+	 * @param params
+	 * @return
+	 */
+	protected boolean makeDraw(LttngTraceState traceSt, long evTime,
+			LttngProcessState process, TimeRangeEventProcess localProcess,
+			ParamsUpdater params) {
+
+		// TmfTimestamp stime = process.getState().getChange_LttTime();
+		long stime = localProcess.getNext_good_time();
+
+		String stateMode;
+		ProcessStatus procStatus = process.getState().getProc_status();
+		// Use Execution mode if process state is RUN otherwise use the actual
+		// process state,
+		// this selection will determine the actual color selected for the event
+		if (procStatus == ProcessStatus.LTTV_STATE_RUN) {
+			stateMode = process.getState().getExec_mode().getInName();
+		} else {
+			stateMode = procStatus.getInName();
+		}
+
+		return makeDraw(traceSt, stime, evTime, localProcess, params, stateMode);
+
+	}
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowTRangeAfterUpdateHandlers.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowTRangeAfterUpdateHandlers.java
new file mode 100644
index 0000000..df7e041
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowTRangeAfterUpdateHandlers.java
@@ -0,0 +1,423 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.controlflow.evProcessor;
+
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.state.StateStrings.Events;
+import org.eclipse.linuxtools.lttng.state.StateStrings.Fields;
+import org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing;
+import org.eclipse.linuxtools.lttng.state.model.LttngProcessState;
+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.ui.TraceDebug;
+import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventProcess;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+
+/**
+ * Creates instances of specific after state update handlers, per corresponding
+ * event.
+ * 
+ * @author alvaro
+ * 
+ */
+class FlowTRangeAfterUpdateHandlers {
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_SCHED_SCHEDULE
+	 * </p>
+	 * Replace C function "after_schedchange_hook" in eventhooks.c
+	 * <p>
+	 * Fields: LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getSchedChangeHandler() {
+		AbsFlowTRangeUpdate handler = new AbsFlowTRangeUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SCHED_SCHEDULE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				
+				// get event time, cpu, trace_number, process, pid
+				LttngProcessState process_in = traceSt.getRunning_process().get(trcEvent.getCpuId());
+				
+				// pid_out is never used, even in LTTv!
+				//Long pid_out = getAFieldLong(trcEvent, traceSt, Fields.LTT_FIELD_PREV_PID);
+				Long pid_in = getAFieldLong(trcEvent, traceSt, Fields.LTT_FIELD_NEXT_PID);
+				
+				if ( !(pid_in.equals(process_in.getPid())) ) {
+				    TraceDebug.debug("pid_in != PID!  (getSchedChangeHandler)");
+                }
+				
+				//hashed_process_data = processlist_get_process_data(process_list,pid_out,process->cpu,&birth,trace_num);
+				TimeRangeEventProcess localProcess = procContainer.findProcess(process_in.getPid(), process_in.getCpu(), traceSt.getTraceId(),process_in.getCreation_time() );
+				
+				if ( localProcess == null ) {
+					if ( (pid_in == 0) || (pid_in != process_in.getPpid()) ) {
+					    TmfTimeRange timeRange = traceSt.getInputDataRef().getTraceTimeWindow();
+	                    localProcess = addLocalProcess(process_in, timeRange.getStartTime().getValue(), timeRange.getEndTime().getValue(), traceSt.getTraceId());
+					}
+					else {
+						TraceDebug
+								.debug("pid_in is not 0 or pid_in == PPID!  (getSchedChangeHandler)");
+					}
+				}
+
+				// There is no drawing done by the C code below, only refreshing
+				// the references to the current hash data to make it ready for
+				// next event
+
+				// This current implementation does not support the use of
+				// current hashed data
+				// although an equivalent would be good in order to improve the
+				// time to find the currently running process per cpu.
+				/*
+				if(ltt_time_compare(hashed_process_data_in->next_good_time, evtime) <= 0)
+				{
+				    TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab);
+				  
+					#ifdef EXTRA_CHECK
+				    if(ltt_time_compare(evtime, time_window.start_time) == -1 || ltt_time_compare(evtime, time_window.end_time) == 1)
+				       return FALSE;
+					#endif //EXTRA_CHECK
+				
+				    Drawing_t *drawing = control_flow_data->drawing;
+				    guint width = drawing->width;
+				    guint new_x;
+				      
+				    convert_time_to_pixels(time_window,evtime,width,&new_x);
+				  	
+				    if(hashed_process_data_in->x.middle != new_x) {
+				        hashed_process_data_in->x.middle = new_x;
+				        hashed_process_data_in->x.middle_used = FALSE;
+				        hashed_process_data_in->x.middle_marked = FALSE;
+				    }
+				}*/
+				
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_PROCESS_FORK
+	 * </p>
+	 * Replace C function "after_process_fork_hook" in eventhooks.c
+	 * <p>
+	 * Fields: LTT_FIELD_CHILD_PID
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getProcessForkHandler() {
+	    AbsFlowTRangeUpdate handler = new AbsFlowTRangeUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_PROCESS_FORK;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {  
+			    
+                Long child_pid = getAFieldLong(trcEvent, traceSt, Fields.LTT_FIELD_CHILD_PID);
+                LttngProcessState process_child = lttv_state_find_process(traceSt, trcEvent.getCpuId(), child_pid );
+			    
+			    if ( process_child != null ) {
+			        TimeRangeEventProcess localProcess = procContainer.findProcess(process_child.getPid(), process_child.getCpu(), traceSt.getTraceId(), process_child.getCreation_time() );
+			        
+			        if ( localProcess == null ) {
+			            if ( (child_pid == 0) || (child_pid != process_child.getPpid()) ) {            
+			                TmfTimeRange timeRange = traceSt.getInputDataRef().getTraceTimeWindow();
+                            localProcess = addLocalProcess(process_child, timeRange.getStartTime().getValue(), timeRange.getEndTime().getValue(), traceSt.getTraceId());
+			            }
+			            else {
+			                TraceDebug.debug("localProcess is null with child_pid not 0 or child_pid equals PPID (getProcessForkHandler)");
+			            }
+					} else {
+						// If we found the process, the Ppid and the Tgid might
+						// be missing, let's add them
+						localProcess.setPpid(process_child.getPpid());
+						localProcess.setTgid(process_child.getTgid());
+			        }
+			    }
+			    else {
+			        TraceDebug.debug("process_child is null! (getProcessForkHandler)");
+			    }
+	              
+				return false;
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_PROCESS_EXIT
+	 * </p>
+	 * Replace C function "after_process_exit_hook" in eventhooks.c
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getProcessExitHandler() {
+	    AbsFlowTRangeUpdate handler = new AbsFlowTRangeUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_PROCESS_EXIT;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+			    
+			    LttngProcessState process = traceSt.getRunning_process().get(trcEvent.getCpuId());
+
+			    if ( process != null ) {
+			        
+					// *** TODO: ***
+					// We shall look into a way to find the current process
+					// faster, see the c library
+					// (current_hash) in order to speed up the find. see c-code
+			        //   if(likely(process_list->current_hash_data[trace_num][cpu] != NULL) ){
+		            //        hashed_process_data = process_list->current_hash_data[trace_num][cpu];
+		            //   }
+			        TimeRangeEventProcess localProcess = procContainer.findProcess(process.getPid(), process.getCpu(), traceSt.getTraceId(),  process.getCreation_time());
+			        
+			        if ( localProcess == null ) {
+			            if ( (process.getPid() == 0) || (process.getPid() != process.getPpid()) ) {			                
+			                TmfTimeRange timeRange = traceSt.getInputDataRef().getTraceTimeWindow();
+		                    localProcess = addLocalProcess(process, timeRange.getStartTime().getValue(), timeRange.getEndTime().getValue(), traceSt.getTraceId());
+			            }
+			            else {
+			                TraceDebug.debug("process pid is not 0 or pid equals ppid! (getProcessExitHandler)");
+			            }
+					}
+			    }
+			    else {
+			        TraceDebug.debug("process is null! (getProcessExitHandler)");
+			    }			    
+			    
+				return false;
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_EXEC
+	 * </p>
+	 * Replace C function "after_fs_exec_hook" in eventhooks.c
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getProcessExecHandler() {
+	    AbsFlowTRangeUpdate handler = new AbsFlowTRangeUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_EXEC;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+			    
+			    LttngProcessState process = traceSt.getRunning_process().get(trcEvent.getCpuId());
+
+                if ( process != null ) {
+                    
+                    TimeRangeEventProcess localProcess = procContainer.findProcess(process.getPid(),  process.getCpu(), traceSt.getTraceId(), process.getCreation_time());
+                    
+                    if ( localProcess == null ) {
+                        if ( (process.getPid() == 0) || (process.getPid() != process.getPpid()) ) {
+                            TmfTimeRange timeRange = traceSt.getInputDataRef().getTraceTimeWindow();
+                            localProcess = addLocalProcess(process, timeRange.getStartTime().getValue(), timeRange.getEndTime().getValue(), traceSt.getTraceId());
+                        }
+                        else {
+                            TraceDebug.debug("process pid is not 0 or pid equals ppid! (getProcessExecHandler)");
+                        }
+                    }
+                    else {
+                        // If we found the process, the name might be missing. Let's add it here.
+                        localProcess.setName(process.getName());
+                    }
+                }
+                else {
+                    TraceDebug.debug("process is null! (getProcessExecHandler)");
+                }
+                
+				return false;
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+	
+	/**
+	 * <p>
+	 * LTT_EVENT_THREAD_BRAND
+	 * </p>
+	 * Replace C function "after_user_generic_thread_brand_hook" in eventhooks.c
+	 * 
+	 * @return
+	 */
+	final IEventProcessing GetThreadBrandHandler() {
+	    AbsFlowTRangeUpdate handler = new AbsFlowTRangeUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_THREAD_BRAND;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+			    
+			    LttngProcessState process = traceSt.getRunning_process().get(trcEvent.getCpuId());
+
+                if ( process != null ) {
+                    
+					// Similar to above comments, implement a faster way to find
+					// the local process
+                    //   if(likely(process_list->current_hash_data[trace_num][cpu] != NULL) ){
+                    //        hashed_process_data = process_list->current_hash_data[trace_num][cpu];
+                    //   }
+                    TimeRangeEventProcess localProcess = procContainer.findProcess(process.getPid(), process.getCpu(), traceSt.getTraceId(), process.getCreation_time());
+                    
+                    if ( localProcess == null ) {
+                        if ( (process.getPid() == 0) || (process.getPid() != process.getPpid()) ) {                         
+                            TmfTimeRange timeRange = traceSt.getInputDataRef().getTraceTimeWindow();
+                            localProcess = addLocalProcess(process, timeRange.getStartTime().getValue(), timeRange.getEndTime().getValue(), traceSt.getTraceId());
+                        }
+                        else {
+                            TraceDebug.debug("process pid is not 0 or pid equals ppid! (GetThreadBrandHandler)");
+                        }
+                    }
+                    else {
+						// If we found the process, the brand might be missing
+						// on it, add it.
+                        localProcess.setBrand(process.getBrand());
+                    }
+                }
+                else {
+                    TraceDebug.debug("process is null! (GetThreadBrandHandler)");
+                }
+                
+                return false;
+			    
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * LTT_EVENT_PROCESS_STATE
+	 * </p>
+	 * Replace C function "after_event_enum_process_hook" in eventhooks.c
+	 * <p>
+	 * <p>
+	 * Creates the processlist entry for the child process. Put the last
+	 * position in x at the current time value.
+	 * </p>
+	 * 
+	 * <p>
+	 * Fields: LTT_FIELD_PID
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getEnumProcessStateHandler() {
+	    AbsFlowTRangeUpdate handler = new AbsFlowTRangeUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_PROCESS_STATE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+			    
+				int first_cpu;
+				int nb_cpus;
+			    
+				Long pid_in = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_PID);
+			    
+                // Lttv assume that pid_in will NEVER be null or incoherent
+                // What if ... ?    (let's add some debug)
+			    if ( pid_in != null  ) {
+    			    if(pid_in == 0L) {
+						first_cpu = 0;
+						nb_cpus = traceSt.getNumberOfCPUs();
+    			    } 
+    			    else {
+						first_cpu = ANY_CPU.intValue();
+						nb_cpus = ANY_CPU.intValue() + 1;
+    			    }
+    			    
+					for (int cpu = first_cpu; cpu < nb_cpus; cpu++) {
+    			        LttngProcessState process_in = lttv_state_find_process(traceSt, trcEvent.getCpuId(), pid_in );
+    			        
+    			        if ( process_in != null ) {
+    			            TimeRangeEventProcess localProcess = procContainer.findProcess(process_in.getPid(), process_in.getCpu(), traceSt.getTraceId(), process_in.getCreation_time());
+    	                    
+    			            if (localProcess == null) {
+        			            if ( (process_in.getPid() == 0) || (process_in.getPid() != process_in.getPpid()) ) {
+                                    TmfTimeRange timeRange = traceSt.getInputDataRef().getTraceTimeWindow();
+                                    localProcess = addLocalProcess(process_in, timeRange.getStartTime().getValue(), timeRange.getEndTime().getValue(), traceSt.getTraceId());
+                                }
+                                else {
+                                    TraceDebug.debug("process pid is not 0 or pid equals ppid! (getEnumProcessStateHandler)");
+                                }
+    			            }
+    			            else {
+    			                // If the process was found, it might be missing informations, add it here
+    			                localProcess.setName(process_in.getName());
+    			                localProcess.setPpid(process_in.getPpid());
+    			                localProcess.setTgid(process_in.getTgid());
+    			            }
+    			        }
+    			        else {
+    			            TraceDebug.debug("process_in is null! This should never happen. (getEnumProcessStateHandler)");
+    			        }
+    			    }
+			    }
+			    else {
+			        TraceDebug.debug("pid_in is null! This should never happen, really... (getEnumProcessStateHandler)");
+			    }
+			    
+				return false;
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowTRangeBeforeUpdateHandlers.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowTRangeBeforeUpdateHandlers.java
new file mode 100644
index 0000000..cad26ee
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowTRangeBeforeUpdateHandlers.java
@@ -0,0 +1,427 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.controlflow.evProcessor;
+
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.state.StateStrings.Events;
+import org.eclipse.linuxtools.lttng.state.StateStrings.Fields;
+import org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing;
+import org.eclipse.linuxtools.lttng.state.model.LttngProcessState;
+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.ui.TraceDebug;
+import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventProcess;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+
+/**
+ * Creates instances of specific before state update handlers, per corresponding
+ * event.
+ * 
+ * @author alvaro
+ * 
+ */
+class FlowTRangeBeforeUpdateHandlers {
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_SYSCALL_ENTRY
+	 * </p>
+	 * Replace C function named "before_execmode_hook" in eventhooks.c
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getStateModesHandler() {
+		AbsFlowTRangeUpdate handler = new AbsFlowTRangeUpdate() {
+
+			// this method is common to many events
+			private Events eventType = Events.LTT_EVENT_SYSCALL_ENTRY;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				Long cpu = trcEvent.getCpuId();
+				LttngProcessState stateProcess = traceSt.getRunning_process()
+						.get(cpu);
+				// TraceDebug.debug("Before handler called");
+				String traceId = traceSt.getTraceId();
+
+				if (stateProcess != null) {
+					// Find process within the list of registered time-range
+					// related
+					// processes
+
+					// key process attributes to look for it or store it
+					// are: pid, birth, trace_num, note: cpu not relevant since
+					// it
+					// may change
+					TimeRangeEventProcess localProcess = procContainer
+							.findProcess(stateProcess.getPid(), stateProcess.getCpu(), traceId, stateProcess
+                                    .getCreation_time());
+
+					// Add process to process list if not present
+					if (localProcess == null) {
+						TmfTimeRange timeRange = traceSt.getInputDataRef()
+								.getTraceTimeWindow();
+						localProcess = addLocalProcess(stateProcess, timeRange
+								.getStartTime().getValue(), timeRange
+								.getEndTime().getValue(), traceId);
+					}
+
+					// Do the actual drawing
+					makeDraw(traceSt, trcEvent.getTimestamp().getValue(),
+							stateProcess, localProcess, params);
+				} else {
+					TraceDebug
+							.debug("Running state process is null! (getStateModesHandler)");
+				}
+
+				return false;
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_SCHED_SCHEDULE
+	 * </p>
+	 * Replace C function named "before_schedchange_hook" in eventhooks.c
+	 * <p>
+	 * Fields: LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE (?)
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getBeforeSchedChangeHandler() {
+		AbsFlowTRangeUpdate handler = new AbsFlowTRangeUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SCHED_SCHEDULE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				Long pid_out = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_PREV_PID);
+				Long pid_in = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_NEXT_PID);
+
+				// This is useless even in Lttv !!
+				// Long state_out = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_PREV_STATE);
+
+				// We need to process information.
+				LttngProcessState process = traceSt.getRunning_process().get(
+						trcEvent.getCpuId());
+
+				if (process != null) {
+					if (process.getPid().equals(pid_out) == false) {
+						// To replace :
+						// process = lttv_state_find_process(ts,tfs->cpu,
+						// pid_out);
+						process = lttv_state_find_process(traceSt, trcEvent
+								.getCpuId(), pid_out);
+						// Also, removed :
+						// guint trace_num = ts->parent.index;
+					}
+
+					if (process != null) {
+						// TODO: Implement something similar to current hash in
+						// order to keep track of the current process and speed
+						// up finding the local resource.
+
+						// HashedProcessData *hashed_process_data = NULL;
+						// hashed_process_data =
+						// processlist_get_process_data(process_list,pid_out,process->cpu,&birth,trace_num);
+						TimeRangeEventProcess localProcess = procContainer
+								.findProcess(process.getPid(), process.getCpu(), traceSt
+										.getTraceId(), process.getCreation_time());
+
+						// Add process to process list if not present
+						// Replace C Call :
+						// processlist_add(process_list,drawing,pid_out,process->tgid,process->cpu,process->ppid,&birth,trace_num,process->name,process->brand,&pl_height,&process_info,&hashed_process_data);
+						if (localProcess == null) {
+							TmfTimeRange timeRange = traceSt.getInputDataRef()
+									.getTraceTimeWindow();
+							localProcess = addLocalProcess(process, timeRange
+									.getStartTime().getValue(), timeRange
+									.getEndTime().getValue(), traceSt
+									.getTraceId());
+						}
+
+						// Do the actual drawing
+						makeDraw(traceSt, trcEvent.getTimestamp().getValue(),
+								process,
+								localProcess, params);
+					} else {
+						// Process may be null if the process started BEFORE the
+						// trace start
+						// TraceDebug.debug("Process is null for pid_out! (getBeforeSchedChangeHandler)");
+					}
+
+					// PID_IN section
+					process = lttv_state_find_process(traceSt, trcEvent
+							.getCpuId(), pid_in);
+
+					if (process != null) {
+						// HashedProcessData *hashed_process_data = NULL;
+						// hashed_process_data =
+						// processlist_get_process_data(process_list, pid_in,
+						// tfs->cpu, &birth, trace_num);
+						TimeRangeEventProcess localProcess = procContainer
+								.findProcess(process.getPid(), process.getCpu(), traceSt
+										.getTraceId(), process.getCreation_time());
+
+						// Add process to process list if not present
+						// Replace C Call :
+						// processlist_add(process_list, drawing, pid_in,
+						// process->tgid, tfs->cpu, process->ppid, &birth,
+						// trace_num, process->name, process->brand, &pl_height,
+						// &process_info, &hashed_process_data);
+						if (localProcess == null) {
+							TmfTimeRange timeRange = traceSt.getInputDataRef()
+									.getTraceTimeWindow();
+							localProcess = addLocalProcess(process, timeRange
+									.getStartTime().getValue(), timeRange
+									.getEndTime().getValue(), traceSt
+									.getTraceId());
+						}
+
+						// Do the actual drawing
+						makeDraw(traceSt, trcEvent.getTimestamp().getValue(),
+								process,
+								localProcess, params);
+
+					} else {
+						// Process can be null if it started AFTER the trace
+						// end. Do nothing...
+						// TraceDebug.debug("No process found for pid_in! Something is wrong? (getBeforeSchedChangeHandler)");
+					}
+				} else {
+					TraceDebug
+							.debug("Running process is null! (getBeforeSchedChangeHandler)");
+				}
+
+				return false;
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_PROCESS_EXIT
+	 * </p>
+	 * Replace C function named "before_process_exit_hook" in eventhooks.c
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getProcessExitHandler() {
+		AbsFlowTRangeUpdate handler = new AbsFlowTRangeUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_PROCESS_EXIT;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				// We need to process information.
+				LttngProcessState process = traceSt.getRunning_process().get(
+						trcEvent.getCpuId());
+
+				if (process != null) {
+					// TODO: Implement a similar method to track the current
+					// local process in order to speed up finding the local
+					// resource
+
+					// hashed_process_data =
+					// processlist_get_process_data(process_list, pid,
+					// process->cpu, &birth,trace_num);
+					TimeRangeEventProcess localProcess = procContainer
+							.findProcess(process.getPid(), process.getCpu(), traceSt
+									.getTraceId(), process.getCreation_time());
+
+					// Add process to process list if not present
+					// Replace C Call :
+					// processlist_add(process_list, drawing, pid,
+					// process->tgid, process->cpu, process->ppid, &birth,
+					// trace_num, process->name, process->brand,&pl_height,
+					// &process_info, &hashed_process_data);
+					if (localProcess == null) {
+						TmfTimeRange timeRange = traceSt.getInputDataRef()
+								.getTraceTimeWindow();
+						localProcess = addLocalProcess(process, timeRange
+								.getStartTime().getValue(), timeRange
+								.getEndTime().getValue(), traceSt.getTraceId());
+					}
+
+					// Call the function that does the actual drawing
+					makeDraw(traceSt, trcEvent.getTimestamp().getValue(),
+							process, localProcess, params);
+
+				} else {
+					TraceDebug
+							.debug("Running process is null! (getProcessExitHandler)");
+				}
+
+				return false;
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_PROCESS_FREE
+	 * </p>
+	 * Replace C function named "before_process_release_hook" in eventhooks.c
+	 * <p>
+	 * Fields: LTT_FIELD_PID
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getProcessFreeHandler() {
+		AbsFlowTRangeUpdate handler = new AbsFlowTRangeUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_PROCESS_FREE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				// PID of the process to release
+				Long release_pid = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_PID);
+
+				if ((release_pid != null)) {
+					LttngProcessState process = lttv_state_find_process(
+							traceSt, ANY_CPU, release_pid);
+					if (process != null) {
+
+						// Replace the C call :
+						// hashed_process_data =
+						// processlist_get_process_data(process_list,pid,process->cpu,&birth,trace_num);
+						TimeRangeEventProcess localProcess = procContainer
+								.findProcess(process.getPid(), process.getCpu(), traceSt
+										.getTraceId(), process
+                                        .getCreation_time());
+
+						// This is as it was in the C ... ?
+						if (localProcess == null) {
+							return false;
+						}
+
+						// Perform the drawing
+						makeDraw(traceSt, trcEvent.getTimestamp().getValue(),
+								process,
+								localProcess, params);
+					}
+				} else {
+					TraceDebug
+							.debug("Release_pid is null! (getProcessFreeHandler)");
+				}
+
+				return false;
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_STATEDUMP_END
+	 * </p>
+	 * Replace C function named "before_statedump_end" in eventhooks.c
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getStateDumpEndHandler() {
+		AbsFlowTRangeUpdate handler = new AbsFlowTRangeUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_STATEDUMP_END;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				// What's below should replace the following call in C :
+				// ClosureData closure_data;
+				// closure_data.events_request = events_request;
+				// closure_data.tss = tss;
+				// closure_data.end_time = evtime;
+				// convert_time_to_pixels(time_window,evtime,width,&closure_data.x_end);
+				// g_hash_table_foreach(process_list->process_hash,
+				// draw_closure,(void*)&closure_data);
+				//
+				// And the draw is always the same then...
+
+				// The c-library loops through the local processes, search for
+				// the local processes in the state provider and then draws
+				// If it's present is the local processes why shuldn't they be
+				// present in the state provider?
+				// This seems more direct. and makes sure all processes are
+				// reflected in the control flow view.
+				LttngProcessState[] processes = traceSt.getProcesses();
+				for (int pos=0; pos < processes.length; pos++) {
+					LttngProcessState process = processes[pos];
+					
+					// Replace the C call :
+					// hashed_process_data =
+					// processlist_get_process_data(process_list,pid,process->cpu,&birth,trace_num);
+					TimeRangeEventProcess localProcess = procContainer
+							.findProcess(process.getPid(), process.getCpu(), traceSt
+									.getTraceId(), process
+                                    .getCreation_time());
+
+					// Add process to process list if not present
+					if (localProcess == null) {
+						TmfTimeRange timeRange = traceSt.getInputDataRef()
+								.getTraceTimeWindow();
+						localProcess = addLocalProcess(process, timeRange
+								.getStartTime().getValue(), timeRange
+								.getEndTime().getValue(), traceSt.getTraceId());
+					}
+
+					// Call the function that will does the actual
+					// drawing
+					makeDraw(traceSt, trcEvent.getTimestamp().getValue(),
+							process, localProcess, params);
+				}
+
+				return false;
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+
+		return handler;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowTRangeFinishUpdateHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowTRangeFinishUpdateHandler.java
new file mode 100644
index 0000000..dbaeb54
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowTRangeFinishUpdateHandler.java
@@ -0,0 +1,109 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors: Alvaro Sanchez-Leon - Initial implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.controlflow.evProcessor;
+
+import java.util.Vector;
+
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.state.StateStrings.Events;
+import org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing;
+import org.eclipse.linuxtools.lttng.state.model.LttngProcessState;
+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.ui.TraceDebug;
+import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeComponent;
+import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEvent;
+import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventProcess;
+
+/**
+ * Creates specific finish state data request
+ * 
+ * @author alvaro
+ * 
+ */
+public class FlowTRangeFinishUpdateHandler extends AbsFlowTRangeUpdate
+		implements IEventProcessing {
+
+	public Events getEventHandleType() {
+		// No specific event
+		return null;
+	}
+
+	public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+		// Draw a last known state to the end of the trace
+		long endReqTime = traceSt.getInputDataRef().getTraceTimeWindow()
+				.getEndTime().getValue();
+		TraceDebug.debug("Number of localProcesses: "
+				+ procContainer.readProcesses().length);
+		// to identify the process relevant to the traceState
+		String traceId = traceSt.getTraceId();
+		int numLocalFound = 0;
+		int numLocalNotFound = 0;
+		int numWithNoChildren = 0;
+		for (TimeRangeEventProcess localProcess : procContainer.readProcesses()) {
+			LttngProcessState stateProcess = lttv_state_find_process(traceSt,
+					localProcess.getCpu(), localProcess.getPid());
+
+			// Drawing the last state for processes related to the current trace
+			// id.
+			if (!localProcess.getTraceID().equals(traceId)) {
+				continue;
+			}
+
+			// Check if the process is in the state provider, it is the case
+			// when the requested time frame did not include any events for a
+			// process
+			if (stateProcess == null) {
+				// Get Start time from the end time of previous event
+				Vector<TimeRangeComponent> childrenEvents = localProcess
+						.getTraceEvents();
+				long nextGoodTime;
+				String stateMode;
+				if (childrenEvents.size() > 0) {
+					TimeRangeComponent prevEvent = childrenEvents
+							.get(childrenEvents.size() - 1);
+					if (prevEvent instanceof TimeRangeEvent) {
+						TimeRangeEvent prevTimeRange = (TimeRangeEvent) prevEvent;
+						// calculate the next good time to draw the event
+						// nextGoodTime = prevTimeRange.getStopTime() + 1;
+						nextGoodTime = localProcess.getNext_good_time();
+						stateMode = prevTimeRange.getStateMode();
+
+						// Draw with the Local information since the current
+						// request did
+						// not contain events related to this process
+						makeDraw(traceSt, nextGoodTime,
+								endReqTime, localProcess, params, stateMode);
+					} else {
+						TraceDebug
+								.debug("previous event not instance of TimeRangeEvent?: "
+										+ prevEvent.getClass().getSimpleName());
+					}
+				} else {
+					numWithNoChildren++;
+				}
+
+				numLocalNotFound++;
+				continue;
+			}
+			numLocalFound++;
+			// Draw the last state for this process
+
+			makeDraw(traceSt, endReqTime, stateProcess, localProcess, params);
+		}
+
+		TraceDebug.debug("Print Last Event: NumLocalFound " + numLocalFound
+				+ "; NumLocalNotFound: " + numLocalNotFound
+				+ "; NumWithNoChildren: " + numWithNoChildren);
+
+		return false;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowTRangeUpdateFactory.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowTRangeUpdateFactory.java
new file mode 100644
index 0000000..b5ae367
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowTRangeUpdateFactory.java
@@ -0,0 +1,171 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.controlflow.evProcessor;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.linuxtools.lttng.state.StateStrings;
+import org.eclipse.linuxtools.lttng.state.evProcessor.AbsEventProcessorFactory;
+import org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing;
+
+/**
+ * Builds a Map from string event name to a processing handler object, the
+ * processors implement the same interface to facilitate transparent methods
+ * call,
+ * 
+ * The map key STring is the entry point of the raw events, using a hash speeds
+ * up the resolution of the appropriate processor
+ * 
+ * @author alvaro
+ * 
+ */
+public class FlowTRangeUpdateFactory extends AbsEventProcessorFactory {
+	// ========================================================================
+	// Data
+	// =======================================================================
+	private final Map<String, IEventProcessing> eventNametoBeforeProcessor = new HashMap<String, IEventProcessing>();
+	private final Map<String, IEventProcessing> eventNametoAfterProcessor = new HashMap<String, IEventProcessing>();
+	private IEventProcessing finishProcesor = null;
+	private static FlowTRangeUpdateFactory instance = null;
+	private FlowTRangeBeforeUpdateHandlers instantiateBeforeHandler = new FlowTRangeBeforeUpdateHandlers();
+	private FlowTRangeAfterUpdateHandlers instantiateAfterHandler = new FlowTRangeAfterUpdateHandlers();
+
+	// ========================================================================
+	// Constructors
+	// =======================================================================
+	private FlowTRangeUpdateFactory() {
+		// Create one instance of each individual event handler and add the
+		// instance to the map
+
+		// BEFORE HOOKS
+		eventNametoBeforeProcessor.put(
+				StateStrings.Events.LTT_EVENT_SYSCALL_ENTRY.getInName(),
+				instantiateBeforeHandler.getStateModesHandler());
+
+		eventNametoBeforeProcessor.put(
+				StateStrings.Events.LTT_EVENT_SYSCALL_EXIT.getInName(),
+				instantiateBeforeHandler.getStateModesHandler());
+
+		eventNametoBeforeProcessor.put(StateStrings.Events.LTT_EVENT_TRAP_ENTRY
+				.getInName(), instantiateBeforeHandler.getStateModesHandler());
+
+		eventNametoBeforeProcessor.put(StateStrings.Events.LTT_EVENT_TRAP_EXIT
+				.getInName(), instantiateBeforeHandler.getStateModesHandler());
+
+		eventNametoBeforeProcessor.put(
+				StateStrings.Events.LTT_EVENT_PAGE_FAULT_ENTRY.getInName(),
+				instantiateBeforeHandler.getStateModesHandler());
+
+		eventNametoBeforeProcessor.put(
+				StateStrings.Events.LTT_EVENT_PAGE_FAULT_EXIT.getInName(),
+				instantiateBeforeHandler.getStateModesHandler());
+
+		eventNametoBeforeProcessor.put(
+				StateStrings.Events.LTT_EVENT_PAGE_FAULT_NOSEM_ENTRY
+						.getInName(), instantiateBeforeHandler
+						.getStateModesHandler());
+
+		eventNametoBeforeProcessor
+				.put(StateStrings.Events.LTT_EVENT_PAGE_FAULT_NOSEM_EXIT
+						.getInName(), instantiateBeforeHandler
+						.getStateModesHandler());
+
+		eventNametoBeforeProcessor.put(StateStrings.Events.LTT_EVENT_IRQ_ENTRY
+				.getInName(), instantiateBeforeHandler.getStateModesHandler());
+
+		eventNametoBeforeProcessor.put(StateStrings.Events.LTT_EVENT_IRQ_EXIT
+				.getInName(), instantiateBeforeHandler.getStateModesHandler());
+
+		eventNametoBeforeProcessor.put(
+				StateStrings.Events.LTT_EVENT_SOFT_IRQ_ENTRY.getInName(),
+				instantiateBeforeHandler.getStateModesHandler());
+
+		eventNametoBeforeProcessor.put(
+				StateStrings.Events.LTT_EVENT_SOFT_IRQ_EXIT.getInName(),
+				instantiateBeforeHandler.getStateModesHandler());
+
+		eventNametoBeforeProcessor.put(
+				StateStrings.Events.LTT_EVENT_SCHED_SCHEDULE.getInName(),
+				instantiateBeforeHandler.getBeforeSchedChangeHandler());
+
+		eventNametoBeforeProcessor.put(
+				StateStrings.Events.LTT_EVENT_PROCESS_EXIT.getInName(),
+				instantiateBeforeHandler.getProcessExitHandler());
+
+		eventNametoBeforeProcessor.put(
+				StateStrings.Events.LTT_EVENT_PROCESS_FREE.getInName(),
+				instantiateBeforeHandler.getProcessFreeHandler());
+
+		eventNametoBeforeProcessor.put(
+				StateStrings.Events.LTT_EVENT_STATEDUMP_END.getInName(),
+				instantiateBeforeHandler.getStateDumpEndHandler());
+
+
+		// AFTER HOOKS
+		eventNametoAfterProcessor.put(
+				StateStrings.Events.LTT_EVENT_SCHED_SCHEDULE.getInName(),
+				instantiateAfterHandler.getSchedChangeHandler());
+
+		eventNametoAfterProcessor.put(
+				StateStrings.Events.LTT_EVENT_PROCESS_FORK.getInName(),
+				instantiateAfterHandler.getProcessForkHandler());
+
+		eventNametoAfterProcessor.put(
+				StateStrings.Events.LTT_EVENT_PROCESS_EXIT.getInName(),
+				instantiateAfterHandler.getProcessExitHandler());
+
+		eventNametoAfterProcessor.put(StateStrings.Events.LTT_EVENT_EXEC
+				.getInName(), instantiateAfterHandler.getProcessExecHandler());
+
+		eventNametoAfterProcessor.put(
+				StateStrings.Events.LTT_EVENT_THREAD_BRAND.getInName(),
+				instantiateAfterHandler.GetThreadBrandHandler());
+
+		eventNametoAfterProcessor.put(
+				StateStrings.Events.LTT_EVENT_PROCESS_STATE.getInName(),
+				instantiateAfterHandler.getEnumProcessStateHandler());
+
+		finishProcesor = new FlowTRangeFinishUpdateHandler();
+	}
+
+	// ========================================================================
+	// Public methods
+	// =======================================================================
+	/**
+	 * The event processors are common to all traces an multiple instances will
+	 * use more memory unnecessarily
+	 * 
+	 * @return
+	 */
+	public static AbsEventProcessorFactory getInstance() {
+		if (instance == null) {
+			instance = new FlowTRangeUpdateFactory();
+		}
+		return instance;
+	}
+
+	@Override
+	public IEventProcessing getAfterProcessor(String eventType) {
+		return eventNametoAfterProcessor.get(eventType);
+	}
+
+	@Override
+	public IEventProcessing getBeforeProcessor(String eventType) {
+		return eventNametoBeforeProcessor.get(eventType);
+	}
+
+	@Override
+	public IEventProcessing getfinishProcessor() {
+		return finishProcesor;
+	}
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/messages.properties b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/messages.properties
new file mode 100644
index 0000000..13ed41c
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/messages.properties
@@ -0,0 +1,24 @@
+ControlFlowView.Action.Filter=Filter

+ControlFlowView.Action.Filter.ToolTip=Process Filter options

+ControlFlowView.Action.Legend=Legend

+ControlFlowView.Action.Legend.ToolTip=Show Legend

+ControlFlowView.Action.LoadData=LoadData

+ControlFlowView.Action.LoadData.ToolTip=Load data from external plug-in

+ControlFlowView.Action.NextEvent=NextEv

+ControlFlowView.Action.NextEvent.Tooltip=Next Event

+ControlFlowView.Action.NextProcess=NextProcess

+ControlFlowView.Action.NextProcess.ToolTip=Select Next Process

+ControlFlowView.Action.PrevEvent=PrevEv

+ControlFlowView.Action.PrevEvent.Tooltip=Previous Event

+ControlFlowView.Action.PreviousProcess=PreviousProcess

+ControlFlowView.Action.PreviousProcess.Tooltip=Select Previous Process

+ControlFlowView.Action.Reset=Reset

+ControlFlowView.Action.Reset.ToolTip=Reset the Time Scale to Default

+ControlFlowView.Action.Synchronize=Synchronise

+ControlFlowView.Action.Synchronize.ToolTip=Synchronise by listening to external API selection calls

+ControlFlowView.Action.ZoomIn=Zoom In

+ControlFlowView.Action.ZoomIn.Tooltip=Zoom In

+ControlFlowView.Action.ZoomOut=Zoom Out

+ControlFlowView.Action.ZoomOut.tooltip=Zoom Out

+ControlFlowView.msgSlogan=Control Flow View

+ControlFlowView.tmf.UI=org.eclipse.linuxtools.tmf.ui

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowModelFactory.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowModelFactory.java
new file mode 100644
index 0000000..25a14ff
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowModelFactory.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.controlflow.model;
+
+import org.eclipse.linuxtools.lttng.ui.views.common.ParamsUpdater;
+
+/**
+ * Instantiates the entry point classes to build the data model for this view
+ * 
+ * @author alvaro
+ * 
+ */
+public class FlowModelFactory {
+	// ========================================================================
+	// Data
+	// ========================================================================
+	private static FlowProcessContainer procContainer = null;
+	private static ParamsUpdater updater = null;
+	
+	
+	// ========================================================================
+	// Methods
+	// ========================================================================
+	/**
+	 * Get Process data container
+	 * @return
+	 */
+	public static FlowProcessContainer getProcContainer() {
+		if (procContainer == null) {
+			procContainer = new FlowProcessContainer();
+		}
+		return procContainer;
+	}
+	
+	public static ParamsUpdater getParamsUpdater() {
+		if (updater == null) {
+			updater = new ParamsUpdater();
+		}
+		return updater;
+	}
+	
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowProcessContainer.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowProcessContainer.java
new file mode 100644
index 0000000..65e0f36
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowProcessContainer.java
@@ -0,0 +1,257 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.controlflow.model;
+
+import java.util.HashMap;
+import java.util.Iterator;
+
+import org.eclipse.linuxtools.lttng.TraceDebug;
+import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventProcess;
+
+/**
+ * Contains the processes in use by the Control flow view
+ * 
+ * @author alvaro
+ * 
+ */
+public class FlowProcessContainer {
+	// ========================================================================
+	// Data
+	// ========================================================================
+	private final HashMap<ProcessKey, TimeRangeEventProcess> allProcesses = new HashMap<ProcessKey, TimeRangeEventProcess>();
+	private static Integer uniqueId = 0;
+	
+	// ========================================================================
+	// Constructor
+	// ========================================================================
+
+	/**
+	 * Package level constructor
+	 */
+	FlowProcessContainer() {
+
+	}
+
+	// ========================================================================
+	// Methods
+	// ========================================================================
+	/**
+	 * Interface to add a new process.<p>
+	 * 
+	 * Note : Process with the same key will be overwritten, it's calling function job to make sure the new process is unique.
+	 * 
+	 * @param newProcess   The process to add
+	 */
+	public void addProcess(TimeRangeEventProcess newProcess) {
+		if (newProcess != null) {
+			allProcesses.put(new ProcessKey(newProcess), newProcess);
+		}
+	}
+	
+	/**
+     * Request a unique ID
+     * 
+     * @return Integer
+     */
+    public Integer getUniqueId() {
+        return uniqueId++;
+    }
+    
+    /**
+     * This method is intended for read only purposes in order to keep the
+     * internal data structure in synch
+     * 
+     * @return TimeRangeEventProcess[]
+     */
+	public TimeRangeEventProcess[] readProcesses() {
+		
+	    // This allow us to return an Array of the correct type of the exact correct dimension, without looping
+		return allProcesses.values().toArray(new TimeRangeEventProcess[allProcesses.size()]);
+	}
+	
+	/**
+     * Clear the children information for processes related to a specific trace
+     * e.g. just before refreshing data with a new time range
+     * 
+     * @param traceId   The trace unique id (trace name?) on which we need to eliminate children.
+     */
+	public void clearChildren(String traceId) {
+	    TimeRangeEventProcess process = null;
+        Iterator<ProcessKey> iterator = allProcesses.keySet().iterator();
+        
+        while (iterator.hasNext()) {
+            process = allProcesses.get(iterator.next());
+            
+            if (process.getTraceID().equals(traceId)) {
+                // Reset clear childEventComposites() and traceEvents()
+                // Also restore the nextGoodTime to the insertionTime for the drawing
+                process.reset();
+            }
+        }
+	}
+	
+	/**
+     * Clear all process items
+     */
+    public void clearProcesses() {
+        allProcesses.clear();
+    }
+	
+    /**
+     * Remove the process related to a specific trace e.g. during trace
+     * removal
+     * 
+     * @param traceId   The trace unique id (trace name?) on which we want to remove process
+     */
+	public void removeProcesses(String traceId) {
+	    ProcessKey iterKey = null;
+
+        Iterator<ProcessKey> iterator = allProcesses.keySet().iterator();
+        while (iterator.hasNext()) {
+            iterKey = iterator.next();
+            
+            if (allProcesses.get(iterKey).getTraceID().equals(traceId)) {
+                allProcesses.remove(iterKey);
+            }
+        }
+	}
+	
+    /**
+     * Search by keys (pid, cpuId, traceId and creationTime)<p>
+     * 
+     * A match is returned if the four arguments received match an entry
+     *  Otherwise null is returned
+     *  
+     * @param searchedPid       The processId (Pid) we are looking for
+     * @param searchedCpuId     The cpu Id we are looking for
+     * @param searchedTraceID   The traceId (trace name?) we are looking for
+     * @param searchedCreationtime The creation time we are looking for
+     * 
+     * @return TimeRangeEventProcess
+     */
+    public TimeRangeEventProcess findProcess(Long searchedPid, Long searchedCpuId, String searchedTraceID, Long searchedCreationtime) {
+    	// Get the TimeRangeEventProcess associated to a key we create here
+        TimeRangeEventProcess foundProcess = allProcesses.get( new ProcessKey(searchedPid, searchedCpuId, searchedTraceID, searchedCreationtime) );
+    	 
+        return foundProcess;
+    }
+}
+
+
+class ProcessKey {
+    private TimeRangeEventProcess valueRef = null;
+    
+    private Long    pid = null;
+    private Long    cpuId = null;
+    private String  traceId = null;
+    private Long    creationtime = null;
+    
+    @SuppressWarnings("unused")
+    private ProcessKey() { }
+    
+    public ProcessKey(TimeRangeEventProcess newRef) {
+        valueRef = newRef;
+    }
+    
+    public ProcessKey(Long newPid, Long newCpuId, String newTraceId, Long newCreationTime) {
+        pid = newPid;
+        cpuId = newCpuId;
+        traceId = newTraceId;
+        creationtime = newCreationTime;
+    }
+    
+    @Override
+    public boolean equals(Object obj) {
+        boolean isSame = false;
+        
+        if ( obj instanceof ProcessKey ) {
+        	ProcessKey procKey = (ProcessKey) obj;
+        	
+        	if ( valueRef != null ) {
+	            if ( (procKey.getPid().equals(valueRef.getPid()) ) &&
+	                 (procKey.getTraceId().equals(valueRef.getTraceID()) ) &&
+	                 (procKey.getCpuId().equals(valueRef.getCpu()) ) &&
+	                 (procKey.getCreationtime().equals(valueRef.getCreationTime()) )  )
+	            {
+	                isSame = true;
+	            }
+        	}
+        	else {
+        		if ( (procKey.getPid().equals(this.pid ) ) &&
+   	                 (procKey.getTraceId().equals(this.traceId ) ) &&
+   	                 (procKey.getCpuId().equals(this.cpuId ) ) &&
+   	                 (procKey.getCreationtime().equals(this.creationtime ) )  )
+   	            {
+   	                isSame = true;
+   	            }
+        	}
+        }
+        else {
+        	TraceDebug.debug("ERROR : The given key is not of the type ProcessKey!" + obj.getClass().toString());
+        }
+        
+        return isSame;
+    }
+    
+    // *** WARNING : Everything in there work because the check "valueRef != null" is the same for ALL getter
+    // Do NOT change this check without checking.
+    public Long getPid() {
+    	if ( valueRef != null ) {
+            return valueRef.getPid();
+        }
+        else {
+            return pid;
+        }
+    }
+
+    public Long getCpuId() {
+        if ( valueRef != null ) {
+            return valueRef.getCpu();
+        }
+        else {
+            return cpuId;
+        }
+    }
+    
+    public String getTraceId() {
+        if ( valueRef != null ) {
+            return valueRef.getTraceID();
+        }
+        else {
+            return traceId;
+        }
+    }
+    
+    public Long getCreationtime() {
+        if ( valueRef != null ) {
+            return valueRef.getCreationTime();
+        }
+        else {
+            return creationtime;
+        }
+    }
+    
+    @Override
+    public int hashCode() {
+    	return this.toString().hashCode();
+    }
+    
+    
+    @Override
+    public String toString() {
+        if ( valueRef != null ) {
+            return (valueRef.getPid().toString() + ":" + valueRef.getCpu().toString() + ":" + valueRef.getTraceID().toString() + ":" + valueRef.getCreationTime().toString());
+        } 
+        
+        return (pid.toString() + ":" + cpuId.toString() + ":" + traceId.toString() + ":" + creationtime.toString());
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsView.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsView.java
new file mode 100644
index 0000000..306adfe
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsView.java
@@ -0,0 +1,133 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.events;
+
+import org.eclipse.linuxtools.lttng.event.LttngEventContent;
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.ui.views.TmfEventsView;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+
+/**
+ * <b><u>EventsView</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class EventsView extends TmfEventsView {
+
+    public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.events";
+
+    // ------------------------------------------------------------------------
+    // Table data
+    // ------------------------------------------------------------------------
+
+    // Table column names
+    private final String TIMESTAMP_COLUMN = "Timestamp";
+    private final String SOURCE_COLUMN    = "Source";
+    private final String TYPE_COLUMN      = "Type";
+    private final String REFERENCE_COLUMN = "Reference";
+    private final String CONTENT_COLUMN   = "Content";
+    private final String[] columnProperties =  new String[] {
+        TIMESTAMP_COLUMN,
+        SOURCE_COLUMN,
+        TYPE_COLUMN,
+        REFERENCE_COLUMN,
+        CONTENT_COLUMN
+    };
+
+    // Column data
+    private class ColumnData {
+        public final String header;
+        public final int    width;
+        public final int    alignment;
+
+        public ColumnData(String h, int w, int a) {
+            header = h;
+            width = w;
+            alignment = a;
+        }
+    };
+
+    private ColumnData[] columnData = new ColumnData[] {
+        new ColumnData(columnProperties[0], 125, SWT.LEFT),
+        new ColumnData(columnProperties[1], 100, SWT.LEFT),
+        new ColumnData(columnProperties[2], 200, SWT.LEFT),
+        new ColumnData(columnProperties[3], 200, SWT.LEFT),
+        new ColumnData(columnProperties[4], 100, SWT.LEFT)
+    };
+
+    // ------------------------------------------------------------------------
+    // Constructor
+    // ------------------------------------------------------------------------
+
+    public EventsView() {
+    	super(1);
+    }
+
+	/**
+	 * @param table
+	 * 
+	 * FIXME: Add support for column selection
+	 */
+	@Override
+	protected void createColumnHeaders(Table table) {
+        for (int i = 0; i < columnData.length; i++) {
+            final TableColumn column = new TableColumn(table, columnData[i].alignment, i);
+            column.setText(columnData[i].header);
+            column.setWidth(columnData[i].width);
+            // TODO: Investigate why the column resizing doesn't work by default
+            // Anything to do with SWT_VIRTUAL?
+            column.addSelectionListener(new SelectionListener() {
+				public void widgetDefaultSelected(SelectionEvent e) {
+					// TODO Auto-generated method stub
+				}
+				public void widgetSelected(SelectionEvent e) {
+					column.pack();
+				}
+            });
+        }
+	}
+
+    /**
+     * @param event
+     * @return
+     */
+    @Override
+	protected String[] extractItemFields(TmfEvent event) {
+        String[] fields = new String[0];
+        
+        if (event != null) {
+            fields = new String[] {
+                    event.getTimestamp().toString(),
+                    event.getSource().toString(),
+                    event.getType().toString(),
+                    event.getReference().toString(),
+                    ((LttngEventContent)event.getContent()).toString() 
+                };
+        }
+        return fields;
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+	public String toString() {
+    	return "[EventsView]";
+    }
+
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java
new file mode 100644
index 0000000..4de5699
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.histogram;
+
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.part.ViewPart;
+
+/**
+ * <b><u>HistogramView</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class HistogramView extends ViewPart {
+
+    public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.histogram";
+
+	/**
+	 * 
+	 */
+	public HistogramView() {
+		// TODO Auto-generated constructor stub
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
+	 */
+	@Override
+	public void createPartControl(Composite parent) {
+		// TODO Auto-generated method stub
+
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
+	 */
+	@Override
+	public void setFocus() {
+		// TODO Auto-generated method stub
+
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/LTTngProjectNature.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/LTTngProjectNature.java
new file mode 100644
index 0000000..2e14ccd
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/LTTngProjectNature.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectNature;
+import org.eclipse.core.runtime.CoreException;
+
+/**
+ * <b><u>LTTngProjectNature</u></b>
+ * <p>
+ * This is really a marker for the LTTng projects.
+ */
+public class LTTngProjectNature implements IProjectNature {
+
+	public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.project.LTTngProjectNature";
+
+	private IProject fProject;
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.resources.IProjectNature#configure()
+	 */
+	public void configure() throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.resources.IProjectNature#deconfigure()
+	 */
+	public void deconfigure() throws CoreException {
+		// TODO Auto-generated method stub
+
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.resources.IProjectNature#getProject()
+	 */
+	public IProject getProject() {
+		return fProject;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.resources.IProjectNature#setProject(org.eclipse.core.resources.IProject)
+	 */
+	public void setProject(IProject project) {
+		fProject = project;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/ProjectView.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/ProjectView.java
new file mode 100644
index 0000000..6b02df6
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/ProjectView.java
@@ -0,0 +1,202 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project;
+
+import java.io.FileNotFoundException;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TreeSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.trace.LTTngTrace;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.ILTTngProjectTreeNode;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngExperimentNode;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngProjectContentProvider;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngProjectLabelProvider;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngProjectRoot;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngTraceNode;
+import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
+import org.eclipse.linuxtools.tmf.experiment.TmfExperimentSelectedSignal;
+import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
+import org.eclipse.linuxtools.tmf.ui.views.TmfView;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Tree;
+
+/**
+ * <b><u>ProjectView</u></b>
+ * <p>
+ * The ProjectView keeps track of the LTTng projects in the workspace.
+ */
+public class ProjectView extends TmfView {
+
+    public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.project";
+
+    // ------------------------------------------------------------------------
+    // Main data structures
+    // ------------------------------------------------------------------------
+
+    private TreeViewer fViewer;
+    private LTTngProjectRoot fProjectRoot;
+    private TmfExperiment<LttngEvent> fSelectedExperiment = null;
+
+    private IWorkspace fWorkspace;
+    private IResourceChangeListener fResourceChangeListener;
+
+    // ------------------------------------------------------------------------
+    // View refresher
+    // ------------------------------------------------------------------------
+
+    // Perform updates on the UI thread
+    private Runnable fViewRefresher = new Runnable() {
+    	public void run() {
+    		if (fViewer != null) {
+    			Object[] elements = fViewer.getExpandedElements();
+    			fViewer.refresh();
+    			fViewer.setExpandedElements(elements);
+    		}
+    	}
+    };
+
+    public LTTngProjectRoot getRoot() {
+    	return fProjectRoot;
+    }
+   
+    // ------------------------------------------------------------------------
+    // Constructor
+    // ------------------------------------------------------------------------
+
+	public ProjectView() {
+		
+		super("ProjectView");
+        fProjectRoot = new LTTngProjectRoot(this);
+
+		fWorkspace = ResourcesPlugin.getWorkspace();
+		fResourceChangeListener = new IResourceChangeListener() {
+            public void resourceChanged(IResourceChangeEvent event) {
+                if (event.getType() == IResourceChangeEvent.POST_CHANGE) {
+                	fProjectRoot.refreshChildren();
+                	refresh();
+                }
+            }            
+        };
+        fWorkspace.addResourceChangeListener(fResourceChangeListener);
+	}
+
+	public void refresh() {
+       	Tree tree = fViewer.getTree();
+       	if (tree != null && !tree.isDisposed())
+       		tree.getDisplay().asyncExec(fViewRefresher);
+	}
+
+	public void setSelection(ILTTngProjectTreeNode node) {
+		fViewer.setSelection(new StructuredSelection(node), true);
+	}
+
+    @Override
+	public void dispose() {
+    	fWorkspace.removeResourceChangeListener(fResourceChangeListener);
+    }
+
+	@Override
+	public void createPartControl(Composite parent) {
+
+		fViewer = new TreeViewer(parent, SWT.SINGLE);
+        fViewer.setContentProvider(new LTTngProjectContentProvider());
+        fViewer.setSorter(new ViewerSorter());
+        fViewer.setLabelProvider(new LTTngProjectLabelProvider());
+        fViewer.setInput(fProjectRoot);
+
+        getSite().setSelectionProvider(fViewer);
+        hookMouse();
+
+        createContextMenu();
+	}
+
+    // ------------------------------------------------------------------------
+    // ViewPart
+    // ------------------------------------------------------------------------
+
+	@Override
+	public String toString() {
+		return "[ProjectView]";
+	}
+
+    // ------------------------------------------------------------------------
+    // hookMouse
+    // ------------------------------------------------------------------------
+
+    private void hookMouse() {
+        fViewer.getTree().addMouseListener(new MouseAdapter() {
+        	@Override
+			public void mouseDoubleClick(MouseEvent event) {
+                TreeSelection selection = (TreeSelection) fViewer.getSelection();
+                Object element = selection.getFirstElement();
+                if (element instanceof LTTngExperimentNode) {
+                	LTTngExperimentNode experiment = (LTTngExperimentNode) element;
+                	selectExperiment(experiment);                
+                }
+            }
+        });
+    }
+
+	private boolean waitForCompletion = true;
+
+	public void selectExperiment(LTTngExperimentNode experiment) {
+    	String expId = experiment.getName();
+        if (fSelectedExperiment != null)
+        	fSelectedExperiment.deregister();
+        try {
+        	LTTngTraceNode[] traceEntries = experiment.getTraces();
+        	int nbTraces = traceEntries.length;
+        	ITmfTrace[] traces = new ITmfTrace[nbTraces];
+        	for (int i = 0; i < nbTraces; i++) {
+        		IResource res = traceEntries[i].getFolder();
+        		String location = res.getLocation().toOSString();
+        		ITmfTrace trace = new LTTngTrace(location, waitForCompletion);
+                traces[i] = trace;
+        	}
+            fSelectedExperiment = new TmfExperiment<LttngEvent>(LttngEvent.class, expId, traces);
+            fSelectedExperiment.indexExperiment(waitForCompletion);
+            broadcast(new TmfExperimentSelectedSignal<LttngEvent>(this, fSelectedExperiment));
+        } catch (FileNotFoundException e) {
+            return;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // createContextMenu
+    // ------------------------------------------------------------------------
+
+	// Populated from the plug-in
+    private void createContextMenu() {
+        MenuManager menuManager = new MenuManager("#PopupMenu");
+        menuManager.setRemoveAllWhenShown(true);
+        Menu menu = menuManager.createContextMenu(fViewer.getControl());
+        fViewer.getControl().setMenu(menu);
+        getSite().registerContextMenu(menuManager, fViewer);
+    }
+			
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/AddTraceWizard.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/AddTraceWizard.java
new file mode 100644
index 0000000..eac20e8
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/AddTraceWizard.java
@@ -0,0 +1,94 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.dialogs;
+
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngExperimentNode;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngProjectNode;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngTraceNode;
+import org.eclipse.ui.IImportWizard;
+import org.eclipse.ui.IWorkbench;
+
+/**
+ * <b><u>AddTraceWizard</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class AddTraceWizard extends Wizard implements IImportWizard {
+
+    private LTTngProjectNode fProject;
+    private LTTngExperimentNode fExperiment;
+    private AddTraceWizardPage fMainPage;
+
+    /**
+     * @param project
+     */
+    public AddTraceWizard(LTTngProjectNode project, LTTngExperimentNode experiment) {
+    	fProject = project;
+    	fExperiment = experiment;
+    }
+
+    /* (non-Javadoc)
+	 * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
+	 */
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+    	setWindowTitle("Adding traces to experiment");
+	}
+
+    /* (non-Javadoc)
+     * @see org.eclipse.jface.wizard.Wizard#addPages()
+     */
+    @Override
+	public void addPages() {
+        super.addPages();
+        fMainPage = new AddTraceWizardPage(fProject, "Some string");
+        addPage(fMainPage);
+    }
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.wizard.Wizard#performFinish()
+	 */
+	@Override
+	public boolean performFinish() {
+
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		IFolder experimentFolder = fExperiment.getFolder();
+
+		LTTngTraceNode[] traces = fMainPage.getSelection();
+		for (LTTngTraceNode trace : traces) {
+			try {
+				IFolder folder = experimentFolder.getFolder(trace.getName());
+				IPath location = trace.getFolder().getLocation();
+				if (workspace.validateLinkLocation(folder, location).isOK()) {
+					folder.createLink(location, IResource.REPLACE, null);
+					fExperiment.addTrace(folder);
+				}
+				else {
+					System.out.println("Problem");
+				}
+			} catch (CoreException e) {
+				e.printStackTrace();
+			}
+		}
+
+		return true;
+	}	
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/AddTraceWizardPage.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/AddTraceWizardPage.java
new file mode 100644
index 0000000..ded48a0
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/AddTraceWizardPage.java
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.dialogs;
+
+import java.util.Vector;
+
+import org.eclipse.jface.viewers.CheckboxTableViewer;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngProjectNode;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngTraceNode;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+
+/**
+ * <b><u>AddTraceWizardPage</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class AddTraceWizardPage extends WizardPage {
+
+	private LTTngProjectNode fProject;
+	private CheckboxTableViewer fCheckboxTableViewer;
+	
+	protected AddTraceWizardPage(LTTngProjectNode project, String pageName) {
+		super(pageName);
+		setTitle("Select traces");
+		setDescription("Select the traces to add to the experiment");
+		fProject = project;
+	}
+
+	public void createControl(Composite parent) {
+		Composite container = new Composite(parent, SWT.NULL);
+		container.setLayout(new FormLayout());
+		setControl(container);
+
+		fCheckboxTableViewer = CheckboxTableViewer.newCheckList(container, SWT.BORDER);
+		fCheckboxTableViewer.setContentProvider(new DialogTraceContentProvider());
+		fCheckboxTableViewer.setLabelProvider(new DialogTraceLabelProvider());
+
+		final Table table = fCheckboxTableViewer.getTable();
+		final FormData formData = new FormData();
+		formData.bottom = new FormAttachment(100, 0);
+		formData.right  = new FormAttachment(100, 0);
+		formData.top    = new FormAttachment(0, 0);
+		formData.left   = new FormAttachment(0, 0);
+		table.setLayoutData(formData);
+		table.setHeaderVisible(true);
+
+		final TableColumn tableColumn = new TableColumn(table, SWT.NONE);
+		tableColumn.setWidth(200);
+		tableColumn.setText("Trace");
+
+        fCheckboxTableViewer.setInput(fProject.getTracesFolder());
+	}
+
+	public LTTngTraceNode[] getSelection() {
+		Vector<LTTngTraceNode> traces = new Vector<LTTngTraceNode>();
+		Object[] selection = fCheckboxTableViewer.getCheckedElements();
+		for (Object sel : selection) {
+			if (sel instanceof LTTngTraceNode)
+				traces.add((LTTngTraceNode) sel);
+		}
+		LTTngTraceNode[] result = new LTTngTraceNode[traces.size()];
+		traces.toArray(result); 
+		return result;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/DialogTraceContentProvider.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/DialogTraceContentProvider.java
new file mode 100644
index 0000000..d3efae9
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/DialogTraceContentProvider.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.dialogs;
+
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngTraceFolderNode;
+
+/**
+ * <b><u>LTTngTracesContentProvider</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class DialogTraceContentProvider implements IStructuredContentProvider {
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
+	 */
+	public Object[] getElements(Object inputElement) {
+		if (inputElement instanceof LTTngTraceFolderNode) {
+			LTTngTraceFolderNode folder = (LTTngTraceFolderNode) inputElement;
+			return folder.getTraces();
+		}
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
+	 */
+	public void dispose() {
+		// TODO Auto-generated method stub
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+	 */
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		// TODO Auto-generated method stub
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/DialogTraceLabelProvider.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/DialogTraceLabelProvider.java
new file mode 100644
index 0000000..d3ff08b
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/DialogTraceLabelProvider.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.dialogs;
+
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngTraceNode;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * <b><u>LTTngTracesLabelProvider</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class DialogTraceLabelProvider extends LabelProvider implements ITableLabelProvider {
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
+	 */
+	public Image getColumnImage(Object element, int columnIndex) {
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
+	 */
+	public String getColumnText(Object element, int columnIndex) {
+		if (element instanceof LTTngTraceNode) {
+			LTTngTraceNode entry = (LTTngTraceNode) element;
+			switch (columnIndex) {
+				case 0:
+					return entry.getName();
+				default:
+					return null;
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizard.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizard.java
new file mode 100644
index 0000000..77dd476
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizard.java
@@ -0,0 +1,117 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.dialogs;
+
+import java.util.List;
+
+import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.ui.IImportWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.ide.IDE;
+import org.eclipse.ui.internal.WorkbenchPlugin;
+import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
+import org.eclipse.ui.internal.wizards.datatransfer.DataTransferMessages;
+
+/**
+ * <b><u>ImportTraceWizard</u></b>
+ * <p>
+ *
+ * TODO: Implement me. Please.
+ */
+@SuppressWarnings("restriction")
+public class ImportTraceWizard extends Wizard implements IImportWizard {
+
+    private IWorkbench fWorkbench;
+    private IStructuredSelection fSelection;
+    private ImportTraceWizardPage fMainPage;
+
+	/**
+     * 
+     */
+    public ImportTraceWizard() {
+        IDialogSettings workbenchSettings = WorkbenchPlugin.getDefault().getDialogSettings();
+        IDialogSettings section = workbenchSettings.getSection("LTTngTraceImportWizard");
+        if (section == null) {
+			section = workbenchSettings.addNewSection("LTTngTraceImportWizard");
+		}
+        
+        setDialogSettings(section);
+    }
+
+    /* (non-Javadoc)
+     * @see org.eclipse.jface.wizard.Wizard#addPages()
+     */
+    @Override
+	public void addPages() {
+        super.addPages();
+        fMainPage = new ImportTraceWizardPage(fWorkbench, fSelection);
+        addPage(fMainPage);
+    }
+
+    /* (non-Javadoc)
+     * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
+     */
+	@SuppressWarnings("rawtypes")
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+        fWorkbench = workbench;
+        fSelection = selection;
+
+        List selectedResources = IDE.computeSelectedResources(selection);
+        if (!selectedResources.isEmpty()) {
+            fSelection = new StructuredSelection(selectedResources);
+        }
+        
+        setWindowTitle(DataTransferMessages.DataTransfer_importTitle);
+        setDefaultPageImageDescriptor(IDEWorkbenchPlugin.getIDEImageDescriptor("wizban/importdir_wiz.png"));
+        setNeedsProgressMonitor(true);
+    }
+	
+    public ImportTraceWizardPage getMainPage() {
+		return fMainPage;
+	}
+	
+	/**
+	 * performFinish is called after the "finish" button is pressed in the import wizard
+	 * If we return "false", the wizard will not close. 
+	 * 
+	 * We perform here version check on the imported LTTng trace
+	 * 
+	 */
+    @Override
+	public boolean performFinish() {
+    	
+    	if ( fMainPage.getDestination().equals( fMainPage.getInitialContainerString() ) ) {
+    		
+    		String errMessage[] = { "Error : import destination is wrong." }; 
+			errMessage = fMainPage.extendErrorMessage(errMessage, "");
+			errMessage = fMainPage.extendErrorMessage(errMessage, "You cannot import your trace directly into the \"" + fMainPage.getInitialContainerString() + "\"");
+			errMessage = fMainPage.extendErrorMessage(errMessage, "The trace has to be into a subdirectly, like \"" + fMainPage.getInitialContainerString() + "/MyTrace\"" );
+			errMessage = fMainPage.extendErrorMessage(errMessage, "");
+			errMessage = fMainPage.extendErrorMessage(errMessage, "Please change the destination folder.");
+			fMainPage.showVersionErrorPopup(errMessage);
+    		
+			return false;
+    	}
+    	
+    	return fMainPage.finish();
+    }
+    
+    @Override
+	public boolean canFinish() {
+    	return fMainPage.isSelectedElementsValidLttngTraces();
+    }
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizardPage.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizardPage.java
new file mode 100644
index 0000000..5c8e041
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizardPage.java
@@ -0,0 +1,342 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.dialogs;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.linuxtools.lttng.LttngException;
+import org.eclipse.linuxtools.lttng.trace.LTTngTraceVersion;
+import org.eclipse.linuxtools.lttng.ui.views.project.handlers.TraceErrorHandler;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngProjectNode;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.internal.wizards.datatransfer.WizardFileSystemResourceImportPage1;
+
+/**
+ * <b><u>ImportTraceWizardPage</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+@SuppressWarnings("restriction")
+public class ImportTraceWizardPage extends WizardFileSystemResourceImportPage1 {
+	
+	private boolean isContainerSet = false;
+	private String  initialContainerString = "";
+	private String  selectedSourceDirectory = "";
+	
+	public ImportTraceWizardPage(IWorkbench workbench, IStructuredSelection selection) {
+		super(workbench, selection);
+		
+		LTTngProjectNode folder = (LTTngProjectNode) selection.getFirstElement();
+		String path = folder.getTracesFolder().getFolder().getFullPath().toOSString();
+		
+		initialContainerString = path;
+		setContainerFieldValue(path);
+	}
+	
+	
+	public String getTraceDirectory() {
+		String tmpPath = "";
+		if ( (getSourceDirectory() != null) && (getSourceDirectory().getName() != null) ) {
+			tmpPath = this.getSourceDirectory().getName().toString();
+		}
+		
+		return tmpPath;
+	}
+	
+	public String getInitialContainerString() {
+		return initialContainerString;
+	}
+	
+	public String getTracepath() {
+		String tmpPath = "";
+		if ( (getSourceDirectory() != null) && (getSourceDirectory().getPath() != null) ) {
+			tmpPath = this.getSourceDirectory().getPath().toString();
+		}
+		
+		return tmpPath;
+	}
+	
+	public String getDestination() {
+		String returnPath = null;
+		
+		if ( getContainerFullPath() != null ) {
+			returnPath = getContainerFullPath().toString();
+		}
+		return returnPath;
+	}
+	
+	public boolean isSelectedElementsValidLttngTraces() {
+		boolean returnedValue = true;
+		
+		// We don't want to test until something is selected
+		if ( selectionGroup.getCheckedElementCount() > 0 ) {
+			
+			// We don't want to revalidate each time, only want a new directory is selected
+			if ( ! selectedSourceDirectory.equals(getSourceDirectory().getAbsolutePath().toString()) )
+			{
+				try {
+					if ( isPathLttngTrace( getSourceDirectory().getAbsolutePath() ) == false ) {
+						returnedValue = false;
+						selectedSourceDirectory = "";
+						
+						String errMessage[] = { "Couldn't get LTTng version number for the path : " }; 
+						errMessage = extendErrorMessage(errMessage, getSourceDirectory().getAbsolutePath() );
+						errMessage = extendErrorMessage(errMessage, "");
+		    			errMessage = extendErrorMessage(errMessage, "Verify that the directory is a valid LTTng trace directory.");
+		    			errMessage = extendErrorMessage(errMessage, "Make sure the top directory is the trace itself and not any of its parent.");
+		    			showVersionErrorPopup(errMessage);
+		    			selectionGroup.setAllSelections(false);
+					}
+					else {
+						selectedSourceDirectory = getSourceDirectory().getAbsolutePath();
+						
+						if ( isContainerSet == false ) {
+							isContainerSet = true;
+							
+							if ( ! getDestination().toString().equals( getInitialContainerString() + "/" + getTraceDirectory() )  ) {
+								// *** HACK ***
+						    	// Force a sane destination to avoid imported files to end up in the root of the "Traces/" directory
+						    	setContainerFieldValue(getInitialContainerString() + "/" + getTraceDirectory());
+							}
+						}
+					}
+		    	}
+		    	catch (LttngException e) {
+		    		String[] errorMessages = e.toString().split("\n");
+		    		String exceptionMessage[] = { "Version check failed for the path : ", this.getTracepath(), "", "Returned error was :" }; 
+		    		
+		    		for ( int pos=0; pos<errorMessages.length; pos++) {
+		    			exceptionMessage = extendErrorMessage(exceptionMessage, errorMessages[pos]);
+		    		}
+		    		
+		    		showVersionErrorPopup(exceptionMessage);
+		    		selectionGroup.setAllSelections(false);
+		    		returnedValue = false;
+		    	}
+			}
+		}
+		isContainerSet = false;
+		
+    	return returnedValue;
+	}
+	
+	
+	public boolean isPathLttngTrace(String path) throws LttngException {
+		
+		boolean returnedValue = true;
+		
+		// Ask for a LttngTraceVersion for the given path
+		LTTngTraceVersion traceVersion = new LTTngTraceVersion( path );
+		
+		// If this is not a valid LTTng trace
+		if ( traceVersion.isValidLttngTrace() == false ) {
+    		returnedValue = false;
+    	}
+		
+		return returnedValue;
+	}
+	
+	
+	public String[] extendErrorMessage(String[] oldErrorMessage, String lineToAdd) {
+		String tmSwapMessage[] = new String[oldErrorMessage.length + 1];
+		for ( int pos = 0; pos<oldErrorMessage.length; pos++) {
+			tmSwapMessage[pos] = oldErrorMessage[pos];
+		}
+		tmSwapMessage[oldErrorMessage.length] = lineToAdd;
+		
+		return tmSwapMessage;
+	}
+	
+	
+    /**
+     * This function will show a version error popup that contain the given message.
+     * 
+     */
+    public void showVersionErrorPopup(String[] errMessages) {
+    	TraceErrorHandler errorDialog = new TraceErrorHandler(errMessages);
+    	try {
+    		errorDialog.execute(null);
+    	}
+    	catch (Exception e) {
+    		e.printStackTrace();
+    	}
+    }
+       
+    
+//    // *** HACK HACK AND HACK ***
+//    // Everything below is a proof of concept on how we could tweak the import wizard to act according to our plan
+//    // Uncomment everything below if you want to test it, but please, does not put any of this into production
+//    @SuppressWarnings({ "unchecked", "rawtypes" })
+//	@Override
+//    public boolean finish() {
+//        if (!ensureSourceIsValid()) {
+//			return false;
+//		}
+//        saveWidgetValues();
+//        
+//        Iterator resourcesEnum = getSelectedResources().iterator();
+//        List listRealFiles = new ArrayList();
+//        
+//        // ****
+//        // HACK #1 : 
+//        // We need to convert everything into java.io.File because ImportOperation does NOT support FileSystemElement
+//        while (resourcesEnum.hasNext()) {
+//        	FileSystemElement tmpFileElement = ((FileSystemElement)resourcesEnum.next());
+//        	java.io.File tmpRealFile = new java.io.File(tmpFileElement.getFileSystemObject().toString());
+//        	
+//            listRealFiles.add(tmpRealFile);
+//        }
+//        
+//        if (listRealFiles.size() > 0) {
+//        	// Call import ressources (code is below)
+//			return importResources(listRealFiles);
+//		}
+//
+//        MessageDialog.openInformation(getContainer().getShell(),
+//                DataTransferMessages.DataTransfer_information,
+//                DataTransferMessages.FileImport_noneSelected);
+//        return false;
+//    }
+//    
+//    @Override
+//    protected boolean importResources(List fileSystemObjects) {
+//    	// *** Explanation of the hackssss
+//    	// We want the import wizard to import everything in the form of : 
+//    	//		trace1/ -> tracefiles*
+//    	//
+//    	// However, the wizard is too dumb to do the following and will recreate the full architecture the user selected.
+//    	// So, depending what the user select, we could end up with something like : 
+//    	// 		home/user/somewhere/trace1/ -> tracefiles*
+//    	//
+//    	// Since there is nothing to do with that, we need to change the "source" and the "to-import files" to reflect this.
+//    	// Basically, from the case above, the "source" should be changed to "trace1/" and "to-import files" 
+//    	//		should have the correct parent so the wizard can still find them
+//    	//
+//    	// Let's see how fun it is to do with mr. import wizard.
+//    	
+//    	
+//    	List listRealFilesShortPath = new ArrayList();
+//    	java.io.File newFullSource = getSourceDirectory();
+//    	
+//    	// We will loop for every "to-import full path files" we have and recreate "short path" files
+//    	// Mean, the current path of the file is currently something like : 
+//    	//		Path : /home/billybob/mytraces/trace1/metadata_0  	Parent : null
+//    	// And we want something less dumb like : 
+//    	//		Path : metadata_0 									Parent : /home/billybob/mytraces/trace1/
+//    	for (int pos=0; pos<fileSystemObjects.size(); pos++) {
+//    		java.io.File oldFile  = (java.io.File)fileSystemObjects.get(pos);
+//    		java.io.File newShortPathFile = oldFile;
+//    		
+//    		// ***
+//    		// HACK #2 : We need to ajust the source of the files!
+//    		// Our current source is probably like : 
+//    		//		(Source) 	Path : / (or null?)
+//    		//		(Files)		Path : /home/billybob/mytraces/trace1/metadata_0  	Parent : null
+//    		// We want something like : 
+//    		//		(Source) 	Path : /home/billybob/mytraces/trace1/
+//    		//    	(Files)		Path : metadata_0  									Parent : /home/billybob/mytraces/trace1/
+//    		// 
+//    		// *BUG : However, we might need MULTIPLE sources since we could have MULTIPLE traces selected... 
+//    		//	THIS IS NOT HANDLED YET.
+//    		
+//    		// Make a new path like -> /home/billybob/mytraces/trace1/
+//    		String newParent = oldFile.getAbsolutePath().substring(0, oldFile.getAbsolutePath().lastIndexOf("/") );
+//    		
+//    		// Create a "short path file" with the good parent from it. This give : 
+//    		// (Files)	Path : metadata_0  Parent : /home/billybob/mytraces/trace1/
+//			newShortPathFile = new java.io.File(newParent, oldFile.getName() );
+//			
+//			// Create a new "full source" directory -> /home/billybob/mytraces/trace1/
+//			newFullSource = new java.io.File( newParent );
+//			
+//			// Add our pretty file to the new List
+//    		listRealFilesShortPath.add(newShortPathFile);
+//    	}
+//    	
+//    	// ***
+//    	// HACK #3
+//    	// Now that we have everything, we need to AJUST THE DESTINATION
+//    	// To do so, we ajust the "ContainerValue" text field.
+//    	//
+//    	// Right now we have something like : 
+//    	//		Path -> /where/to/import/
+//    	//    	(Files)		Path : metadata_0  	Parent : /home/billybob/mytraces/trace1/
+//		// We want something like : 
+//    	//		Path -> /where/to/import/trace1/
+//    	//    	(Files)		Path : metadata_0  	Parent : /home/billybob/mytraces/trace1/
+//    	//
+//    	
+//    	// We take the current text field and we add the "full source" name
+//    	//	Note : the "name" is the last directory name so "trace1" is returned for a path like "/home/billybob/mytraces/trace1/"
+//    	setContainerFieldValue(getContainerFullPath() + "/" + newFullSource.getName());
+//    	
+//    	/*
+//    	System.out.println("\n\n" + getContainerFullPath());
+//    	System.out.println(newFullSource);
+//    	System.out.println(FileSystemStructureProvider.INSTANCE);
+//    	System.out.println(this.getContainer());
+//    	System.out.println(fileSystemObjects);
+//    	*/
+//    	
+//    	// Finally import !!
+//        ImportOperation operation = new ImportOperation(getContainerFullPath(), newFullSource, FileSystemStructureProvider.INSTANCE, this, listRealFilesShortPath);
+//        
+//        operation.setContext(getShell());
+//        return executeImportOperation(operation);
+//    }
+//    
+//    // This function test if the selected directory are LTTng traces
+//    // This one is made to work with the madness above.
+//	public boolean isSelectedElementsValidLttngTraces() {
+//		boolean returnedValue = true;
+//		
+//		String errMessage[] = { "Couldn't get LTTng version number for the path : " }; 
+//		
+//		// We don't want to test until something is selected
+//		if ( selectionGroup.getCheckedElementCount() > 0 ) {
+//			try {
+//				List<MinimizedFileSystemElement> selectionList = selectionGroup.getAllWhiteCheckedItems();
+//				MinimizedFileSystemElement tmpSelectedElement = null;
+//				
+//				for ( int x=0; x<selectionList.size(); x++) {
+//					tmpSelectedElement = selectionList.get(x);
+//					
+//					// *** VERIFY ***
+//					// Not sure ALL directory are checked.
+//					if ( tmpSelectedElement.isDirectory() ) {
+//						String tmpPath = tmpSelectedElement.getFileSystemObject().toString();
+//						if ( isPathLttngTrace( tmpPath ) == false ) {
+//							returnedValue = false;
+//							errMessage = extendErrorMessage(errMessage, tmpPath);
+//						}
+//					}
+//				}
+//				
+//	    		if ( returnedValue == false ) {
+//	    			errMessage = extendErrorMessage(errMessage, "");
+//	    			errMessage = extendErrorMessage(errMessage, "Verify that the directory is a valid LTTng trace directory.");
+//	    			showVersionErrorPopup(errMessage);
+//	    			selectionGroup.setAllSelections(false);
+//	    		}
+//	    	}
+//	    	catch (LttngException e) {
+//	    		String exceptionMessage[] = { "Version check failed for the path : ", this.getTracepath(), "", "Returned error was :", e.toString() }; 
+//	    		showVersionErrorPopup(exceptionMessage);
+//	    		selectionGroup.setAllSelections(false);
+//	    		returnedValue = false;
+//	    	}
+//		}
+//		
+//    	return returnedValue;
+//	}
+    
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/NewExperimentDialog.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/NewExperimentDialog.java
new file mode 100644
index 0000000..1cb3929
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/NewExperimentDialog.java
@@ -0,0 +1,335 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.dialogs;
+
+import java.lang.reflect.InvocationTargetException;
+import java.net.URI;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngExperimentFolderNode;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.SelectionStatusDialog;
+import org.eclipse.ui.internal.ide.IDEWorkbenchMessages;
+import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
+import org.eclipse.ui.internal.ide.dialogs.CreateLinkedResourceGroup;
+
+/**
+ * NewExperimentDialog
+ * 
+ * This is stripped down version of NewFolderDialog.
+ */
+@SuppressWarnings("restriction")
+public class NewExperimentDialog extends SelectionStatusDialog {
+
+	private Text folderNameField;
+	private IContainer container;
+	private boolean firstLinkCheck = true;
+	private CreateLinkedResourceGroup linkedResourceGroup;
+
+	/**
+	 * Creates a NewFolderDialog
+	 * 
+	 * @param parentShell parent of the new dialog
+	 * @param container parent of the new folder
+	 */
+	public NewExperimentDialog(Shell parentShell, LTTngExperimentFolderNode experimentFolder) {
+		super(parentShell);
+		this.container = experimentFolder.getFolder();
+		setTitle("LTTng Experiment");
+		setStatusLineAboveButtons(true);
+	}
+
+	/**
+	 * Creates the folder using the name and link target entered by the user.
+	 * Sets the dialog result to the created folder.  
+	 */
+	@Override
+	protected void computeResult() {
+	}
+
+	/**
+	 * @see org.eclipse.jface.window.Window#create()
+	 */
+	@Override
+	public void create() {
+		super.create();
+		getButton(IDialogConstants.OK_ID).setEnabled(false);
+	}
+
+	/**
+	 * Creates the widget for advanced options.
+	 *  
+	 * @param parent the parent composite
+	 */
+	protected void createLinkResourceGroup(Composite parent) {
+		linkedResourceGroup = new CreateLinkedResourceGroup(IResource.FOLDER,
+				new Listener() {
+					public void handleEvent(Event e) {
+						validateLinkedResource();
+						firstLinkCheck = false;
+					}
+				}, new CreateLinkedResourceGroup.IStringValue() {
+					public void setValue(String string) {
+						folderNameField.setText(string);
+					}
+
+					public String getValue() {
+						return folderNameField.getText();
+					}
+
+					public IResource getResource() {
+						// TODO Auto-generated method stub
+						return null;
+					}
+				});
+	}
+
+	/* (non-Javadoc)
+	 * Method declared on Dialog.
+	 */
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		Composite composite = (Composite) super.createDialogArea(parent);
+		composite.setLayout(new GridLayout());
+		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+		createFolderNameGroup(composite);
+		createLinkResourceGroup(composite);
+		return composite;
+	}
+
+	/**
+	 * Creates the folder name specification controls.
+	 *
+	 * @param parent the parent composite
+	 */
+	private void createFolderNameGroup(Composite parent) {
+		Font font = parent.getFont();
+		Composite folderGroup = new Composite(parent, SWT.NONE);
+		GridLayout layout = new GridLayout();
+		layout.numColumns = 2;
+		folderGroup.setLayout(layout);
+		folderGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+		// new folder label
+		Label folderLabel = new Label(folderGroup, SWT.NONE);
+		folderLabel.setFont(font);
+		folderLabel.setText("Experiment name: ");
+
+		// new folder name entry field
+		folderNameField = new Text(folderGroup, SWT.BORDER);
+		GridData data = new GridData(GridData.FILL_HORIZONTAL);
+		data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH;
+		folderNameField.setLayoutData(data);
+		folderNameField.setFont(font);
+		folderNameField.addListener(SWT.Modify, new Listener() {
+			public void handleEvent(Event event) {
+				validateLinkedResource();
+			}
+		});
+	}
+
+	/**
+	 * Creates a folder resource handle for the folder with the given name.
+	 * The folder handle is created relative to the container specified during 
+	 * object creation. 
+	 *
+	 * @param folderName the name of the folder resource to create a handle for
+	 * @return the new folder resource handle
+	 */
+	private IFolder createFolderHandle(String folderName) {
+		IWorkspaceRoot workspaceRoot = container.getWorkspace().getRoot();
+		IPath folderPath = container.getFullPath().append(folderName);
+		IFolder folderHandle = workspaceRoot.getFolder(folderPath);
+
+		return folderHandle;
+	}
+
+	/**
+	 * Creates a new folder with the given name and optionally linking to
+	 * the specified link target.
+	 * 
+	 * @param folderName name of the new folder
+	 * @param linkTarget name of the link target folder. may be null.
+	 * @return IFolder the new folder
+	 */
+	private IFolder createNewFolder(String folderName, final URI linkTarget) {
+		final IFolder folderHandle = createFolderHandle(folderName);
+
+		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
+			@Override
+			public void execute(IProgressMonitor monitor) throws CoreException {
+				try {
+					monitor.beginTask(IDEWorkbenchMessages.NewFolderDialog_progress, 2000);
+					if (monitor.isCanceled()) {
+						throw new OperationCanceledException();
+					}
+					if (linkTarget == null) {
+						folderHandle.create(false, true, monitor);
+					} else {
+						folderHandle.createLink(linkTarget, IResource.ALLOW_MISSING_LOCAL, monitor);
+					}
+					if (monitor.isCanceled()) {
+						throw new OperationCanceledException();
+					}
+				} finally {
+					monitor.done();
+				}
+			}
+		};
+		try {
+			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(operation);
+		} catch (InterruptedException exception) {
+			return null;
+		} catch (InvocationTargetException exception) {
+			if (exception.getTargetException() instanceof CoreException) {
+				ErrorDialog.openError(getShell(),
+						IDEWorkbenchMessages.NewFolderDialog_errorTitle, null, // no special message
+						((CoreException) exception.getTargetException()).getStatus());
+			} else {
+				// CoreExceptions are handled above, but unexpected runtime exceptions and errors may still occur.
+				IDEWorkbenchPlugin.log(getClass(),
+						"createNewExperiment", exception.getTargetException());
+				MessageDialog.openError(getShell(),
+						IDEWorkbenchMessages.NewFolderDialog_errorTitle,
+						NLS.bind(IDEWorkbenchMessages.NewFolderDialog_internalError,
+							exception.getTargetException().getMessage()));
+			}
+			return null;
+		}
+		return folderHandle;
+	}
+
+	/**
+	 * Update the dialog's status line to reflect the given status. It is safe to call
+	 * this method before the dialog has been opened.
+	 */
+	@Override
+	protected void updateStatus(IStatus status) {
+		if (firstLinkCheck && status != null) {
+			Status newStatus = new Status(IStatus.OK, status.getPlugin(),
+					status.getCode(), status.getMessage(), status.getException());
+			super.updateStatus(newStatus);
+		} else {
+			super.updateStatus(status);
+		}
+	}
+
+	/**
+	 * Update the dialog's status line to reflect the given status. It is safe to call
+	 * this method before the dialog has been opened.
+	 * @param severity
+	 * @param message
+	 */
+	private void updateStatus(int severity, String message) {
+		updateStatus(new Status(severity, IDEWorkbenchPlugin.IDE_WORKBENCH, severity, message, null));
+	}
+
+	/**
+	 * Checks whether the folder name and link location are valid.
+	 * Disable the OK button if the folder name and link location are valid.
+	 * a message that indicates the problem otherwise.
+	 */
+	private void validateLinkedResource() {
+		boolean valid = validateFolderName();
+
+		if (valid) {
+			IFolder linkHandle = createFolderHandle(folderNameField.getText());
+			IStatus status = linkedResourceGroup.validateLinkLocation(linkHandle);
+
+			if (status.getSeverity() != IStatus.ERROR) {
+				getOkButton().setEnabled(true);
+			} else {
+				getOkButton().setEnabled(false);
+			}
+
+			if (status.isOK() == false) {
+				updateStatus(status);
+			}
+		} else {
+			getOkButton().setEnabled(false);
+		}
+	}
+
+	/**
+	 * Checks if the folder name is valid.
+	 *
+	 * @return null if the new folder name is valid.
+	 * 	a message that indicates the problem otherwise.
+	 */
+	private boolean validateFolderName() {
+		String name = folderNameField.getText();
+		IWorkspace workspace = container.getWorkspace();
+		IStatus nameStatus = workspace.validateName(name, IResource.FOLDER);
+
+		if ("".equals(name)) {
+			updateStatus(IStatus.ERROR, "Experiment name is empty");
+			return false;
+		}
+		if (nameStatus.isOK() == false) {
+			updateStatus(nameStatus);
+			return false;
+		}
+		IPath path = new Path(name);
+		if (container.getFolder(path).exists()
+				|| container.getFile(path).exists()) {
+			updateStatus(IStatus.ERROR, NLS.bind("Experiment already exists", name));
+			return false;
+		}
+		updateStatus(IStatus.OK, "");
+		return true;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.dialogs.SelectionStatusDialog#okPressed()
+	 */
+	@Override
+	protected void okPressed() {
+		URI linkTarget = linkedResourceGroup.getLinkTargetURI();
+		IFolder folder = createNewFolder(folderNameField.getText(), linkTarget);
+		if (folder == null) {
+			return;
+		}
+
+		setSelectionResult(new IFolder[] { folder });
+
+		super.okPressed();
+	}
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/NewProjectMainWizardPage.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/NewProjectMainWizardPage.java
new file mode 100644
index 0000000..48da18e
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/NewProjectMainWizardPage.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.dialogs;
+
+import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
+
+/**
+ * <b><u>NewProjectMainWizardPage</u></b>
+ * <p>
+ *
+ * TODO: Implement me. Please.
+ */
+public class NewProjectMainWizardPage extends WizardNewProjectCreationPage {
+
+    /**
+     * @param pageName
+     */
+    public NewProjectMainWizardPage(String pageName) {
+        super(pageName);
+    }
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/NewProjectWizard.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/NewProjectWizard.java
new file mode 100644
index 0000000..e0bd8a3
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/NewProjectWizard.java
@@ -0,0 +1,147 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.dialogs;
+
+import java.net.URI;
+
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
+import org.eclipse.linuxtools.lttng.ui.views.project.LTTngProjectNature;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngProjectNode;
+import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
+
+/**
+ * <b><u>NewProjectWizard</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class NewProjectWizard extends BasicNewResourceWizard {
+
+    private String fTtitle;
+    private String fDescription;
+
+    protected NewProjectMainWizardPage fMainPage;
+    protected String fProjectName;
+    protected URI fProjectLocation;
+    protected IConfigurationElement fConfigElement;
+
+    protected IProject fProject;
+
+    /**
+     * 
+     */
+    public NewProjectWizard() {
+        this("LTTng Project", "Create an LTTng Project");
+    }
+
+    /**
+     * @param title
+     * @param desc
+     */
+    public NewProjectWizard(String title, String desc) {
+        super();
+        setDialogSettings(LTTngUiPlugin.getDefault().getDialogSettings());
+        setNeedsProgressMonitor(true);
+        setForcePreviousAndNextButtons(true);
+        setWindowTitle(title);
+        fTtitle = title;
+        fDescription = desc;
+    }
+
+    /* (non-Javadoc)
+     * @see org.eclipse.jface.wizard.Wizard#addPages()
+     */
+    @Override
+    public void addPages() {
+        fMainPage= new NewProjectMainWizardPage("LTTng Project");
+        fMainPage.setTitle(fTtitle);
+        fMainPage.setDescription(fDescription);
+        addPage(fMainPage);
+    }
+
+    /* (non-Javadoc)
+     * @see org.eclipse.jface.wizard.Wizard#performCancel()
+     */
+    @Override
+    public boolean performCancel() {
+        return true;
+    }
+
+    /* (non-Javadoc)
+     * @see org.eclipse.jface.wizard.Wizard#performFinish()
+     */
+    @Override
+    public boolean performFinish() {
+        fProjectName = fMainPage.getProjectName();
+        fProjectLocation = fMainPage.useDefaults() ? null : fMainPage.getLocationURI();
+        fProject = createProject(fProjectName, fProjectLocation, new NullProgressMonitor());
+        return true;
+    }
+
+    public IProject getProject() {
+    	return fProject;
+    }
+ 
+    /**
+     * @param projectName
+     * @param projectLocation
+     * @param monitor
+     * @return
+     */
+    private IProject createProject(String projectName, URI projectLocation, IProgressMonitor monitor) {
+
+        IWorkspace workspace = ResourcesPlugin.getWorkspace();
+        IWorkspaceRoot root = workspace.getRoot();
+        IProject project = root.getProject(projectName);
+
+        try {
+            if (!project.exists()) {
+                IProjectDescription description = workspace.newProjectDescription(project.getName());
+                if (projectLocation != null)
+                    description.setLocationURI(projectLocation);
+                project.create(description, monitor);
+            }
+
+            if (!project.isOpen())
+                project.open(monitor);
+
+            IProjectDescription description = project.getDescription();
+            description.setNatureIds(new String[] { LTTngProjectNature.ID } );
+            project.setDescription(description, null);
+
+            IFolder folder = project.getFolder(LTTngProjectNode.TRACE_FOLDER_NAME);
+            if (!folder.exists())
+                folder.create(true, true, null);
+
+            folder = project.getFolder(LTTngProjectNode.EXPER_FOLDER_NAME);
+            if (!folder.exists())
+                folder.create(true, true, null);
+
+            return project;
+        }
+        catch (CoreException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/TraceErrorDialog.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/TraceErrorDialog.java
new file mode 100644
index 0000000..06bbcc2
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/TraceErrorDialog.java
@@ -0,0 +1,135 @@
+package org.eclipse.linuxtools.lttng.ui.views.project.dialogs;
+
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   William Bourque - Initial API and implementation
+ *******************************************************************************/
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.dialogs.SelectionStatusDialog;
+
+public class TraceErrorDialog extends SelectionStatusDialog {
+	
+	private String[] messages = null; 
+	
+	public TraceErrorDialog(Shell parentShell, String[] newMessages) {
+		super(parentShell);
+		
+		messages = newMessages;
+		setTitle("Trace Selection");
+		setStatusLineAboveButtons(true);
+	}
+	
+	@Override
+	protected void computeResult() {
+	}
+	
+	@Override
+	public void create() {
+		super.create();
+		getButton(IDialogConstants.OK_ID).setEnabled(true);
+		getButton(IDialogConstants.OK_ID).setAlignment(GridData.CENTER);
+		getButton(IDialogConstants.CANCEL_ID).setVisible(false);
+	}
+	
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		Composite composite = (Composite) super.createDialogArea(parent);
+		composite.setLayout(new GridLayout());
+		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+		
+		createFolderNameGroup(composite);
+		return composite;
+	}
+	
+	private void createFolderNameGroup(Composite parent) {
+		Font font = parent.getFont();
+		Composite folderGroup = new Composite(parent, SWT.NONE);
+		
+		GridLayout layout = new GridLayout();
+		layout.numColumns = 1;
+		layout.verticalSpacing = 3;
+		folderGroup.setLayout(layout);
+		folderGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		
+		
+		// Position grid for the messages
+		GridData positionningData = new GridData(GridData.FILL_VERTICAL);
+		
+		// New message label
+		Label lblMessage = new Label(folderGroup, SWT.NONE);
+		lblMessage.setFont(font);
+		lblMessage.setText("Error while opening the trace! Error message was : ");
+		lblMessage.setLayoutData(positionningData);
+		
+		// The actual messages
+		GC graphicContext = new GC(parent);
+		String longuestLine = "";
+		int msgSize = 0;
+		
+		// *** Font and FontData are nowhere near elegant to use.
+		Font errorFont = new Font(graphicContext.getDevice(), font.getFontData()[0].getName(), font.getFontData()[0].getHeight(), SWT.ITALIC);
+		
+		Label[] lblErrorMessages = new Label[messages.length];
+		for(int x=0; x<messages.length; x++) {
+			lblErrorMessages[x] = new Label(folderGroup, SWT.NONE);
+			lblErrorMessages[x].setFont(errorFont);
+			
+			lblErrorMessages[x].setForeground(new Color(lblErrorMessages[x].getForeground().getDevice(), 255, 0, 0));
+			lblErrorMessages[x].setText(messages[x]);
+			lblErrorMessages[x].setLayoutData(positionningData);
+			
+			if ( messages[x].length() > longuestLine.length() ) {
+				longuestLine = messages[x];
+			}
+		}
+		
+		for ( int pos=0; pos<longuestLine.length(); pos++ ) {
+			msgSize += graphicContext.getAdvanceWidth( longuestLine.charAt(pos) );
+		}
+		// Seems we need to count the final \n of the line otherwise we miss some space
+		msgSize += graphicContext.getAdvanceWidth( '\n' );
+		
+		positionningData.widthHint = msgSize;
+		positionningData.grabExcessHorizontalSpace = true;
+		
+		graphicContext.dispose();
+		
+	}
+	
+	
+	@Override
+	protected void updateStatus(IStatus status) {
+		if (status != null) {
+			Status newStatus = new Status(IStatus.OK, status.getPlugin(),
+					status.getCode(), status.getMessage(), status.getException());
+			super.updateStatus(newStatus);
+		} else {
+			super.updateStatus(status);
+		}
+	}
+	
+	@Override
+	protected void okPressed() {
+		super.okPressed();
+	}
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/CloseProjectHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/CloseProjectHandler.java
new file mode 100644
index 0000000..c00e60d
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/CloseProjectHandler.java
@@ -0,0 +1,95 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.handlers;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.commands.IHandlerListener;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.linuxtools.lttng.ui.views.project.ProjectView;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngProjectNode;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * <b><u>CloseProjectHandler</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class CloseProjectHandler implements IHandler {
+
+	private LTTngProjectNode fProject = null;
+
+	// ------------------------------------------------------------------------
+	// Validation
+	// ------------------------------------------------------------------------
+
+	public boolean isEnabled() {
+		
+		// Check if we are closing down
+		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		if (window == null)
+			return false;
+
+		// Check if we are in the Project View
+		IWorkbenchPage page = window.getActivePage();
+		if (!(page.getActivePart() instanceof ProjectView))
+			return false;
+
+		// Check if a project is selected
+		ISelection selection = page.getSelection(ProjectView.ID);
+		if (selection instanceof StructuredSelection) {
+			Object element = ((StructuredSelection) selection).getFirstElement();
+			fProject = (element instanceof LTTngProjectNode) ? (LTTngProjectNode) element : null;
+		}
+		return (fProject != null && fProject.isOpen());
+	}
+
+	// Handled if we are in the ProjectView
+	public boolean isHandled() {
+		return true;
+	}
+
+	// ------------------------------------------------------------------------
+	// Execution
+	// ------------------------------------------------------------------------
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+
+		if (fProject != null) {
+			fProject.closeProject();
+			fProject.refresh();
+		}
+		return null;
+	}
+
+	public void dispose() {
+		// TODO Auto-generated method stub
+	}
+
+	// ------------------------------------------------------------------------
+	// IHandlerListener
+	// ------------------------------------------------------------------------
+
+	public void addHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+	public void removeHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/DeleteExperimentHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/DeleteExperimentHandler.java
new file mode 100644
index 0000000..ed736ef
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/DeleteExperimentHandler.java
@@ -0,0 +1,105 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.handlers;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.commands.IHandlerListener;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.linuxtools.lttng.ui.views.project.ProjectView;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.ILTTngProjectTreeNode;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngExperimentNode;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * <b><u>DeleteExperimentHandler</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class DeleteExperimentHandler implements IHandler {
+
+	private LTTngExperimentNode fExperiment = null;
+
+	// ------------------------------------------------------------------------
+	// Validation
+	// ------------------------------------------------------------------------
+
+	public boolean isEnabled() {
+
+		// Check if we are closing down
+		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		if (window == null)
+			return false;
+
+		// Check if a trace is selected
+		IWorkbenchPage page = window.getActivePage();
+		if (!(page.getActivePart() instanceof ProjectView))
+			return false;
+
+		// Check if a trace is selected
+		ISelection selection = page.getSelection(ProjectView.ID);
+		if (selection instanceof StructuredSelection) {
+			Object element = ((StructuredSelection) selection).getFirstElement();
+			fExperiment = (element instanceof LTTngExperimentNode) ? (LTTngExperimentNode) element : null;
+		}
+
+		return (fExperiment != null);
+	}
+
+	// Handled if we are in the ProjectView
+	public boolean isHandled() {
+		return true;
+	}
+
+	// ------------------------------------------------------------------------
+	// Execution
+	// ------------------------------------------------------------------------
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+
+		IFolder folder = fExperiment.getFolder();
+		ILTTngProjectTreeNode parent = fExperiment.getParent();
+		try {
+			parent.removeChild(fExperiment);
+			parent.refresh();
+			folder.delete(true, true, null);
+		} catch (CoreException e) {
+			e.printStackTrace();
+		}
+
+		return null;
+	}
+
+	public void dispose() {
+		// TODO Auto-generated method stub
+	}
+
+	// ------------------------------------------------------------------------
+	// IHandlerListener
+	// ------------------------------------------------------------------------
+
+	public void addHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+	public void removeHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/DeleteProjectHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/DeleteProjectHandler.java
new file mode 100644
index 0000000..328dd97
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/DeleteProjectHandler.java
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.handlers;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.commands.IHandlerListener;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.linuxtools.lttng.ui.views.project.ProjectView;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.ILTTngProjectTreeNode;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngProjectNode;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * <b><u>DeleteProjectHandler</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class DeleteProjectHandler implements IHandler {
+
+	private LTTngProjectNode fProject = null;
+
+	// ------------------------------------------------------------------------
+	// Validation
+	// ------------------------------------------------------------------------
+
+	public boolean isEnabled() {
+		
+		// Check if we are closing down
+		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		if (window == null)
+			return false;
+
+		// Check if we are in the Project View
+		IWorkbenchPage page = window.getActivePage();
+		if (!(page.getActivePart() instanceof ProjectView))
+			return false;
+
+		// Check if a project is selected
+		ISelection selection = page.getSelection(ProjectView.ID);
+		if (selection instanceof StructuredSelection) {
+			Object element = ((StructuredSelection) selection).getFirstElement();
+			fProject = (element instanceof LTTngProjectNode) ? (LTTngProjectNode) element : null;
+		}
+		return (fProject != null);
+	}
+
+	// Handled if we are in the ProjectView
+	public boolean isHandled() {
+		return true;
+	}
+
+	// ------------------------------------------------------------------------
+	// Execution
+	// ------------------------------------------------------------------------
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+
+		IProject project = fProject.getProject();
+		ILTTngProjectTreeNode parent = fProject.getParent();
+		try {
+			parent.removeChild(fProject);
+			parent.refresh();
+			project.delete(true, true, null);
+		} catch (CoreException e) {
+			e.printStackTrace();
+		}
+
+		return null;
+	}
+
+	public void dispose() {
+		// TODO Auto-generated method stub
+	}
+
+	// ------------------------------------------------------------------------
+	// IHandlerListener
+	// ------------------------------------------------------------------------
+
+	public void addHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+	public void removeHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/DeleteTraceHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/DeleteTraceHandler.java
new file mode 100644
index 0000000..beb0d05
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/DeleteTraceHandler.java
@@ -0,0 +1,105 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.handlers;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.commands.IHandlerListener;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.linuxtools.lttng.ui.views.project.ProjectView;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.ILTTngProjectTreeNode;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngTraceNode;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * <b><u>DeleteTraceHandler</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class DeleteTraceHandler implements IHandler {
+
+	private LTTngTraceNode fTrace = null;
+
+	// ------------------------------------------------------------------------
+	// Validation
+	// ------------------------------------------------------------------------
+
+	public boolean isEnabled() {
+		
+		// Check if we are closing down
+		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		if (window == null)
+			return false;
+
+		// Check if a trace is selected
+		IWorkbenchPage page = window.getActivePage();
+		if (!(page.getActivePart() instanceof ProjectView))
+			return false;
+
+		// Check if a trace is selected
+		ISelection selection = page.getSelection(ProjectView.ID);
+		if (selection instanceof StructuredSelection) {
+			Object element = ((StructuredSelection) selection).getFirstElement();
+			fTrace = (element instanceof LTTngTraceNode) ? (LTTngTraceNode) element : null;
+		}
+
+		return (fTrace != null);
+	}
+
+	// Handled if we are in the ProjectView
+	public boolean isHandled() {
+		return true;
+	}
+
+	// ------------------------------------------------------------------------
+	// Execution
+	// ------------------------------------------------------------------------
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+
+		IFolder folder = fTrace.getFolder();
+		ILTTngProjectTreeNode parent = fTrace.getParent();
+		try {
+			parent.removeChild(fTrace);
+			parent.refresh();
+			folder.delete(true, true, null);
+		} catch (CoreException e) {
+			e.printStackTrace();
+		}
+
+		return null;
+	}
+
+	public void dispose() {
+		// TODO Auto-generated method stub
+	}
+
+	// ------------------------------------------------------------------------
+	// IHandlerListener
+	// ------------------------------------------------------------------------
+
+	public void addHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+	public void removeHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/ImportTraceHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/ImportTraceHandler.java
new file mode 100644
index 0000000..907c428
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/ImportTraceHandler.java
@@ -0,0 +1,123 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.handlers;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.commands.IHandlerListener;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.window.Window;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.linuxtools.lttng.ui.views.project.ProjectView;
+import org.eclipse.linuxtools.lttng.ui.views.project.dialogs.ImportTraceWizard;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.ILTTngProjectTreeNode;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngProjectNode;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * <b><u>ImportTraceHandler</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class ImportTraceHandler implements IHandler {
+
+	private LTTngProjectNode fProject = null;
+
+	// ------------------------------------------------------------------------
+	// Validation
+	// ------------------------------------------------------------------------
+
+	public boolean isEnabled() {
+		
+		// Check if we are closing down
+		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		if (window == null)
+			return false;
+
+		// Check if we are in the Project View
+		IWorkbenchPage page = window.getActivePage();
+		if (!(page.getActivePart() instanceof ProjectView))
+			return false;
+
+		// Check if a project is selected
+		ISelection selection = page.getSelection(ProjectView.ID);
+		if (selection instanceof StructuredSelection) {
+			Object element = ((StructuredSelection) selection).getFirstElement();
+			if (element instanceof ILTTngProjectTreeNode) {
+				ILTTngProjectTreeNode node = (ILTTngProjectTreeNode) element;
+				while (node != null && !(node instanceof LTTngProjectNode)) {
+					node = node.getParent();
+				}
+				fProject = (node instanceof LTTngProjectNode) ? (LTTngProjectNode) node : null;
+			}
+		}
+
+		return (fProject != null && fProject.isOpen() && fProject.isLTTngProject());
+	}
+
+	// Always handled
+	public boolean isHandled() {
+		return true;
+	}
+
+	// ------------------------------------------------------------------------
+	// Execution
+	// ------------------------------------------------------------------------
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+
+		// Set the selection to the project
+		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+		ProjectView view = (ProjectView) page.getActivePart();
+		view.setSelection(fProject);
+
+		// Fire the Import Trace Wizard
+		IWorkbench workbench = PlatformUI.getWorkbench();
+		Shell shell = workbench.getActiveWorkbenchWindow().getShell();
+
+		ImportTraceWizard wizard = new ImportTraceWizard();
+		wizard.init(PlatformUI.getWorkbench(), new StructuredSelection(fProject));
+		WizardDialog dialog = new WizardDialog(shell, wizard);
+		dialog.open();
+
+		if (dialog.getReturnCode() == Window.OK && fProject != null) {
+			fProject.refreshChildren();
+			fProject.refresh();
+		}
+
+		return null;
+	}
+
+	public void dispose() {
+		// TODO Auto-generated method stub
+	}
+
+	// ------------------------------------------------------------------------
+	// IHandlerListener
+	// ------------------------------------------------------------------------
+
+	public void addHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+	public void removeHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/NewExperimentHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/NewExperimentHandler.java
new file mode 100644
index 0000000..b6e760e
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/NewExperimentHandler.java
@@ -0,0 +1,117 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.handlers;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.commands.IHandlerListener;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.window.Window;
+import org.eclipse.linuxtools.lttng.ui.views.project.ProjectView;
+import org.eclipse.linuxtools.lttng.ui.views.project.dialogs.NewExperimentDialog;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.ILTTngProjectTreeNode;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngExperimentFolderNode;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngProjectNode;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * <b><u>NewExperimentHandler</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class NewExperimentHandler implements IHandler {
+
+	private LTTngProjectNode fProject = null;
+
+	// ------------------------------------------------------------------------
+	// Validation
+	// ------------------------------------------------------------------------
+
+	public boolean isEnabled() {
+
+		// Check if we are closing down
+		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		if (window == null)
+			return false;
+
+		// Check if we are in the Project View
+		IWorkbenchPage page = window.getActivePage();
+		if (!(page.getActivePart() instanceof ProjectView))
+			return false;
+
+		// Check if a project is selected
+		ISelection selection = page.getSelection(ProjectView.ID);
+		if (selection instanceof StructuredSelection) {
+			Object element = ((StructuredSelection) selection).getFirstElement();
+			if (element instanceof ILTTngProjectTreeNode) {
+				ILTTngProjectTreeNode node = (ILTTngProjectTreeNode) element;
+				while (node != null && !(node instanceof LTTngProjectNode)) {
+					node = node.getParent();
+				}
+				fProject = (node instanceof LTTngProjectNode) ? (LTTngProjectNode) node : null;
+			}
+		}
+
+		return (fProject != null && fProject.isOpen() && fProject.isLTTngProject());
+	}
+
+	// Handled if we are in the ProjectView
+	public boolean isHandled() {
+		return true;
+	}
+
+	// ------------------------------------------------------------------------
+	// Execution
+	// ------------------------------------------------------------------------
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+
+		// Open the experiment creation dialog
+		LTTngExperimentFolderNode experimentFolder = fProject.getExperimentsFolder();
+		Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+		NewExperimentDialog dialog = new NewExperimentDialog(shell, experimentFolder);
+		dialog.open();
+
+		if (dialog.getReturnCode() == Window.OK) {
+			Object[] experiments = dialog.getResult();
+			if (experiments[0] instanceof IFolder) {
+				experimentFolder.addExperiment((IFolder) experiments[0]);
+			}
+		}
+
+		return null;
+	}
+
+	public void dispose() {
+		// TODO Auto-generated method stub
+	}
+
+	// ------------------------------------------------------------------------
+	// IHandlerListener
+	// ------------------------------------------------------------------------
+
+	public void addHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+	public void removeHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/NewProjectHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/NewProjectHandler.java
new file mode 100644
index 0000000..a486307
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/NewProjectHandler.java
@@ -0,0 +1,105 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.handlers;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.commands.IHandlerListener;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.jface.window.Window;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.linuxtools.lttng.ui.views.project.ProjectView;
+import org.eclipse.linuxtools.lttng.ui.views.project.dialogs.NewProjectWizard;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngProjectRoot;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * <b><u>NewProjectHandler</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class NewProjectHandler implements IHandler {
+
+	private LTTngProjectRoot fProjectRoot = null;
+
+	// ------------------------------------------------------------------------
+	// Validation
+	// ------------------------------------------------------------------------
+
+	public boolean isEnabled() {
+		
+		// Check if we are closing down
+		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		if (window == null)
+			return false;
+
+		// Check if we are in the Project View
+		IWorkbenchPart part = window.getActivePage().getActivePart();
+		if (!(part instanceof ProjectView))
+			return false;
+
+		fProjectRoot = ((ProjectView) part).getRoot();
+
+		return (fProjectRoot != null);
+	}
+
+	// Always handled
+	public boolean isHandled() {
+		return true;
+	}
+
+	// ------------------------------------------------------------------------
+	// Execution
+	// ------------------------------------------------------------------------
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+
+		// Fire the New Project Wizard
+		Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+		NewProjectWizard wizard = new NewProjectWizard();
+		WizardDialog dialog = new WizardDialog(shell, wizard);
+		dialog.open();
+
+		// Update the project model
+		if (dialog.getReturnCode() == Window.OK) {
+			IProject project = wizard.getProject();
+			if (project != null && fProjectRoot != null) {
+				fProjectRoot.refreshChildren();
+				fProjectRoot.refresh();
+			}
+		}
+
+		return null;
+	}
+
+	public void dispose() {
+		// TODO Auto-generated method stub
+	}
+
+	// ------------------------------------------------------------------------
+	// IHandlerListener
+	// ------------------------------------------------------------------------
+
+	public void addHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+	public void removeHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/OpenExperimentHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/OpenExperimentHandler.java
new file mode 100644
index 0000000..c7948b4
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/OpenExperimentHandler.java
@@ -0,0 +1,100 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.handlers;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.commands.IHandlerListener;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.linuxtools.lttng.ui.views.project.ProjectView;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngExperimentNode;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * <b><u>OpenExperimentHandler</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class OpenExperimentHandler implements IHandler {
+
+	private LTTngExperimentNode fExperiment = null;
+
+	// ------------------------------------------------------------------------
+	// Validation
+	// ------------------------------------------------------------------------
+
+	public boolean isEnabled() {
+		// Check if we are closing down
+		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		if (window == null)
+			return false;
+
+		// Check if a trace is selected
+		IWorkbenchPage page = window.getActivePage();
+		if (!(page.getActivePart() instanceof ProjectView))
+			return false;
+
+		// Check if a trace is selected
+		ISelection selection = page.getSelection(ProjectView.ID);
+		if (selection instanceof StructuredSelection) {
+			Object element = ((StructuredSelection) selection).getFirstElement();
+			fExperiment = (element instanceof LTTngExperimentNode) ? (LTTngExperimentNode) element : null;
+		}
+
+		return (fExperiment != null);
+	}
+
+	// Handled if we are in the ProjectView
+	public boolean isHandled() {
+		return true;
+	}
+
+	// ------------------------------------------------------------------------
+	// Execution
+	// ------------------------------------------------------------------------
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+
+		// Set the selection to the project
+		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+		ProjectView projectView = (ProjectView) page.getActivePart();
+
+		if (projectView != null) {
+			projectView.selectExperiment(fExperiment);
+		}
+
+		return null;
+	}
+
+	// ------------------------------------------------------------------------
+	// IHandlerListener
+	// ------------------------------------------------------------------------
+
+	public void addHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+	public void removeHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+	public void dispose() {
+		// TODO Auto-generated method stub
+		
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/OpenProjectHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/OpenProjectHandler.java
new file mode 100644
index 0000000..8aabb38
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/OpenProjectHandler.java
@@ -0,0 +1,95 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.handlers;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.commands.IHandlerListener;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.linuxtools.lttng.ui.views.project.ProjectView;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngProjectNode;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * <b><u>OpenProjectHandler</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class OpenProjectHandler implements IHandler {
+
+	private LTTngProjectNode fProject = null;
+
+	// ------------------------------------------------------------------------
+	// Validation
+	// ------------------------------------------------------------------------
+
+	public boolean isEnabled() {
+		
+		// Check if we are closing down
+		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		if (window == null)
+			return false;
+
+		// Check if we are in the Project View
+		IWorkbenchPage page = window.getActivePage();
+		if (!(page.getActivePart() instanceof ProjectView))
+			return false;
+
+		// Check if a project is selected
+		ISelection selection = page.getSelection(ProjectView.ID);
+		if (selection instanceof StructuredSelection) {
+			Object element = ((StructuredSelection) selection).getFirstElement();
+			fProject = (element instanceof LTTngProjectNode) ? (LTTngProjectNode) element : null;
+		}
+		return (fProject != null && !fProject.isOpen());
+	}
+
+	// Handled if we are in the ProjectView
+	public boolean isHandled() {
+		return true;
+	}
+
+	// ------------------------------------------------------------------------
+	// Execution
+	// ------------------------------------------------------------------------
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+
+		if (fProject != null) {
+			fProject.openProject();
+			fProject.refresh();
+		}
+		return null;
+	}
+
+	public void dispose() {
+		// TODO Auto-generated method stub
+	}
+
+	// ------------------------------------------------------------------------
+	// IHandlerListener
+	// ------------------------------------------------------------------------
+
+	public void addHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+	public void removeHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/OpenTraceHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/OpenTraceHandler.java
new file mode 100644
index 0000000..8e01111
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/OpenTraceHandler.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.handlers;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.commands.IHandlerListener;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngTraceNode;
+import org.eclipse.swt.widgets.MessageBox;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * <b><u>OpenTraceHandler</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class OpenTraceHandler implements IHandler {
+
+	private LTTngTraceNode fTrace = null;
+
+	// ------------------------------------------------------------------------
+	// Validation
+	// ------------------------------------------------------------------------
+
+	public boolean isEnabled() {
+		return (fTrace != null);
+	}
+
+	// Handled if we are in the ProjectView
+	public boolean isHandled() {
+		return true;
+	}
+
+	// ------------------------------------------------------------------------
+	// Execution
+	// ------------------------------------------------------------------------
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+
+		MessageBox mb = new MessageBox(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
+		mb.setText("Open Trace");
+		mb.setMessage("Not implemented yet");
+		mb.open();
+
+		return null;
+	}
+
+	public void dispose() {
+		// TODO Auto-generated method stub
+	}
+
+	// ------------------------------------------------------------------------
+	// IHandlerListener
+	// ------------------------------------------------------------------------
+
+	public void addHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+	public void removeHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RefreshHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RefreshHandler.java
new file mode 100644
index 0000000..740ed30
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RefreshHandler.java
@@ -0,0 +1,98 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.handlers;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.commands.IHandlerListener;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.linuxtools.lttng.ui.views.project.ProjectView;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.ILTTngProjectTreeNode;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngProjectRoot;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * <b><u>RefreshHandler</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class RefreshHandler implements IHandler {
+
+	private LTTngProjectRoot fProjectRoot = null;
+
+	// ------------------------------------------------------------------------
+	// Validation
+	// ------------------------------------------------------------------------
+
+	public boolean isEnabled() {
+		
+		// Check if we are closing down
+		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		if (window == null)
+			return false;
+
+		// Check if we can find the project model root node
+		ISelection selection = window.getActivePage().getSelection(ProjectView.ID);
+		if (selection instanceof StructuredSelection) {
+			Object element = ((StructuredSelection) selection).getFirstElement();
+			if (element instanceof ILTTngProjectTreeNode) {
+				ILTTngProjectTreeNode node = (ILTTngProjectTreeNode) element;
+				while (node != null && !(node instanceof LTTngProjectRoot)) {
+					node = node.getParent();
+				}
+				fProjectRoot = (node instanceof LTTngProjectRoot) ? (LTTngProjectRoot) node : null;
+			}
+		}
+
+		return (fProjectRoot != null);
+	}
+
+	// Handled if we are in the ProjectView
+	public boolean isHandled() {
+		return true;
+	}
+
+	// ------------------------------------------------------------------------
+	// Execution
+	// ------------------------------------------------------------------------
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+
+		if (fProjectRoot != null) {
+			fProjectRoot.refreshChildren();
+			fProjectRoot.refresh();
+		}
+
+		return null;
+	}
+
+	public void dispose() {
+		// TODO Auto-generated method stub
+	}
+
+	// ------------------------------------------------------------------------
+	// IHandlerListener
+	// ------------------------------------------------------------------------
+
+	public void addHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+	public void removeHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameExperimentHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameExperimentHandler.java
new file mode 100644
index 0000000..7651437
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameExperimentHandler.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.handlers;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.commands.IHandlerListener;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngExperimentNode;
+import org.eclipse.swt.widgets.MessageBox;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * <b><u>RenameExperimentHandler</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class RenameExperimentHandler implements IHandler {
+
+	private LTTngExperimentNode fExperiment = null;
+
+	// ------------------------------------------------------------------------
+	// Validation
+	// ------------------------------------------------------------------------
+
+	public boolean isEnabled() {
+		return (fExperiment != null);
+	}
+
+	// Handled if we are in the ProjectView
+	public boolean isHandled() {
+		return true;
+	}
+
+	// ------------------------------------------------------------------------
+	// Execution
+	// ------------------------------------------------------------------------
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+
+		MessageBox mb = new MessageBox(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
+		mb.setText("Rename Experiment");
+		mb.setMessage("Not implemented yet");
+		mb.open();
+
+		return null;
+	}
+
+	public void dispose() {
+		// TODO Auto-generated method stub
+	}
+
+	// ------------------------------------------------------------------------
+	// IHandlerListener
+	// ------------------------------------------------------------------------
+
+	public void addHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+	public void removeHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameProjectHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameProjectHandler.java
new file mode 100644
index 0000000..43dc44b
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameProjectHandler.java
@@ -0,0 +1,93 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.handlers;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.commands.IHandlerListener;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngProjectNode;
+import org.eclipse.swt.widgets.MessageBox;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * <b><u>RenameProjectHandler</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class RenameProjectHandler implements IHandler {
+
+	private LTTngProjectNode fProject = null;
+
+	// ------------------------------------------------------------------------
+	// Validation
+	// ------------------------------------------------------------------------
+
+	public boolean isEnabled() {
+
+//		// Check if we are closing down
+//		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+//		if (window == null)
+//			return false;
+//
+//		// Check if we are in the Project View
+//		IWorkbenchPage page = window.getActivePage();
+//		if (!(page.getActivePart() instanceof ProjectView))
+//			return false;
+//
+//		// Check if a project is selected
+//		ISelection selection = page.getSelection(ProjectView.ID);
+//		if (selection instanceof StructuredSelection) {
+//			Object element = ((StructuredSelection) selection).getFirstElement();
+//			fProjectNode = (element instanceof LTTngProjectNode) ? (LTTngProjectNode) element : null;
+//		}
+
+		return (fProject != null);
+	}
+
+	// Handled if we are in the ProjectView
+	public boolean isHandled() {
+		return false;
+	}
+
+	// ------------------------------------------------------------------------
+	// Execution
+	// ------------------------------------------------------------------------
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+
+		MessageBox mb = new MessageBox(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
+		mb.setText("Rename Project");
+		mb.setMessage("Not implemented yet");
+		mb.open();
+
+		return null;
+	}
+
+	public void dispose() {
+		// TODO Auto-generated method stub
+	}
+
+	// ------------------------------------------------------------------------
+	// IHandlerListener
+	// ------------------------------------------------------------------------
+
+	public void addHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+	public void removeHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameTraceHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameTraceHandler.java
new file mode 100644
index 0000000..3c1457d
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameTraceHandler.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.handlers;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.commands.IHandlerListener;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngTraceNode;
+import org.eclipse.swt.widgets.MessageBox;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * <b><u>RenameTraceHandler</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class RenameTraceHandler implements IHandler {
+
+	private LTTngTraceNode fTrace = null;
+
+	// ------------------------------------------------------------------------
+	// Validation
+	// ------------------------------------------------------------------------
+
+	public boolean isEnabled() {
+		return (fTrace != null);
+	}
+
+	// Handled if we are in the ProjectView
+	public boolean isHandled() {
+		return true;
+	}
+
+	// ------------------------------------------------------------------------
+	// Execution
+	// ------------------------------------------------------------------------
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+
+		MessageBox mb = new MessageBox(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
+		mb.setText("Rename Trace");
+		mb.setMessage("Not implemented yet");
+		mb.open();
+
+		return null;
+	}
+
+	public void dispose() {
+		// TODO Auto-generated method stub
+	}
+
+	// ------------------------------------------------------------------------
+	// IHandlerListener
+	// ------------------------------------------------------------------------
+
+	public void addHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+	public void removeHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/SelectTracesHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/SelectTracesHandler.java
new file mode 100644
index 0000000..ef3804d
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/SelectTracesHandler.java
@@ -0,0 +1,105 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.handlers;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.commands.IHandlerListener;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.linuxtools.lttng.ui.views.project.ProjectView;
+import org.eclipse.linuxtools.lttng.ui.views.project.dialogs.AddTraceWizard;
+import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngExperimentNode;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * <b><u>SelectTracesHandler</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class SelectTracesHandler implements IHandler {
+
+	private LTTngExperimentNode fExperiment = null;
+
+	// ------------------------------------------------------------------------
+	// Validation
+	// ------------------------------------------------------------------------
+
+	public boolean isEnabled() {
+
+		// Check if we are closing down
+		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		if (window == null)
+			return false;
+
+		// Check if we are in the Project View
+		IWorkbenchPage page = window.getActivePage();
+		if (!(page.getActivePart() instanceof ProjectView))
+			return false;
+
+		// Check that an experiment is selected
+		ISelection selection = page.getSelection(ProjectView.ID);
+		if (selection instanceof StructuredSelection) {
+			Object element = ((StructuredSelection) selection).getFirstElement();
+			fExperiment = (element instanceof LTTngExperimentNode) ? (LTTngExperimentNode) element : null;
+		}
+
+		return (fExperiment != null);
+	}
+
+	// Handled if we are in the ProjectView
+	public boolean isHandled() {
+		return true;
+	}
+
+	// ------------------------------------------------------------------------
+	// Execution
+	// ------------------------------------------------------------------------
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+
+		// Open the trace addition wizard
+		IWorkbench workbench = PlatformUI.getWorkbench();
+		Shell shell = workbench.getActiveWorkbenchWindow().getShell();
+
+		AddTraceWizard wizard = new AddTraceWizard(fExperiment.getProject(), fExperiment);
+		wizard.init(PlatformUI.getWorkbench(), null);
+		WizardDialog dialog = new WizardDialog(shell, wizard);
+		dialog.open();
+
+		return null;
+	}
+
+	public void dispose() {
+		// TODO Auto-generated method stub
+	}
+
+	// ------------------------------------------------------------------------
+	// IHandlerListener
+	// ------------------------------------------------------------------------
+
+	public void addHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+	public void removeHandlerListener(IHandlerListener handlerListener) {
+		// TODO Auto-generated method stub
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/TraceErrorHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/TraceErrorHandler.java
new file mode 100644
index 0000000..ebd6f4d
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/TraceErrorHandler.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   William Bourque - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.handlers;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.commands.IHandlerListener;
+import org.eclipse.linuxtools.lttng.ui.views.project.dialogs.TraceErrorDialog;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.PlatformUI;
+
+
+public class TraceErrorHandler implements IHandler {
+	
+	private String[] messages;
+	
+	public TraceErrorHandler(String[] newMessages) {
+		messages = newMessages;
+	}
+	
+	public boolean isEnabled() {
+		return true;
+	}
+	
+	public boolean isHandled() {
+		return true;
+	}
+	
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		IWorkbench workbench = PlatformUI.getWorkbench();
+		Shell shell = workbench.getActiveWorkbenchWindow().getShell();
+		
+		TraceErrorDialog dialog = new TraceErrorDialog(shell, messages);
+		dialog.open();
+
+		return null;
+	}
+
+	public void dispose() {
+	}
+	
+	public void addHandlerListener(IHandlerListener handlerListener) {
+	}
+
+	public void removeHandlerListener(IHandlerListener handlerListener) {
+	}
+
+}
+
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/ILTTngProjectTreeNode.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/ILTTngProjectTreeNode.java
new file mode 100644
index 0000000..dea2e32
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/ILTTngProjectTreeNode.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.model;
+
+import java.util.List;
+
+/**
+ * <b><u>ILTTngProjectTreeNode</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ * TODO: Make ILTTngProjectTreeNode extends IAdaptable
+ */
+public interface ILTTngProjectTreeNode {
+
+	public String getName();
+
+	public ILTTngProjectTreeNode getParent();
+
+	public boolean hasChildren();
+	
+	public List<ILTTngProjectTreeNode> getChildren();
+	
+	public void removeChild(ILTTngProjectTreeNode child);
+
+	public void removeChildren();
+
+	public void refreshChildren();
+
+	public void refresh();
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngExperimentFolderNode.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngExperimentFolderNode.java
new file mode 100644
index 0000000..5f5416b
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngExperimentFolderNode.java
@@ -0,0 +1,130 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.model;
+
+import java.lang.reflect.Array;
+
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+
+/**
+ * <b><u>LTTngExperimentFolderNode</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class LTTngExperimentFolderNode extends LTTngProjectTreeNode {
+
+	private final IFolder fExperimentFolder;
+
+	// ------------------------------------------------------------------------
+	// Constructors
+	// ------------------------------------------------------------------------
+
+	public LTTngExperimentFolderNode(IFolder folder) {
+		this(null, folder);
+	}
+
+	public LTTngExperimentFolderNode(ILTTngProjectTreeNode parent, IFolder folder) {
+		super(parent);
+		fExperimentFolder = folder;
+	}
+
+	// ------------------------------------------------------------------------
+	// LTTngProjectTreeNode
+	// ------------------------------------------------------------------------
+
+	public String getName() {
+		return fExperimentFolder.getName();
+	}
+
+	@Override
+	public void refreshChildren() {
+		try {
+			IResource[] resources = fExperimentFolder.members();
+			for (IResource resource : resources) {
+				if (resource instanceof IFolder) {
+					LTTngExperimentNode node = find(resource.getName());
+					if (node == null) {
+						node = new LTTngExperimentNode(this, (IFolder) resource);
+						fChildren.add(node);
+					}
+				}
+			}
+	        for (ILTTngProjectTreeNode node : fChildren) {
+	        	if (exists(node.getName(), resources)) {
+	        		node.refreshChildren();
+	        	}
+	        	else {
+	        		fChildren.remove(node);
+	        	}
+	        }
+		} catch (CoreException e) {
+		}
+	}
+
+	private LTTngExperimentNode find(String name) {
+		for (ILTTngProjectTreeNode node : fChildren) {
+			if (node instanceof LTTngExperimentNode && node.getName().equals(name)) {
+				return (LTTngExperimentNode) node;
+			}
+		}
+		return null;
+	}
+
+	private boolean exists(String name, IResource[] resources) {
+        for (IResource resource : resources) {
+			if (resource.getName().equals(name))
+				return true;
+        }
+		return false;
+	}
+
+	// ------------------------------------------------------------------------
+	// Accessors
+	// ------------------------------------------------------------------------
+
+	/**
+	 * @return
+	 */
+	public LTTngProjectNode getProject() {
+		return (LTTngProjectNode) getParent();
+	}
+
+	/**
+	 * @return
+	 */
+	public IFolder getFolder() {
+		return fExperimentFolder;
+	}
+
+	/**
+	 * @return
+	 */
+	public LTTngExperimentNode[] getExperiments() {
+		LTTngExperimentNode[] result = (LTTngExperimentNode[]) Array.newInstance(LTTngExperimentNode.class, fChildren.size());
+		return fChildren.toArray(result);
+	}
+
+	// ------------------------------------------------------------------------
+	// Modifiers
+	// ------------------------------------------------------------------------
+
+// 	No longer needed: handled by the IResourceChangeListener in the View
+	public void addExperiment(IFolder experiment) {
+//		LTTngExperimentNode node = new LTTngExperimentNode(this, experiment);
+//		fChildren.add(node);
+//		refresh();
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngExperimentNode.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngExperimentNode.java
new file mode 100644
index 0000000..e494bc4
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngExperimentNode.java
@@ -0,0 +1,125 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.model;
+
+import java.lang.reflect.Array;
+
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+
+/**
+ * <b><u>LTTngExperimentNode</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class LTTngExperimentNode extends LTTngProjectTreeNode {
+
+	private final IFolder fExperiment;
+
+	// ------------------------------------------------------------------------
+	// Constructors
+	// ------------------------------------------------------------------------
+
+	public LTTngExperimentNode(IFolder resource) {
+		this(null, resource);
+	}
+	
+	public LTTngExperimentNode(ILTTngProjectTreeNode parent, IFolder folder) {
+		super(parent);
+		fExperiment = folder;
+	}
+	
+	// ------------------------------------------------------------------------
+	// LTTngProjectTreeNode
+	// ------------------------------------------------------------------------
+
+	public String getName() {
+		return fExperiment.getName();
+	}
+
+	@Override
+	public void refreshChildren() {
+		try {
+			IResource[] resources = fExperiment.members(0);
+			for (IResource resource : resources) {
+				LTTngTraceNode node = find(resource.getName());
+				if (node == null) {
+					node = new LTTngTraceNode(this, (IFolder) resource);
+					fChildren.add(node);
+				}
+			}
+	        for (ILTTngProjectTreeNode node : fChildren) {
+	        	if (!exists(node.getName(), resources)) {
+	        		fChildren.remove(node);
+	        	}
+	        }
+		} catch (CoreException e) {
+		}
+	}
+
+	private LTTngTraceNode find(String name) {
+		for (ILTTngProjectTreeNode node : fChildren) {
+			if (node instanceof LTTngTraceNode && node.getName().equals(name)) {
+				return (LTTngTraceNode) node;
+			}
+		}
+		return null;
+	}
+
+	private boolean exists(String name, IResource[] resources) {
+        for (IResource resource : resources) {
+			if (resource.getName().equals(name))
+				return true;
+        }
+		return false;
+	}
+
+	// ------------------------------------------------------------------------
+	// Modifiers
+	// ------------------------------------------------------------------------
+
+// 	No longer needed: handled by the IResourceChangeListener in the View
+	public void addTrace(IFolder trace) {
+//		LTTngTraceNode node = new LTTngTraceNode(this, trace);
+//		fChildren.add(node);
+//		refresh();
+	}
+
+	// ------------------------------------------------------------------------
+	// Accessors
+	// ------------------------------------------------------------------------
+
+	/**
+	 * @return
+	 */
+	public IFolder getFolder() {
+		return fExperiment;
+	}
+
+	/**
+	 * @return
+	 */
+	public LTTngTraceNode[] getTraces() {
+		LTTngTraceNode[] result = (LTTngTraceNode[]) Array.newInstance(LTTngTraceNode.class, fChildren.size());
+		return fChildren.toArray(result);
+	}
+
+	/**
+	 * @return
+	 */
+	public LTTngProjectNode getProject() {
+		return (LTTngProjectNode) getParent().getParent();
+	}
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectContentProvider.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectContentProvider.java
new file mode 100644
index 0000000..12a8f74
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectContentProvider.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.model;
+
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+
+/**
+ * <b><u>LTTngProjectContentProvider</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+ public class LTTngProjectContentProvider implements ITreeContentProvider {
+
+	public Object[] getChildren(Object parentElement) {
+		return ((ILTTngProjectTreeNode) parentElement).getChildren().toArray();
+	}
+
+	public Object getParent(Object element) {
+		return ((ILTTngProjectTreeNode) element).getParent();
+	}
+
+	public boolean hasChildren(Object element) {
+		return ((ILTTngProjectTreeNode) element).hasChildren();
+	}
+
+	public Object[] getElements(Object inputElement) {
+		if (inputElement instanceof LTTngProjectRoot) {
+			return ((LTTngProjectRoot) inputElement).getChildren().toArray();
+		}
+        return null;
+	}
+
+	public void dispose() {
+		// TODO Auto-generated method stub
+	}
+
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		// TODO Auto-generated method stub
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectLabelProvider.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectLabelProvider.java
new file mode 100644
index 0000000..6dee2d4
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectLabelProvider.java
@@ -0,0 +1,140 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.model;
+
+import java.net.URL;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * <b><u>LTTngProjectLabelProvider</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ * TODO: Find proper icons for traces and experiments
+ */
+public class LTTngProjectLabelProvider implements ILabelProvider {
+
+	private final String fTraceIconFile      = "icons/garland16.png";
+//	private final String fExperimentIconFile = "icons/garland16.png";
+
+	private final Image fOpenedProjectIcon;
+	private final Image fClosedProjectIcon;
+	private final Image fFolderIcon;
+	private final Image fTraceIcon;
+	private final Image fExperimentIcon;
+
+	/**
+	 * 
+	 */
+	public LTTngProjectLabelProvider() {
+
+		fOpenedProjectIcon = PlatformUI.getWorkbench().getSharedImages().getImage(org.eclipse.ui.ide.IDE.SharedImages.IMG_OBJ_PROJECT);
+		fClosedProjectIcon = PlatformUI.getWorkbench().getSharedImages().getImage(org.eclipse.ui.ide.IDE.SharedImages.IMG_OBJ_PROJECT_CLOSED);
+		fFolderIcon  = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER);
+
+		fTraceIcon = loadIcon(fTraceIconFile);
+		fExperimentIcon = fFolderIcon; // loadIcon(fExperimentIconFile);
+	}
+
+	private Image loadIcon(String url) {
+		LTTngUiPlugin plugin = LTTngUiPlugin.getDefault();
+		Image icon = plugin.getImageRegistry().get(url);
+		if (icon == null) {
+			URL imageURL = plugin.getBundle().getEntry(url);
+			ImageDescriptor descriptor = ImageDescriptor.createFromURL(imageURL);
+			icon = descriptor.createImage();
+			plugin.getImageRegistry().put(url, icon);
+		}
+		return icon;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
+	 */
+	public Image getImage(Object element) {
+
+		if (element instanceof LTTngProjectNode) {
+			LTTngProjectNode project = (LTTngProjectNode) element;
+			return (project.isOpen()) ? fOpenedProjectIcon : fClosedProjectIcon;
+		}
+
+		if (element instanceof LTTngTraceFolderNode) {
+			return fFolderIcon;
+		}
+
+		if (element instanceof LTTngTraceNode) {
+			return fTraceIcon;
+		}
+
+		if (element instanceof LTTngExperimentFolderNode) {
+			return fFolderIcon;
+		}
+
+		if (element instanceof LTTngExperimentNode) {
+			return fExperimentIcon;
+		}
+
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
+	 */
+	public String getText(Object element) {
+		ILTTngProjectTreeNode node = (ILTTngProjectTreeNode) element;
+		String label = node.getName();
+		if (node instanceof LTTngTraceFolderNode      || 
+			node instanceof LTTngExperimentFolderNode ||
+			node instanceof LTTngExperimentNode)
+		{
+			label += " [" + node.getChildren().size() + "]";
+		}
+		return label;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
+	 */
+	public void addListener(ILabelProviderListener listener) {
+		// TODO Auto-generated method stub
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
+	 */
+	public void dispose() {
+		// TODO Auto-generated method stub
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
+	 */
+	public boolean isLabelProperty(Object element, String property) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
+	 */
+	public void removeListener(ILabelProviderListener listener) {
+		// TODO Auto-generated method stub
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectNode.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectNode.java
new file mode 100644
index 0000000..748dce7
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectNode.java
@@ -0,0 +1,200 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.linuxtools.lttng.ui.views.project.LTTngProjectNature;
+
+/**
+ * <b><u>LTTngProjectNode</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class LTTngProjectNode extends LTTngProjectTreeNode {
+
+	public static final String TRACE_FOLDER_NAME = "Traces";
+	public static final String EXPER_FOLDER_NAME = "Experiments";
+
+	private final IProject fProject;
+	private boolean fIsLTTngProject;
+	private boolean fIsOpen;
+	private LTTngTraceFolderNode fTracesFolder;
+	private LTTngExperimentFolderNode fExperimentsFolder;
+
+	// ------------------------------------------------------------------------
+	// Constructors
+	// ------------------------------------------------------------------------
+
+	public LTTngProjectNode(IProject project) {
+		this(null, project);
+	}
+
+	public LTTngProjectNode(ILTTngProjectTreeNode parent, IProject project) {
+		super(parent);
+		fProject = project;
+		updateState();
+	}
+
+	// ------------------------------------------------------------------------
+	// LTTngProjectTreeNode
+	// ------------------------------------------------------------------------
+
+	public String getName() {
+		return fProject.getName();
+	}
+
+	@Override
+	public void refreshChildren() {
+
+		if (!(fIsOpen && fIsLTTngProject))
+			return;
+
+		try {
+			IResource[] resources = fProject.members();
+			for (IResource resource : resources) {
+				if (resource.getType() == IResource.FOLDER) {
+					String name = resource.getName();
+					if (name.equals(TRACE_FOLDER_NAME) && !isIncluded(true, name, fChildren)) {
+						fTracesFolder = new LTTngTraceFolderNode(this, (IFolder) resource);
+						fChildren.add(fTracesFolder);
+					} else
+					if (name.equals(EXPER_FOLDER_NAME) && !isIncluded(false, name, fChildren)) {
+						fExperimentsFolder = new LTTngExperimentFolderNode(this, (IFolder) resource);
+						fChildren.add(fExperimentsFolder);
+					}
+				}
+			}
+        	List<ILTTngProjectTreeNode> toRemove = new ArrayList<ILTTngProjectTreeNode>();
+	        for (ILTTngProjectTreeNode node : fChildren) {
+	        	if (exists(node.getName(), resources)) {
+	        		node.refreshChildren();
+	        	}
+	        	else {
+	        		toRemove.add(node);
+	        	}
+	        }
+    		for (ILTTngProjectTreeNode node : toRemove) {
+    			fChildren.remove(node);
+    		}
+	        
+		} catch (CoreException e) {
+		}
+	}
+
+	private boolean isIncluded(boolean isTraces, String name, List<ILTTngProjectTreeNode> list) {
+		boolean found = false;
+		for (ILTTngProjectTreeNode node : list) {
+			if (node instanceof LTTngTraceFolderNode && isTraces) {
+				found |= node.getName().equals(name);
+			} else
+			if (node instanceof LTTngExperimentFolderNode && !isTraces) {
+				found |= node.getName().equals(name);
+			}
+		}
+		return found;
+	}
+
+	private boolean exists(String name, IResource[] resources) {
+        for (IResource resource : resources) {
+			if (resource.getName().equals(name))
+				return true;
+        }
+		return false;
+	}
+
+	// ------------------------------------------------------------------------
+	// Modifiers
+	// ------------------------------------------------------------------------
+
+	public void openProject() {
+		try {
+			fProject.open(null);
+			updateState();
+			refreshChildren();
+		} catch (CoreException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void closeProject() {
+		try {
+			fProject.close(null);
+			updateState();
+			removeChildren();
+		} catch (CoreException e) {
+			e.printStackTrace();
+		}
+	}
+
+	private boolean isLTTngProject(IProject project) {
+		boolean result = false;
+		if (project != null && project.isAccessible()) {
+			try {
+				result = project.hasNature(LTTngProjectNature.ID);
+			} catch (CoreException e) {
+			}
+		}
+		return result;
+	}
+
+	public void updateState() {
+		fIsOpen = (fProject != null) ? fProject.isAccessible() : false;
+		fIsLTTngProject = isLTTngProject(fProject);
+	}
+
+	// ------------------------------------------------------------------------
+	// Accessors
+	// ------------------------------------------------------------------------
+
+	/**
+	 * @return
+	 */
+	public boolean isLTTngProject() {
+		return fIsLTTngProject;
+	}
+
+	/**
+	 * @return
+	 */
+	public boolean isOpen() {
+		return fIsOpen;
+	}
+
+	/**
+	 * @return
+	 */
+	public IProject getProject() {
+		return fProject;
+	}
+
+	/**
+	 * @return
+	 */
+	public LTTngTraceFolderNode getTracesFolder() {
+		return fTracesFolder;
+	}
+
+	/**
+	 * @return
+	 */
+	public LTTngExperimentFolderNode getExperimentsFolder() {
+		return fExperimentsFolder;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectRoot.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectRoot.java
new file mode 100644
index 0000000..b54831c
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectRoot.java
@@ -0,0 +1,99 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.linuxtools.lttng.ui.views.project.ProjectView;
+
+/**
+ * <b><u>LTTngProjectRoot</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class LTTngProjectRoot extends LTTngProjectTreeNode {
+
+	private final ProjectView fView;
+	
+	// ------------------------------------------------------------------------
+	// Constructors
+	// ------------------------------------------------------------------------
+
+	public LTTngProjectRoot(ProjectView view) {
+		super(null);
+		fView = view;
+		refreshChildren();
+	}
+
+	@Override
+	public void refresh() {
+		fView.refresh();
+	}
+
+	// ------------------------------------------------------------------------
+	// LTTngProjectTreeNode
+	// ------------------------------------------------------------------------
+
+	public String getName() {
+		return null;
+	}
+
+	@Override
+	public void refreshChildren() {
+        IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+        IProject[] projects = root.getProjects();
+        for (IProject project : projects) {
+			LTTngProjectNode node = find(project.getName());
+			if (node == null) {
+				node = new LTTngProjectNode(this, project);
+				fChildren.add(node);
+			} else {
+				node.updateState();
+			}
+        }
+      	List<ILTTngProjectTreeNode> toRemove = new ArrayList<ILTTngProjectTreeNode>();
+       	for (ILTTngProjectTreeNode node : fChildren) {
+       		if (exists(node.getName(), projects)) {
+       			node.refreshChildren();
+       		}
+       		else {
+        		toRemove.add(node);
+       		}
+        }
+		for (ILTTngProjectTreeNode node : toRemove) {
+			fChildren.remove(node);
+		}
+	}
+
+	private LTTngProjectNode find(String name) {
+		for (ILTTngProjectTreeNode node : fChildren) {
+			if (node instanceof LTTngProjectNode && node.getName().equals(name)) {
+				return (LTTngProjectNode) node;
+			}
+		}
+		return null;
+	}
+
+	private boolean exists(String name, IProject[] projects) {
+        for (IProject project : projects) {
+			if (project.getName().equals(name))
+				return true;
+        }
+		return false;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectTreeNode.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectTreeNode.java
new file mode 100644
index 0000000..b35bbfd
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectTreeNode.java
@@ -0,0 +1,82 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <b><u>LTTngProjectTreeNode</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public abstract class LTTngProjectTreeNode implements ILTTngProjectTreeNode {
+
+	protected ILTTngProjectTreeNode fParent = null;
+	protected List<ILTTngProjectTreeNode> fChildren = null;
+
+	// ------------------------------------------------------------------------
+	// Constructor
+	// ------------------------------------------------------------------------
+
+	public LTTngProjectTreeNode(ILTTngProjectTreeNode parent) {
+		fParent = parent;
+		fChildren = new ArrayList<ILTTngProjectTreeNode>();
+	}
+
+	@Override
+	public String toString() {
+		return getName();
+	}
+	
+	// ------------------------------------------------------------------------
+	// ILTTngProjectTreeNode
+	// ------------------------------------------------------------------------
+
+	public ILTTngProjectTreeNode getParent() {
+		return fParent;
+	}
+
+	public boolean hasChildren() {
+		return fChildren.size() > 0;
+	}
+
+	public List<ILTTngProjectTreeNode> getChildren() {
+		return fChildren;
+	}
+
+	public abstract void refreshChildren();
+
+	public void refresh() {
+		fParent.refresh();
+	}
+
+	public void removeChild(ILTTngProjectTreeNode child) {
+        for (ILTTngProjectTreeNode node : fChildren) {
+        	if (node == child) {
+        		node.removeChildren();
+        		// We can do it since we are returning right away
+        		fChildren.remove(node);
+        		return;
+        	}
+        }
+	}
+
+	public void removeChildren() {
+        for (ILTTngProjectTreeNode node : fChildren) {
+        		node.removeChildren();
+        }
+		fChildren.clear();
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngTraceFolderNode.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngTraceFolderNode.java
new file mode 100644
index 0000000..de11690
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngTraceFolderNode.java
@@ -0,0 +1,127 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.model;
+
+import java.lang.reflect.Array;
+
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+
+/**
+ * <b><u>LTTngTraceFolderNode</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class LTTngTraceFolderNode extends LTTngProjectTreeNode {
+
+	private final IFolder fTraceFolder;
+
+	// ------------------------------------------------------------------------
+	// Constructors
+	// ------------------------------------------------------------------------
+
+	public LTTngTraceFolderNode(IFolder folder) {
+		this(null, folder);
+	}
+
+	public LTTngTraceFolderNode(ILTTngProjectTreeNode parent, IFolder folder) {
+		super(parent);
+		fTraceFolder = folder;
+	}
+
+	// ------------------------------------------------------------------------
+	// LTTngProjectTreeNode
+	// ------------------------------------------------------------------------
+
+	public String getName() {
+		return fTraceFolder.getName();
+	}
+
+	@Override
+	public void refreshChildren() {
+		try {
+			IResource[] resources = fTraceFolder.members();
+			for (IResource resource : resources) {
+				if (resource instanceof IFolder) {
+					LTTngTraceNode node = find(resource.getName());
+					if (node == null) {
+						node = new LTTngTraceNode(this, (IFolder) resource);
+						fChildren.add(node);
+					}
+				}
+			}
+	        for (ILTTngProjectTreeNode node : fChildren) {
+	        	if (!exists(node.getName(), resources)) {
+	        		fChildren.remove(node);
+	        	}
+	        }
+		} catch (CoreException e) {
+		}
+	}
+
+	private LTTngTraceNode find(String name) {
+		for (ILTTngProjectTreeNode node : fChildren) {
+			if (node instanceof LTTngTraceNode && node.getName().equals(name)) {
+				return (LTTngTraceNode) node;
+			}
+		}
+		return null;
+	}
+
+	private boolean exists(String name, IResource[] resources) {
+        for (IResource resource : resources) {
+			if (resource.getName().equals(name))
+				return true;
+        }
+		return false;
+	}
+
+	// ------------------------------------------------------------------------
+	// Accessors
+	// ------------------------------------------------------------------------
+
+	/**
+	 * @return
+	 */
+	public LTTngProjectNode getProject() {
+		return (LTTngProjectNode) getParent();
+	}
+
+	/**
+	 * @return
+	 */
+	public IFolder getFolder() {
+		return fTraceFolder;
+	}
+
+	/**
+	 * @return
+	 */
+	public LTTngTraceNode[] getTraces() {
+		LTTngTraceNode[] result = (LTTngTraceNode[]) Array.newInstance(LTTngTraceNode.class, fChildren.size());
+		return fChildren.toArray(result);
+	}
+
+	// ------------------------------------------------------------------------
+	// Modifiers
+	// ------------------------------------------------------------------------
+
+// 	No longer needed: handled by the IResourceChangeListener in the View
+	public void addTrace(IFolder trace) {
+//		LTTngTraceNode node = new LTTngTraceNode(this, trace);
+//		fChildren.add(node);
+//		refresh();
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngTraceNode.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngTraceNode.java
new file mode 100644
index 0000000..4312a2d
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngTraceNode.java
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.project.model;
+
+import org.eclipse.core.resources.IFolder;
+
+/**
+ * <b><u>LTTngTraceNode</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class LTTngTraceNode extends LTTngProjectTreeNode {
+	
+	private final IFolder fTrace;
+
+	// ------------------------------------------------------------------------
+	// Constructors
+	// ------------------------------------------------------------------------
+
+	public LTTngTraceNode(IFolder folder) {
+		this(null, folder);
+	}
+
+	public LTTngTraceNode(ILTTngProjectTreeNode parent, IFolder trace) {
+		super(parent);
+		fTrace = trace;
+	}
+
+	// ------------------------------------------------------------------------
+	// LTTngProjectTreeNode
+	// ------------------------------------------------------------------------
+
+	public String getName() {
+		return fTrace.getName();
+	}
+
+	@Override
+	public void refreshChildren() {
+	}
+
+	// ------------------------------------------------------------------------
+	// Accessors
+	// ------------------------------------------------------------------------
+
+	/**
+	 * @return
+	 */
+	public LTTngProjectNode getProject() {
+		return (LTTngProjectNode) getParent().getParent();
+	}
+
+	/**
+	 * @return
+	 */
+	public IFolder getFolder() {
+		return fTrace;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/Messages.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/Messages.java
new file mode 100644
index 0000000..e01dae1
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/Messages.java
@@ -0,0 +1,33 @@
+/*******************************************************************************

+ * Copyright (c) 2009 Ericsson

+ * 

+ * All rights reserved. This program and the accompanying materials are

+ * made available under the terms of the Eclipse Public License v1.0 which

+ * accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation

+ *******************************************************************************/

+package org.eclipse.linuxtools.lttng.ui.views.resources;

+

+import java.util.MissingResourceException;

+import java.util.ResourceBundle;

+

+public class Messages {

+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.lttng.ui.views.resources.messages"; //$NON-NLS-1$

+

+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle

+			.getBundle(BUNDLE_NAME);

+

+	private Messages() {

+	}

+

+	public static String getString(String key) {

+		try {

+			return RESOURCE_BUNDLE.getString(key);

+		} catch (MissingResourceException e) {

+			return '!' + key + '!';

+		}

+	}

+}

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java
new file mode 100644
index 0000000..00db512
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java
@@ -0,0 +1,694 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors: Alvaro Sanchez-Leon - Initial implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.resources;
+
+import java.util.Arrays;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.linuxtools.lttng.event.LttngTimestamp;
+import org.eclipse.linuxtools.lttng.state.StateDataRequest;
+import org.eclipse.linuxtools.lttng.state.StateManager;
+import org.eclipse.linuxtools.lttng.state.evProcessor.EventProcessorProxy;
+import org.eclipse.linuxtools.lttng.state.experiment.StateExperimentManager;
+import org.eclipse.linuxtools.lttng.state.experiment.StateManagerFactory;
+import org.eclipse.linuxtools.lttng.ui.TraceDebug;
+import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource;
+import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeViewerProvider;
+import org.eclipse.linuxtools.lttng.ui.views.common.AbsTimeUpdateView;
+import org.eclipse.linuxtools.lttng.ui.views.common.ParamsUpdater;
+import org.eclipse.linuxtools.lttng.ui.views.resources.evProcessor.ResourcesTRangeUpdateFactory;
+import org.eclipse.linuxtools.lttng.ui.views.resources.model.ResourceModelFactory;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler;
+import org.eclipse.linuxtools.tmf.signal.TmfSignalManager;
+import org.eclipse.linuxtools.tmf.signal.TmfTimeSynchSignal;
+import org.eclipse.linuxtools.tmf.ui.viewers.TmfViewerFactory;
+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.ITimeAnalysisViewer;
+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.ITmfTimeScaleSelectionListener;
+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.ITmfTimeSelectionListener;
+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.TmfTimeScaleSelectionEvent;
+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.TmfTimeSelectionEvent;
+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITmfTimeAnalysisEntry;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IWorkbenchActionConstants;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+
+/**
+ * @author alvaro
+ * 
+ */
+public class ResourcesView extends AbsTimeUpdateView implements
+		ITmfTimeSelectionListener, ITmfTimeScaleSelectionListener {
+
+	// ========================================================================
+	// Data
+	// ========================================================================
+	public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.resources";
+
+	// private int totalNumItems = 0;
+	// Actions
+	private Action resetScale;
+	private Action nextEvent;
+	private Action prevEvent;
+	private Action nextTrace;
+	private Action prevTrace;
+	private Action showLegend;
+	private Action filterTraces;
+	private Action zoomIn;
+	private Action zoomOut;
+	private Action synch;
+
+	private ITimeAnalysisViewer tsfviewer;
+	private Composite top;
+
+	// private static SimpleDateFormat stimeformat = new SimpleDateFormat(
+	// "yy/MM/dd HH:mm:ss");
+
+	// private TraceModelImplFactory fact;
+
+	// ========================================================================
+	// Constructor
+	// ========================================================================
+
+	/**
+	 * The constructor.
+	 */
+	public ResourcesView() {
+		super(ID);
+	}
+
+	// ========================================================================
+	// Methods
+	// ========================================================================
+
+	/**
+	 * This is a callback that will allow us to create the viewer and initialize
+	 * it.
+	 */
+	@Override
+	public void createPartControl(Composite parent) {
+		top = new Composite(parent, SWT.BORDER);
+
+		top.setLayout(new FillLayout());
+		tsfviewer = TmfViewerFactory.createViewer(top,
+				new TimeRangeViewerProvider());
+
+		tsfviewer.addWidgetSelectionListner(this);
+		tsfviewer.addWidgetTimeScaleSelectionListner(this);
+
+		// Traces shall not be grouped to allow synchronisation
+		tsfviewer.groupTraces(true);
+		tsfviewer.setAcceptSelectionAPIcalls(true);
+
+		// Viewer to notify selection to this class
+		// This class will synchronise selections with table.
+		tsfviewer.addWidgetSelectionListner(this);
+		tsfviewer.addWidgetTimeScaleSelectionListner(this);
+
+		// Create the help context id for the viewer's control
+		// TODO: Associate with help system
+		PlatformUI.getWorkbench().getHelpSystem().setHelp(
+				tsfviewer.getControl(),
+				"org.eclipse.linuxtools.lttng.ui.views.resource.view"); //$NON-NLS-1$
+
+		makeActions();
+		hookContextMenu();
+		contributeToActionBars();
+
+		// Register the updater in charge to refresh elements as we update the
+		// time ranges
+		// FlowParamsUpdater listener = FlowModelFactory.getParamsUpdater();
+		// tsfviewer.addWidgetTimeScaleSelectionListner(listener);
+
+		// TODO: re-factor registration / notification process
+		// Register this view to receive updates when the model is updated with
+		// fresh info
+		// ModelListenFactory.getRegister().addFlowModelUpdatesListener(this);
+
+		// Register the event processor factory in charge of event handling
+		EventProcessorProxy.getInstance().addEventProcessorFactory(
+				ResourcesTRangeUpdateFactory.getInstance());
+
+		// set the initial view parameter values
+		// Experiment start and end time
+		// as well as time space width in pixels, used by the time analysis
+		// widget
+		ParamsUpdater paramUpdater = ResourceModelFactory.getParamsUpdater();
+		StateExperimentManager experimentManger = StateManagerFactory
+				.getExperimentManager();
+		// Read relevant values
+		int timeSpaceWidth = tsfviewer.getTimeSpace();
+		TmfTimeRange timeRange = experimentManger.getExperimentTimeRange();
+		if (timeRange != null) {
+			long time0 = timeRange.getStartTime().getValue();
+			long time1 = timeRange.getEndTime().getValue();
+			paramUpdater.update(time0, time1, timeSpaceWidth);
+		}
+
+		// Read current data if any available
+		StateManagerFactory.getExperimentManager().readExperiment(
+				"resourceView", this);
+	}
+
+	private void hookContextMenu() {
+		MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
+		menuMgr.setRemoveAllWhenShown(true);
+		menuMgr.addMenuListener(new IMenuListener() {
+			public void menuAboutToShow(IMenuManager manager) {
+				ResourcesView.this.fillContextMenu(manager);
+			}
+		});
+
+		Menu menu = menuMgr.createContextMenu(tsfviewer.getControl());
+		tsfviewer.getControl().setMenu(menu);
+		getSite()
+				.registerContextMenu(menuMgr, tsfviewer.getSelectionProvider());
+	}
+
+	private void contributeToActionBars() {
+		IActionBars bars = getViewSite().getActionBars();
+		fillLocalPullDown(bars.getMenuManager());
+		fillLocalToolBar(bars.getToolBarManager());
+	}
+
+	private void fillLocalPullDown(IMenuManager manager) {
+		manager.add(new Separator());
+		// manager.add(showLegend);
+		manager.add(new Separator());
+		manager.add(resetScale);
+		manager.add(nextEvent);
+		manager.add(prevEvent);
+		manager.add(nextTrace);
+		manager.add(prevTrace);
+		// manager.add(filterTraces);
+		manager.add(zoomIn);
+		manager.add(zoomOut);
+		manager.add(synch);
+		manager.add(new Separator());
+	}
+
+	private void fillContextMenu(IMenuManager manager) {
+		// manager.add(showLegend);
+		manager.add(new Separator());
+		manager.add(resetScale);
+		manager.add(nextEvent);
+		manager.add(prevEvent);
+		manager.add(nextTrace);
+		manager.add(prevTrace);
+		// manager.add(showLegend);
+		// manager.add(filterTraces);
+		manager.add(zoomIn);
+		manager.add(zoomOut);
+		manager.add(synch);
+		manager.add(new Separator());
+		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
+	}
+
+	private void fillLocalToolBar(IToolBarManager manager) {
+		// manager.add(showLegend);
+		manager.add(new Separator());
+		manager.add(resetScale);
+		manager.add(nextEvent);
+		manager.add(prevEvent);
+		manager.add(nextTrace);
+		manager.add(prevTrace);
+		// manager.add(filterTraces);
+		manager.add(zoomIn);
+		manager.add(zoomOut);
+		manager.add(synch);
+		manager.add(new Separator());
+	}
+
+	private void makeActions() {
+		// action4
+		resetScale = new Action() {
+			@Override
+			public void run() {
+				if (tsfviewer != null) {
+					tsfviewer.resetStartFinishTime();
+				}
+
+			}
+		};
+		resetScale.setText(Messages.getString("ResourcesView.Action.Reset")); //$NON-NLS-1$
+		resetScale.setToolTipText(Messages
+				.getString("ResourcesView.Action.Reset.ToolTip")); //$NON-NLS-1$
+		resetScale.setImageDescriptor(AbstractUIPlugin
+				.imageDescriptorFromPlugin(Messages
+						.getString("ResourcesView.tmf.UI"),
+						"icons/home_nav.gif"));
+
+		// action5
+		nextEvent = new Action() {
+			@Override
+			public void run() {
+				if (tsfviewer != null) {
+					tsfviewer.selectNextEvent();
+				}
+			}
+		};
+		nextEvent.setText(Messages.getString("ResourcesView.Action.NextEvent")); //$NON-NLS-1$
+		nextEvent.setToolTipText(Messages
+				.getString("ResourcesView.Action.NextEvent.Tooltip")); //$NON-NLS-1$
+		nextEvent.setImageDescriptor(AbstractUIPlugin
+				.imageDescriptorFromPlugin(Messages
+						.getString("ResourcesView.tmf.UI"),
+						"icons/next_event.gif"));
+
+		// action6
+		prevEvent = new Action() {
+			@Override
+			public void run() {
+				if (tsfviewer != null) {
+					tsfviewer.selectPrevEvent();
+				}
+			}
+		};
+		prevEvent.setText(Messages.getString("ResourcesView.Action.PrevEvent")); //$NON-NLS-1$
+		prevEvent.setToolTipText(Messages
+				.getString("ResourcesView.Action.PrevEvent.Tooltip")); //$NON-NLS-1$
+		prevEvent.setImageDescriptor(AbstractUIPlugin
+				.imageDescriptorFromPlugin(Messages
+						.getString("ResourcesView.tmf.UI"),
+						"icons/prev_event.gif"));
+
+		// action7
+		nextTrace = new Action() {
+			@Override
+			public void run() {
+				if (tsfviewer != null) {
+					tsfviewer.selectNextTrace();
+				}
+			}
+		};
+		nextTrace.setText(Messages
+				.getString("ResourcesView.Action.NextResource")); //$NON-NLS-1$
+		nextTrace.setToolTipText(Messages
+				.getString("ResourcesView.Action.NextResource.ToolTip")); //$NON-NLS-1$
+		nextTrace.setImageDescriptor(AbstractUIPlugin
+				.imageDescriptorFromPlugin(Messages
+						.getString("ResourcesView.tmf.UI"),
+						"icons/next_item.gif"));
+
+		// action8
+		prevTrace = new Action() {
+			@Override
+			public void run() {
+				if (tsfviewer != null) {
+					tsfviewer.selectPrevTrace();
+				}
+			}
+		};
+		prevTrace.setText(Messages
+				.getString("ResourcesView.Action.PreviousResource")); //$NON-NLS-1$
+		prevTrace.setToolTipText(Messages
+				.getString("ResourcesView.Action.PreviousResource.Tooltip")); //$NON-NLS-1$
+		prevTrace.setImageDescriptor(AbstractUIPlugin
+				.imageDescriptorFromPlugin(Messages
+						.getString("ResourcesView.tmf.UI"),
+						"icons/prev_item.gif"));
+
+		// action9
+		showLegend = new Action() {
+			@Override
+			public void run() {
+				if (tsfviewer != null) {
+					tsfviewer.showLegend();
+				}
+			}
+		};
+		showLegend.setText(Messages.getString("ResourcesView.Action.Legend")); //$NON-NLS-1$
+		showLegend.setToolTipText(Messages
+				.getString("ResourcesView.Action.Legend.ToolTip")); //$NON-NLS-1$
+
+		// action10
+		filterTraces = new Action() {
+			@Override
+			public void run() {
+				if (tsfviewer != null) {
+					tsfviewer.filterTraces();
+				}
+			}
+		};
+		filterTraces.setText(Messages.getString("ResourcesView.Action.Filter")); //$NON-NLS-1$
+		filterTraces.setToolTipText(Messages
+				.getString("ResourcesView.Action.Filter.ToolTip")); //$NON-NLS-1$
+		filterTraces.setImageDescriptor(AbstractUIPlugin
+				.imageDescriptorFromPlugin(Messages
+						.getString("ResourcesView.tmf.UI"),
+						"icons/filter_items.gif"));
+
+		// action10
+		zoomIn = new Action() {
+			@Override
+			public void run() {
+				if (tsfviewer != null) {
+					tsfviewer.zoomIn();
+				}
+			}
+		};
+		zoomIn.setText(Messages.getString("ResourcesView.Action.ZoomIn")); //$NON-NLS-1$
+		zoomIn.setToolTipText(Messages
+				.getString("ResourcesView.Action.ZoomIn.Tooltip")); //$NON-NLS-1$
+		zoomIn.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(
+				Messages.getString("ResourcesView.tmf.UI"),
+				"icons/zoomin_nav.gif"));
+
+		// action10
+		zoomOut = new Action() {
+			@Override
+			public void run() {
+				if (tsfviewer != null) {
+					tsfviewer.zoomOut();
+				}
+			}
+		};
+		zoomOut.setText(Messages.getString("ResourcesView.Action.ZoomOut")); //$NON-NLS-1$
+		zoomOut.setToolTipText(Messages
+				.getString("ResourcesView.Action.ZoomOut.tooltip")); //$NON-NLS-1$
+		zoomOut.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(
+				Messages.getString("ResourcesView.tmf.UI"),
+				"icons/zoomout_nav.gif"));
+
+		// action11
+		synch = new Action() {
+			@Override
+			public void run() {
+				// Note: No action since the synch flag is used by Control flow
+				// view
+				// the actual viewer is set to accept api selections in
+				// createpartcontrol.
+
+				// if (synch.isChecked()) {
+				// tsfviewer.setAcceptSelectionAPIcalls(true);
+				// } else {
+				// tsfviewer.setAcceptSelectionAPIcalls(false);
+				// }
+			}
+		};
+		synch.setText(Messages.getString("ResourcesView.Action.Synchronize")); //$NON-NLS-1$
+		synch.setToolTipText(Messages
+				.getString("ResourcesView.Action.Synchronize.ToolTip")); //$NON-NLS-1$
+		synch.setChecked(false);
+		synch.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(
+				Messages.getString("ResourcesView.tmf.UI"),
+						"icons/synced.gif"));
+		// PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_ELCL_SYNCED);
+	}
+
+	/**
+	 * Passing the focus request to the viewer's control.
+	 */
+	@Override
+	public void setFocus() {
+		tsfviewer.getControl().setFocus();
+	}
+
+	public void tsfTmProcessSelEvent(TmfTimeSelectionEvent event) {
+		Object source = event.getSource();
+		if (source == null) {
+			return;
+		}
+
+		// TmfTimeAnalysisViewer rViewer = (TmfTimeAnalysisViewer)
+		// event.getSource();
+		// TmfTimeAnalysisViewer synchViewer = null;
+		// Synchronize viewer selections if Enabled,
+		// make sure the selection does not go in loops
+		// if (tsfviewer == rViewer) {
+		// synchViewer = tsfviewer2;
+		// } else {
+		// synchViewer = tsfviewer;
+		// }
+		// Notify listener views.
+
+		ParamsUpdater paramUpdater = ResourceModelFactory.getParamsUpdater();
+		Long savedSelTime = paramUpdater.getSelectedTime();
+
+		long selTimens = event.getSelectedTime();
+
+		// make sure the new selected time is different than saved before
+		// executing update
+		if (savedSelTime == null || savedSelTime != selTimens) {
+			// Notify listener views.
+			synchTimeNotification(selTimens);
+
+			// Update the parameter updater to save the selected time
+			paramUpdater.setSelectedTime(selTimens);
+
+			if (TraceDebug.isDEBUG()) {
+				// Object selection = event.getSelection();
+				TraceDebug.debug("Selected Time in Resource View: "
+						+ new LttngTimestamp(selTimens));
+			}
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @seeorg.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.
+	 * ITmfTimeScaleSelectionListener
+	 * #tsfTmProcessTimeScaleEvent(org.eclipse.linuxtools
+	 * .tmf.ui.viewers.timeAnalysis.TmfTimeScaleSelectionEvent)
+	 */
+	public void tsfTmProcessTimeScaleEvent(TmfTimeScaleSelectionEvent event) {
+		// source needed to keep track of source values
+		Object source = event.getSource();
+
+		if (source != null) {
+			// Update the parameter updater before carrying out a read request
+			ParamsUpdater paramUpdater = ResourceModelFactory
+					.getParamsUpdater();
+			boolean newParams = paramUpdater.processTimeScaleEvent(event);
+
+			if (newParams) {
+				// Read the updated time window
+				TmfTimeRange trange = paramUpdater.getTrange();
+				// Either send a new request or queue for next opportunity
+				dataRequest(trange);
+			}
+		}
+	}
+
+	/**
+	 * Obtains the remainder fraction on unit Seconds of the entered value in
+	 * nanoseconds. e.g. input: 1241207054171080214 ns The number of seconds can
+	 * be obtain by removing the last 9 digits: 1241207054 the fractional
+	 * portion of seconds, expressed in ns is: 171080214
+	 * 
+	 * @param v
+	 * @return
+	 */
+	public String formatNs(long v) {
+		StringBuffer str = new StringBuffer();
+		boolean neg = v < 0;
+		if (neg) {
+			v = -v;
+			str.append('-');
+		}
+
+		String strVal = String.valueOf(v);
+		if (v < 1000000000) {
+			return strVal;
+		}
+
+		// Extract the last nine digits (e.g. fraction of a S expressed in ns
+		return strVal.substring(strVal.length() - 9);
+	}
+
+	/**
+	 * @param items
+	 * @param startTime
+	 * @param endTime
+	 * @param timeUpdate - Time bounds updated needed e.g. if a new Experiment or trace is selected
+	 */
+	public void resourceModelUpdates(final ITmfTimeAnalysisEntry[] items,
+			final long startTime, final long endTime, final boolean timeUpdate) {
+		tsfviewer.getControl().getDisplay().asyncExec(new Runnable() {
+
+			public void run() {
+				tsfviewer.display(items, startTime, endTime, timeUpdate);
+				tsfviewer.resizeControls();
+			}
+		});
+	}
+
+	@Override
+	public void dispose() {
+		// dispose parent resources
+		super.dispose();
+		// Remove the event processor factory
+		EventProcessorProxy.getInstance().removeEventProcessorFactory(
+				ResourcesTRangeUpdateFactory.getInstance());
+
+		tsfviewer.removeWidgetSelectionListner(this);
+		tsfviewer.removeWidgetTimeScaleSelectionListner(this);
+		tsfviewer = null;
+	}
+
+	/**
+	 * Trigger time synchronisation to other views this method shall be called
+	 * when a check has been performed to note that an actual change of time has
+	 * been performed vs a pure re-selection of the same time
+	 * 
+	 * @param time
+	 */
+	private void synchTimeNotification(long time) {
+		// if synchronisation selected
+		if (synch.isChecked()) {
+			// Notify other views
+			TmfSignalManager.dispatchSignal(new TmfTimeSynchSignal(this,
+					new LttngTimestamp(time)));
+		}
+	}
+
+	/**
+	 * Registers as listener of time selection from other tmf views
+	 * 
+	 * @param signal
+	 */
+	@TmfSignalHandler
+	public void synchToTime(TmfTimeSynchSignal signal) {
+		if (synch.isChecked()) {
+			Object source = signal.getSource();
+			if (signal != null && source != null && source != this) {
+				// Internal value is expected in nano seconds.
+				long selectedTime = signal.getCurrentTime().getValue();
+				if (tsfviewer != null) {
+					tsfviewer.setSelectedTime(selectedTime, true, source);
+				}
+			}
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.linuxtools.lttng.ui.views.common.LttngTimeUpdateView#waitCursor
+	 * (boolean)
+	 */
+	@Override
+	protected void waitCursor(final boolean waitInd) {
+		if (tsfviewer != null) {
+			Display display = tsfviewer.getControl().getDisplay();
+
+			// Perform the updates on the UI thread
+			display.asyncExec(new Runnable() {
+				public void run() {
+					tsfviewer.waitCursor(waitInd);
+				}
+			});
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @seeorg.eclipse.linuxtools.lttng.ui.views.common.AbsTimeUpdateView#
+	 * ModelUpdatePrep(java.lang.String, boolean)
+	 */
+	@Override
+	public void ModelUpdatePrep(String traceId, boolean clearAllData,
+			TmfTimeRange trange) {
+		if (clearAllData) {
+			ResourceModelFactory.getResourceContainer().clearResources();
+		} else {
+			ResourceModelFactory.getResourceContainer().clearChildren(traceId);
+		}
+
+		ParamsUpdater updater = ResourceModelFactory.getParamsUpdater();
+		// Start over
+		updater.setEventsDiscarded(0);
+
+		// Update new visible time range if available
+		if (trange != null) {
+			updater.update(trange.getStartTime().getValue(), trange
+					.getEndTime().getValue());
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @seeorg.eclipse.linuxtools.lttng.ui.views.common.LttngTimeUpdateView#
+	 * ModelUpdateComplete(org.eclipse.linuxtools.lttng.state.StateDataRequest)
+	 */
+	@Override
+	public void ModelUpdateComplete(StateDataRequest request) {
+		StateManager smanager = request.getStateManager();
+		long experimentStartTime = -1;
+		long experimentEndTime = -1;
+		TmfTimeRange experimentTimeRange = smanager.getExperimentTimeWindow();
+		if (experimentTimeRange != null) {
+			experimentStartTime = experimentTimeRange.getStartTime().getValue();
+			experimentEndTime = experimentTimeRange.getEndTime().getValue();
+		}
+
+		// Obtain the current resource list
+		TimeRangeEventResource[] resourceArr = ResourceModelFactory
+				.getResourceContainer().readResources();
+
+		// Sort the array by pid
+		Arrays.sort(resourceArr);
+
+		// Update the view part
+		resourceModelUpdates(resourceArr, experimentStartTime,
+				experimentEndTime, request.isclearDataInd());
+
+		// reselect to original time
+		ParamsUpdater paramUpdater = ResourceModelFactory.getParamsUpdater();
+		final Long selTime = paramUpdater.getSelectedTime();
+		if (selTime != null) {
+			Display display = tsfviewer.getControl().getDisplay();
+			display.asyncExec(new Runnable() {
+				public void run() {
+					tsfviewer.setSelectedTime(selTime, false, this);
+				}
+			});
+		}
+
+		if (TraceDebug.isDEBUG()) {
+			Long count = smanager.getEventCount();
+			int eventCount = 0;
+			for (TimeRangeEventResource resource : resourceArr) {
+				eventCount += resource.getTraceEvents().size();
+			}
+
+			int discarded = ResourceModelFactory.getParamsUpdater()
+					.getEventsDiscarded();
+			int discardedOutofOrder = ResourceModelFactory.getParamsUpdater()
+					.getEventsDiscardedWrongOrder();
+			TraceDebug
+					.debug("Events handled: "
+							+ count
+							+ " Events loaded in Resource view: "
+							+ eventCount
+							+ " Number of events discarded: "
+							+ discarded
+							+ "\n\tNumber of events discarded with start time earlier than next good time: "
+							+ discardedOutofOrder);
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/AbsResourcesTRangeUpdate.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/AbsResourcesTRangeUpdate.java
new file mode 100644
index 0000000..e0110d9
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/AbsResourcesTRangeUpdate.java
@@ -0,0 +1,307 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.resources.evProcessor;
+
+import java.util.Vector;
+
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing;
+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeComponent;
+import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEvent;
+import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource;
+import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeResourceFactory;
+import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEvent.Type;
+import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource.ResourceTypes;
+import org.eclipse.linuxtools.lttng.ui.views.common.AbsTRangeUpdate;
+import org.eclipse.linuxtools.lttng.ui.views.common.ParamsUpdater;
+import org.eclipse.linuxtools.lttng.ui.views.resources.model.ResourceContainer;
+import org.eclipse.linuxtools.lttng.ui.views.resources.model.ResourceModelFactory;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+
+public abstract class AbsResourcesTRangeUpdate extends AbsTRangeUpdate
+		implements IEventProcessing {
+
+	// ========================================================================
+	// Data
+	// =======================================================================
+	protected ResourceContainer resContainer = ResourceModelFactory
+			.getResourceContainer();
+	protected ParamsUpdater params = ResourceModelFactory.getParamsUpdater();
+	protected static final Long ANY_CPU = 0L;
+
+	// ========================================================================
+	// Methods
+	// =======================================================================
+	protected TimeRangeEventResource addLocalResource(long traceStartTime,
+			long traceEndTime, String traceId, ResourceTypes type, Long resId,
+			long insertionTime) {
+
+		String resourceName = type.toString() + " " + resId.toString();
+		// Note : the "traceid" here is assigned to the "groupname" as we group
+		// by trace in the UI
+		TimeRangeEventResource localRessource = TimeRangeResourceFactory
+				.getInstance().createResource(resContainer.getUniqueId(),
+						traceStartTime, traceEndTime, resourceName, traceId,
+						"", type, resId, insertionTime);
+		resContainer.addResource(localRessource);
+		return localRessource;
+	}
+
+	/**
+	 * Used to check if the event is visible within the current visible time
+	 * window
+	 * 
+	 * @return
+	 */
+	protected boolean withinViewRange(long stime, long etime) {
+		long windowStartTime = params.getStartTime();
+		long windowEndTime = params.getEndTime();
+
+		// start time is within window
+		if (stime >= windowStartTime && stime <= windowEndTime) {
+			// The event or part of it shall be displayed.
+			return true;
+		}
+
+		// end time is within window
+		if (etime >= windowStartTime && etime <= windowEndTime) {
+			// The event or part of it shall be displayed.
+			return true;
+		}
+
+		// check that a portion is within the window
+		if (stime < windowStartTime && etime > windowEndTime) {
+			// The time range is bigger than the selected time window and
+			// crosses it
+			return true;
+		}
+
+		return false;
+	}
+
+	public TimeRangeEventResource resourcelist_obtain_bdev(
+			LttngTraceState traceState, Long resourceId) {
+		return resourcelist_obtain_generic(resourceId, ResourceTypes.BDEV,
+				traceState.getTraceId());
+	}
+
+	public TimeRangeEventResource resourcelist_obtain_trap(
+			LttngTraceState traceState, Long resourceId) {
+		return resourcelist_obtain_generic(resourceId, ResourceTypes.TRAP,
+				traceState.getTraceId());
+	}
+
+	public TimeRangeEventResource resourcelist_obtain_irq(
+			LttngTraceState traceState, Long resourceId) {
+		return resourcelist_obtain_generic(resourceId, ResourceTypes.IRQ,
+				traceState.getTraceId());
+	}
+
+	public TimeRangeEventResource resourcelist_obtain_soft_irq(
+			LttngTraceState traceState, Long resourceId) {
+		return resourcelist_obtain_generic(resourceId, ResourceTypes.SOFT_IRQ,
+				traceState.getTraceId());
+	}
+
+	public TimeRangeEventResource resourcelist_obtain_cpu(
+			LttngTraceState traceState, Long resourceId) {
+		return resourcelist_obtain_generic(resourceId, ResourceTypes.CPU,
+				traceState.getTraceId());
+	}
+
+	public TimeRangeEventResource resourcelist_obtain_machine(
+			LttngTraceState traceState, Long resourceId) {
+		// *** VERIFY ***
+		// Does "UNKNOWN" make sense for "obtain_machine" ?
+		// It seems to be the only choice, thought...
+		return resourcelist_obtain_generic(resourceId, ResourceTypes.UNKNOWN,
+				traceState.getTraceId());
+	}
+
+	public TimeRangeEventResource resourcelist_obtain_generic(Long resourceId,
+			ResourceTypes resourceType, String traceId) {
+		return resContainer.findResource(resourceId, resourceType, traceId);
+	}
+
+	protected boolean globalProcessBeforeExecmode(LttngEvent trcEvent,
+			LttngTraceState traceSt) {
+
+		// TODO: Implement the tracking of current resource in order ot speed up
+		// searching for the relevant resource similar to current_hash_data in
+		// the C implementation
+		// e.g.
+		// hashed_process_data =
+		// process_list->current_hash_data[trace_num][cpu];
+
+		TimeRangeEventResource localResource = resourcelist_obtain_cpu(traceSt,
+				trcEvent.getCpuId());
+		Long cpu = trcEvent.getCpuId();
+		if (localResource == null) {
+			TmfTimeRange timeRange = traceSt.getInputDataRef()
+					.getTraceTimeWindow();
+			localResource = addLocalResource(timeRange.getStartTime()
+					.getValue(), timeRange.getEndTime().getValue(), traceSt
+					.getTraceId(), ResourceTypes.CPU, cpu, trcEvent
+					.getTimestamp().getValue());
+		}
+
+		// get the start time
+		long stime = localResource.getNext_good_time();
+		// Get the resource state mode
+		String cpuStateMode = localResource.getStateMode(traceSt);
+		// Call the makeDraw function
+		makeDraw(traceSt, stime, trcEvent.getTimestamp().getValue(),
+				localResource, params, cpuStateMode);
+
+		return false;
+	}
+
+	/**
+	 * @param traceSt
+	 * @param startTime
+	 * @param endTime
+	 * @param localResource
+	 * @param params
+	 * @param stateMode
+	 * @return
+	 */
+	protected boolean makeDraw(LttngTraceState traceSt, long startTime,
+			long endTime, TimeRangeEventResource localResource,
+			ParamsUpdater params, String stateMode) {
+
+		// Check if the time range is consistent.
+		if (endTime < startTime) {
+			params.incrementEventsDiscardedWrongOrder();
+			return false;
+		}
+
+		// Determine start and end times to establish duration
+		long stime = startTime;
+		long windowEndTime = params.getEndTime();
+		long etime = endTime < windowEndTime ? endTime : windowEndTime;
+
+		if (etime < stime || !withinViewRange(stime, etime)) {
+			// No use to process the event since it's outside
+			// the visible time range of the window
+			params.incrementEventsDiscarded();
+			return false;
+		}
+
+		// Determine if the time range event will fit it the current
+		// pixel map
+		double duration = etime - stime;
+		double k = getPixelsPerNs(traceSt, params);
+		double pixels = duration * k;
+
+		// ***VERIFY***
+		// Is all this equivalent to this call in C??
+		// if(ltt_time_compare(hashed_process_data->next_good_time,evtime) > 0)
+		// ***
+		// Visibility check
+		// Display a "more information" indication by allowing non visible event
+		// as long as its previous event is visible.
+		boolean visible = true;
+		if (pixels < 1) {
+			boolean prevEventVisibility = true;
+			// Get the visibility indication on previous event for
+			// this process
+			Vector<TimeRangeComponent> inMemEvents = localResource
+					.getTraceEvents();
+			if (inMemEvents.size() != 0) {
+				TimeRangeComponent prevEvent = inMemEvents.get(inMemEvents
+						.size() - 1);
+				prevEventVisibility = prevEvent.isVisible();
+
+				// ***VERIFY***
+				// This replace all C Call like this one ?
+				// #ifdef EXTRA_CHECK if(ltt_time_compare(evtime,
+				// time_window.start_time) == -1 || ltt_time_compare(evtime,
+				// time_window.end_time) == 1)
+
+				// if previous event visibility is false and the time span
+				// between events less than two pixels, there is no need to
+				// load it in memory i.e. not visible and a more indicator is
+				// within two pixels.
+				// return i.e. event discarded to free up memory
+				Long eventSpan = stime - prevEvent.getStartTime();
+				if (prevEventVisibility == false
+						&& ((double) eventSpan * k) < 2) {
+					params.incrementEventsDiscarded();
+					return false;
+				}
+			}
+
+			// if previous event is visible, set this one to not
+			// visible and continue
+			visible = false;
+		}
+
+		Type eventType = getEventType(localResource);
+		if (eventType != null) {
+			TimeRangeEvent time_window = new TimeRangeEvent(stime, etime,
+					localResource, eventType, stateMode);
+
+			// *** VERIFY ***
+			// This is added to replace the multiple draw and gtk/glib command
+			// but
+			// I'm not sure about it
+			time_window.setVisible(visible);
+			localResource.addChildren(time_window);
+			// Store the next good time to start drawing the event.
+			localResource.setNext_good_time(etime);
+			// *** VERIFY ***
+			// Missing checks like this one?
+			// #ifdef EXTRA_CHECK if(ltt_time_compare(evtime,
+			// time_window.start_time) == -1 || ltt_time_compare(evtime,
+			// time_window.end_time) == 1)
+		}
+
+		return false;
+	}
+
+	/**
+	 * Convert between resource type and timeRange event type
+	 * 
+	 * @param resource
+	 * @return
+	 */
+	private Type getEventType(TimeRangeEventResource resource) {
+		// TODO: Can we merge into one type
+		ResourceTypes resType = resource.getType();
+		Type eventType = null;
+
+		switch (resType) {
+		case CPU:
+			eventType = Type.CPU_MODE;
+			break;
+		case IRQ:
+			eventType = Type.IRQ_MODE;
+			break;
+		case SOFT_IRQ:
+			eventType = Type.SOFT_IRQ_MODE;
+			break;
+		case TRAP:
+			eventType = Type.TRAP_MODE;
+			break;
+		case BDEV:
+			eventType = Type.BDEV_MODE;
+			break;
+		default:
+			eventType = Type.PROCESS_MODE;
+			break;
+		}
+
+		return eventType;
+	}
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesTRangeAfterUpdateHandlers.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesTRangeAfterUpdateHandlers.java
new file mode 100644
index 0000000..58d4a13
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesTRangeAfterUpdateHandlers.java
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.resources.evProcessor;
+
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.state.StateStrings.Events;
+import org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing;
+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+
+/**
+ * Creates instances of specific after state update handlers, per corresponding
+ * event.
+ * 
+ * @author alvaro
+ * 
+ */
+public class ResourcesTRangeAfterUpdateHandlers {
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_SCHED_SCHEDULE
+	 * </p>
+	 * Replace C function named "after_schedchange_hook" in eventhooks.c
+	 * <p>
+	 * Fields: LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getAfterSchedChangeHandler() {
+		AbsResourcesTRangeUpdate handler = new AbsResourcesTRangeUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SCHED_SCHEDULE;
+
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				// TODO: After sched scheduler handler should implement an
+				// update to the current resource data, similar to
+				// current_hash_data in C
+				// We don't keep track of current hashed resource, we look in
+				// the hash table every time. keeping track of current hash may
+				// improve performance, although needs to be bench marked to
+				// verify
+				// if there's is a real gain.
+
+				// process_list->current_hash_data[trace_num][process_in->cpu] =
+				// hashed_process_data_in;
+
+				return false;
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+
+		return handler;
+	}
+
+	/**
+	 * Drawing stuff ?
+	 */
+	// int after_request(void *hook_data, void *call_data)
+	// int after_chunk(void *hook_data, void *call_data)
+	// int before_statedump_end(void *hook_data, void *call_data)
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesTRangeBeforeUpdateHandlers.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesTRangeBeforeUpdateHandlers.java
new file mode 100644
index 0000000..3ac29a5
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesTRangeBeforeUpdateHandlers.java
@@ -0,0 +1,414 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.resources.evProcessor;
+
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.state.StateStrings.Channels;
+import org.eclipse.linuxtools.lttng.state.StateStrings.Events;
+import org.eclipse.linuxtools.lttng.state.StateStrings.Fields;
+import org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing;
+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource;
+import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource.ResourceTypes;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+
+/**
+ * Creates instances of specific before state update handlers, per corresponding
+ * event.
+ * 
+ * @author alvaro
+ * 
+ */
+public class ResourcesTRangeBeforeUpdateHandlers {
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_SCHED_SCHEDULE
+	 * </p>
+	 * Replace C function named "before_schedchange_hook" in eventhooks.c
+	 * <p>
+	 * Fields: LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID(?), LTT_FIELD_PREV_STATE
+	 * (?)
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getBeforeSchedChangeHandler() {
+		AbsResourcesTRangeUpdate handler = new AbsResourcesTRangeUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SCHED_SCHEDULE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				// Create a time range for the cpu.
+				globalProcessBeforeExecmode(trcEvent, traceSt);
+
+				return false;
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_IRQ_ENTRY, LTT_EVENT_IRQ_EXIT
+	 * </p>
+	 * Replace C function named "before_execmode_hook_irq" in eventhooks.c
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getBeforeExecutionModeIrq() {
+		AbsResourcesTRangeUpdate handler = new AbsResourcesTRangeUpdate() {
+
+			// This method is common to TWO types of events
+			private Events eventType = Events.LTT_EVENT_IRQ_ENTRY;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				Long irqId = null;
+
+				// According to Ltt, we should not draw anything if the channel
+				// is the kernel one
+				if (trcEvent.getChannelName().equals(
+						Channels.LTT_CHANNEL_KERNEL)) {
+					return false;
+				} else {
+
+					if (trcEvent.getMarkerName().equals(
+							Events.LTT_EVENT_IRQ_ENTRY.getInName())) {
+						irqId = getAFieldLong(trcEvent, traceSt,
+								Fields.LTT_FIELD_IRQ_ID);
+					} else if (trcEvent.getMarkerName().equals(
+							Events.LTT_EVENT_IRQ_EXIT.getInName())) {
+						long cpu = trcEvent.getCpuId();
+						irqId = traceSt.getCpu_states().get(cpu)
+								.peekFromIrqStack();
+						if (irqId.equals(-1L)) {
+							// nothing to update
+							return false;
+						}
+					}
+
+
+					// softIrqId is the resource id here
+					TimeRangeEventResource localResource = resourcelist_obtain_irq(
+							traceSt, irqId);
+
+					// If the resource is missing in the list, add it
+					if (localResource == null) {
+						TmfTimeRange timeRange = traceSt.getInputDataRef()
+								.getTraceTimeWindow();
+						localResource = addLocalResource(timeRange
+								.getStartTime().getValue(), timeRange
+								.getEndTime().getValue(), traceSt.getTraceId(),
+								ResourceTypes.IRQ, irqId, trcEvent
+										.getTimestamp().getValue());
+					}
+
+					// get the start time
+					long stime = localResource.getNext_good_time();
+
+					// Get the resource state mode
+					String irqStateMode = localResource.getStateMode(traceSt);
+
+					// Call the makeDraw function
+					makeDraw(traceSt, stime,
+							trcEvent.getTimestamp().getValue(), localResource,
+							params, irqStateMode);
+
+					// Call the globalProcessBeforeExecmode() after, as
+					// it is needed by all
+					// getBeforeExecmode*SOMETHING*()
+					globalProcessBeforeExecmode(trcEvent, traceSt);
+				}
+				return false;
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_SOFT_IRQ_RAISE, LTT_EVENT_SOFT_IRQ_ENTRY,
+	 * LTT_EVENT_SOFT_IRQ_EXIT,
+	 * </p>
+	 * Replace C function named "before_execmode_hook_soft_irq" in eventhooks.c
+	 * <p>
+	 * Fields: LTT_FIELD_SOFT_IRQ_ID
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getBeforeExecutionModeSoftIrq() {
+		AbsResourcesTRangeUpdate handler = new AbsResourcesTRangeUpdate() {
+
+			// This method is common to SEVERAL types of events
+			private Events eventType = Events.LTT_EVENT_TRAP_ENTRY;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				Long softIrqId = null;
+
+				// According to Ltt, we should not draw anything if the channel
+				// is the kernel one
+				if (trcEvent.getChannelName().equals(
+						Channels.LTT_CHANNEL_KERNEL)) {
+					return false;
+				} else {
+
+					if ((trcEvent.getMarkerName()
+							.equals(Events.LTT_EVENT_SOFT_IRQ_RAISE.getInName()))
+							|| (trcEvent.getMarkerName()
+									.equals(Events.LTT_EVENT_SOFT_IRQ_ENTRY
+											.getInName()))) {
+						softIrqId = getAFieldLong(trcEvent, traceSt,
+								Fields.LTT_FIELD_SOFT_IRQ_ID);
+					} else if (trcEvent.getMarkerName().equals(
+							Events.LTT_EVENT_SOFT_IRQ_EXIT.getInName())) {
+						long cpu = trcEvent.getCpuId();
+						softIrqId = traceSt.getCpu_states().get(cpu)
+								.peekFromSoftIrqStack();
+						if (softIrqId < 0) {
+							// nothing to update
+							return false;
+						}
+					}
+
+					// Add the resource to the resource list
+					// softIrqId is the resource id here
+					TimeRangeEventResource localResource = resourcelist_obtain_soft_irq(
+							traceSt, softIrqId);
+
+					// If the resource is missing in the list, add it
+					if (localResource == null) {
+						TmfTimeRange timeRange = traceSt.getInputDataRef()
+								.getTraceTimeWindow();
+						localResource = addLocalResource(timeRange
+								.getStartTime().getValue(), timeRange
+								.getEndTime().getValue(), traceSt.getTraceId(),
+								ResourceTypes.SOFT_IRQ, softIrqId, trcEvent
+										.getTimestamp().getValue());
+					}
+
+					// get the start time
+					long stime = localResource.getNext_good_time();
+
+					// Get the resource state mode
+					String softIrqStateMode = localResource
+							.getStateMode(traceSt);
+
+					// Call the makeDraw function
+					makeDraw(traceSt, stime,
+							trcEvent.getTimestamp().getValue(), localResource,
+							params, softIrqStateMode);
+
+					// Call the globalProcessBeforeExecmode() after, as
+					// it is needed by all
+					// getBeforeExecmode*SOMETHING*()
+					globalProcessBeforeExecmode(trcEvent, traceSt);
+
+				}
+
+				return false;
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_TRAP_ENTRY, LTT_EVENT_TRAP_EXIT,
+	 * LTT_EVENT_PAGE_FAULT_ENTRY, LTT_EVENT_PAGE_FAULT_EXIT,
+	 * LTT_EVENT_PAGE_FAULT_NOSEM_ENTRY, LTT_EVENT_PAGE_FAULT_NOSEM_EXIT
+	 * </p>
+	 * Replace C function named "before_execmode_hook_trap" in eventhooks.c
+	 * <p>
+	 * Fields: LTT_FIELD_TRAP_ID
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getBeforeExecutionModeTrap() {
+		AbsResourcesTRangeUpdate handler = new AbsResourcesTRangeUpdate() {
+
+			// This method is common to SEVERAL types of events
+			private Events eventType = Events.LTT_EVENT_TRAP_ENTRY;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				Long trapId = null;
+
+				// According to Ltt, we should not draw anything if the channel
+				// is the kernel one
+				if (trcEvent.getChannelName().equals(
+						Channels.LTT_CHANNEL_KERNEL)) {
+					return false;
+				} else {
+
+					if ((trcEvent.getMarkerName()
+							.equals(Events.LTT_EVENT_TRAP_ENTRY.getInName()))
+							|| (trcEvent.getMarkerName()
+									.equals(Events.LTT_EVENT_PAGE_FAULT_ENTRY
+											.getInName()))
+							|| (trcEvent.getMarkerName()
+									.equals(Events.LTT_EVENT_PAGE_FAULT_NOSEM_ENTRY
+											.getInName()))) {
+						trapId = getAFieldLong(trcEvent, traceSt,
+								Fields.LTT_FIELD_TRAP_ID);
+					} else if ((trcEvent.getMarkerName()
+							.equals(Events.LTT_EVENT_TRAP_EXIT.getInName()))
+							|| (trcEvent.getMarkerName()
+									.equals(Events.LTT_EVENT_PAGE_FAULT_EXIT
+											.getInName()))
+							|| (trcEvent.getMarkerName()
+									.equals(Events.LTT_EVENT_PAGE_FAULT_NOSEM_EXIT
+											.getInName()))) {
+						long cpu = trcEvent.getCpuId();
+						trapId = traceSt.getCpu_states().get(cpu)
+								.peekFromTrapStack();
+
+						if (trapId.equals(-1L)) {
+							// Nothing to update
+							return false;
+						}
+					} else {
+						return false;
+					}
+
+					// Add the resource to the resource list
+					// trapId is the resource id here
+					TimeRangeEventResource localResource = resourcelist_obtain_trap(
+							traceSt, trapId);
+
+					// If the resource is missing in the list, add it
+					if (localResource == null) {
+						TmfTimeRange timeRange = traceSt.getInputDataRef()
+								.getTraceTimeWindow();
+						localResource = addLocalResource(timeRange
+								.getStartTime().getValue(), timeRange
+								.getEndTime().getValue(), traceSt.getTraceId(),
+								ResourceTypes.TRAP, trapId, trcEvent
+										.getTimestamp().getValue());
+					}
+
+					// Determine the trap state.
+					String trapStateMode = localResource.getStateMode(traceSt);
+
+					long stime = localResource.getNext_good_time();
+					makeDraw(traceSt, stime,
+							trcEvent.getTimestamp().getValue(), localResource,
+							params, trapStateMode);
+
+					// Call the globalProcessBeforeExecmode() after, as
+					// it is needed by all
+					// getBeforeExecmode*SOMETHING*()
+					globalProcessBeforeExecmode(trcEvent, traceSt);
+
+				}
+
+				return false;
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_REQUEST_ISSUE, LTT_EVENT_REQUEST_COMPLETE
+	 * </p>
+	 * Replace C function named "before_bdev_event_hook" in eventhooks.c
+	 * <p>
+	 * Fields: LTT_FIELD_MAJOR, LTT_FIELD_MINOR, LTT_FIELD_OPERATION (?)
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getBeforeBdevEvent() {
+		AbsResourcesTRangeUpdate handler = new AbsResourcesTRangeUpdate() {
+
+			// This method is common for LTT_EVENT_REQUEST_ISSUE and
+			// LTT_EVENT_REQUEST_COMPLETE
+			private Events eventType = Events.LTT_EVENT_REQUEST_COMPLETE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				Long major = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_MAJOR);
+				Long minor = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_MINOR);
+				// This is useless even in LTTv!
+				// Long oper = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_OPERATION);
+
+				Long bdevId = getMkdevId(major, minor);
+
+				// According to Lttv, bdevId (obtain from MKDEV macro) is
+				// the id here
+				TimeRangeEventResource localResource = resourcelist_obtain_bdev(
+						traceSt, bdevId);
+
+				if (localResource == null) {
+					TmfTimeRange timeRange = traceSt.getInputDataRef()
+							.getTraceTimeWindow();
+					localResource = addLocalResource(timeRange.getStartTime()
+							.getValue(), timeRange.getEndTime().getValue(),
+							traceSt.getTraceId(), ResourceTypes.BDEV, bdevId,
+							trcEvent.getTimestamp().getValue());
+				}
+
+				// get the start time
+				long stime = localResource.getNext_good_time();
+				// Get the resource state mode
+				String bdevStateMode = localResource.getStateMode(traceSt);
+				// Call the makeDraw function
+				makeDraw(traceSt, stime, trcEvent.getTimestamp().getValue(),
+						localResource, params, bdevStateMode);
+
+				return false;
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+
+		return handler;
+	}
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesTRangeFinishUpdateHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesTRangeFinishUpdateHandler.java
new file mode 100644
index 0000000..5d01c75
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesTRangeFinishUpdateHandler.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.resources.evProcessor;
+
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.state.StateStrings.Events;
+import org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing;
+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.ui.TraceDebug;
+import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+
+/**
+ * Creates specific finish state data request
+ * 
+ * @author alvaro
+ * 
+ */
+public class ResourcesTRangeFinishUpdateHandler extends
+ AbsResourcesTRangeUpdate
+		implements IEventProcessing {
+
+	public Events getEventHandleType() {
+		// No specific event
+		return null;
+	}
+
+	public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+		// Draw a last known state to the end of the trace
+		TmfTimestamp endReqTime = traceSt.getInputDataRef()
+				.getTraceTimeWindow().getEndTime();
+
+		TraceDebug.debug("Number of localResources: "
+				+ resContainer.readResources().length);
+
+		// for each existing resource
+		for (TimeRangeEventResource localResource : resContainer
+				.readResources()) {
+
+			// get the start time
+			long stime = localResource.getNext_good_time();
+
+			// Get the resource state mode
+			String stateMode = localResource.getStateMode(traceSt);
+
+			// Insert an instance from previous time to end request time with
+			// the current state
+			makeDraw(traceSt, stime, endReqTime.getValue(),
+					localResource, params, stateMode);
+		}
+
+		return false;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesTRangeUpdateFactory.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesTRangeUpdateFactory.java
new file mode 100644
index 0000000..14b67ca
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesTRangeUpdateFactory.java
@@ -0,0 +1,129 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.resources.evProcessor;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.linuxtools.lttng.state.StateStrings;
+import org.eclipse.linuxtools.lttng.state.evProcessor.AbsEventProcessorFactory;
+import org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing;
+
+/**
+ * Builds a Map from string event name to a processing handler object, the
+ * processors implement the same interface to facilitate transparent methods
+ * call,
+ * 
+ * The map key String is the entry point of the raw events. Using a hash speeds
+ * up the resolution of the appropriate processor
+ * 
+ * @author alvaro
+ * 
+ */
+public class ResourcesTRangeUpdateFactory extends AbsEventProcessorFactory {
+	// ========================================================================
+	// Data
+	// =======================================================================
+	private final Map<String, IEventProcessing> eventNametoBeforeProcessor = new HashMap<String, IEventProcessing>();
+	private final Map<String, IEventProcessing> eventNametoAfterProcessor = new HashMap<String, IEventProcessing>();
+	private ResourcesTRangeFinishUpdateHandler finishProcessor = null;
+	private static ResourcesTRangeUpdateFactory instance = null;
+	private ResourcesTRangeBeforeUpdateHandlers instantiateBeforeHandler = new ResourcesTRangeBeforeUpdateHandlers();
+	private ResourcesTRangeAfterUpdateHandlers instantiateAfterHandler = new ResourcesTRangeAfterUpdateHandlers();
+
+	private ResourcesTRangeUpdateFactory() {
+		// Create one instance of each individual event handler and add the
+		// instance to the map
+
+		// *** BEFORE HOOKS ***
+		eventNametoBeforeProcessor.put(
+				StateStrings.Events.LTT_EVENT_SCHED_SCHEDULE.getInName(),
+				instantiateBeforeHandler.getBeforeSchedChangeHandler());
+
+		eventNametoBeforeProcessor.put(StateStrings.Events.LTT_EVENT_TRAP_ENTRY
+				.getInName(), instantiateBeforeHandler
+				.getBeforeExecutionModeTrap());
+		eventNametoBeforeProcessor.put(StateStrings.Events.LTT_EVENT_TRAP_EXIT
+				.getInName(), instantiateBeforeHandler
+				.getBeforeExecutionModeTrap());
+		eventNametoBeforeProcessor.put(
+				StateStrings.Events.LTT_EVENT_PAGE_FAULT_ENTRY.getInName(),
+				instantiateBeforeHandler.getBeforeExecutionModeTrap());
+		eventNametoBeforeProcessor.put(
+				StateStrings.Events.LTT_EVENT_PAGE_FAULT_EXIT.getInName(),
+				instantiateBeforeHandler.getBeforeExecutionModeTrap());
+		eventNametoBeforeProcessor.put(
+				StateStrings.Events.LTT_EVENT_PAGE_FAULT_NOSEM_ENTRY
+						.getInName(), instantiateBeforeHandler
+						.getBeforeExecutionModeTrap());
+		eventNametoBeforeProcessor
+				.put(StateStrings.Events.LTT_EVENT_PAGE_FAULT_NOSEM_EXIT
+						.getInName(), instantiateBeforeHandler
+						.getBeforeExecutionModeTrap());
+
+		eventNametoBeforeProcessor.put(StateStrings.Events.LTT_EVENT_IRQ_ENTRY
+				.getInName(), instantiateBeforeHandler
+				.getBeforeExecutionModeIrq());
+		eventNametoBeforeProcessor.put(StateStrings.Events.LTT_EVENT_IRQ_EXIT
+				.getInName(), instantiateBeforeHandler
+				.getBeforeExecutionModeIrq());
+
+		eventNametoBeforeProcessor.put(
+				StateStrings.Events.LTT_EVENT_SOFT_IRQ_RAISE.getInName(),
+				instantiateBeforeHandler.getBeforeExecutionModeSoftIrq());
+		eventNametoBeforeProcessor.put(
+				StateStrings.Events.LTT_EVENT_SOFT_IRQ_ENTRY.getInName(),
+				instantiateBeforeHandler.getBeforeExecutionModeSoftIrq());
+		eventNametoBeforeProcessor.put(
+				StateStrings.Events.LTT_EVENT_SOFT_IRQ_EXIT.getInName(),
+				instantiateBeforeHandler.getBeforeExecutionModeSoftIrq());
+
+		eventNametoBeforeProcessor.put(
+				StateStrings.Events.LTT_EVENT_REQUEST_ISSUE.getInName(),
+				instantiateBeforeHandler.getBeforeBdevEvent());
+		eventNametoBeforeProcessor.put(
+				StateStrings.Events.LTT_EVENT_REQUEST_COMPLETE.getInName(),
+				instantiateBeforeHandler.getBeforeBdevEvent());
+
+		// *** AFTER HOOKS ***
+		eventNametoAfterProcessor.put(
+				StateStrings.Events.LTT_EVENT_SCHED_SCHEDULE.getInName(),
+				instantiateAfterHandler.getAfterSchedChangeHandler());
+
+		finishProcessor = new ResourcesTRangeFinishUpdateHandler();
+	}
+
+	/**
+     * 
+     */
+	public static AbsEventProcessorFactory getInstance() {
+		if (instance == null) {
+			instance = new ResourcesTRangeUpdateFactory();
+		}
+		return instance;
+	}
+
+	@Override
+	public IEventProcessing getAfterProcessor(String eventType) {
+		return eventNametoAfterProcessor.get(eventType);
+	}
+
+	@Override
+	public IEventProcessing getBeforeProcessor(String eventType) {
+		return eventNametoBeforeProcessor.get(eventType);
+	}
+
+	@Override
+	public IEventProcessing getfinishProcessor() {
+		return finishProcessor;
+	}
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/messages.properties b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/messages.properties
new file mode 100644
index 0000000..46dabb0
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/messages.properties
@@ -0,0 +1,24 @@
+ResourcesView.Action.Filter=Filter

+ResourcesView.Action.Filter.ToolTip=Resource Filter options

+ResourcesView.Action.Legend=Legend

+ResourcesView.Action.Legend.ToolTip=Show Legend

+ResourcesView.Action.LoadData=LoadData

+ResourcesView.Action.LoadData.ToolTip=Load data from external plug-in

+ResourcesView.Action.NextEvent=NextEv

+ResourcesView.Action.NextEvent.Tooltip=Next Event

+ResourcesView.Action.NextResource=NextResource

+ResourcesView.Action.NextResource.ToolTip=Select Next Resource

+ResourcesView.Action.PrevEvent=PrevEv

+ResourcesView.Action.PrevEvent.Tooltip=Previous Event

+ResourcesView.Action.PreviousResource=PreviousResource

+ResourcesView.Action.PreviousResource.Tooltip=Select Previous Resource

+ResourcesView.Action.Reset=Reset

+ResourcesView.Action.Reset.ToolTip=Reset the Time Scale to Default

+ResourcesView.Action.Synchronize=Synchronise

+ResourcesView.Action.Synchronize.ToolTip=Synchronise by listening to external API selection calls

+ResourcesView.Action.ZoomIn=Zoom In

+ResourcesView.Action.ZoomIn.Tooltip=Zoom In

+ResourcesView.Action.ZoomOut=Zoom Out

+ResourcesView.Action.ZoomOut.tooltip=Zoom Out

+ResourcesView.msgSlogan=Resources View

+ResourcesView.tmf.UI=org.eclipse.linuxtools.tmf.ui

diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceContainer.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceContainer.java
new file mode 100644
index 0000000..2f9545d
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceContainer.java
@@ -0,0 +1,235 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.resources.model;
+
+import java.util.HashMap;
+import java.util.Iterator;
+
+import org.eclipse.linuxtools.lttng.TraceDebug;
+import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource;
+import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource.ResourceTypes;
+
+/**
+ * Common location to allocate the resources in use by the resource view
+ * 
+ * @author alvaro
+ * 
+ */
+public class ResourceContainer {
+	// ========================================================================
+	// Data
+	// ========================================================================
+	private final HashMap<ResourceKey, TimeRangeEventResource> resources = new HashMap<ResourceKey, TimeRangeEventResource>();
+	private static Integer uniqueId = 0;
+	
+	
+	// ========================================================================
+	// Constructor
+	// ========================================================================
+	/**
+	 * Package level constructor
+	 */
+	public ResourceContainer() { }
+	
+	/**
+	 * Interface to add resources.
+	 * 
+	 * @param process
+	 */
+	public void addResource(TimeRangeEventResource newResource) {
+		if (newResource != null) {
+		    resources.put( new ResourceKey(newResource),newResource);
+		}
+	}
+	
+	// ========================================================================
+	// Methods
+	// ========================================================================
+	/**
+     * Request a unique ID
+     * 
+     * @return Integer
+     */
+    public Integer getUniqueId() {
+        return uniqueId++;
+    }
+
+	/**
+	 * This method is intended for read only purposes in order to keep the
+	 * internal data structure in Synch
+	 * 
+	 * @return
+	 */
+	public TimeRangeEventResource[] readResources() {
+		return resources.values().toArray(
+				new TimeRangeEventResource[resources.size()]);
+	}
+	
+	/**
+	 * Clear the children information for resources related to a specific trace
+	 * e.g. just before refreshing data with a new time range
+	 * 
+	 * @param traceId
+	 */
+	public void clearChildren(String traceId) {
+	    TimeRangeEventResource newRes = null;
+        Iterator<ResourceKey> iterator = resources.keySet().iterator();
+        
+        while (iterator.hasNext()) {
+            newRes = resources.get(iterator.next());
+            
+            if (newRes.getTraceId().equals(traceId)) {
+				newRes.reset();
+            }
+        }
+	}
+
+	/**
+	 * Clear all resources items e.g. when a new experiment is selected
+	 */
+	public void clearResources() {
+		resources.clear();
+	}
+
+	/**
+	 * Remove the resources related to a specific trace e.g. during trace
+	 * removal
+	 * 
+	 * @param traceId
+	 */
+	public void removeResources(String traceId) {
+	    ResourceKey newKey = null;
+
+	    Iterator<ResourceKey> iterator = resources.keySet().iterator();
+        while (iterator.hasNext()) {
+            newKey = iterator.next();
+            
+            if (resources.get(newKey).getTraceId().equals(traceId)) {
+                resources.remove(newKey);
+            }
+        }
+	}
+	
+	
+	/**
+	 * Search by keys (resourceId, traceId and type)<p>
+	 * 
+     * A match is returned if the three arguments received match an entry
+     *  Otherwise null is returned
+     *  
+     * @param searchedId        The ressourceId we are looking for
+     * @param searchedType      The ressourceType we are looking for
+     * @param searchedTraceId   The traceId (trace name?) we are looking for
+     * 
+     * @return TimeRangeEventResource
+     */
+    public TimeRangeEventResource findResource(Long searchedId, ResourceTypes searchedType, String searchedTraceId) {
+		// Get the EventResource associated to a key we create here
+        TimeRangeEventResource foundResource = resources.get( new ResourceKey(searchedId, searchedTraceId, searchedType) );
+        
+        return foundResource;
+    }
+}
+
+class ResourceKey {
+    
+    private TimeRangeEventResource valueRef = null;
+    
+    private Long       resourceId = null;
+    private String        traceId = null;
+    private ResourceTypes type = null;
+    
+    @SuppressWarnings("unused")
+    private ResourceKey() { }
+    
+    public ResourceKey(TimeRangeEventResource newRef) {
+        valueRef = newRef;
+    }
+    
+    public ResourceKey(Long newId, String newTraceId, ResourceTypes newType) {
+        resourceId = newId;
+        traceId = newTraceId;
+        type = newType;
+    }
+    
+    @Override
+    public boolean equals(Object obj) {
+        boolean isSame = false;
+        
+        if ( obj instanceof ResourceKey ) {
+        	if ( valueRef != null )  {
+	            if ( (  ((ResourceKey)obj).getResourceId().equals(valueRef.getResourceId()) ) &&
+	                 (  ((ResourceKey)obj).getTraceId().equals(valueRef.getTraceId()) ) &&
+	                 (  ((ResourceKey)obj).getType().equals(valueRef.getType()) ) )
+	            {
+	                isSame = true;
+	            }
+        	}
+        	else {
+        		if ( (  ((ResourceKey)obj).getResourceId().equals(this.resourceId)) &&
+   	                 (  ((ResourceKey)obj).getTraceId().equals(this.traceId)) &&
+   	                 (  ((ResourceKey)obj).getType().equals(this.type)) )
+   	            {
+   	                isSame = true;
+   	            }
+        	}
+        }
+        else {
+        	TraceDebug.debug("ERROR : The given key is not of the type ProcessKey!" + obj.getClass().toString());
+        }
+        
+        return isSame;
+    }
+    
+    // *** WARNING : Everything in there work because the check "valueRef != null" is the same for ALL getter
+    // Do NOT change this check without checking.
+    public Long getResourceId() {
+        if ( valueRef != null ) {
+            return valueRef.getResourceId();
+        }
+        else {
+            return resourceId;
+        }
+    }
+
+    public String getTraceId() {
+        if ( valueRef != null ) {
+            return valueRef.getTraceId();
+        }
+        else {
+            return traceId;
+        }
+    }
+
+    public ResourceTypes getType() {
+        if ( valueRef != null ) {
+            return valueRef.getType();
+        }
+        else {
+            return type;
+        }
+    }
+
+    @Override
+    public int hashCode() { 
+        return this.toString().hashCode();
+    }
+    
+    
+    @Override
+    public String toString() {
+        if ( valueRef != null ) {
+            return (valueRef.getResourceId().toString() + ":" + valueRef.getTraceId().toString() + ":" + valueRef.getType().toString());
+        }
+        return (resourceId + ":" + traceId + ":" + type);
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceModelFactory.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceModelFactory.java
new file mode 100644
index 0000000..496f669
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceModelFactory.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.resources.model;
+
+import org.eclipse.linuxtools.lttng.ui.views.common.ParamsUpdater;
+
+/**
+ * Instantiates the entry point classes to build the data model for this view
+ * 
+ * @author alvaro
+ * 
+ */
+public class ResourceModelFactory {
+	// ========================================================================
+	// Data
+	// ========================================================================
+	private static ResourceContainer resContainer = null;
+	private static ParamsUpdater updater = null;
+	
+	
+	// ========================================================================
+	// Methods
+	// ========================================================================
+	/**
+	 * Get Process data container
+	 * @return
+	 */
+	public static ResourceContainer getResourceContainer() {
+		if (resContainer == null) {
+			resContainer = new ResourceContainer();
+		}
+		return resContainer;
+	}
+	
+	
+	public static ParamsUpdater getParamsUpdater() {
+		if (updater == null) {
+			updater = new ParamsUpdater();
+		}
+		return updater;
+	}
+	
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/StatisticsView.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/StatisticsView.java
new file mode 100644
index 0000000..146bd49
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/StatisticsView.java
@@ -0,0 +1,491 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Yann N. Dauphin    (dhaemon@gmail.com)    - Implementation
+ *   Francois Chouinard (fchouinard@gmail.com) - Initial API
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.statistics;
+
+import java.text.DecimalFormat;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.TreeViewerColumn;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerComparator;
+import org.eclipse.linuxtools.lttng.state.IStateDataRequestListener;
+import org.eclipse.linuxtools.lttng.state.RequestCompletedSignal;
+import org.eclipse.linuxtools.lttng.state.RequestStartedSignal;
+import org.eclipse.linuxtools.lttng.state.evProcessor.EventProcessorProxy;
+import org.eclipse.linuxtools.lttng.state.experiment.StateExperimentManager;
+import org.eclipse.linuxtools.lttng.state.experiment.StateManagerFactory;
+import org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor.StatsEventCountHandlerFactory;
+import org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor.StatsTimeCountHandlerFactory;
+import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsTreeFactory;
+import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsTreeNode;
+import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler;
+import org.eclipse.linuxtools.tmf.ui.views.TmfView;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * <b><u>StatisticsView</u></b>
+ * <p>
+ * The Statistics View displays statistics for traces.
+ * 
+ * It is implemented according to the MVC pattern. - The model is a
+ * StatisticsTreeNode built by the State Manager. - The view is built with a
+ * TreeViewer. - The controller that keeps model and view synchronised is an
+ * observer of the model.
+ */
+public class StatisticsView extends TmfView implements IStateDataRequestListener {
+
+	public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.statistics";
+
+	private TreeViewer treeViewer;
+
+	// Table column names
+	private final String LEVEL_COLUMN = "Level";
+	private final String EVENTS_COUNT_COLUMN = "Number of Events";
+	private final String CPU_TIME_COLUMN = "CPU Time";
+	private final String CUMULATIVE_CPU_TIME_COLUMN = "Cumulative CPU Time";
+	private final String ELAPSED_TIME_COLUMN = "Elapsed Time";
+
+	// Table column tooltips
+	private final String LEVEL_COLUMN_TIP = "Level at which statistics apply.";
+	private final String EVENTS_COUNT_COLUMN_TIP = "Total amount of events that are tied to given resource.";
+	private final String CPU_TIME_COLUMN_TIP = "Total amount of time the CPU was used excluding wait times(I/O, etc.) at that level.";
+	private final String CUMULATIVE_CPU_TIME_COLUMN_TIP = "Total amount of time between the first and last event excluding wait times in a level.";
+	private final String ELAPSED_TIME_COLUMN_TIP = "Total amount of time the CPU was used including wait times(I/O, etc.) at that level.";
+
+	// Level for which statistics should not be displayed.
+	private Set<String> folderLevels = new HashSet<String>(Arrays
+			.asList(new String[] { "Event Types", "Modes", "Submodes", "CPUs",
+					"Processes", "Functions" }));
+
+	// Levels for which sub-levels should not contain time-related statistics.
+	private Set<String> levelsWithEmptyTime = new HashSet<String>(Arrays
+			.asList(new String[] { "Event Types" }));
+
+	private DecimalFormat decimalFormat = new DecimalFormat("0.#########");
+
+	// Used to draw bar charts in columns.
+	private interface ColumnPercentageProvider {
+		public double getPercentage(StatisticsTreeNode node);
+	}
+
+	/**
+	 * Contains all the information necessary to build a column of the table.
+	 */
+	private class ColumnData {
+		// Name of the column.
+		public final String header;
+		// Width of the column.
+		public final int width;
+		// Alignment of the column.
+		public final int alignment;
+		// Tooltip of the column.
+		public final String tooltip;
+		// Adapts a StatisticsTreeNode into the content of it's corresponding
+		// cell for that column.
+		public final ColumnLabelProvider labelProvider;
+		// Used to sort elements of this column. Can be null.
+		public final ViewerComparator comparator;
+		// Used to draw bar charts in this column. Can be null.
+		public final ColumnPercentageProvider percentageProvider;
+
+		public ColumnData(String h, int w, int a, String t,
+				ColumnLabelProvider l, ViewerComparator c,
+				ColumnPercentageProvider p) {
+			header = h;
+			width = w;
+			alignment = a;
+			tooltip = t;
+			labelProvider = l;
+			comparator = c;
+			percentageProvider = p;
+		}
+	};
+
+	// List that will be used to create the table.
+	private ColumnData[] columnDataList = new ColumnData[] {
+			new ColumnData(LEVEL_COLUMN, 200, SWT.LEFT, LEVEL_COLUMN_TIP,
+					new ColumnLabelProvider() {
+						@Override
+						public String getText(Object element) {
+							return ((StatisticsTreeNode) element).getKey();
+						}
+
+						@Override
+						public Image getImage(Object element) {
+							StatisticsTreeNode node = (StatisticsTreeNode) element;
+							if (folderLevels.contains(node.getKey())) {
+								return PlatformUI.getWorkbench()
+										.getSharedImages().getImage(
+												ISharedImages.IMG_OBJ_FOLDER);
+							} else {
+								return PlatformUI.getWorkbench()
+										.getSharedImages().getImage(
+												ISharedImages.IMG_OBJ_ELEMENT);
+							}
+						}
+					}, new ViewerComparator() {
+						@Override
+						public int compare(Viewer viewer, Object e1, Object e2) {
+							StatisticsTreeNode n1 = (StatisticsTreeNode) e1;
+							StatisticsTreeNode n2 = (StatisticsTreeNode) e2;
+
+							return n1.getKey().compareTo(n2.getKey());
+						}
+					}, null),
+			new ColumnData(EVENTS_COUNT_COLUMN, 125, SWT.LEFT,
+					EVENTS_COUNT_COLUMN_TIP, new ColumnLabelProvider() {
+						@Override
+						public String getText(Object element) {
+							StatisticsTreeNode node = (StatisticsTreeNode) element;
+							if (!folderLevels.contains(node.getKey())) {
+								return Long.toString(node.getValue().nbEvents);
+							} else {
+								return "";
+							}
+						}
+					}, new ViewerComparator() {
+						@Override
+						public int compare(Viewer viewer, Object e1, Object e2) {
+							StatisticsTreeNode n1 = (StatisticsTreeNode) e1;
+							StatisticsTreeNode n2 = (StatisticsTreeNode) e2;
+
+							return (int) (n1.getValue().nbEvents - n2
+									.getValue().nbEvents);
+						}
+					}, new ColumnPercentageProvider() {
+						public double getPercentage(StatisticsTreeNode node) {
+							StatisticsTreeNode parent = node;
+							do {
+								parent = parent.getParent();
+							} while (parent != null
+									&& parent.getValue().nbEvents == 0);
+
+							if (parent == null) {
+								return 0;
+							} else {
+								return (double) node.getValue().nbEvents
+										/ parent.getValue().nbEvents;
+							}
+						}
+					}),
+			new ColumnData(CPU_TIME_COLUMN, 125, SWT.LEFT, CPU_TIME_COLUMN_TIP,
+					new ColumnLabelProvider() {
+						@Override
+						public String getText(Object element) {
+							StatisticsTreeNode node = (StatisticsTreeNode) element;
+
+							if (folderLevels.contains(node.getKey())) {
+								return "";
+							} else if (node.getParent() != null
+									&& levelsWithEmptyTime.contains(node
+											.getParent().getKey())) {
+								return "";
+							} else {
+								return decimalFormat
+										.format(node.getValue().cpuTime
+												/ Math.pow(10, 9));
+							}
+						}
+					}, null, null),
+			new ColumnData(CUMULATIVE_CPU_TIME_COLUMN, 155, SWT.LEFT,
+					CUMULATIVE_CPU_TIME_COLUMN_TIP, new ColumnLabelProvider() {
+						@Override
+						public String getText(Object element) {
+							StatisticsTreeNode node = (StatisticsTreeNode) element;
+							if (folderLevels.contains(node.getKey())) {
+								return "";
+							} else if (node.getParent() != null
+									&& levelsWithEmptyTime.contains(node
+											.getParent().getKey())) {
+								return "";
+							} else {
+								return decimalFormat
+										.format(node.getValue().cumulativeCpuTime
+												/ Math.pow(10, 9));
+							}
+						}
+					}, null, null),
+			new ColumnData(ELAPSED_TIME_COLUMN, 100, SWT.LEFT,
+					ELAPSED_TIME_COLUMN_TIP, new ColumnLabelProvider() {
+						@Override
+						public String getText(Object element) {
+							StatisticsTreeNode node = (StatisticsTreeNode) element;
+							if (folderLevels.contains(node.getKey())) {
+								return "";
+							} else if (node.getParent() != null
+									&& levelsWithEmptyTime.contains(node
+											.getParent().getKey())) {
+								return "";
+							} else {
+								return decimalFormat
+										.format(node.getValue().elapsedTime
+												/ Math.pow(10, 9));
+							}
+						}
+					}, null, null) };
+
+	/**
+	 * Adapter TreeViewers can use to interact with StatisticsTreeNode objects.
+	 * 
+	 * @see org.eclipse.jface.viewers.ITreeContentProvider
+	 */
+	class TreeContentProvider implements ITreeContentProvider {
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see
+		 * org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang
+		 * .Object)
+		 */
+		public Object[] getChildren(Object parentElement) {
+			return ((StatisticsTreeNode) parentElement).getChildren().toArray();
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see
+		 * org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang
+		 * .Object)
+		 */
+		public Object getParent(Object element) {
+			return ((StatisticsTreeNode) element).getParent();
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see
+		 * org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang
+		 * .Object)
+		 */
+		public boolean hasChildren(Object element) {
+			return ((StatisticsTreeNode) element).hasChildren();
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see
+		 * org.eclipse.jface.viewers.IStructuredContentProvider#getElements(
+		 * java.lang.Object)
+		 */
+		public Object[] getElements(Object inputElement) {
+			return getChildren(inputElement);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
+		 */
+		public void dispose() {
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see
+		 * org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse
+		 * .jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+		 */
+		// @Override
+		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		}
+	}
+
+	public StatisticsView(String viewName) {
+		super(viewName);
+	}
+
+	public StatisticsView() {
+		this("StatisticsView");
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets
+	 * .Composite)
+	 */
+	@Override
+	public void createPartControl(Composite parent) {
+		EventProcessorProxy.getInstance().addEventProcessorFactory(
+				StatsTimeCountHandlerFactory.getInstance());
+		EventProcessorProxy.getInstance().addEventProcessorFactory(
+				StatsEventCountHandlerFactory.getInstance());
+
+		parent.setLayout(new FillLayout());
+
+		treeViewer = new TreeViewer(parent, SWT.BORDER | SWT.H_SCROLL
+				| SWT.V_SCROLL);
+		treeViewer.setContentProvider(new TreeContentProvider());
+		treeViewer.getTree().setHeaderVisible(true);
+		treeViewer.setUseHashlookup(true);
+
+		for (final ColumnData columnData : columnDataList) {
+			final TreeViewerColumn treeColumn = new TreeViewerColumn(
+					treeViewer, columnData.alignment);
+			treeColumn.getColumn().setText(columnData.header);
+			treeColumn.getColumn().setWidth(columnData.width);
+			treeColumn.getColumn().setToolTipText(columnData.tooltip);
+			if (columnData.comparator != null) {
+				treeColumn.getColumn().addSelectionListener(
+						new SelectionAdapter() {
+							@Override
+							public void widgetSelected(SelectionEvent e) {
+								if (treeViewer.getTree().getSortDirection() == SWT.UP
+										|| treeViewer.getTree().getSortColumn() != treeColumn
+												.getColumn()) {
+									treeViewer
+											.setComparator(columnData.comparator);
+									treeViewer.getTree().setSortDirection(
+											SWT.DOWN);
+								} else {
+									treeViewer
+											.setComparator(new ViewerComparator() {
+												@Override
+												public int compare(
+														Viewer viewer,
+														Object e1, Object e2) {
+													return -1
+															* columnData.comparator
+																	.compare(
+																			viewer,
+																			e1,
+																			e2);
+												}
+											});
+									treeViewer.getTree().setSortDirection(
+											SWT.UP);
+								}
+								treeViewer.getTree().setSortColumn(
+										treeColumn.getColumn());
+							}
+						});
+			}
+			treeColumn.setLabelProvider(columnData.labelProvider);
+		}
+
+		// Handler that will draw the bar charts.
+		treeViewer.getTree().addListener(SWT.EraseItem, new Listener() {
+			// @Override
+			public void handleEvent(Event event) {
+				if (columnDataList[event.index].percentageProvider != null) {
+					StatisticsTreeNode node = (StatisticsTreeNode) event.item
+							.getData();
+
+					double percentage = columnDataList[event.index].percentageProvider
+							.getPercentage(node);
+					if (percentage == 0) {
+						return;
+					}
+
+					if ((event.detail & SWT.SELECTED) > 0) {
+						Color oldForeground = event.gc.getForeground();
+						event.gc.setForeground(event.item.getDisplay()
+								.getSystemColor(SWT.COLOR_LIST_SELECTION));
+						event.gc.fillRectangle(event.x, event.y, event.width,
+								event.height);
+						event.gc.setForeground(oldForeground);
+						event.detail &= ~SWT.SELECTED;
+					}
+
+					int barWidth = (int) ((treeViewer.getTree().getColumn(1)
+							.getWidth() - 8) * percentage);
+					int oldAlpha = event.gc.getAlpha();
+					Color oldForeground = event.gc.getForeground();
+					Color oldBackground = event.gc.getBackground();
+					event.gc.setAlpha(64);
+					event.gc.setForeground(event.item.getDisplay()
+							.getSystemColor(SWT.COLOR_BLUE));
+					event.gc.setBackground(event.item.getDisplay()
+							.getSystemColor(SWT.COLOR_LIST_BACKGROUND));
+					event.gc.fillGradientRectangle(event.x, event.y, barWidth,
+							event.height, true);
+					event.gc.drawRectangle(event.x, event.y, barWidth,
+							event.height);
+					event.gc.setForeground(oldForeground);
+					event.gc.setBackground(oldBackground);
+					event.gc.setAlpha(oldAlpha);
+					event.detail &= ~SWT.BACKGROUND;
+				}
+			}
+		});
+
+		treeViewer.setComparator(columnDataList[0].comparator);
+		treeViewer.getTree().setSortColumn(treeViewer.getTree().getColumn(0));
+		treeViewer.getTree().setSortDirection(SWT.DOWN);
+
+		treeViewer.setInput(StatisticsTreeFactory
+				.getStatisticsTree("Experiment"));
+
+		// Read current data if any available
+		StateExperimentManager experimentManger = StateManagerFactory
+				.getExperimentManager();
+		experimentManger.readExperiment("statisticsView", this);
+
+	}
+	@Override
+	public void dispose() {
+		super.dispose();
+		EventProcessorProxy.getInstance().removeEventProcessorFactory(
+				StatsTimeCountHandlerFactory.getInstance());
+		EventProcessorProxy.getInstance().removeEventProcessorFactory(
+				StatsEventCountHandlerFactory.getInstance());
+
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
+	 */
+	@Override
+	public void setFocus() {
+		treeViewer.getTree().setFocus();
+	}
+
+	@TmfSignalHandler
+	public void processingStarted(RequestStartedSignal request) {
+		// Nothing to do for the time being
+
+	}
+
+	@TmfSignalHandler
+	public void processingCompleted(RequestCompletedSignal signal) {
+		treeViewer.getTree().getDisplay().asyncExec(new Runnable() {
+			// @Override
+			public void run() {
+				treeViewer.refresh();
+			}
+		});
+	}
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/AbstractStatsEventHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/AbstractStatsEventHandler.java
new file mode 100644
index 0000000..57c99b9
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/AbstractStatsEventHandler.java
@@ -0,0 +1,222 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Yann N. Dauphin     (dhaemon@gmail.com)  - Implementation for stats
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor;
+
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.state.StateStrings.Events;
+import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionMode;
+import org.eclipse.linuxtools.lttng.state.StateStrings.ProcessStatus;
+import org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing;
+import org.eclipse.linuxtools.lttng.state.model.LttngProcessState;
+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsTreeFactory;
+import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsTreeNode;
+
+abstract class AbstractStatsEventHandler implements IEventProcessing {
+	private Events eventType;
+	
+	public AbstractStatsEventHandler(Events eventType) {
+		super();
+		this.eventType = eventType;
+	}
+
+	/**
+	 * @return root of of the tree for this experiment.
+	 */
+	protected StatisticsTreeNode getStatisticsTree(LttngEvent trcEvent) {
+		StatisticsTreeNode tree = StatisticsTreeFactory.getStatisticsTree("Experiment");
+		return tree;
+	}
+	
+	/**
+	 * @return list of paths that should be updated for this event.
+	 */
+	protected String[][] getRelevantPaths(LttngEvent event,
+			LttngTraceState traceState) {
+		String trace = traceState.getInputDataRef().getTraceId();
+		
+		Long cpu = event.getCpuId();
+		
+		LttngProcessState process = traceState.getRunning_process().get(
+				cpu);
+		
+		String processName = getPocessName(process);
+				
+		String mode = process.getState().getExec_mode().getInName();
+		
+		String submode = process.getState().getExec_submode();
+		
+		Long function = process.getCurrent_function();
+		
+		// String type = event.getType().getTypeId();
+
+		String[][] paths = {
+				{trace},
+				{trace, "Modes", mode},
+				{trace, "Modes", mode, "Submodes", submode},
+				{trace, "Processes", processName},
+				{trace, "Processes", processName, "CPUs", cpu.toString()},
+				{trace, "Processes", processName, "CPUs", cpu.toString(), "Functions", function.toString()},
+				{trace, "Processes", processName, "CPUs", cpu.toString(), "Modes", mode},
+				{trace, "Processes", processName, "CPUs", cpu.toString(), "Modes", mode, "Submodes", submode},
+				{trace, "Processes", processName, "Modes", mode},
+				{trace, "Processes", processName, "Modes", mode, "Submodes", submode},
+				{trace, "CPUs", cpu.toString()},
+				{trace, "CPUs", cpu.toString(), "Modes", mode},
+				{trace, "CPUs", cpu.toString(), "Modes", mode, "Submodes", submode},
+		};
+		return paths;
+	}
+	
+	/**
+	 * @return list of event types paths that should be updated for this event.
+	 */
+	protected String[][] getRelevantEventTypesPaths(LttngEvent event,
+			LttngTraceState traceState) {
+		String trace = traceState.getInputDataRef().getTraceId();
+		
+		Long cpu = event.getCpuId();
+		
+		LttngProcessState process = traceState.getRunning_process().get(
+				cpu);
+		
+		String processName = getPocessName(process);
+				
+		String mode = process.getState().getExec_mode().getInName();
+		
+		String submode = process.getState().getExec_submode();
+		
+		Long function = process.getCurrent_function();
+		
+		String type = event.getType().getTypeId();
+
+		String[][] paths = {
+				{trace, "Event Types", type},
+				{trace, "Modes", mode, "Event Types", type},
+				{trace, "Modes", mode, "Submodes", submode, "Event Types", type},
+				{trace, "Processes", processName, "Event Types", type},
+				{trace, "Processes", processName, "CPUs", cpu.toString(), "Event Types", type},
+				{trace, "Processes", processName, "CPUs", cpu.toString(), "Functions", function.toString(), "Event Types", type},
+				{trace, "Processes", processName, "CPUs", cpu.toString(), "Modes", mode, "Event Types", type},
+				{trace, "Processes", processName, "CPUs", cpu.toString(), "Modes", mode, "Submodes", submode, "Event Types", type},
+				{trace, "Processes", processName, "Modes", mode, "Event Types", type},
+				{trace, "Processes", processName, "Modes", mode, "Submodes", submode, "Event Types", type},
+				{trace, "CPUs", cpu.toString(), "Event Types", type},
+				{trace, "CPUs", cpu.toString(), "Modes", mode, "Event Types", type},
+				{trace, "CPUs", cpu.toString(), "Modes", mode, "Submodes", submode, "Event Types", type},
+		};
+		return paths;
+	}
+	
+	/**
+	 * @return name of the process. Returns special string if the name is "".
+	 */
+	private String getPocessName(LttngProcessState process) {
+		if (process.getName() == null) {
+			return "Unknown process";
+		}
+		if (process.getName() == "") {
+			return process.getPid().toString();
+		}
+		else {
+			return process.getName();
+		}
+	}
+	
+	/**
+	 * Increase the NbEvents counter of this node.
+	 */
+	protected void increaseNbEvents(StatisticsTreeNode node) {
+		node.getValue().nbEvents++;
+	}
+	
+	/**
+	 * Increase the CPU Time according to the trace state.
+	 */
+	protected void increaseCPUTime(StatisticsTreeNode node, LttngEvent event,
+			LttngTraceState traceState) {
+		Long cpu = event.getCpuId();
+		
+		LttngProcessState process = traceState.getRunning_process().get(
+				cpu);
+		
+		if (process.getState().getProc_status().equals(ProcessStatus.LTTV_STATE_RUN) &&
+				!process.getState().getExec_mode().equals(ExecutionMode.LTTV_STATE_MODE_UNKNOWN)) {
+			node.getValue().cpuTime += event.getTimestamp().getValue()
+				- process.getState().getChange_LttTime();
+		}
+	}
+	
+	/**
+	 * Increase the Elapsed Time according to the trace state.
+	 */
+	protected void increaseElapsedTime(StatisticsTreeNode node, LttngEvent event,
+			LttngTraceState traceState) {
+		Long cpu = event.getCpuId();
+		
+		LttngProcessState process = traceState.getRunning_process().get(
+				cpu);
+		
+		if (!process.getState().getExec_mode().equals(ExecutionMode.LTTV_STATE_MODE_UNKNOWN)) {
+			node.getValue().elapsedTime += event.getTimestamp().getValue()
+				- process.getState().getEntry_LttTime();
+		}
+	}
+	
+	/**
+	 * Increase the Cumulative CPU Time according to the trace state.
+	 */
+	protected void increaseCumulativeCPUTime(StatisticsTreeNode node, LttngEvent event,
+			LttngTraceState traceState) {
+		Long cpu = event.getCpuId();
+		
+		LttngProcessState process = traceState.getRunning_process().get(
+				cpu);
+		
+		if (!process.getState().getExec_mode().equals(ExecutionMode.LTTV_STATE_MODE_UNKNOWN)) {
+			long cumulativeCpuTime = process.getState().getCum_cpu_time();
+			long delta = event.getTimestamp().getValue() - process.getState().getEntry_LttTime();
+			process.getState().setCum_cpu_time(cumulativeCpuTime + delta);
+			node.getValue().cumulativeCpuTime += process.getState().getCum_cpu_time();
+		}
+		else if (process.getState().getProc_status().equals(ProcessStatus.LTTV_STATE_RUN) &&
+				!process.getState().getExec_mode().equals(ExecutionMode.LTTV_STATE_MODE_UNKNOWN)) {
+			long cumulativeCpuTime = process.getState().getCum_cpu_time();
+			long delta = event.getTimestamp().getValue() - process.getState().getChange_LttTime();
+			process.getState().setCum_cpu_time(cumulativeCpuTime + delta);
+			node.getValue().cumulativeCpuTime += process.getState().getCum_cpu_time();
+		}
+	}
+	
+	/**
+	 * Increase the State-bound Cumulative CPU Time according to the trace state.
+	 */
+	protected void increaseStateCumulativeCPUTime(LttngEvent event,
+			LttngTraceState traceState) {
+		Long cpu = event.getCpuId();
+		
+		LttngProcessState process = traceState.getRunning_process().get(cpu);
+		
+		if (process.getState().getProc_status().equals(ProcessStatus.LTTV_STATE_RUN) &&
+				!process.getState().getExec_mode().equals(ExecutionMode.LTTV_STATE_MODE_UNKNOWN)) {
+			long cumulativeCpuTime = process.getState().getCum_cpu_time();
+			long delta = event.getTimestamp().getValue() - process.getState().getChange_LttTime();
+			process.getState().setCum_cpu_time(cumulativeCpuTime + delta);
+		}
+	}
+	
+//	@Override
+	public Events getEventHandleType() {
+		return eventType;
+	}
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsEventCountHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsEventCountHandler.java
new file mode 100644
index 0000000..03d041c
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsEventCountHandler.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Yann N. Dauphin     (dhaemon@gmail.com)  - Implementation for stats
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor;
+
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.state.StateStrings.Events;
+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsTreeNode;
+
+class StatsEventCountHandler extends AbstractStatsEventHandler {
+	
+	public StatsEventCountHandler(Events eventType) {
+		super(eventType);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing#process(org.eclipse.linuxtools.lttng.event.LttngEvent, org.eclipse.linuxtools.lttng.state.model.LttngTraceState)
+	 */
+	public boolean process(LttngEvent event, LttngTraceState traceState) {		
+		StatisticsTreeNode root = getStatisticsTree(event);
+		
+		String[][] paths = getRelevantPaths(event, traceState);
+		
+		for (String[] path : paths) {
+			StatisticsTreeNode node = root.getOrCreateChildFromPath(path); 
+			
+			increaseNbEvents(node);
+		}
+		
+		String[][] eventTypesPaths = getRelevantEventTypesPaths(event, traceState);
+		
+		for (String[] path : eventTypesPaths) {
+			StatisticsTreeNode node = root.getOrCreateChildFromPath(path); 
+			
+			increaseNbEvents(node);
+		}
+		
+		return false;
+	}
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsEventCountHandlerFactory.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsEventCountHandlerFactory.java
new file mode 100644
index 0000000..bb22bac
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsEventCountHandlerFactory.java
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Yann N. Dauphin     (dhaemon@gmail.com)  - Implementation for stats
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor;
+
+import org.eclipse.linuxtools.lttng.state.evProcessor.AbsEventProcessorFactory;
+import org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing;
+
+/**
+ * Provide the handlers that will count the number of events and update the
+ * appropriate tree.
+ * 
+ * Builds a Map from string event name to a processing handler object, the
+ * processors implement the same interface to facilitate transparent methods
+ * call,
+ * 
+ * The map key STring is the entry point of the raw events, using a hash speeds
+ * up the resolution of the appropriate processor
+ * 
+ * @author yann
+ * 
+ */
+public class StatsEventCountHandlerFactory extends AbsEventProcessorFactory{
+	// ========================================================================
+	// Data
+	// ========================================================================
+	private static StatsEventCountHandlerFactory instance = null;
+
+	private final IEventProcessing handler = new StatsEventCountHandler(null);
+	
+	// ========================================================================
+	// Public methods
+	// =======================================================================
+	/**
+	 * The event processors are common to all traces an multiple instances will
+	 * use more memory unnecessarily
+	 * 
+	 * @return
+	 */
+	public static AbsEventProcessorFactory getInstance() {
+		if (instance == null) {
+			instance = new StatsEventCountHandlerFactory();
+		}
+		return instance;
+	}
+
+
+	@Override
+	public IEventProcessing getAfterProcessor(String eventType) {
+		return handler;
+	}
+
+	@Override
+	public IEventProcessing getBeforeProcessor(String eventType) {
+		return null;
+	}
+
+	@Override
+	public IEventProcessing getfinishProcessor() {
+		// No finishing processor used
+		return null;
+	}
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeChangeHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeChangeHandler.java
new file mode 100644
index 0000000..b5e3a7a
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeChangeHandler.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Yann N. Dauphin     (dhaemon@gmail.com)  - Implementation for stats
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor;
+
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.state.StateStrings.Events;
+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsTreeNode;
+
+class StatsModeChangeHandler extends AbstractStatsEventHandler {
+	
+	public StatsModeChangeHandler(Events eventType) {
+		super(eventType);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing#process(org.eclipse.linuxtools.lttng.event.LttngEvent, org.eclipse.linuxtools.lttng.state.model.LttngTraceState)
+	 */
+	public boolean process(LttngEvent event, LttngTraceState traceState) {		
+		StatisticsTreeNode root = getStatisticsTree(event);
+		
+		String[][] paths = getRelevantPaths(event, traceState);
+		
+		for (String[] path : paths) {
+			StatisticsTreeNode node = root.getOrCreateChildFromPath(path);
+			
+			increaseCPUTime(node, event, traceState);
+			
+			increaseStateCumulativeCPUTime(event, traceState);
+		}
+		
+		return false;
+	}
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeEndHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeEndHandler.java
new file mode 100644
index 0000000..06afafd
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeEndHandler.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Yann N. Dauphin     (dhaemon@gmail.com)  - Implementation for stats
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor;
+
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.state.StateStrings.Events;
+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsTreeNode;
+
+class StatsModeEndHandler extends AbstractStatsEventHandler {
+	
+	public StatsModeEndHandler(Events eventType) {
+		super(eventType);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing#process(org.eclipse.linuxtools.lttng.event.LttngEvent, org.eclipse.linuxtools.lttng.state.model.LttngTraceState)
+	 */
+	public boolean process(LttngEvent event, LttngTraceState traceState) {
+		StatisticsTreeNode root = getStatisticsTree(event);
+		
+		String[][] paths = getRelevantPaths(event, traceState);
+		
+		for (String[] path : paths) {
+			StatisticsTreeNode node = root.getOrCreateChildFromPath(path); 
+			
+			increaseCPUTime(node, event, traceState);
+			
+			increaseElapsedTime(node, event, traceState);
+			
+			increaseCumulativeCPUTime(node, event, traceState);
+		}
+		
+		return false;
+	}
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlerFactory.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlerFactory.java
new file mode 100644
index 0000000..20c62e4
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlerFactory.java
@@ -0,0 +1,132 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Yann N. Dauphin     (dhaemon@gmail.com)  - Implementation for stats
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.linuxtools.lttng.state.StateStrings;
+import org.eclipse.linuxtools.lttng.state.evProcessor.AbsEventProcessorFactory;
+import org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing;
+
+/**
+ * Provide the handlers that will count the CPU Time, Cumulative CPU Time and
+ * Elapsed Time and update the appropriate tree.
+ * 
+ * Builds a Map from string event name to a processing handler object, the
+ * processors implement the same interface to facilitate transparent methods
+ * call,
+ * 
+ * The map key STring is the entry point of the raw events, using a hash speeds
+ * up the resolution of the appropriate processor
+ * 
+ * @author alvaro
+ * 
+ */
+public class StatsTimeCountHandlerFactory extends AbsEventProcessorFactory{
+	// ========================================================================
+	// Data
+	// =======================================================================
+	private final Map<String, IEventProcessing> eventNametoBeforeProcessor = new HashMap<String, IEventProcessing>();
+	private final Map<String, IEventProcessing> eventNametoAfterProcessor = new HashMap<String, IEventProcessing>();
+	private static StatsTimeCountHandlerFactory instance = null;
+	private StatsTimeCountHandlers instantiateHandler = new StatsTimeCountHandlers();
+
+	// ========================================================================
+	// Constructors
+	// =======================================================================
+	private StatsTimeCountHandlerFactory() {
+		//create one instance of each individual event handler and add the instance to the map
+		eventNametoBeforeProcessor.put(StateStrings.Events.LTT_EVENT_SYSCALL_ENTRY
+				.getInName(), instantiateHandler.getSyscallEntryBeforeHandler());
+		
+		eventNametoBeforeProcessor.put(StateStrings.Events.LTT_EVENT_SYSCALL_EXIT
+				.getInName(), instantiateHandler.getsySyscallExitBeforeHandler());
+		
+		eventNametoBeforeProcessor.put(StateStrings.Events.LTT_EVENT_TRAP_ENTRY
+				.getInName(), instantiateHandler.getTrapEntryBeforeHandler());
+		
+		eventNametoBeforeProcessor.put(StateStrings.Events.LTT_EVENT_TRAP_EXIT
+				.getInName(), instantiateHandler.getTrapExitBeforeHandler());
+		
+		eventNametoBeforeProcessor.put(StateStrings.Events.LTT_EVENT_PAGE_FAULT_ENTRY
+				.getInName(), instantiateHandler.getTrapEntryBeforeHandler());
+		
+		eventNametoBeforeProcessor.put(StateStrings.Events.LTT_EVENT_PAGE_FAULT_EXIT
+				.getInName(), instantiateHandler.getTrapExitBeforeHandler());
+
+		eventNametoBeforeProcessor.put(StateStrings.Events.LTT_EVENT_PAGE_FAULT_NOSEM_ENTRY
+				.getInName(), instantiateHandler.getTrapEntryBeforeHandler());
+		
+		eventNametoBeforeProcessor.put(StateStrings.Events.LTT_EVENT_PAGE_FAULT_NOSEM_EXIT
+				.getInName(), instantiateHandler.getTrapExitBeforeHandler());
+		
+		eventNametoBeforeProcessor.put(StateStrings.Events.LTT_EVENT_IRQ_ENTRY
+				.getInName(), instantiateHandler.getIrqEntryBeforeHandler());
+		
+		eventNametoBeforeProcessor.put(StateStrings.Events.LTT_EVENT_IRQ_EXIT
+				.getInName(), instantiateHandler.getIrqExitBeforeHandler());
+		
+		eventNametoBeforeProcessor.put(StateStrings.Events.LTT_EVENT_SOFT_IRQ_ENTRY
+				.getInName(), instantiateHandler.getSoftIrqEntryBeforeHandler());
+		
+		eventNametoBeforeProcessor.put(StateStrings.Events.LTT_EVENT_SOFT_IRQ_EXIT
+				.getInName(), instantiateHandler.getSoftIrqExitBeforeHandler());
+		
+		eventNametoBeforeProcessor.put(StateStrings.Events.LTT_EVENT_FUNCTION_ENTRY
+				.getInName(), instantiateHandler.getFunctionEntryBeforeHandler());
+		
+		eventNametoBeforeProcessor.put(StateStrings.Events.LTT_EVENT_FUNCTION_EXIT
+				.getInName(), instantiateHandler.getFunctionExitBeforeHandler());
+		
+		eventNametoBeforeProcessor.put(StateStrings.Events.LTT_EVENT_SCHED_SCHEDULE
+				.getInName(), instantiateHandler.getSchedChangeBeforeHandler());
+		
+		eventNametoAfterProcessor.put(StateStrings.Events.LTT_EVENT_SCHED_SCHEDULE
+				.getInName(), instantiateHandler.getSchedChangeAfterHandler());
+
+	}
+
+	// ========================================================================
+	// Public methods
+	// =======================================================================
+	/**
+	 * The event processors are common to all traces an multiple instances will
+	 * use more memory unnecessarily
+	 * 
+	 * @return
+	 */
+	public static AbsEventProcessorFactory getInstance() {
+		if (instance == null) {
+			instance = new StatsTimeCountHandlerFactory();
+		}
+		return instance;
+	}
+
+
+	@Override
+	public IEventProcessing getAfterProcessor(String eventType) {
+		return eventNametoAfterProcessor.get(eventType);
+	}
+
+	@Override
+	public IEventProcessing getBeforeProcessor(String eventType) {
+		return eventNametoBeforeProcessor.get(eventType);
+	}
+
+	@Override
+	public IEventProcessing getfinishProcessor() {
+		// No finishing processor used
+		return null;
+	}
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlers.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlers.java
new file mode 100644
index 0000000..f3eade8
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlers.java
@@ -0,0 +1,159 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Yann N. Dauphin     (dhaemon@gmail.com)  - Implementation for stats
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor;
+
+import org.eclipse.linuxtools.lttng.state.StateStrings.Events;
+import org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing;
+
+/**
+ * Process the system call entry event
+ * 
+ * @author alvaro
+ * 
+ */
+class StatsTimeCountHandlers {
+	
+	/**
+	 * Method to handle the event: LTT_EVENT_SYSCALL_ENTRY
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getSyscallEntryBeforeHandler() {
+		AbstractStatsEventHandler handler = new StatsModeChangeHandler(Events.LTT_EVENT_SYSCALL_ENTRY);
+		return handler;
+	}
+	
+	/**
+	 * Method to handle the event: LTT_EVENT_SYSCALL_EXIT
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getsySyscallExitBeforeHandler() {
+		AbstractStatsEventHandler handler = new StatsModeEndHandler(Events.LTT_EVENT_SYSCALL_EXIT);
+		return handler;
+	}
+	
+	/**
+	 * Method to handle the event: LTT_EVENT_TRAP_ENTRY
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getTrapEntryBeforeHandler() {
+		AbstractStatsEventHandler handler = new StatsModeChangeHandler(Events.LTT_EVENT_TRAP_ENTRY);
+		return handler;
+	}
+	
+	/**
+	 * Method to handle the event: LTT_EVENT_TRAP_EXIT
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getTrapExitBeforeHandler() {
+		AbstractStatsEventHandler handler = new StatsModeEndHandler(Events.LTT_EVENT_TRAP_EXIT);
+		return handler;
+	}
+	
+	/**
+	 * Method to handle the event: LTT_EVENT_IRQ_ENTRY
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getIrqEntryBeforeHandler() {
+		AbstractStatsEventHandler handler = new StatsModeChangeHandler(Events.LTT_EVENT_IRQ_ENTRY);
+		return handler;
+	}
+	
+	/**
+	 * Method to handle the event: LTT_EVENT_IRQ_EXIT
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getIrqExitBeforeHandler() {
+		AbstractStatsEventHandler handler = new StatsModeEndHandler(Events.LTT_EVENT_IRQ_EXIT);
+		return handler;
+	}
+	
+	/**
+	 * Method to handle the event: LTT_EVENT_SOFT_IRQ_ENTRY
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getSoftIrqEntryBeforeHandler() {
+		AbstractStatsEventHandler handler = new StatsModeChangeHandler(Events.LTT_EVENT_SOFT_IRQ_ENTRY);
+		return handler;
+	}
+	
+	/**
+	 * Method to handle the event: LTT_EVENT_SOFT_IRQ_EXIT
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getSoftIrqExitBeforeHandler() {
+		AbstractStatsEventHandler handler = new StatsModeEndHandler(Events.LTT_EVENT_SOFT_IRQ_EXIT);
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles event: LTT_EVENT_FUNCTION_ENTRY
+	 * </p>
+	 * <p>
+	 * FIELDS: LTT_FIELD_THIS_FN, LTT_FIELD_CALL_SITE
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getFunctionEntryBeforeHandler() {
+		AbstractStatsEventHandler handler = new StatsModeChangeHandler(Events.LTT_EVENT_FUNCTION_ENTRY);
+		return handler;
+	}
+
+	/**
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getFunctionExitBeforeHandler() {
+		AbstractStatsEventHandler handler = new StatsModeEndHandler(Events.LTT_EVENT_FUNCTION_EXIT);
+		return handler;
+	}
+	
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_SCHED_SCHEDULE
+	 * </p>
+	 * <p>
+	 * Fields: LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getSchedChangeBeforeHandler() {
+		AbstractStatsEventHandler handler = new StatsModeChangeHandler(Events.LTT_EVENT_SCHED_SCHEDULE);
+		return handler;
+	}
+	
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_SCHED_SCHEDULE
+	 * </p>
+	 * <p>
+	 * Fields: LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getSchedChangeAfterHandler() {
+		AbstractStatsEventHandler handler = new StatsModeChangeHandler(Events.LTT_EVENT_SCHED_SCHEDULE);
+		return handler;
+	}
+	
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/Statistics.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/Statistics.java
new file mode 100644
index 0000000..53caa96
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/Statistics.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Yann N. Dauphin     (dhaemon@gmail.com)  - Implementation for stats
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.statistics.model;
+
+public class Statistics {
+	public long nbEvents = 0;
+	
+	public long cpuTime = 0;
+	
+	public long cumulativeCpuTime = 0;
+	
+	public long elapsedTime = 0;
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/StatisticsTreeFactory.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/StatisticsTreeFactory.java
new file mode 100644
index 0000000..1b986d5
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/StatisticsTreeFactory.java
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Yann N. Dauphin     (dhaemon@gmail.com)  - Implementation for stats
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.statistics.model;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class StatisticsTreeFactory {
+	// ========================================================================
+	// Data
+	// =======================================================================
+
+	private static final Map<String, StatisticsTreeNode> instanceBook = new HashMap<String, StatisticsTreeNode>();
+	
+	// ========================================================================
+	// Methods
+	// =======================================================================
+
+	/**
+	 * Provide a statisticsTree instance per trace
+	 * 
+	 * @return
+	 */
+	public static StatisticsTreeNode getStatisticsTree(String traceUniqueId) {
+		if (traceUniqueId == null) {
+			return null;
+		}
+
+		if (instanceBook.containsKey(traceUniqueId)) {
+			return instanceBook.get(traceUniqueId);
+		}
+		
+		StatisticsTreeNode tree = new StatisticsTreeNode(traceUniqueId, new Statistics());
+
+		instanceBook.put(traceUniqueId, tree);
+		
+		return tree;
+	}
+
+	/**
+	 * Remove previously registered statistics tree.
+	 * @param traceUniqueId
+	 */
+	public static void removeStatisticsTree(String traceUniqueId) {
+		if (traceUniqueId != null && instanceBook.containsKey(traceUniqueId)) {
+			instanceBook.remove(traceUniqueId);
+		}
+	}
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/StatisticsTreeNode.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/StatisticsTreeNode.java
new file mode 100644
index 0000000..2a10f55
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/StatisticsTreeNode.java
@@ -0,0 +1,199 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Yann N. Dauphin     (dhaemon@gmail.com)  - Implementation for stats
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.ui.views.statistics.model;
+
+import java.util.AbstractMap;
+import java.util.Collection;
+import java.util.HashMap;
+
+/*
+ * A tree where nodes can be accessed efficiently using paths.
+ * 
+ * It works like file systems. Each node is identified by a key. A path is a list of keys separated by the character '/'.
+ * For example, the path 'persons/yann' will browse to the child 'persons' and return it's 'yann' child.
+ * 
+ * If a key might contains the character '/', use the #escapeKey method to get an escaped key. Use the #unescapeKey
+ * method to unescaped the key.
+ */
+public class StatisticsTreeNode {
+
+	private StatisticsTreeNode parent;
+
+	private String key;
+
+	private Statistics value;
+
+	private AbstractMap<String, StatisticsTreeNode> children;
+
+	/*
+	 * Construct a node with the given key and value.
+	 */
+	public StatisticsTreeNode(String key, Statistics value) {
+		this(null, key, value);
+	}
+
+	/*
+	 * Construct a node with the given parent, key and value.
+	 */
+	public StatisticsTreeNode(StatisticsTreeNode parent, String key,
+			Statistics value) {
+		super();
+		this.parent = parent;
+		this.key = key;
+		this.value = value;
+		this.children = new HashMap<String, StatisticsTreeNode>();
+	}
+
+	/*
+	 * @return key associated with this node.
+	 */
+	public StatisticsTreeNode getParent() {
+		return this.parent;
+	}
+
+	/*
+	 * @return key associated with this node.
+	 */
+	public String getKey() {
+		return this.key;
+	}
+
+	/*
+	 * @return value associated with this node.
+	 */
+	public Statistics getValue() {
+		return this.value;
+	}
+
+	/*
+	 * Add a direct child with the given value at the given path.
+	 * 
+	 * @return children node that was created.
+	 */
+	public StatisticsTreeNode addChild(String key, Statistics value) {
+		StatisticsTreeNode created = new StatisticsTreeNode(this, key, value);
+
+		this.children.put(key, created);
+
+		return created;
+	}
+
+	/*
+	 * @return direct children node with the given key. null if not found.
+	 */
+	public StatisticsTreeNode getChild(String key) {
+		if (!this.children.containsKey(key)) {
+			return null;
+		}
+
+		return this.children.get(key);
+	}
+
+	/*
+	 * @return number of direct children of this node.
+	 */
+	public boolean hasChildren() {
+		return getNbChildren() > 0;
+	}
+
+	/*
+	 * @return direct children of this node.
+	 */
+	public Collection<StatisticsTreeNode> getChildren() {
+		return children.values();
+	}
+
+	/*
+	 * @return number of direct children of this node.
+	 */
+	public int getNbChildren() {
+		return children.size();
+	}
+
+	/*
+	 * Get the node at the given path. If it doesn't exist each node in the path
+	 * will be created with the given class.
+	 * 
+	 * @return children node with the given path. null if not found.
+	 */
+	public StatisticsTreeNode getOrCreateChildFromPath(String[] path) {
+		// StatisticsTreeNode previous = this.parent;
+		StatisticsTreeNode current = this;
+		for (String key : path) {
+			if (!current.children.containsKey(key)) {
+				current.children.put(key, new StatisticsTreeNode(current, key,
+						new Statistics()));
+			}
+
+			// previous = current;
+			current = current.children.get(key);
+		}
+
+		return current;
+	}
+
+	/*
+	 * Get the node at the given path. If it doesn't exist each node in the path
+	 * will be created with the given class.
+	 * 
+	 * @return children node with the given path. null if not found.
+	 */
+	public StatisticsTreeNode getOrCreateChildFromPath(String path) {
+		StatisticsTreeNode previous = this.parent;
+		StatisticsTreeNode current = this;
+		for (String key : path.split("/")) {
+			if (!current.children.containsKey(key)) {
+				current.children.put(key, new StatisticsTreeNode(previous, key,
+						new Statistics()));
+			}
+
+			previous = current;
+			current = current.children.get(key);
+		}
+
+		return current;
+	}
+
+	/*
+	 * @return children node with the given path. null if not found.
+	 */
+	public StatisticsTreeNode getChildFromPath(String path) {
+		StatisticsTreeNode current = this;
+		for (String key : path.split("/")) {
+			if (!current.children.containsKey(key)) {
+				return null;
+			}
+
+			current = current.children.get(key);
+		}
+
+		return current;
+	}
+
+	/*
+	 * Use this to escape a key that might contain the '/' character.
+	 * 
+	 * @return escaped key
+	 */
+	public static String escapeKey(String key) {
+		return key.replace("%", "%25").replace("/", "%2F");
+	}
+
+	/*
+	 * Use this to unescape a key.
+	 * 
+	 * @return unescaped key
+	 */
+	public static String unescapeKey(String key) {
+		return key.replace("%2F", "/").replace("%25", "%");
+	}
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/SpinnerGroup.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/SpinnerGroup.java
new file mode 100644
index 0000000..f8e9c3d
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/SpinnerGroup.java
@@ -0,0 +1,320 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.timeframe;
+
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Spinner;
+
+// ========================================================================
+// SpinnerGroup
+// ========================================================================
+
+/**
+ * <b><u>SpinnerGroup</u></b>
+ * <p>
+ * A SpinnerGroup holds two coordinated spinners (for seconds and
+ * nanoseconds) representing the current time within the trace.
+ * <p>
+ * The current time can take any value anything within the time range (start
+ * and end time).
+ */
+public class SpinnerGroup {
+
+    // The nanosecond scale (10^9)
+    private static final int  NS_PER_SECOND = 1000 * 1000 * 1000;
+    private static final byte NS_SCALING_FACTOR = -9;
+
+    // Labels
+    private static final String SECONDS_LABEL = "sec";
+    private static final String NANOSEC_LABEL = "ns";
+
+    // Widgets
+    private Group group;
+    private Spinner seconds;
+    private Spinner nanosec;
+
+    // The valid time range - start time
+    private TmfTimestamp startTime;
+    private int startSeconds;
+    private int startNanosec;
+
+    // The valid time range - end time
+    private TmfTimestamp endTime;
+    private int endSeconds;
+    private int endNanosec;
+
+    // The current time value
+    private TmfTimestamp currentTime;
+    private int currentSeconds;
+    private int currentNanosec;
+    
+	private TimeFrameView fOwner;
+
+    /**
+     * <b><u>Constructor</u></b>
+     * <p>
+     * <li>Creates the display group and formats it for the grid cell
+     * <li>Sets the initial values for Start/End/Current time
+     * </li>
+     * <p>
+     * @param parent    - the parent Composite
+     * @param groupName - the group name
+     * @param range     - the valid time range (start/end time)
+     * @param current   - the current time
+     */
+    public SpinnerGroup(TimeFrameView owner, Composite parent, String groupName, TmfTimeRange range, TmfTimestamp current) {
+
+    	fOwner = owner;
+
+        // Create the group
+        group = new Group(parent, SWT.BORDER);
+        group.setText(groupName);
+
+        // Make it use the whole grid cell
+        GridData gridData = new GridData(SWT.LEFT, SWT.TOP, true, false);
+        gridData.horizontalAlignment = SWT.FILL;
+        group.setLayoutData(gridData);
+
+        // Create and position the widgets
+        seconds = new Spinner(group, SWT.BORDER);
+        seconds.addModifyListener(new ModifyListener() {
+            public void modifyText(ModifyEvent e) {
+                currentSeconds = seconds.getSelection();
+                refreshCurrentTime();
+            }
+        });
+        seconds.setBounds(5, 25, 110, 25);
+
+        Label label = new Label(group, SWT.LEFT);
+        label.setText(SECONDS_LABEL);
+        label.setBounds(120, 28, 25, 22);
+
+        nanosec = new Spinner(group, SWT.BORDER);
+        nanosec.addModifyListener(new ModifyListener() {
+            public void modifyText(ModifyEvent e) {
+                currentNanosec = nanosec.getSelection();
+                // Correct for nanosec underflow
+                if (currentNanosec < 0) {
+                    currentSeconds--;
+                    currentNanosec = NS_PER_SECOND - 1;
+                }
+                // Correct for nanosec overflow
+                if (currentNanosec >= NS_PER_SECOND) {
+                    currentSeconds++;
+                    currentNanosec = 0;
+                }
+                refreshCurrentTime();
+            }
+        });
+        nanosec.setBounds(150, 25, 110, 25);
+
+        label = new Label(group, SWT.LEFT);
+        label.setText(NANOSEC_LABEL);
+        label.setBounds(265, 28, 25, 22);
+
+        setContent(range, current);
+    }
+
+    private void refreshCurrentTime() {
+        long newCurrentTime = ((long) currentSeconds) * NS_PER_SECOND + currentNanosec;
+        TmfTimestamp ts = new TmfTimestamp(newCurrentTime, NS_SCALING_FACTOR, 0);
+        currentTime = ts;
+//        fOwner.synchTimeFrameWidgets(this);
+    }
+
+    // ====================================================================
+    // Get/Set
+    // ====================================================================
+
+    public TmfTimestamp getStartTime() {
+        return startTime;
+    }
+
+    public TmfTimestamp getEndTime() {
+        return endTime;
+    }
+
+    public TmfTimestamp getCurrentTime() {
+        return currentTime;
+    }
+
+    public TmfTimestamp getSpan() {
+        TmfTimestamp span = new TmfTimestamp(startTime.getAdjustment(endTime), NS_SCALING_FACTOR, 0);
+        return span;
+    }
+
+    public TmfTimeRange getTimeRange() {
+        TmfTimeRange range = new TmfTimeRange(startTime, endTime);
+        return range;
+    }
+
+    public void setStartTime(TmfTimestamp ts) {
+    	try {
+    		startTime = ts.synchronize(0, NS_SCALING_FACTOR);
+    		startSeconds = (int) (startTime.getValue() / NS_PER_SECOND);
+    		startNanosec = (int) (startTime.getValue() % NS_PER_SECOND);
+    	}
+    	catch (ArithmeticException e) {
+    	}
+    }
+
+    public void setEndTime(TmfTimestamp ts) {
+    	try {
+    		endTime = ts.synchronize(0, NS_SCALING_FACTOR);
+    		endSeconds = (int) (endTime.getValue() / NS_PER_SECOND);
+    		endNanosec = (int) (endTime.getValue() % NS_PER_SECOND);
+    	}
+    	catch (ArithmeticException e) {
+    	}
+    }
+
+    public void setCurrentTime(TmfTimestamp ts) {
+    	try {
+    		currentTime = ts.synchronize(0, NS_SCALING_FACTOR);
+    		currentSeconds = (int) (currentTime.getValue() / NS_PER_SECOND);
+    		currentNanosec = (int) (currentTime.getValue() % NS_PER_SECOND);
+    	}
+    	catch (ArithmeticException e) {
+    	}
+    }
+
+    // ====================================================================
+    // Operators
+    // ====================================================================
+
+    /**
+     * <b><u>setContent</u></b>
+     * <p>
+     * <li>validates that [startTime <= currentTime <= endTime] is respected
+     * <li>sets the start/current/end time and update the spinners
+     * </li>
+     * <p>
+     * 
+     * @param range
+     * @param current
+     */
+    public void setContent(TmfTimeRange range, TmfTimestamp current) {
+
+    	if (range != null) {
+        	// Extract the time range
+            TmfTimestamp start = range.getStartTime();
+            TmfTimestamp end   = range.getEndTime();
+
+            // Assume start time is OK
+            setStartTime(start);
+
+            // Make sure end time >= start time
+            if (end.compareTo(start, false) < 0) {
+                end = start;
+            }
+            setEndTime(end);
+
+            // Make sure [start time <= current time <= end time]
+            // If not: current = min(max(start, current), end);
+            if (current.compareTo(start, false) < 0) {
+                current = start;
+            }
+            if (current.compareTo(end, false) > 0) {
+                current = end;
+            }
+    	}
+        setCurrentTime(current);
+
+        // And configure the spinners
+        updateSpinners();
+    }
+
+    /**
+     * <b><u>setValue</u></b>
+     * <p>
+     * <li>validates that [startTime <= currentTime <= endTime] is respected
+     * <li>sets the current time and the spinners
+     * </li>
+     * <p>
+     * 
+     * @param range
+     * @param current
+     */
+    public void setValue(TmfTimestamp current) {
+
+        // Make sure [start time <= current time <= end time]
+        // If not: current = min(max(start, current), end);
+        if (current.compareTo(startTime, false) < 0) {
+            current = startTime;
+        }
+        if (current.compareTo(endTime, false) > 0) {
+            current = endTime;
+        }
+        setCurrentTime(current);
+
+        // And configure the spinners
+        updateSpinners();
+    }
+
+    /**
+     * Update the spinners with the new current time value
+     * Perform the update on the UI thread
+     */
+    public void updateSpinners() {
+
+        seconds.getDisplay().asyncExec(new Runnable() {
+			public void run() {
+				if (!seconds.isDisposed() && !nanosec.isDisposed()) {
+		            // If we are on the start second, ensure that [currentNS >= startNS]
+		            // If the currentSeconds > startSeconds, set startns to -1 so we can
+		            // "underflow"
+		            int startns = -1;
+		            if (currentSeconds <= startSeconds) {
+		                currentSeconds = startSeconds;
+		                startns = startNanosec;
+		                if (currentNanosec < startns) {
+		                    currentNanosec = startns;
+		                }
+		            }
+
+		            // If we are on the end second, ensure that [currentNS <= endNS]
+		            // If the currentSeconds < endSeconds, set endns to MAX so we can
+		            // "overflow"
+		            int endns = NS_PER_SECOND;
+		            if (currentSeconds >= endSeconds) {
+		                currentSeconds = endSeconds;
+		                endns = endNanosec;
+		                if (currentNanosec > endns) {
+		                    currentNanosec = endns;
+		                }
+		            }
+
+		            // Refresh the spinners (value, range, increments, ...)
+					// To ensure that the spinners are properly set, the range has to be > 0 
+//					seconds.setValues(currentSeconds, startSeconds - 1, endSeconds + 1, 0, 1, 10);
+//					nanosec.setValues(currentNanosec, startns - 1, endns + 1, 0, 1, 1000000);
+					seconds.setValues(currentSeconds, startSeconds, endSeconds, 0, 1, 10);
+					nanosec.setValues(currentNanosec, startns, endns, 0, 100000, 10000000);
+
+		            // If start == end (i.e. no range), disable the spinner
+		            // (if start == end, the spinner widget range is set to [0..100] by default)
+		            seconds.setEnabled(startSeconds != endSeconds);
+		            nanosec.setEnabled(startns != endns);
+				}
+			}
+        });
+    }
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java
new file mode 100644
index 0000000..6295072
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java
@@ -0,0 +1,325 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.ui.views.timeframe;
+
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
+import org.eclipse.linuxtools.tmf.experiment.TmfExperimentSelectedSignal;
+import org.eclipse.linuxtools.tmf.experiment.TmfExperimentUpdatedSignal;
+import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler;
+import org.eclipse.linuxtools.tmf.signal.TmfTimeSynchSignal;
+import org.eclipse.linuxtools.tmf.ui.views.TmfView;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Slider;
+
+/**
+ * <b><u>TimeFrameView</u></b>
+ * <p>
+ * The TimeFrameView provides a set of spinners to monitor and set the start
+ * time, end time, the current time interval and current time of the trace
+ * set at the nanosecond level.
+ * <p>
+ * It ensures that the following relations are always true:
+ * <p>
+ * <li>[ startTime >= start time of the trace ]
+ * <li>[ endTime <= end time of the trace ]
+ * <li>[ startTime <= currentTime <= endTime ]
+ * <li>[ interval == (endTime - startTime) ]
+ * </li>
+ * <p>
+ * It provides a slider to rapidly set the current time within the time range
+ * (i.e. between startTime and endTime).
+ * <p>
+ * Finally, it allows modification of the time range and the current time. This
+ * triggers notifications to the other LTTng views.
+ * <p>
+ * FIXME: The slider is very jumpy due to the large number of async updates
+ * FIXME: Revisit the control flow between View, Spinners and Slider
+ */
+public class TimeFrameView extends TmfView {
+
+    public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.timeframe";
+
+    // ========================================================================
+    // TimeFrameView
+    // ========================================================================
+
+    // The event log timestamp characteristics
+    private TmfTimestamp fTraceStartTime = new TmfTimestamp();
+    private TmfTimestamp fTraceEndTime   = new TmfTimestamp();
+
+    private TmfTimestamp fCurrentTime   = new TmfTimestamp();
+    
+    private TmfTimeRange fTraceTimeRange = new TmfTimeRange(fTraceStartTime, fTraceEndTime);
+    private TmfTimeRange fTraceSpan      = new TmfTimeRange(fTraceStartTime, fTraceEndTime);
+    private byte fScale = 0;
+
+    // Labels
+    private static final String START_TIME_LABEL   = "Window Start Time";
+    private static final String END_TIME_LABEL     = "Window End Time";
+    private static final String TIME_RANGE_LABEL   = "Window Range";
+    private static final String CURRENT_TIME_LABEL = "Current Time";
+
+    private static final int SLIDER_RANGE = 10000;
+
+    private SpinnerGroup fStartGroup;
+    private SpinnerGroup fEndGroup;
+    private SpinnerGroup fRangeGroup;
+    private SpinnerGroup fCurrentGroup;
+
+    // The slider
+    private Slider fSlider;
+
+    // The current experiment
+    TmfExperiment<LttngEvent> fExperiment = null;
+
+    /**
+     * Constructor
+     */
+    public TimeFrameView() {
+    	super("TimeFrameView");
+    }
+
+    /* (non-Javadoc)
+     * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
+     */
+	@Override
+	public void createPartControl(Composite parent) {
+
+        // Set the view layout
+        GridLayout layout = new GridLayout(4, true);
+        parent.setLayout(layout);
+
+        fStartGroup   = new SpinnerGroup(this, parent, START_TIME_LABEL,   fTraceTimeRange, fTraceStartTime);
+        fEndGroup     = new SpinnerGroup(this, parent, END_TIME_LABEL,     fTraceTimeRange, fTraceEndTime);
+        fRangeGroup   = new SpinnerGroup(this, parent, TIME_RANGE_LABEL,   fTraceTimeRange, fTraceEndTime);
+        fCurrentGroup = new SpinnerGroup(this, parent, CURRENT_TIME_LABEL, fTraceTimeRange, fTraceStartTime);
+
+        // Create the slider
+        createSlider(parent);
+    }
+
+    /* (non-Javadoc)
+     * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
+     */
+	@Override
+	public void setFocus() {
+        // TODO Auto-generated method stub
+    }
+
+    // ========================================================================
+    // Operators
+    // ========================================================================
+
+    /**
+     * One of the spinners has been updated. Synchronize the other widgets.
+     */
+    public void synchTimeFrameWidgets(SpinnerGroup trigger) {
+
+        // Collect the data
+        TmfTimestamp startTime   = fStartGroup.getCurrentTime();
+        TmfTimestamp endTime     = fEndGroup.getCurrentTime();
+        TmfTimestamp timeRange   = fRangeGroup.getCurrentTime();
+        TmfTimestamp currentTime = fCurrentGroup.getCurrentTime();
+
+        // If startTime was set beyond endTime, adjust endTime and interval
+        if (trigger == fStartGroup) {
+            if (startTime.compareTo(endTime, false) > 0) {
+                endTime = startTime;
+            }
+        }
+
+        // If endTime was set beyond startTime, adjust startTime and interval
+        if (trigger == fEndGroup) {
+            if (endTime.compareTo(startTime, false) < 0) {
+                startTime = endTime;
+            }
+        }
+
+        // If timeRange was set, adjust endTime
+        if (trigger == fRangeGroup) {
+            long start = startTime.getValue();
+            long span  = timeRange.getValue();
+            TmfTimestamp ts = new TmfTimestamp(start + span, startTime.getScale(), 0);
+            if (ts.compareTo(fTraceEndTime, false) > 0) {
+                ts = fTraceEndTime.synchronize(fTraceEndTime.getValue(), startTime.getScale());
+            }
+            endTime = ts;
+        }
+
+        // Compute the new time range
+        TmfTimeRange subrange = new TmfTimeRange(startTime, endTime);
+        TmfTimestamp interval = new TmfTimestamp(startTime.getAdjustment(endTime), startTime.getScale(), 0);
+
+        // Update the spinner groups
+        fStartGroup.setContent(fTraceTimeRange, startTime);
+        fEndGroup.setContent(fTraceTimeRange, endTime);
+        fRangeGroup.setContent(fTraceSpan, interval);
+        fCurrentGroup.setContent(subrange, currentTime);
+
+        updateSlider(subrange, currentTime);
+
+        // Notify other views
+        if (!fCurrentTime.equals(currentTime)) {
+            fCurrentTime = currentTime;
+            broadcast(new TmfTimeSynchSignal(this, currentTime));
+        }
+    }
+
+    // ========================================================================
+    // Slider Handling
+    // ========================================================================
+
+    /**
+     * @param parent
+     */
+    private void createSlider(Composite parent) {
+        fSlider = new Slider(parent, SWT.SMOOTH | SWT.FILL);
+        fSlider.setMinimum(0);
+        fSlider.setMaximum(SLIDER_RANGE + fSlider.getThumb());
+        fSlider.setIncrement(SLIDER_RANGE / 100);
+        fSlider.setPageIncrement(SLIDER_RANGE / 10);
+        fSlider.setSelection(0);
+
+        GridData gridData = new GridData(SWT.LEFT, SWT.TOP, true, false);
+        gridData.horizontalAlignment = SWT.FILL;
+        gridData.horizontalSpan = 4;
+        fSlider.setLayoutData(gridData);
+
+        fSlider.addListener(SWT.Selection, new Listener() {
+        	public void handleEvent(Event event) {
+				int ratio = fSlider.getSelection();
+				TmfTimestamp span = fCurrentGroup.getSpan();
+				long value = span.getValue() * ratio / SLIDER_RANGE;
+				TmfTimestamp start = fCurrentGroup.getStartTime();
+				TmfTimestamp current = new TmfTimestamp(start.getValue() + value, start.getScale(), 0);
+				fCurrentGroup.setValue(current);
+			}
+        });
+
+    }
+
+    /**
+     * @param range
+     * @param timestamp
+     */
+    private void updateSlider(TmfTimeRange range, TmfTimestamp timestamp) {
+
+        // Determine the new relative position
+        long total    = range.getStartTime().getAdjustment(range.getEndTime());
+        long relative = range.getStartTime().getAdjustment(timestamp);
+
+        // Set the slider value
+        final long position = (total > 0) ? (relative * SLIDER_RANGE / total) : 0;
+
+        // Update the slider on the UI thread
+        long current = fSlider.getSelection();
+        if (position != current) {
+        	fSlider.getDisplay().asyncExec(new Runnable() {
+        		public void run() {
+        			fSlider.setSelection((int) position);
+        		}
+        	});
+        }
+    }
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return "[TimeFrameView]";
+	}
+
+    // ========================================================================
+    // TMF Signal Handling
+    // ========================================================================
+
+	/**
+     * @param signal
+     */
+    @SuppressWarnings("unchecked")
+    @TmfSignalHandler
+    public void experimentSelected(TmfExperimentSelectedSignal<LttngEvent> signal) {
+
+        // Update the trace reference
+        fExperiment = (TmfExperiment<LttngEvent>) signal.getExperiment();
+
+        // Update the time frame
+        fTraceTimeRange = fExperiment.getTimeRange();
+        fTraceStartTime = fTraceTimeRange.getStartTime();
+        fTraceEndTime   = fTraceTimeRange.getEndTime();
+        fScale          = fTraceStartTime.getScale();
+
+        // Update the widgets
+        fStartGroup.setContent(fTraceTimeRange, fTraceStartTime);
+        fEndGroup.setContent(fTraceTimeRange, fTraceEndTime);
+        fCurrentGroup.setContent(fTraceTimeRange, fTraceStartTime);
+
+        fCurrentTime = fTraceStartTime;
+
+        TmfTimestamp delta = new TmfTimestamp(fTraceStartTime.getAdjustment(fTraceEndTime), fScale, 0);
+        fTraceSpan = new TmfTimeRange(new TmfTimestamp(0, fScale, 0), delta);
+//        fRangeGroup.setContent(fTraceSpan, delta);
+        TmfTimestamp start = new TmfTimestamp(1, (byte) -1, 0);
+        fRangeGroup.setContent(fTraceSpan, start);
+    }
+
+    /**
+     * @param signal
+     */
+    @TmfSignalHandler
+    public void experimentUpdated(TmfExperimentUpdatedSignal signal) {
+
+        // Update the time frame
+       	fTraceTimeRange = signal.getTrace().getTimeRange();
+        fTraceStartTime = fTraceTimeRange.getStartTime();
+        fTraceEndTime   = fTraceTimeRange.getEndTime();
+        fScale          = fTraceStartTime.getScale();
+
+        // Update the widgets
+        fStartGroup.setContent(fTraceTimeRange, fStartGroup.getCurrentTime());
+        fEndGroup.setContent(fTraceTimeRange, fTraceEndTime);
+        fCurrentGroup.setContent(fTraceTimeRange, fCurrentGroup.getCurrentTime());
+
+        TmfTimestamp delta = new TmfTimestamp(fTraceStartTime.getAdjustment(fTraceEndTime), fScale, 0);
+        fTraceSpan = new TmfTimeRange(new TmfTimestamp(0, fScale, 0), delta);
+        fRangeGroup.setContent(fTraceSpan, delta);
+    }
+
+    /**
+     * @param signal
+     */
+    @TmfSignalHandler
+    public void currentTimeUpdated(TmfTimeSynchSignal signal) {
+    	if (signal.getSource() != this) {
+            fCurrentTime = signal.getCurrentTime().synchronize(0, fStartGroup.getCurrentTime().getScale());
+            if (fStartGroup.getCurrentTime().compareTo(fCurrentTime, false) > 0) {
+            	fStartGroup.setContent(new TmfTimeRange(fCurrentTime, fEndGroup.getCurrentTime()), fCurrentTime);
+            }
+            if (fEndGroup.getCurrentTime().compareTo(fCurrentTime, false) < 0) {
+            	fEndGroup.setContent(new TmfTimeRange(fStartGroup.getCurrentTime(), fCurrentTime), fCurrentTime);
+            }
+            fCurrentGroup.setContent(null, fCurrentTime);
+            updateSlider(fCurrentGroup.getTimeRange(), fCurrentTime);
+    	}
+    }
+
+}
\ No newline at end of file
diff --git a/profiling/.classpath b/lttng/org.eclipse.linuxtools.lttng/.classpath
similarity index 100%
copy from profiling/.classpath
copy to lttng/org.eclipse.linuxtools.lttng/.classpath
diff --git a/lttng/org.eclipse.linuxtools.lttng/.project b/lttng/org.eclipse.linuxtools.lttng/.project
new file mode 100644
index 0000000..bb740cc
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.lttng</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/lttng/org.eclipse.linuxtools.lttng/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..d9b8634
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/META-INF/MANIFEST.MF
@@ -0,0 +1,21 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.linuxtools.lttng
+Bundle-Version: 0.2.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.lttng.LTTngCorePlugin
+Bundle-Vendor: %Bundle-Vendor
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.linuxtools.tmf;bundle-version="0.2.0",
+ org.eclipse.linuxtools.lttng.jni;bundle-version="0.2.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.linuxtools.lttng,
+ org.eclipse.linuxtools.lttng.event,
+ org.eclipse.linuxtools.lttng.state,
+ org.eclipse.linuxtools.lttng.state.evProcessor,
+ org.eclipse.linuxtools.lttng.state.evProcessor.state,
+ org.eclipse.linuxtools.lttng.state.experiment,
+ org.eclipse.linuxtools.lttng.state.model,
+ org.eclipse.linuxtools.lttng.trace
+Bundle-Localization: plugin
diff --git a/lttng/org.eclipse.linuxtools.lttng/build.properties b/lttng/org.eclipse.linuxtools.lttng/build.properties
new file mode 100644
index 0000000..aa1a008
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/build.properties
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.properties
diff --git a/lttng/org.eclipse.linuxtools.lttng/plugin.properties b/lttng/org.eclipse.linuxtools.lttng/plugin.properties
new file mode 100644
index 0000000..da1d0fb
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/plugin.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.linuxtools.lttng
+Bundle-Vendor = Eclipse
+Bundle-Name = LTTng - Linux Tracing Toolkit (Incubation)
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/LTTngCorePlugin.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/LTTngCorePlugin.java
new file mode 100644
index 0000000..779ae5e
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/LTTngCorePlugin.java
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng;
+
+import org.eclipse.core.runtime.Plugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * <b><u>LTTngCorePlugin</u></b>
+ * <p>
+ * The activator class controls the plug-in life cycle
+ */
+public class LTTngCorePlugin extends Plugin {
+
+    // ========================================================================
+    // Attributes
+    // ========================================================================
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng";
+
+	// The shared instance
+	private static LTTngCorePlugin plugin;
+	
+    // ========================================================================
+    // Constructors
+    // ========================================================================
+
+	/**
+	 * The constructor
+	 */
+	public LTTngCorePlugin() {
+	}
+
+    // ========================================================================
+    // Accessors
+    // ========================================================================
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static LTTngCorePlugin getDefault() {
+		return plugin;
+	}
+
+    // ========================================================================
+    // Operators
+    // ========================================================================
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		TraceDebug.init();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/LttngException.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/LttngException.java
new file mode 100644
index 0000000..36de9fa
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/LttngException.java
@@ -0,0 +1,14 @@
+package org.eclipse.linuxtools.lttng;
+
+/**
+ * <b><u>LttngException</u></b>
+ * <p>
+ * Super exception class for Lttng
+ */
+public class LttngException extends Exception {
+	static final long serialVersionUID = 4016530589556719360L;
+
+    public LttngException(String errMsg) {
+        super(errMsg);
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/TraceDebug.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/TraceDebug.java
new file mode 100644
index 0000000..96eb50d
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/TraceDebug.java
@@ -0,0 +1,148 @@
+package org.eclipse.linuxtools.lttng;

+

+import java.text.SimpleDateFormat;

+import java.util.Date;

+

+import org.eclipse.core.runtime.ILog;

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.Platform;

+import org.eclipse.core.runtime.Plugin;

+import org.eclipse.core.runtime.Status;

+

+public class TraceDebug {

+	static boolean DEBUG = false;

+	static boolean INFO = false;

+	static boolean WARN = false;

+

+	private static Plugin plugin = LTTngCorePlugin.getDefault();

+	private static String pluginID = LTTngCorePlugin.PLUGIN_ID;

+	private static SimpleDateFormat stimeformat = new SimpleDateFormat(

+			"HH:mm:ss:SSS");

+

+	public static void init() {

+		// Update JniTrace configuration options

+		String debugTrace = Platform.getDebugOption(pluginID + "/debug");

+		String infoTrace = Platform.getDebugOption(pluginID + "/info");

+		String warnTrace = Platform.getDebugOption(pluginID + "/warn");

+

+		if (debugTrace != null) {

+			DEBUG = (new Boolean(debugTrace)).booleanValue();

+		}

+

+		if (infoTrace != null) {

+			INFO = (new Boolean(infoTrace)).booleanValue();

+		}

+

+		if (warnTrace != null) {

+			WARN = (new Boolean(warnTrace)).booleanValue();

+		}

+	}

+

+	public static void info(String message) {

+		if (INFO) {

+			ILog logger = plugin.getLog();

+			logger.log(new Status(IStatus.INFO, LTTngCorePlugin.PLUGIN_ID,

+					IStatus.OK, message, null));

+		}

+	}

+

+	public static void warn(String message) {

+		if (WARN) {

+			ILog logger = plugin.getLog();

+			logger.log(new Status(IStatus.WARNING, LTTngCorePlugin.PLUGIN_ID,

+					IStatus.WARNING, message, null));

+		}

+	}

+

+	public static void debug(String message) {

+		if (DEBUG) {

+			String location = getCallingLocation();

+			System.out.println(location + "\n\t-> " + message);

+

+		}

+	}

+

+	public static void debug(String message, int additionalStackLines) {

+		if (DEBUG) {

+			String location = getCallingLocation(additionalStackLines);

+			System.out.println(location + "\n\t-> " + message);

+		}

+	}

+

+	public static void throwException(String message) {

+		if (DEBUG) {

+			try {

+				triggerException(message);

+			} catch (Exception e) {

+				e.printStackTrace();

+			}

+		}

+	}

+

+	private static void triggerException(String message) throws Exception {

+		throw new Exception(message);

+	}

+

+	private static String getCallingLocation() {

+		StringBuilder sb = new StringBuilder();

+		sb.append(trace(Thread.currentThread().getStackTrace(), 4));

+		sb.append("\n" + trace(Thread.currentThread().getStackTrace(), 3));

+		return sb.toString();

+	}

+

+	private static String getCallingLocation(int numOfStackLines) {

+		int stackCalledFromIdx = 3;

+		int earliestRequested = numOfStackLines > 0 ? stackCalledFromIdx

+				+ numOfStackLines : stackCalledFromIdx;

+		StringBuilder sb = new StringBuilder();

+		for (int i = earliestRequested; i >= stackCalledFromIdx; i--) {

+			sb.append(trace(Thread.currentThread().getStackTrace(), i) + "\n");

+		}

+		return sb.toString();

+	}

+

+	private static String trace(StackTraceElement e[], int level) {

+		if (e != null && e.length >= level) {

+			StackTraceElement s = e[level];

+			if (s != null) {

+				String simpleClassName = s.getClassName();

+				String[] clsNameSegs = simpleClassName.split("\\.");

+				if (clsNameSegs.length > 0)

+					simpleClassName = clsNameSegs[clsNameSegs.length - 1];

+				return stimeformat.format(new Date()) + " " + simpleClassName

+						+ "." + s.getLineNumber() + "." + s.getMethodName();

+			}

+		}

+		return null;

+	}

+

+	public static boolean setDEBUG(boolean newValue) {

+		boolean oldValue = DEBUG;

+		DEBUG = newValue;

+		return oldValue;

+	}

+

+	public static boolean setINFO(boolean newValue) {

+		boolean oldValue = INFO;

+		INFO = newValue;

+		return oldValue;

+	}

+

+	public static boolean setWARN(boolean newValue) {

+		boolean oldValue = WARN;

+		WARN = newValue;

+		return oldValue;

+	}

+

+	public static boolean isDEBUG() {

+		return DEBUG;

+	}

+

+	public static boolean isINFO() {

+		return INFO;

+	}

+

+	public static boolean isWARN() {

+		return WARN;

+	}

+}

diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEvent.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEvent.java
new file mode 100644
index 0000000..a257b3b
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEvent.java
@@ -0,0 +1,157 @@
+package org.eclipse.linuxtools.lttng.event;
+
+import org.eclipse.linuxtools.lttng.jni.JniEvent;
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.event.TmfEventSource;
+
+/**
+ * <b><u>LttngEvent</u></b><p>
+ * 
+ * Lttng specific TmfEvent implementation.<p>
+ * 
+ * The main difference from the basic Tmf implementation is that we keep an internal reference to the JniEvent<br>
+ * The conversion from this LttngEvent to the JniEvent is then possible.
+ */
+public class LttngEvent extends TmfEvent {
+    
+    // Reference to the JNI JniEvent. Should only be used INTERNALLY
+    private JniEvent jniEventReference = null;
+
+    /**
+     * Constructor with parameters.<p>
+     * 
+     * @param timestamp  The timestamp of this event   
+     * @param source     The source of this event
+     * @param type       The type of this event
+     * @param content    The content of this event
+     * @param reference  The reference of this event
+     * @param lttEvent   A reference to a valid JniEvent object
+     * 
+     * @see org.eclipse.linuxtools.tmf.event.TmfTimestamp
+     * @see org.eclipse.linuxtools.tmf.event.TmfEventSource
+     * @see org.eclipse.linuxtools.lttng.event.LttngEventType
+     * @see org.eclipse.linuxtools.lttng.event.LttngEventContent
+     * @see org.eclipse.linuxtools.lttng.event.LttngEventReference
+     * @see org.eclipse.linuxtools.org.eclipse.linuxtools.lttng.jni.JniEvent
+     */
+    public LttngEvent(LttngTimestamp timestamp, TmfEventSource source, LttngEventType type, LttngEventContent content, LttngEventReference reference, JniEvent lttEvent) { 
+        super(timestamp, source, type, reference);
+        
+        fContent = content;
+        jniEventReference = lttEvent;
+    }
+    
+    /**
+     * Copy constructor.<p>
+     * 
+     * @param oldEvent		Event we want to copy from.
+     */
+    public LttngEvent(LttngEvent oldEvent) {
+        this(	(LttngTimestamp)oldEvent.getTimestamp(), 
+        		(TmfEventSource)oldEvent.getSource(), 
+        		(LttngEventType)oldEvent.getType(), 
+        		(LttngEventContent)oldEvent.getContent(), 
+        		(LttngEventReference)oldEvent.getReference(), 
+        		oldEvent.jniEventReference
+        	);
+    }
+    
+    
+    /**
+     * Return the channel name of this event.<p>
+     * 
+     * @return Channel (tracefile) for this event
+     */
+    public String getChannelName() {
+        return ( (LttngEventType)this.getType() ).getTracefileName();
+    }
+    
+    /**
+     * Cpu id number of this event.<p>
+     * 
+     * @return CpuId
+     */
+    public long getCpuId() {
+        return ( (LttngEventType)this.getType() ).getCpuId();
+    }
+    
+    /**
+     * Marker name of this event.<p>
+     * 
+     * @return Marker name
+     */
+    public String getMarkerName() {
+        return ( (LttngEventType)this.getType() ).getMarkerName();
+    }
+    
+    /**
+     * Set a new JniReference for this event.<p>
+     * 
+     * Note : Reference is used to get back to the Jni during event parsing and need to be consistent.
+     * 
+     * @param newJniEventReference	New reference
+     * 
+     * @see org.eclipse.linuxtools.org.eclipse.linuxtools.lttng.jni.JniEvent
+     */
+    public void updateJniEventReference(JniEvent newJniEventReference) {
+        this.jniEventReference = newJniEventReference;
+    }
+    
+    @Override
+    public LttngEventContent getContent() {
+        return (LttngEventContent)fContent;
+    }
+    
+    public void setContent(LttngEventContent newContent) {
+        fContent = newContent;
+    }
+    
+    @Override
+    public LttngEventType getType() {
+        return (LttngEventType)fType;
+    }
+    
+    public void setType(LttngEventType newType) {
+        fType = newType;
+    }
+    
+    
+    /**
+     * Convert this event into a Jni JniEvent.<p>
+     * 
+     * Note : Some verifications are done to make sure the event is still valid on 
+     * the Jni side before conversion.<br> If it is not the case, null will be returned.
+     * 
+     * @return The converted JniEvent
+     * 
+     * @see org.eclipse.linuxtools.org.eclipse.linuxtools.lttng.jni.JniEvent
+     */
+    public synchronized JniEvent convertEventTmfToJni() {
+        JniEvent tmpEvent = null;
+        
+        // ***TODO***
+        // Should we remove the check to save some time??
+        
+        // We don't want to send away events that are outdated as their informations could be invalid
+        //  If the timestamp between the event and the trace are not coherent we will not perform the conversion
+        if ( jniEventReference.getParentTracefile().getParentTrace().getCurrentEventTimestamp().getTime() == getTimestamp().getValue() ) {
+            tmpEvent = jniEventReference;
+        }
+        else {
+            System.out.println("convertEventTmfToJni() failed: Unsynced Timestamp > TMF:" + getTimestamp().getValue() + " <--> JNI:" + jniEventReference.getParentTracefile().getParentTrace().getCurrentEventTimestamp().getTime());
+        }
+        return tmpEvent;
+    }
+    
+    @Override
+	public String toString() {
+    	String returnedData="";
+    	
+    	returnedData += "Event timestamp:" + this.getTimestamp().getValue() + " ";
+    	returnedData += "Channel:" + getChannelName() + " ";
+    	returnedData += "CPU:" + getCpuId() + " ";
+    	returnedData += "Marker:" + getMarkerName() + " ";
+    	
+    	return returnedData;
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventContent.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventContent.java
new file mode 100644
index 0000000..813814e
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventContent.java
@@ -0,0 +1,253 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   William Bourque (wbourque@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.event;
+
+import java.util.HashMap;
+
+import org.eclipse.linuxtools.lttng.jni.JniEvent;
+import org.eclipse.linuxtools.tmf.event.TmfEventContent;
+
+/**
+ * <b><u>LttngEventContent</u></b><p>
+ * 
+ * Lttng specific implementation of the TmfEventContent.<p>
+ */
+public class LttngEventContent extends TmfEventContent {
+    
+    // Hash map that contain the (parsed) fields. This is the actual payload of the event.
+    HashMap<String, LttngEventField> fFieldsMap = new HashMap<String, LttngEventField>();
+    
+    /**
+     * Default constructor.<p>
+     * 
+     * 
+     */
+    public LttngEventContent() {
+        super(null, null);
+    }
+    
+    /**
+     * Constructor with parameters.<p>
+     * 
+     * @param thisParent    Parent event for this content.
+     * 
+     * @see org.eclipse.linuxtools.lttng.event.LttngEvent
+     */
+    public LttngEventContent(LttngEvent thisParent) {
+        super(thisParent, null);
+    }
+    
+    /**
+     * Constructor with parameters, with optional content.<p>
+     * 
+     * @param thisParent    Parent event for this content.
+     * @param thisContent   Already parsed content.
+     * 
+     * @see org.eclipse.linuxtools.lttng.event.LttngEvent
+     */
+    public LttngEventContent(LttngEvent thisParent, HashMap<String, LttngEventField> thisContent) {
+        super(thisParent, null);
+        
+        fFieldsMap = thisContent;
+    }
+    
+    /**
+     * Copy Constructor.<p>
+     * 
+     * @param oldContent  Content to copy from
+     */
+    public LttngEventContent(LttngEventContent oldContent) {
+        this((LttngEvent)oldContent.getEvent(), oldContent.getRawContent() );
+    }
+    
+    
+    @Override
+	public LttngEvent getEvent() {
+        return (LttngEvent)fParentEvent;
+    }
+    
+    public void setEvent(LttngEvent newParent) {
+        fParentEvent = newParent;
+    }
+    
+    
+    // *** VERIFY ***
+    // These are not very useful, are they?
+    @Override
+	public LttngEventType getType() {
+        return (LttngEventType)fParentEvent.getType();
+    }
+    public void setType(LttngEventType newType) {
+        ((LttngEvent)fParentEvent).setType(newType);
+    }
+    
+    
+    // ***TODO***
+    // Find a better way to ensure content is sane!!
+    public void emptyContent() {
+        fFieldsMap.clear();
+    }
+    
+    // ***VERIFY***
+    // A bit weird to return the _currently_parsed fields (unlike all fields like getFields() )
+    // Should we keep this?
+    /**
+     * Return currently parsed fields in an object array format.<p>
+     * 
+     * @return  Currently parsed fields.
+     */
+    @Override
+    public Object[] getContent() {
+        Object[] returnedContent = fFieldsMap.values().toArray( new Object[fFieldsMap.size()] );
+        
+        return returnedContent;
+    }
+    
+    /**
+     * Return currently parsed fields in the internal hashmap format.<p>
+     * 
+     * @return  Currently parsed fields.
+     */
+    public HashMap<String, LttngEventField> getRawContent() {
+        return fFieldsMap;
+    }
+    
+//    @SuppressWarnings("unchecked")
+//    @Override
+//    public LttngEventField[] getFields() {
+//        LttngEventField tmpField = null;
+//        
+//        // *** TODO ***
+//        // SLOW! SLOW! SLOW! We should prevent the user to use this!!
+//        HashMap<String, Object> parsedContent = parseContent();
+//        
+//        String contentKey = null;
+//        Iterator<String> contentItr = parsedContent.keySet().iterator();
+//        while ( contentItr.hasNext() ) {
+//            contentKey = contentItr.next();
+//            
+//            tmpField = new LttngEventField(this, contentKey, parsedContent.get(contentKey));
+//            ((HashMap<String, LttngEventField>)fFields).put(contentKey, tmpField);
+//        }
+//        
+//        return fFields.values().toArray(new LttngEventField[fFields.size()]);
+//    }
+    
+    /**
+     * Parse all fields and return them as an array of LttngFields.<p>
+     * 
+     * Note : This function is heavy and should only be called if all fields are really needed.
+     * 
+     * @return  All fields.
+     * 
+     * @see @see org.eclipse.linuxtools.lttng.event.LttngEventField
+     */
+    @Override
+    public synchronized LttngEventField[] getFields() {
+        
+        
+        if ( fFieldsMap.size() < fParentEvent.getType().getNbFields() ) {
+        	LttngEventField tmpField = null;
+        	LttngEventType tmpType = (LttngEventType)fParentEvent.getType();
+        	
+	        for ( int pos=0; pos<tmpType.getNbFields(); pos++ ) {
+	            String name = tmpType.getLabel(pos);
+	            JniEvent tmpEvent = ((LttngEvent)getEvent()).convertEventTmfToJni();
+	            
+	            if ( tmpEvent != null ) {
+		            Object newValue = tmpEvent.parseFieldByName(name);
+		            tmpField = new LttngEventField(this, name, newValue );
+		            fFieldsMap.put(name, tmpField);
+	            }
+	        }
+        }
+        return fFieldsMap.values().toArray(new LttngEventField[fFieldsMap.size()]);
+    }
+    
+    /**
+     * Parse a single field from its given position.<p>
+     * 
+     * @return  The parsed field or null.
+     * 
+     * @see @see org.eclipse.linuxtools.lttng.event.LttngEventField
+     */
+    @Override
+    public LttngEventField getField(int position) {
+        LttngEventField returnedField = null;
+        String label = fParentEvent.getType().getLabel(position);
+        
+        if ( label != null ) {
+            returnedField = this.getField(label);
+        }
+        
+        return returnedField;
+    }
+    
+    /**
+     * Parse a single field from its given name.<p>
+     * 
+     * @return  The parsed field or null.
+     * 
+     * @see @see org.eclipse.linuxtools.lttng.event.LttngEventField
+     */
+    @Override
+    public synchronized LttngEventField getField(String name) {
+    	// *** VERIFY ***
+        // Should we check if the field exists in LttngType before parsing? 
+        // It could avoid calling parse for non-existent fields but would waste some cpu cycle on check?
+        LttngEventField returnedField = fFieldsMap.get(name);
+        
+        if ( returnedField == null ) {
+            // *** VERIFY ***
+            // Should we really make sure we didn't get null before creating/inserting a field?
+        	JniEvent tmpEvent = ((LttngEvent)getEvent()).convertEventTmfToJni();
+        	
+        	if ( tmpEvent != null) {
+	        	Object newValue =  tmpEvent.parseFieldByName(name);
+	            
+	            if ( newValue!= null ) {
+	                returnedField = new LttngEventField(this, name, newValue);
+	                fFieldsMap.put(name, returnedField );
+	            }
+        	}
+        }
+        
+        return returnedField;
+    }
+    
+    // *** VERIFY ***
+    // *** Is this even useful?
+    @Override
+    protected void parseContent() {
+        fFields = getFields();
+    }
+    
+    /**
+     * toString() method to print the content
+     * 
+     * Note : this function parse all fields and so is very heavy to use.
+     */
+    @Override
+    public String toString() {
+        String returnedString = "";
+        
+        LttngEventField[] allFields = getFields();
+        
+        for ( int pos=0; pos < allFields.length; pos++) {
+            returnedString +=  allFields[pos].toString() + " ";
+        }
+        
+        return returnedString;
+        
+    }
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventField.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventField.java
new file mode 100644
index 0000000..31b15bb
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventField.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   William Bourque (wbourque@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.event;
+
+import org.eclipse.linuxtools.tmf.event.TmfEventContent;
+import org.eclipse.linuxtools.tmf.event.TmfEventField;
+
+/**
+ * <b><u>LttngEventField</u></b><p>
+ * 
+ * Lttng specific implementation of the TmfEventField.<p>
+ * 
+ * LttngEventField add a "name" attribute to the Tmf implementation This
+ * mean the fields will have a name and a value.
+ */
+public class LttngEventField extends TmfEventField {
+	
+    /**
+     * Constructor with parameters.<p>
+     * 
+     * @param parent   Parent content for this field
+     * @param id       Name (label) of this field
+     */
+    public LttngEventField(TmfEventContent parent, String id) {
+        super(parent, id, null);
+    }
+    
+	/**
+	 * Constructor with parameters with optional value.<p>
+	 * 
+	 * @param parent   Parent content for this field
+	 * @param id       Name (label) of this field
+	 * @param value    Parsed value (payload) of this field
+	 */
+	public LttngEventField(TmfEventContent parent, String id, Object value) {
+		super(parent, id, value);
+	}
+	
+	/**
+	 * Copy constructor.<p>
+	 * 
+	 * @param oldField     the field to copy from
+	 */
+	public LttngEventField(LttngEventField oldField) {
+		this(oldField.getParent(), oldField.getId(), oldField.getValue());
+	}
+	
+	@Override
+	public String toString() {
+	    return getId().toString() + ":" + getValue().toString();
+	}
+	
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventReference.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventReference.java
new file mode 100644
index 0000000..9ed0652
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventReference.java
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   William Bourque (wbourque@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.event;
+
+import org.eclipse.linuxtools.tmf.event.*;
+
+/**
+ * <b><u>LttngEventReference</u></b><p>
+ * 
+ * Lttng specific implementation of the TmfEventReference
+ */
+public class LttngEventReference extends TmfEventReference {
+    
+    private String tracename = ""; 
+    
+    /**
+     * Constructor with parameters.<p>
+     * 
+     * @param newTraceName      Trace name 
+     */
+    public LttngEventReference(String newTraceName) {
+        super("");
+        tracename = newTraceName;
+    }
+    
+    /**
+     * Constructor with parameters with optional tracefile path.<p>
+     * 
+     * @param newTracefilePath  Complete tracefile path
+     * @param newTraceName      Trace name 
+     */
+    public LttngEventReference(String newTracefilePath, String newTraceName) {
+        super(newTracefilePath);
+        
+        // Save the name of the trace 
+        tracename = newTraceName;
+    }
+    
+    /**
+     * Copy Constructor.<p>
+     * 
+     * @param oldReference  LttngEventReference to copy from.
+     */
+    public LttngEventReference(LttngEventReference oldReference) {
+        this( oldReference.getValue().toString(), oldReference.getTracepath() );
+    }
+    
+    
+    public String getTracepath() {
+        return tracename;
+    }
+    
+    public void setTracepath(String tracename) {
+        this.tracename = tracename;
+    }
+    
+    public String getValue() {
+        return (String)fReference;
+    }
+    
+    public void setValue(String newReference) {
+        fReference = newReference;
+    }
+    
+    /**
+     * toString() method.<p>
+     * 
+     * We return only tracename, as it will be used directly in the eventsView.
+     *  Returning only tracename gives a better output.
+     * 
+     * @return tracename as String
+     */
+    @Override
+	public String toString() {
+    	return tracename;
+    }
+    
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventSource.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventSource.java
new file mode 100644
index 0000000..861c03b
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventSource.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   William Bourque (wbourque@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.event;
+
+import org.eclipse.linuxtools.tmf.event.*;
+
+/**
+ * <b><u>LttngEventSource</u></b><p>
+ * 
+ * Lttng specific implementation of the TmfEventSource
+ */
+public class LttngEventSource extends TmfEventSource {
+    
+    /**
+     * Default Constructor.<p>
+     * 
+     */
+    public LttngEventSource() {
+        super();
+    }
+    
+    /**
+     * Copy Constructor.<p>
+     * 
+     * @param newSource  Source of the event as string.
+     */
+    public LttngEventSource(String newSource) {
+        super(newSource);
+    }
+    
+    
+    /**
+     * Copy Constructor.<p>
+     * 
+     * @param oldSource  LttngEventSource to copy from.
+     */
+    public LttngEventSource(LttngEventSource oldSource) {
+        this( (String)oldSource.getSourceId() );
+    }
+    
+    
+    @Override
+	public String getSourceId() {
+        return (String)fSourceId;
+    }
+    
+    public void setSourceId(String newSource) {
+        fSourceId = newSource;
+    }
+    
+    @Override
+	public String toString() {
+        return fSourceId.toString();
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventType.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventType.java
new file mode 100644
index 0000000..156cd4e
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventType.java
@@ -0,0 +1,87 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   William Bourque (wbourque@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.event;
+
+import org.eclipse.linuxtools.tmf.event.*;
+
+/**
+ * <b><u>LttngEventType</u></b><p>
+ * 
+ * Lttng specific implementation of the TmfEventType.<p>
+ * 
+ * This implementation add some attributes to the basic Tmf object.
+ */
+public class LttngEventType extends TmfEventType {
+    
+    private String tracefileName    = null;
+    private Long   cpuId            = null;
+    private String markerName       = null;
+    
+    /**
+     * Default Constructor.<p>
+     * 
+     */
+    public LttngEventType() {
+        super();
+    }
+    
+    /**
+     * Constructor with parameters.<p>
+     * 
+     * @param thisTracefileName		Tracefile (channel) name in Ltt
+     * @param thisMarkerName 		Marker name in LTT
+     * @param thisMarkerfieldsName  MarkerFields related to this marker	
+     */
+    public LttngEventType(String thisTracefileName, Long thisCpuId, String thisMarkerName, String[] thisMarkerfieldsName) {
+        super( thisTracefileName + "/" + thisCpuId + "/" + thisMarkerName, thisMarkerfieldsName);
+        
+        tracefileName   = thisTracefileName;
+        cpuId           = thisCpuId;
+        markerName      = thisMarkerName;
+    }
+
+    /**
+     * Copy constructor.<p>
+     * 
+     * @param oldType   Type we want to copy from
+     */
+    public LttngEventType(LttngEventType oldType) {
+        this(oldType.tracefileName, oldType.cpuId, oldType.markerName, oldType.getLabels());
+    }
+    
+    
+    public String getTracefileName() {
+        return tracefileName;
+    }
+    
+    public Long getCpuId() {
+        return cpuId;
+    }
+    
+    public String getMarkerName() {
+        return markerName;
+    }
+    
+    /**
+     * toString() method.
+     * 
+     * @return TypeId (channel/marker) of the object
+     */
+    @Override
+	public String toString() {
+        // *** TODO ***
+        // This is used as-it in the events view, so we won't change its format.
+        //  ...but maybe we should?
+        return tracefileName + "/" + cpuId.toString() + "/" + markerName;
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngLocation.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngLocation.java
new file mode 100644
index 0000000..08ae5aa
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngLocation.java
@@ -0,0 +1,138 @@
+package org.eclipse.linuxtools.lttng.event;
+
+import org.eclipse.linuxtools.tmf.trace.ITmfLocation;
+
+
+public class LttngLocation implements ITmfLocation<LttngTimestamp> {
+	
+	private final static long DEFAULT_CURR_TIME =  0L;
+	
+	private boolean isLastOperationParse = false ;
+	private boolean isLastOperationReadNext = false;
+	private boolean isLastOperationSeek = false;
+	
+	private LttngTimestamp operationTime = null;
+	
+	public LttngLocation() {
+		this( DEFAULT_CURR_TIME );
+	}
+	
+	public LttngLocation(long newCurrentTimestampValue) {
+		isLastOperationParse = false;
+		isLastOperationReadNext = false;
+		isLastOperationSeek = false;
+		operationTime = new LttngTimestamp(newCurrentTimestampValue);
+	}
+	
+	public LttngLocation(LttngTimestamp newCurrentTimestamp) {
+		isLastOperationParse = false;
+		isLastOperationReadNext = false;
+		isLastOperationSeek = false;
+		operationTime = new LttngTimestamp(newCurrentTimestamp);
+	}
+	
+	
+	public LttngLocation(LttngLocation oldLocation) {
+		this.isLastOperationParse = oldLocation.isLastOperationParse;
+		this.isLastOperationReadNext = oldLocation.isLastOperationReadNext;
+		this.isLastOperationSeek = oldLocation.isLastOperationSeek;
+		this.operationTime = oldLocation.operationTime;
+	}
+	
+	@Override
+	public LttngLocation clone() {
+		
+		LttngLocation newLocation = null;
+		
+		try {
+			newLocation = (LttngLocation)super.clone();
+			
+			// *** IMPORTANT ***
+			// Basic type in java are immutable!
+			// Thus, using assignation ("=") on basic type is VALID.
+			newLocation.isLastOperationParse = this.isLastOperationParse;
+			newLocation.isLastOperationReadNext = this.isLastOperationReadNext;
+			newLocation.isLastOperationSeek = this.isLastOperationSeek;
+			
+			// For other type, we need to create a new timestamp
+			newLocation.operationTime  = new LttngTimestamp( this.operationTime );
+		} 
+		catch (CloneNotSupportedException e) {
+			System.out.println("Cloning failed with : " + e.getMessage());
+		}
+
+		return newLocation;
+	}
+	
+	public LttngTimestamp getOperationTime() {
+		return operationTime;
+	}
+	
+	public long getOperationTimeValue() {
+		return operationTime.getValue();
+	}
+	
+	public void setOperationTime(LttngTimestamp newOperationTime) {
+		this.operationTime.setValue(newOperationTime.getValue());
+	}
+	
+	public void setOperationTime(Long newOperationTimeValue) {
+		this.operationTime.setValue(newOperationTimeValue);
+	}
+	
+	
+	public void setLastOperationParse() {
+		isLastOperationParse = true;
+		isLastOperationReadNext  = false;
+		isLastOperationSeek  = false;
+	}
+
+	public boolean isLastOperationParse() {
+		return isLastOperationParse;
+	}
+	
+	
+	public void setLastOperationReadNext() {
+		isLastOperationParse = false;
+		isLastOperationReadNext  = true;
+		isLastOperationSeek  = false;
+	}
+
+	public boolean isLastOperationReadNext() {
+		return isLastOperationReadNext;
+	}
+	
+	
+	public void setLastOperationSeek() {
+		isLastOperationParse = false;
+		isLastOperationReadNext  = false;
+		isLastOperationSeek  = true;
+	}
+
+	public boolean isLastOperationSeek() {
+		return isLastOperationSeek;
+	}
+	
+	public void resetLocationState() {
+		isLastOperationParse = false;
+		isLastOperationReadNext = false;
+		isLastOperationSeek = false;
+	}
+	
+	@Override
+	public String toString() {
+		return "\tLttngLocation[ P/R/S : "  + isLastOperationParse + "/" + isLastOperationReadNext + "/" + isLastOperationSeek + "  Current : " + operationTime + " ]";
+	}
+	
+	// ------------------------------------------------------------------------
+	// ITmfLocation
+	// ------------------------------------------------------------------------
+	public void setLocation(LttngTimestamp location) {
+		operationTime  = (LttngTimestamp)location;
+	}
+
+	public LttngTimestamp getLocation() {
+		return new LttngTimestamp ( operationTime );
+	}
+	
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngTimestamp.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngTimestamp.java
new file mode 100644
index 0000000..df1da9e
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngTimestamp.java
@@ -0,0 +1,161 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   William Bourque (wbourque@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.event;
+
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+
+/**
+ * <b><u>LttngTimestamp</u></b><p>
+ * 
+ * Lttng specific implementation of the TmfTimestamp.<p>
+ * 
+ * The Lttng implementation is the same as the basic Tmf Implementation but allow construction with a TmfTimestamp or a long.
+ */
+public class LttngTimestamp extends TmfTimestamp {
+    
+    // Required by Serializable
+	private static final long serialVersionUID = -7016853105162491273L;
+	
+    /**
+     * Default Constructor.<p>
+     * 
+     */
+	public LttngTimestamp() {
+	    super(Long.MIN_VALUE, (byte) -9);
+	}
+	
+	/**
+     * Constructor with parameters.<p>
+     * 
+     * @param newEventTime    Time as long, unit expected to be nanoseconds
+     */
+    public LttngTimestamp(long newEventTime) {
+        super(newEventTime, (byte) -9);
+    }
+    
+    /**
+     * Copy Constructor.<p>
+     * 
+     * @param oldEventTime    The timestamp object we want to copy from
+     */
+    public LttngTimestamp(TmfTimestamp oldEventTime) {
+        this(oldEventTime.getValue());
+    }
+    
+    @Override
+    public long getValue() {
+        return fValue;
+    }
+    
+    public void setValue(long newValue) {
+        fValue = newValue;
+    }
+    
+	/**
+	 * Get the second part in timestamp.<p>
+	 * 
+	 * Note : We do not use scale and assumes contents to be in nano seconds.
+	 * 
+	 * @return Seconds in the object, in string.
+	 */
+	public String getSeconds() {
+		return formatSecs(fValue);
+	}
+
+	/**
+     * Get the nanosecond part in timestamp.<p>
+     * 
+     * Note : We do not use scale and assumes contents to be in nanoseconds.
+	 * 
+	 * @return Seconds in the object, in string.
+	 */
+	public String getNanoSeconds() {
+		return formatNs(fValue);
+	}
+	
+	/*
+	 * Use the exponent to format the second in the correct format.
+	 */
+	private String formatSecs(long time) {
+		long sec = (long) (time * 1E-9);
+		return String.valueOf(sec);
+	}
+
+	/*
+	 * Obtains the remainder fraction on unit Seconds of the entered value in
+	 * nanoseconds. e.g. input: 1241207054171080214 ns.
+	 * The number of fraction seconds can be obtained by removing the last 9 digits: 
+	 * In 1241207054, the fractional portion of seconds, expressed in ns is: 171080214
+	 */
+	private String formatNs(long time) {
+		boolean neg = time < 0;
+		if (neg) {
+			time = -time;
+		}
+		// The following approach could be used although performance
+		// decreases in half.
+		// String strVal = String.format("%09d", time);
+		// String tmp = strVal.substring(strVal.length() - 9)
+		StringBuffer temp = new StringBuffer();
+		long ns = time;
+		ns %= 1000000000;
+		if (ns < 10) {
+			temp.append("00000000");
+		} else if (ns < 100) {
+			temp.append("0000000");
+		} else if (ns < 1000) {
+			temp.append("000000");
+		} else if (ns < 10000) {
+			temp.append("00000");
+		} else if (ns < 100000) {
+			temp.append("0000");
+		} else if (ns < 1000000) {
+			temp.append("000");
+		} else if (ns < 10000000) {
+			temp.append("00");
+		} else if (ns < 100000000) {
+			temp.append("0");
+		}
+
+		temp.append(ns);
+		return temp.toString();
+	}
+
+	
+    /**
+     * toString() method.
+     * 
+     * @return timestamp, as string
+     */
+    @Override
+	public String toString() {
+
+        // If we are dealing with units of seconds (or higher),
+        // use the plain formatter
+        if (fScale >= 0) {
+            Double value = fValue * Math.pow(10, fScale);
+            return value.toString();
+        }
+
+        // Define a format string
+        String format = String.format("%%1d.%%0%dd", -fScale);
+
+        // And format the timestamp value
+        double scale = Math.pow(10, fScale);
+        long seconds = (long) (fValue * scale);
+        long fracts  = fValue - (long) ((double) seconds / scale); 
+        String result = String.format(format, seconds, fracts);
+
+        return result;
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/IStateDataRequestListener.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/IStateDataRequestListener.java
new file mode 100644
index 0000000..5cfe500
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/IStateDataRequestListener.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.state;
+
+
+/**
+ * Interface to be used to receive notification of Processing start and
+ * completed
+ * 
+ * @author alvaro
+ * 
+ */
+public interface IStateDataRequestListener {
+	// ========================================================================
+	// Methods
+	// ========================================================================
+	
+	/**
+	 * 
+	 * @param request
+	 * @return
+	 */
+	public void processingStarted(RequestStartedSignal request);
+
+	/**
+	 * @param signal
+	 */
+	public void processingCompleted(RequestCompletedSignal signal);
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/LttngStateException.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/LttngStateException.java
new file mode 100644
index 0000000..843d6e7
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/LttngStateException.java
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.state;
+
+/**
+ * 
+ * @author alvaro
+ * 
+ */
+public class LttngStateException extends Exception {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7122881233964952441L;
+
+	/**
+	 * Constructs an {@code LttngStateException} with {@code null} as its error detail
+	 * message.
+	 */
+	public LttngStateException() {
+		super();
+	}
+
+	/**
+	 * Constructs an {@code LttngStateException} with the specified detail message.
+	 * 
+	 * @param message
+	 *            The detail message (which is saved for later retrieval by the
+	 *            {@link #getMessage()} method)
+	 */
+	public LttngStateException(String message) {
+		super(message);
+	}
+
+	/**
+	 * Constructs an {@code LttngStateException} with the specified detail message and
+	 * cause.
+	 * 
+	 * <p>
+	 * Note that the detail message associated with {@code cause} is <i>not</i>
+	 * automatically incorporated into this exception's detail message.
+	 * 
+	 * @param message
+	 *            The detail message (which is saved for later retrieval by the
+	 *            {@link #getMessage()} method)
+	 * 
+	 * @param cause
+	 *            The cause (which is saved for later retrieval by the
+	 *            {@link #getCause()} method). (A null value is permitted, and
+	 *            indicates that the cause is nonexistent or unknown.)
+	 * 
+	 * @since 1.6
+	 */
+	public LttngStateException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	/**
+	 * Constructs an {@code LttngStateException} with the specified cause and a detail
+	 * message of {@code (cause==null ? null : cause.toString())} (which
+	 * typically contains the class and detail message of {@code cause}). This
+	 * constructor is useful for exceptions that are little more than
+	 * wrappers for other throwables.
+	 * 
+	 * @param cause
+	 *            The cause (which is saved for later retrieval by the
+	 *            {@link #getCause()} method). (A null value is permitted, and
+	 *            indicates that the cause is nonexistent or unknown.)
+	 * 
+	 * @since 1.6
+	 */
+	public LttngStateException(Throwable cause) {
+		super(cause);
+	}
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/LttngStateInputRef.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/LttngStateInputRef.java
new file mode 100644
index 0000000..42bb8c6
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/LttngStateInputRef.java
@@ -0,0 +1,106 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.state;
+
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.state.model.ILttngStateInputRef;
+import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace;
+import org.eclipse.linuxtools.lttng.trace.LTTngTrace;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.trace.TmfTrace;
+
+/**
+ * Interface data provider to the state.model package
+ * 
+ * @author alvaro
+ * 
+ */
+public class LttngStateInputRef implements ILttngStateInputRef {
+	
+	private int cpuNumber = -1;
+	
+	// ========================================================================
+	// Table data
+	// =======================================================================
+	TmfTrace<LttngEvent> log = null;
+
+	// ========================================================================
+	// Constructor
+	// ========================================================================
+	LttngStateInputRef(TmfTrace<LttngEvent> log) {
+		this.log = log;
+		
+		if ( log instanceof LTTngTrace) {
+			cpuNumber = ((LTTngTrace)log).getCpuNumber();
+		}
+		else if ( log instanceof LTTngTextTrace) {
+			cpuNumber = ((LTTngTextTrace)log).getCpuNumber();
+		}
+	}
+
+	// ========================================================================
+	// Methods
+	// =======================================================================
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @seeorg.eclipse.linuxtools.lttng.ui.state.model.ILttngStateInputRef#
+	 * getNumberOfCpus()
+	 */
+	// @Override
+	public int getNumberOfCpus() {
+		return cpuNumber;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @seeorg.eclipse.linuxtools.lttng.ui.state.model.ILttngStateInputRef#
+	 * getTraceTimeWindow()
+	 */
+	// @Override
+	public TmfTimeRange getTraceTimeWindow() {
+		if (log != null) {
+			return log.getTimeRange();
+			
+		}
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.linuxtools.lttng.state.model.ILttngStateInputRef#getTraceId()
+	 */
+	public String getTraceId() {
+		if (log != null) {
+			return log.getName();
+		}
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @seeorg.eclipse.linuxtools.lttng.state.model.ILttngStateInputRef#
+	 * getExperimentTimeWindow()
+	 */
+	public TmfTimeRange getExperimentTimeWindow() {
+		// TODO Using the Trace time window temporarily, we need to replace with
+		// the Experiment level
+		if (log != null) {
+			return log.getTimeRange();
+		}
+		return null;
+	}
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/RequestCompletedSignal.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/RequestCompletedSignal.java
new file mode 100644
index 0000000..c270b00
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/RequestCompletedSignal.java
@@ -0,0 +1,18 @@
+package org.eclipse.linuxtools.lttng.state;
+
+import org.eclipse.linuxtools.tmf.signal.TmfSignal;
+
+public class RequestCompletedSignal extends TmfSignal {
+
+	StateDataRequest request;
+
+	public RequestCompletedSignal(StateDataRequest request) {
+		super(request);
+		this.request = request;
+	}
+
+	public StateDataRequest getRequest() {
+		return request;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/RequestStartedSignal.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/RequestStartedSignal.java
new file mode 100644
index 0000000..1372f09
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/RequestStartedSignal.java
@@ -0,0 +1,18 @@
+package org.eclipse.linuxtools.lttng.state;
+
+import org.eclipse.linuxtools.tmf.signal.TmfSignal;
+
+public class RequestStartedSignal extends TmfSignal {
+
+	StateDataRequest request;
+
+	public RequestStartedSignal(StateDataRequest request) {
+		super(request);
+		this.request = request;
+	}
+
+	public StateDataRequest getRequest() {
+		return request;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/StateDataRequest.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/StateDataRequest.java
new file mode 100644
index 0000000..6a97e05
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/StateDataRequest.java
@@ -0,0 +1,193 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.state;
+
+import java.util.Vector;
+
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
+import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
+import org.eclipse.linuxtools.tmf.signal.TmfSignalManager;
+
+/**
+ * This class is an extension of Data Request which includes specific references
+ * i.e. a status listener to indicate the start and end of the request
+ * 
+ * @author alvaro
+ * 
+ */
+public class StateDataRequest extends TmfEventRequest<LttngEvent> {
+
+	// ========================================================================
+	// Data
+	// =======================================================================
+	private Vector<IStateDataRequestListener> listeners = new Vector<IStateDataRequestListener>();
+	private String transactionId = ""; /* optional user's attribute */
+	private StateManager manager = null;
+	private long numOfEvents = 0;
+	private boolean broadcast = false;
+	private boolean clearDataInd = false;
+
+	// ========================================================================
+	// Constructors
+	// =======================================================================
+	/**
+	 * @param range
+	 * @param offset
+	 * @param nbEvents
+	 * @param maxBlockSize
+	 * @param listener
+	 */
+	public StateDataRequest(TmfTimeRange range, long offset, int nbEvents,
+			int maxBlockSize, IStateDataRequestListener listener,
+			StateManager manager) {
+		
+		super(LttngEvent.class, range, nbEvents, maxBlockSize);
+		//super(0, nbEvents, maxBlockSize);
+		this.manager = manager;
+		if (listener != null && !listeners.contains(listener)) {
+			listeners.add(listener);
+		}
+	}
+
+	/**
+	 * @param range
+	 * @param offset
+	 * @param nbEvents
+	 * @param maxBlockSize
+	 * @param listener
+	 * @param transactionID
+	 *            optional use by user application
+	 */
+	public StateDataRequest(TmfTimeRange range, long offset, int nbEvents,
+			int maxBlockSize, IStateDataRequestListener listener,
+			String transactionID, StateManager manager) {
+
+		this(range, offset, nbEvents, maxBlockSize, listener, manager);
+		this.transactionId = transactionID;
+	}
+
+	// ========================================================================
+	// Methods
+	// =======================================================================
+
+	/**
+	 * Trigger the start to process this request right after the notification to
+	 * the interested listeners
+	 * 
+	 * @param experiment
+	 * @param broadcast
+	 *            true: All views, false: only to registered listeners
+	 */
+	public void startRequestInd(TmfExperiment<LttngEvent> experiment, boolean broadcast) {
+		if (broadcast) {
+			// Notify all state views.
+			this.broadcast = broadcast;
+			TmfSignalManager.dispatchSignal(new RequestStartedSignal(this));
+		} else {
+			// Notify specific state views
+			for (IStateDataRequestListener listener : listeners) {
+				listener.processingStarted(new RequestStartedSignal(this));
+			}
+		}
+
+		// trigger the start to process this request
+		experiment.sendRequest(this);
+	}
+
+	/**
+	 * to be called by the handleCompletion in superclass method, notifies the
+	 * interested listeners. i.e. if the request start indicated broadcast, the
+	 * completion will also be broadcasted otherwise only registered listeners
+	 * will be notified.
+	 */
+	public void notifyCompletion() {
+		if (broadcast) {
+			// Notify all state views.
+			TmfSignalManager.dispatchSignal(new RequestCompletedSignal(this));
+		} else {
+			// Notify specific state views
+			for (IStateDataRequestListener listener : listeners) {
+				listener.processingCompleted(new RequestCompletedSignal(this));
+			}
+		}
+	}
+
+	public void notifyStarting() {
+		for (IStateDataRequestListener listener : listeners) {
+			listener.processingStarted(new RequestStartedSignal(this));
+		}
+	}
+
+	public String getTransactionId() {
+		return transactionId;
+	}
+
+	public StateManager getStateManager() {
+		return this.manager;
+	}
+
+	// public IStateDataRequestListener getListener() {
+	// return listener;
+	// }
+
+	public void addListener(IStateDataRequestListener listener) {
+		if (!listeners.contains(listener)) {
+			listeners.add(listener);
+		}
+	}
+
+	public void removeListener(IStateDataRequestListener listener) {
+		if (listener != null) {
+			listeners.remove(listener);
+		}
+	}
+
+	/**
+	 * @param numOfEvents
+	 *            the numOfEvents to set
+	 */
+	public void setNumOfEvents(long numOfEvents) {
+		this.numOfEvents = numOfEvents;
+	}
+
+	/**
+	 * @return the numOfEvents
+	 */
+	public long getNumOfEvents() {
+		return numOfEvents;
+	}
+
+	/**
+	 * @param clearAllData
+	 *            indicates the need to clear all previous data e.g. a new
+	 *            experiment selection
+	 */
+	public void setclearDataInd(boolean clearAllData) {
+		this.clearDataInd = clearAllData;
+	}
+
+	/**
+	 * Returns indication - clearing of all existing data model is required e.g
+	 * from the selection of a new experiment
+	 * 
+	 * @return
+	 */
+	public boolean isclearDataInd() {
+		return clearDataInd;
+	}
+
+	@Override
+	public void handleData() {
+	}
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/StateManager.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/StateManager.java
new file mode 100644
index 0000000..b4ef5a2
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/StateManager.java
@@ -0,0 +1,586 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.state;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Observable;
+import java.util.Set;
+import java.util.Vector;
+
+import org.eclipse.linuxtools.lttng.TraceDebug;
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.event.LttngTimestamp;
+import org.eclipse.linuxtools.lttng.state.evProcessor.AbsEventProcessorFactory;
+import org.eclipse.linuxtools.lttng.state.evProcessor.EventProcessorProxy;
+import org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing;
+import org.eclipse.linuxtools.lttng.state.model.ILttngStateInputRef;
+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.state.model.StateModelFactory;
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
+import org.eclipse.linuxtools.tmf.request.TmfDataRequest;
+import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint;
+import org.eclipse.linuxtools.tmf.trace.TmfLocation;
+import org.eclipse.linuxtools.tmf.trace.TmfTrace;
+
+/**
+ * 
+ * @author alvaro
+ * 
+ */
+public class StateManager extends Observable {
+
+	private static final long LTTNG_STATE_SAVE_INTERVAL = 5000000L;
+
+	// These are used in the building of the data request.
+	private static final long DEFAULT_OFFSET = 0L;
+	private static final int DEFAULT_CHUNK = 1;
+
+	// ========================================================================
+	// Data
+	// =======================================================================
+	private TmfExperiment<LttngEvent> fExperiment = null;
+	private TmfTrace<LttngEvent> fEventLog = null;
+	private StateStacksHandler stateIn = null;
+	private Long eventCount = 0L;
+
+	private HashMap<Long, LttngTraceState> stateCheckpointsList = new HashMap<Long, LttngTraceState>();
+	private Vector<TmfCheckpoint> timestampCheckpointsList = new Vector<TmfCheckpoint>();
+
+	// ========================================================================
+	// Constructor
+	// =======================================================================
+
+	// /**
+	// * Default constructor
+	// * <p>
+	// * Instanciate its own StateStacksHandler.
+	// *
+	// */
+	// public StateManager() {
+	// this.stateIn = new StateStacksHandler();
+	// }
+
+	/**
+	 * Constructor with parameter
+	 * <p>
+	 * 
+	 * @param stateInputHandler
+	 *            A valid StateStacksHandler
+	 * 
+	 */
+	public StateManager(StateStacksHandler stateInputHandler) {
+		this.stateIn = stateInputHandler;
+	}
+
+	// /**
+	// * Copy constructor
+	// * <p>
+	// *
+	// * @param oldStateManager
+	// * the StateManager we want to copy
+	// *
+	// */
+	// public StateManager(StateManager oldStateManager) {
+	// fEventLog = oldStateManager.fEventLog;
+	// stateIn = oldStateManager.stateIn;
+	// trace = oldStateManager.trace;
+	// eventCount = oldStateManager.eventCount;
+	//
+	// stateCheckpointsList = oldStateManager.stateCheckpointsList;
+	// timestampCheckpointsList = oldStateManager.timestampCheckpointsList;
+	// }
+
+	// ========================================================================
+	// Methods
+	// =======================================================================
+	/**
+	 * A new Experiment or trace selected
+	 * @param experiment
+	 * @param clearPreviousData
+	 */
+	@SuppressWarnings("unchecked")
+	public void setTraceSelection(TmfExperiment<LttngEvent> experiment,
+			boolean clearPreviousData) {
+		// New log in use, read all events and build state transition stack
+		if (experiment != null) {
+//			if (fExperiment != null && fExperiment != experiment) {
+//				this.fExperiment.deregister();
+//			}
+
+			this.fExperiment = experiment;
+
+			// if (fEventLog != null) {
+			// this.fEventLog.dispose();
+			// }
+			
+			this.fEventLog = (TmfTrace<LttngEvent>) experiment.getTraces()[0];
+			try {
+				stateIn.init(fEventLog);
+			} catch (LttngStateException e) {
+				e.printStackTrace();
+			}
+
+			// Restart count and collections
+			eventCount = 0L;
+			stateCheckpointsList.clear();
+			timestampCheckpointsList.clear();
+
+			// Obtain a dataRequest to pass to the processRequest function
+			TmfTimeRange allTraceWindow = fEventLog.getTimeRange();
+			StateDataRequest request = getDataRequestStateSave(allTraceWindow,
+					null);
+			request.setclearDataInd(clearPreviousData);
+
+			request.startRequestInd(fExperiment, true);
+
+			if (TraceDebug.isDEBUG()) {
+				StringBuilder sb = new StringBuilder(
+						"Total number of processes in the State provider: "
+								+ stateIn.getTraceStateModel().getProcesses().length);
+
+				TmfTimeRange logTimes = fEventLog.getTimeRange();
+				sb.append("\n\tLog file times "
+						+ new LttngTimestamp(logTimes.getStartTime()));
+				sb.append(" - " + new LttngTimestamp(logTimes.getEndTime()));
+
+				sb.append("\n\tCheckPoints available at: ");
+				for (TmfCheckpoint cpoint : timestampCheckpointsList) {
+					sb.append("\n\t" + cpoint.getTimestamp());
+				}
+				TraceDebug.debug(sb.toString());
+			}
+		}
+
+	}
+
+	/**
+	 * TODO: Not ready for threading
+	 * <p>
+	 * Read events within specific time window
+	 * </p>
+	 * 
+	 * @param trange
+	 * @param obs
+	 * @param transactionID
+	 */
+	public void executeDataRequest(TmfTimeRange trange, String transactionID,
+			IStateDataRequestListener listener) {
+		TmfTimestamp restoredStartTime = restoreCheckPointByTimestamp(trange
+				.getStartTime());
+		// Adjust the time range to consider rewinding to the start time
+		trange = new TmfTimeRange(restoredStartTime, trange.getEndTime());
+		// Get a data request for the time range we want (nearest checkpoint
+		// to timestamp wanted)
+		eventCount = 0L;
+
+		// Process request to that point
+		StateDataRequest request = getDataRequestByTimeRange(trange, listener);
+		// don't wait for completion i.e. allow cancellations
+		request.startRequestInd(fExperiment, false);
+
+		if (TraceDebug.isDEBUG()) {
+			TraceDebug
+					.debug(" Time Window requested, (start adjusted to checkpoint): "
+							+ trange.getStartTime()
+					+ "-" + trange.getEndTime()
+					+ " Total number of processes in the State provider: "
+					+ stateIn.getTraceStateModel().getProcesses().length + " Completed");
+		}
+	}
+
+	/**
+	 * Current value of event counter
+	 * 
+	 * @return Long The number of events, if it is known
+	 */
+	public Long getEventCount() {
+		return eventCount;
+	}
+
+	/**
+	 * used to obtain details on the log associated with this manager e.g.
+	 * logid.
+	 * 
+	 * @return
+	 */
+	public TmfTrace<LttngEvent> getEventLog() {
+		return fEventLog;
+	}
+
+	/**
+	 * Used for troubleshooting when debug mode is on
+	 * 
+	 * @return Set<String> Set of event that were not handled
+	 */
+	public Set<String> getEventsNotHandled() {
+		return stateIn.getEventsNotHandled();
+	}
+
+	/**
+	 * Needed for verification purposes
+	 * 
+	 * @param listener
+	 *            The IEventProcessing we want to register
+	 */
+	void registerListener(IEventProcessing listener) {
+		stateIn.registerListener(listener);
+	}
+
+	/**
+	 * Needed for verification purposes
+	 * 
+	 * @param listener
+	 *            The IEventProcessing we want to unregister
+	 */
+	void deregisterListener(IEventProcessing listener) {
+		stateIn.deregisterListener(listener);
+	}
+
+	/**
+	 * Save a checkpoint if it is needed at that point
+	 * <p>
+	 * The function will use "eventCount" internally to determine if a save was
+	 * needed
+	 * 
+	 * @param eventCounter
+	 *            The event "count" or event "id" so far
+	 * @param eventTime
+	 *            The timestamp of this event
+	 * 
+	 * @return boolean True if a checkpoint was saved, false otherwise
+	 */
+	private boolean saveCheckPointIfNeeded(Long eventCounter, TmfTimestamp eventTime) {
+		boolean saveHappened = false;
+		// Save a checkpoint every LTTNG_STATE_SAVE_INTERVAL event
+		if ((eventCounter.longValue() % LTTNG_STATE_SAVE_INTERVAL) == 0) {
+			// Save the checkpoint
+			stateCheckpointsList.put(eventCounter, stateIn.traceStateModel.clone());
+			// Save correlation between timestamp and checkpoint index
+
+			timestampCheckpointsList.add(new TmfCheckpoint(eventTime, new TmfLocation<Long>(eventCounter)));
+
+			saveHappened = true;
+		}
+
+		return saveHappened;
+	}
+
+	/**
+	 * Restore to the closest checkpoint from TmfTimestamp
+	 * <p>
+	 * Note : it is heavier to restore by timestamp than by event position,
+	 * restore by event position whichever possible.
+	 * 
+	 * @param eventTime
+	 *            The timestamp of the event to restore to
+	 * 
+	 * @return TmfTimestamp indicates the nearest time used to restore the
+	 *         state, null sent if input is invalid
+	 */
+	@SuppressWarnings("unchecked")
+	public TmfTimestamp restoreCheckPointByTimestamp(TmfTimestamp eventTime) {
+		TmfTimeRange logRange = fExperiment.getTimeRange();
+		TmfTimestamp nearestTimeStamp = logRange.getStartTime();
+
+		// The GUI can have time limits higher than this log, since GUI can
+		// handle multiple logs
+		if ((eventTime.getValue() < 0)
+				|| (eventTime.getValue() > logRange.getEndTime().getValue())) {
+			return null;
+		}
+		
+		// The GUI can have time limits lower than this log, since GUI can
+		// handle multiple logs
+		if ((eventTime.getValue() < logRange.getStartTime().getValue())) {
+			eventTime = logRange.getStartTime();
+		}
+		
+		// Sort the checkpoints, required before the binary search
+		Collections.sort(timestampCheckpointsList);
+		// Initiate the compare with a checkpoint containing the target time
+		// stamp to find
+		int index = Collections.binarySearch(timestampCheckpointsList,
+				new TmfCheckpoint(eventTime, new TmfLocation<Long>(0L)));
+		// adjust index to round down to earlier checkpoint when exact match not
+		// found
+		index = getPrevIndex(index);
+
+		LttngTraceState traceState;
+		TmfLocation<Long> location = new TmfLocation<Long>(0L);
+		if (index == 0) {
+			// No checkpoint restore is needed, start with a brand new
+			// TraceState
+			ILttngStateInputRef inputDataRef = new LttngStateInputRef(fEventLog);
+			traceState = StateModelFactory.getStateEntryInstance(inputDataRef);
+		} else {
+			// Useful CheckPoint found
+			TmfCheckpoint checkpoint = timestampCheckpointsList.get(index);
+			nearestTimeStamp = checkpoint.getTimestamp();
+			// get the location associated with the checkpoint
+			location = (TmfLocation<Long>) checkpoint.getLocation();
+			// reference a new copy of the checkpoint template
+			traceState = stateCheckpointsList.get(location).clone();
+		}
+
+		// Make sure eventCount stay consistent!
+		eventCount = location.getLocation();
+
+		// Restore the stored traceState
+		stateIn.setTraceStateModel(traceState);
+
+		return nearestTimeStamp;
+	}
+
+	/**
+	 * Adjust the result from a binary search to the round down position
+	 * 
+	 * @param position
+	 *            if Negative is: (-(insertion point) -1)
+	 * @return position or if no match found, earlier than insertion point
+	 */
+	private int getPrevIndex(int position) {
+		int roundDownPosition = position;
+		if (position < 0) {
+			roundDownPosition = -(position + 2);
+		}
+
+		roundDownPosition = roundDownPosition < 0 ? 0 : roundDownPosition;
+		return roundDownPosition;
+	}
+
+	// /**
+	// * Restore to the closest checkpoint from position
+	// * <p>
+	// *
+	// * @param position
+	// * The position of the event to restore to
+	// *
+	// * @return boolean True if a checkpoint was restored, false otherwise
+	// */
+	// private boolean restoreCheckPointByPosition(long position) {
+	// long nearestCheckPoint = (position - (position %
+	// LTTNG_STATE_SAVE_INTERVAL));
+	//
+	// // Some sanity check :
+	// // Not under 0
+	// // Not over eventCount
+	// // A checkpoint exist
+	// if ((nearestCheckPoint < 0) || (nearestCheckPoint > eventCount)
+	// || (stateCheckpointsList.get(nearestCheckPoint) == null)) {
+	// return false;
+	// } else {
+	// // Restore the stored traceState
+	// stateIn.setTraceStateModel(stateCheckpointsList
+	// .get(nearestCheckPoint));
+	//
+	// // Make sure eventCount stay consistent!
+	// eventCount = new Long(nearestCheckPoint);
+	//
+	// // * Rewind to the correct position
+	// // To do so, we need a request to the correct window
+	// // We will seek to nearestCheckPoint and read next events until
+	// // position
+	// TmfDataRequest<TmfEvent> request = getDataRequestByPosition(
+	// (int) nearestCheckPoint, (int) position);
+	//
+	// // Process request to that point
+	// fExperiment.processRequest(request, true);
+	//
+	// return true;
+	// }
+	// }
+
+	/**
+	 * Get a Tmf data request for the current eventlog
+	 * <p>
+	 * 
+	 * @param TmfTimeRange
+	 *            The time range we want events from.
+	 * 
+	 * @return TmfDataRequest<TmfEvent> The request made
+	 */
+	StateDataRequest getDataRequestByTimeRange(TmfTimeRange timeWindow,
+			IStateDataRequestListener listener) {
+
+		final TmfEvent[] evt = new TmfEvent[1];
+
+		// ***TODO***
+		// The override of handlePartialResult is similar to the one in
+		// getDataRequestByPosition()
+		// ***
+
+		// Create the new request and override the handlePartialResult function
+		StateDataRequest request = new StateDataRequest(timeWindow,
+				DEFAULT_OFFSET, TmfDataRequest.ALL_DATA, DEFAULT_CHUNK,
+				listener, this) {
+			@Override
+			public void handleData() {
+				TmfEvent[] result = getData();
+
+				evt[0] = (result.length > 0) ? result[0] : null;
+				// Dispatch information for Event processing
+				stateIn.processEvent(evt[0]);
+
+				// increment internal and external number of events
+				setNumOfEvents(getNumOfEvents() + 1);
+				eventCount++;
+			}
+
+			@Override
+			public void handleCompleted() {
+				if (isCancelled() || isFailed()) {
+					// No notification to end request handlers
+				} else {
+					// notify the associated end request handlers
+					requestCompleted();
+				}
+
+				// notify listeners
+				notifyCompletion();
+			}
+		};
+
+		return request;
+	}
+
+	private StateDataRequest getDataRequestStateSave(TmfTimeRange timeWindow,
+			IStateDataRequestListener requestListener) {
+
+		final TmfEvent[] evt = new TmfEvent[1];
+
+		// ***TODO***
+		// The override of handlePartialResult is similar to the one in
+		// getDataRequestByPosition()
+		// ***
+
+		// Create the new request and override the handlePartialResult function
+		StateDataRequest request = new StateDataRequest(timeWindow,
+				DEFAULT_OFFSET, TmfDataRequest.ALL_DATA, DEFAULT_CHUNK,
+				requestListener, this) {
+
+			@Override
+			public void handleData() {
+				TmfEvent[] result = getData();
+				
+				evt[0] = (result.length > 0) ? result[0] : null;
+				// Dispatch information for Event processing
+				stateIn.processEvent(evt[0]);
+
+				// Call the function that will save a checkpoint if needed at
+				// that point
+				// Note : We call this function before incrementing eventCount
+				// to avoid skipping the "0th" event
+				if (evt[0] != null) {
+					saveCheckPointIfNeeded(getNumOfEvents(), evt[0]
+							.getTimestamp());
+				}
+
+				// increment internal and external counters
+				setNumOfEvents(getNumOfEvents() + 1);
+				eventCount++;
+			}
+
+			@Override
+			public void handleCompleted() {
+				if (isCancelled() || isFailed()) {
+					// No notification to end request handlers
+				} else {
+					// notify the associated end request handlers
+					requestCompleted();
+				}
+
+				// notify listeners
+				notifyCompletion();
+				TraceDebug.debug("number of events processed on file opening"
+						+ getNumOfEvents());
+			}
+		};
+
+		return request;
+	}
+
+	// /**
+	// * Get a Tmf data request for the current eventlog
+	// * <p>
+	// *
+	// * @param startPosition
+	// * The position to start the get request from
+	// * @param endPosition
+	// * The position to ed the get request at
+	// *
+	// * @return TmfDataRequest<TmfEvent> The request made
+	// */
+	// private TmfDataRequest<TmfEvent> getDataRequestByPosition(
+	// long startPosition, long endPosition) {
+	// final TmfEvent[] evt = new TmfEvent[1];
+	//
+	// // ***FIXME***
+	// // The override of handlePartialResult is exactly the same as the one in
+	// // getDataRequestByPosition()
+	// // However, there is no way to override it in only one place to avoid
+	// // code duplication!
+	// // ***
+	//
+	// // Create the new request and override the handlePartialResult function
+	// TmfDataRequest<TmfEvent> request = new TmfDataRequest<TmfEvent>(
+	// (int) startPosition, DEFAULT_OFFSET,
+	// (int) (endPosition - startPosition), DEFAULT_CHUNK) {
+	// //@Override
+	// public void handlePartialResult() {
+	// TmfEvent[] result = getData();
+	//
+	// evt[0] = (result.length > 0) ? result[0] : null;
+	// // Dispatch information for Event processing
+	// stateIn.processEvent(evt[0]);
+	// }
+	// };
+	//
+	// return request;
+	// }
+
+	/**
+	 * @return
+	 */
+	public TmfTimeRange getExperimentTimeWindow() {
+		if (fExperiment != null) {
+			return fExperiment.getTimeRange();
+		}
+		return null;
+	}
+
+	/**
+	 * This method has to be called once all events of the associated Trace have
+	 * been processed, this method then triggers the drawing of the final state
+	 * which is necessary e.g when zooming.
+	 */
+	public synchronized void requestCompleted() {
+		Set<AbsEventProcessorFactory> handlerRegister = EventProcessorProxy
+				.getInstance().getProcessingFactories();
+		// Notify the FINISH handlers
+		for (Iterator<AbsEventProcessorFactory> iterator = handlerRegister
+				.iterator(); iterator.hasNext();) {
+			AbsEventProcessorFactory handlerRegistry = (AbsEventProcessorFactory) iterator
+					.next();
+			IEventProcessing handler = handlerRegistry.getfinishProcessor();
+			if (handler != null) {
+				// process State Update
+				handler.process(null, stateIn.traceStateModel);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/StateStacksHandler.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/StateStacksHandler.java
new file mode 100644
index 0000000..8fa9669
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/StateStacksHandler.java
@@ -0,0 +1,202 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.state;
+
+import java.util.Iterator;
+import java.util.Set;
+import java.util.Vector;
+
+import org.eclipse.linuxtools.lttng.TraceDebug;
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.state.evProcessor.AbsEventProcessorFactory;
+import org.eclipse.linuxtools.lttng.state.evProcessor.EventProcessorProxy;
+import org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing;
+import org.eclipse.linuxtools.lttng.state.model.ILttngStateInputRef;
+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.trace.TmfTrace;
+
+/**
+ * @author Alvaro
+ * 
+ */
+public class StateStacksHandler {
+	// ========================================================================
+	// Table data
+	// =======================================================================
+	protected LttngTraceState traceStateModel = null;
+	protected Set<String> eventsNotHandled = null;
+	protected Vector<IEventProcessing> listeners = new Vector<IEventProcessing>();
+
+	// ========================================================================
+	// Constructors
+	// ========================================================================
+	public StateStacksHandler(LttngTraceState model) {
+		// It's assumed to have one instance of this class per Trace
+		this.traceStateModel = model;
+	}
+
+	// ========================================================================
+	// Methods
+	// =======================================================================
+	/**
+	 * Initialised by manager, any time a JniTrace selection is updated
+	 * 
+	 * @param trace
+	 * @param log
+	 * 
+	 */
+	void init(TmfTrace<LttngEvent> log) throws LttngStateException {
+		if (log == null) {
+			throw new LttngStateException("No TmfTrace object available!");
+		}
+
+		// this.trace = trace;
+		ILttngStateInputRef ref = new LttngStateInputRef(log);
+		this.traceStateModel.init(ref);
+	}
+
+
+//	static int nbEvents = 0;
+	protected void processEvent(TmfEvent tmfEvent) /* throws LttngStateException */{
+		if (tmfEvent == null) {
+			return;
+		}
+
+		if (!(tmfEvent instanceof LttngEvent)) {
+			TraceDebug
+					.debug("The event received is not an instance of LttngEvent and can not be processed");
+			return;
+		}
+
+//		System.out.println("Event: " + nbEvents++ + ", timestamp: " + tmfEvent.getTimestamp());
+		
+		LttngEvent trcEvent = (LttngEvent) tmfEvent;
+//		LttngEventField[] fields = ((LttngEventContent)trcEvent.getContent()).getFields();
+
+		if (trcEvent != null) {
+			String inEventName = trcEvent.getMarkerName();
+			// String inChannel = trcEvent.getChannelName();
+			// TraceDebug.debug("Event: " + inEventName);
+
+			// Check if the received event is a transition state event
+			// TODO: Remove temporarily to allow other events to go to the
+			// statistics view.
+			// Needs restructuring.
+			// Events eventStruct = StateStrings.getInstance()
+			// .getStateTransEventMap().get(inEventName);
+			// if (eventStruct != null) {
+			// String expectedChannel = eventStruct.getParent().getInName();
+			// check that received channel is the expected channel in the
+			// structure
+			// if (inChannel.equals(expectedChannel)) {
+			// Notify the before Handlers
+			Set<AbsEventProcessorFactory> handlerRegister = EventProcessorProxy
+					.getInstance().getProcessingFactories();
+			// Notify the state BEFORE update handlers
+			for (Iterator<AbsEventProcessorFactory> iterator = handlerRegister
+					.iterator(); iterator.hasNext();) {
+				AbsEventProcessorFactory handlerRegistry = (AbsEventProcessorFactory) iterator
+						.next();
+				IEventProcessing handler = handlerRegistry
+						.getBeforeProcessor(inEventName);
+				if (handler != null) {
+					// process State Update
+					handler.process(trcEvent, traceStateModel);
+				}
+
+			}
+			
+			// Notify the STATE UPDATE handlers
+			// Only one state update expected
+			for (Iterator<AbsEventProcessorFactory> iterator = handlerRegister
+					.iterator(); iterator.hasNext();) {
+				AbsEventProcessorFactory handlerRegistry = (AbsEventProcessorFactory) iterator
+						.next();
+				IEventProcessing handler = handlerRegistry
+						.getStateUpdaterProcessor(inEventName);
+				if (handler != null) {
+					// process State Update
+					handler.process(trcEvent, traceStateModel);
+				}
+
+			}
+
+			// Notify the AFTER update handlers
+			for (Iterator<AbsEventProcessorFactory> iterator = handlerRegister
+					.iterator(); iterator.hasNext();) {
+				AbsEventProcessorFactory handlerRegistry = (AbsEventProcessorFactory) iterator
+						.next();
+				IEventProcessing handler = handlerRegistry
+						.getAfterProcessor(inEventName);
+				if (handler != null) {
+					// process State Update
+					handler.process(trcEvent, traceStateModel);
+				}
+			}
+
+			// } else {
+			// StringBuilder sb = new StringBuilder(
+			// "Unexpected channel received for: " + inEventName
+			// + ", channel rec: " + inChannel
+			// + " chanel expected: " + expectedChannel);
+			// TraceDebug.debug(sb.toString());
+			// }
+			// }
+		}
+	}
+
+	/**
+	 * Used for troubleshooting when debug mode is on
+	 * 
+	 * @return
+	 */
+	Set<String> getEventsNotHandled() {
+		return eventsNotHandled;
+	}
+	
+	/**
+     * Needed for checkpoint
+     * 
+     * @param LttngTraceState
+     */
+    public LttngTraceState getTraceStateModel() {
+        return traceStateModel;
+    }
+    
+    /**
+     * Needed for checkpoint
+     * 
+     * @param LttngTraceState
+     */
+    public void setTraceStateModel(LttngTraceState newTraceState) {
+        traceStateModel = newTraceState;
+    }
+	
+	/**
+	 * Needed for verification purposes
+	 * 
+	 * @param listener
+	 */
+	void registerListener(IEventProcessing listener) {
+		this.listeners.add(listener);
+	}
+
+	/**
+	 * Needed for verification purposes
+	 * 
+	 * @param listener
+	 */
+	void deregisterListener(IEventProcessing listener) {
+		this.listeners.remove(listener);
+	}
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/StateStrings.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/StateStrings.java
new file mode 100644
index 0000000..f0c803e
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/StateStrings.java
@@ -0,0 +1,653 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.state;
+
+import java.util.HashMap;
+import java.util.HashSet;
+
+/**
+ * Singleton
+ * Establishes relationships of state related strings, since the strings and
+ * relations are fixed, the elements are final i.e. just for reading.
+ * 
+ * @author alvaro
+ * 
+ */
+public class StateStrings {
+
+	// ========================================================================
+	// Table data
+	// =======================================================================
+	private static StateStrings instance = null;
+	public static final String LTTV_STATE_UNBRANDED = "";
+	private final HashMap<String, Events> eventStrMap = new HashMap<String, Events>();
+	private final HashMap<String, Events> stateTransEventMap = new HashMap<String, Events>();
+	private final String[] syscall_names = new String[256];;
+	private final String[] trap_names = new String[256];
+	private final String[] irq_names = new String[256];
+	private final String[] soft_irq_names = new String[32];
+
+	private StateStrings() {
+		// Build a Hash map from string name to actual event structure
+		for (Events event : Events.values()) {
+			eventStrMap.put(event.inName, event);
+			if (event.isStateTransition()) {
+				stateTransEventMap.put(event.inName, event);
+			}
+		}
+
+		// Build system call names
+		for (int i = 0; i < 256; i++) {
+			syscall_names[i] = "syscall " + i;
+		}
+
+		// Build trap names
+		for (int i = 0; i < 256; i++) {
+			trap_names[i] = "trap " + i;
+		}
+
+		// Build irq names
+		for (int i = 0; i < 256; i++) {
+			irq_names[i] = "irq " + i;
+		}
+
+		// Build softirq names
+		for (int i = 0; i < 32; i++) {
+			soft_irq_names[i] = "softirq " + i;
+		}
+
+	}
+
+	public static StateStrings getInstance() {
+		// Singleton to provide string constant
+		if (instance == null) {
+			instance = new StateStrings();
+		}
+		return instance;
+	}
+
+	public enum Channels {
+		LTT_CHANNEL_FD_STATE("fd_state"), /* */
+		LTT_CHANNEL_GLOBAL_STATE("global_state"), /* */
+		LTT_CHANNEL_IRQ_STATE("irq_state"), /* */
+		LTT_CHANNEL_MODULE_STATE("module_state"), /* */
+		LTT_CHANNEL_NETIF_STATE("netif_state"), /* */
+		LTT_CHANNEL_SOFTIRQ_STATE("softirq_state"), /* */
+		LTT_CHANNEL_SWAP_STATE("swap_state"), /* */
+		LTT_CHANNEL_SYSCALL_STATE("syscall_state"), /* */
+		LTT_CHANNEL_TASK_STATE("task_state"), /* */
+		LTT_CHANNEL_VM_STATE("vm_state"), /* */
+		LTT_CHANNEL_KPROBE_STATE("kprobe_state"), /* */
+		LTT_CHANNEL_FS("fs"), /* */
+		LTT_CHANNEL_KERNEL("kernel"), /* */
+		LTT_CHANNEL_MM("mm"), /* */
+		LTT_CHANNEL_USERSPACE("userspace"), /* */
+		LTT_CHANNEL_BLOCK("block");
+
+		private final String inName;
+
+		private Channels(String name) {
+			this.inName = name;
+		}
+
+		public String getInName() {
+			return inName;
+		}
+	};
+
+	//
+	public enum Events {
+		LTT_EVENT_SYSCALL_ENTRY("syscall_entry"), /* */
+		LTT_EVENT_SYSCALL_EXIT("syscall_exit"), /* */
+		LTT_EVENT_TRAP_ENTRY("trap_entry"), /* */
+		LTT_EVENT_TRAP_EXIT("trap_exit"), /* */
+		LTT_EVENT_PAGE_FAULT_ENTRY("page_fault_entry"), /* */
+		LTT_EVENT_PAGE_FAULT_EXIT("page_fault_exit"), /* */
+		LTT_EVENT_PAGE_FAULT_NOSEM_ENTRY("page_fault_nosem_entry"), /* */
+		LTT_EVENT_PAGE_FAULT_NOSEM_EXIT("page_fault_nosem_exit"), /* */
+		LTT_EVENT_IRQ_ENTRY("irq_entry"), /* */
+		LTT_EVENT_IRQ_EXIT("irq_exit"), /* */
+		LTT_EVENT_SOFT_IRQ_RAISE("softirq_raise"), /* */
+		LTT_EVENT_SOFT_IRQ_ENTRY("softirq_entry"), /* */
+		LTT_EVENT_SOFT_IRQ_EXIT("softirq_exit"), /* */
+		LTT_EVENT_SCHED_SCHEDULE("sched_schedule"), /* */
+		LTT_EVENT_PROCESS_FORK("process_fork"), /* */
+		LTT_EVENT_KTHREAD_CREATE("kthread_create"), /* */
+		LTT_EVENT_PROCESS_EXIT("process_exit"), /* */
+		LTT_EVENT_PROCESS_FREE("process_free"), /* */
+		LTT_EVENT_EXEC("exec"), /* */
+		LTT_EVENT_PROCESS_STATE("process_state"), /* */
+		LTT_EVENT_STATEDUMP_END("statedump_end"), /* */
+		LTT_EVENT_FUNCTION_ENTRY("function_entry"), /* */
+		LTT_EVENT_FUNCTION_EXIT("function_exit"), /* */
+		LTT_EVENT_THREAD_BRAND("thread_brand"), /* */
+		LTT_EVENT_REQUEST_ISSUE("_blk_request_issue"), /* */
+		LTT_EVENT_REQUEST_COMPLETE("_blk_request_complete"), /* */
+		LTT_EVENT_LIST_INTERRUPT("interrupt"), /* */
+		LTT_EVENT_SYS_CALL_TABLE("sys_call_table"), /* */
+		LTT_EVENT_SOFTIRQ_VEC("softirq_vec"), /* */
+		LTT_EVENT_KPROBE_TABLE("kprobe_table"), /* */
+		LTT_EVENT_KPROBE("kprobe"); /* */
+
+		private final String inName;
+		private final HashSet<Fields> children = new HashSet<Fields>();
+		private Channels parent = null;
+		// Expected to cause a state transition default flag
+		private boolean stateTransition = false;
+
+		static {
+			associate();
+		}
+
+		private Events(String name) {
+			this.inName = name;
+		}
+
+		public String getInName() {
+			return this.inName;
+		}
+
+		public Channels getParent() {
+			return this.parent;
+		}
+
+		public void setParent(Channels parent) {
+			this.parent = parent;
+		}
+
+		public HashSet<Fields> getChildren() {
+			return children;
+		}
+
+		public boolean isStateTransition() {
+			return stateTransition;
+		}
+
+		private static void associate() {
+			// SYSCALL, can receive ip, syscall_id
+			LTT_EVENT_SYSCALL_ENTRY.setParent(Channels.LTT_CHANNEL_KERNEL);
+			LTT_EVENT_SYSCALL_ENTRY.getChildren().add(
+					Fields.LTT_FIELD_SYSCALL_ID);
+			LTT_EVENT_SYSCALL_ENTRY.stateTransition = true;
+
+			LTT_EVENT_SYSCALL_EXIT.setParent(Channels.LTT_CHANNEL_KERNEL);
+			LTT_EVENT_SYSCALL_EXIT.stateTransition = true;
+
+			// TRAP
+			LTT_EVENT_TRAP_ENTRY.setParent(Channels.LTT_CHANNEL_KERNEL);
+			LTT_EVENT_TRAP_ENTRY.getChildren().add(Fields.LTT_FIELD_TRAP_ID);
+			LTT_EVENT_TRAP_ENTRY.stateTransition = true;
+
+			LTT_EVENT_TRAP_EXIT.setParent(Channels.LTT_CHANNEL_KERNEL);
+			LTT_EVENT_TRAP_EXIT.stateTransition = true;
+
+			// PAGE_FAULT
+			LTT_EVENT_PAGE_FAULT_ENTRY.setParent(Channels.LTT_CHANNEL_KERNEL);
+			LTT_EVENT_PAGE_FAULT_ENTRY.getChildren().add(
+					Fields.LTT_FIELD_TRAP_ID);
+			LTT_EVENT_PAGE_FAULT_ENTRY.stateTransition = true;
+
+			LTT_EVENT_PAGE_FAULT_EXIT.setParent(Channels.LTT_CHANNEL_KERNEL);
+			LTT_EVENT_PAGE_FAULT_EXIT.stateTransition = true;
+
+			// PAGE_FAULT_NOSEM
+			LTT_EVENT_PAGE_FAULT_NOSEM_ENTRY
+					.setParent(Channels.LTT_CHANNEL_KERNEL);
+			LTT_EVENT_PAGE_FAULT_NOSEM_ENTRY.getChildren().add(
+					Fields.LTT_FIELD_TRAP_ID);
+			LTT_EVENT_PAGE_FAULT_NOSEM_ENTRY.stateTransition = true;
+
+			LTT_EVENT_PAGE_FAULT_NOSEM_EXIT.getChildren().add(
+					Fields.LTT_FIELD_TRAP_ID);
+			LTT_EVENT_PAGE_FAULT_NOSEM_EXIT.stateTransition = true;
+
+			// IRQ it also receives fields kernel_mode, ip and handler
+			LTT_EVENT_IRQ_ENTRY.setParent(Channels.LTT_CHANNEL_KERNEL);
+			LTT_EVENT_IRQ_ENTRY.getChildren().add(Fields.LTT_FIELD_IRQ_ID);
+			LTT_EVENT_IRQ_ENTRY.stateTransition = true;
+
+			LTT_EVENT_IRQ_EXIT.setParent(Channels.LTT_CHANNEL_KERNEL);
+			LTT_EVENT_IRQ_EXIT.stateTransition = true;
+
+			// SOFT IRQ RAISE
+			LTT_EVENT_SOFT_IRQ_RAISE.setParent(Channels.LTT_CHANNEL_KERNEL);
+			LTT_EVENT_SOFT_IRQ_RAISE.getChildren().add(
+					Fields.LTT_FIELD_SOFT_IRQ_ID);
+			LTT_EVENT_SOFT_IRQ_RAISE.stateTransition = true;
+
+			// SOFT IRQ ENTRY
+			LTT_EVENT_SOFT_IRQ_ENTRY.setParent(Channels.LTT_CHANNEL_KERNEL);
+			LTT_EVENT_SOFT_IRQ_ENTRY.getChildren().add(
+					Fields.LTT_FIELD_SOFT_IRQ_ID);
+			LTT_EVENT_SOFT_IRQ_ENTRY.stateTransition = true;
+
+			LTT_EVENT_SOFT_IRQ_EXIT.setParent(Channels.LTT_CHANNEL_KERNEL);
+			LTT_EVENT_SOFT_IRQ_EXIT.stateTransition = true;
+
+			// SCHED SCHEDULE
+			LTT_EVENT_SCHED_SCHEDULE.setParent(Channels.LTT_CHANNEL_KERNEL);
+			LTT_EVENT_SCHED_SCHEDULE.getChildren().add(
+					Fields.LTT_FIELD_PREV_PID);
+			LTT_EVENT_SCHED_SCHEDULE.getChildren().add(
+					Fields.LTT_FIELD_NEXT_PID);
+			LTT_EVENT_SCHED_SCHEDULE.getChildren().add(
+					Fields.LTT_FIELD_PREV_STATE);
+			LTT_EVENT_SCHED_SCHEDULE.stateTransition = true;
+
+			// PROCESS FORK
+			LTT_EVENT_PROCESS_FORK.setParent(Channels.LTT_CHANNEL_KERNEL);
+			LTT_EVENT_PROCESS_FORK.getChildren().add(
+					Fields.LTT_FIELD_PARENT_PID);
+			LTT_EVENT_PROCESS_FORK.getChildren()
+					.add(Fields.LTT_FIELD_CHILD_PID);
+			LTT_EVENT_PROCESS_FORK.getChildren().add(
+					Fields.LTT_FIELD_CHILD_TGID);
+			LTT_EVENT_PROCESS_FORK.stateTransition = true;
+
+			// KTHREAD
+			LTT_EVENT_KTHREAD_CREATE.setParent(Channels.LTT_CHANNEL_KERNEL);
+			LTT_EVENT_KTHREAD_CREATE.getChildren().add(Fields.LTT_FIELD_PID);
+			LTT_EVENT_KTHREAD_CREATE.stateTransition = true;
+
+			// PROCES EXIT
+			LTT_EVENT_PROCESS_EXIT.setParent(Channels.LTT_CHANNEL_KERNEL);
+			LTT_EVENT_PROCESS_EXIT.getChildren().add(Fields.LTT_FIELD_PID);
+			LTT_EVENT_PROCESS_EXIT.stateTransition = true;
+
+			// PROCESS FREE
+			LTT_EVENT_PROCESS_FREE.setParent(Channels.LTT_CHANNEL_KERNEL);
+			LTT_EVENT_PROCESS_FREE.getChildren().add(Fields.LTT_FIELD_PID);
+			LTT_EVENT_PROCESS_FREE.stateTransition = true;
+
+			// EVENT EXEC
+			LTT_EVENT_EXEC.setParent(Channels.LTT_CHANNEL_FS);
+			LTT_EVENT_EXEC.getChildren().add(Fields.LTT_FIELD_FILENAME);
+			LTT_EVENT_EXEC.stateTransition = true;
+
+			// THREAD BRAND
+			LTT_EVENT_THREAD_BRAND.setParent(Channels.LTT_CHANNEL_USERSPACE);
+			LTT_EVENT_THREAD_BRAND.getChildren().add(Fields.LTT_FIELD_NAME);
+			LTT_EVENT_THREAD_BRAND.stateTransition = true;
+
+			// EVENT PROCESS STATE
+			LTT_EVENT_PROCESS_STATE.setParent(Channels.LTT_CHANNEL_TASK_STATE);
+			LTT_EVENT_PROCESS_STATE.getChildren().add(Fields.LTT_FIELD_PID);
+			LTT_EVENT_PROCESS_STATE.getChildren().add(
+					Fields.LTT_FIELD_PARENT_PID);
+			LTT_EVENT_PROCESS_STATE.getChildren().add(Fields.LTT_FIELD_NAME);
+			LTT_EVENT_PROCESS_STATE.getChildren().add(Fields.LTT_FIELD_TYPE);
+			LTT_EVENT_PROCESS_STATE.getChildren().add(Fields.LTT_FIELD_MODE);
+			LTT_EVENT_PROCESS_STATE.getChildren().add(Fields.LTT_FIELD_SUBMODE);
+			LTT_EVENT_PROCESS_STATE.getChildren().add(Fields.LTT_FIELD_STATUS);
+			LTT_EVENT_PROCESS_STATE.getChildren().add(Fields.LTT_FIELD_TGID);
+			LTT_EVENT_PROCESS_STATE.stateTransition = true;
+
+			// EVENT STATEDUMP END
+			LTT_EVENT_STATEDUMP_END
+					.setParent(Channels.LTT_CHANNEL_GLOBAL_STATE);
+			LTT_EVENT_STATEDUMP_END.stateTransition = true;
+
+			// LTT_EVENT_LIST_INTERRUPT
+			LTT_EVENT_LIST_INTERRUPT.setParent(Channels.LTT_CHANNEL_IRQ_STATE);
+			LTT_EVENT_LIST_INTERRUPT.getChildren().add(Fields.LTT_FIELD_ACTION);
+			LTT_EVENT_LIST_INTERRUPT.getChildren().add(Fields.LTT_FIELD_IRQ_ID);
+			LTT_EVENT_LIST_INTERRUPT.stateTransition = true;
+
+			// LTT_EVENT_REQUEST_ISSUE
+			LTT_EVENT_REQUEST_ISSUE.setParent(Channels.LTT_CHANNEL_BLOCK);
+			LTT_EVENT_REQUEST_ISSUE.getChildren().add(Fields.LTT_FIELD_MAJOR);
+			LTT_EVENT_REQUEST_ISSUE.getChildren().add(Fields.LTT_FIELD_MINOR);
+			LTT_EVENT_REQUEST_ISSUE.getChildren().add(Fields.LTT_FIELD_OPERATION);			
+			LTT_EVENT_REQUEST_ISSUE.getChildren().add(
+					Fields.LTT_FIELD_OPERATION);
+			LTT_EVENT_REQUEST_ISSUE.stateTransition = true;
+
+			// LTT_EVENT_REQUEST_COMPLETE
+			LTT_EVENT_REQUEST_COMPLETE.setParent(Channels.LTT_CHANNEL_BLOCK);
+			LTT_EVENT_REQUEST_COMPLETE.getChildren()
+					.add(Fields.LTT_FIELD_MAJOR);
+			LTT_EVENT_REQUEST_COMPLETE.getChildren()
+					.add(Fields.LTT_FIELD_MINOR);
+			LTT_EVENT_REQUEST_COMPLETE.getChildren().add(
+					Fields.LTT_FIELD_OPERATION);
+			LTT_EVENT_REQUEST_COMPLETE.stateTransition = true;
+
+			// LTT_EVENT_FUNCTION_ENTRY
+			LTT_EVENT_FUNCTION_ENTRY.setParent(Channels.LTT_CHANNEL_USERSPACE);
+			LTT_EVENT_FUNCTION_ENTRY.getChildren()
+					.add(Fields.LTT_FIELD_THIS_FN);
+			LTT_EVENT_FUNCTION_ENTRY.getChildren().add(
+					Fields.LTT_FIELD_CALL_SITE);
+			LTT_EVENT_FUNCTION_ENTRY.stateTransition = true;
+
+			// LTT_EVENT_FUNCTION_EXIT
+			LTT_EVENT_FUNCTION_EXIT.setParent(Channels.LTT_CHANNEL_USERSPACE);
+			LTT_EVENT_FUNCTION_EXIT.getChildren().add(Fields.LTT_FIELD_THIS_FN);
+			LTT_EVENT_FUNCTION_EXIT.getChildren().add(
+					Fields.LTT_FIELD_CALL_SITE);
+			LTT_EVENT_FUNCTION_EXIT.stateTransition = true;
+
+			// LTT_EVENT_FUNCTION_EXIT
+			LTT_EVENT_FUNCTION_EXIT.setParent(Channels.LTT_CHANNEL_USERSPACE);
+			LTT_EVENT_FUNCTION_EXIT.getChildren().add(Fields.LTT_FIELD_THIS_FN);
+			LTT_EVENT_FUNCTION_EXIT.getChildren().add(
+					Fields.LTT_FIELD_CALL_SITE);
+			LTT_EVENT_FUNCTION_EXIT.stateTransition = true;
+
+			// LTT_EVENT_SYS_CALL_TABLE
+			LTT_EVENT_SYS_CALL_TABLE
+					.setParent(Channels.LTT_CHANNEL_SYSCALL_STATE);
+			LTT_EVENT_SYS_CALL_TABLE.getChildren().add(Fields.LTT_FIELD_ID);
+			LTT_EVENT_SYS_CALL_TABLE.getChildren()
+					.add(Fields.LTT_FIELD_ADDRESS);
+			LTT_EVENT_SYS_CALL_TABLE.getChildren().add(Fields.LTT_FIELD_SYMBOL);
+			LTT_EVENT_SYS_CALL_TABLE.stateTransition = true;
+
+			// LTT_EVENT_SYS_CALL_TABLE
+			LTT_EVENT_KPROBE_TABLE.setParent(Channels.LTT_CHANNEL_KPROBE_STATE);
+			LTT_EVENT_KPROBE_TABLE.getChildren().add(Fields.LTT_FIELD_IP);
+			LTT_EVENT_KPROBE_TABLE.getChildren().add(Fields.LTT_FIELD_SYMBOL);
+			LTT_EVENT_KPROBE_TABLE.stateTransition = true;
+
+			// LTT_EVENT_SOFTIRQ_VEC
+			LTT_EVENT_SOFTIRQ_VEC.setParent(Channels.LTT_CHANNEL_SOFTIRQ_STATE);
+			LTT_EVENT_SOFTIRQ_VEC.getChildren().add(Fields.LTT_FIELD_ID);
+			LTT_EVENT_SOFTIRQ_VEC.getChildren().add(Fields.LTT_FIELD_ADDRESS);
+			LTT_EVENT_SOFTIRQ_VEC.getChildren().add(Fields.LTT_FIELD_SYMBOL);
+			LTT_EVENT_SOFTIRQ_VEC.stateTransition = true;
+		}
+
+	};
+
+	public enum Fields {
+		LTT_FIELD_SYSCALL_ID("syscall_id"), /* */
+		LTT_FIELD_TRAP_ID("trap_id"), /* */
+		LTT_FIELD_IRQ_ID("irq_id"), /* */
+		LTT_FIELD_SOFT_IRQ_ID("softirq_id"), /* */
+		LTT_FIELD_PREV_PID("prev_pid"), /* */
+		LTT_FIELD_NEXT_PID("next_pid"), /* */
+		LTT_FIELD_PREV_STATE("prev_state"), /* */
+		LTT_FIELD_PARENT_PID("parent_pid"), /* */
+		LTT_FIELD_CHILD_PID("child_pid"), /* */
+		LTT_FIELD_PID("pid"), /* */
+		LTT_FIELD_TGID("tgid"), /* */
+		LTT_FIELD_CHILD_TGID("child_tgid"), /* */
+		LTT_FIELD_FILENAME("filename"), /* */
+		LTT_FIELD_NAME("name"), /* */
+		LTT_FIELD_TYPE("type"), /* */
+		LTT_FIELD_MODE("mode"), /* */
+		LTT_FIELD_SUBMODE("submode"), /* */
+		LTT_FIELD_STATUS("status"), /* */
+		LTT_FIELD_THIS_FN("this_fn"), /* */
+		LTT_FIELD_CALL_SITE("call_site"), /* */
+		LTT_FIELD_MAJOR("major"), /* */
+		LTT_FIELD_MINOR("minor"), /* */
+		LTT_FIELD_OPERATION("direction"), /* */
+		LTT_FIELD_ACTION("action"), /* */
+		LTT_FIELD_ID("id"), /* */
+		LTT_FIELD_ADDRESS("address"), /* */
+		LTT_FIELD_SYMBOL("symbol"), /* */
+		LTT_FIELD_IP("ip"); /* */
+
+		private final String inName;
+
+		private Fields(String name) {
+			this.inName = name;
+		}
+
+		public String getInName() {
+			return this.inName;
+		}
+	};
+
+	public enum CpuMode {
+		LTTV_CPU_UNKNOWN("unknown"), /* */
+		LTTV_CPU_IDLE("idle"), /* */
+		LTTV_CPU_BUSY("busy"), /* */
+		LTTV_CPU_IRQ("irq"), /* */
+		LTTV_CPU_SOFT_IRQ("softirq"), /* */
+		LTTV_CPU_TRAP("trap"); /* */
+
+		String inName;
+
+		private CpuMode(String name) {
+			this.inName = name;
+		}
+
+		public String getInName() {
+			return this.inName;
+		}
+
+	}
+
+	public enum IRQMode {
+		LTTV_IRQ_UNKNOWN("unknown"), /* */
+		LTTV_IRQ_IDLE("idle"), /* */
+		LTTV_IRQ_BUSY("busy"); /* */
+
+		String inName;
+
+		private IRQMode(String name) {
+			this.inName = name;
+		}
+
+		public String getInName() {
+			return this.inName;
+		}
+
+	}
+
+	public enum SoftIRQMode {
+		LTTV_SOFT_IRQ_UNKNOWN("unknown"), /* */
+		LTTV_SOFT_IRQ_IDLE("idle"), /* */
+		LTTV_SOFT_IRQ_PENDING("pending"), /* */
+		LTTV_SOFT_IRQ_BUSY("busy"); /* */
+
+		String inName;
+
+		private SoftIRQMode(String name) {
+			this.inName = name;
+		}
+
+		public String getInName() {
+			return this.inName;
+		}
+
+	}
+	
+	public enum BdevMode {
+		LTTV_BDEV_UNKNOWN("unknown"), /* */
+		LTTV_BDEV_IDLE("idle"), /* */
+		LTTV_BDEV_BUSY_READING("busy_reading"), /* */
+		LTTV_BDEV_BUSY_WRITING("busy_writing"); /* */
+
+		String inName;
+
+		private BdevMode(String name) {
+			this.inName = name;
+		}
+
+		public String getInName() {
+			return this.inName;
+		}
+
+	}
+	
+	public enum TrapMode {
+		LTTV_TRAP_UNKNOWN("unknown"), /* */
+		LTTV_TRAP_IDLE("idle"), /* */
+		LTTV_TRAP_BUSY("busy"); /* */
+
+		String inName;
+
+		private TrapMode(String name) {
+			this.inName = name;
+		}
+
+		public String getInName() {
+			return this.inName;
+		}
+
+	}
+	public enum ProcessType {
+		LTTV_STATE_USER_THREAD("USER_THREAD"), /* */
+		LTTV_STATE_KERNEL_THREAD("KERNEL_THREAD"); /* */
+
+		String inName;
+
+		private ProcessType(String name) {
+			this.inName = name;
+		}
+
+		public String getInName() {
+			return this.inName;
+		}
+
+	}
+
+	public enum ProcessStatus {
+		LTTV_STATE_UNNAMED("UNNAMED"), LTTV_STATE_WAIT_FORK("WAIT_FORK"), /* */
+		LTTV_STATE_WAIT_CPU("WAIT_CPU"), /* */
+		LTTV_STATE_EXIT("EXIT"), /* */
+		LTTV_STATE_ZOMBIE("ZOMBIE"), /* */
+		LTTV_STATE_WAIT("WAIT"), /* */
+		LTTV_STATE_RUN("RUN"), /* */
+		LTTV_STATE_DEAD("DEAD"); /* */
+
+		String inName;
+
+		private ProcessStatus(String name) {
+			this.inName = name;
+		}
+
+		public String getInName() {
+			return this.inName;
+		}
+
+	}
+
+	public enum ExecutionSubMode {
+		LTTV_STATE_SUBMODE_UNKNOWN("UNKNOWN"), /* */
+		LTTV_STATE_SUBMODE_NONE("NONE"); /* */
+
+		String inName;
+
+		private ExecutionSubMode(String name) {
+			this.inName = name;
+		}
+
+		public String getInName() {
+			return this.inName;
+		}
+
+	}
+
+	public enum ExecutionMode {
+		LTTV_STATE_MODE_UNKNOWN("MODE_UNKNOWN"), /* */
+		LTTV_STATE_USER_MODE("USER_MODE"), /* */
+		LTTV_STATE_SYSCALL("SYSCALL"), /* */
+		LTTV_STATE_TRAP("TRAP"), /* */
+		LTTV_STATE_IRQ("IRQ"), /* */
+		LTTV_STATE_SOFT_IRQ("SOFTIRQ"); /* */
+
+		String inName;
+
+		private ExecutionMode(String name) {
+			this.inName = name;
+		}
+
+		public String getInName() {
+			return this.inName;
+		}
+
+	}
+
+	public enum GenStates {
+		LTTV_STATE_TRACEFILES("tracefiles"), /* */
+		LTTV_STATE_PROCESSES("processes"), /* */
+		LTTV_STATE_PROCESS("process"), /* */
+		LTTV_STATE_RUNNING_PROCESS("running_process"), /* */
+		LTTV_STATE_EVENT("event"), /* */
+		LTTV_STATE_SAVED_STATES("saved states"), /* */
+		LTTV_STATE_SAVED_STATES_TIME("saved states time"), /* */
+		LTTV_STATE_TIME("time"), /* */
+		LTTV_STATE_HOOKS("saved state hooks"), /* */
+		LTTV_STATE_NAME_TABLES("name tables"), /* */
+		LTTV_STATE_TRACE_STATE_USE_COUNT("trace_state_use_count"), /* */
+		LTTV_STATE_RESOURCE_CPUS("cpu count"), /* */
+		LTTV_STATE_RESOURCE_IRQS("irq resource states"), /* */
+		LTTV_STATE_RESOURCE_SOFT_IRQS("soft irq resource states"), /* */
+		LTTV_STATE_RESOURCE_TRAPS("trap resource states"), /* */
+		LTTV_STATE_RESOURCE_BLKDEVS("blkdevs resource states"); /* */
+
+		String inName;
+
+		private GenStates(String name) {
+			this.inName = name;
+		}
+
+		public String getInName() {
+			return this.inName;
+		}
+
+	}
+
+	// ========================================================================
+	// Methods
+	// =======================================================================
+	/**
+	 * Return the string to any known event
+	 * 
+	 * @return the eventstrmap
+	 */
+	public HashMap<String, Events> getEventStrmap() {
+		return eventStrMap;
+	}
+
+	/**
+	 * Return the string to state transition events map
+	 * 
+	 * @return the stateTransEventMap
+	 */
+	public HashMap<String, Events> getStateTransEventMap() {
+		return stateTransEventMap;
+	}
+
+	/**
+	 * @return the mapping from int to system call names
+	 */
+	public String[] getSyscallNames() {
+		return syscall_names;
+	}
+
+	/**
+	 * @return the mapping from int to trap names
+	 */
+	public String[] getTrapNames() {
+		return trap_names;
+	}
+
+	/**
+	 * @return the mapping from int to irq names
+	 */
+	public String[] getIrqNames() {
+		return irq_names;
+	}
+
+	/**
+	 * @return the mapping from int to softirq name
+	 */
+	public String[] getSoftIrqNames() {
+		return soft_irq_names;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/AbsEventProcessorFactory.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/AbsEventProcessorFactory.java
new file mode 100644
index 0000000..c0a414d
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/AbsEventProcessorFactory.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.state.evProcessor;
+
+/**
+ * @author alvaro
+ * 
+ */
+public abstract class AbsEventProcessorFactory {
+	/**
+	 * 
+	 * @return The Event Handler for received event before the State data model
+	 *         is updated.
+	 */
+	public abstract IEventProcessing getBeforeProcessor(String eventType);
+
+	/**
+	 * 
+	 * @return The Event Handler for received event after the State data model
+	 *         is updated.
+	 */
+	public abstract IEventProcessing getAfterProcessor(String eventType);
+
+	/**
+	 * 
+	 * @return The Event Handler after the complete read request is completed,
+	 *         needed e.g. to draw the last state
+	 */
+	public abstract IEventProcessing getfinishProcessor();
+
+	/**
+	 * 
+	 * @return The Event Handler for received event in charge to update the
+	 *         state. Only one handler is expected so other factories must not
+	 *         override this method.
+	 */
+	public IEventProcessing getStateUpdaterProcessor(String eventType) {
+		return null;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/EventProcessorProxy.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/EventProcessorProxy.java
new file mode 100644
index 0000000..cb92caa
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/EventProcessorProxy.java
@@ -0,0 +1,95 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.state.evProcessor;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.linuxtools.lttng.TraceDebug;
+import org.eclipse.linuxtools.lttng.state.evProcessor.state.StateUpdateFactory;
+
+/**
+ * @author alvaro
+ * 
+ */
+public class EventProcessorProxy {
+	// ========================================================================
+	// Data
+	// =======================================================================
+	private static EventProcessorProxy instance = null;
+	private final Set<AbsEventProcessorFactory> processingFactories = new HashSet<AbsEventProcessorFactory>();
+
+	
+	// ========================================================================
+	// Constructors
+	// =======================================================================
+	public EventProcessorProxy() {
+		// Manual creation of State update factory
+		addEventProcessorFactory(StateUpdateFactory.getInstance());
+	}
+
+	// ========================================================================
+	// Methods
+	// =======================================================================
+	/**
+	 * @return the processingFactories
+	 */
+	public Set<AbsEventProcessorFactory> getProcessingFactories() {
+		return processingFactories;
+	}
+
+	/**
+	 * Returns this singleton
+	 * 
+	 * @return
+	 */
+	public static EventProcessorProxy getInstance() {
+		if (instance == null) {
+			instance = new EventProcessorProxy();
+		}
+
+		return instance;
+	}
+
+	/**
+	 * Register a factory of event handler methods, each factory provides a map
+	 * to Before and After state update handlers
+	 * 
+	 * @param handlersFactory
+	 */
+	public void addEventProcessorFactory(
+			AbsEventProcessorFactory handlersFactory) {
+		if (handlersFactory != null) {
+			//only add the listener if not already included
+			if (!processingFactories.contains(handlersFactory)) {
+				processingFactories.add(handlersFactory);
+			}
+		} else {
+			TraceDebug
+					.debug("An attempt to register a null factory has been detected");
+		}
+	}
+
+	/**
+	 * Remove a factory previously added with addEventProcessorFactory
+	 * 
+	 * @param handlersFactory
+	 */
+	public void removeEventProcessorFactory(
+			AbsEventProcessorFactory handlersFactory) {
+		if (handlersFactory != null) {
+			processingFactories.remove(handlersFactory);
+		} 
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/IEventProcessing.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/IEventProcessing.java
new file mode 100644
index 0000000..d69827b
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/IEventProcessing.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.state.evProcessor;
+
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.state.StateStrings;
+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+
+/**
+ * @author alvaro
+ *
+ */
+public interface IEventProcessing {
+
+	// ========================================================================
+	// Abstract methods
+	// =======================================================================
+	public abstract boolean process(LttngEvent trcEvent, LttngTraceState traceSt);
+	public abstract StateStrings.Events getEventHandleType();
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateProcessing.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateProcessing.java
new file mode 100644
index 0000000..6126b9b
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateProcessing.java
@@ -0,0 +1,209 @@
+/**
+ * 
+ */
+package org.eclipse.linuxtools.lttng.state.evProcessor.state;
+
+import org.eclipse.linuxtools.lttng.TraceDebug;
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.event.LttngEventContent;
+import org.eclipse.linuxtools.lttng.event.LttngEventField;
+import org.eclipse.linuxtools.lttng.state.StateStrings.Fields;
+import org.eclipse.linuxtools.lttng.state.model.LttngProcessState;
+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.tmf.event.TmfEventField;
+
+/**
+ * Common utility methods for all state processing handlers, not intended to be
+ * instantiated on its own
+ * 
+ * @author alvaro
+ * 
+ */
+public abstract class AbsStateProcessing {
+
+	/**
+	 * protected method used when a Field is requested among several available
+	 * fields and the expected type is Long
+	 * 
+	 * @param trcEvent
+	 * @param traceSt
+	 * @param expectedNumFields
+	 * @return
+	 */
+	protected Long getAFieldLong(LttngEvent trcEvent, LttngTraceState traceSt, Fields expectedField) {
+		Long fieldVal = 0L;
+		
+        String fieldname = expectedField.getInName();
+		LttngEventField field = ((LttngEventContent) trcEvent.getContent()).getField(fieldname);
+		
+		if ( field == null ) {
+			TraceDebug.debug("***************** CONTENT : " + ((LttngEventContent) trcEvent.getContent()).toString());
+		}
+		else {
+            Object fieldObj = field.getValue();
+            if ( (fieldObj instanceof Long) || (fieldObj instanceof Integer) ) {
+                // Expected numeric value found
+                fieldVal = (Long) field.getValue();
+            } 
+            else {
+                if (TraceDebug.isDEBUG()) {
+                    TraceDebug.debug("Unexpected field Type. Expected: Long, Received: "+ fieldObj.getClass().getSimpleName());
+                }
+            }
+		}
+		
+		/*
+		// TmfEventField[] fields = trcEvent.getContent().getFields();
+		TmfEventField[] fields = ((LttngEventContent) trcEvent.getContent())
+				.getFields(trcEvent);
+	
+		// At least one field expected
+		if (fields.length == 0) {
+			TraceDebug.debug("Unexpected number of fields received: "
+					+ fields.length);
+			return null;
+		}
+	
+		LttngEventField field;
+		String fieldname;
+		String expectedFieldName = expectedField.getInName();
+		for (int i = 0; i < fields.length; i++) {
+			field = (LttngEventField) fields[i];
+			fieldname = field.getName();
+			if (fieldname.equals(expectedFieldName)) {
+				Object fieldObj = field.getValue();
+				if (fieldObj instanceof Long) {
+					// Expected value found
+					fieldVal = (Long) field.getValue();
+					// if (expectedField == Fields.LTT_FIELD_TYPE) {
+					// TraceDebug.debug("Field Type value is: " + fieldVal);
+					// }
+					break;
+				} else {
+					if (TraceDebug.isDEBUG()) {
+						TraceDebug
+								.debug("Unexpected field Type. Expected: Long, Received: "
+										+ fieldObj.getClass().getSimpleName());
+					}
+					return null;
+				}
+			}
+		}
+		*/
+	
+//		if (fieldVal == null) {
+//			if (TraceDebug.isDEBUG()) {
+//				sendNoFieldFoundMsg(((LttngEventContent) trcEvent.getContent()).getFields(), fieldname);
+//			}
+//		}
+		return fieldVal;
+	}
+
+	/**
+	 * protected method used when a Field is requested among several available
+	 * fields and the expected type is String
+	 * 
+	 * @param trcEvent
+	 * @param traceSt
+	 * @param expectedNumFields
+	 * @return
+	 */
+	protected String getAFieldString(LttngEvent trcEvent,
+			LttngTraceState traceSt, Fields expectedField) {
+		String fieldVal = "";
+		
+		String fieldname = expectedField.getInName();
+        LttngEventField field = ((LttngEventContent) trcEvent.getContent()).getField(fieldname);
+        
+		if ( field == null ) {
+			TraceDebug.debug("***************** CONTENT : " + ((LttngEventContent) trcEvent.getContent()).toString());
+		}
+		else {
+	        Object fieldObj = field.getValue();
+	        if (fieldObj instanceof String) {
+	            // Expected numeric value found
+	            fieldVal = (String) field.getValue();
+	        } 
+	        else {
+	            if (TraceDebug.isDEBUG()) {
+	                TraceDebug.debug("Unexpected field Type. Expected: String, Received: "+ fieldObj.getClass().getSimpleName());
+	            }
+	        }
+		}
+		
+		/*
+		// TmfEventField[] fields = trcEvent.getContent().getFields();
+		TmfEventField[] fields = ((LttngEventContent) trcEvent.getContent())
+				.getFields(trcEvent);
+
+		// Only one field expected
+		if (fields.length == 0) {
+			TraceDebug.debug("Unexpected number of fields received: "
+					+ fields.length);
+			return null;
+		}
+	
+		LttngEventField field;
+		String fieldname;
+		String expectedFieldName = expectedField.getInName();
+		for (int i = 0; i < fields.length; i++) {
+			field = (LttngEventField) fields[i];
+			fieldname = field.getName();
+			if (fieldname.equals(expectedFieldName)) {
+				Object fieldObj = field.getValue();
+				if (fieldObj instanceof String) {
+					// Expected value found
+					fieldVal = (String) field.getValue();
+					break;
+				} else {
+					if (TraceDebug.isDEBUG()) {
+						TraceDebug
+								.debug("Unexpected field Type. Expected: String, Received: "
+										+ fieldObj.getClass().getSimpleName());
+					}
+					return null;
+				}
+			}
+		}
+	    */
+	    
+//        if (fieldVal == null) {
+//            if (TraceDebug.isDEBUG()) {
+//                sendNoFieldFoundMsg(((LttngEventContent) trcEvent.getContent()).getFields(), fieldname);
+//            }
+//        }
+		return fieldVal;
+	}
+
+	/**
+	 * Find the process matching the given pid and cpu
+	 * 
+	 * If cpu is 0, the cpu value is not matched and the selection is based on
+	 * pid value only
+	 * 
+	 * @param traceState
+	 * @param cpu
+	 * @param pid
+	 * @return
+	 */
+	protected LttngProcessState lttv_state_find_process(
+							LttngTraceState traceState, Long cpu, Long pid) {
+
+		return traceState.findProcessState(pid, cpu, traceState.getTraceId());
+	}
+
+	protected void sendNoFieldFoundMsg(TmfEventField[] fields,
+			String expectedFieldName) {
+		LttngEventField field;
+		StringBuilder sb = new StringBuilder("Field not found, requested: "
+				+ expectedFieldName);
+		sb.append(" number of fields: " + fields.length + "Fields: ");
+		for (int i = 0; i < fields.length; i++) {
+			field = (LttngEventField) fields[i];
+			sb.append(field.getId() + " ");
+		}
+	
+		TraceDebug.debug(sb.toString(), 5);
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateUpdate.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateUpdate.java
new file mode 100644
index 0000000..bf82ff2
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateUpdate.java
@@ -0,0 +1,250 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.state.evProcessor.state;
+
+
+import org.eclipse.linuxtools.lttng.TraceDebug;
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.state.StateStrings;
+import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionMode;
+import org.eclipse.linuxtools.lttng.state.StateStrings.IRQMode;
+import org.eclipse.linuxtools.lttng.state.StateStrings.ProcessStatus;
+import org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing;
+import org.eclipse.linuxtools.lttng.state.model.LTTngCPUState;
+import org.eclipse.linuxtools.lttng.state.model.LttngBdevState;
+import org.eclipse.linuxtools.lttng.state.model.LttngExecutionState;
+import org.eclipse.linuxtools.lttng.state.model.LttngIRQState;
+import org.eclipse.linuxtools.lttng.state.model.LttngProcessState;
+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+
+public abstract class AbsStateUpdate extends AbsStateProcessing implements
+		IEventProcessing {
+
+	// ========================================================================
+	// Data
+	// =======================================================================
+	protected static final Long ANY_CPU = 0L;
+
+	// ========================================================================
+	// push and pop from stack
+	// =======================================================================
+	protected void push_state(Long cpu, StateStrings.ExecutionMode execMode,
+			String submode, TmfTimestamp eventTime, LttngTraceState traceSt) {
+
+		LttngProcessState process = traceSt.getRunning_process().get(cpu);
+		LttngExecutionState exe_state = new LttngExecutionState();
+		exe_state.setExec_mode(execMode);
+		exe_state.setExec_submode(submode);
+		exe_state.setEntry_Time(eventTime.getValue());
+		exe_state.setChange_Time(eventTime.getValue());
+		exe_state.setCum_cpu_time(0L);
+		exe_state.setProc_status(process.getState().getProc_status());
+		process.pushToExecutionStack(exe_state);
+	}
+
+	protected void pop_state(Long cpu, StateStrings.ExecutionMode execMode,
+			LttngTraceState traceSt, TmfTimestamp eventTime) {
+
+		LttngProcessState process = traceSt.getRunning_process().get(cpu);
+
+		if (!process.getState().getExec_mode().equals(execMode)) {
+			// Different execution mode
+			TraceDebug.debug("Different Execution Mode type \n\tTime:"
+					+ eventTime.toString() + "\n\tprocess state has: \n\t"
+					+ process.getState().getExec_mode().toString()
+					+ "\n\twhen pop_int is:\n\t" + execMode.toString());
+			return;
+		}
+
+		//The process state is updated within the pop method
+		process.popFromExecutionStack();
+		process.getState().setChange_Time(eventTime.getValue());
+	}
+
+	protected void irq_push_mode(LttngIRQState irqst, IRQMode state) {
+		irqst.pushToIrqStack(state);
+	}
+
+	protected void irq_set_base_mode(LttngIRQState irqst, IRQMode state) {
+	    irqst.clearAndSetBaseToIrqStack(state);
+	}
+
+	protected void irq_pop_mode(LttngIRQState irqst) {
+	    irqst.popFromIrqStack();
+	}
+
+	protected void cpu_push_mode(LTTngCPUState cpust, StateStrings.CpuMode state) {
+		// The initialization (init) creates a LttngCPUState instance per
+		// available cpu in the system
+		cpust.pushToCpuStack(state);
+	}
+
+	protected void cpu_pop_mode(LTTngCPUState cpust) {
+		cpust.popFromCpuStack();
+	}
+
+	/* clears the stack and sets the state passed as argument */
+	protected void cpu_set_base_mode(LTTngCPUState cpust,
+			StateStrings.CpuMode state) {
+		cpust.clearAndSetBaseToCpuStack(state);
+	}
+
+	protected void bdev_pop_mode(LttngBdevState bdevst) {
+	    bdevst.popFromBdevStack();
+	}
+
+	/**
+	 * Push a new received function pointer to the user_stack
+	 * 
+	 * @param traceSt
+	 * @param funcptr
+	 * @param cpu
+	 */
+	protected void push_function(LttngTraceState traceSt, Long funcptr, Long cpu) {
+		// Get the related process
+		LttngProcessState process = traceSt.getRunning_process().get(cpu);
+
+		// update stack
+		process.pushToUserStack(funcptr);
+
+		// update the pointer to the current function on the corresponding
+		// process
+		process.setCurrent_function(funcptr);
+	}
+
+	protected void pop_function(LttngTraceState traceSt, LttngEvent trcEvent,
+			Long funcptr) {
+		Long cpu = trcEvent.getCpuId();
+		LttngProcessState process = traceSt.getRunning_process().get(cpu);
+		Long curr_function = process.getCurrent_function();
+
+		if (curr_function != null && curr_function != funcptr) {
+			TraceDebug.debug("Different functions: " + funcptr + " current: "
+					+ curr_function + " time stamp: "
+					+ trcEvent.getTimestamp().toString());
+
+			// g_info("Different functions (%lu.%09lu): ignore it\n",
+			// tfs->parent.timestamp.tv_sec, tfs->parent.timestamp.tv_nsec);
+			// g_info("process state has %" PRIu64 " when pop_function is %"
+			// PRIu64
+			// "\n",
+			// process->current_function, funcptr);
+			// g_info("{ %u, %u, %s, %s, %s }\n",
+			// process->pid,
+			// process->ppid,
+			// g_quark_to_string(process->name),
+			// g_quark_to_string(process->brand),
+			// g_quark_to_string(process->state->s));
+			return;
+		}
+		
+		process.popFromUserStack();
+		process.setCurrent_function(process.peekFromUserStack());
+	}
+
+	// ========================================================================
+	// General methods
+	// =======================================================================
+	// Adaption from MKDEV macro
+	protected Long mkdev(Long major, Long minor) {
+		Long result = null;
+		if (major != null && minor != null) {
+			result = (major << 20) | minor;
+		}
+		return result;
+	}
+
+	/*
+	 * FIXME : this function should be called when we receive an event telling
+	 * that release_task has been called in the kernel. In happens generally
+	 * when the parent waits for its child termination, but may also happen in
+	 * special cases in the child's exit : when the parent ignores its children
+	 * SIGCCHLD or has the flag SA_NOCLDWAIT. It can also happen when the child
+	 * is part of a killed thread group, but isn't the leader.
+	 */
+	protected boolean exit_process(LttngTraceState ts, LttngProcessState process) {
+		/*
+		 * Wait for both schedule with exit dead and process free to happen.
+		 * They can happen in any order.
+		 */
+		process.incrementFree_events();
+		if (process.getFree_events() < 2) {
+			return false;
+		}
+
+		process.clearExecutionStack();
+		process.clearUserStack();
+		ts.removeProcessState(process);
+
+		return true;
+	}
+
+	/**
+	 * @param traceSt
+	 * @param cpu
+	 * @param pid
+	 * @param tgid
+	 * @param timestamp
+	 * @return
+	 */
+	protected LttngProcessState create_process(LttngTraceState traceSt,
+			Long cpu, Long pid, Long tgid, final TmfTimestamp timestamp) {
+		LttngProcessState process = create_process(traceSt, cpu, pid, tgid,
+				ProcessStatus.LTTV_STATE_UNNAMED.getInName(), timestamp);
+		return process;
+	}
+
+	/**
+	 * @param traceSt
+	 * @param cpu
+	 * @param pid
+	 * @param tgid
+	 * @param name
+	 * @param timestamp
+	 * @return
+	 */
+	protected LttngProcessState create_process(LttngTraceState traceSt,
+			Long cpu, Long pid, Long tgid, String name,
+			final TmfTimestamp timestamp) {
+		LttngProcessState process;
+		process = new LttngProcessState(cpu, pid, tgid, name, timestamp.getValue(), traceSt.getTraceId());
+		traceSt.addProcessState(process);
+		return process;
+	}
+
+	/**
+	 * @param ts
+	 * @param cpu
+	 * @param pid
+	 * @param timestamp
+	 *            , Used when a new process is needed
+	 * @return
+	 */
+	protected LttngProcessState lttv_state_find_process_or_create(
+			LttngTraceState ts, Long cpu, Long pid, final TmfTimestamp timestamp) {
+	
+		LttngProcessState process = lttv_state_find_process(ts, cpu, pid);
+		/* Put ltt_time_zero creation time for non existing processes */
+		if (process == null) {
+			process = create_process(ts, cpu, pid, 0L, timestamp);
+			// leave only one entry in the execution stack
+			process.popFromExecutionStack();
+			LttngExecutionState es = process.getState();
+			es.setExec_mode(ExecutionMode.LTTV_STATE_MODE_UNKNOWN);
+			es.setProc_status(ProcessStatus.LTTV_STATE_UNNAMED);
+		}
+	
+		return process;
+	}
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/StateUpdateFactory.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/StateUpdateFactory.java
new file mode 100644
index 0000000..977a672
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/StateUpdateFactory.java
@@ -0,0 +1,186 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.state.evProcessor.state;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.linuxtools.lttng.state.StateStrings;
+import org.eclipse.linuxtools.lttng.state.evProcessor.AbsEventProcessorFactory;
+import org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing;
+
+/**
+ * Builds a Map from string event name to a processing handler object, the
+ * processors implement the same interface to facilitate transparent methods
+ * call,
+ * 
+ * The map key STring is the entry point of the raw events, using a hash speeds
+ * up the resolution of the appropriate processor
+ * 
+ * @author alvaro
+ * 
+ */
+public class StateUpdateFactory extends AbsEventProcessorFactory {
+	// ========================================================================
+	// Data
+	// =======================================================================
+	private final Map<String, IEventProcessing> eventNametoProcessor = new HashMap<String, IEventProcessing>();
+	private static StateUpdateFactory instance = new StateUpdateFactory();
+	private StateUpdateHandlers instantiateHandler = new StateUpdateHandlers();
+
+	// ========================================================================
+	// Constructors
+	// =======================================================================
+	private StateUpdateFactory() {
+		//create one instance of each individual event handler and add the instance to the map
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_SYSCALL_ENTRY
+				.getInName(), instantiateHandler.getSyscallEntryHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_SYSCALL_EXIT
+				.getInName(), instantiateHandler.getsySyscallExitHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_TRAP_ENTRY
+				.getInName(), instantiateHandler.getTrapEntryHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_TRAP_EXIT
+				.getInName(), instantiateHandler.getTrapExitHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_PAGE_FAULT_ENTRY
+				.getInName(), instantiateHandler.getTrapEntryHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_PAGE_FAULT_EXIT
+				.getInName(), instantiateHandler.getTrapExitHandler());
+
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_PAGE_FAULT_NOSEM_ENTRY
+				.getInName(), instantiateHandler.getTrapEntryHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_PAGE_FAULT_NOSEM_EXIT
+				.getInName(), instantiateHandler.getTrapExitHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_IRQ_ENTRY
+				.getInName(), instantiateHandler.getIrqEntryHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_IRQ_EXIT
+				.getInName(), instantiateHandler.getIrqExitHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_SOFT_IRQ_RAISE
+				.getInName(), instantiateHandler.getSoftIrqRaiseHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_SOFT_IRQ_ENTRY
+				.getInName(), instantiateHandler.getSoftIrqEntryHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_SOFT_IRQ_EXIT
+				.getInName(), instantiateHandler.getSoftIrqExitHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_LIST_INTERRUPT
+				.getInName(), instantiateHandler.getEnumInterruptHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_REQUEST_ISSUE
+				.getInName(), instantiateHandler.getBdevRequestIssueHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_REQUEST_COMPLETE
+				.getInName(), instantiateHandler.getBdevRequestCompleteHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_FUNCTION_ENTRY
+				.getInName(), instantiateHandler.getFunctionEntryHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_FUNCTION_EXIT
+				.getInName(), instantiateHandler.getFunctionExitHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_SYS_CALL_TABLE
+				.getInName(), instantiateHandler.getDumpSyscallHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_KPROBE_TABLE
+				.getInName(), instantiateHandler.getDumpKprobeHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_SOFTIRQ_VEC
+				.getInName(), instantiateHandler.getDumpSoftIrqHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_SCHED_SCHEDULE
+				.getInName(), instantiateHandler.getSchedChangeHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_PROCESS_FORK
+				.getInName(), instantiateHandler.getProcessForkHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_KTHREAD_CREATE
+				.getInName(), instantiateHandler.getProcessKernelThreadHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_PROCESS_EXIT
+				.getInName(), instantiateHandler.getProcessExitHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_PROCESS_FREE
+				.getInName(), instantiateHandler.getProcessFreeHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_EXEC
+				.getInName(), instantiateHandler.getProcessExecHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_THREAD_BRAND
+				.getInName(), instantiateHandler.GetThreadBrandHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_STATEDUMP_END
+				.getInName(), instantiateHandler.getStateDumpEndHandler());
+		
+		eventNametoProcessor.put(StateStrings.Events.LTT_EVENT_PROCESS_STATE
+				.getInName(), instantiateHandler.getEnumProcessStateHandler());
+
+
+	}
+
+	// ========================================================================
+	// Public methods
+	// =======================================================================
+	/**
+	 * The event processors are common to all traces an multiple instances will
+	 * use more memory unnecessarily
+	 * 
+	 * @return
+	 */
+	public static AbsEventProcessorFactory getInstance() {
+		if (instance == null) {
+			instance = new StateUpdateFactory();
+		}
+		return instance;
+	}
+
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.lttng.state.evProcessor.AbsEventProcessorFactory#getAfterProcessor(java.lang.String)
+	 */
+	@Override
+	public IEventProcessing getAfterProcessor(String eventType) {
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.lttng.state.evProcessor.AbsEventProcessorFactory#getBeforeProcessor(java.lang.String)
+	 */
+	@Override
+	public IEventProcessing getBeforeProcessor(String eventType) {
+		return null;
+	}
+	
+	/**
+	 * This is the only event handler to update the State provider
+	 * @return 
+	 * 
+	 */
+	@Override
+	public IEventProcessing getStateUpdaterProcessor(String eventType) {
+		return eventNametoProcessor.get(eventType);
+	}
+
+	@Override
+	public IEventProcessing getfinishProcessor() {
+		// No finishing processor used
+		return null;
+	}
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/StateUpdateHandlers.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/StateUpdateHandlers.java
new file mode 100644
index 0000000..8970057
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/StateUpdateHandlers.java
@@ -0,0 +1,1715 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.state.evProcessor.state;
+
+import java.util.Map;
+
+import org.eclipse.linuxtools.lttng.TraceDebug;
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.state.StateStrings;
+import org.eclipse.linuxtools.lttng.state.StateStrings.BdevMode;
+import org.eclipse.linuxtools.lttng.state.StateStrings.CpuMode;
+import org.eclipse.linuxtools.lttng.state.StateStrings.Events;
+import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionMode;
+import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionSubMode;
+import org.eclipse.linuxtools.lttng.state.StateStrings.Fields;
+import org.eclipse.linuxtools.lttng.state.StateStrings.IRQMode;
+import org.eclipse.linuxtools.lttng.state.StateStrings.ProcessStatus;
+import org.eclipse.linuxtools.lttng.state.StateStrings.ProcessType;
+import org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing;
+import org.eclipse.linuxtools.lttng.state.model.LTTngCPUState;
+import org.eclipse.linuxtools.lttng.state.model.LttngBdevState;
+import org.eclipse.linuxtools.lttng.state.model.LttngExecutionState;
+import org.eclipse.linuxtools.lttng.state.model.LttngIRQState;
+import org.eclipse.linuxtools.lttng.state.model.LttngProcessState;
+import org.eclipse.linuxtools.lttng.state.model.LttngSoftIRQState;
+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.state.model.LttngTrapState;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+
+/**
+ * Wraps the creation of individual handlers, each method creates and instance
+ * of the corresponding handler
+ * 
+ * @author alvaro
+ * 
+ */
+class StateUpdateHandlers {
+
+	final IEventProcessing getSyscallEntryHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SYSCALL_ENTRY;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				Long cpu = trcEvent.getCpuId();
+
+				// No syscall_entry update for initialization process
+				LttngProcessState process = traceSt.getRunning_process().get(
+						cpu);
+				if ((process != null) && (process.getPid() != null)
+						&& (process.getPid().longValue() == 0L)) {
+					return true;
+				}
+
+				// Get the expected event field
+				Long syscall = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_SYSCALL_ID);
+
+				String submode = null;
+				if (syscall == null) {
+					TraceDebug
+							.debug("Syscall Field not found, traceVent time: "
+									+ trcEvent.getTimestamp());
+				} else {
+					submode = traceSt.getSyscall_names().get(syscall);
+				}
+
+				if (submode == null) {
+					submode = ExecutionSubMode.LTTV_STATE_SUBMODE_UNKNOWN
+							.getInName();
+				}
+
+				push_state(cpu, StateStrings.ExecutionMode.LTTV_STATE_SYSCALL,
+						submode, trcEvent.getTimestamp(), traceSt);
+				return false;
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	final IEventProcessing getsySyscallExitHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SYSCALL_EXIT;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				Long cpu = trcEvent.getCpuId();
+				LttngProcessState process = traceSt.getRunning_process().get(
+						cpu);
+
+				// No syscall_entry update for initialization process
+				if ((process != null) && (process.getPid() != null)
+						&& (process.getPid().longValue() == 0L)) {
+					return true;
+				}
+
+				pop_state(cpu, StateStrings.ExecutionMode.LTTV_STATE_SYSCALL,
+						traceSt, trcEvent.getTimestamp());
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * Update stacks related to the parsing of an LttngEvent
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getTrapEntryHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_TRAP_ENTRY;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				Long cpu = trcEvent.getCpuId();
+
+				Long trap = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_TRAP_ID);
+				if (trap == null) {
+					TraceDebug
+							.debug("Trap field could not be found, event time: "
+									+ trcEvent.getTimestamp());
+					return true;
+				}
+
+				// ready the trap submode name
+				String submode = traceSt.getTrap_names().get(trap);
+
+				if (submode == null) {
+					submode = ExecutionSubMode.LTTV_STATE_SUBMODE_UNKNOWN
+							.getInName();
+				}
+
+				/* update process state */
+				push_state(cpu, StateStrings.ExecutionMode.LTTV_STATE_TRAP,
+						submode, trcEvent.getTimestamp(), traceSt);
+
+				/* update cpu status */
+				LTTngCPUState cpust = traceSt.getCpu_states().get(cpu);
+				cpu_push_mode(cpust, StateStrings.CpuMode.LTTV_CPU_TRAP);
+				cpust.pushToTrapStack(trap); /* update trap status */
+				
+				// update Trap State
+				LttngTrapState trap_state = null;
+				trap_state = traceSt.getTrap_states().get(trap);
+				
+				// If the trape_state exists, just increment it's counter, 
+				//	otherwise, create it
+				if ( trap_state == null ) {
+					trap_state = new LttngTrapState();
+					trap_state.incrementRunning();
+					traceSt.getTrap_states().put(trap, trap_state);
+				}
+				else {
+					trap_state.incrementRunning();
+				}
+				
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getTrapExitHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_TRAP_EXIT;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				Long cpu = trcEvent.getCpuId();
+				LTTngCPUState cpust = traceSt.getCpu_states().get(cpu);
+				Long trap = cpust.popFromTrapStack();
+
+				/* update process state */
+				pop_state(cpu, ExecutionMode.LTTV_STATE_TRAP, traceSt, trcEvent
+						.getTimestamp());
+
+				/* update cpu status */
+				cpu_pop_mode(cpust);
+
+				if (trap != -1L) {
+					traceSt.getTrap_states().get(trap).decrementRunning();
+				}
+				// else {
+				// TraceDebug.debug("remove this line");
+				// }
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getIrqEntryHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_IRQ_ENTRY;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				Long cpu = trcEvent.getCpuId();
+
+				Long irq = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_IRQ_ID);
+				if (irq == null) {
+					return true;
+				}
+
+				String submode;
+				submode = traceSt.getIrq_names().get(irq);
+
+				if (submode == null) {
+					submode = ExecutionSubMode.LTTV_STATE_SUBMODE_UNKNOWN
+							.getInName();
+				}
+
+				/*
+				 * Do something with the info about being in user or system mode
+				 * when int?
+				 */
+				push_state(cpu, ExecutionMode.LTTV_STATE_IRQ, submode, trcEvent
+						.getTimestamp(), traceSt);
+
+				/* update cpu state */
+				LTTngCPUState cpust = traceSt.getCpu_states().get(cpu);
+				cpu_push_mode(cpust, CpuMode.LTTV_CPU_IRQ); /* mode stack */
+				cpust.pushToIrqStack(irq); /* last irq */
+
+				/* udpate irq state */
+				irq_push_mode(traceSt.getIrq_states().get(irq),
+						IRQMode.LTTV_IRQ_BUSY);
+				return false;
+
+			}
+
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getSoftIrqExitHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SOFT_IRQ_EXIT;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				Long cpu = trcEvent.getCpuId();
+				LTTngCPUState cpust = traceSt.getCpu_states().get(cpu);
+				Long softirq = cpust.popFromSoftIrqStack();
+
+				// Update process status
+				pop_state(cpu, ExecutionMode.LTTV_STATE_SOFT_IRQ, traceSt,
+						trcEvent.getTimestamp());
+
+				/* update softirq status */
+				if (softirq != -1) {
+					LttngSoftIRQState softIrqstate = traceSt
+							.getSoft_irq_states().get(softirq);
+					softIrqstate.decrementRunning();
+				}
+
+				/* update cpu status */
+				cpu_pop_mode(cpust);
+
+				return false;
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getIrqExitHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_IRQ_EXIT;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				Long cpu = trcEvent.getCpuId();
+
+				/* update process state */
+				pop_state(cpu, ExecutionMode.LTTV_STATE_IRQ, traceSt, trcEvent
+						.getTimestamp());
+
+				/* update cpu status */
+				LTTngCPUState cpust = traceSt.getCpu_states().get(cpu);
+				cpu_pop_mode(cpust);
+
+				/* update irq status */
+				Long last_irq = cpust.popFromIrqStack();
+				if (last_irq != -1L) {
+					LttngIRQState irq_state = traceSt.getIrq_states().get(
+							last_irq);
+					irq_pop_mode(irq_state);
+				}
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getSoftIrqRaiseHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SOFT_IRQ_RAISE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				// Long cpu = trcEvent.getCpuId();
+
+				// get event field
+				Long softirq = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_SOFT_IRQ_ID);
+
+				if (softirq == null) {
+					TraceDebug.debug("Soft_irq_id not found in "
+							+ eventType.getInName() + " time: "
+							+ trcEvent.getTimestamp());
+					return true;
+				}
+
+				// String submode;
+				// String[] softIrqNames = traceSt.getSoft_irq_names();
+				// if (softirq < softIrqNames.length) {
+				// submode = softIrqNames[softirq];
+				// } else {
+				// submode = "softirq " + softirq;
+				// }
+
+				/* update softirq status */
+				/* a soft irq raises are not cumulative */
+				LttngSoftIRQState irqState = traceSt.getSoft_irq_states().get(
+						softirq);
+				if (irqState != null) {
+					irqState.setPending(1L);
+				} else {
+					TraceDebug
+							.debug("unexpected soft irq id value: " + softirq);
+				}
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getSoftIrqEntryHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SOFT_IRQ_ENTRY;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				// obtrain cpu
+				Long cpu = trcEvent.getCpuId();
+
+				// get event field
+				Long softirq = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_SOFT_IRQ_ID);
+
+				if (softirq == null) {
+					TraceDebug.debug("Soft IRQ ID not found, eventTime: "
+							+ trcEvent.getTimestamp());
+					return true;
+				}
+
+				// obtain submode
+				Map<Long, String> softIrqNames = traceSt.getSoft_irq_names();
+				String submode = softIrqNames.get(softirq);
+				if (submode == null) {
+					submode = "softirq " + softirq;
+					softIrqNames.put(softirq, submode);
+				}
+
+				/* update softirq status */
+				LttngSoftIRQState irqState = traceSt.getSoft_irq_states().get(
+						softirq);
+				if (irqState != null) {
+					irqState.decrementPending();
+					irqState.incrementRunning();
+				} else {
+					TraceDebug
+							.debug("unexpected soft irq id value: " + softirq);
+				}
+
+				/* update cpu state */
+				LTTngCPUState cpu_state = traceSt.getCpu_states().get(cpu);
+				cpu_state.pushToSoftIrqStack(softirq);
+				cpu_push_mode(cpu_state, CpuMode.LTTV_CPU_SOFT_IRQ);
+
+				/* update process execution mode state stack */
+				push_state(cpu, ExecutionMode.LTTV_STATE_SOFT_IRQ, submode,
+						trcEvent.getTimestamp(), traceSt);
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * Method to handle the event: LTT_EVENT_LIST_INTERRRUPT
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getEnumInterruptHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_LIST_INTERRUPT;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				String action = getAFieldString(trcEvent, traceSt,
+						Fields.LTT_FIELD_ACTION);
+				Long irq = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_IRQ_ID);
+
+				if (action == null) {
+					TraceDebug.debug("Field Action not found in event "
+							+ eventType.getInName() + " time: "
+							+ trcEvent.getTimestamp());
+					return true;
+				}
+
+				if (irq == null) {
+					TraceDebug.debug("Field irq_id not found in event "
+							+ eventType.getInName() + " time: "
+							+ trcEvent.getTimestamp());
+					return true;
+				}
+
+				Map<Long, String> irq_names = traceSt.getIrq_names();
+
+				irq_names.put(irq, action);
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * Handle the event LTT_EVENT_REQUEST_ISSUE
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getBdevRequestIssueHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_REQUEST_ISSUE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				// Get Fields
+				Long major = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_MAJOR);
+				Long minor = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_MINOR);
+				Long operation = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_OPERATION);
+
+				// calculate bdevcode
+				Long devcode = mkdev(major, minor);
+
+				if (devcode == null) {
+					TraceDebug
+							.debug("incorrect calcualtion of bdevcode input( major: "
+									+ major
+									+ " minor: "
+									+ minor
+									+ " operation: " + operation);
+					return true;
+				}
+
+				Map<Long, LttngBdevState> bdev_states = traceSt
+						.getBdev_states();
+				// Get the instance
+				LttngBdevState bdevState = bdev_states.get(devcode);
+				if (bdevState == null) {
+					bdevState = new LttngBdevState();
+				}
+
+				// update the mode in the stack
+				if (operation == 0L) {
+					bdevState.pushToBdevStack(BdevMode.LTTV_BDEV_BUSY_READING);
+				} else {
+					bdevState.pushToBdevStack(BdevMode.LTTV_BDEV_BUSY_WRITING);
+				}
+
+				// make sure it is included in the set
+				bdev_states.put(devcode, bdevState);
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handling event: LTT_EVENT_REQUEST_COMPLETE
+	 * </p>
+	 * <p>
+	 * FIELDS(LTT_FIELD_MAJOR, LTT_FIELD_MINOR, LTT_FIELD_OPERATION
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getBdevRequestCompleteHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_REQUEST_COMPLETE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				// Get Fields
+				Long major = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_MAJOR);
+				Long minor = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_MINOR);
+				Long operation = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_OPERATION);
+
+				// calculate bdevcode
+				Long devcode = mkdev(major, minor);
+
+				if (devcode == null) {
+					TraceDebug
+							.debug("incorrect calcualtion of bdevcode input( major: "
+									+ major
+									+ " minor: "
+									+ minor
+									+ " operation: " + operation);
+					return true;
+				}
+
+				Map<Long, LttngBdevState> bdev_states = traceSt
+						.getBdev_states();
+				// Get the instance
+				LttngBdevState bdevState = bdev_states.get(devcode);
+				if (bdevState == null) {
+					bdevState = new LttngBdevState();
+				}
+
+				/* update block device */
+				bdev_pop_mode(bdevState);
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles event: LTT_EVENT_FUNCTION_ENTRY
+	 * </p>
+	 * <p>
+	 * FIELDS: LTT_FIELD_THIS_FN, LTT_FIELD_CALL_SITE
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getFunctionEntryHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_FUNCTION_ENTRY;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				Long cpu = trcEvent.getCpuId();
+				Long funcptr = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_THIS_FN);
+
+				push_function(traceSt, funcptr, cpu);
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getFunctionExitHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_FUNCTION_EXIT;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				Long funcptr = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_THIS_FN);
+
+				pop_function(traceSt, trcEvent, funcptr);
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * process event: LTT_EVENT_SYS_CALL_TABLE
+	 * </p>
+	 * <p>
+	 * fields: LTT_FIELD_ID, LTT_FIELD_ADDRESS, LTT_FIELD_SYMBOL
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getDumpSyscallHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SYS_CALL_TABLE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				// obtain the syscall id
+				Long id = getAFieldLong(trcEvent, traceSt, Fields.LTT_FIELD_ID);
+
+				// Long address = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_ADDRESS);
+
+				// Obtain the symbol
+				String symbol = getAFieldString(trcEvent, traceSt,
+						Fields.LTT_FIELD_SYMBOL);
+
+				// fill the symbol to the sycall_names collection
+				traceSt.getSyscall_names().put(id, symbol);
+
+				return false;
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles event: LTT_EVENT_KPROBE_TABLE
+	 * </p>
+	 * <p>
+	 * Fields: LTT_FIELD_IP, LTT_FIELD_SYMBOL
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getDumpKprobeHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_KPROBE_TABLE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				Long ip = getAFieldLong(trcEvent, traceSt, Fields.LTT_FIELD_IP);
+				String symbol = getAFieldString(trcEvent, traceSt,
+						Fields.LTT_FIELD_SYMBOL);
+
+				traceSt.getKprobe_table().put(ip, symbol);
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_SOFTIRQ_VEC
+	 * </p>
+	 * <p>
+	 * Fields: LTT_FIELD_ID, LTT_FIELD_ADDRESS, LTT_FIELD_SYMBOL
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getDumpSoftIrqHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SOFTIRQ_VEC;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				// Get id
+				Long id = getAFieldLong(trcEvent, traceSt, Fields.LTT_FIELD_ID);
+
+				// Address not needed
+				// Long address = ltt_event_get_long_unsigned(e,
+				// lttv_trace_get_hook_field(th,
+				// 1));
+
+				// Get symbol
+				String symbol = getAFieldString(trcEvent, traceSt,
+						Fields.LTT_FIELD_SYMBOL);
+
+				// Register the soft irq name
+				traceSt.getSoft_irq_names().put(id, symbol);
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_SCHED_SCHEDULE
+	 * </p>
+	 * <p>
+	 * Fields: LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getSchedChangeHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_SCHED_SCHEDULE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				Long cpu = trcEvent.getCpuId();
+				TmfTimestamp eventTime = trcEvent.getTimestamp();
+
+				LttngProcessState process = traceSt.getRunning_process().get(
+						cpu);
+
+				Long pid_out = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_PREV_PID);
+				Long pid_in = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_NEXT_PID);
+				Long state_out = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_PREV_STATE);
+
+				if (process != null) {
+
+					/*
+					 * We could not know but it was not the idle process
+					 * executing. This should only happen at the beginning,
+					 * before the first schedule event, and when the initial
+					 * information (current process for each CPU) is missing. It
+					 * is not obvious how we could, after the fact, compensate
+					 * the wrongly attributed statistics.
+					 */
+
+					// This test only makes sense once the state is known and if
+					// there
+					// is no
+					// missing events. We need to silently ignore schedchange
+					// coming
+					// after a
+					// process_free, or it causes glitches. (FIXME)
+					// if(unlikely(process->pid != pid_out)) {
+					// g_assert(process->pid == 0);
+					// }
+					if ((process.getPid().longValue() == 0L)
+							&& (process.getState().getExec_mode() == ExecutionMode.LTTV_STATE_MODE_UNKNOWN)) {
+						if ((pid_out != null) && (pid_out.longValue() == 0L)) {
+							/*
+							 * Scheduling out of pid 0 at beginning of the trace
+							 * : we know for sure it is in syscall mode at this
+							 * point.
+							 */
+
+							process.getState().setExec_mode(
+									ExecutionMode.LTTV_STATE_SYSCALL);
+							process.getState().setProc_status(
+									ProcessStatus.LTTV_STATE_WAIT);
+							process.getState().setChange_Time(
+									trcEvent.getTimestamp().getValue());
+							process.getState().setEntry_Time(
+									trcEvent.getTimestamp().getValue());
+						}
+					} else {
+						if (process.getState().getProc_status() == ProcessStatus.LTTV_STATE_EXIT) {
+							process.getState().setProc_status(
+									ProcessStatus.LTTV_STATE_ZOMBIE);
+							process.getState().setChange_Time(
+									trcEvent.getTimestamp().getValue());
+						} else {
+							if ((state_out != null)
+									&& (state_out.longValue() == 0L)) {
+								process.getState().setProc_status(
+										ProcessStatus.LTTV_STATE_WAIT_CPU);
+							} else {
+								process.getState().setProc_status(
+										ProcessStatus.LTTV_STATE_WAIT);
+							}
+
+							process.getState().setChange_Time(
+									trcEvent.getTimestamp().getValue());
+						}
+
+						if ((state_out != null)
+								&& (state_out == 32L || state_out == 64L)) { /*
+																			 * EXIT_DEAD
+																			 * ||
+																			 * TASK_DEAD
+																			 */
+							/* see sched.h for states */
+							if (!exit_process(traceSt, process)) {
+								process.getState().setProc_status(
+										ProcessStatus.LTTV_STATE_DEAD);
+								process.getState().setChange_Time(
+										trcEvent.getTimestamp().getValue());
+							}
+						}
+					}
+				}
+				process = lttv_state_find_process_or_create(traceSt, cpu,
+						pid_in, eventTime);
+
+				traceSt.getRunning_process().put(cpu, process);
+
+				process.getState().setProc_status(ProcessStatus.LTTV_STATE_RUN);
+				process.getState().setChange_Time(eventTime.getValue());
+				process.setCpu(cpu);
+				// process->state->s = LTTV_STATE_RUN;
+				// if(process->usertrace)
+				// process->usertrace->cpu = cpu;
+				// process->last_cpu_index =
+				// ltt_tracefile_num(((LttvTracefileContext*)s)->tf);
+
+				// process->state->change = s->parent.timestamp;
+
+				LTTngCPUState cpu_state = traceSt.getCpu_states().get(cpu);
+				/* update cpu status */
+				if ((pid_in != null) && (pid_in.longValue() == 0L)) {
+
+					/* going to idle task */
+					cpu_set_base_mode(cpu_state, CpuMode.LTTV_CPU_IDLE);
+				} else {
+					/*
+					 * scheduling a real task. we must be careful here: if we
+					 * just schedule()'ed to a process that is in a trap, we
+					 * must put the cpu in trap mode
+					 */
+					cpu_set_base_mode(cpu_state, CpuMode.LTTV_CPU_BUSY);
+					if (process.getState().getExec_mode() == ExecutionMode.LTTV_STATE_TRAP) {
+						cpu_push_mode(cpu_state, CpuMode.LTTV_CPU_TRAP);
+					}
+				}
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_PROCESS_FORK
+	 * </p>
+	 * <p>
+	 * Fields: FIELD_ARRAY(LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID,
+	 * LTT_FIELD_CHILD_TGID)
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getProcessForkHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_PROCESS_FORK;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				Long cpu = trcEvent.getCpuId();
+				LttngProcessState process = traceSt.getRunning_process().get(
+						cpu);
+				TmfTimestamp timeStamp = trcEvent.getTimestamp();
+
+				// /* Parent PID */
+				// Long parent_pid = getAFieldLong(trcEvent, traceSt,
+				// Fields.LTT_FIELD_PARENT_PID);
+
+				/* Child PID */
+				/* In the Linux Kernel, there is one PID per thread. */
+				Long child_pid = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_CHILD_PID);
+
+				/* Child TGID */
+				/* tgid in the Linux kernel is the "real" POSIX PID. */
+				Long child_tgid = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_CHILD_TGID);
+				if (child_tgid == null) {
+					child_tgid = 0L;
+				}
+
+				/*
+				 * Mathieu : it seems like the process might have been scheduled
+				 * in before the fork, and, in a rare case, might be the current
+				 * process. This might happen in a SMP case where we don't have
+				 * enough precision on the clocks.
+				 * 
+				 * Test reenabled after precision fixes on time. (Mathieu)
+				 */
+				// #if 0
+				// zombie_process = lttv_state_find_process(ts, ANY_CPU,
+				// child_pid);
+				//	
+				// if(unlikely(zombie_process != NULL)) {
+				// /* Reutilisation of PID. Only now we are sure that the old
+				// PID
+				// * has been released. FIXME : should know when release_task
+				// happens
+				// instead.
+				// */
+				// guint num_cpus = ltt_trace_get_num_cpu(ts->parent.t);
+				// guint i;
+				// for(i=0; i< num_cpus; i++) {
+				// g_assert(zombie_process != ts->running_process[i]);
+				// }
+				//	
+				// exit_process(s, zombie_process);
+				// }
+				// #endif //0
+
+				if (process.getPid().equals(child_pid)) {
+					TraceDebug
+							.debug("Unexpected, process pid equal to child pid: "
+									+ child_pid
+									+ " Event Time: "
+									+ trcEvent.getTimestamp());
+				}
+
+				// g_assert(process->pid != child_pid);
+				// FIXME : Add this test in the "known state" section
+				// g_assert(process->pid == parent_pid);
+				LttngProcessState child_process = lttv_state_find_process(
+						traceSt, ANY_CPU, child_pid);
+				if (child_process == null) {
+					child_process = create_process(traceSt, cpu, child_pid,
+							child_tgid, timeStamp);
+					child_process.setPpid(process.getPid(), timeStamp.getValue());
+				} else {
+					/*
+					 * The process has already been created : due to time
+					 * imprecision between multiple CPUs : it has been scheduled
+					 * in before creation. Note that we shouldn't have this kind
+					 * of imprecision.
+					 * 
+					 * Simply put a correct parent.
+					 */
+					StringBuilder sb = new StringBuilder("Process " + child_pid);
+					sb.append(" has been created at ["
+							+ child_process.getCreation_time() + "] ");
+					sb.append("and inserted at ["
+							+ child_process.getInsertion_time() + "] ");
+					sb.append("before \nfork on cpu " + cpu + " Event time: ["
+							+ trcEvent + "]\n.");
+					sb
+							.append("Probably an unsynchronized TSD problem on the traced machine.");
+					TraceDebug.debug(sb.toString());
+
+					// g_assert(0); /* This is a problematic case : the process
+					// has
+					// beencreated
+					// before the fork event */
+					child_process.setPpid(process.getPid());
+					child_process.setTgid(child_tgid);
+				}
+
+				if (!child_process.getName().equals(
+						ProcessStatus.LTTV_STATE_UNNAMED.getInName())) {
+					TraceDebug.debug("Unexpected child process status: "
+							+ child_process.getName());
+				}
+
+				child_process.setName(process.getName());
+				child_process.setBrand(process.getBrand());
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_KTHREAD_CREATE
+	 * </p>
+	 * <p>
+	 * Fields: LTT_FIELD_PID
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getProcessKernelThreadHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_KTHREAD_CREATE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+				/*
+				 * We stamp a newly created process as kernel_thread. The thread
+				 * should not be running yet.
+				 */
+
+				LttngExecutionState exState;
+				Long pid;
+				LttngProcessState process;
+
+				/* PID */
+				pid = getAFieldLong(trcEvent, traceSt, Fields.LTT_FIELD_PID);
+				// s->parent.target_pid = pid;
+
+				process = lttv_state_find_process_or_create(traceSt, ANY_CPU,
+						pid, new TmfTimestamp());
+
+				if (!process.getState().getProc_status().equals(
+						ProcessStatus.LTTV_STATE_DEAD)) {
+					// Leave only the first element in the stack with execution
+					// mode to
+					// syscall
+					exState = process.getFirstElementFromExecutionStack();
+					exState.setExec_mode(ExecutionMode.LTTV_STATE_SYSCALL);
+					process.clearExecutionStack();
+					process.pushToExecutionStack(exState);
+				}
+
+				process.setType(ProcessType.LTTV_STATE_KERNEL_THREAD);
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_PROCESS_EXIT
+	 * </p>
+	 * <p>
+	 * LTT_FIELD_PID
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getProcessExitHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_PROCESS_EXIT;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				Long pid;
+				LttngProcessState process;
+
+				pid = getAFieldLong(trcEvent, traceSt, Fields.LTT_FIELD_PID);
+				// s->parent.target_pid = pid;
+
+				// FIXME : Add this test in the "known state" section
+				// g_assert(process->pid == pid);
+
+				process = lttv_state_find_process(traceSt, ANY_CPU, pid);
+				if (process != null) {
+					process.getState().setProc_status(
+							ProcessStatus.LTTV_STATE_EXIT);
+				}
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_PROCESS_FREE
+	 * </p>
+	 * <p>
+	 * Fields: LTT_FIELD_PID
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getProcessFreeHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_PROCESS_FREE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				Long release_pid;
+				LttngProcessState process;
+
+				/* PID of the process to release */
+				release_pid = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_PID);
+				// s->parent.target_pid = release_pid;
+
+				if ((release_pid != null) && (release_pid.longValue() == 0L)) {
+					TraceDebug.debug("Unexpected release_pid: 0, Event time: "
+							+ trcEvent.getTimestamp());
+				}
+
+				process = lttv_state_find_process(traceSt, ANY_CPU, release_pid);
+				if (process != null) {
+					exit_process(traceSt, process);
+				}
+
+				return false;
+				// DISABLED
+				// if(process != null) {
+				/*
+				 * release_task is happening at kernel level : we can now safely
+				 * release the data structure of the process
+				 */
+				// This test is fun, though, as it may happen that
+				// at time t : CPU 0 : process_free
+				// at time t+150ns : CPU 1 : schedule out
+				// Clearly due to time imprecision, we disable it. (Mathieu)
+				// If this weird case happen, we have no choice but to put the
+				// Currently running process on the cpu to 0.
+				// I re-enable it following time precision fixes. (Mathieu)
+				// Well, in the case where an process is freed by a process on
+				// another
+				// CPU
+				// and still scheduled, it happens that this is the schedchange
+				// that
+				// will
+				// drop the last reference count. Do not free it here!
+
+				// int num_cpus = ltt_trace_get_num_cpu(ts->parent.t);
+				// guint i;
+				// for(i=0; i< num_cpus; i++) {
+				// //g_assert(process != ts->running_process[i]);
+				// if(process == ts->running_process[i]) {
+				// //ts->running_process[i] = lttv_state_find_process(ts, i, 0);
+				// break;
+				// }
+				// }
+				// if(i == num_cpus) /* process is not scheduled */
+				// exit_process(s, process);
+				// }
+				//	
+				// return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_EXEC
+	 * </p>
+	 * <p>
+	 * FIELDS: LTT_FIELD_FILENAME
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getProcessExecHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_EXEC;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				Long cpu = trcEvent.getCpuId();
+				LttngProcessState process = traceSt.getRunning_process().get(
+						cpu);
+
+				// #if 0//how to use a sequence that must be transformed in a
+				// string
+				// /* PID of the process to release */
+				// guint64 name_len = ltt_event_field_element_number(e,
+				// lttv_trace_get_hook_field(th, 0));
+				// //name = ltt_event_get_string(e,
+				// lttv_trace_get_hook_field(th, 0));
+				// LttField *child = ltt_event_field_element_select(e,
+				// lttv_trace_get_hook_field(th, 0), 0);
+				// gchar *name_begin =
+				// (gchar*)(ltt_event_data(e)+ltt_event_field_offset(e, child));
+				// gchar *null_term_name = g_new(gchar, name_len+1);
+				// memcpy(null_term_name, name_begin, name_len);
+				// null_term_name[name_len] = '\0';
+				// process->name = g_quark_from_string(null_term_name);
+				// #endif //0
+
+				process.setName(getAFieldString(trcEvent, traceSt,
+						Fields.LTT_FIELD_FILENAME));
+				process.setBrand(StateStrings.LTTV_STATE_UNBRANDED);
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * LTT_EVENT_THREAD_BRAND
+	 * </p>
+	 * <p>
+	 * FIELDS: LTT_FIELD_NAME
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing GetThreadBrandHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_THREAD_BRAND;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				String name;
+				Long cpu = trcEvent.getCpuId();
+				LttngProcessState process = traceSt.getRunning_process().get(
+						cpu);
+
+				name = getAFieldString(trcEvent, traceSt, Fields.LTT_FIELD_NAME);
+				process.setBrand(name);
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * @return
+	 */
+	final IEventProcessing getStateDumpEndHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_STATEDUMP_END;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				/* For all processes */
+				/*
+				 * if kernel thread, if stack[0] is unknown, set to syscall
+				 * mode, wait
+				 */
+				/* else, if stack[0] is unknown, set to user mode, running */
+				LttngProcessState[] processes = traceSt.getProcesses();
+				TmfTimestamp time = trcEvent.getTimestamp();
+				
+				for (int pos = 0; pos < processes.length; pos++) {
+					fix_process(processes[pos], time);
+				}
+				
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+
+			/**
+			 * Private method used to establish the first execution state in the
+			 * stack for a given process
+			 * 
+			 * @param process
+			 * @param timestamp
+			 */
+			private void fix_process(LttngProcessState process,
+					TmfTimestamp timestamp) {
+
+				LttngExecutionState es;
+
+				if (process.getType() == ProcessType.LTTV_STATE_KERNEL_THREAD) {
+					es = process.getFirstElementFromExecutionStack();
+
+					if (es.getExec_mode() == ExecutionMode.LTTV_STATE_MODE_UNKNOWN) {
+						es.setExec_mode(ExecutionMode.LTTV_STATE_SYSCALL);
+						es
+								.setExec_submode(ExecutionSubMode.LTTV_STATE_SUBMODE_NONE
+										.getInName());
+						es.setEntry_Time(timestamp.getValue());
+						es.setChange_Time(timestamp.getValue());
+						es.setCum_cpu_time(0L);
+						if (es.getProc_status() == ProcessStatus.LTTV_STATE_UNNAMED) {
+							es.setProc_status(ProcessStatus.LTTV_STATE_WAIT);
+						}
+					}
+				} else {
+					es = process.getFirstElementFromExecutionStack();
+					if (es.getExec_mode() == ExecutionMode.LTTV_STATE_MODE_UNKNOWN) {
+						es.setExec_mode(ExecutionMode.LTTV_STATE_USER_MODE);
+						es
+								.setExec_submode(ExecutionSubMode.LTTV_STATE_SUBMODE_NONE
+										.getInName());
+						es.setEntry_Time(timestamp.getValue());
+						es.setChange_Time(timestamp.getValue());
+						es.setCum_cpu_time(0L);
+						if (es.getProc_status() == ProcessStatus.LTTV_STATE_UNNAMED) {
+							es.setProc_status(ProcessStatus.LTTV_STATE_RUN);
+						}
+
+						// If the first element is also the one on top... mean
+						// we have ONE element on the stack
+						if (process.getFirstElementFromExecutionStack() == process
+								.peekFromExecutionStack()) {
+							/*
+							 * Still in bottom unknown mode, means never did a
+							 * system call May be either in user mode, syscall
+							 * mode, running or waiting.
+							 */
+							/*
+							 * FIXME : we may be tagging syscall mode when being
+							 * user mode
+							 */
+							// Get a new execution State
+							es = new LttngExecutionState();
+
+							// initialize values
+							es.setExec_mode(ExecutionMode.LTTV_STATE_SYSCALL);
+							es
+									.setExec_submode(ExecutionSubMode.LTTV_STATE_SUBMODE_NONE
+											.getInName());
+							es.setEntry_Time(timestamp.getValue());
+							es.setChange_Time(timestamp.getValue());
+							es.setCum_cpu_time(0L);
+							es.setProc_status(ProcessStatus.LTTV_STATE_WAIT);
+
+							// Push the new state to the stack
+							process.pushToExecutionStack(es);
+						}
+					}
+				}
+			}
+		};
+		return handler;
+	}
+
+	/**
+	 * <p>
+	 * Handles: LTT_EVENT_PROCESS_STATE
+	 * </p>
+	 * <p>
+	 * FIELDS: LTT_FIELD_PID, LTT_FIELD_PARENT_PID, LTT_FIELD_NAME,
+	 * LTT_FIELD_TYPE, LTT_FIELD_MODE, LTT_FIELD_SUBMODE, LTT_FIELD_STATUS,
+	 * LTT_FIELD_TGID
+	 * </p>
+	 * 
+	 * @return
+	 */
+	final IEventProcessing getEnumProcessStateHandler() {
+		AbsStateUpdate handler = new AbsStateUpdate() {
+
+			private Events eventType = Events.LTT_EVENT_PROCESS_STATE;
+
+			// @Override
+			public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) {
+
+				Long parent_pid;
+				Long pid;
+				Long tgid;
+				String command;
+				Long cpu = trcEvent.getCpuId();
+				
+				LttngProcessState process = traceSt.getRunning_process().get(
+						cpu);
+				LttngProcessState parent_process;
+				String type;
+				// String mode, submode, status;
+				LttngExecutionState es;
+				
+				/* PID */
+				pid = getAFieldLong(trcEvent, traceSt, Fields.LTT_FIELD_PID);
+
+				/* Parent PID */
+				parent_pid = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_PARENT_PID);
+
+				/* Command name */
+				command = getAFieldString(trcEvent, traceSt,
+						Fields.LTT_FIELD_NAME);
+
+				Long typeVal = getAFieldLong(trcEvent, traceSt,
+						Fields.LTT_FIELD_TYPE);
+
+				type = ProcessType.LTTV_STATE_KERNEL_THREAD.getInName();
+				if ((typeVal != null) && (typeVal.longValue() == 0L)) {
+					type = ProcessType.LTTV_STATE_USER_THREAD.getInName();
+				}
+
+				// /* mode */
+				// mode = getAFieldString(trcEvent, traceSt,
+				// Fields.LTT_FIELD_MODE);
+				//
+				// /* submode */
+				// submode = getAFieldString(trcEvent, traceSt,
+				// Fields.LTT_FIELD_SUBMODE);
+				//
+				// /* status */
+				// status = getAFieldString(trcEvent, traceSt,
+				// Fields.LTT_FIELD_STATUS);
+
+				/* TGID */
+				tgid = getAFieldLong(trcEvent, traceSt, Fields.LTT_FIELD_TGID);
+				if (tgid == null) {
+					tgid = 0L;
+				}
+
+				if ((pid != null) && (pid.longValue() == 0L)) {
+					for (Long acpu : traceSt.getCpu_states().keySet()) {
+						process = lttv_state_find_process(traceSt, acpu, pid);
+						if (process != null) {
+							process.setPpid(parent_pid);
+							process.setTgid(tgid);
+							process.setName(command);
+							process
+									.setType(ProcessType.LTTV_STATE_KERNEL_THREAD);
+						} else {
+							StringBuilder sb = new StringBuilder(
+									"Unexpected, null process read from the TraceState list of processes, event time: "
+											+ trcEvent.getTimestamp());
+							TraceDebug.debug(sb.toString());
+						}
+					}
+				} else {
+					/*
+					 * The process might exist if a process was forked while
+					 * performing the state dump.
+					 */
+					process = lttv_state_find_process(traceSt, ANY_CPU, pid);
+					if (process == null) {
+						parent_process = lttv_state_find_process(traceSt,
+								ANY_CPU, parent_pid);
+						TmfTimestamp eventTime = trcEvent.getTimestamp();
+						process = create_process(traceSt, cpu, pid, tgid,
+								command, eventTime);
+						if (parent_process != null) {
+							process.setPpid(parent_process.getPid(), eventTime.getValue());
+						}
+
+						/* Keep the stack bottom : a running user mode */
+						/*
+						 * Disabled because of inconsistencies in the current
+						 * statedump states.
+						 */
+						if (type.equals(ProcessType.LTTV_STATE_KERNEL_THREAD
+								.getInName())) {
+							/*
+							 * FIXME Kernel thread : can be in syscall or
+							 * interrupt or trap.
+							 */
+							/*
+							 * Will cause expected trap when in fact being
+							 * syscall (even after end of statedump event) Will
+							 * cause expected interrupt when being syscall.
+							 * (only before end of statedump event)
+							 */
+							// process type is USER_THREAD by default.
+							process
+									.setType(ProcessType.LTTV_STATE_KERNEL_THREAD);
+
+						}
+						
+						//Only one entry needed in the execution stack
+						process.popFromExecutionStack();
+						es = process.getState();
+						es.setExec_mode(ExecutionMode.LTTV_STATE_MODE_UNKNOWN);
+						es.setProc_status(ProcessStatus.LTTV_STATE_UNNAMED);
+						es
+								.setExec_submode(ExecutionSubMode.LTTV_STATE_SUBMODE_UNKNOWN
+										.getInName());
+						// #if 0
+						// /* UNKNOWN STATE */
+						// {
+						// es = process->state =
+						// &g_array_index(process->execution_stack,
+						// LttvExecutionState, 1);
+						// es->t = LTTV_STATE_MODE_UNKNOWN;
+						// es->s = LTTV_STATE_UNNAMED;
+						// es->n = LTTV_STATE_SUBMODE_UNKNOWN;
+						// }
+						// #endif //0
+					} else {
+						/*
+						 * The process has already been created : Probably was
+						 * forked while dumping the process state or was simply
+						 * scheduled in prior to get the state dump event.
+						 */
+						process.setPpid(parent_pid);
+						process.setTgid(tgid);
+						process.setName(command);
+						if (type.equals(ProcessType.LTTV_STATE_KERNEL_THREAD
+								.getInName())) {
+							process
+									.setType(ProcessType.LTTV_STATE_KERNEL_THREAD);
+						} else {
+							process.setType(ProcessType.LTTV_STATE_USER_THREAD);
+						}
+
+						// es =
+						// &g_array_index(process->execution_stack,
+						// LttvExecutionState,
+						// 0);
+						// #if 0
+						// if(es->t == LTTV_STATE_MODE_UNKNOWN) {
+						// if(type == LTTV_STATE_KERNEL_THREAD)
+						// es->t = LTTV_STATE_SYSCALL;
+						// else
+						// es->t = LTTV_STATE_USER_MODE;
+						// }
+						// #endif //0
+						/*
+						 * Don't mess around with the stack, it will eventually
+						 * become ok after the end of state dump.
+						 */
+					}
+				}
+
+				return false;
+
+			}
+
+			// @Override
+			public Events getEventHandleType() {
+				return eventType;
+			}
+		};
+		return handler;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManager.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManager.java
new file mode 100644
index 0000000..e6c5415
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManager.java
@@ -0,0 +1,159 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.state.experiment;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.state.IStateDataRequestListener;
+import org.eclipse.linuxtools.lttng.state.StateManager;
+import org.eclipse.linuxtools.tmf.component.TmfComponent;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
+import org.eclipse.linuxtools.tmf.experiment.TmfExperimentSelectedSignal;
+import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler;
+
+/**
+ * @author alvaro
+ * 
+ */
+public class StateExperimentManager extends TmfComponent {
+	
+	// ========================================================================
+	// Data
+	// =======================================================================
+	
+	private final Map<String, StateManager> managersByID = new HashMap<String, StateManager>();
+	private TmfExperiment<LttngEvent> fExperiment = null; // one experiment supported
+
+	// ========================================================================
+	// Constructors
+	// =======================================================================
+
+	/**
+	 * package level constructor, creation from factory
+	 */
+	StateExperimentManager() {
+		super("StateExperimentManager");
+	}
+
+	// ========================================================================
+	// Methods
+	// =======================================================================
+
+	/**
+	 * Return the Map of unique id to Manager instance
+	 * 
+	 * @return
+	 */
+	public Map<String, StateManager> getManagersByID() {
+		return managersByID;
+	}
+
+	/**
+	 * Read all available traces from the nearest checkpoint from start position
+	 * to the end of a specified time range
+	 * 
+	 * @param trange
+	 * @param obs
+	 * @param transactionID
+	 * @param display
+	 */
+	public void readExperimentTimeWindow(TmfTimeRange trange,
+			String transactionID, IStateDataRequestListener listener) {
+		if (fExperiment != null) {
+			String id = fExperiment.getName();
+			StateManager manager = managersByID.get(id);
+			if (manager != null) {
+				// TODO: A loop to request data for each trace needs to be used
+				// here when multiple traces are supported.
+				manager.executeDataRequest(trange, transactionID, listener);
+			}
+		}
+	}
+
+	public void readExperiment(String transactionID,
+			IStateDataRequestListener listener) {
+		// Need someone to listen to the updates as well as an fExperiment
+		// loaded.
+		if (listener != null && fExperiment != null) {
+			TmfTimeRange trange = fExperiment.getTimeRange();
+			String experimentId = fExperiment.getName();
+
+			// FIXME: there should be an id field available at the trace level
+			// to be fixed with the support of multiple files.
+			// We also need to iterate over the traces in the Experiment and
+			// execute a data Request on each of them
+			// This is also on hold till the request can be performed at a trace
+			// level.
+			// ITmfTrace[] fTraces = fExperiment.getTraces();
+			// for (int i=0; i < fTraces.length; i++) {
+			StateManager manager = StateManagerFactory.getManager(experimentId);
+			manager.executeDataRequest(trange, transactionID, listener);
+			// }
+		}
+	}
+	
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.linuxtools.tmf.eventlog.ITmfEventLogEventListener#handleEvent
+	 * (org.eclipse.linuxtools.tmf.eventlog.ITmfEventLogEvent)
+	 */
+	@SuppressWarnings("unchecked")
+	@TmfSignalHandler
+	public void experimentSelected(TmfExperimentSelectedSignal<LttngEvent> signal) {
+		// TmfExperiment experiment = signal.getExperiment();
+		// ITmfTrace[] traces = experiment.getTraces();
+		// for (ITmfTrace trace : traces) {
+		//			
+		// }
+		if (signal != null) {
+			fExperiment = (TmfExperiment<LttngEvent>) signal.getExperiment();
+			traceSelected(fExperiment);
+		}
+	}
+
+	/**
+	 * A new Experiment selected, notification received from the framework
+	 * Notify the new log selection to the state handling managers
+	 * 
+	 * @param experiment
+	 */
+	private void traceSelected(TmfExperiment<LttngEvent> experiment) {
+		// TODO: Re-factor when multiple traces are supported
+		// traceId, as well as when the request can be specified at the trace
+		// level
+		// For the moment it does work for only one trace per experiment.
+		String experimentId = experiment.getName();
+		StateManager manager = StateManagerFactory.getManager(experimentId);
+		// TODO: clearAllData shall not be applied to all manager calls below
+		// since that would clean all data loaded within previous iterations in
+		// the future loop. i.e. It can be applied to first manager in the loop.
+		boolean clearAllData = true;
+		manager.setTraceSelection(experiment, clearAllData);
+	}
+
+	/**
+	 * @return
+	 */
+	public TmfTimeRange getExperimentTimeRange() {
+		TmfTimeRange timeRangeResult = null;
+		if (fExperiment != null) {
+			timeRangeResult = fExperiment.getTimeRange();
+		}
+		return timeRangeResult;
+	}
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/experiment/StateManagerFactory.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/experiment/StateManagerFactory.java
new file mode 100644
index 0000000..0d6a52d
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/experiment/StateManagerFactory.java
@@ -0,0 +1,106 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.state.experiment;
+
+import java.util.Map;
+
+import org.eclipse.linuxtools.lttng.state.StateManager;
+import org.eclipse.linuxtools.lttng.state.StateStacksHandler;
+import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.state.model.StateModelFactory;
+
+/**
+ * @author alvaro
+ * 
+ */
+public class StateManagerFactory {
+	// ========================================================================
+	// Data
+	// =======================================================================
+
+	private static StateExperimentManager experimentManager = null;
+	private static Map<String, StateManager> instanceBook = null;
+
+	// ========================================================================
+	// Methods
+	// =======================================================================
+
+	/**
+	 * Provide a stateManager instance per trace
+	 * 
+	 * @return
+	 */
+	public static StateManager getManager(String traceUniqueId) {
+
+		if (traceUniqueId == null) {
+			return null;
+		}
+
+		initCheck();
+
+		if (instanceBook.containsKey(traceUniqueId)) {
+			return instanceBook.get(traceUniqueId);
+		}
+
+		LttngTraceState traceModel = StateModelFactory.getStateEntryInstance();
+		StateStacksHandler stateInputHandler = new StateStacksHandler(
+				traceModel);
+		StateManager manager = new StateManager(stateInputHandler);
+
+		instanceBook.put(traceUniqueId, manager);
+		return manager;
+	}
+
+	/**
+	 * Provide the State trace set manager
+	 * 
+	 * @return
+	 */
+	public static StateExperimentManager getExperimentManager() {
+		initCheck();
+		return experimentManager;
+	}
+
+	/**
+	 * Remove previously registered managers
+	 * 
+	 * @param traceUniqueId
+	 */
+	public static void removeManager(String traceUniqueId) {
+		initCheck();
+		if (traceUniqueId != null && instanceBook.containsKey(traceUniqueId)) {
+			instanceBook.remove(traceUniqueId);
+		}
+	}
+
+	/**
+	 * initialization of factory
+	 */
+	private static void initCheck() {
+		if (experimentManager == null) {
+			experimentManager = new StateExperimentManager();
+			instanceBook = experimentManager.getManagersByID();
+		}
+	}
+
+	/**
+	 * Clea up resources
+	 */
+	public static void dispose() {
+		if (experimentManager != null) {
+			experimentManager.deregister();
+			experimentManager = null;
+			instanceBook = null;
+		}
+	}
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/ILttngStateInputRef.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/ILttngStateInputRef.java
new file mode 100644
index 0000000..51584f5
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/ILttngStateInputRef.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.state.model;
+
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+
+/**
+ * <b><u>ILttngStateModelInput</u></b>
+ * <p>Interface providing the data needed by the State model
+ * 
+ */
+
+/**
+ * @author alvaro
+ *
+ */
+public interface ILttngStateInputRef {
+	
+	public int getNumberOfCpus();
+	public TmfTimeRange getTraceTimeWindow();
+	public String getTraceId();
+	public TmfTimeRange getExperimentTimeWindow();
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LTTngCPUState.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LTTngCPUState.java
new file mode 100644
index 0000000..c744b0e
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LTTngCPUState.java
@@ -0,0 +1,178 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.state.model;
+
+import java.util.Stack;
+
+import org.eclipse.linuxtools.lttng.state.StateStrings;
+import org.eclipse.linuxtools.lttng.state.StateStrings.CpuMode;
+
+/**
+ * <b><u>LTTngCPUState</u></b>
+ * <p>
+ * 
+ */
+public class LTTngCPUState implements Cloneable {
+	// ========================================================================
+	// Data
+	// =======================================================================
+	private Stack<StateStrings.CpuMode> mode_stack = new Stack<StateStrings.CpuMode>();
+	private Stack<Long> irq_stack = new Stack<Long>();
+	private Stack<Long> softirq_stack = new Stack<Long>();
+	private Stack<Long> trap_stack = new Stack<Long>();
+
+	// ========================================================================
+	// Constructor
+	// =======================================================================
+	public LTTngCPUState() {
+		mode_stack.push(CpuMode.LTTV_CPU_UNKNOWN);
+		irq_stack.push(-1L);
+		softirq_stack.push(-1L);
+		trap_stack.push(-1L);
+	}
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public LTTngCPUState clone() {
+		LTTngCPUState newState = null;
+
+		try {
+			newState = (LTTngCPUState) super.clone();
+
+			// // *** IMPORTANT ***
+			// // Basic type in java are immutable!
+			// // Thus, using assignation ("=") on basic type is CORRECT,
+			// // but we should ALWAYS use "new" or "clone()" on "non basic"
+			// type
+
+			// Clone should work correctly for all stack object that contain
+			// basic java object (String, Long, etc...)
+			newState.mode_stack = (Stack<StateStrings.CpuMode>) this.mode_stack
+					.clone();
+			newState.irq_stack = (Stack<Long>) this.irq_stack.clone();
+			newState.softirq_stack = (Stack<Long>) this.softirq_stack.clone();
+			newState.trap_stack = (Stack<Long>) this.trap_stack.clone();
+		} catch (CloneNotSupportedException e) {
+			System.out.println("Cloning failed with : " + e.getMessage());
+		}
+
+		return newState;
+	}
+
+	// ========================================================================
+	// Methods
+	public void clearAndSetBaseToCpuStack(StateStrings.CpuMode newCpuMode) {
+		mode_stack.clear();
+		irq_stack.clear();
+		softirq_stack.clear();
+		trap_stack.clear();
+
+		// Ensure that there is always at least 1 item in the stack
+		mode_stack.push(newCpuMode);
+		irq_stack.push(-1L);
+		softirq_stack.push(-1L);
+		trap_stack.push(-1L);
+	}
+
+	// Push to stacks
+	public void pushToCpuStack(StateStrings.CpuMode newCpuMode) {
+		mode_stack.push(newCpuMode);
+	}
+
+	public void pushToIrqStack(Long irqID) {
+		irq_stack.push(irqID);
+	}
+
+	public void pushToSoftIrqStack(Long softIrqID) {
+		softirq_stack.push(softIrqID);
+	}
+
+	public void pushToTrapStack(Long trapID) {
+		trap_stack.push(trapID);
+	}
+
+	// Pop from stacks
+	public StateStrings.CpuMode popFromCpuStack() {
+
+		StateStrings.CpuMode returnedMode = mode_stack.pop();
+
+		if (mode_stack.size() < 1) {
+			// Ensure that there is always at least 1 item in the stack
+			mode_stack.push(StateStrings.CpuMode.LTTV_CPU_UNKNOWN);
+		}
+
+		return returnedMode;
+
+	}
+
+	public Long popFromIrqStack() {
+		Long irq = irq_stack.pop();
+
+		if (irq_stack.size() < 1) {
+			// make sure the stack is not empty
+			irq_stack.push(-1L);
+		}
+		return irq;
+	}
+
+	public Long popFromSoftIrqStack() {
+		Long softirq = softirq_stack.pop();
+
+		if (softirq_stack.size() < 1) {
+			// make sure the stack is not empty
+			softirq_stack.push(-1L);
+		}
+		return softirq;
+	}
+
+	public Long popFromTrapStack() {
+		Long trap = trap_stack.pop();
+
+		if (trap_stack.size() < 1) {
+			// make sure the stack is not empty
+			trap_stack.push(-1L);
+		}
+		return trap;
+	}
+
+	// Peek from stacks
+	public StateStrings.CpuMode peekFromCpuStack() {
+		return mode_stack.peek();
+	}
+
+	public Long peekFromIrqStack() {
+		return irq_stack.peek();
+	}
+
+	public Long peekFromSoftIrqStack() {
+		return softirq_stack.peek();
+	}
+
+	public Long peekFromTrapStack() {
+		return trap_stack.peek();
+	}
+	
+
+	public void reset() {
+		mode_stack.clear();
+		irq_stack.clear();
+		softirq_stack.clear();
+		trap_stack.clear();
+
+		// Ensure that there is always at least 1 item in the stack
+		mode_stack.push(CpuMode.LTTV_CPU_UNKNOWN);
+		irq_stack.push(-1L);
+		softirq_stack.push(-1L);
+		trap_stack.push(-1L);
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngBdevState.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngBdevState.java
new file mode 100644
index 0000000..808b94d
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngBdevState.java
@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.state.model;
+
+import java.util.Stack;
+
+import org.eclipse.linuxtools.lttng.TraceDebug;
+import org.eclipse.linuxtools.lttng.state.StateStrings.BdevMode;
+
+/**
+ * <b><u>LttvBdevState</u></b>
+ * <p>
+ *
+ */
+public class LttngBdevState implements Cloneable {
+    // ========================================================================
+	// Data
+    // =======================================================================
+	private Stack<BdevMode> mode_stack = new Stack<BdevMode>() ;
+
+	
+    // ========================================================================
+	// Constructor
+    // =======================================================================
+	public LttngBdevState() {
+		mode_stack.push(BdevMode.LTTV_BDEV_UNKNOWN);
+	}
+	
+	// ========================================================================
+	// Methods
+	// =======================================================================
+	public void clearBdevStack() {
+        mode_stack.clear();
+    }
+	
+	public void clearAndSetBaseToBdevStack(BdevMode newState) {
+        mode_stack.clear();
+        // Ensure that there is always at least 1 item in the stack
+        mode_stack.push(newState);
+    }
+    
+    public void pushToBdevStack(BdevMode newState) {
+        mode_stack.push(newState);
+    }
+    
+    public BdevMode popFromBdevStack() {
+        
+       BdevMode returnedMode = mode_stack.pop();
+        
+       if (mode_stack.size() < 1) {
+            TraceDebug.debug("Removing last item from mode stack is not allowed! (popFromModeStack)");
+            mode_stack.push(BdevMode.LTTV_BDEV_UNKNOWN);
+       }
+       
+       return returnedMode;
+    }
+    
+    public BdevMode peekFromBdevStack() {
+        return mode_stack.peek();
+    }
+	
+    
+	@Override
+	@SuppressWarnings("unchecked")
+    public LttngBdevState clone() {
+	    LttngBdevState newState = null;
+	    
+	    try {
+	        newState = (LttngBdevState)super.clone();
+	        // Clone should work correctly for all stack object that contain basic java object (String, Long, etc...)
+	        newState.mode_stack = (Stack<BdevMode>)this.mode_stack.clone();
+	    }
+	    catch ( CloneNotSupportedException e ) {
+	        System.out.println("Cloning failed with : " + e.getMessage() );
+	    }
+	    
+	    return newState;
+	}
+	
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngExecutionState.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngExecutionState.java
new file mode 100644
index 0000000..4a19227
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngExecutionState.java
@@ -0,0 +1,152 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.state.model;
+
+import org.eclipse.linuxtools.lttng.state.StateStrings;
+
+/**
+ * <b><u>LttngExecutionState</u></b>
+ * <p>
+ * 
+ */
+public class LttngExecutionState implements Cloneable {
+	// ========================================================================
+	// Data
+	// =======================================================================
+	private Long entry_LttTime = null;
+	private Long change_LttTime = null;
+	private Long cum_cpu_time_Timens = null;
+	
+	private StateStrings.ProcessStatus proc_status = StateStrings.ProcessStatus.LTTV_STATE_UNNAMED;
+	private StateStrings.ExecutionMode exec_mode = StateStrings.ExecutionMode.LTTV_STATE_MODE_UNKNOWN;
+	private String exec_submode = StateStrings.ExecutionSubMode.LTTV_STATE_SUBMODE_UNKNOWN.getInName();
+	
+    @Override
+	public LttngExecutionState clone() {
+	    LttngExecutionState newState = null;
+        
+        try {
+            newState = (LttngExecutionState)super.clone();
+            
+            // *** IMPORTANT ***
+            // Basic type in java are immutable! 
+            // Thus, using assignation ("=") on basic type is CORRECT, 
+            //  but we should ALWAYS use "new" or "clone()" on "non basic" type
+            newState.cum_cpu_time_Timens = this.cum_cpu_time_Timens;
+            newState.exec_submode = this.exec_submode;
+            
+            // ProcessStatus and ExecutionMode are enum, and so shouldn't be a problem to use their reference
+            newState.proc_status = this.proc_status;
+            newState.exec_mode = this.exec_mode;
+            newState.entry_LttTime = this.entry_LttTime;
+            newState.change_LttTime = this.change_LttTime;
+        }
+        catch ( CloneNotSupportedException e ) {
+            System.out.println("Cloning failed with : " + e.getMessage() );
+        }
+        
+        return newState;
+    }
+	
+	// ========================================================================
+	// Methods
+	// =======================================================================
+	/**
+	 * @return the entry_LttTime
+	 */
+	public Long getEntry_LttTime() {
+		return entry_LttTime;
+	}
+
+	/**
+	 * @param entryLttTime
+	 *            the entry_LttTime to set
+	 */
+	public void setEntry_Time(Long entryLttTime) {
+		entry_LttTime = entryLttTime;
+	}
+
+	/**
+	 * @return the change_LttTime
+	 */
+	public Long getChange_LttTime() {
+		return change_LttTime;
+	}
+
+	/**
+	 * @param changeLttTime
+	 *            the change_LttTime to set
+	 */
+	public void setChange_Time(Long changeLttTime) {
+		change_LttTime = changeLttTime;
+	}
+
+	/**
+	 * @return the cum_cpu_time_LttTime
+	 */
+	public Long getCum_cpu_time() {
+		return cum_cpu_time_Timens;
+	}
+
+	/**
+	 * @param cumCpuTimeLttTime
+	 *            the cum_cpu_time_LttTime to set
+	 */
+	public void setCum_cpu_time(Long cumCpuTime) {
+		cum_cpu_time_Timens = cumCpuTime;
+	}
+
+	/**
+	 * @return the proc_status
+	 */
+	public StateStrings.ProcessStatus getProc_status() {
+		return proc_status;
+	}
+
+	/**
+	 * @param procStatus
+	 *            the proc_status to set
+	 */
+	public void setProc_status(StateStrings.ProcessStatus procStatus) {
+		proc_status = procStatus;
+	}
+
+	/**
+	 * @return the exec_mode
+	 */
+	public StateStrings.ExecutionMode getExec_mode() {
+		return exec_mode;
+	}
+
+	/**
+	 * @param execMode
+	 *            the exec_mode to set
+	 */
+	public void setExec_mode(StateStrings.ExecutionMode execMode) {
+		exec_mode = execMode;
+	}
+
+	/**
+	 * @return the exec_submode
+	 */
+	public String getExec_submode() {
+		return exec_submode;
+	}
+
+	/**
+	 * @param execSubmode
+	 *            the exec_submode to set
+	 */
+	public void setExec_submode(String execSubmode) {
+		exec_submode = execSubmode;
+	}
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngIRQState.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngIRQState.java
new file mode 100644
index 0000000..94818ed
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngIRQState.java
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.state.model;
+
+import java.util.Stack;
+
+import org.eclipse.linuxtools.lttng.state.StateStrings;
+import org.eclipse.linuxtools.lttng.state.StateStrings.IRQMode;
+
+/**
+ * <b><u>LttvIRQState</u></b>
+ * @author alvaro
+ *
+ */
+public class LttngIRQState implements Cloneable {
+    // ========================================================================
+	// Data
+    // =======================================================================
+	private Stack<StateStrings.IRQMode> mode_stack = new Stack<StateStrings.IRQMode>();
+
+    // ========================================================================
+    // Constructor
+    // =======================================================================
+	public LttngIRQState() {
+		mode_stack.push(IRQMode.LTTV_IRQ_UNKNOWN);
+	}
+	
+	@Override
+	@SuppressWarnings("unchecked")
+    public LttngIRQState clone() {
+	    LttngIRQState newState = null;
+        
+        try {
+            newState = (LttngIRQState)super.clone();
+            
+            // Clone should work correctly for all stack object that contain basic java object (String, Long, etc...)
+            newState.mode_stack = (Stack<StateStrings.IRQMode>)this.mode_stack.clone();
+        }
+        catch ( CloneNotSupportedException e ) {
+            System.out.println("Cloning failed with : " + e.getMessage() );
+        }
+        
+        return newState;
+    }
+	
+    // ========================================================================
+    // Methods
+    // =======================================================================
+	public void clearIrqStack() {
+        mode_stack.clear();
+    }
+    
+    public void clearAndSetBaseToIrqStack(StateStrings.IRQMode newState) {
+        mode_stack.clear();
+        // Ensure that there is always at least 1 item in the stack
+        mode_stack.push(newState);
+    }
+    
+    public void pushToIrqStack(StateStrings.IRQMode newState) {
+        mode_stack.push(newState);
+    }
+    
+    public StateStrings.IRQMode popFromIrqStack() {
+        
+        StateStrings.IRQMode returnedMode = mode_stack.pop();
+       if (mode_stack.size() < 1) {
+            mode_stack.push(IRQMode.LTTV_IRQ_UNKNOWN);
+       }
+       
+       return returnedMode;
+    }
+    
+    public StateStrings.IRQMode peekFromIrqStack() {
+        return mode_stack.peek();
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngProcessState.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngProcessState.java
new file mode 100644
index 0000000..6345159
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngProcessState.java
@@ -0,0 +1,490 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.state.model;
+
+import java.util.Stack;
+
+import org.eclipse.linuxtools.lttng.TraceDebug;
+import org.eclipse.linuxtools.lttng.state.StateStrings;
+import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionMode;
+import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionSubMode;
+import org.eclipse.linuxtools.lttng.state.StateStrings.ProcessStatus;
+
+/**
+ * <b>LttngProcessState</b>
+ * 
+ * @author alvaro
+ * 
+ */
+public class LttngProcessState implements Cloneable {
+	// ========================================================================
+	// Data
+	// =======================================================================
+	private Long cpu = null;
+	private Long pid = null;
+	private Long tgid = null;
+	private String name = null;
+	private Long creation_time = null;
+	private String brand = null;
+	private StateStrings.ProcessType type = null;
+	private Long current_function = null;
+	private Long ppid = null;
+	private Long insertion_time = null;
+	private String pid_time = null;
+	private Long free_events = null;
+	private LttngExecutionState state = null; // top of stack
+	private Stack<LttngExecutionState> execution_stack = new Stack<LttngExecutionState>();
+	private Stack<Long> user_stack = new Stack<Long>(); // user space
+	
+	private String userTrace = null; /* Associated file trace  */
+	private Long target_pid = null; /* target PID of the current event. */
+	private String trace_id = null;
+	
+	// ========================================================================
+	// Constructor
+	// =======================================================================
+	public LttngProcessState(Long startTime, String traceId) {
+		this.cpu = 0L;
+		this.pid = 0L;
+		this.tgid = 0L;
+		this.name = StateStrings.ProcessStatus.LTTV_STATE_UNNAMED.getInName();
+		this.insertion_time = startTime;
+		this.trace_id = "";
+		init();
+	}
+
+	public LttngProcessState(Long cpu, Long pid, Long tgid,
+			String name, Long startTime, String traceId) {
+		this.cpu = cpu;
+		this.pid = pid;
+		this.tgid = tgid;
+		this.name = name;
+		this.insertion_time = startTime;
+		this.trace_id = traceId;
+		init();
+	}
+
+	// ========================================================================
+	// Methods
+	// =======================================================================
+	private void init() {
+		this.brand = StateStrings.LTTV_STATE_UNBRANDED;
+		this.type = StateStrings.ProcessType.LTTV_STATE_USER_THREAD;
+		this.current_function = 0L;
+		this.ppid = 0L;
+		this.creation_time = 0L;
+		this.free_events = 0L;
+
+		// Initialise stack
+		LttngExecutionState es = new LttngExecutionState();
+		es.setExec_mode(ExecutionMode.LTTV_STATE_USER_MODE);
+		es.setExec_submode(ExecutionSubMode.LTTV_STATE_SUBMODE_NONE.getInName());
+		es.setEntry_Time(this.insertion_time);
+		es.setChange_Time(this.insertion_time);
+		es.setCum_cpu_time(0L);
+		es.setProc_status(ProcessStatus.LTTV_STATE_RUN);
+		this.execution_stack.push(es);
+
+		//This second entry is needed when processes are created via a Fork event.
+		es = new LttngExecutionState();
+		es.setExec_mode(ExecutionMode.LTTV_STATE_SYSCALL);
+		es
+				.setExec_submode(ExecutionSubMode.LTTV_STATE_SUBMODE_NONE
+						.getInName());
+		es.setEntry_Time(this.insertion_time);
+		es.setChange_Time(this.insertion_time);
+		es.setCum_cpu_time(0L);
+		es.setProc_status(ProcessStatus.LTTV_STATE_WAIT_FORK);
+		this.execution_stack.push(es);
+		
+		// point state to the top of the stack
+		this.state = es;
+	}
+	
+	@Override
+	@SuppressWarnings("unchecked")
+    public LttngProcessState clone() {
+	    LttngProcessState newState = null;
+        
+        try {
+            newState = (LttngProcessState)super.clone();
+            
+            // *** IMPORTANT ***
+            // Basic type in java are immutable! 
+			// Thus, using assignment ("=") on basic type is CORRECT,
+            //  but we should ALWAYS use "new" or "clone()" on "non basic" type
+            newState.cpu = this.cpu;
+            newState.pid = this.pid;
+            newState.tgid = this.tgid;
+            newState.name = this.name;
+            newState.brand = this.brand;
+            newState.type = this.type;
+            newState.current_function = this.current_function;
+            newState.ppid = this.ppid;
+            newState.pid_time= this.pid_time;
+            newState.free_events = this.free_events;
+            newState.userTrace = this.userTrace;
+            newState.target_pid = this.target_pid;
+            newState.trace_id = this.trace_id;
+            newState.creation_time = this.creation_time;
+            newState.insertion_time = this.insertion_time;
+            
+            // Call clone on our own object is safe as Long it implements Clonable
+            newState.state = (LttngExecutionState)this.state.clone();
+            
+            // Clone should work correctly for all stack object that contain basic java object (String, Long, etc...)
+            newState.user_stack = (Stack<Long>)this.user_stack.clone();
+            
+            
+            // This is worst case : Stack that contain user defined object. We have to unstack it and clone every object in a new stack!
+            // Why does java does not call clone() for every object in the stack it clone? It would probably be too useful...
+            newState.execution_stack = new Stack<LttngExecutionState>();
+            
+            // Work stack we will use to "pop" item
+            Stack<LttngExecutionState> tmpStack = new Stack<LttngExecutionState>();
+            
+            // First, we pop every ExecutionState, and insert a CLONED copy into our new cloned stack
+            while ( this.execution_stack.empty() == false ) {
+                // Save a copy of the original reference
+                tmpStack.push(this.execution_stack.peek());
+                // Push a CLONED copy into the new stack while poping it from the original stack
+                newState.execution_stack.push( this.execution_stack.pop().clone() );
+            }
+            
+            // Second, we reinsert back our content into the original stack
+            while ( tmpStack.empty() == false ) {
+                // Pop the cloned copy and push it back into the original stack
+                this.execution_stack.push( tmpStack.pop() );
+            }
+        }
+        catch ( CloneNotSupportedException e ) {
+            System.out.println("Cloning failed with : " + e.getMessage() );
+        }
+        
+        return newState;
+    }
+	
+	
+	// ========================================================================
+	// Methods
+	// =======================================================================
+	/**
+	 * @return the pid
+	 */
+	public Long getPid() {
+		return pid;
+	}
+
+	/**
+	 * @param pid
+	 *            the pid to set
+	 */
+	public void setPid(Long pid) {
+		this.pid = pid;
+	}
+
+	/**
+	 * @return the tgid
+	 */
+	public Long getTgid() {
+		return tgid;
+	}
+
+	/**
+	 * @param tgid
+	 *            the tgid to set
+	 */
+	public void setTgid(Long tgid) {
+		this.tgid = tgid;
+	}
+
+	/**
+	 * @return the ppid
+	 */
+	public Long getPpid() {
+		return ppid;
+	}
+
+	/**
+	 * @param ppid
+	 *            the ppid to set
+	 */
+	public void setPpid(Long ppid) {
+		this.ppid = ppid;
+	}
+
+	/**
+	 * <p>
+	 * When the parent pid is known, the creation time is also known and
+	 * requires update
+	 * </p>
+	 * 
+	 * @param ppid
+	 *            the ppid to set
+	 */
+	public void setPpid(Long ppid, Long creationTime) {
+		if (ppid != null) {
+			this.ppid = ppid;
+		}
+		
+		if (creationTime != null) {
+			setCreation_time(creationTime);
+		}
+	}
+
+	/**
+	 * @return the creation_time
+	 */
+	public Long getCreation_time() {
+		return creation_time;
+	}
+
+	/**
+	 * @param creationTime
+	 *            the creation_time to set
+	 */
+	public void setCreation_time(Long creationTime) {
+		if ( (creationTime != null) && (pid != null) ) {
+			creation_time = creationTime;
+			StringBuilder sb = new StringBuilder(this.pid.toString() + "-"
+					+ creationTime.toString());
+			this.pid_time = sb.toString();
+		}
+	}
+
+	/**
+	 * @return the insertion_time
+	 */
+	public Long getInsertion_time() {
+		return insertion_time;
+	}
+
+	/**
+	 * @param insertionTime
+	 *            the insertion_time to set
+	 */
+	public void setInsertion_time(Long insertionTime) {
+		insertion_time = insertionTime;
+	}
+
+	/**
+	 * @return the name
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * @param name
+	 *            the name to set
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	/**
+	 * @return the brand
+	 */
+	public String getBrand() {
+		return brand;
+	}
+
+	/**
+	 * @param brand
+	 *            the brand to set
+	 */
+	public void setBrand(String brand) {
+		this.brand = brand;
+	}
+
+	/**
+	 * @return the prid_time
+	 */
+	public String getPid_time() {
+		return pid_time;
+	}
+
+	/**
+	 * @return the cpu
+	 */
+	public Long getCpu() {
+		return cpu;
+	}
+
+	/**
+	 * @param cpu
+	 *            the cpu to set
+	 */
+	public void setCpu(Long cpu) {
+		this.cpu = cpu;
+	}
+
+	/**
+	 * @return the current_function
+	 */
+	public Long getCurrent_function() {
+		return current_function;
+	}
+
+	/**
+	 * @param currentFunction
+	 *            the current_function to set
+	 */
+	public void setCurrent_function(Long currentFunction) {
+		current_function = currentFunction;
+	}
+
+	/**
+	 * @return the target_pid
+	 */
+	public Long getTarget_pid() {
+		return target_pid;
+	}
+
+	/**
+	 * @param targetPid
+	 *            the target_pid to set
+	 */
+	public void setTarget_pid(Long targetPid) {
+		target_pid = targetPid;
+	}
+	
+	public String getTrace_id() {
+		return trace_id;
+	}
+
+	public void setTrace_id(String traceId) {
+		trace_id = traceId;
+	}
+	
+	/**
+	 * @return the free_events
+	 */
+	public Long getFree_events() {
+		return free_events;
+	}
+
+	/**
+	 * @param freeEvents
+	 *            the free_events to set
+	 */
+	public void setFree_events(Long freeEvents) {
+		free_events = freeEvents;
+	}
+	
+	/**
+	 * increment the nuber of free events
+	 */
+	public void incrementFree_events() {
+		++free_events;
+	}
+
+	/**
+	 * @return the state
+	 */
+	public LttngExecutionState getState() {
+		return state;
+	}
+
+	/**
+	 * @param state
+	 *            the state to set
+	 */
+	public void setState(LttngExecutionState state) {
+		this.state = state;
+	}
+
+	/**
+	 * @return the type
+	 */
+	public StateStrings.ProcessType getType() {
+		return type;
+	}
+
+	/**
+	 * @param type
+	 *            the type to set
+	 */
+	public void setType(StateStrings.ProcessType type) {
+		this.type = type;
+	}
+
+	/**
+	 * @return the userTrace
+	 */
+	public String getUserTrace() {
+		return userTrace;
+	}
+
+	/**
+	 * @param userTrace
+	 *            the userTrace to set
+	 */
+	public void setUserTrace(String userTrace) {
+		this.userTrace = userTrace;
+	}
+	
+	
+	public void clearUserStack() {
+	    user_stack.clear();
+	}
+	
+	public void pushToUserStack(Long newState) {
+	    user_stack.push(newState);
+	}
+	
+	public Long popFromUserStack() {
+       if (user_stack.size() <= 1) {
+            TraceDebug.debug("Removing last item from user stack is not allowed! (popFromUserStack)");
+            return null;
+        }
+        else {
+           return user_stack.pop();
+       }
+    }
+	
+	public Long peekFromUserStack() {
+        return user_stack.peek();
+    }
+	
+	
+	
+	public void clearExecutionStack() {
+        execution_stack.clear();
+    }
+    
+    public void pushToExecutionStack(LttngExecutionState newState) {
+        execution_stack.push(newState);
+		setState(newState);
+    }
+    
+    public LttngExecutionState popFromExecutionStack() {
+       if (execution_stack.size() <= 1) {
+    	   TraceDebug.debug("Removing last item from execution stack is not allowed! (popFromExecutionStack)");
+            return null;
+        }
+        else {
+			LttngExecutionState popedState = execution_stack.pop();
+			// adjust current state to the new top
+			setState(peekFromExecutionStack());
+			return popedState;
+       }
+    }
+    
+    public LttngExecutionState peekFromExecutionStack() {
+        return execution_stack.peek();
+    }
+	
+    public LttngExecutionState getFirstElementFromExecutionStack() {
+        return execution_stack.firstElement();
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngSoftIRQState.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngSoftIRQState.java
new file mode 100644
index 0000000..64eafde
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngSoftIRQState.java
@@ -0,0 +1,114 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.state.model;
+
+/**
+ * <b>LttvSoftIRQState</b>
+ * 
+ * @author alvaro
+ * 
+ */
+public class LttngSoftIRQState implements Cloneable {
+
+	// ========================================================================
+	// Data
+	// =======================================================================
+	private Long pending = null;
+	private Long running = null;
+
+	// ========================================================================
+	// Constructor
+	// =======================================================================
+	public LttngSoftIRQState() {
+		pending = 0L;
+		running = 0L;
+	}
+	
+    @Override
+	public LttngSoftIRQState clone() {
+        LttngSoftIRQState newState = null;
+        
+        try {
+            newState = (LttngSoftIRQState)super.clone();
+            
+            // *** IMPORTANT ***
+            // Basic type in java are immutable! 
+			// Thus, using assignment ("=") on basic type is CORRECT,
+            //  but we should ALWAYS use "new" or "clone()" on "non basic" type
+            newState.pending = this.pending;
+            newState.running = this.running;
+        }
+        catch ( CloneNotSupportedException e ) {
+            System.out.println("Cloning failed with : " + e.getMessage() );
+        }
+        
+        return newState;
+    }
+
+	// ========================================================================
+	// Methods
+	// =======================================================================
+	/**
+	 * @param pending
+	 *            the pending to set
+	 */
+	public void setPending(Long pending) {
+		this.pending = pending;
+	}
+
+	/**
+	 * @return the pending
+	 */
+	public Long getPending() {
+		return pending;
+	}
+
+	/**
+	 * @param running
+	 *            the running to set
+	 */
+	public void setRunning(Long running) {
+		this.running = running;
+	}
+
+	/**
+	 * @return the running
+	 */
+	public Long getRunning() {
+		return running;
+	}
+
+	public void reset() {
+		pending = 0L;
+		running = 0L;
+	}
+	
+	public void incrementRunning() {
+		running ++;
+	}
+	
+	public void incrementPending() {
+		pending ++;
+	}
+	
+	public void decrementRunning() {
+		if (running > 0L) {
+			running--;
+		}
+	}
+	
+	public void decrementPending() {
+		if (pending > 0L) {
+			pending--;
+		}
+	}
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngTraceState.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngTraceState.java
new file mode 100644
index 0000000..4d0ff32
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngTraceState.java
@@ -0,0 +1,565 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.state.model;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.eclipse.linuxtools.lttng.TraceDebug;
+import org.eclipse.linuxtools.lttng.state.LttngStateException;
+import org.eclipse.linuxtools.lttng.state.StateStrings;
+import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionMode;
+import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionSubMode;
+import org.eclipse.linuxtools.lttng.state.StateStrings.IRQMode;
+import org.eclipse.linuxtools.lttng.state.StateStrings.ProcessStatus;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+
+/**
+ * <b><u>LttngTraceState</u></b>
+ * <p>
+ * 
+ */
+/**
+ * @author alvaro
+ * 
+ */
+public class LttngTraceState implements Cloneable {
+	// ========================================================================
+	// Data
+	// =======================================================================
+    
+	private Long save_interval = null;
+
+	private Long max_time_state_recomputed_in_seek = null;
+	private boolean has_precomputed_states = false;
+
+	private HashMap<ProcessStateKey, LttngProcessState> processes = new HashMap<ProcessStateKey, LttngProcessState>();
+
+	// by cpu
+	private Map<Long, LttngProcessState> running_process = new HashMap<Long, LttngProcessState>();
+
+	// Get state tables
+	private Map<Long, LTTngCPUState> cpu_states = new HashMap<Long, LTTngCPUState>();
+	private Map<Long, LttngIRQState> irq_states = new HashMap<Long, LttngIRQState>();
+	private Map<Long, LttngSoftIRQState> soft_irq_states = new HashMap<Long, LttngSoftIRQState>();
+	private Map<Long, LttngTrapState> trap_states = new HashMap<Long, LttngTrapState>();
+	private Map<Long, LttngBdevState> bdev_states = new HashMap<Long, LttngBdevState>();
+
+	// Get name tables
+	private Map<Long, String> syscall_names = new HashMap<Long, String>();
+	private Map<Long, String> kprobe_table = new HashMap<Long, String>();
+	private Map<Long, String> soft_irq_names = new HashMap<Long, String>();
+	private Map<Long, String> trap_names = new HashMap<Long, String>();
+	private Map<Long, String> irq_names = new HashMap<Long, String>();
+
+	private int nb_events = 0;
+
+	// reference to input data provider
+	ILttngStateInputRef inputDataRef = null;
+	String traceId = "";
+
+	// ========================================================================
+	// Constructor
+	// =======================================================================
+	LttngTraceState() {
+		// Get name tables
+		StateStrings strings = StateStrings.getInstance();
+
+		// initialize sycall_names
+		String[] ref_name_table = strings.getSyscallNames();
+		for (Long i = 0L; i < ref_name_table.length; i++) {
+			syscall_names.put(i, ref_name_table[i.intValue()]);
+		}
+
+		// trap names
+		ref_name_table = strings.getTrapNames();
+		for (Long i = 0L; i < ref_name_table.length; i++) {
+			trap_names.put(i, ref_name_table[i.intValue()]);
+		}
+
+		// irq names
+		ref_name_table = strings.getIrqNames();
+		for (Long i = 0L; i < ref_name_table.length; i++) {
+			irq_names.put(i, ref_name_table[i.intValue()]);
+		}
+
+		// softirq names
+		ref_name_table = strings.getSoftIrqNames();
+		for (Long i = 0L; i < ref_name_table.length; i++) {
+			soft_irq_names.put(i, ref_name_table[i.intValue()]);
+		}
+	}
+
+	// =======================================================================
+	// Methods
+	// =======================================================================
+	@Override
+	public LttngTraceState clone() {
+		LttngTraceState newState = null;
+
+		try {
+			newState = (LttngTraceState) super.clone();
+
+			// *** IMPORTANT ***
+			// Basic type in java are immutable!
+			// Thus, using assignment ("=") on basic type is CORRECT,
+			// but we should ALWAYS use "new" or "clone()" on "non basic" type
+			newState.save_interval = this.save_interval;
+			newState.traceId = this.traceId;
+
+			// Basic value only need to be assigned while cloning
+			newState.has_precomputed_states = this.has_precomputed_states;
+			newState.nb_events = this.nb_events;
+			newState.max_time_state_recomputed_in_seek = this.max_time_state_recomputed_in_seek;
+
+			// Clone should work correctly for all stack object that contain
+			// basic java object (String, Long, etc...)
+			newState.syscall_names = this.syscall_names;
+			newState.kprobe_table = this.kprobe_table;
+			newState.soft_irq_names = this.soft_irq_names;
+			newState.trap_names = this.trap_names;
+			newState.irq_names = this.irq_names;
+
+			// This reference should never need to be updated, should it?
+			newState.inputDataRef = this.inputDataRef;
+
+			// *** We need loop on each ArrayList and HashMap, as java implement
+			// nothing that's remotely near deep copying.
+			// *** TODO ***
+			// In the future, implement something better here... serialization
+			// perhaps? Or copy the array chunk of memory in C?
+			
+			Iterator<Long> iteratorL = null;
+			Iterator<ProcessStateKey> iteratorP = null;
+			Long mapKey = null;
+			ProcessStateKey processKey = null;
+			
+			newState.processes = new HashMap<ProcessStateKey, LttngProcessState>();
+			iteratorP = this.processes.keySet().iterator();
+			while (iteratorP.hasNext()) {
+				processKey = iteratorP.next();
+				newState.processes.put(processKey, this.processes.get(processKey).clone());
+			}
+
+			newState.running_process = new HashMap<Long, LttngProcessState>();
+			iteratorL = this.running_process.keySet().iterator();
+			while (iteratorL.hasNext()) {
+				mapKey = iteratorL.next();
+				newState.running_process.put(mapKey, this.running_process.get(mapKey).clone());
+			}
+
+			newState.cpu_states = new HashMap<Long, LTTngCPUState>();
+			iteratorL = this.cpu_states.keySet().iterator();
+			while (iteratorL.hasNext()) {
+				mapKey = iteratorL.next();
+				newState.cpu_states.put(mapKey, this.cpu_states.get(mapKey)
+						.clone());
+			}
+
+			newState.irq_states = new HashMap<Long, LttngIRQState>();
+			iteratorL = this.irq_states.keySet().iterator();
+			while (iteratorL.hasNext()) {
+				mapKey = iteratorL.next();
+				newState.irq_states.put(mapKey, this.irq_states.get(mapKey)
+						.clone());
+			}
+
+			newState.soft_irq_states = new HashMap<Long, LttngSoftIRQState>();
+			iteratorL = this.soft_irq_states.keySet().iterator();
+			while (iteratorL.hasNext()) {
+				mapKey = iteratorL.next();
+				newState.soft_irq_states.put(mapKey, this.soft_irq_states.get(
+						mapKey).clone());
+			}
+
+			newState.trap_states = new HashMap<Long, LttngTrapState>();
+			iteratorL = this.trap_states.keySet().iterator();
+			while (iteratorL.hasNext()) {
+				mapKey = iteratorL.next();
+				newState.trap_states.put(mapKey, this.trap_states.get(mapKey)
+						.clone());
+			}
+
+			newState.bdev_states = new HashMap<Long, LttngBdevState>();
+			iteratorL = this.bdev_states.keySet().iterator();
+			while (iteratorL.hasNext()) {
+				mapKey = iteratorL.next();
+				newState.bdev_states.put(mapKey, this.bdev_states.get(mapKey)
+						.clone());
+			}
+
+		} catch (CloneNotSupportedException e) {
+			System.out.println("Cloning failed with : " + e.getMessage());
+		}
+
+		return newState;
+	}
+
+	public void init(ILttngStateInputRef inputReference)
+			throws LttngStateException {
+		if (inputReference == null) {
+			StringBuilder sb = new StringBuilder(
+					"The input provider reference must not be null");
+			throw new LttngStateException(sb.toString());
+		}
+
+		// Save the input data reference
+		inputDataRef = inputReference;
+
+		// Save traceid
+		traceId = inputDataRef.getTraceId();
+
+		// max time
+		max_time_state_recomputed_in_seek = 0L;
+
+		// reset cpu_states
+		cpu_states.clear();
+		
+		// Obtain the total num of available CPUs and initialize the map
+		// to the corresponding size
+		int numCpus = inputDataRef.getNumberOfCpus();
+		for (Long i = 0L; i < numCpus; i++) {
+			cpu_states.put(i, new LTTngCPUState());
+		}
+
+		// irq states
+		irq_states.clear();
+		for (Long i = 0L; i < irq_names.size(); i++) {
+			irq_states.put(i, new LttngIRQState());
+		}
+
+		// soft irqs
+		soft_irq_states.clear();
+		for (Long i = 0L; i < soft_irq_names.size(); i++) {
+			soft_irq_states.put(i, new LttngSoftIRQState());
+		}
+
+		// traps
+		trap_states.clear();
+		for (Long i = 0L; i < trap_names.size(); i++) {
+			trap_states.put(i, new LttngTrapState(0L));
+		}
+
+		// bdev states
+		bdev_states.clear();
+		
+		processes.clear();
+
+		nb_events = 0;
+		TmfTimeRange timeWin = inputDataRef.getTraceTimeWindow();
+
+		/* Put the per cpu running_process to beginning state : process 0. */
+		for (Long i = 0L; i < numCpus; i++) {
+			LttngProcessState process = new LttngProcessState(timeWin.getStartTime().getValue(), traceId );
+
+			/*
+			 * We are not sure is it's a kernel thread or normal thread, put the
+			 * bottom stack state to unknown
+			 */
+			LttngExecutionState es = process.getFirstElementFromExecutionStack();
+			process.setState(es);
+			es.setExec_mode(ExecutionMode.LTTV_STATE_MODE_UNKNOWN);
+			es.setExec_submode(ExecutionSubMode.LTTV_STATE_SUBMODE_NONE
+					.getInName());
+			es.setProc_status(ProcessStatus.LTTV_STATE_UNNAMED);
+
+			// Reduce from default to only one execution state in the stack
+			process.popFromExecutionStack();
+
+			process.setCpu(i);
+			// no associated user trace yet
+			process.setUserTrace("");
+			// processes.put(i, process);
+			running_process.put(i, process);
+			// reset cpu states
+			LTTngCPUState cpuState = cpu_states.get(i);
+			cpuState.reset();
+			// Add the new process to the list
+			processes.put(new ProcessStateKey(process), process);
+		}
+
+		// reset irq_states
+		for (Long key : irq_states.keySet()) {
+			LttngIRQState irqState = irq_states.get(key);
+			irqState.clearAndSetBaseToIrqStack(IRQMode.LTTV_IRQ_UNKNOWN);
+		}
+
+		// reset soft_irq_states
+		for (Long key : soft_irq_states.keySet()) {
+			LttngSoftIRQState softIrqState = soft_irq_states.get(key);
+			softIrqState.reset();
+		}
+
+		// reset trap_states
+		for (Long key : trap_states.keySet()) {
+			LttngTrapState trapState = trap_states.get(key);
+			trapState.setRunning(0L);
+		}
+
+		// reset bdev_states
+		for (Long key : bdev_states.keySet()) {
+			LttngBdevState bdevState = bdev_states.get(key);
+			bdevState.clearBdevStack();
+		}
+
+	}
+
+	public Long getSave_interval() {
+		return save_interval;
+	}
+
+	public void setSave_interval(Long saveInterval) {
+		save_interval = saveInterval;
+	}
+
+	/**
+	 * @return total number of CPUs registered as read from the Trace
+	 */
+	public int getNumberOfCPUs() {
+		return inputDataRef.getNumberOfCpus();
+	}
+
+	/**
+	 * Provide access to input data not necessarily at Trace level
+	 * 
+	 * @return
+	 */
+	public ILttngStateInputRef getInputDataRef() {
+		return inputDataRef;
+	}
+
+	public Long getMax_time_state_recomputed_in_seek() {
+		return max_time_state_recomputed_in_seek;
+	}
+
+	public void setMax_time_state_recomputed_in_seek(
+			Long maxTimeStateRecomputedInSeek) {
+		max_time_state_recomputed_in_seek = maxTimeStateRecomputedInSeek;
+	}
+
+	public boolean isHas_precomputed_states() {
+		return has_precomputed_states;
+	}
+
+	public void setHas_precomputed_states(boolean hasPrecomputedStates) {
+		has_precomputed_states = hasPrecomputedStates;
+	}
+
+	public Map<Long, LttngProcessState> getRunning_process() {
+		return running_process;
+	}
+
+	public Map<Long, String> getSyscall_names() {
+		return syscall_names;
+	}
+
+	public Map<Long, String> getTrap_names() {
+		return trap_names;
+	}
+
+	public Map<Long, String> getIrq_names() {
+		return irq_names;
+	}
+
+	public Map<Long, String> getSoft_irq_names() {
+		return soft_irq_names;
+	}
+
+	public Map<Long, LTTngCPUState> getCpu_states() {
+		return cpu_states;
+	}
+
+	public Map<Long, LttngIRQState> getIrq_states() {
+		return irq_states;
+	}
+
+	public Map<Long, LttngSoftIRQState> getSoft_irq_states() {
+		return soft_irq_states;
+	}
+
+	public Map<Long, LttngTrapState> getTrap_states() {
+		return trap_states;
+	}
+
+	public Map<Long, LttngBdevState> getBdev_states() {
+		return bdev_states;
+	}
+
+	public Map<Long, String> getKprobe_table() {
+		return kprobe_table;
+	}
+	
+	/**
+	 * @return the traceId
+	 */
+	public String getTraceId() {
+		return traceId;
+	}
+	
+	/**
+	 *  Return an array of Processes
+	 * 
+	 * @return LttngProcessState
+	 */
+	public LttngProcessState[] getProcesses() {
+		return processes.values().toArray(new LttngProcessState[processes.size()]);
+	}
+	
+	/**
+	 * Clear all process state items e.g. when a new experiment is selected
+	 */
+	public void clearProcessState() {
+		processes.clear();
+	}
+	
+	/**
+	 * Interface to add process state.
+	 * 
+	 * @param newProcessState
+	 */
+	public void addProcessState(LttngProcessState newProcessState) {
+		if (newProcessState != null) {
+			processes.put( new ProcessStateKey(newProcessState), newProcessState);
+		}
+	}
+	
+	/**
+	 * Interface to remove process state.
+	 * 
+	 * @param oldProcessState
+	 */
+	public void removeProcessState(LttngProcessState oldProcessState) {
+		if (oldProcessState != null) {
+			processes.remove(new ProcessStateKey(oldProcessState));
+		}
+	}
+	
+	/**
+     * Search by keys (pid, cpuId and traceId)<p>
+     * 
+     * A match is returned if the three arguments received match an entry
+     *  Otherwise null is returned
+     *  
+     * @param searchedPid       The processId (Pid) we are looking for
+     * @param searchedCpuId     The cpu Id we are looking for
+     * @param searchedTraceID   The traceId (trace name?) we are looking for
+     * 
+     * @return LttngProcessState
+     */
+    public LttngProcessState findProcessState(Long searchedPid, Long searchedCpuId, String searchedTraceID) {
+        // Get the TimeRangeEventProcess associated to a key we create here
+    	LttngProcessState foundProcess = processes.get( new ProcessStateKey(searchedPid, searchedCpuId, searchedTraceID) );
+        
+        return foundProcess;
+    }
+	
+	
+}
+
+class ProcessStateKey {
+    private LttngProcessState valueRef = null;
+    
+    private Long    pid = null;
+    private Long    cpuId = null;
+    private String  traceId = null;
+    
+    @SuppressWarnings("unused")
+    private ProcessStateKey() { }
+    
+    public ProcessStateKey(LttngProcessState newRef) {
+        valueRef = newRef;
+    }
+    
+    public ProcessStateKey(Long newPid, Long newCpuId, String newTraceId) {
+        pid = newPid;
+        cpuId = newCpuId;
+        traceId = newTraceId;
+    }
+    
+    @Override
+    public boolean equals(Object obj) {
+        boolean isSame = false;
+        
+        if ( obj instanceof ProcessStateKey ) {
+        	ProcessStateKey procKey = (ProcessStateKey) obj;
+        	
+        	if ( valueRef != null ) {
+	            if ( (procKey.getPid().equals(valueRef.getPid()) ) &&
+	                 (procKey.getTraceId().equals(valueRef.getTrace_id()) ) &&
+	                 ( (procKey.getCpuId().longValue() == 0L ) || (procKey.getCpuId().equals(valueRef.getCpu()))  )  )
+	            {
+	                isSame = true;
+	            }
+        	}
+        	else {
+        		if ( (procKey.getPid().equals(this.pid) ) &&
+   	                 (procKey.getTraceId().equals(this.traceId) ) &&
+   	                 ( (procKey.getCpuId().longValue() == 0L ) || (procKey.getCpuId().equals(this.cpuId))  )  )
+   	            {
+   	                isSame = true;
+   	            }
+        	}
+        }
+        else {
+			TraceDebug
+					.debug("ERROR : The received Key is not of the type ProcessStateKey! but "
+							+ obj.getClass().toString());
+        }
+        
+        return isSame;
+    }
+    
+    // *** WARNING : Everything in there work because the check "valueRef != null" is the same for ALL getter
+    // Do NOT change this check without checking.
+    public Long getPid() {
+    	if ( valueRef != null ) {
+            return valueRef.getPid();
+        }
+        else {
+            return pid;
+        }
+    }
+
+    public Long getCpuId() {
+        if ( valueRef != null ) {
+            return valueRef.getCpu();
+        }
+        else {
+            return cpuId;
+        }
+    }
+    
+    public String getTraceId() {
+        if ( valueRef != null ) {
+            return valueRef.getTrace_id();
+        }
+        else {
+            return traceId;
+        }
+    }
+    
+    @Override
+    public int hashCode() {
+    	return this.toString().hashCode();
+    }
+    
+    
+    @Override
+    public String toString() {
+        if ( valueRef != null ) {
+            return (valueRef.getPid().toString() + ":" + valueRef.getCpu().toString() + ":" + valueRef.getTrace_id().toString() );
+        } 
+        
+        return (pid.toString() + ":" + cpuId.toString() + ":" + traceId.toString());
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngTrapState.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngTrapState.java
new file mode 100644
index 0000000..94dba7d
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngTrapState.java
@@ -0,0 +1,86 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.state.model;
+
+
+
+/**
+ * <b><u>LttvTrapState</u></b>
+ * <p>
+ *
+ */
+public class LttngTrapState implements Cloneable {
+    // ========================================================================
+	// Data
+    // =======================================================================
+	private Long running;
+	
+	
+    // ========================================================================
+    // Constructor
+    // =======================================================================
+	
+	public LttngTrapState() {
+		this.running = 0L;
+	}
+	
+	public LttngTrapState(Long running) {
+		this.running = running;
+	}
+	
+    @Override
+	public LttngTrapState clone() {
+	    LttngTrapState newState = null;
+        
+        try {
+            newState = (LttngTrapState)super.clone();
+            
+            // *** IMPORTANT ***
+            // Basic type in java are immutable! 
+            // Thus, using assignation ("=") on basic type is CORRECT, 
+            //  but we should ALWAYS use "new" or "clone()" on "non basic" type
+            newState.running = this.running;
+        }
+        catch ( CloneNotSupportedException e ) {
+            System.out.println("Cloning failed with : " + e.getMessage() );
+        }
+        
+        return newState;
+    }
+	
+    // ========================================================================
+    // Methods
+    // =======================================================================
+	public Long getRunning() {
+		return running;
+	}
+
+	public void setRunning(Long running) {
+		this.running = running;
+	}
+
+	public void incrementRunning() {
+		running++;
+	}
+	
+	public void decrementRunning() {
+		if (running > 0) {
+			running--;			
+		}
+	}
+	
+	@Override
+	public String toString() {
+		return "running : " + running;
+	}
+	
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/StateModelFactory.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/StateModelFactory.java
new file mode 100644
index 0000000..81c806b
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/StateModelFactory.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.lttng.state.model;
+
+import org.eclipse.linuxtools.lttng.state.LttngStateException;
+
+/**
+ * Entry point to the package
+ * 
+ * @author alvaro
+ * 
+ */
+public class StateModelFactory {
+
+	// ========================================================================
+	// Methods
+	// =======================================================================
+
+	/**
+	 * Return an instance of the entry class, the entry class contains
+	 * references to the internal model elements.
+	 * 
+	 * One instance is expected to be created per LttngTrace.
+	 * 
+	 * This method shall be used when a trace is not opened yet and will be
+	 * initialized later via the init() method.
+	 * 
+	 * @return
+	 */
+	public static LttngTraceState getStateEntryInstance() {
+		return new LttngTraceState();
+	}
+
+	/**
+	 * Provide a LttngTraceState when the input data reference is known e.g.
+	 * when exchanging the State provider to check point clone.
+	 * 
+	 * @return
+	 */
+	public static LttngTraceState getStateEntryInstance(
+			ILttngStateInputRef stateInputRef) {
+		LttngTraceState traceState = new LttngTraceState();
+		try {
+			traceState.init(stateInputRef);
+		} catch (LttngStateException e) {
+			e.printStackTrace();
+		}
+		return traceState;
+	}
+}
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTextTrace.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTextTrace.java
new file mode 100644
index 0000000..5c3595a
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTextTrace.java
@@ -0,0 +1,501 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   William Bourque (wbourque@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.trace;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.HashMap;
+
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.event.LttngEventContent;
+import org.eclipse.linuxtools.lttng.event.LttngEventField;
+import org.eclipse.linuxtools.lttng.event.LttngEventReference;
+import org.eclipse.linuxtools.lttng.event.LttngEventSource;
+import org.eclipse.linuxtools.lttng.event.LttngEventType;
+import org.eclipse.linuxtools.lttng.event.LttngTimestamp;
+import org.eclipse.linuxtools.lttng.jni.JniEvent;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.request.TmfDataRequest;
+import org.eclipse.linuxtools.tmf.trace.ITmfContext;
+import org.eclipse.linuxtools.tmf.trace.ITmfLocation;
+import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
+import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint;
+import org.eclipse.linuxtools.tmf.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.trace.TmfLocation;
+import org.eclipse.linuxtools.tmf.trace.TmfTrace;
+
+public class LTTngTextTrace extends TmfTrace<LttngEvent> implements ITmfTrace {
+	private LttngTimestamp                  eventTimestamp   = null;
+    private LttngEventSource                eventSource      = null;
+    private LttngEventType                  eventType        = null;
+    private TextLttngEventContent           eventContent     = null;
+    private LttngEventReference             eventReference   = null;
+    // The actual event
+    private  TextLttngEvent                 currentLttngEvent = null;             
+    
+    private  HashMap<String, LttngEventType> traceTypes       = null;
+    
+    private  String tracepath = "";
+    private  FileReader fr = null;
+    private  BufferedReader br = null;
+    private  Long nbCharRead = 0L;
+    
+    private int cpuNumber = -1;
+    
+    private  boolean showDebug = false;
+    
+    public LTTngTextTrace(String path) throws Exception {
+    	this(path, false);
+    }
+    
+    public LTTngTextTrace(String path, boolean skipIndexing) throws Exception {
+        super(LttngEvent.class, path, 1);
+        
+        tracepath = path;
+        traceTypes      = new HashMap<String, LttngEventType>();
+        
+        eventTimestamp        = new LttngTimestamp();
+        eventSource           = new LttngEventSource();
+        eventType             = new LttngEventType();
+        eventContent          = new TextLttngEventContent(currentLttngEvent);
+        eventReference        = new LttngEventReference(this.getName());
+        
+        currentLttngEvent = new TextLttngEvent(eventTimestamp, eventSource, eventType, eventContent, eventReference);
+        eventContent.setEvent(currentLttngEvent);
+        
+        if ( positionToFirstEvent() == false ) {
+        	throw new IOException("Fail to position to the beginning of the trace");
+        }
+        else {
+        	fIndexPageSize = 1000;
+        	
+        	// Skip indexing if asked
+        	if ( skipIndexing == true ) {
+        		fCheckpoints.add(new TmfCheckpoint(new LttngTimestamp(0L), new TmfLocation<Long>(0L)));
+        	}
+        	else {
+        		indexTrace(true);
+        	}
+        	
+        	Long endTime = currentLttngEvent.getTimestamp().getValue();
+        	positionToFirstEvent();
+        	
+        	getNextEvent(new TmfContext(null, 0));
+        	Long starTime = currentLttngEvent.getTimestamp().getValue();
+        	positionToFirstEvent();
+        	
+        	setTimeRange( new TmfTimeRange( new LttngTimestamp(starTime), 
+  				    						new LttngTimestamp(endTime)
+                  		 ) );
+        }
+    }
+    
+    
+    private LTTngTextTrace(LTTngTrace oldStream) throws Exception { 
+    	super(LttngEvent.class, null);
+    	throw new Exception("Copy constructor should never be use with a LTTngTrace!");
+    }
+    
+    private boolean positionToFirstEvent() {
+    	
+    	boolean isSuccessful = true;
+    	
+    	try {
+	    	if ( br != null ) {
+	    		br.close();
+	    		fr.close();
+	    	}
+	    	
+	    	fr = new FileReader(tracepath);
+	        br = new BufferedReader(fr);
+	        
+	        // Skip the 2 lines header
+	        br.readLine();
+	        br.readLine();
+	        
+	        // Make sure the event time is consistent
+	        eventTimestamp.setValue(0L);
+    	}
+    	catch (Exception e) {
+    		isSuccessful = false;
+    	}
+    	
+    	return isSuccessful;
+    }
+    
+    private void skipToPosition(TmfLocation<Long> skip) {
+    	try {
+    			long skipPosition = skip.getLocation();
+    			if ( skipPosition < 0 ) {
+    				skipPosition = 0L;
+    			}
+    		
+				if ( showDebug == true ) {
+					System.out.println("skipToPosition(Long skipPosition)");
+					System.out.println("\tSkipping to : " + skipPosition);
+					System.out.println();
+				}
+				positionToFirstEvent();
+				br.skip(skipPosition);
+				
+				nbCharRead = skipPosition;
+    	}
+    	catch (Exception e) {
+    		e.printStackTrace();
+    	}
+    }
+    
+    @Override
+	@SuppressWarnings("unchecked")
+	public TmfContext seekLocation(ITmfLocation<?> location) {
+    	if (location == null) {
+    		location = new TmfLocation<Long>(0L);
+    	}
+
+    	if (!((TmfLocation<Long>) location).getLocation().equals(nbCharRead)) {
+    		skipToPosition((TmfLocation<Long>) location);
+    	}
+
+    	TmfContext tmpTraceContext =  new TmfContext(location, 0L);
+    	
+    	return tmpTraceContext;
+    }
+    
+     private LttngEvent parseMyNextEvent(TmfContext context) {
+    	
+    	// All parsing variables declared here so to be able to print them into the catch if needed
+    	String tmpContent = null;
+    	int tmpCurIndex = 0;
+    	int tmpPrevIndex = 0;
+    	
+    	String tracefile = "";
+		long tmpCpu = 0;
+		String marker = "";
+    	
+		long tmpSecond = 0;
+		long tmpNanosecond = 0;
+		
+		String parsedPayload = "";
+		String markerName = "";
+		Object payload = "";
+		
+		HashMap<String, LttngEventField> fieldsMap = null;
+		
+		LttngEvent returnedEvent = null;
+		
+    	try {
+    		tmpContent = br.readLine();
+    		
+    		if (tmpContent != null) {
+    			// *** NOTE : 
+    			// -1 is the skip the end of line (\n)
+    			nbCharRead += (tmpContent.length()+1);
+	    		
+    			if ( (currentLttngEvent != null) && (currentLttngEvent.getContent().getRawContent() != null) ) {
+    				currentLttngEvent.getContent().emptyContent();
+    			}
+    			
+	    		// EventSource is always the same for now :
+	    		eventSource.setSourceId("Kernel Core");
+	    		
+	    		
+	    		// Tracefile and marker are first in the file
+	    		// Sound like : 
+	    		//		kernel.syscall_entry:
+	    		tmpCurIndex = tmpContent.indexOf(".", tmpPrevIndex);
+	    		
+	    		// *** HACK ***
+	    		// Evil exit case here : the two last line of the text dump does not contain "."
+	    		// We should check in a better way (string comparison and such) but it make the whole process to weight a lot more
+	    		// Conclusion : this is ugly but fast.
+	    		if ( tmpCurIndex < 0 ) {
+	    			if ( showDebug == true ) {
+	    				System.out.println("END OF FILE.");
+	    				System.out.println();
+	    			}
+	    			return null;
+	    		}
+	    		
+	    		tracefile = tmpContent.substring(tmpPrevIndex, tmpCurIndex ).trim();
+	    		/*System.out.println(tracefile);*/
+	    		
+	    		tmpPrevIndex = tmpCurIndex;
+	    		tmpCurIndex = tmpContent.indexOf(":", tmpPrevIndex);
+	    		marker = tmpContent.substring(tmpPrevIndex+1, tmpCurIndex ).trim();
+	    		/*System.out.println(marker);*/
+	    		
+	    		// Timestamp is next but is presented in second.milisecond format, we have to split them
+	    		// Sound like : 
+	    		//		952.162637168
+	    		tmpPrevIndex = tmpCurIndex+1;
+	    		tmpCurIndex = tmpContent.indexOf(".", tmpPrevIndex);
+	    		tmpSecond = Long.parseLong( tmpContent.substring(tmpPrevIndex, tmpCurIndex ).trim() );
+	    		/*System.out.println(tmpSecond);*/
+	    		
+	    		tmpPrevIndex = tmpCurIndex+1;
+	    		tmpCurIndex = tmpContent.indexOf(" ", tmpPrevIndex);
+	    		tmpNanosecond = Long.parseLong( tmpContent.substring(tmpPrevIndex, tmpCurIndex ).trim() );
+	    		/*System.out.println(tmpNanosecond);*/
+	    		
+	    		// We have enough information here to set the timestamp
+	    		eventTimestamp.setValue( (tmpSecond * 1000000000) + tmpNanosecond );
+	    		/*System.out.println(eventTimestamp.toString());*/
+	    		
+	    		// Next field is the reference
+	    		// A long string enclosed by parenthesis and ending with a comma
+	    		// 		(/home/william/workspace/org.eclipse.linuxtools.lttng.tests/traceset/trace-618339events-1293lost-1cpu/kernel_0),
+	    		tmpPrevIndex = tmpCurIndex+1;
+	    		tmpCurIndex = tmpContent.indexOf("(", tmpPrevIndex);
+	    		tmpPrevIndex = tmpCurIndex+1;
+	    		tmpCurIndex = tmpContent.indexOf("),", tmpPrevIndex);
+	    		String fullTracePath = tmpContent.substring(tmpPrevIndex, tmpCurIndex ).trim();
+	    		/*System.out.println(fullTracePath);*/
+	    		
+	    		eventReference.setValue(fullTracePath);
+	    		String traceName = fullTracePath.substring(fullTracePath.lastIndexOf("/")+1).trim();
+	    		/*System.out.println(traceName);*/
+	    		eventReference.setTracepath(traceName);
+	    		
+	    		
+	    		// The next few fields are relatives to the state system (pid, ppid, etc...) we need to skip them.
+	    		// They should be like the following :
+	    		//		4175, 4175, hal-acl-tool, , 4168,
+	    		
+	    		// 1st comma
+	    		tmpPrevIndex = tmpCurIndex+1;
+	    		tmpCurIndex = tmpContent.indexOf(",", tmpPrevIndex);
+	    		// 2nd comma
+	    		tmpPrevIndex = tmpCurIndex+1;
+	    		tmpCurIndex = tmpContent.indexOf(",", tmpPrevIndex);
+	    		// 3rd comma
+	    		tmpPrevIndex = tmpCurIndex+1;
+	    		tmpCurIndex = tmpContent.indexOf(",", tmpPrevIndex);
+	    		// 4th comma
+	    		tmpPrevIndex = tmpCurIndex+1;
+	    		tmpCurIndex = tmpContent.indexOf(",", tmpPrevIndex);
+	    		// 5th comma
+	    		tmpPrevIndex = tmpCurIndex+1;
+	    		tmpCurIndex = tmpContent.indexOf(",", tmpPrevIndex);
+	    		// 6th comma
+	    		tmpPrevIndex = tmpCurIndex+1;
+	    		tmpCurIndex = tmpContent.indexOf(",", tmpPrevIndex);
+	    		
+	    		// The next field is the CPU, in hexadecimal format
+	    		// Should be like : 
+	    		//		0x0,
+	    		tmpPrevIndex = tmpCurIndex+1;
+	    		tmpCurIndex = tmpContent.indexOf("0x", tmpPrevIndex);
+	    		tmpPrevIndex = tmpCurIndex+2;
+	    		
+	    		tmpCurIndex = tmpContent.indexOf(",", tmpPrevIndex);
+	    		tmpCpu = Long.parseLong( tmpContent.substring(tmpPrevIndex, tmpCurIndex ).trim() );
+	    		
+	    		// Set the cpu number of trace if we found a "new" cpu
+	    		if ( cpuNumber < (tmpCpu + 1) ) {
+	    			cpuNumber = (int)(tmpCpu+1);
+	    		}
+	    		/*System.out.println(tmpCpu);*/
+	    		
+	    		
+	    		// The last field is the parsed content
+	    		// It is enclosed by { }
+	    		// Look like : 
+	    		//		SYSCALL { ip = 0xb7f05422, syscall_id = 221 [sys_fcntl64+0x0/0x79] }
+	    		//
+	    		// NOTE : it seems some state system events do not respect this format as they have no payload. 
+	    		//		We will create empty payload then.
+	    		int tmpIndex = tmpContent.indexOf("{", tmpPrevIndex);
+	    		if ( tmpIndex != -1 ) {
+		    		tmpPrevIndex = tmpCurIndex+1;
+		    		tmpCurIndex = tmpIndex;
+		    		tmpPrevIndex = tmpCurIndex+1;
+		    		tmpCurIndex = tmpContent.indexOf("}", tmpPrevIndex);
+		    		parsedPayload = tmpContent.substring(tmpPrevIndex, tmpCurIndex ).trim();
+		    		
+		    		// Now add each LttngField
+		    		boolean isDone = false;
+		    		int tmpIndexBegin = 0;
+		    		int tmpIndexEqual = 0;
+		    		int tmpIndexEnd = 0;
+		    		
+		    		fieldsMap = new HashMap<String, LttngEventField>(); 
+		    		
+		    		while ( isDone == false ) {
+		    			tmpIndexEqual = parsedPayload.indexOf("=", (int)tmpIndexBegin);
+		    			tmpIndexEnd = parsedPayload.indexOf(", ", (int)tmpIndexEqual);
+		    			if ( tmpIndexEnd == -1 ) {
+		    				tmpIndexEnd = parsedPayload.length();
+		    				isDone = true;
+		    			}
+		    			
+		    			markerName = parsedPayload.substring((int)tmpIndexBegin, (int)tmpIndexEqual-1 ).trim();
+		    			payload = ((String)parsedPayload.substring((int)tmpIndexEqual+1, (int)tmpIndexEnd )).replace("\"", " ").trim();
+		    			
+		    			// Try to cast the payload into the correct type
+		    			try {
+		    				payload = Long.parseLong((String)payload);
+		    			}
+		    			catch (NumberFormatException e) { }
+		    			
+		    			LttngEventField tmpField = new LttngEventField(eventContent, markerName, payload);
+		    			fieldsMap.put(markerName, tmpField);
+		    			
+		    			tmpIndexBegin = tmpIndexEnd+1;
+		    		}
+	    		}
+	    		else {
+	    			fieldsMap = new HashMap<String, LttngEventField>(); 
+		    		
+	    			markerName = "";
+	    			payload = "";
+	    			
+	    			LttngEventField tmpField = new LttngEventField(eventContent, markerName, payload);
+	    			fieldsMap.put(markerName, tmpField);
+	    		}
+	    		
+	    		eventContent = new TextLttngEventContent(currentLttngEvent, fieldsMap);
+	    		
+	    		// We now have what we need for the type
+	    		String tmpTypeKey = tracefile + "/" + tmpCpu + "/" + marker;
+	    		if ( traceTypes.get(tmpTypeKey) == null ) {
+	    			traceTypes.put(tmpTypeKey, new LttngEventType(tracefile, tmpCpu, marker, fieldsMap.keySet().toArray(new String[fieldsMap.size()] )) );
+	    		}
+	    		
+	    		currentLttngEvent.setContent(eventContent);
+	    		currentLttngEvent.setType(traceTypes.get(tmpTypeKey));
+	    		
+	    		returnedEvent = currentLttngEvent;
+    		}
+    		else if ( showDebug == true ) {
+					System.out.println("NULL READING");
+					System.out.println();
+					returnedEvent = null;
+			}
+    	}
+    	catch (Exception e) {
+    		System.out.println("Pos is :" + nbCharRead);
+    		if ( tmpContent != null ) {
+    			System.out.println("Erroneous content is :" + tmpContent);
+    		}
+    		
+    		tmpContent = null;
+    		e.printStackTrace();
+    		returnedEvent = null;
+    	}
+    	
+    	return returnedEvent;
+    }
+    
+    @Override
+    public ITmfLocation<?> getCurrentLocation() {
+    	return new TmfLocation<Long>(nbCharRead);
+    }
+    
+	@Override
+	public LttngEvent parseEvent(TmfContext context) {
+		context = seekLocation(context.getLocation());
+		return parseMyNextEvent(context);
+		
+    }
+    
+	public int getCpuNumber() {
+    	return cpuNumber;
+    }
+
+	@Override
+	public ITmfContext armRequest(TmfDataRequest<LttngEvent> request) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
+
+
+// Redefine event to override method we know won't work with a Text tracefile 
+class TextLttngEvent extends LttngEvent {
+	
+	public TextLttngEvent(	LttngTimestamp timestamp, 
+							LttngEventSource source, 
+							LttngEventType type, 
+							LttngEventContent content, 
+							LttngEventReference reference) 
+	{
+		super(timestamp, source, type, content, reference, null);
+	}
+	
+	public TextLttngEvent(TextLttngEvent oldEvent) {
+		this(
+				(LttngTimestamp)oldEvent.getTimestamp(), 
+				(LttngEventSource)oldEvent.getSource(), 
+				(LttngEventType)oldEvent.getType(), 
+				(LttngEventContent)oldEvent.getContent(), 
+				(LttngEventReference)oldEvent.getReference()
+			 );
+	}
+	
+	@Override
+	public JniEvent convertEventTmfToJni() {
+		System.out.println("WARNING : Cannot use convertEventTmfToJni() on a trace in text format.");
+		return null;
+	}
+	
+	@Override
+	public void updateJniEventReference(JniEvent newJniEventReference) {
+		System.out.println("WARNING : Cannot use updateJniEventReference on a trace in text format. Using null.");
+    }
+}
+
+
+class TextLttngEventContent extends LttngEventContent {
+	
+	public TextLttngEventContent() {
+        super();
+    }
+    
+    public TextLttngEventContent(TextLttngEvent thisParent) {
+        super(thisParent, null);
+    }
+    
+    public TextLttngEventContent(TextLttngEvent thisParent, HashMap<String, LttngEventField> thisContent) {
+        super(thisParent, thisContent);
+    }
+    
+    public TextLttngEventContent(TextLttngEventContent oldContent) {
+    	this( (TextLttngEvent)oldContent.fParentEvent, oldContent.getRawContent());
+    }
+    
+    @Override
+    public LttngEventField[] getFields() {
+    	return getRawContent().values().toArray(new LttngEventField[getRawContent().size()]);
+    }
+    
+    @Override
+    public LttngEventField getField(String name) {
+        LttngEventField returnedField = getRawContent().get(name);
+        
+        return returnedField;
+    }
+    
+    @Override
+    public LttngEventField getField(int position) {
+    	LttngEventField returnedField = null;
+    	String label = fParentEvent.getType().getLabel(position);
+        
+        if ( label != null ) {
+            returnedField = this.getField(label);
+        }
+        
+        return returnedField;
+    }
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTrace.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTrace.java
new file mode 100644
index 0000000..395b3af
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTrace.java
@@ -0,0 +1,878 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   William Bourque (wbourque@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.lttng.trace;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Vector;
+
+import org.eclipse.linuxtools.lttng.LttngException;
+import org.eclipse.linuxtools.lttng.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.event.LttngEventContent;
+import org.eclipse.linuxtools.lttng.event.LttngEventReference;
+import org.eclipse.linuxtools.lttng.event.LttngEventSource;
+import org.eclipse.linuxtools.lttng.event.LttngEventType;
+import org.eclipse.linuxtools.lttng.event.LttngLocation;
+import org.eclipse.linuxtools.lttng.event.LttngTimestamp;
+import org.eclipse.linuxtools.lttng.jni.JniEvent;
+import org.eclipse.linuxtools.lttng.jni.JniMarker;
+import org.eclipse.linuxtools.lttng.jni.JniTrace;
+import org.eclipse.linuxtools.lttng.jni.JniTracefile;
+import org.eclipse.linuxtools.lttng.jni.common.JniTime;
+import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.trace.ITmfLocation;
+import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint;
+import org.eclipse.linuxtools.tmf.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.trace.TmfTrace;
+
+
+class LTTngTraceException extends LttngException {
+	static final long serialVersionUID = -1636648737081868146L;
+
+	public LTTngTraceException(String errMsg) {
+        super(errMsg);
+    }
+}
+
+/**
+ * <b><u>LTTngTrace</u></b><p>
+ * 
+ * LTTng trace implementation. It accesses the C trace handling library
+ * (seeking, reading and parsing) through the JNI component.
+ */
+public class LTTngTrace extends TmfTrace<LttngEvent> {
+	
+	public static boolean printDebug = false;
+	public static boolean uniqueEvent = false;
+	
+    private final static boolean SHOW_LTT_DEBUG_DEFAULT    = false;
+	private final static boolean IS_PARSING_NEEDED_DEFAULT = false;
+	private final static int     CHECKPOINT_PAGE_SIZE      = 1000;
+    
+    // Reference to our JNI trace
+    private JniTrace currentJniTrace = null;
+    
+    // *** 
+    //   UNHACKED : 	We can no longer do that because TCF need to maintain several events at once.
+    //					This is very slow to do so in LTTng, this has to be temporary.
+    // 		*** HACK ***
+    // 		To save time, we will declare all component of the LttngEvent during the construction of the trace
+    //  	Then, while reading the trace, we will just SET the values instead of declaring new object
+    // ***
+    LttngTimestamp                  eventTimestamp   = null;
+    LttngEventSource                eventSource      = null;
+    LttngEventContent               eventContent     = null;
+    LttngEventReference             eventReference   = null;
+    
+    
+    // The actual event
+    LttngEvent                      currentLttngEvent = null;             
+    
+    // The current location
+    LttngLocation					previousLocation  = null;
+    
+    LttngEventType                  eventType        = null;
+    // Hashmap of the possible types of events (Tracefile/CPU/Marker in the JNI)
+    HashMap<String, LttngEventType> traceTypes       = null;
+    // This vector will be used to quickly find a marker name from a position 
+    Vector<String>                  traceTypeNames   = null;
+    
+    /**
+     * Default Constructor.<p>
+     * 
+     * @param path  Path to a <b>directory</b> that contain an LTTng trace.
+     * 
+     * @exception Exception (most likely LTTngTraceException or FileNotFoundException)
+     */
+    public LTTngTrace(String path) throws Exception {
+        // Call with "wait for completion" true and "skip indexing" false
+        this(path, true, false);
+    }
+    
+    /**
+     * Constructor, with control over the indexing.
+     * <p>
+     * @param path                  Path to a <b>directory</b> that contain an LTTng trace.
+     * @param waitForCompletion     Should we wait for indexign to complete before moving on.
+     * 
+     * @exception Exception (most likely LTTngTraceException or FileNotFoundException)
+     */
+    public LTTngTrace(String path, boolean waitForCompletion) throws Exception {
+        // Call with "skip indexing" false
+        this(path, waitForCompletion, false);
+    }
+    
+    /**
+     * Default constructor, with control over the indexing and possibility to bypass indexation
+     * <p>
+     * @param path 					Path to a <b>directory</b> that contain an LTTng trace.
+     * @param waitForCompletion  	Should we wait for indexign to complete before moving on.
+     * @param bypassIndexing        Should we bypass indexing completly? This is should only be useful for unit testing.
+     * 
+     * @exception Exception (most likely LTTngTraceException or FileNotFoundException)
+     * 
+     */
+    public LTTngTrace(String path, boolean waitForCompletion, boolean bypassIndexing) throws Exception {
+        super(LttngEvent.class, path, CHECKPOINT_PAGE_SIZE);
+        try {
+    		currentJniTrace = JniTraceFactory.getJniTrace(path, SHOW_LTT_DEBUG_DEFAULT);
+        }
+        catch (Exception e) {
+            throw new LTTngTraceException(e.getMessage());
+        }
+        
+        // Export all the event types from the JNI side 
+        traceTypes      = new HashMap<String, LttngEventType>();
+        traceTypeNames  = new Vector<String>();
+        initialiseEventTypes(currentJniTrace);
+        
+        // *** VERIFY ***
+        // Verify that all those "default constructor" are safe to use
+        eventTimestamp        = new LttngTimestamp();
+        eventSource           = new LttngEventSource();
+        eventType             = new LttngEventType();
+        eventContent          = new LttngEventContent(currentLttngEvent);
+        eventReference        = new LttngEventReference(this.getName());
+        
+        // Create the skeleton event
+        currentLttngEvent = new LttngEvent(eventTimestamp, eventSource, eventType, eventContent, eventReference, null);
+        
+        // Create a new current location
+        previousLocation = new LttngLocation();
+        
+        
+        // Set the currentEvent to the eventContent
+        eventContent.setEvent(currentLttngEvent);
+        
+        // Bypass indexing if asked
+        if ( bypassIndexing == false ) {
+            indexTrace(true);
+        }
+        else {
+        	// Even if we don't have any index, set ONE checkpoint
+        	fCheckpoints.add(new TmfCheckpoint(new LttngTimestamp(0L) , new LttngLocation() ) );
+        	
+        	// Set the start time of the trace
+        	setTimeRange( new TmfTimeRange( new LttngTimestamp(currentJniTrace.getStartTime().getTime()), 
+        			  				    	new LttngTimestamp(currentJniTrace.getEndTime().getTime())
+                                      	  ) );
+        }
+        
+    }
+    
+    /*
+     * Copy constructor is forbidden for LttngEvenmStream
+     * 
+     * Events are only valid for a very limited period of time and
+     *   JNI library does not support multiple access at once (yet?).
+     * For this reason, copy constructor should NEVER be used.
+     */
+    private LTTngTrace(LTTngTrace oldStream) throws Exception { 
+    	super(LttngEvent.class, null);
+    	throw new Exception("Copy constructor should never be use with a LTTngTrace!");
+    }
+    
+    /*
+     * Fill out the HashMap with "Type" (Tracefile/Marker)
+     * 
+     * This should be called at construction once the trace is open
+     */
+    private void initialiseEventTypes(JniTrace trace) {
+        // Work variables
+        LttngEventType  tmpType             = null;
+        String[]        markerFieldsLabels  = null;
+        
+        String          newTracefileKey     = null;
+        Integer         newMarkerKey        = null;
+        
+        JniTracefile    newTracefile    = null;
+        JniMarker       newMarker       = null;
+        
+        // First, obtain an iterator on TRACEFILES of owned by the TRACE
+        Iterator<String>    tracefileItr = trace.getTracefilesMap().keySet().iterator();
+        while ( tracefileItr.hasNext() ) {
+            newTracefileKey = tracefileItr.next();
+            newTracefile    = trace.getTracefilesMap().get(newTracefileKey);
+            
+            // From the TRACEFILE read, obtain its MARKER
+            Iterator<Integer> markerItr = newTracefile.getTracefileMarkersMap().keySet().iterator();
+            while ( markerItr.hasNext() ) {
+                newMarkerKey = markerItr.next();
+                newMarker = newTracefile.getTracefileMarkersMap().get(newMarkerKey);
+                
+                // From the MARKER we can obtain the MARKERFIELDS keys (i.e. labels)
+                markerFieldsLabels = newMarker.getMarkerFieldsHashMap().keySet().toArray( new String[newMarker.getMarkerFieldsHashMap().size()] );
+                tmpType = new LttngEventType(newTracefile.getTracefileName(), newTracefile.getCpuNumber(), newMarker.getName(), markerFieldsLabels );
+                
+                // Add the type to the map/vector
+                addEventTypeToMap(tmpType);
+            }
+        }
+    }
+    
+    /*
+     * Add a new type to the HashMap
+     * 
+     * As the hashmap use a key format that is a bit dangerous to use, we should always add using this function.
+     */
+    private void addEventTypeToMap(LttngEventType newEventType) {
+        String newTypeKey = EventTypeKey.getEventTypeKey(newEventType);
+        
+        this.traceTypes.put(newTypeKey, newEventType);
+        this.traceTypeNames.add(newTypeKey);
+    }
+    
+    /**
+     * Index the current trace.
+     * 
+     * @param useless  This boolean is only to comply to the interface and will be ignored.
+     */
+    @Override
+    public synchronized void indexTrace(boolean useless) {
+    	
+    	long nbEvents=0L;
+    	
+    	// Start time need to be null to detect none have been set 
+        // LastTime need to exist so we can ajust it as we go
+        LttngTimestamp startTime = null;
+        LttngTimestamp lastTime  = new LttngTimestamp();
+    	
+        // Position the trace at the beginning
+        TmfContext context = seekEvent( new LttngTimestamp(0L) );
+        
+        // Read the first event and extract the location
+        LttngEvent tmpEvent = (LttngEvent)getNextEvent(context);
+        
+        // If we read the first event, define the start time.
+        if ( tmpEvent != null ) {
+        	startTime = new LttngTimestamp( tmpEvent.getTimestamp() );
+        	lastTime.setValue(tmpEvent.getTimestamp().getValue());
+        }
+        
+        // Now, we read each event until we hit the end of the trace
+        // We will create a new checkpoint every "getCacheSize()" event
+        while ( tmpEvent != null) {
+    		// Update the last time each time we read a new event
+            lastTime.setValue(tmpEvent.getTimestamp().getValue());
+            
+            // Save a check point if needed
+            if ((nbEvents++ % getCacheSize()) == 0) {
+            	// *** IMPORTANT
+            	// We need to NEW each stuff we put in checkpoint
+            	//	Otherwise everything will be the same!
+                LttngTimestamp tmpTimestamp = new LttngTimestamp( (LttngTimestamp)tmpEvent.getTimestamp() );
+                LttngLocation  newLocation  = new LttngLocation(  (LttngTimestamp)tmpEvent.getTimestamp() );
+                
+                fCheckpoints.add(new TmfCheckpoint(tmpTimestamp, newLocation ) );
+            }
+            // Read the next event
+            tmpEvent = (LttngEvent)getNextEvent(context);
+        }
+        
+        // If we have a start time, we should have an end time as well
+        // Issue the new range
+        if (startTime != null) {
+            setTimeRange( new TmfTimeRange(startTime, lastTime) );
+            notifyListeners(getTimeRange() );
+        }
+        
+        // Ajust the total number of event in the trace
+        fNbEvents = nbEvents;
+        //printCheckpointsVector();
+        //printDebug = true;
+    }
+    
+    /**
+     * Return the latest saved location.
+     * Note : Modifying the returned location may result in buggy positionning!
+     * 
+     * @return The LttngLocation as it was after the last operation.
+     * 
+     * @see org.eclipse.linuxtools.lttng.event.LttngLocation
+     */
+    @Override
+	public ITmfLocation<?> getCurrentLocation() {
+        return previousLocation;
+    }
+    
+    /**
+     * Position the trace to the event at the given location.<p>
+     * NOTE : Seeking by location is very fast compare to seeking by position 
+     * 	but is still slower than "ReadNext", avoid using it for small interval.
+     * 
+     * @param location		Location of the event in the trace.
+     * 						If no event available at this exact location, we will position ourself to the next one.
+     * 
+     * @return The TmfContext that point to this event
+     * 
+     * @see org.eclipse.linuxtools.lttng.event.LttngLocation
+     * @see org.eclipse.linuxtools.tmf.trace.TmfContext
+     */
+    @Override
+	public synchronized TmfContext seekLocation(ITmfLocation<?> location) {
+    	
+    	if ( printDebug == true ) {
+    		System.out.println("seekLocation(location) location -> " + location);
+    	}
+    	
+    	// If the location in context is null, create a new one
+    	LttngLocation curLocation = null;
+    	if ( location == null ) {
+    		curLocation = new LttngLocation();
+    	}
+    	else {
+    		curLocation = (LttngLocation)location;
+    	}
+    	
+    	// *** NOTE : 
+    	// Update to location should (and will) be done in SeekEvent.
+    	
+    	// The only seek valid in LTTng is with the time, we call seekEvent(timestamp)
+    	return seekEvent( curLocation.getOperationTime() );
+    }
+    
+    /**
+     * Position the trace to the event at the given time.<p>
+     * NOTE : Seeking by time is very fast compare to seeking by position 
+     * 	but is still slower than "ReadNext", avoid using it for small interval.
+     * 
+     * @param timestamp		Time of the event in the trace. 
+     * 						If no event available at this exact time, we will position ourself to the next one.
+     * 
+     * @return The TmfContext that point to this event
+     * 
+     * @see org.eclipse.linuxtools.lttng.event.LttngLocation
+     * @see org.eclipse.linuxtools.tmf.trace.TmfContext
+     */
+    @Override
+    public synchronized TmfContext seekEvent(TmfTimestamp timestamp) {
+    	
+    	if ( printDebug == true ) {
+    		System.out.println("seekEvent(timestamp) timestamp -> " + timestamp);
+    	}
+    	
+    	// Call JNI to seek
+    	currentJniTrace.seekToTime(new JniTime(timestamp.getValue()));
+		
+    	// Save the time at which we seeked
+    	previousLocation.setOperationTime(timestamp.getValue());
+    	// Set the operation marker as seek, to be able to detect we did "seek" this event
+    	previousLocation.setLastOperationSeek();
+    	
+    	// *** VERIFY ***
+    	// Is that too paranoid?
+    	//
+    	// We don't trust what upper level could do with our internal location 
+    	//	so we create a new one to return instead 
+    	LttngLocation curLocation = new LttngLocation(previousLocation);
+    	
+    	return new TmfContext( curLocation );
+    }
+    
+    /**
+     * Position the trace to the event at the given position (rank).<p>
+     * NOTE : Seeking by position is very slow in LTTng, consider seeking by timestamp.
+     * 
+     * @param position	Position (or rank) of the event in the trace, starting at 0.
+     * 
+     * @return The TmfContext that point to this event
+     * 
+     * @see org.eclipse.linuxtools.lttng.event.LttngLocation
+     * @see org.eclipse.linuxtools.tmf.trace.TmfContext
+     */
+    @Override
+    public synchronized TmfContext seekEvent(long position) {
+    	
+    	if ( printDebug == true ) {
+    		System.out.println("seekEvent(position) position -> " + position);
+    	}
+    	
+    	TmfTimestamp timestamp = null;
+        long index = position / getCacheSize();
+        
+        // Get the timestamp of the closest check point to the given position
+        if (fCheckpoints.size() > 0) {
+            if (index >= fCheckpoints.size()) {
+                    index = fCheckpoints.size() - 1;
+            }
+            timestamp = (TmfTimestamp)fCheckpoints.elementAt((int)index).getTimestamp();
+        }
+        // If none, take the start time of the trace
+        else {
+            timestamp = getStartTime();
+        }
+        
+        // Seek to the found time
+        TmfContext tmpContext  = seekEvent(timestamp);
+        previousLocation = (LttngLocation)tmpContext.getLocation();
+        
+        // Ajust the index of the event we found at this check point position
+        Long currentPosition = index * getCacheSize();
+        
+        Long lastTimeValueRead = 0L;
+        
+        // Get the event at current position. This won't move to the next one
+        JniEvent tmpJniEvent = currentJniTrace.findNextEvent();
+        // Now that we are positionned at the checkpoint, 
+        //	we need to "readNext" (Position - CheckpointPosition) times or until trace "run out"
+        while ( (tmpJniEvent != null) && ( currentPosition < position ) ) {
+            tmpJniEvent = currentJniTrace.readNextEvent();
+            currentPosition++;
+        }
+        
+        // If we found our event, save its timestamp
+        if ( tmpJniEvent != null ) {
+        	lastTimeValueRead = tmpJniEvent.getEventTime().getTime();
+        }
+        
+        // Set the operation marker as seek, to be able to detect we did "seek" this event
+        previousLocation.setLastOperationSeek();
+        // Save read event time
+        previousLocation.setOperationTime(lastTimeValueRead);
+    	
+    	// *** VERIFY ***
+    	// Is that too paranoid?
+    	//
+    	// We don't trust what upper level could do with our internal location 
+    	//	so we create a new one to return instead 
+    	LttngLocation curLocation = new LttngLocation(previousLocation);
+        
+        return new TmfContext( curLocation );
+    }
+    
+    /**
+     * Return the event in the trace according to the given context. Read it if necessary.<p>
+     * Similar (same?) as ParseEvent except that calling GetNext twice read the next one the second time.
+     * 
+     * @param context 	Current TmfContext where to get the event
+     * 
+     * @return The LttngEvent we read of null if no event are available
+     * 
+     * @see org.eclipse.linuxtools.lttng.event.LttngLocation
+     * @see org.eclipse.linuxtools.tmf.trace.TmfContext
+     */
+    @Override
+    public synchronized LttngEvent getNextEvent(TmfContext context) {
+    	
+    	if ( printDebug == true ) {
+    		System.out.println("getNextEvent(context) context.getLocation() -> " + context.getLocation());
+    	}
+    	
+    	LttngEvent 	returnedEvent = null;
+    	LttngLocation curLocation = null;
+    	
+    	// If the location in context is null, create a new one
+    	if ( context.getLocation() == null ) {
+    		curLocation = new LttngLocation();
+    		context.setLocation(curLocation);
+    	}
+    	else {
+    		// Otherwise, we use the one in context; it should be a valid LttngLocation
+    		curLocation = (LttngLocation)context.getLocation();
+    	}
+    	
+    	// *** HACK ***
+    	// TMF assumes it is possible to read (GetNextEvent) to the next Event once ParseEvent() is called
+    	// In LTTNG, there is not difference between "Parsing" and "Reading" an event.
+    	//  	Since parsing/reading invalidate the previous event, 
+    	//		we need to make sure the sequenceParseEvent() -> GetNextEvent() will not actually move to the next event.
+    	// To do so, we avoid moving for call to "GetNextEvent()" that follow call to a call to "ParseEvent()".
+    	// However, calling ParseEvent() -> GetNextEvent() -> GetNextEvent() will only move next by one.
+    	
+    	// *** Positionning trick :
+    	// GetNextEvent only read the trace if : 
+    	// 1- The last operation was NOT a ParseEvent --> A read is required
+    	// 	OR
+    	// 2- The time of the previous location is different from the current  one --> A seek + a read is required
+    	if ( (curLocation.isLastOperationParse() != true) ||
+    		 (previousLocation.getOperationTimeValue() != curLocation.getOperationTimeValue() ) ) 
+    	{
+			if ( previousLocation.getOperationTimeValue() != curLocation.getOperationTimeValue() ) {
+				if ( printDebug == true ) {
+					System.out.println("\t\tSeeking in getNextEvent. [ LastTime : " + previousLocation.getOperationTimeValue() + " CurrentTime" + curLocation.getOperationTimeValue() + " ]");
+				}
+				seekEvent( curLocation.getOperationTime() );
+			}
+			// Read the next event from the trace. The last one will NO LONGER BE VALID.
+	    	returnedEvent = readEvent(curLocation);
+	    	
+	    	// Set the operation marker as read to both location, to be able to detect we did "read" this event
+	    	previousLocation.setLastOperationReadNext();
+	    	curLocation.setLastOperationReadNext();
+    	}
+    	else {
+    		// No event was read, just return the one currently loaded (the last one we read)
+    		returnedEvent = currentLttngEvent;
+    		
+    		// *** IMPORTANT!
+    		// Reset (erase) the operation marker to both location, to be able to detect we did NOT "read" this event
+        	previousLocation.resetLocationState();
+        	curLocation.resetLocationState();
+    	}
+    	
+    	// If we read an event, set it's time to the locations (both previous and current)
+    	if ( returnedEvent != null ) {
+    		previousLocation.setOperationTime((LttngTimestamp)returnedEvent.getTimestamp());
+    		curLocation.setOperationTime((LttngTimestamp)returnedEvent.getTimestamp());
+    	}
+    	
+    	return returnedEvent;
+    }
+    
+    
+    /**
+     * Return the event in the trace according to the given context. Read it if necessary.<p>
+     * Similar (same?) as GetNextEvent except that calling ParseEvent twice will return the same event
+     * 
+     * @param context 	Current TmfContext where to get the event
+     * 
+     * @return The LttngEvent we read of null if no event are available
+     * 
+     * @see org.eclipse.linuxtools.lttng.event.LttngLocation
+     * @see org.eclipse.linuxtools.tmf.trace.TmfContext
+     */
+    @Override
+	public synchronized LttngEvent parseEvent(TmfContext context) {
+    	
+    	if ( printDebug == true ) {
+    		System.out.println("parseEvent(context) context.getLocation() -> " + context.getLocation());
+    	}
+    	
+    	LttngEvent 	returnedEvent = null;
+    	LttngLocation curLocation = null;
+    	
+    	// If the location in context is null, create a new one
+    	if ( context.getLocation() == null ) {
+    		curLocation = new LttngLocation();
+    		context.setLocation(curLocation);
+    	}
+    	// Otherwise, we use the one in context; it should be a valid LttngLocation
+    	else {
+    		curLocation = (LttngLocation)context.getLocation();
+    	}
+    	
+    	// *** HACK ***
+    	// TMF assumes it is possible to read (GetNextEvent) to the next Event once ParseEvent() is called
+    	// In LTTNG, there is not difference between "Parsing" and "Reading" an event.
+    	// 		So, before "Parsing" an event, we have to make sure we didn't "Read" it alreafy.
+    	// Also, "Reading" invalidate the previous Event in LTTNG and seek back is very costly,
+    	//		so calling twice "Parse" will return the same event, giving a way to get the "Currently loaded" event
+    	
+    	// *** Positionning trick :
+    	// ParseEvent only read the trace if : 
+    	// 1- The last operation was NOT a ParseEvent or a GetNextEvent --> A read is required
+    	// 	OR
+    	// 2- The time of the previous location is different from the current  one --> A seek + a read is required
+    	if ( ( (curLocation.isLastOperationParse() != true) && ((curLocation.isLastOperationReadNext() != true)) )  ||
+    		 (previousLocation.getOperationTimeValue() != curLocation.getOperationTimeValue() ) ) 
+    	{
+    		// Previous time != Current time : We need to reposition to the current time
+			if (previousLocation.getOperationTimeValue() != curLocation.getOperationTimeValue() ) {
+				if ( printDebug == true ) {
+					System.out.println("\t\tSeeking in getNextEvent. [ LastTime : " + previousLocation.getOperationTimeValue() + " CurrentTime" + curLocation.getOperationTimeValue() + " ]");
+				}
+				seekEvent( curLocation.getOperationTime() );
+			}
+	    	
+			// Read the next event from the trace. The last one will NO LONGER BE VALID.
+	    	returnedEvent = readEvent(curLocation);
+    	}
+    	else {
+    		// No event was read, just return the one currently loaded (the last one we read)
+    		returnedEvent = currentLttngEvent;
+    	}
+    	
+    	// If we read an event, set it's time to the locations (both previous and current)
+    	if ( returnedEvent != null ) {
+    		previousLocation.setOperationTime((LttngTimestamp)returnedEvent.getTimestamp());
+    		curLocation.setOperationTime((LttngTimestamp)returnedEvent.getTimestamp());
+    	}
+    	
+    	// Set the operation marker as parse to both location, to be able to detect we already "read" this event
+    	previousLocation.setLastOperationParse();
+    	curLocation.setLastOperationParse();
+    	
+    	return returnedEvent;
+    }
+    
+    /*
+     * Read the next event from the JNI and convert it as Lttng Event<p>
+     * 
+     * @param location 	Current LttngLocation that to be updated with the event timestamp
+     * 
+     * @return The LttngEvent we read of null if no event are available
+     * 
+     * @see org.eclipse.linuxtools.lttng.event.LttngLocation
+     * @see org.eclipse.linuxtools.org.eclipse.linuxtools.lttng.jni.JniTrace
+     */
+    private synchronized LttngEvent readEvent(LttngLocation location) {
+    	LttngEvent 	returnedEvent = null;
+    	JniEvent tmpEvent = null;
+    	
+    	// Read the next event from JNI. THIS WILL INVALIDATE THE CURRENT LTTNG EVENT.
+    	tmpEvent = currentJniTrace.readNextEvent();
+		
+		if ( tmpEvent != null ) {
+			// *** NOTE
+			// Convert will update the currentLttngEvent
+            returnedEvent = convertJniEventToTmf(tmpEvent);
+            
+            location.setOperationTime( (LttngTimestamp)returnedEvent.getTimestamp() );
+        }
+		// *** NOTE
+		// If the read failed (likely the last event in the trace), set the LastReadTime to the JNI time
+		// That way, even if we try to read again, we will step over the bogus seek and read
+		else {
+			location.setOperationTime(  getEndTime().getValue() + 1 );
+		}
+		
+		return returnedEvent;
+    }
+    
+    /**
+     * Method to convert a JniEvent into a LttngEvent.<p>
+     * 
+     * Note : This method will call LttngEvent convertEventJniToTmf(JniEvent, boolean)
+     * with a default value for isParsingNeeded
+     * 
+     * @param   newEvent     The JniEvent to convert into LttngEvent
+     * 
+     * @return  The converted LttngEvent
+     * 
+     * @see org.eclipse.linuxtools.org.eclipse.linuxtools.lttng.jni.JniEvent
+     * @see org.eclipse.linuxtools.lttng.event.LttngEvent
+     */
+	public LttngEvent convertJniEventToTmf(JniEvent newEvent) {
+	    currentLttngEvent = convertJniEventToTmf(newEvent, IS_PARSING_NEEDED_DEFAULT);
+	    
+	    return currentLttngEvent;
+    }
+    
+    /**
+     * Method to convert a JniEvent into a LttngEvent
+     * 
+     * @param   jniEvent        The JniEvent to convert into LttngEvent
+     * @param   isParsingNeeded A boolean value telling if the event should be parsed or not.
+     * 
+     * @return  The converted LttngEvent
+     * 
+     * @see org.eclipse.linuxtools.org.eclipse.linuxtools.lttng.jni.JniEvent
+     * @see org.eclipse.linuxtools.lttng.event.LttngEvent
+     */
+    public LttngEvent convertJniEventToTmf(JniEvent jniEvent, boolean isParsingNeeded) {
+    	
+    	if ( uniqueEvent == true ) {
+	    	
+	        // *** 
+	        //   UNHACKED : 	We can no longer do that because TCF need to maintain several events at once.
+	        //					This is very slow to do so in LTTng, this has to be temporary.
+	        // 		*** HACK *** 
+	        // 		To save time here, we only set value instead of allocating new object
+	        // 		This give an HUGE performance improvement
+	        // 		all allocation done in the LttngTrace constructor
+	        // ***
+	        eventTimestamp.setValue(jniEvent.getEventTime().getTime());
+	        eventSource.setSourceId(jniEvent.requestEventSource());
+	        
+	        eventType = traceTypes.get( EventTypeKey.getEventTypeKey(jniEvent) );
+	        
+	        eventReference.setValue(jniEvent.getParentTracefile().getTracefilePath());
+	        eventReference.setTracepath(this.getName());
+	        
+	        eventContent.emptyContent();
+	        
+	        currentLttngEvent.setType(eventType);
+	        // Save the jni reference
+	        currentLttngEvent.updateJniEventReference(jniEvent);
+	        
+	        // Parse now if was asked
+	        // Warning : THIS IS SLOW
+	        if (isParsingNeeded == true ) {
+	           eventContent.getFields();
+	        }
+	    	
+	    	return currentLttngEvent;
+    	}
+    	else {
+    		return convertJniEventToTmfMultipleEventEvilFix(jniEvent);
+    	}
+    	
+    }
+    
+    /**
+     * This method is a temporary fix to support multiple events at once in TMF
+     *		This is expected to be slow and should be fixed in another way.
+     * See comment in convertJniEventToTmf();
+     * 
+     * @param jniEvent	The current JNI Event
+     * @return Current 	Lttng Event fully parsed
+     */
+    private LttngEvent convertJniEventToTmfMultipleEventEvilFix(JniEvent jniEvent) {
+    	// *** HACK ***
+    	// Below : the "fix" with all the new and the full-parse
+    	// 		Allocating new memory is slow.
+    	//		Parsing every events is very slow.
+    	eventTimestamp        = new LttngTimestamp(jniEvent.getEventTime().getTime());
+        eventSource           = new LttngEventSource(jniEvent.requestEventSource());
+        eventReference        = new LttngEventReference(jniEvent.getParentTracefile().getTracefilePath(), this.getName());
+        eventType             = new LttngEventType(traceTypes.get( EventTypeKey.getEventTypeKey(jniEvent) ));
+        eventContent          = new LttngEventContent(currentLttngEvent);
+        currentLttngEvent = new LttngEvent(eventTimestamp, eventSource, eventType, eventContent, eventReference, null);
+        
+        // The jni reference is no longer reliable but we will keep it anyhow
+        currentLttngEvent.updateJniEventReference(jniEvent);
+        // Ensure that the content is correctly set
+        eventContent.setEvent(currentLttngEvent);
+        // FORCE the full parse of every event :
+        eventContent.getFields();
+    	
+        return currentLttngEvent;
+    }
+    
+    
+    
+    /**
+     * Reference to the current LttngTrace we are reading from.<p>
+     * 
+     * Note : This bypass the framework and should not be use, except for testing!
+     * 
+     * @return Reference to the current LttngTrace 
+     * 
+     * @see org.eclipse.linuxtools.org.eclipse.linuxtools.lttng.jni.JniTrace
+     */
+    public JniTrace getCurrentJniTrace() {
+        return currentJniTrace;
+    }
+    
+    
+    /**
+     * Return a reference to the current LttngEvent we have in memory.
+     * 
+     * @return The current (last read) LttngEvent
+     * 
+     * @see org.eclipse.linuxtools.lttng.event.LttngEvent
+     */
+    public LttngEvent getCurrentEvent() {
+        return currentLttngEvent;
+    }
+    
+    /**
+     * Get the major version number for the current trace
+     * 
+     * @return Version major or -1 if unknown
+     * 
+     * @see org.eclipse.linuxtools.org.eclipse.linuxtools.lttng.jni.JniTrace
+     * 
+     */
+    public short getVersionMajor() {
+    	if ( currentJniTrace!= null ) {
+    		return currentJniTrace.getLttMajorVersion();
+    	}
+    	else {
+    		return -1;
+    	}
+    }
+    
+    /**
+     * Get the minor version number for the current trace
+     * 
+     * @return Version minor or -1 if unknown
+     * 
+     * @see org.eclipse.linuxtools.org.eclipse.linuxtools.lttng.jni.JniTrace
+     * 
+     */
+    public short getVersionMinor() {
+    	if ( currentJniTrace!= null ) {
+    		return currentJniTrace.getLttMinorVersion();
+    	}
+    	else {
+    		return -1;
+    	}
+    }
+    
+    /**
+     * Get the number of CPU for this trace
+     * 
+     * @return Number of CPU or -1 if unknown
+     * 
+     * @see org.eclipse.linuxtools.org.eclipse.linuxtools.lttng.jni.JniTrace
+     * 
+     */
+    public int getCpuNumber() {
+    	if ( currentJniTrace!= null ) {
+    		return currentJniTrace.getCpuNumber();
+    	}
+    	else {
+    		return -1;
+    	}
+    }
+    
+    /**
+     * Print the content of the checkpoint vector.<p>
+     * 
+     * This is intended for debug purpose only.
+     */
+    public void printCheckpointsVector() {
+    	System.out.println("StartTime : " + getTimeRange().getStartTime().getValue());
+    	System.out.println("EndTime   : " + getTimeRange().getEndTime().getValue());
+    	
+        for ( int pos=0; pos < fCheckpoints.size(); pos++) {
+            System.out.print(pos + ": " + "\t");
+            System.out.print( fCheckpoints.get(pos).getTimestamp() + "\t" );
+            System.out.println( fCheckpoints.get(pos).getLocation() );
+        }
+    }
+    
+    /**
+     * Return a String identifying this trace.
+     * 
+     * @return String that identify this trace 
+     */
+    @Override
+	public String toString() {
+    	String returnedData="";
+    	
+    	returnedData += "Path :" + getPath() + " ";
+    	returnedData += "Trace:" + currentJniTrace + " ";
+    	returnedData += "Event:" + currentLttngEvent;
+    	
+    	return returnedData;
+    }
+}
+
+/*
+ * EventTypeKey inner class
+ * 
+ * This class is used to make the process of generating the HashMap key more transparent and so less error prone to use
+ * 
+ */
+class EventTypeKey {
+    //*** WARNING ***
+    // These two getEventTypeKey() functions should ALWAYS construct the key the same ways! 
+    // Otherwise, every type search will fail!
+    
+    static public String getEventTypeKey(LttngEventType newEventType) {
+        String key = newEventType.getTracefileName() + "/" + newEventType.getCpuId().toString() + "/" + newEventType.getMarkerName();
+        
+        return key;
+    }
+    
+    static public String getEventTypeKey(JniEvent newEvent) {
+        String key = newEvent.getParentTracefile().getTracefileName() + "/" + newEvent.getParentTracefile().getCpuNumber() + "/" + newEvent.requestEventMarker().getName();
+        
+        return key;
+    }
+    
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTraceVersion.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTraceVersion.java
new file mode 100644
index 0000000..6c67e98
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTraceVersion.java
@@ -0,0 +1,156 @@
+package org.eclipse.linuxtools.lttng.trace;
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   William Bourque (wbourque@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+import org.eclipse.linuxtools.lttng.LttngException;
+import org.eclipse.linuxtools.lttng.jni.exception.JniTraceVersionException;
+import org.eclipse.linuxtools.lttng.jni.factory.JniTraceVersion;
+
+/**
+ * <b><u>LTTngTraceVersion</u></b><p>
+ * 
+ * This class is responsible of handling the version number of a trace.<p>
+ * It will return the correct version number and validity information of a trace given its path.<br>
+ * 
+ */
+public class LTTngTraceVersion {
+	
+	private String tracepath = null;
+	private JniTraceVersion traceVersion = new JniTraceVersion();
+	
+	/*
+	 * Default constructor is forbidden
+	 */
+	@SuppressWarnings("unused")
+	private LTTngTraceVersion() {
+		// Default constructor forbidden
+	}
+	
+	/**
+	 * Default constructor, takes a tracepath as parameter. 
+	 * 
+	 * @param newPath			(Valid) path to a LTTng trace <b>directory</b>. 
+	 * 
+	 * @throws LttngException	Throwed if something go wrong (bad tracepath or the C library could not be loaded).
+	 */
+	public LTTngTraceVersion(String newPath) throws LttngException {
+		tracepath = newPath;
+		
+		// Fill the new traceversion object
+		fillJniTraceVersion(tracepath);
+	}
+	
+	/*
+	 * Fill (load version numbers) into the JniTraceVersion object.<p>
+	 * This need to be done each time the tracepath is changed.  
+	 * 
+	 * @param newTracepath		(Valid) path to a LTTng trace <b>directory</b>. 
+	 * 
+	 * @throws LttngException	If something go wrong (bad tracepath or the C library could not be loaded).
+	 * 
+	 * @see org.eclipse.linuxtools.lttng.jni.factory.JniTraceVersion
+	 */
+	private void fillJniTraceVersion(String newTracepath) throws LttngException {
+		try {
+			traceVersion.readVersionFromTrace(newTracepath);
+		}
+		catch (JniTraceVersionException e) {
+			throw new LttngException( e.toString() );
+		}
+	}
+	
+	/**
+	 * Get for the full version number as String
+	 * 
+	 * @return version number as String
+	 */
+	public String getTraceVersionString() {
+		return traceVersion.getVersionAsString();
+	}
+	
+	/**
+	 * Get for the major version number
+	 * 
+	 * @return major version number as int
+	 */
+	public int getTraceMinorVersion() {
+		return traceVersion.getMinor();
+	}
+	
+	/**
+	 * Get for the minor version number
+	 * 
+	 * @return minor version number as int
+	 */
+	public int getTraceMajorVersion() {
+		return traceVersion.getMajor();
+	}
+	
+	/**
+	 * Get for the full version number as float
+	 * 
+	 * @return version number as float
+	 */
+	public float getTraceFloatVersion() {
+		return traceVersion.getVersionAsFloat();
+	}
+	
+	/**
+	 * Verify is the currently loaded path was a valid LTTng tracepath.<p>
+	 * 
+	 * Internally, the version number will be checked, any number <= 0 is expected to be wrong.
+	 * 
+	 * @return	A boolean saying if the tracepath appears to be valid or not.
+	 */
+	public boolean isValidLttngTrace() {
+		if ( traceVersion.getVersionAsFloat() > 0 ) {
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
+	
+	/**
+	 * Get for the currently loaded tracepath
+	 * 
+	 * @return	the tracepath currently in use
+	 */
+	public String getTracepath() {
+		return tracepath;
+	}
+	
+	/**
+	 * Set a new tracepath<p>
+	 * 
+	 * Note : Setting this will load the new version information into memory.<br>
+	 * Errors will be catched but a warning will be printed if something go wrong.
+	 * 
+	 * @param newTracepath	The new tracepath to set.
+	 */
+	public void setTracepath(String newTracepath) {
+		try {
+			fillJniTraceVersion(newTracepath);
+			tracepath = newTracepath;
+		}
+		catch (LttngException e) {
+			System.out.println("Could not get the trace version from the given path." +
+							   "Please check that the given path is a valid LTTng trace. (getTracepath)");
+		}
+	}
+	
+	@Override
+	public String toString() {
+		return "LTTngTraceVersion : [" + getTraceFloatVersion() + "]";
+	}
+	
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf-feature/.project b/lttng/org.eclipse.linuxtools.tmf-feature/.project
new file mode 100644
index 0000000..9e75941
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf-feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.tmf-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/lttng/org.eclipse.linuxtools.tmf-feature/build.properties b/lttng/org.eclipse.linuxtools.tmf-feature/build.properties
new file mode 100644
index 0000000..5864ee0
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf-feature/build.properties
@@ -0,0 +1,3 @@
+bin.includes = feature.xml,\
+               epl-v10.html,\
+               feature.properties
diff --git a/lttng/org.eclipse.linuxtools.tmf-feature/compile.org.eclipse.linuxtools.tmf-feature.xml b/lttng/org.eclipse.linuxtools.tmf-feature/compile.org.eclipse.linuxtools.tmf-feature.xml
new file mode 100644
index 0000000..1fe11ae
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf-feature/compile.org.eclipse.linuxtools.tmf-feature.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Compile org.eclipse.linuxtools.tmf.feature" default="main">
+	<target name="main">
+		<ant antfile="build.xml" dir="../org.eclipse.linuxtools.tmf" target="build.jars"/>
+		<ant antfile="build.xml" dir="../org.eclipse.linuxtools.tmf.ui" target="build.jars"/>
+	</target>
+</project>
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/docs/epl-v10.html b/lttng/org.eclipse.linuxtools.tmf-feature/epl-v10.html
similarity index 100%
copy from systemtap/SystemTapGuiServer/systemtapguiserver-1.0/docs/epl-v10.html
copy to lttng/org.eclipse.linuxtools.tmf-feature/epl-v10.html
diff --git a/lttng/org.eclipse.linuxtools.tmf-feature/feature.properties b/lttng/org.eclipse.linuxtools.tmf-feature/feature.properties
new file mode 100644
index 0000000..e2c21c6
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf-feature/feature.properties
@@ -0,0 +1,118 @@
+#*******************************************************************************
+# Copyright (c) 2008 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Ericsson - initial API and implementation
+#********************************************************************************
+
+featureName=Tracing and Monitoring Framework (TMF) (Incubation)
+
+description=TMF plugins.
+
+featureProvider=Eclipse
+
+copyright=Copyright 2009 Ericsson
+
+licenseURL=epl-v10.html
+
+license=\
+ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
+March 17, 2005\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse.org CVS\n\
+repository ("Repository") in CVS modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+Features may also include other Features ("Included Features"). Files named\n\
+"feature.xml" may contain a list of the names and version numbers of\n\
+Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+   - The top-level (root) directory\n\
+   - Plug-in and Fragment directories\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
+   - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Eclipse Update Manager, you must agree to a license ("Feature Update\n\
+License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties". Such Abouts,\n\
+Feature Licenses and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
+    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
diff --git a/lttng/org.eclipse.linuxtools.tmf-feature/feature.xml b/lttng/org.eclipse.linuxtools.tmf-feature/feature.xml
new file mode 100644
index 0000000..598364c
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf-feature/feature.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.linuxtools.tmf"
+      label="%featureName"
+      version="0.2.0.qualifier"
+      provider-name="%featureProvider">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <requires>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.linuxtools.tmf" version="0.2.0" match="greaterOrEqual"/>
+      <import plugin="org.junit"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.linuxtools.tmf"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.tmf.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/lttng/org.eclipse.linuxtools.tmf.doc/.project b/lttng/org.eclipse.linuxtools.tmf.doc/.project
new file mode 100644
index 0000000..b56c0ee
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.doc/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.tmf.doc</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/lttng/org.eclipse.linuxtools.tmf.doc/models/TMF-2 Architecture.pdf b/lttng/org.eclipse.linuxtools.tmf.doc/models/TMF-2 Architecture.pdf
new file mode 100755
index 0000000..11889ad
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.doc/models/TMF-2 Architecture.pdf
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.tmf.doc/models/TMF-3 Event.pdf b/lttng/org.eclipse.linuxtools.tmf.doc/models/TMF-3 Event.pdf
new file mode 100755
index 0000000..817bbff
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.doc/models/TMF-3 Event.pdf
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.tmf.doc/models/TMF-4 Trace.pdf b/lttng/org.eclipse.linuxtools.tmf.doc/models/TMF-4 Trace.pdf
new file mode 100755
index 0000000..42409d5
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.doc/models/TMF-4 Trace.pdf
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.tmf.test-feature/.project b/lttng/org.eclipse.linuxtools.tmf.test-feature/.project
new file mode 100644
index 0000000..7fad136
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.test-feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.tmf.test-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/lttng/org.eclipse.linuxtools.tmf.test-feature/build.properties b/lttng/org.eclipse.linuxtools.tmf.test-feature/build.properties
new file mode 100644
index 0000000..d7b2879
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.test-feature/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               build.properties,\
+               epl-v10.html
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/docs/epl-v10.html b/lttng/org.eclipse.linuxtools.tmf.test-feature/epl-v10.html
similarity index 100%
copy from systemtap/SystemTapGuiServer/systemtapguiserver-1.0/docs/epl-v10.html
copy to lttng/org.eclipse.linuxtools.tmf.test-feature/epl-v10.html
diff --git a/lttng/org.eclipse.linuxtools.tmf.test-feature/feature.properties b/lttng/org.eclipse.linuxtools.tmf.test-feature/feature.properties
new file mode 100644
index 0000000..2f9a259
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.test-feature/feature.properties
@@ -0,0 +1,112 @@
+#*******************************************************************************
+# Copyright (c) 2008 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Red Hat, Inc. - initial API and implementation
+#********************************************************************************
+featureName=TMF Tests (Incubation)
+description=Tests for the TMF integration in Eclipse
+featureProvider=Eclipse
+copyright=Copyright 2010 Ericsson
+licenseURL=epl-v10.html
+license=\
+ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
+March 17, 2005\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse.org CVS\n\
+repository ("Repository") in CVS modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+Features may also include other Features ("Included Features"). Files named\n\
+"feature.xml" may contain a list of the names and version numbers of\n\
+Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+   - The top-level (root) directory\n\
+   - Plug-in and Fragment directories\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
+   - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Eclipse Update Manager, you must agree to a license ("Feature Update\n\
+License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties". Such Abouts,\n\
+Feature Licenses and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
+    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf.test-feature/feature.xml b/lttng/org.eclipse.linuxtools.tmf.test-feature/feature.xml
new file mode 100644
index 0000000..aac4a6a
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.test-feature/feature.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.linuxtools.tmf.tests"
+      label="%featureName"
+      version="0.2.0.qualifier"
+      provider-name="%featureProvider">
+
+   <description url="http://www.example.com/description">
+      %description
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      %copyright
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <requires>
+      <import plugin="org.junit"/>
+      <import plugin="org.eclipse.linuxtools.tmf" version="0.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.tmf.ui" version="0.2.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.linuxtools.tmf.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.tmf.ui.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/.classpath b/lttng/org.eclipse.linuxtools.tmf.tests/.classpath
new file mode 100644
index 0000000..978c0d2
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="stubs"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/.project b/lttng/org.eclipse.linuxtools.tmf.tests/.project
new file mode 100644
index 0000000..358841c
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.tmf.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.tmf.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..71deded
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.linuxtools.tmf.tests
+Bundle-Version: 0.2.0.qualifier
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Vendor: %Bundle-Vendor
+Require-Bundle: org.junit;bundle-version="3.8.2",
+ org.eclipse.linuxtools.tmf;bundle-version="0.2.0",
+ org.eclipse.core.runtime;bundle-version="3.5.0"
+Bundle-Localization: plugin
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.eclipse.linuxtools.tmf.tests.TmfCoreTestPlugin
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/build.properties b/lttng/org.eclipse.linuxtools.tmf.tests/build.properties
new file mode 100644
index 0000000..686ec8f
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/build.properties
@@ -0,0 +1,8 @@
+source.. = stubs/,\
+           src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.properties,\
+               test.xml,\
+               testfiles/
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/plugin.properties b/lttng/org.eclipse.linuxtools.tmf.tests/plugin.properties
new file mode 100644
index 0000000..3144db1
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/plugin.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.linuxtools.tmf.tests
+Bundle-Vendor = Eclipse
+Bundle-Name = Tracing and Monitoring Framework (TMF) Core Unit Test Suite
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/AllTmfCoreTests.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/AllTmfCoreTests.java
new file mode 100644
index 0000000..5a36462
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/AllTmfCoreTests.java
@@ -0,0 +1,55 @@
+package org.eclipse.linuxtools.tmf.tests;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.eclipse.linuxtools.tmf.tests.component.TmfEventProviderTest;
+import org.eclipse.linuxtools.tmf.tests.component.TmfProviderManagerTest;
+import org.eclipse.linuxtools.tmf.tests.event.TmfEventContentTest;
+import org.eclipse.linuxtools.tmf.tests.event.TmfEventFieldTest;
+import org.eclipse.linuxtools.tmf.tests.event.TmfEventReferenceTest;
+import org.eclipse.linuxtools.tmf.tests.event.TmfEventSourceTest;
+import org.eclipse.linuxtools.tmf.tests.event.TmfEventTest;
+import org.eclipse.linuxtools.tmf.tests.event.TmfEventTypeTest;
+import org.eclipse.linuxtools.tmf.tests.event.TmfTimeRangeTest;
+import org.eclipse.linuxtools.tmf.tests.event.TmfTimestampTest;
+import org.eclipse.linuxtools.tmf.tests.event.TmfTraceEventTest;
+import org.eclipse.linuxtools.tmf.tests.request.TmfCoalescedDataRequestTest;
+import org.eclipse.linuxtools.tmf.tests.request.TmfCoalescedEventRequestTest;
+import org.eclipse.linuxtools.tmf.tests.request.TmfDataRequestTest;
+import org.eclipse.linuxtools.tmf.tests.request.TmfEventRequestTest;
+import org.eclipse.linuxtools.tmf.tests.trace.TmfExperimentTest;
+import org.eclipse.linuxtools.tmf.tests.trace.TmfMultiTraceExperimentTest;
+import org.eclipse.linuxtools.tmf.tests.trace.TmfTraceTest;
+
+public class AllTmfCoreTests {
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite(AllTmfCoreTests.class.getName());
+		//$JUnit-BEGIN$
+		suite.addTestSuite(TmfEventProviderTest.class);
+		suite.addTestSuite(TmfProviderManagerTest.class);
+
+		suite.addTestSuite(TmfEventFieldTest.class);
+		suite.addTestSuite(TmfEventContentTest.class);
+		suite.addTestSuite(TmfEventTypeTest.class);
+		suite.addTestSuite(TmfEventSourceTest.class);
+		suite.addTestSuite(TmfTraceEventTest.class);
+		suite.addTestSuite(TmfEventReferenceTest.class);
+		suite.addTestSuite(TmfTimestampTest.class);
+		suite.addTestSuite(TmfTimeRangeTest.class);
+		suite.addTestSuite(TmfEventTest.class);
+
+		suite.addTestSuite(TmfDataRequestTest.class);
+		suite.addTestSuite(TmfEventRequestTest.class);
+		suite.addTestSuite(TmfCoalescedDataRequestTest.class);
+		suite.addTestSuite(TmfCoalescedEventRequestTest.class);
+
+		suite.addTestSuite(TmfTraceTest.class);
+		suite.addTestSuite(TmfExperimentTest.class);
+		suite.addTestSuite(TmfMultiTraceExperimentTest.class);
+		//$JUnit-END$
+		return suite;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/TmfCoreTestPlugin.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/TmfCoreTestPlugin.java
new file mode 100644
index 0000000..340da82
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/TmfCoreTestPlugin.java
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.tests;
+
+import org.eclipse.core.runtime.Plugin;
+
+/**
+ * <b><u>TmfTestPlugin</u></b>
+ * <p>
+ * The activator class controls the plug-in life cycle
+ */
+public class TmfCoreTestPlugin extends Plugin {
+
+    // ========================================================================
+    // Attributes
+    // ========================================================================
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.tmf.tests";
+
+	// The shared instance
+	private static TmfCoreTestPlugin plugin;
+	
+    // ========================================================================
+    // Constructors
+    // ========================================================================
+
+	/**
+	 * The constructor
+	 */
+	public TmfCoreTestPlugin() {
+		plugin = this;
+	}
+
+    // ========================================================================
+    // Accessors
+    // ========================================================================
+
+    /**
+     * @return the shared instance
+     */
+    public static TmfCoreTestPlugin getPlugin() {
+        return plugin;
+    }
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/AllTests.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/AllTests.java
new file mode 100644
index 0000000..411ae21
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/AllTests.java
@@ -0,0 +1,17 @@
+package org.eclipse.linuxtools.tmf.tests.component;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTests {
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite(AllTests.class.getName());
+		//$JUnit-BEGIN$
+		suite.addTestSuite(TmfEventProviderTest.class);
+		suite.addTestSuite(TmfProviderManagerTest.class);
+		//$JUnit-END$
+		return suite;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/TmfEventProviderTest.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/TmfEventProviderTest.java
new file mode 100644
index 0000000..6cec0d0
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/TmfEventProviderTest.java
@@ -0,0 +1,217 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.tests.component;
+
+import java.io.IOException;
+import java.util.Vector;
+
+import junit.framework.TestCase;
+
+import org.eclipse.linuxtools.tmf.component.ITmfDataProvider;
+import org.eclipse.linuxtools.tmf.component.TmfEventProviderStub;
+import org.eclipse.linuxtools.tmf.component.TmfProviderManager;
+import org.eclipse.linuxtools.tmf.component.TmfSyntheticEventProviderStub;
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.event.TmfSyntheticEventStub;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
+import org.eclipse.linuxtools.tmf.trace.TmfTraceStub;
+
+/**
+ * <b><u>TmfClientTest</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfEventProviderTest extends TestCase {
+
+	TmfEventProviderStub fEventProvider;
+	TmfSyntheticEventProviderStub fSyntheticEventProvider;
+
+	public TmfEventProviderTest(String name) throws IOException {
+		super(name);
+	}
+
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+		fEventProvider = new TmfEventProviderStub();
+		fSyntheticEventProvider = new TmfSyntheticEventProviderStub();
+	}
+
+	@Override
+	protected void tearDown() throws Exception {
+		super.tearDown();
+		fEventProvider.deregister();
+		fSyntheticEventProvider.deregister();
+	}
+
+	// ------------------------------------------------------------------------
+	// getProviders (more a sanity check than a test)
+	// ------------------------------------------------------------------------
+
+	@SuppressWarnings("unchecked")
+	public void testGetProviders() {
+
+		// There should be 2 TmfEvent providers: a TmfTraceStub and a TmfEventProviderStub
+		ITmfDataProvider<TmfEvent>[] eventProviders = (ITmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class);
+		assertTrue(eventProviders.length == 2);
+
+		eventProviders = (ITmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
+		assertTrue(eventProviders.length == 1);
+
+		eventProviders = (ITmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class, TmfEventProviderStub.class);
+		assertTrue(eventProviders.length == 1);
+
+		// There should be 1 TmfSyntheticEventStub provider
+		eventProviders = (ITmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfSyntheticEventStub.class);
+		assertTrue(eventProviders.length == 1);
+	}
+
+	// ------------------------------------------------------------------------
+	// getSyntheticEvent
+	// ------------------------------------------------------------------------
+
+	@SuppressWarnings("unchecked")
+	public void testGetPlainEvents() {
+
+        final int BLOCK_SIZE = 100;
+        final int NB_EVENTS  = 1000;
+        final Vector<TmfEvent> requestedEvents = new Vector<TmfEvent>();
+
+        // Get the TmfSyntheticEventStub provider
+		ITmfDataProvider<TmfEvent>[] eventProviders = (ITmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class, TmfEventProviderStub.class);
+		ITmfDataProvider<TmfEvent> provider = eventProviders[0];
+
+        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
+        final TmfEventRequest<TmfEvent> request =
+        	new TmfEventRequest<TmfEvent>(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) {
+            	@Override
+            	public void handleData() {
+            		TmfEvent[] events = getData();
+            		for (TmfEvent e : events) {
+            			requestedEvents.add(e);
+            		}
+            	}
+        	};
+        provider.sendRequest(request);
+        request.waitForCompletion();
+
+        assertEquals("nbEvents", NB_EVENTS, requestedEvents.size());
+        assertTrue("isCompleted",  request.isCompleted());
+        assertFalse("isCancelled", request.isCancelled());
+
+        // Make that we have distinct events.
+        // Don't go overboard: we are not validating the stub! 
+        for (int i = 0; i < NB_EVENTS; i++) {
+            assertEquals("Distinct events", i+1, requestedEvents.get(i).getTimestamp().getValue());
+        }
+	}
+
+	@SuppressWarnings("unchecked")
+	private void getSyntheticData(final TmfTimeRange range, final int nbEvents, final int blockSize) {
+
+        final Vector<TmfSyntheticEventStub> requestedEvents = new Vector<TmfSyntheticEventStub>();
+
+        // Get the event provider
+		ITmfDataProvider<TmfSyntheticEventStub>[] eventProviders = (ITmfDataProvider<TmfSyntheticEventStub>[]) TmfProviderManager.getProviders(TmfSyntheticEventStub.class);
+		ITmfDataProvider<TmfSyntheticEventStub> provider = eventProviders[0];
+
+        final TmfEventRequest<TmfSyntheticEventStub> request =
+        	new TmfEventRequest<TmfSyntheticEventStub>(TmfSyntheticEventStub.class, range, nbEvents, blockSize) {
+            	@Override
+            	public void handleData() {
+            		TmfSyntheticEventStub[] events = getData();
+            		for (TmfSyntheticEventStub e : events) {
+            			requestedEvents.add(e);
+            		}
+            	}
+        	};
+        provider.sendRequest(request);
+        request.waitForCompletion();
+
+        if (nbEvents != -1)
+        	assertEquals("nbEvents", nbEvents, requestedEvents.size());
+        assertTrue("isCompleted", request.isCompleted());
+        assertFalse("isCancelled", request.isCancelled());
+
+        // For each base event, the stub will queue 2 identical synthetic events
+        // Ensure that the events are queued properly.
+        // Don't go overboard: we are not validating the stub!
+        for (int i = 0; i < (nbEvents / 2); i++) {
+            assertEquals("Distinct events", i+1, requestedEvents.get(2 * i + 0).getTimestamp().getValue());
+            assertEquals("Distinct events", i+1, requestedEvents.get(2 * i + 1).getTimestamp().getValue());
+        }
+	}
+
+	// The following tests are the same but for the size of the requested blocks
+	// with regards to the size of the TmfSyntheticEventProviderStub block
+    public void testGetSyntheticEvents_EqualBlockSizes() {
+        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
+		getSyntheticData(range, 1000, TmfSyntheticEventProviderStub.BLOCK_SIZE);
+	}
+
+	public void testGetSyntheticEvents_SmallerBlock() {
+        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
+		getSyntheticData(range, 1000, TmfSyntheticEventProviderStub.BLOCK_SIZE / 2);
+	}
+
+	public void testGetSyntheticEvents_LargerBlock() {
+        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
+		getSyntheticData(range, 1000, TmfSyntheticEventProviderStub.BLOCK_SIZE * 2);
+	}
+
+	public void testGetSyntheticEvents_TimeRange() {
+		TmfTimestamp start = new TmfTimestamp(   1, (byte) -3, 0);
+		TmfTimestamp end   = new TmfTimestamp(1000, (byte) -3, 0);
+        TmfTimeRange range = new TmfTimeRange(start, end);
+		getSyntheticData(range, -1, TmfSyntheticEventProviderStub.BLOCK_SIZE);
+	}
+
+	public void testGetSyntheticEvents_WeirdTimeRange1() {
+		TmfTimestamp start = TmfTimestamp.BigBang;
+		TmfTimestamp end   = new TmfTimestamp(0, (byte) -3, 0);
+        TmfTimeRange range = new TmfTimeRange(start, end);
+		getSyntheticData(range, -1, TmfSyntheticEventProviderStub.BLOCK_SIZE);
+	}
+
+	public void testGetSyntheticEvents_WeirdTimeRange2() {
+		TmfTimestamp start = new TmfTimestamp(0, (byte) -3, 0);
+		TmfTimestamp end   = TmfTimestamp.BigCrunch;
+        TmfTimeRange range = new TmfTimeRange(start, end);
+		getSyntheticData(range, -1, TmfSyntheticEventProviderStub.BLOCK_SIZE);
+	}
+
+	// ------------------------------------------------------------------------
+	// getProviders (more a sanity check than a test)
+	// ------------------------------------------------------------------------
+
+	@SuppressWarnings("unchecked")
+	public void testGetProviders2() {
+
+		// There should be 2 TmfEvent providers: a TmfTraceStub and a TmfEventProviderStub
+		ITmfDataProvider<TmfEvent>[] eventProviders = (ITmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class);
+		assertTrue(eventProviders.length == 2);
+
+		eventProviders = (ITmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
+		assertTrue(eventProviders.length == 1);
+
+		eventProviders = (ITmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class, TmfEventProviderStub.class);
+		assertTrue(eventProviders.length == 1);
+
+		// There should be 1 TmfSyntheticEventStub provider
+		eventProviders = (ITmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfSyntheticEventStub.class);
+		assertTrue(eventProviders.length == 1);
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/TmfProviderManagerTest.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/TmfProviderManagerTest.java
new file mode 100644
index 0000000..8ca12d3
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/TmfProviderManagerTest.java
@@ -0,0 +1,292 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.tests.component;
+
+import junit.framework.TestCase;
+
+import org.eclipse.linuxtools.tmf.component.TmfDataProvider;
+import org.eclipse.linuxtools.tmf.component.TmfProviderManager;
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.request.TmfDataRequest;
+import org.eclipse.linuxtools.tmf.trace.ITmfContext;
+
+/**
+ * <b><u>TmfProviderManagerTest</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfProviderManagerTest extends TestCase {
+
+	public TmfProviderManagerTest(String name) {
+		super(name);
+	}
+
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+	}
+
+	@Override
+	protected void tearDown() throws Exception {
+		super.tearDown();
+	}
+
+	// ------------------------------------------------------------------------
+	// Dummy Providers
+	// ------------------------------------------------------------------------
+	
+	public class TestProvider1 extends TmfDataProvider<TmfEvent> {
+		public TestProvider1(Class<TmfEvent> type) {
+			super("TestProvider1", type);
+		}
+		@Override
+		public ITmfContext armRequest(TmfDataRequest<TmfEvent> request) {
+			return null;
+		}
+		@Override
+		public TmfEvent getNext(ITmfContext context) {
+			return null;
+		}
+		@Override
+		public boolean isCompleted(TmfDataRequest<TmfEvent> request, TmfEvent data, int nbRead) {
+			return false;
+		}
+	}
+
+	public class TestProvider2 extends TmfDataProvider<TmfEvent> {
+		public TestProvider2(Class<TmfEvent> type) {
+			super("TestProvider2", type);
+		}
+		@Override
+		public ITmfContext armRequest(TmfDataRequest<TmfEvent> request) {
+			return null;
+		}
+		@Override
+		public TmfEvent getNext(ITmfContext context) {
+			return null;
+		}
+		@Override
+		public boolean isCompleted(TmfDataRequest<TmfEvent> request, TmfEvent data, int nbRead) {
+			return false;
+		}
+	}
+
+	public class TmfEvent3 extends TmfEvent {
+		public TmfEvent3(TmfEvent3 other) {
+			super(other);
+		}
+	}
+
+	public class TestProvider3 extends TmfDataProvider<TmfEvent3> {
+		public TestProvider3(Class<TmfEvent3> type) {
+			super("TestProvider3", type);
+		}
+		@Override
+		public ITmfContext armRequest(TmfDataRequest<TmfEvent3> request) {
+			return null;
+		}
+		@Override
+		public TmfEvent3 getNext(ITmfContext context) {
+			return null;
+		}
+		@Override
+		public boolean isCompleted(TmfDataRequest<TmfEvent3> request, TmfEvent3 data, int nbRead) {
+			return false;
+		}
+	}
+
+	// ------------------------------------------------------------------------
+	// register()
+	// ------------------------------------------------------------------------
+
+	@SuppressWarnings("unchecked")
+	public void testRegister_0() {
+		TmfDataProvider<TmfEvent>[] providers = (TmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class);
+		assertTrue(providers.length == 0);
+
+		providers = (TmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class);
+		assertTrue(providers.length == 0);
+	}
+
+	@SuppressWarnings("unchecked")
+	public void testRegister_Unregister_1() {
+
+		// Register a single provider
+		TestProvider1 testProvider1 = new TestProvider1(TmfEvent.class);
+
+		TmfDataProvider<TmfEvent>[] providers = (TmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class);
+		assertTrue(providers.length == 1);
+		assertTrue(providers[0] == testProvider1);
+
+		providers = (TmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class);
+		assertTrue(providers.length == 1);
+		assertTrue(providers[0] == testProvider1);
+
+		// Unregister it
+		testProvider1.deregister();
+
+		providers = (TmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class);
+		assertTrue(providers.length == 0);
+
+		providers = (TmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class);
+		assertTrue(providers.length == 0);
+	}
+
+	@SuppressWarnings("unchecked")
+	public void testRegister_Unregister_2() {
+
+		// Register 2 providers, same data type
+		TestProvider1 testProvider1 = new TestProvider1(TmfEvent.class);
+		TestProvider2 testProvider2 = new TestProvider2(TmfEvent.class);
+
+		TmfDataProvider<TmfEvent>[] providers = (TmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class);
+		assertTrue(providers.length == 2);
+		if (providers[0] == testProvider1) {
+			assertTrue(providers[1] == testProvider2);
+		}
+		else {
+			assertTrue(providers[1] == testProvider1);
+			assertTrue(providers[0] == testProvider2);
+		}
+
+		providers = (TmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class);
+		assertTrue(providers.length == 1);
+		assertTrue(providers[0] == testProvider1);
+
+		providers = (TmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class);
+		assertTrue(providers.length == 1);
+		assertTrue(providers[0] == testProvider2);
+
+		// Remove one
+		testProvider1.deregister();
+
+		providers = (TmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class);
+		assertTrue(providers.length == 1);
+		assertTrue(providers[0] == testProvider2);
+
+		providers = (TmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class);
+		assertTrue(providers.length == 0);
+
+		providers = (TmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class);
+		assertTrue(providers.length == 1);
+		assertTrue(providers[0] == testProvider2);
+
+		// Remove the other
+		testProvider2.deregister();
+
+		providers = (TmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class);
+		assertTrue(providers.length == 0);
+
+		providers = (TmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class);
+		assertTrue(providers.length == 0);
+
+		providers = (TmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class);
+		assertTrue(providers.length == 0);
+	}
+
+	@SuppressWarnings("unchecked")
+	public void testRegister_Unregister_3() {
+
+		// Register 3 providers, mixed data types
+		TestProvider1 testProvider1 = new TestProvider1(TmfEvent.class);
+		TestProvider2 testProvider2 = new TestProvider2(TmfEvent.class);
+		TestProvider3 testProvider3 = new TestProvider3(TmfEvent3.class);
+
+		TmfDataProvider<TmfEvent>[] providers = (TmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class);
+		assertTrue(providers.length == 2);
+		if (providers[0] == testProvider1) {
+			assertTrue(providers[1] == testProvider2);
+		}
+		else {
+			assertTrue(providers[1] == testProvider1);
+			assertTrue(providers[0] == testProvider2);
+		}
+
+		TmfDataProvider<TmfEvent3>[] providers3 = (TmfDataProvider<TmfEvent3>[]) TmfProviderManager.getProviders(TmfEvent3.class);
+		assertTrue(providers3.length == 1);
+		assertTrue(providers3[0] == testProvider3);
+
+		providers = (TmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class);
+		assertTrue(providers.length == 1);
+		assertTrue(providers[0] == testProvider1);
+
+		providers = (TmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class);
+		assertTrue(providers.length == 1);
+		assertTrue(providers[0] == testProvider2);
+
+		providers3 = (TmfDataProvider<TmfEvent3>[]) TmfProviderManager.getProviders(TmfEvent3.class, TestProvider3.class);
+		assertTrue(providers3.length == 1);
+		assertTrue(providers3[0] == testProvider3);
+
+		// Remove one
+		testProvider1.deregister();
+
+		providers = (TmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class);
+		assertTrue(providers.length == 1);
+		assertTrue(providers[0] == testProvider2);
+
+		providers = (TmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class);
+		assertTrue(providers.length == 0);
+
+		providers = (TmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class);
+		assertTrue(providers.length == 1);
+		assertTrue(providers[0] == testProvider2);
+
+		providers3 = (TmfDataProvider<TmfEvent3>[]) TmfProviderManager.getProviders(TmfEvent3.class);
+		assertTrue(providers3.length == 1);
+		assertTrue(providers3[0] == testProvider3);
+
+		providers3 = (TmfDataProvider<TmfEvent3>[]) TmfProviderManager.getProviders(TmfEvent3.class, TestProvider3.class);
+		assertTrue(providers3.length == 1);
+		assertTrue(providers3[0] == testProvider3);
+
+		// Remove another one
+		testProvider2.deregister();
+
+		providers = (TmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class);
+		assertTrue(providers.length == 0);
+
+		providers = (TmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class);
+		assertTrue(providers.length == 0);
+
+		providers = (TmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class);
+		assertTrue(providers.length == 0);
+
+		providers3 = (TmfDataProvider<TmfEvent3>[]) TmfProviderManager.getProviders(TmfEvent3.class);
+		assertTrue(providers3.length == 1);
+		assertTrue(providers3[0] == testProvider3);
+
+		providers3 = (TmfDataProvider<TmfEvent3>[]) TmfProviderManager.getProviders(TmfEvent3.class, TestProvider3.class);
+		assertTrue(providers3.length == 1);
+		assertTrue(providers3[0] == testProvider3);
+
+		// Remove the last one
+		testProvider3.deregister();
+
+		providers = (TmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class);
+		assertTrue(providers.length == 0);
+
+		providers = (TmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class);
+		assertTrue(providers.length == 0);
+
+		providers = (TmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class);
+		assertTrue(providers.length == 0);
+
+		providers3 = (TmfDataProvider<TmfEvent3>[]) TmfProviderManager.getProviders(TmfEvent3.class);
+		assertTrue(providers3.length == 0);
+
+		providers3 = (TmfDataProvider<TmfEvent3>[]) TmfProviderManager.getProviders(TmfEvent3.class, TestProvider3.class);
+		assertTrue(providers3.length == 0);
+	}
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/AllTests.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/AllTests.java
new file mode 100644
index 0000000..c298219
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/AllTests.java
@@ -0,0 +1,26 @@
+package org.eclipse.linuxtools.tmf.tests.event;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.eclipse.linuxtools.tmf.TmfCorePlugin;
+
+public class AllTests {
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite("Test suite for " + TmfCorePlugin.PLUGIN_ID + ".event"); //$NON-NLS-1$);
+		//$JUnit-BEGIN$
+		suite.addTestSuite(TmfEventFieldTest.class);
+		suite.addTestSuite(TmfEventContentTest.class);
+		suite.addTestSuite(TmfEventTypeTest.class);
+		suite.addTestSuite(TmfEventSourceTest.class);
+		suite.addTestSuite(TmfTraceEventTest.class);
+		suite.addTestSuite(TmfEventReferenceTest.class);
+		suite.addTestSuite(TmfTimestampTest.class);
+		suite.addTestSuite(TmfTimeRangeTest.class);
+		suite.addTestSuite(TmfEventTest.class);
+		//$JUnit-END$
+		return suite;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventContentTest.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventContentTest.java
new file mode 100644
index 0000000..f534586
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventContentTest.java
@@ -0,0 +1,202 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.tests.event;
+
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.event.TmfEventContent;
+import org.eclipse.linuxtools.tmf.event.TmfEventContentStub;
+import org.eclipse.linuxtools.tmf.event.TmfEventReference;
+import org.eclipse.linuxtools.tmf.event.TmfEventSource;
+import org.eclipse.linuxtools.tmf.event.TmfEventType;
+import org.eclipse.linuxtools.tmf.event.TmfEventTypeStub;
+import org.eclipse.linuxtools.tmf.event.TmfNoSuchFieldException;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+
+import junit.framework.TestCase;
+
+/**
+ * <b><u>TmfEventContentTest</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfEventContentTest extends TestCase {
+
+	private final TmfTimestamp      fTimestamp;
+	private final TmfEventSource    fEventSource;
+	private final TmfEventType      fEventType;
+	private final TmfEventTypeStub  fEventTypeStub;
+	private final TmfEventReference fReference;
+	private final TmfEvent          fEvent;
+	private final TmfEvent          fEventStub;
+
+	private final Object fRawContent = new String("Some content");
+
+	private final TmfEventContent     fBasicContent;
+	private final TmfEventContentStub fStubContent;
+
+	/**
+	 * @param name
+	 */
+	public TmfEventContentTest(String name) {
+		super(name);
+		fTimestamp     = new TmfTimestamp();
+		fEventSource   = new TmfEventSource();
+		fEventType     = new TmfEventType();
+		fEventTypeStub = new TmfEventTypeStub();
+		fReference     = new TmfEventReference();
+
+		fEvent        = new TmfEvent(fTimestamp, fEventSource, fEventType, fReference);
+		fBasicContent = new TmfEventContent(fEvent, fRawContent);
+
+		fEventStub    = new TmfEvent(fTimestamp, fEventSource, fEventTypeStub, fReference);
+		fStubContent  = new TmfEventContentStub(fEventStub, fRawContent);
+	}
+
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+	}
+
+	@Override
+	protected void tearDown() throws Exception {
+		super.tearDown();
+	}
+
+	// ========================================================================
+	// Constructors
+	// ========================================================================
+
+	public void testTmfEventContent() {
+		assertSame("getLabels",  fEvent,      fBasicContent.getEvent());
+		assertSame("getType",    fEventType,  fBasicContent.getType());
+		assertSame("getContent", fRawContent, fBasicContent.getContent());
+	}
+
+	public void testTmfEventContentCopy() {
+		TmfEventContent content  = new TmfEventContent(fBasicContent);
+		assertSame("getLabels",  fEvent,      content.getEvent());
+		assertSame("getType",    fEventType,  content.getType());
+		assertSame("getContent", fRawContent, content.getContent());
+	}
+
+	public void testCloneShallowCopy() {
+		TmfEventContent content  = fBasicContent.clone();
+		assertSame("getLabels",  fEvent,      content.getEvent());
+		assertSame("getType",    fEventType,  content.getType());
+		assertSame("getContent", fRawContent, content.getContent());
+	}
+
+	public void testCloneDeepCopy() {
+		TmfEventContent content  = fStubContent.clone();
+		assertSame   ("getEvent",   fEventStub,     content.getEvent());
+		assertSame   ("getType",    fEventTypeStub, content.getType());
+		assertNotSame("getContent", fRawContent,    content.getContent());
+		assertEquals ("getContent", fRawContent,    content.getContent());
+	}
+
+	// ========================================================================
+	// Basic content parsing
+	// ========================================================================
+
+	public void testGetFields() {
+		Object[] fields = fBasicContent.getFields(); 
+		assertEquals("getFields", 1, fields.length);
+		assertEquals("getFields", fRawContent, fields[0].toString());
+	}
+
+	public void testGetFieldFromId() {
+		Object field;
+		try {
+			field = fBasicContent.getField("Content");
+			assertEquals("getField", fRawContent, field.toString());
+		} catch (TmfNoSuchFieldException e) {
+			fail("Field not found");
+		} 
+	}
+
+	public void testGetFieldFromIdFailed() {
+		try {
+			fBasicContent.getField("Dummy");
+			fail("Found an inexisting field...");
+		} catch (TmfNoSuchFieldException e) {
+			// Success
+		} 
+	}
+
+	public void testGetFieldFromPos() {
+		Object field = fBasicContent.getField(0);
+		assertEquals("getField", fRawContent, field.toString());
+	}
+
+	// ========================================================================
+	// Standard content parsing
+	// ========================================================================
+
+	public void testGetFields2() {
+		Object[] fields = fStubContent.getFields(); 
+		assertEquals("getFields", 5, fields.length);
+	}
+
+	public void testGetFieldFromId2() {
+		Object field;
+		try {
+			field = fStubContent.getField("Field1");
+			assertEquals("getField", new Integer(1), field);
+
+			field = fStubContent.getField("Field2");
+			assertEquals("getField", new Integer(-10), field);
+
+			field = fStubContent.getField("Field3");
+			assertEquals("getField", new Boolean(true), field);
+
+			field = fStubContent.getField("Field4");
+			assertEquals("getField", new String("some string"), field);
+
+			field = fStubContent.getField("Field5");
+			assertEquals("getField", new TmfTimestamp(1, (byte) 2, 3), field);
+
+		} catch (TmfNoSuchFieldException e) {
+			fail("Field not found");
+		} 
+	}
+
+	public void testGetFieldFromPos2() {
+		TmfEventContentStub content = new TmfEventContentStub(fEvent, fRawContent);
+
+		Object field = content.getField(0);
+		assertEquals("getField", new Integer(1), field);
+
+		field = content.getField(1);
+		assertEquals("getField", new Integer(-10), field);
+
+		field = content.getField(2);
+		assertEquals("getField", new Boolean(true), field);
+
+		field = content.getField(3);
+		assertEquals("getField", new String("some string"), field);
+
+		field = content.getField(4);
+		assertEquals("getField", new TmfTimestamp(1, (byte) 2, 3), field);
+	}
+
+	// ========================================================================
+	// Operators
+	// ========================================================================
+
+	public void testToString() {
+		String expected = "[TmfEventContent(" + fRawContent + ",)]";
+		TmfEventContent content = new TmfEventContent(fEvent, fRawContent);
+		assertEquals("toString", expected, content.toString());
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventFieldTest.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventFieldTest.java
new file mode 100644
index 0000000..f2d5362
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventFieldTest.java
@@ -0,0 +1,115 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.tests.event;
+
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.event.TmfEventContent;
+import org.eclipse.linuxtools.tmf.event.TmfEventField;
+import org.eclipse.linuxtools.tmf.event.TmfEventReference;
+import org.eclipse.linuxtools.tmf.event.TmfEventSource;
+import org.eclipse.linuxtools.tmf.event.TmfEventType;
+import org.eclipse.linuxtools.tmf.event.TmfEventTypeStub;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+
+import junit.framework.TestCase;
+
+/**
+ * <b><u>TmfEventFieldTest</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfEventFieldTest extends TestCase {
+
+	private final TmfEventContent fContent;
+	private final String fFieldId = "Field";
+	private final Object fValue1  = new String("Value"); 
+	private final Object fValue2  = new Integer(10); 
+
+	// ========================================================================
+	// Housekeeping
+	// ========================================================================
+
+	public TmfEventFieldTest(String name) {
+		super(name);
+		TmfTimestamp      fTimestamp   = new TmfTimestamp();
+		TmfEventSource    fEventSource = new TmfEventSource();
+		TmfEventType      fEventType   = new TmfEventTypeStub();
+		TmfEventReference fReference   = new TmfEventReference();
+		TmfEvent          fEvent       = new TmfEvent(fTimestamp, fEventSource, fEventType, fReference);
+
+		fContent = new TmfEventContent(fEvent, "Some content");
+	}
+
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+	}
+
+	@Override
+	protected void tearDown() throws Exception {
+		super.tearDown();
+	}
+
+	// ========================================================================
+	// Constructors
+	// ========================================================================
+
+	public void testTmfEventField() {
+		TmfEventField field = new TmfEventField(fContent, fFieldId, fValue1);
+		assertSame("getParent", fContent, field.getParent());
+		assertSame("getId",     fFieldId, field.getId());
+		assertSame("getValue",  fValue1,  field.getValue());
+	}
+
+	public void testTmfEventFieldCopy() {
+		TmfEventField original = new TmfEventField(fContent, fFieldId, fValue1);
+		TmfEventField field = new TmfEventField(original);
+		assertSame("getParent", fContent, field.getParent());
+		assertSame("getId",     fFieldId, field.getId());
+		assertSame("getValue",  fValue1,  field.getValue());
+	}
+
+	public void testCloneShallowCopy() {
+		TmfEventField original = new TmfEventField(fContent, fFieldId, fValue1);
+		TmfEventField field = original.clone();
+		assertSame("getParent", fContent, field.getParent());
+		assertSame("getId",     fFieldId, field.getId());
+		assertSame("getValue",  fValue1,  field.getValue());
+	}
+
+//	public void testCloneDeepCopy() {
+//		TmfEventField original = new TmfEventField(fContent, fFieldId, fValue1);
+//		TmfEventField field = original.clone();
+//		assertNotSame("getParent", fContent, field.getParent());
+//		assertNotSame("getId",     fFieldId, field.getId());
+//		assertNotSame("getValue",  fValue1,  field.getValue());
+//		assertEquals ("getParent", fContent, field.getParent());
+//		assertEquals ("getId",     fFieldId, field.getId());
+//		assertEquals ("getValue",  fValue1,  field.getValue());
+//	}
+
+	// ========================================================================
+	// Operators
+	// ========================================================================
+
+	public void testToString() {
+		String expected1 = "[TmfEventField(" + fFieldId + ":" + fValue1.toString() + ")]";
+		TmfEventField field = new TmfEventField(fContent, fFieldId, fValue1);
+		assertEquals("toString", expected1, field.toString());
+
+		String expected2 = "[TmfEventField(" + fFieldId + ":" + fValue2.toString() + ")]";
+		field = new TmfEventField(fContent, fFieldId, fValue2);
+		assertEquals("toString", expected2, field.toString());
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventReferenceTest.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventReferenceTest.java
new file mode 100644
index 0000000..0f6d755
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventReferenceTest.java
@@ -0,0 +1,93 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.tests.event;
+
+import org.eclipse.linuxtools.tmf.event.TmfEventReference;
+
+import junit.framework.TestCase;
+
+/**
+ * <b><u>TmfEventReferenceTest</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfEventReferenceTest extends TestCase {
+
+	private final Object fReference = new String("Some reference");
+
+	// ========================================================================
+	// Housekeeping
+	// ========================================================================
+
+	public TmfEventReferenceTest(String name) {
+		super(name);
+	}
+
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+	}
+
+	@Override
+	protected void tearDown() throws Exception {
+		super.tearDown();
+	}
+
+	// ========================================================================
+	// Constructors
+	// ========================================================================
+
+	public void testTmfEventReferenceDefault() {
+		TmfEventReference reference = new TmfEventReference();
+		assertEquals("getReference", null, reference.getReference());
+	}
+
+	public void testTmfEventReference() {
+		TmfEventReference reference = new TmfEventReference(fReference);
+		assertSame("getReference", fReference, reference.getReference());
+	}
+
+	public void testTmfEventReferenceCopy() {
+		TmfEventReference original = new TmfEventReference(fReference);
+		TmfEventReference reference = new TmfEventReference(original);
+		assertSame("getReference", fReference, reference.getReference());
+	}
+
+	public void testCloneShallowCopy() {
+		TmfEventReference original = new TmfEventReference(fReference);
+		TmfEventReference reference = original.clone();
+		assertSame("getReference", fReference, reference.getReference());
+	}
+
+//	public void testCloneDeepCopy() {
+//		TmfEventReference original = new TmfEventReference(fReference);
+//		TmfEventReference reference = original.clone();
+//		assertNotSame("getReference", fReference, reference.getReference());
+//		assertEquals ("getReference", fReference, reference.getReference());
+//	}
+
+	// ========================================================================
+	// Operators
+	// ========================================================================
+
+	public void testToString() {
+		String expected1 = "[TmfEventReference(" + "null" + ")]";
+		TmfEventReference reference1 = new TmfEventReference();
+		assertEquals("toString", expected1, reference1.toString());
+
+		String expected2 = "[TmfEventReference(" + fReference.toString() + ")]";
+		TmfEventReference reference2 = new TmfEventReference(fReference);
+		assertEquals("toString", expected2, reference2.toString());
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventSourceTest.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventSourceTest.java
new file mode 100644
index 0000000..b06137f
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventSourceTest.java
@@ -0,0 +1,93 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.tests.event;
+
+import org.eclipse.linuxtools.tmf.event.TmfEventSource;
+
+import junit.framework.TestCase;
+
+/**
+ * <b><u>TmfEventSourceTest</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfEventSourceTest extends TestCase {
+
+	private final Object fSource = new String("Some source");
+
+	// ========================================================================
+	// Housekeeping
+	// ========================================================================
+
+	public TmfEventSourceTest(String name) {
+		super(name);
+	}
+
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+	}
+
+	@Override
+	protected void tearDown() throws Exception {
+		super.tearDown();
+	}
+
+	// ========================================================================
+	// Constructors
+	// ========================================================================
+
+	public void testTmfEventSourceDefault() {
+		TmfEventSource source = new TmfEventSource();
+		assertEquals("getSourceId", null, source.getSourceId());
+	}
+
+	public void testTmfEventSource() {
+		TmfEventSource source = new TmfEventSource(fSource);
+		assertSame("getSourceId", fSource, source.getSourceId());
+	}
+
+	public void testTmfEventSourceCopy() {
+		TmfEventSource original = new TmfEventSource(fSource);
+		TmfEventSource source = new TmfEventSource(original);
+		assertSame("getSourceId", fSource, source.getSourceId());
+	}
+
+	public void testCloneShallowCopy() {
+		TmfEventSource original = new TmfEventSource(fSource);
+		TmfEventSource source = original.clone();
+		assertSame("getSourceId", fSource, source.getSourceId());
+	}
+
+//	public void testCloneDeepCopy() {
+//		TmfEventSource original = new TmfEventSource(fSource);
+//		TmfEventSource source = original.clone();
+//		assertNotSame("getSourceId", fSource, source.getSourceId());
+//		assertEquals ("getSourceId", fSource, source.getSourceId());
+//	}
+
+	// ========================================================================
+	// Operators
+	// ========================================================================
+
+	public void testToString() {
+		String expected1 = "[TmfEventSource(" + "null" + ")]";
+		TmfEventSource source1 = new TmfEventSource();
+		assertEquals("toString", expected1, source1.toString());
+
+		String expected2 = "[TmfEventSource(" + fSource.toString() + ")]";
+		TmfEventSource source2 = new TmfEventSource(fSource);
+		assertEquals("toString", expected2, source2.toString());
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTest.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTest.java
new file mode 100644
index 0000000..ee6abec
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTest.java
@@ -0,0 +1,138 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.tests.event;
+
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.event.TmfEventContent;
+import org.eclipse.linuxtools.tmf.event.TmfEventReference;
+import org.eclipse.linuxtools.tmf.event.TmfEventSource;
+import org.eclipse.linuxtools.tmf.event.TmfEventType;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+
+import junit.framework.TestCase;
+
+/**
+ * <b><u>TmfEventTest</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfEventTest extends TestCase {
+
+	private final String   fTypeId = "Some type";
+	private final String   fLabel0 = "label1";
+	private final String   fLabel1 = "label2";
+	private final String[] fLabels = new String[] { fLabel0, fLabel1 };
+
+	private final TmfTimestamp      fTimestamp1 = new TmfTimestamp(12345, (byte) 2, 5);
+	private final TmfTimestamp      fTimestamp2 = new TmfTimestamp(12350, (byte) 2, 5);
+	private final TmfEventSource    fSource     = new TmfEventSource("Source");
+	private final TmfEventType      fType       = new TmfEventType(fTypeId, fLabels);
+	private final TmfEventReference fReference  = new TmfEventReference("Some reference");
+
+	private final TmfEvent fEvent1;
+	private final TmfEvent fEvent2;
+
+	private final TmfEventContent fContent1;
+	private final TmfEventContent fContent2;
+	
+	// ========================================================================
+	// Housekeeping
+	// ========================================================================
+
+	public TmfEventTest(String name) {
+		super(name);
+
+		fEvent1 = new TmfEvent(fTimestamp1, fSource, fType, fReference);
+		fContent1 = new TmfEventContent(fEvent1, "Some content");
+		fEvent1.setContent(fContent1);
+
+		fEvent2 = new TmfEvent(fTimestamp1, fTimestamp2, fSource, fType, fReference);
+		fContent2 = new TmfEventContent(fEvent2, "Some other content");
+		fEvent2.setContent(fContent2);
+	}
+
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+	}
+
+	@Override
+	protected void tearDown() throws Exception {
+		super.tearDown();
+	}
+
+	// ========================================================================
+	// Constructors
+	// ========================================================================
+
+	public void testTmfEvent() {
+		assertEquals("getTimestamp",         fTimestamp1, fEvent1.getTimestamp());
+		assertEquals("getOriginalTimestamp", fTimestamp1, fEvent1.getOriginalTimestamp());
+		assertEquals("getSource",            fSource,     fEvent1.getSource());
+		assertEquals("getType",              fType,       fEvent1.getType());
+		assertEquals("getContent",           fContent1,   fEvent1.getContent());
+		assertEquals("getReference",         fReference,  fEvent1.getReference());
+	}
+
+	public void testTmfEvent2() {
+		assertEquals("getTimestamp",         fTimestamp2, fEvent2.getTimestamp());
+		assertEquals("getOriginalTimestamp", fTimestamp1, fEvent2.getOriginalTimestamp());
+		assertEquals("getSource",            fSource,     fEvent2.getSource());
+		assertEquals("getType",              fType,       fEvent2.getType());
+		assertEquals("getContent",           fContent2,   fEvent2.getContent());
+		assertEquals("getReference",         fReference,  fEvent2.getReference());
+	}
+
+	public void testTmfEventCopy() {
+		TmfEvent event = new TmfEvent(fEvent1);
+		assertEquals("getTimestamp",         fTimestamp1, event.getTimestamp());
+		assertEquals("getOriginalTimestamp", fTimestamp1, event.getOriginalTimestamp());
+		assertEquals("getSource",            fSource,     event.getSource());
+		assertEquals("getType",              fType,       event.getType());
+		assertEquals("getContent",           fContent1,   event.getContent());
+		assertEquals("getReference",         fReference,  event.getReference());
+	}
+
+//	public void testTmfEventCloneShallowCopy() {
+//		TmfEvent event = fEvent1.clone();
+//		assertEquals("getTimestamp",         fTimestamp1, event.getTimestamp());
+//		assertEquals("getOriginalTimestamp", fTimestamp1, event.getOriginalTimestamp());
+//		assertEquals("getSource",            fSource,     event.getSource());
+//		assertEquals("getType",              fType,       event.getType());
+//		assertEquals("getContent",           fContent1,   event.getContent());
+//		assertEquals("getReference",         fReference,  event.getReference());
+//	}
+
+//	public void testTmfEventCloneDeepCopy() {
+//		TmfEvent event = fEvent1.clone();
+//		assertEquals("getTimestamp",         fTimestamp1, event.getTimestamp());
+//		assertEquals("getOriginalTimestamp", fTimestamp1, event.getOriginalTimestamp());
+//		assertEquals("getSource",            fSource,     event.getSource());
+//		assertEquals("getType",              fType,       event.getType());
+//		assertEquals("getContent",           fContent1,   event.getContent());
+//		assertEquals("getReference",         fReference,  event.getReference());
+//	}
+
+	// ========================================================================
+	// Operators
+	// ========================================================================
+
+//	public void testToString() {
+//		String expected1 = "[TmfEventType:" + TmfEventType.DEFAULT_TYPE_ID + "]";
+//		assertEquals("toString", expected1, fEvent1.toString());
+//
+//		String expected2 = "[TmfEventType:" + fTypeId + "]";
+//		assertEquals("toString", expected2, fEvent2.toString());
+//	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTypeTest.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTypeTest.java
new file mode 100644
index 0000000..1c46c7d
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTypeTest.java
@@ -0,0 +1,123 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.tests.event;
+
+import org.eclipse.linuxtools.tmf.event.TmfEventType;
+import org.eclipse.linuxtools.tmf.event.TmfNoSuchFieldException;
+
+import junit.framework.TestCase;
+
+/**
+ * <b><u>TmfEventTypeTest</u></b>
+ * <p>
+ * JUnit test suite for the TmfEventType class.
+ */
+public class TmfEventTypeTest extends TestCase {
+
+	private final String   fTypeId = "Some type";
+	private final String   fLabel0 = "label1";
+	private final String   fLabel1 = "label2";
+	private final String[] fLabels = new String[] { fLabel0, fLabel1 };
+
+	// ========================================================================
+	// Housekeeping
+	// ========================================================================
+
+	public TmfEventTypeTest(String name) {
+		super(name);
+	}
+
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+	}
+
+	@Override
+	protected void tearDown() throws Exception {
+		super.tearDown();
+	}
+
+	// ========================================================================
+	// Constructors
+	// ========================================================================
+
+	public void testTmfEventTypeDefault() {
+		TmfEventType type = new TmfEventType();
+		try {
+			assertEquals("getTypeId",     TmfEventType.DEFAULT_TYPE_ID, type.getTypeId());
+			assertEquals("getNbFields",   1, type.getNbFields());
+			assertEquals("getFieldIndex", 0, type.getFieldIndex(TmfEventType.DEFAULT_LABELS[0]));
+			assertEquals("getLabels",     TmfEventType.DEFAULT_LABELS, type.getLabels());
+			assertEquals("getLabel",      TmfEventType.DEFAULT_LABELS[0], type.getLabel(0));
+		} catch (TmfNoSuchFieldException e) {
+			fail("getFieldIndex: no such field");
+		}
+	}
+
+	public void testTmfEventType() {
+		TmfEventType type = new TmfEventType(fTypeId, fLabels);
+		try {
+			assertEquals("getTypeId",     fTypeId, type.getTypeId());
+			assertEquals("getNbFields",   fLabels.length, type.getNbFields());
+			assertEquals("getFieldIndex", 0, type.getFieldIndex(fLabel0));
+			assertEquals("getFieldIndex", 1, type.getFieldIndex(fLabel1));
+			assertEquals("getLabels",     fLabels, type.getLabels());
+			assertEquals("getLabel",      fLabel0, type.getLabel(0));
+			assertEquals("getLabel",      fLabel1, type.getLabel(1));
+		} catch (TmfNoSuchFieldException e) {
+			fail("getFieldIndex: no such field");
+		}
+
+		try {
+			assertEquals("getFieldIndex", 0, type.getFieldIndex("Dummy"));
+			fail("getFieldIndex: inexistant field");
+		} catch (TmfNoSuchFieldException e) {
+			// Success
+		}
+	}
+
+	public void testTmfEventTypeCopy() {
+		TmfEventType original = new TmfEventType(fTypeId, fLabels);
+		TmfEventType type = new TmfEventType(original);
+		assertEquals("getTypeId",     fTypeId, type.getTypeId());
+		assertEquals("getNbFields",   fLabels.length, type.getNbFields());
+		assertEquals("getLabels",     fLabels, type.getLabels());
+	}
+
+	public void testCloneShallowCopy() {
+		TmfEventType original = new TmfEventType(fTypeId, fLabels);
+		TmfEventType type = original.clone();
+		assertEquals("getTypeId",     fTypeId, type.getTypeId());
+		assertEquals("getNbFields",   fLabels.length, type.getNbFields());
+		assertEquals("getLabels",     fLabels, type.getLabels());
+	}
+
+//	public void testCloneDeepCopy() {
+//		fail("Not yet implemented");
+//	}
+
+	// ========================================================================
+	// Operators
+	// ========================================================================
+
+	public void testToString() {
+		String expected1 = "[TmfEventType:" + TmfEventType.DEFAULT_TYPE_ID + "]";
+		TmfEventType type1 = new TmfEventType();
+		assertEquals("toString", expected1, type1.toString());
+
+		String expected2 = "[TmfEventType:" + fTypeId + "]";
+		TmfEventType type2 = new TmfEventType(fTypeId, fLabels);
+		assertEquals("toString", expected2, type2.toString());
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTimeRangeTest.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTimeRangeTest.java
new file mode 100644
index 0000000..19d3ba9
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTimeRangeTest.java
@@ -0,0 +1,107 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.tests.event;
+
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+
+import junit.framework.TestCase;
+
+/**
+ * <b><u>TmfTimeRangeTest</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfTimeRangeTest extends TestCase {
+
+	// ========================================================================
+	// Housekeeping
+	// ========================================================================
+
+	public TmfTimeRangeTest(String name) {
+		super(name);
+	}
+
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+	}
+
+	@Override
+	protected void tearDown() throws Exception {
+		super.tearDown();
+	}
+
+	// ========================================================================
+	// Constructors
+	// ========================================================================
+
+	public void testConstructor() throws Exception {
+		TmfTimestamp ts1 = new TmfTimestamp(12345);
+		TmfTimestamp ts2 = new TmfTimestamp(12350);
+		TmfTimeRange range = new TmfTimeRange(ts1, ts2);
+		assertEquals("startTime", ts1, range.getStartTime());
+		assertEquals("endTime", ts2, range.getEndTime());
+	}
+
+	public void testOpenRange1() throws Exception {
+		TmfTimestamp ts2 = new TmfTimestamp(12350);
+		TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, ts2);
+		assertEquals("startTime", TmfTimestamp.BigBang, range.getStartTime());
+		assertEquals("endTime", ts2, range.getEndTime());
+	}
+
+	public void testOpenRange2() throws Exception {
+		TmfTimestamp ts1 = new TmfTimestamp(12345);
+		TmfTimeRange range = new TmfTimeRange(ts1, TmfTimestamp.BigCrunch);
+		assertEquals("startTime", ts1, range.getStartTime());
+		assertEquals("endTime", TmfTimestamp.BigCrunch, range.getEndTime());
+	}
+
+	public void testOpenRange3() throws Exception {
+		TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang,	TmfTimestamp.BigCrunch);
+		assertEquals("startTime", TmfTimestamp.BigBang, range.getStartTime());
+		assertEquals("endTime", TmfTimestamp.BigCrunch, range.getEndTime());
+	}
+	
+	// ========================================================================
+	// contains
+	// ========================================================================
+
+	public void testContains() throws Exception {
+		TmfTimestamp ts1 = new TmfTimestamp(12345);
+		TmfTimestamp ts2 = new TmfTimestamp(12350);
+		TmfTimeRange range = new TmfTimeRange(ts1, ts2);
+
+		assertTrue("contains (lower bound)", range.contains(new TmfTimestamp(12345)));
+		assertTrue("contains (higher bound)", range.contains(new TmfTimestamp(12350)));
+		assertTrue("contains (within bounds)", range.contains(new TmfTimestamp(12346)));
+
+		assertFalse("contains (low value)", range.contains(new TmfTimestamp(12340)));
+		assertFalse("contains (high value)", range.contains(new TmfTimestamp(12351)));
+	}
+
+	// ========================================================================
+	// toString
+	// ========================================================================
+
+	public void testToString() throws Exception {
+		TmfTimestamp ts1 = new TmfTimestamp(12345);
+		TmfTimestamp ts2 = new TmfTimestamp(12350);
+		TmfTimeRange range = new TmfTimeRange(ts1, ts2);
+
+		String expected = "[TmfTimeRange(" + ts1.toString() + ":" + ts2.toString() + ")]";
+		assertEquals("toString", expected, range.toString());
+	}
+	
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTimestampTest.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTimestampTest.java
new file mode 100644
index 0000000..a0773ca
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTimestampTest.java
@@ -0,0 +1,319 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.tests.event;
+
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+
+import junit.framework.TestCase;
+
+/**
+ * <b><u>TmfTimestampTest</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfTimestampTest extends TestCase {
+
+	// ========================================================================
+	// Housekeeping
+	// ========================================================================
+
+	public TmfTimestampTest(String name) {
+		super(name);
+	}
+
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+	}
+
+	@Override
+	protected void tearDown() throws Exception {
+		super.tearDown();
+	}
+
+	// ========================================================================
+	// Constructors
+	// ========================================================================
+
+	public void testDefaultConstructor() throws Exception {
+		TmfTimestamp ts = new TmfTimestamp();
+		assertEquals("getValue", 0, ts.getValue());
+		assertEquals("getscale", 0, ts.getScale());
+		assertEquals("getPrecision", 0, ts.getPrecision());
+	}
+
+	public void testSimpleConstructor() throws Exception {
+		TmfTimestamp ts = new TmfTimestamp(12345);
+		assertEquals("getValue", 12345, ts.getValue());
+		assertEquals("getscale", 0, ts.getScale());
+		assertEquals("getPrecision", 0, ts.getPrecision());
+	}
+
+	public void testSimpleConstructor2() throws Exception {
+		TmfTimestamp ts = new TmfTimestamp(12345, (byte) -1);
+		assertEquals("getValue", 12345, ts.getValue());
+		assertEquals("getscale", -1, ts.getScale());
+		assertEquals("getPrecision", 0, ts.getPrecision());
+	}
+
+	public void testFullConstructor() throws Exception {
+		TmfTimestamp ts = new TmfTimestamp(12345, (byte) 2, 5);
+		assertEquals("getValue", 12345, ts.getValue());
+		assertEquals("getscale", 2, ts.getScale());
+		assertEquals("getPrecision", 5, ts.getPrecision());
+	}
+
+	public void testCopyConstructor() throws Exception {
+		TmfTimestamp ts0 = new TmfTimestamp(12345, (byte) 2, 5);
+		TmfTimestamp ts = new TmfTimestamp(ts0);
+		assertEquals("getValue", 12345, ts.getValue());
+		assertEquals("getscale", 2, ts.getScale());
+		assertEquals("getPrecision", 5, ts.getPrecision());
+	}
+
+	// ========================================================================
+	// BigBang, BigCrunch
+	// ========================================================================
+
+	public void testCopyConstructorBigBang() throws Exception {
+		TmfTimestamp ts = new TmfTimestamp(TmfTimestamp.BigBang);
+		assertEquals("getValue", TmfTimestamp.BigBang.getValue(), ts.getValue());
+		assertEquals("getscale", TmfTimestamp.BigBang.getScale(), ts.getScale());
+		assertEquals("getPrecision", TmfTimestamp.BigBang.getPrecision(), ts.getPrecision());
+	}
+
+	public void testCopyConstructorBigCrunch() throws Exception {
+		TmfTimestamp ts = new TmfTimestamp(TmfTimestamp.BigCrunch);
+		assertEquals("getValue", TmfTimestamp.BigCrunch.getValue(), ts.getValue());
+		assertEquals("getscale", TmfTimestamp.BigCrunch.getScale(), ts.getScale());
+		assertEquals("getPrecision", TmfTimestamp.BigCrunch.getPrecision(), ts.getPrecision());
+	}
+
+	// ========================================================================
+	// toString
+	// ========================================================================
+
+	public void testToString() throws Exception {
+		TmfTimestamp ts1 = new TmfTimestamp();
+		TmfTimestamp ts2 = new TmfTimestamp(1234, (byte) 2);
+		TmfTimestamp ts3 = new TmfTimestamp(1234, (byte) 2, 1);
+		TmfTimestamp ts4 = new TmfTimestamp(-1234, (byte) -1, 4);
+
+		assertEquals("toString", "[TmfTimestamp(0,0,0)]", ts1.toString());
+		assertEquals("toString", "[TmfTimestamp(1234,2,0)]", ts2.toString());
+		assertEquals("toString", "[TmfTimestamp(1234,2,1)]", ts3.toString());
+		assertEquals("toString", "[TmfTimestamp(-1234,-1,4)]", ts4.toString());
+	}
+	
+	// ========================================================================
+	// synchronize
+	// ========================================================================
+
+	public void testSynchronizeOffset() throws Exception {
+		TmfTimestamp ts0 = new TmfTimestamp(1234, (byte) 0, 1);
+		TmfTimestamp ts = new TmfTimestamp();
+
+		ts = ts0.synchronize(0, (byte) 0);
+		assertEquals("getValue", 1234, ts.getValue());
+		assertEquals("getscale", 0, ts.getScale());
+		assertEquals("getPrecision", 1, ts.getPrecision());
+
+		ts = ts0.synchronize(10, (byte) 0);
+		assertEquals("getValue", 1244, ts.getValue());
+		assertEquals("getscale", 0, ts.getScale());
+		assertEquals("getPrecision", 1, ts.getPrecision());
+
+		ts = ts0.synchronize(-10, (byte) 0);
+		assertEquals("getValue", 1224, ts.getValue());
+		assertEquals("getscale", 0, ts.getScale());
+		assertEquals("getPrecision", 1, ts.getPrecision());
+	}
+
+	public void testSynchronizeScale() throws Exception {
+		TmfTimestamp ts0 = new TmfTimestamp(1234, (byte) 0, 12);
+		TmfTimestamp ts = new TmfTimestamp();
+
+		ts = ts0.synchronize(0, (byte) 0);
+		assertEquals("getValue", 1234, ts.getValue());
+		assertEquals("getscale", 0, ts.getScale());
+		assertEquals("getPrecision", 12, ts.getPrecision());
+
+		ts = ts0.synchronize(0, (byte) 1);
+		assertEquals("getValue", 123, ts.getValue());
+		assertEquals("getscale", 1, ts.getScale());
+		assertEquals("getPrecision", 1, ts.getPrecision());
+
+		ts = ts0.synchronize(0, (byte) 2);
+		assertEquals("getValue", 12, ts.getValue());
+		assertEquals("getscale", 2, ts.getScale());
+		assertEquals("getPrecision", 0, ts.getPrecision());
+
+		ts = ts0.synchronize(0, (byte) 4);
+		assertEquals("getValue", 0, ts.getValue());
+		assertEquals("getscale", 4, ts.getScale());
+		assertEquals("getPrecision", 0, ts.getPrecision());
+
+		ts = ts0.synchronize(0, (byte) -2);
+		assertEquals("getValue", 123400, ts.getValue());
+		assertEquals("getscale", -2, ts.getScale());
+		assertEquals("getPrecision", 1200, ts.getPrecision());
+	}
+
+	public void testSynchronizeOffsetAndScale() throws Exception {
+		TmfTimestamp ts0 = new TmfTimestamp(1234, (byte) 0, 12);
+		TmfTimestamp ts = new TmfTimestamp();
+
+		ts = ts0.synchronize(10, (byte) 1);
+		assertEquals("getValue", 133, ts.getValue());
+		assertEquals("getscale", 1, ts.getScale());
+		assertEquals("getPrecision", 1, ts.getPrecision());
+
+		ts = ts0.synchronize(-10, (byte) -1);
+		assertEquals("getValue", 12330, ts.getValue());
+		assertEquals("getscale", -1, ts.getScale());
+		assertEquals("getPrecision", 120, ts.getPrecision());
+	}	
+	
+	// ========================================================================
+	// getAdjustment
+	// ========================================================================
+
+	public void testGetAdjustmentSameScale() throws Exception {
+		TmfTimestamp ts0 = new TmfTimestamp(12345, (byte) -2);
+		TmfTimestamp ts = new TmfTimestamp(10000, (byte) -2);
+
+		long delta = ts.getAdjustment(ts0);
+		assertEquals("delta", 2345, delta);
+	}
+
+	public void testGetAdjustmentDifferentScale() throws Exception {
+		TmfTimestamp ts0 = new TmfTimestamp(12345, (byte) -2);
+		TmfTimestamp ts = new TmfTimestamp(1, (byte) 2);
+
+		long delta = ts.getAdjustment(ts0);
+		assertEquals("delta", 2345, delta);
+
+		delta = ts0.getAdjustment(ts);
+		assertEquals("delta", 0, delta);
+	}
+
+	// ========================================================================
+	// CompareTo
+	// ========================================================================
+
+	public void testCompareToSameScale() throws Exception {
+		TmfTimestamp ts1 = new TmfTimestamp(900, (byte) 0, 50);
+		TmfTimestamp ts2 = new TmfTimestamp(1000, (byte) 0, 50);
+		TmfTimestamp ts3 = new TmfTimestamp(1100, (byte) 0, 50);
+		TmfTimestamp ts4 = new TmfTimestamp(1000, (byte) 0, 75);
+
+		assertTrue(ts1.compareTo(ts1, false) == 0);
+
+		assertTrue(ts1.compareTo(ts2, false) < 0);
+		assertTrue(ts1.compareTo(ts3, false) < 0);
+		assertTrue(ts1.compareTo(ts4, false) < 0);
+
+		assertTrue(ts2.compareTo(ts1, false) > 0);
+		assertTrue(ts2.compareTo(ts3, false) < 0);
+		assertTrue(ts2.compareTo(ts4, false) == 0);
+
+		assertTrue(ts3.compareTo(ts1, false) > 0);
+		assertTrue(ts3.compareTo(ts2, false) > 0);
+		assertTrue(ts3.compareTo(ts4, false) > 0);
+	}
+
+	public void testCompareToDifferentScale() throws Exception {
+		TmfTimestamp ts1 = new TmfTimestamp(9000, (byte) -1, 50);
+		TmfTimestamp ts2 = new TmfTimestamp(1000, (byte) 0, 50);
+		TmfTimestamp ts3 = new TmfTimestamp(110, (byte) 1, 50);
+		TmfTimestamp ts4 = new TmfTimestamp(1, (byte) 3, 75);
+
+		assertTrue(ts1.compareTo(ts1, false) == 0);
+
+		assertTrue(ts1.compareTo(ts2, false) < 0);
+		assertTrue(ts1.compareTo(ts3, false) < 0);
+		assertTrue(ts1.compareTo(ts4, false) < 0);
+
+		assertTrue(ts2.compareTo(ts1, false) > 0);
+		assertTrue(ts2.compareTo(ts3, false) < 0);
+		assertTrue(ts2.compareTo(ts4, false) == 0);
+
+		assertTrue(ts3.compareTo(ts1, false) > 0);
+		assertTrue(ts3.compareTo(ts2, false) > 0);
+		assertTrue(ts3.compareTo(ts4, false) > 0);
+	}
+
+	public void testCompareToWithinPrecision() throws Exception {
+		TmfTimestamp ts1 = new TmfTimestamp(900, (byte) 0, 50);
+		TmfTimestamp ts2 = new TmfTimestamp(1000, (byte) 0, 50);
+		TmfTimestamp ts3 = new TmfTimestamp(1100, (byte) 0, 50);
+		TmfTimestamp ts4 = new TmfTimestamp(1000, (byte) 0, 75);
+
+		assertTrue(ts1.compareTo(ts1, true) == 0);
+
+		assertTrue(ts1.compareTo(ts2, true) == 0);
+		assertTrue(ts1.compareTo(ts3, true) < 0);
+		assertTrue(ts1.compareTo(ts4, true) == 0);
+
+		assertTrue(ts2.compareTo(ts1, true) == 0);
+		assertTrue(ts2.compareTo(ts3, true) == 0);
+		assertTrue(ts2.compareTo(ts4, true) == 0);
+
+		assertTrue(ts3.compareTo(ts1, true) > 0);
+		assertTrue(ts3.compareTo(ts2, true) == 0);
+		assertTrue(ts3.compareTo(ts4, true) == 0);
+	}
+
+	public void testCompareToLargeScale() throws Exception {
+		TmfTimestamp ts1 = new TmfTimestamp(-1, (byte) 100);
+		TmfTimestamp ts2 = new TmfTimestamp(-1000, (byte) -100);
+		TmfTimestamp ts3 = new TmfTimestamp(1, (byte) 100);
+		TmfTimestamp ts4 = new TmfTimestamp(1000, (byte) -100);
+
+		assertTrue(ts1.compareTo(ts2, false) < 0);
+		assertTrue(ts1.compareTo(ts3, false) < 0);
+		assertTrue(ts1.compareTo(ts4, false) < 0);
+
+		assertTrue(ts2.compareTo(ts1, false) > 0);
+		assertTrue(ts2.compareTo(ts3, false) < 0);
+		assertTrue(ts2.compareTo(ts4, false) < 0);
+
+		assertTrue(ts3.compareTo(ts1, false) > 0);
+		assertTrue(ts3.compareTo(ts2, false) > 0);
+		assertTrue(ts3.compareTo(ts4, false) > 0);
+
+		assertTrue(ts4.compareTo(ts1, false) > 0);
+		assertTrue(ts4.compareTo(ts2, false) > 0);
+		assertTrue(ts4.compareTo(ts3, false) < 0);
+	}
+
+	public void testCompareToBigGuys() throws Exception {
+		TmfTimestamp ts1 = new TmfTimestamp(-1, Byte.MAX_VALUE);
+		TmfTimestamp ts2 = new TmfTimestamp(-1, Byte.MIN_VALUE);
+		TmfTimestamp ts3 = new TmfTimestamp(1, Byte.MAX_VALUE);
+		TmfTimestamp ts4 = new TmfTimestamp(1, Byte.MIN_VALUE);
+
+		assertTrue(ts1.compareTo(TmfTimestamp.BigBang, false) > 0);
+		assertTrue(ts1.compareTo(TmfTimestamp.BigCrunch, false) < 0);
+
+		assertTrue(ts2.compareTo(TmfTimestamp.BigBang, false) > 0);
+		assertTrue(ts2.compareTo(TmfTimestamp.BigCrunch, false) < 0);
+
+		assertTrue(ts3.compareTo(TmfTimestamp.BigBang, false) > 0);
+		assertTrue(ts3.compareTo(TmfTimestamp.BigCrunch, false) < 0);
+
+		assertTrue(ts4.compareTo(TmfTimestamp.BigBang, false) > 0);
+		assertTrue(ts4.compareTo(TmfTimestamp.BigCrunch, false) < 0);
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTraceEventTest.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTraceEventTest.java
new file mode 100644
index 0000000..9f2bc8b
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTraceEventTest.java
@@ -0,0 +1,120 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.tests.event;
+
+import org.eclipse.linuxtools.tmf.event.TmfEventContent;
+import org.eclipse.linuxtools.tmf.event.TmfEventReference;
+import org.eclipse.linuxtools.tmf.event.TmfEventSource;
+import org.eclipse.linuxtools.tmf.event.TmfEventType;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.event.TmfTraceEvent;
+
+import junit.framework.TestCase;
+
+/**
+ * <b><u>TmfTraceEventTest</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfTraceEventTest extends TestCase {
+
+	private final String   fTypeId = "Some type";
+	private final String   fLabel0 = "label1";
+	private final String   fLabel1 = "label2";
+	private final String[] fLabels = new String[] { fLabel0, fLabel1 };
+
+	private final TmfTimestamp      fTimestamp1 = new TmfTimestamp(12345, (byte) 2, 5);
+	private final TmfTimestamp      fTimestamp2 = new TmfTimestamp(12350, (byte) 2, 5);
+	private final TmfEventSource    fSource     = new TmfEventSource("Source");
+	private final TmfEventType      fType       = new TmfEventType(fTypeId, fLabels);
+	private final TmfEventReference fReference  = new TmfEventReference("Some reference");
+
+	private final TmfTraceEvent fEvent1;
+	private final TmfTraceEvent fEvent2;
+
+	private final TmfEventContent fContent1;
+	private final TmfEventContent fContent2;
+
+	private final String fPath = "/some/path/";
+	private final String fFile = "filename";
+	private final int    fLine = 10;
+
+	// ========================================================================
+	// Housekeeping
+	// ========================================================================
+
+	public TmfTraceEventTest(String name) {
+		super(name);
+
+		fEvent1 = new TmfTraceEvent(fTimestamp1, fSource, fType, fReference, fPath, fFile, fLine);
+		fContent1 = new TmfEventContent(fEvent1, "Some content");
+		fEvent1.setContent(fContent1);
+
+		fEvent2 = new TmfTraceEvent(fTimestamp1, fTimestamp2, fSource, fType, fReference, fPath, fFile, fLine);
+		fContent2 = new TmfEventContent(fEvent2, "Some other content");
+		fEvent2.setContent(fContent2);
+	}
+
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+	}
+
+	@Override
+	protected void tearDown() throws Exception {
+		super.tearDown();
+	}
+
+	// ========================================================================
+	// Constructors
+	// ========================================================================
+
+    public void testTmfTraceEvent() throws Exception {
+		assertEquals("getTimestamp",         fTimestamp1, fEvent1.getTimestamp());
+		assertEquals("getOriginalTimestamp", fTimestamp1, fEvent1.getOriginalTimestamp());
+		assertEquals("getSource",            fSource,     fEvent1.getSource());
+		assertEquals("getType",              fType,       fEvent1.getType());
+		assertEquals("getContent",           fContent1,   fEvent1.getContent());
+		assertEquals("getReference",         fReference,  fEvent1.getReference());
+		assertEquals("getSourcePath",        fPath,       fEvent1.getSourcePath());
+		assertEquals("getFileName",          fFile,       fEvent1.getFileName());
+		assertEquals("getLineNumber",        fLine,       fEvent1.getLineNumber());
+    }
+
+    public void testTmfTraceEvent2() throws Exception {
+		assertEquals("getTimestamp",         fTimestamp2, fEvent2.getTimestamp());
+		assertEquals("getOriginalTimestamp", fTimestamp1, fEvent2.getOriginalTimestamp());
+		assertEquals("getSource",            fSource,     fEvent2.getSource());
+		assertEquals("getType",              fType,       fEvent2.getType());
+		assertEquals("getContent",           fContent2,   fEvent2.getContent());
+		assertEquals("getReference",         fReference,  fEvent2.getReference());
+		assertEquals("getSourcePath",        fPath,       fEvent2.getSourcePath());
+		assertEquals("getFileName",          fFile,       fEvent2.getFileName());
+		assertEquals("getLineNumber",        fLine,       fEvent2.getLineNumber());
+    }
+
+    public void testTmfTraceEventCopy() throws Exception {
+    	TmfTraceEvent event = new TmfTraceEvent(fEvent2);
+		assertEquals("getTimestamp",         fTimestamp2, event.getTimestamp());
+		assertEquals("getOriginalTimestamp", fTimestamp1, event.getOriginalTimestamp());
+		assertEquals("getSource",            fSource,     event.getSource());
+		assertEquals("getType",              fType,       event.getType());
+		assertEquals("getContent",           fContent2,   event.getContent());
+		assertEquals("getReference",         fReference,  event.getReference());
+		assertEquals("getSourcePath",        fPath,       event.getSourcePath());
+		assertEquals("getFileName",          fFile,       event.getFileName());
+		assertEquals("getLineNumber",        fLine,       event.getLineNumber());
+    }
+
+}
+
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/AllTests.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/AllTests.java
new file mode 100644
index 0000000..dbbd060
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/AllTests.java
@@ -0,0 +1,21 @@
+package org.eclipse.linuxtools.tmf.tests.request;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.eclipse.linuxtools.tmf.TmfCorePlugin;
+
+public class AllTests {
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite("Test suite for " + TmfCorePlugin.PLUGIN_ID + ".request"); //$NON-NLS-1$);
+		//$JUnit-BEGIN$
+		suite.addTestSuite(TmfDataRequestTest.class);
+		suite.addTestSuite(TmfEventRequestTest.class);
+		suite.addTestSuite(TmfCoalescedDataRequestTest.class);
+		suite.addTestSuite(TmfCoalescedEventRequestTest.class);
+		//$JUnit-END$
+		return suite;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedDataRequestTest.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedDataRequestTest.java
new file mode 100644
index 0000000..6cc5c15
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedDataRequestTest.java
@@ -0,0 +1,99 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.tests.request;
+
+
+import junit.framework.TestCase;
+
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.request.TmfCoalescedDataRequest;
+import org.eclipse.linuxtools.tmf.request.TmfDataRequest;
+import org.eclipse.linuxtools.tmf.request.TmfDataRequestStub;
+
+/**
+ * <b><u>TmfCoalescedDataRequestTest</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfCoalescedDataRequestTest extends TestCase {
+
+	// ------------------------------------------------------------------------
+	// Housekeeping
+	// ------------------------------------------------------------------------
+
+	public TmfCoalescedDataRequestTest(String name) {
+		super(name);
+	}
+
+	@Override
+	public void setUp() throws Exception {
+	}
+
+	@Override
+	public void tearDown() throws Exception {
+	}
+
+	// ------------------------------------------------------------------------
+	// Constructors
+	// ------------------------------------------------------------------------
+
+	public void testTmfCoalescedDataRequest() {
+		TmfCoalescedDataRequest<TmfEvent> request = new TmfCoalescedDataRequest<TmfEvent>(TmfEvent.class);
+
+        assertEquals("getIndex",             0, request.getIndex());
+        assertEquals("getNbRequestedEvents", TmfDataRequest.ALL_DATA, request.getNbRequested());
+        assertEquals("getBlockize", TmfDataRequest.DEFAULT_BLOCK_SIZE, request.getBlockize());
+	}
+
+	public void testTmfCoalescedDataRequestIndex() {
+		TmfCoalescedDataRequest<TmfEvent> request = new TmfCoalescedDataRequest<TmfEvent>(TmfEvent.class, 10);
+
+        assertEquals("getIndex",             10, request.getIndex());
+        assertEquals("getNbRequestedEvents", TmfDataRequest.ALL_DATA, request.getNbRequested());
+        assertEquals("getBlockize", TmfDataRequest.DEFAULT_BLOCK_SIZE, request.getBlockize());
+	}
+
+	public void testTmfCoalescedDataRequestIndexNbRequested() {
+		TmfCoalescedDataRequest<TmfEvent> request = new TmfCoalescedDataRequest<TmfEvent>(TmfEvent.class, 10, 100);
+
+        assertEquals("getIndex",              10, request.getIndex());
+        assertEquals("getNbRequestedEvents", 100, request.getNbRequested());
+        assertEquals("getBlockize", TmfDataRequest.DEFAULT_BLOCK_SIZE, request.getBlockize());
+	}
+
+	public void testTmfCoalescedDataRequestIndexNbEventsBlocksize() {
+		TmfCoalescedDataRequest<TmfEvent> request = new TmfCoalescedDataRequest<TmfEvent>(TmfEvent.class, 10, 100, 200);
+
+        assertEquals("getIndex",              10, request.getIndex());
+        assertEquals("getNbRequestedEvents", 100, request.getNbRequested());
+        assertEquals("getBlockize",          200, request.getBlockize());
+	}
+
+	// ------------------------------------------------------------------------
+	// isCompatible
+	// ------------------------------------------------------------------------
+
+	public void testIsCompatible() {
+		TmfCoalescedDataRequest<TmfEvent> coalescedRequest = new TmfCoalescedDataRequest<TmfEvent>(TmfEvent.class, 10, 100, 200);
+		TmfDataRequest<TmfEvent> request1 = new TmfDataRequestStub<TmfEvent>(TmfEvent.class, 10, 100, 200);
+		TmfDataRequest<TmfEvent> request2 = new TmfDataRequestStub<TmfEvent>(TmfEvent.class, 11, 100, 200);
+		TmfDataRequest<TmfEvent> request3 = new TmfDataRequestStub<TmfEvent>(TmfEvent.class, 10, 101, 200);
+		TmfDataRequest<TmfEvent> request4 = new TmfDataRequestStub<TmfEvent>(TmfEvent.class, 10, 100, 201);
+
+        assertTrue ("isCompatible", coalescedRequest.isCompatible(request1));
+        assertFalse("isCompatible", coalescedRequest.isCompatible(request2));
+        assertFalse("isCompatible", coalescedRequest.isCompatible(request3));
+        assertFalse("isCompatible", coalescedRequest.isCompatible(request4));
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedEventRequestTest.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedEventRequestTest.java
new file mode 100644
index 0000000..06aa1ea
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedEventRequestTest.java
@@ -0,0 +1,302 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.tests.request;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Vector;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.tmf.component.ITmfDataProvider;
+import org.eclipse.linuxtools.tmf.component.TmfProviderManager;
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.request.TmfCoalescedEventRequest;
+import org.eclipse.linuxtools.tmf.request.TmfDataRequest;
+import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
+import org.eclipse.linuxtools.tmf.request.TmfEventRequestStub;
+import org.eclipse.linuxtools.tmf.signal.TmfSignal;
+import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler;
+import org.eclipse.linuxtools.tmf.signal.TmfSignalManager;
+import org.eclipse.linuxtools.tmf.tests.TmfCoreTestPlugin;
+import org.eclipse.linuxtools.tmf.trace.TmfTraceStub;
+
+/**
+ * <b><u>TmfCoalescedEventRequestTest</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfCoalescedEventRequestTest extends TestCase {
+
+    private static final String DIRECTORY   = "testfiles";
+    private static final String TEST_STREAM = "A-Test-10K";
+    private static final int    NB_EVENTS   = 10000;
+    private static final int    BLOCK_SIZE  = 100;
+
+    private static TmfTraceStub fTrace      = null;
+
+    private TmfTraceStub setupTrace(String path) {
+    	if (fTrace == null) {
+    		try {
+    	        URL location = FileLocator.find(TmfCoreTestPlugin.getPlugin().getBundle(), new Path(path), null);
+    			File test = new File(FileLocator.toFileURL(location).toURI());
+    			TmfTraceStub trace = new TmfTraceStub(test.getPath(), 500, true);
+    	        fTrace = trace;
+    		} catch (URISyntaxException e) {
+    			e.printStackTrace();
+    		} catch (IOException e) {
+    			e.printStackTrace();
+    		}
+    	}
+    	return fTrace;
+    }
+
+    // ------------------------------------------------------------------------
+	// Housekeeping
+	// ------------------------------------------------------------------------
+
+	public TmfCoalescedEventRequestTest(String name) {
+		super(name);
+	}
+
+	@Override
+	public void setUp() throws Exception {
+		super.setUp();
+	}
+
+	@Override
+	public void tearDown() throws Exception {
+		super.tearDown();
+	}
+
+	// ------------------------------------------------------------------------
+	// Constructors
+	// ------------------------------------------------------------------------
+
+	public void testTmfCoalescedEventRequest() {
+        TmfCoalescedEventRequest<TmfEvent> request = new TmfCoalescedEventRequest<TmfEvent>(TmfEvent.class);
+
+        assertEquals("StartTime", TmfTimestamp.BigBang,   request.getRange().getStartTime());
+        assertEquals("EndTime",   TmfTimestamp.BigCrunch, request.getRange().getEndTime());
+
+        assertEquals("getIndex",             0, request.getIndex());
+        assertEquals("getNbRequestedEvents", TmfDataRequest.ALL_DATA, request.getNbRequested());
+        assertEquals("getBlockize", TmfDataRequest.DEFAULT_BLOCK_SIZE, request.getBlockize());
+	}
+
+	public void testTmfCoalescedEventRequestTimeRange() {
+        TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BigCrunch);
+        TmfCoalescedEventRequest<TmfEvent> request = new TmfCoalescedEventRequest<TmfEvent>(TmfEvent.class, range);
+
+        assertEquals("StartTime", range.getStartTime(), request.getRange().getStartTime());
+        assertEquals("EndTime",   range.getEndTime(),   request.getRange().getEndTime());
+
+        assertEquals("getIndex",             0, request.getIndex());
+        assertEquals("getNbRequestedEvents", TmfDataRequest.ALL_DATA, request.getNbRequested());
+        assertEquals("getBlockize", TmfDataRequest.DEFAULT_BLOCK_SIZE, request.getBlockize());
+	}
+
+	public void testTmfCoalescedEventRequestTimeRangeNbRequested() {
+        TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BigCrunch);
+        TmfCoalescedEventRequest<TmfEvent> request = new TmfCoalescedEventRequest<TmfEvent>(TmfEvent.class, range, 100);
+
+        assertEquals("StartTime", range.getStartTime(), request.getRange().getStartTime());
+        assertEquals("EndTime",   range.getEndTime(),   request.getRange().getEndTime());
+
+        assertEquals("getIndex",               0, request.getIndex());
+        assertEquals("getNbRequestedEvents", 100, request.getNbRequested());
+        assertEquals("getBlockize", TmfDataRequest.DEFAULT_BLOCK_SIZE, request.getBlockize());
+	}
+
+	public void testTmfCoalescedEventRequestTimeRangeNbRequestedBlocksize() {
+        TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BigCrunch);
+        TmfCoalescedEventRequest<TmfEvent> request = new TmfCoalescedEventRequest<TmfEvent>(TmfEvent.class, range, 100, 200);
+
+        assertEquals("StartTime", range.getStartTime(), request.getRange().getStartTime());
+        assertEquals("EndTime",   range.getEndTime(),   request.getRange().getEndTime());
+
+        assertEquals("getIndex",               0, request.getIndex());
+        assertEquals("getNbRequestedEvents", 100, request.getNbRequested());
+        assertEquals("getBlockize",          200, request.getBlockize());
+	}
+
+	// ------------------------------------------------------------------------
+	// isCompatible
+	// ------------------------------------------------------------------------
+
+	public void testIsCompatible() {
+		TmfTimestamp startTime = new TmfTimestamp(10);
+		TmfTimestamp endTime   = new TmfTimestamp(20);
+        TmfTimeRange range1 = new TmfTimeRange(startTime, endTime);
+        TmfTimeRange range2 = new TmfTimeRange(TmfTimestamp.BigBang, endTime);
+        TmfTimeRange range3 = new TmfTimeRange(startTime, TmfTimestamp.BigCrunch);
+
+        TmfCoalescedEventRequest<TmfEvent> coalescedRequest = new TmfCoalescedEventRequest<TmfEvent>(TmfEvent.class, range1);
+		TmfDataRequest<TmfEvent> request1 = new TmfEventRequestStub<TmfEvent>(TmfEvent.class, range1);
+		TmfDataRequest<TmfEvent> request2 = new TmfEventRequestStub<TmfEvent>(TmfEvent.class, range2);
+		TmfDataRequest<TmfEvent> request3 = new TmfEventRequestStub<TmfEvent>(TmfEvent.class, range3);
+
+        assertTrue ("isCompatible", coalescedRequest.isCompatible(request1));
+        assertFalse("isCompatible", coalescedRequest.isCompatible(request2));
+        assertFalse("isCompatible", coalescedRequest.isCompatible(request3));
+	}
+
+	// ------------------------------------------------------------------------
+	// Coalescing
+	// ------------------------------------------------------------------------
+
+	Vector<TmfEvent> requestedEvents1;
+    Vector<TmfEvent> requestedEvents2;
+    Vector<TmfEvent> requestedEvents3;
+
+    TmfEventRequest<TmfEvent> request1;
+    TmfEventRequest<TmfEvent> request2;
+    TmfEventRequest<TmfEvent> request3;
+
+    private class TmfTestTriggerSignal extends TmfSignal {
+    	public final boolean forceCancel;
+		public TmfTestTriggerSignal(Object source, boolean cancel) {
+			super(source);
+			forceCancel = cancel;
+		}
+    }
+
+    @SuppressWarnings("unchecked")
+	@TmfSignalHandler
+    public void trigger(final TmfTestTriggerSignal signal) {
+
+        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
+
+        requestedEvents1 = new Vector<TmfEvent>();
+        request1 = new TmfEventRequest<TmfEvent>(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) {
+            @Override
+            public void handleData() {
+            	if (!isCompleted()) {
+            		TmfEvent[] events = getData();
+            		for (TmfEvent e : events) {
+            			requestedEvents1.add(e);
+            		}
+            		if (signal.forceCancel)
+            			cancel();
+            	}
+            }
+        };
+
+        requestedEvents2 = new Vector<TmfEvent>();
+        request2 = new TmfEventRequest<TmfEvent>(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) {
+            @Override
+            public void handleData() {
+            	if (!isCompleted()) {
+            		TmfEvent[] events = getData();
+            		for (TmfEvent e : events) {
+            			requestedEvents2.add(e);
+            		}
+            	}
+            }
+        };
+
+        requestedEvents3 = new Vector<TmfEvent>();
+        request3 = new TmfEventRequest<TmfEvent>(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) {
+            @Override
+            public void handleData() {
+            	if (!isCompleted()) {
+            		TmfEvent[] events = getData();
+            		for (TmfEvent e : events) {
+            			requestedEvents3.add(e);
+            		}
+            	}
+            }
+        };
+
+        ITmfDataProvider<TmfEvent>[] providers = (ITmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
+        providers[0].sendRequest(request1);
+        providers[0].sendRequest(request2);
+        providers[0].sendRequest(request3);
+    }
+
+    public void testCoalescedRequest() throws Exception {
+
+		setupTrace(DIRECTORY + File.separator + TEST_STREAM);
+
+    	TmfSignalManager.register(this);
+		TmfTestTriggerSignal signal = new TmfTestTriggerSignal(this, false);
+    	TmfSignalManager.dispatchSignal(signal);
+
+        request1.waitForCompletion();
+        request2.waitForCompletion();
+        request3.waitForCompletion();
+
+        assertEquals("Request1: nbEvents", NB_EVENTS, requestedEvents1.size());
+        assertTrue  ("Request1: isCompleted", request1.isCompleted());
+        assertFalse ("Request1: isCancelled", request1.isCancelled());
+
+        assertEquals("Request2: nbEvents", NB_EVENTS, requestedEvents2.size());
+        assertTrue  ("Request2: isCompleted", request2.isCompleted());
+        assertFalse ("Request2: isCancelled", request2.isCancelled());
+
+        assertEquals("Request3: nbEvents", NB_EVENTS, requestedEvents3.size());
+        assertTrue  ("Request3: isCompleted", request3.isCompleted());
+        assertFalse ("Request3: isCancelled", request3.isCancelled());
+
+        // Ensure that we have distinct events.
+        // Don't go overboard: we are not validating the stub! 
+        for (int i = 0; i < NB_EVENTS; i++) {
+            assertEquals("Distinct events", i+1, requestedEvents1.get(i).getTimestamp().getValue());
+            assertEquals("Distinct events", i+1, requestedEvents2.get(i).getTimestamp().getValue());
+            assertEquals("Distinct events", i+1, requestedEvents3.get(i).getTimestamp().getValue());
+        }
+
+        TmfSignalManager.deregister(this);
+    }
+    
+	public void testCancelCoalescedRequest() throws Exception {
+		setupTrace(DIRECTORY + File.separator + TEST_STREAM);
+
+    	TmfSignalManager.register(this);
+		TmfTestTriggerSignal signal = new TmfTestTriggerSignal(this, true);
+    	TmfSignalManager.dispatchSignal(signal);
+
+        request1.waitForCompletion();
+        request2.waitForCompletion();
+        request3.waitForCompletion();
+
+        assertEquals("Request1: nbEvents", BLOCK_SIZE, requestedEvents1.size());
+        assertTrue  ("Request1: isCompleted", request1.isCompleted());
+        assertTrue  ("Request1: isCancelled", request1.isCancelled());
+
+        assertEquals("Request2: nbEvents", NB_EVENTS, requestedEvents2.size());
+        assertTrue  ("Request2: isCompleted", request2.isCompleted());
+        assertFalse ("Request2: isCancelled", request2.isCancelled());
+
+        assertEquals("Request3: nbEvents", NB_EVENTS, requestedEvents3.size());
+        assertTrue  ("Request3: isCompleted", request3.isCompleted());
+        assertFalse ("Request3: isCancelled", request3.isCancelled());
+
+        // Ensure that we have distinct events.
+        // Don't go overboard: we are not validating the stub! 
+        for (int i = 0; i < NB_EVENTS; i++) {
+            assertEquals("Distinct events", i+1, requestedEvents2.get(i).getTimestamp().getValue());
+            assertEquals("Distinct events", i+1, requestedEvents3.get(i).getTimestamp().getValue());
+        }
+
+        TmfSignalManager.deregister(this);
+    }
+
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfDataRequestTest.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfDataRequestTest.java
new file mode 100644
index 0000000..fd2266f
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfDataRequestTest.java
@@ -0,0 +1,116 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.tests.request;
+
+import junit.framework.TestCase;
+
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.request.TmfDataRequest;
+import org.eclipse.linuxtools.tmf.request.TmfDataRequestStub;
+
+/**
+ * <b><u>TmfDataRequestTest</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfDataRequestTest extends TestCase {
+
+	// ------------------------------------------------------------------------
+	// Housekeeping
+	// ------------------------------------------------------------------------
+
+	public TmfDataRequestTest(String name) {
+		super(name);
+	}
+
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+	}
+
+	@Override
+	protected void tearDown() throws Exception {
+		super.tearDown();
+	}
+
+	// ------------------------------------------------------------------------
+	// Constructors
+	// ------------------------------------------------------------------------
+
+	public void testTmfDataRequest() {
+        TmfDataRequest<TmfEvent> request = new TmfDataRequestStub<TmfEvent>(TmfEvent.class);
+
+        assertEquals("getIndex",             0, request.getIndex());
+        assertEquals("getNbRequestedEvents", TmfDataRequest.ALL_DATA, request.getNbRequested());
+        assertEquals("getBlockize", TmfDataRequest.DEFAULT_BLOCK_SIZE, request.getBlockize());
+	}
+
+	public void testTmfDataRequestIndex() {
+        TmfDataRequest<TmfEvent> request = new TmfDataRequestStub<TmfEvent>(TmfEvent.class, 10);
+
+        assertEquals("getIndex",             10, request.getIndex());
+        assertEquals("getNbRequestedEvents", TmfDataRequest.ALL_DATA, request.getNbRequested());
+        assertEquals("getBlockize", TmfDataRequest.DEFAULT_BLOCK_SIZE, request.getBlockize());
+	}
+
+	public void testTmfDataRequestIndexNbRequested() {
+        TmfDataRequest<TmfEvent> request = new TmfDataRequestStub<TmfEvent>(TmfEvent.class, 10, 100);
+
+        assertEquals("getIndex",              10, request.getIndex());
+        assertEquals("getNbRequestedEvents", 100, request.getNbRequested());
+        assertEquals("getBlockize", TmfDataRequest.DEFAULT_BLOCK_SIZE, request.getBlockize());
+	}
+
+	public void testTmfDataRequestIndexNbEventsBlocksize() {
+        TmfDataRequest<TmfEvent> request = new TmfDataRequestStub<TmfEvent>(TmfEvent.class, 10, 100, 200);
+
+        assertEquals("getIndex",              10, request.getIndex());
+        assertEquals("getNbRequestedEvents", 100, request.getNbRequested());
+        assertEquals("getBlockize",          200, request.getBlockize());
+	}
+
+	// ------------------------------------------------------------------------
+	// equals
+	// ------------------------------------------------------------------------
+
+	public void testEquals_Reflexivity() {
+        TmfDataRequest<TmfEvent> request = new TmfDataRequestStub<TmfEvent>(TmfEvent.class, 10, 100, 200);
+
+        assertTrue("request.equals(request)", request.equals(request));
+	}
+
+	public void testEquals_Symmetry() {
+        TmfDataRequest<TmfEvent> request1 = new TmfDataRequestStub<TmfEvent>(TmfEvent.class, 10, 100, 200);
+        TmfDataRequest<TmfEvent> request2 = new TmfDataRequestStub<TmfEvent>(TmfEvent.class, 10, 100, 200);
+        TmfDataRequest<TmfEvent> request3 = new TmfDataRequestStub<TmfEvent>(TmfEvent.class, 20, 100, 200);
+
+        assertTrue("request1.equals(request2)", request1.equals(request2));
+        assertTrue("request2.equals(request1)", request2.equals(request1));
+
+        assertFalse("request1.equals(request3)", request1.equals(request3));
+        assertFalse("request3.equals(request1)", request3.equals(request1));
+        assertFalse("request2.equals(request3)", request2.equals(request3));
+        assertFalse("request3.equals(request2)", request3.equals(request2));
+	}
+
+	public void testEquals_Transivity() {
+        TmfDataRequest<TmfEvent> request1 = new TmfDataRequestStub<TmfEvent>(TmfEvent.class, 10, 100, 200);
+        TmfDataRequest<TmfEvent> request2 = new TmfDataRequestStub<TmfEvent>(TmfEvent.class, 10, 100, 200);
+        TmfDataRequest<TmfEvent> request3 = new TmfDataRequestStub<TmfEvent>(TmfEvent.class, 10, 100, 200);
+
+        assertTrue("request1.equals(request2)", request1.equals(request2));
+        assertTrue("request2.equals(request3)", request2.equals(request3));
+        assertTrue("request1.equals(request3)", request1.equals(request3));
+	}
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfEventRequestTest.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfEventRequestTest.java
new file mode 100644
index 0000000..de1f166
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfEventRequestTest.java
@@ -0,0 +1,144 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.tests.request;
+
+import junit.framework.TestCase;
+
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.request.TmfDataRequest;
+import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
+import org.eclipse.linuxtools.tmf.request.TmfEventRequestStub;
+
+/**
+ * <b><u>TmfEventRequestTest</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfEventRequestTest extends TestCase {
+
+	// ------------------------------------------------------------------------
+	// Housekeeping
+	// ------------------------------------------------------------------------
+
+	public TmfEventRequestTest(String name) {
+		super(name);
+	}
+
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+	}
+
+	@Override
+	protected void tearDown() throws Exception {
+		super.tearDown();
+	}
+
+	// ------------------------------------------------------------------------
+	// Constructors
+	// ------------------------------------------------------------------------
+
+	public void testTmfEventRequest() {
+        TmfEventRequest<TmfEvent> request = new TmfEventRequestStub<TmfEvent>(TmfEvent.class);
+
+        assertEquals("StartTime", TmfTimestamp.BigBang,   request.getRange().getStartTime());
+        assertEquals("EndTime",   TmfTimestamp.BigCrunch, request.getRange().getEndTime());
+
+        assertEquals("getIndex",             0, request.getIndex());
+        assertEquals("getNbRequestedEvents", TmfDataRequest.ALL_DATA, request.getNbRequested());
+        assertEquals("getBlockize", TmfDataRequest.DEFAULT_BLOCK_SIZE, request.getBlockize());
+	}
+
+	public void testTmfEventRequestTimeRange() {
+        TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BigCrunch);
+        TmfEventRequest<TmfEvent> request = new TmfEventRequestStub<TmfEvent>(TmfEvent.class, range);
+
+        assertEquals("StartTime", range.getStartTime(), request.getRange().getStartTime());
+        assertEquals("EndTime",   range.getEndTime(),   request.getRange().getEndTime());
+
+        assertEquals("getIndex",             0, request.getIndex());
+        assertEquals("getNbRequestedEvents", TmfDataRequest.ALL_DATA, request.getNbRequested());
+        assertEquals("getBlockize", TmfDataRequest.DEFAULT_BLOCK_SIZE, request.getBlockize());
+	}
+
+	public void testTmfEventRequestTimeRangeNbRequested() {
+        TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BigCrunch);
+        TmfEventRequest<TmfEvent> request = new TmfEventRequestStub<TmfEvent>(TmfEvent.class, range, 100);
+
+        assertEquals("StartTime", range.getStartTime(), request.getRange().getStartTime());
+        assertEquals("EndTime",   range.getEndTime(),   request.getRange().getEndTime());
+
+        assertEquals("getIndex",               0, request.getIndex());
+        assertEquals("getNbRequestedEvents", 100, request.getNbRequested());
+        assertEquals("getBlockize", TmfDataRequest.DEFAULT_BLOCK_SIZE, request.getBlockize());
+	}
+
+	public void testTmfEventRequestTimeRangeNbRequestedBlocksize() {
+        TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BigCrunch);
+        TmfEventRequest<TmfEvent> request = new TmfEventRequestStub<TmfEvent>(TmfEvent.class, range, 100, 200);
+
+        assertEquals("StartTime", range.getStartTime(), request.getRange().getStartTime());
+        assertEquals("EndTime",   range.getEndTime(),   request.getRange().getEndTime());
+
+        assertEquals("getIndex",               0, request.getIndex());
+        assertEquals("getNbRequestedEvents", 100, request.getNbRequested());
+        assertEquals("getBlockize",          200, request.getBlockize());
+	}
+
+	// ------------------------------------------------------------------------
+	// equals
+	// ------------------------------------------------------------------------
+
+	public void testEquals_Reflexivity() {
+        TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BigCrunch);
+        TmfEventRequest<TmfEvent> request = new TmfEventRequestStub<TmfEvent>(TmfEvent.class, range, 100, 200);
+
+        assertTrue("request.equals(request)", request.equals(request));
+	}
+
+	public void testEquals_Symmetry() {
+        TmfTimeRange range1 = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BigCrunch);
+        TmfTimeRange range2 = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BigCrunch);
+        TmfTimeRange range3 = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.Zero);
+
+        TmfEventRequest<TmfEvent> request1 = new TmfEventRequestStub<TmfEvent>(TmfEvent.class, range1, 100, 200);
+        TmfEventRequest<TmfEvent> request2 = new TmfEventRequestStub<TmfEvent>(TmfEvent.class, range2, 100, 200);
+        TmfEventRequest<TmfEvent> request3 = new TmfEventRequestStub<TmfEvent>(TmfEvent.class, range3, 100, 200);
+
+        assertTrue("request1.equals(request2)", request1.equals(request2));
+        assertTrue("request2.equals(request1)", request2.equals(request1));
+
+        assertFalse("request1.equals(request3)", request1.equals(request3));
+        assertFalse("request3.equals(request1)", request3.equals(request1));
+        assertFalse("request2.equals(request3)", request2.equals(request3));
+        assertFalse("request3.equals(request2)", request3.equals(request2));
+	}
+
+	public void testEquals_Transivity() {
+        TmfTimeRange range1 = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BigCrunch);
+
+        TmfEventRequest<TmfEvent> request1 = new TmfEventRequestStub<TmfEvent>(TmfEvent.class, range1, 100, 200);
+        TmfEventRequest<TmfEvent> request2 = new TmfEventRequestStub<TmfEvent>(TmfEvent.class, range1, 100, 200);
+        TmfEventRequest<TmfEvent> request3 = new TmfEventRequestStub<TmfEvent>(TmfEvent.class, range1, 100, 200);
+
+        assertTrue("request1.equals(request2)", request1.equals(request2));
+        assertTrue("request1.equals(request3)", request1.equals(request3));
+        assertTrue("request2.equals(request1)", request2.equals(request1));
+        assertTrue("request2.equals(request3)", request2.equals(request3));
+        assertTrue("request3.equals(request1)", request3.equals(request1));
+        assertTrue("request3.equals(request2)", request3.equals(request2));
+	}
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/AllTests.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/AllTests.java
new file mode 100644
index 0000000..a7a2646
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/AllTests.java
@@ -0,0 +1,20 @@
+package org.eclipse.linuxtools.tmf.tests.trace;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.eclipse.linuxtools.tmf.TmfCorePlugin;
+
+public class AllTests {
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite("Test suite for " + TmfCorePlugin.PLUGIN_ID + ".trace"); //$NON-NLS-1$);
+		//$JUnit-BEGIN$
+		suite.addTestSuite(TmfTraceTest.class);
+		suite.addTestSuite(TmfExperimentTest.class);
+		suite.addTestSuite(TmfMultiTraceExperimentTest.class);
+		//$JUnit-END$
+		return suite;
+	}
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfExperimentTest.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfExperimentTest.java
new file mode 100644
index 0000000..a51ca95
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfExperimentTest.java
@@ -0,0 +1,657 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.tests.trace;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Vector;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
+import org.eclipse.linuxtools.tmf.experiment.TmfExperimentContext;
+import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
+import org.eclipse.linuxtools.tmf.tests.TmfCoreTestPlugin;
+import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
+import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint;
+import org.eclipse.linuxtools.tmf.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.trace.TmfTraceStub;
+
+/**
+ * <b><u>TmfExperimentTest</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfExperimentTest extends TestCase {
+
+    private static final String DIRECTORY   = "testfiles";
+    private static final String TEST_STREAM = "A-Test-10K";
+    private static final String EXPERIMENT  = "MyExperiment";
+    private static int          NB_EVENTS   = 10000;
+    private static int    fDefaultBlockSize = 1000;
+
+    private static ITmfTrace[] fTraces;
+    private static TmfExperiment<TmfEvent> fExperiment;
+
+    private static byte SCALE = (byte) -3;
+
+    // ------------------------------------------------------------------------
+    // Housekeeping
+    // ------------------------------------------------------------------------
+
+    private ITmfTrace[] setupTrace(String path) {
+    	if (fTraces == null) {
+    		fTraces = new ITmfTrace[1];
+    		try {
+    	        URL location = FileLocator.find(TmfCoreTestPlugin.getPlugin().getBundle(), new Path(path), null);
+    			File test = new File(FileLocator.toFileURL(location).toURI());
+    			TmfTraceStub trace = new TmfTraceStub(test.getPath(), true);
+    			fTraces[0] = trace;
+    		} catch (URISyntaxException e) {
+    			e.printStackTrace();
+    		} catch (IOException e) {
+    			e.printStackTrace();
+    		}
+    	}
+    	return fTraces;
+    }
+
+    private void setupExperiment() {
+    	if (fExperiment == null) {
+            fExperiment = new TmfExperiment<TmfEvent>(TmfEvent.class, EXPERIMENT, fTraces);
+            fExperiment.indexExperiment(true);
+    	}
+    }
+
+	public TmfExperimentTest(String name) throws Exception {
+		super(name);
+	}
+
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+		setupTrace(DIRECTORY + File.separator + TEST_STREAM);
+		setupExperiment();
+	}
+
+	@Override
+	protected void tearDown() throws Exception {
+		super.tearDown();
+	}
+
+    // ------------------------------------------------------------------------
+    // Constructor
+    // ------------------------------------------------------------------------
+
+	public void testBasicTmfExperimentConstructor() {
+		assertEquals("GetId", EXPERIMENT, fExperiment.getName());
+        assertEquals("GetEpoch", TmfTimestamp.Zero, fExperiment.getEpoch());
+        assertEquals("GetNbEvents", NB_EVENTS, fExperiment.getNbEvents());
+
+        TmfTimeRange timeRange = fExperiment.getTimeRange();
+        assertEquals("getStartTime", 1, timeRange.getStartTime().getValue());
+        assertEquals("getEndTime", NB_EVENTS, timeRange.getEndTime().getValue());
+	}
+
+    // ------------------------------------------------------------------------
+    // Verify checkpoints
+    // Note: seekLocation() does not reliably set the rank
+    // ------------------------------------------------------------------------
+
+    public void testValidateCheckpoints() throws Exception {
+
+    	Vector<TmfCheckpoint> checkpoints = fExperiment.getCheckpoints();
+//    	int pageSize = fExperiment.getCacheSize();
+		assertTrue("Checkpoints exist",  checkpoints != null);
+
+		// Validate that each checkpoint points to the right event
+		for (int i = 0; i < checkpoints.size(); i++) {
+			TmfCheckpoint checkpoint = checkpoints.get(i);
+        	TmfExperimentContext context = fExperiment.seekLocation(checkpoint.getLocation());
+			TmfEvent event = fExperiment.parseEvent(context);
+//			assertEquals("Event rank", context.getRank(), i * pageSize);
+			assertTrue("Timestamp", (checkpoint.getTimestamp().compareTo(event.getTimestamp(), false) == 0));
+		}        	
+    }
+
+    // ------------------------------------------------------------------------
+    // parseEvent - make sure parseEvent doesn't update the context
+    // ------------------------------------------------------------------------
+
+    public void testParseEvent() throws Exception {
+
+    	// On lower bound, returns the first event (ts = 0)
+    	TmfContext context = fExperiment.seekEvent(new TmfTimestamp(0, SCALE, 0));
+
+    	TmfEvent event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+
+        event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+
+        event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+
+        for (int i = 1; i < 20; i++) {
+            event = fExperiment.getNextEvent(context);
+            assertEquals("Event timestamp", i, event.getTimestamp().getValue());
+        }
+
+        event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 20, event.getTimestamp().getValue());
+
+        event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 20, event.getTimestamp().getValue());
+    }
+
+    // ------------------------------------------------------------------------
+    // getNextEvent - updates the context
+    // ------------------------------------------------------------------------
+
+    public void testGetNextEvent() throws Exception {
+
+    	// On lower bound, returns the first event (ts = 0)
+    	TmfContext context = fExperiment.seekEvent(new TmfTimestamp(0, SCALE, 0));
+        TmfEvent event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+
+        for (int i = 2; i < 20; i++) {
+            event = fExperiment.getNextEvent(context);
+            assertEquals("Event timestamp", i, event.getTimestamp().getValue());
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // seekLocation
+    // Note: seekLocation() does not reliably set the rank
+    // ------------------------------------------------------------------------
+
+    public void testSeekLocationOnCacheBoundary() throws Exception {
+
+    	// Position trace at event rank 0
+    	TmfContext context = fExperiment.seekLocation(null);
+//        assertEquals("Event rank", 0, context.getRank());
+    	TmfEvent event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 0, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 1, context.getRank());
+
+    	// Position trace at event rank 1000
+        TmfContext tmpContext = fExperiment.seekEvent(new TmfTimestamp(1001, SCALE, 0));
+        context = fExperiment.seekLocation(tmpContext.getLocation().clone());
+//        assertEquals("Event rank", 1000, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1001, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 1000, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1001, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 1001, context.getRank());
+
+    	// Position trace at event rank 4000
+        tmpContext = fExperiment.seekEvent(new TmfTimestamp(4001, SCALE, 0));
+        context = fExperiment.seekLocation(tmpContext.getLocation().clone());
+//        assertEquals("Event rank", 4000, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 4001, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 4000, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 4001, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 4001, context.getRank());
+    }
+
+    public void testSeekLocationNotOnCacheBoundary() throws Exception {
+
+    	// Position trace at event rank 9
+    	TmfContext tmpContext = fExperiment.seekEvent(new TmfTimestamp(10, SCALE, 0));
+        TmfContext context = fExperiment.seekLocation(tmpContext.getLocation().clone());
+//        assertEquals("Event rank", 9, context.getRank());
+    	TmfEvent event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 10, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 9, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 10, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 10, context.getRank());
+
+    	// Position trace at event rank 999
+        tmpContext = fExperiment.seekEvent(new TmfTimestamp(1000, SCALE, 0));
+        context = fExperiment.seekLocation(tmpContext.getLocation().clone());
+//        assertEquals("Event rank", 999, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1000, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 999, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1000, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 1000, context.getRank());
+
+    	// Position trace at event rank 1001
+        tmpContext = fExperiment.seekEvent(new TmfTimestamp(1002, SCALE, 0));
+        context = fExperiment.seekLocation(tmpContext.getLocation().clone());
+//        assertEquals("Event rank", 1001, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1002, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 1001, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1002, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 1002, context.getRank());
+
+    	// Position trace at event rank 4500
+        tmpContext = fExperiment.seekEvent(new TmfTimestamp(4501, SCALE, 0));
+        context = fExperiment.seekLocation(tmpContext.getLocation().clone());
+//        assertEquals("Event rank", 4500, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 4501, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 4500, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 4501, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 4501, context.getRank());
+    }
+
+    public void testSeekLocationOutOfScope() throws Exception {
+
+    	// Position trace at beginning
+    	TmfContext tmpContext = fExperiment.seekLocation(null);
+        TmfContext context = fExperiment.seekLocation(tmpContext.getLocation().clone());
+//        assertEquals("Event rank", 0, context.getRank());
+    	TmfEvent event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 0, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 1, context.getRank());
+
+    	// Position trace at event passed the end
+        tmpContext = fExperiment.seekEvent(new TmfTimestamp(NB_EVENTS + 1, SCALE, 0));
+        context = fExperiment.seekLocation(tmpContext.getLocation().clone());
+//        assertEquals("Event rank", NB_EVENTS, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", null, event);
+//        assertEquals("Event rank", NB_EVENTS, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", null, event);
+//        assertEquals("Event rank", NB_EVENTS, context.getRank());
+    }
+
+    // ------------------------------------------------------------------------
+    // seekEvent on timestamp
+    // ------------------------------------------------------------------------
+
+    public void testSeekEventOnTimestampOnCacheBoundary() throws Exception {
+
+    	// Position trace at event rank 0
+    	TmfContext context = fExperiment.seekEvent(new TmfTimestamp(1, SCALE, 0));
+        assertEquals("Event rank", 0, context.getRank());
+    	TmfEvent event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+        assertEquals("Event rank", 0, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1, context.getRank());
+
+    	// Position trace at event rank 1000
+        context = fExperiment.seekEvent(new TmfTimestamp(1001, SCALE, 0));
+        assertEquals("Event rank", 1000, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1001, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1000, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1001, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1001, context.getRank());
+
+    	// Position trace at event rank 4000
+        context = fExperiment.seekEvent(new TmfTimestamp(4001, SCALE, 0));
+        assertEquals("Event rank", 4000, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 4001, event.getTimestamp().getValue());
+        assertEquals("Event rank", 4000, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 4001, event.getTimestamp().getValue());
+        assertEquals("Event rank", 4001, context.getRank());
+    }
+
+    public void testSeekEventOnTimestampNotOnCacheBoundary() throws Exception {
+
+    	// Position trace at event rank 1
+    	TmfContext context = fExperiment.seekEvent(new TmfTimestamp(2, SCALE, 0));
+        assertEquals("Event rank", 1, context.getRank());
+    	TmfEvent event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 2, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 2, event.getTimestamp().getValue());
+        assertEquals("Event rank", 2, context.getRank());
+
+    	// Position trace at event rank 9
+    	context = fExperiment.seekEvent(new TmfTimestamp(10, SCALE, 0));
+        assertEquals("Event rank", 9, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 10, event.getTimestamp().getValue());
+        assertEquals("Event rank", 9, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 10, event.getTimestamp().getValue());
+        assertEquals("Event rank", 10, context.getRank());
+
+    	// Position trace at event rank 999
+        context = fExperiment.seekEvent(new TmfTimestamp(1000, SCALE, 0));
+        assertEquals("Event rank", 999, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1000, event.getTimestamp().getValue());
+        assertEquals("Event rank", 999, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1000, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1000, context.getRank());
+
+    	// Position trace at event rank 1001
+        context = fExperiment.seekEvent(new TmfTimestamp(1002, SCALE, 0));
+        assertEquals("Event rank", 1001, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1002, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1001, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1002, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1002, context.getRank());
+
+    	// Position trace at event rank 4500
+        context = fExperiment.seekEvent(new TmfTimestamp(4501, SCALE, 0));
+        assertEquals("Event rank", 4500, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 4501, event.getTimestamp().getValue());
+        assertEquals("Event rank", 4500, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 4501, event.getTimestamp().getValue());
+        assertEquals("Event rank", 4501, context.getRank());
+    }
+
+    public void testSeekEventOnTimestampoutOfScope() throws Exception {
+
+    	// Position trace at beginning
+    	TmfContext context = fExperiment.seekEvent(new TmfTimestamp(-1, SCALE, 0));
+        assertEquals("Event rank", 0, context.getRank());
+    	TmfEvent event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+        assertEquals("Event rank", 0, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1, context.getRank());
+
+    	// Position trace at event passed the end
+        context = fExperiment.seekEvent(new TmfTimestamp(NB_EVENTS + 1, SCALE, 0));
+        assertEquals("Event rank", NB_EVENTS, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", null, event);
+        assertEquals("Event rank", NB_EVENTS, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", null, event);
+        assertEquals("Event rank", NB_EVENTS, context.getRank());
+    }
+
+    // ------------------------------------------------------------------------
+    // seekEvent on rank
+    // ------------------------------------------------------------------------
+
+    public void testSeekOnRankOnCacheBoundary() throws Exception {
+
+    	// On lower bound, returns the first event (ts = 1)
+    	TmfContext context = fExperiment.seekEvent(0);
+        assertEquals("Event rank", 0, context.getRank());
+    	TmfEvent event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+        assertEquals("Event rank", 0, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1, context.getRank());
+
+    	// Position trace at event rank 1000
+        context = fExperiment.seekEvent(1000);
+        assertEquals("Event rank", 1000, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1001, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1000, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1001, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1001, context.getRank());
+
+    	// Position trace at event rank 4000
+        context = fExperiment.seekEvent(4000);
+        assertEquals("Event rank", 4000, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 4001, event.getTimestamp().getValue());
+        assertEquals("Event rank", 4000, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 4001, event.getTimestamp().getValue());
+        assertEquals("Event rank", 4001, context.getRank());
+    }
+
+    public void testSeekOnRankNotOnCacheBoundary() throws Exception {
+
+    	// Position trace at event rank 9
+    	TmfContext context = fExperiment.seekEvent(9);
+        assertEquals("Event rank", 9, context.getRank());
+    	TmfEvent event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 10, event.getTimestamp().getValue());
+        assertEquals("Event rank", 9, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 10, event.getTimestamp().getValue());
+        assertEquals("Event rank", 10, context.getRank());
+
+    	// Position trace at event rank 999
+        context = fExperiment.seekEvent(999);
+        assertEquals("Event rank", 999, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1000, event.getTimestamp().getValue());
+        assertEquals("Event rank", 999, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1000, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1000, context.getRank());
+
+    	// Position trace at event rank 1001
+        context = fExperiment.seekEvent(1001);
+        assertEquals("Event rank", 1001, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1002, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1001, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1002, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1002, context.getRank());
+
+    	// Position trace at event rank 4500
+        context = fExperiment.seekEvent(4500);
+        assertEquals("Event rank", 4500, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 4501, event.getTimestamp().getValue());
+        assertEquals("Event rank", 4500, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 4501, event.getTimestamp().getValue());
+        assertEquals("Event rank", 4501, context.getRank());
+    }
+
+    public void testSeekEventOnRankOfScope() throws Exception {
+
+    	// Position trace at beginning
+    	TmfContext context = fExperiment.seekEvent(-1);
+        assertEquals("Event rank", 0, context.getRank());
+    	TmfEvent event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+        assertEquals("Event rank", 0, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1, context.getRank());
+
+    	// Position trace at event passed the end
+        context = fExperiment.seekEvent(NB_EVENTS);
+        assertEquals("Event rank", NB_EVENTS, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", null, event);
+        assertEquals("Event rank", NB_EVENTS, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", null, event);
+        assertEquals("Event rank", NB_EVENTS, context.getRank());
+    }
+    
+    // ------------------------------------------------------------------------
+    // processRequest
+    // ------------------------------------------------------------------------
+
+    public void testProcessRequestForNbEvents() throws Exception {
+        final int blockSize = 100;
+        final int nbEvents  = 1000;
+        final Vector<TmfEvent> requestedEvents = new Vector<TmfEvent>();
+
+        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
+        final TmfEventRequest<TmfEvent> request = new TmfEventRequest<TmfEvent>(TmfEvent.class, range, nbEvents, blockSize) {
+            @Override
+            public void handleData() {
+            	TmfEvent[] events = getData();
+                for (TmfEvent e : events) {
+                    requestedEvents.add(e);
+                }
+            }
+        };
+        fExperiment.sendRequest(request);
+        request.waitForCompletion();
+
+        assertEquals("nbEvents", nbEvents, requestedEvents.size());
+        assertTrue("isCompleted",  request.isCompleted());
+        assertFalse("isCancelled", request.isCancelled());
+
+        // Ensure that we have distinct events.
+        // Don't go overboard: we are not validating the stub! 
+        for (int i = 0; i < nbEvents; i++) {
+            assertEquals("Distinct events", i+1, requestedEvents.get(i).getTimestamp().getValue());
+        }
+    }
+    
+    public void testProcessRequestForNbEvents2() throws Exception {
+        final int blockSize = 2 * NB_EVENTS;
+        final int nbEvents = 1000;
+        final Vector<TmfEvent> requestedEvents = new Vector<TmfEvent>();
+
+        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
+        final TmfEventRequest<TmfEvent> request = new TmfEventRequest<TmfEvent>(TmfEvent.class, range, nbEvents, blockSize) {
+            @Override
+            public void handleData() {
+            	TmfEvent[] events = getData();
+                for (TmfEvent e : events) {
+                    requestedEvents.add(e);
+                }
+            }
+        };
+        fExperiment.sendRequest(request);
+        request.waitForCompletion();
+
+        assertEquals("nbEvents", nbEvents, requestedEvents.size());
+        assertTrue("isCompleted",  request.isCompleted());
+        assertFalse("isCancelled", request.isCancelled());
+
+        // Ensure that we have distinct events.
+        // Don't go overboard: we are not validating the stub! 
+        for (int i = 0; i < nbEvents; i++) {
+            assertEquals("Distinct events", i+1, requestedEvents.get(i).getTimestamp().getValue());
+        }
+    }
+    
+    public void testProcessRequestForAllEvents() throws Exception {
+        final int nbEvents  = TmfEventRequest.ALL_DATA;
+        final int blockSize =  1;
+        final Vector<TmfEvent> requestedEvents = new Vector<TmfEvent>();
+        long nbExpectedEvents = fExperiment.getNbEvents();
+
+        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
+        final TmfEventRequest<TmfEvent> request = new TmfEventRequest<TmfEvent>(TmfEvent.class, range, nbEvents, blockSize) {
+            @Override
+            public void handleData() {
+            	TmfEvent[] events = getData();
+                for (TmfEvent e : events) {
+                    requestedEvents.add(e);
+                }
+            }
+        };
+        fExperiment.sendRequest(request);
+        request.waitForCompletion();
+
+        assertEquals("nbEvents", nbExpectedEvents, requestedEvents.size());
+        assertTrue("isCompleted",  request.isCompleted());
+        assertFalse("isCancelled", request.isCancelled());
+
+        // Ensure that we have distinct events.
+        // Don't go overboard: we are not validating the stub! 
+        for (int i = 0; i < nbExpectedEvents; i++) {
+            assertEquals("Distinct events", i+1, requestedEvents.get(i).getTimestamp().getValue());
+        }
+    }
+    
+    // ------------------------------------------------------------------------
+    // cancel
+    // ------------------------------------------------------------------------
+
+    public void testCancel() throws Exception {
+        final int nbEvents  = NB_EVENTS;
+        final int blockSize =  fDefaultBlockSize;
+        final Vector<TmfEvent> requestedEvents = new Vector<TmfEvent>();
+
+        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
+        final TmfEventRequest<TmfEvent> request = new TmfEventRequest<TmfEvent>(TmfEvent.class, range, nbEvents, blockSize) {
+            @Override
+            public void handleData() {
+            	TmfEvent[] events = getData();
+                for (TmfEvent e : events) {
+                    requestedEvents.add(e);
+                }
+                // Cancel request after the first chunk is received
+                cancel();
+            }
+        };
+        fExperiment.sendRequest(request);
+        request.waitForCompletion();
+
+        assertEquals("nbEvents",  blockSize, requestedEvents.size());
+        assertTrue("isCompleted", request.isCompleted());
+        assertTrue("isCancelled", request.isCancelled());
+    }
+    
+    // ------------------------------------------------------------------------
+    // getRank
+    // ------------------------------------------------------------------------
+
+    public void testGetRank() throws Exception {
+        assertEquals("getRank",    0, fExperiment.getRank(new TmfTimestamp()));
+        assertEquals("getRank",    0, fExperiment.getRank(new TmfTimestamp(   1, (byte) -3)));
+        assertEquals("getRank",   10, fExperiment.getRank(new TmfTimestamp(  11, (byte) -3)));
+        assertEquals("getRank",  100, fExperiment.getRank(new TmfTimestamp( 101, (byte) -3)));
+        assertEquals("getRank", 1000, fExperiment.getRank(new TmfTimestamp(1001, (byte) -3)));
+        assertEquals("getRank", 2000, fExperiment.getRank(new TmfTimestamp(2001, (byte) -3)));
+        assertEquals("getRank", 2500, fExperiment.getRank(new TmfTimestamp(2501, (byte) -3)));
+    }
+
+    // ------------------------------------------------------------------------
+    // getTimestamp
+    // ------------------------------------------------------------------------
+
+    public void testGetTimestamp() throws Exception {
+        assertTrue("getTimestamp", fExperiment.getTimestamp(   0).equals(new TmfTimestamp(   1, (byte) -3)));
+        assertTrue("getTimestamp", fExperiment.getTimestamp(  10).equals(new TmfTimestamp(  11, (byte) -3)));
+        assertTrue("getTimestamp", fExperiment.getTimestamp( 100).equals(new TmfTimestamp( 101, (byte) -3)));
+        assertTrue("getTimestamp", fExperiment.getTimestamp(1000).equals(new TmfTimestamp(1001, (byte) -3)));
+        assertTrue("getTimestamp", fExperiment.getTimestamp(2000).equals(new TmfTimestamp(2001, (byte) -3)));
+        assertTrue("getTimestamp", fExperiment.getTimestamp(2500).equals(new TmfTimestamp(2501, (byte) -3)));
+    }
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfMultiTraceExperimentTest.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfMultiTraceExperimentTest.java
new file mode 100644
index 0000000..65f5822
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfMultiTraceExperimentTest.java
@@ -0,0 +1,639 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.tests.trace;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Vector;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
+import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
+import org.eclipse.linuxtools.tmf.tests.TmfCoreTestPlugin;
+import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
+import org.eclipse.linuxtools.tmf.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.trace.TmfTraceStub;
+
+/**
+ * <b><u>TmfExperimentTest</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfMultiTraceExperimentTest extends TestCase {
+
+    private static final String DIRECTORY    = "testfiles";
+    private static final String TEST_STREAM1 = "O-Test-10K";
+    private static final String TEST_STREAM2 = "E-Test-10K";
+    private static final String EXPERIMENT   = "MyExperiment";
+    private static int          NB_EVENTS    = 20000;
+    private static int    fDefaultBlockSize  = 1000;
+
+    private static ITmfTrace[] fTrace;
+    private static TmfExperiment<TmfEvent> fExperiment;
+
+    private static byte SCALE = (byte) -3;
+
+    // ------------------------------------------------------------------------
+    // Housekeeping
+    // ------------------------------------------------------------------------
+
+    private ITmfTrace[] setupTrace(String path1, String path2) {
+    	if (fTrace == null) {
+    		fTrace = new ITmfTrace[2];
+    		try {
+    	        URL location = FileLocator.find(TmfCoreTestPlugin.getPlugin().getBundle(), new Path(path1), null);
+    			File test = new File(FileLocator.toFileURL(location).toURI());
+    			TmfTraceStub trace1 = new TmfTraceStub(test.getPath(), true);
+    			fTrace[0] = trace1;
+    	        location = FileLocator.find(TmfCoreTestPlugin.getPlugin().getBundle(), new Path(path2), null);
+    			test = new File(FileLocator.toFileURL(location).toURI());
+    			TmfTraceStub trace2 = new TmfTraceStub(test.getPath(), true);
+    			fTrace[1] = trace2;
+    		} catch (URISyntaxException e) {
+    			e.printStackTrace();
+    		} catch (IOException e) {
+    			e.printStackTrace();
+    		}
+    	}
+    	return fTrace;
+    }
+
+    private void setupExperiment() {
+    	if (fExperiment == null) {
+            fExperiment = new TmfExperiment<TmfEvent>(TmfEvent.class, EXPERIMENT, fTrace);
+            fExperiment.indexExperiment(true);
+    	}
+    }
+
+	public TmfMultiTraceExperimentTest(String name) throws Exception {
+		super(name);
+	}
+
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+		setupTrace(DIRECTORY + File.separator + TEST_STREAM1, DIRECTORY + File.separator + TEST_STREAM2);
+		setupExperiment();
+	}
+
+	@Override
+	protected void tearDown() throws Exception {
+		super.tearDown();
+	}
+
+    // ------------------------------------------------------------------------
+    // Constructor
+    // ------------------------------------------------------------------------
+
+	public void testBasicTmfExperimentConstructor() {
+		assertEquals("GetId", EXPERIMENT, fExperiment.getName());
+        assertEquals("GetEpoch", TmfTimestamp.Zero, fExperiment.getEpoch());
+        assertEquals("GetNbEvents", NB_EVENTS, fExperiment.getNbEvents());
+
+        TmfTimeRange timeRange = fExperiment.getTimeRange();
+        assertEquals("getStartTime", 1, timeRange.getStartTime().getValue());
+        assertEquals("getEndTime", NB_EVENTS, timeRange.getEndTime().getValue());
+	}
+
+    // ------------------------------------------------------------------------
+    // parseEvent - make sure parseEvent doesn't update the context
+    // ------------------------------------------------------------------------
+
+    public void testParseEvent() throws Exception {
+
+    	// On lower bound, returns the first event (ts = 0)
+    	TmfContext context = fExperiment.seekEvent(new TmfTimestamp(0, SCALE, 0));
+
+    	TmfEvent event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+
+        event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+
+        event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+
+        for (int i = 1; i < 20; i++) {
+            event = fExperiment.getNextEvent(context);
+            assertEquals("Event timestamp", i, event.getTimestamp().getValue());
+        }
+
+        event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 20, event.getTimestamp().getValue());
+
+        event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 20, event.getTimestamp().getValue());
+    }
+
+    // ------------------------------------------------------------------------
+    // getNextEvent - updates the context
+    // ------------------------------------------------------------------------
+
+    public void testGetNextEvent() throws Exception {
+
+    	// On lower bound, returns the first event (ts = 0)
+    	TmfContext context = fExperiment.seekEvent(new TmfTimestamp(0, SCALE, 0));
+        TmfEvent event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+
+        for (int i = 2; i < 20; i++) {
+            event = fExperiment.getNextEvent(context);
+            assertEquals("Event timestamp", i, event.getTimestamp().getValue());
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // seekLocation
+    // Note: seekLocation() does not reliably set the rank
+    // ------------------------------------------------------------------------
+
+    public void testSeekLocationOnCacheBoundary() throws Exception {
+
+    	// Position trace at event rank 0
+    	TmfContext context = fExperiment.seekLocation(null);
+//        assertEquals("Event rank", 0, context.getRank());
+    	TmfEvent event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 0, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 1, context.getRank());
+
+    	// Position trace at event rank 1000
+        TmfContext tmpContext = fExperiment.seekEvent(new TmfTimestamp(1001, SCALE, 0));
+        context = fExperiment.seekLocation(tmpContext.getLocation().clone());
+//        assertEquals("Event rank", 1000, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1001, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 1000, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1001, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 1001, context.getRank());
+
+    	// Position trace at event rank 4000
+        tmpContext = fExperiment.seekEvent(new TmfTimestamp(4001, SCALE, 0));
+        context = fExperiment.seekLocation(tmpContext.getLocation().clone());
+//        assertEquals("Event rank", 4000, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 4001, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 4000, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 4001, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 4001, context.getRank());
+    }
+
+    public void testSeekLocationNotOnCacheBoundary() throws Exception {
+
+    	// Position trace at event rank 9
+    	TmfContext tmpContext = fExperiment.seekEvent(new TmfTimestamp(10, SCALE, 0));
+        TmfContext context = fExperiment.seekLocation(tmpContext.getLocation().clone());
+//        assertEquals("Event rank", 9, context.getRank());
+    	TmfEvent event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 10, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 9, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 10, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 10, context.getRank());
+
+    	// Position trace at event rank 999
+        tmpContext = fExperiment.seekEvent(new TmfTimestamp(1000, SCALE, 0));
+        context = fExperiment.seekLocation(tmpContext.getLocation().clone());
+//        assertEquals("Event rank", 999, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1000, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 999, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1000, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 1000, context.getRank());
+
+    	// Position trace at event rank 1001
+        tmpContext = fExperiment.seekEvent(new TmfTimestamp(1002, SCALE, 0));
+        context = fExperiment.seekLocation(tmpContext.getLocation().clone());
+//        assertEquals("Event rank", 1001, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1002, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 1001, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1002, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 1002, context.getRank());
+
+    	// Position trace at event rank 4500
+        tmpContext = fExperiment.seekEvent(new TmfTimestamp(4501, SCALE, 0));
+        context = fExperiment.seekLocation(tmpContext.getLocation().clone());
+//        assertEquals("Event rank", 4500, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 4501, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 4500, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 4501, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 4501, context.getRank());
+    }
+
+    public void testSeekLocationOutOfScope() throws Exception {
+
+    	// Position trace at beginning
+    	TmfContext tmpContext = fExperiment.seekLocation(null);
+        TmfContext context = fExperiment.seekLocation(tmpContext.getLocation().clone());
+//        assertEquals("Event rank", 0, context.getRank());
+    	TmfEvent event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 0, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 1, context.getRank());
+
+    	// Position trace at event passed the end
+        tmpContext = fExperiment.seekEvent(new TmfTimestamp(NB_EVENTS + 1, SCALE, 0));
+        context = fExperiment.seekLocation(tmpContext.getLocation().clone());
+//        assertEquals("Event rank", NB_EVENTS, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", null, event);
+//        assertEquals("Event rank", NB_EVENTS, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", null, event);
+//        assertEquals("Event rank", NB_EVENTS, context.getRank());
+    }
+
+    // ------------------------------------------------------------------------
+    // seekEvent on timestamp
+    // ------------------------------------------------------------------------
+
+    public void testSeekEventOnTimestampOnCacheBoundary() throws Exception {
+
+    	// Position trace at event rank 0
+    	TmfContext context = fExperiment.seekEvent(new TmfTimestamp(1, SCALE, 0));
+        assertEquals("Event rank", 0, context.getRank());
+    	TmfEvent event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+        assertEquals("Event rank", 0, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1, context.getRank());
+
+    	// Position trace at event rank 1000
+        context = fExperiment.seekEvent(new TmfTimestamp(1001, SCALE, 0));
+        assertEquals("Event rank", 1000, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1001, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1000, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1001, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1001, context.getRank());
+
+    	// Position trace at event rank 4000
+        context = fExperiment.seekEvent(new TmfTimestamp(4001, SCALE, 0));
+        assertEquals("Event rank", 4000, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 4001, event.getTimestamp().getValue());
+        assertEquals("Event rank", 4000, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 4001, event.getTimestamp().getValue());
+        assertEquals("Event rank", 4001, context.getRank());
+    }
+
+    public void testSeekEventOnTimestampNotOnCacheBoundary() throws Exception {
+
+    	// Position trace at event rank 1
+    	TmfContext context = fExperiment.seekEvent(new TmfTimestamp(2, SCALE, 0));
+        assertEquals("Event rank", 1, context.getRank());
+    	TmfEvent event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 2, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 2, event.getTimestamp().getValue());
+        assertEquals("Event rank", 2, context.getRank());
+
+    	// Position trace at event rank 9
+    	context = fExperiment.seekEvent(new TmfTimestamp(10, SCALE, 0));
+        assertEquals("Event rank", 9, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 10, event.getTimestamp().getValue());
+        assertEquals("Event rank", 9, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 10, event.getTimestamp().getValue());
+        assertEquals("Event rank", 10, context.getRank());
+
+    	// Position trace at event rank 999
+        context = fExperiment.seekEvent(new TmfTimestamp(1000, SCALE, 0));
+        assertEquals("Event rank", 999, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1000, event.getTimestamp().getValue());
+        assertEquals("Event rank", 999, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1000, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1000, context.getRank());
+
+    	// Position trace at event rank 1001
+        context = fExperiment.seekEvent(new TmfTimestamp(1002, SCALE, 0));
+        assertEquals("Event rank", 1001, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1002, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1001, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1002, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1002, context.getRank());
+
+    	// Position trace at event rank 4500
+        context = fExperiment.seekEvent(new TmfTimestamp(4501, SCALE, 0));
+        assertEquals("Event rank", 4500, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 4501, event.getTimestamp().getValue());
+        assertEquals("Event rank", 4500, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 4501, event.getTimestamp().getValue());
+        assertEquals("Event rank", 4501, context.getRank());
+    }
+
+    public void testSeekEventOnTimestampoutOfScope() throws Exception {
+
+    	// Position trace at beginning
+    	TmfContext context = fExperiment.seekEvent(new TmfTimestamp(-1, SCALE, 0));
+        assertEquals("Event rank", 0, context.getRank());
+    	TmfEvent event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+        assertEquals("Event rank", 0, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1, context.getRank());
+
+    	// Position trace at event passed the end
+        context = fExperiment.seekEvent(new TmfTimestamp(NB_EVENTS + 1, SCALE, 0));
+        assertEquals("Event rank", NB_EVENTS, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", null, event);
+        assertEquals("Event rank", NB_EVENTS, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", null, event);
+        assertEquals("Event rank", NB_EVENTS, context.getRank());
+    }
+
+    // ------------------------------------------------------------------------
+    // seekEvent on rank
+    // ------------------------------------------------------------------------
+
+    public void testSeekOnRankOnCacheBoundary() throws Exception {
+
+    	// On lower bound, returns the first event (ts = 1)
+    	TmfContext context = fExperiment.seekEvent(0);
+        assertEquals("Event rank", 0, context.getRank());
+    	TmfEvent event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+        assertEquals("Event rank", 0, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1, context.getRank());
+
+    	// Position trace at event rank 1000
+        context = fExperiment.seekEvent(1000);
+        assertEquals("Event rank", 1000, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1001, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1000, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1001, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1001, context.getRank());
+
+    	// Position trace at event rank 4000
+        context = fExperiment.seekEvent(4000);
+        assertEquals("Event rank", 4000, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 4001, event.getTimestamp().getValue());
+        assertEquals("Event rank", 4000, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 4001, event.getTimestamp().getValue());
+        assertEquals("Event rank", 4001, context.getRank());
+    }
+
+    public void testSeekOnRankNotOnCacheBoundary() throws Exception {
+
+    	// Position trace at event rank 9
+    	TmfContext context = fExperiment.seekEvent(9);
+        assertEquals("Event rank", 9, context.getRank());
+    	TmfEvent event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 10, event.getTimestamp().getValue());
+        assertEquals("Event rank", 9, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 10, event.getTimestamp().getValue());
+        assertEquals("Event rank", 10, context.getRank());
+
+    	// Position trace at event rank 999
+        context = fExperiment.seekEvent(999);
+        assertEquals("Event rank", 999, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1000, event.getTimestamp().getValue());
+        assertEquals("Event rank", 999, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1000, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1000, context.getRank());
+
+    	// Position trace at event rank 1001
+        context = fExperiment.seekEvent(1001);
+        assertEquals("Event rank", 1001, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1002, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1001, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1002, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1002, context.getRank());
+
+    	// Position trace at event rank 4500
+        context = fExperiment.seekEvent(4500);
+        assertEquals("Event rank", 4500, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 4501, event.getTimestamp().getValue());
+        assertEquals("Event rank", 4500, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 4501, event.getTimestamp().getValue());
+        assertEquals("Event rank", 4501, context.getRank());
+    }
+
+    public void testSeekEventOnRankOfScope() throws Exception {
+
+    	// Position trace at beginning
+    	TmfContext context = fExperiment.seekEvent(-1);
+        assertEquals("Event rank", 0, context.getRank());
+    	TmfEvent event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+        assertEquals("Event rank", 0, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1, context.getRank());
+
+    	// Position trace at event passed the end
+        context = fExperiment.seekEvent(NB_EVENTS);
+        assertEquals("Event rank", NB_EVENTS, context.getRank());
+    	event = fExperiment.parseEvent(context);
+        assertEquals("Event timestamp", null, event);
+        assertEquals("Event rank", NB_EVENTS, context.getRank());
+    	event = fExperiment.getNextEvent(context);
+        assertEquals("Event timestamp", null, event);
+        assertEquals("Event rank", NB_EVENTS, context.getRank());
+    }
+    
+    // ------------------------------------------------------------------------
+    // processRequest
+    // ------------------------------------------------------------------------
+
+    public void testProcessRequestForNbEvents() throws Exception {
+        final int blockSize = 100;
+        final int nbEvents  = 1000;
+        final Vector<TmfEvent> requestedEvents = new Vector<TmfEvent>();
+
+        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
+        final TmfEventRequest<TmfEvent> request = new TmfEventRequest<TmfEvent>(TmfEvent.class, range, nbEvents, blockSize) {
+            @Override
+            public void handleData() {
+            	TmfEvent[] events = getData();
+                for (TmfEvent e : events) {
+                    requestedEvents.add(e);
+                }
+            }
+        };
+        fExperiment.sendRequest(request);
+        request.waitForCompletion();
+
+        assertEquals("nbEvents", nbEvents, requestedEvents.size());
+        assertTrue("isCompleted",  request.isCompleted());
+        assertFalse("isCancelled", request.isCancelled());
+
+        // Ensure that we have distinct events.
+        // Don't go overboard: we are not validating the stub! 
+        for (int i = 0; i < nbEvents; i++) {
+            assertEquals("Distinct events", i+1, requestedEvents.get(i).getTimestamp().getValue());
+        }
+    }
+    
+    public void testProcessRequestForNbEvents2() throws Exception {
+        final int blockSize = 2 * NB_EVENTS;
+        final int nbEvents = 1000;
+        final Vector<TmfEvent> requestedEvents = new Vector<TmfEvent>();
+
+        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
+        final TmfEventRequest<TmfEvent> request = new TmfEventRequest<TmfEvent>(TmfEvent.class, range, nbEvents, blockSize) {
+            @Override
+            public void handleData() {
+            	TmfEvent[] events = getData();
+                for (TmfEvent e : events) {
+                    requestedEvents.add(e);
+                }
+            }
+        };
+        fExperiment.sendRequest(request);
+        request.waitForCompletion();
+
+        assertEquals("nbEvents", nbEvents, requestedEvents.size());
+        assertTrue("isCompleted",  request.isCompleted());
+        assertFalse("isCancelled", request.isCancelled());
+
+        // Ensure that we have distinct events.
+        // Don't go overboard: we are not validating the stub! 
+        for (int i = 0; i < nbEvents; i++) {
+            assertEquals("Distinct events", i+1, requestedEvents.get(i).getTimestamp().getValue());
+        }
+    }
+    
+    public void testProcessRequestForAllEvents() throws Exception {
+        final int nbEvents  = TmfEventRequest.ALL_DATA;
+        final int blockSize =  1;
+        final Vector<TmfEvent> requestedEvents = new Vector<TmfEvent>();
+        long nbExpectedEvents = fExperiment.getNbEvents();
+
+        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
+        final TmfEventRequest<TmfEvent> request = new TmfEventRequest<TmfEvent>(TmfEvent.class, range, nbEvents, blockSize) {
+            @Override
+            public void handleData() {
+            	TmfEvent[] events = getData();
+                for (TmfEvent e : events) {
+                    requestedEvents.add(e);
+                }
+            }
+        };
+        fExperiment.sendRequest(request);
+        request.waitForCompletion();
+
+        assertEquals("nbEvents", nbExpectedEvents, requestedEvents.size());
+        assertTrue("isCompleted",  request.isCompleted());
+        assertFalse("isCancelled", request.isCancelled());
+
+        // Ensure that we have distinct events.
+        // Don't go overboard: we are not validating the stub! 
+        for (int i = 0; i < nbExpectedEvents; i++) {
+            assertEquals("Distinct events", i+1, requestedEvents.get(i).getTimestamp().getValue());
+        }
+    }
+    
+    // ------------------------------------------------------------------------
+    // cancel
+    // ------------------------------------------------------------------------
+
+    public void testCancel() throws Exception {
+        final int nbEvents  = NB_EVENTS;
+        final int blockSize =  fDefaultBlockSize;
+        final Vector<TmfEvent> requestedEvents = new Vector<TmfEvent>();
+
+        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
+        final TmfEventRequest<TmfEvent> request = new TmfEventRequest<TmfEvent>(TmfEvent.class, range, nbEvents, blockSize) {
+            @Override
+            public void handleData() {
+            	TmfEvent[] events = getData();
+                for (TmfEvent e : events) {
+                    requestedEvents.add(e);
+                }
+                // Cancel request after the first chunk is received
+                cancel();
+            }
+        };
+        fExperiment.sendRequest(request);
+        request.waitForCompletion();
+
+        assertEquals("nbEvents",  blockSize, requestedEvents.size());
+        assertTrue("isCompleted", request.isCompleted());
+        assertTrue("isCancelled", request.isCancelled());
+    }
+    
+    // ------------------------------------------------------------------------
+    // getRank
+    // ------------------------------------------------------------------------
+
+    public void testGetRank() throws Exception {
+        assertEquals("getRank",    0, fExperiment.getRank(new TmfTimestamp()));
+        assertEquals("getRank",    0, fExperiment.getRank(new TmfTimestamp(   1, (byte) -3)));
+        assertEquals("getRank",   10, fExperiment.getRank(new TmfTimestamp(  11, (byte) -3)));
+        assertEquals("getRank",  100, fExperiment.getRank(new TmfTimestamp( 101, (byte) -3)));
+        assertEquals("getRank", 1000, fExperiment.getRank(new TmfTimestamp(1001, (byte) -3)));
+        assertEquals("getRank", 2000, fExperiment.getRank(new TmfTimestamp(2001, (byte) -3)));
+        assertEquals("getRank", 2500, fExperiment.getRank(new TmfTimestamp(2501, (byte) -3)));
+    }
+
+    // ------------------------------------------------------------------------
+    // getTimestamp
+    // ------------------------------------------------------------------------
+
+    public void testGetTimestamp() throws Exception {
+        assertTrue("getTimestamp", fExperiment.getTimestamp(   0).equals(new TmfTimestamp(   1, (byte) -3)));
+        assertTrue("getTimestamp", fExperiment.getTimestamp(  10).equals(new TmfTimestamp(  11, (byte) -3)));
+        assertTrue("getTimestamp", fExperiment.getTimestamp( 100).equals(new TmfTimestamp( 101, (byte) -3)));
+        assertTrue("getTimestamp", fExperiment.getTimestamp(1000).equals(new TmfTimestamp(1001, (byte) -3)));
+        assertTrue("getTimestamp", fExperiment.getTimestamp(2000).equals(new TmfTimestamp(2001, (byte) -3)));
+        assertTrue("getTimestamp", fExperiment.getTimestamp(2500).equals(new TmfTimestamp(2501, (byte) -3)));
+    }
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfTraceTest.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfTraceTest.java
new file mode 100644
index 0000000..8054828
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfTraceTest.java
@@ -0,0 +1,628 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.tests.trace;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Vector;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.tmf.component.ITmfDataProvider;
+import org.eclipse.linuxtools.tmf.component.TmfProviderManager;
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
+import org.eclipse.linuxtools.tmf.tests.TmfCoreTestPlugin;
+import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint;
+import org.eclipse.linuxtools.tmf.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.trace.TmfTraceStub;
+
+/**
+ * <b><u>TmfTraceTest</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfTraceTest extends TestCase {
+
+    private static final String DIRECTORY   = "testfiles";
+    private static final String TEST_STREAM = "A-Test-10K";
+    private static final int    NB_EVENTS   = 10000;
+    private static TmfTraceStub fTrace      = null;
+
+    private static byte SCALE = (byte) -3;
+
+    // ------------------------------------------------------------------------
+    // Housekeeping
+    // ------------------------------------------------------------------------
+
+    private TmfTraceStub setupTrace(String path) {
+    	if (fTrace == null) {
+    		try {
+    	        URL location = FileLocator.find(TmfCoreTestPlugin.getPlugin().getBundle(), new Path(path), null);
+    			File test = new File(FileLocator.toFileURL(location).toURI());
+    			TmfTraceStub trace = new TmfTraceStub(test.getPath(), 500, true);
+    	        fTrace = trace;
+    		} catch (URISyntaxException e) {
+    			e.printStackTrace();
+    		} catch (IOException e) {
+    			e.printStackTrace();
+    		}
+    	}
+    	return fTrace;
+    }
+
+    public TmfTraceTest(String name) throws Exception {
+		super(name);
+	}
+
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+		setupTrace(DIRECTORY + File.separator + TEST_STREAM);
+	}
+
+	@Override
+	protected void tearDown() throws Exception {
+		super.tearDown();
+	}
+
+    // ------------------------------------------------------------------------
+    // Constructors
+    // ------------------------------------------------------------------------
+
+    public void testTmfTraceDefault() throws Exception {
+		TmfTraceStub trace = null;
+		try {
+	        URL location = FileLocator.find(TmfCoreTestPlugin.getPlugin().getBundle(), new Path(DIRECTORY + File.separator + TEST_STREAM), null);
+			File test = new File(FileLocator.toFileURL(location).toURI());
+			trace = new TmfTraceStub(test.getPath(), true);
+		} catch (URISyntaxException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		assertTrue("Open trace",     trace != null);
+		assertEquals("getCacheSize", TmfTraceStub.DEFAULT_CACHE_SIZE, trace.getCacheSize());
+        assertEquals("getTraceSize", NB_EVENTS, trace.getNbEvents());
+    }
+
+    public void testTmfTrace() throws Exception {
+        assertEquals("getCacheSize",   500, fTrace.getCacheSize());
+        assertEquals("getTraceSize",   NB_EVENTS, fTrace.getNbEvents());
+        assertEquals("getRange-start", 1, fTrace.getTimeRange().getStartTime().getValue());
+        assertEquals("getRange-end",   NB_EVENTS, fTrace.getTimeRange().getEndTime().getValue());
+    }
+
+    // ------------------------------------------------------------------------
+    // Verify checkpoints
+    // ------------------------------------------------------------------------
+
+    public void testValidateCheckpoints() throws Exception {
+
+    	Vector<TmfCheckpoint> checkpoints = fTrace.getCheckpoints();
+    	int pageSize = fTrace.getCacheSize();
+		assertTrue("Checkpoints exist",  checkpoints != null);
+
+		// Validate that each checkpoint points to the right event
+		for (int i = 0; i < checkpoints.size(); i++) {
+			TmfCheckpoint checkpoint = checkpoints.get(i);
+			TmfContext context = new TmfContext(checkpoint.getLocation(), i * pageSize);
+			TmfEvent event = fTrace.parseEvent(context);
+			assertTrue(context.getRank() == i * pageSize);
+			assertTrue((checkpoint.getTimestamp().compareTo(event.getTimestamp(), false) == 0));
+		}
+    }
+
+    // ------------------------------------------------------------------------
+    // parseEvent - make sure parseEvent doesn't update the context
+    // ------------------------------------------------------------------------
+
+    public void testParseEvent() throws Exception {
+
+    	// On lower bound, returns the first event (ts = 0)
+    	TmfContext context = fTrace.seekEvent(new TmfTimestamp(0, SCALE, 0));
+
+    	TmfEvent event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+
+        event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+
+        event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+
+        for (int i = 1; i < 20; i++) {
+            event = fTrace.getNextEvent(context);
+            assertEquals("Event timestamp", i, event.getTimestamp().getValue());
+        }
+
+        event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 20, event.getTimestamp().getValue());
+
+        event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 20, event.getTimestamp().getValue());
+    }
+
+    // ------------------------------------------------------------------------
+    // getNextEvent - updates the context
+    // ------------------------------------------------------------------------
+
+    public void testGetNextEvent() throws Exception {
+
+    	// On lower bound, returns the first event (ts = 0)
+    	TmfContext context = fTrace.seekEvent(new TmfTimestamp(0, SCALE, 0));
+        TmfEvent event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+
+        for (int i = 2; i < 20; i++) {
+            event = fTrace.getNextEvent(context);
+            assertEquals("Event timestamp", i, event.getTimestamp().getValue());
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // seekLocation
+    // Note: seekLocation() does not reliably set the rank
+    // ------------------------------------------------------------------------
+
+    public void testSeekLocationOnCacheBoundary() throws Exception {
+
+    	// Position trace at event rank 0
+    	TmfContext context = fTrace.seekLocation(null);
+//        assertEquals("Event rank", 0, context.getRank());
+    	TmfEvent event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 0, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 1, context.getRank());
+
+    	// Position trace at event rank 1000
+        TmfContext tmpContext = fTrace.seekEvent(new TmfTimestamp(1001, SCALE, 0));
+        context = fTrace.seekLocation(tmpContext.getLocation().clone());
+//        assertEquals("Event rank", 1000, context.getRank());
+    	event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 1001, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 1000, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", 1001, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 1001, context.getRank());
+
+    	// Position trace at event rank 4000
+        tmpContext = fTrace.seekEvent(new TmfTimestamp(4001, SCALE, 0));
+        context = fTrace.seekLocation(tmpContext.getLocation().clone());
+//        assertEquals("Event rank", 4000, context.getRank());
+    	event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 4001, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 4000, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", 4001, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 4001, context.getRank());
+    }
+
+    public void testSeekLocationNotOnCacheBoundary() throws Exception {
+
+    	// Position trace at event rank 9
+    	TmfContext tmpContext = fTrace.seekEvent(new TmfTimestamp(10, SCALE, 0));
+        TmfContext context = fTrace.seekLocation(tmpContext.getLocation().clone());
+//        assertEquals("Event rank", 9, context.getRank());
+    	TmfEvent event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 10, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 9, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", 10, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 10, context.getRank());
+
+    	// Position trace at event rank 999
+        tmpContext = fTrace.seekEvent(new TmfTimestamp(1000, SCALE, 0));
+        context = fTrace.seekLocation(tmpContext.getLocation().clone());
+//        assertEquals("Event rank", 999, context.getRank());
+    	event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 1000, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 999, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", 1000, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 1000, context.getRank());
+
+    	// Position trace at event rank 1001
+        tmpContext = fTrace.seekEvent(new TmfTimestamp(1002, SCALE, 0));
+        context = fTrace.seekLocation(tmpContext.getLocation().clone());
+//        assertEquals("Event rank", 1001, context.getRank());
+    	event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 1002, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 1001, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", 1002, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 1002, context.getRank());
+
+    	// Position trace at event rank 4500
+        tmpContext = fTrace.seekEvent(new TmfTimestamp(4501, SCALE, 0));
+        context = fTrace.seekLocation(tmpContext.getLocation().clone());
+//        assertEquals("Event rank", 4500, context.getRank());
+    	event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 4501, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 4500, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", 4501, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 4501, context.getRank());
+    }
+
+    public void testSeekLocationOutOfScope() throws Exception {
+
+    	// Position trace at beginning
+    	TmfContext tmpContext = fTrace.seekLocation(null);
+        TmfContext context = fTrace.seekLocation(tmpContext.getLocation().clone());
+//        assertEquals("Event rank", 0, context.getRank());
+    	TmfEvent event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 0, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+//        assertEquals("Event rank", 1, context.getRank());
+
+    	// Position trace at event passed the end
+        tmpContext = fTrace.seekEvent(new TmfTimestamp(NB_EVENTS + 1, SCALE, 0));
+        context = fTrace.seekLocation(tmpContext.getLocation().clone());
+//        assertEquals("Event rank", NB_EVENTS, context.getRank());
+    	event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", null, event);
+//        assertEquals("Event rank", NB_EVENTS, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", null, event);
+//        assertEquals("Event rank", NB_EVENTS, context.getRank());
+    }
+
+    // ------------------------------------------------------------------------
+    // seekEvent on timestamp
+    // ------------------------------------------------------------------------
+
+    public void testSeekEventOnTimestampOnCacheBoundary() throws Exception {
+
+    	// Position trace at event rank 0
+    	TmfContext context = fTrace.seekEvent(new TmfTimestamp(1, SCALE, 0));
+        assertEquals("Event rank", 0, context.getRank());
+    	TmfEvent event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+        assertEquals("Event rank", 0, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1, context.getRank());
+
+    	// Position trace at event rank 1000
+        context = fTrace.seekEvent(new TmfTimestamp(1001, SCALE, 0));
+        assertEquals("Event rank", 1000, context.getRank());
+    	event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 1001, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1000, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", 1001, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1001, context.getRank());
+
+    	// Position trace at event rank 4000
+        context = fTrace.seekEvent(new TmfTimestamp(4001, SCALE, 0));
+        assertEquals("Event rank", 4000, context.getRank());
+    	event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 4001, event.getTimestamp().getValue());
+        assertEquals("Event rank", 4000, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", 4001, event.getTimestamp().getValue());
+        assertEquals("Event rank", 4001, context.getRank());
+    }
+
+    public void testSeekEventOnTimestampNotOnCacheBoundary() throws Exception {
+
+    	// Position trace at event rank 1
+    	TmfContext context = fTrace.seekEvent(new TmfTimestamp(2, SCALE, 0));
+        assertEquals("Event rank", 1, context.getRank());
+    	TmfEvent event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 2, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", 2, event.getTimestamp().getValue());
+        assertEquals("Event rank", 2, context.getRank());
+
+    	// Position trace at event rank 9
+    	context = fTrace.seekEvent(new TmfTimestamp(10, SCALE, 0));
+        assertEquals("Event rank", 9, context.getRank());
+    	event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 10, event.getTimestamp().getValue());
+        assertEquals("Event rank", 9, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", 10, event.getTimestamp().getValue());
+        assertEquals("Event rank", 10, context.getRank());
+
+    	// Position trace at event rank 999
+        context = fTrace.seekEvent(new TmfTimestamp(1000, SCALE, 0));
+        assertEquals("Event rank", 999, context.getRank());
+    	event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 1000, event.getTimestamp().getValue());
+        assertEquals("Event rank", 999, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", 1000, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1000, context.getRank());
+
+    	// Position trace at event rank 1001
+        context = fTrace.seekEvent(new TmfTimestamp(1002, SCALE, 0));
+        assertEquals("Event rank", 1001, context.getRank());
+    	event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 1002, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1001, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", 1002, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1002, context.getRank());
+
+    	// Position trace at event rank 4500
+        context = fTrace.seekEvent(new TmfTimestamp(4501, SCALE, 0));
+        assertEquals("Event rank", 4500, context.getRank());
+    	event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 4501, event.getTimestamp().getValue());
+        assertEquals("Event rank", 4500, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", 4501, event.getTimestamp().getValue());
+        assertEquals("Event rank", 4501, context.getRank());
+    }
+
+    public void testSeekEventOnTimestampOutOfScope() throws Exception {
+
+    	// Position trace at beginning
+    	TmfContext context = fTrace.seekEvent(new TmfTimestamp(-1, SCALE, 0));
+        assertEquals("Event rank", 0, context.getRank());
+    	TmfEvent event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+        assertEquals("Event rank", 0, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1, context.getRank());
+
+    	// Position trace at event passed the end
+        context = fTrace.seekEvent(new TmfTimestamp(NB_EVENTS + 1, SCALE, 0));
+        assertEquals("Event rank", NB_EVENTS, context.getRank());
+    	event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", null, event);
+        assertEquals("Event rank", NB_EVENTS, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", null, event);
+        assertEquals("Event rank", NB_EVENTS, context.getRank());
+    }
+
+    // ------------------------------------------------------------------------
+    // seekEvent on rank
+    // ------------------------------------------------------------------------
+
+    public void testSeekOnRankOnCacheBoundary() throws Exception {
+
+    	// On lower bound, returns the first event (ts = 1)
+    	TmfContext context = fTrace.seekEvent(0);
+        assertEquals("Event rank", 0, context.getRank());
+    	TmfEvent event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+        assertEquals("Event rank", 0, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1, context.getRank());
+
+    	// Position trace at event rank 1000
+        context = fTrace.seekEvent(1000);
+        assertEquals("Event rank", 1000, context.getRank());
+    	event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 1001, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1000, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", 1001, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1001, context.getRank());
+
+    	// Position trace at event rank 4000
+        context = fTrace.seekEvent(4000);
+        assertEquals("Event rank", 4000, context.getRank());
+    	event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 4001, event.getTimestamp().getValue());
+        assertEquals("Event rank", 4000, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", 4001, event.getTimestamp().getValue());
+        assertEquals("Event rank", 4001, context.getRank());
+    }
+
+    public void testSeekOnRankNotOnCacheBoundary() throws Exception {
+
+    	// Position trace at event rank 9
+    	TmfContext context = fTrace.seekEvent(9);
+        assertEquals("Event rank", 9, context.getRank());
+    	TmfEvent event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 10, event.getTimestamp().getValue());
+        assertEquals("Event rank", 9, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", 10, event.getTimestamp().getValue());
+        assertEquals("Event rank", 10, context.getRank());
+
+    	// Position trace at event rank 999
+        context = fTrace.seekEvent(999);
+        assertEquals("Event rank", 999, context.getRank());
+    	event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 1000, event.getTimestamp().getValue());
+        assertEquals("Event rank", 999, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", 1000, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1000, context.getRank());
+
+    	// Position trace at event rank 1001
+        context = fTrace.seekEvent(1001);
+        assertEquals("Event rank", 1001, context.getRank());
+    	event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 1002, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1001, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", 1002, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1002, context.getRank());
+
+    	// Position trace at event rank 4500
+        context = fTrace.seekEvent(4500);
+        assertEquals("Event rank", 4500, context.getRank());
+    	event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 4501, event.getTimestamp().getValue());
+        assertEquals("Event rank", 4500, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", 4501, event.getTimestamp().getValue());
+        assertEquals("Event rank", 4501, context.getRank());
+    }
+
+    public void testSeekEventOnRankOfScope() throws Exception {
+
+    	// Position trace at beginning
+    	TmfContext context = fTrace.seekEvent(-1);
+        assertEquals("Event rank", 0, context.getRank());
+    	TmfEvent event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+        assertEquals("Event rank", 0, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
+        assertEquals("Event rank", 1, context.getRank());
+
+    	// Position trace at event passed the end
+        context = fTrace.seekEvent(NB_EVENTS);
+        assertEquals("Event rank", NB_EVENTS, context.getRank());
+    	event = fTrace.parseEvent(context);
+        assertEquals("Event timestamp", null, event);
+        assertEquals("Event rank", NB_EVENTS, context.getRank());
+    	event = fTrace.getNextEvent(context);
+        assertEquals("Event timestamp", null, event);
+        assertEquals("Event rank", NB_EVENTS, context.getRank());
+    }
+    
+    // ------------------------------------------------------------------------
+    // processRequest
+    // ------------------------------------------------------------------------
+
+    @SuppressWarnings("unchecked")
+	public void testProcessRequestForNbEvents() throws Exception {
+        final int BLOCK_SIZE = 100;
+        final int NB_EVENTS  = 1000;
+        final Vector<TmfEvent> requestedEvents = new Vector<TmfEvent>();
+
+        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
+        final TmfEventRequest<TmfEvent> request = new TmfEventRequest<TmfEvent>(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) {
+            @Override
+            public void handleData() {
+            	TmfEvent[] events = getData();
+                for (TmfEvent e : events) {
+                    requestedEvents.add(e);
+                }
+            }
+        };
+        ITmfDataProvider<TmfEvent>[] providers = (ITmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
+        providers[0].sendRequest(request);
+        request.waitForCompletion();
+
+        assertEquals("nbEvents", NB_EVENTS, requestedEvents.size());
+        assertTrue("isCompleted",  request.isCompleted());
+        assertFalse("isCancelled", request.isCancelled());
+
+        // Ensure that we have distinct events.
+        // Don't go overboard: we are not validating the stub! 
+        for (int i = 0; i < NB_EVENTS; i++) {
+            assertEquals("Distinct events", i+1, requestedEvents.get(i).getTimestamp().getValue());
+        }
+    }
+    
+    @SuppressWarnings("unchecked")
+	public void testProcessRequestForAllEvents() throws Exception {
+        final int BLOCK_SIZE =  1;
+        final Vector<TmfEvent> requestedEvents = new Vector<TmfEvent>();
+
+        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
+        final TmfEventRequest<TmfEvent> request = new TmfEventRequest<TmfEvent>(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) {
+            @Override
+            public void handleData() {
+            	TmfEvent[] events = getData();
+                for (TmfEvent e : events) {
+                    requestedEvents.add(e);
+                }
+            }
+        };
+        ITmfDataProvider<TmfEvent>[] providers = (ITmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
+        providers[0].sendRequest(request);
+        request.waitForCompletion();
+
+        assertEquals("nbEvents", NB_EVENTS, requestedEvents.size());
+        assertTrue("isCompleted",  request.isCompleted());
+        assertFalse("isCancelled", request.isCancelled());
+
+        // Ensure that we have distinct events.
+        // Don't go overboard: we are not validating the stub! 
+        for (int i = 0; i < NB_EVENTS; i++) {
+            assertEquals("Distinct events", i+1, requestedEvents.get(i).getTimestamp().getValue());
+        }
+    }
+    
+    // ------------------------------------------------------------------------
+    // cancel
+    // ------------------------------------------------------------------------
+
+    @SuppressWarnings("unchecked")
+	public void testCancel() throws Exception {
+        final Vector<TmfEvent> requestedEvents = new Vector<TmfEvent>();
+
+        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
+        final TmfEventRequest<TmfEvent> request = new TmfEventRequest<TmfEvent>(TmfEvent.class, range, NB_EVENTS, NB_EVENTS) {
+            @Override
+            public void handleData() {
+            	TmfEvent[] events = getData();
+                for (TmfEvent e : events) {
+                    requestedEvents.add(e);
+                }
+                // Cancel request after the first chunk is received
+                cancel();
+            }
+        };
+        ITmfDataProvider<TmfEvent>[] providers = (ITmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
+        providers[0].sendRequest(request);
+        request.waitForCompletion();
+
+        assertEquals("nbEvents",  NB_EVENTS, requestedEvents.size());
+        assertTrue("isCompleted", request.isCompleted());
+        assertTrue("isCancelled", request.isCancelled());
+    }
+
+//    // ------------------------------------------------------------------------
+//    // getRank
+//    // ------------------------------------------------------------------------
+//
+//    public void testGetRank() throws Exception {
+//        assertEquals("getRank",    0, fTrace.getRank(new TmfTimestamp()));
+//        assertEquals("getRank",    0, fTrace.getRank(new TmfTimestamp(   1, (byte) -3)));
+//        assertEquals("getRank",   10, fTrace.getRank(new TmfTimestamp(  11, (byte) -3)));
+//        assertEquals("getRank",  100, fTrace.getRank(new TmfTimestamp( 101, (byte) -3)));
+//        assertEquals("getRank", 1000, fTrace.getRank(new TmfTimestamp(1001, (byte) -3)));
+//        assertEquals("getRank", 2000, fTrace.getRank(new TmfTimestamp(2001, (byte) -3)));
+//        assertEquals("getRank", 2500, fTrace.getRank(new TmfTimestamp(2501, (byte) -3)));
+//    }
+//
+//    // ------------------------------------------------------------------------
+//    // getTimestamp
+//    // ------------------------------------------------------------------------
+//
+//    public void testGetTimestamp() throws Exception {
+//        assertTrue("getTimestamp", fTrace.getTimestamp(   0).equals(new TmfTimestamp(   1, (byte) -3)));
+//        assertTrue("getTimestamp", fTrace.getTimestamp(  10).equals(new TmfTimestamp(  11, (byte) -3)));
+//        assertTrue("getTimestamp", fTrace.getTimestamp( 100).equals(new TmfTimestamp( 101, (byte) -3)));
+//        assertTrue("getTimestamp", fTrace.getTimestamp(1000).equals(new TmfTimestamp(1001, (byte) -3)));
+//        assertTrue("getTimestamp", fTrace.getTimestamp(2000).equals(new TmfTimestamp(2001, (byte) -3)));
+//        assertTrue("getTimestamp", fTrace.getTimestamp(2500).equals(new TmfTimestamp(2501, (byte) -3)));
+//    }
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/CreateTestFiles.java b/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/CreateTestFiles.java
new file mode 100644
index 0000000..d2d66ab
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/CreateTestFiles.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf;
+
+import java.io.BufferedOutputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Random;
+
+/**
+ * <b><u>CreateTestFiles</u></b>
+ * <p>
+ * Create a number of event test files of various lengths.
+ * <p>
+ * Events have the following format:
+ * <ul>
+ * <li> [timestamp] [source] [type] [ref] [field]*
+ * <li> There are NB_SOURCES sources and NB_TYPES types.
+ * <li> The number of fields (0 .. NB_TYPES-1) depends on the event type.
+ * </ul>
+ */
+public class CreateTestFiles {
+
+    // ========================================================================
+    // Constants
+    // ========================================================================
+
+	private static final String DIRECTORY = "testfiles";
+//	private static final String FILE_NAMES[] = { "Test-10", "Test-1K", "Test-10K", "Test-100K" };
+//    private static final int    FILE_SIZES[] = {       10 ,     1000 ,     10000 ,     100000  };
+	private static final String FILE_NAMES[] = { "Test-10K" };
+    private static final int    FILE_SIZES[] = {     10000  };
+
+    private static final int NB_SOURCES = 15;  
+    private static final int NB_TYPES   =  7;  
+
+    // ========================================================================
+    // Constructors
+    // ========================================================================
+
+   /**
+     * @param args
+     */
+    public static void main(String[] args) {
+        
+        try {
+            System.out.println("Creating test files in directory: " + new File(".").getCanonicalPath() + File.separator + DIRECTORY);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        for (int i = 0; i < FILE_SIZES.length; i++) {
+            try {
+            	createTestFile("testfiles" + File.separator + "O-" + FILE_NAMES[i], FILE_SIZES[i], true,  true);
+            	createTestFile("testfiles" + File.separator + "E-" + FILE_NAMES[i], FILE_SIZES[i], true,  false);
+                createTestFile("testfiles" + File.separator + "R-" + FILE_NAMES[i], FILE_SIZES[i], false, false);
+            } catch (Exception e) {
+            }
+        }
+
+		System.out.println("Done.");
+    }
+
+    // ========================================================================
+    // Operators
+    // ========================================================================
+
+    /**
+     * @param file
+     * @param size
+     * @param monotonic
+     * @throws FileNotFoundException
+     * @throws IOException
+     */
+    private static void createTestFile(String file, int size, boolean monotonic, boolean odd) throws FileNotFoundException, IOException {
+        DataOutputStream out;
+        System.out.println("Creating " + file);
+        out = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(file)));
+
+        Random generator = new Random(19580427 + size);
+        long ts = (monotonic && odd) ? -1 : 0;
+        for (int i = 0; i < size; i++) {
+            ts += monotonic ? 2 : generator.nextInt(10);
+            int sourceIndex = i % NB_SOURCES;
+            int typeIndex   = i % NB_TYPES;
+            out.writeLong(ts);                      // Timestamp
+            out.writeUTF("Source-" + sourceIndex);  // Source
+            out.writeUTF("Type-"   + typeIndex);    // Type
+            out.writeInt(i + 1);                    // Reference (event #)
+            for (int j = 0; j < typeIndex; j++) {
+                out.writeUTF("Field-" + sourceIndex + "-" + j);
+            }
+        }
+        out.flush();
+        out.close();
+    }
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfClientStub.java b/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfClientStub.java
new file mode 100644
index 0000000..58e4ae4
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfClientStub.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.component;
+
+import org.eclipse.linuxtools.tmf.event.TmfSyntheticEventStub;
+
+/**
+ * <b><u>TmfClientStub</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfClientStub extends TmfComponent {
+
+	private TmfDataProvider<TmfSyntheticEventStub>[] fProviders;
+
+	public TmfClientStub() {
+		super("TmfClientStub");
+	}
+
+	@SuppressWarnings("unchecked")
+	public void findProvider() {
+		fProviders = (TmfDataProvider<TmfSyntheticEventStub>[]) TmfProviderManager.getProviders(TmfSyntheticEventStub.class, TmfSyntheticEventProviderStub.class);
+//		TmfEventRequest<TmfEventStub> request;
+		System.out.println(fProviders.length);
+	}
+
+	public void triggeRequest() {
+//		TmfEventRequest<TmfEventStub> request;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfDataProviderStub.java b/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfDataProviderStub.java
new file mode 100644
index 0000000..4ad1dde
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfDataProviderStub.java
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.component;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.tmf.event.TmfData;
+import org.eclipse.linuxtools.tmf.request.TmfDataRequest;
+import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
+import org.eclipse.linuxtools.tmf.tests.TmfCoreTestPlugin;
+import org.eclipse.linuxtools.tmf.trace.ITmfContext;
+import org.eclipse.linuxtools.tmf.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.trace.TmfTraceStub;
+
+/**
+ * <b><u>TmfDataProviderStub</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfDataProviderStub extends TmfDataProvider<TmfData> {
+
+    private static final String DIRECTORY   = "testfiles";
+    private static final String TEST_STREAM = "M-Test-10K";
+
+    private TmfTraceStub fTrace;
+
+    public TmfDataProviderStub(String path) throws IOException {
+    	super("TmfDataProviderStub", TmfData.class);
+        URL location = FileLocator.find(TmfCoreTestPlugin.getPlugin().getBundle(), new Path(path), null);
+		try {
+			File test = new File(FileLocator.toFileURL(location).toURI());
+			fTrace = new TmfTraceStub(test.getPath(), true);
+		} catch (URISyntaxException e) {
+			e.printStackTrace();
+		}
+    }
+
+    public TmfDataProviderStub() throws IOException {
+    	this(DIRECTORY + File.separator + TEST_STREAM);
+    }
+    
+    // ------------------------------------------------------------------------
+    // TmfProvider
+    // ------------------------------------------------------------------------
+
+	@Override
+	public ITmfContext armRequest(TmfDataRequest<TmfData> request) {
+		if (request instanceof TmfEventRequest<?>) {
+			TmfContext context = fTrace.seekEvent(((TmfEventRequest<?>) request).getRange().getStartTime());
+			return context;
+		}
+		return null;
+	}
+
+	@Override
+	public TmfData getNext(ITmfContext context) {
+		return fTrace.getNext(context);
+	}
+
+	@Override
+	public boolean isCompleted(TmfDataRequest<TmfData> request, TmfData data, int nbRead) {
+		return false;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfEventProviderStub.java b/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfEventProviderStub.java
new file mode 100644
index 0000000..1e3b080
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfEventProviderStub.java
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.component;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.request.TmfDataRequest;
+import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
+import org.eclipse.linuxtools.tmf.tests.TmfCoreTestPlugin;
+import org.eclipse.linuxtools.tmf.trace.ITmfContext;
+import org.eclipse.linuxtools.tmf.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.trace.TmfTraceStub;
+
+/**
+ * <b><u>TmfEventProviderStub</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfEventProviderStub extends TmfEventProvider<TmfEvent> {
+
+    private static final String DIRECTORY   = "testfiles";
+    private static final String TEST_STREAM = "A-Test-10K";
+
+    private TmfTraceStub fTrace;
+
+    public TmfEventProviderStub(String path) throws IOException {
+    	super(TmfEvent.class);
+        URL location = FileLocator.find(TmfCoreTestPlugin.getPlugin().getBundle(), new Path(path), null);
+		try {
+			File test = new File(FileLocator.toFileURL(location).toURI());
+			fTrace = new TmfTraceStub(test.getPath(), true);
+		} catch (URISyntaxException e) {
+			e.printStackTrace();
+		}
+    }
+
+    public TmfEventProviderStub() throws IOException {
+    	this(DIRECTORY + File.separator + TEST_STREAM);
+    }
+
+    @Override
+    public void deregister() {
+    	fTrace.deregister();
+    	super.deregister();
+    }
+    
+    // ------------------------------------------------------------------------
+    // TmfEventProvider
+    // ------------------------------------------------------------------------
+
+	@Override
+	public ITmfContext armRequest(TmfDataRequest<TmfEvent> request) {
+		if (request instanceof TmfEventRequest<?>) {
+			TmfContext context = fTrace.seekEvent(((TmfEventRequest<?>) request).getRange().getStartTime());
+			return context;
+		}
+		return null;
+	}
+
+	@Override
+	public TmfEvent getNext(ITmfContext context) {
+		return fTrace.getNext(context);
+	}
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfSyntheticEventProviderStub.java b/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfSyntheticEventProviderStub.java
new file mode 100644
index 0000000..ad7e38e
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfSyntheticEventProviderStub.java
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.component;
+
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.event.TmfSyntheticEventStub;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.request.TmfDataRequest;
+import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
+import org.eclipse.linuxtools.tmf.trace.ITmfContext;
+import org.eclipse.linuxtools.tmf.trace.TmfContext;
+
+/**
+ * <b><u>TmfSyntheticEventProviderStub</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfSyntheticEventProviderStub extends TmfEventProvider<TmfSyntheticEventStub> {
+
+    public static final int BLOCK_SIZE = 100;
+    public static final int NB_EVENTS  = 1000;
+
+    public TmfSyntheticEventProviderStub() {
+		super(TmfSyntheticEventStub.class);
+	}
+
+    @Override
+    public void deregister() {
+    	super.deregister();
+    }
+    
+	@SuppressWarnings("unchecked")
+	@Override
+	public ITmfContext armRequest(final TmfDataRequest<TmfSyntheticEventStub> request) {
+
+		// Get the TmfSyntheticEventStub provider
+		ITmfDataProvider<TmfEvent>[] eventProviders = (ITmfDataProvider<TmfEvent>[]) TmfProviderManager.getProviders(TmfEvent.class, TmfEventProviderStub.class);
+		ITmfDataProvider<TmfEvent> provider = eventProviders[0];
+
+		// make sure we have the right type of request
+		if (!(request instanceof TmfEventRequest<?>)) {
+			request.cancel();
+			return null;
+		}
+
+		TmfEventRequest<TmfSyntheticEventStub> eventRequest = (TmfEventRequest<TmfSyntheticEventStub>) request;
+        TmfTimeRange range = eventRequest.getRange();
+        final TmfEventRequest<TmfEvent> subRequest =
+        	new TmfEventRequest<TmfEvent>(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) {
+            	@Override
+            	public void handleData() {
+            		TmfEvent[] events = getData();
+            		if (events.length > 0) {
+            			for (TmfEvent e : events) {
+            				handleIncomingData(e);
+            			}
+            		} else {
+            			request.done();
+            		}
+            	}
+        	};
+        provider.sendRequest(subRequest); // , false);
+
+        // Return a dummy context
+        return new TmfContext();
+	}
+
+	// Queue 2 synthetic events per base event
+	private void handleIncomingData(TmfEvent e) {
+		queueResult(new TmfSyntheticEventStub(e));
+		queueResult(new TmfSyntheticEventStub(e));
+	}
+	
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfEventContentStub.java b/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfEventContentStub.java
new file mode 100644
index 0000000..b56485b
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfEventContentStub.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.event;
+
+/**
+ * <b><u>TmfEventContentStub</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfEventContentStub extends TmfEventContent {
+
+	public TmfEventContentStub(TmfEvent parent, Object content) {
+		super(parent, content);
+	}
+
+	public TmfEventContentStub(TmfEventContentStub other) {
+		super(other);
+	}
+
+	@Override
+	protected void parseContent() {
+        Object field1 = new Integer(1);
+        Object field2 = new Integer(-10);
+        Object field3 = new Boolean(true);
+        Object field4 = new String("some string");
+        Object field5 = new TmfTimestamp(1, (byte) 2, 3);
+        fFields = new Object[] { field1, field2, field3, field4, field5 };
+	}
+	
+    @Override
+    public TmfEventContent clone() {
+    	TmfEventContentStub content = new TmfEventContentStub(this);
+    	content.fRawContent = "Some content";
+    	content.fFields = null;
+		return content;
+    }
+
+    @Override
+	public String toString() {
+    	Object[] fields = getFields();
+    	String result = "[TmfEventContentStub(";
+    	for (int i = 0; i < fields.length; i++) {
+    		result += fields[i].toString() + ",";
+    	}
+    	result += ")]";
+
+    	return result;
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfEventTypeStub.java b/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfEventTypeStub.java
new file mode 100644
index 0000000..e36cb34
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfEventTypeStub.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.event;
+
+/**
+ * <b><u>TmfEventTypeStub</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfEventTypeStub extends TmfEventType {
+
+   public TmfEventTypeStub() {
+        super(
+        	"TmfEventTypeStub",
+        	new String[] { "Field1", "Field2", "Field3", "Field4", "Field5" }
+        );
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfSyntheticEventStub.java b/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfSyntheticEventStub.java
new file mode 100644
index 0000000..7254f35
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfSyntheticEventStub.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.event;
+
+/**
+ * <b><u>TmfSyntheticEventStub</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfSyntheticEventStub extends TmfEvent {
+
+
+	public TmfSyntheticEventStub(TmfEvent event) {
+		super(event);
+	}
+	public TmfSyntheticEventStub(TmfSyntheticEventStub other) {
+		super(other);
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/request/TmfDataRequestStub.java b/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/request/TmfDataRequestStub.java
new file mode 100644
index 0000000..7e41522
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/request/TmfDataRequestStub.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.request;
+
+import org.eclipse.linuxtools.tmf.event.TmfData;
+
+/**
+ * <b><u>TmfDataRequestStub</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfDataRequestStub<T extends TmfData> extends TmfDataRequest<T> {
+
+    /**
+     * Default constructor
+     */
+    public TmfDataRequestStub(Class<T> dataType) {
+        this(dataType, 0, ALL_DATA, DEFAULT_BLOCK_SIZE);
+    }
+
+    /**
+     * @param nbRequested
+     */
+    public TmfDataRequestStub(Class<T> dataType, int index) {
+        this(dataType, index, ALL_DATA, DEFAULT_BLOCK_SIZE);
+    }
+
+    /**
+     * @param index
+     * @param nbRequested
+     */
+    public TmfDataRequestStub(Class<T> dataType, int index, int nbRequested) {
+        this(dataType, index, nbRequested, DEFAULT_BLOCK_SIZE);
+    }
+
+    /**
+     * @param index
+     * @param nbRequested
+     * @param blockSize
+     */
+    public TmfDataRequestStub(Class<T> dataType, int index, int nbRequested, int blockSize) {
+        super(dataType, index, nbRequested, blockSize);
+    }
+
+	@Override
+	public void handleData() {
+		// TODO Auto-generated method stub
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/request/TmfEventRequestStub.java b/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/request/TmfEventRequestStub.java
new file mode 100644
index 0000000..fc305b6
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/request/TmfEventRequestStub.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.request;
+
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+
+/**
+ * <b><u>TmfEventRequestStub</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfEventRequestStub<T extends TmfEvent> extends TmfEventRequest<T> {
+
+    /**
+     * @param range
+     */
+    public TmfEventRequestStub(Class<T> dataType) {
+        this(dataType, TmfTimeRange.Eternity, ALL_DATA, DEFAULT_BLOCK_SIZE);
+    }
+
+    /**
+     * @param range
+     */
+    public TmfEventRequestStub(Class<T> dataType, TmfTimeRange range) {
+        this(dataType, range, ALL_DATA, DEFAULT_BLOCK_SIZE);
+    }
+
+    /**
+     * @param range
+     * @param nbRequested
+     */
+    public TmfEventRequestStub(Class<T> dataType, TmfTimeRange range, int nbRequested) {
+        this(dataType, range, nbRequested, DEFAULT_BLOCK_SIZE);
+    }
+    
+    /**
+     * @param range
+     * @param nbRequested
+     * @param blockSize Size of the largest blocks expected
+     */
+    public TmfEventRequestStub(Class<T> dataType, TmfTimeRange range, int nbRequested, int blockSize) {
+    	super(dataType, range, nbRequested, blockSize);
+    }
+
+	@Override
+	public void handleData() {
+		// TODO Auto-generated method stub
+	}
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfEventParserStub.java b/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfEventParserStub.java
new file mode 100644
index 0000000..259604a
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfEventParserStub.java
@@ -0,0 +1,116 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.trace;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.util.Vector;
+
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.event.TmfEventContent;
+import org.eclipse.linuxtools.tmf.event.TmfEventReference;
+import org.eclipse.linuxtools.tmf.event.TmfEventSource;
+import org.eclipse.linuxtools.tmf.event.TmfEventType;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.parser.ITmfEventParser;
+
+/**
+ * <b><u>TmfEventParserStub</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfEventParserStub implements ITmfEventParser {
+
+    // ------------------------------------------------------------------------
+    // Attributes
+    // ------------------------------------------------------------------------
+
+	private final int NB_TYPES = 10;
+    private final TmfEventType[] fTypes;
+
+    // ------------------------------------------------------------------------
+    // Constructors
+    // ------------------------------------------------------------------------
+
+    public TmfEventParserStub() {
+    	fTypes = new TmfEventType[NB_TYPES];
+    	for (int i = 0; i < NB_TYPES; i++) {
+    		Vector<String> format = new Vector<String>();
+    		for (int j = 1; j <= i; j++) {
+    			format.add(new String("Fmt-" + i + "-Fld-" + j));
+    		}
+    		String[] fields = new String[i];
+    		fTypes[i] = new TmfEventType("Type-" + i, format.toArray(fields));
+    	}
+    }
+
+    // ------------------------------------------------------------------------
+    // Operators
+    // ------------------------------------------------------------------------
+
+    static final String typePrefix = "Type-";
+    @SuppressWarnings("unchecked")
+	public TmfEvent parseNextEvent(ITmfTrace eventStream, TmfContext context) throws IOException {
+
+        if (! (eventStream instanceof TmfTraceStub)) {
+            return null;
+        }
+
+       	// Highly inefficient...
+       	RandomAccessFile stream = ((TmfTraceStub) eventStream).getStream();
+       	String name = eventStream.getName();
+       	name = name.substring(name.lastIndexOf('/') + 1);
+
+        synchronized(stream) {
+        	long location = 0;
+        	if (context != null)
+        		location = ((TmfLocation<Long>) (context.getLocation())).getLocation();
+        	stream.seek(location);
+
+        	try {
+        		long ts        = stream.readLong();
+        		String source  = stream.readUTF();
+        		String type    = stream.readUTF();
+        		@SuppressWarnings("unused")
+        		int reference  = stream.readInt();
+        		int typeIndex  = Integer.parseInt(type.substring(typePrefix.length()));
+        		String[] fields = new String[typeIndex];
+        		for (int i = 0; i < typeIndex; i++) {
+        			fields[i] = stream.readUTF();
+        		}
+
+        		String content = "[";
+        		if (typeIndex > 0) {
+        			content += fields[0];
+        		}
+        		for (int i = 1; i < typeIndex; i++) {
+        			content += ", " + fields[i];
+        		}
+        		content += "]";
+
+        		TmfEvent event = new TmfEvent(
+        				new TmfTimestamp(ts, (byte) -3, 0),     // millisecs
+        				new TmfEventSource(source),
+        				fTypes[typeIndex],
+        				new TmfEventReference(name));
+				TmfEventContent cnt = new TmfEventContent(event, content);
+				event.setContent(cnt);
+				return event;
+        	} catch (EOFException e) {
+        	}
+        }
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfTraceStub.java b/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfTraceStub.java
new file mode 100644
index 0000000..aa69bef
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfTraceStub.java
@@ -0,0 +1,135 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.trace;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.parser.ITmfEventParser;
+
+/**
+ * <b><u>TmfTraceStub</u></b>
+ * <p>
+ * Dummy test trace. Use in conjunction with TmfEventParserStub.
+ */
+public class TmfTraceStub extends TmfTrace<TmfEvent> {
+
+    // ------------------------------------------------------------------------
+    // Attributes
+    // ------------------------------------------------------------------------
+
+    // The actual stream
+    private final RandomAccessFile fTrace;
+
+    // The associated event parser
+    private final ITmfEventParser fParser;
+
+    // ------------------------------------------------------------------------
+    // Constructors
+    // ------------------------------------------------------------------------
+
+    /**
+     * @param filename
+     * @throws FileNotFoundException
+     */
+    public TmfTraceStub(String filename) throws FileNotFoundException {
+        this(filename, DEFAULT_CACHE_SIZE, false);
+    }
+
+    /**
+     * @param filename
+     * @param cacheSize
+     * @throws FileNotFoundException
+     */
+    public TmfTraceStub(String filename, int cacheSize) throws FileNotFoundException {
+        this(filename, cacheSize, false);
+    }
+
+    /**
+     * @param filename
+     * @throws FileNotFoundException
+     */
+    public TmfTraceStub(String filename, boolean waitForCompletion) throws FileNotFoundException {
+        this(filename, DEFAULT_CACHE_SIZE, waitForCompletion);
+    }
+
+    /**
+     * @param filename
+     * @param cacheSize
+     * @throws FileNotFoundException
+     */
+    public TmfTraceStub(String filename, int cacheSize, boolean waitForCompletion) throws FileNotFoundException {
+        super(TmfEvent.class, filename, cacheSize);
+        fTrace = new RandomAccessFile(filename, "r");
+        fParser = new TmfEventParserStub();
+        indexTrace(waitForCompletion);
+    }
+
+    // ------------------------------------------------------------------------
+    // Accessors
+    // ------------------------------------------------------------------------
+
+    public RandomAccessFile getStream() {
+        return fTrace;
+    }
+
+    // ------------------------------------------------------------------------
+    // Operators
+    // ------------------------------------------------------------------------
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public TmfContext seekLocation(ITmfLocation<?> location) {
+        try {
+        	synchronized(fTrace) {
+        		// Position the trace at the requested location and
+        		// returns the corresponding context
+        		long loc = (location != null) ? ((TmfLocation<Long>) location).getLocation() : 0;
+        		if (loc != fTrace.getFilePointer()) {
+        			fTrace.seek(loc);
+        		}
+        		TmfContext context = new TmfContext(getCurrentLocation(), 0);
+        		return context;
+        	}
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+    }
+
+    @Override
+	public TmfLocation<Long> getCurrentLocation() {
+        try {
+            return new TmfLocation<Long>(fTrace.getFilePointer());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+	@Override
+	public TmfEvent parseEvent(TmfContext context) {
+       	try {
+   			// paserNextEvent updates the context
+   			TmfEvent event = fParser.parseNextEvent(this, context);
+       		return event;
+       	}
+       	catch (IOException e) {
+       		e.printStackTrace();
+       	}
+       	return null;
+	}
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/test.xml b/lttng/org.eclipse.linuxtools.tmf.tests/test.xml
new file mode 100644
index 0000000..f440907
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/test.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+
+<project name="testsuite" default="run" basedir=".">
+	<property name="classname" value="org.eclipse.linuxtools.tmf.ui.tests" />
+	<property name="tmf-event-test-suite-classname"   value="org.eclipse.linuxtools.tmf.tests.event.AllTests" />
+	<property name="tmf-request-test-suite-classname" value="org.eclipse.linuxtools.tmf.tests.request.AllTests" />
+	<property name="tmf-trace-test-suite-classname"   value="org.eclipse.linuxtools.tmf.tests.trace.AllTests" />
+	<property name="plugin-name" value="org.eclipse.linuxtools.tmf.tests" />
+
+	<!-- The property ${eclipse-home} should be passed into this script -->
+	<!-- Set a meaningful default value for when it is not. -->
+	<property name="eclipse-home" value="${basedir}/../../" />
+
+	<property name="library-file" value="${eclipse-home}/dropins/${subProjectName2}/plugins/org.eclipse.test/library.xml" />
+
+	<!-- This target holds all initialization code that needs to be done for -->
+	<!-- all tests that are to be run. Initialization for individual tests -->
+	<!-- should be done within the body of the suite target. -->
+	<target name="init">
+		<tstamp />
+		<delete>
+			<fileset dir="${eclipse-home}" includes="org*.xml" />
+		</delete>
+	</target>
+
+	<!-- This target defines the tests that need to be run. -->
+	<target name="tmf_event_test_suite">
+		<property name="tmf-folder" value="${eclipse-home}/tmf_folder" />
+		<delete dir="${tmf-folder}" quiet="true" />
+		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="data-dir" value="${tmf-folder}" />
+			<property name="plugin-name" value="${plugin-name}" />
+			<property name="classname" value="${tmf-event-test-suite-classname}" />
+		</ant>
+	</target>
+
+	<target name="tmf_request_test_suite">
+		<property name="tmf-folder" value="${eclipse-home}/tmf_folder" />
+		<delete dir="${tmf-folder}" quiet="true" />
+		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="data-dir" value="${tmf-folder}" />
+			<property name="plugin-name" value="${plugin-name}" />
+			<property name="classname" value="${tmf-request-test-suite-classname}" />
+		</ant>
+	</target>
+
+	<target name="tmf_trace_test_suite">
+		<property name="tmf-folder" value="${eclipse-home}/tmf_folder" />
+		<delete dir="${tmf-folder}" quiet="true" />
+		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="data-dir" value="${tmf-folder}" />
+			<property name="plugin-name" value="${plugin-name}" />
+			<property name="classname" value="${tmf-trace-test-suite-classname}" />
+		</ant>
+	</target>
+
+	<!-- This target holds code to cleanup the testing environment after  -->
+	<!-- all of the tests have been run. You can use this target to -->
+	<!-- delete temporary files that have been created. -->
+	<target name="cleanup">
+		<mkdir dir="${results}/consolelogs" />
+		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
+	</target>
+
+	<!-- This target runs the test suite. Any actions that need to happen -->
+	<!-- after all the tests have been run should go here. -->
+	<target name="run" depends="init,tmf_event_test_suite,tmf_request_test_suite,tmf_trace_test_suite,cleanup">
+		<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="includes" value="org*.xml" />
+			<property name="output-file" value="${plugin-name}.xml" />
+		</ant>
+	</target>
+
+    <target name="all" depends="run" description="Dummy target to run all tests">
+    </target>
+
+</project>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/testfiles/A-Test-10K b/lttng/org.eclipse.linuxtools.tmf.tests/testfiles/A-Test-10K
new file mode 100644
index 0000000..cfb674a
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/testfiles/A-Test-10K
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/testfiles/E-Test-10K b/lttng/org.eclipse.linuxtools.tmf.tests/testfiles/E-Test-10K
new file mode 100644
index 0000000..08ab10d
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/testfiles/E-Test-10K
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/testfiles/O-Test-10K b/lttng/org.eclipse.linuxtools.tmf.tests/testfiles/O-Test-10K
new file mode 100644
index 0000000..c7db621
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/testfiles/O-Test-10K
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/testfiles/R-Test-10K b/lttng/org.eclipse.linuxtools.tmf.tests/testfiles/R-Test-10K
new file mode 100644
index 0000000..3e1dcb7
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/testfiles/R-Test-10K
Binary files differ
diff --git a/profiling/.classpath b/lttng/org.eclipse.linuxtools.tmf.ui.tests/.classpath
similarity index 100%
copy from profiling/.classpath
copy to lttng/org.eclipse.linuxtools.tmf.ui.tests/.classpath
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui.tests/.project b/lttng/org.eclipse.linuxtools.tmf.ui.tests/.project
new file mode 100644
index 0000000..08ccb6c
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.tmf.ui.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..9d64117
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.linuxtools.tmf.ui.tests
+Bundle-Version: 0.2.0.qualifier
+Bundle-Vendor: %Bundle-Vendor
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.junit,
+ org.eclipse.linuxtools.tmf;bundle-version="0.2.0",
+ org.eclipse.linuxtools.tmf.ui;bundle-version="0.2.0"
+Bundle-Localization: plugin
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui.tests/build.properties b/lttng/org.eclipse.linuxtools.tmf.ui.tests/build.properties
new file mode 100644
index 0000000..33230c0
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui.tests/build.properties
@@ -0,0 +1,6 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.properties,\
+               test.xml
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui.tests/plugin.properties b/lttng/org.eclipse.linuxtools.tmf.ui.tests/plugin.properties
new file mode 100644
index 0000000..ab5f68e
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui.tests/plugin.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.linuxtools.tmf.ui.tests
+Bundle-Vendor = Eclipse
+Bundle-Name = Tracing and Monitoring Framework (TMF) UI Unit Test Suite
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui.tests/test.xml b/lttng/org.eclipse.linuxtools.tmf.ui.tests/test.xml
new file mode 100644
index 0000000..3750668
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui.tests/test.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+
+<project name="testsuite" default="run" basedir=".">
+	<property name="classname" value="org.eclipse.linuxtools.tmf.ui.tests" />
+	<property name="plugin-name" value="org.eclipse.linuxtools.tmf.ui.tests" />
+
+	<!-- The property ${eclipse-home} should be passed into this script -->
+	<!-- Set a meaningful default value for when it is not. -->
+	<property name="eclipse-home" value="${basedir}/../../" />
+
+	<property name="library-file" value="${eclipse-home}/dropins/${subProjectName2}/plugins/org.eclipse.test/library.xml" />
+
+	<!-- This target holds all initialization code that needs to be done for -->
+	<!-- all tests that are to be run. Initialization for individual tests -->
+	<!-- should be done within the body of the suite target. -->
+	<target name="init">
+		<tstamp />
+		<delete>
+			<fileset dir="${eclipse-home}" includes="org*.xml" />
+		</delete>
+	</target>
+
+	<!-- This target defines the tests that need to be run. -->
+	<target name="tmf_ui_test_suite">
+		<property name="tmfui-folder" value="${eclipse-home}/tmfui_folder" />
+		<delete dir="${tmfui-folder}" quiet="true" />
+		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="data-dir" value="${tmfui-folder}" />
+			<property name="plugin-name" value="${plugin-name}" />
+			<property name="classname" value="${classname}" />
+		</ant>
+	</target>
+
+	<!-- This target holds code to cleanup the testing environment after  -->
+	<!-- all of the tests have been run. You can use this target to -->
+	<!-- delete temporary files that have been created. -->
+	<target name="cleanup">
+		<mkdir dir="${results}/consolelogs" />
+		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
+	</target>
+
+	<!-- This target runs the test suite. Any actions that need to happen -->
+	<!-- after all the tests have been run should go here. -->
+	<target name="run" depends="init,cleanup">
+		<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="includes" value="org*.xml" />
+			<property name="output-file" value="${plugin-name}.xml" />
+		</ant>
+	</target>
+
+    <target name="all" depends="run" description="Dummy target to run all tests">
+    </target>
+
+</project>
diff --git a/profiling/.classpath b/lttng/org.eclipse.linuxtools.tmf.ui/.classpath
similarity index 100%
copy from profiling/.classpath
copy to lttng/org.eclipse.linuxtools.tmf.ui/.classpath
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/.project b/lttng/org.eclipse.linuxtools.tmf.ui/.project
new file mode 100644
index 0000000..87f2a6b
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.tmf.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..192c41e
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.linuxtools.tmf.ui
+Bundle-Version: 0.2.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.tmf.ui.TmfUiPlugin
+Bundle-Vendor: %Bundle-Vendor
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.linuxtools.tmf;bundle-version="0.2.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.linuxtools.tmf.ui,
+ org.eclipse.linuxtools.tmf.ui.viewers,
+ org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis,
+ org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.dialogs,
+ org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model,
+ org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.widgets,
+ org.eclipse.linuxtools.tmf.ui.views
+Bundle-Localization: plugin
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/build.properties b/lttng/org.eclipse.linuxtools.tmf.ui/build.properties
new file mode 100644
index 0000000..ae84c65
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/build.properties
@@ -0,0 +1,6 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               icons/,\
+               plugin.properties
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/icons/events_view.gif b/lttng/org.eclipse.linuxtools.tmf.ui/icons/events_view.gif
new file mode 100644
index 0000000..1ef74cf
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/icons/events_view.gif
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/icons/filter_items.gif b/lttng/org.eclipse.linuxtools.tmf.ui/icons/filter_items.gif
new file mode 100644
index 0000000..ef51bd5
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/icons/filter_items.gif
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/icons/home_nav.gif b/lttng/org.eclipse.linuxtools.tmf.ui/icons/home_nav.gif
new file mode 100644
index 0000000..fd0c669
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/icons/home_nav.gif
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/icons/next_event.gif b/lttng/org.eclipse.linuxtools.tmf.ui/icons/next_event.gif
new file mode 100644
index 0000000..da6c4b6
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/icons/next_event.gif
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/icons/next_item.gif b/lttng/org.eclipse.linuxtools.tmf.ui/icons/next_item.gif
new file mode 100644
index 0000000..a970e7e
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/icons/next_item.gif
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/icons/prev_event.gif b/lttng/org.eclipse.linuxtools.tmf.ui/icons/prev_event.gif
new file mode 100644
index 0000000..ed3e7c2
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/icons/prev_event.gif
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/icons/prev_item.gif b/lttng/org.eclipse.linuxtools.tmf.ui/icons/prev_item.gif
new file mode 100644
index 0000000..c16474a
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/icons/prev_item.gif
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/icons/project_view.gif b/lttng/org.eclipse.linuxtools.tmf.ui/icons/project_view.gif
new file mode 100644
index 0000000..4b98a62
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/icons/project_view.gif
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/icons/synced.gif b/lttng/org.eclipse.linuxtools.tmf.ui/icons/synced.gif
new file mode 100644
index 0000000..870934b
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/icons/synced.gif
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/icons/zoomin_nav.gif b/lttng/org.eclipse.linuxtools.tmf.ui/icons/zoomin_nav.gif
new file mode 100644
index 0000000..31441e3
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/icons/zoomin_nav.gif
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/icons/zoomout_nav.gif b/lttng/org.eclipse.linuxtools.tmf.ui/icons/zoomout_nav.gif
new file mode 100644
index 0000000..1f87400
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/icons/zoomout_nav.gif
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/plugin.properties b/lttng/org.eclipse.linuxtools.tmf.ui/plugin.properties
new file mode 100644
index 0000000..2f94474
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/plugin.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.linuxtools.tmf.ui
+Bundle-Vendor = Eclipse
+Bundle-Name = Tracing and Monitoring Framework (TMF) UI (Incubation)
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/TmfUiPlugin.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/TmfUiPlugin.java
new file mode 100644
index 0000000..8902c93
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/TmfUiPlugin.java
@@ -0,0 +1,82 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.ui;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * <b><u>TmfUiPlugin</u></b>
+ * <p>
+ * The activator class controls the plug-in life cycle
+ */
+public class TmfUiPlugin extends AbstractUIPlugin {
+
+    // ========================================================================
+    // Attributes
+    // ========================================================================
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.tmf.ui";
+
+	// The shared instance
+	private static TmfUiPlugin plugin;
+	
+    // ========================================================================
+    // Constructors
+    // ========================================================================
+
+	/**
+	 * The constructor
+	 */
+	public TmfUiPlugin() {
+	}
+
+    // ========================================================================
+    // Accessors
+    // ========================================================================
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static TmfUiPlugin getDefault() {
+		return plugin;
+	}
+
+    // ========================================================================
+    // Operators
+    // ========================================================================
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/ITmfViewer.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/ITmfViewer.java
new file mode 100644
index 0000000..7ce82bb
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/ITmfViewer.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.ui.viewers;
+
+/**
+ * <b><u>ITmfWidget</u></b>
+ * <p>
+ *
+ * TODO: Implement me. Please.
+ */
+public interface ITmfViewer {
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/TmfViewerFactory.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/TmfViewerFactory.java
new file mode 100644
index 0000000..b30f8d4
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/TmfViewerFactory.java
@@ -0,0 +1,38 @@
+/*******************************************************************************

+ * Copyright (c) 2009 Ericsson

+ * 

+ * All rights reserved. This program and the accompanying materials are

+ * made available under the terms of the Eclipse Public License v1.0 which

+ * accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *   Alvaro Sanchez-Leon - Initial API and implementation

+ *******************************************************************************/

+

+package org.eclipse.linuxtools.tmf.ui.viewers;

+

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.ITimeAnalysisViewer;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.TmfTimeAnalysisProvider;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.TmfTimeAnalysisViewer;

+import org.eclipse.swt.widgets.Composite;

+

+/**

+ * <b><u>TmfWidgetFactory</u></b>

+ * <p>

+ *

+ * TODO: Generalize when extension points are introduced

+ * TODO: Today, it is specific for the TimeAnalysis widget

+ */

+public class TmfViewerFactory {

+

+//    public static ITmfWidget createWidget(String id, Composite parent) {

+//        return null;

+//    }

+    

+    public static ITimeAnalysisViewer createViewer(Composite parent,

+            TmfTimeAnalysisProvider provider) {

+        return new TmfTimeAnalysisViewer(parent, provider);

+    }

+

+}

diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/GridUtil.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/GridUtil.java
new file mode 100644
index 0000000..95e1250
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/GridUtil.java
@@ -0,0 +1,45 @@
+/**********************************************************************

+ * Copyright (c) 2005, 2006 IBM Corporation and others.

+ * All rights reserved.   This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * $Id: GridUtil.java,v 1.3 2006/09/20 19:49:13 ewchan Exp $

+ * 

+ * Contributors: 

+ * IBM - Initial API and implementation

+ **********************************************************************/

+

+package org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis;

+

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.layout.GridData;

+

+/**

+ * A utility class to create convenient grid data objects.

+ */ 

+public class GridUtil

+{

+	/**

+	 * Creates a grid data object that occupies vertical and horizontal

+	 * space.

+	 */

+	static public GridData createFill() 

+	{

+		return new GridData(SWT.FILL, SWT.FILL, true, true);

+	}

+	/**

+	 * Creates a grid data object that occupies horizontal space.

+	 */

+	static public GridData createHorizontalFill() 

+	{		

+		return new GridData(SWT.FILL, SWT.DEFAULT, true, false);		

+	}

+	/**

+	 * Creates a grid data object that occupies vertical space.

+	 */

+	static public GridData createVerticalFill() 

+	{

+		return new GridData(SWT.DEFAULT, SWT.FILL, false, true);

+	}

+}

diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/ITimeAnalysisViewer.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/ITimeAnalysisViewer.java
new file mode 100644
index 0000000..d0d32d6
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/ITimeAnalysisViewer.java
@@ -0,0 +1,165 @@
+/*******************************************************************************

+ * Copyright (c) 2009 Ericsson

+ * 

+ * All rights reserved. This program and the accompanying materials are

+ * made available under the terms of the Eclipse Public License v1.0 which

+ * accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *   Alvaro Sanchez-Leon - Initial API and implementation

+ *******************************************************************************/

+

+ package org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis;

+

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.ISelectionProvider;

+import org.eclipse.linuxtools.tmf.ui.viewers.ITmfViewer;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITimeEvent;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITmfTimeAnalysisEntry;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.TimeEvent;

+import org.eclipse.swt.events.ControlEvent;

+import org.eclipse.swt.widgets.Control;

+

+/**

+ * <b><u>ITimeAnalysisWidget</u></b>

+ * <p>

+ *

+ * TODO: Implement me. Please.

+ */

+public interface ITimeAnalysisViewer extends ITmfViewer {

+

+    public enum TimeFormat {

+		RELATIVE, ABSOLUTE

+	};

+

+	/**

+	 * @param e

+	 */

+	public void controlResized(ControlEvent e);

+

+	/**

+	 * 

+	 * @param traceArr

+	 * @param start

+	 *            Specifies a fixed start time to the information to be

+	 *            displayed

+	 * @param end

+	 *            Specifies a fixed end time to the information to be displayed

+	 * @param updateTimeBounds

+	 *            If True - Time Range boundaries update is required

+	 */

+	public abstract void display(ITmfTimeAnalysisEntry[] traceArr, long start,

+			long end, boolean updateTimeBounds);

+

+	/**

+	 * The start and End time are taken from the limits used by the children

+	 * events

+	 * 

+	 * @param traceArr

+	 */

+	public abstract void display(ITmfTimeAnalysisEntry[] traceArr);

+

+	public void addWidgetSelectionListner(ITmfTimeSelectionListener listener);

+

+	public void addWidgetTimeScaleSelectionListner(

+			ITmfTimeScaleSelectionListener listener);

+

+	public void filterTraces();

+

+	public ITmfTimeAnalysisEntry getSelectedTrace();

+

+	public ISelection getSelection();

+

+	public void groupTraces(boolean on);

+

+	public boolean isInFocus();

+

+	public void removeWidgetSelectionListner(ITmfTimeSelectionListener listener);

+

+	public void removeWidgetTimeScaleSelectionListner(

+			ITmfTimeScaleSelectionListener listener);

+

+	public void resetStartFinishTime();

+

+	public void selectNextEvent();

+

+	public void selectPrevEvent();

+

+	public void selectNextTrace();

+

+	public void selectPrevTrace();

+

+	public void showLegend();

+

+	public void zoomIn();

+

+	public void zoomOut();

+

+	public void setSelectedTime(long time, boolean ensureVisible, Object source);

+

+	public void setSelectedEvent(ITimeEvent event, Object Source);

+

+	public void setSelectedTraceTime(ITmfTimeAnalysisEntry trace, long time, Object Source);

+

+	public void setSelectVisTimeWindow(long time0, long time1, Object Source);

+

+	public void setAcceptSelectionAPIcalls(boolean acceptCalls);

+

+	public void setTimeCalendarFormat(boolean toAbsoluteCaltime);

+

+	public boolean isCalendarFormat();

+

+	public boolean isVisibleVerticalScroll();

+

+	public void setVisibleVerticalScroll(boolean visibleVerticalScroll);

+

+	public int getBorderWidth();

+

+	public void setBorderWidth(int borderWidth);

+

+	public int getHeaderHeight();

+

+	public void setHeaderHeight(int headerHeight);

+

+	public int getItemHeight();

+

+	public void setItemHeight(int rowHeight);

+

+	public void resizeControls();

+

+	public void setSelectedTrace(ITmfTimeAnalysisEntry trace);

+

+	public ISelection getSelectionTrace();

+

+	public void setNameWidthPref(int width);

+

+	public int getNameWidthPref(int width);

+

+	public void addFilterSelectionListner(ITmfTimeFilterSelectionListener listener);

+

+	public void removeFilterSelectionListner(

+			ITmfTimeFilterSelectionListener listener);

+

+	public int getTimeSpace();

+

+	public void itemUpdate(ITmfTimeAnalysisEntry parent, TimeEvent item);

+

+	public Control getControl();

+

+	public ISelectionProvider getSelectionProvider();

+

+	/**

+	 * <p>

+	 * Provide the possibility to control the wait cursor externally

+	 * </p>

+	 * <p>

+	 * e.g. data requests in progress

+	 * </p>

+	 * 

+	 * @param waitInd

+	 *            - true change to wait cursor

+	 */

+	public void waitCursor(boolean waitInd);

+

+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/ITmfTimeFilterSelectionListener.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/ITmfTimeFilterSelectionListener.java
new file mode 100644
index 0000000..0b10203
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/ITmfTimeFilterSelectionListener.java
@@ -0,0 +1,19 @@
+/*******************************************************************************

+ * Copyright (c) 2009 Ericsson

+ * 

+ * All rights reserved. This program and the accompanying materials are

+ * made available under the terms of the Eclipse Public License v1.0 which

+ * accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *   Alvaro Sanchez-Leon - Initial API and implementation

+ *******************************************************************************/

+

+package org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis;

+

+import java.util.EventListener;

+

+public interface ITmfTimeFilterSelectionListener extends EventListener {

+	public void tmfTaProcessFilterSelection(TmfTimeFilterSelectionEvent event);

+}

diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/ITmfTimeScaleSelectionListener.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/ITmfTimeScaleSelectionListener.java
new file mode 100644
index 0000000..f73845b
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/ITmfTimeScaleSelectionListener.java
@@ -0,0 +1,24 @@
+/*******************************************************************************

+ * Copyright (c) 2009 Ericsson

+ * 

+ * All rights reserved. This program and the accompanying materials are

+ * made available under the terms of the Eclipse Public License v1.0 which

+ * accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *   Alvaro Sanchez-Leon - Initial API and implementation

+ *******************************************************************************/

+

+package org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis;

+

+import java.util.EventListener;

+

+/**

+ * Implemented by any user of TmfTime in order to be notified of available events,

+ * upon registration

+ * 

+ */

+public interface ITmfTimeScaleSelectionListener extends EventListener {

+	public void tsfTmProcessTimeScaleEvent(TmfTimeScaleSelectionEvent event);

+}

diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/ITmfTimeSelectionListener.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/ITmfTimeSelectionListener.java
new file mode 100644
index 0000000..77d7b82
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/ITmfTimeSelectionListener.java
@@ -0,0 +1,24 @@
+/*******************************************************************************

+ * Copyright (c) 2009 Ericsson

+ * 

+ * All rights reserved. This program and the accompanying materials are

+ * made available under the terms of the Eclipse Public License v1.0 which

+ * accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *   Alvaro Sanchez-Leon - Initial API and implementation

+ *******************************************************************************/

+

+package org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis;

+

+import java.util.EventListener;

+

+/**

+ * Implemented by any user of TsfTm in order to be notified of available events,

+ * upon registration

+ * 

+ */

+public interface ITmfTimeSelectionListener extends EventListener {

+	public void tsfTmProcessSelEvent(TmfTimeSelectionEvent event);

+}

diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/Messages.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/Messages.java
new file mode 100644
index 0000000..c02a986
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/Messages.java
@@ -0,0 +1,53 @@
+/********************************************************************** 

+ * Copyright (c) 2005, 2008, 2009  IBM Corporation, Intel Corporation, Ericsson

+ * 

+ * All rights reserved.   This program and the accompanying materials 

+ * are made available under the terms of the Eclipse Public License v1.0 

+ * which accompanies this distribution, and is available at 

+ * http://www.eclipse.org/legal/epl-v10.html         

+ * $Id: UIMessages.java,v 1.18 2008/06/03 16:53:41 aalexeev Exp $ 

+ * 

+ * Contributors: 

+ * IBM - Initial API and implementation 

+ * Alvaro Sanchez-Leon - Stripped down for TMF

+ **********************************************************************/

+

+package org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis;

+

+import org.eclipse.osgi.util.NLS;

+

+public class Messages {

+

+    private static final String BUNDLE_NAME = "org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.messages"; //$NON-NLS-1$

+	public static String TRACE_STATES_TITLE;

+

+	public static String _TRACE_ID;

+	public static String _TRACE_NAME;

+	public static String _TRACE_CLASS_NAME;

+	public static String _TRACE_GROUP_NAME;

+	public static String _TRACE_START_TIME;

+	public static String _TRACE_DATE;

+	public static String _TRACE_STOP_TIME;

+	public static String _TRACE_STATE;

+	public static String _NUMBER_OF_TRACES;

+	public static String _TRACE_FILTER;

+	public static String _TRACE_FILTER_DESC;

+	// misc

+	public static String _Timescale;

+	public static String _DURATION;

+	public static String _UNDEFINED_GROUP;

+	public static String _TRACE_GROUP_LABEL;

+	public static String _EDIT_PROFILING_OPTIONS;

+

+	public static String _LEGEND;

+	public static String _TRACE_STATES;

+	public static String _WINDOW_TITLE;

+

+	private Messages() {

+		// Do not instantiate

+	}

+

+	static {

+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

+	}

+}

diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeAnalysisProvider.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeAnalysisProvider.java
new file mode 100644
index 0000000..4f4a49d
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeAnalysisProvider.java
@@ -0,0 +1,328 @@
+/*******************************************************************************

+ * Copyright (c) 2009 Ericsson

+ * 

+ * All rights reserved. This program and the accompanying materials are

+ * made available under the terms of the Eclipse Public License v1.0 which

+ * accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *   Alvaro Sanchez-Leon - Initial API and implementation

+ *******************************************************************************/

+

+package org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis;

+

+import java.util.List;

+import java.util.Map;

+

+import org.eclipse.jface.resource.ImageDescriptor;

+import org.eclipse.linuxtools.tmf.ui.TmfUiPlugin;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITimeEvent;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITmfTimeAnalysisEntry;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.TimeEvent;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.widgets.TraceColorScheme;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.graphics.GC;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.graphics.Rectangle;

+import org.eclipse.ui.plugin.AbstractUIPlugin;

+

+public abstract class TmfTimeAnalysisProvider {

+    

+	static public final int IMG_THREAD_RUNNING = 0;

+	static public final int IMG_THREAD_SUSPENDED = 1;

+	static public final int IMG_THREAD_STOPPED = 2;

+	static public final int IMG_METHOD_RUNNING = 3;

+	static public final int IMG_METHOD = 4;

+	static public final int IMG_NUM = 5;

+

+	public enum StateColor {

+		GREEN, DARK_BLUE, RED, GOLD, ORANGE, GRAY, BLACK, DARK_GREEN, DARK_YELLOW, MAGENTA3, PURPLE1, PINK1, AQUAMARINE, LIGHT_BLUE, CADET_BLUE, OLIVE;

+

+		private String stateName;

+

+		StateColor() {

+			String undef = new String("Undefined");

+			this.stateName = undef;

+		}

+

+		public String getStateName() {

+			return stateName;

+		}

+

+		public void setStateName(String stateName) {

+			this.stateName = stateName;

+		}

+	}

+

+	static private String _externalPath[] = {

+			"icons/full/obj16/thread_obj.gif", // running thread

+			"icons/full/obj16/threads_obj.gif", // suspended

+			"icons/full/obj16/threadt_obj.gif", // stopped

+			"icons/full/obj16/stckframe_running_obj.gif", // running stack frame

+			"icons/full/obj16/stckframe_obj.gif", // stack frame

+	};

+

+	static private String _externalPlugin[] = { "org.eclipse.debug.ui",

+			"org.eclipse.debug.ui", "org.eclipse.debug.ui",

+			"org.eclipse.debug.ui", "org.eclipse.debug.ui", };

+

+	static private Image getImage(int idx) {

+		if (idx < 0 || idx >= IMG_NUM)

+			SWT.error(SWT.ERROR_INVALID_ARGUMENT);

+		String key = "trace.img." + idx;

+		Image img = TmfUiPlugin.getDefault().getImageRegistry().get(key);

+		if (null == img) {

+			ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(

+					_externalPlugin[idx], _externalPath[idx]);

+			TmfUiPlugin.getDefault().getImageRegistry().put(key, desc);

+			img = TmfUiPlugin.getDefault().getImageRegistry().get(key);

+		}

+		return img;

+	}

+

+	public void drawState(TraceColorScheme colors, ITimeEvent event,

+			Rectangle rect, GC gc, boolean selected, boolean rectBound,

+			boolean timeSelected) {

+		int colorIdx = getEventColorVal(event);

+		drawState(colors, colorIdx, rect, gc, selected, rectBound, timeSelected);

+

+	}

+

+	public void drawState(TraceColorScheme colors, int colorIdx,

+			Rectangle rect, GC gc, boolean selected, boolean rectBound,

+			boolean timeSelected) {

+

+		boolean visible = rect.width == 0 ? false : true;

+		int colorIdx1 = colorIdx;

+		

+		timeSelected = timeSelected && selected;

+		if (timeSelected) {

+			colorIdx1 = colorIdx + TraceColorScheme.STATES_SEL0

+					- TraceColorScheme.STATES0;

+		}

+

+		if (visible) {

+			// fill all rect area

+			if (rect.isEmpty())

+				return;

+

+			gc.setBackground(colors.getColor(colorIdx1));

+			gc.fillRectangle(rect);

+			colorIdx1 = colorIdx + TraceColorScheme.STATES_BORDER0

+					- TraceColorScheme.STATES0;

+			gc.setForeground(colors.getColor(colorIdx1));

+

+			// draw bounds

+			if (!timeSelected) {

+				if (rectBound && rect.width >= 3) {

+					gc.drawRectangle(rect.x, rect.y, rect.width - 1,

+							rect.height - 1);

+				} else {

+					// Draw the top and bottom borders i.e. no side borders

+					// top

+					gc

+							.drawLine(rect.x, rect.y, rect.x + rect.width - 1,

+									rect.y);

+					// bottom

+					gc.drawLine(rect.x, rect.y + rect.height - 1, rect.x

+							+ rect.width - 1, rect.y + rect.height - 1);

+				}

+			}

+			// draw decoration middle line

+			// int mindy = rect.y + rect.height / 2;

+			// if (TraceColorScheme.GOLD_STATE == colorIdx

+			// || TraceColorScheme.ORANGE_STATE == colorIdx) {

+			// int s = gc.getLineStyle();

+			// int w = gc.getLineWidth();

+			// gc.setLineStyle(SWT.LINE_DOT);

+			// gc.setLineWidth(2);

+			// gc.drawLine(rect.x, mindy, rect.x + rect.width, mindy);

+			// gc.setLineStyle(s);

+			// gc.setLineWidth(w);

+			// } else if (TraceColorScheme.RED_STATE == colorIdx

+			// || TraceColorScheme.GRAY_STATE == colorIdx) {

+			// int w = gc.getLineWidth();

+			// gc.setLineWidth(2);

+			// gc.drawLine(rect.x, mindy, rect.x + rect.width, mindy);

+			// gc.setLineWidth(w);

+			// }

+			// // draw selection bounds

+			// if (timeSelected) {

+			// gc.setForeground(colors

+			// .getColor(TraceColorScheme.SELECTED_TIME));

+			// if (rect.width >= 3) {

+			// gc.drawRectangle(rect.x, rect.y, rect.width - 1,

+			// rect.height - 1);

+			// // gc.drawRectangle(rect.x + 1, rect.y + 1, rect.width - 3,

+			// // rect.height - 3);

+			// } else {

+			// gc

+			// .drawLine(rect.x, rect.y, rect.x + rect.width - 1,

+			// rect.y);

+			// gc.drawLine(rect.x, rect.y + rect.height - 1, rect.x

+			// + rect.width - 1, rect.y + rect.height - 1);

+			// }

+			// gc.drawLine(rect.x, rect.y + 1, rect.x + rect.width - 1,

+			// rect.y + 1);

+			// gc.drawLine(rect.x, rect.y + rect.height - 2, rect.x

+			// + rect.width - 1, rect.y + rect.height - 2);

+			// }

+		} else {

+			// selected rectangle area is not visible but can be represented

+			// with a broken vertical line of specified width.

+			int width = 2;

+			rect.width = width;

+			// check if height is greater than zero.

+			if (rect.isEmpty())

+				return;

+			// colorIdx1 = TraceColorScheme.BLACK;

+			gc.setForeground(colors.getColor(colorIdx));

+			int s = gc.getLineStyle();

+			int w = gc.getLineWidth();

+			gc.setLineStyle(SWT.LINE_DOT);

+			gc.setLineWidth(width);

+			// Trace.debug("Reactangle not visible, drawing vertical line with: "

+			// + rect.x + "," + rect.y + "," + rect.x + "," + rect.y

+			// + rect.height);

+			gc.drawLine(rect.x, rect.y, rect.x, rect.y + rect.height);

+			gc.setLineStyle(s);

+			gc.setLineWidth(w);

+		}

+	}

+

+	/**

+	 * Uses the abstract method getEventcolor to obtain an enum value and

+	 * convert it to an internal color index

+	 * 

+	 * @param event

+	 * @return

+	 */

+	public int getEventColorVal(ITimeEvent event) {

+		StateColor colors = getEventColor(event);

+		if (colors == StateColor.GREEN) {

+			return TraceColorScheme.GREEN_STATE;

+		} else if (colors == StateColor.DARK_BLUE) {

+			return TraceColorScheme.DARK_BLUE_STATE;

+		} else if (colors == StateColor.RED) {

+			return TraceColorScheme.RED_STATE;

+		} else if (colors == StateColor.GOLD) {

+			return TraceColorScheme.GOLD_STATE;

+		} else if (colors == StateColor.ORANGE) {

+			return TraceColorScheme.ORANGE_STATE;

+		} else if (colors == StateColor.GRAY) {

+			return TraceColorScheme.GRAY_STATE;

+		} else if (colors == StateColor.DARK_GREEN) {

+			return TraceColorScheme.DARK_GREEN_STATE;

+		} else if (colors == StateColor.DARK_YELLOW) {

+			return TraceColorScheme.DARK_YELLOW_STATE;

+		} else if (colors == StateColor.MAGENTA3) {

+			return TraceColorScheme.MAGENTA3_STATE;

+		} else if (colors == StateColor.PURPLE1) {

+			return TraceColorScheme.PURPLE1_STATE;

+		} else if (colors == StateColor.PINK1) {

+			return TraceColorScheme.PINK1_STATE;

+		} else if (colors == StateColor.AQUAMARINE) {

+			return TraceColorScheme.AQUAMARINE_STATE;

+		} else if (colors == StateColor.LIGHT_BLUE) {

+			return TraceColorScheme.LIGHT_BLUE_STATE;

+		} else if (colors == StateColor.CADET_BLUE) {

+			return TraceColorScheme.CADET_BLUE_STATE_SEL;

+		} else if (colors == StateColor.OLIVE) {

+			return TraceColorScheme.OLIVE_STATE;

+		}

+

+		return TraceColorScheme.BLACK_STATE;

+	}

+

+	/**

+	 * Select the color for the different internal variants of events.

+	 * 

+	 * @param event

+	 * @return

+	 */

+	public abstract StateColor getEventColor(ITimeEvent event);

+

+	/**

+	 * This values is appended between braces to the right of Trace Name e.g.

+	 * Trace And Error Log [Board 17] or for a Thread trace e.g. State Server

+	 * [java.lang.Thread]

+	 * 

+	 * @param trace

+	 * @return

+	 */

+	public abstract String getTraceClassName(ITmfTimeAnalysisEntry trace);

+

+	public String getEventName(ITimeEvent event) {

+		return getEventName(event, true, false);

+	}

+

+	/**

+	 * Specify a Name for the event depending on its type or state e.g. blocked,

+	 * running, etc..

+	 * 

+	 * @param event

+	 * @param upper

+	 *            True return String value in Upper case

+	 * @param extInfo

+	 *            Verbose, add additional information if applicable

+	 * @return

+	 */

+	public abstract String getEventName(ITimeEvent event, boolean upper,

+			boolean extInfo);

+

+	public String composeTraceName(ITmfTimeAnalysisEntry trace, boolean inclState) {

+		String name = trace.getName();

+		String threadClass = getTraceClassName(trace);

+		if (threadClass != null && threadClass.length() > 0) {

+			name += " [" + threadClass + "]";

+		}

+		if (inclState) {

+			List<TimeEvent> list = trace.getTraceEvents();

+			if (null != list && list.size() > 0) {

+				ITimeEvent event = (ITimeEvent) list.get(list.size() - 1);

+				name += " (" + getEventName(event, false, true) + ")";

+			}

+		}

+		return name;

+	}

+

+	public String composeEventName(ITimeEvent event) {

+		String name = event.getEntry().getName();

+		String threadClass = getTraceClassName(event.getEntry());

+		if (threadClass != null && threadClass.length() > 0) {

+			name += " [" + threadClass + "]";

+		}

+		name += " (" + getEventName(event, false, true) + ")";

+		return name;

+	}

+

+	public abstract Map<String, String> getEventHoverToolTipInfo(

+			ITimeEvent event);

+

+	/**

+	 * Provides the image icon for a given Event or Trace e.g. customize to use

+	 * different icons according to specific event /state combination

+	 * 

+	 * @param obj

+	 * @return

+	 */

+	public Image getItemImage(Object obj) {

+		if (obj instanceof ITmfTimeAnalysisEntry) {

+			List<TimeEvent> list = ((ITmfTimeAnalysisEntry) obj).getTraceEvents();

+			if (null != list && list.size() > 0)

+				obj = list.get(list.size() - 1);

+			else if (((ITmfTimeAnalysisEntry) obj).getStopTime() > 0)

+				return getImage(IMG_THREAD_STOPPED);

+			else

+				return getImage(IMG_THREAD_RUNNING);

+		}

+		if (obj instanceof TimeEvent) {

+			return getImage(IMG_THREAD_RUNNING);

+		}

+		return null;

+	}

+

+	public abstract String getStateName(StateColor color);

+

+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeAnalysisViewer.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeAnalysisViewer.java
new file mode 100644
index 0000000..38e3d16
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeAnalysisViewer.java
@@ -0,0 +1,768 @@
+/*****************************************************************************

+ * Copyright (c) 2007, 2008, 2009 Intel Corporation, Ericsson

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Intel Corporation - Initial API and implementation

+ *    Ruslan A. Scherbakov, Intel - Initial API and implementation

+ *    Alexander N. Alexeev, Intel - Add monitors statistics support

+ *    Alvaro Sanchez-Leon - Adapted for TMF

+ *

+ * $Id: ThreadStatesView.java,v 1.7 2008/05/19 15:07:21 jkubasta Exp $ 

+ *****************************************************************************/

+

+package org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis;

+

+import java.util.Iterator;

+import java.util.List;

+import java.util.Vector;

+

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.ISelectionProvider;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.dialogs.TmfTimeFilterDialog;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.dialogs.TmfTimeLegend;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITimeEvent;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITmfTimeAnalysisEntry;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.TimeEvent;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.widgets.ITimeDataProvider;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.widgets.TimeScaleCtrl;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.widgets.TmfTimeStatesCtrl;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.widgets.TmfTimeTipHandler;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.widgets.TraceColorScheme;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.widgets.Utils;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.events.ControlAdapter;

+import org.eclipse.swt.events.ControlEvent;

+import org.eclipse.swt.events.SelectionEvent;

+import org.eclipse.swt.events.SelectionListener;

+import org.eclipse.swt.graphics.Rectangle;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Control;

+

+public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProvider, SelectionListener {

+

+	/** vars */

+	private long _minTimeInterval;

+	private long _selectedTime;

+	private long _beginTime;

+	private long _endTime;

+	private long _time0;

+	private long _time1;

+	private long _time0_;

+	private long _time1_;

+	private boolean _timeRangeFixed;

+	private int _nameWidthPref = 200;

+	private int _minNameWidth = 6;

+	private int _nameWidth;

+	private Composite _dataViewer;

+

+	private TmfTimeStatesCtrl _stateCtrl;

+	private TimeScaleCtrl _timeScaleCtrl;

+	private TmfTimeTipHandler _threadTip;

+	private TraceColorScheme _colors;

+	private TmfTimeAnalysisProvider _utilImplm;

+

+	private boolean _acceptSetSelAPICalls = false;

+	Vector<ITmfTimeSelectionListener> widgetSelectionListners = new Vector<ITmfTimeSelectionListener>();

+	Vector<ITmfTimeScaleSelectionListener> widgetTimeScaleSelectionListners = new Vector<ITmfTimeScaleSelectionListener>();

+	Vector<ITmfTimeFilterSelectionListener> widgetFilterSelectionListeners = new Vector<ITmfTimeFilterSelectionListener>();

+

+	// Calender Time format, using Epoch reference or Relative time

+	// format(default

+	private boolean calendarTimeFormat = false;

+	private int timeScaleBoderWidth = 4;

+	private int timeScaleHeight = 22;

+

+	/** ctor */

+	public TmfTimeAnalysisViewer(Composite parent, TmfTimeAnalysisProvider provider) {

+        createDataViewer(parent, provider);

+	}

+

+    /* (non-Javadoc)

+     * @see org.eclipse.linuxtools.tmf.ui.widgets.timeAnalysis.api.ITimeAnalysisWidget#display(org.eclipse.linuxtools.tmf.ui.widgets.timeAnalysis.model.TmfTaTrace[])

+     */

+    public void display(ITmfTimeAnalysisEntry[] traceArr) {

+        modelUpdate(traceArr);

+    }

+

+	public void display(ITmfTimeAnalysisEntry[] traceArr, long start, long end,

+			boolean updateTimeBounds) {

+		modelUpdate(traceArr, start, end, updateTimeBounds);

+    }

+

+    public void controlMoved(ControlEvent e) {

+	}

+

+	public void controlResized(ControlEvent e) {

+		resizeControls();

+	}

+

+	// called from the display order in the API

+	public void modelUpdate(ITmfTimeAnalysisEntry[] traces) {

+		if (null != _stateCtrl) {

+			loadOptions();

+			updateInternalData(traces);

+			_stateCtrl.redraw();

+			_timeScaleCtrl.redraw();

+		}

+	}

+

+	// called from the display order in the API

+	public void modelUpdate(ITmfTimeAnalysisEntry[] traces, long start,

+			long end, boolean updateTimeBounds) {

+		if (null != _stateCtrl) {

+			loadOptions();

+			updateInternalData(traces, start, end);

+			if (updateTimeBounds) {

+				_timeRangeFixed = true;

+				// set window to match limits

+				setStartFinishTimeExt(_time0_, _time1_);

+			} else {

+				_stateCtrl.redraw();

+				_timeScaleCtrl.redraw();

+			}

+		}

+	}

+

+	public void itemUpdate(ITmfTimeAnalysisEntry parent, TimeEvent item) {

+		if (null != parent && null != item) {

+			_stateCtrl.refreshPartial(parent, item);

+			_stateCtrl.redraw();

+			_timeScaleCtrl.redraw();

+		}

+	}

+

+	public void selectionChanged() {

+	}

+

+	protected String getViewTypeStr() {

+		return "viewoption.threads";

+	}

+

+	int getMarginWidth(int idx) {

+		return 0;

+	}

+

+	int getMarginHeight(int idx) {

+		return 0;

+	}

+

+	void loadOptions() {

+		_minTimeInterval = 500;

+		_selectedTime = -1;

+		_nameWidth = Utils.loadIntOption(getPreferenceString("namewidth"),

+				_nameWidthPref, _minNameWidth, 1000);

+	}

+

+	void saveOptions() {

+		Utils.saveIntOption(getPreferenceString("namewidth"), _nameWidth);

+	}

+

+	protected Control createDataViewer(Composite parent,

+			TmfTimeAnalysisProvider utilImplm) {

+		loadOptions();

+		_utilImplm = utilImplm;

+		_colors = new TraceColorScheme();

+		_dataViewer = new Composite(parent, SWT.NULL);

+		_dataViewer.setLayoutData(GridUtil.createFill());

+

+		_timeScaleCtrl = new TimeScaleCtrl(_dataViewer, _colors);

+		_timeScaleCtrl.setTimeProvider(this);

+		_timeScaleCtrl.setLayoutData(GridUtil.createFill());

+

+		_stateCtrl = new TmfTimeStatesCtrl(_dataViewer, _colors, _utilImplm);

+

+		_stateCtrl.setTimeProvider(this);

+		_stateCtrl.addSelectionListener(this);

+		_stateCtrl.setLayoutData(GridUtil.createFill());

+		_dataViewer.addControlListener(new ControlAdapter() {

+			@Override

+			public void controlResized(ControlEvent event) {

+				resizeControls();

+			}

+		});

+		resizeControls();

+		_dataViewer.update();

+		_threadTip = new TmfTimeTipHandler(parent.getShell(), _utilImplm, this);

+		_threadTip.activateHoverHelp(_stateCtrl);

+		return _dataViewer;

+	}

+

+	public void dispose() {

+		saveOptions();

+		_stateCtrl.dispose();

+		_dataViewer.dispose();

+		_colors.dispose();

+	}

+

+	public void resizeControls() {

+		Rectangle r = _dataViewer.getClientArea();

+		if (r.isEmpty())

+			return;

+

+		// System.out.println("Client Area:" + r);

+		// timeScaleBoderWidth = 8;

+		// timeScaleHeight = 22;

+		_timeScaleCtrl.setBounds(r.x, r.y + timeScaleBoderWidth, r.width,

+				timeScaleHeight);

+		_stateCtrl.setBounds(r.x, r.y + timeScaleBoderWidth + timeScaleHeight,

+				r.width, r.height - timeScaleBoderWidth - timeScaleHeight);

+		int width = r.width;

+		if (_nameWidth > width - _minNameWidth)

+			_nameWidth = width - _minNameWidth;

+		if (_nameWidth < _minNameWidth)

+			_nameWidth = _minNameWidth;

+	}

+

+	/** Tries to set most convinient time range for display. */

+	void setTimeRange(Object traces[]) {

+		_endTime = 0;

+		_beginTime = -1;

+		ITimeEvent event;

+		for (int i = 0; i < traces.length; i++) {

+			ITmfTimeAnalysisEntry thread = (ITmfTimeAnalysisEntry) traces[i];

+			long lastEventTime = thread.getStopTime();

+			if (lastEventTime > thread.getStartTime()) {

+				if (lastEventTime > _endTime)

+					_endTime = lastEventTime;

+			}

+			List<TimeEvent> list = thread.getTraceEvents();

+			int len = list.size();

+			if (len > 0) {

+				event = (ITimeEvent) list.get(list.size() - 1);

+				lastEventTime = event.getTime();

+				if (lastEventTime > _endTime) {

+					_endTime = lastEventTime;

+					long duration = event.getDuration();

+					_endTime += duration > 0 ? duration : 1000000;

+				}

+				event = (ITimeEvent) list.get(0);

+				if (_beginTime < 0 || _beginTime > event.getTime())

+					_beginTime = event.getTime();

+			}

+		}

+

+		if (_beginTime < 0)

+			_beginTime = 0;

+	}

+

+	void setTimeBounds() {

+		_time0_ = _beginTime - (long) ((_endTime - _beginTime) * 0.02);

+		if (_time0_ < 0)

+			_time0_ = 0;

+		// _time1_ = _time0_ + (_endTime - _time0_) * 1.05;

+		_time1_ = _endTime;

+		// _time0_ = Math.floor(_time0_);

+		// _time1_ = Math.ceil(_time1_);

+		if (!_timeRangeFixed) {

+			_time0 = _time0_;

+			_time1 = _time1_;

+		}

+	}

+

+	/**

+	 * @param traces

+	 */

+	void updateInternalData(ITmfTimeAnalysisEntry[] traces) {

+		if (null == traces)

+			traces = new ITmfTimeAnalysisEntry[0];

+		setTimeRange(traces);

+		refreshAllData(traces);

+	}

+

+	/**

+	 * @param traces

+	 * @param start

+	 * @param end

+	 */

+	void updateInternalData(ITmfTimeAnalysisEntry[] traces, long start, long end) {

+		if (null == traces)

+			traces = new ITmfTimeAnalysisEntry[0];

+		if (end < 1 || start < 1) {

+			// End or start time are unspecified and need to be determined from

+			// individual processes

+			setTimeRange(traces);

+		} else {

+			_endTime = end;

+			_beginTime = start;

+		}

+

+		refreshAllData(traces);

+	}

+

+	/**

+	 * @param traces

+	 */

+	private void refreshAllData(ITmfTimeAnalysisEntry[] traces) {

+		setTimeBounds();

+		if (_selectedTime < 0 || _selectedTime > _endTime)

+			_selectedTime = _endTime;

+		_stateCtrl.refreshData(traces);

+		filterOutNotification();

+	}

+

+	public void setFocus() {

+		if (null != _stateCtrl)

+			_stateCtrl.setFocus();

+	}

+

+	public boolean isInFocus() {

+		return _stateCtrl.isInFocus();

+	}

+

+	public ITmfTimeAnalysisEntry getSelectedTrace() {

+		return _stateCtrl.getSelectedTrace();

+	}

+

+	public ISelection getSelection() {

+		return _stateCtrl.getSelection();

+	}

+

+	public ISelection getSelectionTrace() {

+		return _stateCtrl.getSelectionTrace();

+	}

+

+	public long getTime0() {

+		return _time0;

+	}

+

+	public long getTime1() {

+		return _time1;

+	}

+

+	public long getMinTimeInterval() {

+		return _minTimeInterval;

+	}

+

+	public int getNameSpace() {

+		return _nameWidth;

+	}

+

+	public void setNameSpace(int width) {

+		_nameWidth = width;

+		width = _stateCtrl.getClientArea().width;

+		if (_nameWidth > width - 6)

+			_nameWidth = width - 6;

+		if (_nameWidth < 6)

+			_nameWidth = 6;

+		_stateCtrl.adjustScrolls();

+		_stateCtrl.redraw();

+		_timeScaleCtrl.redraw();

+	}

+

+	public int getTimeSpace() {

+		int w = _stateCtrl.getClientArea().width;

+		return w - _nameWidth;

+	}

+

+	public long getSelectedTime() {

+		return _selectedTime;

+	}

+

+	public long getBeginTime() {

+		return _beginTime;

+	}

+

+	public long getEndTime() {

+		return _endTime;

+	}

+

+	public long getMaxTime() {

+		return _time1_;

+	}

+

+	public long getMinTime() {

+		return _time0_;

+	}

+

+	public void setStartFinishTime(long time0, long time1) {

+		setStartFinishTimeExt(time0, time1);

+		notifyStartFinishTimeSelectionListeners(time0, time1);

+	}

+

+	public void setStartFinishTimeExt(long time0, long time1) {

+		_time0 = time0;

+		if (_time0 < _time0_)

+			_time0 = _time0_;

+		_time1 = time1;

+		if (_time1 - _time0 < _minTimeInterval)

+			_time1 = _time0 + _minTimeInterval;

+		if (_time1 > _time1_)

+			_time1 = _time1_;

+		_timeRangeFixed = true;

+		_stateCtrl.adjustScrolls();

+		_stateCtrl.redraw();

+		_timeScaleCtrl.redraw();

+	}

+

+	public void resetStartFinishTime() {

+		setStartFinishTime(_time0_, _time1_);

+		_timeRangeFixed = false;

+	}

+

+	public void setSelectedTimeInt(long time, boolean ensureVisible) {

+		// Trace.debug("currentTime:" + _selectedTime + " new time:" + time);

+		_selectedTime = time;

+		if (_selectedTime > _endTime)

+			_selectedTime = _endTime;

+		if (_selectedTime < _beginTime)

+			_selectedTime = _beginTime;

+		if (ensureVisible) {

+			double timeSpace = (_time1 - _time0) * .02;

+			double timeMid = (_time1 - _time0) * .1;

+			if (_selectedTime < _time0 + timeSpace) {

+				double dt = _time0 - _selectedTime + timeMid;

+				_time0 -= dt;

+				_time1 -= dt;

+			} else if (_selectedTime > _time1 - timeSpace) {

+				double dt = _selectedTime - _time1 + timeMid;

+				_time0 += dt;

+				_time1 += dt;

+			}

+			if (_time0 < 0) {

+				_time1 -= _time0;

+				_time0 = 0;

+			} else if (_time1 > _time1_) {

+				_time0 -= _time1 - _time1_;

+				_time1 = _time1_;

+			}

+		}

+		_stateCtrl.adjustScrolls();

+		_stateCtrl.redraw();

+		_timeScaleCtrl.redraw();

+	}

+

+	public void widgetDefaultSelected(SelectionEvent e) {

+		// TODO: Opening call stack shall be replaced to a configurable view

+		// new OpenCallStackViewAction().openView(false);

+		// Replaced by event notification

+		// updateModelSelection();

+		notifySelectionListeners(TmfTimeSelectionEvent.type.WIDGET_DEF_SEL);

+	}

+

+	public void widgetSelected(SelectionEvent e) {

+		// Replace by event notification

+		// updateModelSelection();

+		notifySelectionListeners(TmfTimeSelectionEvent.type.WIDGET_SEL);

+	}

+

+	public void selectNextEvent() {

+		_stateCtrl.selectNextEvent();

+	}

+

+	public void selectPrevEvent() {

+		_stateCtrl.selectPrevEvent();

+	}

+

+	public void selectNextTrace() {

+		_stateCtrl.selectNextTrace();

+	}

+

+	public void selectPrevTrace() {

+		_stateCtrl.selectPrevTrace();

+	}

+

+	public void groupTraces(boolean on) {

+		_stateCtrl.groupTraces(on);

+	}

+

+	public void filterTraces() {

+		if (_dataViewer == null || _dataViewer.isDisposed())

+			return;

+

+		if (TmfTimeFilterDialog.getTraceFilter(_dataViewer.getShell(), _stateCtrl

+				.getTraces(), _stateCtrl.getTraceFilter())) {

+			_stateCtrl.refreshData();

+			filterOutNotification();

+		}

+	}

+

+	public void showLegend() {

+		if (_dataViewer == null || _dataViewer.isDisposed())

+			return;

+

+		TmfTimeLegend.open(_dataViewer.getShell(), _utilImplm);

+	}

+

+	public void toggleThreadsInteractionDrawing() {

+		_stateCtrl.toggleTraceInteractionDrawing();

+	}

+

+	public void setThreadJoinDrawing(boolean on) {

+		_stateCtrl.setTraceJoinDrawing(on);

+	}

+

+	public void setThreadWaitDrawing(boolean on) {

+		_stateCtrl.setTraceWaitDrawing(on);

+	}

+

+	public void setThreadReleaseDrawing(boolean on) {

+		_stateCtrl.setTraceReleaseDrawing(on);

+	}

+

+	public boolean getThreadInteractionDrawing() {

+		return _stateCtrl.getTracesInteractionDrawing();

+	}

+

+	public boolean getThreadJoinDrawing() {

+		return _stateCtrl.getTraceJoinDrawing();

+	}

+

+	public boolean getThreadWaitDrawing() {

+		return _stateCtrl.getTraceWaitDrawing();

+	}

+

+	public boolean getThreadReleaseDrawing() {

+		return _stateCtrl.getTraceReleaseDrawing();

+	}

+

+	protected void select(Object obj) {

+		if (obj == null)

+			return;

+		// TODO: ThreadDetails Adaption removed, might need replacement

+		// if (obj instanceof ThreadDetails) {

+		// obj = ((ThreadDetails) obj).getThread();

+		// }

+		if (obj instanceof ITmfTimeAnalysisEntry) {

+			// _stateCtrl.selectThread((TsfTmTrace) obj);

+		}

+	}

+

+	public void zoomIn() {

+		_stateCtrl.zoomIn();

+	}

+

+	public void zoomOut() {

+		_stateCtrl.zoomOut();

+	}

+

+	private String getPreferenceString(String string) {

+		return getViewTypeStr() + "." + string;

+	}

+

+	public void addWidgetSelectionListner(ITmfTimeSelectionListener listener) {

+		widgetSelectionListners.add(listener);

+	}

+

+	public void removeWidgetSelectionListner(ITmfTimeSelectionListener listener) {

+		widgetSelectionListners.removeElement(listener);

+	}

+

+	public void addWidgetTimeScaleSelectionListner(

+			ITmfTimeScaleSelectionListener listener) {

+		widgetTimeScaleSelectionListners.add(listener);

+	}

+

+	public void removeWidgetTimeScaleSelectionListner(

+			ITmfTimeScaleSelectionListener listener) {

+		widgetTimeScaleSelectionListners.removeElement(listener);

+	}

+

+	public void setSelectedTime(long time, boolean ensureVisible, Object source) {

+		if (_acceptSetSelAPICalls == false || this == source) {

+			return;

+		}

+

+		setSelectedTimeInt(time, ensureVisible);

+	}

+

+	public void setSelectedEvent(ITimeEvent event, Object source) {

+		if (_acceptSetSelAPICalls == false || event == null || source == this) {

+			return;

+		}

+		ITmfTimeAnalysisEntry trace = event.getEntry();

+		if (trace != null) {

+			_stateCtrl.selectItem(trace, false);

+		}

+

+		setSelectedTimeInt(event.getTime(), true);

+	}

+

+	public void setSelectedTraceTime(ITmfTimeAnalysisEntry trace, long time, Object source) {

+		if (_acceptSetSelAPICalls == false || trace == null || source == this) {

+			return;

+		}

+

+		if (trace != null) {

+			_stateCtrl.selectItem(trace, false);

+		}

+

+		setSelectedTimeInt(time, true);

+	}

+

+	public void setSelectedTrace(ITmfTimeAnalysisEntry trace) {

+		if (trace == null) {

+			return;

+		}

+

+		_stateCtrl.selectItem(trace, false);

+	}

+

+	public void setSelectVisTimeWindow(long time0, long time1, Object source) {

+		if (_acceptSetSelAPICalls == false || source == this) {

+			return;

+		}

+

+		setStartFinishTimeExt(time0, time1);

+	}

+

+	public void setAcceptSelectionAPIcalls(boolean acceptCalls) {

+		_acceptSetSelAPICalls = acceptCalls;

+	}

+

+	private synchronized void notifySelectionListeners(

+			TmfTimeSelectionEvent.type rtype) {

+		// Any listeners out there ?

+		if (widgetSelectionListners.size() > 0) {

+			// Locate the event selected

+			ISelection selection = getSelection();

+			Object sel = null;

+			if (selection != null && !selection.isEmpty()) {

+				sel = ((IStructuredSelection) selection).getFirstElement();

+			}

+

+			if (sel != null) {

+				// Notify Selection Listeners

+				TmfTimeSelectionEvent event = new TmfTimeSelectionEvent(this,

+						rtype, sel, getSelectedTime());

+

+				for (Iterator<ITmfTimeSelectionListener> iter = widgetSelectionListners

+						.iterator(); iter.hasNext();) {

+					ITmfTimeSelectionListener listener = (ITmfTimeSelectionListener) iter

+							.next();

+					listener.tsfTmProcessSelEvent(event);

+				}

+			}

+		}

+	}

+

+	public void notifyStartFinishTimeSelectionListeners(long _time0, long _time1) {

+		if (widgetTimeScaleSelectionListners.size() > 0) {

+			// Notify Time Scale Selection Listeners

+			TmfTimeScaleSelectionEvent event = new TmfTimeScaleSelectionEvent(

+					this, _time0, _time1, getTimeSpace(), getSelectedTime());

+

+			for (Iterator<ITmfTimeScaleSelectionListener> iter = widgetTimeScaleSelectionListners

+					.iterator(); iter.hasNext();) {

+				ITmfTimeScaleSelectionListener listener = (ITmfTimeScaleSelectionListener) iter

+						.next();

+				listener.tsfTmProcessTimeScaleEvent(event);

+			}

+		}

+	}

+

+	public void setTimeCalendarFormat(boolean toAbsoluteCaltime) {

+		calendarTimeFormat = toAbsoluteCaltime;

+	}

+

+	public boolean isCalendarFormat() {

+		return calendarTimeFormat;

+	}

+

+	public int getBorderWidth() {

+		return timeScaleBoderWidth;

+	}

+

+	public void setBorderWidth(int borderWidth) {

+		if (borderWidth > -1) {

+			this.timeScaleBoderWidth = borderWidth;

+		}

+	}

+

+	public int getHeaderHeight() {

+		return timeScaleHeight;

+	}

+

+	public void setHeaderHeight(int headerHeight) {

+		if (headerHeight > -1) {

+			this.timeScaleHeight = headerHeight;

+		}

+	}

+

+	public int getItemHeight() {

+		if (_stateCtrl != null) {

+			return _stateCtrl.getItemHeight();

+		}

+		return 0;

+	}

+

+	public void setItemHeight(int rowHeight) {

+		if (_stateCtrl != null) {

+			_stateCtrl.setItemHeight(rowHeight);

+		}

+	}

+

+	public boolean isVisibleVerticalScroll() {

+		if (_stateCtrl != null) {

+			_stateCtrl.isVisibleVerticalScroll();

+		}

+		return false;

+	}

+

+	public void setVisibleVerticalScroll(boolean visibleVerticalScroll) {

+		if (_stateCtrl != null) {

+			_stateCtrl.setVisibleVerticalScroll(visibleVerticalScroll);

+		}

+	}

+

+	public void setNameWidthPref(int width) {

+		_nameWidthPref = width;

+		if (width == 0) {

+			_minNameWidth = 0;

+		}

+	}

+

+	public int getNameWidthPref(int width) {

+		return _nameWidthPref;

+	}

+

+	public void addFilterSelectionListner(ITmfTimeFilterSelectionListener listener) {

+		widgetFilterSelectionListeners.add(listener);

+	}

+

+	public void removeFilterSelectionListner(

+			ITmfTimeFilterSelectionListener listener) {

+		widgetFilterSelectionListeners.remove(listener);

+	}

+

+	private void filterOutNotification() {

+		TmfTimeFilterSelectionEvent event = new TmfTimeFilterSelectionEvent(this);

+		event.setFilteredOut(_stateCtrl.getFilteredOut());

+		for (ITmfTimeFilterSelectionListener listener : widgetFilterSelectionListeners) {

+			listener.tmfTaProcessFilterSelection(event);

+		}

+	}

+

+	/**

+	 * needed in case there's a need to associate a context menu

+	 * 

+	 * @return

+	 */

+	public Control getControl() {

+		return _stateCtrl;

+	}

+

+	/**

+	 * Get the selection provider

+	 * 

+	 * @return

+	 */

+	public ISelectionProvider getSelectionProvider() {

+		return _stateCtrl;

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see

+	 * org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.ITimeAnalysisViewer

+	 * #waitCursor(boolean)

+	 */

+	public void waitCursor(boolean waitInd) {

+		_stateCtrl.waitCursor(waitInd);

+	}

+}

diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeFilterSelectionEvent.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeFilterSelectionEvent.java
new file mode 100644
index 0000000..6cf92f8
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeFilterSelectionEvent.java
@@ -0,0 +1,39 @@
+/*******************************************************************************

+ * Copyright (c) 2009 Ericsson

+ * 

+ * All rights reserved. This program and the accompanying materials are

+ * made available under the terms of the Eclipse Public License v1.0 which

+ * accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *   Alvaro Sanchez-Leon - Initial API and implementation

+ *******************************************************************************/

+

+package org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis;

+

+import java.util.EventObject;

+import java.util.Vector;

+

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITmfTimeAnalysisEntry;

+

+public class TmfTimeFilterSelectionEvent extends EventObject {

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = -150960748016449093L;

+

+	Vector<ITmfTimeAnalysisEntry> filteredOut = null;

+

+	public TmfTimeFilterSelectionEvent(Object source) {

+		super(source);

+	}

+

+	public Vector<ITmfTimeAnalysisEntry> getFilteredOut() {

+		return filteredOut;

+	}

+

+	public void setFilteredOut(Vector<ITmfTimeAnalysisEntry> rfilteredOut) {

+		this.filteredOut = rfilteredOut;

+	}

+}

diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeScaleSelectionEvent.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeScaleSelectionEvent.java
new file mode 100644
index 0000000..27def26
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeScaleSelectionEvent.java
@@ -0,0 +1,79 @@
+/*******************************************************************************

+ * Copyright (c) 2009 Ericsson

+ * 

+ * All rights reserved. This program and the accompanying materials are

+ * made available under the terms of the Eclipse Public License v1.0 which

+ * accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *   Alvaro Sanchez-Leon - Initial API and implementation

+ *******************************************************************************/

+

+package org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis;

+

+import java.util.EventObject;

+

+public class TmfTimeScaleSelectionEvent extends EventObject {

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = -4177428788761351379L;

+

+	

+	long time0 = 0;

+	long time1 = 0;

+	long selectedTime = 0;

+	int width = 0;

+

+	/**

+	 * 

+	 * @param arg0

+	 *            source of event

+	 * @param time0

+	 *            time0 the start time

+	 * @param time1

+	 * @param width

+	 *            pixels used to draw the width of the time space

+	 * @param selTime

+	 *            carries the selected time if available otherwise is 0

+	 */

+	public TmfTimeScaleSelectionEvent(Object arg0, long time0, long time1,

+			int width, long selTime) {

+		super(arg0);

+		this.time0 = time0;

+		this.time1 = time1;

+		this.width = width;

+		this.selectedTime = selTime;

+	}

+	

+	/**

+	 * @return

+	 */

+	public long getTime0() {

+		return time0;

+	}

+	

+	/**

+	 * @return

+	 */

+	public long getTime1() {

+		return time1;

+	}

+

+	/**

+	 * @return

+	 */

+	public int getWidth() {

+		return width;

+	}

+

+	/**

+	 * @return

+	 */

+	public long getSelectedTime() {

+		return selectedTime;

+	}

+

+}

diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeSelectionEvent.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeSelectionEvent.java
new file mode 100644
index 0000000..8fd1264
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeSelectionEvent.java
@@ -0,0 +1,49 @@
+/*******************************************************************************

+ * Copyright (c) 2009 Ericsson

+ * 

+ * All rights reserved. This program and the accompanying materials are

+ * made available under the terms of the Eclipse Public License v1.0 which

+ * accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *   Alvaro Sanchez-Leon - Initial API and implementation

+ *******************************************************************************/

+

+package org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis;

+

+import java.util.EventObject;

+

+public class TmfTimeSelectionEvent extends EventObject {

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = 1L;

+	

+	public enum type {WIDGET_DEF_SEL, WIDGET_SEL}

+	type dType;

+	Object selection = null;

+	long selTime = 0;

+	int index = 0;

+	

+	public TmfTimeSelectionEvent(Object arg0, type rType, Object sel, long selectedTime) {

+		super(arg0);

+		dType = rType;

+		selection = sel;

+		selTime = selectedTime;

+	}

+	

+	public type getDType() {

+		return dType;

+	}

+	

+	public Object getSelection() {

+		return selection;

+	}

+	

+	public long getSelectedTime() {

+		return selTime;

+	}

+

+}

diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/dialogs/TmfTimeFilterDialog.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/dialogs/TmfTimeFilterDialog.java
new file mode 100644
index 0000000..f3bd9ee
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/dialogs/TmfTimeFilterDialog.java
@@ -0,0 +1,214 @@
+/*****************************************************************************

+ * Copyright (c) 2008 Intel Corporation.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Intel Corporation - Initial API and implementation

+ *

+ * $Id: ThreadFilterDialog.java,v 1.2 2008/03/05 17:31:07 ewchan Exp $ 

+ *****************************************************************************/

+

+package org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.dialogs;

+

+import org.eclipse.jface.dialogs.TitleAreaDialog;

+import org.eclipse.jface.viewers.CheckStateChangedEvent;

+import org.eclipse.jface.viewers.CheckboxTableViewer;

+import org.eclipse.jface.viewers.ICheckStateListener;

+import org.eclipse.jface.viewers.IStructuredContentProvider;

+import org.eclipse.jface.viewers.ITableLabelProvider;

+import org.eclipse.jface.viewers.LabelProvider;

+import org.eclipse.jface.viewers.Viewer;

+import org.eclipse.jface.viewers.ViewerComparator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.Messages;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITmfTimeAnalysisEntry;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.layout.GridData;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Control;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.swt.widgets.Table;

+import org.eclipse.swt.widgets.TableColumn;

+

+public class TmfTimeFilterDialog extends TitleAreaDialog {

+	private CheckboxTableViewer viewer;

+	private Object[] threads;

+	private boolean[] filter;

+	private ViewContentProvider viewContentProvider;

+	private TraceComparator viewTraceComparator;

+	private ViewLabelProvider viewViewLabelProvider;

+

+	public TmfTimeFilterDialog(Shell parentShell, Object[] threads,

+			boolean[] filter) {

+		super(parentShell);

+

+		this.threads = threads;

+		if (filter != null)

+			this.filter = (boolean[]) filter.clone();

+		

+		viewContentProvider = new ViewContentProvider();

+		viewTraceComparator = new TraceComparator();

+		viewViewLabelProvider = new ViewLabelProvider();

+	}

+

+	public static boolean getTraceFilter(Shell parentShell, Object[] threads,

+			boolean[] filter) {

+		TmfTimeFilterDialog dlg = new TmfTimeFilterDialog(parentShell, threads,

+				filter);

+		if (dlg.open() != Window.OK)

+			return false;

+

+		boolean f[] = dlg.getFilter();

+		if (java.util.Arrays.equals(f, filter))

+			return false;

+		for (int i = f.length - 1; i >= 0; i--)

+			filter[i] = f[i];

+

+		return true;

+	}

+

+	@Override

+	protected Control createDialogArea(Composite parent) {

+		Composite composite = (Composite) super.createDialogArea(parent);

+

+		viewer = CheckboxTableViewer.newCheckList(composite, SWT.BORDER

+				| SWT.V_SCROLL);

+

+		Table table = viewer.getTable();

+		table.setLayoutData(new GridData(GridData.FILL_BOTH));

+		table.setBackground(parent.getBackground());

+		createColumns(table);

+

+		//Assign providers to the viewer.

+		viewer.setContentProvider(viewContentProvider);

+		viewer.setComparator(viewTraceComparator);

+		viewer.setLabelProvider(viewViewLabelProvider);

+		

+		viewer.setInput(new Object());

+

+		viewer.addCheckStateListener(new ICheckStateListener() {

+			public void checkStateChanged(CheckStateChangedEvent event) {

+				Object o = event.getElement();

+				for (int i = threads.length - 1; i >= 0; i--) {

+					if (threads[i].equals(o))

+						filter[i] = event.getChecked();

+				}

+			}

+		});

+

+		if (filter != null) {

+			for (int i = 0; i < filter.length; i++)

+				viewer.setChecked(threads[i], filter[i]);

+		}

+

+		setMessage(Messages._TRACE_FILTER_DESC);

+		setTitle(Messages._TRACE_FILTER);

+		setDialogHelpAvailable(false);

+		setHelpAvailable(false);

+

+//		setTitleImage(org.eclipse.hyades.trace.internal.ui.PDPluginImages.DESC_IMG_UI_WZ_EDITPROFSET

+//				.createImage());

+

+		return composite;

+	}

+

+	private void createColumns(Table table) {

+		table.setHeaderVisible(true);

+

+		String headers[] = { "", Messages._TRACE_ID, Messages._TRACE_NAME };

+		int width[] = { 20, 80, 400 };

+

+		for (int i = 0; i < headers.length; i++) {

+			TableColumn tc = new TableColumn(table, SWT.NONE, i);

+			tc.setResizable(true);

+			tc.setText(headers[i]);

+			tc.setWidth(width[i]);

+		}

+	}

+

+	@Override

+	protected void configureShell(Shell shell) {

+		super.configureShell(shell);

+		shell.setText(Messages._EDIT_PROFILING_OPTIONS);

+	}

+

+	public boolean[] getFilter() {

+		return filter;

+	}

+

+	/**

+	 * @param viewContentProvider

+	 */

+	public void setViewContentProvider(ViewContentProvider viewContentProvider) {

+		this.viewContentProvider = viewContentProvider;

+	}

+

+	/**

+	 * @param viewThreadComparator

+	 */

+	public void setViewThreadComparator(TraceComparator viewThreadComparator) {

+		this.viewTraceComparator = viewThreadComparator;

+	}

+

+	/**

+	 * @param viewViewLabelProvider

+	 */

+	public void setViewViewLabelProvider(ViewLabelProvider viewViewLabelProvider) {

+		this.viewViewLabelProvider = viewViewLabelProvider;

+	}

+	

+	class ViewContentProvider implements IStructuredContentProvider {

+		public void dispose() {

+		}

+

+		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

+		}

+

+		public Object[] getElements(Object input) {

+			return threads;

+		}

+	}

+

+	class ViewLabelProvider extends LabelProvider implements

+			ITableLabelProvider {

+		@Override

+		public Image getImage(Object obj) {

+			return null;

+		}

+

+		public Image getColumnImage(Object element, int columnIndex) {

+			return null;

+		}

+

+		public String getColumnText(Object element, int columnIndex) {

+			// TODO: AA: Provide Label Provider externally

+			ITmfTimeAnalysisEntry t = (ITmfTimeAnalysisEntry) element;

+

+			if (columnIndex == 1)

+				return String.valueOf(t.getId());

+			else if (columnIndex == 2)

+				return t.getName();

+			else

+				return "";

+		}

+	}

+

+	class TraceComparator extends ViewerComparator {

+		@Override

+		public int compare(Viewer viewer, Object e1, Object e2) {

+			// TODO: AA: Provide comparator externally

+			int id1 = ((ITmfTimeAnalysisEntry) e1).getId();

+			int id2 = ((ITmfTimeAnalysisEntry) e2).getId();

+

+			if (id1 == id2)

+				return 0;

+

+			return (id1 < id2) ? -1 : 1;

+			// return 0;

+		}

+	}

+}

diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/dialogs/TmfTimeLegend.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/dialogs/TmfTimeLegend.java
new file mode 100644
index 0000000..5d0e54f
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/dialogs/TmfTimeLegend.java
@@ -0,0 +1,293 @@
+/*******************************************************************************

+ * Copyright (c) 2009 Ericsson

+ * 

+ * All rights reserved. This program and the accompanying materials are

+ * made available under the terms of the Eclipse Public License v1.0 which

+ * accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *   Alvaro Sanchez-Leon - Initial API and implementation

+ *******************************************************************************/

+

+package org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.dialogs;

+

+import org.eclipse.jface.dialogs.IDialogConstants;

+import org.eclipse.jface.dialogs.TitleAreaDialog;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.TmfTimeAnalysisProvider;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.Messages;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.TmfTimeAnalysisProvider.StateColor;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.widgets.TraceColorScheme;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.GC;

+import org.eclipse.swt.graphics.Rectangle;

+import org.eclipse.swt.layout.GridData;

+import org.eclipse.swt.layout.GridLayout;

+import org.eclipse.swt.widgets.Canvas;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Control;

+import org.eclipse.swt.widgets.Event;

+import org.eclipse.swt.widgets.Group;

+import org.eclipse.swt.widgets.Label;

+import org.eclipse.swt.widgets.Listener;

+import org.eclipse.swt.widgets.Shell;

+

+

+public class TmfTimeLegend extends TitleAreaDialog {

+

+	// public static final String stateNames[] = {

+	// UIMessages._Unknown, // "Unknown",

+	// UIMessages._Running, // "Running",

+	// UIMessages._Sleeping, // "Sleeping",

+	// UIMessages._Waiting, // "Waiting",

+	// UIMessages._Blocked, // "Blocked",

+	// UIMessages._Deadlocked, // "Deadlock",

+	// UIMessages._Stopped, // "Stopped",

+	// };

+

+	// public static final String interactionNames[] = {

+	// UIMessages._START_THREAD,

+	// UIMessages._JOIN_TERMINATE,

+	// UIMessages._WAIT_NOTIFY,

+	// UIMessages._INTERRUPT,

+	// UIMessages._RELEASE_ACQUIRE

+	// };

+

+	public static final int interactionColors[] = {

+			TraceColorScheme.TI_START_THREAD,

+			TraceColorScheme.TI_NOTIFY_JOINED, TraceColorScheme.TI_NOTIFY,

+			TraceColorScheme.TI_INTERRUPT, TraceColorScheme.TI_HANDOFF_LOCK };

+

+	protected TraceColorScheme colors;

+	private TmfTimeAnalysisProvider ifUtil;

+

+	public static void open(Shell parent, TmfTimeAnalysisProvider rifUtil) {

+		(new TmfTimeLegend(parent, rifUtil)).open();

+	}

+

+	public TmfTimeLegend(Shell parent, TmfTimeAnalysisProvider rifUtil) {

+		super(parent);

+		colors = new TraceColorScheme();

+		this.ifUtil = rifUtil;

+	}

+

+	@Override

+	protected Control createDialogArea(Composite parent) {

+		Composite dlgArea = (Composite) super.createDialogArea(parent);

+		Composite composite = new Composite(dlgArea, SWT.NONE);

+

+		GridLayout layout = new GridLayout();

+		layout.numColumns = 2;

+		composite.setLayout(layout);

+		GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);

+		composite.setLayoutData(gd);

+

+		createThreadStatesGroup(composite);

+		// createThreadInteractionsGroup(composite);

+

+		setMessage(Messages._LEGEND);

+		setTitle(Messages.TRACE_STATES_TITLE);

+		setDialogHelpAvailable(false);

+		setHelpAvailable(false);

+

+		// setTitleImage(org.eclipse.hyades.trace.internal.ui.PDPluginImages.DESC_IMG_UI_WZ_EDITPROFSET.createImage());

+

+		return composite;

+	}

+

+	private void createThreadStatesGroup(Composite composite) {

+		Group gs = new Group(composite, SWT.NONE);

+		gs.setText(Messages._TRACE_STATES);

+		GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);

+		gs.setLayoutData(gd);

+

+		GridLayout layout = new GridLayout();

+		layout.numColumns = 2;

+		layout.marginWidth = 20;

+		layout.marginBottom = 10;

+		gs.setLayout(layout);

+

+		for (int i = 0; i < 7; i++) {

+			Bar bar = new Bar(gs, i);

+			gd = new GridData();

+			gd.widthHint = 40;

+			gd.heightHint = 20;

+			gd.verticalIndent = 8;

+			bar.setLayoutData(gd);

+

+			Label name = new Label(gs, SWT.NONE);

+			//Get the color enum related to the index

+			StateColor stateColor = TraceColorScheme.getStateColors()[i];

+			//Get the given name, provided by the interface to the application

+			name.setText(ifUtil.getStateName(stateColor));

+			gd = new GridData();

+			gd.horizontalIndent = 10;

+			gd.verticalIndent = 8;

+			name.setLayoutData(gd);

+		}

+	}

+

+	// private void createThreadInteractionsGroup(Composite composite) {

+	// Group g = new Group (composite, SWT.NONE);

+	// g.setText(UIMessages._THREAD_INTERACTIONS);

+	// GridData gd = new GridData (SWT.FILL, SWT.FILL, true, true);

+	// g.setLayoutData(gd);

+	//

+	// GridLayout layout = new GridLayout();

+	// layout.numColumns = 2;

+	// layout.marginWidth = 20;

+	// layout.marginBottom = 10;

+	// g.setLayout(layout);

+	//		

+	// for (int i=0; i<5; i++) {

+	// Arrow a = new Arrow(g, interactionColors[i]);

+	// gd = new GridData();

+	// gd.widthHint = 10;

+	// gd.heightHint = 20;

+	// gd.verticalIndent = 8;

+	// a.setLayoutData(gd);

+	//		

+	// Label name = new Label (g, SWT.NONE);

+	// name.setText(interactionNames[i]);

+	// gd = new GridData ();

+	// gd.horizontalIndent = 4;

+	// gd.verticalIndent = 8;

+	// name.setLayoutData(gd);

+	// }

+	//

+	// Mark m = new Mark(g, TraceColorScheme.TI_WAIT_EXCEEDED);

+	// gd = new GridData();

+	// gd.widthHint = 10;

+	// gd.heightHint = 20;

+	// gd.verticalIndent = 8;

+	// m.setLayoutData(gd);

+	//		

+	// Label name = new Label (g, SWT.NONE);

+	// name.setText(UIMessages._WAIT_TIMEOUT_EXCEED);

+	// gd = new GridData ();

+	// gd.horizontalIndent = 4;

+	// gd.verticalIndent = 8;

+	// name.setLayoutData(gd);

+	// }

+

+	@Override

+	protected void configureShell(Shell shell) {

+		super.configureShell(shell);

+		shell.setText(Messages._WINDOW_TITLE);

+	}

+

+	@Override

+	protected void createButtonsForButtonBar(Composite parent) {

+		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,

+				true);

+	}

+

+	class Bar extends Canvas {

+		private int colorIdx;

+		private Color color;

+

+		public Bar(Composite parent, int colorIdx) {

+			super(parent, SWT.NONE);

+

+			this.colorIdx = colorIdx;

+			color = colors.getColor(colorIdx);

+			addListener(SWT.Paint, new Listener() {

+				public void handleEvent(Event event) {

+					draw(event.gc);

+				}

+			});

+		}

+

+		private void draw(GC gc) {

+			Rectangle r = getClientArea();

+			gc.setBackground(color);

+			gc.fillRectangle(r);

+

+			int my = r.height / 2;

+

+			if (TraceColorScheme.GOLD_STATE == colorIdx

+					|| TraceColorScheme.ORANGE_STATE == colorIdx) {

+				int s = gc.getLineStyle();

+				int w = gc.getLineWidth();

+				gc.setLineStyle(SWT.LINE_DOT);

+				gc.setLineWidth(2);

+				gc.drawLine(0, my, r.width - 1, my);

+				gc.setLineStyle(s);

+				gc.setLineWidth(w);

+			} else if (TraceColorScheme.RED_STATE == colorIdx

+					|| TraceColorScheme.GRAY_STATE == colorIdx) {

+				int w = gc.getLineWidth();

+				gc.setLineWidth(2);

+				gc.drawLine(0, my, r.width - 1, my);

+				gc.setLineWidth(w);

+			}

+

+			gc.setForeground(colors.getColor(TraceColorScheme.BLACK));

+			gc.drawRectangle(0, 0, r.width - 1, r.height - 1);

+		}

+	}

+

+	class Arrow extends Canvas {

+		public final static int HEIGHT = 12;

+		public final static int DX = 3;

+

+		private Color color;

+

+		public Arrow(Composite parent, int colorIdx) {

+			super(parent, SWT.NONE);

+

+			color = colors.getColor(colorIdx);

+			addListener(SWT.Paint, new Listener() {

+				public void handleEvent(Event event) {

+					draw(event.gc);

+				}

+			});

+		}

+

+		private void draw(GC gc) {

+			Rectangle r = getClientArea();

+			gc.setForeground(color);

+

+			int y0, y1;

+			if (r.height > HEIGHT) {

+				y0 = (r.height - HEIGHT) / 2;

+				y1 = y0 + HEIGHT;

+			} else {

+				y0 = 0;

+				y1 = r.height;

+			}

+

+			gc.drawLine(DX, y0, DX, y1);

+

+			gc.drawLine(0, y0 + 3, DX, y0);

+			gc.drawLine(2 * DX, y0 + 3, DX, y0);

+		}

+	}

+

+	class Mark extends Canvas {

+		public final static int DX = 3;

+

+		private Color color;

+

+		public Mark(Composite parent, int colorIdx) {

+			super(parent, SWT.NONE);

+

+			color = colors.getColor(colorIdx);

+			addListener(SWT.Paint, new Listener() {

+				public void handleEvent(Event event) {

+					draw(event.gc);

+				}

+			});

+		}

+

+		private void draw(GC gc) {

+			Rectangle r = getClientArea();

+			gc.setBackground(color);

+

+			int y = (r.height - DX) / 2;

+			int c[] = { 0, y, DX, y + DX, 2 * DX, y };

+			gc.fillPolygon(c);

+		}

+	}

+}

diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/messages.properties b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/messages.properties
new file mode 100644
index 0000000..3d3413f
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/messages.properties
@@ -0,0 +1,38 @@
+#*******************************************************************************

+# Copyright (c) 2009 Ericsson

+# 

+# All rights reserved. This program and the accompanying materials are

+# made available under the terms of the Eclipse Public License v1.0 which

+# accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v10.html

+# 

+#2Contributors:

+# IBM Corporation - initial API and implementation

+# Alvaro Sanchez-Leon - Stripped down for TMF

+# *******************************************************************************/

+

+TRACE_STATES_TITLE = States Transition Visualizer

+

+# labels

+_TRACE_ID = Process Id

+_TRACE_DATE = Date

+_TRACE_NAME = Process Name

+_TRACE_CLASS_NAME = Class Name

+_TRACE_GROUP_NAME = Group Name

+_TRACE_START_TIME = Start Time

+_TRACE_STOP_TIME = Stop Time

+_DURATION = Duration

+_TRACE_STATE = State

+_NUMBER_OF_TRACES = Number of processes

+_TRACE_FILTER = Process Filter

+_TRACE_FILTER_DESC = Define the filter set

+_Timescale = Time scale

+_UNDEFINED_GROUP = <undefined>

+_TRACE_GROUP_LABEL = Process Group [{0}]

+_EDIT_PROFILING_OPTIONS = Edit Profiling Options

+

+#Monitor statistics view messages

+MEM_ALLOCATION_DETAILS_FOR = Allocation details for

+_LEGEND = Legend

+_TRACE_STATES = Process states

+_WINDOW_TITLE = Process Visualizer's Legend

diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/model/ITimeEvent.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/model/ITimeEvent.java
new file mode 100644
index 0000000..56ca0db
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/model/ITimeEvent.java
@@ -0,0 +1,30 @@
+/*******************************************************************************

+ * Copyright (c) 2009 Ericsson

+ * 

+ * All rights reserved. This program and the accompanying materials are

+ * made available under the terms of the Eclipse Public License v1.0 which

+ * accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *   Alvaro Sanchez-Leon - Initial API and implementation

+ *******************************************************************************/

+

+package org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model;

+

+public interface ITimeEvent {

+

+	public ITmfTimeAnalysisEntry getEntry();

+

+	public long getTime();

+

+	/**

+	 * Returning <list> <li>-1: Considers duration to be from current event till

+	 * the next</li> <li>0: Duration is not relevant e.g. a Burst / no state

+	 * associated</li> <li>>0: Valid duration value specified</list>

+	 * 

+	 * @return

+	 */

+	public long getDuration();

+

+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/model/ITmfTimeAnalysisEntry.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/model/ITmfTimeAnalysisEntry.java
new file mode 100644
index 0000000..d26dcf8
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/model/ITmfTimeAnalysisEntry.java
@@ -0,0 +1,30 @@
+/*******************************************************************************

+ * Copyright (c) 2009 Ericsson

+ * 

+ * All rights reserved. This program and the accompanying materials are

+ * made available under the terms of the Eclipse Public License v1.0 which

+ * accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *   Alvaro Sanchez-Leon - Initial API and implementation

+ *******************************************************************************/

+

+package org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model;

+

+import java.util.Vector;

+

+public interface ITmfTimeAnalysisEntry {

+	

+    public String getGroupName();

+

+	public int getId();

+

+	public String getName();

+

+	public long getStartTime();

+

+	public long getStopTime();

+

+	public <T extends ITimeEvent>  Vector<T> getTraceEvents();

+}

diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/model/TimeEvent.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/model/TimeEvent.java
new file mode 100644
index 0000000..05681c9
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/model/TimeEvent.java
@@ -0,0 +1,32 @@
+/*******************************************************************************

+ * Copyright (c) 2009 Ericsson

+ * 

+ * All rights reserved. This program and the accompanying materials are

+ * made available under the terms of the Eclipse Public License v1.0 which

+ * accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *   Alvaro Sanchez-Leon - Initial API and implementation

+ *******************************************************************************/

+

+package org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model;

+

+public abstract class TimeEvent implements ITimeEvent {

+	/* (non-Javadoc)

+	 * @see org.eclipse.linuxtools.tlf.widgets.timeAnalysis.model.TmTaEventI#getTrace()

+	 */

+	public abstract ITmfTimeAnalysisEntry getEntry();

+	

+	/* (non-Javadoc)

+	 * @see org.eclipse.linuxtools.tlf.widgets.timeAnalysis.model.TmTaEventI#getTime()

+	 */

+	public abstract long getTime();

+	

+	/* (non-Javadoc)

+	 * @see org.eclipse.linuxtools.tlf.widgets.timeAnalysis.model.TmTaEventI#getDuration()

+	 */

+	public long getDuration() {

+		return -1;

+	}

+}

diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/ITimeDataProvider.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/ITimeDataProvider.java
new file mode 100644
index 0000000..e0cbcda
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/ITimeDataProvider.java
@@ -0,0 +1,49 @@
+/*****************************************************************************

+ * Copyright (c) 2007, Intel Corporation.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Intel Corporation - Initial API and implementation

+ *    Ruslan A. Scherbakov, Intel - Initial API and implementation

+ *    Alvaro Sanchex-Leon - Udpated for TMF

+ *

+ * $Id: ITimeDataProvider.java,v 1.2 2007/02/27 18:37:36 ewchan Exp $ 

+ *****************************************************************************/

+

+package org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.widgets;

+

+public interface ITimeDataProvider {

+

+	long getSelectedTime();

+

+	long getBeginTime();

+

+	long getEndTime();

+

+	long getMinTime();

+

+	long getMaxTime();

+

+	long getTime0();

+

+	long getTime1();

+

+	long getMinTimeInterval();

+

+	void setStartFinishTime(long time0, long time1);

+

+	void setSelectedTimeInt(long time, boolean ensureVisible);

+

+	void resetStartFinishTime();

+

+	int getNameSpace();

+

+	void setNameSpace(int width);

+

+	int getTimeSpace();

+	

+	boolean isCalendarFormat();

+}

diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/PlainSelection.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/PlainSelection.java
new file mode 100644
index 0000000..cd6c0fa
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/PlainSelection.java
@@ -0,0 +1,65 @@
+/*****************************************************************************

+ * Copyright (c) 2007 Intel Corporation.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Intel Corporation - Initial API and implementation

+ *    Ruslan A. Scherbakov, Intel - Initial API and implementation

+ *    Alvaro Sanchex-Leon - Udpated for TMF

+ *

+ * $Id: PlainSelection.java,v 1.1 2007/04/20 13:06:49 ewchan Exp $ 

+ *****************************************************************************/

+

+package org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.widgets;

+

+import java.util.ArrayList;

+import java.util.Iterator;

+import java.util.List;

+

+import org.eclipse.jface.viewers.IStructuredSelection;

+

+public class PlainSelection implements IStructuredSelection {

+

+	List<Object> list = new ArrayList<Object>();

+

+	public PlainSelection() {

+	}

+

+	public PlainSelection(Object sel) {

+		add(sel);

+	}

+

+	public void add(Object sel) {

+		if (null != sel && !list.contains(sel))

+			list.add(sel);

+	}

+

+	public Object getFirstElement() {

+		if (!list.isEmpty())

+			return list.get(0);

+		return null;

+	}

+

+	public Iterator<Object> iterator() {

+		return list.iterator();

+	}

+

+	public int size() {

+		return list.size();

+	}

+

+	public Object[] toArray() {

+		return list.toArray();

+	}

+

+	public List<Object> toList() {

+		return list;

+	}

+

+	public boolean isEmpty() {

+		return list.isEmpty();

+	}

+}

diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TimeScaleCtrl.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TimeScaleCtrl.java
new file mode 100644
index 0000000..3010673
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TimeScaleCtrl.java
@@ -0,0 +1,470 @@
+/*****************************************************************************

+ * Copyright (c) 2007, 2008 Intel Corporation and others.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Intel Corporation - Initial API and implementation

+ *    Ruslan A. Scherbakov, Intel - Initial API and implementation

+ *    Alvaro Sanchex-Leon - Udpated for TMF

+ *

+ * $Id: TimeScaleCtrl.java,v 1.5 2008/06/16 21:04:49 jkubasta Exp $ 

+ *****************************************************************************/

+

+package org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.widgets;

+

+import java.text.SimpleDateFormat;

+import java.util.Date;

+

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.Messages;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.widgets.Utils.Resolution;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.events.MouseEvent;

+import org.eclipse.swt.events.MouseListener;

+import org.eclipse.swt.events.MouseMoveListener;

+import org.eclipse.swt.events.PaintEvent;

+import org.eclipse.swt.graphics.GC;

+import org.eclipse.swt.graphics.Point;

+import org.eclipse.swt.graphics.Rectangle;

+import org.eclipse.swt.widgets.Composite;

+

+public class TimeScaleCtrl extends TraceCtrl implements MouseListener,

+		MouseMoveListener {

+

+	public TimeScaleCtrl(Composite parent, TraceColorScheme colors) {

+		super(parent, colors, SWT.NO_BACKGROUND | SWT.NO_FOCUS

+				| SWT.DOUBLE_BUFFERED);

+		addMouseListener(this);

+		addMouseMoveListener(this);

+	}

+

+	private ITimeDataProvider _timeProvider;

+	private int _dragState = 0;

+	private int _dragX0 = 0;

+	private int _dragX = 0;

+	private long _time0bak;

+	private long _time1bak;

+	private boolean _isInUpdate;

+	private Rectangle _rect0 = new Rectangle(0, 0, 0, 0);

+

+	public void setTimeProvider(ITimeDataProvider timeProvider) {

+		_timeProvider = timeProvider;

+	}

+

+	private double _timeDeltaD;

+	private long _timeDelta;

+

+	private void calcTimeDelta(int width, double K) {

+		long D[] = { 1, 2, 5, };

+		long pow = 1;

+		double powD = 1;

+		long td = pow;

+		double tdD = powD;

+		double dx = tdD * K;

+		int i = 0;

+		while (dx < width) {

+			td = D[i] * pow;

+			tdD = D[i] * powD;

+			dx = tdD * K;

+			i++;

+			if (i == 3) {

+				i = 0;

+				pow *= 10;

+				powD *= 10;

+			}

+		}

+		_timeDeltaD = tdD;

+		_timeDelta = td;

+//		Trace.debug("Width: " + width + " K: " + K + " Time Delta: "

+//				+ _timeDelta);

+	}

+

+	static private TimeDraw _tds[] = new TimeDraw[] { new TimeDrawSec(),

+			new TimeDrawMillisec(), new TimeDrawMicrosec(),

+			new TimeDrawNanosec(), new TimeDrawAbsSec(),

+			new TimeDrawAbsMillisec(), new TimeDrawAbsMicroSec(),

+			new TimeDrawAbsNanoSec() };

+

+	TimeDraw getTimeDraw(long timeDelta) {

+		TimeDraw timeDraw;

+		if (_timeProvider != null) {

+			if (_timeProvider.isCalendarFormat()) {

+				if (timeDelta >= 1000000000)

+					timeDraw = _tds[4];

+				else if (timeDelta >= 1000000)

+					timeDraw = _tds[5];

+				else if (timeDelta >= 1000)

+					timeDraw = _tds[6];

+				else

+					timeDraw = _tds[7];

+				return timeDraw;

+			}

+		}

+		if (timeDelta >= 1000000000)

+			timeDraw = _tds[0];

+		else if (timeDelta >= 1000000)

+			timeDraw = _tds[1];

+		else if (timeDelta >= 1000)

+			timeDraw = _tds[2];

+		else

+			timeDraw = _tds[3];

+		return timeDraw;

+	}

+

+	@Override

+	void paint(Rectangle rect, PaintEvent e) {

+

+		if (_isInUpdate || null == _timeProvider)

+			return;

+

+		GC gc = e.gc;

+		if (null == _timeProvider) {

+			gc.fillRectangle(rect);

+			return;

+		}

+

+		gc.setBackground(_colors.getColor(TraceColorScheme.TOOL_BACKGROUND));

+		gc.setForeground(_colors.getColor(TraceColorScheme.TOOL_FOREGROUND));

+		long time0 = _timeProvider.getTime0();

+		long time1 = _timeProvider.getTime1();

+		long selectedTime = _timeProvider.getSelectedTime();

+		int leftSpace = _timeProvider.getNameSpace();

+		int timeSpace = _timeProvider.getTimeSpace();

+

+		if (time1 <= time0 || timeSpace < 2) {

+			gc.fillRectangle(rect);

+			return;

+		}

+

+		int numDigits = calculateDigits(time0, time1);

+

+		Utils.init(_rect0, rect);

+		int labelWidth = gc.getCharWidth('0') * numDigits;

+		double K = 1;

+		if (rect.width - leftSpace > 0) {

+			K = (double) timeSpace / (time1 - time0);

+			calcTimeDelta(labelWidth, K);

+		}

+		

+		TimeDraw timeDraw = getTimeDraw(_timeDelta);

+

+		// draw top left area

+		_rect0.width = leftSpace;

+		gc.fillRectangle(_rect0);

+		_rect0.x += 4;

+		_rect0.width -= 4;

+		if (_rect0.width > 0) {

+// TODO: Check if we really need that piece of code...			

+//			if (false && rect.width - leftSpace > 0)

+//				Utils.drawText(gc, Messages._Timescale + ": "

+//						+ timeDraw.hint(), _rect0, true);

+//			else

+				Utils.drawText(gc, Messages._Timescale + ":", _rect0, true);

+		}

+		_rect0.x -= 4;

+		_rect0.width += 4;

+

+		// prepare and draw right rect of the timescale

+		_rect0.x += leftSpace;

+		_rect0.width = rect.width - leftSpace;

+

+		// draw bottom border and erase all other area

+		gc.drawLine(rect.x, rect.y + rect.height - 1, rect.x + rect.width - 1,

+				rect.y + rect.height - 1);

+		_rect0.height--;

+		gc.fillRectangle(_rect0);

+

+		if (_rect0.isEmpty())

+			return;

+

+		// draw selected time

+		int x = _rect0.x + (int) ((selectedTime - time0) * K);

+		if (x >= _rect0.x && x < _rect0.x + _rect0.width) {

+			gc.setForeground(_colors.getColor(TraceColorScheme.SELECTED_TIME));

+			gc.drawLine(x, _rect0.y + _rect0.height - 6, x, _rect0.y

+					+ _rect0.height);

+			gc

+					.setForeground(_colors

+							.getColor(TraceColorScheme.TOOL_FOREGROUND));

+		}

+

+		// draw time scale ticks

+		_rect0.y = rect.y;

+		_rect0.height = rect.height - 4;

+		_rect0.width = labelWidth;

+		long time = (long) (Math.floor(time0 / _timeDeltaD) * _timeDeltaD);

+		// long t = (long) (time * 1000000000);

+		long t = time;

+		int y = _rect0.y + _rect0.height;

+		while (true) {

+			x = rect.x + leftSpace + (int) ((time - time0) * K);

+			if (x >= rect.x + leftSpace + rect.width - _rect0.width) {

+				break;

+			}

+			if (x >= rect.x + leftSpace) {

+				gc.drawLine(x, y, x, y + 4);

+				_rect0.x = x;

+				if (x + _rect0.width <= rect.x + rect.width)

+					timeDraw.draw(gc, t, _rect0);

+			}

+			time += _timeDeltaD;

+			t += _timeDelta;

+		}

+	}

+

+	private int calculateDigits(long time0, long time1) {

+		int numDigits = 5;

+		long timeRange = time1 - time0;

+

+		if (_timeProvider.isCalendarFormat()) {

+			// Calculate the number of digits to represent the minutes provided

+			// 11:222

+			// HH:mm:ss

+			numDigits += 5;

+			if (timeRange < 10000) {

+				// HH:11:222:333:444__

+				numDigits += 10;

+			} else if (timeRange < 10000000) {

+				// HH:11:222:333__

+				numDigits += 6;

+			}

+		} else {

+			// Calculate the number of digits to represent the minutes provided

+			long min = (long) ((time1 * 1E-9) / 60); // to sec then to minutes

+			String strMinutes = String.valueOf(min);

+			// 11:222

+			if (strMinutes != null) {

+				numDigits += strMinutes.length();

+			} else {

+				numDigits += 2;

+			}

+			if (timeRange < 10000) {

+				// 11:222:333:444__

+				numDigits += 8;

+			} else if (timeRange < 10000000) {

+				// 11:222:333__

+				numDigits += 4;

+			}

+		}

+

+//		Trace.debug("timeRange: " + timeRange + " numDigits: " + numDigits);

+		return numDigits;

+	}

+

+	public void mouseDown(MouseEvent e) {

+		if (1 == e.button && null != _timeProvider) {

+			setCapture(true);

+			_dragState = 1;

+		}

+		// Window adjustment allowed using mouse button three.

+		_dragX = _dragX0 = e.x - _timeProvider.getNameSpace();

+		_time0bak = _timeProvider.getTime0();

+		_time1bak = _timeProvider.getTime1();

+	}

+

+	public void mouseUp(MouseEvent e) {

+		if (1 == _dragState) {

+			setCapture(false);

+			_dragState = 0;

+		}

+

+		if (3 == e.button && null != _timeProvider) {

+			if (_dragX0 < 0) {

+				return;

+			}

+			Point size = getSize();

+

+			int leftSpace = _timeProvider.getNameSpace();

+			int x = e.x - leftSpace;

+			if (x > 0 && size.x > leftSpace && _dragX != x) {

+				_dragX = x;

+				long time0 = _time0bak + ((_time1bak - _time0bak) * _dragX0)

+						/ (size.x - leftSpace);

+				long time1 = _time0bak + ((_time1bak - _time0bak) * _dragX)

+						/ (size.x - leftSpace);

+

+				_timeProvider.setStartFinishTime(time0, time1);

+			}

+		}

+	}

+

+	public void mouseMove(MouseEvent e) {

+		if (_dragX0 < 0) {

+			return;

+		}

+		Point size = getSize();

+		if (1 == _dragState && null != _timeProvider) {

+			int leftSpace = _timeProvider.getNameSpace();

+			int x = e.x - leftSpace;

+			if (x > 0 && size.x > leftSpace && _dragX != x) {

+				_dragX = x;

+				long time1 = _time0bak + ((_time1bak - _time0bak) * _dragX0)

+						/ _dragX;

+				_timeProvider.setStartFinishTime(_time0bak, time1);

+			}

+		}

+	}

+

+	public void mouseDoubleClick(MouseEvent e) {

+		if (null != _timeProvider) {

+			_timeProvider.resetStartFinishTime();

+		}

+	}

+}

+

+abstract class TimeDraw {

+	static String S = ":";

+	static String S0 = ":0";

+	static String S00 = ":00";

+	protected SimpleDateFormat stimeformat = new SimpleDateFormat("HH:mm:ss");

+	

+	static String pad(long n) {

+		String s = S;

+		if (n < 10)

+			s = S00;

+		else if (n < 100)

+			s = S0;

+		return s + n;

+	}

+

+	public abstract void draw(GC gc, long time, Rectangle rect);

+

+	public abstract String hint();

+}

+

+class TimeDrawSec extends TimeDraw {

+	static String _hint = "sec";

+

+	@Override

+	public void draw(GC gc, long time, Rectangle rect) {

+		time /= 1000000000;

+		Utils.drawText(gc, time + "", rect, true);

+	}

+

+	@Override

+	public String hint() {

+		return _hint;

+	}

+}

+

+class TimeDrawMillisec extends TimeDraw {

+	static String _hint = "s:ms";

+

+	@Override

+	public void draw(GC gc, long time, Rectangle rect) {

+		time /= 1000000;

+		long ms = time % 1000;

+		time /= 1000;

+		Utils.drawText(gc, time + pad(ms), rect, true);

+	}

+

+	@Override

+	public String hint() {

+		return _hint;

+	}

+}

+

+class TimeDrawMicrosec extends TimeDraw {

+	static String _hint = "s:ms:mcs";

+

+	@Override

+	public void draw(GC gc, long time, Rectangle rect) {

+		time /= 1000;

+		long mcs = time % 1000;

+		time /= 1000;

+		long ms = time % 1000;

+		time /= 1000;

+		Utils.drawText(gc, time + pad(ms) + pad(mcs), rect, true);

+	}

+

+	@Override

+	public String hint() {

+		return _hint;

+	}

+}

+

+class TimeDrawNanosec extends TimeDraw {

+	static String _hint = "s:ms:mcs:ns";

+

+	@Override

+	public void draw(GC gc, long time, Rectangle rect) {

+		long ns = time % 1000;

+		time /= 1000;

+		long mcs = time % 1000;

+		time /= 1000;

+		long ms = time % 1000;

+		time /= 1000;

+		Utils.drawText(gc, time + pad(ms) + pad(mcs) + pad(ns), rect, true);

+	}

+

+	@Override

+	public String hint() {

+		return _hint;

+	}

+}

+

+class TimeDrawAbsSec extends TimeDraw {

+	static String _hint = "HH:mm:ss";

+

+	@Override

+	public void draw(GC gc, long time, Rectangle rect) {

+		String stime = stimeformat.format(new Date((long) (time * 1E-6)));

+		Utils.drawText(gc, stime, rect, true);

+	}

+

+	@Override

+	public String hint() {

+		return _hint;

+	}

+}

+

+class TimeDrawAbsMillisec extends TimeDraw {

+	static String _hint = "HH:ss:ms";

+

+	@Override

+	public void draw(GC gc, long time, Rectangle rect) {

+		String stime = stimeformat.format(new Date((long) (time * 1E-6)));

+		String ns = Utils.formatNs(time, Resolution.MILLISEC);

+

+		Utils.drawText(gc, stime + " " + ns, rect, true);

+	}

+

+	@Override

+	public String hint() {

+		return _hint;

+	}

+}

+

+class TimeDrawAbsMicroSec extends TimeDraw {

+	static String _hint = "HH:ss:ms:mcs";

+

+	@Override

+	public void draw(GC gc, long time, Rectangle rect) {

+		String stime = stimeformat.format(new Date((long) (time * 1E-6)));

+		String micr = Utils.formatNs(time, Resolution.MICROSEC);

+		Utils.drawText(gc, stime + " " + micr, rect, true);

+	}

+

+	@Override

+	public String hint() {

+		return _hint;

+	}

+}

+

+class TimeDrawAbsNanoSec extends TimeDraw {

+	static String _hint = "HH:ss:ms:mcs:ns";

+

+	@Override

+	public void draw(GC gc, long time, Rectangle rect) {

+		String stime = stimeformat.format(new Date((long) (time * 1E-6)));

+		String ns = Utils.formatNs(time, Resolution.NANOSEC);

+		Utils.drawText(gc, stime + " " + ns, rect, true);

+	}

+

+	@Override

+	public String hint() {

+		return _hint;

+	}

+}

diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TmfTimeStatesCtrl.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TmfTimeStatesCtrl.java
new file mode 100644
index 0000000..57bdaf0
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TmfTimeStatesCtrl.java
@@ -0,0 +1,2183 @@
+/*****************************************************************************

+ * Copyright (c) 2007, 2008 Intel Corporation.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Intel Corporation - Initial API and implementation

+ *    Ruslan A. Scherbakov, Intel - Initial API and implementation

+ *    Alvaro Sanchex-Leon - Udpated for TMF

+ *

+ * $Id: ThreadStatesCtrl.java,v 1.15 2008/07/11 13:49:01 aalexeev Exp $ 

+ *****************************************************************************/

+

+package org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.widgets;

+

+import java.util.ArrayList;

+import java.util.HashMap;

+import java.util.Iterator;

+import java.util.List;

+import java.util.Map;

+import java.util.Vector;

+

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.ISelectionChangedListener;

+import org.eclipse.jface.viewers.ISelectionProvider;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.Messages;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.TmfTimeAnalysisProvider;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITimeEvent;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITmfTimeAnalysisEntry;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.TimeEvent;

+import org.eclipse.osgi.util.NLS;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.events.ControlEvent;

+import org.eclipse.swt.events.ControlListener;

+import org.eclipse.swt.events.FocusEvent;

+import org.eclipse.swt.events.FocusListener;

+import org.eclipse.swt.events.KeyEvent;

+import org.eclipse.swt.events.KeyListener;

+import org.eclipse.swt.events.MouseEvent;

+import org.eclipse.swt.events.MouseListener;

+import org.eclipse.swt.events.MouseMoveListener;

+import org.eclipse.swt.events.MouseTrackListener;

+import org.eclipse.swt.events.MouseWheelListener;

+import org.eclipse.swt.events.PaintEvent;

+import org.eclipse.swt.events.SelectionEvent;

+import org.eclipse.swt.events.SelectionListener;

+import org.eclipse.swt.events.TraverseEvent;

+import org.eclipse.swt.events.TraverseListener;

+import org.eclipse.swt.graphics.Cursor;

+import org.eclipse.swt.graphics.GC;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.graphics.Point;

+import org.eclipse.swt.graphics.Rectangle;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.ScrollBar;

+

+/**

+ * @author alvaro

+ * 

+ */

+public class TmfTimeStatesCtrl extends TraceCtrl implements FocusListener,

+		KeyListener, MouseMoveListener, MouseListener, MouseWheelListener,

+		ControlListener, SelectionListener, MouseTrackListener,

+		TraverseListener, ISelectionProvider {

+

+	public static final boolean DEFAULT_DRAW_THREAD_JOIN = true;

+	public static final boolean DEFAULT_DRAW_THREAD_WAIT = true;

+	public static final boolean DEFAULT_DRAW_THREAD_RELEASE = true;

+

+	private final double zoomCoeff = 1.5;

+

+	private ITimeDataProvider _timeProvider;

+	private boolean _isInFocus = false;

+	private boolean _isDragCursor3 = false;

+	private boolean _isWaitCursor = true;

+	private boolean _mouseHover = false;

+	private int _itemHeightDefault = 18;

+	private int _itemHeight = _itemHeightDefault;

+	private int _topItem = 0;

+	private int _dragState = 0;

+	private int _hitIdx = 0;

+	private int _dragX0 = 0;

+	private int _dragX = 0;

+	private int _idealNameWidth = 0;

+	// TODO: 050409

+	private double _timeStep = 0.001;

+	// private double _timeStep = 10000000;

+	private long _time0bak;

+	private long _time1bak;

+	private TmfTimeAnalysisProvider utilImpl = null;

+	private ItemData _data = null;

+	private List<SelectionListener> _selectionListeners;

+	private List<ISelectionChangedListener> _selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

+	private Rectangle _rect0 = new Rectangle(0, 0, 0, 0);

+	private Rectangle _rect1 = new Rectangle(0, 0, 0, 0);

+	private Cursor _dragCursor3;

+	private Cursor _WaitCursor;

+	private boolean drawTracesInteraction = false;

+	private boolean drawTraceJoins = DEFAULT_DRAW_THREAD_JOIN;

+	private boolean drawTraceWaits = DEFAULT_DRAW_THREAD_WAIT;

+	private boolean drawTraceReleases = DEFAULT_DRAW_THREAD_RELEASE;

+

+	// Vertical formatting formatting for the state control view

+	private boolean _visibleVerticalScroll = true;

+	private int _borderWidth = 0;

+	private int _headerHeight = 0;

+

+	public TmfTimeStatesCtrl(Composite parent, TraceColorScheme colors,

+			TmfTimeAnalysisProvider rutilImp) {

+

+		super(parent, colors, SWT.NO_BACKGROUND | SWT.V_SCROLL | SWT.H_SCROLL

+				| SWT.DOUBLE_BUFFERED);

+

+		this.utilImpl = rutilImp;

+		_data = new ItemData(utilImpl);

+

+		addFocusListener(this);

+		addMouseListener(this);

+		addMouseMoveListener(this);

+		addMouseTrackListener(this);

+		addMouseWheelListener(this);

+		addTraverseListener(this);

+		addKeyListener(this);

+		addControlListener(this);

+		ScrollBar scrollVer = getVerticalBar();

+		ScrollBar scrollHor = getHorizontalBar();

+		if (scrollVer != null) {

+			scrollVer.addSelectionListener(this);

+			scrollVer.setVisible(_visibleVerticalScroll);

+		}

+

+		if (scrollHor != null) {

+			scrollHor.addSelectionListener(this);

+		}

+

+		_dragCursor3 = new Cursor(super.getDisplay(), SWT.CURSOR_SIZEWE);

+		_WaitCursor = new Cursor(super.getDisplay(), SWT.CURSOR_WAIT);

+	}

+

+	@Override

+	public void dispose() {

+		super.dispose();

+		_dragCursor3.dispose();

+		_WaitCursor.dispose();

+	}

+

+	public void setTimeProvider(ITimeDataProvider timeProvider) {

+		_timeProvider = timeProvider;

+		adjustScrolls();

+		redraw();

+	}

+

+	public void addSelectionListener(SelectionListener listener) {

+		if (listener == null)

+			SWT.error(SWT.ERROR_NULL_ARGUMENT);

+		if (null == _selectionListeners)

+			_selectionListeners = new ArrayList<SelectionListener>();

+		_selectionListeners.add(listener);

+	}

+

+	public void removeSelectionListener(SelectionListener listener) {

+		if (null != _selectionListeners)

+			_selectionListeners.remove(listener);

+	}

+

+	public void fireSelectionChanged() {

+		if (null != _selectionListeners) {

+			Iterator<SelectionListener> it = _selectionListeners.iterator();

+			while (it.hasNext()) {

+				SelectionListener listener = it.next();

+				listener.widgetSelected(null);

+			}

+		}

+	}

+

+	public void fireDefaultSelection() {

+		if (null != _selectionListeners) {

+			Iterator<SelectionListener> it = _selectionListeners.iterator();

+			while (it.hasNext()) {

+				SelectionListener listener = it.next();

+				listener.widgetDefaultSelected(null);

+			}

+		}

+	}

+

+	public Object[] getTraces() {

+		return _data.getTraces();

+	}

+

+	public boolean[] getTraceFilter() {

+		return _data.getTraceFilter();

+	}

+

+	public void refreshData() {

+		_data.refreshData();

+		adjustScrolls();

+		redraw();

+	}

+

+	public void refreshData(Object traces[]) {

+		_data.refreshData(traces);

+		adjustScrolls();

+		redraw();

+	}

+

+	public void refreshPartial(ITmfTimeAnalysisEntry parent, TimeEvent item) {

+		_data.refreshPartial(parent, item);

+		adjustScrolls();

+		redraw();

+	}

+

+	public void adjustScrolls() {

+		if (null == _timeProvider) {

+			getVerticalBar().setValues(0, 1, 1, 1, 1, 1);

+			getHorizontalBar().setValues(0, 1, 1, 1, 1, 1);

+			return;

+		}

+		int page = countPerPage();

+		if (_topItem + page > _data._items.length)

+			_topItem = _data._items.length - page;

+		if (_topItem < 0)

+			_topItem = 0;

+		getVerticalBar().setValues(_topItem, 0, _data._items.length, page, 1,

+				page);

+		long time0 = _timeProvider.getTime0();

+		long time1 = _timeProvider.getTime1();

+		long timeMin = _timeProvider.getMinTime();

+		long timeMax = _timeProvider.getMaxTime();

+

+		// int timePage = (int) ((time1 - time0) / _timeStep);

+		// int timePos = (int) (time0 / _timeStep);

+		// int minimum = (int) (timeMin / _timeStep);

+		// int maximum = (int) (timeMax / _timeStep);

+

+		long delta = timeMax - timeMin;

+

+		int timePos = 0;

+		int timePage = 0;

+		// Trace.debug("time0 - time1 = " + (time0 - timeMin));

+		if (delta != 0) {

+			timePage = (int) (((double) (time1 - time0) / _timeStep) / delta);

+			timePos = (int) (((double) (time0 - timeMin) / _timeStep) / delta);

+		}

+

+		int minimum = 0;

+		int maximum = 1000;

+		// Trace.debug("time0:" + time0 + " time1:" + time1 + " timeStep:"

+		// + _timeStep + " delta:" + delta);

+		// Trace.debug("selection:" + timePos + " min:" + minimum + " maximum:"

+		// + maximum + " Page:" + timePage);

+		getHorizontalBar().setValues(timePos, minimum, maximum, timePage, 1,

+				timePage);

+	}

+

+	boolean ensureVisibleItem(int idx, boolean redraw) {

+		boolean changed = false;

+		if (idx < 0) {

+			for (idx = 0; idx < _data._items.length; idx++) {

+				if (((Item) _data._items[idx])._selected)

+					break;

+			}

+		}

+		if (idx >= _data._items.length)

+			return changed;

+		if (idx < _topItem) {

+			_topItem = idx;

+			getVerticalBar().setSelection(_topItem);

+			if (redraw)

+				redraw();

+			changed = true;

+		} else {

+			int page = countPerPage();

+			if (idx >= _topItem + page) {

+				_topItem = idx - page + 1;

+				getVerticalBar().setSelection(_topItem);

+				if (redraw)

+					redraw();

+				changed = true;

+			}

+		}

+		return changed;

+	}

+

+	public ISelection getSelection() {

+		PlainSelection sel = new PlainSelection();

+		ITmfTimeAnalysisEntry trace = getSelectedTrace();

+		if (null != trace && null != _timeProvider) {

+			long selectedTime = _timeProvider.getSelectedTime();

+			ITimeEvent event = Utils.findEvent(trace, selectedTime, 0);

+			if (event != null)

+				sel.add(event);

+			else

+				sel.add(trace);

+		}

+		return sel;

+	}

+

+	public ISelection getSelectionTrace() {

+		PlainSelection sel = new PlainSelection();

+		ITmfTimeAnalysisEntry trace = getSelectedTrace();

+		if (null != trace) {

+			sel.add(trace);

+		}

+		return sel;

+	}

+

+	public void selectTrace(int n) {

+		if (n != 1 && n != -1)

+			return;

+		boolean changed = false;

+		int lastSelection = -1;

+		for (int i = 0; i < _data._items.length; i++) {

+			Item item = (Item) _data._items[i];

+			if (item._selected) {

+				lastSelection = i;

+				if (1 == n && i < _data._items.length - 1) {

+					item._selected = false;

+					if (item._hasChildren)

+						_data.expandItem(i, true);

+					item = (Item) _data._items[i + 1];

+					if (item._hasChildren) {

+						_data.expandItem(i + 1, true);

+						item = (Item) _data._items[i + 2];

+					}

+					item._selected = true;

+					changed = true;

+				} else if (-1 == n && i > 0) {

+					i--;

+					Item prevItem = (Item) _data._items[i];

+					if (prevItem._hasChildren) {

+						if (prevItem._expanded) {

+							if (i > 0) {

+								i--;

+								prevItem = (Item) _data._items[i];

+							}

+						}

+						if (!prevItem._expanded) {

+							int added = _data.expandItem(i, true);

+							prevItem = (Item) _data._items[i + added];

+							item._selected = false;

+							prevItem._selected = true;

+							changed = true;

+						}

+					} else {

+						item._selected = false;

+						prevItem._selected = true;

+						changed = true;

+					}

+				}

+				break;

+			}

+		}

+		if (lastSelection < 0 && _data._items.length > 0) {

+			Item item = (Item) _data._items[0];

+			if (item._hasChildren) {

+				_data.expandItem(0, true);

+				item = (Item) _data._items[1];

+				item._selected = true;

+				changed = true;

+			} else {

+				item._selected = true;

+				changed = true;

+			}

+		}

+		if (changed) {

+			ensureVisibleItem(-1, false);

+			redraw();

+			fireSelectionChanged();

+		}

+	}

+

+	public void selectEvent(int n) {

+		if (null == _timeProvider)

+			return;

+		ITmfTimeAnalysisEntry trace = getSelectedTrace();

+		if (trace == _timeProvider)

+			return;

+		long selectedTime = _timeProvider.getSelectedTime();

+		long endTime = _timeProvider.getEndTime();

+		ITimeEvent nextEvent;

+		if (-1 == n && selectedTime >= endTime)

+			nextEvent = Utils.findEvent(trace, selectedTime, 0);

+		else

+			nextEvent = Utils.findEvent(trace, selectedTime, n);

+		if (null == nextEvent && -1 == n)

+			nextEvent = Utils.getFirstEvent(trace);

+		if (null != nextEvent) {

+			_timeProvider.setSelectedTimeInt(nextEvent.getTime(), true);

+			fireSelectionChanged();

+		} else if (1 == n) {

+			_timeProvider.setSelectedTimeInt(endTime, true);

+			fireSelectionChanged();

+		}

+	}

+

+	public void selectNextEvent() {

+		selectEvent(1);

+	}

+

+	public void selectPrevEvent() {

+		selectEvent(-1);

+	}

+

+	public void selectNextTrace() {

+		selectTrace(1);

+	}

+

+	public void selectPrevTrace() {

+		selectTrace(-1);

+	}

+

+	public void zoomIn() {

+		long _time0 = _timeProvider.getTime0();

+		long _time1 = _timeProvider.getTime1();

+		long _range = _time1 - _time0;

+		long selTime = _timeProvider.getSelectedTime();

+		if (selTime <= _time0 || selTime >= _time1) {

+			selTime = (_time0 + _time1) / 2;

+		}

+		long time0 = selTime - (long) ((selTime - _time0) / zoomCoeff);

+		long time1 = selTime + (long) ((_time1 - selTime) / zoomCoeff);

+

+		long inaccuracy = (_timeProvider.getMaxTime() - _timeProvider

+				.getMinTime())

+				- (time1 - time0);

+

+		// Trace.debug("selTime:" + selTime + " time0:" + time0 + " time1:"

+		// + time1 + " inaccuracy:" + inaccuracy);

+

+		if (inaccuracy > 0 && inaccuracy < 100) {

+			_timeProvider.setStartFinishTime(_timeProvider.getMinTime(),

+					_timeProvider.getMaxTime());

+			return;

+		}

+

+		long m = _timeProvider.getMinTimeInterval();

+		if ((time1 - time0) < m) {

+			time0 = selTime - (long) ((selTime - _time0) * m / _range);

+			time1 = time0 + m;

+		}

+

+		_timeProvider.setStartFinishTime(time0, time1);

+	}

+

+	public void zoomOut() {

+		long _time0 = _timeProvider.getTime0();

+		long _time1 = _timeProvider.getTime1();

+		long selTime = _timeProvider.getSelectedTime();

+		if (selTime <= _time0 || selTime >= _time1) {

+			selTime = (_time0 + _time1) / 2;

+		}

+		long time0 = (long) (selTime - (selTime - _time0) * zoomCoeff);

+		long time1 = (long) (selTime + (_time1 - selTime) * zoomCoeff);

+

+		long inaccuracy = (_timeProvider.getMaxTime() - _timeProvider

+				.getMinTime())

+				- (time1 - time0);

+		if (inaccuracy > 0 && inaccuracy < 100) {

+			_timeProvider.setStartFinishTime(_timeProvider.getMinTime(),

+					_timeProvider.getMaxTime());

+			return;

+		}

+

+		_timeProvider.setStartFinishTime(time0, time1);

+	}

+

+	public void groupTraces(boolean on) {

+		_data.groupTraces(on);

+		adjustScrolls();

+		redraw();

+	}

+

+	public void toggleTraceInteractionDrawing() {

+		drawTracesInteraction = !drawTracesInteraction;

+		redraw();

+	}

+

+	public void setTraceJoinDrawing(boolean on) {

+		drawTraceJoins = on;

+		drawTracesInteraction = true;

+		redraw();

+	}

+

+	public void setTraceWaitDrawing(boolean on) {

+		drawTraceWaits = on;

+		drawTracesInteraction = true;

+		redraw();

+	}

+

+	public void setTraceReleaseDrawing(boolean on) {

+		drawTraceReleases = on;

+		drawTracesInteraction = true;

+		redraw();

+	}

+

+	public boolean getTracesInteractionDrawing() {

+		return drawTracesInteraction;

+	}

+

+	public boolean getTraceJoinDrawing() {

+		return drawTraceJoins;

+	}

+

+	public boolean getTraceWaitDrawing() {

+		return drawTraceWaits;

+	}

+

+	public boolean getTraceReleaseDrawing() {

+		return drawTraceReleases;

+	}

+

+	public ITmfTimeAnalysisEntry getSelectedTrace() {

+		ITmfTimeAnalysisEntry trace = null;

+		int idx = getSelectedIndex();

+		if (idx >= 0 && _data._items[idx] instanceof TraceItem)

+			trace = ((TraceItem) _data._items[idx])._trace;

+		return trace;

+	}

+

+	public int getSelectedIndex() {

+		int idx = -1;

+		for (int i = 0; i < _data._items.length; i++) {

+			Item item = (Item) _data._items[i];

+			if (item._selected) {

+				idx = i;

+				break;

+			}

+		}

+		return idx;

+	}

+

+	boolean toggle(int idx) {

+		boolean toggled = false;

+		if (idx >= 0 && idx < _data._items.length) {

+			Item item = (Item) _data._items[idx];

+			if (item._hasChildren) {

+				item._expanded = !item._expanded;

+				_data.updateItems();

+				adjustScrolls();

+				redraw();

+				toggled = true;

+			}

+		}

+		return toggled;

+	}

+

+	int hitTest(int x, int y) {

+		if (x < 0 || y < 0)

+			return -1;

+		int hit = -1;

+		int idx = y / _itemHeight;

+		idx += _topItem;

+		if (idx < _data._items.length)

+			hit = idx;

+		return hit;

+	}

+

+	int hitSplitTest(int x, int y) {

+		if (x < 0 || y < 0 || null == _timeProvider)

+			return -1;

+		int w = 4;

+		int hit = -1;

+		int nameWidth = _timeProvider.getNameSpace();

+		if (x > nameWidth - w && x < nameWidth + w)

+			hit = 1;

+		return hit;

+	}

+

+	public Item getItem(Point pt) {

+		int idx = hitTest(pt.x, pt.y);

+		return idx >= 0 ? (Item) _data._items[idx] : null;

+	}

+

+	long hitTimeTest(int x, int y) {

+		if (null == _timeProvider)

+			return -1;

+		long hitTime = -1;

+		Point size = getCtrlSize();

+		long time0 = _timeProvider.getTime0();

+		long time1 = _timeProvider.getTime1();

+		int nameWidth = _timeProvider.getNameSpace();

+		x -= nameWidth;

+		if (x >= 0 && size.x >= nameWidth) {

+			hitTime = time0 + ((time1 - time0) * x) / (size.x - nameWidth);

+		}

+		return hitTime;

+	}

+

+	void selectItem(int idx, boolean addSelection) {

+		if (addSelection) {

+			if (idx >= 0 && idx < _data._items.length) {

+				Item item = (Item) _data._items[idx];

+				item._selected = true;

+			}

+		} else {

+			for (int i = 0; i < _data._items.length; i++) {

+				Item item = (Item) _data._items[i];

+				item._selected = i == idx;

+			}

+		}

+		boolean changed = ensureVisibleItem(idx, true);

+		if (!changed)

+			redraw();

+	}

+

+	public void selectItem(ITmfTimeAnalysisEntry trace, boolean addSelection) {

+		Integer idx = _data.findTraceItemIndex(trace);

+		selectItem(idx, addSelection);

+	}

+

+	public int countPerPage() {

+		int height = getCtrlSize().y;

+		int count = 0;

+		if (height > 0)

+			count = height / _itemHeight;

+		return count;

+	}

+

+	public int getTopIndex() {

+		int idx = -1;

+		if (_data._items.length > 0)

+			idx = 0;

+		return idx;

+	}

+

+	public int getBottomIndex() {

+		int idx = _data._items.length - 1;

+		return idx;

+	}

+

+	Point getCtrlSize() {

+		Point size = getSize();

+		size.x -= getVerticalBar().getSize().x;

+		size.y -= getHorizontalBar().getSize().y;

+		return size;

+	}

+

+	void getNameRect(Rectangle rect, Rectangle bound, int idx, int nameWidth) {

+		idx -= _topItem;

+		rect.x = bound.x;

+		rect.y = bound.y + idx * _itemHeight;

+		rect.width = nameWidth;

+		rect.height = _itemHeight;

+	}

+

+	void getStatesRect(Rectangle rect, Rectangle bound, int idx, int nameWidth) {

+		idx -= _topItem;

+		rect.x = bound.x + nameWidth;

+		rect.y = bound.y + idx * _itemHeight;

+		rect.width = bound.width - rect.x;

+		rect.height = _itemHeight;

+	}

+

+	// private int getTraceNumber(int tid) {

+	// int num = -1;

+	//

+	// Object[] items = _data._items;

+	// for (int i = _topItem; i < items.length; i++) {

+	// Item item = (Item) items[i];

+	// if ((item instanceof TraceItem)) {

+	// TsfTmTrace trace = ((TraceItem) item)._trace;

+	// if (trace != null && trace.getId() == tid) {

+	// num = i;

+	// break;

+	// }

+	// }

+	// }

+	//

+	// return num;

+	// }

+

+	// private void drawArrow(GC gc, int x0, int y0, int x1, int y1, Color c) {

+	// gc.setForeground(c);

+	// gc.drawLine(x0, y0, x1, y1);

+	//

+	// if (y1 > y0) {

+	// gc.drawLine(x1 - 3, y1 - 3, x1, y1);

+	// gc.drawLine(x1 + 3, y1 - 3, x1, y1);

+	// } else {

+	// gc.drawLine(x1 - 3, y1 + 3, x1, y1);

+	// gc.drawLine(x1 + 3, y1 + 3, x1, y1);

+	// }

+	// }

+

+	// TODO: CC: used in the removed functionality to draw thread interactions.

+	// private void drawTraceThreadEvent(Rectangle bound, TsfTmEvent e,

+	// TsfTmTrace trace, int nItem, int color, GC gc) {

+	// if (trace == null)

+	// return;

+	//

+	// int tid = trace.getId();

+	// if (tid < 0 || getTraceNumber(tid) == -1)

+	// return;

+	//

+	// int nameWidth = _timeProvider.getNameSpace();

+	//

+	// double time0 = _timeProvider.getTime0();

+	// double time1 = _timeProvider.getTime1();

+	// if (time0 == time1)

+	// return;

+	//

+	// int xr = bound.x + nameWidth;

+	// double K = (double) (bound.width - xr) / (time1 - time0);

+	//

+	// int x0 = xr + (int) ((e.getTime() - time0) * K);

+	// if (x0 < xr)

+	// x0 = xr;

+	//

+	// int x1 = xr + (int) ((trace.getStartTime() - time0) * K);

+	// if (x1 < xr)

+	// return;

+	//

+	// int y0 = bound.y + (nItem - _topItem) * _itemHeight + 3

+	// + (_itemHeight - 6) / 2;

+	// int y1 = bound.y + (getTraceNumber(tid) - _topItem) * _itemHeight + 3

+	// + (_itemHeight - 6) / 2;

+	//

+	// drawArrow(gc, x0, y0, x1, y1, _colors.getColor(color));

+	// }

+

+	public void drawTraceEvent(Rectangle bound, ITimeEvent e, int nItem,

+			int color, GC gc) {

+		int nameWidth = _timeProvider.getNameSpace();

+

+		long time0 = _timeProvider.getTime0();

+		long time1 = _timeProvider.getTime1();

+		if (time0 == time1)

+			return;

+

+		int xr = bound.x + nameWidth;

+		double K = (double) (bound.width - xr) / (time1 - time0);

+

+		int x0 = xr + (int) ((e.getTime() - time0) * K);

+		if (x0 < xr)

+			return;

+

+		int y0 = bound.y + (nItem - _topItem) * _itemHeight + 3;

+

+		gc.setBackground(_colors.getColor(color));

+		int c[] = { x0 - 3, y0 - 3, x0, y0, x0 + 3, y0 - 3 };

+		gc.fillPolygon(c);

+	}

+

+	// TODO: CC:

+	// private void drawExecEvent(Rectangle bound, TsfTmTraceExecEventImpl e,

+	// int nitem, int color, GC gc) {

+	// List runnings = e.getRunningEvents();

+	// if (runnings == null)

+	// return;

+	//

+	// int nameWidth = _timeProvider.getNameSpace();

+	//

+	// double time0 = _timeProvider.getTime0();

+	// double time1 = _timeProvider.getTime1();

+	// if (time0 == time1)

+	// return;

+	//

+	// int xr = bound.x + nameWidth;

+	// double K = (double) (bound.width - xr) / (time1 - time0);

+	//

+	// int x0 = xr + (int) ((e.getTime() - time0) * K);

+	// if (x0 < xr)

+	// x0 = xr;

+	//

+	// Iterator it = runnings.iterator();

+	// while (it.hasNext()) {

+	// TsfTmTraceRunningEventImpl re = (TsfTmTraceRunningEventImpl) it

+	// .next();

+	// int tid = re.getThread().getId();

+	// if (tid < 0 || getThreadNumber(tid) == -1)

+	// continue;

+	//

+	// int x1 = xr + (int) ((re.getTime() - time0) * K);

+	// if (x1 < xr)

+	// continue;

+	//

+	// int y0 = bound.y + (nitem - _topItem) * _itemHeight + 3

+	// + (_itemHeight - 6) / 2;

+	// int y1 = bound.y + (getThreadNumber(tid) - _topItem) * _itemHeight

+	// + 3 + (_itemHeight - 6) / 2;

+	//

+	// drawArrow(gc, x0, y0, x1, y1, _colors.getColor(color));

+	// }

+	// }

+

+	public void drawTraceInteractions(Rectangle bound, GC gc) {

+		// int nameWidth = _timeProvider.getNameSpace();

+		// Object[] items = _data._items;

+		//

+		// double time0 = _timeProvider.getTime0();

+		// double time1 = _timeProvider.getTime1();

+		//

+		// if (time0 == time1)

+		// return;

+		//

+		// int xr = bound.x + nameWidth;

+		// double K = (double) (bound.width - xr) / (time1 - time0);

+

+		// for (int i = 0; i < items.length; i++) {

+		// Item item = (Item) items[i];

+		// if (!(item instanceof TraceItem))

+		// continue;

+		//

+		// TsfTmTrace trace = ((TraceItem) item)._trace;

+		// if (trace == null)

+		// continue;

+		//

+		// List<TsfTmEvent> list = trace.getTraceEvents();

+		// Iterator<TsfTmEvent> it = list.iterator();

+		// while (it.hasNext()) {

+		// TsfTmEvent te = (TsfTmEvent) it.next();

+		// TODO: CC: Thread Interactions,

+		// This needs to be accessed externally via a specific

+		// implementation.

+		// if (te instanceof TsfTmTraceStartThreadEventImpl) {

+		// TsfTmTrace child = ((TsfTmTraceStartThreadEventImpl) te)

+		// .getStartedThread();

+		// drawThreadThreadEvent(bound, te, child, i,

+		// TraceColorScheme.TI_START_THREAD, gc);

+		// } else if (te instanceof TsfTmTraceHandoffLockEventImpl) {

+		// if (drawThreadReleases)

+		// drawExecEvent(bound, (TsfTmTraceExecEventImpl) te, i,

+		// TraceColorScheme.TI_HANDOFF_LOCK, gc);

+		// } else if (te instanceof TsfTmTraceNotifyAllEventImpl) {

+		// if (drawThreadWaits)

+		// drawExecEvent(bound, (TsfTmTraceExecEventImpl) te, i,

+		// TraceColorScheme.TI_NOTIFY_ALL, gc);

+		// } else if (te instanceof TsfTmTraceNotifyEventImpl) {

+		// if (drawThreadWaits)

+		// drawExecEvent(bound, (TsfTmTraceExecEventImpl) te, i,

+		// TraceColorScheme.TI_NOTIFY, gc);

+		// } else if (te instanceof

+		// TsfTmTraceDeadAndNotifyJoinedEventImpl) {

+		// if (drawThreadJoins)

+		// drawExecEvent(bound, (TsfTmTraceExecEventImpl) te, i,

+		// TraceColorScheme.TI_NOTIFY_JOINED, gc);

+		// } else if (te instanceof TsfTmTraceInterruptThreadEventImpl)

+		// {

+		// if (drawThreadWaits)

+		// drawExecEvent(bound, (TsfTmTraceExecEventImpl) te, i,

+		// TraceColorScheme.TI_INTERRUPT, gc);

+		// } else if (te instanceof

+		// TsfTmTraceWaitTimeoutExceedEventImpl) {

+		// drawThreadEvent(bound, te, i,

+		// TraceColorScheme.TI_WAIT_EXCEEDED, gc);

+		// }

+		// }

+		// }

+	}

+

+	@Override

+	void paint(Rectangle bound, PaintEvent e) {

+		// If no user preference defined for item height

+		if (_itemHeight == _itemHeightDefault) {

+			_itemHeight = getFontHeight() + 6;

+		}

+

+		if (bound.width < 2 || bound.height < 2 || null == _timeProvider)

+			return;

+

+		_idealNameWidth = 0;

+		GC gc = e.gc;

+		int nameWidth = _timeProvider.getNameSpace();

+		long time0 = _timeProvider.getTime0();

+		long time1 = _timeProvider.getTime1();

+		long endTime = _timeProvider.getEndTime();

+		long selectedTime = _timeProvider.getSelectedTime();

+		// draw trace states

+		Object[] items = _data._items;

+		for (int i = _topItem; i < items.length; i++) {

+			Item item = (Item) items[i];

+			

+			// *** FIXME ***

+			// Everything in this file should be redone with comments.

+			// How the hell am I suppose to understand anything in here?

+			

+			// *** HACK ***

+			// The drawing of the rectangle can be wrong on some system.

+			// _itemHeight can be slightly smaller than the height space for the table (bound.height / items.length)

+			// This would cause the rectangle to slowly "slide" and to no longer get aligned with their text.

+			//

+			// ...There is probably a reason WHY the height space is different in the first hand 

+			//	but this code is a total mess, does not have any comments and is globally impossible to read/understand the way it is right now.

+			//

+			// For now, this little fix should do it... I hope.

+			int newItemHeight = (bound.height / items.length);

+			if ( (items.length > 12) && ( newItemHeight > _itemHeight ) ) {

+				_itemHeight = newItemHeight;

+			}

+			

+			getNameRect(_rect0, bound, i, nameWidth);

+			if (_rect0.y >= bound.y + bound.height)

+				break;

+

+			if (item instanceof GroupItem) {

+				getStatesRect(_rect1, bound, i, nameWidth);

+				_rect0.width += _rect1.width;

+				drawName(item, _rect0, gc);

+			} else {

+				drawName(item, _rect0, gc);

+			}

+			getStatesRect(_rect0, bound, i, nameWidth);

+			drawItemDataDurations(item, _rect0, time0, time1, endTime,

+					selectedTime, gc);

+		}

+

+		if (drawTracesInteraction)

+			drawTraceInteractions(bound, e.gc);

+

+		// fill free canvas area

+		_rect0.x = bound.x;

+		_rect0.y += _rect0.height;

+		_rect0.width = bound.width;

+		_rect0.height = bound.y + bound.height - _rect0.y;

+		if (_rect0.y < bound.y + bound.height) {

+			gc.setBackground(_colors.getColor(TraceColorScheme.BACKGROUND));

+			gc.fillRectangle(_rect0);

+		}

+		// draw drag line, no line if name space is 0.

+		if (3 == _dragState) {

+			gc.setForeground(_colors.getColor(TraceColorScheme.BLACK));

+			gc.drawLine(bound.x + nameWidth, bound.y, bound.x + nameWidth,

+					bound.y + bound.height - 1);

+		} else if (0 == _dragState && _mouseHover

+				&& _timeProvider.getNameSpace() > 0) {

+			gc.setForeground(_colors.getColor(TraceColorScheme.RED));

+			gc.drawLine(bound.x + nameWidth, bound.y, bound.x + nameWidth,

+					bound.y + bound.height - 1);

+		}

+	}

+

+	void drawName(Item item, Rectangle rect, GC gc) {

+		// No name to be drawn

+		if (_timeProvider.getNameSpace() == 0)

+			return;

+		boolean group = item instanceof GroupItem;

+

+		int elemHeight = rect.height / 2;

+		int elemWidth = elemHeight;

+		String name = item._name;

+		if (group) {

+			gc.setBackground(_colors

+					.getBkColorGroup(item._selected, _isInFocus));

+			gc.fillRectangle(rect);

+			if (item._selected && _isInFocus) {

+				gc.setForeground(_colors.getBkColor(item._selected, _isInFocus,

+						false));

+				gc.drawRectangle(rect.x, rect.y, rect.width - 2,

+						rect.height - 2);

+			}

+			gc.setForeground(_colors.getBkColor(false, false, false));

+			gc.drawLine(rect.x, rect.y + rect.height - 1, rect.width - 1,

+					rect.y + rect.height - 1);

+			gc.setForeground(_colors.getFgColorGroup(false, false));

+			gc.setBackground(_colors.getBkColor(false, false, false));

+			Utils.init(_rect1, rect);

+			_rect1.x += MARGIN;

+			_rect1.y += (rect.height - elemHeight) / 2;

+			_rect1.width = elemWidth;

+			_rect1.height = elemHeight;

+			// Get the icon rectangle in the group items

+			gc.fillRectangle(_rect1);

+			gc.drawRectangle(_rect1.x, _rect1.y, _rect1.width - 1,

+					_rect1.height - 1);

+			int p = _rect1.y + _rect1.height / 2;

+			gc.drawLine(_rect1.x + 2, p, _rect1.x + _rect1.width - 3, p);

+			if (!item._expanded) {

+				p = _rect1.x + _rect1.width / 2;

+				gc.drawLine(p, _rect1.y + 2, p, _rect1.y + _rect1.height - 3);

+			}

+			gc.setForeground(_colors

+					.getFgColorGroup(item._selected, _isInFocus));

+			elemWidth += MARGIN;

+		} else {

+			gc.setBackground(_colors.getBkColor(item._selected, _isInFocus,

+					true));

+			gc.setForeground(_colors.getFgColor(item._selected, _isInFocus));

+			gc.fillRectangle(rect);

+			Utils.init(_rect1, rect);

+			_rect1.x += MARGIN;

+			// draw icon

+			ITmfTimeAnalysisEntry trace = ((TraceItem) item)._trace;

+			Image img = utilImpl.getItemImage(trace);

+			if (null != img) {

+				_rect1.y += (rect.height - img.getImageData().height) / 2;

+				gc.drawImage(img, _rect1.x, _rect1.y);

+			}

+			elemWidth = SMALL_ICON_SIZE;

+			// cut long string with "..."

+			Point size = gc.stringExtent(name);

+			if (_idealNameWidth < size.x)

+				_idealNameWidth = size.x;

+			int width = rect.width - MARGIN - MARGIN - elemWidth;

+			int cuts = 0;

+			while (size.x > width && name.length() > 1) {

+				cuts++;

+				name = name.substring(0, name.length() - 1);

+				size = gc.stringExtent(name + "...");

+			}

+			if (cuts > 0)

+				name += "...";

+			elemWidth += MARGIN;

+		}

+		Utils.init(_rect1, rect);

+		int leftMargin = MARGIN + elemWidth;

+		_rect1.x += leftMargin;

+		_rect1.width -= leftMargin;

+		int textWidth = 0;

+		// draw text

+		if (_rect1.width > 0) {

+			_rect1.y += 2;

+			textWidth = Utils.drawText(gc, name, _rect1, true) + 8;

+			_rect1.y -= 2;

+		}

+		// draw middle line

+		if (_rect1.width > 0 && !group) {

+			Utils.init(_rect1, rect);

+			_rect1.x += leftMargin + textWidth;

+			_rect1.width -= textWidth;

+			gc.setForeground(_colors.getColor(TraceColorScheme.MID_LINE));

+			int midy = _rect1.y + _rect1.height / 2;

+			gc.drawLine(_rect1.x, midy, _rect1.x + _rect1.width, midy);

+		}

+		// gc.drawLine(_rect1.x + _rect1.width - 1, _rect1.y, _rect1.x +

+		// _rect1.width - 1, _rect1.y + _rect1.height);

+	}

+

+	void drawItemData(Item item, Rectangle rect, long time0, long time1,

+			long endTime, long selectedTime, GC gc) {

+		if (rect.isEmpty())

+			return;

+		if (time1 <= time0) {

+			gc.setBackground(_colors.getBkColor(false, false, false));

+			gc.fillRectangle(rect);

+			return;

+		}

+

+		Utils.init(_rect1, rect);

+		boolean selected = item._selected;

+		double K = (double) rect.width / (time1 - time0);

+		boolean group = item instanceof GroupItem;

+

+		if (group) {

+			// gc.setBackground(_colors.getBkColorGroup(selected, _isInFocus));

+			// gc.fillRectangle(rect);

+		} else if (item instanceof TraceItem) {

+			ITmfTimeAnalysisEntry trace = ((TraceItem) item)._trace;

+

+			int x0 = rect.x;

+			List<TimeEvent> list = trace.getTraceEvents();

+			// Iterator it = list.iterator();

+			int count = list.size();

+			ITimeEvent lastEvent = null;

+			if (count > 0) {

+				ITimeEvent currEvent = list.get(0);

+				ITimeEvent nextEvent = null;

+				long currEventTime = currEvent.getTime();

+				long nextEventTime = currEventTime;

+				x0 = rect.x + (int) ((currEventTime - time0) * K);

+				int xEnd = rect.x + (int) ((time1 - time0) * K);

+				int x1 = -1;

+				int idx = 1;

+

+				// reduce rect

+				_rect1.y += 3;

+				_rect1.height -= 6;

+				fillSpace(rect, gc, selected, _rect1.x, x0, xEnd);

+

+				// draw event states

+				while (x0 <= xEnd && null != currEvent) {

+					boolean stopped = false;// currEvent instanceof

+					// TsfTmTraceDeadEvent;

+					if (idx < count) {

+						nextEvent = list.get(idx);

+						nextEventTime = nextEvent.getTime();

+						idx++;

+					} else if (stopped) {

+						nextEvent = null;

+						nextEventTime = time1;

+					} else {

+						nextEvent = null;

+						nextEventTime = endTime;

+					}

+					x1 = rect.x + (int) ((nextEventTime - time0) * K);

+					if (x1 >= rect.x) {

+						_rect1.x = x0 >= rect.x ? x0 : rect.x;

+						_rect1.width = (x1 <= xEnd ? x1 : xEnd) - _rect1.x;

+						boolean timeSelected = currEventTime <= selectedTime

+								&& selectedTime < nextEventTime;

+						// Trace.debug("Drawing rectangle: " + _rect1.x + ","

+						// + _rect1.y + "," + _rect1.height + ", "

+						// + _rect1.width + "-->"

+						// + ((int) _rect1.x + (int) _rect1.width));

+						utilImpl.drawState(_colors, currEvent, _rect1, gc,

+								selected, false, timeSelected);

+					}

+					lastEvent = currEvent;

+					currEvent = nextEvent;

+					currEventTime = nextEventTime;

+					x0 = x1;

+				}

+			}

+

+			// fill space after last event

+			int xEnd = rect.x + rect.width;

+			if (x0 < xEnd) {

+				_rect1.x = x0 >= rect.x ? x0 : rect.x;

+				_rect1.width = xEnd - _rect1.x;

+				gc.setBackground(_colors

+						.getBkColor(selected, _isInFocus, false));

+				gc.fillRectangle(_rect1);

+				// draw middle line

+				gc.setForeground(_colors.getColor(utilImpl

+						.getEventColorVal(lastEvent)));

+				int midy = _rect1.y + _rect1.height / 2;

+				int lw = gc.getLineWidth();

+				gc.setLineWidth(2);

+				gc.drawLine(_rect1.x, midy, _rect1.x + _rect1.width, midy);

+				gc.setLineWidth(lw);

+			}

+

+			// draw focus ares

+			Utils.init(_rect1, rect);

+			gc.setForeground(_colors.getBkColor(selected, _isInFocus, false));

+			int y = _rect1.y;

+			gc.drawLine(_rect1.x, y, _rect1.x + _rect1.width, y);

+			y++;

+			gc.drawLine(_rect1.x, y, _rect1.x + _rect1.width, y);

+			y++;

+			gc.drawLine(_rect1.x, y, _rect1.x + _rect1.width, y);

+			y = _rect1.y + _rect1.height - 1;

+			gc.drawLine(_rect1.x, y, _rect1.x + _rect1.width, y);

+			y--;

+			gc.drawLine(_rect1.x, y, _rect1.x + _rect1.width, y);

+			y--;

+			gc.drawLine(_rect1.x, y, _rect1.x + _rect1.width, y);

+		}

+

+		// draw selected time

+		int x = rect.x + (int) ((selectedTime - time0) * K);

+		if (x >= rect.x && x < rect.x + rect.width) {

+			gc.setForeground(_colors.getColor(TraceColorScheme.SELECTED_TIME));

+			if (group)

+				gc.drawLine(x, rect.y + rect.height - 1, x, rect.y

+						+ rect.height);

+			else

+				gc.drawLine(x, rect.y, x, rect.y + rect.height);

+		}

+	}

+

+	/**

+	 * Represent the event in series of bursts rather than sequence of states

+	 * 

+	 * @param item

+	 * @param rect

+	 *            - The container rectangle to be colored to different states

+	 * @param time0

+	 *            - Base time of all events

+	 * @param time1

+	 *            - End time of all events

+	 * @param endTime

+	 * @param selectedTime

+	 * @param gc

+	 */

+	void drawItemDataBurst(Item item, Rectangle rect, long time0, long time1,

+			long endTime, long selectedTime, GC gc) {

+		if (rect.isEmpty())

+			return;

+		if (time1 <= time0) {

+			gc.setBackground(_colors.getBkColor(false, false, false));

+			gc.fillRectangle(rect);

+			return;

+		}

+

+		// Initialize _rect1 to same values as enclosing rectangle rect

+		Utils.init(_rect1, rect);

+		boolean selected = item._selected;

+		// K pixels per second

+		double K = (double) rect.width / (time1 - time0);

+		// Trace.debug("Value of K: " + K + " width:" + rect.width + " time0: "

+		// + time0 + " time1:" + time1 + " endTime: " + endTime);

+

+		boolean group = item instanceof GroupItem;

+

+		if (group) {

+			// gc.setBackground(_colors.getBkColorGroup(selected, _isInFocus));

+			// gc.fillRectangle(rect);

+			// if (Trace.isDEBUG()) {

+			// Trace.debug("Group");

+			// }

+		} else if (item instanceof TraceItem) {

+			ITmfTimeAnalysisEntry trace = ((TraceItem) item)._trace;

+

+			double x0 = rect.x;

+			List<TimeEvent> list = trace.getTraceEvents();

+			// Iterator it = list.iterator();

+			int count = list.size();

+			ITimeEvent lastEvent = null;

+			// Trace.debug("count is: " + count);

+			if (count > 0) {

+				ITimeEvent currEvent = list.get(0);

+				ITimeEvent nextEvent = null;

+				long currEventTime = currEvent.getTime();

+				long nextEventTime = currEventTime;

+				// x0 - Points to the beginning of the event being drawn

+				double step = (double) ((currEventTime - time0) * K);

+				x0 = rect.x + step;

+				// xEnd - Points to the end of the events rectangle

+				double xEnd = rect.x + (double) ((time1 - time0) * K);

+				double x1 = -1;

+				int idx = 1;

+				double xNext = 0;

+

+				// Drawing rectangle is smaller than reserved space

+				_rect1.y += 3;

+				_rect1.height -= 6;

+

+				// Clean up to empty line to draw on top

+				fillSpace(rect, gc, selected, _rect1.x, xEnd, xEnd);

+				// draw event states

+				while (x0 <= xEnd && null != currEvent) {

+					boolean stopped = false;// currEvent instanceof

+					// TsfTmTraceDeadEvent;

+					if (idx < count) {

+						nextEvent = list.get(idx);

+						nextEventTime = nextEvent.getTime();

+						idx++;

+					} else if (stopped) {

+						nextEvent = null;

+						nextEventTime = time1;

+					} else {

+						nextEvent = null;

+						nextEventTime = endTime;

+						// Trace

+						// .debug("nexEventTime is endTime: "

+						// + nextEventTime);

+					}

+

+					// Draw it as a burst, one unit of width.

+					x1 = x0 + (int) 2;

+					if (x1 >= rect.x && x0 <= xEnd) {

+						// Fill with space until x0

+						_rect1.x = (int) (x0 >= rect.x ? x0 : rect.x);

+						_rect1.width = (int) ((x1 <= xEnd ? x1 : xEnd) - _rect1.x);

+						boolean timeSelected = currEventTime <= selectedTime

+								&& selectedTime < nextEventTime;

+						utilImpl.drawState(_colors, currEvent, _rect1, gc,

+								selected, false, timeSelected);

+						// Trace.debug("Drawing rectangle: " + _rect1.x + ","

+						// + _rect1.y + "," + _rect1.height + ", "

+						// + _rect1.width + "-->"

+						// + ((int) _rect1.x + (int) _rect1.width));

+						// Advance rectangle to next start position and Fill

+						// with space until next event

+						_rect1.x += _rect1.width;

+						x0 = x1;

+						xNext = rect.x + (double) ((nextEventTime - time0) * K);

+					}

+					// Fill space till next event

+					fillSpace(rect, gc, selected, x0, xNext, xEnd);

+

+					lastEvent = currEvent;

+					currEvent = nextEvent;

+					currEventTime = nextEventTime;

+					// Move x0 to the beginning of next event

+					x0 = rect.x + (double) ((nextEventTime - time0) * K);

+					// Trace.debug("rect.x: " + rect.x + " + " +

+					// "(nextEvenTime: "

+					// + nextEventTime + "- time0: " + time0 + ") * K: "

+					// + K + " = " + x0);

+				}

+			}

+

+			// fill space after last event

+			int xEnd = rect.x + rect.width;

+			if (x0 < xEnd) {

+				// Trace.debug("Space after last event, x0: " + x0 + ", xEnd: "

+				// + xEnd);

+				_rect1.x = (int) (x0 >= rect.x ? x0 : rect.x);

+				_rect1.width = xEnd - _rect1.x;

+				gc.setBackground(_colors

+						.getBkColor(selected, _isInFocus, false));

+				gc.fillRectangle(_rect1);

+				// draw middle line

+				gc.setForeground(_colors.getColor(utilImpl

+						.getEventColorVal(lastEvent)));

+				int midy = _rect1.y + _rect1.height / 2;

+				int lw = gc.getLineWidth();

+				gc.setLineWidth(2);

+				gc.drawLine(_rect1.x, midy, _rect1.x + _rect1.width, midy);

+				gc.setLineWidth(lw);

+			}

+

+			// draw focus area

+			Utils.init(_rect1, rect);

+			gc.setForeground(_colors.getBkColor(selected, _isInFocus, false));

+			int y = _rect1.y;

+			gc.drawLine(_rect1.x, y, _rect1.x + _rect1.width, y);

+			y++;

+			gc.drawLine(_rect1.x, y, _rect1.x + _rect1.width, y);

+			y++;

+			gc.drawLine(_rect1.x, y, _rect1.x + _rect1.width, y);

+			y = _rect1.y + _rect1.height - 1;

+			gc.drawLine(_rect1.x, y, _rect1.x + _rect1.width, y);

+			y--;

+			gc.drawLine(_rect1.x, y, _rect1.x + _rect1.width, y);

+			y--;

+			gc.drawLine(_rect1.x, y, _rect1.x + _rect1.width, y);

+		}

+

+		// draw selected time

+		int x = rect.x + (int) ((selectedTime - time0) * K);

+		if (x >= rect.x && x < rect.x + rect.width) {

+			gc.setForeground(_colors.getColor(TraceColorScheme.SELECTED_TIME));

+			if (group)

+				gc.drawLine(x, rect.y + rect.height - 1, x, rect.y

+						+ rect.height);

+			else

+				gc.drawLine(x, rect.y, x, rect.y + rect.height);

+		}

+	}

+

+	/**

+	 * Represent the series of events with specified durations

+	 * 

+	 * @param item

+	 * @param rect

+	 *            - The container rectangle to be colored to different states

+	 * @param time0

+	 *            - Base time of all events - start of visible window

+	 * @param time1

+	 *            - End time of visible events - end time of visible window

+	 * @param endTime

+	 *            - End time of all events - may not be visible in selected

+	 *            visible window

+	 * @param selectedTime

+	 * @param gc

+	 */

+	void drawItemDataDurations(Item item, Rectangle rect, long time0,

+			long time1, long endTime, long selectedTime, GC gc) {

+		if (rect.isEmpty())

+			return;

+		if (time1 <= time0) {

+			gc.setBackground(_colors.getBkColor(false, false, false));

+			gc.fillRectangle(rect);

+			return;

+		}

+

+		// Initialize _rect1 to same values as enclosing rectangle rect

+		Utils.init(_rect1, rect);

+		boolean selected = item._selected;

+		// K pixels per second

+		double K = (double) rect.width / (time1 - time0);

+		// Trace.debug("Value of K: " + K + " width:" + rect.width + " time0: "

+		// + time0 + " time1:" + time1 + " endTime: " + endTime);

+

+		boolean group = item instanceof GroupItem;

+

+		if (group) {

+			// gc.setBackground(_colors.getBkColorGroup(selected, _isInFocus));

+			// gc.fillRectangle(rect);

+			// if (Trace.isDEBUG()) {

+			// Trace.debug("\n\t\t\tGroup: " + ((GroupItem) item)._name);

+			// }

+		} else if (item instanceof TraceItem) {

+			ITmfTimeAnalysisEntry trace = ((TraceItem) item)._trace;

+

+			double x0 = rect.x;

+			List<TimeEvent> list = trace.getTraceEvents();

+			// Iterator it = list.iterator();

+			int count = list.size();

+			ITimeEvent lastEvent = null;

+			// if (Trace.isDEBUG()) {

+			// Trace.debug("\n\t\t\tTrace: " + trace.getName()

+			// + utilImpl.getTraceClassName(trace));

+			// }

+			// Trace.debug("count is: " + count);

+			if (count > 0) {

+				ITimeEvent currEvent = list.get(0);

+				ITimeEvent nextEvent = null;

+				long currEventTime = currEvent.getTime();

+				long currEventDuration = currEvent.getDuration();

+				// initial value

+				long nextEventTime = currEventTime;

+				// x0 - Points to the beginning of the event being drawn

+				double step = (double) ((currEventTime - time0) * K);

+				x0 = rect.x + step;

+				// xEnd - Points to the end of the events rectangle

+				double xEnd = rect.x + (double) ((time1 - time0) * K);

+				double x1 = -1;

+				int idx = 1;

+				double xNext = 0;

+

+				// Drawing rectangle is smaller than reserved space

+				_rect1.y += 3;

+				_rect1.height -= 6;

+

+				// Clean up to empty line to draw on top

+				fillSpace(rect, gc, selected, _rect1.x, xEnd, xEnd);

+				// draw event states

+				while (x0 <= xEnd && null != currEvent) {

+					boolean stopped = false;// currEvent instanceof

+					// refresh current event duration as the loop moves

+					currEventDuration = currEvent.getDuration();

+					// TsfTmTraceDeadEvent;

+					if (idx < count) {

+						nextEvent = list.get(idx);

+						nextEventTime = nextEvent.getTime();

+						idx++;

+					} else if (stopped) {

+						nextEvent = null;

+						nextEventTime = time1;

+					} else {

+						nextEvent = null;

+						nextEventTime = endTime;

+						// Trace

+						// .debug("nexEventTime is endTime: "

+						// + nextEventTime);

+					}

+

+					// Calculate position to next event

+					xNext = rect.x + (double) ((nextEventTime - time0) * K);

+

+					// Calculate end position of current event

+					if (currEventDuration < 0) {

+						x1 = rect.x + (double) ((nextEventTime - time0) * K);

+					} else {

+						x1 = currEventDuration == 0 ? (x0 + 2)

+								: (x0 + (double) ((currEventDuration) * K));

+					}

+

+					// If event end position x1 further away than start position

+					// of

+					// next event, cut width till next event

+					// Trace.debug("Next Event Pos: " + xNext

+					// + " End Of Current at: " + x1 + " Event Duration: "

+					// + currEventDuration);

+					x1 = x1 > xNext ? xNext : x1;

+					// if event end boundary is within time range

+					if (x1 >= rect.x && x0 <= xEnd) {

+						// Fill with space until x0

+						x0 = (double) (x0 >= rect.x ? x0 : rect.x);

+						_rect1.width = (int) ((x1 <= xEnd ? x1 : xEnd) - x0);

+						_rect1.x = (int) x0;

+						boolean timeSelected = currEventTime <= selectedTime

+								&& selectedTime < nextEventTime;

+						utilImpl.drawState(_colors, currEvent, _rect1, gc,

+								selected, false, timeSelected);

+						// Trace.debug("Drawing rectangle: " + _rect1.x + ","

+						// + _rect1.y + "," + _rect1.height + ", "

+						// + _rect1.width + "-->"

+						// + ((int) _rect1.x + (int) _rect1.width));

+						// Advance rectangle to next start position and Fill

+						// with space until next event

+						_rect1.x += _rect1.width;

+						x0 = _rect1.x;

+					}

+

+					// Fill space till next event

+					fillSpace(rect, gc, selected, x0, xNext, xEnd);

+

+					lastEvent = currEvent;

+					currEvent = nextEvent;

+					currEventTime = nextEventTime;

+					// Move x0 to the beginning of next event

+					x0 = rect.x + (double) ((nextEventTime - time0) * K);

+					// Trace.debug("rect.x: " + rect.x + " + " +

+					// "(nextEvenTime: "

+					// + nextEventTime + "- time0: " + time0 + ") * K: "

+					// + K + " = " + x0);

+				}

+			}

+

+			// fill space after last event

+			int xEnd = rect.x + rect.width;

+			if (x0 < xEnd) {

+				// Trace.debug("Space after last event, x0: " + x0 + ", xEnd: "

+				// + xEnd);

+				_rect1.x = (int) (x0 >= rect.x ? x0 : rect.x);

+				_rect1.width = xEnd - _rect1.x;

+				gc.setBackground(_colors

+						.getBkColor(selected, _isInFocus, false));

+				gc.fillRectangle(_rect1);

+				// draw middle line

+				gc.setForeground(_colors.getColor(utilImpl

+						.getEventColorVal(lastEvent)));

+				int midy = _rect1.y + _rect1.height / 2;

+				int lw = gc.getLineWidth();

+				gc.setLineWidth(2);

+				gc.drawLine(_rect1.x, midy, _rect1.x + _rect1.width, midy);

+				gc.setLineWidth(lw);

+			}

+

+			// draw focus area

+			Utils.init(_rect1, rect);

+			gc.setForeground(_colors.getBkColor(selected, _isInFocus, false));

+			int y = _rect1.y;

+			gc.drawLine(_rect1.x, y, _rect1.x + _rect1.width, y);

+			y++;

+			gc.drawLine(_rect1.x, y, _rect1.x + _rect1.width, y);

+			y++;

+			gc.drawLine(_rect1.x, y, _rect1.x + _rect1.width, y);

+			y = _rect1.y + _rect1.height - 1;

+			gc.drawLine(_rect1.x, y, _rect1.x + _rect1.width, y);

+			y--;

+			gc.drawLine(_rect1.x, y, _rect1.x + _rect1.width, y);

+			y--;

+			gc.drawLine(_rect1.x, y, _rect1.x + _rect1.width, y);

+		}

+

+		// draw selected time

+		int x = rect.x + (int) ((selectedTime - time0) * K);

+		if (x >= rect.x && x < rect.x + rect.width) {

+			gc.setForeground(_colors.getColor(TraceColorScheme.SELECTED_TIME));

+			if (group)

+				gc.drawLine(x, rect.y + rect.height - 1, x, rect.y

+						+ rect.height);

+			else

+				gc.drawLine(x, rect.y, x, rect.y + rect.height);

+		}

+	}

+

+	private void fillSpace(Rectangle rect, GC gc, boolean selected, double x0,

+			double x1, double xEnd) {

+		// fill space before first event

+		if (x0 >= rect.x && x0 < xEnd) {

+			// _rect1.width = (int) ((x1 <= xEnd ? x1 : xEnd) - x0);

+			// Trace.debug("Drawing Space: " + _rect1.x + "," + _rect1.y + ","

+			// + _rect1.height + ", " + _rect1.width + "--> "

+			// + ((int) _rect1.x + (int) _rect1.width));

+

+			// if (_rect1.width < 0) {

+			// Trace.debug("Incorrect width:" + _rect1.width);

+			// }

+			gc.setBackground(_colors.getBkColor(selected, _isInFocus, false));

+			gc.fillRectangle(_rect1);

+			// draw middle line

+			gc.setForeground(_colors.getColor(TraceColorScheme.MID_LINE));

+			int midy = _rect1.y + _rect1.height / 2;

+			gc.drawLine(_rect1.x, midy, _rect1.x + _rect1.width, midy);

+		} else {

+			// Trace.debug("No space added since, x0 is out of range " + x0

+			// + " rect.x: " + rect.x + " xEnd: " + xEnd);

+		}

+	}

+

+	public void keyTraversed(TraverseEvent e) {

+		if ((e.detail == SWT.TRAVERSE_TAB_NEXT)

+				|| (e.detail == SWT.TRAVERSE_TAB_PREVIOUS))

+			e.doit = true;

+	}

+

+	public void keyPressed(KeyEvent e) {

+		int idx = -1;

+		if (SWT.HOME == e.keyCode) {

+			idx = getTopIndex();

+		} else if (SWT.END == e.keyCode) {

+			idx = getBottomIndex();

+		} else if (SWT.ARROW_DOWN == e.keyCode) {

+			idx = getSelectedIndex();

+			if (idx < 0)

+				idx = 0;

+			else if (idx < _data._items.length - 1)

+				idx++;

+		} else if (SWT.ARROW_UP == e.keyCode) {

+			idx = getSelectedIndex();

+			if (idx < 0)

+				idx = 0;

+			else if (idx > 0)

+				idx--;

+		} else if (SWT.ARROW_LEFT == e.keyCode) {

+			selectPrevEvent();

+		} else if (SWT.ARROW_RIGHT == e.keyCode) {

+			selectNextEvent();

+		} else if (SWT.PAGE_DOWN == e.keyCode) {

+			int page = countPerPage();

+			idx = getSelectedIndex();

+			if (idx < 0)

+				idx = 0;

+			idx += page;

+			if (idx >= _data._items.length)

+				idx = _data._items.length - 1;

+		} else if (SWT.PAGE_UP == e.keyCode) {

+			int page = countPerPage();

+			idx = getSelectedIndex();

+			if (idx < 0)

+				idx = 0;

+			idx -= page;

+			if (idx < 0)

+				idx = 0;

+		} else if (SWT.CR == e.keyCode) {

+			idx = getSelectedIndex();

+			if (idx >= 0) {

+				if (_data._items[idx] instanceof TraceItem)

+					fireDefaultSelection();

+				else if (_data._items[idx] instanceof GroupItem)

+					toggle(idx);

+			}

+			idx = -1;

+		}

+		if (idx >= 0) {

+			selectItem(idx, false);

+			fireSelectionChanged();

+		}

+	}

+

+	public void keyReleased(KeyEvent e) {

+	}

+

+	public void focusGained(FocusEvent e) {

+		_isInFocus = true;

+		redraw();

+	}

+

+	public void focusLost(FocusEvent e) {

+		_isInFocus = false;

+		if (0 != _dragState) {

+			setCapture(false);

+			_dragState = 0;

+		}

+		redraw();

+	}

+

+	public boolean isInFocus() {

+		return _isInFocus;

+	}

+

+	public void mouseMove(MouseEvent e) {

+		if (null == _timeProvider)

+			return;

+		Point size = getCtrlSize();

+		if (1 == _dragState) {

+			int nameWidth = _timeProvider.getNameSpace();

+			int x = e.x - nameWidth;

+			if (x > 0 && size.x > nameWidth && _dragX != x) {

+				_dragX = x;

+				double K = (double) (size.x - nameWidth)

+						/ (_time1bak - _time0bak);

+				long timeDelta = (long) ((_dragX - _dragX0) / K);

+				long time1 = _time1bak - timeDelta;

+				long maxTime = _timeProvider.getMaxTime();

+				if (time1 > maxTime)

+					time1 = maxTime;

+				long time0 = time1 - (_time1bak - _time0bak);

+				if (time0 < _timeProvider.getMinTime()) {

+					time0 = _timeProvider.getMinTime();

+					time1 = time0 + (_time1bak - _time0bak);

+				}

+				_timeProvider.setStartFinishTime(time0, time1);

+			}

+		} else if (3 == _dragState) {

+			_dragX = e.x;

+			_timeProvider.setNameSpace(_hitIdx + _dragX - _dragX0);

+		} else if (0 == _dragState) {

+			boolean mouseHover = hitSplitTest(e.x, e.y) > 0;

+			if (_mouseHover != mouseHover)

+				redraw();

+			_mouseHover = mouseHover;

+		}

+		updateCursor(e.x, e.y);

+	}

+

+	public void mouseDoubleClick(MouseEvent e) {

+		if (null == _timeProvider)

+			return;

+		if (1 == e.button) {

+			int idx = hitSplitTest(e.x, e.y);

+			if (idx >= 0) {

+				_timeProvider.setNameSpace(_idealNameWidth + 3 * MARGIN

+						+ SMALL_ICON_SIZE);

+				return;

+			}

+			idx = hitTest(e.x, e.y);

+			if (idx >= 0) {

+				selectItem(idx, false);

+				if (_data._items[idx] instanceof TraceItem) {

+					fireDefaultSelection();

+				}

+			}

+		}

+	}

+

+	/**

+	 * <p>

+	 * If the x, y position is over the vertical split line (name to time

+	 * ranges), then change the cursor to a drag cursor to indicate the user the

+	 * possibility of resizing

+	 * </p>

+	 * 

+	 * @param x

+	 * @param y

+	 */

+	void updateCursor(int x, int y) {

+		// if Wait cursor not active, check for the need to change to a drag

+		// cursor

+		if (_isWaitCursor == false) {

+			int idx = hitSplitTest(x, y);

+			// No dragcursor is name space is fixed to zero

+			if (idx > 0 && !_isDragCursor3 && _timeProvider.getNameSpace() > 0) {

+				setCursor(_dragCursor3);

+				_isDragCursor3 = true;

+			} else if (idx <= 0 && _isDragCursor3) {

+				setCursor(null);

+				_isDragCursor3 = false;

+			}

+		}

+	}

+

+	/**

+	 * Provide the possibilty to control the wait cursor externally e.g. data

+	 * requests in progress

+	 * 

+	 * @param waitInd

+	 */

+	public void waitCursor(boolean waitInd) {

+		// Update cursor as indicated

+		if (waitInd) {

+			setCursor(_WaitCursor);

+			_isWaitCursor = true;

+		} else {

+			setCursor(null);

+			_isWaitCursor = false;

+		}

+

+		// Get ready for next mouse move

+		_isDragCursor3 = false;

+	}

+

+	public void mouseDown(MouseEvent e) {

+		if (null == _timeProvider)

+			return;

+		int idx;

+		if (1 == e.button) {

+			int namewidth = _timeProvider.getNameSpace();

+			if (namewidth != 0) {

+				idx = hitSplitTest(e.x, e.y);

+				if (idx > 0) {

+					_dragState = 3;

+					_dragX = _dragX0 = e.x;

+					_hitIdx = _timeProvider.getNameSpace();

+					;

+					_time0bak = _timeProvider.getTime0();

+					_time1bak = _timeProvider.getTime1();

+					redraw();

+					return;

+				}

+			}

+

+			idx = hitTest(e.x, e.y);

+			if (idx >= 0) {

+				if (_data._items[idx] instanceof TraceItem) {

+					long hitTime = hitTimeTest(e.x, e.y);

+					if (hitTime >= 0) {

+						_timeProvider.setSelectedTimeInt(hitTime, false);

+						setCapture(true);

+						_dragState = 1;

+						_dragX = _dragX0 = e.x - _timeProvider.getNameSpace();

+						_time0bak = _timeProvider.getTime0();

+						_time1bak = _timeProvider.getTime1();

+					}

+				} else if (_data._items[idx] instanceof GroupItem) {

+					_hitIdx = idx;

+					_dragState = 2;

+				}

+				selectItem(idx, false);

+				fireSelectionChanged();

+			}

+		}

+	}

+

+	public void mouseUp(MouseEvent e) {

+		if (0 != _dragState) {

+			setCapture(false);

+			if (2 == _dragState) {

+				if (hitTest(e.x, e.y) == _hitIdx)

+					toggle(_hitIdx);

+			} else if (3 == _dragState) {

+				redraw();

+			}

+			_dragState = 0;

+		}

+	}

+

+	public void controlMoved(ControlEvent e) {

+	}

+

+	public void controlResized(ControlEvent e) {

+		adjustScrolls();

+	}

+

+	public void widgetDefaultSelected(SelectionEvent e) {

+	}

+

+	public void widgetSelected(SelectionEvent e) {

+		if (e.widget == getVerticalBar()) {

+			_topItem = getVerticalBar().getSelection();

+			if (_topItem < 0)

+				_topItem = 0;

+			redraw();

+		} else if (e.widget == getHorizontalBar() && null != _timeProvider) {

+			int startTime = getHorizontalBar().getSelection();

+			long time0 = _timeProvider.getTime0();

+			long time1 = _timeProvider.getTime1();

+			long timeMin = _timeProvider.getMinTime();

+			long timeMax = _timeProvider.getMaxTime();

+			long delta = timeMax - timeMin;

+

+			long range = time1 - time0;

+			// _timeRangeFixed = true;

+			time0 = timeMin + (long) ((double) (startTime * _timeStep) * delta);

+			time1 = time0 + range;

+			// Trace.debug("\nstartTime:" + startTime + " time0:" + time0

+			// + " time1:" + time1 + " Delta:" + delta);

+			_timeProvider.setStartFinishTime(time0, time1);

+		}

+	}

+

+	public void mouseEnter(MouseEvent e) {

+	}

+

+	public void mouseExit(MouseEvent e) {

+		if (_mouseHover) {

+			_mouseHover = false;

+			redraw();

+		}

+	}

+

+	public void mouseHover(MouseEvent e) {

+	}

+

+	public void mouseScrolled(MouseEvent e) {

+		if (e.count > 0) {

+			zoomIn();

+		} else if (e.count < 0) {

+			zoomOut();

+		}

+	}

+

+	public boolean isVisibleVerticalScroll() {

+		return _visibleVerticalScroll;

+	}

+

+	public void setVisibleVerticalScroll(boolean visibleVerticalScroll) {

+		ScrollBar scrollVer = getVerticalBar();

+		if (scrollVer != null) {

+			scrollVer.setVisible(visibleVerticalScroll);

+		}

+		this._visibleVerticalScroll = visibleVerticalScroll;

+	}

+

+	@Override

+	public int getBorderWidth() {

+		return _borderWidth;

+	}

+

+	public void setBorderWidth(int borderWidth) {

+		this._borderWidth = borderWidth;

+	}

+

+	public int getHeaderHeight() {

+		return _headerHeight;

+	}

+

+	public void setHeaderHeight(int headerHeight) {

+		this._headerHeight = headerHeight;

+	}

+

+	public int getItemHeight() {

+		return _itemHeight;

+	}

+

+	public void setItemHeight(int rowHeight) {

+		this._itemHeight = rowHeight;

+	}

+

+	public Vector<ITmfTimeAnalysisEntry> getFilteredOut() {

+		return _data.getFilteredOut();

+	}

+

+//	@Override

+	public void addSelectionChangedListener(ISelectionChangedListener listener) {

+		if (listener != null) {

+			if (!_selectionChangedListeners.contains(listener)) {

+				_selectionChangedListeners.add(listener);

+			}

+		}

+	}

+

+//	@Override

+	public void removeSelectionChangedListener(

+			ISelectionChangedListener listener) {

+		if (listener != null) {

+			_selectionChangedListeners.remove(listener);

+		}

+	}

+

+//	@Override

+	public void setSelection(ISelection selection) {

+		if (selection instanceof PlainSelection) {

+			PlainSelection sel = (PlainSelection) selection;

+			Object ob = sel.getFirstElement();

+			if (ob instanceof ITmfTimeAnalysisEntry) {

+				ITmfTimeAnalysisEntry trace = (ITmfTimeAnalysisEntry) ob;

+				selectItem(trace, false);

+			}

+		}

+

+	}

+}

+

+class Item {

+	public boolean _expanded;

+	public boolean _selected;

+	public boolean _hasChildren;

+	public String _name;

+

+	Item(String name) {

+		_name = name;

+	}

+

+	@Override

+	public String toString() {

+		return _name;

+	}

+}

+

+class TraceItem extends Item {

+	public ITmfTimeAnalysisEntry _trace;

+

+	TraceItem(ITmfTimeAnalysisEntry trace, String name) {

+		super(name);

+		_trace = trace;

+	}

+}

+

+class GroupItem extends Item {

+	public List<ITmfTimeAnalysisEntry> _traces;

+

+	GroupItem(String name) {

+		super(name);

+		_traces = new ArrayList<ITmfTimeAnalysisEntry>();

+		_hasChildren = true;

+	}

+

+	void add(ITmfTimeAnalysisEntry trace) {

+		_traces.add(trace);

+	}

+}

+

+class ItemData {

+	public Object[] _items = new Object[0];

+	private Object _traces[] = new Object[0];

+	private boolean traceFilter[] = new boolean[0];

+	private Map<String, GroupItem> _groupTable = new HashMap<String, GroupItem>();

+	private boolean _flatList = false;

+	private TmfTimeAnalysisProvider utilsImp;

+	private Vector<ITmfTimeAnalysisEntry> filteredOut = new Vector<ITmfTimeAnalysisEntry>();

+

+	public ItemData(TmfTimeAnalysisProvider utils) {

+		this.utilsImp = utils;

+	}

+

+	protected void groupTraces(boolean on) {

+		if (_flatList == on) {

+			_flatList = !on;

+			updateItems();

+		}

+	}

+

+	void clearGroups() {

+		Iterator<GroupItem> it = _groupTable.values().iterator();

+		while (it.hasNext()) {

+			GroupItem group = it.next();

+			group._traces.clear();

+		}

+	}

+

+	void deleteEmptyGroups() {

+		Iterator<GroupItem> it = _groupTable.values().iterator();

+		while (it.hasNext()) {

+			GroupItem group = it.next();

+			if (group._traces.size() == 0)

+				it.remove();

+		}

+	}

+

+	TraceItem findTraceItem(ITmfTimeAnalysisEntry trace) {

+		if (trace == null)

+			return null;

+

+		int traceId = trace.getId();

+		TraceItem traceItem = null;

+

+		for (int i = 0; i < _items.length; i++) {

+			Object item = _items[i];

+			if (item instanceof TraceItem) {

+				TraceItem ti = (TraceItem) item;

+				if (ti._trace.getId() == traceId) {

+					traceItem = ti;

+					break;

+				}

+			}

+		}

+

+		return traceItem;

+	}

+

+	Integer findTraceItemIndex(ITmfTimeAnalysisEntry trace) {

+		if (trace == null)

+			return null;

+

+		int traceId = trace.getId();

+

+		Integer idx = null;

+		for (int i = 0; i < _items.length; i++) {

+			idx = i;

+			Object item = _items[i];

+			if (item instanceof TraceItem) {

+				TraceItem ti = (TraceItem) item;

+				if (ti._trace.getId() == traceId) {

+					break;

+				}

+			}

+		}

+

+		return idx;

+	}

+

+	public void updateItems() {

+		List<Item> itemList = new ArrayList<Item>();

+		String name = "";

+

+		Iterator<GroupItem> it = _groupTable.values().iterator();

+		while (it.hasNext()) {

+			GroupItem group = it.next();

+			if (!_flatList)

+				itemList.add(group);

+

+			if (_flatList || group._expanded) {

+				Iterator<ITmfTimeAnalysisEntry> it2 = group._traces.iterator();

+				while (it2.hasNext()) {

+					ITmfTimeAnalysisEntry trace = it2.next();

+					TraceItem traceItem = findTraceItem(trace);

+					name = utilsImp.composeTraceName(trace, false);

+					traceItem = new TraceItem(trace, name);

+					itemList.add(traceItem);

+				}

+			}

+		}

+		_items = itemList.toArray();

+	}

+

+	public int expandItem(int idx, boolean expand) {

+		if (idx < 0 || idx >= _items.length)

+			return 0;

+		int ret = 0;

+		Item item = (Item) _items[idx];

+		if (item._hasChildren && !item._expanded) {

+			item._expanded = expand;

+			ret = _items.length;

+			updateItems();

+			ret = _items.length - ret;

+		}

+		return ret;

+	}

+

+	public void refreshData(Object traces[]) {

+		if (traces == null || traces.length == 0) {

+			traceFilter = null;

+		} else if (traceFilter == null || traces.length != traceFilter.length) {

+			traceFilter = new boolean[traces.length];

+			java.util.Arrays.fill(traceFilter, true);

+		}

+

+		_traces = traces;

+		refreshData();

+	}

+

+	/**

+	 * Allows to update the GUI from a stream of events handling addition one by

+	 * one over known TmfTaTrace parents.

+	 * 

+	 * @param parent

+	 * @param childItem

+	 */

+	public void refreshPartial(ITmfTimeAnalysisEntry parent, TimeEvent childItem) {

+		// Find the Trace item within the current list

+		TraceItem item = findTraceItem(parent);

+

+// This method is not used (yet) so this code can be commented out for now

+// FIXME: Arrays.copyOf is a Java6 feature

+//		if (item == null) {

+//			// If the parent item is not found, make room for it in the current

+//			// array

+//			int length = 1;

+//			Object[] traces;

+//			if (_traces != null) {

+//				length = _traces.length + 1;

+//				traces = Arrays.copyOf(_traces, length);

+//			} else {

+//				traces = new Object[length];

+//			}

+//

+//			// Add the new parent element to the end of the array.

+//			traces[length - 1] = parent;

+//

+//			// update the filter array to accomodate a postion to the new

+//			// element

+//			traceFilter = new boolean[traces.length];

+//			java.util.Arrays.fill(traceFilter, true);

+//

+//			// rebuild internal data

+//			_traces = traces;

+//			refreshData();

+//

+//			// item must be there

+//			item = findTraceItem(parent);

+//		}

+

+		ITmfTimeAnalysisEntry localTraceItem = item._trace;

+		// Local trace found

+		Vector<TimeEvent> children = localTraceItem.getTraceEvents();

+		TimeEvent lastChildIn = children.lastElement();

+		long lastChildSTime = lastChildIn.getTime();

+		long newChildSTime = childItem.getTime();

+		if (newChildSTime < lastChildSTime) {

+			// The children are expected to arrive sorted by time

+			// since the new time is earlier than the last child

+			// The infomation is being refreshed from start, remove all

+			// children and start over

+			children.clear();

+		}

+		// Add the new item

+		children.add(childItem);

+

+	}

+

+	public void refreshData() {

+		clearGroups();

+		filteredOut.clear();

+		String undef = Messages._UNDEFINED_GROUP;

+		List<GroupItem> groupList = new ArrayList<GroupItem>();

+		for (int i = 0; i < _traces.length; i++) {

+			ITmfTimeAnalysisEntry trace = (ITmfTimeAnalysisEntry) _traces[i];

+			if (!traceFilter[i]) {

+				filteredOut.add(trace);

+				continue;

+			}

+

+			String groupName = trace.getGroupName();

+			if (null == groupName)

+				groupName = undef;

+

+			GroupItem group = _groupTable.get(groupName);

+			if (null == group) {

+				group = new GroupItem(NLS.bind(Messages._TRACE_GROUP_LABEL,

+						groupName));

+				group._expanded = !groupName.equalsIgnoreCase("system")

+						&& !groupName.equalsIgnoreCase(undef);

+				_groupTable.put(groupName, group);

+				groupList.add(group);

+			}

+			group.add(trace);

+		}

+

+		deleteEmptyGroups();

+		updateItems();

+	}

+

+	public Object[] getTraces() {

+		return _traces;

+	}

+

+	public boolean[] getTraceFilter() {

+		return traceFilter;

+	}

+

+	public Vector<ITmfTimeAnalysisEntry> getFilteredOut() {

+		return filteredOut;

+	}

+}

diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TmfTimeTipHandler.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TmfTimeTipHandler.java
new file mode 100644
index 0000000..bdd38c1
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TmfTimeTipHandler.java
@@ -0,0 +1,218 @@
+/*****************************************************************************

+ * Copyright (c) 2007, Intel Corporation.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Intel Corporation - Initial API and implementation

+ *    Vitaly A. Provodin, Intel - Initial API and implementation

+ *    Alvaro Sanchex-Leon - Udpated for TMF

+ *

+ * $Id: ThreadsTipHandler.java,v 1.5 2007/06/06 19:16:16 gnagarajan Exp $

+ *****************************************************************************/

+package org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.widgets;

+

+import java.util.Iterator;

+import java.util.Map;

+

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.TmfTimeAnalysisProvider;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.Messages;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.ITimeAnalysisViewer.TimeFormat;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITimeEvent;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITmfTimeAnalysisEntry;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.widgets.Utils.Resolution;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.events.MouseAdapter;

+import org.eclipse.swt.events.MouseEvent;

+import org.eclipse.swt.events.MouseTrackAdapter;

+import org.eclipse.swt.graphics.Point;

+import org.eclipse.swt.graphics.Rectangle;

+import org.eclipse.swt.layout.GridData;

+import org.eclipse.swt.layout.GridLayout;

+import org.eclipse.swt.widgets.Control;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.swt.widgets.Table;

+import org.eclipse.swt.widgets.TableColumn;

+import org.eclipse.swt.widgets.TableItem;

+import org.eclipse.swt.widgets.Widget;

+

+

+public class TmfTimeTipHandler {

+

+	private Shell _tipShell;

+	private Table _tipTable;

+	private Item _tipItem;

+	private Point _tipPosition;

+	private ITimeDataProvider _timeDataProvider;

+	TmfTimeAnalysisProvider _utilImp = null;

+

+	public TmfTimeTipHandler(Shell parent, TmfTimeAnalysisProvider rUtilImpl,

+			ITimeDataProvider timeProv) {

+		final Display display = parent.getDisplay();

+

+		this._utilImp = rUtilImpl;

+		this._timeDataProvider = timeProv;

+		_tipShell = new Shell(parent, SWT.ON_TOP | SWT.TOOL);

+		GridLayout gridLayout = new GridLayout();

+		gridLayout.numColumns = 2;

+		gridLayout.marginWidth = 2;

+		gridLayout.marginHeight = 2;

+		_tipShell.setLayout(gridLayout);

+		GridData data = new GridData(GridData.BEGINNING, GridData.BEGINNING,

+				true, true);

+		_tipShell.setLayoutData(data);

+		_tipShell.setBackground(display

+				.getSystemColor(SWT.COLOR_INFO_BACKGROUND));

+

+		_tipTable = new Table(_tipShell, SWT.NONE);

+		_tipTable.setForeground(display

+				.getSystemColor(SWT.COLOR_INFO_FOREGROUND));

+		_tipTable.setBackground(display

+				.getSystemColor(SWT.COLOR_INFO_BACKGROUND));

+		_tipTable.setHeaderVisible(false);

+		_tipTable.setLinesVisible(false);

+

+		// tipTable.setLayoutData(new GridData(GridData.FILL_HORIZONTAL

+		// | GridData.VERTICAL_ALIGN_CENTER));

+	}

+

+	public void activateHoverHelp(final Control control) {

+		control.addMouseListener(new MouseAdapter() {

+			@Override

+			public void mouseDown(MouseEvent e) {

+				if (_tipShell.isVisible())

+					_tipShell.setVisible(false);

+			}

+		});

+

+		control.addMouseTrackListener(new MouseTrackAdapter() {

+			@Override

+			public void mouseExit(MouseEvent e) {

+				if (_tipShell.isVisible())

+					_tipShell.setVisible(false);

+				_tipItem = null;

+

+			}

+

+			private void addItem(String name, String value) {

+				TableItem line = new TableItem(_tipTable, SWT.NONE);

+				line.setText(0, name);

+				line.setText(1, value);

+			}

+

+			private void fillValues(Point pt, TmfTimeStatesCtrl threadStates,

+					Item item) {

+				if (item instanceof TraceItem) {

+					ITmfTimeAnalysisEntry thrd = ((TraceItem) item)._trace;

+					ITimeEvent threadEvent = Utils.findEvent(thrd, threadStates

+							.hitTimeTest(pt.x, pt.y), 2);

+					ITimeEvent nextEvent = Utils.findEvent(thrd, threadStates

+							.hitTimeTest(pt.x, pt.y), 1);

+					// thread name

+					addItem(Messages._TRACE_NAME, thrd.getName());

+					// class name

+					addItem(Messages._TRACE_CLASS_NAME, _utilImp

+							.getTraceClassName(thrd));

+					// thread state

+					addItem(Messages._TRACE_STATE, _utilImp

+							.getEventName(threadEvent));

+

+					// This block receives a

+					// list of <String, String> values to be added to the tip

+					// table

+					Map<String, String> eventAddOns = _utilImp

+							.getEventHoverToolTipInfo(threadEvent);

+					for (Iterator<String> iter = eventAddOns.keySet()

+							.iterator(); iter.hasNext();) {

+						String message = (String) iter.next();

+						addItem(message, eventAddOns.get(message));

+					}

+

+					// start time

+					long startTime = threadEvent == null ? thrd.getStartTime()

+							: threadEvent.getTime();

+

+					long duration = threadEvent == null ? -1 : threadEvent

+							.getDuration();

+

+					if (duration < 0 && threadEvent != null

+							&& nextEvent != null) {

+						long stopTime = nextEvent.getTime();

+						duration = stopTime - startTime;

+					}

+					long eventEndtime = startTime + duration;

+

+// TODO: Check if we need "format"					

+//					TimeFormat format = TimeFormat.RELATIVE;

+					Resolution res = Resolution.NANOSEC;

+					if (_timeDataProvider.isCalendarFormat()) {

+//						format = TimeFormat.ABSOLUTE; // Absolute format

+//														// (calendar)

+						// Add Date

+						addItem(Messages._TRACE_DATE, Utils

+								.formatDate(startTime));

+					}

+					addItem(Messages._TRACE_START_TIME, Utils.formatTime(

+							startTime, TimeFormat.RELATIVE, res));

+

+					addItem(Messages._TRACE_STOP_TIME, Utils.formatTime(

+							eventEndtime, TimeFormat.RELATIVE, res));

+

+					// Duration in relative format in any case

+					addItem(Messages._DURATION, duration > -1 ? Utils

+							.formatTime(duration, TimeFormat.RELATIVE, res)

+							: "?");

+

+				} else if (item instanceof GroupItem) {

+					addItem(Messages._TRACE_GROUP_NAME, item.toString());

+					addItem(Messages._NUMBER_OF_TRACES, ""

+							+ ((GroupItem) item)._traces.size());

+				}

+			}

+

+			@Override

+			public void mouseHover(MouseEvent event) {

+				Point pt = new Point(event.x, event.y);

+				Widget widget = event.widget;

+				Item item = null;

+				if (widget instanceof TmfTimeStatesCtrl) {

+					TmfTimeStatesCtrl threadStates = (TmfTimeStatesCtrl) widget;

+					item = (Item) threadStates.getItem(pt);

+					_tipTable.remove(0, _tipTable.getItemCount() - 1);

+					new TableColumn(_tipTable, SWT.NONE);

+					new TableColumn(_tipTable, SWT.NONE);

+					fillValues(pt, threadStates, item);

+					_tipTable.getColumn(0).setWidth(200);

+					_tipTable.getColumn(1).pack();

+					_tipTable.setSize(_tipTable.computeSize(SWT.DEFAULT, 200));

+					_tipShell.pack();

+				} else if (widget == null) {

+					_tipShell.setVisible(false);

+					_tipItem = null;

+					return;

+				}

+				if (item == _tipItem)

+					return;

+				_tipItem = item;

+				_tipPosition = control.toDisplay(pt);

+				_tipShell.pack();

+				setHoverLocation(_tipShell, _tipPosition);

+				_tipShell.setVisible(true);

+			}

+		});

+	}

+

+	private void setHoverLocation(Shell shell, Point position) {

+		Rectangle displayBounds = shell.getDisplay().getBounds();

+		Rectangle shellBounds = shell.getBounds();

+		shellBounds.x = Math.max(Math.min(position.x, displayBounds.width

+				- shellBounds.width), 0);

+		shellBounds.y = Math.max(Math.min(position.y + 16, displayBounds.height

+				- shellBounds.height), 0);

+		shell.setBounds(shellBounds);

+	}

+

+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TraceColorScheme.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TraceColorScheme.java
new file mode 100644
index 0000000..962767f
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TraceColorScheme.java
@@ -0,0 +1,369 @@
+/*****************************************************************************

+ * Copyright (c) 2008 Intel Corporation.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Intel Corporation - Initial API and implementation

+ *    Ruslan A. Scherbakov, Intel - Initial API and implementation

+ *    Alvaro Sanchex-Leon - Udpated for TMF

+ *

+ * $Id: TraceColorScheme.java,v 1.3 2008/05/09 16:11:24 jkubasta Exp $ 

+ *****************************************************************************/

+

+package org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.widgets;

+

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.TmfTimeAnalysisProvider.StateColor;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.graphics.Color;

+

+

+public class TraceColorScheme {

+

+	// elements color indices

+	static public final int BLACK_STATE = 0;

+	static public final int GREEN_STATE = 1;

+	static public final int DARK_BLUE_STATE = 2;

+	static public final int ORANGE_STATE = 3;

+	static public final int GOLD_STATE = 4;

+	static public final int RED_STATE = 5;

+	static public final int GRAY_STATE = 6;

+	static public final int DARK_GREEN_STATE = 7;

+	static public final int DARK_YELLOW_STATE = 8;

+	static public final int MAGENTA3_STATE = 9;

+	static public final int PURPLE1_STATE = 10;

+	static public final int PINK1_STATE = 11;

+	static public final int AQUAMARINE_STATE = 12;

+	static public final int LIGHT_BLUE_STATE = 13;

+	static public final int CADET_BLUE_STATE = 14;

+	static public final int OLIVE_STATE = 15;

+	

+	static public final int STATES0 = 0;

+	static public final int STATES1 = 15;

+	

+	// State element index to name mapping, must keep the same order as above

+	public static final StateColor stateColors[] = { StateColor.BLACK,

+			StateColor.GREEN, StateColor.DARK_BLUE, StateColor.ORANGE,

+			StateColor.GOLD, StateColor.RED, StateColor.GRAY, StateColor.DARK_GREEN, StateColor.DARK_YELLOW, StateColor.MAGENTA3, StateColor.PURPLE1, 

+			StateColor.PINK1, StateColor.AQUAMARINE, StateColor.LIGHT_BLUE, StateColor.CADET_BLUE, StateColor.OLIVE

+			};

+

+	// selected state elements color indices

+	static public final int BLACK_STATE_SEL = 16;

+	static public final int GREEN_STATE_SEL = 17;

+	static public final int DARK_BLUE_STATE_SEL = 18;

+	static public final int ORANGE_STATE_SEL = 19;

+	static public final int GOLD_STATE_SEL = 20;

+	static public final int RED_STATE_SEL = 21;

+	static public final int GRAY_STATE_SEL = 22;

+	static public final int DARK_GREEN_STATE_SEL = 23;

+	static public final int DARK_YELLOW_STATE_SEL = 24;

+	static public final int MAGENTA3_STATE_SEL = 25;

+	static public final int PURPLE1_STATE_SEL = 26;

+	static public final int PINK1_STATE_SEL = 27;

+	static public final int AQUAMARINE_STATE_SEL = 28;

+	static public final int LIGHT_BLUE_STATE_SEL = 29;

+	static public final int CADET_BLUE_STATE_SEL = 30;

+	static public final int OLIVE_STATE_SEL = 31;

+	

+	static public final int STATES_SEL0 = 16;

+	static public final int STATES_SEL1 = 31;

+

+	// colors indices for viewer controls

+	static public final int BACKGROUND = 32;

+	static public final int FOREGROUND = 33;

+	static public final int BACKGROUND_SEL = 34;

+	static public final int FOREGROUND_SEL = 35;

+	static public final int BACKGROUND_SEL_NOFOCUS = 36;

+	static public final int FOREGROUND_SEL_NOFOCUS = 37;

+	static public final int TOOL_BACKGROUND = 38;

+	static public final int TOOL_FOREGROUND = 39;

+

+	// misc colors

+	static public final int FIX_COLOR = 40;

+	static public final int WHITE = 41;

+	static public final int GRAY = 42;

+	static public final int BLACK = 43;

+	static public final int DARK_GRAY = 44;

+

+	// selected border color indices

+	static public final int BLACK_BORDER = 45;

+	static public final int GREEN_BORDER = 46;

+	static public final int DARK_BLUE_BORDER = 47;

+	static public final int ORANGE_BORDER = 48;

+	static public final int GOLD_BORDER = 49;

+	static public final int RED_BORDER = 50;

+	static public final int GRAY_BORDER = 51;

+	static public final int DARK_GREEN_BORDER1 = 52;

+	static public final int DARK_YELLOW_BORDER1 = 53;

+	static public final int MAGENTA3_BORDER1 = 54;

+	static public final int PURPLE1_BORDER1 = 55;

+	static public final int PINK1_BORDER1 = 56;

+	static public final int AQUAMARINE_BORDER1 = 57;

+	static public final int LIGHT_BLUE_BORDER1 = 58;

+	static public final int CADET_BLUE_STATE_BORDER = 59;

+	static public final int OLIVE_BORDER2 = 60;

+	

+	static public final int STATES_BORDER0 = 45;

+	static public final int STATES_BORDER1 = 60;

+

+	static public final int MID_LINE = 61;

+	static public final int RED = 62;

+	static public final int GREEN = 63;

+	static public final int BLUE = 64;

+	static public final int YELLOW = 65;

+	static public final int CYAN = 66;

+	static public final int MAGENTA = 67;

+

+	static public final int SELECTED_TIME = 68;

+	static public final int LEGEND_BACKGROUND = 69;

+	static public final int LEGEND_FOREGROUND = 70;

+

+	// group items' colors

+	static public final int GR_BACKGROUND = 71;

+	static public final int GR_FOREGROUND = 72;

+	static public final int GR_BACKGROUND_SEL = 73;

+	static public final int GR_FOREGROUND_SEL = 74;

+	static public final int GR_BACKGROUND_SEL_NOFOCUS = 75;

+	static public final int GR_FOREGROUND_SEL_NOFOCUS = 76;

+

+	static public final int LIGHT_LINE = 77;

+	static public final int BACKGROUND_NAME = 78;

+

+	// Interraction's colors

+	static public final int TI_START_THREAD = BLACK;

+	static public final int TI_HANDOFF_LOCK = BLUE;

+	static public final int TI_NOTIFY_ALL = GREEN;

+	static public final int TI_NOTIFY = GREEN;

+	static public final int TI_NOTIFY_JOINED = DARK_GRAY;

+	static public final int TI_INTERRUPT = RED;

+	static public final int TI_WAIT_EXCEEDED = BLUE;

+

+	static interface IColorProvider {

+		public Color get();

+	}

+

+	static class SysCol implements IColorProvider {

+		int syscol;

+

+		SysCol(int syscol) {

+			this.syscol = syscol;

+		}

+

+		public Color get() {

+			return Utils.getSysColor(syscol);

+		}

+	}

+

+	static class RGB implements IColorProvider {

+		int r;

+		int g;

+		int b;

+

+		RGB(int r, int g, int b) {

+			this.r = r;

+			this.g = g;

+			this.b = b;

+		}

+

+		public Color get() {

+			return new Color(null, r, g, b);

+		}

+	}

+

+	static class Mix implements IColorProvider {

+		IColorProvider cp1;

+		IColorProvider cp2;

+		int w1;

+		int w2;

+

+		Mix(IColorProvider cp1, IColorProvider cp2, int w1, int w2) {

+			this.cp1 = cp1;

+			this.cp2 = cp2;

+			this.w1 = w1;

+			this.w2 = w2;

+		}

+

+		Mix(IColorProvider cp1, IColorProvider cp2) {

+			this.cp1 = cp1;

+			this.cp2 = cp2;

+			this.w1 = 1;

+			this.w2 = 1;

+		}

+

+		public Color get() {

+			Color col1 = cp1.get();

+			Color col2 = cp2.get();

+			Color col = Utils.mixColors(col1, col2, w1, w2);

+			return col;

+		}

+	}

+

+	static private final IColorProvider _providersMap[] = {

+			//

+			new RGB(100, 100, 100), // UNKNOWN

+			new RGB(174, 200, 124), // RUNNING

+			new Mix(new SysCol(SWT.COLOR_BLUE), new SysCol(SWT.COLOR_GRAY), 1,

+					3), // SLEEPING

+			new RGB(210, 150, 60), // WAITING

+			new RGB(242, 225, 168), // BLOCKED

+			new Mix(new SysCol(SWT.COLOR_RED), new SysCol(SWT.COLOR_GRAY), 1, 3), // DEADLOCK

+			new RGB(200, 200, 200), // STOPPED

+			new RGB(35, 107, 42), // STEEL BLUE

+			new RGB(205,205,0), // DARK YELLOW

+			new RGB(205, 0, 205), // MAGENTA

+			new RGB(171, 130, 255), // PURPLE

+			new RGB(255, 181, 197), // PINK

+			new RGB(112, 219, 147), // AQUAMARINE

+			new RGB(198, 226, 255), // SLATEGRAY

+			new RGB(95, 158, 160), // CADET BLUE

+			new RGB(107, 142, 35), // OLIVE

+			

+			

+			//TODO: Does not seem to be used, check during clean-up

+			new SysCol(SWT.COLOR_WHITE), // UNKNOWN_SEL

+			new SysCol(SWT.COLOR_GREEN), // RUNNING_SEL

+			new SysCol(SWT.COLOR_BLUE), // SLEEPING_SEL

+			new SysCol(SWT.COLOR_CYAN), // WAITING_SEL

+			new SysCol(SWT.COLOR_YELLOW), // BLOCKED_SEL

+			new SysCol(SWT.COLOR_RED), // DEADLOCK_SEL

+			new SysCol(SWT.COLOR_DARK_GRAY), // STOPPED_SEL

+			new SysCol(SWT.COLOR_WHITE), 

+			new SysCol(SWT.COLOR_GREEN), 

+			new SysCol(SWT.COLOR_BLUE), 

+			new SysCol(SWT.COLOR_CYAN), 

+			new SysCol(SWT.COLOR_YELLOW), 

+			new SysCol(SWT.COLOR_RED), 

+			new SysCol(SWT.COLOR_DARK_GRAY), 

+			new SysCol(SWT.COLOR_WHITE), 

+			new SysCol(SWT.COLOR_GREEN), 

+			

+

+			new SysCol(SWT.COLOR_LIST_BACKGROUND), // BACKGROUND

+			new SysCol(SWT.COLOR_LIST_FOREGROUND), // FOREGROUND

+			new SysCol(SWT.COLOR_LIST_SELECTION), // BACKGROUND_SEL

+			new SysCol(SWT.COLOR_LIST_SELECTION_TEXT), // FOREGROUND_SEL

+			new SysCol(SWT.COLOR_WIDGET_BACKGROUND), // BACKGROUND_SEL_NOFOCUS

+			new SysCol(SWT.COLOR_WIDGET_FOREGROUND), // FOREGROUND_SEL_NOFOCUS

+			new SysCol(SWT.COLOR_WIDGET_BACKGROUND), // TOOL_BACKGROUND

+			new SysCol(SWT.COLOR_WIDGET_DARK_SHADOW), // TOOL_FOREGROUND

+

+			new SysCol(SWT.COLOR_GRAY), // FIX_COLOR

+			new SysCol(SWT.COLOR_WHITE), // WHITE

+			new SysCol(SWT.COLOR_GRAY), // GRAY

+			new SysCol(SWT.COLOR_BLACK), // BLACK

+			new SysCol(SWT.COLOR_DARK_GRAY), // DARK_GRAY

+

+			new SysCol(SWT.COLOR_DARK_GRAY), // BLACK_BORDER

+			new RGB(75, 115, 120), // GREEN_BORDER

+			new SysCol(SWT.COLOR_DARK_BLUE), // DARK_BLUE_BORDER

+			new RGB(242, 225, 168), // ORANGE_BORDER

+			new RGB(210, 150, 60), // GOLD_BORDER

+			new SysCol(SWT.COLOR_DARK_RED), // RED_BORDER

+			new SysCol(SWT.COLOR_BLACK), // GRAY_BORDER

+			new SysCol(SWT.COLOR_DARK_GRAY), // DARK_GREEN_BORDER

+			new RGB(75, 115, 120), // DARK_YELLOW_BORDER

+			new SysCol(SWT.COLOR_DARK_BLUE), // MAGENTA3_BORDER

+			new RGB(242, 225, 168), // PURPLE1_BORDER

+			new RGB(210, 150, 60), // PINK1_BORDER

+			new SysCol(SWT.COLOR_DARK_RED), // AQUAMARINE_BORDER

+			new SysCol(SWT.COLOR_BLACK), // LIGHT_BLUE_BORDER

+			new SysCol(SWT.COLOR_DARK_GRAY), // BLUE_BORDER

+			new RGB(75, 115, 120), // OLIVE_BORDER

+		

+

+			new SysCol(SWT.COLOR_GRAY), // MID_LINE

+			new SysCol(SWT.COLOR_RED), // RED

+			new SysCol(SWT.COLOR_GREEN), // GREEN

+			new SysCol(SWT.COLOR_BLUE), // BLUE

+			new SysCol(SWT.COLOR_YELLOW), // YELLOW

+			new SysCol(SWT.COLOR_CYAN), // CYAN

+			new SysCol(SWT.COLOR_MAGENTA), // MAGENTA

+

+			new SysCol(SWT.COLOR_BLUE), // SELECTED_TIME

+			new SysCol(SWT.COLOR_WIDGET_BACKGROUND), // LEGEND_BACKGROUND

+			new SysCol(SWT.COLOR_WIDGET_DARK_SHADOW), // LEGEND_FOREGROUND

+

+			new Mix(new RGB(150, 200, 240), new SysCol(

+					SWT.COLOR_LIST_BACKGROUND)),// GR_BACKGROUND

+			new RGB(0, 0, 50), // GR_FOREGROUND

+			new Mix(new RGB(200, 200, 100),

+					new SysCol(SWT.COLOR_LIST_SELECTION)), // GR_BACKGROUND_SEL

+			new Mix(new RGB(150, 200, 240), new SysCol(

+					SWT.COLOR_LIST_SELECTION_TEXT)), // GR_FOREGROUND_SEL

+			new Mix(new RGB(222, 222, 155), new SysCol(

+					SWT.COLOR_WIDGET_BACKGROUND)), // GR_BACKGROUND_SEL_NOFOCUS

+			new RGB(0, 0, 50), // GR_FOREGROUND_SEL_NOFOCUS

+

+			new Mix(new SysCol(SWT.COLOR_GRAY), new SysCol(

+					SWT.COLOR_LIST_BACKGROUND), 1, 3), // LIGHT_LINE

+			new Mix(new SysCol(SWT.COLOR_GRAY), new SysCol(

+					SWT.COLOR_LIST_BACKGROUND), 1, 6), // BACKGROUND_NAME

+	};

+

+	private Color _colors[];

+

+	public TraceColorScheme() {

+		_colors = new Color[_providersMap.length];

+	}

+

+	public void dispose() {

+		for (int i = 0; i < _colors.length; i++) {

+			Utils.dispose(_colors[i]);

+			_colors[i] = null;

+		}

+	}

+

+	public Color getColor(int idx) {

+		if (null == _colors[idx]) {

+			if (idx >= STATES_SEL0 && idx <= STATES_SEL1) {

+				Color col1 = getColor(idx - STATES_SEL0);

+				Color col2 = getColor(BACKGROUND_SEL);

+				_colors[idx] = Utils.mixColors(col1, col2, 3, 1);

+			} else {

+				_colors[idx] = _providersMap[idx].get();

+			}

+		}

+		return _colors[idx];

+	}

+

+	public Color getBkColor(boolean selected, boolean focused, boolean name) {

+		if (selected && focused)

+			return getColor(BACKGROUND_SEL);

+		if (selected)

+			return getColor(BACKGROUND_SEL_NOFOCUS);

+		if (name)

+			return getColor(BACKGROUND_NAME);

+		return getColor(BACKGROUND);

+	}

+

+	public Color getFgColor(boolean selected, boolean focused) {

+		if (selected && focused)

+			return getColor(FOREGROUND_SEL);

+		if (selected)

+			return getColor(FOREGROUND_SEL_NOFOCUS);

+		return getColor(FOREGROUND);

+	}

+

+	public Color getBkColorGroup(boolean selected, boolean focused) {

+		if (selected && focused)

+			return getColor(GR_BACKGROUND_SEL);

+		if (selected)

+			return getColor(GR_BACKGROUND_SEL_NOFOCUS);

+		return getColor(GR_BACKGROUND);

+	}

+

+	public Color getFgColorGroup(boolean selected, boolean focused) {

+		if (selected && focused)

+			return getColor(GR_FOREGROUND_SEL);

+		if (selected)

+			return getColor(GR_FOREGROUND_SEL_NOFOCUS);

+		return getColor(GR_FOREGROUND);

+	}

+

+	public static StateColor[] getStateColors() {

+		return stateColors;

+	}

+}

diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TraceCtrl.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TraceCtrl.java
new file mode 100644
index 0000000..213a5ce
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TraceCtrl.java
@@ -0,0 +1,66 @@
+/*****************************************************************************

+ * Copyright (c) 2007, Intel Corporation.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Intel Corporation - Initial API and implementation

+ *    Ruslan A. Scherbakov, Intel - Initial API and implementation

+ *    Alvaro Sanchex-Leon - Udpated for TMF

+ *

+ * $Id: TraceCtrl.java,v 1.2 2007/02/27 18:37:36 ewchan Exp $ 

+ *****************************************************************************/

+

+package org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.widgets;

+

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.events.PaintEvent;

+import org.eclipse.swt.events.PaintListener;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.Rectangle;

+import org.eclipse.swt.widgets.Canvas;

+import org.eclipse.swt.widgets.Composite;

+

+public abstract class TraceCtrl extends Canvas implements PaintListener {

+

+	static public final int MARGIN = 4;

+	static public final int SMALL_ICON_SIZE = 16;

+

+	protected TraceColorScheme _colors;

+	protected int _fontHeight = 0;

+

+	public TraceCtrl(Composite parent, TraceColorScheme colors) {

+		this(parent, colors, SWT.NO_BACKGROUND | SWT.NO_FOCUS);

+	}

+

+	public TraceCtrl(Composite parent, TraceColorScheme colors, int style) {

+		super(parent, style);

+		_colors = colors;

+		addPaintListener(this);

+	}

+

+	@Override

+	public void dispose() {

+		super.dispose();

+	}

+

+	public void paintControl(PaintEvent e) {

+		if (e.widget != this)

+			return;

+		_fontHeight = e.gc.getFontMetrics().getHeight();

+		Rectangle bound = getClientArea();

+		if (!bound.isEmpty()) {

+			Color colBackup = e.gc.getBackground();

+			paint(bound, e);

+			e.gc.setBackground(colBackup);

+		}

+	}

+

+	public int getFontHeight() {

+		return _fontHeight;

+	}

+

+	abstract void paint(Rectangle bound, PaintEvent e);

+}

diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/Utils.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/Utils.java
new file mode 100644
index 0000000..730a3dc
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/Utils.java
@@ -0,0 +1,548 @@
+/*****************************************************************************

+ * Copyright (c) 2007, 2008 Intel Corporation and others.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Intel Corporation - Initial API and implementation

+ *    Ruslan A. Scherbakov, Intel - Initial API and implementation

+ *    Alvaro Sanchex-Leon - Udpated for TMF

+ *

+ * $Id: Utils.java,v 1.11 2008/06/16 21:04:49 jkubasta Exp $ 

+ *****************************************************************************/

+

+package org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.widgets;

+

+import java.text.SimpleDateFormat;

+import java.util.Date;

+import java.util.Iterator;

+import java.util.List;

+import java.util.Vector;

+

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.ITimeAnalysisViewer.TimeFormat;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.TimeEvent;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITimeEvent;

+import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITmfTimeAnalysisEntry;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.Device;

+import org.eclipse.swt.graphics.GC;

+import org.eclipse.swt.graphics.Point;

+import org.eclipse.swt.graphics.Rectangle;

+import org.eclipse.swt.widgets.Display;

+

+public class Utils {

+

+	static public final int IMG_THREAD_RUNNING = 0;

+	static public final int IMG_THREAD_SUSPENDED = 1;

+	static public final int IMG_THREAD_STOPPED = 2;

+	static public final int IMG_METHOD_RUNNING = 3;

+	static public final int IMG_METHOD = 4;

+	static public final int IMG_NUM = 5;

+

+	static public final Object[] _empty = new Object[0];

+

+	static enum Resolution {

+		SECONDS, MILLISEC, MICROSEC, NANOSEC

+	};

+

+	static private SimpleDateFormat stimeformat = new SimpleDateFormat("HH:mm:ss");

+	static private SimpleDateFormat sdateformat = new SimpleDateFormat("yyyy.MM.dd");

+

+//	static private String _externalPlugin[] = { "org.eclipse.debug.ui",

+//			"org.eclipse.debug.ui", "org.eclipse.debug.ui",

+//			"org.eclipse.debug.ui", "org.eclipse.debug.ui", };

+//

+//	static private String _externalPath[] = {

+//			"icons/full/obj16/thread_obj.gif", // running thread

+//			"icons/full/obj16/threads_obj.gif", // suspended

+//			"icons/full/obj16/threadt_obj.gif", // stopped

+//			"icons/full/obj16/stckframe_running_obj.gif", // running stack frame

+//			"icons/full/obj16/stckframe_obj.gif", // stack frame

+//	};

+

+//	static public Image getImage(int idx) {

+//		if (idx < 0 || idx >= IMG_NUM)

+//			SWT.error(SWT.ERROR_INVALID_ARGUMENT);

+//		String key = "trace.img." + idx;

+//		Image img = TimeAnalysisPlugin.getDefault().getImageRegistry().get(key);

+//		if (null == img) {

+//			ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(

+//					_externalPlugin[idx], _externalPath[idx]);

+//			TimeAnalysisPlugin.getDefault().getImageRegistry().put(key, desc);

+//			img = TimeAnalysisPlugin.getDefault().getImageRegistry().get(key);

+//		}

+//		return img;

+//	}

+

+	static public void init(Rectangle rect) {

+		rect.x = 0;

+		rect.y = 0;

+		rect.width = 0;

+		rect.height = 0;

+	}

+

+	static public void init(Rectangle rect, int x, int y, int width, int height) {

+		rect.x = x;

+		rect.y = y;

+		rect.width = width;

+		rect.height = height;

+	}

+

+	static public void init(Rectangle rect, Rectangle source) {

+		rect.x = source.x;

+		rect.y = source.y;

+		rect.width = source.width;

+		rect.height = source.height;

+	}

+

+	static public void deflate(Rectangle rect, int x, int y) {

+		rect.x += x;

+		rect.y += y;

+		rect.width -= x + x;

+		rect.height -= y + y;

+	}

+

+	static public void inflate(Rectangle rect, int x, int y) {

+		rect.x -= x;

+		rect.y -= y;

+		rect.width += x + x;

+		rect.height += y + y;

+	}

+

+	static void dispose(Color col) {

+		if (null != col)

+			col.dispose();

+	}

+

+	static public Color mixColors(Device display, Color c1, Color c2, int w1,

+			int w2) {

+		return new Color(display, (w1 * c1.getRed() + w2 * c2.getRed())

+				/ (w1 + w2), (w1 * c1.getGreen() + w2 * c2.getGreen())

+				/ (w1 + w2), (w1 * c1.getBlue() + w2 * c2.getBlue())

+				/ (w1 + w2));

+	}

+

+	static public Color getSysColor(int id) {

+		Color col = Display.getCurrent().getSystemColor(id);

+		return new Color(col.getDevice(), col.getRGB());

+	}

+

+	static public Color mixColors(Color col1, Color col2, int w1, int w2) {

+		return mixColors(Display.getCurrent(), col1, col2, w1, w2);

+	}

+

+	static public int drawText(GC gc, String text, Rectangle rect,

+			boolean transp) {

+		Point size = gc.stringExtent(text);

+		gc.drawText(text, rect.x, rect.y, transp);

+		return size.x;

+	}

+

+	static public int drawText(GC gc, String text, int x, int y, boolean transp) {

+		Point size = gc.stringExtent(text);

+		gc.drawText(text, x, y, transp);

+		return size.x;

+	}

+

+	/**

+	 * Formats time in format: MM:SS:NNN

+	 * 

+	 * @param v

+	 * @param option

+	 *            0: MMMM:ss:nnnnnnnnn, 1: HH:MM:ss MMM.mmmm.nnn

+	 * @return

+	 */

+	static public String formatTime(long v, TimeFormat format, Resolution res) {

+		// if format is absolute (Calendar)

+		if (format == TimeFormat.ABSOLUTE) {

+			return formatTimeAbs(v, res);

+		}

+

+		StringBuffer str = new StringBuffer();

+		boolean neg = v < 0;

+		if (neg) {

+			v = -v;

+			str.append('-');

+		}

+

+		long sec = (long) (v * 1E-9);

+		// TODO: Expand to make it possible to select the minute, second, nanosecond format

+		//printing minutes is suppressed just sec and ns

+		// if (sec / 60 < 10)

+		// str.append('0');

+		// str.append(sec / 60);

+		// str.append(':');

+		// sec %= 60;

+		// if (sec < 10)

+		// str.append('0');

+		str.append(sec);

+		String ns = formatNs(v, res);

+		if (!ns.equals("")) {

+			str.append(':');

+			str.append(ns);

+		}

+

+		return str.toString();

+	}

+

+	/**

+	 * From input time in nanoseconds, convert to Date format YYYY-MM-dd

+	 * 

+	 * @param absTime

+	 * @return

+	 */

+	public static String formatDate(long absTime) {

+		String sdate = sdateformat.format(new Date((long) (absTime * 1E-6)));

+		return sdate;

+	}

+

+	/**

+	 * Formats time in ns to Calendar format: HH:MM:SS MMM.mmm.nnn

+	 * 

+	 * @param time

+	 * @return

+	 */

+	static public String formatTimeAbs(long time, Resolution res) {

+		StringBuffer str = new StringBuffer();

+

+		// format time from nanoseconds to calendar time HH:MM:SS

+		String stime = stimeformat.format(new Date((long) (time * 1E-6)));

+		str.append(stime + " ");

+		// append the Milliseconds, MicroSeconds and NanoSeconds as specified in

+		// the Resolution

+		str.append(formatNs(time, res));

+		return str.toString();

+	}

+

+	/**

+	 * Obtains the remainder fraction on unit Seconds of the entered value in

+	 * nanoseconds. e.g. input: 1241207054171080214 ns The number of fraction

+	 * seconds can be obtained by removing the last 9 digits: 1241207054 the

+	 * fractional portion of seconds, expressed in ns is: 171080214

+	 * 

+	 * @param time

+	 * @param res

+	 * @return

+	 */

+	public static String formatNs(long time, Resolution res) {

+		StringBuffer temp = new StringBuffer();

+		boolean neg = time < 0;

+		if (neg) {

+			time = -time;

+		}

+

+		// The following approach could be used although performance

+		// decreases in half.

+		// String strVal = String.format("%09d", time);

+		// String tmp = strVal.substring(strVal.length() - 9);

+

+		// number of segments to be included

+		int segments = 0;

+		switch (res) {

+		case MILLISEC:

+			segments = 1;

+			break;

+		case MICROSEC:

+			segments = 2;

+			break;

+		case NANOSEC:

+			segments = 3;

+			break;

+		default:

+			break;

+		}

+

+		long ns = time;

+		ns %= 1000000000;

+		if (ns < 10) {

+			temp.append("00000000");

+		} else if (ns < 100) {

+			temp.append("0000000");

+		} else if (ns < 1000) {

+			temp.append("000000");

+		} else if (ns < 10000) {

+			temp.append("00000");

+		} else if (ns < 100000) {

+			temp.append("0000");

+		} else if (ns < 1000000) {

+			temp.append("000");

+		} else if (ns < 10000000) {

+			temp.append("00");

+		} else if (ns < 100000000) {

+			temp.append("0");

+		}

+		temp.append(ns);

+

+		StringBuffer str = new StringBuffer();

+		if (segments > 0) {

+			// append ms

+			str.append(temp.substring(0, 3));

+		}

+		if (segments > 1) {

+			// append Micro secs

+			str.append(".");

+			str.append(temp.substring(3, 6));

+		}

+		if (segments > 2) {

+			// append Nano seconds

+			str.append(".");

+			str.append(temp.substring(6));

+		}

+

+		return str.toString();

+	}

+

+	static public int loadIntOption(String opt, int def, int min, int max) {

+		// int val =

+		// TraceUIPlugin.getDefault().getPreferenceStore().getInt(opt);

+		// if (0 == val)

+		// val = def;

+		// if (val < min)

+		// val = min;

+		// if (val > max)

+		// val = max;

+		return def;

+	}

+

+	// static public int loadIntOption(String opt) {

+	// int val = TraceUIPlugin.getDefault().getPreferenceStore().getInt(opt);

+	// return val;

+	// }

+

+	static public void saveIntOption(String opt, int val) {

+		// TraceUIPlugin.getDefault().getPreferenceStore().setValue(opt, val);

+	}

+

+	static ITimeEvent getFirstEvent(ITmfTimeAnalysisEntry thread) {

+		if (null == thread)

+			return null;

+		Vector<TimeEvent> list =   thread.getTraceEvents();

+		ITimeEvent event = null;

+		if (!list.isEmpty())

+			event = (ITimeEvent) list.get(0);

+		return event;

+	}

+

+	/**

+	 * N means: <list> <li>-1: Previous Event</li> <li>0: Current Event</li> <li>

+	 * 1: Next Event</li> <li>2: Previous Event when located in a non Event Area

+	 * </list>

+	 * 

+	 * @param thread

+	 * @param time

+	 * @param n

+	 * @return

+	 */

+	static ITimeEvent findEvent(ITmfTimeAnalysisEntry thread, long time, int n) {

+		if (null == thread)

+			return null;

+		List<TimeEvent> list = thread.getTraceEvents();

+		Iterator<TimeEvent> it = list.iterator();

+		ITimeEvent event = null;

+		ITimeEvent prevEvent = null;

+		ITimeEvent nextEvent = null;

+		if (it.hasNext()) {

+			event = (ITimeEvent) it.next();

+			long currStartTime = event.getTime();

+			long currEndTime = currStartTime + event.getDuration();

+

+			if (time < currStartTime) {

+				if (1 != n)

+					event = null;

+				return event;

+			}

+			while (it.hasNext()) {

+				currStartTime = event.getTime();

+				currEndTime = currStartTime + event.getDuration();

+				nextEvent = (ITimeEvent) it.next();

+

+				long nextEventTime = nextEvent.getTime();

+				currEndTime = currEndTime >= nextEventTime ? (nextEventTime - 1)

+						: currEndTime;

+

+//				Trace.debug("currStartTime: " + currStartTime

+//						+ " currEndTime: " + currEndTime + " nextEventTime: "

+//						+ nextEventTime + " time: " + time);

+				if (currStartTime <= time && time <= currEndTime) {

+					if (1 == n)

+						event = nextEvent;

+					else if (-1 == n)

+						event = prevEvent;

+					return event;

+				}

+

+				if (time > currEndTime && time < nextEventTime) {

+					//Located in a non Event area

+					if (2 == n || -1 == n) {

+						return event;

+					} else if (1 == n) {

+						return nextEvent;

+					}

+					return null;

+				}

+

+				prevEvent = event;

+				event = nextEvent;

+			}

+		}

+		if (1 == n)

+			event = null;

+		else if (-1 == n)

+			event = prevEvent;

+		return event;

+	}

+

+	// static public TRCPackage getPackage(Object element) {

+	// if (element instanceof TRCPackage)

+	// return (TRCPackage) element;

+	// if (element instanceof TRCClass)

+	// return ((TRCClass) element).getPackage();

+	// return null;

+	// }

+

+	// static public TRCObjectAllocationAnnotation getAllocationAnnotation(

+	// TRCClass cls) {

+	// TRCObjectAllocationAnnotation aa = null;

+	// EList list = cls.getAnnotations();

+	// int len = list.size();

+	// for (int i = 0; i < len; i++) {

+	// TRCAnnotation annotation = (TRCAnnotation) list.get(i);

+	// if (annotation instanceof TRCObjectAllocationAnnotation)

+	// aa = (TRCObjectAllocationAnnotation) annotation;

+	// }

+	// return aa;

+	// }

+

+	static public String fixMethodSignature(String sig) {

+		int pos = sig.indexOf('(');

+		if (pos >= 0) {

+			String ret = sig.substring(0, pos);

+			sig = sig.substring(pos);

+			sig = sig + " " + ret;

+		}

+		return sig;

+	}

+

+	static public String restoreMethodSignature(String sig) {

+		String ret = "";

+		int pos = sig.indexOf('(');

+		if (pos >= 0) {

+			ret = sig.substring(0, pos);

+			sig = sig.substring(pos + 1);

+		}

+		pos = sig.indexOf(')');

+		if (pos >= 0) {

+			sig = sig.substring(0, pos);

+		}

+		String args[] = sig.split(",");

+		sig = "(";

+		for (int i = 0; i < args.length; i++) {

+			String arg = args[i].trim();

+			if (arg.length() == 0 && args.length == 1)

+				break;

+			sig += getTypeSignature(arg);

+		}

+		sig += ")" + getTypeSignature(ret);

+		return sig;

+	}

+

+	static public String getTypeSignature(String type) {

+		int dim = 0;

+		for (int j = 0; j < type.length(); j++) {

+			if (type.charAt(j) == '[')

+				dim++;

+		}

+		int pos = type.indexOf('[');

+		if (pos >= 0)

+			type = type.substring(0, pos);

+		String sig = "";

+		for (int j = 0; j < dim; j++)

+			sig += "[";

+		if (type.equals("boolean"))

+			sig += "Z";

+		else if (type.equals("byte"))

+			sig += "B";

+		else if (type.equals("char"))

+			sig += "C";

+		else if (type.equals("short"))

+			sig += "S";

+		else if (type.equals("int"))

+			sig += "I";

+		else if (type.equals("long"))

+			sig += "J";

+		else if (type.equals("float"))

+			sig += "F";

+		else if (type.equals("double"))

+			sig += "D";

+		else if (type.equals("void"))

+			sig += "V";

+		else

+			sig += "L" + type.replace('.', '/') + ";";

+		return sig;

+	}

+

+	// static public boolean openSource(Object element) {

+	// if (element instanceof String) {

+	// final String pattern = (String) element;

+	// final int javaType = IJavaSearchConstants.METHOD;

+	// BusyIndicator.showWhile(Display.getDefault(), new Runnable() {

+	// public void run() {

+	// if (!OpenJavaSource.openSource(pattern, javaType,

+	// SearchEngine.createWorkspaceScope(), true)) {

+	// MessageDialog.openInformation(UIPlugin.getDefault()

+	// .getWorkbench().getActiveWorkbenchWindow()

+	// .getShell(), TraceMessages.TRC_MSGT, NLS.bind(

+	// TraceUIMessages._68, pattern));

+	// }

+	// }

+	// });

+	// }

+	// OpenSource.openSource(element);

+	// return true;

+	// }

+

+	// static public int getObjAge(TRCFullTraceObject obj, EList listGC) {

+	// int age = 0;

+	// double t0 = obj.getCreateTime();

+	// double t1 = obj.getCollectTime();

+	// int len = listGC.size();

+	// for (int j = 0; j < len; j++) {

+	// TRCGCEvent gcEvent = (TRCGCEvent) listGC.get(j);

+	// if (gcEvent.getType().equals("finish")) {

+	// double time = gcEvent.getTime();

+	// if (time <= t0)

+	// continue;

+	// if (t1 > 0 && time >= t1)

+	// break;

+	// age++;

+	// }

+	// }

+	// return age;

+	// }

+

+	static public int compare(double d1, double d2) {

+		if (d1 > d2)

+			return 1;

+		if (d1 < d2)

+			return 1;

+		return 0;

+	}

+

+	static public int compare(String s1, String s2) {

+		if (s1 != null && s2 != null)

+			return s1.compareToIgnoreCase(s2);

+		if (s1 != null)

+			return 1;

+		if (s2 != null)

+			return -1;

+		return 0;

+	}

+

+	// static public String formatPercent(int val, int max) {

+	// String s = max > 0 && max >= val ? TString

+	// .formatAsPercentage((double) val / (double) max) : "";

+	// return s;

+	// }

+}

diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/TmfEventsView.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/TmfEventsView.java
new file mode 100644
index 0000000..a02017b
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/TmfEventsView.java
@@ -0,0 +1,301 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.ui.views;
+
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
+import org.eclipse.linuxtools.tmf.experiment.TmfExperimentSelectedSignal;
+import org.eclipse.linuxtools.tmf.experiment.TmfExperimentUpdatedSignal;
+import org.eclipse.linuxtools.tmf.request.TmfDataRequest;
+import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler;
+import org.eclipse.linuxtools.tmf.signal.TmfTimeSynchSignal;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.TableItem;
+
+/**
+ * <b><u>TmfEventsView</u></b>
+ * <p>
+ *
+ * TODO: Implement me. Please.
+ * TODO: Handle column selection, sort, ... generically (nothing less...)
+ * TODO: Implement hide/display columns
+ */
+public class TmfEventsView extends TmfView {
+
+    public static final String ID = "org.eclipse.linuxtools.tmf.ui.views.events";
+
+    private TmfExperiment<TmfEvent> fExperiment;
+    private String fTitlePrefix;
+
+	// ------------------------------------------------------------------------
+    // Table data
+	// ------------------------------------------------------------------------
+
+    private Table fTable;
+
+    // Table column names
+    private final String TIMESTAMP_COLUMN = "Timestamp";
+    private final String SOURCE_COLUMN    = "Source";
+    private final String TYPE_COLUMN      = "Type";
+    private final String REFERENCE_COLUMN = "File";
+    private final String CONTENT_COLUMN   = "Content";
+    private final String[] columnProperties =  new String[] {
+    	TIMESTAMP_COLUMN,
+        SOURCE_COLUMN,
+        TYPE_COLUMN,
+        REFERENCE_COLUMN,
+        CONTENT_COLUMN
+    };
+
+    // Column data
+    private class ColumnData {
+        public final String header;
+        public final int    width;
+        public final int    alignment;
+
+        public ColumnData(String h, int w, int a) {
+            header = h;
+            width = w;
+            alignment = a;
+        }
+    };
+
+    private ColumnData[] columnData = new ColumnData[] {
+        new ColumnData(columnProperties[0], 100, SWT.LEFT),
+        new ColumnData(columnProperties[1], 100, SWT.LEFT),
+        new ColumnData(columnProperties[2], 100, SWT.LEFT),
+        new ColumnData(columnProperties[3], 100, SWT.LEFT),
+        new ColumnData(columnProperties[4], 100, SWT.LEFT)
+    };
+
+	// ------------------------------------------------------------------------
+    // Event cache
+	// ------------------------------------------------------------------------
+
+	private static final int DEFAULT_CACHE_SIZE = 1000;
+    private final int fCacheSize;
+    private TmfEvent[] cache = new TmfEvent[1];
+    private int cacheStartIndex = 0;
+    private int cacheEndIndex = 0;
+    
+	// ------------------------------------------------------------------------
+    // Constructor
+	// ------------------------------------------------------------------------
+
+    public TmfEventsView(int cacheSize) {
+    	super("TmfEventsView");
+    	fCacheSize = cacheSize;
+    }
+
+    public TmfEventsView() {
+    	this(DEFAULT_CACHE_SIZE);
+    }
+
+	// ------------------------------------------------------------------------
+    // ViewPart
+	// ------------------------------------------------------------------------
+
+    @SuppressWarnings("unchecked")
+	@Override
+	public void createPartControl(Composite parent) {
+    	
+    	// Create a virtual table
+    	// TODO: change SINGLE to MULTI line selection and adjust the selection listener
+        final int style = SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER | SWT.VIRTUAL;
+        fTable = new Table(parent, style);
+
+        // Set the table layout
+        GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);
+        fTable.setLayoutData(layoutData);
+
+        // Some cosmetic enhancements
+        fTable.setHeaderVisible(true);
+        fTable.setLinesVisible(true);
+
+        // Set the columns
+        createColumnHeaders(fTable);
+
+        // Handle the table item requests 
+        fTable.addSelectionListener(new SelectionAdapter() {
+
+        	@Override
+			public void widgetSelected(SelectionEvent e) {
+				TmfTimestamp ts = (TmfTimestamp) fTable.getSelection()[0].getData();
+				broadcast(new TmfTimeSynchSignal(fTable, ts));
+			}
+        });
+
+        // Handle the table item requests 
+        fTable.addListener(SWT.SetData, new Listener() {
+
+			public void handleEvent(Event event) {
+
+        		TableItem item = (TableItem) event.item;
+				final int index = fTable.indexOf(item);
+
+				// Note: this works because handleEvent() is called once for each row, in sequence  
+				if ((index >= cacheStartIndex ) && (index < cacheEndIndex)) {
+					int i = index - cacheStartIndex;
+					item.setText(extractItemFields(cache[i]));
+					item.setData(new TmfTimestamp(cache[i].getTimestamp()));
+					return;
+				}
+
+				TmfDataRequest<TmfEvent> request = new TmfDataRequest<TmfEvent>(TmfEvent.class, index, fCacheSize) {
+					@Override
+					public void handleData() {
+						TmfEvent[] tmpEvent = getData();
+						if ((tmpEvent != null) && (tmpEvent.length > 0)) {
+							cache = tmpEvent;
+							cacheStartIndex = index;
+							cacheEndIndex = index + tmpEvent.length;
+						}
+					}
+				};
+				fExperiment.sendRequest(request);
+		        request.waitForCompletion();
+				
+				if (cache[0] != null && cacheStartIndex == index) {
+					item.setText(extractItemFields(cache[0]));
+					item.setData(new TmfTimestamp(cache[0].getTimestamp()));
+				}
+				
+			}
+        });
+
+        fTable.setItemCount(0);
+    	fTitlePrefix = getTitle();
+
+    	// If an experiment is already selected, update the table
+    	fExperiment = (TmfExperiment<TmfEvent>) TmfExperiment.getCurrentExperiment();
+    	if (fExperiment != null) {
+    		experimentSelected(new TmfExperimentSelectedSignal<TmfEvent>(fTable, fExperiment));
+    	}
+    }
+
+	/**
+	 * @param table
+	 * 
+	 * FIXME: Add support for column selection
+	 */
+	protected void createColumnHeaders(Table table) {
+        for (int i = 0; i < columnData.length; i++) {
+            TableColumn column = new TableColumn(table, columnData[i].alignment, i);
+            column.setText(columnData[i].header);
+            column.setWidth(columnData[i].width);
+        }
+	}
+
+	/**
+	 * @param event
+	 * @return
+	 * 
+	 * FIXME: Add support for column selection
+	 */
+	protected String[] extractItemFields(TmfEvent event) {
+        String[] fields = new String[0];
+        if (event != null) {
+            fields = new String[] {
+				new Long(event.getTimestamp().getValue()).toString(),		
+				event.getSource().getSourceId().toString(),
+				event.getType().getTypeId().toString(),
+				event.getReference().getReference().toString(),
+				event.getContent().toString()
+            };
+		}
+		return fields;
+	}
+
+    /* (non-Javadoc)
+     * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
+     */
+    @Override
+	public void setFocus() {
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+	public String toString() {
+    	return "[TmfEventsView]";
+    }
+
+	// ------------------------------------------------------------------------
+    // Signal handlers
+	// ------------------------------------------------------------------------
+    
+	@SuppressWarnings("unchecked")
+	@TmfSignalHandler
+    public void experimentSelected(TmfExperimentSelectedSignal<TmfEvent> signal) {
+		// Update the trace reference
+    	fExperiment = (TmfExperiment<TmfEvent>) signal.getExperiment();
+    	setPartName(fTitlePrefix + " - " + fExperiment.getName());
+
+        // Perform the updates on the UI thread
+        fTable.getDisplay().asyncExec(new Runnable() {
+        	public void run() {
+        		// TODO: Potentially long operation. Add some feedback for the user
+       			fTable.setSelection(0);
+            	fTable.clearAll();
+				cacheStartIndex = cacheEndIndex = 0;	// Clear the cache
+            	fTable.setItemCount((int) fExperiment.getNbEvents());        
+        	}
+        });
+    }
+
+	@TmfSignalHandler
+    public void experimentUpdated(TmfExperimentUpdatedSignal signal) {
+        // Perform the refresh on the UI thread
+    	fTable.getDisplay().asyncExec(new Runnable() {
+			public void run() {
+				if (!fTable.isDisposed() && fExperiment != null) {
+			    	fTable.setItemCount((int) fExperiment.getNbEvents());        
+				}
+			}
+        });
+    }
+
+//    @TmfSignalHandler
+//    public void currentTimeUpdated(TmfTimeSynchSignal signal) {
+//    	if (signal.getSource() != fTable && fExperiment != null) {
+//    		final int index = (int) fExperiment.getRank(signal.getCurrentTime());
+//            // Perform the updates on the UI thread
+//            fTable.getDisplay().asyncExec(new Runnable() {
+//            	public void run() {
+//            		fTable.setSelection(index);
+//            		// The timestamp might not correspond to an actual event
+//            		// and the selection will point to the next experiment event.
+//            		// But we would like to display both the event before and
+//            		// after the selected timestamp.
+//            		// This works fine by default except when the selected event
+//            		// is the top displayed event. The following ensures that we
+//            		// always see both events.
+//            		if ((index > 0) && (index == fTable.getTopIndex())) {
+//            			fTable.setTopIndex(index - 1);
+//            		}
+//            	}
+//            });
+//    	}
+//    }
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/TmfView.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/TmfView.java
new file mode 100644
index 0000000..ba332c0
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/TmfView.java
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.ui.views;
+
+import org.eclipse.linuxtools.tmf.component.ITmfComponent;
+import org.eclipse.linuxtools.tmf.signal.TmfSignal;
+import org.eclipse.linuxtools.tmf.signal.TmfSignalManager;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.part.ViewPart;
+
+/**
+ * <b><u>TmfView</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public abstract class TmfView extends ViewPart implements ITmfComponent {
+
+	private final String fName;
+	
+	// ------------------------------------------------------------------------
+	// Constructor
+	// ------------------------------------------------------------------------
+
+	public TmfView(String viewName) {
+		super();
+		fName = viewName;
+		register();
+	}
+
+	// ------------------------------------------------------------------------
+	// ITmfComponent
+	// ------------------------------------------------------------------------
+
+	public String getName() {
+		return fName;
+	}
+	
+	public void register() {
+		TmfSignalManager.register(this);
+	}
+
+	public void deregister() {
+		TmfSignalManager.deregister(this);
+	}
+
+	public void broadcast(TmfSignal signal) {
+		TmfSignalManager.dispatchSignal(signal);
+	}
+
+	// ------------------------------------------------------------------------
+	// ViewPart
+	// ------------------------------------------------------------------------
+	
+	@Override
+	public void createPartControl(Composite parent) {
+		// TODO Auto-generated method stub
+	}
+
+	@Override
+	public void setFocus() {
+		// TODO Auto-generated method stub
+	}
+
+}
\ No newline at end of file
diff --git a/profiling/.classpath b/lttng/org.eclipse.linuxtools.tmf/.classpath
similarity index 100%
copy from profiling/.classpath
copy to lttng/org.eclipse.linuxtools.tmf/.classpath
diff --git a/lttng/org.eclipse.linuxtools.tmf/.project b/lttng/org.eclipse.linuxtools.tmf/.project
new file mode 100644
index 0000000..93ef706
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.tmf</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/lttng/org.eclipse.linuxtools.tmf/ChangeLog b/lttng/org.eclipse.linuxtools.tmf/ChangeLog
new file mode 100644
index 0000000..9df424b
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/ChangeLog
@@ -0,0 +1,3 @@
+2009-06-16  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Change provider from Ericsson to Eclipse.
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.tmf/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..2ea69c6
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/META-INF/MANIFEST.MF
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.linuxtools.tmf
+Bundle-Version: 0.2.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.tmf.TmfCorePlugin
+Bundle-Vendor: %Bundle-Vendor
+Require-Bundle: org.eclipse.core.runtime
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.linuxtools.tmf,
+ org.eclipse.linuxtools.tmf.component,
+ org.eclipse.linuxtools.tmf.event,
+ org.eclipse.linuxtools.tmf.experiment,
+ org.eclipse.linuxtools.tmf.parser,
+ org.eclipse.linuxtools.tmf.request,
+ org.eclipse.linuxtools.tmf.signal,
+ org.eclipse.linuxtools.tmf.trace
+Bundle-Localization: plugin
diff --git a/lttng/org.eclipse.linuxtools.tmf/build.properties b/lttng/org.eclipse.linuxtools.tmf/build.properties
new file mode 100644
index 0000000..4d2c734
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/build.properties
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               plugin.properties,\
+               .
diff --git a/lttng/org.eclipse.linuxtools.tmf/plugin.properties b/lttng/org.eclipse.linuxtools.tmf/plugin.properties
new file mode 100644
index 0000000..7e2b3cb
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/plugin.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.linuxtools.tmf
+Bundle-Vendor = Eclipse
+Bundle-Name = TMF - Tracing and Monitoring Framework (Incubation)
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/TmfCorePlugin.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/TmfCorePlugin.java
new file mode 100644
index 0000000..dbed10b
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/TmfCorePlugin.java
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf;
+
+import org.eclipse.core.runtime.Plugin;
+
+/**
+ * <b><u>TmfCorePlugin</u></b>
+ * <p>
+ * The activator class controls the plug-in life cycle
+ */
+public class TmfCorePlugin extends Plugin {
+
+	// ------------------------------------------------------------------------
+    // Attributes
+	// ------------------------------------------------------------------------
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.tmf";
+
+	// The shared instance
+	private static TmfCorePlugin plugin;
+	
+	// ------------------------------------------------------------------------
+    // Constructors
+	// ------------------------------------------------------------------------
+
+	/**
+	 * The constructor
+	 */
+	public TmfCorePlugin() {
+		plugin = this;
+	}
+
+	// ------------------------------------------------------------------------
+    // Accessors
+	// ------------------------------------------------------------------------
+
+    /**
+     * @return the shared instance
+     */
+    public static TmfCorePlugin getDefault() {
+        return plugin;
+    }
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/ITmfComponent.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/ITmfComponent.java
new file mode 100644
index 0000000..bcec39a
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/ITmfComponent.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.component;
+
+import org.eclipse.linuxtools.tmf.signal.TmfSignal;
+
+/**
+ * <b><u>ITmfComponent</u></b>
+ * <p>
+ * This is the basic interface of all the TMF components.
+ * <p>
+ *  Currently, it only addresses the inter-component signaling.
+ */
+public interface ITmfComponent {
+
+	/**
+	 * Get the component ID
+	 */
+	public String getName();
+
+	/**
+	 * Register to the signal manager
+	 */
+	public void register();
+
+	/**
+	 * De-register from the signal manager
+	 */
+	public void deregister();
+
+	/**
+	 * Broadcast a signal to all the interested listeners.
+	 * 
+	 * @param signal
+	 */
+	public void broadcast(TmfSignal signal);
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/ITmfDataProvider.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/ITmfDataProvider.java
new file mode 100644
index 0000000..23eefd3
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/ITmfDataProvider.java
@@ -0,0 +1,17 @@
+package org.eclipse.linuxtools.tmf.component;
+
+import org.eclipse.linuxtools.tmf.event.TmfData;
+import org.eclipse.linuxtools.tmf.request.TmfDataRequest;
+
+public interface ITmfDataProvider<T extends TmfData> {
+
+    /**
+     * Queues the request for processing.
+     * 
+     * If the request can't be serviced, it will fail (i.e. isFailed() will be set).
+     * 
+	 * @param request The request to process
+	 */
+	public void sendRequest(TmfDataRequest<T> request);
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfComponent.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfComponent.java
new file mode 100644
index 0000000..0a83127
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfComponent.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.component;
+
+import org.eclipse.linuxtools.tmf.signal.TmfSignal;
+import org.eclipse.linuxtools.tmf.signal.TmfSignalManager;
+
+/**
+ * <b><u>TmfComponent</u></b>
+ * <p>
+ * This is the base class of the TMF components.
+ * <p>
+ *  Currently, it only addresses the inter-component signaling.
+ */
+public abstract class TmfComponent implements ITmfComponent {
+
+	private final String fName;
+	
+	// ------------------------------------------------------------------------
+	// Constructor
+	// ------------------------------------------------------------------------
+
+	public TmfComponent(String name) {
+		fName = name;
+		register();
+	}
+
+	// ------------------------------------------------------------------------
+	// ITmfComponent
+	// ------------------------------------------------------------------------
+
+	public String getName() {
+		return fName;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.tmf.component.ITmfComponent#register()
+	 */
+	public void register() {
+		TmfSignalManager.register(this);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.tmf.component.ITmfComponent#deregister()
+	 */
+	public void deregister() {
+		TmfSignalManager.deregister(this);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.tmf.component.ITmfComponent#broadcast(org.eclipse.linuxtools.tmf.signal.TmfSignal)
+	 */
+	public void broadcast(TmfSignal signal) {
+		TmfSignalManager.dispatchSignal(signal);
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java
new file mode 100644
index 0000000..37ce867
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java
@@ -0,0 +1,281 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.component;
+
+import java.lang.reflect.Array;
+import java.util.Vector;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.SynchronousQueue;
+
+import org.eclipse.linuxtools.tmf.event.TmfData;
+import org.eclipse.linuxtools.tmf.request.ITmfDataRequest;
+import org.eclipse.linuxtools.tmf.request.TmfCoalescedDataRequest;
+import org.eclipse.linuxtools.tmf.request.TmfDataRequest;
+import org.eclipse.linuxtools.tmf.request.TmfRequestExecutor;
+import org.eclipse.linuxtools.tmf.signal.TmfEndSynchSignal;
+import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler;
+import org.eclipse.linuxtools.tmf.signal.TmfStartSynchSignal;
+import org.eclipse.linuxtools.tmf.trace.ITmfContext;
+
+/**
+ * <b><u>TmfProvider</u></b>
+ * <p>
+ * The TmfProvider<T> is a provider for a data of type <T>.
+ * <p>
+ * This abstract class implements the housekeeking methods to register/
+ * deregister the event provider and to handle generically the event requests.
+ * <p>
+ * The concrete class can either re-implement processRequest() entirely or
+ * just implement the hooks (initializeContext() and getNext()).
+ * <p>
+ * TODO: Add support for providing multiple data types.
+ */
+public abstract class TmfDataProvider<T extends TmfData> extends TmfComponent implements ITmfDataProvider<T> {
+
+	final protected Class<T> fType;
+
+	public static final int DEFAULT_QUEUE_SIZE = 1000;
+	protected final int fQueueSize;
+	protected final BlockingQueue<T> fDataQueue;
+	protected final TmfRequestExecutor fExecutor;
+
+	private Integer fSynchDepth;
+
+	// ------------------------------------------------------------------------
+	// Constructors
+	// ------------------------------------------------------------------------
+	
+	public TmfDataProvider(String name, Class<T> type) {
+		this(name, type, DEFAULT_QUEUE_SIZE);
+	}
+
+	protected TmfDataProvider(String name, Class<T> type, int queueSize) {
+		super(name);
+		fQueueSize = queueSize;
+		fType = type;
+		fDataQueue = (queueSize > 1) ? new LinkedBlockingQueue<T>(fQueueSize) : new SynchronousQueue<T>();
+
+		fExecutor = new TmfRequestExecutor();
+		fSynchDepth = 0;
+
+		TmfProviderManager.register(fType, this);
+	}
+
+	@Override
+	public void register() {
+		super.register();
+		TmfProviderManager.register(fType, this);
+	}
+
+	@Override
+	public void deregister() {
+		TmfProviderManager.deregister(fType, this);
+		fExecutor.stop();
+		super.deregister();
+	}
+
+	public int getQueueSize() {
+		return fQueueSize;
+	}
+
+	// ------------------------------------------------------------------------
+	// ITmfRequestHandler
+	// ------------------------------------------------------------------------
+
+	public void sendRequest(final TmfDataRequest<T> request) {
+
+		if (fSynchDepth > 0) {
+			// We are in coalescing mode: client should NEVER wait
+			// (otherwise we will have deadlock...)
+			coalesceDataRequest(request);
+		} else {
+			// Process the request immediately 
+			queueRequest(request);
+		}
+	}
+
+	/**
+	 * This method queues the coalesced requests.
+	 * 
+	 * @param thread
+	 */
+	private synchronized void fireRequests() {
+		for (TmfDataRequest<T> request : fPendingCoalescedRequests) {
+			queueRequest(request);
+		}
+		fPendingCoalescedRequests.clear();
+	}
+
+	// ------------------------------------------------------------------------
+	// Coalescing (primitive test...)
+	// ------------------------------------------------------------------------
+
+	protected Vector<TmfCoalescedDataRequest<T>> fPendingCoalescedRequests = new Vector<TmfCoalescedDataRequest<T>>();
+
+	protected synchronized void newCoalescedDataRequest(TmfDataRequest<T> request) {
+		TmfCoalescedDataRequest<T> coalescedRequest =
+			new TmfCoalescedDataRequest<T>(fType, request.getIndex(), request.getNbRequested(), request.getBlockize());
+		coalescedRequest.addRequest(request);
+		fPendingCoalescedRequests.add(coalescedRequest);
+	}
+
+	protected synchronized void coalesceDataRequest(TmfDataRequest<T> request) {
+		for (TmfCoalescedDataRequest<T> req : fPendingCoalescedRequests) {
+			if (req.isCompatible(request)) {
+				req.addRequest(request);
+				return;
+			}
+		}
+		newCoalescedDataRequest(request);
+	}
+
+	// ------------------------------------------------------------------------
+	// Request processing
+	// ------------------------------------------------------------------------
+
+	protected void queueRequest(final TmfDataRequest<T> request) {
+
+		// Process the request
+		Thread thread = new Thread() {
+
+			@Override
+			public void run() {
+
+				// Extract the generic information
+				int blockSize   = request.getBlockize();
+				int nbRequested = request.getNbRequested();
+			 
+				// Create the result buffer
+				Vector<T> result = new Vector<T>();
+				int nbRead = 0;
+
+				// Initialize the execution
+				ITmfContext context = armRequest(request);
+				if (context == null) {
+					request.fail();
+					return;
+				}
+
+				// Get the ordered events
+				T data = getNext(context);
+				while (data != null && !isCompleted(request, data, nbRead))
+				{
+					result.add(data);
+					if (++nbRead % blockSize == 0) {
+						pushData(request, result);
+					}
+					// To avoid an unnecessary read passed the last data requested
+					if (nbRead < nbRequested) {
+						data = getNext(context);
+					}
+				}
+				pushData(request, result);
+				request.done();
+			}
+		};
+		fExecutor.queueRequest(thread);
+	}
+
+	/**
+	 * Format the result data and forwards it to the requester.
+	 * Note: after handling, the data is *removed*.
+	 * 
+	 * @param request
+	 * @param data
+	 */
+	@SuppressWarnings("unchecked")
+	protected void pushData(ITmfDataRequest<T> request, Vector<T> data) {
+		synchronized(request) {
+			if (!request.isCompleted()) {
+				T[] result = (T[]) Array.newInstance(fType, data.size());
+				data.toArray(result);
+				request.setData(result);
+				request.handleData();
+				data.removeAllElements();
+			}
+		}
+	}
+
+	/**
+	 * Initialize the provider based on the request. The context is
+	 * provider specific and will be updated by getNext().
+	 * 
+	 * @param request
+	 * @return an application specific context; null if request can't be serviced
+	 */
+	public abstract ITmfContext armRequest(TmfDataRequest<T> request);
+	
+	/**
+	 * Return the next piece of data based on the context supplied. The context
+	 * would typically be updated for the subsequent read.
+	 * 
+	 * @param context
+	 * @return
+	 */
+	public T getNext(ITmfContext context) {
+		try {
+			T event = fDataQueue.take();
+			return event;
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	/**
+	 * Makes the generated result data available for getNext()
+	 * 
+	 * @param data
+	 */
+	public void queueResult(T data) {
+		try {
+			fDataQueue.put(data);
+		} catch (InterruptedException e1) {
+			e1.printStackTrace();
+		}
+	}
+
+	/**
+	 * Checks if the data meets the request completion criteria.
+	 * 
+	 * @param request
+	 * @param data
+	 * @return
+	 */
+	public boolean isCompleted(TmfDataRequest<T> request, T data, int nbRead) {
+		return request.isCompleted() || nbRead >= request.getNbRequested();
+	}
+
+	// ------------------------------------------------------------------------
+	// Signal handlers
+	// ------------------------------------------------------------------------
+
+	@TmfSignalHandler
+	public void startSynch(TmfStartSynchSignal signal) {
+		synchronized(fSynchDepth) {
+			fSynchDepth++;
+		}
+	}
+
+	@TmfSignalHandler
+	public void endSynch(TmfEndSynchSignal signal) {
+		synchronized(fSynchDepth) {
+			fSynchDepth--;
+			if (fSynchDepth == 0) {
+				fireRequests();
+			}
+		}
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java
new file mode 100644
index 0000000..70efad7
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.component;
+
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.request.TmfCoalescedEventRequest;
+import org.eclipse.linuxtools.tmf.request.TmfDataRequest;
+import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
+
+/**
+ * <b><u>TmfEventProvider</u></b>
+ * <p>
+ * Implement me. Please.
+ */
+public abstract class TmfEventProvider<T extends TmfEvent> extends TmfDataProvider<T> {
+
+	public TmfEventProvider(Class<T> type) {
+		super("TmfEventProvider", type);
+	}
+
+	public TmfEventProvider(Class<T> type, int queueSize) {
+		super("TmfEventProvider", type, queueSize);
+	}
+
+	@Override
+	public boolean isCompleted(TmfDataRequest<T> request, T data, int nbRead) {
+		boolean dataRequestCompleted = super.isCompleted(request, data, nbRead);
+		if (!dataRequestCompleted && request instanceof TmfEventRequest<?> && data != null) {
+			TmfTimestamp endTime = ((TmfEventRequest<?>) request).getRange().getEndTime();
+			return data.getTimestamp().compareTo(endTime, false) > 0;
+		}
+		return dataRequestCompleted;
+	}
+
+	@Override
+	protected synchronized void newCoalescedDataRequest(TmfDataRequest<T> request) {
+		if (request instanceof TmfEventRequest<?>) {
+			TmfEventRequest<T> eventRequest = (TmfEventRequest<T>) request;
+			TmfCoalescedEventRequest<T> coalescedRequest = 
+				new TmfCoalescedEventRequest<T>(fType, eventRequest.getRange(), eventRequest.getNbRequested(), eventRequest.getBlockize());
+			coalescedRequest.addRequest(eventRequest);
+			fPendingCoalescedRequests.add(coalescedRequest);
+		}
+		else {
+			super.newCoalescedDataRequest(request);
+		}
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfProviderManager.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfProviderManager.java
new file mode 100644
index 0000000..bb6769a
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfProviderManager.java
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.component;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.linuxtools.tmf.event.TmfData;
+
+/**
+ * <b><u>TmfProviderManager.java</u></b>
+ * <p>
+ * Singleton that keeps track of the event providers.
+ */
+public class TmfProviderManager {
+
+	// ------------------------------------------------------------------------
+	// Keeps track of the providers for each event type
+	// ------------------------------------------------------------------------
+	
+	private static Map<Class<? extends TmfData>, List<TmfDataProvider<? extends TmfData>>> fProviders =
+		   new HashMap<Class<? extends TmfData>, List<TmfDataProvider<? extends TmfData>>>();
+
+	/**
+	 * Registers [provider] as a provider of [eventType]
+	 * 
+	 * @param eventType
+	 * @param provider
+	 */
+	public static <T extends TmfData> void register(Class<T> eventType, TmfDataProvider<? extends TmfData> provider) {
+		if (fProviders.get(eventType) == null)
+			fProviders.put(eventType, new ArrayList<TmfDataProvider<? extends TmfData>>());
+		assert(fProviders.get(eventType) != null);
+		fProviders.get(eventType).add(provider);
+	}
+
+	/**
+	 * Re-registers [provider] as a provider of [eventType]
+	 * 
+	 * @param dataClass
+	 * @param provider
+	 */
+	public static <T extends TmfData> void deregister(Class<T> dataClass, TmfDataProvider<? extends TmfData> provider) {
+		List<TmfDataProvider<? extends TmfData>> list = fProviders.get(dataClass);
+		if (list != null) {
+			list.remove(provider);
+			if (list.size() == 0)
+				fProviders.remove(dataClass);
+		}
+	}
+
+	/**
+	 * Returns the list of components that provide [eventType]
+	 * 
+	 * @param dataClass
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	public static TmfDataProvider<? extends TmfData>[] getProviders(Class<? extends TmfData> dataClass) {
+		List<TmfDataProvider<? extends TmfData>> list = fProviders.get(dataClass);
+		if (list == null)
+			list = new ArrayList<TmfDataProvider<? extends TmfData>>(); 
+		TmfDataProvider<? extends TmfData>[] result = new TmfDataProvider[list.size()];
+		return list.toArray(result);
+	}
+
+	/**
+	 * Returns the list of components of type [providerType] that provide [eventType]
+	 * 
+	 * @param type
+	 * @param clazz
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	public static TmfDataProvider<? extends TmfData>[] getProviders(Class<? extends TmfData> dataClass, Class<? extends TmfDataProvider<? extends TmfData>> providerClass) {
+		if (providerClass == null) {
+			return getProviders(dataClass);
+		}
+		TmfDataProvider<? extends TmfData>[] list = getProviders(dataClass);
+		List<TmfDataProvider<? extends TmfData>> result = new ArrayList<TmfDataProvider<? extends TmfData>>();
+		if (list != null) {
+			for (TmfDataProvider<? extends TmfData> provider : list) {
+				if (provider.getClass() == providerClass) {
+					result.add(provider);
+				}
+			}
+		}
+		TmfDataProvider<? extends TmfData>[] array = new TmfDataProvider[result.size()];
+		return result.toArray(array);
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfData.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfData.java
new file mode 100644
index 0000000..b63d9bd
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfData.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.event;
+
+/**
+ * <b><u>TmfData</u></b>
+ * <p>
+ * This is just an empty base class for the data meant to navigate in the
+ * framework.
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public abstract class TmfData {
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEvent.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEvent.java
new file mode 100644
index 0000000..934d42e
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEvent.java
@@ -0,0 +1,175 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.event;
+
+/**
+ * <b><u>TmfEvent</u></b>
+ * <p>
+ * The basic event structure in the TMF. In its canonical form, an event has:
+ * <ul>
+ * <li> a normalized timestamp
+ * <li> a source (reporter)
+ * <li> a type
+ * <li> a content
+ * </ul>
+ * For convenience, a free-form reference field is also provided. It could be
+ * used as e.g. a location marker in the event stream to distinguish between
+ * otherwise identical events.
+ * 
+ * Notice that for performance reasons TmfEvent is NOT immutable. If a copy
+ * of the event is needed, use clone().
+ */
+public class TmfEvent extends TmfData implements Cloneable {
+
+    // ========================================================================
+    // Attributes
+    // ========================================================================
+
+	protected TmfTimestamp      fEffectiveTimestamp;
+	protected TmfTimestamp      fOriginalTimestamp;
+	protected TmfEventSource    fSource;
+	protected TmfEventType      fType;
+	protected TmfEventReference fReference;
+
+	// Content requires a reference to the parent event so it is initialized
+	// using setContent()
+	protected TmfEventContent   fContent;
+
+	// ========================================================================
+    // Constructors
+    // ========================================================================
+
+	/**
+	 * @param originalTS
+	 * @param effectiveTS
+	 * @param source
+	 * @param type
+	 * @param reference
+	 */
+	public TmfEvent(TmfTimestamp originalTS, TmfTimestamp effectiveTS,
+			TmfEventSource source, TmfEventType type, TmfEventReference reference)
+	{
+		fOriginalTimestamp  = originalTS;
+		fEffectiveTimestamp = effectiveTS;
+		fSource             = source;
+		fType               = type;
+		fReference          = reference;
+	}
+
+	/**
+	 * @param timestamp
+	 * @param source
+	 * @param type
+	 * @param reference
+	 */
+	public TmfEvent(TmfTimestamp timestamp, TmfEventSource source,
+			TmfEventType type, TmfEventReference reference)
+	{
+		this(timestamp, timestamp, source, type, reference);
+	}
+
+	/**
+	 * Copy constructor (shallow)
+	 * 
+	 * @param other
+	 */
+	public TmfEvent(TmfEvent other) {
+		assert(other != null);
+		fOriginalTimestamp  = other.fOriginalTimestamp;
+		fEffectiveTimestamp = other.fEffectiveTimestamp;
+		fSource    			= other.fSource;
+		fType      			= other.fType;
+		fContent   			= other.fContent;
+		fReference			= other.fReference;
+	}
+
+	@SuppressWarnings("unused")
+	private TmfEvent() {
+	}
+
+    // ========================================================================
+    // Accessors
+    // ========================================================================
+
+	/**
+	 * @return
+	 */
+	public TmfTimestamp getTimestamp() {
+		return fEffectiveTimestamp;
+	}
+
+	/**
+	 * @return
+	 */
+	public TmfTimestamp getOriginalTimestamp() {
+		return fOriginalTimestamp;
+	}
+
+	/**
+	 * @return
+	 */
+	public TmfEventSource getSource() {
+		return fSource;
+	}
+
+	/**
+	 * @return
+	 */
+	public TmfEventType getType() {
+		return fType;
+	}
+
+	/**
+	 * @return
+	 */
+	public void setContent(TmfEventContent content) {
+		fContent = content;
+	}
+
+	/**
+	 * @return
+	 */
+	public TmfEventContent getContent() {
+		return fContent;
+	}
+
+	/**
+	 * @return
+	 */
+	public TmfEventReference getReference() {
+		return fReference;
+	}
+
+    // ========================================================================
+    // Operators
+    // ========================================================================
+
+	@Override
+	public TmfEvent clone() {
+		TmfEvent event = new TmfEvent(
+			fOriginalTimestamp.clone(),
+			fEffectiveTimestamp.clone(),
+		    fSource.clone(),
+		    fType.clone(),
+		    fReference.clone());
+		TmfEventContent content = fContent.clone();
+		event.setContent(content);
+		return event;
+	}
+
+	// TODO: Design a proper format...
+	@Override
+	public String toString() {
+		return fEffectiveTimestamp.toString();
+	}
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventContent.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventContent.java
new file mode 100644
index 0000000..1a97c6c
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventContent.java
@@ -0,0 +1,151 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.event;
+
+
+/**
+ * <b><u>TmfEventContent</u></b>
+ * <p>
+ * The event content.
+ */
+public class TmfEventContent implements Cloneable {
+
+    // ========================================================================
+    // Attributes
+    // ========================================================================
+
+	protected TmfEvent fParentEvent = null;
+	protected Object   fRawContent  = null;
+	protected Object[] fFields      = null;
+
+    // ========================================================================
+    // Constructors
+    // ========================================================================
+
+	/**
+	 * @param parent
+	 * @param content
+	 */
+	public TmfEventContent(TmfEvent parent, Object content) {
+		fParentEvent = parent;
+		fRawContent  = content;
+	}
+
+    /**
+     * @param other
+     */
+    public TmfEventContent(TmfEventContent other) {
+    	assert(other != null);
+    	fParentEvent = other.fParentEvent;
+		fRawContent  = other.fRawContent;
+		fFields      = other.fFields;
+    }
+
+    @SuppressWarnings("unused")
+	private TmfEventContent() {
+    }
+
+    // ========================================================================
+    // Accessors
+    // ========================================================================
+
+	/**
+	 * @return the parent (containing) event
+	 */
+	public TmfEvent getEvent() {
+		return fParentEvent;
+	}
+
+	/**
+	 * @return the event type
+	 */
+	public TmfEventType getType() {
+		return fParentEvent.getType();
+	}
+
+	/**
+	 * @return the raw content
+	 */
+	public Object getContent() {
+		return fRawContent;
+	}
+
+	/**
+	 * Returns the list of fields in the same order as TmfEventType.getLabels()
+	 * 
+	 * @return the ordered set of fields (optional fields might be null)
+	 */
+	public Object[] getFields() {
+		if (fFields == null) {
+			parseContent();
+		}
+		return fFields;
+	}
+
+	/**
+	 * @param id
+	 * @return
+	 */
+	public Object getField(String id) throws TmfNoSuchFieldException {
+		if (fFields == null) {
+			parseContent();
+		}
+		return fFields[getType().getFieldIndex(id)];
+	}
+
+	/**
+	 * @param n
+	 * @return
+	 */
+	public Object getField(int n) {
+		if (fFields == null) {
+			parseContent();
+		}
+		if (n >= 0 && n < fFields.length)
+			return fFields[n];
+		return null;
+	}
+
+    // ========================================================================
+    // Operators
+    // ========================================================================
+
+	/**
+	 * Should be overridden (all fields are null by default)
+	 */
+	protected void parseContent() {
+		fFields = new Object[1];
+		fFields[0] = fRawContent;
+	}
+	
+	/**
+	 * Clone: shallow copy by default; override for deep copy.
+	 */
+    @Override
+    public TmfEventContent clone() {
+		return new TmfEventContent(this);
+    }
+
+    @Override
+	public String toString() {
+    	Object[] fields = getFields();
+    	String result = "[TmfEventContent(";
+    	for (int i = 0; i < fields.length; i++) {
+    		result += fields[i].toString() + ",";
+    	}
+    	result += ")]";
+
+    	return result;
+    }
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventField.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventField.java
new file mode 100644
index 0000000..9cbd789
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventField.java
@@ -0,0 +1,113 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.event;
+
+/**
+ * <b><u>TmfEventField</u></b>
+ * <p>
+ * A basic event field.
+ * 
+ * TODO: Add support for field hierarchy.
+ */
+public class TmfEventField implements Cloneable {
+
+    // ========================================================================
+    // Attributes
+    // ========================================================================
+
+	private final TmfEventContent fParent;
+    private final String fFieldId;
+    private       Object fValue;
+
+    // ========================================================================
+    // Constructors
+    // ========================================================================
+
+    /**
+     * @param parent
+     * @param id
+     * @param value
+     */
+    public TmfEventField(TmfEventContent parent, String id, Object value) {
+    	fParent  = parent;
+    	fFieldId = id;
+        fValue   = value;
+    }
+
+    /**
+     * @param other
+     */
+    public TmfEventField(TmfEventField other) {
+    	assert(other != null);
+    	fParent  = other.fParent;
+    	fFieldId = other.fFieldId;
+		fValue   = other.fValue;
+    }
+
+    @SuppressWarnings("unused")
+	private TmfEventField() {
+    	fParent  = null;
+    	fFieldId = null;
+        fValue   = null;
+    }
+
+    // ========================================================================
+    // Accessors
+    // ========================================================================
+
+    /**
+     * @return
+     */
+    public TmfEventContent getParent() {
+        return fParent;
+    }
+
+    /**
+     * @return
+     */
+    public String getId() {
+        return fFieldId;
+    }
+
+    /**
+     * @return
+     */
+    public Object getValue() {
+        return fValue;
+    }
+
+    /**
+     * @param value
+     */
+    protected void setValue(Object value) {
+        fValue = value;
+    }
+
+    // ========================================================================
+    // Operators
+    // ========================================================================
+
+	/**
+	 * Clone: shallow copy by default; override for deep copy.
+	 */
+    @Override
+    public TmfEventField clone() {
+    	return new TmfEventField(this);
+    }
+
+    @Override
+	public String toString() {
+        return "[TmfEventField(" + fFieldId + ":" + fValue.toString() + ")]";
+    }
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventReference.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventReference.java
new file mode 100644
index 0000000..40a2deb
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventReference.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.event;
+
+/**
+ * <b><u>TmfEventReference</u></b>
+ * <p>
+ * An application-defined event reference.
+ */
+public class TmfEventReference implements Cloneable {
+
+    // ========================================================================
+    // Attributes
+    // ========================================================================
+
+	protected Object fReference;
+
+    // ========================================================================
+    // Constructors
+    // ========================================================================
+
+	/**
+	 * 
+	 */
+	public TmfEventReference() {
+		this(null);
+	}
+
+	/**
+	 * @param reference
+	 */
+	public TmfEventReference(Object reference) {
+		fReference = reference;
+	}
+
+	/**
+	 * @param other
+	 */
+	public TmfEventReference(TmfEventReference other) {
+		this((other != null) ? other.fReference : null);
+	}
+
+    // ========================================================================
+    // Accessors
+    // ========================================================================
+
+	/**
+	 * @return
+	 */
+	public Object getReference() {
+		return fReference;
+	}
+
+    // ========================================================================
+    // Operators
+    // ========================================================================
+
+    @Override
+    public TmfEventReference clone() {
+    	return new TmfEventReference(this);
+    }
+
+    @Override
+    public String toString() {
+        return "[TmfEventReference(" + ((fReference != null) ? fReference.toString() : "null") + ")]";
+    }
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventSource.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventSource.java
new file mode 100644
index 0000000..4d6cb24
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventSource.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.event;
+
+/**
+ * <b><u>TmfEventSource</u></b>
+ * <p>
+ * The event source.
+ */
+public class TmfEventSource implements Cloneable {
+
+    // ========================================================================
+    // Attributes
+    // ========================================================================
+
+	protected Object fSourceId;
+
+    // ========================================================================
+    // Constructors
+    // ========================================================================
+
+    /**
+     * 
+     */
+    public TmfEventSource() {
+        this(null);
+    }
+
+	/**
+	 * @param sourceId
+	 */
+	public TmfEventSource(Object sourceId) {
+		fSourceId = sourceId;
+	}
+
+	/**
+	 * @param other
+	 */
+	public TmfEventSource(TmfEventSource other) {
+		this((other != null) ? other.fSourceId : null);
+	}
+
+    // ========================================================================
+    // Accessors
+    // ========================================================================
+
+	/**
+	 * @return
+	 */
+	public Object getSourceId() {
+		return fSourceId;
+	}
+
+	// ========================================================================
+    // Operators
+    // ========================================================================
+
+	@Override
+	public TmfEventSource clone() {
+		return new TmfEventSource(this);
+	}
+
+	@Override
+    public String toString() {
+        return "[TmfEventSource(" + ((fSourceId != null) ? fSourceId.toString() : "null") + ")]";
+    }
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventType.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventType.java
new file mode 100644
index 0000000..467910c
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventType.java
@@ -0,0 +1,137 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.event;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <b><u>TmfEventType</u></b>
+ * <p>
+ * The event type.
+ */
+public class TmfEventType implements Cloneable {
+
+    // ========================================================================
+    // Constants
+    // ========================================================================
+
+	public static final String DEFAULT_TYPE_ID  = "TMF Default Type";
+	public static final String[] DEFAULT_LABELS = new String[] { "Content" };
+	
+    // ========================================================================
+    // Attributes
+    // ========================================================================
+
+	private final String   fTypeId;
+	private final String[] fFieldLabels;
+	private final int      fNbFields;
+	private final Map<String, Integer> fFieldMap;
+
+	// ========================================================================
+    // Constructors
+    // ========================================================================
+
+	/**
+	 * 
+	 */
+	public TmfEventType() {
+		this(DEFAULT_TYPE_ID, DEFAULT_LABELS);
+	}
+
+	/**
+	 * @param type
+	 * @param format
+	 */
+	public TmfEventType(String typeId, String[] labels) {
+		assert(typeId != null);
+		assert(labels != null);
+		fTypeId      = typeId;
+		fFieldLabels = labels;
+		fNbFields    = fFieldLabels.length;
+		fFieldMap    = new HashMap<String, Integer>();
+		for (int i = 0; i < fNbFields; i++) {
+			fFieldMap.put(fFieldLabels[i], i);
+		}
+	}
+
+	/**
+	 * @param other
+	 */
+	public TmfEventType(TmfEventType other) {
+		assert(other != null);
+		fTypeId      = other.fTypeId;
+		fFieldLabels = other.fFieldLabels;
+		fNbFields    = other.fNbFields;
+		fFieldMap    = other.fFieldMap;
+	}
+
+    // ========================================================================
+    // Accessors
+    // ========================================================================
+
+	/**
+	 * @return
+	 */
+	public String getTypeId() {
+		return fTypeId;
+	}
+
+	/**
+	 * @return
+	 */
+	public int getNbFields() {
+		return fNbFields;
+	}
+
+	/**
+	 * @return
+	 */
+	public int getFieldIndex(String id) throws TmfNoSuchFieldException {
+		Integer index = fFieldMap.get(id);
+		if (index == null)
+			throw(new TmfNoSuchFieldException(id));
+		return index;
+	}
+
+	/**
+	 * @return
+	 */
+	public String[] getLabels() {
+		return fFieldLabels;
+	}
+
+	/**
+	 * @return
+	 */
+	public String getLabel(int i) {
+		if (i >= 0 && i < fNbFields)
+			return fFieldLabels[i];
+		return null;
+	}
+
+    // ========================================================================
+    // Operators
+    // ========================================================================
+
+    @Override
+    public TmfEventType clone() {
+    	return new TmfEventType(this);
+    }
+
+    @Override
+    public String toString() {
+    	return "[TmfEventType:" + fTypeId + "]";
+    }
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfNoSuchFieldException.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfNoSuchFieldException.java
new file mode 100644
index 0000000..e28e933
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfNoSuchFieldException.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.event;
+
+/**
+ * <b><u>TmfNoSuchFieldException</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfNoSuchFieldException extends Exception {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2504826473032522133L;
+
+	public TmfNoSuchFieldException(String message) {
+		super(message);
+	}
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTimeRange.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTimeRange.java
new file mode 100644
index 0000000..9c634ba
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTimeRange.java
@@ -0,0 +1,117 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.event;
+
+/**
+ * <b><u>TmfTimeRange</u></b>
+ * <p>
+ * A utility class to define time ranges.
+ */
+public class TmfTimeRange {
+
+    // ========================================================================
+    // Constants
+    // ========================================================================
+
+	public static TmfTimeRange Eternity = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
+	
+    // ========================================================================
+    // Attributes
+    // ========================================================================
+
+	private final TmfTimestamp fStartTime;
+	private final TmfTimestamp fEndTime;
+
+    // ========================================================================
+    // Constructors
+    // ========================================================================
+
+	/**
+	 * 
+	 */
+	@SuppressWarnings("unused")
+	private TmfTimeRange() {
+		fStartTime = null;
+		fEndTime   = null;
+	}
+
+	/**
+	 * @param startTime
+	 * @param endTime
+	 */
+	public TmfTimeRange(TmfTimestamp startTime, TmfTimestamp endTime) {
+		fStartTime = startTime;
+		fEndTime   = endTime;
+	}
+	
+	/**
+	 * @param other
+	 */
+	public TmfTimeRange(TmfTimeRange other) {
+		assert(other != null);
+		fStartTime = other.fStartTime;
+		fEndTime   = other.fEndTime;
+	}
+
+    @Override
+    public boolean equals(Object other) {
+    	if (other instanceof TmfTimeRange) {
+    		TmfTimeRange range = (TmfTimeRange) other;
+    		return range.fStartTime.equals(fStartTime) &&
+    		       range.fEndTime.equals(fEndTime);
+    	}
+    	return false;
+    }
+
+    // ========================================================================
+    // Accessors
+    // ========================================================================
+
+	/**
+	 * @return The time range start time
+	 */
+	public TmfTimestamp getStartTime() {
+		return fStartTime;
+	}
+
+	/**
+	 * @return The time range end time
+	 */
+	public TmfTimestamp getEndTime() {
+		return fEndTime;
+	}
+
+    // ========================================================================
+    // Predicates
+    // ========================================================================
+
+	/**
+	 * Check if the timestamp is within the time range
+	 * 
+	 * @param ts
+	 * @return
+	 */
+	public boolean contains(TmfTimestamp ts) {
+		boolean result = (fStartTime.compareTo(ts, true) <= 0) && (fEndTime.compareTo(ts, true) >= 0);
+		return result;
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return "[TmfTimeRange(" + fStartTime.toString() + ":" + fEndTime.toString() + ")]";
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTimestamp.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTimestamp.java
new file mode 100644
index 0000000..9172a5e
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTimestamp.java
@@ -0,0 +1,274 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.event;
+
+
+/**
+ * <b><u>TmfTimestamp</u></b>
+ * <p>
+ * The fundamental time reference in the TMF.
+ * <p>
+ * It provides a generic timestamp implementation in its most basic form:
+ * <ul>
+ * <li>an unstructured integer value
+ * <li>a time scale corresponding to the magnitude of the value wrt some
+ * application-specific base unit (e.g. the second)
+ * <li>a precision to indicate the error on the value (useful for comparing
+ * timestamps in different scales). Default: 0.
+ * </ul>
+ * To allow synchronization of timestamps from different reference clocks,
+ * there is a possibility to "adjust" the timestamp both by changing its scale
+ * (traces of different scale) and by adding an offset to its value (clock
+ * drift between traces).
+ * <p>
+ * Notice that the adjusted timestamp value could be negative e.g. for events
+ * that occurred before t0 wrt the reference clock.
+ * <p>
+ * Finally, notice that timestamps are immutable.
+ */
+public class TmfTimestamp implements Cloneable {
+
+	// ========================================================================
+    // Attributes
+    // ========================================================================
+
+    protected long fValue; 		// The timestamp value
+    protected byte fScale; 		// The time scale
+    protected long fPrecision; 	// The value precision (tolerance)
+
+    // ========================================================================
+    // Constants
+    // ========================================================================
+
+    // The beginning and end of time
+    public static final TmfTimestamp BigBang   = new TmfTimestamp(Long.MIN_VALUE, Byte.MAX_VALUE, 0);
+    public static final TmfTimestamp BigCrunch = new TmfTimestamp(Long.MAX_VALUE, Byte.MAX_VALUE, 0);
+    public static final TmfTimestamp Zero      = new TmfTimestamp(0, (byte) 0, 0);
+
+    // ========================================================================
+    // Constructors
+    // ========================================================================
+
+    /**
+     * Default constructor
+     */
+    public TmfTimestamp() {
+        this(0, (byte) 0, 0);
+    }
+
+    /**
+     * Simple constructor with value only
+     */
+    public TmfTimestamp(long value) {
+        this(value, (byte) 0, 0);
+    }
+
+    /**
+     * Simple constructor with value and scale
+     * 
+     * @param value
+     * @param scale
+     */
+    public TmfTimestamp(long value, byte scale) {
+        this(value, scale, 0);
+    }
+
+    /**
+     * Constructor with value, scale and precision
+     * 
+     * @param value
+     * @param scale
+     * @param precision
+     */
+    public TmfTimestamp(long value, byte scale, long precision) {
+        fValue = value;
+        fScale = scale;
+        fPrecision = Math.abs(precision);
+    }
+
+    /**
+     * Copy constructor
+     * 
+     * @param other
+     */
+    public TmfTimestamp(TmfTimestamp other) {
+    	assert(other != null);
+        fValue = other.fValue;
+        fScale = other.fScale;
+        fPrecision = other.fPrecision;
+    }
+
+    // ========================================================================
+    // Accessors
+    // ========================================================================
+
+    /**
+     * @return the timestamp value
+     */
+    public long getValue() {
+        return fValue;
+    }
+
+    /**
+     * @return the timestamp scale
+     */
+    public byte getScale() {
+        return fScale;
+    }
+
+    /**
+     * @return the timestamp value precision
+     */
+    public long getPrecision() {
+        return fPrecision;
+    }
+
+    // ========================================================================
+    // Operators
+    // ========================================================================
+
+    /**
+     * Return a shifted and scaled timestamp.
+     * 
+     * Limitation: The scaling is limited to MAX_SCALING orders of magnitude.
+     * The main reason is that the 64 bits value starts to lose any significance
+     * meaning beyond that scale difference and it's not even worth the trouble
+     * to switch to BigDecimal arithmetics.
+     * 
+     * @param offset
+     *            - the shift value (in the same scale as newScale)
+     * @param newScale
+     *            - the new scale
+     * @return The synchronized timestamp
+     */
+
+    /*
+     * A java <code>long</code> has a maximum of 19 significant digits.
+     * (-9,223,372,036,854,775,808 .. +9,223,372,036,854,775,807)
+     * 
+     * It is therefore useless to try to synchronize 2 timestamps whose
+     * difference in scale exceeds that value.
+     */
+    private static int MAX_SCALING = 19;
+
+    public TmfTimestamp synchronize(long offset, byte newScale) throws ArithmeticException {
+        long newValue = fValue;
+        long newPrecision = fPrecision;
+
+        // Determine the scaling factor
+        if (fScale != newScale) {
+            int scaleDiff = Math.abs(fScale - newScale);
+            // Let's try to be realistic...
+            if (scaleDiff > MAX_SCALING) {
+                throw new ArithmeticException("Scaling exception");
+            }
+            // Not pretty...
+            long scalingFactor = 1;
+            for (int i = 0; i < scaleDiff; i++) {
+                scalingFactor *= 10;
+            }
+            if (newScale < fScale) {
+                newValue *= scalingFactor;
+                newPrecision *= scalingFactor;
+            } else {
+                newValue /= scalingFactor;
+                newPrecision /= scalingFactor;
+            }
+        }
+
+        return new TmfTimestamp(newValue + offset, newScale, newPrecision);
+    }
+
+    /**
+     * Compute the adjustment, in the reference scale, needed to synchronize
+     * this timestamp with a reference timestamp.
+     * 
+     * @param reference
+     *            - the reference timestamp to synchronize with
+     * @return the adjustment term in the reference time scale
+     * @throws TmfNumericalException
+     */
+    public long getAdjustment(TmfTimestamp reference) throws ArithmeticException {
+        TmfTimestamp ts = synchronize(0, reference.fScale);
+        return reference.fValue - ts.fValue;
+    }
+
+    /**
+     * Compare with another timestamp
+     * 
+     * @param other
+     *            - the other timestamp
+     * @param withinPrecision
+     *            - indicates if precision is to be take into consideration
+     * @return -1: this timestamp is lower
+     *          0: timestamps are equal (within precision if requested)
+     *          1: this timestamp is higher
+     * @throws TmfNumericalException
+     */
+    public int compareTo(final TmfTimestamp other, boolean withinPrecision) {
+
+    	// If values have the same time scale, perform the comparison
+        if (fScale == other.fScale) {
+            if (withinPrecision) {
+                if ((fValue + fPrecision) < (other.fValue - other.fPrecision))
+                    return -1;
+                if ((fValue - fPrecision) > (other.fValue + other.fPrecision))
+                    return 1;
+                return 0;
+            }
+            return (fValue == other.fValue) ? 0 : (fValue < other.fValue) ? -1
+                    : 1;
+        }
+
+        // If values have different time scales, adjust to the finest one and
+        // then compare. If the scaling difference is too large, revert to
+        // some heuristics. Hopefully, nobody will try to compare galactic and
+        // quantic clock events...
+        byte newScale = (fScale < other.fScale) ? fScale : other.fScale;
+        try {
+            TmfTimestamp ts1 = this.synchronize(0, newScale);
+            TmfTimestamp ts2 = other.synchronize(0, newScale);
+            return ts1.compareTo(ts2, withinPrecision);
+        } catch (ArithmeticException e) {
+            if ((fValue == 0) || (other.fValue == 0)) {
+                return (fValue == other.fValue) ? 0
+                        : (fValue < other.fValue) ? -1 : 1;
+            }
+            if ((fValue > 0) && (other.fValue > 0)) {
+                return (fScale < other.fScale) ? -1 : 1;
+            }
+            if ((fValue < 0) && (other.fValue < 0)) {
+                return (fScale > other.fScale) ? -1 : 1;
+            }
+            return (fValue < 0) ? -1 : 1;
+        }
+    }
+
+	@Override
+	public TmfTimestamp clone() {
+		return new TmfTimestamp(this);
+	}
+
+    @Override
+    public boolean equals(Object other) {
+        if (other instanceof TmfTimestamp)
+            return compareTo((TmfTimestamp) other, false) == 0;
+        return super.equals(other);
+    }
+
+    @Override
+    public String toString() {
+    	return "[TmfTimestamp(" + fValue + "," + fScale + "," + fPrecision + ")]";
+    }
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTraceEvent.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTraceEvent.java
new file mode 100644
index 0000000..f030752
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTraceEvent.java
@@ -0,0 +1,129 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.event;
+
+/**
+ * <b><u>TmfTraceEvent</u></b>
+ * <p>
+ * A trace event associates a source code line to an event. The intent is to
+ * provide the capability to open an editor at the line of code that produced
+ * the event.
+ * <p>
+ * TODO: Concept is still a bit vague and should be aligned with the CDT
+ * source lookup service.
+ */
+public class TmfTraceEvent extends TmfEvent {
+
+    // ========================================================================
+    // Attributes
+    // ========================================================================
+
+    private final String fSourcePath;
+    private final String fFileName;
+    private final int    fLineNumber;
+
+    // ========================================================================
+    // Constructors
+    // ========================================================================
+
+	/**
+	 * @param originalTS
+	 * @param effectiveTS
+	 * @param source
+	 * @param type
+	 * @param content
+	 * @param reference
+	 * @param path
+	 * @param file
+	 * @param line
+	 */
+	public TmfTraceEvent(TmfTimestamp originalTS, TmfTimestamp effectiveTS, TmfEventSource source,
+			TmfEventType type, TmfEventReference reference,	String path, String file, int line)
+	{
+		super(originalTS, effectiveTS, source, type, reference);
+		fSourcePath = path;
+		fFileName   = file;
+		fLineNumber = line;
+	}
+
+	/**
+	 * @param timestamp
+	 * @param source
+	 * @param type
+	 * @param content
+	 * @param reference
+	 * @param path
+	 * @param file
+	 * @param line
+	 */
+	public TmfTraceEvent(TmfTimestamp timestamp, TmfEventSource source, TmfEventType type,
+			TmfEventReference reference, String path, String file, int line)
+	{
+		super(timestamp, source, type, reference);
+		fSourcePath = path;
+		fFileName   = file;
+		fLineNumber = line;
+	}
+
+	/**
+	 * @param other
+	 */
+	public TmfTraceEvent(TmfTraceEvent other) {
+		super(other);
+		fSourcePath = other.fSourcePath;
+		fFileName   = other.fFileName;
+		fLineNumber = other.fLineNumber;
+	}
+
+    // ========================================================================
+    // Accessors
+    // ========================================================================
+
+    /**
+     * @return
+     */
+    public String getSourcePath() {
+        return fSourcePath;
+    }
+
+    /**
+     * @return
+     */
+    public String getFileName() {
+        return fFileName;
+    }
+
+    /**
+     * @return
+     */
+    public int getLineNumber() {
+        return fLineNumber;
+    }
+
+    // ========================================================================
+    // Operators
+    // ========================================================================
+
+    // TODO: Deep copy
+    @Override
+    public TmfTraceEvent clone() {
+    	return new TmfTraceEvent(this);
+    }
+
+    // TODO: Proper format
+    @Override
+    public String toString() {
+    	return null;
+    }
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java
new file mode 100644
index 0000000..07ace5a
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java
@@ -0,0 +1,638 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.experiment;
+
+import java.util.Collections;
+import java.util.Vector;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.linuxtools.tmf.component.TmfEventProvider;
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.request.TmfDataRequest;
+import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
+import org.eclipse.linuxtools.tmf.signal.TmfRangeSynchSignal;
+import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler;
+import org.eclipse.linuxtools.tmf.trace.ITmfContext;
+import org.eclipse.linuxtools.tmf.trace.ITmfLocation;
+import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
+import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint;
+import org.eclipse.linuxtools.tmf.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.trace.TmfTraceUpdatedSignal;
+
+/**
+ * <b><u>TmfExperiment</u></b>
+ * <p>
+ * TmfExperiment presents a time-ordered, unified view of a set of TmfTraces
+ * that are part of a tracing experiment. 
+ * <p>
+ */
+public class TmfExperiment<T extends TmfEvent> extends TmfEventProvider<T> implements ITmfTrace {
+
+    // ------------------------------------------------------------------------
+    // Attributes
+    // ------------------------------------------------------------------------
+
+	// The currently selected experiment
+    private static TmfExperiment<?> fCurrentExperiment;
+
+	// The experiment ID
+    private String fExperimentId;
+
+    // The set of traces that constitute the experiment
+    private ITmfTrace[] fTraces;
+
+    // The total number of events
+    private long fNbEvents;
+
+    // The experiment time range
+    private TmfTimeRange fTimeRange;
+
+    // The experiment reference timestamp (default: BigBang)
+    private TmfTimestamp fEpoch;
+
+	// The experiment index
+	private Vector<TmfCheckpoint> fCheckpoints = new Vector<TmfCheckpoint>();
+
+    // ------------------------------------------------------------------------
+    // Constructors
+    // ------------------------------------------------------------------------
+
+    /**
+     * @param type
+     * @param id
+     * @param traces
+     * @param epoch
+     * @param indexPageSize
+     */
+    public TmfExperiment(Class<T> type, String id, ITmfTrace[] traces, TmfTimestamp epoch, int indexPageSize) {
+    	super(type);
+
+    	fExperimentId = id;
+    	fTraces = traces;
+    	fEpoch = epoch;
+    	fIndexPageSize = indexPageSize;
+
+		updateNbEvents();
+		updateTimeRange();
+    }
+
+    /**
+     * @param type
+     * @param id
+     * @param traces
+     */
+    public TmfExperiment(Class<T> type, String id, ITmfTrace[] traces) {
+        this(type, id, traces, TmfTimestamp.Zero, DEFAULT_INDEX_PAGE_SIZE);
+    }
+
+    /**
+     * @param type
+     * @param id
+     * @param traces
+     * @param indexPageSize
+     */
+    public TmfExperiment(Class<T> type, String id, ITmfTrace[] traces, int indexPageSize) {
+        this(type, id, traces, TmfTimestamp.Zero, indexPageSize);
+    }
+
+    /**
+     * 
+     */
+    @Override
+	public void deregister() {
+    	fTraces = null;
+    	fCheckpoints.clear();
+    	fCurrentExperiment= null;
+        super.deregister();
+    }
+
+    // ------------------------------------------------------------------------
+    // ITmfTrace accessors
+    // ------------------------------------------------------------------------
+
+	public String getPath() {
+		return null;
+	}
+
+	@Override
+	public String getName() {
+		return fExperimentId;
+	}
+
+	public long getNbEvents() {
+		return fNbEvents;
+	}
+
+    public int getCacheSize() {
+        return fIndexPageSize;
+    }
+
+	public TmfTimeRange getTimeRange() {
+		return fTimeRange;
+	}
+
+	public TmfTimestamp getStartTime() {
+		return fTimeRange.getStartTime();
+	}
+
+	public TmfTimestamp getEndTime() {
+		return fTimeRange.getEndTime();
+	}
+
+    public Vector<TmfCheckpoint> getCheckpoints() {
+    	return fCheckpoints;
+    }
+
+    // ------------------------------------------------------------------------
+    // Accessors
+    // ------------------------------------------------------------------------
+
+    public static TmfExperiment<?> getCurrentExperiment() {
+    	return fCurrentExperiment;
+    }
+
+    public TmfTimestamp getEpoch() {
+    	return fEpoch;
+    }
+
+    public ITmfTrace[] getTraces() {
+    	return fTraces;
+    }
+
+    /**
+     * Returns the rank of the first event with the requested timestamp.
+     * If none, returns the index of the next event (if any).
+     *  
+     * @param timestamp
+     * @return
+     */
+    public long getRank(TmfTimestamp timestamp) {
+    	TmfExperimentContext context = seekEvent(timestamp);
+    	return context.getRank();
+    }
+
+    /**
+     * Returns the timestamp of the event at the requested index.
+     * If none, returns null.
+     *  
+     * @param index
+     * @return
+     */
+    public TmfTimestamp getTimestamp(int index) {
+    	TmfExperimentContext context = seekEvent(index);
+    	TmfEvent event = getNextEvent(context);
+    	return (event != null) ? event.getTimestamp() : null;
+    }
+
+    // ------------------------------------------------------------------------
+    // Operators
+    // ------------------------------------------------------------------------
+
+    /**
+     * Update the total number of events
+     */
+    private void updateNbEvents() {
+    	int nbEvents = 0;
+    	for (ITmfTrace trace : fTraces) {
+    		nbEvents += trace.getNbEvents();
+    	}
+    	fNbEvents = nbEvents;
+    }
+
+    /**
+     * Update the global time range
+     */
+    private void updateTimeRange() {
+		TmfTimestamp startTime = fTimeRange != null ? fTimeRange.getStartTime() : TmfTimestamp.BigCrunch;
+		TmfTimestamp endTime   = fTimeRange != null ? fTimeRange.getEndTime()   : TmfTimestamp.BigBang;
+
+		for (ITmfTrace trace : fTraces) {
+    		TmfTimestamp traceStartTime = trace.getStartTime();
+    		if (traceStartTime.compareTo(startTime, true) < 0)
+    			startTime = traceStartTime;
+
+    		TmfTimestamp traceEndTime = trace.getEndTime();
+    		if (traceEndTime.compareTo(endTime, true) > 0)
+    			endTime = traceEndTime;
+    	}
+		fTimeRange = new TmfTimeRange(startTime, endTime);
+    }
+
+    // ------------------------------------------------------------------------
+    // TmfProvider
+    // ------------------------------------------------------------------------
+
+	@Override
+	public ITmfContext armRequest(TmfDataRequest<T> request) {
+		TmfTimestamp timestamp = (request instanceof TmfEventRequest<?>) ?
+			((TmfEventRequest<T>) request).getRange().getStartTime() : null;
+
+		TmfExperimentContext context = (timestamp != null) ? 
+			seekEvent(timestamp) : seekEvent(request.getIndex());
+
+		return context;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public T getNext(ITmfContext context) {
+		if (context instanceof TmfExperimentContext) {
+			return (T) getNextEvent((TmfExperimentContext) context);
+		}
+		return null;
+	}
+
+    // ------------------------------------------------------------------------
+    // ITmfTrace trace positioning
+    // ------------------------------------------------------------------------
+
+	// Returns a brand new context based on the location provided
+	// Arms the event queues
+	// NOTE: This is a fine example of pathological coupling...
+	public TmfExperimentContext seekLocation(ITmfLocation<?> location) {
+		
+		if (location instanceof TmfExperimentLocation || location == null) {
+			ITmfLocation<?>[] prvloc = (location != null) ? ((TmfExperimentLocation) location).getLocation() : new TmfExperimentLocation[fTraces.length];
+			ITmfLocation<?>[] newloc = new ITmfLocation[fTraces.length];
+			TmfContext[] contexts = new TmfContext[fTraces.length];
+
+			TmfExperimentContext context = new TmfExperimentContext(fTraces, contexts);
+			TmfEvent[] events = context.getEvents();
+
+			long rank = 0;
+			for (int i = 0; i < fTraces.length; i++) {
+				contexts[i] = fTraces[i].seekLocation(prvloc[i]);
+				newloc[i]   = contexts[i].getLocation();	// No clone here
+				events[i]   = fTraces[i].parseEvent(contexts[i]);
+				rank += contexts[i].getRank();
+			}
+			context.setLocation(new TmfExperimentLocation(newloc));
+			context.setRank(rank);
+			context.setLastTrace(-1);
+			return context;
+		}
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.tmf.trace.ITmfTrace#seekEvent(org.eclipse.linuxtools.tmf.event.TmfTimestamp)
+	 */
+	public TmfExperimentContext seekEvent(TmfTimestamp timestamp) {
+
+		if (timestamp == null) {
+    		timestamp = TmfTimestamp.BigBang;
+    	}
+
+    	// First, find the right checkpoint
+    	int index = Collections.binarySearch(fCheckpoints, new TmfCheckpoint(timestamp, null));
+
+        // In the very likely case that the checkpoint was not found, bsearch
+        // returns its negated would-be location (not an offset...). From that
+        // index, we can then position the stream and get the event.
+        if (index < 0) {
+            index = Math.max(0, -(index + 2));
+        }
+
+        // Position the experiment at the checkpoint
+        ITmfLocation<?> location;
+        synchronized (fCheckpoints) {
+        	if (fCheckpoints.size() > 0) {
+        		if (index >= fCheckpoints.size()) {
+        			index = fCheckpoints.size() - 1;
+        		}
+        		location = fCheckpoints.elementAt(index).getLocation();
+        	}
+        	else {
+        		location = null;
+        	}
+        }
+
+        TmfExperimentContext context = seekLocation(location);
+        context.setRank(index * fIndexPageSize);
+
+        // And locate the event
+        TmfExperimentContext nextEventContext = new TmfExperimentContext(context);
+        TmfEvent event = getNextEvent(nextEventContext);
+        while (event != null && event.getTimestamp().compareTo(timestamp, false) < 0) {
+        	event = getNextEvent(nextEventContext);
+        	context = new TmfExperimentContext(nextEventContext);
+        	if (event != null) context.updateRank(-1);
+        }
+    	context.setLastTrace(-1);
+
+        return context;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.tmf.trace.ITmfTrace#seekEvent(long)
+	 */
+	public TmfExperimentContext seekEvent(long rank) {
+
+        // Position the stream at the previous checkpoint
+        int index = (int) rank / fIndexPageSize;
+        ITmfLocation<?> location;
+        synchronized (fCheckpoints) {
+        	if (fCheckpoints.size() == 0) {
+        		location = null;
+        	}
+        	else {
+        		if (index >= fCheckpoints.size()) {
+        			index  = fCheckpoints.size() - 1;
+        		}
+        		location = fCheckpoints.elementAt(index).getLocation();
+        	}
+        }
+
+        TmfExperimentContext context = seekLocation(location);
+        long pos = index * fIndexPageSize;
+        context.setRank(pos);
+
+        // And locate the event
+        TmfExperimentContext nextEventContext = new TmfExperimentContext(context);
+        TmfEvent event = getNextEvent(nextEventContext);
+        while (event != null && pos++ < rank) {
+        	event = getNextEvent(nextEventContext);
+        	context = new TmfExperimentContext(nextEventContext);
+        	if (event != null) context.updateRank(-1);
+        }
+    	context.setLastTrace(-1);
+
+        return context;
+	}
+
+	/**
+	 * Scan the next events from all traces and return the next one
+	 * in chronological order.
+	 * 
+	 * @param context
+	 * @return
+	 */
+	public synchronized TmfEvent getNextEvent(TmfContext context) {
+
+		if (context instanceof TmfExperimentContext) {
+			TmfExperimentContext expContext = (TmfExperimentContext) context;
+			int lastTrace = expContext.getLastTrace();
+			if (lastTrace != -1) {
+				TmfContext traceContext = expContext.getContexts()[lastTrace];
+				expContext.getTraces()[lastTrace].getNextEvent(traceContext);
+				expContext.getEvents()[lastTrace] = expContext.getTraces()[lastTrace].parseEvent(traceContext);
+				TmfExperimentLocation expLocation = (TmfExperimentLocation) expContext.getLocation();
+				expLocation.getLocation()[lastTrace] = traceContext.getLocation().clone();
+			}
+
+			int trace = -1;
+			TmfTimestamp timestamp = TmfTimestamp.BigCrunch;
+			for (int i = 0; i < expContext.getTraces().length; i++) {
+				if (expContext.getEvents()[i] != null) {
+					if (expContext.getEvents()[i].getTimestamp() != null) {
+						TmfTimestamp otherTS = expContext.getEvents()[i].getTimestamp();
+						if (otherTS.compareTo(timestamp, true) < 0) {
+							trace = i;
+							timestamp = otherTS;
+						}
+					}
+				}
+			}
+			if (trace >= 0) {
+				TmfContext traceContext = expContext.getContexts()[trace];
+				expContext.getEvents()[trace] = expContext.getTraces()[trace].parseEvent(traceContext);
+				expContext.setLastTrace(trace);
+				expContext.updateRank(1);
+				return expContext.getEvents()[trace];
+			}
+		}
+			
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.tmf.trace.ITmfTrace#parseEvent(org.eclipse.linuxtools.tmf.trace.TmfContext)
+	 */
+	public TmfEvent parseEvent(TmfContext context) {
+		
+		if (context instanceof TmfExperimentContext) {
+			TmfExperimentContext expContext = (TmfExperimentContext) context;
+			int lastTrace = expContext.getLastTrace();
+			if (lastTrace != -1) {
+				TmfContext traceContext = expContext.getContexts()[lastTrace];
+				expContext.getTraces()[lastTrace].getNextEvent(traceContext);
+				expContext.getEvents()[lastTrace] = expContext.getTraces()[lastTrace].parseEvent(traceContext);
+				expContext.updateRank(1);
+				TmfExperimentLocation expLocation = (TmfExperimentLocation) expContext.getLocation();
+				expLocation.getLocation()[lastTrace] = traceContext.getLocation().clone();
+			}
+
+			int trace = -1;
+			TmfTimestamp timestamp = TmfTimestamp.BigCrunch;
+			for (int i = 0; i < expContext.getTraces().length; i++) {
+				if (expContext.getEvents()[i] != null) {
+					if (expContext.getEvents()[i].getTimestamp() != null) {
+						TmfTimestamp otherTS = expContext.getEvents()[i].getTimestamp();
+						if (otherTS.compareTo(timestamp, true) < 0) {
+							trace = i;
+							timestamp = otherTS;
+						}
+					}
+				}
+			}
+			if (trace >= 0) {
+				TmfContext traceLocation = expContext.getContexts()[trace];
+				expContext.getEvents()[trace] = expContext.getTraces()[trace].parseEvent(traceLocation);
+				expContext.setLastTrace(-1);
+				return expContext.getEvents()[trace];
+			}
+		}
+
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return "[TmfExperiment (" + fExperimentId + ")]";
+	}
+
+    // ------------------------------------------------------------------------
+    // Indexing
+    // ------------------------------------------------------------------------
+
+	/*
+	 * The experiment holds the globally ordered events of its set of traces.
+	 * It is expected to provide access to each individual event by index i.e.
+	 * it must be possible to request the Nth event of the experiment.
+	 * 
+	 * The purpose of the index is to keep the information needed to rapidly
+	 * restore the traces contexts at regular intervals (every INDEX_PAGE_SIZE
+	 * event).
+	 */
+
+	// The index page size
+	private static final int DEFAULT_INDEX_PAGE_SIZE = 1000;
+	private final int fIndexPageSize;
+
+	// Indicates that an indexing job is already running
+	private Boolean fIndexing = false;
+	private Boolean fIndexed  = false;
+
+	// The indexing job
+	private IndexingJob job;
+
+	/**
+	 * indexExperiment
+	 * 
+	 * Creates the experiment index.
+	 */
+	public void indexExperiment(boolean waitForCompletion) {
+
+		synchronized(fIndexing) {
+			if (fIndexed || fIndexing) {
+				// An indexing job is already running but a new request came
+				// in (probably due to a change in the trace set). The index
+				// being currently built is therefore already invalid.
+				// TODO: Cancel and restart the job
+				// TODO: Add support for dynamically adding/removing traces
+				return;
+			}
+			fIndexing = true;
+		}
+
+		job = new IndexingJob(fExperimentId);
+		job.schedule();
+
+    	if (waitForCompletion) {
+    		try {
+    			job.join();
+    		} catch (InterruptedException e) {
+    			e.printStackTrace();
+    		}
+    	}
+	}
+
+	private class IndexingJob extends Job {
+
+		public IndexingJob(String name) {
+			super(name);
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
+		 */
+		@Override
+		protected IStatus run(IProgressMonitor monitor) {
+
+			// Minimal check
+			if (fTraces.length == 0) {
+	            fIndexing = false;
+				return Status.OK_STATUS;
+			}
+
+			monitor.beginTask("Indexing " + fExperimentId, IProgressMonitor.UNKNOWN);
+
+            int nbEvents = 0;
+            TmfTimestamp startTime = null;
+            TmfTimestamp lastTime  = null;
+
+            // Reset the index
+            fCheckpoints = new Vector<TmfCheckpoint>();
+            
+            try {
+            	// Position the trace at the beginning
+            	TmfExperimentContext context = seekLocation(null);
+            	TmfExperimentLocation location = (TmfExperimentLocation) context.getLocation().clone();
+
+                // Get the first event
+               	TmfEvent event = getNextEvent(context);
+               	if (event != null) {
+                    startTime = new TmfTimestamp(event.getTimestamp());
+               	}
+
+               	// Index the experiment
+               	while (event != null) {
+                	lastTime = event.getTimestamp();
+           			if ((nbEvents++ % fIndexPageSize) == 0) {
+           				fCheckpoints.add(new TmfCheckpoint(lastTime, location.clone()));
+                   		fNbEvents = nbEvents;
+                   		fTimeRange = new TmfTimeRange(startTime, lastTime);
+                   		notifyListeners(new TmfTimeRange(startTime, lastTime));
+
+                        monitor.worked(1);
+
+                        // Check monitor *after* fCheckpoints has been updated
+                        if (monitor.isCanceled()) {
+                            monitor.done();
+                        	return Status.CANCEL_STATUS;
+                        }
+                    }
+
+                    // We will need the contexts at the next iteration
+                    if ((nbEvents % fIndexPageSize) == 0) {
+                        location = (TmfExperimentLocation) context.getLocation();
+           			}
+
+           			event = getNextEvent(context);
+                }
+
+            }
+            finally {
+                synchronized(this) {
+                	fNbEvents = nbEvents;
+                	fTimeRange = new TmfTimeRange(startTime, lastTime);
+                	fIndexing = false;
+                	fIndexed = true;
+                }
+                monitor.done();
+            }
+
+            return Status.OK_STATUS;
+		}
+    }
+
+    protected void notifyListeners(TmfTimeRange range) {
+    	broadcast(new TmfRangeSynchSignal(this, range, null));
+	}
+   
+    // ------------------------------------------------------------------------
+    // Signal handlers
+    // ------------------------------------------------------------------------
+
+    @TmfSignalHandler
+    public void experimentSelected(TmfExperimentSelectedSignal<T> signal) {
+		fCurrentExperiment = signal.getExperiment();
+//    	if (signal.getExperiment() == this) {
+//    		indexExperiment(true);
+//    	}
+    }
+
+    @TmfSignalHandler
+    public void experimentUpdated(TmfExperimentUpdatedSignal signal) {
+//    	indexExperiment(true);
+    }
+
+    @TmfSignalHandler
+    public void traceUpdated(TmfTraceUpdatedSignal signal) {
+    	// TODO: Incremental index update
+    	synchronized(this) {
+    		updateNbEvents();
+    		updateTimeRange();
+    	}
+		broadcast(new TmfExperimentUpdatedSignal(this, this, signal.getTrace()));
+    }
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentCheckpoint.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentCheckpoint.java
new file mode 100644
index 0000000..926bb73
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentCheckpoint.java
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.experiment;
+
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.trace.TmfContext;
+
+/**
+ * <b><u>TmfExperimentCheckpoint</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfExperimentCheckpoint implements Comparable<TmfExperimentCheckpoint> {
+
+    // ------------------------------------------------------------------------
+    // Attributes
+    // ------------------------------------------------------------------------
+    
+    private final TmfTimestamp fTimestamp;
+    private final TmfContext[] fContexts;
+
+    // ------------------------------------------------------------------------
+    // Constructors
+    // ------------------------------------------------------------------------
+
+    /**
+     * @param ts
+     * @param location
+     */
+    public TmfExperimentCheckpoint(TmfTimestamp ts, TmfContext[] contexts) {
+        fTimestamp = ts;
+        fContexts = contexts;
+    }
+
+    // ------------------------------------------------------------------------
+    // Accessors
+    // ------------------------------------------------------------------------
+
+    /**
+     * @return the checkpoint event timestamp
+     */
+    public TmfTimestamp getTimestamp() {
+        return fTimestamp;
+    }
+
+    /**
+     * @return the checkpoint event stream location
+     */
+    public TmfContext[] getContexts() {
+        return fContexts;
+    }
+
+    // ------------------------------------------------------------------------
+    // Comparable
+    // ------------------------------------------------------------------------
+
+	public int compareTo(TmfExperimentCheckpoint other) {
+		return fTimestamp.compareTo(other.fTimestamp, false);
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentContext.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentContext.java
new file mode 100644
index 0000000..1f4d39a
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentContext.java
@@ -0,0 +1,99 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.experiment;
+
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.trace.ITmfLocation;
+import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
+import org.eclipse.linuxtools.tmf.trace.TmfContext;
+
+/**
+ * <b><u>TmfExperimentContext</u></b>
+ * <p>
+ * Implement me. Please.
+ */
+public class TmfExperimentContext extends TmfContext {
+
+	private ITmfTrace[]  fTraces = new ITmfTrace[0];
+	private TmfContext[] fContexts;
+	private TmfEvent[]   fEvents;
+	private int lastIndex;
+
+	// ------------------------------------------------------------------------
+	// Constructors
+	// ------------------------------------------------------------------------
+
+	public TmfExperimentContext(ITmfTrace[] traces, TmfContext[] contexts) {
+		super();
+		fTraces   = traces;
+		fContexts = contexts;
+		fEvents   = new TmfEvent[fTraces.length];
+
+		ITmfLocation<?>[] locations = new ITmfLocation[fTraces.length];
+		long rank = 0;
+		for (int i = 0; i < fTraces.length; i++) {
+			if (contexts[i] != null) {
+				locations[i] = contexts[i].getLocation();
+				rank += contexts[i].getRank();
+			}
+		}
+		
+		setLocation(new TmfExperimentLocation(locations));
+		setRank(rank);
+		lastIndex = -1;
+	}
+
+	public TmfExperimentContext(ITmfTrace[] traces) {
+		this(traces, new TmfContext[traces.length]);
+	}
+
+	public TmfExperimentContext(TmfExperimentContext other) {
+		this(other.fTraces, other.cloneContexts());
+		fEvents = other.fEvents;
+		setLocation(other.getLocation().clone());
+		setRank(other.getRank());
+		setLastTrace(other.lastIndex);
+	}
+
+	private TmfContext[] cloneContexts() {
+		TmfContext[] contexts = new TmfContext[fContexts.length];
+		for (int i = 0; i < fContexts.length; i++)
+			contexts[i] = fContexts[i].clone();
+		return contexts;
+	}
+
+	// ------------------------------------------------------------------------
+	// Accessors
+	// ------------------------------------------------------------------------
+
+	public ITmfTrace[] getTraces() {
+		return fTraces;
+	}
+
+	public TmfContext[] getContexts() {
+		return fContexts;
+	}
+
+	public TmfEvent[] getEvents() {
+		return fEvents;
+	}
+
+	public int getLastTrace() {
+		return lastIndex;
+	}
+
+	public void setLastTrace(int newIndex) {
+		lastIndex = newIndex;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentLocation.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentLocation.java
new file mode 100644
index 0000000..d24d809
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentLocation.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.experiment;
+
+import org.eclipse.linuxtools.tmf.trace.ITmfLocation;
+import org.eclipse.linuxtools.tmf.trace.TmfLocation;
+
+/**
+ * <b><u>TmfExperimentLocation</u></b>
+ * <p>
+ * The experiment location is the set of its traces' locations.
+ */
+public class TmfExperimentLocation extends TmfLocation<ITmfLocation<?>[]> {
+
+	public TmfExperimentLocation(ITmfLocation<?>[] locations) {
+		super(locations);
+	}
+
+	@Override
+	public TmfExperimentLocation clone() {
+		ITmfLocation<?>[] locations = (ITmfLocation<?>[]) getLocation();
+		ITmfLocation<?>[] clones = new ITmfLocation[locations.length];
+		for (int i = 0; i < locations.length; i++) {
+			clones[i] = locations[i].clone();
+		}
+		return new TmfExperimentLocation(clones);
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentSelectedSignal.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentSelectedSignal.java
new file mode 100644
index 0000000..6aafbaa
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentSelectedSignal.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.experiment;
+
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.signal.TmfSignal;
+
+/**
+ * <b><u>TmfExperimentSelectedSignal</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfExperimentSelectedSignal<T extends TmfEvent> extends TmfSignal {
+
+	private final TmfExperiment<T> fExperiment;
+	
+	public TmfExperimentSelectedSignal(Object source, TmfExperiment<T> experiment) {
+		super(source);
+		fExperiment = experiment;
+	}
+
+	public TmfExperiment<? extends TmfEvent> getExperiment() {
+		return fExperiment;
+	}
+
+	@Override
+	public String toString() {
+		return "[TmfExperimentSelectedSignal (" + fExperiment.getName() + ")]";
+	}
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentUpdatedSignal.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentUpdatedSignal.java
new file mode 100644
index 0000000..d01bddd
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentUpdatedSignal.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.experiment;
+
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.signal.TmfSignal;
+import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
+
+/**
+ * <b><u>TmfExperimentUpdatedSignal</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfExperimentUpdatedSignal extends TmfSignal {
+
+	private final TmfExperiment<? extends TmfEvent> fExperiment;
+	private final ITmfTrace fTrace;
+	
+	public TmfExperimentUpdatedSignal(Object source, TmfExperiment<? extends TmfEvent> experiment, ITmfTrace trace) {
+		super(source);
+		fExperiment = experiment;
+		fTrace = trace;
+	}
+
+	public TmfExperiment<? extends TmfEvent> getExperiment() {
+		return fExperiment;
+	}
+
+	public ITmfTrace getTrace() {
+		return fTrace;
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return "[TmfExperimentUpdatedSignal (" + fExperiment.toString() + ", " + fTrace.toString() + ")]";
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/parser/ITmfEventParser.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/parser/ITmfEventParser.java
new file mode 100644
index 0000000..fc6e699
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/parser/ITmfEventParser.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.parser;
+
+import java.io.IOException;
+
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
+import org.eclipse.linuxtools.tmf.trace.TmfContext;
+
+/**
+ * <b><u>ITmfEventParser</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public interface ITmfEventParser {
+
+    /**
+     * @return
+     * @throws IOException 
+     */
+    public TmfEvent parseNextEvent(ITmfTrace stream, TmfContext context) throws IOException;
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/ITmfDataRequest.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/ITmfDataRequest.java
new file mode 100644
index 0000000..32ae0d8
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/ITmfDataRequest.java
@@ -0,0 +1,96 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.request;
+
+import org.eclipse.linuxtools.tmf.event.TmfData;
+
+/**
+ * <b><u>ITmfDataRequest</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public interface ITmfDataRequest<T extends TmfData> {
+
+	// ------------------------------------------------------------------------
+	// Accessors
+	// ------------------------------------------------------------------------
+
+    /**
+     * @return request data type (T)
+     */
+    public Class<T> getDataType();
+
+    /**
+     * @return request ID
+     */
+    public long getRequestId();
+
+    /**
+	 * @return the index of the first event requested
+     */
+    public int getIndex();
+
+    /**
+     * @return the number of requested events
+     */
+    public int getNbRequested();
+
+    /**
+     * @return the block size
+     */
+    public int getBlockize();
+
+    /**
+     * @return the number of events read so far
+     */
+    public int getNbRead();
+
+	// ------------------------------------------------------------------------
+	// Request state
+	// ------------------------------------------------------------------------
+
+    public boolean isCompleted();
+    public boolean isFailed();
+    public boolean isCancelled();
+
+	// ------------------------------------------------------------------------
+	// Data handling
+	// ------------------------------------------------------------------------
+
+    public void setData(T[] data);
+    public T[] getData();
+    public void handleData();
+
+	// ------------------------------------------------------------------------
+	// Request handling
+	// ------------------------------------------------------------------------
+
+    public void handleCompleted();
+    public void handleSuccess();
+    public void handleFailure();
+    public void handleCancel();
+
+    /**
+     * To suspend the client thread until the request completes
+     * (or is canceled).
+     */
+    public void waitForCompletion();
+
+	// ------------------------------------------------------------------------
+	// Request state modifiers
+	// ------------------------------------------------------------------------
+
+    public void done();
+    public void fail();
+    public void cancel();
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/ITmfEventRequest.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/ITmfEventRequest.java
new file mode 100644
index 0000000..9f14f3e
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/ITmfEventRequest.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.request;
+
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+
+/**
+ * <b><u>ITmfEventRequest</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public interface ITmfEventRequest<T extends TmfEvent> extends ITmfDataRequest<T> {
+
+    /**
+     * @return the requested time range
+     */
+    public TmfTimeRange getRange();
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java
new file mode 100644
index 0000000..f47b6f5
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java
@@ -0,0 +1,145 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.request;
+
+import java.util.Vector;
+
+import org.eclipse.linuxtools.tmf.event.TmfData;
+
+/**
+ * <b><u>TmfCoalescedDataRequest</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfCoalescedDataRequest<T extends TmfData> extends TmfDataRequest<T> {
+
+    // ------------------------------------------------------------------------
+    // Attributes
+    // ------------------------------------------------------------------------
+
+	protected Vector<TmfDataRequest<T>> fRequests = new Vector<TmfDataRequest<T>>();
+
+    // ------------------------------------------------------------------------
+    // Constructor
+    // ------------------------------------------------------------------------
+
+    /**
+     * Default constructor
+     */
+    public TmfCoalescedDataRequest(Class<T> dataType) {
+        this(dataType, 0, ALL_DATA, DEFAULT_BLOCK_SIZE);
+    }
+
+    /**
+     * @param nbRequested
+     */
+    public TmfCoalescedDataRequest(Class<T> dataType, int index) {
+        this(dataType, index, ALL_DATA, DEFAULT_BLOCK_SIZE);
+    }
+
+    /**
+     * @param index
+     * @param nbRequested
+     */
+    public TmfCoalescedDataRequest(Class<T> dataType, int index, int nbRequested) {
+        this(dataType, index, nbRequested, DEFAULT_BLOCK_SIZE);
+    }
+
+    /**
+     * @param index
+     * @param nbRequested
+     * @param blockSize
+     */
+    public TmfCoalescedDataRequest(Class<T> dataType, int index, int nbRequested, int blockSize) {
+        super(dataType, index, nbRequested, blockSize);
+    }
+
+    // ------------------------------------------------------------------------
+    // Management
+    // ------------------------------------------------------------------------
+
+	public void addRequest(TmfDataRequest<T> request) {
+		fRequests.add(request);
+	}
+
+	public boolean isCompatible(TmfDataRequest<T> request) {
+
+		boolean ok = request.getIndex() == getIndex();;
+		ok &= request.getNbRequested() == getNbRequested();
+		ok &= request.getBlockize() == getBlockize();
+		
+		return ok;
+	}
+
+    // ------------------------------------------------------------------------
+    // ITmfDataRequest
+    // ------------------------------------------------------------------------
+
+    @Override
+	public void handleData() {
+    	for (TmfDataRequest<T> request : fRequests) {
+    		request.setData(getData());
+    		request.handleData();
+    	}
+    }
+
+    @Override
+    public void handleCompleted() {
+    	for (TmfDataRequest<T> request : fRequests) {
+    		request.handleCompleted();
+    	}
+    }
+
+    @Override
+    public void handleSuccess() {
+    	for (TmfDataRequest<T> request : fRequests) {
+    		request.handleSuccess();
+    	}
+    }
+
+    @Override
+    public void handleFailure() {
+    	for (TmfDataRequest<T> request : fRequests) {
+    		request.handleFailure();
+    	}
+    }
+
+    @Override
+    public void handleCancel() {
+    	for (TmfDataRequest<T> request : fRequests) {
+    		request.handleCancel();
+    	}
+    }
+
+    @Override
+    public void done() {
+    	for (TmfDataRequest<T> request : fRequests) {
+    		request.done();
+    	}
+    }
+
+    @Override
+    public void fail() {
+    	for (TmfDataRequest<T> request : fRequests) {
+    		request.fail();
+    	}
+    }
+
+    @Override
+    public void cancel() {
+    	for (TmfDataRequest<T> request : fRequests) {
+    		request.cancel();
+    	}
+    }
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java
new file mode 100644
index 0000000..2caab92
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java
@@ -0,0 +1,90 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.request;
+
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+
+/**
+ * <b><u>TmfCoalescedEventRequest</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfCoalescedEventRequest<T extends TmfEvent> extends TmfCoalescedDataRequest<T> implements ITmfEventRequest<T> {
+
+    // ------------------------------------------------------------------------
+    // Attributes
+    // ------------------------------------------------------------------------
+
+	private final TmfTimeRange fRange;	// The requested events time range
+
+    // ------------------------------------------------------------------------
+    // Constructor
+    // ------------------------------------------------------------------------
+
+    /**
+     * @param range
+     */
+    public TmfCoalescedEventRequest(Class<T> dataType) {
+        this(dataType, TmfTimeRange.Eternity, ALL_DATA, DEFAULT_BLOCK_SIZE);
+    }
+
+    /**
+     * @param range
+     */
+    public TmfCoalescedEventRequest(Class<T> dataType, TmfTimeRange range) {
+        this(dataType, range, ALL_DATA, DEFAULT_BLOCK_SIZE);
+    }
+
+    /**
+     * @param range
+     * @param nbRequested
+     */
+    public TmfCoalescedEventRequest(Class<T> dataType, TmfTimeRange range, int nbRequested) {
+        this(dataType, range, nbRequested, DEFAULT_BLOCK_SIZE);
+    }
+    
+    /**
+     * @param range
+     * @param nbRequested
+     * @param blockSize Size of the largest blocks expected
+     */
+    public TmfCoalescedEventRequest(Class<T> dataType, TmfTimeRange range, int nbRequested, int blockSize) {
+    	super(dataType, 0, nbRequested, blockSize);
+    	fRange = range;
+    }
+
+    // ------------------------------------------------------------------------
+    // Management
+    // ------------------------------------------------------------------------
+
+	@Override
+	public boolean isCompatible(TmfDataRequest<T> request) {
+		if (request instanceof TmfEventRequest<?>) {
+			boolean ok = getNbRequested() == request.getNbRequested();
+			ok &= getBlockize() == request.getBlockize();
+			ok &= fRange.equals(((TmfEventRequest<T>) request).getRange());
+			return ok;
+		}
+		return false;
+	}
+
+    // ------------------------------------------------------------------------
+    // ITmfEventRequest
+    // ------------------------------------------------------------------------
+
+	public TmfTimeRange getRange() {
+		return fRange;
+	}
+	
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java
new file mode 100644
index 0000000..a96dc63
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java
@@ -0,0 +1,342 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.request;
+
+import org.eclipse.linuxtools.tmf.event.TmfData;
+
+/**
+ * <b><u>TmfDataRequest</u></b>
+ * <p>
+ * TmfDataRequests are used to obtain blocks of contiguous data from a data
+ * provider. Open ranges can be used, especially for continuous streaming.
+ * <p>
+ * The request is processed asynchronously by a TmfProvider and, as blocks
+ * of data become available, handleData() is invoked synchronously for each
+ * block. Upon return, the data instances go out of scope and become eligible
+ * for gc. It is is thus the responsibility of the requester to either clone
+ * or keep a reference to the data it wishes to track specifically.
+ * <p>
+ * This data block approach is used to avoid  busting the heap for very
+ * large trace files. The block size is configurable. 
+ * <p>
+ * The TmfProvider indicates that the request is completed by calling done().
+ * The request can be canceled at any time with cancel().
+ * <p>
+ * Typical usage:
+ *<pre><code><i>TmfTimeWindow range = new TmfTimewindow(...);
+ *TmfDataRequest&lt;DataType[]&gt; request = new TmfDataRequest&lt;DataType[]&gt;(DataType.class, 0, NB_EVENTS, BLOCK_SIZE) {
+ *    public void handleData() {
+ *         DataType[] data = request.getData();
+ *         for (DataType e : data) {
+ *             // do something
+ *         }
+ *    }
+ *    public void handleSuccess() {
+ *         // do something
+ *         }
+ *    }
+ *    public void handleFailure() {
+ *         // do something
+ *         }
+ *    }
+ *    public void handleCancel() {
+ *         // do something
+ *         }
+ *    }
+ *};
+ *fProcessor.process(request, true);
+ *</i></code></pre>
+ *
+ * TODO: Consider decoupling from "time range", "rank", etc and for the more
+ * generic notion of "criteria". This would allow to extend for "time range", etc
+ * instead of providing specialized constructors. This also means removing the
+ * criteria info from the data structure (with the possible exception of fNbRequested).
+ * The nice thing about it is that it would prepare us well for the coming generation
+ * of analysis tools.  
+ * 
+ * TODO: Implement request failures (codes, etc...)
+ */
+public abstract class TmfDataRequest<T extends TmfData> implements ITmfDataRequest<T> {
+
+    // ------------------------------------------------------------------------
+    // Constants
+    // ------------------------------------------------------------------------
+
+    // The default maximum number of events per chunk
+    public static final int DEFAULT_BLOCK_SIZE = 1000;
+
+    // The request count for all the events
+    public static final int ALL_DATA = Integer.MAX_VALUE;
+    
+    private static int fRequestNumber = 0;
+  
+    // ------------------------------------------------------------------------
+    // Attributes
+    // ------------------------------------------------------------------------
+
+    private final Class<T> fDataType;
+    private final int fRequestId;  			// A unique request ID
+    private final int fIndex;      			// The index (rank) of the requested event
+    private final int fNbRequested;  		// The number of requested events (ALL_DATA for all)
+    private final int fBlockSize;          	// The maximum number of events per chunk
+    private       int fNbRead;           	// The number of reads so far
+
+    private Object  lock = new Object();
+    private boolean fRequestCompleted = false;
+    private boolean fRequestFailed    = false;
+    private boolean fRequestCanceled  = false;
+
+    private T[] fData;	// Data object
+    
+    // ------------------------------------------------------------------------
+    // Constructors
+    // ------------------------------------------------------------------------
+
+    /**
+     * Default constructor
+     */
+    public TmfDataRequest(Class<T> dataType) {
+        this(dataType, 0, ALL_DATA, DEFAULT_BLOCK_SIZE);
+    }
+
+    /**
+     * @param nbRequested
+     */
+    public TmfDataRequest(Class<T> dataType, int index) {
+        this(dataType, index, ALL_DATA, DEFAULT_BLOCK_SIZE);
+    }
+
+    /**
+     * @param index
+     * @param nbRequested
+     */
+    public TmfDataRequest(Class<T> dataType, int index, int nbRequested) {
+        this(dataType, index, nbRequested, DEFAULT_BLOCK_SIZE);
+    }
+
+    /**
+     * @param index
+     * @param nbRequested
+     * @param blockSize
+     */
+    public TmfDataRequest(Class<T> dataType, int index, int nbRequested, int blockSize) {
+    	fRequestId   = fRequestNumber++;
+    	fDataType    = dataType;
+    	fIndex       = index;
+    	fNbRequested = nbRequested;
+    	fBlockSize   = blockSize;
+    	fNbRead      = 0;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+    	if (other instanceof TmfDataRequest<?>) {
+    		TmfDataRequest<?> request = (TmfDataRequest<?>) other;
+    		return 	(request.fDataType    == fDataType) &&
+    				(request.fIndex       == fIndex)    &&
+    				(request.fNbRequested == fNbRequested);
+    	}
+    	return false;
+    }
+
+//    @Override
+//    public int hashCode() {
+//    	int hash = 0;
+//    	return hash;
+//    }
+
+    // ------------------------------------------------------------------------
+    // Accessors
+    // ------------------------------------------------------------------------
+
+	/**
+	 * @return the request ID
+	 */
+	public long getRequestId() {
+		return fRequestId;
+	}
+
+	/**
+	 * @return the index of the first event requested
+	 */
+	public int getIndex() {
+		return fIndex;
+	}
+
+    /**
+     * @return the number of requested events (ALL_DATA = all)
+     */
+    public int getNbRequested() {
+        return fNbRequested;
+    }
+
+    /**
+     * @return the block size
+     */
+    public int getBlockize() {
+        return fBlockSize;
+    }
+
+    /**
+     * @return the number of events read so far
+     */
+    public int getNbRead() {
+        return fNbRead;
+    }
+
+    /**
+     * @return indicates if the request is completed
+     */
+    public boolean isCompleted() {
+        return fRequestCompleted;
+    }
+
+    /**
+     * @return indicates if the request is canceled
+     */
+    public boolean isFailed() {
+        return fRequestFailed;
+    }
+
+    /**
+     * @return indicates if the request is canceled
+     */
+    public boolean isCancelled() {
+        return fRequestCanceled;
+    }
+
+    /**
+     * @return the requested data type
+     */
+    public Class<T> getDataType() {
+        return fDataType;
+    }
+
+    // ------------------------------------------------------------------------
+    // Operators
+    // ------------------------------------------------------------------------
+
+    /** 
+     * Sets the data object to specified value. To be called by the 
+     * asynchronous method implementor.
+     * @param data Data value to set.
+     */
+    public synchronized void setData(T[] data) {
+    	fNbRead += data.length;
+    	fData = data;
+    }
+    
+    /**
+     * Returns the data value, null if not set.
+     */
+    public synchronized T[] getData() {
+    	return fData;
+    }
+    
+    /**
+     * Handle a block of incoming data. This method is called every time
+     * a block of data becomes available.
+     * 
+     * - Data items are received in the order they appear in the stream.
+     * - Called by the request processor, in its execution thread, every time a
+     *   block of data becomes available.
+     * - Request processor performs a synchronous call to handlePartialResult()
+     *   i.e. its execution threads holds until handlePartialData() returns.
+     * - Original data items are disposed of on return i.e. keep a reference
+     *   (or a copy) if some persistence is needed between invocations.
+     * - When there is no more data, done() is called. 
+     *
+     * @param events - an array of events
+     */
+    public abstract void handleData();
+
+    /**
+     * Handle the completion of the request. It is called when there is no more
+     * data available either because:
+     * - the request completed normally
+     * - the request failed
+     * - the request was canceled
+     * 
+     * As a convenience, handleXXXX methods are provided. They are meant to be
+     * overridden by the application if it needs to handle these conditions. 
+     */
+    public void handleCompleted() {
+    	if (fRequestFailed) { 
+    		handleFailure();
+    	}
+    	else if (fRequestCanceled) {
+    		handleCancel();
+    	}
+    	else {
+    		handleSuccess();
+    	}
+    }
+
+    public void handleSuccess() {
+    }
+
+    public void handleFailure() {
+    }
+
+    public void handleCancel() {
+    }
+
+    /**
+     * To suspend the client thread until the request completes (or is
+     * canceled).
+     * 
+     * @throws InterruptedException 
+     */
+    public void waitForCompletion() {
+        synchronized (lock) {
+            while (!fRequestCompleted)
+                try {
+                    lock.wait();
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+        }
+    }
+
+    /**
+     * Called by the request processor upon completion.
+     */
+    public void done() {
+        synchronized(lock) {
+            fRequestCompleted = true;
+            lock.notify();
+        }
+        handleCompleted();
+    }
+
+    /**
+     * Called by the request processor upon failure.
+     */
+    public void fail() {
+        synchronized(lock) {
+            fRequestFailed = true;
+            done();
+        }
+    }
+
+    /**
+     * Called by the request processor upon cancellation.
+     */
+    public void cancel() {
+        synchronized(lock) {
+            fRequestCanceled = true;
+            done();
+        }
+    }
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java
new file mode 100644
index 0000000..742d978
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java
@@ -0,0 +1,87 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.request;
+
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+
+/**
+ * <b><u>TmfEventRequest</u></b>
+ * <p>
+ * Implement me. Please.
+ */
+public abstract class TmfEventRequest<T extends TmfEvent> extends TmfDataRequest<T> implements ITmfEventRequest<T> {
+
+    // ------------------------------------------------------------------------
+    // Attributes
+    // ------------------------------------------------------------------------
+
+    private final TmfTimeRange fRange;	// The requested events time range
+
+    // ------------------------------------------------------------------------
+    // Constructors
+    // ------------------------------------------------------------------------
+
+    /**
+     * @param range
+     */
+    public TmfEventRequest(Class<T> dataType) {
+        this(dataType, TmfTimeRange.Eternity, ALL_DATA, DEFAULT_BLOCK_SIZE);
+    }
+
+    /**
+     * @param range
+     */
+    public TmfEventRequest(Class<T> dataType, TmfTimeRange range) {
+        this(dataType, range, ALL_DATA, DEFAULT_BLOCK_SIZE);
+    }
+
+    /**
+     * @param range
+     * @param nbRequested
+     */
+    public TmfEventRequest(Class<T> dataType, TmfTimeRange range, int nbRequested) {
+        this(dataType, range, nbRequested, DEFAULT_BLOCK_SIZE);
+    }
+    
+    /**
+     * @param range
+     * @param nbRequested
+     * @param blockSize Size of the largest blocks expected
+     */
+    public TmfEventRequest(Class<T> dataType, TmfTimeRange range, int nbRequested, int blockSize) {
+    	super(dataType, 0, nbRequested, blockSize);
+    	fRange = range;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+    	if (other instanceof TmfEventRequest<?>) {
+    		TmfEventRequest<?> request = (TmfEventRequest<?>) other;
+    		return super.equals(other) && request.fRange.equals(fRange);
+    	}
+    	return false;
+    }
+
+    // ------------------------------------------------------------------------
+    // Accessors
+    // ------------------------------------------------------------------------
+
+    /**
+     * @return the requested time range
+     */
+    public TmfTimeRange getRange() {
+        return fRange;
+    }
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java
new file mode 100644
index 0000000..f39c932
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.request;
+
+import java.util.Queue;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+
+/**
+ * <b><u>TmfRequestExecutor</u></b>
+ *
+ * Implement me. Please.
+ */
+public class TmfRequestExecutor implements Executor {
+
+	private final ExecutorService fExecutor;
+	private final Queue<Runnable> fRequests = new LinkedBlockingQueue<Runnable>();
+	private Runnable fRequest;
+	
+	public TmfRequestExecutor(ExecutorService executor) {
+		fExecutor = executor;
+	}
+
+	public TmfRequestExecutor() {
+		this(Executors.newSingleThreadExecutor());
+	}
+
+	public void start() {
+		// Nothing to do
+	}
+
+	public void stop() {
+		fExecutor.shutdown();
+	}
+	
+	public void execute(final Runnable request) {
+		fRequests.offer(new Runnable() {
+			public void run() {
+				try {
+					request.run();
+				} finally {
+					scheduleNext();
+				}
+			}
+		});
+		if (fRequest == null) {
+			scheduleNext();
+		}
+	}
+
+	protected synchronized void scheduleNext() {
+		if ((fRequest = fRequests.poll()) != null) {
+			fExecutor.execute(fRequest);
+		}
+	}
+
+	public synchronized void queueRequest(Runnable request) {
+		fRequests.add(request);
+		scheduleNext();
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfEndSynchSignal.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfEndSynchSignal.java
new file mode 100644
index 0000000..caeaff1
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfEndSynchSignal.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.signal;
+
+/**
+ * <b><u>TmfEndSynchSignal</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfEndSynchSignal extends TmfSignal {
+
+	public TmfEndSynchSignal(int synchId) {
+		super(null, synchId);
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfRangeSynchSignal.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfRangeSynchSignal.java
new file mode 100644
index 0000000..61f90ed
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfRangeSynchSignal.java
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.signal;
+
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+
+/**
+ * <b><u>TmfRangeSynchSignal</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfRangeSynchSignal extends TmfSignal {
+
+	private final TmfTimeRange fCurrentRange;
+	private final TmfTimestamp fCurrentTime;
+
+	public TmfRangeSynchSignal(Object source, TmfTimeRange range, TmfTimestamp ts) {
+		super(source);
+		fCurrentRange = range;
+		fCurrentTime = ts;
+	}
+
+	public TmfTimeRange getCurrentRange() {
+		return fCurrentRange;
+	}
+
+	public TmfTimestamp getCurrentTime() {
+		return fCurrentTime;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignal.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignal.java
new file mode 100644
index 0000000..340bfc1
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignal.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.signal;
+
+/**
+ * <b><u>TmfSignal</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public abstract class TmfSignal {
+
+	// The signal originator
+	private final Object fSource;
+
+	private int fReference;
+
+	public TmfSignal(Object source) {
+		this(source, 0);
+	}
+
+	public TmfSignal(Object source, int reference) {
+		fSource = source;
+		fReference = reference;
+	}
+
+	public Object getSource() {
+		return fSource;
+	}
+
+	public void setReference(int reference) {
+		fReference = reference;
+	}
+
+	public int getReference() {
+		return fReference;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignalHandler.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignalHandler.java
new file mode 100644
index 0000000..238cea9
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignalHandler.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.signal;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * <b><u>TmfSignalHandler</u></b>
+ * <p>
+ * Marker for TMF signal handlers.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface TmfSignalHandler {
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignalManager.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignalManager.java
new file mode 100644
index 0000000..61f0b15
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignalManager.java
@@ -0,0 +1,132 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.signal;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <b><u>TmfSignalHandler</u></b>
+ * <p>
+ * This class manages the set of signal listeners and the signals they are
+ * interested in. When a signal is broadcasted, the appropriate listeners
+ * signal handlers are invoked.
+ * <p>
+ */
+public class TmfSignalManager {
+
+	// The set of event listeners and their corresponding handler methods.
+	// Note: listeners could be restricted to ITmfComponents but there is no
+	// harm in letting anyone use this since it is not tied to anything but
+	// the signal data type.
+	static private Map<Object, Method[]> fListeners = new HashMap<Object, Method[]>();
+
+	// If requested, add universal signal tracer
+	// TODO: Temporary solution: should be enabled/disabled dynamically 
+	private static boolean fTraceIsActive = false;
+	private static TmfSignalTracer fSignalTracer;
+	static {
+		if (fTraceIsActive) {
+			fSignalTracer = TmfSignalTracer.getInstance();
+			register(fSignalTracer);
+		}
+	}
+
+	public static synchronized void register(Object listener) {
+		Method[] methods = getSignalHandlerMethods(listener);
+		if (methods.length > 0)
+			fListeners.put(listener, methods);
+	}
+
+	public static synchronized void deregister(Object listener) {
+		fListeners.remove(listener);
+	}
+
+	/**
+	 * Returns the list of signal handlers in the listener. Signal handler name
+	 * is irrelevant; only the annotation (@TmfSignalHandler) is important.
+	 * 
+	 * @param listener
+	 * @return
+	 */
+	static private Method[] getSignalHandlerMethods(Object listener) {
+		List<Method> handlers = new ArrayList<Method>();
+		Method[] methods = listener.getClass().getMethods();
+		for (Method method : methods) {
+			if (method.isAnnotationPresent(TmfSignalHandler.class)) {
+				handlers.add(method);
+			}
+		}
+		return handlers.toArray(new Method[handlers.size()]);
+	}
+
+	/**
+	 * Invokes the handling methods that listens to signals of a given type.
+	 * 
+	 * The list of handlers is built on-the-fly to allow for the dynamic
+	 * creation/deletion of signal handlers. Since the number of signal
+	 * handlers shouldn't be too high, this is not a big performance issue
+	 * to pay for the flexibility.
+	 * 
+	 * For synchronization purposes, the signal is bracketed by two synch signals.
+	 * 
+	 * @param signal the signal to dispatch
+	 */
+	static int fSynchId = 0;
+	static public synchronized void dispatchSignal(TmfSignal signal) {
+		fSynchId++;
+		sendSignal(new TmfStartSynchSignal(fSynchId));
+		signal.setReference(fSynchId);
+		sendSignal(signal);
+		sendSignal(new TmfEndSynchSignal(fSynchId));
+	}
+
+	static private void sendSignal(TmfSignal signal) {
+
+		// Build the list of listener methods that are registered for this signal
+		Class<?> signalClass = signal.getClass();
+		Map<Object, List<Method>> listeners = new HashMap<Object, List<Method>>();
+		listeners.clear();
+		for (Map.Entry<Object, Method[]> entry : fListeners.entrySet()) {
+			List<Method> matchingMethods = new ArrayList<Method>();
+			for (Method method : entry.getValue()) {
+				if (method.getParameterTypes()[0].isAssignableFrom(signalClass)) {
+					matchingMethods.add(method);
+				}
+			}
+			if (!matchingMethods.isEmpty()) {
+				listeners.put(entry.getKey(), matchingMethods);
+			}
+		}
+
+		// Call the signal handlers 
+		for (Map.Entry<Object, List<Method>> entry : listeners.entrySet()) {
+			for (Method method : entry.getValue()) {
+				try {
+					method.invoke(entry.getKey(), new Object[] { signal });
+				} catch (IllegalArgumentException e) {
+					// TODO Auto-generated catch block
+				} catch (IllegalAccessException e) {
+					// TODO Auto-generated catch block
+				} catch (InvocationTargetException e) {
+					// TODO Auto-generated catch block
+				}
+			}
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignalTracer.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignalTracer.java
new file mode 100644
index 0000000..73ae15f
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignalTracer.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.signal;
+
+/**
+ * <b><u>TmfSignalTracer</u></b>
+ * <p>
+ * This object (singleton) traces all TmfSignals in the application.
+ */
+public class TmfSignalTracer {
+
+	static TmfSignalTracer fInstance;
+
+	static public TmfSignalTracer getInstance() {
+		if (fInstance == null) {
+			fInstance = new TmfSignalTracer();
+		}
+		return fInstance;
+	}
+
+	private TmfSignalTracer() {
+	}
+
+	@TmfSignalHandler
+	public void traceSignal(TmfSignal signal) {
+		System.out.println(signal.getSource().toString() + ": " + signal.toString());
+	}
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfStartSynchSignal.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfStartSynchSignal.java
new file mode 100644
index 0000000..a833a16
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfStartSynchSignal.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.signal;
+
+/**
+ * <b><u>TmfStartSynchSignal</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfStartSynchSignal extends TmfSignal {
+
+
+	public TmfStartSynchSignal(int synchId) {
+		super(null, synchId);
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTimeSynchSignal.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTimeSynchSignal.java
new file mode 100644
index 0000000..861c0f3
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTimeSynchSignal.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.signal;
+
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+
+/**
+ * <b><u>TmfTimeSynchSignal</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfTimeSynchSignal extends TmfSignal {
+
+	private final TmfTimestamp fCurrentTime;
+
+	public TmfTimeSynchSignal(Object source, TmfTimestamp ts) {
+		super(source);
+		fCurrentTime = ts;
+	}
+
+	public TmfTimestamp getCurrentTime() {
+		return fCurrentTime;
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return "[TmfTimeSynchSignal (" + fCurrentTime.toString() + ")]";
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/ITmfContext.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/ITmfContext.java
new file mode 100644
index 0000000..880f8c6
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/ITmfContext.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.trace;
+
+/**
+ * <b><u>ITmfContext</u></b>
+ * <p>
+ * This is a place-holder for the context objects.
+ */
+public interface ITmfContext extends Cloneable {
+
+	public void setLocation(ITmfLocation<?> location);
+	public ITmfLocation<?> getLocation();
+
+	public void setRank(long rank);
+	public long getRank();
+	public void updateRank(int rank);
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/ITmfLocation.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/ITmfLocation.java
new file mode 100644
index 0000000..20b20ca
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/ITmfLocation.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.trace;
+
+/**
+ * <b><u>ITmfLocation</u></b>
+ * <p>
+ * This is a place-holder for the location objects.
+ */
+public interface ITmfLocation<L> extends Cloneable {
+
+	public void setLocation(L location);
+
+	public L getLocation();
+
+	public ITmfLocation<L> clone();
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/ITmfTrace.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/ITmfTrace.java
new file mode 100644
index 0000000..f803820
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/ITmfTrace.java
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.trace;
+
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+
+/**
+ * <b><u>ITmfTrace</u></b>
+ * <p>
+ */
+public interface ITmfTrace {
+
+	/**
+	 * @return the trace path 
+	 */
+	public String getPath();
+    
+	/**
+	 * @return the trace name 
+	 */
+	public String getName();
+
+	/**
+	 * @return the number of events in the trace
+	 */
+	public long getNbEvents();
+    
+	/**
+	 * Trace time range accessors
+	 */
+	public TmfTimeRange getTimeRange();
+    public TmfTimestamp getStartTime();
+    public TmfTimestamp getEndTime();
+
+    /**
+     * Positions the trace at the first event with the specified
+     * timestamp or index (i.e. the nth event in the trace).
+     * 
+     * Returns a context which can later be used to read the event.
+     * 
+     * @param data.timestamp
+     * @param data.index
+     * @return a context object for subsequent reads
+     */
+    public TmfContext seekLocation(ITmfLocation<?> location);
+    public TmfContext seekEvent(TmfTimestamp timestamp);
+    public TmfContext seekEvent(long rank);
+
+    /**
+     * Return the event pointed by the supplied context (or null if
+     * no event left) and updates the context to the next event.
+     * 
+     * @return the next event in the stream
+     */
+    public TmfEvent getNextEvent(TmfContext context);
+
+    /**
+     * Return the event pointed by the supplied context (or null if
+     * no event left) and *does not* update the context.
+     * 
+     * @return the next event in the stream
+     */
+    public TmfEvent parseEvent(TmfContext context);
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfCheckpoint.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfCheckpoint.java
new file mode 100644
index 0000000..f37cb28
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfCheckpoint.java
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.trace;
+
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+
+/**
+ * <b><u>TmfCheckpoint</u></b>
+ * <p>
+ * This class maps an event timestamp with a location.
+ */
+public class TmfCheckpoint implements Comparable<TmfCheckpoint> {
+
+    // ------------------------------------------------------------------------
+    // Attributes
+    // ------------------------------------------------------------------------
+    
+    private final TmfTimestamp fTimestamp;
+    private final ITmfLocation<?> fLocation;
+
+    // ------------------------------------------------------------------------
+    // Constructors
+    // ------------------------------------------------------------------------
+
+    /**
+     * @param ts
+     * @param location
+     */
+    public TmfCheckpoint(TmfTimestamp ts, ITmfLocation<?> location) {
+        fTimestamp = ts;
+        fLocation = location;
+    }
+
+    // ------------------------------------------------------------------------
+    // Accessors
+    // ------------------------------------------------------------------------
+
+    /**
+     * @return the checkpoint event timestamp
+     */
+    public TmfTimestamp getTimestamp() {
+        return fTimestamp;
+    }
+
+    /**
+     * @return the checkpoint event stream location
+     */
+    public ITmfLocation<?> getLocation() {
+        return fLocation;
+    }
+
+    // ------------------------------------------------------------------------
+    // Comparable
+    // ------------------------------------------------------------------------
+
+    public int compareTo(TmfCheckpoint other) {
+        return fTimestamp.compareTo(other.fTimestamp, false);
+    }
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfContext.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfContext.java
new file mode 100644
index 0000000..d495182
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfContext.java
@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.trace;
+
+
+/**
+ * <b><u>TmfContext</u></b>
+ * <p>
+ * Trace context structure. It ties a trace location to an event rank. The
+ * context should be enough to restore the trace state so the corresponding
+ * event can be read.
+ * <p>
+ * Used to handle conflicting, concurrent accesses to the trace. 
+ */
+public class TmfContext implements ITmfContext {
+
+	private ITmfLocation<?> fLocation;
+	private long fRank;
+	
+	// ------------------------------------------------------------------------
+	// Constructors
+	// ------------------------------------------------------------------------
+
+	public TmfContext(ITmfLocation<?> loc, long rank) {
+		fLocation = loc;
+		fRank = rank;
+	}
+
+	public TmfContext(ITmfLocation<?> location) {
+		this(location, 0);
+	}
+
+	public TmfContext(TmfContext other) {
+		this(other.fLocation, other.fRank);
+	}
+
+	public TmfContext() {
+		this(null, 0);
+	}
+
+	// ------------------------------------------------------------------------
+	// Cloneable
+	// ------------------------------------------------------------------------
+
+	@Override
+	public TmfContext clone() {
+		try {
+			return (TmfContext) super.clone();
+		} catch (CloneNotSupportedException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	// ------------------------------------------------------------------------
+	// ITmfContext
+	// ------------------------------------------------------------------------
+
+	public void setLocation(ITmfLocation<?> location) {
+		fLocation = location;
+	}
+
+	public ITmfLocation<?> getLocation() {
+		return fLocation;
+	}
+
+	public void setRank(long rank) {
+		fRank = rank;
+	}
+
+	public long getRank() {
+		return fRank;
+	}
+
+	public void updateRank(int delta) {
+		fRank += delta;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfLocation.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfLocation.java
new file mode 100644
index 0000000..6851d9e
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfLocation.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.trace;
+
+/**
+ * <b><u>TmfLocation</u></b>
+ * <p>
+ * A generic implementation of ITmfLocation
+ */
+public class TmfLocation<L> implements ITmfLocation<L> {
+
+	private L fLocation;
+	
+	public TmfLocation(L location) {
+		fLocation = location;
+	}
+
+	public void setLocation(L location) {
+		fLocation = location;
+	}
+
+	public L getLocation() {
+		return fLocation;
+	}
+
+	@Override
+	public String toString() {
+		return fLocation.toString();
+	}
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public TmfLocation<L> clone() {
+		try {
+			return (TmfLocation<L>) super.clone();
+		} catch (CloneNotSupportedException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java
new file mode 100644
index 0000000..c3799c9
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java
@@ -0,0 +1,454 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.trace;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.Collections;
+import java.util.Vector;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.linuxtools.tmf.component.TmfEventProvider;
+import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.request.TmfCoalescedEventRequest;
+import org.eclipse.linuxtools.tmf.request.TmfDataRequest;
+import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
+
+/**
+ * <b><u>TmfTrace</u></b>
+ * <p>
+ * Abstract implementation of ITmfTrace. It should be sufficient to extend this
+ * class and provide implementation for <code>getCurrentLocation()</code> and
+ * <code>seekLocation()</code>, as well as a proper parser, to have a working
+ * concrete implementation.
+ * 
+ * Note: The notion of event rank is still under heavy discussion. Although
+ * used for by the Events View and probably useful in then general case, there
+ * is no easy way to implement it for LTTng (actually  a strong case is being
+ * made that this is useless). Therefore, this is a minimal and partial
+ * implementation and rank should not be relied upon in the general case (i.e.
+ *  it was hacked to work for the Events View).
+ * 
+ * TODO: Add support for live streaming (notifications, incremental indexing, ...)
+ */
+public abstract class TmfTrace<T extends TmfEvent> extends TmfEventProvider<T> implements ITmfTrace {
+
+    // ------------------------------------------------------------------------
+    // Constants
+    // ------------------------------------------------------------------------
+
+    // The default number of events to cache
+	// TODO: Make the DEFAULT_CACHE_SIZE a preference
+    public static final int DEFAULT_CACHE_SIZE = 1000;
+
+    // ------------------------------------------------------------------------
+    // Attributes
+    // ------------------------------------------------------------------------
+
+    // The trace path
+    private final String fPath;
+
+    // The trace name
+    private final String fName;
+
+    // The cache page size AND checkpoints interval
+    protected int fIndexPageSize;
+
+    // The set of event stream checkpoints (for random access)
+    protected Vector<TmfCheckpoint> fCheckpoints = new Vector<TmfCheckpoint>();
+
+    // The number of events collected
+    protected long fNbEvents = 0;
+
+    // The time span of the event stream
+    private TmfTimeRange fTimeRange = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigBang);
+
+    // ------------------------------------------------------------------------
+    // Constructors
+    // ------------------------------------------------------------------------
+
+    /**
+     * @param path
+     * @param cacheSize
+     * @throws FileNotFoundException
+     */
+    protected TmfTrace(Class<T> type, String path, int cacheSize) throws FileNotFoundException {
+    	super(type);
+    	int sep = path.lastIndexOf(File.separator);
+    	fName = (sep >= 0) ? path.substring(sep + 1) : path;
+    	fPath = path;
+        fIndexPageSize = (cacheSize > 0) ? cacheSize : DEFAULT_CACHE_SIZE;
+    }
+
+    /**
+     * @param path
+     * @throws FileNotFoundException
+     */
+    protected TmfTrace(Class<T> type, String path) throws FileNotFoundException {
+    	this(type, path, DEFAULT_CACHE_SIZE);
+    }
+
+    // ------------------------------------------------------------------------
+    // Accessors
+    // ------------------------------------------------------------------------
+
+    /**
+     * @return the trace path
+     */
+    public String getPath() {
+        return fPath;
+    }
+
+    /**
+     * @return the trace name
+     */
+    @Override
+	public String getName() {
+        return fName;
+    }
+
+    /* (non-Javadoc)
+     * @see org.eclipse.linuxtools.tmf.stream.ITmfEventStream#getNbEvents()
+     */
+    public long getNbEvents() {
+        return fNbEvents;
+    }
+
+    /**
+     * @return the size of the cache
+     */
+    public int getCacheSize() {
+        return fIndexPageSize;
+    }
+
+    /* (non-Javadoc)
+     * @see org.eclipse.linuxtools.tmf.stream.ITmfEventStream#getTimeRange()
+     */
+    public TmfTimeRange getTimeRange() {
+        return fTimeRange;
+    }
+
+    /* (non-Javadoc)
+     * @see org.eclipse.linuxtools.tmf.trace.ITmfTrace#getStartTime()
+     */
+    public TmfTimestamp getStartTime() {
+    	return fTimeRange.getStartTime();
+    }
+
+    /* (non-Javadoc)
+     * @see org.eclipse.linuxtools.tmf.trace.ITmfTrace#getEndTime()
+     */
+    public TmfTimestamp getEndTime() {
+    	return fTimeRange.getEndTime();
+    }
+
+    public Vector<TmfCheckpoint> getCheckpoints() {
+    	return fCheckpoints;
+    }
+
+    // ------------------------------------------------------------------------
+    // Operators
+    // ------------------------------------------------------------------------
+
+    protected void setTimeRange(TmfTimeRange range) {
+    	fTimeRange = range;
+    }
+
+    protected void setStartTime(TmfTimestamp startTime) {
+    	fTimeRange = new TmfTimeRange(startTime, fTimeRange.getEndTime());
+    }
+
+    protected void setEndTime(TmfTimestamp endTime) {
+    	fTimeRange = new TmfTimeRange(fTimeRange.getStartTime(), endTime);
+    }
+
+	// ------------------------------------------------------------------------
+	// TmfProvider
+	// ------------------------------------------------------------------------
+
+	@Override
+	public ITmfContext armRequest(TmfDataRequest<T> request) {
+		if (request instanceof TmfEventRequest<?>) {
+			return seekEvent(((TmfEventRequest<T>) request).getRange().getStartTime());
+		}
+		if (request instanceof TmfCoalescedEventRequest<?>) {
+			return seekEvent(((TmfCoalescedEventRequest<T>) request).getRange().getStartTime());
+		}
+		return null;
+	}
+
+	/**
+	 * Return the next piece of data based on the context supplied. The context
+	 * would typically be updated for the subsequent read.
+	 * 
+	 * @param context
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public T getNext(ITmfContext context) {
+		if (context instanceof TmfContext) {
+			return (T) getNextEvent((TmfContext) context);
+		}
+		return null;
+	}
+
+	// ------------------------------------------------------------------------
+	// ITmfTrace
+	// ------------------------------------------------------------------------
+
+    /* (non-Javadoc)
+     * @see org.eclipse.linuxtools.tmf.trace.ITmfTrace#seekEvent(org.eclipse.linuxtools.tmf.event.TmfTimestamp)
+     */
+    public TmfContext seekEvent(TmfTimestamp timestamp) {
+
+    	if (timestamp == null) {
+    		timestamp = TmfTimestamp.BigBang;
+    	}
+
+    	// First, find the right checkpoint
+    	int index = Collections.binarySearch(fCheckpoints, new TmfCheckpoint(timestamp, null));
+
+        // In the very likely case that the checkpoint was not found, bsearch
+        // returns its negated would-be location (not an offset...). From that
+        // index, we can then position the stream and get the event.
+        if (index < 0) {
+            index = Math.max(0, -(index + 2));
+        }
+
+        // Position the stream at the checkpoint
+        ITmfLocation<?> location;
+        synchronized (fCheckpoints) {
+        	if (fCheckpoints.size() > 0) {
+        		if (index >= fCheckpoints.size()) {
+        			index = fCheckpoints.size() - 1;
+        		}
+        		location = fCheckpoints.elementAt(index).getLocation();
+        	}
+        	else {
+        		location = null;
+        	}
+        }
+        TmfContext context = seekLocation(location);
+        context.setRank(index * fIndexPageSize);
+
+        // And locate the event
+        TmfContext nextEventContext = new TmfContext(context);
+        TmfEvent event = getNextEvent(nextEventContext);
+        while (event != null && event.getTimestamp().compareTo(timestamp, false) < 0) {
+        	context.setLocation(nextEventContext.getLocation().clone());
+        	context.updateRank(1);
+        	event = getNextEvent(nextEventContext);
+        }
+
+        return context;
+    }
+
+    /* (non-Javadoc)
+     * @see org.eclipse.linuxtools.tmf.trace.ITmfTrace#seekEvent(int)
+     */
+    public TmfContext seekEvent(long rank) {
+
+        // Position the stream at the previous checkpoint
+        int index = (int) rank / fIndexPageSize;
+        ITmfLocation<?> location;
+        synchronized (fCheckpoints) {
+        	if (fCheckpoints.size() == 0) {
+        		location = null;
+        	}
+        	else {
+        		if (index >= fCheckpoints.size()) {
+        			index  = fCheckpoints.size() - 1;
+        		}
+        		location = fCheckpoints.elementAt(index).getLocation();
+        	}
+        }
+
+        TmfContext context = seekLocation(location);
+        long pos = index * fIndexPageSize;
+        context.setRank(pos);
+
+        if (pos < rank) {
+            TmfEvent event = getNextEvent(context);
+            while (event != null && ++pos < rank) {
+            	event = getNextEvent(context);
+            }
+        }
+
+        return new TmfContext(context.getLocation(), context.getRank());
+    }
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.tmf.trace.ITmfTrace#getNextEvent(org.eclipse.linuxtools.tmf.trace.ITmfTrace.TraceContext)
+	 */
+	public synchronized TmfEvent getNextEvent(TmfContext context) {
+		// parseEvent() does not update the context
+		TmfEvent event = parseEvent(context);
+		if (event != null) {
+			context.setLocation(getCurrentLocation());
+			context.updateRank(1);
+			processEvent(event);
+		}
+    	return event;
+	}
+
+    /**
+	 * Hook for "special" processing by the concrete class
+	 * (called by getNextEvent())
+	 * 
+	 * @param event
+	 */
+	public void processEvent(TmfEvent event) {
+		// Do nothing by default
+	}
+
+    /**
+     * To be implemented by the concrete class
+     */
+    public abstract TmfContext seekLocation(ITmfLocation<?> location);
+	public abstract ITmfLocation<?> getCurrentLocation();
+    public abstract TmfEvent parseEvent(TmfContext context);
+
+	// ------------------------------------------------------------------------
+	// toString
+	// ------------------------------------------------------------------------
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return "[TmfTrace (" + fName + "]";
+	}
+
+    // ------------------------------------------------------------------------
+    // Indexing
+    // ------------------------------------------------------------------------
+
+	/*
+	 * The purpose of the index is to keep the information needed to rapidly
+	 * access a trace event based on its timestamp or rank.
+	 * 
+	 * NOTE: As it is, doesn't work for streaming traces.
+	 */
+
+	private IndexingJob job;
+
+	// Indicates that an indexing job is already running
+	private Boolean fIndexing = false;
+	private Boolean fIndexed  = false;
+
+	public void indexTrace(boolean waitForCompletion) {
+    	synchronized (fIndexing) {
+			if (fIndexed || fIndexing) {
+    			return;
+    		}
+    		fIndexing = true;
+    	}
+
+    	job = new IndexingJob("Indexing " + fName);
+    	job.schedule();
+
+    	if (waitForCompletion) {
+    		try {
+    			job.join();
+    		} catch (InterruptedException e) {
+    			e.printStackTrace();
+    		}
+    	}
+    }
+
+    private class IndexingJob extends Job {
+
+		public IndexingJob(String name) {
+			super(name);
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
+		 */
+		@Override
+		protected IStatus run(IProgressMonitor monitor) {
+
+            monitor.beginTask("Indexing " + fName, IProgressMonitor.UNKNOWN);
+
+            int nbEvents = 0;
+            TmfTimestamp startTime = null;
+            TmfTimestamp lastTime  = null;
+
+            // Reset the index
+            fCheckpoints = new Vector<TmfCheckpoint>();
+            
+            try {
+            	// Position the trace at the beginning
+                TmfContext context = seekLocation(null);
+                ITmfLocation<?> location = context.getLocation().clone();
+
+                // Get the first event
+               	TmfEvent event = getNextEvent(context);
+               	if (event != null) {
+                    startTime = new TmfTimestamp(event.getTimestamp());
+               	}
+
+               	// Index the trace
+               	while (event != null) {
+                	lastTime = event.getTimestamp();
+           			if ((nbEvents++ % fIndexPageSize) == 0) {
+           				lastTime = new TmfTimestamp(event.getTimestamp());
+                   		fCheckpoints.add(new TmfCheckpoint(lastTime, location.clone()));
+                   		fNbEvents = nbEvents;
+                   		fTimeRange = new TmfTimeRange(startTime, lastTime);
+                   		notifyListeners(new TmfTimeRange(startTime, lastTime));
+
+                        monitor.worked(1);
+
+                        // Check monitor *after* fCheckpoints has been updated
+                        if (monitor.isCanceled()) {
+                            monitor.done();
+                        	return Status.CANCEL_STATUS;
+                        }
+                    }
+
+                    // We will need this location at the next iteration
+                    if ((nbEvents % fIndexPageSize) == 0) {
+                        location = context.getLocation().clone();
+           			}
+
+                    event = getNextEvent(context);
+                }
+            }
+            finally {
+                synchronized(this) {
+                	fNbEvents = nbEvents;
+                	fTimeRange = new TmfTimeRange(startTime, lastTime);
+            		fIndexing = false;
+            		fIndexed = true;
+                }
+                notifyListeners(new TmfTimeRange(startTime, lastTime));
+                monitor.done();
+            }
+
+            return Status.OK_STATUS;
+		}
+    }
+
+    protected void notifyListeners(TmfTimeRange range) {
+    	broadcast(new TmfTraceUpdatedSignal(this, this, range));
+	}
+   
+}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfTraceUpdatedSignal.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfTraceUpdatedSignal.java
new file mode 100644
index 0000000..2cba20e
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfTraceUpdatedSignal.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.trace;
+
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.signal.TmfSignal;
+
+/**
+ * <b><u>TmfTraceUpdatedSignal</u></b>
+ * <p>
+ * TODO: Implement me. Please.
+ */
+public class TmfTraceUpdatedSignal extends TmfSignal {
+
+	private final ITmfTrace fTrace;
+	private final TmfTimeRange fTimeRange;
+	
+	public TmfTraceUpdatedSignal(Object source, ITmfTrace trace, TmfTimeRange range) {
+		super(source);
+		fTrace = trace;
+		fTimeRange = range;
+	}
+
+	public ITmfTrace getTrace() {
+		return fTrace;
+	}
+
+	public TmfTimeRange getRange() {
+		return fTimeRange;
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return "[TmfTraceUpdatedSignal (" + fTrace.toString() + ", " + fTimeRange.toString() + ")]";
+	}
+
+}
diff --git a/man/org.eclipse.linuxtools.man-feature/ChangeLog b/man/org.eclipse.linuxtools.man-feature/ChangeLog
new file mode 100644
index 0000000..3756a80
--- /dev/null
+++ b/man/org.eclipse.linuxtools.man-feature/ChangeLog
@@ -0,0 +1,9 @@
+2010-02-08  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.properties: Update featureName.
+
+2010-01-15  Alexander Kurakov  <akurtakov@redhat.com>
+
+	* epl-v10.html: New file.
+	* build.properties: Include license and epl in the build.
+	* feature.xml: Add description url and fix license url.
\ No newline at end of file
diff --git a/man/org.eclipse.linuxtools.man-feature/build.properties b/man/org.eclipse.linuxtools.man-feature/build.properties
index b3a611b..8ea310b 100644
--- a/man/org.eclipse.linuxtools.man-feature/build.properties
+++ b/man/org.eclipse.linuxtools.man-feature/build.properties
@@ -1,2 +1,4 @@
 bin.includes = feature.xml,\
+               license.html,\
+               epl-v10.html,\
                feature.properties
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/docs/epl-v10.html b/man/org.eclipse.linuxtools.man-feature/epl-v10.html
similarity index 100%
copy from systemtap/SystemTapGuiServer/systemtapguiserver-1.0/docs/epl-v10.html
copy to man/org.eclipse.linuxtools.man-feature/epl-v10.html
diff --git a/man/org.eclipse.linuxtools.man-feature/feature.properties b/man/org.eclipse.linuxtools.man-feature/feature.properties
index d0db18b..39208e9 100644
--- a/man/org.eclipse.linuxtools.man-feature/feature.properties
+++ b/man/org.eclipse.linuxtools.man-feature/feature.properties
@@ -16,7 +16,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Man viewer feature (Incubation)
+featureName=Man Page Viewer (Incubation)
 provider=Eclipse
 description=View or fetch man page content.
 # "copyright" property - text of the "Feature Update Copyright"
diff --git a/man/org.eclipse.linuxtools.man-feature/feature.xml b/man/org.eclipse.linuxtools.man-feature/feature.xml
index 960c19f..f1528d1 100644
--- a/man/org.eclipse.linuxtools.man-feature/feature.xml
+++ b/man/org.eclipse.linuxtools.man-feature/feature.xml
@@ -5,7 +5,7 @@
       version="0.0.1.qualifier"
       provider-name="%provider">
 
-   <description>
+   <description url="http://www.eclipse.org/linuxtools/projectPages/manpage/">
       %description
    </description>
 
@@ -13,7 +13,7 @@
       %copyright
    </copyright>
 
-   <license url="%licenseUrl">
+   <license url="%licenseURL">
       %license
    </license>
 
diff --git a/man/org.eclipse.linuxtools.man/ChangeLog b/man/org.eclipse.linuxtools.man/ChangeLog
index 6980246..d8c0d20 100644
--- a/man/org.eclipse.linuxtools.man/ChangeLog
+++ b/man/org.eclipse.linuxtools.man/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-03  Andrew Overholt  <overholt@redhat.com>
+
+	* plugin.xml: Add "(Incubation)" and Provider.
+
 2009-12-09  Alexander Kurakov  <akurtakov@redhat.com>
 
 	* src/org/eclipse/linuxtools/man/preferences/ManPathPage.java: New file.
diff --git a/man/org.eclipse.linuxtools.man/META-INF/MANIFEST.MF b/man/org.eclipse.linuxtools.man/META-INF/MANIFEST.MF
index 882b588..cb39178 100644
--- a/man/org.eclipse.linuxtools.man/META-INF/MANIFEST.MF
+++ b/man/org.eclipse.linuxtools.man/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Man viewer and service
+Bundle-Name: Man viewer and service (Incubation)
 Bundle-SymbolicName: org.eclipse.linuxtools.man;singleton:=true
 Bundle-Version: 0.0.1.qualifier
 Bundle-Activator: org.eclipse.linuxtools.man.Activator
@@ -12,3 +12,4 @@
 Export-Package: org.eclipse.linuxtools.man, 
   org.eclipse.linuxtools.man.views, 
   org.eclipse.linuxtools.man.parser
+Bundle-Vendor: Eclipse
diff --git a/oprofile/org.eclipse.linuxtools.oprofile-feature/.project b/oprofile/org.eclipse.linuxtools.oprofile-feature/.project
new file mode 100644
index 0000000..e08eda0
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile-feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.oprofile-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile-feature/ChangeLog b/oprofile/org.eclipse.linuxtools.oprofile-feature/ChangeLog
new file mode 100644
index 0000000..00c93f4
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile-feature/ChangeLog
@@ -0,0 +1,35 @@
+2009-05-21  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Remove unnecessary ".feature" qualifier in requirement of
+	profilingframework.
+
+2009-05-20  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Remove unnecessary .feature qualifier.
+
+2009-05-19  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.properties: Change provider from Eclipse.org to Eclipse.
+
+2009-04-20  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: 	Add ws qualifiers.
+
+2009-04-20  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Add os and arch qualifiers to fragment stanzas.
+
+2009-01-14  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Re-add update site information.
+
+2009-01-06  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Add dependencies.  Add update site information.
+
+2008-12-18  Andrew Overholt  <overholt@redhat.com>
+
+	* build.properties: Inital checkin.
+	* feature.xml: Likewise.
+	* feature.properties: Likewise.
+	* epl-v10.html: Likewise.
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile-feature/build.properties b/oprofile/org.eclipse.linuxtools.oprofile-feature/build.properties
new file mode 100644
index 0000000..46c0f91
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile-feature/build.properties
@@ -0,0 +1,8 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html,\
+               ChangeLog
+src.includes = epl-v10.html,\
+               feature.properties,\
+               feature.xml,\
+               ChangeLog
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/docs/epl-v10.html b/oprofile/org.eclipse.linuxtools.oprofile-feature/epl-v10.html
similarity index 100%
copy from systemtap/SystemTapGuiServer/systemtapguiserver-1.0/docs/epl-v10.html
copy to oprofile/org.eclipse.linuxtools.oprofile-feature/epl-v10.html
diff --git a/oprofile/org.eclipse.linuxtools.oprofile-feature/feature.properties b/oprofile/org.eclipse.linuxtools.oprofile-feature/feature.properties
new file mode 100644
index 0000000..7b57734
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile-feature/feature.properties
@@ -0,0 +1,112 @@
+#*******************************************************************************
+# Copyright (c) 2008 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Red Hat, Inc. - initial API and implementation
+#********************************************************************************
+featureName=OProfile Integration (Incubation)
+description=Plugins to bring OProfile-based profiling into the workbench.
+provider=Eclipse
+copyright=Copyright 2008 Red Hat, Inc.
+licenseURL=epl-v10.html
+license=\
+ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
+March 17, 2005\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse.org CVS\n\
+repository ("Repository") in CVS modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+Features may also include other Features ("Included Features"). Files named\n\
+"feature.xml" may contain a list of the names and version numbers of\n\
+Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+   - The top-level (root) directory\n\
+   - Plug-in and Fragment directories\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
+   - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Eclipse Update Manager, you must agree to a license ("Feature Update\n\
+License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties". Such Abouts,\n\
+Feature Licenses and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
+    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile-feature/feature.xml b/oprofile/org.eclipse.linuxtools.oprofile-feature/feature.xml
new file mode 100644
index 0000000..df304db
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile-feature/feature.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.linuxtools.oprofile"
+      label="%featureName"
+      version="0.3.0.qualifier"
+      provider-name="%featureProvider">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <url>
+      <update label="Linux Tools Update Site" url="http://download.eclipse.org/technology/linuxtools/update"/>
+   </url>
+
+   <requires>
+      <import plugin="org.eclipse.core.runtime" version="3.4.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui" version="3.4.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.cdt.core"/>
+      <import plugin="org.eclipse.cdt.debug.core"/>
+      <import plugin="org.eclipse.cdt.launch"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.debug.core"/>
+      <import plugin="org.eclipse.debug.ui"/>
+      <import plugin="org.eclipse.linuxtools.profiling.launch"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.linuxtools.profiling.ui"/>
+      <import feature="org.eclipse.linuxtools.profiling" version="0.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.editors" version="3.4.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.oprofile.core" version="0.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.help"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.linuxtools.oprofile.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.oprofile.launch"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.oprofile.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.oprofile.core.linux.x86"
+         os="linux"
+         ws="gtk"
+         arch="x86"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.oprofile.core.linux.x86_64"
+         os="linux"
+         ws="gtk"
+         arch="x86_64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.oprofile.core.linux.ppc"
+         os="linux"
+         ws="gtk"
+         arch="ppc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.oprofile.doc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/profiling/.classpath b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/.classpath
similarity index 100%
copy from profiling/.classpath
copy to oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/.classpath
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/.project b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/.project
new file mode 100644
index 0000000..0bf69ac
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.oprofile.core.linux.ppc</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/.settings/org.eclipse.jdt.core.prefs b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..4e94468
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Tue Mar 17 11:57:30 EDT 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/.svnignore b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/.svnignore
new file mode 100644
index 0000000..ba077a4
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/.svnignore
@@ -0,0 +1 @@
+bin
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/META-INF/MANIFEST.MF b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..33a9ecb
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.oprofile.core.linux.ppc;singleton:=true
+Bundle-Version: 0.3.0.qualifier
+Fragment-Host: org.eclipse.linuxtools.oprofile.core;bundle-version="0.1.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Vendor: %bundleProvider
+Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=ppc))
+Bundle-Localization: fragment
+Import-Package: org.eclipse.linuxtools.oprofile.core,
+ org.eclipse.linuxtools.oprofile.core.linux
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/about.html b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/about.html
new file mode 100644
index 0000000..dcf9907
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>24th December, 2008</p>	
+<h3>License</h3>
+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<h3>Contributions</h3>
+
+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise
+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such
+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
+
+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or
+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the
+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/build.properties b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/build.properties
new file mode 100644
index 0000000..5920d6e
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/build.properties
@@ -0,0 +1,15 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               fragment.xml,\
+               os/,\
+               fragment.properties,\
+               about.html
+src.includes = META-INF/,\
+               about.html,\
+               fragment.properties,\
+               fragment.xml,\
+               os/,\
+               src/
+individualSourceBundles=true
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/fragment.properties b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/fragment.properties
new file mode 100644
index 0000000..242c5c3
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/fragment.properties
@@ -0,0 +1,12 @@
+#*******************************************************************************
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+#*******************************************************************************
+bundleName=OProfile Core Linux PPC Fragment (Incubation)
+bundleProvider=Eclipse
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/fragment.xml b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/fragment.xml
new file mode 100644
index 0000000..a86122d
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/fragment.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<fragment>
+   <extension
+         point="org.eclipse.linuxtools.oprofile.core.OpxmlProvider">
+      <opxmlProvider
+            class="org.eclipse.linuxtools.oprofile.core.linux.ppc.LinuxOpxmlProviderPPC">
+      </opxmlProvider>
+   </extension>
+
+</fragment>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/src/org/eclipse/linuxtools/oprofile/core/linux/ppc/LinuxOpxmlProviderPPC.java b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/src/org/eclipse/linuxtools/oprofile/core/linux/ppc/LinuxOpxmlProviderPPC.java
new file mode 100644
index 0000000..a75e748
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.ppc/src/org/eclipse/linuxtools/oprofile/core/linux/ppc/LinuxOpxmlProviderPPC.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.core.linux.ppc;
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.linuxtools.oprofile.core.OpxmlException;
+import org.eclipse.linuxtools.oprofile.core.linux.LinuxOpxmlProvider;
+
+public class LinuxOpxmlProviderPPC extends LinuxOpxmlProvider {
+	private static final String PLUGIN_ID = "org.eclipse.linuxtools.oprofile.core.linux.ppc"; //$NON-NLS-1$
+	private static final String OPXML_BINARY_NAME = "opxml"; //$NON-NLS-1$
+	private static final String OPXML_BINARY_PATH = "$os$"; //$NON-NLS-1$
+
+	public LinuxOpxmlProviderPPC() throws OpxmlException {
+		super();
+	}
+
+	@Override
+	public String _getOpxmlPath() {
+		String opxmlPath = null;
+		URL opxmlBinaryUrl = FileLocator.find(Platform.getBundle(PLUGIN_ID), new Path(OPXML_BINARY_PATH + Path.SEPARATOR + OPXML_BINARY_NAME), null); 
+		
+		if (opxmlBinaryUrl != null) {
+			try {
+				opxmlPath = FileLocator.toFileURL(opxmlBinaryUrl).getPath();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+		
+		return opxmlPath;
+	}
+}
diff --git a/profiling/.classpath b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/.classpath
similarity index 100%
copy from profiling/.classpath
copy to oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/.classpath
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/.project b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/.project
new file mode 100644
index 0000000..3ea4beb
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.oprofile.core.linux.x86</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/.settings/org.eclipse.jdt.core.prefs b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..213f5b6
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Wed Jan 07 11:21:45 EST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/.svnignore b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/.svnignore
new file mode 100644
index 0000000..ba077a4
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/.svnignore
@@ -0,0 +1 @@
+bin
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/META-INF/MANIFEST.MF b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..d35d803
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.oprofile.core.linux.x86;singleton:=true
+Bundle-Version: 0.3.0.qualifier
+Bundle-Vendor: %bundleProvider
+Fragment-Host: org.eclipse.linuxtools.oprofile.core;bundle-version="0.1.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86))
+Import-Package: org.eclipse.linuxtools.oprofile.core.linux
+Bundle-Localization: fragment
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/about.html b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/about.html
new file mode 100644
index 0000000..dcf9907
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>24th December, 2008</p>	
+<h3>License</h3>
+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<h3>Contributions</h3>
+
+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise
+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such
+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
+
+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or
+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the
+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/build.properties b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/build.properties
new file mode 100644
index 0000000..863422d
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/build.properties
@@ -0,0 +1,15 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               fragment.xml,\
+               about.html,\
+               fragment.properties,\
+               os/
+src.includes = about.html,\
+               META-INF/,\
+               fragment.xml,\
+               fragment.properties,\
+               src/,\
+               os/
+individualSourceBundles=true
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/fragment.properties b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/fragment.properties
new file mode 100644
index 0000000..fb866b4
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/fragment.properties
@@ -0,0 +1,12 @@
+#*******************************************************************************
+# Copyright (c) 2008 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+#*******************************************************************************
+bundleName=OProfile Core Linux x86 Fragment (Incubation)
+bundleProvider=Eclipse
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/fragment.xml b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/fragment.xml
new file mode 100644
index 0000000..9c7f111
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/fragment.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<fragment>
+   <extension
+         point="org.eclipse.linuxtools.oprofile.core.OpxmlProvider">
+      <opxmlProvider
+            class="org.eclipse.linuxtools.oprofile.core.linux.x86.LinuxOpxmlProvider32">
+      </opxmlProvider>
+   </extension>
+
+</fragment>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/src/org/eclipse/linuxtools/oprofile/core/linux/x86/LinuxOpxmlProvider32.java b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/src/org/eclipse/linuxtools/oprofile/core/linux/x86/LinuxOpxmlProvider32.java
new file mode 100644
index 0000000..e250a91
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86/src/org/eclipse/linuxtools/oprofile/core/linux/x86/LinuxOpxmlProvider32.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.core.linux.x86;
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.linuxtools.oprofile.core.OpxmlException;
+import org.eclipse.linuxtools.oprofile.core.linux.LinuxOpxmlProvider;
+
+
+public class LinuxOpxmlProvider32 extends LinuxOpxmlProvider {
+	private static final String PLUGIN_ID = "org.eclipse.linuxtools.oprofile.core.linux.x86"; //$NON-NLS-1$
+	private static final String OPXML_BINARY_NAME = "opxml"; //$NON-NLS-1$
+	private static final String OPXML_BINARY_PATH = "$os$"; //$NON-NLS-1$
+
+	public LinuxOpxmlProvider32() throws OpxmlException {
+		super();
+	}
+
+	@Override
+	public String _getOpxmlPath() {
+		String opxmlPath = null;
+		URL opxmlBinaryUrl = FileLocator.find(Platform.getBundle(PLUGIN_ID), new Path(OPXML_BINARY_PATH + Path.SEPARATOR + OPXML_BINARY_NAME), null); 
+		
+		if (opxmlBinaryUrl != null) {
+			try {
+				opxmlPath = FileLocator.toFileURL(opxmlBinaryUrl).getPath();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+		
+		return opxmlPath;
+	}
+}
diff --git a/profiling/.classpath b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/.classpath
similarity index 100%
copy from profiling/.classpath
copy to oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/.classpath
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/.project b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/.project
new file mode 100644
index 0000000..2399a11
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.oprofile.core.linux.x86_64</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/.settings/org.eclipse.jdt.core.prefs b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..ec5057a
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Wed Jan 07 11:21:57 EST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/.svnignore b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/.svnignore
new file mode 100644
index 0000000..ba077a4
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/.svnignore
@@ -0,0 +1 @@
+bin
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/META-INF/MANIFEST.MF b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..abd6a65
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.oprofile.core.linux.x86_64;singleton:=true
+Bundle-Version: 0.3.0.qualifier
+Bundle-Vendor: %bundleProvider
+Fragment-Host: org.eclipse.linuxtools.oprofile.core;bundle-version="0.1.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64))
+Import-Package: org.eclipse.linuxtools.oprofile.core.linux
+Bundle-Localization: fragment
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/about.html b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/about.html
new file mode 100644
index 0000000..dcf9907
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>24th December, 2008</p>	
+<h3>License</h3>
+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<h3>Contributions</h3>
+
+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise
+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such
+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
+
+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or
+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the
+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/build.properties b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/build.properties
new file mode 100644
index 0000000..e392e8a
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/build.properties
@@ -0,0 +1,15 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               fragment.xml,\
+               about.html,\
+               fragment.properties,\
+               os/
+src.includes = META-INF/,\
+               about.html,\
+               fragment.properties,\
+               fragment.xml,\
+               os/,\
+               src/
+individualSourceBundles=true
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/fragment.properties b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/fragment.properties
new file mode 100644
index 0000000..32ff95c
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/fragment.properties
@@ -0,0 +1,12 @@
+#*******************************************************************************
+# Copyright (c) 2008 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+#*******************************************************************************
+bundleName=OProfile Core Linux x86_64 Fragment (Incubation)
+bundleProvider=Eclipse
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/fragment.xml b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/fragment.xml
new file mode 100644
index 0000000..c56483e
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/fragment.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<fragment>
+   <extension
+         point="org.eclipse.linuxtools.oprofile.core.OpxmlProvider">
+      <opxmlProvider
+            class="org.eclipse.linuxtools.oprofile.core.linux.x86_64.LinuxOpxmlProvider64">
+      </opxmlProvider>
+   </extension>
+
+</fragment>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/src/org/eclipse/linuxtools/oprofile/core/linux/x86_64/LinuxOpxmlProvider64.java b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/src/org/eclipse/linuxtools/oprofile/core/linux/x86_64/LinuxOpxmlProvider64.java
new file mode 100644
index 0000000..c74ccac
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.linux.x86_64/src/org/eclipse/linuxtools/oprofile/core/linux/x86_64/LinuxOpxmlProvider64.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.core.linux.x86_64;
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.linuxtools.oprofile.core.OpxmlException;
+import org.eclipse.linuxtools.oprofile.core.linux.LinuxOpxmlProvider;
+
+public class LinuxOpxmlProvider64 extends LinuxOpxmlProvider {
+	private static final String PLUGIN_ID = "org.eclipse.linuxtools.oprofile.core.linux.x86_64"; //$NON-NLS-1$
+	private static final String OPXML_BINARY_NAME = "opxml"; //$NON-NLS-1$
+	private static final String OPXML_BINARY_PATH = "$os$"; //$NON-NLS-1$
+
+	public LinuxOpxmlProvider64() throws OpxmlException {
+		super();
+	}
+
+	@Override
+	public String _getOpxmlPath() {
+		String opxmlPath = null;
+		URL opxmlBinaryUrl = FileLocator.find(Platform.getBundle(PLUGIN_ID), new Path(OPXML_BINARY_PATH + Path.SEPARATOR + OPXML_BINARY_NAME), null); 
+		
+		if (opxmlBinaryUrl != null) {
+			try {
+				opxmlPath = FileLocator.toFileURL(opxmlBinaryUrl).getPath();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+		
+		return opxmlPath;
+	}
+}
diff --git a/profiling/.classpath b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/.classpath
similarity index 100%
copy from profiling/.classpath
copy to oprofile/org.eclipse.linuxtools.oprofile.core.tests/.classpath
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/.project b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/.project
new file mode 100644
index 0000000..775970b
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.oprofile.core.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/.settings/org.eclipse.jdt.core.prefs b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..8858758
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Thu Jan 15 11:55:42 EST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/.svnignore b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/.svnignore
new file mode 100644
index 0000000..ba077a4
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/.svnignore
@@ -0,0 +1 @@
+bin
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/ChangeLog b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/ChangeLog
new file mode 100644
index 0000000..d5190fe
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/ChangeLog
@@ -0,0 +1,9 @@
+2009-02-25  Andrew Overholt  <overholt@redhat.com>
+
+	* test.xml: Clean up variable names.
+	* META-INF/MANIFEST.MF: Explicitly require JUnit 3.
+	* build.properties: Add test.xml.
+
+2009-02-02  Andrew Overholt  <overholt@redhat.com>
+
+	* test.xml: Initial checkin.
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/META-INF/MANIFEST.MF b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..1ca6686
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,22 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.oprofile.core.tests
+Bundle-Version: 0.3.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.oprofile.core.tests.CoreTestsPlugin
+Bundle-Vendor: %bundleProvider
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources;bundle-version="3.4.1",
+ org.junit;bundle-version="3.8.2"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Import-Package: org.eclipse.linuxtools.oprofile.core,
+ org.eclipse.linuxtools.oprofile.core.daemon,
+ org.eclipse.linuxtools.oprofile.core.model,
+ org.eclipse.linuxtools.oprofile.core.opxml,
+ org.eclipse.linuxtools.oprofile.core.opxml.checkevent,
+ org.eclipse.linuxtools.oprofile.core.opxml.info,
+ org.eclipse.linuxtools.oprofile.core.opxml.modeldata,
+ org.eclipse.linuxtools.oprofile.core.opxml.sessions,
+ org.eclipse.linuxtools.oprofile.tests
+Bundle-Localization: plugin
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/build.properties b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/build.properties
new file mode 100644
index 0000000..0785092
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/build.properties
@@ -0,0 +1,14 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               resources/,\
+               plugin.properties,\
+               test.xml
+src.includes = src/,\
+               resources/,\
+               plugin.properties,\
+               build.properties,\
+               META-INF/,\
+               test.xml
+individualSourceBundles=true
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/plugin.properties b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/plugin.properties
new file mode 100644
index 0000000..e611741
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/plugin.properties
@@ -0,0 +1,12 @@
+#*******************************************************************************
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+#*******************************************************************************
+bundleName=OProfile Core Tests Plug-in (Incubation)
+bundleProvider=Eclipse
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_check-event_invalid_counter.xml b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_check-event_invalid_counter.xml
new file mode 100644
index 0000000..0d95acc
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_check-event_invalid_counter.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<check-events>
+	<result>invalid-counter</result>
+</check-events>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_check-event_invalid_event.xml b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_check-event_invalid_event.xml
new file mode 100644
index 0000000..a71f745
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_check-event_invalid_event.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<check-events>
+	<result>invalid-event</result>
+</check-events>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_check-event_invalid_umask.xml b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_check-event_invalid_umask.xml
new file mode 100644
index 0000000..126fd38
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_check-event_invalid_umask.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<check-events>
+	<result>invalid-um</result>
+</check-events>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_check-event_ok.xml b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_check-event_ok.xml
new file mode 100644
index 0000000..7f6c9a9
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_check-event_ok.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<check-events>
+	<result>ok</result>
+</check-events>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_info.xml b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_info.xml
new file mode 100644
index 0000000..022a5d9
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_info.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<info>
+	<num-counters>2</num-counters>
+	<cpu-frequency>800</cpu-frequency>
+	<defaults>
+		<sample-dir>/var/lib/oprofile/samples/</sample-dir>
+		<lock-file>/var/lib/oprofile/lock</lock-file>
+		<log-file>/var/lib/oprofile/samples/oprofiled.log</log-file>
+		<dump-status>/var/lib/oprofile/complete_dump</dump-status>
+	</defaults>
+	<timer-mode>true</timer-mode>
+	<event-list counter="0">
+		<event>
+			<name>CPU_CLK_UNHALTED</name>
+			<description>Clock cycles when not halted</description>
+			<value>60</value>
+			<minimum>6000</minimum>
+			<unit-mask>
+				<type>exclusive</type>
+				<default>0</default>
+				<mask>
+					<value>0</value>
+					<description>Unhalted core cycles</description>
+				</mask>
+				<mask>
+					<value>1</value>
+					<description>Unhalted bus cycles</description>
+				</mask>
+				<mask>
+					<value>2</value>
+					<description>Unhalted bus cycles of this core while the other core is halted</description>
+				</mask>
+			</unit-mask>
+		</event>
+		<event>
+			<name>INST_RETIRED_ANY_P</name>
+			<description>number of instructions retired</description>
+			<value>192</value>
+			<minimum>6000</minimum>
+			<unit-mask>
+				<type>mandatory</type>
+				<default>0</default>
+				<mask>
+					<value>0</value>
+					<description>No unit mask</description>
+				</mask>
+			</unit-mask>
+		</event>
+		<event>
+			<name>DTLB_MISSES</name>
+			<description>DTLB miss events</description>
+			<value>8</value>
+			<minimum>500</minimum>
+			<unit-mask>
+				<type>bitmask</type>
+				<default>15</default>
+				<mask>
+					<value>1</value>
+					<description>ANY	Memory accesses that missed the DTLB.</description>
+				</mask>
+				<mask>
+					<value>2</value>
+					<description>MISS_LD	DTLB misses due to load operations.</description>
+				</mask>
+				<mask>
+					<value>4</value>
+					<description>L0_MISS_LD L0 DTLB misses due to load operations.</description>
+				</mask>
+				<mask>
+					<value>8</value>
+					<description>MISS_ST	TLB misses due to store operations.</description>
+				</mask>
+			</unit-mask>
+		</event>
+	</event-list>
+	<event-list counter="1">
+		<event>
+			<name>L2_M_LINES_IN</name>
+			<description>number of modified lines allocated in L2</description>
+			<value>37</value>
+			<minimum>500</minimum>
+			<unit-mask>
+				<type>exclusive</type>
+				<default>64</default>
+				<mask>
+					<value>192</value>
+					<description>All cores</description>
+				</mask>
+				<mask>
+					<value>64</value>
+					<description>This core</description>
+				</mask>
+			</unit-mask>
+		</event>
+		<event>
+			<name>L2_LINES_OUT</name>
+			<description>number of recovered lines from L2</description>
+			<value>38</value>
+			<minimum>500</minimum>
+			<unit-mask>
+				<type>bitmask</type>
+				<default>112</default>
+				<mask>
+					<value>192</value>
+					<description>core: all cores</description>
+				</mask>
+				<mask>
+					<value>64</value>
+					<description>core: this core</description>
+				</mask>
+				<mask>
+					<value>48</value>
+					<description>prefetch: all inclusive</description>
+				</mask>
+				<mask>
+					<value>16</value>
+					<description>prefetch: Hardware prefetch only</description>
+				</mask>
+				<mask>
+					<value>0</value>
+					<description>prefetch: exclude hardware prefetch</description>
+				</mask>
+			</unit-mask>
+		</event>
+		<event>
+			<name>EIST_TRANS_ALL</name>
+			<description>Intel(tm) Enhanced SpeedStep(r) Technology transitions</description>
+			<value>58</value>
+			<minimum>500</minimum>
+			<unit-mask>
+				<type>notavalidtype</type>
+				<default>1</default>
+				<mask>
+					<value>1</value>
+					<description>No unit mask</description>
+				</mask>
+			</unit-mask>
+		</event>
+	</event-list>
+</info>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_info_0ctrs.xml b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_info_0ctrs.xml
new file mode 100644
index 0000000..c7dac50
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_info_0ctrs.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<info>
+	<num-counters>error</num-counters>
+</info>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_model-data.xml b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_model-data.xml
new file mode 100644
index 0000000..8292083
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_model-data.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model-data>
+	<image name="/test/path/for/image" count="205000">
+		<symbols>
+			<symbol name="TestFunction1(int)" file="/test/path/for/src/image.cpp" count="180000">
+				<sample>
+					<count>130000</count>
+					<line>42</line>
+				</sample>
+				<sample>
+					<count>40000</count>
+					<line>36</line>
+				</sample>
+				<sample>
+					<count>9999</count>
+					<line>31</line>
+				</sample>
+				<sample>
+					<count>1</count>
+					<line>39</line>
+				</sample>
+			</symbol>
+			<symbol name="TestFunction2(int, int)" file="/test/path/for/src/image2.cpp" count="20000">
+				<sample>
+					<count>19998</count>
+					<line>94</line>
+				</sample>
+				<sample>
+					<count>1</count>
+					<line>12</line>
+				</sample>
+				<sample>
+					<count>1</count>
+					<line>55</line>
+				</sample>
+			</symbol>
+		</symbols>
+		<dependent count="5000">
+			<image name="/no-vmlinux" count="4400">
+			</image>
+			<image name="/lib64/ld-2.9.so" count="300">
+				<symbols>
+					<symbol name="do_lookup_x" file="dl-lookup.c" count="299">
+						<sample>
+							<count>299</count>
+							<line>0</line>
+						</sample>
+					</symbol>
+					<symbol name="_dl_unload_cache" file="rawmemchr.c" count="1">
+						<sample>
+							<count>1</count>
+							<line>0</line>
+						</sample>
+					</symbol>
+				</symbols>
+			</image>
+			<image name="/usr/lib64/libstdc++.so.6.0.10" count="160">
+			</image>
+			<image name="/lib64/libc-2.9.so" count="140">
+				<symbols>
+					<symbol name="_IO_new_file_seekoff" file="" count="100">
+						<sample>
+							<count>100</count>
+							<line>0</line>
+						</sample>
+					</symbol>
+					<symbol name="bool std::operator!=&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;(std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; const&amp;, char const*)" file="" count="40">
+						<sample>
+							<count>40</count>
+							<line>0</line>
+						</sample>
+					</symbol>
+				</symbols>
+			</image>
+		</dependent>
+	</image>
+</model-data>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_model-data_multiple_image.xml b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_model-data_multiple_image.xml
new file mode 100644
index 0000000..e82dad5
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_model-data_multiple_image.xml
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model-data>
+	<image name="/no-vmlinux" count="6844">
+	</image>
+	<image name="/bin/grep" count="2">
+	</image>
+	<image name="/bin/gawk" count="8">
+	</image>
+	<image name="/bin/bash" count="142">
+	</image>
+	<image name="/lib64/libgobject-2.0.so.0.1800.3" count="61">
+	</image>
+	<image name="/lib64/libgio-2.0.so.0.1800.3" count="2">
+	</image>
+	<image name="/lib64/libdl-2.9.so" count="2">
+		<symbols>
+			<symbol name="__do_global_dtors_aux" file="crtstuff.c" count="2">
+				<sample>
+					<count>2</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+		</symbols>
+	</image>
+	<image name="/lib64/ld-2.9.so" count="36">
+		<symbols>
+			<symbol name="_dl_start" file="rtld.c" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="dl_main" file="rtld.c" count="3">
+				<sample>
+					<count>3</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="init_tls" file="rtld.c" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="open_verify" file="dl-load.c" count="2">
+				<sample>
+					<count>2</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="_dl_setup_hash" file="rawmemchr.c" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="_dl_init_internal" file="rawmemchr.c" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="_dl_important_hwcaps" file="rawmemchr.c" count="2">
+				<sample>
+					<count>2</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="munmap" file="rawmemchr.c" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="_dl_load_cache_lookup" file="rawmemchr.c" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="_dl_fini" file="rawmemchr.c" count="2">
+				<sample>
+					<count>2</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="__GI_memset" file="rawmemchr.c" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="_dl_init_paths" file="rawmemchr.c" count="3">
+				<sample>
+					<count>3</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="__brk" file="rawmemchr.c" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="_dl_name_match_p" file="rawmemchr.c" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="index" file="rawmemchr.c" count="2">
+				<sample>
+					<count>2</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="_dl_resolve_conflicts" file="rawmemchr.c" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="_dl_cache_libcmp" file="rawmemchr.c" count="2">
+				<sample>
+					<count>2</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="strcmp" file="rawmemchr.c" count="2">
+				<sample>
+					<count>2</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="_dl_start_user" file="rawmemchr.c" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="strlen" file="rawmemchr.c" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="_dl_sort_fini" file="rawmemchr.c" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="_dl_map_object_deps" file="rawmemchr.c" count="4">
+				<sample>
+					<count>4</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="__libc_memalign" file="" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+		</symbols>
+	</image>
+	<image name="/lib64/libdbus-1.so.3.4.0" count="10">
+	</image>
+	<image name="/lib64/libfuse.so.2.7.4" count="1">
+	</image>
+	<image name="/lib64/libm-2.9.so" count="2">
+		<symbols>
+			<symbol name="__dubsin" file="interp.c" count="2">
+				<sample>
+					<count>2</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+		</symbols>
+	</image>
+	<image name="/lib64/libglib-2.0.so.0.1800.3" count="107">
+	</image>
+	<image name="/lib64/libgthread-2.0.so.0.1800.3" count="3">
+	</image>
+	<image name="/usr/bin/which" count="1">
+	</image>
+	<image name="/usr/bin/compiz" count="21">
+	</image>
+	<image name="/usr/bin/Xorg" count="154">
+		<dependent count="6">
+			<image name="[vdso]" count="6">
+			</image>
+		</dependent>
+	</image>
+	<image name="/usr/bin/ophelp" count="11">
+	</image>
+	<image name="/usr/bin/qemu-kvm" count="142">
+		<dependent count="1">
+			<image name="[vdso]" count="1">
+			</image>
+		</dependent>
+	</image>
+	<image name="/usr/bin/oprofiled" count="26">
+	</image>
+	<image name="/usr/sbin/libvirtd" count="3">
+	</image>
+	<image name="/usr/libexec/multiload-applet-2" count="1">
+	</image>
+	<image name="/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/server/libjvm.so" count="7">
+	</image>
+	<image name="/usr/lib64/libgtk-x11-2.0.so.0.1400.5" count="22">
+	</image>
+	<image name="/usr/lib64/libpangocairo-1.0.so.0.2203.0" count="4">
+	</image>
+	<image name="/usr/lib64/libXrender.so.1.3.0" count="2">
+	</image>
+</model-data>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_sessions.xml b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_sessions.xml
new file mode 100644
index 0000000..2c3016d
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_sessions.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sessions>
+	<event name="BR_INST_EXEC">
+		<session name="current">
+		</session>
+	</event>
+	<event name="CPU_CLK_UNHALTED">
+		<session name="saved">
+		</session>
+	</event>
+	<event name="UOPS_RETIRED">
+		<session name="current">
+		</session>
+		<session name="&quot;&lt;&gt;&amp;&apos;">
+		</session>
+	</event>
+</sessions>
+				
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/AllCoreTests.java b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/AllCoreTests.java
new file mode 100644
index 0000000..f89f6aa
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/AllCoreTests.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.oprofile.core.tests;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllCoreTests {
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite("Test for org.eclipse.linuxtools.oprofile.core.tests"); //$NON-NLS-1$
+		
+		suite.addTestSuite(TestModelDataParse.class);
+		suite.addTestSuite(TestSessionsParse.class);
+		suite.addTestSuite(TestCheckEventsParse.class);
+		suite.addTestSuite(TestInfoParse.class);
+		suite.addTestSuite(TestDataModel.class);
+		
+		return suite;
+	}
+
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/CoreTestsPlugin.java b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/CoreTestsPlugin.java
new file mode 100644
index 0000000..dfc0de8
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/CoreTestsPlugin.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.oprofile.core.tests;
+
+import org.eclipse.core.runtime.Plugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class CoreTestsPlugin extends Plugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.oprofile.core.tests"; //$NON-NLS-1$
+
+	// The shared instance
+	private static CoreTestsPlugin plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public CoreTestsPlugin() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static CoreTestsPlugin getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestCheckEventsParse.java b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestCheckEventsParse.java
new file mode 100644
index 0000000..71fe76c
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestCheckEventsParse.java
@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.oprofile.core.tests;
+
+import java.io.FileReader;
+
+import javax.xml.parsers.SAXParserFactory;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.oprofile.core.opxml.OprofileSAXHandler;
+import org.eclipse.linuxtools.oprofile.core.opxml.checkevent.CheckEventsProcessor;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+
+public class TestCheckEventsParse extends TestCase {
+	private static final String REL_PATH_TO_TEST_XML_OK = "resources/test_check-event_ok.xml"; //$NON-NLS-1$
+	private static final String REL_PATH_TO_TEST_XML_INVALID_EVENT = "resources/test_check-event_invalid_event.xml"; //$NON-NLS-1$
+	private static final String REL_PATH_TO_TEST_XML_INVALID_UMASK = "resources/test_check-event_invalid_umask.xml"; //$NON-NLS-1$
+	private static final String REL_PATH_TO_TEST_XML_INVALID_COUNTER = "resources/test_check-event_invalid_counter.xml"; //$NON-NLS-1$
+	private int[] test_ok, test_invalid_event, test_invalid_umask, test_invalid_counter;
+
+	public TestCheckEventsParse() {
+		super("test check-event parsers"); //$NON-NLS-1$
+	}
+	
+	@Override
+	protected void setUp() throws Exception {
+		test_ok = new int[1];
+		setUpHelper(REL_PATH_TO_TEST_XML_OK, test_ok);
+		test_invalid_event = new int[1];
+		setUpHelper(REL_PATH_TO_TEST_XML_INVALID_EVENT, test_invalid_event);
+		test_invalid_umask = new int[1];
+		setUpHelper(REL_PATH_TO_TEST_XML_INVALID_UMASK, test_invalid_umask);
+		test_invalid_counter = new int[1];
+		setUpHelper(REL_PATH_TO_TEST_XML_INVALID_COUNTER, test_invalid_counter);
+	}
+	
+	//helper
+	private void setUpHelper(String fileToParse, final int[] resultArray) throws Exception {
+		/* this code mostly taken from OpxmlRunner */
+		XMLReader reader = null;
+		OprofileSAXHandler handler = OprofileSAXHandler.getInstance(resultArray);
+		
+		// Create XMLReader
+        SAXParserFactory factory = SAXParserFactory.newInstance();
+		reader = factory.newSAXParser().getXMLReader();
+		
+		// Set content/error handlers
+		reader.setContentHandler(handler);
+		reader.setErrorHandler(handler);
+		
+		String filePath = FileLocator.toFileURL(FileLocator.find(CoreTestsPlugin.getDefault().getBundle(), new Path(fileToParse), null)).getFile();
+		reader.parse(new InputSource(new FileReader(filePath)));
+	}
+	
+	public void testParse() {
+		assertEquals(CheckEventsProcessor.EVENT_OK, test_ok[0]);
+		assertEquals(CheckEventsProcessor.INVALID_EVENT, test_invalid_event[0]);
+		assertEquals(CheckEventsProcessor.INVALID_UMASK, test_invalid_umask[0]);
+		assertEquals(CheckEventsProcessor.INVALID_COUNTER, test_invalid_counter[0]);
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestDataModel.java b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestDataModel.java
new file mode 100644
index 0000000..c50573e
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestDataModel.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.core.tests;
+
+import junit.framework.TestCase;
+
+import org.eclipse.linuxtools.oprofile.core.model.OpModelEvent;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelImage;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelSession;
+import org.eclipse.linuxtools.oprofile.tests.TestingOpModelRoot;
+
+public class TestDataModel extends TestCase {
+	private TestingOpModelRoot _testRoot;
+	
+	public TestDataModel() {
+		super("test data model"); //$NON-NLS-1$
+	}
+	
+	@Override
+	protected void setUp() throws Exception {
+		_testRoot = new TestingOpModelRoot();
+		_testRoot.refreshModel();
+	}
+	
+	public void testParse() {
+		OpModelEvent[] events = _testRoot.getEvents();
+		assertEquals(3, events.length);
+		assertEquals(TestingOpModelRoot.NAME_E1, events[0].getName());
+		assertEquals(TestingOpModelRoot.NAME_E2, events[1].getName());
+		
+		OpModelSession[] e1_sessions = events[0].getSessions(), e2_sessions = events[1].getSessions();
+		assertEquals(1, e1_sessions.length);
+		assertEquals(4, e2_sessions.length);
+		
+		assertEquals(205000, e1_sessions[0].getCount());
+		assertEquals(205000, e2_sessions[0].getCount());
+		assertEquals(200000, e2_sessions[1].getCount());
+		assertEquals(OpModelImage.IMAGE_PARSE_ERROR, e2_sessions[2].getCount());
+		assertEquals(0, e2_sessions[3].getCount());
+		
+		assertEquals(TestingOpModelRoot.NAME_E1_S1, e1_sessions[0].getName());
+		assertEquals(TestingOpModelRoot.NAME_E2_S1, e2_sessions[0].getName());
+		assertEquals(TestingOpModelRoot.NAME_E2_S2, e2_sessions[1].getName());
+		assertEquals(TestingOpModelRoot.NAME_E2_S3, e2_sessions[2].getName());
+		assertEquals(TestingOpModelRoot.NAME_E2_S4, e2_sessions[3].getName());
+		
+		//further image parsing is tested in the TestModelDataParse testParse
+	}
+	
+	public void testStringOutput() {
+		assertEquals(TestingOpModelRoot.ROOT_OUTPUT, _testRoot.toString());
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestInfoParse.java b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestInfoParse.java
new file mode 100644
index 0000000..f962b31
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestInfoParse.java
@@ -0,0 +1,418 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.oprofile.core.tests;
+
+import java.io.FileReader;
+
+import javax.xml.parsers.SAXParserFactory;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.oprofile.core.daemon.OpEvent;
+import org.eclipse.linuxtools.oprofile.core.daemon.OpInfo;
+import org.eclipse.linuxtools.oprofile.core.daemon.OpUnitMask;
+import org.eclipse.linuxtools.oprofile.core.opxml.OprofileSAXHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+
+public class TestInfoParse extends TestCase {
+	private static final String REL_PATH_TO_TEST_XML = "resources/test_info.xml"; //$NON-NLS-1$
+	private static final String REL_PATH_TO_TEST_XML_0CTR = "resources/test_info_0ctrs.xml"; //$NON-NLS-1$
+	
+	private OpInfo info; 
+	private OpInfo info_0ctr; 
+
+	
+	public TestInfoParse() {
+		super("test info parsers"); //$NON-NLS-1$
+	}
+	
+	@Override
+	protected void setUp() throws Exception {
+		/* this code mostly taken from OpxmlRunner */
+		XMLReader reader = null;
+		info = new OpInfo();
+		OprofileSAXHandler handler = OprofileSAXHandler.getInstance(info);
+		
+		// Create XMLReader
+        SAXParserFactory factory = SAXParserFactory.newInstance();
+		reader = factory.newSAXParser().getXMLReader();
+		
+		// Set content/error handlers
+		reader.setContentHandler(handler);
+		reader.setErrorHandler(handler);
+		
+		String filePath = FileLocator.toFileURL(FileLocator.find(CoreTestsPlugin.getDefault().getBundle(), new Path(REL_PATH_TO_TEST_XML), null)).getFile();
+		reader.parse(new InputSource(new FileReader(filePath)));
+		
+		info_0ctr = new OpInfo();
+		handler = OprofileSAXHandler.getInstance(info_0ctr);
+		
+		// Set content/error handlers
+		reader.setContentHandler(handler);
+		reader.setErrorHandler(handler);
+		
+		filePath = FileLocator.toFileURL(FileLocator.find(CoreTestsPlugin.getDefault().getBundle(), new Path(REL_PATH_TO_TEST_XML_0CTR), null)).getFile();
+		reader.parse(new InputSource(new FileReader(filePath)));
+	}
+	
+	public void testParse() {
+		assertEquals("/var/lib/oprofile/samples/", info.getDefault(OpInfo.DEFAULT_SAMPLE_DIR)); //$NON-NLS-1$
+		assertEquals("/var/lib/oprofile/lock", info.getDefault(OpInfo.DEFAULT_LOCK_FILE)); //$NON-NLS-1$
+		assertEquals("/var/lib/oprofile/samples/oprofiled.log", info.getDefault(OpInfo.DEFAULT_LOG_FILE)); //$NON-NLS-1$
+		assertEquals("/var/lib/oprofile/complete_dump", info.getDefault(OpInfo.DEFAULT_DUMP_STATUS)); //$NON-NLS-1$
+		assertTrue(info.getTimerMode());
+		
+		assertEquals((double)800, info.getCPUSpeed());
+		assertEquals(2, info.getNrCounters());
+
+		OpEvent[] ctr0_events = info.getEvents(0), ctr1_events = info.getEvents(1);
+		assertEquals(3, ctr0_events.length);
+		assertEquals(3, ctr1_events.length);
+		
+		OpEvent ctr0_e1 = ctr0_events[0], ctr0_e2 = ctr0_events[1], ctr0_e3 = ctr0_events[2], 
+				ctr1_e1 = ctr1_events[0], ctr1_e2 = ctr1_events[1], ctr1_e3 = ctr1_events[2];
+		//events must be ordered alphabetically
+		assertEquals(6000, ctr0_e1.getMinCount());
+		assertEquals(60, ctr0_e1.getNumber());
+		assertEquals("CPU_CLK_UNHALTED", ctr0_e1.getText()); //$NON-NLS-1$
+		assertEquals("Clock cycles when not halted", ctr0_e1.getTextDescription()); //$NON-NLS-1$
+		assertEquals(500, ctr0_e2.getMinCount());
+		assertEquals(8, ctr0_e2.getNumber());
+		assertEquals("DTLB_MISSES", ctr0_e2.getText()); //$NON-NLS-1$
+		assertEquals("DTLB miss events", ctr0_e2.getTextDescription()); //$NON-NLS-1$
+		assertEquals(6000, ctr0_e3.getMinCount());
+		assertEquals(192, ctr0_e3.getNumber());
+		assertEquals("INST_RETIRED_ANY_P", ctr0_e3.getText()); //$NON-NLS-1$
+		assertEquals("number of instructions retired", ctr0_e3.getTextDescription()); //$NON-NLS-1$
+		assertEquals(500, ctr1_e1.getMinCount());
+		assertEquals(58, ctr1_e1.getNumber());
+		assertEquals("EIST_TRANS_ALL", ctr1_e1.getText()); //$NON-NLS-1$
+		assertEquals("Intel(tm) Enhanced SpeedStep(r) Technology transitions", ctr1_e1.getTextDescription()); //$NON-NLS-1$
+		assertEquals(500, ctr1_e2.getMinCount());
+		assertEquals(38, ctr1_e2.getNumber());
+		assertEquals("L2_LINES_OUT", ctr1_e2.getText()); //$NON-NLS-1$
+		assertEquals("number of recovered lines from L2", ctr1_e2.getTextDescription()); //$NON-NLS-1$
+		assertEquals(500, ctr1_e3.getMinCount());
+		assertEquals(37, ctr1_e3.getNumber());
+		assertEquals("L2_M_LINES_IN", ctr1_e3.getText()); //$NON-NLS-1$
+		assertEquals("number of modified lines allocated in L2", ctr1_e3.getTextDescription()); //$NON-NLS-1$
+		
+		OpUnitMask ctr0_e1_mask = ctr0_e1.getUnitMask(), ctr0_e2_mask = ctr0_e2.getUnitMask(), 
+					ctr0_e3_mask = ctr0_e3.getUnitMask(), ctr1_e1_mask = ctr1_e1.getUnitMask(), 
+					ctr1_e2_mask = ctr1_e2.getUnitMask(), ctr1_e3_mask = ctr1_e3.getUnitMask();
+		
+		assertEquals(0, ctr0_e1_mask.getMaskValue());
+		assertEquals(OpUnitMask.EXCLUSIVE, ctr0_e1_mask.getType());
+		assertEquals(3, ctr0_e1_mask.getNumMasks());
+		assertEquals(0, ctr0_e1_mask.getMaskFromIndex(0));
+		assertEquals("Unhalted core cycles", ctr0_e1_mask.getText(0)); //$NON-NLS-1$
+		assertEquals(1, ctr0_e1_mask.getMaskFromIndex(1));
+		assertEquals("Unhalted bus cycles", ctr0_e1_mask.getText(1)); //$NON-NLS-1$
+		assertEquals(2, ctr0_e1_mask.getMaskFromIndex(2));
+		assertEquals("Unhalted bus cycles of this core while the other core is halted", ctr0_e1_mask.getText(2)); //$NON-NLS-1$
+
+		assertEquals(15, ctr0_e2_mask.getMaskValue());
+		assertEquals(OpUnitMask.BITMASK, ctr0_e2_mask.getType());
+		assertEquals(4, ctr0_e2_mask.getNumMasks());
+		assertEquals(1, ctr0_e2_mask.getMaskFromIndex(0));
+		assertEquals("ANY	Memory accesses that missed the DTLB.", ctr0_e2_mask.getText(0)); //$NON-NLS-1$
+		assertEquals(2, ctr0_e2_mask.getMaskFromIndex(1));
+		assertEquals("MISS_LD	DTLB misses due to load operations.", ctr0_e2_mask.getText(1)); //$NON-NLS-1$
+		assertEquals(4, ctr0_e2_mask.getMaskFromIndex(2));
+		assertEquals("L0_MISS_LD L0 DTLB misses due to load operations.", ctr0_e2_mask.getText(2)); //$NON-NLS-1$
+		assertEquals(8, ctr0_e2_mask.getMaskFromIndex(3));
+		assertEquals("MISS_ST	TLB misses due to store operations.", ctr0_e2_mask.getText(3)); //$NON-NLS-1$
+
+		assertEquals(0, ctr0_e3_mask.getMaskValue());
+		assertEquals(OpUnitMask.MANDATORY, ctr0_e3_mask.getType());
+		assertEquals(1, ctr0_e3_mask.getNumMasks());
+		assertEquals(0, ctr0_e3_mask.getMaskFromIndex(0));
+		assertEquals("No unit mask", ctr0_e3_mask.getText(0)); //$NON-NLS-1$
+
+		assertEquals(1, ctr1_e1_mask.getMaskValue());
+		assertEquals(OpUnitMask.INVALID, ctr1_e1_mask.getType());
+		assertEquals(1, ctr1_e1_mask.getNumMasks());
+		assertEquals(-1, ctr1_e1_mask.getMaskFromIndex(0));		//-1 because of invalid mask type
+		assertEquals("No unit mask", ctr1_e1_mask.getText(0)); //$NON-NLS-1$
+		
+		assertEquals(112, ctr1_e2_mask.getMaskValue());
+		assertEquals(OpUnitMask.BITMASK, ctr1_e2_mask.getType());
+		assertEquals(5, ctr1_e2_mask.getNumMasks());
+		assertEquals(192, ctr1_e2_mask.getMaskFromIndex(0));
+		assertEquals("core: all cores", ctr1_e2_mask.getText(0)); //$NON-NLS-1$
+		assertEquals(64, ctr1_e2_mask.getMaskFromIndex(1));
+		assertEquals("core: this core", ctr1_e2_mask.getText(1)); //$NON-NLS-1$
+		assertEquals(48, ctr1_e2_mask.getMaskFromIndex(2));
+		assertEquals("prefetch: all inclusive", ctr1_e2_mask.getText(2)); //$NON-NLS-1$
+		assertEquals(16, ctr1_e2_mask.getMaskFromIndex(3));
+		assertEquals("prefetch: Hardware prefetch only", ctr1_e2_mask.getText(3)); //$NON-NLS-1$
+		assertEquals(0, ctr1_e2_mask.getMaskFromIndex(4));
+		assertEquals("prefetch: exclude hardware prefetch", ctr1_e2_mask.getText(4)); //$NON-NLS-1$
+		
+		assertEquals(64, ctr1_e3_mask.getMaskValue());
+		assertEquals(OpUnitMask.EXCLUSIVE, ctr1_e3_mask.getType());
+		assertEquals(2, ctr1_e3_mask.getNumMasks());
+		assertEquals(192, ctr1_e3_mask.getMaskFromIndex(0));
+		assertEquals("All cores", ctr1_e3_mask.getText(0)); //$NON-NLS-1$
+		assertEquals(64, ctr1_e3_mask.getMaskFromIndex(1));
+		assertEquals("This core", ctr1_e3_mask.getText(1)); //$NON-NLS-1$
+		
+		assertNull(ctr0_e1_mask.getText(-1));
+				
+		assertEquals(0, info_0ctr.getNrCounters());
+	}
+	
+	public void testUnitMask() throws Exception {
+		//test types of masks setting/unsetting
+		OpUnitMask mask_bit1 = info.getEvents(0)[1].getUnitMask(),
+//					mask_bit2 = info.getEvents(1)[1].getUnitMask(),
+					mask_exl = info.getEvents(0)[0].getUnitMask(),
+					mask_mand = info.getEvents(0)[2].getUnitMask(),
+					mask_invalid = info.getEvents(1)[0].getUnitMask();
+		
+		//bitmask 1 test -- bitmasks all mutually exclusive
+		assertEquals(15, mask_bit1.getMaskValue());
+		mask_bit1.setMaskValue(0);
+		mask_bit1.setMaskFromIndex(0);
+		assertEquals(true, mask_bit1.isMaskSetFromIndex(0));
+		assertEquals(false, mask_bit1.isMaskSetFromIndex(1));
+		assertEquals(false, mask_bit1.isMaskSetFromIndex(2));
+		assertEquals(false, mask_bit1.isMaskSetFromIndex(3));
+		assertEquals(1, mask_bit1.getMaskValue());
+		
+		mask_bit1.setMaskFromIndex(1);
+		assertEquals(true, mask_bit1.isMaskSetFromIndex(0));
+		assertEquals(true, mask_bit1.isMaskSetFromIndex(1));
+		assertEquals(false, mask_bit1.isMaskSetFromIndex(2));
+		assertEquals(false, mask_bit1.isMaskSetFromIndex(3));
+		assertEquals(3, mask_bit1.getMaskValue());
+		
+		mask_bit1.setMaskFromIndex(2);
+		assertEquals(true, mask_bit1.isMaskSetFromIndex(0));
+		assertEquals(true, mask_bit1.isMaskSetFromIndex(1));
+		assertEquals(true, mask_bit1.isMaskSetFromIndex(2));
+		assertEquals(false, mask_bit1.isMaskSetFromIndex(3));
+		assertEquals(7, mask_bit1.getMaskValue());
+		
+		mask_bit1.setMaskFromIndex(3);
+		assertEquals(true, mask_bit1.isMaskSetFromIndex(0));
+		assertEquals(true, mask_bit1.isMaskSetFromIndex(1));
+		assertEquals(true, mask_bit1.isMaskSetFromIndex(2));
+		assertEquals(true, mask_bit1.isMaskSetFromIndex(3));
+		assertEquals(15, mask_bit1.getMaskValue());
+		
+		mask_bit1.unSetMaskFromIndex(1);
+		assertEquals(true, mask_bit1.isMaskSetFromIndex(0));
+		assertEquals(false, mask_bit1.isMaskSetFromIndex(1));
+		assertEquals(true, mask_bit1.isMaskSetFromIndex(2));
+		assertEquals(true, mask_bit1.isMaskSetFromIndex(3));
+
+		mask_bit1.unSetMaskFromIndex(2);
+		assertEquals(true, mask_bit1.isMaskSetFromIndex(0));
+		assertEquals(false, mask_bit1.isMaskSetFromIndex(1));
+		assertEquals(false, mask_bit1.isMaskSetFromIndex(2));
+		assertEquals(true, mask_bit1.isMaskSetFromIndex(3));
+
+		mask_bit1.unSetMaskFromIndex(3);
+		assertEquals(true, mask_bit1.isMaskSetFromIndex(0));
+		assertEquals(false, mask_bit1.isMaskSetFromIndex(1));
+		assertEquals(false, mask_bit1.isMaskSetFromIndex(2));
+		assertEquals(false, mask_bit1.isMaskSetFromIndex(3));
+
+		mask_bit1.setMaskFromIndex(2);
+		assertEquals(true, mask_bit1.isMaskSetFromIndex(0));
+		assertEquals(false, mask_bit1.isMaskSetFromIndex(1));
+		assertEquals(true, mask_bit1.isMaskSetFromIndex(2));
+		assertEquals(false, mask_bit1.isMaskSetFromIndex(3));
+		assertEquals(5, mask_bit1.getMaskValue());
+		
+		mask_bit1.unSetMaskFromIndex(1);
+		assertEquals(true, mask_bit1.isMaskSetFromIndex(0));
+		assertEquals(false, mask_bit1.isMaskSetFromIndex(1));
+		assertEquals(true, mask_bit1.isMaskSetFromIndex(2));
+		assertEquals(false, mask_bit1.isMaskSetFromIndex(3));
+		
+		mask_bit1.unSetMaskFromIndex(3);
+		assertEquals(true, mask_bit1.isMaskSetFromIndex(0));
+		assertEquals(false, mask_bit1.isMaskSetFromIndex(1));
+		assertEquals(true, mask_bit1.isMaskSetFromIndex(2));
+		assertEquals(false, mask_bit1.isMaskSetFromIndex(3));
+		assertEquals(5, mask_bit1.getMaskValue());
+		
+		mask_bit1.setMaskFromIndex(2);
+		assertEquals(true, mask_bit1.isMaskSetFromIndex(0));
+		assertEquals(false, mask_bit1.isMaskSetFromIndex(1));
+		assertEquals(true, mask_bit1.isMaskSetFromIndex(2));
+		assertEquals(false, mask_bit1.isMaskSetFromIndex(3));
+		assertEquals(5, mask_bit1.getMaskValue());
+		
+		mask_bit1.setMaskValue(OpUnitMask.SET_DEFAULT_MASK);
+		assertEquals(15, mask_bit1.getMaskValue());
+
+		//bitmask 2 test -- bitmasks overlap
+			/* bug related to overlapping bitmasks eclipse bz 261917 */
+//		assertEquals(112, mask_bit2.getMaskValue());
+//		mask_bit2.setMaskValue(0);
+//		mask_bit2.setMaskFromIndex(0); 
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(0));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(1));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(2));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(3));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(4));
+////		assertEquals(192, mask_bit2.getMaskValue());
+//		
+//		mask_bit2.setMaskFromIndex(1);
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(0));
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(1));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(2));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(3));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(4));
+////		assertEquals(3, mask_bit2.getMaskValue());
+//		
+//		mask_bit2.setMaskFromIndex(2);
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(0));
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(1));
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(2));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(3));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(4));
+////		assertEquals(7, mask_bit2.getMaskValue());
+//		
+//		mask_bit2.setMaskFromIndex(3);
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(0));
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(1));
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(2));
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(3));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(4));
+////		assertEquals(15, mask_bit2.getMaskValue());
+//		
+//		mask_bit2.setMaskFromIndex(4);
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(0));
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(1));
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(2));
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(3));
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(4));
+////		assertEquals(15, mask_bit2.getMaskValue());
+//		
+//		mask_bit2.unSetMaskFromIndex(1);
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(0));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(1));
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(2));
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(3));
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(4));
+//
+//		mask_bit2.unSetMaskFromIndex(2);
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(0));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(1));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(2));
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(3));
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(4));
+//
+//		mask_bit2.unSetMaskFromIndex(3);
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(0));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(1));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(2));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(3));
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(4));
+//
+//		mask_bit2.unSetMaskFromIndex(4);
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(0));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(1));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(2));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(3));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(4));
+//		
+//		mask_bit2.setMaskFromIndex(2);
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(0));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(1));
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(2));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(3));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(4));
+////		assertEquals(5, mask_bit2.getMaskValue());
+//		
+//		mask_bit2.unSetMaskFromIndex(1);
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(0));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(1));
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(2));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(3));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(4));
+//		
+//		mask_bit2.unSetMaskFromIndex(3);
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(0));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(1));
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(2));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(3));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(4));
+////		assertEquals(5, mask_bit2.getMaskValue());
+//		
+//		mask_bit2.setMaskFromIndex(2);
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(0));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(1));
+//		assertEquals(true, mask_bit2.isMaskSetFromIndex(2));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(3));
+//		assertEquals(false, mask_bit2.isMaskSetFromIndex(4));
+////		assertEquals(5, mask_bit2.getMaskValue());
+//		
+//		mask_bit2.setMaskValue(OpUnitMask.SET_DEFAULT_MASK);
+//		assertEquals(112, mask_bit2.getMaskValue());
+		
+		
+		//exclusive test
+		assertEquals(0, mask_exl.getMaskValue());
+		assertEquals(true, mask_exl.isMaskSetFromIndex(0));
+		assertEquals(false, mask_exl.isMaskSetFromIndex(1));
+		assertEquals(false, mask_exl.isMaskSetFromIndex(2));
+		mask_exl.setMaskFromIndex(1);
+		assertEquals(false, mask_exl.isMaskSetFromIndex(0));
+		assertEquals(1, mask_exl.getMaskValue());
+		mask_exl.unSetMaskFromIndex(1);
+		assertEquals(1, mask_exl.getMaskValue());
+		mask_exl.setMaskFromIndex(2);
+		assertEquals(2, mask_exl.getMaskValue());
+		mask_exl.setDefaultMaskValue();
+		assertEquals(0, mask_exl.getMaskValue());
+		
+		
+		//mandatory test
+		assertEquals(0, mask_mand.getMaskValue());
+		assertEquals(false, mask_mand.isMaskSetFromIndex(0));
+		mask_mand.setMaskFromIndex(0);
+		assertEquals(0, mask_mand.getMaskValue());
+		mask_mand.unSetMaskFromIndex(0);
+		assertEquals(0, mask_mand.getMaskValue());
+		mask_mand.setMaskValue(10);
+		mask_mand.setDefaultMaskValue();
+		assertEquals(0, mask_mand.getMaskValue());
+		
+		//invalid test
+		assertEquals(1, mask_invalid.getMaskValue());
+		assertEquals(false, mask_invalid.isMaskSetFromIndex(0));
+		mask_invalid.setMaskFromIndex(0);
+		assertEquals(1, mask_invalid.getMaskValue());
+		mask_invalid.unSetMaskFromIndex(0);
+		assertEquals(1, mask_invalid.getMaskValue());
+		mask_invalid.setMaskValue(0);
+		mask_invalid.setDefaultMaskValue();
+		assertEquals(1, mask_invalid.getMaskValue());
+	}
+	
+	public void testInfo() throws Exception {
+		OpEvent[] result = info.getEvents(-1);
+		assertEquals(0, result.length);
+
+		assertNull(info.findEvent("doesnt exist")); //$NON-NLS-1$
+		
+		OpEvent event = info.findEvent("CPU_CLK_UNHALTED"); //$NON-NLS-1$
+		assertEquals("CPU_CLK_UNHALTED", event.getText()); //$NON-NLS-1$
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestModelDataParse.java b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestModelDataParse.java
new file mode 100644
index 0000000..6311d7d
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestModelDataParse.java
@@ -0,0 +1,180 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.core.tests;
+
+import java.io.FileReader;
+
+import javax.xml.parsers.SAXParserFactory;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelImage;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelSample;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelSymbol;
+import org.eclipse.linuxtools.oprofile.core.opxml.OprofileSAXHandler;
+import org.eclipse.linuxtools.oprofile.core.opxml.modeldata.ModelDataProcessor;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+
+public class TestModelDataParse extends TestCase {
+	private static final String REL_PATH_TO_TEST_XML = "resources/test_model-data.xml"; //$NON-NLS-1$
+	private static final String REL_PATH_TO_TEST_XML_MULTI_IMAGE = "resources/test_model-data_multiple_image.xml"; //$NON-NLS-1$
+	private static final String IMAGE_OUTPUT = "/test/path/for/image, Count: 205000, Dependent Count: 5000\nSymbols: TestFunction1(int), File: /test/path/for/src/image.cpp, Count: 180000\n\tSample: Line #: 42, Count: 130000\n\tSample: Line #: 36, Count: 40000\n\tSample: Line #: 31, Count: 9999\n\tSample: Line #: 39, Count: 1\nSymbols: TestFunction2(int, int), File: /test/path/for/src/image2.cpp, Count: 20000\n\tSample: Line #: 94, Count: 19998\n\tSample: Line #: 12, Count: 1\n\tSample: Line #: 55, Count: 1\nDependent Image: /no-vmlinux, Count: 4400\nDependent Image: /lib64/ld-2.9.so, Count: 300\n\tSymbols: do_lookup_x, File: dl-lookup.c, Count: 299\n\t\tSample: Line #: 0, Count: 299\n\tSymbols: _dl_unload_cache, File: rawmemchr.c, Count: 1\n\t\tSample: Line #: 0, Count: 1\nDependent Image: /usr/lib64/libstdc++.so.6.0.10, Count: 160\nDependent Image: /lib64/libc-2.9.so, Count: 140\n\tSymbols: _IO_new_file_seekoff, File: , Count: 100\n\t\tSample: Line #: 0, Count: 100\n\tSymbols: bool std::operator!=<char, std::char_traits<char>, std::allocator<char> >(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, char const*), File: , Count: 40\n\t\tSample: Line #: 0, Count: 40\n"; //$NON-NLS-1$
+	private static final String IMAGE_OUTPUT_WITHTAB = "/test/path/for/image, Count: 205000, Dependent Count: 5000\n\tSymbols: TestFunction1(int), File: /test/path/for/src/image.cpp, Count: 180000\n\t\tSample: Line #: 42, Count: 130000\n\t\tSample: Line #: 36, Count: 40000\n\t\tSample: Line #: 31, Count: 9999\n\t\tSample: Line #: 39, Count: 1\n\tSymbols: TestFunction2(int, int), File: /test/path/for/src/image2.cpp, Count: 20000\n\t\tSample: Line #: 94, Count: 19998\n\t\tSample: Line #: 12, Count: 1\n\t\tSample: Line #: 55, Count: 1\n\tDependent Image: /no-vmlinux, Count: 4400\n\tDependent Image: /lib64/ld-2.9.so, Count: 300\n\t\tSymbols: do_lookup_x, File: dl-lookup.c, Count: 299\n\t\t\tSample: Line #: 0, Count: 299\n\t\tSymbols: _dl_unload_cache, File: rawmemchr.c, Count: 1\n\t\t\tSample: Line #: 0, Count: 1\n\tDependent Image: /usr/lib64/libstdc++.so.6.0.10, Count: 160\n\tDependent Image: /lib64/libc-2.9.so, Count: 140\n\t\tSymbols: _IO_new_file_seekoff, File: , Count: 100\n\t\t\tSample: Line #: 0, Count: 100\n\t\tSymbols: bool std::operator!=<char, std::char_traits<char>, std::allocator<char> >(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, char const*), File: , Count: 40\n\t\t\tSample: Line #: 0, Count: 40\n"; //$NON-NLS-1$
+
+	private OpModelImage parsedImage;
+	private OpModelImage parsedErrorImage;
+
+	public TestModelDataParse() {
+		super("test model-data parsers"); //$NON-NLS-1$
+	}
+	
+	@Override
+	protected void setUp() throws Exception {
+		/* this code mostly taken from OpxmlRunner */
+		XMLReader reader = null;
+		parsedImage = new OpModelImage();
+		ModelDataProcessor.CallData image = new ModelDataProcessor.CallData(parsedImage);
+		OprofileSAXHandler handler = OprofileSAXHandler.getInstance(image);
+		
+		// Create XMLReader
+        SAXParserFactory factory = SAXParserFactory.newInstance();
+		reader = factory.newSAXParser().getXMLReader();
+		
+		// Set content/error handlers
+		reader.setContentHandler(handler);
+		reader.setErrorHandler(handler);
+		
+		String filePath = FileLocator.toFileURL(FileLocator.find(CoreTestsPlugin.getDefault().getBundle(), new Path(REL_PATH_TO_TEST_XML), null)).getFile();
+		reader.parse(new InputSource(new FileReader(filePath)));
+
+		//2nd test image
+		parsedErrorImage = new OpModelImage();
+		ModelDataProcessor.CallData errorImage = new ModelDataProcessor.CallData(parsedErrorImage);
+		handler = OprofileSAXHandler.getInstance(errorImage);
+		
+		// Set content/error handlers
+		reader.setContentHandler(handler);
+		reader.setErrorHandler(handler);
+		
+		filePath = FileLocator.toFileURL(FileLocator.find(CoreTestsPlugin.getDefault().getBundle(), new Path(REL_PATH_TO_TEST_XML_MULTI_IMAGE), null)).getFile();
+		reader.parse(new InputSource(new FileReader(filePath)));
+	}
+	
+	public void testParse() {
+		//test attributes
+		assertEquals("/test/path/for/image", parsedImage.getName()); //$NON-NLS-1$
+		assertEquals(205000, parsedImage.getCount());
+		
+		//test symbols
+		OpModelSymbol[] symbols = parsedImage.getSymbols();
+		assertEquals(2, symbols.length);
+		OpModelSymbol sym1 = symbols[0], sym2 = symbols[1];
+		assertEquals("TestFunction1(int)", sym1.getName()); //$NON-NLS-1$
+		assertEquals("/test/path/for/src/image.cpp", sym1.getFile()); //$NON-NLS-1$
+		assertEquals(180000, sym1.getCount());
+		assertEquals("TestFunction2(int, int)", sym2.getName()); //$NON-NLS-1$
+		assertEquals("/test/path/for/src/image2.cpp", sym2.getFile()); //$NON-NLS-1$
+		assertEquals(20000, sym2.getCount());
+		
+		//test samples
+		OpModelSample[] sym1_spls = sym1.getSamples(), sym2_spls = sym2.getSamples();
+		assertEquals(4, sym1_spls.length);
+		assertEquals(3, sym2_spls.length);
+		OpModelSample sym1_spl1 = sym1_spls[0], sym1_spl2 = sym1_spls[1], sym1_spl3 = sym1_spls[2], sym1_spl4 = sym1_spls[3];
+		OpModelSample sym2_spl1 = sym2_spls[0], sym2_spl2 = sym2_spls[1], sym2_spl3 = sym2_spls[2];
+		assertEquals(130000, sym1_spl1.getCount());
+		assertEquals(42, sym1_spl1.getLine());
+		assertEquals(40000, sym1_spl2.getCount());
+		assertEquals(36, sym1_spl2.getLine());
+		assertEquals(9999, sym1_spl3.getCount());
+		assertEquals(31, sym1_spl3.getLine());
+		assertEquals(1, sym1_spl4.getCount());
+		assertEquals(39, sym1_spl4.getLine());
+		assertEquals(19998, sym2_spl1.getCount());
+		assertEquals(94, sym2_spl1.getLine());
+		assertEquals(1, sym2_spl2.getCount());
+		assertEquals(12, sym2_spl2.getLine());
+		assertEquals(1, sym2_spl3.getCount());
+		assertEquals(55, sym2_spl3.getLine());
+		
+		//test dependent images
+		assertEquals(true, parsedImage.hasDependents());
+		assertEquals(5000, parsedImage.getDepCount());
+		OpModelImage[] deps = parsedImage.getDependents();
+		assertEquals(4, deps.length);
+		OpModelImage dep1 = deps[0], dep2 = deps[1], dep3 = deps[2], dep4 = deps[3];
+		
+		assertEquals(false, dep1.hasDependents());
+		assertEquals("/no-vmlinux", dep1.getName()); //$NON-NLS-1$
+		assertEquals(4400, dep1.getCount());
+		
+		assertEquals(false, dep2.hasDependents());
+		OpModelSymbol[] dep2_syms = dep2.getSymbols();
+		assertEquals(2, dep2_syms.length);
+		OpModelSymbol dep2_sym1 = dep2_syms[0], dep2_sym2 = dep2_syms[1];
+		OpModelSample[] dep2_sym1_spls = dep2_sym1.getSamples(), dep2_sym2_spls = dep2_sym2.getSamples();
+		assertEquals(1, dep2_sym1_spls.length);
+		assertEquals(1, dep2_sym2_spls.length);
+		OpModelSample dep2_sym1_spl1 = dep2_sym1_spls[0], dep2_sym2_spl1 = dep2_sym2_spls[0];
+		assertEquals("/lib64/ld-2.9.so", dep2.getName()); //$NON-NLS-1$
+		assertEquals(300, dep2.getCount());
+		assertEquals("do_lookup_x", dep2_sym1.getName()); //$NON-NLS-1$
+		assertEquals("dl-lookup.c", dep2_sym1.getFile()); //$NON-NLS-1$
+		assertEquals(299, dep2_sym1.getCount());
+		assertEquals(299, dep2_sym1_spl1.getCount());
+		assertEquals(0, dep2_sym1_spl1.getLine());
+		assertEquals("_dl_unload_cache", dep2_sym2.getName()); //$NON-NLS-1$
+		assertEquals("rawmemchr.c", dep2_sym2.getFile()); //$NON-NLS-1$
+		assertEquals(1, dep2_sym2.getCount());
+		assertEquals(1, dep2_sym2_spl1.getCount());
+		assertEquals(0, dep2_sym2_spl1.getLine());
+
+		assertEquals(false, dep3.hasDependents());
+		assertEquals("/usr/lib64/libstdc++.so.6.0.10", dep3.getName()); //$NON-NLS-1$
+		assertEquals(160, dep3.getCount());
+		
+		assertEquals(false, dep4.hasDependents());
+		OpModelSymbol[] dep4_syms = dep4.getSymbols();
+		assertEquals(2, dep4_syms.length);
+		OpModelSymbol dep4_sym1 = dep4_syms[0], dep4_sym2 = dep4_syms[1];
+		OpModelSample[] dep4_sym1_spls = dep4_sym1.getSamples(), dep4_sym2_spls = dep4_sym2.getSamples();
+		assertEquals(1, dep4_sym1_spls.length);
+		assertEquals(1, dep4_sym2_spls.length);
+		OpModelSample dep4_sym1_spl1 = dep4_sym1_spls[0], dep4_sym2_spl1 = dep4_sym2_spls[0];
+		assertEquals("/lib64/libc-2.9.so", dep4.getName()); //$NON-NLS-1$
+		assertEquals(140, dep4.getCount());
+		assertEquals("_IO_new_file_seekoff", dep4_sym1.getName()); //$NON-NLS-1$
+		assertEquals("", dep4_sym1.getFile()); //$NON-NLS-1$
+		assertEquals(100, dep4_sym1.getCount());
+		assertEquals(100, dep4_sym1_spl1.getCount());
+		assertEquals(0, dep4_sym1_spl1.getLine());
+		assertEquals("bool std::operator!=<char, std::char_traits<char>, std::allocator<char> >(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, char const*)", dep4_sym2.getName()); //$NON-NLS-1$
+		assertEquals("", dep4_sym2.getFile()); //$NON-NLS-1$
+		assertEquals(40, dep4_sym2.getCount());
+		assertEquals(40, dep4_sym2_spl1.getCount());
+		assertEquals(0, dep4_sym2_spl1.getLine());
+		
+		
+		assertEquals(OpModelImage.IMAGE_PARSE_ERROR, parsedErrorImage.getCount());
+		assertEquals(0, parsedErrorImage.getDepCount());
+		assertNull(parsedErrorImage.getDependents());
+		assertNull(parsedErrorImage.getSymbols());
+		assertEquals("", parsedErrorImage.getName()); //$NON-NLS-1$
+	}
+	
+	public void testStringOutput() throws Exception {
+		assertEquals(IMAGE_OUTPUT, parsedImage.toString());
+		assertEquals(IMAGE_OUTPUT_WITHTAB, parsedImage.toString("\t")); //$NON-NLS-1$
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestSessionsParse.java b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestSessionsParse.java
new file mode 100644
index 0000000..4e585ff
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestSessionsParse.java
@@ -0,0 +1,115 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.oprofile.core.tests;
+
+import java.io.FileReader;
+import java.util.ArrayList;
+
+import javax.xml.parsers.SAXParserFactory;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelEvent;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelSession;
+import org.eclipse.linuxtools.oprofile.core.opxml.OprofileSAXHandler;
+import org.eclipse.linuxtools.oprofile.core.opxml.sessions.SessionsProcessor;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+
+public class TestSessionsParse extends TestCase {
+	private static final String REL_PATH_TO_TEST_XML = "resources/test_sessions.xml"; //$NON-NLS-1$
+	private static final String EVENT1_OUTPUT = "BR_INST_EXEC\nSession: current\n"; //$NON-NLS-1$
+	private static final String EVENT1_OUTPUT_WITHTAB = "BR_INST_EXEC\n\tSession: current\n"; //$NON-NLS-1$
+	private static final String EVENT2_OUTPUT = "CPU_CLK_UNHALTED\nSession: saved\n"; //$NON-NLS-1$
+	private static final String EVENT2_OUTPUT_WITHTAB = "CPU_CLK_UNHALTED\n\tSession: saved\n"; //$NON-NLS-1$
+	private static final String EVENT3_OUTPUT = "UOPS_RETIRED\nSession: current\nSession: \"<>&'\n"; //$NON-NLS-1$
+	private static final String EVENT3_OUTPUT_WITHTAB = "UOPS_RETIRED\n\tSession: current\n\tSession: \"<>&'\n"; //$NON-NLS-1$
+	
+	private ArrayList<OpModelEvent> eventList; 
+
+	
+	public TestSessionsParse() {
+		super("test sessions parsers"); //$NON-NLS-1$
+	}
+	
+	@Override
+	protected void setUp() throws Exception {
+		/* this code mostly taken from OpxmlRunner */
+		XMLReader reader = null;
+		eventList = new ArrayList<OpModelEvent>();
+		SessionsProcessor.SessionInfo sessioninfo = new SessionsProcessor.SessionInfo(eventList);
+		OprofileSAXHandler handler = OprofileSAXHandler.getInstance(sessioninfo);
+		
+		// Create XMLReader
+        SAXParserFactory factory = SAXParserFactory.newInstance();
+		reader = factory.newSAXParser().getXMLReader();
+		
+		// Set content/error handlers
+		reader.setContentHandler(handler);
+		reader.setErrorHandler(handler);
+		
+		String filePath = FileLocator.toFileURL(FileLocator.find(CoreTestsPlugin.getDefault().getBundle(), new Path(REL_PATH_TO_TEST_XML), null)).getFile();
+		reader.parse(new InputSource(new FileReader(filePath)));
+	}
+	
+	public void testParse() {
+		assertEquals(3, eventList.size());
+		OpModelEvent evt1 = eventList.get(0), evt2 = eventList.get(1), evt3 = eventList.get(2);
+		
+		assertEquals("BR_INST_EXEC", evt1.getName()); //$NON-NLS-1$
+		assertEquals("CPU_CLK_UNHALTED", evt2.getName()); //$NON-NLS-1$
+		assertEquals("UOPS_RETIRED", evt3.getName()); //$NON-NLS-1$
+		
+		OpModelSession[] evt1_ss = evt1.getSessions(), evt2_ss = evt2.getSessions(), evt3_ss = evt3.getSessions();
+		assertEquals(1, evt1_ss.length);
+		assertEquals(1, evt2_ss.length);
+		assertEquals(2, evt3_ss.length);
+		OpModelSession evt1_ss_s1 = evt1_ss[0];
+		OpModelSession evt2_ss_s1 = evt2_ss[0];
+		OpModelSession evt3_ss_s1 = evt3_ss[0];
+		OpModelSession evt3_ss_s2 = evt3_ss[1];
+		
+		assertEquals("current", evt1_ss_s1.getName()); //$NON-NLS-1$
+		assertEquals(true, evt1_ss_s1.isDefaultSession());
+		assertNull(evt1_ss_s1.getImage());
+		assertEquals(0, evt1_ss_s1.getCount());
+		assertEquals(evt1, evt1_ss_s1.getEvent());
+		
+		assertEquals("saved", evt2_ss_s1.getName()); //$NON-NLS-1$
+		assertEquals(false, evt2_ss_s1.isDefaultSession());
+		assertNull(evt2_ss_s1.getImage());
+		assertEquals(0, evt2_ss_s1.getCount());
+		assertEquals(evt2, evt2_ss_s1.getEvent());
+		
+		assertEquals("current", evt3_ss_s1.getName()); //$NON-NLS-1$
+		assertEquals(true, evt3_ss_s1.isDefaultSession());
+		assertNull(evt3_ss_s1.getImage());
+		assertEquals(0, evt3_ss_s1.getCount());
+		assertEquals(evt3, evt3_ss_s1.getEvent());
+		
+		assertEquals("\"<>&'", evt3_ss_s2.getName()); //$NON-NLS-1$
+		assertEquals(false, evt3_ss_s2.isDefaultSession());
+		assertNull(evt3_ss_s2.getImage());
+		assertEquals(0, evt3_ss_s2.getCount());
+		assertEquals(evt3, evt3_ss_s2.getEvent());
+	}
+	
+	public void testStringOutput() throws Exception {
+		assertEquals(EVENT1_OUTPUT, eventList.get(0).toString());
+		assertEquals(EVENT1_OUTPUT_WITHTAB, eventList.get(0).toString("\t")); //$NON-NLS-1$
+		assertEquals(EVENT2_OUTPUT, eventList.get(1).toString());
+		assertEquals(EVENT2_OUTPUT_WITHTAB, eventList.get(1).toString("\t")); //$NON-NLS-1$
+		assertEquals(EVENT3_OUTPUT, eventList.get(2).toString());
+		assertEquals(EVENT3_OUTPUT_WITHTAB, eventList.get(2).toString("\t")); //$NON-NLS-1$
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/test.xml b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/test.xml
new file mode 100644
index 0000000..0123d50
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/test.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+
+<project name="testsuite" default="run" basedir=".">
+	<property name="classname" value="org.eclipse.linuxtools.oprofile.core.tests.AllCoreTests" />
+	<property name="plugin-name" value="org.eclipse.linuxtools.oprofile.core.tests" />
+
+	<property name="library-file" value="${eclipse-home}/dropins/${subProjectName2}/plugins/org.eclipse.test/library.xml" />
+
+	<!-- The property ${eclipse-home} should be passed into this script -->
+	<!-- Set a meaningful default value for when it is not. -->
+	<property name="eclipse-home" value="${basedir}/../.." />
+
+	<!-- This target holds all initialization code that needs to be done for -->
+	<!-- all tests that are to be run. Initialization for individual tests -->
+	<!-- should be done within the body of the suite target. -->
+	<target name="init">
+		<tstamp />
+		<delete>
+			<fileset dir="${eclipse-home}" includes="org*.xml" />
+		</delete>
+	</target>
+
+	<!-- This target defines the tests that need to be run. -->
+	<target name="oprofile_core_suite">
+		<property name="oprofile-core-folder" value="${eclipse-home}/oprofile_core_folder" />
+		<delete dir="${oprofile-core-folder}" quiet="true" />
+		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="data-dir" value="${oprofile-core-folder}" />
+			<property name="plugin-name" value="${plugin-name}" />
+			<property name="classname" value="${classname}" />
+		</ant>
+	</target>
+
+	<!-- This target holds code to cleanup the testing environment after -->
+	<!-- after all of the tests have been run. You can use this target to -->
+	<!-- delete temporary files that have been created. -->
+	<target name="cleanup">
+		<mkdir dir="${results}/consolelogs" />
+		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
+	</target>
+
+	<!-- This target runs the test suite. Any actions that need to happen -->
+	<!-- after all the tests have been run should go here. -->
+	<target name="run" depends="init,oprofile_core_suite,cleanup">
+		<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="includes" value="org*.xml" />
+			<property name="output-file" value="${plugin-name}.xml" />
+		</ant>
+	</target>
+	
+    <target name="all" depends="run" description="Dummy target to run all tests">
+    </target>
+
+</project>
diff --git a/profiling/.classpath b/oprofile/org.eclipse.linuxtools.oprofile.core/.classpath
similarity index 100%
copy from profiling/.classpath
copy to oprofile/org.eclipse.linuxtools.oprofile.core/.classpath
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/.project b/oprofile/org.eclipse.linuxtools.oprofile.core/.project
new file mode 100644
index 0000000..f6a0d69
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.oprofile.core</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/.settings/org.eclipse.jdt.core.prefs b/oprofile/org.eclipse.linuxtools.oprofile.core/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..fdf3224
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Thu Jan 15 14:14:30 EST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/.svnignore b/oprofile/org.eclipse.linuxtools.oprofile.core/.svnignore
new file mode 100644
index 0000000..ba077a4
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/.svnignore
@@ -0,0 +1 @@
+bin
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/ChangeLog b/oprofile/org.eclipse.linuxtools.oprofile.core/ChangeLog
new file mode 100644
index 0000000..96f1804
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/ChangeLog
@@ -0,0 +1,21 @@
+2010-05-07  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/linuxtools/oprofile/core/oprofile.properties: Fix typo
+	with \find instead of \nfind. 
+
+2010-05-05  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/linuxtools/oprofile/core/oprofile.properties: Clean up
+	build/install instructions.
+
+2009-12-07  Andrew Overholt  <overholt@redhat.com>
+
+	Bug #297007
+
+	* natives/linux/opxml/move_opxml.sh: Fix release number.
+
+2009-10-29  Andrew Overholt  <overholt@redhat.com>
+
+	Bug #292172
+
+	* natives/linux/opxml/move_opxml.sh: Update release number. 
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/META-INF/MANIFEST.MF b/oprofile/org.eclipse.linuxtools.oprofile.core/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..c4343ce
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/META-INF/MANIFEST.MF
@@ -0,0 +1,21 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.oprofile.core;singleton:=true
+Bundle-Version: 0.3.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.oprofile.core.OprofileCorePlugin
+Bundle-Vendor: %bundleProvider
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.4.0",
+ org.eclipse.ui;bundle-version="3.4.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.linuxtools.oprofile.core,
+ org.eclipse.linuxtools.oprofile.core.daemon,
+ org.eclipse.linuxtools.oprofile.core.linux,
+ org.eclipse.linuxtools.oprofile.core.model,
+ org.eclipse.linuxtools.oprofile.core.opxml,
+ org.eclipse.linuxtools.oprofile.core.opxml.checkevent,
+ org.eclipse.linuxtools.oprofile.core.opxml.info,
+ org.eclipse.linuxtools.oprofile.core.opxml.modeldata,
+ org.eclipse.linuxtools.oprofile.core.opxml.sessions
+Bundle-Localization: plugin
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/README b/oprofile/org.eclipse.linuxtools.oprofile.core/README
new file mode 100644
index 0000000..4f47299
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/README
@@ -0,0 +1,23 @@
+An extra step is required to install the plugin (due to OProfile's lack of a user-space mode):
+
+* Run the install script in the natives/linux/scripts directory (must be as root):
+
+		# ./install
+		
+  * This will ensure all the necessary programs are installed, and create a wrapper for opcontrol
+    which prompts for the root password (since OProfile must be run as root). It will also load the
+    OProfile kernel module, however it is not loaded persistently. Hence, after the computer is 
+    restarted and any functions of the plugin are used, there will be an extra prompt to run 
+    opcontrol that would not normally appear.
+  
+  * If there are any programs missing or an error occurs, the script will fail and display the error.
+    If there are no errors, you will see the message:
+    	
+    	Eclipse-OProfile plugin install successful.
+    
+    
+* To uninstall the plugin, run the uninstall script in the natives/linux/scripts (must be root):
+
+		# ./uninstall
+		
+  * This will simply remove the same files the install script created.
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/about.html b/oprofile/org.eclipse.linuxtools.oprofile.core/about.html
new file mode 100644
index 0000000..0c6525d
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>24th October, 2008</p>	
+<h3>License</h3>
+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<h3>Contributions</h3>
+
+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise
+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such
+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
+
+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or
+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the
+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/build.properties b/oprofile/org.eclipse.linuxtools.oprofile.core/build.properties
new file mode 100644
index 0000000..39977e0
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/build.properties
@@ -0,0 +1,19 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.properties,\
+               plugin.xml,\
+               about.html,\
+               README,\
+               natives/,\
+               schema/
+src.includes = META-INF/,\
+               README,\
+               about.html,\
+               src/,\
+               plugin.xml,\
+               plugin.properties,\
+               natives/,\
+               schema/
+individualSourceBundles=true
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/.svnignore b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/.svnignore
new file mode 100644
index 0000000..5366501
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/.svnignore
@@ -0,0 +1,15 @@
+opxml.o
+stable.o
+oprofiledb.o
+symbol.o
+sample.o
+session.o
+samplefile.o
+imageheader.o
+opinfo.o
+xmlfmt.o
+xmlbuf.o
+xmltag.o
+sevent.o
+profileimage.o
+opxml
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/Makefile b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/Makefile
new file mode 100644
index 0000000..e532b37
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/Makefile
@@ -0,0 +1,78 @@
+# Makefile for Eclipse Oprofile wrapper library
+# Written by Keith Seitz  <keiths@redhat.com>
+# Edited by Kent Sebastian <ksebasti@redhat.com>
+#
+# Copyright (c) 2004,2008 Red Hat, Inc.
+
+CFLAGS += -g -Wall
+CXXFLAGS = $(CFLAGS)
+
+OPROFILE_LIBS = -lop -lodb -loputil++ -loputil
+BFD_LIBRARY = -lbfd
+LIBIBERTY = -liberty
+OTHER_LIBS = $(BFD_LIBRARY)
+EXTRA_LIBS = $(OPROFILE_LIBS) $(OTHER_LIBS) $(LIBIBERTY)
+
+OPXML = 		opxml
+OPXML_OBJS =		opxml.o
+OPROFILE_LIB_OBJS =	stable.o oprofiledb.o symbol.o sample.o \
+			session.o samplefile.o imageheader.o opinfo.o \
+			xmlfmt.o xmlbuf.o xmltag.o \
+			sevent.o profileimage.o
+
+all: $(OPXML)
+
+$(OPXML): $(OPROFILE_LIB_OBJS) $(OPXML_OBJS)
+		$(CXX) -o $(OPXML) $(OPXML_OBJS) $(OPROFILE_LIB_OBJS) \
+		$(EXTRA_LIBS)
+
+clean:
+	$(RM) $(OPROFILE_LIB_OBJS) $(OPXML) $(OPXML_OBJS) $(OPXML_EXEC) *~
+
+install:
+	sh move_opxml.sh
+
+# Dependencies
+opxml.o: oxmlstream.h opinfo.h session.h sample.h sevent.h opxml.cc
+
+imageheader.o: xmlfmt.h imageheader.h imageheader.cc
+imageheader.h: samplefile.h
+
+opinfo.o: opinfo.h opinfo.cc
+opinfo.h: 
+
+oprofiledb.o: oprofiledb.h sample.h stable.h oprofiledb.cc
+oprofiledb.h: xmlbuf.h xmlfmt.h
+
+oxmlstream.h: xmlbuf.h xmlfmt.h
+
+profileimage.o: xmlfmt.h profileimage.h profileimage.cc sample.h
+profileimage.h: samplefile.h
+
+sample.o: xmlfmt.h sample.h sample.cc symbol.h symbol.cc
+sample.h: 
+
+samplefile.o: sample.h stable.h xmlfmt.h samplefile.h samplefile.cc
+samplefile.h: oprofiledb.h
+
+session.o: sevent.h opinfo.h xmlfmt.h session.h session.cc
+session.h: samplefile.h
+
+sevent.o: session.h xmlfmt.h sevent.h sevent.cc
+sevent.h: profileimage.h
+
+stable.o: stable.h symbol.h stable.cc
+stable.h: 
+
+symbol.o: xmlfmt.h symbol.h symbol.cc
+symbol.h: sample.h 
+
+xmlbuf.o: xmltag.h xmlbuf.h xmlbuf.cc
+xmlbuf.h: 
+
+xmlfmt.o: xmlbuf.h xmlfmt.h xmlfmt.cc
+xmlfmt.h: 
+
+xmltag.o: xmltag.h xmltag.cc
+xmltag.h:
+
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/README b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/README
new file mode 100644
index 0000000..64aacad
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/README
@@ -0,0 +1,5 @@
+opxml requires 3 packages to be compiled:
+
+* oprofile
+* oprofile-devel
+* binutils-devel
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/imageheader.cc b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/imageheader.cc
new file mode 100644
index 0000000..d8b560c
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/imageheader.cc
@@ -0,0 +1,35 @@
+/* imageheader - a class which represents the "header" information for a given
+   image.
+   Written by Keith Seitz <keiths@redhat.com>
+   Copyright 2004 Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#include "imageheader.h"
+#include "xmlfmt.h"
+
+using namespace std;
+
+imageheader::imageheader (const samplefile* sfile)
+  : _sfile (sfile)
+{
+}
+
+ostream&
+operator<< (ostream& os, const imageheader* ihdr)
+{
+  return os << startt ("header")
+	    << startt ("cpu_type") << ihdr->get_cpu () << endt
+	    << startt ("count") << ihdr->get_count () << endt
+            << startt ("event") << ihdr->get_event () << endt
+	    << startt ("unit-mask") << ihdr->get_unit_mask () << endt
+	    << startt ("cpu-speed") << ihdr->get_cpu_speed () << endt
+	    << endt;
+}
+
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/imageheader.h b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/imageheader.h
new file mode 100644
index 0000000..ec1f904
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/imageheader.h
@@ -0,0 +1,48 @@
+/* imageheader - a class which represents the "header" info for a given
+   image.
+   Written by Keith Seitz <keiths@redhat.com>
+   Copyright 2004 Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#ifndef _IMAGEHEADER_H
+#define _IMAGEHEADER_H
+#include <ostream>
+#include <string>
+
+#include "samplefile.h"
+
+class imageheader
+{
+ public:
+  // Constructor - pass in the oprofile header
+  imageheader (const samplefile* sfile);
+
+  // Returns the cpu type
+  inline std::string get_cpu (void) const { return _sfile->get_cpu (); };
+
+  // Returns the event collected
+  inline std::string get_event (void) const { return _sfile->get_event (); };
+
+  // Returns the count
+  inline std::string get_count (void) const { return _sfile->get_count (); };
+
+  // Returns the unit mask used during collection
+  inline std::string get_unit_mask (void) const { return _sfile->get_unit_mask (); };
+
+  // Returns an approx cpu speed
+  // FIXME: SUCK?
+  inline double get_cpu_speed (void) const { return 0.00; };
+
+ private:
+  const samplefile* _sfile;
+};
+
+std::ostream& operator<< (std::ostream& os, const imageheader* ihdr);
+#endif // !_SFILEHEADER_H
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/move_opxml.sh b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/move_opxml.sh
new file mode 100644
index 0000000..5b526ea
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/move_opxml.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+RELEASE_VER=0.3.0
+
+case `uname -m` in 
+ 	'i386') \
+ 	mv -f opxml ../../../../org.eclipse.linuxtools.oprofile.core.linux.x86_${RELEASE_VER}.*/os/linux/x86 
+ 	;; 
+ 	'i586') 
+ 	mv -f opxml ../../../../org.eclipse.linuxtools.oprofile.core.linux.x86_${RELEASE_VER}.*/os/linux/x86 
+ 	;; 
+ 	'i686') 
+ 	mv -f opxml ../../../../org.eclipse.linuxtools.oprofile.core.linux.x86_${RELEASE_VER}.*/os/linux/x86 
+ 	;; 
+ 	'x86_64') 
+ 	mv -f opxml ../../../../org.eclipse.linuxtools.oprofile.core.linux.x86_64_${RELEASE_VER}.*/os/linux/x86_64 
+ 	;; 
+ 	'ppc') 
+ 	mv -f opxml ../../../../org.eclipse.linuxtools.oprofile.core.linux.ppc_${RELEASE_VER}.*/os/linux/ppc 
+ 	;; 
+ 	'ppc64') 
+ 	mv -f opxml ../../../../org.eclipse.linuxtools.oprofile.core.linux.ppc_${RELEASE_VER}.*/os/linux/ppc 
+ 	;; 
+ 	*) 
+ 	echo Could not detect system architecture -- please move the opxml binary into the appropriate org.eclipse.linuxtools.oprofile.core.linux.[x86,x86_64,ppc]/os/linux/[x86,x86_64,ppc] directory. 
+	exit 1
+ 	;; 
+ 	esac && echo Success!
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/opinfo.cc b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/opinfo.cc
new file mode 100644
index 0000000..6dd9841
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/opinfo.cc
@@ -0,0 +1,225 @@
+/* Generic oprofile information class for opmxl.
+   Written by Keith Seitz <keiths@redhat.com>
+   Copyright 2003, Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#include "opinfo.h"
+
+#include <sstream>
+#include <string.h>
+
+#include "xmlfmt.h"
+
+using namespace std;
+
+// From liboputil.a. Sadly this won't work if we want to enable
+// remote-system profiling.
+extern "C" double op_cpu_frequency (void);
+
+// Forward declaration
+static void __output_unit_mask_info (ostream& os, const opinfo::event_t* e);
+
+// Constructor
+opinfo::opinfo (op_cpu cpu_type, string dir)
+  : _cpu_type (cpu_type), _dir (dir)
+{
+}
+
+// Returns the number of counters for this cpu type
+int
+opinfo::get_nr_counters (void) const
+{
+  return op_get_nr_counters (_cpu_type);
+}
+
+// Returns (in LIST) a list of valid events for the given counter
+void
+opinfo::get_events (eventlist_t& list, int ctr) const
+{
+  struct list_head* events, *p;
+  events = op_events (_cpu_type);
+
+  list_for_each (p, events)
+    {
+      struct op_event* event = list_entry (p, struct op_event, event_next);
+      if (/*event->counter_mask == CTR_ALL || */ event->counter_mask & (1 << ctr))
+	list.push_back (event);
+    }
+}
+
+// Returns cpu frequency
+double
+opinfo::get_cpu_frequency (void) const
+{
+  return op_cpu_frequency ();
+}
+
+// Checks whether the given CTR, EVENT, and MASK are valid
+opinfo::eventcheck
+opinfo::check (int ctr, int event, int mask) const
+{
+  eventcheck::result_t result =
+    static_cast<eventcheck::result_t> (op_check_events (ctr, event, mask, _cpu_type));
+  return eventcheck (result);
+}
+
+// Converts the given string into a corresponding op_cpu (CPU_NO_GOOD if invalid)
+op_cpu
+opinfo::str_to_op_cpu (const char* const cpu_str)
+{
+  int i;
+  for (i = 0; i < MAX_CPU_TYPE; ++i)
+    {
+      if (strcmp (op_get_cpu_type_str ((op_cpu) i), cpu_str) == 0)
+	return (op_cpu) i;
+    }
+
+  return CPU_NO_GOOD;
+}
+
+// This actually outputs a bunch of information
+ostream&
+operator<< (ostream& os, const opinfo& info)
+{
+  os << startt ("info");
+
+  // Output out number of counters and defaults
+  os << startt ("num-counters") << info.get_nr_counters () << endt
+     << startt ("cpu-frequency") << info.get_cpu_frequency () << endt
+     << startt ("defaults")
+     << startt ("sample-dir") << opinfo::get_default_samples_dir () << endt
+     << startt ("lock-file") << opinfo::get_default_lock_file () << endt
+     << startt ("log-file") << opinfo::get_default_log_file () << endt
+     << startt ("dump-status") << opinfo::get_default_dump_status () << endt
+     << endt;
+
+  if (info.get_cpu_type() == CPU_TIMER_INT)
+    {
+      os << startt ("timer-mode") << "true" << endt;
+
+      //create a fake timer event and output as normal
+      char UM_0_DESC[] = TIMER_EVENT_MASK_UM_0_DESCRIPTION;
+      char TIMER_NAME[] = TIMER_EVENT_NAME;
+      char TIMER_DESC[] = TIMER_EVENT_DESCRIPTION;
+
+      struct op_unit_mask mask;
+      mask.unit_type_mask = utm_mandatory;
+      mask.default_mask = TIMER_EVENT_MASK_DEFAULT_VALUE;
+      mask.um[0].value = TIMER_EVENT_MASK_UM_0_VALUE;
+      mask.um[0].desc = UM_0_DESC;
+      mask.num = TIMER_EVENT_MASK_UM_NUM;
+
+      opinfo::event_t timer_event;
+      timer_event.name = TIMER_NAME;
+      timer_event.desc = TIMER_DESC;
+      timer_event.val = TIMER_EVENT_NUMBER;
+      timer_event.min_count = TIMER_EVENT_MIN_COUNT;
+      timer_event.counter_mask = TIMER_EVENT_COUNTER_MASK;
+      timer_event.unit = &mask;
+
+      os << startt ("event-list") << attrt ("counter", "0");
+
+      os << (&timer_event);
+
+      os << endt;
+    }
+  else
+    {
+      os << startt ("timer-mode") << "false" << endt;
+
+      // Output event list
+      for (int ctr = 0; ctr < info.get_nr_counters (); ++ctr)
+        {
+          opinfo::eventlist_t events;
+
+          ostringstream ctr_s;
+          ctr_s << ctr;
+          os << startt ("event-list") << attrt ("counter", ctr_s.str ());
+          info.get_events (events, ctr);
+          opinfo::eventlist_t::iterator i;
+          for (i = events.begin (); i != events.end (); ++i)
+            os << (*i);
+          os << endt;
+        }
+    }
+
+  return os << endt;
+}
+
+// Prints the given EVENT on the given stream
+ostream&
+operator<< (ostream& os, const opinfo::event_t* event)
+{
+  os << startt ("event")
+     << startt ("name") << event->name << endt
+     << startt ("description") << event->desc << endt
+     << startt ("value") << static_cast<int> (event->val) << endt
+     << startt ("minimum") << static_cast<int> (event->min_count) << endt;
+
+  // ouput unit mask info
+  __output_unit_mask_info (os, event);
+
+  return os << endt;
+}
+
+// Prints the given eventcheck on the given stream
+ostream&
+operator<< (ostream& os, const opinfo::eventcheck& check)
+{
+  static const char* errors[3] = {"invalid-event", "invalid-um", "invalid-counter"};
+
+  os << startt ("check-events");
+
+  if (check.get_result () == OP_OK_EVENT)
+    os << startt ("result") << "ok" << endt;
+  else
+    {
+      for (unsigned int i = 0; i < sizeof (errors) / sizeof (errors[0]); ++i)
+	{
+	  if ((check.get_result () & (1 << i)) > 0)
+	    os << startt ("result") << errors[i] << endt;
+	}
+    }
+
+  return os << endt;
+}
+
+// Convenience function to output unit mask information
+static void
+__output_unit_mask_info (ostream& os, const opinfo::event_t* event)
+{
+  const struct op_unit_mask* umask = event->unit;
+  const char* type;
+
+  switch (umask->unit_type_mask)
+    {
+    case utm_exclusive:
+      type = "exclusive";   break;
+    case utm_bitmask:
+      type = "bitmask";     break;
+    case utm_mandatory:
+    default:
+      type = "mandatory";   break;
+    }
+
+  os << startt ("unit-mask")
+     << startt ("type") << type << endt
+     << startt ("default") << umask->default_mask << endt;
+
+  for (u32 i = 0; i < umask->num; ++i)
+    {
+      os << startt ("mask")
+	 << startt ("value") << umask->um[i].value << endt
+	 << startt ("description") << umask->um[i].desc << endt
+	 << endt;
+    }
+
+  os << endt;
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/opinfo.h b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/opinfo.h
new file mode 100644
index 0000000..958f9fb
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/opinfo.h
@@ -0,0 +1,118 @@
+/* Generic oprofile information class for opmxl.
+   Written by Keith Seitz <keiths@redhat.com>
+   Copyright 2003, Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#ifndef _OPINFO_H
+#define _OPINFO_H
+#include <vector>
+#include <ostream>
+
+#include <op_cpu_type.h>
+#include <op_config.h>
+#include <op_events.h>
+
+#define OP_SAMPLES_DIR "/var/lib/oprofile/samples/"
+#define OP_LOCK_FILE "/var/lib/oprofile/lock"
+#define OP_LOG_FILE "/var/lib/oprofile/samples/oprofiled.log"
+#define OP_DUMP_STATUS "/var/lib/oprofile/complete_dump"
+#define TIMER_EVENT_NAME "TIMER"
+#define TIMER_EVENT_DESCRIPTION "Profiling through timer interrupt"
+#define TIMER_EVENT_NUMBER 0
+#define TIMER_EVENT_MIN_COUNT 0
+#define TIMER_EVENT_COUNTER_MASK 0
+#define TIMER_EVENT_MASK_DEFAULT_VALUE 0
+#define TIMER_EVENT_MASK_UM_NUM 1
+#define TIMER_EVENT_MASK_UM_0_VALUE 0
+#define TIMER_EVENT_MASK_UM_0_DESCRIPTION "No unit mask"
+
+struct op_event;
+
+// A class which knows about static oprofile information, i.e., things
+// which do not depend on sample files.
+class opinfo
+{
+  public:
+  // The type of an oprofile event
+  typedef struct op_event event_t;
+
+  // The type of a list of oprofile events
+  typedef std::vector<event_t*> eventlist_t;
+
+  // A class used for reporting the validity of an event.
+  // Used by opinfo::check.
+  class eventcheck
+  {
+  public:
+    // The result type returned by get_result;
+    typedef enum op_event_check result_t;
+
+    // Constructor
+    eventcheck (result_t ec) : _ec (ec) {};
+
+    // Returns the result of the check. Can be (bitmask):
+    // OP_OK_EVENT, OP_INVALID_EVENT, OP_INVALID_UM, OP_INVALID_COUNTER
+    inline result_t get_result (void) const { return _ec; };
+
+  private:
+    // The result from the check
+    result_t _ec;
+  };
+
+  // Get the default sample directory
+  inline static const char* get_default_samples_dir (void) { return OP_SAMPLES_DIR; };
+
+  // Get the default lock filename
+  inline static const char* get_default_lock_file (void) { return OP_LOCK_FILE; };
+
+  // Get the default log filename
+  inline static const char* get_default_log_file (void) { return OP_LOG_FILE; };
+
+  // Get the default dump status filename
+  inline static const char* get_default_dump_status (void) { return OP_DUMP_STATUS; };
+
+  // Converts the given string into an enum op_cpu
+  static op_cpu str_to_op_cpu (const char* const cpu_str);
+
+  // Constructors
+  opinfo (op_cpu cpu_type = op_get_cpu_type (), std::string dir = get_default_samples_dir ());
+
+  // Returns the number of counters for this cpu type
+  int get_nr_counters (void) const;
+
+  // Returns a list of valid events for the given counter on this cpu type
+  void get_events (eventlist_t& list, int ctr) const;
+
+  // Returns the samples directory in use
+  inline const std::string& get_samples_directory (void) const { return _dir; };
+
+  // Returns the CPU frequency in MHz
+  double get_cpu_frequency (void) const;
+
+  // Returns an eventcheck object representing whether the given
+  // CTR, EVENT, and MASK are valid for this cpu type
+  eventcheck check (int ctr, int event, int mask) const;
+
+  // Returns the cpu type being used
+  op_cpu get_cpu_type (void) const { return _cpu_type; };
+
+ private:
+  // The cpu type
+  op_cpu _cpu_type;
+
+  // The sample directory to use
+  std::string _dir;
+};
+
+// Insert operators for various classes defined in this file
+std::ostream& operator<< (std::ostream& os, const opinfo::eventcheck& ec);
+std::ostream& operator<< (std::ostream& os, const opinfo::event_t* event);
+std::ostream& operator<< (std::ostream& os, const opinfo& info);
+#endif // !_OPINFO_H
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/oprofiledb.cc b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/oprofiledb.cc
new file mode 100644
index 0000000..808e505
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/oprofiledb.cc
@@ -0,0 +1,160 @@
+/* oprofile_db - An Oprofile sample file database wrapper.
+   Written by Keith Seitz <keiths@redhat.com>
+   Copyright 2004 Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#include <iostream>
+#include <op_sample_file.h>
+#include <string.h>
+ 
+#include "oprofiledb.h"
+#include "stable.h"
+#include "sample.h"
+
+oprofile_db::oprofile_db (std::string filename)
+  : _filename (filename), _tree (NULL), _symbol_table (NULL), _is_kernel (false)
+{
+}
+
+oprofile_db::~oprofile_db ()
+{
+  _close_db ();
+  samples_t::iterator i = _samples.begin ();
+  while (i != _samples.end ())
+    {
+      delete SAMPLE (*i);
+      ++i;
+    }
+  _samples.clear ();
+}
+
+void
+oprofile_db::_open_db (void)
+{
+  if (_tree == NULL)
+    {
+      int rc;
+
+      _tree = new odb_t;
+      rc = odb_open (_tree, _filename.c_str (), ODB_RDONLY, sizeof (opd_header));
+      if (rc != 0)
+	{
+	  // This shouldn't happen, but let's at least print something out.
+	  std::cerr << "Error opening oprofile database: " << strerror (rc)
+		    << std::endl;
+	  return;
+	}
+
+      // Get the is_kernel parameter: this is needed for sample gathering later
+      const opd_header* hdr = static_cast<opd_header*> (odb_get_data (_tree));
+      _is_kernel = (hdr->is_kernel != 0);
+    }
+}
+
+void
+oprofile_db::_close_db (void)
+{
+  if (_tree != NULL)
+    {
+      odb_close (_tree);
+      delete _tree;
+    }
+
+  _tree = NULL;
+}
+
+static void
+samples_odb_travel (odb_t* hash, int start, int end, oprofile_db::callback_t callback, void* data)
+{
+  odb_node_nr_t node_nr, pos;
+  odb_node_t* node = odb_get_iterator (hash, &node_nr);
+  for (pos = 0; pos < node_nr; ++pos)
+    {
+      if (node[pos].key)
+	callback (node[pos].key, node[pos].value, data);
+    }
+}
+
+void
+oprofile_db::walk_samples (callback_t callback, void* data)
+{
+  _open_db ();
+  samples_odb_travel (_tree, 0, ~0, callback, data);
+  _close_db ();
+}
+
+const oprofile_db::samples_t&
+oprofile_db::get_samples (symboltable* stable)
+{
+  _symbol_table = stable;
+  walk_samples (_get_samples_callback, this);
+  _symbol_table = NULL;
+  return _samples;
+}
+
+bool
+oprofile_db::has_samples (void)
+{
+  walk_samples (_has_samples_callback, this);
+  return _has_samples;
+}
+
+long
+oprofile_db::get_count (void)
+{
+  long count = 0;
+  walk_samples (_get_count_callback, &count);
+  return count;
+}
+
+// This is a callback from oprofile when traveling the samples in the sample file.
+void
+oprofile_db::_get_samples_callback (odb_key_t key, odb_value_t info, void* data)
+{
+  oprofile_db* odb = static_cast<oprofile_db*> (data);
+
+  symbol* symbol = NULL;
+  bfd_vma real_addr;
+  if (odb->_symbol_table != NULL)
+    symbol = odb->_symbol_table->lookup_vma ((bfd_vma) key, real_addr, odb->_is_kernel);
+
+  // Oprofile can have multiple samples for the same VMA, so look in the
+  // our map/database and see if the given VMA exists. If it does not exist,
+  // add a new Sample. If it does exist, just increment the count of the Sample
+  // by INFO.
+  samples_t::iterator i = odb->_samples.find ((bfd_vma) key);
+  if (i == odb->_samples.end ())
+    {
+      // new sample
+      sample* s = new sample (real_addr, symbol, info);
+      odb->_samples.insert (sample_t (key, s));
+    }
+  else
+    {
+      // existing sample
+      SAMPLE (*i)->incr_count (info);
+    }
+}
+
+void
+oprofile_db::_has_samples_callback (odb_key_t key, odb_value_t info, void* data)
+{
+  oprofile_db* odb = static_cast<oprofile_db*> (data);
+  if (info > 0)
+    odb->has_samples (true);
+}
+
+void
+oprofile_db::_get_count_callback (odb_key_t key, odb_value_t info, void* data)
+{
+  long* count = static_cast<long*> (data);
+  *count += info;
+}
+
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/oprofiledb.h b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/oprofiledb.h
new file mode 100644
index 0000000..23e83a2
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/oprofiledb.h
@@ -0,0 +1,92 @@
+/* oprofile_db - An Oprofile sample file database wrapper.
+   Written by Keith Seitz <keiths@redhat.com>
+   Copyright 2004 Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#ifndef _OPROFILEDB_H
+#define _OPROFILEDB_H
+
+#include <map>
+#include <string>
+#include <bfd.h>
+#include <odb.h>
+
+class sample;
+class symboltable;
+
+// A class which represents an oprofile sample database. This is much
+// lower-level stuff than class samplefile.
+class oprofile_db
+{
+ public:
+  typedef void (*callback_t)(odb_key_t, odb_value_t, void*);
+
+  // Creates an oprofile_db from the given sample file
+  oprofile_db (std::string sample_file);
+  ~oprofile_db ();
+
+  // Function object used to compare VMA for sorting
+  struct ltvma
+  {
+    bool operator() (const bfd_vma a, const bfd_vma b) const
+    { return (a < b); }
+  };
+
+  // The type of the sample database returned be get_samples
+  typedef std::map<const bfd_vma, sample*, ltvma> samples_t;
+
+  // The type of one sample in the database
+  typedef std::pair<const bfd_vma, sample*> sample_t;
+
+  // Macro to fetch the sample from the sample_t.
+  static inline sample* SAMPLE (sample_t sample) { return sample.second; }
+
+  // Retrieves the sample database using STABLE as a symbol table (may be NULL)
+  const samples_t& get_samples (symboltable* stable);
+
+  // Set/query whether the db has any samples in it 
+  bool has_samples (void);
+  void has_samples (bool yesno) { _has_samples = yesno; };
+
+  // Get the total number of samples in this samplefile
+  long get_count (void);
+
+  // Walks the samples with the given callback
+  void walk_samples (callback_t callback, void* data);
+
+ protected:
+  // Callbacks for walking oprofile sample database
+  static void _get_samples_callback (odb_key_t key, odb_value_t info, void* data);
+  static void _has_samples_callback (odb_key_t key, odb_value_t info, void* data);
+  static void _get_count_callback (odb_key_t key, odb_value_t info, void* data);
+
+  // Makes sure the oprofile sample file is open
+  void _open_db (void);
+
+  // Closes the oprofile sample file
+  void _close_db (void);
+
+  // The sample file
+  std::string _filename;
+
+  // The oprofile sample database for the file
+  odb_t* _tree;
+
+  // A map of all the samples
+  samples_t _samples;
+
+  // The symbol table used to resolve VMA into symbols
+  symboltable* _symbol_table;
+
+  bool _has_samples;
+  callback_t _callback;
+  bool _is_kernel;
+};
+#endif // !_OPROFILEDB_H
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/opxml.cc b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/opxml.cc
new file mode 100644
index 0000000..55dfb2b
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/opxml.cc
@@ -0,0 +1,495 @@
+/* Opxml a simple program to output XML descriptions of oprofile sample
+   files (and a little more). This program exists as a bridge between
+   GPL'd software (oprofile and BFD) and EPL'd software (Eclipse).
+   Written by Keith Seitz <keiths@redhat.com>
+   Edited by Kent Sebastian <ksebasti@redhat.com>
+
+   Copyright 2004, 2008, 2009 Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#include <stdlib.h>
+#include <iostream>
+#include <string.h>
+#include <getopt.h>
+#include <errno.h>
+#include <iterator>
+#include <vector>
+#include <set>
+
+#include "opinfo.h"
+#include "oxmlstream.h"
+#include "session.h"
+#include "sample.h"
+#include "sevent.h"
+
+using namespace std;
+
+// Enum describing info options
+enum options
+{
+   INFO,
+   CHECK_EVENT,
+   MODEL_DATA,
+   SESSIONS
+};
+
+// Strings of options
+static const char* options[] =
+{
+  "info",
+  "check-events",
+  "model-data",
+  "sessions",
+  0
+};
+
+// Help for options
+struct help
+{
+  const char* arg;
+  const char* desc;
+};
+
+static const struct help args_help[] =
+{
+  {"[CPU]\t\t\t", "information for given cpu (defualt: current cpu)" },
+  {"CTR EVENT UMASK\t", "check counter/event validity"},
+  {"EVENT SESSION\t", "get model data (image, symbols, samples..) for given SESSION and EVENT"},
+  {"\t\t\t", "get session information"}
+};
+
+//hacky struct to ensure that the default session is
+// always printed out first (and the rest alphabetical)
+struct sevent_comp {
+  bool operator() (const sessionevent* lhs, const sessionevent* rhs) { return (lhs->get_session()->get_name() < rhs->get_session()->get_name()); }
+};
+
+typedef set<sessionevent*, struct sevent_comp > ordered_sessions_t;
+struct session_list_t {
+  sessionevent* default_sevent;
+  ordered_sessions_t* sessions;
+};
+
+
+
+const string DEFAULT_SESSION_NAME = "current";
+
+// Local functions
+static void print_usage (const char* const argv0);
+static int get_option_index (const char* options[], const char* arg);
+static void wrong_num_arguments (int argc, char* argv[], const char* opts);
+static int get_integer (const char* arg);
+
+// Info handlers
+static int info (opinfo& info, int argc, char* argv[]);
+static int check_events (opinfo& info, int argc, char* argv[]);
+static int model_data (opinfo& info, int argc, char* argv[]);
+static int sessions (opinfo& info, int argc, char* argv[]);
+
+//helper function
+static bool object_in_list(const string obj, const vector<string>& objects);
+
+
+static void
+wrong_num_arguments (int argc, char* argv[], const char* opts)
+{
+  cerr << "wrong # args: should be \"";
+  for (int i = 0; i < argc; ++i)
+    cerr << argv[i] << " ";
+
+  cerr << opts << "\"" << endl;
+  exit (EXIT_FAILURE);
+}
+
+// Converts the argument into its corresponding option index
+static int
+get_option_index (const char* options[], const char* arg)
+{
+  const char* option;
+
+  int i = 0;
+  for (option = options[0]; option != NULL; option = options[++i])
+    {
+      if (strncmp (option, arg, strlen (arg)) == 0)
+	return i;
+    }
+
+  return -1;
+}
+
+// Prints a small help message
+static void
+print_help (const char* const argv0)
+{
+  cerr << "Use '" << argv0 << " --help' for a complete list of options."
+	    << endl;
+}
+
+// Prints the usage of this program
+static void
+print_usage (const char* const argv0)
+{
+  cerr << argv0 << ": usage: " << argv0 << " [OPTION] INFO [INFO_OPTIONS]" << endl;
+  cerr << "Supply information about Oprofile and its sample files." << endl << endl;
+  cerr << "Options:" << endl << endl;
+  cerr << "-c, --cpu CPU_TYPE\t\t   cpu type (current: "
+	    << op_get_cpu_type_str (op_get_cpu_type ()) << ")" << endl;
+  cerr << "-d, --dir SAMPLES_DIR\t\t   set sample directory (default: "
+       << opinfo::get_default_samples_dir () << ")" << endl;
+
+  cerr << endl << "Types of INFO:" << endl << endl;
+
+  for (unsigned int i = 0; i < (sizeof (args_help) / sizeof (args_help[0])); ++i)
+    {
+      cerr << options[i] << " " << args_help[i].arg << "   "
+	   << args_help[i].desc << endl;
+    }
+}
+
+int
+main (int argc, char* argv[])
+{
+  const char* argv0 = argv[0];
+
+  if (argc < 2)
+    {
+      print_help (argv0);
+      exit (EXIT_FAILURE);
+    }
+
+  op_cpu cpu_type = op_get_cpu_type ();
+  string dir = opinfo::get_default_samples_dir ();
+
+  static struct option long_options[] =
+  {
+    {"cpu-type", required_argument, 0, 'c'},
+    {"dir", required_argument, 0, 'd'},
+    {"help", no_argument, 0, 'h'},
+    {0, 0, 0, 0}
+  };
+
+  int index;
+  while (true)
+    {
+      int c;
+      c = getopt_long_only (argc, argv, "+", long_options, &index);
+      if (c == -1)
+	break;
+
+      if (c == 0 && long_options[index].flag == 0)
+	c = long_options[index].val;
+
+      switch (c)
+	{
+	case 'c':
+	  cpu_type = opinfo::str_to_op_cpu (optarg);
+	  if (cpu_type == CPU_NO_GOOD)
+	    {
+	      cerr << argv0 << ": cpu \"" << optarg << "\" not recognized"
+			<< endl;
+	      exit (EXIT_FAILURE);
+	    }
+	  break;
+
+	case 'd':
+	  dir = optarg;
+	  break;
+
+	case 'h':
+	  print_usage (argv0);
+	  exit (EXIT_SUCCESS);
+	  break;
+
+	case '?':
+	  print_help (argv0);
+	  exit (EXIT_FAILURE);
+	}
+    }
+
+  // Check that we have a valid cpu type. It can be invalid (here) because
+  // the Oprofile module not loaded/running. Oprofile library will output error.
+  if (cpu_type == CPU_NO_GOOD)
+    exit (EXIT_FAILURE);
+
+  argc -= optind;
+  argv += optind;
+
+  if (argc == 0)
+    {
+      print_help (argv0);
+      exit (EXIT_FAILURE);
+    }
+
+  int rc;
+  opinfo oinfo (cpu_type, dir);
+  index = get_option_index (options, argv[0]);
+    {
+      switch ((enum options) index)
+	{
+	case INFO:
+	  rc = info (oinfo, argc, argv);
+	  break;
+
+	case CHECK_EVENT:
+	  rc = check_events (oinfo, argc, argv);
+	  break;
+
+	case MODEL_DATA:
+	  rc = model_data(oinfo, argc, argv);
+	  break;
+
+        case SESSIONS:
+          rc = sessions (oinfo, argc, argv);
+	  break;
+
+	default:
+	  cerr <<  argv0 << ": unknown option \"" << argv[0] << "\""
+		    << endl;
+	  print_help (argv0);
+	  rc = EXIT_FAILURE;
+	}
+    }
+
+  return rc;
+}
+
+/* Get an integer value from the argument. Only does ints > 0.
+   Returns the integer or -1. */
+static int
+get_integer (const char* arg)
+{
+  errno = 0;
+  int integer = strtol (arg, NULL, 10);
+  if (errno != 0)
+    return -errno;
+
+  return integer;
+}
+
+/* Output static information about oprofile for this cpu type. */
+static int
+info (opinfo& info, int argc, char* argv[])
+{
+  oxmlstream oxml (cout);
+  oxml << info << endxml;
+  return EXIT_SUCCESS;
+}
+
+/* Check whether the given counter/event/umask info is valid.
+ *
+ * Input: COUNTER EVENT UMASK (all integers)
+ * Note: output is a BITMASK of errors. Expect multiple "result" fields on error.
+ */
+static int
+check_events (opinfo& info, int argc, char* argv[])
+{
+  if (argc != 4)
+    wrong_num_arguments (1, argv, "counter event umask");
+
+  int counter = get_integer (argv[1]);
+  if (counter < 0)
+    {
+      cerr << "invalid counter \"" << argv[1] << "\"" << endl;
+      return EXIT_FAILURE;
+    }
+
+  if (counter >= info.get_nr_counters ())
+    {
+      cerr << "counter must not be greater than "
+		<< (info.get_nr_counters () - 1) << endl;
+      return EXIT_FAILURE;
+    }
+
+  int event = get_integer (argv[2]);
+  if (event < 0)
+    {
+      cerr << "invalid event \"" << argv[2] << "\"" << endl;
+      return EXIT_FAILURE;
+    }
+
+  int umask = get_integer (argv[3]);
+  if (umask < 0)
+    {
+      cerr << "invalid unit mask \"" << argv[3] << "\"" << endl;
+      return EXIT_FAILURE;
+    }
+
+  opinfo::eventcheck result = info.check (counter, event, umask);
+
+  oxmlstream oxml (cout);
+  oxml << result << endxml;
+  return EXIT_SUCCESS;
+}
+
+/* Print out the samples associated with the given session
+ *
+ * Input:
+ *      event name
+ *      session name (a default session is 'current')
+ */
+static int
+model_data (opinfo& info, int argc, char* argv[])
+{
+  //TODO: should this be xml so the parser can parse such an error?
+  if (argc < 3)
+    wrong_num_arguments (1, argv, "event session");
+
+  string event (argv[1]);
+  string session_name (argv[2]);
+
+  vector<string> object_list;
+  if (argc >= 3)
+    {
+      //make a list of binary paths to filter out images
+      for (int j = 3; j < argc; j++) {
+        object_list.insert(object_list.begin(), argv[j]);
+      }
+    }
+  session session (session_name, &info);
+
+  //passing the object list in here filters the images that
+  // are added to the sessionevent from an early stage
+  sessionevent* sevent = session.get_event (event);
+
+  if (sevent == NULL)
+    {
+      oxmlstream oxml (cout);
+      oxml << startt ("error");
+
+      oxml << "no such session, event or matching images: "
+           << "session=" << session_name
+	   << "; event=" << event
+           << endt << endxml;
+
+      return EXIT_FAILURE;
+    }
+
+  sessionevent::profileimages_t* images = sevent->get_images ();
+
+  oxmlstream oxml (cout);
+  oxml << startt ("model-data");
+
+  sessionevent::profileimages_t::iterator i;
+  for (i = images->begin (); i != images->end (); ++i)
+    {
+      if (object_list.empty() || object_in_list((*i)->get_name(),object_list))
+        oxml << (*i);
+    }
+
+  oxml << endt << endxml;
+
+  // delete sevent; -- don't do this: it takes too much time!
+  return EXIT_SUCCESS;
+}
+
+static bool
+object_in_list(const string obj, const vector<string>& objects) {
+  vector<string>::const_iterator it;
+
+  for (it = objects.begin(); it != objects.end(); it++) {
+    if ((*it) == obj) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+//The special case handling for the default event is to enusure it is always
+// the first event ouput. This is for usability of the UI on the java side
+// so that the current session is always the first in the view.
+static int
+sessions (opinfo& info, int argc, char* argv[])
+{
+  session::sessionlist_t sessions;
+  sessions = session::get_sessions (info);
+
+
+  /* This seems goofy, but this is best for the UI.
+     Arrange the sessions by the event that they collected. */
+
+  typedef map<string, struct session_list_t* > eventlist_t;
+  eventlist_t eventlist;
+
+  session::sessionlist_t::iterator sit = sessions.begin ();
+  session::sessionlist_t::iterator const send = sessions.end ();
+  for (; sit != send; ++sit)
+    {
+      session* s = *sit;
+      session::seventlist_t events = s->get_events ();
+
+      session::seventlist_t::iterator sit = events.begin ();
+      for (; sit != events.end (); ++sit)
+	{
+	  sessionevent* sevent = *sit;
+	  string event = sevent->get_name ();
+
+	  if (eventlist.find (event) == eventlist.end ())
+	    {
+	      // New event -- new event, and new list of sessions
+	      struct session_list_t* sl = (session_list_t*)malloc(sizeof(session_list_t*));
+	      sl->default_sevent = NULL;
+	      sl->sessions = new ordered_sessions_t;
+
+	      //check if it's the default session
+	      if (s->get_name() == DEFAULT_SESSION_NAME) {
+                sl->default_sevent = sevent;
+	      } else {
+	        sl->sessions->insert(sevent);
+	      }
+
+	      eventlist.insert (pair<string, session_list_t*> (event, sl));
+	    }
+	  else
+	    {
+	      // Known event -- add this session to the existing list for this event
+
+	      //check if it's the default session
+	      if (s->get_name() == DEFAULT_SESSION_NAME) {
+	        eventlist[event]->default_sevent = sevent;
+	      } else {
+	        eventlist[event]->sessions->insert(sevent);
+	      }
+	    }
+	}
+    }
+
+  // Done compiling the list of events. Output information.
+  oxmlstream oxml (cout);
+  oxml << startt ("sessions");
+
+  if (!eventlist.empty ())
+    {
+      eventlist_t::iterator elit;
+      for (elit = eventlist.begin (); elit != eventlist.end (); ++elit)
+	{
+	  string event = elit->first;
+
+	  sessionevent* default_sevent = elit->second->default_sevent;
+	  ordered_sessions_t* sessionlist = elit->second->sessions;
+
+	  oxml << startt ("event") << attrt ("name", event);
+
+	  if (default_sevent != NULL)
+	    oxml << default_sevent;
+
+	  copy (sessionlist->begin (), sessionlist->end (), ostream_iterator<sessionevent*> (oxml, ""));
+	  oxml << endt;
+
+	  if (default_sevent != NULL)
+	    free(default_sevent);
+	  delete sessionlist;
+	}
+    }
+
+  oxml << endt << endxml;
+
+  return EXIT_SUCCESS;
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/oxmlstream.h b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/oxmlstream.h
new file mode 100644
index 0000000..9166d4a
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/oxmlstream.h
@@ -0,0 +1,27 @@
+/* oxmlstream.h - A convenience class for outputting XML.
+   Written by Keith Seitz <keiths@redhat.com>
+   Copyright 2003, Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#ifndef _OXMLSTREAM_H
+#define _OXMLSTREAM_H
+#include <ostream>
+#include "xmlbuf.h"
+#include "xmlfmt.h"
+
+// An ostream which outputs in XML. See xmlfmt.h for XML operators.
+class oxmlstream : public std::ostream
+{
+ public:
+  // Constructor - pass ostream onto which XML should be output.
+  oxmlstream (std::ostream& os) : std::ostream (new xmlbuf (os)) {}
+  ~oxmlstream () { delete rdbuf (); }
+};
+#endif // ! _OXMLSTREAM_H
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/profileimage.cc b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/profileimage.cc
new file mode 100644
index 0000000..d0c34f8
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/profileimage.cc
@@ -0,0 +1,341 @@
+/* profileimage - A class which represents a single image for
+   which oprofile has samples (or for which some child dependency
+   has samples).
+   Written by Keith Seitz <keiths@redhat.com>
+   Edited by Kent Sebastian     <ksebasti@redhat.com>
+   Copyright 2004,2008 Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#include "profileimage.h"
+
+#include <stdio.h>
+#include <iostream>
+#include <iterator>
+#include <set>
+#include <list>
+
+#include "sample.h"
+#include "imageheader.h"
+#include "xmlfmt.h"
+
+using namespace std;
+
+profileimage::profileimage (samplefile* sfile)
+  : _samplefile (sfile), _header (NULL)
+{
+  _dependencies = new list<profileimage*>;
+}
+
+profileimage::~profileimage ()
+{
+  delete _samplefile;
+  delete _dependencies;
+  if (_header != NULL)
+    delete _header;
+}
+
+// returns parsed_filename.image if top-level image
+// or parsed_filename.lib_image if dependency
+string
+profileimage::get_name (void) const
+{
+  if (!_samplefile->has_samplefile ())
+    {
+      // We have no sample file for this object -- look for
+      // the image name in the first dependency
+      list<profileimage*>::iterator i = _dependencies->begin ();
+      if (i != _dependencies->end ())
+	return (*i)->get_samplefile ()->get_image ();
+      else
+	{
+	  // Can this happen? I don't think so, but...
+	  cerr << "WARNING: empty profileimage at " << __FILE__
+	       << ":" << __LINE__ << endl;
+	  return "";
+	}
+    }
+
+  return _samplefile->get_name ();
+}
+
+long
+profileimage::get_count (void) const
+{
+  return _samplefile->get_sample_count ();
+}
+
+void
+profileimage::add_dependency (profileimage* image)
+{
+  _dependencies->push_back (image);
+}
+
+const imageheader*
+profileimage::get_header (void)
+{
+  if (_header == NULL)
+    {
+      samplefile* sfile;
+      if (_samplefile->has_samplefile ())
+	sfile =_samplefile;
+      else
+	{
+	  // No samplefile -- use first dependency
+	  list<profileimage*>::iterator i = _dependencies->begin ();
+	  if (i != _dependencies->end ())
+	    sfile = (*i)->get_samplefile ();
+	  else
+	    {
+	      // Can this happen? I don't think so, but...
+	      cerr << "WARNING: empty profileimage at " << __FILE__
+		   << ":" << __LINE__ << endl;
+	      return NULL;
+	    }
+	}
+
+      _header = new imageheader (sfile);
+    }
+
+  return _header;
+}
+
+/*
+ * This loops through the samples and symbols for the image
+ * and organizes them in a top down manner so that they can
+ * be output as below:
+ *
+ *
+ *  IMAGE name=""
+ *    SYMBOL1 name="" file=""
+ *      SAMPLE1  --\
+ *      ..          |-- this done by sample's operator<<
+ *      SAMPLEN  --/
+ *    ..
+ *    SYMBOLN
+ *
+ *
+ * Note that this will only output info if there are symbols
+ * for the specified image.
+ *
+ */
+ostream&
+operator<< (ostream& os, profileimage* image)
+{
+  samplefile* sfile;
+
+  if (image->get_samplefile ()->has_samplefile ())
+    {
+      sfile = image->get_samplefile();
+
+      //index the symbols by their bfd symbol
+      map<const asymbol*, symbol*> symbols;
+
+      //a list of samples collapsed by file & line number
+      list<sample*> samples_aggregated;
+
+      //get a list of samples from this image
+      samplefile::samples_t all_samples = sfile->get_samples();
+
+      //loop through samples, collapsing those with the same sample and line #
+      for (samplefile::samples_t::iterator i = all_samples.begin (); i != all_samples.end (); ++i)
+        {
+          const sample* smpl = samplefile::SAMPLE (*i);
+
+          if (smpl->has_symbol())
+            {
+              unsigned int line = 0;
+              const char* func  = NULL;
+              const char* file  = NULL;
+              sfile->get_debug_info (smpl->get_vma (), func, file, line);
+
+              //these are deleted in add_sample or at the end of this method
+              sample* new_sample = new sample(smpl->get_vma(), smpl->get_symbol(), smpl->get_count(), line);
+
+              add_sample(samples_aggregated, new_sample);
+            }
+        }
+
+      //loop through the samples, find all unique symbols
+      //add the sample to the symbol's list of samples
+      for (list<sample*>::iterator i = samples_aggregated.begin (); i != samples_aggregated.end (); ++i)
+        {
+          if ((*i)->has_symbol())
+            {
+              unsigned int line = 0;
+              const char* func  = NULL;
+              const char* file  = NULL;
+              sfile->get_debug_info ((*i)->get_vma (), func, file, line);
+
+              //deleted when output later
+              symbol* new_symbol = new symbol((*i)->get_symbol()->get_asymbol(), (file == NULL ? "" : file) );
+
+              //duplicates aren't inserted because of the unique asymbol*
+              symbols.insert(pair<const asymbol*, symbol*>(new_symbol->get_asymbol(),new_symbol));
+
+              //this symbol must be in the map, either it was just added or it was already there
+              symbols[(*i)->get_symbol()->get_asymbol()]->add_sample((*i));
+
+              //add to total count of the symbol
+              symbols[(*i)->get_symbol()->get_asymbol()]->add_count((*i)->get_count());
+            }
+        }
+
+      char buf[11];
+      long total_count = sfile->get_sample_count() + get_dependent_count(image->get_dependencies());
+      sprintf(buf,"%ld", total_count);
+
+      os << startt ("image")
+         << attrt ("name", get_name(image))
+         << attrt ("count", buf);
+
+      if (symbols.size() > 0) {
+        os << startt("symbols");
+
+        set<symbol*, symbol_comp>* sorted_symbols = sort_symbols(&symbols);
+
+        //output the symbols, and free their memory
+        for (set<symbol*, symbol_comp>::iterator i = sorted_symbols->begin(); i != sorted_symbols->end(); ++i)
+          {
+            os << *i;
+            delete *i;
+          }
+
+        os << endt;     // </symbols>
+        sorted_symbols->clear();
+        symbols.clear();
+      }
+
+      //free the memory from the allocated samples
+      for (list<sample*>::iterator i = samples_aggregated.begin(); i != samples_aggregated.end(); ++i)
+        {
+//          cerr << (*i)->get_demangled_name() << " " << (*i)->get_line() << " " << (*i)->get_count() << endl;
+          delete (*i);
+        }
+      samples_aggregated.clear();
+
+
+      //output dependent images
+      list<profileimage*>* deps = image->get_dependencies ();
+      if (!deps->empty())
+        {
+          char buf[21];
+          sprintf(buf,"%ld", get_dependent_count(deps));
+
+          os << startt ("dependent")
+             << attrt ("count", buf);
+
+          set<profileimage*, depimage_comp>* ordered_deps = sort_depimages(deps);
+
+          copy (ordered_deps->begin (), ordered_deps->end (), ostream_iterator<profileimage*> (os, ""));
+          os << endt;
+        }
+
+      os << endt;       //</image>
+    }
+
+  return os;
+}
+
+//Adds the sample new_sample to the container samples.
+//
+//This method is required to collapse multiple samples that
+// occur on the same line, since one line can correspond to
+// more than one instructions and hence multiple samples
+// occur for the same line of code.
+void
+add_sample(list<sample*> &samples, sample* new_sample)
+{
+  bool added = false;
+
+  if (samples.size() == 0)
+    {
+      samples.push_back(new_sample);
+    }
+  else
+    {
+      for (list<sample*>::iterator i = samples.begin(); i != samples.end(); ++i)
+        {
+          //compare based on the symbols (bfd symbol ptr) and line number
+          if ((*i)->get_symbol()->get_asymbol() == new_sample->get_symbol()->get_asymbol() &&
+              (*i)->get_line() == new_sample->get_line())
+            {
+              //sample exists -- remove from vector, aggregate, reinsert
+              sample* s = new sample( (*i)->get_vma(),
+                                      (*i)->get_symbol(),
+                                      (*i)->get_count() + new_sample->get_count(),
+                                      (*i)->get_line());
+
+              delete (*i);
+              samples.erase(i);
+              samples.push_back(s);
+              added = true;
+              break;
+            }
+        }
+
+      if (!added)
+        {
+          samples.push_back(new_sample);
+        }
+    }
+}
+
+long
+get_dependent_count(const list<profileimage*>* const deps)
+{
+  long dep_count = 0;
+
+  //get total count for all the dependent images
+  for (list<profileimage*>::const_iterator i = deps->begin(); i != deps->end(); ++i)
+    {
+      dep_count += (*i)->get_samplefile()->get_sample_count();
+    }
+
+  return dep_count;
+}
+
+//special case name for VDSO
+string
+get_name(const profileimage* p)
+{
+  string name = p->get_name();
+
+  if (name == "")
+    {
+      //FIXME: any better way to do this?
+      if ((p->get_samplefile()->get_sample_file_name()).find("{anon:[vdso]}",0) != string::npos)
+        {
+          name = VDSO_NAME_STRING;
+        }
+    }
+
+  return name;
+}
+
+set<profileimage*, depimage_comp>*
+sort_depimages(const std::list<profileimage*>* const deps) {
+	set<profileimage*, depimage_comp>* sorted_deps = new set<profileimage*, depimage_comp>();
+	for (list<profileimage*>::const_iterator i = deps->begin(); i != deps->end(); ++i) {
+		sorted_deps->insert((*i));
+	}
+
+	return sorted_deps;
+}
+
+set<symbol*, symbol_comp>*
+sort_symbols(const std::map<const asymbol*, symbol*>* const symbols) {
+        set<symbol*, symbol_comp>* sorted_syms = new set<symbol*, symbol_comp>();
+
+        for (map<const asymbol*, symbol*>::const_iterator i = symbols->begin(); i != symbols->end(); ++i) {
+          sorted_syms->insert(i->second);
+        }
+
+        return sorted_syms;
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/profileimage.h b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/profileimage.h
new file mode 100644
index 0000000..2639a76
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/profileimage.h
@@ -0,0 +1,106 @@
+/* profileimage - A class which represents a single image for
+   which oprofile has samples (or for which some child dependency
+   has samples).
+   Written by Keith Seitz <keiths@redhat.com>
+   Edited by Kent Sebastian     <ksebasti@redhat.com>
+   Copyright 2004,2008 Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#ifndef _PROFILEIMAGE_H
+#define _PROFILEIMAGE_H
+
+#include <list>
+#include <string>
+#include <set>
+
+#include "samplefile.h"
+#include "symbol.h"
+
+#define VDSO_NAME_STRING "[vdso]"
+
+class sample;
+class imageheader;
+
+class profileimage
+{
+ public:
+  // Constructor - pass in the samplefile; CANNOT BE NULL.
+  profileimage (samplefile* sfile);
+
+  // Destructor
+  ~profileimage ();
+
+  // Returns the name of this image; it is the name of the actual binary
+  // in which samples were collected.
+  std::string get_name (void) const;
+
+  // Returns the image header for this image
+  const imageheader* get_header (void);
+
+  // Add the given profileimage as a dependency of this image
+  void add_dependency (profileimage* image);
+
+  // Returns a list of all the dependencies of this image
+  std::list<profileimage*>* get_dependencies (void) const { return _dependencies; };
+
+  // Returns the Oprofile samplefile for this image
+  samplefile* get_samplefile (void) const { return _samplefile; };
+
+  // Returns the count of all the samples collected in this image, excluding dependencies
+  long get_count (void) const;
+
+ private:
+  // The samplefile (non-NULL)
+  samplefile* _samplefile;
+
+  // List of dependencies
+  std::list<profileimage*>* _dependencies;
+
+  // Image header
+  imageheader* _header;
+};
+
+struct depimage_comp {
+  bool operator() (const profileimage* lhs, const profileimage* rhs)
+    {
+      if (lhs->get_count() == rhs->get_count())
+        if (lhs->get_name() == rhs->get_name())
+          return true;
+        else
+          return lhs->get_name() < rhs->get_name();
+      else
+        return lhs->get_count() > rhs->get_count();
+    }
+};
+
+struct symbol_comp {
+  bool operator() (const symbol* lhs, const symbol* rhs)
+    {
+      if (lhs->get_count() == rhs->get_count())
+        {
+          std::string ln(lhs->name()), rn(rhs->name());
+          if (ln == rn)
+            return true;
+          else
+            return ln < rn;
+        }
+      else
+        return lhs->get_count() > rhs->get_count();
+    }
+};
+
+
+std::ostream& operator<< (std::ostream& os, profileimage* image);
+void add_sample(std::list<sample*> &samples, sample* new_sample);
+long get_dependent_count(const std::list<profileimage*>* const deps);
+std::set<profileimage*, depimage_comp>* sort_depimages(const std::list<profileimage*>* const deps);
+std::set<symbol*, symbol_comp>* sort_symbols(const std::map<const asymbol*, symbol*>* const symbols);
+std::string get_name(const profileimage* p);
+#endif // !_PROFILEIMAGE_H
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/sample.cc b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/sample.cc
new file mode 100644
index 0000000..820b378
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/sample.cc
@@ -0,0 +1,57 @@
+/* sample - A class which represents an Oprofile sample
+   Written by Keith Seitz <keiths@redhat.com>
+   Edited by Kent Sebastian     <ksebasti@redhat.com>
+   Copyright 2004,2008 Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#include "sample.h"
+#include "xmlfmt.h"
+#include "symbol.h"
+
+using namespace std;
+
+// Constructor - pass in sample's address, any associated symbol, count,
+sample::sample(bfd_vma addr, symbol* sym, unsigned int count)
+  : _addr (addr), _symbol (sym), _count (count)
+{
+}
+
+sample::sample(bfd_vma addr, const symbol* sym, unsigned int count, unsigned int line)
+  : _addr (addr), _symbol (sym), _count (count), _line (line)
+{
+}
+
+const char*
+sample::get_name (void) const
+{
+  return (has_symbol () ? _symbol->name () : NULL);
+}
+
+const char*
+sample::get_demangled_name (void) const
+{
+  return (has_symbol () ? _symbol->demangled_name () : NULL);
+}
+
+/*
+ * <sample>
+ *   <count>4312</count>
+ *   <line>41</line>
+ * </sample>
+ */
+ostream&
+operator<< (ostream& os, const sample* s)
+{
+  os << startt ("sample")
+     << startt ("count") << s->get_count () << endt
+     << startt ("line") << s->get_line() << endt;
+
+  return os << endt;
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/sample.h b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/sample.h
new file mode 100644
index 0000000..f3940fe
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/sample.h
@@ -0,0 +1,78 @@
+/* Sample - A class which represents an Oprofile sample
+   Written by Keith Seitz <keiths@redhat.com>
+   Edited by Kent Sebastian     <ksebasti@redhat.com>
+   Copyright 2003,2008 Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#ifndef _SAMPLE_H
+#define _SAMPLE_H
+#include <stdlib.h>
+#include <bfd.h>
+#include <ostream>
+#include <set>
+
+
+class symbol;
+
+
+class sample
+{
+ public:
+   sample (bfd_vma a, symbol* sym, unsigned int cnt);
+   sample (bfd_vma a, const symbol* sym, unsigned int cnt, unsigned int line);
+
+  // Get the name of the symbol corresponding to this sample
+  // Returns NULL if no symbol.
+  const char* get_name (void) const;
+
+  // Returns the demangled name for this sample
+  const char* get_demangled_name (void) const;
+
+  // Returns the total sample count for this sample
+  inline unsigned int get_count(void) const { return _count; };
+
+  // Increments the total sample count for this sample
+  inline void incr_count (int n) { _count += n; };
+
+  // Does this sample have a symbol?
+  inline bool has_symbol (void) const { return _symbol != NULL; };
+
+  // Returns the symbol for this sample (could be NULL)
+  inline const symbol* get_symbol (void) const { return _symbol; };
+
+  // Gets the real vma for this sample
+  inline bfd_vma get_vma (void) const { return _addr; };
+
+  inline unsigned int get_line() const { return _line; };
+
+ private:
+  // (real) Address of sample
+  bfd_vma _addr;
+
+  // Symbol for sample (according to minimal symbols)
+  const symbol* _symbol;
+
+  // Number of times sample appears in output
+  unsigned int _count;
+
+  //line number -- set in profileimage
+  unsigned int _line;
+
+};
+
+
+struct sample_comp {
+  bool operator() (const sample* lhs, const sample* rhs) { return (lhs->get_count() == rhs->get_count() ? lhs->get_line() < rhs->get_line() : lhs->get_count() > rhs->get_count() ); }
+};
+
+
+// Operator to output samples
+std::ostream& operator<< (std::ostream& os, const sample* s);
+#endif // !_SAMPLE_H
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/samplefile.cc b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/samplefile.cc
new file mode 100644
index 0000000..2bc55d8
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/samplefile.cc
@@ -0,0 +1,248 @@
+/* samplefile - A class which represents a samplefile. This class either
+   represents a real disk file or a "fake" one (needed in cases where
+   Oprofile only collected samples in a dependency, like a library).
+   Written by Keith Seitz <keiths@redhat.com>
+   Copyright 2004 Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#include "samplefile.h"
+#include "sample.h"
+#include "stable.h"
+#include "xmlfmt.h"
+
+#include <algorithm>
+
+using namespace std;
+
+// From libutil++
+extern bool create_file_list (list<string>& file_list, const string& base_dir,
+			      const string& filter = "*", bool recursive = true);
+
+samplefile::samplefile (string filename)
+{
+  _st = NULL;
+  _db = new oprofile_db (filename);
+  _filename = filename;
+  _get_info_from_filename ();
+}
+
+// This seems like a giant waste of time, but when it comes down to processing many
+// hundreds of samplefiles, we really need to be able to do this quickly.
+string
+samplefile::event_for_filename (string filename)
+{
+  string event;
+
+  string::size_type pos = filename.find_last_of ('/');
+  if (pos != string::npos)
+    {
+      string basename = filename.substr (pos + 1, string::npos);
+
+      // Tokenize the basename between the '.'. This seems like a contradiction
+      // to the speed mantra, but consider it a minimal sanity check.
+      vector<string> parts = _tokenize (basename, '.');
+      if (parts.size () == 6)
+	event = parts[0];
+    }
+
+  return event;
+}
+
+void
+samplefile::_get_info_from_filename (void)
+{
+  // First the easy stuff: event specifications
+  // Filenames look like: EVENT.COUNT.UMASK.TGID.TID.CPU
+  string basename;
+  string dir_name;
+  string::size_type pos = _filename.find_last_of ('/');
+  if (pos != string::npos)
+    {
+      dir_name = _filename.substr (0, pos);
+      basename = _filename.substr (pos + 1, string::npos);
+
+      // Tokenize the basename between the '.'
+      vector<string> parts = _tokenize (basename, '.');
+      if (parts.size () == 6)
+	{
+	  // Right number of specifications!
+	  int i = 0;
+	  _event = parts[i++];
+	  _count = parts[i++];
+	  _unit_mask = parts[i++];
+	  _tgid = parts[i++];
+	  _tid = parts[i++];
+	  _cpu = parts[i++];
+	}
+      else
+	return ;
+
+      /* Now the hard part: the lib and image names */
+
+      // Like the event spec, the easiest way to do this is to tokenize the pathname
+      parts = _tokenize (dir_name, '/');
+
+      // Strip off everything up to either "{root}" or "{kern}"
+      vector<string>::size_type i = 0;
+
+      /* Basically, we have
+	 "/path/to/samples/<session>/{root} or {kern}"
+	 + "/path/to/executable/{dep}" + "{root}" || "{kern}"
+	 + "/path/to/library[/{cg}]
+	 [+ "/path/to/callgraph"] */
+
+      // First "token" to look for is "{root}" or "{kern}"
+      for ( ; i < parts.size (); ++i)
+	{
+	  if (parts[i] == "{root}" || parts[i] == "{kern}")
+	    break;
+	}
+
+      // Skip past "{root}" or "{kern}"
+      ++i;
+
+      // Next "token" is "{dep}". Everything else is image name
+      for ( ; i < parts.size () && parts[i] != "{dep}"; ++i)
+	_image += "/" + parts[i];
+
+      // Skip past "{dep}"
+      ++i;
+
+      // "{dep}" must be followed by "{kern}" or "{root}"
+      if (parts[i] != "{kern}" && parts[i] != "{root}")
+	{
+	  // Error. Filename truncated.
+	  return;
+	}
+
+      // Skip past "{kern}" or "{root}"
+      ++i;
+
+      // Next "token" will be "{cg}" or string::npos
+      for ( ; i < parts.size () && parts[i] != "{cg}"; ++i)
+	_lib_image += "/" + parts[i];
+
+      // Skip past "{cg}" (or end)
+      ++i;
+
+      // Last bits will be callgraph
+      for ( ; i < parts.size (); ++i)
+	_callgraph += "/" + parts[i];
+    }
+}
+
+vector<string>
+samplefile::_tokenize (const string& str, char delim)
+{
+  vector<string> tokens;
+  string::size_type start, end;
+
+  start = end = 0;
+  while ((end = str.find (delim, start)) != string::npos)
+    {
+      if (start != end ) // ignore zero-length, i.e, str[0] == delim
+	tokens.push_back (str.substr (start, end - start));
+
+      // skip the delimiter character
+      start = end + 1;
+    }
+
+  // add any trailing stuff
+  if (start != str.length ())
+    tokens.push_back (str.substr (start, string::npos));
+
+  return tokens;
+}
+
+samplefile::~samplefile (void)
+{
+  if (_db != NULL)
+    {
+      delete _db;
+      _db = NULL;
+    }
+
+  if (_st != NULL)
+    {
+      delete _st;
+      _st = NULL;
+    }
+}
+
+// DO NOT FREE THE RESULT. ~oprofile_db will do it.
+const samplefile::samples_t
+samplefile::get_samples (void)
+{
+  samplefile::samples_t samples;
+
+  if (has_samplefile ())
+    {
+      if (_st == NULL)
+	{
+	  _st = new symboltable (get_name ().c_str ());
+	  _st->read_symbols ();
+	}
+
+      samples = _db->get_samples (_st);
+    }
+
+  return samples;
+}
+
+bool
+samplefile::get_debug_info (bfd_vma vma, const char*& func, const char*& file, unsigned int& line)
+{
+  return (_st == NULL ? false : _st->get_debug_info (vma, func, file, line));
+}
+
+void
+samplefile::get_sample_file_list (list<string>& file_list, const string& base_dir)
+{
+  file_list.clear ();
+
+  list<string> files;
+  if (create_file_list (files, base_dir))
+    {
+      list<string>::iterator i;
+      for (i = files.begin (); i != files.end (); ++i)
+	{
+	  // Only allow unique filenames into the final list.
+	  // (This can happen because we can have multiple counters
+	  // for any given sample file.)
+	  if (find (file_list.begin (), file_list.end (), *i)
+	      == file_list.end ())
+	    file_list.push_back (*i);
+	}
+    }
+}
+
+// Output header & list of samples
+/*
+ * <samplefile>/var/lib/oprofile/samples/current/blah/blah/blah</samplefile>
+ * SAMPLE (handled by class sample)
+ */
+ostream&
+operator<< (ostream& os, samplefile* sf)
+{
+  // output the sfile's full pathname (used for fetching debug info)
+  os << startt ("samplefile") << sf->get_sample_file_name () << endt;
+
+  // output list of samples
+  //TODO: grouped by symbol, then line number
+  samplefile::samples_t samples = sf->get_samples ();
+  samplefile::samples_t::iterator s;
+  for (s = samples.begin (); s != samples.end (); ++s)
+    {
+      const sample* smpl = samplefile::SAMPLE (*s);
+      os << smpl;
+    }
+
+  return os;
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/samplefile.h b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/samplefile.h
new file mode 100644
index 0000000..90ca91c
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/samplefile.h
@@ -0,0 +1,140 @@
+/* samplefile - A class which represents a samplefile. This class either
+   represents a real disk file or a "fake" one (needed in cases where
+   Oprofile only collected samples in a dependency, like a library).
+   Written by Keith Seitz <keiths@redhat.com>
+   Copyright 2004 Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#ifndef _SAMPLEFILE_H
+#define _SAMPLEFILE_H
+#include <string>
+#include <list>
+#include <vector>
+
+#include "oprofiledb.h"
+
+class symboltable;
+
+class samplefile
+{
+ public:
+  // The type of a list of samples. STL container with iterators.
+  typedef oprofile_db::samples_t samples_t;
+  
+  // The type of a sample. Also an STL container. Use SAMPLE to get at
+  // actual sample.
+  typedef oprofile_db::sample_t sample_t;
+
+  // The type of a list of samplefiles
+  typedef std::list<samplefile*> samplefilelist_t;
+
+  // Convenience function to return the sample associated with
+  // a sample_t
+  static inline sample* SAMPLE (sample_t sample)
+    { return oprofile_db::SAMPLE (sample); };
+
+  // Constructor -- pass in the filename (may be "" when there
+  // were no samples collected for the profileimage, i.e., "fake").
+  samplefile (std::string filename);
+
+  // Destructor
+  ~samplefile (void);
+
+  // Does this sample have a samplefile? This happens when Oprofile has
+  // collected samples for an image, but all those samples were collected
+  // in libraries and other dependencies.
+  bool has_samplefile (void) const
+    { return _filename != ""; };
+
+  // Is this samplefile a dependency?
+  bool is_dependency (void) const
+    { return (!has_samplefile () || (_image != _lib_image)); }
+
+  // Get count of all samples in this file
+  long get_sample_count (void)
+    { return (has_samplefile () ? _db->get_count () : 0); };
+
+  // Returns the filename of this samplefile (or "" if it is "fake")
+  std::string get_sample_file_name (void) const
+    { return _filename; };
+
+  // Returns the image name
+  std::string get_image (void) const
+    { return _image; };
+
+  // Returns the library image name
+  std::string get_lib_image (void) const
+    {return _lib_image; };
+
+  // Returns the logical name of the image in this samplefile, i.e.,
+  // the lib_image if this is a dependency or image_name if not
+  std::string get_name (void) const
+    { return (is_dependency () ? get_lib_image () : get_image ()); };
+
+  // Returns the event name that was collected in this samplefile
+  std::string get_event (void) const
+    { return _event; };
+
+  std::string get_count (void) const
+    { return _count; };
+
+  std::string get_unit_mask (void) const
+    { return _unit_mask; };
+
+  std::string get_tgid (void) const
+    { return _tgid; };
+ 
+  std::string get_tid (void) const
+    { return _tid; };
+
+  std::string get_cpu (void) const
+    { return _cpu; };
+
+  std::string get_callgraph (void) const
+    { return _callgraph; };
+
+  // Returns a list of all the samples in this samplefile. Do NOT free the result!
+  const samples_t get_samples (void);
+
+  // Returns the debug info for the given VMA.
+  bool get_debug_info (bfd_vma vma, const char*& func, const char*& file, unsigned int& line);
+
+  // Get list of files from base_dir
+  static void get_sample_file_list (std::list<std::string>& file_list, 
+				    const std::string& base_dir);
+
+  // This may seem like a bad practice, but this is done for speed reasons
+  static std::string event_for_filename (std::string filename);
+
+ private:
+  static std::vector<std::string> _tokenize (const std::string& str, char delim);
+  void _get_info_from_filename (void);
+
+  // The oprofile_db associated with this samplefile
+  oprofile_db* _db;
+
+  // The symbol table opened for the executable represented by this samplefile
+  symboltable* _st;
+
+  // Information about the collection configuration
+  std::string _filename;  // Disk filename of samplefile
+  std::string _image;     // Name of the image recorded
+  std::string _lib_image; // Name of the library (== _image if not a sub-image)
+  std::string _event;
+  std::string _count;
+  std::string _unit_mask;
+  std::string _tgid;
+  std::string _tid;
+  std::string _cpu;
+  std::string _callgraph;
+};
+
+std::ostream& operator<< (std::ostream& os, samplefile* sf);
+#endif // !_SAMPLEFILE_H
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/session.cc b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/session.cc
new file mode 100644
index 0000000..7b2bc44
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/session.cc
@@ -0,0 +1,203 @@
+/* session - a class which represents an oprofile session.
+   All sessions occur as directories of the samples directory.
+   Written by Keith Seitz <keiths@redhat.com>
+   Copyright 2003, 2004 Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#include "session.h"
+#include <iostream>
+#include <string.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <dirent.h>
+
+#include "sevent.h"
+#include "opinfo.h"
+#include "xmlfmt.h"
+
+using namespace std;
+
+session::session(string name, const opinfo* info)
+  : _name (name), _info (info)
+{
+}
+
+string
+session::get_base_directory (void) const
+{
+  return _info->get_samples_directory () + _name;
+}
+
+session::sessionlist_t
+session::get_sessions (const opinfo& info)
+{
+  sessionlist_t sessions;
+
+  struct stat sbuf;
+  int rc = stat (info.get_samples_directory ().c_str (), &sbuf);
+  if (rc < 0)
+    {
+      cerr << "cannot stat samples directory (" << info.get_samples_directory () << ")"
+	   << endl;
+      return sessions;
+    }
+  else if (S_ISDIR (sbuf.st_mode) == 0)
+    {
+      cerr << "samples directory (" << info.get_samples_directory ()
+	   << ") is not a directory" << endl;
+      return sessions;
+    }
+
+  DIR* dirp = opendir (info.get_samples_directory ().c_str ());
+  if (dirp == NULL)
+    {
+      cerr << "cannot read samples directory (" << info.get_samples_directory () << ")"
+	   << endl;
+      return sessions;
+    }
+
+  struct dirent* dir;
+  while ((dir = readdir (dirp)) != NULL)
+    {
+      if (strcmp (dir->d_name, ".") != 0 && strcmp (dir->d_name, "..") != 0)
+	{
+	  string name (dir->d_name);
+	  sessions.push_back (new session (name, &info));
+	}
+    }
+
+  return sessions;
+}
+
+// returns NULL if not found
+sessionevent*
+session::get_event (string event_name)
+{
+  list<string> filelist;
+  samplefile::get_sample_file_list (filelist, get_base_directory ());
+
+  // Loop through all sample files, create & populate sessionevents
+  // with sample file lists
+  sessionevent* the_sevent = NULL;
+  list<samplefile*> deps;
+  list<string>::iterator fit = filelist.begin ();
+  for (; fit != filelist.end (); ++fit)
+    {
+      if (samplefile::event_for_filename (*fit) == event_name)
+	{
+	  samplefile* sfile = new samplefile (*fit);
+
+          if (!sfile->is_dependency ())
+            {
+              // main image
+              if (the_sevent == NULL)
+                {
+                  // found the desired event -- create it
+                  the_sevent = new sessionevent (this, event_name);
+                }
+
+              // Add this sample file to the sessionevent
+              the_sevent->add_sample_file (sfile);
+            }
+          else
+            {
+              // dependency -- save it for later resolution
+              deps.push_back (sfile);
+            }
+	}
+    }
+
+  // Now run through the list of dependencies
+  if (the_sevent != NULL)
+    {
+      list<samplefile*>::iterator sfit;
+      for (sfit = deps.begin (); sfit != deps.end (); ++sfit)
+	{
+	  samplefile* sfile = *sfit;
+	  the_sevent->add_sample_file (sfile);
+	}
+    }
+
+  return the_sevent;
+}
+
+
+
+session::seventlist_t
+session::get_events ()
+{
+  list<string> filelist;
+  samplefile::get_sample_file_list (filelist, get_base_directory ());
+
+  // Loop through all sample files, create & populate sessionevents
+  // with sample file lists
+  seventlist_t events;
+  map<string, sessionevent*> emap;
+  list<samplefile*> deps;
+  list<string>::iterator fit = filelist.begin ();
+  for (; fit != filelist.end (); ++fit)
+    {
+      if (samplefile::event_for_filename (*fit) != "")
+	{
+	  samplefile* sfile = new samplefile (*fit);
+	  if (!sfile->is_dependency ())
+	    {
+	      // main image
+	      map<string, sessionevent*>::iterator item;
+	      item = emap.find (sfile->get_event ());
+	      if (item == emap.end ())
+		{
+		  // new event -- create sessionevent
+		  sessionevent* se = new sessionevent (this, sfile->get_event ());
+
+		  // Save this sessionevent in the event map
+		  emap.insert (make_pair<string, sessionevent*> (sfile->get_event (), se));
+
+		  // Add this sample file to the list
+		  se->add_sample_file (sfile);
+
+		  // Finally, add this new sessionevent to result
+		  events.push_back (se);
+		}
+	      else
+		{
+		  // Add this sample file to the sessionevent
+		  sessionevent* se = (*item).second;
+		  se->add_sample_file (sfile);
+		}
+	    }
+	  else
+	    {
+	      // dependency -- save it for later resolution
+	      deps.push_back (sfile);
+	    }
+	}
+    }
+
+  // Now run through the list of dependencies
+  list<samplefile*>::iterator sfit;
+  for (sfit = deps.begin (); sfit != deps.end (); ++sfit)
+    {
+      samplefile* sfile = *sfit;
+      map<string, sessionevent*>::iterator item;
+      item = emap.find (sfile->get_event ());
+      if (item != emap.end ())
+	{
+	  sessionevent* se = (*item).second;
+	  se->add_sample_file (sfile);
+	}
+      else
+	cerr << "WARNING! dep file with no event!" << endl;
+    }
+
+  return events;
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/session.h b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/session.h
new file mode 100644
index 0000000..3371140
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/session.h
@@ -0,0 +1,59 @@
+/* session - a class which represents an oprofile session.
+   All sessions occur as directories of the samples directory.
+   Written by Keith Seitz <keiths@redhat.com>
+   Copyright 2003, 2004 Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#ifndef _SESSION_H
+#define _SESSION_H
+#include <string>
+#include <list>
+
+#include "samplefile.h"
+
+class opinfo;
+class sessionevent;
+
+class session
+{
+ public:
+  // Constructor - pass in the name of the session (or "" for the default)
+  // and cpu/config information
+  session (std::string name, const opinfo* info);
+
+  // Returns a list of all sessions
+  typedef std::list<session*> sessionlist_t;
+  static sessionlist_t get_sessions (const opinfo& info);
+
+  // Returns the name of this session
+  const std::string& get_name (void) const { return _name; };
+
+  // Returns a list of events collected in this session.
+  typedef std::list<sessionevent*> seventlist_t;
+  seventlist_t get_events ();
+
+  // Searches for and returns the sessionevent which collected the
+  // given event_name. Returns NULL if not found. Return value must be
+  // freed by caller.
+  sessionevent* get_event (std::string event_name);
+
+  // Returns the directory for this session, i.e., SAMPLES_DIR+session_name
+  std::string get_base_directory (void) const;
+
+ private:
+  // The name of this session
+  std::string _name;
+
+  // The cpu info
+  const opinfo* _info;
+};
+
+
+#endif // !_SESSION_H
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/sevent.cc b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/sevent.cc
new file mode 100644
index 0000000..34496ef
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/sevent.cc
@@ -0,0 +1,105 @@
+/* sevent (sessionevent) - a class which represents an event collected
+   within an oprofile session. There will be one sessionevent for every
+   event collected within a session. No two sessionevents with the same
+   session name may have the same event name.
+   Written by Keith Seitz <keiths@redhat.com>
+   Copyright 2004 Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#include "sevent.h"
+
+#include "session.h"
+#include "xmlfmt.h"
+
+using namespace std;
+
+sessionevent::sessionevent (const session* session, string event)
+  : _session (session), _event_name (event)
+{
+  _files = new profileimages_t;
+}
+
+sessionevent::~sessionevent ()
+{
+  profileimages_t::iterator it;
+  for (it = _files->begin (); it != _files->end (); ++it)
+    delete (*it);
+  delete _files;
+}
+
+void
+sessionevent::add_sample_file (samplefile* sfile)
+{
+  if (!sfile->is_dependency ())
+    {
+      // top-level image
+      _files->push_back (new profileimage (sfile));
+
+    }
+  else
+    {
+      // find file -- add dependent
+      bool found = false;
+      profileimages_t::iterator it;
+      for (it = _files->begin (); it != _files->end (); ++it)
+	{
+	  if ((*it)->get_name () == sfile->get_image ())
+	    {
+	      (*it)->add_dependency (new profileimage (sfile));
+	      found = true;
+	    }
+	}
+
+      if (!found)
+	{
+	  // This does happen!! We got no samples in a profileimage,
+	  // but we DID get samples in a dependency. Create a new
+	  // "fake" profileimage and add this as a dependency.
+	  profileimage* img = new profileimage (new samplefile (""));
+	  img->add_dependency (new profileimage (sfile));
+	  _files->push_back (img);
+	}
+    }
+}
+
+long
+sessionevent::get_count (void) const
+{
+  // Get list of images
+  profileimages_t::iterator it;
+  long count = 0;
+  for (it = _files->begin (); it != _files->end (); ++it)
+    {
+      // Get count of the main image
+      count += (*it)->get_count ();
+
+      // Add count for dependencies
+      list<profileimage*>* deps = (*it)->get_dependencies ();
+      list<profileimage*>::iterator dit;
+      for (dit = deps->begin (); dit != deps->end (); ++dit)
+	count += (*dit)->get_count ();
+    }
+
+  return count;
+}
+
+/*
+ * <session name="foo">
+ *    <count>1234</count>
+ * </session>
+ *
+ */
+ostream&
+operator<< (ostream& os, const sessionevent* se)
+{
+  return os << startt ("session") << attrt ("name", se->get_session ()->get_name ())
+//	    << startt ("count") << se->get_count () << endt
+	    << endt;
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/sevent.h b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/sevent.h
new file mode 100644
index 0000000..afcb15c
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/sevent.h
@@ -0,0 +1,63 @@
+/* sevent (sessionevent) - a class which represents an event collected
+   within an oprofile session. There will be one sessionevent for every
+   event collected within a session. No two sessionevents with the same
+   session name may have the same event name.
+   Written by Keith Seitz <keiths@redhat.com>
+   Copyright 2004 Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#ifndef _SEVENT_H
+#define _SEVENT_H
+#include <string>
+#include <list>
+
+#include "profileimage.h"
+
+class samplefile;
+class session;
+
+class sessionevent
+{
+ public:
+  // Constructor -- pass in session and event name
+  sessionevent (const session* session, std::string event);
+
+  // Desctructor
+  ~sessionevent ();
+
+  // Returns the event name
+  const std::string get_name (void) const { return _event_name; };
+
+  // Returns the session
+  const session* get_session (void) const { return _session; };
+
+  // Adds the samplefile to this sessionevent
+  void add_sample_file (samplefile* sfile);
+
+  // Returns the count of all samples in this sessionevent
+  long get_count (void) const;
+
+  // Returns a list of the images in the sessionevent
+  typedef std::list<profileimage*> profileimages_t;
+  profileimages_t* get_images (void) const { return _files; };
+
+ private:
+  // The session
+  const session* _session;
+
+  // The name of the event
+  const std::string _event_name;
+
+  // A list of images in this session
+  profileimages_t* _files;
+};
+
+std::ostream& operator<< (std::ostream& os, const sessionevent* se);
+#endif // _SEVENT_H
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/stable.cc b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/stable.cc
new file mode 100644
index 0000000..5f9e63b
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/stable.cc
@@ -0,0 +1,294 @@
+/* symboltable - A symbol table class
+   Written by Keith Seitz <keiths@redhat.com>
+   Copyright 2004 Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#include <stdlib.h>
+#include <string.h>
+#include <iostream>
+#include <fcntl.h>
+#include <algorithm>
+
+#include "stable.h"
+#include "symbol.h"
+
+static bool ltvma (const symbol* a, const symbol* b);
+
+// Stolen from oprofile
+char const* symboltable::_boring_symbols[] = {
+  "gcc2_compiled.",
+  "_init"
+};
+
+// Helper function for sorting symbols by VMA
+static bool
+compare_symbol_with_vma (bfd_vma vma, const symbol* a)
+{
+  return (a->end () > vma);
+}
+
+symboltable::symboltable(const char* file)
+  : _filename (strdup (file)), _abfd (NULL), _symbol_table (NULL), _cache_symbol (NULL)
+{
+}
+
+symboltable::~symboltable ()
+{
+  if (_symbol_table != NULL)
+    free (_symbol_table);
+
+  std::vector<symbol*>::iterator i = _symbols.begin ();
+  while (i != _symbols.end ())
+    {
+      delete (*i);
+      //_symbols.erase (i);
+      ++i;
+    }
+
+  _symbols.clear ();
+  _close_bfd ();
+  free (_filename);
+}
+
+// If this returns NULL, then the VMA is not in any range of
+// msymbols. This is can apparently happen. op_time and friends
+// ignore these samples.
+symbol*
+symboltable::lookup_vma (bfd_vma vma, bfd_vma& real_vma, bool is_kernel)
+{
+  if (is_kernel)
+    real_vma = vma;
+  else
+    real_vma = vma + _start_vma - _text_offset;
+  return (lookup_vma (real_vma));
+}
+
+symbol*
+symboltable::lookup_vma (bfd_vma real_vma)
+{
+  if (_cache_symbol != NULL && _cache_symbol->contains (real_vma))
+    return _cache_symbol;
+
+  std::vector<symbol*>::iterator i;
+  i = upper_bound (_symbols.begin (), _symbols.end (),
+		   real_vma, compare_symbol_with_vma);
+  if (i != _symbols.end () && (*i)->contains (real_vma))
+    {
+      _cache_symbol = *i;
+      return *i;
+    }
+
+  return NULL;
+}
+
+bool
+symboltable::read_symbols ()
+{
+  if (_open_bfd ())
+    {
+      long storage_needed = bfd_get_symtab_upper_bound (_abfd);
+      if (storage_needed > 0)
+	{
+	  _symbol_table = (asymbol**) malloc (storage_needed);
+	  long num_symbols = bfd_canonicalize_symtab (_abfd, _symbol_table);
+	  for (int i = 0; i < num_symbols; ++i)
+	    {
+	      if (_interesting_symbol (_symbol_table[i]))
+		_symbols.push_back (new symbol (_symbol_table[i]));
+	    }
+
+	  if (_symbols.size() > 0)
+	    {
+	      // Sort in order of increasing vma and eliminate duplicates
+	      stable_sort (_symbols.begin (), _symbols.end (), ltvma);
+
+	      // Eliminate duplicates
+	      for (size_t i = 0; i < _symbols.size () - 1; ++i)
+		{
+		  if (_symbols[i]->start () == _symbols[i+1]->start ())
+		    {
+		      int erase;
+
+		      // Opt to keep FUNCTIONs, first come, first kept
+		      if (_symbols[i]->flags () & BSF_FUNCTION)
+			erase = i + 1;
+		      else if (_symbols[i+1]->flags () & BSF_FUNCTION)
+			erase = i;
+		      else // Don't know. Keep first.
+			erase = i + 1;
+
+		      delete *(_symbols.begin () + erase);
+		      _symbols.erase (_symbols.begin () + erase);
+		      --i;
+		    }
+		}
+
+	      // Fill in end addresses
+	      for (size_t i = 0; i <= _symbols.size () - 1; ++i)
+		{
+		  asymbol* this_sym;
+		  asymbol* next_sym = NULL;
+		  asection* this_sect;
+		  asection* next_sect;
+
+		  this_sym = _symbols[i]->get_asymbol ();
+		  this_sect = bfd_get_section (this_sym);
+		  if (i < _symbols.size () - 1)
+		    {
+		      next_sym = _symbols[i + 1]->get_asymbol ();
+		      next_sect = bfd_get_section (next_sym);
+		    }
+		  else
+		    next_sect = NULL;
+
+		  if (next_sect != NULL
+		      && bfd_get_section (this_sym) == bfd_get_section (next_sym))
+		    _symbols[i]->end (_symbols[i + 1]->start ());
+		  else
+		    {
+		      asection* asect = bfd_get_section (this_sym);
+		      bfd_vma end = bfd_get_section_vma (_abfd, asect);
+		      end += bfd_section_size (_abfd, asect);
+		      _symbols[i]->end (end);
+		    }
+		}
+
+	      return true;
+	    }
+	}
+      /* This may not seem correct, since we're pasing pointers of asymbols
+	 and the like to other pieces of opxml (class symbol, in particular),
+	 but remember that we've allocated memory for the symbol table earlier,
+	 and class symbol references that. So as long as the object "class symboltable"
+	 is not deleted, all symbols will be valid, and we can close the bfd. */
+      _close_bfd ();
+    }
+
+  return false;
+}
+
+bool
+symboltable::_interesting_symbol (asymbol* sym)
+{
+  if (!(bfd_get_section_flags (bfd_asymbol_bfd (sym), bfd_get_section (sym)) & SEC_CODE))
+    return false;
+
+  const char* name = bfd_asymbol_name (sym);
+  if (name == NULL || name[0] == '\0')
+    return false;
+
+  // C++ exception stuff
+  if (name[0] == '.' && name[1] == 'L')
+    return false;
+
+  for (size_t i = 0; i < sizeof (_boring_symbols) / sizeof (_boring_symbols[0]); i++)
+    {
+      if (strcmp (name, _boring_symbols[i]) == 0)
+	return false;
+    }
+
+  return true;
+}
+
+bool
+symboltable::_open_bfd (void)
+{
+  if (_abfd == NULL)
+    {
+      bfd_init ();
+      int fd = open (_filename, O_RDONLY); // bfd_close will close fd
+      _abfd = bfd_fdopenr (_filename, NULL, fd);
+      if (_abfd != NULL)
+	{
+	  char** matches;
+	  if (bfd_check_format_matches (_abfd, bfd_object, &matches))
+	    {
+	      asection const* sect;
+
+	      sect = bfd_get_section_by_name(_abfd, ".text");
+	      if (sect != NULL) {
+	        _text_offset = sect->filepos;
+	      } else {
+	        return false;
+	      }
+
+//            //fail: this might not get the text section because
+//	      // other sections may also have the SEC_CODE flag
+//	      for (sect = _abfd->sections; sect != NULL; sect = sect->next)
+//		{
+//		  if (sect->flags & SEC_CODE)
+//		    {
+//		      _text_offset = sect->filepos;
+//		      break;
+//		    }
+//		}
+
+	    }
+
+	  _start_vma = bfd_get_start_address (_abfd);
+	}
+    }
+  return (_abfd != NULL);
+}
+
+void
+symboltable::_close_bfd (void)
+{
+  if (_abfd != NULL)
+    bfd_close (_abfd);
+
+  _abfd = NULL;
+}
+
+bool
+symboltable::get_debug_info (bfd_vma vma, const char*& function,
+			     const char*& source_file, unsigned int& line)
+{
+  function = NULL;
+  source_file = NULL;
+  line = 0;
+
+  symbol* symbol = lookup_vma (vma);
+  if (symbol != NULL)
+    {
+      asection* asection = symbol->section ();
+
+      bfd_vma pc = vma - bfd_get_section_vma (_abfd, asection);
+      return bfd_find_nearest_line (_abfd, asection, _symbol_table, pc,
+				    &source_file, &function, &line);
+    }
+
+
+  return false;
+}
+
+#if 0
+void
+symboltable::dump_table (void)
+{
+  printf ("%8s\t%8s\t%s\n", "start", "end", "name");
+
+  std::vector<symbol*>::iterator i;
+  for (i = _symbols.begin (); i != _symbols.end (); ++i)
+    {
+      symbol* sym = *i;;
+      printf("%8x\t%8x\t%s\n", (unsigned int)sym->start (), (unsigned int)sym->end (),
+	     sym->name ());
+    }
+}
+#endif
+
+// Helper function to sort two symbols based on VMA
+static bool
+ltvma (const symbol* a, const symbol* b)
+{
+  return (a->start () < b->start ());
+}
+
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/stable.h b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/stable.h
new file mode 100644
index 0000000..e82dd72
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/stable.h
@@ -0,0 +1,87 @@
+/* symboltable - A symbol table class
+   Written by Keith Seitz <keiths@redhat.com>
+   Copyright 2004 Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#ifndef _STABLE_H
+#define _STABLE_H
+#include <bfd.h>
+#include <vector>
+
+class symbol;
+
+class symboltable
+{
+ public:
+  symboltable (const char* file);
+  ~symboltable (void);
+
+  // Lookup a Symbol for the given sample vma. Returns the symbol found (or NULL)
+  // and gives the real address of the sample. Sadly, kernel images are treated
+  // differently from userspace images.
+  symbol* lookup_vma (bfd_vma sample_vma, bfd_vma &real_address, bool is_kernel);
+  symbol* lookup_vma (bfd_vma real_vma);
+
+  // Read in the samples
+  bool read_symbols (void);
+
+  inline asymbol** get_bfd_symbol_table (void) const { return _symbol_table; };
+
+  /* Gets the debug info for a given address:
+     function name in debug info
+     source filename
+     line number
+
+     Returns true if debug info found. False otherwise.
+     NOTE: could return true but still have source_file and line be
+     invalid!*/
+  bool get_debug_info (bfd_vma vma, const char*& function,
+		       const char*& source_file, unsigned int& line);
+
+#if 0
+  // Debugging. Dump the symbol table
+  void dump_table (void);
+#endif
+
+ protected:
+  // Opens the BFD associated with the executable
+  bool _open_bfd (void);
+
+  // Closes the BFD
+  void _close_bfd (void);
+
+  // Helper function: is the given asymbol "interesting"? (i.e., should
+  // it go into the symbol table?)
+  static bool _interesting_symbol (asymbol* sym);
+
+  // A list of known uninteresting symbols
+  static char const* _boring_symbols[];
+
+  // All of the executable's symbols
+  std::vector<symbol*> _symbols;
+
+  // The executable's filename
+  char* _filename;
+
+  // The BFD associated with this executable
+  bfd* _abfd;
+
+  // The BFD symbol table
+  asymbol** _symbol_table;
+
+  // The physical load address of this executable (NOT THE BFD SECTION
+  // START ADDRESS)
+  bfd_vma _start_vma;
+  bfd_vma _text_offset;
+
+  // A performance cache
+  symbol* _cache_symbol;
+};
+#endif // !_STABLE_H
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/symbol.cc b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/symbol.cc
new file mode 100644
index 0000000..478805d
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/symbol.cc
@@ -0,0 +1,85 @@
+/* symbol - A class which represents symbols in executables
+   Written by Keith Seitz <keiths@redhat.com>
+   Edited by Kent Sebastian     <ksebasti@redhat.com>
+   Copyright 2003,2008 Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "symbol.h"
+#include "xmlfmt.h"
+
+// From libiberty
+#ifndef DMGL_PARAMS
+#define DMGL_PARAMS (1 << 0)	// Include function arguments
+#endif
+
+#ifndef DMGL_ANSI
+#define DMGL_ANSI (1 << 1)	// Include const, volatile, etc
+#endif
+
+using namespace std;
+
+extern "C" char* cplus_demangle (char const* mangled_name, int options);
+
+const bfd_vma symbol::UNSET = (bfd_vma) -1;
+
+
+symbol::symbol (asymbol* sym)
+  : _end (UNSET), _asymbol (sym)
+{
+  _count = 0;
+}
+
+symbol::symbol (asymbol* sym, string src_filename)
+  : _end (UNSET), _asymbol (sym), _src_filename(src_filename)
+{
+  _count = 0;
+}
+
+bool
+symbol::contains (bfd_vma addr) const
+{
+  if (addr >= start() && addr < _end)
+    return true;
+  return false;
+}
+
+const char*
+symbol::demangled_name (void) const
+{
+  char* demangled = cplus_demangle (name (), DMGL_PARAMS | DMGL_ANSI);
+  if (demangled == NULL)
+    return name ();
+
+  return demangled;
+}
+
+ostream&
+operator<< (ostream& os, const symbol* s)
+{
+  //convert symbol's total count to a string for attrt
+  char buf[11];
+  sprintf(buf,"%u",s->get_count());
+
+  //output this symbol's info
+  os << startt ("symbol")
+      << attrt ("name", s->demangled_name ())
+      << attrt ("file", s->get_srcfilename())
+      << attrt ("count", buf);
+
+  //ouput all samples under this symbol
+  const std::set<sample*, sample_comp>* samples = s->get_sample_list();
+  for (std::set<sample*, sample_comp>::iterator i = samples->begin(); i != samples->end(); ++i)
+    os << (*i);
+
+  return os << endt;
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/symbol.h b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/symbol.h
new file mode 100644
index 0000000..a9a9112
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/symbol.h
@@ -0,0 +1,97 @@
+/* symbol - A class which represents symbols in executables
+   Written by Keith Seitz <keiths@redhat.com>
+   Edited by Kent Sebastian     <ksebasti@redhat.com>
+   Copyright 2003,2008 Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#ifndef _SYMBOL_H
+#define _SYMBOL_H
+
+#include <ostream>
+#include <bfd.h>
+#include <set>
+
+#include "sample.h"
+
+class symbol
+{
+ public:
+  symbol (asymbol* sym);
+  symbol (asymbol* sym, std::string src_filename);
+
+  // Get the start address of this symbol
+  inline bfd_vma start (void) const { return bfd_asymbol_value (_asymbol); };
+
+  // Get the end address of this symbol
+  inline bfd_vma end (void) const { return _end; };
+
+  // Set the end address of this symbol
+  inline void end (bfd_vma addr) { _end = addr; };
+
+  // Get BFD's symbol info
+  inline asymbol* get_asymbol (void) const { return _asymbol; };
+
+  // Get BFD's section info
+  inline asection* section (void) const { return bfd_get_section (_asymbol); };
+
+  // Get the name of this symbol
+  inline const char* name (void) const { return bfd_asymbol_name (_asymbol); };
+
+  // Get the demangled name of this symbol (could be the same as name())
+  const char* demangled_name (void) const;
+
+  // Get the BFD flags for this symbol (i.e., BSF_FUNCTION, BSF_GLOBAL)
+  inline flagword flags (void) const { return _asymbol->flags; };
+
+  // Does this symbol contain the address ADDR?
+  bool contains (bfd_vma addr) const;
+
+  // return filename this symbol is in (used in operator<<)
+  inline const char * get_srcfilename() const { return _src_filename.c_str(); };
+
+  // Constant that all unset address are set to
+  static const bfd_vma UNSET;
+
+  //add the sample s to the list of samples under this symbol
+  inline void add_sample(sample* s) { _samples.insert(_samples.begin(), s); };
+
+  // return the samples (used in operator<< when outputting all the samples)
+  inline const std::set<sample*, sample_comp>* get_sample_list() const { return &_samples; };
+
+  // add the count of a sample to the total count (called after a sample is added with add_sample())
+  inline void add_count(unsigned int c) { _count += c; };
+
+  // return total count of all samples under this symbol
+  inline const unsigned int get_count() const { return _count; };
+
+ protected:
+  // The end address of this symbol (can only be set once all symbols read)
+  bfd_vma _end;
+
+  // The BFD symbol
+  asymbol* _asymbol;
+
+  //filename the symbols is in (set later, from sample debuginfo)
+  std::string _src_filename;
+
+  //list of samples under this symbol, sorted by count
+  // the samples a freed in profileimage.cc
+  //NOTE: because of the sample aggregation in profileimage.cc
+  // and since the comparer uses both count and line # to compare,
+  // all samples are guaranteed to be unique and ordered properly
+  std::set<sample*, sample_comp> _samples;
+
+  //count for all samples below this symbol
+  unsigned int _count;
+};
+
+// ostream inserter for this class
+std::ostream& operator<< (std::ostream& os, const symbol* s);
+#endif // !_SYMBOL_H
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/xmlbuf.cc b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/xmlbuf.cc
new file mode 100644
index 0000000..d880959
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/xmlbuf.cc
@@ -0,0 +1,101 @@
+/* xmlbuf - A class for XML output on an ostream.
+   Written by Keith Seitz <keiths@redhat.com>
+   Copyright 2003, Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#include <stdio.h>
+
+#include "xmlbuf.h"
+#include "xmltag.h"
+
+#define XML_ENCODING "UTF-8"
+#define XML_VERSION  "1.0"
+
+using namespace std;
+
+xmlbuf::xmlbuf (ostream& outstream)
+  : _os (outstream)
+{
+  _top = xmltag::dtd_header (XML_VERSION, XML_ENCODING);
+  _current = _top;
+  _tag_stack = new stack<xmltag*> ();
+}
+
+xmlbuf::~xmlbuf ()
+{
+  // delete tree
+  delete _top;
+
+  // delete tag stack and any items left on it
+  while (!_tag_stack->empty ())
+    {
+      xmltag* t = _tag_stack->top ();
+      _tag_stack->pop ();
+      delete t;
+    }
+
+  delete _tag_stack;
+}
+
+// Only tags get text -- escape reserved characters
+int
+xmlbuf::overflow (int ch)
+{
+  switch (ch)
+    {
+    case EOF:
+      /* nothing */                    break;
+    case '&':
+      _current->add_text ("&amp;");    break;
+    case '<':
+      _current->add_text ("&lt;");     break;
+    case '>':
+      _current->add_text ("&gt;");     break;
+    case '\'':
+      _current->add_text ("&apos;");   break;
+    case '\"':
+      _current->add_text ("&quot;");   break;
+    default:
+      _current->add_char (ch);         break;
+    }
+
+  return ch;
+}
+
+void
+xmlbuf::add_tag (const string& tag_name)
+{
+  xmltag* tag = _current->add_child (tag_name);
+  _tag_stack->push (_current);
+  _current = tag;
+}
+
+void
+xmlbuf::end_tag (void)
+{
+  _current = _tag_stack->top ();
+  _tag_stack->pop ();
+}
+
+void
+xmlbuf::add_attr (const string& name, const string& value)
+{
+  _current->add_attr (name, value);
+}
+
+void
+xmlbuf::dump (void)
+{
+  // dump output to stream
+  _top->output (_os);
+
+  // reset top of tree
+  _top->delete_children ();
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/xmlbuf.h b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/xmlbuf.h
new file mode 100644
index 0000000..ee69f2d
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/xmlbuf.h
@@ -0,0 +1,62 @@
+/* xmlbuf - A class for XML output on an ostream.
+   Written by Keith Seitz <keiths@redhat.com>
+   Copyright 2003, Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#ifndef _XMLBUF_H
+#define _XMLBUF_H
+#include <streambuf>
+#include <ostream>
+#include <string>
+#include <stack>
+
+class xmltag;
+
+class xmlbuf : public std::streambuf
+{
+ public:
+  // Constructor - pass in the ostream to which to dump the whole
+  // XML tree.
+  xmlbuf (std::ostream& outstream);
+  ~xmlbuf ();
+
+  // Adds an XML tag of the given name
+  // Invoked via "addt" operator (defined in xmlfmt.h)
+  void add_tag (const std::string& tag_name);
+
+  // Ends the current tag
+  // Invoked via "endt" operator (defined in xmlfmt.h)
+  void end_tag (void);
+
+  // Adds the given attribute NAME with VALUE to the current tag
+  // Invoked via "attrt" operator (defined in xmlfmt.h)
+  void add_attr (const std::string& name, const std::string& value);
+
+  // Dumps the whole tree to the (real) output stream
+  // Invoked via "endxml" operator (defined in xmlfmt.h)
+  void dump (void);
+
+ protected:
+  int overflow (int ch);
+
+ private:
+  // The ostream to dump the tree
+  std::ostream& _os;
+
+  // The top of the XML document tree
+  xmltag* _top;
+
+  // The current node in the tree being constructed
+  xmltag* _current;
+
+  // A stack of tags being constructed
+  std::stack<xmltag*>* _tag_stack;
+};
+#endif // !_XMLBUF_H
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/xmlfmt.cc b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/xmlfmt.cc
new file mode 100644
index 0000000..2e718a5
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/xmlfmt.cc
@@ -0,0 +1,79 @@
+/* xmlfmt - defines several operators and classes for formatting
+   an XML stream (see oxmlstream.h)
+   Written by Keith Seitz <keiths@redhat.com>
+              Kent Sebastian <ksebasti@redhat.com>
+   Copyright 2003,2009 Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#include "xmlfmt.h"
+#include "xmlbuf.h"
+
+using namespace std;
+
+ostream&
+operator<< (ostream& os, const startt& s)
+{
+  xmlbuf* xbuf = dynamic_cast<xmlbuf*> (os.rdbuf ());
+  if (xbuf != NULL)
+    xbuf->add_tag (s._name);
+  return os;
+}
+
+ostream&
+operator<< (ostream& os, const attrt& a)
+{
+  xmlbuf* xbuf = dynamic_cast<xmlbuf*> (os.rdbuf ());
+  if (xbuf != NULL) {
+    valid_string(const_cast<string&>(a._value));
+    xbuf->add_attr (a._name, a._value);
+  }
+  return os;
+}
+
+ostream&
+endt (ostream& os)
+{
+  xmlbuf* xbuf = dynamic_cast<xmlbuf*> (os.rdbuf ());
+  if (xbuf != NULL)
+    xbuf->end_tag ();
+  return os;
+}
+
+ostream&
+endxml (ostream& os)
+{
+  xmlbuf *xbuf = dynamic_cast<xmlbuf*> (os.rdbuf ());
+  if (xbuf != NULL)
+    xbuf->dump ();
+  return os;
+}
+
+//cant have characters "'&<> in an attribute, will cause xml parsing exceptions
+void
+valid_string (string &s) {
+  string chars = "&\"'<>";
+  string char_replacements[] = {"&amp;", "&quot;", "&apos;", "&lt;", "&gt;"};
+  char search_char;
+
+  for (int char_index = 0; char_index < 5; char_index++) {
+    search_char = chars[char_index];
+
+    string::size_type search_index = 0;
+    while(1) {
+      search_index = s.find(search_char, search_index);
+
+      if (search_index == string::npos)
+        break;
+
+      s.replace(search_index, 1, char_replacements[char_index]);
+      search_index += char_replacements[char_index].length();
+    }
+  }
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/xmlfmt.h b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/xmlfmt.h
new file mode 100644
index 0000000..56345e0
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/xmlfmt.h
@@ -0,0 +1,52 @@
+/* xmlfmt - defines several operators and classes for formatting
+   an XML stream (see oxmlstream.h)
+   Written by Keith Seitz <keiths@redhat.com>
+              Kent Sebastian <ksebasti@redhat.com>
+   Copyright 2003,2009 Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#ifndef _XMLFMT_H
+#define _XMLFMT_H
+#include <ostream>
+
+// Start a new tag with the given NAME
+class startt
+{
+ public:
+  startt (const std::string &name) : _name (name) {};
+  friend std::ostream& operator<< (std::ostream& os, const startt& s);
+
+ private:
+  std::string _name;
+};
+
+// Add an attribute with the given NAME and VALUE to the current tag
+class attrt
+{
+ public:
+  attrt (const std::string& name, const std::string& value)
+    : _name (name), _value (value) {};
+  friend std::ostream& operator<< (std::ostream&, const attrt& a);
+
+ private:
+  std::string _name;
+  std::string _value;
+
+};
+
+// End the current tag
+std::ostream& endt (std::ostream& os);
+
+// End the XML document and output it
+std::ostream& endxml (std::ostream& os);
+
+//function to ensure strings dont have invalid characters
+void valid_string(std::string &s);
+#endif // ! _XMLFMT_H
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/xmltag.cc b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/xmltag.cc
new file mode 100644
index 0000000..a2f25ab
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/xmltag.cc
@@ -0,0 +1,157 @@
+/* xmltag/xmlattr - Classes which are nodes in the XML document tree
+   constructed by oxmlstream, xmlbuf, xmlfmt.
+   Written by Keith Seitz <keiths@redhat.com>
+   Copyright 2003, Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#include "xmltag.h"
+
+using namespace std;
+
+bool xmltag::_header_output = false;
+
+xmltag*
+xmltag::dtd_header (string version, string encoding)
+{
+  string txt ("<?xml version=\"" + version + "\" encoding=\"" + encoding + "\"?>");
+  xmltag* header = new xmltag ("");
+  header->add_text (txt);
+  return header;
+}
+
+xmltag::xmltag (const string& name)
+  : _name (name), _level (-1)
+{
+  _children = new _childlist_t;
+}
+
+xmltag::xmltag (const string& name, int level)
+  : _name (name), _level (level)
+{
+  _children = new _childlist_t;
+}
+
+xmltag::~xmltag ()
+{
+  // delete all children
+  delete_children ();
+  delete _children;
+}
+
+void
+xmltag::delete_children (void)
+{
+  _childlist_t::iterator i;
+  for (i = _children->begin (); i != _children->end (); ++i)
+    delete (*i);
+
+  _children->clear ();
+}
+
+xmltag*
+xmltag::add_child (const string& name)
+{
+  xmltag* child = new xmltag (name, _level + 1);
+  _children->push_back (child);
+  return child;
+}
+
+void
+xmltag::add_text (const string& txt)
+{
+  _text += txt;
+}
+
+void
+xmltag::add_char (const char c)
+{
+  _text += c;
+}
+
+void
+xmltag::add_attr (const string& name, const string& value)
+{
+  _attributes.add (name, value);
+}
+
+// Tags output a start tag with attributes, then children, then a closing tag.
+void
+xmltag::output (ostream& os)
+{
+  bool is_hdr = (_level == -1);
+  bool no_txt = (_text.length () == 0);
+
+  if (is_hdr)
+    {
+      if (!xmltag::_header_output)
+	{
+	  os << _text << endl;
+	  xmltag::_header_output = true;
+	}
+    }
+  else
+    {
+      os << _indent () << "<" << _name;
+      _attributes.output (os);
+      os << ">" << _text;
+      if (no_txt)
+	os << endl;
+    }
+
+  // output children
+  _output_children (os);
+
+  if (!is_hdr)
+    {
+      if (no_txt)
+	os << _indent ();
+      os << "</" << _name << ">" << endl;
+    }
+}
+
+// Walk through children, having them output themselves
+void
+xmltag::_output_children (ostream& os)
+{
+  _childlist_t::iterator i;
+  for (i = _children->begin (); i != _children->end (); ++i)
+    {
+      xmltag* child = (*i);
+      child->output (os);
+    }
+}
+
+string
+xmltag::_indent (void)
+{
+  return (_level > 0 ? std::string (_level, '\t') : "");
+}
+
+xmlattr::~xmlattr ()
+{
+  list<attr_t*>::iterator i;
+  for (i = _attributes.begin (); i != _attributes.end (); ++i)
+    delete (*i);
+}
+
+void
+xmlattr::add (const string& name, const string& value)
+{
+  _attributes.push_back (new attr_t (name, value));
+}
+
+// Attributes output 'name="value"' for each attribute
+void
+xmlattr::output (ostream& os)
+{
+  list<attr_t*>::iterator i;
+  for (i = _attributes.begin (); i != _attributes.end (); ++i)
+    os << " " << attr_name (*i) << "=\"" << attr_value (*i) << "\"";
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/xmltag.h b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/xmltag.h
new file mode 100644
index 0000000..dd556ce
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/opxml/xmltag.h
@@ -0,0 +1,101 @@
+/* xmltag/xmlattr - Classes which are nodes in the XML document tree
+   constructed by oxmlstream, xmlbuf, xmlfmt.
+   Written by Keith Seitz <keiths@redhat.com>
+   Copyright 2003, Red Hat, Inc.
+
+   This program is open source software licensed under the Eclipse
+   Public License ver. 1.
+
+   Alternatively, this program may be used under the terms of the GNU
+   General Public License as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later
+   version.  */
+
+#include <utility>
+#include <string>
+#include <list>
+#include <ostream>
+
+// An XML tag attribute handler class
+class xmlattr
+{
+ public:
+  ~xmlattr();
+
+  // The type of all attributes
+  typedef std::pair<std::string, std::string> attr_t;
+
+  // Convenience accessors
+  static inline const std::string& attr_name (const attr_t* a) { return a->first; };
+  static inline const std::string& attr_value (const attr_t* a) { return a->second; };
+
+  // Add an attribute of the given NAME and VALUE
+  void add (const std::string& name, const std::string& value);
+
+  // Output all attributes to the given ostream.
+  void output (std::ostream& os);
+
+ private:
+  // A list of all attributes
+  std::list<attr_t*> _attributes;
+};
+
+// An XML tag
+class xmltag
+{
+ public:
+  // Convenience function to construct a "tag" which contains
+  // document type definition
+  static xmltag* dtd_header (std::string version, std::string encoding);
+
+  // Constructors - give NAME of tag and (optionally) an indent level
+  xmltag (const std::string& name);
+  xmltag (const std::string& name, int level);
+  ~xmltag ();
+
+  // Add a under this tag of the given NAME and return a pointer to it
+  xmltag* add_child (const std::string& name);
+
+  // Delete all children
+  void delete_children (void);
+
+  // Add an attribute of the given NAME and VALUE to this tag
+  void add_attr (const std::string& name, const std::string& value);
+
+  // Add the character C to the text contained in this tag
+  void add_char (const char c);
+  
+  // Add the given TXT to the text contained in this tag
+  void add_text (const std::string& txt);
+
+  // Output the tag and it's text to the given stream
+  void output (std::ostream& os);
+
+ private:
+  // convenience type of the list of child tags
+  typedef std::list<xmltag*> _childlist_t;
+
+  // A function to return indentation
+  std::string _indent (void);
+
+  // Convenience function to output the children of this tag to the given stream
+  void _output_children (std::ostream& os);
+
+  // Have we output the DTD?
+  static bool _header_output;
+
+  // The name of this tag
+  std::string _name;
+
+  // The text of this tag
+  std::string _text;
+
+  // The attributes associated with this tag
+  xmlattr _attributes;
+
+  // The "children" of this tag (i.e., tags this tag encloses)
+  _childlist_t* _children;
+
+  // The indent level for this tag
+  int _level;
+};
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/.svnignore b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/.svnignore
new file mode 100644
index 0000000..3808cac
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/.svnignore
@@ -0,0 +1,2 @@
+opcontrol
+opcontrol.old
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/install-noconsolehelper.sh b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/install-noconsolehelper.sh
new file mode 100755
index 0000000..27fdc88
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/install-noconsolehelper.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+#
+# This script installs the files necessary for root authentication when using
+# Eclipse-OProfile.
+#
+
+### check install requirements ###
+
+#needs to be run as root
+if [ `id -u` -ne 0 ]; then
+  echo Error: script must be run as the root user
+  exit 1
+fi
+
+#need to be in scripts dir
+if [ $(basename $(pwd)) != scripts ]; then
+  echo Error: script must be run with pwd in script dir
+  exit 1
+fi
+
+#need oprofile package to use plugin at all
+RET=0
+test -x /usr/bin/oprofiled 
+RET=$(($RET + $?))
+test -x /usr/bin/opcontrol
+RET=$(($RET + $?))
+if [ $RET -ne 0 ]; then
+ echo Error: required binaries do not exist, OProfile not installed?
+ exit 1
+fi
+
+#check for opxml executable, make sure it is u+x
+ALLOPXML=`find ../../../../org.eclipse.linuxtools.oprofile.core.linux.* -name opxml -type f | wc -l`
+EXECOPXML=`find ../../../../org.eclipse.linuxtools.oprofile.core.linux.* -name opxml -type f -perm -u+x | wc -l`
+if [ $ALLOPXML -eq 0 ]; then
+  echo Error: cannot find opxml binary, required plugin missing
+  exit 1
+elif [ $EXECOPXML -ne $ALLOPXML ]; then
+  #they exist, but aren't executable, run chmod u+x on them
+  find ../../../.. -name opxml -type f -exec chmod u+x '{}' \;
+fi
+
+echo Copy the following line for the sudoers file, replacing "<username>" with your username:
+echo "<username> ALL=(ALL) NOPASSWD : /usr/bin/opcontrol"
+read -p 'Running visudo, paste the above line in the editor, save it and exit. Press ENTER to continue.'
+visudo
+
+#create opcontrol sudo wrapper
+echo '#!/bin/sh' > opcontrol
+echo 'sudo /usr/bin/opcontrol ${1+"$@"}' >> opcontrol
+chmod +x ./opcontrol
+
+echo Eclipse-OProfile plugin install successful.
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/install.sh b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/install.sh
new file mode 100755
index 0000000..80c5475
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/install.sh
@@ -0,0 +1,71 @@
+#!/bin/bash
+#
+# This script installs the files necessary for root authentication when using
+# Eclipse-OProfile.
+#
+
+### check install requirements ###
+
+#needs to be run as root
+if [ `id -u` -ne 0 ]; then
+  echo Error: script must be run as the root user
+  exit 1
+fi
+
+#need to be in scripts dir
+if [ $(basename $(pwd)) != scripts ]; then
+  echo Error: script must be run with pwd in script dir
+  exit 1
+fi
+
+#need oprofile package to use plugin at all
+RET=0
+test -x /usr/bin/oprofiled 
+RET=$(($RET + $?))
+test -x /usr/bin/opcontrol
+RET=$(($RET + $?))
+if [ $RET -ne 0 ]; then
+ echo Error: required binaries do not exist, OProfile not installed?
+ exit 1
+fi
+
+#need consolehelper to run opcontrol as root from within eclipse
+test -x /usr/bin/consolehelper 
+if [ $? -ne 0 ]; then
+  echo Error: /usr/bin/consolehelper does not exist, run install-noconsolehelper.sh instead 
+  exit 1
+fi
+
+
+### install ###
+
+#create the sym link to consolehelper
+test -L ./opcontrol || { rm -f ./opcontrol && ln -s /usr/bin/consolehelper opcontrol ; }
+if [ $? -ne 0 ]; then
+  echo Error: cannot create opcontrol wrapper in `pwd`
+  exit 1
+fi
+
+#check for opxml executable, make sure it is u+x
+ALLOPXML=`find ../../../../org.eclipse.linuxtools.oprofile.core.linux.* -name opxml -type f | wc -l`
+EXECOPXML=`find ../../../../org.eclipse.linuxtools.oprofile.core.linux.* -name opxml -type f -perm -u+x | wc -l`
+if [ $ALLOPXML -eq 0 ]; then
+  echo Error: cannot find opxml binary, required plugin missing
+  exit 1
+elif [ $EXECOPXML -ne $ALLOPXML ]; then
+  #they exist, but aren't executable, run chmod u+x on them
+  find ../../../.. -name opxml -type f -exec chmod u+x '{}' \;
+fi
+
+##this will have to be loaded every time the user restarts their
+##computer anyway, should load it now?
+#load the oprofile module 
+#test /dev/oprofile/cpu_type
+#if [ $? -ne 0 ]; then
+#  opcontrol --init
+#fi
+
+test -f /etc/security/console.apps/opcontrol || install -D -m 644 opcontrol-wrapper.security /etc/security/console.apps/opcontrol
+test -f /etc/pam.d/opcontrol || install -D -m 644 opcontrol-wrapper.pamd /etc/pam.d/opcontrol
+
+echo Eclipse-OProfile plugin install successful.
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/opcontrol-wrapper.pamd b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/opcontrol-wrapper.pamd
new file mode 100644
index 0000000..14badf9
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/opcontrol-wrapper.pamd
@@ -0,0 +1,9 @@
+#%PAM-1.0
+auth            sufficient      pam_rootok.so
+auth            sufficient      pam_timestamp.so
+auth            include         system-auth
+account         required        pam_permit.so
+session         required        pam_permit.so
+session         optional        pam_xauth.so
+session         optional        pam_timestamp.so
+
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/opcontrol-wrapper.security b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/opcontrol-wrapper.security
new file mode 100644
index 0000000..b147801
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/opcontrol-wrapper.security
@@ -0,0 +1,3 @@
+USER=root
+PROGRAM=/usr/bin/opcontrol
+SESSION=true
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/uninstall-noconsolehelper.sh b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/uninstall-noconsolehelper.sh
new file mode 100755
index 0000000..5bc9d7f
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/uninstall-noconsolehelper.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# This script uninstalls the files necessary for root authentication when using
+# Eclipse-OProfile.
+
+#needs to be run as root
+if [ `id -u` -ne 0 ]; then
+  echo Error: script must be run as the root user
+  exit 1
+fi
+
+#need to be in scripts dir
+if [ $(basename $(pwd)) != scripts ]; then
+  echo Error: script must be run with pwd in script dir
+  exit 1
+fi
+
+rm -f ./opcontrol
+
+read -p 'Running visudo; remove the line: <username> ALL=NOPASSWD : /usr/bin/opcontrol'
+visudo
+
+echo Eclipse-OProfile plugin uninstall successful.
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/uninstall.sh b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/uninstall.sh
new file mode 100755
index 0000000..62368aa
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/uninstall.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# This script uninstalls the files necessary for root authentication when using
+# Eclipse-OProfile.
+
+#needs to be run as root
+if [ `id -u` -ne 0 ]; then
+  echo Error: script must be run as the root user
+  exit 1
+fi
+
+#need to be in scripts dir
+if [ $(basename $(pwd)) != scripts ]; then
+  echo Error: script must be run with pwd in script dir
+  exit 1
+fi
+
+rm -f /etc/security/console.apps/opcontrol
+rm -f /etc/pam.d/opcontrol
+rm -f ./opcontrol
+
+echo Eclipse-OProfile plugin uninstall successful.
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/plugin.properties b/oprofile/org.eclipse.linuxtools.oprofile.core/plugin.properties
new file mode 100644
index 0000000..6bce576
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/plugin.properties
@@ -0,0 +1,12 @@
+#*******************************************************************************
+# Copyright (c) 2008 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+#*******************************************************************************
+bundleName=OProfile Core Plug-in (Incubation)
+bundleProvider=Eclipse
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/plugin.xml b/oprofile/org.eclipse.linuxtools.oprofile.core/plugin.xml
new file mode 100644
index 0000000..6e34065
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/plugin.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+   <extension-point id="OpxmlProvider" name="OpxmlProvider" schema="schema/OpxmlProvider.exsd"/>
+
+</plugin>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/schema/OpxmlProvider.exsd b/oprofile/org.eclipse.linuxtools.oprofile.core/schema/OpxmlProvider.exsd
new file mode 100644
index 0000000..8b02e63
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/schema/OpxmlProvider.exsd
@@ -0,0 +1,70 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.linuxtools.oprofile.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.linuxtools.oprofile.core" id="OpxmlProvider" name="OpxmlProvider"/>
+      </appinfo>
+      <documentation>
+         An extension point to allow architecture fragments to provide the opxml binary.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="opxmlProvider"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="opxmlProvider">
+      <complexType>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.linuxtools.oprofile.core.IOpxmlProvider"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+
+
+
+
+
+</schema>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/IOpcontrolProvider.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/IOpcontrolProvider.java
new file mode 100644
index 0000000..d381b39
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/IOpcontrolProvider.java
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright (c) 2004 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.core;
+
+import org.eclipse.linuxtools.oprofile.core.daemon.OprofileDaemonEvent;
+import org.eclipse.linuxtools.oprofile.core.daemon.OprofileDaemonOptions;
+
+/**
+ * Interface for oprofile core to utilize opcontrol program. Platform plugins should define/register
+ * an OpcontrolProvider for the core to use.
+ */
+public interface IOpcontrolProvider {
+	
+	/**
+	 * Initialize the Oprofile kernel module
+	 * @throws OpcontrolException
+	 */
+	public void initModule() throws OpcontrolException;
+	
+	/**
+	 * De-initialize (unload) the kernel module
+	 * @throws OpcontrolException
+	 */
+	public void deinitModule() throws OpcontrolException;
+	
+	/**
+	 * Clears out data from the current session
+	 * @throws OpcontrolException
+	 */
+	public void reset() throws OpcontrolException;
+	
+	/**
+	 * Flush the current oprofiled sample buffers to disk
+	 * @throws OpcontrolException
+	 */
+	public void dumpSamples() throws OpcontrolException;
+	
+	/**
+	 * Setup oprofiled collection parameters
+	 * @param options a list of command-line arguments for opcontrol
+	 * @param events list of events to collect
+	 * @throws OpcontrolException
+	 */
+	public void setupDaemon(OprofileDaemonOptions options, OprofileDaemonEvent[] events) throws OpcontrolException;
+	
+	/**
+	 * Start data collection by oprofiled (will start oprofiled if necessary)
+	 * @throws OpcontrolException
+	 */
+	public void startCollection() throws OpcontrolException;
+	
+	/**
+	 * Stop data collection (does NOT stop daemon)
+	 * @throws OpcontrolException
+	 */
+	public void stopCollection() throws OpcontrolException;
+	
+	/**
+	 * Stop data collection and shutdown oprofiled
+	 * @throws OpcontrolException
+	 */
+	public void shutdownDaemon() throws OpcontrolException;
+	
+	/**
+	 * Start oprofiled (does NOT start data collection)
+	 * @throws OpcontrolException
+	 */
+	public void startDaemon() throws OpcontrolException;
+	
+	/**
+	 * Save the current session
+	 * @throws OpcontrolException
+	 */
+	public void saveSession(String name) throws OpcontrolException;
+
+	public boolean status() throws OpcontrolException;
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/IOpxmlProvider.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/IOpxmlProvider.java
new file mode 100644
index 0000000..b7512e9
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/IOpxmlProvider.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2004,2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *    Kent Sebastian <ksebasti@redhat.com> - 
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.core;
+
+import java.util.ArrayList;
+
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.linuxtools.oprofile.core.daemon.OpInfo;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelEvent;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelImage;
+
+/**
+ * Interface for the core to utilize opxml. Platform plugins should define/register an
+ * OpxmlProvider for the core to use.
+ */
+public interface IOpxmlProvider {
+	
+	/**
+	 * Returns an <code>IRunnableWithProgress</code> that fetches generic information from opxml
+	 * @param info <code>OpInfo</code> object for results
+	 * @return <code>IRunnableWithProgress</code> that may be run by the caller
+	 */
+	public IRunnableWithProgress info(OpInfo info);
+	
+	/**
+	 * Returns an <code>IRunnableWithProgress</code> that fetches samples for the
+	 * given <code>OpModelSession</code>
+	 * @param eventName the event for which to fetch samples
+	 * @param sessionName the session for which to fetch samples
+	 * @param image the image being profiled to be returned to the caller
+	 * @return <code>IRunnableWithProgress</code> that may be run by the caller
+	 */
+	public IRunnableWithProgress modelData(String eventName, String sessionName, OpModelImage image);
+	
+	/**
+	 * Returns an <code>IRunnableWithProgress</code> that checks the validity of the given
+	 * event, unit mask, and counter combination 
+	 * @param ctr the counter
+	 * @param event the integer event number
+	 * @param um the integer unit mask
+	 * @param eventValid a size one array to hold the return result (see <code>CheckEventsProcessor</code>)
+	 * @return <code>IRunnableWithProgress</code> that may be run by the caller
+	 */
+	public IRunnableWithProgress checkEvents(int ctr, int event, int um, int[] eventValid);
+	
+	/**
+	 * Returns an /code>IRunnableWithProgress</code> that fetches the list of sessions
+	 * @param info the <code>OpInfo</code> for oprofile
+	 * @param sessionList an <code>ArrayList</code> in which to return the list of sessions
+	 * @return <code>IRunnableWithProgress</code> that may be run by the caller
+	 */
+	public IRunnableWithProgress sessions(ArrayList<OpModelEvent> sessionList);
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/OpcontrolException.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/OpcontrolException.java
new file mode 100644
index 0000000..f6de34b
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/OpcontrolException.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2004,2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *    Kent Sebastian <ksebasti@redhat.com> - 
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.core;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+
+public class OpcontrolException extends CoreException {
+	//without this there's a warning..
+	private static final long serialVersionUID = 8508930482724912901L;
+
+	public OpcontrolException(IStatus status) {
+		super(status);
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/Oprofile.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/Oprofile.java
new file mode 100644
index 0000000..7e0f5f4
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/Oprofile.java
@@ -0,0 +1,225 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *    Kent Sebastian <ksebasti@redhat.com> - 
+ *******************************************************************************/ 
+
+package org.eclipse.linuxtools.oprofile.core;
+
+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.linuxtools.oprofile.core.daemon.OpEvent;
+import org.eclipse.linuxtools.oprofile.core.daemon.OpInfo;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelEvent;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelImage;
+import org.eclipse.linuxtools.oprofile.core.opxml.checkevent.CheckEventsProcessor;
+
+
+/**
+ * Common class wrapper for all things Oprofile.
+ */
+public class Oprofile
+{
+	// Ugh. Need to know whether the module is loaded without running oprofile commands...
+	private static final String[] _OPROFILE_CPU_TYPE_FILES = {
+		"/dev/oprofile/cpu_type", //$NON-NLS-1$
+		"/proc/sys/dev/oprofile/cpu_type"  //$NON-NLS-1$
+	};
+	
+	// Oprofile information
+	private static OpInfo _info;
+	
+	// Make sure that oprofile is ready to go
+	static {
+		initializeOprofileModule();
+	}
+	
+	/**
+	 * Initialize the oprofile module
+	 * 
+	 * This function will check if the kernel module is
+	 * loaded. If it is not, it will attempt to load it
+	 * (which will cause the system to prompt the user for
+	 * root access).
+	 */
+	static private void initializeOprofileModule() {
+		// Check if kernel module is loaded, if not, try to load it
+		if (!isKernelModuleLoaded())
+			_initializeOprofile();
+		
+		//it still may not have loaded, if not, critical error
+		if (!isKernelModuleLoaded()) {
+			OprofileCorePlugin.showErrorDialog("oprofileInit", null); //$NON-NLS-1$
+			throw new ExceptionInInitializerError(OprofileProperties.getString("fatal.kernelModuleNotLoaded")); //$NON-NLS-1$
+		} else {
+			_initializeOprofileCore();
+		}
+	}
+	
+	// This requires more inside knowledge about Oprofile than one would like,
+	// but it is the only way of knowing whether the module is loaded (and we can
+	// succesfully call into the oprofile wrapper library without causing it to print out
+	// a lot of warnings).
+	private static boolean isKernelModuleLoaded() {
+		for (int i = 0; i < _OPROFILE_CPU_TYPE_FILES.length; ++i) {
+			File f = new File(_OPROFILE_CPU_TYPE_FILES[i]);
+			if (f.exists())
+				return true;
+		}
+		
+		return false;
+	}
+	
+	// initialize oprofile module by calling `opcontrol --init`
+	private static void _initializeOprofile() {
+		try {
+			OprofileCorePlugin.getDefault().getOpcontrolProvider().initModule();
+		} catch (OpcontrolException e) {
+			OprofileCorePlugin.showErrorDialog("opcontrolProvider", e); //$NON-NLS-1$
+		} 
+	}
+
+	
+	// Initializes static data for oprofile.	
+	private static void _initializeOprofileCore () {
+		_info = OpInfo.getInfo();
+		
+		if (_info == null) {
+			throw new ExceptionInInitializerError(OprofileProperties.getString("fatal.opinfoNotParsed")); //$NON-NLS-1$
+		}
+	}
+	
+	/**
+	 * Queries oprofile for the number of counters on the current CPU.
+	 * Used only in launch config tabs.
+	 * @return the number of counters
+	 */
+	public static int getNumberOfCounters() {
+		return _info.getNrCounters();
+	}
+	
+	/**
+	 * Returns the CPU speed of the current configuration.
+	 * @return the cpu speed in MHz
+	 */
+	public static double getCpuFrequency() {
+		return _info.getCPUSpeed();
+	}
+
+	/**
+	 * Finds the event with the given name
+	 * @param name the event's name (i.e., CPU_CLK_UNHALTED)
+	 * @return the event or <code>null</code> if not found
+	 */
+	public static OpEvent findEvent(String name) {
+		return _info.findEvent(name);
+	}
+
+	/**
+	 * Get all the events that may be collected on the given counter.
+	 * @param num the counter number
+	 * @return an array of all valid events -- NEVER RETURNS NULL!
+	 */
+	public static OpEvent[] getEvents(int num) {
+		return _info.getEvents(num);
+	}
+	
+	/**
+	 * Returns the default location of the oprofile samples directory.
+	 * @return the default samples directory
+	 */
+	public static String getDefaultSamplesDirectory() {
+		return _info.getDefault(OpInfo.DEFAULT_SAMPLE_DIR);
+	}
+	
+	/**
+	 * Returns the oprofile daemon log file.
+	 * @return the log file (absolute pathname)
+	 */
+	public static String getLogFile() {
+		return _info.getDefault(OpInfo.DEFAULT_LOG_FILE);
+	}
+	
+	/**
+	 * Returns whether or not oprofile is in timer mode.
+	 * @return true if oprofile is in timer mode, false otherwise
+	 */
+	public static boolean getTimerMode() {
+		return _info.getTimerMode();
+	}
+	
+	/**
+	 * Checks the requested counter, event, and unit mask for vailidity.
+	 * @param ctr	the counter
+	 * @param event	the event number
+	 * @param um	the unit mask
+	 * @return whether the requested event is valid
+	 */
+	public static Boolean checkEvent(int ctr, int event, int um) {
+		int[] validResult = new int[1];
+		try {
+			IRunnableWithProgress opxml = OprofileCorePlugin.getDefault().getOpxmlProvider().checkEvents(ctr, event, um, validResult);
+			opxml.run(null);
+		} catch (InvocationTargetException e) {
+		} catch (InterruptedException e) {
+		} catch (OpxmlException e) {
+			OprofileCorePlugin.showErrorDialog("opxmlProvider", e); //$NON-NLS-1$
+			return null;
+		}
+		
+		return (validResult[0] == CheckEventsProcessor.EVENT_OK);
+	}
+	
+	/**
+	 * Returns a list of all the events collected on the system, as well as
+	 * the sessions under each of them.
+	 * @returns a list of all collected events
+	 */
+	public static OpModelEvent[] getEvents() {
+		OpModelEvent[] events = null;
+		
+		ArrayList<OpModelEvent> sessionList = new ArrayList<OpModelEvent>();
+		try {
+			IRunnableWithProgress opxml = OprofileCorePlugin.getDefault().getOpxmlProvider().sessions(sessionList);
+			opxml.run(null);
+			events = new OpModelEvent[sessionList.size()];
+			sessionList.toArray(events);
+		} catch (InvocationTargetException e) {
+		} catch (InterruptedException e) {
+		} catch (OpxmlException e) {
+			OprofileCorePlugin.showErrorDialog("opxmlProvider", e); //$NON-NLS-1$
+		}
+		return events;
+	}
+
+	/**
+	 * Return a list of all the Samples in the given session.
+	 * @param session the session for which to get samples
+	 * @param shell the composite shell to use for the progress dialog
+	 */
+	public static OpModelImage getModelData(String eventName, String sessionName) {		
+		OpModelImage image = new OpModelImage();
+		
+		final IRunnableWithProgress opxml;
+		try {
+			opxml = OprofileCorePlugin.getDefault().getOpxmlProvider().modelData(eventName, sessionName, image);
+			opxml.run(null);
+		} catch (InvocationTargetException e) { 
+		} catch (InterruptedException e) { 
+		} catch (OpxmlException e) {
+			OprofileCorePlugin.showErrorDialog("opxmlProvider", e); //$NON-NLS-1$
+			return null;
+		}
+
+		return image;
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/OprofileCorePlugin.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/OprofileCorePlugin.java
new file mode 100644
index 0000000..c36fa40
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/OprofileCorePlugin.java
@@ -0,0 +1,177 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *    Kent Sebastian <ksebasti@redhat.com> - 
+ *******************************************************************************/ 
+
+package org.eclipse.linuxtools.oprofile.core;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.linuxtools.oprofile.core.linux.LinuxOpcontrolProvider;
+import org.eclipse.swt.widgets.Display;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The main plugin class to be used in the desktop.
+ */
+public class OprofileCorePlugin extends Plugin {
+	private static final String PLUGIN_ID = "org.eclipse.linuxtools.oprofile.core"; //$NON-NLS-1$
+	private static final String OPXMLPROVIDER_XPT_NAME = "OpxmlProvider"; //$NON-NLS-1$
+
+	//The shared instance.
+	private static OprofileCorePlugin plugin;
+	private IOpxmlProvider _opxmlProvider;
+	
+	/**
+	 * The constructor.
+	 */
+	public OprofileCorePlugin() {
+		plugin = this;
+	}
+	
+	/**
+	 * This method is called upon plug-in activation
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+	}
+
+	/**
+	 * This method is called when the plug-in is stopped
+	 */
+	public void stop(BundleContext context) throws Exception {
+		super.stop(context);
+		plugin = null;
+	}
+	
+	/**
+	 * Returns the shared instance.
+	 */
+	public static OprofileCorePlugin getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Returns the unique id of this plugin. Should match plugin.xml!
+	 */
+	public static String getId() {
+		return PLUGIN_ID;
+	}
+	
+	/**
+	 * Returns the OpxmlProvider registered with the plugin or throws an exception
+	 * @return the OpxmlProvider
+	 * @throws OpxmlException
+	 */
+	public IOpxmlProvider getOpxmlProvider() throws OpxmlException {
+		Exception except = null;
+		
+		if (_opxmlProvider == null) {
+			IExtensionRegistry registry = Platform.getExtensionRegistry();
+			IExtensionPoint extension = registry.getExtensionPoint(PLUGIN_ID, OPXMLPROVIDER_XPT_NAME);
+			if (extension != null) {
+				IExtension[] extensions = extension.getExtensions();
+				for (IExtension e : extensions) {
+					IConfigurationElement[] configElements = e.getConfigurationElements();
+					if (configElements.length != 0) {
+						try {
+							_opxmlProvider = (IOpxmlProvider) configElements[0].createExecutableExtension("class"); //$NON-NLS-1$
+							if (_opxmlProvider != null)
+								break;
+						} catch (CoreException ce) {
+							except = ce;
+						}
+					}
+				}
+			}
+		}
+		
+		// If there was a problem finding opxml, throw an exception
+		if (_opxmlProvider == null) {
+			throw new OpxmlException(createErrorStatus("opxmlProvider", except)); //$NON-NLS-1$
+		} else {
+			return _opxmlProvider;
+		}
+	}
+	
+	/**
+	 * Returns the registered opcontrol provider or throws an exception
+	 * @return the OpcontrolProvider registered with the plugin
+	 * @throws OpcontrolException
+	 */
+	public IOpcontrolProvider getOpcontrolProvider() throws OpcontrolException {
+//		Exception except = null;
+//		
+//		if (_opcontrol == null) {
+//			IExtensionRegistry registry = Platform.getExtensionRegistry();
+//			IExtensionPoint extension = registry.getExtensionPoint(PLUGIN_ID, "OpcontrolProvider"); //$NON-NLS-1$
+//			if (extension != null) {
+//				IExtension[] extensions = extension.getExtensions();
+//				IConfigurationElement[] configElements = extensions[0].getConfigurationElements();
+//				if (configElements.length != 0) {
+//					try {
+//						_opcontrol = (IOpcontrolProvider) configElements[0].createExecutableExtension("class"); //$NON-NLS-1$
+//					} catch (CoreException ce) {
+//						except = ce;
+//					}
+//				}
+//			}
+//		}
+//		
+//		// If there was a problem finding opcontrol, throw an exception
+//		if (_opcontrol == null) {
+//			String msg = getResourceString("opcontrolProvider.error.missing"); //$NON-NLS-1$
+//			Status status = new Status(IStatus.ERROR, getId(), IStatus.OK, msg, except);
+//			throw new OpcontrolException(status);
+//		}
+//
+//		return _opcontrol;
+		
+		return new LinuxOpcontrolProvider();
+	}
+	
+	public static IStatus createErrorStatus(String errorClassString, Exception e) {
+		String statusMessage = OprofileProperties.getString(errorClassString + ".error.statusMessage"); //$NON-NLS-1$
+
+		if (e == null) {
+			return new Status(IStatus.ERROR, getId(), IStatus.OK, statusMessage, null);
+		} else {
+			return new Status(IStatus.ERROR, getId(), IStatus.OK, statusMessage, e);
+		}
+	}
+	
+	public static void showErrorDialog(String errorClassString, CoreException ex) {
+		final IStatus status;
+		final String dialogTitle = OprofileProperties.getString(errorClassString + ".error.dialog.title"); //$NON-NLS-1$
+		final String errorMessage = OprofileProperties.getString(errorClassString + ".error.dialog.message"); //$NON-NLS-1$
+		
+		if (ex == null) {
+			status = createErrorStatus(errorClassString, null);
+		} else {
+			status = ex.getStatus();
+		}
+
+		//needs to be run in the ui thread otherwise swt throws invalid thread access 
+		Display.getDefault().syncExec(new Runnable() {
+			public void run() {
+				ErrorDialog.openError(null, dialogTitle, errorMessage, status);
+			}
+		});
+
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/OprofileProperties.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/OprofileProperties.java
new file mode 100644
index 0000000..f1bf26e
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/OprofileProperties.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2004 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.oprofile.core;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class OprofileProperties {
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.oprofile.core.oprofile"; //$NON-NLS-1$
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+
+	private OprofileProperties() {
+	}
+
+	public static String getString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/OpxmlException.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/OpxmlException.java
new file mode 100644
index 0000000..21b40e0
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/OpxmlException.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2004 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.core;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+
+/**
+ * An exception thrown by any of the IOpxmlProvider functions
+ */
+public class OpxmlException extends CoreException {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2788304536155025911L;
+
+	/**
+	 * Constructor
+	 * @param status <code>IStatus</code> for the exception
+	 */
+	public OpxmlException(IStatus status) {
+		super(status);
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/daemon/OpEvent.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/daemon/OpEvent.java
new file mode 100644
index 0000000..9204f02
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/daemon/OpEvent.java
@@ -0,0 +1,118 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *    Kent Sebastian <ksebasti@redhat.com>
+ *******************************************************************************/ 
+
+package org.eclipse.linuxtools.oprofile.core.daemon;
+
+/**
+ * A class which represents an Oprofile event
+ */
+public class OpEvent {
+	// The Oprofile event name, i.e., "CPU_CLK_UNHALTED"
+	private String _name;
+	
+	// The Oprofile event number
+	private int _number;
+	
+	 //  A description of the event
+	private String _description;
+
+	// Unit masks for this event type
+	private OpUnitMask _unitMask;
+	
+	// Minimum count
+	private int _minCount;
+	
+	/**
+	 * Sets the unit mask for this event.
+	 * Only called from XML parsers.
+	 * @param mask the new unit mask
+	 */
+	public void _setUnitMask(OpUnitMask mask) {
+		_unitMask = mask;
+	}
+
+	/**
+	 * Sets the name of this event.
+	 * Only called from XML parsers.
+	 * @param text the name
+	 */
+	public void _setText(String text) {
+		_name = text;
+	}
+
+	/**
+	 * Sets the description of this oprofile event.
+	 * Only called from XML parsers.
+	 * @param text the description
+	 */
+	public void _setTextDescription(String text) {
+		_description = text;
+	}
+
+	/**
+	 * Sets the minimum count for this event.
+	 * Only called from XML parsers.
+	 * @param min the minimum count
+	 */
+	public void _setMinCount(int min) {
+		_minCount = min;
+	}
+
+	/**
+	 * Sets oprofile's event number for this event.
+	 * Only called from XML parsers.
+	 * @param num the number
+	 */
+	public void _setNumber(int num) {
+		_number = num;
+	}
+
+	/**
+	 * Returns the unit mask corresponding to this event.
+	 * @return the unit mask
+	 */
+	public OpUnitMask getUnitMask() {		
+		return _unitMask;
+	}
+	
+	/**
+	 * Returns the name of this oprofile event.
+	 * @return the name
+	 */
+	public String getText() {
+		return _name;
+	}
+	
+	/**
+	 * Returns the description of this oprofile event.
+	 * @return the description
+	 */
+	public String getTextDescription() {
+		return _description;
+	}
+	
+	/**
+	 * Returns the minimum count allowed for this event.
+	 * @return the minimum count
+	 */
+	public int getMinCount() {
+		return _minCount;
+	}
+	
+	/**
+	 * Returns oprofile's event number for this event.
+	 * @return the event number
+	 */
+	public int getNumber() {
+		return _number;
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/daemon/OpInfo.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/daemon/OpInfo.java
new file mode 100644
index 0000000..573643e
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/daemon/OpInfo.java
@@ -0,0 +1,214 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *    Kent Sebastian <ksebasti@redhat.com>
+ *******************************************************************************/ 
+
+package org.eclipse.linuxtools.oprofile.core.daemon;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
+
+import org.eclipse.linuxtools.oprofile.core.OprofileCorePlugin;
+import org.eclipse.linuxtools.oprofile.core.OpxmlException;
+import org.eclipse.linuxtools.oprofile.core.linux.LinuxOpxmlProvider.OpInfoRunner;
+import org.eclipse.linuxtools.oprofile.core.opxml.info.DefaultsProcessor;
+
+
+/**
+ * A class to hold generic information about Oprofile.
+ */
+public class OpInfo {
+	// Oprofile defaults
+	public static final String DEFAULT_SAMPLE_DIR = DefaultsProcessor.SAMPLE_DIR;
+	public static final String DEFAULT_LOCK_FILE = DefaultsProcessor.LOCK_FILE;
+	public static final String DEFAULT_LOG_FILE = DefaultsProcessor.LOG_FILE;
+	public static final String DEFAULT_DUMP_STATUS = DefaultsProcessor.DUMP_STATUS;
+	
+	// A comparator class used when sorting events
+	// (sorting by event name)
+	private static class SortEventComparator implements Comparator<OpEvent> {
+		public int compare(OpEvent o1, OpEvent o2) {
+			return o1.getText().compareTo(o2.getText());
+		}
+	}
+
+	// A comparator class used when searching events
+	// (searching by event name)
+	private static class SearchEventComparator implements Comparator<Object> {
+		public int compare(Object a, Object b) {
+			String astr, bstr;
+			if (a instanceof String) {
+				astr = (String) a;
+				bstr = ((OpEvent) b).getText();
+			} else {
+				astr = ((OpEvent) a).getText();
+				bstr = (String) b;
+			}
+			return astr.compareTo(bstr);
+		}
+	}
+	
+	// The number of counters supported by this configuration
+	private int _nrCounters;
+	
+	// A HashMap of Oprofile defaults
+	private HashMap<String,String> _defaults;
+	
+	// The permanent list of events indexed by counter
+	private OpEvent[][] _eventList;
+	
+	// The CPU frequency of this CPU in MHz
+	private double _cpuSpeed;
+	
+	// Whether or not oprofile is running in timer mode
+	private boolean _timerMode;
+	
+	/**
+	 * Return all of Oprofile's generic information.
+	 * @return a class containing the information
+	 */
+	public static OpInfo getInfo() {		
+		// Run opmxl and get the static information
+		OpInfo info = new OpInfo();
+
+		try {
+			OpInfoRunner opxml = (OpInfoRunner) OprofileCorePlugin.getDefault().getOpxmlProvider().info(info);
+			boolean ret = opxml.run0(null);
+			if (ret == false) 
+				info = null;
+		} catch (InvocationTargetException e) {
+		} catch (InterruptedException e) {
+		} catch (OpxmlException e) {
+			OprofileCorePlugin.showErrorDialog("opxmlProvider", e); //$NON-NLS-1$
+		}
+		
+		return info;
+	}
+
+	/**
+	 * Sets the number of counters allowed by Oprofile. This method is called
+	 * after this object is contstructed, while opxml is run (the first tag output
+	 * is num-counters).
+	 * Only called from XML parsers.
+	 * @param ctrs the number of counters
+	 */
+	public void _setNrCounters(int ctrs) {
+		_nrCounters = ctrs;
+		
+		// Allocate room for event lists for the counters
+		_eventList = new OpEvent[_nrCounters][];
+	}
+
+	/**
+	 * Set the CPU frequency (in MHz).
+	 * Only called from the XML parsers.
+	 * @param freq the frequency
+	 */
+	public void _setCPUSpeed(double freq) {
+		_cpuSpeed = freq;
+	}
+
+	/**
+	 * Sets the defaults associated with this configuration of Oprofile.
+	 * Only called from XML parsers.
+	 * @param map the <code>HashMap</code> containing the defaults
+	 */
+	public void _setDefaults(HashMap<String,String> map) {
+		_defaults = map;
+	}
+
+	/**
+	 * Adds the events of the counter counterNum into the list of all events.
+	 * Note they are sorted here.
+	 * Only called from XML parsers.
+	 * @param counterNum the counter with the events
+	 * @param events an array of OpEvent events belonging to this counter
+	 */
+	public void _setEvents(int counterNum, OpEvent[] events) {
+		if (counterNum < _eventList.length) {
+			_eventList[counterNum] = events;
+			Arrays.sort(_eventList[counterNum], new SortEventComparator());
+		}
+	}
+	
+	/**
+	 * Sets whether or not oprofile is operating in timer mode.
+	 * Only called from XML parsers.
+	 * @param timerMode true if oprofile is in timer mode, false if not
+	 */
+	public void _setTimerMode(boolean timerMode) {
+		_timerMode = timerMode;
+	}
+
+	/**
+	 * Returns the number of counters allowed by Oprofile
+	 * @return the number of counters
+	 */
+	public int getNrCounters() {
+		return _nrCounters;
+	}
+		
+	/**
+	 * Returns the CPU's speed in MHz
+	 * @return the speed
+	 */
+	public double getCPUSpeed() {
+		return _cpuSpeed;
+	}
+	
+	/**
+	 * Returns the requested default. Valid defaults are <code>DEFAULT_DUMP_STATUS</code>,
+	 * <code>DEFAULT_LOCK_FILE</code>, <code>DEFAULT_LOG_FILE</code>, and
+	 * <code>DEFAULT_SAMPLE_DIR</code>.
+	 * @param what which default to return
+	 * @return the requested default or <code>null</code> if not known
+	 */
+	public String getDefault(String what) {
+		return (String) _defaults.get(what);
+	}
+
+	/**
+	 * Returns an array of events valid for the given counter number.
+	 * @param num the counter number
+	 * @return an array of valid events
+	 */ 
+	public OpEvent[] getEvents(int num) {
+		if (num >= 0 && num < _eventList.length)
+			return _eventList[num];
+		
+		return new OpEvent[0];
+	}
+	
+	/**
+	 * Returns whether or not oprofile is operating in timer mode.
+	 * @return a boolean, true if in timer mode, false if not
+	 */
+	public boolean getTimerMode() {
+		return _timerMode;
+	}
+	
+	/**
+	 * Searches the for the event with the given name
+	 * @param name the name of the event (e.g., CPU_CLK_UNHALTED)
+	 * @return the event or <code>null</code> if not found
+	 */
+	public OpEvent findEvent(String name) {
+		// Search through all counters
+		for (int counter = 0; counter < getNrCounters(); ++counter) {
+			int idx = Arrays.binarySearch(getEvents(counter), name, new SearchEventComparator());
+			if (idx >= 0)
+				return _eventList[counter][idx];
+		}
+		
+		return null;
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/daemon/OpUnitMask.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/daemon/OpUnitMask.java
new file mode 100644
index 0000000..050cf0f
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/daemon/OpUnitMask.java
@@ -0,0 +1,244 @@
+/*******************************************************************************
+ * Copyright (c) 2004,2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *    Kent Sebastian <ksebasti@redhat.com> 
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.oprofile.core.daemon;
+
+/**
+ * A class representing the unit mask that may be associated with oprofile
+ * events. Note that since this class was originally written, oprofile unit
+ * masks have changed -- a single unit mask may affect several bits at once.
+ * Hence, instead of a certain bit being flipped, the specific bits to be changed 
+ * are determined by the particular mask's index 
+ */
+public class OpUnitMask {
+	/**
+	 * A class which describes an individual unit mask value. Used in XML parsing.
+	 */
+	public static class MaskInfo {
+		/**
+		 * The integer value of the mask.
+		 */
+		public int value;
+
+		/**
+		 * A description of the mask.
+		 */
+		public String description;
+	};
+	
+	public static final int SET_DEFAULT_MASK = -1;
+
+	/**
+	 * Invalid mask type.
+	 */
+	public static final int INVALID = -1;
+
+	/**
+	 * The mask is mandatory. It must be used.
+	 */
+	public static final int MANDATORY = 1;
+
+	/**
+	 * The mask is exclusive. Only one of its mask values may be used.
+	 */
+	public static final int EXCLUSIVE = 2;
+
+	/**
+	 * The mask is a bitmask. Any combination of its values may be used.
+	 */
+	public static final int BITMASK = 3;
+
+
+	// The current value of this unitmask
+	private int _mask;
+
+	// The default mask provided by the oprofile library
+	private int _defaultMask;
+
+	// The type of this unitmask
+	private int _maskType;
+
+	// Descriptions of the bits of this mask
+	private String[] _maskOptionDescriptions = new String[0];
+
+	// mask values -- now bit masks have distinct values (eg: an all of the
+	// above)
+	private int[] _maskOptionValues;
+
+	/**
+	 * Set the descriptions and values for this unitmask's mask options.
+	 * Only used from the XML parsers.
+	 * @param masks a list of all the mask options
+	 */
+	public void _setMaskDescriptions(MaskInfo[] masks) {
+		_maskOptionDescriptions = new String[masks.length];
+		_maskOptionValues = new int[masks.length];
+
+		for (int i = 0; i < masks.length; ++i) {
+			_maskOptionDescriptions[i] = masks[i].description;
+			_maskOptionValues[i] = masks[i].value;
+		}
+	}
+
+	/**
+	 * Sets the default value for this unitmask, and initializes
+	 *   the current unitmask value to this default.
+	 * Only used from the XML parsers.
+	 * @param theDefault the default value
+	 */
+	public void _setDefault(int theDefault) {
+		_defaultMask = theDefault;
+		setDefaultMaskValue();	
+	}
+	
+	/**
+	 * Sets the unitmask type.
+	 * Only used from the XML parsers.
+	 * @param type the type
+	 */
+	public void _setType(int type) {
+		_maskType = type;
+	}
+	
+	/**
+	 * Returns the integer value of this unitmask, suitable for passing to oprofile.
+	 * @return the integer value
+	 */
+	public int getMaskValue() {
+		return _mask;
+	}
+
+	/**
+	 * Tests whether a particular mask is set in the unitmask value, based on the
+	 * value of the mask option at the given index.
+	 * 
+	 * @param index the index of the mask option to check
+	 * @return whether the given mask option's value is set
+	 */
+	public boolean isMaskSetFromIndex(int index) {
+		boolean result = false;
+
+		if (index >= 0 && index < _maskOptionValues.length) {
+			switch (_maskType) {
+			case EXCLUSIVE:
+				result = (_mask == _maskOptionValues[index]);
+				break;
+
+			case BITMASK:
+				result = ((_mask & _maskOptionValues[index]) != 0);
+				break;
+
+			default:
+				result = false;
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * Sets the absolute unitmask value. 
+	 * 
+	 * @param newValue the new value of this unitmask
+	 */
+	public void setMaskValue(int newValue) {
+		if (newValue == SET_DEFAULT_MASK) {
+			_mask = _defaultMask;
+		} else {
+			_mask = newValue;
+		}
+	}
+	
+	/**
+	 * Sets the bits of the given mask option's value in the unitmask value.
+	 * @param index the index of the mask option to set
+	 */
+	public void setMaskFromIndex(int index) {
+		//mandatory masks only use the default value
+		if (index >= 0 && index < _maskOptionValues.length) {
+			if (_maskType == BITMASK)
+				_mask |= _maskOptionValues[index];
+			else if (_maskType == EXCLUSIVE) {
+				_mask = _maskOptionValues[index];
+			}
+		}
+	}
+
+	/**
+	 * Returns the value of the mask based on the unitmask index.
+	 * @param index the index of the mask option
+	 * @return the mask option's value
+	 */
+	public int getMaskFromIndex(int index) {
+		//mandatory masks only use the default value
+		if (_maskType == BITMASK) {
+			if (index >= 0 && index < _maskOptionValues.length) {
+				return _maskOptionValues[index];
+			}
+		} else if (_maskType == EXCLUSIVE) {
+			if (index >= 0 && index < _maskOptionValues.length) {
+				return _maskOptionValues[index];
+			}
+		} else if (_maskType == MANDATORY) {
+			return _defaultMask;
+		}
+
+		//type invalid or unknown, or out of bounds
+		return -1;
+	}
+	
+	/**
+	 * Unset the bits of the given mask option's value in the unitmask value.
+	 * @param index the index of the mask option to set
+	 */
+	public void unSetMaskFromIndex(int index) {
+		if (index >= 0 && index < _maskOptionValues.length && _maskType == BITMASK) {
+			_mask = _mask & ~_maskOptionValues[index];
+		}
+	}
+
+	/**
+	 * Sets the current unitmask value to the default mask value.
+	 */
+	public void setDefaultMaskValue() {
+		_mask = _defaultMask;
+	}
+
+	/**
+	 * Returns a description of the requested mask option.
+	 * @param num the mask option index
+	 * @return the description
+	 */
+	public String getText(int num) {
+		if (num >= 0 && num < _maskOptionDescriptions.length)
+			return _maskOptionDescriptions[num];
+
+		return null;
+	}
+	
+	/**
+	 * Returns the number of mask options in this unitmask.
+	 * @return the number of mask options
+	 */
+	public int getNumMasks() {
+		return _maskOptionDescriptions.length;
+	}
+
+	/**
+	 * Returns the mask type for this unit mask.
+	 * @return <code>BITMASK</code>, <code>EXCLUSIVE</code>, or
+	 *         <code>MANDATORY</code>
+	 */
+	public int getType() {
+		return _maskType;
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/daemon/OprofileDaemonEvent.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/daemon/OprofileDaemonEvent.java
new file mode 100644
index 0000000..34ae43e
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/daemon/OprofileDaemonEvent.java
@@ -0,0 +1,118 @@
+/*******************************************************************************
+ * Copyright (c) 2004,2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *    Kent Sebastian <ksebasti@redhat.com>
+ *******************************************************************************/ 
+
+package org.eclipse.linuxtools.oprofile.core.daemon;
+
+import org.eclipse.linuxtools.oprofile.core.Oprofile;
+
+/**
+ * This class represents an event used to configure the OProfile
+ * daemon.
+ */
+public class OprofileDaemonEvent {
+	public static final int COUNT_UNINITIALIZED = 0;
+	public static final int COUNT_INVALID = -1;
+	
+	// The event to collect on this counter
+	private OpEvent _event;
+	
+	// Profile kernel?
+	private boolean _profileKernel;
+	
+	// Profile userspace?
+	private boolean _profileUser;
+	
+	// Reset counter value
+	private int _count;
+
+	public OprofileDaemonEvent() {
+		_profileKernel = true;
+		_profileUser = true;
+		_count = COUNT_UNINITIALIZED;
+		_event = null;
+	}
+
+	/**
+	 * Set the event to collect
+	 * @param event the OProfile event
+	 */
+	public void setEvent(OpEvent event) {
+		_event = event;
+	}
+	
+	/**
+	 * Get the event to collect
+	 * @returns the OProfile event
+	 */
+	public OpEvent getEvent() {
+		return _event;
+	}
+
+	/**
+	 * Set whether to profile the kernel
+	 * @param profileKernel whether to enable kernel profiling
+	 */
+	public void setProfileKernel(boolean profileKernel) {
+		_profileKernel = profileKernel;
+	}
+	
+	/**
+	 * Get whether to profile the kernel
+	 * @return whether to profile the kernel
+	 */
+	public boolean getProfileKernel() {
+		return _profileKernel;
+	}
+
+	/**
+	 * Set whether to profile userspace
+	 * @param profileUser whether to profile userspace
+	 */
+	public void setProfileUser(boolean profileUser) {
+		_profileUser = profileUser;
+	}
+	
+	/**
+	 * Get whether to profile userspace
+	 * @return whether to profile userspace
+	 */
+	public boolean getProfileUser() {
+		return _profileUser;
+	}
+
+	/**
+	 * Set the reset count
+	 * @param count the new count
+	 */
+	public void setResetCount(int count) {
+		_count = count;
+	}
+	
+	/**
+	 * Get the reset count
+	 * @return the reset count
+	 */
+	public int getResetCount() {
+		// FIXME: This isn't quite in the right place...
+		if (_count == COUNT_UNINITIALIZED) {
+			// This is what Oprofile does in oprof_start.cpp:
+			double speed = Oprofile.getCpuFrequency();
+			if (speed == 0.0) {
+				_count = _event.getMinCount() * 30;
+			} else {
+				_count = (int) speed * 20;
+			}
+		}
+		
+		return _count;
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/daemon/OprofileDaemonOptions.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/daemon/OprofileDaemonOptions.java
new file mode 100644
index 0000000..d9cb574
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/daemon/OprofileDaemonOptions.java
@@ -0,0 +1,141 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *    Kent Sebastian <ksebasti@redhat.com>
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.core.daemon;
+
+
+/**
+ * This class represents the global launch options for the
+ * OProfile daemon.
+ */
+public class OprofileDaemonOptions {
+	// Kernel image file
+	private String _kernelImageFile;
+	
+	// Enable verbose logging?
+	private boolean _verboseLogging;
+	
+	// How to separate profiles (mask)
+	private int _separateProfiles;
+	
+	// the image to profile
+	private String _binaryImage;
+	
+	//how many calls down to profile
+	private int _callgraphDepth;
+	
+	/**
+	 * Sample separation options. Determines how oprofiled will group
+	 *   samples for binaries which isn't the main binary being profiled.
+	 *   
+	 * Currently only properly support:
+	 *   -none: ignore all other binaries
+	 *   -library: include shared library samples
+	 *   -kernel: include kernel module samples (which implicitly includes library)
+	 *   
+	 *   the others probably wouldn't show nicely in the view
+	 */
+	public static final int SEPARATE_NONE = 0;
+	public static final int SEPARATE_LIBRARY = 1;
+	public static final int SEPARATE_KERNEL = 2;
+	public static final int SEPARATE_THREAD = 4;
+	public static final int SEPARATE_CPU = 8;
+	
+	public OprofileDaemonOptions() {
+		//defaults
+//		_kernelImageFile = Oprofile.getKernelImageFile();
+		_kernelImageFile = ""; //$NON-NLS-1$
+		_verboseLogging = false;
+		_separateProfiles = SEPARATE_NONE;	
+		_binaryImage = ""; //$NON-NLS-1$
+		_callgraphDepth = 0;
+	}
+	
+	/**
+	 * Get the kernel image file
+	 * @return the kernel image file
+	 */
+	public String getKernelImageFile() {
+		return _kernelImageFile;
+	}
+	
+	/**
+	 * Set the kernel image file
+	 * @param image the kernel image
+	 */
+	public void setKernelImageFile(String image) {
+		_kernelImageFile = image;
+	}
+
+	/**
+	 * Get daemon verbose logging
+	 * @return whether verbose logging is enabled
+	 */
+	public boolean getVerboseLogging() {
+		return _verboseLogging;
+	}
+	
+	/**
+	 * Set daemon verbose logging
+	 * @param logging whether to enable verbose logging
+	 */
+	public void setVerboseLogging(boolean logging) {
+		_verboseLogging = logging;
+	}
+
+	/**
+	 * Get daemon profile separation mask
+	 * @return mask of options
+	 */
+	public int getSeparateProfilesMask() {
+		return _separateProfiles;
+	}
+	
+	/**
+	 * Set daemon profile separation mask
+	 * @param mask the new separation mask
+	 */
+	public void setSeparateProfilesMask(int mask) {
+		_separateProfiles = mask;
+	}
+
+	/**
+	 * Get the path to the binary image being profiled.
+	 * @return full path to the binary
+	 */
+	public String getBinaryImage() {
+		return _binaryImage;
+	}
+
+	/**
+	 * Sets the path of the binary image to profile.
+	 * @param _image full path to the binary
+	 */
+	public void setBinaryImage(String _image) {
+		this._binaryImage = _image;
+	}
+
+	/**
+	 * Get the call depth value.
+	 * @return integer amount of calls down to profile
+	 */
+	public int getCallgraphDepth() {
+		return _callgraphDepth;
+	}
+
+	/**
+	 * Sets the call depth value.
+	 * @param depth integer amount of calls down to profile
+	 */
+	public void setCallgraphDepth(int depth) {
+		this._callgraphDepth = depth;
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/linux/LinuxOpcontrolProvider.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/linux/LinuxOpcontrolProvider.java
new file mode 100644
index 0000000..72cc489
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/linux/LinuxOpcontrolProvider.java
@@ -0,0 +1,343 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *    Kent Sebastian <ksebasti@redhat.com>
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.core.linux;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.ArrayList;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.linuxtools.oprofile.core.IOpcontrolProvider;
+import org.eclipse.linuxtools.oprofile.core.OpcontrolException;
+import org.eclipse.linuxtools.oprofile.core.Oprofile;
+import org.eclipse.linuxtools.oprofile.core.OprofileCorePlugin;
+import org.eclipse.linuxtools.oprofile.core.daemon.OprofileDaemonEvent;
+import org.eclipse.linuxtools.oprofile.core.daemon.OprofileDaemonOptions;
+
+/**
+ * A class which encapsulates running opcontrol.
+ */
+public class LinuxOpcontrolProvider implements IOpcontrolProvider {
+	// Location of opcontrol security wrapper
+	private static final String _OPCONTROL_REL_PATH = "natives/linux/scripts/opcontrol"; //$NON-NLS-1$
+	private final String OPCONTROL_PROGRAM;
+
+	// Initialize the Oprofile kernel module and oprofilefs
+	private static final String _OPD_INIT_MODULE = "--init"; //$NON-NLS-1$
+	
+	// Setup daemon collection arguments
+	private static final String _OPD_SETUP = "--setup"; //$NON-NLS-1$
+	private static final String _OPD_HELP = "--help"; //$NON-NLS-1$
+	private static final String _OPD_SETUP_SEPARATE = "--separate="; //$NON-NLS-1$
+	private static final String _OPD_SETUP_SEPARATE_SEPARATOR = ","; //$NON-NLS-1$
+	private static final String _OPD_SETUP_SEPARATE_NONE = "none"; //$NON-NLS-1$
+	private static final String _OPD_SETUP_SEPARATE_LIBRARY = "library"; //$NON-NLS-1$
+	private static final String _OPD_SETUP_SEPARATE_KERNEL = "kernel"; //$NON-NLS-1$
+	private static final String _OPD_SETUP_SEPARATE_THREAD = "thread"; //$NON-NLS-1$
+	private static final String _OPD_SETUP_SEPARATE_CPU = "cpu"; //$NON-NLS-1$
+
+	private static final String _OPD_SETUP_EVENT = "--event="; //$NON-NLS-1$
+	private static final String _OPD_SETUP_EVENT_SEPARATOR = ":"; //$NON-NLS-1$
+	private static final String _OPD_SETUP_EVENT_TRUE = "1"; //$NON-NLS-1$
+	private static final String _OPD_SETUP_EVENT_FALSE = "0"; //$NON-NLS-1$
+	private static final String _OPD_SETUP_EVENT_DEFAULT = "default"; //$NON-NLS-1$
+
+	private static final String _OPD_SETUP_IMAGE = "--image="; //$NON-NLS-1$
+
+	private static final String _OPD_CALLGRAPH_DEPTH = "--callgraph="; //$NON-NLS-1$
+
+	// Kernel image file options
+	private static final String _OPD_KERNEL_NONE = "--no-vmlinux"; //$NON-NLS-1$
+	private static final String _OPD_KERNEL_FILE = "--vmlinux="; //$NON-NLS-1$
+	
+	// Logging verbosity
+//	private static final String _OPD_VERBOSE_LOGGING = "--verbose="; //$NON-NSL-1$
+//	private static final String _OPD_VERBOSE_ALL = "all"; //$NON-NLS-1$
+//	private static final String _OPD_VERBOSE_SFILE = "sfile"; //$NON-NLS-1$
+//	private static final String _OPD_VERBOSE_ARCS = "arcs"; //$NON-NLS-1$
+//	private static final String _OPD_VERBOSE_SAMPLES = "samples"; //$NON-NLS-1$
+//	private static final String _OPD_VERBOSE_MODULE = "module"; //$NON-NLS-1$
+//	private static final String _OPD_VERBOSE_MISC = "misc"; //$NON-NLS-1$
+	
+	// Start the daemon process without starting data collection
+	private static final String _OPD_START_DAEMON = "--start-daemon"; //$NON-NLS-1$
+	
+	// Start collecting profiling data
+	private static final String _OPD_START_COLLECTION = "--start"; //$NON-NLS-1$
+	
+	// Flush the collected profiling data to disk
+	private static final String _OPD_DUMP = "--dump"; //$NON-NLS-1$
+	
+	// Stop data collection
+	private static final String _OPD_STOP_COLLECTION = "--stop"; //$NON-NLS-1$
+	
+	// Stop data collection and stop daemon
+	private static final String _OPD_SHUTDOWN = "--shutdown"; //$NON-NLS-1$
+	
+	// Clear out data from current session
+	private static final String _OPD_RESET = "--reset"; //$NON-NLS-1$
+	
+	// Save data from the current session
+	private static final String _OPD_SAVE_SESSION = "--save="; //$NON-NLS-1$
+	
+	// Unload the oprofile kernel module and oprofilefs
+	private static final String _OPD_DEINIT_MODULE = "--deinit"; //$NON-NLS-1$
+	
+	// Logging verbosity. Specified with setupDaemon.
+	//--verbosity=all generates WAY too much stuff in the log
+	private String _verbosity = ""; //$NON-NLS-1$
+	
+	
+	public LinuxOpcontrolProvider() throws OpcontrolException {
+		OPCONTROL_PROGRAM = _findOpcontrol();
+	}
+	
+	/**
+	 * Unload the kernel module and oprofilefs
+	 * @throws OpcontrolException
+	 */
+	public void deinitModule() throws OpcontrolException {
+		_runOpcontrol(_OPD_DEINIT_MODULE);
+	}
+	
+	/**
+	 * Dump collected profiling data
+	 * @throws OpcontrolException
+	 */
+	public void dumpSamples() throws OpcontrolException {
+		_runOpcontrol(_OPD_DUMP);
+	}
+	
+	/**
+	 * Loads the kernel module and oprofilefs
+	 * @throws OpcontrolException
+	 */
+	public void initModule() throws OpcontrolException {
+		_runOpcontrol(_OPD_INIT_MODULE);
+	}
+	
+	/**
+	 * Clears out data from current session
+	 * @throws OpcontrolException
+	 */
+	public void reset() throws OpcontrolException {
+		_runOpcontrol(_OPD_RESET);
+	}
+	
+	/**
+	 * Saves the current ("default") session
+	 * @param name	the name to which to save the session
+	 * @throws OpcontrolException
+	 */
+	public void saveSession(String name) throws OpcontrolException {
+		ArrayList<String> cmd = new ArrayList<String>();
+		cmd.add(_OPD_SAVE_SESSION + name);
+		_runOpcontrol(cmd);
+	}
+	
+	/**
+	 * Give setup aruments
+	 * @param args	list of parameters for daemon
+	 * @throws OpcontrolException
+	 */
+	public void setupDaemon(OprofileDaemonOptions options, OprofileDaemonEvent[] events) throws OpcontrolException {
+		// Convert options & events to arguments for opcontrol
+		ArrayList<String> args = new ArrayList<String>();
+		args.add(_OPD_SETUP);
+		_optionsToArguments(args, options);
+		if (!Oprofile.getTimerMode()) {
+			if (events == null || events.length == 0) {
+				args.add(_OPD_SETUP_EVENT + _OPD_SETUP_EVENT_DEFAULT);
+			} else {
+				for (int i = 0; i < events.length; ++i) {
+					_eventToArguments(args, events[i]);
+				}
+			}
+		}
+		_runOpcontrol(args);
+	}
+	
+	/**
+	 * Stop data collection and remove daemon
+	 * @throws OpcontrolException
+	 */
+	public void shutdownDaemon() throws OpcontrolException {
+		_runOpcontrol(_OPD_SHUTDOWN);
+	}
+	
+	/**
+	 * Start data collection (will start daemon if necessary)
+	 * @throws OpcontrolException
+	 */
+	public void startCollection() throws OpcontrolException {
+		_runOpcontrol(_OPD_START_COLLECTION);
+	}
+	
+	/**
+	 * Start daemon without starting profiling
+	 * @throws OpcontrolException
+	 */
+	public void startDaemon() throws OpcontrolException {
+		_runOpcontrol(_OPD_START_DAEMON);
+	}
+	
+	/**
+	 * Stop data collection
+	 * @throws OpcontrolException
+	 */
+	public void stopCollection() throws OpcontrolException {
+		_runOpcontrol(_OPD_STOP_COLLECTION);
+	}
+
+	/**
+	 * Check status. returns true if any status was returned
+	 * @throws OpcontrolException
+	 */
+	public boolean status() throws OpcontrolException {
+		return _runOpcontrol(_OPD_HELP);
+	}
+	
+	// Convenience function
+	private boolean _runOpcontrol(String cmd) throws OpcontrolException {
+		ArrayList<String> list = new ArrayList<String>();
+		list.add(cmd);
+		return _runOpcontrol(list);
+	}
+	
+	// Will add opcontrol program to beginning of args
+	// args: list of opcontrol arguments (not including opcontrol program itself)
+	/**
+	 * @return true if any output was produced on the error stream. Unfortunately
+	 * this appears to currently be the only way we can tell if user correctly
+	 * entered the password
+	 */
+	private boolean _runOpcontrol(ArrayList<String> args) throws OpcontrolException {
+		args.add(0, OPCONTROL_PROGRAM);
+		// Verbosity hack. If --start or --start-daemon, add verbosity, if set
+		String cmd = (String) args.get(1);
+		if (_verbosity.length() > 0 && (cmd.equals (_OPD_START_COLLECTION) || cmd.equals(_OPD_START_DAEMON))) {
+			args.add(_verbosity);
+		}
+		
+		String[] cmdArray = new String[args.size()];
+		args.toArray(cmdArray);
+		
+		Process p = null;
+		try {
+			p = Runtime.getRuntime().exec(cmdArray);
+		} catch (IOException ioe) {
+			if (p != null) {
+				p.destroy();
+				p = null;
+			}
+			
+			throw new OpcontrolException(OprofileCorePlugin.createErrorStatus("opcontrolRun", ioe)); //$NON-NLS-1$
+		}
+		
+		if (p != null) {
+			BufferedReader errout = new BufferedReader(new InputStreamReader(p.getErrorStream()));
+			String output = "", s; //$NON-NLS-1$
+			try {
+				while ((s = errout.readLine()) != null) {
+					output += s;
+				}
+				
+				int ret = p.waitFor();
+				if (ret != 0) {
+					System.out.println(output);
+					throw new OpcontrolException(OprofileCorePlugin.createErrorStatus("opcontrolNonZeroExitCode", null)); //$NON-NLS-1$
+				}
+				
+				if (output.length() != 0) {
+					return true;
+				}
+				
+			} catch (IOException ioe) { 
+				ioe.printStackTrace();
+			} catch (InterruptedException e) {
+				e.printStackTrace();
+			}
+		}
+		return false;
+	}
+	
+	private static String _findOpcontrol() throws OpcontrolException {
+		URL url = FileLocator.find(Platform.getBundle(OprofileCorePlugin.getId()), new Path(_OPCONTROL_REL_PATH), null); 
+
+		if (url != null) {
+			try {
+				return FileLocator.toFileURL(url).getPath();
+			} catch (IOException ignore) { }
+		} else {
+			throw new OpcontrolException(OprofileCorePlugin.createErrorStatus("opcontrolProvider", null)); //$NON-NLS-1$
+		}
+
+		return null;
+	}	
+
+	// Convert the event into arguments for opcontrol
+	private void _eventToArguments(ArrayList<String> args, OprofileDaemonEvent event) {
+		// Event spec: "EVENT:count:mask:profileKernel:profileUser"
+		String spec = new String(_OPD_SETUP_EVENT);
+		spec += event.getEvent().getText();
+		spec += _OPD_SETUP_EVENT_SEPARATOR;
+		spec += event.getResetCount();
+		spec += _OPD_SETUP_EVENT_SEPARATOR;
+		spec += event.getEvent().getUnitMask().getMaskValue();
+		spec += _OPD_SETUP_EVENT_SEPARATOR;
+		spec += (event.getProfileKernel() ? _OPD_SETUP_EVENT_TRUE : _OPD_SETUP_EVENT_FALSE);
+		spec += _OPD_SETUP_EVENT_SEPARATOR;
+		spec += (event.getProfileUser() ? _OPD_SETUP_EVENT_TRUE : _OPD_SETUP_EVENT_FALSE);
+		args.add(spec);
+	}
+	
+	// Convert the options into arguments for opcontrol
+	private void _optionsToArguments(ArrayList<String> args, OprofileDaemonOptions options) {
+		// Add separate flags
+		int mask = options.getSeparateProfilesMask();
+
+		String separate = new String(_OPD_SETUP_SEPARATE);
+		
+		if (mask == OprofileDaemonOptions.SEPARATE_NONE) {
+			separate += _OPD_SETUP_SEPARATE_NONE;
+		} else {
+			//note that opcontrol will nicely ignore the trailing comma
+			if ((mask & OprofileDaemonOptions.SEPARATE_LIBRARY) != 0)
+				separate += _OPD_SETUP_SEPARATE_LIBRARY + _OPD_SETUP_SEPARATE_SEPARATOR;
+			if ((mask & OprofileDaemonOptions.SEPARATE_KERNEL) != 0)
+				separate += _OPD_SETUP_SEPARATE_KERNEL + _OPD_SETUP_SEPARATE_SEPARATOR;
+			if ((mask & OprofileDaemonOptions.SEPARATE_THREAD) != 0)
+				separate += _OPD_SETUP_SEPARATE_THREAD + _OPD_SETUP_SEPARATE_SEPARATOR;
+			if ((mask & OprofileDaemonOptions.SEPARATE_CPU) != 0)
+				separate += _OPD_SETUP_SEPARATE_CPU + _OPD_SETUP_SEPARATE_SEPARATOR;
+		}
+		args.add(separate);
+		
+		// Add kernel image
+		if (options.getKernelImageFile() == null || options.getKernelImageFile().length() == 0) {
+			args.add(_OPD_KERNEL_NONE);
+		} else {
+			args.add(_OPD_KERNEL_FILE + options.getKernelImageFile());
+		}
+
+		//image filter -- always non-null
+		args.add(_OPD_SETUP_IMAGE + options.getBinaryImage());
+		
+		//callgraph depth
+		args.add(_OPD_CALLGRAPH_DEPTH + options.getCallgraphDepth());
+	}
+
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/linux/LinuxOpxmlProvider.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/linux/LinuxOpxmlProvider.java
new file mode 100644
index 0000000..b5be556
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/linux/LinuxOpxmlProvider.java
@@ -0,0 +1,124 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *    Kent Sebastian <ksebasti@redhat.com> 
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.core.linux;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.linuxtools.oprofile.core.IOpxmlProvider;
+import org.eclipse.linuxtools.oprofile.core.OprofileCorePlugin;
+import org.eclipse.linuxtools.oprofile.core.OpxmlException;
+import org.eclipse.linuxtools.oprofile.core.daemon.OpInfo;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelEvent;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelImage;
+import org.eclipse.linuxtools.oprofile.core.opxml.OpxmlConstants;
+import org.eclipse.linuxtools.oprofile.core.opxml.modeldata.ModelDataProcessor;
+import org.eclipse.linuxtools.oprofile.core.opxml.sessions.SessionsProcessor;
+
+/**
+ * A class which implements the IOpxmlProvider interface for running opxml.
+ */
+public abstract class LinuxOpxmlProvider implements IOpxmlProvider {
+	private String _pathToOpxml;
+	
+	public LinuxOpxmlProvider() throws OpxmlException {
+		_pathToOpxml = _getOpxmlPath();
+		
+		if (_pathToOpxml == null) {
+			throw new OpxmlException(OprofileCorePlugin.createErrorStatus("opxmlProvider", null)); //$NON-NLS-1$
+		}
+	}
+	
+	public abstract String _getOpxmlPath();
+	
+	public IRunnableWithProgress info(final OpInfo info) {
+		return new OpInfoRunner(info);
+	}
+
+	//public because it is used in OpInfo.java:getInfo()
+	public class OpInfoRunner implements IRunnableWithProgress {
+		private boolean b;
+		final private OpInfo info;
+		
+		public OpInfoRunner(OpInfo _info) {
+			info = _info;
+		}
+		
+		public boolean run0(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+			run(monitor);
+			return b;
+		}
+		
+		public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+			OpxmlRunner runner = new OpxmlRunner(_pathToOpxml);
+			String[] args = new String[] {
+				OpxmlConstants.OPXML_INFO
+			};
+			b = runner.run(args, info);
+		}
+	}
+	
+	public IRunnableWithProgress modelData(final String eventName, final String sessionName, final OpModelImage image) {
+		IRunnableWithProgress runnable = new IRunnableWithProgress() {	
+			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+				OpxmlRunner runner = new OpxmlRunner(_pathToOpxml);
+
+				String[] args = new String[] {
+						OpxmlConstants.OPXML_MODELDATA,
+						eventName,
+						sessionName
+				};
+				
+				ModelDataProcessor.CallData data = new ModelDataProcessor.CallData(image);
+				runner.run(args, data);
+			}
+		};
+		
+		return runnable;
+	}
+		
+	public IRunnableWithProgress checkEvents(final int ctr, final int event, final int um, final int[] eventValid) {
+		IRunnableWithProgress runnable = new IRunnableWithProgress() {
+			public void run(IProgressMonitor monitor) {
+				OpxmlRunner runner = new OpxmlRunner(_pathToOpxml);
+				String[] args = new String[] {
+					OpxmlConstants.CHECKEVENTS_TAG,
+					Integer.toString(ctr),
+					Integer.toString(event),
+					Integer.toString(um)
+				};
+				
+				runner.run(args, eventValid);
+			}
+		};
+		return runnable;
+	}
+	
+	public IRunnableWithProgress sessions(final ArrayList<OpModelEvent> sessionList) {
+		
+		IRunnableWithProgress runnable = new IRunnableWithProgress() {
+			public void run(IProgressMonitor monitor) {
+				OpxmlRunner runner = new OpxmlRunner(_pathToOpxml);
+				String[] args = new String[] {
+					OpxmlConstants.OPXML_SESSIONS,
+				};
+		
+				SessionsProcessor.SessionInfo sinfo  = new SessionsProcessor.SessionInfo(sessionList);
+				runner.run(args, sinfo);
+			}
+		};
+
+		return runnable;
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/linux/OpxmlRunner.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/linux/OpxmlRunner.java
new file mode 100644
index 0000000..3a7c02a
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/linux/OpxmlRunner.java
@@ -0,0 +1,105 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *    Kent Sebastian <ksebasti@redhat.com> - 
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.core.linux;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+import javax.xml.parsers.SAXParserFactory;
+
+import org.eclipse.linuxtools.oprofile.core.OprofileCorePlugin;
+import org.eclipse.linuxtools.oprofile.core.OpxmlException;
+import org.eclipse.linuxtools.oprofile.core.opxml.OprofileSAXHandler;
+import org.eclipse.linuxtools.oprofile.core.opxml.XMLProcessor;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+
+/**
+ * This class will run opxml.
+ * 
+ * opxml is a small program which acts as a textual interface between Oprofile and
+ * BFD and the oprofile plugins. 
+ */
+public class OpxmlRunner {
+	private OprofileSAXHandler _handler;
+	private String _pathToOpxml;
+
+	public OpxmlRunner(String pathToOpxml) {
+		//assume that the path given is valid
+		_pathToOpxml = pathToOpxml;
+	}
+	
+	/**
+	 * Returns the current XMLProcessor handling parsing of opxml output.
+	 * @return the processor
+	 */
+	public XMLProcessor getProcessor() {
+		return _handler.getProcessor();
+	}
+	
+	/**
+	 * Runs opxml with the given arguments.
+	 * @param args the arguments to pass to opxml
+	 * @param callData any callData to pass to the processor
+	 * @return boolean indicating the success/failure of opxml
+	 * @throws OpxmlException 
+	 */
+	public boolean run(String[] args, Object callData) {
+		XMLReader reader = null;
+		_handler = OprofileSAXHandler.getInstance(callData);
+		
+		// Create XMLReader
+        SAXParserFactory factory = SAXParserFactory.newInstance();
+        try {
+			reader = factory.newSAXParser().getXMLReader();
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		}
+		
+		// Set content/error handlers
+		reader.setContentHandler(_handler);
+		reader.setErrorHandler(_handler);
+		
+		// Setup args
+		String[] cmdArray = new String[args.length + 1];
+		cmdArray[0] = _pathToOpxml;
+		System.arraycopy(args, 0, cmdArray, 1, args.length);
+		
+		// Run opxml
+		try {
+			Process p = Runtime.getRuntime().exec(cmdArray);
+			BufferedReader bi = new BufferedReader(new InputStreamReader(p.getInputStream()));
+			reader.parse(new InputSource(bi));	
+			int ret = p.waitFor();
+			if (ret != 0) {
+				//System.out.println("error running opxml");
+				return false;
+			}
+			
+			return true;
+		} catch (SAXException e) {
+			e.printStackTrace();
+			OprofileCorePlugin.showErrorDialog("opxmlSAXParseException", null); //$NON-NLS-1$
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+//			System.out.println("IOException: " + e.getMessage());
+			e.printStackTrace();
+			OprofileCorePlugin.showErrorDialog("opxmlIOException", null); //$NON-NLS-1$
+		}
+		
+		return false;
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/model/OpModelEvent.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/model/OpModelEvent.java
new file mode 100644
index 0000000..bd4fab7
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/model/OpModelEvent.java
@@ -0,0 +1,66 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *    Kent Sebastian <ksebasti@redhat.com> - 
+ *******************************************************************************/ 
+
+package org.eclipse.linuxtools.oprofile.core.model;
+
+/**
+ * A class which represents the event collected in a given session.
+ */
+public class OpModelEvent {
+	private String _eventName;
+	private OpModelSession[] _sessions;
+	private String _printTabs = "";		//for nice output  //$NON-NLS-1$
+	
+	public OpModelEvent(String name) {
+		_eventName = name;
+	}
+
+	public OpModelSession[] getSessions() {
+		return _sessions;
+	}
+
+	public void _setSessions(OpModelSession[] sessions) {
+		_sessions = sessions;
+	}
+
+	public String getName() {
+		return _eventName;
+	}
+
+	//populate all sessions
+	public void refreshModel() {
+		if (_sessions != null) {
+			for (int i = 0; i < _sessions.length; i++) {
+				_sessions[i].refreshModel();
+			}
+		}
+	}
+	
+	public String toString(String tabs) {
+		_printTabs = tabs;
+		String s = toString();
+		_printTabs = ""; //$NON-NLS-1$
+		return s;
+	}
+
+	@Override
+	public String toString() {
+		String s = _eventName + "\n"; //$NON-NLS-1$
+		if (_sessions != null) {
+			for (int i = 0; i < _sessions.length; i++) {
+				s += _printTabs + "Session: "; //$NON-NLS-1$
+				s += _sessions[i].toString(_printTabs + "\t"); //$NON-NLS-1$
+			}
+		}
+		return s;
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/model/OpModelImage.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/model/OpModelImage.java
new file mode 100644
index 0000000..2686dfd
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/model/OpModelImage.java
@@ -0,0 +1,140 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *    Kent Sebastian <ksebasti@redhat.com> - 
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.core.model;
+
+
+/**
+ * A class which represents an image (executables,
+ * libraries, modules) profile by OProfile.
+ */
+public class OpModelImage {
+	public static final int IMAGE_PARSE_ERROR = -1;
+	
+	//The count of all samples from this image
+	private int _count;
+	
+	//the count for all dependent images -- needed?
+	private int _depcount;
+	
+	//The name of this image (the full path, where applicable)
+	private String _name;
+	
+	//The symbols profiled in this image
+	private OpModelSymbol[] _symbols;
+	
+	//Any dependent images on this image (usually shared libs, kernel modules)
+	private OpModelImage[] _dependents;
+	
+	private String _printTabs = "";		//for nice output //$NON-NLS-1$
+	
+	public OpModelImage() {
+		_name = ""; //$NON-NLS-1$
+		_count = 0;
+		_depcount = 0;
+		_symbols = null;
+		_dependents = null;
+	}
+	
+	public int getCount() {
+		return _count;
+	}
+	
+	public int getDepCount() {
+		return _depcount;
+	}
+
+	public String getName() {
+		return _name;
+	}
+
+	public OpModelSymbol[] getSymbols() {
+		return _symbols;
+	}
+
+	public OpModelImage[] getDependents() {
+		return _dependents;
+	}
+
+	public boolean hasDependents() {
+		return (_dependents == null || _dependents.length == 0 ? false : true);
+	}
+	
+	/**
+	 * This method is not meant to be called publicly, used only 
+	 * from the XML processors	
+	 * @param _count
+	 */
+	public void _setCount(int _count) {
+		this._count = _count;
+	}
+	
+	/**
+	 * This method is not meant to be called publicly, used only 
+	 * from the XML processors	
+	 * @param _depcount
+	 */
+	public void _setDepCount(int _depcount) {
+		this._depcount = _depcount;
+	}
+
+	/**
+	 * This method is not meant to be called publicly, used only 
+	 * from the XML processors	
+	 * @param _name
+	 */
+	public void _setName(String _name) {
+		this._name = _name;
+	}
+
+	/**
+	 * This method is not meant to be called publicly, used only 
+	 * from the XML processors	
+	 * @param _symbols
+	 */
+	public void _setSymbols(OpModelSymbol[] _symbols) {
+		this._symbols = _symbols;
+	}
+
+	/**
+	 * This method is not meant to be called publicly, used only 
+	 * from the XML processors	
+	 * @param _dependents
+	 */
+	public void _setDependents(OpModelImage[] _dependents) {
+		this._dependents = _dependents;
+	}
+
+	public String toString(String tabs) {
+		_printTabs = tabs;
+		String s = toString();
+		_printTabs = ""; //$NON-NLS-1$
+		return s;
+	}
+
+	@Override
+	public String toString() {
+		String s = _name + ", Count: " + _count + (_depcount !=0 ? ", Dependent Count: " + _depcount + "\n" : "\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		if (_symbols != null) {
+			for (int i = 0; i < _symbols.length; i++) {
+				s += _printTabs + "Symbols: "; //$NON-NLS-1$
+				s += _symbols[i].toString(_printTabs + "\t"); //$NON-NLS-1$
+			}
+		}
+		if (_dependents != null) {
+			for (int i = 0; i < _dependents.length; i++) {
+				s += _printTabs + "Dependent Image: "; //$NON-NLS-1$
+				s += _dependents[i].toString(_printTabs + "\t"); //$NON-NLS-1$
+			}			
+		}
+		return s;
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/model/OpModelRoot.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/model/OpModelRoot.java
new file mode 100644
index 0000000..d0db8e2
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/model/OpModelRoot.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation 
+ *******************************************************************************/ 
+
+package org.eclipse.linuxtools.oprofile.core.model;
+
+import org.eclipse.linuxtools.oprofile.core.Oprofile;
+
+/**
+ * A root node for the data model. Only one instance exists at any time,
+ * although the contents will change. On instantiation the events and
+ * sessions are gathered. 
+ * 
+ * Note that this data model does not map 1:1 to the oprofile data model.
+ * This model is for use in profiling one application compiled with debug
+ * info, from within eclipse. 
+ */
+
+public class OpModelRoot {
+	//single instance
+	private static OpModelRoot _modelRoot = new OpModelRoot();
+
+	private OpModelEvent[] _events;
+//	private String _printTabs = "\t";		//for nice output
+
+	protected OpModelRoot() {
+//		refreshModel();
+		_events = null;
+//		_modelRoot = this;
+	}
+
+	public static OpModelRoot getDefault() {
+		return _modelRoot;
+	}
+
+	public void refreshModel() {
+		//TODO-performance/interactivity: some persistence for events/sessions
+		// that dont change from run to run (non default sessions) 
+		
+		_events = getNewEvents();
+		if (_events != null) {
+			for (int i = 0; i < _events.length; i++) {
+				if (_events[i] != null)
+					_events[i].refreshModel();
+			}
+		}
+	}
+	
+	protected OpModelEvent[] getNewEvents() {
+		//launch `opxml sessions`, gather up events & the sessions under them
+		return Oprofile.getEvents(); 
+	}
+	
+	public OpModelEvent[] getEvents() {
+		return _events;
+	}
+	
+	@Override
+	public String toString() {
+		String s = ""; //$NON-NLS-1$
+		if (_events != null) {
+			for (int i = 0; i < _events.length; i++) {
+				if (_events[i] != null) {
+					s += "Event: "; //$NON-NLS-1$
+					s += _events[i].toString("\t"); //$NON-NLS-1$
+				}
+			}
+		}
+		return s;
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/model/OpModelSample.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/model/OpModelSample.java
new file mode 100644
index 0000000..a705c09
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/model/OpModelSample.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2004,2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *    Kent Sebastian <ksebasti@redhat.com> - 
+ *******************************************************************************/ 
+
+package org.eclipse.linuxtools.oprofile.core.model;
+
+/**
+ * Represents an OProfile sample.
+ */
+public class OpModelSample {
+	private int _count;
+	private int _line;
+
+	public OpModelSample() {
+		_count = 0;
+		_line = 0;
+	}
+	
+	public void _setCount(int _count) {
+		this._count = _count;
+	}
+
+	public void _setLine(int _line) {
+		this._line = _line;
+	}
+
+	public int getCount() {
+		return _count;
+	}
+
+	public int getLine() {
+		return _line;
+	}
+
+	@Override
+	public String toString() {
+		String s = "Line #: " + _line + ", Count: " + _count + "\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		return s;
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/model/OpModelSession.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/model/OpModelSession.java
new file mode 100644
index 0000000..aa8964d
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/model/OpModelSession.java
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation 
+ *******************************************************************************/ 
+
+package org.eclipse.linuxtools.oprofile.core.model;
+
+import org.eclipse.linuxtools.oprofile.core.Oprofile;
+
+
+/**
+ * This class represents oprofile sessions. Sessions contain an image
+ * of the profiled binary.
+ */
+public class OpModelSession {
+	private static final String DEFAULT_SESSION_STRING = "current"; //$NON-NLS-1$
+
+	private OpModelEvent _parentEvent;
+	private OpModelImage _image;
+	private String _name;
+	private String _printTabs = "";		//for nice output //$NON-NLS-1$
+
+	public OpModelSession(OpModelEvent event, String name) {
+		_parentEvent = event;
+		_name = name;
+		_image = null;
+	}
+	
+	public OpModelImage getImage() {
+		return _image;
+	}
+
+	public OpModelEvent getEvent() {
+		return _parentEvent;
+	}
+	
+	public String getName() {
+		return _name;
+	}
+	
+	public int getCount() {
+		if (_image == null) {
+			return 0;
+		} else {
+			return _image.getCount();
+		}
+	}
+	
+	public boolean isDefaultSession() {
+		return _name.equals(DEFAULT_SESSION_STRING); 
+	}
+	
+	public void refreshModel() {
+		//populate this session with samples
+		_image = getNewImage();
+	}
+	
+	protected OpModelImage getNewImage() {
+		return Oprofile.getModelData(_parentEvent.getName(), _name);
+	}
+
+	public String toString(String tabs) {
+		_printTabs = tabs;
+		String s = toString();
+		_printTabs = ""; //$NON-NLS-1$
+		return s;
+	}
+
+	@Override
+	public String toString() {
+		String s = _name + "\n"; //$NON-NLS-1$
+		if (_image != null) {
+			s += _printTabs + "Image: "; //$NON-NLS-1$
+			s += _image.toString(_printTabs + "\t"); //$NON-NLS-1$
+		}
+		return s;
+		
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/model/OpModelSymbol.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/model/OpModelSymbol.java
new file mode 100644
index 0000000..9f07f82
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/model/OpModelSymbol.java
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation 
+ *******************************************************************************/ 
+
+package org.eclipse.linuxtools.oprofile.core.model;
+
+/**
+ * This class represents a debugging symbol, the symbol output
+ *  from opxml. If a symbol exists, it must have samples (which are
+ *  OpModelSamples), although those samples may or may not have 
+ *  complete debug info.
+ */
+public class OpModelSymbol {
+	private String _name;
+	private String _file;
+	private int _count;
+	private OpModelSample[] _samples;
+	private String _printTabs = ""; 	//for nice output //$NON-NLS-1$
+	
+	public OpModelSymbol() {
+		_name = ""; //$NON-NLS-1$
+		_file = ""; //$NON-NLS-1$
+		_count = 0;
+		_samples = null;
+	}
+	
+	public void _setName(String _name) {
+		this._name = _name;
+	}
+
+	public void _setFile(String _file) {
+		this._file = _file;
+	}
+
+	public void _setCount(int _count) {
+		this._count = _count;
+	}
+
+	public void _setSamples(OpModelSample[] _samples) {
+		this._samples = _samples;
+	}
+
+	public String getName() {
+		return _name;
+	}
+
+	public String getFile() {
+		return _file;
+	}
+
+	public int getCount() {
+		return _count;
+	}
+
+	public OpModelSample[] getSamples() {
+		return _samples;
+	}
+
+	public String toString(String tabs) {
+		_printTabs = tabs;
+		String s = toString();
+		_printTabs = ""; //$NON-NLS-1$
+		return s;
+	}
+
+	@Override
+	public String toString() {
+		String s = _name + ", File: " + _file + ", Count: " + _count + "\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		if (_samples != null) {
+			for (int i = 0; i < _samples.length; i++) {
+				s += _printTabs + "Sample: "; //$NON-NLS-1$
+				s += _samples[i].toString();
+			}
+		}
+		return s;
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/oprofile.properties b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/oprofile.properties
new file mode 100644
index 0000000..a9ef98b
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/oprofile.properties
@@ -0,0 +1,49 @@
+######################################################################
+# Copyright (c) 2004, 2008, 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Keith Seitz <keiths@redhat.com> - Initial implementation
+#    Kent Sebastian <ksebasti@redhat.com>
+######################################################################
+unknown-kernel=unknown
+getSamples.caption=Reading samples for session \"{0}\"...
+getSamples.caption.default-session=Reading samples for session \"Default\"...
+
+oprofileInit.error.statusMessage=An error occurred initializing OProfile for use with the plugin. Try loading the kernel module via OProfile itself with the command `opcontrol --init` (must be run as root).
+oprofileInit.error.dialog.title=Error initializing OProfile
+oprofileInit.error.dialog.message=FATAL: The OProfile kernel module could not be loaded.
+
+opcontrolRun.error.statusMessage=Error during run of opcontrol
+opcontrolNonZeroExitCode.error.statusMessage=Exit code of opcontrol indicates failure
+
+opcontrolProvider.error.statusMessage=Could not find an OpcontrolProvider, or no opcontrol binary exists.\n\nPlease ensure you have run the install script as the root user. The install script will be in the org.eclipse.linuxtools.oprofile.core plugin, which may be located in one of a few places. You can locate it with the following command (type in a terminal):\n\nfind <~/.eclipse OR the location from which you're running eclipse> \\n-name 'org.eclipse.linuxtools.oprofile.core_*'\n\nWhen you have found the location of the plugin, change to the following directory and build the native component:\n\ncd <path to org.eclipse.linuxtools.oprofile.core>/natives/linux/opxml\nmake\nmake install\n\nFinally, as root, run the install script contained therein:\n\ncd <path to org.eclipse.linuxtools.oprofile.core>/natives/linux/scripts\nsh install.sh\n\nYou may need to set the script as executable before running this command; do this with:\n\nchmod u+x install.sh
+
+opcontrolProvider.error.dialog.title=Error running opcontrol
+opcontrolProvider.error.dialog.message=FATAL: An error occurred running opcontrol.
+
+opxmlParse.error.statusMessage=An unexpected error occurred with parsing opxml's output. Please file a bug at http://bugs.eclipse.org/bugs.
+opxmlParse.error.dialog.title=Error with opxml
+opxmlParse.error.dialog.message=An error occurred with opxml.
+
+opxmlIOException.error.statusMessage=The opxml binary can not be read or executed. Either your user does not have sufficient permissions, or the install script was not run.\n\nPlease ensure you have run the install script as the root user. The install script will be in the org.eclipse.linuxtools.oprofile.core plugin, which may be located in one of a few places. You can locate it with the following command (type in a terminal):\n\nfind <~/.eclipse OR the location from which you're running eclipse> -name 'org.eclipse.linuxtools.oprofile.core_*'\n\nWhen you have found the location of the plugin, change to the following directory and build the native component:\n\ncd <path to org.eclipse.linuxtools.oprofile.core>/natives/linux/opxml\nmake\nmake install\n\nFinally, as root, run the install script contained therein:\n\ncd <path to org.eclipse.linuxtools.oprofile.core>/natives/linux/scripts\nsh install.sh\n\nYou may need to set the script as executable before running this command; do this with:\n\nchmod u+x install.sh   
+opxmlIOException.error.dialog.title=Error with opxml
+opxmlIOException.error.dialog.message=FATAL: An error occurred with opxml.
+
+opxmlSAXParseException.error.statusMessage=The XML output could not be read, most likely a fatal error. Please see the "Errors Related to opxml" section in the OProfile user guide on the Eclipse.org wiki (http://wiki.eclipse.org/Linux_Tools_Project/OProfile/User_Guide#Errors_Related_to_opxml) or in the Eclipse Help docs.
+opxmlSAXParseException.error.dialog.title=Error with opxml
+opxmlSAXParseException.error.dialog.message=An error occurred with opxml.
+
+opxmlProvider.error.statusMessage=Could not find an OpxmlProvider, or no opxml binary exists. Please fix the issue before continuing.
+opxmlProvider.error.dialog.title=Error with opxml
+opxmlProvider.error.dialog.message=FATAL: An error occurred with opxml.
+
+fatal.kernelModuleNotLoaded=OProfile kernel module not loaded or no opcontrol. Please fix the issue and restart Eclipse.
+fatal.opinfoNotParsed=Fatal error: core OProfile information failed to parse. Please fix the issue and restart Eclipse.
+
+ui.annotate.no.sessions.error.statusMessage=There are no sessions to annotate. Please profile a binary.
+ui.annotate.no.sessions.error.dialog.title=Annotation Error
+ui.annotate.no.sessions.error.dialog.message=Error annotating
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/OprofileSAXHandler.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/OprofileSAXHandler.java
new file mode 100644
index 0000000..cf2fb22
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/OprofileSAXHandler.java
@@ -0,0 +1,184 @@
+/*******************************************************************************
+ * Copyright (c) 2004 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.core.opxml;
+
+import java.util.HashMap;
+import java.util.Stack;
+
+import org.eclipse.linuxtools.oprofile.core.opxml.checkevent.CheckEventsProcessor;
+import org.eclipse.linuxtools.oprofile.core.opxml.info.OpInfoProcessor;
+import org.eclipse.linuxtools.oprofile.core.opxml.modeldata.ModelDataProcessor;
+import org.eclipse.linuxtools.oprofile.core.opxml.sessions.SessionsProcessor;
+import org.xml.sax.Attributes;
+import org.xml.sax.helpers.DefaultHandler;
+
+/**
+ * The SAX handler class that is used to parse the output of opxml.
+ * @see org.eclipse.linuxtools.oprofile.core.opxml.OpxmlRunner
+ */
+public class OprofileSAXHandler extends DefaultHandler {
+	// The only allowed instance of this class
+	private static OprofileSAXHandler _instance = null;
+	
+	// A Map of all the XML processors for opxml
+	private static HashMap<String,Class<?>> _processors = new HashMap<String,Class<?>>();
+	
+	// The current processor being used to parse the document
+	private XMLProcessor _processor = null;
+	private Object _callData;
+	
+	/* A stack of XML processors. This allows processors to invoke sub-processors
+	   for handling nested tags more efficiently. */
+	private Stack<XMLProcessor> _processorStack = new Stack<XMLProcessor>();
+	
+	// A convenience class for specifying XMLProcessors
+	private static class ProcessorItem {
+		public String tagName;
+		public Class<?> handlerClass;
+		public ProcessorItem(String name, Class<?> cls) {
+			tagName = name;
+			handlerClass = cls;
+		}
+	}
+	
+	// The list of all "root" XML tags and their handler classes 
+	private static final ProcessorItem[] _handlerList = {
+		new ProcessorItem(OpxmlConstants.INFO_TAG, OpInfoProcessor.class),
+		new ProcessorItem(OpxmlConstants.CHECKEVENTS_TAG, CheckEventsProcessor.class),
+		new ProcessorItem(OpxmlConstants.MODELDATA_TAG, ModelDataProcessor.class),
+		new ProcessorItem(OpxmlConstants.SESSIONS_TAG, SessionsProcessor.class)
+	};
+	
+	/**
+	 * Returns an instance of the handler. This must be used to access the parser!
+	 * @return a handler instance
+	 */
+	public static OprofileSAXHandler getInstance(Object callData) {
+		if (_instance == null) {
+			_instance = new OprofileSAXHandler();
+			
+			// Initialize processor map
+			for (int i = 0; i < _handlerList.length; ++i) {
+				_processors.put(_handlerList[i].tagName, _handlerList[i].handlerClass);
+			}
+		}
+		
+		// Set calldata into handler
+		_instance.setCallData (callData);
+		return _instance;
+	}
+	
+	/**
+	 * Sets the calldata for the processor.
+	 * @param callData the calldata to pass to the processor
+	 */
+	public void setCallData(Object callData)
+	{
+		_callData = callData;
+	}
+	
+	/**
+	 * Returns the processor for a given request type.
+	 * @param type the name of the processor
+	 * @return the requested processor or null
+	 */
+	public static XMLProcessor getProcessor(String type) {
+		XMLProcessor processor = null;
+		
+		Class<?> handlerClass = (Class<?>) _processors.get(type);
+		if (handlerClass != null) {
+			try {
+				processor = (XMLProcessor) handlerClass.newInstance();
+			} catch (InstantiationException e) {
+			} catch (IllegalAccessException e) {
+			}
+		}
+		
+		return processor;
+	}
+	
+	/**
+	 * @see org.xml.sax.ContentHandler#startDocument()
+	 */
+	public void startDocument() {
+		// Reset processor
+		_processor = null;
+	}
+	
+	/**
+	 * @see org.xml.sax.ContentHandler#endDocument()
+	 */
+	public void endDocument() {
+	}
+	
+	/**
+	 * @see org.xml.sax.ContentHandler#startElement(String, String, String, Attributes)
+	 */
+	public void startElement(String uri, String lName, String qName, Attributes attrs) {
+		if (_processor == null) {
+			// Get processor for this event type
+			_processor = getProcessor(qName);
+			_processor.reset(_callData);
+		}
+		
+		// If we already have a processor, so let it deal with this new element.
+		// Allow the processor to deal with it's own tag as well: this way it can
+		// grab attributes from it.
+		_processor.startElement(qName, attrs, _callData);
+	}
+	
+	/**
+	 * @see org.xml.sax.ContentHandler#endElement(String, String, String)
+	 */
+	public void endElement(String uri, String name, String qName) {
+		_processor.endElement(qName, _callData);
+	}
+	
+	/**
+	 * @see org.xml.sax.ContentHandler#characters(char[], int, int)
+	 */
+	public void characters(char ch[], int start, int length) {
+		// Ignore characters which are only whitespace
+		String str = new String(ch, start, length).trim();
+		if (str.length() > 0 && _processor != null)
+			_processor.characters(new String(ch, start, length), _callData);
+	}
+	
+	/**
+	 * Returns the processor used to parse the document.
+	 * @return the XMLProcessor
+	 */
+	public XMLProcessor getProcessor() {
+		return _processor;
+	}
+	
+	/**
+	 * Pushes the current XMLProcessor onto the stack and installs the given
+	 * processor as the document's parser/handler.
+	 * @param proc the processor to continue parsing the document
+	 */
+	public void push(XMLProcessor proc) {
+		_processorStack.add(_processor);
+		_processor = proc;
+		_processor.reset(_callData);
+	}
+	
+	/**
+	 * Removes the current XMLProcessor and installs the previous processor.
+	 * NOTE: This assumes that endElement caused the pop, so it calls endElement in
+	 * the parent processor.
+	 * @param tag the XML tag to pass to the parent processor
+	 */
+	public void pop(String tag) {
+		_processor = (XMLProcessor) _processorStack.pop();
+		_processor.endElement(tag, _callData);
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/OpxmlConstants.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/OpxmlConstants.java
new file mode 100644
index 0000000..3a0f62a
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/OpxmlConstants.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2004,2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *    Kent Sebastian <ksebasti@redhat.com> - change samples to model-data
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.core.opxml;
+
+/**
+ * A class of constants for communications with the opxml wrapper
+ * program.
+ * @see org.eclipse.linuxtools.oprofile.core.opxml.OprofileSAXHandler
+ */
+public class OpxmlConstants {
+	/**
+	 * Request static oprofile information (num counters, defaults, event lists) 
+	 */
+	public static final String OPXML_INFO = "info"; //$NON-NLS-1$
+	public static final String INFO_TAG = OPXML_INFO;
+
+	/**
+	 * Request model data for a session
+	 */
+	public static final String OPXML_MODELDATA = "model-data"; //$NON-NLS-1$
+	public static final String MODELDATA_TAG = OPXML_MODELDATA;
+	
+	/**
+	 * Request event validity check
+	 */
+	public static final String OPXML_CHECKEVENTS = "check-events"; //$NON-NLS-1$
+	public static final String CHECKEVENTS_TAG = OPXML_CHECKEVENTS;
+	
+	/**
+	 * Request session list
+	 */
+	public static final String OPXML_SESSIONS  = "sessions"; //$NON-NLS-1$
+	public static final String SESSIONS_TAG = OPXML_SESSIONS;
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/XMLProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/XMLProcessor.java
new file mode 100644
index 0000000..85229fd
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/XMLProcessor.java
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (c) 2004 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.core.opxml;
+
+import org.xml.sax.Attributes;
+
+/**
+ * A class which (minimally) parses XML documents. This class provides only basic
+ * support for collecting information from XML documents. It is intended to be subclassed,
+ * providing only common functionality for all parser classes.
+ * @see org.eclipse.linuxtools.oprofile.core.opxml.OpxmlRunner
+ */
+public class XMLProcessor {
+	// The characters in the current tag
+	protected String _characters;
+	
+	/**
+	 * This method is called whenever the SAXHandler is about to invoke the
+	 * processor for the first time on a given document.
+	 * @param callData call data for the processor (usually the result is stored here)
+	 */
+	public void reset(Object callData) {
+	};
+	
+	/**
+	 * This method is called whenever a new tag is seen in the document. By default,
+	 * this process will clear the characters collected for the tag. Processors will typically
+	 * call this baseclass method to setup for collecting new character information for a
+	 * tag.
+	 * @param name the name of the tag
+	 * @param attrs the tag's attributes
+	 * @param callData call data for the processor (usually the result is stored here)
+	 */
+	public void startElement(String name, Attributes attrs, Object callData) {
+		_characters = new String();
+	}
+	
+	/**
+	 * This method is called whenever the closing tag for an element is seen in the
+	 * document.
+	 * @param name the element which is ending
+	 * @param callData call data for the processor (usually the result is stored here)
+	 */
+	public void endElement(String name, Object callData) {
+	}
+	
+	/**
+	 * This method is called whenever characters are seen in the document that are not in
+	 *  a markup tag.
+	 * @param chars the characters read
+	 * @param callData call data for the processor (usually the result is stored here)
+	 */
+	public void characters(String chars, Object callData) {
+		_characters = chars;
+	}
+	
+	/**
+	 * This method is called on attribute strings and does the reverse of valid_string in
+	 * xmlfmt.cc in opxml. 
+	 * @param source source attribute string 
+	 * @return the source string with escaped characters translated back to their single character counterpart
+	 */
+	public String valid_string(String source) {
+		final String chars_long[] = {"&amp;", "&quot;", "&apos;", "&lt;", "&gt;"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+		final String chars[] = {"&", "\"", "'", "<", ">"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+		for (int i = 0; i < chars_long.length; i++) {
+			source.replaceAll(chars_long[i], chars[i]);
+		}
+		return source;
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/checkevent/CheckEventsProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/checkevent/CheckEventsProcessor.java
new file mode 100644
index 0000000..79c8a58
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/checkevent/CheckEventsProcessor.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *    Kent Sebastian <ksebasti@redhat.com> 
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.core.opxml.checkevent;
+
+import org.eclipse.linuxtools.oprofile.core.opxml.XMLProcessor;
+
+/**
+ * XML handler class for opxml's "check-events".
+ * @see org.eclipse.linuxtools.oprofile.core.opxml.OpxmlRunner
+ */
+public class CheckEventsProcessor extends XMLProcessor {
+	public static final int INVALID_UNKNOWN = 0;	//unexpected error
+	public static final int EVENT_OK = 1;			//valid
+	public static final int INVALID_EVENT = 2;		//invalid event number
+	public static final int INVALID_UMASK = 3;		//invalid unit mask value
+	public static final int INVALID_COUNTER = 4;	//invalid event for given counter number
+
+	private static final String _RESULT_TAG = "result"; //$NON-NLS-1$
+	private static final String _CHECK_EVENTS_TAG ="check-events"; //$NON-NLS-1$
+
+	private static final String _EVENT_OK = "ok"; //$NON-NLS-1$
+	private static final String _INVALID_EVENT = "invalid-event"; //$NON-NLS-1$
+	private static final String _INVALID_UMASK = "invalid-um"; //$NON-NLS-1$
+	private static final String _INVALID_COUNTER = "invalid-counter"; //$NON-NLS-1$
+
+	private int _result;
+
+	/**
+	 * @see org.eclipse.linuxtools.oprofile.core.XMLProcessor#reset()
+	 */
+	public void reset(Object callData) {
+		_result = INVALID_UNKNOWN;
+	}
+	
+	/**
+	 * @see org.eclipse.linuxtools.oprofile.core.XMLProcessor#endElement(String)
+	 */
+	public void endElement(String name, Object callData) {
+		if (name.equals(_RESULT_TAG)) {
+			if (_characters.equals(_EVENT_OK)) {
+				_result = EVENT_OK;
+			} else if (_characters.equals(_INVALID_EVENT)) {
+					_result = INVALID_EVENT;
+			} else if (_characters.equals(_INVALID_UMASK)) {
+				_result = INVALID_UMASK;
+			} else if (_characters.equals(_INVALID_COUNTER)) {
+				_result = INVALID_COUNTER;
+			}
+		} else if (name.equals(_CHECK_EVENTS_TAG)) {
+			int[] result = (int[]) callData;
+			result[0] = _result;
+		}
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/info/DefaultsProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/info/DefaultsProcessor.java
new file mode 100644
index 0000000..817d842
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/info/DefaultsProcessor.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2004 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.core.opxml.info;
+
+import java.util.HashMap;
+
+import org.eclipse.linuxtools.oprofile.core.daemon.OpInfo;
+import org.eclipse.linuxtools.oprofile.core.opxml.OprofileSAXHandler;
+import org.eclipse.linuxtools.oprofile.core.opxml.XMLProcessor;
+
+/**
+ * XML handler class for opxml's "defaults".
+ * @see org.eclipse.linuxtools.oprofile.core.opxml.OpxmlRunner
+ */
+public class DefaultsProcessor extends XMLProcessor {
+	// XML tags reconize by this processor (public)
+	public static final String SAMPLE_DIR = "sample-dir"; //$NON-NLS-1$
+	public static final String LOCK_FILE = "lock-file"; //$NON-NLS-1$
+	public static final String LOG_FILE = "log-file"; //$NON-NLS-1$
+	public static final String DUMP_STATUS = "dump-status"; //$NON-NLS-1$
+	protected HashMap<String,String> _map = new HashMap<String,String>();
+
+	/**
+	 * @see org.eclipse.linuxtools.oprofile.core.XMLProcessor#reset()
+	 */
+	public void reset(Object callData) {
+		_map.clear();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.oprofile.core.opxml.XMLProcessor#endElement(java.lang.String, java.lang.Object)
+	 */
+	public void endElement(String name, Object callData) {
+		if (name.equals(OpInfoProcessor.DEFAULTS_TAG)) {
+			OpInfo info = (OpInfo) callData;
+			info._setDefaults(_map);
+			OprofileSAXHandler.getInstance(callData).pop(name);
+		} else {
+			_map.put(name, _characters);
+		}
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/info/EventListProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/info/EventListProcessor.java
new file mode 100644
index 0000000..72f5e77
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/info/EventListProcessor.java
@@ -0,0 +1,241 @@
+/*******************************************************************************
+ * Copyright (c) 2004,2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *    Kent Sebastian <ksebasti@redhat.com>
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.core.opxml.info;
+
+import java.util.ArrayList;
+
+import org.eclipse.linuxtools.oprofile.core.daemon.OpEvent;
+import org.eclipse.linuxtools.oprofile.core.daemon.OpUnitMask;
+import org.eclipse.linuxtools.oprofile.core.opxml.OprofileSAXHandler;
+import org.eclipse.linuxtools.oprofile.core.opxml.XMLProcessor;
+import org.xml.sax.Attributes;
+
+
+/**
+ * XML handler class for opxml's "event-list".
+ * @see org.eclipse.linuxtools.oprofile.core.opxml.OpxmlRunner
+ */
+public class EventListProcessor extends XMLProcessor {
+	// The current event being constructed
+	private OpEvent _currentEvent;
+	private int _counter;
+	private ArrayList<OpEvent> _currentEventList;
+	
+	// An XML processor for reading the unit mask information for an event
+	private UnitMaskProcessor _umProcessor;
+	
+	// XML elements recognized by this processor
+	private static final String _EVENT_TAG = "event"; //$NON-NLS-1$
+	private static final String _UNIT_MASK_TAG = "unit-mask"; //$NON-NLS-1$
+	private static final String _NAME_TAG = "name"; //$NON-NLS-1$
+	private static final String _VALUE_TAG = "value"; //$NON-NLS-1$
+	private static final String _DESCRIPTION_TAG = "description"; //$NON-NLS-1$
+	private static final String _MASK_TAG = "mask"; //$NON-NLS-1$
+	private static final String _MINIMUM_COUNT_TAG = "minimum"; //$NON-NLS-1$
+	private static final String _ATTR_EVENT_LIST_COUNTER = "counter"; //$NON-NLS-1$
+	
+	// This is a special processor which is used to deal with a single mask value
+	private class MaskProcessor extends XMLProcessor {
+		private OpUnitMask.MaskInfo _info;
+		
+		/**
+		 * @see org.eclipse.linuxtools.oprofile.core.XMLProcessor#reset()
+		 */
+		public void reset(Object callData) {
+			_info = new OpUnitMask.MaskInfo();
+		}
+		
+		/**
+		 * @see org.eclipse.linuxtools.oprofile.core.XMLProcessor#endElement(String)
+		 */
+		public void endElement(String name, Object callData) {
+			if (name.equals(_VALUE_TAG)) {
+				// Set mask's value
+				_info.value = Integer.parseInt(_characters);
+			} else if (name.equals(_DESCRIPTION_TAG)) {
+				_info.description = _characters;
+			} else if (name.equals(_MASK_TAG)) {
+				// Pop and pass mask tag to previous processor (UnitMaskProcessor)
+				OprofileSAXHandler.getInstance(callData).pop(_MASK_TAG);
+			}
+		}
+
+		/**
+		 * Returns the information that has been collected about a mask.
+		 * @return the mask information
+		 */
+		public OpUnitMask.MaskInfo getResult() {
+			return _info;
+		}
+	}
+	
+	// This is a special processor to handle unit mask information
+	private class UnitMaskProcessor extends XMLProcessor {
+		// An ArrayList to hold all the valid masks for a unit mask.
+		private ArrayList<OpUnitMask.MaskInfo> _masks;
+		
+		// The unit mask being constructed
+		private OpUnitMask _unitMask;
+		
+		// An XML processor for each individual mask value.
+		private MaskProcessor _maskProcessor;
+		
+		// XML elements recognized by this processor
+		private static final String _MASK_TYPE_TAG = "type"; //$NON-NLS-1$
+		private static final String _MASK_DEFAULT_TAG = "default"; //$NON-NLS-1$
+		private static final String _MASK_TYPE_BITMASK = "bitmask"; //$NON-NLS-1$
+		private static final String _MASK_TYPE_MANDATORY = "mandatory"; //$NON-NLS-1$
+		private static final String _MASK_TYPE_EXCLUSIVE = "exclusive"; //$NON-NLS-1$
+		
+		/**
+		 * Constructor for UnitMaskProcessor. Initializes internal state.
+		 */
+		public UnitMaskProcessor() {
+			super();
+			_maskProcessor = new MaskProcessor();
+			_masks = new ArrayList<OpUnitMask.MaskInfo>();
+		}
+		
+		/**
+		 * @see org.eclipse.linuxtools.oprofile.core.XMLProcessor#reset()
+		 */
+		public void reset(Object callData) {
+			_unitMask = new OpUnitMask();
+			_masks.clear();
+		}
+		
+		/**
+		 * @see org.eclipse.linuxtools.oprofile.core.XMLProcessor#startElement(String, Attributes)
+		 */
+		public void startElement(String name, Attributes attrs, Object callData) {
+			if (name.equals(_MASK_TAG)) {
+				// Tell SAX handler to use the mask processor
+				OprofileSAXHandler.getInstance(callData).push(_maskProcessor);
+			} else {
+				super.startElement(name, attrs, callData);
+			}
+		}
+		
+		/**
+		 * @see org.eclipse.linuxtools.oprofile.core.XMLProcessor#endElement(String)
+		 */
+		public void endElement(String name, Object callData) {
+			if (name.equals(_MASK_TYPE_TAG)) {
+				// Set the mask type
+				_unitMask._setType(_getTypeFromString(_characters));
+			} else if (name.equals(_MASK_DEFAULT_TAG)) {
+				// Set the default mask
+				_unitMask._setDefault(Integer.parseInt(_characters));
+			} else if (name.equals(_MASK_TAG)) {
+				// Add this mask description to the list of all masks
+				_masks.add(_maskProcessor.getResult());
+			} else if (name.equals(_UNIT_MASK_TAG)) {
+				// All done. Add the known masks to the unit mask
+				OpUnitMask.MaskInfo[] descs = new OpUnitMask.MaskInfo[_masks.size()];
+				_masks.toArray(descs);
+				_unitMask._setMaskDescriptions(descs);
+				
+				// Pop this processor and pass _UNIT_MASK_TAG to previoius processor
+				OprofileSAXHandler.getInstance(callData).pop(_UNIT_MASK_TAG);
+			}
+		}
+				
+		/**
+		 * Returns the constructed unit mask.
+		 * @return the unit mask
+		 */
+		public OpUnitMask getResult() {
+			return _unitMask;
+		}
+		
+		// Converts a string representing a mask type into an integer
+		private int _getTypeFromString(String string) {
+			if (string.equals(_MASK_TYPE_MANDATORY)) {
+				return OpUnitMask.MANDATORY;
+			} else if (string.equals(_MASK_TYPE_BITMASK)) {
+				return OpUnitMask.BITMASK;
+			} else if (string.equals(_MASK_TYPE_EXCLUSIVE)) {
+				return OpUnitMask.EXCLUSIVE;
+			}
+
+			return -1;
+		}
+	};
+	
+	/**
+	 * Constructor for EventListProcessor. Initializes internal state.
+	 */
+	public EventListProcessor() {
+		super();
+		_umProcessor = new UnitMaskProcessor();
+	}
+	
+	@Override
+	public void reset(Object callData) {
+		_currentEventList = new ArrayList<OpEvent>();
+	}
+	
+	/**
+	 * @see org.eclipse.linuxtools.oprofile.core.XMLProcessor#startElement(String, Attributes)
+	 */
+	public void startElement(String name, Attributes attrs, Object callData) {
+		if (name.equals(_EVENT_TAG)) {
+			// new event
+			_currentEvent = new OpEvent();
+		} else if (name.equals(_UNIT_MASK_TAG)) {
+			// Tell the SAX handler to use the unit mask processor
+			OprofileSAXHandler.getInstance(callData).push(_umProcessor);
+		} else if (name.equals(OpInfoProcessor.EVENT_LIST_TAG)) {
+			// Our start tag: grab the counter number from the attributes
+			_counter = Integer.parseInt(attrs.getValue(_ATTR_EVENT_LIST_COUNTER));
+		} else {
+			super.startElement(name, attrs, callData);
+		}
+	}
+	
+	/**
+	 * @see org.eclipse.linuxtools.oprofile.core.XMLProcessor#endElement(String)
+	 */
+	public void endElement(String name, Object callData) {
+		if (name.equals(_EVENT_TAG)) {
+			// Finished constructing an event. Add it to the list.
+			_currentEventList.add(_currentEvent);
+		} else if (name.equals(_UNIT_MASK_TAG)) {
+			// Set the event's unit mask
+			_currentEvent._setUnitMask(_umProcessor.getResult());
+		} else if (name.equals(_NAME_TAG)) {
+			// Set event's name
+			_currentEvent._setText(_characters);
+		} else if (name.equals(_VALUE_TAG)) {
+			// Set event's value
+			_currentEvent._setNumber(Integer.parseInt(_characters));
+		} else if (name.equals(_DESCRIPTION_TAG)) {
+			// Set event's description
+			_currentEvent._setTextDescription(_characters);
+		} else if (name.equals(_MINIMUM_COUNT_TAG)) {
+			// Set event's minimum count
+			_currentEvent._setMinCount(Integer.parseInt(_characters));
+		} else if (name.equals(OpInfoProcessor.EVENT_LIST_TAG)) {
+			OprofileSAXHandler.getInstance(callData).pop(name);
+		}
+	}
+	
+	public int getCounterNum() {
+		return _counter;
+	}
+	
+	public OpEvent[] getEvents() {
+		OpEvent[] events = new OpEvent[_currentEventList.size()];
+		_currentEventList.toArray(events);
+		return events;
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/info/OpInfoProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/info/OpInfoProcessor.java
new file mode 100644
index 0000000..ef0b8ea
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/info/OpInfoProcessor.java
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2004,2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *    Kent Sebastian <ksebasti@redhat.com>
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.core.opxml.info;
+
+import org.eclipse.linuxtools.oprofile.core.daemon.OpInfo;
+import org.eclipse.linuxtools.oprofile.core.opxml.OprofileSAXHandler;
+import org.eclipse.linuxtools.oprofile.core.opxml.XMLProcessor;
+import org.xml.sax.Attributes;
+
+
+/**
+ * Opxml processor for the "info" command.
+ * @see org.eclipse.linuxtools.oprofile.core.opxml.OpxmlRunner
+ */
+public class OpInfoProcessor extends XMLProcessor {
+	// Other XMLProcessors used by this processor
+	private DefaultsProcessor _defaultsProc;
+	private EventListProcessor _eventListProc;
+	
+	// XML tags processed by this processor
+	public static final String NUM_COUNTERS_TAG = "num-counters"; //$NON-NLS-1$
+	public static final String DEFAULTS_TAG = "defaults"; //$NON-NLS-1$
+	public static final String EVENT_LIST_TAG = "event-list"; //$NON-NLS-1$
+	public static final String CPU_FREQUENCY_TAG = "cpu-frequency"; //$NON-NLS-1$
+	public static final String TIMER_MODE = "timer-mode";  //$NON-NLS-1$
+
+	public OpInfoProcessor() {
+		_defaultsProc = new DefaultsProcessor();
+		_eventListProc = new EventListProcessor();
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.oprofile.core.opxml.XMLProcessor#startElement(java.lang.String, org.xml.sax.Attributes, java.lang.Object)
+	 */
+	public void startElement(String name, Attributes attrs, Object callData) {
+		if (name.equals(DEFAULTS_TAG)) {
+			OprofileSAXHandler.getInstance(callData).push(_defaultsProc);
+		} else if (name.equals(EVENT_LIST_TAG)) {
+			OprofileSAXHandler.getInstance(callData).push(_eventListProc);
+			_eventListProc.startElement(name, attrs, callData);
+		} else {
+			super.startElement(name, attrs, callData);
+		}
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.oprofile.core.opxml.XMLProcessor#endElement(java.lang.String, java.lang.Object)
+	 */
+	public void endElement(String name, Object callData) {
+		if (name.equals(CPU_FREQUENCY_TAG)) {
+			double speed = Double.parseDouble(_characters);
+			OpInfo info = (OpInfo) callData;
+			info._setCPUSpeed(speed);
+		} else if (name.equals(TIMER_MODE)) {
+			boolean timerMode = Boolean.parseBoolean(_characters);
+			OpInfo info = (OpInfo) callData;
+			info._setTimerMode(timerMode);
+		} else if (name.equals(NUM_COUNTERS_TAG)) {
+			int numCounters = 0;
+			try {
+				numCounters = Integer.parseInt(_characters);
+			} catch (NumberFormatException nfe) {
+			}
+			OpInfo info = (OpInfo) callData;
+			info._setNrCounters(numCounters);
+		} else if (name.equals(EVENT_LIST_TAG)) {
+			OpInfo info = (OpInfo) callData;
+			info._setEvents(_eventListProc.getCounterNum(), _eventListProc.getEvents());
+		}
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/modeldata/DependentProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/modeldata/DependentProcessor.java
new file mode 100644
index 0000000..44b4149
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/modeldata/DependentProcessor.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.core.opxml.modeldata;
+
+import java.util.ArrayList;
+
+import org.eclipse.linuxtools.oprofile.core.model.OpModelImage;
+import org.eclipse.linuxtools.oprofile.core.opxml.OprofileSAXHandler;
+import org.eclipse.linuxtools.oprofile.core.opxml.XMLProcessor;
+import org.xml.sax.Attributes;
+
+
+/**
+ * XML handler class for dependent images (<image> tags under <dependent>)
+ */
+public class DependentProcessor extends XMLProcessor {
+	//XML tags parsed by this processor
+	private static final String IMAGE_TAG = "image"; //$NON-NLS-1$
+	private static final String SYMBOLS_TAG = "symbols"; //$NON-NLS-1$
+	private static final String DEPENDENT_TAG = "dependent"; //$NON-NLS-1$
+	
+	//attribute tags
+	private static final String ATTR_IMAGENAME = "name"; //$NON-NLS-1$
+	private static final String ATTR_COUNT = "count"; //$NON-NLS-1$
+
+	//the current image being constructed
+	private OpModelImage _image;
+	//a list of all the dependent images
+	private ArrayList<OpModelImage> _imageList;
+
+	//processor used for symbols of an image
+	private SymbolsProcessor _symbolsProcessor = new SymbolsProcessor();
+
+	public void reset(Object callData) {
+		_image = new OpModelImage();
+		_imageList = new ArrayList<OpModelImage>();
+	}
+
+	public void startElement(String name, Attributes attrs, Object callData) {
+		if (name.equals(IMAGE_TAG)) {
+			_image._setName(valid_string(attrs.getValue(ATTR_IMAGENAME)));
+			_image._setCount(Integer.parseInt(attrs.getValue(ATTR_COUNT)));
+		} else if (name.equals(SYMBOLS_TAG)) {
+			OprofileSAXHandler.getInstance(callData).push(_symbolsProcessor);
+		}
+	}
+	/**
+	 * @see org.eclipse.linuxtools.oprofile.core.XMLProcessor#endElement(String)
+	 */
+	public void endElement(String name, Object callData) {
+		if (name.equals(IMAGE_TAG)) {
+			_imageList.add(_image);
+			_image = new OpModelImage();
+		} else if (name.equals(SYMBOLS_TAG)) {
+			_image._setSymbols(_symbolsProcessor.getSymbols());
+		} else if (name.equals(DEPENDENT_TAG)) {
+			OprofileSAXHandler.getInstance(callData).pop(DEPENDENT_TAG);
+		}
+	}
+	
+	public OpModelImage[] getImages() {
+		OpModelImage[] images = new OpModelImage[_imageList.size()];
+		_imageList.toArray(images);
+		return images;
+	}
+
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/modeldata/ModelDataProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/modeldata/ModelDataProcessor.java
new file mode 100644
index 0000000..c625f44
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/modeldata/ModelDataProcessor.java
@@ -0,0 +1,92 @@
+/*******************************************************************************
+ * Copyright (c) 2004,2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *    Kent Sebastian <ksebasti@redhat.com> - 
+ *******************************************************************************/ 
+
+package org.eclipse.linuxtools.oprofile.core.opxml.modeldata;
+
+import org.eclipse.linuxtools.oprofile.core.model.OpModelImage;
+import org.eclipse.linuxtools.oprofile.core.opxml.OprofileSAXHandler;
+import org.eclipse.linuxtools.oprofile.core.opxml.XMLProcessor;
+import org.xml.sax.Attributes;
+
+
+/**
+ * A processor for `opxml samples`.
+ */
+public class ModelDataProcessor extends XMLProcessor {
+	//The resulting image compiled by the processor to be used by the caller.
+	public static class CallData {
+		public OpModelImage image;
+		public CallData(OpModelImage im) { image = im; }
+	}
+
+	//XML tags parsed by this processor
+	private static final String IMAGE_TAG = "image"; //$NON-NLS-1$
+	private static final String SYMBOLS_TAG = "symbols"; //$NON-NLS-1$
+	private static final String DEPENDENT_TAG = "dependent"; //$NON-NLS-1$
+	
+	//attribute tags
+	private static final String ATTR_IMAGENAME = "name"; //$NON-NLS-1$
+	private static final String ATTR_COUNT = "count"; //$NON-NLS-1$
+	private static final String ATTR_DEPCOUNT = "count"; //$NON-NLS-1$
+	
+	//the current image being constructed
+	private OpModelImage _image;
+	private int img_seen;	//for ensuring image singleton-ness
+
+	//processors used for symbols and dependent images
+	private SymbolsProcessor _symbolsProcessor = new SymbolsProcessor();
+	private DependentProcessor _dependentProcessor = new DependentProcessor();
+	
+	
+	public void reset(Object callData) {
+		_image = ((CallData) callData).image;
+		img_seen = 0;
+	}
+
+	public void startElement(String name, Attributes attrs, Object callData) {
+		if (name.equals(IMAGE_TAG)) {
+			if (img_seen == 0) {
+				_image._setName(valid_string(attrs.getValue(ATTR_IMAGENAME)));
+				_image._setCount(Integer.parseInt(attrs.getValue(ATTR_COUNT)));
+			}
+
+			img_seen++;
+		} else if (name.equals(SYMBOLS_TAG)) {
+			OprofileSAXHandler.getInstance(callData).push(_symbolsProcessor);
+		} else if (name.equals(DEPENDENT_TAG)) {
+			_image._setDepCount(Integer.parseInt(attrs.getValue(ATTR_DEPCOUNT)));
+			OprofileSAXHandler.getInstance(callData).push(_dependentProcessor);
+		} else {
+			super.startElement(name, attrs, callData);
+		}
+	}
+	
+	public void endElement(String name, Object callData) {
+		if (name.equals(IMAGE_TAG)) {
+			if (img_seen > 1) {
+				//should only ever be one image, otherwise oprofile was run
+				// outside of eclipse and the ui would not handle it properly
+				_image._setCount(OpModelImage.IMAGE_PARSE_ERROR);
+				_image._setDepCount(0);
+				_image._setDependents(null);
+				_image._setSymbols(null);
+				_image._setName(""); //$NON-NLS-1$				
+			}
+		} else if (name.equals(SYMBOLS_TAG)){
+			_image._setSymbols(_symbolsProcessor.getSymbols());
+		} else if (name.equals(DEPENDENT_TAG)){
+			_image._setDependents(_dependentProcessor.getImages());
+		} else {
+			super.endElement(name, callData);
+		}
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/modeldata/SamplesProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/modeldata/SamplesProcessor.java
new file mode 100644
index 0000000..253c50b
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/modeldata/SamplesProcessor.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *      - Note: the original SamplesProcessor class was removed, this is a new 
+ *        implementation 
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.core.opxml.modeldata;
+
+import java.util.ArrayList;
+
+import org.eclipse.linuxtools.oprofile.core.model.OpModelSample;
+import org.eclipse.linuxtools.oprofile.core.opxml.OprofileSAXHandler;
+import org.eclipse.linuxtools.oprofile.core.opxml.XMLProcessor;
+
+
+/**
+ * XML handler class for <sample> tags (individual samples).
+ */
+public class SamplesProcessor extends XMLProcessor {
+	//XML tags parsed by this processor
+	private static final String SAMPLE_TAG = "sample"; //$NON-NLS-1$
+	private static final String COUNT_TAG = "count"; //$NON-NLS-1$
+	private static final String LINE_TAG = "line";  //$NON-NLS-1$
+	private static final String SYMBOL_TAG = "symbol";  //$NON-NLS-1$
+	
+	//the current sample being constructed
+	private OpModelSample _sample;
+	//a list of all samples (for this symbol)
+	private ArrayList<OpModelSample> _sampleList;
+
+	public void reset(Object callData) {
+		_sample = new OpModelSample();
+		_sampleList = new ArrayList<OpModelSample>();
+	}
+
+	/**
+	 * @see org.eclipse.linuxtools.oprofile.core.XMLProcessor#endElement(String)
+	 */
+	public void endElement(String name, Object callData) {
+		if (name.equals(COUNT_TAG)) {
+			_sample._setCount(Integer.parseInt(_characters));
+		} else if (name.equals(LINE_TAG)) {
+			_sample._setLine(Integer.parseInt(_characters));
+		} else if (name.equals(SAMPLE_TAG)) {
+			_sampleList.add(_sample);
+			_sample = new OpModelSample();
+		} else if (name.equals(SYMBOL_TAG)) {
+			OprofileSAXHandler.getInstance(callData).pop(SYMBOL_TAG);
+		}
+	}
+	
+	public OpModelSample[] getSamples() {
+		OpModelSample[] samples = new OpModelSample[_sampleList.size()];
+		_sampleList.toArray(samples);
+		return samples;
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/modeldata/SymbolsProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/modeldata/SymbolsProcessor.java
new file mode 100644
index 0000000..353f3e7
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/modeldata/SymbolsProcessor.java
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.core.opxml.modeldata;
+
+import java.util.ArrayList;
+
+import org.eclipse.linuxtools.oprofile.core.model.OpModelSymbol;
+import org.eclipse.linuxtools.oprofile.core.opxml.OprofileSAXHandler;
+import org.eclipse.linuxtools.oprofile.core.opxml.XMLProcessor;
+import org.xml.sax.Attributes;
+
+/**
+ * A processor for the <symbols> tag from `opxml samples ..`
+ */
+public class SymbolsProcessor extends XMLProcessor {
+	//XML tags parsed by this processor
+	private static final String SYMBOLS_TAG = "symbols"; //$NON-NLS-1$
+	private static final String SYMBOL_TAG = "symbol";  //$NON-NLS-1$
+	private static final String SAMPLE_TAG = "sample"; //$NON-NLS-1$
+
+	//attribute tags
+	private static final String ATTR_NAME = "name"; //$NON-NLS-1$
+	private static final String ATTR_FILE = "file"; //$NON-NLS-1$
+	private static final String ATTR_COUNT = "count";	 //$NON-NLS-1$
+	
+	//the current symbol being constructed
+	private OpModelSymbol _symbol;
+	//all the symbols in this <symbols> tag, to be returned to the calling ModelDataProcessor
+	private ArrayList<OpModelSymbol> _symbols;
+	
+	//the processor used for individual samples
+	private SamplesProcessor _samplesProcessor = new SamplesProcessor();
+	
+	
+	public void reset(Object callData) {
+		_symbol = new OpModelSymbol();
+		_symbols = new ArrayList<OpModelSymbol>();
+	}
+
+	/**
+	 * @see org.eclipse.linuxtools.oprofile.core.XMLProcessor#startElement(String, Attributes)
+	 */
+	public void startElement(String name, Attributes attrs, Object callData) {
+		if (name.equals(SYMBOL_TAG)) {
+			_symbol._setName(valid_string(attrs.getValue(ATTR_NAME)));
+			_symbol._setCount(Integer.parseInt(attrs.getValue(ATTR_COUNT)));
+			_symbol._setFile(valid_string(attrs.getValue(ATTR_FILE)));
+		} else if (name.equals(SAMPLE_TAG)) {
+			OprofileSAXHandler.getInstance(callData).push(_samplesProcessor);
+		}
+	}
+	
+	/**
+	 * @see org.eclipse.linuxtools.oprofile.core.XMLProcessor#endElement(String)
+	 */
+	public void endElement(String name, Object callData) {
+		if (name.equals(SYMBOL_TAG)) {
+			_symbol._setSamples(_samplesProcessor.getSamples());
+			_symbols.add(_symbol);
+			_symbol = new OpModelSymbol();
+		} else if (name.equals(SYMBOLS_TAG)) {
+			OprofileSAXHandler.getInstance(callData).pop(SYMBOLS_TAG);
+		}
+	}
+	
+	//return all parsed samples
+	public OpModelSymbol[] getSymbols() {
+		OpModelSymbol [] symbols = new OpModelSymbol[_symbols.size()];
+		_symbols.toArray(symbols);
+		return symbols;
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/sessions/SessionsProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/sessions/SessionsProcessor.java
new file mode 100644
index 0000000..a8144bd
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/sessions/SessionsProcessor.java
@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * Copyright (c) 2004 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.core.opxml.sessions;
+
+import java.util.ArrayList;
+
+import org.eclipse.linuxtools.oprofile.core.model.OpModelEvent;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelSession;
+import org.eclipse.linuxtools.oprofile.core.opxml.XMLProcessor;
+import org.xml.sax.Attributes;
+
+
+/**
+ * A processor for sessions.
+ * @see org.eclipse.linuxtools.oprofile.core.opxml.OpxmlRunner
+ */
+public class SessionsProcessor extends XMLProcessor {
+	public static class SessionInfo {
+		// A list of SessionEvents
+		public ArrayList<OpModelEvent> list;
+		
+		public SessionInfo(ArrayList<OpModelEvent> _list){
+			list = _list;
+		}
+	};
+	
+	// XML tags recognized by this processor
+	public static final String SESSION_TAG = "session"; //$NON-NLS-1$
+	private static final String _SESSION_NAME_ATTR = "name"; //$NON-NLS-1$
+	public static final String SAMPLE_COUNT_TAG = "count"; //$NON-NLS-1$
+	public static final String EVENT_TAG = "event"; //$NON-NLS-1$
+	private static final String _EVENT_NAME_ATTR = "name"; //$NON-NLS-1$
+	
+	// The current session being constructed
+	private OpModelSession _currentSession;
+	
+	// The current event being constructed
+	private OpModelEvent _currentEvent;
+	
+	// A list of all sessions
+	private ArrayList<OpModelSession> _sessionList;
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.oprofile.core.opxml.XMLProcessor#startElement(java.lang.String, org.xml.sax.Attributes, java.lang.Object)
+	 */
+	public void startElement(String name, Attributes attrs, Object callData) {
+		if (name.equals(SESSION_TAG)) {
+			String sessionName = valid_string(attrs.getValue(_SESSION_NAME_ATTR));
+			_currentSession = new OpModelSession(_currentEvent, sessionName);
+		} else if (name.equals(EVENT_TAG)) {
+			String eventName = attrs.getValue(_EVENT_NAME_ATTR);
+			_currentEvent = new OpModelEvent(eventName);
+			_sessionList = new ArrayList<OpModelSession>();
+		} else {
+			super.startElement(name, attrs, callData);
+		}
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.oprofile.core.opxml.XMLProcessor#endElement(java.lang.String, java.lang.Object)
+	 */
+	public void endElement(String name, Object callData) {
+		if (name.equals(SESSION_TAG)) {
+			// Got end of session -- save in session list
+			_sessionList.add(_currentSession);
+			_currentSession = null;
+		} else if (name.equals(EVENT_TAG)) {
+			// Got end of event -- save session list into current OpModelEvent and
+			// save current event into call data
+			OpModelSession[] s = new OpModelSession[_sessionList.size()];
+			_sessionList.toArray(s);
+			_currentEvent._setSessions(s);
+			SessionInfo info = (SessionInfo) callData;
+			info.list.add(_currentEvent);
+			_currentEvent = null;
+			_sessionList = null;
+		} else {
+			super.endElement(name, callData);
+		}
+	}
+}
diff --git a/profiling/.classpath b/oprofile/org.eclipse.linuxtools.oprofile.doc/.classpath
similarity index 100%
copy from profiling/.classpath
copy to oprofile/org.eclipse.linuxtools.oprofile.doc/.classpath
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/.project b/oprofile/org.eclipse.linuxtools.oprofile.doc/.project
new file mode 100644
index 0000000..9df5409
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.oprofile.doc</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/.settings/org.eclipse.jdt.core.prefs b/oprofile/org.eclipse.linuxtools.oprofile.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..0d47615
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Tue Apr 14 09:48:05 EDT 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/ChangeLog b/oprofile/org.eclipse.linuxtools.oprofile.doc/ChangeLog
new file mode 100644
index 0000000..e817cab
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/ChangeLog
@@ -0,0 +1,44 @@
+2009-04-15  Andrew Overholt  <overholt@redhat.com>
+
+	* doc/notices.html: Use copyright symbol.
+
+2009-04-15  Andrew Overholt  <overholt@redhat.com>
+
+	* build-helper.xml: Add comment about checking WikiText out into your workspace.
+
+2009-04-14  Andrew Overholt  <overholt@redhat.com>
+
+	* build-helper.xml: Get rid of Phoenix extension (to have common side navigation
+	bar) in resulting HTML.
+
+2009-04-14  Andrew Overholt  <overholt@redhat.com>
+
+	* userguide/OProfile Reference.html: Newly-generated to include image.
+	* userguide/images/LinuxTools-0.2.0-OProfile-Screenshot.png: Initial checkin.
+
+2009-04-14  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add .qualifier.  Set bundle localization.
+	* plugin.xml: Set id on toc extension.  Add generated toc.
+	* toc.xml: Get rid of extraneous stuff.  We can re-add if we feel we need it.
+
+2009-04-14  Andrew Overholt  <overholt@redhat.com>
+
+	* about.html: Initial checkin.
+	* build-helper.xml: Likewise.
+	* build.properties: Likewise.
+	* ChangeLog: Likewise.
+	* .classpath: Likewise.
+	* doc/notices.html: Likewise.
+	* extract-markup.xsl: Likewise.
+	* META-INF/MANIFEST.MF: Likewise.
+	* plugin.properties: Likewise.
+	* plugin.xml: Likewise.
+	* .project: Likewise.
+	* .settings/org.eclipse.jdt.core.prefs: Likewise.
+	* src/org/eclipse/linuxtools/internal/oprofile/doc/anttask/MediaWikiImageFetcher.java: Likewise.
+	* src/org/eclipse/linuxtools/internal/oprofile/doc/anttask/tasks.properties: Likewise.
+	* toc.xml: Likewise.
+	* userguide/OProfile Reference.html: Likewise.
+	* userguide/OProfile Reference-toc.xml: Likewise.
+	* userguide/Updating-This-Document.html: Likewise.
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/META-INF/MANIFEST.MF b/oprofile/org.eclipse.linuxtools.oprofile.doc/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..95e77eb
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.linuxtools.oprofile.doc; singleton:=true
+Bundle-Version: 0.3.0.qualifier
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %Bundle-Vendor
+Require-Bundle: org.apache.ant;bundle-version="1.7.0";resolution:=optional,
+ org.eclipse.help
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Localization: plugin
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/about.html b/oprofile/org.eclipse.linuxtools.oprofile.doc/about.html
new file mode 100644
index 0000000..0c6525d
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>24th October, 2008</p>	
+<h3>License</h3>
+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<h3>Contributions</h3>
+
+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise
+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such
+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
+
+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or
+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the
+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/build-helper.xml b/oprofile/org.eclipse.linuxtools.oprofile.doc/build-helper.xml
new file mode 100644
index 0000000..1da04de
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/build-helper.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="org.eclipse.linuxtools.oprofile.doc" default="all">
+	<description>
+            Generate Eclipse help content for the Linux Tools OProfile user guide
+    </description>
+
+	<property name="oprofile.help.doc.url.base" value="http://wiki.eclipse.org"/>
+	<property name="oprofile.wiki.url.base" value="${oprofile.help.doc.url.base}/Linux_Tools_Project/OProfile"/>
+	<property name="imageFolder" value="images"/>
+
+	<path id="tasks.classpath" path="bin"/>
+
+	<!-- See the paths below?
+	     Check org.eclipse.mylyn.wikitext.{core,mediawiki.core} into your workspace
+	     from Mylyn CVS (under tools project in eclipse.org CVS)
+	  -->
+
+	<path id="wikitext.tasks.classpath">
+		<pathelement location="../org.eclipse.mylyn.wikitext.core/@dot"/>
+		<pathelement location="../org.eclipse.mylyn.wikitext.core/bin"/>
+		<pathelement location="../org.eclipse.mylyn.wikitext.mediawiki.core/@dot"/>
+		<pathelement location="../org.eclipse.mylyn.wikitext.mediawiki.core/bin"/>
+	</path>
+
+	<taskdef classpathref="tasks.classpath" resource="org/eclipse/linuxtools/internal/oprofile/doc/anttask/tasks.properties"/>
+	<taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/util/anttask/tasks.properties"/>
+
+	<target name="init">
+		<mkdir dir="tmp"/>
+	</target>
+
+	<target name="clean" depends="init">
+		<delete includeemptydirs="true" failonerror="false">
+			<fileset dir="tmp"/>
+		</delete>
+	</target>
+
+	<target name="all" depends="init" description="Generate Eclipse help content for the Linux Tools OProfile user guide">
+		<eclipse-wiki-to-help
+        	help.doc.filenamenoextension="OProfile Reference"
+        	help.doc.url.base="${oprofile.help.doc.url.base}"
+        	help.doc.url.html="${oprofile.wiki.url.base}/User_Guide"
+        	help.doc.url.xml="${oprofile.help.doc.url.base}/Special:Export/Linux_Tools_Project/OProfile/User_Guide"
+        	help.imagefolder="${imageFolder}"
+        	targetfolder="userguide"
+        	wiki.url.base="${oprofile.help.doc.url.base}/Linux_Tools_Project"/>
+	</target>
+
+	<macrodef name="eclipse-wiki-to-help">
+		<attribute name="help.doc.url.base"/>
+		<attribute name="wiki.url.base"/>
+		<attribute name="help.doc.url.html"/>
+		<attribute name="help.doc.url.xml"/>
+		<attribute name="help.doc.filenameNoExtension"/>
+		<attribute name="help.imageFolder"/>
+		<attribute name="targetFolder"/>
+		<sequential>
+			<get dest="tmp/help.doc.xml" src="@{help.doc.url.xml}"/>
+			<get dest="tmp/help.doc.html" src="@{help.doc.url.html}"/>
+
+			<!--
+	    	<copy todir="tmp">
+	    		<fileset dir="images"/>
+	    	</copy>
+	    	-->
+			<mediawiki-fetch-images src="tmp/help.doc.html" dest="tmp" base="@{help.doc.url.base}"/>
+
+			<xslt style="extract-markup.xsl" in="tmp/help.doc.xml" out="tmp/@{help.doc.filenameNoExtension}.mediawiki"/>
+			<echo append="true" file="tmp/@{help.doc.filenameNoExtension}.mediawiki">
+
+= Updating This Document =
+
+This document is maintained in a collaborative wiki.  If you wish to update or modify this document please visit 
+@{help.doc.url.html}
+			</echo>
+
+			<!-- Removing Phoenix extensions -->
+			<replaceregexp match="\{\{\#eclipseproject.*" replace="" flags="g" byline="true">
+				<fileset dir="tmp" includes="**/*.mediawiki"/>
+			</replaceregexp>
+
+			<wikitext-to-eclipse-help markupLanguage="org.eclipse.mylyn.wikitext.mediawiki.core.MediaWikiLanguage" 
+				multipleOutputFiles="true"
+				navigationImages="true"
+				helpPrefix="@{targetFolder}"
+				internallinkpattern="@{wiki.url.base}/{0}"
+				validate="true"
+				failonvalidationerror="true"
+				prependImagePrefix="${imageFolder}"
+				formatoutput="true">
+				<fileset dir="tmp" includes="**/*.mediawiki"/>
+				<stylesheet url="book.css"/>
+			</wikitext-to-eclipse-help>
+			
+			<wikitext-to-docbook markupLanguage="org.eclipse.mylyn.wikitext.mediawiki.core.MediaWikiLanguage" 
+				internallinkpattern="@{wiki.url.base}/{0}"
+				validate="true"
+				failonvalidationerror="true"
+				overwrite="true">
+				<fileset dir="tmp" includes="**/*.mediawiki"/>
+			</wikitext-to-docbook>
+
+			<mkdir dir="@{targetFolder}/${imageFolder}"/>
+			<copy todir="@{targetFolder}/${imageFolder}" overwrite="true">
+				<fileset dir="tmp">
+					<include name="*.gif"/>
+					<include name="*.png"/>
+				</fileset>
+			</copy>
+			<copy todir="@{targetFolder}" overwrite="true">
+				<fileset dir="tmp">
+					<include name="*.html"/>
+					<include name="*.xml"/>
+					<exclude name="help.doc.html"/>
+					<exclude name="help.doc.xml"/>
+				</fileset>
+			</copy>
+			<antcall target="test"/>
+		</sequential>
+	</macrodef>
+
+
+	<target name="test" depends="init" description="verify that all of the HTML files are well-formed XML">
+		<echo level="info">
+Validating help content XML and HTML files: The Eclipse help system expects well-formed XML
+			
+If validation fails it is because either:
+			
+* the userguide source code is poorly formed, or
+* the WikiText MediaWiki parser has a bug
+			
+Problems with userguide source are usually caused by improper use of HTML markup in the MediaWiki source,
+or inadvertently starting a line with a space character (in MediaWiki this starts a preformatted block)
+		</echo>
+
+		<!-- 
+		Don't bother with DTD validation: we only care if the files are well-formed.
+		We therefore provide an empty DTD 
+		-->
+		<echo file="tmp/__empty.dtd" message=""/>
+		<xmlvalidate lenient="true">
+			<fileset dir="userguide">
+				<include name="**/*.xml"/>
+			</fileset>
+			<fileset dir="userguide">
+				<include name="**/*.html"/>
+			</fileset>
+			<dtd publicid="-//W3C//DTD XHTML 1.0 Transitional//EN" location="${basedir}/tmp/__empty.dtd"/>
+		</xmlvalidate>
+	</target>
+</project>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/build.properties b/oprofile/org.eclipse.linuxtools.oprofile.doc/build.properties
new file mode 100644
index 0000000..bcf97c0
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/build.properties
@@ -0,0 +1,19 @@
+source.. = src/
+output.. = bin/
+bin.includes = plugin.xml,\
+               META-INF/,\
+               .,\
+               doc/,\
+               userguide/,\
+               toc.xml,\
+               plugin.properties,\
+               about.html
+src.includes = userguide/,\
+               toc.xml,\
+               src/,\
+               plugin.xml,\
+               plugin.properties,\
+               doc/,\
+               about.html,\
+               META-INF/
+individualSourceBundles=true
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/doc/notices.html b/oprofile/org.eclipse.linuxtools.oprofile.doc/doc/notices.html
new file mode 100644
index 0000000..dd6688f
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/doc/notices.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+
+<meta name="copyright" content="&#169; Copyright 2009 Eclipse Linux Tools project committers and others. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+
+   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+   <LINK REL="STYLESHEET" HREF="book.css" CHARSET="ISO-8859-1" TYPE="text/css">
+   <title>Legal Notices</title>
+</head>
+<body>
+
+<h3>
+<a NAME="Notices"></a>Notices</h3>
+<p>
+The material in this guide is &#169; Copyright 2009 Eclipse Linux Tools project committers and others.
+</p>
+<p>
+<a href="../about.html">Terms and conditions regarding the use of this guide.</a>
+</p>
+</body>
+</html>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/extract-markup.xsl b/oprofile/org.eclipse.linuxtools.oprofile.doc/extract-markup.xsl
new file mode 100644
index 0000000..4c4e731
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/extract-markup.xsl
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:mw="http://www.mediawiki.org/xml/export-0.3/">
+	<xsl:output  method="text"/>
+	
+	<xsl:template match="/">
+		<xsl:value-of select="//mw:text"/>
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/plugin.properties b/oprofile/org.eclipse.linuxtools.oprofile.doc/plugin.properties
new file mode 100644
index 0000000..aadf4eb
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/plugin.properties
@@ -0,0 +1,2 @@
+Bundle-Vendor = Eclipse
+Bundle-Name = OProfile Documentation (Incubation)
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/plugin.xml b/oprofile/org.eclipse.linuxtools.oprofile.doc/plugin.xml
new file mode 100644
index 0000000..0c609f8
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/plugin.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+   <extension
+         id="org.eclipse.linuxtools.oprofile.doc.helpDocs"
+         name="OProfile"
+         point="org.eclipse.help.toc">
+      <toc
+            file="toc.xml"
+            primary="true">
+      </toc>
+      <toc
+            file="userguide/OProfile Reference-toc.xml"
+            primary="false">
+      </toc>
+   </extension>
+
+</plugin>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/src/org/eclipse/linuxtools/internal/oprofile/doc/anttask/MediaWikiImageFetcher.java b/oprofile/org.eclipse.linuxtools.oprofile.doc/src/org/eclipse/linuxtools/internal/oprofile/doc/anttask/MediaWikiImageFetcher.java
new file mode 100644
index 0000000..f6dc995
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/src/org/eclipse/linuxtools/internal/oprofile/doc/anttask/MediaWikiImageFetcher.java
@@ -0,0 +1,149 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008 David Green and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     David Green - initial API and implementation
+ * 
+ * Re-namespaced 2009-04-14 without changes from org.eclipse.mylyn.help.ui.
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.oprofile.doc.anttask;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.Get;
+
+/**
+ * Fetch images from a MediaWiki-generated HTML page source
+ * 
+ * @author David Green
+ */
+public class MediaWikiImageFetcher extends Task {
+
+	private String base;
+
+	private File dest;
+
+	private File src;
+
+	@Override
+	public void execute() throws BuildException {
+		if (dest == null) {
+			throw new BuildException("Must specify @dest"); //$NON-NLS-1$
+		}
+		if (!dest.exists()) {
+			throw new BuildException("@dest does not exist: " + dest); //$NON-NLS-1$
+		}
+		if (!dest.isDirectory()) {
+			throw new BuildException("@dest is not a directory: " + dest); //$NON-NLS-1$
+		}
+		if (src == null) {
+			throw new BuildException("Must specify @src"); //$NON-NLS-1$
+		}
+		if (!src.exists()) {
+			throw new BuildException("@src does not exist: " + src); //$NON-NLS-1$
+		}
+		if (!src.isFile()) {
+			throw new BuildException("@src is not a file: " + src); //$NON-NLS-1$
+		}
+		if (base == null) {
+			throw new BuildException("Must specify @base"); //$NON-NLS-1$
+		}
+		if (base.endsWith("/")) { //$NON-NLS-1$
+			base = base.substring(0, base.length() - 1);
+		}
+		Pattern fragmentUrlPattern = Pattern.compile("src=\"([^\"]+)\""); //$NON-NLS-1$
+		Pattern imagePattern = Pattern.compile("alt=\"Image:([^\"]*)\"([^>]+)", Pattern.MULTILINE); //$NON-NLS-1$
+		String htmlSrc;
+		try {
+			htmlSrc = readSrc();
+		} catch (IOException e) {
+			throw new BuildException("Cannot read src: " + src + ": " + e.getMessage(), e); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		log("Parsing " + src, Project.MSG_INFO); //$NON-NLS-1$
+		int fileCount = 0;
+		Matcher imagePatternMatcher = imagePattern.matcher(htmlSrc);
+		while (imagePatternMatcher.find()) {
+			String alt = imagePatternMatcher.group(1);
+			String imageFragment = imagePatternMatcher.group(2);
+			if (imageFragment != null) {
+				Matcher fragmentUrlMatcher = fragmentUrlPattern.matcher(imageFragment);
+				if (fragmentUrlMatcher.find()) {
+					String url = fragmentUrlMatcher.group(1);
+					String qualifiedUrl = base + url;
+					log("Fetching " + qualifiedUrl, Project.MSG_INFO); //$NON-NLS-1$
+					Get get = new Get();
+					get.setProject(getProject());
+					get.setLocation(getLocation());
+					try {
+						get.setSrc(new URL(qualifiedUrl));
+					} catch (MalformedURLException e) {
+						log("Skipping " + url + ": " + e.getMessage(), Project.MSG_WARN); //$NON-NLS-1$ //$NON-NLS-2$
+						continue;
+					}
+					// note: we use the alt text for the name since for some files there is a case-difference between
+					//       the server URL and the text used in the image src of the markup
+					String name = alt == null ? url.substring(url.lastIndexOf('/')) : alt;
+					get.setDest(new File(dest, name));
+					get.execute();
+					++fileCount;
+				}
+			}
+		}
+		log("Fetched " + fileCount + " image files for " + src, Project.MSG_INFO); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	public String getBase() {
+		return base;
+	}
+
+	public File getDest() {
+		return dest;
+	}
+
+	public File getSrc() {
+		return src;
+	}
+
+	private String readSrc() throws IOException {
+		StringBuilder buf = new StringBuilder((int) src.length());
+		Reader reader = new BufferedReader(new FileReader(src));
+		try {
+			int i;
+			while ((i = reader.read()) != -1) {
+				buf.append((char) i);
+			}
+		} finally {
+			reader.close();
+		}
+		return buf.toString();
+	}
+
+	public void setBase(String base) {
+		this.base = base;
+	}
+
+	public void setDest(File dest) {
+		this.dest = dest;
+	}
+
+	public void setSrc(File src) {
+		this.src = src;
+	}
+
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/src/org/eclipse/linuxtools/internal/oprofile/doc/anttask/tasks.properties b/oprofile/org.eclipse.linuxtools.oprofile.doc/src/org/eclipse/linuxtools/internal/oprofile/doc/anttask/tasks.properties
new file mode 100644
index 0000000..68f71a2
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/src/org/eclipse/linuxtools/internal/oprofile/doc/anttask/tasks.properties
@@ -0,0 +1 @@
+mediawiki-fetch-images=org.eclipse.linuxtools.internal.oprofile.doc.anttask.MediaWikiImageFetcher
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/toc.xml b/oprofile/org.eclipse.linuxtools.oprofile.doc/toc.xml
new file mode 100644
index 0000000..0592fce
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/toc.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="OProfile Integration User Guide">
+ <link toc="userguide/OProfile Reference-toc.xml"/>
+ <topic href="doc/notices.html" label="Legal" />
+</toc>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/Example-Project.html b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/Example-Project.html
new file mode 100644
index 0000000..d6f0855
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/Example-Project.html
@@ -0,0 +1,63 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>OProfile Reference - Example Project</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Example Project</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="OProfile-View.html" title="OProfile View">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Troubleshooting.html" title="Troubleshooting">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">OProfile View</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Troubleshooting</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Example_Project">Example Project</h1>
+		<p>If you wish to try the documented steps in this article with a test project, you can download the same sample project used to create the screenshots at the following link:</p>
+		<p>
+			<a href="http://wiki.eclipse.org/images/7/77/Eclipse-oprofile_testproj_factorial.zip">http://wiki.eclipse.org/images/7/77/Eclipse-oprofile_testproj_factorial.zip</a>
+		</p>
+		<p>To import the project into the Eclipse workspace, navigate to <u>File</u> > <u>Import</u> > <u>General</u> > <u>Existing Projects into Workspace</u>. Then, choose <u>Select archive file</u> and use the <u>Browse</u> button to point to the location of the sample project on your file system.</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="OProfile-View.html" title="OProfile View">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="OProfile Reference.html" title="OProfile Reference">
+						<img alt="OProfile Reference" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right">
+					<a href="Troubleshooting.html" title="Troubleshooting">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">OProfile View</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Troubleshooting</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/Installation-and-Set-Up.html b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/Installation-and-Set-Up.html
new file mode 100644
index 0000000..00d22b9
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/Installation-and-Set-Up.html
@@ -0,0 +1,156 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>OProfile Reference - Installation and Set-Up</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Installation and Set-Up</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="OProfile Reference.html" title="Overview">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Launching-A-Profile.html" title="Launching A Profile">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Overview</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Launching A Profile</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Installation_and_Set-Up">Installation and Set-Up</h1>
+		<p>The easiest way to install the OProfile plug-in for Eclipse is through the 
+			<b>''Software Updates and Add-ons '</b>' menu. For information on how to use this menu, refer to 
+			<a href="http://wiki.eclipse.org/Linux_Tools_Project/PluginInstallHelp#Installing_Updates_From_the_Linux_Tools_Update_Site">http://wiki.eclipse.org/Linux_Tools_Project/PluginInstallHelp#Installing_Updates_From_the_Linux_Tools_Update_Site</a>.
+		</p>
+		<p>Unlike most Eclipse plug-ins, the OProfile plug-in requires some configuration after installation. Note that this configuration process takes only a few simple steps, and only needs to be done once.</p>
+		<p>After the plug-in is first installed, performing a profile run with OProfile will bring up a dialog similar to the following:</p>
+		<p>
+			<img border="0" src="images/Screenshot-installscript_error_dialog.png"/>
+		</p>
+		<p>As the dialog suggests, you must run the supplied install script; this script will allow the OProfile plug-in to perform OProfile tasks as root (since OProfile cannot be run as an unprivileged user). The steps below are the same as the dialog but described in more detail.</p>
+		<h2 id="Step_1_-_Locate_the_Installation_Scripts">Step 1 - Locate the Installation Scripts</h2>
+		<p>Open up a terminal and locate the 
+			<i><code>natives/linux/scripts</code></i> subdirectory, which is found in the 
+			<i><code>org.eclipse.linuxtools.oprofile.core</code></i> plug-in directory. The location of this plug-in directory depends on how you installed Eclipse.
+		</p>
+		<ul>
+			<li>If you are using a distro-supplied version of Eclipse and installed the plug-in via the update site, the plug-in directory will most likely be under 
+				<i><code>~/.eclipse</code></i>. To find the exact location of the plug-in directory in this case, use the following command:
+				<dl>
+					<dd><code>find ~/.eclipse -name 'org.eclipse.linuxtools.oprofile.core_*'</code></dd>
+				</dl>
+			</li>
+			<li>Alternatively, if you are using an extracted tarball of Eclipse (i.e. you downloaded a 
+				<i><code>.tar.gz</code></i> from 
+				<a href="http://www.eclipse.org/downloads/">http://www.eclipse.org/downloads/</a>), then the plug-in will most likely be in the <code>plugins</code> sub-directory of where you extracted it.
+				<dl>
+					<dd>For example, if you extracted the tarball to <code>
+						<i>/home/ksebasti</i></code>, your Eclipse installation would be in <code>
+						<i>/home/ksebasti/eclipse</i></code>. In this case, you should use the following command to find the exact location of the plug-in directory:
+					</dd>
+					<dd><code>find /home/ksebasti/eclipse -name 'org.eclipse.linuxtools.oprofile.core_*'</code></dd>
+				</dl>
+			</li>
+		</ul>
+		<p>
+			<b>Note:</b> In both cases, the quotes (') and asterisk (*) are necessary.
+		</p>
+		<p>Sample output will look like this:</p>
+		<pre>$ find /home/ksebasti/eclipse -name 'org.eclipse.linuxtools.oprofile.core_*'
+/home/ksebasti/eclipse/plugins/org.eclipse.linuxtools.oprofile.core_0.2.0.200904131051
+</pre>
+		<p>Once you find the plug-in directory, navigate to its <code>
+			<i>natives/linux/scripts</i></code> subdirectory. Using our previous example:
+			<br/><code>cd /home/ksebasti/eclipse/plugins/org.eclipse.linuxtools.oprofile.core_0.2.0.200904131051/natives/linux/scripts</code>
+		</p>
+		<p>The <code>
+			<i>natives/linux/scripts</i></code> subdirectory contains the installation scripts you will need to run in order to allow OProfile to run as root.
+		</p>
+		<h2 id="Step_2_-_Choose_Which_Installation_Script_To_Run">Step 2 - Choose Which Installation Script To Run</h2>
+		<p>The 
+			<i><code>natives/linux/scripts</code></i> subdirectory contains two scripts: 
+			<i><code>install.sh</code></i> and 
+			<i><code>install-noconsolehelper.sh</code></i>. Both scripts perform sanity checks to ensure OProfile is installed and that <code>opxml</code>, a C++ program required to interface with OProfile, exists and can be run. The difference is in how root authentication with the plug-in is set up. 
+		</p>
+		<ul>
+			<li>
+				<i><code>install.sh</code></i> uses the pluggable authentication modules (PAM) mechanism. This is the default and recommended method for root authentication. When an OProfile task is required, you will be presented with this dialog to enter the root password:
+				<br/>
+				<img border="0" src="images/Screenshot-opcontrol_consolehelper.png"/>
+			</li>
+			<li>
+				<i><code>install-noconsolehelper.sh</code></i> can be used when <code>consolehelper</code> is not present on the system, or if required PAM modules are not on the system. It uses the sudo mechanism and a small wrapper script. The install script will describe the text which should be written in the 
+				<i><code>sudoers</code></i> file, then run the command <code>visudo</code> to edit it. 
+				<br/>'
+				<i>Warning:</i>' The 
+				<i><code>sudoers</code></i> file is a sensitive system file and altering it in other ways may lead to system instability. Only users with enough knowledge of running a Linux system should use this method. For these reasons, this method of root authentication is discouraged. However, it may be the only option available to some users and it has been tested to work by developers and users of the plug-in.
+			</li>
+		</ul>
+		<h2 id="Step_3_-_Running_The_Install_Script">Step 3 - Running The Install Script</h2>
+		<p>Once you have selected an install script, log in as root. Assuming you are in the 
+			<i><code>natives/linux/scripts</code></i> subdirectory of the plug-in directory (as in 
+			<a href="Installation-and-Set-Up.html#Step_1_-_Locate_the_Installation_Scripts">Step 1 - Locate the Installation Scripts</a>), run your selected install script:
+		</p>
+		<dl>
+			<dd><code>./install.sh</code></dd>
+		</dl>
+		<p>Successful output will look like this:</p>
+		<pre>./install.sh
+Eclipse-OProfile plugin install successful.
+</pre>
+		<p>Either install script should be run as the root user since both scripts perform some actions that require elevated privileges: 
+			<i><code>install.sh</code></i> places files in 
+			<i><code>/etc</code></i> subdirectories, while 
+			<i><code>install-noconsolehelper.sh</code></i> runs the command <code>visudo</code>. If you wish to simply run either install script without logging in as root, use:
+		</p>
+		<dl>
+			<dd><code>su -c './install.sh'</code></dd>
+		</dl>
+		<p>This command will run only the install script as the root user, then return control to the regular user. Note that you will still need to enter the root password to make this work. If you receive an error message, refer to the 
+			<a href="Troubleshooting.html#Troubleshooting">Troubleshooting</a> section.
+		</p>
+		<h2 id="Step_4_-_Restart_Eclipse">Step 4 - Restart Eclipse</h2>
+		<p>After running the install script, restart Eclipse using <u>File</u> > <u>Restart</u>. </p>
+		<p>If you need to uninstall the plug-in, run the 
+			<i><code>uninstall.sh</code></i> or 
+			<i><code>uninstall-noconsolehelper.sh</code></i> script before uninstalling it from within Eclipse. These scripts are also located in the 
+			<i><code>natives/linux/scripts</code></i> subdirectory of the OProfile core plug-in directory (i.e. the same directory where the install scripts are found).
+		</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="OProfile Reference.html" title="Overview">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="OProfile Reference.html" title="OProfile Reference">
+						<img alt="OProfile Reference" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right">
+					<a href="Launching-A-Profile.html" title="Launching A Profile">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Overview</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Launching A Profile</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/Launching-A-Profile.html b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/Launching-A-Profile.html
new file mode 100644
index 0000000..6ce3aa3
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/Launching-A-Profile.html
@@ -0,0 +1,93 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>OProfile Reference - Launching A Profile</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Launching A Profile</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Installation-and-Set-Up.html" title="Installation and Set-Up">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Profiling-Configuration.html" title="Profiling Configuration">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Installation and Set-Up</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Profiling Configuration</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Launching_A_Profile">Launching A Profile</h1>
+		<p>The purpose of the OProfile plug-in is to provide useful profile information in a user-friendly manner. To do this, it first gathers the required information. The plug-in hooks into the Eclipse and CDT's launching facilities; in doing so, profiling becomes as easy as a normal run of your program. </p>
+		<p>During a profile run, the OProfile plug-in will start, stop and perform other OProfile tasks in the background as needed, while the binary being profiled runs as normal. Currently, it is possible to start profiling when a user binary is run and stop after the binary has returned as well as the ability to start/stop profiling at arbitrary times.</p>
+		<h2 id="One-Click_Launch">One-Click Launch</h2>
+		<p>Most users are interested in profiling where a program spends the most CPU time during execution. The OProfile plug-in for Eclipse includes a 
+			<i>one-click launch</i> feature which profiles this. The one-click launch sets appropriate defaults for a profile configuration using the 
+			<i>execution time</i> event, and launches the profile with no further required user intervention.
+		</p>
+		<p>To use the one-click launch, right click on the 
+			<i>project</i>, the 
+			<i>binary</i> or in an 
+			<i>open editor</i> for a source file belonging to that project. Then, navigate to <u>Profile As</u> and click <u>Profile With OProfile</u> to start the launch.
+		</p>
+		<p>
+			<img border="0" src="images/Screenshot-one-click_launch.png"/>
+		</p>
+		<h2 id="Launching_a_Customized_Profile">Launching a Customized Profile</h2>
+		<p>The OProfile plug-in allows you to configure a profile run using several available OProfile options. These options are exposed via the launch configuration in a user-friendly manner, allowing for a more complex profile. </p>
+		<p>To customize a profile, right click on the 
+			<i>project</i>, the 
+			<i>binary</i> or in an 
+			<i>open editor</i> for a source file belonging to that project. Then, navigate to <u>Profile As</u> > <u>Profile Configurations...</u> to open the 
+			<b>
+				<i>Profile Configurations</i>
+			</b> menu. Refer to the 
+			<a href="Profiling-Configuration.html#Profiling_Configuration">Profiling Configuration</a> section for more information about configuring a profile. 
+		</p>
+		<p>After configuring a profile, click the <u>Profile</u> button to launch the profile.</p>
+		<h2 id="Manual_Profile">Manual Profile</h2>
+		<p>As of the 0.3.0 release, users can profile their applications in two ways: an automatic or manual profile. Automatic is the previously described method whereby the OProfile daemon is started before the binary is launched and stopped after the binary returns. A manual profile configures the daemon with the appropriate settings, but instead a control dialog is available which the user can use to start or stop the OProfile daemon at will. Each mode has their own configuration type and icon, as to disambiguate the type of profile an entry in the profile history. A feedback list in the dialog assures the user that the operations have been received, since at times an operation may take a few seconds to complete. This feature is most useful to profile applications which halt on input, or large applications for which it is undesirable to launch and return several times. It is not recommended to use this feature to only profile when you believe your application is spending time; the statistical nature of OProfile will account for this.</p>
+		<p>
+			<img border="0" src="images/Oprofile_manual_dialog.png"/>
+		</p>
+		<p>
+			<img border="0" src="images/Oprofile_manual_shortcut.png"/>
+		</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Installation-and-Set-Up.html" title="Installation and Set-Up">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="OProfile Reference.html" title="OProfile Reference">
+						<img alt="OProfile Reference" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right">
+					<a href="Profiling-Configuration.html" title="Profiling Configuration">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Installation and Set-Up</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Profiling Configuration</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/OProfile Reference-toc.xml b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/OProfile Reference-toc.xml
new file mode 100644
index 0000000..b1ceaa9
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/OProfile Reference-toc.xml
@@ -0,0 +1,46 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<toc topic="userguide/OProfile Reference.html" label="OProfile Reference">
+	<topic href="userguide/OProfile Reference.html" label="Overview"></topic>
+	<topic href="userguide/Installation-and-Set-Up.html" label="Installation and Set-Up">
+		<topic href="userguide/Installation-and-Set-Up.html#Step_1_-_Locate_the_Installation_Scripts" label="Step 1 - Locate the Installation Scripts"></topic>
+		<topic href="userguide/Installation-and-Set-Up.html#Step_2_-_Choose_Which_Installation_Script_To_Run" label="Step 2 - Choose Which Installation Script To Run"></topic>
+		<topic href="userguide/Installation-and-Set-Up.html#Step_3_-_Running_The_Install_Script" label="Step 3 - Running The Install Script"></topic>
+		<topic href="userguide/Installation-and-Set-Up.html#Step_4_-_Restart_Eclipse" label="Step 4 - Restart Eclipse"></topic>
+	</topic>
+	<topic href="userguide/Launching-A-Profile.html" label="Launching A Profile">
+		<topic href="userguide/Launching-A-Profile.html#One-Click_Launch" label="One-Click Launch"></topic>
+		<topic href="userguide/Launching-A-Profile.html#Launching_a_Customized_Profile" label="Launching a Customized Profile"></topic>
+		<topic href="userguide/Launching-A-Profile.html#Manual_Profile" label="Manual Profile"></topic>
+	</topic>
+	<topic href="userguide/Profiling-Configuration.html" label="Profiling Configuration">
+		<topic href="userguide/Profiling-Configuration.html#Global_Settings" label="Global Settings"></topic>
+		<topic href="userguide/Profiling-Configuration.html#Event_Configuration" label="Event Configuration">
+			<topic href="userguide/Profiling-Configuration.html#Timer_Interrupt_Mode" label="Timer Interrupt Mode"></topic>
+			<topic href="userguide/Profiling-Configuration.html#Regular_Mode" label="Regular Mode"></topic>
+		</topic>
+	</topic>
+	<topic href="userguide/OProfile-View.html" label="OProfile View">
+		<topic href="userguide/OProfile-View.html#Features" label="Features">
+			<topic href="userguide/OProfile-View.html#View_Tree" label="View Tree"></topic>
+			<topic href="userguide/OProfile-View.html#View_Menu" label="View Menu"></topic>
+		</topic>
+	</topic>
+	<topic href="userguide/Example-Project.html" label="Example Project"></topic>
+	<topic href="userguide/Troubleshooting.html" label="Troubleshooting">
+		<topic href="userguide/Troubleshooting.html#Install_Script_Errors" label="Install Script Errors">
+			<topic href="userguide/Troubleshooting.html#Error:_script_must_be_run_as_the_root_user" label="Error: script must be run as the root user"></topic>
+			<topic href="userguide/Troubleshooting.html#Error:_script_must_be_run_with_pwd_in_script_dir" label="Error: script must be run with pwd in script dir"></topic>
+			<topic href="userguide/Troubleshooting.html#Error:_required_binaries_do_not_exist.2C_OProfile_not_installed.3F" label="Error: required binaries do not exist, OProfile not installed?"></topic>
+			<topic href="userguide/Troubleshooting.html#Error:_.2Fusr.2Fbin.2Fconsolehelper_does_not_exist.2C_run_install-noconsolehelper.sh_instead" label="Error: /usr/bin/consolehelper does not exist, run install-noconsolehelper.sh instead"></topic>
+			<topic href="userguide/Troubleshooting.html#Error:_cannot_create_opcontrol_wrapper_in_.3Cdirectory.3E" label="Error: cannot create opcontrol wrapper in &lt;directory>"></topic>
+			<topic href="userguide/Troubleshooting.html#Error:_cannot_find_opxml_binary.2C_required_plugin_missing" label="Error: cannot find opxml binary, required plugin missing"></topic>
+		</topic>
+		<topic href="userguide/Troubleshooting.html#No_Samples_From_A_Profile" label="No Samples From A Profile"></topic>
+		<topic href="userguide/Troubleshooting.html#Log_Reader_Hangs" label="Log Reader Hangs"></topic>
+		<topic href="userguide/Troubleshooting.html#Errors_Related_to_opxml" label="Errors Related to opxml"></topic>
+		<topic href="userguide/Troubleshooting.html#Rebuilding_opxml" label="Rebuilding opxml">
+			<topic href="userguide/Troubleshooting.html#Ubuntu_-_Extra_Requirements" label="Ubuntu - Extra Requirements"></topic>
+		</topic>
+	</topic>
+	<topic href="userguide/Updating-This-Document.html" label="Updating This Document"></topic>
+</toc>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/OProfile Reference.html b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/OProfile Reference.html
new file mode 100644
index 0000000..8d395e9
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/OProfile Reference.html
@@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>OProfile Reference</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">OProfile Reference</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Installation-and-Set-Up.html" title="Installation and Set-Up">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Installation and Set-Up</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Overview">Overview</h1>
+		<p>OProfile is a system-wide Linux profiler, capable of running at low overhead. It consists of a kernel driver and a daemon for collecting raw sample data, along with a suite of tools for parsing that data into meaningful information. OProfile is generally used by developers to determine which sections of code consume the most amount of CPU time, and why.</p>
+		<p>The OProfile plug-in allows Eclipse users to seamlessly include OProfile capabilities into their development workflow, regardless of their experience in using OProfile. Users with little experience in OProfile can use the 
+			<a href="Launching-A-Profile.html#One-Click_Launch">One-Click Launch</a> to run a default OProfile view. Experienced users can perform the same OProfile functions they would on the command line, but with a much richer visualization of the results.
+		</p>
+		<p>For more details on OProfile, visit the project homepage at 
+			<a href="http://oprofile.sourceforge.net/news/">http://oprofile.sourceforge.net/news/</a>.
+		</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Installation-and-Set-Up.html" title="Installation and Set-Up">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Installation and Set-Up</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/OProfile Reference.xml b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/OProfile Reference.xml
new file mode 100644
index 0000000..3033bdc
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/OProfile Reference.xml
@@ -0,0 +1,959 @@
+<?xml version='1.0' ?><!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<book>
+	<title>OProfile Reference</title>
+	<chapter id="Overview">
+		<title>Overview</title>
+		<para>OProfile is a system-wide Linux profiler, capable of running at low overhead. It consists of a kernel driver and a daemon for collecting raw sample data, along with a suite of tools for parsing that data into meaningful information. OProfile is generally used by developers to determine which sections of code consume the most amount of CPU time, and why.</para>
+		<para>The OProfile plug-in allows Eclipse users to seamlessly include OProfile capabilities into their development workflow, regardless of their experience in using OProfile. Users with little experience in OProfile can use the 
+			<link linkend="One-Click_Launch">One-Click Launch</link> to run a default OProfile view. Experienced users can perform the same OProfile functions they would on the command line, but with a much richer visualization of the results.
+		</para>
+		<para>For more details on OProfile, visit the project homepage at 
+			<ulink url="http://oprofile.sourceforge.net/news/">http://oprofile.sourceforge.net/news/</ulink>.
+		</para>
+	</chapter>
+	<chapter id="Installation_and_Set-Up">
+		<title>Installation and Set-Up</title>
+		<para>The easiest way to install the OProfile plug-in for Eclipse is through the 
+			<emphasis role="bold">''Software Updates and Add-ons '</emphasis>' menu. For information on how to use this menu, refer to 
+			<ulink url="http://wiki.eclipse.org/Linux_Tools_Project/PluginInstallHelp#Installing_Updates_From_the_Linux_Tools_Update_Site">http://wiki.eclipse.org/Linux_Tools_Project/PluginInstallHelp#Installing_Updates_From_the_Linux_Tools_Update_Site</ulink>.
+		</para>
+		<para>Unlike most Eclipse plug-ins, the OProfile plug-in requires some configuration after installation. Note that this configuration process takes only a few simple steps, and only needs to be done once.</para>
+		<para>After the plug-in is first installed, performing a profile run with OProfile will bring up a dialog similar to the following:</para>
+		<para>
+			<mediaobject>
+				<imageobject>
+					<imagedata fileref="Screenshot-installscript_error_dialog.png"/>
+				</imageobject>
+			</mediaobject>
+		</para>
+		<para>As the dialog suggests, you must run the supplied install script; this script will allow the OProfile plug-in to perform OProfile tasks as root (since OProfile cannot be run as an unprivileged user). The steps below are the same as the dialog but described in more detail.</para>
+		<section id="Step_1_-_Locate_the_Installation_Scripts">
+			<title>Step 1 - Locate the Installation Scripts</title>
+			<para>Open up a terminal and locate the 
+				<emphasis role="italic"><code>natives/linux/scripts</code></emphasis> subdirectory, which is found in the 
+				<emphasis role="italic"><code>org.eclipse.linuxtools.oprofile.core</code></emphasis> plug-in directory. The location of this plug-in directory depends on how you installed Eclipse.
+			</para>
+			<itemizedlist>
+				<listitem>
+					<para>If you are using a distro-supplied version of Eclipse and installed the plug-in via the update site, the plug-in directory will most likely be under 
+						<emphasis role="italic"><code>~/.eclipse</code></emphasis>. To find the exact location of the plug-in directory in this case, use the following command:
+					</para>
+					<variablelist>
+						<listitem>
+							<para><code>find ~/.eclipse -name 'org.eclipse.linuxtools.oprofile.core_*'</code></para>
+						</listitem>
+					</variablelist>
+				</listitem>
+				<listitem>
+					<para>Alternatively, if you are using an extracted tarball of Eclipse (i.e. you downloaded a 
+						<emphasis role="italic"><code>.tar.gz</code></emphasis> from 
+						<ulink url="http://www.eclipse.org/downloads/">http://www.eclipse.org/downloads/</ulink>), then the plug-in will most likely be in the <code>plugins</code> sub-directory of where you extracted it.
+					</para>
+					<variablelist>
+						<listitem>
+							<para>For example, if you extracted the tarball to <code>
+								<emphasis role="italic">/home/ksebasti</emphasis></code>, your Eclipse installation would be in <code>
+								<emphasis role="italic">/home/ksebasti/eclipse</emphasis></code>. In this case, you should use the following command to find the exact location of the plug-in directory:
+							</para>
+						</listitem>
+						<listitem>
+							<para><code>find /home/ksebasti/eclipse -name 'org.eclipse.linuxtools.oprofile.core_*'</code></para>
+						</listitem>
+					</variablelist>
+				</listitem>
+			</itemizedlist>
+			<para>
+				<emphasis role="bold">Note:</emphasis> In both cases, the quotes (') and asterisk (*) are necessary.
+			</para>
+			<para>Sample output will look like this:</para>
+			<literallayout>$ find /home/ksebasti/eclipse -name 'org.eclipse.linuxtools.oprofile.core_*'
+/home/ksebasti/eclipse/plugins/org.eclipse.linuxtools.oprofile.core_0.2.0.200904131051
+</literallayout>
+			<para>Once you find the plug-in directory, navigate to its <code>
+				<emphasis role="italic">natives/linux/scripts</emphasis></code> subdirectory. Using our previous example:
+<code>				cd /home/ksebasti/eclipse/plugins/org.eclipse.linuxtools.oprofile.core_0.2.0.200904131051/natives/linux/scripts</code>
+			</para>
+			<para>The <code>
+				<emphasis role="italic">natives/linux/scripts</emphasis></code> subdirectory contains the installation scripts you will need to run in order to allow OProfile to run as root.
+			</para>
+		</section>
+		<section id="Step_2_-_Choose_Which_Installation_Script_To_Run">
+			<title>Step 2 - Choose Which Installation Script To Run</title>
+			<para>The 
+				<emphasis role="italic"><code>natives/linux/scripts</code></emphasis> subdirectory contains two scripts: 
+				<emphasis role="italic"><code>install.sh</code></emphasis> and 
+				<emphasis role="italic"><code>install-noconsolehelper.sh</code></emphasis>. Both scripts perform sanity checks to ensure OProfile is installed and that <code>opxml</code>, a C++ program required to interface with OProfile, exists and can be run. The difference is in how root authentication with the plug-in is set up. 
+			</para>
+			<itemizedlist>
+				<listitem>
+					<para>
+						<emphasis role="italic"><code>install.sh</code></emphasis> uses the pluggable authentication modules (PAM) mechanism. This is the default and recommended method for root authentication. When an OProfile task is required, you will be presented with this dialog to enter the root password:
+
+						<mediaobject>
+							<imageobject>
+								<imagedata fileref="Screenshot-opcontrol_consolehelper.png"/>
+							</imageobject>
+						</mediaobject>
+					</para>
+				</listitem>
+				<listitem>
+					<para>
+						<emphasis role="italic"><code>install-noconsolehelper.sh</code></emphasis> can be used when <code>consolehelper</code> is not present on the system, or if required PAM modules are not on the system. It uses the sudo mechanism and a small wrapper script. The install script will describe the text which should be written in the 
+						<emphasis role="italic"><code>sudoers</code></emphasis> file, then run the command <code>visudo</code> to edit it. 
+						'
+						<emphasis role="italic">Warning:</emphasis>' The 
+						<emphasis role="italic"><code>sudoers</code></emphasis> file is a sensitive system file and altering it in other ways may lead to system instability. Only users with enough knowledge of running a Linux system should use this method. For these reasons, this method of root authentication is discouraged. However, it may be the only option available to some users and it has been tested to work by developers and users of the plug-in.
+					</para>
+				</listitem>
+			</itemizedlist>
+		</section>
+		<section id="Step_3_-_Running_The_Install_Script">
+			<title>Step 3 - Running The Install Script</title>
+			<para>Once you have selected an install script, log in as root. Assuming you are in the 
+				<emphasis role="italic"><code>natives/linux/scripts</code></emphasis> subdirectory of the plug-in directory (as in 
+				<link linkend="Step_1_-_Locate_the_Installation_Scripts">Step 1 - Locate the Installation Scripts</link>), run your selected install script:
+			</para>
+			<variablelist>
+				<listitem>
+					<para><code>./install.sh</code></para>
+				</listitem>
+			</variablelist>
+			<para>Successful output will look like this:</para>
+			<literallayout>./install.sh
+Eclipse-OProfile plugin install successful.
+</literallayout>
+			<para>Either install script should be run as the root user since both scripts perform some actions that require elevated privileges: 
+				<emphasis role="italic"><code>install.sh</code></emphasis> places files in 
+				<emphasis role="italic"><code>/etc</code></emphasis> subdirectories, while 
+				<emphasis role="italic"><code>install-noconsolehelper.sh</code></emphasis> runs the command <code>visudo</code>. If you wish to simply run either install script without logging in as root, use:
+			</para>
+			<variablelist>
+				<listitem>
+					<para><code>su -c './install.sh'</code></para>
+				</listitem>
+			</variablelist>
+			<para>This command will run only the install script as the root user, then return control to the regular user. Note that you will still need to enter the root password to make this work. If you receive an error message, refer to the 
+				<link linkend="Troubleshooting">Troubleshooting</link> section.
+			</para>
+		</section>
+		<section id="Step_4_-_Restart_Eclipse">
+			<title>Step 4 - Restart Eclipse</title>
+			<para>After running the install script, restart Eclipse using <u>File</u> > <u>Restart</u>. </para>
+			<para>If you need to uninstall the plug-in, run the 
+				<emphasis role="italic"><code>uninstall.sh</code></emphasis> or 
+				<emphasis role="italic"><code>uninstall-noconsolehelper.sh</code></emphasis> script before uninstalling it from within Eclipse. These scripts are also located in the 
+				<emphasis role="italic"><code>natives/linux/scripts</code></emphasis> subdirectory of the OProfile core plug-in directory (i.e. the same directory where the install scripts are found).
+			</para>
+		</section>
+	</chapter>
+	<chapter id="Launching_A_Profile">
+		<title>Launching A Profile</title>
+		<para>The purpose of the OProfile plug-in is to provide useful profile information in a user-friendly manner. To do this, it first gathers the required information. The plug-in hooks into the Eclipse and CDT's launching facilities; in doing so, profiling becomes as easy as a normal run of your program. </para>
+		<para>During a profile run, the OProfile plug-in will start, stop and perform other OProfile tasks in the background as needed, while the binary being profiled runs as normal. Currently, it is possible to start profiling when a user binary is run and stop after the binary has returned as well as the ability to start/stop profiling at arbitrary times.</para>
+		<section id="One-Click_Launch">
+			<title>One-Click Launch</title>
+			<para>Most users are interested in profiling where a program spends the most CPU time during execution. The OProfile plug-in for Eclipse includes a 
+				<emphasis role="italic">one-click launch</emphasis> feature which profiles this. The one-click launch sets appropriate defaults for a profile configuration using the 
+				<emphasis role="italic">execution time</emphasis> event, and launches the profile with no further required user intervention.
+			</para>
+			<para>To use the one-click launch, right click on the 
+				<emphasis role="italic">project</emphasis>, the 
+				<emphasis role="italic">binary</emphasis> or in an 
+				<emphasis role="italic">open editor</emphasis> for a source file belonging to that project. Then, navigate to <u>Profile As</u> and click <u>Profile With OProfile</u> to start the launch.
+			</para>
+			<para>
+				<mediaobject>
+					<imageobject>
+						<imagedata fileref="Screenshot-one-click_launch.png"/>
+					</imageobject>
+				</mediaobject>
+			</para>
+		</section>
+		<section id="Launching_a_Customized_Profile">
+			<title>Launching a Customized Profile</title>
+			<para>The OProfile plug-in allows you to configure a profile run using several available OProfile options. These options are exposed via the launch configuration in a user-friendly manner, allowing for a more complex profile. </para>
+			<para>To customize a profile, right click on the 
+				<emphasis role="italic">project</emphasis>, the 
+				<emphasis role="italic">binary</emphasis> or in an 
+				<emphasis role="italic">open editor</emphasis> for a source file belonging to that project. Then, navigate to <u>Profile As</u> > <u>Profile Configurations...</u> to open the 
+				<emphasis role="bold">
+					<emphasis role="italic">Profile Configurations</emphasis>
+				</emphasis> menu. Refer to the 
+				<link linkend="Profiling_Configuration">Profiling Configuration</link> section for more information about configuring a profile. 
+			</para>
+			<para>After configuring a profile, click the <u>Profile</u> button to launch the profile.</para>
+		</section>
+		<section id="Manual_Profile">
+			<title>Manual Profile</title>
+			<para>As of the 0.3.0 release, users can profile their applications in two ways: an automatic or manual profile. Automatic is the previously described method whereby the OProfile daemon is started before the binary is launched and stopped after the binary returns. A manual profile configures the daemon with the appropriate settings, but instead a control dialog is available which the user can use to start or stop the OProfile daemon at will. Each mode has their own configuration type and icon, as to disambiguate the type of profile an entry in the profile history. A feedback list in the dialog assures the user that the operations have been received, since at times an operation may take a few seconds to complete. This feature is most useful to profile applications which halt on input, or large applications for which it is undesirable to launch and return several times. It is not recommended to use this feature to only profile when you believe your application is spending time; the statistical nature of OProfile will account for this.</para>
+			<para>
+				<mediaobject>
+					<imageobject>
+						<imagedata fileref="Oprofile_manual_dialog.png"/>
+					</imageobject>
+				</mediaobject>
+			</para>
+			<para>
+				<mediaobject>
+					<imageobject>
+						<imagedata fileref="Oprofile_manual_shortcut.png"/>
+					</imageobject>
+				</mediaobject>
+			</para>
+		</section>
+	</chapter>
+	<chapter id="Profiling_Configuration">
+		<title>Profiling Configuration</title>
+		<para>OProfile has many configuration options, the amount of which can be overwhelming. For more information about these options, refer to 
+			<ulink url="http://oprofile.sourceforge.net/doc/controlling.html">http://oprofile.sourceforge.net/doc/controlling.html</ulink>. The 
+			<emphasis role="bold">
+				<emphasis role="italic">Profile Configurations</emphasis>
+			</emphasis> menu provided by the OProfile plug-in aims to make relevant, commonly-used OProfile configuration options easily accessible to users of all experience levels. Currently, the 
+			<emphasis role="bold">
+				<emphasis role="italic">Profile Configurations</emphasis>
+			</emphasis> menu provides two configuration tabs to the standard CDT launch configuration: 
+			<link linkend="Global_Settings">Global Settings</link> and 
+			<link linkend="Event_Configuration">Event Configuration</link>.
+		</para>
+		<section id="Global_Settings">
+			<title>Global Settings</title>
+			<para>The 
+				<emphasis role="bold">
+					<emphasis role="italic">Global Settings</emphasis>
+				</emphasis> tab configures how the OProfile daemon gathers profiling information. Each option is described below.
+
+				<mediaobject>
+					<imageobject>
+						<imagedata fileref="Screenshot-global_config.png"/>
+					</imageobject>
+				</mediaobject>
+			</para>
+			<variablelist>
+				<varlistentry>
+					<term>Kernel Image File (optional)</term>
+					<listitem>
+						<para>To collect more detailed information about the operation of a program in the Linux kernel, use the <u>Browse</u> button specify the location of your running kernel's 
+							<emphasis role="italic"><code>vmlinux</code></emphasis> file. A kernel's 
+							<emphasis role="italic"><code>vmlinux</code></emphasis> file contains debugging information required by OProfile. Note that the compressed 
+							<emphasis role="italic">vmlinux</emphasis> file, often named 
+							<emphasis role="italic"><code>vmlinuz</code></emphasis>, cannot be used for this purpose. 
+							 Note: For this option to have any effect, you must enable the 
+							<emphasis role="bold">
+								<emphasis role="italic">Include dependent kernel modules</emphasis>
+							</emphasis> option.
+						</para>
+					</listitem>
+				</varlistentry>
+			</variablelist>
+			<variablelist>
+				<varlistentry>
+					<term>Include dependent shared libraries</term>
+					<listitem>
+						<para>This option will make OProfile include samples from shared libraries that are used by the profiled binary/program. These samples will then be aggregated in the profile results.</para>
+					</listitem>
+				</varlistentry>
+			</variablelist>
+			<variablelist>
+				<varlistentry>
+					<term>Include dependent kernel modules</term>
+					<listitem>
+						<para>This option will make OProfile include samples related to running in the kernel. If the 
+							<emphasis role="italic"><code>vmlinux</code></emphasis> file is specified, the profile will include details of the specific kernel modules in use. Otherwise, kernel samples will be grouped under the name <code>no-vmlinux</code>.
+						</para>
+					</listitem>
+				</varlistentry>
+			</variablelist>
+			<para>The differences between the options are illustrated in the following OProfile view screenshot:</para>
+			<para>
+				<mediaobject>
+					<imageobject>
+						<imagedata fileref="Screenshot-oprofile_global_differences.png"/>
+					</imageobject>
+				</mediaobject>
+			</para>
+			<itemizedlist>
+				<listitem>
+					<para><code>incl_library</code> was run with only the 
+						<emphasis role="bold">
+							<emphasis role="italic">Include dependent shared libraries</emphasis>
+						</emphasis> checked
+					</para>
+				</listitem>
+				<listitem>
+					<para><code>incl_vmlinux</code> was run with the 
+						<emphasis role="italic"><code>vmlinux</code></emphasis> file specified; both 
+						<emphasis role="bold">
+							<emphasis role="italic">Include dependent shared libraries</emphasis>
+						</emphasis> and 
+						<emphasis role="bold">
+							<emphasis role="italic">Include dependent kernel modules</emphasis>
+						</emphasis> checked
+					</para>
+				</listitem>
+				<listitem>
+					<para><code>no_vmlinux</code> was run without any 
+						<emphasis role="italic"><code>vmlinux</code></emphasis> file specified; both 
+						<emphasis role="bold">
+							<emphasis role="italic">Include dependent shared libraries</emphasis>
+						</emphasis> and 
+						<emphasis role="bold">
+							<emphasis role="italic">Include dependent kernel modules</emphasis>
+						</emphasis> checked
+					</para>
+				</listitem>
+				<listitem>
+					<para><code>novmlinux_noseparate</code> was run with none of the options checked</para>
+				</listitem>
+			</itemizedlist>
+		</section>
+		<section id="Event_Configuration">
+			<title>Event Configuration</title>
+			<para>Your system processor's hardware profiling registers often contain a large number of options. The 
+				<emphasis role="bold">
+					<emphasis role="italic">Event Configuration</emphasis>
+				</emphasis> tab condenses these options to a more manageable amount.
+			</para>
+			<section id="Timer_Interrupt_Mode">
+				<title>Timer Interrupt Mode</title>
+				<para>If your processor (or kernel) does not support the hardware profiling registers OProfile uses, OProfile will run in 
+					<emphasis role="italic">timer-interrupt mode</emphasis>. This mode has no user-configurable events. For more information about 
+					<emphasis role="italic">timer-interrupt mode</emphasis>, refer to 
+					<ulink url="http://oprofile.sourceforge.net/doc/detailed-parameters.html#timer">http://oprofile.sourceforge.net/doc/detailed-parameters.html#timer</ulink>.
+				</para>
+				<para>The event configuration tab will then look like the screenshot below:</para>
+				<para>
+					<mediaobject>
+						<imageobject>
+							<imagedata fileref="Screenshot-oprofile_event_timer.png"/>
+						</imageobject>
+					</mediaobject>
+				</para>
+			</section>
+			<section id="Regular_Mode">
+				<title>Regular Mode</title>
+				<para>If your processor (or kernel) supports hardware profiling registers, there are several configuration options available to you. The availability of these configuration options depend on your processor model or kernel version. With proper support, the 
+					<emphasis role="bold">
+						<emphasis role="italic">Events</emphasis>
+					</emphasis> configuration tab will look like the following screenshot:
+				</para>
+				<para>
+					<mediaobject>
+						<imageobject>
+							<imagedata fileref="Screenshot-oprofile_eventconfig.png"/>
+						</imageobject>
+					</mediaobject>
+				</para>
+				<para>In 
+					<emphasis role="italic">regular mode</emphasis>, the 
+					<emphasis role="bold">
+						<emphasis role="italic">Events</emphasis>
+					</emphasis> configuration tab can contain any of the following options:
+				</para>
+				<variablelist>
+					<varlistentry>
+						<term>Use default event</term>
+						<listitem>
+							<para>This option is enabled by default when creating a new profile configuration, or when a profile configuration is created through the 
+								<link linkend="One-Click_Launch">one-click launch</link>. 
+								<emphasis role="bold">
+									<emphasis role="italic">Use default event</emphasis>
+								</emphasis> is a shortcut to use an event based on processor execution time, with a reasonable value for the 
+								<emphasis role="bold">
+									<emphasis role="italic">Count</emphasis>
+								</emphasis> option. Using this option will prevent you from configuring the counters any further.
+								 For a list of default events for various processors, refer to 
+								<ulink url="http://oprofile.sourceforge.net/doc/controlling.html#eventspec">http://oprofile.sourceforge.net/doc/controlling.html#eventspec</ulink>.
+							</para>
+						</listitem>
+					</varlistentry>
+				</variablelist>
+				<variablelist>
+					<varlistentry>
+						<term>Counter Tabs (
+							<emphasis role="bold">
+								<emphasis role="italic">Ctr 0</emphasis>
+							</emphasis>, 
+							<emphasis role="bold">
+								<emphasis role="italic">Ctr 1</emphasis>
+							</emphasis>, 
+							<emphasis role="bold">
+								<emphasis role="italic">Ctr 2</emphasis>
+							</emphasis>, and so on)
+						</term>
+						<listitem>
+							<para>A processor may have 1 to 8 hardware profiling registers (also called counters). Each one may be programmed separately to profile many events simultaneously. Each tabs labelled 
+								<emphasis role="italic">Ctr</emphasis> represents one counter and exposes the same options.
+							</para>
+						</listitem>
+					</varlistentry>
+				</variablelist>
+				<variablelist>
+					<varlistentry>
+						<term>Enabled</term>
+						<listitem>
+							<para>This option (located in each counter tab) disables or enables a counter.</para>
+						</listitem>
+					</varlistentry>
+				</variablelist>
+				<variablelist>
+					<varlistentry>
+						<term>Event List</term>
+						<listitem>
+							<para>A list of the events available for profiling on a given counter.</para>
+						</listitem>
+					</varlistentry>
+				</variablelist>
+				<variablelist>
+					<varlistentry>
+						<term>Event Description</term>
+						<listitem>
+							<para>When you select an event from the events list, this field provides a short description of that event's function. OProfile provides the content for this field.</para>
+						</listitem>
+					</varlistentry>
+				</variablelist>
+				<variablelist>
+					<varlistentry>
+						<term>Profile Kernel and Profile user binaries</term>
+						<listitem>
+							<para>Instructs OProfile to profile binaries in the selected spaces. Keeping both checked is recommended (even if other 
+								<link linkend="Global_Settings">Global Settings</link> are not specified).
+							</para>
+						</listitem>
+					</varlistentry>
+				</variablelist>
+				<variablelist>
+					<varlistentry>
+						<term>Count</term>
+						<listitem>
+							<para>Specifies a reset count for the hardware counter. In most cases, the default value (based on the CPU clock frequency) is sufficient. Each event has a minimum value, but it is recommended to use a value many orders of magnitude larger.
+								 
+								<emphasis role="bold">WARNING</emphasis>: if you specify a value that is too low, the profiled program may take much longer to return or your system may hang.
+							</para>
+						</listitem>
+					</varlistentry>
+				</variablelist>
+				<variablelist>
+					<varlistentry>
+						<term>Unit Mask</term>
+						<listitem>
+							<para>Many events have a 
+								<emphasis role="italic">unit mask</emphasis> which allows further narrowing of the scope of the event. If in doubt, use the default value (specified by OProfile). There are three types of unit masks:
+							</para>
+						</listitem>
+					</varlistentry>
+				</variablelist>
+				<itemizedlist>
+					<listitem>
+						<para>Mandatory -- no selection necessary; a single required value</para>
+					</listitem>
+					<listitem>
+						<para>Exclusive -- several possible values; a single required value</para>
+					</listitem>
+					<listitem>
+						<para>Bitmask -- several possible values; a combination of several values</para>
+					</listitem>
+				</itemizedlist>
+			</section>
+		</section>
+	</chapter>
+	<chapter id="OProfile_View">
+		<title>OProfile View</title>
+		<para>The OProfile view is the central point of interaction of the plug-in with the results of profiling.</para>
+		<para>
+			<mediaobject>
+				<imageobject>
+					<imagedata fileref="Screenshot-oprofile_view_full.png"/>
+				</imageobject>
+			</mediaobject>
+		</para>
+		<para>The tree structure displayed above describes one or more profiles of one or more events in the following manner:</para>
+		<itemizedlist>
+			<listitem>
+				<para>
+					<mediaobject>
+						<imageobject>
+							<imagedata fileref="Icon-oprofile_event.gif"/>
+						</imageobject>
+					</mediaobject> Events -- the name of the profiling event used by OProfile (e.g. <code>CPU_CLK_UNHALTED</code>)
+				</para>
+				<itemizedlist>
+					<listitem>
+						<para>
+							<mediaobject>
+								<imageobject>
+									<imagedata fileref="Icon-oprofile_session.gif"/>
+								</imageobject>
+							</mediaobject> Session -- the name of the session the profile is stored in (e.g. <code>run1</code>)
+						</para>
+						<itemizedlist>
+							<listitem>
+								<para>
+									<mediaobject>
+										<imageobject>
+											<imagedata fileref="Icon-oprofile_image.gif"/>
+										</imageobject>
+									</mediaobject> Image -- the binary being profiled (e.g. 
+									<emphasis role="italic"><code>/notnfs/ksebasti/oprofile/plugin/factorial/Debug/factorial</code></emphasis>)
+								</para>
+								<itemizedlist>
+									<listitem>
+										<para>
+											<mediaobject>
+												<imageobject>
+													<imagedata fileref="Icon-oprofile_symbol.gif"/>
+												</imageobject>
+											</mediaobject> Symbol -- symbols gathered from the binary's debug information (e.g. <code>factorial2</code>)
+										</para>
+										<itemizedlist>
+											<listitem>
+												<para>
+													<mediaobject>
+														<imageobject>
+															<imagedata fileref="Icon-oprofile_sample.gif"/>
+														</imageobject>
+													</mediaobject> Sample -- individual OProfile samples correlated to line numbers of source code
+												</para>
+											</listitem>
+										</itemizedlist>
+									</listitem>
+									<listitem>
+										<para>
+											<mediaobject>
+												<imageobject>
+													<imagedata fileref="Icon-oprofile_dependent.gif"/>
+												</imageobject>
+											</mediaobject> Dependent Images -- other binaries related to the run of the program; shared libraries or kernel modules
+										</para>
+										<itemizedlist>
+											<listitem>
+												<para>
+													<mediaobject>
+														<imageobject>
+															<imagedata fileref="Icon-oprofile_image.gif"/>
+														</imageobject>
+													</mediaobject> Image -- the dependent binary 
+												</para>
+												<itemizedlist>
+													<listitem>
+														<para>
+															<mediaobject>
+																<imageobject>
+																	<imagedata fileref="Icon-oprofile_symbol.gif"/>
+																</imageobject>
+															</mediaobject> Symbol -- same as above
+														</para>
+														<itemizedlist>
+															<listitem>
+																<para>
+																	<mediaobject>
+																		<imageobject>
+																			<imagedata fileref="Icon-oprofile_sample.gif"/>
+																		</imageobject>
+																	</mediaobject> Sample -- same as above
+																</para>
+															</listitem>
+														</itemizedlist>
+													</listitem>
+												</itemizedlist>
+											</listitem>
+										</itemizedlist>
+									</listitem>
+								</itemizedlist>
+							</listitem>
+						</itemizedlist>
+					</listitem>
+				</itemizedlist>
+			</listitem>
+		</itemizedlist>
+		<para>If source code is not available, some symbols (including source file name) may be shown, but no samples. This is normally the case with programs that use shared libraries. Also, depending on the 
+			<link linkend="Global_Settings">Global Settings</link>, a profile may have no dependent images.
+		</para>
+		<para>Note that after Eclipse is restarted, there will be no data shown in the OProfile view. Data from past profiles will still be on the system, if not touched otherwise, and can be re-read with the <u>Refresh View</u> menu action (refer to the 
+			<link linkend="View_Menu">View Menu</link> section for more details).
+		</para>
+		<section id="Features">
+			<title>Features</title>
+			<para>This section describes the features of the plug-in exposed through the view.</para>
+			<section id="View_Tree">
+				<title>View Tree</title>
+				<para>Double-clicking on a 
+					<mediaobject>
+						<imageobject>
+							<imagedata fileref="Icon-oprofile_sample.gif"/>
+						</imageobject>
+					</mediaobject>sample will open the source file in an editor and place the insertion point at the corresponding line in code.
+				</para>
+				<para>
+					<emphasis role="bold">Note:</emphasis> For this to work, the source code must be available and it must be in the correct directory (as described in the debug info of the binary).
+				</para>
+			</section>
+			<section id="View_Menu">
+				<title>View Menu</title>
+				<variablelist>
+					<varlistentry>
+						<term>Open OProfile Daemon Log</term>
+						<listitem>
+							<para>This will launch a dialog showing the contents of the OProfile daemon log. 
+
+								<mediaobject>
+									<imageobject>
+										<imagedata fileref="Screenshot-oprofiled_log_reader.png"/>
+									</imageobject>
+								</mediaobject>
+								By default, the OProfile daemon log is in <code>
+								<emphasis role="italic">/var/lib/oprofile/samples/oprofiled.log</emphasis></code>
+							</para>
+						</listitem>
+					</varlistentry>
+				</variablelist>
+				<variablelist>
+					<varlistentry>
+						<term>Refresh View</term>
+						<listitem>
+							<para>This will re-read the OProfile data on the system, re-create the internal data model and re-display the profile tree. Doing so allows you to display data already on the system without launching a profile (e.g. when Eclipse first starts up).</para>
+						</listitem>
+					</varlistentry>
+				</variablelist>
+				<variablelist>
+					<varlistentry>
+						<term>Save Default Session</term>
+						<listitem>
+							<para>The default session, named <code>current</code>, is overwritten on each launch of a profile if it is not saved. If you wish to keep a profile for later viewing, this menu action will allow you to save the session to a different name.
+								Since the samples are in a system directory, this operation requires root privileges; hence, you will be prompted for the root password. The 
+								<emphasis role="bold">
+									<emphasis role="italic">Save Session</emphasis>
+								</emphasis> dialog is shown below:
+							</para>
+						</listitem>
+					</varlistentry>
+				</variablelist>
+				<para>
+					<mediaobject>
+						<imageobject>
+							<imagedata fileref="Screenshot-oprofile_save_session.png"/>
+						</imageobject>
+					</mediaobject>
+				</para>
+			</section>
+		</section>
+	</chapter>
+	<chapter id="Example_Project">
+		<title>Example Project</title>
+		<para>If you wish to try the documented steps in this article with a test project, you can download the same sample project used to create the screenshots at the following link:</para>
+		<para>
+			<ulink url="http://wiki.eclipse.org/images/7/77/Eclipse-oprofile_testproj_factorial.zip">http://wiki.eclipse.org/images/7/77/Eclipse-oprofile_testproj_factorial.zip</ulink>
+		</para>
+		<para>To import the project into the Eclipse workspace, navigate to <u>File</u> > <u>Import</u> > <u>General</u> > <u>Existing Projects into Workspace</u>. Then, choose <u>Select archive file</u> and use the <u>Browse</u> button to point to the location of the sample project on your file system.</para>
+	</chapter>
+	<chapter id="Troubleshooting">
+		<title>Troubleshooting</title>
+		<para>Various problems and their solutions are described here. If you encounter a problem not described here, please 
+			<ulink url="https://bugs.eclipse.org/bugs/enter_bug.cgi?assigned_to=ksebasti%40redhat.com&amp;blocked=&amp;bug_file_loc=http%3A%2F%2F&amp;bug_severity=normal&amp;bug_status=NEW&amp;comment=&amp;component=OProfile&amp;contenttypeentry=&amp;contenttypemethod=autodetect&amp;contenttypeselection=text%2Fplain&amp;data=&amp;dependson=&amp;description=&amp;flag_type-1=X&amp;flag_type-2=X&amp;flag_type-4=X&amp;flag_type-6=X&amp;flag_type-7=X&amp;flag_type-8=X&amp;form_name=enter_bug&amp;keywords=&amp;op_sys=Linux&amp;priority=P3&amp;product=Linux%20Tools&amp;qa_contact=&amp;rep_platform=PC&amp;short_desc=">file a bug</ulink>.
+		</para>
+		<section id="Install_Script_Errors">
+			<title>Install Script Errors</title>
+			<para>This section describes different errors that could occur from running the install scripts (i.e. <code>
+				<emphasis role="italic">install.sh</emphasis></code> or <code>
+				<emphasis role="italic">install-noconsolehelper.sh</emphasis></code>) 
+			</para>
+			<section id="Error:_script_must_be_run_as_the_root_user">
+				<title>Error: script must be run as the root user</title>
+				<para>You attempted to run the script as an ordinary, non-root user. You must be the root user to run the install script, as the scripts edit files located in root-owned directories. </para>
+				<para>Solution: Run the command <code>su -</code> to become the root user, or run the script as the root user with <code>su -c './install.sh'</code>.</para>
+			</section>
+			<section id="Error:_script_must_be_run_with_pwd_in_script_dir">
+				<title>Error: script must be run with pwd in script dir</title>
+				<para>Your current working directory must be the <code>
+					<emphasis role="italic">natives/linux/scripts</emphasis></code> subdirectory of the OProfile core plug-in; running the script relative from another location will not work. 
+				</para>
+				<para>Solution: Simply follow the steps on 
+					<link linkend="Step_1_-_Locate_the_Installation_Scripts">Step 1 - Locate the Installation Scripts</link> to find the <code>
+					<emphasis role="italic">natives/linux/scripts</emphasis></code> subdirectory of the OProfile core plug-in.
+				</para>
+			</section>
+			<section id="Error:_required_binaries_do_not_exist.2C_OProfile_not_installed.3F">
+				<title>Error: required binaries do not exist, OProfile not installed?</title>
+				<para>The OProfile plug-in could not find the <code>
+					<emphasis role="italic">oprofiled</emphasis></code> and <code>
+					<emphasis role="italic">opcontrol</emphasis></code> binaries. This could mean they are not in their default directory (<code>
+					<emphasis role="italic">/usr/bin</emphasis></code>), or they do not exist at all.
+				</para>
+				<para>Solution: If the binaries are on your system (and in your <code>PATH</code>) but not in those directories, you can either remove these checks from the install script or create symlinks in the <code>
+					<emphasis role="italic">/usr/bin</emphasis></code> directory. Of course, if the binaries do not exist on your system, then install the <code>
+					<emphasis role="italic">oprofile</emphasis></code> package.
+				</para>
+			</section>
+			<section id="Error:_.2Fusr.2Fbin.2Fconsolehelper_does_not_exist.2C_run_install-noconsolehelper.sh_instead">
+				<title>Error: /usr/bin/consolehelper does not exist, run install-noconsolehelper.sh instead</title>
+				<para>You ran the <code>
+					<emphasis role="italic">install.sh</emphasis></code> script, but <code>consolehelper</code> was not installed on your system.
+					As described in 
+					<link linkend="Step_2_-_Choose_Which_Installation_Script_To_Run">Step 2 - Choose Which Installation Script To Run</link>, if <code>consolehelper</code> is not installed, then you will need to use a root authentication mode that uses the <code>sudo</code> mechanism.
+				</para>
+				<para>Solution: Run the <code>
+					<emphasis role="italic">install-noconsolehelper.sh</emphasis></code> script instead.
+				</para>
+			</section>
+			<section id="Error:_cannot_create_opcontrol_wrapper_in_.3Cdirectory.3E">
+				<title>Error: cannot create opcontrol wrapper in &lt;directory></title>
+				<para>The <code>ln</code> command reports that the symlink could not be created. This can occur if the <code>
+					<emphasis role="italic">natives/linux/scripts</emphasis></code> subdirectory is located on an NFS mount; the NFS server will not allow the local root user to create files in the directory.
+				</para>
+				<para>Solution: Before running the <code>
+					<emphasis role="italic">install.sh</emphasis></code> script, first create the symlink as a regular user by running the command <code>ln -s /usr/bin/consolehelper opcontrol</code>. Then, remove the following section from the <code>
+					<emphasis role="italic">install.sh</emphasis></code> script:
+				</para>
+				<literallayout>#create the sym link to consolehelper
+test -L ./opcontrol || { rm -f ./opcontrol &amp;&amp; ln -s /usr/bin/consolehelper opcontrol ; }
+if [ $? -ne 0 ]; then
+  echo Error: cannot create opcontrol wrapper in `pwd`
+  exit 1
+fi
+</literallayout>
+				<para>The <code>
+					<emphasis role="italic">install.sh</emphasis></code> script is fixed in the most recent version of the OProfile plug-in for Eclipse, but not in the 0.2.0 release.
+				</para>
+			</section>
+			<section id="Error:_cannot_find_opxml_binary.2C_required_plugin_missing">
+				<title>Error: cannot find opxml binary, required plugin missing</title>
+				<para>This can occur if the native binary <code>
+					<emphasis role="italic">opxml</emphasis></code> is not found. This binary is required for proper operation of the plug-in.
+				</para>
+				<para>Solution: If the <code>
+					<emphasis role="italic">org.eclipse.linuxtools.oprofile.core.linux.{x86,x86_64,ppc}</emphasis></code> directories exist (in the Eclipse <code>
+					<emphasis role="italic">plugins</emphasis></code> directory), refer to the 
+					<link linkend="Rebuilding_opxml">Rebuilding opxml</link> section for instructions on rebuilding the binary and placing it in the proper directory. Otherwise, re-install the plug-in.
+				</para>
+			</section>
+		</section>
+		<section id="No_Samples_From_A_Profile">
+			<title>No Samples From A Profile</title>
+			<para>It is possible for a profile run of a program to return no samples, resulting in no <code>current</code> session displayed. This is not always indicative of a problem with either OProfile or the profiled program. OProfile is a system-wide profiling tool; hence, other active processes running on your system may overshadow your program. This is particularly true if the profiled program is not CPU intensive. </para>
+			<para>In addition, the 
+				<emphasis role="italic">Event</emphasis> you choose (selected through the 
+				<emphasis role="bold">
+					<emphasis role="italic">Events</emphasis>
+				</emphasis> tab, as described in 
+				<link linkend="Regular_Mode">Regular Mode</link>) could cause a profile to return no samples; for example the event 
+				<emphasis role="italic">BR_CND_MISSP_EXEC</emphasis> will only provide samples if a branch was mispredicted by the processor. Note also that due to the statistical nature of OProfile, profiling is neither deterministic nor consistent; two subsequent runs may output very different results. In some cases, one run can result in no samples, while another run on the same program can result in many samples. The OProfile online documentation has other useful information 
+				<ulink url="http://oprofile.sourceforge.net/doc/results.html#no-results">here</ulink>.
+			</para>
+			<para>Solution: The following suggestions could help you generate more samples from a profile run:</para>
+			<itemizedlist>
+				<listitem>
+					<para>run your program with a larger input</para>
+				</listitem>
+				<listitem>
+					<para>halt or kill as many other non-essential processes as possible </para>
+				</listitem>
+				<listitem>
+					<para>reduce the 
+						<emphasis role="italic">Count</emphasis> in the 
+						<link linkend="Event_Configuration">Event Configuration</link> tab
+					</para>
+				</listitem>
+				<listitem>
+					<para>launch a profile several times </para>
+				</listitem>
+			</itemizedlist>
+			<para>If you are unsure whether your configuration is working correctly, try profiling the sample project in the 
+				<link linkend="Example_Project">Example Project</link> section.
+			</para>
+		</section>
+		<section id="Log_Reader_Hangs">
+			<title>Log Reader Hangs</title>
+			<para>If the OProfile daemon log file is too large, the log reader may hang and possibly cause the OProfile plug-in to crash. This occurs when the 
+				<emphasis role="italic">verbosity</emphasis> option is set to <code>all</code>, which results in several hundred MiB of text in the log over several profile runs. If you do require all this data in the log file, do not launch the log reader. Delete or backup the log file before running the log reader again.
+			</para>
+		</section>
+		<section id="Errors_Related_to_opxml">
+			<title>Errors Related to opxml</title>
+			<para><code>opxml</code> is the native program that bridges OProfile and the OProfile plug-in for Eclipse. In some cases, some errors may be caused by problems with <code>opxml</code>. To verify if this is the case, run <code>opxml</code>.</para>
+			<para><code>opxml</code> is normally located in the Eclipse <code>
+				<emphasis role="italic">plugins</emphasis></code> directory, similar to the install scripts described in 
+				<link linkend="Step_1_-_Locate_the_Installation_Scripts">Step 1 - Locate the Installation Scripts</link>. However, depending on your platform, the location of <code>opxml</code> will be different. To determine what your platform is, run the following command at a terminal:
+			</para>
+			<variablelist>
+				<listitem>
+					<para></para>
+					<variablelist>
+						<listitem>
+							<para><code>uname -m</code></para>
+						</listitem>
+					</variablelist>
+				</listitem>
+			</variablelist>
+			<para>Depending on the output, locate the following directory in the same manner as 
+				<link linkend="Step_1_-_Locate_the_Installation_Scripts">Step 1 - Locate the Installation Scripts</link>, and change into that directory:
+			</para>
+			<informaltable>
+				<tr>
+					<th>Output from <code>uname -m</code></th>
+					<th>Directory to use in <code>find</code> command</th>
+					<th>Sub-directory to change to</th>
+				</tr>
+				<tr>
+					<td>i386, i468, i568, i686, x86</td>
+					<td>org.eclipse.linuxtools.oprofile.core.linux.x86</td>
+					<td>os/linux/x86</td>
+				</tr>
+				<tr>
+					<td>x86_64</td>
+					<td>org.eclipse.linuxtools.oprofile.core.linux.x86_64</td>
+					<td>os/linux/x86_64</td>
+				</tr>
+				<tr>
+					<td>ppc, ppc64</td>
+					<td>org.eclipse.linuxtools.oprofile.core.linux.ppc</td>
+					<td>os/linux/ppc</td>
+				</tr>
+			</informaltable>
+			<para>For example, if you are running Eclipse on a 64bit machine (i.e. x86_64), you should run the following command to find the location of <code>opxml</code>:</para>
+			<variablelist>
+				<listitem>
+					<para><code>$ find /home/ksebasti/eclipse -name 'org.eclipse.linuxtools.oprofile.core.linux.x86_64_*'</code></para>
+				</listitem>
+			</variablelist>
+			<para>This will display the following output (or similar):</para>
+			<variablelist>
+				<listitem>
+					<para><code>/home/ksebasti/eclipse/plugins/org.eclipse.linuxtools.oprofile.core.linux.x86_64_0.2.0.200904201514</code></para>
+				</listitem>
+			</variablelist>
+			<para>Navigate into that directory:</para>
+			<variablelist>
+				<listitem>
+					<para><code>$ cd /home/ksebasti/eclipse/plugins/org.eclipse.linuxtools.oprofile.core.linux.x86_64_0.2.0.200904201514/os/linux/x86_64</code></para>
+				</listitem>
+			</variablelist>
+			<para>Once you have navigated to the right directory, run the following command:</para>
+			<variablelist>
+				<listitem>
+					<para><code>./opxml info</code></para>
+				</listitem>
+			</variablelist>
+			<para>Check that the paths in the <code>defaults</code> section are correct. If the output is similar to the output of the command <code>ophelp</code>, but formatted as XML, then this might not be the problem. However, if running <code>opxml</code> produces an error, it may be the root cause. A common error on some systems is that they use an older version of the C runtime libraries (i.e. <code>glibc</code>). Refer to 
+				<link linkend="Rebuilding_opxml">Rebuilding opxml</link> for a solution to this error.
+			</para>
+			<para>In any case, if there is an error please look for an 
+				<ulink url="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;short_desc_type=allwordssubstr&amp;short_desc=&amp;classification=Technology&amp;product=Linux+Tools&amp;component=OProfile&amp;long_desc_type=allwordssubstr&amp;long_desc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;status_whiteboard_type=allwordssubstr&amp;status_whiteboard=&amp;keywords_type=allwords&amp;keywords=&amp;emailtype1=substring&amp;email1=&amp;emailtype2=substring&amp;email2=&amp;bugidtype=include&amp;bug_id=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;cmdtype=doit&amp;order=Reuse+same+sort+as+last+time&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=">existing bug</ulink> or if one does not exist, 
+				<ulink url="https://bugs.eclipse.org/bugs/enter_bug.cgi?assigned_to=ksebasti%40redhat.com&amp;blocked=&amp;bug_file_loc=http%3A%2F%2F&amp;bug_severity=normal&amp;bug_status=NEW&amp;comment=&amp;component=OProfile&amp;contenttypeentry=&amp;contenttypemethod=autodetect&amp;contenttypeselection=text%2Fplain&amp;data=&amp;dependson=&amp;description=&amp;flag_type-1=X&amp;flag_type-2=X&amp;flag_type-4=X&amp;flag_type-6=X&amp;flag_type-7=X&amp;flag_type-8=X&amp;form_name=enter_bug&amp;keywords=&amp;op_sys=Linux&amp;priority=P3&amp;product=Linux%20Tools&amp;qa_contact=&amp;rep_platform=PC&amp;short_desc=&amp;version=0.2">file a new bug</ulink>.
+			</para>
+		</section>
+		<section id="Rebuilding_opxml">
+			<title>Rebuilding opxml</title>
+			<para>You will need to rebuild the <code>opxml</code> binary if running it returns an error similar to the following:</para>
+			<variablelist>
+				<listitem>
+					<para><code>opxml: /some/path/libc.so.6: version `GLIBC_2.8' not found (required by opxml)</code></para>
+				</listitem>
+			</variablelist>
+			<para>
+				<emphasis role="bold">Warning:</emphasis> this is rarely necessary; in some cases, rebuilding the <code>opxml</code> binary may break an otherwise working OProfile plug-in installation. You should only rebuild the <code>opxml</code> binary if you are sure that doing so is the only remaining option in fixing the OProfile plug-in for Eclipse.
+			</para>
+			<para>To rebuild the <code>opxml</code> binary, perform the following steps</para>
+			<orderedlist>
+				<listitem>
+					<para>Follow the exact same steps as 
+						<link linkend="Step_1_-_Locate_the_Installation_Scripts">Step 1 - Locate the Installation Scripts</link>, except instead of changing to the <code>
+						<emphasis role="italic">natives/linux/scripts</emphasis></code> sub-directory, change to the <code>
+						<emphasis role="italic">natives/linux/opxml</emphasis></code> sub-directory of the core plugin. The source files for the <code>opxml</code> binary should be located here.
+					</para>
+				</listitem>
+				<listitem>
+					<para>Rebuilding <code>opxml</code> requires <code>make</code>, <code>g++</code>, the <code>libbfd</code> libraries and the OProfile development libraries. In Fedora, the <code>oprofile-devel</code> package contains the OProfile development libraries; for information about the OProfile development libraries in Ubuntu, refer to 
+						<link linkend="Ubuntu_-_Extra_Requirements">Ubuntu - Extra Requirements</link>.
+					</para>
+				</listitem>
+				<listitem>
+					<para>Run <code>make</code> to build the binary.</para>
+				</listitem>
+				<listitem>
+					<para>Run <code>make install</code> to install the binary into the correct plug-in directory.</para>
+				</listitem>
+				<listitem>
+					<para>Run <code>make clean</code> to remove the extra files created during the build process.</para>
+				</listitem>
+			</orderedlist>
+			<section id="Ubuntu_-_Extra_Requirements">
+				<title>Ubuntu - Extra Requirements</title>
+				<para>Ubuntu and other Debian-based systems do not provide the OProfile development libraries in their packaging management system, so we must build them by hand. To do so, perform the following steps:</para>
+				<orderedlist>
+					<listitem>
+						<para>Install the packages <code>binutils-dev</code> and <code>libpopt-dev</code>.</para>
+						<itemizedlist>
+							<listitem>
+								<para><code>sudo apt-get install binutils-dev libpopt-dev</code></para>
+							</listitem>
+						</itemizedlist>
+					</listitem>
+					<listitem>
+						<para>Download the OProfile source.</para>
+						<itemizedlist>
+							<listitem>
+								<para><code>apt-get source oprofile</code></para>
+							</listitem>
+						</itemizedlist>
+					</listitem>
+					<listitem>
+						<para>Unpack the OProfile source tarball.</para>
+						<itemizedlist>
+							<listitem>
+								<para><code>cd oprofile-0.9.3 ; tar -zxf oprofile_0.9.3-1.1ubuntu2.tar.gz</code></para>
+							</listitem>
+						</itemizedlist>
+					</listitem>
+					<listitem>
+						<para>Run the <code>configure</code> tool.</para>
+						<itemizedlist>
+							<listitem>
+								<para><code>cd oprofile-0.9.3 ; ./configure --without-kernel-support</code></para>
+							</listitem>
+						</itemizedlist>
+					</listitem>
+					<listitem>
+						<para>Compile the required libraries.</para>
+						<itemizedlist>
+							<listitem>
+								<para><code>make</code></para>
+							</listitem>
+						</itemizedlist>
+					</listitem>
+					<listitem>
+						<para>Move the libraries into the include path.</para>
+						<itemizedlist>
+							<listitem>
+								<para><code>sudo mv libutil/op_types.h libop/op_sample_file.h libutil/op_list.h libop/op_events.h libop/op_cpu_type.h libop/op_config.h libdb/odb.h /usr/include</code></para>
+							</listitem>
+							<listitem>
+								<para><code>sudo mv libop/libop.a libdb/libodb.a /usr/lib</code></para>
+							</listitem>
+							<listitem>
+								<para><code>sudo mv libabi/libabi.a /usr/lib/libopabi.a</code></para>
+							</listitem>
+							<listitem>
+								<para><code>sudo mv libutil/libutil.a /usr/lib/liboputil.a</code></para>
+							</listitem>
+							<listitem>
+								<para><code>sudo mv libutil++/libutil++.a /usr/lib/liboputil++.a</code></para>
+							</listitem>
+						</itemizedlist>
+					</listitem>
+				</orderedlist>
+				<para>The required libraries should now be in the proper place for compiling. Continue the steps in the 
+					<link linkend="Rebuilding_opxml">Rebuilding opxml</link> section.
+				</para>
+				<para>
+					<emphasis role="bold">Note:</emphasis> The procedure for building the OProfile development libraries for Ubuntu (described in this section) was tested on Ubuntu 8.04 with Eclipse, the CDT, oprofile and all its dependencies already installed via <code>apt</code>.
+				</para>
+			</section>
+		</section>
+	</chapter>
+	<chapter id="Updating_This_Document">
+		<title>Updating This Document</title>
+		<para>This document is maintained in a collaborative wiki.  If you wish to update or modify this document please visit 
+
+			<ulink url="http://wiki.eclipse.org/Linux_Tools_Project/OProfile/User_Guide">http://wiki.eclipse.org/Linux_Tools_Project/OProfile/User_Guide</ulink>
+		</para>
+	</chapter>
+</book>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/OProfile-View.html b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/OProfile-View.html
new file mode 100644
index 0000000..cc3596e
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/OProfile-View.html
@@ -0,0 +1,148 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>OProfile Reference - OProfile View</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">OProfile View</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Profiling-Configuration.html" title="Profiling Configuration">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Example-Project.html" title="Example Project">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Profiling Configuration</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Example Project</td>
+			</tr>
+		</table><hr/>
+		<h1 id="OProfile_View">OProfile View</h1>
+		<p>The OProfile view is the central point of interaction of the plug-in with the results of profiling.</p>
+		<p>
+			<img border="0" src="images/Screenshot-oprofile_view_full.png"/>
+		</p>
+		<p>The tree structure displayed above describes one or more profiles of one or more events in the following manner:</p>
+		<ul>
+			<li>
+				<img border="0" src="images/Icon-oprofile_event.gif"/> Events -- the name of the profiling event used by OProfile (e.g. <code>CPU_CLK_UNHALTED</code>)
+				<ul>
+					<li>
+						<img border="0" src="images/Icon-oprofile_session.gif"/> Session -- the name of the session the profile is stored in (e.g. <code>run1</code>)
+						<ul>
+							<li>
+								<img border="0" src="images/Icon-oprofile_image.gif"/> Image -- the binary being profiled (e.g. 
+								<i><code>/notnfs/ksebasti/oprofile/plugin/factorial/Debug/factorial</code></i>)
+								<ul>
+									<li>
+										<img border="0" src="images/Icon-oprofile_symbol.gif"/> Symbol -- symbols gathered from the binary's debug information (e.g. <code>factorial2</code>)
+										<ul>
+											<li>
+												<img border="0" src="images/Icon-oprofile_sample.gif"/> Sample -- individual OProfile samples correlated to line numbers of source code
+											</li>
+										</ul>
+									</li>
+									<li>
+										<img border="0" src="images/Icon-oprofile_dependent.gif"/> Dependent Images -- other binaries related to the run of the program; shared libraries or kernel modules
+										<ul>
+											<li>
+												<img border="0" src="images/Icon-oprofile_image.gif"/> Image -- the dependent binary 
+												<ul>
+													<li>
+														<img border="0" src="images/Icon-oprofile_symbol.gif"/> Symbol -- same as above
+														<ul>
+															<li>
+																<img border="0" src="images/Icon-oprofile_sample.gif"/> Sample -- same as above
+															</li>
+														</ul>
+													</li>
+												</ul>
+											</li>
+										</ul>
+									</li>
+								</ul>
+							</li>
+						</ul>
+					</li>
+				</ul>
+			</li>
+		</ul>
+		<p>If source code is not available, some symbols (including source file name) may be shown, but no samples. This is normally the case with programs that use shared libraries. Also, depending on the 
+			<a href="Profiling-Configuration.html#Global_Settings">Global Settings</a>, a profile may have no dependent images.
+		</p>
+		<p>Note that after Eclipse is restarted, there will be no data shown in the OProfile view. Data from past profiles will still be on the system, if not touched otherwise, and can be re-read with the <u>Refresh View</u> menu action (refer to the 
+			<a href="OProfile-View.html#View_Menu">View Menu</a> section for more details).
+		</p>
+		<h2 id="Features">Features</h2>
+		<p>This section describes the features of the plug-in exposed through the view.</p>
+		<h3 id="View_Tree">View Tree</h3>
+		<p>Double-clicking on a 
+			<img border="0" src="images/Icon-oprofile_sample.gif"/>sample will open the source file in an editor and place the insertion point at the corresponding line in code.
+		</p>
+		<p>
+			<b>Note:</b> For this to work, the source code must be available and it must be in the correct directory (as described in the debug info of the binary).
+		</p>
+		<h3 id="View_Menu">View Menu</h3>
+		<dl>
+			<dt>Open OProfile Daemon Log</dt>
+			<dd>This will launch a dialog showing the contents of the OProfile daemon log. 
+				<br/>
+				<img border="0" src="images/Screenshot-oprofiled_log_reader.png"/>
+				<br/>By default, the OProfile daemon log is in <code>
+				<i>/var/lib/oprofile/samples/oprofiled.log</i></code>
+			</dd>
+		</dl>
+		<dl>
+			<dt>Refresh View</dt>
+			<dd>This will re-read the OProfile data on the system, re-create the internal data model and re-display the profile tree. Doing so allows you to display data already on the system without launching a profile (e.g. when Eclipse first starts up).</dd>
+		</dl>
+		<dl>
+			<dt>Save Default Session</dt>
+			<dd>The default session, named <code>current</code>, is overwritten on each launch of a profile if it is not saved. If you wish to keep a profile for later viewing, this menu action will allow you to save the session to a different name.
+				<br/>Since the samples are in a system directory, this operation requires root privileges; hence, you will be prompted for the root password. The 
+				<b>
+					<i>Save Session</i>
+				</b> dialog is shown below:
+			</dd>
+		</dl>
+		<p>
+			<img border="0" src="images/Screenshot-oprofile_save_session.png"/>
+		</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Profiling-Configuration.html" title="Profiling Configuration">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="OProfile Reference.html" title="OProfile Reference">
+						<img alt="OProfile Reference" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right">
+					<a href="Example-Project.html" title="Example Project">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Profiling Configuration</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Example Project</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/Profiling-Configuration.html b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/Profiling-Configuration.html
new file mode 100644
index 0000000..89fc38c
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/Profiling-Configuration.html
@@ -0,0 +1,227 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>OProfile Reference - Profiling Configuration</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Profiling Configuration</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Launching-A-Profile.html" title="Launching A Profile">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="OProfile-View.html" title="OProfile View">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Launching A Profile</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">OProfile View</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Profiling_Configuration">Profiling Configuration</h1>
+		<p>OProfile has many configuration options, the amount of which can be overwhelming. For more information about these options, refer to 
+			<a href="http://oprofile.sourceforge.net/doc/controlling.html">http://oprofile.sourceforge.net/doc/controlling.html</a>. The 
+			<b>
+				<i>Profile Configurations</i>
+			</b> menu provided by the OProfile plug-in aims to make relevant, commonly-used OProfile configuration options easily accessible to users of all experience levels. Currently, the 
+			<b>
+				<i>Profile Configurations</i>
+			</b> menu provides two configuration tabs to the standard CDT launch configuration: 
+			<a href="Profiling-Configuration.html#Global_Settings">Global Settings</a> and 
+			<a href="Profiling-Configuration.html#Event_Configuration">Event Configuration</a>.
+		</p>
+		<h2 id="Global_Settings">Global Settings</h2>
+		<p>The 
+			<b>
+				<i>Global Settings</i>
+			</b> tab configures how the OProfile daemon gathers profiling information. Each option is described below.
+
+			<img border="0" src="images/Screenshot-global_config.png"/>
+		</p>
+		<dl>
+			<dt>Kernel Image File (optional)</dt>
+			<dd>To collect more detailed information about the operation of a program in the Linux kernel, use the <u>Browse</u> button specify the location of your running kernel's 
+				<i><code>vmlinux</code></i> file. A kernel's 
+				<i><code>vmlinux</code></i> file contains debugging information required by OProfile. Note that the compressed 
+				<i>vmlinux</i> file, often named 
+				<i><code>vmlinuz</code></i>, cannot be used for this purpose. 
+				<br/> Note: For this option to have any effect, you must enable the 
+				<b>
+					<i>Include dependent kernel modules</i>
+				</b> option.
+			</dd>
+		</dl>
+		<dl>
+			<dt>Include dependent shared libraries</dt>
+			<dd>This option will make OProfile include samples from shared libraries that are used by the profiled binary/program. These samples will then be aggregated in the profile results.</dd>
+		</dl>
+		<dl>
+			<dt>Include dependent kernel modules</dt>
+			<dd>This option will make OProfile include samples related to running in the kernel. If the 
+				<i><code>vmlinux</code></i> file is specified, the profile will include details of the specific kernel modules in use. Otherwise, kernel samples will be grouped under the name <code>no-vmlinux</code>.
+			</dd>
+		</dl>
+		<p>The differences between the options are illustrated in the following OProfile view screenshot:</p>
+		<p>
+			<img border="0" src="images/Screenshot-oprofile_global_differences.png"/>
+		</p>
+		<ul>
+			<li><code>incl_library</code> was run with only the 
+				<b>
+					<i>Include dependent shared libraries</i>
+				</b> checked
+			</li>
+			<li><code>incl_vmlinux</code> was run with the 
+				<i><code>vmlinux</code></i> file specified; both 
+				<b>
+					<i>Include dependent shared libraries</i>
+				</b> and 
+				<b>
+					<i>Include dependent kernel modules</i>
+				</b> checked
+			</li>
+			<li><code>no_vmlinux</code> was run without any 
+				<i><code>vmlinux</code></i> file specified; both 
+				<b>
+					<i>Include dependent shared libraries</i>
+				</b> and 
+				<b>
+					<i>Include dependent kernel modules</i>
+				</b> checked
+			</li>
+			<li><code>novmlinux_noseparate</code> was run with none of the options checked</li>
+		</ul>
+		<h2 id="Event_Configuration">Event Configuration</h2>
+		<p>Your system processor's hardware profiling registers often contain a large number of options. The 
+			<b>
+				<i>Event Configuration</i>
+			</b> tab condenses these options to a more manageable amount.
+		</p>
+		<h3 id="Timer_Interrupt_Mode">Timer Interrupt Mode</h3>
+		<p>If your processor (or kernel) does not support the hardware profiling registers OProfile uses, OProfile will run in 
+			<i>timer-interrupt mode</i>. This mode has no user-configurable events. For more information about 
+			<i>timer-interrupt mode</i>, refer to 
+			<a href="http://oprofile.sourceforge.net/doc/detailed-parameters.html#timer">http://oprofile.sourceforge.net/doc/detailed-parameters.html#timer</a>.
+		</p>
+		<p>The event configuration tab will then look like the screenshot below:</p>
+		<p>
+			<img border="0" src="images/Screenshot-oprofile_event_timer.png"/>
+		</p>
+		<h3 id="Regular_Mode">Regular Mode</h3>
+		<p>If your processor (or kernel) supports hardware profiling registers, there are several configuration options available to you. The availability of these configuration options depend on your processor model or kernel version. With proper support, the 
+			<b>
+				<i>Events</i>
+			</b> configuration tab will look like the following screenshot:
+		</p>
+		<p>
+			<img border="0" src="images/Screenshot-oprofile_eventconfig.png"/>
+		</p>
+		<p>In 
+			<i>regular mode</i>, the 
+			<b>
+				<i>Events</i>
+			</b> configuration tab can contain any of the following options:
+		</p>
+		<dl>
+			<dt>Use default event</dt>
+			<dd>This option is enabled by default when creating a new profile configuration, or when a profile configuration is created through the 
+				<a href="Launching-A-Profile.html#One-Click_Launch">one-click launch</a>. 
+				<b>
+					<i>Use default event</i>
+				</b> is a shortcut to use an event based on processor execution time, with a reasonable value for the 
+				<b>
+					<i>Count</i>
+				</b> option. Using this option will prevent you from configuring the counters any further.
+				<br/> For a list of default events for various processors, refer to 
+				<a href="http://oprofile.sourceforge.net/doc/controlling.html#eventspec">http://oprofile.sourceforge.net/doc/controlling.html#eventspec</a>.
+			</dd>
+		</dl>
+		<dl>
+			<dt>Counter Tabs (
+				<b>
+					<i>Ctr 0</i>
+				</b>, 
+				<b>
+					<i>Ctr 1</i>
+				</b>, 
+				<b>
+					<i>Ctr 2</i>
+				</b>, and so on)
+			</dt>
+			<dd>A processor may have 1 to 8 hardware profiling registers (also called counters). Each one may be programmed separately to profile many events simultaneously. Each tabs labelled 
+				<i>Ctr</i> represents one counter and exposes the same options.
+			</dd>
+		</dl>
+		<dl>
+			<dt>Enabled</dt>
+			<dd>This option (located in each counter tab) disables or enables a counter.</dd>
+		</dl>
+		<dl>
+			<dt>Event List</dt>
+			<dd>A list of the events available for profiling on a given counter.</dd>
+		</dl>
+		<dl>
+			<dt>Event Description</dt>
+			<dd>When you select an event from the events list, this field provides a short description of that event's function. OProfile provides the content for this field.</dd>
+		</dl>
+		<dl>
+			<dt>Profile Kernel and Profile user binaries</dt>
+			<dd>Instructs OProfile to profile binaries in the selected spaces. Keeping both checked is recommended (even if other 
+				<a href="Profiling-Configuration.html#Global_Settings">Global Settings</a> are not specified).
+			</dd>
+		</dl>
+		<dl>
+			<dt>Count</dt>
+			<dd>Specifies a reset count for the hardware counter. In most cases, the default value (based on the CPU clock frequency) is sufficient. Each event has a minimum value, but it is recommended to use a value many orders of magnitude larger.
+				<br/> 
+				<b>WARNING</b>: if you specify a value that is too low, the profiled program may take much longer to return or your system may hang.
+			</dd>
+		</dl>
+		<dl>
+			<dt>Unit Mask</dt>
+			<dd>Many events have a 
+				<i>unit mask</i> which allows further narrowing of the scope of the event. If in doubt, use the default value (specified by OProfile). There are three types of unit masks:
+			</dd>
+		</dl>
+		<ul>
+			<li>Mandatory -- no selection necessary; a single required value</li>
+			<li>Exclusive -- several possible values; a single required value</li>
+			<li>Bitmask -- several possible values; a combination of several values</li>
+		</ul><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Launching-A-Profile.html" title="Launching A Profile">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="OProfile Reference.html" title="OProfile Reference">
+						<img alt="OProfile Reference" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right">
+					<a href="OProfile-View.html" title="OProfile View">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Launching A Profile</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">OProfile View</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/Troubleshooting.html b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/Troubleshooting.html
new file mode 100644
index 0000000..c586dc5
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/Troubleshooting.html
@@ -0,0 +1,278 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>OProfile Reference - Troubleshooting</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Troubleshooting</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Example-Project.html" title="Example Project">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Updating-This-Document.html" title="Updating This Document">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Example Project</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Updating This Document</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Troubleshooting">Troubleshooting</h1>
+		<p>Various problems and their solutions are described here. If you encounter a problem not described here, please 
+			<a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?assigned_to=ksebasti%40redhat.com&amp;blocked=&amp;bug_file_loc=http%3A%2F%2F&amp;bug_severity=normal&amp;bug_status=NEW&amp;comment=&amp;component=OProfile&amp;contenttypeentry=&amp;contenttypemethod=autodetect&amp;contenttypeselection=text%2Fplain&amp;data=&amp;dependson=&amp;description=&amp;flag_type-1=X&amp;flag_type-2=X&amp;flag_type-4=X&amp;flag_type-6=X&amp;flag_type-7=X&amp;flag_type-8=X&amp;form_name=enter_bug&amp;keywords=&amp;op_sys=Linux&amp;priority=P3&amp;product=Linux%20Tools&amp;qa_contact=&amp;rep_platform=PC&amp;short_desc=">file a bug</a>.
+		</p>
+		<h2 id="Install_Script_Errors">Install Script Errors</h2>
+		<p>This section describes different errors that could occur from running the install scripts (i.e. <code>
+			<i>install.sh</i></code> or <code>
+			<i>install-noconsolehelper.sh</i></code>) 
+		</p>
+		<h3 id="Error:_script_must_be_run_as_the_root_user">Error: script must be run as the root user</h3>
+		<p>You attempted to run the script as an ordinary, non-root user. You must be the root user to run the install script, as the scripts edit files located in root-owned directories. </p>
+		<p>Solution: Run the command <code>su -</code> to become the root user, or run the script as the root user with <code>su -c './install.sh'</code>.</p>
+		<h3 id="Error:_script_must_be_run_with_pwd_in_script_dir">Error: script must be run with pwd in script dir</h3>
+		<p>Your current working directory must be the <code>
+			<i>natives/linux/scripts</i></code> subdirectory of the OProfile core plug-in; running the script relative from another location will not work. 
+		</p>
+		<p>Solution: Simply follow the steps on 
+			<a href="Installation-and-Set-Up.html#Step_1_-_Locate_the_Installation_Scripts">Step 1 - Locate the Installation Scripts</a> to find the <code>
+			<i>natives/linux/scripts</i></code> subdirectory of the OProfile core plug-in.
+		</p>
+		<h3 id="Error:_required_binaries_do_not_exist.2C_OProfile_not_installed.3F">Error: required binaries do not exist, OProfile not installed?</h3>
+		<p>The OProfile plug-in could not find the <code>
+			<i>oprofiled</i></code> and <code>
+			<i>opcontrol</i></code> binaries. This could mean they are not in their default directory (<code>
+			<i>/usr/bin</i></code>), or they do not exist at all.
+		</p>
+		<p>Solution: If the binaries are on your system (and in your <code>PATH</code>) but not in those directories, you can either remove these checks from the install script or create symlinks in the <code>
+			<i>/usr/bin</i></code> directory. Of course, if the binaries do not exist on your system, then install the <code>
+			<i>oprofile</i></code> package.
+		</p>
+		<h3 id="Error:_.2Fusr.2Fbin.2Fconsolehelper_does_not_exist.2C_run_install-noconsolehelper.sh_instead">Error: /usr/bin/consolehelper does not exist, run install-noconsolehelper.sh instead</h3>
+		<p>You ran the <code>
+			<i>install.sh</i></code> script, but <code>consolehelper</code> was not installed on your system.
+			As described in 
+			<a href="Installation-and-Set-Up.html#Step_2_-_Choose_Which_Installation_Script_To_Run">Step 2 - Choose Which Installation Script To Run</a>, if <code>consolehelper</code> is not installed, then you will need to use a root authentication mode that uses the <code>sudo</code> mechanism.
+		</p>
+		<p>Solution: Run the <code>
+			<i>install-noconsolehelper.sh</i></code> script instead.
+		</p>
+		<h3 id="Error:_cannot_create_opcontrol_wrapper_in_.3Cdirectory.3E">Error: cannot create opcontrol wrapper in &lt;directory></h3>
+		<p>The <code>ln</code> command reports that the symlink could not be created. This can occur if the <code>
+			<i>natives/linux/scripts</i></code> subdirectory is located on an NFS mount; the NFS server will not allow the local root user to create files in the directory.
+		</p>
+		<p>Solution: Before running the <code>
+			<i>install.sh</i></code> script, first create the symlink as a regular user by running the command <code>ln -s /usr/bin/consolehelper opcontrol</code>. Then, remove the following section from the <code>
+			<i>install.sh</i></code> script:
+		</p>
+		<pre>#create the sym link to consolehelper
+test -L ./opcontrol || { rm -f ./opcontrol &amp;&amp; ln -s /usr/bin/consolehelper opcontrol ; }
+if [ $? -ne 0 ]; then
+  echo Error: cannot create opcontrol wrapper in `pwd`
+  exit 1
+fi
+</pre>
+		<p>The <code>
+			<i>install.sh</i></code> script is fixed in the most recent version of the OProfile plug-in for Eclipse, but not in the 0.2.0 release.
+		</p>
+		<h3 id="Error:_cannot_find_opxml_binary.2C_required_plugin_missing">Error: cannot find opxml binary, required plugin missing</h3>
+		<p>This can occur if the native binary <code>
+			<i>opxml</i></code> is not found. This binary is required for proper operation of the plug-in.
+		</p>
+		<p>Solution: If the <code>
+			<i>org.eclipse.linuxtools.oprofile.core.linux.{x86,x86_64,ppc}</i></code> directories exist (in the Eclipse <code>
+			<i>plugins</i></code> directory), refer to the 
+			<a href="Troubleshooting.html#Rebuilding_opxml">Rebuilding opxml</a> section for instructions on rebuilding the binary and placing it in the proper directory. Otherwise, re-install the plug-in.
+		</p>
+		<h2 id="No_Samples_From_A_Profile">No Samples From A Profile</h2>
+		<p>It is possible for a profile run of a program to return no samples, resulting in no <code>current</code> session displayed. This is not always indicative of a problem with either OProfile or the profiled program. OProfile is a system-wide profiling tool; hence, other active processes running on your system may overshadow your program. This is particularly true if the profiled program is not CPU intensive. </p>
+		<p>In addition, the 
+			<i>Event</i> you choose (selected through the 
+			<b>
+				<i>Events</i>
+			</b> tab, as described in 
+			<a href="Profiling-Configuration.html#Regular_Mode">Regular Mode</a>) could cause a profile to return no samples; for example the event 
+			<i>BR_CND_MISSP_EXEC</i> will only provide samples if a branch was mispredicted by the processor. Note also that due to the statistical nature of OProfile, profiling is neither deterministic nor consistent; two subsequent runs may output very different results. In some cases, one run can result in no samples, while another run on the same program can result in many samples. The OProfile online documentation has other useful information 
+			<a href="http://oprofile.sourceforge.net/doc/results.html#no-results">here</a>.
+		</p>
+		<p>Solution: The following suggestions could help you generate more samples from a profile run:</p>
+		<ul>
+			<li>run your program with a larger input</li>
+			<li>halt or kill as many other non-essential processes as possible </li>
+			<li>reduce the 
+				<i>Count</i> in the 
+				<a href="Profiling-Configuration.html#Event_Configuration">Event Configuration</a> tab
+			</li>
+			<li>launch a profile several times </li>
+		</ul>
+		<p>If you are unsure whether your configuration is working correctly, try profiling the sample project in the 
+			<a href="Example-Project.html#Example_Project">Example Project</a> section.
+		</p>
+		<h2 id="Log_Reader_Hangs">Log Reader Hangs</h2>
+		<p>If the OProfile daemon log file is too large, the log reader may hang and possibly cause the OProfile plug-in to crash. This occurs when the 
+			<i>verbosity</i> option is set to <code>all</code>, which results in several hundred MiB of text in the log over several profile runs. If you do require all this data in the log file, do not launch the log reader. Delete or backup the log file before running the log reader again.
+		</p>
+		<h2 id="Errors_Related_to_opxml">Errors Related to opxml</h2>
+		<p><code>opxml</code> is the native program that bridges OProfile and the OProfile plug-in for Eclipse. In some cases, some errors may be caused by problems with <code>opxml</code>. To verify if this is the case, run <code>opxml</code>.</p>
+		<p><code>opxml</code> is normally located in the Eclipse <code>
+			<i>plugins</i></code> directory, similar to the install scripts described in 
+			<a href="Installation-and-Set-Up.html#Step_1_-_Locate_the_Installation_Scripts">Step 1 - Locate the Installation Scripts</a>. However, depending on your platform, the location of <code>opxml</code> will be different. To determine what your platform is, run the following command at a terminal:
+		</p>
+		<dl>
+			<dd>
+				<dl>
+					<dd><code>uname -m</code></dd>
+				</dl>
+			</dd>
+		</dl>
+		<p>Depending on the output, locate the following directory in the same manner as 
+			<a href="Installation-and-Set-Up.html#Step_1_-_Locate_the_Installation_Scripts">Step 1 - Locate the Installation Scripts</a>, and change into that directory:
+		</p>
+		<table border="1">
+			<tr>
+				<th>Output from <code>uname -m</code></th>
+				<th>Directory to use in <code>find</code> command</th>
+				<th>Sub-directory to change to</th>
+			</tr>
+			<tr>
+				<td>i386, i468, i568, i686, x86</td>
+				<td>org.eclipse.linuxtools.oprofile.core.linux.x86</td>
+				<td>os/linux/x86</td>
+			</tr>
+			<tr>
+				<td>x86_64</td>
+				<td>org.eclipse.linuxtools.oprofile.core.linux.x86_64</td>
+				<td>os/linux/x86_64</td>
+			</tr>
+			<tr>
+				<td>ppc, ppc64</td>
+				<td>org.eclipse.linuxtools.oprofile.core.linux.ppc</td>
+				<td>os/linux/ppc</td>
+			</tr>
+		</table>
+		<p>For example, if you are running Eclipse on a 64bit machine (i.e. x86_64), you should run the following command to find the location of <code>opxml</code>:</p>
+		<dl>
+			<dd><code>$ find /home/ksebasti/eclipse -name 'org.eclipse.linuxtools.oprofile.core.linux.x86_64_*'</code></dd>
+		</dl>
+		<p>This will display the following output (or similar):</p>
+		<dl>
+			<dd><code>/home/ksebasti/eclipse/plugins/org.eclipse.linuxtools.oprofile.core.linux.x86_64_0.2.0.200904201514</code></dd>
+		</dl>
+		<p>Navigate into that directory:</p>
+		<dl>
+			<dd><code>$ cd /home/ksebasti/eclipse/plugins/org.eclipse.linuxtools.oprofile.core.linux.x86_64_0.2.0.200904201514/os/linux/x86_64</code></dd>
+		</dl>
+		<p>Once you have navigated to the right directory, run the following command:</p>
+		<dl>
+			<dd><code>./opxml info</code></dd>
+		</dl>
+		<p>Check that the paths in the <code>defaults</code> section are correct. If the output is similar to the output of the command <code>ophelp</code>, but formatted as XML, then this might not be the problem. However, if running <code>opxml</code> produces an error, it may be the root cause. A common error on some systems is that they use an older version of the C runtime libraries (i.e. <code>glibc</code>). Refer to 
+			<a href="Troubleshooting.html#Rebuilding_opxml">Rebuilding opxml</a> for a solution to this error.
+		</p>
+		<p>In any case, if there is an error please look for an 
+			<a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;short_desc_type=allwordssubstr&amp;short_desc=&amp;classification=Technology&amp;product=Linux+Tools&amp;component=OProfile&amp;long_desc_type=allwordssubstr&amp;long_desc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;status_whiteboard_type=allwordssubstr&amp;status_whiteboard=&amp;keywords_type=allwords&amp;keywords=&amp;emailtype1=substring&amp;email1=&amp;emailtype2=substring&amp;email2=&amp;bugidtype=include&amp;bug_id=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;cmdtype=doit&amp;order=Reuse+same+sort+as+last+time&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=">existing bug</a> or if one does not exist, 
+			<a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?assigned_to=ksebasti%40redhat.com&amp;blocked=&amp;bug_file_loc=http%3A%2F%2F&amp;bug_severity=normal&amp;bug_status=NEW&amp;comment=&amp;component=OProfile&amp;contenttypeentry=&amp;contenttypemethod=autodetect&amp;contenttypeselection=text%2Fplain&amp;data=&amp;dependson=&amp;description=&amp;flag_type-1=X&amp;flag_type-2=X&amp;flag_type-4=X&amp;flag_type-6=X&amp;flag_type-7=X&amp;flag_type-8=X&amp;form_name=enter_bug&amp;keywords=&amp;op_sys=Linux&amp;priority=P3&amp;product=Linux%20Tools&amp;qa_contact=&amp;rep_platform=PC&amp;short_desc=&amp;version=0.2">file a new bug</a>.
+		</p>
+		<h2 id="Rebuilding_opxml">Rebuilding opxml</h2>
+		<p>You will need to rebuild the <code>opxml</code> binary if running it returns an error similar to the following:</p>
+		<dl>
+			<dd><code>opxml: /some/path/libc.so.6: version `GLIBC_2.8' not found (required by opxml)</code></dd>
+		</dl>
+		<p>
+			<b>Warning:</b> this is rarely necessary; in some cases, rebuilding the <code>opxml</code> binary may break an otherwise working OProfile plug-in installation. You should only rebuild the <code>opxml</code> binary if you are sure that doing so is the only remaining option in fixing the OProfile plug-in for Eclipse.
+		</p>
+		<p>To rebuild the <code>opxml</code> binary, perform the following steps</p>
+		<ol>
+			<li>Follow the exact same steps as 
+				<a href="Installation-and-Set-Up.html#Step_1_-_Locate_the_Installation_Scripts">Step 1 - Locate the Installation Scripts</a>, except instead of changing to the <code>
+				<i>natives/linux/scripts</i></code> sub-directory, change to the <code>
+				<i>natives/linux/opxml</i></code> sub-directory of the core plugin. The source files for the <code>opxml</code> binary should be located here.
+			</li>
+			<li>Rebuilding <code>opxml</code> requires <code>make</code>, <code>g++</code>, the <code>libbfd</code> libraries and the OProfile development libraries. In Fedora, the <code>oprofile-devel</code> package contains the OProfile development libraries; for information about the OProfile development libraries in Ubuntu, refer to 
+				<a href="Troubleshooting.html#Ubuntu_-_Extra_Requirements">Ubuntu - Extra Requirements</a>.
+			</li>
+			<li>Run <code>make</code> to build the binary.</li>
+			<li>Run <code>make install</code> to install the binary into the correct plug-in directory.</li>
+			<li>Run <code>make clean</code> to remove the extra files created during the build process.</li>
+		</ol>
+		<h3 id="Ubuntu_-_Extra_Requirements">Ubuntu - Extra Requirements</h3>
+		<p>Ubuntu and other Debian-based systems do not provide the OProfile development libraries in their packaging management system, so we must build them by hand. To do so, perform the following steps:</p>
+		<ol>
+			<li>Install the packages <code>binutils-dev</code> and <code>libpopt-dev</code>.
+				<ul>
+					<li><code>sudo apt-get install binutils-dev libpopt-dev</code></li>
+				</ul>
+			</li>
+			<li>Download the OProfile source.
+				<ul>
+					<li><code>apt-get source oprofile</code></li>
+				</ul>
+			</li>
+			<li>Unpack the OProfile source tarball.
+				<ul>
+					<li><code>cd oprofile-0.9.3 ; tar -zxf oprofile_0.9.3-1.1ubuntu2.tar.gz</code></li>
+				</ul>
+			</li>
+			<li>Run the <code>configure</code> tool.
+				<ul>
+					<li><code>cd oprofile-0.9.3 ; ./configure --without-kernel-support</code></li>
+				</ul>
+			</li>
+			<li>Compile the required libraries.
+				<ul>
+					<li><code>make</code></li>
+				</ul>
+			</li>
+			<li>Move the libraries into the include path.
+				<ul>
+					<li><code>sudo mv libutil/op_types.h libop/op_sample_file.h libutil/op_list.h libop/op_events.h libop/op_cpu_type.h libop/op_config.h libdb/odb.h /usr/include</code></li>
+					<li><code>sudo mv libop/libop.a libdb/libodb.a /usr/lib</code></li>
+					<li><code>sudo mv libabi/libabi.a /usr/lib/libopabi.a</code></li>
+					<li><code>sudo mv libutil/libutil.a /usr/lib/liboputil.a</code></li>
+					<li><code>sudo mv libutil++/libutil++.a /usr/lib/liboputil++.a</code></li>
+				</ul>
+			</li>
+		</ol>
+		<p>The required libraries should now be in the proper place for compiling. Continue the steps in the 
+			<a href="Troubleshooting.html#Rebuilding_opxml">Rebuilding opxml</a> section.
+		</p>
+		<p>
+			<b>Note:</b> The procedure for building the OProfile development libraries for Ubuntu (described in this section) was tested on Ubuntu 8.04 with Eclipse, the CDT, oprofile and all its dependencies already installed via <code>apt</code>.
+		</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Example-Project.html" title="Example Project">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="OProfile Reference.html" title="OProfile Reference">
+						<img alt="OProfile Reference" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right">
+					<a href="Updating-This-Document.html" title="Updating This Document">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Example Project</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Updating This Document</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/Updating-This-Document.html b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/Updating-This-Document.html
new file mode 100644
index 0000000..cf743c8
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/Updating-This-Document.html
@@ -0,0 +1,54 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>OProfile Reference - Updating This Document</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Updating This Document</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Troubleshooting.html" title="Troubleshooting">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right"></td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Troubleshooting</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top"></td>
+			</tr>
+		</table><hr/>
+		<h1 id="Updating_This_Document">Updating This Document</h1>
+		<p>This document is maintained in a collaborative wiki.  If you wish to update or modify this document please visit 
+
+			<a href="http://wiki.eclipse.org/Linux_Tools_Project/OProfile/User_Guide">http://wiki.eclipse.org/Linux_Tools_Project/OProfile/User_Guide</a>
+		</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Troubleshooting.html" title="Troubleshooting">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="OProfile Reference.html" title="OProfile Reference">
+						<img alt="OProfile Reference" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right"></td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Troubleshooting</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top"></td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Icon-oprofile_dependent.gif b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Icon-oprofile_dependent.gif
new file mode 100644
index 0000000..122bada
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Icon-oprofile_dependent.gif
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Icon-oprofile_event.gif b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Icon-oprofile_event.gif
new file mode 100644
index 0000000..c91f254
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Icon-oprofile_event.gif
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Icon-oprofile_image.gif b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Icon-oprofile_image.gif
new file mode 100644
index 0000000..8aa0162
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Icon-oprofile_image.gif
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Icon-oprofile_sample.gif b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Icon-oprofile_sample.gif
new file mode 100644
index 0000000..061161a
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Icon-oprofile_sample.gif
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Icon-oprofile_session.gif b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Icon-oprofile_session.gif
new file mode 100644
index 0000000..c2b41bd
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Icon-oprofile_session.gif
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Icon-oprofile_symbol.gif b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Icon-oprofile_symbol.gif
new file mode 100644
index 0000000..6ae4604
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Icon-oprofile_symbol.gif
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/LinuxTools-0.2.0-OProfile-Screenshot.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/LinuxTools-0.2.0-OProfile-Screenshot.png
new file mode 100644
index 0000000..947b24e
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/LinuxTools-0.2.0-OProfile-Screenshot.png
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Oprofile_manual_dialog.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Oprofile_manual_dialog.png
new file mode 100644
index 0000000..b9232e3
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Oprofile_manual_dialog.png
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Oprofile_manual_shortcut.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Oprofile_manual_shortcut.png
new file mode 100644
index 0000000..3ff8c3d
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Oprofile_manual_shortcut.png
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-global_config.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-global_config.png
new file mode 100644
index 0000000..af97846
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-global_config.png
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-installscript_error_dialog.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-installscript_error_dialog.png
new file mode 100644
index 0000000..3dea3b9
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-installscript_error_dialog.png
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-one-click_launch.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-one-click_launch.png
new file mode 100644
index 0000000..d55d704
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-one-click_launch.png
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-opcontrol_consolehelper.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-opcontrol_consolehelper.png
new file mode 100644
index 0000000..5b2bc10
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-opcontrol_consolehelper.png
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-oprofile_event_timer.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-oprofile_event_timer.png
new file mode 100644
index 0000000..37b3e82
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-oprofile_event_timer.png
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-oprofile_eventconfig.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-oprofile_eventconfig.png
new file mode 100644
index 0000000..d0bc0b6
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-oprofile_eventconfig.png
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-oprofile_global_differences.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-oprofile_global_differences.png
new file mode 100644
index 0000000..5d7cd37
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-oprofile_global_differences.png
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-oprofile_save_session.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-oprofile_save_session.png
new file mode 100644
index 0000000..afb189b
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-oprofile_save_session.png
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-oprofile_view_full.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-oprofile_view_full.png
new file mode 100644
index 0000000..6008028
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-oprofile_view_full.png
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-oprofiled_log_reader.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-oprofiled_log_reader.png
new file mode 100644
index 0000000..5a7f61e
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/userguide/images/Screenshot-oprofiled_log_reader.png
Binary files differ
diff --git a/profiling/.classpath b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.classpath
similarity index 100%
copy from profiling/.classpath
copy to oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.classpath
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.project b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.project
new file mode 100644
index 0000000..a5702a7
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.oprofile.launch.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.settings/org.eclipse.jdt.core.prefs b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..b8349f1
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Tue Mar 17 15:14:26 EDT 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.svnignore b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.svnignore
new file mode 100644
index 0000000..ba077a4
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.svnignore
@@ -0,0 +1 @@
+bin
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/META-INF/MANIFEST.MF b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..0c57733
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,26 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.oprofile.launch.tests
+Bundle-Version: 0.3.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.oprofile.launch.tests.LaunchTestsPlugin
+Bundle-Vendor: %bundleProvider
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources;bundle-version="3.4.1"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Import-Package: junit.framework;version="[3.0.0,4.0.0)",
+ org.eclipse.cdt.core.model,
+ org.eclipse.cdt.launch,
+ org.eclipse.debug.core,
+ org.eclipse.debug.ui,
+ org.eclipse.linuxtools.oprofile.core,
+ org.eclipse.linuxtools.oprofile.core.daemon,
+ org.eclipse.linuxtools.oprofile.launch,
+ org.eclipse.linuxtools.oprofile.launch.configuration,
+ org.eclipse.linuxtools.oprofile.launch.launching,
+ org.eclipse.linuxtools.profiling.tests,
+ org.eclipse.swt,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.widgets
+Bundle-Localization: plugin
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/build.properties b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/build.properties
new file mode 100644
index 0000000..0e80561
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/build.properties
@@ -0,0 +1,13 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.properties,\
+               test.xml,\
+               resources/
+src.includes = META-INF/,\
+               plugin.properties,\
+               src/,\
+               test.xml,\
+               resources/
+individualSourceBundles=true
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/plugin.properties b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/plugin.properties
new file mode 100644
index 0000000..6786c93
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/plugin.properties
@@ -0,0 +1,12 @@
+#*******************************************************************************
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+#*******************************************************************************
+bundleName=OProfile Ui Tests Plug-in (Incubation)
+bundleProvider=Eclipse
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/primeTest/.cproject b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/primeTest/.cproject
new file mode 100644
index 0000000..189e059
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/primeTest/.cproject
@@ -0,0 +1,593 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?>
+
+<cproject>
+<storageModule moduleId="org.eclipse.cdt.core.settings">
+<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.403427377">
+<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.403427377" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+<externalSettings/>
+<extensions>
+<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+</extensions>
+</storageModule>
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<configuration artifactName="primeTest" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.403427377" name="Debug" parent="cdt.managedbuild.config.gnu.exe.debug">
+<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.403427377." name="/" resourcePath="">
+<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.558427244" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
+<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.1359199583" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
+<builder buildPath="${workspace_loc:/primeTest/Debug}" id="cdt.managedbuild.target.gnu.builder.exe.debug.586737917" managedBuildOn="true" name="Gnu Make Builder.Debug" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
+<tool id="cdt.managedbuild.tool.gnu.archiver.base.2089156823" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.838879119" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
+<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.2129883685" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
+<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.900612275" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.890848790" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
+<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.1566991183" superClass="gnu.c.compiler.exe.debug.option.optimization.level" valueType="enumerated"/>
+<option id="gnu.c.compiler.exe.debug.option.debugging.level.733038562" superClass="gnu.c.compiler.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
+<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.582042928" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.1103748863" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug">
+<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.720696663" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
+<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+</inputType>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.1031198340" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug"/>
+<tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.711744790" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug">
+<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1029709722" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+</tool>
+</toolChain>
+</folderInfo>
+</configuration>
+</storageModule>
+<storageModule moduleId="scannerConfiguration">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.403427377;cdt.managedbuild.config.gnu.exe.debug.403427377.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.890848790;cdt.managedbuild.tool.gnu.c.compiler.input.582042928">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.24056498;cdt.managedbuild.config.gnu.exe.release.24056498.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.1686021986;cdt.managedbuild.tool.gnu.c.compiler.input.1357248577">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+</storageModule>
+<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+</cconfiguration>
+<cconfiguration id="cdt.managedbuild.config.gnu.exe.release.24056498">
+<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.24056498" moduleId="org.eclipse.cdt.core.settings" name="Release">
+<externalSettings/>
+<extensions>
+<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+</extensions>
+</storageModule>
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<configuration artifactName="primeTest" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.24056498" name="Release" parent="cdt.managedbuild.config.gnu.exe.release">
+<folderInfo id="cdt.managedbuild.config.gnu.exe.release.24056498." name="/" resourcePath="">
+<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.247847873" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
+<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.2144033541" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
+<builder buildPath="${workspace_loc:/primeTest/Release}" id="cdt.managedbuild.target.gnu.builder.exe.release.1815603600" managedBuildOn="true" name="Gnu Make Builder.Release" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
+<tool id="cdt.managedbuild.tool.gnu.archiver.base.514329033" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.732737648" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
+<option id="gnu.cpp.compiler.exe.release.option.optimization.level.1782789072" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
+<option id="gnu.cpp.compiler.exe.release.option.debugging.level.883245152" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.1686021986" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
+<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.1286291976" superClass="gnu.c.compiler.exe.release.option.optimization.level" valueType="enumerated"/>
+<option id="gnu.c.compiler.exe.release.option.debugging.level.74557006" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
+<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1357248577" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.1980307205" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release">
+<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.1094559692" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
+<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+</inputType>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release.906024509" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.release"/>
+<tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.1057582725" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release">
+<inputType id="cdt.managedbuild.tool.gnu.assembler.input.592314293" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+</tool>
+</toolChain>
+</folderInfo>
+</configuration>
+</storageModule>
+<storageModule moduleId="scannerConfiguration">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.403427377;cdt.managedbuild.config.gnu.exe.debug.403427377.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.890848790;cdt.managedbuild.tool.gnu.c.compiler.input.582042928">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.24056498;cdt.managedbuild.config.gnu.exe.release.24056498.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.1686021986;cdt.managedbuild.tool.gnu.c.compiler.input.1357248577">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+</storageModule>
+</cconfiguration>
+</storageModule>
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<project id="primeTest.cdt.managedbuild.target.gnu.exe.2060231390" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/>
+</storageModule>
+</cproject>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/primeTest/.project b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/primeTest/.project
new file mode 100644
index 0000000..bcbd6b7
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/primeTest/.project
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>primeTest</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>?name?</key>
+					<value></value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.append_environment</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.autoBuildTarget</key>
+					<value>all</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.buildArguments</key>
+					<value></value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.buildCommand</key>
+					<value>make</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.buildLocation</key>
+					<value>${workspace_loc:/primeTest/Debug}</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
+					<value>clean</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.contents</key>
+					<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
+					<value>false</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableFullBuild</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.fullBuildTarget</key>
+					<value>all</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.stopOnError</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+					<value>true</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+	</natures>
+</projectDescription>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/primeTest/primeTest.c b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/primeTest/primeTest.c
new file mode 100644
index 0000000..df4f802
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/primeTest/primeTest.c
@@ -0,0 +1,36 @@
+void
+PrimeFactors(int n)
+{
+  int count = 0;
+  int temp = 0;
+  int i = 0;
+  for (i = 1; i <= n; i++)
+    {
+      int j = i - 1;
+      while (j > 1)
+        {
+          if (i % j == 0) //Is PRIME
+            break;
+          else
+            j--;
+        }
+
+      if (j == 1)
+        {
+          if (n % i == 0)
+            {
+              if (i > temp)
+                temp = i;
+              count++;
+            }
+        }
+    }
+}
+
+int
+main()
+{
+  int a = 35324;
+  PrimeFactors(a);
+  return 0;
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/sleepTest/.cproject b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/sleepTest/.cproject
new file mode 100644
index 0000000..cd18366
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/sleepTest/.cproject
@@ -0,0 +1,593 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?>
+
+<cproject>
+<storageModule moduleId="org.eclipse.cdt.core.settings">
+<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.1175678966">
+<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.1175678966" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+<externalSettings/>
+<extensions>
+<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+</extensions>
+</storageModule>
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<configuration artifactName="sleepTest" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.1175678966" name="Debug" parent="cdt.managedbuild.config.gnu.exe.debug">
+<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.1175678966." name="/" resourcePath="">
+<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.1707235535" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
+<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.1214447499" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
+<builder buildPath="${workspace_loc:/sleepTest/Debug}" id="cdt.managedbuild.target.gnu.builder.exe.debug.1027550092" managedBuildOn="true" name="Gnu Make Builder.Debug" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
+<tool id="cdt.managedbuild.tool.gnu.archiver.base.1529643871" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.339425130" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
+<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.1980513678" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
+<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.587285095" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1711527348" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
+<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.948398850" superClass="gnu.c.compiler.exe.debug.option.optimization.level" valueType="enumerated"/>
+<option id="gnu.c.compiler.exe.debug.option.debugging.level.1175577535" superClass="gnu.c.compiler.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
+<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1219179977" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.546839158" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug">
+<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.1380471818" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
+<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+</inputType>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.1493322213" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug"/>
+<tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.1271920137" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug">
+<inputType id="cdt.managedbuild.tool.gnu.assembler.input.2029809829" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+</tool>
+</toolChain>
+</folderInfo>
+</configuration>
+</storageModule>
+<storageModule moduleId="scannerConfiguration">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1894586679;cdt.managedbuild.config.gnu.exe.release.1894586679.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.1456980182;cdt.managedbuild.tool.gnu.c.compiler.input.1930258097">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.1175678966;cdt.managedbuild.config.gnu.exe.debug.1175678966.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1711527348;cdt.managedbuild.tool.gnu.c.compiler.input.1219179977">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+</storageModule>
+<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+</cconfiguration>
+<cconfiguration id="cdt.managedbuild.config.gnu.exe.release.1894586679">
+<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.1894586679" moduleId="org.eclipse.cdt.core.settings" name="Release">
+<externalSettings/>
+<extensions>
+<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+</extensions>
+</storageModule>
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<configuration artifactName="sleepTest" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.1894586679" name="Release" parent="cdt.managedbuild.config.gnu.exe.release">
+<folderInfo id="cdt.managedbuild.config.gnu.exe.release.1894586679." name="/" resourcePath="">
+<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.1335316415" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
+<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.1056384912" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
+<builder buildPath="${workspace_loc:/sleepTest/Release}" id="cdt.managedbuild.target.gnu.builder.exe.release.1890388296" managedBuildOn="true" name="Gnu Make Builder.Release" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
+<tool id="cdt.managedbuild.tool.gnu.archiver.base.1599654641" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.110695799" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
+<option id="gnu.cpp.compiler.exe.release.option.optimization.level.483218288" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
+<option id="gnu.cpp.compiler.exe.release.option.debugging.level.1740548907" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.1456980182" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
+<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.564508580" superClass="gnu.c.compiler.exe.release.option.optimization.level" valueType="enumerated"/>
+<option id="gnu.c.compiler.exe.release.option.debugging.level.216318945" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
+<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1930258097" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.1609842259" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release">
+<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.1263392915" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
+<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+</inputType>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release.1176128340" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.release"/>
+<tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.1836498428" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release">
+<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1282718375" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+</tool>
+</toolChain>
+</folderInfo>
+</configuration>
+</storageModule>
+<storageModule moduleId="scannerConfiguration">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1894586679;cdt.managedbuild.config.gnu.exe.release.1894586679.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.1456980182;cdt.managedbuild.tool.gnu.c.compiler.input.1930258097">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.1175678966;cdt.managedbuild.config.gnu.exe.debug.1175678966.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1711527348;cdt.managedbuild.tool.gnu.c.compiler.input.1219179977">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+</storageModule>
+</cconfiguration>
+</storageModule>
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<project id="sleepTest.cdt.managedbuild.target.gnu.exe.918644780" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/>
+</storageModule>
+</cproject>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/sleepTest/.project b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/sleepTest/.project
new file mode 100644
index 0000000..8e8d336
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/sleepTest/.project
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>sleepTest</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>?name?</key>
+					<value></value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.append_environment</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.autoBuildTarget</key>
+					<value>all</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.buildArguments</key>
+					<value></value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.buildCommand</key>
+					<value>make</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.buildLocation</key>
+					<value>${workspace_loc:/sleepTest/Debug}</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
+					<value>clean</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.contents</key>
+					<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
+					<value>false</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableFullBuild</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.fullBuildTarget</key>
+					<value>all</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.stopOnError</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+					<value>true</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+	</natures>
+</projectDescription>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/sleepTest/sleepTest.c b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/sleepTest/sleepTest.c
new file mode 100644
index 0000000..e13b08b
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/sleepTest/sleepTest.c
@@ -0,0 +1,6 @@
+#include <unistd.h>
+
+int main() {
+	sleep(10);
+	return 0;
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/AllLaunchTests.java b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/AllLaunchTests.java
new file mode 100644
index 0000000..3109011
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/AllLaunchTests.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.oprofile.launch.tests;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllLaunchTests {
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite("Test for org.eclipse.linuxtools.oprofile.launch.tests"); //$NON-NLS-1$
+		
+		if (LaunchTestsPlugin.RUN_OPROFILE) {
+			suite.addTestSuite(TestLaunching.class);
+			suite.addTestSuite(TestManualLaunching.class);
+			suite.addTestSuite(TestSetup.class);
+		}
+		
+		suite.addTestSuite(TestDummy.class);
+		
+		return suite;
+	}
+
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/LaunchTestsPlugin.java b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/LaunchTestsPlugin.java
new file mode 100644
index 0000000..de44518
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/LaunchTestsPlugin.java
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.oprofile.launch.tests;
+
+import org.eclipse.core.runtime.Plugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class LaunchTestsPlugin extends Plugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.oprofile.launch.tests"; //$NON-NLS-1$
+
+	// The shared instance
+	private static LaunchTestsPlugin plugin;
+	
+	/**
+	 *  Java system properties.
+	 *  usage: -Dorg.eclipse.linuxtools.oprofile.launch.tests.runOprofile=<yes|no> [default: yes]
+	 *  if yes, will run the launch tests
+	 *     no, will skip the launch tests (they all require oprofile to be set up)
+	 */
+	public static final String SYSTEM_PROPERTY_RUN_OPROFILE = "org.eclipse.linuxtools.oprofile.launch.tests.runOprofile"; //$NON-NLS-1$
+	public static final boolean RUN_OPROFILE = System.getProperty(SYSTEM_PROPERTY_RUN_OPROFILE, "yes").equals("yes"); //$NON-NLS-1$ //$NON-NLS-2$
+
+	
+	/**
+	 * The constructor
+	 */
+	public LaunchTestsPlugin() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static LaunchTestsPlugin getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestDummy.java b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestDummy.java
new file mode 100644
index 0000000..82e95fd
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestDummy.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.oprofile.launch.tests;
+
+import junit.framework.TestCase;
+
+// Dummy test just so that the launch tests have something
+// running when oprofile does not
+public class TestDummy extends TestCase {
+	public void testPass() {
+		assertTrue(true);
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestLaunching.java b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestLaunching.java
new file mode 100644
index 0000000..daad084
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestLaunching.java
@@ -0,0 +1,140 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.oprofile.launch.tests;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.ILaunch;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationType;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.debug.core.Launch;
+import org.eclipse.linuxtools.oprofile.core.daemon.OprofileDaemonEvent;
+import org.eclipse.linuxtools.oprofile.core.daemon.OprofileDaemonOptions;
+import org.eclipse.linuxtools.oprofile.launch.OprofileLaunchPlugin;
+import org.eclipse.linuxtools.oprofile.launch.configuration.LaunchOptions;
+import org.eclipse.linuxtools.oprofile.launch.configuration.OprofileEventConfigTab;
+import org.eclipse.linuxtools.oprofile.launch.configuration.OprofileSetupTab;
+import org.eclipse.linuxtools.oprofile.launch.launching.OprofileLaunchConfigurationDelegate;
+import org.eclipse.linuxtools.profiling.tests.AbstractTest;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+
+public class TestLaunching extends AbstractTest {
+	private class testingOprofileLaunchConfigurationDelegate extends OprofileLaunchConfigurationDelegate {
+		public boolean eventsIsNull;
+		public OprofileDaemonOptions _options;  
+		protected void oprofileDumpSamples() { return; }
+		protected void oprofileReset() { return; }
+		protected void oprofileShutdown() { return; }
+		protected void oprofileStartCollection() { return; }
+		protected void oprofileSetupDaemon(OprofileDaemonOptions options, OprofileDaemonEvent[] events) { 
+			_options = options; 
+			eventsIsNull = events == null ? true : false; 
+			return; 
+		}
+		@Override
+		protected void postExec(LaunchOptions options, OprofileDaemonEvent[] daemonEvents, ILaunch launch, Process process) {
+			super.postExec(options, daemonEvents, launch, process);
+			
+			try {
+				process.waitFor();
+			} catch (InterruptedException e) {
+				e.printStackTrace();
+			}		
+		}
+	}
+	
+	protected ILaunchConfiguration config;
+	protected Shell testShell;
+	
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+		proj = createProjectAndBuild(LaunchTestsPlugin.getDefault().getBundle(), "primeTest"); //$NON-NLS-1$
+		config = createConfiguration(proj.getProject());
+		testShell = new Shell(Display.getDefault());
+		testShell.setLayout(new GridLayout());
+	}
+
+	@Override
+	protected void tearDown() throws Exception {
+		testShell.dispose();
+		deleteProject(proj);
+		super.tearDown();
+	}
+
+	@Override
+	protected ILaunchConfigurationType getLaunchConfigType() {
+		return getLaunchManager().getLaunchConfigurationType(OprofileLaunchPlugin.ID_LAUNCH_PROFILE);
+	}
+
+	@Override
+	protected void setProfileAttributes(ILaunchConfigurationWorkingCopy wc) throws CoreException {
+		OprofileEventConfigTab configTab = new OprofileEventConfigTab();
+		OprofileSetupTab setupTab = new OprofileSetupTab();
+		configTab.setDefaults(wc);
+		setupTab.setDefaults(wc);
+	}
+	
+	public void testDefaultLaunch() throws CoreException {
+		testingOprofileLaunchConfigurationDelegate delegate = new testingOprofileLaunchConfigurationDelegate();
+		ILaunch launch = new Launch(config, ILaunchManager.PROFILE_MODE, null);
+		
+		LaunchOptions options = new LaunchOptions();
+		options.loadConfiguration(config);
+		assertTrue(options.isValid());
+		assertEquals("", options.getBinaryImage()); //$NON-NLS-1$
+		assertEquals("", options.getKernelImageFile()); //$NON-NLS-1$
+		assertEquals(OprofileDaemonOptions.SEPARATE_NONE, options.getSeparateSamples());
+		
+		delegate.launch(config, ILaunchManager.PROFILE_MODE, launch, null);
+		assertTrue(delegate.eventsIsNull);
+		assertNotNull(delegate._options);
+		assertTrue(delegate._options.getBinaryImage().length() > 0);
+		assertEquals("", delegate._options.getKernelImageFile()); //$NON-NLS-1$
+		assertEquals(0, delegate._options.getCallgraphDepth());
+		assertFalse(delegate._options.getVerboseLogging());
+		assertEquals(OprofileDaemonOptions.SEPARATE_NONE, delegate._options.getSeparateProfilesMask());
+	}
+	
+	public void testEventLaunch() throws CoreException {
+		testingOprofileLaunchConfigurationDelegate delegate = new testingOprofileLaunchConfigurationDelegate();
+		ILaunch launch = new Launch(config, ILaunchManager.PROFILE_MODE, null);
+		
+		ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
+		wc.setAttribute(OprofileLaunchPlugin.ATTR_USE_DEFAULT_EVENT, false);
+		wc.setAttribute(OprofileLaunchPlugin.ATTR_COUNTER_ENABLED(0), true);
+		wc.setAttribute(OprofileLaunchPlugin.ATTR_COUNTER_COUNT(0), 100000);
+		wc.setAttribute(OprofileLaunchPlugin.ATTR_COUNTER_EVENT(0),	"FAKE_EVENT"); //$NON-NLS-1$
+		wc.setAttribute(OprofileLaunchPlugin.ATTR_COUNTER_PROFILE_KERNEL(0), true);
+		wc.setAttribute(OprofileLaunchPlugin.ATTR_COUNTER_PROFILE_USER(0), true);
+		wc.setAttribute(OprofileLaunchPlugin.ATTR_COUNTER_UNIT_MASK(0), 0);
+		wc.doSave();
+		LaunchOptions options = new LaunchOptions();
+		options.loadConfiguration(config);
+		assertTrue(options.isValid());
+		assertEquals("", options.getBinaryImage()); //$NON-NLS-1$
+		assertEquals("", options.getKernelImageFile()); //$NON-NLS-1$
+		assertEquals(OprofileDaemonOptions.SEPARATE_NONE, options.getSeparateSamples());
+
+		delegate.launch(config, ILaunchManager.PROFILE_MODE, launch, null);
+		assertFalse(delegate.eventsIsNull);
+		assertNotNull(delegate._options);
+		assertTrue(delegate._options.getBinaryImage().length() > 0);
+		assertEquals("", delegate._options.getKernelImageFile()); //$NON-NLS-1$
+		assertEquals(0, delegate._options.getCallgraphDepth());
+		assertFalse(delegate._options.getVerboseLogging());
+		assertEquals(OprofileDaemonOptions.SEPARATE_NONE, delegate._options.getSeparateProfilesMask());
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestManualLaunching.java b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestManualLaunching.java
new file mode 100644
index 0000000..2f50bd3
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestManualLaunching.java
@@ -0,0 +1,140 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.oprofile.launch.tests;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.ILaunch;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationType;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.debug.core.Launch;
+import org.eclipse.linuxtools.oprofile.core.daemon.OprofileDaemonEvent;
+import org.eclipse.linuxtools.oprofile.core.daemon.OprofileDaemonOptions;
+import org.eclipse.linuxtools.oprofile.launch.OprofileLaunchPlugin;
+import org.eclipse.linuxtools.oprofile.launch.configuration.LaunchOptions;
+import org.eclipse.linuxtools.oprofile.launch.configuration.OprofileEventConfigTab;
+import org.eclipse.linuxtools.oprofile.launch.configuration.OprofileSetupTab;
+import org.eclipse.linuxtools.oprofile.launch.launching.OprofileManualLaunchConfigurationDelegate;
+import org.eclipse.linuxtools.profiling.tests.AbstractTest;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+
+public class TestManualLaunching extends AbstractTest {
+	private class testingOprofileLaunchConfigurationDelegate extends OprofileManualLaunchConfigurationDelegate {
+		public boolean eventsIsNull;
+		public OprofileDaemonOptions _options;  
+		protected void oprofileDumpSamples() { return; }
+		protected void oprofileReset() { return; }
+		protected void oprofileShutdown() { return; }
+		protected void oprofileStartCollection() { return; }
+		protected void oprofileSetupDaemon(OprofileDaemonOptions options, OprofileDaemonEvent[] events) { 
+			_options = options; 
+			eventsIsNull = events == null ? true : false; 
+			return; 
+		}
+		@Override
+		protected void postExec(LaunchOptions options, OprofileDaemonEvent[] daemonEvents, ILaunch launch, Process process) {
+			super.postExec(options, daemonEvents, launch, process);
+			
+			try {
+				process.waitFor();
+			} catch (InterruptedException e) {
+				e.printStackTrace();
+			}
+		}
+	}
+	
+	protected ILaunchConfiguration config;
+	protected Shell testShell;
+	
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+		proj = createProjectAndBuild(LaunchTestsPlugin.getDefault().getBundle(), "sleepTest"); //$NON-NLS-1$
+		config = createConfiguration(proj.getProject());
+		testShell = new Shell(Display.getDefault());
+		testShell.setLayout(new GridLayout());
+	}
+
+	@Override
+	protected void tearDown() throws Exception {
+		testShell.dispose();
+		deleteProject(proj);
+		super.tearDown();
+	}
+
+	@Override
+	protected ILaunchConfigurationType getLaunchConfigType() {
+		return getLaunchManager().getLaunchConfigurationType(OprofileLaunchPlugin.ID_LAUNCH_PROFILE_MANUAL);
+	}
+
+	@Override
+	protected void setProfileAttributes(ILaunchConfigurationWorkingCopy wc) throws CoreException {
+		OprofileEventConfigTab configTab = new OprofileEventConfigTab();
+		OprofileSetupTab setupTab = new OprofileSetupTab();
+		configTab.setDefaults(wc);
+		setupTab.setDefaults(wc);
+	}
+	
+	public void testDefaultLaunch() throws CoreException {
+		testingOprofileLaunchConfigurationDelegate delegate = new testingOprofileLaunchConfigurationDelegate();
+		ILaunch launch = new Launch(config, ILaunchManager.PROFILE_MODE, null);
+		
+		LaunchOptions options = new LaunchOptions();
+		options.loadConfiguration(config);
+		assertTrue(options.isValid());
+		assertEquals("", options.getBinaryImage()); //$NON-NLS-1$
+		assertEquals("", options.getKernelImageFile()); //$NON-NLS-1$
+		assertEquals(OprofileDaemonOptions.SEPARATE_NONE, options.getSeparateSamples());
+		
+		delegate.launch(config, ILaunchManager.PROFILE_MODE, launch, null);
+		assertTrue(delegate.eventsIsNull);
+		assertNotNull(delegate._options);
+		assertTrue(delegate._options.getBinaryImage().length() > 0);
+		assertEquals("", delegate._options.getKernelImageFile()); //$NON-NLS-1$
+		assertEquals(0, delegate._options.getCallgraphDepth());
+		assertFalse(delegate._options.getVerboseLogging());
+		assertEquals(OprofileDaemonOptions.SEPARATE_NONE, delegate._options.getSeparateProfilesMask());
+	}
+	
+	public void testEventLaunch() throws CoreException {
+		testingOprofileLaunchConfigurationDelegate delegate = new testingOprofileLaunchConfigurationDelegate();
+		ILaunch launch = new Launch(config, ILaunchManager.PROFILE_MODE, null);
+		
+		ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
+		wc.setAttribute(OprofileLaunchPlugin.ATTR_USE_DEFAULT_EVENT, false);
+		wc.setAttribute(OprofileLaunchPlugin.ATTR_COUNTER_ENABLED(0), true);
+		wc.setAttribute(OprofileLaunchPlugin.ATTR_COUNTER_COUNT(0), 100000);
+		wc.setAttribute(OprofileLaunchPlugin.ATTR_COUNTER_EVENT(0),	"FAKE_EVENT"); //$NON-NLS-1$
+		wc.setAttribute(OprofileLaunchPlugin.ATTR_COUNTER_PROFILE_KERNEL(0), true);
+		wc.setAttribute(OprofileLaunchPlugin.ATTR_COUNTER_PROFILE_USER(0), true);
+		wc.setAttribute(OprofileLaunchPlugin.ATTR_COUNTER_UNIT_MASK(0), 0);
+		wc.doSave();
+		LaunchOptions options = new LaunchOptions();
+		options.loadConfiguration(config);
+		assertTrue(options.isValid());
+		assertEquals("", options.getBinaryImage()); //$NON-NLS-1$
+		assertEquals("", options.getKernelImageFile()); //$NON-NLS-1$
+		assertEquals(OprofileDaemonOptions.SEPARATE_NONE, options.getSeparateSamples());
+
+		delegate.launch(config, ILaunchManager.PROFILE_MODE, launch, null);
+		assertFalse(delegate.eventsIsNull);
+		assertNotNull(delegate._options);
+		assertTrue(delegate._options.getBinaryImage().length() > 0);
+		assertEquals("", delegate._options.getKernelImageFile()); //$NON-NLS-1$
+		assertEquals(0, delegate._options.getCallgraphDepth());
+		assertFalse(delegate._options.getVerboseLogging());
+		assertEquals(OprofileDaemonOptions.SEPARATE_NONE, delegate._options.getSeparateProfilesMask());
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestSetup.java b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestSetup.java
new file mode 100644
index 0000000..3baa987
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestSetup.java
@@ -0,0 +1,151 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.oprofile.launch.tests;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationType;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.linuxtools.oprofile.core.daemon.OprofileDaemonOptions;
+import org.eclipse.linuxtools.oprofile.launch.OprofileLaunchPlugin;
+import org.eclipse.linuxtools.oprofile.launch.configuration.OprofileEventConfigTab;
+import org.eclipse.linuxtools.oprofile.launch.configuration.OprofileSetupTab;
+import org.eclipse.linuxtools.profiling.tests.AbstractTest;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+
+public class TestSetup extends AbstractTest {
+	protected ILaunchConfiguration config;
+	protected Shell testShell;
+	
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+		proj = createProjectAndBuild(LaunchTestsPlugin.getDefault().getBundle(), "primeTest"); //$NON-NLS-1$
+		config = createConfiguration(proj.getProject());
+		testShell = new Shell(Display.getDefault());
+		testShell.setLayout(new GridLayout());
+	}
+
+	@Override
+	protected void tearDown() throws Exception {
+		testShell.dispose();
+		deleteProject(proj);
+		super.tearDown();
+	}
+	
+	@Override
+	protected ILaunchConfigurationType getLaunchConfigType() {
+		return getLaunchManager().getLaunchConfigurationType(OprofileLaunchPlugin.ID_LAUNCH_PROFILE_MANUAL);
+	}
+	
+	@Override
+	protected void setProfileAttributes(ILaunchConfigurationWorkingCopy wc) throws CoreException {
+		OprofileEventConfigTab configTab = new OprofileEventConfigTab();
+		OprofileSetupTab setupTab = new OprofileSetupTab();
+		configTab.setDefaults(wc);
+		setupTab.setDefaults(wc);
+	}
+
+	//getter functions for otherwise unaccessible member variables 
+	private class OprofileTestingSetupTab extends OprofileSetupTab {
+		protected Button getKernelCheck() { return _checkSeparateKernel; }
+		protected Button getLibraryCheck() { return _checkSeparateLibrary; }
+		protected Text getTextKernelImage() { return _kernelImageFileText; }
+	}
+	
+	public void testSetupTab() throws CoreException {
+		OprofileTestingSetupTab tab = new OprofileTestingSetupTab();
+		tab.createControl(new Shell());
+		assertNotNull(tab.getImage());
+		assertNotNull(tab.getName());
+		
+		//default config
+		tab.setDefaults(config.getWorkingCopy());
+		tab.initializeFrom(config);
+		
+		Button libraryCheck = tab.getLibraryCheck();
+		libraryCheck.setSelection(true);
+		libraryCheck.notifyListeners(SWT.Selection, null);
+		tab.performApply(config.getWorkingCopy());
+		assertEquals(OprofileDaemonOptions.SEPARATE_LIBRARY, config.getAttribute(OprofileLaunchPlugin.ATTR_SEPARATE_SAMPLES, -1));
+		libraryCheck.setSelection(false);
+		libraryCheck.notifyListeners(SWT.Selection, null);
+		tab.performApply(config.getWorkingCopy());
+		assertEquals(OprofileDaemonOptions.SEPARATE_NONE, config.getAttribute(OprofileLaunchPlugin.ATTR_SEPARATE_SAMPLES, -1));
+		
+		Button kernelCheck = tab.getKernelCheck();
+		kernelCheck.setSelection(true);
+		kernelCheck.notifyListeners(SWT.Selection, null);
+		tab.performApply(config.getWorkingCopy());
+		assertEquals(OprofileDaemonOptions.SEPARATE_KERNEL, config.getAttribute(OprofileLaunchPlugin.ATTR_SEPARATE_SAMPLES, -1));
+		kernelCheck.setSelection(false);
+		kernelCheck.notifyListeners(SWT.Selection, null);
+		tab.performApply(config.getWorkingCopy());
+		assertEquals(OprofileDaemonOptions.SEPARATE_NONE, config.getAttribute(OprofileLaunchPlugin.ATTR_SEPARATE_SAMPLES, -1));
+		
+		libraryCheck.setSelection(true);
+		libraryCheck.notifyListeners(SWT.Selection, null);
+		kernelCheck.setSelection(true);
+		kernelCheck.notifyListeners(SWT.Selection, null);
+		tab.performApply(config.getWorkingCopy());
+		tab.initializeFrom(config);
+		assertTrue(libraryCheck.getSelection());
+		assertTrue(kernelCheck.getSelection());
+		
+		Text kernelLocationText = tab.getTextKernelImage();
+		kernelLocationText.setText("doesntexist"); //$NON-NLS-1$
+		kernelLocationText.notifyListeners(SWT.Selection, null);
+		tab.performApply(config.getWorkingCopy());
+		assertFalse(tab.isValid(config));
+
+		kernelLocationText.setText(""); //$NON-NLS-1$
+		kernelLocationText.notifyListeners(SWT.Selection, null);
+		tab.performApply(config.getWorkingCopy());
+		assertTrue(tab.isValid(config));
+	}
+	
+	private class OprofileTestingEventConfigTab extends OprofileEventConfigTab {
+		@Override
+		protected boolean getTimerMode() { return false; }
+		@Override
+		protected int getNumberOfCounters() { return 1; }
+		@Override
+		protected boolean checkEventSetupValidity(int counter, int number, int maskValue) { return true; }
+		public Button getDefaultCheck() { return _defaultEventCheck; }
+	}
+	
+	public void testEventConfigTab() throws CoreException {
+		OprofileTestingEventConfigTab tab = new OprofileTestingEventConfigTab();
+		tab.createControl(new Shell());
+		assertNotNull(tab.getImage());
+		assertNotNull(tab.getName());
+		
+		tab.setDefaults(config.getWorkingCopy());
+		tab.initializeFrom(config);
+		assertTrue(tab.isValid(config));
+		
+		assertTrue(tab.getDefaultCheck().getSelection());
+		tab.getDefaultCheck().notifyListeners(SWT.Selection, null);
+		tab.getDefaultCheck().setSelection(false);
+		tab.getDefaultCheck().notifyListeners(SWT.Selection, null);
+
+		ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
+		wc.setAttribute(OprofileLaunchPlugin.ATTR_USE_DEFAULT_EVENT, false);
+		tab.performApply(wc);
+		assertFalse(tab.isValid(config));
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/test.xml b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/test.xml
new file mode 100644
index 0000000..b51a3ac
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/test.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+
+<project name="testsuite" default="run" basedir=".">
+	<property name="classname" value="org.eclipse.linuxtools.oprofile.launch.tests.AllLaunchTests" />
+	<property name="plugin-name" value="org.eclipse.linuxtools.oprofile.launch.tests" />
+
+	<property name="library-file" value="${eclipse-home}/dropins/${subProjectName2}/plugins/org.eclipse.test/library.xml" />
+
+	<!-- The property ${eclipse-home} should be passed into this script -->
+	<!-- Set a meaningful default value for when it is not. -->
+	<property name="eclipse-home" value="${basedir}/../.." />
+
+	<!-- This target holds all initialization code that needs to be done for -->
+	<!-- all tests that are to be run. Initialization for individual tests -->
+	<!-- should be done within the body of the suite target. -->
+	<target name="init">
+		<tstamp />
+		<delete>
+			<fileset dir="${eclipse-home}" includes="org*.xml" />
+		</delete>
+	</target>
+
+	<!-- This target defines the tests that need to be run. -->
+	<target name="oprofile_launch_suite">
+		<property name="oprofile-launch-folder" value="${eclipse-home}/oprofile_launch_folder" />
+		<delete dir="${oprofile-launch-folder}" quiet="true" />
+		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="data-dir" value="${oprofile-launch-folder}" />
+			<property name="plugin-name" value="${plugin-name}" />
+			<property name="classname" value="${classname}" />
+		</ant>
+	</target>
+
+	<!-- This target holds code to cleanup the testing environment after -->
+	<!-- after all of the tests have been run. You can use this target to -->
+	<!-- delete temporary files that have been created. -->
+	<target name="cleanup">
+		<mkdir dir="${results}/consolelogs" />
+		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
+	</target>
+
+	<!-- This target runs the test suite. Any actions that need to happen -->
+	<!-- after all the tests have been run should go here. -->
+	<target name="run" depends="init,oprofile_launch_suite,cleanup">
+		<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="includes" value="org*.xml" />
+			<property name="output-file" value="${plugin-name}.xml" />
+		</ant>
+	</target>
+	
+    <target name="all" depends="run" description="Dummy target to run all tests">
+    </target>
+
+</project>
diff --git a/profiling/.classpath b/oprofile/org.eclipse.linuxtools.oprofile.launch/.classpath
similarity index 100%
copy from profiling/.classpath
copy to oprofile/org.eclipse.linuxtools.oprofile.launch/.classpath
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/.project b/oprofile/org.eclipse.linuxtools.oprofile.launch/.project
new file mode 100644
index 0000000..7e16bda
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.oprofile.launch</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/.settings/org.eclipse.jdt.core.prefs b/oprofile/org.eclipse.linuxtools.oprofile.launch/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..df0870d
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Wed Aug 06 11:12:12 EDT 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/.svnignore b/oprofile/org.eclipse.linuxtools.oprofile.launch/.svnignore
new file mode 100644
index 0000000..ba077a4
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/.svnignore
@@ -0,0 +1 @@
+bin
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/META-INF/MANIFEST.MF b/oprofile/org.eclipse.linuxtools.oprofile.launch/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..5e2a5dc
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/META-INF/MANIFEST.MF
@@ -0,0 +1,30 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.oprofile.launch;singleton:=true
+Bundle-Version: 0.3.0.qualifier
+Bundle-Vendor: %bundleProvider
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.4.0",
+ org.eclipse.ui;bundle-version="3.4.0"
+Bundle-Activator: org.eclipse.linuxtools.oprofile.launch.OprofileLaunchPlugin
+Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
+Import-Package: org.eclipse.cdt.core.model,
+ org.eclipse.cdt.debug.core,
+ org.eclipse.cdt.launch,
+ org.eclipse.cdt.utils.pty,
+ org.eclipse.cdt.utils.spawner,
+ org.eclipse.core.resources,
+ org.eclipse.debug.core,
+ org.eclipse.debug.core.model,
+ org.eclipse.debug.ui,
+ org.eclipse.linuxtools.oprofile.core,
+ org.eclipse.linuxtools.oprofile.core.daemon,
+ org.eclipse.linuxtools.oprofile.ui,
+ org.eclipse.linuxtools.oprofile.ui.view,
+ org.eclipse.linuxtools.profiling.launch,
+ org.eclipse.ui
+Export-Package: org.eclipse.linuxtools.oprofile.launch,
+ org.eclipse.linuxtools.oprofile.launch.configuration,
+ org.eclipse.linuxtools.oprofile.launch.launching
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/about.html b/oprofile/org.eclipse.linuxtools.oprofile.launch/about.html
new file mode 100644
index 0000000..bf06e8c
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>8th September, 2004</p>	
+<h3>License</h3>
+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<h3>Contributions</h3>
+
+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise
+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such
+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
+
+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or
+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the
+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/build.properties b/oprofile/org.eclipse.linuxtools.oprofile.launch/build.properties
new file mode 100644
index 0000000..3268fa6
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/build.properties
@@ -0,0 +1,15 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               plugin.properties,\
+               icons/,\
+               about.html
+src.includes = META-INF/,\
+               about.html,\
+               icons/,\
+               plugin.properties,\
+               plugin.xml,\
+               src/
+individualSourceBundles=true
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/icons/event_tab.gif b/oprofile/org.eclipse.linuxtools.oprofile.launch/icons/event_tab.gif
new file mode 100644
index 0000000..c91f254
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/icons/event_tab.gif
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/icons/global_tab.gif b/oprofile/org.eclipse.linuxtools.oprofile.launch/icons/global_tab.gif
new file mode 100644
index 0000000..ec6cca4
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/icons/global_tab.gif
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/icons/profile_manual_run.png b/oprofile/org.eclipse.linuxtools.oprofile.launch/icons/profile_manual_run.png
new file mode 100644
index 0000000..e14bdbe
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/icons/profile_manual_run.png
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/icons/profile_run.png b/oprofile/org.eclipse.linuxtools.oprofile.launch/icons/profile_run.png
new file mode 100644
index 0000000..4f8488f
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/icons/profile_run.png
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/plugin.properties b/oprofile/org.eclipse.linuxtools.oprofile.launch/plugin.properties
new file mode 100644
index 0000000..a177a0f
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/plugin.properties
@@ -0,0 +1,27 @@
+#*******************************************************************************
+# Copyright (c) 2008 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Red Hat, Inc. - initial API and implementation
+#*******************************************************************************
+bundleName=OProfile Launch Plug-in (Incubation)
+bundleProvider=Eclipse
+
+pluginName=OProfile Launch Support
+launchconfigurationtype.label=Profile With OProfile
+launchconfigurationtype.manual.label=Profile With OProfile (Manual)
+
+launchgroup.label=OProfile
+launchgroup.titile=Select a run configuration to profile with OProfile
+
+launchmode.label=Profile
+launchmode.launchaslabel=Profile As
+
+launchshortcuts.label=Profile With OProfile
+
+manual.launchconfigurationtype.label=Profile With OProfile (Manual)
+manual.launchshortcuts.label=Profile With OProfile (Manual)
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/plugin.xml b/oprofile/org.eclipse.linuxtools.oprofile.launch/plugin.xml
new file mode 100644
index 0000000..e5c218a
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/plugin.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+   <extension
+         point="org.eclipse.debug.core.launchConfigurationTypes">
+      <launchConfigurationType
+            delegate="org.eclipse.linuxtools.oprofile.launch.launching.OprofileLaunchConfigurationDelegate"
+            id="org.eclipse.linuxtools.oprofile.launch.oprofile"
+            modes="profile"
+            name="%launchconfigurationtype.label"
+            public="true"
+            sourceLocatorId="org.eclipse.cdt.launch.DefaultSourceLocator"
+            sourcePathComputerId="org.eclipse.cdt.debug.core.sourcePathComputer">
+      </launchConfigurationType>
+      <launchConfigurationType
+            delegate="org.eclipse.linuxtools.oprofile.launch.launching.OprofileManualLaunchConfigurationDelegate"
+            id="org.eclipse.linuxtools.oprofile.launch.oprofile.manual"
+            modes="profile"
+            name="%launchconfigurationtype.manual.label"
+            public="true"
+            sourceLocatorId="org.eclipse.cdt.launch.DefaultSourceLocator"
+            sourcePathComputerId="org.eclipse.cdt.debug.core.sourcePathComputer">
+      </launchConfigurationType>
+   </extension>
+   <extension
+         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
+      <launchConfigurationTypeImage
+            configTypeID="org.eclipse.linuxtools.oprofile.launch.oprofile"
+            icon="icons/profile_run.png"
+            id="org.eclipse.linuxtools.oprofile.launch.oprofileImage">
+      </launchConfigurationTypeImage>
+      <launchConfigurationTypeImage
+            configTypeID="org.eclipse.linuxtools.oprofile.launch.oprofile.manual"
+            icon="icons/profile_manual_run.png"
+            id="org.eclipse.linuxtools.oprofile.launch.manual.oprofileImage">
+      </launchConfigurationTypeImage>
+   </extension>
+   <extension
+         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
+      <launchConfigurationTabGroup
+            class="org.eclipse.linuxtools.oprofile.launch.configuration.OprofileLaunchConfigurationTabGroup"
+            id="org.eclipse.linuxtools.oprofile.launch.launchConfigurationTabGroup"
+            type="org.eclipse.linuxtools.oprofile.launch.oprofile">
+      </launchConfigurationTabGroup>
+      <launchConfigurationTabGroup
+            class="org.eclipse.linuxtools.oprofile.launch.configuration.OprofileLaunchConfigurationTabGroup"
+            id="org.eclipse.linuxtools.oprofile.launch.manualLaunchConfigurationTabGroup"
+            type="org.eclipse.linuxtools.oprofile.launch.oprofile.manual">
+      </launchConfigurationTabGroup>
+   </extension>
+   <extension
+         point="org.eclipse.debug.ui.launchShortcuts">
+      <shortcut
+            class="org.eclipse.linuxtools.oprofile.launch.launching.OprofileLaunchShortcut"
+            icon="icons/profile_run.png"
+            id="org.eclipse.linuxtools.oprofile.launch.profileshortcut"
+            label="%launchshortcuts.label"
+            modes="profile">
+         <contextualLaunch>
+           <enablement>
+<!-- FIXME: this is not a proper enablement condition -->           
+             <with variable="selection">
+             	<count value="1"></count>
+
+               <iterate>
+                   <or>
+                     <instanceof value="org.eclipse.cdt.core.model.IBinary"/>
+                     <instanceof value="org.eclipse.cdt.core.model.ICProject"/>
+                     <test property="org.eclipse.cdt.launch.isExecutable"/>
+                     <test property="org.eclipse.cdt.launch.isCProject"/>
+                     <and>
+                       <instanceof value="org.eclipse.ui.IFileEditorInput"/>
+                       <adapt type="org.eclipse.core.resources.IResource">
+                         <adapt type="org.eclipse.cdt.core.model.ICElement"/>
+                       </adapt>
+                     </and>
+                   </or>
+               </iterate>
+
+             </with>
+           </enablement>
+  		 </contextualLaunch>
+      </shortcut>
+      <shortcut
+            class="org.eclipse.linuxtools.oprofile.launch.launching.OprofileManualLaunchShortcut"
+            icon="icons/profile_manual_run.png"
+            id="org.eclipse.linuxtools.oprofile.launch.profileshortcut.manual"
+            label="%manual.launchshortcuts.label"
+            modes="profile">
+         <contextualLaunch>
+            <enablement>
+               <with
+                     variable="selection">
+                  <count
+                        value="1">
+                  </count>
+                  <iterate>
+                     <or>
+                        <instanceof
+                              value="org.eclipse.cdt.core.model.IBinary">
+                        </instanceof>
+                        <instanceof
+                              value="org.eclipse.cdt.core.model.ICProject">
+                        </instanceof>
+                        <test
+                              property="org.eclipse.cdt.launch.isExecutable">
+                        </test>
+                        <test
+                              property="org.eclipse.cdt.launch.isCProject">
+                        </test>
+                        <and>
+                           <instanceof
+                                 value="org.eclipse.ui.IFileEditorInput">
+                           </instanceof>
+                           <adapt
+                                 type="org.eclipse.core.resources.IResource">
+                              <adapt
+                                    type="org.eclipse.cdt.core.model.ICElement">
+                              </adapt>
+                           </adapt>
+                        </and>
+                     </or>
+                  </iterate>
+               </with>
+            </enablement>
+         </contextualLaunch>
+      </shortcut>
+   </extension>
+</plugin>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/OprofileLaunchMessages.java b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/OprofileLaunchMessages.java
new file mode 100644
index 0000000..869bd29
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/OprofileLaunchMessages.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2004 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.oprofile.launch;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class OprofileLaunchMessages {
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.oprofile.launch.oprofilelaunch"; //$NON-NLS-1$
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+
+	private OprofileLaunchMessages() {
+	}
+
+	public static String getString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/OprofileLaunchPlugin.java b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/OprofileLaunchPlugin.java
new file mode 100644
index 0000000..fd7f739
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/OprofileLaunchPlugin.java
@@ -0,0 +1,115 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *    Kent Sebastian <ksebasti@redhat.com>
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.launch;
+
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.plugin.*;
+import org.eclipse.core.resources.*;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.linuxtools.oprofile.launch.configuration.EventConfigCache;
+import org.osgi.framework.BundleContext;
+
+
+/**
+ * The main plugin class to be used in the desktop.
+ */
+public class OprofileLaunchPlugin extends AbstractUIPlugin {
+	//The shared instance.
+	private static OprofileLaunchPlugin plugin;
+	//shared cache instance for configuration
+	private static EventConfigCache _eventConfigCache = null;
+
+	private static final String ID_PLUGIN = "org.eclipse.linuxtools.oprofile.launch"; //$NON-NLS-1$
+
+	// The launch type ID for profiling
+	public static final String ID_LAUNCH_PROFILE = ID_PLUGIN + ".oprofile"; //$NON-NLS-1$
+	public static final String ID_LAUNCH_PROFILE_MANUAL = ID_PLUGIN + ".oprofile.manual"; //$NON-NLS-1$
+
+
+	/* Launch Configuration attributes */
+	
+	// Global options \\
+	public static final String ATTR_KERNEL_IMAGE_FILE = ID_LAUNCH_PROFILE + ".KERNEL_IMAGE"; 			//$NON-NLS-1$
+	public static final String ATTR_SEPARATE_SAMPLES = ID_LAUNCH_PROFILE + ".SEPARATE_SAMPLES"; 		//$NON-NLS-1$
+	public static final String ATTR_USE_DEFAULT_EVENT = ID_LAUNCH_PROFILE + ".USE_DEFAULT_EVENT";		//$NON-NLS-1$
+
+	// Manual Profile string \\
+	public static final String ATTR_MANUAL_PROFILE = ID_LAUNCH_PROFILE + ".MANUAL_PROFILE";		//$NON-NLS-1$
+	
+	// Counter Attributes \\
+	private static final String ATTR_COUNTER(int nr) { return ID_LAUNCH_PROFILE + ".COUNTER_" + nr; } 					//$NON-NLS-1$
+	public static final String ATTR_COUNTER_ENABLED(int nr)  { return ATTR_COUNTER(nr) + ".ENABLED"; } 					//$NON-NLS-1$
+	public static final String ATTR_COUNTER_EVENT(int nr) { return ATTR_COUNTER(nr)  + ".EVENT"; } 						//$NON-NLS-1$
+	public static final String ATTR_COUNTER_PROFILE_KERNEL(int nr) { return ATTR_COUNTER(nr) + ".PROFILE_KERNEL"; }		//$NON-NLS-1$
+	public static final String ATTR_COUNTER_PROFILE_USER(int nr) { return ATTR_COUNTER(nr) + ".PROFILE_USER"; } 		//$NON-NLS-1$
+	public static final String ATTR_COUNTER_COUNT(int nr) { return ATTR_COUNTER(nr) + ".COUNT"; } 						//$NON-NLS-1$
+	public static final String ATTR_COUNTER_UNIT_MASK(int nr) { return  ATTR_COUNTER(nr) + ".UNIT_MASK"; } 				//$NON-NLS-1$
+	
+	
+	public static final String ICON_PATH = "icons/"; //$NON-NLS-1$
+	public static final String ICON_EVENT_TAB = ICON_PATH + "event_tab.gif"; //$NON-NLS-1$
+	public static final String ICON_GLOBAL_TAB = ICON_PATH + "global_tab.gif"; //$NON-NLS-1$
+	
+	
+	/**
+	 * The constructor.
+	 */
+	public OprofileLaunchPlugin() {
+		plugin = this;
+	}
+
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+	}
+
+	public void stop(BundleContext context) throws Exception {
+		super.stop(context);
+		plugin = null;
+	}	
+
+	public static OprofileLaunchPlugin getDefault() {
+		return plugin;
+	}
+
+	public static IWorkspace getWorkspace() {
+		return ResourcesPlugin.getWorkspace();
+	}
+	
+	public static String getUniqueIdentifier() {
+		return ID_PLUGIN;
+	}
+	
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return imageDescriptorFromPlugin(ID_PLUGIN, path);
+	}
+
+	public static IWorkbenchWindow getActiveWorkbenchWindow() {
+		return getDefault().getWorkbench().getActiveWorkbenchWindow();
+	}
+	
+	public static Shell getActiveWorkbenchShell() {
+		IWorkbenchWindow window = getActiveWorkbenchWindow();
+		if (window != null) {
+			return window.getShell();
+		}
+		return null;
+	}	
+
+	public static EventConfigCache getCache() {
+		if (_eventConfigCache == null) {
+			_eventConfigCache = new EventConfigCache();
+		}
+		
+		return _eventConfigCache;
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/configuration/EventConfigCache.java b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/configuration/EventConfigCache.java
new file mode 100644
index 0000000..e5d6f5c
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/configuration/EventConfigCache.java
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *    
+ *******************************************************************************/
+package org.eclipse.linuxtools.oprofile.launch.configuration;
+
+import java.util.HashMap;
+import org.eclipse.linuxtools.oprofile.core.Oprofile;
+
+/**
+ * Cache class for event configuration. Currently only used to cache the results
+ * of an `opxml check-event ..` run, since the isValid() method in the EventConfigTab
+ * needlessly spawns opxml dozens of times with the same values. Note that multiple
+ * checks of the same value will necessarily return the same result (for a given 
+ * processor) so there is no worry of an invalid cache entry.
+ */
+public class EventConfigCache {
+	//a cache entry for an event check, used as the hashmap key 
+	class CheckEventEntry {
+		public Integer counterNum, eventNum, maskValue;
+		
+		public CheckEventEntry(int counterNum, int eventNum, int maskValue) {
+			this.counterNum = new Integer(counterNum);
+			this.eventNum = new Integer(eventNum);
+			this.maskValue = new Integer(maskValue);
+		}
+		
+		@Override
+		public boolean equals(Object obj) {
+			if (obj instanceof CheckEventEntry) {
+				CheckEventEntry other = (CheckEventEntry)obj;
+				return (counterNum.equals(other.counterNum) && eventNum.equals(other.eventNum) && maskValue.equals(other.maskValue));
+			} else {
+				return false;
+			}
+		}
+		
+		@Override
+		public int hashCode() {
+			int prime = 11, result = 3;
+			result = prime*result + counterNum.hashCode();
+			result = prime*result + eventNum.hashCode();
+			result = prime*result + maskValue.hashCode();
+			return result;
+		}
+	}
+	
+	HashMap<CheckEventEntry, Boolean> validEventCache;
+
+	/**
+	 * Default constructor, creates an empty cache.
+	 */
+	public EventConfigCache() {
+		validEventCache = new HashMap<CheckEventEntry, Boolean>();
+	}
+
+	/**
+	 * Method to be used to check the validity of an event. Will check
+	 * the cache for the result of a previous check of the same values,
+	 * or otherwise will spawn opxml to check properly.
+	 * @param counter counter number
+	 * @param event event number
+	 * @param mask unit mask value
+	 * @return true or false, depending if the event config is valid
+	 */
+	public boolean checkEvent(int counter, int event, int mask) {
+		CheckEventEntry e = new CheckEventEntry(counter, event, mask);
+		Boolean result = null;
+		
+		result = validEventCache.get(e);
+		
+		if (result == null) {
+			//not in the map, get its value and add it in
+			result = Oprofile.checkEvent(counter, event, mask);
+			
+			//possible to be null if there is no opxmlProvider
+			if (result != null) {
+				validEventCache.put(e, result);
+			}
+		}
+
+		return (result == null ? false : result);
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/configuration/LaunchOptions.java b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/configuration/LaunchOptions.java
new file mode 100644
index 0000000..6d4e2be
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/configuration/LaunchOptions.java
@@ -0,0 +1,129 @@
+/*******************************************************************************
+ * Copyright (c) 2004,2008,2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *    Kent Sebastian <ksebasti@redhat.com> - 
+ *******************************************************************************/ 
+
+package org.eclipse.linuxtools.oprofile.launch.configuration;
+
+import java.io.File;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.linuxtools.oprofile.core.daemon.OprofileDaemonOptions;
+import org.eclipse.linuxtools.oprofile.launch.OprofileLaunchPlugin;
+
+/**
+ * This class wraps OProfile's global launch options for the
+ * Eclipse launcher facility.
+ */
+public class LaunchOptions {
+	// The launch options for the daemon
+	private OprofileDaemonOptions _options;
+
+	public LaunchOptions() {
+		_options = new OprofileDaemonOptions();
+	}
+	
+	/**
+	 * Determines whether the global oprofile options represented by this
+	 * object are valid
+	 * @return whether the options are valid
+	 */
+	public boolean isValid() {
+		// The only point of contention is whether the specified vmlinux *file* exists.
+		String fn = _options.getKernelImageFile();
+		if (fn != null && fn.length() > 0) {
+			File file = new File(_options.getKernelImageFile());
+			return (file.exists() && file.isFile());
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Saves the global options of this object into the specified launch
+	 * configuration
+	 * @param config	the launch configuration
+	 */
+	public void saveConfiguration(ILaunchConfigurationWorkingCopy config) {
+		config.setAttribute(OprofileLaunchPlugin.ATTR_KERNEL_IMAGE_FILE, _options.getKernelImageFile());
+		config.setAttribute(OprofileLaunchPlugin.ATTR_SEPARATE_SAMPLES, _options.getSeparateProfilesMask());
+	}
+	
+	/**
+	 * Loads this object with the global options in the given launch
+	 * configuration
+	 * @param config	the launch configuration
+	 */
+	public void loadConfiguration(ILaunchConfiguration config) {
+		try {
+			_options.setKernelImageFile(config.getAttribute(OprofileLaunchPlugin.ATTR_KERNEL_IMAGE_FILE, "")); //$NON-NLS-1$
+			_options.setSeparateProfilesMask(config.getAttribute(OprofileLaunchPlugin.ATTR_SEPARATE_SAMPLES, OprofileDaemonOptions.SEPARATE_NONE));
+		} catch (CoreException e) {
+		}
+	}
+	
+	/**
+	 * Get the daemon launch options
+	 * @return the OprofileDaemonOption
+	 */
+	public OprofileDaemonOptions getOprofileDaemonOptions() {
+		return _options;
+	}
+	
+	/**
+	 * Method getKernelImageFile.
+	 * @return the kernel image file
+	 */
+	public String getKernelImageFile() {
+		return _options.getKernelImageFile();
+	}
+	
+	/**
+	 * Sets the kernel image file
+	 * @param image	the kernel image file
+	 */
+	public void setKernelImageFile(String image) {
+		_options.setKernelImageFile(image);
+	}
+
+	/**
+	 * Method getSeparateSamples.
+	 * @return whether and how to separate samples for each distinct application
+	 */
+	public int getSeparateSamples() {
+		return _options.getSeparateProfilesMask();
+	}
+
+	/**
+	 * Sets whether/how to collect separate samples for each distinct application
+	 * @param how	one of SEPARATE_{NONE, LIBRARY, KERNEL, THREAD, CPU}
+	 */
+	public void setSeparateSamples(int how) {
+		_options.setSeparateProfilesMask(how);
+	}
+	
+	/**
+	 * Returns the path of the binary to profile.
+	 * @return the full path to the binary being profile
+	 */
+	public String getBinaryImage() {
+		return _options.getBinaryImage();
+	}
+
+	/**
+	 * Sets the binary to profile in this launch.
+	 * @param _image string of the full path to the binary
+	 */
+	public void setBinaryImage(String _image) {
+		_options.setBinaryImage(_image);
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/configuration/OprofileCounter.java b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/configuration/OprofileCounter.java
new file mode 100644
index 0000000..875b2c0
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/configuration/OprofileCounter.java
@@ -0,0 +1,253 @@
+/*******************************************************************************
+ * Copyright (c) 2004,2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *    Kent Sebastian <ksebasti@redhat.com>
+ *******************************************************************************/ 
+
+package org.eclipse.linuxtools.oprofile.launch.configuration;
+
+import java.text.MessageFormat;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.linuxtools.oprofile.core.Oprofile;
+import org.eclipse.linuxtools.oprofile.core.daemon.OpEvent;
+import org.eclipse.linuxtools.oprofile.core.daemon.OpUnitMask;
+import org.eclipse.linuxtools.oprofile.core.daemon.OprofileDaemonEvent;
+import org.eclipse.linuxtools.oprofile.launch.OprofileLaunchPlugin;
+import org.eclipse.linuxtools.oprofile.launch.OprofileLaunchMessages;
+
+/**
+ * This class represents an oprofile runtime configuration of a counter. It is
+ * used to construct arguments for launching op_start on the host. It
+ * simply wraps OprofileDaemonEvent.
+ */
+public class OprofileCounter {
+	private static final String COUNTER_STRING = OprofileLaunchMessages.getString("oprofileCounter.counterString"); //$NON-NLS-1$
+	
+	// The counter number
+	private int _number;
+	
+	// Is this counter enabled?
+	private boolean _enabled;
+	
+	// The event to collect on this counter
+	private OprofileDaemonEvent _daemonEvent;
+	
+	// List of valid events on this counter
+	private OpEvent[] _eventList = null;
+
+	/**
+	 * Constructor for OprofileCounter.
+	 * @param nr	the counter number
+	 */
+	public OprofileCounter(int nr) {
+		_number = nr;
+		_enabled = false;
+		_eventList = Oprofile.getEvents(_number);
+		_daemonEvent = new OprofileDaemonEvent();
+	}
+
+	/**
+	 * Constructs all of the counters in  the given launch configuration.
+	 * @param config the launch configuration
+	 * @return an array of all counters
+	 */
+	public static OprofileCounter[] getCounters(ILaunchConfiguration config) {
+		OprofileCounter[] ctrs = new OprofileCounter[Oprofile.getNumberOfCounters()];
+		for (int i = 0; i < ctrs.length; i++)
+		{
+			ctrs[i] = new OprofileCounter(i);
+			if (config != null)
+				ctrs[i].loadConfiguration(config);
+		}
+		
+		return ctrs;
+	}
+
+	/**
+	 * Method setEnabled.
+	 * @param enabled	whether to set this counter as enabled
+	 */
+	public void setEnabled(boolean enabled) {
+		_enabled = enabled;
+	}
+	
+	/**
+	 * Method setEvent.
+	 * @param event	the event for this counter
+	 */
+	public void setEvent(OpEvent event) {
+		_daemonEvent.setEvent(event);
+	}
+	
+	/**
+	 * Method setProfileKernel.
+	 * @param profileKernel	whether this counter should count kernel events
+	 */
+	public void setProfileKernel(boolean profileKernel) {
+		_daemonEvent.setProfileKernel(profileKernel);
+	}
+	
+	/**
+	 * Method setProfileUser.
+	 * @param profileUser	whether this counter should count user events
+	 */
+	public void setProfileUser(boolean profileUser) {
+		_daemonEvent.setProfileUser(profileUser);
+	}
+	
+	/**
+	 * Method setCount.
+	 * @param count	the number of events between samples for this counter
+	 */
+	public void setCount(int count) {
+		_daemonEvent.setResetCount(count);
+	}
+	
+	/**
+	 * Saves this counter's configuration into the specified launch
+	 * configuration.
+	 * @param config	the launch configuration
+	 */
+	public void saveConfiguration(ILaunchConfigurationWorkingCopy config) {
+		config.setAttribute(OprofileLaunchPlugin.ATTR_COUNTER_ENABLED(_number), _enabled);
+		if (_daemonEvent.getEvent() != null) {
+			config.setAttribute(OprofileLaunchPlugin.ATTR_COUNTER_EVENT(_number), _daemonEvent.getEvent().getText());
+			config.setAttribute(OprofileLaunchPlugin.ATTR_COUNTER_UNIT_MASK(_number), _daemonEvent.getEvent().getUnitMask().getMaskValue());
+		}
+		config.setAttribute(OprofileLaunchPlugin.ATTR_COUNTER_PROFILE_KERNEL(_number), _daemonEvent.getProfileKernel());
+		config.setAttribute(OprofileLaunchPlugin.ATTR_COUNTER_PROFILE_USER(_number), _daemonEvent.getProfileUser());
+		config.setAttribute(OprofileLaunchPlugin.ATTR_COUNTER_COUNT(_number), _daemonEvent.getResetCount());
+	}
+	
+	/**
+	 * Loads a counter configuration from the specified launch configuration.
+	 * @param config	the launch configuration
+	 */
+	public void loadConfiguration(ILaunchConfiguration config) {
+		try {
+			_enabled = config.getAttribute(OprofileLaunchPlugin.ATTR_COUNTER_ENABLED(_number), false);
+
+			String str = config.getAttribute(OprofileLaunchPlugin.ATTR_COUNTER_EVENT(_number), ""); //$NON-NLS-1$
+			_daemonEvent.setEvent(_eventFromString(str));
+
+			if (_daemonEvent.getEvent() == null) {
+				return;
+			}
+			
+			
+			int maskValue =  config.getAttribute(OprofileLaunchPlugin.ATTR_COUNTER_UNIT_MASK(_number), OpUnitMask.SET_DEFAULT_MASK);
+			_daemonEvent.getEvent().getUnitMask().setMaskValue(maskValue);
+			
+			_daemonEvent.setProfileKernel(config.getAttribute(OprofileLaunchPlugin.ATTR_COUNTER_PROFILE_KERNEL(_number), false));
+			_daemonEvent.setProfileUser(config.getAttribute(OprofileLaunchPlugin.ATTR_COUNTER_PROFILE_USER(_number), false));
+			
+			_daemonEvent.setResetCount(config.getAttribute(OprofileLaunchPlugin.ATTR_COUNTER_COUNT(_number), OprofileDaemonEvent.COUNT_UNINITIALIZED));
+		} catch (CoreException ce) {
+			
+		}
+	}
+	
+	public OpUnitMask getUnitMask() {
+		OpEvent event = _daemonEvent.getEvent();
+		
+		if (event != null) {
+			return event.getUnitMask();
+		} else {
+			return null;
+		}
+	}
+	
+	/**
+	 * Returns a textual label for this counter (used by UI)
+	 * @return the label to use in widgets referring to this counter
+	 */
+	public String getText() {
+		Object[] args = new Object[] {new Integer(_number)};
+		return MessageFormat.format(COUNTER_STRING, args);
+	}
+	
+	/**
+	 * Method getNumber.
+	 * @return the counter's number
+	 */
+	public int getNumber() {
+		return _number;
+	}
+	
+	/**
+	 * Method getEnabled.
+	 * @return whether this counter is enabled
+	 */
+	public boolean getEnabled() {
+		return _enabled;
+	}
+
+	/**
+	 * Method getEvent.
+	 * @return the event for this counter
+	 */
+	public OpEvent getEvent() {
+		return _daemonEvent.getEvent();
+	}
+	
+	/**
+	 * Method getProfileKernel.
+	 * @return whether this counter is counting kernel events
+	 */
+	public boolean getProfileKernel() {
+		return _daemonEvent.getProfileKernel();
+	}
+	
+	/**
+	 * Method getProfileUser.
+	 * @return whether this counter is counting user events
+	 */
+	public boolean getProfileUser() {
+		return _daemonEvent.getProfileUser();
+	}
+
+	/**
+	 * Method getCount.
+	 * @return the number of events between samples for this counter
+	 */
+	public int getCount() {
+		return _daemonEvent.getResetCount();
+	}
+	
+	/**
+	 * Method getValidEvents.
+	 * @return an array of all events that this counter can monitor
+	 */
+	public OpEvent[] getValidEvents() {		
+		return _eventList;
+	}
+	
+	/**
+	 * Gets the daemon event configuration for this counter.
+	 * <B>Not</B> valid if this counter is not enabled!
+	 * @return the OprofileDaemonEvent
+	 */
+	public OprofileDaemonEvent getDaemonEvent() {
+		return _daemonEvent;
+	}
+
+	// Returns the event with the same label as the parameter STR
+	private OpEvent _eventFromString(String str) {
+		for (int i = 0; i < _eventList.length; i++) {
+			if (_eventList[i].getText().equals(str))
+				return _eventList[i];
+		}
+		
+		return null;
+	}
+}
+
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/configuration/OprofileEventConfigTab.java b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/configuration/OprofileEventConfigTab.java
new file mode 100644
index 0000000..0ceab90
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/configuration/OprofileEventConfigTab.java
@@ -0,0 +1,800 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *    Kent Sebastian <ksebasti@redhat.com> -
+ *    
+ * CounterSubTab Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation (before subclassing)
+ *    Kent Sebastian <ksebasti@redhat.com> - turned into a sub class,
+ * 	     changed layouts, fixed up some interactivity issues, ..
+ * 
+ * UnitMaskViewer Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *    Kent Sebastian <ksebasti@redhat.com>
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.oprofile.launch.configuration;
+
+import java.text.MessageFormat;
+import java.util.ArrayList;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
+import org.eclipse.debug.ui.ILaunchConfigurationTab;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.linuxtools.oprofile.core.Oprofile;
+import org.eclipse.linuxtools.oprofile.core.OprofileCorePlugin;
+import org.eclipse.linuxtools.oprofile.core.daemon.OpEvent;
+import org.eclipse.linuxtools.oprofile.core.daemon.OpUnitMask;
+import org.eclipse.linuxtools.oprofile.core.daemon.OprofileDaemonEvent;
+import org.eclipse.linuxtools.oprofile.launch.OprofileLaunchMessages;
+import org.eclipse.linuxtools.oprofile.launch.OprofileLaunchPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.ScrolledComposite;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.TabFolder;
+import org.eclipse.swt.widgets.TabItem;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * Thic class represents the event configuration tab of the launcher dialog.
+ */
+public class OprofileEventConfigTab extends AbstractLaunchConfigurationTab {
+	protected Button _defaultEventCheck;
+	protected OprofileCounter[] _counters = OprofileCounter.getCounters(null);
+	protected CounterSubTab[] _counterSubTabs;
+
+	/**
+	 * Essentially the constructor for this tab; creates the 'default event'
+	 * checkbox and an appropriate number of counter tabs.
+	 * @param parent the parent composite
+	 */
+	public void createControl(Composite parent) {
+		Composite top = new Composite(parent, SWT.NONE);
+		setControl(top);
+		top.setLayout(new GridLayout());
+
+		if (getTimerMode()) {
+			Label timerModeLabel = new Label(top, SWT.LEFT);
+			timerModeLabel.setText(OprofileLaunchMessages.getString("tab.event.timermode.no.options")); //$NON-NLS-1$
+		} else {
+			createVerticalSpacer(top, 1);
+	
+			//default event checkbox
+			_defaultEventCheck = new Button(top, SWT.CHECK);
+			_defaultEventCheck.setText(OprofileLaunchMessages.getString("tab.event.defaultevent.button.text")); //$NON-NLS-1$
+			_defaultEventCheck.setLayoutData(new GridData());
+			_defaultEventCheck.addSelectionListener(new SelectionAdapter() {
+				public void widgetSelected(SelectionEvent se) {
+					_handleEnabledToggle();
+				}
+			});
+	
+			createVerticalSpacer(top, 1);
+	
+			//tabs for each of the counters
+			OprofileCounter[] counters = OprofileCounter.getCounters(null);
+			TabItem[] counterTabs = new TabItem[counters.length];
+			_counterSubTabs = new CounterSubTab[counters.length];
+			
+			TabFolder tabFolder = new TabFolder(top, SWT.NONE);
+			tabFolder.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+	
+	
+			for (int i = 0; i < counters.length; i++) {
+				Composite c = new Composite(tabFolder, SWT.NONE);
+				CounterSubTab currentTab = new CounterSubTab(c, counters[i]);
+				_counterSubTabs[i] = currentTab;
+				
+				counterTabs[i] = new TabItem(tabFolder, SWT.NONE);
+				counterTabs[i].setControl(c);
+				counterTabs[i].setText(OprofileLaunchMessages.getString("tab.event.counterTab.counterText") + String.valueOf(i)); //$NON-NLS-1$
+			}
+		}
+	}
+
+	/**
+	 * @see ILaunchConfigurationTab#initializeFrom(ILaunchConfiguration)
+	 */
+	public void initializeFrom(ILaunchConfiguration config) {
+		if (!getTimerMode()) {
+			try {
+				for (int i = 0; i < _counters.length; i++) {
+					_counters[i].loadConfiguration(config);
+				}
+				
+				for (CounterSubTab tab : _counterSubTabs) {
+					tab.initializeTab(config);
+				}
+	
+				boolean enabledState = config.getAttribute(OprofileLaunchPlugin.ATTR_USE_DEFAULT_EVENT, true);
+				_defaultEventCheck.setSelection(enabledState);
+				setEnabledState(!enabledState);
+	
+				updateLaunchConfigurationDialog();
+			} catch (CoreException e) {
+				e.printStackTrace();
+			}
+		}
+	}
+
+	/**
+	 * @see ILaunchConfigurationTab#isValid(ILaunchConfiguration)
+	 */
+	public boolean isValid(ILaunchConfiguration config) {
+		if (getTimerMode()) {
+			return true;		//no options to check for validity
+		} else {
+			int numEnabledEvents = 0;
+			boolean valid = true;
+	
+			try {
+				if (config.getAttribute(OprofileLaunchPlugin.ATTR_USE_DEFAULT_EVENT, false)) {
+					numEnabledEvents = 1;
+				} else {
+					//This seems like an odd way to validate, but since most of the validation
+					// is done with the OprofileDaemonEvent that the counter wraps, this
+					// is the easiest way.
+					OprofileCounter[] counters = new OprofileCounter[getNumberOfCounters()];
+					for (int i = 0; i < counters.length; i++) {
+						counters[i] = new OprofileCounter(i);
+						counters[i].loadConfiguration(config);
+						if (counters[i].getEnabled()) {
+							++numEnabledEvents;
+	
+							if (counters[i].getEvent() == null) {
+								valid = false;
+								break;
+							}
+	
+							// First check min count
+							int min = counters[i].getEvent().getMinCount();
+							if (counters[i].getCount() < min) {
+								valid = false;
+								break;
+							}
+	
+							// Next ask oprofile if it is valid
+							if (!checkEventSetupValidity(counters[i].getNumber(), counters[i].getEvent().getNumber(), counters[i].getEvent().getUnitMask().getMaskValue())) {
+								valid = false;
+								break;
+							}
+						}
+					}
+				}
+			} catch (CoreException e) {
+				e.printStackTrace();
+			}
+	
+			return (numEnabledEvents > 0 && valid);
+		} 
+	}
+
+	/**
+	 * @see ILaunchConfigurationTab#performApply(ILaunchConfigurationWorkingCopy)
+	 */
+	public void performApply(ILaunchConfigurationWorkingCopy config) {
+		if (getTimerMode()) {
+			config.setAttribute(OprofileLaunchPlugin.ATTR_USE_DEFAULT_EVENT, true);
+		} else {
+			config.setAttribute(OprofileLaunchPlugin.ATTR_USE_DEFAULT_EVENT, _defaultEventCheck.getSelection());
+			
+			for (CounterSubTab cst : _counterSubTabs) {
+				cst.performApply(config);
+			}
+		}
+		try {
+			config.doSave();
+		} catch (CoreException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @see ILaunchConfigurationTab#setDefaults(ILaunchConfigurationWorkingCopy)
+	 */
+	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
+		boolean useDefault = true;
+
+		// When instantiated, the OprofileCounter will set defaults.
+		for (int i = 0; i < _counters.length; i++) {
+			_counters[i].saveConfiguration(config);
+			if (_counters[i].getEnabled()) {
+				useDefault = false;
+			}
+		}
+
+		config.setAttribute(OprofileLaunchPlugin.ATTR_USE_DEFAULT_EVENT, useDefault);
+		try {
+			config.doSave();
+		} catch (CoreException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	/**
+	 * @see ILaunchConfigurationTab#getName()
+	 */
+	public String getName() {
+		return OprofileLaunchMessages.getString("tab.event.name"); //$NON-NLS-1$
+	}
+
+	/**
+	 * @see ILaunchConfigurationTab#getImage()
+	 */
+	@Override
+	public Image getImage() {
+		return OprofileLaunchPlugin.getImageDescriptor(OprofileLaunchPlugin.ICON_EVENT_TAB).createImage();
+	}
+
+	/**
+	 * Handles the toggling of the default event check box. Not meant to be called
+	 * directly.
+	 */
+	private void _handleEnabledToggle() {
+		setEnabledState(!_defaultEventCheck.getSelection());
+		updateLaunchConfigurationDialog();
+	}
+	
+	/**
+	 * Sets the state of the child counter tabs' widgets.
+	 * @param state true for enabled, false for disabled
+	 */
+	private void setEnabledState(boolean state) {
+		for (CounterSubTab cst : _counterSubTabs) {
+			cst.setEnabledState(state);
+		}
+	}
+
+	/*
+	 * Extracted methods to be overridden by the test suite.
+	 */
+
+	/**
+	 * Returns whether the event's unit mask is valid
+	 * @param counter counter number
+	 * @param number event number (oprofile internal number)
+	 * @param maskValue unit mask value
+	 * @return true if valid config, false otherwise
+	 */
+	protected boolean checkEventSetupValidity(int counter, int number, int maskValue) {
+		return OprofileLaunchPlugin.getCache().checkEvent(counter, number, maskValue);
+	}
+
+	/**
+	 * Returns whether or not oprofile is operating in timer mode.
+	 * @return true if oprofile is in timer mode, false otherwise
+	 */
+	protected boolean getTimerMode() {
+		return Oprofile.getTimerMode();
+	}
+	
+	/**
+	 * Returns the number of hardware counters the cpu has 
+	 * @return int number of counters
+	 */
+	protected int getNumberOfCounters() {
+		return Oprofile.getNumberOfCounters();
+	}
+	
+	/**
+	 * A sub-tab of the OprofileEventConfigTab launch configuration tab. 
+	 * Essentially, it is a frontend to an OprofileCounter. This is an 
+	 * inner class because it requires methods from the parent tab (such as
+	 * updateLaunchConfigurationDialog() when a widget changes state).
+	 */ 
+	protected class CounterSubTab {
+		private Button _enabledCheck;
+		private Button _profileKernelCheck;
+		private Button _profileUserCheck;
+		private Label _countTextLabel;
+		private Text _countText;
+		private Label _eventDescLabel;
+		private Text _eventDescText;
+		private UnitMaskViewer _unitMaskViewer;
+		private ListViewer _eventList;
+		private OprofileCounter _counter;
+		
+		private ScrolledComposite _scrolledTop;
+		private Composite _tabTopContainer;
+
+		/**
+		 * Constructor for a subtab. Creates the layout and widgets for its content.
+		 * @param parent composite the widgets will be created in 
+		 * @param counter the associated OprofileCounter object
+		 */
+		public CounterSubTab(Composite parent, OprofileCounter counter) {
+			_counter = counter;
+
+			parent.setLayout(new GridLayout());
+
+			//scrollable composite on top
+			ScrolledComposite scrolledContainer = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL);
+			scrolledContainer.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+			GridLayout layout = new GridLayout();
+			layout.marginHeight = 0;
+			layout.marginWidth = 0;
+			scrolledContainer.setLayout(layout);
+			scrolledContainer.setExpandHorizontal(true);
+			scrolledContainer.setExpandVertical(true);
+			
+			//composite to contain the rest of the tab
+			Composite tabTopContainer = new Composite(scrolledContainer, SWT.NONE);
+			scrolledContainer.setContent(tabTopContainer);
+			layout = new GridLayout();
+			layout.marginHeight = 0;
+			layout.marginWidth = 0;
+			layout.numColumns = 2;
+			tabTopContainer.setLayout(layout);
+			tabTopContainer.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); 
+
+			//top cell
+			Composite topCellComp = new Composite(tabTopContainer, SWT.NONE);
+			layout = new GridLayout();
+			layout.marginHeight = 0;
+			layout.marginWidth = 0;
+			layout.numColumns = 2;
+			topCellComp.setLayout(layout);
+			topCellComp.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1));
+			
+			createTopCell(topCellComp);
+			
+			createVerticalSpacer(tabTopContainer, 2);
+			
+			//left side composite group for eventList
+			Composite eventListComp = new Composite(tabTopContainer, SWT.NONE);
+			layout = new GridLayout();
+			layout.marginHeight = 0;
+			layout.marginWidth = 0;
+			eventListComp.setLayout(layout);
+			//layoutdata is set later
+
+			createLeftCell(eventListComp);
+			
+			
+			//right side composite group for other event config and unit mask
+			Composite eventConfigComp = new Composite(tabTopContainer, SWT.NONE);
+			layout = new GridLayout();
+			layout.numColumns = 2;
+			layout.marginHeight = 0;
+			layout.marginWidth = 0;
+			eventConfigComp.setLayout(layout);
+			eventConfigComp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+			
+			createRightCell(eventConfigComp);
+
+			
+			//set the list's composite layout based on the right cell's size
+			GridData data = new GridData(SWT.FILL, SWT.FILL, false, true);
+			data.heightHint = eventConfigComp.getSize().x;
+			eventListComp.setLayoutData(data);
+			
+			_scrolledTop = scrolledContainer;
+			_tabTopContainer = tabTopContainer;
+		}
+		
+		/**
+		 * Creates the "Enabled" checkbox, and the event description text.
+		 * @param parent composite these widgets will be created in
+		 */
+		private void createTopCell(Composite parent) {
+			//checkbox
+			_enabledCheck = new Button(parent, SWT.CHECK);
+			_enabledCheck.setText(OprofileLaunchMessages.getString("tab.event.counterSettings.enabled.button.text")); //$NON-NLS-1$
+			_enabledCheck.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 2, 1));
+			_enabledCheck.addSelectionListener(new SelectionAdapter() {
+				public void widgetSelected(SelectionEvent se) {
+					_counter.setEnabled(_enabledCheck.getSelection());
+					_setEnabledState(_counter.getEnabled());
+					updateLaunchConfigurationDialog();
+				}
+			});
+			_enabledCheck.setEnabled(false);
+			
+			//label for textbox
+			_eventDescLabel = new Label(parent, SWT.NONE);
+			_eventDescLabel.setText(OprofileLaunchMessages.getString("tab.event.eventDescription.label.text")); //$NON-NLS-1$
+			_eventDescLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+
+			//textbox
+			_eventDescText = new Text(parent, SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY);
+			_eventDescText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+		}
+
+		/**
+		 * Creates the event list widget.
+		 * @param parent composite these widgets will be created in
+		 */
+		private void createLeftCell(Composite parent) {
+			_eventList = new ListViewer(parent, SWT.SINGLE | SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER);
+			_eventList.getList().setLayoutData(new GridData(SWT.LEFT, SWT.FILL, false, true));
+
+			_eventList.setLabelProvider(new ILabelProvider(){
+				public String getText(Object element) {
+					OpEvent e = (OpEvent) element;
+					return e.getText();
+				}
+				public Image getImage(Object element) { return null; }
+				public void addListener(ILabelProviderListener listener) { }
+				public void dispose() { }
+				public boolean isLabelProperty(Object element, String property) { return false; }
+				public void removeListener(ILabelProviderListener listener) { }
+			});
+			
+			_eventList.setContentProvider(new IStructuredContentProvider() {
+				public Object[] getElements(Object inputElement) {
+					OprofileCounter ctr = (OprofileCounter) inputElement;
+					return (OpEvent[]) ctr.getValidEvents();
+				}
+				public void dispose() { }
+				public void inputChanged(Viewer arg0, Object arg1, Object arg2) { }
+			});
+
+			//adds the events to the list from the counter
+			_eventList.setInput(_counter);
+			
+			_eventList.addSelectionChangedListener(new ISelectionChangedListener() {
+				public void selectionChanged(SelectionChangedEvent sce) {
+					_handleEventListSelectionChange();
+				}
+			});
+		}
+		
+		/**
+		 * Creates the 2 profile space checkboxes, event count and unit mask widget.
+		 * @param parent composite these widgets will be created in
+		 */
+		private void createRightCell(Composite parent) {
+			//profile kernel checkbox
+			_profileKernelCheck = new Button(parent, SWT.CHECK);
+			_profileKernelCheck.setText(OprofileLaunchMessages.getString("tab.event.counterSettings.profileKernel.check.text")); //$NON-NLS-1$
+			_profileKernelCheck.addSelectionListener(new SelectionAdapter() {
+				public void widgetSelected(SelectionEvent se) {
+					_handleProfileKernelToggle();
+				}
+			});
+			
+			//profile user checkbox -- should this ever be disabled?
+			_profileUserCheck = new Button(parent, SWT.CHECK);
+			_profileUserCheck.setText(OprofileLaunchMessages.getString("tab.event.counterSettings.profileUser.check.text")); //$NON-NLS-1$
+			_profileUserCheck.addSelectionListener(new SelectionAdapter() {
+				public void widgetSelected(SelectionEvent se) {
+					_handleProfileUserToggle();
+				}
+			});
+			
+			//event count label/text 
+			_countTextLabel = new Label(parent, SWT.NONE);
+			_countTextLabel.setText(OprofileLaunchMessages.getString("tab.event.counterSettings.count.label.text")); //$NON-NLS-1$
+			_countText = new Text(parent, SWT.SINGLE | SWT.BORDER);
+			_countText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+			_countText.addModifyListener(new ModifyListener() {
+				public void modifyText(ModifyEvent me) {
+					_handleCountTextModify();
+				}
+			});
+
+			//unit mask widget
+			Composite unitMaskComp = new Composite(parent, SWT.NONE);
+			GridLayout layout = new GridLayout();
+			layout.marginHeight = 0;
+			layout.marginWidth = 0;
+			unitMaskComp.setLayout(layout);
+			unitMaskComp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1));
+
+			_unitMaskViewer = new UnitMaskViewer(unitMaskComp);
+		}
+		
+		/**
+		 * Initializes the tab on first creation.
+		 * @param config default configuration for the counter and the associated widgets
+		 */
+		public void initializeTab(ILaunchConfiguration config) {
+			//make all controls inactive, since the 'default event' checkbox
+			// is checked by default
+			setEnabledState(false);
+			
+			if (config != null) {
+				_counter.loadConfiguration(config);
+			}
+
+			boolean enabled = _counter.getEnabled();
+			_enabledCheck.setSelection(enabled);
+
+			if (_counter.getEvent() == null) {
+				// Default to first in list
+				_counter.setEvent(_counter.getValidEvents()[0]);
+			}
+
+			//load default states
+			_profileKernelCheck.setSelection(_counter.getProfileKernel());
+			_profileUserCheck.setSelection(_counter.getProfileUser());
+			_countText.setText(Integer.toString(_counter.getCount()));
+			_eventDescText.setText(_counter.getEvent().getTextDescription());
+			_unitMaskViewer.displayEvent(_counter.getEvent());
+			_eventList.setSelection(new StructuredSelection(_counter.getEvent()));
+		}
+		
+		/**
+		 * Applies the tab's current state to the launch configuration.
+		 * @param config launch config to apply to
+		 */
+		public void performApply(ILaunchConfigurationWorkingCopy config) {
+			_counter.saveConfiguration(config);
+			try {
+				config.doSave();
+			} catch (CoreException e) {
+				e.printStackTrace();
+			}
+		}
+
+		/**
+		 * Enables/disables the widgets in this tab.
+		 * @param state true to enable to the counter's state, false to disable all
+		 */
+		public void setEnabledState(boolean state) {
+			_enabledCheck.setEnabled(state);
+			
+			if (state) {
+				_setEnabledState(_counter.getEnabled());
+			} else {
+				_setEnabledState(false);
+			}
+		}
+		
+		/**
+		 * Method split from setEnabledState to avoid code duplication.
+		 * Not meant to be called directly.
+		 * @param state true to enable all widgets, false to disable all widgets
+		 */
+		private void _setEnabledState(boolean state) {
+			_profileKernelCheck.setEnabled(state);
+			_profileUserCheck.setEnabled(state);
+			_countText.setEnabled(state);
+			_eventDescText.setEnabled(state);
+			_unitMaskViewer.setEnabled(state);
+			_eventList.getList().setEnabled(state);
+		}
+
+		/**
+		 * Handling method for the event list. Gets the selection from the listviewer 
+		 * and updates the UnitMask and event description text box. 
+		 */
+		private void _handleEventListSelectionChange() {
+			int index = _eventList.getList().getSelectionIndex();
+			OpEvent event = (OpEvent) _eventList.getElementAt(index);
+			_counter.setEvent(event);
+			_eventDescText.setText(event.getTextDescription());
+			_unitMaskViewer.displayEvent(event);
+
+			// Check the min count to update the error message (events can have
+			// different minimum reset counts)
+			int min = _counter.getEvent().getMinCount();
+			if (_counter.getCount() < min) {
+				setErrorMessage(getMinCountErrorMessage(min));
+			}
+
+			updateLaunchConfigurationDialog();
+		}
+		
+		/**
+		 * Handles the toggling of the "profile user" button.
+		 */
+		private void _handleProfileUserToggle() {
+			_counter.setProfileUser(_profileUserCheck.getSelection());
+			updateLaunchConfigurationDialog();
+		}
+
+		/**
+		 * Handles the toggling of the "profile kernel" button.
+		 */
+		private void _handleProfileKernelToggle() {
+			_counter.setProfileKernel(_profileKernelCheck.getSelection());
+			updateLaunchConfigurationDialog();
+		}
+		
+		/**
+		 * Handles text modify events in the count text widget.
+		 */
+		private void _handleCountTextModify() {
+			String errorMessage = null;
+			try {
+
+				// This seems counter-intuitive, but we must save the count
+				// so that isValid knows this launch config is invalid
+				int count = Integer.parseInt(_countText.getText());
+				_counter.setCount(count);
+
+				// Check minimum count
+				int min = _counter.getEvent().getMinCount();
+				if (count < min) {
+					errorMessage = getMinCountErrorMessage(min);
+				}
+			} catch (NumberFormatException e) {
+				errorMessage = OprofileLaunchMessages.getString("tab.event.counterSettings.count.invalid"); //$NON-NLS-1$
+				_counter.setCount(OprofileDaemonEvent.COUNT_INVALID);
+			} finally {
+				setErrorMessage(errorMessage);
+				updateLaunchConfigurationDialog();
+			}
+		}
+		
+		/**
+		 * Returns a string with the minimum allowed count, suitable foruse with setErrorMessage().
+		 * @param min minimum count
+		 * @return a String containing the error message
+		 */
+		private String getMinCountErrorMessage(int min) {
+			String msg = OprofileLaunchMessages.getString("tab.event.counterSettings.count.too-small"); //$NON-NLS-1$
+			Object[] args = new Object[] { new Integer(min) };
+			return MessageFormat.format(msg, args);
+		}
+		
+		/**
+		 * Changes parameters for the top scrolled composite which makes the scroll bars
+		 * appear when content overflows the visible area. Called by the UnitMaskViewer 
+		 * whenever a new set of unit mask buttons are created, since the number of them is
+		 * variable and there is no guarantee as to the default size of the launch configuration
+		 * dialog in general.
+		 */
+		private void resizeScrollContainer() {
+			_scrolledTop.setMinSize(_tabTopContainer.computeSize(SWT.DEFAULT, SWT.DEFAULT));
+		}
+		
+		
+		/**
+		 * This class displays event unit masks via check boxes and appropriate labels.
+		 */
+		protected class UnitMaskViewer {
+			private Label _unitMaskLabel;
+			private Composite _top;
+			private Composite _maskListComp;
+			private Button[] _unitMaskButtons;
+
+			/**
+			 * Constructor, creates the widget.
+			 * @param parent composite the widget will be created in
+			 */
+			public UnitMaskViewer(Composite parent) {
+				//"Unit Mask:" label
+				_unitMaskLabel = new Label(parent, SWT.NONE);
+				_unitMaskLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+				_unitMaskLabel.setText(OprofileLaunchMessages.getString("unitmaskViewer.label.text")); //$NON-NLS-1$
+				_unitMaskLabel.setVisible(true);
+
+				//composite to contain the button widgets
+				Composite top = new Composite(parent, SWT.NONE);
+				top.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+				GridLayout layout = new GridLayout();
+				layout.marginHeight = 0;
+				layout.marginWidth = 0;
+				top.setLayout(layout);
+				_top = top;
+				
+				_maskListComp = null;
+				_unitMaskButtons = null;
+			}
+
+			/**
+			 * Handles button toggles; updates the counter's unit mask to the appropriate value.
+			 * @param maskButton the button object
+			 * @param index the button's mask index (used in OpUnitMask for a proper mask value) 
+			 */
+			private void _handleToggle(Button maskButton, int index) {
+				OpUnitMask mask = _counter.getUnitMask();
+				if (mask != null) {
+					if (maskButton.getSelection()) {
+						mask.setMaskFromIndex(index);
+					} else {
+						mask.unSetMaskFromIndex(index);
+					}
+				}
+
+				//update the parent tab
+				updateLaunchConfigurationDialog();
+			}
+
+			/**
+			 * Disposes of the old unit mask check list and creates a new one with 
+			 *   the appropriate default value. 
+			 * @param oe the event
+			 */
+			public void displayEvent(OpEvent oe) {
+				OpUnitMask mask = oe.getUnitMask();
+				int totalMasks = mask.getNumMasks();
+				
+				if (_maskListComp != null) {
+					_maskListComp.dispose();
+				}
+				
+				Composite newMaskComp = new Composite(_top, SWT.NONE);
+				newMaskComp.setLayout(new GridLayout());
+				newMaskComp.setLayoutData(new GridData(SWT.LEFT, SWT.FILL, false, true));
+				_maskListComp = newMaskComp;
+
+				//creates these buttons with the default masks
+				mask.setDefaultMaskValue();
+				
+				ArrayList<Button> maskButtons = new ArrayList<Button>();
+				
+				for (int i = 0; i < totalMasks; i++) {
+					Button maskButton;
+
+					if (mask.getType() == OpUnitMask.INVALID) {
+						//big problem, most likely parsing went awry or opxml output mangled
+						OprofileCorePlugin.showErrorDialog("opxmlParse", null); //$NON-NLS-1$
+						return;
+					} else if (mask.getType() == OpUnitMask.MANDATORY) {
+						maskButton = new Button(newMaskComp, SWT.RADIO);
+						maskButton.setEnabled(false);
+						maskButton.setText(mask.getText(i));
+						maskButton.setSelection(true);
+					} else {
+						int buttonType;
+						final int maskButtonIndex = i;
+						boolean selected = mask.isMaskSetFromIndex(maskButtonIndex);
+
+						if (mask.getType() == OpUnitMask.EXCLUSIVE) {
+							buttonType = SWT.RADIO;
+						} else {	//mask type is OpUnitMask.BITMASK
+							buttonType = SWT.CHECK;
+						}
+						
+						maskButton = new Button(newMaskComp, buttonType);
+						maskButton.setEnabled(true);
+						maskButton.setText(mask.getText(i));
+						maskButton.setSelection(selected);
+						maskButton.addSelectionListener(new SelectionAdapter() {
+							public void widgetSelected(SelectionEvent se) {
+								_handleToggle((Button)se.getSource(), maskButtonIndex);
+							}
+						});
+						
+						maskButtons.add(maskButton);
+					}
+				}
+				
+				_unitMaskButtons = new Button[maskButtons.size()];
+				maskButtons.toArray(_unitMaskButtons);
+				
+				resizeScrollContainer();
+			}
+
+			/**
+			 * Enables and disables the viewer for UI input
+			 * @param enabled whether this viewer should be enabled
+			 */
+			public void setEnabled(boolean enabled) {
+				if (_unitMaskButtons != null) {
+					for (Button b : _unitMaskButtons) {
+						b.setEnabled(enabled);
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/configuration/OprofileLaunchConfigurationTabGroup.java b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/configuration/OprofileLaunchConfigurationTabGroup.java
new file mode 100644
index 0000000..047cfcf
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/configuration/OprofileLaunchConfigurationTabGroup.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation 
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.launch.configuration;
+
+import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
+import org.eclipse.linuxtools.profiling.launch.ProfileLaunchConfigurationTabGroup;
+
+public class OprofileLaunchConfigurationTabGroup extends ProfileLaunchConfigurationTabGroup {
+	@Override
+	public AbstractLaunchConfigurationTab[] getProfileTabs() {
+		return new AbstractLaunchConfigurationTab[] { new OprofileSetupTab(), new OprofileEventConfigTab() };
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/configuration/OprofileSetupTab.java b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/configuration/OprofileSetupTab.java
new file mode 100644
index 0000000..d523ea6
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/configuration/OprofileSetupTab.java
@@ -0,0 +1,280 @@
+/*******************************************************************************
+ * Copyright (c) 2004,2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *    Kent Sebastian <ksebasti@redhat.com> - 
+ *******************************************************************************/
+package org.eclipse.linuxtools.oprofile.launch.configuration;
+
+import java.io.File;
+import java.text.MessageFormat;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
+import org.eclipse.linuxtools.oprofile.core.daemon.OprofileDaemonOptions;
+import org.eclipse.linuxtools.oprofile.launch.OprofileLaunchMessages;
+import org.eclipse.linuxtools.oprofile.launch.OprofileLaunchPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.MessageBox;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * This tab is used by the launcher to configure global oprofile run options.
+ */
+public class OprofileSetupTab extends AbstractLaunchConfigurationTab {
+	protected Text _kernelImageFileText;
+	
+	protected Button _checkSeparateLibrary;
+	protected Button _checkSeparateKernel;
+	//maybe these later
+//	protected Button _checkSeparateThread;
+//	protected Button _checkSeparateCpu;
+
+	protected static LaunchOptions _options = null;
+
+	public String getName() {
+		return OprofileLaunchMessages.getString("tab.global.name"); //$NON-NLS-1$
+	}
+
+	public boolean isValid(ILaunchConfiguration config) {
+		boolean b = _options.isValid();
+		// System.out.println("SetupTab isValid = " + b);
+		return b;
+	}
+
+	public void performApply(ILaunchConfigurationWorkingCopy config) {
+		_options.saveConfiguration(config);
+		try {
+			config.doSave();
+		} catch (CoreException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void initializeFrom(ILaunchConfiguration config) {
+		_options.loadConfiguration(config);
+		
+		_kernelImageFileText.setText(_options.getKernelImageFile());
+		
+		int separate = _options.getSeparateSamples();
+		
+		if (separate == OprofileDaemonOptions.SEPARATE_NONE) {
+			_checkSeparateLibrary.setSelection(false);
+			_checkSeparateKernel.setSelection(false);
+		} else {
+			//note that opcontrol will nicely ignore the trailing comma
+			if ((separate & OprofileDaemonOptions.SEPARATE_LIBRARY) != 0)
+				_checkSeparateLibrary.setSelection(true);
+			if ((separate & OprofileDaemonOptions.SEPARATE_KERNEL) != 0)
+				_checkSeparateKernel.setSelection(true);
+//			if ((separate & OprofileDaemonOptions.SEPARATE_THREAD) != 0)
+//				_checkSeparateThread.setSelection(true);
+//			if ((separate & OprofileDaemonOptions.SEPARATE_CPU) != 0)
+//				_checkSeparateCpu.setSelection(true);
+		}
+	}
+
+	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
+		_options = new LaunchOptions();
+		_options.saveConfiguration(config);
+		try {
+			config.doSave();
+		} catch (CoreException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	@Override
+	public Image getImage() {
+		return OprofileLaunchPlugin.getImageDescriptor(OprofileLaunchPlugin.ICON_GLOBAL_TAB).createImage();
+	}
+
+	public void createControl(Composite parent) {
+		_options = new LaunchOptions();
+
+		Composite top = new Composite(parent, SWT.NONE);
+		setControl(top);
+		top.setLayout(new GridLayout());
+
+		GridData data;
+		GridLayout layout;
+		createVerticalSpacer(top, 1);
+
+		// Create container for kernel image file selection
+		Composite p = new Composite(top, SWT.NONE);
+		layout = new GridLayout();
+		layout.numColumns = 2;
+		layout.marginHeight = 0;
+		layout.marginWidth = 0;
+		p.setLayout(layout);
+		data = new GridData(GridData.FILL_HORIZONTAL);
+		p.setLayoutData(data);
+
+		Label l = new Label(p, SWT.NONE);
+		l.setText(OprofileLaunchMessages.getString("tab.global.kernelImage.label.text")); //$NON-NLS-1$
+		data = new GridData();
+		data.horizontalSpan = 2;
+		l.setLayoutData(data);
+
+		_kernelImageFileText = new Text(p, SWT.SINGLE | SWT.BORDER);
+		data = new GridData(GridData.FILL_HORIZONTAL);
+		_kernelImageFileText.setLayoutData(data);
+		_kernelImageFileText.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent mev) {
+				_handleKernelImageFileTextModify(_kernelImageFileText);
+			};
+		});
+
+		Button button = createPushButton(p, OprofileLaunchMessages.getString("tab.global.kernelImage.browse.button.text"), null); //$NON-NLS-1$
+		final Shell shell = top.getShell();
+		button.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent sev) {
+				_showFileDialog(shell);
+			}
+		});
+
+		createVerticalSpacer(top, 1);
+
+		// Create checkbox options container
+		p = new Composite(top, SWT.NONE);
+		layout = new GridLayout();
+		layout.numColumns = 1;
+		layout.marginHeight = 0;
+		layout.marginWidth = 0;
+		p.setLayout(layout);
+		data = new GridData(GridData.FILL_HORIZONTAL);
+		data.horizontalSpan = 2;
+		p.setLayoutData(data);
+
+		_checkSeparateLibrary = _createCheckButton(p, OprofileLaunchMessages.getString("tab.global.check.separateLibrary.text")); //$NON-NLS-1$
+		_checkSeparateKernel = _createCheckButton(p, OprofileLaunchMessages.getString("tab.global.check.separateKernel.text")); //$NON-NLS-1$
+//		_checkSeparateThread = _createCheckButton(p, OprofileLaunchMessages.getString("tab.global.check.separateThread.text")); //$NON-NLS-1$
+//		_checkSeparateCpu = _createCheckButton(p, OprofileLaunchMessages.getString("tab.global.check.separateCpu.text")); //$NON-NLS-1$
+	}
+
+	// convenience method to create radio buttons with the given label
+	private Button _createCheckButton(Composite parent, String label) {
+		final Button b = new Button(parent, SWT.CHECK);
+		b.setText(label);
+		b.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent se) {
+				_handleCheckSelected(b);
+			}
+		});
+
+		return b;
+	}
+
+	//sets the proper separation mask for sample separation 
+	private void _handleCheckSelected(Button button) {
+		int oldSeparate = _options.getSeparateSamples();
+		int newSeparate = oldSeparate;		//initalize
+		
+		if (button == _checkSeparateLibrary) {
+			if (button.getSelection()) {
+				newSeparate = oldSeparate | OprofileDaemonOptions.SEPARATE_LIBRARY;
+			} else {
+				newSeparate = oldSeparate & ~OprofileDaemonOptions.SEPARATE_LIBRARY;
+			}
+		} else if (button == _checkSeparateKernel) {
+			if (button.getSelection()) {
+				newSeparate = oldSeparate | OprofileDaemonOptions.SEPARATE_KERNEL;
+			} else {
+				newSeparate = oldSeparate & ~OprofileDaemonOptions.SEPARATE_KERNEL;
+			}
+//		} else if (button == _checkSeparateThread) {
+//			if (button.getSelection()) {
+//				newSeparate = oldSeparate | OprofileDaemonOptions.SEPARATE_THREAD;
+//			} else {
+//				newSeparate = oldSeparate & ~OprofileDaemonOptions.SEPARATE_THREAD;
+//			}
+//		} else if (button == _checkSeparateCpu) {
+//			if (button.getSelection()) {
+//				newSeparate = oldSeparate | OprofileDaemonOptions.SEPARATE_CPU;
+//			} else {
+//				newSeparate = oldSeparate & ~OprofileDaemonOptions.SEPARATE_CPU;
+//			}
+		}
+		
+		_options.setSeparateSamples(newSeparate);
+
+		updateLaunchConfigurationDialog();
+	}
+
+	// handles text modification events for all text boxes in this tab
+	private void _handleKernelImageFileTextModify(Text text) {
+		String errorMessage = null;
+		String filename = text.getText();
+
+		if (filename.length() > 0) {
+			File file = new File(filename);
+			if (!file.exists() || !file.isFile()) {
+				String msg = OprofileLaunchMessages.getString("tab.global.kernelImage.kernel.nonexistent"); //$NON-NLS-1$
+				Object[] args = new Object[] { filename };
+				errorMessage = MessageFormat.format(msg, args);
+			}
+
+			//seems odd, but must set it even if it is invalid so that performApply
+			// and isValid work properly
+			_options.setKernelImageFile(filename);
+		} else {
+			// no kernel image file
+			_options.setKernelImageFile(new String());
+		}
+
+		// Update dialog and error message
+		setErrorMessage(errorMessage);
+		updateLaunchConfigurationDialog();
+	}
+
+	// Displays a file dialog to allow the user to select the kernel image file
+	private void _showFileDialog(Shell shell) {
+		FileDialog d = new FileDialog(shell, SWT.OPEN);
+		File kernel = new File(_options.getKernelImageFile());
+		if (!kernel.exists()) {
+			kernel = new File("/boot"); 	//$NON-NLS-1$
+			if (!kernel.exists())
+				kernel = new File("/"); 	//$NON-NLS-1$
+		}
+		d.setFileName(kernel.toString());
+		d.setText(OprofileLaunchMessages.getString("tab.global.selectKernelDialog.text")); //$NON-NLS-1$
+		String newKernel = d.open();
+		if (newKernel != null) {
+			kernel = new File(newKernel);
+			if (!kernel.exists()) {
+				MessageBox mb = new MessageBox(shell, SWT.ICON_ERROR | SWT.RETRY | SWT.CANCEL);
+				mb.setMessage(OprofileLaunchMessages.getString("tab.global.selectKernelDialog.error.kernelDoesNotExist.text")); 	//$NON-NLS-1$
+				switch (mb.open()) {
+					case SWT.RETRY:
+						// Ok, it's recursive, but it shouldn't matter
+						_showFileDialog(shell);
+						break;
+					default:
+					case SWT.CANCEL:
+						break;
+				}
+			} else {
+				_kernelImageFileText.setText(newKernel);
+			}
+		}
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/launching/AbstractOprofileLaunchConfigurationDelegate.java b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/launching/AbstractOprofileLaunchConfigurationDelegate.java
new file mode 100644
index 0000000..319551a
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/launching/AbstractOprofileLaunchConfigurationDelegate.java
@@ -0,0 +1,189 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008, 2009 Red Hat, Inc. and others
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *    Keith Seitz <keiths@redhat.com> - setup code in launch the method, initially 
+ *        written in the now-defunct OprofileSession class
+ *    QNX Software Systems and others - the section of code marked in the launch 
+ *        method, and the exec method
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.launch.launching;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
+import org.eclipse.cdt.launch.AbstractCLaunchDelegate;
+import org.eclipse.cdt.utils.pty.PTY;
+import org.eclipse.cdt.utils.spawner.ProcessFactory;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.ILaunch;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.linuxtools.oprofile.core.OpcontrolException;
+import org.eclipse.linuxtools.oprofile.core.OprofileCorePlugin;
+import org.eclipse.linuxtools.oprofile.core.daemon.OprofileDaemonEvent;
+import org.eclipse.linuxtools.oprofile.core.daemon.OprofileDaemonOptions;
+import org.eclipse.linuxtools.oprofile.launch.OprofileLaunchPlugin;
+import org.eclipse.linuxtools.oprofile.launch.configuration.LaunchOptions;
+import org.eclipse.linuxtools.oprofile.launch.configuration.OprofileCounter;
+import org.eclipse.linuxtools.oprofile.ui.OprofileUiPlugin;
+import org.eclipse.linuxtools.oprofile.ui.view.OprofileView;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+
+public abstract class AbstractOprofileLaunchConfigurationDelegate extends AbstractCLaunchDelegate {
+	public void launch(ILaunchConfiguration config, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
+
+		LaunchOptions options = new LaunchOptions();		//default options created in the constructor
+		options.loadConfiguration(config);
+		IPath exePath = verifyProgramPath( config );
+		options.setBinaryImage(exePath.toOSString());
+
+		//if daemonEvents null or zero size, the default event will be used
+		OprofileDaemonEvent[] daemonEvents = null;
+		if (!config.getAttribute(OprofileLaunchPlugin.ATTR_USE_DEFAULT_EVENT, false)) {
+			//get the events to profile from the counters
+			OprofileCounter[] counters = OprofileCounter.getCounters(config);
+			ArrayList<OprofileDaemonEvent> events = new ArrayList<OprofileDaemonEvent>();
+			
+			for (int i = 0; i < counters.length; ++i) {
+				if (counters[i].getEnabled())
+					events.add(counters[i].getDaemonEvent());
+			}
+			
+			daemonEvents = new OprofileDaemonEvent[events.size()];
+			events.toArray(daemonEvents);
+		}
+		
+		if (!preExec(options, daemonEvents)) return;
+
+		/* 
+		 * this code written by QNX Software Systems and others and was 
+		 * originally in the CDT under LocalCDILaunchDelegate::RunLocalApplication
+		 */
+		//set up and launch the local c/c++ program
+		try {
+			File wd = getWorkingDirectory( config );
+			if ( wd == null ) {
+				wd = new File( System.getProperty( "user.home", "." ) ); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+			String arguments[] = getProgramArgumentsArray( config );
+			ArrayList<String> command = new ArrayList<String>( 1 + arguments.length );
+			command.add( exePath.toOSString() );
+			command.addAll( Arrays.asList( arguments ) );
+			String[] commandArray = (String[])command.toArray( new String[command.size()] );
+			boolean usePty = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_USE_TERMINAL, ICDTLaunchConfigurationConstants.USE_TERMINAL_DEFAULT);
+			Process process;
+			process = exec( commandArray, getEnvironment( config ), wd, usePty );
+			DebugPlugin.newProcess( launch, process, renderProcessLabel( commandArray[0] ) );
+
+			postExec(options, daemonEvents, launch, process);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	protected abstract boolean preExec(LaunchOptions options, OprofileDaemonEvent[] daemonEvents);
+
+	protected abstract void postExec(LaunchOptions options, OprofileDaemonEvent[] daemonEvents, ILaunch launch, Process process);
+
+	/**
+	 * This code was adapted from code written by QNX Software Systems and others 
+	 * and was originally in the CDT under LocalCDILaunchDelegate::exec
+	 * 
+	 * @param cmdLine
+	 *            the command line
+	 * @param workingDirectory
+	 *            the working directory, or <code>null</code>
+	 * @return the resulting process or <code>null</code> if the exec is
+	 *         cancelled
+	 * @see Runtime
+	 */
+	protected Process exec( String[] cmdLine, String[] environ, File workingDirectory, boolean usePty ) throws CoreException, IOException {
+		Process p = null;
+		try {
+			if ( workingDirectory == null ) {
+				p = ProcessFactory.getFactory().exec( cmdLine, environ );
+			}
+			else {
+				if ( usePty && PTY.isSupported() ) {
+					p = ProcessFactory.getFactory().exec( cmdLine, environ, workingDirectory, new PTY() );
+				}
+				else {
+					p = ProcessFactory.getFactory().exec( cmdLine, environ, workingDirectory );
+				}
+			}
+		}
+		catch( IOException e ) {
+			if ( p != null ) {
+				p.destroy();
+			}
+			throw e;
+		}
+		return p;
+	}
+
+	@Override
+	protected String getPluginID() {
+		return OprofileLaunchPlugin.getUniqueIdentifier();
+	}
+	
+	//Helper function to refresh the oprofile view. Opens and focuses the view 
+	// if it isn't already. 
+	protected void refreshOprofileView() {
+		OprofileView view = OprofileUiPlugin.getDefault().getOprofileView();
+		if (view != null) {
+			view.refreshView();
+		} else {
+			try {
+				PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(OprofileUiPlugin.ID_OPROFILE_VIEW);
+			} catch (PartInitException e2) {
+				e2.printStackTrace();
+			}
+			OprofileUiPlugin.getDefault().getOprofileView().refreshView();
+		}
+	}
+	
+	/* all these functions exist to be overridden by the test class in order to allow launch testing */
+	
+	protected void oprofileShutdown() throws OpcontrolException {
+		OprofileCorePlugin.getDefault().getOpcontrolProvider().shutdownDaemon();	
+	}
+	
+	protected void oprofileReset() throws OpcontrolException {
+		OprofileCorePlugin.getDefault().getOpcontrolProvider().reset();		
+	}
+	
+	protected void oprofileSetupDaemon(OprofileDaemonOptions options, OprofileDaemonEvent[] events) throws OpcontrolException {
+		OprofileCorePlugin.getDefault().getOpcontrolProvider().setupDaemon(options, events);		
+	}
+
+	protected void oprofileStartCollection() throws OpcontrolException {
+		OprofileCorePlugin.getDefault().getOpcontrolProvider().startCollection();
+	}
+	
+	protected void oprofileDumpSamples() throws OpcontrolException {
+		OprofileCorePlugin.getDefault().getOpcontrolProvider().dumpSamples();
+	}
+	
+	/**
+	 * Runs opcontrol --help. Returns true if there was any output, false 
+	 * otherwise. Return value can be used to tell if the user successfully
+	 * entered a password.
+	 * @return true if opcontrol --help was run correctly. False otherwise
+	 * @throws OpcontrolException
+	 */
+	protected boolean oprofileStatus() throws OpcontrolException {
+		return OprofileCorePlugin.getDefault().getOpcontrolProvider().status();
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/launching/OprofileLaunchConfigurationDelegate.java b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/launching/OprofileLaunchConfigurationDelegate.java
new file mode 100644
index 0000000..dc0994b
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/launching/OprofileLaunchConfigurationDelegate.java
@@ -0,0 +1,98 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc. and others
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.launch.launching;
+
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.ILaunch;
+import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.debug.core.ILaunchesListener2;
+import org.eclipse.linuxtools.oprofile.core.OpcontrolException;
+import org.eclipse.linuxtools.oprofile.core.OprofileCorePlugin;
+import org.eclipse.linuxtools.oprofile.core.daemon.OprofileDaemonEvent;
+import org.eclipse.linuxtools.oprofile.launch.configuration.LaunchOptions;
+import org.eclipse.swt.widgets.Display;
+
+public class OprofileLaunchConfigurationDelegate extends AbstractOprofileLaunchConfigurationDelegate {
+
+	@Override
+	protected boolean preExec(LaunchOptions options, OprofileDaemonEvent[] daemonEvents) {
+		//set up and launch the oprofile daemon
+		try {
+			if (!oprofileStatus())
+				return false;
+			
+			//kill the daemon (it shouldn't be running already, but to be safe)
+			oprofileShutdown();
+			
+			//reset data from the (possibly) existing default session, 
+			// otherwise multiple runs will combine samples and results
+			// won't make much sense
+			oprofileReset();
+			
+			//setup the events and other parameters
+			oprofileSetupDaemon(options.getOprofileDaemonOptions(), daemonEvents);
+			
+			//start the daemon & collection of samples 
+			//note: since the daemon is only profiling for the specific image we told 
+			// it to, no matter to start the daemon before the binary itself is run
+			oprofileStartCollection();
+		} catch (OpcontrolException oe) {
+			OprofileCorePlugin.showErrorDialog("opcontrolProvider", oe); //$NON-NLS-1$
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	protected void postExec(LaunchOptions options, OprofileDaemonEvent[] daemonEvents, ILaunch launch, Process process) {
+		//add a listener for termination of the launch
+		ILaunchManager lmgr = DebugPlugin.getDefault().getLaunchManager();
+		lmgr.addLaunchListener(new LaunchTerminationWatcher(launch));
+	}
+	
+	//A class used to listen for the termination of the current launch, and 
+	// run some functions when it is finished. 
+	class LaunchTerminationWatcher implements ILaunchesListener2 {
+		private ILaunch launch;
+		public LaunchTerminationWatcher(ILaunch il) {
+			launch = il;
+		}
+		public void launchesTerminated(ILaunch[] launches) {
+			try {
+				for (ILaunch l : launches) {
+					/**
+					 * Dump samples from the daemon,
+					 * shut down the daemon,
+					 * activate the OProfile view (open it if it isn't already),
+					 * refresh the view (which parses the data/ui model and displays it).
+					 */
+					if (l.equals(launch)) {
+						oprofileDumpSamples();
+						oprofileShutdown();
+
+						//need to run this in the ui thread otherwise get SWT Exceptions
+						// based on concurrency issues
+						Display.getDefault().syncExec(new Runnable() {
+							public void run() {
+								refreshOprofileView();
+							}
+						});
+					}
+				}
+			} catch (OpcontrolException oe) {
+				OprofileCorePlugin.showErrorDialog("opcontrolProvider", oe); //$NON-NLS-1$
+			}
+		}
+		public void launchesAdded(ILaunch[] launches) { /* dont care */}
+		public void launchesChanged(ILaunch[] launches) { /* dont care */ }
+		public void launchesRemoved(ILaunch[] launches) { /* dont care */ }
+	}	
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/launching/OprofileLaunchShortcut.java b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/launching/OprofileLaunchShortcut.java
new file mode 100644
index 0000000..6bbe26c
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/launching/OprofileLaunchShortcut.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation 
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.launch.launching;
+
+import org.eclipse.cdt.core.model.IBinary;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationType;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.linuxtools.oprofile.launch.OprofileLaunchPlugin;
+import org.eclipse.linuxtools.oprofile.launch.configuration.LaunchOptions;
+import org.eclipse.linuxtools.profiling.launch.ProfileLaunchShortcut;
+
+/**
+ * A class that takes care of the right-click -> profile with oprofile
+ *   shortcut, where the ProfileLaunchShortcut has the logic to automatically
+ *   find binaries and create a default launch if one doesn't exist.
+ */
+public class OprofileLaunchShortcut extends ProfileLaunchShortcut {
+	@Override
+	protected ILaunchConfigurationType getLaunchConfigType() {
+		
+		return getLaunchManager().getLaunchConfigurationType(OprofileLaunchPlugin.ID_LAUNCH_PROFILE);
+	}
+
+	/**
+	 * Default settings for the OProfile-specific option tabs.
+	 */
+	@Override
+	protected void setDefaultProfileAttributes(ILaunchConfigurationWorkingCopy wc) throws CoreException {
+		//default global setup options
+		LaunchOptions options = new LaunchOptions();
+		options.saveConfiguration(wc);
+
+		//default event option
+		wc.setAttribute(OprofileLaunchPlugin.ATTR_USE_DEFAULT_EVENT, true);
+	}
+
+	//need to have this here because a saved launch config will have the manual
+	// attribute left over, and a previous manual run will still run manually
+	// even if launched from the non-manual shortcut
+	@Override
+	protected ILaunchConfiguration findLaunchConfiguration(IBinary bin, String mode) {
+		ILaunchConfiguration config = super.findLaunchConfiguration(bin, mode);
+		
+		try {
+			ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
+			wc.setAttribute(OprofileLaunchPlugin.ATTR_MANUAL_PROFILE, false);
+			wc.doSave();
+		} catch (CoreException e) {
+			e.printStackTrace();
+		}
+		
+		return config;
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/launching/OprofileManualLaunchConfigurationDelegate.java b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/launching/OprofileManualLaunchConfigurationDelegate.java
new file mode 100644
index 0000000..8f4cea4
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/launching/OprofileManualLaunchConfigurationDelegate.java
@@ -0,0 +1,296 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc. and others
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.launch.launching;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.ILaunch;
+import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.debug.core.ILaunchesListener2;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.linuxtools.oprofile.core.OpcontrolException;
+import org.eclipse.linuxtools.oprofile.core.OprofileCorePlugin;
+import org.eclipse.linuxtools.oprofile.core.daemon.OprofileDaemonEvent;
+import org.eclipse.linuxtools.oprofile.launch.OprofileLaunchMessages;
+import org.eclipse.linuxtools.oprofile.launch.configuration.LaunchOptions;
+import org.eclipse.linuxtools.oprofile.ui.view.OprofileViewSaveDefaultSessionAction;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Layout;
+import org.eclipse.swt.widgets.List;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PlatformUI;
+
+public class OprofileManualLaunchConfigurationDelegate extends AbstractOprofileLaunchConfigurationDelegate {
+	@Override
+	protected boolean preExec(LaunchOptions options, OprofileDaemonEvent[] daemonEvents) {
+//		//set up the oprofile daemon
+//		try {
+//			//kill the daemon (it shouldn't be running already, but to be safe)
+//			oprofileShutdown();
+//			
+//			//reset data from the (possibly) existing default session, 
+//			// otherwise multiple runs will combine samples and results
+//			// won't make much sense
+//			oprofileReset();
+//			
+//			//setup the events and other parameters
+//			oprofileSetupDaemon(options.getOprofileDaemonOptions(), daemonEvents);
+//		} catch (OpcontrolException oe) {
+//			OprofileCorePlugin.showErrorDialog("opcontrolProvider", oe); //$NON-NLS-1$
+//			return;
+//		}
+		return true;
+	}
+
+	@Override
+	protected void postExec(LaunchOptions options, OprofileDaemonEvent[] daemonEvents, ILaunch launch, Process process) {
+		final LaunchOptions fOptions = options;
+		final OprofileDaemonEvent[] fDaemonEvents = daemonEvents;
+		final ILaunch fLaunch = launch;
+		Display.getDefault().syncExec(new Runnable() { 
+			public void run() {
+				//TODO: have a initialization dialog to do reset and setupDaemon?
+				// using a progress dialog, can't abort the launch if there's an exception..
+				try {
+					if (!oprofileStatus())
+						return;
+					oprofileReset();
+					oprofileSetupDaemon(fOptions.getOprofileDaemonOptions(), fDaemonEvents);
+				} catch (OpcontrolException oe) {
+					OprofileCorePlugin.showErrorDialog("opcontrolProvider", oe); //$NON-NLS-1$
+					return;		//dont open the dialog
+				}
+				
+				//manual oprofile control dialog
+				final OprofiledControlDialog dlg = new OprofiledControlDialog();
+				ILaunchManager lmgr = DebugPlugin.getDefault().getLaunchManager();
+				
+				//possible for the launched process to have terminated before opening the dialog
+				if (!fLaunch.isTerminated()) {
+					dlg.setBlockOnOpen(false);
+					dlg.open();
+					lmgr.addLaunchListener(new LaunchTerminationDialogCloser(fLaunch, dlg));
+				}
+			} 
+		});
+	}
+	
+	//A class used to listen for the termination of the current launch, and 
+	// run some functions when it is finished. 
+	class LaunchTerminationDialogCloser implements ILaunchesListener2 {
+		private ILaunch launch;
+		private OprofiledControlDialog dialog;
+		public LaunchTerminationDialogCloser(ILaunch il, OprofiledControlDialog dlg) {
+			launch = il;
+			dialog = dlg;
+		}
+		public void launchesTerminated(ILaunch[] launches) {
+			for (ILaunch l : launches) {
+				//kill the dialog when the launch is done
+				if (l.equals(launch)) {
+					//must be in the ui thread else thread access errors
+					Display.getDefault().asyncExec(new Runnable() {
+						public void run() {
+							dialog.close();
+
+							//progress dialog for ensuring the daemon is shut down
+							IRunnableWithProgress refreshRunner = new IRunnableWithProgress() {
+								public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+									monitor.beginTask(OprofileLaunchMessages.getString("oprofiledcontroldialog.post.stopdaemon"), 1); //$NON-NLS-1$
+									try {
+										oprofileShutdown();
+									} catch (OpcontrolException e) {
+//									e.printStackTrace();
+									}
+									monitor.worked(1);
+									monitor.done();
+								}
+							};
+							ProgressMonitorDialog dialog = new ProgressMonitorDialog(null);
+							try {
+								dialog.run(true, false, refreshRunner);
+							} catch (InvocationTargetException e) {
+								e.printStackTrace();
+							} catch (InterruptedException e) {
+								e.printStackTrace();
+							}
+						}
+					});
+				}
+			}
+		}
+		public void launchesAdded(ILaunch[] launches) { /* dont care */}
+		public void launchesChanged(ILaunch[] launches) { /* dont care */ }
+		public void launchesRemoved(ILaunch[] launches) { /* dont care */ }
+	}	
+	
+	/**
+	 * A custom dialog box to control the oprofile daemon.
+	 */
+	private class OprofiledControlDialog extends MessageDialog {
+		private Button _startDaemonButton;
+		private Button _stopDaemonButton;
+		private Button _refreshViewButton;
+		private Button _resetSessionButton;
+		private Button _saveSessionButton;
+		private List _feedbackList;
+		
+		public OprofiledControlDialog () {
+			super(new Shell(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()), OprofileLaunchMessages.getString("oprofiledcontroldialog.title"), null, null, MessageDialog.NONE, new String[] { IDialogConstants.OK_LABEL }, 0); //$NON-NLS-1$
+		
+			//override styles; makes the dialog non-modal
+			setShellStyle(SWT.CLOSE | SWT.TITLE );
+		}
+		
+		@Override
+	    protected Control createCustomArea(Composite parent) {
+			Composite area = new Composite(parent, 0);
+			Layout layout = new GridLayout(5, true);
+			GridData gd = new GridData();
+			
+			area.setLayout(layout);
+			area.setLayoutData(gd);
+			
+			Button startDaemonButton = new Button(area, SWT.PUSH);
+			startDaemonButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+			startDaemonButton.setText(OprofileLaunchMessages.getString("oprofiledcontroldialog.buttons.startdaemon")); //$NON-NLS-1$
+			startDaemonButton.addSelectionListener(new SelectionListener() {
+				public void widgetDefaultSelected(SelectionEvent e) {
+				}
+				public void widgetSelected(SelectionEvent e) {
+					try {
+						oprofileStartCollection();
+						_startDaemonButton.setEnabled(false);
+						_stopDaemonButton.setEnabled(true);
+						_refreshViewButton.setEnabled(true);
+						_resetSessionButton.setEnabled(true);
+						_saveSessionButton.setEnabled(true);
+					} catch (OpcontrolException oe) {
+						//disable buttons, notify user of error
+						disableAllButtons();
+						OprofileCorePlugin.showErrorDialog("opcontrolProvider", oe); //$NON-NLS-1$
+					}
+					addToFeedbackList(OprofileLaunchMessages.getString("oprofiledcontroldialog.feedback.startdaemon")); //$NON-NLS-1$
+				}});
+			_startDaemonButton = startDaemonButton;
+			
+			Button stopDaemonButton = new Button(area, SWT.PUSH);
+			stopDaemonButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+			stopDaemonButton.setText(OprofileLaunchMessages.getString("oprofiledcontroldialog.buttons.stopdaemon")); //$NON-NLS-1$
+			stopDaemonButton.setEnabled(false);		//disabled at start
+			stopDaemonButton.addSelectionListener(new SelectionListener() {
+				public void widgetDefaultSelected(SelectionEvent e) {
+				}
+				public void widgetSelected(SelectionEvent e) {
+					try {
+						oprofileShutdown();
+						_startDaemonButton.setEnabled(true);
+						_stopDaemonButton.setEnabled(false);
+					} catch (OpcontrolException oe) {
+						//disable buttons, notify user of error
+						disableAllButtons();
+						OprofileCorePlugin.showErrorDialog("opcontrolProvider", oe); //$NON-NLS-1$
+					}
+					addToFeedbackList(OprofileLaunchMessages.getString("oprofiledcontroldialog.feedback.stopdaemon")); //$NON-NLS-1$
+				}});
+			_stopDaemonButton = stopDaemonButton;
+			
+			Button saveSessionButton = new Button(area, SWT.PUSH);
+			saveSessionButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+			saveSessionButton.setText(OprofileLaunchMessages.getString("oprofiledcontroldialog.buttons.savesession")); //$NON-NLS-1$
+			saveSessionButton.setEnabled(false);		//disabled at start
+			saveSessionButton.addSelectionListener(new SelectionListener() {
+				public void widgetDefaultSelected(SelectionEvent e) {
+				}
+				public void widgetSelected(SelectionEvent e) {
+					addToFeedbackList(OprofileLaunchMessages.getString("oprofiledcontroldialog.feedback.save")); //$NON-NLS-1$
+					OprofileViewSaveDefaultSessionAction hack = new OprofileViewSaveDefaultSessionAction();
+					hack.run();
+				}});
+			_saveSessionButton = saveSessionButton;
+			
+			Button resetSessionButton = new Button(area, SWT.PUSH);
+			resetSessionButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+			resetSessionButton.setText(OprofileLaunchMessages.getString("oprofiledcontroldialog.buttons.resetsession")); //$NON-NLS-1$
+			resetSessionButton.setEnabled(false);		//disabled at start
+			resetSessionButton.addSelectionListener(new SelectionListener() {
+				public void widgetDefaultSelected(SelectionEvent e) {
+				}
+				public void widgetSelected(SelectionEvent e) {
+					try {
+						oprofileReset();
+					} catch (OpcontrolException oe) {
+						//disable buttons, notify user of error
+						disableAllButtons();
+						OprofileCorePlugin.showErrorDialog("opcontrolProvider", oe); //$NON-NLS-1$
+					}
+					refreshOprofileView();	//without refresh can lead to inconsistencies for save session
+					addToFeedbackList(OprofileLaunchMessages.getString("oprofiledcontroldialog.feedback.reset")); //$NON-NLS-1$
+				}});
+			_resetSessionButton = resetSessionButton;
+			
+			Button refreshViewButton = new Button(area, SWT.PUSH);
+			refreshViewButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+			refreshViewButton.setText(OprofileLaunchMessages.getString("oprofiledcontroldialog.buttons.refreshview")); //$NON-NLS-1$
+			refreshViewButton.setEnabled(false);		//disabled at start
+			refreshViewButton.addSelectionListener(new SelectionListener() {
+				public void widgetDefaultSelected(SelectionEvent e) {
+				}
+				public void widgetSelected(SelectionEvent e) {
+					addToFeedbackList(OprofileLaunchMessages.getString("oprofiledcontroldialog.feedback.dumpsamples")); //$NON-NLS-1$
+					try {
+						oprofileDumpSamples();
+					} catch (OpcontrolException oe) {
+						//no error in this case; the user might refresh when the daemon isnt running
+					}
+					refreshOprofileView();
+					addToFeedbackList(OprofileLaunchMessages.getString("oprofiledcontroldialog.feedback.refreshed")); //$NON-NLS-1$
+				}});
+			_refreshViewButton = refreshViewButton;
+			
+
+			List feedback = new List(area, SWT.READ_ONLY | SWT.MULTI | SWT.BORDER | SWT.V_SCROLL);
+			feedback.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 5, 1));
+			feedback.add(OprofileLaunchMessages.getString("oprofiledcontroldialog.feedback.init")); //$NON-NLS-1$
+			_feedbackList = feedback;
+			
+	        return area;
+	    }
+		
+		//helper function
+		private void disableAllButtons() {
+			_startDaemonButton.setEnabled(false);
+			_stopDaemonButton.setEnabled(false);
+			_refreshViewButton.setEnabled(false);
+			_resetSessionButton.setEnabled(false);
+			_saveSessionButton.setEnabled(false);
+		}
+		
+		//a little hack to get the list to auto scroll to the newly added item
+		private void addToFeedbackList(String s) {
+			_feedbackList.add(s,0);
+			_feedbackList.setTopIndex(0);
+		}
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/launching/OprofileManualLaunchShortcut.java b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/launching/OprofileManualLaunchShortcut.java
new file mode 100644
index 0000000..04f4091
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/launching/OprofileManualLaunchShortcut.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation 
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.launch.launching;
+
+import org.eclipse.cdt.core.model.IBinary;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationType;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.linuxtools.oprofile.launch.OprofileLaunchPlugin;
+import org.eclipse.linuxtools.oprofile.launch.configuration.LaunchOptions;
+import org.eclipse.linuxtools.profiling.launch.ProfileLaunchShortcut;
+
+/**
+ * A class that takes care of the right-click -> profile with oprofile
+ *   shortcut, where the ProfileLaunchShortcut has the logic to automatically
+ *   find binaries and create a default launch if one doesn't exist.
+ */
+public class OprofileManualLaunchShortcut extends ProfileLaunchShortcut {
+	@Override
+	protected ILaunchConfigurationType getLaunchConfigType() {
+		return getLaunchManager().getLaunchConfigurationType(OprofileLaunchPlugin.ID_LAUNCH_PROFILE_MANUAL);
+	}
+
+	/**
+	 * Default settings for the OProfile-specific option tabs.
+	 */
+	@Override
+	protected void setDefaultProfileAttributes(ILaunchConfigurationWorkingCopy wc) throws CoreException {
+		//default global setup options
+		LaunchOptions options = new LaunchOptions();
+		options.saveConfiguration(wc);
+
+		//default event option
+		wc.setAttribute(OprofileLaunchPlugin.ATTR_USE_DEFAULT_EVENT, true);
+	}
+	
+	@Override
+	protected ILaunchConfiguration findLaunchConfiguration(IBinary bin, String mode) {
+		ILaunchConfiguration config = super.findLaunchConfiguration(bin, mode);
+		
+		//hijack the launch config and add in the manual profile value, which will be 
+		// used in the delegate 
+		try {
+			ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
+			wc.setAttribute(OprofileLaunchPlugin.ATTR_MANUAL_PROFILE, true);
+			wc.doSave();
+		} catch (CoreException e) {
+			e.printStackTrace();
+		}
+		
+		return config;
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/oprofilelaunch.properties b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/oprofilelaunch.properties
new file mode 100644
index 0000000..5b7ca9c
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/oprofilelaunch.properties
@@ -0,0 +1,68 @@
+#####################################################################
+# Copyright (c) 2004,2008 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Keith Seitz <keiths@redhat.com> - initial implementation
+#    Kent Sebastian <ksebasti@redhat.com> - 
+###################################################################### 
+tab.claunch.name=&Application
+tab.claunch.launchConfig.label.text=C/C++ Launch &Configuration:
+tab.claunch.launchConfig.button.browse.text=&Browse...
+tab.claunch.launchConfigDialog.title=Launch Configuration Selection
+tab.claunch.launchConfigDialog.message=Choose a C/C++ Application Launch Configuration to profile:
+oprofileCounter.counterString=Counter: {0,number,integer}
+
+tab.event.name=Events
+tab.event.counterSettings.label.text=Counter settings
+tab.event.counterSettings.enabled.button.text=Enabled
+tab.event.eventDescription.label.text=Event Description:
+tab.event.counterSettings.profileKernel.check.text=Profile kernel
+tab.event.counterSettings.profileUser.check.text=Profile user binaries
+tab.event.counterSettings.count.label.text=Count:
+tab.event.counterSettings.count.too-small=Minimum count must be at least {0,number,integer}
+tab.event.counterSettings.count.invalid=Invalid count value, must be an integer
+tab.event.defaultevent.button.text=Use default event
+tab.event.counterTab.counterText=Ctr 
+tab.event.timermode.no.options=OProfile is running in timer mode; no event options can be specified.
+
+tab.global.name=Global
+tab.global.kernelImage.label.text=&Kernel image file (optional):
+tab.global.kernelImage.kernel.nonexistent=Kernel image \"{0}\" does not exist
+tab.global.kernelImage.browse.button.text=&Browse...
+tab.global.selectKernelDialog.text=Select current kernel file
+tab.global.selectKernelDialog.error.kernelDoesNotExist.text=The selected kernel image file does not exist.
+tab.global.check.separateLibrary.text=Include dependent shared libraries 
+tab.global.check.separateKernel.text=Include dependent kernel modules (also includes libraries)
+tab.global.check.separateThread.text=Separate profiles per thread
+tab.global.check.separateCpu.text=Separate profiles per CPU
+tab.global.check.manualProfile.text=Manual control of OProfile daemon
+
+unitmaskViewer.label.text=Unit mask:
+
+launchshortcut.no_project_error=No project associated with selected element.
+launchshortcut.errordialog.title=OProfile Launcher
+launchshortcut.errordialog.no_launch_error=Error: No launch configurations exist for this project.
+
+launchshortcut.launchselectiondialog.no_project_name=<no name>
+launchshortcut.launchselectiondialog.title=Profile Configuration Selection
+launchshortcut.launchselectiondialog.message=Select a profiling launch configuration:
+
+oprofiledcontroldialog.title=OProfile Control
+oprofiledcontroldialog.buttons.startdaemon=Start Daemon
+oprofiledcontroldialog.buttons.stopdaemon=Stop Daemon
+oprofiledcontroldialog.buttons.refreshview=Refresh View
+oprofiledcontroldialog.buttons.resetsession=Reset Session
+oprofiledcontroldialog.buttons.savesession=Save Session
+oprofiledcontroldialog.feedback.init=Dialog initialized
+oprofiledcontroldialog.feedback.startdaemon=Started OProfile daemon
+oprofiledcontroldialog.feedback.stopdaemon=Stopped OProfile daemon
+oprofiledcontroldialog.feedback.reset=Default session cleared
+oprofiledcontroldialog.feedback.save=Opening session save dialog..
+oprofiledcontroldialog.feedback.dumpsamples=Dumping samples..
+oprofiledcontroldialog.feedback.refreshed=OProfile view refreshed
+
+oprofiledcontroldialog.post.stopdaemon=Ensuring the OProfile daemon is stopped..
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.test-feature/.project b/oprofile/org.eclipse.linuxtools.oprofile.test-feature/.project
new file mode 100644
index 0000000..3816827
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.test-feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.oprofile.test-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.test-feature/ChangeLog b/oprofile/org.eclipse.linuxtools.oprofile.test-feature/ChangeLog
new file mode 100644
index 0000000..3161b5c
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.test-feature/ChangeLog
@@ -0,0 +1,3 @@
+2009-07-22  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Remove trailing "-feature".
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.test-feature/build.properties b/oprofile/org.eclipse.linuxtools.oprofile.test-feature/build.properties
new file mode 100644
index 0000000..4699457
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.test-feature/build.properties
@@ -0,0 +1,8 @@
+bin.includes = feature.xml,\
+               epl-v10.html,\
+               feature.properties,\
+               build.properties
+src.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html,\
+               build.properties
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/docs/epl-v10.html b/oprofile/org.eclipse.linuxtools.oprofile.test-feature/epl-v10.html
similarity index 100%
copy from systemtap/SystemTapGuiServer/systemtapguiserver-1.0/docs/epl-v10.html
copy to oprofile/org.eclipse.linuxtools.oprofile.test-feature/epl-v10.html
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.test-feature/feature.properties b/oprofile/org.eclipse.linuxtools.oprofile.test-feature/feature.properties
new file mode 100644
index 0000000..700f4df
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.test-feature/feature.properties
@@ -0,0 +1,112 @@
+#*******************************************************************************
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Red Hat, Inc. - initial API and implementation
+#********************************************************************************
+featureName=OProfile Integration Tests (Incubation)
+featureProvider=Eclipse
+description=Tests for plugins bringing OProfile-based profiling into the workbench.
+copyright=Copyright 2008 Red Hat, Inc.
+licenseURL=epl-v10.html
+license=\
+ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
+March 17, 2005\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse.org CVS\n\
+repository ("Repository") in CVS modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+Features may also include other Features ("Included Features"). Files named\n\
+"feature.xml" may contain a list of the names and version numbers of\n\
+Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+   - The top-level (root) directory\n\
+   - Plug-in and Fragment directories\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
+   - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Eclipse Update Manager, you must agree to a license ("Feature Update\n\
+License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties". Such Abouts,\n\
+Feature Licenses and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
+    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.test-feature/feature.xml b/oprofile/org.eclipse.linuxtools.oprofile.test-feature/feature.xml
new file mode 100644
index 0000000..0c6731d
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.test-feature/feature.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.linuxtools.oprofile.test"
+      label="%featureName"
+      version="0.3.0.qualifier"
+      provider-name="%featureProvider">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <requires>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.core.resources" version="3.4.1" match="greaterOrEqual"/>
+      <import plugin="org.junit" version="3.8.2" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.oprofile.core"/>
+      <import plugin="org.eclipse.cdt.core"/>
+      <import plugin="org.eclipse.cdt.launch"/>
+      <import plugin="org.eclipse.debug.core"/>
+      <import plugin="org.eclipse.debug.ui"/>
+      <import plugin="org.eclipse.linuxtools.oprofile.launch"/>
+      <import plugin="org.eclipse.linuxtools.profiling.tests"/>
+      <import plugin="org.eclipse.swt"/>
+      <import plugin="org.eclipse.core.runtime" version="3.4.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.oprofile.ui"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.linuxtools.oprofile.core.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.oprofile.launch.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.oprofile.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.oprofile.ui.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+</feature>
diff --git a/profiling/.classpath b/oprofile/org.eclipse.linuxtools.oprofile.tests/.classpath
similarity index 100%
copy from profiling/.classpath
copy to oprofile/org.eclipse.linuxtools.oprofile.tests/.classpath
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/.project b/oprofile/org.eclipse.linuxtools.oprofile.tests/.project
new file mode 100644
index 0000000..c8e31b7
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.oprofile.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/.settings/org.eclipse.jdt.core.prefs b/oprofile/org.eclipse.linuxtools.oprofile.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..36670fa
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Tue Mar 17 16:20:27 EDT 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/.svnignore b/oprofile/org.eclipse.linuxtools.oprofile.tests/.svnignore
new file mode 100644
index 0000000..ba077a4
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.tests/.svnignore
@@ -0,0 +1 @@
+bin
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/META-INF/MANIFEST.MF b/oprofile/org.eclipse.linuxtools.oprofile.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..d2117d7
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.oprofile.tests
+Bundle-Version: 0.3.0.qualifier
+Bundle-Vendor: %bundleProvider
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Import-Package: org.eclipse.linuxtools.oprofile.core.model,
+ org.eclipse.linuxtools.oprofile.core.opxml,
+ org.eclipse.linuxtools.oprofile.core.opxml.modeldata
+Export-Package: org.eclipse.linuxtools.oprofile.tests
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.4.0"
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.eclipse.linuxtools.oprofile.tests.TestPlugin
+Bundle-Localization: plugin
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/build.properties b/oprofile/org.eclipse.linuxtools.oprofile.tests/build.properties
new file mode 100644
index 0000000..f935d6e
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.tests/build.properties
@@ -0,0 +1,11 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               resources/,\
+               plugin.properties
+src.includes = src/,\
+               resources/,\
+               plugin.properties,\
+               META-INF/
+individualSourceBundles=true
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/plugin.properties b/oprofile/org.eclipse.linuxtools.oprofile.tests/plugin.properties
new file mode 100644
index 0000000..01733ac
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.tests/plugin.properties
@@ -0,0 +1,12 @@
+#*******************************************************************************
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+#*******************************************************************************
+bundleName=OProfile Common Test Plug-in (Incubation)
+bundleProvider=Eclipse
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/resources/test_model-data.xml b/oprofile/org.eclipse.linuxtools.oprofile.tests/resources/test_model-data.xml
new file mode 100644
index 0000000..0942fa7
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.tests/resources/test_model-data.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model-data>
+	<image name="/test/path/for/image" count="205000">
+		<symbols>
+			<symbol name="TestFunction1(int)" file="/test/path/for/src/image.cpp" count="180000">
+				<sample>
+					<count>130000</count>
+					<line>42</line>
+				</sample>
+				<sample>
+					<count>40000</count>
+					<line>36</line>
+				</sample>
+				<sample>
+					<count>9999</count>
+					<line>31</line>
+				</sample>
+				<sample>
+					<count>1</count>
+					<line>39</line>
+				</sample>
+			</symbol>
+			<symbol name="TestFunction2(int, int)" file="/test/path/for/src/image2.cpp" count="20000">
+				<sample>
+					<count>19998</count>
+					<line>94</line>
+				</sample>
+				<sample>
+					<count>1</count>
+					<line>12</line>
+				</sample>
+				<sample>
+					<count>1</count>
+					<line>55</line>
+				</sample>
+			</symbol>
+		</symbols>
+		<dependent count="5000">
+			<image name="/no-vmlinux" count="4400">
+			</image>
+			<image name="/lib64/ld-2.9.so" count="300">
+				<symbols>
+					<symbol name="do_lookup_x" file="dl-lookup.c" count="299">
+						<sample>
+							<count>299</count>
+							<line>0</line>
+						</sample>
+					</symbol>
+					<symbol name="_dl_unload_cache" file="rawmemchr.c" count="1">
+						<sample>
+							<count>1</count>
+							<line>0</line>
+						</sample>
+					</symbol>
+				</symbols>
+			</image>
+			<image name="/usr/lib64/libstdc++.so.6.0.10" count="160">
+			</image>
+			<image name="/lib64/libc-2.9.so" count="140">
+				<symbols>
+					<symbol name="_IO_new_file_seekoff" file="" count="100">
+						<sample>
+							<count>100</count>
+							<line>0</line>
+						</sample>
+					</symbol>
+					<symbol name="bcopy" file="" count="40">
+						<sample>
+							<count>40</count>
+							<line>0</line>
+						</sample>
+					</symbol>
+				</symbols>
+			</image>
+		</dependent>
+	</image>
+</model-data>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/resources/test_model-data_multiple_image.xml b/oprofile/org.eclipse.linuxtools.oprofile.tests/resources/test_model-data_multiple_image.xml
new file mode 100644
index 0000000..e82dad5
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.tests/resources/test_model-data_multiple_image.xml
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model-data>
+	<image name="/no-vmlinux" count="6844">
+	</image>
+	<image name="/bin/grep" count="2">
+	</image>
+	<image name="/bin/gawk" count="8">
+	</image>
+	<image name="/bin/bash" count="142">
+	</image>
+	<image name="/lib64/libgobject-2.0.so.0.1800.3" count="61">
+	</image>
+	<image name="/lib64/libgio-2.0.so.0.1800.3" count="2">
+	</image>
+	<image name="/lib64/libdl-2.9.so" count="2">
+		<symbols>
+			<symbol name="__do_global_dtors_aux" file="crtstuff.c" count="2">
+				<sample>
+					<count>2</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+		</symbols>
+	</image>
+	<image name="/lib64/ld-2.9.so" count="36">
+		<symbols>
+			<symbol name="_dl_start" file="rtld.c" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="dl_main" file="rtld.c" count="3">
+				<sample>
+					<count>3</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="init_tls" file="rtld.c" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="open_verify" file="dl-load.c" count="2">
+				<sample>
+					<count>2</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="_dl_setup_hash" file="rawmemchr.c" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="_dl_init_internal" file="rawmemchr.c" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="_dl_important_hwcaps" file="rawmemchr.c" count="2">
+				<sample>
+					<count>2</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="munmap" file="rawmemchr.c" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="_dl_load_cache_lookup" file="rawmemchr.c" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="_dl_fini" file="rawmemchr.c" count="2">
+				<sample>
+					<count>2</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="__GI_memset" file="rawmemchr.c" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="_dl_init_paths" file="rawmemchr.c" count="3">
+				<sample>
+					<count>3</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="__brk" file="rawmemchr.c" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="_dl_name_match_p" file="rawmemchr.c" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="index" file="rawmemchr.c" count="2">
+				<sample>
+					<count>2</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="_dl_resolve_conflicts" file="rawmemchr.c" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="_dl_cache_libcmp" file="rawmemchr.c" count="2">
+				<sample>
+					<count>2</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="strcmp" file="rawmemchr.c" count="2">
+				<sample>
+					<count>2</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="_dl_start_user" file="rawmemchr.c" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="strlen" file="rawmemchr.c" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="_dl_sort_fini" file="rawmemchr.c" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="_dl_map_object_deps" file="rawmemchr.c" count="4">
+				<sample>
+					<count>4</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+			<symbol name="__libc_memalign" file="" count="1">
+				<sample>
+					<count>1</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+		</symbols>
+	</image>
+	<image name="/lib64/libdbus-1.so.3.4.0" count="10">
+	</image>
+	<image name="/lib64/libfuse.so.2.7.4" count="1">
+	</image>
+	<image name="/lib64/libm-2.9.so" count="2">
+		<symbols>
+			<symbol name="__dubsin" file="interp.c" count="2">
+				<sample>
+					<count>2</count>
+					<line>0</line>
+				</sample>
+			</symbol>
+		</symbols>
+	</image>
+	<image name="/lib64/libglib-2.0.so.0.1800.3" count="107">
+	</image>
+	<image name="/lib64/libgthread-2.0.so.0.1800.3" count="3">
+	</image>
+	<image name="/usr/bin/which" count="1">
+	</image>
+	<image name="/usr/bin/compiz" count="21">
+	</image>
+	<image name="/usr/bin/Xorg" count="154">
+		<dependent count="6">
+			<image name="[vdso]" count="6">
+			</image>
+		</dependent>
+	</image>
+	<image name="/usr/bin/ophelp" count="11">
+	</image>
+	<image name="/usr/bin/qemu-kvm" count="142">
+		<dependent count="1">
+			<image name="[vdso]" count="1">
+			</image>
+		</dependent>
+	</image>
+	<image name="/usr/bin/oprofiled" count="26">
+	</image>
+	<image name="/usr/sbin/libvirtd" count="3">
+	</image>
+	<image name="/usr/libexec/multiload-applet-2" count="1">
+	</image>
+	<image name="/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/server/libjvm.so" count="7">
+	</image>
+	<image name="/usr/lib64/libgtk-x11-2.0.so.0.1400.5" count="22">
+	</image>
+	<image name="/usr/lib64/libpangocairo-1.0.so.0.2203.0" count="4">
+	</image>
+	<image name="/usr/lib64/libXrender.so.1.3.0" count="2">
+	</image>
+</model-data>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/resources/test_model-data_nodepimage.xml b/oprofile/org.eclipse.linuxtools.oprofile.tests/resources/test_model-data_nodepimage.xml
new file mode 100644
index 0000000..e01389d
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.tests/resources/test_model-data_nodepimage.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model-data>
+	<image name="/test/path/for/image" count="200000">
+		<symbols>
+			<symbol name="TestFunction1(int)" file="/test/path/for/src/image.cpp" count="180000">
+				<sample>
+					<count>130000</count>
+					<line>42</line>
+				</sample>
+				<sample>
+					<count>40000</count>
+					<line>36</line>
+				</sample>
+				<sample>
+					<count>9999</count>
+					<line>31</line>
+				</sample>
+				<sample>
+					<count>1</count>
+					<line>39</line>
+				</sample>
+			</symbol>
+			<symbol name="TestFunction2(int, int)" file="/test/path/for/src/image2.cpp" count="20000">
+				<sample>
+					<count>19998</count>
+					<line>94</line>
+				</sample>
+				<sample>
+					<count>1</count>
+					<line>12</line>
+				</sample>
+				<sample>
+					<count>1</count>
+					<line>55</line>
+				</sample>
+			</symbol>
+		</symbols>
+	</image>
+</model-data>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestPlugin.java b/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestPlugin.java
new file mode 100644
index 0000000..8b87d1d
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestPlugin.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.oprofile.tests;
+
+import org.eclipse.core.runtime.Plugin;
+import org.osgi.framework.BundleContext;
+
+public class TestPlugin extends Plugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.oprofile.tests"; //$NON-NLS-1$
+	
+	public static final String SYMBOL1_FILENAME = "/test/path/for/src/image.cpp"; //$NON-NLS-1$
+	public static final String SYMBOL2_FILENAME = "/test/path/for/src/image2.cpp"; //$NON-NLS-1$
+
+	public static final String DEP2_SYMBOL1_FILENAME = "dl-lookup.c"; //$NON-NLS-1$
+	public static final String DEP2_SYMBOL2_FILENAME = "rawmemchr.c"; //$NON-NLS-1$
+	public static final String DEP4_SYMBOL_FILENAME = ""; //$NON-NLS-1$
+	
+	// The shared instance
+	private static TestPlugin plugin = null;
+	
+	/**
+	 * The constructor
+	 */
+	public TestPlugin() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static TestPlugin getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelRoot.java b/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelRoot.java
new file mode 100644
index 0000000..f993102
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelRoot.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.tests;
+
+import org.eclipse.linuxtools.oprofile.core.model.OpModelEvent;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelRoot;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelSession;
+
+public class TestingOpModelRoot extends OpModelRoot {
+	public static final String ROOT_OUTPUT = "Event: testEvent1\n\tSession: testSession1e1\n\t\tImage: /test/path/for/image, Count: 205000, Dependent Count: 5000\n\t\t\tSymbols: TestFunction1(int), File: /test/path/for/src/image.cpp, Count: 180000\n\t\t\t\tSample: Line #: 42, Count: 130000\n\t\t\t\tSample: Line #: 36, Count: 40000\n\t\t\t\tSample: Line #: 31, Count: 9999\n\t\t\t\tSample: Line #: 39, Count: 1\n\t\t\tSymbols: TestFunction2(int, int), File: /test/path/for/src/image2.cpp, Count: 20000\n\t\t\t\tSample: Line #: 94, Count: 19998\n\t\t\t\tSample: Line #: 12, Count: 1\n\t\t\t\tSample: Line #: 55, Count: 1\n\t\t\tDependent Image: /no-vmlinux, Count: 4400\n\t\t\tDependent Image: /lib64/ld-2.9.so, Count: 300\n\t\t\t\tSymbols: do_lookup_x, File: dl-lookup.c, Count: 299\n\t\t\t\t\tSample: Line #: 0, Count: 299\n\t\t\t\tSymbols: _dl_unload_cache, File: rawmemchr.c, Count: 1\n\t\t\t\t\tSample: Line #: 0, Count: 1\n\t\t\tDependent Image: /usr/lib64/libstdc++.so.6.0.10, Count: 160\n\t\t\tDependent Image: /lib64/libc-2.9.so, Count: 140\n\t\t\t\tSymbols: _IO_new_file_seekoff, File: , Count: 100\n\t\t\t\t\tSample: Line #: 0, Count: 100\n\t\t\t\tSymbols: bcopy, File: , Count: 40\n\t\t\t\t\tSample: Line #: 0, Count: 40\nEvent: testEvent2\n\tSession: testSession1e2\n\t\tImage: /test/path/for/image, Count: 205000, Dependent Count: 5000\n\t\t\tSymbols: TestFunction1(int), File: /test/path/for/src/image.cpp, Count: 180000\n\t\t\t\tSample: Line #: 42, Count: 130000\n\t\t\t\tSample: Line #: 36, Count: 40000\n\t\t\t\tSample: Line #: 31, Count: 9999\n\t\t\t\tSample: Line #: 39, Count: 1\n\t\t\tSymbols: TestFunction2(int, int), File: /test/path/for/src/image2.cpp, Count: 20000\n\t\t\t\tSample: Line #: 94, Count: 19998\n\t\t\t\tSample: Line #: 12, Count: 1\n\t\t\t\tSample: Line #: 55, Count: 1\n\t\t\tDependent Image: /no-vmlinux, Count: 4400\n\t\t\tDependent Image: /lib64/ld-2.9.so, Count: 300\n\t\t\t\tSymbols: do_lookup_x, File: dl-lookup.c, Count: 299\n\t\t\t\t\tSample: Line #: 0, Count: 299\n\t\t\t\tSymbols: _dl_unload_cache, File: rawmemchr.c, Count: 1\n\t\t\t\t\tSample: Line #: 0, Count: 1\n\t\t\tDependent Image: /usr/lib64/libstdc++.so.6.0.10, Count: 160\n\t\t\tDependent Image: /lib64/libc-2.9.so, Count: 140\n\t\t\t\tSymbols: _IO_new_file_seekoff, File: , Count: 100\n\t\t\t\t\tSample: Line #: 0, Count: 100\n\t\t\t\tSymbols: bcopy, File: , Count: 40\n\t\t\t\t\tSample: Line #: 0, Count: 40\n\tSession: testSession2e2\n\t\tImage: /test/path/for/image, Count: 200000\n\t\t\tSymbols: TestFunction1(int), File: /test/path/for/src/image.cpp, Count: 180000\n\t\t\t\tSample: Line #: 42, Count: 130000\n\t\t\t\tSample: Line #: 36, Count: 40000\n\t\t\t\tSample: Line #: 31, Count: 9999\n\t\t\t\tSample: Line #: 39, Count: 1\n\t\t\tSymbols: TestFunction2(int, int), File: /test/path/for/src/image2.cpp, Count: 20000\n\t\t\t\tSample: Line #: 94, Count: 19998\n\t\t\t\tSample: Line #: 12, Count: 1\n\t\t\t\tSample: Line #: 55, Count: 1\n\tSession: testSession3e2\n\t\tImage: , Count: -1\n\tSession: testSession4e2\n"; //$NON-NLS-1$
+	public static final String NAME_E1 = "testEvent1"; //$NON-NLS-1$
+	public static final String NAME_E2 = "testEvent2"; //$NON-NLS-1$
+	public static final String NAME_E1_S1 = "testSession1e1"; //$NON-NLS-1$
+	public static final String NAME_E2_S1 = "testSession1e2"; //$NON-NLS-1$
+	public static final String NAME_E2_S2 = "testSession2e2"; //$NON-NLS-1$
+	public static final String NAME_E2_S3 = "testSession3e2"; //$NON-NLS-1$
+	public static final String NAME_E2_S4 = "testSession4e2"; //$NON-NLS-1$
+	@Override
+	protected OpModelEvent[] getNewEvents() {
+		//fake running opxml and simply return hand-made events
+		OpModelEvent[] e = {new OpModelEvent(NAME_E1), new OpModelEvent(NAME_E2), null};
+		e[0]._setSessions(new TestingOpModelSession[] {new TestingOpModelSession(e[0], NAME_E1_S1)});
+		e[1]._setSessions(new OpModelSession[] {
+				new TestingOpModelSession(e[1], NAME_E2_S1),
+				new TestingOpModelSession2(e[1], NAME_E2_S2),
+				new TestingOpModelSession3(e[1], NAME_E2_S3),
+				new TestingOpModelSession4(e[1], NAME_E2_S4)});
+		return e;
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelSession.java b/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelSession.java
new file mode 100644
index 0000000..cdeb612
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelSession.java
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.tests;
+
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelEvent;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelImage;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelSession;
+import org.eclipse.linuxtools.oprofile.core.opxml.OprofileSAXHandler;
+import org.eclipse.linuxtools.oprofile.core.opxml.modeldata.ModelDataProcessor;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+
+/*
+ * A faked OpModelSession object of a typical image + some dependent images.
+ */
+public class TestingOpModelSession extends OpModelSession {
+	private static final String REL_PATH_TO_TEST_XML = "resources/test_model-data.xml"; //$NON-NLS-1$
+	public static final String IMAGE_OUTPUT = "/test/path/for/image, Count: 205000, Dependent Count: 5000\nSymbols: TestFunction1(int), File: /test/path/for/src/image.cpp, Count: 180000\n\tSample: Line #: 42, Count: 130000\n\tSample: Line #: 36, Count: 40000\n\tSample: Line #: 31, Count: 9999\n\tSample: Line #: 39, Count: 1\nSymbols: TestFunction2(int, int), File: /test/path/for/src/image2.cpp, Count: 20000\n\tSample: Line #: 94, Count: 19998\n\tSample: Line #: 12, Count: 1\n\tSample: Line #: 55, Count: 1\nDependent Image: /no-vmlinux, Count: 4400\nDependent Image: /lib64/ld-2.9.so, Count: 300\n\tSymbols: do_lookup_x, File: dl-lookup.c, Count: 299\n\t\tSample: Line #: 0, Count: 299\n\tSymbols: _dl_unload_cache, File: rawmemchr.c, Count: 1\n\t\tSample: Line #: 0, Count: 1\nDependent Image: /usr/lib64/libstdc++.so.6.0.10, Count: 160\nDependent Image: /lib64/libc-2.9.so, Count: 140\n\tSymbols: _IO_new_file_seekoff, File: , Count: 100\n\t\tSample: Line #: 0, Count: 100\n\tSymbols: bcopy, File: , Count: 40\n\t\tSample: Line #: 0, Count: 40\n"; //$NON-NLS-1$
+	public static final String IMAGE_OUTPUT_WITHTAB = "/test/path/for/image, Count: 205000, Dependent Count: 5000\n\tSymbols: TestFunction1(int), File: /test/path/for/src/image.cpp, Count: 180000\n\t\tSample: Line #: 42, Count: 130000\n\t\tSample: Line #: 36, Count: 40000\n\t\tSample: Line #: 31, Count: 9999\n\t\tSample: Line #: 39, Count: 1\n\tSymbols: TestFunction2(int, int), File: /test/path/for/src/image2.cpp, Count: 20000\n\t\tSample: Line #: 94, Count: 19998\n\t\tSample: Line #: 12, Count: 1\n\t\tSample: Line #: 55, Count: 1\n\tDependent Image: /no-vmlinux, Count: 4400\n\tDependent Image: /lib64/ld-2.9.so, Count: 300\n\t\tSymbols: do_lookup_x, File: dl-lookup.c, Count: 299\n\t\t\tSample: Line #: 0, Count: 299\n\t\tSymbols: _dl_unload_cache, File: rawmemchr.c, Count: 1\n\t\t\tSample: Line #: 0, Count: 1\n\tDependent Image: /usr/lib64/libstdc++.so.6.0.10, Count: 160\n\tDependent Image: /lib64/libc-2.9.so, Count: 140\n\t\tSymbols: _IO_new_file_seekoff, File: , Count: 100\n\t\t\tSample: Line #: 0, Count: 100\n\t\tSymbols: bcopy, File: , Count: 40\n\t\t\tSample: Line #: 0, Count: 40\n"; //$NON-NLS-1$
+
+	public TestingOpModelSession(OpModelEvent event, String name) {
+		super(event, name);
+	}
+	@Override
+	protected OpModelImage getNewImage() {
+		/* this code mostly taken from OpxmlRunner */
+		OpModelImage parsedImage = null;
+		try {
+			XMLReader reader = null;
+			parsedImage = new OpModelImage();
+			ModelDataProcessor.CallData image = new ModelDataProcessor.CallData(parsedImage);
+			OprofileSAXHandler handler = OprofileSAXHandler.getInstance(image);
+			
+			// Create XMLReader
+			SAXParserFactory factory = SAXParserFactory.newInstance();
+			reader = factory.newSAXParser().getXMLReader();
+			
+			// Set content/error handlers
+			reader.setContentHandler(handler);
+			reader.setErrorHandler(handler);
+			
+			String filePath = FileLocator.toFileURL(FileLocator.find(TestPlugin.getDefault().getBundle(), new Path(REL_PATH_TO_TEST_XML), null)).getFile();
+			reader.parse(new InputSource(new FileReader(filePath)));
+		} catch (FileNotFoundException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		} catch (SAXException e) {
+			e.printStackTrace();
+		} catch (ParserConfigurationException e) {
+			e.printStackTrace();
+		}
+		
+		return parsedImage;
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelSession2.java b/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelSession2.java
new file mode 100644
index 0000000..5f5adf2
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelSession2.java
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.tests;
+
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelEvent;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelImage;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelSession;
+import org.eclipse.linuxtools.oprofile.core.opxml.OprofileSAXHandler;
+import org.eclipse.linuxtools.oprofile.core.opxml.modeldata.ModelDataProcessor;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+
+/*
+ * A faked OpModelSession object of a typical image with no dependent images.
+ */
+public class TestingOpModelSession2 extends OpModelSession {
+	private static final String REL_PATH_TO_TEST_XML = "resources/test_model-data_nodepimage.xml"; //$NON-NLS-1$
+	public static final String IMAGE_OUTPUT = "/test/path/for/image, Count: 205000, Dependent Count: 5000\nSymbols: TestFunction1(int), File: /test/path/for/src/image.cpp, Count: 180000\n\tSample: Line #: 42, Count: 130000\n\tSample: Line #: 36, Count: 40000\n\tSample: Line #: 31, Count: 9999\n\tSample: Line #: 39, Count: 1\nSymbols: TestFunction2(int, int), File: /test/path/for/src/image2.cpp, Count: 20000\n\tSample: Line #: 94, Count: 19998\n\tSample: Line #: 12, Count: 1\n\tSample: Line #: 55, Count: 1\n"; //$NON-NLS-1$
+	public static final String IMAGE_OUTPUT_WITHTAB = "/test/path/for/image, Count: 205000, Dependent Count: 5000\n\tSymbols: TestFunction1(int), File: /test/path/for/src/image.cpp, Count: 180000\n\t\tSample: Line #: 42, Count: 130000\n\t\tSample: Line #: 36, Count: 40000\n\t\tSample: Line #: 31, Count: 9999\n\t\tSample: Line #: 39, Count: 1\n\tSymbols: TestFunction2(int, int), File: /test/path/for/src/image2.cpp, Count: 20000\n\t\tSample: Line #: 94, Count: 19998\n\t\tSample: Line #: 12, Count: 1\n\t\tSample: Line #: 55, Count: 1\n"; //$NON-NLS-1$
+
+	public TestingOpModelSession2(OpModelEvent event, String name) {
+		super(event, name);
+	}
+	@Override
+	protected OpModelImage getNewImage() {
+		/* this code mostly taken from OpxmlRunner */
+		OpModelImage parsedImage = null;
+		try {
+			XMLReader reader = null;
+			parsedImage = new OpModelImage();
+			ModelDataProcessor.CallData image = new ModelDataProcessor.CallData(parsedImage);
+			OprofileSAXHandler handler = OprofileSAXHandler.getInstance(image);
+			
+			// Create XMLReader
+			SAXParserFactory factory = SAXParserFactory.newInstance();
+			reader = factory.newSAXParser().getXMLReader();
+			
+			// Set content/error handlers
+			reader.setContentHandler(handler);
+			reader.setErrorHandler(handler);
+			
+			String filePath = FileLocator.toFileURL(FileLocator.find(TestPlugin.getDefault().getBundle(), new Path(REL_PATH_TO_TEST_XML), null)).getFile();
+			reader.parse(new InputSource(new FileReader(filePath)));
+		} catch (FileNotFoundException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		} catch (SAXException e) {
+			e.printStackTrace();
+		} catch (ParserConfigurationException e) {
+			e.printStackTrace();
+		}
+		
+		return parsedImage;
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelSession3.java b/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelSession3.java
new file mode 100644
index 0000000..ccb5f6b
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelSession3.java
@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.tests;
+
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelEvent;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelImage;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelSession;
+import org.eclipse.linuxtools.oprofile.core.opxml.OprofileSAXHandler;
+import org.eclipse.linuxtools.oprofile.core.opxml.modeldata.ModelDataProcessor;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+
+/*
+ * A faked OpModelSession object when there are multiple images in the session,
+ * simulating when the session was not created from within the eclipse plugin.
+ */
+public class TestingOpModelSession3 extends OpModelSession {
+	private static final String REL_PATH_TO_TEST_XML = "resources/test_model-data_multiple_image.xml"; //$NON-NLS-1$
+
+	public TestingOpModelSession3(OpModelEvent event, String name) {
+		super(event, name);
+	}
+	@Override
+	protected OpModelImage getNewImage() {
+		/* this code mostly taken from OpxmlRunner */
+		OpModelImage parsedImage = null;
+		try {
+			XMLReader reader = null;
+			parsedImage = new OpModelImage();
+			ModelDataProcessor.CallData image = new ModelDataProcessor.CallData(parsedImage);
+			OprofileSAXHandler handler = OprofileSAXHandler.getInstance(image);
+			
+			// Create XMLReader
+			SAXParserFactory factory = SAXParserFactory.newInstance();
+			reader = factory.newSAXParser().getXMLReader();
+			
+			// Set content/error handlers
+			reader.setContentHandler(handler);
+			reader.setErrorHandler(handler);
+			
+			String filePath = FileLocator.toFileURL(FileLocator.find(TestPlugin.getDefault().getBundle(), new Path(REL_PATH_TO_TEST_XML), null)).getFile();
+			reader.parse(new InputSource(new FileReader(filePath)));
+		} catch (FileNotFoundException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		} catch (SAXException e) {
+			e.printStackTrace();
+		} catch (ParserConfigurationException e) {
+			e.printStackTrace();
+		}
+		
+		return parsedImage;
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelSession4.java b/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelSession4.java
new file mode 100644
index 0000000..d5bc135
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelSession4.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.tests;
+
+import org.eclipse.linuxtools.oprofile.core.model.OpModelEvent;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelImage;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelSession;
+
+/*
+ * A faked OpModelSession object where there is no image. 
+ * Note: technically this shouldn't really happen in normal operation
+ *       of the plugin unless there is a major b0rk-up with the xml parsers..
+ */
+public class TestingOpModelSession4 extends OpModelSession {
+	public TestingOpModelSession4(OpModelEvent event, String name) {
+		super(event, name);
+	}
+	@Override
+	protected OpModelImage getNewImage() {
+		return null;
+	}
+}
diff --git a/profiling/.classpath b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/.classpath
similarity index 100%
copy from profiling/.classpath
copy to oprofile/org.eclipse.linuxtools.oprofile.ui.tests/.classpath
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/.project b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/.project
new file mode 100644
index 0000000..cebd05a
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.oprofile.ui.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/.settings/org.eclipse.jdt.core.prefs b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..b8349f1
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Tue Mar 17 15:14:26 EDT 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/.svnignore b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/.svnignore
new file mode 100644
index 0000000..ba077a4
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/.svnignore
@@ -0,0 +1 @@
+bin
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/META-INF/MANIFEST.MF b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..e5c6af8
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.oprofile.ui.tests
+Bundle-Version: 0.3.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.oprofile.ui.tests.UiTestsPlugin
+Bundle-Vendor: %bundleProvider
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources;bundle-version="3.4.1"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Import-Package: junit.framework;version="[3.0.0,4.0.0)",
+ org.eclipse.linuxtools.oprofile.core.model,
+ org.eclipse.linuxtools.oprofile.tests,
+ org.eclipse.linuxtools.oprofile.ui.model,
+ org.eclipse.swt.graphics
+Bundle-Localization: plugin
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/build.properties b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/build.properties
new file mode 100644
index 0000000..25b52eb
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/build.properties
@@ -0,0 +1,11 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.properties,\
+               test.xml
+src.includes = META-INF/,\
+               plugin.properties,\
+               src/,\
+               test.xml
+individualSourceBundles=true
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/plugin.properties b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/plugin.properties
new file mode 100644
index 0000000..6786c93
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/plugin.properties
@@ -0,0 +1,12 @@
+#*******************************************************************************
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+#*******************************************************************************
+bundleName=OProfile Ui Tests Plug-in (Incubation)
+bundleProvider=Eclipse
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/src/org/eclipse/linuxtools/oprofile/ui/tests/AllUiTests.java b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/src/org/eclipse/linuxtools/oprofile/ui/tests/AllUiTests.java
new file mode 100644
index 0000000..81a3e90
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/src/org/eclipse/linuxtools/oprofile/ui/tests/AllUiTests.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.oprofile.ui.tests;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllUiTests {
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite("Test for org.eclipse.linuxtools.oprofile.ui.tests"); //$NON-NLS-1$
+		
+		suite.addTestSuite(TestUiDataModel.class);
+		
+		return suite;
+	}
+
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/src/org/eclipse/linuxtools/oprofile/ui/tests/TestUiDataModel.java b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/src/org/eclipse/linuxtools/oprofile/ui/tests/TestUiDataModel.java
new file mode 100644
index 0000000..2e62cea
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/src/org/eclipse/linuxtools/oprofile/ui/tests/TestUiDataModel.java
@@ -0,0 +1,678 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.oprofile.ui.tests;
+
+import junit.framework.TestCase;
+
+import org.eclipse.linuxtools.oprofile.core.model.OpModelEvent;
+import org.eclipse.linuxtools.oprofile.tests.TestPlugin;
+import org.eclipse.linuxtools.oprofile.tests.TestingOpModelRoot;
+import org.eclipse.linuxtools.oprofile.ui.model.IUiModelElement;
+import org.eclipse.linuxtools.oprofile.ui.model.UiModelRoot;
+import org.eclipse.linuxtools.oprofile.ui.model.UiModelSample;
+import org.eclipse.linuxtools.oprofile.ui.model.UiModelSession;
+import org.eclipse.linuxtools.oprofile.ui.model.UiModelSymbol;
+
+public class TestUiDataModel extends TestCase {
+
+	private class TestingUiModelRoot extends UiModelRoot {
+		protected OpModelEvent[] getModelDataEvents() {
+			TestingOpModelRoot modelRoot = new TestingOpModelRoot();
+			modelRoot.refreshModel();
+			return modelRoot.getEvents();
+		};
+	}
+
+	private class TestingUiModelRoot2 extends UiModelRoot {
+		protected OpModelEvent[] getModelDataEvents() {
+			return null;
+		};
+	}
+
+	private TestingUiModelRoot _uiModelRoot;
+	private TestingUiModelRoot2 _uiModelRoot2;
+	
+	public TestUiDataModel() {
+		super("test ui data model classes"); //$NON-NLS-1$
+	}
+	
+	@Override
+	protected void setUp() throws Exception {
+		_uiModelRoot = new TestingUiModelRoot();
+		_uiModelRoot.refreshModel();
+		
+		_uiModelRoot2 = new TestingUiModelRoot2();
+		_uiModelRoot2.refreshModel();
+	}
+	
+	public void testParse() {
+		/* test UiModelRoot */
+		assertNull(_uiModelRoot2.getLabelImage());
+		assertNull(_uiModelRoot2.getParent());
+		assertNull(_uiModelRoot2.getLabelText());
+		assertTrue(_uiModelRoot2.hasChildren());
+		IUiModelElement r2_events[] = _uiModelRoot2.getChildren();
+		assertNotNull(r2_events);
+		assertEquals(1, r2_events.length);
+		IUiModelElement r2_event1 = r2_events[0];
+		assertFalse(r2_event1.hasChildren());
+		assertNull(r2_event1.getChildren());
+		assertNull(r2_event1.getParent());
+		assertNotNull(r2_event1.getLabelImage());
+		assertNotNull(r2_event1.getLabelText());
+		
+		assertNull(_uiModelRoot.getLabelImage());
+		assertNull(_uiModelRoot.getParent());
+		assertNull(_uiModelRoot.getLabelText());
+		assertTrue(_uiModelRoot.hasChildren());
+		
+		/* test UiModelEvent */
+		IUiModelElement events[] = _uiModelRoot.getChildren();
+		assertNotNull(events);
+		assertEquals(3, events.length);
+		assertNotNull(events[0]);
+		assertNotNull(events[1]);
+		assertNotNull(events[2]);
+
+		assertEquals(TestingOpModelRoot.NAME_E1, events[0].toString());
+		assertEquals(TestingOpModelRoot.NAME_E1, events[0].getLabelText());
+		assertTrue(events[0].hasChildren());
+		assertNull(events[0].getParent());		//events are top level tree elements
+		assertNotNull(events[0].getLabelImage());
+		
+		assertEquals(TestingOpModelRoot.NAME_E2, events[1].toString());
+		assertEquals(TestingOpModelRoot.NAME_E2, events[1].getLabelText());
+		assertTrue(events[1].hasChildren());
+		assertNull(events[1].getParent());		//events are top level tree elements
+		assertNotNull(events[1].getLabelImage());
+		
+		assertEquals("", events[2].toString()); //$NON-NLS-1$
+		assertEquals("", events[2].getLabelText()); //$NON-NLS-1$
+		assertFalse(events[2].hasChildren());
+		assertNull(events[2].getParent());		//events are top level tree elements
+		assertNotNull(events[2].getLabelImage());
+		
+		/* test UiModelSession */
+		IUiModelElement[] e1_sessions = events[0].getChildren(), e2_sessions = events[1].getChildren();
+		assertNotNull(e1_sessions);
+		assertNotNull(e2_sessions);
+		assertEquals(1, e1_sessions.length);
+		assertEquals(4, e2_sessions.length);
+		assertNotNull(e1_sessions[0]);
+		assertNotNull(e2_sessions[0]);
+		assertNotNull(e2_sessions[1]);
+		assertNotNull(e2_sessions[2]);
+		assertNotNull(e2_sessions[3]);
+		
+		assertEquals(TestingOpModelRoot.NAME_E1_S1, e1_sessions[0].toString());
+		assertEquals(TestingOpModelRoot.NAME_E1_S1, e1_sessions[0].getLabelText());
+		assertFalse(((UiModelSession)e1_sessions[0]).isDefaultSession());
+		assertTrue(e1_sessions[0].hasChildren());
+		assertEquals(events[0], e1_sessions[0].getParent());
+		assertNotNull(e1_sessions[0].getLabelImage());
+		
+		assertEquals(TestingOpModelRoot.NAME_E2_S1, e2_sessions[0].toString());
+		assertEquals(TestingOpModelRoot.NAME_E2_S1, e2_sessions[0].getLabelText());
+		assertFalse(((UiModelSession)e2_sessions[0]).isDefaultSession());
+		assertTrue(e2_sessions[0].hasChildren());
+		assertEquals(events[1], e2_sessions[0].getParent());
+		assertNotNull(e2_sessions[0].getLabelImage());
+		
+		assertEquals(TestingOpModelRoot.NAME_E2_S2, e2_sessions[1].toString());
+		assertEquals(TestingOpModelRoot.NAME_E2_S2, e2_sessions[1].getLabelText());
+		assertFalse(((UiModelSession)e2_sessions[1]).isDefaultSession());
+		assertTrue(e2_sessions[1].hasChildren());
+		assertEquals(events[1], e2_sessions[1].getParent());
+		assertNotNull(e2_sessions[1].getLabelImage());
+		
+		assertEquals(TestingOpModelRoot.NAME_E2_S3, e2_sessions[2].toString());
+		assertEquals(TestingOpModelRoot.NAME_E2_S3, e2_sessions[2].getLabelText());
+		assertFalse(((UiModelSession)e2_sessions[2]).isDefaultSession());
+		assertTrue(e2_sessions[2].hasChildren());
+		assertEquals(events[1], e2_sessions[2].getParent());
+		assertNotNull(e2_sessions[2].getLabelImage());
+
+		assertEquals(TestingOpModelRoot.NAME_E2_S4, e2_sessions[3].toString());
+		assertEquals(TestingOpModelRoot.NAME_E2_S4, e2_sessions[3].getLabelText());
+		assertFalse(((UiModelSession)e2_sessions[3]).isDefaultSession());
+		assertFalse(e2_sessions[3].hasChildren());
+		assertEquals(events[1], e2_sessions[3].getParent());
+		assertNotNull(e2_sessions[3].getLabelImage());
+
+		/* test UiModelImage and UiModelDependent */
+		IUiModelElement[] e1_s1_images = e1_sessions[0].getChildren(), 
+							e2_s1_images = e2_sessions[0].getChildren(),
+							e2_s2_images = e2_sessions[1].getChildren(),
+							e2_s3_images = e2_sessions[2].getChildren(),
+							e2_s4_images = e2_sessions[3].getChildren();
+	
+		assertNotNull(e1_s1_images);
+		assertNotNull(e2_s1_images);
+		assertNotNull(e2_s2_images);
+		assertNotNull(e2_s3_images);
+		assertNotNull(e2_s4_images);
+		assertEquals(2, e1_s1_images.length);	//#2 is a dep image
+		assertEquals(2, e2_s1_images.length);	//#2 is a dep image
+		assertEquals(1, e2_s2_images.length);
+		assertEquals(1, e2_s3_images.length);
+		assertEquals(1, e2_s4_images.length);
+		assertNotNull(e1_s1_images[0]);
+		assertNotNull(e1_s1_images[1]);
+		assertNotNull(e2_s1_images[0]);
+		assertNotNull(e2_s1_images[1]);
+		assertNotNull(e2_s2_images[0]);
+		assertNotNull(e2_s3_images[0]);
+		assertNull(e2_s4_images[0]);
+		
+		//dont test string output -- strings are i18n'd and L10n'd 
+		assertNotNull(e1_s1_images[0].toString());
+		assertNotNull(e1_s1_images[0].getLabelText());
+		assertTrue(e1_s1_images[0].hasChildren());
+		assertEquals(e1_sessions[0], e1_s1_images[0].getParent());
+		assertNotNull(e1_s1_images[0].getLabelImage());
+		
+		assertNotNull(e1_s1_images[1].toString());
+		assertNotNull(e1_s1_images[1].getLabelText());
+		assertTrue(e1_s1_images[1].hasChildren());
+		assertEquals(e1_sessions[0], e1_s1_images[1].getParent());
+		assertNotNull(e1_s1_images[1].getLabelImage());
+		
+		assertNotNull(e2_s1_images[0].toString());
+		assertNotNull(e2_s1_images[0].getLabelText());
+		assertTrue(e2_s1_images[0].hasChildren());
+		assertEquals(e2_sessions[0], e2_s1_images[0].getParent());
+		assertNotNull(e2_s1_images[0].getLabelImage());
+		
+		assertNotNull(e2_s1_images[1].toString());
+		assertNotNull(e2_s1_images[1].getLabelText());
+		assertTrue(e2_s1_images[1].hasChildren());
+		assertEquals(e2_sessions[0], e2_s1_images[1].getParent());
+		assertNotNull(e2_s1_images[1].getLabelImage());
+		
+		assertNotNull(e2_s2_images[0].toString());
+		assertNotNull(e2_s2_images[0].getLabelText());
+		assertTrue(e2_s2_images[0].hasChildren());
+		assertEquals(e2_sessions[1], e2_s2_images[0].getParent());
+		assertNotNull(e2_s2_images[0].getLabelImage());
+
+		assertNotNull(e2_s3_images[0].toString());
+		assertNotNull(e2_s3_images[0].getLabelText());
+		assertFalse(e2_s3_images[0].hasChildren());
+		assertEquals(e2_sessions[2], e2_s3_images[0].getParent());
+		assertNotNull(e2_s3_images[0].getLabelImage());
+		
+		/* test UiModelSymbol */
+		IUiModelElement[] e1_s1_i1_symbols = e1_s1_images[0].getChildren(),
+							e1_s1_i2_depimages = e1_s1_images[1].getChildren(),
+							e2_s1_i1_symbols = e2_s1_images[0].getChildren(),
+							e2_s1_i2_depimages = e2_s1_images[1].getChildren(),
+							e2_s2_i1_symbols = e2_s2_images[0].getChildren();
+		
+		assertNotNull(e1_s1_i1_symbols);
+		assertNotNull(e1_s1_i2_depimages);
+		assertNotNull(e2_s1_i1_symbols);
+		assertNotNull(e2_s1_i2_depimages);
+		assertNotNull(e2_s2_i1_symbols);
+		assertEquals(2, e1_s1_i1_symbols.length);
+		assertEquals(4, e1_s1_i2_depimages.length);
+		assertEquals(2, e2_s1_i1_symbols.length);
+		assertEquals(4, e2_s1_i2_depimages.length);
+		assertEquals(2, e2_s2_i1_symbols.length);
+		assertNotNull(e1_s1_i1_symbols[0]);
+		assertNotNull(e1_s1_i1_symbols[1]);
+		assertNotNull(e1_s1_i2_depimages[0]);
+		assertNotNull(e1_s1_i2_depimages[1]);
+		assertNotNull(e1_s1_i2_depimages[2]);
+		assertNotNull(e1_s1_i2_depimages[3]);
+		assertNotNull(e2_s1_i1_symbols[0]);
+		assertNotNull(e2_s1_i1_symbols[1]);
+		assertNotNull(e2_s1_i2_depimages[0]);
+		assertNotNull(e2_s1_i2_depimages[1]);
+		assertNotNull(e2_s1_i2_depimages[2]);
+		assertNotNull(e2_s1_i2_depimages[3]);
+		assertNotNull(e2_s2_i1_symbols[0]);
+		assertNotNull(e2_s2_i1_symbols[1]);
+
+		assertNotNull(e1_s1_i1_symbols[0].toString());
+		assertNotNull(e1_s1_i1_symbols[0].getLabelText());
+		assertEquals(TestPlugin.SYMBOL1_FILENAME, ((UiModelSymbol)e1_s1_i1_symbols[0]).getFileName());
+		assertTrue(e1_s1_i1_symbols[0].hasChildren());
+		assertEquals(e1_s1_images[0], e1_s1_i1_symbols[0].getParent());
+		assertNotNull(e1_s1_i1_symbols[0].getLabelImage());
+		
+		assertNotNull(e1_s1_i1_symbols[1].toString());
+		assertNotNull(e1_s1_i1_symbols[1].getLabelText());
+		assertEquals(TestPlugin.SYMBOL2_FILENAME, ((UiModelSymbol)e1_s1_i1_symbols[1]).getFileName());
+		assertTrue(e1_s1_i1_symbols[1].hasChildren());
+		assertEquals(e1_s1_images[0], e1_s1_i1_symbols[1].getParent());
+		assertNotNull(e1_s1_i1_symbols[1].getLabelImage());
+
+		assertNotNull(e1_s1_i2_depimages[0].toString());
+		assertNotNull(e1_s1_i2_depimages[0].getLabelText());
+		assertFalse(e1_s1_i2_depimages[0].hasChildren());
+		assertEquals(e1_s1_images[1], e1_s1_i2_depimages[0].getParent());
+		assertNotNull(e1_s1_i2_depimages[0].getLabelImage());
+
+		assertNotNull(e1_s1_i2_depimages[1].toString());
+		assertNotNull(e1_s1_i2_depimages[1].getLabelText());
+		assertTrue(e1_s1_i2_depimages[1].hasChildren());
+		assertEquals(e1_s1_images[1], e1_s1_i2_depimages[1].getParent());
+		assertNotNull(e1_s1_i2_depimages[1].getLabelImage());
+
+		assertNotNull(e1_s1_i2_depimages[2].toString());
+		assertNotNull(e1_s1_i2_depimages[2].getLabelText());
+		assertFalse(e1_s1_i2_depimages[2].hasChildren());
+		assertEquals(e1_s1_images[1], e1_s1_i2_depimages[2].getParent());
+		assertNotNull(e1_s1_i2_depimages[2].getLabelImage());
+
+		assertNotNull(e1_s1_i2_depimages[3].toString());
+		assertNotNull(e1_s1_i2_depimages[3].getLabelText());
+		assertTrue(e1_s1_i2_depimages[3].hasChildren());
+		assertEquals(e1_s1_images[1], e1_s1_i2_depimages[3].getParent());
+		assertNotNull(e1_s1_i2_depimages[3].getLabelImage());
+
+		assertNotNull(e2_s1_i1_symbols[0].toString());
+		assertNotNull(e2_s1_i1_symbols[0].getLabelText());
+		assertEquals(TestPlugin.SYMBOL1_FILENAME, ((UiModelSymbol)e2_s1_i1_symbols[0]).getFileName());
+		assertTrue(e2_s1_i1_symbols[0].hasChildren());
+		assertEquals(e2_s1_images[0], e2_s1_i1_symbols[0].getParent());
+		assertNotNull(e2_s1_i1_symbols[0].getLabelImage());
+		
+		assertNotNull(e2_s1_i1_symbols[1].toString());
+		assertNotNull(e2_s1_i1_symbols[1].getLabelText());
+		assertEquals(TestPlugin.SYMBOL2_FILENAME, ((UiModelSymbol)e2_s1_i1_symbols[1]).getFileName());
+		assertTrue(e2_s1_i1_symbols[1].hasChildren());
+		assertEquals(e2_s1_images[0], e2_s1_i1_symbols[1].getParent());
+		assertNotNull(e2_s1_i1_symbols[1].getLabelImage());
+
+		assertNotNull(e2_s1_i2_depimages[0].toString());
+		assertNotNull(e2_s1_i2_depimages[0].getLabelText());
+		assertFalse(e2_s1_i2_depimages[0].hasChildren());
+		assertEquals(e2_s1_images[1], e2_s1_i2_depimages[0].getParent());
+		assertNotNull(e2_s1_i2_depimages[0].getLabelImage());
+
+		assertNotNull(e2_s1_i2_depimages[1].toString());
+		assertNotNull(e2_s1_i2_depimages[1].getLabelText());
+		assertTrue(e2_s1_i2_depimages[1].hasChildren());
+		assertEquals(e2_s1_images[1], e2_s1_i2_depimages[1].getParent());
+		assertNotNull(e2_s1_i2_depimages[1].getLabelImage());
+
+		assertNotNull(e2_s1_i2_depimages[2].toString());
+		assertNotNull(e2_s1_i2_depimages[2].getLabelText());
+		assertFalse(e2_s1_i2_depimages[2].hasChildren());
+		assertEquals(e2_s1_images[1], e2_s1_i2_depimages[2].getParent());
+		assertNotNull(e2_s1_i2_depimages[2].getLabelImage());
+
+		assertNotNull(e2_s1_i2_depimages[3].toString());
+		assertNotNull(e2_s1_i2_depimages[3].getLabelText());
+		assertTrue(e2_s1_i2_depimages[3].hasChildren());
+		assertEquals(e2_s1_images[1], e2_s1_i2_depimages[3].getParent());
+		assertNotNull(e2_s1_i2_depimages[3].getLabelImage());
+
+		assertNotNull(e2_s2_i1_symbols[0].toString());
+		assertNotNull(e2_s2_i1_symbols[0].getLabelText());
+		assertEquals(TestPlugin.SYMBOL1_FILENAME, ((UiModelSymbol)e2_s2_i1_symbols[0]).getFileName());
+		assertTrue(e2_s2_i1_symbols[0].hasChildren());
+		assertEquals(e2_s2_images[0], e2_s2_i1_symbols[0].getParent());
+		assertNotNull(e2_s2_i1_symbols[0].getLabelImage());
+		
+		assertNotNull(e2_s2_i1_symbols[1].toString());
+		assertNotNull(e2_s2_i1_symbols[1].getLabelText());
+		assertEquals(TestPlugin.SYMBOL2_FILENAME, ((UiModelSymbol)e2_s2_i1_symbols[1]).getFileName());
+		assertTrue(e2_s2_i1_symbols[1].hasChildren());
+		assertEquals(e2_s2_images[0], e2_s2_i1_symbols[1].getParent());
+		assertNotNull(e2_s2_i1_symbols[1].getLabelImage());
+
+		/* test the symbols from the dep images */
+		IUiModelElement[] e1_s1_i2_dep1_symbols = e1_s1_i2_depimages[0].getChildren(),
+							e1_s1_i2_dep2_symbols = e1_s1_i2_depimages[1].getChildren(),
+							e1_s1_i2_dep3_symbols = e1_s1_i2_depimages[2].getChildren(),
+							e1_s1_i2_dep4_symbols = e1_s1_i2_depimages[3].getChildren(),
+							e2_s1_i2_dep1_symbols = e2_s1_i2_depimages[0].getChildren(),
+							e2_s1_i2_dep2_symbols = e2_s1_i2_depimages[1].getChildren(),
+							e2_s1_i2_dep3_symbols = e2_s1_i2_depimages[2].getChildren(),
+							e2_s1_i2_dep4_symbols = e2_s1_i2_depimages[3].getChildren();
+
+    	assertNull(e1_s1_i2_dep1_symbols);
+		assertNotNull(e1_s1_i2_dep2_symbols);
+		assertNull(e1_s1_i2_dep3_symbols);
+		assertNotNull(e1_s1_i2_dep4_symbols);
+		assertNull(e2_s1_i2_dep1_symbols);
+		assertNotNull(e2_s1_i2_dep2_symbols);
+		assertNull(e2_s1_i2_dep3_symbols);
+		assertNotNull(e2_s1_i2_dep4_symbols);
+		assertEquals(2, e1_s1_i2_dep2_symbols.length);
+		assertEquals(2, e1_s1_i2_dep4_symbols.length);
+		assertEquals(2, e2_s1_i2_dep2_symbols.length);
+		assertEquals(2, e2_s1_i2_dep4_symbols.length);
+		assertNotNull(e1_s1_i2_dep2_symbols[0]);
+		assertNotNull(e1_s1_i2_dep2_symbols[1]);
+		assertNotNull(e1_s1_i2_dep4_symbols[0]);
+		assertNotNull(e1_s1_i2_dep4_symbols[1]);
+		assertNotNull(e2_s1_i2_dep2_symbols[0]);
+		assertNotNull(e2_s1_i2_dep2_symbols[1]);
+		assertNotNull(e2_s1_i2_dep4_symbols[0]);
+		assertNotNull(e2_s1_i2_dep4_symbols[1]);
+		
+		assertNotNull(e1_s1_i2_dep2_symbols[0].toString());
+		assertNotNull(e1_s1_i2_dep2_symbols[0].getLabelText());
+		assertEquals(TestPlugin.DEP2_SYMBOL1_FILENAME, ((UiModelSymbol)e1_s1_i2_dep2_symbols[0]).getFileName());
+		assertFalse(e1_s1_i2_dep2_symbols[0].hasChildren());
+		assertEquals(e1_s1_i2_depimages[1], e1_s1_i2_dep2_symbols[0].getParent());
+		assertNotNull(e1_s1_i2_dep2_symbols[0].getLabelImage());
+		
+		assertNotNull(e1_s1_i2_dep2_symbols[1].toString());
+		assertNotNull(e1_s1_i2_dep2_symbols[1].getLabelText());
+		assertEquals(TestPlugin.DEP2_SYMBOL2_FILENAME, ((UiModelSymbol)e1_s1_i2_dep2_symbols[1]).getFileName());
+		assertFalse(e1_s1_i2_dep2_symbols[1].hasChildren());
+		assertEquals(e1_s1_i2_depimages[1], e1_s1_i2_dep2_symbols[1].getParent());
+		assertNotNull(e1_s1_i2_dep2_symbols[1].getLabelImage());
+
+		assertNotNull(e1_s1_i2_dep4_symbols[0].toString());
+		assertNotNull(e1_s1_i2_dep4_symbols[0].getLabelText());
+		assertEquals(TestPlugin.DEP4_SYMBOL_FILENAME, ((UiModelSymbol)e1_s1_i2_dep4_symbols[0]).getFileName());
+		assertFalse(e1_s1_i2_dep4_symbols[0].hasChildren());
+		assertEquals(e1_s1_i2_depimages[3], e1_s1_i2_dep4_symbols[0].getParent());
+		assertNotNull(e1_s1_i2_dep4_symbols[0].getLabelImage());
+		
+		assertNotNull(e1_s1_i2_dep4_symbols[1].toString());
+		assertNotNull(e1_s1_i2_dep4_symbols[1].getLabelText());
+		assertEquals(TestPlugin.DEP4_SYMBOL_FILENAME, ((UiModelSymbol)e1_s1_i2_dep4_symbols[1]).getFileName());
+		assertFalse(e1_s1_i2_dep4_symbols[1].hasChildren());
+		assertEquals(e1_s1_i2_depimages[3], e1_s1_i2_dep4_symbols[1].getParent());
+		assertNotNull(e1_s1_i2_dep4_symbols[1].getLabelImage());
+		
+		assertNotNull(e2_s1_i2_dep2_symbols[0].toString());
+		assertNotNull(e2_s1_i2_dep2_symbols[0].getLabelText());
+		assertEquals(TestPlugin.DEP2_SYMBOL1_FILENAME, ((UiModelSymbol)e2_s1_i2_dep2_symbols[0]).getFileName());
+		assertFalse(e2_s1_i2_dep2_symbols[0].hasChildren());
+		assertEquals(e2_s1_i2_depimages[1], e2_s1_i2_dep2_symbols[0].getParent());
+		assertNotNull(e2_s1_i2_dep2_symbols[0].getLabelImage());
+		
+		assertNotNull(e2_s1_i2_dep2_symbols[1].toString());
+		assertNotNull(e2_s1_i2_dep2_symbols[1].getLabelText());
+		assertEquals(TestPlugin.DEP2_SYMBOL2_FILENAME, ((UiModelSymbol)e2_s1_i2_dep2_symbols[1]).getFileName());
+		assertFalse(e2_s1_i2_dep2_symbols[1].hasChildren());
+		assertEquals(e2_s1_i2_depimages[1], e2_s1_i2_dep2_symbols[1].getParent());
+		assertNotNull(e2_s1_i2_dep2_symbols[1].getLabelImage());
+
+		assertNotNull(e2_s1_i2_dep4_symbols[0].toString());
+		assertNotNull(e2_s1_i2_dep4_symbols[0].getLabelText());
+		assertEquals(TestPlugin.DEP4_SYMBOL_FILENAME, ((UiModelSymbol)e2_s1_i2_dep4_symbols[0]).getFileName());
+		assertFalse(e2_s1_i2_dep4_symbols[0].hasChildren());
+		assertEquals(e2_s1_i2_depimages[3], e2_s1_i2_dep4_symbols[0].getParent());
+		assertNotNull(e2_s1_i2_dep4_symbols[0].getLabelImage());
+		
+		assertNotNull(e2_s1_i2_dep4_symbols[1].toString());
+		assertNotNull(e2_s1_i2_dep4_symbols[1].getLabelText());
+		assertEquals(TestPlugin.DEP4_SYMBOL_FILENAME, ((UiModelSymbol)e2_s1_i2_dep4_symbols[1]).getFileName());
+		assertFalse(e2_s1_i2_dep4_symbols[1].hasChildren());
+		assertEquals(e2_s1_i2_depimages[3], e2_s1_i2_dep4_symbols[1].getParent());
+		assertNotNull(e2_s1_i2_dep4_symbols[1].getLabelImage());
+
+		/* test UiModelSample */
+		IUiModelElement[] e1_s1_i1_s1_samples = e1_s1_i1_symbols[0].getChildren(),
+							e1_s1_i1_s2_samples = e1_s1_i1_symbols[1].getChildren(),
+							e1_s1_d2_s1_samples = e1_s1_i2_dep2_symbols[0].getChildren(),
+							e1_s1_d2_s2_samples = e1_s1_i2_dep2_symbols[1].getChildren(),
+							e1_s1_d4_s1_samples = e1_s1_i2_dep4_symbols[0].getChildren(),
+							e1_s1_d4_s2_samples = e1_s1_i2_dep4_symbols[1].getChildren(),
+							e2_s1_i1_s1_samples = e2_s1_i1_symbols[0].getChildren(),
+							e2_s1_i1_s2_samples = e2_s1_i1_symbols[1].getChildren(),
+							e2_s1_d2_s1_samples = e2_s1_i2_dep2_symbols[0].getChildren(),
+							e2_s1_d2_s2_samples = e2_s1_i2_dep2_symbols[1].getChildren(),
+							e2_s1_d4_s1_samples = e2_s1_i2_dep4_symbols[0].getChildren(),
+							e2_s1_d4_s2_samples = e2_s1_i2_dep4_symbols[1].getChildren(),
+							e2_s2_i1_s1_samples = e2_s2_i1_symbols[0].getChildren(),
+							e2_s2_i1_s2_samples = e2_s2_i1_symbols[1].getChildren();
+
+		assertNotNull(e1_s1_i1_s1_samples);
+		assertNotNull(e1_s1_i1_s2_samples);
+		assertNotNull(e1_s1_d2_s1_samples);
+		assertNotNull(e1_s1_d2_s2_samples);
+		assertNotNull(e1_s1_d4_s1_samples);
+		assertNotNull(e1_s1_d4_s2_samples);
+		assertNotNull(e2_s1_i1_s1_samples);
+		assertNotNull(e2_s1_i1_s2_samples);
+		assertNotNull(e2_s1_d2_s1_samples);
+		assertNotNull(e2_s1_d2_s2_samples);
+		assertNotNull(e2_s1_d4_s1_samples);
+		assertNotNull(e2_s1_d4_s2_samples);
+		assertNotNull(e2_s2_i1_s1_samples);
+		assertNotNull(e2_s2_i1_s2_samples);
+		assertEquals(4, e1_s1_i1_s1_samples.length);
+		assertEquals(3, e1_s1_i1_s2_samples.length);
+		//0 but not null for dep images due to samples with no line #
+		assertEquals(0, e1_s1_d2_s1_samples.length);	
+		assertEquals(0, e1_s1_d2_s2_samples.length);
+		assertEquals(0, e1_s1_d4_s1_samples.length);
+		assertEquals(0, e1_s1_d4_s2_samples.length);
+		assertEquals(4, e2_s1_i1_s1_samples.length);
+		assertEquals(3, e2_s1_i1_s2_samples.length);
+		assertEquals(0, e2_s1_d2_s1_samples.length);
+		assertEquals(0, e2_s1_d2_s2_samples.length);
+		assertEquals(0, e2_s1_d4_s1_samples.length);
+		assertEquals(0, e2_s1_d4_s2_samples.length);
+		assertEquals(4, e2_s2_i1_s1_samples.length);
+		assertEquals(3, e2_s2_i1_s2_samples.length);
+		assertNotNull(e1_s1_i1_s1_samples[0]);
+		assertNotNull(e1_s1_i1_s1_samples[1]);
+		assertNotNull(e1_s1_i1_s1_samples[2]);
+		assertNotNull(e1_s1_i1_s1_samples[3]);
+		assertNotNull(e1_s1_i1_s2_samples[0]);
+		assertNotNull(e1_s1_i1_s2_samples[1]);
+		assertNotNull(e1_s1_i1_s2_samples[2]);
+//
+		assertNotNull(e2_s1_i1_s1_samples[0]);
+		assertNotNull(e2_s1_i1_s1_samples[1]);
+		assertNotNull(e2_s1_i1_s1_samples[2]);
+		assertNotNull(e2_s1_i1_s1_samples[3]);
+		assertNotNull(e2_s1_i1_s2_samples[0]);
+		assertNotNull(e2_s1_i1_s2_samples[1]);
+		assertNotNull(e2_s1_i1_s2_samples[2]);
+		assertNotNull(e2_s2_i1_s1_samples[0]);
+		assertNotNull(e2_s2_i1_s1_samples[1]);
+		assertNotNull(e2_s2_i1_s1_samples[2]);
+		assertNotNull(e2_s2_i1_s1_samples[3]);
+		assertNotNull(e2_s2_i1_s2_samples[0]);
+		assertNotNull(e2_s2_i1_s2_samples[1]);
+		assertNotNull(e2_s2_i1_s2_samples[2]);
+//
+		assertNotNull(e1_s1_i1_s1_samples[0].toString());
+		assertNotNull(e1_s1_i1_s1_samples[0].getLabelText());
+		assertEquals(42, ((UiModelSample)e1_s1_i1_s1_samples[0]).getLine());
+		assertEquals((double)0.6341, ((UiModelSample)e1_s1_i1_s1_samples[0]).getCountPercentage(), (double)0.0001);
+		assertNull(e1_s1_i1_s1_samples[0].getChildren());
+		assertFalse(e1_s1_i1_s1_samples[0].hasChildren());
+		assertEquals(e1_s1_i1_symbols[0], e1_s1_i1_s1_samples[0].getParent());
+		assertNotNull(e1_s1_i1_s1_samples[0].getLabelImage());
+
+		assertNotNull(e1_s1_i1_s1_samples[1].toString());
+		assertNotNull(e1_s1_i1_s1_samples[1].getLabelText());
+		assertEquals(36, ((UiModelSample)e1_s1_i1_s1_samples[1]).getLine());
+		assertEquals((double)0.1951, ((UiModelSample)e1_s1_i1_s1_samples[1]).getCountPercentage(), (double)0.0001);
+		assertNull(e1_s1_i1_s1_samples[1].getChildren());
+		assertFalse(e1_s1_i1_s1_samples[1].hasChildren());
+		assertEquals(e1_s1_i1_symbols[0], e1_s1_i1_s1_samples[1].getParent());
+		assertNotNull(e1_s1_i1_s1_samples[1].getLabelImage());
+
+		assertNotNull(e1_s1_i1_s1_samples[2].toString());
+		assertNotNull(e1_s1_i1_s1_samples[2].getLabelText());
+		assertEquals(31, ((UiModelSample)e1_s1_i1_s1_samples[2]).getLine());
+		assertEquals((double)0.0488, ((UiModelSample)e1_s1_i1_s1_samples[2]).getCountPercentage(), (double)0.0001);
+		assertNull(e1_s1_i1_s1_samples[2].getChildren());
+		assertFalse(e1_s1_i1_s1_samples[2].hasChildren());
+		assertEquals(e1_s1_i1_symbols[0], e1_s1_i1_s1_samples[2].getParent());
+		assertNotNull(e1_s1_i1_s1_samples[2].getLabelImage());
+
+		assertNotNull(e1_s1_i1_s1_samples[3].toString());
+		assertNotNull(e1_s1_i1_s1_samples[3].getLabelText());
+		assertEquals(39, ((UiModelSample)e1_s1_i1_s1_samples[3]).getLine());
+		assertEquals((double)0.0, ((UiModelSample)e1_s1_i1_s1_samples[3]).getCountPercentage(), (double)0.0001);
+		assertNull(e1_s1_i1_s1_samples[3].getChildren());
+		assertFalse(e1_s1_i1_s1_samples[3].hasChildren());
+		assertEquals(e1_s1_i1_symbols[0], e1_s1_i1_s1_samples[3].getParent());
+		assertNotNull(e1_s1_i1_s1_samples[3].getLabelImage());
+
+		assertNotNull(e1_s1_i1_s2_samples[0].toString());
+		assertNotNull(e1_s1_i1_s2_samples[0].getLabelText());
+		assertEquals(94, ((UiModelSample)e1_s1_i1_s2_samples[0]).getLine());
+		assertEquals((double)0.0976, ((UiModelSample)e1_s1_i1_s2_samples[0]).getCountPercentage(), (double)0.0001);
+		assertNull(e1_s1_i1_s2_samples[0].getChildren());
+		assertFalse(e1_s1_i1_s2_samples[0].hasChildren());
+		assertEquals(e1_s1_i1_symbols[1], e1_s1_i1_s2_samples[0].getParent());
+		assertNotNull(e1_s1_i1_s2_samples[0].getLabelImage());
+
+		assertNotNull(e1_s1_i1_s2_samples[1].toString());
+		assertNotNull(e1_s1_i1_s2_samples[1].getLabelText());
+		assertEquals(12, ((UiModelSample)e1_s1_i1_s2_samples[1]).getLine());
+		assertEquals((double)0.0, ((UiModelSample)e1_s1_i1_s2_samples[1]).getCountPercentage(), (double)0.0001);
+		assertNull(e1_s1_i1_s2_samples[1].getChildren());
+		assertFalse(e1_s1_i1_s2_samples[1].hasChildren());
+		assertEquals(e1_s1_i1_symbols[1], e1_s1_i1_s2_samples[1].getParent());
+		assertNotNull(e1_s1_i1_s2_samples[1].getLabelImage());
+
+		assertNotNull(e1_s1_i1_s2_samples[2].toString());
+		assertNotNull(e1_s1_i1_s2_samples[2].getLabelText());
+		assertEquals(55, ((UiModelSample)e1_s1_i1_s2_samples[2]).getLine());
+		assertEquals((double)0.0, ((UiModelSample)e1_s1_i1_s2_samples[2]).getCountPercentage(), (double)0.0001);
+		assertNull(e1_s1_i1_s2_samples[2].getChildren());
+		assertFalse(e1_s1_i1_s2_samples[2].hasChildren());
+		assertEquals(e1_s1_i1_symbols[1], e1_s1_i1_s2_samples[2].getParent());
+		assertNotNull(e1_s1_i1_s2_samples[2].getLabelImage());
+
+		assertNotNull(e2_s1_i1_s1_samples[0].toString());
+		assertNotNull(e2_s1_i1_s1_samples[0].getLabelText());
+		assertEquals(42, ((UiModelSample)e2_s1_i1_s1_samples[0]).getLine());
+		assertEquals((double)0.6341, ((UiModelSample)e2_s1_i1_s1_samples[0]).getCountPercentage(), (double)0.0001);
+		assertNull(e2_s1_i1_s1_samples[0].getChildren());
+		assertFalse(e2_s1_i1_s1_samples[0].hasChildren());
+		assertEquals(e2_s1_i1_symbols[0], e2_s1_i1_s1_samples[0].getParent());
+		assertNotNull(e2_s1_i1_s1_samples[0].getLabelImage());
+
+		assertNotNull(e2_s1_i1_s1_samples[1].toString());
+		assertNotNull(e2_s1_i1_s1_samples[1].getLabelText());
+		assertEquals(36, ((UiModelSample)e2_s1_i1_s1_samples[1]).getLine());
+		assertEquals((double)0.1951, ((UiModelSample)e2_s1_i1_s1_samples[1]).getCountPercentage(), (double)0.0001);
+		assertNull(e2_s1_i1_s1_samples[1].getChildren());
+		assertFalse(e2_s1_i1_s1_samples[1].hasChildren());
+		assertEquals(e2_s1_i1_symbols[0], e2_s1_i1_s1_samples[1].getParent());
+		assertNotNull(e2_s1_i1_s1_samples[1].getLabelImage());
+
+		assertNotNull(e2_s1_i1_s1_samples[2].toString());
+		assertNotNull(e2_s1_i1_s1_samples[2].getLabelText());
+		assertEquals(31, ((UiModelSample)e2_s1_i1_s1_samples[2]).getLine());
+		assertEquals((double)0.0488, ((UiModelSample)e2_s1_i1_s1_samples[2]).getCountPercentage(), (double)0.0001);
+		assertNull(e2_s1_i1_s1_samples[2].getChildren());
+		assertFalse(e2_s1_i1_s1_samples[2].hasChildren());
+		assertEquals(e2_s1_i1_symbols[0], e2_s1_i1_s1_samples[2].getParent());
+		assertNotNull(e2_s1_i1_s1_samples[2].getLabelImage());
+
+		assertNotNull(e2_s1_i1_s1_samples[3].toString());
+		assertNotNull(e2_s1_i1_s1_samples[3].getLabelText());
+		assertEquals(39, ((UiModelSample)e2_s1_i1_s1_samples[3]).getLine());
+		assertEquals((double)0.0, ((UiModelSample)e2_s1_i1_s1_samples[3]).getCountPercentage(), (double)0.0001);
+		assertNull(e2_s1_i1_s1_samples[3].getChildren());
+		assertFalse(e2_s1_i1_s1_samples[3].hasChildren());
+		assertEquals(e2_s1_i1_symbols[0], e2_s1_i1_s1_samples[3].getParent());
+		assertNotNull(e2_s1_i1_s1_samples[3].getLabelImage());
+
+		assertNotNull(e2_s1_i1_s2_samples[0].toString());
+		assertNotNull(e2_s1_i1_s2_samples[0].getLabelText());
+		assertEquals(94, ((UiModelSample)e2_s1_i1_s2_samples[0]).getLine());
+		assertEquals((double)0.0976, ((UiModelSample)e2_s1_i1_s2_samples[0]).getCountPercentage(), (double)0.0001);
+		assertNull(e2_s1_i1_s2_samples[0].getChildren());
+		assertFalse(e2_s1_i1_s2_samples[0].hasChildren());
+		assertEquals(e2_s1_i1_symbols[1], e2_s1_i1_s2_samples[0].getParent());
+		assertNotNull(e2_s1_i1_s2_samples[0].getLabelImage());
+
+		assertNotNull(e2_s1_i1_s2_samples[1].toString());
+		assertNotNull(e2_s1_i1_s2_samples[1].getLabelText());
+		assertEquals(12, ((UiModelSample)e2_s1_i1_s2_samples[1]).getLine());
+		assertEquals((double)0.0, ((UiModelSample)e2_s1_i1_s2_samples[1]).getCountPercentage(), (double)0.0001);
+		assertNull(e2_s1_i1_s2_samples[1].getChildren());
+		assertFalse(e2_s1_i1_s2_samples[1].hasChildren());
+		assertEquals(e2_s1_i1_symbols[1], e2_s1_i1_s2_samples[1].getParent());
+		assertNotNull(e2_s1_i1_s2_samples[1].getLabelImage());
+
+		assertNotNull(e2_s1_i1_s2_samples[2].toString());
+		assertNotNull(e2_s1_i1_s2_samples[2].getLabelText());
+		assertEquals(55, ((UiModelSample)e2_s1_i1_s2_samples[2]).getLine());
+		assertEquals((double)0.0, ((UiModelSample)e2_s1_i1_s2_samples[2]).getCountPercentage(), (double)0.0001);
+		assertNull(e2_s1_i1_s2_samples[2].getChildren());
+		assertFalse(e2_s1_i1_s2_samples[2].hasChildren());
+		assertEquals(e2_s1_i1_symbols[1], e2_s1_i1_s2_samples[2].getParent());
+		assertNotNull(e2_s1_i1_s2_samples[2].getLabelImage());
+
+		assertNotNull(e2_s2_i1_s1_samples[0].toString());
+		assertNotNull(e2_s2_i1_s1_samples[0].getLabelText());
+		assertEquals(42, ((UiModelSample)e2_s2_i1_s1_samples[0]).getLine());
+		assertEquals((double)0.65, ((UiModelSample)e2_s2_i1_s1_samples[0]).getCountPercentage(), (double)0.0001);
+		assertNull(e2_s2_i1_s1_samples[0].getChildren());
+		assertFalse(e2_s2_i1_s1_samples[0].hasChildren());
+		assertEquals(e2_s2_i1_symbols[0], e2_s2_i1_s1_samples[0].getParent());
+		assertNotNull(e2_s2_i1_s1_samples[0].getLabelImage());
+
+		assertNotNull(e2_s2_i1_s1_samples[1].toString());
+		assertNotNull(e2_s2_i1_s1_samples[1].getLabelText());
+		assertEquals(36, ((UiModelSample)e2_s2_i1_s1_samples[1]).getLine());
+		assertEquals((double)0.2, ((UiModelSample)e2_s2_i1_s1_samples[1]).getCountPercentage(), (double)0.0001);
+		assertNull(e2_s2_i1_s1_samples[1].getChildren());
+		assertFalse(e2_s2_i1_s1_samples[1].hasChildren());
+		assertEquals(e2_s2_i1_symbols[0], e2_s2_i1_s1_samples[1].getParent());
+		assertNotNull(e2_s2_i1_s1_samples[1].getLabelImage());
+
+		assertNotNull(e2_s2_i1_s1_samples[2].toString());
+		assertNotNull(e2_s2_i1_s1_samples[2].getLabelText());
+		assertEquals(31, ((UiModelSample)e2_s2_i1_s1_samples[2]).getLine());
+		assertEquals((double)0.05, ((UiModelSample)e2_s2_i1_s1_samples[2]).getCountPercentage(), (double)0.0001);
+		assertNull(e2_s2_i1_s1_samples[2].getChildren());
+		assertFalse(e2_s2_i1_s1_samples[2].hasChildren());
+		assertEquals(e2_s2_i1_symbols[0], e2_s2_i1_s1_samples[2].getParent());
+		assertNotNull(e2_s2_i1_s1_samples[2].getLabelImage());
+
+		assertNotNull(e2_s2_i1_s1_samples[3].toString());
+		assertNotNull(e2_s2_i1_s1_samples[3].getLabelText());
+		assertEquals(39, ((UiModelSample)e2_s2_i1_s1_samples[3]).getLine());
+		assertEquals((double)0.0, ((UiModelSample)e2_s2_i1_s1_samples[3]).getCountPercentage(), (double)0.0001);
+		assertNull(e2_s2_i1_s1_samples[3].getChildren());
+		assertFalse(e2_s2_i1_s1_samples[3].hasChildren());
+		assertEquals(e2_s2_i1_symbols[0], e2_s2_i1_s1_samples[3].getParent());
+		assertNotNull(e2_s2_i1_s1_samples[3].getLabelImage());
+
+		assertNotNull(e2_s2_i1_s2_samples[0].toString());
+		assertNotNull(e2_s2_i1_s2_samples[0].getLabelText());
+		assertEquals(94, ((UiModelSample)e2_s2_i1_s2_samples[0]).getLine());
+		assertEquals((double)0.1, ((UiModelSample)e2_s2_i1_s2_samples[0]).getCountPercentage(), (double)0.0001);
+		assertNull(e2_s2_i1_s2_samples[0].getChildren());
+		assertFalse(e2_s2_i1_s2_samples[0].hasChildren());
+		assertEquals(e2_s2_i1_symbols[1], e2_s2_i1_s2_samples[0].getParent());
+		assertNotNull(e2_s2_i1_s2_samples[0].getLabelImage());
+
+		assertNotNull(e2_s2_i1_s2_samples[1].toString());
+		assertNotNull(e2_s2_i1_s2_samples[1].getLabelText());
+		assertEquals(12, ((UiModelSample)e2_s2_i1_s2_samples[1]).getLine());
+		assertEquals((double)0.0, ((UiModelSample)e2_s2_i1_s2_samples[1]).getCountPercentage(), (double)0.0001);
+		assertNull(e2_s2_i1_s2_samples[1].getChildren());
+		assertFalse(e2_s2_i1_s2_samples[1].hasChildren());
+		assertEquals(e2_s2_i1_symbols[1], e2_s2_i1_s2_samples[1].getParent());
+		assertNotNull(e2_s2_i1_s2_samples[1].getLabelImage());
+
+		assertNotNull(e2_s2_i1_s2_samples[2].toString());
+		assertNotNull(e2_s2_i1_s2_samples[2].getLabelText());
+		assertEquals(55, ((UiModelSample)e2_s2_i1_s2_samples[2]).getLine());
+		assertEquals((double)0.0, ((UiModelSample)e2_s2_i1_s2_samples[2]).getCountPercentage(), (double)0.0001);
+		assertNull(e2_s2_i1_s2_samples[2].getChildren());
+		assertFalse(e2_s2_i1_s2_samples[2].hasChildren());
+		assertEquals(e2_s2_i1_symbols[1], e2_s2_i1_s2_samples[2].getParent());
+		assertNotNull(e2_s2_i1_s2_samples[2].getLabelImage());
+ 	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/src/org/eclipse/linuxtools/oprofile/ui/tests/UiTestsPlugin.java b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/src/org/eclipse/linuxtools/oprofile/ui/tests/UiTestsPlugin.java
new file mode 100644
index 0000000..281930e
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/src/org/eclipse/linuxtools/oprofile/ui/tests/UiTestsPlugin.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.oprofile.ui.tests;
+
+import org.eclipse.core.runtime.Plugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class UiTestsPlugin extends Plugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.oprofile.ui.tests"; //$NON-NLS-1$
+
+	// The shared instance
+	private static UiTestsPlugin plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public UiTestsPlugin() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static UiTestsPlugin getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/test.xml b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/test.xml
new file mode 100644
index 0000000..cc74a8c
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/test.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+
+<project name="testsuite" default="run" basedir=".">
+	<property name="classname" value="org.eclipse.linuxtools.oprofile.ui.tests.AllUiTests" />
+	<property name="plugin-name" value="org.eclipse.linuxtools.oprofile.ui.tests" />
+
+	<property name="library-file" value="${eclipse-home}/dropins/${subProjectName2}/plugins/org.eclipse.test/library.xml" />
+
+	<!-- The property ${eclipse-home} should be passed into this script -->
+	<!-- Set a meaningful default value for when it is not. -->
+	<property name="eclipse-home" value="${basedir}/../.." />
+
+	<!-- This target holds all initialization code that needs to be done for -->
+	<!-- all tests that are to be run. Initialization for individual tests -->
+	<!-- should be done within the body of the suite target. -->
+	<target name="init">
+		<tstamp />
+		<delete>
+			<fileset dir="${eclipse-home}" includes="org*.xml" />
+		</delete>
+	</target>
+
+	<!-- This target defines the tests that need to be run. -->
+	<target name="oprofile_ui_suite">
+		<property name="oprofile-ui-folder" value="${eclipse-home}/oprofile_ui_folder" />
+		<delete dir="${oprofile-ui-folder}" quiet="true" />
+		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="data-dir" value="${oprofile-ui-folder}" />
+			<property name="plugin-name" value="${plugin-name}" />
+			<property name="classname" value="${classname}" />
+		</ant>
+	</target>
+
+	<!-- This target holds code to cleanup the testing environment after -->
+	<!-- after all of the tests have been run. You can use this target to -->
+	<!-- delete temporary files that have been created. -->
+	<target name="cleanup">
+		<mkdir dir="${results}/consolelogs" />
+		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
+	</target>
+
+	<!-- This target runs the test suite. Any actions that need to happen -->
+	<!-- after all the tests have been run should go here. -->
+	<target name="run" depends="init,oprofile_ui_suite,cleanup">
+		<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="includes" value="org*.xml" />
+			<property name="output-file" value="${plugin-name}.xml" />
+		</ant>
+	</target>
+	
+    <target name="all" depends="run" description="Dummy target to run all tests">
+    </target>
+
+</project>
diff --git a/profiling/.classpath b/oprofile/org.eclipse.linuxtools.oprofile.ui/.classpath
similarity index 100%
copy from profiling/.classpath
copy to oprofile/org.eclipse.linuxtools.oprofile.ui/.classpath
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/.project b/oprofile/org.eclipse.linuxtools.oprofile.ui/.project
new file mode 100644
index 0000000..ed72d2c
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.oprofile.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/.settings/org.eclipse.jdt.core.prefs b/oprofile/org.eclipse.linuxtools.oprofile.ui/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..5f0bb8a
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Mon Dec 01 14:59:31 EST 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/.svnignore b/oprofile/org.eclipse.linuxtools.oprofile.ui/.svnignore
new file mode 100644
index 0000000..ba077a4
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/.svnignore
@@ -0,0 +1 @@
+bin
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/META-INF/MANIFEST.MF b/oprofile/org.eclipse.linuxtools.oprofile.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..cbb5164
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,33 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.oprofile.ui;singleton:=true
+Bundle-Version: 0.3.0.qualifier
+Bundle-Vendor: %bundleProvider
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.4.0",
+ org.eclipse.ui;bundle-version="3.4.0",
+ org.eclipse.ui.editors;bundle-version="3.4.0"
+Bundle-Activator: org.eclipse.linuxtools.oprofile.ui.OprofileUiPlugin
+Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
+Export-Package: org.eclipse.linuxtools.oprofile.ui;
+  uses:="org.eclipse.jface.resource,
+   org.eclipse.ui,
+   org.eclipse.linuxtools.oprofile.ui.sample,
+   org.eclipse.linuxtools.oprofile.ui.system,
+   org.eclipse.ui.plugin,
+   org.eclipse.core.resources,
+   org.eclipse.jface.viewers,
+   org.eclipse.swt.graphics,
+   org.osgi.framework,
+   org.eclipse.swt.widgets",
+ org.eclipse.linuxtools.oprofile.ui.model,
+ org.eclipse.linuxtools.oprofile.ui.view
+Import-Package: org.eclipse.cdt.core.model,
+ org.eclipse.core.resources,
+ org.eclipse.jface.text,
+ org.eclipse.jface.text.source,
+ org.eclipse.linuxtools.oprofile.core,
+ org.eclipse.linuxtools.oprofile.core.model,
+ org.eclipse.linuxtools.profiling.ui
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/about.html b/oprofile/org.eclipse.linuxtools.oprofile.ui/about.html
new file mode 100644
index 0000000..bf06e8c
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>8th September, 2004</p>	
+<h3>License</h3>
+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<h3>Contributions</h3>
+
+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise
+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such
+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
+
+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or
+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the
+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/build.properties b/oprofile/org.eclipse.linuxtools.oprofile.ui/build.properties
new file mode 100644
index 0000000..3268fa6
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/build.properties
@@ -0,0 +1,15 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               plugin.properties,\
+               icons/,\
+               about.html
+src.includes = META-INF/,\
+               about.html,\
+               icons/,\
+               plugin.properties,\
+               plugin.xml,\
+               src/
+individualSourceBundles=true
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/annotate.png b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/annotate.png
new file mode 100644
index 0000000..6cef6c7
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/annotate.png
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/dependent.gif b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/dependent.gif
new file mode 100644
index 0000000..122bada
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/dependent.gif
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/dump.gif b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/dump.gif
new file mode 100644
index 0000000..d5b8001
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/dump.gif
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/error.png b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/error.png
new file mode 100644
index 0000000..7d94eb1
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/error.png
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/event.gif b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/event.gif
new file mode 100644
index 0000000..c91f254
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/event.gif
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/image.gif b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/image.gif
new file mode 100644
index 0000000..8aa0162
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/image.gif
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/oprofile_view.png b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/oprofile_view.png
new file mode 100644
index 0000000..4f8488f
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/oprofile_view.png
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/sample.gif b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/sample.gif
new file mode 100644
index 0000000..061161a
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/sample.gif
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/session.gif b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/session.gif
new file mode 100644
index 0000000..c2b41bd
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/session.gif
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/symbol.gif b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/symbol.gif
new file mode 100644
index 0000000..6ae4604
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/symbol.gif
Binary files differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/plugin.properties b/oprofile/org.eclipse.linuxtools.oprofile.ui/plugin.properties
new file mode 100644
index 0000000..b0de4cf
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/plugin.properties
@@ -0,0 +1,28 @@
+#*******************************************************************************
+# Copyright (c) 2004, 2008 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Red Hat, Inc. - initial API and implementation
+#*******************************************************************************
+bundleName=OProfile UI Plug-in (Incubation)
+bundleProvider=Eclipse
+
+view.groupname=C/C++ Profiling
+view.name=OProfile
+
+view.annotate.toggle.label=Toggle Annotation
+view.annotate.toggle.tooltip=Toggle Annotation
+
+annotateCommand.name=Annotate
+lt.min.pct.label=OProfile Annotation: <0.01%
+lt.05.pct.label=OProfile Annotation: 0.01% - 4.99%
+lt.10.pct.label=OProfile Annotation: 05% - 9.99%
+lt.20.pct.label=OProfile Annotation: 10% - 19.99%
+lt.30.pct.label=OProfile Annotation: 20% - 29.99%
+lt.40.pct.label=OProfile Annotation: 30% - 39.99%
+lt.50.pct.label=OProfile Annotation: 40% - 49.99%
+gt.50.pct.label=OProfile Annotation: >50%
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/plugin.xml b/oprofile/org.eclipse.linuxtools.oprofile.ui/plugin.xml
new file mode 100644
index 0000000..338b167
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/plugin.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+   <extension
+         point="org.eclipse.ui.views">
+      <view
+            category="org.eclipse.linuxtools.oprofile.ui.viewgroup"
+            class="org.eclipse.linuxtools.oprofile.ui.view.OprofileView"
+            icon="icons/oprofile_view.png"
+            id="org.eclipse.linuxtools.oprofile.ui.OProfileView"
+            name="%view.name"
+            restorable="true">
+      </view>
+      <category
+            id="org.eclipse.linuxtools.oprofile.ui.viewgroup"
+            name="%view.groupname">
+      </category>
+   </extension>
+</plugin>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/OprofileUiMessages.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/OprofileUiMessages.java
new file mode 100644
index 0000000..dc195d4
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/OprofileUiMessages.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2004 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *******************************************************************************/ 
+
+package org.eclipse.linuxtools.oprofile.ui;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class OprofileUiMessages
+{
+
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.oprofile.ui.oprofileui"; //$NON-NLS-1$
+
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+
+	private OprofileUiMessages()
+	{
+	}
+
+	public static String getString(String key)
+	{
+		try
+		{
+			return RESOURCE_BUNDLE.getString(key);
+		}
+		catch (MissingResourceException e)
+		{
+			return '!' + key + '!';
+		}
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/OprofileUiPlugin.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/OprofileUiPlugin.java
new file mode 100644
index 0000000..addd19e
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/OprofileUiPlugin.java
@@ -0,0 +1,142 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Keith Seitz <keiths@redhat.com> - initial API and implementation
+ *    Kent Sebastian <ksebasti@redhat.com> - 
+ *******************************************************************************/ 
+
+package org.eclipse.linuxtools.oprofile.ui;
+
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.linuxtools.oprofile.ui.view.OprofileView;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+
+/**
+ * The main plugin class to be used in the desktop.
+ */
+public class OprofileUiPlugin extends AbstractUIPlugin {
+	//The shared instance.
+	private static OprofileUiPlugin plugin;
+
+	private OprofileView _oprofileview = null;
+	
+	public static final String ID_PLUGIN = "org.eclipse.linuxtools.oprofile.ui"; //$NON-NLS-1$
+	public static final String ID_OPROFILE_VIEW = ID_PLUGIN + ".OProfileView"; //$NON-NLS-1$
+
+	private static final String ICON_PATH = "icons/"; //$NON-NLS-1$
+	public static final String SESSION_ICON = ICON_PATH + "session.gif"; //$NON-NLS-1$
+	public static final String EVENT_ICON = ICON_PATH + "event.gif"; //$NON-NLS-1$
+	public static final String IMAGE_ICON = ICON_PATH + "image.gif"; //$NON-NLS-1$
+	public static final String DEPENDENT_ICON = ICON_PATH + "dependent.gif"; //$NON-NLS-1$
+	public static final String SYMBOL_ICON = ICON_PATH + "symbol.gif"; //$NON-NLS-1$
+	public static final String SAMPLE_ICON = ICON_PATH + "sample.gif"; //$NON-NLS-1$
+	public static final String ERROR_ICON = ICON_PATH + "error.png"; //$NON-NLS-1$
+	
+	public static final double MINIMUM_SAMPLE_PERCENTAGE = 0.0001;
+	
+	public static final String ANNOTATION_TYPE_LT_MIN_PERCENTAGE = "org.eclipse.linuxtools.oprofile.ui.annotation.lt.min.pct"; //$NON-NLS-1$
+	public static final String ANNOTATION_TYPE_LT_05 = "org.eclipse.linuxtools.oprofile.ui.annotation.lt.05.pct"; //$NON-NLS-1$
+	public static final String ANNOTATION_TYPE_LT_10 = "org.eclipse.linuxtools.oprofile.ui.annotation.lt.10.pct"; //$NON-NLS-1$
+	public static final String ANNOTATION_TYPE_LT_20 = "org.eclipse.linuxtools.oprofile.ui.annotation.lt.20.pct"; //$NON-NLS-1$
+	public static final String ANNOTATION_TYPE_LT_30 = "org.eclipse.linuxtools.oprofile.ui.annotation.lt.30.pct"; //$NON-NLS-1$
+	public static final String ANNOTATION_TYPE_LT_40 = "org.eclipse.linuxtools.oprofile.ui.annotation.lt.40.pct"; //$NON-NLS-1$
+	public static final String ANNOTATION_TYPE_LT_50 = "org.eclipse.linuxtools.oprofile.ui.annotation.lt.50.pct"; //$NON-NLS-1$
+	public static final String ANNOTATION_TYPE_GT_50 = "org.eclipse.linuxtools.oprofile.ui.annotation.gt.50.pct"; //$NON-NLS-1$
+	
+	/**
+	 * The constructor.
+	 */
+	public OprofileUiPlugin() {
+		plugin = this;
+	}
+
+	/**
+	 * This method is called upon plug-in activation
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+	}
+
+	/**
+	 * This method is called when the plug-in is stopped
+	 */
+	public void stop(BundleContext context) throws Exception {
+		super.stop(context);
+		plugin = null;
+	}
+	
+	
+	/**
+	 * Returns the shared instance.
+	 */
+	public static OprofileUiPlugin getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Returns the workspace instance.
+	 */
+	public static IWorkspace getWorkspace() {
+		return ResourcesPlugin.getWorkspace();
+	}
+
+	/**	
+	 * Returns an image descriptor for the image file at the given
+	 * plug-in relative path
+	 *
+	 * @param path the path
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return imageDescriptorFromPlugin(ID_PLUGIN, path);
+	}
+	
+	
+	public OprofileView getOprofileView() {
+		return _oprofileview;
+	}
+
+	public void setOprofileView(OprofileView _oprofileview) {
+		this._oprofileview = _oprofileview;
+	}
+
+	public static IWorkbenchWindow getActiveWorkbenchWindow() {
+		return getDefault().getWorkbench().getActiveWorkbenchWindow();
+	}
+	
+	public static Shell getActiveWorkbenchShell() {
+		IWorkbenchWindow window = getActiveWorkbenchWindow();
+		if (window != null) {
+			return window.getShell();
+		}
+		return null;
+	}
+	
+	public static String getPercentageString(double percentage) {
+		NumberFormat nf = NumberFormat.getPercentInstance();
+		if (nf instanceof DecimalFormat) {
+			nf.setMinimumFractionDigits(2);
+			nf.setMaximumFractionDigits(2);
+		}
+		
+		if (percentage < OprofileUiPlugin.MINIMUM_SAMPLE_PERCENTAGE) {
+			return "<" + nf.format(OprofileUiPlugin.MINIMUM_SAMPLE_PERCENTAGE); //$NON-NLS-1$
+		} else {
+			return nf.format(percentage);
+		}
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/IUiModelElement.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/IUiModelElement.java
new file mode 100644
index 0000000..e8a37b1
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/IUiModelElement.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation 
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.ui.model;
+
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Interface for all model elements to ease use with the tree viewer.
+ */
+public interface IUiModelElement {
+	/**
+	 * Returns the text to display in the tree viewer as required by the label provider.
+	 * @return text describing this element
+	 */
+	String getLabelText();
+
+	/**
+	 * Returns the children of this element.
+	 * @return an array of IUiModelElements
+	 */
+	IUiModelElement[] getChildren();
+	
+	/**
+	 * Returns if this element has any children. Unless there is no data in
+	 * a session, only samples should not have any children.
+	 * @return true if children, false if no children
+	 */
+	boolean hasChildren();
+	
+	/**
+	 * Returns the parent element.
+	 * @return the parent element
+	 */
+	IUiModelElement getParent();
+
+	/**
+	 * Returns the Image to display next to the text in the tree viewer.
+	 * @return an Image object of the icon
+	 */
+	Image getLabelImage();
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelDependent.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelDependent.java
new file mode 100644
index 0000000..6b7a32b
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelDependent.java
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation 
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.ui.model;
+
+import org.eclipse.linuxtools.oprofile.core.model.OpModelImage;
+import org.eclipse.linuxtools.oprofile.ui.OprofileUiMessages;
+import org.eclipse.linuxtools.oprofile.ui.OprofileUiPlugin;
+import org.eclipse.swt.graphics.Image;
+
+public class UiModelDependent implements IUiModelElement {
+	private IUiModelElement _parent;
+	private OpModelImage _dataModelDependents[];
+	private UiModelImage _dependents[];
+	private int _totalCount;
+	private int _depCount;
+	
+	public UiModelDependent(IUiModelElement parent, OpModelImage dependents[], int totalCount, int depCount) {
+		_parent = parent;
+		_dataModelDependents = dependents;
+		_dependents = null;
+		_totalCount = totalCount;
+		_depCount = depCount;
+		refreshModel();
+	}
+
+	private void refreshModel() {
+		_dependents = new UiModelImage[_dataModelDependents.length];
+		
+		for (int i = 0; i < _dataModelDependents.length; i++) {
+			_dependents[i] = new UiModelImage(this, _dataModelDependents[i], _totalCount, 0);
+		}
+	}
+	
+	@Override
+	public String toString() {
+		double countPercentage = (double)_depCount / (double)_totalCount;
+		String percentage = OprofileUiPlugin.getPercentageString(countPercentage);
+
+		return percentage + " " + OprofileUiMessages.getString("uimodel.percentage.in") + OprofileUiMessages.getString("uimodel.dependent.dependent.images"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
+	}
+
+	/** IUiModelElement functions **/
+	public String getLabelText() {
+		return toString();
+	}
+
+	public IUiModelElement[] getChildren() {
+		return _dependents;
+	}
+
+	public boolean hasChildren() {
+		return true;	//must have children, or this object wouldn't be created
+	}
+
+	public IUiModelElement getParent() {
+		return _parent;
+	}
+
+	public Image getLabelImage() {
+		return OprofileUiPlugin.getImageDescriptor(OprofileUiPlugin.DEPENDENT_ICON).createImage();
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelError.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelError.java
new file mode 100644
index 0000000..0efcf5b
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelError.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation 
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.ui.model;
+
+import org.eclipse.linuxtools.oprofile.ui.OprofileUiMessages;
+import org.eclipse.linuxtools.oprofile.ui.OprofileUiPlugin;
+import org.eclipse.swt.graphics.Image;
+
+public class UiModelError implements IUiModelElement {
+	public static final UiModelError NO_SAMPLES_ERROR = new UiModelError(OprofileUiMessages.getString("root.error.nosamples")); //$NON-NLS-1$
+
+	private String errorMessage;
+	
+	public UiModelError(String message) {
+		errorMessage = message;
+	}
+	
+	/** IUiModelElement functions **/
+	public String getLabelText() {
+		return errorMessage;
+	}
+
+	public IUiModelElement[] getChildren() {
+		return null;
+	}
+	
+	public boolean hasChildren() {
+		return false;
+	}
+
+	public IUiModelElement getParent() {
+		return null;
+	}
+	
+	public Image getLabelImage() {
+		return OprofileUiPlugin.getImageDescriptor(OprofileUiPlugin.ERROR_ICON).createImage();
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelEvent.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelEvent.java
new file mode 100644
index 0000000..9586542
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelEvent.java
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation 
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.ui.model;
+
+import org.eclipse.linuxtools.oprofile.core.model.OpModelEvent;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelSession;
+import org.eclipse.linuxtools.oprofile.ui.OprofileUiPlugin;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Top level elements displayed in the view -- events that oprofile 
+ *  has profiled. Must have children sessions.
+ */
+public class UiModelEvent implements IUiModelElement {
+	private IUiModelElement _parent = null;		//parent node -- necessary?
+	private OpModelEvent _event;				//the node in the data model
+	private UiModelSession _sessions[];			//this node's children
+	
+	public UiModelEvent(OpModelEvent event) {
+		if (event != null) {
+			_event = event;
+			refreshModel();
+		}
+	}
+
+	/**
+	 * Create the ui sessions from the data model.
+	 */
+	private void refreshModel() {
+		OpModelSession dataModelSessions[] = _event.getSessions();
+		_sessions = new UiModelSession[dataModelSessions.length];
+		
+		for (int i = 0; i < dataModelSessions.length; i++) {
+			_sessions[i] = new UiModelSession(this, dataModelSessions[i]);
+		}
+	}
+
+	@Override
+	public String toString() {
+		return (_event == null ? "" : _event.getName()); //$NON-NLS-1$
+	}
+
+	/** IUiModelElement functions **/
+	public String getLabelText() {
+		return toString();
+	}
+	
+	public IUiModelElement[] getChildren() {
+		return _sessions;
+	}
+
+	public boolean hasChildren() {
+		return (_sessions == null || _sessions.length == 0 ? false : true);
+	}
+
+	public IUiModelElement getParent() {
+		return _parent;
+	}
+
+	public Image getLabelImage() {
+		return OprofileUiPlugin.getImageDescriptor(OprofileUiPlugin.EVENT_ICON).createImage();
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelImage.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelImage.java
new file mode 100644
index 0000000..e412909
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelImage.java
@@ -0,0 +1,96 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation 
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.ui.model;
+
+import org.eclipse.linuxtools.oprofile.core.model.OpModelImage;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelSymbol;
+import org.eclipse.linuxtools.oprofile.ui.OprofileUiMessages;
+import org.eclipse.linuxtools.oprofile.ui.OprofileUiPlugin;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Children of sessions in the view -- the binary which was profiled. 
+ * May or may not have child symbols. Note that although the dependent
+ * images are children of OpModelImages in the data model, for usability's
+ * sake they are children of the parent session in the tree.
+ */
+public class UiModelImage implements IUiModelElement {
+	private IUiModelElement _parent;		//parent element, may be UiModelSession or UiModelDependent
+	private OpModelImage _image;			//the node in the data model
+	private UiModelSymbol _symbols[];		//this node's child (symbols)
+	private int _totalCount;				//total number of samples 
+	private int _depCount;					//number of samples from dependent images
+
+	public UiModelImage(IUiModelElement parent, OpModelImage image, int totalCount, int depCount) {
+		_parent = parent;
+		_image = image;
+		_symbols = null;
+		_totalCount = totalCount;
+		_depCount = depCount;
+		refreshModel();
+	}
+
+	private void refreshModel() {
+		OpModelSymbol[] dataModelSymbols = _image.getSymbols();
+		
+		//dependent images may not have symbols
+		if (dataModelSymbols != null) {
+			_symbols = new UiModelSymbol[dataModelSymbols.length];
+	
+			for (int i = 0; i < dataModelSymbols.length; i++) {
+				_symbols[i] = new UiModelSymbol(this, dataModelSymbols[i], _totalCount);
+			}
+		}
+	}
+	
+	@Override
+	public String toString() {
+		if (_image.getCount() == OpModelImage.IMAGE_PARSE_ERROR) {
+			return OprofileUiMessages.getString("opxmlParse.error.multipleImages"); //$NON-NLS-1$
+		} else {
+			double countPercentage = (double)(_image.getCount() - _depCount) / (double)_totalCount;
+			String percentage = OprofileUiPlugin.getPercentageString(countPercentage);
+			
+			return percentage + " " + OprofileUiMessages.getString("uimodel.percentage.in") + _image.getName(); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+	
+	/** IUiModelElement functions **/
+	public String getLabelText() {
+		return toString();
+	}
+
+	public IUiModelElement[] getChildren() {
+		IUiModelElement children[] = null;
+		
+		if (_symbols != null) {
+			children = new IUiModelElement[_symbols.length];
+			
+			for (int i = 0; i < _symbols.length; i++) {
+				children[i] = _symbols[i];
+			}
+		}
+		
+		return children;
+	}
+
+	public boolean hasChildren() {
+		return (_symbols == null || _symbols.length == 0 ? false : true);
+	}
+
+	public IUiModelElement getParent() {
+		return _parent;
+	}
+
+	public Image getLabelImage() {
+		return OprofileUiPlugin.getImageDescriptor(OprofileUiPlugin.IMAGE_ICON).createImage();
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelRoot.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelRoot.java
new file mode 100644
index 0000000..3a86314
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelRoot.java
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright (c) 2008,2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation 
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.ui.model;
+
+import org.eclipse.linuxtools.oprofile.core.model.OpModelEvent;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelRoot;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Convenience class for creating the UI model from the oprofile data model,
+ *  via a single point of access.
+ */
+public class UiModelRoot implements IUiModelElement {
+	private static UiModelRoot _uiModelRoot = new UiModelRoot();	//singleton
+	private UiModelEvent[] _events;							//this node's children
+	private UiModelError _rootError;
+
+	/** constructor, private for singleton use **/
+	protected UiModelRoot() {
+//		refreshModel();
+		_events = null;
+		_rootError = null;
+//		_uiModelRoot = this;
+	}
+	
+	/**
+	 * Get the instance of this ui model root.
+	 * @return the ui model root object
+	 */
+	public static UiModelRoot getDefault() {
+		return _uiModelRoot;
+	}
+
+	/**
+	 * Kick off creating the UI model from the data model. Meant to 
+	 * 	be called from UI code. The refreshModel() method is called for 
+	 *  the child elements from their constructor.
+	 */
+	public void refreshModel() {
+		OpModelEvent dataModelEvents[] = getModelDataEvents();
+		
+		_rootError = null;
+		_events = null;
+
+		if (dataModelEvents == null || dataModelEvents.length == 0) {
+			_rootError = UiModelError.NO_SAMPLES_ERROR;
+		} else {
+			_events = new UiModelEvent[dataModelEvents.length];
+			for (int i = 0; i < dataModelEvents.length; i++) {
+				_events[i] = new UiModelEvent(dataModelEvents[i]);
+			}
+		}
+	}
+	
+	protected OpModelEvent[] getModelDataEvents() {
+		OpModelRoot modelRoot = OpModelRoot.getDefault();
+		return modelRoot.getEvents();
+	}
+
+	/** IUiModelElement functions **/
+	public String getLabelText() {
+		return null;
+	}
+
+	public IUiModelElement[] getChildren() {
+		if (_events != null)
+			return _events;
+		else
+			return new IUiModelElement[] { _rootError };
+	}
+
+	public boolean hasChildren() {
+		return true;
+	}
+
+	public IUiModelElement getParent() {
+		return null;
+	}
+
+	public Image getLabelImage() {
+		return null;
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelSample.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelSample.java
new file mode 100644
index 0000000..389ab2f
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelSample.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation 
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.ui.model;
+
+import org.eclipse.linuxtools.oprofile.core.model.OpModelSample;
+import org.eclipse.linuxtools.oprofile.ui.OprofileUiMessages;
+import org.eclipse.linuxtools.oprofile.ui.OprofileUiPlugin;
+import org.eclipse.swt.graphics.Image;
+
+public class UiModelSample implements IUiModelElement {
+	private IUiModelElement _parent;		//parent element
+	private OpModelSample _sample;			//the node in the data model
+	private int _totalCount;				//total sample count for the parent session
+	
+	public UiModelSample(IUiModelElement parent, OpModelSample sample, int totalCount) {
+		_parent = parent;
+		_sample = sample;
+		_totalCount = totalCount;
+	}
+	
+	@Override
+	public String toString() {
+		double countPercentage = (double)_sample.getCount() / (double)_totalCount;
+		String percentage = OprofileUiPlugin.getPercentageString(countPercentage);
+		
+		return percentage + " " + OprofileUiMessages.getString("uimodel.sample.on.line") + Integer.toString(_sample.getLine()); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+	
+	public int getLine() {
+		return _sample.getLine();
+	}
+	
+	public double getCountPercentage() {
+		return (double)_sample.getCount() / (double)_totalCount;
+	}
+	
+	/** IUiModelElement functions **/
+	public String getLabelText() {
+		return toString();
+	}
+
+	public IUiModelElement[] getChildren() {
+		return null;
+	}
+
+	public boolean hasChildren() {
+		return false;		//bottom level element
+	}
+
+	public IUiModelElement getParent() {
+		return _parent;
+	}
+
+	public Image getLabelImage() {
+		return OprofileUiPlugin.getImageDescriptor(OprofileUiPlugin.SAMPLE_ICON).createImage();
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelSession.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelSession.java
new file mode 100644
index 0000000..f688814
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelSession.java
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation 
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.ui.model;
+
+import org.eclipse.linuxtools.oprofile.core.model.OpModelImage;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelSession;
+import org.eclipse.linuxtools.oprofile.ui.OprofileUiPlugin;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Children of events in the view -- sessions containing images/symbols
+ *  for its parent event. Must have a child image. May also have dependent
+ *  images, which are children of the Image in the data model, but are 
+ *  displayed as children of the session in the view.
+ */
+public class UiModelSession implements IUiModelElement {
+	private IUiModelElement _parent;		//parent element
+	private OpModelSession _session;		//the node in the data model
+	private UiModelImage _image;			//this node's child
+	private UiModelDependent _dependent;	//dependent images of the OpModelImage
+
+	//OProfile's default session name
+	private static final String DEFAULT_SESSION_NAME = "current"; //$NON-NLS-1$
+	
+	public UiModelSession(IUiModelElement parent, OpModelSession session) {
+		_parent = parent;
+		_session = session;
+		_image = null;
+		_dependent = null;
+		refreshModel();
+	}
+	
+	private void refreshModel() {
+		OpModelImage dataModelImage = _session.getImage();
+		if (dataModelImage != null) {
+			_image = new UiModelImage(this, dataModelImage, dataModelImage.getCount(), dataModelImage.getDepCount());
+			
+			if (dataModelImage.hasDependents()) {
+				_dependent = new UiModelDependent(this, dataModelImage.getDependents(), dataModelImage.getCount(), dataModelImage.getDepCount());
+			}
+		}
+	}
+
+	@Override
+	public String toString() {
+		return _session.getName();
+	}
+	
+	public boolean isDefaultSession() {
+		return _session.getName().equalsIgnoreCase(DEFAULT_SESSION_NAME);
+	}
+
+	/** IUiModelElement functions **/
+	public String getLabelText() {
+		return toString();
+	}
+
+	public IUiModelElement[] getChildren() {
+		if (_dependent != null) {
+			return new IUiModelElement[] {_image, _dependent};
+		} else {
+			return new IUiModelElement[] {_image};
+		}
+	}
+
+	public boolean hasChildren() {
+		return (_image != null);
+	}
+
+	public IUiModelElement getParent() {
+		return _parent;
+	}
+
+	public Image getLabelImage() {
+		return OprofileUiPlugin.getImageDescriptor(OprofileUiPlugin.SESSION_ICON).createImage();
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelSymbol.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelSymbol.java
new file mode 100644
index 0000000..a4dae3b
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelSymbol.java
@@ -0,0 +1,96 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation 
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.ui.model;
+
+import java.io.File;
+import java.util.ArrayList;
+
+import org.eclipse.linuxtools.oprofile.core.model.OpModelSample;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelSymbol;
+import org.eclipse.linuxtools.oprofile.ui.OprofileUiMessages;
+import org.eclipse.linuxtools.oprofile.ui.OprofileUiPlugin;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Children of images in the view -- a function name in the profiled 
+ *  image's source code. May or may not have child samples.
+ */
+public class UiModelSymbol implements IUiModelElement {
+	private IUiModelElement _parent;	//parent element
+	private OpModelSymbol _symbol;		//the node in the data model
+	private UiModelSample _samples[];	//this node's children
+	private int _totalCount;			//total count of samples for the parent session
+	
+	public UiModelSymbol(IUiModelElement parent, OpModelSymbol symbol, int totalCount) {
+		_parent = parent;
+		_symbol = symbol;
+		_samples = null;
+		_totalCount = totalCount;
+		refreshModel();
+	}	
+	
+	private void refreshModel() {
+		ArrayList<UiModelSample> sampleList = new ArrayList<UiModelSample>();
+		OpModelSample dataModelSamples []= _symbol.getSamples();
+		
+		for (int i = 0; i < dataModelSamples.length; i++) {
+			//dont display samples with line number of 0, meaning no line number
+			// was correlated, more likely that no source file exists
+			if (dataModelSamples[i].getLine() != 0) {
+				sampleList.add(new UiModelSample(this, dataModelSamples[i], _totalCount));
+			}
+		}
+		
+		_samples = new UiModelSample[sampleList.size()];
+		sampleList.toArray(_samples);
+	}
+	
+	@Override
+	public String toString() {
+		double countPercentage = (double)_symbol.getCount() / (double)_totalCount;
+		String percentage = OprofileUiPlugin.getPercentageString(countPercentage);
+		
+		//a hack to get `basename` type functionality
+		String fileName = (new File(_symbol.getFile())).getName();
+//		String fileName = _symbol.getFile();
+
+		return percentage + " " + OprofileUiMessages.getString("uimodel.percentage.in") + _symbol.getName() + (fileName.length() == 0 ? "" : " [" + fileName + "]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+	}
+	
+	public String getFileName() {
+		return _symbol.getFile();
+	}
+	
+	public String getFunctionName(){
+		return _symbol.getName();
+	}
+
+	/** IUiModelElement functions **/
+	public String getLabelText() {
+		return toString();
+	}
+
+	public IUiModelElement[] getChildren() {
+		return _samples;
+	}
+
+	public boolean hasChildren() {
+		return (_samples == null || _samples.length == 0 ? false : true);
+	}
+
+	public IUiModelElement getParent() {
+		return _parent;
+	}
+
+	public Image getLabelImage() {
+		return OprofileUiPlugin.getImageDescriptor(OprofileUiPlugin.SYMBOL_ICON).createImage();
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/oprofileui.properties b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/oprofileui.properties
new file mode 100644
index 0000000..2502d6f
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/oprofileui.properties
@@ -0,0 +1,40 @@
+######################################################################
+# Copyright (c) 2004,2008 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Keith Seitz <keiths@redhat.com> - initial implementation
+#    Kent Sebastian <ksebasti@redhat.com>
+###################################################################### 
+savedialog.title=Save Session
+savedialog.message=Enter the new name of the default session
+savedialog.initial=
+savedialog.validator.invalidChar={0} is an invalid character in session name \"{1}\".
+savedialog.validator.containsWhitespace=Session name \"{0}\" cannot contain whitespace.
+savedialog.validator.exists=Session \"{0}\" already exists.
+
+defaultsessiondialog.nodefaultsession.title=Error Saving Default Session
+defaultsessiondialog.nodefaultsession.message=No default session exists.
+
+view.dialog.parsing.text=Parsing OProfile Data
+view.actions.refresh.label=Refresh View
+view.actions.logreader.label=Open OProfile Daemon Log
+view.actions.savedefaultsession.label=Save Default Session
+
+oprofiled.logreader.dialog.title=OProfiled Log
+oprofiled.logreader.error.fileNotFound=Log file empty or does not exist.
+oprofiled.logreader.error.io=Error reading log file.
+
+uimodel.percentage.in=in 
+uimodel.sample.on.line=on line 
+uimodel.dependent.dependent.images=dependent images
+
+opxmlParse.error.multipleImages=Error: samples not created from Eclipse-OProfile plugin. Please remove this session.
+
+annotation.text.from=from event 
+annotation.text.in=in session 
+
+root.error.nosamples=No profiling data is on the system. 
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/view/OprofileView.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/view/OprofileView.java
new file mode 100644
index 0000000..4ecf12d
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/view/OprofileView.java
@@ -0,0 +1,138 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation 
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.ui.view;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.linuxtools.oprofile.core.model.OpModelRoot;
+import org.eclipse.linuxtools.oprofile.ui.OprofileUiMessages;
+import org.eclipse.linuxtools.oprofile.ui.OprofileUiPlugin;
+import org.eclipse.linuxtools.oprofile.ui.model.UiModelRoot;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.ViewPart;
+
+/**
+ * The view for the OProfile plugin. Shows the elements gathered by the data model
+ *   in a tree viewer, parsed by the ui model (in the model package). The hierarchy
+ *   (as it is displayed) looks like:
+ *   
+ *   UiModelRoot (not shown in the view)
+ *   \_ UiModelEvent
+ *   \_ ...
+ *   \_ UiModelEvent
+ *      \_ UiModelSession
+ *      \_ ...
+ *      \_ UiModelSession
+ *         \_ UiModelImage
+ *         |  \_ UiModelSymbol
+ *         |  \_ ...
+ *         |  \_ UiModelSymbol
+ *         |     \_ UiModelSample
+ *         |     \_ ...
+ *         |     \_ UiModelSample
+ *         \_ UiModelDependent
+ *            \_ UiModelImage
+ *            |  \_ ... (see above)
+ *            \_ ...
+ * 
+ * The refreshView() function takes care of launching the data model parsing and
+ *   ui model parsing in a separate thread.
+ */
+public class OprofileView extends ViewPart {
+	private TreeViewer _viewer;
+
+	@Override
+	public void createPartControl(Composite parent) {
+		_createTreeViewer(parent);
+		_createActionMenu();
+
+		OprofileUiPlugin.getDefault().setOprofileView(this);
+	}
+	
+	private void _createTreeViewer(Composite parent) {
+		_viewer = new TreeViewer(parent, SWT.SINGLE);
+		_viewer.setContentProvider(new OprofileViewContentProvider());
+		_viewer.setLabelProvider(new OprofileViewLabelProvider());
+		_viewer.addDoubleClickListener(new OprofileViewDoubleClickListener());
+	}
+
+	private void _createActionMenu() {
+		IMenuManager manager = getViewSite().getActionBars().getMenuManager();
+		
+		manager.add(new OprofileViewLogReaderAction());
+		manager.add(new OprofileViewRefreshAction());
+		manager.add(new OprofileViewSaveDefaultSessionAction());
+	}
+	
+	private TreeViewer getTreeViewer() {
+		return _viewer;
+	}
+	
+	/**
+	 * Extremely convoluted way of getting the running and parsing to happen in 
+	 *   a separate thread, with a progress monitor. In most cases and on fast 
+	 *   machines this will probably only be a blip.
+	 */
+	public void refreshView() {
+		try {
+			PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(OprofileUiPlugin.ID_OPROFILE_VIEW);
+		} catch (PartInitException e) {
+			e.printStackTrace();
+		}
+
+		IRunnableWithProgress refreshRunner = new IRunnableWithProgress() {
+			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+				monitor.beginTask(OprofileUiMessages.getString("view.dialog.parsing.text"), 2); //$NON-NLS-1$
+
+				OpModelRoot dataModelRoot = OpModelRoot.getDefault();
+				dataModelRoot.refreshModel();
+//				System.out.println(dataModelRoot);	//debugging
+				monitor.worked(1);
+
+				final UiModelRoot UiRoot = UiModelRoot.getDefault();
+				UiRoot.refreshModel();
+				
+				Display.getDefault().asyncExec(new Runnable() {
+					public void run() {
+						OprofileUiPlugin.getDefault().getOprofileView().getTreeViewer().setInput(UiRoot);
+					}
+				});
+				monitor.worked(1);
+
+				monitor.done();
+			}
+		};
+		
+		ProgressMonitorDialog dialog = new ProgressMonitorDialog(null);
+		try {
+			dialog.run(true, false, refreshRunner);
+		} catch (InvocationTargetException e) {
+			e.printStackTrace();
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	public void setFocus() {
+		// TODO Auto-generated method stub
+	}
+
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/view/OprofileViewContentProvider.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/view/OprofileViewContentProvider.java
new file mode 100644
index 0000000..61ad322
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/view/OprofileViewContentProvider.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation,
+ *    	adapted from Keith Seitz's ProfileContentProvider 
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.ui.view;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.linuxtools.oprofile.ui.model.IUiModelElement;
+
+/**
+ * Content provider for the OprofileView's tree viewer.
+ */
+public class OprofileViewContentProvider implements ITreeContentProvider {
+
+	public Object[] getChildren(Object element) {
+		Assert.isLegal(element instanceof IUiModelElement, "in OprofileViewContentProvider"); //$NON-NLS-1$
+		return ((IUiModelElement) element).getChildren();
+	}
+
+	public Object getParent(Object element) {
+		Assert.isLegal(element instanceof IUiModelElement, "in OprofileViewContentProvider"); //$NON-NLS-1$
+		return ((IUiModelElement) element).getParent();
+	}
+
+	public boolean hasChildren(Object element) {
+		Assert.isLegal(element instanceof IUiModelElement, "in OprofileViewContentProvider"); //$NON-NLS-1$
+		return ((IUiModelElement) element).hasChildren();
+	}
+
+	public Object[] getElements(Object parentElement) {
+		return getChildren(parentElement);
+	}
+	
+	public void dispose() {
+		// TODO Auto-generated method stub
+	}
+
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		// TODO Auto-generated method stub
+	}
+
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/view/OprofileViewDoubleClickListener.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/view/OprofileViewDoubleClickListener.java
new file mode 100644
index 0000000..27eb76a
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/view/OprofileViewDoubleClickListener.java
@@ -0,0 +1,134 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.ui.view;
+
+import java.util.HashMap;
+
+import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.TreeSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.linuxtools.oprofile.ui.model.IUiModelElement;
+import org.eclipse.linuxtools.oprofile.ui.model.UiModelEvent;
+import org.eclipse.linuxtools.oprofile.ui.model.UiModelImage;
+import org.eclipse.linuxtools.oprofile.ui.model.UiModelSample;
+import org.eclipse.linuxtools.oprofile.ui.model.UiModelSession;
+import org.eclipse.linuxtools.oprofile.ui.model.UiModelSymbol;
+import org.eclipse.linuxtools.profiling.ui.ProfileUIUtils;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * Listener for the oprofile view when a user double clicks on an element in the tree.
+ * 
+ * Different things occur based on the event:
+ *   
+ *   UiModelEvent 		- nothing (?)
+ *   UiModelSession 	- save the session to a different name
+ *   UiModelImage 		- nothing (?)
+ *   UiModelSymbol		- nothing (?)
+ *   UiModelSample		- go to line number in appropriate file
+ */
+public class OprofileViewDoubleClickListener implements IDoubleClickListener {
+	public void doubleClick(DoubleClickEvent event) {
+		TreeViewer tv = (TreeViewer) event.getSource();
+		TreeSelection tsl = (TreeSelection) tv.getSelection();
+		IUiModelElement element = (IUiModelElement) tsl.getFirstElement();
+		ICProject project;
+		
+		try {
+			if (element instanceof UiModelEvent) {
+				// UiModelEvent event = (UiModelEvent)element;
+
+			} else if (element instanceof UiModelSession) {
+				/* moved into an action menu */
+			} else if (element instanceof UiModelImage) {
+				// UiModelImage image = (UiModelImage)element;
+
+			} else if (element instanceof UiModelSymbol) {
+				final UiModelSymbol symbol = (UiModelSymbol) element;
+				final String imageLabel = symbol.getParent().getLabelText();
+				final String fileName = symbol.getFileName();
+				String functionName = symbol.getFunctionName();
+				int numOfArgs = -1;
+				HashMap<String, int[]> map;
+
+				// hard coded to match "XY.PQ% in /some/arbitrary/path/to/binary"
+				String absPath = imageLabel.substring(imageLabel.indexOf(" in ") + 4);
+				project = ProfileUIUtils.findCProjectWithAbsolutePath(absPath);
+				if (project == null) {
+					return;
+				}
+
+				// detect function with arguments and narrow search accordingly
+				if (functionName.matches(".*\\(.*\\)")) {
+					int start = functionName.indexOf('(');
+					if (functionName.contains(",")) {
+						int end = functionName.indexOf(')');
+						numOfArgs = functionName.substring(start, end).split(",").length;
+					} else {
+						numOfArgs = 1;
+					}
+					functionName = functionName.substring(0, start);
+				}else{
+					numOfArgs = 0;
+				}
+
+				if (fileName.length() > 0 && functionName.length() > 0) {
+					// this should almost ALWAYS be the case
+					// try and go to the function in the file
+					map = ProfileUIUtils.findFunctionsInProject(project,functionName, numOfArgs, fileName, true);
+
+					// if function still can't be found, go to first line in the file
+					if (map.isEmpty()) {
+						ProfileUIUtils.openEditorAndSelect(fileName, 1);
+					} else {
+						for (String loc : map.keySet()) {
+							ProfileUIUtils.openEditorAndSelect(loc, map.get(loc)[0], map.get(loc)[1]);
+						}
+					}
+
+				} else if (functionName.length() > 0) {
+					// can this ever happen ?
+					// try to find the file name that has this function
+					map = ProfileUIUtils.findFunctionsInProject(project, functionName, numOfArgs, null, true);
+
+					for (String loc : map.keySet()) {
+						ProfileUIUtils.openEditorAndSelect(loc, map.get(loc)[0], map.get(loc)[1]);
+					}
+				} else if (fileName.length() > 0) {
+					// can this ever happen ?
+					// jump to 1st line in the file
+					ProfileUIUtils.openEditorAndSelect(fileName, 1);
+				}
+				
+			} else if (element instanceof UiModelSample) {
+				// jump to line number in the appropriate file
+				UiModelSample sample = (UiModelSample) element;
+				int line = sample.getLine();
+
+				// get file name from the parent sample
+				final UiModelSymbol symbol = ((UiModelSymbol) sample.getParent());
+				final String fileName = symbol.getFileName();
+				ProfileUIUtils.openEditorAndSelect(fileName, line);
+			}
+		} catch (BadLocationException e1) {
+			e1.printStackTrace();
+		} catch (PartInitException e2) {
+			e2.printStackTrace();
+		} catch (CoreException e3) {
+			e3.printStackTrace();
+		}
+	}
+	
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/view/OprofileViewLabelProvider.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/view/OprofileViewLabelProvider.java
new file mode 100644
index 0000000..2cb4f9a
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/view/OprofileViewLabelProvider.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation,
+ *    	adapted from Keith Seitz's ProfileLabelProvider 
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.ui.view;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.linuxtools.oprofile.ui.model.IUiModelElement;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Content provider for OprofileView's tree viewer.
+ */
+public class OprofileViewLabelProvider implements ILabelProvider {
+
+	public Image getImage(Object element) {
+		Assert.isLegal(element instanceof IUiModelElement, "in OprofileViewLabelProvider"); //$NON-NLS-1$
+		return ((IUiModelElement) element).getLabelImage();
+	}
+
+	public String getText(Object element) {
+		Assert.isLegal(element instanceof IUiModelElement, "in OprofileViewLabelProvider"); //$NON-NLS-1$
+		return ((IUiModelElement) element).getLabelText();
+	}
+
+	public void addListener(ILabelProviderListener listener) {
+		// TODO Auto-generated method stub
+	}
+
+	public void dispose() {
+		// TODO Auto-generated method stub
+	}
+
+	public boolean isLabelProperty(Object element, String property) {
+		return false;
+	}
+
+	public void removeListener(ILabelProviderListener listener) {
+		// TODO Auto-generated method stub
+	}
+
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/view/OprofileViewLogReaderAction.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/view/OprofileViewLogReaderAction.java
new file mode 100644
index 0000000..07ec62e
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/view/OprofileViewLogReaderAction.java
@@ -0,0 +1,142 @@
+/*******************************************************************************
+ * Copyright (c) 2004,2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation 
+ *    Keith Seitz <keiths@redhat.com> - much of the code in the LogReader class
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.ui.view;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.linuxtools.oprofile.core.Oprofile;
+import org.eclipse.linuxtools.oprofile.ui.OprofileUiMessages;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Layout;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * Log reader action. Reads /var/lib/oprofile/samples/oprofiled.log and displays
+ *  it in a nice dialog. Although the log is of dubious utility, it might be useful 
+ *  to some.
+ */
+public class OprofileViewLogReaderAction extends Action {
+	public OprofileViewLogReaderAction() {
+		super(OprofileUiMessages.getString("view.actions.logreader.label")); //$NON-NLS-1$
+	}
+	
+	@Override
+	public void run() {
+		Shell activeShell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+		LogReader log = new LogReader();
+		
+		try {
+			new ProgressMonitorDialog(activeShell).run(true, false, log);
+		} catch (InvocationTargetException e) {
+			e.printStackTrace();
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	    
+		//open custom log dialog
+	    OprofiledLogDialog odlg = new OprofiledLogDialog(activeShell, log.getLogContents());
+	    odlg.open();
+	}
+}
+
+/**
+ * A Runnable to read oprofiled's logfile 
+ */
+class LogReader implements Runnable, IRunnableWithProgress {
+	private static long _lastModified = -1;
+	private static String _contents = null;
+
+	public void run() {
+		File logFile = new File(Oprofile.getLogFile());
+		long modified = logFile.lastModified();
+		
+		//only reread it if it has been modified since the last run
+		if (modified != _lastModified) {
+			_lastModified = modified;
+			_contents = new String();
+			
+			try {
+				BufferedReader reader = new BufferedReader(new FileReader(logFile));
+				String line;
+				while ((line = reader.readLine()) != null) {
+					_contents += line + "\n"; //$NON-NLS-1$
+				}
+			} catch (FileNotFoundException e) {
+				// The file doesn't exist or was erased. Try again next time.
+				_contents = OprofileUiMessages.getString("oprofiled.logreader.error.fileNotFound"); //$NON-NLS-1$
+			} catch (IOException e) {
+				// Error reading log. Try again next time.
+				_lastModified = 0;
+				_contents = OprofileUiMessages.getString("oprofiled.logreader.error.io"); //$NON-NLS-1$
+			}
+		}
+	}
+	
+	public String getLogContents() {
+		return _contents;
+	}
+
+
+	public void run(IProgressMonitor monitor) throws InvocationTargetException,
+			InterruptedException {
+		this.run();
+	}
+}
+
+/**
+ * A custom dialog box to display the oprofiled log file.
+ */
+class OprofiledLogDialog extends MessageDialog {
+	//string to contain the log file
+	String textContent = null;
+	
+	final int GRID_WIDTH = 350;
+	final int GRID_HEIGHT = 400;
+	
+	public OprofiledLogDialog (Shell parentShell, String dialogMessage) {
+		super(parentShell, OprofileUiMessages.getString("oprofiled.logreader.dialog.title"), null, null, MessageDialog.NONE, new String[] { IDialogConstants.OK_LABEL }, 0); //$NON-NLS-1$
+		textContent = dialogMessage;
+	}
+	
+	@Override
+    protected Control createCustomArea(Composite parent) {
+		Composite area = new Composite(parent, 0);
+		Layout layout = new GridLayout(1, true);
+		GridData gd = new GridData(GRID_WIDTH, GRID_HEIGHT);
+		
+		area.setLayout(layout);
+		area.setLayoutData(gd);
+		
+		Text txt = new Text(area, SWT.READ_ONLY | SWT.MULTI | SWT.V_SCROLL | SWT.BORDER);
+		txt.setText(textContent);
+		txt.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		
+        return area;
+    }
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/view/OprofileViewRefreshAction.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/view/OprofileViewRefreshAction.java
new file mode 100644
index 0000000..5f554cd
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/view/OprofileViewRefreshAction.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation 
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.ui.view;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.linuxtools.oprofile.ui.OprofileUiMessages;
+import org.eclipse.linuxtools.oprofile.ui.OprofileUiPlugin;
+
+/**
+ * Refresh menu item. 
+ */
+public class OprofileViewRefreshAction extends Action {
+	public OprofileViewRefreshAction() {
+		super(OprofileUiMessages.getString("view.actions.refresh.label")); //$NON-NLS-1$
+	}
+	
+	@Override
+	public void run() {
+		OprofileUiPlugin.getDefault().getOprofileView().refreshView();
+	}
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/view/OprofileViewSaveDefaultSessionAction.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/view/OprofileViewSaveDefaultSessionAction.java
new file mode 100644
index 0000000..183c23d
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/view/OprofileViewSaveDefaultSessionAction.java
@@ -0,0 +1,127 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Kent Sebastian <ksebasti@redhat.com> - initial API and implementation 
+ *    Keith Seitz <keiths@redhat.com> - SaveSessionValidator code 
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.oprofile.ui.view;
+
+import java.io.File;
+import java.text.MessageFormat;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.window.Window;
+import org.eclipse.linuxtools.oprofile.core.OpcontrolException;
+import org.eclipse.linuxtools.oprofile.core.Oprofile;
+import org.eclipse.linuxtools.oprofile.core.OprofileCorePlugin;
+import org.eclipse.linuxtools.oprofile.ui.OprofileUiMessages;
+import org.eclipse.linuxtools.oprofile.ui.OprofileUiPlugin;
+import org.eclipse.linuxtools.oprofile.ui.model.IUiModelElement;
+import org.eclipse.linuxtools.oprofile.ui.model.UiModelError;
+import org.eclipse.linuxtools.oprofile.ui.model.UiModelRoot;
+import org.eclipse.linuxtools.oprofile.ui.model.UiModelSession;
+
+/**
+ * Menu item to save the default session. Moved from a double-click in the view
+ * on the default session for consistency (since non-default sessions can't be saved). 
+ */
+public class OprofileViewSaveDefaultSessionAction extends Action {
+	public OprofileViewSaveDefaultSessionAction() {
+		super(OprofileUiMessages.getString("view.actions.savedefaultsession.label")); //$NON-NLS-1$
+	}
+	
+	@Override
+	public void run() {
+		boolean defaultSessionExists = false;
+		UiModelRoot modelRoot = UiModelRoot.getDefault();
+		
+		if (modelRoot.hasChildren()) {
+			IUiModelElement[] events = modelRoot.getChildren();
+			for (IUiModelElement e : events) {
+				if (e instanceof UiModelError)
+					break;
+				
+				IUiModelElement[] sessions = e.getChildren();
+				for (IUiModelElement s : sessions) {
+					if (((UiModelSession)s).isDefaultSession()) {
+						defaultSessionExists = true;
+						break;
+					}
+				}
+				if (defaultSessionExists)
+					break;
+			}
+		}
+		
+		if (defaultSessionExists) {
+			//the following code was originially written by Keith Seitz
+			InputDialog dialog = new InputDialog(OprofileUiPlugin.getActiveWorkbenchShell(),
+					OprofileUiMessages.getString("savedialog.title"),    //$NON-NLS-1$
+					OprofileUiMessages.getString("savedialog.message"),    //$NON-NLS-1$
+					OprofileUiMessages.getString("savedialog.initial"),   //$NON-NLS-1$
+					new SaveSessionValidator());
+			
+			int result = dialog.open();
+			if (result == Window.OK) {
+				try {
+					OprofileCorePlugin.getDefault().getOpcontrolProvider().saveSession(dialog.getValue());
+					OprofileUiPlugin.getDefault().getOprofileView().refreshView();
+				} catch (OpcontrolException oe) {
+					OprofileCorePlugin.showErrorDialog("opcontrolProvider", oe); //$NON-NLS-1$
+				}
+			}
+		} else {
+			MessageDialog.openError(OprofileUiPlugin.getActiveWorkbenchShell(),
+					OprofileUiMessages.getString("defaultsessiondialog.nodefaultsession.title"),  //$NON-NLS-1$
+					OprofileUiMessages.getString("defaultsessiondialog.nodefaultsession.message")); //$NON-NLS-1$
+		}
+	}
+	
+	//Original author: Keith Seitz <keiths@redhat.com>
+	private class SaveSessionValidator implements IInputValidator {
+		public String isValid(String newText) {
+			// Sanity check
+			if (newText.length() == 0) {
+				return ""; //$NON-NLS-1$
+			}
+			
+			// Cannot contain invalid characters
+			int index = newText.indexOf('/');
+			if (index == -1) {
+				index = newText.indexOf('\\');
+			}
+			
+			if (index != -1) {
+				String format = OprofileUiMessages.getString("savedialog.validator.invalidChar"); //$NON-NLS-1$
+				Object[] fmtArgs = new Object[] { newText.substring(index, index + 1), newText };
+				return MessageFormat.format(format, fmtArgs);
+			}
+				
+			// Cannot contain whitespace
+			if (newText.contains(" ") || newText.contains("\t")) { //$NON-NLS-1$ //$NON-NLS-2$
+				String format = OprofileUiMessages.getString("savedialog.validator.containsWhitespace"); //$NON-NLS-1$
+				Object[] fmtArgs = new Object[] { newText };
+				return MessageFormat.format(format, fmtArgs);
+			}
+			
+			// Must not already exist (opcontrol doesn't allow it)
+			File file = new File(Oprofile.getDefaultSamplesDirectory(), newText);
+			if (file.exists()) {
+				String format = OprofileUiMessages.getString("savedialog.validator.exists"); //$NON-NLS-1$
+				Object[] fmtArgs = new Object[] { newText };
+				return MessageFormat.format(format, fmtArgs);
+			}
+
+			// Everything OK
+			return null;
+		}
+	};
+}
diff --git a/profiling/ChangeLog b/profiling/ChangeLog
deleted file mode 100644
index 64c36e4..0000000
--- a/profiling/ChangeLog
+++ /dev/null
@@ -1,75 +0,0 @@
-2009-12-21  Roland Grunberg  <rgrunber@redhat.com>
-
-	* META-INF/MANIFEST.MF: Make necessary changes for switch from JUnit 3 to JUnit 4.
-
-2009-08-11  Elliott Baron  <ebaron@redhat.com>
-
-	* META-INF/MANIFEST.MF: Bump version to 0.3.0.
-
-2009-08-10  Elliott Baron  <ebaron@redhat.com>
-
-	* META-INF/MANIFEST.MF: Remove unused package.
-	* src/org/eclipse/linuxtools/profiling/tests/AbstractTest.java: Remove code that
-	turns off indexer and corresponding assertion.
-
-2009-08-07  Andrew Overholt  <overholt@redhat.com>
-
-	* plugin.properties: Change provider from Eclipse.org to Eclipse.
-
-2009-07-30  Elliott Baron  <ebaron@redhat.com>
-
-	* src/org/eclipse/linuxtools/profiling/tests/ProfileTestsPlugin.java: Removed.
-	* src/org/eclipse/linuxtools/internal/profiling/tests/ProfileTestsPlugin.java: New file.
-	* .project: Enabled API analysis. 
-	* META-INF/MANIFEST.MF: Export internal package.
-
-2009-06-23  Elliott Baron  <ebaron@redhat.com>
-
-	* AbstractTest.java (createConfiguration): Throw CoreException.
-	(createProject): Use IndexSetupParticipant to control indexer. 
-
-2009-05-12  Elliott Baron  <ebaron@redhat.com>
-
-	* META-INF/MANIFEST.MF: New deps.
-	* AbstractTest.java (createProject): Preemptively add ManagedBuild and ScannerConfig
-	natures before project is imported for #273079.
-
-2009-04-21  Elliott Baron  <ebaron@redhat.com>
-
-	* META-INF/MANIFEST.MF: Added new deps for controlling Indexer.
-	* AbstractTest.java (createProject): Turn off workspace building,
-	turn off indexer while creating.
-	(createProjectAndBuild): Make protected.
-	(buildProject): Build type from INCREMENTAL to FULL. Make protected.
-
-2009-04-07  Elliott Baron  <ebaron@redhat.com>
-
-	* AbstractTest.java (deleteProject): Wrap this in a IWorkspaceRunnable.
-
-2009-04-03  Elliott Baron  <ebaron@redhat.com>
-
-	* Messages.java: New file.
-	* messages.properties: New file.
-	* AbstractTest.java (createConfiguration): If binary not found,
-	fail with informative error.
-	(buildProject): Refresh workspace in IWorkspaceRunnable.
-	* AbstractTest.java (createProject): Refactored "Debug".
-	(createConfiguration): Use job with buildRule, taken from ManagedBuilder tests.
-	* META-INF/MANIFEST.MF: 0.2.0 version.	
-
-2009-03-18  Elliott Baron  <ebaron@redhat.com>
-
-	* AbstractTest.java (createProject): Split into creation and building.
-	(createProjectAndBuild): Renamed from createProject.
-	(buildProject): New method.
-
-2009-02-03  Elliott Baron  <ebaron@redhat.com>
-
-	* LaunchConfigTabTest: Removed for now.
-	* META-INF/MANIFEST.MF: Require-Bundle for JUnit < 4.0.0
-
-2009-01-05  Elliott Baron  <ebaron@redhat.com>
-
-	* META-INF/MANIFEST.MF: Changed version to 0.1.0.
-	* build.properties: Include about.html and icons.
-	* about.html: Added.
\ No newline at end of file
diff --git a/profiling/META-INF/MANIFEST.MF b/profiling/META-INF/MANIFEST.MF
deleted file mode 100644
index 223e8e8..0000000
--- a/profiling/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.linuxtools.profiling.tests
-Bundle-Version: 0.3.0.qualifier
-Bundle-Activator: org.eclipse.linuxtools.internal.profiling.tests.ProfileTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.junit;bundle-version="4.7.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Bundle-Localization: plugin
-Export-Package: org.eclipse.linuxtools.internal.profiling.tests,
- org.eclipse.linuxtools.profiling.tests
-Import-Package: org.eclipse.cdt.build.core.scannerconfig,
- org.eclipse.cdt.core,
- org.eclipse.cdt.core.index,
- org.eclipse.cdt.core.model,
- org.eclipse.cdt.core.testplugin,
- org.eclipse.cdt.debug.core,
- org.eclipse.cdt.managedbuilder.core,
- org.eclipse.core.resources,
- org.eclipse.debug.core,
- org.eclipse.debug.ui,
- org.eclipse.ui.actions,
- org.eclipse.ui.wizards.datatransfer
diff --git a/profiling/org.eclipse.linuxtools.profiling-feature/.project b/profiling/org.eclipse.linuxtools.profiling-feature/.project
new file mode 100644
index 0000000..74683e7
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling-feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.profiling-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/profiling/org.eclipse.linuxtools.profiling-feature/ChangeLog b/profiling/org.eclipse.linuxtools.profiling-feature/ChangeLog
new file mode 100644
index 0000000..0ae9da4
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling-feature/ChangeLog
@@ -0,0 +1,55 @@
+2009-08-11  Elliott Baron  <ebaron@redhat.com>
+
+	* feature.xml: Remove redundant feature dependencies, set CDT version >= 6.0.0.
+	Bump version to 0.3.0.
+
+2009-05-28  Elliott Baron  <ebaron@redhat.com>
+
+	* feature.properties: Fix featureProvider key.
+
+2009-05-20  Elliott Baron  <ebaron@redhat.com>
+
+	* feature.xml: Remove '.feature' from feature ID.
+
+2009-05-19  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.properties: Change provider from Eclipse.org to Eclipse.
+
+2009-04-23  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Remove 5.0.0.qualifier versions on CDT dependencies.
+
+2009-04-03  Elliott Baron  <ebaron@redhat.com>
+
+	* feature.xml: 0.2.0 version.
+
+2009-01-14  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Re-add update site information (sorry).
+
+2009-01-14  Elliott Baron  <ebaron@redhat.com>
+
+	* feature.xml: Removed update site information.
+
+2009-01-08  Elliott Baron  <ebaron@redhat.com>
+
+	* feature.xml: Added CDT features to required features.
+
+2009-01-06  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Add update site information.  Remove Linux requirement.
+
+2008-12-16  Elliott Baron  <ebaron@redhat.com>
+
+	* feature.xml: Added dependencies and Linux requirement.
+
+2008-12-10  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Typo in feature ID.
+
+2008-12-10  Andrew Overholt  <overholt@redhat.com>
+
+	* build.properties: Inital checkin.
+	* feature.xml: Likewise.
+	* feature.properties: Likewise.
+	* epl-v10.html: Likewise.
\ No newline at end of file
diff --git a/profiling/org.eclipse.linuxtools.profiling-feature/build.properties b/profiling/org.eclipse.linuxtools.profiling-feature/build.properties
new file mode 100644
index 0000000..0c6ef87
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling-feature/build.properties
@@ -0,0 +1,3 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/docs/epl-v10.html b/profiling/org.eclipse.linuxtools.profiling-feature/epl-v10.html
similarity index 100%
copy from systemtap/SystemTapGuiServer/systemtapguiserver-1.0/docs/epl-v10.html
copy to profiling/org.eclipse.linuxtools.profiling-feature/epl-v10.html
diff --git a/profiling/org.eclipse.linuxtools.profiling-feature/feature.properties b/profiling/org.eclipse.linuxtools.profiling-feature/feature.properties
new file mode 100644
index 0000000..c7fd9c7
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling-feature/feature.properties
@@ -0,0 +1,112 @@
+#*******************************************************************************
+# Copyright (c) 2008 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Red Hat, Inc. - initial API and implementation
+#********************************************************************************
+featureName=Profile Framework (Incubation)
+description=Plugins common to profiling tools.
+featureProvider=Eclipse
+copyright=Copyright 2008 Red Hat, Inc.
+licenseURL=epl-v10.html
+license=\
+ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
+March 17, 2005\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse.org CVS\n\
+repository ("Repository") in CVS modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+Features may also include other Features ("Included Features"). Files named\n\
+"feature.xml" may contain a list of the names and version numbers of\n\
+Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+   - The top-level (root) directory\n\
+   - Plug-in and Fragment directories\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
+   - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Eclipse Update Manager, you must agree to a license ("Feature Update\n\
+License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties". Such Abouts,\n\
+Feature Licenses and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
+    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
\ No newline at end of file
diff --git a/profiling/org.eclipse.linuxtools.profiling-feature/feature.xml b/profiling/org.eclipse.linuxtools.profiling-feature/feature.xml
new file mode 100644
index 0000000..0db15dd
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling-feature/feature.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.linuxtools.profiling"
+      label="%featureName"
+      version="0.3.0.qualifier"
+      provider-name="%featureProvider">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <url>
+      <update label="Linux Tools Update Site" url="http://download.eclipse.org/technology/linuxtools/update"/>
+   </url>
+
+   <requires>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.core.filesystem"/>
+      <import plugin="org.eclipse.debug.ui"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.editors"/>
+      <import plugin="org.eclipse.cdt.core"/>
+      <import plugin="org.eclipse.cdt.debug.core"/>
+      <import plugin="org.eclipse.cdt.launch"/>
+      <import plugin="org.eclipse.cdt.ui"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.debug.core"/>
+      <import feature="org.eclipse.cdt" version="6.0.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.linuxtools.profiling.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.profiling.launch"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/profiling/.classpath b/profiling/org.eclipse.linuxtools.profiling.launch/.classpath
similarity index 100%
rename from profiling/.classpath
rename to profiling/org.eclipse.linuxtools.profiling.launch/.classpath
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/.project b/profiling/org.eclipse.linuxtools.profiling.launch/.project
new file mode 100644
index 0000000..a1c9f00
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.profiling.launch</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+	</natures>
+</projectDescription>
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.profiling.launch/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..03c28b0
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Wed Oct 22 16:33:22 EDT 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/.svnignore b/profiling/org.eclipse.linuxtools.profiling.launch/.svnignore
new file mode 100644
index 0000000..ba077a4
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/.svnignore
@@ -0,0 +1 @@
+bin
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/ChangeLog b/profiling/org.eclipse.linuxtools.profiling.launch/ChangeLog
new file mode 100644
index 0000000..6198395
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/ChangeLog
@@ -0,0 +1,55 @@
+2009-12-08  Roland Grunberg  <rgrunber@redhat.com>
+
+	* src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchConfigurationDelegate.java:
+		Get rid of error checking for (createProcess) since subprocess cannot be null as long as initial command is 'exec'.
+
+2009-12-08  Charley Wang  <chwang@redhat.com>
+
+	* src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchConfigurationDelegate.java: Change delegate to launch by creating a temporary shell script, rather than launch directly.
+	Make generateCommand public
+	Do not setExecutable.
+
+2009-12-06  rgrunber  <rgrunber@redhat.com>
+
+	* src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchConfigurationDelegate.java 
+		(createProcess): Return null when a process fails to execute and let user decide action to take.
+
+2009-11-26  Charley Wang  <chwang@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add org.eclipse.cdt.core, which seems needed with some versions and not with others.
+	* src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchConfigurationDelegate.java: Add generateCommand abstract function for command generation. This is called by createProcess()
+
+2009-11-23  Charley Wang  <chwang@redhat.com>
+
+	* src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchConfigurationTab.java: Add (Currently empty) ProfileLaunchConfigurationTab
+	* src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchShortcut.java: Improve documentation on abstract functions
+	* src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchConfigurationDelegate.java: Add ProfileLaunchConfigurationDelegate. This class contains functions that Roland and I had difficulty with when we were creating the SystemTap plugin, namely the creation and reading of a process. 
+
+2009-08-11  Elliott Baron  <ebaron@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump version to 0.3.0.
+
+2009-08-07  Andrew Overholt  <overholt@redhat.com>
+
+	* plugin.properties: Change provider from Eclipse.org to Eclipse.
+
+2009-07-30  Elliott Baron  <ebaron@redhat.com>
+
+	* src/org/eclipse/linuxtools/profiling/launch/Messages.java: Removed.
+	* src/org/eclipse/linuxtools/profiling/launch/messages.properties: Removed.
+	* src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchPlugin.java: Removed.
+	* src/org/eclipse/linuxtools/internal/profiling/launch/Messages.java: New file.
+	* src/org/eclipse/linuxtools/internal/profiling/launch/messages.properties: New file.
+	* src/org/eclipse/linuxtools/internal/profiling/launch/ProfileLaunchPlugin.java: New file.
+	* .project: Enabled API analysis.
+	* META-INF/MANIFEST.MF: Export internal package.
+	* src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchShortcut.java (findLaunchConfiguration): Replace deprecated method calls. 
+
+2009-04-03  Elliott Baron  <ebaron@redhat.com>
+
+	* META-INF/MANIFEST.MF: 0.2.0 version.
+
+2009-01-05  Elliott Baron  <ebaron@redhat.com>
+
+	* META-INF/MANIFEST.MF: Changed version to 0.1.0.
+	* build.properties: Include about.html.
\ No newline at end of file
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.profiling.launch/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..6467005
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/META-INF/MANIFEST.MF
@@ -0,0 +1,29 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name.0
+Bundle-SymbolicName: org.eclipse.linuxtools.profiling.launch;singleton:=true
+Bundle-Version: 0.3.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.internal.profiling.launch.ProfileLaunchPlugin
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.cdt.core
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Import-Package: org.eclipse.cdt.core.model,
+ org.eclipse.cdt.debug.core,
+ org.eclipse.cdt.launch,
+ org.eclipse.cdt.launch.ui,
+ org.eclipse.cdt.ui,
+ org.eclipse.cdt.utils.pty,
+ org.eclipse.cdt.utils.spawner,
+ org.eclipse.core.resources,
+ org.eclipse.debug.core,
+ org.eclipse.debug.core.model,
+ org.eclipse.debug.ui,
+ org.eclipse.debug.ui.sourcelookup,
+ org.eclipse.jface.text,
+ org.eclipse.ui.console
+Export-Package: org.eclipse.linuxtools.internal.profiling.launch,
+ org.eclipse.linuxtools.profiling.launch
+Bundle-Localization: plugin
+Bundle-Vendor: %Bundle-Vendor.0
diff --git a/profiling/about.html b/profiling/org.eclipse.linuxtools.profiling.launch/about.html
similarity index 100%
rename from profiling/about.html
rename to profiling/org.eclipse.linuxtools.profiling.launch/about.html
diff --git a/profiling/build.properties b/profiling/org.eclipse.linuxtools.profiling.launch/build.properties
similarity index 100%
rename from profiling/build.properties
rename to profiling/org.eclipse.linuxtools.profiling.launch/build.properties
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/plugin.properties b/profiling/org.eclipse.linuxtools.profiling.launch/plugin.properties
new file mode 100644
index 0000000..1815f55
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/plugin.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.linuxtools.profiling.launch
+Bundle-Vendor.0 = Eclipse
+Bundle-Name.0 = Profiling Launch Plug-in (Incubation)
\ No newline at end of file
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/Messages.java b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/Messages.java
new file mode 100644
index 0000000..aa6ecf5
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/Messages.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Elliott Baron <ebaron@redhat.com> - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.internal.profiling.launch;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class Messages {
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.profiling.launch.messages"; //$NON-NLS-1$
+
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
+			.getBundle(BUNDLE_NAME);
+
+	private Messages() {
+	}
+
+	public static String getString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+}
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/ProfileLaunchPlugin.java b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/ProfileLaunchPlugin.java
new file mode 100644
index 0000000..6f09a80
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/ProfileLaunchPlugin.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Elliott Baron <ebaron@redhat.com> - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.internal.profiling.launch;
+
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+public class ProfileLaunchPlugin extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.profiling.launch"; //$NON-NLS-1$
+
+	// The shared instance
+	private static ProfileLaunchPlugin plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public ProfileLaunchPlugin() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static ProfileLaunchPlugin getDefault() {
+		return plugin;
+	}
+
+	public static Shell getActiveWorkbenchShell() {
+		return getDefault().getWorkbench().getActiveWorkbenchWindow().getShell();
+	}
+
+}
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/messages.properties b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/messages.properties
new file mode 100644
index 0000000..d4451f2
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/messages.properties
@@ -0,0 +1,10 @@
+ProfileLaunchShortcut.Binaries=Binaries:
+ProfileLaunchShortcut.Binary_not_found=Launch failed. Binary not found.
+ProfileLaunchShortcut.Choose_a_launch_configuration=Choose a launch configuration to profile
+ProfileLaunchShortcut.Choose_a_local_application=Choose a local application to profile
+ProfileLaunchShortcut.Launch_Configuration_Selection=Launch Configuration Selection
+ProfileLaunchShortcut.Looking_for_executables=Looking for executables
+ProfileLaunchShortcut.no_project_selected=Launch failed no project selected
+ProfileLaunchShortcut.Profile=Profile
+ProfileLaunchShortcut.Qualifier=Qualifer:
+ProfileLaunchShortcut.Launcher=Profiling Launcher
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchConfigurationDelegate.java b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchConfigurationDelegate.java
new file mode 100644
index 0000000..6f19915
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchConfigurationDelegate.java
@@ -0,0 +1,205 @@
+package org.eclipse.linuxtools.profiling.launch;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+
+import org.eclipse.cdt.launch.AbstractCLaunchDelegate;
+import org.eclipse.cdt.utils.pty.PTY;
+import org.eclipse.cdt.utils.spawner.ProcessFactory;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.ILaunch;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.model.IProcess;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.ui.console.ConsolePlugin;
+import org.eclipse.ui.console.TextConsole;
+
+/**
+ * Helper class for launching command line tools. Contains methods for creating a process and
+ * one method for fetching from the console. 
+ * 
+ * 
+ * @author chwang
+ *
+ */
+public abstract class ProfileLaunchConfigurationDelegate extends AbstractCLaunchDelegate{
+
+	/**
+	 * Deletes and recreates the file at outputPath
+	 * 
+	 * @param outputPath
+	 * @return false if there is an IOException
+	 */
+	protected boolean testOutput(String outputPath) {
+		try {
+			//Make sure the output file exists
+			File tempFile = new File(outputPath);
+			tempFile.delete();
+			tempFile.createNewFile();
+		} catch (IOException e1) {
+			return false;
+		}
+		return true;
+	}
+	
+	/**
+	 * This method will create a process in the command line with I/O directed to the Eclipse console.
+	 * It returns a reference to the process. Note that the process runs independently of Eclipse's threads,
+	 * so you will have to poll the process to determine when it has terminated. To grab output from the 
+	 * process, either attach a <code>org.eclipse.debug.core.model.IStreamMonitor</code> to one of the monitors
+	 * in <code>process.getStreamsProxy()</code>, or use the static get methods in 
+	 * <code>ProfileLaunchConfigurationDelegate</code>.
+	 * 
+	 * <br>
+	 * Will call generateCommand(config) to create the command line.
+	 * 
+	 * 
+	 * @param config -- Use the configuration passed as a parameter to the launch method.
+	 * @param cmd -- Command string, as it would appear on the command line.
+	 * @param launch -- use the launch passed as a parameter to the launch method.
+	 * @return
+	 * @throws CoreException
+	 * @throws IOException
+	 */
+
+	protected IProcess createProcess(ILaunchConfiguration config, ILaunch launch) throws CoreException, IOException {
+		File workDir = getWorkingDirectory(config);
+		if (workDir == null) {
+			workDir = new File(System.getProperty("user.home", ".")); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+
+		//Put command into a shell script
+		String cmd = generateCommand(config);
+		File script = File.createTempFile("org.eclipse.linuxtools.profiling.launch" + System.currentTimeMillis(), ".sh");
+		String data = "#!/bin/sh\nexec " + cmd; //$NON-NLS-1$
+		FileOutputStream out = new FileOutputStream(script);
+		out.write(data.getBytes());
+		
+		String[] commandArray = prepareCommand("sh " + script.getAbsolutePath());
+		Process subProcess = execute(commandArray, getEnvironment(config),
+				workDir, true);
+		
+		IProcess process = createNewProcess(launch, subProcess,commandArray[0]);
+		// set the command line used
+		process.setAttribute(IProcess.ATTR_CMDLINE,cmd);
+		
+		return process;
+	}
+	
+	/**
+	 * Use to generate the command. 
+	 * @param config
+	 * @return The command string, as it would appear on command-line
+	 */
+	public abstract String generateCommand(ILaunchConfiguration config);
+	
+
+	/** 
+	 * Prepare cmd for execution - we need a command array of strings,
+ 	 * no string can contain a space character. The resulting command
+ 	 * array will be passed in to the process.
+	 */
+	protected String[] prepareCommand(String cmd) {
+		String tmp[] = cmd.split(" "); //$NON-NLS-1$
+		ArrayList<String> cmdLine = new ArrayList<String>();
+		for (String str : tmp) {
+			cmdLine.add(str);
+		}
+		return (String[]) cmdLine.toArray(new String[cmdLine.size()]);
+	}
+	
+	
+	/**
+	 * Executes a command array using pty
+	 * 
+	 * @param commandArray -- Split a command string on the ' ' character
+	 * @param env -- Use <code>getEnvironment(ILaunchConfiguration)</code> in the AbstractCLaunchDelegate.
+	 * @param wd -- Working directory
+	 * @param usePty -- A value of 'true' usually suffices
+	 * @return A properly formed process, or null
+	 * @throws IOException -- If the process cannot be created
+	 */
+	public Process execute(String[] commandArray, String[] env, File wd,
+			boolean usePty) throws IOException {
+		Process process = null;
+		try {
+			if (wd == null) {
+				process = ProcessFactory.getFactory().exec(commandArray, env);
+			} else {
+				if (PTY.isSupported() && usePty) {
+					process = ProcessFactory.getFactory().exec(commandArray,
+							env, wd, new PTY());
+				} else {
+					process = ProcessFactory.getFactory().exec(commandArray,
+							env, wd);
+				}
+			}
+		} catch (IOException e) {
+			if (process != null) {
+				process.destroy();
+			}
+			return null;
+		}
+		return process;
+	}
+	
+
+
+	/**
+	 * Spawn a new IProcess using the Debug Plugin.
+	 * 
+	 * @param launch
+	 * @param systemProcess
+	 * @param programName
+	 * @return
+	 */
+	protected IProcess createNewProcess(ILaunch launch, Process systemProcess,
+			String programName) {
+		return DebugPlugin.newProcess(launch, systemProcess,
+				renderProcessLabel(programName));
+	}
+	
+	
+
+	/**
+	 * 
+	 * @param search : A String that can be found in the console
+	 * @return The TextConsole having 'name' somewhere within it's name
+	 */
+	public static TextConsole getConsole(String search) {
+		for (int i = 0; i < ConsolePlugin.getDefault().getConsoleManager()
+				.getConsoles().length; i++) {
+			if (ConsolePlugin.getDefault().getConsoleManager().
+					getConsoles()[i].getName().contains(search)) {
+				return (TextConsole)ConsolePlugin.getDefault().getConsoleManager().getConsoles()[i];
+			}
+		}
+		return null;
+	}
+
+	
+	/**
+	 * Returns the contents of a console as a String
+	 * 
+	 * @param search : Console name
+	 * @return The text contained within that console
+	 */
+	public static String getMainConsoleText(String search){
+		TextConsole proc = (TextConsole) getConsole(search);
+		return ((IDocument)proc.getDocument()).get();
+	}
+	
+	/**
+	 * Return the document attached to containing the given string. For best results,
+	 * use <code>ILaunchConfiguration.getName()</code>.
+	 * @param search
+	 * @return
+	 */
+	public static IDocument getConsoleDocument(String search) {
+		return ((TextConsole)getConsole(search)).getDocument();
+	}
+	
+}
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchConfigurationTab.java b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchConfigurationTab.java
new file mode 100644
index 0000000..7b6bce8
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchConfigurationTab.java
@@ -0,0 +1,7 @@
+package org.eclipse.linuxtools.profiling.launch;
+
+import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
+
+public abstract class ProfileLaunchConfigurationTab extends AbstractLaunchConfigurationTab{
+
+}
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchConfigurationTabGroup.java b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchConfigurationTabGroup.java
new file mode 100644
index 0000000..bf117d1
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchConfigurationTabGroup.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Elliott Baron <ebaron@redhat.com> - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.linuxtools.profiling.launch;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import org.eclipse.cdt.launch.ui.CArgumentsTab;
+import org.eclipse.cdt.launch.ui.CMainTab;
+import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
+import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
+import org.eclipse.debug.ui.CommonTab;
+import org.eclipse.debug.ui.EnvironmentTab;
+import org.eclipse.debug.ui.ILaunchConfigurationDialog;
+import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
+
+public abstract class ProfileLaunchConfigurationTabGroup extends AbstractLaunchConfigurationTabGroup {
+
+	public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
+		ArrayList<AbstractLaunchConfigurationTab> tabs = new ArrayList<AbstractLaunchConfigurationTab>();
+		tabs.add(new CMainTab());
+		tabs.add(new CArgumentsTab());
+		
+		tabs.addAll(Arrays.asList(getProfileTabs()));
+		
+		tabs.add(new EnvironmentTab());
+		tabs.add(new SourceLookupTab());
+		tabs.add(new CommonTab());
+		
+		setTabs(tabs.toArray(new AbstractLaunchConfigurationTab[tabs.size()]));
+	}
+	
+	public abstract AbstractLaunchConfigurationTab[] getProfileTabs();
+
+}
\ No newline at end of file
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchShortcut.java b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchShortcut.java
new file mode 100644
index 0000000..9cd6ef0
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchShortcut.java
@@ -0,0 +1,302 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2007 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ * Ken Ryall (Nokia) - bug 178731
+ * Elliott Baron <ebaron@redhat.com> - Modified implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.profiling.launch;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.cdt.core.model.CModelException;
+import org.eclipse.cdt.core.model.CoreModel;
+import org.eclipse.cdt.core.model.IBinary;
+import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.cdt.debug.core.CDebugUtils;
+import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
+import org.eclipse.cdt.ui.CElementLabelProvider;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationType;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.debug.ui.DebugUITools;
+import org.eclipse.debug.ui.IDebugModelPresentation;
+import org.eclipse.debug.ui.ILaunchShortcut;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.window.Window;
+import org.eclipse.linuxtools.internal.profiling.launch.Messages;
+import org.eclipse.linuxtools.internal.profiling.launch.ProfileLaunchPlugin;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.dialogs.ElementListSelectionDialog;
+import org.eclipse.ui.dialogs.TwoPaneElementSelector;
+
+public abstract class ProfileLaunchShortcut implements ILaunchShortcut {
+
+	public void launch(IEditorPart editor, String mode) {
+		searchAndLaunch(new Object[] { editor.getEditorInput() }, mode);
+	}
+
+	public void launch(ISelection selection, String mode) {
+		if (selection instanceof IStructuredSelection) {
+			searchAndLaunch(((IStructuredSelection) selection).toArray(), mode);
+		}
+	}
+
+	public void launch(IBinary bin, String mode) {
+		ILaunchConfiguration config = findLaunchConfiguration(bin, mode);
+		if (config != null) {
+			DebugUITools.launch(config, mode);
+		}
+	}
+
+	/**
+	 * Locate a configuration to relaunch for the given type.  If one cannot be found, create one.
+	 * 
+	 * @return a re-useable config or <code>null</code> if none
+	 */
+	protected ILaunchConfiguration findLaunchConfiguration(IBinary bin, String mode) {
+		ILaunchConfiguration configuration = null;
+		ILaunchConfigurationType configType = getLaunchConfigType();
+		List<ILaunchConfiguration> candidateConfigs = Collections.emptyList();
+		try {
+			ILaunchConfiguration[] configs = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations(configType);
+			candidateConfigs = new ArrayList<ILaunchConfiguration>(configs.length);
+			for (int i = 0; i < configs.length; i++) {
+				ILaunchConfiguration config = configs[i];
+				IPath programPath = CDebugUtils.getProgramPath(config);
+				String projectName = CDebugUtils.getProjectName(config);
+				IPath binPath = bin.getResource().getProjectRelativePath();
+				if (programPath != null && programPath.equals(binPath)) {
+					if (projectName != null && projectName.equals(bin.getCProject().getProject().getName())) {
+						candidateConfigs.add(config);
+					}
+				}
+			}
+		} catch (CoreException e) {
+			e.printStackTrace();
+		}
+	
+		// If there are no existing configs associated with the IBinary, create one.
+		// If there is exactly one config associated with the IBinary, return it.
+		// Otherwise, if there is more than one config associated with the IBinary, prompt the
+		// user to choose one.
+		int candidateCount = candidateConfigs.size();
+		if (candidateCount < 1) {
+			configuration = createConfiguration(bin);
+		} else if (candidateCount == 1) {
+			configuration = (ILaunchConfiguration) candidateConfigs.get(0);
+		} else {
+			// Prompt the user to choose a config.  A null result means the user
+			// cancelled the dialog, in which case this method returns null,
+			// since cancelling the dialog should also cancel launching anything.
+			configuration = chooseConfiguration(candidateConfigs, mode);
+		}
+		return configuration;
+	}
+
+	/**
+	 * Can return <code>getLaunchManager().getLaunchConfigurationType(String ID)</code>.
+	 * This String will be used to identify your configuration type to Eclipse, and should
+	 * be unique.
+	 * 
+	 * @return
+	 */
+	protected abstract ILaunchConfigurationType getLaunchConfigType();
+	
+	protected abstract void setDefaultProfileAttributes(ILaunchConfigurationWorkingCopy wc) throws CoreException;
+
+	protected ILaunchConfiguration createConfiguration(IBinary bin) {
+		ILaunchConfiguration config = null;
+		try {
+			String projectName = bin.getResource().getProjectRelativePath().toString();
+			ILaunchConfigurationType configType = getLaunchConfigType();
+			ILaunchConfigurationWorkingCopy wc = configType.newInstance(null, getLaunchManager().generateUniqueLaunchConfigurationNameFrom(bin.getElementName()));
+	
+			wc.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, projectName);
+			wc.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, bin.getCProject().getElementName());
+			wc.setMappedResources(new IResource[] {bin.getResource(), bin.getResource().getProject()});
+			wc.setAttribute(ICDTLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, (String) null);
+	
+			setDefaultProfileAttributes(wc);
+	
+			config = wc.doSave();
+		} catch (CoreException e) {
+			e.printStackTrace();
+		}
+		return config;
+	}
+
+	protected ILaunchManager getLaunchManager() {
+		return DebugPlugin.getDefault().getLaunchManager();
+	}
+
+	/**
+	 * Method searchAndLaunch.
+	 * @param objects
+	 * @param mode
+	 */
+	private void searchAndLaunch(final Object[] elements, String mode) {
+		if (elements != null && elements.length > 0) {
+			IBinary bin = null;
+			if (elements.length == 1 && elements[0] instanceof IBinary) {
+				bin = (IBinary) elements[0];
+			} else {
+				final List<IBinary> results = new ArrayList<IBinary>();
+				ProgressMonitorDialog dialog = new ProgressMonitorDialog(getActiveWorkbenchShell());
+				IRunnableWithProgress runnable = new IRunnableWithProgress() {
+					public void run(IProgressMonitor pm) throws InterruptedException {
+						int nElements = elements.length;
+						pm.beginTask(Messages.getString("ProfileLaunchShortcut.Looking_for_executables"), nElements); //$NON-NLS-1$
+						try {
+							IProgressMonitor sub = new SubProgressMonitor(pm, 1);
+							for (int i = 0; i < nElements; i++) {
+								if (elements[i] instanceof IAdaptable) {
+									IResource r = (IResource) ((IAdaptable) elements[i]).getAdapter(IResource.class);
+									if (r != null) {
+										ICProject cproject = CoreModel.getDefault().create(r.getProject());
+										if (cproject != null) {
+											try {
+												IBinary[] bins = cproject.getBinaryContainer().getBinaries();
+	
+												for (int j = 0; j < bins.length; j++) {
+													if (bins[j].isExecutable()) {
+														results.add(bins[j]);
+													}
+												}
+											} catch (CModelException e) {
+											}
+										}
+									}
+								}
+								if (pm.isCanceled()) {
+									throw new InterruptedException();
+								}
+								sub.done();
+							}
+						} finally {
+							pm.done();
+						}
+					}
+				};
+				try {
+					dialog.run(true, true, runnable);
+				} catch (InterruptedException e) {
+					return;
+				} catch (InvocationTargetException e) {
+					handleFail(e.getMessage());
+					return;
+				}
+				int count = results.size();
+				if (count == 0) {					
+					handleFail(Messages.getString("ProfileLaunchShortcut.Binary_not_found")); //$NON-NLS-1$
+				} else if (count > 1) {
+					bin = chooseBinary(results, mode);
+				} else {
+					bin = (IBinary)results.get(0);
+				}
+			}
+			if (bin != null) {
+				launch(bin, mode);
+			}
+		} else {
+			handleFail(Messages.getString("ProfileLaunchShortcut.no_project_selected")); //$NON-NLS-1$
+		}
+	}
+
+	protected void handleFail(String message) {
+		MessageDialog.openError(getActiveWorkbenchShell(), Messages.getString("ProfileLaunchShortcut.Launcher"), message); //$NON-NLS-1$
+	}
+
+	/**
+	 * Prompts the user to select a  binary
+	 * 
+	 * @return the selected binary or <code>null</code> if none.
+	 */
+	protected IBinary chooseBinary(List<IBinary> binList, String mode) {
+		ILabelProvider programLabelProvider = new CElementLabelProvider() {
+			public String getText(Object element) {
+				if (element instanceof IBinary) {
+					IBinary bin = (IBinary)element;
+					StringBuffer name = new StringBuffer();
+					name.append(bin.getPath().lastSegment());
+					return name.toString();
+				}
+				return super.getText(element);
+			}
+		};
+	
+		ILabelProvider qualifierLabelProvider = new CElementLabelProvider() {
+			public String getText(Object element) {
+				if (element instanceof IBinary) {
+					IBinary bin = (IBinary)element;
+					StringBuffer name = new StringBuffer();
+					name.append(bin.getCPU() + (bin.isLittleEndian() ? "le" : "be")); //$NON-NLS-1$ //$NON-NLS-2$
+					name.append(" - "); //$NON-NLS-1$
+					name.append(bin.getPath().toString());
+					return name.toString();
+				}
+				return super.getText(element);
+			}
+		};
+	
+		TwoPaneElementSelector dialog = new TwoPaneElementSelector(getActiveWorkbenchShell(), programLabelProvider, qualifierLabelProvider);
+		dialog.setElements(binList.toArray());
+		dialog.setTitle(Messages.getString("ProfileLaunchShortcut.Profile")); //$NON-NLS-1$
+		dialog.setMessage(Messages.getString("ProfileLaunchShortcut.Choose_a_local_application")); //$NON-NLS-1$
+		dialog.setUpperListLabel(Messages.getString("ProfileLaunchShortcut.Binaries")); //$NON-NLS-1$
+		dialog.setLowerListLabel(Messages.getString("ProfileLaunchShortcut.Qualifier")); //$NON-NLS-1$
+		dialog.setMultipleSelection(false);
+		if (dialog.open() == Window.OK) {
+			return (IBinary) dialog.getFirstResult();
+		}
+	
+		return null;
+	}
+
+	/**
+	 * Show a selection dialog that allows the user to choose one of the specified
+	 * launch configurations.  Return the chosen config, or <code>null</code> if the
+	 * user cancelled the dialog.
+	 */
+	protected ILaunchConfiguration chooseConfiguration(List<ILaunchConfiguration> configList, String mode) {
+		IDebugModelPresentation labelProvider = DebugUITools.newDebugModelPresentation();
+		ElementListSelectionDialog dialog = new ElementListSelectionDialog(getActiveWorkbenchShell(), labelProvider);
+		dialog.setElements(configList.toArray());
+		dialog.setTitle(Messages.getString("ProfileLaunchShortcut.Launch_Configuration_Selection"));  //$NON-NLS-1$
+		dialog.setMessage(Messages.getString("ProfileLaunchShortcut.Choose_a_launch_configuration"));  //$NON-NLS-1$
+		dialog.setMultipleSelection(false);
+		int result = dialog.open();
+		labelProvider.dispose();
+		if (result == Window.OK) {
+			return (ILaunchConfiguration) dialog.getFirstResult();
+		}
+		return null;
+	}
+
+	protected Shell getActiveWorkbenchShell() {
+		return ProfileLaunchPlugin.getActiveWorkbenchShell();
+	}
+
+}
\ No newline at end of file
diff --git a/profiling/org.eclipse.linuxtools.profiling.test-feature/.project b/profiling/org.eclipse.linuxtools.profiling.test-feature/.project
new file mode 100644
index 0000000..537d5a8
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.test-feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.profiling.test-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/profiling/org.eclipse.linuxtools.profiling.test-feature/ChangeLog b/profiling/org.eclipse.linuxtools.profiling.test-feature/ChangeLog
new file mode 100644
index 0000000..3ce01f8
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.test-feature/ChangeLog
@@ -0,0 +1,43 @@
+2009-08-11  Elliott Baron  <ebaron@redhat.com>
+
+	* feature.xml: Bump version to 0.3.0.
+
+2009-07-30  Elliott Baron  <ebaron@redhat.com>
+
+	* feature.xml: Recomputed dependencies.
+
+2009-05-28  Elliott Baron  <ebaron@redhat.com>
+
+	* feature.properties: Fix featureProvider key.
+
+2009-05-20  Elliott Baron  <ebaron@redhat.com>
+
+	* feature.xml: Remove '.feature' from feature ID.
+	
+2009-05-19  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.properties: Change provider from Eclipse.org to Eclipse.
+
+2009-04-03  Elliott Baron  <ebaron@redhat.com>
+
+	* feature.xml: 0.2.0 version.
+	
+2009-02-12  Elliott Baron  <ebaron@redhat.com>
+
+	* feature.xml: Updated dependencies org.junit4 -> org.junit
+
+2008-12-16  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: See if we can get the valgrind tests to find this plugin if it's
+	jarred.
+
+2008-12-16  Elliott Baron  <ebaron@redhat.com>
+
+	* feature.xml: Fixed feature ID.
+
+2008-12-16  Elliott Baron  <ebaron@redhat.com>
+
+	* build.properties: Inital checkin.
+	* feature.xml: Likewise.
+	* feature.properties: Likewise.
+	* epl-v10.html: Likewise.
\ No newline at end of file
diff --git a/profiling/org.eclipse.linuxtools.profiling.test-feature/build.properties b/profiling/org.eclipse.linuxtools.profiling.test-feature/build.properties
new file mode 100644
index 0000000..0c6ef87
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.test-feature/build.properties
@@ -0,0 +1,3 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/docs/epl-v10.html b/profiling/org.eclipse.linuxtools.profiling.test-feature/epl-v10.html
similarity index 100%
copy from systemtap/SystemTapGuiServer/systemtapguiserver-1.0/docs/epl-v10.html
copy to profiling/org.eclipse.linuxtools.profiling.test-feature/epl-v10.html
diff --git a/profiling/org.eclipse.linuxtools.profiling.test-feature/feature.properties b/profiling/org.eclipse.linuxtools.profiling.test-feature/feature.properties
new file mode 100644
index 0000000..d24dbdc
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.test-feature/feature.properties
@@ -0,0 +1,112 @@
+#*******************************************************************************
+# Copyright (c) 2008 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Red Hat, Inc. - initial API and implementation
+#********************************************************************************
+featureName=Profile Testing Framework (Incubation)
+description=Test plugins common to profiling tools.
+featureProvider=Eclipse
+copyright=Copyright 2008 Red Hat, Inc.
+licenseURL=epl-v10.html
+license=\
+ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
+March 17, 2005\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse.org CVS\n\
+repository ("Repository") in CVS modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+Features may also include other Features ("Included Features"). Files named\n\
+"feature.xml" may contain a list of the names and version numbers of\n\
+Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+   - The top-level (root) directory\n\
+   - Plug-in and Fragment directories\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
+   - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Eclipse Update Manager, you must agree to a license ("Feature Update\n\
+License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties". Such Abouts,\n\
+Feature Licenses and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
+    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
\ No newline at end of file
diff --git a/profiling/org.eclipse.linuxtools.profiling.test-feature/feature.xml b/profiling/org.eclipse.linuxtools.profiling.test-feature/feature.xml
new file mode 100644
index 0000000..17fb135
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.test-feature/feature.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.linuxtools.profiling.test"
+      label="%featureName"
+      version="0.3.0.qualifier"
+      provider-name="%featureProvider">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <requires>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.junit" version="0.0.0"/>
+      <import plugin="org.eclipse.cdt.managedbuilder.core"/>
+      <import plugin="org.eclipse.cdt.core"/>
+      <import plugin="org.eclipse.cdt.core.tests"/>
+      <import plugin="org.eclipse.cdt.debug.core"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.debug.core"/>
+      <import plugin="org.eclipse.debug.ui"/>
+      <import plugin="org.eclipse.ui.ide"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.linuxtools.profiling.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/profiling/.classpath b/profiling/org.eclipse.linuxtools.profiling.tests/.classpath
similarity index 100%
copy from profiling/.classpath
copy to profiling/org.eclipse.linuxtools.profiling.tests/.classpath
diff --git a/profiling/.project b/profiling/org.eclipse.linuxtools.profiling.tests/.project
similarity index 100%
rename from profiling/.project
rename to profiling/org.eclipse.linuxtools.profiling.tests/.project
diff --git a/profiling/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.profiling.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from profiling/.settings/org.eclipse.jdt.core.prefs
rename to profiling/org.eclipse.linuxtools.profiling.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/profiling/org.eclipse.linuxtools.profiling.tests/ChangeLog b/profiling/org.eclipse.linuxtools.profiling.tests/ChangeLog
new file mode 100644
index 0000000..e314ee7
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.tests/ChangeLog
@@ -0,0 +1,71 @@
+2009-08-11  Elliott Baron  <ebaron@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump version to 0.3.0.
+
+2009-08-10  Elliott Baron  <ebaron@redhat.com>
+
+	* META-INF/MANIFEST.MF: Remove unused package.
+	* src/org/eclipse/linuxtools/profiling/tests/AbstractTest.java: Remove code that
+	turns off indexer and corresponding assertion.
+
+2009-08-07  Andrew Overholt  <overholt@redhat.com>
+
+	* plugin.properties: Change provider from Eclipse.org to Eclipse.
+
+2009-07-30  Elliott Baron  <ebaron@redhat.com>
+
+	* src/org/eclipse/linuxtools/profiling/tests/ProfileTestsPlugin.java: Removed.
+	* src/org/eclipse/linuxtools/internal/profiling/tests/ProfileTestsPlugin.java: New file.
+	* .project: Enabled API analysis. 
+	* META-INF/MANIFEST.MF: Export internal package.
+
+2009-06-23  Elliott Baron  <ebaron@redhat.com>
+
+	* AbstractTest.java (createConfiguration): Throw CoreException.
+	(createProject): Use IndexSetupParticipant to control indexer. 
+
+2009-05-12  Elliott Baron  <ebaron@redhat.com>
+
+	* META-INF/MANIFEST.MF: New deps.
+	* AbstractTest.java (createProject): Preemptively add ManagedBuild and ScannerConfig
+	natures before project is imported for #273079.
+
+2009-04-21  Elliott Baron  <ebaron@redhat.com>
+
+	* META-INF/MANIFEST.MF: Added new deps for controlling Indexer.
+	* AbstractTest.java (createProject): Turn off workspace building,
+	turn off indexer while creating.
+	(createProjectAndBuild): Make protected.
+	(buildProject): Build type from INCREMENTAL to FULL. Make protected.
+
+2009-04-07  Elliott Baron  <ebaron@redhat.com>
+
+	* AbstractTest.java (deleteProject): Wrap this in a IWorkspaceRunnable.
+
+2009-04-03  Elliott Baron  <ebaron@redhat.com>
+
+	* Messages.java: New file.
+	* messages.properties: New file.
+	* AbstractTest.java (createConfiguration): If binary not found,
+	fail with informative error.
+	(buildProject): Refresh workspace in IWorkspaceRunnable.
+	* AbstractTest.java (createProject): Refactored "Debug".
+	(createConfiguration): Use job with buildRule, taken from ManagedBuilder tests.
+	* META-INF/MANIFEST.MF: 0.2.0 version.	
+
+2009-03-18  Elliott Baron  <ebaron@redhat.com>
+
+	* AbstractTest.java (createProject): Split into creation and building.
+	(createProjectAndBuild): Renamed from createProject.
+	(buildProject): New method.
+
+2009-02-03  Elliott Baron  <ebaron@redhat.com>
+
+	* LaunchConfigTabTest: Removed for now.
+	* META-INF/MANIFEST.MF: Require-Bundle for JUnit < 4.0.0
+
+2009-01-05  Elliott Baron  <ebaron@redhat.com>
+
+	* META-INF/MANIFEST.MF: Changed version to 0.1.0.
+	* build.properties: Include about.html and icons.
+	* about.html: Added.
\ No newline at end of file
diff --git a/profiling/org.eclipse.linuxtools.profiling.tests/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.profiling.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..04c8ae3
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,27 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name.0
+Bundle-SymbolicName: org.eclipse.linuxtools.profiling.tests
+Bundle-Version: 0.3.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.internal.profiling.tests.ProfileTestsPlugin
+Bundle-Vendor: %Bundle-Vendor.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.junit;bundle-version="[0.0.0,4.0.0)"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
+Export-Package: org.eclipse.linuxtools.internal.profiling.tests,
+ org.eclipse.linuxtools.profiling.tests
+Import-Package: org.eclipse.cdt.build.core.scannerconfig,
+ org.eclipse.cdt.core,
+ org.eclipse.cdt.core.index,
+ org.eclipse.cdt.core.model,
+ org.eclipse.cdt.core.testplugin,
+ org.eclipse.cdt.debug.core,
+ org.eclipse.cdt.managedbuilder.core,
+ org.eclipse.core.resources,
+ org.eclipse.debug.core,
+ org.eclipse.debug.ui,
+ org.eclipse.ui.actions,
+ org.eclipse.ui.wizards.datatransfer
diff --git a/profiling/about.html b/profiling/org.eclipse.linuxtools.profiling.tests/about.html
similarity index 100%
copy from profiling/about.html
copy to profiling/org.eclipse.linuxtools.profiling.tests/about.html
diff --git a/profiling/build.properties b/profiling/org.eclipse.linuxtools.profiling.tests/build.properties
similarity index 100%
copy from profiling/build.properties
copy to profiling/org.eclipse.linuxtools.profiling.tests/build.properties
diff --git a/profiling/plugin.properties b/profiling/org.eclipse.linuxtools.profiling.tests/plugin.properties
similarity index 100%
rename from profiling/plugin.properties
rename to profiling/org.eclipse.linuxtools.profiling.tests/plugin.properties
diff --git a/profiling/src/org/eclipse/linuxtools/internal/profiling/tests/ProfileTestsPlugin.java b/profiling/org.eclipse.linuxtools.profiling.tests/src/org/eclipse/linuxtools/internal/profiling/tests/ProfileTestsPlugin.java
similarity index 100%
rename from profiling/src/org/eclipse/linuxtools/internal/profiling/tests/ProfileTestsPlugin.java
rename to profiling/org.eclipse.linuxtools.profiling.tests/src/org/eclipse/linuxtools/internal/profiling/tests/ProfileTestsPlugin.java
diff --git a/profiling/src/org/eclipse/linuxtools/profiling/tests/AbstractTest.java b/profiling/org.eclipse.linuxtools.profiling.tests/src/org/eclipse/linuxtools/profiling/tests/AbstractTest.java
similarity index 100%
rename from profiling/src/org/eclipse/linuxtools/profiling/tests/AbstractTest.java
rename to profiling/org.eclipse.linuxtools.profiling.tests/src/org/eclipse/linuxtools/profiling/tests/AbstractTest.java
diff --git a/profiling/src/org/eclipse/linuxtools/profiling/tests/Messages.java b/profiling/org.eclipse.linuxtools.profiling.tests/src/org/eclipse/linuxtools/profiling/tests/Messages.java
similarity index 100%
rename from profiling/src/org/eclipse/linuxtools/profiling/tests/Messages.java
rename to profiling/org.eclipse.linuxtools.profiling.tests/src/org/eclipse/linuxtools/profiling/tests/Messages.java
diff --git a/profiling/src/org/eclipse/linuxtools/profiling/tests/messages.properties b/profiling/org.eclipse.linuxtools.profiling.tests/src/org/eclipse/linuxtools/profiling/tests/messages.properties
similarity index 100%
rename from profiling/src/org/eclipse/linuxtools/profiling/tests/messages.properties
rename to profiling/org.eclipse.linuxtools.profiling.tests/src/org/eclipse/linuxtools/profiling/tests/messages.properties
diff --git a/profiling/.classpath b/profiling/org.eclipse.linuxtools.profiling.ui/.classpath
similarity index 100%
copy from profiling/.classpath
copy to profiling/org.eclipse.linuxtools.profiling.ui/.classpath
diff --git a/profiling/org.eclipse.linuxtools.profiling.ui/.project b/profiling/org.eclipse.linuxtools.profiling.ui/.project
new file mode 100644
index 0000000..15137b2
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.ui/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.profiling.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+	</natures>
+</projectDescription>
diff --git a/profiling/org.eclipse.linuxtools.profiling.ui/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.profiling.ui/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..2b0594c
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.ui/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Mon Oct 27 11:42:51 EDT 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/profiling/org.eclipse.linuxtools.profiling.ui/.svnignore b/profiling/org.eclipse.linuxtools.profiling.ui/.svnignore
new file mode 100644
index 0000000..ba077a4
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.ui/.svnignore
@@ -0,0 +1 @@
+bin
diff --git a/profiling/org.eclipse.linuxtools.profiling.ui/ChangeLog b/profiling/org.eclipse.linuxtools.profiling.ui/ChangeLog
new file mode 100644
index 0000000..d1163b8
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.ui/ChangeLog
@@ -0,0 +1,52 @@
+2010-05-06  Roland Grunberg  <rgrunber@redhat.com>
+
+	* src/org/eclipse/linuxtools/profiling/ui/ProfileUIUtils.java (findFunctionsInProject):
+		Use a stronger comparison when determining if two files have the same path.
+
+2010-04-08  Roland Grunberg  <rgrunber@redhat.com>
+
+	* META-INF/MANIFEST.MF: Added imports needed for using CDT Indexer.
+	* src/org/eclipse/linuxtools/profiling/ui/ProfileUIUtils.java
+		(findCProjectWithAbsolutePath): New, for purpose of locating an ICProject.
+		(findFunctionsInProject): New, for purpose of finding data needed to link
+		to source code of a function call.
+
+2010-03-22  Roland Grunberg  <rgrunber@redhat.com>
+
+	* src/org/eclipse/linuxtools/profiling/ui/ProfileUIUtils.java:
+		(openEditorAndSelect): Overload to take an offset and length.
+
+2009-08-11  Elliott Baron  <ebaron@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump version to 0.3.0.
+
+2009-08-07  Andrew Overholt  <overholt@redhat.com>
+
+	* plugin.properties: Change provider from Eclipse.org to Eclipse.
+
+2009-07-30  Elliott Baron  <ebaron@redhat.com>
+
+	* src/org/eclipse/linuxtools/profiling/ui/ProfileUIPlugin.java: Removed.
+	* src/org/eclipse/linuxtools/internal/profiling/ui/ProfileUIPlugin.java: New file.
+	* .project: Enabled API analysis.
+	* META-INF/MANIFEST.MF: Export internal package.
+	* src/org/eclipse/linuxtools/profiling/ui/ProfileUIUtils.java: Import internal class.
+
+2009-06-26  Elliott Baron  <ebaron@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add core.resources to deps.
+
+2009-04-30  Elliott Baron  <ebaron@redhat.com>
+
+	* META-INF/MANIFEST.MF: New deps.
+	* ProfileUIUtils.java (openEditorAndSelect): Overloaded to take ISourceLookupResult.
+
+2009-04-03  Elliott Baron  <ebaron@redhat.com>
+
+	* META-INF/MANIFEST.MF: 0.2.0 version.
+
+2009-01-05  Elliott Baron  <ebaron@redhat.com>
+
+	* META-INF/MANIFEST.MF: Changed version to 0.1.0.
+	* build.properties: Include about.html.
+	* about.html: Added.
\ No newline at end of file
diff --git a/profiling/org.eclipse.linuxtools.profiling.ui/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.profiling.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..1fb4bdc
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,27 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name.0
+Bundle-SymbolicName: org.eclipse.linuxtools.profiling.ui;singleton:=true
+Bundle-Version: 0.3.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.internal.profiling.ui.ProfileUIPlugin
+Bundle-Vendor: %Bundle-Vendor.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
+Export-Package: org.eclipse.linuxtools.internal.profiling.ui,
+ org.eclipse.linuxtools.profiling.ui
+Import-Package: org.eclipse.cdt.core,
+ org.eclipse.cdt.core.dom.ast,
+ org.eclipse.cdt.core.index,
+ org.eclipse.cdt.core.model,
+ org.eclipse.cdt.debug.core,
+ org.eclipse.core.filesystem,
+ org.eclipse.core.resources,
+ org.eclipse.debug.core.model,
+ org.eclipse.debug.ui,
+ org.eclipse.debug.ui.sourcelookup,
+ org.eclipse.jface.text,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.texteditor
diff --git a/profiling/about.html b/profiling/org.eclipse.linuxtools.profiling.ui/about.html
similarity index 100%
copy from profiling/about.html
copy to profiling/org.eclipse.linuxtools.profiling.ui/about.html
diff --git a/profiling/org.eclipse.linuxtools.profiling.ui/build.properties b/profiling/org.eclipse.linuxtools.profiling.ui/build.properties
new file mode 100644
index 0000000..bc3b0f2
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.ui/build.properties
@@ -0,0 +1,7 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               plugin.properties,\
+               about.html
diff --git a/profiling/org.eclipse.linuxtools.profiling.ui/plugin.properties b/profiling/org.eclipse.linuxtools.profiling.ui/plugin.properties
new file mode 100644
index 0000000..8c648d1
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.ui/plugin.properties
@@ -0,0 +1,4 @@
+#Properties file for org.eclipse.linuxtools.profiling.ui
+category.name.0 = Profiling
+Bundle-Vendor.0 = Eclipse
+Bundle-Name.0 = Profiling UI Plug-in (Incubation)
\ No newline at end of file
diff --git a/profiling/org.eclipse.linuxtools.profiling.ui/plugin.xml b/profiling/org.eclipse.linuxtools.profiling.ui/plugin.xml
new file mode 100644
index 0000000..89aafb6
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.ui/plugin.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+   <extension
+         point="org.eclipse.ui.views">
+      <category
+            id="org.eclipse.linuxtools.profiling.ui"
+            name="%category.name.0">
+      </category>
+   </extension>
+   <extension
+         point="org.eclipse.ui.perspectiveExtensions">
+      <perspectiveExtension
+            targetID="org.eclipse.cdt.ui.CPerspective">
+         <actionSet
+               id="org.eclipse.debug.ui.profileActionSet">
+         </actionSet>
+      </perspectiveExtension>
+   </extension>
+
+</plugin>
diff --git a/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/internal/profiling/ui/ProfileUIPlugin.java b/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/internal/profiling/ui/ProfileUIPlugin.java
new file mode 100644
index 0000000..6e2769d
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/internal/profiling/ui/ProfileUIPlugin.java
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Elliott Baron <ebaron@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.profiling.ui;
+
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class ProfileUIPlugin extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.profiling.ui"; //$NON-NLS-1$
+
+	// The shared instance
+	private static ProfileUIPlugin plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public ProfileUIPlugin() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static ProfileUIPlugin getDefault() {
+		return plugin;
+	}
+	
+	public static Shell getActiveWorkbenchShell() {
+		IWorkbenchWindow window = getDefault().getWorkbench().getActiveWorkbenchWindow();
+		if (window != null) {
+			return window.getShell();
+		}
+		return null;
+	}
+
+}
diff --git a/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/profiling/ui/ProfileUIUtils.java b/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/profiling/ui/ProfileUIUtils.java
new file mode 100644
index 0000000..7e401dd
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/profiling/ui/ProfileUIUtils.java
@@ -0,0 +1,261 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Elliott Baron <ebaron@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.profiling.ui;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.dom.ast.DOMException;
+import org.eclipse.cdt.core.dom.ast.IBinding;
+import org.eclipse.cdt.core.dom.ast.IFunction;
+import org.eclipse.cdt.core.index.IIndex;
+import org.eclipse.cdt.core.index.IIndexFile;
+import org.eclipse.cdt.core.index.IIndexManager;
+import org.eclipse.cdt.core.index.IIndexName;
+import org.eclipse.cdt.core.index.IndexFilter;
+import org.eclipse.cdt.core.model.ICElement;
+import org.eclipse.cdt.core.model.ICElementVisitor;
+import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.cdt.debug.core.CDebugCorePlugin;
+import org.eclipse.core.filesystem.EFS;
+import org.eclipse.core.filesystem.IFileStore;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.debug.core.model.ISourceLocator;
+import org.eclipse.debug.ui.DebugUITools;
+import org.eclipse.debug.ui.IDebugModelPresentation;
+import org.eclipse.debug.ui.sourcelookup.ISourceLookupResult;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.linuxtools.internal.profiling.ui.ProfileUIPlugin;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.ide.IDE;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+import org.eclipse.ui.texteditor.ITextEditor;
+
+public class ProfileUIUtils {
+	
+	/**
+	 * Opens the specified file in an editor (or selects an already open
+	 * editor) and highlights the specified line.
+	 * @param path - absolute path of file to open
+	 * @param line - line number to select, 0 to not select a line
+	 * @throws PartInitException - Failed to open editor
+	 * @throws BadLocationException - Line number not valid in file
+	 */
+	public static void openEditorAndSelect(String path, int line) throws PartInitException, BadLocationException {
+		Path p = new Path(path);
+
+		if (p.toFile().exists()) {
+			IWorkbenchPage activePage = ProfileUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
+			IFileStore file = EFS.getLocalFileSystem().getStore(p);
+
+			IEditorPart editor = IDE.openEditorOnFileStore(activePage, file);
+			if (editor instanceof ITextEditor) {
+				ITextEditor textEditor = (ITextEditor) editor;
+
+				if (line > 0) {
+					IDocumentProvider provider = textEditor.getDocumentProvider();
+					IDocument document = provider.getDocument(textEditor.getEditorInput());
+
+					int start = document.getLineOffset(line - 1); //zero-indexed
+					textEditor.selectAndReveal(start, 0);
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Opens the specified file in an editor (or selects an already open
+	 * editor) and highlights the specified line.
+	 * @param result - result of performing source lookup with a ISourceLocator
+	 * @param line - line number to select, 0 to not select a line
+	 * @throws PartInitException - Failed to open editor
+	 * @throws BadLocationException - Line number not valid in file
+	 * @see DebugUITools#lookupSource(Object, ISourceLocator)
+	 */
+	public static void openEditorAndSelect(ISourceLookupResult result, int line) throws PartInitException, BadLocationException {
+		IEditorInput input = result.getEditorInput();
+		String editorID = result.getEditorId();
+		
+		if (input == null || editorID == null) {
+			// Consult the CDT DebugModelPresentation
+			Object sourceElement = result.getSourceElement();
+			if (sourceElement != null) {				
+				IDebugModelPresentation pres = DebugUITools.newDebugModelPresentation(CDebugCorePlugin.getUniqueIdentifier());
+				input = pres.getEditorInput(sourceElement);
+				editorID = pres.getEditorId(input, sourceElement);
+				pres.dispose();
+			}
+		}
+		if (input != null && editorID != null) {
+			// Open the editor
+			IWorkbenchPage activePage = ProfileUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();;
+
+			IEditorPart editor = IDE.openEditor(activePage, input, editorID);
+			// Select the line
+			if (editor instanceof ITextEditor) {
+				ITextEditor textEditor = (ITextEditor) editor;
+
+				if (line > 0) {
+					IDocumentProvider provider = textEditor.getDocumentProvider();
+					IDocument document = provider.getDocument(textEditor.getEditorInput());
+
+					IRegion lineRegion = document.getLineInformation(line - 1); //zero-indexed
+					textEditor.selectAndReveal(lineRegion.getOffset(), lineRegion.getLength());
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Open a file in the Editor at the specified offset, highlighting the given length
+	 * 
+	 * @param path : Absolute path pointing to the file which will be opened.
+	 * @param offset : Offset of the function to be highlighted.
+	 * @param length : Length of the function to be highlighted.
+	 * @throws PartInitException if the editor could not be initialized
+	 */
+	public static void openEditorAndSelect(String path, int offset, int length) throws PartInitException {
+		Path p = new Path (path);
+
+		if (p.toFile().exists()) {
+			IWorkbenchPage activePage = ProfileUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
+			IFileStore fileStore = EFS.getLocalFileSystem().getStore(p);
+
+			IEditorPart editor = IDE.openEditorOnFileStore(activePage, fileStore);
+			if (editor instanceof ITextEditor) {
+				ITextEditor text = (ITextEditor) editor;
+				text.selectAndReveal(offset, length);
+			}
+		}
+	}
+	
+	/**
+	 * Find an ICProject that contains the specified absolute path.
+	 * 
+	 * @param absPath An absolute path (usually to some file/folder in a project)
+	 * @return an ICProject corresponding to the project that contains the absolute path
+	 * @throws CoreException
+	 */
+	public static ICProject findCProjectWithAbsolutePath(final String absPath) throws CoreException{
+		final String workspaceLoc = ResourcesPlugin.getWorkspace().getRoot().getLocation().toOSString();
+		final ArrayList<ICProject> ret = new ArrayList<ICProject>();
+		
+		// visitor object to check for the matching path string
+		ICElementVisitor vis = new ICElementVisitor() {
+			public boolean visit(ICElement element) throws CoreException {
+				if (element.getElementType() == ICElement.C_CCONTAINER
+						|| element.getElementType() == ICElement.C_PROJECT){
+					return true;
+				}else if (absPath.equals(workspaceLoc+element.getPath().toFile().getAbsolutePath())){
+					ret.add(element.getCProject());
+				}
+				return false;
+		}};
+		
+			ICProject[] cProjects = CCorePlugin.getDefault().getCoreModel().getCModel().getCProjects();
+			for (ICProject proj : cProjects){
+					// visit every project
+					proj.accept(vis);
+			}
+		
+		// is it possible to find more than one matching project ?
+		return ret.size() == 0 ? null : ret.get(0);
+	}
+	
+	/**
+	 * Get a mapping between a file name, and the data relevant to locating
+	 * the corresponding function name for a given project.
+	 * 
+	 * @param project : C Project Type
+	 * @param functionName : Name of a function 
+	 * @param numArgs : The number of arguments this function is expected to have.
+	 * A value of -1 will ignore the number of arguments when searching.
+	 * @param fileHint : The name of the file where we expect to find functionName.
+	 * It is null if we do not want to use this option.
+	 * @return a HashMap<String, int []> of String absolute paths of files and the
+	 * function's corresponding node-offset and length.
+	 */
+	public static HashMap<String,int[]> findFunctionsInProject(ICProject project, String functionName,
+			int numArgs, String fileHint)  {
+		  HashMap<String,int[]> files = new HashMap<String,int[]>() ;
+
+		  IIndexManager manager = CCorePlugin.getIndexManager();
+		  IIndex index = null;
+		    try {
+				index = manager.getIndex(project);
+				index.acquireReadLock();
+				IBinding[] bindings = index.findBindings(functionName.toCharArray(), IndexFilter.ALL, null);
+				for (IBinding bind : bindings) {
+					if (bind instanceof IFunction
+							&& (numArgs == -1 || ((IFunction)bind).getParameters().length == numArgs)) {
+						IFunction ifunction = (IFunction) bind;
+						IIndexName[] names = index.findNames(ifunction, IIndex.FIND_DEFINITIONS);
+						for (IIndexName iname : names) {
+							IIndexFile file = iname.getFile();
+							if (file != null) {
+								String loc = file.getLocation().getURI().getPath();
+								if (fileHint != null){
+									if (loc.equals(new File(fileHint).getCanonicalPath())){
+										//TODO: Consider changing data structure so that we can
+										// store multiple same-named functions (different args)
+										// from the same file.
+										files.put(loc, new int [] {iname.getNodeOffset(), iname.getNodeLength()});
+									}
+								}else{
+									files.put(loc, new int [] {iname.getNodeOffset(), iname.getNodeLength()});
+								}
+							}
+						}
+					}
+				}
+				
+			} catch (CoreException e) {
+				e.printStackTrace();
+			} catch (InterruptedException e) {
+				e.printStackTrace();
+			} catch (DOMException e) {
+				e.printStackTrace();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}finally{
+				index.releaseReadLock();
+			}
+		   return files;
+	}
+	
+	/**
+	 * Helper function for findFunctionsInProject
+	 * @param needResult True if the function should relax constraints in order
+	 * to return some value. False if a failure to find the function(s) is acceptable.
+	 */
+	public static HashMap<String,int[]> findFunctionsInProject(ICProject project, String functionName, 
+			int numArgs, String fileHint, boolean needResult){
+		HashMap<String, int []> map = findFunctionsInProject(project, functionName, numArgs, fileHint);
+		if (needResult && map.size() == 0){
+			map = findFunctionsInProject(project, functionName, -1, fileHint);
+			if (map.size() == 0){
+				return findFunctionsInProject(project, functionName, -1, null);
+			}
+		}
+		return map;
+	}
+	
+}
diff --git a/releng/org.eclipse.linuxtools.all/ChangeLog b/releng/org.eclipse.linuxtools.all/ChangeLog
index 2465c72..f1890ac 100644
--- a/releng/org.eclipse.linuxtools.all/ChangeLog
+++ b/releng/org.eclipse.linuxtools.all/ChangeLog
@@ -9,6 +9,10 @@
 
 	* feature.properties: Match consistent license text (bug #306627).
 
+2010-03-15  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Bump version to 0.5.0.
+
 2010-01-18  Andrew Overholt  <overholt@redhat.com>
 
 	* feature.xml: Add gcov feature.
diff --git a/releng/org.eclipse.linuxtools.all/feature.xml b/releng/org.eclipse.linuxtools.all/feature.xml
index 47844ac..d1cf80b 100644
--- a/releng/org.eclipse.linuxtools.all/feature.xml
+++ b/releng/org.eclipse.linuxtools.all/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.linuxtools.all"
       label="%featureName"
-      version="0.3.0.qualifier"
+      version="0.5.0.qualifier"
       provider-name="%provider">
 
    <description>
diff --git a/releng/org.eclipse.linuxtools.all/license.html b/releng/org.eclipse.linuxtools.all/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/releng/org.eclipse.linuxtools.all/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/releng/org.eclipse.linuxtools.releng/ChangeLog b/releng/org.eclipse.linuxtools.releng/ChangeLog
index 49d4dec..cacc295 100644
--- a/releng/org.eclipse.linuxtools.releng/ChangeLog
+++ b/releng/org.eclipse.linuxtools.releng/ChangeLog
@@ -11,6 +11,32 @@
 
 	* build.properties: Add swtbot eclipse plugins as dependency.
 
+2010-03-15  Andrew Overholt  <overholt@redhat.com>
+
+	* build.properties: Update version.
+	* maps/linuxtools.map: Fix syntax.
+
+2010-03-15  Andrew Overholt  <overholt@redhat.com>
+
+	* maps/linuxtools.map: Use 0.5.0 branch.
+	* psfs/autotools.psf: Likewise.
+	* psfs/callgraph.psf: Likewise.
+	* psfs/changelog.psf: Likewise.
+	* psfs/eclipse-build.psf: Likewise.
+	* psfs/gcov.psf: Likewise.
+	* psfs/gprof.psf: Likewise.
+	* psfs/libhover.psf: Likewise.
+	* psfs/linuxtools.psf: Likewise.
+	* psfs/lttng.psf: Likewise.
+	* psfs/manviewer.psf: Likewise.
+	* psfs/oprofile.psf: Likewise.
+	* psfs/oprofiledocs.psf: Likewise.
+	* psfs/rpm-editor.psf: Likewise.
+	* psfs/rpmstubby.psf: Likewise.
+	* psfs/systemtap.psf: Likewise.
+	* psfs/valgrind-tests.psf: Likewise.
+	* psfs/valgrind.psf: Likewise.
+
 2010-01-29  Anithra P Janakiraman  <anithra@linux.vnet.ibm.com>
 
 	* maps/linuxtools.map: Add new dashboard plugins for SystemTap
diff --git a/releng/org.eclipse.linuxtools.releng/maps/linuxtools.map b/releng/org.eclipse.linuxtools.releng/maps/linuxtools.map
index dc8496f..69e9082 100644
--- a/releng/org.eclipse.linuxtools.releng/maps/linuxtools.map
+++ b/releng/org.eclipse.linuxtools.releng/maps/linuxtools.map
@@ -1,147 +1,146 @@
 !*** changelog
-plugin@org.eclipse.linuxtools.changelog.core=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog,,org.eclipse.linuxtools.changelog.core
-fragment@org.eclipse.linuxtools.changelog.cparser=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog,,org.eclipse.linuxtools.changelog.cparser
-plugin@org.eclipse.linuxtools.changelog.doc=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog,,org.eclipse.linuxtools.changelog.doc
-fragment@org.eclipse.linuxtools.changelog.parsers.java=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog,,org.eclipse.linuxtools.changelog.javaparser
-feature@org.eclipse.linuxtools.changelog=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog,,org.eclipse.linuxtools.changelog-feature
+plugin@org.eclipse.linuxtools.changelog.core=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/branches/0.5.0,,org.eclipse.linuxtools.changelog.core
+fragment@org.eclipse.linuxtools.changelog.cparser=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/branches/0.5.0,,org.eclipse.linuxtools.changelog.cparser
+plugin@org.eclipse.linuxtools.changelog.doc=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/branches/0.5.0,,org.eclipse.linuxtools.changelog.doc
+fragment@org.eclipse.linuxtools.changelog.parsers.java=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/branches/0.5.0,,org.eclipse.linuxtools.changelog.javaparser
+feature@org.eclipse.linuxtools.changelog=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/branches/0.5.0,,org.eclipse.linuxtools.changelog-feature
 
 !*** rpm
-plugin@org.eclipse.linuxtools.rpm.rpmlint=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm,,org.eclipse.linuxtools.rpm.rpmlint
-plugin@org.eclipse.linuxtools.rpm.ui.editor=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm,,org.eclipse.linuxtools.rpm.ui.editor
-plugin@org.eclipse.linuxtools.rpm.ui.editor.doc=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm,,org.eclipse.linuxtools.rpm.ui.editor.doc
-plugin@org.eclipse.linuxtools.rpm.ui.editor.tests=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm,,org.eclipse.linuxtools.rpm.ui.editor.tests
-feature@org.eclipse.linuxtools.rpm.ui.editor=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm,,org.eclipse.linuxtools.rpm.ui.editor-feature
-plugin@org.eclipse.linuxtools.rpm.core=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm,,org.eclipse.linuxtools.rpm.core
-plugin@org.eclipse.linuxtools.rpm.core.tests=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm,,org.eclipse.linuxtools.rpm.core.tests
-plugin@org.eclipse.linuxtools.rpm.ui=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm,,org.eclipse.linuxtools.rpm.ui
-feature@org.eclipse.linuxtools.rpm=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm,,org.eclipse.linuxtools.rpm-feature
+plugin@org.eclipse.linuxtools.rpm.rpmlint=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/branches/0.5.0,,org.eclipse.linuxtools.rpm.rpmlint
+plugin@org.eclipse.linuxtools.rpm.ui.editor=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/branches/0.5.0,,org.eclipse.linuxtools.rpm.ui.editor
+plugin@org.eclipse.linuxtools.rpm.ui.editor.doc=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/branches/0.5.0,,org.eclipse.linuxtools.rpm.ui.editor.doc
+plugin@org.eclipse.linuxtools.rpm.ui.editor.tests=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/branches/0.5.0,,org.eclipse.linuxtools.rpm.ui.editor.tests
+feature@org.eclipse.linuxtools.rpm.ui.editor=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/branches/0.5.0,,org.eclipse.linuxtools.rpm.ui.editor-feature
+plugin@org.eclipse.linuxtools.rpm.core=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/branches/0.5.0,,org.eclipse.linuxtools.rpm.core
+plugin@org.eclipse.linuxtools.rpm.core.tests=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/branches/0.5.0,,org.eclipse.linuxtools.rpm.core.tests
+plugin@org.eclipse.linuxtools.rpm.ui=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/branches/0.5.0,,org.eclipse.linuxtools.rpm.ui
+feature@org.eclipse.linuxtools.rpm=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/branches/0.5.0,,org.eclipse.linuxtools.rpm-feature
 
 !*** rpmstubby
-plugin@org.eclipse.linuxtools.rpmstubby=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpmstubby,,org.eclipse.linuxtools.rpmstubby
-feature@org.eclipse.linuxtools.rpmstubby=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpmstubby,,org.eclipse.linuxtools.rpmstubby-feature
+plugin@org.eclipse.linuxtools.rpmstubby=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpmstubby/branches/0.5.0,,org.eclipse.linuxtools.rpmstubby
+feature@org.eclipse.linuxtools.rpmstubby=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpmstubby/branches/0.5.0,,org.eclipse.linuxtools.rpmstubby-feature
 
 !*** autotools
-plugin@org.eclipse.linuxtools.cdt.autotools=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools,,org.eclipse.linuxtools.cdt.autotools
-plugin@org.eclipse.linuxtools.cdt.autotools.core=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools,,org.eclipse.linuxtools.cdt.autotools.core
-plugin@org.eclipse.linuxtools.cdt.autotools.ui=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools,,org.eclipse.linuxtools.cdt.autotools.ui
-plugin@org.eclipse.linuxtools.cdt.autotools_docs=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools,,org.eclipse.linuxtools.cdt.autotools-docs
-plugin@org.eclipse.linuxtools.cdt.autotools.tests=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools,,org.eclipse.linuxtools.cdt.autotools.tests
-plugin@org.eclipse.linuxtools.cdt.autotools.ui.tests=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools,,org.eclipse.linuxtools.cdt.autotools.ui.tests
-feature@org.eclipse.linuxtools.cdt.autotools=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools,,org.eclipse.linuxtools.cdt.autotools-feature
+plugin@org.eclipse.linuxtools.cdt.autotools=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/branches/0.5.0,,org.eclipse.linuxtools.cdt.autotools
+plugin@org.eclipse.linuxtools.cdt.autotools.core=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/branches/0.5.0,,org.eclipse.linuxtools.cdt.autotools.core
+plugin@org.eclipse.linuxtools.cdt.autotools.ui=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/branches/0.5.0,,org.eclipse.linuxtools.cdt.autotools.ui
+plugin@org.eclipse.linuxtools.cdt.autotools_docs=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/branches/0.5.0,,org.eclipse.linuxtools.cdt.autotools-docs
+plugin@org.eclipse.linuxtools.cdt.autotools.tests=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/branches/0.5.0,,org.eclipse.linuxtools.cdt.autotools.tests
+feature@org.eclipse.linuxtools.cdt.autotools=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/branches/0.5.0,,org.eclipse.linuxtools.cdt.autotools-feature
 
 !*** gprof
-plugin@org.eclipse.linuxtools.binutils=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof,,org.eclipse.linuxtools.binutils
-plugin@org.eclipse.linuxtools.dataviewers=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof,,org.eclipse.linuxtools.dataviewers
-plugin@org.eclipse.linuxtools.gprof=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof,,org.eclipse.linuxtools.gprof
-fragment@org.eclipse.linuxtools.gprof.test=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof,,org.eclipse.linuxtools.gprof.test
-feature@org.eclipse.linuxtools.gprof=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof,,org.eclipse.linuxtools.gprof-feature
+plugin@org.eclipse.linuxtools.binutils=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof/branches/0.5.0,,org.eclipse.linuxtools.binutils
+plugin@org.eclipse.linuxtools.dataviewers=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof/branches/0.5.0,,org.eclipse.linuxtools.dataviewers
+plugin@org.eclipse.linuxtools.gprof=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof/branches/0.5.0,,org.eclipse.linuxtools.gprof
+fragment@org.eclipse.linuxtools.gprof.test=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof/branches/0.5.0,,org.eclipse.linuxtools.gprof.test
+feature@org.eclipse.linuxtools.gprof=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof/branches/0.5.0,,org.eclipse.linuxtools.gprof-feature
 
 !*** libhover
-plugin@org.eclipse.linuxtools.cdt.libhover=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover,,org.eclipse.linuxtools.cdt.libhover
-plugin@org.eclipse.linuxtools.cdt.libhover.glibc=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover,,org.eclipse.linuxtools.cdt.libhover.glibc
-plugin@org.eclipse.linuxtools.cdt.libhover.newlib=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover,,org.eclipse.linuxtools.cdt.libhover.newlib
-plugin@org.eclipse.linuxtools.cdt.libhover.library_docs=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover,,org.eclipse.linuxtools.cdt.libhover.library-docs
-plugin@org.eclipse.linuxtools.cdt.libhover.libstdcxx=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover,,org.eclipse.linuxtools.cdt.libhover.libstdcxx
-feature@org.eclipse.linuxtools.cdt.libhover=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover,,org.eclipse.linuxtools.cdt.libhover-feature
-feature@org.eclipse.linuxtools.cdt.libhover.newlib=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover,,org.eclipse.linuxtools.cdt.libhover.newlib-feature
+plugin@org.eclipse.linuxtools.cdt.libhover=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/branches/0.5.0,,org.eclipse.linuxtools.cdt.libhover
+plugin@org.eclipse.linuxtools.cdt.libhover.glibc=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/branches/0.5.0,,org.eclipse.linuxtools.cdt.libhover.glibc
+plugin@org.eclipse.linuxtools.cdt.libhover.newlib=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/branches/0.5.0,,org.eclipse.linuxtools.cdt.libhover.newlib
+plugin@org.eclipse.linuxtools.cdt.libhover.library_docs=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/branches/0.5.0,,org.eclipse.linuxtools.cdt.libhover.library-docs
+plugin@org.eclipse.linuxtools.cdt.libhover.libstdcxx=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/branches/0.5.0,,org.eclipse.linuxtools.cdt.libhover.libstdcxx
+feature@org.eclipse.linuxtools.cdt.libhover=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/branches/0.5.0,,org.eclipse.linuxtools.cdt.libhover-feature
+feature@org.eclipse.linuxtools.cdt.libhover.newlib=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/branches/0.5.0,,org.eclipse.linuxtools.cdt.libhover.newlib-feature
 
 !*** man
-plugin@org.eclipse.linuxtools.man=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/man,,org.eclipse.linuxtools.man
-feature@org.eclipse.linuxtools.man=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/man,,org.eclipse.linuxtools.man-feature
+plugin@org.eclipse.linuxtools.man=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/man/branches/0.5.0,,org.eclipse.linuxtools.man
+feature@org.eclipse.linuxtools.man=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/man/branches/0.5.0,,org.eclipse.linuxtools.man-feature
 
 !*** systemtap
-plugin@org.eclipse.linuxtools.systemtap.backup.ui.editor=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap,,org.eclipse.linuxtools.systemtap.backup.ui.editor
-feature@org.eclipse.linuxtools.systemtap.backup=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap,,org.eclipse.linuxtools.systemtap.backup-feature
-plugin@org.eclipse.linuxtools.systemtap.ui.consolelog=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap,,org.eclipse.linuxtools.systemtap.ui.consolelog
-plugin@org.eclipse.linuxtools.systemtap.ui.editor=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap,,org.eclipse.linuxtools.systemtap.ui.editor
-feature@org.eclipse.linuxtools.systemtap=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap,,org.eclipse.linuxtools.systemtap-feature
-plugin@org.eclipse.linuxtools.systemtap.ui.graphing=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap,,org.eclipse.linuxtools.systemtap.ui.graphing
-plugin@org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap,,org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui
-plugin@org.eclipse.linuxtools.systemtap.ui.graphingapi.ui=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap,,org.eclipse.linuxtools.systemtap.ui.graphingapi.ui
-plugin@org.eclipse.linuxtools.systemtap.ui.ide=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap,,org.eclipse.linuxtools.systemtap.ui.ide
-plugin@org.eclipse.linuxtools.systemtap.ui.logging=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap,,org.eclipse.linuxtools.systemtap.ui.logging
-plugin@org.eclipse.linuxtools.systemtap.ui.structures=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap,,org.eclipse.linuxtools.systemtap.ui.structures
-plugin@org.eclipse.linuxtools.systemtap.ui.systemtapgui=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap,,org.eclipse.linuxtools.systemtap.ui.systemtapgui
-plugin@org.eclipse.linuxtools.systemtap.ui.dashboard=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap,,org.eclipse.linuxtools.systemtap.ui.dashboard
-plugin@org.eclipse.linuxtools.systemtap.ui.dashboardextension=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap,,org.eclipse.linuxtools.systemtap.ui.dashboardextension
-plugin@org.eclipse.linuxtools.systemtap.ui.graphicalrun=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap,,org.eclipse.linuxtools.systemtap.ui.graphicalrun
+plugin@org.eclipse.linuxtools.systemtap.backup.ui.editor=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0,,org.eclipse.linuxtools.systemtap.backup.ui.editor
+feature@org.eclipse.linuxtools.systemtap.backup=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0,,org.eclipse.linuxtools.systemtap.backup-feature
+plugin@org.eclipse.linuxtools.systemtap.ui.consolelog=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0,,org.eclipse.linuxtools.systemtap.ui.consolelog
+plugin@org.eclipse.linuxtools.systemtap.ui.editor=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0,,org.eclipse.linuxtools.systemtap.ui.editor
+feature@org.eclipse.linuxtools.systemtap=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0,,org.eclipse.linuxtools.systemtap-feature
+plugin@org.eclipse.linuxtools.systemtap.ui.graphing=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0,,org.eclipse.linuxtools.systemtap.ui.graphing
+plugin@org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0,,org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui
+plugin@org.eclipse.linuxtools.systemtap.ui.graphingapi.ui=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0,,org.eclipse.linuxtools.systemtap.ui.graphingapi.ui
+plugin@org.eclipse.linuxtools.systemtap.ui.ide=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0,,org.eclipse.linuxtools.systemtap.ui.ide
+plugin@org.eclipse.linuxtools.systemtap.ui.logging=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0,,org.eclipse.linuxtools.systemtap.ui.logging
+plugin@org.eclipse.linuxtools.systemtap.ui.structures=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0,,org.eclipse.linuxtools.systemtap.ui.structures
+plugin@org.eclipse.linuxtools.systemtap.ui.systemtapgui=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0,,org.eclipse.linuxtools.systemtap.ui.systemtapgui
+plugin@org.eclipse.linuxtools.systemtap.ui.dashboard=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0,,org.eclipse.linuxtools.systemtap.ui.dashboard
+plugin@org.eclipse.linuxtools.systemtap.ui.dashboardextension=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0,,org.eclipse.linuxtools.systemtap.ui.dashboardextension
+plugin@org.eclipse.linuxtools.systemtap.ui.graphicalrun=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0,,org.eclipse.linuxtools.systemtap.ui.graphicalrun
 
 !*** callgraph
-plugin@org.eclipse.linuxtools.callgraph.core=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap,,org.eclipse.linuxtools.callgraph.core
-plugin@org.eclipse.linuxtools.callgraph.launch=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap,,org.eclipse.linuxtools.callgraph.launch
-plugin@org.eclipse.linuxtools.callgraph=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap,,org.eclipse.linuxtools.callgraph
-plugin@org.eclipse.linuxtools.callgraph.launch.tests=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap,,org.eclipse.linuxtools.callgraph.launch.tests
-plugin@org.eclipse.linuxtools.callgraph.tests=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap,,org.eclipse.linuxtools.callgraph.tests
-feature@org.eclipse.linuxtools.callgraph=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap,,org.eclipse.linuxtools.callgraph-feature
-feature@org.eclipse.linuxtools.callgraph.tests=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap,,org.eclipse.linuxtools.callgraph.tests-feature
+plugin@org.eclipse.linuxtools.callgraph.core=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0,,org.eclipse.linuxtools.callgraph.core
+plugin@org.eclipse.linuxtools.callgraph.launch=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0,,org.eclipse.linuxtools.callgraph.launch
+plugin@org.eclipse.linuxtools.callgraph=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0,,org.eclipse.linuxtools.callgraph
+plugin@org.eclipse.linuxtools.callgraph.launch.tests=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0,,org.eclipse.linuxtools.callgraph.launch.tests
+plugin@org.eclipse.linuxtools.callgraph.tests=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0,,org.eclipse.linuxtools.callgraph.tests
+feature@org.eclipse.linuxtools.callgraph=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0,,org.eclipse.linuxtools.callgraph-feature
+feature@org.eclipse.linuxtools.callgraph.tests=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0,,org.eclipse.linuxtools.callgraph.tests-feature
 
 !*** profiling framework
-plugin@org.eclipse.linuxtools.profiling.launch=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling,,org.eclipse.linuxtools.profiling.launch
-plugin@org.eclipse.linuxtools.profiling.tests=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling,,org.eclipse.linuxtools.profiling.tests
-plugin@org.eclipse.linuxtools.profiling.ui=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling,,org.eclipse.linuxtools.profiling.ui
-feature@org.eclipse.linuxtools.profiling=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling,,org.eclipse.linuxtools.profiling-feature
-feature@org.eclipse.linuxtools.profiling.test=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling,,org.eclipse.linuxtools.profiling.test-feature
+plugin@org.eclipse.linuxtools.profiling.launch=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0,,org.eclipse.linuxtools.profiling.launch
+plugin@org.eclipse.linuxtools.profiling.tests=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0,,org.eclipse.linuxtools.profiling.tests
+plugin@org.eclipse.linuxtools.profiling.ui=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0,,org.eclipse.linuxtools.profiling.ui
+feature@org.eclipse.linuxtools.profiling=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0,,org.eclipse.linuxtools.profiling-feature
+feature@org.eclipse.linuxtools.profiling.test=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0,,org.eclipse.linuxtools.profiling.test-feature
 
 !*** oprofile
-plugin@org.eclipse.linuxtools.oprofile.core=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile,,org.eclipse.linuxtools.oprofile.core
-plugin@org.eclipse.linuxtools.oprofile.doc=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile,,org.eclipse.linuxtools.oprofile.doc
-plugin@org.eclipse.linuxtools.oprofile.core.tests=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile,,org.eclipse.linuxtools.oprofile.core.tests
-fragment@org.eclipse.linuxtools.oprofile.core.linux.ppc=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile,,org.eclipse.linuxtools.oprofile.core.linux.ppc
-fragment@org.eclipse.linuxtools.oprofile.core.linux.x86=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile,,org.eclipse.linuxtools.oprofile.core.linux.x86
-fragment@org.eclipse.linuxtools.oprofile.core.linux.x86_64=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile,,org.eclipse.linuxtools.oprofile.core.linux.x86_64
-plugin@org.eclipse.linuxtools.oprofile.launch=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile,,org.eclipse.linuxtools.oprofile.launch
-plugin@org.eclipse.linuxtools.oprofile.launch.tests=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile,,org.eclipse.linuxtools.oprofile.launch.tests
-plugin@org.eclipse.linuxtools.oprofile.tests=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile,,org.eclipse.linuxtools.oprofile.tests
-plugin@org.eclipse.linuxtools.oprofile.ui=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile,,org.eclipse.linuxtools.oprofile.ui
-plugin@org.eclipse.linuxtools.oprofile.ui.tests=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile,,org.eclipse.linuxtools.oprofile.ui.tests
-feature@org.eclipse.linuxtools.oprofile=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile,,org.eclipse.linuxtools.oprofile-feature
-feature@org.eclipse.linuxtools.oprofile.test=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile,,org.eclipse.linuxtools.oprofile.test-feature
+plugin@org.eclipse.linuxtools.oprofile.core=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0,,org.eclipse.linuxtools.oprofile.core
+plugin@org.eclipse.linuxtools.oprofile.doc=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0,,org.eclipse.linuxtools.oprofile.doc
+plugin@org.eclipse.linuxtools.oprofile.core.tests=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0,,org.eclipse.linuxtools.oprofile.core.tests
+fragment@org.eclipse.linuxtools.oprofile.core.linux.ppc=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0,,org.eclipse.linuxtools.oprofile.core.linux.ppc
+fragment@org.eclipse.linuxtools.oprofile.core.linux.x86=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0,,org.eclipse.linuxtools.oprofile.core.linux.x86
+fragment@org.eclipse.linuxtools.oprofile.core.linux.x86_64=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0,,org.eclipse.linuxtools.oprofile.core.linux.x86_64
+plugin@org.eclipse.linuxtools.oprofile.launch=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0,,org.eclipse.linuxtools.oprofile.launch
+plugin@org.eclipse.linuxtools.oprofile.launch.tests=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0,,org.eclipse.linuxtools.oprofile.launch.tests
+plugin@org.eclipse.linuxtools.oprofile.tests=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0,,org.eclipse.linuxtools.oprofile.tests
+plugin@org.eclipse.linuxtools.oprofile.ui=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0,,org.eclipse.linuxtools.oprofile.ui
+plugin@org.eclipse.linuxtools.oprofile.ui.tests=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0,,org.eclipse.linuxtools.oprofile.ui.tests
+feature@org.eclipse.linuxtools.oprofile=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0,,org.eclipse.linuxtools.oprofile-feature
+feature@org.eclipse.linuxtools.oprofile.test=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0,,org.eclipse.linuxtools.oprofile.test-feature
 
 !*** valgrind
-plugin@org.eclipse.linuxtools.valgrind.cachegrind=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind,,org.eclipse.linuxtools.valgrind.cachegrind
-plugin@org.eclipse.linuxtools.valgrind.cachegrind.tests=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind,,org.eclipse.linuxtools.valgrind.cachegrind.tests
-plugin@org.eclipse.linuxtools.valgrind.core=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind,,org.eclipse.linuxtools.valgrind.core
-plugin@org.eclipse.linuxtools.valgrind.doc=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind,,org.eclipse.linuxtools.valgrind.doc
-plugin@org.eclipse.linuxtools.valgrind.launch=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind,,org.eclipse.linuxtools.valgrind.launch
-plugin@org.eclipse.linuxtools.valgrind.massif=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind,,org.eclipse.linuxtools.valgrind.massif
-plugin@org.eclipse.linuxtools.valgrind.massif.tests=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind,,org.eclipse.linuxtools.valgrind.massif.tests
-plugin@org.eclipse.linuxtools.valgrind.memcheck=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind,,org.eclipse.linuxtools.valgrind.memcheck
-plugin@org.eclipse.linuxtools.valgrind.memcheck.tests=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind,,org.eclipse.linuxtools.valgrind.memcheck.tests
-plugin@org.eclipse.linuxtools.valgrind.tests=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind,,org.eclipse.linuxtools.valgrind.tests
-plugin@org.eclipse.linuxtools.valgrind.ui=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind,,org.eclipse.linuxtools.valgrind.ui
-plugin@org.eclipse.linuxtools.valgrind.ui.editor=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind,,org.eclipse.linuxtools.valgrind.ui.editor
-feature@org.eclipse.linuxtools.valgrind=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind,,org.eclipse.linuxtools.valgrind-feature
-feature@org.eclipse.linuxtools.valgrind.test=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind,,org.eclipse.linuxtools.valgrind.test-feature
+plugin@org.eclipse.linuxtools.valgrind.cachegrind=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0,,org.eclipse.linuxtools.valgrind.cachegrind
+plugin@org.eclipse.linuxtools.valgrind.cachegrind.tests=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0,,org.eclipse.linuxtools.valgrind.cachegrind.tests
+plugin@org.eclipse.linuxtools.valgrind.core=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0,,org.eclipse.linuxtools.valgrind.core
+plugin@org.eclipse.linuxtools.valgrind.doc=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0,,org.eclipse.linuxtools.valgrind.doc
+plugin@org.eclipse.linuxtools.valgrind.launch=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0,,org.eclipse.linuxtools.valgrind.launch
+plugin@org.eclipse.linuxtools.valgrind.massif=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0,,org.eclipse.linuxtools.valgrind.massif
+plugin@org.eclipse.linuxtools.valgrind.massif.tests=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0,,org.eclipse.linuxtools.valgrind.massif.tests
+plugin@org.eclipse.linuxtools.valgrind.memcheck=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0,,org.eclipse.linuxtools.valgrind.memcheck
+plugin@org.eclipse.linuxtools.valgrind.memcheck.tests=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0,,org.eclipse.linuxtools.valgrind.memcheck.tests
+plugin@org.eclipse.linuxtools.valgrind.tests=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0,,org.eclipse.linuxtools.valgrind.tests
+plugin@org.eclipse.linuxtools.valgrind.ui=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0,,org.eclipse.linuxtools.valgrind.ui
+plugin@org.eclipse.linuxtools.valgrind.ui.editor=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0,,org.eclipse.linuxtools.valgrind.ui.editor
+feature@org.eclipse.linuxtools.valgrind=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0,,org.eclipse.linuxtools.valgrind-feature
+feature@org.eclipse.linuxtools.valgrind.test=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0,,org.eclipse.linuxtools.valgrind.test-feature
 
 !*** tmf
-plugin@org.eclipse.linuxtools.tmf=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng,,org.eclipse.linuxtools.tmf
-plugin@org.eclipse.linuxtools.tmf.doc=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng,,org.eclipse.linuxtools.tmf.doc
-plugin@org.eclipse.linuxtools.tmf.tests=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng,,org.eclipse.linuxtools.tmf.tests
-plugin@org.eclipse.linuxtools.tmf.ui=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng,,org.eclipse.linuxtools.tmf.ui
-plugin@org.eclipse.linuxtools.tmf.ui.tests=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng,,org.eclipse.linuxtools.tmf.ui.tests
-feature@org.eclipse.linuxtools.tmf=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng,,org.eclipse.linuxtools.tmf-feature
-feature@org.eclipse.linuxtools.tmf.tests=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng,,org.eclipse.linuxtools.tmf.test-feature
+plugin@org.eclipse.linuxtools.tmf=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0,,org.eclipse.linuxtools.tmf
+plugin@org.eclipse.linuxtools.tmf.doc=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0,,org.eclipse.linuxtools.tmf.doc
+plugin@org.eclipse.linuxtools.tmf.tests=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0,,org.eclipse.linuxtools.tmf.tests
+plugin@org.eclipse.linuxtools.tmf.ui=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0,,org.eclipse.linuxtools.tmf.ui
+plugin@org.eclipse.linuxtools.tmf.ui.tests=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0,,org.eclipse.linuxtools.tmf.ui.tests
+feature@org.eclipse.linuxtools.tmf=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0,,org.eclipse.linuxtools.tmf-feature
+feature@org.eclipse.linuxtools.tmf.tests=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0,,org.eclipse.linuxtools.tmf.test-feature
 
 !*** lttng
-plugin@org.eclipse.linuxtools.lttng=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng,,org.eclipse.linuxtools.lttng
-plugin@org.eclipse.linuxtools.lttng.jni=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng,,org.eclipse.linuxtools.lttng.jni
-plugin@org.eclipse.linuxtools.lttng.help=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng,,org.eclipse.linuxtools.lttng.help
-plugin@org.eclipse.linuxtools.lttng.tests=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng,,org.eclipse.linuxtools.lttng.tests
-plugin@org.eclipse.linuxtools.lttng.ui=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng,,org.eclipse.linuxtools.lttng.ui
-plugin@org.eclipse.linuxtools.lttng.ui.tests=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng,,org.eclipse.linuxtools.lttng.ui.tests
-feature@org.eclipse.linuxtools.lttng=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng,,org.eclipse.linuxtools.lttng-feature
-feature@org.eclipse.linuxtools.lttng.tests=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng,,org.eclipse.linuxtools.lttng.test-feature
+plugin@org.eclipse.linuxtools.lttng=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0,,org.eclipse.linuxtools.lttng
+plugin@org.eclipse.linuxtools.lttng.jni=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0,,org.eclipse.linuxtools.lttng.jni
+plugin@org.eclipse.linuxtools.lttng.help=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0,,org.eclipse.linuxtools.lttng.help
+plugin@org.eclipse.linuxtools.lttng.tests=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0,,org.eclipse.linuxtools.lttng.tests
+plugin@org.eclipse.linuxtools.lttng.ui=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0,,org.eclipse.linuxtools.lttng.ui
+plugin@org.eclipse.linuxtools.lttng.ui.tests=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0,,org.eclipse.linuxtools.lttng.ui.tests
+feature@org.eclipse.linuxtools.lttng=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0,,org.eclipse.linuxtools.lttng-feature
+feature@org.eclipse.linuxtools.lttng.tests=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0,,org.eclipse.linuxtools.lttng.test-feature
 
 !*** gcov
-plugin@org.eclipse.linuxtools.dataviewers.annotatedsourceeditor=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov,,org.eclipse.linuxtools.dataviewers.annotatedsourceeditor
-plugin@org.eclipse.linuxtools.dataviewers.charts=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov,,org.eclipse.linuxtools.dataviewers.charts
-plugin@org.eclipse.linuxtools.gcov=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov,,org.eclipse.linuxtools.gcov
-fragment@org.eclipse.linuxtools.gcov.test=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov,,org.eclipse.linuxtools.gcov.test
-feature@org.eclipse.linuxtools.gcov=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov,,org.eclipse.linuxtools.gcov-feature
+plugin@org.eclipse.linuxtools.dataviewers.annotatedsourceeditor=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov/branches/0.5.0,,org.eclipse.linuxtools.dataviewers.annotatedsourceeditor
+plugin@org.eclipse.linuxtools.dataviewers.charts=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov/branches/0.5.0,,org.eclipse.linuxtools.dataviewers.charts
+plugin@org.eclipse.linuxtools.gcov=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov/branches/0.5.0,,org.eclipse.linuxtools.gcov
+fragment@org.eclipse.linuxtools.gcov.test=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov/branches/0.5.0,,org.eclipse.linuxtools.gcov.test
+feature@org.eclipse.linuxtools.gcov=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov/branches/0.5.0,,org.eclipse.linuxtools.gcov-feature
 
-feature@org.eclipse.linuxtools.all=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/releng,,org.eclipse.linuxtools.all
-feature@org.eclipse.linuxtools.test=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/releng,,org.eclipse.linuxtools.test-feature
-plugin@org.eclipse.linuxtools.tests=SVN,trunk,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/releng,,org.eclipse.linuxtools.tests
+feature@org.eclipse.linuxtools.all=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/releng/branches/0.5.0,,org.eclipse.linuxtools.all
+feature@org.eclipse.linuxtools.test=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/releng/branches/0.5.0,,org.eclipse.linuxtools.test-feature
+plugin@org.eclipse.linuxtools.tests=SVN,,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/releng/branches/0.5.0,,org.eclipse.linuxtools.tests
 
 !*** used for tests
 plugin@org.eclipse.test=v20080313,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
diff --git a/releng/org.eclipse.linuxtools.releng/psfs/callgraph.psf b/releng/org.eclipse.linuxtools.releng/psfs/callgraph.psf
index 8eb2ec4..c88a124 100644
--- a/releng/org.eclipse.linuxtools.releng/psfs/callgraph.psf
+++ b/releng/org.eclipse.linuxtools.releng/psfs/callgraph.psf
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <psf version="2.0">
 <provider id="org.tigris.subversion.subclipse.core.svnnature">
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.callgraph-feature,org.eclipse.linuxtools.callgraph-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.callgraph,org.eclipse.linuxtools.callgraph"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.callgraph.tests,org.eclipse.linuxtools.callgraph.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.callgraph.core,org.eclipse.linuxtools.callgraph.core"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.callgraph.launch,org.eclipse.linuxtools.callgraph.launch"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.callgraph.launch.tests,org.eclipse.linuxtools.callgraph.launch.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.callgraph.tests-feature,org.eclipse.linuxtools.callgraph.tests-feature"/>
-<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/trunk/org.eclipse.linuxtools.profiling-feature,org.eclipse.linuxtools.profiling-feature"/>
-<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/trunk/org.eclipse.linuxtools.profiling.launch,org.eclipse.linuxtools.profiling.launch"/>
-<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/trunk/org.eclipse.linuxtools.profiling.test-feature,org.eclipse.linuxtools.profiling.test-feature"/>
-<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/trunk/org.eclipse.linuxtools.profiling.tests,org.eclipse.linuxtools.profiling.tests"/>
-<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/trunk/org.eclipse.linuxtools.profiling.ui,org.eclipse.linuxtools.profiling.ui"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.callgraph-feature,org.eclipse.linuxtools.callgraph-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.callgraph,org.eclipse.linuxtools.callgraph"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.callgraph.tests,org.eclipse.linuxtools.callgraph.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.callgraph.core,org.eclipse.linuxtools.callgraph.core"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.callgraph.launch,org.eclipse.linuxtools.callgraph.launch"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.callgraph.launch.tests,org.eclipse.linuxtools.callgraph.launch.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.callgraph.tests-feature,org.eclipse.linuxtools.callgraph.tests-feature"/>
+<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0/org.eclipse.linuxtools.profiling-feature,org.eclipse.linuxtools.profiling-feature"/>
+<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0/org.eclipse.linuxtools.profiling.launch,org.eclipse.linuxtools.profiling.launch"/>
+<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0/org.eclipse.linuxtools.profiling.test-feature,org.eclipse.linuxtools.profiling.test-feature"/>
+<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0/org.eclipse.linuxtools.profiling.tests,org.eclipse.linuxtools.profiling.tests"/>
+<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0/org.eclipse.linuxtools.profiling.ui,org.eclipse.linuxtools.profiling.ui"/>
 </provider>
 </psf>
\ No newline at end of file
diff --git a/releng/org.eclipse.linuxtools.releng/psfs/changelog.psf b/releng/org.eclipse.linuxtools.releng/psfs/changelog.psf
index 250cdd4..aaa1f4c 100644
--- a/releng/org.eclipse.linuxtools.releng/psfs/changelog.psf
+++ b/releng/org.eclipse.linuxtools.releng/psfs/changelog.psf
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <psf version="2.0">
 <provider id="org.tigris.subversion.subclipse.core.svnnature">
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/trunk/org.eclipse.linuxtools.changelog-feature,org.eclipse.linuxtools.changelog-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/trunk/org.eclipse.linuxtools.changelog.core,org.eclipse.linuxtools.changelog.core"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/trunk/org.eclipse.linuxtools.changelog.cparser,org.eclipse.linuxtools.changelog.cparser"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/trunk/org.eclipse.linuxtools.changelog.doc,org.eclipse.linuxtools.changelog.doc"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/trunk/org.eclipse.linuxtools.changelog.javaparser,org.eclipse.linuxtools.changelog.javaparser"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/branches/0.5.0/org.eclipse.linuxtools.changelog-feature,org.eclipse.linuxtools.changelog-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/branches/0.5.0/org.eclipse.linuxtools.changelog.core,org.eclipse.linuxtools.changelog.core"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/branches/0.5.0/org.eclipse.linuxtools.changelog.cparser,org.eclipse.linuxtools.changelog.cparser"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/branches/0.5.0/org.eclipse.linuxtools.changelog.doc,org.eclipse.linuxtools.changelog.doc"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/branches/0.5.0/org.eclipse.linuxtools.changelog.javaparser,org.eclipse.linuxtools.changelog.javaparser"/>
 </provider>
 </psf>
diff --git a/releng/org.eclipse.linuxtools.releng/psfs/eclipse-build.psf b/releng/org.eclipse.linuxtools.releng/psfs/eclipse-build.psf
index 7913fdc..a9719ee 100644
--- a/releng/org.eclipse.linuxtools.releng/psfs/eclipse-build.psf
+++ b/releng/org.eclipse.linuxtools.releng/psfs/eclipse-build.psf
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <psf version="2.0">
 <provider id="org.tigris.subversion.subclipse.core.svnnature">
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/eclipse-build/trunk/eclipse-build,eclipse-build"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/eclipse-build/trunk/eclipse-build-config,eclipse-build-config"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/eclipse-build/trunk/eclipse-build-feature,eclipse-build-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/eclipse-build/branches/0.5.0/eclipse-build,eclipse-build"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/eclipse-build/branches/0.5.0/eclipse-build-config,eclipse-build-config"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/eclipse-build/branches/0.5.0/eclipse-build-feature,eclipse-build-feature"/>
 </provider>
 </psf>
\ No newline at end of file
diff --git a/releng/org.eclipse.linuxtools.releng/psfs/gcov.psf b/releng/org.eclipse.linuxtools.releng/psfs/gcov.psf
index 92efaed..3ba1db3 100644
--- a/releng/org.eclipse.linuxtools.releng/psfs/gcov.psf
+++ b/releng/org.eclipse.linuxtools.releng/psfs/gcov.psf
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <psf version="2.0">
 <provider id="org.tigris.subversion.subclipse.core.svnnature">
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov/trunk/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor,org.eclipse.linuxtools.dataviewers.annotatedsourceeditor"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov/trunk/org.eclipse.linuxtools.dataviewers.charts,org.eclipse.linuxtools.dataviewers.charts"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov/trunk/org.eclipse.linuxtools.gcov,org.eclipse.linuxtools.gcov"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov/trunk/org.eclipse.linuxtools.gcov-feature,org.eclipse.linuxtools.gcov-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov/trunk/org.eclipse.linuxtools.gcov.test,org.eclipse.linuxtools.gcov.test"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov/branches/0.5.0/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor,org.eclipse.linuxtools.dataviewers.annotatedsourceeditor"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov/branches/0.5.0/org.eclipse.linuxtools.dataviewers.charts,org.eclipse.linuxtools.dataviewers.charts"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov/branches/0.5.0/org.eclipse.linuxtools.gcov,org.eclipse.linuxtools.gcov"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov/branches/0.5.0/org.eclipse.linuxtools.gcov-feature,org.eclipse.linuxtools.gcov-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov/branches/0.5.0/org.eclipse.linuxtools.gcov.test,org.eclipse.linuxtools.gcov.test"/>
 </provider>
 </psf>
diff --git a/releng/org.eclipse.linuxtools.releng/psfs/gprof.psf b/releng/org.eclipse.linuxtools.releng/psfs/gprof.psf
index 2cd3b0f..670bb18 100644
--- a/releng/org.eclipse.linuxtools.releng/psfs/gprof.psf
+++ b/releng/org.eclipse.linuxtools.releng/psfs/gprof.psf
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <psf version="2.0">
 <provider id="org.tigris.subversion.subclipse.core.svnnature">
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof/trunk/org.eclipse.linuxtools.binutils,org.eclipse.linuxtools.binutils"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof/trunk/org.eclipse.linuxtools.dataviewers,org.eclipse.linuxtools.dataviewers"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof/trunk/org.eclipse.linuxtools.gprof,org.eclipse.linuxtools.gprof"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof/trunk/org.eclipse.linuxtools.gprof-feature,org.eclipse.linuxtools.gprof-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof/trunk/org.eclipse.linuxtools.gprof.test,org.eclipse.linuxtools.gprof.test"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof/branches/0.5.0/org.eclipse.linuxtools.binutils,org.eclipse.linuxtools.binutils"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof/branches/0.5.0/org.eclipse.linuxtools.dataviewers,org.eclipse.linuxtools.dataviewers"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof/branches/0.5.0/org.eclipse.linuxtools.gprof,org.eclipse.linuxtools.gprof"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof/branches/0.5.0/org.eclipse.linuxtools.gprof-feature,org.eclipse.linuxtools.gprof-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof/branches/0.5.0/org.eclipse.linuxtools.gprof.test,org.eclipse.linuxtools.gprof.test"/>
 </provider>
 </psf>
diff --git a/releng/org.eclipse.linuxtools.releng/psfs/libhover.psf b/releng/org.eclipse.linuxtools.releng/psfs/libhover.psf
index a134749..c9495f3 100644
--- a/releng/org.eclipse.linuxtools.releng/psfs/libhover.psf
+++ b/releng/org.eclipse.linuxtools.releng/psfs/libhover.psf
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <psf version="2.0">
 <provider id="org.tigris.subversion.subclipse.core.svnnature">
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/trunk/org.eclipse.linuxtools.cdt.libhover,org.eclipse.linuxtools.cdt.libhover"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/trunk/org.eclipse.linuxtools.cdt.libhover-feature,org.eclipse.linuxtools.cdt.libhover-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/trunk/org.eclipse.linuxtools.cdt.libhover.glibc,org.eclipse.linuxtools.cdt.libhover.glibc"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/trunk/org.eclipse.linuxtools.cdt.libhover.libstdcxx,org.eclipse.linuxtools.cdt.libhover.libstdcxx"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/trunk/org.eclipse.linuxtools.cdt.libhover.library-docs,org.eclipse.linuxtools.cdt.libhover.library-docs"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/trunk/org.eclipse.linuxtools.cdt.libhover.newlib,org.eclipse.linuxtools.cdt.libhover.newlib"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/trunk/org.eclipse.linuxtools.cdt.libhover.newlib-feature,org.eclipse.linuxtools.cdt.libhover.newlib-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/branches/0.5.0/org.eclipse.linuxtools.cdt.libhover,org.eclipse.linuxtools.cdt.libhover"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/branches/0.5.0/org.eclipse.linuxtools.cdt.libhover-feature,org.eclipse.linuxtools.cdt.libhover-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/branches/0.5.0/org.eclipse.linuxtools.cdt.libhover.glibc,org.eclipse.linuxtools.cdt.libhover.glibc"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/branches/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx,org.eclipse.linuxtools.cdt.libhover.libstdcxx"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/branches/0.5.0/org.eclipse.linuxtools.cdt.libhover.library-docs,org.eclipse.linuxtools.cdt.libhover.library-docs"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/branches/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib,org.eclipse.linuxtools.cdt.libhover.newlib"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/branches/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib-feature,org.eclipse.linuxtools.cdt.libhover.newlib-feature"/>
 </provider>
 </psf>
\ No newline at end of file
diff --git a/releng/org.eclipse.linuxtools.releng/psfs/linuxtools.psf b/releng/org.eclipse.linuxtools.releng/psfs/linuxtools.psf
index 4eb900e..df795cb 100644
--- a/releng/org.eclipse.linuxtools.releng/psfs/linuxtools.psf
+++ b/releng/org.eclipse.linuxtools.releng/psfs/linuxtools.psf
@@ -1,135 +1,135 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <psf version="2.0">
 <provider id="org.tigris.subversion.subclipse.core.svnnature">
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/trunk/org.eclipse.linuxtools.cdt.autotools,org.eclipse.linuxtools.cdt.autotools"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/trunk/org.eclipse.linuxtools.cdt.autotools.core,org.eclipse.linuxtools.cdt.autotools.core"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/trunk/org.eclipse.linuxtools.cdt.autotools.ui,org.eclipse.linuxtools.cdt.autotools.ui"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/trunk/org.eclipse.linuxtools.cdt.autotools-docs,org.eclipse.linuxtools.cdt.autotools-docs"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/trunk/org.eclipse.linuxtools.cdt.autotools-feature,org.eclipse.linuxtools.cdt.autotools-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/trunk/org.eclipse.linuxtools.cdt.autotools.tests,org.eclipse.linuxtools.cdt.autotools.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.callgraph-feature,org.eclipse.linuxtools.callgraph-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.callgraph,org.eclipse.linuxtools.callgraph"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.callgraph.tests,org.eclipse.linuxtools.callgraph.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.callgraph.core,org.eclipse.linuxtools.callgraph.core"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.callgraph.launch,org.eclipse.linuxtools.callgraph.launch"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.callgraph.launch.tests,org.eclipse.linuxtools.callgraph.launch.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.callgraph.tests-feature,org.eclipse.linuxtools.callgraph.tests-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/trunk/org.eclipse.linuxtools.changelog-feature,org.eclipse.linuxtools.changelog-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/trunk/org.eclipse.linuxtools.changelog.core,org.eclipse.linuxtools.changelog.core"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/trunk/org.eclipse.linuxtools.changelog.cparser,org.eclipse.linuxtools.changelog.cparser"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/trunk/org.eclipse.linuxtools.changelog.doc,org.eclipse.linuxtools.changelog.doc"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/trunk/org.eclipse.linuxtools.changelog.javaparser,org.eclipse.linuxtools.changelog.javaparser"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/trunk/org.eclipse.linuxtools.cdt.libhover,org.eclipse.linuxtools.cdt.libhover"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/trunk/org.eclipse.linuxtools.cdt.libhover-feature,org.eclipse.linuxtools.cdt.libhover-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/trunk/org.eclipse.linuxtools.cdt.libhover.glibc,org.eclipse.linuxtools.cdt.libhover.glibc"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/trunk/org.eclipse.linuxtools.cdt.libhover.libstdcxx,org.eclipse.linuxtools.cdt.libhover.libstdcxx"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/trunk/org.eclipse.linuxtools.cdt.libhover.library-docs,org.eclipse.linuxtools.cdt.libhover.library-docs"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/trunk/org.eclipse.linuxtools.cdt.libhover.newlib,org.eclipse.linuxtools.cdt.libhover.newlib"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/trunk/org.eclipse.linuxtools.cdt.libhover.newlib-feature,org.eclipse.linuxtools.cdt.libhover.newlib-feature"/><project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof/trunk/org.eclipse.linuxtools.binutils,org.eclipse.linuxtools.binutils"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/eclipse-build/trunk/eclipse-build,eclipse-build"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/eclipse-build/trunk/eclipse-build-config,eclipse-build-config"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/eclipse-build/trunk/eclipse-build-feature,eclipse-build-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof/trunk/org.eclipse.linuxtools.binutils,org.eclipse.linuxtools.binutils"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof/trunk/org.eclipse.linuxtools.dataviewers,org.eclipse.linuxtools.dataviewers"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof/trunk/org.eclipse.linuxtools.gprof,org.eclipse.linuxtools.gprof"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof/trunk/org.eclipse.linuxtools.gprof-feature,org.eclipse.linuxtools.gprof-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof/trunk/org.eclipse.linuxtools.gprof.test,org.eclipse.linuxtools.gprof.test"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/trunk/org.eclipse.linuxtools.oprofile-feature,org.eclipse.linuxtools.oprofile-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/trunk/org.eclipse.linuxtools.oprofile.core,org.eclipse.linuxtools.oprofile.core"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/trunk/org.eclipse.linuxtools.oprofile.core.tests,org.eclipse.linuxtools.oprofile.core.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/trunk/org.eclipse.linuxtools.oprofile.core.linux.ppc,org.eclipse.linuxtools.oprofile.core.linux.ppc"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/trunk/org.eclipse.linuxtools.oprofile.core.linux.x86,org.eclipse.linuxtools.oprofile.core.linux.x86"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/trunk/org.eclipse.linuxtools.oprofile.core.linux.x86_64,org.eclipse.linuxtools.oprofile.core.linux.x86_64"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/trunk/org.eclipse.linuxtools.oprofile.doc,org.eclipse.linuxtools.oprofile.doc"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/trunk/org.eclipse.linuxtools.oprofile.launch,org.eclipse.linuxtools.oprofile.launch"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/trunk/org.eclipse.linuxtools.oprofile.launch.tests,org.eclipse.linuxtools.oprofile.launch.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/trunk/org.eclipse.linuxtools.oprofile.tests,org.eclipse.linuxtools.oprofile.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/trunk/org.eclipse.linuxtools.oprofile.test-feature,org.eclipse.linuxtools.oprofile.test-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/trunk/org.eclipse.linuxtools.oprofile.ui,org.eclipse.linuxtools.oprofile.ui"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/trunk/org.eclipse.linuxtools.oprofile.ui.tests,org.eclipse.linuxtools.oprofile.ui.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/trunk/org.eclipse.linuxtools.profiling-feature,org.eclipse.linuxtools.profiling-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/trunk/org.eclipse.linuxtools.profiling.launch,org.eclipse.linuxtools.profiling.launch"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/trunk/org.eclipse.linuxtools.profiling.test-feature,org.eclipse.linuxtools.profiling.test-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/trunk/org.eclipse.linuxtools.profiling.tests,org.eclipse.linuxtools.profiling.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/trunk/org.eclipse.linuxtools.profiling.ui,org.eclipse.linuxtools.profiling.ui"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/releng/trunk/org.eclipse.linuxtools.all,org.eclipse.linuxtools.all"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/releng/trunk/org.eclipse.linuxtools.releng,org.eclipse.linuxtools.releng"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/branches/0.5.0/org.eclipse.linuxtools.cdt.autotools,org.eclipse.linuxtools.cdt.autotools"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/branches/0.5.0/org.eclipse.linuxtools.cdt.autotools.core,org.eclipse.linuxtools.cdt.autotools.core"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/branches/0.5.0/org.eclipse.linuxtools.cdt.autotools.ui,org.eclipse.linuxtools.cdt.autotools.ui"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/branches/0.5.0/org.eclipse.linuxtools.cdt.autotools-docs,org.eclipse.linuxtools.cdt.autotools-docs"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/branches/0.5.0/org.eclipse.linuxtools.cdt.autotools-feature,org.eclipse.linuxtools.cdt.autotools-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/branches/0.5.0/org.eclipse.linuxtools.cdt.autotools.tests,org.eclipse.linuxtools.cdt.autotools.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.callgraph-feature,org.eclipse.linuxtools.callgraph-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.callgraph,org.eclipse.linuxtools.callgraph"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.callgraph.tests,org.eclipse.linuxtools.callgraph.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.callgraph.core,org.eclipse.linuxtools.callgraph.core"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.callgraph.launch,org.eclipse.linuxtools.callgraph.launch"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.callgraph.launch.tests,org.eclipse.linuxtools.callgraph.launch.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.callgraph.tests-feature,org.eclipse.linuxtools.callgraph.tests-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/branches/0.5.0/org.eclipse.linuxtools.changelog-feature,org.eclipse.linuxtools.changelog-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/branches/0.5.0/org.eclipse.linuxtools.changelog.core,org.eclipse.linuxtools.changelog.core"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/branches/0.5.0/org.eclipse.linuxtools.changelog.cparser,org.eclipse.linuxtools.changelog.cparser"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/branches/0.5.0/org.eclipse.linuxtools.changelog.doc,org.eclipse.linuxtools.changelog.doc"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/branches/0.5.0/org.eclipse.linuxtools.changelog.javaparser,org.eclipse.linuxtools.changelog.javaparser"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/branches/0.5.0/org.eclipse.linuxtools.cdt.libhover,org.eclipse.linuxtools.cdt.libhover"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/branches/0.5.0/org.eclipse.linuxtools.cdt.libhover-feature,org.eclipse.linuxtools.cdt.libhover-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/branches/0.5.0/org.eclipse.linuxtools.cdt.libhover.glibc,org.eclipse.linuxtools.cdt.libhover.glibc"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/branches/0.5.0/org.eclipse.linuxtools.cdt.libhover.libstdcxx,org.eclipse.linuxtools.cdt.libhover.libstdcxx"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/branches/0.5.0/org.eclipse.linuxtools.cdt.libhover.library-docs,org.eclipse.linuxtools.cdt.libhover.library-docs"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/branches/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib,org.eclipse.linuxtools.cdt.libhover.newlib"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/branches/0.5.0/org.eclipse.linuxtools.cdt.libhover.newlib-feature,org.eclipse.linuxtools.cdt.libhover.newlib-feature"/><project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof/branches/0.5.0/org.eclipse.linuxtools.binutils,org.eclipse.linuxtools.binutils"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/eclipse-build/branches/0.5.0/eclipse-build,eclipse-build"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/eclipse-build/branches/0.5.0/eclipse-build-config,eclipse-build-config"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/eclipse-build/branches/0.5.0/eclipse-build-feature,eclipse-build-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof/branches/0.5.0/org.eclipse.linuxtools.binutils,org.eclipse.linuxtools.binutils"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof/branches/0.5.0/org.eclipse.linuxtools.dataviewers,org.eclipse.linuxtools.dataviewers"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof/branches/0.5.0/org.eclipse.linuxtools.gprof,org.eclipse.linuxtools.gprof"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof/branches/0.5.0/org.eclipse.linuxtools.gprof-feature,org.eclipse.linuxtools.gprof-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gprof/branches/0.5.0/org.eclipse.linuxtools.gprof.test,org.eclipse.linuxtools.gprof.test"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0/org.eclipse.linuxtools.oprofile-feature,org.eclipse.linuxtools.oprofile-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0/org.eclipse.linuxtools.oprofile.core,org.eclipse.linuxtools.oprofile.core"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0/org.eclipse.linuxtools.oprofile.core.tests,org.eclipse.linuxtools.oprofile.core.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0/org.eclipse.linuxtools.oprofile.core.linux.ppc,org.eclipse.linuxtools.oprofile.core.linux.ppc"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0/org.eclipse.linuxtools.oprofile.core.linux.x86,org.eclipse.linuxtools.oprofile.core.linux.x86"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0/org.eclipse.linuxtools.oprofile.core.linux.x86_64,org.eclipse.linuxtools.oprofile.core.linux.x86_64"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0/org.eclipse.linuxtools.oprofile.doc,org.eclipse.linuxtools.oprofile.doc"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0/org.eclipse.linuxtools.oprofile.launch,org.eclipse.linuxtools.oprofile.launch"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0/org.eclipse.linuxtools.oprofile.launch.tests,org.eclipse.linuxtools.oprofile.launch.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0/org.eclipse.linuxtools.oprofile.tests,org.eclipse.linuxtools.oprofile.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0/org.eclipse.linuxtools.oprofile.test-feature,org.eclipse.linuxtools.oprofile.test-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0/org.eclipse.linuxtools.oprofile.ui,org.eclipse.linuxtools.oprofile.ui"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0/org.eclipse.linuxtools.oprofile.ui.tests,org.eclipse.linuxtools.oprofile.ui.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0/org.eclipse.linuxtools.profiling-feature,org.eclipse.linuxtools.profiling-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0/org.eclipse.linuxtools.profiling.launch,org.eclipse.linuxtools.profiling.launch"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0/org.eclipse.linuxtools.profiling.test-feature,org.eclipse.linuxtools.profiling.test-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0/org.eclipse.linuxtools.profiling.tests,org.eclipse.linuxtools.profiling.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0/org.eclipse.linuxtools.profiling.ui,org.eclipse.linuxtools.profiling.ui"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/releng/branches/0.5.0/org.eclipse.linuxtools.all,org.eclipse.linuxtools.all"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/releng/branches/0.5.0/org.eclipse.linuxtools.releng,org.eclipse.linuxtools.releng"/>
 
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/releng/trunk/org.eclipse.linuxtools.test-feature,org.eclipse.linuxtools.test-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/releng/trunk/org.eclipse.linuxtools.tests,org.eclipse.linuxtools.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/releng/branches/0.5.0/org.eclipse.linuxtools.test-feature,org.eclipse.linuxtools.test-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/releng/branches/0.5.0/org.eclipse.linuxtools.tests,org.eclipse.linuxtools.tests"/>
 
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/trunk/org.eclipse.linuxtools.rpm.core,org.eclipse.linuxtools.rpm.core"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/trunk/org.eclipse.linuxtools.rpm.core.tests,org.eclipse.linuxtools.rpm.core.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/trunk/org.eclipse.linuxtools.rpm.rpmlint,org.eclipse.linuxtools.rpm.rpmlint"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/trunk/org.eclipse.linuxtools.rpm.ui,org.eclipse.linuxtools.rpm.ui"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/trunk/org.eclipse.linuxtools.rpm.ui.editor,org.eclipse.linuxtools.rpm.ui.editor"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/trunk/org.eclipse.linuxtools.rpm.ui.editor.doc,org.eclipse.linuxtools.rpm.ui.editor.doc"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/trunk/org.eclipse.linuxtools.rpm.ui.editor-feature,org.eclipse.linuxtools.rpm.ui.editor-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/trunk/org.eclipse.linuxtools.rpm.ui.editor.tests,org.eclipse.linuxtools.rpm.ui.editor.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/trunk/org.eclipse.linuxtools.rpm-feature,org.eclipse.linuxtools.rpm-feature"/>>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpmstubby/trunk/org.eclipse.linuxtools.rpmstubby,org.eclipse.linuxtools.rpmstubby"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpmstubby/trunk/org.eclipse.linuxtools.rpmstubby-feature,org.eclipse.linuxtools.rpmstubby-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.backup-feature,org.eclipse.linuxtools.systemtap.backup-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.backup.ui.editor,org.eclipse.linuxtools.systemtap.backup.ui.editor"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.ui.consolelog,org.eclipse.linuxtools.systemtap.ui.consolelog"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.ui.editor,org.eclipse.linuxtools.systemtap.ui.editor"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap-feature,org.eclipse.linuxtools.systemtap-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.ui.graphing,org.eclipse.linuxtools.systemtap.ui.graphing"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui,org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui,org.eclipse.linuxtools.systemtap.ui.graphingapi.ui"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.ui.ide,org.eclipse.linuxtools.systemtap.ui.ide"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.ui.logging,org.eclipse.linuxtools.systemtap.ui.logging"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.ui.structures,org.eclipse.linuxtools.systemtap.ui.structures"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.ui.systemtapgui,org.eclipse.linuxtools.systemtap.ui.systemtapgui"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.ui.dashboard,org.eclipse.linuxtools.systemtap.ui.dashboard"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.ui.dashboardextension,org.eclipse.linuxtools.systemtap.ui.dashboardextension"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.ui.graphicalrun,org.eclipse.linuxtools.systemtap.ui.graphicalrun"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/trunk/org.eclipse.linuxtools.profiling-feature,org.eclipse.linuxtools.profiling-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/trunk/org.eclipse.linuxtools.profiling.launch,org.eclipse.linuxtools.profiling.launch"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/trunk/org.eclipse.linuxtools.profiling.test-feature,org.eclipse.linuxtools.profiling.test-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/trunk/org.eclipse.linuxtools.profiling.tests,org.eclipse.linuxtools.profiling.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/trunk/org.eclipse.linuxtools.profiling.ui,org.eclipse.linuxtools.profiling.ui"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind-feature,org.eclipse.linuxtools.valgrind-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.cachegrind,org.eclipse.linuxtools.valgrind.cachegrind"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.cachegrind.tests,org.eclipse.linuxtools.valgrind.cachegrind.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.core,org.eclipse.linuxtools.valgrind.core"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.doc,org.eclipse.linuxtools.valgrind.doc"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.launch,org.eclipse.linuxtools.valgrind.launch"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.massif,org.eclipse.linuxtools.valgrind.massif"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.massif.tests,org.eclipse.linuxtools.valgrind.massif.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.memcheck,org.eclipse.linuxtools.valgrind.memcheck"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.memcheck.tests,org.eclipse.linuxtools.valgrind.memcheck.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.test-feature,org.eclipse.linuxtools.valgrind.test-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.tests,org.eclipse.linuxtools.valgrind.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.ui,org.eclipse.linuxtools.valgrind.ui"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.ui.editor,org.eclipse.linuxtools.valgrind.ui.editor"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/trunk/org.eclipse.linuxtools.profiling.tests,org.eclipse.linuxtools.profiling.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.massif.tests,org.eclipse.linuxtools.valgrind.massif.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.memcheck.tests,org.eclipse.linuxtools.valgrind.memcheck.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.tests,org.eclipse.linuxtools.valgrind.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/branches/0.5.0/org.eclipse.linuxtools.rpm.core,org.eclipse.linuxtools.rpm.core"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/branches/0.5.0/org.eclipse.linuxtools.rpm.core.tests,org.eclipse.linuxtools.rpm.core.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/branches/0.5.0/org.eclipse.linuxtools.rpm.rpmlint,org.eclipse.linuxtools.rpm.rpmlint"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/branches/0.5.0/org.eclipse.linuxtools.rpm.ui,org.eclipse.linuxtools.rpm.ui"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/branches/0.5.0/org.eclipse.linuxtools.rpm.ui.editor,org.eclipse.linuxtools.rpm.ui.editor"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/branches/0.5.0/org.eclipse.linuxtools.rpm.ui.editor.doc,org.eclipse.linuxtools.rpm.ui.editor.doc"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/branches/0.5.0/org.eclipse.linuxtools.rpm.ui.editor-feature,org.eclipse.linuxtools.rpm.ui.editor-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/branches/0.5.0/org.eclipse.linuxtools.rpm.ui.editor.tests,org.eclipse.linuxtools.rpm.ui.editor.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/branches/0.5.0/org.eclipse.linuxtools.rpm-feature,org.eclipse.linuxtools.rpm-feature"/>>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpmstubby/branches/0.5.0/org.eclipse.linuxtools.rpmstubby,org.eclipse.linuxtools.rpmstubby"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpmstubby/branches/0.5.0/org.eclipse.linuxtools.rpmstubby-feature,org.eclipse.linuxtools.rpmstubby-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.backup-feature,org.eclipse.linuxtools.systemtap.backup-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.backup.ui.editor,org.eclipse.linuxtools.systemtap.backup.ui.editor"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.ui.consolelog,org.eclipse.linuxtools.systemtap.ui.consolelog"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.ui.editor,org.eclipse.linuxtools.systemtap.ui.editor"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap-feature,org.eclipse.linuxtools.systemtap-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.ui.graphing,org.eclipse.linuxtools.systemtap.ui.graphing"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui,org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui,org.eclipse.linuxtools.systemtap.ui.graphingapi.ui"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.ui.ide,org.eclipse.linuxtools.systemtap.ui.ide"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.ui.logging,org.eclipse.linuxtools.systemtap.ui.logging"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.ui.structures,org.eclipse.linuxtools.systemtap.ui.structures"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.ui.systemtapgui,org.eclipse.linuxtools.systemtap.ui.systemtapgui"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.ui.dashboard,org.eclipse.linuxtools.systemtap.ui.dashboard"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.ui.dashboardextension,org.eclipse.linuxtools.systemtap.ui.dashboardextension"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.ui.graphicalrun,org.eclipse.linuxtools.systemtap.ui.graphicalrun"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0/org.eclipse.linuxtools.profiling-feature,org.eclipse.linuxtools.profiling-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0/org.eclipse.linuxtools.profiling.launch,org.eclipse.linuxtools.profiling.launch"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0/org.eclipse.linuxtools.profiling.test-feature,org.eclipse.linuxtools.profiling.test-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0/org.eclipse.linuxtools.profiling.tests,org.eclipse.linuxtools.profiling.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0/org.eclipse.linuxtools.profiling.ui,org.eclipse.linuxtools.profiling.ui"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind-feature,org.eclipse.linuxtools.valgrind-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.cachegrind,org.eclipse.linuxtools.valgrind.cachegrind"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.cachegrind.tests,org.eclipse.linuxtools.valgrind.cachegrind.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.core,org.eclipse.linuxtools.valgrind.core"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.doc,org.eclipse.linuxtools.valgrind.doc"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.launch,org.eclipse.linuxtools.valgrind.launch"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.massif,org.eclipse.linuxtools.valgrind.massif"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.massif.tests,org.eclipse.linuxtools.valgrind.massif.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.memcheck,org.eclipse.linuxtools.valgrind.memcheck"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.memcheck.tests,org.eclipse.linuxtools.valgrind.memcheck.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.test-feature,org.eclipse.linuxtools.valgrind.test-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.tests,org.eclipse.linuxtools.valgrind.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.ui,org.eclipse.linuxtools.valgrind.ui"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.ui.editor,org.eclipse.linuxtools.valgrind.ui.editor"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0/org.eclipse.linuxtools.profiling.tests,org.eclipse.linuxtools.profiling.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.massif.tests,org.eclipse.linuxtools.valgrind.massif.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.memcheck.tests,org.eclipse.linuxtools.valgrind.memcheck.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.tests,org.eclipse.linuxtools.valgrind.tests"/>
 
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/man/trunk/org.eclipse.linuxtools.man-feature,org.eclipse.linuxtools.man-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/man/trunk/org.eclipse.linuxtools.man,org.eclipse.linuxtools.man"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/man/branches/0.5.0/org.eclipse.linuxtools.man-feature,org.eclipse.linuxtools.man-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/man/branches/0.5.0/org.eclipse.linuxtools.man,org.eclipse.linuxtools.man"/>
 
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.lttng,org.eclipse.linuxtools.lttng"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.lttng-feature,org.eclipse.linuxtools.lttng-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.lttng.help,org.eclipse.linuxtools.lttng.help"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.lttng.test-feature,org.eclipse.linuxtools.lttng.test-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.lttng.tests,org.eclipse.linuxtools.lttng.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.lttng.ui.tests,org.eclipse.linuxtools.lttng.ui.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.tmf,org.eclipse.linuxtools.tmf"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.tmf-feature,org.eclipse.linuxtools.tmf-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.tmf.doc,org.eclipse.linuxtools.tmf.doc"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.tmf.test-feature,org.eclipse.linuxtools.tmf.test-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.tmf.tests,org.eclipse.linuxtools.tmf.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.tmf.ui,org.eclipse.linuxtools.tmf.ui"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.tmf.ui.tests,org.eclipse.linuxtools.tmf.ui.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov/trunk/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor,org.eclipse.linuxtools.dataviewers.annotatedsourceeditor"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov/trunk/org.eclipse.linuxtools.dataviewers.charts,org.eclipse.linuxtools.dataviewers.charts"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov/trunk/org.eclipse.linuxtools.gcov,org.eclipse.linuxtools.gcov"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov/trunk/org.eclipse.linuxtools.gcov-feature,org.eclipse.linuxtools.gcov-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov/trunk/org.eclipse.linuxtools.gcov.test,org.eclipse.linuxtools.gcov.test"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.lttng,org.eclipse.linuxtools.lttng"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.lttng-feature,org.eclipse.linuxtools.lttng-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.lttng.help,org.eclipse.linuxtools.lttng.help"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.lttng.test-feature,org.eclipse.linuxtools.lttng.test-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.lttng.tests,org.eclipse.linuxtools.lttng.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.lttng.ui.tests,org.eclipse.linuxtools.lttng.ui.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.tmf,org.eclipse.linuxtools.tmf"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.tmf-feature,org.eclipse.linuxtools.tmf-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.tmf.doc,org.eclipse.linuxtools.tmf.doc"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.tmf.test-feature,org.eclipse.linuxtools.tmf.test-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.tmf.tests,org.eclipse.linuxtools.tmf.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.tmf.ui,org.eclipse.linuxtools.tmf.ui"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.tmf.ui.tests,org.eclipse.linuxtools.tmf.ui.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov/branches/0.5.0/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor,org.eclipse.linuxtools.dataviewers.annotatedsourceeditor"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov/branches/0.5.0/org.eclipse.linuxtools.dataviewers.charts,org.eclipse.linuxtools.dataviewers.charts"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov/branches/0.5.0/org.eclipse.linuxtools.gcov,org.eclipse.linuxtools.gcov"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov/branches/0.5.0/org.eclipse.linuxtools.gcov-feature,org.eclipse.linuxtools.gcov-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/gcov/branches/0.5.0/org.eclipse.linuxtools.gcov.test,org.eclipse.linuxtools.gcov.test"/>
 </provider>
 
 <provider id="org.eclipse.team.cvs.core.cvsnature">
diff --git a/releng/org.eclipse.linuxtools.releng/psfs/lttng.psf b/releng/org.eclipse.linuxtools.releng/psfs/lttng.psf
index 62411a2..ac1c8f5 100644
--- a/releng/org.eclipse.linuxtools.releng/psfs/lttng.psf
+++ b/releng/org.eclipse.linuxtools.releng/psfs/lttng.psf
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <psf version="2.0">
 <provider id="org.tigris.subversion.subclipse.core.svnnature">
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.lttng,org.eclipse.linuxtools.lttng"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.lttng-feature,org.eclipse.linuxtools.lttng-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.lttng.help,org.eclipse.linuxtools.lttng.help"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.lttng.test-feature,org.eclipse.linuxtools.lttng.test-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.lttng.tests,org.eclipse.linuxtools.lttng.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.lttng.ui.tests,org.eclipse.linuxtools.lttng.ui.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.tmf,org.eclipse.linuxtools.tmf"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.tmf-feature,org.eclipse.linuxtools.tmf-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.tmf.doc,org.eclipse.linuxtools.tmf.doc"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.tmf.test-feature,org.eclipse.linuxtools.tmf.test-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.tmf.tests,org.eclipse.linuxtools.tmf.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.tmf.ui,org.eclipse.linuxtools.tmf.ui"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/trunk/org.eclipse.linuxtools.tmf.ui.tests,org.eclipse.linuxtools.tmf.ui.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.lttng,org.eclipse.linuxtools.lttng"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.lttng-feature,org.eclipse.linuxtools.lttng-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.lttng.help,org.eclipse.linuxtools.lttng.help"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.lttng.test-feature,org.eclipse.linuxtools.lttng.test-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.lttng.tests,org.eclipse.linuxtools.lttng.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.lttng.ui.tests,org.eclipse.linuxtools.lttng.ui.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.tmf,org.eclipse.linuxtools.tmf"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.tmf-feature,org.eclipse.linuxtools.tmf-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.tmf.doc,org.eclipse.linuxtools.tmf.doc"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.tmf.test-feature,org.eclipse.linuxtools.tmf.test-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.tmf.tests,org.eclipse.linuxtools.tmf.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.tmf.ui,org.eclipse.linuxtools.tmf.ui"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/lttng/branches/0.5.0/org.eclipse.linuxtools.tmf.ui.tests,org.eclipse.linuxtools.tmf.ui.tests"/>
 </provider>
 </psf>
\ No newline at end of file
diff --git a/releng/org.eclipse.linuxtools.releng/psfs/manviewer.psf b/releng/org.eclipse.linuxtools.releng/psfs/manviewer.psf
index 0d42ace..07d23ed 100644
--- a/releng/org.eclipse.linuxtools.releng/psfs/manviewer.psf
+++ b/releng/org.eclipse.linuxtools.releng/psfs/manviewer.psf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <psf version="2.0">
 <provider id="org.tigris.subversion.subclipse.core.svnnature">
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/man/trunk/org.eclipse.linuxtools.man,org.eclipse.linuxtools.man"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/man/trunk/org.eclipse.linuxtools.man-feature,org.eclipse.linuxtools.man-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/man/branches/0.5.0/org.eclipse.linuxtools.man,org.eclipse.linuxtools.man"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/man/branches/0.5.0/org.eclipse.linuxtools.man-feature,org.eclipse.linuxtools.man-feature"/>
 </provider>
 </psf>
\ No newline at end of file
diff --git a/releng/org.eclipse.linuxtools.releng/psfs/oprofile.psf b/releng/org.eclipse.linuxtools.releng/psfs/oprofile.psf
index f1dcb42..05bbdf0 100644
--- a/releng/org.eclipse.linuxtools.releng/psfs/oprofile.psf
+++ b/releng/org.eclipse.linuxtools.releng/psfs/oprofile.psf
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <psf version="2.0">
 <provider id="org.tigris.subversion.subclipse.core.svnnature">
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/trunk/org.eclipse.linuxtools.oprofile-feature,org.eclipse.linuxtools.oprofile-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/trunk/org.eclipse.linuxtools.oprofile.core,org.eclipse.linuxtools.oprofile.core"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/trunk/org.eclipse.linuxtools.oprofile.core.tests,org.eclipse.linuxtools.oprofile.core.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/trunk/org.eclipse.linuxtools.oprofile.core.linux.ppc,org.eclipse.linuxtools.oprofile.core.linux.ppc"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/trunk/org.eclipse.linuxtools.oprofile.core.linux.x86,org.eclipse.linuxtools.oprofile.core.linux.x86"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/trunk/org.eclipse.linuxtools.oprofile.core.linux.x86_64,org.eclipse.linuxtools.oprofile.core.linux.x86_64"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/trunk/org.eclipse.linuxtools.oprofile.launch,org.eclipse.linuxtools.oprofile.launch"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/trunk/org.eclipse.linuxtools.oprofile.launch.tests,org.eclipse.linuxtools.oprofile.launch.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/trunk/org.eclipse.linuxtools.oprofile.tests,org.eclipse.linuxtools.oprofile.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/trunk/org.eclipse.linuxtools.oprofile.test-feature,org.eclipse.linuxtools.oprofile.test-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/trunk/org.eclipse.linuxtools.oprofile.ui,org.eclipse.linuxtools.oprofile.ui"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/trunk/org.eclipse.linuxtools.oprofile.ui.tests,org.eclipse.linuxtools.oprofile.ui.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/trunk/org.eclipse.linuxtools.profiling-feature,org.eclipse.linuxtools.profiling-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/trunk/org.eclipse.linuxtools.profiling.launch,org.eclipse.linuxtools.profiling.launch"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/trunk/org.eclipse.linuxtools.profiling.test-feature,org.eclipse.linuxtools.profiling.test-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/trunk/org.eclipse.linuxtools.profiling.tests,org.eclipse.linuxtools.profiling.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/trunk/org.eclipse.linuxtools.profiling.ui,org.eclipse.linuxtools.profiling.ui"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0/org.eclipse.linuxtools.oprofile-feature,org.eclipse.linuxtools.oprofile-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0/org.eclipse.linuxtools.oprofile.core,org.eclipse.linuxtools.oprofile.core"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0/org.eclipse.linuxtools.oprofile.core.tests,org.eclipse.linuxtools.oprofile.core.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0/org.eclipse.linuxtools.oprofile.core.linux.ppc,org.eclipse.linuxtools.oprofile.core.linux.ppc"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0/org.eclipse.linuxtools.oprofile.core.linux.x86,org.eclipse.linuxtools.oprofile.core.linux.x86"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0/org.eclipse.linuxtools.oprofile.core.linux.x86_64,org.eclipse.linuxtools.oprofile.core.linux.x86_64"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0/org.eclipse.linuxtools.oprofile.launch,org.eclipse.linuxtools.oprofile.launch"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0/org.eclipse.linuxtools.oprofile.launch.tests,org.eclipse.linuxtools.oprofile.launch.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0/org.eclipse.linuxtools.oprofile.tests,org.eclipse.linuxtools.oprofile.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0/org.eclipse.linuxtools.oprofile.test-feature,org.eclipse.linuxtools.oprofile.test-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0/org.eclipse.linuxtools.oprofile.ui,org.eclipse.linuxtools.oprofile.ui"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0/org.eclipse.linuxtools.oprofile.ui.tests,org.eclipse.linuxtools.oprofile.ui.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0/org.eclipse.linuxtools.profiling-feature,org.eclipse.linuxtools.profiling-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0/org.eclipse.linuxtools.profiling.launch,org.eclipse.linuxtools.profiling.launch"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0/org.eclipse.linuxtools.profiling.test-feature,org.eclipse.linuxtools.profiling.test-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0/org.eclipse.linuxtools.profiling.tests,org.eclipse.linuxtools.profiling.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0/org.eclipse.linuxtools.profiling.ui,org.eclipse.linuxtools.profiling.ui"/>
 </provider>
 <provider id="org.eclipse.team.cvs.core.cvsnature">
 <project reference="1.0,:pserver:dev.eclipse.org:/cvsroot/tools,org.eclipse.cdt/all/org.eclipse.cdt.core.tests,org.eclipse.cdt.core.tests,CDT_6_0_2"/>
diff --git a/releng/org.eclipse.linuxtools.releng/psfs/oprofiledocs.psf b/releng/org.eclipse.linuxtools.releng/psfs/oprofiledocs.psf
index 9be18a1..8d3b378 100644
--- a/releng/org.eclipse.linuxtools.releng/psfs/oprofiledocs.psf
+++ b/releng/org.eclipse.linuxtools.releng/psfs/oprofiledocs.psf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <psf version="2.0">
 <provider id="org.tigris.subversion.subclipse.core.svnnature">
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/trunk/org.eclipse.linuxtools.oprofile.doc,org.eclipse.linuxtools.oprofile.doc"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/branches/0.5.0/org.eclipse.linuxtools.oprofile.doc,org.eclipse.linuxtools.oprofile.doc"/>
 </provider>
 <provider id="org.eclipse.team.cvs.core.cvsnature">
 <project reference="1.0,:pserver:dev.eclipse.org:/cvsroot/tools,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.core,org.eclipse.mylyn.wikitext.core,R_3_1_1"/>
diff --git a/releng/org.eclipse.linuxtools.releng/psfs/rpm-editor.psf b/releng/org.eclipse.linuxtools.releng/psfs/rpm-editor.psf
index 2eb13ae..c15fd48 100644
--- a/releng/org.eclipse.linuxtools.releng/psfs/rpm-editor.psf
+++ b/releng/org.eclipse.linuxtools.releng/psfs/rpm-editor.psf
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <psf version="2.0">
 <provider id="org.tigris.subversion.subclipse.core.svnnature">
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/trunk/org.eclipse.linuxtools.rpm.core,org.eclipse.linuxtools.rpm.core"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/trunk/org.eclipse.linuxtools.rpm.core.tests,org.eclipse.linuxtools.rpm.core.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/trunk/org.eclipse.linuxtools.rpm.rpmlint,org.eclipse.linuxtools.rpm.rpmlint"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/trunk/org.eclipse.linuxtools.rpm.ui,org.eclipse.linuxtools.rpm.ui"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/trunk/org.eclipse.linuxtools.rpm.ui.editor,org.eclipse.linuxtools.rpm.ui.editor"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/trunk/org.eclipse.linuxtools.rpm.ui.editor.doc,org.eclipse.linuxtools.rpm.ui.editor.doc"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/trunk/org.eclipse.linuxtools.rpm.ui.editor-feature,org.eclipse.linuxtools.rpm.ui.editor-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/trunk/org.eclipse.linuxtools.rpm.ui.editor.tests,org.eclipse.linuxtools.rpm.ui.editor.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/trunk/org.eclipse.linuxtools.rpm-feature,org.eclipse.linuxtools.rpm-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/branches/0.5.0/org.eclipse.linuxtools.rpm.core,org.eclipse.linuxtools.rpm.core"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/branches/0.5.0/org.eclipse.linuxtools.rpm.core.tests,org.eclipse.linuxtools.rpm.core.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/branches/0.5.0/org.eclipse.linuxtools.rpm.rpmlint,org.eclipse.linuxtools.rpm.rpmlint"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/branches/0.5.0/org.eclipse.linuxtools.rpm.ui,org.eclipse.linuxtools.rpm.ui"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/branches/0.5.0/org.eclipse.linuxtools.rpm.ui.editor,org.eclipse.linuxtools.rpm.ui.editor"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/branches/0.5.0/org.eclipse.linuxtools.rpm.ui.editor.doc,org.eclipse.linuxtools.rpm.ui.editor.doc"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/branches/0.5.0/org.eclipse.linuxtools.rpm.ui.editor-feature,org.eclipse.linuxtools.rpm.ui.editor-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/branches/0.5.0/org.eclipse.linuxtools.rpm.ui.editor.tests,org.eclipse.linuxtools.rpm.ui.editor.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/branches/0.5.0/org.eclipse.linuxtools.rpm-feature,org.eclipse.linuxtools.rpm-feature"/>
 </provider>
 </psf>
\ No newline at end of file
diff --git a/releng/org.eclipse.linuxtools.releng/psfs/rpmstubby.psf b/releng/org.eclipse.linuxtools.releng/psfs/rpmstubby.psf
index 40ff5b1..f5e59ca 100644
--- a/releng/org.eclipse.linuxtools.releng/psfs/rpmstubby.psf
+++ b/releng/org.eclipse.linuxtools.releng/psfs/rpmstubby.psf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <psf version="2.0">
 <provider id="org.tigris.subversion.subclipse.core.svnnature">
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpmstubby/trunk/org.eclipse.linuxtools.rpmstubby,org.eclipse.linuxtools.rpmstubby"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpmstubby/trunk/org.eclipse.linuxtools.rpmstubby-feature,org.eclipse.linuxtools.rpmstubby-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpmstubby/branches/0.5.0/org.eclipse.linuxtools.rpmstubby,org.eclipse.linuxtools.rpmstubby"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpmstubby/branches/0.5.0/org.eclipse.linuxtools.rpmstubby-feature,org.eclipse.linuxtools.rpmstubby-feature"/>
 </provider>
 </psf>
diff --git a/releng/org.eclipse.linuxtools.releng/psfs/systemtap.psf b/releng/org.eclipse.linuxtools.releng/psfs/systemtap.psf
index c459d5c..7c62bea 100644
--- a/releng/org.eclipse.linuxtools.releng/psfs/systemtap.psf
+++ b/releng/org.eclipse.linuxtools.releng/psfs/systemtap.psf
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <psf version="2.0">
 <provider id="org.tigris.subversion.subclipse.core.svnnature">
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.backup-feature,org.eclipse.linuxtools.systemtap.backup-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.backup.ui.editor,org.eclipse.linuxtools.systemtap.backup.ui.editor"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.ui.consolelog,org.eclipse.linuxtools.systemtap.ui.consolelog"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.ui.editor,org.eclipse.linuxtools.systemtap.ui.editor"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap-feature,org.eclipse.linuxtools.systemtap-feature"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.ui.graphing,org.eclipse.linuxtools.systemtap.ui.graphing"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui,org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui,org.eclipse.linuxtools.systemtap.ui.graphingapi.ui"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.ui.ide,org.eclipse.linuxtools.systemtap.ui.ide"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.ui.logging,org.eclipse.linuxtools.systemtap.ui.logging"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.ui.structures,org.eclipse.linuxtools.systemtap.ui.structures"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.ui.systemtapgui,org.eclipse.linuxtools.systemtap.ui.systemtapgui"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.ui.dashboard,org.eclipse.linuxtools.systemtap.ui.dashboard"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.ui.dashboardextension,org.eclipse.linuxtools.systemtap.ui.dashboardextension"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/trunk/org.eclipse.linuxtools.systemtap.ui.graphicalrun,org.eclipse.linuxtools.systemtap.ui.graphicalrun"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.backup-feature,org.eclipse.linuxtools.systemtap.backup-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.backup.ui.editor,org.eclipse.linuxtools.systemtap.backup.ui.editor"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.ui.consolelog,org.eclipse.linuxtools.systemtap.ui.consolelog"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.ui.editor,org.eclipse.linuxtools.systemtap.ui.editor"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap-feature,org.eclipse.linuxtools.systemtap-feature"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.ui.graphing,org.eclipse.linuxtools.systemtap.ui.graphing"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui,org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui,org.eclipse.linuxtools.systemtap.ui.graphingapi.ui"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.ui.ide,org.eclipse.linuxtools.systemtap.ui.ide"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.ui.logging,org.eclipse.linuxtools.systemtap.ui.logging"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.ui.structures,org.eclipse.linuxtools.systemtap.ui.structures"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.ui.systemtapgui,org.eclipse.linuxtools.systemtap.ui.systemtapgui"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.ui.dashboard,org.eclipse.linuxtools.systemtap.ui.dashboard"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.ui.dashboardextension,org.eclipse.linuxtools.systemtap.ui.dashboardextension"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/systemtap/branches/0.5.0/org.eclipse.linuxtools.systemtap.ui.graphicalrun,org.eclipse.linuxtools.systemtap.ui.graphicalrun"/>
 </provider>
 </psf>
\ No newline at end of file
diff --git a/releng/org.eclipse.linuxtools.releng/psfs/valgrind-tests.psf b/releng/org.eclipse.linuxtools.releng/psfs/valgrind-tests.psf
index 5989656..5560106 100644
--- a/releng/org.eclipse.linuxtools.releng/psfs/valgrind-tests.psf
+++ b/releng/org.eclipse.linuxtools.releng/psfs/valgrind-tests.psf
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <psf version="2.0">
 <provider id="org.tigris.subversion.subclipse.core.svnnature">
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/trunk/org.eclipse.linuxtools.profiling.tests,org.eclipse.linuxtools.profiling.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.massif.tests,org.eclipse.linuxtools.valgrind.massif.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.memcheck.tests,org.eclipse.linuxtools.valgrind.memcheck.tests"/>
-<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.tests,org.eclipse.linuxtools.valgrind.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0/org.eclipse.linuxtools.profiling.tests,org.eclipse.linuxtools.profiling.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.massif.tests,org.eclipse.linuxtools.valgrind.massif.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.memcheck.tests,org.eclipse.linuxtools.valgrind.memcheck.tests"/>
+<project reference="0.9.3,svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.tests,org.eclipse.linuxtools.valgrind.tests"/>
 </provider>
 <provider id="org.eclipse.team.cvs.core.cvsnature">
 <project reference="1.0,:pserver:dev.eclipse.org:/cvsroot/tools,org.eclipse.cdt/all/org.eclipse.cdt.core.tests,org.eclipse.cdt.core.tests,CDT_5_0_1"/>
diff --git a/releng/org.eclipse.linuxtools.releng/psfs/valgrind.psf b/releng/org.eclipse.linuxtools.releng/psfs/valgrind.psf
index 6e91dbf..a2226f2 100644
--- a/releng/org.eclipse.linuxtools.releng/psfs/valgrind.psf
+++ b/releng/org.eclipse.linuxtools.releng/psfs/valgrind.psf
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <psf version="2.0">
 <provider id="org.tigris.subversion.subclipse.core.svnnature">
-<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/trunk/org.eclipse.linuxtools.profiling-feature,org.eclipse.linuxtools.profiling-feature"/>
-<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/trunk/org.eclipse.linuxtools.profiling.launch,org.eclipse.linuxtools.profiling.launch"/>
-<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/trunk/org.eclipse.linuxtools.profiling.test-feature,org.eclipse.linuxtools.profiling.test-feature"/>
-<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/trunk/org.eclipse.linuxtools.profiling.tests,org.eclipse.linuxtools.profiling.tests"/>
-<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/trunk/org.eclipse.linuxtools.profiling.ui,org.eclipse.linuxtools.profiling.ui"/>
-<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind-feature,org.eclipse.linuxtools.valgrind-feature"/>
-<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.cachegrind,org.eclipse.linuxtools.valgrind.cachegrind"/>
-<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.cachegrind.tests,org.eclipse.linuxtools.valgrind.cachegrind.tests"/>
-<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.core,org.eclipse.linuxtools.valgrind.core"/>
-<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.doc,org.eclipse.linuxtools.valgrind.doc"/>
-<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.launch,org.eclipse.linuxtools.valgrind.launch"/>
-<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.massif,org.eclipse.linuxtools.valgrind.massif"/>
-<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.massif.tests,org.eclipse.linuxtools.valgrind.massif.tests"/>
-<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.memcheck,org.eclipse.linuxtools.valgrind.memcheck"/>
-<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.memcheck.tests,org.eclipse.linuxtools.valgrind.memcheck.tests"/>
-<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.test-feature,org.eclipse.linuxtools.valgrind.test-feature"/>
-<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.tests,org.eclipse.linuxtools.valgrind.tests"/>
-<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.ui,org.eclipse.linuxtools.valgrind.ui"/>
-<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/trunk/org.eclipse.linuxtools.valgrind.ui.editor,org.eclipse.linuxtools.valgrind.ui.editor"/>
+<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0/org.eclipse.linuxtools.profiling-feature,org.eclipse.linuxtools.profiling-feature"/>
+<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0/org.eclipse.linuxtools.profiling.launch,org.eclipse.linuxtools.profiling.launch"/>
+<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0/org.eclipse.linuxtools.profiling.test-feature,org.eclipse.linuxtools.profiling.test-feature"/>
+<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0/org.eclipse.linuxtools.profiling.tests,org.eclipse.linuxtools.profiling.tests"/>
+<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/branches/0.5.0/org.eclipse.linuxtools.profiling.ui,org.eclipse.linuxtools.profiling.ui"/>
+<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind-feature,org.eclipse.linuxtools.valgrind-feature"/>
+<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.cachegrind,org.eclipse.linuxtools.valgrind.cachegrind"/>
+<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.cachegrind.tests,org.eclipse.linuxtools.valgrind.cachegrind.tests"/>
+<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.core,org.eclipse.linuxtools.valgrind.core"/>
+<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.doc,org.eclipse.linuxtools.valgrind.doc"/>
+<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.launch,org.eclipse.linuxtools.valgrind.launch"/>
+<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.massif,org.eclipse.linuxtools.valgrind.massif"/>
+<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.massif.tests,org.eclipse.linuxtools.valgrind.massif.tests"/>
+<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.memcheck,org.eclipse.linuxtools.valgrind.memcheck"/>
+<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.memcheck.tests,org.eclipse.linuxtools.valgrind.memcheck.tests"/>
+<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.test-feature,org.eclipse.linuxtools.valgrind.test-feature"/>
+<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.tests,org.eclipse.linuxtools.valgrind.tests"/>
+<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.ui,org.eclipse.linuxtools.valgrind.ui"/>
+<project reference="0.9.3,http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/branches/0.5.0/org.eclipse.linuxtools.valgrind.ui.editor,org.eclipse.linuxtools.valgrind.ui.editor"/>
 </provider>
 <provider id="org.eclipse.team.cvs.core.cvsnature">
 <project reference="1.0,:pserver:dev.eclipse.org:/cvsroot/birt,source/org.apache.commons.codec,org.apache.commons.codec,BIRT_2_3_2_Nightly_20090331"/>
diff --git a/releng/org.eclipse.linuxtools.test-feature/license.html b/releng/org.eclipse.linuxtools.test-feature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/releng/org.eclipse.linuxtools.test-feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/rpm/org.eclipse.linuxtools.rpm-feature/.classpath b/rpm/org.eclipse.linuxtools.rpm-feature/.classpath
new file mode 100644
index 0000000..ac37fb2
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm-feature/.classpath
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/rpm/org.eclipse.linuxtools.rpm-feature/.project b/rpm/org.eclipse.linuxtools.rpm-feature/.project
new file mode 100644
index 0000000..9af573f
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm-feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.rpm-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/rpm/org.eclipse.linuxtools.rpm-feature/ChangeLog b/rpm/org.eclipse.linuxtools.rpm-feature/ChangeLog
new file mode 100644
index 0000000..39b22a5
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm-feature/ChangeLog
@@ -0,0 +1,85 @@
+2009-08-07  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* feature.properties: Fix provider to be Eclipse not Eclipse.org.
+
+2009-08-06  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* feature.xml: Remove doc plugin for now.
+
+2009-07-20  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* feature.xml: Remove unpack="false" for the doc plugin.
+
+2009-07-20  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* .project: This is not a Java project.
+	* feature.xml: No need for install handler.
+
+2009-07-17  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* feature.xml: Add update site.
+	* license.html: New file.
+	* build.properties: Add license.html to bin.includes.
+	
+2009-07-17  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* feature.properties: Add more missing properties.
+	* feature.xml: Fill correct metadata.
+	
+2009-07-17  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* build.properties: Fix copyright.
+	* feature.properties: Fix copyright and add Incubation to the name.
+	* feature.xml: Remove plugin versions and fix copyright.
+
+2007-01-29  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Use org.eclipse.linuxtools instead of org.eclipse.cdt.
+
+2005-05-27  Jeremy Handcock  <handcock@redhat.com>
+
+	* about.html: New.
+	* build.properties: Include about.html.
+	* feature.xml: Bump version to 3.0.
+
+2005-05-18  Jeremy Handcock  <handcock@redhat.com>
+
+	* feature.xml 
+	(feature): Remove rpm.propertypage plug-in temporarily.
+	(requires): Remove CDT core dependency.
+	* build.properties (bin.includes): Correct.
+	(src.includes): Ditto.
+
+2004-11-11  Rick Moseley  <rmoseley@redhat.com>
+
+	* change versions to 1.1 from 1.2
+	* feature.xml: add propertypage
+
+2004-07-15  Rick Moseley  <rmoseley@redhat.com>
+
+	* change versions to 1.1 from 1.0
+	feature.xml - missed one
+
+2004-07-14  Rick Moseley  <rmoseley@redhat.com>
+	* feature.xml: id renamed to com.redhat.eclipse.rpm
+		Recompute dependencies
+	* build.properties: added
+
+2004-02-11  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* build.xml (all.plugins) added ui/core. Removed import_export
+	* feature.xml : com.redhat.eclipse.rp.import_export removed
+	com.redhat.eclipse.rpm.ui added
+	com.redhat.eclipse.rom.core added
+	* .classpath : Updated for 2.1.2
+
+2003-09-08  Tom Tromey  <tromey@redhat.com>
+
+	* feature.xml (id, label): Updated.
+	* feature.properties: New file.
+
+2003-08-27  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* build.xml(all.plugins): Added com.redhat.eclipse.rpm.doc
+	* feature.xml: Added com.redhat.eclipse.rpm.doc
+	*.classpath: Added for easier project work
diff --git a/rpm/org.eclipse.linuxtools.rpm-feature/about.html b/rpm/org.eclipse.linuxtools.rpm-feature/about.html
new file mode 100644
index 0000000..44e2290
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm-feature/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

+<html>

+<head>

+<title>About</title>

+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>8th September, 2004</p>	

+<h3>License</h3>

+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<h3>Contributions</h3>

+

+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise

+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such

+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or

+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the

+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available

+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also

+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+</body>

+</html>
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm-feature/build.properties b/rpm/org.eclipse.linuxtools.rpm-feature/build.properties
new file mode 100644
index 0000000..c1e6df3
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm-feature/build.properties
@@ -0,0 +1,21 @@
+###############################################################################
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+bin.includes = feature.xml,\
+               feature.properties,\
+               about.html
+src.includes = .classpath,\
+               .project,\
+               ChangeLog,\
+               build.properties,\
+               feature.properties,\
+               feature.xml,\
+               about.html,\
+               license.html
diff --git a/rpm/org.eclipse.linuxtools.rpm-feature/feature.properties b/rpm/org.eclipse.linuxtools.rpm-feature/feature.properties
new file mode 100644
index 0000000..dc9081e
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm-feature/feature.properties
@@ -0,0 +1,134 @@
+###############################################################################
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+
+# features.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=RPM Import/Export and Building Tool (Incubation)
+provider=Eclipse
+description=Export/Import and Build tools.
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2007-2009 Red Hat, Inc and others. All rights reserved.\n\
+\n\
+This program and the accompanying materials are made available under the terms\n\
+of the Eclipse Public License v1.0 which accompanies this distribution, and is\n\
+available at http://www.eclipse.org/legal/epl-v10.html\n
+################ end of copyright property ####################################
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
+March 17, 2005\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse.org CVS\n\
+repository ("Repository") in CVS modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+Features may also include other Features ("Included Features"). Files named\n\
+"feature.xml" may contain a list of the names and version numbers of\n\
+Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+   - The top-level (root) directory\n\
+   - Plug-in and Fragment directories\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
+   - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Eclipse Update Manager, you must agree to a license ("Feature Update\n\
+License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties". Such Abouts,\n\
+Feature Licenses and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
+    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
+########### end of license property ##########################################
diff --git a/rpm/org.eclipse.linuxtools.rpm-feature/feature.xml b/rpm/org.eclipse.linuxtools.rpm-feature/feature.xml
new file mode 100644
index 0000000..5ffc31b
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm-feature/feature.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2009 Red Hat, Inc.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+   
+    Contributors:
+        Red Hat - initial API and implementation
+ -->
+<feature
+      id="org.eclipse.linuxtools.rpm"
+      label="%featureName"
+      version="0.4.3.qualifier"
+      provider-name="%provider">
+
+   <description url="http://www.eclipse.org/linuxtools/projectPages/specfile/">
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <url>
+      <update label="Linux Tools Update Site" url="http://download.eclipse.org/technology/linuxtools/update"/>
+   </url>
+
+   <requires>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.swt"/>
+      <import plugin="org.eclipse.jface"/>
+      <import plugin="org.eclipse.text"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.linuxtools.rpm.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+     <plugin
+         id="org.eclipse.linuxtools.rpm.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/rpm/org.eclipse.linuxtools.rpm-feature/license.html b/rpm/org.eclipse.linuxtools.rpm-feature/license.html
new file mode 100644
index 0000000..f5a1625
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm-feature/license.html
@@ -0,0 +1,81 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
+<title>Eclipse.org Software User Agreement</title>
+</head>
+
+<body lang="EN-US" link=blue vlink=purple>
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>March 17, 2005</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+   
+<h3>Applicable Licenses</h3>   
+   
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+(&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
+   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+   
+<ul>
+	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>   
+ 
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+	
+<ul>
+	<li>The top-level (root) directory</li>
+
+	<li>Plug-in and Fragment directories</li>
+	<li>Inside Plug-ins and Fragments packaged as JARs</li>
+	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+	<li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
+	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+
+	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+<h3>Cryptography</h3>
+	
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+   
+<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
+</body>
+</html>
diff --git a/profiling/.classpath b/rpm/org.eclipse.linuxtools.rpm.core.tests/.classpath
similarity index 100%
copy from profiling/.classpath
copy to rpm/org.eclipse.linuxtools.rpm.core.tests/.classpath
diff --git a/rpm/org.eclipse.linuxtools.rpm.core.tests/.cvsignore b/rpm/org.eclipse.linuxtools.rpm.core.tests/.cvsignore
new file mode 100644
index 0000000..ba077a4
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core.tests/.cvsignore
@@ -0,0 +1 @@
+bin
diff --git a/rpm/org.eclipse.linuxtools.rpm.core.tests/.project b/rpm/org.eclipse.linuxtools.rpm.core.tests/.project
new file mode 100644
index 0000000..cc88be1
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.rpm.core.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/rpm/org.eclipse.linuxtools.rpm.core.tests/.settings/org.eclipse.jdt.core.prefs b/rpm/org.eclipse.linuxtools.rpm.core.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..b8db5e1
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,70 @@
+#Tue Jul 21 18:25:11 EEST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/rpm/org.eclipse.linuxtools.rpm.core.tests/ChangeLog b/rpm/org.eclipse.linuxtools.rpm.core.tests/ChangeLog
new file mode 100644
index 0000000..ce3bc92
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core.tests/ChangeLog
@@ -0,0 +1,150 @@
+2010-01-08  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/core/tests/RPMProjectTest.java (testBuildSourceRPMHelloWorld): Adapt to api changes.
+
+2009-09-07  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/core/tests/RPMProjectTest.java (testImportHelloWorld): Drop checks not needed.
+
+2009-08-07  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* OSGI-INF/l10n/bundle.properties: Fix provider to be Eclipse not Eclipse.org.
+
+2009-07-22  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* .settings/org.eclipse.jdt.core.prefs: Enable more warnings.
+	* src/org/eclipse/linuxtools/rpm/core/tests/RPMProjectNatureTest.java (setUp): Add missing @Override.
+	* src/org/eclipse/linuxtools/rpm/core/tests/RPMProjectTest.java (setUp): Likewise.
+	(suite): Removed as it is not needed.
+
+2009-07-21  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/core/tests/RPMProjectFactoryTest.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/tests/AllTests.java (suite): Remove nonexisting test.
+	* src/org/eclipse/linuxtools/rpm/core/tests/RPMProjectTest.java (testBuildPrepHelloWorld): Create RPMProject directly.
+	(testImportHelloWorld): Likewise.
+	(testBuildSourceRPMHelloWorld): Likewise.
+
+2009-07-21  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* META-INF/MANIFEST.MF: No need to export packages.
+
+2009-07-21  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/core: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/internal/tests/RPMCoreInternalTestSuite.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/internal/tests/RPMProjectTest.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/tests/RPMCoreTestsPlugin.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/tests/RPMCoreTestSuite.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/tests/RPMProjectTest.java: New file.
+	* META-INF/MANIFEST.MF: Remove not needed Require-Bundle and Bundle-Activator.
+	* src/org/eclipse/linuxtools/rpm/core/tests/AllTests.java (suite): Add tests directly.
+	* src/org/eclipse/linuxtools/rpm/core/tests/RPMProjectFactoryTest.java (testGetNewProject): Use RPMProject directly.
+
+2009-07-17  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* OSGI-INF/l10n/bundle.properties: New file.
+	* build.properties: Simplify build.
+	* META-INF/MANIFEST.MF: Don't export any package and externalize strings.
+
+2009-06-25  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* build.properties: Fix copyright header.
+	* src/org/eclipse/linuxtools/rpm/core/internal/tests/RPMCoreInternalTestSuite.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/internal/tests/RPMProjectTest.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/tests/AllTests.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/tests/RPMCoreTestsPlugin.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/tests/RPMCoreTestSuite.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/tests/RPMProjectFactoryTest.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/tests/RPMProjectNatureTest.java: Likewise.
+
+2009-06-09  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/core/internal/tests/RPMProjectTest.java (testImportHelloWorld): Adapt to API changes.
+	(testBuildSourceRPMHelloWorld): Likewise.
+
+2009-06-08  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* plugin.xml: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/internal/tests/SpecFileParserTest.java: Removed.
+	* .settings/org.eclipse.jdt.core.prefs: New file.
+	* .classpath: J2SE-1.5.
+	* build.properties: Likewise.
+	* META-INF/MANIFEST.MF: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/internal/tests/RPMCoreInternalTestSuite.java (suite): Remove test not present anymore.
+	* src/org/eclipse/linuxtools/rpm/core/internal/tests/RPMProjectTest.java (testIsChangedHelloWorld1): Remove code testing old implementation.
+	(setUp): Likewise.
+	(testBuildPrepHelloWorld): Likewise.
+	(testImportHelloWorld): Likewise.
+	(testIsChangedHelloWorld): Likewise.
+	(testBuildSourceRPMHelloWorld): Likewise.
+	(suite): Likewise.
+	(testBuildSourceRPMHelloWorld1): Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/tests/RPMProjectFactoryTest.java (testGetNewProject): Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/tests/RPMProjectNatureTest.java (testAddRPMProjectNature): Likewise.
+
+2008-11-01  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* META-INF/MANIFEST.MF: Replace deprecated Eclipse-LazyStart usage.
+
+2007-05-04  Andrew Overholt  <overholt@redhat.com>
+
+	Bug #185598
+	* META-INF/MANIFEST.MF: Add "Incubation" to Bundle-Name.
+
+2007-04-05  Remy Suen  <remy.suen@gmail.com>
+
+	Bug #181249
+	* .classpath: Set required EE.
+	* META-INF/MANIFEST.MF: Initial commit.
+	* build.properties: Include MANIFEST.MF.
+	* plugin.xml: Declare dependency and runtime information in an OSGi
+	manifest.
+
+2007-01-30  Andrew Overholt  <overholt@redhat.com>
+
+	* : Re-namespace from cdt to linuxtools.
+
+2005-05-27  Jeremy Handcock  <handcock@redhat.com>
+
+	* plugin.xml: Bump version to 3.0.
+
+2005-05-18  Jeremy Handcock  <handcock@redhat.com>
+
+	Eclipse.org Bugzilla #82195:
+
+	* plugin.xml (requires): Remove CDT core dependency.
+	* build.properties (src.includes): Correct.
+
+	* resources/specs/helloworld.spec: New.
+
+	* src/org/eclipse/cdt/rpm/core/internal/RPMCoreInternalTestSuite.java:
+	New.
+	* src/org/eclipse/cdt/rpm/core/internal/RPMProjectTest.java: New.
+	* src/org/eclipse/cdt/rpm/core/internal/SpecFileParserTest.java: New.
+
+	* src/org/eclipse/cdt/rpm/core/AllTests.java
+	(suite): Add RPMCoreInternalTestSuite.
+	* src/org/eclipse/cdt/rpm/core/CProjectHelper.java: Remove.
+	* src/org/eclipse/cdt/rpm/core/RPMCoreTestSuite.java
+	(suite): Remove old tests; add new tests.
+	* src/org/eclipse/cdt/rpm/core/RPMExportTests.java: Remove.
+	* src/org/eclipse/cdt/rpm/core/RPMProjetFactoryTests.java: New.
+	* src/org/eclipse/cdt/rpm/core/RPMProjectNatureTests.java: New.
+	* src/org/eclipse/cdt/rpm/core/SRPMExportTests.java: Remove.
+	* src/org/eclipse/cdt/rpm/core/SRPMImportTests.java: Remove.
+
+2004-12-10  Jeremy Handcock  <handcock@redhat.com>
+
+	* plugin.xml (requires): Remove org.eclipse.cdt.core.tests dependency.
+	* src/org/eclipse/cdt/rpm/tests/AllTests.java: Move ...
+	* src/org/eclipse/cdt/rpm/core/tests/AllTests.java: ... to here.
+	* src/org/eclipse/cdt/rpm/core/tests/CProjectHelper.java: New file.
+	* src/org/eclipse/cdt/rpm/core/tests/RPMExportTests.java: Don't catch
+	exceptions; let the test harness handle them.
+	* src/org/eclipse/cdt/rpm/core/tests/SRPMExportTests.java: Ditto.
+	* src/org/eclipse/cdt/rpm/core/tests/SRPMImportTests.java: Ditto.
+
+2004-12-03  Aaron Luchko <aluchko@redhat.com>
+
+	* Initial Import
diff --git a/rpm/org.eclipse.linuxtools.rpm.core.tests/META-INF/MANIFEST.MF b/rpm/org.eclipse.linuxtools.rpm.core.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..8db74af
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name.0
+Bundle-SymbolicName: org.eclipse.linuxtools.rpm.core.tests;singleton:=true
+Bundle-Version: 0.4.3.qualifier
+Bundle-Vendor: %Bundle-Vendor.0
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.linuxtools.rpm.core,
+ org.eclipse.core.resources,
+ org.junit
+Export-Package: org.eclipse.linuxtools.rpm.core.tests
diff --git a/rpm/org.eclipse.linuxtools.rpm.core.tests/OSGI-INF/l10n/bundle.properties b/rpm/org.eclipse.linuxtools.rpm.core.tests/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..4e2cf88
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core.tests/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.linuxtools.rpm.core.tests
+Bundle-Vendor.0 = Eclipse
+Bundle-Name.0 = RPM Tests Plug-in (Incubation)
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.core.tests/build.properties b/rpm/org.eclipse.linuxtools.rpm.core.tests/build.properties
new file mode 100644
index 0000000..e9bbc96
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core.tests/build.properties
@@ -0,0 +1,23 @@
+###############################################################################
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+source.. = src/
+output.. = bin/
+bin.includes = .,\
+               resources/,\
+               META-INF/,\
+               OSGI-INF/l10n/bundle.properties
+src.includes = .classpath,\
+               .project,\
+               ChangeLog,\
+               build.properties,\
+               resources/,\
+               src/,\
+               META-INF/
diff --git a/rpm/org.eclipse.linuxtools.rpm.core.tests/resources/specs/helloworld.spec b/rpm/org.eclipse.linuxtools.rpm.core.tests/resources/specs/helloworld.spec
new file mode 100644
index 0000000..7361d38
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core.tests/resources/specs/helloworld.spec
@@ -0,0 +1,30 @@
+%define _unpackaged_files_terminate_build 0
+Summary: None - Eclipse-generated spec file
+Name: helloworld
+Version: 2
+Release: 2
+License: GPL
+Group: Applications/Internet
+Source: helloworld-%{version}.tar.bz2
+Requires: tar
+BuildRoot: %{_tmppath}/%{name}-root
+%description
+
+Basic spec file for rpm build in Eclipse for helloworld
+
+%prep
+%setup -q
+%build
+
+make
+
+%install rm -rf $RPM_BUILD_ROOT
+%makeinstall RPM_BUILD_ROOT=$RPM_BUILD_ROOT
+%clean
+rm -rf $RPM_BUILD_ROOT
+%files
+%defattr(-,root,root)
+/usr/local/bin/helloworld
+%changelog
+* Tue Sep 07 2004 Rick Moseley <rmoseley@redhat.com>
+- Original
diff --git a/rpm/org.eclipse.linuxtools.rpm.core.tests/resources/srpms/helloworld-2-2.src.rpm b/rpm/org.eclipse.linuxtools.rpm.core.tests/resources/srpms/helloworld-2-2.src.rpm
new file mode 100644
index 0000000..7a757ed
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core.tests/resources/srpms/helloworld-2-2.src.rpm
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.core.tests/src/org/eclipse/linuxtools/rpm/core/tests/AllTests.java b/rpm/org.eclipse.linuxtools.rpm.core.tests/src/org/eclipse/linuxtools/rpm/core/tests/AllTests.java
new file mode 100644
index 0000000..ca5f48e
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core.tests/src/org/eclipse/linuxtools/rpm/core/tests/AllTests.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2005, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.core.tests;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTests extends TestSuite{
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite("Test for org.eclipse.linuxtools.rpm.core.tests");
+		//$JUnit-BEGIN$
+		suite.addTestSuite(RPMProjectTest.class);
+		suite.addTestSuite(RPMProjectNatureTest.class);
+		//$JUnit-END$
+		return suite;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.core.tests/src/org/eclipse/linuxtools/rpm/core/tests/RPMProjectNatureTest.java b/rpm/org.eclipse.linuxtools.rpm.core.tests/src/org/eclipse/linuxtools/rpm/core/tests/RPMProjectNatureTest.java
new file mode 100644
index 0000000..c4b007c
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core.tests/src/org/eclipse/linuxtools/rpm/core/tests/RPMProjectNatureTest.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.core.tests;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceDescription;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.linuxtools.rpm.core.RPMProjectNature;
+
+public class RPMProjectNatureTest extends TestCase {
+
+	IWorkspace workspace;
+    IWorkspaceRoot root;
+    NullProgressMonitor monitor;
+    String pluginRoot;
+    
+    /*
+     * @see TestCase#setUp()
+     */
+    @Override
+	protected void setUp() throws Exception {
+        super.setUp();
+        IWorkspaceDescription desc;
+        workspace = ResourcesPlugin.getWorkspace();
+        root = workspace.getRoot();
+        monitor = new NullProgressMonitor();
+        if(workspace == null) {
+            fail("Workspace was not setup");
+        }
+        if(root == null) {
+            fail("Workspace root was not setup");
+        }
+        desc = workspace.getDescription();
+        desc.setAutoBuilding(false);
+        workspace.setDescription(desc);
+    }
+	
+	public void testAddRPMProjectNature() throws Exception {
+		IProject testProject = root.getProject("testProject");
+		testProject.create(monitor);
+		testProject.open(monitor);
+		RPMProjectNature.addRPMNature(testProject, monitor);
+		assertTrue(testProject.hasNature(RPMProjectNature.RPM_NATURE_ID));
+		testProject.delete(true, false, monitor);
+	}
+	
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.core.tests/src/org/eclipse/linuxtools/rpm/core/tests/RPMProjectTest.java b/rpm/org.eclipse.linuxtools.rpm.core.tests/src/org/eclipse/linuxtools/rpm/core/tests/RPMProjectTest.java
new file mode 100644
index 0000000..a31730e
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core.tests/src/org/eclipse/linuxtools/rpm/core/tests/RPMProjectTest.java
@@ -0,0 +1,176 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.core.tests;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.net.URL;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceDescription;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.QualifiedName;
+import org.eclipse.linuxtools.rpm.core.IRPMConstants;
+import org.eclipse.linuxtools.rpm.core.RPMCorePlugin;
+import org.eclipse.linuxtools.rpm.core.RPMProject;
+import org.eclipse.linuxtools.rpm.core.RPMProjectNature;
+import org.osgi.framework.FrameworkUtil;
+
+public class RPMProjectTest extends TestCase {
+
+	IWorkspace workspace;
+	IWorkspaceRoot root;
+	NullProgressMonitor monitor;
+	String pluginRoot;
+
+	final String file_sep = System.getProperty("file.separator"); //$NON-NLS-1$
+
+	/*
+	 * @see TestCase#setUp()
+	 */
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+		IWorkspaceDescription desc;
+		workspace = ResourcesPlugin.getWorkspace();
+		root = workspace.getRoot();
+		monitor = new NullProgressMonitor();
+		if (workspace == null) {
+			fail("Workspace was not setup");
+		}
+		if (root == null) {
+			fail("Workspace root was not setup");
+		}
+		desc = workspace.getDescription();
+		desc.setAutoBuilding(false);
+		workspace.setDescription(desc);
+	}
+
+	public void testImportHelloWorld() throws Exception {
+		// Create a project for the test
+		IProject testProject = root.getProject("testHelloWorld");
+		testProject.create(monitor);
+		testProject.open(monitor);
+
+		// Instantiate an RPMProject
+		RPMProject rpmProject = new RPMProject(testProject);
+
+		// Find the test SRPM and install it
+		URL url = FileLocator.find(FrameworkUtil.getBundle(RPMProjectTest.class), new Path(
+				"resources" + file_sep + "srpms" + file_sep + //$NON-NLS-1$ //$NON-NLS-2$
+						"helloworld-2-2.src.rpm"), null);
+		if (url == null) {
+			fail("Unable to find resource" + file_sep + "srpms" + file_sep
+					+ "helloworld-2-2.src.rpm");
+		}
+		File foo = new File(FileLocator.toFileURL(url).getPath());
+		rpmProject.importSourceRPM(foo);
+
+		// Make sure the original SRPM got copied into the workspace
+		IFile srpm = rpmProject.getConfiguration().getSrpmsFolder().getFile(
+				"helloworld-2-2.src.rpm");
+		assertTrue(srpm.exists());
+		assertNotNull(rpmProject.getProject()
+				.getPersistentProperty(
+						new QualifiedName(RPMCorePlugin.ID,
+								IRPMConstants.SRPM_PROPERTY)));
+
+		// Make sure everything got installed properly
+		IFile spec = rpmProject.getConfiguration().getSpecsFolder().getFile(
+				"helloworld.spec");
+		assertTrue(spec.exists());
+		IFile sourceBall = rpmProject.getConfiguration().getSourcesFolder()
+				.getFile("helloworld-2.tar.bz2");
+		assertTrue(sourceBall.exists());
+
+		// Make sure we got the spec file
+		IFile specFile = rpmProject.getSpecFile();
+		assertTrue(specFile != null);
+		assertNotNull(rpmProject.getProject().getPersistentProperty(
+				new QualifiedName(RPMCorePlugin.ID,
+						IRPMConstants.SPEC_FILE_PROPERTY)));
+
+		// Make sure the RPM nature was added
+		assertTrue(rpmProject.getProject().hasNature(
+				RPMProjectNature.RPM_NATURE_ID));
+
+		// Clean up
+		testProject.delete(true, false, monitor);
+	}
+
+	public void testBuildPrepHelloWorld() throws Exception {
+		// Create a project for the test
+		IProject testProject = root.getProject("testBuildPrepHelloWorld");
+		testProject.create(monitor);
+		testProject.open(monitor);
+
+		// Instantiate an RPMProject
+		RPMProject rpmProject = new RPMProject(testProject);
+
+		// Find the test SRPM, install, and build-prep it
+		URL url = FileLocator.find(FrameworkUtil.getBundle(RPMProjectTest.class), new Path(
+				"resources" + file_sep + "srpms" + file_sep + //$NON-NLS-1$ //$NON-NLS-2$
+						"helloworld-2-2.src.rpm"), null);
+		if (url == null) {
+			fail("Unable to find resource" + file_sep + "srpms" + file_sep
+					+ "helloworld-2-2.src.rpm");
+		}
+		File foo = new File(FileLocator.toFileURL(url).getPath());
+		rpmProject.importSourceRPM(foo);
+		rpmProject.buildPrep();
+
+		// Make sure we got everything in the build directory
+		IFolder builddir = rpmProject.getConfiguration().getBuildFolder();
+		IFolder helloworldFolder = builddir.getFolder("helloworld-2");
+		assertTrue(helloworldFolder.exists());
+
+		// Clean up
+		testProject.delete(true, false, monitor);
+	}
+
+	public void testBuildSourceRPMHelloWorld() throws Exception {
+		// Create a project for the test
+		IProject testProject = root.getProject("testBuildSourceRPMHelloWorld1");
+		testProject.create(monitor);
+		testProject.open(monitor);
+
+		// Instantiate an RPMProject
+		RPMProject rpmProject = new RPMProject(testProject);
+
+		// Find the test SRPM and install it
+		URL url = FileLocator.find(FrameworkUtil.getBundle(RPMProjectTest.class), new Path(
+				"resources" + file_sep + "srpms" + file_sep + //$NON-NLS-1$ //$NON-NLS-2$
+						"helloworld-2-2.src.rpm"), null);
+		if (url == null) {
+			fail("Unable to find resource" + file_sep + "srpms" + file_sep
+					+ "helloworld-2-2.src.rpm");
+		}
+		File foo = new File(FileLocator.toFileURL(url).getPath());
+		rpmProject.importSourceRPM(foo);
+		ByteArrayOutputStream bos = new ByteArrayOutputStream();
+		rpmProject.buildSourceRPM(bos);
+
+		IFile foo2 = rpmProject.getConfiguration().getSrpmsFolder().getFile(
+				"helloworld-2-2.src.rpm");
+		assertTrue(foo2.exists());
+
+		testProject.delete(true, false, null);
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/.classpath b/rpm/org.eclipse.linuxtools.rpm.core/.classpath
new file mode 100644
index 0000000..304e861
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/.cvsignore b/rpm/org.eclipse.linuxtools.rpm.core/.cvsignore
new file mode 100644
index 0000000..ba077a4
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core/.cvsignore
@@ -0,0 +1 @@
+bin
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/.project b/rpm/org.eclipse.linuxtools.rpm.core/.project
new file mode 100644
index 0000000..680f5fa
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.rpm.core</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/.settings/org.eclipse.jdt.core.prefs b/rpm/org.eclipse.linuxtools.rpm.core/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..fe64b52
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,87 @@
+#Fri Jan 08 17:15:36 EET 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/.settings/org.eclipse.jdt.ui.prefs b/rpm/org.eclipse.linuxtools.rpm.core/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..7b306f1
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,54 @@
+#Fri Dec 18 15:00:14 EET 2009
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=false
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/.template b/rpm/org.eclipse.linuxtools.rpm.core/.template
new file mode 100644
index 0000000..d65e0f4
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core/.template
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+   <p/><p><b>Tips on working with this plug-in project</b></p><li>For the view of the new plug-in at a glance, go to the <img href="pageImage"/><a href="OverviewPage">Overview</a>.</li><li>You can test the contributions of this plug-in by launching another instance of the workbench. On the <b>Run</b> menu, click <b>Run As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.run">Run-time Workbench</a> from the available choices.</li><li>You can add more functionality to this plug-in by adding extensions using the <a href="action.newExtension">New Extension Wizard</a>.</li><li>The plug-in project contains Java code that you can debug. Place breakpoints in Java classes. On the <b>Run</b> menu, select <b>Debug As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.debug">Run-time Workbench</a> from the available choices.</li>
+</form>
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/ChangeLog b/rpm/org.eclipse.linuxtools.rpm.core/ChangeLog
new file mode 100644
index 0000000..d0a224c
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core/ChangeLog
@@ -0,0 +1,726 @@
+2010-01-19  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/core/RPMCorePlugin.java: Removed not needed methods.
+	* src/org/eclipse/linuxtools/rpm/core/RPMProject.java (importSourceRPM): Assign directly to the variable.
+	* src/org/eclipse/linuxtools/rpm/core/utils/Utils.java (fileExist): New method.
+	(copyFile): Likewise.
+	(inputStreamToString): Concatenate with StringBuilder.
+	(runCommandToString): Fix javadoc.
+
+2010-01-12  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* .settings/org.eclipse.jdt.core.prefs: Enable more warnings.
+	* src/org/eclipse/linuxtools/rpm/core/utils/RPM.java (install): Fix javadoc.
+	* src/org/eclipse/linuxtools/rpm/core/utils/RPMBuild.java (buildAll): Likewise.
+	(buildBinary): Likewise.
+	(buildPrep): Likewise.
+	(buildSource): Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/utils/Utils.java (runCommandToInputStream): Likewise.
+	(inputStreamToString): Likewise.
+	(runCommand): Likewise.
+
+2010-01-08  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/core/RPMProject.java (buildSourceRPM): Make it void which writes to the passed OutputStream.
+	(buildBinaryRPM): Likewise.
+	(buildAll): Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/utils/RPMBuild.java (buildAll): Likewise.
+	(buildBinary): Likewise.
+	(buildSource): Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/utils/Utils.java (runCommandToInputStream): Remove not needed try/catch.
+	(inputStreamToString): Javadoc format.
+	(runCommand): New method.
+
+2009-12-18  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* .settings/org.eclipse.jdt.ui.prefs: New file.
+	
+2009-12-18  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/core/RPMProject.java (setSpecFile): Store directly, there is no need to keep local variable.
+
+2009-12-18  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/core/RPMCoreInitializer.java: New file.
+	* plugin.xml: Add preference Initializer.
+	* src/org/eclipse/linuxtools/rpm/core/RPMCorePlugin.java (initializeDefaultPreferences): Remove deprecated message override. 
+
+2009-08-13  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/core/RPMProject.java (buildPrep): Don't set sources folder.
+	(generateFileCheckSum): Removed.
+	(generateProjectChecksum): Removed.
+	(prepareExport): Do not store checksums.
+	(importSourceRPM): Likewise.
+	(getSpecFile): Return first member of SPECS folder.
+
+2009-08-07  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* plugin.properties: Fix provider to be Eclipse not Eclipse.org.
+
+2009-07-21  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/core/RPMProjectFactory.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/RPMConfiguration.java (initialize): Don't try to create existing folders.
+
+2009-07-21  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/core/internal/Messages.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/internal/rpm_strings.properties: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/internal/RPMConfiguration.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/internal/SourceRPM.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/IRPMConfiguration.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/ISourceRPM.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/Messages.java: New file.
+	* src/org/eclipse/linuxtools/rpm/core/rpm_strings.properties: New file.
+	* src/org/eclipse/linuxtools/rpm/core/RPMConfiguration.java: New file.
+	* src/org/eclipse/linuxtools/rpm/core/SourceRPM.java: New file.
+	* META-INF/MANIFEST.MF: Remove package export.
+	* src/org/eclipse/linuxtools/rpm/core/IRPMConstants.java: Fix imports.
+	* src/org/eclipse/linuxtools/rpm/core/RPMCorePlugin.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/RPMProject.java (getSourceRPM): Use implementations.
+	(setSourceRPM): Likewise.
+	(getConfiguration): Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/RPMProjectFactory.java (getRPMProject): Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/utils/RPM.java (RPM): Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/utils/RPMBuild.java (RPMBuild): Likewise. 
+	
+2009-07-21  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/core/internal/RPMProject.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/IRPMProject.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/RPMProject.java: New file.
+	* src/org/eclipse/linuxtools/rpm/core/RPMProjectFactory.java (getRPMProject): Use the implementation directly.
+
+2009-07-17  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* license.html: New file.
+	* build.properties: Add license.html to bin.includes.
+	
+2009-07-17  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* META-INF/MANIFEST.MF: Sync version with other rpm plugins.
+	* plugin.properties: Fix Copyright.
+	* src/org/eclipse/linuxtools/rpm/core/internal/Messages.java: Fix Copyright.
+
+2009-07-16  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* build.properties: Simplify build.
+	* META-INF/MANIFEST.MF: Likewise.
+	
+2009-07-16  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/core/utils/Utils.java (runCommandToInputStream): Don't use Java 1.6 API.
+	
+2009-07-16  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/core/internal/utils/Command.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/internal/utils/ShellScript.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/internal/utils/StreamReaderThread.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/utils/Diff.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/utils/Utils.java: New file.
+	* META-INF/MANIFEST.MF: Don't export o.e.l.rpm.core.internal.util.
+	* src/org/eclipse/linuxtools/rpm/core/internal/RPMProject.java (buildSourceRPM): Return InputStream.
+	(buildBinaryRPM): Likewise.
+	(buildAll): Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/IRPMProject.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/utils/RPM.java (install): Invoke directly instead of creating shell scripts.
+	(RPM): Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/utils/RPMBuild.java (buildAll): Likewise.
+	(buildBinary): Likewise.
+	(buildPrep): Likewise.
+	(rebuild): Likewise.
+	(buildSource): Likewise.
+	(RPMBuild): Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/utils/RPMQuery.java (getBuildTime): Likewise.
+	(getHeaderInfo): Likewise.
+	(getArch): Likewise.
+	(query): Likewise.
+	(getPostInstallScript): Likewise.
+	(getPreInstallScript): Likewise.
+	(getPlatform): Likewise.
+	(getBuildHost): Likewise.
+	(getChangelog): Likewise.
+	(getPreUninstallScript): Likewise.
+	(getProvides): Likewise.
+	(getPostUninstallScript): Likewise.
+	(getOS): Likewise.
+
+2009-06-29  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* .settings/org.eclipse.jdt.core.prefs: Enable more warnings.
+	* src/org/eclipse/linuxtools/rpm/core/internal/utils/ShellScript.java (exec): Fix NON-NLS warning.
+	* src/org/eclipse/linuxtools/rpm/core/internal/utils/StreamReaderThread.java (run): Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/IRPMConstants.java (RPM_DISPLAYED_LOG_NAME): Remove not needed constants.
+	* src/org/eclipse/linuxtools/rpm/core/RPMCorePlugin.java (getHostName): Removed.
+	(getWorkspace): Likewise.
+	(start): Likewise.
+	(stop): Likewise.
+	(initializeDefaultPreferences): Remove not needed constants.
+	* src/org/eclipse/linuxtools/rpm/core/utils/Diff.java (Diff): Add missing NON-NLS.
+	* src/org/eclipse/linuxtools/rpm/core/utils/RPM.java (RPM): Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/utils/RPMBuild.java (RPMBuild): Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/utils/RPMQuery.java (query): Likewise.
+
+2009-06-29  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* plugin.properties: New file.
+	* build.properties: Externalize strings.
+	* META-INF/MANIFEST.MF: Likewise.
+	* plugin.xml: Likewise.
+
+2009-06-25  Alexander Kurtakov  <akurtako@redhat.com>
+	Fix for #281480.
+	* src/org/eclipse/linuxtools/rpm/core/internal/RPMProject.java (importSourceRPM): Do not  build on import. 
+	This prevents importing srpms that are not buildable for some reason. 
+
+2009-06-25  Alexander Kurtakov  <akurtako@redhat.com>
+	Fix for #179156.
+	* src/org/eclipse/linuxtools/rpm/core/utils/internal/Command.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/utils/internal/ShellScript.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/utils/internal/StreamReaderThread.java: Removed.
+	* build.properties: Remove reference to non-existing file.
+	* META-INF/MANIFEST.MF: Fix package name.
+	* src/org/eclipse/linuxtools/rpm/core/internal/utils/Command.java: Fix internal package names.
+	* src/org/eclipse/linuxtools/rpm/core/internal/utils/ShellScript.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/internal/utils/StreamReaderThread.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/utils/Diff.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/utils/RPM.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/utils/RPMBuild.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/utils/RPMQuery.java: Likewise.
+	
+2009-06-25  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* plugin.properties: Removed.
+	* build.properties: Fix copyright header.
+	* plugin.xml: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/internal/Messages.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/internal/rpm_strings.properties: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/internal/RPMConfiguration.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/internal/RPMProject.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/internal/SourceRPM.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/IRPMConfiguration.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/IRPMConstants.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/IRPMProject.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/ISourceRPM.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/RPMCorePlugin.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/RPMProjectFactory.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/RPMProjectNature.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/utils/Diff.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/utils/internal/Command.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/utils/internal/ShellScript.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/utils/internal/StreamReaderThread.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/utils/RPM.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/utils/RPMBuild.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/utils/RPMQuery.java: Likewise.
+
+2009-06-09  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/core/IRPMConfiguration.java: Add TODO.
+	
+2009-06-09  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/core/RPMExportDelta.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/internal/RPMProject.java (buildSourceRPM): Adapt to RPMExportDelta removal.
+	(buildBinaryRPM): Likewise.
+	(buildAll): Likewise.
+	(prepareExport): Likewise.
+	(importSourceRPM): Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/IRPMProject.java: Likewise.
+
+2009-06-08  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/core/internal/Patch.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/internal/SpecFile.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/internal/SpecFileParser.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/IPatch.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/ISpecFile.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/core/internal/RPMProject.java (setSpecFile): Remove not needed parts.
+	(buildBinaryRPM): Likewise.
+	(buildSourceRPM): Likewise.
+	(buildAll): Likewise.
+	(importSourceRPM): Likewise.
+	(buildPrep): Likewise.
+	(copySources): Likewise.
+	(getSpecFile): Likewise.
+	(getSourceRPM): Likewise.
+	(RPMProject): Likewise.
+	(setSourceRPM): Likewise.
+	(prepareExport): Likewise.
+	(generateFileCheckSum): Likewise.
+	(generateProjectChecksum): Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/IRPMProject.java (getProject): No more ISpecFile, use IFile.
+	* src/org/eclipse/linuxtools/rpm/core/RPMProjectFactory.java (getRPMProject): Likewise.
+
+2009-05-29  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* .classpath: J2SE-1.5.
+	* src/org/eclipse/linuxtools/rpm/core/utils/Diff.java (Diff): Remove deprecated usage.
+	* src/org/eclipse/linuxtools/rpm/core/utils/RPM.java (RPM): Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/utils/RPMBuild.java (RPMBuild): Likewise. 
+	* src/org/eclipse/linuxtools/rpm/core/utils/RPMQuery.java (query): Likewise.
+
+2009-05-28  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* .settings/org.eclipse.jdt.core.prefs: New file.
+	* META-INF/MANIFEST.MF: BREE J2SE-1.5
+	* src/org/eclipse/linuxtools/rpm/core/RPMCorePlugin.java (stop): Add @Override.
+	(start): Likewise.
+	(initializeDefaultPreferences): Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/utils/internal/StreamReaderThread.java (run): Likewise.
+
+2009-05-28  Alexander Kurtakov  <akurtako@redhat.com>
+	Modernize.
+	* plugin.properties: New file.
+	* build.properties: Include plugin.properties.
+	* src/org/eclipse/linuxtools/rpm/core/internal/RPMProject.java (findExcludedFiles): Modernize.
+	(find): Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/internal/SpecFileParser.java (getNumPatches): Likewise.
+	(getLastPatchMacroLine): Likewise.
+	(parseDefine): Likewise.
+	(getSetupLine): Likewise.
+	(parseNameVerRel): Likewise.
+	(getUniquePatchId): Likewise.
+	(parse): Likewise.
+	(getLastSourceLine): Likewise.
+	(parseConfigureArgs): Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/RPMProjectNature.java (removeNature): Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/utils/internal/Command.java (exec): Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/utils/RPM.java (RPM): Likewise.
+	* src/org/eclipse/linuxtools/rpm/core/utils/RPMBuild.java (RPMBuild): Likewise.
+
+2008-11-01  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* META-INF/MANIFEST.MF: Replace deprecated Eclipse-LazyStart usage.
+
+2007-05-04  Andrew Overholt  <overholt@redhat.com>
+
+	Bug #185598
+	* META-INF/MANIFEST.MF: Add "Incubation" to Bundle-Name.
+
+2007-04-05  Remy Suen  <remy.suen@gmail.com>
+
+	Bug #181249
+	* META-INF/MANIFEST.MF: Initial commit.
+	* build.properties: Include MANIFEST.MF.
+	* plugin.xml: Declare dependency and runtime information in an OSGi
+	manifest.
+
+2007-01-29  Andrew Overholt  <overholt@redhat.com>
+
+	* : Re-namespace from cdt to linuxtools.
+
+2005-05-27  Jeremy Handcock  <handcock@redhat.com>
+
+	* plugin.xml: Bump version to 3.0.
+
+2005-05-19  Jeremy Handcock  <handcock@redhat.com>
+
+	Eclipse.org Bugzilla #82196:
+	* src/org/eclipse/cdt/rpm/core/utils/RPMQuery.java: New.
+	* src/org/eclipse/cdt/rpm/core/utils/internal/Command.java
+	(exec): Return standard output as String.
+	* src/org/eclipse/cdt/rpm/core/utils/internal/ShellScript.java
+	(execNoLog): Same.
+	(exec): Same.
+
+2005-05-18  Jeremy Handcock  <handcock@redhat.com>
+
+	Eclipse.org Bugzilla #82195:
+
+	* build.properties (bin.includes): Correct.
+	(src.includes): Ditto.
+	* plugin.xml (runtime): Remove RPMPluginPreferencesPage.jar.
+
+	* src/org/eclipse/cdt/rpm/core/IPatch.java: New.
+	* src/org/eclipse/cdt/rpm/core/IRPMConfiguration.java: New.
+	* src/org/eclipse/cdt/rpm/core/IRPMConstants.java: New.
+	* src/org/eclipse/cdt/rpm/core/IRPMProject.java: New.
+	* src/org/eclipse/cdt/rpm/core/ISourceRPM.java: New.
+	* src/org/eclipse/cdt/rpm/core/LinuxShellCmds.java: Remove.
+	* src/org/eclipse/cdt/rpm/core/Messages.java: Move to core.internal.
+	* src/org/eclipse/cdt/rpm/core/rpm_strings.properties: Ditto.
+	* src/org/eclipse/cdt/rpm/core/RPMCore.java: Remove.
+	* src/org/eclipse/cdt/rpm/core/RPMCorePlugin.java
+	(initializeDefaultPreferences): Use IRPMConstants.
+	(getExternalLogFile): New method.
+	* src/org/eclipse/cdt/rpm/core/RPMExport.java: Remove.
+	* src/org/eclipse/cdt/rpm/core/RPMExportCore.java: Remove.
+	* src/org/eclipse/cdt/rpm/core/RPMExportDelta.java: New.
+	* src/org/eclipse/cdt/rpm/core/RPMProjectFactory.java: New.
+	* src/org/eclipse/cdt/rpm/core/RPMProjectNature.java: New.
+	* src/org/eclipse/cdt/rpm/core/SpecFileOps.java: Remove; move relics 
+	to core.internal.SpecFileParser.
+	* src/org/eclipse/cdt/rpm/core/SRPMExport.java: Remove.
+	* src/org/eclipse/cdt/rpm/core/SRPMImport.java: Remove.
+	* src/org/eclipse/cdt/rpm/core/StreamReaderThread.java: Move to 
+	core.utils.internal.
+	* src/org/eclipse/cdt/rpm/core/TarOps.java: Remove.
+
+	* src/org/eclipse/cdt/rpm/core/internal/Messages.java: Move to here.
+	* src/org/eclipse/cdt/rpm/core/internal/Patch.java: New.
+	* src/org/eclipse/cdt/rpm/core/internal/rpm_strings.properties: Move to 
+	here.
+	* src/org/eclipse/cdt/rpm/core/internal/RPMConfiguration.java: New.
+	* src/org/eclipse/cdt/rpm/core/internal/RPMProject.java: New.
+	* src/org/eclipse/cdt/rpm/core/internal/SourceRPM.java: New.
+	* src/org/eclipse/cdt/rpm/core/internal/SpecFile.java: New.
+	* src/org/eclipse/cdt/rpm/core/internal/SpecFileParser.java: New.
+
+	* src/org/eclipse/cdt/rpm/core/utils/Diff.java: New.
+	* src/org/eclipse/cdt/rpm/core/utils/RPM.java: New.
+	* src/org/eclipse/cdt/rpm/core/utils/RPMBuild.java: New.
+
+	* src/org/eclipse/cdt/rpm/core/utils/internal/Command.java: New.
+	* src/org/eclipse/cdt/rpm/core/utils/internal/ShellScript.java: New.
+	* src/org/eclipse/cdt/rpm/core/utils/internal/StreamReaderThread.java:
+	Moved to here.
+
+2004-12-14  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/core/RPMCore.java (generateChecksum): added call to new
+	  method to calculate a true checksum (bz# 78767)
+	* (fileCheckSum): new method to calculate checksum for a file for above change
+	* (RPMCore): catch exception added to generateChecksum() for above change
+	* (createSRPMinfo): catch exception added to generateChecksum() for above change
+	* various externalize strings issues
+
+2004-11-11  Rick Moseley  <rmoseley@redhat.com>
+	* plugin.xml: change version to 1.2
+
+2004-11-08  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/core/LinuxShellCmds.java (executeLinuxCommand): add
+	  capability to capture output from both stdout and stderr simultaneously
+
+2004-11-04  Jeffery Pound  <jpound@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/core/LinuxShellCmds.java (): get commands from a 
+	   properties bundle
+	* src/org/eclipse/cdt/rpm/core/RPMCore.java (): ditto
+	* src/org/eclipse/cdt/rpm/core/RPMCorePlugin.java (): ditto
+	* src/org/eclipse/cdt/rpm/core/SpecFileOps.java (): ditto
+	* src/org/eclipse/cdt/rpm/core/SRPMImport.java (): ditto
+	* src/org/eclipse/cdt/rpm/core/TarOps.java (): ditto
+
+2004-11-02  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/core/LinuxShellCmds.java (getInfo): change method to be
+		able to handle output to both stderr and stdout simultaneously
+	* src/org/eclipse/cdt/rpm/core/StreamReaderThread.java : new class to handle
+	   reading of stdout and stderr from shell commands
+
+2004-09-08  Rick Moseley  <rmoseley@redhat.com>
+	
+	* fix screw-up from merge of branch from below fix
+
+2004-09-07  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/com/redhat/eclipse/rpm/core/SpecFileOps.java (createRPMspec): remove
+	  call to "id" to get group id; modify "make" command for creating spec file
+
+2004-09-01  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/com/redhat/eclipse/rpm/core/SpecFileOps.java: clean up unnecessary "$NON-NLS-1"s
+	* src/com/redhat/eclipse/rpm/core/TarOps.java: clean up unnecessary "$NON-NLS-1"s
+	* src/com/redhat/eclipse/rpm/core/SRPMImport.java: clean up unnecessary "$NON-NLS-1"s
+	* src/com/redhat/eclipse/rpm/core/RPMCore.java: * clean up unnecessary "$NON-NLS-1"s
+	  add a couple that were needed
+	* src/com/redhat/eclipse/rpm/core/RPMExportCore.java (renameSpecFile): 
+	  BZ #131300
+	* (run): BZ #131300
+	* clean up unnecessary "$NON-NLS-1"s
+	  
+2004-08-31  rmoseley  <rmoseley@dhcp-232.hsv.redhat.com>
+
+	* build.xml: Rebuilt after merging with head
+
+2004-08-30  rmoseley  <rmoseley@dhcp-232.hsv.redhat.com>
+
+	* plugin.xml : remove RPMPreferencesPages stuff forgotten from merge
+
+2004-08-04  Jeremy Handcock  <handcock@redhat.com>
+	
+	* .cvsignore: New file.	
+	* src/com/redhat/eclipse/rpm/core/prefs/RPMPluginPreferencesPage.java:
+	Move to com.redhat.eclipse.rpm.ui.
+	* src/com/redhat/eclipse/rpm/core/prefs/RPMCorePlugin.java: Move...
+	* src/com/redhat/eclipse/rpm/core/RPMCorePlugin.java: ...to here.
+	* plugin.xml: Rename main plugin class.  Remove preference page 
+	extension.
+
+2004-08-04  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/com/redhat/eclipse/rpm/core/rpm_strings.properties: expand message
+	  about parsing spec file
+
+2004-07-28  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/com/redhat/eclipse/rpm/core/SpecFileOps.java (createRPMspec): 
+	  bz #128603 - make method more flexible, use new rpm macros
+
+2004-07-19  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/com/redhat/eclipse/rpm/core/prefs/RPMCorePlugin.java (getHostName): added
+	  this method, made it static and public so RPMPluginPreferencesPage can access it
+	* src/com/redhat/eclipse/rpm/core/prefs/RPMPluginPreferencesPage.java (getUserName): 
+	(initializeDefaultPreferences): get the default name/e-mail differently
+	  remove this method and place it into RPMCorePlugin.java
+	(initializeDefaultPreferences): add call to getUserName in RPMCorePluign
+	   
+
+2004-07-15  Rick Moseley  <rmoseley@redhat.com>
+
+	* build.properties : change RpmCore -> RPMCore
+	* build.xml: same
+		change version from 1.0.0 to 1.1
+	* plugin.xml: change version from 1.0.0 to 1.1
+
+2004-07-14  Rick Moseley  <rmoseley@redhat.com>
+
+	* build.xml : Eclipse 3.0 changes
+	* src/com/redhat/eclipse/rpm/core/LinuxShellCmds.java : renames as seen below
+	* src/com/redhat/eclipse/rpm/core/RPMCore.java : renamed from RpmCore.java
+	* src/com/redhat/eclipse/rpm/core/RPMExport.java : renames as seen below
+	* src/com/redhat/eclipse/rpm/core/RPMExportCore.java : renames as seen below
+	* src/com/redhat/eclipse/rpm/core/SpecFileOps.java : renames as seen below
+	* src/com/redhat/eclipse/rpm/core/SRPMExport.java : renames as seen below
+	* src/com/redhat/eclipse/rpm/core/SRPMImport.java : renames as seen below
+	* src/com/redhat/eclipse/rpm/core/TarOps.java : rename RpmCore -> RPMCore
+	* src/com/redhat/eclipse/rpm/core/prefs/RPMPluginPreferencesPage.java : rename
+	* src/com/redhat/eclipse/rpm/core/prefs/RPMCorePlugin.java : rename
+	* plugin.xml :rename RpmPreferencesPage -> RPMPreferencesPage
+				  rename RpmCorePlugin -> RPMCorePlugin
+				  3.0 updates
+				  removed unneeded dependencies
+
+2004-05-27  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/com/redhat/eclipse/rpm/core/prefs/RpmPluginPreferencesPage.java : 
+		remove ISO date variable, RPM changelog does not support it
+	* src/com/redhat/eclipse/rpm/core/prefs/RpmCorePlugin.java : 
+		remove ISO date variable, RPM changelog does not support it
+	* src/com/redhat/eclipse/rpm/core/rpm_strings.properties : rename 
+		RpmCore -> RPMCore
+	* src/com/redhat/eclipse/rpm/core/SRPMImport.java (): rename 
+		RpmCore -> RPMCore
+	* src/com/redhat/eclipse/rpm/core/RPMExportCore.java (): rename 
+		RpmCore -> RPMCore
+	* src/com/redhat/eclipse/rpm/core/SpecFileOps.java (returnDate): new for returning 
+		date format
+	(createRPMspec):add call to the above new method 
+
+2004-05-26  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/com/redhat/eclipse/rpm/core/RPMExport.java (RPMExport): changes for prefs store
+	* src/com/redhat/eclipse/rpm/core/SRPMImport.java (): changed name from ImportSRPM
+	* src/com/redhat/eclipse/rpm/core/SRPMImport.java (): changes for prefs store
+	* src/com/redhat/eclipse/rpm/core/RpmCore.java (): changes for prefs store
+	(RpmCore): change the way rpm build log name is generated  
+	(setRpmbuild_logname): set the build log name from other classes 
+	* plugin.xml : added preferences page
+	* src/com/redhat/eclipse/rpm/core/prefs/RpmCorePlugin.java : new for prefs store
+	* src/com/redhat/eclipse/rpm/core/prefs/RpmPluginPreferencesPage.java : new for prefs store
+	* src/com/redhat/eclipse/rpm/core/LinuxShellCmds.java (): changes for prefs store
+	* src/com/redhat/eclipse/rpm/core/RPMExportCore.java (): changes for prefs store
+	* src/com/redhat/eclipse/rpm/core/SpecFileOps.java (): changes for prefs store
+	* src/com/redhat/eclipse/rpm/core/SRPMExport.java (SRPMExport): changes for
+		prefs store
+	* src/com/redhat/eclipse/rpm/core/TarOps.java (): changes for prefs store
+
+2004-05-05  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/com/redhat/eclipse/rpm/core/ImportSRPM.java (run): add call to createRPMLogFile()
+	* src/com/redhat/eclipse/rpm/core/rpm_strings.properties : add/change error messages
+	* src/com/redhat/eclipse/rpm/core/RPMExportCore.java (run): call createRPMLogFile()
+	* src/com/redhat/eclipse/rpm/core/RpmCore.java (createRPMLogFile): new method to 
+	  create a file to hold the current log file name
+
+2004-04-05  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/com/redhat/eclipse/rpm/core/SpecFileOps.java (getHostName): add getHostName()
+	function to get the hostname for the changelog e-mail address
+	(createRPMspec): mod to use the getHostName() function 
+
+2004-04-02  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/com/redhat/eclipse/rpm/core/rpm_strings.properties : add more complete message when
+	  a source rpm has been deleted from a project and another export is attempted
+	* src/com/redhat/eclipse/rpm/core/RPMExportCore.java (run): add proj_path to firstRPM call
+	* src/com/redhat/eclipse/rpm/core/RpmCore.java (firstSRPM): add proj_path parameter to call
+	(getSRPMexportinfo): rmove logic to throw CoreException if missing .srpminfo file 
+
+2004-03-31  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/com/redhat/eclipse/rpm/core/RpmCore.java (RpmCore): add call to new method checkSrpmExists
+	(getSRPMexportinfo): remove check to see if source rpm is still where .srpminfo is pointing to 
+	(checkSrpmExists): new method - contains logic removed from getSRPMexportinfo 
+
+2004-03-23  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/com/redhat/eclipse/rpm/core/RpmCore.java (getSRPMexportinfo): 
+	          added additional message about missing source rpm and how to correct it
+
+2004-03-17  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/com/redhat/eclipse/rpm/core/RpmCore.java (deleteEclipseFiles): added the "Binaries"
+	   directory to be deleted before exporting a project as a source RPM
+
+2004-02-16  Rick Moseley  <rmoseley@redhat.com>
+
+	* RPMExportCore.java (run): fix error on version number
+			parameter being passed to generateSRPMpatch()
+	* ImportSRPM.java (executeRPMbuildprep): updated javadoc comments
+	* RpmCore.java (setRpmbuild_logname): updated javadoc comments
+	* RPMExportCore.java (run): change call to executeRPMbuildprep
+	* RpmCore.java (executeRPMbuildprep): removed "import" logic
+	* RpmCore.java (executeRPMbuildprep): changed debug verbage
+	* ImportSRPM.java (executeRPMbuildprep): added - modified from RpmCore version
+	* ImportSRPM.java (getSourceCode): changed call to executeRPMbuildprep
+
+2004-02-15  Rick Moseley  <rmoseley@redhat.com>
+
+	* RpmCore.java (getSRPMexportinfo): remove old debug statement
+	* RPMExportCore.java (setUi_spec_file): correct path_to_specfile calculation
+	* RpmCore.java (RpmCore): correct path_to_specfile calculation
+	* LinuxShellCmds.java : internationalized strings
+	* LinuxShellCmds.java (linuxCopy): added //$NON-NLS-1$ to lines which do not require 
+	internationalization
+	* LinuxShellCmds.java (createLinuxShellScript): update javadoc comments
+	* rpm_strings.properties : added new internationalization strings
+	* RpmCore.java : internationalized the strings
+	* RpmCore.java : update javadoc comments
+	* RPMExportCore.java (createSRPM): added //$NON-NLS-1$ to lines which do not require 
+	internationalization
+	* RPMExportCore.java (renameSpecFile): added //$NON-NLS-1$ to lines which do not require 
+	internationalization
+	* RPMExportCore.java (run): added //$NON-NLS-1$ to lines which do not require 
+	internationalization
+	* RPMExportCore.java (): added //$NON-NLS-1$ to lines which do not require 
+	internationalization
+	* RPMExportCore.java (): added javadoc comments
+	* RPMExport.java : added //$NON-NLS-1$ to lines which do not require 
+	internationalization
+	* SRPMExport.java (run): added javadoc comments
+	* SRPMExport.java (SRPMExport): added javadoc comments
+	* SRPMExport.java : added //$NON-NLS-1$ to lines which do not require 
+	internationalization
+	* SRPMExport.java : update comments
+	* SpecFileOps.java (checkForConfigure): added //$NON-NLS-1$ to lines which do not require 
+	internationalization
+	* SpecFileOps.java (traverse): update javadoc comments
+	* SpecFileOps.java (createRPMspec): added //$NON-NLS-1$ to lines which do not require 
+	internationalization
+	* SpecFileOps.java (createRPMspec): update javadoc comments
+	* SpecFileOps.java (parsePatchArray): update javadoc comments
+	* SpecFileOps.java (parsePatchArray): update javadoc comments
+	* SpecFileOps.java (checkPatch): updated javadoc comments
+	* SpecFileOps.java (changeRPMspecfile): update javadoc comments
+	* TarOps.java : added comments
+	* TarOps.java (createRPMtarfile): changed message for CoreException
+	* TarOps.java (createRPMtarfile): added //$NON-NLS-1$ to lines which do not require 
+	internationalization
+	* TarOps.java (createRPMtarfile): update javadoc comments
+	* TarOps.java (renameRPMtarfile): update javadoc comments
+	* TarOps.java (untarSource): changed message for CoreException
+	* TarOps.java (untarSource): added //$NON-NLS-1$ to lines which do not require 
+	internationalization
+	* ImportSRPM.java : added comments
+	* ImportSRPM.java (findTarBallPath): added //$NON-NLS-1$ to lines which do not require 
+	internationalization
+	* ImportSRPM.java (getSourceCode): added //$NON-NLS-1$ to lines which do not require 
+	internationalization
+	* ImportSRPM.java (run): added //$NON-NLS-1$ to lines which do not require 
+	internationalization
+	* RpmCore.java (installRPMsource): update javadoc comments
+	* RpmCore.java (executeRpmBuild): change to e.getMessage()
+	* RpmCore.java (deleteRPMresources): update javadoc comments
+	* RpmCore.java (createRPMmacros): update javadoc comments
+	* RpmCore.java (createRPMrpmrc): update javadoc comments
+	* RpmCore.java (deleteEclipseFiles): update javadoc comments
+	* RpmCore.java (executeMakeClean): add comments
+	* RpmCore.java (getNameVerRel): add javadoc comments
+	* RpmCore.java (copyFile): update javadoc comments
+	* RpmCore.java (copyFile): update javadoc comments
+	* RpmCore.java (getSRPMexportinfo): update javadoc comments
+	* RpmCore.java (executeProjConfigure): change error message format
+	* RpmCore.java (executeProjConfigure): update javadoc comments
+	* RpmCore.java (getConfigOpts): update javadoc comments
+	* RpmCore.java (copyDirTree): update javadoc comments
+	* RpmCore.java (checkForMakefile): update javadoc comments
+	* RpmCore.java (RpmCore): update javadoc comments
+	* RpmCore.java : updated javadoc comments
+	* RpmCore.java (createRPMmacros): deleted - no longer used
+	* RpmCore.java (copySpecFile): deleted - no longer used
+
+2004-02-13  Rick Moseley  <rmoseley@redhat.com>
+
+	* RPMExportCore.java (buildBinaryFromSourceRpm): add call to deleteResources()
+	* RpmCore.java (RpmCore): remove _import from the build log name
+	* RPMExportCore.java (run): add logic to handle renaming of tarballs
+	* TarOps.java (): delete untarSourceandCopy method
+	* RPMExportCore.java : added static final variables
+	* RPMExport.java (run): add logic to handle user-specified spec files
+
+2004-02-12  Rick Moseley  <rmoseley@redhat.com>
+
+	* ImportSRPM.java (getSourceCode): change message for CoreException
+	  to e.getMessage()
+	* RpmCore.java :changed debug statement to false
+	* ImportSRPM.java (getSourceCode): added debug print statement
+	* ImportSRPM.java (run): added try/catch around getSourceCode
+	* ImportSRPM.java (run): change message for core exception to 
+	e.getMessage() that was thown from a called method
+
+2004-02-12  Rick Moseley  <rmoseley@redhat.com>
+
+* RpmCore.java (copyRpms): add debug statement when debug=true
+	* RPMExportCore.java (run): add logic for shortcut for building binary RPMs
+	if the source RPM has just been built
+	* RPMExportCore.java (findSpecFileName): new method
+	* RPMExportCore.java (replaceSpecFile): new method
+	* RPMExportCore.java (buildBinaryFromSourceRpm): New method 
+	* RpmCore.java (createRPMdirectories): change message for core exception to 
+	e.getMessage() that was thown from a called method
+	* RpmCore.java (deleteSRPMextrafiles): change message for core exception to 
+	e.getMessage() that was thown from a called method
+	* RpmCore.java (copyFile): change message for core exception to 
+	e.getMessage() that was thown from a called method
+	* RPMExport.java :Initialize patch tag and changelog to "" upon instantiation
+	* SpecFileOps.java (changeRPMspecfile): change message for core exception to 
+	e.getMessage() that was thown from a called method
+	* RpmCore.java (setRpmbuild_logname): change message for core exception to 
+	e.getMessage() that was thown from a called method
+	* RPMExportCore.java (run): change message for core exception to 
+	e.getMessage() that was thown from a called method
+	* RpmCore.java (generateSRPMpatch): change message for core exception to 
+	e.getMessage() that was thown from a called method
+	Also, do not throw CoreException if no patch was generated, return a 0
+	* RPMExportCore.java (createSRPM): change message for core exception to 
+	e.getMessage() that was thown from a called method
+	* RPMExportCore.java (createSRPMinfo): change message for core exception to 
+	e.getMessage() that was thown from a called method
+
+2004-02-11  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* build.xml: Rewritten
+	* .classpath: Regenerated for 2.1.2
+
+2004-02-11  Rick Moseley  <rmoseley@redhat.com>
+
+	* RPMExportCore.java (renameSpecFile): Fix error with the renaming of the spec file; make sure
+	"eclipse_" is in front
+	* SpecFileOps.java (parseSpecfile): Initailize line_ptr array before using to get rid of any old
+	values that may be hanging around
+	* RPMExportCore.java (createSRPMinfo): Change variable names to not coincide with global
+	names
+	* RPMExportCore.java (run): Change option from "bs" to the correct "-bs"
+	* RPMExportCore.java (createSRPM): change variable name from export_opt to which_rpm
+	* RPMExportCore.java (): Initialize the "which_rpm" variable in the constructor
+	* RpmCore.java (RpmCore): Move logic for "else" to correct area to make sure variables are
+	initialized when exporting a project that was not previously an RPM
+
+2004-02-11  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* Initial Import
+
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/META-INF/MANIFEST.MF b/rpm/org.eclipse.linuxtools.rpm.core/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..d0492e7
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.linuxtools.rpm.core;singleton:=true
+Bundle-Version: 0.4.3.qualifier
+Bundle-Activator: org.eclipse.linuxtools.rpm.core.RPMCorePlugin
+Bundle-Localization: plugin
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.ui
+Export-Package: 
+ org.eclipse.linuxtools.rpm.core,
+ org.eclipse.linuxtools.rpm.core.utils
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/about.html b/rpm/org.eclipse.linuxtools.rpm.core/about.html
new file mode 100644
index 0000000..44e2290
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

+<html>

+<head>

+<title>About</title>

+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>8th September, 2004</p>	

+<h3>License</h3>

+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<h3>Contributions</h3>

+

+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise

+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such

+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or

+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the

+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available

+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also

+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+</body>

+</html>
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/build.properties b/rpm/org.eclipse.linuxtools.rpm.core/build.properties
new file mode 100644
index 0000000..497d242
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core/build.properties
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2004-2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+source.. = src/
+output.. = bin/
+bin.includes = plugin.xml,\
+               .,\
+               about.html,\
+               META-INF/,\
+               plugin.properties,\
+               license.html
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/license.html b/rpm/org.eclipse.linuxtools.rpm.core/license.html
new file mode 100644
index 0000000..f5a1625
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core/license.html
@@ -0,0 +1,81 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
+<title>Eclipse.org Software User Agreement</title>
+</head>
+
+<body lang="EN-US" link=blue vlink=purple>
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>March 17, 2005</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+   
+<h3>Applicable Licenses</h3>   
+   
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+(&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
+   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+   
+<ul>
+	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>   
+ 
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+	
+<ul>
+	<li>The top-level (root) directory</li>
+
+	<li>Plug-in and Fragment directories</li>
+	<li>Inside Plug-ins and Fragments packaged as JARs</li>
+	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+	<li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
+	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+
+	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+<h3>Cryptography</h3>
+	
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+   
+<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
+</body>
+</html>
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/plugin.properties b/rpm/org.eclipse.linuxtools.rpm.core/plugin.properties
new file mode 100644
index 0000000..69c5fda
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core/plugin.properties
@@ -0,0 +1,14 @@
+###############################################################################
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+#Properties file for org.eclipse.linuxtools.rpm.core
+extension.name = RPM Project Nature
+Bundle-Vendor = Eclipse
+Bundle-Name = RPM Core Plug-in (Incubation)
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/plugin.xml b/rpm/org.eclipse.linuxtools.rpm.core/plugin.xml
new file mode 100644
index 0000000..ac2300c
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core/plugin.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?><!--
+    Copyright (c) 2009 Red Hat, Inc.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+   
+    Contributors:
+        Red Hat - initial API and implementation
+ -->
+
+<plugin>
+   <extension
+         id="rpmnature"
+         name="%extension.name"
+         point="org.eclipse.core.resources.natures">
+         <runtime>
+         	<run class="org.eclipse.linuxtools.rpm.core.RPMProjectNature"></run>
+         </runtime>
+   </extension>
+<extension point="org.eclipse.core.runtime.preferences">
+		<initializer
+			class="org.eclipse.linuxtools.rpm.core.RPMCoreInitializer" />
+	</extension>
+</plugin>
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/IRPMConstants.java b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/IRPMConstants.java
new file mode 100644
index 0000000..2017205
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/IRPMConstants.java
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.core;
+
+
+public interface IRPMConstants {
+
+	/**
+	 * Contains the name of the preference store key for storing and retrieving
+	 * the path to the system's <code>rpm</code> binary.
+	 */
+	public static final String RPM_CMD = "RPM_CMD"; //$NON-NLS-1$
+	
+	/**
+	 * Contains the name of the preference store key for storing and retrieving
+	 * the path to the system's <code>rpmbuild</code> binary.
+	 */
+	public static final String RPMBUILD_CMD = "RPMBUILD_CMD"; //$NON-NLS-1$
+	
+	/**
+	 * Contains the name of the preference store key for storing and retrieving
+	 * the path to the system's <code>diff</code> binary.
+	 */
+	public static final String DIFF_CMD = "DIFF_CMD"; //$NON-NLS-1$
+	
+	/**
+	 * Contains the name of the preference store key for storing and retrieving
+	 * the name of the RPM log viewer.
+	 */
+	public static final String RPM_DISPLAYED_LOG_NAME = "RPM_DISPLAYED_LOG_NAME"; //$NON-NLS-1$
+	
+	/**
+	 * Contains the name of the preference store key for storing and retrieving
+	 * the name of the RPM log.
+	 */
+	public static final String RPM_LOG_NAME = "RPM_LOG_NAME"; //$NON-NLS-1$
+	
+	/**
+	 * Contains the name of the default RPMS folder in an RPM project.
+	 */
+	public static final String RPMS_FOLDER = "RPMS"; //$NON-NLS-1$
+	
+	/**
+	 * Contains the name of the default SRPMS folder in an RPM project.
+	 */
+	public static final String SRPMS_FOLDER = "SRPMS"; //$NON-NLS-1$
+	
+	/**
+	 * Contains the name of the default SPECS folder in an RPM project.
+	 */
+	public static final String SPECS_FOLDER = "SPECS"; //$NON-NLS-1$
+	
+	/**
+	 * Contains the name of the default SOURCES folder in an RPM project.
+	 */
+	public static final String SOURCES_FOLDER = "SOURCES"; //$NON-NLS-1$
+	
+	/**
+	 * Contains the name of the default BUILD folder in an RPM project.
+	 */
+	public static final String BUILD_FOLDER = "BUILD"; //$NON-NLS-1$
+	
+	/**
+	 * Contains the name of the project property used to store the project-relative
+	 * path of an RPM project's source RPM.
+	 */
+	public static final String SRPM_PROPERTY = "SRPM_PROPERTY"; //$NON-NLS-1$
+	
+	/**
+	 * Contains the name of the project property used to store the project-relative
+	 * path of an RPM project's spec file.
+	 */
+	public static final String SPEC_FILE_PROPERTY = "SPEC_FILE_PROPERTY"; //$NON-NLS-1$
+	
+	/**
+	 * Contains the name of the project property used to store an RPM project's
+	 * checksum value.
+	 */
+	public static final String CHECKSUM_PROPERTY = "CHECKSUM_PROPERTY"; //$NON-NLS-1$
+	
+	/**
+	 * Contains the system's file separator.
+	 */
+	public static final String FILE_SEP = System.getProperty("file.separator"); //$NON-NLS-1$
+
+	/**
+	 * Contains the system's line separator.
+	 */
+	public static final String LINE_SEP = System.getProperty("line.separator"); //$NON-NLS-1$
+	
+	/**
+	 * Contains the plug-ins default error message.
+	 */
+	public static final String ERROR = Messages.getString("RPMCore.Error_1"); //$NON-NLS-1$
+	
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/Messages.java b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/Messages.java
new file mode 100644
index 0000000..af7b2d2
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/Messages.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2009, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.core;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class Messages {
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.rpm.core.rpm_strings"; //$NON-NLS-1$
+
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+
+	private Messages() {
+	}
+
+	public static String getString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/RPMConfiguration.java b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/RPMConfiguration.java
new file mode 100644
index 0000000..69c474a
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/RPMConfiguration.java
@@ -0,0 +1,153 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.core;
+
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.QualifiedName;
+
+public class RPMConfiguration {
+	
+	private IProject project;
+	
+	private IFolder rpmsFolder;
+    private IFolder srpmsFolder;
+    private IFolder specsFolder;
+    private IFolder sourcesFolder;
+    private IFolder buildFolder;
+	
+	public RPMConfiguration(IProject project) throws CoreException {
+		this.project = project;
+		initialize();
+	}
+	
+	/**
+	 * Sets the internal folder fields according to stored properties
+	 * in the workspace project, or according to the default properties
+	 * if no stored properties are found.  If the folders do not exist,
+	 * they are created.
+	 * @throws CoreException if:
+	 * <ul>
+	 * <li>Getting or setting project properties fails</ul>
+	 * <li>Creating project folders fails</li>
+	 * </ul>
+	 */
+    private void initialize() throws CoreException {
+		String pluginID = RPMCorePlugin.ID;
+        
+		String sourcesPath = 
+			project.getPersistentProperty(new QualifiedName(pluginID, IRPMConstants.SOURCES_FOLDER));
+		if(sourcesPath == null) {
+			sourcesFolder = project.getFolder(IRPMConstants.SOURCES_FOLDER);
+			if(!sourcesFolder.exists()) {
+				sourcesFolder.create(false, true, null);
+			}
+			sourcesFolder.setDerived(true);
+			project.setPersistentProperty(new QualifiedName(pluginID, IRPMConstants.SOURCES_FOLDER), 
+	                sourcesFolder.getName());
+        } else {
+			sourcesFolder = project.getFolder(sourcesPath);
+			if(!sourcesFolder.exists()) {
+				sourcesFolder.create(false, true, null);
+			}
+        }
+		
+		String srcRpmPath = 
+			project.getPersistentProperty(new QualifiedName(pluginID, IRPMConstants.SRPMS_FOLDER));
+        if(srcRpmPath == null) {
+			srpmsFolder = project.getFolder(IRPMConstants.SRPMS_FOLDER);
+			if(!srpmsFolder.exists()) {
+				srpmsFolder.create(false, true, null);
+			}
+			srpmsFolder.setDerived(true);
+			project.setPersistentProperty(new QualifiedName(pluginID, IRPMConstants.SRPMS_FOLDER),
+					srpmsFolder.getName());
+        } else {
+			srpmsFolder = project.getFolder(srcRpmPath);
+			if(!srpmsFolder.exists()) {
+				srpmsFolder.create(false, true, null);
+			}
+        }
+		
+		String buildPath = 
+			project.getPersistentProperty(new QualifiedName(pluginID, IRPMConstants.BUILD_FOLDER));
+        if(buildPath == null) {
+            buildFolder = project.getFolder(IRPMConstants.BUILD_FOLDER);
+            if(!buildFolder.exists()) {
+				buildFolder.create(false, true, null);
+			}
+			buildFolder.setDerived(true);
+			project.setPersistentProperty(new QualifiedName(pluginID, IRPMConstants.BUILD_FOLDER), 
+					buildFolder.getName());
+        } else {
+			buildFolder = project.getFolder(buildPath);
+			if(!buildFolder.exists()) {
+				buildFolder.create(false, true, null);
+			}
+        }
+		
+		String rpmPath = 
+			project.getPersistentProperty(new QualifiedName(pluginID, IRPMConstants.RPMS_FOLDER));
+        if(rpmPath == null) {
+			rpmsFolder = project.getFolder(IRPMConstants.RPMS_FOLDER);
+			if(!rpmsFolder.exists()) {
+				rpmsFolder.create(false, true, null);
+			}
+			rpmsFolder.setDerived(true);
+			project.setPersistentProperty(new QualifiedName(pluginID, IRPMConstants.RPMS_FOLDER), 
+	                rpmsFolder.getName());
+        } else {
+			rpmsFolder = project.getFolder(rpmPath);
+			if(!rpmsFolder.exists()) {
+				rpmsFolder.create(false, true, null);
+			}
+        }
+		
+		String specPath = 
+			project.getPersistentProperty(new QualifiedName(pluginID, IRPMConstants.SPECS_FOLDER));
+        if(specPath == null) {
+            specsFolder = project.getFolder(IRPMConstants.SPECS_FOLDER);
+            if(!specsFolder.exists()) {
+				specsFolder.create(false, true, null);
+			}
+			specsFolder.setDerived(true);
+			project.setPersistentProperty(new QualifiedName(pluginID, IRPMConstants.SPECS_FOLDER),
+					specsFolder.getName());
+        } else {
+			specsFolder = project.getFolder(specPath);
+			if(!specsFolder.exists()) {
+				specsFolder.create(false, true, null);
+			}
+        }
+    }
+	
+	public IFolder getBuildFolder() {
+		return buildFolder;
+	}
+
+	public IFolder getRpmsFolder() {
+		return rpmsFolder;
+	}
+
+	public IFolder getSourcesFolder() {
+		return sourcesFolder;
+	}
+
+	public IFolder getSpecsFolder() {
+		return specsFolder;
+	}
+
+	public IFolder getSrpmsFolder() {
+		return srpmsFolder;
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/RPMCoreInitializer.java b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/RPMCoreInitializer.java
new file mode 100644
index 0000000..63f7712
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/RPMCoreInitializer.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Alexander Kurtakov - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.core;
+
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.jface.preference.IPreferenceStore;
+
+/**
+ * Initialize preferences.
+ *
+ */
+public class RPMCoreInitializer extends AbstractPreferenceInitializer {
+
+	@Override
+	public void initializeDefaultPreferences() {
+		IPreferenceStore store = RPMCorePlugin.getDefault()
+				.getPreferenceStore();
+		String user_name = System.getProperty("user.name"); //$NON-NLS-1$
+		store.setDefault(IRPMConstants.RPM_DISPLAYED_LOG_NAME, ".logfilename_" //$NON-NLS-1$
+				+ user_name);
+		store.setDefault(IRPMConstants.RPM_LOG_NAME, "rpmbuild.log"); //$NON-NLS-1$
+
+		store.setDefault(IRPMConstants.RPM_CMD, "/bin/rpm"); //$NON-NLS-1$
+		store.setDefault(IRPMConstants.RPMBUILD_CMD, "/usr/bin/rpmbuild"); //$NON-NLS-1$
+		store.setDefault(IRPMConstants.DIFF_CMD, "/usr/bin/diff"); //$NON-NLS-1$
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/RPMCorePlugin.java b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/RPMCorePlugin.java
new file mode 100644
index 0000000..89c3d88
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/RPMCorePlugin.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.core;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+
+/**
+ * The main plugin class to be used in the desktop.
+ */
+public class RPMCorePlugin extends AbstractUIPlugin {
+	//The shared instance.
+	private static RPMCorePlugin plugin;
+	
+	public static final String ID = "org.eclipse.linuxtools.rpm.core"; //$NON-NLS-1$
+	
+	
+	/**
+	 * The constructor.
+	 */
+	public RPMCorePlugin() {
+		//super();
+		plugin = this;
+	}
+
+	/**
+	 * Returns the shared instance.
+	 */
+	public static RPMCorePlugin getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/RPMProject.java b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/RPMProject.java
new file mode 100644
index 0000000..f14b232
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/RPMProject.java
@@ -0,0 +1,200 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2010 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.core;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.OutputStream;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.QualifiedName;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.linuxtools.rpm.core.utils.RPM;
+import org.eclipse.linuxtools.rpm.core.utils.RPMBuild;
+
+public class RPMProject {
+
+	private IProject project;
+	private SourceRPM sourceRPM;
+	private RPMConfiguration rpmConfig;
+
+	public RPMProject(IProject project) throws CoreException {
+		this.project = project;
+		rpmConfig = new RPMConfiguration(this.project);
+	}
+
+	public IProject getProject() {
+		return project;
+	}
+
+	public SourceRPM getSourceRPM() {
+		return sourceRPM;
+	}
+
+	public void setSourceRPM(SourceRPM sourceRPM) throws CoreException {
+		this.sourceRPM = sourceRPM;
+		getProject()
+				.setPersistentProperty(
+						new QualifiedName(RPMCorePlugin.ID,
+								IRPMConstants.SRPM_PROPERTY),
+						sourceRPM.getFile().getName());
+	}
+
+	public RPMConfiguration getConfiguration() {
+		return rpmConfig;
+	}
+
+	public IFile getSpecFile() {
+		IFolder specsFolder = getConfiguration().getSpecsFolder();
+		IFile file = null;
+		try {
+			file = specsFolder.getFile(specsFolder.members()[0].getName());
+		} catch (CoreException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return file;
+	}
+
+	public void setSpecFile(IFile specFile) throws CoreException {
+		getProject().setPersistentProperty(
+				new QualifiedName(RPMCorePlugin.ID,
+						IRPMConstants.SPEC_FILE_PROPERTY), specFile.getName());
+	}
+
+	public void importSourceRPM(File externalFile) throws CoreException {
+		// Copy original SRPM to workspace
+		IFile srpmFile = getConfiguration().getSrpmsFolder().getFile(
+				externalFile.getName());
+		try {
+			srpmFile.create(new FileInputStream(externalFile), false, null);
+		} catch (FileNotFoundException e) {
+			String throw_message = Messages
+					.getString("RPMCore.Error_trying_to_copy__") + //$NON-NLS-1$
+					rpmConfig.getSpecsFolder().getLocation().toOSString();
+			IStatus error = new Status(IStatus.ERROR, IRPMConstants.ERROR, 1,
+					throw_message, null);
+			throw new CoreException(error);
+		}
+		setSourceRPM(new SourceRPM(srpmFile));
+
+		// Install the SRPM
+		RPM rpm = new RPM(getConfiguration());
+		rpm.install(getSourceRPM().getFile());
+		getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
+
+		// Set the spec file
+		IResource[] installedSpecs = getConfiguration().getSpecsFolder().members();
+		if (installedSpecs.length != 1) {
+			String throw_message = Messages
+					.getString("RPMCore.spec_file_ambiguous") + //$NON-NLS-1$
+					rpmConfig.getSpecsFolder().getLocation().toOSString();
+			IStatus error = new Status(IStatus.ERROR, IRPMConstants.ERROR, 1,
+					throw_message, null);
+			throw new CoreException(error);
+		}
+		setSpecFile(getConfiguration().getSpecsFolder().getFile(
+				installedSpecs[0].getName()));
+
+		// Set the project nature
+		RPMProjectNature.addRPMNature(getProject(), null);
+
+	}
+
+	public void buildAll(OutputStream outStream) throws CoreException {
+		prepareExport();
+		RPMBuild rpmbuild = new RPMBuild(getConfiguration());
+		 rpmbuild.buildAll(getSpecFile(), outStream);
+
+		getConfiguration().getBuildFolder().refreshLocal(
+				IResource.DEPTH_INFINITE, null);
+		getConfiguration().getRpmsFolder().refreshLocal(
+				IResource.DEPTH_INFINITE, null);
+		getConfiguration().getSrpmsFolder().refreshLocal(
+				IResource.DEPTH_INFINITE, null);
+	}
+
+	public void buildBinaryRPM(OutputStream out) throws CoreException {
+		prepareExport();
+		RPMBuild rpmbuild = new RPMBuild(getConfiguration());
+		rpmbuild.buildBinary(getSpecFile(), out);
+
+		getConfiguration().getBuildFolder().refreshLocal(
+				IResource.DEPTH_INFINITE, null);
+		getConfiguration().getRpmsFolder().refreshLocal(
+				IResource.DEPTH_INFINITE, null);
+	}
+
+	public void buildSourceRPM(OutputStream out) throws CoreException {
+		prepareExport();
+		RPMBuild rpmbuild = new RPMBuild(getConfiguration());
+		rpmbuild.buildSource(getSpecFile(), out);
+
+		getConfiguration().getBuildFolder().refreshLocal(
+				IResource.DEPTH_INFINITE, null);
+		getConfiguration().getSrpmsFolder().refreshLocal(
+				IResource.DEPTH_INFINITE, null);
+	}
+
+	public void buildPrep() throws CoreException {
+		RPMBuild rpmbuild = new RPMBuild(getConfiguration());
+		rpmbuild.buildPrep(getSpecFile());
+		getConfiguration().getBuildFolder().refreshLocal(
+				IResource.DEPTH_INFINITE, null);
+	}
+
+	/**
+	 * Prepares for project export. This method updates the project model with
+	 * the given RPM project export delta by:
+	 * <ul>
+	 * <li>Parsing the given spec file and updating the model accordingly</li>
+	 * <li>Updating the spec file model and writing it to disk</li>
+	 * <li>Determining if a patch is needed and generating a patch</li>
+	 * </ul>
+	 * 
+	 * @param exportOp
+	 *            the export delta
+	 * @throws CoreException
+	 *             if:
+	 *             <ul>
+	 *             <li>The project does not have an RPM nature</li>
+	 *             <li>Parsing the spec file fails</li>
+	 *             <li>Patch generation fails</li>
+	 *             <li>Writing the spec file fails</li>
+	 *             </ul>
+	 */
+	private void prepareExport() throws CoreException {
+		/* Don't support exporting projects that have not been imported as SRPMs */
+		if (!getProject().hasNature(RPMProjectNature.RPM_NATURE_ID)) {
+			String throw_message = Messages
+					.getString("RPMCore.RPMProject.prepareExport") + //$NON-NLS-1$
+					getProject().getName();
+			IStatus error = new Status(IStatus.ERROR, IRPMConstants.ERROR, 1,
+					throw_message, null);
+			throw new CoreException(error);
+		}
+
+		// Do a buildPrep again to make sure the BUILD folder is pristine
+		buildPrep();
+
+		getConfiguration().getSourcesFolder().refreshLocal(
+				IResource.DEPTH_INFINITE, null);
+		getConfiguration().getSpecsFolder().refreshLocal(
+				IResource.DEPTH_INFINITE, null);
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/RPMProjectNature.java b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/RPMProjectNature.java
new file mode 100644
index 0000000..29aeee4
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/RPMProjectNature.java
@@ -0,0 +1,124 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.core;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IProjectNature;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+
+/**
+ * The RPM project nature.
+ *
+ */
+public class RPMProjectNature implements IProjectNature {
+
+	/**
+	 * The unique nature ID associated with the RPM project nature.
+	 */
+	public static final String RPM_NATURE_ID = RPMCorePlugin.ID + ".rpmnature"; //$NON-NLS-1$
+	
+	IProject project;
+	
+	public RPMProjectNature() {
+	}
+	
+	public RPMProjectNature(IProject project) {
+		this.project = project;
+	}
+	
+	/**
+	 * Adds the RPM project nature to a given workspace project.
+	 * @param project the project
+	 * @param mon a progress monitor, or <code>null</code> if progress monitoring
+	 * is not desired
+	 * @throws CoreException if adding the RPM project nature fails
+	 */
+	public static void addRPMNature(IProject project, IProgressMonitor mon) throws CoreException {
+		addNature(project, RPM_NATURE_ID, mon);
+	}
+
+	/**
+	 * Removes the RPM project nature from a given workspace project.
+	 * @param project the project
+	 * @param mon a progress monitor, or <code>null</code> if progress monitoring
+	 * is not desired
+	 * @throws CoreException if removing the RPM project nature fails
+	 */
+	public static void removeRPMNature(IProject project, IProgressMonitor mon) throws CoreException {
+		removeNature(project, RPM_NATURE_ID, mon);
+	}
+	
+	/**
+	 * Utility method for adding a nature to a project.
+	 * 
+	 * @param proj
+	 *            the project to add the nature
+	 * @param natureId
+	 *            the id of the nature to assign to the project
+	 * @param monitor
+	 *            a progress monitor to indicate the duration of the operation,
+	 *            or <code>null</code> if progress reporting is not required.
+	 *  
+	 */
+	private static void addNature(IProject project, String natureId, IProgressMonitor monitor) throws CoreException {
+		if(project.hasNature(natureId)) {
+			return;
+		}
+		IProjectDescription description = project.getDescription();
+		String[] prevNatures = description.getNatureIds();
+		String[] newNatures = new String[prevNatures.length + 1];
+		System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
+		newNatures[prevNatures.length] = natureId;
+		description.setNatureIds(newNatures);
+		project.setDescription(description, monitor);
+	}
+
+	/**
+	 * Utility method for removing a project nature from a project.
+	 * 
+	 * @param proj
+	 *            the project to remove the nature from
+	 * @param natureId
+	 *            the nature id to remove
+	 * @param monitor
+	 *            a progress monitor to indicate the duration of the operation,
+	 *            or <code>null</code> if progress reporting is not required.
+	 */
+	private static void removeNature(IProject project, String natureId, IProgressMonitor monitor) throws CoreException {
+		IProjectDescription description = project.getDescription();
+		String[] prevNatures = description.getNatureIds();
+		List<String> newNatures = new ArrayList<String>(Arrays.asList(prevNatures));
+		newNatures.remove(natureId);
+		description.setNatureIds(newNatures.toArray(new String[newNatures.size()]));
+		project.setDescription(description, monitor);
+	}
+	
+	public void configure() throws CoreException {
+	}
+
+	public void deconfigure() throws CoreException {
+	}
+
+	public IProject getProject() {
+		return project;
+	}
+
+	public void setProject(IProject project) {
+		this.project = project;
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/SourceRPM.java b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/SourceRPM.java
new file mode 100644
index 0000000..ccdba3c
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/SourceRPM.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.core;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+
+public class SourceRPM {
+    
+	private IFile sourceRPM;
+	private IFolder sourcesFolder;
+	
+	public SourceRPM(IFile sourceRPM) {
+		this.sourceRPM = sourceRPM;
+	}
+	
+	public IFile getFile() {
+		return sourceRPM;
+	}
+	
+	public IFolder getSourcesFolder() {
+		return sourcesFolder;
+	}
+	
+	public void setSourcesFolder(IFolder sourcesFolder) {
+		this.sourcesFolder = sourcesFolder;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/rpm_strings.properties b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/rpm_strings.properties
new file mode 100644
index 0000000..1fb1c7a
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/rpm_strings.properties
@@ -0,0 +1,223 @@
+###############################################################################
+# Copyright (c) 2004, 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+
+RPMCore.Error=Error
+RPMCore.Error_trying_to_copy__=Error trying to copy 
+RPMCore._to__=\ to 
+RPMCore.--executeRPMlinux_command__95=--executeRPMlinux_command:
+RPMCore.Error_executing__97=Error executing 
+RPMCore.Error_waiting_for__99=Error waiting for 
+RPMCore._to_complete._100=\ to complete.
+RPMCore.Command__102=Command 
+RPMCore._was_interrupted._103=\ was interrupted.
+RPMCore.The_patch_name__109=The patch name 
+RPMCore._is_not_unique._110=\ is not unique.
+RPMCore._nPlease_modify_the___Patch_tag___field_and_try_again._111=\nPlease modify the \'Patch tag\' field and try again.
+RPMCore.Error_trying_to_parse_spec_file_113=Error trying to parse spec file\nMaybe a character encoding error?
+RPMCore._nIs_there_a_spec_file_at___114=\nIs there a spec file at: 
+RPMCore.Failed_to_open_the_output_spec_file_at__123=Failed to open the output spec file at 
+RPMCore.Error_trying_to_modify__132=Error trying to modify 
+RPMCore.Error_parsing_the_spec_file_in_the_project_--_157=Error parsing the spec file in the project --
+RPMCore.Failed_to_find_a___install__or___clean____section_in_the__180=Failed to find a \'install: or \'clean:\' section in the 
+RPMCore.project__s_M/makefile.__THIS_IS_REQUIRED_!_!_!_181=project\'s M/makefile.  THIS IS REQUIRED\!\!\!
+RPMCore.I/O_error_processing/reading_the_M/makefile__183=I/O error processing/reading the M/makefile 
+RPMCore.Failed_to_find_a_M/makefile_in_the_project.___THIS_IS_REQUIRED_!_!_!_185=Failed to find a M/makefile in the project.   THIS IS REQUIRED\!\!\!
+RPMCore.Failed_to_create_RPM_directories,_check_file_permissions_in__195=Failed to create RPM directories, check file permissions in 
+RPMCore.Failed_to_create_RPM_directories_in__203=Failed to create RPM directories in 
+RPMCore._--_check_file_permissions._204=\ -- check file permissions.
+RPMCore.Error_executing__208=Error executing 
+RPMCore.command._nSomething_is_wrong_with_file_permissions._209=command.\nSomething is wrong with file permissions.
+RPMCore.Problem_creating_the_.rpmrc_file.__Check_file_permissions_in__217=Problem creating the .rpmrc file.  Check file permissions in 
+RPMCore.Problem_creating_the_.rpmmacros_file._nCheck_file_permissions_in__226=Problem creating the .rpmmacros file.\nCheck file permissions in 
+RPMCore.Problem_creating_the_.rpmmacros_file._nCheck_file_permissions_in__228=Problem creating the .rpmmacros file.\nCheck file permissions in 
+RPMCore.Problem_creating_the_rpm_spec_file._nCheck_file_permissions_in__247=Problem creating the rpm spec file.\nCheck file permissions in 
+RPMCore.Problem_running_the___make___file_to_create_the_executables._nView_the_log_file_at__249=Problem running the \'make\' file to create the executables.\nView the log file at 
+RPMCore.Problem_creating_the___make_install___shell_script_--___rpmbuild.sh__.___270=Problem creating the \'make install\' shell script -- \'rpmbuild.sh\'.  
+RPMCore._nCheck_file_permissions_in__271=\nCheck file permissions in 
+RPMCore.Problem_running_the___make_install___shell_script_--__273=Problem running the \'make install\' shell script -- 
+RPMCore._nThere_may_be_a_problem_in_the_M/makefile._274=\nThere may be a problem in the M/makefile.
+RPMCore.No_files_were_found_under_build_root_--__276=No files were found under build root -- 
+RPMCore._n_--_Problem_with_the___install____section_of_the_spec_file__277=\n -- Problem with the \'install:\' section of the spec file?
+RPMCore.Problem_creating_spec_file.__Check_permissions_in__324=Problem creating spec file.  Check permissions in 
+RPMCore.Problem_creating_spec_file.__Check_permissions_in__326=Problem creating spec file.  Check permissions in 
+RPMCore.source_328=source
+RPMCore.Error_executing___make_clean___in__329=Error executing \'make clean\' in 
+RPMCore.Problem_creating_a_shell_script_--__342=Problem creating a shell script -- 
+RPMCore._nThere_may_be_a_problem_in_the_M/makefile._343=\nThere may be a problem in the M/makefile.
+RPMCore.Problem_running_this_command___346=Problem running this command: 
+RPMCore._nCheck_permissions._347=\nCheck permissions.
+RPMCore.Error_trying_to_create_shell_script_to_install__352=Error trying to create shell script to install 
+RPMCore.the_source_rpm._nCheck_the_file_permissions_in__353=the source rpm.\nCheck the file permissions in 
+RPMCore.Error_trying_to_install_the_source_with_this_command__355=Error trying to install the source with this command 
+RPMCore._nCheck_the_log_at__356=\nCheck the log at 
+RPMCore./SPECS/_359=/SPECS/
+RPMCore.There_is_not_a__360=There is not a 
+RPMCore._directory._nCheck_permissions_in_the_path_directories._361=\ directory.\nCheck permissions in the path directories.
+RPMCore.An_error_in_the__364=An error in the 
+RPMCore.directory._nEither_there_is_either_no_spec_file_or_more_than_one._365=directory.\nEither there is either no spec file or more than one.
+RPMCore.There_are_either_no_directories_or_too_many_directories_under__369=There are either no directories or too many directories under 
+RPMCore.An_error_occurred_trying_to_rename__373=An error occurred trying to rename  
+RPMCore.Error_creating_shell_script_for_the__381=Error creating shell script for the 
+RPMCore._nCheck_file_permissions._382=\nCheck file permissions.
+RPMCore.Error_executing_the_command_to_build_prep_the_rpm_-__384=Error executing the command to build prep the rpm - 
+RPMCore._nCheck_the_log_at__385=\nCheck the log at 
+RPMCore.There_should_be_only_one_directory_under__391=There should be only one directory under 
+RPMCore._at_this_point_392=\ at this point
+RPMCore.This_file_already_exists___396=This file already exists: 
+RPMCore.Error_trying_to_create_.srpminfo_file._401=Error trying to create .srpminfo file.
+RPMCore.Problem_copying_source_rpm_info_file._nCheck_permissions_in__409=Problem copying source rpm info file.\nCheck permissions in 
+RPMCore.Problem_copying_source_rpm_info_file._nCheck_permissions_in__411=Problem copying source rpm info file.\nCheck permissions in 
+RPMCore.Error_trying_to_copy_the_target_project_directory_tree_with_this_command_--__417=Error trying to copy the target project directory tree with this command -- 
+RPMCore._nFile_permissions_problem__418=\nFile permissions problem?
+RPMCore.Error_trying_to_check_for_Makefile_in__421=Error trying to check for Makefile in 
+RPMCore.Error_--_the_M/makefile_does_not_have_either_an___install____or___clean_____423=Error -- the M/makefile does not have either an \'install:\' or \'clean:\' 
+RPMCore.section._nLook_in_this_directory_____424=section.\nLook in this directory:   
+RPMCore.Error_running___make_clean___in__426=Error running \'make clean\' in 
+RPMCore.Error_either_creating_or_executing_the___make_clean___command_in__428=Error either creating or executing the \'make clean\' command in 
+RPMCore.There_are_too_many_directories_in__432=There are too many directories in 
+RPMCore.Error_trying_to_rename_directory_in__438=Error trying to rename directory in 
+RPMCore.Permissions_problem__440=Permissions problem?
+RPMCore.Error_trying_to_parse_spec_file_442=Error trying to parse spec file
+RPMCore._nIs_there_a_spec_file_at___443=\nIs there a spec file at: 
+RPMCore.Error_trying_to_create_a_tarball_of_the_source_using_this_command_--__454=Error trying to create a tarball of the source using this command -- 
+RPMCore.A_problem_occurred_creating_the_rpmbuild_shell_script.___461=A problem occurred creating the rpmbuild shell script.  
+RPMCore._nPlease_check_the_file_permissions_in_/var/tmp__462=\nPlease check the file permissions in /var/tmp 
+RPMCore.A_problem_occurred_running_this_command.___464=A problem occurred running this command.  
+RPMCore.__nPlease_review_the_log_at__465=\ \nPlease review the log at\nWindows->Show View->Other...->RPM Plugin Log File->RPM Plugin Log Viewer
+RPMCore.There_should_be_only_one_directory_under__467=There should be only one directory under 
+RPMCore.__nCheck_the_directories_there.__The_RPM_work_area_in_/var/tmp_will_be_preserved._468=\ \nCheck the directories there.  The RPM work area in /var/tmp will be preserved. 
+RPMCore.Error_trying_to_delete__477=Error trying to delete 
+RPMCore._nCheck_permissions._478=\nCheck permissions.
+RPMCore.Error_deleting_resources.__Check_file_permissions_in__483=Error deleting resources.  Check file permissions in 
+RPMCore.Problem_deleting_the_log_file_at__486=Problem deleting the log file at 
+RPMCore.__Check_the_permissions._487=\ \ Check the permissions.
+RPMCore.Error_deleting_files_in_deleteSRPMextrafiles_496=Error deleting files in deleteSRPMextrafiles
+RPMCore.Error_deleting_files_in_deleteSRPMextrafiles_498=Error deleting files in deleteSRPMextrafiles
+RPMCore.executeProjConfigure_500=executeProjConfigure
+RPMCore./bin/chmod_-R_u+r__501=/bin/chmod -R u+r 
+RPMCore./_502=/
+RPMCore.Error_executing_the_command__503=Error executing the command 
+RPMCore.__Check_permissions_of__504=\ \ Check permissions of 
+RPMCore.Problem_creating_the___make_clean/distclean/maintainer-clean___shell_script_--__515=Problem creating the \'make clean/distclean/maintainer-clean\' shell script -- 
+RPMCore._nThere_may_be_a_problem_in_the_M/makefile._516=\nThere may be a problem in the M/makefile.
+RPMCore.Problem_running_the___make_install___shell_script_--__518=Problem running the \'make install\' shell script -- 
+RPMCore._nThere_may_be_a_problem_in_the_M/makefile._519=\nThere may be a problem in the M/makefile.
+RPMCore.Problem_deleting_extra_files_from_project_in_deleteSRPMextrafiles_521=Problem deleting extra files from project in deleteSRPMextrafiles
+RPMCore.Problem_deleting_extra_files_in_the_project_in_deleteEclipseiles._523=Problem deleting extra files in the project in deleteEclipseiles.
+RPMCore.There_should_only_be_two_directories_in__531=There should only be two directories in 
+RPMCore.Error_executing_the_command__538=Error executing the command 
+RPMCore.__Check_permissions_of__539=\ \ Check permissions of 
+RPMCore.Error_in_the_Makefile_in__541=Error in the Makefile in 
+RPMCore._nMake_sure_there_is_a_clean_/distclean_/realclean_section__542=\nMake sure there is a clean:/distclean:/realclean section:
+RPMCore.Error_running_the___make_distclean/realclean/mainainer-clean____544=Error running the \'make distclean/realclean/maintainer-clean\' 
+RPMCore.command_on_the_previous_source_RPM_545=command on the previous source RPM
+RPMCore.Error_creating_shell_script_for_the__553=Error creating shell script for the 
+RPMCore._nCheck_file_permissions._554=\nCheck file permissions.
+RPMCore.Error_executing_the_command_to_create_the_patch_file_-__558=Error executing the command to create the patch file - 
+RPMCore._nAre_you_sure_there_were_changes_made_to_the_project__559=\nAre you sure there were changes made to the project? 
+RPMCore.rpm_spec_should_not_be_null_here_in__567=rpm_spec should not be null here in 
+RPMCore.A_problem_occurred_creating_the_rpmbuild_shell_script.___571=A problem occurred creating the rpmbuild shell script.  
+RPMCore._nPlease_check_the_file_permissions_in_/var/tmp__572=\nPlease check the file permissions in /var/tmp 
+RPMCore.A_problem_occurred_running_this_command.___574=A problem occurred running this command.  
+RPMCore._nPlease_review_the_log_at__575=\nPlease review the log at\nWindows->Show View->Other...->RPM Plugin Log File->RPM Plugin Log Viewer
+RPMCore.There_are_too_many_directories_in__577=There are too many directories in 
+RPMCore.Unable_to_delete_file__582=Unable to delete file 
+RPMCore._nCheck_permissions_in_the_project._583=\nCheck permissions in the project.
+RPMCore.Error_returned_from_firstSRPM_trying__588=Error returned from firstSRPM() trying 
+RPMCore.to_copy_the_spec_file_from_the_work_area_to_the_project_589=to copy the spec file from the work area to the project
+RPMCore.Error_trying_to_rename__591=Error trying to rename 
+RPMCore.Error_trying_to_create_.srpminfo_file._594=Error trying to create .srpminfo file.
+RPMCore.Error_trying_to_copy_spec_file_from_work__598=Error trying to copy spec file from work 
+RPMCore.area_to_Eclipse_project_directory_599=area to Eclipse project directory
+RPMCore.Error_copying_directories_in__1=Error copying directories in 
+RPMCore.Error_trying_to_copy_project_directory(_3=Error trying to copy project directory(
+RPMCore.)_to_the_work_area(_4=) to the work area(
+RPMCore.Error_trying_to_write_to__8=Error trying to write to 
+RPMCore.Error_1=Error
+RPMCore.Error_6=Error
+RPMCore.Error_8=Error
+RPMCore.Error_creating_directory___18=Error creating directory: 
+RPMCore._nCheck_permissions__19=\nCheck permissions?
+RPMCore.Error_copying_project_source_from__20=Error copying project source from 
+RPMCore._to__21=\ to 
+RPMCore.Error_creating_the_shell_script_to_untar_or__22=Error creating the shell script to untar or 
+RPMCore.executing_the_shell_script_to_untar_the_source._Command____23=executing the shell script to untar the source. Command = 
+RPMCore.Error_copying_source_from__24=Error copying source from 
+RPMCore._to__25=\ to 
+RPMCore.__26=\ 
+RPMCore.0=Error generating checksum: 
+RPMCore.Error_trying_to_copy_file__27=Error trying to copy file 
+RPMCore._to__28=\ to 
+RPMCore.Error_trying_to_set_up_rpm__29=Error trying to set up rpm 
+RPMCore.in__30=in 
+RPMCore._to_create_patches_31=\ to create patches
+RPMCore.Checksum___32=Checksum: 
+RPMCore.Error_parsing_spec_file_at__33=Error parsing spec file at 
+RPMCore.Error_either_creating_or_running_configure_script_34=Error either creating or running configure script
+RPMCore.RPMCore._to__7_35=RPMCore._to__7
+RPMCore.Error_36=Error
+RPMCore.Error_37=Error
+RPMCore.Error_39=Error
+RPMCore.Error_40=Error
+RPMCore.Error_47=Error
+RPMCore.An_error_occurred_either_creating_the_shell_script_containing_2=An error occurred either creating the shell script containing 
+RPMCore.this_command____3=this command:\n  
+RPMCore._nor_trying_to_execute_it._nView_the_log_at___4=\nor trying to execute it.\nView the log at: 
+RPMCore._for_more_details_5=\ for more details
+RPMCore.Error_1=Error
+RPMCore.There_is_not_a_.srpminfo_file_in__7=There is not a .srpminfo file in 
+RPMCore.There_is_no_longer_a_source_RPM_at__86=There is no longer a source RPM at 
+RPMCore.Error_getting_info_from__93=Error getting info from 
+RPMCore.Error_during__191=Error during 
+RPMCore._execution..error____192=\ execution..error = 
+RPMCore.Error_trying_to_copy__6=Error trying to copy 
+RPMCore._to__7=\ to 
+RPMCore.Error_trying_to_write_to__8=Error trying to write to 
+RPMCore.No___%defines___were_found_in_the_spec_file_38=No \'%defines\' were found in the spec file
+RPMCore.Failed_to_find_a_spec_file_at=Failed to find a spec file at 
+RPMCore.Error_using_parseDefine_to_get_the_version_no._41=Error using parseDefine to get the version no.
+RPMCore._from_the_spec_file_at___42=\ from the spec file at: 
+RPMCore.Error_using_parseDefine_to_get_the_release_no._44=Error using parseDefine to get the release no.
+RPMCore._from_the_spec_file_at___45=\ from the spec file at: 
+RPMCore.Error_parsing_the_spec_file_at=Error parsing the spec file at 
+RPMCore.Error_creating_srpminfo_file_in_the_project._9=Error creating srpminfo file in the project.
+RPMCore._nCheck_permissions_in__10=\nCheck permissions in 
+RPMExportCore.Too_many_spec_files_in__4=Too many spec files in 
+RPMExportCore.Error_trying_to_delete__5=Error trying to delete 
+ImportSRPM.Error_occurred_during_the_source_install._n_1=Error occurred during the source install.\n
+ImportSRPM.There_are_either_too_many_or_0_directories_under__2=There are either too many or 0 directories under 
+ImportSRPM.Cannot_find_a_tarball_to_untar_in___3=Cannot find a tarball to untar in: 
+LinuxShellCmds.Error_attempting_to_create___1=Error attempting to create: 
+LinuxShellCmds.Cannot_copy_a_directory___2=Cannot copy a directory: 
+LinuxShellCmds._to_a_file___3=\ to a file: 
+LinuxShellCmds.Error_attempting_to_copy_source_from___4=Error attempting to copy source from: 
+LinuxShellCmds._to__5=\ to 
+LinuxShellCmds.1=Process  returned non-zero value:
+LinuxShellCmds.2=Process output:\n
+LinuxShellCmds.3=Process error:\n
+LinuxShellCmds.4=Process  executed successfully
+LinuxShellCmds.5=Process output:\n
+LinuxShellCmds.6=Process error:\n
+LinuxShellCmds.7=\n Error output from command:\n
+LinuxShellCmds.9=Process  returned non-zero value:
+LinuxShellCmds.10=Process output:\n
+LinuxShellCmds.11=Process error:\n
+LinuxShellCmds.12=Process  executed successfully
+LinuxShellCmds.13=Process output:\n
+LinuxShellCmds.14=Process error:\n
+LinuxShellCmds.15=Error executing 
+RPMCore._nThis_RPM_*must*_be_restored_before_exporting_can_occur._1=\nThis RPM *must* be restored before exporting can occur.
+RPMCore.Error_creating__1=Error creating 
+RPMCore._nCheck_permissions__2=\nCheck permissions?
+RPMCore.spec_file_ambiguous=More than one file found in 
+RPMCore.RPMProjectFactory.0=Error constructing spec file model
+RPMCore.RPMProjectFactory.1=Error constructing source RPM model
+RPMCore.RPMProject.prepareExport=The project is not an RPM project 
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/utils/RPM.java b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/utils/RPM.java
new file mode 100644
index 0000000..36ec70e
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/utils/RPM.java
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2010 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.core.utils;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.preferences.DefaultScope;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.linuxtools.rpm.core.IRPMConstants;
+import org.eclipse.linuxtools.rpm.core.RPMConfiguration;
+import org.eclipse.linuxtools.rpm.core.RPMCorePlugin;
+
+/**
+ * A utility class for executing RPM commands.
+ * 
+ */
+public class RPM {
+
+	private static final String DEFINE = "--define"; //$NON-NLS-1$
+	private String[] macroDefines;
+	private String rpmCmd;
+
+	/**
+	 * Constructs a new RPM object.
+	 * 
+	 * @param config
+	 *            the RPM configuration to use
+	 */
+	public RPM(RPMConfiguration config) {
+		IEclipsePreferences node = new DefaultScope().getNode(RPMCorePlugin.ID);
+		rpmCmd = node.get(IRPMConstants.RPM_CMD, ""); //$NON-NLS-1$
+		String[] tmpMacroDefines = {
+				rpmCmd,
+				"-v", //$NON-NLS-1$
+				DEFINE, "_sourcedir " //$NON-NLS-1$
+						+ config.getSourcesFolder().getLocation().toOSString(),
+				DEFINE, "_srcrpmdir " + //$NON-NLS-1$
+						config.getSrpmsFolder().getLocation().toOSString(),
+				DEFINE, "_builddir " + //$NON-NLS-1$
+						config.getBuildFolder().getLocation().toOSString(),
+				DEFINE, "_rpmdir " + //$NON-NLS-1$
+						config.getRpmsFolder().getLocation().toOSString(),
+				DEFINE, "_specdir " + //$NON-NLS-1$
+						config.getSpecsFolder().getLocation().toOSString() };
+		this.macroDefines = tmpMacroDefines;
+	}
+
+	/**
+	 * Installs a given source RPM
+	 * 
+	 * @param sourceRPM The src.rpm file to install.
+	 * @return The output of the install command.
+	 * @throws CoreException If something fails.
+	 */
+	public String install(IFile sourceRPM) throws CoreException {
+		List<String> command = new ArrayList<String>();
+		command.addAll(Arrays.asList(macroDefines));
+		command.add("-i"); //$NON-NLS-1$
+		command.add(sourceRPM.getLocation().toOSString());
+		try {
+			return Utils.runCommandToString(command
+					.toArray(new String[command.size()]));
+		} catch (IOException e) {
+			throw new CoreException(new Status(IStatus.ERROR, RPMCorePlugin.ID,
+					e.getMessage(), e));
+		}
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/utils/RPMBuild.java b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/utils/RPMBuild.java
new file mode 100644
index 0000000..2fd6ded
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/utils/RPMBuild.java
@@ -0,0 +1,158 @@
+/*******************************************************************************
+ * Copyright (c) 2005-2010 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.core.utils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.preferences.DefaultScope;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.linuxtools.rpm.core.IRPMConstants;
+import org.eclipse.linuxtools.rpm.core.RPMConfiguration;
+import org.eclipse.linuxtools.rpm.core.RPMCorePlugin;
+
+/**
+ * A utility class for executing rpmbuild commands.
+ * 
+ */
+public class RPMBuild {
+
+	private static final String DEFINE = "--define"; //$NON-NLS-1$
+
+	private String[] macroDefines;
+
+	private String rpmBuildCmd;
+
+	/**
+	 * Constructs a new object.
+	 * 
+	 * @param config
+	 *            the RPM configuration to use
+	 */
+	public RPMBuild(RPMConfiguration config) {
+		IEclipsePreferences node = new DefaultScope().getNode(RPMCorePlugin.ID);
+		rpmBuildCmd = node.get(IRPMConstants.RPMBUILD_CMD, ""); //$NON-NLS-1$
+		String[] tmpMacroDefines = {
+				rpmBuildCmd,
+				"-v", //$NON-NLS-1$
+				DEFINE, "_sourcedir " //$NON-NLS-1$
+						+ config.getSourcesFolder().getLocation().toOSString(),
+				DEFINE, "_srcrpmdir " + //$NON-NLS-1$
+						config.getSrpmsFolder().getLocation().toOSString(),
+				DEFINE, "_builddir " + //$NON-NLS-1$
+						config.getBuildFolder().getLocation().toOSString(),
+				DEFINE, "_rpmdir " + //$NON-NLS-1$
+						config.getRpmsFolder().getLocation().toOSString(),
+				DEFINE, "_specdir " + //$NON-NLS-1$
+						config.getSpecsFolder().getLocation().toOSString() };
+		this.macroDefines = tmpMacroDefines;
+	}
+
+	/**
+	 * Prepares the sources for a given spec file.
+	 * 
+	 * @param specFile
+	 *            the spec file
+	 * @return The output of the `rpmbuild -bp` command.
+	 * @throws CoreException
+	 *             if the operation fails
+	 */
+	public InputStream buildPrep(IFile specFile) throws CoreException {
+		List<String> command = new ArrayList<String>();
+		command.addAll(Arrays.asList(macroDefines));
+		command.add("-bp"); //$NON-NLS-1$
+		command.add(specFile.getLocation().toString());
+		try {
+			return Utils.runCommandToInputStream(command
+					.toArray(new String[command.size()]));
+		} catch (IOException e) {
+			throw new CoreException(new Status(IStatus.ERROR, RPMCorePlugin.ID,
+					e.getMessage(), e));
+		}
+	}
+
+	/**
+	 * Builds a binary RPM for a given spec file.
+	 * 
+	 * @param specFile
+	 *            the spec file
+	 * @param outStream The stream to write the output to.
+	 * @throws CoreException
+	 *             if the operation fails
+	 */
+	public void buildBinary(IFile specFile, OutputStream outStream) throws CoreException {
+		List<String> command = new ArrayList<String>();
+		command.addAll(Arrays.asList(macroDefines));
+		command.add("-bb"); //$NON-NLS-1$
+		command.add(specFile.getLocation().toString());
+		try {
+			Utils.runCommand(outStream, command
+					.toArray(new String[command.size()]));
+		} catch (IOException e) {
+			throw new CoreException(new Status(IStatus.ERROR, RPMCorePlugin.ID,
+					e.getMessage(), e));
+		}
+	}
+
+	/**
+	 * Builds both a binary and source RPM for a given spec file.
+	 * 
+	 * @param specFile
+	 *            the spec file
+	 * @param outStream The stream to write the output to.
+	 * @throws CoreException
+	 *             if the operation fails
+	 */
+	public void buildAll(IFile specFile, OutputStream outStream) throws CoreException {
+		List<String> command = new ArrayList<String>();
+		command.addAll(Arrays.asList(macroDefines));
+		command.add("-ba"); //$NON-NLS-1$
+		command.add(specFile.getLocation().toString());
+		try {
+			Utils.runCommand(outStream, command
+					.toArray(new String[command.size()]));
+		} catch (IOException e) {
+			throw new CoreException(new Status(IStatus.ERROR, RPMCorePlugin.ID,
+					e.getMessage(), e));
+		}
+	}
+
+	/**
+	 * Builds a source RPM for a given spec file.
+	 * 
+	 * @param specFile
+	 *            the spec file
+	 * @param outStream The stream to write the output to.
+	 * @throws CoreException
+	 *             if the operation fails
+	 */
+	public void buildSource(IFile specFile, OutputStream outStream) throws CoreException {
+		List<String> command = new ArrayList<String>();
+		command.addAll(Arrays.asList(macroDefines));
+		command.add("-bs"); //$NON-NLS-1$
+		command.add(specFile.getLocation().toString());
+		try {
+			Utils.runCommand(outStream, command
+					.toArray(new String[command.size()]));
+		} catch (IOException e) {
+			throw new CoreException(new Status(IStatus.ERROR, RPMCorePlugin.ID,
+					e.getMessage(), e));
+		}
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/utils/RPMQuery.java b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/utils/RPMQuery.java
new file mode 100644
index 0000000..df61cc9
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/utils/RPMQuery.java
@@ -0,0 +1,108 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.core.utils;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.preferences.DefaultScope;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.linuxtools.rpm.core.IRPMConstants;
+import org.eclipse.linuxtools.rpm.core.RPMCorePlugin;
+
+/**
+ * Utility class for executing queries on existing binary and source RPMs
+ * 
+ */
+public class RPMQuery {
+
+	private static final String QF = "--qf"; //$NON-NLS-1$
+	private static final String QP = "-qp"; //$NON-NLS-1$
+
+	private RPMQuery() {
+	}
+
+	public static String getHeaderInfo(IFile rpmFile) throws CoreException {
+		return query(rpmFile, "-qip"); //$NON-NLS-1$
+	}
+
+	public static String getChangelog(IFile rpmFile) throws CoreException {
+		return query(rpmFile, "--changelog", QP); //$NON-NLS-1$
+	}
+
+	public static String getArch(IFile rpmFile) throws CoreException {
+		return query(rpmFile, QF, "%{ARCH}", QP); //$NON-NLS-1$
+	}
+
+	public static String getPlatform(IFile rpmFile) throws CoreException {
+		return query(rpmFile, QF, "%{PLATFORM}", QP); //$NON-NLS-1$
+	}
+
+	public static String getOS(IFile rpmFile) throws CoreException {
+		return query(rpmFile, QF, "%{OS}", QP); //$NON-NLS-1$
+	}
+
+	public static String getBuildHost(IFile rpmFile) throws CoreException {
+		return query(rpmFile, QF, "%{BUILDHOST}", QP); //$NON-NLS-1$
+	}
+
+	public static String getBuildTime(IFile rpmFile) throws CoreException {
+		return query(rpmFile, QF, "%{BUILDTIME:date}", QP); //$NON-NLS-1$
+	}
+
+	public static String getPreInstallScript(IFile rpmFile)
+			throws CoreException {
+		return query(rpmFile, QF, "%{PREIN}", QP); //$NON-NLS-1$
+	}
+
+	public static String getPostInstallScript(IFile rpmFile)
+			throws CoreException {
+		return query(rpmFile, QF, "%{POSTIN}", QP); //$NON-NLS-1$
+	}
+
+	public static String getPreUninstallScript(IFile rpmFile)
+			throws CoreException {
+		return query(rpmFile, QF, "%{PREUN}", QP); //$NON-NLS-1$
+	}
+
+	public static String getPostUninstallScript(IFile rpmFile)
+			throws CoreException {
+		return query(rpmFile, QF, "%{POSTUN}", QP); //$NON-NLS-1$
+	}
+
+	public static String getProvides(IFile rpmFile) throws CoreException {
+		return query(rpmFile, "-qlp"); //$NON-NLS-1$
+	}
+
+	private static String query(IFile rpmFile, String... args)
+			throws CoreException {
+		IEclipsePreferences node = new DefaultScope().getNode(RPMCorePlugin.ID);
+		String rpmCmd = node.get(IRPMConstants.RPM_CMD, ""); //$NON-NLS-1$
+		List<String> command = new ArrayList<String>();
+		command.add(rpmCmd);
+		command.addAll(Arrays.asList(args));
+		command.add(rpmFile.getLocation().toOSString());
+		try {
+			return Utils.runCommandToString(command.toArray(new String[command
+					.size()]));
+		} catch (IOException e) {
+			throw new CoreException(new Status(IStatus.ERROR, RPMCorePlugin.ID,
+					e.getMessage(), e));
+		}
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/utils/Utils.java b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/utils/Utils.java
new file mode 100644
index 0000000..d1df7a6
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.core/src/org/eclipse/linuxtools/rpm/core/utils/Utils.java
@@ -0,0 +1,157 @@
+/*******************************************************************************
+ * Copyright (c) 2009-2010 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.core.utils;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.channels.FileChannel;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+
+/**
+ * Utilities for calling system executables.
+ * 
+ */
+public class Utils {
+
+	/**
+	 * Runs the given command and parameters.
+	 * 
+	 * @param command
+	 *            The command with all parameters.
+	 * @return Stream containing the combined content of stderr and stdout.
+	 * @throws IOException
+	 *             If IOException occurs.
+	 */
+	public static BufferedInputStream runCommandToInputStream(String... command)
+			throws IOException {
+		BufferedInputStream in = null;
+		ProcessBuilder pBuilder = new ProcessBuilder(command);
+		pBuilder = pBuilder.redirectErrorStream(true);
+		Process child = pBuilder.start();
+		in = new BufferedInputStream(child.getInputStream());
+		return in;
+	}
+
+	/**
+	 * Runs the given command and parameters.
+	 * 
+	 * @param outStream
+	 *            The stream to write the output to.
+	 * 
+	 * @param command
+	 *            The command with all parameters.
+	 * @throws IOException If an IOException occurs.
+	 */
+	public static void runCommand(final OutputStream outStream,
+			String... command) throws IOException {
+		ProcessBuilder pBuilder = new ProcessBuilder(command);
+		pBuilder = pBuilder.redirectErrorStream(true);
+		Process child = pBuilder.start();
+		final BufferedInputStream in = new BufferedInputStream(child
+				.getInputStream());
+		Job readinJob = new Job("") { //$NON-NLS-1$
+
+			@Override
+			protected IStatus run(IProgressMonitor monitor) {
+				try {
+					int i;
+					while ((i = in.read()) != -1) {
+						outStream.write(i);
+					}
+				} catch (IOException e) {
+					e.printStackTrace();
+					return Status.CANCEL_STATUS;
+				}
+				return Status.OK_STATUS;
+			}
+
+		};
+		readinJob.schedule();
+		try {
+			child.waitFor();
+		} catch (InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * Run a command and return its output.
+	 * @param command The command to execute.
+	 * @return The output of the executed command.
+	 * @throws IOException If an I/O exception occurred.
+	 */
+	public static String runCommandToString(String... command)
+			throws IOException {
+		BufferedInputStream in = runCommandToInputStream(command);
+		return inputStreamToString(in);
+	}
+
+	/**
+	 * Reads the content of the given InputStream and returns its textual
+	 * representation.
+	 * 
+	 * @param stream
+	 *            The InputStream to read.
+	 * @return Textual content of the stream.
+	 * @throws IOException If an IOException occurs.
+	 */
+	public static String inputStreamToString(InputStream stream)
+			throws IOException {
+		StringBuilder retStr = new StringBuilder(); 
+		int c;
+		while ((c = stream.read()) != -1) {
+			retStr.append((char) c);
+		}
+		stream.close();
+		return retStr.toString();
+	}
+	
+	/**
+	 * Checks whether a file exists.
+	 * 
+	 * @param cmdPath The file path to be checked.
+	 * @return <code>true</code> if the file exists, <code>false</code> otherwise.
+	 */
+	public static boolean fileExist(String cmdPath) {
+		return new File(cmdPath).exists();
+	}
+	
+	/**
+	 * Copy file from one destination to another.
+	 * @param in The source file.
+	 * @param out The destination.
+	 * @throws IOException If an I/O exception occurs.
+	 */
+	public static void copyFile(File in, File out) throws IOException {
+		FileChannel inChannel = new FileInputStream(in).getChannel();
+		FileChannel outChannel = new FileOutputStream(out).getChannel();
+		try {
+			inChannel.transferTo(0, inChannel.size(), outChannel);
+		} catch (IOException e) {
+			throw e;
+		} finally {
+			if (inChannel != null)
+				inChannel.close();
+			if (outChannel != null)
+				outChannel.close();
+		}
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/.classpath b/rpm/org.eclipse.linuxtools.rpm.rpmlint/.classpath
new file mode 100644
index 0000000..304e861
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/.cvsignore b/rpm/org.eclipse.linuxtools.rpm.rpmlint/.cvsignore
new file mode 100644
index 0000000..ba077a4
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/.cvsignore
@@ -0,0 +1 @@
+bin
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/.project b/rpm/org.eclipse.linuxtools.rpm.rpmlint/.project
new file mode 100644
index 0000000..6cdf1d6
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.rpm.rpmlint</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/.settings/org.eclipse.jdt.core.prefs b/rpm/org.eclipse.linuxtools.rpm.rpmlint/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..ae971f0
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,83 @@
+#Wed Feb 25 14:59:06 CET 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/ChangeLog b/rpm/org.eclipse.linuxtools.rpm.rpmlint/ChangeLog
new file mode 100644
index 0000000..78b2ad1
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/ChangeLog
@@ -0,0 +1,479 @@
+2010-01-19  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* META-INF/MANIFEST.MF: Require o.e.l.rpm.core.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/actions/RunRpmlintAction.java: Use Utils from core.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/parser/RpmlintParser.java: Likewise.
+
+2010-01-18  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* plugin.xml: Switch to commands.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/actions/RunRpmlintAction.java: Make it AbstractHandler. 
+	* src/org/eclipse/linuxtools/rpm/rpmlint/actions/ToggleRpmlintNatureAction.java: Likewise. 
+
+2009-08-07  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* plugin.properties: Fix provider to be Eclipse not Eclipse.org.
+
+2009-06-29  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/rpmlint/actions/Messages.java: New messages for missing rpmlint error.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/actions/messages.properties: Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/actions/RunRpmlintAction.java (run): Show error dialog when rpmlint is not found.
+
+2009-05-29  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/rpmlint/actions/RunRpmlintAction.java (run): Add javadoc.
+	(selectionChanged): Likewise.
+	(setActivePart): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/actions/ToggleRpmlintNatureAction.java (run): Likewise.
+	(selectionChanged): Likewise.
+	(setActivePart): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/Activator.java (stop): Likewise.
+	(SPECFILE_EXTENSION): Likewise.
+	(start): Likewise.
+	(PLUGIN_ID): Likewise.
+	(RPMFILE_EXTENSION): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintBuilder.java (MARKER_ID): Likewise.
+	(MAX_WORKS): Likewise.
+	(BUILDER_ID): Likewise.
+	(getSpecfileTaskHandler): Make it protected.
+
+2009-05-14  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump release 0.4.3.
+
+2009-05-08  Alphonse Van Assche  <alcapcom@fedoraproject.org>
+	Add support for the new 'specfile-error' rpmlint error. This error is 
+	returned by rpmlint when it cannot parse a given .spec file using 
+	'rpm -q --qf= --specfile file.spec' command. The output of the RPM parser 
+	give us some useful information about many .spec file syntax errors.  
+
+	* src/org/eclipse/linuxtools/rpm/rpmlint/parser/RpmlintParser.java: Parse rpm parser error message.
+	* plugin.xml: Fix typo.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintMarkerVisitor.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/parser/RpmlintItem.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/RpmlintMarkerResolutionGenerator.java: Likewise.
+
+2009-03-24  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* plugin.xml: Add popup menu item for running rpmlint on spec files.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintMarkerRemoveVisitor.java (visit): Clean markers for rpm files.
+
+2009-02-25  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* .settings/org.eclipse.jdt.core.prefs: Enable warning for not used parameter.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/ARpmlintResolution.java (getImage): Let's have getImage in the base class to not copy it everywhere.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/HardcodedPackagerTag.java (getImage): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/HardcodedPrefixTag.java (getImage): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/MacroInChangelog.java (getImage): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoBuildrootTag.java (getImage): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoBuildSection.java (getImage): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoCleaningOfBuildroot.java (getImage): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoCleanSection.java (getImage): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoInstallSection.java (getImage): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoPrepSection.java (getImage): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/PatchNotApplied.java (getImage): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/RpmBuildrootUsage.java (getImage): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/SetupNotQuiet.java (getImage): Likewise.
+
+2009-02-12  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/HardcodedPackagerTag.java (getDescription): Fix javadoc.
+	(ID): Likewise.
+	(getImage): Likewise.
+	(getLabel): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/HardcodedPrefixTag.java (getDescription): Likewise.
+	(ID): Likewise.
+	(getImage): Likewise.
+	(getLabel): Likewise.
+
+2009-02-09  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* .settings/org.eclipse.jdt.core.prefs: Enable warnings for missing javadoc.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/Activator.java: Add constant for rpm file extension.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/Messages.java (static initializer): Remove not used message. 
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/messages.properties: Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintBuilder.java (visitAndMarkRpmlintItems): Likewise.
+	(incrementalBuild): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintDeltaVisitor.java (visit): Add rpm files to the to be checked list.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintMarkerVisitor.java (visit): Handle markers for rpm files.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintPreVisitor.java (visit): Add rpm files to the to be checked list.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/parser/RpmlintParser.java (addMarker): New method for markers not related with a source line.
+
+2009-02-06  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoBuildrootTag.java (getLineNumberForInsert): Remove methods that return section arrays.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoBuildSection.java (getLineNumberForInsert): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoCleaningOfBuildroot.java (getLineNumberForInsert): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoCleanSection.java (getLineNumberForInsert): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoInstallSection.java (getLineNumberForInsert): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoPrepSection.java (getLineNumberForInsert): Likewise.
+	
+2009-02-06  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/rpmlint/actions/RunRpmlintAction.java (run): Use utils for command invocation.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/parser/RpmlintParser.java (parseVisisted): Likewise.
+	(parseRpmlintOutput): Fix typo.
+	(runRpmlintCommand): Use utils for command invocation.
+
+2009-02-02  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/rpmlint/actions/RunRpmlintAction.java (run): Clear console before outputting to not merge different runs.
+
+2009-02-01  Alexander Kurtakov  <akurtako@redhat.com>
+	Fix #262926.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/actions/Messages.java: New file.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/actions/messages.properties: New file.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/actions/RunRpmlintAction.java: New file.
+	* META-INF/MANIFEST.MF: Add o.e.ui.console require.
+	* plugin.xml: Add action for viewing rpmlint output for rpm.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/actions/ToggleRpmlintNatureAction.java (run): Simplify and fix warning.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/Activator.java (getRpmlintPath): New method.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/parser/RpmlintParser.java 
+	(runRpmlintCommand): Simplify.
+	(getRpmlintPath): Moved in activator. 
+
+2009-01-22  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/rpmlint/Activator.java: Add constant for specfile extension.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintDeltaVisitor.java (visit): Simplify if and use file extension constant.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintMarkerRemoveVisitor.java (visit): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintMarkerVisitor.java (visit): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintPreVisitor.java (visit): Likewise.
+
+2009-01-22  Alexander Kurtakov  <akurtako@redhat.com>
+	Externalize strings.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/Messages.java: New file.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/messages.properties: New file.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/Messages.java: New file.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/messages.properties: New file.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/preferences/Messages.java: New file.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/preferences/messages.properties: New file.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/Messages.java: New file.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/messages.properties: New file.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/actions/ToggleRpmlintNatureAction.java: Add Copyright header. 
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintBuilder.java (visitAndMarkRpmlintItems): Externalize strings.
+	(fullBuild): Likewise.
+	(incrementalBuild): Likewise.
+	(build): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintDeltaVisitor.java (visit):Likewise. 
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintMarkerRemoveVisitor.java (visit): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintMarkerVisitor.java (fileToString): Likewise.
+	(visit): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintNature.java: Add Copyright header.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintPreVisitor.java (visit): Externalize strings.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/preferences/RpmlintPreferencePage.java (createFieldEditors): Externalize strings.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/ARpmlintResolution.java: Add 2009 to Copyright year.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/HardcodedPackagerTag.java (getDescription): Externalize strings.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/HardcodedPrefixTag.java (getDescription): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/MacroInChangelog.java (getDescription): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoBuildrootTag.java (getDescription): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoBuildSection.java (getDescription): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoCleaningOfBuildroot.java (getDescription): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoCleanSection.java (getDescription): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoInstallSection.java (getDescription): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoPrepSection.java (getDescription): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/PatchNotApplied.java (getDescription): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/RpmBuildrootUsage.java (getDescription): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/SetupNotQuiet.java (getDescription): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/RpmlintLog.java (logError): Likewise.
+
+2009-01-21  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* .settings/org.eclipse.jdt.core.prefs: Enable non externalized strings warnings.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/Activator.java: Add NON-NLS.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintBuilder.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintNature.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/parser/RpmlintItem.java (setSeverity): Likewise. 
+	(toString): Likewise.
+	(setRefferedContent): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/parser/RpmlintParser.java (getRealLineNbr): Likewise.
+	(parseRpmlintOurput): Likewise.
+	(runRpmlintCommand): Likewise.
+	(getMixedUseOfTabsAndSpaces): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/preferences/PreferenceConstants.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/ARemoveLineResolution.java (run): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/HardcodedPackagerTag.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/HardcodedPrefixTag.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/MacroInChangelog.java (getReplaceString): Likewise.
+	(getOriginalString): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoBuildrootTag.java (getLineToInsert): Likewise.
+	(getLineNumberForInsert): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoBuildSection.java (getLineToInsert): Likewise.
+	(getLineNumberForInsert): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoCleaningOfBuildroot.java (getLineToInsert): Likewise.
+	(getLineNumberForInsert): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoCleanSection.java (getLineToInsert): Likewise.
+	(getLineNumberForInsert): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoInstallSection.java (getLineToInsert): Likewise.
+	(getLineNumberForInsert): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoPrepSection.java (getLineToInsert): Likewise.
+	(getLineNumberForInsert): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/PatchNotApplied.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/RpmBuildrootUsage.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/RpmlintMarkerResolutionGenerator.java (getRpmlintErrorId): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/SetupNotQuiet.java (getReplaceString): Likewise.
+	(getOriginalString): Likewise.
+
+2009-01-15  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/rpmlint/actions/ToggleRpmlintNatureAction.java 
+	(toggleNature): Comment empty block.
+	
+2009-01-15  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* .settings/org.eclipse.jdt.core.prefs: Enable javadoc warnings. 
+	ONLY to be correct javadoc, not checking missing javadoc. Yet.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/actions/ToggleRpmlintNatureAction.java 
+	(setActivePart): Comment empty block.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/parser/RpmlintParser.java 
+	(getRealLineNbr): Fix javadoc syntax.
+	(parseVisisted): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/AInsertLineResolution.java 
+	(getLineNumberForInsert): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/RpmlintLog.java 
+	(logInfo): Likewise.
+	(logError): Likewise.
+	(log): Likewise.
+	(createStatus): Likewise.
+	
+2009-01-15  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* .settings/org.eclipse.jdt.core.prefs: Enable project wide warnings.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/parser/RpmlintParser.java 
+	(RpmlintParser): Make it private so instances can't be made.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/preferences/RpmlintPreferencePage.java 
+	(init): Add comment.
+
+2009-01-14  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add back qualifier for trunk.
+
+2009-01-14  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump release for Linuxtools 0.1 release.
+
+2009-01-12  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* META-INF/MANIFEST.MF: Add qualifier to the version.
+
+2009-01-06  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* META-INF/MANIFEST.MF: Bump release to 0.4.1.
+
+2008-12-18  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/ARpmlintResolution.java: New file.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/AInsertLineResolution.java 
+	(run): Remove functionality that is in the base class now.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/ARemoveLineResolution.java 
+	(run): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/AReplaceTextResolution.java 
+	(run): Likewise.
+
+2008-11-28  Alexander Kurtakov  <akurtakov@gmail.com>
+	Fix problem with enabling rpmlint warnings after task handler addition.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintBuilder.java 
+	(getSpecfileTaskHandler): Match the error handler api.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintMarkerVisitor.java 
+	(visit): Set the task handler too.
+
+2008-11-27  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoBuildSection.java 
+	(getLineNumberForInsert): Update to latest Specfile changes.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoCleaningOfBuildroot.java 
+	(getLineNumberForInsert): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoCleanSection.java 
+	(getLineNumberForInsert): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoInstallSection.java 
+	(getLineNumberForInsert): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoPrepSection.java 
+	(getLineNumberForInsert): Likewise.
+
+2008-11-26  Alexander Kurtakov  <akurtakov@gmail.com>
+	Fix imports caused by marker handlers movement.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintBuilder.java: Fix imports.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintMarkerRemoveVisitor.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintMarkerVisitor.java: Likewise.
+
+2008-11-01  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* build.properties: Add plugin.properties to bin.includes.
+
+2008-10-31  Andrew Overholt  <overholt@redhat.com>
+
+	* plugin.properties: Initial import.
+	* META-INF/MANIFEST.MF: Use plugin.properties.  Add "(Incubation)".
+
+2008-10-20  Alexander Kurtakov  <akurtakov@gmail.com>
+	Fix deprecations.
+	* META-INF/MANIFEST.MF:
+	Use Bunde-ActivationPolicy instead of the deprecated Eclipse-LazyStart.
+
+2008-10-13 Alexander Kurtakov  <akurtakov@gmail.com>
+	3 more quick fixes with some cleanup.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/AInsertLineResolution.java:
+	(run): Store the marker line for use in the resolution.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/HardcodedPackagerTag.java:
+	Add license.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/MacroInChangelog.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoCleaningOfBuildroot.java:
+	(getLineNumberForInsert): Handle warning from clean section too.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoCleanSection.java:
+	New file.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoInstallSection.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoPrepSection.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/RpmlintMarkerResolutionGenerator.java:
+	(getResolutions): Register the new quickfixes.
+	(hasResolutions): Register all the resolutions.
+
+2008-08-02 Alexander Kurtakov  <akurtakov@gmail.com>
+	Two more quick fixes.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/RpmlintMarkerResolutionGenerator.java:
+	(getResolutions): Enable new fixes.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/HardcodedPackagerTag.java: New file.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/HardcodedPrefixTag.java: Likewise.
+
+2008-08-02 Alexander Kurtakov  <akurtakov@gmail.com>
+	Cleanup.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintMarkerVisitor.java:
+	Remove unused import.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoBuildrootTag.java:
+	Make ID final.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoBuildSection.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoCleaningOfBuildroot.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/PatchNotApplied.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/RpmBuildrootUsage.java:
+	Likewise.
+
+2007-07-18  Alphonse Van Assche   <alcapcom@gmail.com>
+
+	* META-INF/MANIFEST.MF: bump to 0.0.2
+	* src/org/eclipse/linuxtools/rpm/rpmlint/actions/ToggleRpmlintNatureAction.java (run): Generify.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintMarkerVisitor.java (visit): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintNature.java (configure): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/parser/RpmlintParser.java (getRealLineNbr): Likewise.
+	(parseRpmlintOurput): Ignore rpmlint 0.83 summary line.
+
+2008-05-24  Alexander Kurtakov  <akurtakov@gmail.com>
+	Add missing @Override annotations.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/Activator.java:
+	(start): Likewise.
+	(stop): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintBuilder.java:
+	(build): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/parser/RpmlintItem.java:
+	(toString): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/preferences/PreferenceInitializer.java:
+	(initializeDefaultPreferences): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/preferences/RpmlintPreferencePage.java:
+	(createFieldEditors): Likewise.
+
+2008-05-22  Alexander Kurtakov  <akurtakov@gmail.com>
+	Add rpm-buildroot-usage quick fix.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/RpmBuildrootUsage.java: New file.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/RpmlintMarkerResolutionGenerator.java:
+	(getResolutions): Enable rpm-buildroot-usage fix.
+
+2008-05-22  Alexander Kurtakov  <akurtakov@gmail.com>
+	Add macro-in-changelog quick fix.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/MacroInChangelog.java: New file.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/RpmlintMarkerResolutionGenerator.java:
+	(getResolutions): Enable macro-in-changelog fix.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/AReplaceTextResolution.java:
+	(run): Replace at the exact position in the line.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/SetunNotQuiet.java:
+	(getOriginalString): Mark as @Override.
+	(getReplaceString): Likewise.
+	* META-INF/MANIFEST.MF: Bump BREE to J2SE-1.5
+
+2008-05-21  Alexander Kurtakov  <akurtakov@gmail.com>
+	Add no-%build-section quick fix.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoBuildSection.java: New file.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/RpmlintMarkerResolutionGenerator.java:
+	(getResolutions): Enable no-%build-section fix.
+
+2008-05-19  Alexander Kurtakov  <akurtakov@gmail.com>
+	Add no-cleaning-of-buildroot quick fix.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoCleaningOfBuildroot.java: New file.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/RpmlintMarkerResolutionGenerator.java:
+	(getResolutions): Enable no-cleaning-of-buildroot quick fix.
+
+2008-05-19  Alexander Kurtakov  <akurtakov@gmail.com>
+	Add no-buildroot-tag quick fix.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/AInsertLineResolution.java: New file.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoBuildrootTag.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/RpmlintMarkerResolutionGenerator.java:
+	(getResolutions): Enable no-buildroot-tag.
+	* META-INF/MANIFEST.MF: Import org.eclipse.ui.editors package.
+
+2008-04-29  Alexander Kurtakov  <akurtakov@gmail.com>
+	Generify.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/actions/ToggleRpmlintNatureAction.java
+	(run): Generify.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintBuilder.java
+	(fullBuild): Likewise.
+	(incrementalBuild): Likewise.
+	(visitAndMarkRpmlintItems): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/RpmlintDeltaVisitor.java
+	(getVisitedPaths): Likewise.
+	(visit): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/RpmlintMarkerVisitor.java
+	(RpmlintMarketVisitor): Likewise.
+	(visit): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/RpmlintPreVisitor.java
+	(getVisitedPaths): Likewise.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/parser/RpmlintParser.java
+	(getNumberOfIterations): Likewise.
+	(parseRpmlintOurput): Likewise.
+	(parseVisited): Likewise.
+	(runRpmlintCommand): Likewise.
+	(splitArrayList): Likewise.
+
+2008-04-08  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* .classpath:
+	The minimum java version is 5 now.
+	* .settings/org.eclipse.jdt.core.prefs:
+	Bump the compiler lever to 5.
+
+2007-07-18  Alphonse Van Assche   <alcapcom@gmail.com>
+
+	* META-INF/MANIFEST.MF: Remove unneeded deps.
+
+2007-06-26  Alphonse Van Assche   <alcapcom@gmail.com>
+
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintDeltaVisitor.java:
+	(visit): Remove old markers when a resource is modified.
+
+2007-06-25  Alphonse Van Assche   <alcapcom@gmail.com>
+
+	* src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintBuilder.java:
+	Cleanup some messages.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/Activator.java:
+	Add license.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/RpmlintLog.java:
+	Add license + cleanup the javadoc.
+	* src/org/eclipse/linuxtools/rpm/rpmlint/parser/RpmlintParser.java:
+	Remove unneeded stack traces printing.
+
+2007-06-22  Alphonse Van Assche   <alcapcom@gmail.com>
+
+	* .cvsignore: Add bin dir.
+
+2007-06-21  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	* src/org/eclipse/linuxtools/rpm/rpmlint/parser/RpmlintParser.java
+	(splitArrayList): Don't return the list to be compatible with parseVisisted new
+	implementation.
+
+2007-05-22  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	Initial version.
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/META-INF/MANIFEST.MF b/rpm/org.eclipse.linuxtools.rpm.rpmlint/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..7c8463d
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/META-INF/MANIFEST.MF
@@ -0,0 +1,26 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.rpm.rpmlint;singleton:=true
+Bundle-Version: 0.4.3.qualifier
+Bundle-Activator: org.eclipse.linuxtools.rpm.rpmlint.Activator
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.ui,
+ org.eclipse.jface.text,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.linuxtools.rpm.ui.editor,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.console;bundle-version="3.3.0",
+ org.eclipse.linuxtools.rpm.core
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.eclipse.linuxtools.rpm.rpmlint,
+ org.eclipse.linuxtools.rpm.rpmlint.actions,
+ org.eclipse.linuxtools.rpm.rpmlint.builder,
+ org.eclipse.linuxtools.rpm.rpmlint.parser,
+ org.eclipse.linuxtools.rpm.rpmlint.preferences,
+ org.eclipse.linuxtools.rpm.rpmlint.resolutions
+Bundle-Vendor: %provider
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/build.properties b/rpm/org.eclipse.linuxtools.rpm.rpmlint/build.properties
new file mode 100644
index 0000000..7b17480
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/build.properties
@@ -0,0 +1,6 @@
+source.. = src/
+output.. = bin/
+bin.includes = plugin.xml,\
+               META-INF/,\
+               .,\
+               plugin.properties
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/plugin.properties b/rpm/org.eclipse.linuxtools.rpm.rpmlint/plugin.properties
new file mode 100644
index 0000000..269c3f3
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+#  Copyright (c) 2008 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+bundleName=RPM Rpmlint Plug-in (Incubation)
+provider=Eclipse
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/plugin.xml b/rpm/org.eclipse.linuxtools.rpm.rpmlint/plugin.xml
new file mode 100644
index 0000000..6278bc8
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/plugin.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+   <extension
+         id="rpmlintBuilder"
+         name="Rpmlint project builder"
+         point="org.eclipse.core.resources.builders">
+      <builder
+            hasNature="true">
+         <run
+               class="org.eclipse.linuxtools.rpm.rpmlint.builder.RpmlintBuilder">
+         </run>
+      </builder>
+   </extension>
+   <extension
+         id="rpmlintNature"
+         name="Rpmlint Projet Nature"
+         point="org.eclipse.core.resources.natures">
+      <runtime>
+         <run
+               class="org.eclipse.linuxtools.rpm.rpmlint.builder.RpmlintNature">
+         </run>
+      </runtime>
+      <builder id="org.eclipse.linuxtools.rpm.rpmlint.rpmlintBuilder"/>
+   </extension>
+   <extension
+         point="org.eclipse.ui.commands">
+         <category
+            name="Rpmlint Commands"
+            description="Specfile Editor Commands"
+            id="rpmlint.category"/>
+         <command
+            categoryId="rpmlint.category"
+            name="Toggle Rpmlint"
+            id="rpmlint.toggleRpmlint.command"/>
+         <command
+            categoryId="rpmlint.category"
+            name="Run rpmlint"
+            id="rpmlint.runRpmlint.command"/>
+   </extension>
+   <extension point="org.eclipse.ui.handlers">
+    	<handler
+         	class="org.eclipse.linuxtools.rpm.rpmlint.actions.ToggleRpmlintNatureAction"
+         	commandId="rpmlint.toggleRpmlint.command" />
+   		<handler
+         	class="org.eclipse.linuxtools.rpm.rpmlint.actions.RunRpmlintAction"
+         	commandId="rpmlint.runRpmlint.command" />
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+         <menuContribution
+            locationURI="popup:org.eclipse.ui.popup.any?after=additions">
+         <command
+               commandId="rpmlint.toggleRpmlint.command"
+               label="Add/Remove Rpmlint Warnings" >
+                <visibleWhen>
+   		<iterate operator="and" ifEmpty="false">
+      			<adapt type="org.eclipse.core.resources.IProject">
+      			</adapt>
+   		</iterate>
+        </visibleWhen>
+               
+               </command>
+         <command
+               commandId="rpmlint.runRpmlint.command"
+               label="Run Rpmlint ">
+               <visibleWhen>
+  <iterate operator="and" ifEmpty="false">
+    <or>
+      <adapt type="org.eclipse.core.resources.IResource">
+         <or>
+            <test property="org.eclipse.core.resources.name" value="*.rpm"/> 
+            <test property="org.eclipse.core.resources.name" value="*.spec"/> 
+         </or>
+      </adapt>
+      <adapt type="org.eclipse.jface.text.ITextSelection" />
+    </or>
+   </iterate>
+</visibleWhen>
+               
+               </command>
+      </menuContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.preferencePages">
+      <page
+            category="org.eclipse.linuxtools.rpm.ui.editor.mainpage"
+            class="org.eclipse.linuxtools.rpm.rpmlint.preferences.RpmlintPreferencePage"
+            id="org.eclipse.linuxtools.rpm.rpmlint.preferences.rpmlintPreferencePage"
+            name="Rpmlint"/>
+   </extension>
+   <extension
+         point="org.eclipse.core.runtime.preferences">
+      <initializer class="org.eclipse.linuxtools.rpm.rpmlint.preferences.PreferenceInitializer"/>
+   </extension>
+   <extension
+         id="rpmlintProblem"
+         name="Rpmlint Problem"
+         point="org.eclipse.core.resources.markers">
+      <super type="org.eclipse.core.resources.problemmarker"/>
+      <super type="org.eclipse.core.resources.textmarker"/>
+      <persistent value="true"/>
+      <attribute name="rpmlintErrorId"/>
+      <attribute name="rpmlintrefferedContent"/>
+   </extension>
+   <extension
+         point="org.eclipse.ui.ide.markerResolution">
+      <markerResolutionGenerator
+            class="org.eclipse.linuxtools.rpm.rpmlint.resolutions.RpmlintMarkerResolutionGenerator"
+            markerType="org.eclipse.linuxtools.rpm.rpmlint.rpmlintProblem"/>
+   </extension>
+   
+</plugin>
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/Activator.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/Activator.java
new file mode 100644
index 0000000..5faac8b
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/Activator.java
@@ -0,0 +1,94 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.rpmlint;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.linuxtools.rpm.rpmlint.preferences.PreferenceConstants;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	/**
+	 * The id of this plugin.
+	 */
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.rpm.rpmlint"; //$NON-NLS-1$
+	
+	/**
+	 * Specfile extension constant i.e. .spec files.
+	 */
+	public static final String SPECFILE_EXTENSION = "spec"; //$NON-NLS-1$
+	
+	/**
+	 * RPM extension constant, i.e. .rpm files.
+	 */
+	public static final String RPMFILE_EXTENSION = "rpm"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+		plugin = this;
+	}
+
+	/**
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+	}
+
+	/**
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Returns an image descriptor for the image file at the given
+	 * plug-in relative path
+	 *
+	 * @param path the path
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return imageDescriptorFromPlugin(PLUGIN_ID, path);
+	}
+	
+	/**
+	 * Returns the rpmlint path stored in the preferences.
+	 * @return The path to the rpmlint executable.
+	 */
+	public static String getRpmlintPath() {
+		return plugin.getPreferenceStore().getString(
+				PreferenceConstants.P_RPMLINT_PATH);
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/Messages.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/Messages.java
new file mode 100644
index 0000000..ba8926d
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/Messages.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.rpm.rpmlint.messages"; //$NON-NLS-1$
+	public static String RpmlintLog_0;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+		//should not be instantiated
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/RpmlintLog.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/RpmlintLog.java
new file mode 100644
index 0000000..3878572
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/RpmlintLog.java
@@ -0,0 +1,103 @@
+/*******************************************************************************

+ * Copyright (c) 2007 Alphonse Van Assche.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Alphonse Van Assche - initial API and implementation

+ *******************************************************************************/

+

+package org.eclipse.linuxtools.rpm.rpmlint;

+

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.Status;

+

+/**

+ * The logger of convenience for the Rpmlint Plug-In.

+ */

+public class RpmlintLog {

+   /**

+    * Log the specified information.

+    * 

+    * @param message A human-readable message, localized to the

+    *           current locale.

+    */

+   public static void logInfo(String message) {

+      log(IStatus.INFO, IStatus.OK, message, null);

+   }

+

+   /**

+    * Log the specified error.

+    * 

+    * @param exception A low-level exception.

+    */

+   public static void logError(Throwable exception) {

+      logError(Messages.RpmlintLog_0, exception);

+   }

+

+   /**

+    * Log the specified error.

+    * 

+    * @param message A human-readable message, localized to the

+    *           current locale.

+    * @param exception A low-level exception, or <code>null</code>

+    *           if not applicable.

+    */

+   public static void logError(String message, Throwable exception) {

+      log(IStatus.ERROR, IStatus.OK, message, exception);

+   }

+

+   /**

+    * Log the specified information.

+    * 

+    * @param severity The severity; one of the following:

+    *           <code>IStatus.OK</code>,

+    *           <code>IStatus.ERROR</code>,

+    *           <code>IStatus.INFO</code>, or

+    *           <code>IStatus.WARNING</code>.

+    * @param code The plug-in-specific status code, or <code>OK</code>.

+    * @param message A human-readable message, localized to the

+    *           current locale.

+    * @param exception A low-level exception, or <code>null</code>

+    *           if not applicable.

+    */

+   public static void log(int severity, int code, String message,

+         Throwable exception) {

+

+      log(createStatus(severity, code, message, exception));

+   }

+

+   /**

+    * Create a status object representing the specified information.

+    * 

+    * @param severity The severity; one of the following:

+    *           <code>IStatus.OK</code>,

+    *           <code>IStatus.ERROR</code>,

+    *           <code>IStatus.INFO</code>, or

+    *           <code>IStatus.WARNING</code>.

+    * @param code The plug-in-specific status code, or

+    *           <code>OK</code>.

+    * @param message A human-readable message, localized to the

+    *           current locale.

+    * @param exception A low-level exception, or <code>null</code>

+    *           if not applicable.

+    * @return the status object (not <code>null</code>).

+    */

+   public static IStatus createStatus(int severity, int code,

+         String message, Throwable exception) {

+

+      return new Status(severity, Activator.PLUGIN_ID, code,

+            message, exception);

+   }

+

+   /**

+    * Log the given status.

+    * 

+    * @param status The status to log.

+    */

+   public static void log(IStatus status) {

+	   Activator.getDefault().getLog().log(status);

+   }

+}
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/actions/Messages.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/actions/Messages.java
new file mode 100644
index 0000000..a3f016b
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/actions/Messages.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.actions;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.rpm.rpmlint.actions.messages"; //$NON-NLS-1$
+	public static String RunRpmlintAction_0;
+	public static String RunRpmlintAction_1;
+	public static String RunRpmlintAction_2;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+		// don't allow instantiating
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/actions/RunRpmlintAction.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/actions/RunRpmlintAction.java
new file mode 100644
index 0000000..5cb3c9e
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/actions/RunRpmlintAction.java
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.actions;
+
+import java.io.IOException;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.linuxtools.rpm.core.utils.Utils;
+import org.eclipse.linuxtools.rpm.rpmlint.Activator;
+import org.eclipse.linuxtools.rpm.rpmlint.RpmlintLog;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.console.ConsolePlugin;
+import org.eclipse.ui.console.IConsole;
+import org.eclipse.ui.console.IConsoleManager;
+import org.eclipse.ui.console.MessageConsole;
+import org.eclipse.ui.console.MessageConsoleStream;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * Manually invoke rpmlint action, which prints the output of rpmlint execution to the console.
+ *
+ */
+public class RunRpmlintAction extends AbstractHandler{
+	/**
+	 * @param event The execution event.
+	 * @return Nothing.
+	 */
+	public Object execute(ExecutionEvent event)  {
+		ISelection selection = HandlerUtil.getCurrentSelection(event);
+		if (selection instanceof IStructuredSelection) {
+			for (Object element : ((IStructuredSelection) selection).toList()) {
+				IFile rpmFile = null;
+				if (element instanceof IFile) {
+					rpmFile = (IFile) element;
+				} else if (element instanceof IAdaptable) {
+					rpmFile = (IFile) ((IAdaptable) element)
+							.getAdapter(IFile.class);
+				}
+				if (rpmFile != null) {
+					try {
+						if (Utils.fileExist(Activator.getRpmlintPath())) {
+							String output = Utils.runCommandToString(Activator
+									.getRpmlintPath(),
+									"-i", rpmFile.getLocation() //$NON-NLS-1$
+											.toString());
+							MessageConsole myConsole = findConsole(Messages.RunRpmlintAction_0);
+							MessageConsoleStream out = myConsole
+									.newMessageStream();
+							myConsole.clearConsole();
+							myConsole.activate();
+							out.println(output);
+						} else {
+							IStatus warning = new Status(
+									IStatus.WARNING,
+									Activator.PLUGIN_ID,
+									1,
+									Messages.RunRpmlintAction_1,
+									null);
+							ErrorDialog.openError(PlatformUI.getWorkbench()
+									.getActiveWorkbenchWindow().getShell(),
+									Messages.RunRpmlintAction_2,
+									null, warning);
+						}
+					} catch (IOException e) {
+						// FIXME: rpmlint is not installed in the default place
+						// -> ask user to open the prefs page.
+						RpmlintLog.logError(e);
+					}
+				}
+			}
+		}
+		return null;
+
+	}
+
+	private MessageConsole findConsole(String name) {
+		ConsolePlugin plugin = ConsolePlugin.getDefault();
+		IConsoleManager conMan = plugin.getConsoleManager();
+		IConsole[] existing = conMan.getConsoles();
+		for (int i = 0; i < existing.length; i++)
+			if (name.equals(existing[i].getName()))
+				return (MessageConsole) existing[i];
+		// no console found, so create a new one
+		MessageConsole myConsole = new MessageConsole(name, null);
+		conMan.addConsoles(new IConsole[] { myConsole });
+		return myConsole;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/actions/ToggleRpmlintNatureAction.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/actions/ToggleRpmlintNatureAction.java
new file mode 100644
index 0000000..d66366d
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/actions/ToggleRpmlintNatureAction.java
@@ -0,0 +1,90 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.actions;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.linuxtools.rpm.rpmlint.builder.RpmlintNature;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * Toggle rpmlint nature for the given project. 
+ * As a result this enables/disables rpmlint builder.
+ *
+ */
+public class ToggleRpmlintNatureAction extends AbstractHandler {
+
+
+	/** 
+	 * @param event The event
+	 * @return Null.
+	 */
+	public Object execute(ExecutionEvent event) {
+		ISelection selection = HandlerUtil.getCurrentSelection(event);
+		if (selection instanceof IStructuredSelection) {
+			for (Object element: ((IStructuredSelection) selection).toList()) {
+				IProject project = null;
+				if (element instanceof IProject) {
+					project = (IProject) element;
+				} else if (element instanceof IAdaptable) {
+					project = (IProject) ((IAdaptable) element)
+							.getAdapter(IProject.class);
+				}
+				if (project != null) {
+					toggleNature(project);
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Toggles sample nature on a project
+	 * 
+	 * @param project
+	 *            to have sample nature added or removed
+	 */
+	private void toggleNature(IProject project) {
+		try {
+			IProjectDescription description = project.getDescription();
+			String[] natures = description.getNatureIds();
+
+			for (int i = 0; i < natures.length; ++i) {
+				if (RpmlintNature.NATURE_ID.equals(natures[i])) {
+					// Remove the nature
+					String[] newNatures = new String[natures.length - 1];
+					System.arraycopy(natures, 0, newNatures, 0, i);
+					System.arraycopy(natures, i + 1, newNatures, i,
+							natures.length - i - 1);
+					description.setNatureIds(newNatures);
+					project.setDescription(description, null);
+					return;
+				}
+			}
+
+			// Add the nature
+			String[] newNatures = new String[natures.length + 1];
+			System.arraycopy(natures, 0, newNatures, 0, natures.length);
+			newNatures[natures.length] = RpmlintNature.NATURE_ID;
+			description.setNatureIds(newNatures);
+			project.setDescription(description, null);
+		} catch (CoreException e) {
+			//TODO log exception
+		}
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/actions/messages.properties b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/actions/messages.properties
new file mode 100644
index 0000000..cee6e0e
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/actions/messages.properties
@@ -0,0 +1,13 @@
+###############################################################################
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+RunRpmlintAction_0=Rpmlint console
+RunRpmlintAction_1=No rpmlint installed or configured
+RunRpmlintAction_2=Please install and configure rpmlint in the plugin preference page.
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/builder/Messages.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/builder/Messages.java
new file mode 100644
index 0000000..f9c87cc
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/builder/Messages.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.builder;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.rpm.rpmlint.builder.messages"; //$NON-NLS-1$
+	public static String RpmlintBuilder_0;
+	public static String RpmlintBuilder_1;
+	public static String RpmlintBuilder_2;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+		// should not be instantiated
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintBuilder.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintBuilder.java
new file mode 100644
index 0000000..ef009c3
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintBuilder.java
@@ -0,0 +1,150 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.builder;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.jface.text.Document;
+import org.eclipse.linuxtools.rpm.rpmlint.Activator;
+import org.eclipse.linuxtools.rpm.rpmlint.parser.RpmlintItem;
+import org.eclipse.linuxtools.rpm.rpmlint.parser.RpmlintParser;
+import org.eclipse.linuxtools.rpm.ui.editor.markers.SpecfileErrorHandler;
+import org.eclipse.linuxtools.rpm.ui.editor.markers.SpecfileTaskHandler;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileParser;
+
+/**
+ * Project builder responsible for invoking rpmlint and processing it's response.
+ */
+public class RpmlintBuilder extends IncrementalProjectBuilder {
+
+	/**
+	 * Total number of chunks to divede the work in.
+	 */
+	public static final int MAX_WORKS = 100;
+
+	/**
+	 * ID for this builder.
+	 */
+	public static final String BUILDER_ID = Activator.PLUGIN_ID + ".rpmlintBuilder"; //$NON-NLS-1$
+
+	/**
+	 * ID for rpmlint marker problems.
+	 */
+	public static final String MARKER_ID = Activator.PLUGIN_ID +  ".rpmlintProblem"; //$NON-NLS-1$
+
+	private SpecfileParser specfileParser;
+
+	private SpecfileErrorHandler errorHandler;
+	private SpecfileTaskHandler taskHandler;
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.core.internal.events.InternalBuilder#build(int,
+	 *      java.util.Map, org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	@Override
+	protected IProject[] build(int kind, Map args, IProgressMonitor monitor)
+			throws CoreException {
+		// TODO: handle the monitor in a more clean way.
+		monitor.beginTask(Messages.RpmlintBuilder_0, MAX_WORKS);
+		monitor.worked(20);
+		if (kind == FULL_BUILD) {
+			fullBuild(monitor);
+		} else {
+			IResourceDelta delta = getDelta(getProject());
+			if (delta == null) {
+				fullBuild(monitor);
+			} else {
+				incrementalBuild(delta, monitor);
+			}
+		}			
+		return null;
+	}
+
+	protected void fullBuild(IProgressMonitor monitor) throws CoreException {
+		RpmlintPreVisitor resourceVisitor = new RpmlintPreVisitor();
+		getProject().accept(resourceVisitor);
+		checkCancel(monitor);
+		monitor.worked(50);
+		monitor.setTaskName(Messages.RpmlintBuilder_1);
+		ArrayList<RpmlintItem> rpmlintItems = RpmlintParser.getInstance().parseVisisted(
+				resourceVisitor.getVisitedPaths());
+		visitAndMarkRpmlintItems(monitor, rpmlintItems);
+	}
+
+	protected void incrementalBuild(IResourceDelta delta,
+			IProgressMonitor monitor) throws CoreException {
+		RpmlintDeltaVisitor deltaVisitor = new RpmlintDeltaVisitor();
+		delta.accept(deltaVisitor);
+		monitor.worked(50);
+		monitor.setTaskName(Messages.RpmlintBuilder_1);
+		ArrayList<RpmlintItem> rpmlintItems = RpmlintParser.getInstance().parseVisisted(
+				deltaVisitor.getVisitedPaths());
+		visitAndMarkRpmlintItems(monitor, rpmlintItems);
+	}
+
+	private void visitAndMarkRpmlintItems(IProgressMonitor monitor,
+			ArrayList<RpmlintItem> rpmlintItems) throws CoreException {
+		if (rpmlintItems.size() > 0) {
+			checkCancel(monitor);
+			monitor.worked(70);
+			monitor.setTaskName(Messages.RpmlintBuilder_2);
+			getProject().accept(new RpmlintMarkerVisitor(this, rpmlintItems));
+			monitor.worked(MAX_WORKS);
+		}
+	}
+
+	protected SpecfileParser getSpecfileParser() {
+		if (specfileParser == null) {
+			specfileParser = new SpecfileParser();
+		}
+		return specfileParser;
+	}
+
+	protected SpecfileErrorHandler getSpecfileErrorHandler(IFile file,
+			String specContent) {
+		if (errorHandler == null) {
+			errorHandler = new SpecfileErrorHandler(file, new Document(
+					specContent));
+		} else {
+			errorHandler.setFile(file);
+			errorHandler.setDocument(new Document(specContent));
+		}
+		return errorHandler;
+	}
+
+	protected SpecfileTaskHandler getSpecfileTaskHandler(IFile file,
+			String specContent) {
+		if (taskHandler == null) {
+			taskHandler = new SpecfileTaskHandler(file, new Document(
+					specContent));
+		} else {
+			taskHandler.setFile(file);
+			taskHandler.setDocument(new Document(specContent));
+		}
+		return taskHandler;
+	}
+
+	protected void checkCancel(IProgressMonitor monitor) {
+		if (monitor.isCanceled()) {
+			throw new OperationCanceledException();
+		}
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintDeltaVisitor.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintDeltaVisitor.java
new file mode 100644
index 0000000..71a67c2
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintDeltaVisitor.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.builder;
+
+import java.util.ArrayList;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.linuxtools.rpm.rpmlint.Activator;
+import org.eclipse.linuxtools.rpm.rpmlint.parser.RpmlintParser;
+
+public class RpmlintDeltaVisitor implements IResourceDeltaVisitor {
+
+	private ArrayList<String> paths = new ArrayList<String>();
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
+	 */
+	public boolean visit(IResourceDelta delta) {
+		IResource resource = delta.getResource();
+		if (Activator.SPECFILE_EXTENSION.equals(resource.getFileExtension())
+				|| Activator.RPMFILE_EXTENSION.equals(resource
+						.getFileExtension())) {
+			switch (delta.getKind()) {
+			// we first visiting resources to be able to run the rpmlint command
+			// only once. That improve drastically the performance.
+			case IResourceDelta.ADDED:
+				paths.add(resource.getLocation().toOSString());
+				break;
+			case IResourceDelta.CHANGED:
+				RpmlintParser.getInstance().deleteMarkers(resource);
+				paths.add(resource.getLocation().toOSString());
+				break;
+			}
+		}
+		return true;
+	}
+	
+	public ArrayList<String> getVisitedPaths() {
+		return paths;
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintMarkerRemoveVisitor.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintMarkerRemoveVisitor.java
new file mode 100644
index 0000000..3337828
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintMarkerRemoveVisitor.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.builder;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceVisitor;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.linuxtools.rpm.rpmlint.Activator;
+import org.eclipse.linuxtools.rpm.rpmlint.parser.RpmlintParser;
+import org.eclipse.linuxtools.rpm.ui.editor.markers.SpecfileErrorHandler;
+
+/**
+ * Removes all the markers created by rpmlint.
+ *
+ */
+public class RpmlintMarkerRemoveVisitor implements IResourceVisitor {
+
+	/**
+	 * Removes all rpmlint markers for spec and rpm files.
+	 * 
+	 * @see org.eclipse.core.resources.IResourceVisitor#visit(org.eclipse.core.resources.IResource)
+	 */
+	public boolean visit(IResource resource) throws CoreException {
+		if (Activator.SPECFILE_EXTENSION.equals(resource.getFileExtension())
+				|| Activator.RPMFILE_EXTENSION.equals(resource
+						.getFileExtension())) {
+			RpmlintParser.getInstance().deleteMarkers(resource);
+			// remove internal marks
+			resource.deleteMarkers(
+					SpecfileErrorHandler.SPECFILE_ERROR_MARKER_ID, false,
+					IResource.DEPTH_ZERO);
+		}
+		return true;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintMarkerVisitor.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintMarkerVisitor.java
new file mode 100644
index 0000000..0c988f7
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintMarkerVisitor.java
@@ -0,0 +1,173 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.builder;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceVisitor;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.Document;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.linuxtools.rpm.rpmlint.Activator;
+import org.eclipse.linuxtools.rpm.rpmlint.RpmlintLog;
+import org.eclipse.linuxtools.rpm.rpmlint.parser.RpmlintItem;
+import org.eclipse.linuxtools.rpm.rpmlint.parser.RpmlintParser;
+import org.eclipse.linuxtools.rpm.ui.editor.markers.SpecfileErrorHandler;
+
+public class RpmlintMarkerVisitor implements IResourceVisitor {
+
+	private ArrayList<RpmlintItem> rpmlintItems;
+	
+	private int lineNumber;
+	
+	private RpmlintBuilder builder;
+	
+	private String specContent;
+	
+	private boolean firstWarningInResource;
+	
+	private IFile currentFile;
+	
+	private IDocument document;
+	
+	private int charStart;
+	
+	private int charEnd;
+		
+	
+	public RpmlintMarkerVisitor(RpmlintBuilder builder, ArrayList<RpmlintItem> rpmlintItems) {
+		this.rpmlintItems = rpmlintItems;
+		this.builder = builder;
+		rpmlintItems = new ArrayList<RpmlintItem>();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.resources.IResourceVisitor#visit(org.eclipse.core.resources.IResource)
+	 */
+	public boolean visit(IResource resource) throws CoreException {
+		if (Activator.SPECFILE_EXTENSION.equals(resource.getFileExtension())) {
+			firstWarningInResource = true;
+			for (RpmlintItem item : rpmlintItems) {
+				if (item.getFileName().equals(resource.getLocation().toOSString())) {
+					currentFile = ((IFile)resource);
+					if (firstWarningInResource) {
+						RpmlintParser.getInstance().deleteMarkers(resource);
+						// remove internal marks on the current resource
+						currentFile.deleteMarkers(SpecfileErrorHandler.SPECFILE_ERROR_MARKER_ID, false, IResource.DEPTH_ZERO);
+						firstWarningInResource = false;
+					}
+
+					specContent = fileToString(currentFile);
+					// FIXME: workaround the wrong line number with configure-without-libdir-spec
+					if (item.getId().equals("configure-without-libdir-spec")) { //$NON-NLS-1$
+						item.setLineNbr(-1);
+						lineNumber = RpmlintParser.getInstance().getRealLineNbr(specContent, "./configure"); //$NON-NLS-1$
+						if (lineNumber == -1)
+							lineNumber = RpmlintParser.getInstance().getRealLineNbr(specContent, "%configure"); //$NON-NLS-1$
+						item.setLineNbr(lineNumber);
+					}
+					
+					lineNumber = item.getLineNbr();
+					if (lineNumber == -1) {
+						lineNumber = RpmlintParser.getInstance().getRealLineNbr(specContent, item.getRefferedContent());
+						if (lineNumber == -1) {
+							lineNumber = 1;
+						}
+					}
+					lineNumber -= 1;
+					// end workaround
+					
+					// BTW we mark specfile with the internal marker.
+					builder.getSpecfileParser().setErrorHandler(builder.getSpecfileErrorHandler(currentFile, specContent));
+					builder.getSpecfileParser().setTaskHandler(builder.getSpecfileTaskHandler(currentFile, specContent));
+					builder.getSpecfileParser().parse(specContent);
+
+					document = new Document(specContent);
+					charStart = getLineOffset(lineNumber);
+					charEnd = charStart + getLineLenght(lineNumber);
+					RpmlintParser.getInstance().addMarker((IFile) resource, item.getId() + ": " //$NON-NLS-1$
+							+ item.getMessage(), lineNumber, charStart, charEnd,
+							item.getSeverity(), item.getId(),
+							item.getRefferedContent());
+				}
+			}
+		} else if (Activator.RPMFILE_EXTENSION.equals(resource
+				.getFileExtension())) {
+			firstWarningInResource = true;
+			for (RpmlintItem item : rpmlintItems) {
+					currentFile = ((IFile) resource);
+					if (firstWarningInResource) {
+						RpmlintParser.getInstance().deleteMarkers(resource);
+						// remove internal marks on the current resource
+						currentFile.deleteMarkers(
+								SpecfileErrorHandler.SPECFILE_ERROR_MARKER_ID,
+								false, IResource.DEPTH_ZERO);
+						firstWarningInResource = false;
+					}
+
+					// BTW we mark specfile with the internal marker.
+					builder.getSpecfileParser().setErrorHandler(
+							builder.getSpecfileErrorHandler(currentFile,
+									specContent));
+					builder.getSpecfileParser().setTaskHandler(
+							builder.getSpecfileTaskHandler(currentFile,
+									specContent));
+
+					RpmlintParser.getInstance().addMarker((IFile) resource,
+							item.getId() + ": " //$NON-NLS-1$
+									+ item.getMessage(), item.getSeverity(),
+							item.getId(), item.getRefferedContent());
+			}
+		}
+		return true;
+	}
+	
+	private int getLineOffset(int lineNumber) {
+		try {
+			return document.getLineOffset(lineNumber);
+		} catch (BadLocationException e) {
+			RpmlintLog.logError(e);
+			return 1;
+		}
+	}
+	
+	private int getLineLenght(int lineNumber) {
+		try {
+			return document.getLineLength(lineNumber);
+		} catch (BadLocationException e) {
+			RpmlintLog.logError(e);
+			return 1;
+		}
+	}
+	
+	private String fileToString(IFile file) {
+		String ret = ""; //$NON-NLS-1$
+		try {
+			InputStream in = file.getContents();
+			int nbrOfByte = in.available();
+			byte[] bytes = new byte[nbrOfByte];
+			in.read(bytes);
+			ret = new String(bytes);
+			in.close();
+		} catch (CoreException e) {
+			RpmlintLog.logError(e);
+		} catch (IOException e) {
+			RpmlintLog.logError(e);
+		}
+		return ret;
+	}
+	
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintNature.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintNature.java
new file mode 100644
index 0000000..ec40872
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintNature.java
@@ -0,0 +1,90 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.builder;
+
+import org.eclipse.core.resources.ICommand;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IProjectNature;
+import org.eclipse.core.runtime.CoreException;
+
+public class RpmlintNature implements IProjectNature {
+
+	/**
+	 * ID of this project nature
+	 */
+	public static final String NATURE_ID = "org.eclipse.linuxtools.rpm.rpmlint.rpmlintNature"; //$NON-NLS-1$
+
+	private IProject project;
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.core.resources.IProjectNature#configure()
+	 */
+	public void configure() throws CoreException {
+		IProjectDescription desc = project.getDescription();
+		ICommand[] commands = desc.getBuildSpec();
+		for (ICommand command : commands) {
+			if (command.getBuilderName().equals(RpmlintBuilder.BUILDER_ID)) {
+				return;
+			}
+		}
+		ICommand[] newCommands = new ICommand[commands.length + 1];
+		System.arraycopy(commands, 0, newCommands, 0, commands.length);
+		ICommand command = desc.newCommand();
+		command.setBuilderName(RpmlintBuilder.BUILDER_ID);
+		newCommands[newCommands.length - 1] = command;
+		desc.setBuildSpec(newCommands);
+		project.setDescription(desc, null);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.core.resources.IProjectNature#deconfigure()
+	 */
+	public void deconfigure() throws CoreException {
+		IProjectDescription description = getProject().getDescription();
+		ICommand[] commands = description.getBuildSpec();
+		for (int i = 0; i < commands.length; ++i) {
+			if (commands[i].getBuilderName().equals(RpmlintBuilder.BUILDER_ID)) {
+				ICommand[] newCommands = new ICommand[commands.length - 1];
+				System.arraycopy(commands, 0, newCommands, 0, i);
+				System.arraycopy(commands, i + 1, newCommands, i,
+						commands.length - i - 1);
+				description.setBuildSpec(newCommands);
+				// Remove rpmlint marks on all specfiles into the project.
+				project.accept(new RpmlintMarkerRemoveVisitor());
+				return;
+			}
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.core.resources.IProjectNature#getProject()
+	 */
+	public IProject getProject() {
+		return project;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.core.resources.IProjectNature#setProject(org.eclipse.core.resources.IProject)
+	 */
+	public void setProject(IProject project) {
+		this.project = project;
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintPreVisitor.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintPreVisitor.java
new file mode 100644
index 0000000..f15d74d
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/builder/RpmlintPreVisitor.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.builder;
+
+import java.util.ArrayList;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceVisitor;
+import org.eclipse.linuxtools.rpm.rpmlint.Activator;
+
+public class RpmlintPreVisitor implements IResourceVisitor {
+	
+	private ArrayList<String> paths = new ArrayList<String>();
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.resources.IResourceVisitor#visit(org.eclipse.core.resources.IResource)
+	 */
+	public boolean visit(IResource resource) {
+		if (Activator.SPECFILE_EXTENSION.equals(resource.getFileExtension())
+				|| Activator.RPMFILE_EXTENSION.equals(resource
+						.getFileExtension())) {
+			// we previsiting resource to be able to run rpmlint command
+			// only once. That improve drasticaly the perfs.
+			paths.add(resource.getLocation().toOSString());
+		}
+		return true;	
+	}
+
+	public ArrayList<String> getVisitedPaths() {
+		return paths;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/builder/messages.properties b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/builder/messages.properties
new file mode 100644
index 0000000..39d2deb
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/builder/messages.properties
@@ -0,0 +1,13 @@
+###############################################################################
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+RpmlintBuilder_0=Check rpmlint problems
+RpmlintBuilder_1=Retrive Rpmlint problems...
+RpmlintBuilder_2=Add Rpmlint problems...
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/messages.properties b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/messages.properties
new file mode 100644
index 0000000..45979e8
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/messages.properties
@@ -0,0 +1,11 @@
+###############################################################################
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+RpmlintLog_0=Unexpected Exception
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/parser/RpmlintItem.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/parser/RpmlintItem.java
new file mode 100644
index 0000000..0b34605
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/parser/RpmlintItem.java
@@ -0,0 +1,130 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.parser;
+
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileParser;
+
+public class RpmlintItem {
+
+	private static final String[] sections = SpecfileParser.simpleSections;
+
+	private int lineNbr;
+
+	private int severity;
+
+	private String id;
+
+	private String refferedContent;
+
+	private String refferedSection;
+
+	private String message;
+	
+	private String fileName;
+
+	public String getFileName() {
+		return fileName;
+	}
+
+	public void setFileName(String file) {
+		this.fileName = file;
+	}
+
+	public int getLineNbr() {
+		return lineNbr;
+	}
+
+	public void setLineNbr(int lineNbr) {
+		this.lineNbr = lineNbr;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+	public String getRefferedContent() {
+		return refferedContent;
+	}
+
+	public void setRefferedContent(String refferedContent) {
+		for (int i = 0; i < sections.length; i++) {
+			if (refferedContent.startsWith(sections[i])) {
+				this.refferedContent = refferedContent.trim();
+				if (this.refferedContent.equals("")) //$NON-NLS-1$
+					this.refferedContent = sections[i];
+				this.refferedSection = sections[i];
+				i = sections.length;
+			} else {
+				this.refferedContent = refferedContent;
+				this.refferedSection = ""; //$NON-NLS-1$
+			}
+		}
+	}
+
+	public String getrefferedSection() {
+		return refferedSection;
+	}
+
+	public int getSeverity() {
+		return severity;
+	}
+
+	public void setSeverity(String severity) {
+		severity = severity.replaceAll(":", "").trim(); //$NON-NLS-1$ //$NON-NLS-2$
+		switch (severity.charAt(0)) {
+		case 'I':
+			this.severity = 0;
+			break;
+		case 'W':
+			this.severity = 1;
+			break;
+		case 'E':
+			this.severity = 2;
+			break;
+		default:
+			this.severity = 0;
+			break;
+		}
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder stringBuilder = new StringBuilder();
+		stringBuilder.append("line number: "); //$NON-NLS-1$
+		stringBuilder.append(this.lineNbr);
+		stringBuilder.append("\nfile name: "); //$NON-NLS-1$
+		stringBuilder.append(this.fileName);
+		stringBuilder.append("\nseverity: "); //$NON-NLS-1$
+		stringBuilder.append(this.severity);
+		stringBuilder.append("\nId: "); //$NON-NLS-1$
+		stringBuilder.append(this.id);
+		stringBuilder.append("\nrefered content: "); //$NON-NLS-1$
+		stringBuilder.append(this.refferedContent);
+		stringBuilder.append("\nmessage: "); //$NON-NLS-1$
+		stringBuilder.append(this.getMessage());
+		stringBuilder.append("\n"); //$NON-NLS-1$
+		return stringBuilder.toString(); 
+	}
+	
+	
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/parser/RpmlintParser.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/parser/RpmlintParser.java
new file mode 100644
index 0000000..9548841
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/parser/RpmlintParser.java
@@ -0,0 +1,341 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.parser;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.linuxtools.rpm.core.utils.Utils;
+import org.eclipse.linuxtools.rpm.rpmlint.Activator;
+import org.eclipse.linuxtools.rpm.rpmlint.RpmlintLog;
+import org.eclipse.linuxtools.rpm.rpmlint.builder.RpmlintBuilder;
+import org.eclipse.linuxtools.rpm.rpmlint.preferences.PreferenceConstants;
+import org.eclipse.linuxtools.rpm.rpmlint.resolutions.RpmlintMarkerResolutionGenerator;
+
+public class RpmlintParser {
+	
+	
+	private static final String COLON = ":"; //$NON-NLS-1$
+	private static final String SPACE = " "; //$NON-NLS-1$
+	private static final String EMPTY_STRING = ""; //$NON-NLS-1$
+	private static RpmlintParser rpmlintParser;
+
+	// default constructor
+	private RpmlintParser() {
+		// Empty constructor for making it a singleton.
+	}
+	
+	public static RpmlintParser getInstance() {
+		if (rpmlintParser == null) {
+			rpmlintParser = new RpmlintParser();
+		}
+		return rpmlintParser;
+	}
+		
+	/**
+	 * Parse visited resources.
+	 * @param visitedResources The list of resources to parse.
+	 * 
+	 * @return
+	 * 		a <code>RpmlintItem</code> ArrayList.
+	 */
+	public ArrayList<RpmlintItem> parseVisisted(ArrayList<String> visitedResources) {
+		ArrayList<RpmlintItem> retList = new ArrayList<RpmlintItem>();
+		// workaround "Argument list too long" xargs limitation. 
+		ArrayList<List<String>> commandsList = splitArrayList(visitedResources, 500);
+		Iterator<List<String>> iterator = commandsList.iterator();
+		while (iterator.hasNext()) {
+			if (commandsList.size() > 1)
+				retList.addAll(parseRpmlintOutput(runRpmlintCommand(iterator.next())));
+			else
+				return parseRpmlintOutput(runRpmlintCommand(visitedResources));
+		}
+		return retList;
+
+	}
+	
+	public void addMarker(IFile file, String message, int lineNumber, int charStart, int charEnd,
+			int severity, String rpmlintID, String rpmlintrefferedContent) {
+		try {
+			IMarker marker = file
+					.createMarker(RpmlintBuilder.MARKER_ID);
+			marker.setAttribute(IMarker.LOCATION, file.getFullPath().toString());
+			marker.setAttribute(IMarker.MESSAGE, message);
+			marker.setAttribute(IMarker.SEVERITY, severity);
+			marker.setAttribute(IMarker.LINE_NUMBER, lineNumber);
+			marker.setAttribute(IMarker.CHAR_START, charStart);
+			marker.setAttribute(IMarker.CHAR_END, charEnd);
+			marker.setAttribute(RpmlintMarkerResolutionGenerator.RPMLINT_ERROR_ID, rpmlintID);
+			marker.setAttribute(RpmlintMarkerResolutionGenerator.RPMLINT_REFFERED_CONTENT, rpmlintrefferedContent);
+
+		} catch (CoreException e) {
+			RpmlintLog.logError(e);
+		}
+	}
+	
+	public void addMarker(IFile file, String message, int severity,
+			String rpmlintID, String rpmlintrefferedContent) {
+		try {
+			IMarker marker = file.createMarker(RpmlintBuilder.MARKER_ID);
+			marker
+					.setAttribute(IMarker.LOCATION, file.getFullPath()
+							.toString());
+			marker.setAttribute(IMarker.MESSAGE, message);
+			marker.setAttribute(IMarker.SEVERITY, severity);
+			marker.setAttribute(
+					RpmlintMarkerResolutionGenerator.RPMLINT_ERROR_ID,
+					rpmlintID);
+			marker.setAttribute(
+					RpmlintMarkerResolutionGenerator.RPMLINT_REFFERED_CONTENT,
+					rpmlintrefferedContent);
+
+		} catch (CoreException e) {
+			RpmlintLog.logError(e);
+		}
+	}
+	
+	public void deleteMarkers(IResource resource) {
+		try {
+			resource.deleteMarkers(RpmlintBuilder.MARKER_ID, false, IResource.DEPTH_ZERO);
+		} catch (CoreException e) {
+			RpmlintLog.logError(e);
+		}
+	}
+	
+	/**
+	 * Parse a given rpmlint <code>InputStream</code>
+	 * 
+	 * @param 
+	 * 		rpmlint <code>InputStream</code> to parse.
+	 * @return
+	 * 		a <code>RpmlintItem</code> ArrayList.
+	 */
+	private ArrayList<RpmlintItem> parseRpmlintOutput(BufferedInputStream in) {
+		RpmlintItem item =  new RpmlintItem();
+		ArrayList<RpmlintItem> rpmlintItems = new ArrayList<RpmlintItem>();
+		LineNumberReader reader = new LineNumberReader(new InputStreamReader(in));
+		String line;
+		boolean isFirtItemLine = true;
+		String[] lineItems;
+		String description = EMPTY_STRING;
+		try {
+			while ((line = reader.readLine()) != null) {
+				if (isFirtItemLine) {
+					isFirtItemLine = false;
+					lineItems = line.split(COLON, 4);
+					item.setFileName(lineItems[0]);
+					int lineNbr;
+					
+					
+					// FIXME: last rpmlint version (0.83) contain a summary 
+					// line at the bottom of it output, so if we 
+					// detected this line we can safely return rpmlintItems, 
+					// maybe we can find a better way to detect this line. 
+					try {
+						Integer.parseInt(line.split(SPACE)[0]);
+						return rpmlintItems;
+					} catch (NumberFormatException e) {
+						// this line is not the summary
+					}					
+					
+					// TODO: ask rpmlint upstream to display always the same output.
+					// at the moment the line number is not always displayed.
+					// If the same output is always used, all the workarounds for the line number can be
+					// removed.
+					try {
+						lineNbr = Integer.parseInt(lineItems[1]);
+						item.setSeverity(lineItems[2]);
+						lineItems = lineItems[3].trim().split(SPACE, 2);						
+					} catch (NumberFormatException e) {
+						// No line number showed for this rpmlint warning.
+						lineItems = line.split(COLON, 3);
+						lineNbr = -1;
+						item.setSeverity(lineItems[1]);
+						lineItems = lineItems[2].trim().split(SPACE, 2);
+					} 
+					item.setLineNbr(lineNbr);					
+					item.setId(lineItems[0]);
+					if (lineItems.length > 1) {
+						// Maybe this error occur when rpmlint execute 'rpm -q --qf=
+						// --specfile file.spec' command
+						RpmlintItem tmpItem = parseRpmOutput(item, lineItems[1]) ;
+						if (tmpItem == null) {
+							item.setRefferedContent(lineItems[1]);
+						} else {
+							item = tmpItem;
+						}
+					} else {
+						item.setRefferedContent(EMPTY_STRING);
+					}
+				} else {
+					description += line + '\n';
+				}
+				
+				if (line.equals(EMPTY_STRING)) {
+					if (item.getMessage() == null)
+						item.setMessage(description.substring(0, description.length() - 2));
+					int useOfTabsAndSpaces = getMixedUseOfTabsAndSpaces(item.getRefferedContent());
+					if (useOfTabsAndSpaces != -1) 
+						item.setLineNbr(useOfTabsAndSpaces);
+					rpmlintItems.add(item);
+					item = new RpmlintItem();
+					
+					// Reinitialize parser for the next item
+					isFirtItemLine=true;
+					description = EMPTY_STRING;
+				}
+
+			}
+			// Close the input stream
+			in.close();
+		} catch (IOException e) {
+			RpmlintLog.logError(e);
+		}
+		return rpmlintItems;
+	}
+	
+	private RpmlintItem parseRpmOutput(RpmlintItem item, String line) {
+		String[] rpmErrorItems = line.split(COLON, 4);
+		if (item.getId().equalsIgnoreCase("specfile-error")) { //$NON-NLS-1$
+			// set severity
+			item.setSeverity("E"); //$NON-NLS-1$
+		} else {
+			return null;
+		}
+		// set line number
+		try {
+			if (rpmErrorItems[1].matches(" line [0-9]+$")) { //$NON-NLS-1$
+				item.setLineNbr(Integer.parseInt(
+						rpmErrorItems[1].replace(" line ", ""))); //$NON-NLS-1$ //$NON-NLS-2$
+				item.setMessage(rpmErrorItems[2]);
+				item.setRefferedContent(rpmErrorItems[3]);
+			} else {
+				item.setLineNbr(-1);
+				item.setMessage(rpmErrorItems[1]);
+				item.setRefferedContent(""); //$NON-NLS-1$
+			}
+		} catch (NumberFormatException e) {
+			return null;
+		}
+		
+		return item;
+	}
+	
+	/**
+	 * Run rpmlint command on given visitedResources.
+	 * 
+	 * @param specContent
+	 *            the specfile content
+	 * @return the rpmlint command <code>InputStream</code>
+	 * @throws IOException
+	 */
+	private BufferedInputStream runRpmlintCommand(List<String> visitedResources) {
+		BufferedInputStream in = null;
+		int i = 2;
+		String[] cmd = new String[visitedResources.size() + i];
+		cmd[0] = Activator.getRpmlintPath();
+		cmd[1] = "-i"; //$NON-NLS-1$
+		Iterator<String> iterator = visitedResources.iterator();
+		while(iterator.hasNext()) {
+			cmd[i] = iterator.next();
+			i++;
+		}
+		try {
+			in = Utils.runCommandToInputStream(cmd);
+		} catch (IOException e) {
+			// FIXME: rpmlint is not installed in the default place -> ask user to open the prefs page.
+			RpmlintLog.logError(e);
+		}
+		return in;
+	}
+	
+	/**
+	 * 
+	 * Return the line number for given specContent and strToFind, it returns -1
+	 * if the string to find is not found.
+	 * 
+	 * @param specContent The content of the spec file.
+	 * 
+	 * @param strToFind The string we are looking for.
+	 * @return the line number
+	 */
+	public int getRealLineNbr(String specContent, String strToFind) {
+		int ret = -1;
+		if (strToFind.equals(EMPTY_STRING)) {
+			return ret;
+		}
+		String line;
+		LineNumberReader reader = new LineNumberReader(new StringReader(
+				specContent));
+		try {
+			while ((line = reader.readLine()) != null) {
+				if (line.replaceAll("\t| ", EMPTY_STRING).indexOf( //$NON-NLS-1$
+						strToFind.replaceAll("\t| ", EMPTY_STRING)) > -1) { //$NON-NLS-1$
+					ret = reader.getLineNumber();
+				}
+			}
+		} catch (IOException e) {
+			// return -1 if an I/O Exception occure.
+		}
+		return ret;
+	}
+	
+	private int getMixedUseOfTabsAndSpaces(String refferedContent){
+		int lineNbr = -1;
+		if (refferedContent.indexOf("(spaces: line") > -1) { //$NON-NLS-1$
+			String tabsAndSpacesPref = Activator
+			.getDefault()
+			.getPreferenceStore()
+			.getString(PreferenceConstants.P_RPMLINT_TABS_AND_SPACES);
+			String[] spacesAndTabs = refferedContent.split("line"); //$NON-NLS-1$
+			if (tabsAndSpacesPref == PreferenceConstants.P_RPMLINT_SPACES)
+				lineNbr = Integer.parseInt(spacesAndTabs[1]
+				                                         .split(",")[0].trim()); //$NON-NLS-1$
+			else
+				lineNbr = Integer.parseInt(spacesAndTabs[2]
+				                                         .replaceFirst("\\)", EMPTY_STRING).trim()); //$NON-NLS-1$
+		}
+		return lineNbr;
+	}
+	
+	private ArrayList<List<String>> splitArrayList(ArrayList<String> list, int listSize) {
+		ArrayList<List<String>> resultList = new ArrayList<List<String>>();
+		if (list.size() <= listSize) {
+			resultList.add(list);
+			return resultList;
+		}
+		for (int i = 0; i < getNumberOfIterations(list, listSize); i++) {
+			int maxLength = ((i + 1) * listSize > list.size()) ? list
+					.size() : (i + 1) * listSize;
+			List<List<String>> sublist = new ArrayList<List<String>>();
+			sublist.add(list.subList(i * listSize, maxLength));
+			resultList.addAll(sublist);
+		}
+		return resultList;		
+	}
+ 
+	private int getNumberOfIterations(List<String> list, int subCollectionSize) {
+		return list.size() % subCollectionSize == 0 ? list.size()
+				/ subCollectionSize : (list.size() / subCollectionSize) + 1;
+	}
+
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/preferences/Messages.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/preferences/Messages.java
new file mode 100644
index 0000000..d6f9629
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/preferences/Messages.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.preferences;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.rpm.rpmlint.preferences.messages"; //$NON-NLS-1$
+	public static String RpmlintPreferencePage_0;
+	public static String RpmlintPreferencePage_1;
+	public static String RpmlintPreferencePage_2;
+	public static String RpmlintPreferencePage_3;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+		// should not be instantiated
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/preferences/PreferenceConstants.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/preferences/PreferenceConstants.java
new file mode 100644
index 0000000..c011951
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/preferences/PreferenceConstants.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.rpmlint.preferences;
+
+/**
+ * Constant definitions for rpmlint plug-in preferences
+ */
+public class PreferenceConstants {
+	/*
+	 * keys
+	 */
+	public static final String P_RPMLINT_PATH = "RpmlintPath"; //$NON-NLS-1$
+	public static final String P_RPMLINT_TABS = "RpmlintTab"; //$NON-NLS-1$
+	public static final String P_RPMLINT_SPACES = "RpmlintSpaces"; //$NON-NLS-1$
+	public static final String P_RPMLINT_TABS_AND_SPACES = P_RPMLINT_SPACES;
+	
+	/*
+	 * default values
+	 */
+	public static final String DP_RPMLINT_PATH = "/usr/bin/rpmlint"; //$NON-NLS-1$
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/preferences/PreferenceInitializer.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/preferences/PreferenceInitializer.java
new file mode 100644
index 0000000..156632c
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/preferences/PreferenceInitializer.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.rpmlint.preferences;
+
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.linuxtools.rpm.rpmlint.Activator;
+
+
+/**
+ * Class used to initialize default preference values.
+ */
+public class PreferenceInitializer extends AbstractPreferenceInitializer {
+	
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
+	 */
+	@Override
+	public void initializeDefaultPreferences() {
+		IPreferenceStore store = Activator.getDefault().getPreferenceStore();
+		store.setDefault(PreferenceConstants.P_RPMLINT_PATH, PreferenceConstants.DP_RPMLINT_PATH);
+		store.setDefault(PreferenceConstants.P_RPMLINT_TABS_AND_SPACES, PreferenceConstants.P_RPMLINT_SPACES);		
+		
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/preferences/RpmlintPreferencePage.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/preferences/RpmlintPreferencePage.java
new file mode 100644
index 0000000..40e162d
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/preferences/RpmlintPreferencePage.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.preferences;
+
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.jface.preference.FileFieldEditor;
+import org.eclipse.jface.preference.RadioGroupFieldEditor;
+import org.eclipse.linuxtools.rpm.rpmlint.Activator;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+public class RpmlintPreferencePage extends FieldEditorPreferencePage implements
+		IWorkbenchPreferencePage {
+
+	/**
+	 * default constructor
+	 */
+	public RpmlintPreferencePage() {
+		super(GRID);
+		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors()
+	 */
+	@Override
+	public void createFieldEditors() {
+		FileFieldEditor rpmlintFileFieldEditor = new FileFieldEditor(
+				PreferenceConstants.P_RPMLINT_PATH, Messages.RpmlintPreferencePage_0,
+				getFieldEditorParent());
+		addField(rpmlintFileFieldEditor);
+		RadioGroupFieldEditor spacesAndTabsRadioGroup = new RadioGroupFieldEditor(
+				PreferenceConstants.P_RPMLINT_TABS_AND_SPACES,
+				Messages.RpmlintPreferencePage_1, 1, new String[][] {
+						{ Messages.RpmlintPreferencePage_2,
+								PreferenceConstants.P_RPMLINT_SPACES },
+						{ Messages.RpmlintPreferencePage_3,
+								PreferenceConstants.P_RPMLINT_TABS } },
+				getFieldEditorParent(), true);
+		addField(spacesAndTabsRadioGroup);
+
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
+	 */
+	public void init(IWorkbench workbench) {
+		// Do nothing
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/preferences/messages.properties b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/preferences/messages.properties
new file mode 100644
index 0000000..83fae4a
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/preferences/messages.properties
@@ -0,0 +1,14 @@
+###############################################################################
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+RpmlintPreferencePage_0=rpmlint path
+RpmlintPreferencePage_1=Mixed use of tabs and spaces
+RpmlintPreferencePage_2=Show warnings about spaces
+RpmlintPreferencePage_3=Show warnings about tabulations
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/AInsertLineResolution.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/AInsertLineResolution.java
new file mode 100644
index 0000000..225779e
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/AInsertLineResolution.java
@@ -0,0 +1,66 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Alexander Kurtakov.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Kurtakov - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.resolutions;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.linuxtools.rpm.rpmlint.RpmlintLog;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
+
+/**
+ * Defines the common functionality for a resolution which fix is only inserting line.
+ *
+ */
+abstract public class AInsertLineResolution extends ARpmlintResolution {
+
+	protected int markerLine;
+	
+	/**
+	 * Returns the line to be inserted for the fix.
+	 * Note: If there are some whitespace requirements for this line(e.g. an empty line after it) 
+	 * just append it to the real fix.
+	 * 
+	 * @return The entire line for the fix.
+	 */
+	public abstract String getLineToInsert();
+	
+	/**
+	 * Returns the number of the line, which will succeed the inserted line.
+	 * 
+	 * @param editor The Specfile editor if it's needed for determining the correct place.
+	 * @return The number of the line following the inserted line.
+	 */
+	public abstract int getLineNumberForInsert(SpecfileEditor editor);
+
+	/**
+	 * Inserts an entire line at a given position as a resolution for a problem.
+	 * 
+	 * @see org.eclipse.ui.IMarkerResolution#run(org.eclipse.core.resources.IMarker)
+	 */
+	public void run(IMarker marker) {
+		markerLine = marker.getAttribute(IMarker.LINE_NUMBER, 0);
+		SpecfileEditor editor = getEditor(marker);
+		if (editor == null) {
+			return;
+		}
+		// Get the document
+		IDocument doc = editor.getSpecfileSourceViewer().getDocument();
+		
+		try {
+			int index = doc.getLineOffset(getLineNumberForInsert(editor));
+			doc.replace(index, 0, getLineToInsert());
+		} catch (BadLocationException e) {
+			RpmlintLog.logError(e);
+		}
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/ARemoveLineResolution.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/ARemoveLineResolution.java
new file mode 100644
index 0000000..0a5f351
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/ARemoveLineResolution.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.resolutions;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.linuxtools.rpm.rpmlint.RpmlintLog;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
+
+abstract public class ARemoveLineResolution extends ARpmlintResolution {
+	
+	public void run(IMarker marker) {
+	
+		SpecfileEditor editor = getEditor(marker); 
+		if (editor == null) {
+			return;
+		}
+		// Get the document
+		IDocument doc = editor.getSpecfileSourceViewer().getDocument(); 
+
+		try {
+			int index = doc.getLineOffset(marker.getAttribute(IMarker.LINE_NUMBER, 0));
+			int lineLength = doc.getLineLength(marker.getAttribute(IMarker.LINE_NUMBER, 0));
+			doc.replace(index, lineLength, "");  //$NON-NLS-1$
+		} catch (BadLocationException e) {
+			RpmlintLog.logError(e);
+		}
+	}
+	
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/AReplaceTextResolution.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/AReplaceTextResolution.java
new file mode 100644
index 0000000..ff028b6
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/AReplaceTextResolution.java
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.resolutions;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.linuxtools.rpm.rpmlint.RpmlintLog;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
+
+abstract public class AReplaceTextResolution extends ARpmlintResolution {
+	
+	/**
+	 * Returns the original string
+	 * 
+	 * @return the original string
+	 */
+	abstract public String getOriginalString();
+	
+	/**
+	 * Returns the string to replace in the <code>Document</code>
+	 * 
+	 * @return the string to replace
+	 * 
+	 */
+	abstract public String getReplaceString();
+	
+	public void run(IMarker marker) {
+	
+		SpecfileEditor editor = getEditor(marker); 
+		if (editor == null) {
+			return;
+		}
+		IDocument doc = editor.getSpecfileSourceViewer().getDocument(); 
+
+		try {
+			int lineNumber = marker.getAttribute(IMarker.LINE_NUMBER, 0);
+			int index = doc.getLineOffset(lineNumber);
+			String line = editor.getSpecfile().getLine(lineNumber);
+			int rowIndex = line.indexOf(getOriginalString());
+			if (rowIndex > -1){
+				doc.replace(index+rowIndex, getOriginalString().length(), getReplaceString()); 
+			}
+		} catch (BadLocationException e) {
+			RpmlintLog.logError(e);
+		}
+	}
+	
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/ARpmlintResolution.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/ARpmlintResolution.java
new file mode 100644
index 0000000..64d2748
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/ARpmlintResolution.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.resolutions;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.linuxtools.rpm.rpmlint.RpmlintLog;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IMarkerResolution2;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.ide.IDE;
+
+/**
+ * Base class providing common functionality for rpmlint resolution.
+ * 
+ */
+public abstract class ARpmlintResolution implements IMarkerResolution2 {
+
+	
+	/**
+	 * No image for rpmlint resolutions for now. 
+	 * 
+	 * @see org.eclipse.ui.IMarkerResolution2#getImage()
+	 */
+	public Image getImage() {
+		return null;
+	}
+	
+	/**
+	 * Returns the SpecfileEditor for the given IMarker if any.
+	 * 
+	 * @param marker The marker to use for retrieving the editor.
+	 * @return The SpecfileEditor this marker is from or null if it's not a SpecfileEditor.
+	 */
+	protected SpecfileEditor getEditor(IMarker marker) {
+		// Open or activate the editor.
+		IWorkbenchPage page = PlatformUI.getWorkbench()
+				.getActiveWorkbenchWindow().getActivePage();
+		IEditorPart part;
+		try {
+			part = IDE.openEditor(page, marker);
+		} catch (PartInitException e) {
+			RpmlintLog.logError(e);
+			return null;
+		}
+		// Get the editor's document.
+		if (!(part instanceof SpecfileEditor)) {
+			return null;
+		}
+		SpecfileEditor editor = (SpecfileEditor) part;
+		return editor;
+	}
+}
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/HardcodedPackagerTag.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/HardcodedPackagerTag.java
new file mode 100644
index 0000000..2091dad
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/HardcodedPackagerTag.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Alexander Kurtakov.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Kurtakov - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.resolutions;
+
+/**
+ * Quick fix for the hardcoded-packager-tag warning.
+ * This is as simple as removing the line.
+ *
+ */
+public class HardcodedPackagerTag extends ARemoveLineResolution {
+	/**
+	 * Rpmlint warning id.
+	 */
+	public static final String ID = "hardcoded-packager-tag"; //$NON-NLS-1$
+
+	/**
+	 * @see org.eclipse.ui.IMarkerResolution2#getDescription()
+	 */
+	public String getDescription() {
+		return Messages.HardcodedPackagerTag_0;
+	}
+
+	/**
+	 * @see org.eclipse.ui.IMarkerResolution#getLabel()
+	 */
+	public String getLabel() {
+		return ID;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/HardcodedPrefixTag.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/HardcodedPrefixTag.java
new file mode 100644
index 0000000..efb370a
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/HardcodedPrefixTag.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Alexander Kurtakov.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Kurtakov - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.resolutions;
+
+
+/**
+ * Quick fix for the hardcoded-prefix-tag warning.
+ *
+ */
+public class HardcodedPrefixTag extends ARemoveLineResolution{
+	/**
+	 * Rpmlint warning id.
+	 */
+	public static final String ID = "hardcoded-prefix-tag"; //$NON-NLS-1$
+
+	/**
+	 * @see org.eclipse.ui.IMarkerResolution2#getDescription()
+	 */
+	public String getDescription() {
+		return Messages.HardcodedPrefixTag_0;
+	}
+
+	/**
+	 * @see org.eclipse.ui.IMarkerResolution#getLabel()
+	 */
+	public String getLabel() {
+		return ID;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/MacroInChangelog.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/MacroInChangelog.java
new file mode 100644
index 0000000..b0502b6
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/MacroInChangelog.java
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Alexander Kurtakov.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Kurtakov - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.resolutions;
+
+public class MacroInChangelog extends AReplaceTextResolution {
+
+	public static final String ID = "macro-in-%changelog"; //$NON-NLS-1$
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.linuxtools.rpm.rpmlint.quickfixes.AReplaceTextResolution#getOriginalString()
+	 */
+	@Override
+	public String getOriginalString() {
+		return "%"; //$NON-NLS-1$
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.linuxtools.rpm.rpmlint.quickfixes.AReplaceTextResolution#getReplaceString()
+	 */
+	@Override
+	public String getReplaceString() {
+		return "%%"; //$NON-NLS-1$
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.IMarkerResolution2#getDescription()
+	 */
+	public String getDescription() {
+		return Messages.MacroInChangelog_0
+				+ Messages.MacroInChangelog_1;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.IMarkerResolution#getLabel()
+	 */
+	public String getLabel() {
+		return ID;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/Messages.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/Messages.java
new file mode 100644
index 0000000..bc42a95
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/Messages.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.resolutions;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.rpm.rpmlint.resolutions.messages"; //$NON-NLS-1$
+	public static String HardcodedPackagerTag_0;
+	public static String HardcodedPrefixTag_0;
+	public static String MacroInChangelog_0;
+	public static String MacroInChangelog_1;
+	public static String NoBuildrootTag_0;
+	public static String NoBuildSection_0;
+	public static String NoCleaningOfBuildroot_0;
+	public static String NoCleanSection_0;
+	public static String NoInstallSection_0;
+	public static String NoPrepSection_0;
+	public static String PatchNotApplied_0;
+	public static String RpmBuildrootUsage_0;
+	public static String SetupNotQuiet_0;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+		//should not be instantiated
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoBuildSection.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoBuildSection.java
new file mode 100644
index 0000000..3c993ab
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoBuildSection.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Alexander Kurtakov.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Kurtakov - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.resolutions;
+
+import java.util.List;
+
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileSection;
+
+/**
+ * Resolution for the no-%build-section rpmlint warning.
+ * Fix is to put an empty %build section.
+ *
+ */
+public class NoBuildSection extends AInsertLineResolution {
+	public static final String ID = "no-%build-section"; //$NON-NLS-1$
+
+	public String getDescription() {
+		return Messages.NoBuildSection_0;
+	}
+
+	public String getLabel() {
+		return ID;
+	}
+
+	@Override
+	public String getLineToInsert() {
+		return "%build\n\n"; //$NON-NLS-1$
+	}
+
+	@Override
+	public int getLineNumberForInsert(SpecfileEditor editor) {
+		List<SpecfileSection> sections = editor.getSpecfile().getSections();
+		for (SpecfileSection section : sections) {
+			if (section.getName().equals("install")) { //$NON-NLS-1$
+				return section.getLineNumber();
+			}
+		}
+		return 0;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoBuildrootTag.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoBuildrootTag.java
new file mode 100644
index 0000000..692267d
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoBuildrootTag.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Alexander Kurtakov.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Kurtakov - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.resolutions;
+
+import java.util.List;
+
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileSection;
+
+/**
+ * Quick fix for the "no-buildroot-tag" error.
+ * TODO: Provide UI for defining the BuildRoot format.
+ *
+ */
+public class NoBuildrootTag extends AInsertLineResolution {
+	public static final String ID = "no-buildroot-tag"; //$NON-NLS-1$
+
+	public String getDescription() {
+		return Messages.NoBuildrootTag_0;
+	}
+
+	public String getLabel() {
+		return ID;
+	}
+
+	@Override
+	public String getLineToInsert() {
+		return "BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root\n\n"; //$NON-NLS-1$
+	}
+
+	@Override
+	public int getLineNumberForInsert(SpecfileEditor editor) {
+		List<SpecfileSection> sections = editor.getSpecfile()
+				.getComplexSections();
+		for (SpecfileSection section : sections) {
+			if (section.getName().equals("description") //$NON-NLS-1$
+					&& section.getPackage() == null) {
+				return section.getLineNumber();
+			}
+		}
+		return 0;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoCleanSection.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoCleanSection.java
new file mode 100644
index 0000000..e33f791
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoCleanSection.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Alexander Kurtakov.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Kurtakov - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.resolutions;
+
+import java.util.List;
+
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileSection;
+
+public class NoCleanSection extends AInsertLineResolution {
+	public static final String ID = "no-%clean-section"; //$NON-NLS-1$
+
+	public String getDescription() {
+		return Messages.NoCleanSection_0;
+	}
+
+	public String getLabel() {
+		return ID;
+	}
+
+	@Override
+	public String getLineToInsert() {
+		return "%clean\n\n"; //$NON-NLS-1$
+	}
+
+	@Override
+	public int getLineNumberForInsert(SpecfileEditor editor) {
+		List<SpecfileSection> sections = editor.getSpecfile().getSections();
+		for (SpecfileSection section : sections) {
+			if (section.getName().equals("changelog")) { //$NON-NLS-1$
+				return section.getLineNumber();
+			}
+		}
+		return 0;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoCleaningOfBuildroot.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoCleaningOfBuildroot.java
new file mode 100644
index 0000000..c0118c4
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoCleaningOfBuildroot.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Alexander Kurtakov.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Kurtakov - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.resolutions;
+
+import java.util.List;
+
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileSection;
+
+public class NoCleaningOfBuildroot extends AInsertLineResolution {
+
+	public static final String ID = "no-cleaning-of-buildroot"; //$NON-NLS-1$
+
+	public String getDescription() {
+		return Messages.NoCleaningOfBuildroot_0;
+	}
+
+	public String getLabel() {
+		return ID;
+	}
+
+	@Override
+	public String getLineToInsert() {
+		return "rm -Rf $RPM_BUILD_ROOT\n"; //$NON-NLS-1$
+	}
+
+	@Override
+	public int getLineNumberForInsert(SpecfileEditor editor) {
+		List<SpecfileSection> sections = editor.getSpecfile().getSections();
+		for (SpecfileSection section : sections) {
+			if (section.getName().equals("install") //$NON-NLS-1$
+					|| section.getName().equals("clean")) { //$NON-NLS-1$
+				if (markerLine == section.getLineNumber()) {
+					return section.getLineNumber() + 1;
+				}
+			}
+		}
+		return 0;
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoInstallSection.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoInstallSection.java
new file mode 100644
index 0000000..b695307
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoInstallSection.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Alexander Kurtakov.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Kurtakov - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.resolutions;
+
+import java.util.List;
+
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileSection;
+
+public class NoInstallSection extends AInsertLineResolution {
+	public static final String ID = "no-%install-section"; //$NON-NLS-1$
+
+	public String getDescription() {
+		return Messages.NoInstallSection_0;
+	}
+
+	public String getLabel() {
+		return ID;
+	}
+
+	@Override
+	public String getLineToInsert() {
+		return "%install\n\n"; //$NON-NLS-1$
+	}
+
+	@Override
+	public int getLineNumberForInsert(SpecfileEditor editor) {
+		List<SpecfileSection> sections = editor.getSpecfile().getSections();
+		for (SpecfileSection section : sections) {
+			if (section.getName().equals("clean")) { //$NON-NLS-1$
+				return section.getLineNumber();
+			}
+		}
+		return 0;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoPrepSection.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoPrepSection.java
new file mode 100644
index 0000000..eb92cd2
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/NoPrepSection.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Alexander Kurtakov.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Kurtakov - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.resolutions;
+
+import java.util.List;
+
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileSection;
+
+public class NoPrepSection extends AInsertLineResolution{
+	public static final String ID = "no-%prep-section"; //$NON-NLS-1$
+
+	public String getDescription() {
+		return Messages.NoPrepSection_0;
+	}
+
+	public String getLabel() {
+		return ID;
+	}
+
+	@Override
+	public String getLineToInsert() {
+		return "%prep\n\n"; //$NON-NLS-1$
+	}
+
+	@Override
+	public int getLineNumberForInsert(SpecfileEditor editor) {
+		List<SpecfileSection> sections = editor.getSpecfile().getSections();
+		for (SpecfileSection section : sections) {
+			if (section.getName().equals("build")) { //$NON-NLS-1$
+				return section.getLineNumber();
+			}
+		}
+		return 0;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/PatchNotApplied.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/PatchNotApplied.java
new file mode 100644
index 0000000..7027b65
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/PatchNotApplied.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.resolutions;
+
+public class PatchNotApplied extends ARemoveLineResolution {
+
+	public static final String ID = "patch-not-applied"; //$NON-NLS-1$
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IMarkerResolution2#getDescription()
+	 */
+	public String getDescription() {
+		return Messages.PatchNotApplied_0;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IMarkerResolution#getLabel()
+	 */
+	public String getLabel() {
+		return ID;
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/RpmBuildrootUsage.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/RpmBuildrootUsage.java
new file mode 100644
index 0000000..649976f
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/RpmBuildrootUsage.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Alexander Kurtakov.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Kurtakov - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.resolutions;
+
+public class RpmBuildrootUsage extends ARemoveLineResolution{
+	public static final String ID = "rpm-buildroot-usage"; //$NON-NLS-1$
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.IMarkerResolution2#getDescription()
+	 */
+	public String getDescription() {
+		return Messages.RpmBuildrootUsage_0;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.IMarkerResolution#getLabel()
+	 */
+	public String getLabel() {
+		return ID;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/RpmlintMarkerResolutionGenerator.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/RpmlintMarkerResolutionGenerator.java
new file mode 100644
index 0000000..1f26d3a
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/RpmlintMarkerResolutionGenerator.java
@@ -0,0 +1,108 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.resolutions;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.ui.IMarkerResolution;
+import org.eclipse.ui.IMarkerResolutionGenerator2;
+
+public class RpmlintMarkerResolutionGenerator implements IMarkerResolutionGenerator2 {
+
+	// rpmlint error id atribut name
+	public static final String RPMLINT_ERROR_ID = "rpmlintErrorId"; //$NON-NLS-1$
+	
+	// rpmlint refered  text
+	public static final String RPMLINT_REFFERED_CONTENT = "rpmlintrefferedContent"; //$NON-NLS-1$
+	
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IMarkerResolutionGenerator2#hasResolutions(org.eclipse.core.resources.IMarker)
+	 */
+	public boolean hasResolutions(IMarker marker) {
+		String rpmlintErrorId = getRpmlintErrorId(marker);
+		if (rpmlintErrorId.equals(SetupNotQuiet.ID)) {
+            return true;
+		} else if (rpmlintErrorId.equals(PatchNotApplied.ID)) {
+			return true;
+		}  else if (rpmlintErrorId.equals(NoBuildrootTag.ID)) {
+			return true;
+		} else if (rpmlintErrorId.equals(NoCleaningOfBuildroot.ID)){
+			return true;
+		} else if (rpmlintErrorId.equals(NoBuildSection.ID)){
+			return true;
+		} else if (rpmlintErrorId.equals(MacroInChangelog.ID)){
+			return true;
+		} else if (rpmlintErrorId.equals(RpmBuildrootUsage.ID)){
+			return true;
+		} else if (rpmlintErrorId.equals(HardcodedPrefixTag.ID)){
+			return true;
+		} else if (rpmlintErrorId.equals(HardcodedPackagerTag.ID)){
+			return true;
+		} else if (rpmlintErrorId.equals(NoPrepSection.ID)){
+			return true;
+		} else if (rpmlintErrorId.equals(NoInstallSection.ID)){
+			return true;
+		} else if (rpmlintErrorId.equals(NoCleanSection.ID)){
+			return true;
+		}
+
+		return false;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IMarkerResolutionGenerator#getResolutions(org.eclipse.core.resources.IMarker)
+	 */
+	public IMarkerResolution[] getResolutions(IMarker marker) {
+		List<IMarkerResolution> resolutions = new ArrayList<IMarkerResolution>();
+		String rpmlintErrorId = getRpmlintErrorId(marker);
+		if (rpmlintErrorId.equals(SetupNotQuiet.ID)) {
+			resolutions.add(new SetupNotQuiet());
+		} else if (rpmlintErrorId.equals(PatchNotApplied.ID)) {
+			resolutions.add(new PatchNotApplied());
+		} else if (rpmlintErrorId.equals(NoBuildrootTag.ID)) {
+			resolutions.add(new NoBuildrootTag());
+		} else if (rpmlintErrorId.equals(NoCleaningOfBuildroot.ID)){
+			resolutions.add(new NoCleaningOfBuildroot());
+		} else if (rpmlintErrorId.equals(NoBuildSection.ID)){
+			resolutions.add(new NoBuildSection());
+		} else if (rpmlintErrorId.equals(MacroInChangelog.ID)){
+			resolutions.add(new MacroInChangelog());
+		} else if (rpmlintErrorId.equals(RpmBuildrootUsage.ID)){
+			resolutions.add(new RpmBuildrootUsage());
+		} else if (rpmlintErrorId.equals(HardcodedPrefixTag.ID)){
+			resolutions.add(new HardcodedPrefixTag());
+		} else if (rpmlintErrorId.equals(HardcodedPackagerTag.ID)){
+			resolutions.add(new HardcodedPackagerTag());
+		} else if (rpmlintErrorId.equals(NoPrepSection.ID)){
+			resolutions.add(new NoPrepSection());
+		} else if (rpmlintErrorId.equals(NoInstallSection.ID)){
+			resolutions.add(new NoInstallSection());
+		} else if (rpmlintErrorId.equals(NoCleanSection.ID)){
+			resolutions.add(new NoCleanSection());
+		}
+
+		return resolutions.toArray(new IMarkerResolution[resolutions.size()]);
+	}
+	
+	/**
+	 * Return the rpmlint error id attribute for the specified marker
+	 * 
+	 * @param marker the marker to check
+	 * @return the rpmlint error id or <code>""</code> if none
+	 */
+	private String getRpmlintErrorId(IMarker marker) {
+		return marker.getAttribute(RPMLINT_ERROR_ID, ""); //$NON-NLS-1$
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/SetupNotQuiet.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/SetupNotQuiet.java
new file mode 100644
index 0000000..c0b2f4a
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/SetupNotQuiet.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.rpmlint.resolutions;
+
+public class SetupNotQuiet extends AReplaceTextResolution {
+
+	public static final String ID = "setup-not-quiet"; //$NON-NLS-1$
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.rpm.rpmlint.quickfixes.AReplaceTextResolution#getOriginalString()
+	 */
+	@Override
+	public String getOriginalString() {
+		return "%setup"; //$NON-NLS-1$
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.linuxtools.rpm.rpmlint.quickfixes.AReplaceTextResolution#getReplaceString()
+	 */
+	@Override
+	public String getReplaceString() {
+		return "%setup -q"; //$NON-NLS-1$
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IMarkerResolution2#getDescription()
+	 */
+	public String getDescription() {
+		return Messages.SetupNotQuiet_0;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IMarkerResolution#getLabel()
+	 */
+	public String getLabel() {
+		return ID;
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/messages.properties b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/messages.properties
new file mode 100644
index 0000000..b2656de
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/rpm/rpmlint/resolutions/messages.properties
@@ -0,0 +1,23 @@
+###############################################################################
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+HardcodedPackagerTag_0=The Packager tag is hardcoded in your spec file. It should be removed, so as to use rebuilder's own defaults.
+HardcodedPrefixTag_0=The Prefix tag is hardcoded in your spec file. It should be removed, so as to allow package relocation.
+MacroInChangelog_0=Macros are expanded in %changelog too, which can in unfortunate cases lead 
+MacroInChangelog_1=to the package not building at all, or other subtle unexpected conditions that\taffect the build.
+NoBuildrootTag_0=The BuildRoot tag isn't used in your spec. It must be used in order to allow building the package as non root on some systems.
+NoBuildSection_0=Insert empty %build section
+NoCleaningOfBuildroot_0=You should clean $RPM_BUILD_ROOT in the %clean section and just after the beginning of %install section. Use "rm -Rf $RPM_BUILD_ROOT"
+NoCleanSection_0=Insert empty %clean section
+NoInstallSection_0=Insert empty %install section
+NoPrepSection_0=Insert empty %prep section
+PatchNotApplied_0=A patch is included in your package but was not applied. Refer to the patches documentation to see what's wrong.
+RpmBuildrootUsage_0=$RPM_BUILD_ROOT should not be touched during %build or %prep stage, as it will break short circuiting.
+SetupNotQuiet_0=Use the -q option to the %setup macro to avoid useless build output from unpacking the sources
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor-feature/.project b/rpm/org.eclipse.linuxtools.rpm.ui.editor-feature/.project
new file mode 100644
index 0000000..d8a6e9c
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor-feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.rpm.ui.editor-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor-feature/ChangeLog b/rpm/org.eclipse.linuxtools.rpm.ui.editor-feature/ChangeLog
new file mode 100644
index 0000000..9767b35
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor-feature/ChangeLog
@@ -0,0 +1,52 @@
+2009-11-10  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.properties: Make featureName a bit more user-friendly.
+
+2009-08-05  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.properties: Update description.
+
+2009-05-19  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.properties: Change provider from Eclipse.org to Eclipse.
+
+2009-05-14  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* feature.xml: Bump release 0.4.3.
+
+2009-01-24  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* feature.xml: Include doc plugin.
+
+2009-01-14  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Re-added update site information (sorry).  Re-add "qualifier" for trunk.
+
+2009-01-14  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* feature.xml: Bump release for Linuxtools 0.1 release.
+	
+2009-01-14  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* feature.xml: Remove update site.
+
+2009-01-09  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* feature.properties: Add 2009 to copyright text.
+	* feature.xml: Add qualifier to version.
+
+2009-01-06  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.xml: Add update site information.
+
+2009-01-06  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* feature.xml: Bump release to 0.4.1 and add url to our site.
+
+2008-10-31  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.properties: Add "(Incubation)".
+
+2007-08-19  Alphonse Van Assche   <alcapcom@gmail.com>
+
+	* feature.xml: change version to 0.1.0
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor-feature/build.properties b/rpm/org.eclipse.linuxtools.rpm.ui.editor-feature/build.properties
new file mode 100644
index 0000000..279df8f
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor-feature/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+               license.html,\
+               feature.properties,\
+               epl-v10.html
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/docs/epl-v10.html b/rpm/org.eclipse.linuxtools.rpm.ui.editor-feature/epl-v10.html
similarity index 100%
copy from systemtap/SystemTapGuiServer/systemtapguiserver-1.0/docs/epl-v10.html
copy to rpm/org.eclipse.linuxtools.rpm.ui.editor-feature/epl-v10.html
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor-feature/feature.properties b/rpm/org.eclipse.linuxtools.rpm.ui.editor-feature/feature.properties
new file mode 100644
index 0000000..1424ff7
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor-feature/feature.properties
@@ -0,0 +1,140 @@
+#*******************************************************************************
+# Copyright (c) 2007 Alphonse Van Assche.
+# Copyright (c) 2008 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Alphonse Van Assche - initial API and implementation
+#    Red Hat, Inc.
+#********************************************************************************
+
+# NLS_MESSAGEFORMAT_NONE
+# NLS_ENCODING=UTF-8
+
+# "featureName" property - name of the feature
+featureName=RPM Specfile Editor (Incubation)
+
+# "description" property - description of the feature
+description=This feature provides an editor with completion assistance, hover variable expansion, and more for RPM specfiles.  
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2007-2009 Red Hat, Inc and others. All rights reserved.\n\
+\n\
+This program and the accompanying materials are made available under the terms\n\
+of the Eclipse Public License v1.0 which accompanies this distribution, and is\n\
+available at http://www.eclipse.org/legal/epl-v10.html\n
+################ end of copyright property ####################################
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
+March 17, 2005\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse.org CVS\n\
+repository ("Repository") in CVS modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+Features may also include other Features ("Included Features"). Files named\n\
+"feature.xml" may contain a list of the names and version numbers of\n\
+Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+   - The top-level (root) directory\n\
+   - Plug-in and Fragment directories\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
+   - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Eclipse Update Manager, you must agree to a license ("Feature Update\n\
+License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties". Such Abouts,\n\
+Feature Licenses and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
+    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
+########### end of license property ##########################################
+
+
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor-feature/feature.xml b/rpm/org.eclipse.linuxtools.rpm.ui.editor-feature/feature.xml
new file mode 100644
index 0000000..89d7c81
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor-feature/feature.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.linuxtools.rpm.ui.editor"
+      label="%featureName"
+      version="0.4.3.qualifier"
+      provider-name="%featureProvider"
+      plugin="org.eclipse.linuxtools.rpm.ui.editor">
+
+   <description url="http://www.eclipse.org/linuxtools/">
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <url>
+      <update label="Linux Tools Update Site" url="http://download.eclipse.org/technology/linuxtools/update"/>
+   </url>
+
+   <requires>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.jface"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.editors"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.ui.views"/>
+      <import plugin="org.eclipse.linuxtools.changelog.core"/>
+      <import plugin="com.ibm.icu"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.linuxtools.rpm.rpmlint"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.rpm.ui.editor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.rpm.ui.editor.doc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+</feature>
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor-feature/license.html b/rpm/org.eclipse.linuxtools.rpm.ui.editor-feature/license.html
new file mode 100644
index 0000000..f5a1625
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor-feature/license.html
@@ -0,0 +1,81 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
+<title>Eclipse.org Software User Agreement</title>
+</head>
+
+<body lang="EN-US" link=blue vlink=purple>
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>March 17, 2005</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+   
+<h3>Applicable Licenses</h3>   
+   
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+(&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
+   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+   
+<ul>
+	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>   
+ 
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+	
+<ul>
+	<li>The top-level (root) directory</li>
+
+	<li>Plug-in and Fragment directories</li>
+	<li>Inside Plug-ins and Fragments packaged as JARs</li>
+	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+	<li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
+	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+
+	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+<h3>Cryptography</h3>
+	
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+   
+<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
+</body>
+</html>
diff --git a/profiling/.classpath b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/.classpath
similarity index 100%
copy from profiling/.classpath
copy to rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/.classpath
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/.project b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/.project
new file mode 100644
index 0000000..13327c3
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.rpm.ui.editor.doc</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/ChangeLog b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/ChangeLog
new file mode 100644
index 0000000..d0e8691
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/ChangeLog
@@ -0,0 +1,187 @@
+2009-08-07  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* plugin.properties: Fix provider to be Eclipse not Eclipse.org.
+
+2009-08-04  Alexander Kurtakov  <akurtako@redhat.com>
+	Sync with wiki.
+	* userguide/Customizing-Editor-Settings.html: Removed.
+	* userguide/images/\ Specfile_enable_rpmlint.png: Removed.
+	* userguide/images/\ Specfile_generic.png: Removed.
+	* userguide/images/\ Specfile_macros_content.png: Removed.
+	* userguide/images/\ Specfile_macros_description.png: Removed.
+	* userguide/images/\ Specfile_new_from_template.png: Removed.
+	* userguide/images/\ Specfile_new_wizard.png: Removed.
+	* userguide/images/\ Specfile_problems_rpmlint.png: Removed.
+	* userguide/images/\ Specfile_rpmlint_fix_after.png: Removed.
+	* userguide/images/\ Specfile_rpmlint_fix_before.png: Removed.
+	* userguide/images/\ Specfile_rpmlint_quickfix.png: Removed.
+	* userguide/images/\ Specfile_settings_changelog.png: Removed.
+	* userguide/images/\ Specfile_settings_macros.png: Removed.
+	* userguide/images/\ Specfile_settings_rpmlint.png: Removed.
+	* userguide/images/\ Specfile_settings_tasks.png: Removed.
+	* userguide/images/\ Specfile_settings_templates.png: Removed.
+	* userguide/images/\ Specfile_warnings_rpmlint.png: Removed.
+	* userguide/Rpmlint.html: Removed.
+	* userguide/Configuring-Specfile-Editor-Settings.html: New file.
+	* userguide/General-Usage.html: New file.
+	* userguide/images/Screenshot-edittemplate.png: New file.
+	* userguide/images/Screenshot-taskscreenshot.png: New file.
+	* userguide/images/Specfile_enable_rpmlint.png: New file.
+	* userguide/images/Specfile_generic.png: New file.
+	* userguide/images/Specfile_macros_content.png: New file.
+	* userguide/images/Specfile_macros_description.png: New file.
+	* userguide/images/Specfile_new_from_template.png: New file.
+	* userguide/images/Specfile_new_wizard.png: New file.
+	* userguide/images/Specfile_problems_rpmlint.png: New file.
+	* userguide/images/Specfile_rpmlint_fix_after.png: New file.
+	* userguide/images/Specfile_rpmlint_fix_before.png: New file.
+	* userguide/images/Specfile_rpmlint_quickfix.png: New file.
+	* userguide/images/Specfile_settings_changelog.png: New file.
+	* userguide/images/Specfile_settings_macros.png: New file.
+	* userguide/images/Specfile_settings_rpmlint.png: New file.
+	* userguide/images/Specfile_settings_tasks.png: New file.
+	* userguide/images/Specfile_settings_templates.png: New file.
+	* userguide/Installing.html: New file.
+	* userguide/images/Specfile_settings_rpms_details.png: Updated.
+	* userguide/images/Specfile_settings_rpms_generic.png: Updated.
+	* userguide/SpecfileEditorReference-toc.xml: Updated.
+	* userguide/SpecfileEditorReference.html: Updated.
+	* userguide/Updating-This-Document.html: Updated.
+
+2009-07-17  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* build-helper.xml: Add copyright.
+	* build.properties: Likewise.
+	* META-INF/MANIFEST.MF: Add Bundle-Lokalization. 
+	* plugin.properties: Add copyright.
+	* plugin.xml: Likewise.
+	* src/org/eclipse/linuxtools/internal/rpm/ui/editor/doc/anttask/tasks.properties: Likewise.
+	* toc.xml: Likewise.
+
+2009-05-26  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* META-INF/MANIFEST.MF: Don't require versioned org.apache.ant.
+
+2009-05-26  Alexander Kurtakov  <akurtako@redhat.com>
+	Move documentation to wiki.eclipse.org.
+	* html/generic.html: Removed.
+	* html/images/enable_rpmlint.png: Removed.
+	* html/images/generic.png: Removed.
+	* html/images/macros_long.png: Removed.
+	* html/images/macros_short.png: Removed.
+	* html/images/new_from_template.png: Removed.
+	* html/images/problems_rpmlint.png: Removed.
+	* html/images/rpmlint_fix_after.png: Removed.
+	* html/images/rpmlint_fix_before.png: Removed.
+	* html/images/rpmlint_quickfix.png: Removed.
+	* html/images/settings_changelog.png: Removed.
+	* html/images/settings_macros.png: Removed.
+	* html/images/settings_rpmlint.png: Removed.
+	* html/images/settings_rpms_details.png: Removed.
+	* html/images/settings_rpms_generic.png: Removed.
+	* html/images/settings_tasks.png: Removed.
+	* html/images/settings_templates.png: Removed.
+	* html/images/Unti.xcf: Removed.
+	* html/images/warnings_rpmlint.png: Removed.
+	* html/images/wizard.png: Removed.
+	* html/macro_settings.html: Removed.
+	* html/package_settings.html: Removed.
+	* html/rpmlint.html: Removed.
+	* html/settings.html: Removed.
+	* html/support.html: Removed.
+	* html/toc.html: Removed.
+	* .classpath: New file.
+	* about.html: New file.
+	* build-helper.xml: New file.
+	* doc/notices.html: New file.
+	* extract-markup.xsl: New file.
+	* plugin.properties: New file.
+	* src/org/eclipse/linuxtools/internal/rpm/ui/editor/doc/anttask/MediaWikiImageFetcher.java: New file.
+	* src/org/eclipse/linuxtools/internal/rpm/ui/editor/doc/anttask/tasks.properties: New file.
+	* userguide/Customizing-Editor-Settings.html: New file.
+	* userguide/images/\ Specfile_enable_rpmlint.png: New file.
+	* userguide/images/\ Specfile_generic.png: New file.
+	* userguide/images/\ Specfile_macros_content.png: New file.
+	* userguide/images/\ Specfile_macros_description.png: New file.
+	* userguide/images/\ Specfile_new_from_template.png: New file.
+	* userguide/images/\ Specfile_new_wizard.png: New file.
+	* userguide/images/\ Specfile_problems_rpmlint.png: New file.
+	* userguide/images/\ Specfile_rpmlint_fix_after.png: New file.
+	* userguide/images/\ Specfile_rpmlint_fix_before.png: New file.
+	* userguide/images/\ Specfile_rpmlint_quickfix.png: New file.
+	* userguide/images/\ Specfile_settings_changelog.png: New file.
+	* userguide/images/\ Specfile_settings_macros.png: New file.
+	* userguide/images/\ Specfile_settings_rpmlint.png: New file.
+	* userguide/images/\ Specfile_settings_tasks.png: New file.
+	* userguide/images/\ Specfile_settings_templates.png: New file.
+	* userguide/images/\ Specfile_warnings_rpmlint.png: New file.
+	* userguide/images/Specfile_settings_rpms_details.png: New file.
+	* userguide/images/Specfile_settings_rpms_generic.png: New file.
+	* userguide/Rpmlint.html: New file.
+	* userguide/SpecfileEditorReference-toc.xml: New file.
+	* userguide/SpecfileEditorReference.html: New file.
+	* userguide/Updating-This-Document.html: New file.
+	* .project: Make it java project.
+	* build.properties: Add new files for distribution.
+	* META-INF/MANIFEST.MF: Use plugin.properties for name and vendor, add new bundle requires.
+	* plugin.xml: Add new TOC generated from wiki.
+	* toc.xml: Reference the genertated TOC.
+
+2009-05-14  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump release 0.4.3.
+
+2009-04-15  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* META-INF/MANIFEST.MF: Fix Bundle-Name and Bundle-Vendor.
+
+2009-01-26  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* html/images/settings_rpms_details.png: New file.
+	* html/images/settings_rpms_generic.png: New file.
+	* html/images/Unti.xcf: New file.
+	* html/package_settings.html: Fill packages setting page.
+	* html/images/macros_long.png: New file.
+	* html/images/macros_short.png: New file.
+	* html/images/settings_macros.png: New file.
+	* html/macro_settings.html: Fill macro settings page.
+	* html/images/settings_changelog.png: New file.
+	* html/images/settings_rpmlint.png: New file.
+	* html/images/settings_tasks.png: New file.
+	* html/images/settings_templates.png: New file.
+	* html/settings.html: Fill the settings documentation page.
+	* html/support.html: Fill the support documentation page.
+	* html/images/rpmlint_fix_after.png: New file.
+	* html/images/rpmlint_fix_before.png: New file.
+	* html/images/enable_rpmlint.png: New file.
+	* html/images/problems_rpmlint.png: New file.
+	* html/images/rpmlint_quickfix.png: New file.
+	* html/images/warnings_rpmlint.png: New file.
+	* html/rpmlint.html: Fill the documentation for rpmlint integration.
+
+2009-01-24  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* html/images/new_from_template.png: New file.
+	* html/images/generic.png: New file.
+	* html/images/wizard.png: New file.
+	* html/generic.html: Starting editing and creating a new specfile described.
+	
+
+2009-01-23  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* html/toc.html: TOC with basic intro created.
+
+2009-01-16  Alexander Kurtakov  <akurtako@redhat.com>
+	Stubs for the documentation.
+	* .project: New file.
+	* build.properties: New file.
+	* html/generic.html: New file.
+	* html/macro_settings.html: New file.
+	* html/package_settings.html: New file.
+	* html/rpmlint.html: New file.
+	* html/settings.html: New file.
+	* html/support.html: New file.
+	* html/toc.html: New file.
+	* META-INF/MANIFEST.MF: New file.
+	* plugin.xml: New file.
+	* toc.xml: New file.
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/META-INF/MANIFEST.MF b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..87f4de7
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.rpm.ui.editor.doc; singleton:=true
+Bundle-Version: 0.4.3.qualifier
+Bundle-Vendor: %provider
+Bundle-Localization: plugin
+Require-Bundle: org.apache.ant,
+ org.eclipse.help
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/about.html b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/about.html
new file mode 100644
index 0000000..0c6525d
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>24th October, 2008</p>	
+<h3>License</h3>
+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<h3>Contributions</h3>
+
+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise
+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such
+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
+
+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or
+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the
+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/build-helper.xml b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/build-helper.xml
new file mode 100644
index 0000000..051d11f
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/build-helper.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+    Copyright (c) 2009 Red Hat, Inc.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+   
+    Contributors:
+        Red Hat - initial API and implementation
+ -->
+
+<project name="org.eclipse.linuxtools.rpm.ui.editor.doc" default="all">
+	<description>
+            Generate Eclipse help content for the Linux Tools Specfile Editor user guide
+    </description>
+
+	<property name="specfile.help.doc.url.base" value="http://wiki.eclipse.org"/>
+	<property name="specfile.wiki.url.base" value="${specfile.help.doc.url.base}/Linux_Tools_Project/SpecfileEditor"/>
+	<property name="imageFolder" value="images"/>
+
+	<path id="tasks.classpath" path="bin"/>
+
+	<!-- See the paths below?
+	     Check org.eclipse.mylyn.wikitext.{core,mediawiki.core} into your workspace
+	     from Mylyn CVS (under tools project in eclipse.org CVS)
+	  -->
+
+	<path id="wikitext.tasks.classpath">
+		<pathelement location="../org.eclipse.mylyn.wikitext.core/@dot"/>
+		<pathelement location="../org.eclipse.mylyn.wikitext.core/bin"/>
+		<pathelement location="../org.eclipse.mylyn.wikitext.mediawiki.core/@dot"/>
+		<pathelement location="../org.eclipse.mylyn.wikitext.mediawiki.core/bin"/>
+	</path>
+
+	<taskdef classpathref="tasks.classpath" resource="org/eclipse/linuxtools/internal/rpm/ui/editor/doc/anttask/tasks.properties"/>
+	<taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/util/anttask/tasks.properties"/>
+
+	<target name="init">
+		<mkdir dir="tmp"/>
+	</target>
+
+	<target name="clean" depends="init">
+		<delete includeemptydirs="true" failonerror="false">
+			<fileset dir="tmp"/>
+		</delete>
+	</target>
+
+	<target name="all" depends="init" description="Generate Eclipse help content for the Linux Tools OProfile user guide">
+		<eclipse-wiki-to-help
+        	help.doc.filenamenoextension="SpecfileEditorReference"
+        	help.doc.url.base="${specfile.help.doc.url.base}"
+        	help.doc.url.html="${specfile.wiki.url.base}/User_Guide"
+        	help.doc.url.xml="${specfile.help.doc.url.base}/Special:Export/Linux_Tools_Project/SpecfileEditor/User_Guide"
+        	help.imagefolder="${imageFolder}"
+        	targetfolder="userguide"
+        	wiki.url.base="${oprofile.help.doc.url.base}/Linux_Tools_Project"/>
+	</target>
+
+	<macrodef name="eclipse-wiki-to-help">
+		<attribute name="help.doc.url.base"/>
+		<attribute name="wiki.url.base"/>
+		<attribute name="help.doc.url.html"/>
+		<attribute name="help.doc.url.xml"/>
+		<attribute name="help.doc.filenameNoExtension"/>
+		<attribute name="help.imageFolder"/>
+		<attribute name="targetFolder"/>
+		<sequential>
+			<get dest="tmp/help.doc.xml" src="@{help.doc.url.xml}"/>
+			<get dest="tmp/help.doc.html" src="@{help.doc.url.html}"/>
+
+			<!--
+	    	<copy todir="tmp">
+	    		<fileset dir="images"/>
+	    	</copy>
+	    	-->
+			<mediawiki-fetch-images src="tmp/help.doc.html" dest="tmp" base="@{help.doc.url.base}"/>
+
+			<xslt style="extract-markup.xsl" in="tmp/help.doc.xml" out="tmp/@{help.doc.filenameNoExtension}.mediawiki"/>
+			<echo append="true" file="tmp/@{help.doc.filenameNoExtension}.mediawiki">
+
+= Updating This Document =
+
+This document is maintained in a collaborative wiki.  If you wish to update or modify this document please visit 
+@{help.doc.url.html}
+			</echo>
+
+			<!-- Removing Phoenix extensions -->
+			<replaceregexp match="\{\{\#eclipseproject.*" replace="" flags="g" byline="true">
+				<fileset dir="tmp" includes="**/*.mediawiki"/>
+			</replaceregexp>
+
+			<wikitext-to-eclipse-help markupLanguage="org.eclipse.mylyn.wikitext.mediawiki.core.MediaWikiLanguage" 
+				multipleOutputFiles="true"
+				navigationImages="true"
+				helpPrefix="@{targetFolder}"
+				internallinkpattern="@{wiki.url.base}/{0}"
+				validate="true"
+				failonvalidationerror="true"
+				prependImagePrefix="${imageFolder}"
+				formatoutput="true">
+				<fileset dir="tmp" includes="**/*.mediawiki"/>
+				<stylesheet url="book.css"/>
+			</wikitext-to-eclipse-help>
+
+			<mkdir dir="@{targetFolder}/${imageFolder}"/>
+			<copy todir="@{targetFolder}/${imageFolder}" overwrite="true">
+				<fileset dir="tmp">
+					<include name="*.gif"/>
+					<include name="*.png"/>
+				</fileset>
+			</copy>
+			<copy todir="@{targetFolder}" overwrite="true">
+				<fileset dir="tmp">
+					<include name="*.html"/>
+					<include name="*toc.xml"/>
+					<exclude name="help.doc.html"/>
+				</fileset>
+			</copy>
+			<antcall target="test"/>
+		</sequential>
+	</macrodef>
+
+
+	<target name="test" depends="init" description="verify that all of the HTML files are well-formed XML">
+		<echo level="info">
+Validating help content XML and HTML files: The Eclipse help system expects well-formed XML
+			
+If validation fails it is because either:
+			
+* the userguide source code is poorly formed, or
+* the WikiText MediaWiki parser has a bug
+			
+Problems with userguide source are usually caused by improper use of HTML markup in the MediaWiki source,
+or inadvertently starting a line with a space character (in MediaWiki this starts a preformatted block)
+		</echo>
+
+		<!-- 
+		Don't bother with DTD validation: we only care if the files are well-formed.
+		We therefore provide an empty DTD 
+		-->
+		<echo file="tmp/__empty.dtd" message=""/>
+		<xmlvalidate lenient="true">
+			<fileset dir="userguide">
+				<include name="**/*.xml"/>
+			</fileset>
+			<fileset dir="userguide">
+				<include name="**/*.html"/>
+			</fileset>
+			<dtd publicid="-//W3C//DTD XHTML 1.0 Transitional//EN" location="${basedir}/tmp/__empty.dtd"/>
+		</xmlvalidate>
+	</target>
+</project>
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/build.properties b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/build.properties
new file mode 100644
index 0000000..b931697
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/build.properties
@@ -0,0 +1,20 @@
+###############################################################################
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+source.. = src/
+output.. = bin/
+bin.includes = plugin.xml,\
+               META-INF/,\
+               .,\
+               doc/,\
+               userguide/,\
+               toc.xml,\
+               plugin.properties,\
+               about.html
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/doc/notices.html b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/doc/notices.html
new file mode 100644
index 0000000..dd6688f
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/doc/notices.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+
+<meta name="copyright" content="&#169; Copyright 2009 Eclipse Linux Tools project committers and others. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+
+   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+   <LINK REL="STYLESHEET" HREF="book.css" CHARSET="ISO-8859-1" TYPE="text/css">
+   <title>Legal Notices</title>
+</head>
+<body>
+
+<h3>
+<a NAME="Notices"></a>Notices</h3>
+<p>
+The material in this guide is &#169; Copyright 2009 Eclipse Linux Tools project committers and others.
+</p>
+<p>
+<a href="../about.html">Terms and conditions regarding the use of this guide.</a>
+</p>
+</body>
+</html>
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/extract-markup.xsl b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/extract-markup.xsl
new file mode 100644
index 0000000..4c4e731
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/extract-markup.xsl
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:mw="http://www.mediawiki.org/xml/export-0.3/">
+	<xsl:output  method="text"/>
+	
+	<xsl:template match="/">
+		<xsl:value-of select="//mw:text"/>
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/plugin.properties b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/plugin.properties
new file mode 100644
index 0000000..6dc3204
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/plugin.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+provider=Eclipse
+bundleName=Documentation for RPM specfile editor (Incubation)
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/plugin.xml b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/plugin.xml
new file mode 100644
index 0000000..c8e20b5
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/plugin.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?><!--
+    Copyright (c) 2009 Red Hat, Inc.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+   
+    Contributors:
+        Red Hat - initial API and implementation
+ -->
+
+<plugin>
+   <extension
+         point="org.eclipse.help.toc">
+      <toc file="toc.xml" primary="true" />
+      <toc
+            file="userguide/SpecfileEditorReference-toc.xml"
+            primary="false">
+      </toc>
+   </extension>
+</plugin>
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/src/org/eclipse/linuxtools/internal/rpm/ui/editor/doc/anttask/MediaWikiImageFetcher.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/src/org/eclipse/linuxtools/internal/rpm/ui/editor/doc/anttask/MediaWikiImageFetcher.java
new file mode 100644
index 0000000..080c25b
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/src/org/eclipse/linuxtools/internal/rpm/ui/editor/doc/anttask/MediaWikiImageFetcher.java
@@ -0,0 +1,149 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008 David Green and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     David Green - initial API and implementation
+ * 
+ * Re-namespaced 2009-04-14 without changes from org.eclipse.mylyn.help.ui.
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.rpm.ui.editor.doc.anttask;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.Get;
+
+/**
+ * Fetch images from a MediaWiki-generated HTML page source
+ * 
+ * @author David Green
+ */
+public class MediaWikiImageFetcher extends Task {
+
+	private String base;
+
+	private File dest;
+
+	private File src;
+
+	@Override
+	public void execute() throws BuildException {
+		if (dest == null) {
+			throw new BuildException("Must specify @dest"); //$NON-NLS-1$
+		}
+		if (!dest.exists()) {
+			throw new BuildException("@dest does not exist: " + dest); //$NON-NLS-1$
+		}
+		if (!dest.isDirectory()) {
+			throw new BuildException("@dest is not a directory: " + dest); //$NON-NLS-1$
+		}
+		if (src == null) {
+			throw new BuildException("Must specify @src"); //$NON-NLS-1$
+		}
+		if (!src.exists()) {
+			throw new BuildException("@src does not exist: " + src); //$NON-NLS-1$
+		}
+		if (!src.isFile()) {
+			throw new BuildException("@src is not a file: " + src); //$NON-NLS-1$
+		}
+		if (base == null) {
+			throw new BuildException("Must specify @base"); //$NON-NLS-1$
+		}
+		if (base.endsWith("/")) { //$NON-NLS-1$
+			base = base.substring(0, base.length() - 1);
+		}
+		Pattern fragmentUrlPattern = Pattern.compile("src=\"([^\"]+)\""); //$NON-NLS-1$
+		Pattern imagePattern = Pattern.compile("alt=\"Image:([^\"]*)\"([^>]+)", Pattern.MULTILINE); //$NON-NLS-1$
+		String htmlSrc;
+		try {
+			htmlSrc = readSrc();
+		} catch (IOException e) {
+			throw new BuildException("Cannot read src: " + src + ": " + e.getMessage(), e); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		log("Parsing " + src, Project.MSG_INFO); //$NON-NLS-1$
+		int fileCount = 0;
+		Matcher imagePatternMatcher = imagePattern.matcher(htmlSrc);
+		while (imagePatternMatcher.find()) {
+			String alt = imagePatternMatcher.group(1);
+			String imageFragment = imagePatternMatcher.group(2);
+			if (imageFragment != null) {
+				Matcher fragmentUrlMatcher = fragmentUrlPattern.matcher(imageFragment);
+				if (fragmentUrlMatcher.find()) {
+					String url = fragmentUrlMatcher.group(1);
+					String qualifiedUrl = base + url;
+					log("Fetching " + qualifiedUrl, Project.MSG_INFO); //$NON-NLS-1$
+					Get get = new Get();
+					get.setProject(getProject());
+					get.setLocation(getLocation());
+					try {
+						get.setSrc(new URL(qualifiedUrl));
+					} catch (MalformedURLException e) {
+						log("Skipping " + url + ": " + e.getMessage(), Project.MSG_WARN); //$NON-NLS-1$ //$NON-NLS-2$
+						continue;
+					}
+					// note: we use the alt text for the name since for some files there is a case-difference between
+					//       the server URL and the text used in the image src of the markup
+					String name = alt == null ? url.substring(url.lastIndexOf('/')) : alt;
+					get.setDest(new File(dest, name));
+					get.execute();
+					++fileCount;
+				}
+			}
+		}
+		log("Fetched " + fileCount + " image files for " + src, Project.MSG_INFO); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	public String getBase() {
+		return base;
+	}
+
+	public File getDest() {
+		return dest;
+	}
+
+	public File getSrc() {
+		return src;
+	}
+
+	private String readSrc() throws IOException {
+		StringBuilder buf = new StringBuilder((int) src.length());
+		Reader reader = new BufferedReader(new FileReader(src));
+		try {
+			int i;
+			while ((i = reader.read()) != -1) {
+				buf.append((char) i);
+			}
+		} finally {
+			reader.close();
+		}
+		return buf.toString();
+	}
+
+	public void setBase(String base) {
+		this.base = base;
+	}
+
+	public void setDest(File dest) {
+		this.dest = dest;
+	}
+
+	public void setSrc(File src) {
+		this.src = src;
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/src/org/eclipse/linuxtools/internal/rpm/ui/editor/doc/anttask/tasks.properties b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/src/org/eclipse/linuxtools/internal/rpm/ui/editor/doc/anttask/tasks.properties
new file mode 100644
index 0000000..f7c05bc
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/src/org/eclipse/linuxtools/internal/rpm/ui/editor/doc/anttask/tasks.properties
@@ -0,0 +1,11 @@
+###############################################################################
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+mediawiki-fetch-images=org.eclipse.linuxtools.internal.rpm.ui.editor.doc.anttask.MediaWikiImageFetcher
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/toc.xml b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/toc.xml
new file mode 100644
index 0000000..72b906c
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/toc.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+<!--
+    Copyright (c) 2009 Red Hat, Inc.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+   
+    Contributors:
+        Red Hat - initial API and implementation
+ -->
+
+<toc label="Specfile Editor User Guide">
+ <link toc="userguide/SpecfileEditorReference-toc.xml"/>
+ <topic href="doc/notices.html" label="Legal" />
+</toc>
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/Configuring-Specfile-Editor-Settings.html b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/Configuring-Specfile-Editor-Settings.html
new file mode 100644
index 0000000..dab1cf6
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/Configuring-Specfile-Editor-Settings.html
@@ -0,0 +1,212 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>SpecfileEditorReference - Configuring Specfile Editor Settings</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Configuring Specfile Editor Settings</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="General-Usage.html" title="General Usage">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Updating-This-Document.html" title="Updating This Document">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">General Usage</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Updating This Document</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Configuring_Specfile_Editor_Settings">Configuring Specfile Editor Settings</h1>
+		<p>To configure Specfile Editor settings, navigate to <u>Window</u> / <u>Preferences</u>. Then, from the left pane of the 
+			<b>
+				<i>Preferences</i>
+			</b> menu, select 
+			<b>
+				<i>Specfile Editor</i>
+			</b>. 
+		</p>
+		<p>
+			<img border="0" src="images/Specfile_settings_changelog.png"/>
+		</p>
+		<p>Upon selecting the 
+			<b>
+				<i>Specfile Editor</i>
+			</b> menu, you can configure the format and locale of Changelog entries. To edit the actual content of your Changelogs, click the <u>ChangeLog</u> hyperlink in the menu, or use 
+			<b>Ctrl</b>+'
+			<i>Alt</i>'+'
+			<i>C'</i> (outside of the 
+			<b>
+				<i>Preferences</i>
+			</b> menu).
+		</p>
+		<h2 id="Macro_Completion">Macro Completion</h2>
+		<p>Macro definitions enable the Specfile Editor to properly highlight and autocompile 
+			<i>.spec</i> files.  The 
+			<b>
+				<i>Macro Completion</i>
+			</b> sub-menu allows you to add/remove macro definitions and configure how the Specfile Editor should present macro values during mouse hovers. 
+		</p>
+		<p>
+			<img border="0" src="images/Specfile_settings_macros.png"/>
+		</p>
+		<p>The 
+			<b>
+				<i>Macro Definitions</i>
+			</b> section shows what macros the Specfile Editor is using. You can add, delete, and reorder macros using the buttons to the left of this section.
+		</p>
+		<p>The 
+			<b>
+				<i>Mouse hover content</i>
+			</b> section enables you to specify what kind of information about a macro value whenever you hover your mouse over it. You can choose whether to display the contents or description of a macro value. The following screenshots illustrate the difference between both options:
+		</p>
+		<dl>
+			<dt>Show macro descriptions </dt>
+			<dd>
+				<img border="0" src="images/Specfile_macros_description.png"/>
+			</dd>
+			<dt>Show macro contents </dt>
+			<dd>
+				<img border="0" src="images/Specfile_macros_content.png"/>
+			</dd>
+		</dl>
+		<h2 id="RPM_Completions">RPM Completions</h2>
+		<p>The 
+			<b>
+				<i>RPM Completions</i>
+			</b> section allows you to configure generic package list settings. This section allows you to use distribution-specific references which supplement auto-completion in editing 
+			<i><code>.spec</code></i> files. These distribution-specific references include a list of installed RPM packages as well as online repositories. 
+		</p>
+		<p>
+			<img border="0" src="images/Specfile_settings_rpms_generic.png"/>
+		</p>
+		<p>
+			<b>
+				<i>RPM Completions</i>
+			</b> configures the following settings:
+		</p>
+		<ul>
+			<li>Whether to use <code>rpm</code> or <code>yum</code> to build the package list</li>
+			<li>The path to the package list file </li>
+			<li>Whether or not to automatically build the RPM packages proposals list</li>
+			<li>When to refresh package list (
+				<b>
+					<i>Proposals RPM list build rate</i>
+				</b>)
+			</li>
+		</ul>
+		<p>The Specfile Editor can use package management tools to build the package list. Currently, the Specfile Editor only supports <code>yum</code> and <code>urpmi</code>. If neither package management tools are present in the system, the Specfile Editor will use <code>rpm</code> to build the package list.</p>
+		<h3 id="Package_Information">Package Information</h3>
+		<p>This sub-section of 
+			<b>
+				<i>RPM Completions</i>
+			</b> allows you to configure what package details (i.e. RPM tags) to display during mouse hovers over appropriate values. 
+			<b>
+				<i>Package Information</i>
+			</b> also lets you set the number of packages to show details for. 
+		</p>
+		<p>
+			<img border="0" src="images/Specfile_settings_rpms_details.png"/>
+		</p>
+		<p>
+			<b>
+				<i>Package Information</i>
+			</b> contains a checklist of RPM tags (e.g. 
+			<b>
+				<i>Name</i>
+			</b>, 
+			<b>
+				<i>Version</i>
+			</b>, 
+			<b>
+				<i>Release</i>
+			</b>). The Specfile Editor displays these tags during mouse hovers on package information in the 
+			<i><code>.spec</code></i> file. You can also set a threshold for the number of proposals that enables the Specfile Editor to display this information. By default, the threshold is 10.
+		</p>
+		<h2 id="Rpmlint">Rpmlint</h2>
+		<p>The 
+			<b>
+				<i>Rpmlint</i>
+			</b> section allows you to configure where <code>rpmlint</code> is installed, which is useful if it is installed somewhere other than the default 
+			<i><code>/usr/bin/rpmlint</code></i>. This section also allows you to set whether warnings should be used for tabs or spaces, which is useful if you use both in the 
+			<i><code>.spec</code></i> file.
+		</p>
+		<p>
+			<img border="0" src="images/Specfile_settings_rpmlint.png"/>
+		</p>
+		<h2 id="Task_Tags">Task Tags</h2>
+		<p>The 
+			<b>
+				<i>Task Tags</i>
+			</b> section allows the Specfile Editor to identify specific strings as 
+			<i>task tags</i>. The Specfile Editor will only search for these strings in comments. By default, the Specfile Editor identifies the strings <code>TODO</code> and 
+			<i><code>FIXME</code></i> as task tags.
+		</p>
+		<p>
+			<img border="0" src="images/Specfile_settings_tasks.png"/>
+		</p>
+		<p>Whenever the Specfile Editor finds a task tag in the 
+			<i><code>.spec</code></i> file, it adds the tag to the 
+			<b>
+				<i>Tasks</i>
+			</b> view and plots an appropriate marker in the editor. Clicking the tag in the 
+			<b>
+				<i>Tasks</i>
+			</b> view will automatically place the insertion point on the corresponding string in the 
+			<i><code>.spec</code></i> file.
+		</p>
+		<p>
+			<img border="0" src="images/Screenshot-taskscreenshot.png"/>
+		</p>
+		<h2 id="Templates">Templates</h2>
+		<p>The 
+			<b>
+				<i>Templates</i>
+			</b> section allows you to share and manage different 
+			<i><code>.spec</code></i> file directive/section templates for all contexts. 
+		</p>
+		<p>
+			<img border="0" src="images/Specfile_settings_templates.png"/>
+		</p>
+		<p>The <u>Import</u> and <u>Export</u> functions allow you to share templates with other developers who may also be working on the same package. The <u>New</u> and <u>Edit</u> buttons open a menu for adding or revising templates; they both contain the same options.</p>
+		<p>
+			<img border="0" src="images/Screenshot-edittemplate.png"/>
+		</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="General-Usage.html" title="General Usage">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="SpecfileEditorReference.html" title="SpecfileEditorReference">
+						<img alt="SpecfileEditorReference" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right">
+					<a href="Updating-This-Document.html" title="Updating This Document">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">General Usage</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Updating This Document</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/General-Usage.html b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/General-Usage.html
new file mode 100644
index 0000000..50766ba
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/General-Usage.html
@@ -0,0 +1,187 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>SpecfileEditorReference - General Usage</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">General Usage</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Installing.html" title="Installing">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Configuring-Specfile-Editor-Settings.html" title="Configuring Specfile Editor Settings">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Installing</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Configuring Specfile Editor Settings</td>
+			</tr>
+		</table><hr/>
+		<h1 id="General_Usage">General Usage</h1>
+		<p>To fully benefit from all the features offered by the Specfile Editor, ensure that your 
+			<i><code>.spec</code></i> file is part of a project inside the Eclipse workspace. <code>rpmlint</code> integration, file hyperlinks, and some auto-completion features are not available otherwise. The following screenshot provides an impression of the full interface benefits provided by the Specfile Editor plug-in:
+			<br/>
+			<img border="0" src="images/Specfile_generic.png"/>
+		</p>
+		<h2 id="Creating_a_New_Specfile">Creating a New Specfile</h2>
+		<p>The Specfile Editor plug-in provides a wizard for creating new 
+			<i><code>.spec</code></i> files. To use this wizard, navigate first to <u>File</u> > <u>New</u> > <u>Other...</u> ; then, expand the <u>RPM Wizards</u> entry to select <u>New specfile based on a template</u>.
+		</p>
+		<p>
+			<img border="0" src="images/Specfile_new_wizard.png"/>
+		</p>
+		<p>This will open the Specfile Creation wizard, which provides an interface for generating the basic contents of a 
+			<i><code>.spec</code></i> file.
+		</p>
+		<p>
+			<img border="0" src="images/Specfile_new_from_template.png"/>
+		</p>
+		<p>The Specfile Creation wizard contains the following fields:</p>
+		<dl>
+			<dt>Project</dt>
+			<dd>This field associates the generated 
+				<i><code>.spec</code></i> with a project in the current workspace, which ultimately specifies where the 
+				<i><code>.spec</code></i> will be saved. The 
+				<b>
+					<i>Select a project...</i>
+				</b> button allows you to select a specific project for this field with ease. By default, the Specfile Editor plug-in specifies the last active project when you invoked the Specfile Creation wizard.
+			</dd>
+		</dl>
+		<dl>
+			<dt>Select a template </dt>
+			<dd>This drop-down list allows you to select a 
+				<i><code>.spec</code></i> template to use. You can install templates provided by <code>rpmdevtools</code>, which is available 
+				<a href="https://fedorahosted.org/rpmdevtools">https://fedorahosted.org/rpmdevtools</a> .
+			</dd>
+		</dl>
+		<dl>
+			<dt>Version </dt>
+			<dd>This fills in the <code>Version:</code> line of the 
+				<i><code>.spec</code></i> file.
+			</dd>
+		</dl>
+		<dl>
+			<dt>Summary </dt>
+			<dd>This fills in the <code>Summary:</code> line of the 
+				<i><code>.spec</code></i> file.
+			</dd>
+		</dl>
+		<dl>
+			<dt>Group </dt>
+			<dd>This drop-down list allows you to select a package group to which the project belongs.</dd>
+		</dl>
+		<dl>
+			<dt>License </dt>
+			<dd>This fills in the <code>License:</code> line of the 
+				<i><code>.spec</code></i> file.
+			</dd>
+		</dl>
+		<dl>
+			<dt>URL </dt>
+			<dd>This fills in the <code>URL:</code> line of the 
+				<i><code>.spec</code></i> file, which typically specifies the public home page of the project.
+			</dd>
+		</dl>
+		<dl>
+			<dt>Source0 </dt>
+			<dd>This field specifies the source archive from which the package is built.</dd>
+		</dl>
+		<h2 id="rpmlint">rpmlint</h2>
+		<p>To enable <code>rpmlint</code> warnings, right-click on the project containing the 
+			<i><code>.spec</code></i> file. Then, select <u>Add/Remove rpmlint warnings</u> from the context menu. You can use this menu selection to disable <code>rpmlint</code> warnings as well.
+		</p>
+		<p>
+			<img border="0" src="images/Specfile_enable_rpmlint.png"/>
+		</p>
+		<p>Enabling <code>rpmlint</code> warnings will add a new <code>rpmlint</code> builder to the project. This <code>rpmlint</code> builder checks the 
+			<i><code>.spec</code></i> file during each project build or clean. Afterwards, the builder displays any appropriate warnings and errors in the 
+			<b>
+				<i>Problems</i>
+			</b> pane. Each warning/error is plotted in the 
+			<i><code>.spec</code></i> file as well; clicking an <code>rpmlint</code> warning/error in the 
+			<b>
+				<i>Problems</i>
+			</b> pane will automatically place the insertion point on the corresponding section in the 
+			<i><code>.spec</code></i> file.
+		</p>
+		<p>
+			<img border="0" src="images/Specfile_problems_rpmlint.png"/>
+		</p>
+		<h3 id="Quick_Fixes">Quick Fixes</h3>
+		<p>You can also directly resolve several warnings and errors through the 
+			<b>
+				<i>Quick Fix</i>
+			</b> menu. To access this menu, right-click on a warning or error from the 
+			<b>
+				<i>Problems</i>
+			</b> pane and select <u>Quick Fix</u>.
+		</p>
+		<p>As the name suggests, the 
+			<b>
+				<i>Quick Fix</i>
+			</b> menu provides you with quick solutions to common 
+			<i><code>.spec</code></i> file errors and problems. For example, <code>rpmlint</code> detected a <code>no-cleaning-of-buildroot</code> error in the following <code>%install</code> section from the <code>.spec</code> file:
+		</p>
+		<p>
+			<img border="0" src="images/Specfile_rpmlint_fix_before.png"/>
+		</p>
+		<p>If the 
+			<b>
+				<i>Quick Fix</i>
+			</b> menu can provide a solution for a particular error, it will be available in the menu. To apply it, simply select the solution (from the 
+			<b>
+				<i>Select a fix:</i>
+			</b> area) and the corresponding problem (from the 
+			<b>
+				<i>Problems:</i>
+			</b> area), then click the <u>Finish</u> button. 
+		</p>
+		<p>
+			<img border="0" src="images/Specfile_rpmlint_quickfix.png"/>
+		</p>
+		<p>The following screenshot shows the revisions to the <code>%install</code> section applied by the 
+			<b>
+				<i>Quick Fix</i>
+			</b> menu:
+		</p>
+		<p>
+			<img border="0" src="images/Specfile_rpmlint_fix_after.png"/>
+		</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Installing.html" title="Installing">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="SpecfileEditorReference.html" title="SpecfileEditorReference">
+						<img alt="SpecfileEditorReference" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right">
+					<a href="Configuring-Specfile-Editor-Settings.html" title="Configuring Specfile Editor Settings">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Installing</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Configuring Specfile Editor Settings</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/Installing.html b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/Installing.html
new file mode 100644
index 0000000..2773c23
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/Installing.html
@@ -0,0 +1,68 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>SpecfileEditorReference - Installing</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Installing</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="SpecfileEditorReference.html" title="Overview">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="General-Usage.html" title="General Usage">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Overview</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">General Usage</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Installing">Installing</h1>
+		<p>In order for the Specfile Editor Plug-in for Eclipse to work, you should have the 
+			<i><code>rpmlint</code></i> package installed.
+		</p>
+		<p>Once the 
+			<i><code>rpmlint</code></i> package is installed, the easiest way to install the Valgrind plug-in for Eclipse is through the 
+			<b>
+				<i>Software Updates and Add-ons</i>
+			</b> menu. For information on how to use this menu, refer to 
+			<a href="http://wiki.eclipse.org/Linux_Tools_Project/PluginInstallHelp">http://wiki.eclipse.org/Linux_Tools_Project/PluginInstallHelp</a>.
+		</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="SpecfileEditorReference.html" title="Overview">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="SpecfileEditorReference.html" title="SpecfileEditorReference">
+						<img alt="SpecfileEditorReference" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right">
+					<a href="General-Usage.html" title="General Usage">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Overview</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">General Usage</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/SpecfileEditorReference-toc.xml b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/SpecfileEditorReference-toc.xml
new file mode 100644
index 0000000..2689610
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/SpecfileEditorReference-toc.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<toc topic="userguide/SpecfileEditorReference.html" label="SpecfileEditorReference">
+	<topic href="userguide/SpecfileEditorReference.html" label="Overview"></topic>
+	<topic href="userguide/Installing.html" label="Installing"></topic>
+	<topic href="userguide/General-Usage.html" label="General Usage">
+		<topic href="userguide/General-Usage.html#Creating_a_New_Specfile" label="Creating a New Specfile"></topic>
+		<topic href="userguide/General-Usage.html#rpmlint" label="rpmlint">
+			<topic href="userguide/General-Usage.html#Quick_Fixes" label="Quick Fixes"></topic>
+		</topic>
+	</topic>
+	<topic href="userguide/Configuring-Specfile-Editor-Settings.html" label="Configuring Specfile Editor Settings">
+		<topic href="userguide/Configuring-Specfile-Editor-Settings.html#Macro_Completion" label="Macro Completion"></topic>
+		<topic href="userguide/Configuring-Specfile-Editor-Settings.html#RPM_Completions" label="RPM Completions">
+			<topic href="userguide/Configuring-Specfile-Editor-Settings.html#Package_Information" label="Package Information"></topic>
+		</topic>
+		<topic href="userguide/Configuring-Specfile-Editor-Settings.html#Rpmlint" label="Rpmlint"></topic>
+		<topic href="userguide/Configuring-Specfile-Editor-Settings.html#Task_Tags" label="Task Tags"></topic>
+		<topic href="userguide/Configuring-Specfile-Editor-Settings.html#Templates" label="Templates"></topic>
+	</topic>
+	<topic href="userguide/Updating-This-Document.html" label="Updating This Document"></topic>
+</toc>
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/SpecfileEditorReference.html b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/SpecfileEditorReference.html
new file mode 100644
index 0000000..6a5a826
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/SpecfileEditorReference.html
@@ -0,0 +1,51 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>SpecfileEditorReference</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">SpecfileEditorReference</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Installing.html" title="Installing">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Installing</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Overview">Overview</h1>
+		<p>The Specfile Editor Plug-in for Eclipse provides useful features to help developers manage 
+			<i><code>.spec</code></i> files. This plug-in allows users to leverage several Eclipse GUI features in editing 
+			<i><code>.spec</code></i> files, including outline/quick outline view in the editor, auto-completion, highlighting, file hyperlinks, and folding.
+		</p>
+		<p>In addition, the Specfile Editor Plug-in also integrates the <code>rpmlint</code> tool into the Eclipse interface. <code>rpmlint</code> is a command-line tool that helps developers detect common RPM package errors. The richer visualization offered by the Eclipse interface helps developers quickly detect, view, and correct mistakes reported by <code>rpmlint</code>.</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Installing.html" title="Installing">
+						<img alt="Next" border="0" src="images/images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top"></td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Installing</td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/Updating-This-Document.html b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/Updating-This-Document.html
new file mode 100644
index 0000000..c09e57d
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/Updating-This-Document.html
@@ -0,0 +1,54 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>SpecfileEditorReference - Updating This Document</title>
+		<link type="text/css" rel="stylesheet" href="book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Updating This Document</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Configuring-Specfile-Editor-Settings.html" title="Configuring Specfile Editor Settings">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right"></td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Configuring Specfile Editor Settings</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top"></td>
+			</tr>
+		</table><hr/>
+		<h1 id="Updating_This_Document">Updating This Document</h1>
+		<p>This document is maintained in a collaborative wiki.  If you wish to update or modify this document please visit 
+
+			<a href="http://wiki.eclipse.org/Linux_Tools_Project/SpecfileEditor/User_Guide">http://wiki.eclipse.org/Linux_Tools_Project/SpecfileEditor/User_Guide</a>
+		</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Configuring-Specfile-Editor-Settings.html" title="Configuring Specfile Editor Settings">
+						<img alt="Previous" border="0" src="images/images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="SpecfileEditorReference.html" title="SpecfileEditorReference">
+						<img alt="SpecfileEditorReference" border="0" src="images/images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right"></td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Configuring Specfile Editor Settings</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top"></td>
+			</tr>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Screenshot-edittemplate.png b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Screenshot-edittemplate.png
new file mode 100644
index 0000000..446cb19
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Screenshot-edittemplate.png
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Screenshot-taskscreenshot.png b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Screenshot-taskscreenshot.png
new file mode 100644
index 0000000..6b32601
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Screenshot-taskscreenshot.png
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_enable_rpmlint.png b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_enable_rpmlint.png
new file mode 100644
index 0000000..db7f40d
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_enable_rpmlint.png
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_generic.png b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_generic.png
new file mode 100644
index 0000000..dc490cf
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_generic.png
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_macros_content.png b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_macros_content.png
new file mode 100644
index 0000000..7f8e582
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_macros_content.png
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_macros_description.png b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_macros_description.png
new file mode 100644
index 0000000..a872147
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_macros_description.png
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_new_from_template.png b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_new_from_template.png
new file mode 100644
index 0000000..d38f936
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_new_from_template.png
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_new_wizard.png b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_new_wizard.png
new file mode 100644
index 0000000..2beefd5
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_new_wizard.png
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_problems_rpmlint.png b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_problems_rpmlint.png
new file mode 100644
index 0000000..18eb49b
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_problems_rpmlint.png
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_rpmlint_fix_after.png b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_rpmlint_fix_after.png
new file mode 100644
index 0000000..02e438e
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_rpmlint_fix_after.png
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_rpmlint_fix_before.png b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_rpmlint_fix_before.png
new file mode 100644
index 0000000..f47bd38
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_rpmlint_fix_before.png
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_rpmlint_quickfix.png b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_rpmlint_quickfix.png
new file mode 100644
index 0000000..6b461ef
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_rpmlint_quickfix.png
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_settings_changelog.png b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_settings_changelog.png
new file mode 100644
index 0000000..b62848e
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_settings_changelog.png
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_settings_macros.png b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_settings_macros.png
new file mode 100644
index 0000000..f26f152
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_settings_macros.png
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_settings_rpmlint.png b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_settings_rpmlint.png
new file mode 100644
index 0000000..7719232
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_settings_rpmlint.png
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_settings_rpms_details.png b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_settings_rpms_details.png
new file mode 100644
index 0000000..01179ef
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_settings_rpms_details.png
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_settings_rpms_generic.png b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_settings_rpms_generic.png
new file mode 100644
index 0000000..2d4b21f
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_settings_rpms_generic.png
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_settings_tasks.png b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_settings_tasks.png
new file mode 100644
index 0000000..f8de577
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_settings_tasks.png
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_settings_templates.png b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_settings_templates.png
new file mode 100644
index 0000000..21c9bde
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/userguide/images/Specfile_settings_templates.png
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.classpath b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.classpath
new file mode 100644
index 0000000..304e861
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.cvsignore b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.cvsignore
new file mode 100644
index 0000000..ba077a4
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.cvsignore
@@ -0,0 +1 @@
+bin
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.project b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.project
new file mode 100644
index 0000000..f3af6ee
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.rpm.ui.editor.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.settings/org.eclipse.jdt.core.prefs b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..4c50b9c
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,70 @@
+#Wed Nov 19 14:24:04 CET 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.settings/org.eclipse.jdt.ui.prefs b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..38a7d02
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,54 @@
+#Wed Mar 04 13:50:18 CET 2009
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=false
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/ChangeLog b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/ChangeLog
new file mode 100644
index 0000000..e8c05fd
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/ChangeLog
@@ -0,0 +1,526 @@
+2010-03-01  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/SourcesFileHyperlinkDetectorTest.java (testDetectHyperlinks): Fix number of hyperlink detectors.
+
+2010-01-19  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* META-INF/MANIFEST.MF: Require core.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmMacroProposalsListTest.java: Use Utils from core.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmPackageProposalsListTest.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfileTestProject.java: Likewise.
+
+2010-01-18  Alexander Kurtakov  <akurtako@redhat.com>
+    Remove an empty test class now that it's AbstractHandler not an ActionDelegate.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/actions/SpecfileEditorShowOutlineActionDelegateTest.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/actions/ActionsAllTests.java (suite): Remove action delegate test.
+
+2009-08-07  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* plugin.properties: Fix provider to be Eclipse not Eclipse.org.
+
+2009-07-08  Alphonse Van Assche  <alcapcom@fedoraproject.org>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/scanners/SpecfilePackagesScannerTest.java : Fix disabled tests.  
+
+2009-05-19  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/parser/SpecfileDefineTest.java (testResolve): Fix compile.
+
+2009-05-14  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* META-INF/MANIFEST.MF: Sync release with the feature 0.4.3.
+
+2009-05-08  Alphonse Van Assche <alcapcom@fedoraproject.org>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/parser/SpecfileDefineTest.java: Disable test define 
+	without value, because of the fact that this error is no more managed by our internal parser.  
+
+2009-04-02  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmMacroProposalsListTest.java (testGetMacroEval): Fix %_libdir expectation.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmPackageProposalsListTest.java (testGetRpmInfo): Use rpm package for the test.
+	(setUp): Add rpm to the packagelist.
+	(testGetValue): Use rpm package for the test.
+	
+2009-04-02  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmMacroProposalsListTest.java (testGetMacroEval): Run the test only when rpm executable is available.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmPackageProposalsListTest.java (setUp): Fix deprecation.
+	(testGetRpmInfo): Exec only when rpm executable is available.
+	(testGetValue): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/scanners/SpecfilePackagesScannerTest.java (setUp): Likewise.
+
+2009-03-26  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* .settings/org.eclipse.jdt.ui.prefs: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/actions/ActionsAllTests.java (suite): Add one more test.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/actions/SpecfileEditorShowOutlineActionDelegateTest.java: New file. 
+
+2009-03-08  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/scanners/SpecfileScannerTest.java (testKeyword): Fix order in asserts.
+
+2009-03-04  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/actions/ActionsAllTests.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/actions/SpecfileChangelogFormatterTest.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/actions/SpecfileChangelogParserTest.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/AllTests.java (suite): Add new tests.
+
+2009-02-28  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/MailHyperlinkDetectorTest.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/SourcesFileHyperlinkDetectorTest.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/HyperlinkAllTests.java (suite): Add new test files.
+
+2009-02-25  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/HyperlinkAllTests.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/SpecfileElementHyperlinkDetectorTest.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/AllTests.java (suite): Add HyperlinkAllTests.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/EpochTagTest.java: Add 2009 to the Copyright year.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/FileTestCase.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/HeaderRecognitionTest.java: Likewise. 
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/LicenseTagTest.java: Likewise. 
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/LinePositionTests.java: Likewise. 
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/NameTagTests.java: Likewise. 
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/parser/SourceComparatorTest.java: Likewise. 
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/parser/SpecfileDefineTest.java: Likewise. 
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/parser/SpecfileTest.java: Likewise. 
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/PatchApplicationTest.java: Likewise. 
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/ReleaseTagTests.java: Likewise. 
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfileCompletionProcessorTest.java: Likewise. 
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfileTestProject.java: Likewise. 
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/VersionTagTests.java: Likewise. 
+	
+2009-02-25  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/DefineTests.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/parser/SpecfileDefineTest.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/AllTests.java (suite): Remove DefineTests, which is renamed and moved.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/FileTestCase.java: More protected fields.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/parser/ParserAllTests.java (suite): Add SpecfileDefineTest.
+
+2009-02-25  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/HyperlinkWithMacroTests.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SourceComparatorTests.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/URLHyperlinkWithMacroDetectorTest.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/parser/ParserAllTests.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/parser/SourceComparatorTest.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/AllTests.java (suite): Use ParserAllTests instead of every test.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/FileTestCase.java: Make testFileProtected.
+	
+2009-02-25  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/RefactoringTests.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/parser/SpecfileTest.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/AllTests.java (suite): Adapt to SpecfileTest rename.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/FileTestCase.java: Make specfile member protected.
+	
+2009-02-18  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/LinePositionTests.java (testLineNumber): Adapt to latest api changes.
+	(testLineNumber2): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SourceComparatorTests.java (testPatchComparator): Likewise.
+	(testPatchComparator2): Likewise.
+
+2009-02-06  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfileTestProject.java (dispose): Use utils for command invocation.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/scanners/SpecfilePackagesScannerTest.java (getContents): Do not concatenate strings.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/scanners/SpecfileScannerTest.java (getContents): Likewise.
+
+2009-02-02  Andrew Overholt  <overholt@redhat.com>
+
+	* test.xml: Update.
+
+2009-01-14  Alexander Kurtakov  <akurtako@redhat.com>
+	Mimic plugin packages for easier navigation.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmMacroProposalsListTests.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmPackageProposalsListTests.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfileChangelogScannerTests.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfilePackagesScannerTests.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfileScannerTests.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmMacroProposalsListTest.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmPackageProposalsListTest.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/scanners/ScannersAllTests.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/scanners/SpecfileChangelogScannerTest.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/scanners/SpecfilePackagesScannerTest.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/scanners/SpecfileScannerTest.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/AllTests.java 
+	(suite): Add ScannersAllTests.suite not every scaner test separately.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/AScannerTest.java: Make it public.
+
+2008-12-04  Andrew Overholt  <overholt@redhat.com>
+
+	* build.properties: Add test.xml to bin.includes.
+
+2008-12-02  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfileCompletionProcessorTest.java
+	(setUp): Removed - not needed.
+	(tearDown): Likewise.
+	(initEditor): Don't do things done in the parent.
+
+2008-11-30  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/EditorTests.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/ParserTests.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/FileTestCase.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/AllTests.java (suite): Don't add empty test case.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/AScannerTest.java: Extend FileTestCase and skip work done in parent.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/DefineTests.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/EpochTagTest.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/HeaderRecognitionTest.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/HyperlinkWithMacroTests.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/LicenseTagTest.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/LinePositionTests.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/NameTagTests.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/PatchApplicationTest.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/RefactoringTests.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/ReleaseTagTests.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmMacroProposalsListTests.java: Remove unneeded constructor.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfileChangelogScannerTests.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SourceComparatorTests.java: Extend FileTestCase and skip work done in parent.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfilePackagesScannerTests.java
+	(setUp): Throw correct exception.
+	(SpecfilePackagesScannerTests): Removed unneeded constructor.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfileScannerTests.java
+	(SpecfileScannerTests): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/VersionTagTests.java: Extend FileTestCase and skip work done in parent.
+
+2008-11-29  Alexander Kurtakov  <akurtakov@gmail.com>
+	Adopt imports to the editor package movements.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfileCompletionProcessorTest.java: Adopt imports.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfileScannerTests.java: Likewise.
+
+2008-11-28  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfileChangelogScannerTests.java: Adapt to package movements.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfileCompletionProcessorTest.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfilePackagesScannerTests.java: Likewise.
+
+2008-11-27  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SourceComparatorTests.java
+	(testPatchComparator2): Use the generic method.
+
+2008-11-26  Alexander Kurtakov  <akurtakov@gmail.com>
+	Fix imports caused by the marker handlers moving.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/DefineTests.java: Fix imports.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/EpochTagTest.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/HeaderRecognitionTest.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/HyperlinkWithMacroTests.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/LicenseTagTest.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/LinePositionTests.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/NameTagTests.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/PatchApplicationTest.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/RefactoringTests.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/ReleaseTagTests.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SourceComparatorTests.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/VersionTagTests.java: Likewise.
+
+2008-11-19  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* .settings/org.eclipse.jdt.core.prefs: Add project specific compiler warnings.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/AllTests.java
+	(suite): Enable SpecfilePackagesScannerTests.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfileCompletionProcessorTest.java
+	(setUp): Add missing @Override.
+	(tearDown): Likewise.
+
+2008-11-19  Alexander Kurtakov  <akurtakov@gmail.com>
+	Fix #214247 + cleanups.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfileCompletionProcessorTest.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/AllTests.java
+	(suite): Run SpecfileCompletionProcessorTest.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/AScannerTest.java
+	(setUp): Ensure using the modified test file.
+	(tearDown): Do not dispose editor.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/HyperlinkWithMacroTests.java
+	(testMacroResolutionInUrl): Ensure using the modified test file.
+	(newFile): Force changing file content.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfileTestProject.java
+	(createFile): Use the parameter as a file name instead of the hardcoded value.
+	(refresh): New method to synchronize the project content with local fs.
+
+2008-11-06  Andrew Overholt  <overholt@redhat.com>
+
+	* test.xml: gef-folder -> specfile-folder.
+
+2008-11-05  Andrew Overholt  <overholt@redhat.com>
+
+	* test.xml: New file to drive tests on build.eclipse.org.
+
+2008-11-01  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* META-INF/MANIFEST.MF: Replace deprecated Eclipse-LazyStart usage.
+	* build.properties: Add plugin.properties to bin.includes.
+
+2008-10-31  Andrew Overholt  <overholt@redhat.com>
+
+	* plugin.properties: Initial import.
+	* META-INF/MANIFEST.MF: Use plugin.properties.  Add "(Incubation)".
+
+2008-07-04  Andrew Overholt  <overholt@redhat.com>
+
+	* .settings/org.eclipse.jdt.core.prefs: Set to 1.5.
+
+2008-07-03  Alexander Kurtakov  <akurtakov@gmail.com>
+	Adapt to Java 5 and cleanup.
+	* META_INF/MANIFEST.MF: Bump Bundle-RequiredExecutionEnvironment to J2SE-1.5.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/AScannerTest.java:
+	(setUp): Add @Override.
+	(tearDown): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/DefineTests.java:
+	(setUp): Likewise.
+	(tearDown): Likewise.
+	(testDefine): Don't catch Exception when it's not thrown.
+	(testDefine2): Likewise.
+	(testDefine3): Likewise.
+	(testDefine4): Likewise.
+	(testUnderscoreDefine): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/EditorTests.java:
+	(start): Add @Override.
+	(stop): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/EpochTagTest.java:
+	(setUp): Likewise.
+	(tearDown): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/HeaderRecognitionTest.java:
+	(setUp): Likewise.
+	(tearDown): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/HyperlinkWithMacroTest.java:
+	(setUp): Likewise.
+	(tearDown): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/LicenseTagTest.java:
+	(setUp): Likewise.
+	(tearDown): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/LinePositionTest.java:
+	(setUp): Likewise.
+	(tearDown): Likewise.
+	(testLineNumber): Use foreach instead of iterator.
+	(testLineNumber2): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/NameTagTest.java:
+	(setUp): Add @Override.
+	(tearDown): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/ParserTests.java:
+	(setUp): Likewise.
+	(tearDown): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/PatcApplicationTest.java:
+	(setUp): Likewise.
+	(tearDown): Likewise.
+	(testMultiplePatchLineNumbers): Use foreach instead of iterator.
+	(testPatchLineNumber): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/RefactoringTests.java:
+	(setUp): Add @Override.
+	(tearDown): Likewise.
+	(testOrganizePatches): Generify.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/ReleaseTagTests.java:
+	(setUp): Add @Override.
+	(tearDown): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmMacroProposalsListTests.java:
+	(setUp): Likewise.
+	(testGetProposals): Generify.
+	(testGetProposals): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmPackageProposalsListTests.java:
+	(setUp): Add @Override.
+	(testGetProposals): Generify.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SourceComparatorTests.java:
+	(setUp): Add @Override.
+	(tearDown): Likewise.
+	(testPatchComparator): Use foreach instead of iterator.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfileChangelogScannerTests.java:
+	(getContents): Add @Override.
+	(getScanner): Likewise.
+	(testMail): Remove unneeded catch and variable.
+	(testSection): Likewise.
+	(testVerRel): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfilePackagesScannerTests.java:
+	(getContents): Add @Override.
+	(getScanner): Likewise.
+	(setUp): Likewise.
+	(testComment): Remove unneeded catch and variable.
+	(testPackageTag): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfileScannerTests.java:
+	(getContents): Add @Override.
+	(getScanner): Likewise.
+	(testComment): Remove unneeded catch and variable.
+	(testDefineCorrectlyScanned): Likewise.
+	(testDefinedMacro): Likewise.
+	(testKeyword): Likewise.
+	(testMacro): Likewise.
+	(testSection): Likewise.
+	(testTag): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/VersionTagTests.java:
+	(setUp): Add @Override.
+	(tearDown): Likewise.
+
+2008-05-12  Alexander Kurtakov  <akurtakov@gmail.com>
+	Fix compile.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/HyperlinkWithMacroTests.java:
+	Fix compile.
+
+2008-04-08  Alexander Kurtakov <akurtakov@gmail.com>
+
+	* .classpat: Bump requirement to java 5.
+
+2007-07-05  Andrew Overholt  <overholt@redhat.com>
+
+	* Too many files to list: Add standard copyright and license header.
+
+2007-06-22  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	* META-INF/MANIFEST.MF: Add "org.eclipse.ui.editors" dependencie requiere by
+	Ecliple 3.3
+
+2007-06-20  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/AScannerTest.java:
+	Abstract test case class for scanners.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/AllTests.java
+	(suite): Add new test cases classes.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfileScannerTests.java:
+	New tests.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfilePackagesScannerTests.java:
+	New tests.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfileChangelogScannerTests.java:
+	New tests.
+
+2007-06-20  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmPackageProposalsListTests.java
+	(tearDown): Remove method.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfileTestProject.java
+	(dispose): Remove /tmp/pkglist file at the end of the test suite.
+
+2007-06-20  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	* META-INF/MANIFEST.MF: Add  org.eclipse.ui.ide package.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/AllTests.java
+	(suite): Enable HyperlinkWithMacroTests.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/HyperlinkWithMacroTests.java
+	(testMacroResolutionInUrl): Using org.eclipse.ui.ide.IDE.openEditor to get the
+	editor instance.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/LicenseTagTest.java:
+	(testMultipleLicenseTag): Disable this test case according with the current
+	code.
+
+2007-05-04  Andrew Overholt  <overholt@redhat.com>
+
+	Bug #185598
+	* META-INF/MANIFEST.MF: Add "Incubation" to Bundle-Name.  Add Bundle-Vendor.
+
+2007-04-16  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/AllTests.java (suite):
+	Add (commented-out) HyperlinkWithMacroTests.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/HyperlinkWithMacroTests.java:
+	New file.
+
+2007-04-12  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	Bug #181236
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmPackageProposalsListTests.java:
+	New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmMacroProposalsListTests.java:
+	New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/AllTests.java
+	(suite): Add new tests.
+
+2007-04-05  Remy Suen  <remy.suen@gmail.com>
+
+	Bug #181249
+	* META-INF/MANIEST.MF: Set the Bundle-RequiredExecutionEnvironment
+	attribute to J2SE-1.4.
+
+2007-04-05  Andrew Overholt  <overholt@redhat.com>
+
+	* .classpath: Remove spurious junit.jar entry (bug #181238).
+
+2007-04-05  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/HeaderRecognitionTest.java
+	(newFile): Remove unnecessary specfile instantiation.
+	(setUp): Instantiate specfile object.
+	(testGetComplexSectionName3): Update test to use getPackageName() instead of getName().
+	(testGetComplexSectionName4): Likewise.
+	(testGetComplexSectionName5): Likewise.
+
+2007-04-04  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/tests/HeaderRecognitionTest.java
+	(newFile): Un-comment creation of specfile object.
+	* .settings/org.eclipse.jdt.core.prefs: New file.
+	* .classpath: New file.  Set J2SE-1.4 as EE.
+
+2007-03-28  Andrew Overholt  <overholt@redhat.com>
+
+        Re-namespace to org.eclipse.linuxtools.rpm.ui.editor.tests.
+
+2006-11-07  Andrew Overholt  <overholt@redhat.com>
+
+	Add license tag tests.
+
+	* src/org/eclipse/cdt/rpm/editor/tests/LicenseTagTest.java: New file.
+	* src/org/eclipse/cdt/rpm/editor/tests/DefineTests.java: Re-write to better handle out-of-order error markers.
+	* src/org/eclipse/cdt/rpm/editor/tests/AllTests.java (suite): Add license tag tests.
+
+2006-10-03  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/tests/RefactoringTests.java: New file.
+	* src/org/eclipse/cdt/rpm/editor/tests/PatchApplicationTest.java
+	(testPatchLineNumber): Fix line numbers.
+	(testMultiplePatchLineNumbers): Likewise.
+	* src/org/eclipse/cdt/rpm/editor/tests/LinePositionTests.java
+	(testLineNumber2): New method.
+	(testLineNumber): Likewise.
+	* src/org/eclipse/cdt/rpm/editor/tests/HeaderRecognitionTest.java
+	(testGetComplexSectionName2): Remove unused 'element'.
+	(testGetComplexSectionName7): Likewise.
+	* src/org/eclipse/cdt/rpm/editor/tests/AllTests.java
+	(suite): Add SourceComparator and Refactoring tests.
+	* src/org/eclipse/cdt/rpm/editor/tests/SourceComparatorTests.java: Clean up
+	imports.
+
+2006-09-19  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/tests/SourceComparatorTests.java: New file.
+	* src/org/eclipse/cdt/rpm/editor/tests/PatchApplicationTest.java
+	(testPatchLineNumber): New test. Ensure patch application line number is
+	correctly parsed.
+	(testMultiplePatchLineNumbers): Likewise but for multiple applications of the
+	same patch.
+
+2006-09-05  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/tests/AllTests.java
+	(suite): Re-enable all tests.
+
+2006-09-04  Igor Foox  <ifoox@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/tests/EpochTagTest.java: Fix imports.
+	* src/org/eclipse/cdt/rpm/editor/tests/DefineTests.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/tests/VersionTagTests.java: Fix tests
+	to new testing process.
+	* src/org/eclipse/cdt/rpm/editor/tests/LinePositionTests.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/tests/NameTagTests.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/tests/ReleaseTagTests.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/tests/PatchApplicationTest.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/tests/HeaderRecognitionTest.java: Likewise.
+	(testMain): Removed unused method.
+
+2006-09-01  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/tests/AllTests.java: New file.
+	(suite): New method.  Suite for all tests.
+	* src/org/eclipse/cdt/rpm/editor/tests/SpecfileTestProject.java: New file.
+	(createFile): New method.
+	(getFailureMarkers): Likewise.
+	(SpecfileTestProject): Likewise.
+	(dispose): Likewise.
+	* src/org/eclipse/cdt/rpm/editor/tests/EpochTagTest.java: Re-write to use
+	SpecfileTestProject.
+	* src/org/eclipse/cdt/rpm/editor/tests/DefineTests.java: Likewise.
+	* META-INF/MANIFEST.MF: Add dependency on editor plugin.
+	* .classpath: Add JUnit dependency.
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/META-INF/MANIFEST.MF b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..1ad7722
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.rpm.ui.editor.tests
+Bundle-Version: 0.4.3
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.jface.text,
+ org.eclipse.core.resources,
+ org.eclipse.osgi,
+ org.eclipse.ui.workbench,
+ org.eclipse.ui.ide,
+ org.eclipse.core.runtime,
+ org.eclipse.linuxtools.rpm.ui.editor,
+ org.eclipse.jface,
+ org.eclipse.ui.editors,
+ org.junit;bundle-version="3.8.2",
+ org.eclipse.linuxtools.rpm.core
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Vendor: %provider
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/build.properties b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/build.properties
new file mode 100644
index 0000000..33230c0
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/build.properties
@@ -0,0 +1,6 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.properties,\
+               test.xml
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/plugin.properties b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/plugin.properties
new file mode 100644
index 0000000..6271532
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+#  Copyright (c) 2008 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+bundleName=RPM Specfile Editor Tests Plug-in (Incubation)
+provider=Eclipse
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/AScannerTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/AScannerTest.java
new file mode 100644
index 0000000..b6fed77
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/AScannerTest.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.tests;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
+import org.eclipse.linuxtools.rpm.ui.editor.Activator;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
+import org.eclipse.ui.IEditorPart;
+
+public abstract class AScannerTest extends FileTestCase {
+
+	protected RuleBasedScanner rulesBasedScanner;
+
+	protected abstract String getContents();
+
+	protected abstract RuleBasedScanner getScanner();
+
+	public SpecfileEditor editor;
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see junit.framework.TestCase#setUp()
+	 */
+	@Override
+	protected void setUp() throws CoreException {
+		super.setUp();
+		newFile(getContents());
+		testProject.refresh();
+		IEditorPart openEditor = org.eclipse.ui.ide.IDE.openEditor(Activator
+				.getDefault().getWorkbench().getActiveWorkbenchWindow()
+				.getActivePage(), testFile,
+				"org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor");
+		editor = (SpecfileEditor) openEditor;
+		editor.doRevertToSaved();
+		rulesBasedScanner = getScanner();
+		rulesBasedScanner.setRange(testDocument, 0, getContents().length());
+	}
+
+	protected IToken getNextToken() {
+		return rulesBasedScanner.nextToken();
+	}
+
+	protected IToken getToken(int nbrOfToken) {
+		for (int i = 0; i < nbrOfToken - 1; i++) {
+			rulesBasedScanner.nextToken();
+		}
+		return rulesBasedScanner.nextToken();
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/AllTests.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/AllTests.java
new file mode 100644
index 0000000..3a08623
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/AllTests.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.tests;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.eclipse.linuxtools.rpm.ui.editor.tests.actions.ActionsAllTests;
+import org.eclipse.linuxtools.rpm.ui.editor.tests.hyperlink.HyperlinkAllTests;
+import org.eclipse.linuxtools.rpm.ui.editor.tests.parser.ParserAllTests;
+import org.eclipse.linuxtools.rpm.ui.editor.tests.scanners.ScannersAllTests;
+
+public class AllTests {
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite(
+				"Test for org.eclipse.linuxtools.rpm.ui.editor.tests");
+		// $JUnit-BEGIN$
+		suite.addTestSuite(EpochTagTest.class);
+		suite.addTestSuite(ReleaseTagTests.class);
+		suite.addTestSuite(NameTagTests.class);
+		suite.addTestSuite(VersionTagTests.class);
+		suite.addTestSuite(HeaderRecognitionTest.class);
+		suite.addTestSuite(LicenseTagTest.class);
+		suite.addTestSuite(PatchApplicationTest.class);
+		suite.addTestSuite(LinePositionTests.class);
+		suite.addTestSuite(RpmMacroProposalsListTest.class);
+		suite.addTestSuite(RpmPackageProposalsListTest.class);
+		suite.addTest(ActionsAllTests.suite());
+		suite.addTest(ScannersAllTests.suite());
+		suite.addTest(ParserAllTests.suite());
+		suite.addTest(HyperlinkAllTests.suite());
+		suite.addTestSuite(SpecfileCompletionProcessorTest.class);
+		// $JUnit-END$
+		return suite;
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/EpochTagTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/EpochTagTest.java
new file mode 100644
index 0000000..1068c52
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/EpochTagTest.java
@@ -0,0 +1,101 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.tests;
+
+import org.eclipse.core.resources.IMarker;
+
+public class EpochTagTest extends FileTestCase {
+
+	public void testEpochTag() {
+		String testText = "Epoch: 1";
+		newFile(testText);
+		assertEquals(1, specfile.getEpoch());
+	}
+
+	public void testEpochTag2() {
+		String testText = "Epoch:	1";
+		newFile(testText);
+		assertEquals(1, specfile.getEpoch());
+	}
+
+	public void testNullEpochTag() {
+		String testText = "Epoch:";
+		newFile(testText);
+		IMarker marker = getFailureMarkers()[0];
+		assertEquals(0, marker.getAttribute(IMarker.CHAR_START, 0));
+		assertEquals(6, marker.getAttribute(IMarker.CHAR_END, 0));
+		assertEquals(IMarker.SEVERITY_ERROR, marker.getAttribute(
+				IMarker.SEVERITY, -1));
+		assertEquals("Epoch declaration without value.", marker.getAttribute(
+				IMarker.MESSAGE, ""));
+	}
+
+	public void testNullEpochTag2() {
+		String testText = "Epoch:	";
+		newFile(testText);
+		IMarker marker = getFailureMarkers()[0];
+		assertEquals(0, marker.getAttribute(IMarker.CHAR_START, 0));
+		assertEquals(7, marker.getAttribute(IMarker.CHAR_END, 0));
+		assertEquals(IMarker.SEVERITY_ERROR, marker.getAttribute(
+				IMarker.SEVERITY, -1));
+		assertEquals("Epoch declaration without value.", marker.getAttribute(
+				IMarker.MESSAGE, ""));
+	}
+
+	public void testMultipleEpochsTag() {
+		String testText = "Epoch: 1 2";
+		newFile(testText);
+		IMarker marker = getFailureMarkers()[0];
+		assertEquals(0, marker.getAttribute(IMarker.CHAR_START, 0));
+		assertEquals(10, marker.getAttribute(IMarker.CHAR_END, 0));
+		assertEquals(IMarker.SEVERITY_ERROR, marker.getAttribute(
+				IMarker.SEVERITY, -1));
+		assertEquals("Epoch cannot have multiple values.", marker.getAttribute(
+				IMarker.MESSAGE, ""));
+	}
+
+	public void testMultipleEpochsTag2() {
+		String testText = "Epoch: 	1 2";
+		newFile(testText);
+		IMarker marker = getFailureMarkers()[0];
+		assertEquals(0, marker.getAttribute(IMarker.CHAR_START, 0));
+		assertEquals(11, marker.getAttribute(IMarker.CHAR_END, 0));
+		assertEquals(IMarker.SEVERITY_ERROR, marker.getAttribute(
+				IMarker.SEVERITY, -1));
+		assertEquals("Epoch cannot have multiple values.", marker.getAttribute(
+				IMarker.MESSAGE, ""));
+	}
+
+	public void testNonIntegerEpoch() {
+		String testText = "Epoch: blah";
+		newFile(testText);
+		IMarker marker = getFailureMarkers()[0];
+		assertEquals(0, marker.getAttribute(IMarker.CHAR_START, 0));
+		assertEquals(11, marker.getAttribute(IMarker.CHAR_END, 0));
+		assertEquals(IMarker.SEVERITY_ERROR, marker.getAttribute(
+				IMarker.SEVERITY, -1));
+		assertEquals("Epoch cannot have non-integer value.", marker
+				.getAttribute(IMarker.MESSAGE, ""));
+	}
+
+	public void testNonIntegerEpoch2() {
+		String testText = "Epoch:	blah";
+		newFile(testText);
+		IMarker marker = getFailureMarkers()[0];
+		assertEquals(0, marker.getAttribute(IMarker.CHAR_START, 0));
+		assertEquals(11, marker.getAttribute(IMarker.CHAR_END, 0));
+		assertEquals(IMarker.SEVERITY_ERROR, marker.getAttribute(
+				IMarker.SEVERITY, -1));
+		assertEquals("Epoch cannot have non-integer value.", marker
+				.getAttribute(IMarker.MESSAGE, ""));
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/FileTestCase.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/FileTestCase.java
new file mode 100644
index 0000000..c58180b
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/FileTestCase.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.tests;
+
+import java.io.ByteArrayInputStream;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.text.Document;
+import org.eclipse.linuxtools.rpm.ui.editor.markers.SpecfileErrorHandler;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.Specfile;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileParser;
+
+/**
+ * Test case providing all the objects needed for the rpm editor tests.
+ * 
+ */
+public abstract class FileTestCase extends TestCase {
+
+	protected SpecfileParser parser;
+	protected Specfile specfile;
+	protected IFile testFile;
+	protected Document testDocument;
+	SpecfileErrorHandler errorHandler;
+	SpecfileTestProject testProject;
+
+	@Override
+	protected void setUp() throws CoreException {
+		testProject = new SpecfileTestProject();
+		testFile = testProject.createFile("test.spec");
+		parser = new SpecfileParser();
+		specfile = new Specfile();
+	}
+
+	@Override
+	protected void tearDown() throws CoreException {
+		testProject.dispose();
+	}
+
+	protected IMarker[] getFailureMarkers() {
+		try {
+			return testProject.getFailureMarkers();
+		} catch (CoreException e) {
+			fail(e.getMessage());
+		}
+		return null;
+	}
+
+	protected void newFile(String contents) {
+		try {
+			testFile.setContents(new ByteArrayInputStream(contents.getBytes()),
+					false, false, null);
+		} catch (CoreException e) {
+			fail(e.getMessage());
+		}
+		testDocument = new Document(contents);
+		errorHandler = new SpecfileErrorHandler(testFile, testDocument);
+		parser.setErrorHandler(errorHandler);
+		specfile = parser.parse(testDocument);
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/HeaderRecognitionTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/HeaderRecognitionTest.java
new file mode 100644
index 0000000..184af7f
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/HeaderRecognitionTest.java
@@ -0,0 +1,175 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.tests;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileElement;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileSection;
+
+/**
+ * @author overholt
+ * 
+ */
+public class HeaderRecognitionTest extends FileTestCase {
+
+	String testText;
+
+	public void testGetSimpleSectionName() {
+		testText = "%prep";
+		SpecfileElement element;
+
+		newFile(testText);
+		element = parser.parseLine(testText, specfile, 0);
+		assertEquals(SpecfileSection.class, element.getClass());
+		assertEquals(testText.substring(1), ((SpecfileSection) element)
+				.getName());
+	}
+
+	public void testGetComplexSectionName1() {
+		testText = "%post";
+		SpecfileElement element;
+
+		newFile(testText);
+		element = parser.parseLine(testText, specfile, 0);
+		assertEquals(SpecfileSection.class, element.getClass());
+		SpecfileSection section = (SpecfileSection) element;
+		assertEquals(testText.substring(1), section.getName());
+		assertNull(section.getPackage());
+	}
+
+	public void testGetComplexSectionName2() {
+		testText = "%post -n";
+		newFile(testText);
+		specfile = parser.parse(testDocument);
+
+		IMarker marker = getFailureMarkers()[0];
+		assertEquals(0, marker.getAttribute(IMarker.CHAR_START, 0));
+		assertEquals("No package name after -n in post section.", marker
+				.getAttribute(IMarker.MESSAGE, ""));
+		assertEquals(testText.length(), marker
+				.getAttribute(IMarker.CHAR_END, 0));
+	}
+
+	public void testGetComplexSectionName3() {
+		testText = "%post -n name";
+		String[] tokens = testText.split("\\s+");
+		SpecfileElement element;
+
+		newFile(testText);
+		element = parser.parseLine(testText, specfile, 0);
+		assertEquals(SpecfileSection.class, element.getClass());
+		SpecfileSection section = (SpecfileSection) element;
+		assertEquals(tokens[0].substring(1), section.getName());
+		assertEquals(tokens[2], section.getPackage().getPackageName());
+	}
+
+	public void testGetComplexSectionName4() {
+		// FIXME: check for rest of line when -p is implemented
+		// this should be an error case
+		testText = "%post -n name -p";
+		String[] tokens = testText.split("\\s+");
+		SpecfileElement element;
+
+		newFile(testText);
+		element = parser.parseLine(testText, specfile, 0);
+		assertEquals(SpecfileSection.class, element.getClass());
+		SpecfileSection section = (SpecfileSection) element;
+		assertEquals(tokens[0].substring(1), section.getName());
+		assertEquals(tokens[2], section.getPackage().getPackageName());
+	}
+
+	public void testGetComplexSectionName5() {
+		// FIXME: check for rest of line when -p is implemented
+		// "blah bleh" should become the actual text of the section
+		testText = "%post -n name -p blah bleh";
+		String[] tokens = testText.split("\\s+");
+		SpecfileElement element;
+
+		newFile(testText);
+		element = parser.parseLine(testText, specfile, 0);
+		assertEquals(SpecfileSection.class, element.getClass());
+		SpecfileSection section = (SpecfileSection) element;
+		assertEquals(tokens[0].substring(1), section.getName());
+		assertEquals(tokens[2], section.getPackage().getPackageName());
+	}
+
+	public void testGetComplexSectionName6() {
+		testText = "%post -p blah bleh";
+		// FIXME: check for rest of line when -p is implemented
+		// "blah bleh" should become the actual text of the section
+
+		String[] tokens = testText.split("\\s+");
+		SpecfileElement element;
+
+		newFile(testText);
+		element = parser.parseLine(testText, specfile, 0);
+		assertEquals(SpecfileSection.class, element.getClass());
+		SpecfileSection section = (SpecfileSection) element;
+		assertEquals(tokens[0].substring(1), section.getName());
+		assertNull(section.getPackage());
+	}
+
+	public void testGetComplexSectionName7() {
+		testText = "%post -n -p blah";
+
+		newFile(testText);
+		specfile = parser.parse(testDocument);
+
+		IMarker marker = getFailureMarkers()[0];
+		assertEquals(0, marker.getAttribute(IMarker.CHAR_START, 0));
+		assertEquals("Package name must not start with '-': -p.", marker
+				.getAttribute(IMarker.MESSAGE, ""));
+		assertEquals(testText.length(), marker
+				.getAttribute(IMarker.CHAR_END, 0));
+	}
+
+	// public void testGetComplexSectionName8() {
+	// testText = "%files blah -f blah.list";
+	//
+	// SpecfileElement element;
+	// specfile = new Specfile("testspec");
+	// try {
+	// element = parser.parseLine(testText, specfile);
+	// fail();
+	// } catch (Exception e) {
+	// assertTrue(e.getMessage().startsWith(""));
+	// }
+	// }
+	//	 
+	// public void testGetComplexSectionName9() {
+	// testText = "%files blah blah -f blah.list";
+	//
+	// SpecfileElement element;
+	// specfile = new Specfile("testspec");
+	// try {
+	// element = parser.parseLine(testText, specfile);
+	// fail();
+	// } catch (Exception e) {
+	// assertTrue(e.getMessage().startsWith(""));
+	// }
+	// }
+	//	 
+	// public void testGetComplexSectionName10() {
+	// // FIXME: can you have multiple files lists?
+	// testText = "%files blah -f blah.list blah2.list";
+	//
+	// SpecfileElement element;
+	// specfile = new Specfile("testspec");
+	// try {
+	// element = parser.parseLine(testText, specfile);
+	// fail();
+	// } catch (Exception e) {
+	// assertTrue(e.getMessage().startsWith(""));
+	// }
+	// }
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/LicenseTagTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/LicenseTagTest.java
new file mode 100644
index 0000000..c224208
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/LicenseTagTest.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.tests;
+
+public class LicenseTagTest extends FileTestCase {
+
+	public void testSingleLicenseTag() {
+		String testText = "License: EPL";
+		newFile(testText);
+		assertEquals("EPL", specfile.getLicense());
+	}
+	// FIXME: investigate whether we should keep this or not
+	// See SpecfileParser at line 450
+	// public void testMultipleLicenseTag() {
+	// String testText = "License: Eclipse Public License";
+	// try {
+	// newFile(testText);
+	// IMarker marker= testProject.getFailureMarkers()[0];
+	// assertEquals(0, marker.getAttribute(IMarker.CHAR_START, 0));
+	// assertEquals(31, marker.getAttribute(IMarker.CHAR_END, 0));
+	// assertEquals(IMarker.SEVERITY_WARNING,
+	// marker.getAttribute(IMarker.SEVERITY, -1));
+	// assertEquals("License should be an acronym.",
+	// marker.getAttribute(IMarker.MESSAGE, ""));
+	// } catch (Exception e) {
+	// e.printStackTrace();
+	// fail();
+	// }
+	// }
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/LinePositionTests.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/LinePositionTests.java
new file mode 100644
index 0000000..7d85192
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/LinePositionTests.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.tests;
+
+import java.util.Collection;
+
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileSource;
+
+public class LinePositionTests extends FileTestCase {
+
+	public void testLineNumber() {
+		String specText = "Patch3: somefilesomewhere.patch" + "\n"
+				+ "Patch2: someotherfile.patch";
+
+		newFile(specText);
+		Collection<SpecfileSource> patches = specfile.getPatches();
+		for (SpecfileSource patch : patches) {
+			if (patch.getNumber() == 2)
+				assertEquals(1, patch.getLineNumber());
+			else if (patch.getNumber() == 3)
+				assertEquals(0, patch.getLineNumber());
+			else
+				fail();
+		}
+	}
+
+	public void testLineNumber2() {
+		String specText = "Patch3: somefilesomewhere.patch" + "\n" + "%patch3";
+
+		newFile(specText);
+		Collection<SpecfileSource> patches = specfile.getPatches();
+		for (SpecfileSource patch : patches) {
+			if (patch.getNumber() == 3) {
+				assertEquals(0, patch.getLineNumber());
+				assertEquals(1, patch.getLinesUsed().get(0).intValue());
+			} else
+				fail();
+		}
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/NameTagTests.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/NameTagTests.java
new file mode 100644
index 0000000..72f228d
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/NameTagTests.java
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.tests;
+
+import org.eclipse.core.resources.IMarker;
+
+public class NameTagTests extends FileTestCase {
+
+	public void testResolvedNameTag() {
+
+		String testText = "%define blah notblah\nName: %{blah}";
+
+		newFile(testText);
+
+		assertEquals("notblah", specfile.getName());
+	}
+
+	public void testResolvedSetName() {
+		String testText = "%define blah notblah\nName: %{blah}";
+		newFile(testText);
+		assertEquals("notblah", specfile.getName());
+	}
+
+	public void testNameTag() {
+		String testText = "Name: blah";
+		newFile(testText);
+		assertEquals("blah", specfile.getName());
+	}
+
+	public void testNameTag2() {
+		String testText = "Name:	blah";
+		newFile(testText);
+		assertEquals("blah", specfile.getName());
+	}
+
+	public void testNullNameTag() {
+		String testText = "Name:	";
+		newFile(testText);
+		IMarker marker = getFailureMarkers()[0];
+		assertEquals(0, marker.getAttribute(IMarker.CHAR_START, 0));
+		assertEquals(testText.length(), marker
+				.getAttribute(IMarker.CHAR_END, 0));
+		assertEquals("Name declaration without value.", marker.getAttribute(
+				IMarker.MESSAGE, ""));
+	}
+
+	public void testNullNameTag2() {
+		String testText = "Name: ";
+
+		newFile(testText);
+		IMarker marker = getFailureMarkers()[0];
+		assertEquals(0, marker.getAttribute(IMarker.CHAR_START, 0));
+		assertEquals(testText.length(), marker
+				.getAttribute(IMarker.CHAR_END, 0));
+		assertEquals("Name declaration without value.", marker.getAttribute(
+				IMarker.MESSAGE, ""));
+	}
+
+	public void testMultipleNamesTag() {
+		String testText = "Name: blah bleh";
+
+		newFile(testText);
+		IMarker marker = getFailureMarkers()[0];
+		assertEquals(0, marker.getAttribute(IMarker.CHAR_START, 0));
+		assertEquals(testText.length(), marker
+				.getAttribute(IMarker.CHAR_END, 0));
+		assertEquals("Name cannot have multiple values.", marker.getAttribute(
+				IMarker.MESSAGE, ""));
+	}
+
+	public void testMultipleNamesTag2() {
+		String testText = "Name: 	blah bleh";
+
+		newFile(testText);
+		IMarker marker = getFailureMarkers()[0];
+		assertEquals(0, marker.getAttribute(IMarker.CHAR_START, 0));
+		assertEquals(testText.length(), marker
+				.getAttribute(IMarker.CHAR_END, 0));
+		assertEquals("Name cannot have multiple values.", marker.getAttribute(
+				IMarker.MESSAGE, ""));
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/PatchApplicationTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/PatchApplicationTest.java
new file mode 100644
index 0000000..32b560b
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/PatchApplicationTest.java
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.tests;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileElement;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfilePatchMacro;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileSource;
+
+public class PatchApplicationTest extends FileTestCase {
+
+	public void testParsePatchApplication() {
+		String specText = "Patch3: somefilesomewhere.patch\n%patch3";
+		String testText = "%patch3";
+
+		newFile(specText);
+		SpecfileElement element = parser.parseLine(testText, specfile, 1);
+		assertEquals(SpecfilePatchMacro.class, element.getClass());
+		assertEquals(3, ((SpecfilePatchMacro) element).getPatchNumber());
+	}
+
+	public void testPatchLineNumber() {
+		String specText = "Patch3: somefilesomewhere.patch" + "\n" + "%patch3";
+
+		newFile(specText);
+		SpecfileSource thisPatch = specfile.getPatch(3);
+		List<Integer> usedList = new ArrayList<Integer>(1);
+		usedList.add(Integer.valueOf(1));
+		assertEquals(thisPatch.getLinesUsed(), usedList);
+	}
+
+	public void testMultiplePatchLineNumbers() {
+		String specText = "Patch3: somefilesomewhere.patch" + "\n" + "%patch3"
+				+ "\n" + "blah" + "\n" + "%patch3";
+
+		newFile(specText);
+		SpecfileSource thisPatch = specfile.getPatch(3);
+		List<Integer> usedList = new ArrayList<Integer>(2);
+		usedList.add(Integer.valueOf(1));
+		usedList.add(Integer.valueOf(3));
+		assertEquals(thisPatch.getLinesUsed(), usedList);
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/ReleaseTagTests.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/ReleaseTagTests.java
new file mode 100644
index 0000000..4c37532
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/ReleaseTagTests.java
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.tests;
+
+import org.eclipse.core.resources.IMarker;
+
+public class ReleaseTagTests extends FileTestCase {
+
+	public void testResolvedSetRelease() {
+		String testText = "%define blah notblah\nRelease: %{blah}";
+
+		newFile(testText);
+		assertEquals("notblah", specfile.getRelease());
+	}
+
+	public void testReleaseTag() {
+		String testText = "Release: blah";
+		newFile(testText);
+		assertEquals("blah", specfile.getRelease());
+	}
+
+	public void testReleaseTag2() {
+		String testText = "Release:		blah";
+		newFile(testText);
+		assertEquals("blah", specfile.getRelease());
+	}
+
+	public void testNullReleaseTag() {
+		String testText = "Release:	";
+		newFile(testText);
+
+		IMarker marker = getFailureMarkers()[0];
+		assertEquals(0, marker.getAttribute(IMarker.CHAR_START, 0));
+		assertEquals(testText.length(), marker
+				.getAttribute(IMarker.CHAR_END, 0));
+		assertEquals("Release declaration without value.", marker.getAttribute(
+				IMarker.MESSAGE, ""));
+	}
+
+	public void testNullReleaseTag2() {
+		String testText = "Release:		";
+
+		newFile(testText);
+
+		IMarker marker = getFailureMarkers()[0];
+		assertEquals(0, marker.getAttribute(IMarker.CHAR_START, 0));
+		assertEquals(testText.length(), marker
+				.getAttribute(IMarker.CHAR_END, 0));
+		assertEquals("Release declaration without value.", marker.getAttribute(
+				IMarker.MESSAGE, ""));
+	}
+
+	public void testMultipleReleasesTag() {
+		String testText = "Release: blah bleh";
+		newFile(testText);
+
+		IMarker marker = getFailureMarkers()[0];
+		assertEquals(0, marker.getAttribute(IMarker.CHAR_START, 0));
+		assertEquals(testText.length(), marker
+				.getAttribute(IMarker.CHAR_END, 0));
+		assertEquals("Release cannot have multiple values.", marker
+				.getAttribute(IMarker.MESSAGE, ""));
+	}
+
+	public void testMultipleReleasesTag2() {
+		String testText = "Release: 	blah bleh";
+		newFile(testText);
+
+		IMarker marker = getFailureMarkers()[0];
+		assertEquals(0, marker.getAttribute(IMarker.CHAR_START, 0));
+		assertEquals(testText.length(), marker
+				.getAttribute(IMarker.CHAR_END, 0));
+		assertEquals("Release cannot have multiple values.", marker
+				.getAttribute(IMarker.MESSAGE, ""));
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmMacroProposalsListTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmMacroProposalsListTest.java
new file mode 100644
index 0000000..cdec745
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmMacroProposalsListTest.java
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.tests;
+
+import java.util.Map;
+
+import junit.framework.TestCase;
+
+import org.eclipse.linuxtools.rpm.core.utils.Utils;
+import org.eclipse.linuxtools.rpm.ui.editor.RpmMacroProposalsList;
+
+public class RpmMacroProposalsListTest extends TestCase {
+
+	RpmMacroProposalsList macroProposalsList;
+
+	@Override
+	protected void setUp() throws Exception {
+		macroProposalsList = new RpmMacroProposalsList();
+	}
+
+	public final void testBuildMacroList() {
+		macroProposalsList.buildMacroList();
+		if (!macroProposalsList.findKey("%_libdir"))
+			fail("buildMacroList faild, %_libdir macro was not found!");
+	}
+
+	public final void testGetProposals() {
+		Map<String, String> proposals = macroProposalsList
+				.getProposals("%_libdir");
+		if (proposals.size() != 1) {
+			fail("getProposals faild, %_libdir macro was retrive as proposals");
+		}
+	}
+
+	public final void testGetProposals2() {
+		Map<String, String> proposals = macroProposalsList
+				.getProposals("%_unexistingmacro");
+		if (proposals.size() != 0) {
+			fail("getProposals faild, %_unexistingmacro don't can exist");
+		}
+	}
+
+	public final void testGetValue() {
+		if (macroProposalsList.getValue("_libdir").indexOf("lib") == -1) {
+			fail("getValue faild, %_libdir value don't end with '%{_lib}'");
+		}
+	}
+
+	public final void testGetValue2() {
+		if (macroProposalsList.getValue("_unexistingmacro") != null) {
+			fail("getValue faild, %_libdir value don't end with '%{_lib}'");
+		}
+	}
+
+	public final void testGetMacroEval() {
+		if (Utils.fileExist("/bin/rpm")) {
+			if (RpmMacroProposalsList.getMacroEval("%_libdir").indexOf("lib") == -1) {
+				fail("getMacroEval faild, eval don't end with 'lib'");
+			}
+		}
+	}
+
+	public final void testGetMacroEval2() {
+		if (!RpmMacroProposalsList.getMacroEval("%_unexistingmacro").equals(
+				"%_unexistingmacro")) {
+			fail("getMacroEval faild, eval don't contain %_unexistingmacro macro name");
+		}
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmPackageProposalsListTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmPackageProposalsListTest.java
new file mode 100644
index 0000000..6512842
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmPackageProposalsListTest.java
@@ -0,0 +1,82 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.tests;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.eclipse.linuxtools.rpm.core.utils.Utils;
+import org.eclipse.linuxtools.rpm.ui.editor.Activator;
+import org.eclipse.linuxtools.rpm.ui.editor.RpmPackageProposalsList;
+import org.eclipse.linuxtools.rpm.ui.editor.preferences.PreferenceConstants;
+
+public class RpmPackageProposalsListTest extends TestCase {
+
+	private RpmPackageProposalsList packageProposalsList;
+
+	@Override
+	protected void setUp() throws Exception {
+		Activator.getDefault().getPreferenceStore().setValue(
+				PreferenceConstants.P_RPM_LIST_FILEPATH, "/tmp/pkglist");
+		try {
+			BufferedWriter out = new BufferedWriter(new FileWriter(
+					"/tmp/pkglist"));
+			out.write("setup\ntest\nrpm\n");
+			out.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		packageProposalsList = new RpmPackageProposalsList();
+	}
+
+	public final void testGetProposals() {
+		List<String[]> proposals = packageProposalsList.getProposals("setup");
+		if (!(proposals.size() == 1)) {
+			fail("getProposals failed, setup package was retrieve as proposals!");
+		}
+	}
+
+	public final void testGetValue() {
+		if (Utils.fileExist("/bin/rpm")) {
+			if (!packageProposalsList.getValue("rpm").startsWith(
+					"<b>Name: </b>rpm")) {
+				fail("getValue failed, rpm package info doesn't start with '<b>Name:<b> rpm'");
+			}
+		}
+	}
+
+	public final void testGetValue2() {
+		if (packageProposalsList.getValue("test").indexOf("test") == -1) {
+			fail("getValue failed, test package info doesn't contain 'test'");
+		}
+	}
+
+	public final void testGetRpmInfo() {
+		if (Utils.fileExist("/bin/rpm")) {
+			if (!packageProposalsList.getRpmInfo("rpm").startsWith(
+					"<b>Name: </b>rpm")) {
+				fail("getRpmInfo failed, rpm package info doesn't start with '<b>Name:<b> rpm'");
+			}
+		}
+	}
+
+	public final void testGetRpmInfo2() {
+		if (packageProposalsList.getValue("test").indexOf("test") == -1) {
+			fail("getRpmInfo failed, test package info doesn't contain 'test'");
+		}
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfileCompletionProcessorTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfileCompletionProcessorTest.java
new file mode 100644
index 0000000..1423e0c
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfileCompletionProcessorTest.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.tests;
+
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.eclipse.linuxtools.rpm.ui.editor.Activator;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileCompletionProcessor;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.ide.IDE;
+
+public class SpecfileCompletionProcessorTest extends FileTestCase {
+
+	public static final String ONE_SOURCE = "Source0: text.zip\n";
+	public static final String NO_SOURCE = "Patch3: somefilesomewhere.patch"
+			+ "\n" + "Patch2: someotherfile.patch\n";
+	public static final String THREE_SOURCE_SEPARATED = "Source0: text.zip"
+			+ "\n" + "Patch0: first.patch" + "\n" + "Source2: ant.jar" + "\n"
+			+ "Source3: main.tar.gz";
+
+	private SpecfileEditor initEditor(String contents) throws Exception {
+		newFile(contents);
+		IEditorPart openEditor = IDE.openEditor(Activator.getDefault()
+				.getWorkbench().getActiveWorkbenchWindow().getActivePage(),
+				testFile);
+		return (SpecfileEditor) openEditor;
+	}
+
+	private synchronized void computeCompletionProposals(String specContent,
+			int occurances) throws Exception {
+		SpecfileEditor editor = initEditor(specContent);
+		testProject.refresh();
+		// This is needed so the changes in the testFile are loaded in the
+		// editor
+		editor.doRevertToSaved();
+		SpecfileCompletionProcessor complProcessor = new SpecfileCompletionProcessor(
+				editor);
+		assertNotNull(complProcessor);
+		ICompletionProposal[] proposals = complProcessor
+				.computeCompletionProposals(editor.getSpecfileSourceViewer(), 0);
+		int sourceComplCount = 0;
+		for (int i = 0; i < proposals.length; i++) {
+			ICompletionProposal proposal = proposals[i];
+			if (proposal.getDisplayString().startsWith("%{SOURCE")) {
+				++sourceComplCount;
+			}
+		}
+		assertEquals(occurances, sourceComplCount);
+	}
+
+	public void testComputeComplProposalsOneSource() throws Exception {
+		computeCompletionProposals(ONE_SOURCE, 1);
+	}
+
+	public void testComputeComplProposalsNoSource() throws Exception {
+		computeCompletionProposals(NO_SOURCE, 0);
+	}
+
+	public void testComputeComplProposalsThreeSourceSeparated()
+			throws Exception {
+		computeCompletionProposals(THREE_SOURCE_SEPARATED, 3);
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfileTestProject.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfileTestProject.java
new file mode 100644
index 0000000..6cc9c7f
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/SpecfileTestProject.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.tests;
+
+import java.io.IOException;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.linuxtools.rpm.core.utils.Utils;
+
+public class SpecfileTestProject {
+	private IProject project;
+
+	public SpecfileTestProject() throws CoreException {
+		IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
+		project = workspaceRoot.getProject("TestSpecfileProject");
+		project.create(null);
+		project.open(null);
+	}
+
+	public void dispose() throws CoreException {
+		project.delete(true, true, null);
+		try {
+			Utils.runCommandToInputStream("rm", "-f", "/tmp/pkglist");
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public IFile createFile(String filename) throws CoreException {
+		IFile testSpecfile = project.getFile(filename);
+		testSpecfile.create(null, true, null);
+		return testSpecfile;
+	}
+
+	protected IMarker[] getFailureMarkers() throws CoreException {
+		return project.findMarkers(
+				"org.eclipse.linuxtools.rpm.ui.editor.specfileerror", false,
+				IResource.DEPTH_INFINITE);
+	}
+
+	public void refresh() throws CoreException {
+		project.refreshLocal(IResource.DEPTH_INFINITE, null);
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/VersionTagTests.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/VersionTagTests.java
new file mode 100644
index 0000000..17a8daa
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/VersionTagTests.java
@@ -0,0 +1,86 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.tests;
+
+import org.eclipse.core.resources.IMarker;
+
+public class VersionTagTests extends FileTestCase {
+
+	public void testResolvedSetVersion() {
+		String testText = "%define blah notblah\nVersion: %{blah}";
+		newFile(testText);
+		assertEquals("notblah", specfile.getVersion());
+	}
+
+	public void testVersionTag() {
+		String testText = "Version: blah";
+		newFile(testText);
+		assertEquals("blah", specfile.getVersion());
+	}
+
+	public void testVersionTag2() {
+		String testText = "Version:		blah";
+		newFile(testText);
+		assertEquals("blah", specfile.getVersion());
+	}
+
+	public void testNullVersionTag() {
+		String testText = "Version: ";
+		newFile(testText);
+
+		IMarker marker = getFailureMarkers()[0];
+		assertEquals(0, marker.getAttribute(IMarker.CHAR_START, 0));
+		assertEquals(testText.length(), marker
+				.getAttribute(IMarker.CHAR_END, 0));
+		assertEquals("Version declaration without value.", marker.getAttribute(
+				IMarker.MESSAGE, ""));
+	}
+
+	public void testNullVersionTag2() {
+		String testText = "Version:		";
+
+		newFile(testText);
+
+		IMarker marker = getFailureMarkers()[0];
+		assertEquals(0, marker.getAttribute(IMarker.CHAR_START, 0));
+		assertEquals(testText.length(), marker
+				.getAttribute(IMarker.CHAR_END, 0));
+		assertEquals("Version declaration without value.", marker.getAttribute(
+				IMarker.MESSAGE, ""));
+	}
+
+	public void testMultipleVersionsTag() {
+		String testText = "Version: blah bleh";
+		newFile(testText);
+
+		IMarker marker = getFailureMarkers()[0];
+		assertEquals(0, marker.getAttribute(IMarker.CHAR_START, 0));
+		assertEquals(testText.length(), marker
+				.getAttribute(IMarker.CHAR_END, 0));
+		assertEquals("Version cannot have multiple values.", marker
+				.getAttribute(IMarker.MESSAGE, ""));
+	}
+
+	public void testMultipleVersionsTag2() {
+		String testText = "Version: 	blah bleh";
+
+		newFile(testText);
+
+		IMarker marker = getFailureMarkers()[0];
+		assertEquals(0, marker.getAttribute(IMarker.CHAR_START, 0));
+		assertEquals(testText.length(), marker
+				.getAttribute(IMarker.CHAR_END, 0));
+		assertEquals("Version cannot have multiple values.", marker
+				.getAttribute(IMarker.MESSAGE, ""));
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/actions/ActionsAllTests.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/actions/ActionsAllTests.java
new file mode 100644
index 0000000..54c752a
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/actions/ActionsAllTests.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.tests.actions;
+
+import junit.framework.TestSuite;
+
+public class ActionsAllTests {
+	public static TestSuite suite() {
+		TestSuite suite = new TestSuite(
+				"Test for org.eclipse.linuxtools.rpm.ui.editor.tests.actions");
+		suite.addTestSuite(SpecfileChangelogFormatterTest.class);
+		suite.addTestSuite(SpecfileChangelogParserTest.class);
+		return suite;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/actions/SpecfileChangelogFormatterTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/actions/SpecfileChangelogFormatterTest.java
new file mode 100644
index 0000000..bdb8a64
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/actions/SpecfileChangelogFormatterTest.java
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.tests.actions;
+
+import java.text.MessageFormat;
+import java.util.Date;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.linuxtools.rpm.ui.editor.Activator;
+import org.eclipse.linuxtools.rpm.ui.editor.actions.SpecfileChangelogFormatter;
+import org.eclipse.linuxtools.rpm.ui.editor.tests.FileTestCase;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.ide.IDE;
+
+public class SpecfileChangelogFormatterTest extends FileTestCase {
+
+	private static final String USER_MAIL = "someone@redhat.com";
+	private static final String USER_NAME = "Alexander Kurtakov";
+	private SpecfileChangelogFormatter formatter;
+	private IEditorPart editor;
+
+	@Override
+	protected void setUp() throws CoreException {
+		super.setUp();
+		newFile("%changelog");
+		editor = IDE.openEditor(Activator.getDefault().getWorkbench()
+				.getActiveWorkbenchWindow().getActivePage(), testFile,
+				"org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor");
+		formatter = new SpecfileChangelogFormatter();
+	}
+
+	public void testFormatDateLine() {
+		String expectedLine = MessageFormat
+				.format(
+						"* {0} {1} <{2}> {3}{4}-{5}", SpecfileChangelogFormatter.SIMPLE_DATE_FORMAT.format(new Date()), //$NON-NLS-1$
+						USER_NAME, USER_MAIL, "", "0", "0");
+		assertEquals(expectedLine, formatter.formatDateLine(USER_NAME,
+				USER_MAIL));
+	}
+
+	public void testMergeChangelogStringStringStringIEditorPartStringString() {
+		// TODO find how to test this
+		formatter.mergeChangelog("proba", "", editor, "", "");
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/actions/SpecfileChangelogParserTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/actions/SpecfileChangelogParserTest.java
new file mode 100644
index 0000000..7969c93
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/actions/SpecfileChangelogParserTest.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.tests.actions;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.linuxtools.rpm.ui.editor.actions.SpecfileChangelogParser;
+
+public class SpecfileChangelogParserTest extends TestCase {
+
+	private SpecfileChangelogParser parser;
+	
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+		parser = new SpecfileChangelogParser();
+	}
+
+	public void testParseCurrentFunctionIEditorPart() throws CoreException {
+		assertEquals("", parser.parseCurrentFunction(null));
+	}
+
+	public void testParseCurrentFunctionIEditorInputInt() throws CoreException {
+		assertEquals("", parser.parseCurrentFunction(null, 0));
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/HyperlinkAllTests.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/HyperlinkAllTests.java
new file mode 100644
index 0000000..6231475
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/HyperlinkAllTests.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.tests.hyperlink;
+
+import junit.framework.TestSuite;
+
+public class HyperlinkAllTests extends TestSuite {
+	public static TestSuite suite() {
+		TestSuite suite = new TestSuite(
+				"Test for org.eclipse.linuxtools.rpm.ui.editor.tests.hyperlink");
+		suite.addTestSuite(MailHyperlinkDetectorTest.class);
+		suite.addTestSuite(SourcesFileHyperlinkDetectorTest.class);
+		suite.addTestSuite(SpecfileElementHyperlinkDetectorTest.class);
+		suite.addTestSuite(URLHyperlinkWithMacroDetectorTest.class);
+		return suite;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/MailHyperlinkDetectorTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/MailHyperlinkDetectorTest.java
new file mode 100644
index 0000000..392025a
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/MailHyperlinkDetectorTest.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.tests.hyperlink;
+
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.eclipse.linuxtools.rpm.ui.editor.Activator;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
+import org.eclipse.linuxtools.rpm.ui.editor.hyperlink.MailHyperlink;
+import org.eclipse.linuxtools.rpm.ui.editor.hyperlink.MailHyperlinkDetector;
+import org.eclipse.linuxtools.rpm.ui.editor.tests.FileTestCase;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.ide.IDE;
+
+public class MailHyperlinkDetectorTest extends FileTestCase {
+
+	private SpecfileEditor editor;
+	private MailHyperlinkDetector elementDetector;
+
+	public void testDetectHyperlinks() throws PartInitException {
+		String testText = "Version: 0.0\n" + "Release: 0\n" + "%changelog\n"
+				+ "* Fri Feb 27 2009 Test <someone@smth.com> 3.3.2.4-6\n-\n"
+				+ "* Fri Feb 27 2009 Test someone@smth.com 3.3.2.4-6\n-\n";
+		newFile(testText);
+
+		IEditorPart openEditor = IDE
+				.openEditor(Activator.getDefault().getWorkbench()
+						.getActiveWorkbenchWindow().getActivePage(), testFile,
+						"org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor");
+
+		editor = (SpecfileEditor) openEditor;
+		editor.doRevertToSaved();
+		elementDetector = new MailHyperlinkDetector(editor);
+		// test mail
+		IRegion region = new Region(38, 0);
+		IHyperlink[] returned = elementDetector.detectHyperlinks(editor
+				.getSpecfileSourceViewer(), region, false);
+		assertEquals(1, returned.length);
+		assertTrue(returned[0] instanceof MailHyperlink);
+		
+		region = new Region(124, 0);
+		returned = elementDetector.detectHyperlinks(editor
+				.getSpecfileSourceViewer(), region, false);
+		assertEquals(1, returned.length);
+		assertTrue(returned[0] instanceof MailHyperlink);
+	}
+
+	public void testDetectHyperlinksNoRegionAndTextViewer() {
+		elementDetector = new MailHyperlinkDetector(editor);
+		IHyperlink[] returned = elementDetector.detectHyperlinks(null, null,
+				false);
+		assertNull(returned);
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/SourcesFileHyperlinkDetectorTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/SourcesFileHyperlinkDetectorTest.java
new file mode 100644
index 0000000..d5cac55
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/SourcesFileHyperlinkDetectorTest.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.tests.hyperlink;
+
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.eclipse.linuxtools.rpm.ui.editor.Activator;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
+import org.eclipse.linuxtools.rpm.ui.editor.hyperlink.SourcesFileHyperlinkDetector;
+import org.eclipse.linuxtools.rpm.ui.editor.tests.FileTestCase;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.ide.IDE;
+
+public class SourcesFileHyperlinkDetectorTest extends FileTestCase {
+	private SpecfileEditor editor;
+	private SourcesFileHyperlinkDetector elementDetector;
+
+	public void testDetectHyperlinks() throws PartInitException {
+		String testText = "Source0: test.zip\n";
+		newFile(testText);
+
+		IEditorPart openEditor = IDE
+				.openEditor(Activator.getDefault().getWorkbench()
+						.getActiveWorkbenchWindow().getActivePage(), testFile,
+						"org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor");
+
+		editor = (SpecfileEditor) openEditor;
+		editor.doRevertToSaved();
+		elementDetector = new SourcesFileHyperlinkDetector(editor);
+		// test source element
+		IRegion region = new Region(10, 0);
+		IHyperlink[] returned = elementDetector.detectHyperlinks(editor
+				.getSpecfileSourceViewer(), region, false);
+		assertEquals(2, returned.length);
+		
+		//test empty
+		region = new Region(4, 0);
+		returned = elementDetector.detectHyperlinks(editor
+				.getSpecfileSourceViewer(), region, false);
+		assertNull(returned);
+	}
+
+	public void testDetectHyperlinksNoRegionAndTextViewer() {
+		elementDetector = new SourcesFileHyperlinkDetector(editor);
+		IHyperlink[] returned = elementDetector.detectHyperlinks(null, null,
+				false);
+		assertNull(returned);
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/SpecfileElementHyperlinkDetectorTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/SpecfileElementHyperlinkDetectorTest.java
new file mode 100644
index 0000000..1c9e0a3
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/SpecfileElementHyperlinkDetectorTest.java
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.tests.hyperlink;
+
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.eclipse.linuxtools.rpm.ui.editor.Activator;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
+import org.eclipse.linuxtools.rpm.ui.editor.hyperlink.SpecfileElementHyperlink;
+import org.eclipse.linuxtools.rpm.ui.editor.hyperlink.SpecfileElementHyperlinkDetector;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileDefine;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileSource;
+import org.eclipse.linuxtools.rpm.ui.editor.tests.FileTestCase;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.ide.IDE;
+
+public class SpecfileElementHyperlinkDetectorTest extends FileTestCase {
+	private SpecfileEditor editor;
+	private SpecfileElementHyperlinkDetector elementDetector;
+
+	public void testDetectHyperlinks() throws PartInitException {
+		String testText = "%define smth other\nSource0: test.zip\nPatch0: first.patch\n"
+				+ "%build\n %{SOURCE0}\n%patch0\n%{smth}\n";
+		newFile(testText);
+		elementDetector = new SpecfileElementHyperlinkDetector(specfile);
+
+		IEditorPart openEditor = IDE
+				.openEditor(Activator.getDefault().getWorkbench()
+						.getActiveWorkbenchWindow().getActivePage(), testFile,
+						"org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor");
+
+		editor = (SpecfileEditor) openEditor;
+		editor.doRevertToSaved();
+		// test source element
+		IRegion region = new Region(74, 0);
+		IHyperlink[] returned = elementDetector.detectHyperlinks(editor
+				.getSpecfileSourceViewer(), region, false);
+		SpecfileElementHyperlink element = (SpecfileElementHyperlink) returned[0];
+		assertTrue(element.getSource() instanceof SpecfileSource);
+		SpecfileSource source = (SpecfileSource) element.getSource();
+		assertEquals(source.getSourceType(), SpecfileSource.SourceType.SOURCE);
+		assertEquals(source.getFileName(), "test.zip");
+
+		// test patch element
+		region = new Region(83, 0);
+		returned = elementDetector.detectHyperlinks(editor
+				.getSpecfileSourceViewer(), region, false);
+		element = (SpecfileElementHyperlink) returned[0];
+		assertTrue(element.getSource() instanceof SpecfileSource);
+		source = (SpecfileSource) element.getSource();
+		assertEquals(source.getSourceType(), SpecfileSource.SourceType.PATCH);
+		assertEquals(source.getFileName(), "first.patch");
+
+		// test define
+		region = new Region(89, 0);
+		returned = elementDetector.detectHyperlinks(editor
+				.getSpecfileSourceViewer(), region, false);
+		element = (SpecfileElementHyperlink) returned[0];
+		assertTrue(element.getSource() instanceof SpecfileDefine);
+		SpecfileDefine define = (SpecfileDefine) element.getSource();
+		assertEquals(define.getName(), "smth");
+		assertEquals(define.getStringValue(), "other");
+	}
+	
+	public void testDetectHyperlinksNoRegionAndTextViewer() {
+		elementDetector = new SpecfileElementHyperlinkDetector(specfile);
+		IHyperlink[] returned = elementDetector.detectHyperlinks(null, null, false);
+		assertNull(returned);
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/URLHyperlinkWithMacroDetectorTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/URLHyperlinkWithMacroDetectorTest.java
new file mode 100644
index 0000000..58c4226
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/hyperlink/URLHyperlinkWithMacroDetectorTest.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.tests.hyperlink;
+
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.eclipse.jface.text.hyperlink.URLHyperlink;
+import org.eclipse.linuxtools.rpm.ui.editor.Activator;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
+import org.eclipse.linuxtools.rpm.ui.editor.hyperlink.URLHyperlinkWithMacroDetector;
+import org.eclipse.linuxtools.rpm.ui.editor.tests.FileTestCase;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.ide.IDE;
+
+public class URLHyperlinkWithMacroDetectorTest extends FileTestCase {
+
+	private SpecfileEditor editor;
+	private URLHyperlinkWithMacroDetector macroDetector;
+
+	public void testDetectHyperlinks() throws PartInitException {
+		String testText = "Name: eclipse\nURL: http://www.%{name}.org/";
+		newFile(testText);
+		macroDetector = new URLHyperlinkWithMacroDetector(specfile);
+		IRegion region = new Region(20, 0);
+		IEditorPart openEditor = IDE
+				.openEditor(Activator.getDefault().getWorkbench()
+						.getActiveWorkbenchWindow().getActivePage(), testFile,
+						"org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor");
+
+		editor = (SpecfileEditor) openEditor;
+		editor.doRevertToSaved();
+		IHyperlink[] returned = macroDetector.detectHyperlinks(editor
+				.getSpecfileSourceViewer(), region, false);
+		URLHyperlink url = (URLHyperlink) returned[0];
+		assertEquals("http://www.eclipse.org/", url.getURLString());
+	}
+}
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/parser/ParserAllTests.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/parser/ParserAllTests.java
new file mode 100644
index 0000000..a6b737c
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/parser/ParserAllTests.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.tests.parser;
+
+import junit.framework.TestSuite;
+
+public class ParserAllTests extends TestSuite {
+	public static TestSuite suite() {
+		TestSuite suite = new TestSuite(
+				"Test for org.eclipse.linuxtools.rpm.ui.editor.tests.parser");
+		suite.addTestSuite(SourceComparatorTest.class);
+		suite.addTestSuite(SpecfileDefineTest.class);
+		suite.addTestSuite(SpecfileTest.class);
+		return suite;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/parser/SourceComparatorTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/parser/SourceComparatorTest.java
new file mode 100644
index 0000000..9667717
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/parser/SourceComparatorTest.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.tests.parser;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileSource;
+import org.eclipse.linuxtools.rpm.ui.editor.tests.FileTestCase;
+
+public class SourceComparatorTest extends FileTestCase {
+
+	public void testPatchComparator() {
+		String specText = "Patch3: somefilesomewhere.patch" + "\n"
+				+ "Patch2: someotherfile.patch";
+
+		newFile(specText);
+		Collection<SpecfileSource> patches = specfile.getPatches();
+		int i = 1;
+		for (SpecfileSource patch : patches) {
+			i++;
+			if (i == 2)
+				assertEquals(2, patch.getNumber());
+			else if (i == 3)
+				assertEquals(3, patch.getNumber());
+			else
+				fail();
+		}
+	}
+
+	public void testPatchComparator2() {
+		String specText = "Patch3: somefilesomewhere.patch" + "\n"
+				+ "Patch2: someotherfile.patch";
+
+		newFile(specText);
+		List<SpecfileSource> patches = specfile.getPatches();
+		assertEquals(2, patches.get(0).getNumber());
+		assertEquals(3, patches.get(1).getNumber());
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/parser/SpecfileDefineTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/parser/SpecfileDefineTest.java
new file mode 100644
index 0000000..ccaece6
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/parser/SpecfileDefineTest.java
@@ -0,0 +1,163 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.tests.parser;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileDefine;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileElement;
+import org.eclipse.linuxtools.rpm.ui.editor.tests.FileTestCase;
+
+public class SpecfileDefineTest extends FileTestCase {
+
+	private String testSpec =
+	// Characters 0 through 17
+	"%define blah bleh" + "\n" +
+	// Characters 18 through 36
+			"%define blah2	bleh" + "\n" +
+			// Characters 37 through 52
+			"%define blah3	1" + "\n" +
+			// Characters 53 through 69
+			"%define blah4		1" + "\n" +
+			// Characters 70 through 83
+			"%define blah5" + "\n" +
+			// Characters 84 through 95
+			"%define 1 2" + "\n" +
+			// Characters 96 through 109
+			"%define -n -p" + "\n" +
+			// Characters 110 through 144
+			"%define __find_requires %{SOURCE3}";
+
+	@Override
+	protected void setUp() throws CoreException {
+		super.setUp();
+		newFile(testSpec);
+		specfile = parser.parse(testDocument);
+	}
+
+	public void testResolve() {
+		SpecfileDefine define1 = new SpecfileDefine("name", "testspec",
+				specfile, specfile.getPackages().getPackage(specfile.getName()));
+		specfile.addDefine(define1);
+		assertEquals("testspec", ((SpecfileElement) define1).resolve("%{name}"));
+	}
+
+	public void testDefine() {
+		SpecfileDefine blahDefine = specfile.getDefine("blah");
+		assertEquals(SpecfileDefine.class, blahDefine.getClass());
+		assertEquals("blah", blahDefine.getName());
+		assertEquals("bleh", blahDefine.getStringValue());
+	}
+
+	public void testDefine2() {
+		SpecfileDefine blahDefine = specfile.getDefine("blah2");
+		assertEquals(SpecfileDefine.class, blahDefine.getClass());
+		assertEquals("blah2", blahDefine.getName());
+		assertEquals("bleh", blahDefine.getStringValue());
+	}
+
+	public void testDefine3() {
+		SpecfileDefine blahDefine = specfile.getDefine("blah3");
+		assertEquals(SpecfileDefine.class, blahDefine.getClass());
+		assertEquals("blah3", blahDefine.getName());
+		assertEquals(1, blahDefine.getIntValue());
+	}
+
+	public void testDefine4() {
+		SpecfileDefine blahDefine = specfile.getDefine("blah4");
+		assertEquals(SpecfileDefine.class, blahDefine.getClass());
+		assertEquals("blah4", blahDefine.getName());
+		assertEquals(1, blahDefine.getIntValue());
+	}
+
+// This error is no more managed by our 'internal' parser. 
+//	public void testNullDefinition() {
+//		boolean fail = true;
+//		for (IMarker marker : getFailureMarkers()) {
+//			if ((marker.getAttribute(IMarker.CHAR_START, 0) == 70)
+//					&& (marker.getAttribute(IMarker.CHAR_END, 0) == 83)) {
+//				assertEquals(IMarker.SEVERITY_WARNING, marker.getAttribute(
+//						IMarker.SEVERITY, -1));
+//				assertEquals("No value name after define.", marker
+//						.getAttribute(IMarker.MESSAGE, ""));
+//				fail = false;
+//			}
+//		}
+//		if (fail)
+//			fail();
+//	}
+
+	public void testNonLetterDefinitionName() {
+		boolean fail = true;
+		for (IMarker marker : getFailureMarkers()) {
+			if ((marker.getAttribute(IMarker.CHAR_START, 0) == 84)
+					&& (marker.getAttribute(IMarker.CHAR_END, 0) == 95)) {
+				assertEquals(IMarker.SEVERITY_ERROR, marker.getAttribute(
+						IMarker.SEVERITY, -1));
+				assertEquals(
+						"Definition lvalue must begin with a letter or an underscore.",
+						marker.getAttribute(IMarker.MESSAGE, ""));
+				fail = false;
+			}
+		}
+		if (fail)
+			fail();
+		// try {
+		// IMarker marker= testProject.getFailureMarkers()[1];
+		// System.out.println("non-letter definition");
+		// System.out.println(marker.getAttribute(IMarker.SEVERITY, -1));
+		// System.out.println(marker.getAttribute(IMarker.MESSAGE, ""));
+		// System.out.println(marker.getAttribute(IMarker.CHAR_START, 0));
+		// System.out.println(marker.getAttribute(IMarker.CHAR_END, 0));
+		// assertEquals(IMarker.SEVERITY_ERROR,
+		// marker.getAttribute(IMarker.SEVERITY, -1));
+		// assertEquals("Definition lvalue must begin with a letter or an underscore.",
+		// marker.getAttribute(IMarker.MESSAGE, ""));
+		// } catch (CoreException e) {
+		// fail();
+		// }
+	}
+
+	public void testNonLetterDefinitionName2() {
+		boolean fail = true;
+		for (IMarker marker : getFailureMarkers()) {
+			if ((marker.getAttribute(IMarker.CHAR_START, 0) == 96)
+					&& (marker.getAttribute(IMarker.CHAR_END, 0) == 109)) {
+				assertEquals(IMarker.SEVERITY_ERROR, marker.getAttribute(
+						IMarker.SEVERITY, -1));
+				assertEquals(
+						"Definition lvalue must begin with a letter or an underscore.",
+						marker.getAttribute(IMarker.MESSAGE, ""));
+				fail = false;
+			}
+		}
+		if (fail)
+			fail();
+		// try {
+		// IMarker marker= testProject.getFailureMarkers()[2];
+		// assertEquals(IMarker.SEVERITY_ERROR,
+		// marker.getAttribute(IMarker.SEVERITY, -1));
+		// assertEquals("Definition lvalue must begin with a letter or an underscore.",
+		// marker.getAttribute(IMarker.MESSAGE, ""));
+		// } catch (CoreException e) {
+		// fail();
+		// }
+	}
+
+	public void testUnderscoreDefine() {
+		SpecfileDefine blahDefine = specfile.getDefine("__find_requires");
+		assertEquals(SpecfileDefine.class, blahDefine.getClass());
+		assertEquals("__find_requires", blahDefine.getName());
+		assertEquals("%{SOURCE3}", blahDefine.getStringValue());
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/parser/SpecfileTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/parser/SpecfileTest.java
new file mode 100644
index 0000000..41ae5a2
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/parser/SpecfileTest.java
@@ -0,0 +1,101 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.tests.parser;
+
+import java.util.List;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileSource;
+import org.eclipse.linuxtools.rpm.ui.editor.tests.FileTestCase;
+
+public class SpecfileTest extends FileTestCase {
+
+	public void testGetLine() {
+		String specText = "Patch3: somefilesomewhere.patch" + "\n" + "%patch3";
+		try {
+			newFile(specText);
+			assertEquals("%patch3", specfile.getLine(1));
+		} catch (BadLocationException e) {
+			fail(e.getMessage());
+		}
+	}
+
+	public void testChangeLine() {
+		String specText = "Patch3: somefilesomewhere.patch" + "\n" + "%patch3";
+
+		try {
+			newFile(specText);
+			assertEquals("%patch3", specfile.getLine(1));
+			specfile.changeLine(1, "%patch4");
+			assertEquals("%patch4", specfile.getLine(1));
+		} catch (BadLocationException e) {
+			fail(e.getMessage());
+		}
+	}
+
+	public void testChangeLine2() {
+		String specText = "Patch3: somefilesomewhere.patch" + "\n" + "%patch3";
+
+		try {
+			newFile(specText);
+			assertEquals("Patch3: somefilesomewhere.patch", specfile.getLine(0));
+			specfile.changeLine(0, "Patch4: somefilesomewhere.patch");
+			assertEquals("Patch4: somefilesomewhere.patch", specfile.getLine(0));
+		} catch (BadLocationException e) {
+			fail(e.getMessage());
+		}
+	}
+
+	public void testChangeLine3() {
+		String specText = "Patch3: somefilesomewhere.patch" + "\n" + "%patch3";
+
+		try {
+			newFile(specText);
+			assertEquals("Patch3: somefilesomewhere.patch", specfile.getLine(0));
+			specfile.changeLine(0, "andrew");
+			assertEquals("andrew", specfile.getLine(0));
+		} catch (BadLocationException e) {
+			fail(e.getMessage());
+		}
+	}
+
+	public void testOrganizePatches() {
+		String specText = "Patch3: somefilesomewhere.patch" + "\n" + "%patch3";
+
+		try {
+			newFile(specText);
+			assertEquals("Patch3: somefilesomewhere.patch", specfile.getLine(0));
+			assertEquals("%patch3", specfile.getLine(1));
+			assertEquals(0, specfile.getPatch(3).getLineNumber());
+			SpecfileSource patch = specfile.getPatch(3);
+			List<Integer> linesUsed = patch.getLinesUsed();
+			assertEquals(1, linesUsed.size());
+			Integer lineUsedNumber = linesUsed.get(0);
+			assertEquals(1, lineUsedNumber.intValue());
+			specfile.organizePatches();
+			assertEquals("Patch0: somefilesomewhere.patch", specfile.getLine(0));
+			assertEquals("%patch0", specfile.getLine(1));
+			assertEquals(0, specfile.getPatch(0).getLineNumber());
+			patch = specfile.getPatch(3);
+			assertNull(patch);
+			patch = specfile.getPatch(0);
+			assertEquals(0, patch.getNumber());
+			linesUsed = patch.getLinesUsed();
+			assertEquals(1, linesUsed.size());
+			lineUsedNumber = linesUsed.get(0);
+			assertEquals(1, lineUsedNumber.intValue());
+		} catch (BadLocationException e) {
+			fail(e.getMessage());
+		}
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/scanners/ScannersAllTests.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/scanners/ScannersAllTests.java
new file mode 100644
index 0000000..0029711
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/scanners/ScannersAllTests.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.tests.scanners;
+
+import junit.framework.TestSuite;
+
+public class ScannersAllTests extends TestSuite {
+	public static TestSuite suite() {
+		TestSuite suite = new TestSuite(
+				"Test for org.eclipse.linuxtools.rpm.ui.editor.tests.scanners");
+		suite.addTestSuite(SpecfileChangelogScannerTest.class);
+		suite.addTestSuite(SpecfilePackagesScannerTest.class);
+		suite.addTestSuite(SpecfileScannerTest.class);
+		return suite;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/scanners/SpecfileChangelogScannerTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/scanners/SpecfileChangelogScannerTest.java
new file mode 100644
index 0000000..5fb3f04
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/scanners/SpecfileChangelogScannerTest.java
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.tests.scanners;
+
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.linuxtools.rpm.ui.editor.ColorManager;
+import org.eclipse.linuxtools.rpm.ui.editor.ISpecfileColorConstants;
+import org.eclipse.linuxtools.rpm.ui.editor.scanners.SpecfileChangelogScanner;
+import org.eclipse.linuxtools.rpm.ui.editor.tests.AScannerTest;
+
+public class SpecfileChangelogScannerTest extends AScannerTest {
+
+	private IToken token;
+
+	private TextAttribute ta;
+
+	private SpecfileChangelogScanner scanner;
+
+	public SpecfileChangelogScannerTest() {
+		scanner = new SpecfileChangelogScanner(new ColorManager());
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.linuxtools.rpm.ui.editor.tests.AScannerTest#getContents()
+	 */
+	@Override
+	protected String getContents() {
+		return "%changelog <toto@test.com> - 1.1-4";
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.linuxtools.rpm.ui.editor.tests.AScannerTest#getScanner()
+	 */
+	@Override
+	protected RuleBasedScanner getScanner() {
+		return scanner;
+	}
+
+	public void testSection() {
+		token = getNextToken();
+		assertTrue(token instanceof Token);
+		assertEquals(10, rulesBasedScanner.getTokenLength());
+		assertEquals(0, rulesBasedScanner.getTokenOffset());
+		ta = (TextAttribute) token.getData();
+		assertEquals(ta.getForeground().getRGB(),
+				ISpecfileColorConstants.SECTIONS);
+	}
+
+	public void testMail() {
+		token = getToken(3);
+		assertTrue(token instanceof Token);
+		assertEquals(15, rulesBasedScanner.getTokenLength());
+		assertEquals(11, rulesBasedScanner.getTokenOffset());
+		ta = (TextAttribute) token.getData();
+		assertEquals(ta.getForeground().getRGB(),
+				ISpecfileColorConstants.AUTHOR_MAIL);
+	}
+
+	public void testVerRel() {
+		token = getToken(4);
+		assertTrue(token instanceof Token);
+		assertEquals(8, rulesBasedScanner.getTokenLength());
+		assertEquals(26, rulesBasedScanner.getTokenOffset());
+		ta = (TextAttribute) token.getData();
+		assertEquals(ta.getForeground().getRGB(),
+				ISpecfileColorConstants.VER_REL);
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/scanners/SpecfilePackagesScannerTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/scanners/SpecfilePackagesScannerTest.java
new file mode 100644
index 0000000..c9ecd69
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/scanners/SpecfilePackagesScannerTest.java
@@ -0,0 +1,128 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.tests.scanners;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.linuxtools.rpm.ui.editor.Activator;
+import org.eclipse.linuxtools.rpm.ui.editor.ColorManager;
+import org.eclipse.linuxtools.rpm.ui.editor.ISpecfileColorConstants;
+import org.eclipse.linuxtools.rpm.ui.editor.preferences.PreferenceConstants;
+import org.eclipse.linuxtools.rpm.ui.editor.scanners.SpecfilePackagesScanner;
+import org.eclipse.linuxtools.rpm.ui.editor.tests.AScannerTest;
+
+public class SpecfilePackagesScannerTest extends AScannerTest {
+
+	private IToken token;
+
+	private TextAttribute ta;
+
+	private SpecfilePackagesScanner scanner;
+
+	public SpecfilePackagesScannerTest() {
+		Activator.getDefault().getPreferenceStore().setValue(
+				PreferenceConstants.P_RPM_LIST_FILEPATH, "/tmp/pkglist");
+		Activator.getDefault().getPreferenceStore().setValue(
+				PreferenceConstants.P_RPM_LIST_BACKGROUND_BUILD, false);
+		
+		try {
+			BufferedWriter out = new BufferedWriter(new FileWriter(
+					"/tmp/pkglist"));
+			out.write("setup\ntest_underscore\n");
+			out.close();
+		} catch (IOException e) {
+			fail(e.getMessage());
+		}
+		// we ensure that proposals are rebuild
+		Activator.packagesList = null;
+		scanner = new SpecfilePackagesScanner(new ColorManager());
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.linuxtools.rpm.ui.editor.tests.AScannerTest#getContents()
+	 */
+	@Override
+	protected String getContents() {
+		return "Requires: test_underscore\n%{name}\n# Requires:\n";
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.linuxtools.rpm.ui.editor.tests.AScannerTest#getScanner()
+	 */
+	@Override
+	protected RuleBasedScanner getScanner() {
+		return scanner;
+	}
+
+	public void testPackageTag() {
+		token = getNextToken();
+		assertTrue(token instanceof Token);
+		assertEquals(9, rulesBasedScanner.getTokenLength());
+		assertEquals(0, rulesBasedScanner.getTokenOffset());
+		ta = (TextAttribute) token.getData();
+		assertEquals(ta.getForeground().getRGB(), ISpecfileColorConstants.TAGS);
+	}
+
+	/**
+	 * We test a package with a underscore. see bug:
+	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=182302 
+	 */
+	public void testPackage() {
+		try {
+			token = getToken(2);
+			assertTrue(token instanceof Token);
+			assertEquals(16, rulesBasedScanner.getTokenLength());
+			assertEquals(9, rulesBasedScanner.getTokenOffset());
+			ta = (TextAttribute) token.getData();
+			assertEquals((ta.getForeground()).getRGB(),
+					ISpecfileColorConstants.PACKAGES);
+		} catch (Exception e) {
+			fail();
+		}
+	}
+
+	public void testMacro() {
+		try {
+			token = getToken(4);
+			assertTrue(token instanceof Token);
+			assertEquals(7, rulesBasedScanner.getTokenLength());
+			assertEquals(26, rulesBasedScanner.getTokenOffset());
+			ta = (TextAttribute) token.getData();
+			assertEquals((ta.getForeground()).getRGB(),
+					ISpecfileColorConstants.MACROS);
+		} catch (Exception e) {
+			fail();
+		}
+	}
+	/**
+	 * Check that comments are not handle with the package scanner. See bug:
+	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=182302 
+	 */
+	public void testComment() {
+		token = getToken(6);
+		assertTrue(token instanceof Token);
+		assertEquals(1, rulesBasedScanner.getTokenLength());
+		ta = (TextAttribute) token.getData();
+		assertNull(ta);
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/scanners/SpecfileScannerTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/scanners/SpecfileScannerTest.java
new file mode 100644
index 0000000..c5d29bc
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/scanners/SpecfileScannerTest.java
@@ -0,0 +1,120 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.tests.scanners;
+
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.linuxtools.rpm.ui.editor.ColorManager;
+import org.eclipse.linuxtools.rpm.ui.editor.ISpecfileColorConstants;
+import org.eclipse.linuxtools.rpm.ui.editor.scanners.SpecfileScanner;
+import org.eclipse.linuxtools.rpm.ui.editor.tests.AScannerTest;
+
+public class SpecfileScannerTest extends AScannerTest {
+
+	private IToken token;
+
+	private TextAttribute ta;
+
+	private SpecfileScanner scanner;
+
+	public SpecfileScannerTest() {
+		scanner = new SpecfileScanner(new ColorManager());
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.linuxtools.rpm.ui.editor.tests.AScannerTest#getContents()
+	 */
+	@Override
+	protected String getContents() {
+		return "# This is a comment\nName: test\n%prep\n%{name}\n%define\n%if\nName=test";
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.linuxtools.rpm.ui.editor.tests.AScannerTest#getScanner()
+	 */
+	@Override
+	protected RuleBasedScanner getScanner() {
+		return scanner;
+	}
+
+	public void testComment() {
+		token = getNextToken();
+		assertTrue(token instanceof Token);
+		assertEquals(20, rulesBasedScanner.getTokenLength());
+		assertEquals(0, rulesBasedScanner.getTokenOffset());
+		ta = (TextAttribute) token.getData();
+		assertEquals(ISpecfileColorConstants.COMMENT, ta.getForeground().getRGB());
+	}
+
+	public void testTag() {
+		token = getToken(2);
+		assertTrue(token instanceof Token);
+		assertEquals(5, rulesBasedScanner.getTokenLength());
+		assertEquals(20, rulesBasedScanner.getTokenOffset());
+		ta = (TextAttribute) token.getData();
+		assertEquals(ISpecfileColorConstants.TAGS, ta.getForeground().getRGB());
+	}
+
+	public void testSection() {
+		token = getToken(9);
+		assertTrue(token instanceof Token);
+		assertEquals(5, rulesBasedScanner.getTokenLength());
+		assertEquals(31, rulesBasedScanner.getTokenOffset());
+		ta = (TextAttribute) token.getData();
+		assertEquals(ISpecfileColorConstants.SECTIONS, ta.getForeground().getRGB());
+	}
+
+	public void testMacro() {
+		token = getToken(11);
+		assertTrue(token instanceof Token);
+		assertEquals(7, rulesBasedScanner.getTokenLength());
+		assertEquals(37, rulesBasedScanner.getTokenOffset());
+		ta = (TextAttribute) token.getData();
+		assertEquals(ISpecfileColorConstants.MACROS, ta.getForeground().getRGB());
+	}
+
+	public void testDefinedMacro() {
+		token = getToken(13);
+		assertTrue(token instanceof Token);
+		assertEquals(7, rulesBasedScanner.getTokenLength());
+		assertEquals(45, rulesBasedScanner.getTokenOffset());
+		ta = (TextAttribute) token.getData();
+		assertEquals(ISpecfileColorConstants.MACROS, ta.getForeground().getRGB());
+	}
+
+	public void testKeyword() {
+		token = getToken(15);
+		assertTrue(token instanceof Token);
+		assertEquals(3, rulesBasedScanner.getTokenLength());
+		assertEquals(53, rulesBasedScanner.getTokenOffset());
+		ta = (TextAttribute) token.getData();
+		assertEquals(ISpecfileColorConstants.KEYWORDS, ta.getForeground().getRGB());
+	}
+
+	/**
+	 * Check that defines are correctly scanned. See bug:
+	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=182302 printscreen:
+	 * https://bugs.eclipse.org/bugs/attachment.cgi?id=63722
+	 */
+	public void testDefineCorreclyScanned() {
+		token = getToken(17);
+		assertTrue(token instanceof Token);
+		assertEquals(1, rulesBasedScanner.getTokenLength());
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/test.xml b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/test.xml
new file mode 100644
index 0000000..6d4dc7a
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/test.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+
+<project name="testsuite" default="junits" basedir=".">
+	<property name="classname" value="org.eclipse.linuxtools.rpm.ui.editor.tests.AllTests" />
+
+	<!-- The property ${eclipse-home} should be passed into this script -->
+	<!-- Set a meaningful default value for when it is not. -->
+	<property name="eclipse-home" value="${basedir}/../.." />
+
+	<!-- sets the properties eclipse-home, and library-file -->
+	<property name="plugin-name" value="org.eclipse.linuxtools.rpm.ui.editor.tests" />
+	<property name="library-file" value="${eclipse-home}/dropins/${subProjectName2}/plugins/org.eclipse.test/library.xml" />
+
+	<!-- This target holds all initialization code that needs to be done for -->
+	<!-- all tests that are to be run. Initialization for individual tests -->
+	<!-- should be done within the body of the suite target. -->
+	<target name="init">
+		<tstamp />
+		<delete>
+			<fileset dir="${eclipse-home}" includes="org*.xml" />
+		</delete>
+	</target>
+
+	<!-- This target defines the tests that need to be run. -->
+	<target name="suite">
+		<property name="specfile-folder" value="${eclipse-home}/specfile_folder" />
+		<delete dir="${specfile-folder}" quiet="true" />
+		<echo message="About to run ${classname} with library-file=${library-file}"/>
+		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="data-dir" value="${specfile-folder}" />
+			<property name="plugin-name" value="${plugin-name}" />
+			<property name="classname" value="${classname}" />
+		</ant>
+	</target>
+
+	<!-- This target holds code to cleanup the testing environment after -->
+	<!-- after all of the tests have been run. You can use this target to -->
+	<!-- delete temporary files that have been created. -->
+	<target name="cleanup">
+		<mkdir dir="${results}/consolelogs" />
+		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
+	</target>
+
+	<!-- This target runs the test suite. Any actions that need to happen -->
+	<!-- after all the tests have been run should go here. -->
+	<target name="junits" depends="init,suite,cleanup">
+		<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="includes" value="org*.xml" />
+			<property name="output-file" value="${plugin-name}.xml" />
+		</ant>
+	</target>
+	
+    <target name="all" depends="junits" description="Dummy target to run all JUnit tests">
+    </target>
+	
+    <target name="run" depends="junits" description="Dummy target to run all JUnit tests">
+    </target>
+
+</project>
diff --git a/profiling/.classpath b/rpm/org.eclipse.linuxtools.rpm.ui.editor/.classpath
similarity index 100%
copy from profiling/.classpath
copy to rpm/org.eclipse.linuxtools.rpm.ui.editor/.classpath
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/.cvsignore b/rpm/org.eclipse.linuxtools.rpm.ui.editor/.cvsignore
new file mode 100644
index 0000000..ba077a4
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/.cvsignore
@@ -0,0 +1 @@
+bin
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/.project b/rpm/org.eclipse.linuxtools.rpm.ui.editor/.project
new file mode 100644
index 0000000..6c30afd
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.rpm.ui.editor</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+	</natures>
+</projectDescription>
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/.settings/org.eclipse.jdt.core.prefs b/rpm/org.eclipse.linuxtools.rpm.ui.editor/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..d1a6bf5
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,83 @@
+#Wed Feb 25 14:36:15 CET 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=ignore
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/.settings/org.moreunit.prefs b/rpm/org.eclipse.linuxtools.rpm.ui.editor/.settings/org.moreunit.prefs
new file mode 100644
index 0000000..9a90b1e
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/.settings/org.moreunit.prefs
@@ -0,0 +1,5 @@
+#Tue Jan 19 00:22:12 EET 2010
+eclipse.preferences.version=1
+org.moreunit.prefixes=
+org.moreunit.unitsourcefolder=org.eclipse.linuxtools.rpm.ui.editor\:src\:org.eclipse.linuxtools.rpm.ui.editor.tests\:src
+org.moreunit.useprojectsettings=true
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/ChangeLog b/rpm/org.eclipse.linuxtools.rpm.ui.editor/ChangeLog
new file mode 100644
index 0000000..8f784b5
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/ChangeLog
@@ -0,0 +1,2594 @@
+2010-03-14  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* plugin.properties: Externalize strings.
+	* plugin.xml: Likewise.
+
+2010-03-12  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java (parseSimpleDefinition): Fix direct definitions split. (Charley Wang bz#305421)
+	
+2010-03-12  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileDoubleClickStrategy.java: Fix line ending check. (Charley Wang bz#294555)	
+
+2010-02-25  Alexander Kurtakov  <akurtako@redhat.com>
+    Add ability to download sources if they are hyperlinks.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SourcesFileDownloadHyperlink.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/Messages.java: Add more messages.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/messages.properties: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SourcesFileHyperlinkDetector.java (detectHyperlinks): Add download hyperlink.
+	(SourcesFileHyperlinkDetector): Format.
+
+2010-02-01  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java (parseDirectDefinition): Show error when missing value.
+	(parseDefine): Likewise.
+
+2010-01-29  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileElement.java (resolve): Fix StringIndexOutOfBounds.
+
+2010-01-26  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileElement.java (resolve): Fix stackoverflow when recursive define is used.
+	(SpecfileElement): Format.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java (parseDirectDefinition): Fix parsing defines without value.
+
+2010-01-25  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* plugin.xml: Fix documentProviders file extensions.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileEditor.java (SpecfileEditor): Do not set document provider, correctly done with the extension.
+
+2010-01-19  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Utils.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/UiUtils.java: New file.
+	* .settings/org.moreunit.prefs: Fix configuration.
+	* META-INF/MANIFEST.MF: Require o.e.linuxtools.rpm.core.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogFormatter.java (formatDateLine): Use Utils from core.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Activator.java (start): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/derived/HTMLTextPresenter.java (adaptTextPresentation): Remove dead variable.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/MainPackagePage.java (MainPackagePage): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/SpecfileFormEditor.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SourcesFileHyperlinkDetector.java (detectHyperlinks): Use UiUtils instead of Utils which is now in core.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/URLHyperlinkWithMacroDetector.java (detectHyperlinks): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SourceComparator.java: Implement Serializable.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java (addDefine): Use UiUtils instead of Utils which is now in core.
+	(getDefine): Likewise.
+	(modifyDefine): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileElement.java (resolve): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java (simpleSections): Make declarations final.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/MacroProposalsPreferencePage.java: Remove dead variable.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/RpmProposalsPreferencePage.java (rpmtoolsRadioGroupFieldEditor): Use UiUtils instead of Utils which is now in core.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroProposalsList.java (getMacroEval): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageBuildProposalsJob.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageProposalsList.java (getRpmInfo): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java (ProposalComparator): Implement Serializable.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileReconcilingStrategy.java (SpecfileReconcilingStrategy): Remove dead store.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/NoExecutableWizardPage.java (createControl): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizard.java: Use UiUtils instead of Utils which is now in core.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizardPage.java (setTextItem): Remove dead store.
+	(runRpmdevNewSpec): Use utils from core.
+	(createControl): Remove dead store.
+
+2010-01-18  Alexander Kurtakov  <akurtako@redhat.com>
+    Preference store should not be set to the editor if you want to inherit configurations like showing line numbers and etc.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Activator.java: Remove not needed import.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileEditor.java (SpecfileEditor): Do not set preference store. 
+
+2010-01-18  Alexander Kurtakov  <akurtako@redhat.com>
+    Switch from the current commands and actions mixture to only commands.
+	* plugin.xml: Replace all actions with commands.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileEditorOrganizePatchesActionDelegate.java : Rewrite it to be AbstractHandler.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileEditorShowOutlineActionDelegate.java: Likewise. 
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileEditorToggleCommentActionDelegate.java: Likewise. 
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Activator.java (getActiveEditor): Removed, not needed. 
+
+2010-01-18  Alexander Kurtakov  <akurtako@redhat.com>
+    Replace our custom tab-to-space implementation with org.eclipse.jface.text.TabToSpacesConverter.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileProjectionViewer.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileTabConverter.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileConfiguration.java (getAutoEditStrategies): New method.
+	(getTabSize): Likewise.
+	(isTabConversionEnabled): Likewise. 
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileEditor.java (getAdapter): Drop references to all old tab replacing code.
+	(createPartControl): Likewise.
+	(doSetInput): Likewise.
+	
+2010-01-18  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileConfiguration.java: Remove not needed member.
+
+2010-01-18  Alexander Kurtakov  <akurtako@redhat.com>
+	Use default annotation hover instead of our copied and staled one.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/derived/AnnotationHover.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileConfiguration.java (getAnnotationHover): Removed. 
+
+2010-01-07  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/derived/LineBreakingReader.java (readLine): Fix javadoc.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/Messages.java: Add copyright header.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/messages.properties: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/RpmTagText.java (RpmTagText): Externalize string.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileSection.java (getContents): Add NON-NLS.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/MacroProposalsPreferencePage.java (MacroListEditor.selectionChanged): Add @Override.
+
+2009-12-18  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java (parseSimpleDefinition): Format.
+	(parseMacro): Likewise.
+	(complexDefinitions): Likewise.
+	(parseDirectDefinition): Likewise.
+	(parseLine): Likewise.
+	(parseBuildRequire): Likewise
+	(directValuesDefinitions): Likewise
+	(parseSection): Likewise.
+	(simpleDefinitions): Remove buildroot.
+	(directDefinitions): Add buildroot.
+	
+2009-12-18  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java (parseSimpleDefinition): Remove false warning for Release tag.
+
+2009-10-28  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java (parseLine): Make sure that when trying to parse Source or Patch they are really such.
+
+2009-10-24  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java (parseDefine): %define and %global shouldn't be associated with a subpackage.
+
+2009-10-23  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/Messages.java (Messages): Fix issues found by pmd.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogParser.java (parseCurrentFunction): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Activator.java (Activator): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/compare/Messages.java (Messages): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/detectors/IStrictWordDetector.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/Messages.java (Messages): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/SpecfileFormEditor.java (SpecfileFormEditor): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/Messages.java (Messages): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SourcesFileHyperlinkDetector.java (detectHyperlinks): Likewise.
+	(SourcesFileHyperlinkDetector): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SpecfileElementHyperlinkDetector.java (SpecfileElementHyperlinkDetector): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Messages.java (Messages): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/outline/Messages.java (Messages): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/outline/SpecfileContentProvider.java (getChildren): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/outline/SpecfileLabelProvider.java (addListener): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/Messages.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileDefine.java (SpecfileDefine): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileElement.java (resolve): Likewise.
+	(setName): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePackage.java (setPackageName): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePackageContainer.java (getLineEndPosition): Likewise.
+	(SpecfilePackageContainer): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileTag.java (toString): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/MacroProposalsPreferencePage.java (MacroListEditor.MacroListEditor): Likewise.
+	(MacroListEditor.getListControl): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/Messages.java (Messages): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/PreferenceConstants.java (PreferenceConstants): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/SpecTemplatePreferencePage.java (performOk): Likewise.
+	(SpecTemplatePreferencePage): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/TaskTagsPreferencePage.java (TasksListEditor.parseString): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroProposalsList.java (buildMacroList): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageBuildProposalsJob.java (update): Likewise.
+	(setPropertyChangeListener): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/rules/AuthorEmailRule.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/rules/StringWithEndingRule.java (StringWithEndingRule): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/rules/VersionReleaseRule.java (evaluate): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfileChangelogScanner.java (SpecfileChangelogScanner): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfilePackagesScanner.java (SpecfilePackagesScanner): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfilePartitionScanner.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfileScanner.java (SpecfileScanner): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java (computeTemplateProposals): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileConfiguration.java (SpecfileConfiguration): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileDocumentProvider.java (getDocument): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileEditor.java (getParser): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileFoldingStructureProvider.java (updateFoldingRegions): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileLog.java (SpecfileLog): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileProjectionViewer.java (doOperation): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileReconcilingStrategy.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/Messages.java (Messages): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizardPage.java (setDefaultValues): Likewise.
+	(getContent): Likewise.
+	(.modifyText): Likewise.
+	(createControl): Likewise.
+
+2009-10-22  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileEditor.java (setSpecfile): Remove parts that are autodone in 3.5.
+
+2009-08-12  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/NoExecutableWizardPage.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/Messages.java: Aditional string for NoExecutableWizardPage.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/messages.properties: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizard.java (performFinish): Format.
+	(addPages): Conditionalize pages added.
+	(throwCoreException): Format.
+	(doFinish): Likewise.
+	(.run): Likewise.
+
+2009-08-07  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* plugin.properties: Fix provider to be Eclipse not Eclipse.org.
+
+2009-07-08  Alphonse Van Assche  <alcapcom@fedoraproject.org>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfileChangelogScanner.java (SpecfileChangelogScanner): Don't do unneeded stuff.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfilePackagesScanner.java: Remove unneded code + typo cleanups.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfilePartitionScanner.java: Use private static final + typo.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfileScanner.java: : Likewike.
+
+2009-07-07  Alphonse Van Assche  <alcapcom@fedoraproject.org>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageBuildProposalsJob.java: Remove unneeded comments (we target 3.5 now).
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogAction.java: Removed unused action.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/Messages.java: Remove no more needed messages.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogFormatter.java (formatDateLine): Resolve defines on the right place.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SpecfileElementHyperlinkDetector.java (getDefineName): Fix null pointer exception.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileElement.java (resolve): Use of Utils.resolveDefines
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileHover.java (findWord): Fix hover bug on specfiles that begin with a define.
+	(getHoverRegion): Use better var name.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Utils.java: Typo cleanups.
+
+2009-06-16  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/RpmSectionPage.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/SpecfileFormEditor.java (addPages): Add pages for %prep/%build/%install.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java (getSection): Add method for getting a section by name.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileSection.java (setContents): New method for changing contents of the section.
+	(getContents): New method for retrieving the content of the section.
+
+2009-06-04  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/Messages.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/messages.properties: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Activator.java: Removed double ;.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/MainPackagePage.java (createFormContent): Externalize strings. 
+	(MainPackagePage): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/SpecfileFormEditor.java (addPages): Likewise.
+
+2009-06-03  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileTag.java (setTagType): Remove it is auto handled now. 
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java (parseSimpleDefinition): Do not set tag type it's auto set now.
+
+2009-06-03  Alexander Kurtakov  <akurtako@redhat.com>
+	Support BuildRequires/Requires in the form editor and parser.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/MainPackagePage.java (createFormContent): Add BuildRequires/Requires fields.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/RpmTagText.java (.modifyText): New constructor.
+	(RpmTagText): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java (addRequire): Add BuildRequires/Requires fields.
+	(getRequires): Likewise.
+	(getBuildRequires): Likewise.
+	(addBuildRequire): Likewise.
+	(Specfile): Likewise.
+	(modifyDefine): New method.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileElement.java (resolve): Remove not needed try/catch.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePackage.java (addRequire): Add requires member and accessors.
+	(SpecfilePackage): Likewise.
+	(getRequires): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java (parseSimpleDefinition): Use constants.
+	(parseDirectDefinition): Likewise.
+	(parseLine): Support Requires parsing.
+	(parseComplexDefinition): Use constants.
+	(parseBuildRequire): New method.
+
+2009-05-29  Alexander Kurtakov  <akurtako@redhat.com>
+	Remove deprecated Preferences usage.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/PreferenceConstants.java: Correct constant types.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/SpecTemplatePreferencePage.java (performOk): Don't use deprecated Preferences.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageBuildProposalsJob.java (update): Likewise.
+	(.preferenceChange): Likewise.
+	(setPropertyChangeListener): Likewise.
+
+2009-05-26  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java (getBuildRequires): Add buildrequires member.
+	(setBuildRequires): Likewise. 
+	(Specfile): Likewise.
+	(modifyDefine): Add NON-NLS.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageBuildProposalsJob.java (retrievePackageList): Guard /bin/sh execution.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageProposalsList.java (setPackagesList): Read .pkglist only when available.
+
+2009-05-20  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/RpmTagText.java (RpmTagText): Fix defines handling.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java (parseSimpleDefinition): Support BuildArch and BuildRoot.
+	(parseLine): Likewisel
+	(simpleDefinitions): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileTag.java (setValue): Set correct type.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Utils.java (getPackageDefineId): Fix lower casing.
+
+2009-05-19  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java (modifyDefine): Adapt to SpecfileTag API simplification.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileDefine.java (SpecfileDefine): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java (parseSimpleDefinition): Likewise.
+	(packageLevelDefinitions): Remove fixed todo.
+	(parseSection): Remove unneeded cast.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileTag.java (setValue): Simplify API.
+	
+2009-05-19  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/MainPackagePage.java (createFormContent): Put more meaningful names. 
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/RpmTagText.java (.modifyText): Support for package specific tags.
+	(RpmTagText): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java (addDefine): Likewise.
+	(getDefine): Likewise.
+	(modifyDefine): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileDefine.java (SpecfileDefine): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePackage.java (isMainPackage): Utility method to determine the main package.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java (parseSimpleDefinition): Suppport for package specific tags.
+	(packageLevelDefinitions): Likewise.
+	(parseDirectDefinition): Likewise.
+	(parseDefine): Likewise.
+	(parseLine): Likewise.
+	(simpleDefinitions): Likewise.
+	(parseSection): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileTag.java (setParent): Likewise.
+	(getParent): Likewise.
+	(SpecfileTag): Likewise.
+	(getIntValue): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmTags.java: Add missing tags.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Utils.java (getPackageDefineId): Method to create a package specific define id.
+	
+2009-05-19  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePackage.java (getGroup): Add group and summary fields and accessors.
+	(getSummary): Likewise.
+	(setGroup): Likewise.
+	(setSummary): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java (parseSimpleDefinition): Fix NON-NLS.
+	(parseDefine): Likewise.
+	(parseComplexDefinition): Likewise. 
+	(parsePatch): Likewise.
+	(parseSection): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileProjectionViewer.java (removeTextConverter): Use IAutoEditStrategy instead of our own interface.
+	(customizeDocumentCommand): Likewise.
+	(addTextConverter): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileTabConverter.java: Likewise.
+	
+2009-05-19  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/MainPackagePage.java (createFormContent): Show fields for subpackages Summary and Group.
+
+2009-05-18  Alexander Kurtakov  <akurtako@redhat.com>
+	Initial support for subpackages in the form editor. Only names for now.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/MainPackagePage.java (createFormContent): Display sections for all the subpackages.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePackage.java (getFullPackageName): New method for returning the full name of a package.
+
+2009-05-17  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/MainPackagePage.java (createFormContent): Simplify.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/RpmTagText.java (.modifyText): Make the text responsible for all the data.
+	(RpmTagText): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/SpecfileFormEditor.java (doSaveAs): Add comment. 
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java (getDefine): Make sure that define name is lower case.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java (parseSimpleDefinition): Extract constant.
+	(parseDefine): Likewise.
+	(parseComplexDefinition): Likewise.
+	(parsePatch): Likewise.
+	(parseSection): Likewise.
+
+2009-05-14  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/RpmTagText.java: New file. Add Copyright header.
+	* META-INF/MANIFEST.MF: Bump release.
+
+2009-05-13  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/MainPackagePage.java (createFormContent): Remove commented code. 
+	(.modifyText): Connect with the document.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/SpecfileFormEditor.java (addPages): Remove all dirty handling.
+	(isDirty): Likewise.
+	(doSave): Likewise.
+	(SpecfileFormEditor): Likewise. 
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java (modifyDefine): Useful method for manipulating define's value.
+
+2009-05-08  Alphonse Van Assche <alcapcom@fedoraproject.org>
+	Remove 'No value name after define.' parsing error, this error is now 
+	throw by RPM parser through rpmlint.
+	
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java: Remove no more needed code. 
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/message.properties Remove above message string.
+
+2009-05-06  Alphonse Van Assche <alcapcom@fedoraproject.org>
+    Convert tab by space (https://bugs.eclipse.org/bugs/show_bug.cgi?id=185227)
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileProjectionViewer.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileTabConverter.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/MainPreferencePage.java: Add a checkbox.  
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/PreferenceConstants.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/PreferenceInitializer.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/Messages.java: Externalize strings.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/messages.properties: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileEditor.java: add convert tab by space capability.
+
+2009-04-15  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* .project: Add apianalysis nature.
+	* plugin.properties: Better name.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/MainPackagePage.java (createFormContent): Clean old code. 
+	(MainPackagePage): Likewise.
+	(.modifyText): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/SpecfileFormEditor.java (addPages): Likewise.
+	(isDirty): Likewise.
+	(doSaveAs): Likewise.
+	(doSave): Likewise.
+	(SpecfileFormEditor): Likewise.
+	(createToolkit): Likewise.
+
+2009-03-28  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/compare/SpecStructureCreator.java (parseSpecfile): User correct section borders.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java (parseSimpleDefinition): Format.
+	(complexSections): Likewise.
+	(complexDefinitions): Likewise.
+	(parseMacro): Set section boundaries.
+	(generateTaskMarker): Format.
+	(parseDefine): Likewise.
+	(parseComplexDefinition): Likewise.
+	(parsePatch): Likewise.
+	(errorHandler): Likewise.
+	(simpleDefinitions): Likewise.
+	(directValuesDefinitions): Likewise.
+	(parseSection): Set section boundaries.
+	(parseDirectDefinition): Format.
+	(parseLine): Likewise.
+	(simpleSections): Likewise.
+	(parse): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileSection.java (getPackageName): Format.
+	(SpecfileSection): Likewise.
+	(setSectionEndLine): Store end line.
+	(getSectionEndLine): Likewise.
+
+2009-03-17  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java (parse): Fix NPE, generateTaskMarker only when taskHandler is present.
+
+2009-03-07  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogAction.java (run): Remove empty lines.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileEditorOrganizePatchesActionDelegate.java: Remove notneeded constructor.
+
+2009-03-04  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* .settings/org.moreunit.prefs: Fix template.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogFormatter.java (formatTodaysDate): Make format a constant.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java (getVersion): Return default value.
+	(getRelease): Likewise.
+
+2009-02-27  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/rules/TagRule.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SourcesFileHyperlink.java: Log error.
+
+2009-02-25  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SpecfileElementHyperlink.java (open): Log error.
+	(getSource): New method.
+	
+2009-02-25  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* .settings/org.eclipse.jdt.core.prefs: Enable warning for not used parameters.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogAction.java (createChangelogEntry): Drop unused parameter.
+	(run): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SpecfileElementHyperlinkDetector.java (prepareHyperlink): Likewise.
+	(detectHyperlinks): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java (parseMacro): Likewise.
+	(parseLine): Likewise.
+	(parseComplexDefinition): Likewise. 
+	(parsePatch): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java (computeSourcesProposals): Likewise.
+	(computePatchesProposals): Likewise.
+	(computeCompletionProposals): Likewise.
+	(computeRpmGroupProposals): Likewise.
+	(computeRpmPackageProposals): Likewise.
+	(computeRpmMacroProposals): Likewise.
+	
+	2009-02-25  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java (Specfile): Removed, not needed.
+	(addDefine): Likewise. 
+	(setSources): Likewise.
+	(getDefines): Renamed from getDefinesAsList.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroOccurrencesUpdater.java (getMacros): Adapt to Specfile API changes.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java (getDefines): Likewise.
+
+2009-02-22  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/compare/Messages.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/compare/messages.properties: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/compare/SpecMergeViewer.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/compare/SpecMergeViewerCreator.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/compare/SpecStructureCreator.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/compare/SpecStructureMergeViewerCreator.java: New file.
+	* META-INF/MANIFEST.MF: Add dependenci to org.eclipse.compare.
+	* plugin.xml: Add compare extensions.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/MainPackagePage.java (createFormContent): Add final qualifier.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfilePartitionScanner.java: Add SPEC_FILE_PARTITIONING constant.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileConfiguration.java (getDoubleClickStrategy): Add javadoc.
+	(getConfiguredContentTypes): Likewise.
+
+2009-02-19  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/MacroProposalsPreferencePage.java: Fix copyright.
+
+2009-02-19  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/MacroProposalsPreferencePage.java (MacroListEditor.selectionChanged): Fix compilation with Eclipse 3.5 M5.
+
+2009-02-18  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/MainPackagePage.java (replaceTagValue): Try to save changes.
+	(createFormContent): Likewise.
+	(MainPackagePage): Likewise.
+	(.modifyText): Likewise.
+	
+2009-02-18  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java (parseMacro): Add suppport for %global.
+	(parseDefine): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfileScanner.java (DEFINED_MACROS): Likewise.
+
+2009-02-16  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Utils.java (pluginSanityCheck): Add check for rpmdev-setuptree existence.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfilePartitioner.java: Remove unneeded method.
+
+2009-02-12  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java: Fix completion for groups.
+
+2009-02-10  Alexander Kurtakov  <akurtako@redhat.com>
+	Fix for specfile defines without line number and simplification.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/MainPackagePage.java (createFormContent): Put modify listener.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java (getVersion): Simplify tags handling by auto creating defines for them.
+	(getEpoch): Likewise.
+	(addDefine): Likewise.
+	(getRelease): Likewise.
+	(getName): Likewise.
+	(getLicense): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileDefine.java (SpecfileDefine): Create define from tag.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java (parse): Simplify tags handling.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileTag.java (SpecfileTag): Add empty constructor.
+
+2009-02-09  Alexander Kurtakov  <akurtako@redhat.com>
+	Initial version of a form based editor.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/MainPackagePage.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/forms/SpecfileFormEditor.java: New file.
+	* META-INF/MANIFEST.MF: Add dependency on ui.forms.
+	* plugin.xml: Add form based editor.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java (organizePatches): Replace get[Sources|Patches]AsList with simple get[Sources|Patches] 
+	(getSources): Likewise.
+	(getPatches): Likewise.
+	(setEpoch): Use constants for RPM tags.
+	(setVersion): Likewise.
+	(setName): Likewise.
+	(setRelease): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java (parse): Set summary.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java (getSources): Replace get[Sources|Patches]AsList with simple get[Sources|Patches] 
+	(getPatches): Likewise.
+
+2009-02-06  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/outline/SpecfileContentProvider.java (getChildren): Remove methods that return array.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java (getSections): Likewise.
+	(getComplexSections): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java (getContextType): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileFoldingStructureProvider.java (createFoldingStructure): Likewise.
+	
+2009-02-06  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroProposalsList.java (getMacroEval): Use utils for command invocation.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageBuildProposalsJob.java (retrievePackageList): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageProposalsList.java (getRpmInfo): Likewise
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Utils.java (runCommandToInputStream): Make it vararg.
+	(runCommandToString): Likewise.
+	(pluginSanityCheck): Execute directly.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizardPage.java (runRpmdevNewSpec): Use utils for command invocation.
+
+2009-02-02  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/ISpecfileSpecialSymbols.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/rules/CommentRule.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/rules/MacroRule.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileEditorToggleCommentActionDelegate.java (linesContentCommentChar): Use constant.
+	(run): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SpecfileElementHyperlinkDetector.java (getDefineName): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java (generateTaskMarker): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfilePackagesScanner.java (SpecfilePackagesScanner): Use specialized rules.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfilePartitionScanner.java (SpecfilePartitionScanner): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfileScanner.java (SpecfileScanner): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java (getSources): Use constants.
+	(computeRpmMacroProposals): Use constants.
+	
+2009-02-02  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizardPage.java (SpecfileNewWizardPage): Fix javadoc.
+	* .classpath: Make classpath entry refer to J2SE-1.5.
+
+2009-01-28  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogAction.java (createChangelogEntry): Fix NON-NLS after externalizing.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/RpmProposalsPreferencePage.java (buildTimeListRateFieldEditor): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/TaskTagsPreferencePage.java (TasksListEditor.getNewInputObject): LIkewise.
+	
+2009-01-28  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/Messages.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/messages.properties: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/Messages.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/messages.properties: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Messages.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/messages.properties: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/outline/Messages.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/outline/messages.properties: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/Messages.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/messages.properties: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/Messages.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/messages.properties: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/Messages.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/messages.properties: New file.
+	* build.properties: Externalize strings, add copyright year.
+	* plugin.properties: Likewise.
+	* plugin.xml: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogAction.java (createChangelogEntry): Likewise.
+	(run): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogFormatter.java (mergeChangelog): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogParser.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileEditorOrganizePatchesActionDelegate.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileEditorToggleCommentActionDelegate.java (run): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Activator.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/ColorManager.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/derived/AnnotationHover.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/derived/HTML2TextReader.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/derived/HTMLTextPresenter.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/derived/LineBreakingReader.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/derived/SingleCharReader.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/derived/SubstitutionTextReader.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/detectors/IStrictWordDetector.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/detectors/KeywordWordDetector.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/detectors/MacroWordDetector.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/detectors/PatchNumberDetector.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/detectors/SuffixNumberDetector.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/detectors/TagWordDetector.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SourcesFileHyperlink.java (getHyperlinkText): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SourcesFileHyperlinkDetector.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SpecfileElementHyperlinkDetector.java (getDefineName): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/ISpecfileColorConstants.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/markers/SpecfileErrorHandler.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/markers/SpecfileMarkerHandler.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/markers/SpecfileTaskHandler.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/NonRuleBasedDamagerRepairer.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/outline/SpecfileContentOutlinePage.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/outline/SpecfileContentProvider.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/outline/SpecfileLabelProvider.java (getText): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SourceComparator.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileDefine.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileElement.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileMacro.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePackage.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePackageContainer.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParseException.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java (parseSimpleDefinition): Likewise.
+	(parseDefine): Likewise.
+	(parseComplexDefinition): Likewise.
+	(parsePatch): Likewise.
+	(parseSection): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePatchMacro.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePreamble.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileSection.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileSource.java (changeDeclaration): Likewise.
+	(changeReferences): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileTag.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/MacroProposalsPreferencePage.java (MacroListEditor.createButtons): Likewise.
+	(createFieldEditors): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/MainPreferencePage.java (changelogEntryFormatFieldEditor): Likewise.
+	(createContents): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/RpmInformationsPreferencePage.java (createFieldEditors): Likewise.
+	(maxProposalsIntegerFieldEditor): Likewise.
+	(RpmInformationsPreferencePage): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/RpmProposalsPreferencePage.java (rpmtoolsRadioGroupFieldEditor): Likewise.
+	(createFieldEditors): Likewise.
+	(buildTimeListRateFieldEditor): Likewise.
+	(createContents): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/TaskTagsPreferencePage.java (TasksListEditor.getNewInputObject): Likewise.
+	(createFieldEditors): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroProposalsList.java (buildMacroList): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageBuildProposalsJob.java (retrievePackageList): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageProposalsList.java (getProposals): Likewise.
+	(getRpmInfo): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmTags.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/rules/AuthorEmailRule.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/rules/SectionRule.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/rules/StringWithEndingRule.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/rules/TagRule.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/rules/VersionReleaseRule.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfileChangelogScanner.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfilePartitionScanner.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfileScanner.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileConfiguration.java (getContentAssistant): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileDoubleClickStrategy.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileEditor.java (createActions): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileEditorMessages.properties: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileHover.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileLog.java (logError): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfilePartitioner.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileReconcilingStrategy.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizard.java (performFinish): Likewise.
+	(doFinish): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizardPage.java (dialogChanged): Likewise.
+	(populateTemplateCombo): Likewise.
+	(SpecfileNewWizardPage): Likewise.
+	(handleBrowse): Likewise.
+	(createControl): Likewise.
+	* templates/templates.xml: Likewise.
+
+2009-01-22  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Activator.java (getRpmPackageList): Add missing NON-NLS.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizard.java (throwCoreException): Use the constant for plugin id.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizardPage.java (throwCoreException): Likewise.
+
+2009-01-21  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* .settings/org.eclipse.jdt.core.prefs: Enable warnings for non externalized strings.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogAction.java (createChangelogEntry): Add missing NON-NLS.
+	(run): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogFormatter.java (mergeChangelog): Likewise.
+	(formatDateLine): Likewise.
+	(formatTodaysDate): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogParser.java (parseCurrentFunction): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileEditorToggleCommentActionDelegate.java (linesContentCommentChar): Likewise.
+	(run): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Activator.java (getContextTypeRegistry): Likewise.
+	(getTemplateStore): Likewise.
+	(.accept): Likewise.
+	(getRpmGroups): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/derived/HTML2TextReader.java (html2Text): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/MailHyperlinkDetector.java (detectHyperlinks): Likewise.
+	(getBody): Likewise.
+	(getSubject): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SourcesFileHyperlink.java (open): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SourcesFileHyperlinkDetector.java (detectHyperlinks): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SpecfileElementHyperlinkDetector.java (detectHyperlinks): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/markers/SpecfileErrorHandler.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/markers/SpecfileTaskHandler.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/outline/SpecfileContentProvider.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/outline/SpecfileLabelProvider.java (getText): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java (setEpoch): Likewise.
+	(setVersion): Likewise.
+	(setName): Likewise.
+	(setRelease): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileElement.java (resolve): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePackage.java (SpecfilePackage): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java (parseSimpleDefinition): Likewise.
+	(parseMacro): Likewise.
+	(parseDirectDefinition): Likewise.
+	(generateTaskMarker): Likewise.
+	(parseDefine): Likewise.
+	(parseLine): Likewise.
+	(parseComplexDefinition): Likewise.
+	(parsePatch): Likewise.
+	(parse): Likewise.
+	(parseSection): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePatchMacro.java (toString): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileSection.java (toString): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileSource.java (changeDeclaration): Likewise.
+	(toString): Likewise.
+	(SpecfileSource): Likewise.
+	(changeReferences): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileTag.java (toString): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/MacroProposalsPreferencePage.java (MacroListEditor.createList): Likewise.
+	(MacroListEditor.parseString): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/MainPreferencePage.java (.widgetSelected): Likewise.
+	(createLocalesCombo): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/PreferenceConstants.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/RpmProposalsPreferencePage.java (rpmtoolsRadioGroupFieldEditor): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/TaskTagsPreferencePage.java (TasksListEditor.parseString): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroOccurrencesUpdater.java (update): Likewise.
+	(isMacro): Likewise.
+	(getWordAtSelection): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroProposalsList.java (getValue): Likewise.
+	(getProposals): Likewise.
+	(addMacroToMap): Likewise.
+	(buildMacroList): Likewise.
+	(getMacroEval): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageBuildProposalsJob.java (retrievePackageList): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageProposalsList.java (getRpmInfo): Likewise.
+	(getformattedRpmInformations): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmSections.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmTags.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/rules/TagRule.java (TagRule): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfileChangelogScanner.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfilePackagesScanner.java (SpecfilePackagesScanner): Likewise.
+	(PACKAGES_TAGS): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfilePartitionScanner.java (SpecfilePartitionScanner): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfileScanner.java (keywords): Likewise.
+	(SpecfileScanner): Likewise.
+	(DEFINED_MACROS): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java (getSources): Likewise.
+	(computeTemplateProposals): Likewise.
+	(getDefines): Likewise.
+	(getPatches): Likewise.
+	(getPrefix): Likewise.
+	(computeRpmMacroProposals): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileEditor.java (SpecfileEditor): Likewise.
+	(getResourceBundle): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileHover.java (getSourceOrPatchValue): Likewise.
+	(getMacroValueFromMacroList): Likewise.
+	(getHoverInfo): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfilePartitioner.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Utils.java (inputStreamToString): Likewise.
+	(pluginSanityCheck): Likewise.
+	(resolveDefines): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizard.java (throwCoreException): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizardPage.java (setTemplateTagValue): Likewise.
+	(dialogChanged): Likewise.
+	(populateTemplateCombo): Likewise.
+	(getContent): Likewise.
+	(throwCoreException): Likewise.
+	(.modifyText): Likewise.
+	(runRpmdevNewSpec): Likewise.
+	(getFileName): Likewise.
+
+2009-01-15  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* .settings/org.eclipse.jdt.core.prefs: Enable validity javadoc warnings.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Activator.java 
+	(getImage): Fix javadoc.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SourcesFileHyperlink.java 
+	(SourcesFileHyperlink): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java 
+	(setEpoch): Likewise.
+	(setVersion): Likewise.
+	(setName): Likewise.
+	(setRelease): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/MacroProposalsPreferencePage.java 
+	(MacroListEditor.getButtonBoxControl): Likewise.
+	(MacroListEditor.getListControl): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroOccurrencesUpdater.java 
+	(update): Likewise.
+	(RpmMacroOccurrencesUpdater): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroProposalsList.java 
+	(getValue): Likewise.
+	(getProposals): Likewise.
+	(findKey): Likewise.
+	(getMacroEval): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileLog.java 
+	(logInfo): Likewise.
+	(logError): Likewise.
+	(log): Likewise.
+	(createStatus): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Utils.java 
+	(resolveDefines): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizardPage.java 
+	(SpecfileNewWizardPage): Likewise.
+
+2009-01-14  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add back qualifier for trunk.
+	
+2009-01-14  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* META-INF/MANIFEST.MF: Bump release for Linuxtools 0.1 release.
+
+2009-01-14  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileDocumentProvider.java 
+	(getDocument): Create new partitioner and connect it only if we are going to set it to the document.
+	Should fix #260868.
+
+2009-01-12  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* .settings/org.moreunit.prefs: New file. Set tests projects as the tests provider for moreunit users.
+	* META-INF/MANIFEST.MF: Add qualifier to version.
+
+2009-01-09  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogFormatter.java 
+	(mergeChangelog): Fix 260446.
+
+2009-01-06  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* META-INF/MANIFEST.MF: Bump release to 0.4.1.
+
+2008-12-11  Alexander Kurtakov  <akurtakov@gmail.com>
+	Fix #255760.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Activator.java 
+	(rpmGroups): New member to store rpm groups.
+	(getRpmGroups): Fetch rpm groups from the system file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfilePartitionScanner.java 
+	(SpecfilePartitionScanner): Initialize spec_group token.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java 
+	(computeCompletionProposals): Add special handling for rpm groups proposals.
+	(computeRpmGroupProposals): Compute rpm group proposals.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileConfiguration.java 
+	(getContentAssistant): Add support for rpm group partition.
+	(getPresentationReconciler): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizardPage.java 
+	(populateGroupCombo): Use Activator's method for fetching groups. 
+	(createControl): Remove unneeded exception.
+
+2008-12-04  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmTags.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java: Use constants from RpmTags.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/RpmInformationsPreferencePage.java 
+	(createFieldEditors): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmSections.java: Make it interface.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfileScanner.java 
+	(TAGS): Use constants from RpmTags.
+	(SpecfileScanner): Likewise.
+
+2008-12-02  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* plugin.xml: Add extension to the document provider.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfilePartitionScanner.java 
+	(SpecfilePartitionScanner): Use section constants.
+
+2008-11-30  Alexander Kurtakov  <akurtakov@gmail.com>
+	Use foreach to make code more readable.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogAction.java 
+	(run): Use foreach to make code more readable.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogFormatter.java 
+	(mergeChangelog): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/outline/ContainsFilter.java 
+	(hasUnfilteredChild): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java 
+	(parseMacro): Likewise.
+	(parseLine): Likewise.
+	(parseSection): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroProposalsList.java 
+	(buildMacroList): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfileChangelogScanner.java 
+	(SpecfileChangelogScanner): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfilePackagesScanner.java 
+	(SpecfilePackagesScanner): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfilePartitionScanner.java 
+	(SpecfilePartitionScanner): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfileScanner.java 
+	(SpecfileScanner): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java 
+	(computeTemplateProposals): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfilePartitioner.java 
+	(printPartitions): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizardPage.java 
+	(populateTemplateCombo): Likewise.
+
+2008-11-29  Alexander Kurtakov  <akurtakov@gmail.com>
+	Cleanup derived classed to not show so many warnings.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/derived/AnnotationHover.java 
+	(getAnnotations): Generify.
+	(computeCoverage): Likewise.
+	(select): Likewise.
+	(getHoverRegion): Likewise.
+	(getHoverInfo): Likewise.
+	(formatMultipleMessages): Likewise. 
+	(computeHoverMessage): 
+	* src/org/eclipse/linuxtools/rpm/ui/editor/derived/HTML2TextReader.java 
+	(computeSubstitution): Add @Override.
+	(entity2Text): Remove unneeded cast.
+	(static initializer): Generify.
+	(read): Add @Override.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/derived/HTMLTextPresenter.java 
+	(adaptTextPresentation): Generify.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/derived/SingleCharReader.java 
+	(read): Add @Override.
+	(ready): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/derived/SubstitutionTextReader.java 
+	(reset): Likewise.
+	(read): Likewise.
+	(ready): Likewise.
+	(close): Likewise.
+
+2008-11-29  Alexander Kurtakov  <akurtakov@gmail.com>
+	Removed unused classes.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/detectors/SpecfileWhitespaceDetector.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfileTagScanner.java: Removed.
+
+2008-11-29  Alexander Kurtakov  <akurtakov@gmail.com>
+	Move SpecfileTagScanner to scanners package and remove wrong todos.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileTagScanner.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfileTagScanner.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/detectors/KeywordWordDetector.java 
+	(isWordStart): Removed wrong auto generated todo.
+	(isWordPart): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/detectors/TagWordDetector.java 
+	(isWordStart): Likewise.
+	(isWordPart): Likewise.
+
+2008-11-29  Alexander Kurtakov  <akurtakov@gmail.com>
+	Move SpecfileScanner and SpecfileCompletionProcessor to correct packages.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfileCompletionProcessor.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileScanner.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfileScanner.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroProposalsList.java: Adopt imports.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileConfiguration.java: Adopt imports.
+
+2008-11-28  Alexander Kurtakov  <akurtakov@gmail.com>
+	Extract detectors, rules and scanners packages.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/AuthorEmailRule.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/IStrictWordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/KeywordWordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/MacroWordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/PackageWordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/PatchNumberDetector.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SectionRule.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileChangelogScanner.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfilePackagesScanner.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfilePartitionScanner.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileWhitespaceDetector.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/StringWithEndingRule.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SuffixNumberDetector.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/TagRule.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/TagWordDetector.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/VersionReleaseRule.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/detectors/IStrictWordDetector.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/detectors/KeywordWordDetector.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/detectors/MacroWordDetector.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/detectors/PackageWordDetector.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/detectors/PatchNumberDetector.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/detectors/SpecfileWhitespaceDetector.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/detectors/SuffixNumberDetector.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/detectors/TagWordDetector.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/rules/AuthorEmailRule.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/rules/SectionRule.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/rules/StringWithEndingRule.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/rules/TagRule.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/rules/VersionReleaseRule.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfileChangelogScanner.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfileCompletionProcessor.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfilePackagesScanner.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfilePartitionScanner.java: New file.
+	* META-INF/MANIFEST.MF: Export scanners package.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogAction.java: Adapt imports to the moved classes.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogFormatter.java: Likewise
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileConfiguration.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileDocumentProvider.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileScanner.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileEditor.java (getInputDocument): Make it public to allow tests compilation.
+
+2008-11-27  Alexander Kurtakov  <akurtakov@gmail.com>
+	Use Java 5 apis.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogAction.java 
+	(run): Use StringBuilder.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogFormatter.java 
+	(mergeChangelog): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileEditorToggleCommentActionDelegate.java 
+	(run): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/AuthorEmailRule.java 
+	(unreadBuffer): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java 
+	(getComplexSectionsElements): Removed - not needed.
+	(getSectionsElements): Likewise.
+	(getSections): Returns SpecfileElement[].
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/MacroProposalsPreferencePage.java 
+	(MacroListEditor.createList): Use StringBuilder.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroProposalsList.java 
+	(getMacroEval): Use ProcessBuilder instead of Runtime.exec.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageBuildProposalsJob.java 
+	(retrievePackageList): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageProposalsList.java 
+	(getRpmInfo): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SectionRule.java 
+	(unreadBuffer): Use StringBuilder.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java 
+	(getContextType): Fix for Specfile method renaming.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileFoldingStructureProvider.java 
+	(addFoldingRegions): Remove not thrown Exception.
+	(updateFoldingRegions): Likewise.
+	(createFoldingStructure): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfilePartitioner.java 
+	(printPartitions): Use StringBuilder.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/StringWithEndingRule.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/VersionReleaseRule.java 
+	(VersionReleaseRule): Likewise.
+	(unreadBuffer): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizardPage.java 
+	(runRpmdevNewSpec): Use ProcessBuilder.
+
+2008-11-27  Alexander Kurtakov  <akurtakov@gmail.com>
+	Simplify API and cleanup.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/markers/SpecfileErrorHandler.java 
+	(handleError): Remove unneeded return.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/markers/SpecfileMarkerHandler.java 
+	(getCharOffset): Remove unneeded Integer.valueOf.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/markers/SpecfileTaskHandler.java
+	(handleTask): Remove unneeded return. 
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java 
+	(getComplexSections): Removed.
+	(getDefinesAsArray): Likewise.
+	(getPatchesAsArray): Likewise.
+	(getSourcesAsArray): Likewise.
+	(getDefinesAsList): Really return List.
+	(getPatchesAsList): Likewise.
+	(organizePatches): Remove commented debug code.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroOccurrencesUpdater.java 
+	(getMacros): Generify.
+	(isMacro): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java 
+	(computeSourcesProposals): Use List insteda of array.
+	(computeTemplateProposals): Likewise.
+	(computePatchesProposals): Likewise.
+	(computeCompletionProposals): Likewise.
+	(computeRpmPackageProposals): Likewise.
+	(computeRpmMacroProposals): Likewise.
+
+2008-11-26  Alexander Kurtakov  <akurtakov@gmail.com>
+	Move marker handlers to a separate package and extract base class.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileErrorHandler.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileTaskHandler.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/markers/SpecfileErrorHandler.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/markers/SpecfileMarkerHandler.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/markers/SpecfileTaskHandler.java: New file.
+	* META-INF/MANIFEST.MF: Export org.eclipse.linuxtools.rpm.ui.editor.markers package.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java 
+	(parse): Clean task markers when parsing.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/TaskTagsPreferencePage.java 
+	(createContents): Removed method that just calls super. 
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileEditor.java: Fix imports.
+
+2008-11-25  Alexander Kurtakov  <akurtakov@gmail.com>
+	Fix #255412.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/TaskTagsPreferencePage.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileTaskHandler.java: New file.
+	* plugin.xml: Add preference page and marker for tasks.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java 
+	(SpecfileParser): Store a IPreferenceStore in a member.
+	(setTaskHandler): Set the SpecfileTaskHandler.
+	(generateTaskMarker): Generate task marker when needed.
+	(parse): Invoke generateTaskMarker to check for task markers.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/PreferenceConstants.java 
+	(DP_TASK_TAGS): Initial value.
+	(P_TASK_TAGS): Task tags key.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/PreferenceInitializer.java 
+	(initializeDefaultPreferences): Initialize task tags.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileEditor.java 
+	(validateAndMark): Set the task tags handler.
+
+2008-11-19  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* .settings/org.eclipse.jdt.core.prefs: Enable more warnings.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java: Commented unneeded var. 
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizardPage.java 
+	(handleBrowse): Use constant from the defining class.
+
+2008-11-11  Alexander Kurtakov  <akurtakov@gmail.com>
+	Fix #254925.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SpecfileElementHyperlinkDetector.java: 
+	(detectHyperlinks): Fix detection.
+	(prepareHyperlink): New method with the index in the line where the hyperlink starts.
+
+2008-11-01  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* build.properties: Add plugin.properties to bin.includes.
+
+2008-10-31  Alexander Kurtakov  <akurtakov@gmail.com>
+	Fix for #230022.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileScanner.java 
+	(DEFINED_MACROS): Make it public.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileHover.java 
+	(findWord): Fix the word finding so %doc and %defattr works.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroProposalsList.java 
+	(buildMacroList): Add the buildin macros to the proposals list.
+
+2008-10-31  Andrew Overholt  <overholt@redhat.com>
+
+	* plugin.properties: Initial import.
+	* META-INF/MANIFEST.MF: Use plugin.properties.  Add "(Incubation)".
+
+2008-10-20  Alexander Kurtakov  <akurtakov@gmail.com>
+	Fix deprecations.
+	* META-INF/MANIFEST.MF:
+	Use Bunde-ActivationPolicy instead of the deprecated Eclipse-LazyStart.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileConfiguration.java:
+	(getInformationControlCreator): Use the new DefaultInformationControl constructor.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileHover.java:
+	(getHoverControlCreator): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/outline/SpecfileQuickOutlineDialog.java:
+	(SpecfileQuickOutlineDialog): Use the new PopupDialog constructor.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePatchMacro.java:
+	(SpecfilePatchMacro): Comment unused member.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/SpecTemplatePreferencePage.java:
+	Drop redundant interface implements.
+
+2008-10-18  Alexander Kurtakov  <akurtakov@gmail.com>
+	Add hyperlink for Source and Patch definitions.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileConfiguration.java:
+	(getHyperlinkDetectors): Register new detector.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SourcesFileHyperlink.java:
+	New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SourcesFileHyperlinkDetector.java:
+	Likewise.
+
+2008-07-03  Alexander Kurtakov  <akurtakov@gmail.com>
+	Show %patch autocomplete only in %prep section.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java:
+	(computeCompletionProposals): Activate patchesProposals only in SPEC_PREP section.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileConfiguration.java:
+	(getContentAssistant): Add content assist processor for SPEC_PREP.
+	(getPresentationReconciler): Register SPEC_PREP.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfilePartitionScanner.java:
+	(SpecfilePartitionScanner): Add SPEC_PREP section.
+
+2008-07-03  Alexander Kurtakov  <akurtakov@gmail.com>
+	Enums for SpecfileSource.sourceType and SpecfileTag.tagType.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parsing/SpecfileParser.java:
+	(parse): Use SourceType instead of int.
+	(parseComplexDefinition): Likewise.
+	(parseLine): Likewise.
+	(parseSimpleDefinition): Use TagType instead of int.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parsing/SpecfileSource.java:
+	(SourceType): New enum for the sourceType.
+	(getSourceType): Use SourceType instead of int.
+	(setSourceType): Likewise.
+	(toString): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parsing/SpecfileTag.java:
+	(TagType): New enum for the tagType.
+	(SpecfileTag): Use TagType instead of int.
+	(getStringValue): Likewise.
+	(getTagType): Likewise.
+	(setTagType): Likewise.
+	(toString): Likewise.
+
+2008-07-03  Alexander Kurtakov  <akurtakov@gmail.com>
+	Simplify parsing.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parsing/Specfile.java:
+	(addDefine(String, int)): New method.
+	(addDefine(String, String)): Likewise.
+	(getComplexSectionElements): Use Collection.toArray instead of cycling elements.
+	(getPatch): No need to convert int to Integer it is autoboxed.
+	(getSectionElements): Use Collection.toArray instead of cycling elements.
+	(getSource): No need to convert int to Integer it is autoboxed.
+	(printArray): Removed unused method.
+	(setEpoch): Add/update define on setting epoch.
+	(setName): Likewise.
+	(setRelease): Likewise.
+	(setVersion): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parsing/SpecfileParser.java:
+	(parse): No need to set defines by hand due to the autosetting in Specfile.
+	(parseSection): Format.
+
+2008-07-02  Alexander Kurtakov  <akurtakov@gmail.com>
+	More cleanups.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/ColorManager.java:
+	Use foreach instead of iterator.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/NonRuleBasedDamagerRepairer.java:
+	Remove usage of deprecated Assert.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroOccurencesUpdater.java:
+	Use foreach instead of iterator.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroProposalsList.java:
+	(getProposals): Likewise.
+	(toString): Add @Override.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageBuildProposalsJob.java:
+	(run): Likewise.
+	(shouldSchedule): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageProposalsList.java:
+	(getProposals): Use foreach instead of iterator.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileChangelogScanner.java:
+	(nextToken): Add @Override.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java:
+	(computePatchesProposals): Use foreach instead of iterator.
+	(computeRpmMacroProposals): Likewise.
+	(computeRpmPackageProposals): Likewise.
+	(computeSourceProposals): Likewise.
+	(getDefines): Likewise.
+	(getPatches): Likewise.
+	(getSources): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileConfiguration.java:
+	Add @Override where needed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileEditor.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileErrorHandler.java:
+	Use Integer.valueOf instead of new Integer.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileFoldingStructureProvider.java:
+	(computeAdditions): Use foreach instead of iterator.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfilePartitioner.java:
+	(computePartitioning): Removed, it simply calls super method.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/TagRule.java:
+	(sequenceDetected): Add @Override.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogAction.java:
+	(createChangelogEntry): No need for new String(String).
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogFormatter.java:
+	(formatDateLine): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java:
+	Use Integer.valueOf instead of new Integer.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileSource.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/RpmProposalsPreferencePage.java:
+	(rpmtoolsRadioGroupFieldEditor): Use foreach instead of iterator.
+
+2008-06-29  Alexander Kurtakov  <akurtakov@gmail.com>
+	Various cleanups.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Activator.java:
+	(start): Add missing @Override.
+	(stop): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileFoldingStructureProvider.java:
+	Remove unneeded import.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfilePackagesScanner.java:
+	(SpecfilePackagesScanner): Use foreach instead of iterator.
+	(nextToken): Add missing @Override.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfilePartitioner.java:
+	(computePartitioning): Likewise.
+	(connect): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParseException:
+	Add serialVersionUID.
+
+2008-06-29  Alexander Kurtakov  <akurtakov@gmail.com>
+	Make missing @Override and @Deprecate warnings.
+	* .settings/org.eclipse.jdt.core.prefs: Missing @Override and @Deprecate should
+	be warnings.
+
+2008-06-29  Alexander Kurtakov  <akurtakov@gmail.com>
+	Do not show simple sections in the subpackages + cleanup.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePackage.java:
+	(toString): Add @Override.
+	(getSections): Removed unneeded foreach.
+	(getPackage): Add @Override.
+	(getPackageName): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java:
+	(simpleSections): Add %clean.
+	(complexSections): Remove %clean.
+	(parseSections): Do not add simple sections to the subpackages.
+
+2008-06-29  Alexander Kurtakov  <akurtakov@gmail.com>
+	Add missing @Override.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/MailHyperlink.java:
+	(open): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/URLHyperlinkWithMacroDetector.java:
+	(detectHyperlinks): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/outline/SpecfileContentOutlinePage.java:
+	(createControl): Likewise.
+	(selectionChanged): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/MacroProposalPreferencePage.java:
+	(MacroListEditor): Likewise.
+	(createFieldEditors): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/MainPreferencePage.java:
+	(createContents): Likewise.
+	(createFieldEditors): Likewise.
+	(createLocalesCombo): Likewise.
+	(performDefaults): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/PreferenceInitializer.java:
+	(initializeDefaultPreferences): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/RpmInformationsPreferencePage.java:
+	(createFieldEditors): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/RpmProposalsPreferencePage.java:
+	(createContents): Likewise.
+	(createFieldEditors): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/SpecTemplatePreferencePage.java:
+	(isShowFormatterSetting): Likewise.
+	(performOK): Likewise.
+
+2008-06-29  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	* META-INF/MANIFEST.MF: bump to 0.4.0
+
+2008-06-27  Alexander Kurtakov  <akurtakov@gmail.com>
+	Add quick outline.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileEditorShowOutlineActionDelegate.java:
+	New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/outlin/ContainsFilter.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/outlin/SpecfileQuickOutlineDialog.java:
+	Likewise.
+	* plugin.xml: Add the quick outline action.
+
+2008-05-14  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	Add folding on all complex sections.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java
+	(getComplexSectionsAsList): New method.
+	(addComplexSection): Likewise.
+	(getComplexSections):Likewise.
+	(getComplexSectionsElements): Likewise.
+	(getSectionsAsList): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java
+	(parseSection): Add complex sections.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileFoldingStructureProvider.java
+	(addFoldingRegions): Likewise.
+	(createFoldingStructure): Likewise.
+	(ElementByLineNbrComparator): New inner class.
+
+2008-05-13  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	Exctract rpm sections to a separate class.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmSections.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfilePartitionScanner.java:
+	Use sections from RpmSections.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileScanner.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java: Likewise.
+
+2008-05-12  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	Add support to detect mail hyperlink. To make a try, just select a
+	part of text in the specfile and <ctrl> + click on a mail address.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/MailHyperlink.java: New
+	file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/MailHyperlinkDetector.java:
+	New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/URLHyperlinkWithMacroDetector.java:
+	New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/URLHyperlinkWithMacroDetector.java:
+	Moved.
+	* .classpath: add StandardVMType/J2SE-1.5.
+	* META-INF/MANIFEST.MF: export hyperlink package.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileConfiguration.java
+	(getPresentationReconciler):
+	(getHyperlinkDetectors): Add mail detector.
+	(getHyperlinkDetectorTargets): Add java doc.
+	(getTextHover): likewise.
+	(getDoubleClickStrategy): likewise.
+	(getConfiguredContentTypes): likewise.
+
+2008-05-10  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	Add support for %pretrans and %posttrans sections
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfilePartitionScanner.java:
+	Add definitions.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileScanner.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/editor/SpecfileParser.java:
+	(parseSection): Prevent NPE when the section is not defined and add definitions
+	for %pretrans and %posttrans.
+
+2008-05-02  Andrew Overholt  <overholt@redhat.com>
+
+	Bug #230024
+	* META-INF/MANIFEST.MF: Bump BREE to J2SE-1.5
+
+2008-04-29  Alexander Kurtakov  <akurtakov@gmail.com>
+	Generify.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/ColorManager.java
+	(dispose): Generify.
+	(getColor): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroOccurencesUpdater.java
+	(removeOldAnnotations): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageProposalsList.java
+	(getProposals): Likewise.
+	(getValue): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileChangelogScanner.java
+	(SpecfileChangelogScanner): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileFoldingStructureProvider.java
+	(addFoldingRegions): Likewise.
+	(computeAdditions): Likewise.
+	(computeDifferences): Likewise.
+	(createFoldingStructure): Likewise.
+	(updateFoldingRegions): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfilePackagesScanner.java
+	(SpecfilePackagesScanner): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfilePartitionScanner.java
+	(SpecfilePartitionScanner): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileScanner.java
+	(SpecfileScanner): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/MacroProposalsPreferencePage.java
+	(MacroListEditor.parseList): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/RpmProposalsPreferencePage.java
+	(rpmtoolsRadioGroupFieldEditor): Likewise.
+
+2008-04-27  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	IFileStore don't give possibility to mark resources or to get a IFile, so some
+	functionality cannot be provided on file outside a workspace - The Java editor
+	seem to do the same thing.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SpecfileElementHyperlinkDetector.java
+	(prepareHyperlink): Prepare links only for specfile inside the workspace.
+	(detectHyperlinks): Only provides this functionality for existing patches and
+	sources.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileElement.java
+	(resolve): Don't throw unexpected exceptions.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroProposalsList.java
+	(getValue): Generify.
+	(getProposals): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java
+	(computeSourcesProposals): Likewise.
+	(getSources): Likewise.
+	(ProposalComparator): Likewise.
+	(computeTemplateProposals): Likewise.
+	(ProposalComparator.compare): Likewise.
+	(getDefines): Likewise.
+	(computePatchesProposals): Likewise.
+	(getPatches): Likewise.
+	(computeCompletionProposals):Likewise. (computeRpmPackageProposals): Likewise.
+	(computeRpmMacroProposals): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileDocumentProvider.java
+	(getDocument): Now we extends TextFileDocumentProvider - Fix File->Open File
+	bug.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileEditor.java
+	(getInputFile): Return null if the IEditorInput instance is not of type IFileEditorInput.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileErrorHandler.java
+	(handleError): Handle errors only on specfile inside a workspace.
+	(removeExistingMarkers): Likewise.
+	* META-INF/MANIFEST.MF: Bump to 0.3.0
+
+2008-04-10  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	Bug #226546
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileComparator.java: Generify.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePackage.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePackageContainer.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileSource.java: Likewise.
+
+2008-04-10  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java:
+	Add directValuesDefinitions used for License, fixes LicenseTagTest.
+
+2008-04-06  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	Make %{SOURCE} and %patch hyperlinks to ease navigation.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileConfiguration.java:
+	Extend TextSourceViewerConfiguration, register SpecfileElementHyperlinkDetector.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SpecfileElementHyperlink.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SpecfileElementHyperlinkDetector.java:
+	New file.
+
+2008-04-01  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* .classpath:
+	The minimum java version is 5 now.
+	* .settings/org.eclipse.jdt.core.prefs:
+	Bump the compiler lever to 5 now and auto changes from eclipse.
+
+2008-03-21  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* plugin.xml: Define org.eclipse.linuxtools.rpm.ui.specEditorScope context
+	and register key sequence="Ctrl+Shift+O" in it ,fix conflict with Java editor
+	which disables "Organize imports" key binding.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileEditor.java:
+	Set own key binding scope "org.eclipse.linuxtools.rpm.ui.specEditorScope" .
+
+2008-03-17  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	Bug #217316
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/MacroProposalsPreferencePage.java:
+	Add interface for adding directories to Macro completion list
+
+2008-01-23  Alphonse Van Assche  <alcapcom@gmail.com>
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageBuildProposalsJob.java
+	Backup package list only if the file existing + strings cleanups.
+
+2008-01-18  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	Bug #215788, 215771
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroProposalsList.java:
+	Handle directories with macros files.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java:
+	Remove License from simple tags.
+
+
+2008-01-04  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	Bug #214217
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileCompletionProcessor.java:
+	Enable auto-complete for the defined sources in the spec.
+
+2008-01-03  Andrew Overholt  <overholt@redhat.com>
+
+	Bug #206964
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizardPage.java:
+	Remove 1.5 API call.
+
+2007-12-15  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	* META-INF/MANIFEST.MF: Bump to 0.2.1
+
+2007-12-15  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	Bug #212781 + some cleanups
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/MainPreferencePage.java:
+	Add Changelog format preferences.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/PreferenceInitializer.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/PreferenceConstants.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java
+	(parse): Remove existing markers only when SpecfileErrorHandler is instantiated.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogFormatter.java
+	(formatDateLine): Changelog entry format based on prefs.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Utils.java
+	(resolveDefines): Copy from URLHyperlinkWithMacroDetector.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/URLHyperlinkWithMacroDetector.java:
+	Move resolveDefines() to Utils.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageBuildProposalsJob.java
+	(propertyListener): Run the job only when P_CURRENT_RPMTOOLS preference change.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/RpmProposalsPreferencePage.java:
+	Remove unused import.
+
+2007-11-28  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	Add support for URPM tool and cancel support to RpmPackageBuildProposalsJob.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/RpmProposalsPreferencePage.java
+	(rpmtoolsRadioGroupFieldEditor): Add urpm support.
+	(buildTimeListRateFieldEditor): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/PreferenceConstants.java
+	(DP_RPMTOOLS_URPM): New const.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageProposalsList.java: Using
+	HashSet list to advoid duplicate package.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageBuildProposalsJob.java
+	(update): Cancel support.
+	(retrievePackageList): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Utils.java
+	(copyFile): New method.
+	(fileExist): New method.
+	(pluginSanityCheck): Add package list preferences sanity checks.
+
+2007-11-21  Andrew Overholt  <overholt@redhat.com>
+
+	Bug #207207
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java
+	(parseSimpleDefinition): Allow macros in simple definitions
+	(Alexander Kurtakov).2007-10-14 Alphonse Van Assche <alcapcom@gmail.com>Bug #206160* src/org/eclipse/linuxtools/rpm/ui/editor/Activator.java(start):
+	Add sanity checks, at this time we only check if ~/.rpmmacros file exist and in
+	the case at this file don't exist we run rpmdev-setuptree to create it.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Utils.java: New File.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/PreferenceConstants.java
+	(RPMMACRO_FILE): New Constant. Bug
+	https://bugzilla.redhat.com/show_bug.cgi?id=327101
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java
+	(computePatchesProposals): Remove accidentally added code.
+
+2007-09-25  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	Add key bindings for Toggle Comment and Organize Patches actions.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileEditorToggleCommentActionDelegate.java:
+	Implement IWorkbenchWindowActionDelegate interface.
+	(selectionChanged): Set/update the editor member when the selection change.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileEditorOrganizePatchesActionDelegate.java
+	Implement IWorkbenchWindowActionDelegate interface.
+	(selectionChanged): Set/Update the editor member when the selection change.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Activator.java
+	(getActiveEditor): New method.
+	* plugin.xml: Add extension points for these key bindings.
+
+2007-09-24  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	Bug #204146
+	* src/org/eclipse/linuxtools/rpm/ui/editor/outline/SpecfileContentOutlinePage.java
+	(selectionChanged): Set the length parameter of editor#setHighlightRange method
+	to 1.
+
+2007-09-24  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	Bug #204150
+	(Clean fix) * src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java (computePatchesProposals):
+	New method.
+	(getDefines): Rename method.
+	(getPatches): New method.
+	(computeCompletionProposals): Add patches proposals.
+
+2007-09-24  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	Bug #204150
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java
+	(getDefinesName): Add completion for patches.
+
+2007-09-24  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizardPage.java:
+	Throw CoreException if /usr/share/doc or /etc/rpmdevtools dir are not found.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Activator.java: Using SpecfileLog.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileSource.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePackageContainer.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogFormatter.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogAction.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/URLHyperlinkWithMacroDetector.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfilePartitioner.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileFoldingStructureProvider.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileErrorHandler.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileEditor.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageProposalsList.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroProposalsList.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroOccurrencesUpdater.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizard.java:
+	Likewise.
+
+2007-05-04  Andrew Overholt  <overholt@redhat.com>
+
+	Bug #199172
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogFormatter.java:
+	Add method required by ChangeLog HEAD.
+
+2007-07-18  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizardPage.java:
+	(dialogChanged): Fix a little mistake with String#indexOf
+
+2007-07-17  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	Build RPM proposal list in a background task job, the list can be update when
+	the plugin is loader, once a week or once a month.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageBuildProposalsJob.java: New
+	Class that initialize and update the packages proposal list.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Activator.java: Add property change
+	listener and call RpmPackageBuildProposalsJob#update in the start method.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageProposalsList.java:
+	Updating to use the new job to update package proposal list strategy.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/RpmProposalsPreferencePage.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/PreferenceInitializer.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/PreferenceConstants.java:
+	Likewise.
+
+2007-07-17  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java: Add
+	defines in proposals. Don't show templates in package context and retrieve
+	proposals only when it's needed. Cleanup javadoc and remove some unneeded methods
+	args.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java:
+	(getDefinesName): New method.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/URLHyperlinkWithMacroDetector.java:
+	Cleanup.
+
+2007-07-16  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	Implement toggle comment like in JDT.
+	* plugin.xml: Add comment toggle action. Add our document provider.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileEditorToggleCommentActionDelegate.java:
+	New action.
+
+2007-07-14  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizardPage.java:
+	Replace String#contains by String#indexOf for JRE 1.4 compatibility.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileConfiguration.java: Moving
+	Annotation Hover to derived package.
+	* Too many files to list: Add contributor line.
+
+2007-07-13  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfilePackagesScanner.java: Fix
+	copyright.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/PackageWordDetector.java: Likewise.
+
+2007-07-05  Andrew Overholt  <overholt@redhat.com>
+
+	* Too many files to list: Add standard copyright and license header.
+
+2007-06-25  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizardPage.java:
+	(dialogChanged): Forgot to add '>' char as un-acceptable character for the Name
+	tag.
+
+2007-06-25  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	Add a wizard for new specfile based on a template provided by the rpmdevtools
+	package.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizard.java: New
+	File.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizardPage.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileLog.java: Likewise, The
+	logger of convenience for the Specfile Plug-In.
+	* plugin.xml: Add extensions points for the wizard.
+
+2007-06-22  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	* META-INF/MANIFEST.MF: Add new dependencie "com.ibm.icu" for LineBreakingReader
+	derived class.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileErrorHandler.java:
+	(setDocument): New method. It is used by the rpmlint Plug-In.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileErrorHandler.java:
+	(setFile): Likewise.
+	(parse): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileHover.java: Using the derived
+	HTMLTextPresenter class. That make the plugin compatible with both 3.2 and 3.3
+	Eclipse versions.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileConfiguration.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/derived/HTML2TextReader.java: New New
+	derived class.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/derived/SubstitutionTextReader.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/derived/SingleCharReader.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/derived/LineBreakingReader.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/derived/HTMLTextPresenter.java:
+	Likewise.
+
+2007-06-20  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileEditor.java
+	(dispose): Set specfile field to null, useful for test cases.
+	(getSpecfileSourceViewer): New method used by HyperlinkWithMacroTests.
+
+2007-06-20  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroOccurrencesUpdater.java
+	(isDefineChar): Add '?' char as define limiter.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/PackageWordDetector.java
+	(isWordPart): Add '+' char.
+	* icons/occurence_obj.gif New file.
+
+2007-06-05  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	Bug #182633
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Activator.java
+	(getImage): New method.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/outline/SpecfileLabelProvider.java
+	(PREAMBLE_ICON): New global var for icon.
+	(SECTION_ICON): Likewise.
+	(PACKAGES_ICON): Likewise.
+	(PACKAGE_ICON): Likewise.
+	(getImage): Take the above icons in account.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java
+	(TEMPLATE_ICON): New global var for icon.
+	(computeTemplateProposals): Using Activator.getImage() method.
+	(computeRpmMacroProposals): Likewise.
+	(computeRpmPackageProposals): Likewise.
+
+2007-06-05  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	Bug: #184955
+	* plugin.xml: add org.eclipse.ui.editors.markerAnnotationSpecification extension
+	point.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileHover.java
+	(getHoverInfo): using new methods.
+	(getSourceOrPatchValue): New method used by RpmMacroOccuencesUpdater.
+	(getMacroValueFromMacroList): New method used by RpmMacroOccuencesUpdater.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileConfiguration.java
+	(getAnnotationHover): overload of getAnnotationHover() method from
+	SourceViewerConfiguration.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java
+	(getDefinesAsList): New method.
+	(getDefinesAsArray): New method.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroOccurrencesUpdater.java: New
+	file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/AnnotationHover.java: New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileEditor.java
+	(setSpecfile): update macro occurences.
+
+2007-06-04  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java
+	(parsePatch): Parse %patch macro and Patch: directive without trailing number.
+	(parseComplexDefinition): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileSource.java
+	(changeReferences): Likewise.
+	(changeDeclaration): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileScanner.java
+	(SpecfileScanner): Scan %patch macro without trailing number.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/URLHyperlinkWithMacroDetector.java
+	(detectHyperlinks): Check if IHyperlink[] is not null before try to get the
+	lenght of it.
+
+2007-06-04  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogFormatter.java
+	Fix ChangeLog entry action.
+	(formatDateLine): Add escape char in pattern %{?dist} tag.
+
+2007-05-04  Andrew Overholt  <overholt@redhat.com>
+
+	Bug #185598
+	* META-INF/MANIFEST.MF: Add "Incubation" to Bundle-Name.
+
+2007-04-14  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	Bug #182302
+	* src/org/eclipse/linuxtools/rpm/ui/editor/PackageWordDetector.java
+	(isWordPart): Detect packages contain '_' char.
+	(isWordStart): Add support for packages begining with ' ' | ',' | '\t' | ':'
+	char.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java
+	(parseLine): Fix tags parsing.
+	(parseSimpleDefinition): Don't show warning about acronym error.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileScanner.java
+	(sections): Add %clean and %check section.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfilePackagesScanner.java
+	(PACKAGES_TAGS): Add Requires(hint)
+	(SpecfilePackagesScanner): Detect packages that begin with ' ' | ',' | '\t' |
+	':' char. Add comment support.
+
+2007-04-10  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	Bug #181747
+	* src/org/eclipse/linuxtools/rpm/ui/editor/URLHyperlinkWithMacroDetector.java:
+	New class to resolve macro in URL.
+	(detectHyperlinks): New method.
+	(URLHyperlinkWithMacroDetector): Likewise.
+	(resolveDefinesInURL): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileConfiguration.java:
+	(getHyperlinkDetectors): Use URLHyperlinkWithMacroDetector.
+
+2007-04-10  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	Bug #181110
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileReconcilingStrategy.java:
+	Update the editor without saving the file.
+	(updateFolding): Don't create a specfile instance.
+	(reconcile): Use the same method to reconcile.
+	(SpecfileReconcilingStrategy): Remove unneeded code.
+	(updateEditor): Update the specfile instance of the editor.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java
+	(parseSimpleDefinition): Cleanup.
+	(parseComplexDefinition): Remove all existing error handler markers before
+	parsing the file.
+	(parse): Remove workarounds which are no longer needed.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java
+	(getContextType): Fix array out of bounds bug with incomplete specfiles.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileFoldingStructureProvider.java
+	(updateFoldingRegions): Use the Specfile instance in the editor one.
+
+2007-04-08  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	Bug #181245
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileScanner.java: Remove unneeded
+	RPM tags, these tags are now taken into account by SpecfilePartitionScanner.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfilePackagesScanner.java: New
+	file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfilePartitionScanner.java: Add
+	__spec_packages partition type. Use SpecfilePackagesScanner.PACKAGES_TAGS.
+	(SpecfilePartitionScanner): Add new scan rules for the__spec_packages partition.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileHover.java: Add hover support
+	for RPM packages.
+	(findPackages): New method.
+	(getHoverRegion): Add support for findPackages() method.
+	(getHoverInfo): Get RPM package hover information. Rename macroName to
+	currentSelection to reflect the current code.
+	(getHoverControlCreator): Use HTMLTextPresenter as information control
+	presenter.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileConfiguration.java: Add
+	support for the RPM packages content type.
+	(getSpecfilePackagesScanner): New method.
+	(getPresentationReconciler): Reconcile packages.
+	(getContentAssistant): Set content assistant for packages content type.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java: Add
+	completion support for the __spec_packages partition type.
+	(computeRpmPackageProposals): Show only proposals on lines begining with
+	Requires, BuildRequires, etc.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageProposalsList.java: Add a
+	method used by SpecfilePartionScanner.getHoverInfo() to retrieve package.
+	information.
+	(getValue): New method.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/PackageWordDetector.java: New file.
+	Add packages word detection.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/ISpecfileColorConstants.java: Add
+	color constant for packages.
+
+2007-04-06  Alphonse Van Assche  <alcapcom@gmail.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroProposalsList.java
+	(getValue): Escape "?" character in regex. Bug #181395.
+
+2007-04-05  Remy Suen  <remy.suen@gmail.com>
+
+	Bug #181249
+	* META-INF/MANIEST.MF: Set the Bundle-RequiredExecutionEnvironment attribute to
+	J2SE-1.4.
+
+2007-04-05  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroProposalsList.java
+	(getProposals): Escape "{" character in regex.
+
+2007-04-04  Andrew Overholt  <overholt@redhat.com>
+
+	This large functionality addition was done by Alphonse Van Assche. The
+	discussion surrounding it is available at
+	https://bugs.eclipse.org/bugs/show_bug.cgi?id=177220.
+	* .classpath: Add J2SE-1.4 preferred EE.
+	* build.properties: Add icons and templates to binary build.
+	* icons/changelog.gif: Remove apparently unused icon.
+	* META-INF/MANIFEST.MF: Change changelog requirement to new namespace. Add
+	* plugin.xml: Update class namespace for editor extension. Update changelog
+	extension point locations. Add templates and preferences extensions. preferences
+	to package export list.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/Activator.java: Add template,
+	contextType, and macro and package completion variables.
+	(getTemplateStore): New method.
+	(getRpmMacroList): Likewise.
+	(getRpmPackageList): Likewise.
+	(getContextTypeRegistry): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroProposalsList.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageProposalsList.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileConfiguration.java
+	(getReconciler): Change delay to 500 ms.
+	(getContentAssistant): New method.
+	(getInformationControlCreator): New method.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileEditor.java
+	(getAdapter): Add projectionSupport.
+	(getResourceBundle): New method.
+	(createActions): Likewise.
+	(createPartControl): Likewise.
+	(createSourceViewer): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileEditorMessages.properties:
+	New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileFoldingStructureProvider.java:
+	New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileHover.java
+	(getHoverInfo): Add non-%source and non-%patch macro proposals.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileReconcilingStrategy.java
+	(SpecfileReconcilingStrategy): Add parser and foldingStructureProvider.
+	(setDocument): Implement.
+	(reconcile): Call reconcile().
+	(initialReconcile): New method. Call reconcile().
+	(reconcile): New method. Parse and update editor and folding.
+	(setProgressMonitor): New method.
+	(parseSpecfile): Likewise.
+	(updateEditor): Likewise.
+	(updateFolding): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogParser.java:
+	Update changelog import package name.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogFormatter.java
+	(formatTodaysDate): Add locale-based formatting. Will probably want to re-visit
+	this soon.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java
+	(getSectionsElements): New method. Used for determining when to offer completion
+	proposals.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java
+	(parseComplexDefinition): Add temporary workaround for null errorHandler.
+	(parseSimpleDefinition): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/MainPreferencePage.java:
+	New file.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/MacroProposalsPreferencePage.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/PreferenceConstants.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/PreferenceInitializer.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/RpmInformationsPreferencePage.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/RpmProposalsPreferencePage.java:
+	Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/editor/preferences/SpecTemplatePreferencePage.java:
+	Likewise.
+	* templates/templates.xml: Likewise. Templates for completion.
+
+2007-03-28  Andrew Overholt  <overholt@redhat.com>
+
+	Re-namespace to org.eclipse.linuxtools.rpm.ui.editor.
+
+2007-03-15  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/SpecfileReconcilingStrategy.java: New file.
+	* src/org/eclipse/cdt/rpm/editor/outline/SpecfileContentOutlinePage.java
+	(update): Run in an async thread.
+	(.run): New method.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileConfiguration.java
+	(getReconciler): New method.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileEditor.java
+	(validateAndMark): Call getParser.
+	(getParser): New method.
+	(getAdapter): Call getOutlinePage.
+	(getOutlinePage): New method.
+	(setSpecfile): New method.
+
+2007-01-06  Igor Foox  <ifoox@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileParser.java
+	(parseSection): Special case the top level package so that it appears in the
+	outline.
+
+2007-01-06  Igor Foox  <ifoox@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileSection.java: Rename thePackage
+	field to parentPackage.
+	(getPackage): Rename thePackage field to parentPackage.
+	(toString): Ditto.
+	(SpecfileSection): Ditto.
+	(setPackage): Ditto.
+	(getPackageName): New method.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfilePackage.java: Resubclass based
+	on SpecfileSection instead of SpecfileElement and add a new field packageName.
+	(getPackage): New method.
+	(setPackageName): New method.
+	(getPackageName): New method.
+	(toString): Remove redundant code, change use of getName to getPackageName().
+	(SpecfilePackage): Initialize new fields, pass "package" to super constructor.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfilePackageContainer.java
+	(getPackage): Use getPackageName() instead of getName().
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileParser.java
+	(parseSection): Special case ParserPackages from other types of ParserSections.
+
+2007-01-04  Igor Foox  <ifoox@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfilePreamble.java: New file.
+	* src/org/eclipse/cdt/rpm/editor/outline/SpecfileContentProvider.java
+	(getChildren): Add the preamble and sections to the children returned for a
+	Specfile.
+	* src/org/eclipse/cdt/rpm/editor/outline/SpecfileLabelProvider.java
+	(getText): Add "Preamble" as the returned text for SpecfilePreamble.
+	* src/org/eclipse/cdt/rpm/editor/parser/Specfile.java
+	(Specfile): Change preamble to a SpecfilePreamble from a SpecfileElement,
+	intialize it in the constructor.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileParser.java
+	(parseSection): Add simple, but not complex, sections to the specfile with
+	addSection(). Add complex section to a SpecfilePackage hierarchialy, and add the
+	package to the specfile.
+	(parse): Remove if block that dealt with SpecfileSections.
+	(simpleSections): Add javadoc.
+	(complexSections): Add javadoc.
+
+2007-01-03  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfilePackageContainer.java: New file.
+	Container for packages for use in the model and outline.
+	* src/org/eclipse/cdt/rpm/editor/outline/SpecfileContentProvider.java
+	(SpecfileContentProvider): Set specfile in the constructor.
+	(getElements): Use getChildren.
+	(getChildren): Re-work outline to have Packages sub-category. Will further
+	refine later.
+	(hasChildren): Add knowledge of SpecfilePackage and SpecfilePackageContainer.
+	* src/org/eclipse/cdt/rpm/editor/outline/SpecfileLabelProvider.java
+	(getText): Add SpecfilePackage and SpecfilePackageContainer.
+	* src/org/eclipse/cdt/rpm/editor/parser/Specfile.java
+	(getPackage): New method.
+	(getPreamble): Likewise.
+	(addPackage): Likewise.
+	(Specfile): Likewise.
+	(getPackages): Likewise.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileParser.java
+	(parseSection): Deal with -f, add package data to sections.
+	(parse): Add packages to model.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfilePackage.java
+	(SpecfilePackage): Add sections.
+	(getSections): New method.
+	(hasChildren): Likewise.
+	(addSection): Likewise.
+	(getLineEndPosition): Override to return the actual %package line.
+	(getLineStartPosition): Likewise.
+
+2006-12-19  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileSource.java
+	(getFileName): Resolve macros.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileConfiguration.java
+	(getPresentationReconciler): Cleanups.
+	(getTextHover): Likewise.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileHover.java
+	(findWord): Deal with macros without braces
+	(ex. %patch).(getHoverInfo): Fix typo.
+
+2006-12-18  Igor Foox  <ifoox@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/SpecfilePartitionScanner.java: Remove the
+	SPEC_DEFAULT partition type, as IDocument.EFAULT_CONTENT_TYPE fulfills this role.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileConfiguration.java
+	(getConfiguredContentTypes): Fix to return
+	SpecfilePartitionScanner.SPEC_PARTITION_TYPES instead of just the default
+	partition type.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileHover.java
+	(getHoverInfo): Change hover text to "<macro name>: <macro value". Add hover for
+	patch and source declarations.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileParser.java
+	(parse): Special case Epoch handling, now added to list of defines.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileSource.java: Change call to
+	super constructor with String.
+
+2006-12-04  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/SpecfileHover.java: New file. Hover support.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileConfiguration.java
+	(SpecfileConfiguration): Add editor to constructor.
+	(getTextHover): New method.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileEditor.java
+	(SpecfileEditor): Add this object to configuration constructor call.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileParser.java
+	(parse): Add version and release defines.
+
+2006-11-07  Andrew Overholt  <overholt@redhat.com>
+
+	Add license.
+	* src/org/eclipse/cdt/rpm/editor/parser/Specfile.java: Add license.
+	(setLicense): New method.
+	(getLicense): Likewise.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileParser.java
+	(parseSimpleDefinition): Add license.
+	(parse): Likewise.
+	(parseDefine): Likewise.
+	(parseLine): Likewise.
+
+2006-10-04  Andrew Overholt  <overholt@redhat.com>
+
+	* plugin.xml: Update ChangeLog parser extension to not use fully-qualified
+	editor name.
+
+2006-10-03  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/outline/SpecfileContentProvider.java
+	(inputChanged): Don't parse; use SpecfileEditor's parsed Specfile instead.
+	(SpecfileContentProvider): Take as input the ITextEditor rather than just the
+	IDocumentProvider. Remove unused field variables.
+	* src/org/eclipse/cdt/rpm/editor/outline/SpecfileContentOutlinePage.java
+	(createControl): Use updated SpecfileContentProvider constructor.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileEditor.java
+	(editorSaved): Parse the document
+	(validateAndMark) before updating the outline.* src/org/eclipse/cdt/rpm/editor/actions/SpecfileChangelogFormatter.java: Remove unused field variable.(getParsedSpecfile):
+	Don't parse; use SpecfileEditor's parsed Specfile instead.
+	* src/org/eclipse/cdt/rpm/editor/actions/SpecfileChangelogAction.java
+	(createChangelogEntry): Don't parse; use SpecfileEditor's parsed Specfile
+	instead.
+	(run): Pass Specfile and not editor to createChangelogEntry; Fix typos.
+	* src/org/eclipse/cdt/rpm/editor/actions/SpecfileEditorOrganizePatchesActionDelegate.java
+	(setActiveEditor): Remove debugging output.
+	(run): Likewise.
+
+2006-10-03  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/actions/SpecfileEditorOrganizePatchesActionDelegate.java:
+	New file.
+	(setActiveEditor): New method.
+	(run): Likewise.
+	(selectionChanged): Likewise.
+	* src/org/eclipse/cdt/rpm/editor/parser/Specfile.java:
+	(printArray): New method.
+	(getDocument): Likewise.
+	(toString): Likewise.
+	(getSourcesAsArray): Likewise.
+	(setDocument): Likewise.
+	(setSources): Likewise.
+	(changeLine): Likewise.
+	(organizePatches): Likewise.
+	(getLine): Likewise.
+	(getLineLength): Likewise.
+	(getPatchesAsArray): Likewise.
+	(setPatches): Likewise.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileSource.java
+	(toString): Add declaration line.
+	(getLineNumber): New method.
+	(changeDeclaration): Likewise.
+	(setLineNumber): Likewise.
+	(changeReferences): Likewise.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileParser.java
+	(parse): Fix line numbers. Record patch declaration line numbers.
+	* plugin.xml: Add action for "Organize Patches" in editor context menu.
+	* src/org/eclipse/cdt/rpm/editor/SpecfilePartitioner.java
+	(connect): Don't print out the partitions.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileEditor.java
+	(validateAndMark): Keep parsed specfile.
+	(getSpecfile): New method.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileErrorHandler.java
+	(getCharOffset): Fix line number calculations.
+
+2006-09-19  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/parser/SourceComparator.java: New file.
+	* src/org/eclipse/cdt/rpm/editor/parser/Specfile.java
+	(printSources): New method.
+	(printPatches): Likewise.
+	(getSourcesAsList): Likewise.
+	(getSourcesAsArray): Likewise.
+	(getSources): Likewise.
+	(getPatchesAsList): Likewise.
+	(getPatches): Likewise.
+	(getPatchesAsArray): Likewise.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileSource.java
+	(toString): Add lines used.
+	(getLinesUsed): New method.
+	(removeLineUsed): Likewise.
+	(addLineUsed): Likewise.
+	(SpecfileSource): Initialize linesUsed.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileParser.java
+	(parse): Add line numbers where patches and sources are used.
+
+2006-09-19  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileParser.java
+	(parseComplexDefinition): Make lines that being with "Source" or "Patch" but do
+	not have colons just warnings as we cannot tell the difference between these and
+	Source or Patch directives with missing trailing colons.
+
+2006-09-07  Igor Foox  <ifoox@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/actions/SpecfileChangelogFormatter.java: Fix
+	the case where there is no changelog section in the file as well as some minor
+	formatting fixes.
+
+2006-09-07  Igor Foox  <ifoox@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/actions/SpecfileChangelogFormatter.java: New
+	file.
+	* src/org/eclipse/cdt/rpm/editor/actions/SpecfileChangelogParser.java: New,
+	empty, file.
+	* src/org/eclipse/cdt/rpm/editor/parser/Specfile.java: Initialize epoch to -1.
+	* META-INF/MANIFEST.MF: Add exporting of the new
+	org.eclipse.linuxtools.rpm.ui.editor.actions package. Add dependency on
+	com.redhat.eclipse.changelog.core.
+	* plugin.xml: Remove extension of the org.eclipse.ui.actionSets extension point,
+	add extension of the com.redhat.eclipse.changelog.core.parserContribution and
+	com.redhat.eclipse.changelog.core.formatterContribution extension points.
+	* src/org/eclipse/cdt/rpm/editor/actions/SpecfileChangelogAction.java
+	(createChangelogEntry): Use email and author name from changelog plugin,
+	although in a very hacky way. Add option epoch to the version, add macro
+	resolution in version, epoch and release.
+
+2006-09-05  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileElement.java
+	(resolve): Use reluctant regex to allow for multiple definitions to be resolved.
+	* src/org/eclipse/cdt/rpm/editor/actions/SpecfileChangelogAction.java
+	(createChangelogEntry): Resolve strings so we don't end up with variable
+	definitions in the nvr string.
+
+2006-09-04  Igor Foox  <ifoox@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/actions/SpecfileChangelogAction.java: New file,
+	implementing the changelog entry action.
+	* icons/changelog.gif: New file.
+	* plugin.xml: Add extension point for actionSet.
+
+2006-09-04  Igor Foox  <ifoox@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileParser.java
+	(parseSection): Add continue statement if no package name is found after -n.
+
+2006-09-03  Igor Foox  <ifoox@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/outline/SpecfileContentProvider.java: Remove
+	unnecessary imports.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileDocumentProvider.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/SpecfilePartitionScanner.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileChangelogScanner.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileParser.java
+	(parseSimpleDefinition): Change use of illegal String.contains(String) to
+	String.indexOf(String) > 0.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileTag.java
+	(toString): Likewise.
+
+2006-09-01  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileParser.java
+	(parseDefine): Remove colon from error messages.
+	(parse): Don't output to console.
+	(parseSimpleDefinition): Return after first error. Remove colon from error
+	messages.
+
+2006-08-31  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/parser/Specfile.java
+	(getSource): New method.
+	(getPatch): Likewise.
+	(addPatch): Likewise.
+	(addSource): Likewise.
+	(Specfile): Likewise. Add patches and sources maps.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileParser.java
+	(packageLevelDefinitions): Likewise.
+	(parseMacro): Likewise.
+	(parseSection): Likewise.
+	(complexDefinitions): Likewise.
+	(parsePatch): Likewise.
+	(parseLine): Likewise.
+	(simpleDefinitions): Likewise.
+	(parseDefine): Likewise.
+	(parse): Likewise.
+	(parseSimpleDefinition): Likewise.
+	(parseComplexDefinition): Likewise. Split up parser into multiple methods.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileTag.java
+	(toString): Use resolve method.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileParseException.java
+	(SpecfileParseException): Add severity.
+	(getSeverity): New method.
+	(setSeverity): Likewise.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileErrorHandler.java
+	(handleError): Use severity. Add severity.
+
+2006-08-31  Andrew Overholt  <overholt@redhat.com>
+
+	* META-INF/MANIFEST.MF: Add package exports to facilitate moving tests to new
+	plugin.
+
+2006-08-29  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/parser/tests: Move tests to new plugin
+	org.eclipse.linuxtools.rpm.ui.editor.tests.
+	* .classpath: Remove JUnit from classpath.
+
+2006-08-28  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileParser.java
+	(parseLine): Handle errors directly and do not throw exceptions.
+	(parse): Pass lineNumber to parseLine for error handling.
+
+2006-08-28  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/outline/SpecfileContentProvider.java
+	(getParent): Set null root.
+	(inputChanged): Add error handling.
+	(getElements): Set null root.
+	* src/org/eclipse/cdt/rpm/editor/outline/SpecfileContentOutlinePage.java
+	(update): Check for null input.
+	* src/org/eclipse/cdt/rpm/editor/outline/SpecfileLabelProvider.java
+	(getText): Never return null.
+	* src/org/eclipse/cdt/rpm/editor/parser/Specfile.java: Set default name value.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileParser.java
+	(parseLine): First cut of error handling.
+	(parse): Likewise.
+	(setErrorHandler): Likewise. Likewise.
+	* META-INF/MANIFEST.MF: Add dependencies for error handling.
+	* plugin.xml: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileEditor.java
+	(doSetInput): First cut of error handling.
+	(validateAndMark): Likewise.
+	(getInputDocument): Likewise.
+	(getInputFile): Likewise.
+	(editorSaved): Likewise. Likewise.
+	* src/org/eclipse/cdt/rpm/editor/AuthorEmailRule.java
+	(evaluate): Add necessary cast.
+	* src/org/eclipse/cdt/rpm/editor/VersionReleaseRule.java
+	(evaluate): Likewise.
+
+2006-08-21  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/parser/Specfile.java
+	(setVersion): New method.
+	(getVersion): Likewise.
+	(setRelease): Likewise.
+	(getDefine): Likewise.
+	(addDefine): Likewise.
+	(getRelease): Likewise.
+	(Specfile): Add version, release, and defines.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileSection.java
+	(SpecfileSection): Add specfile to constructor.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileParser.java
+	(parseLine): Add specfile argument.
+	(parse): Likewise.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfilePackage.java
+	(SpecfilePackage): Likewise.
+	* src/org/eclipse/cdt/rpm/editor/parser/tests/HeaderRecognitionTest.java
+	(testGetComplexSectionName2): Likewise.
+	(testGetComplexSectionName4): Likewise.
+	(testGetComplexSectionName5): Likewise.
+	(testGetSimpleSectionName): Likewise.
+	(testGetComplexSectionName6): Likewise.
+	(testGetComplexSectionName3): Likewise.
+	(testGetComplexSectionName7): Likewise.
+	(testGetComplexSectionName1): Likewise. Likewise.
+	* src/org/eclipse/cdt/rpm/editor/parser/tests/EpochTagTest.java
+	(testNonIntegerEpoch): Likewise.
+	(testMultipleEpochsTag): Likewise.
+	(testMultipleEpochsTag2): Likewise.
+	(testEpochTag2): Likewise.
+	(testNonIntegerEpoch2): Likewise.
+	(testNullEpochTag2): Likewise.
+	(testNullEpochTag): Likewise.
+	(testEpochTag): Likewise. Likewise.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileTag.java
+	(SpecfileTag): Likewise.
+	(setTagType): New method.
+	(getTagType): Likewise.
+	(getStringValue): Likewise.
+	(toString): Use tag type to determine return value.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileElement.java
+	(getSpecfile): New method.
+	(resolve): Likewise. Resolve variable definitions.
+	(setSpecfile): Likewise.
+	(getName): Use resolve.
+	* src/org/eclipse/cdt/rpm/editor/parser/tests/NameTagTest.java
+	(testNameTag2): Add specfile argument.
+	(testMultipleNamesTag2): Likewise.
+	(testNameTag): Likewise.
+	(testMultipleNamesTag): Likewise.
+	(testNullNameTag2): Likewise.
+	(testNullNameTag): Likewise.
+	(testResolvedSetName):
+	(testResolvedNameTag): Add specfile field.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileDefine.java: New file.
+	* src/org/eclipse/cdt/rpm/editor/parser/tests/DefineTests.java: New file.
+	* src/org/eclipse/cdt/rpm/editor/parser/tests/ReleaseTagTests.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/parser/tests/VersionTagTests.java: Likewise.
+
+2006-08-20  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/parser/Specfile.java
+	(setEpoch): New method.
+	(getEpoch): Likewise. Add epoch field variable.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileParser.java
+	(parseLine): Handle epochs.
+	(parse): Likewise. Clean up imports and remove unused args variable.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileTag.java
+	(setIntValue): New method. Handle tags that have integer values.
+	(getIntValue): Likewise.
+	(toString): Modify to handle integer and string tags.
+	(SpecfileTag): Modify constructors for integer and string values.
+	(setStringValue): Refactor setValue.
+	(getStringValue): Likewise. Add tagType field variable.
+	* src/org/eclipse/cdt/rpm/editor/parser/tests/NameTagTest.java
+	(testNameTag2): Modify to use SpecfileTag.getStringValue;
+	(testNameTag): Likewise.
+	* src/org/eclipse/cdt/rpm/editor/parser/tests/EpochTagTest.java: New file. Tests
+	for epoch tag handling.
+
+2006-08-18  Andrew Overholt  <overholt@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/parser/tests/NameTagTest.java: Add new file.
+	* src/org/eclipse/cdt/rpm/editor/parser/tests/HeaderRecognitionTest.java: Ditto.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileTag.java: Ditto.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileSection.java: Ditto.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileParser.java : Ditto.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfilePackage.java: Ditto.
+	* src/org/eclipse/cdt/rpm/editor/parser/SpecfileElement.java: Ditto.
+	* src/org/eclipse/cdt/rpm/editor/parser/Specfile.java: Ditto.
+	* src/org/eclipse/cdt/rpm/editor/outline/SpecfileLabelProvider.java: Ditto.
+	* src/org/eclipse/cdt/rpm/editor/outline/SpecfileContentProvider.java: Ditto.
+	* src/org/eclipse/cdt/rpm/editor/outline/SpecfileContentOutlinePage.java: Ditto.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileEditor.java
+	(getAdapter): Add method.
+	* .classpath: Add dependency on JUnit.
+	* META-INF/MANIFEST.MF: Add dependency on org.eclipse.ui.views.
+
+2006-08-12  Igor Foox  <ifoox@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/VersionReleaseRule.java: Fixed bug with the
+	handling of trailing space following the version-release.
+	* src/org/eclipse/cdt/rpm/editor/AuthorEmailRule.java: Added rudimentary
+	checking for valid email addresses, and fixed a few hanging bugs when removing
+	the '<', '@', '.', or '>' characters from the email address.
+
+2006-08-12  Igor Foox  <ifoox@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/SpecfileScanner.java: Minor doc fixes.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileConfiguration.java: Added a reference
+	to a SpecfileChangelogScanner. Added a damager/repairer pair for the %files and
+	%changelog sections.
+	* src/org/eclipse/cdt/rpm/editor/ISpecfileColorConstants.java: Removed leftover
+	constants from XML editor example, added constants for changelog colouring.
+	* src/org/eclipse/cdt/rpm/editor/AuthorEmailRule.java: New file.
+	* src/org/eclipse/cdt/rpm/editor/VersionReleaseRule.java: New file.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileChangelogScanner.java: New file.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileTagScanner.java: Commented the whole
+	file, as I think it's unused.
+
+2006-08-12  Igor Foox  <ifoox@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/editor/SpecfilePartitionScanner.java: Fixed
+	partitioning with a simple initial partitioning scheme.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileDocumentProvider.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileConfiguration.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/SectionRule.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/SpecfilePartitioner.java: New file, adds
+	debugging output to partitioning.
+
+2006-08-02  Andrew Overholt  <overholt@redhat.com>
+
+	* .settings/org.eclipse.jdt.core.prefs: Initial commit.
+	* src/org/eclipse/cdt/rpm/editor/TagWordDetector.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileConfiguration.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/ColorManager.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/NonRuleBasedDamagerRepairer.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/SectionRule.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/SpecfilePartitionScanner.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/StringWithEndingRule.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileWhitespaceDetector.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileDoubleClickStrategy.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileTagScanner.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/TagRule.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/IStrictWordDetector.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/Activator.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/MacroWordDetector.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileDocumentProvider.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileScanner.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/PatchNumberDetector.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/SpecfileEditor.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/SuffixNumberDetector.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/ISpecfileColorConstants.java: Likewise.
+	* src/org/eclipse/cdt/rpm/editor/KeywordWordDetector.java: Likewise.
+	* build.properties: Likewise.
+	* .project: Likewise.
+	* ChangeLog: Likewise.
+	* plugin.xml: Likewise.
+	* icons/rpm.gif: Likewise.
+	* META-INF/MANIFEST.MF: Likewise.
+	* .classpath: Likewise.
+	* .cvsignore: Likewise.
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/META-INF/MANIFEST.MF b/rpm/org.eclipse.linuxtools.rpm.ui.editor/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..af21fb7
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/META-INF/MANIFEST.MF
@@ -0,0 +1,31 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.eclipse.linuxtools.rpm.ui.editor; singleton:=true
+Bundle-Version: 0.4.3.qualifier
+Bundle-Activator: org.eclipse.linuxtools.rpm.ui.editor.Activator
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.jface.text,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.views,
+ org.eclipse.core.resources,
+ org.eclipse.ui.ide,
+ org.eclipse.linuxtools.changelog.core,
+ com.ibm.icu,
+ org.eclipse.ui.forms;bundle-version="3.3.101",
+ org.eclipse.compare;bundle-version="3.4.0",
+ org.eclipse.linuxtools.rpm.core
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.linuxtools.rpm.ui.editor,
+ org.eclipse.linuxtools.rpm.ui.editor.actions,
+ org.eclipse.linuxtools.rpm.ui.editor.hyperlink,
+ org.eclipse.linuxtools.rpm.ui.editor.markers,
+ org.eclipse.linuxtools.rpm.ui.editor.outline,
+ org.eclipse.linuxtools.rpm.ui.editor.parser,
+ org.eclipse.linuxtools.rpm.ui.editor.preferences,
+ org.eclipse.linuxtools.rpm.ui.editor.scanners
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Vendor: %provider
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/build.properties b/rpm/org.eclipse.linuxtools.rpm.ui.editor/build.properties
new file mode 100644
index 0000000..df19334
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/build.properties
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+source.. = src/
+output.. = bin/
+bin.includes = plugin.xml,\
+               META-INF/,\
+               .,\
+               icons/,\
+               templates/,\
+               plugin.properties
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/icons/macro_obj.gif b/rpm/org.eclipse.linuxtools.rpm.ui.editor/icons/macro_obj.gif
new file mode 100644
index 0000000..9ac596d
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/icons/macro_obj.gif
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/icons/occurrence_obj.gif b/rpm/org.eclipse.linuxtools.rpm.ui.editor/icons/occurrence_obj.gif
new file mode 100644
index 0000000..7b1efa5
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/icons/occurrence_obj.gif
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/icons/package_obj.gif b/rpm/org.eclipse.linuxtools.rpm.ui.editor/icons/package_obj.gif
new file mode 100644
index 0000000..f4a1ea1
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/icons/package_obj.gif
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/icons/packages_obj.gif b/rpm/org.eclipse.linuxtools.rpm.ui.editor/icons/packages_obj.gif
new file mode 100644
index 0000000..1f4ec30
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/icons/packages_obj.gif
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/icons/preamble_obj.gif b/rpm/org.eclipse.linuxtools.rpm.ui.editor/icons/preamble_obj.gif
new file mode 100644
index 0000000..ea94702
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/icons/preamble_obj.gif
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/icons/rpm.gif b/rpm/org.eclipse.linuxtools.rpm.ui.editor/icons/rpm.gif
new file mode 100644
index 0000000..8e82089
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/icons/rpm.gif
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/icons/section_obj.gif b/rpm/org.eclipse.linuxtools.rpm.ui.editor/icons/section_obj.gif
new file mode 100644
index 0000000..9e44ce5
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/icons/section_obj.gif
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/icons/template_obj.gif b/rpm/org.eclipse.linuxtools.rpm.ui.editor/icons/template_obj.gif
new file mode 100644
index 0000000..fdde5fb
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/icons/template_obj.gif
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/plugin.properties b/rpm/org.eclipse.linuxtools.rpm.ui.editor/plugin.properties
new file mode 100644
index 0000000..6b4e74a
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/plugin.properties
@@ -0,0 +1,36 @@
+#################################################################################
+#  Copyright (c) 2008, 2009 Red Hat, Inc.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+#  Contributors:
+#      Red Hat Incorporated - initial API and implementation
+#################################################################################
+bundleName=RPM Specfile Editor (Incubation)
+provider=Eclipse
+context.name = Specfile Editor Context
+editor.name = Specfile Editor
+editor.name.0 = Specfile Form Editor
+extension.name = Specfile Error Marker
+extension.name.0 = Specfile Task Marker
+page.name = Specfile Editor
+page.name.0 = RPM Completions
+page.name.1 = Macro Completion
+page.name.2 = Templates
+page.name.3 = Package Information
+page.name.4 = Task Tags
+category.name = RPM
+wizard.name = Specfile based on a template
+category.description = Specfile Editor Commands
+category.name.0 = Editor Commands
+command.name = Toggle Comment
+command.name.0 = Organize patches
+command.name.1 = Show outline
+command.label = Toggle Comments
+command.tooltip = Add or Remove Comments
+command.label.0 = Organize patches
+command.tooltip.0 = Organize patches numerically
+command.label.1 = Show Outline
+command.tooltip.1 = Show Outline
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/plugin.xml b/rpm/org.eclipse.linuxtools.rpm.ui.editor/plugin.xml
new file mode 100644
index 0000000..5555860
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/plugin.xml
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?><!--
+    Copyright (c) 2009 Red Hat, Inc.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+    
+    Contributors:
+        Red Hat - initial API and implementation
+ -->
+
+<plugin>
+
+   <extension point="org.eclipse.ui.contexts">
+      <context
+            name="%context.name"
+            id="org.eclipse.linuxtools.rpm.ui.specEditorScope"
+            parentId="org.eclipse.ui.textEditorScope">
+      </context>
+   </extension>
+   
+   <extension
+         point="org.eclipse.ui.editors">
+      <editor
+            name="%editor.name"
+            extensions="spec"
+            icon="icons/rpm.gif"
+            contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor"
+            class="org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor"
+            id="org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor">
+      </editor>
+      <editor
+            name="%editor.name.0"
+            extensions="spec"
+            icon="icons/rpm.gif"
+            contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor"
+            class="org.eclipse.linuxtools.rpm.ui.editor.forms.SpecfileFormEditor"
+            id="org.eclipse.linuxtools.rpm.ui.editor.forms.SpecfileFormEditor">
+      </editor>
+   </extension>
+   
+   <extension
+	   id="specfileerror"
+	   point="org.eclipse.core.resources.markers"
+	   name="%extension.name">
+	   <super type="org.eclipse.core.resources.problemmarker"/>
+	   <super type="org.eclipse.core.resources.textmarker"/>
+	   <persistent value="true"/>
+	</extension>
+	 <extension
+	   id="specfiletask"
+	   point="org.eclipse.core.resources.markers"
+	   name="%extension.name.0">
+	   <super type="org.eclipse.core.resources.taskmarker"/>
+	   <persistent value="true"/>
+	</extension>
+   <extension
+         point="org.eclipse.ui.editors.documentProviders">
+      <provider
+      		extensions="spec"
+            class="org.eclipse.linuxtools.rpm.ui.editor.SpecfileDocumentProvider"
+            id="org.eclipse.linuxtools.rpm.ui.editor.specfileDocumentProvider">
+      </provider>
+   </extension>
+   <extension
+         point="org.eclipse.linuxtools.changelog.core.parserContribution">
+      <parser
+            class="org.eclipse.linuxtools.rpm.ui.editor.actions.SpecfileChangelogParser"
+            editor="SpecfileEditor"
+            name="SpecfileChangelogParser"/>
+   </extension>
+   <extension
+         point="org.eclipse.linuxtools.changelog.core.formatterContribution">
+      <formatter
+            class="org.eclipse.linuxtools.rpm.ui.editor.actions.SpecfileChangelogFormatter"
+            id="org.eclipse.linuxtools.rpm.ui.editor.actions.specfilechangelogformatter"
+            inFile="true"
+            name="SpecfileChangelogFormatter">
+         <filePattern pattern=".*\.spec"/>
+      </formatter>
+   </extension>
+  
+   <extension
+         point="org.eclipse.ui.editors.templates">
+      <contextType
+            class="org.eclipse.jface.text.templates.TemplateContextType"
+            name="preSection"
+            id="org.eclipse.linuxtools.rpm.ui.editor.preSection"/>
+      <contextType
+            class="org.eclipse.jface.text.templates.TemplateContextType"
+            name="buildSection"
+            id="org.eclipse.linuxtools.rpm.ui.editor.buildSection"/>
+      <contextType
+            class="org.eclipse.jface.text.templates.TemplateContextType"
+            name="preambleSection"
+            id="org.eclipse.linuxtools.rpm.ui.editor.preambleSection"/>
+      <include file="templates/templates.xml"/>
+      <contextType
+            class="org.eclipse.jface.text.templates.TemplateContextType"
+            id="org.eclipse.linuxtools.rpm.ui.editor.installSection"
+            name="fileSection"/>
+      <contextType
+            class="org.eclipse.jface.text.templates.TemplateContextType"
+            id="org.eclipse.linuxtools.rpm.ui.editor.changelogSection"
+            name="changelogSection"/>
+      <include file="templates/templates.xml"/>
+   </extension>
+   <extension
+         point="org.eclipse.ui.preferencePages">
+      <page
+            class="org.eclipse.linuxtools.rpm.ui.editor.preferences.MainPreferencePage"
+            id="org.eclipse.linuxtools.rpm.ui.editor.mainpage"
+            name="%page.name"/>
+      <page
+            category="org.eclipse.linuxtools.rpm.ui.editor.mainpage"
+            class="org.eclipse.linuxtools.rpm.ui.editor.preferences.RpmProposalsPreferencePage"
+            id="org.eclipse.linuxtools.rpm.ui.editor.preferences.RpmProposalsPreferencePage"
+            name="%page.name.0"/>
+      <page
+            category="org.eclipse.linuxtools.rpm.ui.editor.mainpage"
+            class="org.eclipse.linuxtools.rpm.ui.editor.preferences.MacroProposalsPreferencePage"
+            id="org.eclipse.linuxtools.rpm.ui.editor.preferences.MacroProposalsPreferencePage"
+            name="%page.name.1"/>
+      <page
+            category="org.eclipse.linuxtools.rpm.ui.editor.mainpage"
+            class="org.eclipse.linuxtools.rpm.ui.editor.preferences.SpecTemplatePreferencePage"
+            id="org.eclipse.linuxtools.rpm.ui.editor.preferences.SpecTemplatePreferencePage"
+            name="%page.name.2"/>
+      <page
+            category="org.eclipse.linuxtools.rpm.ui.editor.preferences.RpmProposalsPreferencePage"
+            class="org.eclipse.linuxtools.rpm.ui.editor.preferences.RpmInformationsPreferencePage"
+            id="org.eclipse.linuxtools.rpm.ui.editor.preferences.RpmInformationsPreferencePage"
+            name="%page.name.3"/>
+      <page
+            category="org.eclipse.linuxtools.rpm.ui.editor.mainpage"
+            class="org.eclipse.linuxtools.rpm.ui.editor.preferences.TaskTagsPreferencePage"
+            id="org.eclipse.linuxtools.rpm.ui.editor.preferences.TaskTagsPreferencePage"
+            name="%page.name.4"/>
+   </extension>
+
+   <extension
+         point="org.eclipse.core.runtime.preferences">
+      <initializer class="org.eclipse.linuxtools.rpm.ui.editor.preferences.PreferenceInitializer"/>
+   </extension>
+   
+   <extension
+         point="org.eclipse.ui.editors.markerAnnotationSpecification">
+      <specification
+            annotationType="org.eclipse.linuxtools.rpm.ui.editor.highlightannotation"
+            verticalRulerPreferenceKey="highlight.rulers.vertical"
+            textPreferenceKey="highlight.text"
+            colorPreferenceKey="highlight.color"
+            highlightPreferenceKey="highlight.background"
+            textPreferenceValue="false"
+            textStylePreferenceValue="UNDERLINE"
+            overviewRulerPreferenceKey="highlight.rulers.overview"
+            presentationLayer="4"
+            highlightPreferenceValue="true"
+            label="Macro"
+            icon="icons/occurrence_obj.gif"
+            colorPreferenceValue="253,255,155"
+            verticalRulerPreferenceValue="true"
+            overviewRulerPreferenceValue="true"
+            textStylePreferenceKey="highlight.text.style">
+      </specification>
+   </extension>
+   <extension
+         point="org.eclipse.ui.newWizards">
+      <category
+            id="org.eclipse.linuxtools.rpm.ui.editor"
+            name="%category.name">
+      </category>
+      <wizard
+            category="org.eclipse.linuxtools.rpm.ui.editor"
+            class="org.eclipse.linuxtools.rpm.ui.editor.wizards.SpecfileNewWizard"
+            icon="icons/rpm.gif"
+            id="org.eclipse.linuxtools.rpm.ui.editor.wizards.SpecfileNewWizard"
+            name="%wizard.name">
+      </wizard>
+   </extension>
+   <!-- Commands -->
+   <extension
+         point="org.eclipse.ui.commands">
+         <category
+            name="%category.name.0"
+            description="%category.description"
+            id="rpmEditor.category"/>
+         <command
+            categoryId="rpmEditor.category"
+            name="%command.name"
+            id="rpmEditor.toggleComment.command"/>
+         <command
+            categoryId="rpmEditor.category"
+            name="%command.name.0"
+            id="rpmEditor.organizePatches.command"/>
+         <command
+         	categoryId="rpmEditor.category"
+            id="rpmEditor.showOutline.command"
+            name="%command.name.1"/>
+   </extension>
+   <extension point="org.eclipse.ui.handlers">
+    	<handler
+         	class="org.eclipse.linuxtools.rpm.ui.editor.actions.SpecfileEditorToggleCommentActionDelegate"
+         	commandId="rpmEditor.toggleComment.command" />
+   		<handler
+         	class="org.eclipse.linuxtools.rpm.ui.editor.actions.SpecfileEditorOrganizePatchesActionDelegate"
+         	commandId="rpmEditor.organizePatches.command" />
+   		<handler
+         	class="org.eclipse.linuxtools.rpm.ui.editor.actions.SpecfileEditorShowOutlineActionDelegate"
+         	commandId="rpmEditor.showOutline.command" />
+   </extension>
+   <!-- Key bindings -->
+   <extension
+     point="org.eclipse.ui.bindings">
+      <key
+           sequence="Ctrl+Shift+C"
+           commandId="rpmEditor.toggleComment.command"
+           contextId="org.eclipse.ui.textEditorScope"
+           schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+           sequence="Ctrl+Shift+O"
+           commandId="rpmEditor.organizePatches.command"
+           contextId="org.eclipse.linuxtools.rpm.ui.specEditorScope"
+           schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+      	   sequence="Ctrl+O"
+           commandId="rpmEditor.showOutline.command"
+           contextId="org.eclipse.linuxtools.rpm.ui.specEditorScope"
+           schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+   </extension>
+   <!-- Editor menu actions -->
+   <extension
+         point="org.eclipse.ui.menus">
+         <menuContribution
+            locationURI="popup:#TextEditorContext?after=additions">
+         <command
+               commandId="rpmEditor.toggleComment.command"
+               label="%command.label"
+               tooltip="%command.tooltip" />
+         <command
+               commandId="rpmEditor.organizePatches.command"
+               label="%command.label.0"
+               tooltip="%command.tooltip.0" />
+         <command
+               commandId="rpmEditor.showOutline.command"
+               label="%command.label.1"
+               tooltip="%command.tooltip.1" />
+      </menuContribution>
+   </extension>
+   <!-- Compare support-->
+   <extension point="org.eclipse.compare.contentMergeViewers">
+	  <viewer
+		id="org.eclipse.linuxtools.rpm.ui.editor.SpecMergeViewer"
+		extensions="spec"
+		class="org.eclipse.linuxtools.rpm.ui.editor.compare.SpecMergeViewerCreator">
+	  </viewer>
+   </extension>
+   <extension point="org.eclipse.compare.structureMergeViewers">
+	  <viewer
+		id="org.eclipse.linuxtools.rpm.ui.editor.SpecStructureMergeViewer"
+		extensions="spec"
+		class="org.eclipse.linuxtools.rpm.ui.editor.compare.SpecStructureMergeViewerCreator">
+	  </viewer>
+   </extension>
+   <extension point ="org.eclipse.compare.structureCreators">
+ 		<structureCreator id="org.eclipse.linuxtools.rpm.ui.editor.SpecStructureCreator" 
+		class="org.eclipse.linuxtools.rpm.ui.editor.compare.SpecStructureCreator" extensions="spec"/>
+   </extension>
+</plugin>
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/Activator.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/Activator.java
new file mode 100644
index 0000000..5ac387b
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/Activator.java
@@ -0,0 +1,203 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *    Alphonse Van Assche
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.LineNumberReader;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.jface.text.templates.ContextTypeRegistry;
+import org.eclipse.jface.text.templates.persistence.TemplateStore;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.editors.text.templates.ContributionContextTypeRegistry;
+import org.eclipse.ui.editors.text.templates.ContributionTemplateStore;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.rpm.ui.editor"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+	
+	private ContributionTemplateStore fTemplateStore;
+	private ContributionContextTypeRegistry fContextTypeRegistry;
+	
+	// RPM macros list
+	private RpmMacroProposalsList macrosList ;
+	
+	// RPM Groups
+	private List<String> rpmGroups = new ArrayList<String>() ;
+	
+	// RPM package list
+	public static RpmPackageProposalsList packagesList ;
+	
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+		super();
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		RpmPackageBuildProposalsJob.setPropertyChangeListener(true);
+		RpmPackageBuildProposalsJob.update();
+		// Do some sanity checks.
+		UiUtils.pluginSanityCheck();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		RpmPackageBuildProposalsJob.setPropertyChangeListener(false);
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Returns an image descriptor for the image file at the given
+	 * plug-in relative path
+	 *
+	 * @param path the path
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return imageDescriptorFromPlugin(PLUGIN_ID, path);
+	}
+	
+	public TemplateStore getTemplateStore() {
+		if (fTemplateStore == null) {
+			fTemplateStore= new ContributionTemplateStore(getContextTypeRegistry(), getPreferenceStore(), "templates"); //$NON-NLS-1$
+			try {
+				fTemplateStore.load();
+			} catch (IOException e) {
+				SpecfileLog.logError(e);
+			}
+		}
+
+		return fTemplateStore;
+	}
+
+	public RpmMacroProposalsList getRpmMacroList() {
+		macrosList = new RpmMacroProposalsList();
+		return macrosList;
+	}
+	
+	
+	public RpmPackageProposalsList getRpmPackageList() {
+		if (packagesList == null){
+			packagesList = new RpmPackageProposalsList();
+		} else if (packagesList.getProposals("").size() == 0) { //$NON-NLS-1$
+			packagesList = new RpmPackageProposalsList();
+		}
+		return packagesList;
+	}
+	
+	public List<String> getRpmGroups() {
+		if (rpmGroups.isEmpty()) {
+			// FIXME: Can we assume that all distros place
+			// documentations files in the below path?
+			String docDir = "/usr/share/doc/"; //$NON-NLS-1$
+			File dir = new File(docDir);
+			if (dir.exists()) {
+				File files[] = dir.listFiles(new FilenameFilter() {
+					public boolean accept(File dir, String name) {
+						return name.startsWith("rpm-"); //$NON-NLS-1$
+					}
+				});
+				try {
+					// We can not be sure that there is only one directory here
+					// starting with rpm-
+					// (e.g. rpm-apidocs is the wrong directory.)
+					for (File file : files) {
+						File groupsFile = new File(file, "GROUPS"); //$NON-NLS-1$
+						if (groupsFile.exists()) {
+
+							LineNumberReader reader = new LineNumberReader(
+									new FileReader(groupsFile));
+							String line;
+							while ((line = reader.readLine()) != null) {
+								rpmGroups.add(line);
+							}
+							break;
+						}
+					}
+				} catch (IOException e) {
+					SpecfileLog.logError(e);
+				}
+			}
+		}
+		return rpmGroups;
+	}
+
+	public ContextTypeRegistry getContextTypeRegistry() {
+		if (fContextTypeRegistry == null) {
+			fContextTypeRegistry = new ContributionContextTypeRegistry();
+			fContextTypeRegistry.addContextType("org.eclipse.linuxtools.rpm.ui.editor.preambleSection"); //$NON-NLS-1$
+			fContextTypeRegistry.addContextType("org.eclipse.linuxtools.rpm.ui.editor.preSection"); //$NON-NLS-1$
+			fContextTypeRegistry.addContextType("org.eclipse.linuxtools.rpm.ui.editor.buildSection"); //$NON-NLS-1$
+			fContextTypeRegistry.addContextType("org.eclipse.linuxtools.rpm.ui.editor.installSection"); //$NON-NLS-1$
+			fContextTypeRegistry.addContextType("org.eclipse.linuxtools.rpm.ui.editor.changelogSection");			 //$NON-NLS-1$
+		}
+		return fContextTypeRegistry;
+	}
+	
+	/**
+	 * Get a <code>Image</code> object for the given relative path.
+	 * 
+	 * @param imageRelativePath	The relative path to the image.
+	 * @return
+	 * 		a <code>Image</code>
+	 */
+	public Image getImage(String imageRelativePath) {
+		ImageRegistry registry = getImageRegistry();
+		Image image = registry.get(imageRelativePath);
+		if (image == null) {
+			ImageDescriptor desc = getImageDescriptor(imageRelativePath);
+			registry.put(imageRelativePath, desc);
+			image = registry.get(imageRelativePath);
+		}
+		return image;
+	}
+	
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/ColorManager.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/ColorManager.java
new file mode 100644
index 0000000..3e50950
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/ColorManager.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.widgets.Display;
+
+public class ColorManager {
+
+	protected Map<RGB, Color> fColorTable = new HashMap<RGB, Color>(10);
+
+	public void dispose() {
+		for (Map.Entry<RGB, Color> entry:fColorTable.entrySet()){
+			entry.getValue().dispose();
+		}
+	}
+	public Color getColor(RGB rgb) {
+		Color color = fColorTable.get(rgb);
+		if (color == null) {
+			color = new Color(Display.getCurrent(), rgb);
+			fColorTable.put(rgb, color);
+		}
+		return color;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/ISpecfileColorConstants.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/ISpecfileColorConstants.java
new file mode 100644
index 0000000..beaaf2c
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/ISpecfileColorConstants.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor;
+
+import org.eclipse.swt.graphics.RGB;
+
+public interface ISpecfileColorConstants {
+	// general constants 
+	RGB DEFAULT = new RGB(0, 0, 0);
+	RGB SECTIONS = new RGB(128, 0, 0);
+	RGB MACROS = new RGB(0, 0, 128);
+	RGB KEYWORDS = new RGB(127, 0, 85);
+	RGB DEFINES = new RGB(0, 128, 0);
+	RGB TAGS = new RGB(255, 101, 52);
+	RGB COMMENT = new RGB(63, 95, 191);
+	RGB PACKAGES = new RGB(0, 0, 128);
+	
+	// changelog section specific constants
+	RGB AUTHOR_MAIL = new RGB(10, 20, 175);
+	RGB VER_REL = new RGB(255, 101, 52);
+	
+	
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/ISpecfileSpecialSymbols.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/ISpecfileSpecialSymbols.java
new file mode 100644
index 0000000..8d6a1e6
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/ISpecfileSpecialSymbols.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor;
+
+/**
+ * Constants for all the special symbols in spec file.
+ * 
+ */
+public interface ISpecfileSpecialSymbols {
+	/**
+	 * Identifier for macro start - long one.
+	 */
+	String MACRO_START_LONG = "%{"; //$NON-NLS-1$
+	/**
+	 * Identifier for macro end - long one.
+	 */
+	String MACRO_END_LONG = "}"; //$NON-NLS-1$
+	
+	/**
+	 * Identifier for macro start - short one.
+	 */
+	String MACRO_START_SHORT = "%"; //$NON-NLS-1$
+	/**
+	 * Identifier for comment start. Comment is from this symbol till the line
+	 * end.
+	 */
+	String COMMENT_START = "#"; //$NON-NLS-1$
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/Messages.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/Messages.java
new file mode 100644
index 0000000..d7215fd
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/Messages.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor;
+
+import org.eclipse.osgi.util.NLS;
+
+public final class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.rpm.ui.editor.messages"; //$NON-NLS-1$
+	public static String RpmMacroProposalsList_0;
+	public static String RpmPackageBuildProposalsJob_0;
+	public static String RpmPackageBuildProposalsJob_1;
+	public static String RpmPackageBuildProposalsJob_2;
+	public static String RpmPackageBuildProposalsJob_3;
+	public static String RpmPackageProposalsList_0;
+	public static String RpmPackageProposalsList_1;
+	public static String RpmPackageProposalsList_2;
+	public static String RpmPackageProposalsList_3;
+	public static String SpecfileConfiguration_0;
+	public static String SpecfileEditor_0;
+	public static String SpecfileEditor_1;
+	public static String SpecfileEditor_2;
+	public static String SpecfileLog_0;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+		super();
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/NonRuleBasedDamagerRepairer.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/NonRuleBasedDamagerRepairer.java
new file mode 100644
index 0000000..fae9e80
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/NonRuleBasedDamagerRepairer.java
@@ -0,0 +1,148 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.DocumentEvent;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITypedRegion;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.TextPresentation;
+import org.eclipse.jface.text.presentation.IPresentationDamager;
+import org.eclipse.jface.text.presentation.IPresentationRepairer;
+import org.eclipse.swt.custom.StyleRange;
+
+public class NonRuleBasedDamagerRepairer
+	implements IPresentationDamager, IPresentationRepairer {
+
+	/** The document this object works on */
+	protected IDocument fDocument;
+	/** The default text attribute if non is returned as data by the current token */
+	protected TextAttribute fDefaultTextAttribute;
+	
+	/**
+	 * Constructor for NonRuleBasedDamagerRepairer.
+	 */
+	public NonRuleBasedDamagerRepairer(TextAttribute defaultTextAttribute) {
+		Assert.isNotNull(defaultTextAttribute);
+
+		fDefaultTextAttribute = defaultTextAttribute;
+	}
+
+	/**
+	 * @see IPresentationRepairer#setDocument(IDocument)
+	 */
+	public void setDocument(IDocument document) {
+		fDocument = document;
+	}
+
+	/**
+	 * Returns the end offset of the line that contains the specified offset or
+	 * if the offset is inside a line delimiter, the end offset of the next line.
+	 *
+	 * @param offset the offset whose line end offset must be computed
+	 * @return the line end offset for the given offset
+	 * @exception BadLocationException if offset is invalid in the current document
+	 */
+	protected int endOfLineOf(int offset) throws BadLocationException {
+
+		IRegion info = fDocument.getLineInformationOfOffset(offset);
+		if (offset <= info.getOffset() + info.getLength())
+			return info.getOffset() + info.getLength();
+
+		int line = fDocument.getLineOfOffset(offset);
+		try {
+			info = fDocument.getLineInformation(line + 1);
+			return info.getOffset() + info.getLength();
+		} catch (BadLocationException x) {
+			return fDocument.getLength();
+		}
+	}
+
+	/**
+	 * @see IPresentationDamager#getDamageRegion(ITypedRegion, DocumentEvent, boolean)
+	 */
+	public IRegion getDamageRegion(
+		ITypedRegion partition,
+		DocumentEvent event,
+		boolean documentPartitioningChanged) {
+		if (!documentPartitioningChanged) {
+			try {
+
+				IRegion info =
+					fDocument.getLineInformationOfOffset(event.getOffset());
+				int start = Math.max(partition.getOffset(), info.getOffset());
+
+				int end =
+					event.getOffset()
+						+ (event.getText() == null
+							? event.getLength()
+							: event.getText().length());
+
+				if (info.getOffset() <= end
+					&& end <= info.getOffset() + info.getLength()) {
+					// optimize the case of the same line
+					end = info.getOffset() + info.getLength();
+				} else
+					end = endOfLineOf(end);
+
+				end =
+					Math.min(
+						partition.getOffset() + partition.getLength(),
+						end);
+				return new Region(start, end - start);
+
+			} catch (BadLocationException x) {
+			}
+		}
+
+		return partition;
+	}
+
+	/**
+	 * @see IPresentationRepairer#createPresentation(TextPresentation, ITypedRegion)
+	 */
+	public void createPresentation(
+		TextPresentation presentation,
+		ITypedRegion region) {
+		addRange(
+			presentation,
+			region.getOffset(),
+			region.getLength(),
+			fDefaultTextAttribute);
+	}
+
+	/**
+	 * Adds style information to the given text presentation.
+	 *
+	 * @param presentation the text presentation to be extended
+	 * @param offset the offset of the range to be styled
+	 * @param length the length of the range to be styled
+	 * @param attr the attribute describing the style of the range to be styled
+	 */
+	protected void addRange(
+		TextPresentation presentation,
+		int offset,
+		int length,
+		TextAttribute attr) {
+		if (attr != null)
+			presentation.addStyleRange(
+				new StyleRange(
+					offset,
+					length,
+					attr.getForeground(),
+					attr.getBackground(),
+					attr.getStyle()));
+	}
+}
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroOccurrencesUpdater.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroOccurrencesUpdater.java
new file mode 100644
index 0000000..2d039c1
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroOccurrencesUpdater.java
@@ -0,0 +1,239 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITextSelection;
+import org.eclipse.jface.text.Position;
+import org.eclipse.jface.text.source.Annotation;
+import org.eclipse.jface.text.source.IAnnotationModel;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.viewers.IPostSelectionProvider;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.Specfile;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileDefine;
+
+class RpmMacroOccurrencesUpdater implements ISelectionChangedListener {
+												   
+	private static final String ANNOTATION_TYPE = Activator.PLUGIN_ID + ".highlightannotation"; //$NON-NLS-1$
+
+	private final SpecfileEditor fEditor;
+
+	private final List<Annotation> fOldAnnotations = new LinkedList<Annotation>();
+
+	/**
+	 * Creates a new instance on editor <code>specfileEditor</code>.
+	 * 
+	 * @param specfileEditor The editor to mark occurrences on.
+	 */
+	public RpmMacroOccurrencesUpdater(SpecfileEditor specfileEditor) {
+		((IPostSelectionProvider) specfileEditor.getSelectionProvider())
+				.addPostSelectionChangedListener(this);
+		fEditor = specfileEditor;
+	}
+
+	/*
+	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
+	 */
+	public void selectionChanged(SelectionChangedEvent event) {
+		update((ISourceViewer) event.getSource());
+	}
+
+	/**
+	 * Updates the drawn annotations.
+	 * 
+	 * @param viewer The viewer to get the document and annotation model from
+	 */
+	public void update(ISourceViewer viewer) {
+		try {
+			IDocument document = viewer.getDocument();
+			IAnnotationModel model = viewer.getAnnotationModel();
+			if (document == null || model == null) {
+				return;
+			}
+			removeOldAnnotations(model);
+			String currentSelectedWord = getWordAtSelection(fEditor.getSelectionProvider()
+					.getSelection(), document);
+			if (isMacro(currentSelectedWord)) {
+				Specfile spec = fEditor.getSpecfile();
+				SpecfileDefine define = spec.getDefine(currentSelectedWord);
+				String word = currentSelectedWord + ": "; //$NON-NLS-1$
+                if (define != null) {
+                	word += define.getStringValue();
+                } else {
+              		// If there's no such define we try to see if it corresponds to
+            		// a Source or Patch declaration
+            		String retrivedValue = SpecfileHover.getSourceOrPatchValue(spec, currentSelectedWord.toLowerCase());
+            		if (retrivedValue != null) 
+            			word += retrivedValue;
+            		else {
+            			// If it does not correspond to a Patch or Source macro, try to find it
+            			// in the macro proposals list.
+            			retrivedValue = SpecfileHover.getMacroValueFromMacroList(currentSelectedWord);
+            			if (retrivedValue != null) 
+            				word += retrivedValue;
+            		}
+                }
+                createNewAnnotations(currentSelectedWord, word, document, model);
+			}
+		} catch (BadLocationException e) {
+			SpecfileLog.logError(e);
+		}
+	}
+
+	/**
+	 * Removes the previous set of annotations from the annotation model.
+	 * 
+	 * @param model
+	 *            the annotation model
+	 */
+	private void removeOldAnnotations(IAnnotationModel model) {
+		for (Annotation annotation: fOldAnnotations) {
+			model.removeAnnotation(annotation);
+		}
+		fOldAnnotations.clear();
+	}
+
+	/**
+	 * Checks if <code>word</code> is an macro.
+	 * 
+	 * @param word
+	 *            the word to check
+	 * 
+	 * @return <code>true</code> if <code>word</code> is an macro,
+	 *         <code>false</code> otherwise
+	 */
+	private boolean isMacro(String word) {
+		List<SpecfileDefine> defines = getMacros();
+		if (word.length() > 0) {
+			for (SpecfileDefine define: defines) {
+				if (containsWord(define, word)) {
+					return true;
+				}
+			}
+			if (Activator.getDefault().getRpmMacroList().getProposals(
+					"%" + word).size() > 0) //$NON-NLS-1$
+				return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Retrieves the macros from the editor's specfile.
+	 * 
+	 * @return the macros from the editor's specfile
+	 */
+	private List<SpecfileDefine> getMacros() {
+		Specfile specfile = fEditor.getSpecfile();
+		if (specfile != null) {
+			List<SpecfileDefine> macros = specfile.getDefines();
+			if (macros != null)
+				return macros;
+		}
+		return new ArrayList<SpecfileDefine>();
+	}
+
+	/**
+	 * Returns <code>true</code> if <code>macro</code> equals the word
+	 * <code>current</code>.
+	 * 
+	 * @param macro
+	 *            the <code>macro</code> to check
+	 * @param current
+	 *            the word to look for
+	 * 
+	 * @return <code>true</code> if <code>macro</code> contains the word
+	 *         <code>current</code>,<code>false</code> if not
+	 */
+	private boolean containsWord(SpecfileDefine macro, String current) {
+		return macro.getName().toLowerCase().equals(current);
+	}
+
+	/**
+	 * Returns the word at the current selection / caret position.
+	 * 
+	 * @param selection
+	 *            the selection
+	 * @param document
+	 *            the document
+	 * @return the currently selected text, or the word at the caret if the
+	 *         selection has length 0
+	 * @throws BadLocationException
+	 *             if accessing the document fails
+	 */
+	private String getWordAtSelection(ISelection selection, IDocument document)
+			throws BadLocationException {
+		String word;
+		if (selection instanceof ITextSelection) {
+			ITextSelection ts = (ITextSelection) selection;
+			int offset = ts.getOffset();
+			int end = offset + ts.getLength();
+
+			// non-empty selections
+			if (end != offset) {
+				word = ts.getText();
+			} else {
+				while (offset > 0 && isDefineChar(document.getChar(offset - 1)))
+					offset--;
+				while (end < document.getLength()
+						&& isDefineChar(document.getChar(end)))
+					end++;
+
+				word = document.get(offset, end - offset);
+			}
+		} else {
+			word = ""; //$NON-NLS-1$
+		}
+		return word.toLowerCase();
+	}
+
+	private boolean isDefineChar(char c) {
+		return c != '{' && c != '}' && c != '?' && !Character.isWhitespace(c);
+	}
+
+	/**
+	 * Adds an annotation for every occurrence of <code>macro</code> in the
+	 * document. Also stores the created annotations in
+	 * <code>fOldAnnotations</code>.
+	 * 
+	 * @param macro
+	 *            the word to look for
+	 * @param document
+	 *            the document
+	 * @param model
+	 *            the annotation model
+	 */
+	private void createNewAnnotations(String macro, String hoverContent, IDocument document,
+			IAnnotationModel model) {
+		String content = document.get().toLowerCase();
+		int idx = content.indexOf(macro.toLowerCase());
+		while (idx != -1) {
+			Annotation annotation = new Annotation(ANNOTATION_TYPE, false,
+					hoverContent);
+			Position position = new Position(idx, macro.length());
+			model.addAnnotation(annotation, position);
+			fOldAnnotations.add(annotation);
+			idx = content.indexOf(macro, idx + 1);
+		}
+	}
+
+	public void dispose() {
+		((IPostSelectionProvider) fEditor.getSelectionProvider())
+				.removePostSelectionChangedListener(this);
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroProposalsList.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroProposalsList.java
new file mode 100644
index 0000000..fb59408
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/RpmMacroProposalsList.java
@@ -0,0 +1,227 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.eclipse.linuxtools.rpm.ui.editor.preferences.PreferenceConstants;
+import org.eclipse.linuxtools.rpm.ui.editor.scanners.SpecfileScanner;
+
+/**
+ * This class is used to retrieve and manage the RPM macro 
+ * proposals list.
+ *
+ */
+public class RpmMacroProposalsList {
+
+	private static final String EMPTY_STRING = ""; //$NON-NLS-1$
+
+	private Map<String, String> macroMap = new HashMap<String, String>();
+
+	private String toStringStr;
+
+	/**
+	 * Default contructor
+	 */
+	public RpmMacroProposalsList() {
+		buildMacroList();
+	}
+
+	/**
+	 * Build the macro list.
+	 */
+	public final void buildMacroList() {
+		for (String definedMacro: SpecfileScanner.DEFINED_MACROS){
+			macroMap.put(definedMacro, Messages.RpmMacroProposalsList_0);
+			//TODO find way to provide info about buildin macros.
+		}
+		String macroProposalsPaths = Activator.getDefault()
+				.getPreferenceStore().getString(
+						PreferenceConstants.P_MACRO_PROPOSALS_FILESPATH);
+		String[] paths = macroProposalsPaths.split(";"); //$NON-NLS-1$
+		// paths must be reversed because the last value added
+		// into a Map overwrites the first.
+		paths = reverseStringArray(paths);
+		for (String path : paths) {
+			if (!path.equals(EMPTY_STRING)) {
+				File pathFile = new File(path);
+				if (pathFile.exists()) {
+					if (pathFile.isDirectory()) {
+						File[] macrosFiles = pathFile.listFiles();
+						for (File macrosFile : macrosFiles) {
+							addMacroToMap(macrosFile.getAbsolutePath());
+						}
+					} else {
+						addMacroToMap(path);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Add macro definition to the map
+	 * 
+	 * @param filename
+	 *            macro file definition.
+	 */
+	private void addMacroToMap(String filename) {
+		String line = EMPTY_STRING;
+		try {
+			BufferedReader reader = new BufferedReader(new InputStreamReader(
+					new FileInputStream(filename)));
+			line = reader.readLine();
+			String key = EMPTY_STRING, value = EMPTY_STRING;
+			while (line != null) {
+				if (line.startsWith("%")) { //$NON-NLS-1$
+					String[] item = line.split("\t+| ", 2); //$NON-NLS-1$
+					try {
+						// Get values on more than one line
+						if (line.trim().endsWith("\\")) { //$NON-NLS-1$
+							value = "\n"; //$NON-NLS-1$
+							boolean isKeyLine = true;
+							while (line.trim().endsWith("\\")) { //$NON-NLS-1$
+								if (isKeyLine) {
+									isKeyLine = false;
+									key = item[0];
+									if (item.length > 1)
+										value += item[1].replaceAll("\\", "\n\n");  //$NON-NLS-1$//$NON-NLS-2$
+								} else {
+									value += line.substring(0,
+											line.length() - 1).trim()
+											+ "\n\t"; //$NON-NLS-1$
+								}
+								line = reader.readLine();
+							}
+						} else {
+							key = item[0];
+							value = item[1];
+						}
+						key = key.trim();
+						value = value.trim();
+						macroMap.put(key, value);
+						toStringStr += key + ": " + value + "\n"; //$NON-NLS-1$ //$NON-NLS-2$
+					} catch (Exception e) {
+						line = reader.readLine();
+						continue;
+					}
+					value = EMPTY_STRING;
+					key = EMPTY_STRING;
+				}
+				line = reader.readLine();
+			}
+		} catch (IOException e) {
+			SpecfileLog.logError(e);
+		}
+	}
+
+	/**
+	 * Reverse a <code>String</code> array.
+	 * 
+	 * @param stringArrayToReverse
+	 *            the string array to reverse.
+	 * @return the reversed <code>String</code> array.
+	 */
+	private String[] reverseStringArray(String[] stringArrayToReverse) {
+		int left = 0;
+		int right = stringArrayToReverse.length - 1;
+		while (left < right) {
+			String tmp = stringArrayToReverse[left];
+			stringArrayToReverse[left] = stringArrayToReverse[right];
+			stringArrayToReverse[right] = tmp;
+			left++;
+			right--;
+		}
+		return stringArrayToReverse;
+	}
+
+	/**
+	 * Get proposals for a given prefix
+	 * 
+	 * @param prefix The prefix to search.
+	 * @return a <code>Map</code> of proposals.
+	 */
+	public Map<String, String> getProposals(String prefix) {
+		Map<String, String> proposalsMap = new HashMap<String, String>(macroMap.size());
+		int i = 0;
+		for (Map.Entry<String, String> entry: macroMap.entrySet()) {
+			// Get proposals for macro begin with { char too.
+			if (entry.getKey().startsWith(prefix.replaceFirst("\\{", EMPTY_STRING))) { //$NON-NLS-1$
+				proposalsMap.put(entry.getKey(), entry.getValue());
+			}
+			i++;
+		}
+		// Sort proposals
+		Map<String, String> sortedMap = new TreeMap<String, String>(proposalsMap);
+		return sortedMap;
+	}
+
+	/**
+	 * Get the value for a given macro.
+	 * 
+	 * @param key Key to retrieve value.
+	 * @return a string representation of the value
+	 */
+	public String getValue(String key) {
+		String value = macroMap.get("%" + key); //$NON-NLS-1$
+		// get proposals for macro contain ? too.
+		if (value == null) {
+			value = macroMap.get(("%" + key).replaceFirst("\\?", EMPTY_STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		return value;
+	}
+	
+	/**
+	 * Find a key in the macroMap
+	 * 
+	 * @param keyToFind The key to find.
+	 * @return return the value
+	 */
+	public boolean findKey(String keyToFind) {
+		return macroMap.containsKey(keyToFind);
+	}
+	
+	/**
+	 * Return the ouput of the <code>rpm --eval</code> command for a given
+	 * macro.
+	 *  
+	 * @param macroName The macro name to eval.
+	 * @return the resolved macro content.
+	 */
+	public static String getMacroEval(String macroName) {
+		String eval = EMPTY_STRING;
+		try {
+			eval = org.eclipse.linuxtools.rpm.core.utils.Utils.runCommandToString( "rpm", "--eval", macroName); //$NON-NLS-1$//$NON-NLS-2$
+		} catch (IOException e) {
+			SpecfileLog.logError(e);
+		}
+		return eval.trim();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return toStringStr;
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageBuildProposalsJob.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageBuildProposalsJob.java
new file mode 100644
index 0000000..fad79a2
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageBuildProposalsJob.java
@@ -0,0 +1,199 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.Date;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.core.runtime.preferences.DefaultScope;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;
+import org.eclipse.linuxtools.rpm.core.utils.Utils;
+import org.eclipse.linuxtools.rpm.ui.editor.preferences.PreferenceConstants;
+
+public final class RpmPackageBuildProposalsJob extends Job {
+
+	private RpmPackageBuildProposalsJob(String name) {
+		super(name);
+	}
+
+	private static final String JOB_NAME = Messages.RpmPackageBuildProposalsJob_0;
+
+	private static RpmPackageBuildProposalsJob job = null;
+
+	private static final IEclipsePreferences PREFERENCES = new DefaultScope().getNode(Activator.PLUGIN_ID);
+
+	protected static final IEclipsePreferences.IPreferenceChangeListener PROPERTY_LISTENER = new IEclipsePreferences.IPreferenceChangeListener() {
+		public void preferenceChange(PreferenceChangeEvent event) {
+			if (event.getKey().equals(PreferenceConstants.P_CURRENT_RPMTOOLS)) {
+				update();
+			}
+		}
+	};
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	@Override
+	protected IStatus run(IProgressMonitor monitor) {
+		return retrievePackageList(monitor);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.core.runtime.jobs.Job#shouldSchedule()
+	 */
+	@Override
+	public boolean shouldSchedule() {
+		return equals(job);
+	}
+
+	/**
+	 * Run the Job if it's needed according with the configuration set in the
+	 * preference page.
+	 */
+	protected static void update() {
+		boolean runJob = false;
+		// Today's date
+		Date today = new Date();
+		if (PREFERENCES
+				.getBoolean(PreferenceConstants.P_RPM_LIST_BACKGROUND_BUILD, PreferenceConstants.DP_RPM_LIST_BACKGROUND_BUILD)) {
+			int period = PREFERENCES
+					.getInt(PreferenceConstants.P_RPM_LIST_BUILD_PERIOD, PreferenceConstants.DP_RPM_LIST_BUILD_PERIOD);
+			// each time that the plugin is loaded.
+			if (period == 1) {
+				runJob = true;
+			} else {
+				long lastBuildTime = PREFERENCES
+						.getLong(PreferenceConstants.P_RPM_LIST_LAST_BUILD, PreferenceConstants.DP_RPM_LIST_LAST_BUILD);
+				if (lastBuildTime == 0) {
+					runJob = true;
+				} else {
+					long interval = (today.getTime() - lastBuildTime)
+							/ (1000 * 60 * 60 * 24);
+					// run the job once a week
+					if (period == 2 && interval >= 7)
+						runJob = true;
+					// run the job once a month
+					else if (period == 3 && interval >= 30)
+						runJob = true;
+				}
+			}
+			if (runJob) {
+				if (job == null) {
+					job = new RpmPackageBuildProposalsJob(JOB_NAME);
+					job.schedule();
+					PREFERENCES.putLong(PreferenceConstants.P_RPM_LIST_LAST_BUILD, today
+							.getTime());
+				} else {
+					job.cancel();
+					job.schedule();
+					PREFERENCES.putLong(
+							PreferenceConstants.P_RPM_LIST_LAST_BUILD, today
+									.getTime());
+				}
+			}
+		} else {
+			if (job != null) {
+				job.cancel();
+				job = null;
+			}
+		}
+	}
+
+	/**
+	 * Retrieve the package list
+	 * 
+	 * @param monitor
+	 *            to update
+	 * @return a <code>IStatus</code>
+	 */
+	private IStatus retrievePackageList(IProgressMonitor monitor) {
+		String rpmListCmd = Activator.getDefault().getPreferenceStore()
+				.getString(PreferenceConstants.P_CURRENT_RPMTOOLS);
+		String rpmListFilepath = Activator.getDefault().getPreferenceStore()
+				.getString(PreferenceConstants.P_RPM_LIST_FILEPATH);
+		File bkupFile = new File(rpmListFilepath + ".bkup"); //$NON-NLS-1$
+		try {
+			monitor.beginTask(Messages.RpmPackageBuildProposalsJob_1,
+					IProgressMonitor.UNKNOWN);
+			if (Utils.fileExist("/bin/sh")) { //$NON-NLS-1$
+				InputStream in = Utils.runCommandToInputStream(
+						"/bin/sh", "-c", rpmListCmd); //$NON-NLS-1$ //$NON-NLS-2$
+				// backup pkg list file
+				File rpmListFile = new File(rpmListFilepath);
+				if (rpmListFile.exists())
+					Utils.copyFile(new File(rpmListFilepath), bkupFile);
+
+				BufferedWriter out = new BufferedWriter(new FileWriter(
+						rpmListFile, false));
+				BufferedReader reader = new BufferedReader(
+						new InputStreamReader(in));
+				monitor.subTask(Messages.RpmPackageBuildProposalsJob_2
+						+ rpmListCmd + Messages.RpmPackageBuildProposalsJob_3);
+				String line;
+				while ((line = reader.readLine()) != null) {
+					monitor.subTask(line);
+					out.write(line + "\n"); //$NON-NLS-1$
+					if (monitor.isCanceled()) {
+						in.close();
+						out.close();
+						// restore backup
+						if (rpmListFile.exists() && bkupFile.exists()) {
+							Utils.copyFile(bkupFile, rpmListFile);
+							bkupFile.delete();
+						}
+						Activator.packagesList = new RpmPackageProposalsList();
+						return Status.CANCEL_STATUS;
+					}
+				}
+				in.close();
+				out.close();
+				bkupFile.delete();
+			}
+		} catch (IOException e) {
+			SpecfileLog.logError(e);
+			return null;
+		} finally {
+			monitor.done();
+		}
+		// Update package list
+		Activator.packagesList = new RpmPackageProposalsList();
+		return Status.OK_STATUS;
+	}
+
+	/**
+	 * Enable and disable the property change listener.
+	 * 
+	 * @param activated
+	 */
+	protected static void setPropertyChangeListener(boolean activated) {
+		if (activated) {
+			PREFERENCES.addPreferenceChangeListener(PROPERTY_LISTENER);
+		} else {
+			PREFERENCES.removePreferenceChangeListener(PROPERTY_LISTENER);
+		}
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageProposalsList.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageProposalsList.java
new file mode 100644
index 0000000..8399bfc
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/RpmPackageProposalsList.java
@@ -0,0 +1,169 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor;
+
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CharsetEncoder;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.linuxtools.rpm.core.utils.Utils;
+import org.eclipse.linuxtools.rpm.ui.editor.preferences.PreferenceConstants;
+
+/**
+ * This class is used to retrieve and manage the RPM package proposals.
+ * 
+ */
+public class RpmPackageProposalsList {
+	private HashSet<String> list = new HashSet<String>();
+
+	public RpmPackageProposalsList() {
+		setPackagesList();
+	}
+
+	private void setPackagesList() {
+		String rpmpkgsFile = Activator.getDefault().getPreferenceStore()
+				.getString(PreferenceConstants.P_RPM_LIST_FILEPATH);
+		try {
+			if (Utils.fileExist(rpmpkgsFile)) {
+				BufferedReader reader = new BufferedReader(
+						new InputStreamReader(new FileInputStream(rpmpkgsFile)));
+				String line = reader.readLine();
+				while (line != null) {
+					list.add(line.trim());
+					line = reader.readLine();
+				}
+			}
+		} catch (IOException e) {
+			RpmPackageBuildProposalsJob.update();
+			SpecfileLog.logError(e);
+		}
+	}
+
+	public List<String[]> getProposals(String prefix) {
+		int rpmpkgsMaxProposals = Activator.getDefault().getPreferenceStore()
+				.getInt(PreferenceConstants.P_RPM_LIST_MAX_PROPOSALS);
+		List<String[]> proposalsList = new ArrayList<String[]>(list.size());
+		int i = 0;
+		for (String listValue:list){
+			String item[] = new String[2];
+			item[0] = listValue;
+			String message = Messages.RpmPackageProposalsList_0
+					+ rpmpkgsMaxProposals
+					+ Messages.RpmPackageProposalsList_1;
+			item[1] = message;				
+			if (item[0].startsWith(prefix)) {
+				proposalsList.add(item);
+			}
+			i++;
+		}
+		/*
+		 * Show RPM informations only if the proposal list is less than the
+		 * limit set in the RPM proposals preference page.
+		 */
+		;
+		if (proposalsList.size() < rpmpkgsMaxProposals) {
+			List<String[]> proposalsListWithInfo = new ArrayList<String[]>(proposalsList.size());
+			for (String[]  proposals: proposalsList){
+				proposals[1] = getRpmInfo(proposals[0]);
+				proposalsListWithInfo.add(proposals);
+			}
+			return proposalsListWithInfo;
+		} else {
+			return proposalsList;
+		}
+	}
+	
+	public String getValue(String key) {
+		for (String item :list){
+			if (item.equals(key.trim())) {
+				return getRpmInfo(item);
+			}
+		}
+		return null;
+		
+	}
+
+	public String getRpmInfo(String pkgName) {
+		String ret = ""; //$NON-NLS-1$
+		try {
+			ret = org.eclipse.linuxtools.rpm.core.utils.Utils.runCommandToString("rpm", "-q", pkgName, "--qf",  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+					getformattedRpmInformations());
+		} catch (IOException e) {
+			SpecfileLog.logError(e);
+			return Messages.RpmPackageProposalsList_2
+					+ Messages.RpmPackageProposalsList_3;
+		}
+		// Create encoder and decoder
+		CharsetDecoder decoder = Charset.forName(System.getProperty("file.encoding")).newDecoder(); //$NON-NLS-1$
+		/*
+		 * TODO: Jcharset may be used to detect the inputstream encoding if it's required?
+		 * http://jchardet.sourceforge.net
+		 */
+		CharsetEncoder encoder = Charset.forName("ISO-8859-1").newEncoder(); //$NON-NLS-1$
+		try {
+			ByteBuffer bbuf = encoder.encode(CharBuffer.wrap(ret));
+			CharBuffer cbuf = decoder.decode(bbuf);
+			ret = cbuf.toString();
+		} catch (CharacterCodingException e) {
+			// If an error occurs when re-encoding the output, the original
+			// output is returned.
+		}
+		return ret;
+	}
+
+	private String getformattedRpmInformations() {
+		String formatedInfoString = ""; //$NON-NLS-1$
+		IPreferenceStore store = Activator.getDefault().getPreferenceStore();
+		if (store.getBoolean(PreferenceConstants.P_RPMINFO_NAME))
+			formatedInfoString += "<b>Name: </b>%{NAME}<br>"; //$NON-NLS-1$
+		if (store.getBoolean(PreferenceConstants.P_RPMINFO_VERSION))
+			formatedInfoString += "<b>Version: </b>%{VERSION}<br>"; //$NON-NLS-1$
+		if (store.getBoolean(PreferenceConstants.P_RPMINFO_RELEASE))
+			formatedInfoString += "<b>Release: </b>%{Release}<br>"; //$NON-NLS-1$
+		if (store.getBoolean(PreferenceConstants.P_RPMINFO_SUMMARY))
+			formatedInfoString += "<b>Summary: </b>%{SUMMARY}<br>"; //$NON-NLS-1$
+		if (store.getBoolean(PreferenceConstants.P_RPMINFO_LICENSE))
+			formatedInfoString += "<b>License: </b>%{LICENSE}<br>"; //$NON-NLS-1$
+		if (store.getBoolean(PreferenceConstants.P_RPMINFO_GROUP))
+			formatedInfoString += "<b>Group: </b>%{GROUP}<br>"; //$NON-NLS-1$
+		if (store.getBoolean(PreferenceConstants.P_RPMINFO_URL))
+			formatedInfoString += "<b>URL: </b>%{URL}<br>"; //$NON-NLS-1$
+		if (store.getBoolean(PreferenceConstants.P_RPMINFO_INSTALLTIME))
+			formatedInfoString += "<b>Installation Date: </b>%{INSTALLTIME:date}<br>"; //$NON-NLS-1$
+		if (store.getBoolean(PreferenceConstants.P_RPMINFO_DESCRIPTION))
+			formatedInfoString += "<b>Description: </b>%{DESCRIPTION}<br>"; //$NON-NLS-1$
+		if (store.getBoolean(PreferenceConstants.P_RPMINFO_PACKAGER))
+			formatedInfoString += "<b>Packager: </b>%{PACKAGER}<br>"; //$NON-NLS-1$
+		if (store.getBoolean(PreferenceConstants.P_RPMINFO_VENDOR))
+			formatedInfoString += "<b>Vendor: </b>%{VENDOR}<br>"; //$NON-NLS-1$
+		if (store.getBoolean(PreferenceConstants.P_RPMINFO_SIZE))
+			formatedInfoString += "<b>Size: </b>%{SIZE} bytes<br>"; //$NON-NLS-1$
+		if (store.getBoolean(PreferenceConstants.P_RPMINFO_BUILDTIME))
+			formatedInfoString += "<b>Build Date: </b>%{BUILDTIME:date}<br>"; //$NON-NLS-1$
+		if (store.getBoolean(PreferenceConstants.P_RPMINFO_SOURCERPM))
+			formatedInfoString += "<b>SRPM: </b>%{SOURCERPM}<br>"; //$NON-NLS-1$
+		return formatedInfoString;
+
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/RpmSections.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/RpmSections.java
new file mode 100644
index 0000000..b6e72a0
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/RpmSections.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Alexander Kurtakov.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Kurtakov - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor;
+
+/**
+ * Definitions of all the rpm sections.
+ */
+public interface RpmSections {
+	
+	String PREP_SECTION = "%prep"; //$NON-NLS-1$
+	String BUILD_SECTION = "%build"; //$NON-NLS-1$
+	String INSTALL_SECTION = "%install"; //$NON-NLS-1$
+	String PRETRANS_SECTION = "%pretrans"; //$NON-NLS-1$
+	String PRE_SECTION = "%pre"; //$NON-NLS-1$
+	String PREUN_SECTION = "%preun"; //$NON-NLS-1$
+	String POST_SECTION = "%post"; //$NON-NLS-1$
+	String POSTUN_SECTION = "%postun"; //$NON-NLS-1$
+	String POSTTRANS_SECTION = "%posttrans"; //$NON-NLS-1$
+	String CLEAN_SECTION = "%clean"; //$NON-NLS-1$
+	String FILES_SECTION = "%files"; //$NON-NLS-1$
+	String CHECK_SECTION = "%check"; //$NON-NLS-1$
+	String CHANGELOG_SECTION = "%changelog"; //$NON-NLS-1$
+	String PACKAGE_SECTION = "%package"; //$NON-NLS-1$
+	String DESCRIPTION_SECTION = "%description"; //$NON-NLS-1$
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/RpmTags.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/RpmTags.java
new file mode 100644
index 0000000..5ec9470
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/RpmTags.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor;
+
+
+/**
+ * Definitions of all rpm tags.
+ *
+ */
+public interface RpmTags {
+	String SUMMARY = "Summary"; //$NON-NLS-1$
+	String NAME = "Name"; //$NON-NLS-1$
+	String VERSION = "Version"; //$NON-NLS-1$
+	String PACKAGER = "Packager"; //$NON-NLS-1$
+	String ICON = "Icon"; //$NON-NLS-1$
+	String URL = "URL"; //$NON-NLS-1$
+	String PREFIX = "Prefix"; //$NON-NLS-1$
+	String GROUP = "Group"; //$NON-NLS-1$
+	String LICENSE = "License"; //$NON-NLS-1$
+	String RELEASE = "Release"; //$NON-NLS-1$
+	String BUILD_ROOT = "BuildRoot"; //$NON-NLS-1$
+	String DISTRIBUTION = "Distribution"; //$NON-NLS-1$
+	String VENDOR =	"Vendor"; //$NON-NLS-1$
+	String PROVIDES = "Provides"; //$NON-NLS-1$
+	String EXCLUSIVE_ARCH = "ExclusiveArch"; //$NON-NLS-1$
+	String EXCLUDE_ARCH = "ExcludeArch"; //$NON-NLS-1$
+	String EXCLUDE_OS = "ExclusiveOS"; //$NON-NLS-1$
+	String BUILD_ARCH = "BuildArch"; //$NON-NLS-1$
+	String BUILD_ARCHITECTURES = "BuildArchitectures"; //$NON-NLS-1$
+	String AUTO_REQUIRES = "AutoRequires"; //$NON-NLS-1$
+	String AUTO_REQ = "AutoReq"; //$NON-NLS-1$
+	String AUTO_REQ_PROV = "AutoReqProv"; //$NON-NLS-1$
+	String AUTO_PROV = "AutoProv"; //$NON-NLS-1$
+	String EPOCH = "Epoch"; //$NON-NLS-1$
+	String OBSOLETES = "Obsoletes"; //$NON-NLS-1$
+	String REQUIRES = "Requires";  //$NON-NLS-1$
+	String REQUIRES_PRE = "Requires(pre)"; //$NON-NLS-1$
+	String REQUIRES_POST = "Requires(post)"; //$NON-NLS-1$
+	String REQUIRES_POSTUN = "Requires(postun)"; //$NON-NLS-1$
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java
new file mode 100644
index 0000000..baefd4c
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileCompletionProcessor.java
@@ -0,0 +1,589 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextSelection;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.contentassist.CompletionProposal;
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.text.contentassist.IContextInformation;
+import org.eclipse.jface.text.contentassist.IContextInformationValidator;
+import org.eclipse.jface.text.templates.DocumentTemplateContext;
+import org.eclipse.jface.text.templates.Template;
+import org.eclipse.jface.text.templates.TemplateContext;
+import org.eclipse.jface.text.templates.TemplateContextType;
+import org.eclipse.jface.text.templates.TemplateException;
+import org.eclipse.jface.text.templates.TemplateProposal;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.Specfile;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileDefine;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileSection;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileSource;
+import org.eclipse.linuxtools.rpm.ui.editor.scanners.SpecfilePartitionScanner;
+
+/**
+ * Content assist processor
+ * 
+ * @author Alphonse Van Assche
+ *
+ */
+public class SpecfileCompletionProcessor implements IContentAssistProcessor {
+	
+	private static final String SOURCE = "SOURCE"; //$NON-NLS-1$
+
+	private static final String EMPTY_STRING = ""; //$NON-NLS-1$
+
+	/**
+	 * <code>Comparator</code> implementation used to sort template proposals
+	 * @author Van Assche Alphonse
+	 */
+	private static final class ProposalComparator implements Comparator<TemplateProposal>, Serializable {
+		private static final long serialVersionUID = 1L;
+
+		public int compare(TemplateProposal t1, TemplateProposal t2) {
+			return (t2.getRelevance() - t1.getRelevance());
+		}
+	}
+
+	private static final String TEMPLATE_ICON = "icons/template_obj.gif"; //$NON-NLS-1$
+
+	private static final String MACRO_ICON = "icons/macro_obj.gif"; //$NON-NLS-1$
+	
+	private static final String PATCH_ICON = "icons/macro_obj.gif"; //$NON-NLS-1$
+	
+	private static final String PACKAGE_ICON = "icons/rpm.gif"; //$NON-NLS-1$
+
+	private static final String PREAMBLE_SECTION_TEMPLATE = "org.eclipse.linuxtools.rpm.ui.editor.preambleSection"; //$NON-NLS-1$
+
+	private static final String PRE_SECTION_TEMPLATE = "org.eclipse.linuxtools.rpm.ui.editor.preSection"; //$NON-NLS-1$
+
+	private static final String BUILD_SECTION_TEMPLATE = "org.eclipse.linuxtools.rpm.ui.editor.buildSection"; //$NON-NLS-1$
+
+	private static final String INSTALL_SECTION_TEMPLATE = "org.eclipse.linuxtools.rpm.ui.editor.installSection"; //$NON-NLS-1$
+
+	private static final String CHANGELOG_SECTION_TEMPLATE = "org.eclipse.linuxtools.rpm.ui.editor.changelogSection"; //$NON-NLS-1$
+
+	private final SpecfileEditor editor;
+	
+	private static final Comparator<TemplateProposal> PROPOSAL_COMPARATOR = new ProposalComparator();
+
+	/**
+	 * Default constructor
+	 */
+	public SpecfileCompletionProcessor(SpecfileEditor editor) {
+		this.editor = editor;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeCompletionProposals(org.eclipse.jface.text.ITextViewer, int)
+	 */
+	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer,
+			int offset) {
+		List<ICompletionProposal> result = new ArrayList<ICompletionProposal>();
+		Specfile specfile = editor.getSpecfile();
+		if (specfile == null)
+			return null;
+		ITextSelection selection = (ITextSelection) viewer
+				.getSelectionProvider().getSelection();
+		// adjust offset to start of normalized selection
+		if (selection.getOffset() != offset)
+			offset = selection.getOffset();
+		String prefix = getPrefix(viewer, offset);
+		Region region = new Region(offset - prefix.length(), prefix.length()
+				+ selection.getLength());
+		// RPM macro's are useful in the whole specfile.
+		List<ICompletionProposal> rpmMacroProposals = computeRpmMacroProposals(
+				region, specfile, prefix);
+		// Sources completion
+		List<ICompletionProposal> sourcesProposals = computeSourcesProposals(
+				region, specfile, prefix);
+		result.addAll(sourcesProposals);
+		// Get the current content type
+		String currentContentType = editor.getInputDocument().getDocumentPartitioner().getContentType(region.getOffset());
+		if (currentContentType.equals(SpecfilePartitionScanner.SPEC_PREP)){
+			List<ICompletionProposal> patchesProposals = computePatchesProposals(
+					region, specfile, prefix);
+			result.addAll(patchesProposals);
+		}
+		
+		if (currentContentType.equals(SpecfilePartitionScanner.SPEC_PACKAGES)) {
+			// don't show template in the RPM packages content type.
+			// (when the line begin with Requires, BuildRequires etc...)
+			List<ICompletionProposal> rpmPackageProposals = computeRpmPackageProposals(
+					region, prefix);
+			result.addAll(rpmPackageProposals);
+			result.addAll(rpmMacroProposals);
+		} else {
+			// don't show RPM packages proposals in all others content type. 
+			List<? extends ICompletionProposal> templateProposals = computeTemplateProposals(
+					viewer, region, specfile, prefix);
+			result.addAll(templateProposals);
+			result.addAll(rpmMacroProposals);
+		}
+		if (currentContentType.equals(SpecfilePartitionScanner.SPEC_GROUP)){
+			IDocument document = viewer.getDocument();
+			try {
+				int lineNumber = document.getLineOfOffset(region.getOffset());
+				int lineOffset = document.getLineOffset(lineNumber);
+				if (region.getOffset() - lineOffset > 5){
+					result.clear();
+					String groupPrefix = getGroupPrefix(viewer, offset);
+					result.addAll(computeRpmGroupProposals(region, groupPrefix));
+				}
+			} catch (BadLocationException e) {
+				SpecfileLog.logError(e);
+			}
+		}
+		return result
+				.toArray(new ICompletionProposal[result.size()]);
+	}
+	
+	/**
+	 * Compute the templates proposals, these proposals are contextual on sections.
+	 * Return an array of template proposals for the given viewer, region, specfile, prefix.
+	 * 
+	 * @param viewer
+	 *            the viewer for which the context is created
+	 * @param region
+	 *            the region into <code>document</code> for which the context
+	 *            is created
+	 * @param specfile
+	 * 			  the specfile element
+	 * @param prefix
+	 * 			  the prefix string
+	 * @return 
+	 *            a ICompletionProposal[]
+	 */
+	private List<? extends ICompletionProposal> computeTemplateProposals(ITextViewer viewer,
+			IRegion region, Specfile specfile, String prefix) {
+		TemplateContext context = createContext(viewer, region, specfile);
+		List<TemplateProposal> matches = new ArrayList<TemplateProposal>();
+		if (context == null) {
+			return matches;
+		}
+		ITextSelection selection = (ITextSelection) viewer
+				.getSelectionProvider().getSelection();
+		context.setVariable("selection", selection.getText()); //$NON-NLS-1$
+		String id = context.getContextType().getId();
+		Template[] templates = Activator.getDefault().getTemplateStore()
+				.getTemplates(id);
+		for (Template template : templates) {
+			try {
+				context.getContextType().validate(template.getPattern());
+			} catch (TemplateException e) {
+				continue;
+			}
+			int relevance = getRelevance(template, prefix);
+			if (relevance > 0) {
+				matches.add(new TemplateProposal(template, context, region,
+						Activator.getDefault().getImage(TEMPLATE_ICON), relevance));
+			}
+		}
+		Collections.sort(matches, PROPOSAL_COMPARATOR);
+		return matches;
+	}
+
+	/**
+	 * Compute RPM macro proposals, these proposals are usable in the whole document.
+	 * Return an array of RPM macro proposals for the given viewer, region, prefix.
+	 * 
+	 * @param viewer
+	 *            the viewer for which the context is created
+	 * @param region
+	 *            the region into <code>document</code> for which the context
+	 *            is created
+	 * @param prefix
+	 * 			  the prefix string to find
+	 * @return 
+	 *            a ICompletionProposal[]
+	 */
+	private List<ICompletionProposal> computeRpmMacroProposals(IRegion region, 
+			Specfile specfile, String prefix) {
+		Map<String, String> rpmMacroProposalsMap = Activator.getDefault().getRpmMacroList().getProposals(prefix);
+		
+		// grab defines and put them into the proposals map
+		rpmMacroProposalsMap.putAll(getDefines(specfile, prefix));
+		
+		ArrayList<ICompletionProposal> proposals = new ArrayList<ICompletionProposal>();
+		if (rpmMacroProposalsMap != null) {
+			for (Map.Entry<String, String> entry : rpmMacroProposalsMap
+					.entrySet()) {
+				proposals.add(new CompletionProposal(
+						ISpecfileSpecialSymbols.MACRO_START_LONG
+								+ entry.getKey().substring(1)
+								+ ISpecfileSpecialSymbols.MACRO_END_LONG,
+						region.getOffset(), region.getLength(), entry.getKey()
+								.length() + 2, Activator.getDefault().getImage(
+								MACRO_ICON), entry.getKey(), null, entry
+								.getValue()));
+			}
+		}
+		return proposals;
+	}
+	
+	/**
+	 * Compute patches proposals, these proposals are usable in the whole document.
+	 * Return an array of patches proposals for the given viewer, region, prefix.
+	 * 
+	 * @param viewer
+	 *            the viewer for which the context is created
+	 * @param region
+	 *            the region into <code>document</code> for which the context
+	 *            is created
+	 * @param prefix
+	 * 			  the prefix string to find
+	 * @return 
+	 *            a ICompletionProposal[]
+	 */
+	private List<ICompletionProposal> computePatchesProposals(IRegion region, 
+			Specfile specfile, String prefix) {
+		// grab patches and put them into the proposals map
+		Map<String, String> patchesProposalsMap = getPatches(specfile, prefix);
+		ArrayList<ICompletionProposal> proposals = new ArrayList<ICompletionProposal>();
+		if (patchesProposalsMap != null) {
+			for (Map.Entry<String, String> entry : patchesProposalsMap
+					.entrySet()) {
+				proposals.add(new CompletionProposal(entry.getKey(), region
+						.getOffset(), region.getLength(), entry.getKey()
+						.length(), Activator.getDefault().getImage(PATCH_ICON),
+						entry.getKey(), null, entry.getValue()));
+			}
+		}
+		return proposals;
+	}
+	
+	/**
+	 * Compute sources proposals, these proposals are usable in the whole document.
+	 * Return an array of sources proposals for the given viewer, region, prefix.
+	 * 
+	 * @param viewer
+	 *            the viewer for which the context is created
+	 * @param region
+	 *            the region into <code>document</code> for which the context
+	 *            is created
+	 * @param prefix
+	 * 			  the prefix string to find
+	 * @return 
+	 *            a ICompletionProposal[]
+	 */
+	private List<ICompletionProposal> computeSourcesProposals(IRegion region, 
+			Specfile specfile, String prefix) {
+		// grab patches and put them into the proposals map
+		Map<String, String> sourcesProposalsMap = getSources(specfile, prefix);
+		ArrayList<ICompletionProposal> proposals = new ArrayList<ICompletionProposal>();
+		if (sourcesProposalsMap != null) {
+			for (Map.Entry<String, String> entry : sourcesProposalsMap
+					.entrySet()) {
+				proposals.add(new CompletionProposal(entry.getKey(), region
+						.getOffset(), region.getLength(), entry.getKey()
+						.length(), Activator.getDefault().getImage(PATCH_ICON),
+						entry.getKey(), null, entry.getValue()));
+			}
+		}
+		return proposals;
+	}
+
+	/**
+	 * Compute RPM package proposals, these proposals are usable only in the preambule section.
+	 * Return an array of RPM macro proposals for the given viewer, region, specfile, prefix.
+	 * 
+	 * @param viewer
+	 *            the viewer for which the context is created
+	 * @param region
+	 *            the region into <code>document</code> for which the context
+	 *            is created
+	 * @param prefix
+	 * 			  the prefix string
+	 * @return 
+	 *            a ICompletionProposal[]
+	 */
+	private List<ICompletionProposal> computeRpmPackageProposals(IRegion region, 
+			String prefix) {
+		List<String[]> rpmPkgProposalsList = Activator.getDefault().getRpmPackageList().getProposals(prefix);
+		ArrayList<ICompletionProposal> proposals = new ArrayList<ICompletionProposal>();
+		if (rpmPkgProposalsList != null) {
+			for (String[] item : rpmPkgProposalsList) {
+				proposals.add(new CompletionProposal(item[0], region
+						.getOffset(), region.getLength(), item[0].length(),
+						Activator.getDefault().getImage(PACKAGE_ICON), item[0],
+						null, item[1]));
+			}
+		}
+		return proposals;
+	}
+	
+	private List<ICompletionProposal> computeRpmGroupProposals(IRegion region,
+			String prefix) {
+		List<String> rpmGroupProposalsList = Activator.getDefault()
+				.getRpmGroups();
+		ArrayList<ICompletionProposal> proposals = new ArrayList<ICompletionProposal>();
+		for (String item : rpmGroupProposalsList) {
+			if (item.startsWith(prefix)) {
+				proposals.add(new CompletionProposal(item, region.getOffset(),
+						region.getLength(), item.length(), Activator
+								.getDefault().getImage(PACKAGE_ICON), item,
+						null, item));
+			}
+		}
+		return proposals;
+	}
+
+	/**
+	 * Create a template context for the givens Specfile, offset.
+	 * 
+	 * @param specfile
+	 *            the sepcfile element
+	 * @param offset
+	 *            the offset of the <code>documment</code>
+	 * @return a TemplateContextType
+	 */
+	private TemplateContextType getContextType(Specfile specfile, int offset) {
+		List<SpecfileSection> elements = specfile.getSections();
+			if (elements.size() == 0 || offset < elements.get(0).getLineEndPosition()) {
+				return Activator.getDefault().getContextTypeRegistry()
+						.getContextType(PREAMBLE_SECTION_TEMPLATE);
+			} else if (elements.size() == 1 || offset < elements.get(1).getLineEndPosition()) {
+				return Activator.getDefault().getContextTypeRegistry()
+						.getContextType(PRE_SECTION_TEMPLATE);
+			} else if (elements.size() == 2 || offset < elements.get(2).getLineEndPosition()) {
+				return Activator.getDefault().getContextTypeRegistry()
+						.getContextType(BUILD_SECTION_TEMPLATE);
+			} else if (elements.size() == 3 || offset < elements.get(3).getLineEndPosition()) {
+				return Activator.getDefault().getContextTypeRegistry()
+						.getContextType(INSTALL_SECTION_TEMPLATE);
+			} else {
+				return Activator.getDefault().getContextTypeRegistry()
+						.getContextType(CHANGELOG_SECTION_TEMPLATE);
+			}
+		
+	}
+
+	/**
+	 * Create a template context for the given Specfile and offset.
+	 * 
+	 * @param viewer
+	 *            the viewer for which the context is created
+	 * @param region
+	 *            the region into <code>document</code> for which the context
+	 *            is created
+	 * @param specfile
+	 * 			  the specfile element
+	 * @return a TemplateContextType
+	 */
+	private TemplateContext createContext(ITextViewer viewer, IRegion region,
+			Specfile specfile) {
+		TemplateContextType contextType = getContextType(specfile, region
+				.getOffset());
+		if (contextType != null) {
+			IDocument document = viewer.getDocument();
+			return new DocumentTemplateContext(contextType, document, region
+					.getOffset(), region.getLength());
+		}
+		return null;
+	}
+	
+	/**
+	 * Get relevance on templates for the given template and prefix.
+	 * @param template
+	 * 			the <code>Template</code> to get relevance
+	 * @param prefix
+	 * 			the prefix <code>String</code> to check.
+	 * @return
+	 * 			a relevant code (90 if <code>true</code> and 0 if not)
+	 */
+	private int getRelevance(Template template, String prefix) {
+		if (template.getName().startsWith(prefix))
+			return 90;
+		return 0;
+	}
+
+	/**
+	 * Get the prefix for a given viewer, offset.
+	 * 
+	 * @param viewer
+	 *            the viewer for which the context is created
+	 * @param offset
+	 *            the offset into <code>document</code> for which the prefix
+	 *            is research
+	 * @return the prefix
+	 */
+	private String getPrefix(ITextViewer viewer, int offset) {
+		int i = offset;
+		IDocument document = viewer.getDocument();
+		if (i > document.getLength())
+			return EMPTY_STRING;
+
+		try {
+			while (i > 0) {
+				char ch = document.getChar(i - 1);
+				if (!Character.isLetterOrDigit(ch) && (ch != '%') && (ch != '_') && (ch != '-') && (ch != '{'))
+					break;
+				i--;
+			}
+			return document.get(i, offset - i);
+		} catch (BadLocationException e) {
+			return EMPTY_STRING;
+		}
+	}
+	
+	/**
+	 * Get the prefix for a given viewer, offset.
+	 * 
+	 * @param viewer
+	 *            the viewer for which the context is created
+	 * @param offset
+	 *            the offset into <code>document</code> for which the prefix
+	 *            is research
+	 * @return the prefix
+	 */
+	private String getGroupPrefix(ITextViewer viewer, int offset) {
+		int i = offset;
+		IDocument document = viewer.getDocument();
+		if (i > document.getLength())
+			return EMPTY_STRING;
+
+		try {
+			while (i > 0) {
+				char ch = document.getChar(i - 1);
+				if (!Character.isLetterOrDigit(ch) && (ch != '/'))
+					break;
+				i--;
+			}
+			return document.get(i, offset - i);
+		} catch (BadLocationException e) {
+			return EMPTY_STRING;
+		}
+	}
+
+	/**
+	 * Get defines as a String key->value pair for a given specfile
+	 * and prefix.
+	 * 
+	 * @param specfile
+	 *            to get defines from.
+	 * @param prefix
+	 *            used to find defines.
+	 * @return a <code>HashMap</code> of defines.
+	 * 
+	 */
+	private Map<String, String> getDefines(Specfile specfile, String prefix) {
+		Collection<SpecfileDefine> defines = specfile.getDefines();
+		Map<String, String> ret = new HashMap<String, String>();
+		String defineName;
+		for (SpecfileDefine define: defines) {
+			defineName = "%" + define.getName(); //$NON-NLS-1$
+			if (defineName.startsWith(prefix.replaceFirst("\\{", EMPTY_STRING))) //$NON-NLS-1$
+				ret.put(defineName, define.getStringValue());
+		}
+		return ret;
+	}
+	
+	/**
+	 * Get patches as a String key->value pair for a given specfile
+	 * and prefix.
+	 * 
+	 * @param specfile
+	 *            to get defines from.
+	 * @param prefix
+	 *            used to find defines.
+	 * @return a <code>HashMap</code> of defines.
+	 * 
+	 */
+	private Map<String, String> getPatches(Specfile specfile, String prefix) {
+		Collection<SpecfileSource> patches = specfile.getPatches();
+		Map<String, String> ret = new HashMap<String, String>();
+		String patchName;
+		for (SpecfileSource patch: patches) {
+			patchName = "%patch" + patch.getNumber(); //$NON-NLS-1$
+			if (patchName.startsWith(prefix))
+				ret.put(patchName.toLowerCase(), SpecfileHover
+						.getSourceOrPatchValue(specfile, "patch" //$NON-NLS-1$
+								+ patch.getNumber()));
+		}
+		return ret;
+	}
+	
+	/**
+	 * Get sources as a String key->value pair for a given specfile
+	 * and prefix.
+	 * 
+	 * @param specfile
+	 *            to get defines from.
+	 * @param prefix
+	 *            used to find defines.
+	 * @return a <code>HashMap</code> of defines.
+	 * 
+	 */
+	private Map<String, String> getSources(Specfile specfile, String prefix) {
+		Collection<SpecfileSource> sources = specfile.getSources();
+		Map<String, String> ret = new HashMap<String, String>();
+		String sourceName;
+		for (SpecfileSource source : sources) {
+			sourceName = ISpecfileSpecialSymbols.MACRO_START_LONG + SOURCE
+					+ source.getNumber()
+					+ ISpecfileSpecialSymbols.MACRO_END_LONG;
+			if (sourceName.startsWith(prefix))
+				ret.put(sourceName, SpecfileHover.getSourceOrPatchValue(
+						specfile, SOURCE + source.getNumber()));
+		}
+		return ret;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeContextInformation(org.eclipse.jface.text.ITextViewer, int)
+	 */
+	public IContextInformation[] computeContextInformation(ITextViewer viewer,
+			int offset) {
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getCompletionProposalAutoActivationCharacters()
+	 */
+	public char[] getCompletionProposalAutoActivationCharacters() {
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationAutoActivationCharacters()
+	 */
+	public char[] getContextInformationAutoActivationCharacters() {
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getErrorMessage()
+	 */
+	public String getErrorMessage() {
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationValidator()
+	 */
+	public IContextInformationValidator getContextInformationValidator() {
+		return null;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileConfiguration.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileConfiguration.java
new file mode 100644
index 0000000..4f8ec47
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileConfiguration.java
@@ -0,0 +1,272 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009, 2010 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor;
+
+import java.util.Map;
+
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.text.DefaultInformationControl;
+import org.eclipse.jface.text.DefaultLineTracker;
+import org.eclipse.jface.text.IAutoEditStrategy;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IInformationControl;
+import org.eclipse.jface.text.IInformationControlCreator;
+import org.eclipse.jface.text.ITextDoubleClickStrategy;
+import org.eclipse.jface.text.ITextHover;
+import org.eclipse.jface.text.TabsToSpacesConverter;
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.contentassist.ContentAssistant;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.text.contentassist.IContentAssistant;
+import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
+import org.eclipse.jface.text.presentation.IPresentationReconciler;
+import org.eclipse.jface.text.presentation.PresentationReconciler;
+import org.eclipse.jface.text.reconciler.IReconciler;
+import org.eclipse.jface.text.reconciler.MonoReconciler;
+import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.linuxtools.rpm.ui.editor.derived.HTMLTextPresenter;
+import org.eclipse.linuxtools.rpm.ui.editor.hyperlink.MailHyperlinkDetector;
+import org.eclipse.linuxtools.rpm.ui.editor.hyperlink.SourcesFileHyperlinkDetector;
+import org.eclipse.linuxtools.rpm.ui.editor.hyperlink.SpecfileElementHyperlinkDetector;
+import org.eclipse.linuxtools.rpm.ui.editor.hyperlink.URLHyperlinkWithMacroDetector;
+import org.eclipse.linuxtools.rpm.ui.editor.preferences.PreferenceConstants;
+import org.eclipse.linuxtools.rpm.ui.editor.scanners.SpecfileChangelogScanner;
+import org.eclipse.linuxtools.rpm.ui.editor.scanners.SpecfilePackagesScanner;
+import org.eclipse.linuxtools.rpm.ui.editor.scanners.SpecfilePartitionScanner;
+import org.eclipse.linuxtools.rpm.ui.editor.scanners.SpecfileScanner;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.editors.text.TextSourceViewerConfiguration;
+
+public class SpecfileConfiguration extends TextSourceViewerConfiguration {
+	private SpecfileDoubleClickStrategy doubleClickStrategy;
+	private SpecfileScanner scanner;
+	private SpecfileChangelogScanner changelogScanner;
+	private SpecfilePackagesScanner packagesScanner;
+	private ColorManager colorManager;
+	private SpecfileHover specfileHover;
+	private SpecfileEditor editor;
+
+	public SpecfileConfiguration(ColorManager colorManager, SpecfileEditor editor) {
+		super();
+		this.colorManager = colorManager;
+		this.editor = editor;
+	}
+	
+	/**
+	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getConfiguredContentTypes(org.eclipse.jface.text.source.ISourceViewer)
+	 */
+	@Override
+	public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
+		return SpecfilePartitionScanner.SPEC_PARTITION_TYPES;
+	}
+	
+	/**
+	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getDoubleClickStrategy(org.eclipse.jface.text.source.ISourceViewer, java.lang.String)
+	 */
+	@Override
+	public ITextDoubleClickStrategy getDoubleClickStrategy(
+		ISourceViewer sourceViewer,
+		String contentType) {
+		if (doubleClickStrategy == null)
+			doubleClickStrategy = new SpecfileDoubleClickStrategy();
+		return doubleClickStrategy;
+	}
+
+	protected SpecfileScanner getSpecfileScanner() {
+		if (scanner == null) {
+			scanner = new SpecfileScanner(colorManager);
+			scanner.setDefaultReturnToken(
+				new Token(
+					new TextAttribute(
+						colorManager.getColor(ISpecfileColorConstants.DEFAULT))));
+		}
+		return scanner;
+	}
+	
+	protected SpecfileChangelogScanner getSpecfileChangelogScanner() {
+		if  (changelogScanner == null) {
+			changelogScanner = new SpecfileChangelogScanner(colorManager);
+			changelogScanner.setDefaultReturnToken(
+				new Token(
+					new TextAttribute(
+						colorManager.getColor(ISpecfileColorConstants.DEFAULT))));
+		}
+		return changelogScanner;
+	}
+	
+	protected SpecfilePackagesScanner getSpecfilePackagesScanner() {
+		if  (packagesScanner == null) {
+			packagesScanner = new SpecfilePackagesScanner(colorManager);
+			packagesScanner.setDefaultReturnToken(
+				new Token(
+					new TextAttribute(
+						colorManager.getColor(ISpecfileColorConstants.DEFAULT))));
+		}
+		return packagesScanner;
+	}
+	
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.editors.text.TextSourceViewerConfiguration#getTextHover(org.eclipse.jface.text.source.ISourceViewer, java.lang.String)
+	 */
+	@Override
+	public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) {
+		if (specfileHover == null)
+			specfileHover = new SpecfileHover(this.editor);
+		return specfileHover;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getPresentationReconciler(org.eclipse.jface.text.source.ISourceViewer)
+	 */
+	@Override
+	public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
+		PresentationReconciler reconciler = new PresentationReconciler();
+
+		DefaultDamagerRepairer dr = new DefaultDamagerRepairer(getSpecfileScanner());
+		reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
+		reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
+//
+//                dr = new DefaultDamagerRepairer(getSpecfileScanner());
+//                reconciler.setDamager(dr, SpecfilePartitionScanner.SPEC_DEFAULT);
+//                reconciler.setRepairer(dr, SpecfilePartitionScanner.SPEC_DEFAULT);
+
+		dr = new DefaultDamagerRepairer(getSpecfilePackagesScanner());
+		reconciler.setDamager(dr, SpecfilePartitionScanner.SPEC_PACKAGES);
+		reconciler.setRepairer(dr, SpecfilePartitionScanner.SPEC_PACKAGES);
+		
+		dr = new DefaultDamagerRepairer(getSpecfileScanner());
+		reconciler.setDamager(dr, SpecfilePartitionScanner.SPEC_PREP);
+		reconciler.setRepairer(dr, SpecfilePartitionScanner.SPEC_PREP);
+		
+		dr = new DefaultDamagerRepairer(getSpecfileScanner());
+		reconciler.setDamager(dr, SpecfilePartitionScanner.SPEC_SCRIPT);
+		reconciler.setRepairer(dr, SpecfilePartitionScanner.SPEC_SCRIPT);
+		
+		dr = new DefaultDamagerRepairer(getSpecfileScanner());
+		reconciler.setDamager(dr, SpecfilePartitionScanner.SPEC_FILES);
+		reconciler.setRepairer(dr, SpecfilePartitionScanner.SPEC_FILES);
+		
+		dr = new DefaultDamagerRepairer(getSpecfileScanner());
+		reconciler.setDamager(dr, SpecfilePartitionScanner.SPEC_GROUP);
+		reconciler.setRepairer(dr, SpecfilePartitionScanner.SPEC_GROUP);
+		
+		dr = new DefaultDamagerRepairer(getSpecfileChangelogScanner());
+		reconciler.setDamager(dr, SpecfilePartitionScanner.SPEC_CHANGELOG);
+		reconciler.setRepairer(dr, SpecfilePartitionScanner.SPEC_CHANGELOG);
+
+		return reconciler;
+	}
+
+	/*
+	 * @see SourceViewerConfiguration#getReconciler(ISourceViewer)
+	 */
+	@Override
+	public IReconciler getReconciler(ISourceViewer sourceViewer) {
+		if (editor != null && editor.isEditable()) {
+			SpecfileReconcilingStrategy strategy= new SpecfileReconcilingStrategy(editor);
+			MonoReconciler reconciler= new MonoReconciler(strategy, false);
+			reconciler.setProgressMonitor(new NullProgressMonitor());
+			reconciler.setDelay(500);
+			return reconciler;
+		}
+		return null;
+	}
+	
+	/*
+	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getContentAssistant(org.eclipse.jface.text.source.ISourceViewer)
+	 */
+	@Override
+	public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
+		ContentAssistant assistant= new ContentAssistant();
+		IContentAssistProcessor processor= new SpecfileCompletionProcessor(editor);
+		// add content assistance to all the supported contentType
+		assistant.setContentAssistProcessor(processor, IDocument.DEFAULT_CONTENT_TYPE);
+		assistant.setContentAssistProcessor(processor, SpecfilePartitionScanner.SPEC_PREP);
+		assistant.setContentAssistProcessor(processor, SpecfilePartitionScanner.SPEC_SCRIPT);
+		assistant.setContentAssistProcessor(processor,SpecfilePartitionScanner.SPEC_FILES);
+		assistant.setContentAssistProcessor(processor,SpecfilePartitionScanner.SPEC_CHANGELOG);		
+		assistant.setContentAssistProcessor(processor,SpecfilePartitionScanner.SPEC_PACKAGES);
+		assistant.setContentAssistProcessor(processor,
+				SpecfilePartitionScanner.SPEC_GROUP);
+		// configure content assistance
+		assistant.setContextInformationPopupOrientation(IContentAssistant.CONTEXT_INFO_ABOVE);
+        IInformationControlCreator controlCreator= getInformationControlCreator();
+		assistant.setInformationControlCreator(controlCreator);
+		assistant.enableAutoInsert(true);
+		assistant.setStatusLineVisible(true);
+		assistant.setStatusMessage(Messages.SpecfileConfiguration_0);
+		return assistant;
+	}
+	
+	private IInformationControlCreator getInformationControlCreator() {
+		return new IInformationControlCreator() {
+			public IInformationControl createInformationControl(Shell parent) {
+				return new DefaultInformationControl(parent, new HTMLTextPresenter(false));
+			}
+		};
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getHyperlinkDetectors(org.eclipse.jface.text.source.ISourceViewer)
+	 */
+	@Override
+	public IHyperlinkDetector[] getHyperlinkDetectors(ISourceViewer sourceViewer) {
+		if (sourceViewer == null)
+			return null;
+		return new IHyperlinkDetector[] {
+				new URLHyperlinkWithMacroDetector(editor.getSpecfile()),
+				new SpecfileElementHyperlinkDetector(editor.getSpecfile()), new MailHyperlinkDetector(editor), new SourcesFileHyperlinkDetector(editor)};
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.editors.text.TextSourceViewerConfiguration#getHyperlinkDetectorTargets(org.eclipse.jface.text.source.ISourceViewer)
+	 */
+	@Override
+	protected Map getHyperlinkDetectorTargets(ISourceViewer sourceViewer) {
+        Map<String, Object> targets= super.getHyperlinkDetectorTargets(sourceViewer);
+        targets.put("org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor", editor); //$NON-NLS-1$
+        return targets;
+    }
+
+	private int getTabSize() {
+		return Activator.getDefault().getPreferenceStore().getInt(
+				PreferenceConstants.P_NBR_OF_SPACES_FOR_TAB);
+	}
+
+	private boolean isTabConversionEnabled() {
+		return Activator.getDefault().getPreferenceStore().getBoolean(
+				PreferenceConstants.P_SPACES_FOR_TABS);
+	}
+	
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.jface.text.source.SourceViewerConfiguration#getAutoEditStrategies
+	 * (org.eclipse.jface.text.source.ISourceViewer, java.lang.String)
+	 */
+	@Override
+	public IAutoEditStrategy[] getAutoEditStrategies(
+			ISourceViewer sourceViewer, String contentType) {
+		if (isTabConversionEnabled()) {
+			TabsToSpacesConverter tabsConverter = new TabsToSpacesConverter();
+			tabsConverter.setLineTracker(new DefaultLineTracker());
+			tabsConverter.setNumberOfSpacesPerTab(getTabSize());
+			return new IAutoEditStrategy[] { tabsConverter };
+		}
+		return null;
+	}
+		
+}
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileDocumentProvider.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileDocumentProvider.java
new file mode 100644
index 0000000..d974b07
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileDocumentProvider.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor;
+
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.linuxtools.rpm.ui.editor.scanners.SpecfilePartitionScanner;
+import org.eclipse.ui.editors.text.TextFileDocumentProvider;
+
+public class SpecfileDocumentProvider extends TextFileDocumentProvider {
+
+	private IDocument document;
+
+	@Override
+	public IDocument getDocument(Object element) {
+		document = super.getDocument(element);
+		if (document != null && document.getDocumentPartitioner() == null) {
+			SpecfilePartitioner partitioner = new SpecfilePartitioner(
+					new SpecfilePartitionScanner(),
+					SpecfilePartitionScanner.SPEC_PARTITION_TYPES);
+			partitioner.connect(document, false);
+			document.setDocumentPartitioner(partitioner);
+		}
+		return document;
+	}
+}
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileDoubleClickStrategy.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileDoubleClickStrategy.java
new file mode 100644
index 0000000..c533aea
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileDoubleClickStrategy.java
@@ -0,0 +1,123 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor;
+
+import org.eclipse.jface.text.*;
+
+public class SpecfileDoubleClickStrategy implements ITextDoubleClickStrategy {
+	protected ITextViewer fText;
+	//lTerminator should be either '\r' or '\n' depending on the OS
+	final char lTerminator = System.getProperty("line.separator").charAt(0); //$NON-NLS-1$
+
+	public void doubleClicked(ITextViewer part) {
+		int pos = part.getSelectedRange().x;
+
+		if (pos < 0)
+			return;
+
+		fText = part;
+
+		if (!selectComment(pos)) {
+			selectWord(pos);
+		}
+	}
+	protected boolean selectComment(int caretPos) {
+		IDocument doc = fText.getDocument();
+		int startPos, endPos;
+		try {
+			int pos = caretPos;
+			char c = ' ';
+
+			while (pos >= 0) {
+				c = doc.getChar(pos);
+				if (c == '\\') {
+					pos -= 2;
+					continue;
+				}
+				if ( c == lTerminator || c == '\"')
+					break;
+				--pos;
+			}
+			if (c != '\"')
+				return false;
+
+			startPos = pos;
+
+			pos = caretPos;
+			int length = doc.getLength();
+			c = ' ';
+
+			while (pos < length) {
+				c = doc.getChar(pos);
+				if ( c == lTerminator || c == '\"' )
+					break;
+				++pos;
+			}
+			if (c != '\"')
+				return false;
+
+			endPos = pos;
+
+			int offset = startPos + 1;
+			int len = endPos - offset;
+			fText.setSelectedRange(offset, len);
+			return true;
+		} catch (BadLocationException x) {
+		}
+
+		return false;
+	}
+	protected boolean selectWord(int caretPos) {
+
+		IDocument doc = fText.getDocument();
+		int startPos, endPos;
+
+		try {
+
+			int pos = caretPos;
+			char c;
+
+			while (pos >= 0) {
+				c = doc.getChar(pos);
+				if (!Character.isJavaIdentifierPart(c))
+					break;
+				--pos;
+			}
+
+			startPos = pos;
+
+			pos = caretPos;
+			int length = doc.getLength();
+
+			while (pos < length) {
+				c = doc.getChar(pos);
+				if (!Character.isJavaIdentifierPart(c))
+					break;
+				++pos;
+			}
+
+			endPos = pos;
+			selectRange(startPos, endPos);
+			return true;
+
+		} catch (BadLocationException x) {
+		}
+
+		return false;
+	}
+
+	private void selectRange(int startPos, int stopPos) {
+		int offset = startPos + 1;
+		int length = stopPos - offset;
+		fText.setSelectedRange(offset, length);
+	}
+}
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileEditor.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileEditor.java
new file mode 100644
index 0000000..d4e1edb
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileEditor.java
@@ -0,0 +1,185 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *    Alphonse Van Assche
+ *    Alexander Kurtakov - adapt to 3.5 API.
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.source.SourceViewer;
+import org.eclipse.linuxtools.rpm.ui.editor.markers.SpecfileErrorHandler;
+import org.eclipse.linuxtools.rpm.ui.editor.markers.SpecfileTaskHandler;
+import org.eclipse.linuxtools.rpm.ui.editor.outline.SpecfileContentOutlinePage;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.Specfile;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileParser;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.editors.text.TextEditor;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+
+public class SpecfileEditor extends TextEditor {
+
+	private ColorManager colorManager;
+	private SpecfileContentOutlinePage outlinePage;
+	private IEditorInput input;
+	private Specfile specfile;
+	private SpecfileParser parser;
+	private RpmMacroOccurrencesUpdater fOccurrencesUpdater;
+
+	public SpecfileEditor() {
+		super();
+		colorManager = new ColorManager();
+		parser = getParser();
+		setSourceViewerConfiguration(new SpecfileConfiguration(colorManager,
+				this));
+		setKeyBindingScopes(new String[] { "org.eclipse.linuxtools.rpm.ui.specEditorScope" }); //$NON-NLS-1$
+	}
+
+	@Override
+	public void dispose() {
+		colorManager.dispose();
+		// Set specfile field to null here is useful for test cases because
+		// whether
+		// the specfile in null SpecfileReconcilingStrategy#reconcile don't
+		// update anything and thus it don't give false stacktraces.
+		specfile = null;
+		super.dispose();
+	}
+
+	@Override
+	protected void doSetInput(IEditorInput newInput) throws CoreException {
+		super.doSetInput(newInput);
+		this.input = newInput;
+
+		if (outlinePage != null)
+			outlinePage.setInput(input);
+
+		validateAndMark();
+	}
+
+	@Override
+	protected void editorSaved() {
+		super.editorSaved();
+
+		// we validate and mark document here
+		validateAndMark();
+
+		if (outlinePage != null)
+			outlinePage.update();
+	}
+
+	protected void validateAndMark() {
+		try {
+			IDocument document = getInputDocument();
+			SpecfileErrorHandler specfileErrorHandler = new SpecfileErrorHandler(
+					getInputFile(), document);
+			specfileErrorHandler.removeExistingMarkers();
+			SpecfileTaskHandler specfileTaskHandler = new SpecfileTaskHandler(
+					getInputFile(), document);
+			specfileTaskHandler.removeExistingMarkers();
+			this.parser.setErrorHandler(specfileErrorHandler);
+			this.parser.setTaskHandler(specfileTaskHandler);
+			specfile = parser.parse(document);
+		} catch (Exception e) {
+			SpecfileLog.logError(e);
+		}
+	}
+
+	/**
+	 * Get a {@link IFile}, this implementation return <code>null</code> if the
+	 * <code>IEditorInput</code> instance is not of type
+	 * {@link IFileEditorInput}.
+	 * 
+	 * @return a <code>IFile</code> or <code>null</code>.
+	 */
+	protected IFile getInputFile() {
+		if (input instanceof IFileEditorInput) {
+			IFileEditorInput ife = (IFileEditorInput) input;
+			IFile file = ife.getFile();
+			return file;
+		}
+		return null;
+	}
+
+	public IDocument getInputDocument() {
+		IDocument document = getDocumentProvider().getDocument(input);
+		return document;
+	}
+
+	@Override
+	public Object getAdapter(Class required) {
+		if (IContentOutlinePage.class.equals(required)) {
+			return getOutlinePage();
+		}
+		return super.getAdapter(required);
+	}
+
+	public SpecfileContentOutlinePage getOutlinePage() {
+		if (outlinePage == null) {
+			outlinePage = new SpecfileContentOutlinePage(this);
+			if (getEditorInput() != null)
+				outlinePage.setInput(getEditorInput());
+		}
+		return outlinePage;
+	}
+
+	public Specfile getSpecfile() {
+		return specfile;
+	}
+
+
+	/*
+	 * @see
+	 * org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#createPartControl
+	 * (org.eclipse.swt.widgets.Composite)
+	 */
+	@Override
+	public void createPartControl(Composite parent) {
+		super.createPartControl(parent);
+		fOccurrencesUpdater = new RpmMacroOccurrencesUpdater(this);
+	}
+
+	protected void setSpecfile(Specfile specfile) {
+		this.specfile = specfile;
+		if (fOccurrencesUpdater != null) {
+			Shell shell = getSite().getShell();
+			if (!(shell == null || shell.isDisposed())) {
+				shell.getDisplay().asyncExec(new Runnable() {
+					public void run() {
+						fOccurrencesUpdater.update(getSourceViewer());
+					}
+				});
+			}
+		}
+
+	}
+
+	public final SpecfileParser getParser() {
+		if (parser == null) {
+			parser = new SpecfileParser();
+		}
+		return parser;
+	}
+
+	/**
+	 * Get the spefile source viewer, this method is useful for test cases.
+	 * 
+	 * @return the specfile source viewer
+	 */
+	public SourceViewer getSpecfileSourceViewer() {
+		return (SourceViewer) getSourceViewer();
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileEditorMessages.properties b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileEditorMessages.properties
new file mode 100644
index 0000000..3804f13
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileEditorMessages.properties
@@ -0,0 +1,13 @@
+###############################################################################
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+ContentAssistProposal.label=Content Assist
+ContentAssistProposal.tooltip=Content Assist
+ContentAssistProposal.description=Content Assist
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileFoldingStructureProvider.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileFoldingStructureProvider.java
new file mode 100644
index 0000000..e77663f
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileFoldingStructureProvider.java
@@ -0,0 +1,136 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.Position;
+import org.eclipse.jface.text.source.Annotation;
+import org.eclipse.jface.text.source.projection.ProjectionAnnotation;
+import org.eclipse.jface.text.source.projection.ProjectionAnnotationModel;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.Specfile;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileElement;
+
+public class SpecfileFoldingStructureProvider {
+
+	
+	private class ElementByLineNbrComparator implements Comparator<SpecfileElement> {
+		public int compare(SpecfileElement element1, SpecfileElement element2) {
+			Integer lineNbr1 = element1.getLineNumber();
+			Integer lineNbr2 = element2.getLineNumber();
+			return lineNbr1.compareTo(lineNbr2);
+		}
+	}
+	
+	private static final Annotation[] EMPTY = new Annotation[] {};
+	private SpecfileEditor sEditor;
+	private IDocument sDocument;
+	private IProgressMonitor sProgressMonitor;
+
+	public SpecfileFoldingStructureProvider(SpecfileEditor editor) {
+		sEditor = editor;
+	}
+
+	public void setProgressMonitor(IProgressMonitor progressMonitor) {
+		sProgressMonitor = progressMonitor;
+	}
+
+	public void setDocument(IDocument document) {
+		sDocument = document;
+	}
+
+	public void updateFoldingRegions() {
+		ProjectionAnnotationModel model = (ProjectionAnnotationModel) sEditor
+				.getAdapter(ProjectionAnnotationModel.class);
+		if (model != null)
+			updateFoldingRegions(model);
+	}
+
+	void updateFoldingRegions(ProjectionAnnotationModel model) {
+		Set<Position> structure = createFoldingStructure(sEditor.getSpecfile());
+		Annotation[] deletions = computeDifferences(model, structure);
+		Map<Annotation,Position> additions = computeAdditions(structure);
+		if ((deletions.length != 0 || !additions.isEmpty())
+				&& (sProgressMonitor == null || !sProgressMonitor.isCanceled()))
+			model.modifyAnnotations(deletions, additions, EMPTY);
+	}
+
+	private Map<Annotation,Position> computeAdditions(Set<Position> currentRegions) {
+		Map<Annotation,Position> additionsMap = new HashMap<Annotation,Position>();
+		for (Position position: currentRegions)
+			additionsMap.put(new ProjectionAnnotation(), position);
+		return additionsMap;
+	}
+
+	private Annotation[] computeDifferences(ProjectionAnnotationModel model,
+			Set<Position> current) {
+		List<Annotation> deletions = new ArrayList<Annotation>();
+		for (Iterator<Annotation> iter = model.getAnnotationIterator(); iter.hasNext();) {
+			Annotation annotation = iter.next();
+			if (annotation instanceof ProjectionAnnotation) {
+				Position position = model.getPosition(annotation);
+				if (current.contains(position))
+					current.remove(position);
+				else
+					deletions.add(annotation);
+			}
+		}
+		return deletions.toArray(new Annotation[deletions.size()]);
+	}
+
+	private Set<Position> createFoldingStructure(Specfile specfile) {
+		Set<Position> set = new HashSet<Position>();
+		
+		List<SpecfileElement> elements = new ArrayList<SpecfileElement>();
+		elements.addAll(specfile.getSections());
+		elements.addAll(specfile.getComplexSections());
+		Collections.sort(elements, new ElementByLineNbrComparator());
+		addFoldingRegions(set, elements.toArray());
+		return set;
+	}
+
+	private void addFoldingRegions(Set<Position> regions, Object[] elements) {
+		Position position;
+		// add folding on the preamble section
+		try {
+			SpecfileElement element = (SpecfileElement) elements[0];
+			position = new Position(0, element.getLineStartPosition() - 1);
+			regions.add(position);
+		} catch (Exception exception){
+			//pass
+		}
+
+		for (int i = 0; i < elements.length; i++) {
+			SpecfileElement startElement = (SpecfileElement) elements[i];
+			int offsetPos = startElement.getLineStartPosition();
+			int lenghtPos;
+			if (i < elements.length -1) {
+				SpecfileElement endElement = (SpecfileElement) elements[i+1];
+				lenghtPos = endElement.getLineStartPosition() - startElement.getLineStartPosition() - 1;
+			} else {
+				lenghtPos = sDocument.getLength() - startElement.getLineStartPosition();
+			}
+			position = new Position(offsetPos, lenghtPos);
+			regions.add(position);
+		}
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileHover.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileHover.java
new file mode 100644
index 0000000..8f80639
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileHover.java
@@ -0,0 +1,277 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *    Alphonse Van Assche
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.DefaultInformationControl;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IInformationControl;
+import org.eclipse.jface.text.IInformationControlCreator;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextHover;
+import org.eclipse.jface.text.ITextHoverExtension;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.Region;
+import org.eclipse.linuxtools.rpm.ui.editor.derived.HTMLTextPresenter;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.Specfile;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileDefine;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileSource;
+import org.eclipse.linuxtools.rpm.ui.editor.preferences.PreferenceConstants;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Shell;
+
+public class SpecfileHover implements ITextHover, ITextHoverExtension {
+
+	private static final String EMPTY_STRING = ""; //$NON-NLS-1$
+	private SpecfileEditor editor;
+
+	public SpecfileHover(SpecfileEditor editor) {
+		this.editor = editor;
+	}
+
+	public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
+		if (hoverRegion == null || hoverRegion.getLength() == 0)
+			return null;
+		
+		Specfile spec = editor.getSpecfile();
+		
+		
+		String currentSelection;
+		try {
+			currentSelection = textViewer.getDocument().get(hoverRegion.getOffset() + 1, hoverRegion.getLength() - 1);
+		} catch (BadLocationException e) {
+			return null;
+		}
+		
+                
+        // First we try to get a define based on the given name
+		SpecfileDefine define = spec.getDefine(currentSelection);
+		
+        String value = currentSelection + ": "; //$NON-NLS-1$
+                
+		if (define != null) {
+                    value += define.getStringValue();
+                    return value;
+                }
+                
+		String macroLower = currentSelection.toLowerCase();
+
+		// If there's no such define we try to see if it corresponds to
+		// a Source or Patch declaration
+		String retrivedValue = getSourceOrPatchValue(spec, macroLower);
+		if (retrivedValue != null) 
+			return value += retrivedValue;
+		else {
+			// If it does not correspond to a Patch or Source macro, try to find it
+			// in the macro proposals list.
+			retrivedValue = getMacroValueFromMacroList(currentSelection);
+			if (retrivedValue != null) 
+				return value += retrivedValue;
+			else {
+				// If it does not correspond to a macro in the list, try to find it
+				// in the RPM list. 
+				retrivedValue = Activator.getDefault().getRpmPackageList().getValue(currentSelection.replaceFirst(":",EMPTY_STRING)); //$NON-NLS-1$ 
+				if (retrivedValue != null)
+					return retrivedValue;
+			}
+		}
+       // We return null in other cases, so we don't show hover information
+       // for unrecognized macros and RPM packages.
+       return null;
+	}
+
+	public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
+		
+		if (textViewer != null) {
+			/*
+			 * If the hover offset falls within the selection range return the
+			 * region for the whole selection.
+			 */
+			Point selectedRange = textViewer.getSelectedRange();
+			if (selectedRange.x >= 0 && selectedRange.y	 > 0
+					&& offset >= selectedRange.x
+					&& offset <= selectedRange.x + selectedRange.y)
+				return new Region(selectedRange.x, selectedRange.y);
+			else {
+				IRegion region = findWord(textViewer.getDocument(), offset);
+				if (region.equals(new Region(offset, 0))) {
+					region = findPackages(textViewer.getDocument(), offset);
+				}
+				return region;
+			}
+		}
+		return null;
+	}
+
+	public IInformationControlCreator getHoverControlCreator() {
+		return new IInformationControlCreator() {
+			public IInformationControl createInformationControl(Shell parent) {
+				return new DefaultInformationControl(parent, new HTMLTextPresenter(true));
+			}
+		};
+	}
+	
+	
+	public static IRegion findWord(IDocument document, int offset) {
+		int start = -1;
+		int end = -1;
+		boolean beginsWithBrace = false;
+
+		try {
+			int pos = offset;
+			char c;
+
+			while (pos >= 0) {
+				c = document.getChar(pos);
+				if (c == '%') {
+					if (document.getChar(pos + 1) == '{')
+						beginsWithBrace = true;
+					break;
+				}
+				else if (c == '\n' || c == '}'){
+					// if we hit the beginning of the line, it's not a macro
+					return new Region(offset, 0);
+				}
+				--pos;
+			}
+			
+			if (!beginsWithBrace)
+				--pos;
+
+			start = pos;
+
+			pos = offset;
+			int length = document.getLength();
+
+			while (pos < length) {
+				c = document.getChar(pos);
+				if (beginsWithBrace && (c == '}')) {
+					break;
+				}
+				else if (c == '\n' || c == '%' || c == '('){ // '(' is needed for the %deffatt( case
+					break;
+//					Do not return empty region here. We have a work.
+//					return new Region(offset, 0);
+				} else if (!beginsWithBrace && c == ' ') {
+					break;
+				}
+				++pos;
+			}
+
+			end = pos;
+
+		} catch (BadLocationException x) {
+		}
+
+		if (start >= -1 && end > -1) {
+			if (start == offset)
+				return new Region(start, end - start);
+			else
+				return new Region(start + 1, end - start - 1);
+		}
+
+		return null;
+	}
+	
+	public static IRegion findPackages(IDocument document, int offset) {
+		int start = -1;
+		int end = -1;
+		boolean beginsWithSpace = false;
+		try {
+			int pos = offset;
+			char c;
+			while (pos >= 0) {
+				c = document.getChar(pos);
+				if (c == ' ' || c =='\t' || c==':')  {
+					if (Character.isLetter(document.getChar(pos + 1))) {
+						beginsWithSpace = true;
+						break;
+					} else if (c == '\n'){
+						return new Region(offset, 0);
+					}
+				}  
+				--pos;
+			}
+			--pos;
+			start = pos;
+			pos = offset;
+			int length = document.getLength();
+			while (pos < length) {
+				c = document.getChar(pos);
+				if (beginsWithSpace && (!Character.isLetter(c) && !Character.isDigit(c) && c != '-')) {
+					break;
+				}
+				else if (c == '\n'){
+					return new Region(offset, 0);
+				}
+				++pos;
+			}
+			end = pos;
+
+		} catch (BadLocationException x) {
+		}
+
+		if (start > -1 && end > -1) {
+			return new Region(start, end - start);
+		}
+		return null;
+	}
+	
+	public static String getSourceOrPatchValue(Specfile spec, String patchOrSourceName) {
+		String value = null;
+		Pattern p = Pattern.compile("(source|patch)(\\d*)"); //$NON-NLS-1$
+		Matcher m = p.matcher(patchOrSourceName);
+
+		if (m.matches()) {
+			String digits = m.group(2);
+
+			SpecfileSource source = null;
+			int number = -1;
+
+			if (digits != null && digits.equals(EMPTY_STRING)) {
+				number = 0;
+			} else if (digits != null && !digits.equals(EMPTY_STRING)) {
+				number = Integer.parseInt(digits);
+			}
+
+			if (number != -1) {
+				if (m.group(1).equals("source")) //$NON-NLS-1$
+					source = spec.getSource(number);
+				else if (m.group(1).equals("patch")) //$NON-NLS-1$
+					source = spec.getPatch(number);
+
+				if (source != null) {
+					value = source.getFileName();
+				}
+			}
+		}
+		return value;
+	}
+
+	public static String getMacroValueFromMacroList(String macroName) {
+		String value = null;
+		if (Activator.getDefault().getRpmMacroList().findKey("%" + macroName)) { //$NON-NLS-1$
+			String currentConfig = Activator.getDefault().getPreferenceStore().getString(PreferenceConstants.P_MACRO_HOVER_CONTENT);
+			// Show content of the macro according with the configuration set
+			// in the macro preference page.
+			if (currentConfig.equals(PreferenceConstants.P_MACRO_HOVER_CONTENT_VIEWDESCRIPTION))
+				value = Activator.getDefault().getRpmMacroList().getValue(macroName);
+			else
+				value = RpmMacroProposalsList.getMacroEval("%" + macroName); //$NON-NLS-1$
+		}
+		return value;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileLog.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileLog.java
new file mode 100644
index 0000000..bfc941a
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileLog.java
@@ -0,0 +1,109 @@
+/*******************************************************************************

+ * Copyright (c) 2007 Alphonse Van Assche.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Alphonse Van Assche - initial API and implementation

+ *******************************************************************************/

+

+package org.eclipse.linuxtools.rpm.ui.editor;

+

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.Status;

+

+/**

+ * The logger of convenience for the Specfile Plug-In.

+ */

+public final class SpecfileLog {

+	

+	private SpecfileLog(){

+		super();

+	}

+	

+   /**

+    * Log the specified information.

+    * 

+    * @param message A human-readable message, localized to the

+    *           current locale.

+    */

+   public static void logInfo(String message) {

+      log(IStatus.INFO, IStatus.OK, message, null);

+   }

+

+   /**

+    * Log the specified error.

+    * 

+    * @param exception A low-level exception.

+    */

+   public static void logError(Throwable exception) {

+      logError(Messages.SpecfileLog_0, exception);

+   }

+

+   /**

+    * Log the specified error.

+    * 

+    * @param message A human-readable message, localized to the

+    *           current locale.

+    * @param exception A low-level exception, or <code>null</code>

+    *           if not applicable.

+    */

+   public static void logError(String message, Throwable exception) {

+      log(IStatus.ERROR, IStatus.OK, message, exception);

+   }

+

+   /**

+    * Log the specified information.

+    * 

+    * @param severity The severity; one of the following:

+    *           <code>IStatus.OK</code>,

+    *           <code>IStatus.ERROR</code>,

+    *           <code>IStatus.INFO</code>, or

+    *           <code>IStatus.WARNING</code>.

+    * @param code The plug-in-specific status code, or

+    *           <code>OK</code>.

+    * @param message A human-readable message, localized to the

+    *           current locale.

+    * @param exception A low-level exception, or <code>null</code>

+    *           if not applicable.

+    */

+   public static void log(int severity, int code, String message,

+         Throwable exception) {

+

+      log(createStatus(severity, code, message, exception));

+   }

+

+   /**

+    * Create a status object representing the specified information.

+    * 

+    * @param severity The severity; one of the following:

+    *           <code>IStatus.OK</code>,

+    *           <code>IStatus.ERROR</code>,

+    *           <code>IStatus.INFO</code>, or

+    *           <code>IStatus.WARNING</code>.

+    * @param code The plug-in-specific status code, or

+    *           <code>OK</code>.

+    * @param message A human-readable message, localized to the

+    *           current locale.

+    * @param exception A low-level exception, or <code>null</code>

+    *           if not applicable.

+    * @return, the status object (not <code>null</code>).

+    */

+   public static IStatus createStatus(int severity, int code,

+         String message, Throwable exception) {

+

+      return new Status(severity, Activator.PLUGIN_ID, code,

+            message, exception);

+   }

+

+   /**

+    * Log the given status.

+    * 

+    * @param status The status to log.

+    */

+   public static void log(IStatus status) {

+	   Activator.getDefault().getLog().log(status);

+   }

+}
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfilePartitioner.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfilePartitioner.java
new file mode 100644
index 0000000..90097f8
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfilePartitioner.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor;
+
+import org.eclipse.jface.text.rules.FastPartitioner;
+import org.eclipse.jface.text.rules.IPartitionTokenScanner;
+
+public class SpecfilePartitioner extends FastPartitioner {
+	
+	public SpecfilePartitioner(IPartitionTokenScanner scanner, String[] legalContentTypes) {
+		super(scanner, legalContentTypes);
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileReconcilingStrategy.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileReconcilingStrategy.java
new file mode 100644
index 0000000..0d0c6c7
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/SpecfileReconcilingStrategy.java
@@ -0,0 +1,92 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *    Alphonse Van Assche
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.reconciler.DirtyRegion;
+import org.eclipse.jface.text.reconciler.IReconcilingStrategy;
+import org.eclipse.jface.text.reconciler.IReconcilingStrategyExtension;
+import org.eclipse.linuxtools.rpm.ui.editor.outline.SpecfileContentOutlinePage;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.Specfile;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+
+public class SpecfileReconcilingStrategy implements IReconcilingStrategy, IReconcilingStrategyExtension {
+
+	private IDocument sDocument;
+	private IProgressMonitor sProgressMonitor;
+	private SpecfileFoldingStructureProvider sFoldingStructureProvider;
+	
+	SpecfileContentOutlinePage outline;
+	SpecfileEditor editor;
+	IDocumentProvider documentProvider;
+
+	public SpecfileReconcilingStrategy(SpecfileEditor editor) {
+		outline= editor.getOutlinePage();
+		this.editor = editor;
+		documentProvider = editor.getDocumentProvider();
+		sFoldingStructureProvider= new SpecfileFoldingStructureProvider(editor);
+	}
+
+	
+	public void setDocument(IDocument document) {
+		sDocument= document;
+		sFoldingStructureProvider.setDocument(sDocument);
+	}
+
+	public void setProgressMonitor(IProgressMonitor monitor) {
+		sProgressMonitor= monitor;
+		sFoldingStructureProvider.setProgressMonitor(sProgressMonitor);
+	}
+
+	public void reconcile(DirtyRegion dirtyRegion, IRegion subRegion) {
+		reconcile();
+	}
+
+	public void initialReconcile() {
+		reconcile();
+	}
+
+	private void reconcile() {
+		Specfile specfile = editor.getSpecfile();
+		if (specfile != null) {
+			editor.setSpecfile(editor.getParser().parse(documentProvider
+					.getDocument(editor.getEditorInput())));
+			outline.update();
+			updateFolding();
+			updateEditor();
+		}
+	}
+	
+	public void reconcile(IRegion partition) {
+		reconcile();
+	}
+
+	private void updateEditor() {
+		Shell shell= editor.getSite().getShell();
+		if (!(shell == null || shell.isDisposed())) {
+			shell.getDisplay().asyncExec(new Runnable() {
+				public void run() {
+					editor.setSpecfile(editor.getParser().parse(documentProvider
+							.getDocument(editor.getEditorInput())));
+				}
+			});
+		}
+	}
+
+	private void updateFolding() {
+		sFoldingStructureProvider.updateFoldingRegions();
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/UiUtils.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/UiUtils.java
new file mode 100644
index 0000000..d9a9785
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/UiUtils.java
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.linuxtools.rpm.core.utils.Utils;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.Specfile;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileDefine;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfilePackage;
+import org.eclipse.linuxtools.rpm.ui.editor.preferences.PreferenceConstants;
+
+/*
+ * TODO Refract existing code to use the bellow methods so that we can easily 
+ * switch the way that we do some common operation.
+ *
+ */
+
+public class UiUtils {
+	
+	public static void pluginSanityCheck() throws IOException {
+		boolean exists = (new File(PreferenceConstants.RPMMACRO_FILE)).exists();
+	    // Check if ~/.rpmmacros exist, if the file don't exist we create 
+		// it with the appropriate command.
+		if (!exists && Utils.fileExist("/usr/bin/rpmdev-setuptree")) { //$NON-NLS-1$
+			org.eclipse.linuxtools.rpm.core.utils.Utils.runCommandToInputStream("rpmdev-setuptree"); //$NON-NLS-1$
+	    }
+		
+		// Check RPM tool preference.
+		String currentRpmTool = Activator.getDefault().getPreferenceStore().getString(PreferenceConstants.P_CURRENT_RPMTOOLS);
+		if (!Utils.fileExist("/usr/bin/yum")) { //$NON-NLS-1$
+			if (currentRpmTool.equals(PreferenceConstants.DP_RPMTOOLS_YUM))
+				Activator.getDefault().getPreferenceStore().setValue(PreferenceConstants.P_CURRENT_RPMTOOLS, PreferenceConstants.DP_RPMTOOLS_RPM);
+		} else if (!Utils.fileExist("/usr/bin/urpmq")) { //$NON-NLS-1$
+			if (currentRpmTool.equals(PreferenceConstants.DP_RPMTOOLS_URPM))
+				Activator.getDefault().getPreferenceStore().setValue(PreferenceConstants.P_CURRENT_RPMTOOLS, PreferenceConstants.DP_RPMTOOLS_RPM);
+		}
+	}
+	
+	
+		
+	/**
+	 * Resolve defines for a give string, if a define is not found or if
+	 * there is some other error, the original string is returned.
+	 * 
+	 * @param stringToResolve The string to resolve.
+	 * @return resolved string
+	 */
+	public static String resolveDefines(Specfile specfile, String stringToResolve) {
+		String originalString = stringToResolve;
+		SpecfileDefine define;
+		try {
+			Pattern variablePattern = Pattern.compile("%\\{(\\S+?)\\}"); //$NON-NLS-1$
+			Matcher variableMatcher = variablePattern.matcher(stringToResolve);
+			while (variableMatcher.find()) {
+				define = specfile.getDefine(variableMatcher.group(1));
+				stringToResolve = stringToResolve.replaceAll(variableMatcher.group(1), define.getStringValue());
+			}
+			if (!stringToResolve.equals(originalString))
+				stringToResolve = stringToResolve.replaceAll("\\%\\{|\\}", ""); //$NON-NLS-1$ //$NON-NLS-2$
+			return stringToResolve;
+		} catch (Exception e) {
+			return originalString;
+		}
+	}
+	
+	public static String getPackageDefineId(SpecfileDefine define, SpecfilePackage rpmPackage){
+		return getPackageDefineId(define.getName(),rpmPackage);
+	}
+	
+	public static String getPackageDefineId(String defineName, SpecfilePackage rpmPackage){
+		return defineName.toLowerCase() + ":" + rpmPackage.getPackageName(); //$NON-NLS-1$
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/actions/Messages.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/actions/Messages.java
new file mode 100644
index 0000000..2f402fd
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/actions/Messages.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.actions;
+
+import org.eclipse.osgi.util.NLS;
+
+public final class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.rpm.ui.editor.actions.messages"; //$NON-NLS-1$
+	public static String SpecfileChangelogFormatter_0;
+	public static String SpecfileChangelogFormatter_1;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+		super();
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogFormatter.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogFormatter.java
new file mode 100644
index 0000000..5086e3c
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogFormatter.java
@@ -0,0 +1,202 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.actions;
+
+import java.text.MessageFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Locale;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.BadPositionCategoryException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITypedRegion;
+import org.eclipse.jface.text.Position;
+import org.eclipse.linuxtools.changelog.core.ChangelogPlugin;
+import org.eclipse.linuxtools.changelog.core.IFormatterChangeLogContrib;
+import org.eclipse.linuxtools.rpm.ui.editor.Activator;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileLog;
+import org.eclipse.linuxtools.rpm.ui.editor.UiUtils;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.Specfile;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileElement;
+import org.eclipse.linuxtools.rpm.ui.editor.preferences.PreferenceConstants;
+import org.eclipse.linuxtools.rpm.ui.editor.scanners.SpecfilePartitionScanner;
+import org.eclipse.ui.IEditorPart;
+
+public class SpecfileChangelogFormatter implements IFormatterChangeLogContrib {
+
+    public static final SimpleDateFormat SIMPLE_DATE_FORMAT = new SimpleDateFormat("EEE MMM d yyyy"); //$NON-NLS-1$
+	private static final String EMPTY_STRING = ""; //$NON-NLS-1$
+	private IEditorPart changelog;
+
+    public String formatDateLine(String authorName, String authorEmail) {
+    	String dateLine;
+        Specfile specfile = getParsedSpecfile();
+        SpecfileElement resolveElement = new SpecfileElement();
+        resolveElement.setSpecfile(specfile);
+        String epoch = specfile.getEpoch() == -1 ? EMPTY_STRING : (specfile.getEpoch() + ":"); //$NON-NLS-1$
+        String version = specfile.getVersion() == null ? EMPTY_STRING : specfile.getVersion();
+        String release = specfile.getRelease() == null ? EMPTY_STRING : specfile.getRelease();
+        
+        // remove the dist macro if it exist in the release string.
+        release = release.replaceAll("\\%\\{\\?dist\\}", EMPTY_STRING); //$NON-NLS-1$
+     
+        // default format
+        dateLine = MessageFormat.format("* {0} {1} <{2}> {3}{4}-{5}", formatTodaysDate(), authorName, //$NON-NLS-1$
+				authorEmail, epoch, version, release);
+
+        String format = Activator.getDefault().getPreferenceStore().getString(PreferenceConstants.P_CHANGELOG_ENTRY_FORMAT);
+        if (format.equals(PreferenceConstants.P_CHANGELOG_ENTRY_FORMAT_VERSIONED_WITH_SEPARATOR))
+        	dateLine =  MessageFormat.format("* {0} {1} <{2}> - {3}{4}-{5}", formatTodaysDate(), //$NON-NLS-1$
+					authorName, authorEmail, epoch, version, release);
+        
+        else if (format.equals(PreferenceConstants.P_CHANGELOG_ENTRY_FORMAT_UNVERSIONED))
+        	dateLine =  MessageFormat
+					.format("* {0} {1} <{2}>", formatTodaysDate(), authorName, authorEmail); //$NON-NLS-1$
+        
+       	dateLine = UiUtils.resolveDefines(specfile, dateLine);
+        return dateLine;
+
+    }
+
+    public String mergeChangelog(String dateLine, String functionGuess,
+            IEditorPart changelog, String changeLogLocation, String fileLocation) {
+    	return mergeChangelog(dateLine, functionGuess, EMPTY_STRING, changelog, changeLogLocation, fileLocation);
+    }
+
+    protected Specfile getParsedSpecfile() {
+        if (changelog == null)
+            changelog = ChangelogPlugin.getDefault().getWorkbench()
+                    .getActiveWorkbenchWindow().getActivePage()
+                    .getActiveEditor();
+        if (changelog instanceof SpecfileEditor) {
+            SpecfileEditor specEditor = (SpecfileEditor) changelog;
+            return specEditor.getSpecfile();
+        }
+        return null;
+    }
+
+    private String formatTodaysDate() {
+        Calendar cal = new GregorianCalendar();
+        cal.setTime(new Date());
+        // Get default locale
+        Locale defaultLocale = Locale.getDefault();
+        Locale.setDefault(new Locale(Activator.getDefault().getPreferenceStore().getString(PreferenceConstants.P_CHANGELOG_LOCAL)));
+        String date = SIMPLE_DATE_FORMAT.format(new Date());
+        Locale.setDefault(defaultLocale);
+        return date;
+    }
+
+	public String mergeChangelog(String dateLine, String functionGuess,
+			String defaultContent, IEditorPart changelog,
+			String changeLogLocation, String fileLocation) {
+		if (changelog instanceof SpecfileEditor) {
+            SpecfileEditor specEditor = (SpecfileEditor) changelog;
+            IDocument doc = specEditor.getDocumentProvider().getDocument(
+                    specEditor.getEditorInput());
+            String[] positionCategories = doc.getPositionCategories();
+            String contentTypesPositionCategory = null;
+
+            // there is some random number suffix to the category positions,
+            // we need to find the one we want
+            for (String positionCategory: positionCategories) {
+                if (positionCategory.startsWith("__content_types_category")) //$NON-NLS-1$
+                    contentTypesPositionCategory = positionCategory;
+            }
+
+            if (contentTypesPositionCategory != null) {
+                try {
+                    Position[] sectionPositions = doc
+                            .getPositions(contentTypesPositionCategory);
+                    ITypedRegion changelogPartition = null;
+                    for (Position position: sectionPositions) {
+                        int offset = position.getOffset();
+
+                        ITypedRegion partition = doc.getPartition(offset);
+                        if (partition.getType().equals(
+                                SpecfilePartitionScanner.SPEC_CHANGELOG))
+                            changelogPartition = partition;
+
+                    }
+                    // Temporary buffer for changelog text
+                    StringBuilder buf = new StringBuilder();
+                    String changelogText = EMPTY_STRING;
+                    String[] changelogLines = new String[] {};
+                    int offset = doc.getLength();
+                    int length = 0;
+
+                    // there was no changelog partition add it.
+                    if (changelogPartition == null) {
+
+                        // make sure there are at least 2 newlines before 
+                        // the changelog section
+                        String endString = doc.get(doc.getLength() - 2, 2);
+                        if (endString.charAt(0) != '\n')
+                            buf.append('\n');
+                        if (endString.charAt(1) != '\n')
+                            buf.append('\n');
+                        
+                        buf.append("%changelog\n"); //$NON-NLS-1$
+                        
+                    // or get the old text and add the header
+                    } else {
+                        offset = changelogPartition.getOffset();
+                        length = changelogPartition.getLength();
+                        changelogText = doc.get(offset, length);
+
+                        // get old changelog text
+                        changelogLines = changelogText.split("\n"); //$NON-NLS-1$
+                        // add the %changelog header
+                        buf.append(changelogLines[0]).append('\n');
+                    }
+
+                    // now add the entry stub
+                    buf.append(dateLine);
+                    buf.append('\n');
+                    buf.append("- \n"); //$NON-NLS-1$
+
+                    // set the cursor at the end of the entry,
+                    // count back 2 '\n's
+                    int newCursorOffset = offset + buf.length() - 1;
+                    for (int i = 1; i < changelogLines.length; i++) {
+                        buf.append('\n').append(changelogLines[i]);
+                    }
+                    
+                    // always terminate the file with a new line
+                    if (changelogLines.length > 0)
+                        buf.append('\n');
+                    
+                    doc.replace(offset, length, buf.toString());
+
+                    specEditor.selectAndReveal(newCursorOffset, 0);
+                    specEditor.setFocus();
+                } catch (BadPositionCategoryException e) {
+        			SpecfileLog.logError(e);
+                } catch (BadLocationException e) {
+        			SpecfileLog.logError(e);
+                }
+            } else {
+                // log error, we didn't find content type category positions,
+                // WTF?
+            }
+        } else {
+            // TODO: LOg error.
+            System.err.println(Messages.SpecfileChangelogFormatter_0 + changelog.getClass().toString()
+                    + Messages.SpecfileChangelogFormatter_1);
+        }
+        return EMPTY_STRING;
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogParser.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogParser.java
new file mode 100644
index 0000000..bef112c
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileChangelogParser.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.actions;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.linuxtools.changelog.core.IParserChangeLogContrib;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+
+public class SpecfileChangelogParser implements IParserChangeLogContrib {
+
+	public String parseCurrentFunction(IEditorPart editor) throws CoreException {
+		return ""; //$NON-NLS-1$
+	}
+
+	public String parseCurrentFunction(IEditorInput input, int offset) throws CoreException {
+		return ""; //$NON-NLS-1$
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileEditorOrganizePatchesActionDelegate.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileEditorOrganizePatchesActionDelegate.java
new file mode 100644
index 0000000..3be5384
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileEditorOrganizePatchesActionDelegate.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.actions;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.Specfile;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+public class SpecfileEditorOrganizePatchesActionDelegate extends AbstractHandler {
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
+	 */
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		Specfile specfile = ((SpecfileEditor)HandlerUtil.getActiveEditor(event)).getSpecfile();
+		if (specfile != null) {
+			specfile.organizePatches();
+		}
+		return null;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileEditorShowOutlineActionDelegate.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileEditorShowOutlineActionDelegate.java
new file mode 100644
index 0000000..3656ca1
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileEditorShowOutlineActionDelegate.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Alexander Kurtakov.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Kurtakov - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.actions;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
+import org.eclipse.linuxtools.rpm.ui.editor.outline.SpecfileQuickOutlineDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+public class SpecfileEditorShowOutlineActionDelegate extends AbstractHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		SpecfileEditor editor = (SpecfileEditor) HandlerUtil
+				.getActiveEditor(event);
+		SpecfileQuickOutlineDialog quickOutlinePopupDialog = new SpecfileQuickOutlineDialog(
+				editor.getSite().getShell(), SWT.NONE, editor);
+		quickOutlinePopupDialog.setSize(400, 200);
+		quickOutlinePopupDialog.setVisible(true);
+		return null;
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileEditorToggleCommentActionDelegate.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileEditorToggleCommentActionDelegate.java
new file mode 100644
index 0000000..d991c8d
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/actions/SpecfileEditorToggleCommentActionDelegate.java
@@ -0,0 +1,102 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.actions;
+
+import java.io.IOException;
+import java.io.LineNumberReader;
+import java.io.StringReader;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITextSelection;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.linuxtools.rpm.ui.editor.ISpecfileSpecialSymbols;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileLog;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+public class SpecfileEditorToggleCommentActionDelegate extends AbstractHandler {
+
+	SpecfileEditor editor;
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
+	 */
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		editor = (SpecfileEditor) HandlerUtil.getActiveEditor(event);
+		IDocument document = editor.getSpecfileSourceViewer().getDocument();
+		ISelection currentSelection = editor.getSpecfileSourceViewer()
+				.getSelection();
+		if (currentSelection instanceof ITextSelection) {
+			ITextSelection selection = (ITextSelection) currentSelection;
+			String selectedContent = ""; //$NON-NLS-1$
+			try {
+				int begin = document.getLineOffset(selection.getStartLine());
+				StringBuilder sb = new StringBuilder(document.get().substring(0,
+						begin));
+				String content = document.get().substring(begin,
+						selection.getOffset() + selection.getLength());
+				if (linesContentCommentChar(content)) {
+					if (selection.getStartLine() == selection.getEndLine()) {
+						selectedContent = ISpecfileSpecialSymbols.COMMENT_START + content; 
+					} else
+						selectedContent = ISpecfileSpecialSymbols.COMMENT_START + content.replaceAll("\n", "\n#"); //$NON-NLS-1$ //$NON-NLS-2$
+				} else {
+					selectedContent = content.replaceFirst(ISpecfileSpecialSymbols.COMMENT_START, "").replaceAll( //$NON-NLS-1$
+							"\n#", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
+				}
+				sb.append(selectedContent);
+				sb.append(document.get().substring(
+						selection.getOffset() + selection.getLength(),
+						document.get().length()));
+				document.set(sb.toString());
+				editor.setHighlightRange(selection.getOffset(), selection
+						.getLength(), true);
+			} catch (BadLocationException e) {
+				SpecfileLog.logError(e);
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Check if all lines are commented
+	 * 
+	 * @param content
+	 *            to check
+	 * @return true if all lines begin with '#' char
+	 */
+	private boolean linesContentCommentChar(String content) {
+		LineNumberReader reader = new LineNumberReader(
+				new StringReader(content));
+		String line;
+		boolean ret = false;
+		try {
+			while ((line = reader.readLine()) != null) {
+				if (line.startsWith(ISpecfileSpecialSymbols.COMMENT_START)) 
+					ret = false;
+				else
+					return true;
+			}
+		} catch (IOException e) {
+			SpecfileLog.logError(e);
+			return false;
+		}
+		return ret;
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/actions/messages.properties b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/actions/messages.properties
new file mode 100644
index 0000000..77b79d3
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/actions/messages.properties
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+SpecfileChangelogAction_0=Did not get changelog partition. Please make me one\!
+SpecfileChangelogAction_1=Got specfile partition: 
+SpecfileChangelogAction_2=,
+SpecfileChangelogAction_3=Got 
+SpecfileChangelogAction_4=\ editor
+SpecfileChangelogAction_5=EEE MMM d yyyy
+SpecfileChangelogFormatter_0=Got 
+SpecfileChangelogFormatter_1=\ editor
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/compare/Messages.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/compare/Messages.java
new file mode 100644
index 0000000..f51e40f
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/compare/Messages.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.compare;
+
+import org.eclipse.osgi.util.NLS;
+
+public final class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.rpm.ui.editor.compare.messages"; //$NON-NLS-1$
+	public static String SpecMergeViewer_0;
+	public static String SpecStructureCreator_0;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+		super();
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/compare/SpecMergeViewer.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/compare/SpecMergeViewer.java
new file mode 100644
index 0000000..acf7b8f
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/compare/SpecMergeViewer.java
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.compare;
+
+import org.eclipse.compare.CompareConfiguration;
+import org.eclipse.compare.contentmergeviewer.TextMergeViewer;
+import org.eclipse.jface.text.IDocumentPartitioner;
+import org.eclipse.jface.text.TextViewer;
+import org.eclipse.jface.text.source.SourceViewer;
+import org.eclipse.linuxtools.rpm.ui.editor.ColorManager;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileConfiguration;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfilePartitioner;
+import org.eclipse.linuxtools.rpm.ui.editor.scanners.SpecfilePartitionScanner;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * Merge viewer for the files.
+ * 
+ */
+public class SpecMergeViewer extends TextMergeViewer {
+	private ColorManager colorManager;
+
+	/**
+	 * Creates a new SpecMergeViewer.
+	 * 
+	 * @param parent The parent control.
+	 * @param configuration The compare configuration.
+	 * 
+	 * @see TextMergeViewer#TextMergeViewer(Composite, CompareConfiguration)
+	 */
+	public SpecMergeViewer(Composite parent, CompareConfiguration configuration) {
+		super(parent, configuration);
+	}
+
+	@Override
+	public String getTitle() {
+		return Messages.SpecMergeViewer_0;
+	}
+
+	@Override
+	protected IDocumentPartitioner getDocumentPartitioner() {
+		return new SpecfilePartitioner(new SpecfilePartitionScanner(),
+				SpecfilePartitionScanner.SPEC_PARTITION_TYPES);
+	}
+
+	@Override
+	protected void configureTextViewer(TextViewer textViewer) {
+		if (textViewer instanceof SourceViewer) {
+			this.colorManager = new ColorManager();
+			SpecfileEditor editor = new SpecfileEditor();
+			((SourceViewer) textViewer).configure(new SpecfileConfiguration(
+					colorManager, editor));
+		}
+	}
+
+	/**
+	 * Dispose the color manager and invoke the super method.
+	 * 
+	 * @see org.eclipse.compare.contentmergeviewer.TextMergeViewer#handleDispose(org.eclipse.swt.events.DisposeEvent)
+	 */
+	@Override
+	protected void handleDispose(DisposeEvent event) {
+		if (colorManager != null)
+			colorManager.dispose();
+		super.handleDispose(event);
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/compare/SpecMergeViewerCreator.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/compare/SpecMergeViewerCreator.java
new file mode 100644
index 0000000..1606ca1
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/compare/SpecMergeViewerCreator.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.compare;
+
+import org.eclipse.compare.CompareConfiguration;
+import org.eclipse.compare.IViewerCreator;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * Viewer creator which creates a SpecMergeViewer.
+ * 
+ */
+public class SpecMergeViewerCreator implements IViewerCreator {
+
+	/**
+	 * @see org.eclipse.compare.IViewerCreator#createViewer(org.eclipse.swt.widgets
+	 *      .Composite, org.eclipse.compare.CompareConfiguration)
+	 */
+	public Viewer createViewer(Composite parent, CompareConfiguration config) {
+		return new SpecMergeViewer(parent, config);
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/compare/SpecStructureCreator.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/compare/SpecStructureCreator.java
new file mode 100644
index 0000000..ed6aead
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/compare/SpecStructureCreator.java
@@ -0,0 +1,233 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.compare;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+import org.eclipse.compare.CompareUI;
+import org.eclipse.compare.IEditableContent;
+import org.eclipse.compare.IEncodedStreamContentAccessor;
+import org.eclipse.compare.ISharedDocumentAdapter;
+import org.eclipse.compare.IStreamContentAccessor;
+import org.eclipse.compare.ITypedElement;
+import org.eclipse.compare.structuremergeviewer.DocumentRangeNode;
+import org.eclipse.compare.structuremergeviewer.IStructureComparator;
+import org.eclipse.compare.structuremergeviewer.StructureCreator;
+import org.eclipse.compare.structuremergeviewer.StructureRootNode;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IDocumentPartitioner;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileLog;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfilePartitioner;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.Specfile;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfilePackage;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileParser;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileSection;
+import org.eclipse.linuxtools.rpm.ui.editor.scanners.SpecfilePartitionScanner;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Structure creator making which structure is based on the following tree.
+ * 
+ * <pre>
+ * ROOT_NODE
+ * 		SECTIONS...N
+ * 		SUB_PACKAGE...N
+ * 			SUB_PACKAGE_SECTIONS...N
+ * </pre>
+ */
+public class SpecStructureCreator extends StructureCreator {
+
+	static class SpecNode extends DocumentRangeNode implements ITypedElement {
+
+		public SpecNode(DocumentRangeNode parent, int type, String id,
+				IDocument doc, int start, int length) {
+			super(parent, type, id, doc, start, length);
+			if (parent != null) {
+				parent.addChild(SpecNode.this);
+			}
+		}
+
+		public String getName() {
+			return this.getId();
+		}
+
+		public String getType() {
+			return "spec"; //$NON-NLS-1$
+		}
+
+		public Image getImage() {
+			return CompareUI.getImage(getType());
+		}
+	}
+
+	public String getName() {
+		return Messages.SpecStructureCreator_0;
+	}
+
+	@Override
+	public IStructureComparator locate(Object path, Object input) {
+		return null;
+	}
+
+	public String getContents(Object node, boolean ignoreWhitespace) {
+		if (node instanceof IStreamContentAccessor) {
+			IStreamContentAccessor sca = (IStreamContentAccessor) node;
+			try {
+				return readString(sca);
+			} catch (CoreException ex) {
+			}
+		}
+		return null;
+	}
+
+	private void parseSpecfile(DocumentRangeNode root, IDocument doc,
+			IProgressMonitor monitor) {
+		try {
+			SpecfileParser parser = new SpecfileParser();
+			Specfile specfile = parser.parse(doc);
+			String id = specfile.getName();
+			SpecNode parent = new SpecNode(root, 0, id, doc, 0, doc.getLength());
+			monitor = beginWork(monitor);
+			for (SpecfileSection sec : specfile.getSections()) {
+				try {
+					addNode(parent, doc, sec.getName(), doc.getLineOffset(sec
+							.getLineNumber()), doc.getLineOffset(sec
+							.getSectionEndLine())
+							- doc.getLineOffset(sec.getLineNumber()));
+				} catch (BadLocationException e) {
+					SpecfileLog.logError(e);
+				}
+			}
+			for (SpecfilePackage sPackage : specfile.getPackages()
+					.getPackages()) {
+				try {
+					SpecNode pNode = addNode(parent, doc, sPackage
+							.getPackageName(), doc.getLineOffset(sPackage
+							.getLineNumber()), doc.getLineOffset(sPackage
+							.getSectionEndLine())
+							- doc.getLineOffset(sPackage.getLineNumber()));
+					for (SpecfileSection section : sPackage.getSections()) {
+						addNode(pNode, doc, section.getName(), doc
+								.getLineOffset(section.getLineNumber()), doc
+								.getLineOffset(section.getSectionEndLine())
+								- doc.getLineOffset(section.getLineNumber()));
+					}
+				} catch (BadLocationException e) {
+					SpecfileLog.logError(e);
+				}
+			}
+		} finally {
+			monitor.done();
+		}
+	}
+
+	private IProgressMonitor beginWork(IProgressMonitor monitor) {
+		if (monitor == null)
+			return new NullProgressMonitor();
+		return new SubProgressMonitor(monitor, IProgressMonitor.UNKNOWN);
+	}
+
+	private SpecNode addNode(DocumentRangeNode root, IDocument doc,
+			String name, int start, int end) {
+		return new SpecNode(root, 1, name, doc, start, end);
+	}
+
+	private static String readString(InputStream is, String encoding) {
+		if (is == null)
+			return null;
+		BufferedReader reader = null;
+		try {
+			StringBuffer buffer = new StringBuffer();
+			char[] part = new char[2048];
+			int read = 0;
+			reader = new BufferedReader(new InputStreamReader(is, encoding));
+
+			while ((read = reader.read(part)) != -1)
+				buffer.append(part, 0, read);
+
+			return buffer.toString();
+
+		} catch (IOException ex) {
+			// NeedWork
+		} finally {
+			if (reader != null) {
+				try {
+					reader.close();
+				} catch (IOException ex) {
+					// silently ignored
+				}
+			}
+		}
+		return null;
+	}
+
+	public static String readString(IStreamContentAccessor sa)
+			throws CoreException {
+		InputStream is = sa.getContents();
+		if (is != null) {
+			String encoding = null;
+			if (sa instanceof IEncodedStreamContentAccessor) {
+				try {
+					encoding = ((IEncodedStreamContentAccessor) sa)
+							.getCharset();
+				} catch (Exception e) {
+				}
+			}
+			if (encoding == null)
+				encoding = ResourcesPlugin.getEncoding();
+			return readString(is, encoding);
+		}
+		return null;
+	}
+
+	@Override
+	protected IDocumentPartitioner getDocumentPartitioner() {
+		return new SpecfilePartitioner(new SpecfilePartitionScanner(),
+				SpecfilePartitionScanner.SPEC_PARTITION_TYPES);
+	}
+
+	@Override
+	protected String getDocumentPartitioning() {
+		return SpecfilePartitionScanner.SPEC_FILE_PARTITIONING;
+	}
+
+	@Override
+	protected IStructureComparator createStructureComparator(Object input,
+			IDocument document, ISharedDocumentAdapter adapter,
+			IProgressMonitor monitor) throws CoreException {
+
+		final boolean isEditable;
+		if (input instanceof IEditableContent)
+			isEditable = ((IEditableContent) input).isEditable();
+		else
+			isEditable = false;
+
+		DocumentRangeNode rootNode = new StructureRootNode(document, input,
+				this, adapter) {
+			@Override
+			public boolean isEditable() {
+				return isEditable;
+			}
+		};
+		parseSpecfile(rootNode, document, monitor);
+		return rootNode;
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/compare/SpecStructureMergeViewerCreator.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/compare/SpecStructureMergeViewerCreator.java
new file mode 100644
index 0000000..f99ed56
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/compare/SpecStructureMergeViewerCreator.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.compare;
+
+import org.eclipse.compare.CompareConfiguration;
+import org.eclipse.compare.IViewerCreator;
+import org.eclipse.compare.structuremergeviewer.StructureDiffViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * ViewerCreator which creates a StructureDiffViewer with a
+ * SpecStructureCreator.
+ * 
+ */
+public class SpecStructureMergeViewerCreator implements IViewerCreator {
+
+	/**
+	 * @see org.eclipse.compare.IViewerCreator#createViewer(org.eclipse.swt.widgets.Composite,
+	 *      org.eclipse.compare.CompareConfiguration)
+	 */
+	public Viewer createViewer(Composite parent, CompareConfiguration config) {
+		StructureDiffViewer diffViewer = new StructureDiffViewer(parent, config);
+		diffViewer.setStructureCreator(new SpecStructureCreator());
+		return diffViewer;
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/compare/messages.properties b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/compare/messages.properties
new file mode 100644
index 0000000..f849c3d
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/compare/messages.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+SpecMergeViewer_0=Spec Compare
+SpecStructureCreator_0=Spec file compare
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/derived/HTML2TextReader.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/derived/HTML2TextReader.java
new file mode 100644
index 0000000..3f97aa6
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/derived/HTML2TextReader.java
@@ -0,0 +1,330 @@
+/*******************************************************************************
+ *  Copyright (c) 2000, 2009 IBM Corporation and others.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ * 
+ *  Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.derived;
+
+
+import java.io.IOException;
+import java.io.PushbackReader;
+import java.io.Reader;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyleRange;
+
+import org.eclipse.jface.text.TextPresentation;
+
+
+/**
+ * Reads the text contents from a reader of HTML contents and translates
+ * the tags or cut them out.
+ * <p>
+ * Moved into this package from <code>org.eclipse.jface.internal.text.html</code>.</p>
+ */
+public class HTML2TextReader extends SubstitutionTextReader {
+
+	private static final String EMPTY_STRING= ""; //$NON-NLS-1$
+	private static final Map<String, String> fgEntityLookup;
+	private static final Set<String> fgTags;
+
+	static {
+
+		fgTags= new HashSet<String>();
+		fgTags.add("b"); //$NON-NLS-1$
+		fgTags.add("br"); //$NON-NLS-1$
+		fgTags.add("br/"); //$NON-NLS-1$
+		fgTags.add("div"); //$NON-NLS-1$
+		fgTags.add("h1"); //$NON-NLS-1$
+		fgTags.add("h2"); //$NON-NLS-1$
+		fgTags.add("h3"); //$NON-NLS-1$
+		fgTags.add("h4"); //$NON-NLS-1$
+		fgTags.add("h5"); //$NON-NLS-1$
+		fgTags.add("p"); //$NON-NLS-1$
+		fgTags.add("dl"); //$NON-NLS-1$
+		fgTags.add("dt"); //$NON-NLS-1$
+		fgTags.add("dd"); //$NON-NLS-1$
+		fgTags.add("li"); //$NON-NLS-1$
+		fgTags.add("ul"); //$NON-NLS-1$
+		fgTags.add("pre"); //$NON-NLS-1$
+		fgTags.add("head"); //$NON-NLS-1$
+
+		fgEntityLookup= new HashMap<String, String>(7);
+		fgEntityLookup.put("lt", "<"); //$NON-NLS-1$ //$NON-NLS-2$
+		fgEntityLookup.put("gt", ">"); //$NON-NLS-1$ //$NON-NLS-2$
+		fgEntityLookup.put("nbsp", " "); //$NON-NLS-1$ //$NON-NLS-2$
+		fgEntityLookup.put("amp", "&"); //$NON-NLS-1$ //$NON-NLS-2$
+		fgEntityLookup.put("circ", "^"); //$NON-NLS-1$ //$NON-NLS-2$
+		fgEntityLookup.put("tilde", "~"); //$NON-NLS-2$ //$NON-NLS-1$
+		fgEntityLookup.put("quot", "\"");		 //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	private int fCounter= 0;
+	private TextPresentation fTextPresentation;
+	private int fBold= 0;
+	private int fStartOffset= -1;
+	private boolean fInParagraph= false;
+	private boolean fIsPreformattedText= false;
+	private boolean fIgnore= false;
+	private boolean fHeaderDetected= false;
+
+	/**
+	 * Transforms the HTML text from the reader to formatted text.
+	 *
+	 * @param reader the reader
+	 * @param presentation If not <code>null</code>, formattings will be applied to
+	 * the presentation.
+	*/
+	public HTML2TextReader(Reader reader, TextPresentation presentation) {
+		super(new PushbackReader(reader));
+		fTextPresentation= presentation;
+	}
+
+	@Override
+	public int read() throws IOException {
+		int c= super.read();
+		if (c != -1)
+			++ fCounter;
+		return c;
+	}
+
+	protected void startBold() {
+		if (fBold == 0)
+			fStartOffset= fCounter;
+		++ fBold;
+	}
+
+	protected void startPreformattedText() {
+		fIsPreformattedText= true;
+		setSkipWhitespace(false);
+	}
+
+	protected void stopPreformattedText() {
+		fIsPreformattedText= false;
+		setSkipWhitespace(true);
+	}
+
+	protected void stopBold() {
+		-- fBold;
+		if (fBold == 0) {
+			if (fTextPresentation != null) {
+				fTextPresentation.addStyleRange(new StyleRange(fStartOffset, fCounter - fStartOffset, null, null, SWT.BOLD));
+			}
+			fStartOffset= -1;
+		}
+	}
+
+	/*
+	 * @see org.eclipse.jdt.internal.ui.text.SubstitutionTextReader#computeSubstitution(int)
+	 */
+	@Override
+	protected String computeSubstitution(int c) throws IOException {
+
+		if (c == '<')
+			return  processHTMLTag();
+		else if (fIgnore)
+			return EMPTY_STRING;
+		else if (c == '&')
+			return processEntity();
+		else if (fIsPreformattedText)
+			return processPreformattedText(c);
+
+		return null;
+	}
+
+	private String html2Text(String html) {
+
+		if (html == null || html.length() == 0)
+			return EMPTY_STRING;
+
+		html= html.toLowerCase();
+		
+		String tag= html;
+		if ('/' == tag.charAt(0))
+			tag= tag.substring(1);
+
+		if (!fgTags.contains(tag))
+			return EMPTY_STRING;
+
+
+		if ("pre".equals(html)) { //$NON-NLS-1$
+			startPreformattedText();
+			return EMPTY_STRING;
+		}
+
+		if ("/pre".equals(html)) { //$NON-NLS-1$
+			stopPreformattedText();
+			return EMPTY_STRING;
+		}
+
+		if (fIsPreformattedText)
+			return EMPTY_STRING;
+
+		if ("b".equals(html)) { //$NON-NLS-1$
+			startBold();
+			return EMPTY_STRING;
+		}
+
+		if ((html.length() > 1 && html.charAt(0) == 'h' && Character.isDigit(html.charAt(1))) || "dt".equals(html)) { //$NON-NLS-1$
+			startBold();
+			return EMPTY_STRING;
+		}
+
+		if ("dl".equals(html)) //$NON-NLS-1$
+			return LINE_DELIM;
+
+		if ("dd".equals(html)) //$NON-NLS-1$
+			return "\t"; //$NON-NLS-1$
+
+		if ("li".equals(html)) //$NON-NLS-1$
+			// FIXME: this hard-coded prefix does not work for RTL languages, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=91682
+			return LINE_DELIM + "\t-"; //$NON-NLS-1$
+
+		if ("/b".equals(html)) { //$NON-NLS-1$
+			stopBold();
+			return EMPTY_STRING;
+		}
+
+		if ("p".equals(html))  { //$NON-NLS-1$
+			fInParagraph= true;
+			return LINE_DELIM;
+		}
+
+		if ("br".equals(html) || "br/".equals(html) || "div".equals(html)) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			return LINE_DELIM;
+
+		if ("/p".equals(html))  { //$NON-NLS-1$
+			boolean inParagraph= fInParagraph;
+			fInParagraph= false;
+			return inParagraph ? EMPTY_STRING : LINE_DELIM;
+		}
+
+		if ((html.startsWith("/h") && html.length() > 2 && Character.isDigit(html.charAt(2))) || "/dt".equals(html)) { //$NON-NLS-1$ //$NON-NLS-2$
+			stopBold();
+			return LINE_DELIM;
+		}
+
+		if ("/dd".equals(html)) //$NON-NLS-1$
+			return LINE_DELIM;
+		
+		if ("head".equals(html) && !fHeaderDetected) { //$NON-NLS-1$
+			fHeaderDetected= true;
+			fIgnore= true;
+			return EMPTY_STRING;
+		}
+		
+		if ("/head".equals(html) && fHeaderDetected && fIgnore) { //$NON-NLS-1$
+			fIgnore= false;
+			return EMPTY_STRING;
+		}
+
+		return EMPTY_STRING;
+	}
+
+	/*
+	 * A '<' has been read. Process a html tag
+	 */
+	private String processHTMLTag() throws IOException {
+
+		StringBuffer buf= new StringBuffer();
+		int ch;
+		do {
+
+			ch= nextChar();
+
+			while (ch != -1 && ch != '>') {
+				buf.append(Character.toLowerCase((char) ch));
+				ch= nextChar();
+				if (ch == '"'){
+					buf.append(Character.toLowerCase((char) ch));
+					ch= nextChar();
+					while (ch != -1 && ch != '"'){
+						buf.append(Character.toLowerCase((char) ch));
+						ch= nextChar();
+					}
+				}
+				if (ch == '<'){
+					unread(ch);
+					return '<' + buf.toString();
+				}
+			}
+
+			if (ch == -1)
+				return null;
+
+			int tagLen= buf.length();
+			// needs special treatment for comments
+			if ((tagLen >= 3 && "!--".equals(buf.substring(0, 3))) //$NON-NLS-1$
+				&& !(tagLen >= 5 && "--".equals(buf.substring(tagLen - 2)))) { //$NON-NLS-1$
+				// unfinished comment
+				buf.append(ch);
+			} else {
+				break;
+			}
+		} while (true);
+
+		return html2Text(buf.toString());
+	}
+
+	private String processPreformattedText(int c) {
+		if  (c == '\r' || c == '\n')
+			fCounter++;
+		return null;
+	}
+
+
+	private void unread(int ch) throws IOException {
+		((PushbackReader) getReader()).unread(ch);
+	}
+
+	protected String entity2Text(String symbol) {
+		if (symbol.length() > 1 && symbol.charAt(0) == '#') {
+			int ch;
+			try {
+				if (symbol.charAt(1) == 'x') {
+					ch= Integer.parseInt(symbol.substring(2), 16);
+				} else {
+					ch= Integer.parseInt(symbol.substring(1), 10);
+				}
+				return EMPTY_STRING + (char)ch;
+			} catch (NumberFormatException e) {
+			}
+		} else {
+			String str= fgEntityLookup.get(symbol);
+			if (str != null) {
+				return str;
+			}
+		}
+		return "&" + symbol; // not found //$NON-NLS-1$
+	}
+
+	/*
+	 * A '&' has been read. Process a entity
+	 */
+	private String processEntity() throws IOException {
+		StringBuffer buf= new StringBuffer();
+		int ch= nextChar();
+		while (Character.isLetterOrDigit((char)ch) || ch == '#') {
+			buf.append((char) ch);
+			ch= nextChar();
+		}
+
+		if (ch == ';')
+			return entity2Text(buf.toString());
+
+		buf.insert(0, '&');
+		if (ch != -1)
+			buf.append((char) ch);
+		return buf.toString();
+	}
+}
+
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/derived/HTMLTextPresenter.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/derived/HTMLTextPresenter.java
new file mode 100644
index 0000000..7baab45
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/derived/HTMLTextPresenter.java
@@ -0,0 +1,200 @@
+/*******************************************************************************
+ *  Copyright (c) 2000, 2009 IBM Corporation and others.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ * 
+ *  Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.derived;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.util.Iterator;
+
+import org.eclipse.swt.custom.StyleRange;
+import org.eclipse.swt.graphics.Drawable;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.widgets.Display;
+
+import org.eclipse.jface.text.DefaultInformationControl;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.TextPresentation;
+
+
+/**
+ * <p>
+ * Moved into this package from <code>org.eclipse.jface.internal.text.html</code>.</p>
+ */
+public class HTMLTextPresenter implements DefaultInformationControl.IInformationPresenter, DefaultInformationControl.IInformationPresenterExtension {
+
+	private static final String LINE_DELIM= System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
+
+	private int fCounter;
+	private boolean fEnforceUpperLineLimit;
+
+	public HTMLTextPresenter(boolean enforceUpperLineLimit) {
+		super();
+		fEnforceUpperLineLimit= enforceUpperLineLimit;
+	}
+
+	public HTMLTextPresenter() {
+		this(true);
+	}
+
+	protected Reader createReader(String hoverInfo, TextPresentation presentation) {
+		return new HTML2TextReader(new StringReader(hoverInfo), presentation);
+	}
+
+	protected void adaptTextPresentation(TextPresentation presentation, int offset, int insertLength) {
+
+		int yoursStart= offset;
+
+		Iterator<StyleRange> e= presentation.getAllStyleRangeIterator();
+		while (e.hasNext()) {
+
+			StyleRange range= e.next();
+
+			int myStart= range.start;
+			int myEnd=   range.start + range.length -1;
+			myEnd= Math.max(myStart, myEnd);
+
+			if (myEnd < yoursStart)
+				continue;
+
+			if (myStart < yoursStart)
+				range.length += insertLength;
+			else
+				range.start += insertLength;
+		}
+	}
+
+	private void append(StringBuffer buffer, String string, TextPresentation presentation) {
+
+		int length= string.length();
+		buffer.append(string);
+
+		if (presentation != null)
+			adaptTextPresentation(presentation, fCounter, length);
+
+		fCounter += length;
+	}
+
+	private String getIndent(String line) {
+		int length= line.length();
+
+		int i= 0;
+		while (i < length && Character.isWhitespace(line.charAt(i))) ++i;
+
+		return (i == length ? line : line.substring(0, i)) + " "; //$NON-NLS-1$
+	}
+
+	/*
+	 * @see IHoverInformationPresenter#updatePresentation(Display display, String, TextPresentation, int, int)
+	 */
+	public String updatePresentation(Display display, String hoverInfo, TextPresentation presentation, int maxWidth, int maxHeight) {
+		return updatePresentation((Drawable)display, hoverInfo, presentation, maxWidth, maxHeight);
+	}
+
+	/*
+	 * @see IHoverInformationPresenterExtension#updatePresentation(Drawable drawable, String, TextPresentation, int, int)
+	 * @since 3.2
+	 */
+	public String updatePresentation(Drawable drawable, String hoverInfo, TextPresentation presentation, int maxWidth, int maxHeight) {
+
+		if (hoverInfo == null)
+			return null;
+
+		GC gc= new GC(drawable);
+		try {
+
+			StringBuffer buffer= new StringBuffer();
+			int maxNumberOfLines= Math.round(maxHeight / gc.getFontMetrics().getHeight());
+
+			fCounter= 0;
+			LineBreakingReader reader= new LineBreakingReader(createReader(hoverInfo, presentation), gc, maxWidth);
+
+			boolean lastLineFormatted= false;
+			String lastLineIndent= null;
+
+			String line=reader.readLine();
+			boolean lineFormatted= reader.isFormattedLine();
+			boolean firstLineProcessed= false;
+
+			while (line != null) {
+
+				if (fEnforceUpperLineLimit && maxNumberOfLines <= 0)
+					break;
+
+				if (firstLineProcessed) {
+					if (!lastLineFormatted)
+						append(buffer, LINE_DELIM, null);
+					else {
+						append(buffer, LINE_DELIM, presentation);
+						if (lastLineIndent != null)
+							append(buffer, lastLineIndent, presentation);
+					}
+				}
+
+				append(buffer, line, null);
+				firstLineProcessed= true;
+
+				lastLineFormatted= lineFormatted;
+				if (!lineFormatted)
+					lastLineIndent= null;
+				else if (lastLineIndent == null)
+					lastLineIndent= getIndent(line);
+
+				line= reader.readLine();
+				lineFormatted= reader.isFormattedLine();
+
+				maxNumberOfLines--;
+			}
+
+			if (line != null) {
+				append(buffer, LINE_DELIM, lineFormatted ? presentation : null);
+				append(buffer,"...", presentation); //$NON-NLS-1$
+			}
+
+			return trim(buffer, presentation);
+
+		} catch (IOException e) {
+
+			// ignore TODO do something else?
+			return null;
+
+		} finally {
+			gc.dispose();
+		}
+	}
+
+	private String trim(StringBuffer buffer, TextPresentation presentation) {
+
+		int length= buffer.length();
+
+		int end= length -1;
+		while (end >= 0 && Character.isWhitespace(buffer.charAt(end)))
+			-- end;
+
+		if (end == -1)
+			return ""; //$NON-NLS-1$
+
+		if (end < length -1)
+			buffer.delete(end + 1, length);
+		else
+			end= length;
+
+		int start= 0;
+		while (start < end && Character.isWhitespace(buffer.charAt(start)))
+			++ start;
+
+		buffer.delete(0, start);
+		presentation.setResultWindow(new Region(start, buffer.length()));
+		return buffer.toString();
+	}
+}
+
+
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/derived/LineBreakingReader.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/derived/LineBreakingReader.java
new file mode 100644
index 0000000..bfb5ed2
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/derived/LineBreakingReader.java
@@ -0,0 +1,133 @@
+/*******************************************************************************
+ *  Copyright (c) 2000, 2009 IBM Corporation and others.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ * 
+ *  Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.derived;
+
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.Reader;
+
+import com.ibm.icu.text.BreakIterator;
+import org.eclipse.swt.graphics.GC;
+
+/**
+ * Not a real reader. Could change if requested
+ * <p>Moved into this package from <code>org.eclipse.jface.internal.text.html</code>.</p>
+ */
+public class LineBreakingReader {
+
+	private BufferedReader fReader;
+	private GC fGC;
+	private int fMaxWidth;
+
+	private String fLine;
+	private int fOffset;
+
+	private BreakIterator fLineBreakIterator;
+	private boolean fBreakWords;
+
+	/**
+	 * Creates a reader that breaks an input text to fit in a given width.
+	 * 
+	 * @param reader Reader of the input text
+	 * @param gc The graphic context that defines the currently used font sizes
+	 * @param maxLineWidth The max width (pixels) where the text has to fit in
+	 */
+	public LineBreakingReader(Reader reader, GC gc, int maxLineWidth) {
+		fReader= new BufferedReader(reader);
+		fGC= gc;
+		fMaxWidth= maxLineWidth;
+		fOffset= 0;
+		fLine= null;
+		fLineBreakIterator= BreakIterator.getLineInstance();
+		fBreakWords= true;
+	}
+
+	public boolean isFormattedLine() {
+		return fLine != null;
+	}
+
+	/**
+	 * Reads the next line. The lengths of the line will not exceed the given maximum
+	 * width.
+	 * 
+	 * @return the next line 
+	 * @throws IOException  If an I/O error occurs.
+	 */
+	public String readLine() throws IOException {
+		if (fLine == null) {
+			String line= fReader.readLine();
+			if (line == null)
+				return null;
+
+			int lineLen= fGC.textExtent(line).x;
+			if (lineLen < fMaxWidth) {
+				return line;
+			}
+			fLine= line;
+			fLineBreakIterator.setText(line);
+			fOffset= 0;
+		}
+		int breakOffset= findNextBreakOffset(fOffset);
+		String res;
+		if (breakOffset != BreakIterator.DONE) {
+			res= fLine.substring(fOffset, breakOffset);
+			fOffset= findWordBegin(breakOffset);
+			if (fOffset == fLine.length()) {
+				fLine= null;
+			}
+		} else {
+			res= fLine.substring(fOffset);
+			fLine= null;
+		}
+		return res;
+	}
+
+	private int findNextBreakOffset(int currOffset) {
+		int currWidth= 0;
+		int nextOffset= fLineBreakIterator.following(currOffset);
+		while (nextOffset != BreakIterator.DONE) {
+			String word= fLine.substring(currOffset, nextOffset);
+			int wordWidth= fGC.textExtent(word).x;
+			int nextWidth= wordWidth + currWidth;
+			if (nextWidth > fMaxWidth) {
+				if (currWidth > 0)
+					return currOffset;
+
+				if (!fBreakWords)
+					return nextOffset;
+
+				// need to fit into fMaxWidth
+				int length= word.length();
+				while (length >= 0) {
+					length--;
+					word= word.substring(0, length);
+					wordWidth= fGC.textExtent(word).x;
+					if (wordWidth + currWidth < fMaxWidth)
+						return currOffset + length;
+				}
+				return nextOffset;
+			}
+			currWidth= nextWidth;
+			currOffset= nextOffset;
+			nextOffset= fLineBreakIterator.next();
+		}
+		return nextOffset;
+	}
+
+	private int findWordBegin(int idx) {
+		while (idx < fLine.length() && Character.isWhitespace(fLine.charAt(idx))) {
+			idx++;
+		}
+		return idx;
+	}
+}
+
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/derived/SingleCharReader.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/derived/SingleCharReader.java
new file mode 100644
index 0000000..ed5f697
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/derived/SingleCharReader.java
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ *  Copyright (c) 2000, 2009 IBM Corporation and others.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ * 
+ *  Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.derived;
+
+
+import java.io.IOException;
+import java.io.Reader;
+
+
+/**
+ * <p>
+ * Moved into this package from <code>org.eclipse.jface.internal.text.html</code>.</p>
+ */
+public abstract class SingleCharReader extends Reader {
+
+	/**
+	 * @see Reader#read()
+	 */
+	@Override
+	public abstract int read() throws IOException;
+
+	/**
+	 * @see Reader#read(char[],int,int)
+	 */
+	@Override
+	public int read(char cbuf[], int off, int len) throws IOException {
+		int end= off + len;
+		for (int i= off; i < end; i++) {
+			int ch= read();
+			if (ch == -1) {
+				if (i == off)
+					return -1;
+				return i - off;
+			}
+			cbuf[i]= (char)ch;
+		}
+		return len;
+	}
+
+	/**
+	 * @see Reader#ready()
+	 */
+    @Override
+	public boolean ready() throws IOException {
+		return true;
+	}
+
+	/**
+	 * Returns the readable content as string.
+	 * @return the readable content as string
+	 * @exception IOException in case reading fails
+	 */
+	public String getString() throws IOException {
+		StringBuffer buf= new StringBuffer();
+		int ch;
+		while ((ch= read()) != -1) {
+			buf.append((char)ch);
+		}
+		return buf.toString();
+	}
+}
+
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/derived/SubstitutionTextReader.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/derived/SubstitutionTextReader.java
new file mode 100644
index 0000000..0e200ad
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/derived/SubstitutionTextReader.java
@@ -0,0 +1,164 @@
+/*******************************************************************************
+ *  Copyright (c) 2000, 2009 IBM Corporation and others.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ * 
+ *  Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.derived;
+
+import java.io.IOException;
+import java.io.Reader;
+
+
+/**
+ * Reads the text contents from a reader and computes for each character
+ * a potential substitution. The substitution may eat more characters than
+ * only the one passed into the computation routine.
+ * <p>
+ * Moved into this package from <code>org.eclipse.jface.internal.text.html</code>.</p>
+ */
+public abstract class SubstitutionTextReader extends SingleCharReader {
+
+	protected static final String LINE_DELIM= System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
+
+	private Reader fReader;
+	protected boolean fWasWhiteSpace;
+	private int fCharAfterWhiteSpace;
+
+	/**
+	 * Tells whether white space characters are skipped.
+	 */
+	private boolean fSkipWhiteSpace= true;
+
+	private boolean fReadFromBuffer;
+	private StringBuffer fBuffer;
+	private int fIndex;
+
+
+	protected SubstitutionTextReader(Reader reader) {
+		fReader= reader;
+		fBuffer= new StringBuffer();
+		fIndex= 0;
+		fReadFromBuffer= false;
+		fCharAfterWhiteSpace= -1;
+		fWasWhiteSpace= true;
+	}
+
+	/**
+	 * Computes the substitution for the given character and if necessary
+	 * subsequent characters. Implementation should use <code>nextChar</code>
+	 * to read subsequent characters.
+	 *
+	 * @param c the character to be substituted
+	 * @return the substitution for <code>c</code>
+	 * @throws IOException in case computing the substitution fails
+	 */
+	protected abstract String computeSubstitution(int c) throws IOException;
+
+	/**
+	 * Returns the internal reader.
+	 *
+	 * @return the internal reader
+	 */
+	protected Reader getReader() {
+		return fReader;
+	}
+
+	/**
+	 * Returns the next character.
+	 * @return the next character
+	 * @throws IOException in case reading the character fails
+	 */
+	protected int nextChar() throws IOException {
+		fReadFromBuffer= (fBuffer.length() > 0);
+		if (fReadFromBuffer) {
+			char ch= fBuffer.charAt(fIndex++);
+			if (fIndex >= fBuffer.length()) {
+				fBuffer.setLength(0);
+				fIndex= 0;
+			}
+			return ch;
+		}
+
+		int ch= fCharAfterWhiteSpace;
+		if (ch == -1) {
+			ch= fReader.read();
+		}
+		if (fSkipWhiteSpace && Character.isWhitespace((char)ch)) {
+			do {
+				ch= fReader.read();
+			} while (Character.isWhitespace((char)ch));
+			if (ch != -1) {
+				fCharAfterWhiteSpace= ch;
+				return ' ';
+			}
+		} else {
+			fCharAfterWhiteSpace= -1;
+		}
+		return ch;
+	}
+
+	/**
+	 * @see Reader#read()
+	 */
+	@Override
+	public int read() throws IOException {
+		int c;
+		do {
+
+			c= nextChar();
+			while (!fReadFromBuffer) {
+				String s= computeSubstitution(c);
+				if (s == null)
+					break;
+				if (s.length() > 0)
+					fBuffer.insert(0, s);
+				c= nextChar();
+			}
+
+		} while (fSkipWhiteSpace && fWasWhiteSpace && (c == ' '));
+		fWasWhiteSpace= (c == ' ' || c == '\r' || c == '\n');
+		return c;
+	}
+
+	/**
+	 * @see Reader#ready()
+	 */
+    @Override
+	public boolean ready() throws IOException {
+		return fReader.ready();
+	}
+
+	/**
+	 * @see Reader#close()
+	 */
+	@Override
+	public void close() throws IOException {
+		fReader.close();
+	}
+
+	/**
+	 * @see Reader#reset()
+	 */
+	@Override
+	public void reset() throws IOException {
+		fReader.reset();
+		fWasWhiteSpace= true;
+		fCharAfterWhiteSpace= -1;
+		fBuffer.setLength(0);
+		fIndex= 0;
+	}
+
+	protected final void setSkipWhitespace(boolean state) {
+		fSkipWhiteSpace= state;
+	}
+
+	protected final boolean isSkippingWhitespace() {
+		return fSkipWhiteSpace;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/detectors/IStrictWordDetector.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/detectors/IStrictWordDetector.java
new file mode 100644
index 0000000..136d1ba
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/detectors/IStrictWordDetector.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.detectors;
+
+import org.eclipse.jface.text.rules.IWordDetector;
+
+public interface IStrictWordDetector extends IWordDetector {
+	boolean isEndingCharacter(char c);
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/detectors/KeywordWordDetector.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/detectors/KeywordWordDetector.java
new file mode 100644
index 0000000..1de13cd
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/detectors/KeywordWordDetector.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.detectors;
+
+import org.eclipse.jface.text.rules.IWordDetector;
+
+public class KeywordWordDetector implements IWordDetector {
+
+	public boolean isWordPart(char c) {
+		return Character.isLetterOrDigit(c);
+	}
+
+	public boolean isWordStart(char c) {
+		return (c == '%');
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/detectors/MacroWordDetector.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/detectors/MacroWordDetector.java
new file mode 100644
index 0000000..8d4581b
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/detectors/MacroWordDetector.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.detectors;
+
+import org.eclipse.jface.text.rules.IWordDetector;
+
+public class MacroWordDetector implements IWordDetector {
+
+	public boolean isWordPart(char c) {
+		return (Character.isLetterOrDigit(c) || c == '%' || c == '{' || c == '}' || c == '_') ;
+	}
+
+	public boolean isWordStart(char c) {
+		return (c == '%');
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/detectors/PackageWordDetector.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/detectors/PackageWordDetector.java
new file mode 100644
index 0000000..2016912
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/detectors/PackageWordDetector.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.detectors;
+
+import org.eclipse.jface.text.rules.IWordDetector;
+
+public class PackageWordDetector implements IWordDetector {
+
+	public boolean isWordPart(char c) {
+		return Character.isLetterOrDigit(c) || (c == '-') || (c == '_') || (c == '+');
+	}
+
+	public boolean isWordStart(char c) {
+		return (c == ' ') || (c == ',') || (c == '\t') || (c == ':');
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/detectors/PatchNumberDetector.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/detectors/PatchNumberDetector.java
new file mode 100644
index 0000000..2984a0c
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/detectors/PatchNumberDetector.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.detectors;
+
+
+
+public class PatchNumberDetector implements IStrictWordDetector {
+
+	public boolean isWordPart(char c) {
+		return Character.isDigit(c);
+	}
+
+	public boolean isWordStart(char c) {
+		return Character.isDigit(c);
+	}
+	
+	public boolean isEndingCharacter(char c) {
+		return Character.isWhitespace(c);
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/detectors/SuffixNumberDetector.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/detectors/SuffixNumberDetector.java
new file mode 100644
index 0000000..3ee364f
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/detectors/SuffixNumberDetector.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.detectors;
+
+
+public class SuffixNumberDetector implements IStrictWordDetector {
+
+	public boolean isEndingCharacter(char c) {
+		return (c == ':');
+	}
+
+	public boolean isWordPart(char c) {
+		return Character.isDigit(c);
+	}
+
+	public boolean isWordStart(char c) {
+		// TODO Auto-generated method stub
+		return Character.isDigit(c);
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/detectors/TagWordDetector.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/detectors/TagWordDetector.java
new file mode 100644
index 0000000..c68b966
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/detectors/TagWordDetector.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.detectors;
+
+import org.eclipse.jface.text.rules.IWordDetector;
+
+public class TagWordDetector implements IWordDetector {
+
+	public boolean isWordPart(char c) {
+		return Character.isLetterOrDigit(c) || (c == ':') || (c == '(') || (c == ')');
+	}
+
+	public boolean isWordStart(char c) {
+		return Character.isLetter(c);
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/forms/MainPackagePage.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/forms/MainPackagePage.java
new file mode 100644
index 0000000..12cadb6
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/forms/MainPackagePage.java
@@ -0,0 +1,170 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.forms;
+
+import org.eclipse.linuxtools.rpm.ui.editor.RpmTags;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.Specfile;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfilePackage;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileTag;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.layout.RowLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.editor.FormPage;
+import org.eclipse.ui.forms.widgets.ExpandableComposite;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.ScrolledForm;
+import org.eclipse.ui.forms.widgets.Section;
+
+public class MainPackagePage extends FormPage {
+	private FormToolkit toolkit;
+	private ScrolledForm form;
+	private Specfile specfile;
+
+	public MainPackagePage(SpecfileFormEditor editor, Specfile specfile) {
+		super(editor, Messages.MainPackagePage_0, Messages.MainPackagePage_1);
+		this.specfile = specfile;
+	}
+
+	@Override
+	protected void createFormContent(IManagedForm managedForm) {
+		super.createFormContent(managedForm);
+		toolkit = managedForm.getToolkit();
+		form = managedForm.getForm();
+		form.setText(Messages.MainPackagePage_2);
+		GridLayout layout = new GridLayout();
+		layout.marginWidth = layout.marginHeight = 5;
+		layout.numColumns = 2;
+		RowLayout rowLayout = new RowLayout();
+		rowLayout.type = SWT.VERTICAL;
+		rowLayout.justify = true;
+		rowLayout.fill = true;
+		
+		form.getBody().setLayout(rowLayout);
+		form.getBody().setLayoutData(rowLayout);
+		layout.numColumns = 2;
+		GridData gd = new GridData();
+		gd.horizontalSpan = 2;
+		gd.horizontalAlignment = SWT.FILL;
+		final Section mainPackageSection = toolkit.createSection(form.getBody(),
+				ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE
+						| ExpandableComposite.EXPANDED);
+		mainPackageSection.setText(Messages.MainPackagePage_3);
+		mainPackageSection.setLayout(new GridLayout());
+		Composite mainPackageClient = toolkit.createComposite(mainPackageSection);
+		GridLayout gridLayout = new GridLayout();
+		gridLayout.marginWidth = gridLayout.marginHeight = 5;
+		gridLayout.numColumns = 2;
+		
+		mainPackageClient.setLayout(gridLayout);
+		new RpmTagText(mainPackageClient, RpmTags.NAME, specfile);
+		new RpmTagText(mainPackageClient, RpmTags.VERSION, specfile);
+		new RpmTagText(mainPackageClient, RpmTags.RELEASE, specfile);
+		new RpmTagText(mainPackageClient, RpmTags.URL, specfile);
+		new RpmTagText(mainPackageClient, RpmTags.LICENSE, specfile);
+		new RpmTagText(mainPackageClient, RpmTags.GROUP, specfile);
+		new RpmTagText(mainPackageClient, RpmTags.EPOCH, specfile);
+		new RpmTagText(mainPackageClient, RpmTags.BUILD_ROOT, specfile);
+		new RpmTagText(mainPackageClient, RpmTags.BUILD_ARCH, specfile);
+		new RpmTagText(mainPackageClient, RpmTags.SUMMARY, specfile, SWT.MULTI);
+		
+		// BuildRequires
+		final Section buildRequiresSection = toolkit.createSection(mainPackageClient,
+				ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE
+						| ExpandableComposite.EXPANDED);
+		buildRequiresSection.setText(Messages.MainPackagePage_4);
+		buildRequiresSection.setLayout(rowLayout);
+		buildRequiresSection.setExpanded(false);
+		Composite buildRequiresClient = toolkit.createComposite(buildRequiresSection);
+		buildRequiresClient.setLayout(gridLayout);
+		for (SpecfileTag buildRequire: specfile.getBuildRequires()) {
+			new RpmTagText(buildRequiresClient, buildRequire, specfile);
+		}
+		buildRequiresSection.setClient(buildRequiresClient);
+		toolkit.paintBordersFor(buildRequiresClient);
+		toolkit.paintBordersFor(buildRequiresSection);
+		
+		// Requires
+		final Section requiresSection = toolkit.createSection(mainPackageClient,
+				ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE
+						| ExpandableComposite.EXPANDED);
+		requiresSection.setText(Messages.MainPackagePage_5);
+		requiresSection.setLayout(rowLayout);
+		requiresSection.setExpanded(false);
+		Composite requiresClient = toolkit.createComposite(requiresSection);
+		requiresClient.setLayout(gridLayout);
+		requiresClient.setLayoutData(gd);
+		for (SpecfileTag require: specfile.getRequires()) {
+			new RpmTagText(requiresClient, require, specfile);
+		}
+		requiresSection.setClient(requiresClient);
+		toolkit.paintBordersFor(requiresClient);
+		toolkit.paintBordersFor(requiresSection);
+		
+		mainPackageSection.setClient(mainPackageClient);
+		toolkit.paintBordersFor(mainPackageClient);
+		toolkit.paintBordersFor(mainPackageSection);
+		
+		// subpackages
+		final Section packagesSection = toolkit.createSection(form.getBody(),
+				ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE
+						| ExpandableComposite.EXPANDED);
+		packagesSection.setText(Messages.MainPackagePage_6);
+		packagesSection.setLayout(gridLayout);
+		Composite packagesClient = toolkit.createComposite(packagesSection);
+		packagesClient.setLayout(gridLayout);
+		packagesClient.setLayoutData(gd);
+		for (SpecfilePackage specfilePackage : specfile.getPackages()
+				.getPackages()) {
+			if (specfilePackage.isMainPackage()){
+				continue;
+			}
+			final Section packageSection = toolkit.createSection(packagesClient,
+					ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE
+							| ExpandableComposite.EXPANDED);
+			packageSection.setText(specfilePackage.getFullPackageName());
+			packageSection.setExpanded(false);
+			packageSection.setLayout(rowLayout);
+			Composite packageClient = toolkit.createComposite(packageSection);
+			packageClient.setLayout(gridLayout);
+			packageClient.setLayoutData(gd);
+			new RpmTagText(packageClient, RpmTags.SUMMARY, specfile, specfilePackage, SWT.MULTI);
+			new RpmTagText(packageClient, RpmTags.GROUP, specfile, specfilePackage, SWT.MULTI);
+			
+			final Section packageRequiresSection = toolkit.createSection(packageClient,
+					ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE
+							| ExpandableComposite.EXPANDED);
+			packageRequiresSection.setText(Messages.MainPackagePage_7);
+			packageRequiresSection.setLayout(rowLayout);
+			packageRequiresSection.setLayoutData(gd);
+			Composite packageRequiresClient = toolkit.createComposite(packageRequiresSection);
+			packageRequiresClient.setLayout(gridLayout);
+			packageRequiresClient.setLayoutData(gd);
+			for (SpecfileTag require: specfilePackage.getRequires()) {
+				new RpmTagText(packageRequiresClient, require, specfile);
+			}
+			packageRequiresSection.setClient(packageRequiresClient);
+			
+			toolkit.paintBordersFor(packageRequiresClient);
+			toolkit.paintBordersFor(packageRequiresSection);
+			
+			packageSection.setClient(packageClient);
+			toolkit.paintBordersFor(packageClient);
+			toolkit.paintBordersFor(packageSection);
+		}
+		packagesSection.setClient(packagesClient);
+		toolkit.paintBordersFor(packagesClient);
+		toolkit.paintBordersFor(packagesSection);
+		managedForm.refresh();
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/forms/Messages.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/forms/Messages.java
new file mode 100644
index 0000000..bf33a45
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/forms/Messages.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.forms;
+
+import org.eclipse.osgi.util.NLS;
+
+public final class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.rpm.ui.editor.forms.messages"; //$NON-NLS-1$
+	public static String MainPackagePage_0;
+	public static String MainPackagePage_1;
+	public static String MainPackagePage_2;
+	public static String MainPackagePage_3;
+	public static String MainPackagePage_4;
+	public static String MainPackagePage_5;
+	public static String MainPackagePage_6;
+	public static String MainPackagePage_7;
+	public static String RpmTagText_0;
+	public static String SpecfileFormEditor_0;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+		super();
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/forms/RpmSectionPage.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/forms/RpmSectionPage.java
new file mode 100644
index 0000000..a8b2394
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/forms/RpmSectionPage.java
@@ -0,0 +1,52 @@
+package org.eclipse.linuxtools.rpm.ui.editor.forms;
+
+import org.eclipse.linuxtools.rpm.ui.editor.parser.Specfile;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileSection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.editor.FormPage;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.ScrolledForm;
+
+public class RpmSectionPage extends FormPage {
+	private String rpmSection;
+	private SpecfileSection section;
+
+	public RpmSectionPage(SpecfileFormEditor editor, Specfile specfile,
+			String rpmSection) {
+		super(editor, rpmSection, rpmSection);
+		this.rpmSection = rpmSection;
+		this.section = specfile.getSection(rpmSection.substring(1));
+	}
+
+	@Override
+	protected void createFormContent(IManagedForm managedForm) {
+		super.createFormContent(managedForm);
+		FormToolkit toolkit = managedForm.getToolkit();
+		ScrolledForm form = managedForm.getForm();
+		form.setText(rpmSection);
+		GridLayout layout = new GridLayout();
+
+		form.getBody().setLayout(layout);
+		layout.numColumns = 2;
+		toolkit.createLabel(form.getBody(), rpmSection);
+		final Text text = toolkit.createText(form.getBody(), section.getContents(),
+				SWT.MULTI | SWT.BORDER | SWT.V_SCROLL);
+		text.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				section.setContents(text.getText());
+			}
+		});
+		GridData gd = new GridData();
+		gd.grabExcessHorizontalSpace = true;
+		gd.grabExcessVerticalSpace = true;
+		gd.horizontalAlignment = SWT.FILL;
+		gd.verticalAlignment = SWT.FILL;
+		text.setLayoutData(gd);
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/forms/RpmTagText.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/forms/RpmTagText.java
new file mode 100644
index 0000000..ad655a7
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/forms/RpmTagText.java
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2009-2010 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.forms;
+
+import org.eclipse.linuxtools.rpm.ui.editor.parser.Specfile;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileDefine;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfilePackage;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileTag;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileTag.TagType;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class RpmTagText {
+
+	public RpmTagText(Composite parent, final String rpmTag,
+			final Specfile specfile) {
+		this(parent, rpmTag, specfile, SWT.SINGLE);
+	}
+
+	public RpmTagText(Composite parent, final String rpmTag,
+			final Specfile specfile, int flag) {
+		Label label = new Label(parent, SWT.SINGLE);
+		label.setText(rpmTag);
+		final Text text = new Text(parent, SWT.BORDER_SOLID | flag);
+		SpecfileDefine define = specfile.getDefine(rpmTag);
+		if (null != define) {
+			if (define.getTagType().equals(TagType.INT)) {
+				text.setText(String.valueOf(define.getIntValue()));
+			} else {
+				text.setText(define.getStringValue());
+			}
+		}
+		text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		text.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				specfile.modifyDefine(rpmTag, text.getText());
+			}
+		});
+	}
+
+	public RpmTagText(Composite parent, final String rpmTag,
+			final Specfile specfile, final SpecfilePackage rpmPackage, int flag) {
+		Label label = new Label(parent, SWT.SINGLE);
+		label.setText(rpmTag);
+		final Text text = new Text(parent, SWT.BORDER_SOLID | flag);
+		SpecfileDefine define = specfile.getDefine(rpmTag, rpmPackage);
+		if (null != define) {
+			text.setText(define.getStringValue());
+		}
+		text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		text.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				specfile.modifyDefine(rpmTag, rpmPackage, text.getText());
+			}
+		});
+	}
+
+	public RpmTagText(Composite parent, final SpecfileTag require, final Specfile specfile) {
+		Label label = new Label(parent, SWT.SINGLE);
+		label.setText(Messages.RpmTagText_0);
+		final Text text = new Text(parent, SWT.BORDER_SOLID);
+		text.setText(require.getStringValue());
+		text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		text.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				 specfile.modifyDefine(require, text.getText());
+			}
+		});
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/forms/SpecfileFormEditor.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/forms/SpecfileFormEditor.java
new file mode 100644
index 0000000..e82a7f6
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/forms/SpecfileFormEditor.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.forms;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.linuxtools.rpm.ui.editor.RpmSections;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.Specfile;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.forms.editor.FormEditor;
+import org.eclipse.ui.forms.editor.FormPage;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+
+public class SpecfileFormEditor extends FormEditor {
+
+	FormPage mainPackage;
+	SpecfileEditor editor;
+	private Specfile specfile;
+
+	public SpecfileFormEditor() {
+		super();
+		editor = new SpecfileEditor();
+	}
+
+	@Override
+	protected FormToolkit createToolkit(Display display) {
+		// Create a toolkit that shares colors between editors.
+		return new FormToolkit(Display.getCurrent());
+	}
+
+	@Override
+	protected void addPages() {
+		try {
+			int index = addPage(editor, getEditorInput());
+			setPageText(index, Messages.SpecfileFormEditor_0);
+			specfile = editor.getSpecfile();
+			mainPackage = new MainPackagePage(this, specfile);
+			addPage(0, mainPackage);
+			addPage(1, new RpmSectionPage(this, specfile, RpmSections.PREP_SECTION));
+			addPage(2, new RpmSectionPage(this, specfile, RpmSections.BUILD_SECTION));
+			addPage(3, new RpmSectionPage(this, specfile, RpmSections.INSTALL_SECTION));
+		} catch (PartInitException e) {
+			//
+		}
+	}
+
+	@Override
+	public void doSave(IProgressMonitor monitor) {
+		editor.doSave(monitor);
+	}
+
+	@Override
+	public void doSaveAs() {
+		//noop
+	}
+
+	@Override
+	public boolean isSaveAsAllowed() {
+		return false;
+	}
+
+	@Override
+	public boolean isDirty() {
+		return editor.isDirty();
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/forms/messages.properties b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/forms/messages.properties
new file mode 100644
index 0000000..d580b56
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/forms/messages.properties
@@ -0,0 +1,20 @@
+###############################################################################
+# Copyright (c) 2010 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+MainPackagePage_0=Overview
+MainPackagePage_1=Overview
+MainPackagePage_2=Main Package information
+MainPackagePage_3=Main package information
+MainPackagePage_4=Build Requires
+MainPackagePage_5=Requires
+MainPackagePage_6=Subpackages
+MainPackagePage_7=Requires
+RpmTagText_0=Require
+SpecfileFormEditor_0=Source
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/MailHyperlink.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/MailHyperlink.java
new file mode 100644
index 0000000..6ba7074
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/MailHyperlink.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.hyperlink;
+
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.hyperlink.URLHyperlink;
+import org.eclipse.swt.program.Program;
+
+/**
+ * Mail hyperlink.
+ */
+public class MailHyperlink extends URLHyperlink {
+
+
+	private String fURLString;
+
+	
+	public MailHyperlink(IRegion region, String urlString) {
+		super(region, urlString);
+		fURLString = urlString;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.hyperlink.URLHyperlink#open()
+	 */
+	@Override
+	public void open() {
+		if (fURLString != null) {
+			Program.launch(fURLString);
+			fURLString= null;
+			return;
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/MailHyperlinkDetector.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/MailHyperlinkDetector.java
new file mode 100644
index 0000000..53a9670
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/MailHyperlinkDetector.java
@@ -0,0 +1,217 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.hyperlink;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.text.MessageFormat;
+import java.util.StringTokenizer;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextSelection;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.hyperlink.AbstractHyperlinkDetector;
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.eclipse.jface.text.hyperlink.URLHyperlinkDetector;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.Specfile;
+
+
+/**
+ * Mail hyperlink detector. Largely inspired of {@link URLHyperlinkDetector}
+ */
+public class MailHyperlinkDetector extends AbstractHyperlinkDetector {
+
+	private SpecfileEditor editor;
+
+	public MailHyperlinkDetector(SpecfileEditor editor) {
+		this.editor = editor;
+	}
+
+	/*
+	 * @see org.eclipse.jface.text.hyperlink.IHyperlinkDetector#detectHyperlinks(org.eclipse.jface.text.ITextViewer,
+	 *      org.eclipse.jface.text.IRegion, boolean)
+	 */
+	public IHyperlink[] detectHyperlinks(ITextViewer textViewer, IRegion region, boolean canShowMultipleHyperlinks) {
+		if (region == null || textViewer == null)
+			return null;
+
+		IDocument document= textViewer.getDocument();
+
+		int offset= region.getOffset();
+
+		String urlString= null;
+		if (document == null)
+			return null;
+
+		IRegion lineInfo;
+		String line;
+		String mail;
+		int mailLength = 0;
+		int mailOffsetInLine;
+		try {
+			lineInfo= document.getLineInformationOfOffset(offset);
+			line= document.get(lineInfo.getOffset(), lineInfo.getLength());
+		} catch (BadLocationException ex) {
+			ex.printStackTrace();
+			return null;
+		}
+		
+		int startSeparator= line.indexOf("<"); //$NON-NLS-1$
+		mailOffsetInLine = startSeparator + 1;
+
+		if (startSeparator != -1) {
+			
+			int endSeparator= line.indexOf(">"); //$NON-NLS-1$
+			
+			if (endSeparator < 5)
+				return null;
+			
+			mail= line.substring(startSeparator + 1, endSeparator).trim();
+			mailLength= mail.length();
+			
+			// Some cleanups, maybe we can add more.
+			mail= mail.replaceAll("(?i) at ", "@"); //$NON-NLS-1$ //$NON-NLS-2$
+			mail= mail.replaceAll("(?i) dot ", "."); //$NON-NLS-1$ //$NON-NLS-2$
+			mail= mail.replaceAll("(?i)_at_", "@"); //$NON-NLS-1$ //$NON-NLS-2$
+			mail= mail.replaceAll("(?i)_dot_", "."); //$NON-NLS-1$ //$NON-NLS-2$
+			
+			mail= mail.replaceAll(" +", " "); //$NON-NLS-1$ //$NON-NLS-2$
+			if (mail.split(" ").length == 3) { //$NON-NLS-1$
+				if (mail.indexOf("@") == -1) //$NON-NLS-1$
+					mail = mail.replaceFirst(" ", "@").replaceFirst(" ", "."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+			}
+			mail= mail.replaceAll(" ", ""); //$NON-NLS-1$ //$NON-NLS-2$
+			
+		} else {
+
+			int offsetInLine= offset - lineInfo.getOffset();
+
+			boolean startDoubleQuote= false;
+			mailOffsetInLine= 0;
+
+			int mailSeparatorOffset= line.indexOf("@"); //$NON-NLS-1$
+			while (mailSeparatorOffset >= 0) {
+
+				// (left to "@")
+				mailOffsetInLine= mailSeparatorOffset;
+				char ch;
+				do {
+					mailOffsetInLine--;
+					ch= ' ';
+					if (mailOffsetInLine > -1)
+						ch= line.charAt(mailOffsetInLine);
+					startDoubleQuote= ch == '"';
+				} while (Character.isLetterOrDigit(ch) || ch == '.' || ch == '_' || ch == '-');
+				mailOffsetInLine++;
+
+				// a valid mail contain a left part.
+				if (mailOffsetInLine == mailSeparatorOffset)
+					return null;
+
+				// Right to "@"
+				StringTokenizer tokenizer= new StringTokenizer(line.substring(mailSeparatorOffset + 3), " \t\n\r\f<>", false); //$NON-NLS-1$
+				if (!tokenizer.hasMoreTokens())
+					return null;
+
+				mailLength= tokenizer.nextToken().length() + 3 + mailSeparatorOffset - mailOffsetInLine;
+				if (offsetInLine >= mailOffsetInLine && offsetInLine <= mailOffsetInLine + mailLength)
+					break;
+
+				mailSeparatorOffset= line.indexOf("@", mailSeparatorOffset + 1); //$NON-NLS-1$
+			}
+
+			if (mailSeparatorOffset < 0)
+				return null;
+
+			if (startDoubleQuote) {
+				int endOffset= -1;
+				int nextDoubleQuote= line.indexOf('"', mailOffsetInLine);
+				int nextWhitespace= line.indexOf(' ', mailOffsetInLine);
+				if (nextDoubleQuote != -1 && nextWhitespace != -1)
+					endOffset= Math.min(nextDoubleQuote, nextWhitespace);
+				else if (nextDoubleQuote != -1)
+					endOffset= nextDoubleQuote;
+				else if (nextWhitespace != -1)
+					endOffset= nextWhitespace;
+				if (endOffset != -1)
+					mailLength= endOffset - mailOffsetInLine;
+			}
+			if (mailLength == 0)
+				return null;
+			
+			mail= line.substring(mailOffsetInLine, mailOffsetInLine + mailLength);
+		}
+
+		try {
+			// mail address contain at less one '@' and one '.' character.
+			if (!mail.contains("@") || !mail.contains(".")) //$NON-NLS-1$ //$NON-NLS-2$
+				return null;			
+			
+			urlString= "mailto:" + mail; //$NON-NLS-1$
+			char separator= '?';
+			String subject= getSubject();
+			if (subject != null) {
+				urlString+= separator + "subject=" + subject; //$NON-NLS-1$
+				separator= '&';
+			}
+			String body= getBody();
+			if (body != null)
+				urlString+= separator + "body=" + body; //$NON-NLS-1$
+
+			// url don't like %
+			urlString= urlString.replaceAll("\\%", "\\%25"); //$NON-NLS-1$ //$NON-NLS-2$
+			new URL(urlString);
+		} catch (MalformedURLException ex) {
+			ex.printStackTrace();
+			urlString= null;
+			return null;
+		}
+
+		IRegion urlRegion= new Region(lineInfo.getOffset() + mailOffsetInLine, mailLength);
+		return new IHyperlink[] {new MailHyperlink(urlRegion, urlString)};
+	}	
+
+	private String getSubject() {
+		Specfile specfile= editor.getSpecfile();
+		return MessageFormat.format("[{0}.spec - {1}-{2}]", specfile.getName(), specfile.getVersion(), //$NON-NLS-1$
+				specfile.getRelease());		 
+	}
+
+	private String getBody() {
+		String body = null;
+		// Get current selection
+		IDocument document= editor.getSpecfileSourceViewer().getDocument();
+		ISelection currentSelection= editor.getSpecfileSourceViewer().getSelection();
+		if (currentSelection instanceof ITextSelection) {
+			ITextSelection selection= (ITextSelection) currentSelection;
+			try {
+				String txt= selection.getText();
+				if (txt.trim().length() > 0) {
+					int begin= document.getLineOffset(selection.getStartLine());
+					body= document.get().substring(begin,
+							selection.getOffset() + selection.getLength());
+					// replace left spaces or tabs and add a space at the begin of each line.
+					body= body.replaceAll("(?m)^[ \\t]+|[ \\t]+$|^", " "); //$NON-NLS-1$ //$NON-NLS-2$
+				}
+			} catch (BadLocationException e) {
+			}
+
+		}
+		return body;
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/Messages.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/Messages.java
new file mode 100644
index 0000000..1a7616a
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/Messages.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.hyperlink;
+
+import org.eclipse.osgi.util.NLS;
+
+public final class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.rpm.ui.editor.hyperlink.messages"; //$NON-NLS-1$
+	public static String SourcesFileDownloadHyperlink_0;
+	public static String SourcesFileDownloadHyperlink_1;
+	public static String SourcesFileDownloadHyperlink_2;
+	public static String SourcesFileDownloadHyperlink_3;
+	public static String SourcesFileDownloadHyperlink_4;
+	public static String SourcesFileHyperlink_0;
+	public static String SourcesFileHyperlink_1;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+		super();
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SourcesFileDownloadHyperlink.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SourcesFileDownloadHyperlink.java
new file mode 100644
index 0000000..076d38a
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SourcesFileDownloadHyperlink.java
@@ -0,0 +1,191 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Alexander Kurtakov (Red Hat) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.hyperlink;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.eclipse.linuxtools.rpm.core.IRPMConstants;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileLog;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.MessageBox;
+
+public class SourcesFileDownloadHyperlink implements IHyperlink {
+	class DownloadJob extends Job {
+		private IFile file;
+		private URLConnection content;
+		private boolean fileOverride;
+
+		public DownloadJob(IFile file, URLConnection content, boolean override) {
+			super(NLS.bind(Messages.SourcesFileDownloadHyperlink_4, file
+					.getName()));
+			this.file = file;
+			this.content = content;
+			this.fileOverride = override;
+		}
+
+		public DownloadJob(IFile file, URLConnection content) {
+			this(file, content, false);
+		}
+
+		@Override
+		public IStatus run(IProgressMonitor monitor) {
+			monitor.beginTask(NLS.bind(Messages.SourcesFileDownloadHyperlink_4,
+					file.getName()), content.getContentLength());
+			try {
+				File tempFile = File.createTempFile(file.getName(), ""); //$NON-NLS-1$
+				FileOutputStream fos = new FileOutputStream(tempFile);
+				InputStream is = new BufferedInputStream(content.getInputStream());
+				int b;
+				boolean canceled = false;
+				while ((b = is.read()) != -1) {
+					if (monitor.isCanceled()) {
+						canceled = true;
+						break;
+					}
+					fos.write(b);
+					monitor.worked(1);
+				}
+				is.close();
+				fos.close();
+				if (!canceled) {
+					if (fileOverride) {
+						file.setContents(new FileInputStream(tempFile), true,
+								false, monitor);
+					} else {
+						file.create(new FileInputStream(tempFile), true,
+								monitor);
+
+					}
+				}
+				tempFile.delete();
+			} catch (CoreException e) {
+				SpecfileLog.logError(e);
+				return Status.CANCEL_STATUS;
+			} catch (IOException e) {
+				SpecfileLog.logError(e);
+				return Status.CANCEL_STATUS;
+			}
+			monitor.done();
+			return Status.OK_STATUS;
+		}
+	};
+
+	String fileName;
+	IFile original;
+	IRegion region;
+
+	/**
+	 * Creates hyperlink for the following file name, region and file whether
+	 * the file name is found.
+	 * 
+	 * @param original
+	 *            The file where the reference to this file name is.
+	 * @param fileName
+	 *            The name of the file to open.
+	 * @param region
+	 *            The hyperlink region.
+	 */
+	public SourcesFileDownloadHyperlink(IFile original, String fileName,
+			IRegion region) {
+		this.fileName = fileName;
+		this.original = original;
+		this.region = region;
+	}
+
+	/**
+	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkRegion()
+	 */
+	public IRegion getHyperlinkRegion() {
+		return region;
+	}
+
+	/**
+	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
+	 */
+	public String getHyperlinkText() {
+		return Messages.SourcesFileHyperlink_1 + ' ' + fileName;
+	}
+
+	/**
+	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getTypeLabel()
+	 */
+	public String getTypeLabel() {
+		return null;
+	}
+
+	/**
+	 * Tries to open the given file name looking for it in the current directory
+	 * and in ../SOURCES.
+	 * 
+	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#open()
+	 */
+	public void open() {
+		IContainer container = original.getParent();
+		IResource saveFolder = container.getParent().findMember(
+				IRPMConstants.SOURCES_FOLDER);
+		if (saveFolder == null) {
+			saveFolder = container.findMember(original.getFullPath()
+					.removeLastSegments(1));
+		}
+		if (saveFolder == null) {
+			saveFolder = container.findMember("/"); //$NON-NLS-1$
+		}
+		try {
+			URL url = new URL(fileName);
+			URLConnection connection = url.openConnection();
+			String savedFileName = fileName
+					.substring(fileName.lastIndexOf('/') + 1);
+			IFile savedFile = original.getProject().getFile(
+					saveFolder.getProjectRelativePath().append(savedFileName));
+			if (savedFile.exists()) {
+				MessageBox mb = new MessageBox(Display.getCurrent()
+						.getActiveShell(), SWT.ICON_QUESTION | SWT.OK
+						| SWT.CANCEL);
+				mb.setText(Messages.SourcesFileDownloadHyperlink_0);
+				mb.setMessage(NLS.bind(Messages.SourcesFileDownloadHyperlink_1,
+						savedFileName));
+				int rc = mb.open();
+				if (rc == SWT.OK) {
+					new DownloadJob(savedFile, connection, true).schedule();
+				}
+
+			} else {
+				new DownloadJob(savedFile, connection).schedule();
+			}
+		} catch (IOException e) {
+			MessageBox mb = new MessageBox(Display.getCurrent()
+					.getActiveShell(), SWT.ICON_WARNING | SWT.OK);
+			mb.setMessage(Messages.SourcesFileDownloadHyperlink_2);
+			mb.setText(Messages.SourcesFileDownloadHyperlink_3);
+			mb.open();
+		}
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SourcesFileHyperlink.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SourcesFileHyperlink.java
new file mode 100644
index 0000000..1584e92
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SourcesFileHyperlink.java
@@ -0,0 +1,98 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.hyperlink;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileLog;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.ide.IDE;
+
+/**
+ * Hyperlink implementation for the source and patch files in a srpm. Note: This
+ * implementation assumes two filesystem layouts where it looks for files. 1.
+ * Exploder srpm - Spec file and sources in one directory. 2. Rpmbuild structure
+ * - Assumes that the edited spec file is in a SPECS folder and looks for
+ * sources in ../SOURCES.
+ */
+public class SourcesFileHyperlink implements IHyperlink {
+
+	String fileName;
+	IFile original;
+	IRegion region;
+
+	/**
+	 * Creates hyperlink for the following file name, region and file whether
+	 * the file name is found.
+	 * 
+	 * @param original The file where the reference to this file name is.
+	 * @param fileName The name of the file to open.
+	 * @param region The hyperlink region.
+	 */
+	public SourcesFileHyperlink(IFile original, String fileName, IRegion region) {
+		this.fileName = fileName;
+		this.original = original;
+		this.region = region;
+	}
+
+	/**
+	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkRegion()
+	 */
+	public IRegion getHyperlinkRegion() {
+		return region;
+	}
+
+	/**
+	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
+	 */
+	public String getHyperlinkText() {
+		return Messages.SourcesFileHyperlink_0 + fileName;
+	}
+
+	/**
+	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getTypeLabel()
+	 */
+	public String getTypeLabel() {
+		return null;
+	}
+
+	/**
+	 * Tries to open the given file name looking for it in the current directory
+	 * and in ../SOURCES.
+	 * 
+	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#open()
+	 */
+	public void open() {
+		IContainer container = original.getParent();
+		IResource resourceToOpen = container.findMember(fileName);
+		if (resourceToOpen == null || !resourceToOpen.exists()) {
+			IResource sourcesFolder = container.getParent().findMember(
+					"SOURCES"); //$NON-NLS-1$
+			resourceToOpen = ((IFolder) sourcesFolder).getFile(fileName);
+		}
+		IWorkbenchPage page = PlatformUI.getWorkbench()
+				.getActiveWorkbenchWindow().getActivePage();
+		try {
+			if (resourceToOpen.getType() == IResource.FILE) {
+				IDE.openEditor(page, (IFile) resourceToOpen);
+			}
+		} catch (PartInitException e) {
+			SpecfileLog.logError(e);
+		}
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SourcesFileHyperlinkDetector.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SourcesFileHyperlinkDetector.java
new file mode 100644
index 0000000..0abb624
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SourcesFileHyperlinkDetector.java
@@ -0,0 +1,95 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2010 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.hyperlink;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.hyperlink.AbstractHyperlinkDetector;
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
+import org.eclipse.linuxtools.rpm.ui.editor.UiUtils;
+import org.eclipse.ui.part.FileEditorInput;
+
+/**
+ * Detects values for Patch and Source definitions.
+ * 
+ */
+public class SourcesFileHyperlinkDetector extends AbstractHyperlinkDetector {
+
+	SpecfileEditor editor;
+	private static final String PATCH_IDENTIFIER = "Patch"; //$NON-NLS-1$
+	private static final String SOURCE_IDENTIFIER = "Source"; //$NON-NLS-1$
+
+	/**
+	 * Creates the detector.
+	 * 
+	 * @param editor
+	 *            Reference to the specfile editor.
+	 */
+	public SourcesFileHyperlinkDetector(SpecfileEditor editor) {
+		super();
+		this.editor = editor;
+	}
+
+	/**
+	 * @see org.eclipse.jface.text.hyperlink.IHyperlinkDetector#detectHyperlinks(org.eclipse.jface.text.ITextViewer,
+	 *      org.eclipse.jface.text.IRegion, boolean)
+	 */
+	public IHyperlink[] detectHyperlinks(ITextViewer textViewer,
+			IRegion region, boolean canShowMultipleHyperlinks) {
+		if (region == null || textViewer == null) {
+			return null;
+		}
+
+		IDocument document = textViewer.getDocument();
+
+		int offset = region.getOffset();
+
+		if (document == null) {
+			return null;
+		}
+		IRegion lineInfo;
+		String line;
+		try {
+			lineInfo = document.getLineInformationOfOffset(offset);
+			line = document.get(lineInfo.getOffset(), lineInfo.getLength());
+		} catch (BadLocationException ex) {
+			return null;
+		}
+		if (editor.getEditorInput() instanceof FileEditorInput) {
+			IFile original = ((FileEditorInput) editor.getEditorInput())
+					.getFile();
+			if (line.startsWith(SOURCE_IDENTIFIER)
+					|| line.startsWith(PATCH_IDENTIFIER)) {
+				int delimiterIndex = line.indexOf(':') + 1;
+				String fileName = line.substring(delimiterIndex).trim();
+				if (region.getOffset() > lineInfo.getOffset()
+						+ line.indexOf(fileName)) {
+					IRegion fileNameRegion = new Region(lineInfo.getOffset()
+							+ line.indexOf(fileName), fileName.length());
+					return new IHyperlink[] {
+							new SourcesFileHyperlink(original, UiUtils
+									.resolveDefines(editor.getSpecfile(),
+											fileName), fileNameRegion),
+							new SourcesFileDownloadHyperlink(original, UiUtils
+									.resolveDefines(editor.getSpecfile(),
+											fileName), fileNameRegion) };
+				}
+			}
+		}
+
+		return null;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SpecfileElementHyperlink.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SpecfileElementHyperlink.java
new file mode 100644
index 0000000..05b8840
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SpecfileElementHyperlink.java
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Alexander Kurtakov.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Kurtakov - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.hyperlink;
+
+import java.util.HashMap;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileLog;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileElement;
+import org.eclipse.ui.IEditorDescriptor;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.ide.IDE;
+
+/**
+ * Hyperlink implementation for the following hyperlink elements: SOURCE, PATCH
+ * and %define.
+ */
+public class SpecfileElementHyperlink implements IHyperlink {
+	private IRegion region;
+	private SpecfileElement source;
+	private IFile file;
+
+	public SpecfileElementHyperlink(IRegion region, SpecfileElement source,
+			IFile file) {
+		this.region = region;
+		this.source = source;
+		this.file = file;
+	}
+
+	public IRegion getHyperlinkRegion() {
+		return region;
+	}
+
+	public String getHyperlinkText() {
+		return null;
+	}
+
+	public String getTypeLabel() {
+		return null;
+	}
+
+	public void open() {
+		IWorkbenchPage page = PlatformUI.getWorkbench()
+				.getActiveWorkbenchWindow().getActivePage();
+		IEditorDescriptor desc = PlatformUI.getWorkbench().getEditorRegistry()
+				.getDefaultEditor(file.getName());
+		HashMap<String, Object> map = new HashMap<String, Object>();
+		// TODO don't increment the line number once the SpecfileSource reports
+		// correct line
+		map.put(IMarker.LINE_NUMBER, Integer
+				.valueOf(getSource().getLineNumber() + 1));
+		map.put(IDE.EDITOR_ID_ATTR, desc.getId());
+		try {
+			IMarker marker = file.createMarker(IMarker.TEXT);
+			marker.setAttributes(map);
+			IDE.openEditor(page, marker);
+			marker.delete();
+		} catch (CoreException e) {
+			SpecfileLog.logError(e);
+		}
+	}
+
+	/**
+	 * @return the source
+	 */
+	public SpecfileElement getSource() {
+		return source;
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SpecfileElementHyperlinkDetector.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SpecfileElementHyperlinkDetector.java
new file mode 100644
index 0000000..3868de1
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/SpecfileElementHyperlinkDetector.java
@@ -0,0 +1,160 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Alexander Kurtakov.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Kurtakov - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.hyperlink;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.hyperlink.AbstractHyperlinkDetector;
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.eclipse.linuxtools.rpm.ui.editor.ISpecfileSpecialSymbols;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.Specfile;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileDefine;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileElement;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileSource;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.FileEditorInput;
+
+import com.ibm.icu.util.StringTokenizer;
+
+/**
+ * Hyperlink detector for source, patch and defines in the spec file.
+ * 
+ */
+public class SpecfileElementHyperlinkDetector extends AbstractHyperlinkDetector {
+
+	private static final String PATCH_IDENTIFIER = "%patch"; //$NON-NLS-1$
+	private static final String SOURCE_IDENTIFIER = "%{SOURCE"; //$NON-NLS-1$
+	private Specfile specfile;
+
+	public SpecfileElementHyperlinkDetector(Specfile specfile) {
+		super();
+		this.specfile = specfile;
+	}
+
+	public IHyperlink[] detectHyperlinks(ITextViewer textViewer,
+			IRegion region, boolean canShowMultipleHyperlinks) {
+
+		if (region == null || textViewer == null) {
+			return null;
+		}
+
+		IDocument document = textViewer.getDocument();
+
+		int offset = region.getOffset();
+
+		if (document == null) {
+			return null;
+		}
+		IRegion lineInfo;
+		String line;
+		try {
+			lineInfo = document.getLineInformationOfOffset(offset);
+			line = document.get(lineInfo.getOffset(), lineInfo.getLength());
+		} catch (BadLocationException ex) {
+			return null;
+		}
+
+		int offsetInLine = offset - lineInfo.getOffset();
+
+		StringTokenizer tokens = new StringTokenizer(line);
+		String word = ""; //$NON-NLS-1$
+		int tempLineOffset = 0;
+		int wordOffsetInLine = 0;
+		while (tokens.hasMoreTokens()) {
+			String tempWord = tokens.nextToken();
+			Pattern defineRegexp = Pattern.compile("%\\{(.*?)\\}"); //$NON-NLS-1$
+			Matcher fit = defineRegexp.matcher(tempWord);
+			while (fit.find()){
+				if ((fit.start() <= offsetInLine) && (offsetInLine <= fit.end())){
+					tempWord = fit.group();
+					wordOffsetInLine = fit.start();
+					tempLineOffset += fit.start();
+					break;
+				}
+			}
+			tempLineOffset += tempWord.length();
+			word = tempWord;
+			if (tempLineOffset > offsetInLine) {
+				break;
+			}
+		}
+		if (word.startsWith(SOURCE_IDENTIFIER)) {
+			int sourceNumber = Integer.valueOf(
+					word.substring(SOURCE_IDENTIFIER.length(),
+							word.length() - 1)).intValue();
+			SpecfileSource source = specfile.getSource(sourceNumber);
+			if (source != null)
+				return prepareHyperlink(lineInfo, line, word, source);
+		} else if (word.startsWith(PATCH_IDENTIFIER)) {
+
+			int sourceNumber = Integer.valueOf(
+					word.substring(PATCH_IDENTIFIER.length(), word.length()))
+					.intValue();
+			SpecfileSource source = specfile.getPatch(sourceNumber);
+			if (source != null)
+				return prepareHyperlink(lineInfo, line, word, source);
+		} else {
+			String defineName = getDefineName(word);
+			SpecfileDefine define = specfile.getDefine(defineName);
+			if (define != null) {
+				return prepareHyperlink(lineInfo, line, defineName, define,
+						wordOffsetInLine);
+			}
+		}
+		return null;
+	}
+
+	private String getDefineName(String word) {
+		if (word.startsWith(ISpecfileSpecialSymbols.MACRO_START_LONG)) {
+			return word.substring(2, word.length() - 1);
+		}
+		return ""; //$NON-NLS-1$
+	}
+
+	private IHyperlink[] prepareHyperlink(IRegion lineInfo, String line,
+			String word, SpecfileElement source, int lineIndex) {
+		IRegion urlRegion = new Region(lineInfo.getOffset()
+				+ line.indexOf(word, lineIndex), word.length());
+
+		IWorkbench wb = PlatformUI.getWorkbench();
+		IWorkbenchWindow win = wb.getActiveWorkbenchWindow();
+		IWorkbenchPage page = win.getActivePage();
+		IEditorPart editor = page.getActiveEditor();
+		// A IFile cannot be retrieve from a IFileStoreEditorInput, so at this time
+		// we can only provide this functionality for resources inside the workbench.
+		if (editor.getEditorInput() instanceof FileEditorInput) {
+			IFile original = ((FileEditorInput) editor.getEditorInput()).getFile();
+			return new IHyperlink[] { new SpecfileElementHyperlink(urlRegion,
+					source, original) };			
+		} else {
+			return null;
+		}
+		
+
+	}
+	
+	private IHyperlink[] prepareHyperlink(IRegion lineInfo, String line,
+			String word, SpecfileElement source) {
+		return prepareHyperlink(lineInfo, line, word, source, 0);
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/URLHyperlinkWithMacroDetector.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/URLHyperlinkWithMacroDetector.java
new file mode 100644
index 0000000..dd5409b
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/URLHyperlinkWithMacroDetector.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Alphonse Van Assche
+ *     Andrew Overholt
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.hyperlink;
+
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.eclipse.jface.text.hyperlink.URLHyperlink;
+import org.eclipse.jface.text.hyperlink.URLHyperlinkDetector;
+import org.eclipse.linuxtools.rpm.ui.editor.UiUtils;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.Specfile;
+
+
+/**
+ * URL hyperlink with macro detector.
+ * derived form the JFace URLHyperlinkDetector class
+ *
+ */
+public class URLHyperlinkWithMacroDetector extends URLHyperlinkDetector {
+
+	private Specfile specfile;
+	
+	/**
+	 * Creates a new URL hyperlink with macro detector.
+	 */
+	public URLHyperlinkWithMacroDetector(Specfile specfile) {
+		this.specfile= specfile;
+	}
+	
+	/*
+	 * @see org.eclipse.jface.text.hyperlink.IHyperlinkDetector#detectHyperlinks(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion, boolean)
+	 */
+	@Override
+	public IHyperlink[] detectHyperlinks(ITextViewer textViewer, IRegion region, boolean canShowMultipleHyperlinks) {
+		IHyperlink[] returned = super.detectHyperlinks(textViewer, region, canShowMultipleHyperlinks);
+		if (returned != null && returned.length > 0) {
+		IHyperlink hyperlink = returned[0];
+			if (hyperlink instanceof URLHyperlink) {
+				URLHyperlink urlHyperlink = (URLHyperlink) hyperlink;
+				String newURLString = UiUtils.resolveDefines(specfile, urlHyperlink.getURLString());
+				return new IHyperlink[] {new URLHyperlink(urlHyperlink.getHyperlinkRegion(), newURLString)};
+			}
+		}
+		return returned;
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/messages.properties b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/messages.properties
new file mode 100644
index 0000000..e9e3787
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/hyperlink/messages.properties
@@ -0,0 +1,17 @@
+###############################################################################
+# Copyright (c) 2009, 2010 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+SourcesFileDownloadHyperlink_0=Confirm Overwrite
+SourcesFileDownloadHyperlink_1=Are you sure you want to overwrite {0} ?
+SourcesFileDownloadHyperlink_2=Remote resource doesn't exist
+SourcesFileDownloadHyperlink_3=Resource not found
+SourcesFileDownloadHyperlink_4=Downloading: {0}
+SourcesFileHyperlink_0=Open 
+SourcesFileHyperlink_1=Download
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/markers/SpecfileErrorHandler.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/markers/SpecfileErrorHandler.java
new file mode 100644
index 0000000..0bf73f1
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/markers/SpecfileErrorHandler.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *    Alphonse Van Assche
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.markers;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.linuxtools.rpm.ui.editor.Activator;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileLog;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileParseException;
+import org.eclipse.ui.texteditor.MarkerUtilities;
+
+public class SpecfileErrorHandler extends SpecfileMarkerHandler{
+	
+	public static final String SPECFILE_ERROR_MARKER_ID = Activator.PLUGIN_ID
+	+ ".specfileerror"; //$NON-NLS-1$
+	
+	public SpecfileErrorHandler(IFile file, IDocument document)
+	{
+		super(file, document);
+	}
+	
+	public void handleError(SpecfileParseException e) {
+		int lineNumber = e.getLineNumber();
+		
+		if (file == null) {	return;	}
+		
+		Map<String, Object> map = new HashMap<String, Object>();
+		MarkerUtilities.setLineNumber(map, lineNumber);
+		MarkerUtilities.setMessage(map, e.getMessage());
+		map.put(IMarker.MESSAGE, e.getMessage());
+		map.put(IMarker.LOCATION, file.getFullPath().toString());
+
+		Integer charStart = getCharOffset(lineNumber, e.getStartColumn());
+		if (charStart != null) {
+			map.put(IMarker.CHAR_START, charStart);
+		}
+		Integer charEnd = getCharOffset(lineNumber, e.getEndColumn());
+		if (charEnd != null) {
+			map.put(IMarker.CHAR_END, charEnd);
+		}
+		
+		// FIXME:  add severity level
+		map.put(IMarker.SEVERITY, Integer.valueOf(e.getSeverity()));
+		
+		try {
+			MarkerUtilities.createMarker(file, map, SPECFILE_ERROR_MARKER_ID);
+		} catch (CoreException ee) {
+			SpecfileLog.logError(ee);
+		}
+	}
+	
+	@Override
+	String getMarkerID() {
+		return SPECFILE_ERROR_MARKER_ID;
+	}
+	
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/markers/SpecfileMarkerHandler.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/markers/SpecfileMarkerHandler.java
new file mode 100644
index 0000000..56d4183
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/markers/SpecfileMarkerHandler.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.markers;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileLog;
+
+public abstract class SpecfileMarkerHandler {
+
+	IDocument document;
+	IFile file;
+
+	public SpecfileMarkerHandler(IFile file, IDocument document) {
+		this.file = file;
+		this.document = document;
+	}
+
+	abstract String getMarkerID();
+
+	protected Integer getCharOffset(int lineNumber, int columnNumber) {
+		try {
+			return document.getLineOffset(lineNumber)
+					+ columnNumber;
+		} catch (BadLocationException e) {
+			SpecfileLog.logError(e);
+			return null;
+		}
+	}
+
+	public void removeExistingMarkers() {
+		if (file == null) {
+			return;
+		}
+
+		try {
+			file.deleteMarkers(getMarkerID(), true, IResource.DEPTH_ZERO);
+		} catch (CoreException e1) {
+			SpecfileLog.logError(e1);
+		}
+	}
+
+	public void setFile(IFile file) {
+		this.file = file;
+	}
+
+	public void setDocument(IDocument document) {
+		this.document = document;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/markers/SpecfileTaskHandler.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/markers/SpecfileTaskHandler.java
new file mode 100644
index 0000000..af40ffa
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/markers/SpecfileTaskHandler.java
@@ -0,0 +1,66 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.markers;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.linuxtools.rpm.ui.editor.Activator;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileLog;
+import org.eclipse.ui.texteditor.MarkerUtilities;
+
+public class SpecfileTaskHandler extends SpecfileMarkerHandler{
+	public static final String SPECFILE_TASK_MARKER_ID = Activator.PLUGIN_ID
+			+ ".specfiletask"; //$NON-NLS-1$
+
+	public SpecfileTaskHandler(IFile file, IDocument document) {
+		super(file, document);
+	}
+
+	public void handleTask(int lineNumber, String line, String taskType) {
+		if (file == null) {
+			return;
+		}
+
+		String message = line.substring(line.indexOf(taskType));
+		Map<String, Object> map = new HashMap<String, Object>();
+		MarkerUtilities.setLineNumber(map, lineNumber);
+		MarkerUtilities.setMessage(map, message);
+		map.put(IMarker.MESSAGE, message);
+		map.put(IMarker.LOCATION, file.getFullPath().toString());
+		map.put(IMarker.USER_EDITABLE, false);
+		Integer charStart = getCharOffset(lineNumber, 0);
+		if (charStart != null) {
+			map.put(IMarker.CHAR_START, charStart);
+		}
+		Integer charEnd = getCharOffset(lineNumber, line.length());
+		if (charEnd != null) {
+			map.put(IMarker.CHAR_END, charEnd);
+		}
+
+		try {
+			MarkerUtilities.createMarker(file, map, SPECFILE_TASK_MARKER_ID);
+		} catch (CoreException ee) {
+			SpecfileLog.logError(ee);
+		}
+	}
+
+	@Override
+	String getMarkerID() {
+		return SPECFILE_TASK_MARKER_ID;
+	}
+
+	
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/messages.properties b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/messages.properties
new file mode 100644
index 0000000..2946aaf
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/messages.properties
@@ -0,0 +1,24 @@
+###############################################################################
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+RpmMacroProposalsList_0=Buildin rpm macro
+RpmPackageBuildProposalsJob_0=Update RPM packages proposal list
+RpmPackageBuildProposalsJob_1=Retrieving packages
+RpmPackageBuildProposalsJob_2=Run command '
+RpmPackageBuildProposalsJob_3=' ...
+RpmPackageProposalsList_0=RPM information is only available\nif the proposal list is less than 
+RpmPackageProposalsList_1=\ item(s).\n\nYou can change the item limit in the \nRPM proposals preferences page.
+RpmPackageProposalsList_2=Cannot retrieve RPM information.\n\n
+RpmPackageProposalsList_3=Please adjust your preferences:\n\nSpecfile Editor-> Macro proposals-> Package Info
+SpecfileConfiguration_0=Press Ctrl+Space to see proposals
+SpecfileEditor_0=ContentAssistProposal.
+SpecfileEditor_1=ContentAssist
+SpecfileEditor_2=ContentAssist
+SpecfileLog_0=Unexpected Exception
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/outline/ContainsFilter.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/outline/ContainsFilter.java
new file mode 100644
index 0000000..615c974
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/outline/ContainsFilter.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Alexander Kurtakov.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Kurtakov - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.outline;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerFilter;
+
+/**
+ * Simple filter that only check whether the label contains the given string to
+ * look for.
+ */
+public class ContainsFilter extends ViewerFilter {
+
+	private String lookFor;
+
+	public void setLookFor(String lookFor) {
+		this.lookFor = lookFor;
+	}
+
+	/**
+	 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+	 */
+	@Override
+	public boolean select(Viewer viewer, Object parentElement, Object element) {
+		if ((viewer instanceof TreeViewer) == false) {
+			return true;
+		}
+		TreeViewer treeViewer = (TreeViewer) viewer;
+		String currentLabel = ((ILabelProvider) treeViewer.getLabelProvider())
+				.getText(element);
+		if (lookFor == null) {
+			return true;
+		}
+		if (currentLabel != null && currentLabel.contains(lookFor)) {
+			return true;
+		}
+		return hasUnfilteredChild(treeViewer, element);
+	}
+
+	private boolean hasUnfilteredChild(TreeViewer viewer, Object element) {
+		Object[] children = ((ITreeContentProvider) viewer.getContentProvider())
+				.getChildren(element);
+		for (Object child :children) {
+			if (select(viewer, element, child)) {
+				return true;
+			}
+		}
+		return false;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/outline/Messages.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/outline/Messages.java
new file mode 100644
index 0000000..5928e36
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/outline/Messages.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.outline;
+
+import org.eclipse.osgi.util.NLS;
+
+public final class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.rpm.ui.editor.outline.messages"; //$NON-NLS-1$
+	public static String SpecfileLabelProvider_0;
+	public static String SpecfileLabelProvider_1;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+		super();
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/outline/SpecfileContentOutlinePage.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/outline/SpecfileContentOutlinePage.java
new file mode 100644
index 0000000..6789954
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/outline/SpecfileContentOutlinePage.java
@@ -0,0 +1,109 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.outline;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileElement;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.texteditor.ITextEditor;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+
+public class SpecfileContentOutlinePage extends ContentOutlinePage {
+
+	private ITextEditor editor;
+	private IEditorInput input;
+	
+	public SpecfileContentOutlinePage(SpecfileEditor editor) {
+		super();
+		this.editor = editor;
+	}
+
+	public void setInput(IEditorInput editorInput) {
+		this.input = editorInput;
+		update();
+	}
+
+	public void update() {
+		//set the input so that the outlines parse can be called
+		//update the tree viewer state
+		final TreeViewer viewer = getTreeViewer();
+
+		if (viewer != null)
+		{
+			final Control control = viewer.getControl();
+			if (control != null && !control.isDisposed())
+			{
+				control.getDisplay().asyncExec(new Runnable() {
+					public void run() {
+						if (!control.isDisposed()) {
+							control.setRedraw(false);
+							if (input != null)
+								viewer.setInput(input);
+							viewer.expandAll();
+							control.setRedraw(true);
+						}
+					}
+				});
+			}
+		}
+	}
+	
+	@Override
+	public void createControl(Composite parent) {
+
+		super.createControl(parent);
+
+		TreeViewer viewer= getTreeViewer();
+		viewer.setContentProvider(new SpecfileContentProvider(editor));
+		viewer.setLabelProvider(new SpecfileLabelProvider());
+		viewer.addSelectionChangedListener(this);
+
+		if (input != null)
+			viewer.setInput(input);
+	}
+	
+	/*
+	 * Change in selection
+	 */
+	@Override
+	public void selectionChanged(SelectionChangedEvent event)
+	{
+		super.selectionChanged(event);
+		
+		//find out which item in tree viewer we have selected, and set highlight range accordingly
+		ISelection selection = event.getSelection();
+		if (selection.isEmpty())
+			editor.resetHighlightRange();
+		else
+		{
+			SpecfileElement element = (SpecfileElement) ((IStructuredSelection) selection)
+					.getFirstElement();		
+			
+			int start = element.getLineStartPosition();
+			try
+			{
+				editor.setHighlightRange(start, 1, true);
+			}
+			catch (IllegalArgumentException e)
+			{
+				editor.resetHighlightRange();
+			}
+		}
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/outline/SpecfileContentProvider.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/outline/SpecfileContentProvider.java
new file mode 100644
index 0000000..2d5ca3b
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/outline/SpecfileContentProvider.java
@@ -0,0 +1,115 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.outline;
+
+import org.eclipse.jface.text.BadPositionCategoryException;
+import org.eclipse.jface.text.DefaultPositionUpdater;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IPositionUpdater;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.Specfile;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfilePackage;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfilePackageContainer;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+import org.eclipse.ui.texteditor.ITextEditor;
+
+public class SpecfileContentProvider implements ITreeContentProvider {
+
+	private IDocumentProvider documentProvider;
+	private Specfile specfile;
+	private SpecfileEditor specEditor;
+	protected final static String SECTION_POSITIONS = "section_positions"; //$NON-NLS-1$
+	protected IPositionUpdater positionUpdater = new DefaultPositionUpdater(SECTION_POSITIONS);
+	
+	public SpecfileContentProvider(ITextEditor editor) {
+		if (editor instanceof SpecfileEditor) {
+			specEditor = (SpecfileEditor) editor;
+			specfile = specEditor.getSpecfile();
+		}
+		this.documentProvider = editor.getDocumentProvider();
+	}
+	
+	public void dispose() {
+		// TODO Auto-generated method stub
+
+	}
+
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		if (oldInput != null)
+		{
+			IDocument document = documentProvider.getDocument(oldInput);
+			if (document != null)
+			{
+				try
+				{
+					document.removePositionCategory(SECTION_POSITIONS);
+				}
+				catch (BadPositionCategoryException x)
+				{
+				}
+				document.removePositionUpdater(positionUpdater);
+			}
+		}
+
+		if (newInput != null)
+		{
+			IDocument document = documentProvider.getDocument(newInput);
+			if (document != null)
+			{
+				document.addPositionCategory(SECTION_POSITIONS);
+				document.addPositionUpdater(positionUpdater);
+				if (specEditor != null)
+					specfile = specEditor.getSpecfile();
+			}
+		}
+	}
+
+	public Object[] getChildren(Object parentElement) {
+		if (parentElement == specfile) {
+			Object[] elms = new Object[1 + 1 + specfile.getSections().size()];
+			elms[0] = specfile.getPreamble();
+			elms[1] = specfile.getPackages();
+			Object[] sections = specfile.getSections().toArray();
+			for (int i = 0; i < sections.length; i++) {
+				 elms[i + 2] = sections[i];
+			}
+			return elms;
+		} else if (parentElement instanceof SpecfilePackageContainer) {
+			return ((SpecfilePackageContainer) parentElement).getPackages();
+		} else if (parentElement instanceof SpecfilePackage) {
+			return ((SpecfilePackage) parentElement).getSections();
+		}
+		return new Object[0];
+	}
+
+	public Object getParent(Object element) {
+		return null;
+	}
+
+	public boolean hasChildren(Object element) {
+		if (element == specfile) {
+			return true;
+		} else if (element instanceof SpecfilePackageContainer) {
+			return ((SpecfilePackageContainer) element).hasChildren();
+		} else if (element instanceof SpecfilePackage) {
+			return ((SpecfilePackage) element).hasChildren();
+		}
+		return false;
+	}
+
+	public Object[] getElements(Object inputElement) {
+		return this.getChildren(specfile);
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/outline/SpecfileLabelProvider.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/outline/SpecfileLabelProvider.java
new file mode 100644
index 0000000..f774714
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/outline/SpecfileLabelProvider.java
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.outline;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.linuxtools.rpm.ui.editor.Activator;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.Specfile;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileElement;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfilePackage;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfilePackageContainer;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfilePreamble;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileSection;
+import org.eclipse.swt.graphics.Image;
+
+public class SpecfileLabelProvider implements ILabelProvider {
+
+	private static final String PREAMBLE_ICON="icons/preamble_obj.gif"; //$NON-NLS-1$
+	private static final String SECTION_ICON="icons/section_obj.gif"; //$NON-NLS-1$
+	private static final String PACKAGES_ICON="icons/packages_obj.gif"; //$NON-NLS-1$
+	private static final String PACKAGE_ICON="icons/package_obj.gif"; //$NON-NLS-1$
+	
+	public void addListener(ILabelProviderListener listener) {
+	}
+
+	public void dispose() {
+	}
+
+	public boolean isLabelProperty(Object element, String property) {
+		return false;
+	}
+
+	public void removeListener(ILabelProviderListener listener) {
+	}
+
+	public Image getImage(Object element) {
+		if (element instanceof SpecfilePackage) {
+			return Activator.getDefault().getImage(PACKAGE_ICON);
+		} else if (element instanceof SpecfileSection) {
+			return Activator.getDefault().getImage(SECTION_ICON);
+		} else if (element instanceof SpecfilePackageContainer) {
+			return Activator.getDefault().getImage(PACKAGES_ICON);
+		}else if (element instanceof SpecfilePreamble) {
+			return Activator.getDefault().getImage(PREAMBLE_ICON);
+		}
+		return null;
+	}
+
+	public String getText(Object element) {
+		if (element instanceof SpecfileSection) {
+			SpecfileSection specfileSection = (SpecfileSection) element;
+			return specfileSection.toString();
+		} else if (element instanceof Specfile) {
+			return ((Specfile) element).getName();
+		} else if (element instanceof SpecfilePackageContainer) {
+			return Messages.SpecfileLabelProvider_0;
+		} else if (element instanceof SpecfilePreamble){
+			return Messages.SpecfileLabelProvider_1;
+		} else if (element instanceof SpecfileElement) {
+			SpecfileElement specfileElement = (SpecfileElement) element;
+			return specfileElement.getName();
+		} else if (element instanceof String) {
+			return (String) element;
+		} else if (element instanceof SpecfilePackage) {
+			return ((SpecfilePackage) element).getName();
+		}
+		return ""; //$NON-NLS-1$
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/outline/SpecfileQuickOutlineDialog.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/outline/SpecfileQuickOutlineDialog.java
new file mode 100644
index 0000000..5e4a537
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/outline/SpecfileQuickOutlineDialog.java
@@ -0,0 +1,166 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Alexander Kurtakov.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alexander Kurtakov - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.outline;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.PopupDialog;
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.viewers.AbstractTreeViewer;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileEditor;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileElement;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyAdapter;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.FontMetrics;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.Tree;
+
+public class SpecfileQuickOutlineDialog extends PopupDialog {
+
+	TreeViewer treeViewer;
+	private Text filterText;
+	private SpecfileEditor editor;
+	private ContainsFilter treeViewerFilter;
+
+	public SpecfileQuickOutlineDialog(Shell parent, int shellStyle,
+			SpecfileEditor editor) {
+		super(parent, shellStyle, true, true, true, true, true, null, null);
+		this.editor = editor;
+		create();
+	}
+
+	public void setSize(int width, int height) {
+		getShell().setSize(width, height);
+	}
+
+	public void setVisible(boolean visible) {
+		if (visible) {
+			open();
+			filterText.setFocus();
+		} else {
+			saveDialogBounds(getShell());
+			getShell().setVisible(false);
+		}
+	}
+
+	public void dispose() {
+		close();
+	}
+	
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		createUIWidgetTreeViewer(parent);
+		createUIListenersTreeViewer();
+		return treeViewer.getControl();
+	}
+
+	@Override
+	protected Control createTitleControl(Composite parent) {
+		filterText = new Text(parent, SWT.NONE);
+		GC gc = new GC(parent);
+		gc.setFont(parent.getFont());
+		FontMetrics fontMetrics = gc.getFontMetrics();
+		gc.dispose();
+		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true,
+				false).hint(SWT.DEFAULT,
+				Dialog.convertHeightInCharsToPixels(fontMetrics, 1)).applyTo(
+				filterText);
+
+		filterText.addKeyListener(new KeyAdapter() {
+			@Override
+			public void keyPressed(KeyEvent e) {
+				if (e.keyCode == 0x0D) { // Enter pressed
+					gotoSelectedElement();
+				} else if (e.keyCode == SWT.ARROW_DOWN) {
+					treeViewer.getTree().setFocus();
+				} else if (e.keyCode == SWT.ARROW_UP) {
+					treeViewer.getTree().setFocus();
+				} else if (e.character == 0x1B) { // Escape pressed
+					dispose();
+				}
+			}
+		});
+		filterText.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				String filterTextInput = ((Text) e.widget).getText()
+						.toLowerCase();
+				treeViewerFilter.setLookFor(filterTextInput);
+				stringMatcherUpdated();
+			}
+		});
+		return filterText;
+	}
+
+	private void stringMatcherUpdated() {
+		treeViewer.getControl().setRedraw(false);
+		treeViewer.refresh();
+		treeViewer.expandAll();
+		treeViewer.getControl().setRedraw(true);
+	}
+
+	private void createUIWidgetTreeViewer(Composite parent) {
+		final int style = SWT.H_SCROLL | SWT.V_SCROLL;
+		final Tree widget = new Tree(parent, style);
+		final GridData data = new GridData(GridData.FILL_BOTH);
+		data.heightHint = widget.getItemHeight() * 12;
+		widget.setLayoutData(data);
+		treeViewer = new TreeViewer(widget);
+		treeViewerFilter = new ContainsFilter();
+		treeViewer.addFilter(treeViewerFilter);
+		SpecfileContentProvider fOutlineContentProvider = new SpecfileContentProvider(
+				editor);
+		treeViewer.setContentProvider(fOutlineContentProvider);
+		SpecfileLabelProvider fTreeLabelProvider = new SpecfileLabelProvider();
+		treeViewer.setLabelProvider(fTreeLabelProvider);
+		treeViewer.setAutoExpandLevel(AbstractTreeViewer.ALL_LEVELS);
+		treeViewer.setUseHashlookup(true);
+		treeViewer.setInput(fOutlineContentProvider);
+	}
+
+	private void createUIListenersTreeViewer() {
+		final Tree tree = treeViewer.getTree();
+		tree.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetDefaultSelected(SelectionEvent e) {
+				gotoSelectedElement();
+			}
+		});
+	}
+
+	private void gotoSelectedElement() {
+		final SpecfileElement curElement = (SpecfileElement) getSelectedElement();
+		if (curElement == null) {
+			return;
+		}
+		dispose();
+		editor.setHighlightRange(curElement.getLineStartPosition(), 1, true);
+	}
+
+	
+	private Object getSelectedElement() {
+		if (treeViewer == null) {
+			return null;
+		}
+		return ((IStructuredSelection) treeViewer.getSelection())
+				.getFirstElement();
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/outline/messages.properties b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/outline/messages.properties
new file mode 100644
index 0000000..610533d
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/outline/messages.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+SpecfileLabelProvider_0=Packages
+SpecfileLabelProvider_1=Preamble
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/Messages.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/Messages.java
new file mode 100644
index 0000000..56c9a5c
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/Messages.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.parser;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public final class Messages {
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.rpm.ui.editor.parser.messages"; //$NON-NLS-1$
+
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
+			.getBundle(BUNDLE_NAME);
+
+	private Messages() {
+	}
+
+	public static String getString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SourceComparator.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SourceComparator.java
new file mode 100644
index 0000000..94136da
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SourceComparator.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.parser;
+
+import java.io.Serializable;
+import java.util.Comparator;
+
+public class SourceComparator implements Comparator<SpecfileSource>, Serializable{
+	private static final long serialVersionUID = 1L;
+
+	public int compare(SpecfileSource source0, SpecfileSource source1) {
+		if (source0 == null)
+			return -1;
+		if (source1 == null)
+			return 1;
+		if (source0.getNumber() < source1.getNumber())
+			return -1;
+		else if (source0.getNumber() == source1.getNumber())
+			return 0;
+		else
+			return 1;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java
new file mode 100644
index 0000000..06881d7
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/Specfile.java
@@ -0,0 +1,315 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *    Alphonse Van Assche
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.parser;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.linuxtools.rpm.ui.editor.RpmTags;
+import org.eclipse.linuxtools.rpm.ui.editor.UiUtils;
+
+public class Specfile {
+
+	SpecfilePreamble preamble;
+	
+	SpecfilePackageContainer packages;
+
+	List<SpecfileSection> sections;
+	List<SpecfileSection> complexSections;
+
+	Map<String, SpecfileDefine> defines;
+
+	Map<Integer, SpecfileSource> sources;
+
+	Map<Integer, SpecfileSource> patches;
+	
+	private List<SpecfileTag> buildRequires;
+	
+	private List<SpecfileTag> requires;
+
+	private IDocument document;
+
+	public Specfile() {
+		packages = new SpecfilePackageContainer();
+		preamble = new SpecfilePreamble();
+		sections = new ArrayList<SpecfileSection>();
+		complexSections = new ArrayList<SpecfileSection>();
+		defines = new HashMap<String, SpecfileDefine>();
+		sources = new HashMap<Integer, SpecfileSource>();
+		patches = new HashMap<Integer, SpecfileSource>();
+		buildRequires = new ArrayList<SpecfileTag>();
+		requires = new ArrayList<SpecfileTag>();
+	}
+
+	public List<SpecfileSection> getSections() {
+		return sections;
+	}
+
+	public SpecfileSection getSection(String sectionName){
+		for (SpecfileSection section : sections) {
+			if (sectionName.equals(section.getName())) {
+				return section;
+			}
+		}
+		return null;
+	}
+	
+	public List<SpecfileSection> getComplexSections() {
+		return complexSections;
+	}
+	
+	public SpecfileSource getPatch(int number) {
+		return patches.get(number);
+	}
+
+	public SpecfileSource getSource(int number) {
+		return sources.get(number);
+	}
+
+	public String getName() {
+		SpecfileDefine define = getDefine(RpmTags.NAME.toLowerCase());
+		if (define != null){
+			return define.getStringValue();
+		}
+		return " "; //$NON-NLS-1$
+	}
+
+	public void addSection(SpecfileSection section) {
+		sections.add(section);
+	}
+
+	public void addComplexSection(SpecfileSection section) {
+		complexSections.add(section);
+	}
+	
+	public void addSource(SpecfileSource source) {
+		sources.put(Integer.valueOf(source.getNumber()), source);
+	}
+
+	public void addPatch(SpecfileSource patch) {
+		patches.put(Integer.valueOf(patch.getNumber()), patch);
+	}
+
+    /**
+     * Adds the given define to the map of defines for this specfile.
+     * 
+     * @param define The define to add.
+     */
+    public void addDefine(SpecfileDefine define) {
+    	SpecfilePackage rpmPackage = define.getParent();
+    	if (rpmPackage != null && !rpmPackage.isMainPackage()) {
+    		defines.put(UiUtils.getPackageDefineId(define, rpmPackage), define);
+    		return;
+    	}
+		defines.put(define.getName(), define);
+	}
+    
+    public void addDefine(SpecfileTag tag) {
+		addDefine(new SpecfileDefine(tag));
+	}
+    
+    public SpecfileDefine getDefine(String defineName) {
+		return defines.get(defineName.toLowerCase());
+	}
+	
+	public SpecfileDefine getDefine(String defineName, SpecfilePackage rpmPackage) {
+		return defines.get(UiUtils.getPackageDefineId(defineName, rpmPackage));
+	}
+
+	public int getEpoch() {
+		SpecfileDefine define = getDefine(RpmTags.EPOCH.toLowerCase());
+		if (define != null){
+			return define.getIntValue();
+		}
+		return -1;
+	}
+
+	public String getRelease() {
+		SpecfileDefine define = getDefine(RpmTags.RELEASE.toLowerCase());
+		if (define != null){
+			return define.getStringValue();
+		}
+		return "0"; //$NON-NLS-1$
+	}
+
+	public String getVersion() {
+		SpecfileDefine define = getDefine(RpmTags.VERSION.toLowerCase());
+		if (define != null){
+			return define.getStringValue();
+		}
+		return "0"; //$NON-NLS-1$
+	}
+
+	public List<SpecfileSource> getPatches() {
+		List<SpecfileSource> patchesList = new ArrayList<SpecfileSource>(patches.values());
+		Collections.sort(patchesList, new SourceComparator());
+		return patchesList;
+	}
+
+	public Collection<SpecfileSource> getSources() {
+		List<SpecfileSource> sourcesList = new ArrayList<SpecfileSource>(sources.values());
+		Collections.sort(sourcesList, new SourceComparator());
+		return sourcesList;
+	}
+
+	public List<SpecfileDefine> getDefines() {
+		List<SpecfileDefine> definesList = new ArrayList<SpecfileDefine>(defines.values());
+		return definesList;
+	}
+	
+	public void organizePatches() {
+		List<SpecfileSource> patches = getPatches();
+		int newPatchNumber = 0;
+		int oldPatchNumber = -1;
+		Map<Integer, SpecfileSource> newPatches = new HashMap<Integer, SpecfileSource>();
+		for (SpecfileSource thisPatch: patches) {
+			if (thisPatch.getSpecfile() == null)
+				thisPatch.setSpecfile(this);
+			oldPatchNumber = thisPatch.getNumber();
+			thisPatch.setNumber(newPatchNumber);
+			thisPatch.changeDeclaration(oldPatchNumber);
+			thisPatch.changeReferences(oldPatchNumber);
+			newPatches.put(Integer.valueOf(newPatchNumber), thisPatch);
+			newPatchNumber++;
+		}
+		setPatches(newPatches);
+	}
+
+	public void setDocument(IDocument specfileDocument) {
+		document = specfileDocument;
+	}
+
+	public String getLine(int lineNumber) throws BadLocationException {
+		int offset = document.getLineOffset(lineNumber);
+		int length = getLineLength(lineNumber);
+		String lineContents = document.get(offset, length);
+		return lineContents;
+	}
+
+	public IDocument getDocument() {
+		return document;
+	}
+
+	public int getLineLength(int lineNumber) throws BadLocationException {
+		int length = document.getLineLength(lineNumber);
+		String lineDelimiter = document.getLineDelimiter(lineNumber);
+		if (lineDelimiter != null)
+			length = length - lineDelimiter.length();
+		return length;
+	}
+
+	public void changeLine(int lineNumber, String string)
+			throws BadLocationException {
+		document.replace(document.getLineOffset(lineNumber),
+				getLineLength(lineNumber), string);
+	}
+
+	public void setPatches(Map<Integer, SpecfileSource> patches) {
+		this.patches = patches;
+	}
+
+	@Override
+	public String toString() {
+		return getName();
+	}
+
+	public String getLicense() {
+		return defines.get(RpmTags.LICENSE.toLowerCase()).getStringValue();
+	}
+
+	public SpecfilePackageContainer getPackages() {
+		return packages;
+	}
+
+	public SpecfileElement getPreamble() {
+		return preamble;
+	}
+
+	public SpecfilePackage getPackage(String packageName) {
+		return getPackages().getPackage(packageName);
+	}
+
+	public void addPackage(SpecfilePackage subPackage) {
+		if (! packages.contains(subPackage))
+			packages.addPackage(subPackage);
+	}
+
+	public void modifyDefine(String defineName, SpecfilePackage rpmPackage,
+			String newValue) {
+		SpecfileDefine define = getDefine(UiUtils.getPackageDefineId(defineName, rpmPackage));
+		if (define != null) {
+			define.setValue(newValue);
+			try {
+				changeLine(define.getLineNumber(), defineName + ": " + newValue); //$NON-NLS-1$
+			} catch (BadLocationException e) {
+				e.printStackTrace();
+			}
+		}
+		
+	}
+
+	public void modifyDefine(String defineName, String newValue) {
+		SpecfileDefine define = getDefine(defineName.toLowerCase());
+		if (define != null) {
+			define.setValue(newValue);
+			try {
+				changeLine(define.getLineNumber(), defineName + ": " + newValue); //$NON-NLS-1$
+			} catch (BadLocationException e) {
+				e.printStackTrace();
+			}
+		}
+	}
+	
+	public void modifyDefine(SpecfileTag define, String newValue) {
+		if (define != null) {
+			define.setValue(newValue);
+			try {
+				changeLine(define.getLineNumber(), define.getName() + ": " + newValue); //$NON-NLS-1$
+			} catch (BadLocationException e) {
+				e.printStackTrace();
+			}
+		}
+	}
+
+	/**
+	 * @param buildRequire the buildRequire to add
+	 */
+	public void addBuildRequire(SpecfileDefine buildRequire) {
+		buildRequires.add(buildRequire);
+	}
+	
+	/**
+	 * @param require the require to add
+	 */
+	public void addRequire(SpecfileTag require) {
+		requires.add(require);
+	}
+
+	/**
+	 * @return the buildRequires
+	 */
+	public List<SpecfileTag> getBuildRequires() {
+		return buildRequires;
+	}
+
+	public List<SpecfileTag> getRequires() {
+		return requires;
+	}
+	
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileDefine.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileDefine.java
new file mode 100644
index 0000000..2f7e5a4
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileDefine.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.parser;
+
+public class SpecfileDefine extends SpecfileTag {
+
+	public SpecfileDefine(String name, int value, Specfile specfile, SpecfilePackage parent) {
+		super(name, value, specfile, parent);
+	}
+
+	public SpecfileDefine(String name, String value, Specfile specfile, SpecfilePackage parent) {
+		super(name, value, specfile, parent);
+	}
+
+	public SpecfileDefine(SpecfileTag tag) {
+		super();
+		setName(tag.getName().toLowerCase());
+		setSpecfile(tag.getSpecfile());
+		setLineNumber(tag.getLineNumber());
+		setParent(tag.getParent());
+		if (tag.getTagType().equals(TagType.STRING)) {
+			setValue(tag.getStringValue());
+		}
+		if (tag.getTagType().equals(TagType.INT)) {
+			setValue(tag.getIntValue());
+		}
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileElement.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileElement.java
new file mode 100644
index 0000000..2631223
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileElement.java
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.parser;
+
+import org.eclipse.linuxtools.rpm.ui.editor.UiUtils;
+
+public class SpecfileElement {
+	private Specfile specfile;
+	private String name;
+	private int lineNumber;
+	private int lineStartPosition;
+	private int lineEndPosition;
+
+	public int getLineNumber() {
+		return lineNumber;
+	}
+
+	public void setLineNumber(int lineNumber) {
+		this.lineNumber = lineNumber;
+	}
+
+	public SpecfileElement() {
+		// weird
+	}
+
+	public SpecfileElement(String name) {
+		setName(name);
+	}
+
+	public String getName() {
+		return resolve(name);
+	}
+
+	public final void setName(String name) {
+		this.name = name;
+	}
+
+	@Override
+	public String toString() {
+		return name;
+	}
+
+	public int getLineEndPosition() {
+		return lineEndPosition;
+	}
+
+	public void setLineEndPosition(int lineEndPosition) {
+		this.lineEndPosition = lineEndPosition;
+	}
+
+	public int getLineStartPosition() {
+		return lineStartPosition;
+	}
+
+	public void setLineStartPosition(int lineStartPosition) {
+		this.lineStartPosition = lineStartPosition;
+	}
+
+	public Specfile getSpecfile() {
+		return specfile;
+	}
+
+	public void setSpecfile(Specfile specfile) {
+		this.specfile = specfile;
+	}
+
+	public String resolve(String toResolve) {
+		if (specfile == null || toResolve.equals("")) {//$NON-NLS-1$
+			if (toResolve.length()>2 && toResolve.substring(2, toResolve.length() - 1).equals(name)) { 
+				return toResolve;
+			}
+		}
+		return UiUtils.resolveDefines(specfile, toResolve);
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileMacro.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileMacro.java
new file mode 100644
index 0000000..4f341d4
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileMacro.java
@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.parser;
+
+public class SpecfileMacro extends SpecfileElement {
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePackage.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePackage.java
new file mode 100644
index 0000000..129efa5
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePackage.java
@@ -0,0 +1,134 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.parser;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SpecfilePackage extends SpecfileSection {
+	private String description;
+	private List<SpecfileSection> sections;
+	private List<SpecfileTag> requires;
+ 	private String packageName;
+	private String summary;
+	private String group;
+
+	public SpecfilePackage(String packageName, Specfile specfile) {
+		super("package", specfile); //$NON-NLS-1$
+		super.setSpecfile(specfile);
+		setPackageName(packageName);
+        setPackage(this);
+        sections = new ArrayList<SpecfileSection>();
+        requires = new ArrayList<SpecfileTag>();
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	
+	@Override
+	public String toString() {
+		return getPackageName();
+	}
+
+	public void addSection(SpecfileSection section) {
+		sections.add(section);
+	}
+
+	
+	public SpecfileSection[] getSections() {
+		SpecfileSection[] toReturn = new SpecfileSection[sections.size()];
+		return sections.toArray(toReturn);
+	}
+
+	public boolean hasChildren() {
+		if (sections != null && sections.size() > 0)
+			return true;
+		return false;
+	}
+
+    @Override
+	public SpecfilePackage getPackage() {
+		return this;
+	}
+
+	@Override
+	public String getPackageName() {
+		return resolve(this.packageName);
+	}
+	
+	/**
+	 * Returns the full package name. 
+	 * 
+	 * @return The name of the package with the common part appended in front.
+	 */
+	public String getFullPackageName() {
+		if (getSpecfile().getName().equals(getPackageName())){
+			return getPackageName();
+		}
+		return getSpecfile().getName()+"-" + getPackageName(); //$NON-NLS-1$
+	}
+
+	public final void setPackageName(String packageName) {
+		this.packageName = packageName;
+	}
+
+	/**
+	 * @param summary the summary to set
+	 */
+	public void setSummary(String summary) {
+		this.summary = summary;
+	}
+
+	/**
+	 * @return the summary
+	 */
+	public String getSummary() {
+		return summary;
+	}
+
+	/**
+	 * @param group the group to set
+	 */
+	public void setGroup(String group) {
+		this.group = group;
+	}
+
+	/**
+	 * @return the group
+	 */
+	public String getGroup() {
+		return group;
+	}
+
+	public boolean isMainPackage() {
+		if (getSpecfile().getName().equals(getPackageName())){
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * @param require the require to add
+	 */
+	public void addRequire(SpecfileTag require) {
+		requires.add(require);
+	}
+
+	public List<SpecfileTag> getRequires() {
+		return requires;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePackageContainer.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePackageContainer.java
new file mode 100644
index 0000000..a2ac84f
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePackageContainer.java
@@ -0,0 +1,99 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.parser;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileLog;
+
+public class SpecfilePackageContainer extends SpecfileElement {
+	List<SpecfilePackage> packages;
+	
+	public SpecfilePackageContainer() {
+		super();
+		packages = new ArrayList<SpecfilePackage>();
+	}
+	
+	public SpecfilePackage[] getPackages() {
+		try {
+			Object [] objs = packages.toArray();
+			SpecfilePackage [] packs = new SpecfilePackage[objs.length];
+			for (int i = 0; i <  objs.length; i++) {
+				SpecfilePackage pack = (SpecfilePackage) objs[i];
+				packs[i] = pack;
+			}
+			return packs;
+		}catch (Exception e){
+			SpecfileLog.logError(e);
+		}
+		return new SpecfilePackage[0] ;
+	}
+	
+	void addPackage(SpecfilePackage subPackage) {
+		packages.add(subPackage);
+	}
+	
+	@Override
+	public int getLineStartPosition() {
+		if ((packages == null) || (packages.size() == 0))
+			return 0;
+		
+		int lowestStartLine = Integer.MAX_VALUE;
+		
+		for (SpecfilePackage subPackage: packages){
+			if (subPackage.getLineStartPosition() < lowestStartLine)
+				lowestStartLine = subPackage.getLineStartPosition();
+		}
+		
+		if (lowestStartLine == Integer.MAX_VALUE)
+			return 0;
+		return lowestStartLine;
+	}
+	
+	@Override
+	public int getLineEndPosition() {
+		if ((packages == null) || packages.isEmpty()) {
+			return 0;
+		}
+
+		int highestEndLine = 0;
+		
+		for (SpecfilePackage subPackage: packages){
+			if (subPackage.getLineStartPosition() > highestEndLine)
+				highestEndLine = subPackage.getLineEndPosition();
+		}
+
+		if (highestEndLine < 0)
+			return 0;
+		return highestEndLine;
+	}
+
+	public SpecfilePackage getPackage(String packageName) {
+		for (SpecfilePackage thisPackage: packages) {
+			if (thisPackage.getPackageName().equals(thisPackage.resolve(packageName))) {
+				return thisPackage;
+			}
+		}
+		return null;
+	}
+
+	public boolean contains(SpecfilePackage subPackage){
+		return packages.contains(subPackage);
+	}
+
+	public boolean hasChildren() {
+		if (packages != null && packages.size() > 0)
+			return true;
+		return false;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParseException.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParseException.java
new file mode 100644
index 0000000..043de91
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParseException.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.parser;
+
+public class SpecfileParseException extends Exception {
+	
+	private static final long serialVersionUID = 1L;
+	String message;
+	int severity;
+	int lineNumber;
+	int startColumn;
+	int endColumn;
+	public int getEndColumn() {
+		return endColumn;
+	}
+	public void setEndColumn(int endColumn) {
+		this.endColumn = endColumn;
+	}
+	public int getLineNumber() {
+		return lineNumber;
+	}
+	public void setLineNumber(int lineNumber) {
+		this.lineNumber = lineNumber;
+	}
+	@Override
+	public String getMessage() {
+		return message;
+	}
+	public void setMessage(String message) {
+		this.message = message;
+	}
+	public int getStartColumn() {
+		return startColumn;
+	}
+	public void setStartColumn(int startColumn) {
+		this.startColumn = startColumn;
+	}
+	public SpecfileParseException(String message, int lineNumber, int startColumn, int endColumn, int severity) {
+		super();
+		this.message = message;
+		this.lineNumber = lineNumber;
+		this.startColumn = startColumn;
+		this.endColumn = endColumn;
+		this.severity = severity;
+	}
+	public int getSeverity() {
+		return severity;
+	}
+	public void setSeverity(int severity) {
+		this.severity = severity;
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java
new file mode 100644
index 0000000..0387a27
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileParser.java
@@ -0,0 +1,602 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *    Alphonse Van Assche
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.parser;
+
+import java.io.IOException;
+import java.io.LineNumberReader;
+import java.io.StringReader;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.Document;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.linuxtools.rpm.ui.editor.Activator;
+import org.eclipse.linuxtools.rpm.ui.editor.ISpecfileSpecialSymbols;
+import org.eclipse.linuxtools.rpm.ui.editor.RpmTags;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileLog;
+import org.eclipse.linuxtools.rpm.ui.editor.markers.SpecfileErrorHandler;
+import org.eclipse.linuxtools.rpm.ui.editor.markers.SpecfileTaskHandler;
+import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileSource.SourceType;
+import org.eclipse.linuxtools.rpm.ui.editor.preferences.PreferenceConstants;
+
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.*;
+
+public class SpecfileParser {
+
+	private static final String DEFINE_SEPARATOR = ":"; //$NON-NLS-1$
+
+	private static final String SPACE_REGEX = "\\s+"; //$NON-NLS-1$
+
+	/**
+	 * These are SRPM-wide sections, and they also cannot have any flags like -n
+	 * or -f. Hence they are called simple. This is probably a misleading name
+	 * and it should be renamed to reflect that they are SRPM-wide sections.
+	 */
+	public static final String[] simpleSections = { PREP_SECTION, BUILD_SECTION,
+			INSTALL_SECTION, CLEAN_SECTION, CHANGELOG_SECTION };
+
+	/**
+	 * These are sections that apply to a particular sub-package (i.e. binary
+	 * RPM), including the main package. These can also have flags like -f or -n
+	 * appended to them, hence they are called complex. This should probably be
+	 * renamed to reflect that they are in fact per-RPM sections.
+	 */
+	private static String[] complexSections = { PRETRANS_SECTION, PRE_SECTION,
+			PREUN_SECTION, POST_SECTION, POSTUN_SECTION, POSTTRANS_SECTION,
+			FILES_SECTION, PACKAGE_SECTION, DESCRIPTION_SECTION };
+
+	private static String[] simpleDefinitions = { RpmTags.EPOCH, RpmTags.NAME,
+			RpmTags.VERSION, RpmTags.RELEASE, RpmTags.URL, RpmTags.BUILD_ARCH };
+
+	private static String[] directValuesDefinitions = { RpmTags.LICENSE,
+			RpmTags.BUILD_ROOT };
+	// Note that the ordering here should match that in
+	// SpecfileSource#SOURCETYPE
+	private static String[] complexDefinitions = { "Source", "Patch" }; //$NON-NLS-1$ //$NON-NLS-2$
+
+	private static String[] packageLevelDefinitions = { RpmTags.SUMMARY,
+			RpmTags.GROUP, RpmTags.OBSOLETES, RpmTags.PROVIDES,
+			RpmTags.REQUIRES, RpmTags.REQUIRES_PRE, RpmTags.REQUIRES_POST,
+			RpmTags.REQUIRES_POSTUN };
+
+	private SpecfileErrorHandler errorHandler;
+	private SpecfileTaskHandler taskHandler;
+	private IPreferenceStore store;
+	private SpecfileSection lastSection;
+	private SpecfilePackage activePackage;
+
+	public SpecfileParser() {
+		store = Activator.getDefault().getPreferenceStore();
+	}
+
+	public Specfile parse(IDocument specfileDocument) {
+
+		// remove all existing markers, if a SpecfileErrorHandler is
+		// instantiated.
+		if (errorHandler != null)
+			errorHandler.removeExistingMarkers();
+		if (taskHandler != null) {
+			taskHandler.removeExistingMarkers();
+		}
+		LineNumberReader reader = new LineNumberReader(new StringReader(
+				specfileDocument.get()));
+		String line = ""; //$NON-NLS-1$
+		int lineStartPosition = 0;
+		Specfile specfile = new Specfile();
+		specfile.setDocument(specfileDocument);
+		try {
+			while ((line = reader.readLine()) != null) {
+				if (taskHandler != null) {
+					generateTaskMarker(reader.getLineNumber() - 1, line);
+				}
+				// IDocument.getLine(#) is 0-indexed whereas
+				// reader.getLineNumber appears to be 1-indexed
+				SpecfileElement element = parseLine(line, specfile, reader
+						.getLineNumber() - 1);
+				if (element != null) {
+					element.setLineNumber(reader.getLineNumber() - 1);
+					element.setLineStartPosition(lineStartPosition);
+					element.setLineEndPosition(lineStartPosition
+							+ line.length());
+					if (element.getClass() == SpecfileTag.class) {
+						SpecfileTag tag = (SpecfileTag) element;
+						specfile.addDefine(tag);
+					} else if ((element.getClass() == SpecfilePatchMacro.class)) {
+						SpecfilePatchMacro thisPatchMacro = (SpecfilePatchMacro) element;
+						if (thisPatchMacro != null) {
+							thisPatchMacro.setSpecfile(specfile);
+						}
+						SpecfileSource thisPatch = specfile
+								.getPatch(thisPatchMacro.getPatchNumber());
+						if (thisPatch != null) {
+							thisPatch.addLineUsed(reader.getLineNumber() - 1);
+							thisPatch.setSpecfile(specfile);
+						}
+					} else if ((element.getClass() == SpecfileDefine.class)) {
+						specfile.addDefine((SpecfileDefine) element);
+					} else if ((element.getClass() == SpecfileSource.class)) {
+						SpecfileSource source = (SpecfileSource) element;
+
+						source.setLineNumber(reader.getLineNumber() - 1);
+						if (source.getSourceType() == SpecfileSource.SourceType.SOURCE) {
+							specfile.addSource(source);
+						} else {
+							specfile.addPatch(source);
+						}
+					}
+				}
+				// The +1 is for the line delimiter. FIXME: will we end up off
+				// by one on the last line?
+				lineStartPosition += line.length() + 1;
+			}
+		} catch (IOException e) {
+			// FIXME
+			SpecfileLog.logError(e);
+		}
+		return specfile;
+	}
+
+	private void generateTaskMarker(int lineNumber, String line) {
+		String[] taskTags = store.getString(PreferenceConstants.P_TASK_TAGS)
+				.split(";"); //$NON-NLS-1$
+		int commentCharIndex = line
+				.indexOf(ISpecfileSpecialSymbols.COMMENT_START);
+		if (commentCharIndex > -1) {
+			for (String item : taskTags) {
+				int taskIndex = line.indexOf(item);
+				if (taskIndex > commentCharIndex) {
+					taskHandler.handleTask(lineNumber, line, item);
+				}
+			}
+		}
+	}
+
+	public Specfile parse(String specfileContent) {
+		return parse(new Document(specfileContent));
+	}
+
+	public SpecfileElement parseLine(String lineText, Specfile specfile,
+			int lineNumber) {
+
+		if (lineText.startsWith("%")) //$NON-NLS-1$
+			return parseMacro(lineText, specfile, lineNumber);
+
+		for (String simpleDefinition : simpleDefinitions) {
+			if (lineText.startsWith(simpleDefinition + DEFINE_SEPARATOR)) {
+				return parseSimpleDefinition(lineText, specfile, lineNumber,
+						false);
+			}
+		}
+		for (String directValuesDefinition : directValuesDefinitions) {
+			if (lineText.startsWith(directValuesDefinition + DEFINE_SEPARATOR)) {
+				return parseDirectDefinition(lineText, specfile, lineNumber);
+			}
+		}
+		for (String directValuesDefinition : packageLevelDefinitions) {
+			if (lineText.startsWith(directValuesDefinition + DEFINE_SEPARATOR)) {
+				SpecfileElement definition = parseDirectDefinition(lineText,
+						specfile, lineNumber);
+				if (directValuesDefinition.equals(RpmTags.REQUIRES)) {
+					if (activePackage != null) {
+						activePackage.addRequire((SpecfileTag) definition);
+					} else {
+						specfile.addRequire((SpecfileTag) definition);
+					}
+				}
+				return definition;
+			}
+		}
+
+		if (lineText.startsWith(complexDefinitions[0])
+				&& lineText.contains(DEFINE_SEPARATOR)) {
+			return parseComplexDefinition(lineText, lineNumber,
+					SourceType.SOURCE);
+		} else if (lineText.startsWith(complexDefinitions[1])
+				&& lineText.contains(DEFINE_SEPARATOR)) {
+			return parseComplexDefinition(lineText, lineNumber,
+					SourceType.PATCH);
+		} else if (lineText.startsWith("BuildRequires")) { //$NON-NLS-1$
+			return parseBuildRequire(lineText, lineNumber, specfile);
+		}
+
+		return null;
+	}
+
+	private SpecfileElement parseBuildRequire(String lineText, int lineNumber,
+			Specfile specfile) {
+		String value = lineText.substring(lineText.indexOf(':') + 1,
+				lineText.length()).trim();
+		SpecfileDefine buildRequire = new SpecfileDefine(
+				"BuildRequires", value, specfile, null); //$NON-NLS-1$
+		buildRequire.setLineNumber(lineNumber);
+		specfile.addBuildRequire(buildRequire);
+		return buildRequire;
+	}
+
+	private SpecfileSection parseSection(String lineText, Specfile specfile,
+			int lineNumber) {
+		List<String> tokens = Arrays.asList(lineText.split(SPACE_REGEX));
+		SpecfileSection toReturn = null;
+		boolean isSimpleSection = false;
+		for (Iterator<String> iter = tokens.iterator(); iter.hasNext();) {
+			String token = iter.next();
+
+			// Sections
+			// Simple Section Headers
+			for (String simpleSection : simpleSections) {
+				if (token.equals(simpleSection)) {
+					toReturn = new SpecfileSection(token.substring(1), specfile);
+					specfile.addSection(toReturn);
+					isSimpleSection = true;
+				}
+
+			}
+
+			// Complex Section Headers
+			for (String complexSection : complexSections) {
+				if (token.equals(complexSection)) {
+					String name = token.substring(1);
+					if (!name.equals("package")) { //$NON-NLS-1$
+						toReturn = new SpecfileSection(name, specfile);
+						specfile.addComplexSection(toReturn);
+					}
+					while (iter.hasNext()) {
+						String nextToken = iter.next();
+						if (nextToken.equals("-n")) { //$NON-NLS-1$
+							if (!iter.hasNext()) {
+								errorHandler
+										.handleError(new SpecfileParseException(
+												Messages
+														.getString("SpecfileParser.1") //$NON-NLS-1$
+														+ name
+														+ Messages
+																.getString("SpecfileParser.2"), //$NON-NLS-1$
+												lineNumber, 0, lineText
+														.length(),
+												IMarker.SEVERITY_ERROR));
+								continue;
+							}
+
+							nextToken = iter.next();
+							if (nextToken.startsWith("-")) { //$NON-NLS-1$
+								errorHandler
+										.handleError(new SpecfileParseException(
+												Messages
+														.getString("SpecfileParser.3") //$NON-NLS-1$
+														+ nextToken
+														+ Messages
+																.getString("SpecfileParser.4"), //$NON-NLS-1$
+												lineNumber, 0, lineText
+														.length(),
+												IMarker.SEVERITY_ERROR));
+							}
+
+						} else if (nextToken.equals("-p")) { //$NON-NLS-1$
+							// FIXME: rest of line is the actual section
+							break;
+						} else if (nextToken.equals("-f")) { //$NON-NLS-1$
+							break;
+						}
+
+						// this is a package
+						if (toReturn == null) {
+							SpecfilePackage tmpPackage = specfile
+									.getPackage(nextToken);
+
+							if (tmpPackage == null) {
+								tmpPackage = new SpecfilePackage(nextToken,
+										specfile);
+								specfile.addPackage(tmpPackage);
+							}
+							activePackage = tmpPackage;
+							return tmpPackage;
+						}
+
+						// this is another section
+						SpecfilePackage enclosingPackage = specfile
+								.getPackage(nextToken);
+						if (enclosingPackage == null) {
+							enclosingPackage = new SpecfilePackage(nextToken,
+									specfile);
+							specfile.addPackage(enclosingPackage);
+						}
+						toReturn.setPackage(enclosingPackage);
+						enclosingPackage.addSection(toReturn);
+					}
+				}
+			}
+		}
+
+		// if this package is part of the top level package, add it to
+		// it
+		if (toReturn != null && toReturn.getPackage() == null) {
+			SpecfilePackage topPackage = specfile
+					.getPackage(specfile.getName());
+			if (topPackage == null) {
+				topPackage = new SpecfilePackage(specfile.getName(), specfile);
+				specfile.addPackage(topPackage);
+			}
+			if (!isSimpleSection) {
+				topPackage.addSection(toReturn);
+			}
+		}
+		if (lastSection != null) {
+			lastSection.setSectionEndLine(lineNumber);
+		}
+		return toReturn;
+	}
+
+	private SpecfileElement parseMacro(String lineText, Specfile specfile,
+			int lineNumber) {
+		// FIXME: handle other macros
+
+		if (lineText.startsWith("%define") || lineText.startsWith("%global")) { //$NON-NLS-1$ //$NON-NLS-2$
+			return parseDefine(lineText, specfile, lineNumber);
+		} else if (lineText.startsWith("%patch")) { //$NON-NLS-1$
+			return parsePatch(lineText, lineNumber);
+		}
+
+		String[] sections = new String[simpleSections.length
+				+ complexSections.length];
+		System.arraycopy(simpleSections, 0, sections, 0, simpleSections.length);
+		System.arraycopy(complexSections, 0, sections, simpleSections.length,
+				complexSections.length);
+		for (String section : sections) {
+			if (lineText.startsWith(section)) {
+				lastSection = parseSection(lineText, specfile, lineNumber);
+				lastSection.setSectionEndLine(lineNumber + 1);
+				return lastSection;
+			}
+		}
+		// FIXME: add handling of lines containing %{SOURCENNN}
+		return null;
+	}
+
+	private SpecfileElement parsePatch(String lineText, int lineNumber) {
+
+		SpecfilePatchMacro toReturn = null;
+
+		List<String> tokens = Arrays.asList(lineText.split(SPACE_REGEX));
+
+		for (String token : tokens) {
+			// %patchN+
+			try {
+				if (token.startsWith("%patch")) { //$NON-NLS-1$
+					int patchNumber = 0;
+					if (token.length() > 6) {
+						patchNumber = Integer.parseInt(token.substring(6));
+					}
+					toReturn = new SpecfilePatchMacro(patchNumber);
+				}
+			} catch (NumberFormatException e) {
+				errorHandler.handleError(new SpecfileParseException(
+						Messages.getString("SpecfileParser.5"), //$NON-NLS-1$
+						lineNumber, 0, lineText.length(),
+						IMarker.SEVERITY_ERROR));
+				return null;
+			}
+		}
+
+		return toReturn;
+	}
+
+	private SpecfileDefine parseDefine(String lineText, Specfile specfile,
+			int lineNumber) {
+		List<String> tokens = Arrays.asList(lineText.split(SPACE_REGEX));
+		SpecfileDefine toReturn = null;
+		for (Iterator<String> iter = tokens.iterator(); iter.hasNext();) {
+			// Eat the actual "%define" or "%global" token
+			iter.next();
+			while (iter.hasNext()) {
+				String defineName = iter.next();
+				// FIXME: is this true? investigate in rpmbuild source
+				// Definitions must being with a letter
+				if (!Character.isLetter(defineName.charAt(0))
+						&& (defineName.charAt(0) != '_')) {
+					errorHandler.handleError(new SpecfileParseException(
+							Messages.getString("SpecfileParser.6"), //$NON-NLS-1$
+							lineNumber, 0, lineText.length(),
+							IMarker.SEVERITY_ERROR));
+					return null;
+				} else {
+					if (iter.hasNext()) {
+						String defineStringValue = iter.next();
+						// Defines that are more than one token
+						if (iter.hasNext()) {
+							defineStringValue = lineText.substring(lineText
+									.indexOf(defineStringValue));
+							// Eat up the rest of the tokens
+							while (iter.hasNext())
+								iter.next();
+						}
+						int defineIntValue = -1;
+						try {
+							defineIntValue = Integer
+									.parseInt(defineStringValue);
+						} catch (NumberFormatException e) {
+							toReturn = new SpecfileDefine(defineName,
+									defineStringValue, specfile, null);
+						}
+						if (toReturn == null)
+							toReturn = new SpecfileDefine(defineName,
+									defineIntValue, specfile, null);
+					} else {
+						errorHandler.handleError(new SpecfileParseException(defineName+
+								Messages.getString("SpecfileParser.14"), //$NON-NLS-1$
+								lineNumber, 0, lineText.length(),
+								IMarker.SEVERITY_ERROR));
+					}
+				}
+			}
+		}
+		return toReturn;
+	}
+
+	private SpecfileElement parseComplexDefinition(String lineText,
+			int lineNumber, SourceType sourceType) {
+		SpecfileSource toReturn = null;
+		List<String> tokens = Arrays.asList(lineText.split(SPACE_REGEX));
+		int number = -1;
+		boolean firstToken = true;
+
+		for (Iterator<String> iter = tokens.iterator(); iter.hasNext();) {
+			String token = iter.next();
+			if (token != null && token.length() > 0) {
+				if (firstToken) {
+					if (token.endsWith(DEFINE_SEPARATOR)) {
+						token = token.substring(0, token.length() - 1);
+					} else {
+						// FIXME: come up with a better error message here
+						// FIXME: what about descriptions that begin a line with
+						// the word "Source" or "Patch"?
+						errorHandler.handleError(new SpecfileParseException(
+								Messages.getString("SpecfileParser.8"), //$NON-NLS-1$
+								lineNumber, 0, lineText.length(),
+								IMarker.SEVERITY_WARNING));
+						return null;
+					}
+					if (sourceType == SourceType.PATCH) {
+						if (token.length() > 5) {
+							number = Integer.parseInt(token.substring(5));
+							if (!("patch" + number).equalsIgnoreCase(token)) { //$NON-NLS-1$
+								errorHandler
+										.handleError(new SpecfileParseException(
+												Messages
+														.getString("SpecfileParser.10"), //$NON-NLS-1$
+												lineNumber, 0, lineText
+														.length(),
+												IMarker.SEVERITY_ERROR));
+								return null;
+							}
+						} else {
+							number = 0;
+						}
+					} else {
+						if (token.length() > 6) {
+							number = Integer.parseInt(token.substring(6));
+							if (!("source" + number).equalsIgnoreCase(token)) { //$NON-NLS-1$
+								errorHandler
+										.handleError(new SpecfileParseException(
+												Messages
+														.getString("SpecfileParser.11"), //$NON-NLS-1$
+												lineNumber, 0, lineText
+														.length(),
+												IMarker.SEVERITY_ERROR));
+								return null;
+							}
+						} else {
+							number = 0;
+						}
+					}
+					toReturn = new SpecfileSource(number, ""); //$NON-NLS-1$
+					toReturn.setSourceType(sourceType);
+					firstToken = false;
+				} else {
+					// toReturn should never be null but check just in case
+					if (toReturn != null)
+						toReturn.setFileName(token);
+					if (iter.hasNext()) {
+						errorHandler.handleError(new SpecfileParseException(
+								Messages.getString("SpecfileParser.12"), //$NON-NLS-1$
+								lineNumber, 0, lineText.length(),
+								IMarker.SEVERITY_ERROR));
+					}
+				}
+			}
+		}
+
+		return toReturn;
+	}
+
+	private SpecfileElement parseSimpleDefinition(String lineText,
+			Specfile specfile, int lineNumber, boolean warnMultipleValues) {
+		List<String> tokens = Arrays.asList(lineText.split(SPACE_REGEX));
+		SpecfileTag toReturn = null;
+
+		for (Iterator<String> iter = tokens.iterator(); iter.hasNext();) {
+			String token = iter.next();
+
+			if (token.length() <= 0) {
+				break;
+			}
+
+			if (iter.hasNext()) {
+				String possValue = iter.next();
+				if (possValue.startsWith("%") && iter.hasNext()) { //$NON-NLS-1$
+					possValue += ' ' + iter.next();
+				}
+				toReturn = new SpecfileTag(token.substring(0,
+						token.length() - 1).toLowerCase(), possValue, specfile,
+						null);
+				if (iter.hasNext() && !warnMultipleValues) {
+					errorHandler.handleError(new SpecfileParseException(
+							token.substring(0, token.length() - 1)
+									+ Messages.getString("SpecfileParser.13"), //$NON-NLS-1$
+							lineNumber, 0, lineText.length(),
+							IMarker.SEVERITY_ERROR));
+					return null;
+				}
+			} else {
+				errorHandler.handleError(new SpecfileParseException(token
+						.substring(0, token.length() - 1)
+						+ Messages.getString("SpecfileParser.14"), lineNumber, //$NON-NLS-1$
+						0, lineText.length(), IMarker.SEVERITY_ERROR));
+				toReturn = null;
+			}
+		}
+		if ((toReturn != null) && (toReturn.getStringValue() != null)) {
+			try {
+				int intValue = Integer.parseInt(toReturn.getStringValue());
+				toReturn.setValue(intValue);
+			} catch (NumberFormatException e) {
+				if (toReturn.getName().equalsIgnoreCase(RpmTags.EPOCH)) {
+					errorHandler
+							.handleError(new SpecfileParseException(
+									Messages.getString("SpecfileParser.16"), lineNumber, //$NON-NLS-1$
+									0, lineText.length(),
+									IMarker.SEVERITY_ERROR));
+					toReturn = null;
+				}
+			}
+		}
+		return toReturn;
+	}
+
+	private SpecfileElement parseDirectDefinition(String lineText,
+			Specfile specfile, int lineNumber) {
+		String[] parts = lineText.split(DEFINE_SEPARATOR, 2);
+		SpecfileTag directDefinition;
+		if (parts.length == 2) {
+			directDefinition = new SpecfileTag(parts[0], parts[1].trim(),
+					specfile, activePackage);
+			directDefinition.setLineNumber(lineNumber);
+		} else {
+			errorHandler.handleError(new SpecfileParseException(parts[0]
+					+ Messages.getString("SpecfileParser.14"), lineNumber, //$NON-NLS-1$
+					0, lineText.length(), IMarker.SEVERITY_ERROR));
+			directDefinition = null;
+		}
+		return directDefinition;
+	}
+
+	public void setErrorHandler(SpecfileErrorHandler specfileErrorHandler) {
+		errorHandler = specfileErrorHandler;
+	}
+
+	public void setTaskHandler(SpecfileTaskHandler specfileTaskHandler) {
+		taskHandler = specfileTaskHandler;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePatchMacro.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePatchMacro.java
new file mode 100644
index 0000000..8a023c5
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePatchMacro.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.parser;
+
+import java.text.MessageFormat;
+
+public class SpecfilePatchMacro extends SpecfileMacro {
+	private int patchNumber;
+	private int patchLevel;
+	// TODO:  add patchLevel functionality
+	public SpecfilePatchMacro(int patchNumber) {
+		super();
+		this.patchNumber = patchNumber;
+//		this.patchLevel = patchLevel;
+	}
+	public int getPatchLevel() {
+		return patchLevel;
+	}
+	public void setPatchLevel(int patchLevel) {
+		this.patchLevel = patchLevel;
+	}
+	public int getPatchNumber() {
+		return patchNumber;
+	}
+	public void setPatchNumber(int patchNumber) {
+		this.patchNumber = patchNumber;
+	}
+	@Override
+	public String toString() {
+		return MessageFormat.format("patch #{0} at level {1}", patchNumber, patchLevel); //$NON-NLS-1$
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePreamble.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePreamble.java
new file mode 100644
index 0000000..8481157
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfilePreamble.java
@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.parser;
+
+public class SpecfilePreamble extends SpecfileElement {
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileSection.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileSection.java
new file mode 100644
index 0000000..49de0e9
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileSection.java
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.parser;
+
+import java.text.MessageFormat;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+
+public class SpecfileSection extends SpecfileElement {
+
+	private SpecfilePackage parentPackage;
+	private int sectionEndLine;
+
+	public SpecfileSection(String name, Specfile specfile) {
+		super(name);
+		parentPackage = null;
+		super.setSpecfile(specfile);
+	}
+
+	public SpecfilePackage getPackage() {
+		return parentPackage;
+	}
+
+	public void setPackage(SpecfilePackage thePackage) {
+		this.parentPackage = thePackage;
+	}
+
+	@Override
+	public String toString() {
+		if (parentPackage == null) {
+			return getName();
+		} else {
+			return MessageFormat.format("{0} {1}", getName(), parentPackage); //$NON-NLS-1$
+		}
+	}
+
+	public String getPackageName() {
+		return parentPackage.getPackageName();
+	}
+
+	/**
+	 * @param sectionEnd
+	 *            the sectionEnd to set
+	 */
+	public void setSectionEndLine(int sectionEnd) {
+		this.sectionEndLine = sectionEnd;
+	}
+
+	/**
+	 * @return the sectionEnd
+	 */
+	public int getSectionEndLine() {
+		return sectionEndLine;
+	}
+
+	public String getContents() {
+		IDocument document = getSpecfile().getDocument();
+		int beginning = getLineStartPosition();
+		try {
+		int end = document.getLineOffset(getSectionEndLine());
+			return document.get(beginning, end-beginning);
+		} catch (BadLocationException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return ""; //$NON-NLS-1$
+	}
+
+	public void setContents(String newContent) {
+		// TODO Modify document to change the contents
+		
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileSource.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileSource.java
new file mode 100644
index 0000000..0d98290
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileSource.java
@@ -0,0 +1,128 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.parser;
+
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileLog;
+
+public class SpecfileSource extends SpecfileElement {
+	int number;
+	int lineNumber = -1;
+	String fileName;
+	public enum SourceType { SOURCE, PATCH}
+	SourceType sourceType;
+	List<Integer> linesUsed;
+	
+	public SourceType getSourceType() {
+		return sourceType;
+	}
+	public void setSourceType(SourceType sourceType) {
+		this.sourceType = sourceType;
+	}
+	public SpecfileSource(int number, String fileName) {
+		super("source"); //$NON-NLS-1$
+		this.number = number;
+		this.fileName = fileName;
+		this.linesUsed = new ArrayList<Integer>();
+	}
+	public String getFileName() {
+		return resolve(fileName);
+	}
+	public void setFileName(String fileName) {
+		this.fileName = fileName;
+	}
+	public int getNumber() {
+		return number;
+	}
+	public void setNumber(int number) {
+		this.number = number;
+	}
+	public void addLineUsed(int lineNumber) {
+		linesUsed.add(Integer.valueOf(lineNumber));
+	}
+	public void removeLineUsed(int lineNumber) {
+		linesUsed.remove(Integer.valueOf(lineNumber));
+	}
+	public List<Integer> getLinesUsed() {
+		return linesUsed;
+	}
+	@Override
+	public String toString() {
+		if (sourceType == SourceType.SOURCE)
+			return MessageFormat.format(
+					"Source #{0} (line #{1}, used on lines {2}) -> {3}", //$NON-NLS-1$
+					number, lineNumber, getLinesUsed(), fileName);
+		return MessageFormat.format(
+				"Patch #{0} (line #{1}, used on lines {2}) -> {3}", number, //$NON-NLS-1$
+				lineNumber, getLinesUsed(), fileName);
+	}
+	
+	// Note that changeReferences assumes that the number of the source/patch
+	// has *already been set*.  If this is not true, it will simply do nothing
+	public void changeReferences(int oldPatchNumber) {
+		Specfile specfile = this.getSpecfile();
+		Pattern patchPattern;
+		if (oldPatchNumber == 0) {
+			patchPattern = Pattern.compile("%patch" + oldPatchNumber + "|%patch"); //$NON-NLS-1$ //$NON-NLS-2$
+		} else {
+			patchPattern = Pattern.compile("%patch" + oldPatchNumber); //$NON-NLS-1$
+		}
+		for (int lineNumber: getLinesUsed()){
+			String line;
+			try {
+				line = specfile.getLine(lineNumber);
+				Matcher patchMatcher = patchPattern.matcher(line);
+				if (!patchMatcher.find()) {
+					System.out.println(Messages.getString("SpecfileSource.0") + patchPattern.pattern()); //$NON-NLS-1$
+//					throw new BadLocationException("can't match " + patchPattern);
+				}
+				specfile.changeLine(lineNumber, line.replaceAll(patchPattern.pattern(), Messages.getString("SpecfileSource.1") + number)); //$NON-NLS-1$
+			} catch (BadLocationException e) {
+				SpecfileLog.logError(e);
+			}
+		}
+	}
+	public void changeDeclaration(int oldPatchNumber) {
+		Specfile specfile = this.getSpecfile();
+		Pattern patchPattern;
+		if (oldPatchNumber == 0) {
+			patchPattern = Pattern.compile("Patch" + oldPatchNumber + "|Patch"); //$NON-NLS-1$ //$NON-NLS-2$
+		} else {
+			patchPattern = Pattern.compile("Patch" + oldPatchNumber); //$NON-NLS-1$
+		}
+		String line;
+		try {
+			line = specfile.getLine(lineNumber);
+			Matcher patchMatcher = patchPattern.matcher(line);
+			if (!patchMatcher.find())
+				// TODO: Maybe we can throw a exception here.
+				System.out.println(Messages.getString("SpecfileSource.2") + patchPattern.pattern()); //$NON-NLS-1$
+			specfile.changeLine(lineNumber, line.replaceAll(patchPattern.pattern(), "Patch" + number)); //$NON-NLS-1$
+		} catch (BadLocationException e) {
+			SpecfileLog.logError(e);
+		}
+	}
+	@Override
+	public int getLineNumber() {
+		return lineNumber;
+	}
+	@Override
+	public void setLineNumber(int lineNumber) {
+		this.lineNumber = lineNumber;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileTag.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileTag.java
new file mode 100644
index 0000000..2f033e5
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/SpecfileTag.java
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.parser;
+
+
+public class SpecfileTag extends SpecfileElement {
+	
+	public enum TagType { INT, STRING}
+	TagType tagType;
+	
+	String stringValue;
+	int intValue;
+	SpecfilePackage parent;
+	
+
+	public SpecfileTag(){
+		// Empty constructor
+	}
+	
+	public SpecfileTag(String name, String value, Specfile specfile, SpecfilePackage parentPackage) {
+		setName(name);
+		this.stringValue = value;
+		this.tagType = TagType.STRING;
+		super.setSpecfile(specfile);
+		this.parent=parentPackage;
+	}
+	
+	public SpecfileTag(String name, int value, Specfile specfile, SpecfilePackage parentPackage) {
+		setName(name);
+		this.intValue = value;
+		this.tagType = TagType.INT;
+		super.setSpecfile(specfile);
+		this.parent=parentPackage;
+	}
+	
+	public String getStringValue() {
+		if (tagType == TagType.INT) {
+			return Integer.toString(intValue);
+		}
+		return resolve(stringValue);
+	}
+	public void setValue(String value) {
+		this.tagType = TagType.STRING;
+		this.stringValue = value;
+	}
+	
+	public int getIntValue() {
+		return intValue;
+	}
+	
+	public void setValue(int value) {
+		this.tagType = TagType.INT;
+		this.intValue = value;
+	}
+	
+	public SpecfilePackage getParent() {
+		return parent;
+	}
+	
+	public void setParent(SpecfilePackage parent) {
+		this.parent = parent;
+	}
+	
+	@Override
+	public String toString() {
+		if (tagType == TagType.INT) {
+			return getName() + ": " + getIntValue(); //$NON-NLS-1$
+		}
+		String tagValue = getStringValue();
+		if ((tagValue != null) && (tagValue.length() > 0) && (tagValue.indexOf('%') > 0)) { 
+			return getName() + ": " + super.resolve(tagValue); //$NON-NLS-1$
+		}
+		return getName() + ": " + getStringValue(); //$NON-NLS-1$
+	}
+
+	public TagType getTagType() {
+		return tagType;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/messages.properties b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/messages.properties
new file mode 100644
index 0000000..4881942
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/parser/messages.properties
@@ -0,0 +1,27 @@
+###############################################################################
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+SpecfileParser.1=No package name after -n in 
+SpecfileParser.10=Invalid patch directive.
+SpecfileParser.11=Invalid source directive.
+SpecfileParser.12=Filename cannot be multiple words.
+SpecfileParser.13=\ cannot have multiple values.
+SpecfileParser.14=\ declaration without value.
+SpecfileParser.15=Release should not contain an underscore.
+SpecfileParser.16=Epoch cannot have non-integer value.
+SpecfileParser.2=\ section.
+SpecfileParser.3=Package name must not start with '-': 
+SpecfileParser.4=.
+SpecfileParser.5=Patch number be an integer.
+SpecfileParser.6=Definition lvalue must begin with a letter or an underscore.
+SpecfileParser.8=If this is a Source or Patch directive, it must end with a colon.
+SpecfileSource.0=error:  can't match 
+SpecfileSource.1=%patch
+SpecfileSource.2=error: can't match 
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/MacroProposalsPreferencePage.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/MacroProposalsPreferencePage.java
new file mode 100644
index 0000000..cb26d89
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/MacroProposalsPreferencePage.java
@@ -0,0 +1,427 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * Copyright (c) 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *    Wind River Systems, Inc - compile fixes
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.preferences;
+
+import java.util.ArrayList;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.jface.preference.ListEditor;
+import org.eclipse.jface.preference.RadioGroupFieldEditor;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.linuxtools.rpm.ui.editor.Activator;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.List;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Widget;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+/**
+ * RPM macro proposals and hover preference page class.
+ * 
+ */
+public class MacroProposalsPreferencePage extends FieldEditorPreferencePage
+		implements IWorkbenchPreferencePage {
+
+	public MacroProposalsPreferencePage() {
+		super(FLAT);
+		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+	}
+
+	public void init(IWorkbench workbench) {
+	}
+
+	@Override
+	protected void createFieldEditors() {
+		ListEditor macroListEditor = new MacroListEditor(
+				PreferenceConstants.P_MACRO_PROPOSALS_FILESPATH,
+				Messages.MacroProposalsPreferencePage_0, getFieldEditorParent());
+		addField(macroListEditor);
+		RadioGroupFieldEditor macroHoverListEditor = new RadioGroupFieldEditor(
+				PreferenceConstants.P_MACRO_HOVER_CONTENT,
+				Messages.MacroProposalsPreferencePage_1,
+				1,
+				new String[][] {
+						{
+								Messages.MacroProposalsPreferencePage_2,
+								PreferenceConstants.P_MACRO_HOVER_CONTENT_VIEWDESCRIPTION },
+						{
+								Messages.MacroProposalsPreferencePage_3,
+								PreferenceConstants.P_MACRO_HOVER_CONTENT_VIEWCONTENT } },
+				getFieldEditorParent(), true);
+		addField(macroHoverListEditor);
+	}
+
+	class MacroListEditor extends ListEditor {
+
+		/**
+		 * The list widget; <code>null</code> if none (before creation or
+		 * after disposal).
+		 */
+		private List list;
+
+		/**
+		 * The button box containing the Add, Remove, Up, and Down buttons;
+		 * <code>null</code> if none (before creation or after disposal).
+		 */
+		private Composite buttonBox;
+
+		/**
+		 * The Add file button.
+		 */
+		private Button addFileButton;
+		
+		/**
+		 * The Add button.
+		 */
+		private Button addDirButton;
+
+		/**
+		 * The Remove button.
+		 */
+		private Button removeButton;
+
+		/**
+		 * The Up button.
+		 */
+		private Button upButton;
+
+		/**
+		 * The Down button.
+		 */
+		private Button downButton;
+
+		/**
+		 * The selection listener.
+		 */
+		private SelectionListener selectionListener;
+
+		public MacroListEditor(String name, String labelText, Composite parent) {
+			super();
+			init(name, labelText);
+			createControl(parent);
+			list = getListControl(parent);
+		}
+
+		@Override
+		protected String createList(String[] items) {
+			StringBuilder path = new StringBuilder(""); //$NON-NLS-1$
+			for (String item:items) {
+				path.append(item);
+				path.append(";"); //$NON-NLS-1$
+			}
+			return path.toString();
+		}
+
+		@Override
+		protected String getNewInputObject() {
+			FileDialog dialog = new FileDialog(getShell());
+			return dialog.open();
+		}
+		
+		protected String getNewDirInputObject() {
+			DirectoryDialog dialog = new DirectoryDialog(getShell());
+			return dialog.open();
+		}
+
+		@Override
+		protected String[] parseString(String stringList) {
+			StringTokenizer st = new StringTokenizer(stringList, ";\n\r"); //$NON-NLS-1$
+			ArrayList<String> v = new ArrayList<String>();
+			while (st.hasMoreTokens()) {
+				v.add(st.nextToken());
+			}
+			return v.toArray(new String[v.size()]);
+		}
+
+		/**
+		 * Notifies that the Add button has been pressed.
+		 */
+		private void addFilePressed() {
+			setPresentsDefaultValue(false);
+			String input = getNewInputObject();
+
+			if (input != null) {
+				int index = list.getSelectionIndex();
+				if (index >= 0) {
+					list.add(input, index + 1);
+				} else {
+					list.add(input, 0);
+				}
+				selectionChanged();
+			}
+		}
+		
+		/**
+		 * Notifies that the Add button has been pressed.
+		 */
+		private void addDirPressed() {
+			setPresentsDefaultValue(false);
+			String input = getNewDirInputObject();
+
+			if (input != null) {
+				int index = list.getSelectionIndex();
+				if (index >= 0) {
+					list.add(input, index + 1);
+				} else {
+					list.add(input, 0);
+				}
+				selectionChanged();
+			}
+		}
+
+		/**
+		 * Creates the Add, Remove, Up, and Down button in the given button box.
+		 * 
+		 * @param box
+		 *            the box for the buttons
+		 */
+		private void createButtons(Composite box) {
+			addFileButton = createPushButton(box, Messages.MacroProposalsPreferencePage_4);
+			addDirButton = createPushButton(box, Messages.MacroProposalsPreferencePage_5);
+			removeButton = createPushButton(box, "ListEditor.remove");//$NON-NLS-1$
+			upButton = createPushButton(box, "ListEditor.up");//$NON-NLS-1$
+			downButton = createPushButton(box, "ListEditor.down");//$NON-NLS-1$
+		}
+
+		/**
+		 * Helper method to create a push button.
+		 * 
+		 * @param parent
+		 *            the parent control
+		 * @param key
+		 *            the resource name used to supply the button's label text
+		 * @return Button
+		 */
+		private Button createPushButton(Composite parent, String key) {
+			Button button = new Button(parent, SWT.PUSH);
+			button.setText(JFaceResources.getString(key));
+			button.setFont(parent.getFont());
+			GridData data = new GridData(GridData.FILL_HORIZONTAL);
+			int widthHint = convertHorizontalDLUsToPixels(button,
+					IDialogConstants.BUTTON_WIDTH);
+			data.widthHint = Math.max(widthHint, button.computeSize(
+					SWT.DEFAULT, SWT.DEFAULT, true).x);
+			button.setLayoutData(data);
+			button.addSelectionListener(getSelectionListener());
+			return button;
+		}
+
+		/**
+		 * Creates a selection listener.
+		 */
+		@Override
+		public void createSelectionListener() {
+			selectionListener = new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent event) {
+					Widget widget = event.widget;
+					if (widget == addFileButton) {
+						addFilePressed();
+					} else if (widget == addDirButton) {
+						addDirPressed();
+					}else if (widget == removeButton) {
+						removePressed();
+					} else if (widget == upButton) {
+						upPressed();
+					} else if (widget == downButton) {
+						downPressed();
+					} else if (widget == list) {
+						selectionChanged();
+					}
+				}
+			};
+		}
+
+		/**
+		 * Notifies that the Down button has been pressed.
+		 */
+		private void downPressed() {
+			swap(false);
+		}
+
+		/**
+		 * Returns this field editor's button box containing the Add, Remove,
+		 * Up, and Down button.
+		 * 
+		 * @param parent The parent control
+		 * @return the button box
+		 */
+		@Override
+		public Composite getButtonBoxControl(Composite parent) {
+			if (buttonBox == null) {
+				buttonBox = new Composite(parent, SWT.NULL);
+				GridLayout layout = new GridLayout();
+				layout.marginWidth = 0;
+				buttonBox.setLayout(layout);
+				createButtons(buttonBox);
+				buttonBox.addDisposeListener(new DisposeListener() {
+					public void widgetDisposed(DisposeEvent event) {
+						addFileButton = null;
+						addDirButton = null;
+						removeButton = null;
+						upButton = null;
+						downButton = null;
+						buttonBox = null;
+					}
+				});
+
+			} else {
+				checkParent(buttonBox, parent);
+			}
+
+			selectionChanged();
+			return buttonBox;
+		}
+
+		/**
+		 * Returns this field editor's list control.
+		 * 
+		 * @param parent The parent control
+		 * @return the list control
+		 */
+		@Override
+		public final List getListControl(Composite parent) {
+			if (list == null) {
+				list = new List(parent, SWT.BORDER | SWT.SINGLE | SWT.V_SCROLL
+						| SWT.H_SCROLL);
+				list.setFont(parent.getFont());
+				list.addSelectionListener(getSelectionListener());
+				list.addDisposeListener(new DisposeListener() {
+					public void widgetDisposed(DisposeEvent event) {
+						list = null;
+					}
+				});
+			} else {
+				checkParent(list, parent);
+			}
+			return list;
+		}
+
+		/**
+		 * Returns this field editor's selection listener. The listener is
+		 * created if nessessary.
+		 * 
+		 * @return the selection listener
+		 */
+		private SelectionListener getSelectionListener() {
+			if (selectionListener == null) {
+				createSelectionListener();
+			}
+			return selectionListener;
+		}
+
+		/**
+		 * Returns this field editor's shell.
+		 * <p>
+		 * This method is internal to the framework; subclassers should not call
+		 * this method.
+		 * </p>
+		 * 
+		 * @return the shell
+		 */
+		@Override
+		protected Shell getShell() {
+			if (addFileButton == null) {
+				return null;
+			}
+			return addFileButton.getShell();
+		}
+
+		/**
+		 * Notifies that the Remove button has been pressed.
+		 */
+		private void removePressed() {
+			setPresentsDefaultValue(false);
+			int index = list.getSelectionIndex();
+			if (index >= 0) {
+				list.remove(index);
+				selectionChanged();
+			}
+		}
+
+		/**
+		 * Notifies that the list selection has changed.
+		 */
+		@Override
+		protected void selectionChanged() {
+
+			int index = list.getSelectionIndex();
+			int size = list.getItemCount();
+
+			removeButton.setEnabled(index >= 0);
+			upButton.setEnabled(size > 1 && index > 0);
+			downButton.setEnabled(size > 1 && index >= 0 && index < size - 1);
+		}
+
+		/**
+		 * Moves the currently selected item up or down.
+		 * 
+		 * @param up
+		 *            <code>true</code> if the item should move up, and
+		 *            <code>false</code> if it should move down
+		 */
+		private void swap(boolean up) {
+			setPresentsDefaultValue(false);
+			int index = list.getSelectionIndex();
+			int target = up ? index - 1 : index + 1;
+
+			if (index >= 0) {
+				String[] selection = list.getSelection();
+				Assert.isTrue(selection.length == 1);
+				list.remove(index);
+				list.add(selection[0], target);
+				list.setSelection(target);
+			}
+			selectionChanged();
+		}
+
+		/**
+		 * Notifies that the Up button has been pressed.
+		 */
+		private void upPressed() {
+			swap(true);
+		}
+
+		/*
+		 * @see FieldEditor.setEnabled(boolean,Composite).
+		 */
+		@Override
+		public void setEnabled(boolean enabled, Composite parent) {
+			super.setEnabled(enabled, parent);
+			getListControl(parent).setEnabled(enabled);
+			addFileButton.setEnabled(enabled);
+			addDirButton.setEnabled(enabled);
+			removeButton.setEnabled(enabled);
+			upButton.setEnabled(enabled);
+			downButton.setEnabled(enabled);
+		}
+
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/MainPreferencePage.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/MainPreferencePage.java
new file mode 100644
index 0000000..f987682
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/MainPreferencePage.java
@@ -0,0 +1,143 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.preferences;
+
+import java.util.Locale;
+
+import org.eclipse.jface.preference.BooleanFieldEditor;
+import org.eclipse.jface.preference.FieldEditor;
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.jface.preference.IntegerFieldEditor;
+import org.eclipse.jface.preference.RadioGroupFieldEditor;
+import org.eclipse.linuxtools.rpm.ui.editor.Activator;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.eclipse.ui.dialogs.PreferencesUtil;
+
+
+/**
+ * Specfile editor main preference page class.
+ *
+ */
+public class MainPreferencePage extends FieldEditorPreferencePage implements
+		IWorkbenchPreferencePage {
+	
+	private Combo combo;
+	
+	private int defaultItem;
+	
+	/**
+	 * default constructor
+	 */
+	public MainPreferencePage() {
+		super(GRID);
+		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+		//setDescription("Main preference page for Specfile Plug-in editor");
+	}
+
+	private FieldEditor changelogEntryFormatFieldEditor(Composite parent) { 
+		RadioGroupFieldEditor changelogEntryFormatRadioGroupEditor = new RadioGroupFieldEditor(
+				PreferenceConstants.P_CHANGELOG_ENTRY_FORMAT,
+				Messages.MainPreferencePage_2, 1, new String[][] {
+						{ Messages.MainPreferencePage_3, PreferenceConstants.P_CHANGELOG_ENTRY_FORMAT_VERSIONED },
+						{ Messages.MainPreferencePage_4, PreferenceConstants.P_CHANGELOG_ENTRY_FORMAT_VERSIONED_WITH_SEPARATOR},
+						{ Messages.MainPreferencePage_5, PreferenceConstants.P_CHANGELOG_ENTRY_FORMAT_UNVERSIONED }}, parent, true);
+		return changelogEntryFormatRadioGroupEditor;
+	}		
+	
+	private void createLocalesCombo(Composite parent) {
+		combo = new Combo(parent, SWT.DROP_DOWN | SWT.READ_ONLY |SWT.BEGINNING);
+		// populate the combo with all ISO countries
+		int selectedItem = 0;
+		String lastLocale = getPreferenceStore().getString(PreferenceConstants.P_CHANGELOG_LOCAL);
+		String[] countries = Locale.getISOCountries();
+		for (int i = 0; i < countries.length; i++) {
+				Locale currentLocale = new Locale(countries[i]);
+				combo.add(countries[i] + " - " + currentLocale.getDisplayLanguage()); //$NON-NLS-1$
+				// get index of the Locale store in the preferences
+				if (countries[i].equals(lastLocale))
+					selectedItem = i;
+				// get the index of the default Locale
+				if (countries[i].equals(PreferenceConstants.DP_CHANGELOG_LOCAL))
+					defaultItem = i;
+		}
+		combo.select(selectedItem);
+		// update preferences
+		combo.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				Combo combo = (Combo) e.getSource();
+				getPreferenceStore().setValue(
+						PreferenceConstants.P_CHANGELOG_LOCAL,
+						combo.getText().split("-")[0].trim()); //$NON-NLS-1$
+			}
+		});
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors()
+	 */
+	@Override
+	public void createFieldEditors() {
+		GridData data = new GridData();
+		data.horizontalSpan = 2;
+		final Composite parent = getFieldEditorParent();
+		Link link= new Link(parent, SWT.NONE);
+		link.setText(Messages.MainPreferencePage_0);
+		link.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				PreferencesUtil.createPreferenceDialogOn(parent.getShell() , e.text, null, null); 
+			}
+		});
+		addField(changelogEntryFormatFieldEditor(parent));
+		Label labelLocal = new Label(parent, SWT.NONE);
+		labelLocal.setText(Messages.MainPreferencePage_1);
+		
+		labelLocal.setLayoutData(data);
+		createLocalesCombo(parent);
+		addField(new BooleanFieldEditor(PreferenceConstants.P_SPACES_FOR_TABS,
+				Messages.MainPreferencePage_6, parent));
+		Composite numEditorComp = new Composite(parent, SWT.NONE);
+		IntegerFieldEditor numEditor = new IntegerFieldEditor(
+				PreferenceConstants.P_NBR_OF_SPACES_FOR_TAB,
+				Messages.MainPreferencePage_7, numEditorComp, 1);
+		addField(numEditor);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
+	 */
+	public void init(IWorkbench workbench) {
+
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.FieldEditorPreferencePage#performDefaults()
+	 */
+	@Override
+	protected void performDefaults() {
+		super.performDefaults();
+		combo.select(defaultItem);
+		getPreferenceStore().setValue(PreferenceConstants.P_CHANGELOG_LOCAL, PreferenceConstants.DP_CHANGELOG_LOCAL);
+		getPreferenceStore().setValue(PreferenceConstants.P_CHANGELOG_ENTRY_FORMAT, PreferenceConstants.DP_CHANGELOG_ENTRY_FORMAT);
+	}
+	
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/Messages.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/Messages.java
new file mode 100644
index 0000000..c1085d6
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/Messages.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.preferences;
+
+import org.eclipse.osgi.util.NLS;
+
+public final class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.rpm.ui.editor.preferences.messages"; //$NON-NLS-1$
+	public static String MacroProposalsPreferencePage_0;
+	public static String MacroProposalsPreferencePage_1;
+	public static String MacroProposalsPreferencePage_2;
+	public static String MacroProposalsPreferencePage_3;
+	public static String MacroProposalsPreferencePage_4;
+	public static String MacroProposalsPreferencePage_5;
+	public static String MainPreferencePage_0;
+	public static String MainPreferencePage_1;
+	public static String MainPreferencePage_2;
+	public static String MainPreferencePage_3;
+	public static String MainPreferencePage_4;
+	public static String MainPreferencePage_5;
+	public static String MainPreferencePage_6;
+	public static String MainPreferencePage_7;
+	public static String RpmInformationsPreferencePage_0;
+	public static String RpmInformationsPreferencePage_1;
+	public static String RpmInformationsPreferencePage_2;
+	public static String RpmInformationsPreferencePage_3;
+	public static String RpmInformationsPreferencePage_4;
+	public static String RpmInformationsPreferencePage_5;
+	public static String RpmInformationsPreferencePage_6;
+	public static String RpmInformationsPreferencePage_7;
+	public static String RpmProposalsPreferencePage_0;
+	public static String RpmProposalsPreferencePage_1;
+	public static String RpmProposalsPreferencePage_10;
+	public static String RpmProposalsPreferencePage_12;
+	public static String RpmProposalsPreferencePage_2;
+	public static String RpmProposalsPreferencePage_3;
+	public static String RpmProposalsPreferencePage_4;
+	public static String RpmProposalsPreferencePage_5;
+	public static String RpmProposalsPreferencePage_6;
+	public static String RpmProposalsPreferencePage_7;
+	public static String RpmProposalsPreferencePage_8;
+	public static String TaskTagsPreferencePage_0;
+	public static String TaskTagsPreferencePage_1;
+	public static String TaskTagsPreferencePage_2;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+		super();
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/PreferenceConstants.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/PreferenceConstants.java
new file mode 100644
index 0000000..5b98725
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/PreferenceConstants.java
@@ -0,0 +1,118 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.preferences;
+
+/**
+ * Constant definitions for plug-in preferences
+ */
+public final class PreferenceConstants {
+
+	/*
+	 * Other Constant
+	 */
+	public static final String RPMMACRO_FILE = System.getProperty("user.home") + "/.rpmmacros"; //$NON-NLS-1$//$NON-NLS-2$
+
+	/*
+	 * Prefences keys
+	 */
+
+	// rpm list builder
+	public static final String P_RPM_LIST_FILEPATH = "rpmListFilePath"; //$NON-NLS-1$
+	public static final String P_RPM_LIST_MAX_PROPOSALS = "rpmListMaxProposalsInfo"; //$NON-NLS-1$
+	public static final String P_CURRENT_RPMTOOLS = "currentRpmtools"; //$NON-NLS-1$
+	public static final String P_RPM_LIST_BACKGROUND_BUILD = "rpmListBackgroundBuild"; //$NON-NLS-1$
+	public static final String P_RPM_LIST_BUILD_PERIOD = "rpmListBuildPeriod"; //$NON-NLS-1$
+	public static final String P_RPM_LIST_LAST_BUILD = "rpmLisMastBuild"; //$NON-NLS-1$
+	// macro
+	public static final String P_MACRO_PROPOSALS_FILESPATH = "macroProposalsFilespath"; //$NON-NLS-1$
+	public static final String P_MACRO_HOVER_CONTENT_VIEWCONTENT = "macroHoverViewContent"; //$NON-NLS-1$
+	public static final String P_MACRO_HOVER_CONTENT_VIEWDESCRIPTION = "macroHoverViewDescription"; //$NON-NLS-1$
+	public static final String P_MACRO_HOVER_CONTENT = P_MACRO_HOVER_CONTENT_VIEWCONTENT;
+	// changelog
+	public static final String P_CHANGELOG_LOCAL = "changelogLocal"; //$NON-NLS-1$
+
+	public static final String P_CHANGELOG_ENTRY_FORMAT = "changelogEntryFormat"; //$NON-NLS-1$
+	public static final String P_CHANGELOG_ENTRY_FORMAT_VERSIONED = "1"; //$NON-NLS-1$
+	public static final String P_CHANGELOG_ENTRY_FORMAT_VERSIONED_WITH_SEPARATOR = "2"; //$NON-NLS-1$
+	public static final String P_CHANGELOG_ENTRY_FORMAT_UNVERSIONED = "3"; //$NON-NLS-1$
+
+	// RPM informations
+	public static final String P_RPMINFO_NAME = "RpmInfoName"; //$NON-NLS-1$
+	public static final String P_RPMINFO_VERSION = "RpmInfoVersion"; //$NON-NLS-1$
+	public static final String P_RPMINFO_RELEASE = "RpmInfoRelease"; //$NON-NLS-1$
+	public static final String P_RPMINFO_SUMMARY = "RpmInfoSummary"; //$NON-NLS-1$
+	public static final String P_RPMINFO_LICENSE = "RpmInfoLicense"; //$NON-NLS-1$
+	public static final String P_RPMINFO_GROUP = "RpmInfoName"; //$NON-NLS-1$
+	public static final String P_RPMINFO_URL = "RpmInfoUrl"; //$NON-NLS-1$
+	public static final String P_RPMINFO_DESCRIPTION = "RpmInfoDescription"; //$NON-NLS-1$
+	public static final String P_RPMINFO_INSTALLTIME = "RpmInfoInstallDate"; //$NON-NLS-1$
+	public static final String P_RPMINFO_SIZE = "RpmInfoSize"; //$NON-NLS-1$
+	public static final String P_RPMINFO_PACKAGER = "RpmInfoPackager"; //$NON-NLS-1$
+	public static final String P_RPMINFO_VENDOR = "RpmInfoVendor"; //$NON-NLS-1$
+	public static final String P_RPMINFO_BUILDTIME = "RpmInfoBuildDate"; //$NON-NLS-1$
+	public static final String P_RPMINFO_SOURCERPM = "RpmInfoSourceRpm"; //$NON-NLS-1$
+	public static final String P_TASK_TAGS = "RpmSpecTaskTags"; //$NON-NLS-1$
+	// Convert tab by spaces
+	public static final String P_SPACES_FOR_TABS = "SpacesForTabs"; //$NON-NLS-1$
+	public static final String P_NBR_OF_SPACES_FOR_TAB = "NbrOfSpacesForTab"; //$NON-NLS-1$
+
+	/*
+	 * Preferences default values
+	 */
+
+	public static final String DP_RPM_LIST_FILEPATH = System
+			.getProperty("user.dir") + "/.pkglist"; //$NON-NLS-1$ //$NON-NLS-2$
+	public static final String DP_RPM_LIST_MAX_PROPOSALS = "10"; //$NON-NLS-1$
+	public static final String DP_RPMTOOLS_RPM = "rpm -qa --qf '%{NAME}\\n'"; //$NON-NLS-1$
+	public static final String DP_RPMTOOLS_YUM = "yum -C list all | grep - | cut -d \".\" -f 1"; //$NON-NLS-1$
+	public static final String DP_RPMTOOLS_URPM = "urpmq --list"; //$NON-NLS-1$
+	// public static final String DP_RPM_LIST_HIDE_PROPOSALS_WARNING = "false";
+	public static final boolean DP_RPM_LIST_BACKGROUND_BUILD = true;
+	public static final int DP_RPM_LIST_BUILD_PERIOD = 1;
+	// public static final String DP_RPM_LIST_LAST_BUILD = "";
+
+	// macro
+	public static final String DP_MACRO_PROPOSALS_FILESPATH = RPMMACRO_FILE
+			+ ";/usr/lib/rpm/macros"; //$NON-NLS-1$
+	// changelog
+	public static final String DP_CHANGELOG_LOCAL = "US"; //$NON-NLS-1$
+	public static final String DP_CHANGELOG_ENTRY_FORMAT = P_CHANGELOG_ENTRY_FORMAT_VERSIONED;
+	// task tags
+	public static final String DP_TASK_TAGS = "TODO;FIXME"; //$NON-NLS-1$
+
+	// Convert tab by spaces
+	public static final boolean DP_SPACES_FOR_TABS = false;
+	public static final String DP_NBR_OF_SPACES_FOR_TAB = "4"; //$NON-NLS-1$
+
+	// RPM informations
+	public static final boolean DP_RPMINFO_NAME = true;
+	public static final boolean DP_RPMINFO_VERSION = true;
+	public static final boolean DP_RPMINFO_RELEASE = true;
+	public static final boolean DP_RPMINFO_SUMMARY = true;
+	public static final boolean DP_RPMINFO_LICENSE = true;
+	public static final boolean DP_RPMINFO_GROUP = true;
+	public static final boolean DP_RPMINFO_URL = true;
+	public static final boolean DP_RPMINFO_DESCRIPTION = false;
+	public static final boolean DP_RPMINFO_INSTALLTIME = true;
+	public static final boolean DP_RPMINFO_SIZE = true;
+	public static final boolean DP_RPMINFO_PACKAGER = false;
+	public static final boolean DP_RPMINFO_VENDOR = true;
+	public static final boolean DP_RPMINFO_BUILDTIME = true;
+	public static final boolean DP_RPMINFO_SOURCERPM = true;
+
+	public static final long DP_RPM_LIST_LAST_BUILD = 0;
+	
+	private PreferenceConstants(){
+		super();
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/PreferenceInitializer.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/PreferenceInitializer.java
new file mode 100644
index 0000000..b5be8f2
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/PreferenceInitializer.java
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.preferences;
+
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.linuxtools.rpm.ui.editor.Activator;
+
+/**
+ * Class used to initialize default preference values.
+ */
+public class PreferenceInitializer extends AbstractPreferenceInitializer {
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @seeorg.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#
+	 * initializeDefaultPreferences()
+	 */
+	@Override
+	public void initializeDefaultPreferences() {
+		IPreferenceStore store = Activator.getDefault().getPreferenceStore();
+		store.setDefault(PreferenceConstants.P_CURRENT_RPMTOOLS,
+				PreferenceConstants.DP_RPMTOOLS_RPM);
+		store.setDefault(PreferenceConstants.P_RPM_LIST_FILEPATH,
+				PreferenceConstants.DP_RPM_LIST_FILEPATH);
+		store.setDefault(PreferenceConstants.P_RPM_LIST_MAX_PROPOSALS,
+				PreferenceConstants.DP_RPM_LIST_MAX_PROPOSALS);
+		store.setDefault(PreferenceConstants.P_RPM_LIST_BACKGROUND_BUILD,
+				PreferenceConstants.DP_RPM_LIST_BACKGROUND_BUILD);
+		store.setDefault(PreferenceConstants.P_RPM_LIST_BUILD_PERIOD,
+				PreferenceConstants.DP_RPM_LIST_BUILD_PERIOD);
+		store.setDefault(PreferenceConstants.P_MACRO_PROPOSALS_FILESPATH,
+				PreferenceConstants.DP_MACRO_PROPOSALS_FILESPATH);
+		store.setDefault(PreferenceConstants.P_CHANGELOG_LOCAL,
+				PreferenceConstants.DP_CHANGELOG_LOCAL);
+		store.setDefault(PreferenceConstants.P_CHANGELOG_ENTRY_FORMAT,
+				PreferenceConstants.DP_CHANGELOG_ENTRY_FORMAT);
+		store.setDefault(PreferenceConstants.P_MACRO_HOVER_CONTENT,
+				PreferenceConstants.P_MACRO_HOVER_CONTENT_VIEWDESCRIPTION);
+		store.setDefault(PreferenceConstants.P_RPMINFO_NAME,
+				PreferenceConstants.DP_RPMINFO_NAME);
+		store.setDefault(PreferenceConstants.P_RPMINFO_VERSION,
+				PreferenceConstants.DP_RPMINFO_VERSION);
+		store.setDefault(PreferenceConstants.P_RPMINFO_RELEASE,
+				PreferenceConstants.DP_RPMINFO_RELEASE);
+		store.setDefault(PreferenceConstants.P_RPMINFO_SUMMARY,
+				PreferenceConstants.DP_RPMINFO_SUMMARY);
+		store.setDefault(PreferenceConstants.P_RPMINFO_LICENSE,
+				PreferenceConstants.DP_RPMINFO_LICENSE);
+		store.setDefault(PreferenceConstants.P_RPMINFO_GROUP,
+				PreferenceConstants.DP_RPMINFO_GROUP);
+		store.setDefault(PreferenceConstants.P_RPMINFO_URL,
+				PreferenceConstants.DP_RPMINFO_URL);
+		store.setDefault(PreferenceConstants.P_RPMINFO_DESCRIPTION,
+				PreferenceConstants.DP_RPMINFO_DESCRIPTION);
+		store.setDefault(PreferenceConstants.P_RPMINFO_INSTALLTIME,
+				PreferenceConstants.DP_RPMINFO_INSTALLTIME);
+		store.setDefault(PreferenceConstants.P_RPMINFO_SIZE,
+				PreferenceConstants.DP_RPMINFO_SIZE);
+		store.setDefault(PreferenceConstants.P_RPMINFO_PACKAGER,
+				PreferenceConstants.DP_RPMINFO_PACKAGER);
+		store.setDefault(PreferenceConstants.P_RPMINFO_VENDOR,
+				PreferenceConstants.DP_RPMINFO_VENDOR);
+		store.setDefault(PreferenceConstants.P_RPMINFO_BUILDTIME,
+				PreferenceConstants.DP_RPMINFO_BUILDTIME);
+		store.setDefault(PreferenceConstants.P_RPMINFO_SOURCERPM,
+				PreferenceConstants.DP_RPMINFO_SOURCERPM);
+		store.setDefault(PreferenceConstants.P_TASK_TAGS,
+				PreferenceConstants.DP_TASK_TAGS);
+		// Convert tab by spaces
+		store.setDefault(PreferenceConstants.P_SPACES_FOR_TABS,
+				PreferenceConstants.DP_SPACES_FOR_TABS);
+		store.setDefault(PreferenceConstants.P_NBR_OF_SPACES_FOR_TAB,
+				PreferenceConstants.DP_NBR_OF_SPACES_FOR_TAB);
+
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/RpmInformationsPreferencePage.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/RpmInformationsPreferencePage.java
new file mode 100644
index 0000000..4c9e4d3
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/RpmInformationsPreferencePage.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.preferences;
+
+import org.eclipse.jface.preference.BooleanFieldEditor;
+import org.eclipse.jface.preference.FieldEditor;
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.jface.preference.IntegerFieldEditor;
+import org.eclipse.linuxtools.rpm.ui.editor.Activator;
+import org.eclipse.linuxtools.rpm.ui.editor.RpmTags;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+public class RpmInformationsPreferencePage extends FieldEditorPreferencePage implements
+IWorkbenchPreferencePage{
+
+		/**
+		 * Default constructor
+		 */
+		public RpmInformationsPreferencePage() {
+			super(GRID);
+			setDescription(Messages.RpmInformationsPreferencePage_0);
+			setPreferenceStore(Activator.getDefault().getPreferenceStore());
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors()
+		 */
+		@Override
+		public void createFieldEditors() {
+			addField(maxProposalsIntegerFieldEditor());
+			addField(new BooleanFieldEditor(PreferenceConstants.P_RPMINFO_NAME, RpmTags.NAME, getFieldEditorParent()));
+			addField(new BooleanFieldEditor(PreferenceConstants.P_RPMINFO_VERSION, RpmTags.VERSION, getFieldEditorParent()));
+			addField(new BooleanFieldEditor(PreferenceConstants.P_RPMINFO_RELEASE, RpmTags.RELEASE, getFieldEditorParent()));
+			addField(new BooleanFieldEditor(PreferenceConstants.P_RPMINFO_SUMMARY, RpmTags.SUMMARY, getFieldEditorParent()));
+			addField(new BooleanFieldEditor(PreferenceConstants.P_RPMINFO_LICENSE, RpmTags.LICENSE, getFieldEditorParent()));
+			addField(new BooleanFieldEditor(PreferenceConstants.P_RPMINFO_GROUP, RpmTags.GROUP, getFieldEditorParent()));
+			addField(new BooleanFieldEditor(PreferenceConstants.P_RPMINFO_URL, RpmTags.URL, getFieldEditorParent()));
+			addField(new BooleanFieldEditor(PreferenceConstants.P_RPMINFO_INSTALLTIME, Messages.RpmInformationsPreferencePage_1, getFieldEditorParent()));
+			addField(new BooleanFieldEditor(PreferenceConstants.P_RPMINFO_DESCRIPTION, Messages.RpmInformationsPreferencePage_2, getFieldEditorParent()));
+			addField(new BooleanFieldEditor(PreferenceConstants.P_RPMINFO_PACKAGER, RpmTags.PACKAGER, getFieldEditorParent()));
+			addField(new BooleanFieldEditor(PreferenceConstants.P_RPMINFO_VENDOR, RpmTags.VENDOR, getFieldEditorParent()));
+			addField(new BooleanFieldEditor(PreferenceConstants.P_RPMINFO_SIZE, Messages.RpmInformationsPreferencePage_3, getFieldEditorParent()));
+			addField(new BooleanFieldEditor(PreferenceConstants.P_RPMINFO_BUILDTIME, Messages.RpmInformationsPreferencePage_4, getFieldEditorParent()));
+			addField(new BooleanFieldEditor(PreferenceConstants.P_RPMINFO_SOURCERPM, Messages.RpmInformationsPreferencePage_5, getFieldEditorParent()));
+		}
+		
+		private FieldEditor maxProposalsIntegerFieldEditor() {
+			IntegerFieldEditor maxProposalsFieldEditor = new IntegerFieldEditor(
+					PreferenceConstants.P_RPM_LIST_MAX_PROPOSALS,
+					Messages.RpmInformationsPreferencePage_6, getFieldEditorParent());
+			maxProposalsFieldEditor.setValidRange(1, 40);
+			maxProposalsFieldEditor.setErrorMessage(Messages.RpmInformationsPreferencePage_7);
+			return maxProposalsFieldEditor;
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
+		 */
+		public void init(IWorkbench workbench) {
+		}
+		
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/RpmProposalsPreferencePage.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/RpmProposalsPreferencePage.java
new file mode 100644
index 0000000..d0f61e6
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/RpmProposalsPreferencePage.java
@@ -0,0 +1,135 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.preferences;
+
+import java.util.ArrayList;
+
+import org.eclipse.jface.preference.BooleanFieldEditor;
+import org.eclipse.jface.preference.FieldEditor;
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.jface.preference.RadioGroupFieldEditor;
+import org.eclipse.jface.preference.StringFieldEditor;
+import org.eclipse.linuxtools.rpm.core.utils.Utils;
+import org.eclipse.linuxtools.rpm.ui.editor.Activator;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Link;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.eclipse.ui.dialogs.PreferencesUtil;
+
+/**
+ * RPM package proposals preference page class.
+ *
+ */
+public class RpmProposalsPreferencePage extends FieldEditorPreferencePage
+		implements IWorkbenchPreferencePage {
+
+	/*
+	 * default constructor
+	 */
+	public RpmProposalsPreferencePage() {
+		super(FLAT);
+		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors()
+	 */
+	@Override
+	public void createFieldEditors() {
+		addField(rpmtoolsRadioGroupFieldEditor());	
+		// FIXME: there is validations problem when a FileFieldEditor is used, so 
+		// as a quick fix, StringFieldEditor is used.
+		StringFieldEditor rpmListFieldEditor = new StringFieldEditor(PreferenceConstants.P_RPM_LIST_FILEPATH,
+				Messages.RpmProposalsPreferencePage_0, getFieldEditorParent());
+		addField(rpmListFieldEditor);
+		addField(new BooleanFieldEditor(PreferenceConstants.P_RPM_LIST_BACKGROUND_BUILD,Messages.RpmProposalsPreferencePage_1, getFieldEditorParent()));
+		addField(buildTimeListRateFieldEditor());
+	}
+	
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createContents(org.eclipse.swt.widgets.Composite)
+	 */
+	@Override
+	protected Control createContents(final Composite parent) {
+		Link link= new Link(parent, SWT.NONE);
+		link.setText(Messages.RpmProposalsPreferencePage_2);
+		link.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				PreferencesUtil.createPreferenceDialogOn(parent.getShell() , e.text, null, null); 
+			}
+		});
+		Composite fieldEditorComposite = (Composite) super
+				.createContents(parent);
+		return fieldEditorComposite;
+	}
+	
+	private FieldEditor rpmtoolsRadioGroupFieldEditor() {
+		ArrayList<String[]> list = new ArrayList<String[]>();
+		list.add(new String[] { Messages.RpmProposalsPreferencePage_3,
+								PreferenceConstants.DP_RPMTOOLS_RPM });
+		/*
+		 * Show only installed tools.
+		 * Don't forgot to add sanity check in UiUtils.pluginSanityCheck().
+		 */ 
+		if (Utils.fileExist("/usr/bin/yum"))  //$NON-NLS-1$
+			list.add(new String[] { Messages.RpmProposalsPreferencePage_4,
+					PreferenceConstants.DP_RPMTOOLS_YUM });
+		if (Utils.fileExist("/usr/bin/urpmq"))  //$NON-NLS-1$
+			list.add(new String[] { Messages.RpmProposalsPreferencePage_5,
+					PreferenceConstants.DP_RPMTOOLS_URPM });
+
+		String[][] radioItems = new String[list.size()][2];
+		int pos = 0;
+		for (String[] item: list) {
+			radioItems[pos][0] = item[0];
+			radioItems[pos][1] = item[1];
+			pos++;
+			
+		}
+	
+		RadioGroupFieldEditor rpmToolsRadioGroupEditor = new RadioGroupFieldEditor(
+				PreferenceConstants.P_CURRENT_RPMTOOLS,
+				Messages.RpmProposalsPreferencePage_6, 1, radioItems ,
+				getFieldEditorParent(), true);
+		return rpmToolsRadioGroupEditor;
+	}
+	
+	private FieldEditor buildTimeListRateFieldEditor() { 
+		RadioGroupFieldEditor buildListTimeRateRadioGroupEditor = new RadioGroupFieldEditor(
+				PreferenceConstants.P_RPM_LIST_BUILD_PERIOD,
+				Messages.RpmProposalsPreferencePage_7, 1, new String[][] {
+						{ Messages.RpmProposalsPreferencePage_8, "1" }, //$NON-NLS-1$
+						{ Messages.RpmProposalsPreferencePage_10, "2" }, //$NON-NLS-1$
+						{ Messages.RpmProposalsPreferencePage_12, "3" }}, getFieldEditorParent(), true); //$NON-NLS-1$
+		return buildListTimeRateRadioGroupEditor;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
+	 */
+	public void init(IWorkbench workbench) {
+
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/SpecTemplatePreferencePage.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/SpecTemplatePreferencePage.java
new file mode 100644
index 0000000..6c60c91
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/SpecTemplatePreferencePage.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.preferences;
+
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.linuxtools.rpm.ui.editor.Activator;
+import org.eclipse.ui.texteditor.templates.TemplatePreferencePage;
+import org.osgi.service.prefs.BackingStoreException;
+
+/**
+ * Templates preference page
+ *
+ */
+public class SpecTemplatePreferencePage extends TemplatePreferencePage {
+	
+	/**
+	 * Default constructor
+	 */
+	public SpecTemplatePreferencePage() {
+		super();
+		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+		setTemplateStore(Activator.getDefault().getTemplateStore());
+		setContextTypeRegistry(Activator.getDefault().getContextTypeRegistry());
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.texteditor.templates.TemplatePreferencePage#isShowFormatterSetting()
+	 */
+	@Override
+	protected boolean isShowFormatterSetting() {
+		return true;
+	}
+
+
+	/**
+	 * @see org.eclipse.ui.texteditor.templates.TemplatePreferencePage#performOk()
+	 */
+	@Override
+	public boolean performOk() {
+		boolean ok= super.performOk();
+		try {
+			new InstanceScope().getNode(Activator.PLUGIN_ID).flush();
+		} catch (BackingStoreException e) {
+			//Error while saving.
+			ok = false;
+		}
+		return ok;
+	}
+
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/TaskTagsPreferencePage.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/TaskTagsPreferencePage.java
new file mode 100644
index 0000000..217997f
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/TaskTagsPreferencePage.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.preferences;
+
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.jface.preference.ListEditor;
+import org.eclipse.jface.window.Window;
+import org.eclipse.linuxtools.rpm.ui.editor.Activator;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+public class TaskTagsPreferencePage extends FieldEditorPreferencePage implements
+		IWorkbenchPreferencePage {
+
+	public TaskTagsPreferencePage() {
+		super(GRID);
+		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+	}
+
+	public void init(IWorkbench workbench) {
+	}
+
+	@Override
+	protected void createFieldEditors() {
+		addField(new TasksListEditor(PreferenceConstants.P_TASK_TAGS,
+				Messages.TaskTagsPreferencePage_0,
+				getFieldEditorParent()));
+	}
+
+	class TasksListEditor extends ListEditor {
+
+		public TasksListEditor(String name, String labelText, Composite parent) {
+			super(name, labelText, parent);
+		}
+
+		@Override
+		protected String createList(String[] items) {
+			StringBuilder itemsString = new StringBuilder();
+			for (String item : items) {
+				itemsString.append(item + ';');
+			}
+			return itemsString.toString();
+		}
+
+		@Override
+		protected String getNewInputObject() {
+			String result = null;
+			// open an input dialog so that the user can enter a new task tag
+			InputDialog inputDialog = new InputDialog(getShell(),
+					Messages.TaskTagsPreferencePage_1, Messages.TaskTagsPreferencePage_2, "", null); //$NON-NLS-1$
+			int returnCode = inputDialog.open();
+
+			if (returnCode == Window.OK) {
+				result = inputDialog.getValue();
+			}
+
+			return result;
+
+		}
+
+		@Override
+		protected String[] parseString(String stringList) {
+			return stringList.split(";"); //$NON-NLS-1$
+		}
+
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/messages.properties b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/messages.properties
new file mode 100644
index 0000000..add9625
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/preferences/messages.properties
@@ -0,0 +1,46 @@
+###############################################################################
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+MacroProposalsPreferencePage_0=Macro Definitions
+MacroProposalsPreferencePage_1=Mouse hover content
+MacroProposalsPreferencePage_2=Show macro descriptions (e.g '%{prefix}/share')
+MacroProposalsPreferencePage_3=Show macro contents (e.g '/usr/share')
+MacroProposalsPreferencePage_4=Add file
+MacroProposalsPreferencePage_5=Add directory
+MainPreferencePage_0=Use the <a href="org.eclipse.linuxtools.changelog.core.Page1">ChangeLog</a> preferences to configure your name and e-mail address.
+MainPreferencePage_1=Changelog entries Locale:
+MainPreferencePage_2=Changelog entries format:
+MainPreferencePage_3=Versioned entry (e.g. * Date Name <Mail> 1.1-1)
+MainPreferencePage_4=Versioned entry with separator (e.g. * Date Name <Mail> - 1.1-1)
+MainPreferencePage_5=Unversioned entry (e.g. * Date Name <Mail>)
+MainPreferencePage_6=&Insert spaces for tabs
+MainPreferencePage_7=&Number of spaces representing a tab:
+RpmInformationsPreferencePage_0=RPM tags used as proposal descriptions
+RpmInformationsPreferencePage_1=Installation Date
+RpmInformationsPreferencePage_2=Description
+RpmInformationsPreferencePage_3=Size
+RpmInformationsPreferencePage_4=Build Date
+RpmInformationsPreferencePage_5=Source Rpm
+RpmInformationsPreferencePage_6=This information is only shown when the number of proposals is less than
+RpmInformationsPreferencePage_7=Proposal limit for RPM information must be an integer between 1 and 40
+RpmProposalsPreferencePage_0=Path to packages list file:
+RpmProposalsPreferencePage_1=Automatically build the RPM packages proposals list
+RpmProposalsPreferencePage_10=Once a week
+RpmProposalsPreferencePage_12=Once a month
+RpmProposalsPreferencePage_2=<a href="org.eclipse.linuxtools.rpm.ui.editor.preferences.RpmInformationsPreferencePage">Package Information</a> page helps to configure proposal descriptions
+RpmProposalsPreferencePage_3=RPM (Red Hat Package Manager)
+RpmProposalsPreferencePage_4=YUM (Yellowdog Updater, Modified)
+RpmProposalsPreferencePage_5=URPM (User RPM)
+RpmProposalsPreferencePage_6=RPM tools used to build the package list
+RpmProposalsPreferencePage_7=Proposals RPM list build rate
+RpmProposalsPreferencePage_8=Each time that the workbench is open
+TaskTagsPreferencePage_0=Strings indicating tasks in RPM specfile.
+TaskTagsPreferencePage_1=New Task Tag...
+TaskTagsPreferencePage_2=Enter new Task Tag:
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/rules/AuthorEmailRule.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/rules/AuthorEmailRule.java
new file mode 100644
index 0000000..55450cc
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/rules/AuthorEmailRule.java
@@ -0,0 +1,134 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.rules;
+
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IPredicateRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.Token;
+
+public class AuthorEmailRule implements IPredicateRule {
+
+	/** Buffer used for pattern detection */
+	private StringBuilder fBuffer = new StringBuilder();
+
+	/** The success token */
+	IToken token;
+
+	protected final static char START_CHAR = '<';
+
+	protected final static char END_CHAR = '>';
+
+	protected final static char[] INTER_CHARS = { '@', '.' };
+
+	protected final static int STATE_START = 0;
+
+	protected final static int STATE_OPENED = 1;
+
+	protected final static int STATE_AT = 2;
+
+	protected final static int STATE_PERIOD = 3;
+
+	protected final static int STATE_DONE = 4;
+
+	public AuthorEmailRule(IToken token) {
+		this.token = token;
+	}
+
+	public IToken getSuccessToken() {
+		return token;
+	}
+
+	public IToken evaluate(ICharacterScanner scanner, boolean resume) {
+		/*
+		 * whether we think we're reading the ending sequence, i.e. the next
+		 * section heading
+		 */
+		int state = STATE_START;
+		fBuffer.setLength(0);
+		int c;
+
+		do {
+			c = scanner.read();
+			fBuffer.append((char) c);
+
+			// we have reached the end of file or line prematurely, this is not
+			// considered success
+			if (c == ICharacterScanner.EOF || (char) c == '\n') {
+				unreadBuffer(scanner, fBuffer);
+				return Token.UNDEFINED;
+			}
+
+			// we encountered the opening character at the beginning
+			if (state == STATE_START && (char) c == START_CHAR) {
+				state++;
+			} else if (state == STATE_OPENED) {
+				// we encountered the first neccessary intermediary char
+				if ((char) c == INTER_CHARS[0]) {
+					state++;
+				}
+
+				// check if we have a valid char
+				if (! (Character.isLetterOrDigit((char) c) || c == '.' || c == '_' || c == '-' || c == '@')){
+					unreadBuffer(scanner, fBuffer);
+					return Token.UNDEFINED;
+				}
+				
+				// we just keep reading
+
+			} else if (state == STATE_AT) {
+				// we encountered the second neccessary intermediary char
+				if ((char) c == INTER_CHARS[1]) {
+					state++;
+				}
+				
+				// check if we have a valid char
+				if (! (Character.isLetterOrDigit((char) c) || c == '.' || c == '_' || c == '-')){
+					unreadBuffer(scanner, fBuffer);
+					return Token.UNDEFINED;
+				}
+				// we just keep reading
+			} else if (state == STATE_PERIOD) {
+				// the last char before the ending char cannot be a '.'
+				if ((char) c == END_CHAR && fBuffer.charAt(fBuffer.length() - 1) != '.')
+					state++;
+				else if ((char) c == END_CHAR){
+					unreadBuffer(scanner, fBuffer);
+					return Token.UNDEFINED;
+				}
+			} else {
+				unreadBuffer(scanner, fBuffer);
+				return Token.UNDEFINED;
+			}
+
+		} while (state != STATE_DONE);
+		
+		// we've gone through all states until we've reached STATE_DONE, success
+		return token;
+	}
+
+	public IToken evaluate(ICharacterScanner scanner) {
+		return evaluate(scanner, false);
+	}
+
+	/**
+	 * Returns the characters in the buffer to the scanner.
+	 * 
+	 * @param scanner
+	 *            the scanner to be used
+	 */
+	protected void unreadBuffer(ICharacterScanner scanner, StringBuilder buffer) {
+		for (int i = buffer.length() - 1; i >= 0; i--)
+			scanner.unread();
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/rules/CommentRule.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/rules/CommentRule.java
new file mode 100644
index 0000000..3d56f51
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/rules/CommentRule.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.rules;
+
+import org.eclipse.jface.text.rules.EndOfLineRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.linuxtools.rpm.ui.editor.ISpecfileSpecialSymbols;
+
+/**
+ * A rule for matching comment line.
+ * Starts with # and ends at the end of line.
+ * 
+ */
+public class CommentRule extends EndOfLineRule{
+	/**
+	 * Creates a EndofLineRule starting with the comment("#") symbol.
+	 * 
+	 * @param token The token to look into.
+	 */
+	public CommentRule(IToken token) {
+		super(ISpecfileSpecialSymbols.COMMENT_START, token);
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/rules/MacroRule.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/rules/MacroRule.java
new file mode 100644
index 0000000..a43f927
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/rules/MacroRule.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.rules;
+
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.SingleLineRule;
+import org.eclipse.linuxtools.rpm.ui.editor.ISpecfileSpecialSymbols;
+
+/**
+ * A rule for matching %{...} sections in spec file.
+ * 
+ */
+public class MacroRule extends SingleLineRule {
+
+	/**
+	 * Creates a SingleLineRule by using macros start and end identifiers for
+	 * start and end delimiters.
+	 * 
+	 * @param token The token to look into.
+	 */
+	public MacroRule(IToken token) {
+		super(ISpecfileSpecialSymbols.MACRO_START_LONG,
+				ISpecfileSpecialSymbols.MACRO_END_LONG, token);
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/rules/SectionRule.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/rules/SectionRule.java
new file mode 100644
index 0000000..51c5f83
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/rules/SectionRule.java
@@ -0,0 +1,140 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.rules;
+
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IPredicateRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.Token;
+
+public class SectionRule implements IPredicateRule {
+
+	/** Buffer used for pattern detection */
+	private StringBuilder fBuffer = new StringBuilder();
+
+	/** Buffer used for pattern detection of next header */
+	private StringBuilder nextHeaderBuffer = new StringBuilder();
+
+	/** The success token */
+	IToken token;
+
+	/** The beginning token, represents a section of the spec file */
+	String startingHeader;
+
+	/** A list of possible ending section headers */
+	String[] endingHeaders;
+
+	public SectionRule(String startingHeader, String[] endingHeaders,
+			IToken token) {
+		this.startingHeader = startingHeader;
+		this.endingHeaders = endingHeaders;
+		this.token = token;
+	}
+
+	public IToken getSuccessToken() {
+		return token;
+	}
+
+	public IToken evaluate(ICharacterScanner scanner, boolean resume) {
+		/* whether we think we're reading the ending sequence, i.e. the next
+		 * section heading
+		 */
+		boolean readingEndSequence = false;
+		fBuffer.setLength(0);
+		nextHeaderBuffer.setLength(0);
+		int c = scanner.read();
+
+		/* if we're starting at the beginning header we check that the partition
+		 * begins with the required header */
+		if (!resume) {
+			for (int i = 0; i < startingHeader.length(); i++) {
+				fBuffer.append((char) c);
+				if (startingHeader.charAt(i) != (char) c) {
+					unreadBuffer(scanner, fBuffer);
+					return Token.UNDEFINED;
+				}
+				c = scanner.read();
+			}
+		}
+
+		fBuffer.append((char) c);
+
+		do {
+			// Sections can only begin with a % on a new line
+			if (c == '\n') {
+				// if we were readin a %blah, reset because it turned out to
+				// not be a terminating section header
+				readingEndSequence = false;
+
+				// if we're reading a line beginning with % then it might be
+				// at terminating sectino header
+				c = scanner.read();
+				if (c == '%') {
+					// Start appending to the we reset the buffer for section
+					// headers, and indicate that this line can be a terminating
+					// section header
+					nextHeaderBuffer.setLength(0);
+					readingEndSequence = true;
+				} else if (c == ICharacterScanner.EOF) {
+					
+					// we allow EOF as a valid ending to a section
+					break;
+				} else {
+					fBuffer.append((char) c);
+					continue;
+				}
+			}
+			// we're in a line that's a possible terminating section header,
+			// so we compare it with all terminating headers
+			if (readingEndSequence) {
+				nextHeaderBuffer.append((char) c);
+				for (int i = 0; i < endingHeaders.length; i++) {
+					String tempSectionheader = endingHeaders[i];
+
+					// we've found our terminating header
+					if (nextHeaderBuffer.toString().equals(tempSectionheader)) {
+
+						// exclude the terminating header from the partition
+						unreadBuffer(scanner, nextHeaderBuffer);
+
+						return token;
+					}
+				}
+			}
+			
+			// read the next char
+			c = scanner.read();
+			fBuffer.append((char) c);
+		} while (c != ICharacterScanner.EOF);
+
+		// we've reached EOF and since our section started with the correct
+		// header, then this is just the current end of the partition, and
+		// we return the success token
+		return token;
+	}
+
+	public IToken evaluate(ICharacterScanner scanner) {
+		return evaluate(scanner, false);
+	}
+
+	/**
+	 * Returns the characters in the buffer to the scanner.
+	 * 
+	 * @param scanner
+	 *            the scanner to be used
+	 */
+	protected void unreadBuffer(ICharacterScanner scanner, StringBuilder buffer) {
+		for (int i = buffer.length() - 1; i >= 0; i--)
+			scanner.unread();
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/rules/StringWithEndingRule.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/rules/StringWithEndingRule.java
new file mode 100644
index 0000000..b2d50f3
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/rules/StringWithEndingRule.java
@@ -0,0 +1,107 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.rules;
+
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.linuxtools.rpm.ui.editor.detectors.IStrictWordDetector;
+
+public class StringWithEndingRule implements IRule {
+	/**
+	 * The default token to be returned on success and if nothing else has been
+	 * specified.
+	 */
+	protected IToken fDefaultToken;
+
+	protected IToken token;
+
+	protected IStrictWordDetector fDetector;
+
+	/** The column constraint */
+	protected int fColumn = UNDEFINED;
+
+	/** Internal setting for the un-initialized column constraint */
+	protected static final int UNDEFINED = -1;
+
+	/** Buffer used for pattern detection */
+	private StringBuilder fBuffer = new StringBuilder();
+
+	private String fStartingSequence;
+
+	private boolean fMandatoryEndSequence;
+
+	public StringWithEndingRule(String startingSequence,
+			IStrictWordDetector trailingCharDetector, IToken inToken,
+			boolean endSequenceRequired) {
+		super();
+		token = inToken;
+		fDetector = trailingCharDetector;
+		fStartingSequence = startingSequence;
+		fMandatoryEndSequence = endSequenceRequired;
+		fDefaultToken = Token.UNDEFINED;
+
+	}
+
+	public IToken evaluate(ICharacterScanner scanner) {
+		int c = scanner.read();
+		fBuffer.setLength(0);
+
+		for (int i = 0; i < fStartingSequence.length(); i++) {
+			fBuffer.append((char) c);
+			if (fStartingSequence.charAt(i) != c) {
+				unreadBuffer(scanner);
+				return Token.UNDEFINED;
+			}
+			c = scanner.read();
+		}
+
+		if (fDetector.isWordStart((char) c)) {
+			if (fColumn == UNDEFINED || (fColumn == scanner.getColumn() - 1)) {
+
+				do {
+					fBuffer.append((char) c);
+					c = scanner.read();
+				} while (c != ICharacterScanner.EOF
+						&& fDetector.isWordPart((char) c));
+				
+				if (c != ICharacterScanner.EOF && !fDetector.isEndingCharacter((char) c)) {
+					unreadBuffer(scanner);
+					return Token.UNDEFINED;
+				}
+
+				return token;
+			}
+
+		}
+
+		if (!fMandatoryEndSequence && fDetector.isEndingCharacter((char) c))
+			return token;
+		scanner.unread();
+
+		unreadBuffer(scanner);
+		return Token.UNDEFINED;
+	}
+
+	/**
+	 * Returns the characters in the buffer to the scanner.
+	 * 
+	 * @param scanner
+	 *            the scanner to be used
+	 */
+	protected void unreadBuffer(ICharacterScanner scanner) {
+		for (int i = fBuffer.length() - 1; i >= 0; i--)
+			scanner.unread();
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/rules/VersionReleaseRule.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/rules/VersionReleaseRule.java
new file mode 100644
index 0000000..61b7f16
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/rules/VersionReleaseRule.java
@@ -0,0 +1,166 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.rules;
+
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IPredicateRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.linuxtools.rpm.ui.editor.scanners.SpecfileChangelogScanner;
+
+public class VersionReleaseRule implements IPredicateRule {
+
+	/** Buffer used for pattern detection */
+	private StringBuilder fBuffer = new StringBuilder();
+
+	/** Buffer to keep track of trailing whitespace */
+	private StringBuilder fWhiteSpaceBuffer = new StringBuilder();
+
+	/** The success token */
+	IToken fToken;
+
+	/** The token that has to preceed this token */
+	IToken fPreceedingToken;
+
+	/** Where we can find out what the preceeding token was */
+	SpecfileChangelogScanner fChangelogScanner;
+
+	protected final static char CHARS_SEPERATOR = '-';
+
+	protected final static int STATE_START = 0;
+
+	protected final static int STATE_VERSION = 1;
+
+	protected final static int STATE_RELEASE = 2;
+
+	protected final static int STATE_TRAIL = 3;
+
+	protected final static int STATE_DONE = 4;
+
+	public VersionReleaseRule(IToken token) {
+		this.fToken = token;
+	}
+
+	public VersionReleaseRule(IToken successToken, IToken preceedingToken,
+			SpecfileChangelogScanner scanner) {
+		fToken = successToken;
+		fPreceedingToken = preceedingToken;
+		fChangelogScanner = scanner;
+	}
+
+	public IToken getSuccessToken() {
+		return fToken;
+	}
+
+public IToken evaluate(ICharacterScanner scanner, boolean resume) {
+		// if the last token successfully read was not the fPreceedingToke fail
+		IToken lastToken = getLastToken();
+		
+		if (lastToken != fPreceedingToken	) {
+			return Token.UNDEFINED;
+		}
+		
+		fBuffer.setLength(0);
+		int state = STATE_START;
+		int c;
+		int numPreceedingBlanks = 0;
+		
+		do {
+			c = scanner.read();
+			fBuffer.append((char) c);
+			
+			// preceeding white space
+			if (state == STATE_START){
+				if (Character.isWhitespace((char) c) || c == '-')
+					numPreceedingBlanks++;
+				else
+					state++;
+			}
+			// version state (first part of version-release)
+			if (state == STATE_VERSION) {
+				// if we've read some semblance of a version and we've reached
+				// the separator character
+				if (fBuffer.length() > numPreceedingBlanks && c == CHARS_SEPERATOR){
+					state++;
+				}
+				// otherwise we allow only digits, letters, underscores, ':' or
+				// '.' in the version
+				else if (!(Character.isLetterOrDigit((char) c) || c == '.' || c == '_' || c == ':')) {
+					unreadBuffer(scanner, fBuffer);
+					return Token.UNDEFINED;
+				}
+			}
+			// release state (second part of version-release)
+			else if (state == STATE_RELEASE){
+				// an EOF or EOL indicates success
+				if (c == ICharacterScanner.EOF || c == '\n'){
+					state = STATE_DONE;
+				}
+				
+				// if we encounter a space, we enter the optional trailing
+				// space section which we consider valid (but not part of the
+				// token) if and only if it is ended by and EOF or EOL
+				else if (Character.isWhitespace((char) c)){
+					state++;
+					fWhiteSpaceBuffer.setLength(0);
+					fWhiteSpaceBuffer.append(c);
+				}
+				// allow digits, characters or '.' in the release
+				else if (! ( Character.isLetterOrDigit((char) c) || c == '.' || c == '_')){
+					unreadBuffer(scanner, fBuffer);
+					return Token.UNDEFINED;
+				}
+				
+			}
+			// whitespace state, we finished redeaing the ver-rel and are
+			// now looking for an EOF or EOL for success
+			else if (state == STATE_TRAIL) {
+				// success, unwind the whitespace
+				if (c == ICharacterScanner.EOF || c == '\n'){
+					unreadBuffer(scanner, fWhiteSpaceBuffer);
+					state++;
+				} // some other illegal token after ver-rel unwind the whole
+					// deal
+				else if (!Character.isWhitespace((char) c)){
+					unreadBuffer(scanner, fBuffer);
+					return Token.UNDEFINED;
+				}
+				else{ // white space, keep reading
+					fWhiteSpaceBuffer.append((char)c);
+				}
+				
+			}
+		} while (state != STATE_DONE);
+		
+		// we've gone through all states until we've reached STATE_DONE, success
+		return fToken;
+	}	
+
+	public IToken evaluate(ICharacterScanner scanner) {
+		return evaluate(scanner, false);
+	}
+
+	/**
+	 * Returns the characters in the buffer to the scanner.
+	 * 
+	 * @param scanner
+	 *            the scanner to be used
+	 */
+	protected void unreadBuffer(ICharacterScanner scanner, StringBuilder buffer) {
+		for (int i = buffer.length() - 1; i >= 0; i--)
+			scanner.unread();
+	}
+
+	protected IToken getLastToken() {
+		return fChangelogScanner.getLastToken();
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfileChangelogScanner.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfileChangelogScanner.java
new file mode 100644
index 0000000..468ab8b
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfileChangelogScanner.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.scanners;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.jface.text.rules.WordRule;
+import org.eclipse.linuxtools.rpm.ui.editor.ColorManager;
+import org.eclipse.linuxtools.rpm.ui.editor.ISpecfileColorConstants;
+import org.eclipse.linuxtools.rpm.ui.editor.RpmSections;
+import org.eclipse.linuxtools.rpm.ui.editor.detectors.KeywordWordDetector;
+import org.eclipse.linuxtools.rpm.ui.editor.rules.AuthorEmailRule;
+import org.eclipse.linuxtools.rpm.ui.editor.rules.VersionReleaseRule;
+import org.eclipse.swt.SWT;
+/**
+ * This class is used specifically of the syntax coloring of the %changelog
+ * section of a spec file, which has completely different syntax than 
+ * the rest of the file.
+ * 
+ */
+public class SpecfileChangelogScanner extends RuleBasedScanner {
+
+	private IToken fLastToken;
+	
+	public SpecfileChangelogScanner(ColorManager manager) {
+		super();
+		IToken sectionToken = new Token(new TextAttribute(manager
+				.getColor(ISpecfileColorConstants.SECTIONS), null, SWT.ITALIC));
+		
+		IToken authorEmail = new Token(new TextAttribute(manager
+				.getColor(ISpecfileColorConstants.AUTHOR_MAIL), null, SWT.NONE));
+
+		IToken versionRelease = new Token(new TextAttribute(manager
+				.getColor(ISpecfileColorConstants.VER_REL), null, SWT.NONE));
+		
+		List<IRule> rules = new ArrayList<IRule>();
+
+		// %prep, %build, ...
+		WordRule wordRule = new WordRule(new KeywordWordDetector(), Token.UNDEFINED);
+		wordRule.addWord(RpmSections.CHANGELOG_SECTION, sectionToken);
+		rules.add(wordRule);
+	
+		AuthorEmailRule emailRule= new AuthorEmailRule(authorEmail);
+		rules.add(emailRule);
+		
+		VersionReleaseRule verRelRule = new VersionReleaseRule(versionRelease, authorEmail, this);
+		rules.add(verRelRule);
+		
+		IRule[] result = new IRule[rules.size()];
+		rules.toArray(result);
+		setRules(result);
+	}
+	
+	public IToken getLastToken (){
+		return fLastToken;
+	}
+
+	@Override
+	public IToken nextToken() {
+		fLastToken = super.nextToken();
+		return fLastToken;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfilePackagesScanner.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfilePackagesScanner.java
new file mode 100644
index 0000000..2fb0844
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfilePackagesScanner.java
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.scanners;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.jface.text.rules.WordRule;
+import org.eclipse.linuxtools.rpm.ui.editor.Activator;
+import org.eclipse.linuxtools.rpm.ui.editor.ColorManager;
+import org.eclipse.linuxtools.rpm.ui.editor.ISpecfileColorConstants;
+import org.eclipse.linuxtools.rpm.ui.editor.detectors.PackageWordDetector;
+import org.eclipse.linuxtools.rpm.ui.editor.detectors.TagWordDetector;
+import org.eclipse.linuxtools.rpm.ui.editor.rules.MacroRule;
+import org.eclipse.swt.SWT;
+
+/**
+ * This class is specifically used for syntax coloring of Requires,
+ * BuildRquires, etc... tags of a specfile.
+ * 
+ */
+public class SpecfilePackagesScanner extends RuleBasedScanner {
+
+	protected static final String[] PACKAGES_TAGS = {
+			"BuildRequires", "BuildConflicts", //$NON-NLS-1$ //$NON-NLS-2$
+			"BuildPreReq", "Requires", "Requires(post)", "Requires(postun)", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+			"Requires(pre)", "Requires(preun)", "Requires(hint)", "Conflicts", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+			"Obsoletes", "Prereq" }; //$NON-NLS-1$ //$NON-NLS-2$
+
+	public SpecfilePackagesScanner(ColorManager manager) {
+		super();
+		IToken packageToken = new Token(new TextAttribute(manager
+				.getColor(ISpecfileColorConstants.PACKAGES), null, SWT.NONE));
+
+		IToken tagToken = new Token(new TextAttribute(manager
+				.getColor(ISpecfileColorConstants.TAGS)));
+
+		IToken macroToken = new Token(new TextAttribute(manager
+				.getColor(ISpecfileColorConstants.MACROS)));
+
+		List<IRule> rules = new ArrayList<IRule>();
+
+		rules.add(new MacroRule(macroToken));
+
+		// BuildRequires:, ...
+		WordRule wordRule = new WordRule(new TagWordDetector(), Token.UNDEFINED);
+		for (String packageTag : PACKAGES_TAGS) {
+			wordRule.addWord(packageTag + ":", tagToken); //$NON-NLS-1$
+		}
+		rules.add(wordRule);
+
+		// RPM packages
+		wordRule = new WordRule(new PackageWordDetector(), Token.UNDEFINED);
+		List<String[]> rpmPackages = Activator.getDefault().getRpmPackageList()
+				.getProposals(""); //$NON-NLS-1$
+		char[] startWith = {' ', '\t', ',', ':'};
+		for (String[] item: rpmPackages){
+			// FIXME Perhaps, that can slow down the scanning?
+			for (char startChar : startWith) {
+				wordRule.addWord(startChar + item[0], packageToken);
+			}
+		}
+		rules.add(wordRule);
+
+		IRule[] result = new IRule[rules.size()];
+		rules.toArray(result);
+		setRules(result);
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfilePartitionScanner.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfilePartitionScanner.java
new file mode 100644
index 0000000..71a8699
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfilePartitionScanner.java
@@ -0,0 +1,109 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *    Alphonse Van Assche
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.scanners;
+
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.BUILD_SECTION;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.CHANGELOG_SECTION;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.CLEAN_SECTION;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.FILES_SECTION;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.INSTALL_SECTION;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.POSTTRANS_SECTION;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.POSTUN_SECTION;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.POST_SECTION;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.PREP_SECTION;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.PRETRANS_SECTION;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.PREUN_SECTION;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.PRE_SECTION;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.rules.EndOfLineRule;
+import org.eclipse.jface.text.rules.IPredicateRule;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.MultiLineRule;
+import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
+import org.eclipse.jface.text.rules.SingleLineRule;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.linuxtools.rpm.ui.editor.RpmSections;
+import org.eclipse.linuxtools.rpm.ui.editor.rules.CommentRule;
+import org.eclipse.linuxtools.rpm.ui.editor.rules.SectionRule;
+
+public class SpecfilePartitionScanner extends RuleBasedPartitionScanner {
+
+	public static final String SPEC_PREP = "__spec_prep"; //$NON-NLS-1$
+	public static final String SPEC_SCRIPT = "__spec_script"; //$NON-NLS-1$
+	public static final String SPEC_FILES = "__spec_files"; //$NON-NLS-1$
+	public static final String SPEC_CHANGELOG = "__spec_changelog"; //$NON-NLS-1$
+	public static final String SPEC_PACKAGES = "__spec_packages"; //$NON-NLS-1$
+	public static final String SPEC_GROUP = "__spec_group"; //$NON-NLS-1$
+	public static final String SPEC_FILE_PARTITIONING = "___spec_partitioning"; //$NON-NLS-1$
+	
+	public static final String[] SPEC_PARTITION_TYPES = { IDocument.DEFAULT_CONTENT_TYPE, SPEC_PREP, SPEC_SCRIPT,
+			SPEC_FILES, SPEC_CHANGELOG, SPEC_PACKAGES, SPEC_GROUP};
+	
+	/** All possible headers for sections of the type SPEC_SCRIPT */
+	private static final String[] SECTION_HEADERS = { BUILD_SECTION, INSTALL_SECTION, 
+		PRETRANS_SECTION, PRE_SECTION, PREUN_SECTION, POST_SECTION, POSTUN_SECTION,
+		POSTTRANS_SECTION, CLEAN_SECTION};
+
+	/** All possible headers for section that can come after sections of the type SPEC_SCRIPT */
+	private static final String[] SECTION_ENDING_HEADERS = { BUILD_SECTION, INSTALL_SECTION, 
+		PRETRANS_SECTION, PRE_SECTION, PREUN_SECTION, POST_SECTION, POSTUN_SECTION, POSTTRANS_SECTION, 
+		CLEAN_SECTION, FILES_SECTION};
+	
+	public SpecfilePartitionScanner() {
+		super();
+		
+		IToken specPrep = new Token(SPEC_PREP);
+		IToken specScript = new Token(SPEC_SCRIPT);
+		IToken specFiles = new Token(SPEC_FILES);
+		IToken specChangelog = new Token(SPEC_CHANGELOG);
+		IToken specPackages = new Token(SPEC_PACKAGES);
+		IToken specGroup = new Token(SPEC_GROUP);
+		
+		List<IRule> rules = new ArrayList<IRule>();
+		
+		// RPM packages
+		for (String packageTag : SpecfilePackagesScanner.PACKAGES_TAGS) {
+			rules.add(new SingleLineRule(packageTag, "", specPackages, (char)0 , true));		 //$NON-NLS-1$
+		}
+		
+		// %prep
+		rules.add(new SectionRule(PREP_SECTION, new String[] { BUILD_SECTION }, specPrep));
+		
+		// %changelog
+		rules.add(new MultiLineRule(RpmSections.CHANGELOG_SECTION, "", specChangelog, (char)0 , true)); //$NON-NLS-1$
+		
+		// "%build", "%install", "%pre", "%preun", "%post", "%postun"
+		for (String sectionHeader : SECTION_HEADERS)
+			rules.add(new SectionRule(sectionHeader, SECTION_ENDING_HEADERS, specScript));
+
+		// comments
+		rules.add(new CommentRule(specScript));
+		
+		// group tag
+		rules.add(new EndOfLineRule("Group:", specGroup)); //$NON-NLS-1$
+		
+		
+		// %files
+		rules.add(new SectionRule(FILES_SECTION, new String[] { FILES_SECTION,
+				CHANGELOG_SECTION }, specFiles));
+		
+		IPredicateRule[] result= new IPredicateRule[rules.size()];
+		rules.toArray(result);
+		setPredicateRules(result);
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfileScanner.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfileScanner.java
new file mode 100644
index 0000000..0954e57
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/scanners/SpecfileScanner.java
@@ -0,0 +1,161 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.scanners;
+
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.BUILD_SECTION;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.CHANGELOG_SECTION;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.CHECK_SECTION;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.CLEAN_SECTION;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.DESCRIPTION_SECTION;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.FILES_SECTION;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.INSTALL_SECTION;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.PACKAGE_SECTION;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.POSTTRANS_SECTION;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.POSTUN_SECTION;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.POST_SECTION;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.PREP_SECTION;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.PRETRANS_SECTION;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.PREUN_SECTION;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmSections.PRE_SECTION;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmTags.AUTO_PROV;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmTags.AUTO_REQ;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmTags.AUTO_REQUIRES;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmTags.AUTO_REQ_PROV;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmTags.BUILD_ARCH;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmTags.BUILD_ARCHITECTURES;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmTags.BUILD_ROOT;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmTags.DISTRIBUTION;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmTags.EPOCH;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmTags.EXCLUDE_ARCH;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmTags.EXCLUDE_OS;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmTags.EXCLUSIVE_ARCH;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmTags.GROUP;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmTags.ICON;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmTags.LICENSE;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmTags.NAME;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmTags.PACKAGER;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmTags.PREFIX;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmTags.PROVIDES;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmTags.RELEASE;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmTags.SUMMARY;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmTags.URL;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmTags.VENDOR;
+import static org.eclipse.linuxtools.rpm.ui.editor.RpmTags.VERSION;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.jface.text.rules.WordRule;
+import org.eclipse.linuxtools.rpm.ui.editor.ColorManager;
+import org.eclipse.linuxtools.rpm.ui.editor.ISpecfileColorConstants;
+import org.eclipse.linuxtools.rpm.ui.editor.detectors.KeywordWordDetector;
+import org.eclipse.linuxtools.rpm.ui.editor.detectors.MacroWordDetector;
+import org.eclipse.linuxtools.rpm.ui.editor.detectors.PatchNumberDetector;
+import org.eclipse.linuxtools.rpm.ui.editor.detectors.SuffixNumberDetector;
+import org.eclipse.linuxtools.rpm.ui.editor.detectors.TagWordDetector;
+import org.eclipse.linuxtools.rpm.ui.editor.rules.CommentRule;
+import org.eclipse.linuxtools.rpm.ui.editor.rules.MacroRule;
+import org.eclipse.linuxtools.rpm.ui.editor.rules.StringWithEndingRule;
+import org.eclipse.swt.SWT;
+
+public class SpecfileScanner extends RuleBasedScanner {
+
+	private static final String[] SECTIONS = { PREP_SECTION, BUILD_SECTION, INSTALL_SECTION,
+		PRETRANS_SECTION, PRE_SECTION, PREUN_SECTION, POST_SECTION, FILES_SECTION, CHANGELOG_SECTION,
+		PACKAGE_SECTION, DESCRIPTION_SECTION, POSTUN_SECTION, POSTTRANS_SECTION, CLEAN_SECTION, 
+		CHECK_SECTION };
+
+	public static final String[] DEFINED_MACROS = {
+			"%define", "%global", "%make", "%setup", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+			"%attrib", "%defattr", "%attr", "%dir", "%config", "%docdir", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
+			"%doc", "%lang", "%verify", "%ghost" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+
+	private static final String[] KEYWORDS = { "%if", "%ifarch", "%ifnarch", "%else", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+			"%endif" }; //$NON-NLS-1$
+
+	private static final String[] TAGS = { SUMMARY, NAME, VERSION, PACKAGER, ICON,
+			URL, PREFIX, GROUP, LICENSE, RELEASE, BUILD_ROOT, DISTRIBUTION,
+			VENDOR, PROVIDES, EXCLUSIVE_ARCH, EXCLUDE_ARCH, EXCLUDE_OS,
+			BUILD_ARCH, BUILD_ARCHITECTURES, AUTO_REQUIRES, AUTO_REQ,
+			AUTO_REQ_PROV, AUTO_PROV, EPOCH };
+
+	public SpecfileScanner(ColorManager manager) {
+		super();
+		IToken sectionToken = new Token(new TextAttribute(manager
+				.getColor(ISpecfileColorConstants.SECTIONS), null, SWT.ITALIC));
+
+		IToken macroToken = new Token(new TextAttribute(manager
+				.getColor(ISpecfileColorConstants.MACROS)));
+
+		IToken keywordToken = new Token(new TextAttribute(manager
+				.getColor(ISpecfileColorConstants.KEYWORDS), null, SWT.BOLD));
+
+		IToken tagToken = new Token(new TextAttribute(manager
+				.getColor(ISpecfileColorConstants.TAGS)));
+
+		IToken commentToken = new Token(new TextAttribute(manager
+				.getColor(ISpecfileColorConstants.COMMENT)));
+
+		List<IRule> rules = new ArrayList<IRule>();
+
+		rules.add(new CommentRule(commentToken)); 
+		rules.add(new MacroRule( macroToken));
+
+		// %define, %make, ...
+		WordRule wordRule = new WordRule(new MacroWordDetector(),
+				Token.UNDEFINED);
+		for (String definedMacro : DEFINED_MACROS) {
+			wordRule.addWord(definedMacro, macroToken);
+		}
+		rules.add(wordRule);
+
+		// %patch[0-9]+[\ \t]
+		rules.add(new StringWithEndingRule("%patch", new PatchNumberDetector(), //$NON-NLS-1$
+				macroToken, false ));
+
+		// %if, %else ...
+		wordRule = new WordRule(new KeywordWordDetector(), Token.UNDEFINED);
+		for (String keyword : KEYWORDS) {
+			wordRule.addWord(keyword, keywordToken);
+		}
+		rules.add(wordRule);
+
+		// %prep, %build, ...
+		wordRule = new WordRule(new KeywordWordDetector(), Token.UNDEFINED);
+		for (String section : SECTIONS) {
+			wordRule.addWord(section, sectionToken);
+		}
+		rules.add(wordRule);
+
+		// Name:, Summary:, ...
+		wordRule = new WordRule(new TagWordDetector(), Token.UNDEFINED);
+		for (String tag : TAGS) {
+			wordRule.addWord(tag + ":", tagToken); //$NON-NLS-1$
+		}
+		rules.add(wordRule);
+
+		// Source[0-9]*:, Patch[0-9]*:
+		rules.add(new StringWithEndingRule("Source", //$NON-NLS-1$
+				new SuffixNumberDetector(), tagToken, false));
+		rules.add(new StringWithEndingRule("Patch", new SuffixNumberDetector(), //$NON-NLS-1$
+				tagToken, false));
+
+		IRule[] result = new IRule[rules.size()];
+		rules.toArray(result);
+		setRules(result);
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/wizards/Messages.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/wizards/Messages.java
new file mode 100644
index 0000000..3ed9772
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/wizards/Messages.java
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.editor.wizards;
+
+import org.eclipse.osgi.util.NLS;
+
+public final class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.rpm.ui.editor.wizards.messages"; //$NON-NLS-1$
+	public static String NoExecutableWizardPage_0;
+	public static String NoExecutableWizardPage_1;
+	public static String NoExecutableWizardPage_2;
+	public static String SpecfileNewWizard_0;
+	public static String SpecfileNewWizard_1;
+	public static String SpecfileNewWizard_2;
+	public static String SpecfileNewWizard_3;
+	public static String SpecfileNewWizard_4;
+	public static String SpecfileNewWizardPage_10;
+	public static String SpecfileNewWizardPage_11;
+	public static String SpecfileNewWizardPage_12;
+	public static String SpecfileNewWizardPage_13;
+	public static String SpecfileNewWizardPage_14;
+	public static String SpecfileNewWizardPage_15;
+	public static String SpecfileNewWizardPage_16;
+	public static String SpecfileNewWizardPage_17;
+	public static String SpecfileNewWizardPage_18;
+	public static String SpecfileNewWizardPage_19;
+	public static String SpecfileNewWizardPage_20;
+	public static String SpecfileNewWizardPage_21;
+	public static String SpecfileNewWizardPage_22;
+	public static String SpecfileNewWizardPage_23;
+	public static String SpecfileNewWizardPage_24;
+	public static String SpecfileNewWizardPage_25;
+	public static String SpecfileNewWizardPage_26;
+	public static String SpecfileNewWizardPage_27;
+	public static String SpecfileNewWizardPage_28;
+	public static String SpecfileNewWizardPage_29;
+	public static String SpecfileNewWizardPage_9;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+		super();
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/wizards/NoExecutableWizardPage.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/wizards/NoExecutableWizardPage.java
new file mode 100644
index 0000000..fcd8911
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/wizards/NoExecutableWizardPage.java
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.wizards;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+
+public class NoExecutableWizardPage extends WizardPage {
+
+	protected NoExecutableWizardPage() {
+		super(Messages.NoExecutableWizardPage_0);
+		this.setImageDescriptor(ImageDescriptor.createFromFile(getClass(),
+				"/icons/rpm.gif")); //$NON-NLS-1$
+	}
+
+	public void createControl(Composite parent) {
+		final Composite container = new Composite(parent, SWT.NULL);
+		GridLayout layout = new GridLayout();
+		container.setLayout(layout);
+		layout.numColumns = 3;
+		layout.verticalSpacing = 9;
+
+		// Project
+		Label label = new Label(container, SWT.NULL);
+		label
+				.setText(Messages.NoExecutableWizardPage_1);
+		// empty label for the last row.
+		new Label(container, SWT.NULL);
+		setControl(container);
+		this.setTitle(Messages.NoExecutableWizardPage_2);
+	}
+
+	@Override
+	public boolean isPageComplete() {
+		return false;
+	}
+	
+	
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizard.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizard.java
new file mode 100644
index 0000000..ed3fbcd
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizard.java
@@ -0,0 +1,171 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.wizards;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.linuxtools.rpm.core.utils.Utils;
+import org.eclipse.linuxtools.rpm.ui.editor.Activator;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileLog;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWizard;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.ide.IDE;
+
+public class SpecfileNewWizard extends Wizard implements INewWizard {
+	private SpecfileNewWizardPage page;
+	private ISelection selection;
+
+	/**
+	 * Constructor for SpecfileNewWizard.
+	 */
+	public SpecfileNewWizard() {
+		super();
+		setNeedsProgressMonitor(true);
+	}
+
+	/**
+	 * Adding the page to the wizard.
+	 */
+	@Override
+	public void addPages() {
+		if (!Utils.fileExist("/usr/bin/rpmdev-newspec")) { //$NON-NLS-1$
+			addPage(new NoExecutableWizardPage());
+		} else {
+			page = new SpecfileNewWizardPage(selection);
+			addPage(page);
+		}
+	}
+
+	/**
+	 * This method is called when 'Finish' button is pressed in the wizard. We
+	 * will create an operation and run it using wizard as execution context.
+	 */
+	@Override
+	public boolean performFinish() {
+		final String containerName = page.getProjectName();
+		final String fileName = page.getFileName();
+		final InputStream contentInputStream = openContentStream();
+		IRunnableWithProgress op = new IRunnableWithProgress() {
+			public void run(IProgressMonitor monitor)
+					throws InvocationTargetException {
+				try {
+					doFinish(containerName, fileName, contentInputStream,
+							monitor);
+				} catch (CoreException e) {
+					throw new InvocationTargetException(e);
+				} finally {
+					monitor.done();
+				}
+			}
+		};
+		try {
+			getContainer().run(true, false, op);
+		} catch (InterruptedException e) {
+			return false;
+		} catch (InvocationTargetException e) {
+			SpecfileLog.logError(e);
+			Throwable realException = e.getTargetException();
+			MessageDialog.openError(getShell(), Messages.SpecfileNewWizard_0,
+					realException.getMessage());
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * The worker method. It will find the container, create the file if missing
+	 * or just replace its contents, and open the editor on the newly created
+	 * file.
+	 */
+	private void doFinish(String projectName, String fileName,
+			InputStream contentInputStream, IProgressMonitor monitor)
+			throws CoreException {
+		monitor.beginTask(Messages.SpecfileNewWizard_1 + fileName, 2);
+		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+		IResource resource = root.findMember(new Path(projectName));
+		if (!resource.exists() || !(resource instanceof IContainer)) {
+			throwCoreException(Messages.SpecfileNewWizard_2 + projectName
+					+ Messages.SpecfileNewWizard_3);
+		}
+		IContainer container = (IContainer) resource;
+		final IFile file = container.getFile(new Path(fileName));
+		try {
+			InputStream stream = contentInputStream;
+			if (file.exists()) {
+				file.setContents(stream, true, true, monitor);
+			} else {
+				file.create(stream, true, monitor);
+			}
+			stream.close();
+		} catch (IOException e) {
+		}
+		monitor.worked(1);
+		monitor.setTaskName(Messages.SpecfileNewWizard_4);
+		getShell().getDisplay().asyncExec(new Runnable() {
+			public void run() {
+				IWorkbenchPage page = PlatformUI.getWorkbench()
+						.getActiveWorkbenchWindow().getActivePage();
+				try {
+					IDE.openEditor(page, file, true);
+				} catch (PartInitException e) {
+				}
+			}
+		});
+		monitor.worked(1);
+	}
+
+	/**
+	 * We will initialize file contents with the modified template text.
+	 */
+	private InputStream openContentStream() {
+		String contents = page.getContent();
+		return new ByteArrayInputStream(contents.getBytes());
+	}
+
+	private void throwCoreException(String message) throws CoreException {
+		IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID,
+				IStatus.OK, message, null);
+		throw new CoreException(status);
+	}
+
+	/**
+	 * We will accept the selection in the workbench to see if we can initialize
+	 * from it.
+	 * 
+	 * @see IWorkbenchWizard#init(IWorkbench, IStructuredSelection)
+	 */
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.selection = selection;
+	}
+}
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizardPage.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizardPage.java
new file mode 100644
index 0000000..a6853b2
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizardPage.java
@@ -0,0 +1,442 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Alphonse Van Assche.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Alphonse Van Assche - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui.editor.wizards;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
+import java.util.List;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.IDialogPage;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.window.Window;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.linuxtools.rpm.ui.editor.Activator;
+import org.eclipse.linuxtools.rpm.ui.editor.SpecfileLog;
+import org.eclipse.linuxtools.rpm.ui.editor.UiUtils;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.dialogs.ContainerSelectionDialog;
+
+public class SpecfileNewWizardPage extends WizardPage {
+
+	private static final String NAME = "package_name"; //$NON-NLS-1$
+
+	private static final String VERSION = "1.0"; //$NON-NLS-1$
+
+	private static final String SUMMARY = "Summary of the package"; //$NON-NLS-1$
+
+	private static final String GROUP = "Amusements/Games"; //$NON-NLS-1$
+
+	private static final String LICENSE = "GPL"; //$NON-NLS-1$
+
+	private static final String URL = "http://"; //$NON-NLS-1$
+
+	private static final String SOURCE0 = "archive_name-%{version}"; //$NON-NLS-1$
+
+	private Text projectText;
+
+	private Text nameText;
+
+	private Text versionText;
+
+	private Text summaryText;
+
+	private Combo groupCombo;
+
+	private Text licenseText;
+
+	private Text urlText;
+
+	private Text source0Text;
+
+	private GridData gd;
+
+	private Combo templateCombo;
+
+	private ISelection selection;
+
+	private String selectedTemplate = "minimal"; //$NON-NLS-1$
+
+	private String content;
+
+	/**
+	 * Constructor for SpecfileNewWizardPage.
+	 * 
+	 * @param selection The selection to put the new spec file in.
+	 */
+	public SpecfileNewWizardPage(ISelection selection) {
+		super("wizardPage"); //$NON-NLS-1$
+		setTitle(Messages.SpecfileNewWizardPage_9);
+		setDescription(Messages.SpecfileNewWizardPage_10);
+		this.selection = selection;
+	}
+
+	/**
+	 * @see IDialogPage#createControl(Composite)
+	 */
+	public void createControl(Composite parent) {
+		final Composite container = new Composite(parent, SWT.NULL);
+		GridLayout layout = new GridLayout();
+		container.setLayout(layout);
+		layout.numColumns = 3;
+		layout.verticalSpacing = 9;
+
+		// Project
+		Label label = new Label(container, SWT.NULL);
+		label.setText(Messages.SpecfileNewWizardPage_11);
+		projectText = new Text(container, SWT.BORDER | SWT.SINGLE);
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		projectText.setLayoutData(gd);
+		projectText.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				dialogChanged();
+			}
+		});
+		Button button = new Button(container, SWT.PUSH);
+		button.setText(Messages.SpecfileNewWizardPage_12);
+		button.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				handleBrowse();
+			}
+		});
+
+		// Template to use
+		label = new Label(container, SWT.NULL);
+		label.setText(Messages.SpecfileNewWizardPage_13);
+		templateCombo = new Combo(container, SWT.NULL);
+		try {
+			populateTemplateCombo(templateCombo);
+		} catch (CoreException e2) {
+			SpecfileLog.logError(e2);
+		}
+		// empty label for the last row.
+		label = new Label(container, SWT.NULL);
+		templateCombo.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				selectedTemplate = ((Combo) e.getSource()).getText();
+				InputStream inputStream = runRpmdevNewSpec(selectedTemplate);
+				LineNumberReader reader = new LineNumberReader(
+						new InputStreamReader(inputStream));
+				String line;
+				try {
+					content = ""; //$NON-NLS-1$
+					setDefaultValues();
+					while ((line = reader.readLine()) != null) {
+						if (line.startsWith("Name:")) { //$NON-NLS-1$
+							setTemplateTagValue(nameText, line);
+						}
+						if (line.startsWith("Version:")) { //$NON-NLS-1$
+							setTemplateTagValue(versionText, line);
+						}
+						if (line.startsWith("Summary:")) { //$NON-NLS-1$
+							setTemplateTagValue(summaryText, line);
+						}
+						if (line.startsWith("Group:")) { //$NON-NLS-1$
+							String[] items = line.split(":", 2); //$NON-NLS-1$
+							String value = items[1].trim();
+							if (!value.equals("")) //$NON-NLS-1$
+								groupCombo.setText(value);
+						}
+						if (line.startsWith("License:")) { //$NON-NLS-1$
+							setTemplateTagValue(licenseText, line);
+						}
+						if (line.startsWith("URL:")) { //$NON-NLS-1$
+							setTemplateTagValue(urlText, line);
+						}
+						if (line.startsWith("Source0:")) { //$NON-NLS-1$
+							setTemplateTagValue(source0Text, line);
+						}
+						content += line + '\n';
+					}
+				} catch (IOException e1) {
+					SpecfileLog.logError(e1);
+				}
+			}
+		});
+
+		// Package Name
+		nameText = setTextItem(container, Messages.SpecfileNewWizardPage_14);
+
+		// Package Version
+		versionText = setTextItem(container, Messages.SpecfileNewWizardPage_15);
+
+		// Package Summary
+		summaryText = setTextItem(container, Messages.SpecfileNewWizardPage_16);
+
+		// Package Group
+		label = new Label(container, SWT.NULL);
+		label.setText(Messages.SpecfileNewWizardPage_17);
+		groupCombo = new Combo(container, SWT.NULL);
+		populateGroupCombo(groupCombo);
+		// empty label for the last row.
+		new Label(container, SWT.NULL);
+
+		// Package License
+		licenseText = setTextItem(container, Messages.SpecfileNewWizardPage_18);
+
+		// Package URL
+		urlText = setTextItem(container, Messages.SpecfileNewWizardPage_19);
+
+		// Package Source0
+		source0Text = setTextItem(container, Messages.SpecfileNewWizardPage_20);
+
+		initialize();
+		dialogChanged();
+		setControl(container);
+	}
+
+	private Text setTextItem(Composite container, String textLabel) {
+		Label label = new Label(container, SWT.NULL);
+		label.setText(textLabel);
+		Text text = new Text(container, SWT.BORDER | SWT.SINGLE);
+		text.setLayoutData(gd);
+		text.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				dialogChanged();
+			}
+		});
+		// empty label for the last row.
+		new Label(container, SWT.NULL);
+		return text;
+	}
+
+	private void setTemplateTagValue(Text text, String line) {
+		String[] items = line.split(":", 2); //$NON-NLS-1$
+		String value = items[1].trim();
+		if (!value.equals("")) { //$NON-NLS-1$
+			text.setText(value);
+		}
+	}
+
+	public String getProjectName() {
+		return projectText.getText();
+	}
+
+	public String getFileName() {
+		return nameText.getText() + ".spec"; //$NON-NLS-1$
+	}
+
+	public String getSelectedTemplate() {
+		return selectedTemplate;
+	}
+
+	public String getContent() {
+		InputStream inputStream = runRpmdevNewSpec(selectedTemplate);
+		LineNumberReader reader = new LineNumberReader(new InputStreamReader(
+				inputStream));
+		String line;
+		try {
+			content = ""; //$NON-NLS-1$
+			while ((line = reader.readLine()) != null) {
+				if (line.startsWith("Name:")) { //$NON-NLS-1$
+					line = "Name:" + "           " + nameText.getText(); //$NON-NLS-1$ //$NON-NLS-2$
+				}
+				if (line.startsWith("Version:")) { //$NON-NLS-1$
+					line = "Version:" + "        " + versionText.getText(); //$NON-NLS-1$ //$NON-NLS-2$
+				}
+				if (line.startsWith("Summary:")) { //$NON-NLS-1$
+					line = "Summary:" + "        " + summaryText.getText(); //$NON-NLS-1$ //$NON-NLS-2$
+				}
+				if (line.startsWith("Group:")) { //$NON-NLS-1$
+					line = "Group:" + "          " + groupCombo.getText(); //$NON-NLS-1$ //$NON-NLS-2$
+				}
+				if (line.startsWith("License:")) { //$NON-NLS-1$
+					line = "License:" + "        " + licenseText.getText(); //$NON-NLS-1$ //$NON-NLS-2$
+				}
+				if (line.startsWith("URL:")) { //$NON-NLS-1$
+					line = "URL:" + "            " + urlText.getText(); //$NON-NLS-1$ //$NON-NLS-2$
+				}
+				if (line.startsWith("Source0:")) { //$NON-NLS-1$
+					line = "Source0:" + "        " + source0Text.getText(); //$NON-NLS-1$ //$NON-NLS-2$
+				}
+				content += line + '\n';
+			}
+		} catch (IOException e1) {
+			SpecfileLog.logError(e1);
+		}
+		return content;
+	}
+
+	/**
+	 * Tests if the current workbench selection is a suitable container to use.
+	 */
+	private void initialize() {
+		if (selection != null && selection.isEmpty() == false
+				&& selection instanceof IStructuredSelection) {
+			IStructuredSelection ssel = (IStructuredSelection) selection;
+			if (ssel.size() > 1)
+				return;
+			Object obj = ssel.getFirstElement();
+			if (obj instanceof IResource) {
+				IContainer container;
+				if (obj instanceof IContainer)
+					container = (IContainer) obj;
+				else
+					container = ((IResource) obj).getParent();
+				projectText.setText(container.getFullPath().toString());
+			}
+		}
+		setDefaultValues();
+	}
+
+	/**
+	 * Uses the standard container selection dialog to choose the new value for
+	 * the container field.
+	 */
+	private void handleBrowse() {
+		ContainerSelectionDialog dialog = new ContainerSelectionDialog(
+				getShell(), ResourcesPlugin.getWorkspace().getRoot(), false,
+				Messages.SpecfileNewWizardPage_21);
+		if (dialog.open() == Window.OK) {
+			Object[] result = dialog.getResult();
+			if (result.length == 1) {
+				projectText.setText(((Path) result[0]).toString());
+			}
+		}
+	}
+
+	/**
+	 * Ensures that both text fields are set.
+	 */
+	private void dialogChanged() {
+		IResource container = ResourcesPlugin.getWorkspace().getRoot()
+				.findMember(new Path(getProjectName()));
+		String fileName = getFileName();
+		if (getProjectName().length() == 0) {
+			updateStatus(Messages.SpecfileNewWizardPage_22);
+			return;
+		}
+		if (container == null
+				|| (container.getType() & (IResource.PROJECT | IResource.FOLDER)) == 0) {
+			updateStatus(Messages.SpecfileNewWizardPage_23);
+			return;
+		}
+		if (!container.isAccessible()) {
+			updateStatus(Messages.SpecfileNewWizardPage_24);
+			return;
+		}
+		if (fileName.length() == 0) {
+			updateStatus(Messages.SpecfileNewWizardPage_25);
+			return;
+		}
+
+		/*
+		 * Current RPM doc content (4.4.2):
+		 * Names must not include whitespace and may include a hyphen '-'
+		 * (unlike version and releasetags). Names should not include any
+		 * numeric operators ('<', '>','=') as future versions of rpm may need
+		 * to reserve characters other than '-'.
+		 * 
+		 */
+		String packageName = nameText.getText();
+		if (packageName.indexOf(" ") != -1 || packageName.indexOf("<") != -1 //$NON-NLS-1$ //$NON-NLS-2$
+				|| packageName.indexOf(">") != -1 || packageName.indexOf("=") != -1){ //$NON-NLS-1$ //$NON-NLS-2$
+			updateStatus(Messages.SpecfileNewWizardPage_26
+					+ Messages.SpecfileNewWizardPage_27);
+			return;
+		}
+
+		if (versionText.getText().indexOf("-") > -1) { //$NON-NLS-1$
+			updateStatus(Messages.SpecfileNewWizardPage_28);
+			return;
+		}
+
+		updateStatus(null);
+	}
+
+	private void updateStatus(String message) {
+		setErrorMessage(message);
+		setPageComplete(message == null);
+	}
+
+	private void setDefaultValues() {
+		nameText.setText(NAME);
+		versionText.setText(VERSION);
+		summaryText.setText(SUMMARY);
+		groupCombo.setText(GROUP);
+		licenseText.setText(LICENSE);
+		urlText.setText(URL);
+		source0Text.setText(SOURCE0);
+	}
+
+	private void populateTemplateCombo(Combo templateCombo) throws CoreException {
+		// get a list of all files in a directory
+		File dir = new File("/etc/rpmdevtools"); //$NON-NLS-1$
+		String[] files = dir.list();
+		if (dir.exists()) {
+			String templateCSV = ""; //$NON-NLS-1$
+			for (String file : files) {
+				if (file.startsWith("spectemplate-")) //$NON-NLS-1$
+					templateCSV += file.split("-", 2)[1].replaceAll("\\.spec", //$NON-NLS-1$ //$NON-NLS-2$
+							"") //$NON-NLS-1$
+							+ ","; //$NON-NLS-1$
+			}
+			String[] templates = templateCSV.split(","); //$NON-NLS-1$
+			for (String template: templates) {
+				templateCombo.add(template);
+			}
+			templateCombo.setText(selectedTemplate);			
+		} else {
+			throwCoreException(Messages.SpecfileNewWizardPage_29);
+		}
+	}
+
+	private void populateGroupCombo(Combo groupsCombo) {
+		List<String> rpmGroups = Activator.getDefault().getRpmGroups();
+		for (String rpmGroup : rpmGroups) {
+			groupsCombo.add(rpmGroup);
+		}
+	}
+
+	private BufferedInputStream runRpmdevNewSpec(String template) {
+		BufferedInputStream in = null;
+		// Here we assuming that the rpmdevtools package is installed.
+		try {
+			in = org.eclipse.linuxtools.rpm.core.utils.Utils.runCommandToInputStream("rpmdev-newspec", "-o", "-", "-t", template ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		} catch (IOException e) {
+			// FIXME: rpmdev-newspec is not in the system $PATH, what should we do here?.
+			SpecfileLog.logError(e);
+		}
+		return in;
+	}
+	
+	private void throwCoreException(String message) throws CoreException {
+		IStatus status = new Status(IStatus.ERROR,
+				Activator.PLUGIN_ID, IStatus.OK, message,
+				null);
+		throw new CoreException(status);
+	}
+
+}
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/wizards/messages.properties b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/wizards/messages.properties
new file mode 100644
index 0000000..bc28451
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/wizards/messages.properties
@@ -0,0 +1,39 @@
+NoExecutableWizardPage_1=Executable rpmdev-newspec can not be found on PATH. \nPlease verify it is installed and on your PATH in order to make this wizard work.
+NoExecutableWizardPage_2=rpmdev-newspec can not be executed
+###############################################################################
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+NoExecutableWizardPage_0=Error
+SpecfileNewWizard_0=Error
+SpecfileNewWizard_1=Creating 
+SpecfileNewWizard_2=Project "
+SpecfileNewWizard_3=" does not exist.
+SpecfileNewWizard_4=Opening file for editing...
+SpecfileNewWizardPage_10=This wizard creates a new specfile based on a selected template.
+SpecfileNewWizardPage_11=&Project:
+SpecfileNewWizardPage_12=Select a project...
+SpecfileNewWizardPage_13=Select a Template:
+SpecfileNewWizardPage_14=&Name:
+SpecfileNewWizardPage_15=&Version:
+SpecfileNewWizardPage_16=&Summary:
+SpecfileNewWizardPage_17=&Group:
+SpecfileNewWizardPage_18=&License:
+SpecfileNewWizardPage_19=&URL:
+SpecfileNewWizardPage_20=Source&0:
+SpecfileNewWizardPage_21=Select new file container
+SpecfileNewWizardPage_22=File container must be specified
+SpecfileNewWizardPage_23=The Project must exist
+SpecfileNewWizardPage_24=Project must be writable
+SpecfileNewWizardPage_25=Spec file name must be specified
+SpecfileNewWizardPage_26=The Name tag must not include whitespace and 
+SpecfileNewWizardPage_27=should not include any numeric operators ('<', '>','=')
+SpecfileNewWizardPage_28=Please, no dashes in the version\!
+SpecfileNewWizardPage_29=/etc/rpmdevtools directory was not found
+SpecfileNewWizardPage_9=New specfile based on a template
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/templates/templates.xml b/rpm/org.eclipse.linuxtools.rpm.ui.editor/templates/templates.xml
new file mode 100644
index 0000000..38d1b86
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/templates/templates.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="ISO-8859-1"?><!--
+    Copyright (c) 2009 Red Hat, Inc.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+    
+    Contributors:
+        Red Hat - initial API and implementation
+ -->
+
+<templates>
+
+<!-- PREAMBLE SECTION TEMPLATES -->
+<template id="prep" name="%prep" description="%prep template" context="org.eclipse.linuxtools.rpm.ui.editor.preambleSection" enabled="true">%prep
+</template>
+<template id="define" name="%define" description="%define template" context="org.eclipse.linuxtools.rpm.ui.editor.preambleSection" enabled="true">%define ${key} ${value}</template>
+<template id="name" name="Name:" description="Name template" context="org.eclipse.linuxtools.rpm.ui.editor.preambleSection" enabled="true">Name: ${package_name}</template>
+<template id="url" name="URL:" description="Url template" context="org.eclipse.linuxtools.rpm.ui.editor.preambleSection" enabled="true">Url: ${package_url}</template>
+<template id="license" name="License:" description="License template" context="org.eclipse.linuxtools.rpm.ui.editor.preambleSection" enabled="true">License: ${package_name}</template>
+<template id="group" name="Group:" description="Group template" context="org.eclipse.linuxtools.rpm.ui.editor.preambleSection" enabled="true">Group: ${package_group}</template>
+<template id="version" name="Version:" description="Version template" context="org.eclipse.linuxtools.rpm.ui.editor.preambleSection" enabled="true">Version: ${package_name}</template>
+<template id="release" name="Release:" description="Release template" context="org.eclipse.linuxtools.rpm.ui.editor.preambleSection" enabled="true">Release: ${package_name}%{?dist}</template>
+<template id="summary" name="Summary:" description="Summary template" context="org.eclipse.linuxtools.rpm.ui.editor.preambleSection" enabled="true">Summary: ${package_name}</template>
+<template id="buildRoot" name="BuildRoot:" description="BuildRoot template" context="org.eclipse.linuxtools.rpm.ui.editor.preambleSection" enabled="true">BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)</template>
+<template id="excludeArch" name="ExcludeArch:" description="ExcludeArch template" context="org.eclipse.linuxtools.rpm.ui.editor.preambleSection" enabled="true">ExcludeArch: ${exluded_arches}</template>
+<template id="requires" name="Requires" description="Requires template" context="org.eclipse.linuxtools.rpm.ui.editor.preambleSection" enabled="true">Requires: ${package_name}</template>
+<template id="requiresPre" name="Requires" description="Requires(pre) template" context="org.eclipse.linuxtools.rpm.ui.editor.preambleSection" enabled="true">Requires(pre): ${package_name}</template>
+<template id="requiresPost" name="Requires" description="Requires(post) template" context="org.eclipse.linuxtools.rpm.ui.editor.preambleSection" enabled="true">Requires(post): ${package_name}</template>
+<template id="buildRequires" name="BuildRequires:" description="BuildRequires template" context="org.eclipse.linuxtools.rpm.ui.editor.preambleSection" enabled="true">BuildRequires: ${package_name}</template>
+<template id="source" name="Source:" description="Source template" context="org.eclipse.linuxtools.rpm.ui.editor.preambleSection" enabled="true">Source${src_number}: ${source_filename}</template>
+<template id="sourceZero" name="Source0:" description="Source0 template" context="org.eclipse.linuxtools.rpm.ui.editor.preambleSection" enabled="true">Source0: %{name}-%{version}.tar.${bz2}</template>
+<template id="patch" name="Patch:" description="Patch template" context="org.eclipse.linuxtools.rpm.ui.editor.preambleSection" enabled="true">Patch${patch_number}: ${path_filename}</template>
+<template id="description" name="%description" description="%description main package template" context="org.eclipse.linuxtools.rpm.ui.editor.preambleSection" enabled="true">%description
+${package_description}
+</template>
+<template id="package" name="%package template" description="Add a package template" context="org.eclipse.linuxtools.rpm.ui.editor.preambleSection" enabled="true">%package ${package_name}</template>
+<template id="develPackage" name="%package devel template" description="Add a devel package template" context="org.eclipse.linuxtools.rpm.ui.editor.preambleSection" enabled="true">%package devel
+Summary: Development packages for %{name}.
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: ${package_name}
+</template>
+<template id="develDescription" name="%description devel" description="Add a devel package template" context="org.eclipse.linuxtools.rpm.ui.editor.preambleSection" enabled="true">%description devel
+The %{name}-devel package includes the header files
+and developer docs for the %{name} package.
+${more_dev_informations_on_this_devel_package}
+</template>
+
+<!-- PRE SECTION TEMPLATES -->
+<template id="build" name="%build" description="%build template" context="org.eclipse.linuxtools.rpm.ui.editor.preSection" enabled="true">%build
+</template>
+<template id="setup" name="%setup" description="setup -q template" context="org.eclipse.linuxtools.rpm.ui.editor.preSection" enabled="true">%setup -q</template>
+<template id="setupName" name="%setup" description="setup -q -n template" context="org.eclipse.linuxtools.rpm.ui.editor.preSection" enabled="true">%setup -q -n ${dir_name}</template>
+<template id="simplePatch" name="%patch" description="Add a simple patch entry" context="org.eclipse.linuxtools.rpm.ui.editor.preSection" enabled="true">%patch${patch_nbr} -b .${bkup_name}</template>
+<template id="levelPatch" name="%patch" description="Add a patch entry with source level" context="org.eclipse.linuxtools.rpm.ui.editor.preSection" enabled="true">%patch${patch_nbr} -p${src_level} -b .${bkup_name}</template>
+
+
+<!-- BUILD SECTION TEMPLATES -->
+<template id="install" name="%install" description="%install template" context="org.eclipse.linuxtools.rpm.ui.editor.buildSection" enabled="true">%install
+</template>
+<template id="configure" name="%configure" description="%configure template" context="org.eclipse.linuxtools.rpm.ui.editor.buildSection" enabled="true">%configure ${param}</template>
+<template id="make" name="make" description="make template" context="org.eclipse.linuxtools.rpm.ui.editor.buildSection" enabled="true">make</template>
+<template id="makeSmpFlag" name="make %{?_smp_mflags}" description="make template with smp macro" context="org.eclipse.linuxtools.rpm.ui.editor.buildSection" enabled="true">make %{?_smp_mflags}</template>
+
+<!-- INSTALL SECTION TEMPLATES -->
+<template id="changelog" name="%changelog" description="%changelog template" context="org.eclipse.linuxtools.rpm.ui.editor.installSection" enabled="true">%changelog</template>
+<template id="defattr" name="%defattr" description="%defattr template" context="org.eclipse.linuxtools.rpm.ui.editor.installSection" enabled="true">%defattr(-, root, root, -)</template>
+<template id="doc" name="%doc" description="%doc template" context="org.eclipse.linuxtools.rpm.ui.editor.installSection" enabled="true">%doc ${COPYING} ${AUTHORS} ${INSTALL} ${README}</template>
+<template id="post" name="%post" description="%post section template" context="org.eclipse.linuxtools.rpm.ui.editor.installSection" enabled="true">%post</template>
+<template id="pre" name="%pre" description="%pre section template" context="org.eclipse.linuxtools.rpm.ui.editor.installSection" enabled="true">%pre</template>
+<template id="preun" name="%preun" description="%preun section template" context="org.eclipse.linuxtools.rpm.ui.editor.installSection" enabled="true">%preun</template>
+<template id="clean" name="%clean" description="%clean section template" context="org.eclipse.linuxtools.rpm.ui.editor.installSection" enabled="true">%clean
+rm -rf %{buildroot}
+</template>
+<template id="files" name="%files" description="%files section template" context="org.eclipse.linuxtools.rpm.ui.editor.installSection" enabled="true">%files
+%defattr(-, root, root, -)
+</template>
+<template id="filesDevel" name="%files devel" description="%files devel section template" context="org.eclipse.linuxtools.rpm.ui.editor.installSection" enabled="true">%files devel
+%defattr(-, root, root, -)
+</template>
+<template id="rm" name="rm" description="remove command template" context="org.eclipse.linuxtools.rpm.ui.editor.installSection" enabled="true">rm</template>
+<template id="rmBuildRoot" name="rm" description="rm -rf ${buildroot} template" context="org.eclipse.linuxtools.rpm.ui.editor.installSection" enabled="true">rm -rf %{buildroot}</template>
+<template id="makeInstall" name="make DESTDIR=" description="make DESTDIR" context="org.eclipse.linuxtools.rpm.ui.editor.installSection" enabled="true">make DESTDIR=%{buildroot} install || exit 1</template>
+<template id="desktopFileInstall" name="desktop-file-install" description="desktop-file-install template" context="org.eclipse.linuxtools.rpm.ui.editor.installSection" enabled="true">desktop-file-install --vendor ${vendor} \
+	--dir %{buildroot}%{_datadir}/applications \
+	--add-category ${app_category} \
+	%{buildroot}%{_datadir}/applications/${desktopfile_name}.desktop
+</template>
+<template id="updateDesktopDB" name="update-desktop-database" description="desktop-file-install template" context="org.eclipse.linuxtools.rpm.ui.editor.installSection" enabled="true">update-desktop-database -q %{_datadir}/applications</template>
+
+<!-- CHANGELOG SECTION TEMPLATES -->
+<template id="fix" name="fix" description="fix changelog message template" context="org.eclipse.linuxtools.rpm.ui.editor.changelogSection" enabled="true">fix: ${fix_msg} (#${bz_id})</template>
+<template id="bump" name="bump" description="bump changelog message template" context="org.eclipse.linuxtools.rpm.ui.editor.changelogSection" enabled="true">bump to ${versions} version.</template>
+
+</templates>
diff --git a/profiling/.classpath b/rpm/org.eclipse.linuxtools.rpm.ui/.classpath
similarity index 100%
copy from profiling/.classpath
copy to rpm/org.eclipse.linuxtools.rpm.ui/.classpath
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/.cvsignore b/rpm/org.eclipse.linuxtools.rpm.ui/.cvsignore
new file mode 100644
index 0000000..ba077a4
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/.cvsignore
@@ -0,0 +1 @@
+bin
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/.project b/rpm/org.eclipse.linuxtools.rpm.ui/.project
new file mode 100644
index 0000000..37dc27e
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/.project
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.rpm.ui</name>
+	<comment></comment>
+	<projects>
+		<project>com.redhat.eclipse.rpm.core</project>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/.settings/org.eclipse.core.resources.prefs b/rpm/org.eclipse.linuxtools.rpm.ui/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..678ba62
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+#Mon Jan 29 17:24:34 EST 2007
+eclipse.preferences.version=1
+encoding//src/org/eclipse/linuxtools/rpm/ui/propertypage/messages.properties=8859_1
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/.settings/org.eclipse.jdt.core.prefs b/rpm/org.eclipse.linuxtools.rpm.ui/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..2f21a52
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,87 @@
+#Fri Jan 08 17:16:04 EET 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/.settings/org.eclipse.jdt.ui.prefs b/rpm/org.eclipse.linuxtools.rpm.ui/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..8fbccf7
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,54 @@
+#Fri Dec 18 15:01:45 EET 2009
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=false
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/.template b/rpm/org.eclipse.linuxtools.rpm.ui/.template
new file mode 100644
index 0000000..d65e0f4
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/.template
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+   <p/><p><b>Tips on working with this plug-in project</b></p><li>For the view of the new plug-in at a glance, go to the <img href="pageImage"/><a href="OverviewPage">Overview</a>.</li><li>You can test the contributions of this plug-in by launching another instance of the workbench. On the <b>Run</b> menu, click <b>Run As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.run">Run-time Workbench</a> from the available choices.</li><li>You can add more functionality to this plug-in by adding extensions using the <a href="action.newExtension">New Extension Wizard</a>.</li><li>The plug-in project contains Java code that you can debug. Place breakpoints in Java classes. On the <b>Run</b> menu, select <b>Debug As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.debug">Run-time Workbench</a> from the available choices.</li>
+</form>
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/ChangeLog b/rpm/org.eclipse.linuxtools.rpm.ui/ChangeLog
new file mode 100644
index 0000000..5311c8e
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/ChangeLog
@@ -0,0 +1,649 @@
+2010-03-14  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* OSGI-INF/l10n/bundle.properties: Remove redundant New.
+
+2010-01-12  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* .settings/org.eclipse.jdt.core.prefs: Enable more warnings.
+
+2010-01-08  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/RPMExportOperation.java (run): Adapt to RPMBuild api changes.
+
+2010-01-07  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/util/ExceptionHandler.java: Removed.
+	* META-INF/MANIFEST.MF: Do not export removed package.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/ChangelogPage.java (addChangelogField): Uses StatusManger for error reporting.
+	(RPM_CHANGELOG_ENTRIES): Formatted.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/InstallScriptsPage.java (RPM_POST_UNINSTALL): Likewise.
+	(RPM_POST_INSTALL): Likewise.
+	(addScriptFields): Use StatusManger for error reporting.
+	(RPM_PRE_INSTALL): Formatted.
+	(RPM_PRE_UNINSTALL): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/Messages.java (getString): Remove not needed TODO.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/messages.properties: Remove not needed string.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/ProvidesPage.java (addProvidesField): Uses StatusManager for error reporting.
+	(RPM_QL): Formatted.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/SpecFileHeaderPage.java (RPM_QI): Likewise. 
+	(addInfoField): Uses StatusManager for error reporting.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/TargetPage.java (RPM_TIME): Formatted. 
+	(RPM_ARCH): Likewise.
+	(RPM_PLATFORM): Likewise. 
+	(RPM_HOST): Likewise.
+	(addTargetFields): Uses StatusManager for error reporting.
+
+2009-12-18  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* plugin.xml: Accept IResource for export wizard.
+	* src/org/eclipse/linuxtools/rpm/ui/rpm_strings.properties: Add new strings.
+	* src/org/eclipse/linuxtools/rpm/ui/RPMExportPage.java (getExportType): Format.
+	(createErrorControls): New method.
+	(RPMExportPage): Accept IProject.
+	(createExportTypeControls): Format.
+	(createControl): Invoke createErrorControls.
+	(canFinish): Check whether there is a project.
+	* src/org/eclipse/linuxtools/rpm/ui/RPMExportWizard.java (performFinish): Format.
+	(addPages): Handle resources and find the parent project.
+	(init): Format.
+	
+2009-12-18  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* plugin.xml: Move all rpm wizards to their own category.
+	
+2009-12-18  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/rpm_strings.properties: Indicate that the new project is going to be rpm project.
+	* src/org/eclipse/linuxtools/rpm/ui/SRPMImportPage.java (getNewProject): Run RPMNewProject instead of the generic new project.
+	 
+2009-12-18  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* .settings/org.eclipse.jdt.ui.prefs: Enable save actions.
+
+2009-08-07  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* OSGI-INF/l10n/bundle.properties: Fix provider to be Eclipse not Eclipse.org.
+
+2009-07-21  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/RPMExportPage.java (RPMExportPage): Create RPMProject directly.
+	* src/org/eclipse/linuxtools/rpm/ui/SRPMImportOperation.java (run): Likewise.
+	
+2009-07-21  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/RPMExportOperation.java (RPMExportOperation): Use RPMProject directly.
+	* src/org/eclipse/linuxtools/rpm/ui/RPMExportPage.java (getSelectedRPMProject): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/SRPMImportOperation.java (run): Likewise.
+
+2009-07-17  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* OSGI-INF/l10n/bundle.properties: New file.
+	* build.properties: Include file containing l10n data.
+	* META-INF/MANIFEST.MF: Externalize strings.
+	* plugin.xml: Likewise.
+
+2009-07-16  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* build.properties: Simplify build.
+	* META-INF/MANIFEST.MF: Likewise.
+	
+2009-07-16  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* META-INF/MANIFEST.MF: Require o.e.ui.console.
+	* src/org/eclipse/linuxtools/rpm/ui/RPMExportOperation.java (getStatus): Format.
+	(findConsole): Utility method for retrieving the console to write to.
+	(run): Read the input stream and dump it to the console.
+
+2009-07-02  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/rpm_strings.properties: Add new strings.
+	* src/org/eclipse/linuxtools/rpm/ui/RPMExportWizard.java (performFinish): Run export as Job.
+	(canFinish): Simplify.
+	* src/org/eclipse/linuxtools/rpm/ui/RPMNewProject.java (RPMNewProject): Removed. 
+	(createProject): Use constants.
+	(init): Externalize strings.
+
+2009-06-29  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* .settings/org.eclipse.jdt.core.prefs: Enable more warnings.
+	* src/org/eclipse/linuxtools/rpm/ui/IRPMUIConstants.java: Make build type an enum.
+	* src/org/eclipse/linuxtools/rpm/ui/RPMExportOperation.java (RPMExportOperation): Likewise.
+	(run): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/RPMExportPage.java (getExportType): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/RPMNewProject.java (.execute): Add missing @Override.
+
+2009-06-25  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* build.properties: Add copyright.
+	* src/org/eclipse/linuxtools/rpm/ui/IRPMUIConstants.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/Messages.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/ChangelogPage.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/InstallScriptsPage.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/Messages.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/messages.properties: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/ProvidesPage.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/SpecFileHeaderPage.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/TargetPage.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/rpm_strings.properties: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/RPMExportOperation.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/RPMExportPage.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/RPMExportWizard.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/RPMUIPlugin.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/SRPMImportOperation.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/SRPMImportPage.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/SRPMImportWizard.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/util/ExceptionHandler.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/RPMNewProject.java: New file.
+	* plugin.xml: Add copyright and new wizard for creating rpm project.
+	
+
+2009-06-09  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/logviewer/LogReader.java: Removed.
+	* src/org/eclipse/linuxtools/rpm/ui/logviewer/RPMLogViewer.java: Removed.
+	* META-INF/MANIFEST.MF: Remove non working log viewer.
+	* plugin.xml: Likewise.
+	
+2009-06-09  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/RPMExportPatchPage.java: Removed.
+	* .settings/org.eclipse.jdt.core.prefs: Enable more warnings.
+	* plugin.xml: Fix ids to o.e.linuxtools from o.e.cdt.
+	* src/org/eclipse/linuxtools/rpm/ui/logviewer/LogReader.java (run): Remove not needed NON-NLS.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/ChangelogPage.java (addChangelogField): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/InstallScriptsPage.java (addScriptFields): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/ProvidesPage.java (addProvidesField): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/SpecFileHeaderPage.java (addInfoField): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/TargetPage.java (addTargetFields): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/RPMExportOperation.java (RPMExportOperation): Adapt to RPMExportDelta removal.
+	(run): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/RPMExportPage.java (getExportType): Major simplification.
+	(handleEvent): Likewise.
+	(RPMExportPage): Likewise.
+	(createControl): Likewise.
+	(canFinish): Likewise.
+	(rpmProject): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/RPMExportWizard.java (performFinish): Remove not needed checks.
+	(canFinish): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/RPMUIPlugin.java (getImageDescriptor): Remove not needed NON-NLS.
+	(getResourceBundle): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/SRPMImportOperation.java (run): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/SRPMImportPage.java (SRPMImportPage): Likewise.
+	(canFinish): Likewise.
+
+2009-06-08  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/RPMExportPage.java (createProjectBox): Update to latest o.e.l.rpm.core API.
+	(setSpecFileField): Likewise.
+	(.handleEvent): Likewise.
+	(createControl): Likewise.
+	(createSpacer): Likewise.
+
+2009-06-03  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* .classpath: Update classpath.
+	* plugin.xml: Remove old attributes.
+
+2009-05-28  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* .settings/org.eclipse.jdt.core.prefs: New file.
+	* META-INF/MANIFEST.MF: BREE J2SE-1.5.
+	* src/org/eclipse/linuxtools/rpm/ui/IRPMUIConstants.java: More dead code removal.
+	* src/org/eclipse/linuxtools/rpm/ui/logviewer/RPMLogViewer.java (setFocus): Add @Override.
+	(dispose): Likewise.
+	(createPartControl): Likewise. 
+	(ViewLabelProvider.getImage): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/ChangelogPage.java (createContents): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/InstallScriptsPage.java (createContents): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/ProvidesPage.java (createContents): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/SpecFileHeaderPage.java (createContents): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/TargetPage.java (createContents): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/RPMExportPatchPage.java: Remove unneeded imports.
+	* src/org/eclipse/linuxtools/rpm/ui/RPMExportWizard.java (performFinish): Add @Override.
+	(addPages): Add @Override.
+	(canFinish): Add @Override.
+	* src/org/eclipse/linuxtools/rpm/ui/RPMUIPlugin.java (stop): Likewise.
+	(start): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/SRPMImportPage.java (getSelectedSRPM): Fix comparison.
+	* src/org/eclipse/linuxtools/rpm/ui/SRPMImportWizard.java (performFinish): Add @Override.
+	(addPages): Likewise.
+	(canFinish): Likewise.
+
+2009-05-28  Alexander Kurtakov  <akurtako@redhat.com>
+	Remove preference page it was done in the rpm.ui.editor package long ago.
+	* src/org/eclipse/linuxtools/rpm/ui/preferences/RPMPluginPreferencesPage.java: Removed.
+	* META-INF/MANIFEST.MF: Don't export not existing package.
+	* plugin.xml: Remove references for the preference page.
+	
+2009-05-28  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpm/ui/logviewer/LogReader.java: Remove dead code.
+	* src/org/eclipse/linuxtools/rpm/ui/logviewer/RPMLogViewer.java (dispose): Likewise.
+	(createPartControl): Likewise.
+	(_defineLayout): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/preferences/RPMPluginPreferencesPage.java (createTextField):Likewise. 
+	(initializeDefaults): Likewise.
+	(createBrowseButton): Likewise.
+	(init): Likewise.
+	(createComposite): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/ChangelogPage.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/InstallScriptsPage.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/ProvidesPage.java (addProvidesField): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/SpecFileHeaderPage.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/propertypage/TargetPage.java (addTargetFields): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/RPMExportOperation.java (getStatus): Likewise.
+	(run): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/RPMExportPage.java (createProjectBox): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/RPMExportPatchPage.java (patchTag): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/RPMExportWizard.java: Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/SRPMImportOperation.java (getStatus): Likewise.
+	(run): Likewise.
+	* src/org/eclipse/linuxtools/rpm/ui/SRPMImportPage.java (createProjectBox): Likewise.
+	(finish): Likewise.
+	(sourceSRPM): Likewise.
+	(createSourceRPMCombo): Likewise.
+	(SRPMImportPage): Likewise.
+
+2008-11-01  Alexander Kurtakov  <akurtakov@gmail.com>
+
+	* META-INF/MANIFEST.MF: Replace deprecated Eclipse-LazyStart usage.
+	* build.properties: Add META-INF to bin.includes.
+
+2007-05-04  Andrew Overholt  <overholt@redhat.com>
+
+	Bug #185598
+	* META-INF/MANIFEST.MF: Add "Incubation" to Bundle-Name.
+
+2007-01-29  Remy Suen  <remy.suen@gmail.com>
+
+	Bug #181249
+	* META-INF/MANIFEST.MF: Initial import.
+	* .classpath: Set a J2SE-1.4 JRE.
+	* plugin.xml: Migrate dependency information to an OSGi manifest.
+
+2007-01-29  Andrew Overholt  <overholt@redhat.com>
+
+	* : Re-namespace from cdt to linuxtools.
+
+2005-05-27  Jeremy Handcock  <handcock@redhat.com>
+
+	* plugin.xml: Bump version to 3.0.
+
+2005-05-24  Jeremy Handcock  <handcock@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/ui/rpm_strings.properties: New strings.
+	* src/org/eclipse/cdt/rpm/ui/RPMExportPage.java
+	VALID_CHARS: New field contains list of valid version-release 
+	characters.
+	specFileCombo: Change type to Text and rename to specFileField.
+	(getSelectedSpecFile): Reflect type change.
+	(setSpecFileComboData): Rename to setSpecFileField.
+	(setSpecFileField): Reflect type change.
+	(createProjectBox): Don't call setPageComplete.
+	(createSpecFileFields): Reflect type change.  Use a 
+	ResourceSelectionDialog to limit selections to workspace spec files.
+	(canFinish): Reflect type change.  Change ordering to verify fields 
+	in order of appearance.
+	(canGoNext): Enforce canFinish() == true before wizard can advance to 
+	next page.
+	(handleEvent): Call canFinish().
+	* src/org/eclipse/cdt/rpm/ui/RPMExportPatchPage.java
+	valid_char_list: '.' is valid.
+	(canFinish): Change ordering to verify fields in order of appearance.
+
+2005-05-19  Jeremy Handcock  <handcock@redhat.com>
+
+	Eclipse.org Bugzilla #82196:
+	* plugin.xml (extension): Add property page extensions.
+	* .settings/org.eclipse.core.resources.prefs: New.
+
+	* src/org/eclipse/cdt/rpm/ui/propertypage/ChangelogPage.java: Move from 
+	rpm.propertypage.  Externalize strings.
+	(addFirstSection): Remove method.
+	(addSeparator): Same.
+	(addSecondSection): Rename to addChangelogField.
+	(addChangelogField): Use rpm.core.utils.RPMQuery.
+	(createContents): Remove calls to removed methods; reflect method rename
+	changes.
+	* src/org/eclipse/cdt/rpm/ui/propertypage/InstallScriptsPage.java: Move
+	from rpm.propertypage.  Externalize strings.
+	(addFirstSection): Remove method.
+	(addSeparator): Same.
+	(addSecondSection): Rename to addScriptFields.
+	(addScriptFields): Use rpm.core.utils.RPMQuery.
+	(createContents): Remove calls to removed methods; reflect method rename
+	changes.
+	* src/org/eclipse/cdt/rpm/ui/propertypage/Messages.java: New.
+	* src/org/eclipse/cdt/rpm/ui/propertypage/messages.properties: New.
+	* src/org/eclipse/cdt/rpm/ui/propertypage/ProvidesPage.java: Move from 
+	rpm.propertypage.  Externalize strings.
+	(addFirstSection): Remove method.
+	(addSeparator): Same.
+	(addSecondSection): Rename to addProvidesField.
+	(addProvidesField): Use rpm.core.utils.RPMQuery.
+	(createContents): Remove calls to removed methods; reflect method rename
+	changes.
+	* src/org/eclipse/cdt/rpm/ui/propertypage/SpecFileHeaderPage.java: Move 
+	from rpm.propertypage.  Externalize strings.
+	(addFirstSection): Remove method.
+	(addSeparator): Same.
+	(addSecondSection): Rename to addInfoFields.
+	(addInfoFields): Use rpm.core.utils.RPMQuery.
+	(createContents): Remove calls to removed methods; reflect method rename
+	changes.
+	* src/org/eclipse/cdt/rpm/ui/propertypage/TargetPage.java: Move from 
+	rpm.propertypage.  Externalize strings.
+	(addFirstSection): Remove method.
+	(addSeparator): Same.
+	(addSecondSection): Rename to addTargetFields.
+	(addTargetFields): Convert Text widgets to Label widgets.  Use 
+	rpm.core.utils.RPMQuery.
+
+2005-05-18  Jeremy Handcock  <handcock@redhat.com>
+
+	Eclipse.org Bugzilla #82195:
+	
+	* build.properties (bin.includes): Correct.
+	(src.includes): Ditto.
+	* plugin.xml (plugin): Set plugin class.
+	(extension): Tweak wording.
+	
+	* src/org/eclipse/cdt/rpm/ui/IRPMUIConstants.java: New.
+	* src/org/eclipse/cdt/rpm/ui/rpm_strings.properties: Add new strings.
+	* src/org/eclipse/cdt/rpm/ui/RPMExportOperation.java
+	(RPMExportOperation): Simplify.
+	(run): Update to use new core model.
+	* src/org/eclipse/cdt/rpm/ui/RPMExportPage_2.java: Rename to ...
+	* src/org/eclipse/cdt/rpm/ui/RPMExportPatchPage.java: ... this.
+	* src/org/eclipse/cdt/rpm/ui/RPMExportPage.java: Simplify.
+	Update to use new core model.
+	* src/org/eclipse/cdt/rpm/ui/RPMExportWizard.java
+	(performFinish): Update to use new core model.
+	(addPages): Use renamed RPMExportPatchPage.
+	* src/org/eclipse/cdt/rpm/ui/RPMUIPlugin.java: New.  
+	Where was this before???
+	* src/org/eclipse/cdt/rpm/ui/SRPMImportOperation.java
+	(SRPMImportOperation): Simplify.
+	(run): Update to use new core model.
+	* src/org/eclipse/cdt/rpm/ui/SRPMImportPage.java: Simplify.
+	Update to use new core model.
+	* src/org/eclipse/cdt/rpm/ui/SRPMImportwizard.java: Rename to ...
+	* src/org/eclipse/cdt/rpm/ui/SRPMImportWizard.java: ... this.
+	
+	* src/org/eclipse/cdt/rpm/ui/logviewer/LogReader.java
+	(getLogFile): Get log file from plug-in core class.
+
+	* src/org/eclipse/cdt/rpm/ui/preferences/RPMPluginPreferencesPage.java
+	(doGetPreferenceStore): Remove.
+	(init): Remove call to initializeDefaultPreferences.
+	(initializeDefaults): Use constants.
+	(storeValues): Ditto.
+	(createContents): Remove fields not used by new core model.
+	
+	* src/org/eclipse/cdt/rpm/ui/util/ExceptionHandler.java: New.
+
+2005-01-18  Aaron Luchko  <aluchko@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/ui/preferences/RPMPluginPreferencesPage.java 
+	(initializeDefaultPreferences): Changed path to diff from "diff" to 
+	"/usr/bin/diff" --  bz#83150
+
+2005-01-18  Aaron Luchko  <aluchko@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/ui/SRPMImportPage.java (): bz# 83135
+	  Can import into a new project using New Project Wizard
+	* src/org/eclipse/cdt/rpm/ui/rpm_strings.properties: bz# 83135
+	  Can import into a new project using New Project Wizard
+
+2005-01-17  Aaron Luchko  <aluchko@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/ui/RPMExportPage.java (): bz# 83031
+	* src/org/eclipse/cdt/rpm/ui/SRPMImportOperation.java (): ditto
+	* src/org/eclipse/cdt/rpm/ui/SRPMImportPage.java (): ditto
+	* src/org/eclipse/cdt/rpm/ui/SRPMImportWizard.java (): ditto
+	* src/org/eclipse/cdt/rpm/ui/rpm_strings.properties: ditto
+
+2005-01-15  Aaron Luchko  <aluchko@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/ui/SRPMImportPage.java:
+	  Add previously opened srpms to the combo box when opening srpms
+	
+2004-12-15  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/ui/RPMExportPage.java (returnProjectPath): 
+	  bz #81145 - fixed unhandled exception when exporting a source/binary RPM
+
+2004-12-09  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/ui/rpm_strings.properties: bz# 78773/78788
+	* src/org/eclipse/cdt/rpm/ui/RPMExportPage_2.java (modifyText): bz#
+	   78773/78788
+
+2004-11-11  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/ui/SRPMImportPage.java (createProjectBox): add
+	  addSelectionListener for when a project to import into is not selected
+
+2004-11-11  Rick Moseley  <rmoseley@redhat.com>
+	* plugin.xml: remove "test" from labels
+
+2004-11-11  Rick Moseley  <rmoseley@redhat.com>
+	* plugin.xml: change version to 1.2
+
+2004-11-05  Aaron Luchko  <aluchko@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/ui/RPMExportPage.java (): show only C/C++ projects to 
+	   be exported
+	* src/org/eclipse/cdt/rpm/ui/RPMExportWizard.java (): ditto
+	* src/org/eclipse/cdt/rpm/ui/RPMImportPage.java (): ditto
+	* src/org/eclipse/cdt/rpm/ui/SRPMImportPage.java (): ditto
+
+2004-11-04  Jeffery Pound  <jpound@redhat.com>
+
+	* src/org/eclipse/cdt/rpm/ui/SRPMImportOperation.java (): put commands into
+	   a properties bundle`
+	* src/org/eclipse/cdt/rpm/ui/preferences/RPMPluginPreferencesPage.java (): add
+	   shell commands to be user configurable
+
+2004-08-31  Rick Moseley  <rmoseley@redhat.com>
+
+	* build.xml: rebuilt after merge/refactoring
+
+2004-08-19  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* src/com/redhat/eclipse/rpm/ui/SRPMImportPage.java (createProjectBox): 
+	Added a C Nature check for project list.
+	* src/com/redhat/eclipse/rpm/ui/RPMExportPage.java (createProjectBox):  
+	Added a C Nature check.
+	(createProjectBox): Removed debug statement
+	* plugin.xml: Added import cdt
+
+2004-08-10  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/com/redhat/eclipse/rpm/ui/RPMExportPage_2.java (modifyText):
+	  add back in hot verifiction of patch tag names; correct when "Finish"
+	  button is enabled
+	(canFinish): correct when "Finish" button is enabled
+	* src/com/redhat/eclipse/rpm/ui/rpm_strings.properties: externalize new
+	  message for above change
+
+2004-08-04  Jeremy Handcock  <handcock@redhat.com>
+
+	* .cvsignore: New file.
+	* src/com/redhat/eclipse/rpm/ui/RPMExportPage_2.java: Rename core 
+	plugin import.
+	* src/com/redhat/eclipse/rpm/ui/logviewer/LogReader.java: Same.
+	* src/com/redhat/eclipse/rpm/ui/preferences/RPMPluginPreferencesPage.java:
+	New file; moved from com.redhat.eclipse.rpm.core.
+	* plugin.xml: Add preference page extension.
+
+2004-08-04  rmoseley  <rmoseley@dhcp-232.hsv.redhat.com>
+
+	* plugin.xml : do not start RPM log viewer automatically 
+	   fixes bz #129071
+
+2004-07-27  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/com/redhat/eclipse/rpm/ui/rpm_strings.properties : add strings
+	* src/com/redhat/eclipse/rpm/ui/RPMExportOperation.java (run): 
+	  internationalize strings
+	* src/com/redhat/eclipse/rpm/ui/SRPMImportOperation.java : same as below
+	* src/com/redhat/eclipse/rpm/ui/RPMExportPage_2.java (RPMExportPage_2): 
+	  correct message/internationalize strings
+	  (canFinish): correct message/internationalize strings
+
+2004-07-22  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/com/redhat/eclipse/rpm/ui/RPMExportOperation.java (run): conditionalize
+	  the last change based on whether or not source/binary rpm is produced
+	* src/com/redhat/eclipse/rpm/ui/RPMExportOperation.java (run): propagate
+	  the patch tag and changlog entry when only binary RPM is created
+	  (bugzilla #128343)
+	* src/com/redhat/eclipse/rpm/ui/RPMExportPage_2.java (modifyText): add 
+	  listener for patch tag field for hot verify
+	* src/com/redhat/eclipse/rpm/ui/RPMExportPage_2.java : remove hot verify
+	  for patch tag field
+	 (populatePatchInfo): add "- " to the changelog text field
+	 (getPatchNames): new parser to get patch tags from spec file
+	 (canFinish): add loop to check for duplucate patch tags
+
+2004-07-16  Rick Moseley  <rmoseley@redhat.com>
+
+	* build.properties : add /icons
+
+2004-07-14  Rick Moseley  <rmoseley@redhat.com>
+
+	* build.xml : Eclipse 3.0 changes
+	* src/com/redhat/eclipse/rpm/ui/logviewer/RPMLogViewer.java : renamed from
+		RpmLogViewer
+	* plugin.xml : rename RpmLogViewer -> RPMLogViewer
+		remove bogus dependencies
+		Eclipse 3.0 changes
+	* src/com/redhat/eclipse/rpm/ui/RPMExportPage.java: add platform-independent file
+		separator
+	* src/com/redhat/eclipse/rpm/ui/RPMExportPage.java (setSpecFileComboData): add call
+		to setVersionReleaseFields when spec field is changed
+	* src/com/redhat/eclipse/rpm/ui/SRPMImportOperation.java : check if passed a null
+		error message
+	* src/com/redhat/eclipse/rpm/ui/logviewer/LogReader.java : rename RpmCorePlugin ->
+		RPMCorePlugin
+
+2004-06-18  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/com/redhat/eclipse/rpm/ui/RPMExportPage.java (getSpecFilePath): new method
+	   to save the spec file path for the next page
+	(canFinish): add saving of path_to_specfile static variable 
+	(): add file_sep/line_sep variables for portability 
+
+2004-05-27  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/com/redhat/eclipse/rpm/ui/SRPMImportOperation.java (): rename 
+		RpmCore -> RPMCore
+	* src/com/redhat/eclipse/rpm/ui/RPMExportPage.java (compareCheckSum): rename 
+		RpmCore -> RPMCore
+
+2004-05-26  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/com/redhat/eclipse/rpm/ui/logviewer/LogReader.java (getLogFile): changes for 
+		prefs store
+	* src/com/redhat/eclipse/rpm/ui/RPMExportPage_2.java (populatePatchInfo): get name
+		and e-mail address from prefs store 
+	* src/com/redhat/eclipse/rpm/ui/SRPMImportOperation.java (run): changes for prefs
+	   store addition 
+	* src/com/redhat/eclipse/rpm/ui/RPMExportOperation.java (run): changes for prefs
+	   store addition
+
+2004-05-05  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/com/redhat/eclipse/rpm/ui/logviewer/RpmLogViewer.java (): new class to
+		display RPM plugin log files
+	* src/com/redhat/eclipse/rpm/ui/logviewer/LogReader.java (): new class to
+		display RPM plugin log files
+	* plugin.xml : add RPM log viewer stuff
+
+2004-04-05  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/com/redhat/eclipse/rpm/ui/RPMExportPage_2.java (getHostName): add functionality
+	to remove superfluous part of the host/domain name for the changelog e-mail address
+	* (populatePatchInfo): add login to get the host name to put into the e-mail address 
+	in the changelog entry
+
+2004-04-02  Rick Moseley  <rmoseley@redhat.com>
+
+	* src/com/redhat/eclipse/rpm/ui/RPMExportPage.java (compareCheckSum): add
+		call to firstSRPM() to check for existence of .srpminfo
+
+2004-03-31  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* src/com/redhat/eclipse/rpm/ui/RPMExportOperation.java (getStatus): check to see what kind
+	of object (Status or Throwable) is passed back from RpmCore
+	* src/com/redhat/eclipse/rpm/ui/SRPMImportOperation.java (getStatus): same
+
+2004-03-26  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* SRPMImportOperation.java (getStatus): Change ISTATUS
+	to STATUS
+	* RPMExportOperation.java (getStatus): Ditto
+	
+
+2004-02-13  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* RPMExportPage.java (createSpecFileField):: added Version/Release
+	 trigger on browse spec file
+	* RPMExportOperation.java (refreshWorkspace): Created
+	(run):  Added refreshWorkspace on each try block
+	
+
+2004-02-12  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* RPMExportPage_2.java (keyPressed):  Refactored/rewritten
+	* SRPMImportPage.java (finish): Fixed ImportOperation calling pattern
+	(validateFinish): Added JavaDoc
+	(canFinish): Added JavaDoc
+	(createProjectBox): rewrote
+	* SRPMImportOperation.java (getStatus): Added more robust getStatus
+	from RPMExportOperation
+	* RPMExportPage.java (finish): Fixed ExportOperation calling pattern
+	(hasMakefile): rewritten/refactored
+	(returnSpecFiles):  Rewritten and refactored
+	* RPMExportOperation.java (rpmDeleteLogFile): Deleted.
+	Removed log file and preserve parameters
+	
+	
+2004-02-12  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* readme : Updated. Added author and maintenance boundary
+	for each plug-in
+	* SRPMImportOperation.java (run): Modified flow for
+	RPM Core refactor
+	* rpm_strings.properties : Added SRPM/RPM Export Messages
+	Removed Old ones.
+	* RPMExportOperation.java (run):  Modified flow for
+	RPM Core refactor
+
+2004-02-12  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* plugin.xml : Fixed typos
+	* rpm_strings.properties : Refactored strings to match new
+	class names
+
+2004-02-11  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* build.xml: Added com.redhat.eclipse.rpm.core/RpmCore.jar to classpath
+	
+2004-02-11  Phil Muldoon  <pmuldoon@redhat.com>
+	
+	* build.xml: Rewritten
+	* .classpath: Regenerated for 2.1.2
+
+2004-02-11  Rick Moseley  <rmoseley@redhat.com>
+
+	* RPMExportOperation.java (run): Comment out some old run monitor code, correct bug of calling 
+	rpmexport.run() twice, change one of them to srpmexport.run()
+
+2004-02-11  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* Initial Import:
+
+
+
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/META-INF/MANIFEST.MF b/rpm/org.eclipse.linuxtools.rpm.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..aa135cc
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,22 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name.0
+Bundle-SymbolicName: org.eclipse.linuxtools.rpm.ui;singleton:=true
+Bundle-Version: 0.4.3.qualifier
+Bundle-Activator: org.eclipse.linuxtools.rpm.ui.RPMUIPlugin
+Bundle-Vendor: %Bundle-Vendor.0
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.ui.ide,
+ org.eclipse.jface.text,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.ui,
+ org.eclipse.swt,
+ org.eclipse.jface,
+ org.eclipse.text,
+ org.eclipse.linuxtools.rpm.core,
+ org.eclipse.ui.console
+Export-Package: 
+ org.eclipse.linuxtools.rpm.ui,
+ org.eclipse.linuxtools.rpm.ui.propertypage
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/OSGI-INF/l10n/bundle.properties b/rpm/org.eclipse.linuxtools.rpm.ui/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..eda5536
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,14 @@
+#Properties file for org.eclipse.linuxtools.rpm.ui
+wizard.name.0 = Source/Binary RPM
+wizard.description.0 = Export an RPM
+wizard.name.1 = Source RPM
+wizard.description.1 = Imports a Source RPM to a project
+page.name.0 = Spec File Header
+page.name.1 = Changelog Entries
+page.name.2 = Target
+page.name.3 = Install/Uninstall Scripts
+page.name.4 = Files Package Provides
+category.name.0 = RPM
+wizard.name.2 = RPM Project
+Bundle-Vendor.0 = Eclipse
+Bundle-Name.0 = RPM UI Plug-in (Incubation)
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/about.html b/rpm/org.eclipse.linuxtools.rpm.ui/about.html
new file mode 100644
index 0000000..44e2290
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/about.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

+<html>

+<head>

+<title>About</title>

+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>8th September, 2004</p>	

+<h3>License</h3>

+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<h3>Contributions</h3>

+

+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise

+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such

+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or

+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the

+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available

+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also

+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>

+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the

+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>

+

+</body>

+</html>
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/build.properties b/rpm/org.eclipse.linuxtools.rpm.ui/build.properties
new file mode 100644
index 0000000..5a6baf4
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/build.properties
@@ -0,0 +1,19 @@
+###############################################################################
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+source.. = src/
+output.. = bin/
+bin.includes = plugin.xml,\
+               .,\
+               icons/,\
+               about.html,\
+               META-INF/,\
+               OSGI-INF/l10n/bundle.properties
+
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/icons/rpm.gif b/rpm/org.eclipse.linuxtools.rpm.ui/icons/rpm.gif
new file mode 100644
index 0000000..8e82089
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/icons/rpm.gif
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/plugin.xml b/rpm/org.eclipse.linuxtools.rpm.ui/plugin.xml
new file mode 100644
index 0000000..c7819e1
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/plugin.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?><!--
+    Copyright (c) 2009 Red Hat, Inc.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+   
+    Contributors:
+        Red Hat - initial API and implementation
+ -->
+
+<plugin>
+   <extension
+         point="org.eclipse.ui.exportWizards">
+      <category
+            id="org.eclipse.linuxtools.rpm.ui"
+            name="%category.name.0">
+      </category>
+      <wizard
+            name="%wizard.name.0"
+            icon="icons/rpm.gif"
+            class="org.eclipse.linuxtools.rpm.ui.RPMExportWizard"
+            category="org.eclipse.linuxtools.rpm.ui"
+            id="org.eclipse.linuxtools.rpm.ui.RPMExportWizard">
+         <description>
+            %wizard.description.0
+         </description>
+         <selection
+               class="org.eclipse.core.resources.IResource" />
+      </wizard>
+   </extension>
+   <extension
+         point="org.eclipse.ui.importWizards">
+      <category
+            id="org.eclipse.linuxtools.rpm.ui"
+            name="%category.name.0">
+      </category>
+      <wizard
+            name="%wizard.name.1"
+            icon="icons/rpm.gif"
+            class="org.eclipse.linuxtools.rpm.ui.SRPMImportWizard" 
+            category="org.eclipse.linuxtools.rpm.ui"
+            id="org.eclipse.linuxtools.rpm.ui.SRPMImportWizard">
+         <description>
+            %wizard.description.1
+         </description>
+         <selection
+               class="org.eclipse.core.resources.IResource">
+         </selection>
+      </wizard>
+   </extension>
+	<extension
+         point="org.eclipse.ui.propertyPages">
+      <page
+            class="org.eclipse.linuxtools.rpm.ui.propertypage.SpecFileHeaderPage"
+            id="rg.eclipse.linuxtools.rpm.ui.propertypage.SpecFileHeaderPage"
+            name="%page.name.0"
+            nameFilter="*.rpm">
+      </page>
+      <page
+            class="org.eclipse.linuxtools.rpm.ui.propertypage.ChangelogPage"
+            id="org.eclipse.linuxtools.rpm.ui.propertypage.ChangelogPage"
+            name="%page.name.1"
+            nameFilter="*.rpm">
+      </page>
+      <page
+            class="org.eclipse.linuxtools.rpm.ui.propertypage.TargetPage"
+            id="org.eclipse.linuxtools.rpm.ui.propertypage.TargetPage"
+            name="%page.name.2"
+            nameFilter="*.rpm">
+      </page>
+      <page
+            class="org.eclipse.linuxtools.rpm.ui.propertypage.InstallScriptsPage"
+            id="org.eclipse.linuxtools.rpm.ui.propertypage.InstallScriptsPage"
+            name="%page.name.3"
+            nameFilter="*.rpm">
+      </page>
+      <page
+            class="org.eclipse.linuxtools.rpm.ui.propertypage.ProvidesPage"
+            id="org.eclipse.linuxtools.rpm.ui.propertypage.ProvidesPage"
+            name="%page.name.4"
+            nameFilter="*.rpm">
+      </page>
+   </extension>
+ <extension
+       point="org.eclipse.ui.newWizards">
+       <category
+            id="org.eclipse.linuxtools.rpm.ui"
+            name="%category.name.0">
+      </category>
+      <wizard
+      		project="true"
+            category="org.eclipse.linuxtools.rpm.ui.editor"
+            class="org.eclipse.linuxtools.rpm.ui.RPMNewProject"
+            icon="icons/rpm.gif"
+            id="org.eclipse.linuxtools.rpm.ui.RPMNewProject"
+            name="%wizard.name.2">
+      </wizard>
+ </extension>
+ <extension
+       point="org.eclipse.ui.ide.projectNatureImages">
+    <image
+          icon="icons/rpm.gif"
+          id="org.eclipse.linuxtools.rpm.ui.image"
+          natureId="org.eclipse.linuxtools.rpm.core.rpmnature">
+    </image>
+ </extension>
+</plugin>
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/IRPMUIConstants.java b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/IRPMUIConstants.java
new file mode 100644
index 0000000..545a6cd
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/IRPMUIConstants.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui;
+
+public interface IRPMUIConstants {
+
+	public static final String LINE_SEP = System.getProperty("line.separator"); //$NON-NLS-1$
+	
+	public enum BuildType { NONE, ALL, BINARY, SOURCE}
+	
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/Messages.java b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/Messages.java
new file mode 100644
index 0000000..1aeb68e
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/Messages.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.rpm.ui;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class Messages {
+
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.rpm.ui.rpm_strings"; //$NON-NLS-1$
+
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+
+	private Messages() {
+	}
+
+	public static String getString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/RPMExportOperation.java b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/RPMExportOperation.java
new file mode 100644
index 0000000..743f0f96
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/RPMExportOperation.java
@@ -0,0 +1,137 @@
+/*******************************************************************************
+ * Copyright (c) 2004 - 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.linuxtools.rpm.core.RPMProject;
+import org.eclipse.linuxtools.rpm.ui.IRPMUIConstants.BuildType;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.console.ConsolePlugin;
+import org.eclipse.ui.console.IConsole;
+import org.eclipse.ui.console.IConsoleManager;
+import org.eclipse.ui.console.MessageConsole;
+import org.eclipse.ui.console.MessageConsoleStream;
+
+public class RPMExportOperation implements IRunnableWithProgress {
+	private IProgressMonitor monitor;
+	private ArrayList<Exception> rpm_errorTable;
+	private RPMProject rpmProject;
+	private BuildType exportType;
+
+	public RPMExportOperation(RPMProject rpmProject, BuildType exportType) {
+		this.rpmProject = rpmProject;
+		this.exportType = exportType;
+	}
+
+	/**
+	 * @see org.eclipse.jface.operation.IRunnableWithProgress#run(IProgressMonitor)
+	 * 
+	 */
+	public void run(IProgressMonitor progressMonitor)
+			throws InvocationTargetException {
+		int totalWork = 2;
+
+		monitor = progressMonitor;
+
+		// We keep a all our reported errors in an ArrayList.
+		rpm_errorTable = new ArrayList<Exception>();
+
+		// Start progress
+		monitor.beginTask(Messages.getString("RPMExportOperation.Starting"), //$NON-NLS-1$
+				totalWork);
+		monitor.worked(1);
+		MessageConsole myConsole = findConsole("rpmbuild"); //$NON-NLS-1$
+		MessageConsoleStream out = myConsole.newMessageStream();
+		myConsole.clearConsole();
+		myConsole.activate();
+		switch (exportType) {
+		case ALL:
+			try {
+				monitor.setTaskName(Messages
+						.getString("RPMExportOperation.Executing_RPM_Export")); //$NON-NLS-1$
+				rpmProject.buildAll(out);
+			} catch (Exception e) {
+				rpm_errorTable.add(e);
+			}
+			break;
+
+		case BINARY:
+			monitor.setTaskName(Messages
+					.getString("RPMExportOperation.Executing_RPM_Export")); //$NON-NLS-1$
+			try {
+				rpmProject.buildBinaryRPM(out);
+			} catch (Exception e) {
+				rpm_errorTable.add(e);
+			}
+			break;
+
+		case SOURCE:
+			monitor.setTaskName(Messages
+					.getString("RPMExportOperation.Executing_SRPM_Export")); //$NON-NLS-1$
+			try {
+				rpmProject.buildSourceRPM(out);
+			} catch (Exception e) {
+				rpm_errorTable.add(e);
+			}
+			break;
+		}
+		monitor.worked(1);
+	}
+
+	public MultiStatus getStatus() {
+		IStatus[] errors = new IStatus[rpm_errorTable.size()];
+		Iterator<Exception> count = rpm_errorTable.iterator();
+		int iCount = 0;
+		String error_message = Messages.getString("RPMExportOperation.0"); //$NON-NLS-1$
+		while (count.hasNext()) {
+
+			Object anonErrorObject = count.next();
+			if (anonErrorObject instanceof Throwable) {
+				Throwable errorObject = (Throwable) anonErrorObject;
+				error_message = errorObject.getMessage();
+
+			} else if (anonErrorObject instanceof Status) {
+				Status errorObject = (Status) anonErrorObject;
+				error_message = errorObject.getMessage();
+			}
+			IStatus error = new Status(IStatus.ERROR, "RPM Plugin", IStatus.OK, //$NON-NLS-1$
+					error_message, null);
+			errors[iCount] = error;
+			iCount++;
+		}
+
+		return new MultiStatus(PlatformUI.PLUGIN_ID, IStatus.OK, errors,
+				Messages.getString("RPMExportOperation.Open_SRPM_Errors"), //$NON-NLS-1$
+				null);
+	}
+
+	private MessageConsole findConsole(String name) {
+		ConsolePlugin plugin = ConsolePlugin.getDefault();
+		IConsoleManager conMan = plugin.getConsoleManager();
+		IConsole[] existing = conMan.getConsoles();
+		for (int i = 0; i < existing.length; i++)
+			if (name.equals(existing[i].getName()))
+				return (MessageConsole) existing[i];
+		// no console found, so create a new one
+		MessageConsole myConsole = new MessageConsole(name, null);
+		conMan.addConsoles(new IConsole[] { myConsole });
+		return myConsole;
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/RPMExportPage.java b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/RPMExportPage.java
new file mode 100644
index 0000000..6adb1d9
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/RPMExportPage.java
@@ -0,0 +1,170 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2005, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.linuxtools.rpm.core.RPMProject;
+import org.eclipse.linuxtools.rpm.ui.IRPMUIConstants.BuildType;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
+
+/**
+ * S/RPM export Defines the page that is shown to the user when they choose to
+ * export to an S/RPM. Defines the UI elements shown, and the basic validation.
+ * RPMExportPage. Called by RPMExportWizard. Class can not be subclassed extends
+ * WizardPage for the RPM export wizard, implements Listener
+ */
+public class RPMExportPage extends WizardPage implements Listener {
+
+	// Checkbox Buttons
+	private Button exportBinary;
+	private Button exportSource;
+
+	// The currently selected RPM project
+	private RPMProject rpmProject;
+
+	public RPMExportPage(IProject rpmProject) {
+		super(
+				Messages.getString("RPMExportPage.Export_SRPM"), //$NON-NLS-1$
+				Messages.getString("RPMExportPage.Export_SRPM_from_project"), null); //$NON-NLS-1$
+		setDescription(Messages
+				.getString("RPMExportPage.Select_project_export")); //$NON-NLS-1$
+		try {
+			this.rpmProject = new RPMProject(rpmProject);
+		} catch (CoreException e) {
+			e.printStackTrace();
+		}
+		setPageComplete(true);
+	}
+
+	public RPMProject getSelectedRPMProject() {
+		return rpmProject;
+	}
+
+	public BuildType getExportType() {
+		BuildType exportType = BuildType.NONE;
+		if (exportBinary.getSelection() && exportSource.getSelection()) {
+			exportType = BuildType.ALL;
+		} else if (exportBinary.getSelection()) {
+			exportType = BuildType.BINARY;
+		} else if (exportSource.getSelection()) {
+			exportType = BuildType.SOURCE;
+		}
+		return exportType;
+	}
+
+	/**
+	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
+	 * 
+	 *      Parent control. Creates the listbox, Destination box, and options
+	 *      box
+	 * 
+	 */
+	public void createControl(Composite parent) {
+		Composite composite = new Composite(parent, SWT.NULL);
+
+		// Create a layout for the wizard page
+		composite.setLayout(new GridLayout());
+		composite.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
+		setControl(composite);
+
+		if (rpmProject != null) {
+			// Create contols on the page
+			createExportTypeControls(composite);
+
+			// Check if the project has changed
+			// and therefore the project needs a patch
+			setPageComplete(false);
+		} else {
+			createErrorControls(composite);
+			setPageComplete(true);
+		}
+	}
+
+	private void createErrorControls(Composite parent) {
+		Label label = new Label(parent, SWT.CENTER);
+		label.setText(Messages.getString("RPMExportPage.0")); //$NON-NLS-1$
+	}
+
+	private void createExportTypeControls(Composite parent) {
+		// Create a group for the control and set up the layout.
+		Group group = new Group(parent, SWT.NONE);
+		group.setLayout(new GridLayout());
+		group
+				.setText(Messages
+						.getString("RPMExportPage.Composite_Export_Type")); //$NON-NLS-1$
+		group.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL
+				| GridData.HORIZONTAL_ALIGN_FILL));
+
+		// Create the export binary checkbox
+		exportBinary = new Button(group, SWT.CHECK);
+		exportBinary.setText(Messages.getString("RPMExportPage.Export_Binary")); //$NON-NLS-1$
+		exportBinary.setSelection(true);
+		exportBinary.setToolTipText(Messages
+				.getString("RPMExportPage.toolTip_Export_Binary")); //$NON-NLS-1$
+
+		// Create the export source checkbox
+		exportSource = new Button(group, SWT.CHECK);
+		exportSource.setText(Messages.getString("RPMExportPage.Export_Source")); //$NON-NLS-1$
+		exportSource.setSelection(true);
+		exportSource.setToolTipText(Messages
+				.getString("RPMExportPage.toolTip_Export_Source")); //$NON-NLS-1$
+
+		SelectionListener listener = new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				handleEvent(null);
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+				handleEvent(null);
+			}
+		};
+		exportBinary.addSelectionListener(listener);
+		exportSource.addSelectionListener(listener);
+	}
+
+	/**
+	 * canFinish()
+	 * 
+	 * Hot validation. Called to determine whether Finish button can be set to
+	 * true
+	 * 
+	 * @return boolean. true if finish can be activated
+	 */
+	public boolean canFinish() {
+		if (rpmProject != null && !exportBinary.getSelection()
+				&& !exportSource.getSelection()) {
+			// Make sure either export binary/source is checked
+			setErrorMessage(Messages
+					.getString("RPMExportPage.Select_export_type")); //$NON-NLS-1$
+			return false;
+		}
+
+		setDescription(null);
+		setErrorMessage(null);
+		return true;
+	}
+
+	public void handleEvent(Event e) {
+		setPageComplete(canFinish());
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/RPMExportWizard.java b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/RPMExportWizard.java
new file mode 100644
index 0000000..315bb2a
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/RPMExportWizard.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.linuxtools.rpm.core.RPMProjectNature;
+import org.eclipse.ui.IExportWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.progress.IProgressConstants;
+
+public class RPMExportWizard extends Wizard implements IExportWizard {
+	private RPMExportPage mainPage;
+	private IStructuredSelection selection;
+
+	/**
+	 * @see org.eclipse.ui.IWorkbenchWizard#init(IWorkbench,
+	 *      IStructuredSelection)
+	 * 
+	 *      Basic constructor. Don't do much, just print out debug, and set
+	 *      progress monitor status to true
+	 */
+	public void init(IWorkbench workbench, IStructuredSelection currentSelection) {
+		setNeedsProgressMonitor(true);
+		setWindowTitle(Messages.getString("RPMExportWizard.Export_an_SRPM")); //$NON-NLS-1$
+		selection = currentSelection;
+	}
+
+	@Override
+	public boolean performFinish() {
+		// Create a new instance of the RPMExportOperation runnable
+		final RPMExportOperation rpmExport = new RPMExportOperation(mainPage
+				.getSelectedRPMProject(), mainPage.getExportType());
+
+		// Run the export
+		Job job = new Job(Messages.getString("RPMExportWizard.0")) { //$NON-NLS-1$
+			@Override
+			protected IStatus run(IProgressMonitor monitor) {
+				setProperty(IProgressConstants.KEEP_PROPERTY, Boolean.TRUE);
+				try {
+					rpmExport.run(monitor);
+				} catch (InvocationTargetException e) {
+					return Status.CANCEL_STATUS;
+				}
+				return rpmExport.getStatus();
+			}
+		};
+		job.setUser(true);
+		job.schedule();
+
+		// Need to return some meaninful status. Should only return true if the
+		// wizard completed
+		// successfully.
+		return true;
+	}
+
+	@Override
+	public boolean canFinish() {
+		return mainPage.canFinish();
+	}
+
+	// Add the RPMExportPage as the only page in this wizard.
+	@Override
+	public void addPages() {
+		IProject project = null;
+		if (selection.isEmpty()) {
+
+		} else if (!(selection.getFirstElement() instanceof IProject)) {
+			if (selection.getFirstElement() instanceof IResource) {
+				IResource resource = (IResource) selection.getFirstElement();
+				IProject parentProject = resource.getProject();
+				try {
+					if (parentProject.hasNature(RPMProjectNature.RPM_NATURE_ID)) {
+						project = parentProject;
+					}
+				} catch (CoreException e) {
+					// nothing we can do
+				}
+			}
+		} else if (selection.getFirstElement() instanceof IProject) {
+			IProject tempProject = (IProject) selection.getFirstElement();
+			try {
+				if (tempProject.hasNature(RPMProjectNature.RPM_NATURE_ID)) {
+					project = tempProject;
+				}
+			} catch (CoreException e) {
+				// nothing we can do
+			}
+		}
+
+		mainPage = new RPMExportPage(project);
+		addPage(mainPage);
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/RPMNewProject.java b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/RPMNewProject.java
new file mode 100644
index 0000000..b58def1
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/RPMNewProject.java
@@ -0,0 +1,93 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.linuxtools.rpm.core.IRPMConstants;
+import org.eclipse.linuxtools.rpm.core.RPMProjectNature;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
+
+public class RPMNewProject extends Wizard implements INewWizard {
+	WizardNewProjectCreationPage namePage;
+
+	@Override
+	public boolean performFinish() {
+		try {
+			WorkspaceModifyOperation op = new WorkspaceModifyOperation() {
+				@Override
+				protected void execute(IProgressMonitor monitor) {
+					createProject(monitor != null ? monitor
+							: new NullProgressMonitor());
+				}
+			};
+			getContainer().run(false, true, op);
+		} catch (InvocationTargetException x) {
+			return false;
+		} catch (InterruptedException x) {
+			return false;
+		}
+		return true;
+
+	}
+
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		super.addPages();
+		namePage = new WizardNewProjectCreationPage(Messages.getString("RPMNewProject.0")); //$NON-NLS-1$
+		namePage.setTitle(Messages.getString("RPMNewProject.1")); //$NON-NLS-1$
+		namePage
+				.setDescription(Messages.getString("RPMNewProject.2")); //$NON-NLS-1$
+		namePage.setImageDescriptor(ImageDescriptor.createFromFile(getClass(),
+				"/icons/rpm.gif")); //$NON-NLS-1$
+		addPage(namePage);
+	}
+
+	protected void createProject(IProgressMonitor monitor) {
+		try {
+			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+			IProject project = root.getProject(namePage.getProjectName());
+			IProjectDescription description = ResourcesPlugin.getWorkspace()
+					.newProjectDescription(project.getName());
+			if (!Platform.getLocation().equals(namePage.getLocationPath()))
+				description.setLocation(namePage.getLocationPath());
+			description
+					.setNatureIds(new String[] { RPMProjectNature.RPM_NATURE_ID });
+			project.create(description, monitor);
+			monitor.worked(10);
+			project.open(monitor);
+			project.getFolder(IRPMConstants.SPECS_FOLDER).create(true, true, monitor);
+			project.getFolder(IRPMConstants.SOURCES_FOLDER).create(true, true, monitor);
+			IFolder buildFolder = project.getFolder(IRPMConstants.BUILD_FOLDER);
+			buildFolder.create(true, true, monitor);
+			buildFolder.setHidden(true);
+			project.getFolder(IRPMConstants.RPMS_FOLDER).create(true, true, monitor);
+			project.getFolder(IRPMConstants.SRPMS_FOLDER).create(true, true, monitor);
+		} catch (CoreException e) {
+			e.printStackTrace();
+		}
+	}
+
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/RPMUIPlugin.java b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/RPMUIPlugin.java
new file mode 100644
index 0000000..8838b98
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/RPMUIPlugin.java
@@ -0,0 +1,128 @@
+/*******************************************************************************
+ * Copyright (c) 2005-2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The main plugin class to be used in the desktop.
+ */
+public class RPMUIPlugin extends AbstractUIPlugin {
+	//The shared instance.
+	private static RPMUIPlugin plugin;
+	//Resource bundle.
+	private ResourceBundle resourceBundle;
+	
+	public static final String ID = "org.eclipse.linuxtools.rpm.ui"; //$NON-NLS-1$
+	
+	/**
+	 * The constructor.
+	 */
+	public RPMUIPlugin() {
+		super();
+		plugin = this;
+	}
+
+	/**
+	 * This method is called upon plug-in activation
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+	}
+
+	/**
+	 * This method is called when the plug-in is stopped
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		super.stop(context);
+		plugin = null;
+		resourceBundle = null;
+	}
+
+	/**
+	 * Returns the shared instance.
+	 */
+	public static RPMUIPlugin getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Returns the string from the plugin's resource bundle,
+	 * or 'key' if not found.
+	 */
+	public static String getResourceString(String key) {
+		ResourceBundle bundle = RPMUIPlugin.getDefault().getResourceBundle();
+		try {
+			return (bundle != null) ? bundle.getString(key) : key;
+		} catch (MissingResourceException e) {
+			return key;
+		}
+	}
+
+	/**
+	 * Returns the plugin's resource bundle,
+	 */
+	public ResourceBundle getResourceBundle() {
+		try {
+			if (resourceBundle == null)
+				resourceBundle = ResourceBundle.getBundle("rpmui.RpmuiPluginResources"); //$NON-NLS-1$
+		} catch (MissingResourceException x) {
+			resourceBundle = null;
+		}
+		return resourceBundle;
+	}
+
+	/**
+	 * Returns an image descriptor for the image file at the given
+	 * plug-in relative path.
+	 *
+	 * @param path the path
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return AbstractUIPlugin.imageDescriptorFromPlugin("rpmui", path); //$NON-NLS-1$
+	}
+	
+	public void log(Throwable e) {
+		log(new Status(IStatus.ERROR, ID, IStatus.ERROR, "Error", e)); //$NON-NLS-1$
+	}
+
+	public void log(IStatus status) {
+		getLog().log(status);
+	}
+	
+	public void logErrorMessage(String message) {
+		log(new Status(IStatus.ERROR, ID, 1, message, null));
+	}
+	
+	public static Shell getActiveWorkbenchShell() {
+		 IWorkbenchWindow window= getActiveWorkbenchWindow();
+		 if (window != null) {
+		 	return window.getShell();
+		 }
+		 return null;
+	}
+	
+	public static IWorkbenchWindow getActiveWorkbenchWindow() {
+		return getDefault().getWorkbench().getActiveWorkbenchWindow();
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/SRPMImportOperation.java b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/SRPMImportOperation.java
new file mode 100644
index 0000000..42ec761
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/SRPMImportOperation.java
@@ -0,0 +1,122 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui;
+
+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.linuxtools.rpm.core.RPMProject;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * Import Operation Class for RPM plug-in. This allows us to abstract the operations
+ *  to  a utility class which also inherits IRunnableWithProgress that allows use of
+ * progress bar
+ */
+
+public class SRPMImportOperation implements IRunnableWithProgress {
+	private IProject project;
+	private File sourceRPM;
+
+	// Progressmonitor
+	private IProgressMonitor monitor;
+
+	private List<Exception> rpm_errorTable;
+
+	/**
+	 * Method SRPMImportOperation.
+	 * @param name - (IProject) name
+	 * @param srpm_name - name of input srpm
+	 * @param applyPatchesFlag - Apply patches on import
+	 * @param runAutoConfFlag - Run autoconf on import
+	 */
+	public SRPMImportOperation(IProject project, File sourceRPM) {
+		this.project = project;
+		this.sourceRPM = sourceRPM;
+	}
+
+	/**
+	 * @see org.eclipse.jface.operation.IRunnableWithProgress#run(IProgressMonitor)
+	 *
+	 * Perform the import of  SRPM import. Call the build class incrementally
+	 */
+	public void run(IProgressMonitor progressMonitor)
+		throws InvocationTargetException {
+		// Total number of work steps needed
+		int totalWork = 2;
+
+		monitor = progressMonitor;
+		rpm_errorTable = new ArrayList<Exception>();
+
+		monitor.beginTask(Messages.getString("SRPMImportOperation.Starting"), //$NON-NLS-1$
+		totalWork);
+
+		// Try to create an instance of the build class. 
+		try {
+			RPMProject rpmProject = new RPMProject(project);
+			monitor.worked(1);
+			monitor.setTaskName(Messages.getString("SRPMImportOperation.Importing_SRPM")); //$NON-NLS-1$
+			rpmProject.importSourceRPM(sourceRPM);
+		} catch (Exception e) {
+			rpm_errorTable.add(e);
+			return;
+		}
+		monitor.worked(1);
+	}
+
+
+	public MultiStatus getStatus() {
+	IStatus[] errors = new IStatus[rpm_errorTable.size()];
+	Iterator<Exception> count = rpm_errorTable.iterator();
+	int iCount = 0;
+	String error_message=Messages.getString("SRPMImportOperation.0"); //$NON-NLS-1$
+	while (count.hasNext()) {
+
+		Object anonErrorObject = count.next();
+		if (anonErrorObject instanceof Throwable) {
+			Throwable errorObject = (Throwable)  anonErrorObject;
+			error_message=errorObject.getMessage();
+			if (error_message == null)
+				error_message=Messages.getString("SRPMImportOperation.1"); //$NON-NLS-1$
+				
+		}
+		else
+			if (anonErrorObject instanceof Status)
+			{
+				Status errorObject = (Status) anonErrorObject;
+				error_message=errorObject.getMessage();
+				if (error_message == null)
+					error_message=Messages.getString("SRPMImportOperation.2"); //$NON-NLS-1$
+			}
+		IStatus error =
+			new Status(
+				IStatus.ERROR,
+				"RPM Plugin",IStatus.OK, //$NON-NLS-1$
+				error_message,
+				null);
+		errors[iCount] = error;
+		iCount++;
+	}
+
+	return new MultiStatus(PlatformUI.PLUGIN_ID, IStatus.OK, errors, Messages.getString("SRPMImportOperation.3"), //$NON-NLS-1$
+	null);
+}
+	
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/SRPMImportPage.java b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/SRPMImportPage.java
new file mode 100644
index 0000000..6eb6705
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/SRPMImportPage.java
@@ -0,0 +1,451 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui;
+
+import java.io.File;
+import java.util.Iterator;
+import java.util.Vector;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.List;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * RPM GUI import  page. Defines the page the is shown to the user when they choose
+ * to export to and RPM. Defines the UI elements shown, and the basic validation (need to add to
+ * this)
+ * SRPMImportPage. Called by SRPMImportwizard.  Class can not be subclassed
+ * extends WizardPage and implements Listener (for events)
+ *
+ */
+public class SRPMImportPage extends WizardPage implements Listener {
+	
+	/** This is a copy of 
+	 * org.eclipse.team.internal.ccvs.ui.wizards.CheckoutAsWizard.NewProjectListener**/
+	class NewProjectListener implements IResourceChangeListener {
+		private IProject newProject = null;
+
+		/**
+		 * @see IResourceChangeListener#resourceChanged(IResourceChangeEvent)
+		 */
+		public void resourceChanged(IResourceChangeEvent event) {
+			IResourceDelta root = event.getDelta();
+			IResourceDelta[] projectDeltas = root.getAffectedChildren();
+			for (int i = 0; i < projectDeltas.length; i++) {
+				IResourceDelta delta = projectDeltas[i];
+				IResource resource = delta.getResource();
+				if (delta.getKind() == IResourceDelta.ADDED) {
+					newProject = (IProject) resource;
+				}
+			}
+		}
+
+		/**
+		 * Gets the newProject.
+		 * 
+		 * @return Returns a IProject
+		 */
+		public IProject getNewProject() {
+			return newProject;
+		}
+	}
+
+	// GUI Control variables	
+	private Combo sourceSRPM;
+	private Button intoConfigured;
+	private Button intoExisting;
+	private List projectList;
+	private IStructuredSelection selection;
+
+	static private Vector<String> srpmVector;
+	
+	/**
+	 * @see java.lang.Object#Object()
+	 *
+	 * Constructor for SRPMImportPage class
+	 * @param aWorkbench - Workbench
+	 * @param selection - IStructuredSelection
+	 */
+	public SRPMImportPage(IWorkbench aWorkbench, IStructuredSelection currentSelection) {
+		super(Messages.getString("SRPMImportPage.Import_SRPM"), //$NON-NLS-1$
+			Messages.getString("SRPMImportPage.Select_project_to_import"), null); //$NON-NLS-1$
+
+		setPageComplete(false);
+		setDescription(Messages.getString(
+				"SRPMImportPage.Select_project_to_import")); //$NON-NLS-1$
+		selection = currentSelection;
+	}
+
+	
+	private String getSelectedProjectName() {
+		String[] selections = projectList.getSelection();
+		if (selections.length > 0) {
+			return selections[0];
+		}
+		return null;
+	}
+	
+	private File getSelectedSRPM() {
+		String srpmName = sourceSRPM.getText();
+		if(srpmName == null || srpmName.equals("")) { //$NON-NLS-1$
+			return null;
+		}
+		return new File(sourceSRPM.getText());
+	}
+
+	public void createControl(Composite parent) {
+		// Set Page complete to false. Don't allow the user to execute wizard
+		// until we have all the required data
+		setPageComplete(false);
+
+		// Create a generic composite to hold ui variable
+		Composite composite = new Composite(parent, SWT.NULL);
+
+		// Create a layout for the wizard page
+		composite.setLayout(new GridLayout());
+		composite.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
+		setControl(composite);
+
+		// Create contols on the page
+		createSourceRPMCombo(composite);
+		createProjectBox(composite);
+	}
+
+	private void createSourceRPMCombo(Composite parent) {
+		Group specGrid = new Group(parent, SWT.NONE);
+		specGrid.setLayout(new GridLayout());
+		specGrid.setText(Messages.getString("SRPMImportPage.SRPM_Name")); //$NON-NLS-1$
+		specGrid.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL |
+				GridData.HORIZONTAL_ALIGN_FILL));
+
+		Composite sourceSpecComposite = new Composite(specGrid, SWT.NONE);
+		GridLayout layout = new GridLayout();
+		layout.numColumns = 2;
+		sourceSpecComposite.setLayout(layout);
+		sourceSpecComposite.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL |
+				GridData.GRAB_HORIZONTAL));
+
+		sourceSRPM = new Combo(sourceSpecComposite, SWT.BORDER);
+		sourceSRPM.setToolTipText(Messages.getString(
+				"SRPMImportPage.toolTip_SRPM_Name")); //$NON-NLS-1$
+
+		if (srpmVector == null)
+			srpmVector = new Vector<String>();
+		for (int i = srpmVector.size(); i > 0; i--)
+			sourceSRPM.add((srpmVector.elementAt(i - 1)));
+		GridData gridData = new GridData();
+		gridData.horizontalAlignment = GridData.FILL;
+		gridData.grabExcessHorizontalSpace = true;
+		sourceSRPM.setLayoutData(gridData);
+		sourceSRPM.addModifyListener(new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					handleEvent(null);
+				}
+			});
+
+		Button srpmBrowse = new Button(sourceSpecComposite, SWT.PUSH);
+		srpmBrowse.setToolTipText(Messages.getString(
+				"SRPMImportPage.toolTip_Open_file_navigator")); //$NON-NLS-1$
+		srpmBrowse.setText(Messages.getString("RPMPage.Browse")); //$NON-NLS-1$
+		srpmBrowse.addListener(SWT.Selection,
+			new Listener() {
+				public void handleEvent(Event event) {
+					FileDialog srpmBrowseDialog = new FileDialog(getContainer()
+							.getShell(), SWT.OPEN);
+					String selectedSRPM_name = srpmBrowseDialog.open();
+					if (selectedSRPM_name != null)
+					{
+						File testSRPMfilename = new File(selectedSRPM_name);
+						if (testSRPMfilename.isFile())
+							sourceSRPM.setText(selectedSRPM_name);
+					}
+				}
+			});
+		srpmBrowse.addListener(SWT.FocusOut, this);
+	}
+
+	/**
+	 * Method createProjectBox.
+	 * @param parent - parent widget
+	 *
+	 * Create a list box and populate it with
+	 * the list of current projects in the workspace
+	 * along with adding the option for a configured project
+	 */
+	private void createProjectBox(Composite parent) {
+		// Creates a control that enumerates all the projects in the current 
+		// Workspace and places them in a listbox. 
+		// Give the option of importing into an existing project or creating a new one
+		
+		// Declare an array of IProject;
+		IProject[] internalProjectList;
+
+		//Get the current workspace root.
+		final IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace()
+															  .getRoot();
+
+		// Create a group and set up the layout, we want to seperate 
+		// project selection from the other widgets on the wizard dialog box
+		Group group = new Group(parent, SWT.NONE);
+		group.setLayout(new GridLayout());
+		group.setText(Messages.getString("SRPMImportPage.import_srpm_into")); //$NON-NLS-1$
+		group.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL |
+				GridData.HORIZONTAL_ALIGN_FILL));
+		intoExisting = new Button(group, SWT.RADIO);
+		intoExisting.setText(Messages.getString("RPMPage.Select_a_project")); //$NON-NLS-1$
+		
+		// Create a new SWT listbox. Only allow single selection of items	 
+		// Set up the layout data
+		projectList = new List(group, SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL);
+		projectList.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL |
+				GridData.HORIZONTAL_ALIGN_FILL));
+		projectList.setToolTipText(Messages.getString(
+				"SRPMImportPage.toolTip_project_destination")); //$NON-NLS-1$
+
+		intoConfigured = new Button(group, SWT.RADIO);
+		intoConfigured.setText(Messages.getString("SRPMImportPage.Configured_New_Project")); //$NON-NLS-1$
+
+		// Set the height to 4 elements high
+		GridData projectLayout = new GridData(GridData.GRAB_HORIZONTAL |
+				GridData.HORIZONTAL_ALIGN_FILL);
+		projectLayout.heightHint = projectList.getItemHeight() * 4;
+		projectList.setLayoutData(projectLayout);
+
+		// From the current Workspace root, get a list of all current projects
+		// This should come back to us as an array of IProject.
+		internalProjectList = workspaceRoot.getProjects();
+
+		// Stuff the listbox with the text name of the projects 
+		// using the getName() method
+		// Find the first selected project in the workspace
+
+		Iterator iter = selection.iterator();
+		Object selectedObject= null;
+		IProject selectedProject = null;
+		boolean isSelection = false;
+		if (iter.hasNext())
+		{
+			selectedObject = iter.next();
+			if (selectedObject instanceof IResource)
+			{
+				selectedProject = ((IResource) selectedObject).getProject();
+				isSelection = true;
+			}
+		}
+
+		// Stuff the listbox with the text names of the projects 
+		// using the getName() method and select the selected 
+		// project if available
+		
+		for (int a = 0; a < internalProjectList.length; a++) 
+		{
+			projectList.add(internalProjectList[a].getName());
+			if (isSelection && internalProjectList[a].equals(selectedProject)) {
+				projectList.setSelection(a);
+			}
+		}
+		
+		if (projectList.getItemCount() == 0) //there were no projects
+		{
+			projectList.add(Messages.getString(
+			"SRPMImportPage.No_projects_found")); //$NON-NLS-1$
+			intoExisting.setEnabled(false); // Can't very well import into an existing
+			projectList.setEnabled(false);  // project now can we?
+			intoConfigured.setSelection(true);
+			isSelection = true; // we don't want select the "RPMPage.No_c/c++_projects_found_2"
+		}
+		else {
+			intoExisting.setSelection(true);	
+		}
+		
+		if (!isSelection) { //if none is selected select first project
+			projectList.setSelection(0);
+		}
+		else {
+			projectList.addSelectionListener(new SelectionListener() {
+				public void widgetSelected(SelectionEvent e) {
+					handleEvent(null);
+				}
+
+				public void widgetDefaultSelected(SelectionEvent e) {
+				}
+			});
+		}
+
+		intoExisting.addListener(SWT.Selection, this);
+		intoConfigured.addListener(SWT.Selection, this);
+		projectList.addListener(SWT.FocusOut, this);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
+	 */
+	public void handleEvent(Event event) {
+		if (event != null)
+		{
+			if (event.widget == intoExisting && intoExisting.getSelection())
+			{
+				projectList.setEnabled(true);
+			}
+			else if (event.widget == intoConfigured && intoConfigured.getSelection())
+			{
+				projectList.setEnabled(false);
+			}
+		}
+		setPageComplete(canFinish());
+	}
+
+	
+	/**
+	 * canFinish()
+	 * 
+	 * Hot validation. Called to determine whether Finish
+	 * button can be set to true
+	 * @return boolean. true if finish can be activated
+	 */
+	public boolean canFinish() {
+		// Make sure project has been selected or the user 
+		// has decided to configure a new one instead
+		if (getSelectedProjectName() == null && !intoConfigured.getSelection()) {
+			return false;
+		}
+
+		// Make sure an srpm name has been provided
+		if (sourceSRPM.getText().equals("")) { //$NON-NLS-1$
+			return false;
+		}
+		File srpm = new File(sourceSRPM.getText());
+		if (!srpm.isFile()){
+			setErrorMessage(Messages.getString("SRPMImportPage.Source_not_Valid")); //$NON-NLS-1$
+			return false;
+		}
+		if (sourceSRPM.getText().lastIndexOf(".src.rpm") == -1) //$NON-NLS-1$
+		{
+			setErrorMessage(Messages.getString("SRPMImportPage.No_src_rpm_ext")); //$NON-NLS-1$
+			return false;
+		}
+  
+		return true;
+	}
+	
+	/**
+	 * finish()
+	 * 
+	 * Perform finish after finish button is pressed
+	 * @return boolean
+	 * @throws CoreException
+	 * 	 */
+	public boolean finish() throws CoreException {
+		IProject detailedProject;
+			
+		// Get the handle to the current activate Workspace	    
+		IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
+
+		// User chooses an existing project or make a new project
+		if (intoExisting.getSelection()) {
+			// Get the current selected member from the list box (projectList)
+			String[] selectedProject = projectList.getSelection();
+			
+			// As we only allow a single selection in the listbox, and the listbox always
+			// comes with the first element selected, we can assume the first element
+			// in the returned array is valid.
+			detailedProject = workspaceRoot.getProject(selectedProject[0]);
+		}		
+		else {
+			detailedProject = getNewProject();
+			if(detailedProject == null) {
+				return false;
+			}
+		}
+		// Add this SRPM to srpmList
+		for (int i = 0; i < srpmVector.size(); i++)
+		{	// There can only be one occurance 
+			if (srpmVector.elementAt(i).equals(sourceSRPM.getText()))
+			{
+				srpmVector.remove(i);
+				break;
+			}
+		}
+		srpmVector.add((sourceSRPM.getText()));
+		
+		SRPMImportOperation srpmImportOp = null;
+		try {
+			srpmImportOp = new SRPMImportOperation(detailedProject,
+					getSelectedSRPM());
+			getContainer().run(true, true, srpmImportOp);
+		} catch (Exception e) {
+			setErrorMessage(e.toString());
+			return false;
+		}
+
+		// Get the status of the operation
+		IStatus srpmImportStatus = srpmImportOp.getStatus();
+
+		// If the status does not come back clean, open error dialog
+		if (!srpmImportStatus.isOK()) {
+			ErrorDialog.openError(getContainer().getShell(),
+				Messages.getString("SRPMImportPage.Errors_importing_SRPM"), //$NON-NLS-1$
+				null, // no special message
+				srpmImportStatus);
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get a new project that is configured by the new project wizard. This is
+	 * currently the only way to do this.  This is a copy of 
+	 * org.eclipse.team.internal.ccvs.ui.wizards.CheckoutAsWizard.getNewProject()
+	 */
+	private IProject getNewProject() {
+		NewProjectListener listener = new NewProjectListener();
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(listener,
+				IResourceChangeEvent.POST_CHANGE);
+		RPMNewProject wizard = new RPMNewProject();
+		wizard.init(PlatformUI.getWorkbench(), null);
+	    // Instantiates the wizard container with the wizard and opens it
+	    WizardDialog dialog = new WizardDialog(getShell(), wizard);
+	    dialog.create();
+	    dialog.open();
+	    ResourcesPlugin.getWorkspace().removeResourceChangeListener(listener);
+		IProject project = listener.getNewProject();
+		return project;
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/SRPMImportWizard.java b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/SRPMImportWizard.java
new file mode 100644
index 0000000..8c1ac94
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/SRPMImportWizard.java
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui;
+
+import org.eclipse.core.runtime.CoreException;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+
+import org.eclipse.ui.IImportWizard;
+import org.eclipse.ui.IWorkbench;
+
+
+/**
+ * Plug-in entry point. When the user chooses to import an RPM the plug-in manager in Eclipse
+ * will invoke this class. This class extends Wizard and implements IImportWizard.
+ * The main plugin class to be used in the desktop. This is the "entrypoint"
+ * for the import rpm plug-in.
+ */
+public class SRPMImportWizard extends Wizard implements IImportWizard {
+	private IWorkbench workbench;
+	private IStructuredSelection selection;
+	private SRPMImportPage mainPage;
+
+	/**
+	 * @see org.eclipse.ui.IWorkbenchWizard#init(IWorkbench, IStructuredSelection)
+	 */
+	public void init(IWorkbench workbench, IStructuredSelection currentSelection) {
+		this.workbench = workbench;
+		selection = currentSelection;
+		setWindowTitle(Messages.getString("SRPMImportwizard.Import_an_SRPM")); //$NON-NLS-1$
+		setNeedsProgressMonitor(true);
+	}
+
+	/**
+	 * @see org.eclipse.jface.wizard.IWizard#performFinish()
+	 */
+
+	// We have elected to do the Finish button clickin in the SRPMImportPage. So override
+	//the default and point to SRPMImport finish()
+	@Override
+	public boolean performFinish() {
+		try {
+			return mainPage.finish();
+		} catch (CoreException e) {
+			return false;
+		}
+	}
+
+	/**
+	 * @see org.eclipse.jface.wizard.IWizard#canFinish()
+	 *
+	 * Select to finish validation in the SRPMImportPage
+	 */
+	@Override
+	public boolean canFinish() {
+		return mainPage.canFinish();
+	}
+
+	/**
+	 * @see org.eclipse.jface.wizard.IWizard#addPages()
+	 */
+
+	// Add the SRPMImportPage as the only page in this wizard.
+	@Override
+	public void addPages() {
+		mainPage = new SRPMImportPage(workbench, selection);
+		addPage(mainPage);
+		super.addPages();
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/propertypage/ChangelogPage.java b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/propertypage/ChangelogPage.java
new file mode 100644
index 0000000..fc2281d
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/propertypage/ChangelogPage.java
@@ -0,0 +1,100 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.propertypage;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.linuxtools.rpm.core.utils.RPMQuery;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.dialogs.PropertyPage;
+import org.eclipse.ui.statushandlers.StatusAdapter;
+import org.eclipse.ui.statushandlers.StatusManager;
+
+public class ChangelogPage extends PropertyPage {
+
+	private static final String RPM_CHANGELOG_ENTRIES = Messages
+			.getString("ChangelogPage.entries"); //$NON-NLS-1$
+
+	private static final int CL_ENTRIES_FIELD_WIDTH = 80;
+
+	private static final int CL_ENTRIES_FIELD_HEIGHT = 50;
+
+	private Text rpm_ChangelogEntriesText;
+
+	/**
+	 * Constructor for RPMPropertyPage.
+	 */
+	public ChangelogPage() {
+		super();
+	}
+
+	private void addChangelogField(Composite parent) {
+		Composite composite = createDefaultComposite(parent);
+
+		// RPM labels and text fields setup
+
+		Label rpmChangelogEntriesLabel = new Label(composite, SWT.NONE);
+		rpmChangelogEntriesLabel.setText(RPM_CHANGELOG_ENTRIES);
+		rpm_ChangelogEntriesText = new Text(composite, SWT.MULTI | SWT.BORDER
+				| SWT.READ_ONLY | SWT.V_SCROLL | SWT.WRAP);
+		GridData gdEntries = new GridData();
+		gdEntries.widthHint = convertWidthInCharsToPixels(CL_ENTRIES_FIELD_WIDTH);
+		gdEntries.heightHint = convertWidthInCharsToPixels(CL_ENTRIES_FIELD_HEIGHT);
+		rpm_ChangelogEntriesText.setLayoutData(gdEntries);
+
+		try {
+			String rpm_ChangelogEntries = RPMQuery
+					.getChangelog((IFile) getElement());
+			rpm_ChangelogEntriesText.setText(rpm_ChangelogEntries);
+		} catch (CoreException e) {
+			StatusManager.getManager().handle(new StatusAdapter(e.getStatus()),
+					StatusManager.LOG | StatusManager.SHOW);
+		}
+
+	}
+
+	/**
+	 * @see PreferencePage#createContents(Composite)
+	 */
+	@Override
+	protected Control createContents(Composite parent) {
+		Composite composite = new Composite(parent, SWT.NONE);
+		GridLayout layout = new GridLayout();
+		composite.setLayout(layout);
+		GridData data = new GridData(GridData.FILL);
+		data.grabExcessHorizontalSpace = true;
+		composite.setLayoutData(data);
+
+		addChangelogField(composite);
+		return composite;
+	}
+
+	private Composite createDefaultComposite(Composite parent) {
+		Composite composite = new Composite(parent, SWT.NULL);
+		GridLayout layout = new GridLayout();
+		layout.numColumns = 2;
+		composite.setLayout(layout);
+
+		GridData data = new GridData();
+		data.verticalAlignment = GridData.FILL;
+		data.horizontalAlignment = GridData.FILL;
+		composite.setLayoutData(data);
+
+		return composite;
+	}
+}
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/propertypage/InstallScriptsPage.java b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/propertypage/InstallScriptsPage.java
new file mode 100644
index 0000000..28b2ad4
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/propertypage/InstallScriptsPage.java
@@ -0,0 +1,153 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.propertypage;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.linuxtools.rpm.core.utils.RPMQuery;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.dialogs.PropertyPage;
+import org.eclipse.ui.statushandlers.StatusAdapter;
+import org.eclipse.ui.statushandlers.StatusManager;
+
+public class InstallScriptsPage extends PropertyPage {
+
+	private static final String RPM_PRE_INSTALL = Messages
+			.getString("InstallScriptsPage.PreinstallScript"); //$NON-NLS-1$
+
+	private static final String RPM_POST_INSTALL = Messages
+			.getString("InstallScriptsPage.PostinstallScript"); //$NON-NLS-1$
+
+	private static final String RPM_PRE_UNINSTALL = Messages
+			.getString("InstallScriptsPage.PreuninstallScript"); //$NON-NLS-1$
+
+	private static final String RPM_POST_UNINSTALL = Messages
+			.getString("InstallScriptsPage.PostuninstallScript"); //$NON-NLS-1$
+
+	private static final int SCRIPT_ENTRIES_FIELD_WIDTH = 80;
+
+	private static final int SCRIPT_ENTRIES_FIELD_HEIGHT = 20;
+
+	private Text rpm_PreInstallText;
+
+	private Text rpm_PostInstallText;
+
+	private Text rpm_PreUnInstallText;
+
+	private Text rpm_PostUnInstallText;
+
+	/**
+	 * Constructor for RPMPropertyPage.
+	 */
+	public InstallScriptsPage() {
+		super();
+	}
+
+	private void addScriptFields(Composite parent) {
+		Composite composite = createDefaultComposite(parent);
+
+		// RPM labels and text fields setup
+
+		Label rpmPreInstallLabel = new Label(composite, SWT.NONE);
+		rpmPreInstallLabel.setText(RPM_PRE_INSTALL);
+		rpm_PreInstallText = new Text(composite, SWT.MULTI | SWT.BORDER
+				| SWT.READ_ONLY | SWT.V_SCROLL | SWT.WRAP);
+		GridData gdPreInst = new GridData();
+		gdPreInst.widthHint = convertWidthInCharsToPixels(SCRIPT_ENTRIES_FIELD_WIDTH);
+		gdPreInst.heightHint = convertWidthInCharsToPixels(SCRIPT_ENTRIES_FIELD_HEIGHT);
+		rpm_PreInstallText.setLayoutData(gdPreInst);
+
+		Label rpmPostInstallLabel = new Label(composite, SWT.NONE);
+		rpmPostInstallLabel.setText(RPM_POST_INSTALL);
+		rpm_PostInstallText = new Text(composite, SWT.MULTI | SWT.BORDER
+				| SWT.READ_ONLY | SWT.V_SCROLL | SWT.WRAP);
+		GridData gdPostInst = new GridData();
+		gdPostInst.widthHint = convertWidthInCharsToPixels(SCRIPT_ENTRIES_FIELD_WIDTH);
+		gdPostInst.heightHint = convertWidthInCharsToPixels(SCRIPT_ENTRIES_FIELD_HEIGHT);
+		rpm_PostInstallText.setLayoutData(gdPostInst);
+
+		Label rpmPreUnInstallLabel = new Label(composite, SWT.NONE);
+		rpmPreUnInstallLabel.setText(RPM_PRE_UNINSTALL);
+		rpm_PreUnInstallText = new Text(composite, SWT.MULTI | SWT.BORDER
+				| SWT.READ_ONLY | SWT.V_SCROLL | SWT.WRAP);
+		GridData gdPreUnInst = new GridData();
+		gdPreUnInst.widthHint = convertWidthInCharsToPixels(SCRIPT_ENTRIES_FIELD_WIDTH);
+		gdPreUnInst.heightHint = convertWidthInCharsToPixels(SCRIPT_ENTRIES_FIELD_HEIGHT);
+		rpm_PreUnInstallText.setLayoutData(gdPreUnInst);
+
+		Label rpmPostUnInstallLabel = new Label(composite, SWT.NONE);
+		rpmPostUnInstallLabel.setText(RPM_POST_UNINSTALL);
+		rpm_PostUnInstallText = new Text(composite, SWT.MULTI | SWT.BORDER
+				| SWT.READ_ONLY | SWT.V_SCROLL | SWT.WRAP);
+		GridData gdPostUnInst = new GridData();
+		gdPostUnInst.widthHint = convertWidthInCharsToPixels(SCRIPT_ENTRIES_FIELD_WIDTH);
+		gdPostUnInst.heightHint = convertWidthInCharsToPixels(SCRIPT_ENTRIES_FIELD_HEIGHT);
+		rpm_PostUnInstallText.setLayoutData(gdPostUnInst);
+
+		// Populate RPM text fields
+		try {
+			IFile rpmFile = (IFile) getElement();
+			String rpm_PreInstall = RPMQuery.getPreInstallScript(rpmFile);
+			rpm_PreInstallText.setText(rpm_PreInstall);
+
+			String rpm_PostInstall = RPMQuery.getPostInstallScript(rpmFile);
+			rpm_PostInstallText.setText(rpm_PostInstall);
+
+			String rpm_PreUnInstall = RPMQuery.getPreUninstallScript(rpmFile);
+			rpm_PreUnInstallText.setText(rpm_PreUnInstall);
+
+			String rpm_PostUnInstall = RPMQuery.getPostUninstallScript(rpmFile);
+			rpm_PostUnInstallText.setText(rpm_PostUnInstall);
+		} catch (CoreException e) {
+			StatusManager.getManager().handle(new StatusAdapter(e.getStatus()),
+					StatusManager.LOG | StatusManager.SHOW);
+		}
+
+	}
+
+	/**
+	 * @see PreferencePage#createContents(Composite)
+	 */
+	@Override
+	protected Control createContents(Composite parent) {
+		Composite composite = new Composite(parent, SWT.NONE);
+		GridLayout layout = new GridLayout();
+		composite.setLayout(layout);
+		GridData data = new GridData(GridData.FILL);
+		data.grabExcessHorizontalSpace = true;
+		composite.setLayoutData(data);
+
+		addScriptFields(composite);
+		return composite;
+	}
+
+	private Composite createDefaultComposite(Composite parent) {
+		Composite composite = new Composite(parent, SWT.NULL);
+		GridLayout layout = new GridLayout();
+		layout.numColumns = 2;
+		composite.setLayout(layout);
+
+		GridData data = new GridData();
+		data.verticalAlignment = GridData.FILL;
+		data.horizontalAlignment = GridData.FILL;
+		composite.setLayoutData(data);
+
+		return composite;
+	}
+
+}
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/propertypage/Messages.java b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/propertypage/Messages.java
new file mode 100644
index 0000000..b387ee9
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/propertypage/Messages.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2005-2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.propertypage;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class Messages {
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.rpm.ui.propertypage.messages"; //$NON-NLS-1$
+
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
+			.getBundle(BUNDLE_NAME);
+
+	private Messages() {
+	}
+
+	public static String getString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/propertypage/ProvidesPage.java b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/propertypage/ProvidesPage.java
new file mode 100644
index 0000000..4aa1447
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/propertypage/ProvidesPage.java
@@ -0,0 +1,101 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.propertypage;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.linuxtools.rpm.core.utils.RPMQuery;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.dialogs.PropertyPage;
+import org.eclipse.ui.statushandlers.StatusAdapter;
+import org.eclipse.ui.statushandlers.StatusManager;
+
+public class ProvidesPage extends PropertyPage {
+
+	private static final String RPM_QL = Messages
+			.getString("ProvidesPage.Provides"); //$NON-NLS-1$
+
+	private static final int QL_FIELD_WIDTH = 80;
+
+	private static final int QL_FIELD_HEIGHT = 40;
+
+	private Text rpm_qlText;
+
+	/**
+	 * Constructor for RPMPropertyPage.
+	 */
+	public ProvidesPage() {
+		super();
+	}
+
+	private void addProvidesField(Composite parent) {
+		Composite composite = createDefaultComposite(parent);
+
+		// RPM labels and text fields setup
+
+		Label rpmDescriptionLabel = new Label(composite, SWT.NONE);
+		rpmDescriptionLabel.setText(RPM_QL);
+		rpm_qlText = new Text(composite, SWT.MULTI | SWT.BORDER | SWT.READ_ONLY
+				| SWT.V_SCROLL | SWT.WRAP);
+		GridData gdQL = new GridData();
+		gdQL.widthHint = convertWidthInCharsToPixels(QL_FIELD_WIDTH);
+		gdQL.heightHint = convertWidthInCharsToPixels(QL_FIELD_HEIGHT);
+		rpm_qlText.setLayoutData(gdQL);
+
+		// Populate RPM text fields
+		try {
+			String rpm_ql = RPMQuery.getProvides((IFile) getElement());
+			rpm_qlText.setText(rpm_ql);
+		} catch (CoreException e) {
+			StatusManager.getManager().handle(new StatusAdapter(e.getStatus()),
+					StatusManager.LOG | StatusManager.SHOW);
+		}
+
+	}
+
+	/**
+	 * @see PreferencePage#createContents(Composite)
+	 */
+	@Override
+	protected Control createContents(Composite parent) {
+		Composite composite = new Composite(parent, SWT.NONE);
+		GridLayout layout = new GridLayout();
+		composite.setLayout(layout);
+		GridData data = new GridData(GridData.FILL);
+		data.grabExcessHorizontalSpace = true;
+		composite.setLayoutData(data);
+
+		addProvidesField(composite);
+		return composite;
+	}
+
+	private Composite createDefaultComposite(Composite parent) {
+		Composite composite = new Composite(parent, SWT.NULL);
+		GridLayout layout = new GridLayout();
+		layout.numColumns = 2;
+		composite.setLayout(layout);
+
+		GridData data = new GridData();
+		data.verticalAlignment = GridData.FILL;
+		data.horizontalAlignment = GridData.FILL;
+		composite.setLayoutData(data);
+
+		return composite;
+	}
+
+}
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/propertypage/SpecFileHeaderPage.java b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/propertypage/SpecFileHeaderPage.java
new file mode 100644
index 0000000..eceacc0
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/propertypage/SpecFileHeaderPage.java
@@ -0,0 +1,99 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.propertypage;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.linuxtools.rpm.core.utils.RPMQuery;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.dialogs.PropertyPage;
+import org.eclipse.ui.statushandlers.StatusAdapter;
+import org.eclipse.ui.statushandlers.StatusManager;
+
+public class SpecFileHeaderPage extends PropertyPage {
+
+	private static final String RPM_QI = Messages
+			.getString("SpecFileHeaderPage.info"); //$NON-NLS-1$
+
+	private static final int QI_FIELD_WIDTH = 80;
+
+	private static final int QI_FIELD_HEIGHT = 40;
+
+	private Text rpm_qiText;
+
+	/**
+	 * Constructor for RPMPropertyPage.
+	 */
+	public SpecFileHeaderPage() {
+		super();
+	}
+
+	private void addInfoField(Composite parent) {
+		Composite composite = createDefaultComposite(parent);
+
+		// RPM labels and text fields setup
+
+		Label rpmDescriptionLabel = new Label(composite, SWT.NONE);
+		rpmDescriptionLabel.setText(RPM_QI);
+		rpm_qiText = new Text(composite, SWT.MULTI | SWT.BORDER | SWT.READ_ONLY
+				| SWT.V_SCROLL | SWT.WRAP);
+		GridData gdQI = new GridData();
+		gdQI.widthHint = convertWidthInCharsToPixels(QI_FIELD_WIDTH);
+		gdQI.heightHint = convertWidthInCharsToPixels(QI_FIELD_HEIGHT);
+		rpm_qiText.setLayoutData(gdQI);
+
+		// Populate RPM text field
+		try {
+			String rpm_qi = RPMQuery.getHeaderInfo((IFile) getElement());
+			rpm_qiText.setText(rpm_qi);
+		} catch (CoreException e) {
+			StatusManager.getManager().handle(new StatusAdapter(e.getStatus()),
+					StatusManager.LOG | StatusManager.SHOW);
+		}
+	}
+
+	/**
+	 * @see PreferencePage#createContents(Composite)
+	 */
+	@Override
+	protected Control createContents(Composite parent) {
+		Composite composite = new Composite(parent, SWT.NONE);
+		GridLayout layout = new GridLayout();
+		composite.setLayout(layout);
+		GridData data = new GridData(GridData.FILL);
+		data.grabExcessHorizontalSpace = true;
+		composite.setLayoutData(data);
+
+		addInfoField(composite);
+		return composite;
+	}
+
+	private Composite createDefaultComposite(Composite parent) {
+		Composite composite = new Composite(parent, SWT.NULL);
+		GridLayout layout = new GridLayout();
+		layout.numColumns = 2;
+		composite.setLayout(layout);
+
+		GridData data = new GridData();
+		data.verticalAlignment = GridData.FILL;
+		data.horizontalAlignment = GridData.FILL;
+		composite.setLayoutData(data);
+
+		return composite;
+	}
+}
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/propertypage/TargetPage.java b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/propertypage/TargetPage.java
new file mode 100644
index 0000000..78d95e4
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/propertypage/TargetPage.java
@@ -0,0 +1,159 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.rpm.ui.propertypage;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.linuxtools.rpm.core.utils.RPMQuery;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.dialogs.PropertyPage;
+import org.eclipse.ui.statushandlers.StatusAdapter;
+import org.eclipse.ui.statushandlers.StatusManager;
+
+public class TargetPage extends PropertyPage {
+
+	private static final String RPM_ARCH = Messages
+			.getString("TargetPage.Architecture"); //$NON-NLS-1$
+
+	private static final String RPM_PLATFORM = Messages
+			.getString("TargetPage.Platform"); //$NON-NLS-1$
+
+	private static final String RPM_OS = Messages.getString("TargetPage.OS"); //$NON-NLS-1$
+
+	private static final String RPM_HOST = Messages
+			.getString("TargetPage.BuildHost"); //$NON-NLS-1$
+
+	private static final String RPM_TIME = Messages
+			.getString("TargetPage.BuildTime"); //$NON-NLS-1$
+
+	private static final int ARCH_FIELD_WIDTH = 8;
+
+	private static final int PLATFORM_FIELD_WIDTH = 20;
+
+	private static final int OS_FIELD_WIDTH = 10;
+
+	private static final int HOST_FIELD_WIDTH = 40;
+
+	private static final int TIME_FIELD_WIDTH = 35;
+
+	private Label rpm_archText;
+
+	private Label rpm_platformText;
+
+	private Label rpm_osText;
+
+	private Label rpm_hostText;
+
+	private Label rpm_timeText;
+
+	/**
+	 * Constructor for RPMPropertyPage.
+	 */
+	public TargetPage() {
+		super();
+	}
+
+	private void addTargetFields(Composite parent) {
+		Composite composite = createDefaultComposite(parent);
+
+		// RPM labels and text fields setup
+
+		Label rpmArchLabel = new Label(composite, SWT.NONE);
+		rpmArchLabel.setText(RPM_ARCH);
+		rpm_archText = new Label(composite, SWT.HORIZONTAL);
+		GridData gdArch = new GridData();
+		gdArch.widthHint = convertWidthInCharsToPixels(ARCH_FIELD_WIDTH);
+		rpm_archText.setLayoutData(gdArch);
+
+		Label rpmPlatformLabel = new Label(composite, SWT.NONE);
+		rpmPlatformLabel.setText(RPM_PLATFORM);
+		rpm_platformText = new Label(composite, SWT.HORIZONTAL);
+		GridData gdPlatform = new GridData();
+		gdPlatform.widthHint = convertWidthInCharsToPixels(PLATFORM_FIELD_WIDTH);
+		rpm_platformText.setLayoutData(gdPlatform);
+
+		Label rpmOSLabel = new Label(composite, SWT.NONE);
+		rpmOSLabel.setText(RPM_OS);
+		rpm_osText = new Label(composite, SWT.HORIZONTAL);
+		GridData gdOS = new GridData();
+		gdOS.widthHint = convertWidthInCharsToPixels(OS_FIELD_WIDTH);
+		rpm_osText.setLayoutData(gdOS);
+
+		Label rpmHostLabel = new Label(composite, SWT.NONE);
+		rpmHostLabel.setText(RPM_HOST);
+		rpm_hostText = new Label(composite, SWT.HORIZONTAL);
+		GridData gdHost = new GridData();
+		gdHost.widthHint = convertWidthInCharsToPixels(HOST_FIELD_WIDTH);
+		rpm_hostText.setLayoutData(gdHost);
+
+		Label rpmTimeLabel = new Label(composite, SWT.NONE);
+		rpmTimeLabel.setText(RPM_TIME);
+		rpm_timeText = new Label(composite, SWT.HORIZONTAL);
+		GridData gdTime = new GridData();
+		gdTime.widthHint = convertWidthInCharsToPixels(TIME_FIELD_WIDTH);
+		rpm_timeText.setLayoutData(gdTime);
+
+		// Populate RPM text fields
+		try {
+			IFile rpmFile = (IFile) getElement();
+			String rpm_arch = RPMQuery.getArch(rpmFile);
+			rpm_archText.setText(rpm_arch);
+			String rpm_platform = RPMQuery.getPlatform(rpmFile);
+			rpm_platformText.setText(rpm_platform);
+			String rpm_os = RPMQuery.getOS(rpmFile);
+			rpm_osText.setText(rpm_os);
+			String rpm_host = RPMQuery.getBuildHost(rpmFile);
+			rpm_hostText.setText(rpm_host);
+			String rpm_time = RPMQuery.getBuildTime(rpmFile);
+			rpm_timeText.setText(rpm_time);
+		} catch (CoreException e) {
+			StatusManager.getManager().handle(new StatusAdapter(e.getStatus()),
+					StatusManager.LOG | StatusManager.SHOW);
+		}
+
+	}
+
+	/**
+	 * @see PreferencePage#createContents(Composite)
+	 */
+	@Override
+	protected Control createContents(Composite parent) {
+		Composite composite = new Composite(parent, SWT.NONE);
+		GridLayout layout = new GridLayout();
+		composite.setLayout(layout);
+		GridData data = new GridData(GridData.FILL);
+		data.grabExcessHorizontalSpace = true;
+		composite.setLayoutData(data);
+
+		addTargetFields(composite);
+		return composite;
+	}
+
+	private Composite createDefaultComposite(Composite parent) {
+		Composite composite = new Composite(parent, SWT.NULL);
+		GridLayout layout = new GridLayout();
+		layout.numColumns = 2;
+		composite.setLayout(layout);
+
+		GridData data = new GridData();
+		data.verticalAlignment = GridData.FILL;
+		data.horizontalAlignment = GridData.FILL;
+		composite.setLayoutData(data);
+
+		return composite;
+	}
+}
\ No newline at end of file
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/propertypage/messages.properties b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/propertypage/messages.properties
new file mode 100644
index 0000000..0b39b34
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/propertypage/messages.properties
@@ -0,0 +1,22 @@
+###############################################################################
+# Copyright (c) 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+SpecFileHeaderPage.info=Header Information:
+ChangelogPage.entries=ChangeLog Entries:
+TargetPage.Architecture=Architecture:
+TargetPage.Platform=Platform:
+TargetPage.OS=OS Target:
+TargetPage.BuildHost=Build Host:
+TargetPage.BuildTime=Build Time:
+InstallScriptsPage.PreinstallScript=Pre-install script:
+InstallScriptsPage.PostinstallScript=Post-install script:
+InstallScriptsPage.PreuninstallScript=Pre-uninstall script:
+InstallScriptsPage.PostuninstallScript=Post-uninstall script:
+ProvidesPage.Provides=Files Provided:
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/redhat-system_tools.png b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/redhat-system_tools.png
new file mode 100644
index 0000000..0cc5d06
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/redhat-system_tools.png
Binary files differ
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/rpm_strings.properties b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/rpm_strings.properties
new file mode 100644
index 0000000..1e9d635
--- /dev/null
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/rpm/ui/rpm_strings.properties
@@ -0,0 +1,174 @@
+###############################################################################
+# Copyright (c) 2004, 2009 Red Hat, Inc.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Red Hat - initial API and implementation
+###############################################################################
+RPMExportOperation.Cannot_invoke_core_rpmbuild_class=Cannot invoke the core rpm build class
+RPMExportOperation.Makefile_exists_check=Checking existence of Makefile/makefile
+RPMExportOperation.Create_RPM_directories=Creating RPM directories
+RPMExportOperation.Create_.rpmrc_RPM_resource=Creating .rpmrc RPM resource file
+RPMExportOperation.Creat_.rpmmacro_RPM_resource=Creating .rpmmacro RPM resource file
+RPMExportOperation.Replicate_project_dir=Replicating project directory
+RPMExportOperation.Setting_RPM_spec=Setting RPM spec file
+RPMExportOperation.Retrieving_RPM_info=Retrieving RPM info
+RPMExportOperation.Installing_previous_SRPM_source=Installing previous SRPM source
+RPMExportOperation.Executing_Build_Preparation=Executing Build Preparation
+RPMExportOperation.Modifying_Spec_File=Modifying Spec File
+RPMExportOperation.Generating_patch=Generating patch
+RPMExportOperation.Creating_new_SPEC_file=Creating new SPEC file
+RPMExportOperation.Create_RPM_Tar_file=Create RPM Tar file
+RPMExportOperation.Creating_the_RPM_binary=Creating the RPM binary
+RPMExportOperation.Starting_task=Starting ...
+RPMExportOperation.Cleaning_up_RPM_workarea=Cleaning up RPM work area
+RPMExportOperation.Export_RPM_errors=Export RPM errors
+
+RPMExportPage.0=No RPM project found in the selection
+RPMExportPage.Export_an_RPM=Export an RPM
+RPMExportPage.Makefile_pc=Makefile
+RPMExportPage.Makefile_lc=makefile
+RPMExportPage.specify_version_and_release_if_SPEC_file_not_provided=You must specify a version and release if a SPEC file is not provided
+RPMExportPage.selected_project_does_not_have_Makefile=The selected project does not have a Makefile
+RPMExportPage.Cannont_find_file=Cannot find the file: 
+RPMExportPage.Core_Exception=Core Exception: 
+RPMExportPage.SPEC_file=SPEC file
+RPMExportPage.Version=Version: 
+RPMExportPage.Release=\ \ Release: 
+RPMExportPage.project_to_export_to_RPM=Select a project to export to RPM
+RPMExportPage.No_c/c++_projects_found=---> No c/c++ projects found <--
+RPMExportPage.Invald_project_specified_(not_c/c++)=Invald project specified (not_c/c++)
+RPMExportPage.Select_project=Select a project
+RPMExportPage.No_c/c++_projects_found_2=---> No c/c++ projects found <---
+RPMExportPage.Binary_RPM_filename=Binary RPM filename
+RPMExportPage.Preserve_RPM_environment=Preserve RPM build environment
+RPMExportPage.Gen_build_log_file=Generate build output log file
+RPMExportPage.Composite_Export_Type=Composite Export Type
+RPMExportPage.Export_Binary=Export a Binary RPM
+RPMExportPage.Export_Source=Export a Source RPM
+RPMExportPage.Fill_in_ver_rel=Specify version and release information
+RPMExportPage.Invalid_ver_rel=Invalid version or release
+RPMExportPage.Select_export_type=Select export type(s)
+RPMExportPage.Select_spec_file=Select a spec file
+RPMExportPage.Not_in_specs=Spec file must be in SPECS folder
+RPMExportPage.Spec_file_does_not_exist=Selected spec file does not exist
+
+
+RPMexportwiz.Export_an_RPM_title=Export an RPM
+
+SRPMImportPage.Configured_New_Project=Import into project &configured using the New RPM Project Wizard
+SRPMImportPage.Project_does_not_exist=Project does not exist. Please select a project
+SRPMImportPage.Problems_identifying_import_source_directory=Problems identifying import source directory
+SRPMImportPage.SRPM_Name=SRPM
+SRPMImportPage.Import_SRPM=Import SRPM
+SRPMImportPage.Select_project_to_import=Select a project to import an SRPM into
+SRPMImportPage.No_objects_selected_to_be_imported=No objects have been selected to be imported
+SRPMImportPage.Errors_importing_SRPM=Errors encountered importing the SRPM
+SRPMImportPage.Preserve_SRPM_envionment=Preserve SRPM envionment
+SRPMImportPage.Create_logfile_operations=Create a logfile of operations
+SRPMImportPage.Browse=Browse...
+SRPMImportPage.Errors_importing_SRPM=Errors encountered importing the SRPM
+SRPMImportPage.Errors_importing_SRPM_2=Errors encountered importing the SRPM
+SRPMImportPage.ApplyPatches=Apply all patches to pristine source
+SRPMImportPage.runAutoConf=Run AutoConf (configure) if applicable
+SRPMImportPage.preserveRPMenvironment=Preserve RPM environment
+SRPMImportPage.Source_not_Valid=Source File is not a valid file
+SRPMImportPage.No_src_rpm_ext=Filename does not have src.rpm extension
+SRPMImportPage.Build_Options=Build Options
+SRPMImportPage.import_srpm_into=Import SRPM into...
+SRPMImportwizard.Import_an_SRPM=Import an SRPM
+SRPMImportPage.No_projects_found=No projects found
+
+
+SRPMImportPage.toolTip_ApplyPatches=Typically, an SRPM is comprised of a source tarball\nand a set of patches that are applied to that tarball.\nTherefore changes are made to the SRPM in the form of\npatches, while leaving the original source 'pristine'\n\nThis option allows you to import the unpatched\n'pristine' source code, and not apply patches
+SRPMImportPage.toolTip_runAutoConf=Many projects use autoconf to create their\nbuild environments automatically. Typically,\nthis is done by running the 'configure' script that\ncreates, among other things, a Makefile\n\nClick this option to run the configure step if this\nis an autoconf project
+SRPMImportPage.toolTip_preserveEnv=Click to preserve the RPM environment after import\nThis option is normally only used for debugging.
+SRPMImportPage.toolTip_genLog=Click to generate a log of the import process
+SRPMImportPage.toolTip_SRPM_Name=Name of SRPM file to import into a project
+SRPMImportPage.toolTip_Open_file_navigator=Click to open a file navigator to select an SRPM  file
+SRPMImportPage.toolTip_project_destination=Select a project as a destination for the imported SRPM files
+
+RPMExportOperation.Starting=Starting ...
+RPMExportOperation.0=Error message not defined
+RPMExportOperation.Open_SRPM_Errors=Export RPM Errors
+RPMExportOperation.Starting_SRPM_Export=Starting SRPM Export Operation
+RPMExportOperation.Executing_SRPM_Export=Executing SRPM Export
+RPMExportOperation.Starting_RPM_Export=Starting RPM Export Operation
+RPMExportOperation.Executing_RPM_Export=Executing RPM Export
+
+RPMExportPage.Export_SRPM=Export SRPM
+RPMExportPage.Export_SRPM_from_project=Export an SRPM from a project
+RPMExportPage.Select_project_export=Select a project to export
+RPMExportPage.Makefile_pc=Makefile
+RPMExportPage.makefile_lc=makefile
+RPMExportPage.project_does_not_have_Makefile=The selected project does not have a Makefile
+RPMExportPage.No_c/c++_projects_found=---> No c/c++ projects found <---
+RPMExportPage.Invald_project_specified=Invald project specified (not c/c++)
+RPMExportPage.Patch_must_have_name=Patch must have a name
+RPMExportPage.must_supply_version_number=You must supply a version number
+RPMExportPage.must_supply_release_number=You must supply a release number
+RPMExportPage.version_or_release_change=Either version or release must change for exporting
+RPMExportPage.Patch_have_descriptive_tag=Patch must have a short descriptive tag
+RPMExportPage.Patch_tag_cannot_have_spaces=Patch tag cannot have any spaces
+RPMExportPage.Patch_must_have_changelog=Patch must have a changelog entry
+RPMExportPage.Errors_encountered_importing_SRPM=Errors encountered importing the SRPM
+RPMExportPage.SPEC_file=SPEC file
+RPMExportPage_2.0=Enter patch/changelog information for spec file
+RPMExportPage_2.1=Patch name contains invalid character(s)
+RPMExportPage_2.2=Enter patch/changelog information for spec file
+RPMExportPage_2.3=Patch name is not unique
+RPMExportPage_2.4=Enter changelog entry info
+RPMExportPage_2.5=Enter a patch name
+RPMExportPage.Generate_patch=Generate patch (against previously imported SRPM)
+RPMExportPage.YourName=YourName
+RPMExportPage.your@mail.com=mail.com
+RPMExportPage.Patch_Options=Patch Options
+RPMExportPage.Patch_Name=Patch Name: 
+RPMExportPage.Patch_Tag=Patch Tag 
+RPMExportPage.Patch_Changelog_Stamp=Changelog Date Stamp: 
+RPMExportPage.Patch_Changelog=Changelog Comment: 
+RPMExportPage.Version=\ \Version: 
+RPMExportPage.Release=\ \Release:
+RPMExportPage.RPM_Export_Filename=RPM Export Filename
+RPMExportPage.groupPatchTitle=Patch Needed
+RPMExportPage.needPatch_Project=The project
+RPMExportPage.needPatch_desc=\ has changed since last imported as an SRPM. To continue export\nas an SRPM, you will have to generate a patch (on the next page)
+											
+											
+RPMExportPage.toolTip_Export_Binary=Enable to export a Binary RPM
+RPMExportPage.toolTip_Export_Source=Enable to export a source RPM
+RPMExportPage.toolTip_Select_a_project=Select a project as a source for the exported RPM/SRPM
+RPMExportPage.toolTip_SpecFile=Select an RPM SPEC file to export the project.\nA list of SPEC files found in the project are already placed in the combo box,\nor choose another SPEC file using the Browse button.
+RPMExportPage.toolTip_file_navigator=Click to open a file navigator to select an external SPEC file
+RPMExportPage.toolTip_Version=The Version associated with this RPM.\nChange the version here to change the\nversion of the RPM.
+RPMExportPage.toolTip_Release=The Release associated with this RPM.\nChange the release here to change the release number of the RPM.
+RPMExportPage.toolTip_Patch_Name=Patch Name - unique identifier for the patch. 
+RPMExportPage.toolTip_Changelog_Stamp=Changelog Date - Date stamp for the changelog entry. \n\nExample: * Wed Oct 12 2003 -- John Doe <jdoe@redhat.com>
+RPMExportPage.toolTip_Changelog=Changelog Comment - short descriptive summary of change made in patch\n\nExample: - Fixed bugzilla entry #125642
+
+RPMPage.Browse=Browse...
+RPMPage.Select_a_project=Select a project ...
+RPMPage.No_RPM_projects_found=No RPM projects found
+
+
+RPMExportWizard.0=Exporting RPM/SRPM...
+RPMExportWizard.Export_an_SRPM=Export an SRPM
+
+SRPMImportOperation.Starting=Starting ...
+SRPMImportOperation.import=import
+SRPMImportOperation.0=Error message not defined
+SRPMImportOperation.1=Undefined Error\!
+SRPMImportOperation.2=Undefined Error\!
+SRPMImportOperation.3=Source RPM Import Error
+SRPMImportOperation.Open_SRPM_Errors=Import SRPM Errors=
+SRPMImportOperation.Importing_SRPM=Importing SRPM
+
+ExceptionDialog.seeErrorLogMessage=An exception occurred.  See error log for details.
+ErrorDialog.title=Error
+
+RPMNewProject.0=New RPM Project
+RPMNewProject.1=Create a new RPM project
+RPMNewProject.2=Created project will have a standard rpmbuild structure.
\ No newline at end of file
diff --git a/rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/ChangeLog b/rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/ChangeLog
index 588e825..2d82c0e 100644
--- a/rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/ChangeLog
+++ b/rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-10  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.properties: Make featureName a bit more user-friendly.
+
 2009-05-19  Andrew Overholt  <overholt@redhat.com>
 
 	* feature.properties: Change provider from Eclipse.org to Eclipse. 
diff --git a/rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/feature.properties b/rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/feature.properties
index 6c8d048..d180355 100644
--- a/rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/feature.properties
+++ b/rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/feature.properties
@@ -13,7 +13,7 @@
 # NLS_ENCODING=UTF-8
 
 # "featureName" property - name of the feature
-featureName=RPM Stubby Feature (Incubation)
+featureName=Convert feature.xml/pom.xml to RPM specfiles (Incubation)
 
 # "description" property - description of the feature
 description=RPM Stubby Plug-in is a plugin aiming to auto-generate RPM specfile \
diff --git a/rpmstubby/org.eclipse.linuxtools.rpmstubby/ChangeLog b/rpmstubby/org.eclipse.linuxtools.rpmstubby/ChangeLog
index c34fb0a..89f3b41 100644
--- a/rpmstubby/org.eclipse.linuxtools.rpmstubby/ChangeLog
+++ b/rpmstubby/org.eclipse.linuxtools.rpmstubby/ChangeLog
@@ -1,3 +1,25 @@
+2010-02-11  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpmstubby/StubbyPomGenerator.java (generateInstallSection): Proper install for jars in a <packaging>pom</packaging> project and use %{_mavenpomdir} macro.
+
+2010-01-26  Alexander Kurtakov  <akurtako@redhat.com>
+    Drop ability to generate gcj specific parts. Use %global not %define.
+	* src/org/eclipse/linuxtools/rpmstubby/preferences/PreferenceConstants.java: Remove gcj parts.
+	* src/org/eclipse/linuxtools/rpmstubby/preferences/PreferenceInitializer.java (initializeDefaultPreferences): Likewise.
+	* src/org/eclipse/linuxtools/rpmstubby/preferences/StubbyPreferencePage.java (createFieldEditors): Likewise.
+	* src/org/eclipse/linuxtools/rpmstubby/StubbyGenerator.java (getPackageFiles): Likewise.
+	(generateFilesSections): Likewise.
+	(StubbyGenerator): Likewise.
+	(generateSpecfile): Likewise. Replace %define with %global.
+
+2009-12-03  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* plugin.xml: Fix duplicated popup menu ids.
+
+2009-11-04  Alexander Kurtakov  <akurtako@redhat.com>
+
+	* src/org/eclipse/linuxtools/rpmstubby/model/PomModel.java (getVersion): Return inherited parent version if one wasn't defined.
+
 2009-09-07  Alexander Kurtakov  <akurtako@redhat.com>
 
 	* src/org/eclipse/linuxtools/rpmstubby/model/PomModel.java (xpathEvalNodes): Format.
diff --git a/rpmstubby/org.eclipse.linuxtools.rpmstubby/plugin.xml b/rpmstubby/org.eclipse.linuxtools.rpmstubby/plugin.xml
index f8fca1d..4cd4464 100644
--- a/rpmstubby/org.eclipse.linuxtools.rpmstubby/plugin.xml
+++ b/rpmstubby/org.eclipse.linuxtools.rpmstubby/plugin.xml
@@ -34,7 +34,7 @@
 			</visibility>
 		</objectContribution>
 		<objectContribution objectClass="org.eclipse.core.resources.IFile"
-			nameFilter="pom.xml" id="org.eclipse.linuxtools.rpmstubby.contribution1">
+			nameFilter="pom.xml" id="org.eclipse.linuxtools.rpmstubby.contribution3">
 			<menu label="%menu.label" path="additions"
 				id="org.eclipse.linuxtools.rpmstubby.menu1" />
 			<action label="%action.label"
diff --git a/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/StubbyGenerator.java b/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/StubbyGenerator.java
index 5da603d..d47cbf6 100644
--- a/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/StubbyGenerator.java
+++ b/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/StubbyGenerator.java
@@ -45,7 +45,6 @@
 
 	private MainPackage mainPackage;
 	private List<SubPackage> subPackages;
-	private boolean withGCJSupport;
 	private boolean withFetchScript;
 	private boolean usePdebuildScript;
 	private IPreferenceStore store;
@@ -62,8 +61,6 @@
 		this.mainPackage = mainPackage;
 		this.subPackages = subPackages;
 		store = StubbyPlugin.getDefault().getPreferenceStore();
-		this.withGCJSupport = store
-				.getBoolean(PreferenceConstants.P_STUBBY_WITH_GCJ);
 		this.withFetchScript = store
 				.getBoolean(PreferenceConstants.P_STUBBY_WITH_FETCH_SCRIPT);
 		this.usePdebuildScript = store
@@ -79,12 +76,10 @@
 		StringBuilder buffer = new StringBuilder();
 		String simplePackageName = getPackageName(mainPackage.getName());
 		String packageName = "eclipse-" + simplePackageName;
-		if (withGCJSupport)
-			buffer.append("%define gcj_support    1\n");
 		if (withFetchScript)
-			buffer.append("%define src_repo_tag   #FIXME\n");
-		buffer.append("%define eclipse_base   %{_libdir}/eclipse\n");
-		buffer.append("%define install_loc    %{_datadir}/eclipse/dropins/"
+			buffer.append("%global src_repo_tag   #FIXME\n");
+		buffer.append("%global eclipse_base   %{_libdir}/eclipse\n");
+		buffer.append("%global install_loc    %{_datadir}/eclipse/dropins/"
 				+ simplePackageName.toLowerCase() + "\n\n");
 		buffer.append("Name:           " + packageName.toLowerCase() + "\n");
 		buffer.append("Version:        "
@@ -107,19 +102,6 @@
 		}
 		buffer
 				.append("BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)\n\n");
-		if (withGCJSupport) {
-			buffer.append("%if %{gcj_support}\n");
-			buffer.append("BuildRequires:    gcc-java\n");
-			buffer.append("BuildRequires:    java-gcj-compat-devel\n");
-			buffer.append("Requires(post):   java-gcj-compat\n");
-			buffer.append("Requires(postun): java-gcj-compat\n");
-			buffer.append("%else\n");
-			buffer.append("BuildRequires:    java-devel >= 1.5.0\n");
-			buffer.append("%endif\n");
-			buffer.append("%if ! %{gcj_support}\n");
-			buffer.append("BuildArch: noarch\n");
-			buffer.append("%endif\n\n");
-		} else
 			buffer.append("BuildArch: noarch\n\n");
 		buffer.append("BuildRequires: eclipse-pde >= 1:3.4.0\n");
 		buffer.append("Requires: eclipse-platform >= 3.4.0\n");
@@ -149,25 +131,8 @@
 		buffer.append("%{__unzip} -q -d %{buildroot}%{install_loc} \\\n");
 		buffer.append("     build/rpmBuild/" + mainPackage.getName()
 				+ ".zip \n\n");
-		if (withGCJSupport) {
-			buffer.append("%if %{gcj_support}\n");
-			buffer.append("  %{_bindir}/aot-compile-rpm\n");
-			buffer.append("%endif\n\n");
-		}
 		buffer.append("%clean\n");
 		buffer.append("%{__rm} -rf %{buildroot}\n\n");
-		if (withGCJSupport) {
-			buffer.append("%if %{gcj_support}\n");
-			buffer.append("%post\n");
-			buffer.append("if [ -x %{_bindir}/rebuild-gcj-db ]; then\n");
-			buffer.append("  %{_bindir}/rebuild-gcj-db\n");
-			buffer.append("fi\n\n");
-			buffer.append("%preun\n");
-			buffer.append("if [ -x %{_bindir}/rebuild-gcj-db ]; then\n");
-			buffer.append("  %{_bindir}/rebuild-gcj-db\n");
-			buffer.append("fi\n");
-			buffer.append("%endif\n\n");
-		}
 		generateFilesSections(buffer);
 		buffer.append("%changelog\n\n");
 		buffer.append("#FIXME\n");
@@ -192,8 +157,7 @@
 					+ subPackage.getName() + "_*/*.html\n");
 			buffer.append("%{eclipse_base}/features/" + subPackage.getName()
 					+ "_*/feature.*\n");
-			buffer.append(getPackageFiles(subPackage.getProvides(),
-					withGCJSupport)
+			buffer.append(getPackageFiles(subPackage.getProvides())
 					+ "\n");
 		}
 	}
@@ -404,21 +368,12 @@
 		return uniqueProvides;
 	}
 
-	private String getPackageFiles(List<PackageItem> packageItems,
-			boolean withGCJSupport) {
+	private String getPackageFiles(List<PackageItem> packageItems) {
 		StringBuilder toRet = new StringBuilder();
 		for (PackageItem packageItem : packageItems) {
 			toRet.append("%{eclipse_base}/plugins/").append(
 					packageItem.getName()).append("_*.jar\n");
 		}
-		if (withGCJSupport) {
-			toRet.append("%if %{gcj_support}\n");
-			for (PackageItem packageItem : packageItems) {
-				toRet.append("%{_libdir}/gcj/%{name}/").append(
-						packageItem.getName()).append("_*\n");
-			}
-			toRet.append("%endif\n");
-		}
 		return toRet.toString();
 	}
 }
diff --git a/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/StubbyPomGenerator.java b/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/StubbyPomGenerator.java
index 1cd2d25..741960e 100644
--- a/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/StubbyPomGenerator.java
+++ b/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/StubbyPomGenerator.java
@@ -146,12 +146,12 @@
 		buffer.append("rm -rf %{buildroot}\n\n");
 
 		buffer.append("# jars\n");
-		buffer.append("install -d -m 0755 %{buildroot}%{_javadir}/%{name}\n");
+		buffer.append("install -d -m 0755 %{buildroot}%{_javadir}\n");
 		buffer
-				.append("install -m 644 #TODO jars   %{buildroot}%{_javadir}/%{name}/\n\n");
+				.append("install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}-%{version}.jar\n\n");
 
 		buffer
-				.append("(cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{version}*; \\\n");
+				.append("(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \\\n");
 		buffer
 				.append("    do ln -sf ${jar} `echo $jar| sed \"s|-%{version}||g\"`; done)\n\n");
 
@@ -161,10 +161,10 @@
 
 		buffer.append("# poms\n");
 		buffer
-				.append("install -d -m 755 %{buildroot}%{_datadir}/maven2/poms\n");
+				.append("install -d -m 755 %{buildroot}%{_mavenpomdir}\n");
 		buffer.append("install -pm 644 pom.xml \\\n");
 		buffer
-				.append("    %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}.pom\n\n");
+				.append("    %{buildroot}%{_mavenpomdir}/JPP.%{name}.pom\n\n");
 
 		buffer.append("# javadoc\n");
 		buffer
@@ -179,8 +179,8 @@
 	private void generateFilesSections(StringBuilder buffer) {
 		buffer.append("%files\n");
 		buffer.append("%defattr(-,root,root,-)\n");
-		buffer.append("%{_javadir}/%{name}\n");
-		buffer.append("%{_datadir}/maven2/poms/*\n");
+		buffer.append("%{_javadir}/*\n");
+		buffer.append("%{_mavenpomdir}/*\n");
 		buffer.append("%{_mavendepmapfragdir}/*\n\n");
 
 		buffer.append("%files javadoc\n");
@@ -191,9 +191,7 @@
 
 	private void generatePrepSection(StringBuilder buffer) {
 		buffer.append("\n%prep\n");
-		buffer.append("%setup -q -n FIXME\n\n");
-		buffer.append("mkdir external_repo\n");
-		buffer.append("ln -s %{_javadir} external_repo/JPP\n\n");
+		buffer.append("%setup -q #You may need to update this according to your Source0\n\n");
 	}
 
 	private void generateBuildSection(StringBuilder buffer) {
diff --git a/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/model/PomModel.java b/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/model/PomModel.java
index 8836f72..46ef33f 100644
--- a/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/model/PomModel.java
+++ b/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/model/PomModel.java
@@ -88,12 +88,17 @@
 	}
 
 	/**
-	 * Returns the project version (xpath:/project/version).
+	 * Returns the project version (xpath:/project/version) or the parent version if
+	 * version is not present.
 	 *
 	 * @return The version.
 	 */
 	public String getVersion() {
-		return xpathEval("/project/version");
+		String version = xpathEval("/project/version");
+		if (version.equals("")) {
+			version = xpathEval("/project/parent/version");
+		}
+		return version;
 	}
 
 	/**
diff --git a/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/preferences/PreferenceConstants.java b/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/preferences/PreferenceConstants.java
index ca71856..4b039df 100644
--- a/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/preferences/PreferenceConstants.java
+++ b/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/preferences/PreferenceConstants.java
@@ -18,7 +18,6 @@
 	/*
 	 * keys
 	 */
-	public static final String P_STUBBY_WITH_GCJ = "StubbyWithGCJ";
 	public static final String P_STUBBY_INTERACTIVE = "StubbyInteractive";
 	public static final String P_STUBBY_WITH_FETCH_SCRIPT = "StrubbyWithFetchScript";
 	public static final String P_STUBBY_USE_PDEBUILD_SCRIPT = "StubbyUsePdebuildScript";
@@ -26,7 +25,6 @@
 	/*
 	 * default values
 	 */
-	public static final boolean DP_STUBBY_WITH_GCJ = false;
 	public static final boolean DP_STUBBY_INTERACTIVE = true;
 	public static final boolean DP_STUBBY_WITH_FETCH_SCRIPT = true;
 	public static final boolean DP_STUBBY_USE_PDEBUILD_SCRIPT = true;
diff --git a/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/preferences/PreferenceInitializer.java b/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/preferences/PreferenceInitializer.java
index 47dfbef..1048fd1 100644
--- a/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/preferences/PreferenceInitializer.java
+++ b/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/preferences/PreferenceInitializer.java
@@ -21,15 +21,12 @@
  */
 public class PreferenceInitializer extends AbstractPreferenceInitializer {
 	
-	/*
-	 * (non-Javadoc)
-	 * 
+	/**
 	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
 	 */
 	@Override
 	public void initializeDefaultPreferences() {
 		IPreferenceStore store = StubbyPlugin.getDefault().getPreferenceStore();
-		store.setDefault(PreferenceConstants.P_STUBBY_WITH_GCJ, PreferenceConstants.DP_STUBBY_WITH_GCJ);
 		store.setDefault(PreferenceConstants.P_STUBBY_INTERACTIVE, PreferenceConstants.DP_STUBBY_INTERACTIVE);		
 		store.setDefault(PreferenceConstants.P_STUBBY_WITH_FETCH_SCRIPT, PreferenceConstants.DP_STUBBY_WITH_FETCH_SCRIPT);	
 		store.setDefault(PreferenceConstants.P_STUBBY_USE_PDEBUILD_SCRIPT, PreferenceConstants.DP_STUBBY_USE_PDEBUILD_SCRIPT);
diff --git a/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/preferences/StubbyPreferencePage.java b/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/preferences/StubbyPreferencePage.java
index 58db324..6f96275 100644
--- a/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/preferences/StubbyPreferencePage.java
+++ b/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/preferences/StubbyPreferencePage.java
@@ -40,8 +40,6 @@
 		addField(new BooleanFieldEditor(
 				PreferenceConstants.P_STUBBY_INTERACTIVE,
 				"Stubby interactive mode", getFieldEditorParent()));
-		addField(new BooleanFieldEditor(PreferenceConstants.P_STUBBY_WITH_GCJ,
-				"Add GCJ support to the specfile", getFieldEditorParent()));
 		addField(new BooleanFieldEditor(
 				PreferenceConstants.P_STUBBY_WITH_FETCH_SCRIPT,
 				"Include a fetch script", getFieldEditorParent()));
diff --git a/systemtap/.project b/systemtap/.project
deleted file mode 100644
index 37d3b6d..0000000
--- a/systemtap/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.linuxtools.systemtap.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/systemtap/SystemTapGuiServer/.project b/systemtap/SystemTapGuiServer/.project
deleted file mode 100644
index 229b52a..0000000
--- a/systemtap/SystemTapGuiServer/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>SystemTapGuiServer</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/MailBox.cpp b/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/MailBox.cpp
deleted file mode 100644
index 298ae11..0000000
--- a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/MailBox.cpp
+++ /dev/null
@@ -1,328 +0,0 @@
-#include "include/stapdebug.hpp"
-#include <iostream>
-using std::cout;
-using std::endl;
-using std::cerr;
-
-#include "include/MailBox.hpp"
-#include "include/confReader.hpp"
-#include "include/dmerror.hpp"
-#include "include/common.hpp"
-#include "include/logger.hpp"
-#include "include/datamanager.hpp"
-
-#include <algorithm>
-#include <iostream>
-#include <sstream>
-
-#include <unistd.h>
-#include <arpa/inet.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-
-using namespace std;
-
-/*
- * TODO All of the pthread calls that might fail need to do something more than
- * report the error, if they move forward after reporting we have the potential
- * to introduce race conditions.
- */
-
-namespace datamanager
-{
-
-	// static initializations
-	MailBox* MailBox::spMailBox = NULL;
-	std::map<int, std::set<int> > MailBox::boxes;
-	std::map<int, pthread_mutex_t> MailBox::locks;
-	std::set<int> MailBox::fds;
-	std::map<int, std::set<int> >::iterator MailBox::m_it;
-	std::map<int, pthread_mutex_t>::iterator MailBox::pit;
-
-	MailBox::~MailBox ()
-	{
-		std::set<int>::iterator s_it;
-		// close all socket file descriptors
-
-		for (m_it = boxes.begin(); m_it != boxes.end(); ++m_it)
-			for (s_it = m_it->second.begin(); s_it != m_it->second.end(); ++s_it) {
-				// this is where we could send one last packet to clients
-				//cerr <<"\tClosing : " <<*s_it <<endl;
-				close (*s_it);
-			}
-
-//		for (pit = locks.begin(); pit != locks.end(); ++pit)
-//			pthread_mutex_unlock (&pit->second) && pthread_mutex_destroy (&pit->second);
-
-	}
-
-	MailBox* MailBox::getInstance (void)
-	{
-		if (spMailBox == 0) spMailBox = new MailBox ();
-		return spMailBox;
-	}
-
-	void MailBox::deleteInstance ()
-	{
-		if (MailBox::spMailBox == NULL)
-			return;
-		MailBox *temp = MailBox::spMailBox;
-		MailBox::spMailBox = NULL;
-		delete temp;
-	}
-
-	void MailBox::resetMailBoxes ()
-	{
-
-		fds.clear();
-
-		for (m_it = boxes.begin(); m_it != boxes.end(); ++m_it)
-			m_it->second.clear ();
-
-		boxes.clear();
-
-		for (pit = locks.begin(); pit != locks.end(); ++pit)
-			pthread_mutex_destroy (&pit->second);
-
-		locks.clear();
-	}
-
-	bool MailBox::isEmpty(int boxnum) const
-	{	// *no locking, do not call while unsubscribe is being called
-		// *check if the mailbox is valid before calling this method!
-
-		return boxes[boxnum].size() == 0;
-	}
-
-	bool MailBox::addClient (int socketfd)
-	{
-		fds.insert(socketfd);
-		return true;
-	}
-
-	bool MailBox::delClient (int socketfd)
-	{
-		return fds.erase(socketfd) != 0;
-	}
-
-	bool MailBox::isClient(int socketfd) const
-	{
-		if (fds.find(socketfd) != fds.end())
-			return true;
-		else
-			return false;
-	}
-
-	int MailBox::cleanBox (int boxnum)
-	{
-		struct dmResponse notice;
-
-		/* This script died or completed - notify consumers and cleanup
-		 * mailbox */
-
-		// assemble packet
-		notice.beginIdStr = htonl (DM_PACKET_BEGIN);
-		notice.src = htonl (DATA_MGR);
-		notice.scriptID = htonl (boxnum);
-		notice.size = htonl(0);
-		notice.returnCode = htonl (DM_NOTICE_SCRIPT_COMPLETED);
-
-		if (pthread_mutex_lock (&locks[boxnum])) {
-			ostringstream err;
-			err <<"Failed to lock!\n";
-			Logger log;
-			log.log (err.str ());
-		}
-
-		// for each subscriber in mailbox, write data to socketfd
-		std::set<int>::iterator end = boxes[boxnum].end();
-		std::set<int>::iterator sit = boxes[boxnum].begin();
-
-		for (; sit != end; ++sit) {
-			notice.clientID = htonl (*sit);
-
-			send (*sit, &notice, sizeof (notice), 0);
-		}
-
-		coutd << "Emptied mbox: " << boxnum <<endl;
-		boxes[boxnum].clear();
-
-		if (pthread_mutex_unlock (&locks[boxnum])) {
-			ostringstream err;
-			err <<"Failed to unlock!\n";
-			Logger log;
-			log.log (err.str ());
-		}
-
-		return 0;
-	}
-
-	bool MailBox::sendData (struct dmResponse *resp)
-	//(int boxnum, unsigned int size, void* data, bool errflag)
-	{
-		char buf[DataManager::BUFFER_SIZE];
-		bool rc = true;
-		struct dmResponse_header header, *ptr;
-
-		if (!ConfReader::getInstance()->isValid(resp->scriptID))
-			return false;
-
-		// check if mailbox has subscribers or return false,
-		// this should not happen now anymore
-		if (boxes[resp->scriptID].empty()) {
-			ostringstream err;
-			err << "sending data to an empty mailbox!?\n";
-			Logger log;
-			log.log (err.str ());
-			return false;
-		}
-
-		header.beginIdStr = htonl(resp->beginIdStr);
-		header.returnCode = htonl(resp->returnCode);
-		header.scriptID = htonl(resp->scriptID);
-		header.size = htonl(resp->size);
-		header.src = htonl(resp->src);
-		
-                ptr = (dmResponse_header *) buf;
-		// build concatenated buffer : header + data
-		memset(buf, '\0', DataManager::BUFFER_SIZE);
-		memcpy(buf, &header, sizeof(header));
-		memcpy(buf + sizeof(header), resp->data, resp->size);
-
-		// aquire mutex lock or block
-		if (pthread_mutex_lock (&locks[resp->scriptID])) {
-			ostringstream err;
-			err << "Failed to lock!\n";
-			Logger log;
-			log.log (err.str ());
-		}
-
-		// assign iterators
-		std::set<int>::iterator end = boxes[resp->scriptID].end();
-		std::set<int>::iterator sit = boxes[resp->scriptID].begin();
-
-		// for each subscriber in mailbox, write data to socketfd
-		for (; sit != end; ++sit) {
-			/* Add client id info to buffer, now that we have it */
-			ptr->clientID = htonl(*sit);
-
-			// if error, assume connection is dead and remove
-			if (send (*sit, buf, sizeof (header) + resp->size, 0) < 0) {
-				boxes[resp->scriptID].erase (*sit);
-				fds.erase (*sit);
-			}
-		}
-
-		if (boxes[resp->scriptID].size() == 0)
-			rc = false;
-
-		// release lock
-		if (pthread_mutex_unlock (&locks[resp->scriptID])) {
-			ostringstream err;
-			err <<"Failed to unlock!\n";
-			Logger log;
-			log.log (err.str ());
-		}
-
-		return rc;
-
-	}
-
-	int MailBox::unsubscribeAll(int socketfd)
-	{	// ** not thread safe?
-		// ** also, only returns one of possibly many scriptIDs to be stopped by DM
-
-		int rc = -1;
-
-		// remove socketfd from each mailbox
-		for (m_it = boxes.begin(); m_it != boxes.end(); ++m_it) {
-
-			if (pthread_mutex_lock (&locks[m_it->first])) {
-				ostringstream err;
-				err <<"Failed to lock!\n";
-				Logger log;
-				log.log (err.str ());
-			}
-			if (m_it->second.erase (socketfd) != 0 && m_it->second.size () == 0)
-				rc = m_it->first;
-			if (pthread_mutex_unlock (&locks[m_it->first])) {
-				ostringstream err;
-				err <<"Failed to unlock!\n";
-				Logger log;
-				log.log (err.str ());
-			}
-		}
-
-		return rc;
-	}
-
-	int MailBox::subscribe(struct dmRequest *req)
-	{
-		int retval;
-		Logger log;
-		int boxnum = req->scriptID;
-		int socketfd = req->clientID;
-
-		// check if mailbox number is valid or return error
-		if (!ConfReader::getInstance()->isValid(boxnum)) {
-			return ConfReader::getInstance()->checkScript(boxnum);
-		}
-
-		if (boxes.find(boxnum) == boxes.end()) {
-			// mailbox is not in here, create
-			pthread_mutex_init (&locks[boxnum], NULL);
-			coutd << "Created lock on box :" << boxnum <<endl;
-		}
-
-		if (pthread_mutex_lock (&locks[boxnum])) {
-			ostringstream err;
-			err <<"Failed to lock!\n";
-			log.log (err.str ());
-		}
-
-		retval = boxes[boxnum].insert(socketfd).second;
-		coutd << "Added mbox + rx :" << boxnum << " + " << socketfd <<endl;
-
-		if (pthread_mutex_unlock (&locks[boxnum])) {
-			ostringstream err;
-			err <<"Failed to unlock!\n";
-			log.log (err.str ());
-		}
-
-		// note if 0 is ever not returned here there are problems
-		return retval ? 0 : DM_ERR_MBOX_DUPLICATE;
-	}
-
-	int MailBox::unsubscribe(int boxnum, int socketfd)
-	{
-		int retval;
-
-		// check if mailbox number is valid or return false
-		if (!ConfReader::getInstance()->isValid(boxnum))
-			return ConfReader::getInstance()->checkScript(boxnum);
-
-		if (pthread_mutex_lock (&locks[boxnum])) {
-			ostringstream err;
-			err <<"Failed to lock!\n";
-			Logger log;
-			log.log (err.str ());
-		}
-
-		retval = boxes[boxnum].erase(socketfd);
-		coutd << "Deleted mbox + rx :" << boxnum << " + " << socketfd <<endl;
-
-		if (pthread_mutex_unlock (&locks[boxnum])) {
-			ostringstream err;
-			err <<"Failed to unlock!\n";
-			Logger log;
-			log.log (err.str ());
-		}
-
-		return (retval == 1) ? 0 : DM_ERR_MBOX_DUPLICATE;
-	}
-
-} // end of datamanager namespace
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/Makefile b/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/Makefile
deleted file mode 100644
index a21dea7..0000000
--- a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Makefile for datamanager daemon
-OBJECTS = subscriptionMgr.o datamanager.o MailBox.o confReader.o dmerror.o \
-common.o logger.o
-TESTOBJS = test/testdriver.o dmerror.o common.o
-LD_FLAGS = -lpthread 
-
-all: makefile.dep stapgui-server 
-
-makefile.dep : *.cpp include/*.hpp
-	for i in *.cpp; do gcc -MM "$${i}"; done > $@
-include makefile.dep
-
-stapgui-server: $(OBJECTS)
-	$(CXX) -o $@ $^ $(LD_FLAGS)
-
-.PHONY: clean  	
-
-clean:
-	rm -f stapgui-server $(OBJECTS) $(TESTOBJS) stapgui-server 
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/common.cpp b/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/common.cpp
deleted file mode 100644
index 2b48e9c..0000000
--- a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/common.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-#include "include/common.hpp"
-#include "include/dmerror.hpp"
-#include <netinet/in.h>
-#include <stdlib.h>
-#include <iostream>
-#include <fcntl.h>
-
-using namespace std;
-namespace datamanager
-{
-	/* Convert packet to network byte order */
-	struct dmRequest * reqConvToN(struct dmRequest *req)
-	{
-		/* Only allow conversion once */
-		if (req->beginIdStr != DM_PACKET_BEGIN)
-			return req;
-               cout << "conversion" << req->data;
-		req->beginIdStr = htonl(req->beginIdStr);
-		req->reqAction = htonl(req->reqAction);
-		req->scriptID = htonl(req->scriptID);
-		req->clientID = htonl(req->clientID);
-		req->size = htonl(req->size);
-//                req->data = htonl(req->data);
-		return req;
-	}
-
-	/* Convert packet to host byte order only if needed */
-	struct dmRequest * reqConvToH(struct dmRequest *req)
-	{
-		if (req->beginIdStr == DM_PACKET_BEGIN)
-			return req;
-		else if (ntohl(req->beginIdStr) == DM_PACKET_BEGIN) {
-			req->beginIdStr = ntohl(req->beginIdStr);
-			req->reqAction = ntohl(req->reqAction);
-			req->scriptID = ntohl(req->scriptID);
-			req->clientID = ntohl(req->clientID);
-			req->size = ntohl(req->size);
-  //                      req->data = ntohl(req->data);
-		}
-		return req;
-	}
-
-	struct dmResponse * respConvToN(struct dmResponse *resp)
-	{
-		/* Only allow conversion once */
-		if (resp->beginIdStr != DM_PACKET_BEGIN)
-			return resp;
-
-		resp->beginIdStr = htonl(resp->beginIdStr);
-		resp->clientID = htonl(resp->clientID);
-		resp->scriptID = htonl(resp->scriptID);
-		resp->size = htonl(resp->size);
-		resp->src = htonl(resp->src);
-		resp->returnCode = htonl(resp->returnCode);
-
-		return resp;
-	}
-
-	struct dmResponse * respConvToH(struct dmResponse *resp)
-	{
-		if (resp->beginIdStr == DM_PACKET_BEGIN)
-			return resp;
-		else if (ntohl(resp->beginIdStr) == DM_PACKET_BEGIN) {
-			resp->beginIdStr = ntohl(resp->beginIdStr);
-			resp->clientID = ntohl(resp->clientID);
-			resp->scriptID = ntohl(resp->scriptID);
-			resp->size = ntohl(resp->size);
-			resp->src = ntohl(resp->src);
-			resp->returnCode = ntohl(resp->returnCode);
-		}
-		return resp;
-	}
-
-	void printReq(struct dmRequest *req)
-	{
-		cout << "Request Packet: " << endl;
-		cout << "\treqAction:" << req->reqAction << " - ";
-		switch (req->reqAction) {
-			case REQ_CREATE_CONN:
-				cout << "Create connection." << endl;
-				break;
-			case REQ_DESTROY_CONN:
-				cout << "Destroy connection." << endl;
-				break;
-			case REQ_SUBSCRIBE:
-				cout << " Subscribing." << endl;
-				break;
-			case REQ_UNSUBSCRIBE:
-				cout << " Unubscribing." << endl;
-				break;
-			case REQ_GET_STATUS:
-				cout << " REQ_GET_STATUS." << endl;
-				break;
-			case REQ_SUBSCRIPTION_MODIFY:
-				cout << " REQ_SUBSCRIPTION_MODIFY." << endl;
-				break;
-			default:
-				cout << " Unknown command. " << endl;
-		}
-
-		cout << "\tClientID: " << req->clientID << endl;
-		cout << "\tScriptID: " << req->scriptID << endl;
-		cout << "\tData size: " << req->size << endl;
-		cout << "\tData : " << req->data << " -----------------------------" << endl;
-	}
-
-	bool printResp(struct dmResponse *resp)
-	{
-		bool rc = false;
-		char *str;
-
-		if (resp == NULL)
-			return false;
-
-		cout << "Response Packet: " << endl;
-
-		cout << "\tbeginIdStr: ";
-		if (resp->beginIdStr == DM_PACKET_BEGIN) {
-			cout << " Verified. " << endl;
-			rc = true;
-		}
-		else {
-			char *buf;
-			cout << " Failed verification. " << endl;
-			cout << "Resp ID: " << resp->beginIdStr << endl;
-			cout << "Required ID: " << DM_PACKET_BEGIN << endl;
-			buf = (char *) resp;
-			cout << "Buffer: \n" << endl;
-			for (unsigned int i = 0; i < sizeof(*resp); i++)
-				cout << i << " : " << buf[i] << endl;
-
-			return false;
-		}
-
-		cout << "\tsrc: " << resp->src;
-		switch (resp->src) {
-			case STDOUT:
-				cout << " STDOUT." << endl;
-				break;
-			case STDERR:
-				cout << " STDERR." << endl;
-				break;
-			case SUBSCRIPTION_MGR:
-				cout << " SUBSCRIPTION_MGR." << endl;
-				break;
-			case DATA_MGR:
-				cout << " DATA_MGR." << endl;
-				break;
-			case MAILBOX:
-				cout << " MAILBOX." << endl;
-				break;
-			default:
-				cout << ": Unknown source. " << endl;
-		}
-		cout << "\tscriptID: " << resp->scriptID << endl;
-		cout << "\tclientID: " << resp->clientID << endl;
-		cout << "\tdata size: " << resp->size << endl;
-		cout << "\tReturn Code: " << resp->returnCode << " : " << dm_error_print(resp->returnCode) << endl;
-
-		if (resp->size > 0) {
-			cout << " \t Data: " << endl;
-			str = (char *) resp->data;
-			for (unsigned int i = 0; i < resp->size; i++)
-				cout << str[i];
-			cout << endl;
-		}
-
-		cout << " -----------------------------" << endl;
-
-		return rc;
-	}
-
-	int forceNonBlocking(int fd)
-	{
-		int flags;
-
-		/* Force socket to be non-blocking */
-		flags = fcntl(fd, F_GETFL, 0);
-		if (flags < 0) {
-			return -1;
-		}
-	    fcntl(fd, F_SETFL, flags | O_NONBLOCK);
-	    return 0;
-	}
-}
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/confReader.cpp b/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/confReader.cpp
deleted file mode 100644
index e5cef34..0000000
--- a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/confReader.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-#include "include/confReader.hpp"
-#include "include/logger.hpp"
-#include "include/dmerror.hpp"
-#include "include/common.hpp"
-
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-using namespace std;
-
-namespace datamanager
-{
-	// static intitializations
-	ConfReader* ConfReader::crInstance = NULL;
-
-	ConfReader::ConfReader (void) : scriptMax( 0 ), scriptCount( 0 )
-	{
-		loadScripts();
-	}
-
-	void ConfReader::resetConf ()
-	{
-		// erase everything
-		// then reread config file
-
-		scriptList.clear();
-		loadScripts();
-	}
-
-	ConfReader* ConfReader::getInstance ()
-	{
-		if (crInstance == NULL) crInstance = new ConfReader();
-		return crInstance;
-	}
-
-	void ConfReader::setInvalid(int scriptNum)
-	{
-		if (checkScript(scriptNum) == 1)
-			scriptList[scriptNum].valid = DM_ERR_SCRIPT_LOAD;
-	}
-
-	/** checkScript
-	 * @brief Looks to see if the physical file represented by a script
-	 *  index exists, and whether it corresponds to a script that should
-	 *  be installed as defined through the script_list.conf file.
-	 * @ret Returns 1 if script has been found and appears valid,
-	 * 	 otherwise will return error codes defined in dmerror.hpp
-	 */
-	int ConfReader::checkScript(int scriptNum)
-	{
-		if ((scriptNum > scriptMax) || (scriptNum < 0)) {
-			return DM_ERR_SCRIPT_NOEXIST;
-		}
-		else if (scriptList[scriptNum].valid == 1) {
-			/* already confirmed valid */
-			return 1;
-		}
-		else if (scriptList[scriptNum].valid != -1) {
-			/* already confirmed invalid */
-			return scriptList[scriptNum].valid;
-		}
-
-		/* If script has not yet been checked... */
-		for (int n = 0; n <= scriptMax; n++) {
-			if (scriptNum == scriptList[n].scriptNum) {
-				if ((fopen (scriptList[scriptNum].scriptName.c_str(), "r")) == NULL) {
-					scriptList[scriptNum].valid = DM_ERR_SCRIPT_NOINST;
-				}
-				else {
-					scriptList[scriptNum].valid = 1;
-				}
-
-				return scriptList[scriptNum].valid;
-			}
-		}
-
-		scriptList[scriptNum].valid = DM_ERR_SCRIPT_NOEXIST;
-		return scriptList[scriptNum].valid;
-	}
-
-	bool ConfReader::isValid (int scriptNum)
-	{
-		return checkScript(scriptNum) == 1;
-	}
-
-	const scriptElement* ConfReader::getScript( int scriptnum )
-	{
-		if (scriptList.find (scriptnum) == scriptList.end())
-			return NULL;
-		return &scriptList[scriptnum];
-	}
-
-	/* parseString
-	 * @brief Parses out a specific sub-string from a given line of text.
-	 * The line of text must consist of "-delimited sub-strings.  Given
-	 * this, and a number reference 'str_pos',  this function returns the sub-
-	 * string at position 'str_pos'
-	 * Note:  Count starts at 0
-	 *
-	 * @param str_pos: Position of substring in line
-	 * @param out: Reference to a string, which will hold value of substring
-	 * at completion
-	 */
-	std::string ConfReader::parseString(const std::string& line, int str_pos)
-	{
-		int count = 0;
-		size_t pos = 0;
-		int beg, len;
-
-		do {
-			beg = line.find('"', pos) + 1;
-			pos = line.find('"', beg) + 1;
-			len = pos - beg;
-			count++;
-			} while  ((pos != string::npos) && (count < str_pos));
-
-		return line.substr(beg, len - 1);
-
-	}
-
-	int ConfReader::readConfFile(string fileContents)
-	{
-		ifstream fin (SCRIPTLIST.c_str(), ifstream::in);
-		ostringstream str;
-		char tmp[512];
-
-		if (fin.fail()) {
-			ostringstream err;
-			err << "Error loading " << SCRIPTLIST << " file" << endl;
-			Logger log;
-			log.log( err.str( ) );
-			return -1;
-		}
-
-		while(fin.good()) {
-			fin.get(tmp, 512);
-			str << tmp;
-		}
-		fileContents = str.str();
-		return 0;
-	}
-
-	int ConfReader::loadScripts()
-	{
-		using std::ifstream;
-		using std::string;
-		using std::cout;
-		using std::endl;
-
-		ifstream fin (SCRIPTLIST.c_str(), ifstream::in);
-		string line;
-		char tmp_buf[512];
-
-		if (fin.fail()) {
-			ostringstream err;
-			err << "Error loading " << SCRIPTLIST << " file" << endl;
-			Logger log;
-			log.log( err.str( ) );
-			return -1;
-		}
-
-		while(!fin.eof()) {
-			scriptElement cur;
-
-			fin.getline(tmp_buf,512);
-			line = string(tmp_buf);
-
-			if ((line.find('#', 0) == string::npos)
-				&& (line.length() > 0)) {
-				cur.scriptNum = atoi(parseString(line, 1).c_str());
-				cur.scriptType = atoi(parseString(line, 2).c_str());
-				if (cur.scriptNum > scriptMax) {
-					scriptMax = cur.scriptNum;
-				}
-
-				cur.scriptName = parseString(line, 3);
-				cur.format_str = parseString(line, 4);
-				cur.args = parseString(line, 5);
-				cur.valid = -1;
-
-				scriptList.insert( pair<int, scriptElement>( cur.scriptNum, cur ) );
-			}
-		}
-
-		scriptCount = scriptList.size();
-		fin.close();
-		return 0;
-	}
-
-      int ConfReader::addScript(struct dmRequest* req)
-     {
-           scriptElement cur;
-           ostringstream os;
-           cur.scriptNum = req->scriptID;
-           char inputfilename[40];
-           sprintf(inputfilename,"/tmp/%s",req->data);
-           cur.scriptName = inputfilename;
-           if(req->guru == 1)
-         	  cur.scriptType = 5;
-           else
-          	 cur.scriptType = 4;
-           cur.format_str = "";
-           cur.args = "";
-           scriptMax = scriptMax + 1;
-           if(scriptMax < cur.scriptNum)
-           	 scriptMax = cur.scriptNum;
-           cur.valid = -1;
-           scriptList.insert( pair<int,scriptElement>(cur.scriptNum, cur) ); 
-           scriptCount = scriptList.size();
-           return cur.scriptNum;
-     }
-
-} // end of datamanager namespace
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/datamanager.cpp b/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/datamanager.cpp
deleted file mode 100644
index 96d9b3e..0000000
--- a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/datamanager.cpp
+++ /dev/null
@@ -1,914 +0,0 @@
-	#include "include/datamanager.hpp"
-	#include "include/MailBox.hpp"
-	#include "include/common.hpp"
-	#include "include/confReader.hpp"
-	#include "include/dmerror.hpp"
-	#include "include/stapdebug.hpp"
-	#include "include/logger.hpp"
-	#include "include/subscriptionMgr.hpp"
-
-	#include <sys/time.h>
-	#include <sys/types.h>
-	#include <sys/select.h>
-	#include <sys/socket.h>
-	#include <sys/wait.h>
-	#include <sys/un.h>
-	#include <dirent.h>
-	#include <errno.h>
-	#include <fcntl.h>
-	#include <string.h>
-	#include <signal.h>
-	#include <stdio.h>
-        #include <stdlib.h>
-        #include <strings.h>
-	#include <unistd.h>
-
-	#include <vector>
-	#include <iostream>
-	#include <sstream>
-
-	using namespace std;
-	using namespace datamanager;
-
-	extern int errno;
-
-	const string DataManager::TMP_DIR = "/var/tmp/";
-	const string DataManager::DATAMANAGER_SOCKET = TMP_DIR + "stapguidm";
-	const string DataManager::STDOUT_SOCK_BASE = TMP_DIR + "stdout-";
-	const string DataManager::STDERR_SOCK_BASE = TMP_DIR + "stderr-";
-	DataManager* DataManager::spDataMan = NULL;
-
-	DataManager* DataManager::getInstance( )
-	{
-		if( DataManager::spDataMan == NULL )
-		{
-			DataManager::spDataMan = new DataManager( );
-		}
-		return DataManager::spDataMan;
-	}
-	void DataManager::deleteInstance( )
-	{
-		if( DataManager::spDataMan == NULL )
-			return;
-		DataManager *temp = DataManager::spDataMan;
-		DataManager::spDataMan = NULL;
-		delete temp;
-	}
-
-	DataManager::DataManager( ) : mSetup( false ), mNotificationFd( 0 )
-	{ }
-
-	DataManager::~DataManager( )
-	{
-		vector<struct stap_process_t*>::iterator i, end;
-
-		close( mNotificationFd );
-
-		end = mProcessInfo.end( );
-		for( i = mProcessInfo.begin( ); i != end; ++i )
-		{
-			destroyStapProcess( (*i) );
-			delete (*i);
-		}
-	}
-
-	bool DataManager::generateStatus( int scriptID ) const
-	{
-		// Stub for future use
-		return true;
-	}
-
-	void DataManager::run( )
-	{
-		int stdOut, stdErr, numFd, ret = 0;
-		fd_set readSet, temp;
-		struct dmRequest req;
-		Logger log;
-
-		mNotificationFd = setupSocket( );
-		if( mNotificationFd < 0 )
-			return;
-
-		FD_ZERO( &readSet );
-		FD_SET( mNotificationFd, &readSet );
-
-		numFd = mNotificationFd + 1;
-
-		/*
-		 * This is the main loop for this thread, it waits for data to collect,
-		 * sends data to the MailBox manager, and manages stap processes.
-		 */
-		while( true )
-		{
-			memcpy( &temp, &readSet, sizeof( fd_set ) );
-			ret = select( numFd, &temp, NULL, NULL, NULL );
-			if( ret < 0 )
-			{
-				ostringstream err;
-				err.str() = ("");
-				err << "Invalid return from select: '" << strerror( errno ) <<
-					"'" << endl;
-				log.log( err.str( ) );
-				return;
-			}
-
-			// We got a message from the SubscriptionMgr
-			if( FD_ISSET( mNotificationFd, &temp ) )
-			{
-				// new notification from SM
-				recv( mNotificationFd, &req, sizeof( req ), MSG_WAITALL );
-				ret = handleNotification( &req, stdOut, stdErr );
-
-				if( CREATED_PROCESS == ret )
-				{
-					//A new Process was started.
-					FD_SET( stdOut, &readSet );
-					FD_SET( stdErr, &readSet );
-					numFd = findHighestFd( ) + 1;
-				}
-				else if( DESTROYED_PROCESS == ret )
-				{
-					// A process was destroyed
-					FD_CLR( stdOut, &readSet );
-					FD_CLR( stdErr, &readSet );
-					numFd = findHighestFd( ) + 1;
-				}
-				else if( SHUTDOWN_DATAMANAGER == ret )
-				{
-					// Shutdown was requested.
-					return;
-				}
-			}
-			else
-			{	// some process is writing ...
-
-				vector<struct stap_process_t*>::iterator i, end;
-				end = mProcessInfo.end( );
-
-				for( i = mProcessInfo.begin( ); ret > 0 && i != end; ++i )
-				{
-					struct stap_process_t* curr = (*i);
-					/*
-					 * This section is not an if/else construct because it is
-					 * possible that select has found data on both the stdout and
-					 * the stderr socket for a process.
-					 */
-					int bytesCollected = 0;
-					if( FD_ISSET( curr->stdOut, &temp ) )
-					{
-						ret--;
-						bytesCollected = collectData( (*i), false );
-						if( bytesCollected > 0 )
-						{
-							if( !sendData( (*i) ) )
-							{
-								/*
-								 * Send failed to send data to any clients, stop
-								 * listening for data
-								 */
-								destroyStapProcess( curr );
-								FD_CLR( curr->stdOut, &readSet );
-								FD_CLR( curr->stdErr, &readSet );
-								delete curr;
-								i = mProcessInfo.erase( i );
-								numFd = findHighestFd( ) + 1;
-								continue;
-							}
-						}
-					}
-
-					bytesCollected = 0;
-					if( FD_ISSET( (*i)->stdErr, &temp ) )
-					{
-						ret--;
-						bytesCollected = collectData( (*i), true );
-						if( bytesCollected > 0 )
-						{
-							if( !sendData( (*i) ) )
-							{
-								/*
-								 * Send failed to send data to any clients, stop
-								 * listening for data
-								 */
-								destroyStapProcess( curr );
-								FD_CLR( curr->stdOut, &readSet );
-								FD_CLR( curr->stdErr, &readSet );
-								delete curr;
-								i = mProcessInfo.erase( i );
-								numFd = findHighestFd( ) + 1;
-								continue;
-							}
-						}
-					}
-
-					/*
-					 * The waitpid call is used to check the status of this
-					 * process.  waitpid is used instead of kill because if a
-					 * process has terminated it will be cleaned up before we are
-					 * notified of its status.
-					 */
-
-					int status, tmp;
-					tmp = waitpid( curr->pid, &status, WNOHANG | WUNTRACED);
-					if( tmp > 0 &&
-						( WIFEXITED( status ) || WIFSIGNALED( status ) ) )
-					{
-						// This process has been terminated
-						MailBox::getInstance( )->cleanBox( curr->scriptid );
-						destroyStapProcess( curr );
-						FD_CLR( curr->stdOut, &readSet );
-						FD_CLR( curr->stdErr, &readSet );
-						delete curr;
-						i = mProcessInfo.erase( i );
-						numFd = findHighestFd( ) + 1;
-					}
-				}
-			}
-		}
-	}
-
-	int DataManager::collectData( struct stap_process_t* script, bool isError )
-	{
-		int fd, ret;
-		int* size;
-		char* buffer;
-
-		script->isMessageError = isError;
-		if( isError )
-		{
-			fd = script->stdErr;
-			buffer = script->errBuffer;
-			size = &( script->errSize );
-		}
-		else
-		{
-			fd = script->stdOut;
-			buffer = script->outBuffer;
-			size = &( script->outSize );
-		}
-
-		// Reads data
-		while( *size < BUFFER_SIZE &&
-			( ret = read( fd, buffer + (*size), BUFFER_SIZE - (*size) ) ) > 0 )
-			*size += ret;
-
-		if( (*size) > BUFFER_SIZE )
-		{
-			// Error condition
-			ostringstream err;
-			if( isError )
-				err << "stderr ";
-			else
-				err << "stdout";
-
-			err << "buffer overrun for script " << script->scriptid;
-
-			Logger log;
-			log.log( err.str( ) );
-			cerr << err.str( ) << endl;
-			*size = 0;
-			memset( buffer, 0, BUFFER_SIZE );
-			return 0;
-		}
-
-		/*
-		 * Starts at the back of the buffer and walks towards the front until we
-		 * find the first newline, this delimits a quantum of data and we will only
-		 * send a complete quantum to the client.  If we don't find a newline then
-		 * we will send the entire buffer.
-		 */
-		while( (*size) >= 0 && buffer[ *size ] != '\n' )
-			(*size)--;
-
-		if( (*size) < 0 )
-			*size = strlen( buffer );
-		else
-			(*size)++;
-
-		return (*size);
-	}
-
-	/**
-	 * Forks a process that will exec stap after establishing socket communication
-	 * with the main process and redirecting stdout and stderr to these sockets.
-	 * The main process will setup the sockets and listen for incoming connections
-	 * on them.
-	 *
-	 * @param scriptID The ID number of the script to start
-	 *
-	 * @return A pointer to the new process structure.
-	 */
-	struct stap_process_t* DataManager::createUserProcess( struct dmRequest *req )
-	{
-		struct stap_process_t* ret = NULL;
-		int pid, fd, len;
-		ret = new struct stap_process_t;
-		if( ret == NULL )
-		{
-			Logger log;
-			ostringstream err;
-			err << "Out of memory" << endl;
-			log.log( err.str( ) );
-			return ret;
-		}
-
-		memset( ret, 0, sizeof( struct stap_process_t ));
-
-		ret->scriptid = req->scriptID;
-
-		if( !setupStapIPC( ret ) )
-		{
-			delete ret;
-			return NULL;
-		}
-
-		len = sizeof( struct sockaddr_un );
-
-		pid = fork( );
-		if( pid < 0 )
-		{
-			ostringstream err;
-			err << "Failed to fork:" << strerror( errno ) << endl;
-			Logger log;
-			log.log( err.str( ) );
-			delete ret;
-			return NULL;
-		}
-		else if( pid == 0 )
-		{
-                       setpgid(0,0);
-			// Child Process
-			execStap( req );
-			/*
-			 * If execStap returns, the exec call failed and we should terminate
-			 * this process.
-			 */
-                        
-			exit( 1 );
-		}
-		else
-		{
-			// Parent process
-			ret->pid = pid;
-			ostringstream os;
-			struct sockaddr_un local;
-			local.sun_family = AF_UNIX;
-
-			// Accept the stdOut connection
-			os << STDOUT_SOCK_BASE << ret->scriptid;
-			strcpy( local.sun_path, os.str( ).c_str( ) );
-			fd = accept( ret->stdOut, (struct sockaddr*)&local, (socklen_t*)&len );
-			if( fd < 0 )
-				goto PARENT_PROC_ERR;
-
-			close( ret->stdOut );
-			ret->stdOut = fd;
-
-			forceNonBlocking(fd);
-
-			os.str( "" );
-			// Accept the stdErr connection
-			os << STDERR_SOCK_BASE << ret->scriptid;
-			strcpy( local.sun_path, os.str( ).c_str( ) );
-			fd = accept( ret->stdErr, (struct sockaddr*)&local, (socklen_t*)&len );
-			if( fd < 0 )
-				goto PARENT_PROC_ERR;
-
-			forceNonBlocking(fd);
-
-			close( ret->stdErr );
-			ret->stdErr = fd;
-		}
-
-		return ret;
-
-	PARENT_PROC_ERR:
-		ostringstream err;
-		err << "Error redirecting stdout or stderr: '" << strerror( errno ) << "'"
-			<< endl;
-		Logger log;
-		log.log( err.str( ) );
-		close( ret->stdErr );
-		close( ret->stdOut );
-		kill( ret->pid, SIGINT );
-		delete ret;
-		return NULL;
-	}
-
-	/**
-	 * Close sockets for stdout and stderr, kill the process and remove the socket
-	 * files.
-	 */
-	void DataManager::destroyStapProcess( struct stap_process_t* script )
-	{
-                char command[1024];
-		close( script->stdOut );
-		close( script->stdErr );
-		ostringstream os;
-           //     sprintf(command,"pkill -SIGINT -f .*stapio.*%d.*", script->pid); 
-            //    system(command);
-                sprintf(command,"pkill -g %d",script->pid);
-            //    system(command);
-             //   sprintf(command,"kill %d",script->pid);
-                if(system(command)) {}
-		os << DataManager::STDOUT_SOCK_BASE << script->scriptid;
-		unlink( os.str( ).c_str( ) );
-		os.str( "" );
-		os << DataManager::STDERR_SOCK_BASE << script->scriptid;
-		unlink( os.str( ).c_str( ) );
-
-	}
-
-	int DataManager::handleNotification( struct dmRequest *req, int& stdOut, int& stdErr )
-	{
-		int mailBoxID = req->scriptID;
-
-		// If the ID is negative a shutdown has been requested.
-		if( mailBoxID < 0 )
-			return SHUTDOWN_DATAMANAGER;
-
-		/*
-		 * If the ID is not a valid script to run, nothing to do, not sure if this
-		 * should be reported.
-		 */
-		if( !ConfReader::getInstance( )->isValid( mailBoxID ) )
-			return 0;
-
-		vector<struct stap_process_t*>::iterator i, end;
-		end = mProcessInfo.end( );
-		struct stap_process_t* temp = NULL;
-
-		for( i = mProcessInfo.begin( ); i != end; ++i )
-		{
-			if( (*i)->scriptid == mailBoxID )
-			{
-				if( MailBox::getInstance( )->isEmpty( mailBoxID ) )
-				{
-					/*
-					 * The process exists but there are not any clients subscribed
-					 * to this box any longer, kill the process.
-					 */
-					temp = (*i);
-					mProcessInfo.erase( i );
-					destroyStapProcess( temp );
-					stdOut = temp->stdOut;
-					stdErr = temp->stdErr;
-					delete temp;
-					return DESTROYED_PROCESS;
-				}
-				else
-				{
-					/*
-					 * The process exists and there are clients subscribed,
-					 * do nothing
-					 */
-					return 0;
-				}
-			}
-		}
-
-		/*
-		 * The first subscription was added to the specified box, create the
-		 * process for it
-		 */
-		temp = createUserProcess( req );
-		if( temp == NULL )
-			return 0;
-		stdOut = temp->stdOut;
-		stdErr = temp->stdErr;
-		mProcessInfo.push_back( temp );
-
-		return CREATED_PROCESS;
-	}
-
-	/**
-	 * Sets up the socket used to comminucate with the SubscriptionMgr
-	 */
-	int DataManager::setupSocket( )
-	{
-		int s, fd, ret;
-		struct sockaddr_un local;
-		s = socket( AF_UNIX, SOCK_STREAM, 0 );
-		if(  s < 0 )
-		{
-			ostringstream err;
-			err << "Unable to create dm socket: '" << strerror( errno ) << "'" <<
-				endl;
-			Logger log;
-			log.log( err.str( ) );
-			return -1;
-		}
-
-		local.sun_family = AF_UNIX;
-		strcpy( local.sun_path, DATAMANAGER_SOCKET.c_str( ) );
-
-		ret = bind( s, (struct sockaddr*)&local, sizeof( struct sockaddr_un ) );
-		if( ret < 0 )
-		{
-			ostringstream err;
-			err << "Unable to bind dm socket: '" << strerror( errno ) << "'" <<
-				endl;
-			Logger log;
-			log.log( err.str( ) );
-			cerr << err.str( ) << endl;
-			close( s );
-			return -1;
-		}
-
-
-		ret = listen( s , 1 );
-		if( ret < 0 )
-		{
-			ostringstream err;
-			err << "Unable to listen to dm socket: '" << strerror( errno ) << "'" <<
-				endl;
-			Logger log;
-			log.log( err.str( ) );
-			cerr << err.str( ) << endl;
-			close( s );
-			return -1;
-		}
-
-		ret = sizeof( struct sockaddr_un );
-		mSetup = true;
-
-		fd = accept( s, (struct sockaddr*)&local, (socklen_t*)&ret );
-		if( fd < 0 )
-		{
-			ostringstream err;
-			err << "Error accepting new dm connection: '" << strerror( errno ) <<
-				"'" << endl;
-			Logger log;
-			log.log( err.str( ) );
-			cerr << err.str( ) << endl;
-			close( s );
-			return -1;
-		}
-                 //mSetup = true; 
-//               if( fd == 0)
-  //             {
-		forceNonBlocking(fd);
-
-		close( s );
-		mSetup = false;
-
-		return fd;
-    //          }
-	}
-
-	/**
-	 * Sets up te sockets to recieve data from this stap process
-	 */
-	bool DataManager::setupStapIPC( struct stap_process_t* script )
-	{
-		struct sockaddr_un local;
-		int fd, len;
-		local.sun_family = AF_UNIX;
-		len = sizeof( struct sockaddr_un );
-		ostringstream os;
-
-		os << STDOUT_SOCK_BASE << script->scriptid;
-		strcpy( local.sun_path, os.str( ).c_str( ) );
-		fd = socket( AF_UNIX, SOCK_STREAM, 0 );
-		if( fd < 1 )
-		{
-			ostringstream err;
-			err << "Error creating stdout socket: '" << strerror( errno ) << "'"
-				<< endl;
-			Logger log;
-			log.log( err.str( ) );
-			return false;
-		}
-
-		if( 0 > bind( fd, (struct sockaddr*)&local, len ) )
-		{
-			ostringstream err;
-			err << "Error binding stdout socket: '" << strerror( errno ) << "'"
-				<< endl;
-			Logger log;
-			log.log( err.str( ) );
-			close( fd );
-			return false;
-		}
-
-		if( 0 > listen( fd, 1 ) )
-		{
-			ostringstream err;
-			err << "Error listening on stdout socket: '" << strerror( errno ) << "'"
-				<< endl;
-			Logger log;
-			log.log( err.str( ) );
-			close( fd );
-			return false;
-		}
-
-		script->stdOut = fd;
-
-		os.str( "" );
-		os << STDERR_SOCK_BASE << script->scriptid;
-		local.sun_path[ 0 ] = 0;
-		strcpy( local.sun_path, os.str( ).c_str( ) );
-		fd = socket( AF_UNIX, SOCK_STREAM, 0 );
-		if( fd < 1 )
-		{
-			ostringstream err;
-			err << "Error creating stderr socket: '" << strerror( errno ) << "'"
-				<< endl;
-			Logger log;
-			log.log( err.str( ) );
-			return false;
-		}
-
-		if( 0 > bind( fd, (struct sockaddr*)&local, len ) )
-		{
-			ostringstream err;
-			err << "Error binding stderr socket: '" << strerror( errno ) << "'" <<
-				" " << local.sun_path << endl;
-			Logger log;
-			log.log( err.str( ) );
-			close( fd );
-			return false;
-		}
-
-		if( 0 > listen( fd, 1 ) )
-		{
-			ostringstream err;
-			err << "Error listening on stderr socket: '" << strerror( errno ) << "'"
-				<< endl;
-			Logger log;
-			log.log( err.str( ) );
-			close( fd );
-			return false;
-		}
-
-		script->stdErr = fd;
-
-		return true;
-	}
-
-	/**
-	 * Connects to data sockets, redirects stdout and stderr then calls exec
-	 */
-	void DataManager::execStap( struct dmRequest *req )
-	{
-		int stdOut, stdErr;
-		struct sockaddr_un local;
-		ostringstream os;
-		Logger log;
-		local.sun_family = AF_UNIX;
-		int rc = 0;
-                char cmd[75];
-                
-		const scriptElement* args =
-			ConfReader::getInstance( )->getScript( req->scriptID );
-
-		if( args == NULL )
-		{
-			// failed to find script ...
-			ostringstream err;
-			err << "Failed to find script number : " << req->scriptID << endl;
-			Logger log;
-			log.log( err.str( ) );
-			return;
-		}
-
-		// Set stdout as unbuffered to avoid double buffering
-		setvbuf( stdout, NULL, _IONBF, 0 );
-
-		os << STDOUT_SOCK_BASE << req->scriptID;
-		strcpy( local.sun_path, os.str( ).c_str( ) );
-		stdOut = socket( AF_UNIX, SOCK_STREAM, 0 );
-		stdErr = socket( AF_UNIX, SOCK_STREAM, 0 );
-		if( stdOut < 0 || stdErr < 0 )
-		{
-			ostringstream err;
-			err << "Error creating output sockets: '" << strerror( errno ) << "'"
-				<< endl;
-			Logger log;
-			log.log( err.str( ) );
-			return;
-		}
-
-		if( 0 > dup2( stdOut, STDOUT_FILENO ) ||
-			0 > dup2( stdErr, STDERR_FILENO ) )
-		{
-			ostringstream err;
-			err << "Failed to dup output: " << strerror (errno) << endl;
-			Logger log;
-			log.log( err.str( ) );
-			return;
-		}
-
-		if( 0 > connect( stdOut, (struct sockaddr*)&local,
-			sizeof( struct sockaddr_un ) ) )
-		{
-			ostringstream err;
-			err << "Error connecting to stdout socket: '" << strerror( errno ) << "'"
-				<< endl;
-			Logger log;
-			log.log( err.str( ) );
-			return;
-		}
-
-		os.str( "" );
-		os << STDERR_SOCK_BASE << req->scriptID;
-		strcpy( local.sun_path, os.str( ).c_str( ) );
-		if( 0 > connect( stdErr, (struct sockaddr*)&local,
-			sizeof( struct sockaddr_un ) ) )
-		{
-			ostringstream err;
-			err << "Error connecting to stderr socket: '" << strerror( errno ) << "'"
-				<< endl;
-			Logger log;
-			log.log( err.str( ) );
-			return;
-		}
-                         sprintf(cmd,"stap %s",(args->scriptName).c_str());
-                             // strip data of excess spaces
-                             int i;
-                             for(i=0;i<20;i++)
-                            if(req->data[i] == ' ') {break;}
-                             char username[i];
-                             for(int n=0;n<i;n++)
-                                  username[n] = req->data[n];
-                             username[i]='\0';
-
-
-                   
-		switch(args->scriptType) {
-			case (SYSTEM_TAP):
-				os.str( "" );
-				os << "Executing '" <<  "stap process. " << endl;
-				os << "Command: " <<  args->scriptName << ", args = " << args->args.c_str( ) << endl;
-				log.log( os.str( ) );
-				execlp("staprun",  "staprun", (args->scriptName).c_str( ), (char*)NULL );
-			break;
-                       case (STP):
-                             os.str( "" );
-                             os << "Executing " << "stap stp process. "<< endl;
-                             os << "Command: " << args->scriptName << endl;
-                           // sprintf(cmd,"su %s -c \"stap  %s\"",username,(args->scriptName).c_str());
-                             sprintf(cmd,"stap %s", (args->scriptName).c_str());
-                             // strip data of excess spaces
-                           //  int i;
-                           //  for(i=0;i<20;i++)
-                           // if(req->data[i] == ' ') {break;}
-                           //  char username[i];
-                           //  for(int n=0;n<i;n++)
-                           //       username[n] = req->data[n];
-                           //  username[i]='\0';
-                             log.log( os.str( ) );
-                              os << cmd << endl;
-                             //  system(cmd);
-                                 
-                               execlp("su","su",username,"-c",cmd,(char*)NULL);
-                             break;
-                             
-		      case (STP_GURU):
-                             os.str( "" );
-                             os << "Executing " << "stap -g process. "<< endl;
-                             os << "Command: " << args->scriptName << endl;
-                             log.log( os.str( ) );
-                           sprintf(cmd,"stap -g %s",(args->scriptName).c_str());
-                         //    execlp("stap -g", "stap", (args->scriptName).c_str( ),(char*)NULL);
-                           execlp("su","su",username,"-c",cmd,(char*)NULL);
-                               break;
-       
-                      case (BLUEDYE):
-			os.str( "" );
-			os << "Exec'ing Bluedye Analyzer: Ensuring Module is in place: " << endl;
-			log.log(os.str());
-			rc = system("modprobe bluedye");
-			if (rc) {
-				os.str( "" );
-				os << "Error: Bluedye Module Not Found.  Please install Bluedye package." << endl;
-				log.log(os.str());
-				exit(1);
-			}
-			os.str( "" );
-			os << "Exec'ing: " << args->scriptName << ", args = " << args->args.c_str( ) << endl;
-			log.log(os.str());
-			execl(args->scriptName.c_str( ), " ", args->args.c_str( ), (char*) NULL );
-			break;
-		case (SHELL):
-			string cmd;
-			cmd = args->scriptName + " " + args->args;
-			os.str( "" );
-			os << "pid: " << getpid() << ", DMD Execing Shell Cmd: " << cmd << endl;
-			log.log(os.str());
-			if(system(cmd.c_str())) {}
-			exit(0);
-			break;
-	}
-
-	ostringstream err;
-	err << "Failed to execute script #: " << cmd << ", Error: " << strerror (errno) << endl;
-	log.log( err.str( ) );
-
-	exit( 1 );
-}
-
-bool DataManager::sendData( struct stap_process_t* script )
-{
-	char* buffer;
-	int* size;
-	struct dmResponse resp;
-
-	/*
-	 * buffer has the message data, size has how many bytes we
-	 * should send
-	 */
-	if( script->isMessageError )
-	{
-		buffer = script->errBuffer;
-		resp.src = STDERR;
-		size = &( script->errSize );
-	}
-	else
-	{
-		buffer = script->outBuffer;
-		resp.src = STDOUT;
-		size = &( script->outSize );
-	}
-
-	resp.beginIdStr = DM_PACKET_BEGIN;
-	resp.scriptID = script->scriptid;
-	resp.data = buffer;
-	resp.returnCode = 0;
-	resp.size = (*size) + 1;
-
-	if( !MailBox::getInstance( )-> sendData( &resp ))
-	{
-		/*
-		 * the mailbox appears to be empty, probably because the clients
-		 * unexpectedly died off.
-		 */
-		return false;
-	}
-
-	char temp[ DataManager::BUFFER_SIZE + 1 ] = { '\0' };
-	strcpy( temp, buffer + (*size) );
-	memset( buffer, 0, BUFFER_SIZE );
-	strcpy( buffer, temp );
-	*size = strlen( buffer );
-
-	return true;
-}
-
-int DataManager::findHighestFd( )
-{
-	int ret = mNotificationFd;
-	vector<struct stap_process_t*>::iterator i, end;
-	end = mProcessInfo.end( );
-
-	for( i = mProcessInfo.begin( ); i != end; ++i )
-	{
-		if( (*i)->stdErr >= ret )
-			ret = (*i)->stdErr;
-		if( (*i)->stdOut >= ret )
-			ret = (*i)->stdOut;
-	}
-	return ret;
-}
-
-void* startDataManager( void* data )
-{
-	DataManager* dm = DataManager::getInstance( );
-
-	/*
-	 * This thread will ignore signals, start with a set of ignored signals
-	 * that ignores all and remove a few key ones.
-	 */
-	sigset_t ignore;
-	sigfillset( &ignore );
-	sigdelset( &ignore, SIGFPE );
-	sigdelset( &ignore, SIGSEGV );
-	sigdelset( &ignore, SIGBUS );
-	pthread_sigmask( SIG_SETMASK, &ignore, NULL );
-	dm->run( );
-
-	/*
-	 * dm->run only returns if we have a fatal error or we recieve the
-	 * shutdown signal.
-	 */
-	DataManager::deleteInstance( );
-
-	// Remove all the socket files
-	unlink( DataManager::DATAMANAGER_SOCKET.c_str( ) );
-	struct dirent* info;
-	DIR* tmpDir = opendir( DataManager::TMP_DIR.c_str( ) );
-	if( tmpDir == NULL )
-		return NULL;
-
-	while( ( info = readdir( tmpDir ) ) != NULL )
-	{
-		string path = DataManager::TMP_DIR + info->d_name;
-		if( path.find( DataManager::STDOUT_SOCK_BASE ) != string::npos ||
-			path.find( DataManager::STDERR_SOCK_BASE ) != string::npos )
-		{
-			unlink( path.c_str( ) );
-		}
-	}
-
-	return NULL;
-}
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/dmerror.cpp b/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/dmerror.cpp
deleted file mode 100644
index 09847c2..0000000
--- a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/dmerror.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-
-#include "include/dmerror.hpp"
-#include <errno.h>
-#include <string.h>
-
-const char * dm_error_print(uint32_t err)
-{
-	if (err == 0)
-		return "Success";
-
-	if (!(err & DM_ERROR))
-		return strerror((int) err);
-
-	switch (err) {
-		case DM_ERR_MBOX_LOCK:
-			return "Mailbox can not be locked or unlocked";
-		case DM_ERR_MBOX_DUPLICATE:
-			return "Notice: Subscription already removed.";
-		case DM_ERR_SOCKET_READ:
-			return "Error reading from socket";
-		case DM_ERR_LISTEN_SOCKET:
-			return "Error on listen socket";
-		case DM_ERR_PACKET_FORMAT:
-			return "Format of packet sent is unreadable.";
-		case DM_ERR_BAD_CLIENTID:
-			return "Client specifying a non-allocated clientID";
-		case DM_ERR_REQUEST_TYPE:
-			return "Unknown request type.";
-		case DM_ERR_COMM_CHANNEL:
-			return "Communications socket not opened.";
-		case DM_ERR_SCRIPT_LOAD:
-			return "Error: Script failed to compile/insmod.";
-		case DM_ERR_SCRIPT_NOEXIST:
-			return "Error: Script does not exist.  Possible version difference between client and daemon. ";
-		case DM_ERR_SCRIPT_NOINST:
-			return "Error: Script has not been installed.  Run 'make install' on server.";
-		case DM_NOTICE_SCRIPT_COMPLETED:
-			return "Notice: Script/command on remote system has completed and exited.";
-		case DM_NOTICE_CONNECTION_CLOSED:
-			return "Notice: Connection to Data Management Daemon (DMD) has been closed.";
-		case DM_NOTICE_CONNECTION_CREATED:
-			return "Notice: Connection to Data Management Daemon (DMD) created.";
-		case DM_NOTICE_SUB_SUCCESS:
-			return "Notice: Client subscribed to script/command output.";
-		case DM_NOTICE_UNSUB_SUCCESS:
-			return "Notice: Client unsubscribed to script/command.";
-		default:
-			return "Unknown error";
-	}
-}
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/docs/README b/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/docs/README
deleted file mode 100644
index b3e8606..0000000
--- a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/docs/README
+++ /dev/null
@@ -1,113 +0,0 @@
-SystemTapGui
-
-Table of Contents
------------------
-
-1. Introduction
-2. Requirements
-3. Architecture
-4. Installation
-5. Known Bugs
-6. Future Plans
-7. FAQ 
-
-
-1. Introduction
-----------------
-
-SystemtapGui is a tool being developed to assist in writing SystemTap
-scripts and viewing kernel performance. It is both an Integrated
-Development Environment for the SystemTap scripting language, as well as
-a data visualization and analysis tool.
-
-The GUI is targetted at System Administrators who want to get
-information out of their system using SystemTap, as well as Developers
-who wish to write new SystemTap scripts. It is an Eclipse-based
-application.
-
-
-2. Requirements
-----------------
-
-Hardware Requirements:
-    * x86, x86_64, ppc64, s390
-
-Software Requirements:
-    * Linux kernel v2.6.14 or newer
-    * Eclipse v3.4
-    * SystemTap v0.7 or newer
-
-
-3. Architecture
----------------
-
-The Gui is a client-server application and the server and client can be installed seperately. The client is an eclipse plugin and requires eclipse to be installed. It provides an IDE to write scripts and a visualizer to view the output in graphical form.
- The server (stapgui-server) provides stdout/stderr data collection and process management services for processes run on a remote system. The  server executes the SystemTap script, collects all output to stderr and stdout from that process, then funnels it via a socket to the client.
-The client and server can be installed on machines with different architectures.This allows users to monitor remote machines. You may also download and build the source yourself.
-
-4. Installation
-----------------
-
-NOTE: Installation assumes you already have both Eclipse and SystemTap
-installed.
-
-   Server
-   ------
-   1  Install the systemtapguiserver rpm. Eg on Fedora run the command 
-      yum install systemtapguiserver
-   2. Run the command 'stapgui-server'. You will get a message saying "Listening for Connections..." in a minute or so which shows that the server is up and running.  
-
-   Client
-   -------
-   1. Install the  eclipse-systemtapgui rpm. Eg on Fedora run the command
-      yum install eclipse-systemtapgui
-   2. Launch eclipse and open the SystemTap IDE perspective to start writing scripts. 
-   3. For detailed help see the Help Section in Eclipse. 
-
-5. Known Bugs
---------------
-
-This is a list of known bugs that the developers are aware of and will
-be fixed:
-
-a.  Performance issues with large outputs
-
-b.  Indicate terminate on self ending scripts
-
-c.  Multiple probes can be added for the same line
-
-d.  Time-wait between script submission and execution.
-
-
-6. Future Plans
----------------- 
-
-The next steps in development are to fix the known bugs in they system
-as well as to improve system performance. 
-
-Please post any feedback, whether it be bugs, requested features, or
-general questions. Feedback can be posted directly to the projects
-website (https://sourceforge.net/projects/stapgui/) or to the systemtap
-mailing list. We welcome your input and hope to develop an excellent
-open source tool for the community in the coming months.
-
-
-7. FAQ
---------
-
-
-1. Why does it freeze / do nothing when I try to run a script?
-The script would take 2-3 minutes to execute. The time taken is for the
-script to be transferred to and executed on the remote machine. If you
-do not see a response after 3 minutes make sure SystemTap and your
-kernel are set up properly on the remote machine. For information on how
-to do this visit the SystemTap Wiki at
-http://sourceware.org/systemtap/wiki
-
-2. Why does it take a long time to start up the first time I open the IDE?
-It is running each of the probes to gather information about the
-available variables. This only has to be done once, so its recommended
-that you let it complete. If you don't need this information, you can
-click "Cancel" to stop this process.
-
-END OF DOCUMENT
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/include/MailBox.hpp b/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/include/MailBox.hpp
deleted file mode 100644
index 24f215f..0000000
--- a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/include/MailBox.hpp
+++ /dev/null
@@ -1,145 +0,0 @@
-#ifndef MAILBOX_HPP_
-#define MAILBOX_HPP_
-
-#include <map>
-#include <set>
-
-#include <pthread.h>
-#include "common.hpp"
-
-namespace datamanager
-{
-	class MailBox
-	{
-		friend class SubscriptionMgr;
-
-		private:
-//		public:
-			// only instance of this class
-			static MailBox* spMailBox;
-
-			// maps and iterators for the mailbox and mutexes
-			static std::map<int, std::set<int> > boxes;
-			static std::map<int, pthread_mutex_t> locks;
-			static std::set<int> fds;
-
-			static std::map<int, std::set<int> >::iterator m_it;
-			static std::map<int, pthread_mutex_t>::iterator pit;
-
-			/**
-			 * Add a "subscriber" to a mailbox, which will receive the output
-			 * of a running process. A subscriber is an open file descriptor.
-			 *
-			 * @param  boxnum	The mailbox number, isValidMod(boxnum) must return true.
-			 * @param  socketfd	The file descriptor for the open socket that is to be written to.
-			 * @return STAPDM_MBOX_[INVALID,DUPLICATE,LOCK] for invalid mailbox, duplicate
-			 *         subscription request, and mutex un/locking failures reespectively.
-			 *         0 on success.
-			 */
-			int subscribe (struct dmRequest *req);
-
-			/**
-			 * Remove a file descriptor from the given mailbox. The file descriptor will
-			 * no longer be written to.
-			 *
-			 * @param  boxnum	The mailbox number that the file descriptor is in.
-			 * @param  socketfd	The file descriptor to be removed.
-			 * @return STAPDM_MBOX_[INVALID,DUPLICATE,LOCK] for invalid mailbox, duplicate
-			 *         subscription request, and mutex un/locking failures reespectively.
-			 *         0 on success.
-			 */
-			int unsubscribe (int boxnum, int socketfd);
-
-			/**
-			 * Remove the given clientID/socket fd from all mailboxes. This most likely
-			 * happens because a client has closed communication with the data manager.
-			 *
-			 * @param  socketfd	The clientID to be removed from all mailboxes.
-			 * @return	The last mailbox from which socketfd was removed and size equals 0
-			 * 			or, -1 if that condition was never true.
-			 */
-			int unsubscribeAll(int socketfd);
-
-			/**
-			 * Given a clientID from a request or response packet, this tells if it has been
-			 * added before to the set of known IDs.
-			 *
-			 * @param  socketfd	The clientID/socket fd to query
-			 * @return true if it has been previously added, false otherwise
-			 */
-			bool isClient (int socketfd) const;
-
-			/**
-			 * Given a clientID/socket fd, add it to the set of previously seen clientIDs.
-			 *
-			 * @param  socketfd	A clientID/socket fd, most likely from a dmRequest packet
-			 * return  true if the client was added successfully, false otherwise
-			 */
-			bool addClient (int socketfd);
-
-			/**
-			 * Given a clientID/socket fd, remove it from the set of previously seen clientIDs.
-			 *
-			 * @param	socketfd  A clientID/socket fd, most likely from a dmRequest packet
-			 * @return	true if the clientID was removed from the set, false otherwise
-			 */
-			bool delClient (int socketfd);
-
-			/**
-			 * Delete the instance of the mailbox: close all open file descriptors
-			 * and optionally send a message to each client notifying them of the
-			 * imminent closure of the data manager.
-			 */
-			void deleteInstance ();
-
-		public:
-
-			/**
-			 * The destructor does nothing, this might be removed in the future.
-			 */
-			~MailBox ();
-
-			/**
-			 * Returns a pointer to an internally maintained <code>MailBox</code>.
-			 */
-			static MailBox* getInstance ();
-
-			/**
-			 * Determines if the given mailbox has any subscribers.
-			 *
-			 * @return	true, if there are zero subscribers, false otherwise.
-			 */
-			bool isEmpty(int boxnum) const;
-
-			/**
-			 * Send data of length size to all clients subscribed to boxnum from
-			 * stdout (errflag == false) or stderr (errflag == true). If a client
-			 * in the mailbox is dead (send error), it is removed.
-			 *
-			 * @param  boxnum	The mailbox to aggregate the data to.
-			 * @param  size		The size in bytes of the data.
-			 * @param  data		A pointer to the data to be sent, this is probably an array of chars.
-			 * @param  errflag	true if the data came from stderr, false otherwise.
-			 * @return true if data was sent and there are still subscribers, false otherwise
-			 */
-			bool sendData (struct dmResponse *);
-
-			/**
-			 * Send a message to all clients subscribed to given boxnum that the
-			 * corresponding process is no longer running, and then unsubscribe
-			 * all of them, leaving the mailbox empty.
-			 *
-			 * @param  boxnum	Which mailbox to clear of subscribers.
-			 * @return	Zero if everything went fine, non zero otherwise.
-			 */
-			int cleanBox (int boxnum);
-
-			/**
-			 * This will remove and reset all mailboxes and their corresponding locks.
-			 */
-			void resetMailBoxes ();
-	};
-
-}
-
-#endif /*MAILBOX_HPP_*/
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/include/common.hpp b/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/include/common.hpp
deleted file mode 100644
index 0368a9e..0000000
--- a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/include/common.hpp
+++ /dev/null
@@ -1,112 +0,0 @@
-#ifndef COMMON_H_
-#define COMMON_H_
-
-#include <stdint.h>
-#include <string>
-
-using std::string;
-
-namespace datamanager
-{
-	/* static intitializations */
-	const string SCRIPTLIST = "/var/tmp/dmd/script_list.conf";
-	const string SCRIPT_DIR = "/var/tmp/dmd/scripts/";
-
-	struct dmRequest * reqConvToH(struct dmRequest *req);
-	struct dmRequest * reqConvToN(struct dmRequest *req);
-	struct dmResponse * respConvToH(struct dmResponse *resp);
-	struct dmResponse * respConvToN(struct dmResponse *resp);
-	void printReq(struct dmRequest *req);
-	bool printResp(struct dmResponse *resp);
-	int forceNonBlocking(int fd);
-
-	/* definitions/declarations possibly needed by a client app */
-
-	/* Message passed to datamanager to indicate requested shutdown */
-	static const int SHUTDOWN_DATAMANAGER = -1;
-
-	/* Identifies beginning of a stap-gui packet */
-	static const uint32_t DM_PACKET_BEGIN = 0xa1b2c3d4;
-
-	/* primary port for socket communication with
-		subscription manager */
-	static const int LISTEN_PORT = 22462;
-	static const int TIMEOUT_FOR_LISTEN = 5; /* seconds */
-
-	/* Valid request types */
-	enum reqAction_t {
-		REQ_CREATE_CONN = 1,
-		REQ_SUBSCRIBE,
-		REQ_UNSUBSCRIBE,
-		REQ_GET_STATUS,
-		REQ_SUBSCRIPTION_MODIFY,
-		REQ_DESTROY_CONN,
-		REQ_CONFIG_FILE  /* TODO : Add support for this. Sends servers
-					script_list.conf file to client */
-	};
-
-	enum reqType_t {
-		SYSTEM_TAP = 1,
-		BLUEDYE,
-		SHELL,
-                STP,
-                STP_GURU 
-	};
-
-	/* For requests sent from client or dashboard to subscriptionMgr */
-	struct dmRequest {
-		uint32_t beginIdStr; /* DM_PACKET_BEGIN or other as needed */
-		uint32_t reqAction; /* action to take on specified service */
-		uint32_t scriptID;
-		uint32_t clientID;  /* Unique id, set to 0 for first subscription req,
-	       							then set to assigned id for future req's */
-                uint32_t guru;
-		uint32_t size; /* size of data */
-	        char data[20]; /* For requests requiring passing of added data */
-	};
-
-	enum dmResponseDataSources {
-		STDOUT = 1,
-		STDERR,
-		SUBSCRIPTION_MGR,
-		DATA_MGR,
-		MAILBOX
-	};
-
-	/* Response Packet: for packaging by mailbox, will be sent in this format
-	 *  to client (consumer) */
-	struct dmResponse {
-		uint32_t beginIdStr;	/* DM_PACKET_BEGIN or other as needed */
-		uint32_t src; 			/* identifies data or error source -lookup in dmResponseDataSources */
-		uint32_t scriptID;
-		uint32_t clientID; 		/* Unique id, generated by data manager during first
-							       request, then included with all data packets */
-		uint32_t returnCode;	/* Optional return code from request */
-		uint32_t size; 			/* size of data */
-		void *data;
-	};
-
-        struct dmResponse_header {
-                uint32_t beginIdStr;    /* DM_PACKET_BEGIN or other as needed */
-                uint32_t src;                   /* identifies data or error source -lookup in dmResponseDataSources */
-                uint32_t scriptID;
-                uint32_t clientID;              /* Unique id, generated by data manager during first
-                                                               request, then included with all data packets */
-                uint32_t returnCode;     /* Optional return code from request */
-                uint32_t size;                  /* size of data */
-            };   
-
-	/* Holds data as read from script_list.conf */
-	struct scriptElement {
-		int scriptType;
-		int scriptNum;
-		string scriptName;
-		string format_str; /* describes format of data returned from script */
-		string args;
-		int valid;
-	};
-
-}
-
-#endif /*COMMON_H_*/
-
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/include/confReader.hpp b/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/include/confReader.hpp
deleted file mode 100644
index c5f29cc..0000000
--- a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/include/confReader.hpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef CONFREADER_HPP_
-#define CONFREADER_HPP_
-
-#include <string>
-#include <map>
-
-#include "common.hpp"
-
-namespace datamanager
-{
-	class ConfReader
-	{
-		private:
-			static ConfReader* crInstance;
-
-			// map of script# -> scriptElement, plus iterators
-			std::map<int, scriptElement> scriptList;
-
-			// currently unused
-			int scriptMax, scriptCount;
-
-			ConfReader();
-			int loadScripts ();
-			std::string parseString (const std::string& line, int str_pos);
-
-		public:
-			static ConfReader* getInstance ();
-			int getScriptCount () const;
-			bool isValid (int scriptNum);
-			void setInvalid(int scriptNum);
-			int checkScript(int scriptNum);
-                        int addScript(struct dmRequest* req);
-			void resetConf ();
-			static int readConfFile(string fileContents);
-			const scriptElement* getScript( int index );
-	};
-
-}
-#endif /*ConfReader_HPP_*/
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/include/datamanager.hpp b/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/include/datamanager.hpp
deleted file mode 100644
index 98f3d28..0000000
--- a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/include/datamanager.hpp
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * License stuff goes here.
- */
-
-#ifndef DATAMANAGER_H_
-#define DATAMANAGER_H_
-
-#include <string>
-#include <vector>
-
-using namespace std;
-
-namespace datamanager
-{
-
-	/**
-	 * The DataManager class implements the Singleton pattern.  It will be
-	 * responsible for collecting data quanta from the open stap process and
-	 * passing that data to the MailBox class for distribution.  DataManager
-	 * will also handle start up and shutdown of stap processesat the appropriate
-	 * time.
-	 *
-	 * @Class DataManager
-	 *
-	 * @ingroup stapguidm
-	 *
-	 * @brief Handles startup, shutdown, and data collection for stap scripts.
-	 */
-
-	class DataManager
-	{
-		public:
-
-			~DataManager( );
-
-			/**
-			 * Gets the status of the specified script
-			 *
-			 * @param scriptID
-			 * 	The id number for the script to query.
-			 *
-			 * @return
-			 * 	True if the process is alive or has been killed normally,
-			 *  otherwise false.
-			 */
-			bool generateStatus( int scriptID ) const;
-
-			/**
-			 * Main DataManager method.  Runs a tight loop using select
-			 * for notification that data is ready to be collected.
-			 */
-			void run( );
-
-			/**
-			 * Returns setup status for the DataManager
-			 *
-			 * @return
-			 * 	true if setup is finished, false otherwise
-			 */
-			inline bool isSetup( ) { return mSetup; }
-
-			/**
-			 * Returns a reference to the DataManager, constructs one if
-			 * necessary.
-			 *
-			 * @return
-			 * 	Refence to the DataManager.
-			 */
-			static DataManager* getInstance( );
-
-			/**
-			 * Deletes the instance of DataManager and sets pointer to NULL.
-			 */
-			static void deleteInstance( );
-
-			static const int BUFFER_SIZE = 4095;
-			static const int CREATED_PROCESS = 1;
-			static const int DESTROYED_PROCESS = 2;
-			static const string DATAMANAGER_SOCKET;
-			static const string STDOUT_SOCK_BASE;
-			static const string STDERR_SOCK_BASE;
-			static const string TMP_DIR;
-
-		private:
-			static DataManager* spDataMan;
-
-			bool mSetup;
-			int mNotificationFd;
-			vector<struct stap_process_t*> mProcessInfo;
-
-			DataManager( );
-			int collectData( struct stap_process_t* script, bool isError = false );
-			struct stap_process_t* createUserProcess( struct dmRequest *req );
-			void destroyStapProcess( struct stap_process_t* script );
-			int handleNotification( struct dmRequest *req, int& stdOut, int& stdErr );
-			int setupSocket( );
-			int findHighestFd( );
-			bool setupStapIPC( struct stap_process_t* script );
-			void execStap( struct dmRequest *req );
-			bool sendData( struct stap_process_t* script );
-	};
-
-	struct stap_process_t
-	{
-		int pid;
-		int scriptid;
-		int stdOut;
-		int stdErr;
-		int outSize;
-		int errSize;
-		bool isMessageError;
-		char outBuffer[ DataManager::BUFFER_SIZE + 1 ];
-		char errBuffer[ DataManager::BUFFER_SIZE + 1 ];
-	};
-}
-
-/**
- * This method is for the call to pthread_create, it will not take any
- * actual input nor will it return anything but NULL (the void*s are for
- * compatibility with the pthread_create call).
- */
-void* startDataManager( void* data );
-
-#endif /*DATAMANAGER_H_*/
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/include/dmerror.hpp b/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/include/dmerror.hpp
deleted file mode 100644
index 9334174..0000000
--- a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/include/dmerror.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-#ifndef STAPERROR_H_
-#define STAPERROR_H_
-
-#include <stdint.h>
-
-/**
- * @page error_codes Error Code Layout
- *
- * Error code format: 0x8cs0nnnn, where:
- *   - c = category
- *   - s = severity
- *   - nnnn = error code; this 16-bit number is sufficient to uniquely identify
- *           the error within the stap data manager
- */
-
-	#define DM_ERROR 0x80000000
-
-	#define DM_ERR_CAT_MASK 0x0F000000
-	#define DM_ERR_SEV_MASK 0x00F00000
-	#define DM_ERR_CODE_MASK 0x0000FFFF
-
-	#define DM_ERR_CAT_INTERNAL 0x01000000
-	#define DM_ERR_CAT_USER 0x02000000
-	#define DM_ERR_CAT_SETUP 0x04000000
-
-	#define DM_ERR_SEV_ERR 0x00100000
-	#define DM_ERR_SEV_WARN 0x00200000
-	#define DM_ERR_SEV_INFO 0x00400000
-
-	/* Error definition */
-	#define DM_ERR_REQUEST_TYPE 	(DM_ERROR | DM_ERR_CAT_USER \
-			| DM_ERR_SEV_ERR | 0x00000001)
-	#define DM_ERR_LISTEN_SOCKET 	(DM_ERROR | DM_ERR_CAT_USER \
-			| DM_ERR_SEV_ERR | 0x00000002)
-	#define DM_ERR_SOCKET_READ 	(DM_ERROR | DM_ERR_CAT_INTERNAL \
-			| DM_ERR_SEV_ERR | 0x00000004)
-
-	#define DM_ERR_MBOX_DUPLICATE 	(DM_ERROR | DM_ERR_CAT_USER \
-	 		| DM_ERR_SEV_WARN | 0x00000008)
-	#define DM_ERR_MBOX_LOCK 	(DM_ERROR | DM_ERR_CAT_INTERNAL \
-			| DM_ERR_SEV_ERR | 0x0000000F)
-	#define DM_ERR_PACKET_FORMAT 	(DM_ERROR | DM_ERR_CAT_USER \
-			| DM_ERR_SEV_WARN | 0x00000010)
-	#define DM_ERR_BAD_CLIENTID 	(DM_ERROR | DM_ERR_CAT_USER \
-			| DM_ERR_SEV_WARN | 0x00000011)
-	#define DM_ERR_COMM_CHANNEL 	(DM_ERROR | DM_ERR_CAT_USER \
-			| DM_ERR_SEV_WARN | 0x00000012)
-
-	#define DM_ERR_SCRIPT_LOAD 	(DM_ERROR | DM_ERR_CAT_INTERNAL \
-			| DM_ERR_SEV_ERR | 0x00000014)
-	#define DM_ERR_SCRIPT_NOEXIST 	(DM_ERROR | DM_ERR_CAT_USER \
-			| DM_ERR_SEV_ERR | 0x00000018)
-	#define DM_ERR_SCRIPT_NOINST 	(DM_ERROR | DM_ERR_CAT_USER \
-			| DM_ERR_SEV_ERR | 0x0000001F)
-	#define DM_NOTICE_SCRIPT_COMPLETED 	(DM_ERROR | DM_ERR_CAT_USER \
-			| DM_ERR_SEV_INFO | 0x00000020)
-	#define DM_NOTICE_CONNECTION_CLOSED	(DM_ERROR | DM_ERR_CAT_USER \
-			| DM_ERR_SEV_INFO | 0x00000021)
-	#define DM_NOTICE_CONNECTION_CREATED	(DM_ERROR | DM_ERR_CAT_USER \
-			| DM_ERR_SEV_INFO | 0x00000022)
-	#define DM_NOTICE_SUB_SUCCESS	(DM_ERROR | DM_ERR_CAT_USER \
-			| DM_ERR_SEV_INFO | 0x00000024)
-	#define DM_NOTICE_UNSUB_SUCCESS	(DM_ERROR | DM_ERR_CAT_USER \
-			| DM_ERR_SEV_INFO | 0x00000028)
-
-	/* Function for looking up error code meaning */
-	const char* dm_error_print(uint32_t err);
-
-#endif /*STAPERROR_H_*/
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/include/logger.hpp b/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/include/logger.hpp
deleted file mode 100644
index b77dbd3..0000000
--- a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/include/logger.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef LOGGER_H
-#define LOGGER_H
-
-#include <string>
-
-#include <syslog.h>
-#define L_DEFAULT_HANDLER syslog // replaces fprintf(3) by syslog(3)
-#define L_DEFAULT_PARAMS LOG_USER // default priority for syslog info
-
-using namespace std;
-
-namespace datamanager
-{
-
-	class Logger
-	{
-		public:
-			/*
-			 * Log level will use the constants defined in syslog.h see
-			 * syslog(3) for their meanings.
-			 */
-
-			Logger( const string& ident = "stapguidm" );
-
-			~Logger();
-
-			inline const string& getIdent( ) const { return mIdent; }
-
-			/**
-			 * Sends the specified message to syslogd with the specified
-			 * severity level.  The severity level defaults to LOG_NOTICE if
-			 * nothing is specified.
-			 */
-			void log( const string& message, int level = LOG_NOTICE ) const;
-
-		private:
-			string mIdent;
-	};
-
-}
-
-#endif //LOGGER_H
-
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/include/stapdebug.hpp b/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/include/stapdebug.hpp
deleted file mode 100644
index a41bc7b..0000000
--- a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/include/stapdebug.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef STAPDEBUG_HPP_
-#define STAPDEBUG_HPP_
-
-#ifdef DEBUG_ON
-#define coutd cout << __FILE__ << ": " << __func__ << "()" << " [" << __LINE__ << "] "
-#else
-#define coutd if(0) cout
-#endif
-
-#endif /*STAPDEBUG_HPP_*/
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/include/subscriptionMgr.hpp b/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/include/subscriptionMgr.hpp
deleted file mode 100644
index dd64b7d..0000000
--- a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/include/subscriptionMgr.hpp
+++ /dev/null
@@ -1,106 +0,0 @@
-#ifndef SUBSCRIPTIONMGR_H_
-#define SUBSCRIPTIONMGR_H_
-
-#include "datamanager.hpp"
-#include "MailBox.hpp"
-#include <linux/types.h>
-#include <pthread.h>
-#include <map>
-
-namespace datamanager
-{
-	/* @class subscriptionMgr
-	 * @brief This class is responsible for managing all incoming
-	 * requests for connections / communication with the stap-gui
-	 * data manager
-	 */
-	class SubscriptionMgr
-	{
-		public:
-			static bool SYSTEM_EXITING;
-
-			~SubscriptionMgr();
-			int startService();
-
-			/* Accession methods for the subscritpionMap, linking a unique
-			 * subscriber ID to a socket file descriptor */
-			int addSubscriberID(int uniqueID, int socketfd);
-			int removeSubscriberID(int uniqueID);
-			int getSubscriberSocketFD(int uniqueID);
-
-			/* getInstance
-			 * @brief Returns instance of singleton SubscriptionMgr class, or
-			 * 	constructs and returns as needed
-			 */
-			static SubscriptionMgr *getInstance();
-
-			/* getStatus
-			 * @brief For future use - allows a request for status to come from
-			 * the dashboard, which then also spawns cleanup in the
-			 * DM
-			 * param scriptID - identifier for the script to query about
-			 * param flags - bitmap of flag options
-			 * @return 0 if successful, otherwise a negative error code*/
-			int getStatus(int scriptID, int flags);
-			/* runScript
-			 * @brief For future use - for execution of custom scripts
-			 * @param path - Path and script name to be compiled and insmod'd
-			 * @return 0 if successful, otherwise a negative error code*/
-			int runScript(char path);
-
-			/* dmdSighandler
-			 * @brief Cleans up whenever the server is being shut down
-			 *  by a signal
-			 */
-			void dmdCleanup();
-
-		private:
-			static SubscriptionMgr *smInstance;
-                        static std::map<int, char *> users;
-                        static char user[20]; 
-			pthread_t dmThread;
-			int permSocketfd, dmSocketfd;
-
-			/* default constructor available only to members or
-				friends of this class*/
-			SubscriptionMgr();
-			/* disallow copy constructor */
-		    SubscriptionMgr(const SubscriptionMgr &old);
-		    /* disallow assignment operator */
-		    const SubscriptionMgr &operator=(const SubscriptionMgr &old);
-
-			/* initDMComm
-			 * @brief Initiates socket communication with data manager
-			 * @return - number of bytes written, or negative error code on
-			 *  failure
-			 */
-			int initDMComm();
-			/* notiftyDM
-			 * @brief Sends the mailbox ID for which the linked list has
-			 * been changed to the data manager
-			 * @param sigType - Either a scriptID, or if negative, a request
-			 * 	for some predefined action (ie - shutdown)
-			 * 	list being modified
-			 * @return 0 if successful, otherwise a negative error code*/
-			int notifyDM(struct dmRequest *req);
-			/* subscribe
-			 * @brief Handles modification of the array shared with the
-			 * data manager, adding a new socket descriptor to the linked list
-			 * @param scriptID - identifier for the script being subscribed to
-			 * @return 0 if successful, otherwise a negative error code*/
-			int subscribe(int scriptID);
-			/* unSubscribe
-			 * @brief Handles modification of the array shared with the
-			 * data manager, removing a socket descriptor from the linked list
-			 * @param scriptID - identifier for the script being unsubscribed
-			 * 	from
-			 * @return 0 if successful, otherwise a negative error code
-			 * */
-			int unSubscribe(int scriptID);
-
-			int handleRequest(struct dmRequest* req, struct dmResponse* resp, int newfd);
-
-	};
-}
-
-#endif /*SUBSCRIPTIONMGR_H_*/
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/logger.cpp b/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/logger.cpp
deleted file mode 100644
index 1eeb1c0..0000000
--- a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/logger.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "include/logger.hpp"
-
-namespace datamanager
-{
-	Logger::Logger( const string& ident ) :
-		mIdent( ident )
-	{
-		openlog( mIdent.c_str( ), LOG_PID, LOG_USER );
-	}
-
-	Logger::~Logger( )
-	{
-		closelog( );
-	}
-
-	void Logger::log( const string& message, int level ) const
-	{
-		syslog( level, "%s", message.c_str( ) );
-	}
-
-}
-
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/makefile.dep b/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/makefile.dep
deleted file mode 100644
index 53c4c65..0000000
--- a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/makefile.dep
+++ /dev/null
@@ -1,18 +0,0 @@
-common.o: common.cpp include/common.hpp include/dmerror.hpp
-confReader.o: confReader.cpp include/confReader.hpp include/common.hpp \
-  include/logger.hpp include/dmerror.hpp include/common.hpp
-datamanager.o: datamanager.cpp include/datamanager.hpp \
-  include/MailBox.hpp include/common.hpp include/common.hpp \
-  include/confReader.hpp include/dmerror.hpp include/stapdebug.hpp \
-  include/logger.hpp include/subscriptionMgr.hpp include/datamanager.hpp \
-  include/MailBox.hpp
-dmerror.o: dmerror.cpp include/dmerror.hpp
-logger.o: logger.cpp include/logger.hpp
-MailBox.o: MailBox.cpp include/stapdebug.hpp include/MailBox.hpp \
-  include/common.hpp include/confReader.hpp include/dmerror.hpp \
-  include/common.hpp include/logger.hpp include/datamanager.hpp
-subscriptionMgr.o: subscriptionMgr.cpp include/subscriptionMgr.hpp \
-  include/datamanager.hpp include/MailBox.hpp include/common.hpp \
-  include/datamanager.hpp include/stapdebug.hpp include/dmerror.hpp \
-  include/MailBox.hpp include/common.hpp include/logger.hpp \
-  include/confReader.hpp
diff --git a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/subscriptionMgr.cpp b/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/subscriptionMgr.cpp
deleted file mode 100644
index 1ae4457..0000000
--- a/systemtap/SystemTapGuiServer/systemtapguiserver-1.0/subscriptionMgr.cpp
+++ /dev/null
@@ -1,401 +0,0 @@
-#include "include/subscriptionMgr.hpp"
-#include "include/datamanager.hpp"
-#include "include/stapdebug.hpp"
-#include "include/dmerror.hpp"
-#include "include/MailBox.hpp"
-#include "include/common.hpp"
-#include "include/logger.hpp"
-#include "include/confReader.hpp"
-
-#include <iostream>
-#include <sstream>
-#include <linux/types.h>
-#include <linux/socket.h>
-#include <netinet/in.h>
-#include <pthread.h>
-#include <signal.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/un.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/stat.h>
-
-using namespace std;
-using namespace datamanager;
-
-SubscriptionMgr* SubscriptionMgr::smInstance = NULL;
-bool SubscriptionMgr::SYSTEM_EXITING = false;
-std::map<int, char* > SubscriptionMgr::users;
-char SubscriptionMgr::user[20];
-
-
-extern char *optarg;
-extern int optind, opterr, optopt;
-
-extern int errno;
-
-SubscriptionMgr::SubscriptionMgr() : dmThread( 0 ),
-	permSocketfd( -1 ), dmSocketfd( -1 )
-{
-	/* Create data manager thread */
-	pthread_create(&dmThread, NULL, startDataManager, NULL);
-	/* init communication with datamanager */
-        sleep(1);
- 	initDMComm();
-}
-
-int SubscriptionMgr::initDMComm()
-{
-	struct sockaddr_un server;
-	int rc;
-	DataManager *dm;
-	dmSocketfd = socket(AF_UNIX, SOCK_STREAM, 0);
-	if (dmSocketfd < 0) {
-		ostringstream err;
- 		err << "Error calling socket on data manager" << endl;
- 		Logger log;
- 		log.log(err.str());
-		dmdCleanup();
- 	}
- 	server.sun_family = AF_UNIX;
-	strcpy(server.sun_path, DataManager::DATAMANAGER_SOCKET.c_str());
-
-	dm = DataManager::getInstance();
-	while (!dm->isSetup()) {}
-
-	rc = connect(dmSocketfd, (struct sockaddr *)&server,
-		sizeof(struct sockaddr_un));
-
-	forceNonBlocking(dmSocketfd);
-
-	if (rc) {
-		ostringstream err;
- 		err << "Error connecting to data manager RC: " << rc << " : "
-			<< strerror(errno) << endl;
-		Logger log;
- 		log.log(err.str());
-		dmdCleanup();
-	}
-	return 0;
-}
-
-int SubscriptionMgr::notifyDM(struct dmRequest *req)
-{
-	unsigned int size = 0;
-	int ret;
-
-	while( size < sizeof(req->scriptID) &&
-		( ret = write(
-			dmSocketfd, req + size, sizeof(*req) - size ) ) > 0 )
-		size += ret;
-
-	if (ret < 0) {
- 		ostringstream err;
- 		err << "Error writing to data manager socket" << endl;
- 		Logger log;
- 		log.log(err.str());
- 		dmdCleanup();
- 		return ret;
-	}
-	return size;
-}
-
-SubscriptionMgr * SubscriptionMgr::getInstance()
-{
-	if (!smInstance)
-		smInstance = new SubscriptionMgr();
-
-	return smInstance;
-}
-
-int SubscriptionMgr::getStatus(int scriptID, int flags)
-{
-	return -1;
-}
-
-/* runScript
- * @brief: Stub for future expansion.  Will allow custom script execution
- */
-int SubscriptionMgr::runScript(char path)
-{
-	return -1;
-}
-
-int SubscriptionMgr::handleRequest(struct dmRequest* req, struct dmResponse* resp, int newfd)
-{
-	int rc = 0;
-	MailBox* mbInstance = MailBox::getInstance ();
-	resp->size = 0;
-	string str;
-	char *buf;
-        ostringstream os;
-	ConfReader *cr = ConfReader::getInstance();
-
-	if (req->beginIdStr != DM_PACKET_BEGIN)
-		rc = DM_ERR_PACKET_FORMAT;
-	else if (!mbInstance->isClient (req->clientID) && req->reqAction != REQ_CREATE_CONN)
-		rc = DM_ERR_COMM_CHANNEL;
-	else {
-		switch (req->reqAction) {
-			case REQ_CREATE_CONN:
-				// A new connection was requested
-				mbInstance->addClient (newfd);
-                                sprintf(user,"%s",req->data);
-                                users[newfd] = user;
-				rc = DM_NOTICE_CONNECTION_CREATED;
-				break;
-				case REQ_DESTROY_CONN:
-					// Remove all state related to clientID
-					mbInstance->delClient (req->clientID);
-					rc = mbInstance->unsubscribeAll (req->clientID);
-					if (rc != -1) {
-						req->scriptID = rc;
-						notifyDM (req);
-					}
-					rc = DM_NOTICE_CONNECTION_CLOSED;
-					break;
-				case REQ_SUBSCRIBE:
-					int id;
-					id = cr->addScript(req);
-					req->scriptID = id;
-					rc = mbInstance->subscribe(req);
-					if (rc == 0) {
-				        sprintf(req->data,"%s",users[req->clientID]); 
-						notifyDM(req);
-						rc = DM_NOTICE_SUB_SUCCESS;
-					}
-					break;
-				case REQ_UNSUBSCRIBE:
-					rc = mbInstance->unsubscribe (req->scriptID, req->clientID);
-
-					// unsubscribe will be non-zero if script is invalid
-					if (rc == 0 && mbInstance->isEmpty(req->scriptID)) {
-						notifyDM (req);
-						rc = DM_NOTICE_UNSUB_SUCCESS;
-					}
-
-					break;
-				case REQ_GET_STATUS:
-					// currently not supported
-					rc = DM_ERR_REQUEST_TYPE;
-					break;
-				case REQ_SUBSCRIPTION_MODIFY:
-					// currently not supported
-					rc = DM_ERR_REQUEST_TYPE;
-					break;
-				case REQ_CONFIG_FILE:
-					cr->readConfFile(str);
-					buf = strdup(str.c_str());
-					resp->data = buf;
-					resp->size = str.length();
-					break;
-
-				       
-				default:
-					rc =  DM_ERR_REQUEST_TYPE;
-					break;
-			} // switch
-
-		} // else
-
-
-		resp->beginIdStr = DM_PACKET_BEGIN;
-		resp->src = SUBSCRIPTION_MGR;
-		resp->scriptID = req->scriptID;
-
-		if (req->reqAction == REQ_CREATE_CONN)
-			resp->clientID = newfd;
-		else
-			resp->clientID = req->clientID;
-
-		resp->returnCode = rc;
-		// currently unused
-		return rc;
-	}
-
-	int SubscriptionMgr::startService()
-	{
-		struct sockaddr_in serv_addr, client_addr;
-		int newfd, rc;
-		socklen_t client_len = sizeof(client_addr);
-		char buf[255];
-
-		permSocketfd = socket(AF_INET, SOCK_STREAM, 0);
-		if (permSocketfd < 0) {
-			ostringstream err;
-			err << "Error on socket: " << strerror (errno) << endl;
-			cerr << err.str() << endl;
-			Logger log;
-			log.log(err.str());
-			return -1;
-		}
-
-		memset(&serv_addr, 0, sizeof(serv_addr));
-		serv_addr.sin_family = AF_INET;
-		serv_addr.sin_addr.s_addr = INADDR_ANY;
-		serv_addr.sin_port = htons(LISTEN_PORT);
-
-		if (bind(permSocketfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0) {
-			ostringstream err;
-			err << "Error on binding: " << strerror (errno) << endl;
-			cerr << err.str() << endl;
-			Logger log;
-			log.log(err.str());
-			return -1;
-		}
-
-		if (listen(permSocketfd, 5) != 0) {
-			ostringstream err;
-			err << "Error on listen: " << strerror (errno) << endl;
-			cerr << err.str() << endl;
-			Logger log;
-			log.log(err.str());
-			return -1;
-		}
-
-		cout << "Listening for connections... " << endl;
-
-	/* Loop looking for new connection requests */
-	while (true) {
-		struct dmRequest* req;
-		struct dmResponse resp;
-
-		newfd = accept(permSocketfd, (struct sockaddr *) &client_addr, &client_len);
-
-		if (newfd < 0) {
-			ostringstream err;
-			err << "Error on accept: " << strerror (errno) << endl;
-			cerr << err.str() << endl;
- 			Logger log;
- 			log.log(err.str());
-			return -1;
-		}
-
-		memset(&buf, 0, 255);
-
-		if (recv(newfd, buf, sizeof( struct dmRequest ), MSG_WAITALL) < 0) {
-			ostringstream err;
-			err << "Error reading from socket: " << strerror (errno) << endl;
-			cerr << err.str() << endl;
- 			Logger log;
- 			log.log(err.str());
-			return -1;
-		}
-
-	/* convert request to host byte order */
-		req = (struct dmRequest*) buf;
-                     handleRequest(reqConvToH(req), &resp, newfd);
-                
-
-		/* Send response to client */
-		respConvToN(&resp);
-		send(ntohl(resp.clientID), &resp, sizeof(resp), 0);
-		if (resp.size) { /* if there is anything to send */
-			send(ntohl(resp.clientID), resp.data, ntohl(resp.size), 0);
-		}
-		if (req->reqAction != REQ_CREATE_CONN)
-			close (newfd);
-	}
-
-	return rc;
-}
-
-void SubscriptionMgr::dmdCleanup()
-{
-	void *tmp;
-	struct dmRequest req;
-
-	ostringstream out;
- 	out << "Closing stapgui daemon\n";
- 	Logger log;
- 	log.log(out.str());
- 	memset(&req, 0, sizeof(req));
- 	req.scriptID = SHUTDOWN_DATAMANAGER;
-	notifyDM(&req);
-	pthread_join(dmThread, &tmp);
-	MailBox::getInstance()->deleteInstance();
-	close(permSocketfd);
-	close(dmSocketfd);
-	exit(0);
-}
-
-void dmdSighandler(int sig)
-{
-	SubscriptionMgr::getInstance( )->dmdCleanup();
-}
-
-void printUsage( const string& name )
-{
-	cerr << "Usage: " << name << " [-h] [-b] [-p PORTNUMBER ]" << endl;
-	cerr << " -h:            help, this message" << endl;
-	cerr << " -b:            Run in background (daemonize the process)" << endl;
-	cerr << " -p PORTNUMBER: Use specified port number instead of default (" <<
-		LISTEN_PORT << ")" << endl;
-}
-
-int main(int argc, char **argv)
-{
-	struct sigaction sigact;
-	SubscriptionMgr* sm = NULL;
-	bool daemon = false;
-	int port = LISTEN_PORT;
-	int opt;
-
-	while ((opt = getopt(argc, argv, "hbp:")) != -1) {
-		switch (opt) {
-			case 'b':
-				daemon = true;
-				break;
-			case 'p':
-				port = atoi(optarg);
-				break;
-			case 'h':
-			default:
-				printUsage(argv[0]);
-				exit( 1 );
-		}
-	}
-
-	/* Daemonize child process */
-	if (daemon) {
-		if(fork()) return 0;
-		setsid();
-		umask(0);
-		// Close stdout, stderr, stdin
-		close(0);
-		close(1);
-		close(2);
-	}
-
-	try {
-		sm = SubscriptionMgr::getInstance();
-	}
-	catch ( exception& e )
-	{
-		ostringstream err;
- 		err << "Error creating subscription manager" << endl;
- 		Logger log;
- 		log.log(err.str());
-		return -1;
-	}
-
-	/* Setup signal interception, so when process is killed, it cleans
-	 * up properly */
-	sigact.sa_handler = dmdSighandler;
-	sigemptyset(&sigact.sa_mask);
-
-	sigaction(SIGABRT, &sigact, NULL);
-	sigaction(SIGILL, &sigact, NULL);
-	sigaction(SIGINT, &sigact, NULL);
-	sigaction(SIGQUIT, &sigact, NULL);
-	sigaction(SIGTERM, &sigact, NULL);
-
-	sm->startService();
-	sm->dmdCleanup();
-
-	return 0;
-}
diff --git a/systemtap/build.properties b/systemtap/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/systemtap/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/systemtap/feature.xml b/systemtap/feature.xml
deleted file mode 100644
index e45595d..0000000
--- a/systemtap/feature.xml
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.linuxtools.systemtap.feature"
-      label="Feature Feature"
-      version="1.0.0">
-
-   <description>
-      Plugins for maintaining and developing Systemtap scripts.
-   </description>
-
-   <copyright>
-      Copyright 2008 Phillip Muldoon.
-   </copyright>
-
-   <license url="http://www.eclipse.org/org/documents/epl-v10.php">
-      Eclipse Public License - v 1.0
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS
-ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT’S ACCEPTANCE
-OF THIS AGREEMENT.
-1. DEFINITIONS
-&quot;Contribution&quot; means:
-a) in the case of the initial Contributor, the initial code and
-documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-i)changes to the Program, and
-ii)additions to the Program;
-where such changes and/or additions to the Program originate
-from and are distributed by that particular Contributor. A Contribution
-&apos;originates&apos; from a Contributor if it was added to the Program
-by such Contributor itself or anyone acting on such Contributor’s
-behalf. Contributions do not include additions to the Program
-which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.
-&quot;Contributor&quot; means any person or entity that distributes the
-Program.
-&quot;Licensed Patents &quot; mean patent claims licensable by a Contributor
-which are necessarily infringed by the use or sale of its Contribution
-alone or when combined with the Program.
-&quot;Program&quot; means the Contributions distributed in accordance with
-this Agreement.
-&quot;Recipient&quot; means anyone who receives the Program under this
-Agreement, including all Contributors.
-2. GRANT OF RIGHTS
-a) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free copyright
-license to reproduce, prepare derivative works of, publicly display,
-publicly perform, distribute and sublicense the Contribution
-of such Contributor, if any, and such derivative works, in source
-code and object code form.
-b) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free patent
-license under Licensed Patents to make, use, sell, offer to sell,
-import and otherwise transfer the Contribution of such Contributor,
-if any, in source code and object code form. This patent license
-shall apply to the combination of the Contribution and the Program
-if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to
-be covered by the Licensed Patents. The patent license shall
-not apply to any other combinations which include the Contribution.
-No hardware per se is licensed hereunder.
-c) Recipient understands that although each Contributor grants
-the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe
-the patent or other intellectual property rights of any other
-entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement
-of intellectual property rights or otherwise. As a condition
-to exercising the rights and licenses granted hereunder, each
-Recipient hereby assumes sole responsibility to secure any other
-intellectual property rights needed, if any. For example, if
-a third party patent license is required to allow Recipient to
-distribute the Program, it is Recipient’s responsibility to acquire
-that license before distributing the Program.
-d) Each Contributor represents that to its knowledge it has sufficient
-copyright rights in its Contribution, if any, to grant the copyright
-license set forth in this Agreement.
-3. REQUIREMENTS
-A Contributor may choose to distribute the Program in object
-code form under its own license agreement, provided that:
-a) it complies with the terms and conditions of this Agreement;
-and
-b) its license agreement:
-i) effectively disclaims on behalf of all Contributors all warranties
-and conditions, express and implied, including warranties or
-conditions of title and non-infringement, and implied warranties
-or conditions of merchantability and fitness for a particular
-purpose;
-ii) effectively excludes on behalf of all Contributors all liability
-for damages, including direct, indirect, special, incidental
-and consequential damages, such as lost profits;
-iii) states that any provisions which differ from this Agreement
-are offered by that Contributor alone and not by any other party;
-and
-iv) states that source code for the Program is available from
-such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for
-software exchange.
-When the Program is made available in source code form:
-a) it must be made available under this Agreement; and
-b) a copy of this Agreement must be included with each copy of
-the Program.
-Contributors may not remove or alter any copyright notices contained
-within the Program.
-Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.
-4. COMMERCIAL DISTRIBUTION
-Commercial distributors of software may accept certain responsibilities
-with respect to end users, business partners and the like. While
-this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-(&quot;Commercial Contributor&quot;) hereby agrees to defend and indemnify
-every other Contributor (&quot;Indemnified Contributor&quot;) against any
-losses, damages and costs (collectively &quot;Losses&quot;) arising from
-claims, lawsuits and other legal actions brought by a third party
-against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection
-with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any
-claims or Losses relating to any actual or alleged intellectual
-property infringement. In order to qualify, an Indemnified Contributor
-must: a) promptly notify the Commercial Contributor in writing
-of such claim, and b) allow the Commercial Contributor to control,
-and cooperate with the Commercial Contributor in, the defense
-and any related settlement negotiations. The Indemnified Contributor
-may participate in any such claim at its own expense.
-For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor’s responsibility
-alone. Under this section, the Commercial Contributor would have
-to defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any
-other Contributor to pay any damages as a result, the Commercial
-Contributor must pay those damages.
-5. NO WARRANTY
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM
-IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with
-its exercise of rights under this Agreement , including but not
-limited to the risks and costs of program errors, compliance
-with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations.
-6. DISCLAIMER OF LIABILITY
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE
-OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY
-OF SUCH DAMAGES.
-7. GENERAL
-If any provision of this Agreement is invalid or unenforceable
-under applicable law, it shall not affect the validity or enforceability
-of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be
-reformed to the minimum extent necessary to make such provision
-valid and enforceable.
-If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging
-that the Program itself (excluding combinations of the Program
-with other software or hardware) infringes such Recipient’s patent(s),
-then such Recipient’s rights granted under Section 2(b) shall
-terminate as of the date such litigation is filed.
-All Recipient’s rights under this Agreement shall terminate if
-it fails to comply with any of the material terms or conditions
-of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If
-all Recipient’s rights under this Agreement terminate, Recipient
-agrees to cease use and distribution of the Program as soon as
-reasonably practicable. However, Recipient’s obligations under
-this Agreement and any licenses granted by Recipient relating
-to the Program shall continue and survive.
-Everyone is permitted to copy and distribute copies of this Agreement,
-but in order to avoid inconsistency the Agreement is copyrighted
-and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other
-than the Agreement Steward has the right to modify this Agreement.
-The Eclipse Foundation is the initial Agreement Steward. The
-Eclipse Foundation may assign the responsibility to serve as
-the Agreement Steward to a suitable separate entity. Each new
-version of the Agreement will be given a distinguishing version
-number. The Program (including Contributions) may always be distributed
-subject to the version of the Agreement under which it was received.
-In addition, after a new version of the Agreement is published,
-Contributor may elect to distribute the Program (including its
-Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights
-or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under
-this Agreement are reserved.
-This Agreement is governed by the laws of the State of New York
-and the intellectual property laws of the United States of America.
-No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose.
-Each party waives its rights to a jury trial in any resulting
-litigation.
-Related Links
-* EPL in plain HTML
-* The EPL on OSI’s site
-* CPL to EPL conversion
-* Home
-* Privacy Policy
-* Terms of Use
-Copyright © 2006 The Eclipse Foundation. All Rights Reserved
-   </license>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.editors"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.linuxtools.systemtap.ui.editor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog b/systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog
index f1de818..9d7731a 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog
+++ b/systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog
@@ -1,4 +1,4 @@
-2009-11-03  chwang  <chwang@toto>
+2009-11-03  Charley Wang  <chwang@redhat.com>
 
 	* feature.properties: Change description for Callgraph feature. Add Changelog
 	* feature.properties: Change featureName
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/ChangeLog b/systemtap/org.eclipse.linuxtools.callgraph.core/ChangeLog
index 0779670..07a8eb8 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.core/ChangeLog
+++ b/systemtap/org.eclipse.linuxtools.callgraph.core/ChangeLog
@@ -1,3 +1,52 @@
+2010-02-26  Roland Grunberg  <rgrunber@redhat.com>
+
+	* src/org/eclipse/linuxtools/callgraph/core/SystemTapParser.java:
+		Clean up code and add getter for internal data field.
+
+2010-02-23  Charley Wang  <chwang@redhat.com>
+
+	* src/org/eclipse/linuxtools/callgraph/core/SystemTapParser.java: Add a Thread.sleep() to stop abusing CPU cycles so much
+	Get rid of extraneous parsing job as a further optimization
+
+2010-02-12  Charley Wang  <chwang@redhat.com>
+
+	* src/org/eclipse/linuxtools/callgraph/core/SystemTapView.java: Create default implementations of getParser and setParser using a private SystemTapParser variable.
+	* src/org/eclipse/linuxtools/callgraph/core/SystemTapTextView.java: Get rid of getParser and setParser functions.
+
+2010-02-11  Charley Wang  <chwang@redhat.com>
+
+	* src/org/eclipse/linuxtools/callgraph/core/SystemTapTextParser.java: Properly grab new lines in text parser.
+	* src/org/eclipse/linuxtools/callgraph/core/SystemTapParser.java: Call makeView earlier so SystemTapTextView will stop breaking.
+
+2010-02-02  Charley Wang  <chwang@redhat.com>
+
+	* src/org/eclipse/linuxtools/callgraph/core/SystemTapCommandGenerator.java: Fix binary argument handling.
+
+2010-02-01  Roland Grunberg  <rgrunber@redhat.com>
+
+	* src/org/eclipse/linuxtools/callgraph/core/messages.properties: Remove unused externalized string.
+	* src/org/eclipse/linuxtools/callgraph/core/SystemTapView.java: Remove Callgraph Version string.
+
+2010-01-28  Roland Grunberg  <rgrunber@redhat.com>
+
+	* src/org/eclipse/linuxtools/callgraph/core/SystemTapErrorHandler.java: Clean up unnecessary code.
+	* src/org/eclipse/linuxtools/callgraph/core/SystemTapTextView.java: Same as above.
+	* src/org/eclipse/linuxtools/callgraph/core/SystemTapView.java: Same as above.
+
+2010-01-26  Charley Wang  <chwang@redhat.com>
+
+	* src/org/eclipse/linuxtools/callgraph/core/SystemTapParser.java: Fix settings for nonrealtimeparsing.
+
+2010-01-22  Roland Grunberg  <rgrunber@redhat.com>
+
+	* errors.prop: Add case for when uprobes.ko built for a previous kernel, and must be updated.
+	* src/org/eclipse/linuxtools/callgraph/core/messages.properties: Remove Error Log externalized strings.
+	* src/org/eclipse/linuxtools/callgraph/core/SystemTapErrorHandler.java:
+		(writeToLog): Output logged errors using the Eclipse Error Log.
+	* src/org/eclipse/linuxtools/callgraph/core/SystemTapTextView.java:
+		(createPartControl): remove the Error Log from being displayed. 
+	* src/org/eclipse/linuxtools/callgraph/core/SystemTapView.java: Remove the Error Log window.
+
 2009-12-22  Charley Wang  <chwang@redhat.com>
 
 	* src/org/eclipse/linuxtools/callgraph/core/SystemTapErrorHandler.java: Remove extraneous logic
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/errors.prop b/systemtap/org.eclipse.linuxtools.callgraph.core/errors.prop
index deee4c8..84644cf 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.core/errors.prop
+++ b/systemtap/org.eclipse.linuxtools.callgraph.core/errors.prop
@@ -10,4 +10,5 @@
 .*stapdev.*stapusr.*=Please add yourself to the 'stapdev' or 'stapusr' group in order to run stap.
 .*Error inserting module.*File exists=A previous run of systemtap did not finish execution properly. In commandline, try ps aux | grep stap, kill any running stap processes and try again. 
 .*line 0: syntax error near unexpected token.*=Your workspace name may contain opening and closing brackets -- please switch to a workspace that does not use brackets and try again.
-.*SystemTap's version of uprobes is out of date.*=SystemTap's version of uprobes is out of date. As root, please run "make -C /usr/local/share/systemtap/runtime/uprobes".
\ No newline at end of file
+.*SystemTap's version of uprobes is out of date.*=SystemTap's version of uprobes is out of date. As root, please run "make -C /usr/local/share/systemtap/runtime/uprobes".
+.*Error inserting module.*Invalid module format.*=SystemTap's version of uprobes is out of date. As root, please run "make -C /usr/local/share/systemtap/runtime/uprobes".
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/parse_function_partial.stp b/systemtap/org.eclipse.linuxtools.callgraph.core/parse_function_partial.stp
index 21e5ba5..17033b3 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.core/parse_function_partial.stp
+++ b/systemtap/org.eclipse.linuxtools.callgraph.core/parse_function_partial.stp
@@ -1,7 +1,6 @@
 global serial
 global startTime
 global finalTime
-global currentDepth
 
 
 function callFunction(probefunc, tid) {
@@ -10,14 +9,12 @@
 		printf("<%s,,%d,,%d,,%d\n", probefunc, serial, startTime, tid)
 	} else
 	    printf("<%s,,%d,,%d,,%d\n", probefunc, serial, gettimeofday_ns(), tid)
-	currentDepth++
 	serial++
 }
 
 function returnFunction(probefunc, tid) {
 	finalTime = gettimeofday_ns()
 	printf(">%s,,%d,,%d\n", probefunc, finalTime, tid)
-	currentDepth--
 }
 
 
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapCommandGenerator.java b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapCommandGenerator.java
index eca4826..24c7aaa 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapCommandGenerator.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapCommandGenerator.java
@@ -74,7 +74,7 @@
 			if (binaryArguments.length() < 1){	
 				cmdList.add("-c '" + binaryPath + "'"); //$NON-NLS-1$ //$NON-NLS-2$
 			}else{				
-				cmdList.add("-c '" + binaryPath + " " + binaryArguments +"'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				cmdList.add("-c \"" + binaryPath + " " + binaryArguments +"\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			}
 		}
 		
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapErrorHandler.java b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapErrorHandler.java
index cf387b4..23bcac9 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapErrorHandler.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapErrorHandler.java
@@ -16,12 +16,12 @@
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
-import java.util.Calendar;
-import java.util.TimeZone;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
 
 /**
  * Helper class parses the given string for recognizable error messages
@@ -30,8 +30,6 @@
 public class SystemTapErrorHandler {
 
     public static final String FILE_PROP = "errors.prop"; //$NON-NLS-1$
-    public static final String FILE_ERROR_LOG = "Error.log"; //$NON-NLS-1$
-    public static final int MAX_LOG_SIZE = 50000;
     private boolean errorRecognized;
     private StringBuilder errorMessage = new StringBuilder(""); //$NON-NLS-1$
     private StringBuilder logContents;
@@ -154,51 +152,12 @@
      * time.
      */
     public void writeToLog() {
-        File errorLog = new File(PluginConstants.getDefaultOutput() + "Error.log"); //$NON-NLS-1$
-
-        try {
-            // CREATE THE ERROR LOG IF IT DOES NOT EXIST
-            // CLEAR THE ERROR LOG AFTER A FIXED SIZE(BYTES)
-            if (!errorLog.exists() || errorLog.length() > MAX_LOG_SIZE) {
-                errorLog.delete();
-                errorLog.createNewFile();
-            }
-
-            Calendar cal = Calendar.getInstance(TimeZone.getDefault());
-            int year = cal.get(Calendar.YEAR);
-            int month = cal.get(Calendar.MONTH);
-            int day = cal.get(Calendar.DAY_OF_MONTH);
-            int hour = cal.get(Calendar.HOUR_OF_DAY);
-            int minute = cal.get(Calendar.MINUTE);
-            int second = cal.get(Calendar.SECOND);
-
-            // APPEND THE ERROR TO THE LOG
-            Helper.appendToFile(errorLog.getAbsolutePath(), Messages
-                    .getString("SystemTapErrorHandler.ErrorLogDashes") //$NON-NLS-1$
-                    + PluginConstants.NEW_LINE
-                    + day
-                    + "/" + month //$NON-NLS-1$
-                    + "/" + year + " - " + hour + ":" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                    + minute
-                    + ":" + second //$NON-NLS-1$
-                    + PluginConstants.NEW_LINE
-                    + logContents
-                    + PluginConstants.NEW_LINE + PluginConstants.NEW_LINE);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
+    	IStatus status = new Status(IStatus.ERROR,CallgraphCorePlugin.PLUGIN_ID,logContents.toString());
+    	CallgraphCorePlugin.getDefault().getLog().log(status);
+    	
         logContents = new StringBuilder(); //$NON-NLS-1$
     }
 
-
-    /**
-     * Convenience method for deleting and recreating log at default location
-     */
-    public static void deleteLog() {
-        File log = new File(PluginConstants.getDefaultOutput() + FILE_ERROR_LOG); //$NON-NLS-1$
-        deleteLog(log);
-    }
    
     /**
      * Delete the log at File and replace it with a new (empty) file
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapParser.java b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapParser.java
index 5129802..c04270f 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapParser.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapParser.java
@@ -34,17 +34,14 @@
 	protected Object internalData;
 	private String secondaryID = ""; //$NON-NLS-1$
 
-	public boolean isDone;
+	public boolean done;
 	
-	private RunTimeJob job;
-	private boolean jobCancelled;
-
 	public SystemTapParser() {
 		super("Parsing data"); //$NON-NLS-1$
 		this.sourcePath = PluginConstants.getDefaultIOPath();
 		this.viewID = null;
 		initialize();
-		isDone = false;
+		done = false;
 		
 		//PURELY FOR TESTING
 		if (monitor == null){
@@ -64,8 +61,7 @@
 		initialize();
 	}
 
-
-
+	
 	/**
 	 * Initialize will be called in the constructors for this class. Use this
 	 * method to initialize variables.
@@ -85,8 +81,6 @@
 	public abstract IStatus nonRealTimeParsing();
 
 
-	
-	
 	/**
 	 * Implement this method if your parser is to execute in realtime. This method 
 	 * will be called as part of a while loop in a separate Job. Use the setInternalData
@@ -163,22 +157,41 @@
 		if (this.monitor == null) {
 			this.monitor = new NullProgressMonitor();
 		}
-		makeView();
 		
-		if (realTime && (job == null || job.getResult()==null)) {
-			job = new RunTimeJob("RealTimeParser"); //$NON-NLS-1$
-			job.schedule();
+		makeView();
+		if (realTime) {
+        	try {
+				setInternalData();
+	            while (!done){
+	            	returnStatus = realTimeParsing();
+	            	if (monitor.isCanceled() || returnStatus == Status.CANCEL_STATUS) {
+	            		done = true;
+	            		return Status.CANCEL_STATUS;
+	            	}
+	            	
+	            	Thread.sleep(500);
+	            }
+	            if (!monitor.isCanceled()) returnStatus = realTimeParsing();
+	            done = true;
+				return returnStatus;
+        	} catch (Exception e) {
+        		SystemTapUIErrorMessages m = new SystemTapUIErrorMessages(
+        				Messages.getString("SystemTapParser.InternalData"), //$NON-NLS-1$ 
+        				Messages.getString("SystemTapParser.FailedToSetData"), //$NON-NLS-1$ 
+        				Messages.getString("SystemTapParser.FailedToSetDataMessage")); //$NON-NLS-1$
+        		m.schedule();
+        		return Status.CANCEL_STATUS;
+        	}
 		} else {
 			returnStatus = nonRealTimeParsing();
-		}
-				
-	
-		if (!returnStatus.isOK()){
+			if (!returnStatus.isOK()){
+				return returnStatus;
+			}
+			
+			setData(this);
 			return returnStatus;
 		}
-		
-		setData(this);
-		return returnStatus;
+	
 	}
 	
 	public void printArrayListMap(HashMap<Integer, ArrayList<Integer>> blah) {
@@ -222,6 +235,7 @@
 		}
 		return Status.CANCEL_STATUS;
 	}
+	
 
 	public void launchFileErrorDialog() {
 		SystemTapUIErrorMessages err = new SystemTapUIErrorMessages(Messages
@@ -233,39 +247,20 @@
 	}
 
 
-
-	
-	private class RunTimeJob extends Job {
-		public RunTimeJob(String name) {
-			super(name);
-		}
-
-		@Override
-		public IStatus run(IProgressMonitor monitor) {
-			IStatus returnStatus = Status.CANCEL_STATUS;       
-	        try {
-	        	setInternalData();
-	            while (!isDone){
-	            	returnStatus = realTimeParsing();
-	            	if (monitor.isCanceled() || returnStatus == Status.CANCEL_STATUS)
-	            		return Status.CANCEL_STATUS;
-	            }
-	            returnStatus = realTimeParsing();
-		    } catch (Exception e) {
-		       	e.printStackTrace();
-	        }
-			return returnStatus;
-		}
-	}
-	
 	/**
-	 * Return the Data object.
-	 * @return
+	 * @return the Data object
 	 */
 	public Object getData() {
 		return data;
 	}
 	
+	/**
+	 * @return the internal data object
+	 */
+	public Object getInternalData(){
+		return internalData;
+	}
+	
 	
 	/**
 	 * Generic method for setting the internalData object. This will be called
@@ -298,8 +293,7 @@
 	public String getFile() {
 		return sourcePath;
 	}
-	
-	
+
 	/**
 	 * Sets the file to read from
 	 * 
@@ -308,24 +302,20 @@
 	public void setSourcePath(String source) {
 		this.sourcePath = source;
 	}
-	
 
 	/**
-	 * Slightly more graceful termination than cancelJob.
-	 * Setting to true will cause the parser's RunTimeJob to terminate at the end
-	 * of its current iteration. Does not offer as solid a guarantee
-	 * of termination, however.
+	 * Will terminate the parser at the next opportunity (~once every 0.5s)s
+	 * 
 	 * @param val
 	 */
 	public void setDone(boolean val) {
-		isDone = val;
+		done = val;
 	}
 
-	
 	public void setMonitor(IProgressMonitor m) {
 		this.monitor = m;
 	}
-	
+
 	/**
 	 * Set whether or not this parser runs in real time. If viewID has already
 	 * been set, this will also attempt to open the view.
@@ -336,7 +326,7 @@
 		realTime = val;
 
 	}
-	
+
 	/**
 	 * Set the viewID to use for this parser -- see the callgraph.core view
 	 * extension point. If realTime is set to true, this will also attempt to
@@ -351,57 +341,41 @@
 	/**
 	 * Called at the end of a non-realtime run. 
 	 * Feel free to override this method if using non-realtime functions.
-	 * The setData method will be called after executeParsing() is run. The getData() method
-	 * will be used by the SystemTapView to get the data associated with this parser.
+	 * The setData method will be called after executeParsing() is run.
+	 * The getData() method will be used by the SystemTapView to get the 
+	 * data associated with this parser.
 	 * <br><br>
-	 * Alternatively, you can cast the parser within SystemTapView to your own parser class and access
-	 * its data structures that way. 
+	 * Alternatively, you can cast the parser within SystemTapView to your
+	 * own parser class and access its data structures that way. 
 	 */
 	public void setData(Object obj) {
 		data = obj;
 	}
 	
 	/**
-	 * Cancels the RunTimeJob affiliated with this parser. Returns the result
-	 * of job.cancel() if job is not null, or false if job is null.
+	 * Sends a message to cancel the job. Job may not terminate immediately.
 	 */
-	public boolean cancelJob() {
-		if (job != null) {
-			jobCancelled = true;
-			return job.cancel();
-		}
-		return false;
-	}
-	
-	/**
-	 * Returns true if job is not null and the job's last result was CANCEL_STATUS.
-	 *  False otherwise.
-	 */
-	public boolean isJobCancelled() {
-		if ((job != null && job.getResult() == Status.CANCEL_STATUS)
-				|| jobCancelled) {
-			return true;
-		}
-		return false;
+	public void cancelJob() {
+		done = true;
 	}
 
-	
+	public boolean isDone() {
+		return done;
+	}
+
 	public void setKillButtonEnabled(boolean val) {
-		if (view != null) 
+		if (view != null)
 			view.setKillButtonEnabled(val);
-		
 	}
 
 	public boolean isRealTime() {
 		return realTime;
 	}
 
-
 	public void setSecondaryID(String secondaryID) {
 		this.secondaryID = secondaryID;
 	}
 
-
 	public String getSecondaryID() {
 		return secondaryID;
 	}
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapTextParser.java b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapTextParser.java
index a548b78..5d3f780 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapTextParser.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapTextParser.java
@@ -44,9 +44,11 @@
 			while ((line = buff.readLine()) != null) {
 				if (monitor.isCanceled())
 					return Status.CANCEL_STATUS;
-				text.append(line);
+				text.append(line + "\n");
 			}
 			setData(text.toString());
+			if (text.length() > 0)
+				System.out.println(text.toString());
 			view.update();
 		} catch (IOException e) {
 			e.printStackTrace();
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapTextView.java b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapTextView.java
index 6fa850e..84a3e96 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapTextView.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapTextView.java
@@ -25,7 +25,6 @@
 import org.eclipse.swt.widgets.Display;
 
 public class SystemTapTextView extends SystemTapView {
-	private SystemTapParser parser;
 	private StyledText viewer;
 
 	private Display display;
@@ -194,28 +193,21 @@
 	}
 
 	@Override
-	public boolean setParser(SystemTapParser p) {
-		parser = p;
-		return true;
-	}
-
-	@Override
 	public void createPartControl(Composite parent) {
 		createViewer(parent);
 	
 		addKillButton();
 		addFileMenu();
-		addErrorMenu();
 		addHelpMenu();
 		ViewFactory.addView(this);
 	}
 
 	@Override
 	public void updateMethod() {
-		if (parser.getData() instanceof String) {
-			String data = (String) parser.getData();
+		if (getParser().getData() instanceof String) {
+			String data = (String) getParser().getData();
 			if (data.length() > 0)
-				prettyPrintln((String) parser.getData());
+				prettyPrintln((String) getParser().getData());
 		}
 	}
 
@@ -234,11 +226,5 @@
 		return false;
 	}
 
-	@Override
-	public SystemTapParser getParser() {
-		return parser;
-	}
-	
-	
 
 }
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapView.java b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapView.java
index d3f82ff..ca24e61 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapView.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapView.java
@@ -3,9 +3,7 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.MappedByteBuffer;
@@ -23,7 +21,6 @@
 import org.eclipse.swt.custom.StyledText;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
@@ -41,9 +38,6 @@
     private final String NEW_LINE = Messages.getString("SystemTapView.1"); //$NON-NLS-1$
    
     public Composite masterComposite;
-    private Action error_errorLog;
-    private Action error_deleteError;
-    private IMenuManager errors;
     private IMenuManager help;
     private Action kill;
 
@@ -56,6 +50,7 @@
     protected Action open_default;
     protected String sourcePath;
     protected IMenuManager file;
+    private SystemTapParser parser;
 
 
     /**
@@ -146,7 +141,9 @@
      *
      * @return
      */
-    public abstract SystemTapParser getParser();
+    public SystemTapParser getParser() {
+    	return parser;
+    }
 
     /**
      * Method for setting the parser object of the view. Make this method return
@@ -156,7 +153,12 @@
      * @param parser
      * @return
      */
-    public abstract boolean setParser(SystemTapParser parser);
+    public boolean setParser(SystemTapParser parser) {
+    	this.parser = parser;
+    	if (this.parser == null)
+    		return false;
+    	return true;
+    }
 
     /**
      * Perform whatever actions are necessary to 'update' this viewer. It is
@@ -191,19 +193,6 @@
      */
     protected abstract boolean createOpenDefaultAction();
 
-    /**
-     * Appends the error menu, containing options for opening and clearing the
-     * error log.
-     */
-    public void addErrorMenu() {
-        IMenuManager menu = getViewSite().getActionBars().getMenuManager();
-        errors = new MenuManager(Messages.getString("SystemTapView.ErrMenu")); //$NON-NLS-1$
-        menu.add(errors);
-        createErrorActions();
-
-        errors.add(error_errorLog);
-        errors.add(error_deleteError);
-    }
    
     /**
      * Create File menu -- calls the abstract protected methods
@@ -263,7 +252,7 @@
                     Shell sh = new Shell();
 
                     MessageDialog.openInformation(sh, Messages
-                            .getString("SystemTapView.StapVersion"), message + NEW_LINE + Messages.getString("Callgraph.Version")); //$NON-NLS-1$ //$NON-NLS-2$
+                            .getString("SystemTapView.StapVersion"), message); //$NON-NLS-1$
 
                 } catch (IOException e) {
                     e.printStackTrace();
@@ -358,81 +347,6 @@
     }
    
    
-   
-   
-    /**
-     * Populates the Errors menu
-     */
-    public void createErrorActions() {
-
-        error_errorLog = new Action(Messages.getString("SystemTapView.OpenLog")) { //$NON-NLS-1$
-            public void run() {
-                boolean error = false;
-                File log = new File(PluginConstants.getDefaultOutput()
-                        + "Error.log"); //$NON-NLS-1$
-                BufferedReader buff;
-                try {
-                    buff = new BufferedReader(new FileReader(log));
-                    String logText = ""; //$NON-NLS-1$
-                    String line;
-
-                    while ((line = buff.readLine()) != null) {
-                        logText += line + PluginConstants.NEW_LINE;
-                    }
-
-                    Shell sh = new Shell(SWT.BORDER | SWT.TITLE);
-
-                    sh.setText(Messages.getString("SystemTapView.ErrLog")); //$NON-NLS-1$
-                    sh.setLayout(new FillLayout());
-                    sh.setSize(600, 600);
-
-                    StyledText txt = new StyledText(sh, SWT.MULTI
-                            | SWT.V_SCROLL | SWT.WRAP | SWT.READ_ONLY);
-
-                    txt.setText(logText);
-
-                    sh.setText(Messages.getString("SystemTapView.ErrLogWindow")); //$NON-NLS-1$
-
-                    sh.open();
-                    txt.setTopIndex(txt.getLineCount());
-
-                } catch (FileNotFoundException e) {
-                    error = true;
-                } catch (IOException e) {
-                    error = true;
-                } finally {
-                    if (error) {
-                        SystemTapUIErrorMessages mess = new SystemTapUIErrorMessages(
-                                Messages
-                                        .getString("SystemTapView.ErrorMessageName"), //$NON-NLS-1$
-                                Messages
-                                        .getString("SystemTapView.ErrorMessageTitle"), //$NON-NLS-1$
-                                Messages
-                                        .getString("SystemTapView.ErrorMessageBody") //$NON-NLS-1$
-                                        + Messages
-                                                .getString("SystemTapView.ErrorMessageBody2")); //$NON-NLS-1$
-                        mess.schedule();
-                    }
-                }
-
-            }
-        };
-
-        error_deleteError = new Action(Messages
-                .getString("SystemTapView.ClearLog")) { //$NON-NLS-1$
-            public void run() {
-                if (!MessageDialog.openConfirm(new Shell(), Messages
-                        .getString("SystemTapView.DeleteLogsTitle"), Messages //$NON-NLS-1$
-                        .getString("SystemTapView.DeleteLogsMessage") //$NON-NLS-1$
-                        + Messages
-                                .getString("SystemTapView.DeleteLogsMessage2"))) //$NON-NLS-1$
-                    return;
-
-                SystemTapErrorHandler.deleteLog();
-            }
-        };
-    }
-
     protected void addKillButton() {
         IToolBarManager mgr = getViewSite().getActionBars().getToolBarManager();
         kill = new Action(Messages.getString("SystemTapView.StopScript"), //$NON-NLS-1$
@@ -455,22 +369,6 @@
         return kill;
     }
    
-    public Action getError_errorLog() {
-        return error_errorLog;
-    }
-
-    public void setError_errorLog(Action errorErrorLog) {
-        error_errorLog = errorErrorLog;
-    }
-
-    public Action getError_deleteError() {
-        return error_deleteError;
-    }
-
-    public void setError_deleteError(Action errorDeleteError) {
-        error_deleteError = errorDeleteError;
-    }
-
     public  Action getHelp_version() {
         return help_version;
     }
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/messages.properties b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/messages.properties
index 4beacee..7a2ed10 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/messages.properties
+++ b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/messages.properties
@@ -8,7 +8,6 @@
 # Contributors:
 #     Red Hat - initial API and implementation
 ###############################################################################
-Callgraph.Version=Eclipse Callgraph 0.4 Nightly Build
 FileFinderOpener.FileNotFound1=File not found
 FileFinderOpener.FileNotFound2=Could not find file to open:\n\n
 FileFinderOpener.MultFilesDialogM1=Multiple files found which define a function '
@@ -18,35 +17,25 @@
 FileFinderOpener.FileNotFound=File not found
 SystemTapErrorHandler.NoErrRecognized=No recognizable errors detected. 
 SystemTapErrorHandler.NoErrRecognizedMsg=Please consult error log for more information.
-SystemTapErrorHandler.ErrorLogDashes=-----------------------
 SystemTapErrorHandler.ErrorMessage=One or more errors were encountered and logged in the error log.  
 SystemTapErrorHandler.ErrorMessage1=(Errors -> Open log from the SystemTap View menu).\n
 SystemTapErrorHandler.ErrorMessage2=Possible causes:\n\n
 SystemTapParser.ParseErr=ParseError
 SystemTapParser.ErrSymbol=Unexpected symbol
+SystemTapParser.FailedToSetData=Failed to set data
+SystemTapParser.FailedToSetDataMessage=SystemTapParser failed to set internal data.
+SystemTapParser.InternalData=InternalData
 SystemTapParser.InvalidFile=Invalid File Error
 SystemTapParser.InvalidFileMsg1=The file : 
 SystemTapParser.InvalidFileMsg2=\ could not be rendered. Please make sure the file exists and is valid.
-SystemTapView.OpenLog=Open Log
 SystemTapView.Help=Help
 SystemTapView.FileIOErr=File Access Error
 SystemTapView.FileIOErrMsg=Could not access the selected file. This could be because due to a permissions error.
 SystemTapView.1=\n
-SystemTapView.ErrLogWindow=SystemTap Error Log
 SystemTapView.StopScript=Stop Script
-SystemTapView.ErrMenu=Errors
-SystemTapView.ErrLogMenu=Error Log
 SystemTapView.Version=Version
 SystemTapView.StapVersion=Systemtap Version
 SystemTapView.AboutMenu=About
 SystemTapView.FileMenu=File
 SystemTapView.SaveMenu=Save
-SystemTapView.DeleteLogsMessage=This will permanently clear the SystemTap Eclipse error 
-SystemTapView.DeleteLogsMessage2=logs. Are you sure you want to continue?
-SystemTapView.DeleteLogsTitle=Delete logs?
-SystemTapView.ErrorMessageBody=Error log could not be read, most likely this is because
-SystemTapView.ErrorMessageBody2=\ the log file could not be found.
-SystemTapView.ErrorMessageName=ErrorLog reading error
-SystemTapView.ErrorMessageTitle=Error reading error log
-SystemTapView.ClearLog=Clear log
 StapGraphParser.JobName=GraphUIJob instance
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/ChangeLog b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/ChangeLog
index a35ae63..1ee9db6 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/ChangeLog
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-24  rgrunber  <rgrunber@redhat.com>
+
+	* src/org/eclipse/linuxtools/callgraph/launch/tests/SystemTapErrorHandlerTest.java (testUprobesError):
+		Update message to reflect new error message.
+
 2009-12-16  rgrunber  <rgrunber@redhat.com>
 
 	* src/org/eclipse/linuxtools/callgraph/launch/tests/SystemTapErrorHandlerTest.java:
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/SystemTapErrorHandlerTest.java b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/SystemTapErrorHandlerTest.java
index 5490cc8..6458e2e 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/SystemTapErrorHandlerTest.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/SystemTapErrorHandlerTest.java
@@ -76,13 +76,13 @@
 	
 	public void testUprobesError(){
 		
-		errorString = "SystemTap's version of uprobes is out of date. As root, run or a member of the stapdev group run \"make -C /usr/local/share/systemtap/runtime/uprobes\".";
+		errorString = "SystemTap's version of uprobes is out of date. As root, or a member of the 'root' group, run \"make -C /usr/local/share/systemtap/runtime/uprobes\".";
 		
 		errHandler = new SystemTapErrorHandler();
 		errHandler.handle(new NullProgressMonitor(), errorString);
 		
 		assertTrue(errHandler.isErrorRecognized());
-		assertTrue(errHandler.getErrorMessage().contains("Probes were not compiled on your system. Try 'make -C /usr/local/share/systemtap/runtime/uprobes' as root"));
+		assertTrue(errHandler.getErrorMessage().contains("SystemTap's version of uprobes is out of date. As root, please run \"make -C /usr/local/share/systemtap/runtime/uprobes\"."));
 		
 	}
 
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/ChangeLog b/systemtap/org.eclipse.linuxtools.callgraph.launch/ChangeLog
index a855b3d..a009cbc 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/ChangeLog
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/ChangeLog
@@ -1,3 +1,21 @@
+2010-03-05  Charley Wang  <chwang@redhat.com>
+
+	* src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchConfigurationDelegate.java: Stop passsing a useless argument to finishLaunch
+
+2010-03-02  Charley Wang  <chwang@redhat.com>
+
+	* src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchConfigurationDelegate.java (launch): Toss out a message dialog if output path is broken.
+
+2010-02-26  Roland Grunberg  <rgrunber@redhat.com>
+
+	* src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchShortcut.java:
+		Cleanup code.
+
+2010-02-23  Charley Wang  <chwang@redhat.com>
+
+	* src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchConfigurationDelegate.java: Change cancellation language/checks
+	* src/org/eclipse/linuxtools/callgraph/launch/LaunchStapGraph.java: Add tid to marker functions
+
 2009-12-22  Charley Wang  <chwang@redhat.com>
 
 	* src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchConfigurationDelegate.java: Only display error popup if there is something to say -- use isErrorRecognized instead of message length.
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/LaunchStapGraph.java b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/LaunchStapGraph.java
index ddcc982..b70ea4b 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/LaunchStapGraph.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/LaunchStapGraph.java
@@ -111,7 +111,7 @@
 	 * @return
 	 */
 	private String generateProbe(String function) {
-		String output = "probe process(@1).function(\"" + function + "\").call ? {	if ( ! isinstr(probefunc(), \"___STAP_MARKER___\")) { callFunction(probefunc(),tid()) } 	}	probe process(@1).function(\"" + function + "\").return ? {		if ( ! isinstr(probefunc(), \"___STAP_MARKER___\")) returnFunction(probefunc(),tid())	else { printf(\"?%s\\n\", user_string(strtol(tokenize($$return, \"return=\"),16)))}}\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		String output = "probe process(@1).function(\"" + function + "\").call ? {	if ( ! isinstr(probefunc(), \"___STAP_MARKER___\")) { callFunction(probefunc(),tid()) } 	}	probe process(@1).function(\"" + function + "\").return ? {		if ( ! isinstr(probefunc(), \"___STAP_MARKER___\")) returnFunction(probefunc(),tid())	else { printf(\"?%d,,%s\\n\", tid(), user_string(strtol(tokenize($$return, \"return=\"),16)))}}\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		return output;
 	}
 	
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchConfigurationDelegate.java b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchConfigurationDelegate.java
index e636384..7eaddc6 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchConfigurationDelegate.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchConfigurationDelegate.java
@@ -173,10 +173,14 @@
 
 		// check for cancellation
 		if ( !testOutput(outputPath) || monitor.isCanceled() ) {
+			SystemTapUIErrorMessages mess = new SystemTapUIErrorMessages(Messages.getString("SystemTapLaunchConfigurationDelegate.0"),  //$NON-NLS-1$
+					Messages.getString("SystemTapLaunchConfigurationDelegate.1"), Messages.getString("SystemTapLaunchConfigurationDelegate.2") + outputPath +  //$NON-NLS-1$ //$NON-NLS-2$
+					Messages.getString("SystemTapLaunchConfigurationDelegate.3")); //$NON-NLS-1$
+			mess.schedule();
 			return;
 		}
 
-		finishLaunch(launch, config, partialCommand, m, true);
+		finishLaunch(launch, config, m, true);
 	}
 
 	
@@ -192,7 +196,7 @@
 	}
 	
 
-	private void finishLaunch(ILaunch launch, ILaunchConfiguration config, String options,
+	private void finishLaunch(ILaunch launch, ILaunchConfiguration config, 
 			IProgressMonitor monitor, boolean retry) {
 
 		try {
@@ -259,7 +263,7 @@
 			
 			while (!process.isTerminated()) {
 				Thread.sleep(100);
-				if ((monitor != null && monitor.isCanceled()) || parser.isJobCancelled()) {
+				if ((monitor != null && monitor.isCanceled()) || parser.isDone()) {
 					parser.cancelJob();
 					process.terminate();
 					return;
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchShortcut.java b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchShortcut.java
index 2c2b53f..77bef9a 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchShortcut.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchShortcut.java
@@ -146,8 +146,7 @@
 	 */
 	public void initialize() {
 		name = ""; //$NON-NLS-1$
-		dirPath = ResourcesPlugin.getWorkspace().getRoot().getLocation()
-				.toString();
+		dirPath = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString();
 		binaryPath = LaunchConfigurationConstants.DEFAULT_BINARY_PATH;
 		arguments = LaunchConfigurationConstants.DEFAULT_ARGUMENTS;
 		outputPath = PluginConstants.getDefaultIOPath();
@@ -246,27 +245,18 @@
 				e1.printStackTrace();
 			}
 
-			wc.setAttribute(LaunchConfigurationConstants.SCRIPT_PATH,
-					scriptPath);
+			wc.setAttribute(LaunchConfigurationConstants.SCRIPT_PATH,scriptPath);
 
 			if (!invalid(binaryPath))
-				wc.setAttribute(LaunchConfigurationConstants.BINARY_PATH,
-						binaryPath);
+				wc.setAttribute(LaunchConfigurationConstants.BINARY_PATH,binaryPath);
 
-			wc.setAttribute(LaunchConfigurationConstants.OUTPUT_PATH,
-					outputPath);
+			wc.setAttribute(LaunchConfigurationConstants.OUTPUT_PATH,outputPath);
 			wc.setAttribute(LaunchConfigurationConstants.ARGUMENTS, arguments);
-			wc.setAttribute(LaunchConfigurationConstants.GENERATED_SCRIPT,
-					generatedScript);
-			wc.setAttribute(LaunchConfigurationConstants.NEED_TO_GENERATE,
-					needToGenerate);
+			wc.setAttribute(LaunchConfigurationConstants.GENERATED_SCRIPT,generatedScript);
+			wc.setAttribute(LaunchConfigurationConstants.NEED_TO_GENERATE,needToGenerate);
 			wc.setAttribute(LaunchConfigurationConstants.OVERWRITE, overwrite);
-			wc
-					.setAttribute(LaunchConfigurationConstants.USE_COLOUR,
-							useColours);
-			wc
-					.setAttribute(LaunchConfigurationConstants.PARSER_CLASS,
-							parserID);
+			wc.setAttribute(LaunchConfigurationConstants.USE_COLOUR,useColours);
+			wc.setAttribute(LaunchConfigurationConstants.PARSER_CLASS,parserID);
 			wc.setAttribute(LaunchConfigurationConstants.VIEW_CLASS, viewID);
 			wc.setAttribute(LaunchConfigurationConstants.SECONDARY_VIEW_ID, setSecondaryViewID());
 
@@ -445,18 +435,10 @@
 								.generateUniqueLaunchConfigurationNameFrom(
 										name + " - " + bin.getElementName())); //$NON-NLS-1$
 
-				wc.setAttribute(
-						ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME,
-						projectName);
-				wc.setAttribute(
-						ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, bin
-								.getCProject().getElementName());
-				wc.setMappedResources(new IResource[] { bin.getResource(),
-						bin.getResource().getProject() });
-				wc
-						.setAttribute(
-								ICDTLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY,
-								(String) null);
+				wc.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME,projectName);
+				wc.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, bin.getCProject().getElementName());
+				wc.setMappedResources(new IResource[] { bin.getResource(),bin.getResource().getProject() });
+				wc.setAttribute(ICDTLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY,(String) null);
 
 				setDefaultProfileAttributes(wc);
 
@@ -916,8 +898,6 @@
 		return PluginConstants.DEFAULT_PARSER_ID; 
 	}
 
-
-
 	public String getScript() {
 		return generatedScript;
 	}
@@ -988,7 +968,6 @@
 		
 	}
 	
-	
 
 	/**
 	 * Each launch class should define its own script path. Must return the
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/messages.properties b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/messages.properties
index 8892805..17855f2 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/messages.properties
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/messages.properties
@@ -20,6 +20,10 @@
 LaunchWizard.Func=Function
 LaunchWizard.Launch=Launch
 LaunchWizard.Script=Script: 
+SystemTapLaunchConfigurationDelegate.0=NoOutput
+SystemTapLaunchConfigurationDelegate.1=Output file broken
+SystemTapLaunchConfigurationDelegate.2=Output file 
+SystemTapLaunchConfigurationDelegate.3=\ threw an IOException
 SystemTapLaunchConfigurationDelegate.NoCommand=SystemTapLaunchConfigurationDelegate does not have a command yet
 SystemTapLaunchConfigurationDelegate.CallGraphGenericError=CallGraph Error
 SystemTapLaunchConfigurationDelegate.DocWriterName=DocWriter, Delegate
diff --git a/systemtap/org.eclipse.linuxtools.callgraph/ChangeLog b/systemtap/org.eclipse.linuxtools.callgraph/ChangeLog
index e16e99b..3e9e205 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph/ChangeLog
+++ b/systemtap/org.eclipse.linuxtools.callgraph/ChangeLog
@@ -1,3 +1,60 @@
+2010-02-23  Charley Wang  <chwang@redhat.com>
+
+	* src/org/eclipse/linuxtools/callgraph/StapGraphParser.java: Fix markers to work with threads
+
+2010-02-01  Charley Wang  <chwang@redhat.com>
+
+	* src/org/eclipse/linuxtools/callgraph/graphlisteners/StapGraphMouseListener.java: ctrl+double-click go to actual function instead of its parent. Very confusing otherwise.
+
+2010-01-28  Roland Grunberg  <rgrunber@redhat.com>
+
+	* src/org/eclipse/linuxtools/callgraph/CallgraphView.java : Clean up unnecessary code.
+
+2010-01-26  Charley Wang  <chwang@redhat.com>
+
+	* src/org/eclipse/linuxtools/callgraph/CallgraphView.java: Fix miscounting caused by lack of proper escape clause.
+
+2010-01-22  Charley Wang  <chwang@redhat.com>
+
+	* src/org/eclipse/linuxtools/callgraph/StapGraph.java: removed extra loadData function that is never used.
+	* src/org/eclipse/linuxtools/callgraph/CallgraphView.java: Fix miscounting in non-dot-file-node
+
+2010-01-22  Roland Grunberg  <rgrunber@redhat.com>
+
+	* src/org/eclipse/linuxtools/callgraph/CallgraphView.java:
+		(createPartControl): Prepare for removal of Error Log window functionality.
+
+2010-01-18  Charley Wang  <chwang@redhat.com>
+
+	* src/org/eclipse/linuxtools/callgraph/StapGraph.java: Add addCalled method, which increments the timesCalled variable on stapData corresponding to the input id.
+	Change bounds on radius in radial view.
+	* src/org/eclipse/linuxtools/callgraph/StapGraphParser.java: Add multiple identical entries to neighbourMap for collapsed nodes (dot-file)
+	Proper error catching for number parsing failures.
+	* src/org/eclipse/linuxtools/callgraph/CallgraphView.java: Properly attach dot-file nodes with id < 0
+	Properly account for collapsed nodes (dot-file)
+	Cleanup of TODO's
+
+2010-01-14  Charley Wang  <chwang@redhat.com>
+
+	* src/org/eclipse/linuxtools/callgraph/CallgraphView.java: Remove extraneous println
+
+2010-01-13  Charley Wang  <chwang@redhat.com>
+
+	* src/org/eclipse/linuxtools/callgraph/StapGraphParser.java: Add function parseDotFile() -- all calls to this function assumes non-real-time.
+	* src/org/eclipse/linuxtools/callgraph/CallgraphView.java: Add capacity for parsing .dot files generated by the program
+
+2009-12-24  rgrunber  <rgrunber@redhat.com>
+
+	* src/org/eclipse/linuxtools/callgraph/CallgraphView.java 
+		(setGraphOptions): Add save_text so it is disabled when context does not require it. 
+	* src/org/eclipse/linuxtools/callgraph/messages.properties:
+		Give relevant names to save_text externalized Strings.
+
+2009-12-23  Charley Wang  <chwang@redhat.com>
+
+	* src/org/eclipse/linuxtools/callgraph/StapGraph.java: Properly align nodes in radial mode. No more annoying 'just-off-center'ness!!
+	Remove System.out.println hooks.
+
 2009-12-21  Charley Wang  <chwang@redhat.com>
 
 	* src/org/eclipse/linuxtools/callgraph/StapGraph.java: Gentle code cleaning
diff --git a/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/callgraph/CallgraphView.java b/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/callgraph/CallgraphView.java
index 161c8d7..2b48a76 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/callgraph/CallgraphView.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/callgraph/CallgraphView.java
@@ -202,6 +202,7 @@
 		 *                Load graph data
 		 */
 	    for (int id_parent : parser.serialMap.keySet()) {
+	    	if (id_parent < 0) continue;
 	    	boolean marked = false;
 	    	String msg = ""; //$NON-NLS-1$
 	    	if (g.getNodeData(id_parent) == null) {
@@ -218,8 +219,14 @@
 		    	if (outNeighbours == null || outNeighbours.get(id_parent) == null)
 		    		continue;
 				for (int id_child : outNeighbours.get(id_parent)) {
-					if (g.getNodeData(id_child) != null)
+					if (g.getNodeData(id_child) != null && id_child < 0) {
+						//Assume this is an additional call of the same node
+						//Should only happen in dot-files!!
+						g.addCalled(id_child);
 						continue;
+					} else if (g.getNodeData(id_child) != null) {
+						continue;
+					}
 					if (monitor.isCanceled()) {
 						return Status.CANCEL_STATUS;
 					}
@@ -334,6 +341,8 @@
 		save_dot.setEnabled(visible);
 		save_col_dot.setEnabled(visible);
 		save_cur_dot.setEnabled(visible);
+		save_text.setEnabled(visible);
+		
 		view_treeview.setEnabled(visible);
 		view_radialview.setEnabled(visible);
 		view_aggregateview.setEnabled(visible);
@@ -427,27 +436,26 @@
 		// ADD OPTIONS TO THE GRAPH MENU
 		addFileMenu();
 
-		//TODO I AM HERE
-		save_cur_dot = new Action(Messages.getString("CallgraphView.0")) { //$NON-NLS-1$
+		save_cur_dot = new Action(Messages.getString("CallgraphView.SaveViewAsDot")) { //$NON-NLS-1$
 			public void run(){
 				writeToDot(g.getCollapseMode(), g.nodeMap.keySet());
 			}
 
 		};
-		save_dot = new Action(Messages.getString("CallgraphView.1")) { //$NON-NLS-1$
+		save_dot = new Action(Messages.getString("CallgraphView.SaveAllUncollapsedAsDot")) { //$NON-NLS-1$
             public void run(){
               writeToDot(false, g.nodeDataMap.keySet());
             }
 		};
 		
-		save_col_dot = new Action (Messages.getString("CallgraphView.2")) { //$NON-NLS-1$
+		save_col_dot = new Action (Messages.getString("CallgraphView.SaveAllCollapsedAsDot")) { //$NON-NLS-1$
 		     public void run(){
 	                writeToDot(true, g.nodeDataMap.keySet());
 	            }
 			
 		};
 		
-		save_text = new Action (Messages.getString("CallgraphView.3")) { //$NON-NLS-1$
+		save_text = new Action (Messages.getString("CallgraphView.SaveCollapsedAsASCII")) { //$NON-NLS-1$
 			public void run() {
 				//Prints an 80 char table
 		        Shell sh = new Shell();
@@ -497,7 +505,7 @@
 		        }
 			}
 		};
-		saveMenu = new MenuManager(Messages.getString("CallgraphView.4")); //$NON-NLS-1$
+		saveMenu = new MenuManager(Messages.getString("CallgraphView.SaveMenu")); //$NON-NLS-1$
 		file.add(saveMenu);
 		saveMenu.add(save_cur_dot);
 		saveMenu.add(save_col_dot);
@@ -509,7 +517,6 @@
 		gotoMenu = new MenuManager(Messages.getString("CallgraphView.GoTo")); //$NON-NLS-1$
 		menu.add(view);
 		menu.add(gotoMenu);
-		addErrorMenu();
 		addHelpMenu();
 		
 		view.add(view_treeview);
diff --git a/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/callgraph/StapGraph.java b/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/callgraph/StapGraph.java
index a2f7a3a..5fa2ac7 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/callgraph/StapGraph.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/callgraph/StapGraph.java
@@ -284,46 +284,7 @@
 			idOfLastNode = id;
 		return id;
 	}
-
-	/**
-	 * Create a new StapData object with the given parameters. If the id is larger
-	 * than the current idOfLastNode, then idOfLastNode is set to id.
-	 * 
-	 * @param style
-	 * @param id
-	 * @param txt
-	 * @param time
-	 * @param called
-	 * @param caller
-	 * @return
-	 */
-	public int loadData(int style, int id, String txt, long time, int called,
-			int caller, boolean isMarked) {
-		//-------------Invalid function catching
-		// Catches some random C/C++ directive functions
-		if (id < 10 && killInvalidFunctions) {
-			if (txt.contains(")")) { //$NON-NLS-1$
-				return -1;
-			} else if (txt.contains(".")) { //$NON-NLS-1$
-				return -1;
-			} else if (txt.contains("\"")) { //$NON-NLS-1$
-				return -1;
-			}
-		} 
 		
-		//-------------Add node to appropriate map/list
-		StapData n = new StapData(this, style, txt, time, called, 
-				id, caller, isMarked);
-		if (isMarked)
-			markedNodes.add(id);
-		nodeDataMap.put(id, n);
-
-		// Make no assumptions about the order that data is input
-		if (id > idOfLastNode)
-			idOfLastNode = id;
-		return id;
-	}
-	
 	public void insertMessage(int id, String message) {
 		StapData temp = nodeDataMap.get(id);
 		if (temp == null) return;
@@ -344,9 +305,10 @@
 	 * @param centerNode
 	 */
 	public void drawRadial(int centerNode) {
-		int radius = Math.min(this.getBounds().width,
+		int radius = Math.max(CONSTANT_VERTICAL_INCREMENT,
+				Math.min(this.getBounds().width,
 				this.getBounds().height)
-				/ 2 - CONSTANT_VERTICAL_INCREMENT;
+				/ 2 - 2*CONSTANT_VERTICAL_INCREMENT);
 
 		rootVisibleNodeNumber = centerNode;
 		StapData nodeData = getNodeData(centerNode);
@@ -365,7 +327,7 @@
 		// Draw node in center
 		StapNode n = nodeMap.get(centerNode);
 		int x = this.getBounds().width / 2 - n.getSize().width/2;
-		int y = this.getBounds().height / 2 - n.getSize().height;
+		int y = this.getBounds().height / 2;
 		n.setLocation(x, y);
 		
 		if (getNodeData(centerNode).isMarked())
@@ -460,12 +422,12 @@
 			}
 			
 			StapNode subN = nodeMap.get(subID);
+			
 			if (radius != 0) {
-				yOffset = (int) (radius * Math.cos(angle * i));
-				xOffset = (int) (radius * Math.sin(angle * i) + StapNode.getNodeSize()*Math.sin(angle*i)*3);
+				yOffset = (int) (radius * Math.cos((float) angle * i));
+				xOffset = (int) (radius * Math.sin((float) angle * i)) - subN.getSize().width/2 + getNode(id).getSize().width/2;
 			}
 
-
 			if (hasChildren(subID))
 				subN.setBackgroundColor(CONSTANT_HAS_CHILDREN);
 			subN.setLocation(x + xOffset, y + yOffset);
@@ -2010,4 +1972,10 @@
 	public boolean getCollapseMode() {
 		return collapse_mode;
 	}
+
+
+
+	public void addCalled(int idChild) {
+		getNodeData(idChild).timesCalled++;
+	}
 }
diff --git a/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/callgraph/StapGraphParser.java b/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/callgraph/StapGraphParser.java
index 02b502e..96912bd 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/callgraph/StapGraphParser.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/callgraph/StapGraphParser.java
@@ -41,7 +41,6 @@
 	
 	public  HashMap<Integer, Long> timeMap;
 	public  TreeMap<Integer, String> serialMap;
-//	public  HashMap<Integer, ArrayList<Integer>> outNeighbours;
 	public  HashMap<Integer, HashMap<Integer, ArrayList<Integer>>> neighbourMaps;
 	public  HashMap<String, Long> aggregateTimeMap;
 	public  HashMap<String, Integer> countMap;
@@ -51,7 +50,6 @@
 	public int validator;
 	public Long endingTimeInNS;
 	public long totalTime;
-//	public int lastFunctionCalled;
 	public  HashMap<Integer, Integer> lastFunctionMap;
 	public ICProject project;
 	private static final String DELIM = ",,"; //$NON-NLS-1$
@@ -59,8 +57,6 @@
 	private boolean encounteredMain = false;
 	private ArrayList<Integer> shouldGetEndingTimeForID = new ArrayList <Integer>();
 	
-//	private ArrayList<String> nameList = new ArrayList<String>();
-//	private ArrayList<Integer> idList = new ArrayList<Integer>();
 	private  HashMap<Integer, ArrayList<String>> nameMaps;
 	private  HashMap<Integer, ArrayList<Integer>> idMaps;
 	private boolean skippedDirectives = false; 			
@@ -87,7 +83,7 @@
 		project = null;
 		startTime = -1;
 	}
-
+	
 	
 	public IStatus nonRealTimeParsing(){
 		//Clear maps (in case a previous execution left values hanging)
@@ -184,16 +180,18 @@
 		/*
 		 * Append message
 		 */
-		for (int key : idMaps.keySet()) {
-			ArrayList<Integer> idList = idMaps.get(key);
-			if (msg.length() < 1 || idList.size() < 1)
-				continue;
-			int id = idList.get(idList.size() -1);
-			if (msg.equals("<unknown>")) { //$NON-NLS-1$
-				msg = msg + Messages.getString("StapGraphParser.UnknownMarkers"); //$NON-NLS-1$
-			}
-			markedMap.put(id, (markedMap.get(id) == null ? "" : markedMap.get(id)) + msg); //$NON-NLS-1$
-			}
+		String[] parsed = msg.split(",,", 2);
+		
+		int key = Integer.parseInt(parsed[0]);
+		
+		ArrayList<Integer> idList = idMaps.get(key);
+		if (idList == null || msg.length() < 1 || idList.size() < 1)
+			return;
+		int id = idList.get(idList.size() -1);
+		if (parsed[1].equals("<unknown>")) { //$NON-NLS-1$
+			parsed[1] = parsed[1] + Messages.getString("StapGraphParser.UnknownMarkers"); //$NON-NLS-1$
+		}
+		markedMap.put(id, (markedMap.get(id) == null ? "" : markedMap.get(id)) + parsed[1]); //$NON-NLS-1$
 	}
 	
 	private IStatus parse(String s) {
@@ -385,7 +383,114 @@
 		}
 		return Status.OK_STATUS;
 	}
+
 	
+	private IStatus parseDotFile() {
+		if (!(internalData instanceof BufferedReader))
+			return Status.CANCEL_STATUS;
+
+		BufferedReader buff = (BufferedReader) internalData;
+		
+		HashMap <Integer, ArrayList<Integer>> outNeighbours= new HashMap<Integer, ArrayList<Integer>>();
+		ArrayList<String> nameList = new ArrayList<String>();
+		ArrayList<Integer> idList = new ArrayList<Integer>();
+		endingTimeInNS =0l;
+		totalTime=10000l;
+		try {
+			String line;
+			while ((line = buff.readLine()) != null) {
+				if (line.equals("}")) //$NON-NLS-1$
+					break;
+				if (monitor.isCanceled())
+					return Status.CANCEL_STATUS;
+				if (line.length() < 1)
+					continue;
+				
+				String[] args = new String[2];
+				args = line.split(" ", 2); //$NON-NLS-1$
+				if (args[0].contains("->")) { //$NON-NLS-1$
+					//connection
+					int[] ids = new int[2];
+					int called = 1;
+					try {
+						ids[0] = Integer.parseInt(args[0].split("->")[0]); //$NON-NLS-1$
+						ids[1] = Integer.parseInt(args[0].split("->")[1]); //$NON-NLS-1$
+						int index1 = args[1].indexOf("=\""); //$NON-NLS-1$
+						int index2 = args[1].indexOf("\"]"); //$NON-NLS-1$
+						called = Integer.parseInt(args[1].substring(index1 + 2,index2));
+					} catch (NumberFormatException e) {
+						SystemTapUIErrorMessages m = new SystemTapUIErrorMessages(
+								Messages.getString("StapGraphParser.idOrLabel"), Messages.getString("StapGraphParser.idOrLabel"),  //$NON-NLS-1$ //$NON-NLS-2$ 
+								Messages.getString("StapGraphParser.nonNumericLabel")); //$NON-NLS-1$
+						m.schedule();
+						return Status.CANCEL_STATUS;
+					}
+					
+					//Set neighbour
+					ArrayList<Integer> tmpList = outNeighbours.get(ids[0]);
+					if (tmpList == null)
+						tmpList = new ArrayList<Integer>();
+					
+					for (int i = 0; i < called; i++)
+						tmpList.add(ids[1]);
+					
+					outNeighbours.put(ids[0], tmpList);
+				} else {
+					//node
+					try {
+						int id = Integer.parseInt(args[0]);
+						if (firstNode == -1) {
+							firstNode = id;
+						}
+						int index = args[1].indexOf("=\""); //$NON-NLS-1$
+						String name = args[1].substring(index + 2, args[1].indexOf(" ", index)); //$NON-NLS-1$
+						double dtime = 0.0;
+						dtime = Double.parseDouble(args[1].substring(args[1].indexOf(" ") + 1, args[1].indexOf("%"))); //$NON-NLS-1$ //$NON-NLS-2$
+						long time = (long) (dtime*100); 
+	
+						nameList.add(name);
+						idList.add(id);
+						timeMap.put(id, time);
+						serialMap.put(id, name);
+						if (countMap.get(name) == null){
+							countMap.put(name, 0);
+						}
+						countMap.put(name, countMap.get(name) + 1);
+						
+						long cumulativeTime = (aggregateTimeMap.get(name) != null ? aggregateTimeMap.get(name) : 0) + time;
+						aggregateTimeMap.put(name, cumulativeTime);
+					} catch (NumberFormatException e) {
+						SystemTapUIErrorMessages m = new SystemTapUIErrorMessages(
+								Messages.getString("StapGraphParser.idOrTime"), Messages.getString("StapGraphParser.idOrTime"),  //$NON-NLS-1$ //$NON-NLS-2$
+						Messages.getString("StapGraphParser.nonNumericTime")); //$NON-NLS-1$
+						m.schedule();
+						return Status.CANCEL_STATUS;
+					}
+					
+				}
+				
+				
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+		} finally {
+			try {
+				buff.close();
+			} catch (IOException e) {
+				//Do nothing
+			}
+		}
+		neighbourMaps.put(0, outNeighbours);
+		nameMaps.put(0, nameList);
+		idMaps.put(0, idList);
+		try {
+			view.update();
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+
+		return Status.OK_STATUS;
+	}
 
 	@Override
 	public IStatus realTimeParsing() {
@@ -396,12 +501,17 @@
 
 		String line;
 		boolean draw = false;
+		boolean first = true;
 		try {
 			while ((line = buff.readLine()) != null) {
 				if (monitor.isCanceled())
 					return Status.CANCEL_STATUS;
 				if (line.length() < 1)
 					continue;
+				if (first && (line.contains(Messages.getString("StapGraphParser.17")))) { //$NON-NLS-1$
+					return parseDotFile();
+				}
+				first = false;
 				
 				draw = true; 
 				if (line.equals("PROBE_BEGIN")) { //$NON-NLS-1$
@@ -455,4 +565,5 @@
 				+ Messages.getString("StapGraphParser.TimeUnits")); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
+
 }
diff --git a/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/callgraph/graphlisteners/StapGraphMouseListener.java b/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/callgraph/graphlisteners/StapGraphMouseListener.java
index 9824f64..0530f51 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/callgraph/graphlisteners/StapGraphMouseListener.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/callgraph/graphlisteners/StapGraphMouseListener.java
@@ -187,7 +187,7 @@
 			if (node == null)
 				return null;
 
-			int caller = node.getData().parent;
+			int caller = node.getData().id;
 
 			if (caller < graph.getFirstUsefulNode()) {
 				// The only node that satisfies this condition should be
diff --git a/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/callgraph/messages.properties b/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/callgraph/messages.properties
index 620acb3..9ce8804 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/callgraph/messages.properties
+++ b/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/callgraph/messages.properties
@@ -12,6 +12,7 @@
 StapGraph.NumOfCalls=number of calls : 
 StapGraph.Func=function : 
 StapGraph.Time=time : 
+StapGraphParser.17=digraph stapgraph {
 StapGraphParser.RetMismatch=Encountered return without matching call for function 
 StapGraphParser.NoStartTime=No start time could be found for function 
 StapGraphParser.Term=:::Program terminated here
@@ -24,14 +25,18 @@
 StapGraphParser.ActualTime=\nActual time: 
 StapGraphParser.CouldNotOpen=Could not open file 
 StapGraphParser.FileNotFound=File not found
+StapGraphParser.idOrLabel=dot-file-id-or-label
+StapGraphParser.idOrTime=dot-file-id-or-time
+StapGraphParser.nonNumericLabel=Non-numeric symbol while parsing id or label for .dot file
+StapGraphParser.nonNumericTime=Non-numeric symbol while parsing id or time for .dot file
 StapGraphParser.TimeUnits=ms
 StapGraphParser.UnknownMarkers=\ -- User-space may have been paged out before stap could find it. Please try again. 
 StapNode.0=unnamed
-CallgraphView.0=Save current view as .dot file
-CallgraphView.1=Save all uncollapsed as .dot file
-CallgraphView.2=Save all collapsed as .dot file
-CallgraphView.3=Save collapsed as ASCII
-CallgraphView.4=Save As
+CallgraphView.SaveViewAsDot=Save current view as .dot file
+CallgraphView.SaveAllUncollapsedAsDot=Save all uncollapsed as .dot file
+CallgraphView.SaveAllCollapsedAsDot=Save all collapsed as .dot file
+CallgraphView.SaveCollapsedAsASCII=Save collapsed as ASCII
+CallgraphView.SaveMenu=Save As
 CallgraphView.Play=Play (D)
 CallgraphView.ViewMenu=View
 CallgraphView.OpenLastRun=Open Last Run
diff --git a/systemtap/org.eclipse.linuxtools.systemtap-feature/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap-feature/ChangeLog
index ccfd32a..57110e2 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap-feature/ChangeLog
+++ b/systemtap/org.eclipse.linuxtools.systemtap-feature/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-08  Andrew Overholt  <overholt@redhat.com>
+
+	* feature.properties: Capitalize feature name.
+
+2010-01-29  Anithra P Janakiraman  <anithra@linux.vnet.ibm.com>
+
+	* feature.xml: Add new dashboard plugins for SystemTap
+
 2009-08-06  Andrew Overholt  <overholt@redhat.com>
 
 	* feature.properties: Remove trailing period.
diff --git a/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.properties b/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.properties
index d33e0ae..6498b07 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.properties
+++ b/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.properties
@@ -7,7 +7,7 @@
 #
 #********************************************************************************
 featureName=systemtapgui
-description=SystemTap IDE and visualization tool (Incubation)
+description=SystemTap IDE and Visualization Tools (Incubation)
 featureProvider=Eclipse
 copyright=\
 Copyright (c) 2009 IBM Corporation. All rights reserved.\n\
diff --git a/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.xml b/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.xml
index 77f38a8..6fc143a 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.xml
@@ -84,4 +84,25 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.linuxtools.systemtap.ui.dashboard"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.systemtap.ui.dashboardextension"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.systemtap.ui.graphicalrun"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.backup.ui.editor/src/org/eclipse/linuxtools/systemtap/backup/ui/editor/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.backup.ui.editor/src/org/eclipse/linuxtools/systemtap/backup/ui/editor/ChangeLog
index 59d9abd..8a8baf6 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.backup.ui.editor/src/org/eclipse/linuxtools/systemtap/backup/ui/editor/ChangeLog
+++ b/systemtap/org.eclipse.linuxtools.systemtap.backup.ui.editor/src/org/eclipse/linuxtools/systemtap/backup/ui/editor/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-29  Anithra P Janakiraman  <anithra@linux.vnet.ibm.com>
+
+	* src/org/eclipse/linuxtools/systemtap/backup/ui/editor/STPMetadataSingleton.java (parse): 
+
 2009-07-07  Anithra P Janakiraman  <anithra@linux.vnet.ibm.com>
 
 	* src/org/eclipse/linuxtools/systemtap/backup/ui/editor/ColorManager.java: New file.
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.backup.ui.editor/src/org/eclipse/linuxtools/systemtap/backup/ui/editor/STPMetadataSingleton.java b/systemtap/org.eclipse.linuxtools.systemtap.backup.ui.editor/src/org/eclipse/linuxtools/systemtap/backup/ui/editor/STPMetadataSingleton.java
index fd57195..ac03bd9 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.backup.ui.editor/src/org/eclipse/linuxtools/systemtap/backup/ui/editor/STPMetadataSingleton.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.backup.ui.editor/src/org/eclipse/linuxtools/systemtap/backup/ui/editor/STPMetadataSingleton.java
@@ -288,8 +288,8 @@
 		System.out.println(System.getProperty("user.pwd"));
 
 		System.out.println(System.getProperties());
-		System.out.println(bundle.containsKey("syscall"));
-		System.out.println(bundle.containsKey("syscall."));
+	//	System.out.println(bundle.containsKey("syscall"));
+	//	System.out.println(bundle.containsKey("syscall."));
 		System.out.println(bundle.getKeys());
 	}
 
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/ChangeLog
index 360812d..5c3b411 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/ChangeLog
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/ChangeLog
@@ -1,3 +1,43 @@
+2010-03-11  Anithra P Janakiraman  <anithra@linux.vnet.ibm.com>
+
+	* src/org/eclipse/linuxtools/systemtap/ui/consolelog/actions/ConsoleAction.java (buildEnablementChecks): Fix for BZ #304208
+
+2010-02-11  Roland Grunberg  <rgrunber@redhat.com>
+
+	* src/org/eclipse/linuxtools/systemtap/ui/consolelog/actions/ConsoleAction.java: Fix for BZ #293207
+	* src/org/eclipse/linuxtools/systemtap/ui/consolelog/actions/StopScriptAction.java: Fix for BZ #293207
+	* src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ScriptConsole.java: Fix for BZ #293207
+	
+		Consoles within ConsoleManger are only guaranteed to implement IConsole, so to cast to
+		ScriptConsole requires a check first.
+
+2010-02-04  Anithra P Janakiraman  <anithra@linux.vnet.ibm.com>
+
+	* META-INF/MANIFEST.MF: removed version dependency for org.eclipse.ui bundle
+
+2010-01-29  Anithra P Janakiraman  <anithra@linux.vnet.ibm.com>
+
+	* src/org/eclipse/linuxtools/systemtap/ui/consolelog/LoggedCommand2.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/consolelog/ScpExec.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ScriptConsole2.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/consolelog/actions/ConsoleAction.java (selectionChanged): 
+	(.propertyChanged): 
+	(isRunning): 
+	(dispose): 
+	(getActive): 
+	(buildEnablementChecks): 
+	* src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SelectServerDialog.java (.widgetSelected): 
+	(open): 
+	* src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ScriptConsole.java (run): 
+	(ScriptConsole): 
+	(createErrorDaemon): 
+	(createConsoleDaemon): 
+	(saveStream): 
+	(isRunning): 
+	(dispose): 
+	(stop): 
+	(getCommand): 
+
 2009-11-16  Andrew Overholt  <overholt@redhat.com>
 
 	* META-INF/MANIFEST.MF: Fix Bundle-Name.
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/META-INF/MANIFEST.MF
index 2ed83df..fd32e5d 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/META-INF/MANIFEST.MF
@@ -22,3 +22,4 @@
  com.jcraft.jsch;bundle-version="0.1.37"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Import-Package: org.eclipse.linuxtools.systemtap.ui.editor
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/actions/ConsoleAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/actions/ConsoleAction.java
index 0cbeb7d..3132c62 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/actions/ConsoleAction.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/actions/ConsoleAction.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse
+ *     Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P j
+ *     Roland Grunberg
  *******************************************************************************/
 
 package org.eclipse.linuxtools.systemtap.ui.consolelog.actions;
@@ -18,12 +18,13 @@
 import org.eclipse.ui.IPropertyListener;
 import org.eclipse.ui.IViewActionDelegate;
 import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.IWorkbenchWindowActionDelegate;
 import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.console.IConsole;
 import org.eclipse.ui.console.IConsoleConstants;
-import org.eclipse.ui.console.IConsoleView;
-
+import org.eclipse.ui.internal.console.ConsoleView;
 
 
 
@@ -32,6 +33,7 @@
  * action that makes use of the Console.
  * @author Ryan Morse
  */
+@SuppressWarnings("restriction")
 public abstract class ConsoleAction extends Action implements IWorkbenchWindowActionDelegate, IViewActionDelegate {
 	public void init(IWorkbenchWindow window) {}
 	
@@ -49,15 +51,20 @@
 	 * @return The active <code>ScriptConsole<code> in the ConsoleView
 	 */
 	protected ScriptConsole getActive() {
-		IConsoleView ivp = (IConsoleView)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(IConsoleConstants.ID_CONSOLE_VIEW);
-		return (ScriptConsole)ivp.getConsole();
+		IViewPart ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(IConsoleConstants.ID_CONSOLE_VIEW);
+		IConsole activeConsole = ((ConsoleView)ivp).getConsole();
+		if (activeConsole instanceof ScriptConsole){
+			return (ScriptConsole)activeConsole;
+		}else{
+			return null;
+		}
 	}
 	
 	/**
 	 * Updates whether the action should be enabled when the user changes their ViewPart selection
 	 */
 	public void selectionChanged(IAction act, ISelection select) {
-		this.setAct(act);
+		this.act = act;
 		buildEnablementChecks();
 	}
 	
@@ -65,9 +72,10 @@
 	 * Builds the checks to see if the action should be enabled or not
 	 */
 	private void buildEnablementChecks() {
-		IViewPart ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(IConsoleConstants.ID_CONSOLE_VIEW);
-		if(null != ivp) {
-			setEnablement(isRunning((IConsoleView)ivp));
+		IWorkbenchPart wbp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getPartService().getActivePart();
+		if (wbp instanceof ConsoleView){
+			IViewPart ivp = (IViewPart) wbp;
+			setEnablement(isRunning((ConsoleView)ivp));
 			ivp.addPropertyListener(listener);
 		}
 	}
@@ -75,9 +83,13 @@
 	/**
 	 * Checks to see if the active console is still running
 	 */
-	private boolean isRunning(IConsoleView cv) {
-		ScriptConsole console = (ScriptConsole)cv.getConsole();
-		return (console != null && console.isRunning());
+	private boolean isRunning(ConsoleView cv) {
+		if (cv.getConsole() instanceof ScriptConsole){
+			ScriptConsole console = (ScriptConsole)cv.getConsole();
+			return (console != null && console.isRunning());
+		}else{
+			return false;
+		}
 	}
 	
 	/**
@@ -92,25 +104,17 @@
 	 * calling this.
 	 */
 	public void dispose() {
-		setAct(null);
+		act = null;
 		//Unable to findView when disposed is called, as a result null pointer exception is thrown
 		//PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(IConsoleConstants.ID_CONSOLE_VIEW).removePropertyListener(listener);
 		listener = null;
 	}
 	
-	public void setAct(IAction act) {
-		this.act = act;
-	}
-
-	public IAction getAct() {
-		return act;
-	}
-
 	private IAction act;
 	private IPropertyListener listener = new IPropertyListener() {
 		public void propertyChanged(Object o, int i) {
-			if(o instanceof IConsoleView)
-				setEnablement(isRunning((IConsoleView)o));
+			if(o instanceof ConsoleView)
+				setEnablement(isRunning((ConsoleView)o));
 		}
 	};
 }
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/actions/StopScriptAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/actions/StopScriptAction.java
index ed7ed07..8ce232d 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/actions/StopScriptAction.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/actions/StopScriptAction.java
@@ -49,11 +49,12 @@
 	 */
 	public void run(int i) {
 		IConsole ic[] = ConsolePlugin.getDefault().getConsoleManager().getConsoles();
-		ScriptConsole console = (ScriptConsole)ic[i];
-
-		if(console.isRunning())
-			console.stop();
-	
+		if (ic[i] instanceof ScriptConsole){
+			ScriptConsole console = (ScriptConsole)ic[i];
+			
+			if(console.isRunning())
+				console.stop();
+		}
 	}
 
 	/**
@@ -64,9 +65,11 @@
 		ScriptConsole console;
 		
 		for(int i=0; i<ic.length; i++) {
-			console = (ScriptConsole)ic[i];
-			if(console.isRunning())
-				console.stop();
+			if (ic[i] instanceof ScriptConsole){
+				console = (ScriptConsole)ic[i];
+				if(console.isRunning())
+					console.stop();
+			}
 		}
 	}
 	
@@ -79,9 +82,11 @@
 		ScriptConsole console;
 		
 		for(int i=0; i<ic.length; i++) {
-			console = (ScriptConsole)ic[i];
-			if(console.isRunning())
-				return true;
+			if (ic[i] instanceof ScriptConsole){
+				console = (ScriptConsole)ic[i];
+				if(console.isRunning())
+					return true;
+			}
 		}
 		return false;
 	}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SelectServerDialog.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SelectServerDialog.java
index 2cfbbeb..cd44ed8 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SelectServerDialog.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SelectServerDialog.java
@@ -18,7 +18,6 @@
 
 public class SelectServerDialog extends Dialog {
 	private Text hostText;
-	private Text portText;
 	private Text userText;
 	private Text passwordText;
 	private Button rememberButton;
@@ -58,21 +57,7 @@
 		hostText = new Text(shell, SWT.SINGLE | SWT.BORDER);
 		hostText.setLayoutData(data);
 		hostText.setText(ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.HOST_NAME));
-		
-		data = new GridData();
-		data.grabExcessHorizontalSpace = false;
-		data.horizontalAlignment = SWT.LEFT;
-		Label portLabel = new Label(shell, SWT.NONE);
-		portLabel.setText("Port: ");
-		portLabel.setLayoutData(data);
-		
-		data = new GridData();
-		data.grabExcessHorizontalSpace = true;
-		data.horizontalAlignment = SWT.FILL;
-		portText = new Text(shell, SWT.SINGLE | SWT.BORDER);
-		portText.setLayoutData(data);
-		portText.setText(ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.PORT_NUMBER));
-		
+			
 		data = new GridData();
 		data.grabExcessHorizontalSpace = false;
 		data.horizontalAlignment = SWT.LEFT;
@@ -142,7 +127,6 @@
 				// FIXME: no error handling is done, should probably be
 				// pushed down to the connection level
 				// Set the preferences to this new info.
-				ConsoleLogPlugin.getDefault().getPreferenceStore().setValue(ConsoleLogPreferenceConstants.PORT_NUMBER, portText.getText());
 				ConsoleLogPlugin.getDefault().getPreferenceStore().setValue(ConsoleLogPreferenceConstants.HOST_NAME, hostText.getText());
 				ConsoleLogPlugin.getDefault().getPreferenceStore().setValue(ConsoleLogPreferenceConstants.REMEMBER_SERVER, rememberButton.getSelection());
 				ConsoleLogPlugin.getDefault().getPreferenceStore().setValue(ConsoleLogPreferenceConstants.SCP_PASSWORD, passwordText.getText());
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ScriptConsole.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ScriptConsole.java
index 3f0e6f3..1b02e93 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ScriptConsole.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ScriptConsole.java
@@ -15,12 +15,12 @@
 
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.linuxtools.systemtap.ui.consolelog.Subscription;
 import org.eclipse.linuxtools.systemtap.ui.consolelog.actions.StopScriptAction;
 import org.eclipse.linuxtools.systemtap.ui.consolelog.internal.Localization;
 import org.eclipse.linuxtools.systemtap.ui.consolelog.views.ErrorView;
 import org.eclipse.linuxtools.systemtap.ui.structures.IPasswordPrompt;
-import org.eclipse.linuxtools.systemtap.ui.structures.runnable.LoggedCommand;
+import org.eclipse.linuxtools.systemtap.ui.consolelog.LoggedCommand2;
+import org.eclipse.linuxtools.systemtap.ui.consolelog.ScpExec;
 import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.console.ConsolePlugin;
@@ -56,14 +56,16 @@
 				StopScriptAction ssa = new StopScriptAction();
 				ssa.init(PlatformUI.getWorkbench().getActiveWorkbenchWindow());
 				for(int i=0; i<ic.length; i++) {
-					activeConsole = (ScriptConsole)ic[i];
-					if(activeConsole.getName().endsWith(name)) {
-						//Stop any script currently running
-						ssa.run(i);
-						//Remove output from last run
-						activeConsole.clearConsole();
-						activeConsole.setName(name);
-						console = activeConsole;
+					if (ic[i] instanceof ScriptConsole){
+						activeConsole = (ScriptConsole)ic[i];
+						if(activeConsole.getName().endsWith(name)) {
+							//Stop any script currently running
+							ssa.run(i);
+							//Remove output from last run
+							activeConsole.clearConsole();
+							activeConsole.setName(name);
+							console = activeConsole;
+						}
 					}
 				}
 			}
@@ -78,7 +80,7 @@
 		return console;
 	}
 	
-	public static ScriptConsole getInstance(String name,Subscription sub) {
+	/*public static ScriptConsole getInstance(String name) {
 		ScriptConsole console = null;
 		try {
 			IConsole ic[] = ConsolePlugin.getDefault().getConsoleManager().getConsoles();
@@ -89,15 +91,17 @@
 				StopScriptAction ssa = new StopScriptAction();
 				ssa.init(PlatformUI.getWorkbench().getActiveWorkbenchWindow());
 				for(int i=0; i<ic.length; i++) {
-					activeConsole = (ScriptConsole)ic[i];
-					if(activeConsole.getName().endsWith(name)) {
-						//Stop any script currently running
-						ssa.run(i);
-			
-						//Remove output from last run
-						activeConsole.clearConsole();
-						activeConsole.setName(name);
-						console = activeConsole;
+					if (ic[i] instanceof ScriptConsole) {
+						activeConsole = (ScriptConsole)ic[i];
+						if(activeConsole.getName().endsWith(name)) {
+							//Stop any script currently running
+							ssa.run(i);
+				
+							//Remove output from last run
+							activeConsole.clearConsole();
+							activeConsole.setName(name);
+							console = activeConsole;
+						}
 					}
 				}
 			}
@@ -110,17 +114,17 @@
 			console = null;
 		}
 		return console;
-	}
+	}*/
 	private ScriptConsole(String name, ImageDescriptor imageDescriptor) {
 		super(name, imageDescriptor);
 		cmd = null;
 	}
 	
-	private ScriptConsole(String name, ImageDescriptor imageDescriptor, Subscription sub) {
+	/*private ScriptConsole(String name, ImageDescriptor imageDescriptor, Subscription sub) {
 		super(name, imageDescriptor);
 		this.subscription = sub;
 		cmd = null;
-	}
+	}*/
 	
 	/**
 	 * Creates the <code>ConsoleStreamDaemon</code> for passing data from the 
@@ -140,8 +144,7 @@
 			IViewPart ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(ErrorView.ID);
 			if(null != ivp && ivp instanceof ErrorView)
 				errorView = ((ErrorView)ivp);
-		} catch(Exception e) {}
-
+		} catch(Exception e) {e.printStackTrace();}
 		errorDaemon = new ErrorStreamDaemon(this, errorView, parser);
 	}
 	
@@ -153,29 +156,36 @@
 	 * @param errorParser The parser to handle error messages generated by the command
 	 */
 	public void run(String[] command, String[] envVars, IPasswordPrompt prompt, IErrorParser errorParser) {
-		if(subscription.init())
-		{
+	//	if(subscription.init())
+	//	{
 		createConsoleDaemon();
+		if (errorParser != null)
 		createErrorDaemon(errorParser);
-		subscription.addErrorStreamListener(errorDaemon);
-		subscription.addInputStreamListener(consoleDaemon);
+	    cmd = new LoggedCommand2(command, envVars, prompt, 100,this.getName());
+        cmd.addErrorStreamListener(errorDaemon);
+        cmd.addInputStreamListener(consoleDaemon);
+        cmd.start();
+        activate();
+        ConsolePlugin.getDefault().getConsoleManager().showConsoleView(this);
+	//	subscription.addErrorStreamListener(errorDaemon);
+	//	subscription.addInputStreamListener(consoleDaemon);
 		
-		if (!subscription.isRunning())
-		{
-			subscription.start();
-		}
-		ConsolePlugin.getDefault().getConsoleManager().showConsoleView(this);
-		}
-		else
-		{
-			setName(Localization.getString("ScriptConsole.Terminated") + super.getName());
-			subscription.interrupt();
-			subscription.delSubscription();
-			ConsolePlugin.getDefault().getConsoleManager().removeConsoles(new IConsole[] {this});
-		}
+	//	if (!subscription.isRunning())
+	//	{
+	//		subscription.start();
+	//	}
+	//	ConsolePlugin.getDefault().getConsoleManager().showConsoleView(this);
+	//	}
+	//	else
+	//	{
+		//	setName(Localization.getString("ScriptConsole.Terminated") + super.getName());
+	//		subscription.interrupt();
+			//subscription.delSubscription();
+			//ConsolePlugin.getDefault().getConsoleManager().removeConsoles(new IConsole[] {this});
+		//}
 	} 
 	
-	public void run() {
+/*	public void run() {
 		if(subscription.init())
 		{
 		createConsoleDaemon();
@@ -198,14 +208,14 @@
 			ConsolePlugin.getDefault().getConsoleManager().removeConsoles(new IConsole[] {this});
 		}
 			
-	}
+	} */
 	
 	/**
 	 * Check to see if the Command is still running
 	 * @return boolean representing if the command is running
 	 */
 	public boolean isRunning() {
-		return subscription.isRunning();
+		return cmd.isRunning();
 	}
 	
 	/**
@@ -222,32 +232,48 @@
 	 */
 	public void saveStream(File file) {
 		if(isRunning())
-			if(!subscription.saveLog(file))
-				MessageDialog.openWarning(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), Localization.getString("ScriptConsole.Problem"), Localization.getString("ScriptConsole.ErrorSavingLog"));
+		//	if(!subscription.saveLog(file))
+		//		MessageDialog.openWarning(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), Localization.getString("ScriptConsole.Problem"), Localization.getString("ScriptConsole.ErrorSavingLog"));
+			if(!cmd.saveLog(file))
+                MessageDialog.openWarning(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), Localization.getString("ScriptConsole.Problem"), Localization.getString("ScriptConsole.ErrorSavingLog"));
+
 	}
 	
 	/**
 	 * Gets the command that is running in this console, or null if there is no running command.
 	 * @return The <code>LoggedCommand</code> that is running in this console.
 	 */
-	public LoggedCommand getCommand() {
+	public LoggedCommand2 getCommand() {
 		return cmd;
 	}
 	
-	public String getOutput() {
+	/*public String getOutput() {
 		return subscription.getOutput();
-	}
+	}*/
 	
 	/**
 	 * Stops the running command and the associated listeners.
 	 */
 	public synchronized void stop() {
-		if(isRunning()) {
-			setName(Localization.getString("ScriptConsole.Terminated") + super.getName());
-			subscription.interrupt();
-			subscription.delSubscription();
+		  if(isRunning()) {
+			  String command[] = new String[1];
+				String moduleName = this.getName();
+				moduleName = moduleName.substring(0,moduleName.indexOf('.'));
+				if (moduleName.indexOf('-') != -1)
+					moduleName = moduleName.substring(0, moduleName.indexOf('-'));
+			
+				command[0] = "ps -ef | grep " + moduleName + " | grep stapio | awk '{print $2}' | xargs kill -SIGINT";
+				ScpExec stop = new ScpExec(command, moduleName);
+		        stop.start();
+              cmd.stop();
+              cmd.removeErrorStreamListener(errorDaemon);
+              cmd.removeInputStreamListener(consoleDaemon);
+              setName(Localization.getString("ScriptConsole.Terminated") + super.getName());
 			ConsolePlugin.getDefault().getConsoleManager().removeConsoles(new IConsole[] {this});
 			
+	        
+			
+			
 		}
 	}
 	
@@ -256,9 +282,9 @@
 	 */
 	public void dispose() {
 		if(!isDisposed()) {
-			if(null != subscription)
-				subscription.dispose();
-			subscription = null;
+			if(null != cmd)
+				cmd.dispose();
+			cmd = null;
 			if(null != errorDaemon)
 				errorDaemon.dispose();
 			errorDaemon = null;
@@ -280,9 +306,9 @@
 		} catch(Exception e) {}
 	}
 	
-	private LoggedCommand cmd;
+	private LoggedCommand2 cmd;
 	
 	private ErrorStreamDaemon errorDaemon;
 	private ConsoleStreamDaemon consoleDaemon;
-	private Subscription subscription;
+//	private Subscription subscription;
 }
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/.classpath b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/.classpath
new file mode 100644
index 0000000..751c8f2
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/.project b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/.project
new file mode 100644
index 0000000..f464cf5
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.systemtap.ui.dashboard</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/ChangeLog
new file mode 100644
index 0000000..77f5859
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/ChangeLog
@@ -0,0 +1,130 @@
+2010-02-11  Roland Grunberg  <rgrunber@redhat.com>
+
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/internal/DashboardCloseMonitor.java:
+		Fix NPE by proceeding only when the view exists.
+
+2010-01-29  Anithra P Janakiraman  <anithra@linux.vnet.ibm.com>
+
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/ImportModuleLocationAction.java:
+	(run): 
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/internal/DashboardCloseMonitor.java:
+	(preShutdown):
+	
+2010-01-29  Anithra P Janakiraman  <anithra@linux.vnet.ibm.com>
+	
+	* .classpath: New file.
+	* .project: New file.
+	* bin: New file.
+	* build.properties: New file.
+	* documentation/html/concepts/activeModulesBrowser.html: New file.
+	* documentation/html/concepts/concepts.html: New file.
+	* documentation/html/concepts/modules.html: New file.
+	* documentation/html/concepts/modulesBrowser.html: New file.
+	* documentation/html/gettingstarted/dashboardTutorial.html: New file.
+	* documentation/html/gettingstarted/gettingStarted.html: New file.
+	* documentation/html/gettingstarted/images/activeModules.png: New file.
+	* documentation/html/gettingstarted/images/closeButton.png: New file.
+	* documentation/html/gettingstarted/images/expandButton.png: New file.
+	* documentation/html/gettingstarted/images/graphExpanded.png: New file.
+	* documentation/html/gettingstarted/images/moduleBrowser.png: New file.
+	* documentation/html/gettingstarted/images/multipleRunningModules.png: New file.
+	* documentation/html/gettingstarted/images/rightleft.png: New file.
+	* documentation/html/gettingstarted/images/runningDashboard.png: New file.
+	* documentation/html/gettingstarted/images/smallGraph.png: New file.
+	* documentation/html/reference/frequentlyAskedQuestions.html: New file.
+	* documentation/html/reference/images/menu/preferencesbox1.png: New file.
+	* documentation/html/reference/images/menu/viewbox1.png: New file.
+	* documentation/html/reference/images/toolbars/dash.png: New file.
+	* documentation/html/reference/images/toolbars/graphing.png: New file.
+	* documentation/html/reference/images/toolbars/ide.png: New file.
+	* documentation/html/reference/images/toolbars/import_wiz.gif: New file.
+	* documentation/html/reference/images/toolbars/mod_obj.gif: New file.
+	* documentation/html/reference/images/toolbars/pause_script.gif: New file.
+	* documentation/html/reference/images/toolbars/start_script.gif: New file.
+	* documentation/html/reference/images/toolbars/stop_obj.gif: New file.
+	* documentation/html/reference/menus.html: New file.
+	* documentation/html/reference/preferences.html: New file.
+	* documentation/html/reference/reference.html: New file.
+	* documentation/html/reference/toolbars.html: New file.
+	* documentation/html/tasks/creatingModules.html: New file.
+	* documentation/html/tasks/graphInteraction.html: New file.
+	* documentation/html/tasks/images/addedModule.png: New file.
+	* documentation/html/tasks/images/closeButton.png: New file.
+	* documentation/html/tasks/images/expandButton.png: New file.
+	* documentation/html/tasks/images/exportScript.png: New file.
+	* documentation/html/tasks/images/importDialogue.png: New file.
+	* documentation/html/tasks/images/rightleft.png: New file.
+	* documentation/html/tasks/images/script_details.gif: New file.
+	* documentation/html/tasks/images/zoom.png: New file.
+	* documentation/html/tasks/importModules.html: New file.
+	* documentation/html/tasks/runningModules.html: New file.
+	* documentation/html/tasks/tasks.html: New file.
+	* documentation/html/toc.html: New file.
+	* documentation/tocconcepts.xml: New file.
+	* documentation/tocgettingstarted.xml: New file.
+	* documentation/tocreference.xml: New file.
+	* documentation/toctasks.xml: New file.
+	* icons/actions/bomb.png: New file.
+	* icons/actions/graph/close.gif: New file.
+	* icons/actions/graph/collapse.gif: New file.
+	* icons/actions/graph/expand.gif: New file.
+	* icons/actions/graph/maximize.gif: New file.
+	* icons/actions/graph/restore.gif: New file.
+	* icons/actions/import_wiz.gif: New file.
+	* icons/actions/pause_script.gif: New file.
+	* icons/actions/start_script.gif: New file.
+	* icons/actions/stop_script.gif: New file.
+	* icons/misc/graph_act.gif: New file.
+	* icons/misc/graph_dis.gif: New file.
+	* icons/misc/module_obj.gif: New file.
+	* icons/perspective_obj.gif: New file.
+	* icons/views/active_mod_obj.gif: New file.
+	* icons/views/dashboard_obj.gif: New file.
+	* icons/views/mod_obj.gif: New file.
+	* META-INF/MANIFEST.MF: New file.
+	* modules/IO.Cumulative_IO_Activity.dash: New file.
+	* modules/IO.IO_Activity_by_Process.dash: New file.
+	* modules/Network.Processwise_Network_Traffic.dash: New file.
+	* modules/Process.Profile_Kernel_functions.dash: New file.
+	* modules/Profiling.Functions_profile.dash: New file.
+	* modules/Profiling.Unnecessary_Polling_Operations.dash: New file.
+	* plugin.properties: New file.
+	* plugin.xml: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/ActivateGraphAction.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/CustomAction.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/hidden/GetSelectedModule.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/ImportModuleLocationAction.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/PauseModuleAction.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/RunModuleAction.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/StopGraphAction.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/StopModuleAction.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardAdapter.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardComposite.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardPerspective.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardSessionSettings.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/internal/DashboardCloseMonitor.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/internal/DashboardPlugin.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/internal/Localization.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/internal/localization.properties: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/preferences/DashboardPreferenceConstants.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/preferences/DashboardPreferencePage.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/preferences/PreferenceInitializer.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/ActiveModuleData.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/ActiveModuleTreeNode.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardGraphData.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardGraphsLocator.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardGraphsTreeBuilder.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardMetaData.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModule.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModuleFileFilter.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModuleLocator.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModuleTreeBuilder.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/GraphTreeNode.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/ModuleTreeNode.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/ActiveModuleBrowserView.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/DashboardGraphsBrowserView.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/DashboardModuleBrowserView.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/DashboardView.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/GraphsView.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/ModuleView.java: New file.
+	* toc.xml: 
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..8c773ab
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/META-INF/MANIFEST.MF
@@ -0,0 +1,26 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: SystemTap Dashboard (Incubation)
+Bundle-SymbolicName: org.eclipse.linuxtools.systemtap.ui.dashboard; singleton:=true
+Bundle-Version: 0.3.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.systemtap.ui.dashboard.internal.DashboardPlugin
+Bundle-Vendor: Eclipse
+Bundle-Localization: plugin
+Export-Package: org.eclipse.linuxtools.systemtap.ui.dashboard,
+ org.eclipse.linuxtools.systemtap.ui.dashboard.internal,
+ org.eclipse.linuxtools.systemtap.ui.dashboard.preferences,
+ org.eclipse.linuxtools.systemtap.ui.dashboard.structures,
+ org.eclipse.linuxtools.systemtap.ui.dashboard.views
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.linuxtools.systemtap.ui.structures,
+ org.eclipse.linuxtools.systemtap.ui.logging,
+ org.eclipse.linuxtools.systemtap.ui.graphingapi.ui,
+ org.eclipse.linuxtools.systemtap.ui.systemtapgui,
+ org.eclipse.linuxtools.systemtap.ui.consolelog
+Import-Package: org.eclipse.linuxtools.systemtap.ui.graphicalrun.structures,
+ org.eclipse.linuxtools.systemtap.ui.graphing,
+ org.eclipse.linuxtools.systemtap.ui.ide,
+ org.eclipse.linuxtools.systemtap.ui.ide.structures
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/build.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/build.properties
new file mode 100644
index 0000000..f7e08a6
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/build.properties
@@ -0,0 +1,10 @@
+source.. = src/
+output.. = bin/
+bin.includes = plugin.xml,\
+               META-INF/,\
+               .,\
+               icons/,\
+               documentation/,\
+               toc.xml,\
+               modules/,\
+               plugin.properties
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/concepts/activeModulesBrowser.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/concepts/activeModulesBrowser.html
new file mode 100644
index 0000000..d140346
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/concepts/activeModulesBrowser.html
@@ -0,0 +1,17 @@
+<a href="../toc.html">Table of Contents</a> > <a href="concepts.html">Concepts</a>
+
+<h2>
+Active Modules Browser
+</h2>
+
+The Active Modules Browser displays each module currently active.<br><br>
+
+<img src="../gettingstarted/images/activeModules.png"><br><br>
+
+The following right click options exist for the graphs embedded in each of the active modules:
+<ul>
+<li><b>Stop Graph</b> - Stops the graph from updating.</li>
+<li><b>Activate Graph</b> - Instructs a formerly stopped graph to continue updating.</li>
+</ul>
+
+To view all modules available, switch to the <a href="modulesBrowser.html">Modules Browser</a>.
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/concepts/concepts.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/concepts/concepts.html
new file mode 100644
index 0000000..1e8167e
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/concepts/concepts.html
@@ -0,0 +1,15 @@
+<a href="../toc.html">Table of Contents</a> 
+
+<h2>
+Concepts
+</h2>
+
+This section of the Dashboard User Guide details conceptual topics of the application; the major 
+components, what they do, and how how you interact with them.
+
+<ol>
+<li><a href="modules.html">Modules</a></li>
+<li><a href="modulesBrowser.html">Modules Browser</a></li>
+<li><a href="activeModulesBrowser.html">Active Modules Browser</a></li>
+<li><a href="../tasks/creatingModules.html">Creating Modules</a></li>
+</ol>
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/concepts/modules.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/concepts/modules.html
new file mode 100644
index 0000000..faa3438
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/concepts/modules.html
@@ -0,0 +1,27 @@
+<a href="../toc.html">Table of Contents</a> > <a href="concepts.html">Concepts</a>
+
+<h2>
+Modules
+</h2>
+
+A module is a package used in the Dashboard perspective, containing a SystemTap script and associated metadata.<br><br>
+
+<a name="families">
+<h3>
+Module Families
+</h3>
+
+Modules are grouped in "module families", groups of modules that are related. One example is the Hard Disk
+module family which contains the module Disk Access:<br><br>
+
+<img src="../gettingstarted/images/moduleBrowser.png"><br><br>
+
+<h3>
+Multiple Graphs
+</h3>
+
+Often, as in the case of the Disk Access module, modules will spawn multiple graphs on execution.<br><br>
+
+<img src="../gettingstarted/images/runningDashboard.png"><br><br>
+
+There are a number of different module families constructed for different analysis sets.
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/concepts/modulesBrowser.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/concepts/modulesBrowser.html
new file mode 100644
index 0000000..702c46a
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/concepts/modulesBrowser.html
@@ -0,0 +1,18 @@
+<a href="../toc.html">Table of Contents</a> > <a href="concepts.html">Concepts</a>
+
+<h2>
+Modules Browser
+</h2>
+
+The Modules Browser displays all the modules available to run, categorized by <a href="modules.html#families">
+module families</a>. Modules in each family can be viewed by expanding the appropriate module family name.<br><br>
+
+<img src="../gettingstarted/images/moduleBrowser.png"><br><br>
+
+From the Modules Browser the following options are available on right-clicking a module:
+<ul>
+<li><b>View Script</b> - Opens the module's SystemTap script in the IDE Perspective.</li>
+</ul>
+
+To view the currently active modules, switch to the <a href="activeModulesBrowser.html">Active Modules Browser</a>.
+
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/dashboardTutorial.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/dashboardTutorial.html
new file mode 100644
index 0000000..331815f
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/dashboardTutorial.html
@@ -0,0 +1,66 @@
+<a href="../toc.html">Table of Contents</a> > <a href="gettingStarted.html">Getting Started</a>
+
+<h2>
+Dashboard Tutorial
+</h2>
+
+The Dashboard Perspective is the most advanced part of SystemTap GUI. It is designed to allow users to browse 
+and run prebuilt <a href="../concepts/modules.html">modules</a> in order to see multiple graphs updating in
+sequence.<br><br>
+
+For this tutorial we'll use one of the prebuilt modules to illustrate the user how the Dashboard perspective 
+is used. Each module is part of a <a href="../concepts/modules.html#families">module family</a>, a collection of related
+modules. To start, switch to the Dashboard perspective. On the left you should see a browser titled "Modules".<br><br>
+
+<img src="images/moduleBrowser.png"><br><br>
+
+The <a href="../concepts/modulesBrowser.html">Module Browser</a> contains a list of modules available to run. Notice that there is another tab, "Active Modules", in the same pane. The 
+<a href="../concepts/activeModulesBrowser.html">Active Modules Browser</a> allows you to browse the modules you currently have running. At this point, however, it
+will be empty; there are no modules currently running. Open the module family "Hard Disk" by clicking the arrow
+next to it's name. This will display each module associated in the "Hard Disk" module family.<br><br>
+
+We are going to be running the Disk Access module. This can be accomplished two ways. You may select it and
+<b><u>R</u>un-><u>R</u>un Script</b>. You can alternatively click the <b>Run Script</b> button in the Toolbar. SystemTap GUI will request the details of the Remote Server(ip address, username, password), 
+enter the details to proceed. You should see a display similar to the following:<br><br>
+
+<img src="images/runningDashboard.png"><br><br>
+
+The Dashboard shows three graphs, each obtaining data from one script, each analyzing different components of disk access - bytes read, 
+bytes written, and a multi-line graph illustrating both.<br><br>
+
+<img src="images/smallGraph.png"><br><br>
+
+Each graph comes with graph-specific options:
+<ul>
+<li><img src="images/expandButton.png"> - <b>Expand Graph</b> - This option opens a set of graph-unique options:
+<ul>
+<li><b>Zoom</b> - This option allows the user to increase and decrease the no of x-axis ticks.</li>
+</ul>
+</li>
+<li><img src="images/rightleft.png"> - <b>Close Zoom bar</b> - This hides the zoom bar.
+<li><img src="images/closeButton.png"> - <b>Close Graph</b> - This removes the graph from the viewer pane.</li>
+</ul>
+
+Take a moment to interact with these options to familiarize yourself with them.<br><br>
+
+<img src="images/graphExpanded.png"><br><br>
+
+<h3>
+Multiple Module Execution
+</h3>
+
+SystemTap GUI supports the execution of more than one module at one time. The currently running script does not
+not to be halted and the currently open graphs do not need to be closed, though they may be if desired. To 
+execute another module, simply select and run it as described above. If you were to
+run  a module in the Memory module family for example, a new tab will be opened titled 'Memory' in addition to the 
+current tab for 'Hard Disk'.<br><br>
+
+Up to 8 graphs may be open in each tab at any given time. Drag and drop support is included for the graph types, permitting
+re-arrangement for ideal analysis. In addition, <b>Pausing</b> is also implemented in SystemTap GUI. You may pause 
+any module by selecting <b><u>R</u>un-><u>P</u>ause Module</b>, or by selecting <b>Pause</b> from the toolbar. Know that this method of
+pausing is an illusion; the graph data is simply not updated while the script continues to run. This inability
+to truly pause is inherent in SystemTap itself. You can also stop the script using the above methods. This
+will halt the running script of that module and remove the graphs entirely from the view pane. It will not affect
+graphs or scripts associated with any other modules. If at any time you are unsure of which modules are 
+currently active you can check this by navigating to the <a href="../concepts/activeModulesBrowser.html">Active 
+Modules Browser.</a><br><br>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/gettingStarted.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/gettingStarted.html
new file mode 100644
index 0000000..b3a4831
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/gettingStarted.html
@@ -0,0 +1,12 @@
+<a href="../toc.html">Table of Contents</a>
+
+<h2>
+Getting Started
+</h2>
+
+This section of the Dashboard User Guide covers the essentials of getting started using the Dashboard 
+Perspective. 
+
+<ol>
+<li><a href="dashboardTutorial.html">Dashboard Tutorial</a></li>
+</ol>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/images/activeModules.png b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/images/activeModules.png
new file mode 100644
index 0000000..261f3ed
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/images/activeModules.png
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/images/closeButton.png b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/images/closeButton.png
new file mode 100644
index 0000000..73af7d2
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/images/closeButton.png
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/images/expandButton.png b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/images/expandButton.png
new file mode 100644
index 0000000..a342299
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/images/expandButton.png
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/images/graphExpanded.png b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/images/graphExpanded.png
new file mode 100644
index 0000000..870bfe9
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/images/graphExpanded.png
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/images/moduleBrowser.png b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/images/moduleBrowser.png
new file mode 100644
index 0000000..593cc29
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/images/moduleBrowser.png
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/images/multipleRunningModules.png b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/images/multipleRunningModules.png
new file mode 100644
index 0000000..6e3994b
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/images/multipleRunningModules.png
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/images/rightleft.png b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/images/rightleft.png
new file mode 100644
index 0000000..cf1b164
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/images/rightleft.png
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/images/runningDashboard.png b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/images/runningDashboard.png
new file mode 100644
index 0000000..1e0c827
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/images/runningDashboard.png
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/images/smallGraph.png b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/images/smallGraph.png
new file mode 100644
index 0000000..71f26fd
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/gettingstarted/images/smallGraph.png
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/frequentlyAskedQuestions.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/frequentlyAskedQuestions.html
new file mode 100755
index 0000000..f629c2c
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/frequentlyAskedQuestions.html
@@ -0,0 +1,33 @@
+<a href="../toc.html">Table of Contents</a> > <a href="reference.html">Reference</a>
+
+<h2>
+Frequently Asked Questions
+</h2>
+
+This section details frequently asked questions relating to the Dashboard Perspective.<br><br>
+
+<b>
+Can more than one module be open at any given time?
+</b><br><br>
+
+A: SystemTap GUI supports the execution of more than one module at one time. The currently running script does not
+not to be halted and the currently open graphs do not need to be closed, though they may be if desired. To 
+execute another module, simply select and run it as described previously . If you were to
+run the Page Faults module in the Memory module family for example, an additional tab will be created for 
+the Memory module family <br><br>
+
+
+<b>
+How many graphs may be opened at one time?
+</b><br><br>
+
+A: Currently, 8 in each tab(i.e, 8 per module family). You may close graphs to make more room by using the closebox. 
+<img src="../gettingstarted/images/closeButton.png"><br><br><br>
+
+<b>
+Is there an option to pause specific graphs?
+</b><br><br>
+
+A: No. You can pause or stop a specific module, which will in turn pause or stop the specific graphs associated
+with it, but you cannot pause or stop just one graph unless that module produces just one graph or you close all
+but that graph.
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/menu/preferencesbox1.png b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/menu/preferencesbox1.png
new file mode 100644
index 0000000..31b0cbc
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/menu/preferencesbox1.png
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/menu/viewbox1.png b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/menu/viewbox1.png
new file mode 100644
index 0000000..28e5cd8
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/menu/viewbox1.png
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/toolbars/dash.png b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/toolbars/dash.png
new file mode 100644
index 0000000..4e1dc2e
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/toolbars/dash.png
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/toolbars/graphing.png b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/toolbars/graphing.png
new file mode 100644
index 0000000..adfa0c2
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/toolbars/graphing.png
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/toolbars/ide.png b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/toolbars/ide.png
new file mode 100644
index 0000000..43daceb
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/toolbars/ide.png
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/toolbars/import_wiz.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/toolbars/import_wiz.gif
new file mode 100755
index 0000000..d38085a
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/toolbars/import_wiz.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/toolbars/mod_obj.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/toolbars/mod_obj.gif
new file mode 100644
index 0000000..8bbfd04
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/toolbars/mod_obj.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/toolbars/pause_script.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/toolbars/pause_script.gif
new file mode 100644
index 0000000..161e3f5
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/toolbars/pause_script.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/toolbars/start_script.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/toolbars/start_script.gif
new file mode 100644
index 0000000..d6b3bdc
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/toolbars/start_script.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/toolbars/stop_obj.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/toolbars/stop_obj.gif
new file mode 100755
index 0000000..dc47edf
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/images/toolbars/stop_obj.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/menus.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/menus.html
new file mode 100755
index 0000000..1a69588
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/menus.html
@@ -0,0 +1,48 @@
+<a href="../toc.html">Table of Contents</a> > <a href="reference.html">Reference</a>
+
+<h2>
+Dashboard Perspective Menus
+</h2>
+
+What follows is a comprehension list of the menu options available within the Systemtap GUI Dashboard Perspective.
+
+
+<h3>
+<u>F</u>ile
+</h3>
+<ul>
+<li><b><u>I</u>mport Module Location</b> - This option allows brings up a dialogue box prompting the user with the location of a module file which is then loaded into the <a href="../concepts/modulesBrowser.html">Module Browser</a>.<br><img src="../tasks/images/importDialogue.png"><br><br></li>
+<li><b>E<u>x</u>it</b> - Exits Systemtap GUI.
+</ul>
+
+<h3>
+<a name="run"><u>R</u>un</a>
+</h3>
+<ul>
+<li><b><u>R</u>un</b> - This option runs the selected module in the <a href="../concepts/modulesBrowser.html">Module Browser</a>.</li>
+<li><b><u>P</u>ause</b> - This option pauses the selected module in the <a href="../concepts/modulesBrowser.html">Module Browser</a>. Know that this method of pausing is an illusion; the graph data is simply not updated while the script continues to run. This inability to truly pause is inherent in SystemTap itself.</li>
+<li><b><u>S</u>top</b> - This option stops the selected module in the <a href="../concepts/modulesBrowser.html">Module Browser</a>.</li>
+</ul>
+
+<h3>
+<u>W</u>indow
+</h3>
+<ul>
+<li><b>Open in <u>N</u>ew Window</b> - This option opens a new instance of SystemTap GUI.</li>
+<li><b><u>O</u>pen Perspective</b> - This submenu lists each of the available perspectives to open:
+<ul>
+<li>IDE Perspective</li>
+<li>Graphing Perspective</li>
+<li>Dashboard Perspective</li>
+</ul></li>
+<li><b>Show <u>V</u>iews</b> - This submenus lists each of the available views to open:
+<ul>
+<li>Console</li>
+<li>Error Log</li>
+<li>Functions</li>
+<li>Kernel Source</li>
+<li>Probe Alias</li>
+<li>Other - Lists all views in the application.</li><br><img src="images/menu/viewbox1.png"><br><br>
+</ul></li>
+<li><b><u>P</u>references</b> - Due to the breath of this topic it is covered in another section. Please see <a href="preferences.html">Preferences Help</a>.<br><img src="images/menu/preferencesbox1.png"><br><br></li>
+</ul>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/preferences.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/preferences.html
new file mode 100755
index 0000000..cbc19ea
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/preferences.html
@@ -0,0 +1,120 @@
+<a href="../toc.html">Table of Contents</a> > <a href="reference.html">Reference</a>
+
+<h2>
+Preferences
+</h2>
+
+This section details each of the options listed under <b><u>W</u>indow-><u>P</u>references</b>. The Preferences dialog is the dialog used to set user preferences. The Preferences dialog pages can be searched using the filter function. To filter by matching the page title, simply type the name of the page you are seeking and the available pages will be presented below. The filter also searches on keywords such as appearance and java.
+
+<ul>
+<li><b>Logging</b> 
+<ul>
+<li><b>Enable logging</b> - This option turns on and off the ability to log data from the console.</li>
+<li><b>Logging level</b> - This dropdown box allows you to select one of our levels of logging.
+<ul>
+<li>Debug - A very large quantity of debug information, difficult to identify what you are looking for but extremely exhaustive.</li>
+<li>Info - Displays most information regarding program execution; the default level.</li>
+<li>Critical - Lists only critical errors duration execution.</li>
+<li>Fatal - Lists only fatal errors during execution.</li>
+</ul>
+</li>
+<li><b>Log to</b> - Specifies where you wish the logging to be written:
+<ul>
+<li>Console - Writes the debug information directly to the console.</li>
+<li>File - Write the debug information to a file.</li>
+</ul>
+<li><b>File</b> - The location of the file that logging sends the debug information to.</li>
+</ul>
+<li><b>SystemTap</b> - This section contains options relevent to SystemTap itself.
+<ul>
+<li><b>Remember window state</b> - Preserves the state of the window on exitting SystemTap GUI.
+<li><b>Dashboard Preferences</b> - Preferences relate to the Dashboard Perspective.
+<ul>
+<li>Additional Modules - Provides for the addition of more modules to the Dashboard. Modules are files containing a SystemTap script and associated metadata.</li>
+</ul>
+<li><b>Environment Variables</b> - Allows the user to set specific values to the following environment variables
+<ul>
+<li>LD_LIBRARY_PATH</li>
+<li>PATH</li>
+</ul>
+</li>
+<li><b>Graphing</b> - Preferences related to the Graphing Perspective.
+<ul>
+<li><b><u>R</u>efresh Delay (ms)</b> - Milliseconds in between re-painting the graph.</li>
+<li><b>Data Table</b> - Preferences related to the data table.
+<ul>
+<li><u>J</u>ump to the newest entry - Determines whether the scroll bar maintains its location at the newest entry.</li>
+<li><u>A</u>uto resize columns - Determines whether columns automatically resize to the width of the contents or whether they remain placed when moved.</li>
+<li><u>M</u>ax data items - Maximum number of entries that the table shows, though the table itself may have more not visible.</li>
+</ul>
+</li>
+<li><b>Graph</b> - Preferences related to graphs.
+<ul>
+<li><u>S</u>how grid lines - Turns on and off painting of the grid lines.</li>
+<li><u>V</u>iewable data items - Number of maximum samples plotted at any time.</li>
+</ul>
+</ul>
+<li><b>IDE</b> - Preferences when loading the IDE Perspective.
+<ul>
+<li><b>Use stored tapset trees</b> - Loads the stored tapset trees on initialization.</li>
+<li><b>Editor</b> - Preferences related to the editor.
+<ul>
+<li><u>E</u>ditor Background Color - Sets the color painted in the background of the editor pane.</li>
+<li>Show Line <u>N</u>umbers - Option to turn on and off line numbers in the editor pane.
+<li>Code Assist
+<ul>
+<li><u>U</u>se Code Assist - Turns on and off the option to use Code Assist, which is a method that predicts what you are typing based on existing probe aliasi and opens a window that allows you to scroll down and select and/or continue typing for refined results.</li>
+<li>How Code Assist adds code - Method used in Code Assist.
+<ul>
+<li><u>I</u>nsert - Inserts the selected text directly into the cursor point.</li>
+<li><u>O</u>verwrite - Overwrites as you type.</li>
+</ul>
+</li>
+<li>Activation <u>D</u>elay (requires restart) - Delay in milliseconds before the code assist routines attempts to run.
+<li>Activation <u>T</u>rigger - This is the key that actives Code Assist. For SystemTap GUI it is set to the divider between tapset and probe alias.
+</ul>
+</li>
+<li>Syntax Coloring - These options assign color values to identified types within the .stp and .c editors.
+<ul>
+<li>STP editor
+<ul>
+<li><u>D</u>efault Color - Color of normal code.</li>
+<li><u>K</u>eyword Color - Color of keywords.</li>
+<li><u>E</u>mbedded C Color - Color of embedded C code.</li>
+<li><u>E</u>mbedded Color - Color of embedded code.</li>
+<li><u>C</u>omment Color - Color of comments.</li>
+<li><u>T</u>ype Color - Color of items identified as types.</li>
+<li><u>S</u>tring Color - Color of strings.</li>
+</ul>
+</li>
+<li>C editor
+<ul>
+<li><u>D</u>efault Color - Color of normal code.</li>
+<li><u>K</u>eyword Color - Color of keywords.</li>
+<li><u>P</u>reprocessor Color - Color of preprocessor code.</li>
+<li><u>C</u>omment Color - Color of comments.</li>
+<li><u>T</u>ype Color - Color of items identified as types.</li>
+<li><u>S</u>tring Color - Color of strings.</li>
+</ul>
+</li>
+</ul
+</li>
+<li>Typeing - No options available at this time.</li>
+</ul>
+</li>
+<li><b>Path</b>
+<ul>
+<li><u>K</u>ernel Source Directory - Location of the directory that the kernel source code is pulled from.</li>
+<li>Stap - No options available at this time.
+<ul>
+<li>Tapsets - Preferences related to tapsets.
+<ul>
+<li><u>A</u>dditional Tapsets - Allows you to specify additional tapsets scripts to be added in with every script.</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</ul>
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/reference.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/reference.html
new file mode 100644
index 0000000..ec26953
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/reference.html
@@ -0,0 +1,17 @@
+<a href="../toc.html">Table of Contents</a> 
+
+<h2>
+Reference
+</h2>
+
+This section of the Dashboard User Guild is intended to provide the following resources should you have any
+very specific questions regarding the Dashboard Perspective in general or one of the options associated with 
+it. It also contains example scripts and FAQs.
+
+<ol>
+<li><a href="frequentlyAskedQuestions.html">Frequently Asked Questions</a></li>
+<li><a href="menus.html">Menus</a></li>
+<li><a href="preferences.html">Preferences</a></li>
+<li><a href="toolbars.html">Toolbars</a></li>
+</ol>
+
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/toolbars.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/toolbars.html
new file mode 100755
index 0000000..6ae66bb
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/reference/toolbars.html
@@ -0,0 +1,30 @@
+<a href="../toc.html">Table of Contents</a> > <a href="reference.html">Reference</a>
+
+<h2>
+Toolbars
+</h2>
+
+
+SystemTap GUI currently has two toolbars built in; an Action Bar for file and execution operations and a Perspective Selector to jump to different perspectives.
+
+<h3>
+Action Bar
+</h3>
+
+<ul>
+<li><img src="images/toolbars/import_wiz.gif"> <b>Import Dashboard Module Location</b> - This option brings up a dialogue box prompting the user for a module file which is then loaded into the <a href="../concepts/modulesBrowser.html">Module Browser</a>.
+<li><img src="images/toolbars/start_script.gif"> <b>Run</b> - This option runs the selected module in the <a href="../concepts/modulesBrowser.html">Module Browser</a>.</li>
+<li><img src="images/toolbars/pause_script.gif"> <b>Pause</b> - This option pauses the selected module in the <a href="../concepts/modulesBrowser.html">Module Browser</a>. Know that this method of pausing is an illusion; the graph data is simply not updated while the script continues to run. This inability to truly pause is inherent in SystemTap itself.</li>
+<li><img src="images/toolbars/stop_obj.gif"> <b>Stop</b> - This option stops the selected module in the <a href="../concepts/modulesBrowser.html">Module Browser</a>.</li>
+<li><img src="images/toolbars/mod_obj.gif"> <b>Create a New Dashboard module</b> - This option creates a new module in the <a href="../concepts/modulesBrowser.html">Module Browser</a>.</li>
+</ul>
+
+<h3>
+Perspective Selector
+</h3>
+
+<ul>
+<li><img src="images/toolbars/ide.png"> <b>IDE Perspective</b> - This launches the IDE Perspective, useful for writing and executing scripts.</li>
+<li><img src="images/toolbars/graphing.png"> <b>Graphing Perspective</b> - This launches the Graphing Perspective, useful for graphing scripts.</li>
+<li><img src="images/toolbars/dash.png"> <b>Dashboard Perspective</b> - This launches the Dashboard Perspective, useful for multiple graphing.</li>
+</ul>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/creatingModules.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/creatingModules.html
new file mode 100644
index 0000000..5e1cca8
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/creatingModules.html
@@ -0,0 +1,52 @@
+<a href="../toc.html">Table of Contents</a> > <a href="tasks.html">Tasks</a>
+
+<h2>
+Creating Modules
+</h2>
+
+SystemTap GUI allows for the creation of custom modules. In order to do this the user must have a script that returns
+data in a consistent pattern along with providing a regular expression to interpret it; the same requirements
+as any script run in the Graphics Perspective. Creating a module can be done in two ways
+<br>
+<h3>Export Script</h3>
+Using the <b><u>E</u>xport Script</b> 
+option in the <b><u>F</u>ile</b> menu of the IDE Perspective. This will create a module from a script that is currently open in the IDE. The module will consist of the script and metadata information stored as a '.dash' file on the local system(where SystemTapGUI is running).The user is first prompted
+for regular expression details (just like in the Graphing perspective) after which a 
+dialog box similar to the following shows up:<br><br>
+
+<img src="images/exportScript.png"><br><br>
+
+The dialogue box has the following properties:
+<ul>
+<li><b>Display</b> - This is the name of the module. This is the text that will show up under the specified
+module family.</li>
+<li><b>Category</b> - This field requires the name of the module family the module should be placed in.</li>
+<li><b>Graphs</b> - This box allows you to added one or more predefine graph types to spawn each time the
+module is ran.</li>
+</ul>
+
+When you click ok your module will be added into the Module Browser in the Dashboard Perspective.<br><br>
+
+<img src="images/addedModule.png"><br><br>
+
+<h3>Create Module</h3>
+Using the <b><u>C</u>reate Module</b> 
+option in the dashboard or IDE toolbar. This will create a module from an example script that available on the remote System, Users will have to specify the location of the examples directory and the path to the script.The module will consist of only the metadata information stored as a '.dash' file on the local system(where SystemTapGUI is running). The script will not be packaged with the module, the location specified will be used to run the script directly on the remote system. The user would have to first enter the script details, 
+and then follow the same set of steps as in the previous option.<br><br>
+
+<img src="images/script_details.gif"><br><br>
+
+<h3>Tips</h3>
+
+Make sure your script works fine with the regular expression and the graphs are as desired using the IDE/Graphing perspectives
+before creating a dashboard module using the script.
+
+<h3>Constraints</h3>
+
+The script should adhere to the below constraints to add it to the dashboard:
+<ul>
+<li> The script should regularly output rows/tables of data that will confirm to the same regular expression, i.e, you cannot have two sets of output in the same script
+<li> The script should not have exit() statements
+<li> Since the dashboard supports dynamic graphs the script should output data periodically
+<li> Users should remember that the dashboard currently does not support any processing of the output data.
+</ul>
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/graphInteraction.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/graphInteraction.html
new file mode 100644
index 0000000..4488cb1
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/graphInteraction.html
@@ -0,0 +1,15 @@
+<a href="../toc.html">Table of Contents</a> > <a href="tasks.html">Tasks</a>
+
+<h2>
+Graph Interaction
+</h2>
+
+The graphical options used in the Dashboard perspective:
+<ul>
+<li><b>Zoom Bar</b> - This enables the user to zoom in and out on the current graph by sliding the bar to the left and right. The current magnification is shown at the top of the bar. Zooming would increase the no of x-axis ticks therefore allowing the user to see more(or less) data at a point in time.<br><br><img src="images/zoom.png"></li>
+<li><img src="images/expandButton.png"> - <b>Show Zoom bar</b> - This displays the zoom bar.
+<li><img src="images/rightleft.png"> - <b>Close Zoom bar</b> - This hides the zoom bar.
+<li><img src="images/closeButton.png"> - <b>Close Graph</b> - This removes the graph from the viewer pane.</li>
+</ul>
+
+<img src="../gettingstarted/images/graphExpanded.png">
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/images/addedModule.png b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/images/addedModule.png
new file mode 100644
index 0000000..989dbb5
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/images/addedModule.png
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/images/closeButton.png b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/images/closeButton.png
new file mode 100644
index 0000000..73af7d2
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/images/closeButton.png
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/images/expandButton.png b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/images/expandButton.png
new file mode 100644
index 0000000..a342299
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/images/expandButton.png
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/images/exportScript.png b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/images/exportScript.png
new file mode 100644
index 0000000..cee013d
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/images/exportScript.png
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/images/importDialogue.png b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/images/importDialogue.png
new file mode 100644
index 0000000..541de9f
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/images/importDialogue.png
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/images/rightleft.png b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/images/rightleft.png
new file mode 100644
index 0000000..cf1b164
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/images/rightleft.png
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/images/script_details.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/images/script_details.gif
new file mode 100644
index 0000000..0daf0ae
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/images/script_details.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/images/zoom.png b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/images/zoom.png
new file mode 100644
index 0000000..4ff3b64
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/images/zoom.png
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/importModules.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/importModules.html
new file mode 100644
index 0000000..32c33fe
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/importModules.html
@@ -0,0 +1,11 @@
+<a href="../toc.html">Table of Contents</a> > <a href="tasks.html">Tasks</a>
+
+<h2>
+Importing Modules
+</h2>
+
+The Dashboard Perspective allows for the import of modules by using the option <b><u>F</u>ile-><u>I</u>mport
+Module Location</b>. Simply navigate to and select the module file you wish to import, and SystemTap GUI will 
+add the module to the <a href="../concepts/moduleBrowser.html">Module Browser</a> in the Dashboard Perspective.<br><br>
+
+<img src="images/importDialogue.png">
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/runningModules.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/runningModules.html
new file mode 100644
index 0000000..27e0e4e
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/runningModules.html
@@ -0,0 +1,31 @@
+<a href="../toc.html">Table of Contents</a> > <a href="tasks.html">Tasks</a>
+
+<h2>
+Running Modules
+</h2>
+
+The <a href="../concepts/modulesBrowser.html">Module Browser</a> contains a list of modules available to run.
+
+Running modules in the Dashboard Perspective can be accomplished in three different ways. You may select it and
+<b><u>R</u>un-><u>R</u>un Script</b>. You can alternatively click the <b>Run Script</b> button in the Toolbar. 
+SystemTap GUI will request the details of the remote system(IPAddress,username,password).Enter these details and make
+sure that the username has sufficient access to execute SystemTap scripts 
+You should see a display similar to the following, graphs differing based on what 
+module you chose to run and Module Browser differences based off of your current module include list:<br><br>
+
+<img src="../gettingstarted/images/runningDashboard.png"><br><br>
+
+<h3>
+Multiple Module Execution
+</h3>
+
+SystemTap GUI supports the execution of more than one module at one time. The currently running script does not
+not to be halted and the currently open graphs do not need to be closed, though they may be if desired. To 
+execute another module, simply select and run it using  one of the two methods described above. 
+
+Up to 8 graphs may be open at one given time in any given tab. 
+Stopping the script
+will halt the running script of that module and remove the graphs entirely from the view pane. It will not affect
+graphs or scripts associated with any other modules. If at any time you are unsure of which modules are 
+currently active you can check this by navigating to the <a href="../concepts/activeModulesBrowser.html">Active 
+Modules Browser.</a><br><br>
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/tasks.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/tasks.html
new file mode 100644
index 0000000..d0a8e0b
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/tasks/tasks.html
@@ -0,0 +1,16 @@
+<a href="../toc.html">Table of Contents</a> 
+
+<h2>
+Tasks
+</h2>
+
+This section of the Dashboard User Guild is intended to provide help pages for common tasks that the user may
+wish to perform in the Dashboard Perspective.
+
+<ol>
+<li><a href="creatingModules.html">Creating Modules</a></li>
+<li><a href="importModules.html">Importing Modules</a></li>
+<li><a href="runningModules.html">Running Modules</a></li>
+<li><a href="graphInteraction.html">Graph Interaction</a></li>
+</ol>
+
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/toc.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/toc.html
new file mode 100755
index 0000000..85b4365
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/html/toc.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Table of Contents</title>
+</head>
+
+<body>
+<h1>Table of Contents</h1>
+
+Welcome to SystemTap GUI help pages. Here you will find wide selection of help pages covering the Dashboard
+Perspective of SystemTap GUI.
+
+<ol>
+
+<li><a href="gettingstarted/gettingStarted.html">Getting Started</a>
+<ol>
+<li><a href="gettingstarted/dashboardTutorial.html">Dashboard Tutorial</a></li>
+</ol>
+</li>
+
+<li><a href="concepts/concepts.html">Concepts</a></li>
+<ol>
+<li><a href="concepts/modules.html">Modules</a></li>
+<li><a href="concepts/modulesBrowser.html">Modules Browser</a></li>
+<li><a href="concepts/activeModulesBrowser.html">Active Modules Browser</a></li>
+</ol>
+</li>
+
+<li><a href="tasks/tasks.html">Tasks</a>
+<ol>
+<li><a href="tasks/creatingModules.html">Creating Modules</a></li>
+<li><a href="tasks/importModules.html">Importing Modules</a></li>
+<li><a href="tasks/runningModules.html">Running Modules</a></li>
+<li><a href="tasks/graphInteraction.html">Graph Interaction</a></li>
+</ol>
+</li>
+
+<li><a href="reference/reference.html">Reference</li>
+<ol>
+<li><a href="reference/frequentlyAskedQuestions.html">Frequently Asked Questions</a></li>
+<li><a href="reference/menus.html">Menus</a></li>
+<li><a href="reference/preferences.html">Preferences</a></li>
+<li><a href="reference/toolbars.html">Toolbars</a></li>
+</ol>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/tocconcepts.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/tocconcepts.xml
new file mode 100755
index 0000000..bc6f500
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/tocconcepts.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="Concepts" link_to="toc.xml#concepts"> 
+	<topic label="Modules"  href="documentation/html/concepts/modules.html" /> 
+	<topic label="Module Browser"  href="documentation/html/concepts/modulesBrowser.html" /> 
+	<topic label="Active Modules Browser"  href="documentation/html/concepts/activeModulesBrowser.html" /> 
+</toc>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/tocgettingstarted.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/tocgettingstarted.xml
new file mode 100755
index 0000000..248f3cb
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/tocgettingstarted.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="Getting Started" link_to="toc.xml#gettingstarted"> 
+	<topic label="Dashboard Tutorial" href="documentation/html/gettingstarted/dashboardTutorial.html" /> 
+</toc>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/tocreference.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/tocreference.xml
new file mode 100755
index 0000000..3dc469d
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/tocreference.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="Reference" link_to="toc.xml#reference"> 
+	<topic label="Menus" href="documentation/html/reference/menus.html" /> 
+	<topic label="Toolbars" href="documentation/html/reference/toolbars.html" /> 
+	<topic label="Preferences" href="documentation/html/reference/preferences.html" /> 
+	<topic label="Frequently Asked Questions"  href="documentation/html/reference/frequentlyAskedQuestions.html" /> 
+</toc>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/toctasks.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/toctasks.xml
new file mode 100755
index 0000000..bcdcba9
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/documentation/toctasks.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="Tasks" link_to="toc.xml#tasks"> 
+	<topic label="Creating Modules"  href="documentation/html/tasks/creatingModules.html" /> 
+	<topic label="Importing Modules"  href="documentation/html/tasks/importModules.html" /> 
+	<topic label="Running Modules"  href="documentation/html/tasks/runningModules.html" /> 
+	<topic label="Graph Interaction"  href="documentation/html/tasks/graphInteraction.html" /> 
+	
+</toc>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/bomb.png b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/bomb.png
new file mode 100644
index 0000000..1be3797
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/bomb.png
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/graph/close.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/graph/close.gif
new file mode 100644
index 0000000..6d76761
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/graph/close.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/graph/collapse.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/graph/collapse.gif
new file mode 100644
index 0000000..72ecbe3
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/graph/collapse.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/graph/expand.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/graph/expand.gif
new file mode 100644
index 0000000..e626e39
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/graph/expand.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/graph/maximize.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/graph/maximize.gif
new file mode 100644
index 0000000..55af28e
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/graph/maximize.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/graph/restore.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/graph/restore.gif
new file mode 100644
index 0000000..55cc251
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/graph/restore.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/import_wiz.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/import_wiz.gif
new file mode 100755
index 0000000..d38085a
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/import_wiz.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/pause_script.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/pause_script.gif
new file mode 100644
index 0000000..161e3f5
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/pause_script.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/start_script.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/start_script.gif
new file mode 100644
index 0000000..d6b3bdc
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/start_script.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/stop_script.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/stop_script.gif
new file mode 100644
index 0000000..dc47edf
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/actions/stop_script.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/misc/graph_act.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/misc/graph_act.gif
new file mode 100644
index 0000000..3dc7a65
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/misc/graph_act.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/misc/graph_dis.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/misc/graph_dis.gif
new file mode 100644
index 0000000..2cd9c54
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/misc/graph_dis.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/misc/module_obj.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/misc/module_obj.gif
new file mode 100644
index 0000000..0f07692
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/misc/module_obj.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/perspective_obj.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/perspective_obj.gif
new file mode 100755
index 0000000..96028b3
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/perspective_obj.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/views/active_mod_obj.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/views/active_mod_obj.gif
new file mode 100644
index 0000000..c1e4ee3
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/views/active_mod_obj.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/views/dashboard_obj.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/views/dashboard_obj.gif
new file mode 100644
index 0000000..ec50b70
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/views/dashboard_obj.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/views/mod_obj.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/views/mod_obj.gif
new file mode 100644
index 0000000..8bbfd04
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/icons/views/mod_obj.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/modules/IO.Cumulative_IO_Activity.dash b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/modules/IO.Cumulative_IO_Activity.dash
new file mode 100644
index 0000000..886e30b
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/modules/IO.Cumulative_IO_Activity.dash
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/modules/IO.IO_Activity_by_Process.dash b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/modules/IO.IO_Activity_by_Process.dash
new file mode 100644
index 0000000..a8f6387
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/modules/IO.IO_Activity_by_Process.dash
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/modules/Network.Processwise_Network_Traffic.dash b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/modules/Network.Processwise_Network_Traffic.dash
new file mode 100644
index 0000000..901c160
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/modules/Network.Processwise_Network_Traffic.dash
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/modules/Process.Profile_Kernel_functions.dash b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/modules/Process.Profile_Kernel_functions.dash
new file mode 100644
index 0000000..8802c90
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/modules/Process.Profile_Kernel_functions.dash
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/modules/Profiling.Functions_profile.dash b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/modules/Profiling.Functions_profile.dash
new file mode 100644
index 0000000..cdf460f
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/modules/Profiling.Functions_profile.dash
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/modules/Profiling.Unnecessary_Polling_Operations.dash b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/modules/Profiling.Unnecessary_Polling_Operations.dash
new file mode 100644
index 0000000..fa53cae
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/modules/Profiling.Unnecessary_Polling_Operations.dash
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.properties
new file mode 100644
index 0000000..97661f1
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.properties
@@ -0,0 +1,41 @@
+perspective.dashboard.name=Dashboard
+
+view.module.name=Modules
+view.graphs.name=Graphs
+view.activeModule.name=Active Modules
+view.dashboard.name=Dashboard
+
+command.import.name=Import Data Set
+command.import.desc=Import data set from file
+command.stop.name=&Stop Module
+command.stop.desc=Stops the currently selected Dashboard Module
+command.pause.name=&Pause Module
+command.pause.desc=Pauses the currently selected Dashboard Module
+command.run.name=&Run Module
+command.run.desc=Starts the currently selected Dashboard Module
+command.new.name=&Create New Module
+command.new.desc=Creates a New Dashboard Module
+
+category.file.name=File
+category.file.desc=File
+category.run.name=Run
+category.run.desc=Run
+
+actionset.filename=File Action Set
+action.import.name=&Import Modules
+action.import.desc=Import Dashboard Module Directory
+action.new.name=&Create New Module
+action.new.desc=Creates a New Dashboard Module
+
+actionset.run.name=Run Action Set
+action.stop.name=&Stop Module
+action.stop.desc=Stops the currently selected Dashboard Module
+action.pause.name=&Pause Module
+action.pause.desc=Pauses the currently selected Dashboard Module
+action.run.name=&Run Module
+action.run.desc=Starts the currently selected Dashboard Module
+
+preference.dashboard.name=Dashboard
+
+action.activateGraph.name=Activate Graph
+action.stopGraph.name=Stop Graph
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.xml
new file mode 100644
index 0000000..4c6f0ec
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.xml
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+	<extension
+		point="org.eclipse.ui.perspectives">
+		<perspective
+			name="%perspective.dashboard.name"
+		class="org.eclipse.linuxtools.systemtap.ui.dashboard.DashboardPerspective"
+			icon="icons/perspective_obj.gif"
+			id="org.eclipse.linuxtools.systemtap.ui.dashboard.DashboardPerspective"/>
+	</extension>
+
+	<extension
+		point="org.eclipse.ui.views">
+		<view
+			name="%view.module.name"
+			allowMultiple="false"
+			icon="icons/views/mod_obj.gif"
+			class="org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardModuleBrowserView"
+			id="org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardModuleBrowserView">
+		</view>
+		<view
+			name="%view.activeModule.name"
+			allowMultiple="false"
+			icon="icons/views/active_mod_obj.gif"
+			class="org.eclipse.linuxtools.systemtap.ui.dashboard.views.ActiveModuleBrowserView"
+			id="org.eclipse.linuxtools.systemtap.ui.dashboard.views.ActiveModuleBrowserView">
+		</view>
+		<view
+			name="%view.dashboard.name"
+			allowMultiple="false"
+			icon="icons/views/dashboard_obj.gif"
+			class="org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardView"
+			id="org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardView">
+		</view>
+  <view
+        allowMultiple="false"
+        class="org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardGraphsBrowserView"
+        icon="icons/misc/graph_act.gif"
+        id="org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardModuleGraphsView"
+        name="%view.graphs.name">
+  </view>
+	</extension>
+	
+	<extension
+		point="org.eclipse.ui.commands">
+		<command
+			name="%command.import.name"
+			description="%command.import.desc"
+			categoryId="org.eclipse.linuxtools.systemtap.ui.dashboard.category.file"
+			id="org.eclipse.linuxtools.systemtap.ui.dashboard.commands.ImportModuleAction"/>
+		<command
+			name="%command.stop.name"
+			description="%command.stop.desc"
+			categoryId="org.eclipse.linuxtools.systemtap.ui.dashboard.category.run"
+			id="org.eclipse.linuxtools.systemtap.ui.dashboard.commands.StopModuleAction"/>
+		<command
+			name="%command.pause.name"
+			description="%command.pause.desc"
+			categoryId="org.eclipse.linuxtools.systemtap.ui.dashboard.category.run"
+			id="org.eclipse.linuxtools.systemtap.ui.dashboard.commands.PauseModuleAction"/>
+		<command
+			name="%command.run.name"
+			description="%command.run.desc"
+			categoryId="org.eclipse.linuxtools.systemtap.ui.dashboard.category.run"
+			id="org.eclipse.linuxtools.systemtap.ui.dashboard.commands.RunModuleAction"/>
+		<!--command
+			name="%command.new.name"
+			description="%command.new.desc"
+			categoryId="org.eclipse.linuxtools.systemtap.ui.dashboard.category.file"
+			id="org.eclipse.linuxtools.systemtap.ui.dashboard.commands.CreateModuleAction"/-->
+	
+		<category
+			name="%category.file.name"
+			description="%category.file.desc"
+			id="org.eclipse.linuxtools.systemtap.ui.dashboard.category.file"/>
+		<category
+			name="%category.run.name"
+			description="%category.run.desc"
+			id="org.eclipse.linuxtools.systemtap.ui.dashboard.category.run"/>
+	</extension>
+
+	<extension
+		point="org.eclipse.ui.bindings">
+		<key
+			commandId="org.eclipse.linuxtools.systemtap.ui.dashboard.commands.ImportModuleAction"
+			contextId="org.eclipse.ui.contexts.window"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+			sequence="M1+I"/>
+	</extension>
+	
+	<extension
+		point="org.eclipse.ui.actionSets">
+		<actionSet
+			label="%actionset.file.name"
+			visible="false"
+			id="org.eclipse.linuxtools.systemtap.ui.dashboard.FileActionSet">
+			<action
+				label="%action.import.name"
+				tooltip="%action.import.desc"
+				id="org.eclipse.linuxtools.systemtap.ui.dashboard.actions.ImportModuleAction"
+				icon="icons/actions/import_wiz.gif"
+				toolbarPath="org.eclipse.ui.workbench.file/open.ext"
+				menubarPath="file2/new.ext"
+				class="org.eclipse.linuxtools.systemtap.ui.dashboard.actions.ImportModuleLocationAction"
+				definitionId="org.eclipse.linuxtools.systemtap.ui.dashboard.commands.ImportModuleAction"
+				style="push"
+				state="false"/>
+				<!--action
+				label="%action.new.name"
+				tooltip="%action.new.desc"
+				id="org.eclipse.linuxtools.systemtap.ui.dashboard.actions.CreateModuleAction"
+				icon="icons/actions/import_wiz.gif"
+				toolbarPath="org.eclipse.ui.workbench.file/open.ext"
+				menubarPath="file2/new.ext"
+				class="org.eclipse.linuxtools.systemtap.ui.dashboard.actions.CreateModuleAction"
+				definitionId="org.eclipse.linuxtools.systemtap.ui.dashboard.commands.CreateModuleAction"
+				style="push"
+				state="true"/-->
+		</actionSet>
+		<actionSet
+			label="%actionset.run.name"
+			visible="false"
+			id="org.eclipse.linuxtools.systemtap.ui.dashboard.RunActionSet">
+			<action
+				label="%action.stop.name"
+				tooltip="%action.stop.desc"
+				class="org.eclipse.linuxtools.systemtap.ui.dashboard.actions.StopModuleAction"
+				definitionId="org.eclipse.linuxtools.systemtap.ui.dashboard.commands.StopModuleAction"
+				icon="icons/actions/stop_script.gif"
+				id="org.eclipse.linuxtools.systemtap.ui.dashboard.actions.StopModuleAction"
+				state="false"
+				style="push"
+				menubarPath="launch/wbStart"
+				toolbarPath="org.eclipse.ui.workbench.file/build.group">
+			</action>
+			<action
+				label="%action.pause.name"
+				tooltip="%action.pause.desc"
+				id="org.eclipse.linuxtools.systemtap.ui.dashboard.actions.PauseModuleAction"
+				icon="icons/actions/pause_script.gif"
+				toolbarPath="org.eclipse.ui.workbench.file/build.group"
+				menubarPath="launch/wbStart"
+				class="org.eclipse.linuxtools.systemtap.ui.dashboard.actions.PauseModuleAction"
+				definitionId="org.eclipse.linuxtools.systemtap.ui.dashboard.commands.PauseModuleAction"
+				style="push"
+				state="false"/>
+			<action
+				label="%action.run.name"
+				tooltip="%action.run.desc"
+				class="org.eclipse.linuxtools.systemtap.ui.dashboard.actions.RunModuleAction"
+				definitionId="org.eclipse.linuxtools.systemtap.ui.dashboard.commands.RunModuleAction"
+				icon="icons/actions/start_script.gif"
+				id="org.eclipse.linuxtools.systemtap.ui.dashboard.actions.RunModuleAction"
+				menubarPath="launch/wbStart"
+				state="false"
+				style="push"
+				toolbarPath="org.eclipse.ui.workbench.file/build.group"/>
+		</actionSet>
+	</extension>
+
+	<extension
+		point="org.eclipse.ui.preferencePages">
+		<page
+			name="%preference.dashboard.name"
+			id="com.qualityeclipse.systemtap.prefs.dashboard"
+			class="org.eclipse.linuxtools.systemtap.ui.dashboard.preferences.DashboardPreferencePage"
+			category="com.qualityeclipse.systemtap.prefs.view"/>
+	</extension>
+
+	<extension
+		point="org.eclipse.core.runtime.preferences">
+		<initializer class="org.eclipse.linuxtools.systemtap.ui.dashboard.preferences.PreferenceInitializer"/>
+	</extension>
+
+	<extension
+		point="org.eclipse.help.toc">
+		<toc
+			file="toc.xml"
+			primary="true"/>
+		<toc file="documentation/tocconcepts.xml"/>
+		<toc file="documentation/tocgettingstarted.xml"/>
+		<toc file="documentation/tocreference.xml"/>
+		<toc file="documentation/toctasks.xml"/>
+	</extension>
+
+	<!--<extension
+		point="org.eclipse.ui.popupMenus">
+		<objectContribution
+			adaptable="false"
+			id="org.eclipse.linuxtools.systemtap.ui.dashboard.RunModuleMenu"
+			objectClass="org.eclipse.linuxtools.systemtap.ui.structures.TreeNode">
+			<action
+				label="%action.stop.name"
+				class="org.eclipse.linuxtools.systemtap.ui.dashboard.actions.StopModuleAction"
+				icon="icons/actions/stop_script.gif"
+				menubarPath="build.ext"
+				id="org.eclipse.linuxtools.systemtap.ui.dashboard.StopModuleAction"
+				style="push"/>
+			<action
+				label="%action.pause.name"
+				class="org.eclipse.linuxtools.systemtap.ui.dashboard.actions.PauseModuleAction"
+				icon="icons/actions/pause_script.gif"
+				menubarPath="build.ext"
+				id="org.eclipse.linuxtools.systemtap.ui.dashboard.PauseModuleAction"
+				style="push"/>
+			<action
+				label="%action.run.name"
+				class="org.eclipse.linuxtools.systemtap.ui.dashboard.actions.RunModuleAction"
+				icon="icons/actions/start_script.gif"
+				menubarPath="build.ext"
+				id="org.eclipse.linuxtools.systemtap.ui.dashboard.RunModuleAction"
+				style="push"/>
+		</objectContribution>
+	</extension>-->
+
+	<extension
+		point="org.eclipse.ui.popupMenus">
+		<objectContribution
+			adaptable="false"
+			id="org.eclipse.linuxtools.systemtap.ui.dashboard.ShowGraphMenu"
+			objectClass="org.eclipse.linuxtools.systemtap.ui.dashboard.structures.GraphTreeNode">
+			<action
+				label="%action.activateGraph.name"
+				class="org.eclipse.linuxtools.systemtap.ui.dashboard.actions.ActivateGraphAction"
+				icon="icons/misc/graph_act.gif"
+				menubarPath="build.ext"
+				id="org.eclipse.linuxtools.systemtap.ui.dashboard.ActivateGraphAction"
+				style="push"/>
+			<action
+				label="%action.stopGraph.name"
+				class="org.eclipse.linuxtools.systemtap.ui.dashboard.actions.StopGraphAction"
+				icon="icons/misc/graph_dis.gif"
+				menubarPath="build.ext"
+				id="org.eclipse.linuxtools.systemtap.ui.dashboard.StopGraphAction"
+				style="push"/>
+		</objectContribution>
+	</extension>
+
+	<extension
+		point="org.eclipse.ui.perspectiveExtensions">
+		<perspectiveExtension
+			targetID="org.eclipse.linuxtools.systemtap.ui.dashboard.DashboardPerspective">
+			<actionSet id="org.eclipse.linuxtools.systemtap.ui.dashboard.FileActionSet"/>
+			<actionSet id="org.eclipse.linuxtools.systemtap.ui.dashboard.RunActionSet"/>
+			<perspectiveShortcut id="org.eclipse.linuxtools.systemtap.ui.systemtapgui.Perspective"/>
+		</perspectiveExtension>
+		<perspectiveExtension
+			targetID="org.eclipse.linuxtools.systemtap.ui.systemtapgui.Perspective">
+			<perspectiveShortcut id="org.eclipse.linuxtools.systemtap.ui.dashboard.DashboardPerspective"/>
+		</perspectiveExtension>
+		<perspectiveExtension
+			targetID="org.eclipse.linuxtools.systemtap.ui.graphing.GraphingPerspective">
+			<perspectiveShortcut id="org.eclipse.linuxtools.systemtap.ui.dashboard.DashboardPerspective"/>
+		</perspectiveExtension>
+		<perspectiveExtension
+			targetID="org.eclipse.linuxtools.systemtap.ui.ide.IDEPerspective">
+			<perspectiveShortcut id="org.eclipse.linuxtools.systemtap.ui.dashboard.DashboardPerspective"/>
+		</perspectiveExtension>
+	</extension>
+ <!-- <extension
+       point="org.eclipse.ui.menus">
+    <menuContribution
+          locationURI="toolbar:org.eclipse.ui.main.toolbar">
+       <toolbar
+             id="org.eclipse.linuxtools.systemtap.ui.dashboard.toolbar1">
+          <visibleWhen
+                checkEnabled="true">
+          </visibleWhen>
+         <command
+               commandId="org.eclipse.linuxtools.systemtap.ui.dashboard.commands.ImportModuleAction"
+               id="org.eclipse.linuxtools.systemtap.ui.dashboard.commands.ImportModuleAction"
+               label="a">
+            <visibleWhen>
+            </visibleWhen>
+         </command>
+		<command
+        commandId="org.eclipse.linuxtools.systemtap.ui.dashboard.commands.StopModuleAction"
+        id="org.eclipse.linuxtools.systemtap.ui.dashboard.commands.StopModuleAction"
+        label="b"/>
+		<command
+        commandId="org.eclipse.linuxtools.systemtap.ui.dashboard.commands.StopModuleAction"
+        id="org.eclipse.linuxtools.systemtap.ui.dashboard.commands.PauseModuleAction"
+        label="c"/>
+		<command
+        commandId="org.eclipse.linuxtools.systemtap.ui.dashboard.commands.StopModuleAction"
+        id="org.eclipse.linuxtools.systemtap.ui.dashboard.commands.RunModuleAction"
+        label="d"/>
+       </toolbar>
+    </menuContribution>
+ </extension> -->
+</plugin>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardAdapter.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardAdapter.java
new file mode 100644
index 0000000..0af0b08
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardAdapter.java
@@ -0,0 +1,328 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.DragSource;
+import org.eclipse.swt.dnd.DragSourceListener;
+import org.eclipse.swt.dnd.DropTarget;
+import org.eclipse.swt.dnd.DropTargetListener;
+import org.eclipse.swt.dnd.TextTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.events.ControlListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.PlatformUI;
+
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.IDataSet;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.structures.GraphData;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.charts.AbstractChartBuilder;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.widgets.GraphComposite;
+import org.eclipse.linuxtools.systemtap.ui.structures.TreeNode;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.actions.StopGraphAction;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.internal.DashboardPlugin;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.DashboardGraphData;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.GraphTreeNode;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.views.ActiveModuleBrowserView;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardView;
+
+/**
+ * This class is used to contain a graph for the DashboardComposite.  The class
+ * provides a windowing framework that allows the user to close the graph at
+ * will and to toggle whether or not to display the graph configuration settings.
+ * @author Henry Hughes
+ * @author Ryan Morse
+ */
+public class DashboardAdapter {
+	/**
+	 * This constructor sets up all of the basic internal components for class.
+	 * @param parent This is the component that will act as the parent container
+	 * @param gd The data that will be used to construct the internal graph
+	 * @param ds The data used to populate the graph.
+	 */
+	public DashboardAdapter(DashboardComposite parent, GraphData gd, IDataSet ds, String moduleName) {
+		folder = new CTabFolder(parent.deadComposite, SWT.NONE);
+		FormLayout layout = new FormLayout();
+		layout.marginHeight = 0; layout.marginWidth = 0;
+		parent.deadComposite.setLayout(layout);
+		
+		FormData data = new FormData();
+		data.left = new FormAttachment(0,0);
+		data.top = new FormAttachment(0,0);
+		data.right = new FormAttachment(100,0);
+		data.bottom = new FormAttachment(100,0);
+		
+		folder.setLayoutData(folder);
+		folder.setLayout(new FormLayout());
+		//folder.setTabHeight(0);
+		
+		ToolBar toolBar = new ToolBar (folder, SWT.FLAT | SWT.BORDER);
+		min = new ToolItem(toolBar, SWT.PUSH);
+		min.setImage(expandImage);
+		close = new ToolItem(toolBar, SWT.PUSH);
+		close.setImage(closeImage);
+		max = new ToolItem(toolBar, SWT.PUSH);
+		max.setImage(maxImage);
+		toolBar.pack ();
+		folder.setTopRight(toolBar);
+         modulename = moduleName;
+		resetDND(null, null);
+		
+		createGraph(gd, ds);
+		wireButtons(parent);
+	}
+
+	/**
+	 * This method creates the internal graph that will be displayed in this container.
+	 * @param gd The graph data used to specify the graph that will be created.
+	 * @param ds The data set that is used to populate the graph.
+	 */
+	private void createGraph(GraphData gd, IDataSet ds) {
+		//Setup canvas
+		CTabItem item = new CTabItem(folder, SWT.NONE);
+		Composite c = new Composite(folder, SWT.NONE);
+		c.addControlListener(new ControlListener() {
+		      public void controlMoved(ControlEvent e) {
+		      }
+
+		      public void controlResized(ControlEvent e) {
+		        
+		      }
+		    });    
+		//c.setExpan
+		FormData data = new FormData();
+		data.left = new FormAttachment(0,0);
+		data.top = new FormAttachment(0,0);
+		data.left = new FormAttachment(100,0);
+		data.right = new FormAttachment(100,0);
+		c.setLayoutData(data);
+		c.setLayout(new FormLayout());
+		item.setControl(c);
+		//item.setText(gd.title);
+		folder.setSelection(item);
+		
+		//Create graph
+		gc = new GraphComposite(c, SWT.NONE, gd, ds);
+		gc.configure(false);
+		FormData fd = new FormData();
+		fd.left = new FormAttachment(0,0);
+		fd.right = new FormAttachment(100,0);
+		fd.top = new FormAttachment(0,0);
+		fd.bottom = new FormAttachment(100,0);
+		gc.setLayoutData(fd);
+	}
+	
+	/**
+	 * This method resets all Drag And Drop information.
+	 * @param drag This is the object that is being moved
+	 * @param drop This is the object that occupies the desired location of the first object.
+	 */
+	public void resetDND(DragSourceListener drag, DropTargetListener drop) {
+		if(drag != null) dragSource.removeDragListener(drag);
+		if(drop != null) dropTarget.removeDropListener(drop);
+		if(dragSource != null) dragSource.dispose();
+		if(dropTarget != null) dropTarget.dispose();
+		dragSource = new DragSource(folder, DND.DROP_MOVE);
+		dragSource.setTransfer(types);
+		dropTarget = new DropTarget(folder, DND.DROP_MOVE | DND.DROP_DEFAULT);
+		dropTarget.setTransfer(types);
+	}
+	
+	/**
+	 * Creates and addes the action listeners for the buttons.
+	 * @param comp The composite that is containing this class.
+	 */
+	private void wireButtons(DashboardComposite comp) {
+		SelectionListener listener = new DashboardShimButtonController(this, comp);
+		close.addSelectionListener(listener);
+		min.addSelectionListener(listener);
+		max.addSelectionListener(listener);
+	}
+	
+	/**
+	 * Updates the containers parent with the provided composite.
+	 * @param c The new composite that will serve as the parent.
+	 */
+	public void setParent(Composite c) {
+		folder.setParent(c);
+	}
+
+	/**
+	 * Changes the layout information for this class.
+	 * @param o The new layout informatino for the class.
+	 */
+	public void setLayoutData(Object o) {
+		folder.setLayoutData(o);
+	}
+	
+	/**
+	 * Sets whether or not the graph is visible
+	 * @param b Visibility flag.
+	 */
+	public void setVisible(boolean b) {
+		folder.setVisible(b);
+	}
+	
+	/**
+	 * Returns the internal graph that is being displayed
+	 * @return The graph that is held by this class.
+	 */
+	public AbstractChartBuilder getGraph() {
+		return gc.getCanvas();
+		
+	}
+	
+	/**
+	 * Closes this class and removes it from being displayed in the parent composite.
+	 * Also updates its display information in the ActiveModuleBrowserView.
+	 */
+	private void closeShim() {
+		IViewPart ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(ActiveModuleBrowserView.ID);
+		ActiveModuleBrowserView ambv = (ActiveModuleBrowserView)ivp;
+		TreeNode root = (TreeNode)ambv.getViewer().getTree().getData();
+		TreeNode node;
+		GraphTreeNode child;
+		for(int j,i=0; i<root.getChildCount(); i++) {
+			node = root.getChildAt(i);
+			for(j=0; j<node.getChildCount(); j++) {
+				child = (GraphTreeNode)node.getChildAt(j);
+				if(this == ((DashboardGraphData)child.getData()).adapter) {
+					StopGraphAction sga = new StopGraphAction();
+					sga.run(child);
+					return;
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Removes all internal references in this class.  Nothing should make any references
+	 * to anyting in this class after calling the dispose method.
+	 */
+	public void dispose() {
+		if(null != folder)
+			folder.dispose();
+		folder = null;
+		if(null != close)
+			close.dispose();
+		close = null;
+		if(null != min)
+			min.dispose();
+		min = null;
+		if(null != dragSource)
+			dragSource.dispose();
+		dragSource = null;
+		if(null != dropTarget)
+			dropTarget.dispose();
+		dropTarget = null;
+		IViewPart ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(DashboardView.ID);
+		((DashboardView)ivp).getUpdater().removeUpdateListener(getGraph());
+		if(null != gc && !gc.isDisposed())
+			gc.dispose();
+		gc = null;
+		types = null;
+	}
+	
+	/**
+	 * This class handles the button clicks for the three buttons on the window bar.  It
+	 * supports closing the window, as well as toggling whether or not to display the
+	 * Graph display options.
+	 * @author Henry Hughes
+	 * @author Ryan Morse
+	 */
+	private class DashboardShimButtonController implements SelectionListener {
+		DashboardAdapter shim;
+		DashboardComposite composite;
+		boolean maximized = false;
+		public DashboardShimButtonController(DashboardAdapter shim, DashboardComposite composite) {
+			this.shim = shim;
+			this.composite = composite;
+		}
+		
+		public void widgetSelected(SelectionEvent e) {
+			if(e.widget == close)
+				closeShim();
+
+			if(e.widget == min) {
+				Composite c = (Composite)folder.getSelection().getControl();
+				Control[] children = c.getChildren();
+				for(int i = 0; i < children.length; i++) {
+					if(children[i] instanceof GraphComposite) {
+						GraphComposite gc = (GraphComposite)children[i];
+						gc.configure(!gc.isSidebarVisible());
+						if(gc.isSidebarVisible())
+							min.setImage(collapseImage);
+						else
+							min.setImage(expandImage);
+					}
+				}
+			}
+			if(e.widget == max) {
+				Composite c = (Composite)folder.getSelection().getControl();
+				Control[] children = c.getChildren();
+				for(int i = 0; i < children.length; i++) {
+					if(children[i] instanceof GraphComposite) {
+						GraphComposite gc = (GraphComposite)children[i];
+							if(!maximized)
+						{
+						composite.maximize(shim);
+						max.setImage(restoreImage);
+						maximized= true;
+						}
+          			else
+          			{
+						composite.restore();
+						max.setImage(maxImage);
+						maximized= false;
+						}					
+						}
+				}
+			}
+
+		}
+
+		public void widgetDefaultSelected(SelectionEvent e) {}
+	}
+	
+	public String getmodulename()
+	{
+		return modulename;
+	}
+
+	public CTabFolder folder;
+	public DragSource dragSource;
+	public DropTarget dropTarget;
+	private ToolItem close, min, max;
+	private GraphComposite gc;
+	private String modulename;
+	Transfer[] types = new Transfer[] { TextTransfer.getInstance() };
+
+	private static final Image closeImage = DashboardPlugin.getImageDescriptor("icons/actions/graph/close.gif").createImage();
+	private static final Image collapseImage = DashboardPlugin.getImageDescriptor("icons/actions/graph/collapse.gif").createImage();
+	private static final Image expandImage = DashboardPlugin.getImageDescriptor("icons/actions/graph/expand.gif").createImage();
+	private static final Image maxImage = DashboardPlugin.getImageDescriptor("icons/actions/graph/maximize.gif").createImage();
+	private static final Image restoreImage = DashboardPlugin.getImageDescriptor("icons/actions/graph/restore.gif").createImage();
+
+}
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardComposite.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardComposite.java
new file mode 100644
index 0000000..3ef2f4f
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardComposite.java
@@ -0,0 +1,493 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard;
+
+import java.util.ArrayList;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.DragSourceAdapter;
+import org.eclipse.swt.dnd.DragSourceEvent;
+import org.eclipse.swt.dnd.DropTargetAdapter;
+import org.eclipse.swt.dnd.DropTargetEvent;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * A multiplexing composite class that presents itself as one composite, while
+ * allowing up to 8 DashboardAdapter composites to render on its surface. Handles
+ * space allocation, drag/drop between the composites.
+ * @author Henry Hughes
+ */
+public class DashboardComposite {
+
+	/**
+	 * The set of internal composites, these are rendered on by the associated adapters.
+	 */
+	private final Composite[] internal = new Composite[8];
+	/**
+	 * The set of external DashboardAdapter references, each one of these is associated
+	 * with the internal Composite sharing its index number in the internal array.
+	 */
+	private final DashboardAdapter[] external = new DashboardAdapter[8];
+	/**
+	 * Used slot counter, keeps track of how many internal composites are presently dirty.
+	 */
+	private int usedSlotCount = 0;
+	/**
+	 * Drag listeners for all of the internal composites.
+	 */
+	private final InternalCompositeDragListener[] dragListeners = new InternalCompositeDragListener[8];
+	/**
+	 * Drop listeners for all of the internal composites.
+	 */
+	private final InternalCompositeDropListener[] dropListeners = new InternalCompositeDropListener[8];
+	/**
+	 * Queue at the end of the list. When there are 8 objects rendering and a 9th object is added, 
+	 * it is placed on this queue and displayed when an internal composite is released.
+	 */
+	private final ArrayList externalQueue = new ArrayList();
+	/**
+	 * The actual rendering surface.
+	 */
+	private final Composite surface;
+	
+	int maximized = 0;
+	/**
+	 * Parental hell. When objects are added to this composite incorrectly, the next run of the
+	 * reparent algorithm will assign objects that are drawing on the wrong composite to this deadComposite.
+	 * This composite is not rendered, it is set invisible and disabled. When an object is added to the
+	 * rendering queue, it is also reparented to the dead composite.
+	 */
+	public final Composite deadComposite;
+	
+	public void layout() {	//TODO: Remove this.  It is a temporary solution to another bug
+		surface.layout(true, true);
+	}
+	
+	/**
+	 * Default constructor for the DashboardComposite. Creates all of the internal composites, sets up
+	 * listeners.
+	 * @param parent The parent Composite for this Composite.
+	 * @param style SWT style flag to use.
+	 */
+	public DashboardComposite(Composite parent, int style) {
+		parent.setLayout(new FormLayout());
+		FormData data = new FormData();
+		data.left = new FormAttachment(0,0);
+		data.right = new FormAttachment(100, 0);
+		data.top = new FormAttachment(0,0);
+		data.bottom = new FormAttachment(100,0);
+		surface = new Composite(parent, style);
+		surface.setLayoutData(data);
+		surface.setLayout(new FormLayout());
+		deadComposite = new Composite(parent, style);
+		deadComposite.setVisible(false);
+		for(int i = 0; i < internal.length; i++)
+		{
+			internal[i] = new Composite(surface, SWT.NONE);
+			data = new FormData();
+			internal[i].setLayoutData(data);
+			internal[i].setVisible(false);
+			internal[i].setLayout(new FormLayout());
+			external[i] = null;
+			dragListeners[i] = new InternalCompositeDragListener(i);
+			dropListeners[i] = new InternalCompositeDropListener(i);
+		}
+	}
+	
+	/**
+	 * This listener detects drag events inside the DashboardComposite and creates
+	 * a string that represents the ID of the composite that is being dragged.
+	 * @author Henry Hughes
+	 */
+	private class InternalCompositeDragListener extends DragSourceAdapter
+	{
+		final int sourceID;
+		public InternalCompositeDragListener(int k)
+		{
+			super();
+			sourceID = k;
+		}
+		public void dragStart(DragSourceEvent event) {
+			super.dragStart(event);
+			if(!external[sourceID].folder.isVisible())
+				event.doit = false;
+		}
+
+		public void dragSetData(DragSourceEvent event) {
+			super.dragSetData(event);
+			event.data = Integer.toString(sourceID);
+		}
+	}
+	
+	/**
+	 * This listener detects drop events, and invokes the move(int,int) method in DashboardComposite
+	 * to swap the composites.
+	 * @author Henry Hughes
+	 */
+	private class InternalCompositeDropListener extends DropTargetAdapter
+	{
+		final int sourceID;
+		public InternalCompositeDropListener(int k)
+		{
+			sourceID = k;
+		}
+		public void dragEnter(DropTargetEvent event) {
+			if(event.currentDataType != null)
+				event.detail = DND.DROP_MOVE;
+			else
+				event.detail = DND.DROP_NONE;
+		}
+
+		public void dragOperationChanged(DropTargetEvent event) {
+			super.dragOperationChanged(event);
+		}
+		long lastDropTime = 0;
+		public void drop(DropTargetEvent event) {
+			super.drop(event);
+			int k = -1;
+			
+			/* For some absurdly stupid reason this method seems to be called twice under
+			 * certain circumstances. This is probably a bug in eclipse's SDK, nonetheless, it's our
+			 * problem now. To get around this, we check for timestamps within 100ms of each other.
+			 * If the last drop was fired less than 100ms ago, we silently eat the event.
+			 */
+			long eventTime = (long)(event.time & 0xFFFFFFFFL);
+			if(eventTime > lastDropTime - 100 && eventTime < lastDropTime + 100) return;
+			
+			try
+			{
+				k = Integer.parseInt((String)event.data);
+			}
+			catch (NumberFormatException e) {}
+			if(k > -1 && k < 8 && k != sourceID)
+			{
+				move(k, sourceID);
+				move(k,k);  //dont ask me why, but the original graph refuses to update without this
+				lastDropTime = eventTime;
+			}	
+		}
+	}
+	
+	/**
+	 * Adds the input DashboardAdapter to the DashboardComposite, either assigning it an internal composite
+	 * and rescaling the composite if necessary, or adding it to the queue if there are no free internal
+	 * composites to use.
+	 * @param c DashboardAdapter to add.
+	 */
+	public void add(DashboardAdapter c)
+	{
+		int index = findLowestOpenSlot();
+		if(index == -1)	//add to the queue
+		{
+			externalQueue.add(c);
+			return;
+		}
+		external[index] = c;
+		FormData data = new FormData();
+		data.left= new FormAttachment(0,0);
+		data.right = new FormAttachment(100,0);
+		data.top = new FormAttachment(0,0);
+		data.bottom = new FormAttachment(100,0);
+		c.folder.setParent(internal[index]);
+		c.folder.setLayoutData(data);
+		bindDND(index);
+		calculateUsedSlots();
+		scale();
+		surface.layout(true, true);
+	}
+	
+	/**
+	 * Removes the input DashboardAdapter, removing it from the internal composite it's associated to
+	 * or from the queue, compacting the internal and external arrays, then rescaling. 
+	 * @param c DashboardAdapter to remove.
+	 */
+	public void remove(DashboardAdapter c)
+	{
+		int index = -1;
+		for(int i = 0; i < external.length; i++)
+			if(external[i] == c)
+				index = i;
+		if(index == -1)	//it's probably in externalQueue, pop it off of the queue and done
+			externalQueue.remove(c);
+		else	//it's on the rendering queue... deal with it
+		{
+			external[index].resetDND(dragListeners[index], dropListeners[index]);
+			external[index] = null;
+			
+			compact();
+			reparent();
+			calculateUsedSlots();
+			scale();
+			surface.layout(true, true);
+		}
+	}
+	/**
+	 * Swaps the objects rendering on composites from and to, reparenting them to their new homes and
+	 * moving them in the actual array. Also resets drag and drop listeners on those objects. 
+	 */
+	public void move(int from, int to)
+	{
+		DashboardAdapter fromShim = external[from], toShim = external[to];
+		external[to] = fromShim;
+		external[from] = toShim;
+		
+		external[to].setParent(internal[to]);
+		external[from].setParent(internal[from]);
+		
+		fromShim.resetDND(dragListeners[from], dropListeners[from]); 
+		toShim.resetDND(dragListeners[to], dropListeners[to]);
+		bindDND(from);
+		bindDND(to);
+		
+		return;
+	}
+	/**
+	 * Binds the drag and drop listeners for the given slots.
+	 * @param slot Slot to bind D&D.
+	 */
+	private void bindDND(int slot)
+	{
+		external[slot].dragSource.addDragListener(dragListeners[slot]);
+		external[slot].dropTarget.addDropListener(dropListeners[slot]);
+	}
+	/**
+	 * Finds the lowest open slot index.
+	 * @return Returns the lowest available internal slot's index.
+	 */
+	private int findLowestOpenSlot()
+	{
+		for(int i = 0; i < external.length; i++)
+			if(external[i] == null)
+				return i;
+		return -1;
+	}
+	/**
+	 * Calculates the number of used slots.
+	 */
+	private void calculateUsedSlots()
+	{
+		int count = 0;
+		for (int i = 0; i < external.length; i++)
+			if(external[i] != null)
+				count++;
+		usedSlotCount = count;
+	}
+	/**
+	 * "Crushes" the external array, removing open slots that are not at the end of the list.
+	 */
+	private void compact()
+	{
+		int i = 0, j = 0;
+		while(i < external.length)
+		{
+			while(i < external.length && external[i] != null)
+				i++;
+			if(i == external.length) break;
+			//we've found the lowest null slot
+			if(externalQueue.size() > 0)
+			{	//fill it from the queue
+				external[i] = (DashboardAdapter)externalQueue.remove(0);
+				FormData data = new FormData();
+				data.left= new FormAttachment(0,0);
+				data.right = new FormAttachment(100,0);
+				data.top = new FormAttachment(0,0);
+				data.bottom = new FormAttachment(100,0);
+				external[i].setLayoutData(data);
+				continue;
+			}
+			j = i;
+			while(j < external.length && external[j] == null)
+				j++;
+			if(j == external.length) break;		//we never found a non-null, so i is the first blank slot
+			external[i] = external[j];
+			external[j] = null;
+			i = j;
+		}
+	}
+	/**
+	 * Reparents all the external DashboardAdapters to the correct internal composite.
+	 */
+	private void reparent()
+	{
+		for(int i = 0; i < internal.length; i++)
+		{
+			Control[] c = internal[i].getChildren();
+			for(int j = 0; j < c.length; j++)
+			{
+				if(external[i] != null && c[j] == external[i].folder)
+					c[j].setVisible(true);
+				else
+					c[j].setParent(deadComposite);
+			}
+		}
+		for(int i = 0 ; i < external.length; i++)
+		{
+			if(external[i] != null)
+			{
+				external[i].setParent(internal[i]);
+				external[i].resetDND(null, null);
+				bindDND(i);
+			}
+		}
+	}
+	
+	/**
+	 * Removes the input DashboardAdapter, removing it from the internal composite it's associated to
+	 * or from the queue, compacting the internal and external arrays, then rescaling. 
+	 * @param c DashboardAdapter to remove.
+	 */
+	public void maximize(DashboardAdapter c)
+	{
+		int index = -1;
+		for(int i = 0; i < external.length; i++)
+			if(external[i] == c)
+				index = i;
+	//	if(index == -1)	//it's probably in externalQueue, pop it off of the queue and done
+		//	externalQueue.remove(c);
+		//else	//it's on the rendering queue... deal with it
+		//{
+	//		external[index].resetDND(dragListeners[index], dropListeners[index]);
+	//		external[index] = null;
+			usedSlotCount = 1;
+			//calculateUsedSlots(index);
+			maximized = index;
+			scale();
+			surface.layout(true, true);
+	//	}
+	}
+	/**
+	 * Removes the input DashboardAdapter, removing it from the internal composite it's associated to
+	 * or from the queue, compacting the internal and external arrays, then rescaling. 
+	 * @param c DashboardAdapter to remove.
+	 */
+	public void restore()
+	{
+			calculateUsedSlots();
+			maximized = 0;
+			scale();
+			surface.layout(true, true);
+	}
+	
+	public int getusedSlots()
+	{
+		return usedSlotCount;
+	}
+	/**
+	 * Sets the LayoutData for all of the internal Composites, scaling the size to an appropriate amount
+	 * for the number of currently used slots.
+	 */
+	private void scale()
+	{
+		switch(usedSlotCount)
+		{
+		case 8:
+		case 7:
+			//turn on all internal composites, 4x2 layout
+			for(int i = 0; i < 8; i++)
+			{
+				FormData data = new FormData();
+				data.left = new FormAttachment(i%2 * 50, 0);
+				data.right = new FormAttachment((i%2 +1)* 50, 0);
+				data.top = new FormAttachment(i / 2, 4, 0);
+				data.bottom = new FormAttachment(i/2+1, 4, 0);
+				internal[i].setLayoutData(data);
+				internal[i].setVisible(true);
+				if(external[i] != null) external[i].setVisible(true);
+			}
+			break;
+		case 6:
+		case 5:
+			//turn on 6 internal composites, 3x2 layout
+			for(int i = 0; i < 6; i++)
+			{
+				FormData data = new FormData();
+				data.left = new FormAttachment(i%2 * 50, 0);
+				data.right = new FormAttachment((i%2+1) * 50, 0);
+				data.top = new FormAttachment(i /2,3, 0);
+				data.bottom = new FormAttachment(i/2+1,3, 0);
+				internal[i].setLayoutData(data);
+				internal[i].setVisible(true);
+				if(external[i]!= null) external[i].setVisible(true);
+			}
+			for(int i = 6; i < 8; i++)
+			{
+				internal[i].setVisible(false);
+				if(external[i] != null) external[i].setVisible(false);	//this should never happen
+			}
+			break;
+		case 4:
+		case 3:
+			//turn on 4 internal composites, 2x2 layout
+			for(int i = 0; i < 4; i++)
+			{
+				FormData data = new FormData();
+				data.left = new FormAttachment(i%2 * 50, 0);
+				data.right = new FormAttachment((i%2+1) * 50, 0);
+				data.top = new FormAttachment(i / 2,2, 0);
+				data.bottom = new FormAttachment(i/2+1,2, 0);
+				internal[i].setLayoutData(data);
+				internal[i].setVisible(true);
+				if(external[i] != null) external[i].setVisible(true);
+			}
+			for(int i = 4; i < 8; i++)
+			{
+				internal[i].setVisible(false);
+				if(external[i] != null) external[i].setVisible(false);	//this should never happen
+			}
+			break;
+		case 2:
+			//turn on 2 internal composites, 1x2 layout
+			for(int i = 0; i < 2; i++)
+			{
+				FormData data = new FormData();
+				data.left = new FormAttachment(0, 3);
+				data.right = new FormAttachment(100, -3);
+				data.top = new FormAttachment(i ,2, 3);
+				data.bottom = new FormAttachment(i+1,2, -3);
+				internal[i].setLayoutData(data);
+				internal[i].setVisible(true);
+				external[i].setVisible(true);
+			}
+			for(int i = 2; i < 8; i++)
+			{
+				internal[i].setVisible(false);
+				if(external[i] != null) external[i].setVisible(false);	//this should never happen
+			}
+			break;
+		case 1:
+		case 0:
+		default:
+			//turn on 1 internal composite, full layout
+			FormData data = new FormData();
+			data.left = new FormAttachment(0, 0);
+			data.right = new FormAttachment(100, 0);
+			data.top = new FormAttachment(0, 0);
+			data.bottom = new FormAttachment(100, 0);
+			internal[maximized].setLayoutData(data);
+			internal[maximized].setVisible(true);
+			if(external[maximized] != null) external[maximized].setVisible(true);
+			for(int i = usedSlotCount; i < 8; i++)
+			{
+				if (i!=maximized)
+				{
+				internal[i].setVisible(false);
+				if(external[i] != null) external[i].setVisible(false);	//this should never happen
+				}
+			}
+		}
+	}
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardPerspective.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardPerspective.java
new file mode 100644
index 0000000..cfa7fca
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardPerspective.java
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard;
+
+
+import org.eclipse.ui.IFolderLayout;
+import org.eclipse.ui.IPageLayout;
+import org.eclipse.ui.IPerspectiveFactory;
+
+import org.eclipse.linuxtools.systemtap.ui.logging.LogManager;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.views.ActiveModuleBrowserView;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardModuleBrowserView;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardView;
+
+/**
+ * The <code>DashboardPerspective</code> class defines the layout of the Dashboard perspective
+ * in the application.
+ * @see org.eclipse.ui.IPerspectiveFactory
+ * @author Ryan Morse
+ */
+public class DashboardPerspective implements IPerspectiveFactory {
+	public static String ID = "org.eclipse.linuxtools.systemtap.ui.dashboard.DashboardPerspective";
+	
+	public void createInitialLayout(IPageLayout layout) {
+		LogManager.logDebug("Start createInitialLayout:", this);
+
+		//Don't display the editor
+		String editorArea = layout.getEditorArea();
+		layout.setEditorAreaVisible(false);
+
+		//Create the left hand tabed view
+		IFolderLayout browsers = layout.createFolder("browsers", IPageLayout.LEFT, 0.25f, editorArea);
+		browsers.addPlaceholder(DashboardModuleBrowserView.ID + ":*");
+		browsers.addView(DashboardModuleBrowserView.ID);
+		
+		
+		IFolderLayout browsers2 = layout.createFolder("browsers2", IPageLayout.BOTTOM, 0.5f, "browsers");
+		browsers2.addPlaceholder(ActiveModuleBrowserView.ID + ":*");
+		browsers2.addView(ActiveModuleBrowserView.ID);
+
+		layout.getViewLayout(DashboardModuleBrowserView.ID).setCloseable(false);
+		layout.getViewLayout(ActiveModuleBrowserView.ID).setCloseable(false);
+		//DashboardModuleBrowserView.getmoduleNames();
+		/*for (int i=0 ; i<moduleNames.size(); i++)
+		{
+			System.out.println("Dashboard perspective: " + moduleNames.get(i));
+		}*/
+
+		//Add the graph content view.
+		layout.addStandaloneView(DashboardView.ID, false, IPageLayout.TOP, 1.0f, editorArea);
+
+		layout.getViewLayout(DashboardView.ID).setCloseable(false);
+		layout.getViewLayout(DashboardView.ID).setMoveable(false);
+
+		//Add all perspectives to the MainMenu. Window->Show View
+		layout.addShowViewShortcut(DashboardView.ID);
+		layout.addShowViewShortcut(DashboardModuleBrowserView.ID);
+		layout.addShowViewShortcut(ActiveModuleBrowserView.ID);
+
+		//Add a link to the perspective in the MainMenu.  Window->Open Perspective
+		layout.addPerspectiveShortcut(ID);
+
+		LogManager.logDebug("End createInitialLayout:", this);
+	}
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardSessionSettings.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardSessionSettings.java
new file mode 100644
index 0000000..97224ef
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/DashboardSessionSettings.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard;
+
+import java.util.ArrayList;
+
+/**
+ * This is a simple class used to store information specific to the dashboard that
+ * needs to be accessesed at random.
+ * @author Ryan Morse
+ */
+public class DashboardSessionSettings {
+	public static String password = null;
+	public static ArrayList allmodules = null;
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/ActivateGraphAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/ActivateGraphAction.java
new file mode 100644
index 0000000..e416212
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/ActivateGraphAction.java
@@ -0,0 +1,120 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.actions;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Cursor;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IViewActionDelegate;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.PlatformUI;
+
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.DashboardGraphData;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.GraphTreeNode;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.views.ActiveModuleBrowserView;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardView;
+
+/**
+ * This action is responsible for starting up a closed graph.  This is used when a module
+ * has already been started, but one of the graphs is not being displayed for what ever reason.
+ * This will make the selected graph active again.
+ * @author Ryan Morse
+ */
+public class ActivateGraphAction extends Action implements IViewActionDelegate {
+	public void init(IViewPart view) {
+		selectedItem = null;
+	}
+	
+	public void run(IAction act) {
+		run();
+	}
+
+	public void run() {
+		run(selectedItem);
+	}
+	
+	/**
+	 * This method retreives the graph information for the selected item and then
+	 * creates the graph for display.
+	 * @param selected The graph item that is currently selected and needs to be activated
+	 */
+	public void run(GraphTreeNode selected) {
+		 Display disp = PlatformUI.getWorkbench().getDisplay();
+		  Cursor cursor = new Cursor(disp, SWT.CURSOR_WAIT);
+		  PlatformUI.getWorkbench().getDisplay().getActiveShell().setCursor(cursor);
+
+		
+		IViewPart ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(DashboardView.ID);
+
+		DashboardGraphData data = ((DashboardGraphData)selected.getData());
+		
+	 	
+	//	IFilteredDataSet fds = DataSetFactory.createFilteredDataSet(data.data);
+	//	for(int k=0; k<data.filters.length; k++)
+		//	fds.addFilter(data.filters[k]);
+		data.adapter = ((DashboardView)ivp).createGraph(data.graph, data.data, data.moduleName);
+
+		ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(ActiveModuleBrowserView.ID);
+		ActiveModuleBrowserView ambv = (ActiveModuleBrowserView)ivp;
+		ambv.getViewer().refresh();
+		  PlatformUI.getWorkbench().getDisplay().getActiveShell().setCursor(null);
+		  cursor.dispose();
+	}
+	
+	/**
+	 * This method updates what item is currently selected.
+	 * @param action The action that started this method.
+	 * @param selection The newly selected item
+	 */
+	public void selectionChanged(IAction action, ISelection selection) {
+		if(selection instanceof IStructuredSelection) {
+			IStructuredSelection selected = (IStructuredSelection)selection;
+			Object o = selected.getFirstElement();
+			if(o instanceof GraphTreeNode) {
+				selectedItem = (GraphTreeNode)o;
+				o = selectedItem.getData();
+				if(null == ((DashboardGraphData)o).adapter) {
+					action.setEnabled(true);
+					return;
+				}
+			}
+		}
+		action.setEnabled(false);
+	}
+	
+	private GraphTreeNode selectedItem;
+
+	public void run(GraphTreeNode selected, String module) {
+		 Display disp = PlatformUI.getWorkbench().getDisplay();
+		  Cursor cursor = new Cursor(disp, SWT.CURSOR_WAIT);
+		  PlatformUI.getWorkbench().getDisplay().getActiveShell().setCursor(cursor);
+
+		IViewPart ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(DashboardView.ID);
+
+		DashboardGraphData data = ((DashboardGraphData)selected.getData());
+		
+	//	IFilteredDataSet fds = DataSetFactory.createFilteredDataSet(data.data);
+	//	for(int k=0; k<data.filters.length; k++)
+		//	fds.addFilter(data.filters[k]);
+		data.adapter = ((DashboardView)ivp).createGraph(data.graph, data.data, module);
+
+		ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(ActiveModuleBrowserView.ID);
+		ActiveModuleBrowserView ambv = (ActiveModuleBrowserView)ivp;
+		ambv.getViewer().refresh();
+		  PlatformUI.getWorkbench().getDisplay().getActiveShell().setCursor(null);
+		  cursor.dispose();
+	}
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/CustomAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/CustomAction.java
new file mode 100644
index 0000000..3ce20bc
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/CustomAction.java
@@ -0,0 +1,27 @@
+package org.eclipse.linuxtools.systemtap.ui.dashboard.actions;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
+
+public class CustomAction extends Action implements IWorkbenchAction{
+
+    private static final String ID = "org.eclipse.linuxtools.systemtap.ui.dashboard.actions.CustomAction";
+
+    public CustomAction(){
+        setId(ID);
+    }
+
+    public void run() {
+
+        Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+        String dialogBoxTitle = "Message";
+        String message = "You clicked something!";
+        MessageDialog.openInformation(shell, dialogBoxTitle, message);
+    }
+
+    public void dispose() {}
+
+}
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/ImportModuleLocationAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/ImportModuleLocationAction.java
new file mode 100644
index 0000000..83af91a
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/ImportModuleLocationAction.java
@@ -0,0 +1,103 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.actions;
+
+import java.io.File;
+import java.text.MessageFormat;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+
+import org.eclipse.linuxtools.systemtap.ui.logging.LogManager;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.internal.DashboardPlugin;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.internal.Localization;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.preferences.DashboardPreferenceConstants;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardModuleBrowserView;
+
+/**
+ * This action allows users to add new directories of DashboardModules.  This provides support for downloading
+ * packages from other locations as they become more prevelent.
+ * @author Ryan Morse
+ */
+public class ImportModuleLocationAction extends Action implements IWorkbenchWindowActionDelegate {
+	private IWorkbenchWindow fWindow;
+
+	public ImportModuleLocationAction() {
+		setEnabled(true);
+	}
+
+	public void dispose() {
+		LogManager.logInfo("Disposing", this);
+		fWindow= null;
+	}
+
+	public void init(IWorkbenchWindow window) {
+		LogManager.logInfo("Initializing fWindow: " + window, this);
+		fWindow= window;
+	}
+
+	public void run(IAction action) {
+		run();
+	}
+
+	public void selectionChanged(IAction action, ISelection selection) {}
+
+	/**
+	 * This method brings up a dialog window for the user to select the directory
+	 * that they have additional modules in.  The new directory is then added
+	 * to the list of module directories.  Once added, the dashboard is refreshed to
+	 * make sure all modules are included in the view, including those in the folder
+	 * just added.
+	 */
+	public void run() {
+		LogManager.logDebug("Start run:", this);
+		File file= queryFolder();
+		if (file != null) {
+			IPreferenceStore p = DashboardPlugin.getDefault().getPreferenceStore();
+			String folders = p.getString(DashboardPreferenceConstants.P_MODULE_FOLDERS);
+
+			p.setValue(DashboardPreferenceConstants.P_MODULE_FOLDERS, folders + File.pathSeparator + file.getAbsolutePath());
+			
+			IViewPart ivp = fWindow.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(DashboardModuleBrowserView.ID);
+			((DashboardModuleBrowserView)ivp).refresh();
+		} else if (file != null) {
+			String msg = MessageFormat.format(Localization.getString("ImportModuleLocationAction.FileIsNull"), (Object[])new String[]{file.getName()});
+			MessageDialog.openWarning(fWindow.getShell(), Localization.getString("ImportModuleLocationAction.Problem"), msg);
+		}
+		LogManager.logDebug("End run:", this);
+	}
+
+	/**
+	 * This method brings up a new dialog window for the user to select the directory
+	 * that they have a number of modules in.
+	 * @return The folder that the user selected.
+	 */
+	private File queryFolder() {
+		DirectoryDialog dialog= new DirectoryDialog(fWindow.getShell(), SWT.OPEN);
+		dialog.setText(Localization.getString("ImportModuleLocationAction.ImportDashboardModules"));
+		String path= dialog.open();
+		if (path != null && path.length() > 0) {
+			LogManager.logDebug("queryFile: returnVal-" + path, this);
+			return new File(path);
+		}
+		LogManager.logDebug("queryFile: returnVal-null", this);
+		return null;
+	}
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/PauseModuleAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/PauseModuleAction.java
new file mode 100644
index 0000000..32581ac
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/PauseModuleAction.java
@@ -0,0 +1,229 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.actions;
+
+import java.util.ArrayList;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.ui.IViewActionDelegate;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.eclipse.ui.PlatformUI;
+
+import org.eclipse.linuxtools.systemtap.ui.structures.TreeNode;
+import org.eclipse.linuxtools.systemtap.ui.structures.listeners.IActionListener;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.actions.hidden.GetSelectedModule;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.ActiveModuleData;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.DashboardModule;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.views.ActiveModuleBrowserView;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardModuleBrowserView;
+
+/**
+ * This action is used to pause the selected dashboard module.  This is only a fake pause.  
+ * The graph is left open, and the SystemTap script is stopped.  The user can then start
+ * the script running again and have it output to the same graph.  This provides the illusion
+ * of being paused.
+ * @author Ryan Morse
+ */
+public class PauseModuleAction extends Action implements IViewActionDelegate, IWorkbenchWindowActionDelegate {
+	public void init(IViewPart view) {
+		this.view = view;
+	}
+	
+	public void init(IWorkbenchWindow window) {}
+	
+	public void run(IAction act) {
+		run();
+	}
+	
+	/**
+	 * This is the main method of the class. It handles the "pretend" pause of the module.  The stap process is
+	 * stopped but the graph is left open.
+	 */
+	public void run() {
+		DashboardModule module = GetSelectedModule.getModule(view);
+		IViewPart ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(ActiveModuleBrowserView.ID);
+		ActiveModuleBrowserView ambv = (ActiveModuleBrowserView)ivp;
+		if(ambv.isActive(module)) {
+			ActiveModuleData amd = ambv.pause(module);
+			if (amd.cmd.isRunning()) {
+			amd.cmd.stop();
+			amd.cmd.dispose(); }
+			amd.paused = true;
+		}
+		fireActionEvent();
+		setEnablement(false);
+		buildEnablementChecks();
+	}
+	
+	/**
+	 * This updates the enablement of the action based on the newly selected item
+	 * @param act The action that called this method
+	 * @param select The newly selected item.
+	 */
+	public void selectionChanged(IAction act, ISelection select) {
+		this.act = act;
+		setEnablement(false);
+		buildEnablementChecks();
+	}
+	
+	/**
+	 * This method handles creating the checks that are used to determine if
+	 * the action should be enabled for use.
+	 */
+	private void buildEnablementChecks() {
+		IViewPart ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(DashboardModuleBrowserView.ID);
+		if(null != ivp) {
+			final DashboardModuleBrowserView dmbv = (DashboardModuleBrowserView)ivp;
+			dmbv.getViewer().addSelectionChangedListener(moduleListener);
+			
+			ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(ActiveModuleBrowserView.ID);
+			final ActiveModuleBrowserView ambv = (ActiveModuleBrowserView)ivp;
+			ambv.getViewer().addSelectionChangedListener(activeModuleListener);
+			
+			RunModuleAction.addActionListener(runListener);
+			StopModuleAction.addActionListener(stopListener);
+		}
+	}
+	
+	/**
+	 * Toggles whether or not the action is enabled
+	 * @param enabled boolean flag representing whether the action is enabled or not
+	 */
+	private void setEnablement(boolean enabled) {
+		act.setEnabled(enabled);
+	}
+	
+	/**
+	 * Removes all internal references provided by this action.  Nothing should be
+	 * called or referenced after the dispose method.
+	 */
+	public void dispose() {
+		try {
+			IViewPart ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(DashboardModuleBrowserView.ID);
+			final DashboardModuleBrowserView dmbv = (DashboardModuleBrowserView)ivp;
+			dmbv.getViewer().removeSelectionChangedListener(moduleListener);
+			
+			ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(ActiveModuleBrowserView.ID);
+			final ActiveModuleBrowserView ambv = (ActiveModuleBrowserView)ivp;
+			ambv.getViewer().removeSelectionChangedListener(activeModuleListener);
+			
+			RunModuleAction.removeActionListener(runListener);
+			StopModuleAction.removeActionListener(stopListener);
+		} catch(Exception e) {}
+		
+		view = null;
+		act = null;
+	}
+	
+	/**
+	 * Adds a new listener to the button to inform others when the pause button
+	 * is pressed.
+	 * @param listener The class interested in knowing when scripts are paused
+	 */
+	public static void addActionListener(IActionListener listener) {
+		listeners.add(listener);
+	}
+	
+	/**
+	 * Removes the listener from getting pause events.
+	 * @param listener The class that no longer should receive pause notices
+	 */
+	public static void removeActionListener(IActionListener listener) {
+		listeners.remove(listener);
+	}
+	
+	/**
+	 * This method fires the event when a module is paused to every listener
+	 * that is registered.
+	 */
+	private static void fireActionEvent() {
+		for(int i=0; i<listeners.size(); i++)
+			((IActionListener)listeners.get(i)).handleActionEvent();
+	}
+	
+	/**
+	 * Enables this action everytime a new module is run.
+	 */
+	private final IActionListener runListener = new IActionListener() {
+		public void handleActionEvent() {
+			setEnablement(true);
+		}
+	};
+	
+	/**
+	 * Disables this action everytime a module is stopped.
+	 */
+	private final IActionListener stopListener = new IActionListener() {
+		public void handleActionEvent() {
+			setEnablement(false);
+		}
+	};
+	
+	/**
+	 * This method checks to see if the newly selected item in the 
+	 * ActiveModuleBrowserView is paused or not.  It will then set the
+	 * enablement based on whether or not it is already paused.
+	 */
+	private final ISelectionChangedListener activeModuleListener = new ISelectionChangedListener() {
+		public void selectionChanged(SelectionChangedEvent e) {
+			try {
+				TreeNode node = (TreeNode)((StructuredSelection)(e.getSelection())).getFirstElement();
+				if(((ActiveModuleData)node.getData()).paused)
+					setEnablement(false);
+				else
+					setEnablement(true);
+			} catch(Exception ex) {}
+		}
+	};
+	
+	/**
+	 * This method checks to see if the newly selected item in the 
+	 * DashboardModuleBrowserView is running or not.  It will then set the
+	 * enablement based on whether or not it is running.
+	 */
+	private final ISelectionChangedListener moduleListener = new ISelectionChangedListener() {
+		public void selectionChanged(SelectionChangedEvent e) {
+			try {
+				TreeNode node = (TreeNode)((StructuredSelection)(e.getSelection())).getFirstElement();
+				IViewPart ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(ActiveModuleBrowserView.ID);
+				ActiveModuleBrowserView amdv = (ActiveModuleBrowserView)ivp;
+				int childcount = node.getChildCount();
+				if(0 == childcount && amdv.isActive((DashboardModule)node.getData()) && !amdv.isPaused((DashboardModule)node.getData()))
+					setEnablement(true);
+				else if(childcount > 0)
+				{   	
+					boolean pause = false;
+						for(int j=0; j<childcount; j++) {
+							if(amdv.isActive((DashboardModule)node.getChildAt(j).getData()) && !amdv.isPaused((DashboardModule)node.getChildAt(j).getData())) {
+								pause = true;
+								break; }
+						}
+						if (pause == true ) setEnablement(true);
+					
+				}
+				else
+					setEnablement(false);
+			} catch(Exception ex) {}
+		}
+	};
+	
+	private IViewPart view;
+	private IAction act;
+	private static ArrayList listeners = new ArrayList();
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/RunModuleAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/RunModuleAction.java
new file mode 100644
index 0000000..dfa48d2
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/RunModuleAction.java
@@ -0,0 +1,416 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.actions;
+
+import java.util.ArrayList;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Cursor;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IViewActionDelegate;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.eclipse.ui.PlatformUI;
+
+import org.eclipse.linuxtools.systemtap.ui.consolelog.ClientSession;
+import org.eclipse.linuxtools.systemtap.ui.consolelog.ScpClient;
+import org.eclipse.linuxtools.systemtap.ui.consolelog.Subscription;
+import org.eclipse.linuxtools.systemtap.ui.consolelog.dialogs.SelectServerDialog;
+import org.eclipse.linuxtools.systemtap.ui.consolelog.internal.ConsoleLogPlugin;
+import org.eclipse.linuxtools.systemtap.ui.consolelog.preferences.ConsoleLogPreferenceConstants;
+import org.eclipse.linuxtools.systemtap.ui.consolelog.structures.ScriptConsole;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.IDataSet;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.wizards.dataset.DataSetFactory;
+import org.eclipse.linuxtools.systemtap.ui.structures.TreeNode;
+import org.eclipse.linuxtools.systemtap.ui.structures.listeners.IActionListener;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.actions.hidden.GetSelectedModule;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.ActiveModuleData;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.DashboardModule;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.views.ActiveModuleBrowserView;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardModuleBrowserView;
+import org.eclipse.linuxtools.systemtap.ui.graphicalrun.structures.ChartStreamDaemon2;
+import org.eclipse.linuxtools.systemtap.ui.systemtapgui.preferences.EnvironmentVariablesPreferencePage;
+
+/**
+ * This action is used to run the selected dashboard module.  
+ * The command is setup and started.  Any graphs associated with the module
+ * are also added to the main window the the user to monitor.
+ * @author Ryan Morse
+ */
+public class RunModuleAction extends Action implements IViewActionDelegate, IWorkbenchWindowActionDelegate {
+//	public RunModuleAction(){
+	//	buildEnablementChecks();
+	//}
+	
+	public void init(IViewPart view) {
+		this.view = view;
+	}
+	
+	public void init(IWorkbenchWindow window) {
+		fWindow= window;
+	}
+	
+	public void run(IAction act) {
+		run();
+	}
+	
+	/**
+	 * This is the main method of the class. It handles running of the module.  
+	 * The command is setup and started.  Any graphs associated with the module
+	 * are also added to the main window the the user to monitor.
+	 */
+	public void run() {
+		//Get the treeViewer
+//		BusyIndicator.showWhile(Display.getCurrent(), this.);
+		 Display disp = PlatformUI.getWorkbench().getDisplay();
+		  Cursor cursor = new Cursor(disp, SWT.CURSOR_WAIT);
+		  PlatformUI.getWorkbench().getDisplay().getActiveShell().setCursor(cursor);
+
+		DashboardModule module = null;
+		TreeNode node = GetSelectedModule.getNode(view);
+		if (node.getChildCount() == 0)
+		{
+			module = (DashboardModule)node.getData(); 
+		if(null != module) {
+			runScript(module);
+				setEnablement(false);
+				buildEnablementChecks();
+			fireActionEvent();
+			
+		} }
+		else { 
+			for(int j=0; j<node.getChildCount(); j++) {
+			module = (DashboardModule)node.getChildAt(j).getData();
+			runScript(module);
+			setEnablement(false);
+			buildEnablementChecks();
+			fireActionEvent();
+			}
+			}
+		  PlatformUI.getWorkbench().getDisplay().getActiveShell().setCursor(null);
+		  cursor.dispose();
+
+	}
+	
+	/*public void run() {
+		//Get the treeViewer
+		IViewPart ivp;
+		//DashboardModule module = GetSelectedModule.getModule(view);
+		TreeNode node = GetSelectedModule.getModule(view);
+		if(null != node) {	
+			ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(ActiveModuleBrowserView.ID);
+			ActiveModuleBrowserView ambv = (ActiveModuleBrowserView)ivp;
+			boolean paused = ambv.isPaused(module);
+					
+			//TODO: Check for prebuilt module first
+			String[] cmd = new String[] {
+					"stap",
+					"-g",
+					module.script.getAbsolutePath()};
+			
+			IDataSet ds;
+			if(paused)
+				ds = ambv.pause(module).data;
+			else
+				ds = DataSetFactory.createDataSet(module.dataSetID, module.labels);
+			//LoggedCommand command = new LoggedCommand(cmd, getEnvironmentVariables(), new PasswordPrompt(DashboardSessionSettings.password), 100);
+			//command.addInputStreamListener(new ChartStreamDaemon(ds, module.parser));
+			//command.start();
+			  fileName = module.script.getAbsolutePath();
+            
+			createClientSession();
+			//if(paused)
+				//ambv.pause(module).paused = false;
+			//else {
+				ActiveModuleData amd = new ActiveModuleData();
+				amd.module = module;
+				amd.cmd = console;
+				amd.data = ds;
+				amd.paused = false;
+				addActive(module.category + "." + module.display, amd);
+			//}
+				setEnablement(false);
+				buildEnablementChecks();
+			fireActionEvent();
+			
+		} else { buildEnablementChecks(); }
+	}*/
+	
+	/**
+	 * Adds the newly run module to the ActiveModuleBrowserView.
+	 * @param display The name used to display this module
+	 * @param amd The data used in the running module.
+	 */
+	private void addActive(String display, ActiveModuleData amd) {
+		IViewPart ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(ActiveModuleBrowserView.ID);
+		((ActiveModuleBrowserView)ivp).add(display, amd);
+	}
+	
+	private String[] getEnvironmentVariables() {
+		return EnvironmentVariablesPreferencePage.getEnvironmentVariables();
+	}
+	
+	private void runScript(DashboardModule module)
+	{
+		IViewPart ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(ActiveModuleBrowserView.ID);
+		ActiveModuleBrowserView ambv = (ActiveModuleBrowserView)ivp;
+		boolean paused = ambv.isPaused(module);
+		fileName = module.script.getAbsolutePath();
+		String tmpfileName = fileName;
+		String serverfileName = fileName.substring(fileName.lastIndexOf('/')+1);
+		if(ConsoleLogPlugin.getDefault().getPluginPreferences().getBoolean(ConsoleLogPreferenceConstants.REMEMBER_SERVER)!=true)
+        	
+        {
+			new SelectServerDialog(fWindow.getShell()).open();
+		}
+	  if (module.location.equalsIgnoreCase("local")) {
+		 try{
+				ScpClient scpclient = new ScpClient();
+				tmpfileName=null;
+				tmpfileName="/tmp/"+ serverfileName;
+				 scpclient.transfer(fileName,tmpfileName);
+		    }catch(Exception e){e.printStackTrace();}
+	  }
+		String modname = serverfileName.substring(0, serverfileName.indexOf('.'));
+		if (modname.indexOf('-') != -1)
+			modname = modname.substring(0, modname.indexOf('-'));
+	
+		//TODO: Check for prebuilt module first
+		String[] cmd = new String[] {
+				"stap",
+				"-g",
+				"-m",
+				modname,
+				tmpfileName};
+		
+			   	ScriptConsole console = ScriptConsole.getInstance(serverfileName);
+            console.run(cmd, null, null, null);
+		IDataSet ds;
+		if(paused)
+			ds = ambv.pause(module).data;
+		else
+			ds = DataSetFactory.createDataSet(module.dataSetID, module.labels);
+		  
+		console.getCommand().addInputStreamListener(new ChartStreamDaemon2(console, ds, module.parser));
+		  
+		 
+		  
+	//	createClientSession();
+	//	subscription.addInputStreamListener(new ChartStreamDaemon2(console, ds, module.parser));
+
+		//if(paused)
+			//ambv.pause(module).paused = false;
+		//else {
+			ActiveModuleData amd = new ActiveModuleData();
+			amd.module = module;
+			amd.cmd = console;
+			amd.data = ds;
+			amd.paused = false;
+			addActive(module.category + "." + module.display, amd);
+		//}
+	
+	}
+	
+	/**
+	 * This updates the enablement of the action based on the newly selected item
+	 * @param act The action that called this method
+	 * @param select The newly selected item.
+	 */
+	public void selectionChanged(IAction act, ISelection select) {
+		this.act = act;
+		setEnablement(false);
+		buildEnablementChecks();
+	}
+	
+	/**
+	 * This method handles creating the checks that are used to determine if
+	 * the action should be enabled for use.
+	 */
+	private void buildEnablementChecks() {
+		IViewPart ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(DashboardModuleBrowserView.ID);
+		if(null != ivp) {
+			final DashboardModuleBrowserView dmbv = (DashboardModuleBrowserView)ivp;
+			dmbv.getViewer().addSelectionChangedListener(moduleListener);
+			
+			ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(ActiveModuleBrowserView.ID);
+			final ActiveModuleBrowserView ambv = (ActiveModuleBrowserView)ivp;
+			ambv.getViewer().addSelectionChangedListener(activeModuleListener);
+			
+			StopModuleAction.addActionListener(stopListener);
+		PauseModuleAction.addActionListener(pauseListener);
+		}
+	}
+	
+	/**
+	 * Toggles whether or not the action is enabled
+	 * @param enabled boolean flag representing whether the action is enabled or not
+	 */
+	private void setEnablement(boolean enabled) {
+		act.setEnabled(enabled);
+	}
+	
+	/**
+	 * Removes all internal references provided by this action.  Nothing should be
+	 * called or referenced after the dispose method.
+	 */
+	public void dispose() {
+		try {
+			IViewPart ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(DashboardModuleBrowserView.ID);
+			final DashboardModuleBrowserView dmbv = (DashboardModuleBrowserView)ivp;
+			dmbv.getViewer().removeSelectionChangedListener(moduleListener);
+			
+			ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(ActiveModuleBrowserView.ID);
+			final ActiveModuleBrowserView ambv = (ActiveModuleBrowserView)ivp;
+			ambv.getViewer().removeSelectionChangedListener(activeModuleListener);
+			
+			StopModuleAction.removeActionListener(stopListener);
+			PauseModuleAction.removeActionListener(pauseListener);
+		} catch(Exception e) {
+			
+		}
+		view = null;
+		act = null;
+		fWindow = null;
+	}
+	
+	/**
+	 * Adds a new listener to the button to inform others when the run button
+	 * is pressed.
+	 * @param listener The class interested in knowing when scripts are run
+	 */
+	public static void addActionListener(IActionListener listener) {
+		listeners.add(listener);
+	}
+	
+	/**
+	 * Removes the listener from getting run events.
+	 * @param listener The class that no longer should receive run notices
+	 */
+	public static void removeActionListener(IActionListener listener) {
+		listeners.remove(listener);
+	}
+	
+	/**
+	 * This method fires the event when a module is run to every listener
+	 * that is registered.
+	 */
+	private static void fireActionEvent() {
+		for(int i=0; i<listeners.size(); i++)
+			((IActionListener)listeners.get(i)).handleActionEvent();
+	}
+	
+	/**
+	 * Enables this action everytime a module is stopped.
+	 */
+	private final IActionListener stopListener = new IActionListener() {
+		public void handleActionEvent() {
+			setEnablement(true);
+		}
+	};
+	
+	/**
+	 * Enables this action everytime a module is paused.
+	 */
+	private final IActionListener pauseListener = new IActionListener() {
+		public void handleActionEvent() {
+			setEnablement(true);
+		}
+	};
+	
+	/**
+	 * This method checks to see if the newly selected item in the 
+	 * ActiveModuleBrowserView is paused or not.  It will then set the
+	 * enablement based on whether or not it is already paused.
+	 */
+	private final ISelectionChangedListener activeModuleListener = new ISelectionChangedListener() {
+		public void selectionChanged(SelectionChangedEvent e) {
+			try {
+				TreeNode node = (TreeNode)((StructuredSelection)(e.getSelection())).getFirstElement();
+				if(((ActiveModuleData)node.getData()).paused)
+					setEnablement(true);
+				else
+					setEnablement(false);
+			} catch(Exception ex) {}
+		}
+	};
+	
+	/**
+	 * This method checks to see if the newly selected item in the 
+	 * DashboardModuleBrowserView is running or not.  It will then set the
+	 * enablement based on whether or not it is running.
+	 */
+	private final ISelectionChangedListener moduleListener = new ISelectionChangedListener() {
+		public void selectionChanged(SelectionChangedEvent e) {
+			try {
+				TreeNode node = (TreeNode)((StructuredSelection)(e.getSelection())).getFirstElement();
+				IViewPart ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(ActiveModuleBrowserView.ID);
+				ActiveModuleBrowserView amdv = (ActiveModuleBrowserView)ivp;
+				DashboardModule module = (node.getData() instanceof DashboardModule) ? (DashboardModule)node.getData() : null;
+				int childcount = node.getChildCount();
+				if(0 == childcount && !amdv.isActive(module))
+					setEnablement(true);
+				else if(amdv.isActive(module) && amdv.isPaused(module))
+					setEnablement(true);
+				else if(childcount > 0)
+				{   	
+					boolean active = false;
+					
+					
+						for(int j=0; j<childcount; j++) {
+							if(amdv.isActive((DashboardModule)node.getChildAt(j).getData())) {
+								active = true;
+								break; }
+						}
+						if (active == false ) setEnablement(true);
+					
+				}
+				else
+				 setEnablement(false);
+			} catch(Exception ex) {}
+		}
+	};
+	
+	protected boolean createClientSession()
+	{
+		
+		if (!ClientSession.isConnected())
+		{
+				new SelectServerDialog(fWindow.getShell()).open();
+		}
+		if((ConsoleLogPlugin.getDefault().getPluginPreferences().getBoolean(ConsoleLogPreferenceConstants.CANCELLED))!=true)
+		{
+		subscription = new Subscription(fileName,false);
+		if (ClientSession.isConnected())		
+		{
+	//	console = ScriptConsole.getInstance(fileName, subscription);
+     //   console.run();
+		}
+		}		
+		return true;
+	}
+	
+	private IViewPart view;
+	private static ArrayList listeners = new ArrayList();
+	private String fileName = null;
+	protected IWorkbenchWindow fWindow = null;
+	private IAction act;
+	protected Subscription subscription;
+	protected int SCRIPT_ID;
+	protected ScriptConsole console;
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/StopGraphAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/StopGraphAction.java
new file mode 100644
index 0000000..151d60d
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/StopGraphAction.java
@@ -0,0 +1,86 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.actions;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IViewActionDelegate;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.PlatformUI;
+
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.DashboardGraphData;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.GraphTreeNode;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.views.ActiveModuleBrowserView;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardView;
+
+/**
+ * This action is responsible for stopping an active graph.  This is used when a module
+ * has already been started, but the user no longer wants to see one of the graphs.
+ * This will make the selected graph inactive, with the option for bringing it back up
+ * at a future time.
+ * @author Ryan Morse
+ */
+public class StopGraphAction extends Action implements IViewActionDelegate {
+	public void init(IViewPart view) {
+		selectedItem = null;
+	}
+	
+	public void run(IAction act) {
+		run();
+	}
+
+	public void run() {
+		run(selectedItem);
+	}
+	
+	/**
+	 * This method retreives the graph information for the selected item and then
+	 * disposes of the graph from the display.
+	 * @param selected The graph item that is currently selected and needs to be deactivated
+	 */
+	public void run(GraphTreeNode selected) {
+		DashboardGraphData data = ((DashboardGraphData)selected.getData());
+		IViewPart ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(DashboardView.ID);
+		DashboardView dv = (DashboardView)ivp;
+		dv.removeGraph(data.adapter,data.adapter.getmodulename());
+		data.adapter = null;
+
+		ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(ActiveModuleBrowserView.ID);
+		ActiveModuleBrowserView ambv = (ActiveModuleBrowserView)ivp;
+		ambv.getViewer().refresh();
+	}
+	
+	/**
+	 * This method updates what item is currently selected.
+	 * @param action The action that started this method.
+	 * @param selection The newly selected item
+	 */
+	public void selectionChanged(IAction action, ISelection selection) {
+		if(selection instanceof IStructuredSelection) {
+			IStructuredSelection selected = (IStructuredSelection)selection;
+			Object o = selected.getFirstElement();
+			if(o instanceof GraphTreeNode) {
+				selectedItem = (GraphTreeNode)o;
+				o = selectedItem.getData();
+				if(null == ((DashboardGraphData)o).adapter) {
+					action.setEnabled(false);
+					return;
+				}
+			}
+		}
+		action.setEnabled(true);
+	}
+	
+	private GraphTreeNode selectedItem;
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/StopModuleAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/StopModuleAction.java
new file mode 100644
index 0000000..66fffbd
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/StopModuleAction.java
@@ -0,0 +1,269 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.actions;
+
+import java.util.ArrayList;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.ui.IViewActionDelegate;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.eclipse.ui.PlatformUI;
+
+import org.eclipse.linuxtools.systemtap.ui.structures.TreeNode;
+import org.eclipse.linuxtools.systemtap.ui.structures.listeners.IActionListener;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.actions.hidden.GetSelectedModule;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.ActiveModuleData;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.ActiveModuleTreeNode;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.DashboardGraphData;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.DashboardModule;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.GraphTreeNode;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.views.ActiveModuleBrowserView;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardModuleBrowserView;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardView;
+
+/**
+ * This action is used to stop the selected dashboard module.  The graphs are all
+ * closed, the process is killed, and the item is removed from tha ActiveModuleBrowserView.
+ * @author Ryan Morse
+ */
+public class StopModuleAction extends Action implements IViewActionDelegate, IWorkbenchWindowActionDelegate {
+	public void init(IViewPart view) {
+		this.view = view;
+	}
+	
+	public void init(IWorkbenchWindow window) {}
+	
+	public void run(IAction act) {
+		run();
+	}
+	
+	/**
+	 * This is the main method of the class. It handles stopping of the module.  
+	 * All of the graphs are closed, the process is killed, and the item
+	 * is removed from the ActiveModuleBrowserView.
+	 */
+	public void run() {
+		PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() {
+			boolean stop = false;
+			public void run() {
+				if(stop) return;
+				try {
+					TreeNode treenode = GetSelectedModule.getNode(view);
+					DashboardModule module = null;
+					if (treenode.getChildCount() == 0)
+					{
+						module = (DashboardModule)treenode.getData();
+						stop =  stopmodule(module);
+					}
+					else 
+					{ 
+						for(int j=0; j<treenode.getChildCount(); j++) {
+						module = (DashboardModule)treenode.getChildAt(j).getData();
+						stop = stopmodule(module) || stop ;
+						}
+					}
+				} catch (Exception e) {
+					stop = true;
+				}
+			}
+		});
+	}
+	
+	private boolean stopmodule(DashboardModule module)
+	{
+		IViewPart ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(ActiveModuleBrowserView.ID);
+		ActiveModuleBrowserView ambv = (ActiveModuleBrowserView)ivp;
+		GraphTreeNode graphNode;
+		DashboardGraphData graphData;
+		boolean stop = false;
+		try{
+			if(ambv.isActive(module)) {
+				ActiveModuleTreeNode node = ambv.remove(module);
+				ActiveModuleData amd = (ActiveModuleData)node.getData();
+				
+				ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(DashboardView.ID);
+				DashboardView dv = (DashboardView)ivp;
+				
+				for(int i=0; i<node.getChildCount(); i++) {
+					graphNode = (GraphTreeNode)node.getChildAt(i);
+					graphData = (DashboardGraphData)graphNode.getData();
+					if(null != graphData.adapter) {
+						dv.removeGraph(graphData.adapter, module.getcategory());
+						graphData.adapter = null;
+					}
+				}
+				
+				if(!amd.paused) {
+					if (amd.cmd.isRunning())
+					amd.cmd.stop();
+					amd.data = null;
+				}
+				dv.closeComposite(amd.module.category);
+				amd = null;
+				fireActionEvent();
+			}
+
+			setEnablement(false);
+			buildEnablementChecks();
+		} catch (Exception e) {
+			stop = true;
+		}	
+		return stop;
+	}
+	
+	/**
+	 * This updates the enablement of the action based on the newly selected item
+	 * @param act The action that called this method
+	 * @param select The newly selected item.
+	 */
+	public void selectionChanged(IAction act, ISelection select) {
+		this.act = act;
+		setEnablement(false);
+		buildEnablementChecks();
+	}
+	
+	/**
+	 * This method handles creating the checks that are used to determine if
+	 * the action should be enabled for use.
+	 */
+	private void buildEnablementChecks() {
+		IViewPart ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(DashboardModuleBrowserView.ID);
+		if(null != ivp) {
+			final DashboardModuleBrowserView dmbv = (DashboardModuleBrowserView)ivp;
+			dmbv.getViewer().addSelectionChangedListener(moduleListener);
+			
+			ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(ActiveModuleBrowserView.ID);
+			final ActiveModuleBrowserView ambv = (ActiveModuleBrowserView)ivp;
+			ambv.getViewer().addSelectionChangedListener(activeModuleListener);
+			
+			RunModuleAction.addActionListener(runListener);
+		}
+	}
+	
+	/**
+	 * Toggles whether or not the action is enabled
+	 * @param enabled boolean flag representing whether the action is enabled or not
+	 */
+	private void setEnablement(boolean enabled) {
+		act.setEnabled(enabled);
+	}
+	
+	/**
+	 * Removes all internal references provided by this action.  Nothing should be
+	 * called or referenced after the dispose method.
+	 */
+	public void dispose() {
+		try {
+			RunModuleAction.removeActionListener(runListener);
+	
+			IViewPart ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(DashboardModuleBrowserView.ID);
+			final DashboardModuleBrowserView dmbv = (DashboardModuleBrowserView)ivp;
+			dmbv.getViewer().removeSelectionChangedListener(moduleListener);
+			
+			ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(ActiveModuleBrowserView.ID);
+			final ActiveModuleBrowserView ambv = (ActiveModuleBrowserView)ivp;
+			ambv.getViewer().removeSelectionChangedListener(activeModuleListener);
+		} catch(Exception e) {}
+		
+		view = null;
+		act = null;
+	}
+	
+	/**
+	 * Adds a new listener to the button to inform others when the stop button
+	 * is pressed.
+	 * @param listener The class interested in knowing when scripts are stopped
+	 */
+	public static void addActionListener(IActionListener listener) {
+		listeners.add(listener);
+	}
+	
+	/**
+	 * Removes the listener from getting stop events.
+	 * @param listener The class that no longer should receive stop notices
+	 */
+	public static void removeActionListener(IActionListener listener) {
+		listeners.remove(listener);
+	}
+	
+	/**
+	 * This method fires the event when a module is run to every listener
+	 * that is registered.
+	 */
+	private static void fireActionEvent() {
+		for(int i=0; i<listeners.size(); i++)
+			((IActionListener)listeners.get(i)).handleActionEvent();
+	}
+	
+	/**
+	 * Enables this action everytime a new module is run.
+	 */
+	private final IActionListener runListener = new IActionListener() {
+		public void handleActionEvent() {
+			setEnablement(true);
+		}
+	};
+	
+	/**
+	 * Enables this action everytime an item in the ActiveModuleBrowserView
+	 * is selected.
+	 */
+	private final ISelectionChangedListener activeModuleListener = new ISelectionChangedListener() {
+		public void selectionChanged(SelectionChangedEvent e) {
+			setEnablement(true);
+		}
+	};
+	
+	/**
+	 * This method checks to see if the newly selected item in the 
+	 * DashboardModuleBrowserView is running or not.  It will then set the
+	 * enablement based on whether or not it is running.
+	 */
+	private final ISelectionChangedListener moduleListener = new ISelectionChangedListener() {
+		public void selectionChanged(SelectionChangedEvent e) {
+			try {
+				TreeNode node = (TreeNode)((StructuredSelection)(e.getSelection())).getFirstElement();
+				IViewPart ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(ActiveModuleBrowserView.ID);
+				ActiveModuleBrowserView amdv = (ActiveModuleBrowserView)ivp;
+				int childcount = node.getChildCount();
+				if(0 == childcount && amdv.isActive((DashboardModule)node.getData()))
+					setEnablement(true);
+				else if(childcount > 0)
+				{   	
+					boolean active = false;
+					
+					
+						for(int j=0; j<childcount; j++) {
+							if(amdv.isActive((DashboardModule)node.getChildAt(j).getData())) {
+								active = true;
+								break; }
+						}
+						if (active == true ) setEnablement(true);
+					
+				}
+				else
+					setEnablement(false);
+			} catch(Exception ex) {}
+		}
+	};
+	
+	private IViewPart view;
+	private IAction act;
+	private static ArrayList listeners = new ArrayList();
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/hidden/GetSelectedModule.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/hidden/GetSelectedModule.java
new file mode 100644
index 0000000..6cf083a
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/hidden/GetSelectedModule.java
@@ -0,0 +1,115 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.actions.hidden;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.PlatformUI;
+
+import org.eclipse.linuxtools.systemtap.ui.structures.TreeNode;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.ActiveModuleData;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.DashboardModule;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.ModuleTreeNode;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.views.ActiveModuleBrowserView;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardModuleBrowserView;
+
+/**
+ * This class is used for determining what module is currently selected. It examins both
+ * the DashboardModuleBrowserView and the ActiveModuleBrowserView to determine which is
+ * active, and what is selected inside that view.
+ * @author Ryan Morse
+ */
+public final class GetSelectedModule {
+	/**
+	 * This class examins the provided view and if it is an instance of either
+	 * DashboardModuleBrowserView or ActiveModuleBrowserView it retreives the selected
+	 * item and returns it.  Else, it returns null.
+	 * @param view The view that is currently open.
+	 * @return The selected DashboardModule contained in the provided view
+	 */
+	public static DashboardModule getModule(IViewPart view) {
+		if(null == view)
+			view = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(DashboardModuleBrowserView.ID);
+		
+		if(view instanceof DashboardModuleBrowserView)
+			return getModule2((DashboardModuleBrowserView)view);
+		else if(view instanceof ActiveModuleBrowserView)
+			return getModule2((ActiveModuleBrowserView)view);
+		return null;
+	}
+	
+	
+	/**
+	 * This class examins the provied view and retreives the selected item from
+	 * it.  It then converts the selected item into a DashboardModule and returns it.
+	 * @param view The DashboardModuleBrowserView that is currently open
+	 * @return The selected DashboardModule from the view
+	 */
+	private static DashboardModule getModule2(DashboardModuleBrowserView view) {
+		TreeViewer viewer = view.getViewer();
+		ISelection selected = viewer.getSelection();
+		if(null != selected && selected instanceof IStructuredSelection) {
+			Object element = ((IStructuredSelection)selected).getFirstElement();
+			if(element instanceof ModuleTreeNode) {
+				ModuleTreeNode mod = (ModuleTreeNode)element;
+				
+				return (DashboardModule)mod.getData();
+			}
+		}
+		return null;
+	}
+	
+	public static TreeNode getNode(IViewPart view) {
+		TreeViewer viewer = null;
+		if(null == view)
+			view = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(DashboardModuleBrowserView.ID);
+		if(view instanceof DashboardModuleBrowserView)
+			viewer = ((DashboardModuleBrowserView)view).getViewer();
+		else 
+			viewer = ((ActiveModuleBrowserView)view).getViewer();
+		ISelection selected = viewer.getSelection();
+		if(null != selected && selected instanceof IStructuredSelection) {
+			Object element = ((IStructuredSelection)selected).getFirstElement();
+			if(element instanceof TreeNode) {
+				TreeNode node = (TreeNode)element;
+				
+				return node;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * This class examins the provied view and retreives the selected item from
+	 * it.  It then gets the DashboardModule contained within the selected item
+	 * and returns it.
+	 * @param view The ActiveModuleBrowserView that is currently open
+	 * @return The selected DashboardModule from the view
+	 */
+	
+	
+	private static DashboardModule getModule2(ActiveModuleBrowserView view) {
+		TreeViewer viewer = view.getViewer();
+		ISelection selected = viewer.getSelection();
+		if(null != selected && selected instanceof IStructuredSelection) {
+			Object element = ((IStructuredSelection)selected).getFirstElement();
+			if(element instanceof TreeNode) {
+				TreeNode mod = (TreeNode)element;
+				
+				return ((ActiveModuleData)mod.getData()).module;
+			}
+		}
+		return null;
+	}
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/internal/DashboardCloseMonitor.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/internal/DashboardCloseMonitor.java
new file mode 100644
index 0000000..8a188b2
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/internal/DashboardCloseMonitor.java
@@ -0,0 +1,50 @@
+/*******************************************************************************

+ * Copyright (c) 2006 IBM Corporation.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *     Ryan Morse

+ *******************************************************************************/

+

+package org.eclipse.linuxtools.systemtap.ui.dashboard.internal;

+

+import java.text.MessageFormat;

+

+import org.eclipse.jface.dialogs.MessageDialog;

+import org.eclipse.ui.IViewPart;

+import org.eclipse.ui.IWorkbench;

+import org.eclipse.ui.IWorkbenchListener;

+import org.eclipse.ui.IWorkbenchWindow;

+

+import org.eclipse.linuxtools.systemtap.ui.dashboard.views.ActiveModuleBrowserView;

+

+/**

+ * This listener is responsible for monitoring workbench close actions.  It is used 

+ * to veto a shutdown if there are modules still running and the user does not really

+ * want to shutdown.

+ * @author Ryan Morse

+ */

+public class DashboardCloseMonitor implements IWorkbenchListener {

+	public boolean preShutdown(IWorkbench workbench, boolean forced) {

+		boolean close = true;

+		if(!forced) {

+			IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();

+			IViewPart ivp = window.getActivePage().findView(ActiveModuleBrowserView.ID);

+			

+			if (ivp != null){

+				ActiveModuleBrowserView ambv = (ActiveModuleBrowserView)ivp;

+				if(ambv.anyRunning()) {

+					String msg = MessageFormat.format(Localization.getString("DashboardCloseMonitor.StillRunning"), (Object[])null);

+					close = MessageDialog.openQuestion(window.getShell(), "Closing...", msg);

+				}

+			}

+			

+		}

+		return close;

+	}

+	

+	public void postShutdown(IWorkbench workbench) {}

+}

diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/internal/DashboardPlugin.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/internal/DashboardPlugin.java
new file mode 100644
index 0000000..7634961
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/internal/DashboardPlugin.java
@@ -0,0 +1,92 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.internal;
+
+import java.io.File;
+
+import org.eclipse.ui.IWorkbenchListener;
+import org.eclipse.ui.plugin.*;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.osgi.framework.BundleContext;
+
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.DashboardMetaData;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.internal.DashboardCloseMonitor;
+
+/**
+ * The main plugin class to be used in the desktop.
+ */
+public class DashboardPlugin extends AbstractUIPlugin {
+	/**
+	 * The constructor.
+	 */
+	public DashboardPlugin() {
+		plugin = this;
+	}
+
+	/**
+	 * This method is called upon plug-in activation
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		
+		workbenchListener = new DashboardCloseMonitor();
+		plugin.getWorkbench().addWorkbenchListener(workbenchListener);
+	}
+
+	/**
+	 * This method is called when the plug-in is stopped
+	 */
+	public void stop(BundleContext context) throws Exception {
+		super.stop(context);
+
+		plugin.getWorkbench().removeWorkbenchListener(workbenchListener);
+		plugin = null;
+
+		//Clean up temparary scripts
+		removeFolder(DashboardMetaData.tempScriptFolder);
+		removeFolder(DashboardMetaData.tempModuleFolder);
+	}
+	
+	private void removeFolder(File folder) {
+		try {
+			File[] files = folder.listFiles();
+			for(int j=0; j<files.length; j++) {
+				if(files[j].isDirectory())
+					removeFolder(files[j]);
+				else
+					files[j].delete();
+			}
+			folder.delete();
+		} catch(Exception e) {}
+	}
+
+	/**
+	 * Returns the shared instance.
+	 */
+	public static DashboardPlugin getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Returns an image descriptor for the image file at the given
+	 * plug-in relative path.
+	 *
+	 * @param path the path
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.linuxtools.systemtap.ui.dashboard", path);
+	}
+	
+	private IWorkbenchListener workbenchListener;
+	private static DashboardPlugin plugin;
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/internal/Localization.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/internal/Localization.java
new file mode 100644
index 0000000..e7157fb
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/internal/Localization.java
@@ -0,0 +1,22 @@
+package org.eclipse.linuxtools.systemtap.ui.dashboard.internal;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class Localization {
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.systemtap.ui.dashboard.internal.localization";
+
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
+			.getBundle(BUNDLE_NAME);
+
+	private Localization() {
+	}
+
+	public static String getString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/internal/localization.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/internal/localization.properties
new file mode 100644
index 0000000..231831b
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/internal/localization.properties
@@ -0,0 +1,14 @@
+ImportModuleLocationAction.FileIsNull=File is null
+ImportModuleLocationAction.Problem=Problem
+ImportModuleLocationAction.ImportDashboardModules=Import Dashboard Modules
+
+RunModuleAction.ModuleIsRunning=This module is already running\!
+RunModuleAction.Problem=Problem
+
+DashboardCloseMonitor.StillRunning=There are modules still running, are you sure you want to close?
+
+DashboardPreferencePage.DashboardPreferences=Dashboard Preferences
+DashboardPreferencePage.AdditionalDirectories=Additional &module directories:
+DashboardPreferencePage.ModuleDirectory=Module Directory
+DashboardPreferencePage.RefreshDelay=&Refresh delay (ms):
+DashboardPreferencePage.ExamplesDir=SystemTap Examples Directory:
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/preferences/DashboardPreferenceConstants.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/preferences/DashboardPreferenceConstants.java
new file mode 100644
index 0000000..2195db3
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/preferences/DashboardPreferenceConstants.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.preferences;
+
+public class DashboardPreferenceConstants {
+	public static final String P_MODULE_FOLDERS = "ModuleFoldersPreference";
+	public static final String P_DASHBOARD_UPDATE_DELAY = "DashboardUpdateDelay";
+	public static final String P_DASHBOARD_EXAMPLES_DIR = "ExamplesDir";
+	public static final String P_DASHBOARD_SCRIPT = "Script";
+
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/preferences/DashboardPreferencePage.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/preferences/DashboardPreferencePage.java
new file mode 100755
index 0000000..95c6a57
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/preferences/DashboardPreferencePage.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.preferences;
+
+import org.eclipse.jface.preference.*;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.eclipse.ui.IWorkbench;
+
+import org.eclipse.linuxtools.systemtap.ui.logging.LogManager;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.internal.DashboardPlugin;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.internal.Localization;
+
+public class DashboardPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
+	public DashboardPreferencePage() {
+		super(GRID);
+		LogManager.logDebug("Start DashboardPreferencePage:", this);
+		setPreferenceStore(DashboardPlugin.getDefault().getPreferenceStore());
+		setDescription(Localization.getString("DashboardPreferencePage.DashboardPreferences"));
+		LogManager.logDebug("End DashboardPreferencePage:", this);
+	}
+	
+	public void createFieldEditors() {
+		LogManager.logDebug("Start createFieldEditors:", this);
+		addField(new PathEditor(DashboardPreferenceConstants.P_MODULE_FOLDERS,
+				Localization.getString("DashboardPreferencePage.AdditionalDirectories"), Localization.getString("DashboardPreferencePage.ModuleDirectory"), getFieldEditorParent()));
+		
+		addField(new IntegerFieldEditor(DashboardPreferenceConstants.P_DASHBOARD_UPDATE_DELAY,
+				Localization.getString("DashboardPreferencePage.RefreshDelay"), getFieldEditorParent()));
+		
+		addField(new StringFieldEditor(DashboardPreferenceConstants.P_DASHBOARD_EXAMPLES_DIR,
+				Localization.getString("DashboardPreferencePage.ExamplesDir"),  getFieldEditorParent()));
+		
+		LogManager.logDebug("End createFieldEditors:", this);
+	}
+
+	public void init(IWorkbench workbench) {
+		LogManager.logDebug("Start init:", this);
+		LogManager.logInfo("Initializing", this);
+		LogManager.logDebug("End init:", this);
+	}
+	
+	public void dispose() {
+		LogManager.logDebug("Start dispose:", this);
+		LogManager.logInfo("Disposing", this);
+		super.dispose();
+		LogManager.logDebug("End dispose:", this);
+	}
+}
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/preferences/PreferenceInitializer.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/preferences/PreferenceInitializer.java
new file mode 100755
index 0000000..bd72371
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/preferences/PreferenceInitializer.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.preferences;
+
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.jface.preference.IPreferenceStore;
+
+import org.eclipse.linuxtools.systemtap.ui.logging.LogManager;
+
+import org.eclipse.linuxtools.systemtap.ui.dashboard.internal.DashboardPlugin;
+
+public class PreferenceInitializer extends AbstractPreferenceInitializer {
+	public void initializeDefaultPreferences() {
+		LogManager.logDebug("Start initializeDefaultPreferences:", this);
+		IPreferenceStore store = DashboardPlugin.getDefault().getPreferenceStore();
+
+		//dashboard
+		store.setDefault(DashboardPreferenceConstants.P_MODULE_FOLDERS, "");
+		store.setDefault(DashboardPreferenceConstants.P_DASHBOARD_UPDATE_DELAY, 1000);
+		store.setDefault(DashboardPreferenceConstants.P_DASHBOARD_EXAMPLES_DIR, "/usr/local/share/doc/systemtap/examples");
+
+		LogManager.logDebug("End initializeDefaultPreferences:", this);
+	}
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/ActiveModuleData.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/ActiveModuleData.java
new file mode 100644
index 0000000..4464c26
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/ActiveModuleData.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.structures;
+
+import org.eclipse.linuxtools.systemtap.ui.consolelog.structures.ScriptConsole;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.IDataSet;
+//import org.eclipse.linuxtools.systemtap.ui.structures.runnable.LoggedCommand;
+
+/**
+ * This is a basic structure to contain all the important information for a 
+ * running Dashboard script.
+ * @author Ryan Morse
+ */
+public class ActiveModuleData {
+	public DashboardModule module;
+	public ScriptConsole cmd;
+	public IDataSet data;
+	public boolean paused;
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/ActiveModuleTreeNode.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/ActiveModuleTreeNode.java
new file mode 100644
index 0000000..a9d3bfe
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/ActiveModuleTreeNode.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.structures;
+
+import org.eclipse.linuxtools.systemtap.ui.structures.TreeNode;
+
+/**
+ * This is a simple extension of TreeNode to allow for providing a popup menu
+ * for specific items in the ActiveModuleBrowserView and DashboardModuleBrowserView
+ * @author Ryan Morse
+ *
+ */
+public class ActiveModuleTreeNode extends TreeNode {
+	public ActiveModuleTreeNode(ActiveModuleData amd, String disp, boolean c) {
+		super(amd, disp, c);
+	}
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardGraphData.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardGraphData.java
new file mode 100644
index 0000000..d19c3f4
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardGraphData.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.structures;
+
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.IDataSet;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.filters.IDataSetFilter;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.structures.GraphData;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.DashboardAdapter;
+
+/**
+ * This is a basic structure to contain all the important information for a 
+ * a Dashboard graph.
+ * @author Ryan Morse
+ */
+public class DashboardGraphData {
+	public GraphData graph;
+	public String moduleName;
+	public IDataSetFilter[] filters;
+	public IDataSet data;
+	public DashboardAdapter adapter;
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardGraphsLocator.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardGraphsLocator.java
new file mode 100644
index 0000000..b9857ce
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardGraphsLocator.java
@@ -0,0 +1,94 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.structures;
+
+import java.io.File;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+
+import org.eclipse.linuxtools.systemtap.ui.structures.JarArchive;
+import org.eclipse.linuxtools.systemtap.ui.structures.TreeNode;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.internal.DashboardPlugin;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.preferences.DashboardPreferenceConstants;
+import org.eclipse.linuxtools.systemtap.ui.systemtapgui.SystemTapGUISettings;
+
+/**
+ * This class is used to generate the entire Dashboard module list.  It
+ * gets the list of directories that the user has specified contain modules
+ * and then calls the TreeBuilder on each of them to build up the entire list.
+ * @author Ryan Morse
+ */
+public final class DashboardGraphsLocator {
+	/**
+	 * This is the main method for the class.  It first gathers up all the directories
+	 * that contain modules and then goes through each directory and adds the modules
+	 * contained in that folder to the list.  Once finished, it will return the entire
+	 * list.
+	 * @return The entire list of Dashboard Modules organized as a Tree
+	 */
+	public static TreeNode getGraphs() {
+		TreeNode root = new TreeNode(null, "", false);
+
+		String[] locations = getModuleLocations();
+		DashboardGraphsTreeBuilder dmtb;
+		if(null != locations) {
+			for(int i=0; i<locations.length; i++) {
+				dmtb = new DashboardGraphsTreeBuilder(root);
+				dmtb.generateTree(new File(locations[i]));
+			}
+			root.sortTree();
+		}
+
+		return root;
+	}
+	
+	/**
+	 * This method gets all of the dashboard module directories from the user's
+	 * preferences and adds the default directores, then returns the entire list.
+	 * @return String array containing all of the directories with modules.
+	 */
+	public static String[] getModuleLocations() {
+		IPreferenceStore store = DashboardPlugin.getDefault().getPreferenceStore();
+
+		String locations = store.getString(DashboardPreferenceConstants.P_MODULE_FOLDERS);
+		
+		String[] folders = locations.split(File.pathSeparator);
+
+		String[] allFolders;
+		if(locations.length() > 0) {
+			allFolders = new String[folders.length + 2];
+			System.arraycopy(folders, 0, allFolders, 2, folders.length);
+		} else
+			allFolders = new String[2];
+		
+		//This locates all the preexisting modules
+		if(new File(moduleStore).exists()) {
+			File f = new File(moduleLocation);
+			if(!f.exists()) {
+				f.mkdir();
+				JarArchive.unjarFiles(moduleStore, moduleLocation, "modules/");
+			}
+			allFolders[0] = moduleLocation;
+		} else {
+			allFolders[0] = System.getProperty("osgi.splashLocation");
+			allFolders[0] = allFolders[0].substring(0, allFolders[0].indexOf("systemtapgui"));
+			allFolders[0] += "dashboard/modules/";
+		}
+		
+		allFolders[1] = SystemTapGUISettings.settingsFolder.getAbsolutePath();
+
+		return allFolders;
+	}
+	
+	public static final String moduleLocation = SystemTapGUISettings.installDirectory + "/.modules/";
+	public static final String moduleStore = SystemTapGUISettings.installDirectory + "/plugins/org.eclipse.linuxtools.systemtap.ui.dashboard_1.0.0.jar";
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardGraphsTreeBuilder.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardGraphsTreeBuilder.java
new file mode 100644
index 0000000..d61de1c
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardGraphsTreeBuilder.java
@@ -0,0 +1,115 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.structures;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.eclipse.linuxtools.systemtap.ui.structures.TreeNode;
+import org.eclipse.linuxtools.systemtap.ui.structures.ZipArchive;
+import org.eclipse.linuxtools.systemtap.ui.systemtapgui.SystemTapGUISettings;
+
+/**
+ * This class is responsible for searching through the Dashboard module
+ * directory and building a tree with their modules.
+ * @author Ryan Morse
+ */
+public class DashboardGraphsTreeBuilder {
+	public DashboardGraphsTreeBuilder() {
+		tree = new TreeNode("Root", "", false);
+	}
+	
+	public DashboardGraphsTreeBuilder(TreeNode t) {
+		tree = t;
+	}
+	
+	/**
+	 * Returns the tree containing all of the dashboard modules
+	 * @return TreeNode with dashboard modules
+	 */
+	public TreeNode getTree() {
+		return tree;
+	}
+
+	/**
+	 * This method is used to generate the tree of dashboard modules for
+	 * the provided folder.
+	 * @param folder The directory to search for dashboard modules
+	 */
+	public void generateTree(File folder) {
+		scanNextLevel(folder);
+	}
+	
+	/**
+	 * This is the main method for this class. It searches through the provided
+	 * file/folder and builds the tree with any dashboard modules it finds.
+	 * @param f The file/folder to scan for modules
+	 */
+	private void scanNextLevel(File f) {
+		File[] fs = f.listFiles(new DashboardModuleFileFilter());
+		DashboardMetaData dgd;
+		DashboardModule dg;
+		
+		TreeNode location;
+		for(int i=0; i<fs.length; i++) {
+			if(fs[i].isDirectory())
+				scanNextLevel(fs[i]);
+			else {
+				try {
+					File folder = new File(SystemTapGUISettings.tempDirectory + "/bundles/");
+					if(!folder.exists())
+						folder.mkdirs();
+					
+					File file = new File(folder + "/" + fs[i].getName() + ".tmp");
+					file.createNewFile();
+					ZipArchive.uncompressFile(file.getAbsolutePath(), fs[i].getAbsolutePath());
+					ZipArchive.unzipFiles(file.getAbsolutePath(), folder.getAbsolutePath());
+					dgd = new DashboardMetaData(folder.getAbsolutePath() + DashboardModule.metaFileName);
+					dg = dgd.getModule();
+					dg.archiveFile = fs[i];
+					location = findInsertLocation(dg.category);
+					location.add(new ModuleTreeNode(dg, dg.display, true));
+					
+					File[] files = folder.listFiles();
+					for(int j=0; j<files.length; j++)
+						files[j].delete();
+					folder.delete();
+				} catch(IOException ioe) {}
+			}
+		}
+	}
+	
+	/**
+	 * This method searches through the tree to find the correct location
+	 * to add the new module.  If the path does not exist yet, a new node will
+	 * be created.
+	 * @param path The category the module should be added to
+	 * @return The tree node matching the provided path
+	 */
+	private TreeNode findInsertLocation(String path) {
+		String[] folders = path.split("\\p{Punct}");
+		TreeNode level = tree;
+		
+		for(int j,i=0; i<folders.length; i++) {
+			for(j=0; j<level.getChildCount(); j++) {
+				if(level.getChildAt(j).toString().equals(folders[i]))
+					break;
+			}
+			if(j >= level.getChildCount())
+				level.add(new TreeNode("", folders[i], false));
+			level = level.getChildAt(j);
+		}
+		return level;
+	}
+	
+	private TreeNode tree;
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardMetaData.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardMetaData.java
new file mode 100644
index 0000000..dcebcbb
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardMetaData.java
@@ -0,0 +1,212 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.structures;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.util.ArrayList;
+
+import org.eclipse.ui.IMemento;
+import org.eclipse.ui.WorkbenchException;
+import org.eclipse.ui.XMLMemento;
+
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.structures.GraphData;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.wizards.dataset.DataSetFactory;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.wizards.filter.AvailableFilterTypes;
+import org.eclipse.linuxtools.systemtap.ui.systemtapgui.SystemTapGUISettings;
+
+/**
+ * This class handles retreiving information from the metadata contained in a Dashboard module.
+ * It will read through the metadata and create a new DashboardModule data set to contain
+ * all of the information contained in the XML Memento file.
+ * @author Ryan Morse
+ */
+public class DashboardMetaData {
+	public DashboardMetaData(String file) {
+		this(new File(file));
+	}
+
+	public DashboardMetaData(File file) {
+		module = null;
+		metaFile = file;
+		if(file.exists())
+			readData();
+	}
+	
+	public DashboardModule getModule() {
+		return module;
+	}
+	
+	/**
+	 * This method checks to see if there is an available module for the specified kernel version.
+	 * @param kernelVersion String for the specific kernel to try to get a module for.
+	 * @return boolean representing whether or there is an existing module for the provided kernel
+	 */
+	public boolean isModuleAvailable(String kernelVersion) {
+		for(int i=0; i<module.kernelVersions.length; i++)
+			if(module.kernelVersions[i].equals(kernelVersion))
+				return true;
+		return false;
+	}
+	
+	/**
+	 * This method tries to retreive the module for the provided kernel version.
+	 * @param kernelVersion String for the specific kernel to try to get a module for
+	 * @return File that represents the module for the requested kernel version.
+	 */
+	public File getKernelModule(String kernelVersion) {
+		for(int i=0; i<module.kernelVersions.length; i++)
+			if(module.kernelVersions[i].equals(kernelVersion))
+				return module.kernelModules[i];
+		return null;
+	}
+
+	/**
+	 * This is the main method for this class. It reads the contents of the meta file
+	 * and populates the DashboardModule structure from it.
+	 * @return boolean representing whether or not the meta data was succesfuly read
+	 */
+	private boolean readData() {
+		if(null == metaFile)
+			return false;
+
+		try {
+			module = new DashboardModule();
+			FileReader reader = new FileReader(metaFile);
+			if(!reader.ready())
+				return false;
+
+			XMLMemento data = XMLMemento.createReadRoot(reader, XMLDashboardItem);
+
+			//Get main module information
+			module.display = data.getString(XMLdDisplay);
+			module.category = data.getString(XMLdCategory);
+			module.description = data.getString(XMLdDescription);
+			module.dataSetID = data.getString(XMLdDataset);
+			module.location = data.getString(XMLdLocation);
+			module.scriptFileName = data.getString(XMLdScriptFileName);
+			File temp = null;
+			//Get the script
+			if ((module.location ==null) || (module.location.equalsIgnoreCase("local")))
+			{
+			if(!tempScriptFolder.exists())
+				tempScriptFolder.mkdirs();
+			temp = new File(metaFile.getParentFile() + data.getString(XMLdScript));
+			module.script = new File(tempScriptFolder.getAbsolutePath() + "/" + module.hashCode() + ".stp");
+			temp.renameTo(module.script);
+			}
+			else
+				module.script = new File(module.location + "/" + module.scriptFileName);
+			//Get the column names
+			IMemento[] children = data.getChild(XMLParsingExpressions).getChildren(XMLpColumn);
+			module.labels = new String[children.length];
+			int i;
+			for(i=0; i<children.length; i++)
+				module.labels[i] = children[i].getString(XMLpName);
+			
+			//Get the parser
+			module.parser = DataSetFactory.createParserXML(module.dataSetID, data.getChild(XMLParsingExpressions).getChild(XMLpParser));
+
+			//Get all graph information
+			IMemento[] children2;
+			children = data.getChild(XMLGraphDisplays).getChildren(XMLgGraph);
+			module.graphs = new GraphData[children.length];
+			module.filters = new ArrayList[children.length];
+			int j, ys;
+			for(i=0; i<children.length; i++) {
+				module.graphs[i] = new GraphData();
+				module.graphs[i].graphID = children[i].getString(XMLgId);
+				module.graphs[i].title = children[i].getString(XMLgTitle);
+				
+				//Get all filters for the graph
+				children2 = children[i].getChildren(XMLgFilter);
+				module.filters[i] = new ArrayList();
+				for(j=0; j<children2.length; j++) {
+					module.filters[i].add(AvailableFilterTypes.getDataSetFilter(children2[j]));
+				}
+				
+				//Get all x & y series for the graph
+				children2 = children[i].getChildren(XMLgSeries);
+				module.graphs[i].ySeries = new int[children2.length-1];
+
+				for(j=0, ys=0; j<children2.length; j++) {
+					if(XMLgAxisX.equals(children2[j].getString(XMLgAxis)))
+						module.graphs[i].xSeries = children2[j].getInteger(XMLgColumn).intValue();
+					else if(XMLgAxisY.equals(children2[j].getString(XMLgAxis))) {
+						module.graphs[i].ySeries[ys] = children2[j].getInteger(XMLgColumn).intValue();
+						ys++;
+					}
+				}
+			}
+			
+			//Retreive any kernel module data.
+			children = data.getChildren(XMLKernelModule);
+			module.kernelVersions = new String[children.length];
+			module.kernelModules = new File[children.length];
+			if(!tempModuleFolder.exists())
+				tempModuleFolder.mkdirs();
+			for(i=0; i<children.length; i++) {
+				module.kernelVersions[i] = children[i].getString(XMLkVersion);
+
+				temp = new File(metaFile.getParentFile() + children[i].getString(XMLkModule));
+				module.kernelModules[i] = new File(tempModuleFolder.getAbsolutePath() + module.hashCode() + temp.getName());
+				temp.renameTo(module.kernelModules[i]);
+			}
+
+			reader.close();
+		} catch(FileNotFoundException fnfe) {
+			return false;
+		} catch(WorkbenchException we) {
+			return false;
+		} catch(Exception e) {
+			return false;
+		}
+
+		return true;
+	}
+		
+	private static File metaFile;
+	private DashboardModule module;
+	public static final File tempScriptFolder = new File(SystemTapGUISettings.tempDirectory + "scripts/");
+	public static final File tempModuleFolder = new File(SystemTapGUISettings.tempDirectory + "modules/");
+	
+	public static final String XMLDashboardItem = "DashboardItem";
+	public static final String XMLdDisplay = "display";
+	public static final String XMLdCategory = "category";
+	public static final String XMLdDescription = "description";
+	public static final String XMLdDataset = "dataset";
+	public static final String XMLdScript = "script";
+	public static final String XMLdScriptFileName = "scriptFileName";
+	public static final String XMLdLocation = "location";
+	
+
+	public static final String XMLParsingExpressions = "ParsingExpressions";
+	public static final String XMLpColumn = "Column";
+	public static final String XMLpName = "name";
+	public static final String XMLpParser = "Parser";
+
+	public static final String XMLGraphDisplays = "GraphDisplays";
+	public static final String XMLgGraph = "Graph";
+	public static final String XMLgId = "id";
+	public static final String XMLgTitle = "title";
+	public static final String XMLgColumn = "column";
+	public static final String XMLgAxis = "axis";
+	public static final String XMLgAxisX = "x";
+	public static final String XMLgAxisY = "y";
+	public static final String XMLgSeries = "Series";
+	public static final String XMLgFilter = "Filter";
+
+	public static final String XMLKernelModule = "KernelModule";
+	public static final String XMLkVersion = "version";
+	public static final String XMLkModule = "module";
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModule.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModule.java
new file mode 100644
index 0000000..18165a1
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModule.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.structures;
+
+import java.io.File;
+import java.util.ArrayList;
+
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.IDataSetParser;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.structures.GraphData;
+
+/**
+ * This is a basic structure to contain all the important information for a 
+ * module in the dashboard.
+ * @author Ryan Morse
+ */
+public class DashboardModule {
+	public String display;
+	public String category;
+	public String description;
+	public File script;
+	public File archiveFile;
+
+	public String dataSetID;
+	public String[] labels;
+	public IDataSetParser parser;
+	public GraphData[] graphs;
+	public ArrayList[] filters;
+	public String location;
+	
+	public String[] kernelVersions;
+	public File[] kernelModules;
+
+	public String scriptFileName;
+	public static final String metaFileName = "/metaData";
+	
+	public String getcategory()
+	{
+		return category;
+	
+	}
+	public String getdisplay()
+	{
+		return display;
+	}
+	
+	public String getlocation()
+	{
+		return location;
+	}
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModuleFileFilter.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModuleFileFilter.java
new file mode 100644
index 0000000..1e29151
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModuleFileFilter.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.structures;
+
+import java.io.File;
+import java.io.FileFilter;
+
+/**
+ * This is a simple file filter that will exclude anything other then a Dashboard module and
+ * a folder.
+ * @author Ryan Morse
+ */
+public class DashboardModuleFileFilter implements FileFilter {
+	public boolean accept(File f) {
+		return f.isDirectory() || f.getName().toLowerCase().endsWith(DashboardModuleExtension);
+	}
+	
+	public String getDescription() {
+		return ".dash files";
+	}
+	
+	public static final String DashboardModuleExtension = ".dash";
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModuleLocator.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModuleLocator.java
new file mode 100644
index 0000000..f5d362b
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModuleLocator.java
@@ -0,0 +1,95 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.structures;
+
+import java.io.File;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+
+import org.eclipse.linuxtools.systemtap.ui.structures.JarArchive;
+import org.eclipse.linuxtools.systemtap.ui.structures.TreeNode;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.internal.DashboardPlugin;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.preferences.DashboardPreferenceConstants;
+import org.eclipse.linuxtools.systemtap.ui.systemtapgui.SystemTapGUISettings;
+
+/**
+ * This class is used to generate the entire Dashboard module list.  It
+ * gets the list of directories that the user has specified contain modules
+ * and then calls the TreeBuilder on each of them to build up the entire list.
+ * @author Ryan Morse
+ */
+public final class DashboardModuleLocator {
+	/**
+	 * This is the main method for the class.  It first gathers up all the directories
+	 * that contain modules and then goes through each directory and adds the modules
+	 * contained in that folder to the list.  Once finished, it will return the entire
+	 * list.
+	 * @return The entire list of Dashboard Modules organized as a Tree
+	 */
+	public static TreeNode getModules() {
+		TreeNode root = new TreeNode(null, "", false);
+
+		String[] locations = getModuleLocations();
+		DashboardModuleTreeBuilder dmtb = null;
+		if(null != locations) {
+			for(int i=0; i<locations.length; i++) {
+				dmtb = new DashboardModuleTreeBuilder(root);
+				dmtb.generateTree(new File(locations[i]));
+			}
+			root.sortTree();
+		}
+        
+		return root;
+	}
+	
+	/**
+	 * This method gets all of the dashboard module directories from the user's
+	 * preferences and adds the default directores, then returns the entire list.
+	 * @return String array containing all of the directories with modules.
+	 */
+	public static String[] getModuleLocations() {
+		IPreferenceStore store = DashboardPlugin.getDefault().getPreferenceStore();
+
+		String locations = store.getString(DashboardPreferenceConstants.P_MODULE_FOLDERS);
+		
+		String[] folders = locations.split(File.pathSeparator);
+
+		String[] allFolders;
+		if(locations.length() > 0) {
+			allFolders = new String[folders.length + 2];
+			System.arraycopy(folders, 0, allFolders, 2, folders.length);
+		} else
+			allFolders = new String[2];
+		
+		//This locates all the preexisting modules
+		if(new File(moduleStore).exists()) {
+			File f = new File(moduleLocation);
+			if(!f.exists()) {
+				f.mkdir();
+				JarArchive.unjarFiles(moduleStore, moduleLocation, "modules/");
+			}
+			allFolders[0] = moduleLocation;
+		} else {
+			allFolders[0] = System.getProperty("osgi.splashLocation");
+			allFolders[0] = allFolders[0].substring(0, allFolders[0].indexOf("systemtapgui"));
+			allFolders[0] += "dashboard/modules/";
+		}
+		
+		allFolders[1] = SystemTapGUISettings.settingsFolder.getAbsolutePath();
+
+		return allFolders;
+	}
+	
+	public static final String moduleLocation = SystemTapGUISettings.installDirectory + "/.modules/";
+	public static final String moduleStore = SystemTapGUISettings.installDirectory + "/plugins/org.eclipse.linuxtools.systemtap.ui.dashboard_1.0.0.jar";
+	
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModuleTreeBuilder.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModuleTreeBuilder.java
new file mode 100644
index 0000000..35fa225
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModuleTreeBuilder.java
@@ -0,0 +1,137 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.structures;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+
+import org.eclipse.linuxtools.systemtap.ui.structures.TreeNode;
+import org.eclipse.linuxtools.systemtap.ui.structures.ZipArchive;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardView;
+import org.eclipse.linuxtools.systemtap.ui.systemtapgui.SystemTapGUISettings;
+
+/**
+ * This class is responsible for searching through the Dashboard module
+ * directory and building a tree with their modules.
+ */
+public class DashboardModuleTreeBuilder {
+	public DashboardModuleTreeBuilder() {
+		tree = new TreeNode("Root", "", true);
+			}
+	
+	public DashboardModuleTreeBuilder(TreeNode t) {
+		tree = t;
+	}
+	
+	/**
+	 * Returns the tree containing all of the dashboard modules
+	 * @return TreeNode with dashboard modules
+	 */
+	public TreeNode getTree() {
+		return tree;
+	}
+
+	/**
+	 * This method is used to generate the tree of dashboard modules for
+	 * the provided folder.
+	 * @param folder The directory to search for dashboard modules
+	 */
+	public void generateTree(File folder) {
+		scanNextLevel(folder);
+	}
+	
+	/**
+	 * This is the main method for this class. It searches through the provided
+	 * file/folder and builds the tree with any dashboard modules it finds.
+	 * @param f The file/folder to scan for modules
+	 */
+	private void scanNextLevel(File f) {
+		File[] fs = f.listFiles(new DashboardModuleFileFilter());
+		DashboardMetaData dmd;
+		DashboardModule dm;
+		
+		TreeNode location;
+		for(int i=0; i<fs.length; i++) {
+			if(fs[i].isDirectory())
+				scanNextLevel(fs[i]);
+			else {
+				try {
+					File folder = new File(SystemTapGUISettings.tempDirectory + "/bundles/");
+					if(!folder.exists())
+						folder.mkdirs();
+					
+					File file = new File(folder + "/" + fs[i].getName() + ".tmp");
+					file.createNewFile();
+					ZipArchive.uncompressFile(file.getAbsolutePath(), fs[i].getAbsolutePath());
+					ZipArchive.unzipFiles(file.getAbsolutePath(), folder.getAbsolutePath());
+					dmd = new DashboardMetaData(folder.getAbsolutePath() + DashboardModule.metaFileName);
+					dm = dmd.getModule();
+					dm.archiveFile = fs[i];
+					int index = searchModuleNames(dm.category);
+					if (index == -1)
+					{
+						moduleNames.add(dm.category);
+						//
+						DashboardView.addmodulename(dm.category);
+					}
+					location = findInsertLocation(dm.category);
+					location.add(new ModuleTreeNode(dm, dm.display, true));
+					
+					File[] files = folder.listFiles();
+					for(int j=0; j<files.length; j++)
+						files[j].delete();
+					folder.delete();
+				} catch(IOException ioe) {}
+			}
+		}
+	}
+	
+	/**
+	 * This method searches through the tree to find the correct location
+	 * to add the new module.  If the path does not exist yet, a new node will
+	 * be created.
+	 * @param path The category the module should be added to
+	 * @return The tree node matching the provided path
+	 */
+	private TreeNode findInsertLocation(String path) {
+		String[] folders = path.split("\\p{Punct}");
+		TreeNode level = tree;
+		//
+		for(int j,i=0; i<folders.length; i++) {
+			for(j=0; j<level.getChildCount(); j++) {
+				if(level.getChildAt(j).toString().equals(folders[i]))
+					break;
+			}
+			if(j >= level.getChildCount())
+				level.add(new TreeNode("", folders[i], true));
+			level = level.getChildAt(j);
+		}
+		return level;
+	}
+	
+	
+	private int searchModuleNames(String moduleName) {
+		//
+		
+		if(moduleNames.size() > 0)
+		{
+		for (int i = 0; i<moduleNames.size();i++)
+		{
+			if (moduleName.equals(moduleNames.get(i))) return i;
+		} 
+		}
+		return -1;
+	}
+	private TreeNode tree;
+	public static ArrayList<String> moduleNames = new ArrayList<String>();
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/GraphTreeNode.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/GraphTreeNode.java
new file mode 100644
index 0000000..22e8f78
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/GraphTreeNode.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.structures;
+
+import org.eclipse.linuxtools.systemtap.ui.structures.TreeNode;
+
+/**
+ * This is a simple extension of TreeNode to allow for creating specific
+ * popup menu items that are only displayed for the Graphs.
+ * @author Ryan Morse
+ */
+public class GraphTreeNode extends TreeNode {
+	public GraphTreeNode(DashboardGraphData gd, String disp, boolean active) {
+		super(gd, disp, active);
+	}
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/ModuleTreeNode.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/ModuleTreeNode.java
new file mode 100644
index 0000000..666c4f2
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/ModuleTreeNode.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.structures;
+
+import org.eclipse.linuxtools.systemtap.ui.structures.TreeNode;
+
+/**
+ * This is a simple extension of TreeNode to allow for creating specific
+ * popup menu items that are only displayed for Dashboard modules.
+ * @author Ryan Morse
+ */
+public class ModuleTreeNode extends TreeNode {
+	public ModuleTreeNode(DashboardModule dm, String disp, boolean c) {
+		super(dm, disp, c);
+	}
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/ActiveModuleBrowserView.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/ActiveModuleBrowserView.java
new file mode 100644
index 0000000..e068654
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/ActiveModuleBrowserView.java
@@ -0,0 +1,235 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.views;
+
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Cursor;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.IWorkbenchActionConstants;
+import org.eclipse.ui.PlatformUI;
+
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.filters.IDataSetFilter;
+import org.eclipse.linuxtools.systemtap.ui.logging.LogManager;
+import org.eclipse.linuxtools.systemtap.ui.structures.TreeNode;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.actions.ActivateGraphAction;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.internal.DashboardPlugin;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.ActiveModuleData;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.ActiveModuleTreeNode;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.DashboardGraphData;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.DashboardModule;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.GraphTreeNode;
+
+/**
+ * This class is used to display a list of all of the Modules that are running
+ * as well as the status of each graph associated with the module.  It provides
+ * methods for starting, stopping, and pausing the active module.
+ * @author Ryan Morse
+ */
+public class ActiveModuleBrowserView extends ModuleView {
+	public ActiveModuleBrowserView() {
+		super();
+		LogManager.logInfo("Initializing", this);
+	}
+	
+	protected void generateModuleTree() {
+		viewer.setInput(new TreeNode("root", "", false));
+	}
+	
+	public void createPartControl(Composite parent) {
+		super.createPartControl(parent);
+		viewer.setLabelProvider(new ViewLabelProvider());
+	}
+	
+	/**
+	 * This method builds the actions for the items inside this view.  It adds a
+	 * double click listener to each of the Items so they will be run if they
+	 * are actual modules.  It also sets up the layout for popup menu when users
+	 * right click on a module element.
+	 */
+	protected void makeActions() {
+		//Gets items from plugin.xml
+		MenuManager manager = new MenuManager("modulePopup");
+		Control control = this.viewer.getControl();
+		manager.add(new Separator("file.ext"));
+		manager.add(new Separator("build.ext"));
+		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
+		Menu menu = manager.createContextMenu(control);
+		control.setMenu(menu);
+		getSite().registerContextMenu(manager, viewer);
+		super.makeActions();
+	}
+	
+	/**
+	 * This method handles adding a new module to the list of active modules.
+	 * It will then generate each of the graphs that are a part of the module.
+	 * Adding them as a new graph in the main display and adding them as children
+	 * of the module in the ActiveModuleBrowserView.
+	 * @param display The string used as a title for the module
+	 * @param data The <code>ActiveModuleData</code> representing the item to add.
+	 */
+	public void add(String display, ActiveModuleData data) {
+		 Display disp = PlatformUI.getWorkbench().getDisplay();
+		  Cursor cursor = new Cursor(disp, SWT.CURSOR_WAIT);
+		  PlatformUI.getWorkbench().getDisplay().getActiveShell().setCursor(cursor);
+
+		TreeNode root = (TreeNode)viewer.getInput();
+		ActiveModuleTreeNode child = new ActiveModuleTreeNode(data, display, true);
+		GraphTreeNode graphNode;
+		root.add(child);
+		DashboardGraphData graphData;
+		for(int i=0; i<data.module.graphs.length; i++) {
+			graphData = new DashboardGraphData();
+			graphData.data = data.data;
+			graphData.filters = new IDataSetFilter[data.module.filters[i].size()];
+			data.module.filters[i].toArray(graphData.filters);
+			graphData.graph = data.module.graphs[i];
+			graphData.moduleName = data.module.category;
+			graphData.adapter = null;
+			ActivateGraphAction act = new ActivateGraphAction();
+			graphNode = new GraphTreeNode(graphData, data.module.graphs[i].title, true);
+			act.run(graphNode,data.module.getcategory());
+			child.add(graphNode);
+		}
+		root.sortLevel();
+		viewer.refresh();
+		  PlatformUI.getWorkbench().getDisplay().getActiveShell().setCursor(null);
+		  cursor.dispose();
+	}
+	
+	/**
+	 * This method handles pausing a module in the ActiveModuleBrowserView.  When
+	 * it locates the item to be paused, it will return a reference to that module.
+	 * @param mod The <code>DashboardModule</code> that needs to be paused
+	 * @return The item being paused
+	 */
+	public ActiveModuleData pause(DashboardModule mod) {
+		TreeNode tree = (TreeNode)viewer.getInput();
+		for(int i=0; i<tree.getChildCount(); i++) {
+			if(tree.getChildAt(i).toString().equals(mod.category + "." + mod.display)) {
+				return (ActiveModuleData)(tree.getChildAt(i).getData());
+			}
+		}
+		
+		return null;
+	}
+	
+	/**
+	 * This method handles removing a module in the ActiveModuleBrowserView.  When
+	 * it locates the item to be removed, it will return a remove it from the tree
+	 * and return a reference to that module.
+	 * @param mod The module that needs to be removed
+	 * @return The active module that was removed.
+	 */
+	public ActiveModuleTreeNode remove(DashboardModule mod) {
+		TreeNode tree = (TreeNode)viewer.getInput();
+		for(int i=0; i<tree.getChildCount(); i++) {
+			if(tree.getChildAt(i).toString().equals(mod.category + "." + mod.display)) {
+				ActiveModuleTreeNode node = (ActiveModuleTreeNode)tree.getChildAt(i);
+				tree.remove(i);
+				viewer.refresh();
+				return node;
+			}
+		}
+		
+		return null;
+	}
+	
+	/**
+	 * This method checks to see if the provided module is running or not.
+	 * @param mod The module to check if it is running
+	 * @return boolean representing whether the provided module is running
+	 */
+	public boolean isActive(DashboardModule mod) {
+		try {
+			TreeNode tree = (TreeNode)viewer.getInput();
+			for(int i=0; i<tree.getChildCount(); i++) {
+				if(tree.getChildAt(i).toString().equals(mod.category + "." + mod.display))
+					return true;
+			}
+		} catch(Exception e) {}
+		return false;
+	}
+	
+	/**
+	 * This method checks to see if the provided module is running, and if so
+	 * whether or not it is paused.
+	 * @param mod The module to check if it is paused.
+	 * @return boolean representing whether the provided module is paused
+	 */
+	public boolean isPaused(DashboardModule mod) {
+		try {
+			TreeNode tree = (TreeNode)viewer.getInput();
+			for(int i=0; i<tree.getChildCount(); i++) {
+				if(tree.getChildAt(i).toString().equals(mod.category + "." + mod.display))
+					return ((ActiveModuleData)tree.getChildAt(i).getData()).paused;
+			}
+		} catch(Exception e) {}
+		
+		return false;
+	}
+	
+	/**
+	 * This method checks to see if any modules are still running
+	 * @return boolean - are any modules are still running?
+	 */
+	public boolean anyRunning() {
+		TreeNode tree = (TreeNode)viewer.getInput();
+		return tree.getChildCount() > 0;
+		//return true;
+	}
+	
+	/**
+	 * This method removes all internal references. Nothing should be called/referenced after
+	 * this method is run.
+	 */
+	public void dispose() {
+		LogManager.logInfo("disposing", this);
+		super.dispose();
+		viewer = null;
+	}
+	
+	/**
+	 * This class provides functionality for determining what image to 
+	 * display for each item in the tree.
+	 */
+	private class ViewLabelProvider extends LabelProvider {
+		public String getText(Object obj) {
+			return obj.toString();
+		}
+
+		public Image getImage(Object obj) {
+			TreeNode treeObj = (TreeNode)obj;
+			Image img = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_ELEMENT);
+			
+			if(treeObj.getChildCount() > 0)
+				img = DashboardPlugin.getImageDescriptor("icons/misc/module_obj.gif").createImage();
+			else if(treeObj instanceof GraphTreeNode){
+				if(null == ((DashboardGraphData)((GraphTreeNode)treeObj).getData()).adapter)
+					img = DashboardPlugin.getImageDescriptor("icons/misc/graph_dis.gif").createImage();
+				else
+					img = DashboardPlugin.getImageDescriptor("icons/misc/graph_act.gif").createImage();
+			}
+
+			return img;
+		}
+	}	
+	
+	public static final String ID = "org.eclipse.linuxtools.systemtap.ui.dashboard.views.ActiveModuleBrowserView";
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/DashboardGraphsBrowserView.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/DashboardGraphsBrowserView.java
new file mode 100644
index 0000000..6aed947
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/DashboardGraphsBrowserView.java
@@ -0,0 +1,150 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.views;
+
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.IWorkbenchActionConstants;
+import org.eclipse.ui.PlatformUI;
+
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.filters.IDataSetFilter;
+import org.eclipse.linuxtools.systemtap.ui.logging.LogManager;
+import org.eclipse.linuxtools.systemtap.ui.structures.TreeNode;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.actions.ActivateGraphAction;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.internal.DashboardPlugin;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.ActiveModuleData;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.ActiveModuleTreeNode;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.DashboardGraphData;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.GraphTreeNode;
+
+
+/**
+ * This is a basic browser view for the dashboard perspective.  It contains a list
+ * of all of the available dashboard modules.
+ * @author Ryan Morse
+ */
+public class DashboardGraphsBrowserView extends GraphsView {
+	public DashboardGraphsBrowserView() {
+		super();
+		LogManager.logInfo("Initializing", this);
+	}
+	
+	/**
+	 * This method sends requests to get all of the modules that are
+	 * avialable on the system.  Once then are found, it will
+	 * set the viewer's content to the tree of modules that were found.
+	 */
+	/*protected void generateGraphsTree() {
+		TreeNode graphs = DashboardGraphsLocator.getGraphs();
+		
+		if(null != graphs)
+			viewer.setInput(graphs);
+		else
+			viewer.setInput(new TreeNode("", false));
+	}*/
+	
+	protected void generateGraphsTree() {
+		viewer.setInput(new TreeNode("root", "", false));
+	}
+	
+	public void createPartControl(Composite parent) {
+		super.createPartControl(parent);
+		viewer.setLabelProvider(new ViewLabelProvider());
+	}
+	
+	/**
+	 * This method builds the actions for the items inside this view.  It adds a
+	 * double click listener to each of the Items so they will be run if they
+	 * are actual modules.  It also sets up the layout for popup menu when users
+	 * right click on a module element.
+	 */
+	protected void makeActions() {
+		//Gets items from plugin.xml
+		MenuManager manager = new MenuManager("modulePopup");
+		Control control = this.viewer.getControl();
+		manager.add(new Separator("file.ext"));
+		manager.add(new Separator("build.ext"));
+		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
+		Menu menu = manager.createContextMenu(control);
+		control.setMenu(menu);
+		getSite().registerContextMenu(manager, viewer);
+		super.makeActions();
+	}
+	
+	public void add(String display, ActiveModuleData data) {
+		TreeNode root = (TreeNode)viewer.getInput();
+		ActiveModuleTreeNode child = new ActiveModuleTreeNode(data, display, true);
+		GraphTreeNode graphNode;
+		root.add(child);
+		DashboardGraphData graphData;
+		for(int i=0; i<data.module.graphs.length; i++) {
+			graphData = new DashboardGraphData();
+			graphData.data = data.data;
+			graphData.filters = new IDataSetFilter[data.module.filters[i].size()];
+			data.module.filters[i].toArray(graphData.filters);
+			graphData.graph = data.module.graphs[i];
+			graphData.moduleName = data.module.category;
+			graphData.adapter = null;
+			ActivateGraphAction act = new ActivateGraphAction();
+			graphNode = new GraphTreeNode(graphData, data.module.graphs[i].title, true);
+			act.run(graphNode);
+			child.add(graphNode);
+			
+		}
+		root.sortLevel();
+		viewer.refresh();
+		
+	}
+	/**
+	 * This method removes all internal references. Nothing should be called/referenced after
+	 * this method is run.
+	 */
+	public void dispose() {
+		LogManager.logInfo("disposing", this);
+		super.dispose();
+		viewer=null;
+	}
+	/**
+	 * This class provides functionality for determining what image to 
+	 * display for each item in the tree.
+	 */
+	private class ViewLabelProvider extends LabelProvider {
+		public String getText(Object obj) {
+			return obj.toString();
+		}
+
+		public Image getImage(Object obj) {
+			TreeNode treeObj = (TreeNode)obj;
+			Image img = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_ELEMENT);
+			
+			if(treeObj.getChildCount() > 0)
+				img = DashboardPlugin.getImageDescriptor("icons/misc/module_obj.gif").createImage();
+			else if(treeObj instanceof GraphTreeNode){
+				if(null == ((DashboardGraphData)((GraphTreeNode)treeObj).getData()).adapter)
+					img = DashboardPlugin.getImageDescriptor("icons/misc/graph_dis.gif").createImage();
+				else
+					img = DashboardPlugin.getImageDescriptor("icons/misc/graph_act.gif").createImage();
+			}
+
+			return img;
+		}
+	}	
+	public static final String ID = "org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardGraphsBrowserView";
+	
+}
+
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/DashboardModuleBrowserView.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/DashboardModuleBrowserView.java
new file mode 100755
index 0000000..371dfd6
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/DashboardModuleBrowserView.java
@@ -0,0 +1,98 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.views;
+
+
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.ui.IWorkbenchActionConstants;
+
+import org.eclipse.linuxtools.systemtap.ui.logging.LogManager;
+import org.eclipse.linuxtools.systemtap.ui.structures.TreeNode;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.DashboardModuleLocator;
+
+/**
+ * This is a basic browser view for the dashboard perspective.  It contains a list
+ * of all of the available dashboard modules.
+ * @author Ryan Morse
+ */
+public class DashboardModuleBrowserView extends ModuleView {
+	public DashboardModuleBrowserView() {
+		super();
+		LogManager.logInfo("Initializing", this);
+	}
+	
+	/**
+	 * This method sends requests to get all of the modules that are
+	 * avialable on the system.  Once then are found, it will
+	 * set the viewer's content to the tree of modules that were found.
+	 */
+	protected void generateModuleTree() {
+		TreeNode modules = DashboardModuleLocator.getModules();
+		
+		if(null != modules)
+			viewer.setInput(modules);
+		else
+			viewer.setInput(new TreeNode("", false));
+	
+	}
+	
+	/**
+	 * This method builds the actions for the items inside this view.  It adds a
+	 * double click listener to each of the Items so they will be run if they
+	 * are actual modules.  It also sets up the layout for popup menu when users
+	 * right click on a module element.
+	 */
+	protected void makeActions() {
+		dblClickListener = new IDoubleClickListener() {
+			public void doubleClick(DoubleClickEvent e) {
+				//Disabled for now, until find way to disable this like menu
+				//RunModuleAction act = new RunModuleAction();
+				//act.run();
+			}
+		};
+		
+		viewer.addDoubleClickListener(dblClickListener);
+		
+		//Gets items from plugin.xml
+		MenuManager manager = new MenuManager("modulePopup");
+		Control control = this.viewer.getControl();
+		manager.add(new Separator("file.ext"));
+		manager.add(new Separator("build.ext"));
+		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
+		Menu menu = manager.createContextMenu(control);
+		control.setMenu(menu);
+		getSite().registerContextMenu(manager, viewer);
+		super.makeActions();
+	}
+	
+	/**
+	 * This method removes all internal references. Nothing should be called/referenced after
+	 * this method is run.
+	 */
+	public void dispose() {
+		LogManager.logInfo("disposing", this);
+		viewer.removeDoubleClickListener(dblClickListener);
+		super.dispose();
+	}
+
+
+	public static final String ID = "org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardModuleBrowserView";
+	private IDoubleClickListener dblClickListener;
+	
+}
+
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/DashboardView.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/DashboardView.java
new file mode 100644
index 0000000..fad1125
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/DashboardView.java
@@ -0,0 +1,357 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.views;
+
+import java.util.ArrayList;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabFolder2Listener;
+import org.eclipse.swt.custom.CTabFolderEvent;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Cursor;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.ViewPart;
+
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.IDataSet;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.structures.GraphData;
+import org.eclipse.linuxtools.systemtap.ui.logging.LogManager;
+import org.eclipse.linuxtools.systemtap.ui.structures.UpdateManager;
+import org.eclipse.linuxtools.systemtap.ui.structures.listeners.ITabListener;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.DashboardAdapter;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.DashboardComposite;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.internal.DashboardPlugin;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.preferences.DashboardPreferenceConstants;
+
+
+/**
+ * This is the main view of the dashboard.  It is where all of the graphs are displayed 
+ * when they are run.  It utalizes <code>DashboardComposite</code> to handle all of the 
+ * layout data for the view.
+ * @author Henry Hughes
+ * @author Ryan Morse
+ */
+public class DashboardView extends ViewPart {
+
+	public DashboardView() {
+	super();
+	LogManager.logDebug("Start DashboardView:", this);
+	LogManager.logInfo("Initializing", this);
+	composites = new ArrayList<DashboardComposite>();
+	tabListeners = new ArrayList<ITabListener>();
+	moduleNames = new ArrayList<String>();
+	LogManager.logDebug("End DashboardView:", this);
+
+}
+
+	
+	/**
+	 * This method will create a new composite for the module
+	 * The composite will be given a new tab item at the end of 
+	 * the list.
+	 * @param title The name to be shown on the new tab
+	 */
+	public void createComposite(String title) {
+		CTabItem item;
+
+		item = new CTabItem(scriptFolder, SWT.CLOSE);
+		item.setText(title);
+		
+		Composite parent = new Composite(scriptFolder, SWT.NONE);
+		parent.setBackground(new Color(parent.getDisplay(), 0, 0, 255));
+		DashboardComposite comp = new DashboardComposite(parent, SWT.BORDER);
+		IPreferenceStore p = DashboardPlugin.getDefault().getPreferenceStore();
+		int delay = p.getInt(DashboardPreferenceConstants.P_DASHBOARD_UPDATE_DELAY);
+		updater = new UpdateManager(delay);
+		composites.add(comp);
+		moduleNames.add(title);
+		item.setControl(parent);
+
+		scriptFolder.setSelection(item);
+		fireTabOpenEvent();
+	}
+
+ /*
+	 * This method creates the layout for the view.  It makes use of 
+	 * <code>DashboardComposite</code> to handle positioning of all of the graphs.
+	 * @param parent The composite that contains all elements added by this view.
+	 */
+/*	public void createPartControl(Composite parent) {
+		composite[CompositeNo] = new DashboardComposite(parent, SWT.BORDER);
+		IPreferenceStore p = DashboardPlugin.getDefault().getPreferenceStore();
+		int delay = p.getInt(DashboardPreferenceConstants.P_DASHBOARD_UPDATE_DELAY);
+		updater = new UpdateManager(delay);
+	}*/
+	
+	public void createPartControl(Composite parent) {
+		LogManager.logDebug("Start createPartControl: parent-" + parent, this);
+	     //bar.pack();
+		FormData data2 = new FormData();
+		data2.left = new FormAttachment(0, 0);
+		data2.top = new FormAttachment(0, 0);
+		data2.right = new FormAttachment(100, 0);
+		data2.bottom = new FormAttachment(100, 0);
+		Composite cmpGraph = new Composite(parent, SWT.NONE);
+		cmpGraph.setLayoutData(data2);
+		
+		//This is for the tab view
+		cmpGraph.setLayout(new FormLayout());
+		FormData data3 = new FormData();
+		data3.left = new FormAttachment(0, 0);
+		data3.top = new FormAttachment(0, 0);
+		data3.right = new FormAttachment(100, 0);
+		data3.bottom = new FormAttachment(6, 0);
+	//	while (DashboardModuleLocator.moduleNames == null) {}
+	//	allModuleNames = new ArrayList<String>(DashboardModuleBrowserView.getmoduleNames());
+	
+		
+	/*	Composite toolbar = new Composite(cmpGraph, SWT.NONE);
+		Button modbutton = new Button(toolbar,SWT.PUSH);
+	//	modbutton.setBackground(new Color(Display.getCurrent(), IGraphColorConstants.COLORS[0]));
+		modbutton.setText(allModuleNames.get(1));
+		//modbutton.setText("text0");
+		modbutton = new Button(toolbar,SWT.PUSH);
+		//modbutton.setBackground(new Color(Display.getCurrent(), IGraphColorConstants.COLORS[1]));
+		modbutton.setText(allModuleNames.get(0));
+		for (int i = 2; i < 5; i++) {
+		      modbutton = new Button(toolbar, SWT.PUSH);
+		      modbutton.setText(allModuleNames.get(i));
+		     // modbutton.setBackground(new Color(Display.getCurrent(), IGraphColorConstants.COLORS[i]));
+		    }
+		toolbar.setLayout(new RowLayout());
+		toolbar.setLayoutData(data3);
+		toolbar.pack();*/
+		
+	  /* ToolBar bar = new ToolBar(cmpGraph, SWT.BORDER);
+	      ToolItem item = new ToolItem(bar, SWT.PUSH);
+	      item.setText(allModuleNames.get(1));
+	      item = new ToolItem(bar, SWT.PUSH);
+	      item.setText(allModuleNames.get(0));
+	
+		    for (int i = 2; i < allModuleNames.size(); i++) {
+		      item = new ToolItem(bar, SWT.PUSH);
+		      item.setText(allModuleNames.get(i));
+		    }
+		 bar.setLayoutData(data3);
+		 bar.pack(); */
+	
+
+		//Create the folder for all of the script sets, so it takes up all of the parent composite
+		scriptFolder = new CTabFolder(cmpGraph, SWT.NONE);
+		FormData data = new FormData();
+		data.top = new FormAttachment(0, 0);
+		data.left = new FormAttachment(0, 0);
+		data.right = new FormAttachment(100, 0);
+		data.bottom = new FormAttachment(100, 0);
+		scriptFolder.setLayoutData(data);
+		scriptFolder.addSelectionListener(new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				fireTabChangedEvent();
+			}
+			
+			public void widgetDefaultSelected(SelectionEvent e) {}
+		});
+		
+
+		scriptFolder.addCTabFolder2Listener(new CTabFolder2Listener() {
+			public void restore(CTabFolderEvent e) {}
+			public void showList(CTabFolderEvent e) {}
+			public void minimize(CTabFolderEvent e) {}
+			public void maximize(CTabFolderEvent e) {}
+			public void close(CTabFolderEvent e) {
+				composites.remove(scriptFolder.indexOf((CTabItem)e.item));
+		    	moduleNames.remove(scriptFolder.indexOf((CTabItem)e.item));
+				fireTabCloseEvent();
+			}
+		});
+		
+		Display display = parent.getShell().getDisplay();
+		
+		/*scriptFolder.setSelectionBackground(new Color[] {
+		        display.getSystemColor(SWT.COLOR_WIDGET_DARK_SHADOW),
+		        display.getSystemColor(SWT.COLOR_WIDGET_NORMAL_SHADOW),
+		        display.getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW)}, new int[] { 50,
+		        100});*/
+		
+         scriptFolder.setSelectionBackground(display.getSystemColor(SWT.COLOR_GRAY));
+         //scriptFolder.setForeground(display.getSystemColor(SWT.COLOR_YELLOW));
+         scriptFolder.setMaximizeVisible(true);
+         scriptFolder.setSelectionForeground(display.getSystemColor(SWT.COLOR_BLACK));
+         
+		LogManager.logDebug("End createPartControl", this);
+	}
+
+
+	public void setFocus() {}
+
+	/*public Composite getComposite() {
+		return composite.deadComposite;
+	}*/
+	
+	/**
+	 * This method creates a new graph in the view.  It creates a wrapper for the graph
+	 * and then adds an update listener to the graph, and finally registers it with
+	 * the composite.
+	 * @param gd The data needed to create a new graph
+	 * @param ds The dataset used to store all script output data
+	 * @return The newly create graph component.
+	 */
+/*	public DashboardAdapter createGraph(GraphData gd, IDataSet ds) {
+		DashboardAdapter adapter = new DashboardAdapter(composite, gd, ds);
+		updater.addUpdateListener(adapter.getGraph());
+		composite.add(adapter);
+		
+		return adapter;
+	}*/
+	/**
+	 * This method creates a new graph in the view.  It creates a wrapper for the graph
+	 * and then adds an update listener to the graph, and finally registers it with
+	 * the composite.
+	 * @param gd The data needed to create a new graph
+	 * @param ds The dataset used to store all script output data
+	 * @return The newly create graph component.
+	 */
+	public DashboardAdapter createGraph(GraphData gd, IDataSet ds, String moduleName) {
+		 Display disp = PlatformUI.getWorkbench().getDisplay();
+		  Cursor cursor = new Cursor(disp, SWT.CURSOR_WAIT);
+		  PlatformUI.getWorkbench().getDisplay().getActiveShell().setCursor(cursor);
+   //    while (ds.getRowCount() <= 0 ) {}
+		int index = searchModuleNames(moduleName);
+	
+		DashboardAdapter adapter = null;
+		if (index == -1)
+		{
+				createComposite(moduleName);
+			index = searchModuleNames(moduleName);
+		}
+		adapter = new DashboardAdapter(composites.get(index), gd, ds, moduleName);
+		updater.addUpdateListener(adapter.getGraph());
+		composites.get(index).add(adapter);
+		  PlatformUI.getWorkbench().getDisplay().getActiveShell().setCursor(null);
+		  cursor.dispose();
+		return adapter;
+	}
+	
+	private int searchModuleNames(String moduleName) {
+		for (int i = 0; i<moduleNames.size();i++)
+		{
+			
+			if (moduleName.equals(moduleNames.get(i))) return i;
+		}
+		return -1;
+	}
+
+	public UpdateManager getUpdater() {
+		return updater;
+	}
+
+	public void removeGraph(DashboardAdapter graph, String moduleName) {
+		int index = searchModuleNames(moduleName);
+		composites.get(index).remove(graph);
+		graph.dispose();
+		/*if (composites.get(index).getusedSlots() == 0)
+		{
+			composites.remove(index);
+			moduleNames.remove(index);
+			tabListeners.remove(index);
+			fireTabCloseEvent();
+		}*/
+	}
+	
+	public void closeComposite(String moduleName)
+	{
+		int index = searchModuleNames(moduleName);
+		if (composites.get(index).getusedSlots() <= 0)
+		{
+		scriptFolder.getItem(index).dispose();
+		moduleNames.remove(index);
+		composites.remove(index);
+		}
+	}
+	
+	public void addTabListener(ITabListener listener) {
+		tabListeners.add(listener);
+	}
+
+	public void removeTabListener(ITabListener listener) {
+		tabListeners.remove(listener);
+	}
+
+	private void fireTabCloseEvent() {
+		for(int i=0; i<tabListeners.size(); i++)
+			((ITabListener)tabListeners.get(i)).tabClosed();
+	}
+	
+	
+	private void fireTabOpenEvent() {
+		for(int i=0; i<tabListeners.size(); i++)
+			((ITabListener)tabListeners.get(i)).tabOpened();
+	}
+
+	private void fireTabChangedEvent() {
+		for(int i=0; i<tabListeners.size(); i++)
+			((ITabListener)tabListeners.get(i)).tabChanged();
+	}
+	
+	/**
+	 * Removes all internal references in this class.  Nothing should make any references
+	 * to anyting in this class after calling the dispose method.
+	 */
+	public void dispose() {
+		LogManager.logDebug("Start dispose:", this);
+		LogManager.logInfo("Disposing", this);
+		super.dispose();
+
+		if(null != scriptFolder)
+			scriptFolder.dispose();
+		scriptFolder = null;
+		if(null != composites)
+			composites.removeAll(composites);
+		composites = null;
+		scriptFolder = null;
+		if(null != tabListeners)
+			tabListeners.removeAll(tabListeners);
+		tabListeners = null;
+		LogManager.logDebug("End dispose:", this);
+		
+	}
+	
+	public static void addmodulename(String str)
+	{
+		if (allModuleNames == null) allModuleNames = new ArrayList<String>();
+		
+		allModuleNames.add(str);
+	}
+	
+	private ArrayList<DashboardComposite> composites;
+	private ArrayList<String> moduleNames;
+	public static ArrayList<String> allModuleNames = null;
+	private ArrayList<ITabListener> tabListeners;
+	private UpdateManager updater;
+	private CTabFolder scriptFolder;
+	public static final String ID = "org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardView";
+	
+}
+
+
+
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/GraphsView.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/GraphsView.java
new file mode 100644
index 0000000..5f798a9
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/GraphsView.java
@@ -0,0 +1,152 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.views;
+
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Cursor;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.ViewPart;
+
+import org.eclipse.linuxtools.systemtap.ui.logging.LogManager;
+import org.eclipse.linuxtools.systemtap.ui.structures.TreeNode;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.internal.DashboardPlugin;
+
+/**
+ * This class provides the framework for the ModuleBrowsers.  Since
+ * it is abstract, it can't be implemented itself.  It does however
+ * provide a number of common methods that will be needed for all of
+ * the ModuleBrowsers.
+ * @author Ryan Morse
+ */
+public abstract class GraphsView extends ViewPart {
+	public GraphsView() {
+		super();
+		LogManager.logInfo("Initializing", this);
+	}
+	
+	/**
+	 * This class provides the framework for traversing the view's Tree structure.
+	 */
+	private class ViewContentProvider implements IStructuredContentProvider, ITreeContentProvider {
+		public void inputChanged(Viewer v, Object oldInput, Object newInput) {}
+		
+		public void dispose() {}
+		
+		public Object[] getElements(Object parent) {
+			return getChildren(parent);
+		}
+		
+		public Object getParent(Object child) {
+			return null;
+		}
+		
+		public Object[] getChildren(Object par) {
+			TreeNode parent = ((TreeNode)par);
+
+			Object[] children = new Object[parent.getChildCount()];
+
+			for(int i=0; i<children.length; i++) {
+				children[i] = parent.getChildAt(i);
+			}
+			
+			return children;
+		}
+		
+		public boolean hasChildren(Object parent) {
+			return ((TreeNode)parent).getChildCount() > 0;
+		}
+	}
+	
+	/**
+	 * This class provides functionality for determining what image to
+	 * display for each item in the tree.
+	 */
+	private class ViewLabelProvider extends LabelProvider {
+		public String getText(Object obj) {
+			return obj.toString();
+		}
+
+		public Image getImage(Object obj) {
+			TreeNode treeObj = (TreeNode)obj;
+			Image img;
+			
+			img = DashboardPlugin.getImageDescriptor("icons/misc/graph_dis.gif").createImage();
+			if (treeObj.getChildCount() > 0)
+				img = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER);
+
+			return img;
+		}
+	}	
+	
+	/**
+	 * This method creates the framework for the view.  It initializes the viewer, which 
+	 * contains the TreeNode and handles how to display each entry.
+	 */
+	public void createPartControl(Composite parent) {
+		LogManager.logDebug("Start createPartControl: parent-" + parent, this);
+		parent.getShell().setCursor(new Cursor(parent.getShell().getDisplay(), SWT.CURSOR_WAIT));
+		viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
+		viewer.setContentProvider(new ViewContentProvider());
+		viewer.setLabelProvider(new ViewLabelProvider());
+
+		generateGraphsTree();
+		makeActions();
+		LogManager.logDebug("End createPartControl:", this);
+	}
+	
+	/**
+	 * This method is intented to provided the necessary information for generating everthing
+	 * that needs to be displayed in the tree viewer.
+	 */
+	protected abstract void generateGraphsTree();
+
+	/**
+	 * This method is intented to add new Actions to the view.
+	 */
+	protected void makeActions() {}
+	
+	/**
+	 * This method is intented to handle updating the view when items are added or removed.
+	 */
+	public void refresh() {
+		generateGraphsTree();
+	}
+	
+	public TreeViewer getViewer() {
+		return viewer;
+	}
+
+	public void setFocus() {
+		viewer.getControl().setFocus();
+	}
+
+	/**
+	 * This method removes all internal references. Nothing should be called/referenced after
+	 * this method is run.
+	 */
+	public void dispose() {
+		LogManager.logInfo("disposing", this);
+		super.dispose();
+		viewer = null;
+	}
+	
+	public static final String ID = "org.eclipse.linuxtools.systemtap.ui.dashboard.views.GraphsView";
+	protected TreeViewer viewer;
+}
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/ModuleView.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/ModuleView.java
new file mode 100644
index 0000000..50422ce
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/views/ModuleView.java
@@ -0,0 +1,260 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboard.views;
+
+import org.eclipse.jface.resource.FontRegistry;
+import org.eclipse.jface.viewers.IColorProvider;
+import org.eclipse.jface.viewers.IFontProvider;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Cursor;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.ViewPart;
+
+import org.eclipse.linuxtools.systemtap.ui.logging.LogManager;
+import org.eclipse.linuxtools.systemtap.ui.structures.TreeNode;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.internal.DashboardPlugin;
+
+/**
+ * This class provides the framework for the ModuleBrowsers.  Since
+ * it is abstract, it can't be implemented itself.  It does however
+ * provide a number of common methods that will be needed for all of
+ * the ModuleBrowsers.
+ * @author Ryan Morse
+ */
+public abstract class ModuleView extends ViewPart {
+	public ModuleView() {
+		super();
+		LogManager.logInfo("Initializing", this);
+	}
+	
+	/**
+	 * This class provides the framework for traversing the view's Tree structure.
+	 */
+	private class ViewContentProvider implements IStructuredContentProvider, ITreeContentProvider {
+		public void inputChanged(Viewer v, Object oldInput, Object newInput) {}
+		
+		public void dispose() {}
+		
+		public Object[] getElements(Object parent) {
+			return getChildren(parent);
+		}
+		
+		public Object getParent(Object child) {
+			return null;
+		}
+		
+		public Object[] getChildren(Object par) {
+			TreeNode parent = ((TreeNode)par);
+
+			Object[] children = new Object[parent.getChildCount()];
+
+			for(int i=0; i<children.length; i++) {
+				children[i] = parent.getChildAt(i);
+			}
+			
+			return children;
+		}
+		
+		public boolean hasChildren(Object parent) {
+			return ((TreeNode)parent).getChildCount() > 0;
+		}
+	}
+public class ViewLabelProvider extends LabelProvider 
+	implements ILabelProvider, IFontProvider, IColorProvider{
+
+	FontRegistry registry = new FontRegistry();
+	int j=0;
+
+	public Image getImage(Object element) {
+		TreeNode treeObj = (TreeNode)element;
+		Image img = null;
+		img = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER);
+		if (treeObj.getChildCount() == 0)
+			img = DashboardPlugin.getImageDescriptor("icons/misc/module_obj.gif").createImage();
+		
+		return img;
+	}
+
+	public String getText(Object obj) {
+		return obj.toString();
+	}
+
+	public void addListener(ILabelProviderListener listener) {
+		// TODO Auto-generated method stub
+
+	}
+
+	public void dispose() {
+		// TODO Auto-generated method stub
+
+	}
+
+	public boolean isLabelProperty(Object element, String property) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public void removeListener(ILabelProviderListener listener) {
+		// TODO Auto-generated method stub
+
+	}
+
+	public Font getFont(Object element) {
+		Font font = Display.getCurrent().getSystemFont();
+		TreeNode parent = ((TreeNode)element);
+		/*if (parent.getChildCount()>0) {
+			font = registry.getBold(Display.getCurrent().getSystemFont().g);
+		}*/
+		return font;
+	}
+
+	public Color getBackground(Object element) {
+		TreeNode parent = ((TreeNode)element);
+		Color c = null;
+	//	if (parent.getChildCount()>0) {
+	//	c = new Color(Display.getCurrent(), IGraphColorConstants.COLORS[j]);
+	//	j++;
+	//	}
+		return c;
+	}
+
+	public Color getForeground(Object element, int columnIndex) {
+		//Globals.debug("Get foreground colour for index " + columnIndex + "!",8);
+		Color color = null;
+		//if (element instanceof MyModelItem) {
+			//color = Display.getCurrent().getSystemColor(SWT.COLOR_RED);
+		//}
+		return color;
+	}
+
+	public Color getForeground(Object element) {
+	//	Globals.debug("Get foreground colour!",8);
+	//	Color color = Display.getCurrent().getSystemColor(SWT.COLOR_BLUE);;
+	//	if (element instanceof MyModelItem) {
+		//	MyModelItem mItem = (MyModelItem) element;
+			//color = Display.getCurrent().getSystemColor(SWT.COLOR_GREEN);
+		//}
+		return null;
+	}
+
+	public Color getBackground(Object element, int columnIndex) {
+		return null;
+	}
+
+}
+	/**
+	 * This class provides functionality for determining what image to
+	 * display for each item in the tree.
+	 */
+	/*private class ViewLabelProvider extends LabelProvider implements ITableColorProvider{
+		public String getText(Object obj) {
+			return obj.toString();
+		}
+
+		public Image getImage(Object obj) {
+			TreeNode treeObj = (TreeNode)obj;
+			Image img;
+			
+			img = DashboardPlugin.getImageDescriptor("icons/misc/module_obj.gif").createImage();
+			if (treeObj.getChildCount() > 0)
+				img = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER);
+
+			return img;
+		}
+
+		public Color getBackground(Object obj, int columnIndex) {
+		//	if (((TreeNode)obj).getChildCount() > 0)
+			//{
+			Color color = new Color(null, 255, 255, 255);//color is black
+			return color;
+		//	}
+			//else
+				//return null;
+		}
+
+		public Color getForeground(Object element, int columnIndex) {
+			// TODO Auto-generated method stub
+			Color color = new Color(null, 255, 255, 255);//color is black
+			return color;
+		}
+	}	*/
+	
+	/**
+	 * This method creates the framework for the view.  It initializes the viewer, which 
+	 * contains the TreeNode and handles how to display each entry.
+	 */
+	public void createPartControl(Composite parent) {
+		LogManager.logDebug("Start createPartControl: parent-" + parent, this);
+		parent.getShell().setCursor(new Cursor(parent.getShell().getDisplay(), SWT.CURSOR_WAIT));
+	//	viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
+        viewer = new TreeViewer(parent);
+		viewer.setContentProvider(new ViewContentProvider());
+		viewer.setLabelProvider(new ViewLabelProvider());
+
+		generateModuleTree();
+		makeActions();
+		LogManager.logDebug("End createPartControl:", this);
+	}
+	
+	/**
+	 * This method is intented to provided the necessary information for generating everthing
+	 * that needs to be displayed in the tree viewer.
+	 */
+	protected abstract void generateModuleTree();
+
+	/**
+	 * This method is intented to add new Actions to the view.
+	 */
+	protected void makeActions() {}
+	
+	/**
+	 * This method is intented to handle updating the view when items are added or removed.
+	 */
+	public void refresh() {
+		generateModuleTree();
+	}
+	
+	public TreeViewer getViewer() {
+		return viewer;
+	}
+
+	public void setFocus() {
+		viewer.getControl().setFocus();
+	}
+
+	/**
+	 * This method removes all internal references. Nothing should be called/referenced after
+	 * this method is run.
+	 */
+	public void dispose() {
+		LogManager.logInfo("disposing", this);
+		super.dispose();
+		viewer = null;
+	}
+	
+	public static final String ID = "org.eclipse.linuxtools.systemtap.ui.dashboard.views.ModuleView";
+	protected TreeViewer viewer;
+}
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/toc.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/toc.xml
new file mode 100755
index 0000000..dff78c3
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/toc.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="Systemtap Dashboard User Guide" topic="documentation/html/toc.html">
+   <topic label="Getting Started" href="documentation/html/gettingstarted/gettingStarted.html">
+      <anchor id="gettingstarted"/>
+   </topic>
+   <topic label="Concepts" href="documentation/html/concepts/concepts.html">
+      <anchor id="concepts"/>
+   </topic>
+   <topic label="Tasks" href="documentation/html/tasks/tasks.html">
+      <anchor id="tasks"/>
+   </topic>
+   <topic label="Reference" href="documentation/html/reference/reference.html">
+      <anchor id="reference"/>
+   </topic>
+</toc>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/.classpath b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/.classpath
new file mode 100644
index 0000000..2035d8e
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/.project b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/.project
new file mode 100644
index 0000000..57309d6
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.systemtap.ui.dashboardextension</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/ChangeLog
new file mode 100644
index 0000000..2f0fb66
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/ChangeLog
@@ -0,0 +1,33 @@
+2010-02-04  Anithra P Janakiraman  <anithra@linux.vnet.ibm.com>
+
+	* META-INF/MANIFEST.MF: removed version dependency for org.eclipse.ui bundle
+
+2010-01-29  Anithra P Janakiraman  <anithra@linux.vnet.ibm.com>
+
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/actions/ExportScriptAction.java:
+	(run): 
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/dialogs/ExportScriptDialog.java:
+	(buttonPressed): 
+
+2010-01-29  Anithra P Janakiraman  <anithra@linux.vnet.ibm.com>
+	
+	* .classpath: New file.
+	* .project: New file.
+	* bin: New file.
+	* build.properties: New file.
+	* icons/actions/export_wiz.gif: New file.
+	* icons/actions/file_obj.gif: New file.
+	* icons/actions/mod_obj.gif: New file.
+	* META-INF/MANIFEST.MF: New file.
+	* plugin.properties: New file.
+	* plugin.xml: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/actions/AddScriptAction.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/actions/CreateModuleAction.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/actions/DeleteScriptAction.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/actions/ExportScriptAction.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/actions/ViewScriptAction.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/dialogs/ExportScriptDialog.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/dialogs/ScriptDetails.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/internal/DashboardExtensionPlugin.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/internal/Localization.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/internal/localization.properties: 
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..5622bb3
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/META-INF/MANIFEST.MF
@@ -0,0 +1,23 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: DashboardExtension Plug-in (Incubation)
+Bundle-SymbolicName: org.eclipse.linuxtools.systemtap.ui.dashboardextension; singleton:=true
+Bundle-Version: 0.3.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.systemtap.ui.dashboardextension.internal.DashboardExtensionPlugin
+Bundle-Vendor: Eclipse
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.linuxtools.systemtap.ui.ide,
+ org.eclipse.linuxtools.systemtap.ui.editor,
+ org.eclipse.linuxtools.systemtap.ui.graphing,
+ org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui,
+ org.eclipse.linuxtools.systemtap.ui.logging,
+ org.eclipse.linuxtools.systemtap.ui.systemtapgui,
+ org.eclipse.linuxtools.systemtap.ui.structures,
+ org.eclipse.linuxtools.systemtap.ui.dashboard,
+ org.eclipse.linuxtools.systemtap.ui.graphingapi.ui
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Import-Package: org.eclipse.linuxtools.systemtap.ui.editor
+
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/build.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/build.properties
new file mode 100644
index 0000000..c88359b
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/build.properties
@@ -0,0 +1,7 @@
+source.. = src/
+output.. = bin/
+bin.includes = plugin.xml,\
+               META-INF/,\
+               .,\
+               icons/,\
+               plugin.properties
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/icons/actions/export_wiz.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/icons/actions/export_wiz.gif
new file mode 100644
index 0000000..5a0837d
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/icons/actions/export_wiz.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/icons/actions/file_obj.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/icons/actions/file_obj.gif
new file mode 100755
index 0000000..7ccc6a7
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/icons/actions/file_obj.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/icons/actions/mod_obj.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/icons/actions/mod_obj.gif
new file mode 100644
index 0000000..8bbfd04
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/icons/actions/mod_obj.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.properties
new file mode 100644
index 0000000..bdc6f14
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.properties
@@ -0,0 +1,18 @@
+command.exportScript.name=&Export Script...
+command.exportScript.desc=Export Script to the Dashboard
+
+actionset.export.name=Export Action Set
+action.exportScript.name=&Export Script...
+action.exportScript.desc=Export Script to the Dashboard
+
+command.createModule.name=&Create Module...
+command.createModule.desc=Create new Dashboard Module
+
+actionset.createModule.name=Create Module Action Set
+action.createModule.name=&Create Module...
+action.createModule.desc=Create new Dashboard Module
+
+
+action.viewScript.name=View Script
+action.addScript.name=Add Script
+action.deleteScript.name=Delete Script
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.xml
new file mode 100644
index 0000000..200cc71
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+	<extension
+		point="org.eclipse.ui.startup">
+		<!--startup class=""-->
+	</extension>
+
+	<extension
+		point="org.eclipse.ui.commands">
+		<command
+			name="%command.exportScript.name"
+			description="%command.exportScript.desc"
+			categoryId="org.eclipse.linuxtools.systemtap.ui.ide.category.file"
+			id="org.eclipse.linuxtools.systemtap.ui.dashboardextension.commands.ExportScript"/>
+			<command
+			name="%command.createModule.name"
+			description="%command.createModule.desc"
+			categoryId="org.eclipse.linuxtools.systemtap.ui.dashboard.category.file"
+			id="org.eclipse.linuxtools.systemtap.ui.dashboardextension.commands.CreateModuleAction"/>
+	</extension>
+	<!--<extension
+		point="org.eclipse.ui.bindings">
+		<key
+			commandId="org.eclipse.linuxtools.systemtap.ui.dashboardextension.commands.ExportScript"
+			contextId="org.eclipse.ui.contexts.window"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+			sequence="M1+1"/>
+		<key
+			commandId="org.eclipse.linuxtools.systemtap.ui.dashboardextension.commands.CreateModuleAction"
+			contextId="org.eclipse.ui.contexts.window"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+			sequence="M1+2"/>
+	</extension>-->
+	<extension
+		point="org.eclipse.ui.actionSets">
+		<actionSet
+			label="%actionset.export.name"
+			visible="true"
+			id="org.eclipse.linuxtools.systemtap.ui.dashboardextension.ExportScriptActionSet">
+			<action
+				label="%action.exportScript.name"
+				tooltip="%action.exportScript.desc"
+				id="org.eclipse.linuxtools.systemtap.ui.dashboardextension.actions.ExportScript"
+				icon="icons/actions/export_wiz.gif"
+				toolbarPath="org.eclipse.ui.workbench.file/export.ext"
+				menubarPath="file2/export.ext"
+				class="org.eclipse.linuxtools.systemtap.ui.dashboardextension.actions.ExportScriptAction"
+				definitionId="org.eclipse.linuxtools.systemtap.ui.dashboardextension.commands.ExportScript"
+				style="push"
+				state="false"/>
+		</actionSet>
+	</extension>
+	<extension
+		point="org.eclipse.ui.actionSets">
+		<actionSet
+			label="%actionset.createModule.name"
+			visible="true"
+			id="org.eclipse.linuxtools.systemtap.ui.dashboardextension.CreateModuleActionSet">
+			<action
+				label="%action.createModule.name"
+				tooltip="%action.createModule.desc"
+				id="org.eclipse.linuxtools.systemtap.ui.dashboardextension.actions.CreateModuleAction"
+				icon="icons/actions/mod_obj.gif"
+				toolbarPath="org.eclipse.ui.workbench.file/export.ext"
+				menubarPath="file2/export.ext"
+				class="org.eclipse.linuxtools.systemtap.ui.dashboardextension.actions.CreateModuleAction"
+				definitionId="org.eclipse.linuxtools.systemtap.ui.dashboardextension.commands.CreateModuleAction"
+				style="push"
+				state="true"/>
+		</actionSet>
+	</extension>
+	
+
+	<extension
+		point="org.eclipse.ui.popupMenus">
+		<objectContribution
+			adaptable="false"
+			id="org.eclipse.linuxtools.systemtap.ui.dashboardextension.ViewScriptMenu"
+			objectClass="org.eclipse.linuxtools.systemtap.ui.dashboard.structures.ModuleTreeNode">
+			<action
+				label="%action.viewScript.name"
+				class="org.eclipse.linuxtools.systemtap.ui.dashboardextension.actions.ViewScriptAction"
+				icon="icons/actions/file_obj.gif"
+				menubarPath="file.ext"
+				id="org.eclipse.linuxtools.systemtap.ui.dashboardextension.ViewScriptAction"
+				style="push"/>
+   <!--<action
+         class="org.eclipse.linuxtools.systemtap.ui.dashboardextension.actions.AddScriptAction"
+         icon="icons/actions/file_obj.gif"
+         id="org.eclipse.linuxtools.systemtap.ui.dashboardextension.AddScriptAction"
+         label="%action.addScript.name"
+         menubarPath="file.ext"
+         style="push">
+   </action>-->
+   <!--<action
+         class="org.eclipse.linuxtools.systemtap.ui.dashboardextension.actions.DeleteScriptAction"
+         icon="icons/actions/file_obj.gif"
+         id="org.eclipse.linuxtools.systemtap.ui.dashboardextension.DeleteScriptAction"
+         label="%action.deleteScript.name"
+         menubarPath="file.ext"
+         style="push">
+   </action>-->
+		</objectContribution>
+	</extension>
+
+	<extension
+		point="org.eclipse.ui.perspectiveExtensions">
+		<perspectiveExtension
+			targetID="org.eclipse.linuxtools.systemtap.ui.ide.IDEPerspective">
+			<actionSet id="org.eclipse.linuxtools.systemtap.ui.dashboardextension.ExportScriptActionSet"/>
+		</perspectiveExtension>
+		<perspectiveExtension
+			targetID="org.eclipse.linuxtools.systemtap.ui.dashboard.DashboardPerspective">
+			<actionSet id="org.eclipse.linuxtools.systemtap.ui.dashboardextension.CreateModuleActionSet"/>
+		</perspectiveExtension>
+	</extension>
+</plugin>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/actions/AddScriptAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/actions/AddScriptAction.java
new file mode 100644
index 0000000..a71f041
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/actions/AddScriptAction.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboardextension.actions;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IViewActionDelegate;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.WorkbenchException;
+
+import org.eclipse.linuxtools.systemtap.ui.editor.SimpleEditor;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.DashboardModule;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.ModuleTreeNode;
+import org.eclipse.linuxtools.systemtap.ui.ide.IDEPerspective;
+import org.eclipse.linuxtools.systemtap.ui.ide.actions.TempFileAction;
+
+/**
+ * A class that handles extracting the original script from the dashboard module.
+ * It will then create a new active editor in the IDE perspective and display the
+ * module in a temp file.  Users can then modify this script and use the modified
+ * version as well as the original.
+ * @author Ryan Morse
+ */
+public class AddScriptAction extends Action implements IViewActionDelegate {
+	/**
+	 * This method sets what item the user has selected to view.
+	 */
+	public void init(IViewPart view) {
+		selectedItem = null;
+	}
+	
+	/**
+	 * This method will retreive the script from the selected module for the user
+	 * to see.  It will then create a new active editor in the IDE perspective and 
+	 * display the module in a temp file.  Users can then modify this script and 
+	 * use the modified version as well as the original.
+	 * @param act An action representing the click event used to start this method.
+	 */
+	public void run(IAction act) {
+		DashboardModule data = (DashboardModule)selectedItem.getData();
+		
+		try {
+			IWorkbenchPage p = PlatformUI.getWorkbench().showPerspective(IDEPerspective.ID, PlatformUI.getWorkbench().getActiveWorkbenchWindow());
+
+			TempFileAction tfa = new TempFileAction();
+			tfa.run();
+			
+			IEditorPart edit = p.getActiveEditor();
+			
+			if(null != edit) {
+				if(edit instanceof SimpleEditor) {
+					SimpleEditor editor = (SimpleEditor)edit;
+					
+					//Copy the file just to ensure the user has to save their own copy if they want it
+					FileInputStream fin;		
+					try {
+					    fin = new FileInputStream(data.script);
+					    StringBuilder sb = new StringBuilder();
+					    
+					    int c;
+					    while((c = fin.read()) != -1)
+					    	sb.append((char)c);
+					    
+					    fin.close();		
+						editor.insertText(sb.toString());
+					} catch (IOException e) {}
+				}
+			}
+		} catch(WorkbenchException we) {}
+	}
+	
+	/**
+	 * This method will update the selected item when a new item is selected.
+	 * @param action The action that fired this method.
+	 * @param selection The newly selected item.
+	 */
+	public void selectionChanged(IAction action, ISelection selection) {
+		if(selection instanceof IStructuredSelection) {
+			IStructuredSelection selected = (IStructuredSelection)selection;
+			Object o = selected.getFirstElement();
+			if(o instanceof ModuleTreeNode) {
+				selectedItem = (ModuleTreeNode)o;
+				o = selectedItem.getData();
+				if(null != o) {
+					setEnabled(true);
+					return;
+				}
+			}
+		}
+		setEnabled(false);
+	}
+	
+	private ModuleTreeNode selectedItem;
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/actions/CreateModuleAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/actions/CreateModuleAction.java
new file mode 100644
index 0000000..7497e58
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/actions/CreateModuleAction.java
@@ -0,0 +1,273 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboardextension.actions;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileWriter;
+
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.ui.IMemento;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.WorkbenchException;
+import org.eclipse.ui.XMLMemento;
+
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.IDataSet;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.IDataSetParser;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.filters.IDataSetFilter;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.structures.GraphData;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.wizards.dataset.DataSetWizard;
+import org.eclipse.linuxtools.systemtap.ui.structures.TreeNode;
+import org.eclipse.linuxtools.systemtap.ui.structures.ZipArchive;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.DashboardPerspective;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.internal.DashboardPlugin;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.preferences.DashboardPreferenceConstants;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.DashboardMetaData;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.DashboardModule;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.DashboardModuleFileFilter;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardModuleBrowserView;
+import org.eclipse.linuxtools.systemtap.ui.dashboardextension.dialogs.ExportScriptDialog;
+import org.eclipse.linuxtools.systemtap.ui.dashboardextension.dialogs.ScriptDetails;
+import org.eclipse.linuxtools.systemtap.ui.graphing.GraphingConstants;
+import org.eclipse.linuxtools.systemtap.ui.systemtapgui.SystemTapGUISettings;
+
+/**
+ * This class brings up a dialog box for the user to select what they want the
+ * new module to contain.  If a new module is build, it will be exported to the
+ * dashboard for use at any time.
+ * @author Ryan Morse
+ */
+public class CreateModuleAction extends Action implements IWorkbenchWindowActionDelegate {
+	/**
+	 * This method will bring up the export script dialog window for the user
+	 * to select what they want to new module to contain.  If the user enters
+	 * module information and clicks ok the module will be built and added to
+	 * the dashboard.
+	 */
+	
+	//private static String scriptFileName = "/script.stp";
+	public String script = null;
+	
+	public void init(IWorkbenchWindow window) {
+		fWindow= window;
+	}
+	
+	protected IWorkbenchWindow fWindow = null;
+	
+	public void run(IAction action) {
+	//	if(null == script || script.length() <= 0) {
+		//	String msg = MessageFormat.format(Localization.getString("ExportScriptAction.NoFileToExport"), null);
+		//	MessageDialog.openWarning(fWindow.getShell(), Localization.getString("ExportScriptAction.Error"), msg);
+	//	} else {
+		    ScriptDetails sd = new ScriptDetails(fWindow.getShell());
+		    sd.open();
+		    if (sd.isCanceled()) return;
+		    
+		    script = DashboardPlugin.getDefault().getPreferenceStore().getString(DashboardPreferenceConstants.P_DASHBOARD_SCRIPT);
+			DataSetWizard wizard = new DataSetWizard(GraphingConstants.DataSetMetaData, script);
+			IWorkbench workbench = PlatformUI.getWorkbench();
+			wizard.init(workbench, null);
+			WizardDialog dialog = new WizardDialog(workbench.getActiveWorkbenchWindow().getShell(), wizard);
+			dialog.create();
+			dialog.open();
+
+			IDataSetParser parser = wizard.getParser();
+			IDataSet dataSet = wizard.getDataSet();
+
+			wizard.dispose();
+			
+			if(null == parser || null == dataSet)
+				return;
+			
+			ExportScriptDialog exportDialog = new ExportScriptDialog(fWindow.getShell(), dataSet);
+			exportDialog.open();
+			
+			exportDialog.dispose();
+			if(!exportDialog.isCanceled()) {
+				String category = exportDialog.getCategory();
+				String display = exportDialog.getDisplay();
+				String description = exportDialog.getDescription();
+				GraphData[] gd = exportDialog.getGraphs();
+				TreeNode filters = exportDialog.getGraphFilters();
+
+				validateDirectory();
+				File meta = saveMetaData(display, category, description, dataSet, parser, gd, filters,DashboardPlugin.getDefault().getPreferenceStore().getString(DashboardPreferenceConstants.P_DASHBOARD_EXAMPLES_DIR));
+				String archiveName = getSaveDirectory() + "/" + category.replace(' ', '_') + "." + display.replace(' ', '_');
+				buildArchive(archiveName, new File(script), meta);
+				cleanupFiles(new String[] {archiveName, meta.getAbsolutePath()});
+				updateDashboard();
+		//	}
+		}
+	}
+	
+	/**
+	 * This method will check to make sure the exported module directory is valid.
+	 * If it isn't then the foleders will be created in order to make the directory
+	 * valid.
+	 */
+	private void validateDirectory() {
+		File folder = new File(getSaveDirectory());
+
+		if(!folder.exists())
+			folder.mkdir();
+	}
+	
+	/**
+	 * This method will create a new XML Memento used to store all of the meta data
+	 * for the module.  This data is all based on what the user selected from the
+	 * dialog box.
+	 * @param disp The string to display that represents this module.
+	 * @param cat The category string representing where this module will be placed
+	 * @param desc The description string for this module
+	 * @param dataSet The IDataSet that holds the data for this module
+	 * @param parser The parer that can obtain the information from the raw output
+	 * @param gd GraphData Array specifying all of the information needed to create the selected graphs
+	 * @param filters TreeNode containing all of the selected filters for each graph.
+	 */
+	private File saveMetaData(String disp, String cat, String desc, IDataSet dataSet, IDataSetParser parser, GraphData[] gd, TreeNode filters, String location) {
+		File meta = null;
+		XMLMemento data = XMLMemento.createWriteRoot(DashboardMetaData.XMLDashboardItem);
+
+		try {
+			IMemento child, child2, child3;
+
+			data.putString(DashboardMetaData.XMLdDisplay, disp);
+			data.putString(DashboardMetaData.XMLdCategory, cat);
+			data.putString(DashboardMetaData.XMLdDescription, desc);
+			data.putString(DashboardMetaData.XMLdDataset, dataSet.getID());
+			data.putString(DashboardMetaData.XMLdScript, script);
+			data.putString(DashboardMetaData.XMLdLocation, location);
+			data.putString(DashboardMetaData.XMLdScriptFileName, script);
+				
+			
+			child = data.createChild(DashboardMetaData.XMLParsingExpressions);
+			String[] cols = dataSet.getTitles();
+			for(int i=0; i<cols.length; i++) {
+				child2 = child.createChild(DashboardMetaData.XMLpColumn);
+				child2.putString(DashboardMetaData.XMLpName, cols[i]);
+			}
+			parser.saveXML(child.createChild(DashboardMetaData.XMLpParser));
+
+			child = data.createChild(DashboardMetaData.XMLGraphDisplays);
+			for(int j,i=0; i<gd.length; i++) {
+				child2 = child.createChild(DashboardMetaData.XMLgGraph);
+				child2.putString(DashboardMetaData.XMLgId, gd[i].graphID);
+				child2.putString(DashboardMetaData.XMLgTitle, gd[i].title);
+
+				TreeNode treeChild = filters.getChildAt(i);
+				for(j=0; j<treeChild.getChildCount(); j++) {
+					((IDataSetFilter)(treeChild.getChildAt(j).getData())).writeXML(child2);
+				}
+				
+				child3 = child2.createChild(DashboardMetaData.XMLgSeries);
+				child3.putString(DashboardMetaData.XMLgAxis, DashboardMetaData.XMLgAxisX);
+				child3.putInteger(DashboardMetaData.XMLgColumn, gd[i].xSeries);
+				for(j=0; j<gd[i].ySeries.length; j++) {
+					child3 = child2.createChild(DashboardMetaData.XMLgSeries);
+					child3.putString(DashboardMetaData.XMLgAxis, DashboardMetaData.XMLgAxisY);
+					child3.putInteger(DashboardMetaData.XMLgColumn, gd[i].ySeries[j]);
+				}
+			}
+			
+			meta = new File(getSaveDirectory() + DashboardModule.metaFileName);
+			FileWriter writer = new FileWriter(meta);
+			data.save(writer);
+			writer.close();
+		} catch(FileNotFoundException fnfe) {
+			return meta;
+		} catch(Exception e) {
+			return meta;
+		}
+		return meta;
+	}
+	
+	/**
+	 * This method will create the module archive by first zipping the .stp file and the meta data
+	 * together.  Then it will compress the .zip file into a .gz file.  The .gz file's extension is 
+	 * set to .dash to discurage users from trying to modify it and to make it sepecific to the 
+	 * SystemTapGUI dashboard.
+	 * @param archiveName The name to use for the file containing the new module data.
+	 * @param script The file representing the .stp script file to use for the module
+	 * @param meta The XML Memento file representing the module details.
+	 */
+	private void buildArchive(String archiveName, File script, File meta) {
+		String[] files = new String[] {meta.getAbsolutePath()};
+		String[] names = new String[] {DashboardModule.metaFileName};
+		
+		ZipArchive.zipFiles(archiveName, files, names);
+		ZipArchive.compressFile(archiveName + DashboardModuleFileFilter.DashboardModuleExtension, archiveName);
+	}
+	
+	/**
+	 * This method will delete any extra files that were generated as a result of building
+	 * the Dashboard module.
+	 * @param files A list of all of the file paths that should be removed
+	 */
+	private void cleanupFiles(String[] files) {
+		if(null == files)
+			return;
+		
+		File f;
+		for(int i=0; i<files.length; i++) {
+			f = new File(files[i]);
+			if(f.exists())
+				f.delete();
+		}
+	}
+	
+	/**
+	 * This method will get the directory name that should be used for saving the dashboard modules.
+	 */
+	private String getSaveDirectory() {
+		return SystemTapGUISettings.settingsFolder + "/dashboard";
+	}
+	
+	/**
+	 * This method forces the Dashboard's DashboardModuleBrowserView to refresh itself to ensure
+	 * that is contains the most up-to-date module list.
+	 */
+	private void updateDashboard() {
+		try {
+			IWorkbenchPage p = PlatformUI.getWorkbench().showPerspective(DashboardPerspective.ID, PlatformUI.getWorkbench().getActiveWorkbenchWindow());
+			IViewPart ivp = p.findView(DashboardModuleBrowserView.ID);
+			((DashboardModuleBrowserView)ivp).refresh();
+
+			//p = PlatformUI.getWorkbench().showPerspective(IDEPerspective.ID, PlatformUI.getWorkbench().getActiveWorkbenchWindow());
+		} catch(WorkbenchException we) {}
+	}
+	
+	/**
+	 * Removes all internal references to objects.  No other method should be called after this.
+	 */
+	/*public void dispose() {
+		super.dispose();
+	}*/
+
+	public void selectionChanged(IAction action, ISelection selection) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	public void dispose() {
+		// TODO Auto-generated method stub
+		
+	}
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/actions/DeleteScriptAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/actions/DeleteScriptAction.java
new file mode 100644
index 0000000..bb49c8f
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/actions/DeleteScriptAction.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboardextension.actions;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IViewActionDelegate;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.WorkbenchException;
+
+import org.eclipse.linuxtools.systemtap.ui.editor.SimpleEditor;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.DashboardModule;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.ModuleTreeNode;
+import org.eclipse.linuxtools.systemtap.ui.ide.IDEPerspective;
+import org.eclipse.linuxtools.systemtap.ui.ide.actions.TempFileAction;
+
+/**
+ * A class that handles extracting the original script from the dashboard module.
+ * It will then create a new active editor in the IDE perspective and display the
+ * module in a temp file.  Users can then modify this script and use the modified
+ * version as well as the original.
+ * @author Ryan Morse
+ */
+public class DeleteScriptAction extends Action implements IViewActionDelegate {
+	/**
+	 * This method sets what item the user has selected to view.
+	 */
+	public void init(IViewPart view) {
+		selectedItem = null;
+	}
+	
+	/**
+	 * This method will retreive the script from the selected module for the user
+	 * to see.  It will then create a new active editor in the IDE perspective and 
+	 * display the module in a temp file.  Users can then modify this script and 
+	 * use the modified version as well as the original.
+	 * @param act An action representing the click event used to start this method.
+	 */
+	public void run(IAction act) {
+		DashboardModule data = (DashboardModule)selectedItem.getData();
+		
+		try {
+			IWorkbenchPage p = PlatformUI.getWorkbench().showPerspective(IDEPerspective.ID, PlatformUI.getWorkbench().getActiveWorkbenchWindow());
+
+			TempFileAction tfa = new TempFileAction();
+			tfa.run();
+			
+			IEditorPart edit = p.getActiveEditor();
+			
+			if(null != edit) {
+				if(edit instanceof SimpleEditor) {
+					SimpleEditor editor = (SimpleEditor)edit;
+					
+					//Copy the file just to ensure the user has to save their own copy if they want it
+					FileInputStream fin;		
+					try {
+					    fin = new FileInputStream(data.script);
+					    StringBuilder sb = new StringBuilder();
+					    
+					    int c;
+					    while((c = fin.read()) != -1)
+					    	sb.append((char)c);
+					    
+					    fin.close();		
+						editor.insertText(sb.toString());
+					} catch (IOException e) {}
+				}
+			}
+		} catch(WorkbenchException we) {}
+	}
+	
+	/**
+	 * This method will update the selected item when a new item is selected.
+	 * @param action The action that fired this method.
+	 * @param selection The newly selected item.
+	 */
+	public void selectionChanged(IAction action, ISelection selection) {
+		if(selection instanceof IStructuredSelection) {
+			IStructuredSelection selected = (IStructuredSelection)selection;
+			Object o = selected.getFirstElement();
+			if(o instanceof ModuleTreeNode) {
+				selectedItem = (ModuleTreeNode)o;
+				o = selectedItem.getData();
+				if(null != o) {
+					setEnabled(true);
+					return;
+				}
+			}
+		}
+		setEnabled(false);
+	}
+	
+	private ModuleTreeNode selectedItem;
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/actions/ExportScriptAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/actions/ExportScriptAction.java
new file mode 100644
index 0000000..1ed1d63
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/actions/ExportScriptAction.java
@@ -0,0 +1,250 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboardextension.actions;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileWriter;
+import java.text.MessageFormat;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.ui.IMemento;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.WorkbenchException;
+import org.eclipse.ui.XMLMemento;
+
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.IDataSet;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.IDataSetParser;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.filters.IDataSetFilter;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.structures.GraphData;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.wizards.dataset.DataSetWizard;
+import org.eclipse.linuxtools.systemtap.ui.structures.TreeNode;
+import org.eclipse.linuxtools.systemtap.ui.structures.ZipArchive;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.DashboardPerspective;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.DashboardMetaData;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.DashboardModule;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.DashboardModuleFileFilter;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardModuleBrowserView;
+import org.eclipse.linuxtools.systemtap.ui.dashboardextension.dialogs.ExportScriptDialog;
+import org.eclipse.linuxtools.systemtap.ui.dashboardextension.internal.Localization;
+import org.eclipse.linuxtools.systemtap.ui.graphing.GraphingConstants;
+import org.eclipse.linuxtools.systemtap.ui.ide.IDEPerspective;
+import org.eclipse.linuxtools.systemtap.ui.ide.actions.RunScriptAction;
+import org.eclipse.linuxtools.systemtap.ui.systemtapgui.SystemTapGUISettings;
+
+/**
+ * This class brings up a dialog box for the user to select what they want the
+ * new module to contain.  If a new module is build, it will be exported to the
+ * dashboard for use at any time.
+ * @author Ryan Morse
+ */
+public class ExportScriptAction extends RunScriptAction implements IWorkbenchWindowActionDelegate {
+	/**
+	 * This method will bring up the export script dialog window for the user
+	 * to select what they want to new module to contain.  If the user enters
+	 * module information and clicks ok the module will be built and added to
+	 * the dashboard.
+	 */
+	
+	private static String scriptFileName = "/script.stp";
+	
+	public void run(IAction action) {
+		String script = getFilePath();
+		if(null == script || script.length() <= 0) {
+			String msg = MessageFormat.format(Localization.getString("ExportScriptAction.NoFileToExport"), (Object[])null);
+			MessageDialog.openWarning(fWindow.getShell(), Localization.getString("ExportScriptAction.Error"), msg);
+		} else {
+			DataSetWizard wizard = new DataSetWizard(GraphingConstants.DataSetMetaData, script);
+			IWorkbench workbench = PlatformUI.getWorkbench();
+			wizard.init(workbench, null);
+			WizardDialog dialog = new WizardDialog(workbench.getActiveWorkbenchWindow().getShell(), wizard);
+			dialog.create();
+			dialog.open();
+
+			IDataSetParser parser = wizard.getParser();
+			IDataSet dataSet = wizard.getDataSet();
+
+			wizard.dispose();
+			
+			if(null == parser || null == dataSet)
+				return;
+			
+			ExportScriptDialog exportDialog = new ExportScriptDialog(fWindow.getShell(), dataSet);
+			exportDialog.open();
+			
+			exportDialog.dispose();
+			if(!exportDialog.isCanceled()) {
+				String category = exportDialog.getCategory();
+				String display = exportDialog.getDisplay();
+				String description = exportDialog.getDescription();
+				GraphData[] gd = exportDialog.getGraphs();
+				TreeNode filters = exportDialog.getGraphFilters();
+
+				validateDirectory();
+				File meta = saveMetaData(display, category, description, dataSet, parser, gd, filters,"local");
+				String archiveName = getSaveDirectory() + "/" + category.replace(' ', '_') + "." + display.replace(' ', '_');
+				buildArchive(archiveName, new File(script), meta);
+				cleanupFiles(new String[] {archiveName, meta.getAbsolutePath()});
+				updateDashboard();
+			}
+		}
+	}
+	
+	/**
+	 * This method will check to make sure the exported module directory is valid.
+	 * If it isn't then the foleders will be created in order to make the directory
+	 * valid.
+	 */
+	private void validateDirectory() {
+		File folder = new File(getSaveDirectory());
+
+		if(!folder.exists())
+			folder.mkdir();
+	}
+	
+	/**
+	 * This method will create a new XML Memento used to store all of the meta data
+	 * for the module.  This data is all based on what the user selected from the
+	 * dialog box.
+	 * @param disp The string to display that represents this module.
+	 * @param cat The category string representing where this module will be placed
+	 * @param desc The description string for this module
+	 * @param dataSet The IDataSet that holds the data for this module
+	 * @param parser The parer that can obtain the information from the raw output
+	 * @param gd GraphData Array specifying all of the information needed to create the selected graphs
+	 * @param filters TreeNode containing all of the selected filters for each graph.
+	 */
+	private File saveMetaData(String disp, String cat, String desc, IDataSet dataSet, IDataSetParser parser, GraphData[] gd, TreeNode filters, String location) {
+		File meta = null;
+		XMLMemento data = XMLMemento.createWriteRoot(DashboardMetaData.XMLDashboardItem);
+
+		try {
+			IMemento child, child2, child3;
+
+			data.putString(DashboardMetaData.XMLdDisplay, disp);
+			data.putString(DashboardMetaData.XMLdCategory, cat);
+			data.putString(DashboardMetaData.XMLdDescription, desc);
+			data.putString(DashboardMetaData.XMLdDataset, dataSet.getID());
+			data.putString(DashboardMetaData.XMLdScript, scriptFileName);
+			data.putString(DashboardMetaData.XMLdLocation, location);
+			data.putString(DashboardMetaData.XMLdScriptFileName, scriptFileName);
+				
+			
+			child = data.createChild(DashboardMetaData.XMLParsingExpressions);
+			String[] cols = dataSet.getTitles();
+			for(int i=0; i<cols.length; i++) {
+				child2 = child.createChild(DashboardMetaData.XMLpColumn);
+				child2.putString(DashboardMetaData.XMLpName, cols[i]);
+			}
+			parser.saveXML(child.createChild(DashboardMetaData.XMLpParser));
+
+			child = data.createChild(DashboardMetaData.XMLGraphDisplays);
+			for(int j,i=0; i<gd.length; i++) {
+				child2 = child.createChild(DashboardMetaData.XMLgGraph);
+				child2.putString(DashboardMetaData.XMLgId, gd[i].graphID);
+				child2.putString(DashboardMetaData.XMLgTitle, gd[i].title);
+
+				TreeNode treeChild = filters.getChildAt(i);
+				for(j=0; j<treeChild.getChildCount(); j++) {
+					((IDataSetFilter)(treeChild.getChildAt(j).getData())).writeXML(child2);
+				}
+				
+				child3 = child2.createChild(DashboardMetaData.XMLgSeries);
+				child3.putString(DashboardMetaData.XMLgAxis, DashboardMetaData.XMLgAxisX);
+				child3.putInteger(DashboardMetaData.XMLgColumn, gd[i].xSeries);
+				for(j=0; j<gd[i].ySeries.length; j++) {
+					child3 = child2.createChild(DashboardMetaData.XMLgSeries);
+					child3.putString(DashboardMetaData.XMLgAxis, DashboardMetaData.XMLgAxisY);
+					child3.putInteger(DashboardMetaData.XMLgColumn, gd[i].ySeries[j]);
+				}
+			}
+			
+			meta = new File(getSaveDirectory() + DashboardModule.metaFileName);
+			FileWriter writer = new FileWriter(meta);
+			data.save(writer);
+			writer.close();
+		} catch(FileNotFoundException fnfe) {
+			return meta;
+		} catch(Exception e) {
+			return meta;
+		}
+		return meta;
+	}
+	
+	/**
+	 * This method will create the module archive by first zipping the .stp file and the meta data
+	 * together.  Then it will compress the .zip file into a .gz file.  The .gz file's extension is 
+	 * set to .dash to discurage users from trying to modify it and to make it sepecific to the 
+	 * SystemTapGUI dashboard.
+	 * @param archiveName The name to use for the file containing the new module data.
+	 * @param script The file representing the .stp script file to use for the module
+	 * @param meta The XML Memento file representing the module details.
+	 */
+	private void buildArchive(String archiveName, File script, File meta) {
+		String[] files = new String[] {script.getAbsolutePath(), meta.getAbsolutePath()};
+		String[] names = new String[] {scriptFileName, DashboardModule.metaFileName};
+		
+		ZipArchive.zipFiles(archiveName, files, names);
+		ZipArchive.compressFile(archiveName + DashboardModuleFileFilter.DashboardModuleExtension, archiveName);
+	}
+	
+	/**
+	 * This method will delete any extra files that were generated as a result of building
+	 * the Dashboard module.
+	 * @param files A list of all of the file paths that should be removed
+	 */
+	private void cleanupFiles(String[] files) {
+		if(null == files)
+			return;
+		
+		File f;
+		for(int i=0; i<files.length; i++) {
+			f = new File(files[i]);
+			if(f.exists())
+				f.delete();
+		}
+	}
+	
+	/**
+	 * This method will get the directory name that should be used for saving the dashboard modules.
+	 */
+	private String getSaveDirectory() {
+		return SystemTapGUISettings.settingsFolder + "/dashboard";
+	}
+	
+	/**
+	 * This method forces the Dashboard's DashboardModuleBrowserView to refresh itself to ensure
+	 * that is contains the most up-to-date module list.
+	 */
+	private void updateDashboard() {
+		try {
+			IWorkbenchPage p = PlatformUI.getWorkbench().showPerspective(DashboardPerspective.ID, PlatformUI.getWorkbench().getActiveWorkbenchWindow());
+			IViewPart ivp = p.findView(DashboardModuleBrowserView.ID);
+			((DashboardModuleBrowserView)ivp).refresh();
+
+			p = PlatformUI.getWorkbench().showPerspective(IDEPerspective.ID, PlatformUI.getWorkbench().getActiveWorkbenchWindow());
+		} catch(WorkbenchException we) {}
+	}
+	
+	/**
+	 * Removes all internal references to objects.  No other method should be called after this.
+	 */
+	public void dispose() {
+		super.dispose();
+	}
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/actions/ViewScriptAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/actions/ViewScriptAction.java
new file mode 100644
index 0000000..14550bd
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/actions/ViewScriptAction.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboardextension.actions;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IViewActionDelegate;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.WorkbenchException;
+
+import org.eclipse.linuxtools.systemtap.ui.editor.SimpleEditor;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.DashboardModule;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.structures.ModuleTreeNode;
+import org.eclipse.linuxtools.systemtap.ui.ide.IDEPerspective;
+import org.eclipse.linuxtools.systemtap.ui.ide.actions.TempFileAction;
+
+/**
+ * A class that handles extracting the original script from the dashboard module.
+ * It will then create a new active editor in the IDE perspective and display the
+ * module in a temp file.  Users can then modify this script and use the modified
+ * version as well as the original.
+ * @author Ryan Morse
+ */
+public class ViewScriptAction extends Action implements IViewActionDelegate {
+	/**
+	 * This method sets what item the user has selected to view.
+	 */
+	public void init(IViewPart view) {
+		selectedItem = null;
+	}
+	
+	/**
+	 * This method will retreive the script from the selected module for the user
+	 * to see.  It will then create a new active editor in the IDE perspective and 
+	 * display the module in a temp file.  Users can then modify this script and 
+	 * use the modified version as well as the original.
+	 * @param act An action representing the click event used to start this method.
+	 */
+	public void run(IAction act) {
+		DashboardModule data = (DashboardModule)selectedItem.getData();
+		
+		try {
+			IWorkbenchPage p = PlatformUI.getWorkbench().showPerspective(IDEPerspective.ID, PlatformUI.getWorkbench().getActiveWorkbenchWindow());
+
+			TempFileAction tfa = new TempFileAction();
+			tfa.run();
+			
+			IEditorPart edit = p.getActiveEditor();
+			
+			if(null != edit) {
+				if(edit instanceof SimpleEditor) {
+					SimpleEditor editor = (SimpleEditor)edit;
+					
+					//Copy the file just to ensure the user has to save their own copy if they want it
+					FileInputStream fin;		
+					try {
+					    fin = new FileInputStream(data.script);
+					    StringBuilder sb = new StringBuilder();
+					    
+					    int c;
+					    while((c = fin.read()) != -1)
+					    	sb.append((char)c);
+					    
+					    fin.close();		
+						editor.insertText(sb.toString());
+					} catch (IOException e) {}
+				}
+			}
+		} catch(WorkbenchException we) {}
+	}
+	
+	/**
+	 * This method will update the selected item when a new item is selected.
+	 * @param action The action that fired this method.
+	 * @param selection The newly selected item.
+	 */
+	public void selectionChanged(IAction action, ISelection selection) {
+		if(selection instanceof IStructuredSelection) {
+			IStructuredSelection selected = (IStructuredSelection)selection;
+			Object o = selected.getFirstElement();
+			if(o instanceof ModuleTreeNode) {
+				selectedItem = (ModuleTreeNode)o;
+				o = selectedItem.getData();
+				if(null != o) {
+					setEnabled(true);
+					return;
+				}
+			}
+		}
+		setEnabled(false);
+	}
+	
+	private ModuleTreeNode selectedItem;
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/dialogs/ExportScriptDialog.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/dialogs/ExportScriptDialog.java
new file mode 100644
index 0000000..c062809
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/dialogs/ExportScriptDialog.java
@@ -0,0 +1,339 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboardextension.dialogs;
+
+import java.text.MessageFormat;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeItem;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.PlatformUI;
+
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.IDataSet;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.filters.IDataSetFilter;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.structures.GraphData;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.wizards.filter.AvailableFilterTypes;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.wizards.filter.SelectFilterWizard;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.wizards.graph.GraphFactory;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.wizards.graph.SelectGraphWizard;
+import org.eclipse.linuxtools.systemtap.ui.structures.TreeNode;
+import org.eclipse.linuxtools.systemtap.ui.dashboardextension.internal.Localization;
+
+/**
+ * This class handles creating a dialog that the user is able to select
+ * features that they want to be part of their new dashboard module.
+ * Once the user is done configuring the module, it will create the new 
+ * module for the dashboard from the active script in the editor.
+ * @author Ryan Morse
+ */
+public class ExportScriptDialog extends Dialog {
+	public ExportScriptDialog(Shell parentShell, IDataSet data) {
+		super(parentShell);
+		this.data = data;
+		canceled = false;
+	}
+
+	/**
+	 * This method will setup the size of the dialog window and set its title.
+	 * @param shell The shell that will contain this dialog box
+	 */
+	protected void configureShell(Shell shell) {
+		super.configureShell(shell);
+		shell.setText(Localization.getString("ExportScriptDialog.ExportScript"));
+		shell.setSize(330, 375);
+	}
+
+	/**
+	 * This method adds all of the components to the dialog and positions them.
+	 * Actions are added to all of the buttons to deal with user interaction.
+	 * @param parent The Composite that will contain all components created in this method
+	 * @return The main Control created by this method.
+	 */
+	protected Control createDialogArea(Composite parent) {
+		Composite comp = new Composite(parent, SWT.NONE);
+
+		//Dialog reference labels
+		Label lblDisplay = new Label(comp, SWT.NONE);
+		lblDisplay.setText(Localization.getString("ExportScriptDialog.Display"));
+		lblDisplay.setBounds(10, 12, 100, 25);
+		Label lblCategory = new Label(comp, SWT.NONE);
+		lblCategory.setText(Localization.getString("ExportScriptDialog.Category"));
+		lblCategory.setBounds(10, 42, 100, 25);
+		Label lblDescription = new Label(comp, SWT.NONE);
+		lblDescription.setText(Localization.getString("ExportScriptDialog.Description"));
+		lblDescription.setBounds(10, 72, 100, 25);
+		Label lblGraphs = new Label(comp, SWT.NONE);
+		lblGraphs.setText(Localization.getString("ExportScriptDialog.Graphs"));
+		lblGraphs.setBounds(10, 150, 100, 25);
+
+		//Text boxes for how to display the new module in the dashboard
+		txtDisplay = new Text(comp, SWT.BORDER);
+		txtDisplay.setBounds(120, 10, 200, 25);
+		txtCategory = new Text(comp, SWT.BORDER);
+		txtCategory.setBounds(120, 40, 200, 25);
+		txtDescription = new Text(comp, SWT.MULTI | SWT.WRAP | SWT.BORDER);
+		txtDescription.setBounds(120, 70, 200, 75);
+		
+		treeGraphs = new Tree(comp, SWT.SINGLE | SWT.BORDER);
+		treeGraphs.setBounds(10, 175, 200, 125);
+
+		//Button to add another graph
+		btnAdd = new Button(comp, SWT.PUSH);
+		btnAdd.setText(Localization.getString("ExportScriptDialog.Add"));
+		btnAdd.setBounds(220, 175, 100, 26);
+
+		//Button to filter the script output data
+		btnAddFilter = new Button(comp, SWT.PUSH);
+		btnAddFilter.setText(Localization.getString("ExportScriptDialog.AddFilter"));
+		btnAddFilter.setBounds(220, 205, 100, 26);
+		btnAddFilter.setEnabled(false);
+		
+		//Button to remove the selected graph/filter
+		btnRemove = new Button(comp, SWT.PUSH);
+		btnRemove.setText(Localization.getString("ExportScriptDialog.Remove"));
+		btnRemove.setBounds(220, 265, 100, 26);
+		btnRemove.setEnabled(false);
+
+		//Action to notify the buttons when to enable/disable themselves based on list selection
+		treeGraphs.addSelectionListener(new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				selectedTreeItem = (TreeItem)e.item;
+				if(null == selectedTreeItem.getParentItem())
+					btnAddFilter.setEnabled(true);
+				else
+					btnAddFilter.setEnabled(false);
+				btnRemove.setEnabled(true);
+			}
+			
+			public void widgetDefaultSelected(SelectionEvent e) {}
+		});
+		
+		//Brings up a new dialog box when user clicks the add button.  Allows selecting a new graph to display.
+		btnAdd.addSelectionListener(new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				SelectGraphWizard wizard = new SelectGraphWizard(data);
+				IWorkbench workbench = PlatformUI.getWorkbench();
+				wizard.init(workbench, null);
+				WizardDialog dialog = new WizardDialog(workbench.getActiveWorkbenchWindow().getShell(), wizard);
+				dialog.create();
+				dialog.open();
+
+				GraphData gd = wizard.getGraphData();
+				if(null != gd) {
+					TreeItem item = new TreeItem(treeGraphs, SWT.NONE);
+					item.setText(GraphFactory.getGraphName(gd.graphID) + ":" + gd.title);
+					item.setData(gd);
+				}
+			}
+			
+			public void widgetDefaultSelected(SelectionEvent e) {}
+		});
+
+		//Brings up a new dialog for selecting filter options when the user clicks the filter button.
+		btnAddFilter.addSelectionListener(new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				SelectFilterWizard wizard = new SelectFilterWizard(data.getTitles());
+				IWorkbench workbench = PlatformUI.getWorkbench();
+				wizard.init(workbench, null);
+				WizardDialog dialog = new WizardDialog(workbench.getActiveWorkbenchWindow().getShell(), wizard);
+				dialog.create();
+				dialog.open();
+
+				IDataSetFilter f = wizard.getFilter();
+				if(null != f) {
+					TreeItem item = new TreeItem(treeGraphs.getSelection()[0], SWT.NONE);
+					item.setText(AvailableFilterTypes.getFilterName(f.getID()));
+					item.setData(f);
+				}
+			}
+			
+			public void widgetDefaultSelected(SelectionEvent e) {}
+		});
+		
+		//Removes the selected graph/filter from the tree
+		btnRemove.addSelectionListener(new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				selectedTreeItem.dispose();
+				btnRemove.setEnabled(false);
+			}
+			
+			public void widgetDefaultSelected(SelectionEvent e) {}
+		});
+		
+		return comp;
+	}
+
+	/**
+	 * This method haddles what to do when the user clicks the ok or cancel button.
+	 * If canceled it will just close without doing anything.  If the user clicked ok
+	 * and the data entered is valid it will set up variables that can be accessed
+	 * later to build the actual module.  This method should not be called explicitly.
+	 * @param buttonID A reference to the button that was pressed. 0 - ID, 1- for others
+	 */
+	protected void buttonPressed(int buttonID) {
+		if(0 == buttonID) {	//OK
+			if(txtDisplay.getText().length() <= 0 || 
+			   txtCategory.getText().length() <= 0 ||
+			   txtDescription.getText().length() <= 0 ||
+			   treeGraphs.getItemCount() <= 0) {
+				String msg = MessageFormat.format(Localization.getString("ExportScriptDialog.FillFields"), (Object[])null);
+				MessageDialog.openWarning(this.getShell(), Localization.getString("ExportScriptDialog.Error"), msg);
+				return;
+			}
+
+			display = txtDisplay.getText();
+			category = txtCategory.getText();
+			description = txtDescription.getText();
+			buildGraphData();
+			buildFilterData();
+		} else {
+			canceled = true;
+		}
+		
+		super.buttonPressed(buttonID);
+	}
+
+	/**
+	 * This allows outside classes to determine if the user clicked ok or cancel.
+	 * @return boolean representing whether the cancel button was pressed or not
+	 */
+	public boolean isCanceled() {
+		return canceled;
+	}
+	
+	/**
+	 * This allows an outside class to determin what was chosen to be the Category.
+	 * @return String representing the selected Category name.
+	 */
+	public String getCategory() {
+		return category;
+	}
+	
+	/**
+	 * This allows an outside class to determin what was chosen to be the Description.
+	 * @return String representing the selected Description.
+	 */
+	public String getDescription() {
+		return description;
+	}
+	
+	/**
+	 * This allows an outside class to determin what was chosen to be the Display name.
+	 * @return String representing the selected Display name.
+	 */
+	public String getDisplay() {
+		return display;
+	}
+	
+	/**
+	 * This allows an outside class to determin what graph types were selected.
+	 * @return GraphData[] for each selected graph.
+	 */
+	public GraphData[] getGraphs() {
+		return graphData;
+	}
+	
+	/**
+	 * This allows an outside class to determin what filter types were chosen.
+	 * @return TreeNode organized as follows: Root->Graphs->Filters.
+	 */
+	public TreeNode getGraphFilters() {
+		return filters;
+	}
+	
+	/**
+	 * This cleans up all internal references to objects.  No other method should
+	 * be called after the dispose method.
+	 */
+	public void dispose() {
+		if(null != txtDisplay)
+			txtDisplay.dispose();
+		if(null != txtCategory)
+			txtCategory.dispose();
+		if(null != txtDescription)
+			txtDescription.dispose();
+		if(null != treeGraphs)
+			treeGraphs.dispose();
+		if(null != btnAdd)
+			btnAdd.dispose();
+		if(null != btnRemove)
+			btnRemove.dispose();
+		if(null != btnAddFilter)
+			btnAddFilter.dispose();
+		if(null != selectedTreeItem)
+			selectedTreeItem.dispose();
+		txtDisplay = null;
+		txtCategory = null;
+		txtDescription = null;
+		treeGraphs = null;
+		btnAdd = null;
+		btnRemove = null;
+		btnAddFilter = null;
+		selectedTreeItem = null;
+		data = null;
+	}
+	
+	/**
+	 * This method converts what was selected in the tree into a simple array
+	 * of all of the selected graphs and their data.
+	 */
+	private void buildGraphData() {
+		TreeItem[] children = treeGraphs.getItems();
+		graphData = new GraphData[children.length];
+		for(int i=0; i<graphData.length; i++)
+			graphData[i] = (GraphData)children[i].getData();
+	}
+	
+	/**
+	 * This mothod takes the data from the tree and builds another tree that
+	 * has all the information about the graph and Filters in an easily
+	 * accessable structure.
+	 */
+	private void buildFilterData() {
+		TreeItem[] items = treeGraphs.getItems();
+		TreeItem[] filterItems;
+
+		filters = new TreeNode("", false); //$NON-NLS-1$
+		TreeNode graphLevel;
+		for(int i=0; i<items.length; i++) {
+			filterItems = items[i].getItems();
+	
+			graphLevel = new TreeNode("graph", false); //$NON-NLS-1$
+			filters.add(graphLevel);
+			
+			for(int j=0; j<filterItems.length; j++)
+				graphLevel.add(new TreeNode(filterItems[j].getData(), false));
+		}
+	}
+	
+	private IDataSet data;
+	private Tree treeGraphs;
+	private Text txtDisplay, txtCategory, txtDescription;
+	private Button btnAdd, btnRemove, btnAddFilter;
+	private String display, category, description;
+	private GraphData[] graphData;
+	private TreeNode filters;
+	private boolean canceled;
+	private TreeItem selectedTreeItem;
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/dialogs/ScriptDetails.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/dialogs/ScriptDetails.java
new file mode 100644
index 0000000..397f286
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/dialogs/ScriptDetails.java
@@ -0,0 +1,129 @@
+/*******************************************************************************
+ * Copyright (c) 2009 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboardextension.dialogs;
+
+
+
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Dialog;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.events.SelectionEvent;
+
+import org.eclipse.linuxtools.systemtap.ui.dashboard.internal.DashboardPlugin;
+import org.eclipse.linuxtools.systemtap.ui.dashboard.preferences.DashboardPreferenceConstants;
+
+public class ScriptDetails extends Dialog {
+	private Text dirText;
+	private Text scriptText;
+	private Button OKButton;
+	private Button cancelButton;
+	private boolean canceled = true; 
+	
+	public ScriptDetails(Shell parent) {
+		super(parent);
+	}
+	
+	/**
+	 * This allows outside classes to determine if the user clicked ok or cancel.
+	 * @return boolean representing whether the cancel button was pressed or not
+	 */
+	public boolean isCanceled() {
+		return canceled;
+	}
+	
+	public void open() {
+		
+		Shell parent = getParent();
+		final Shell shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
+		shell.setText("Enter Script details");
+		shell.setSize(350, 160);
+		
+		GridLayout layout = new GridLayout();
+		layout.numColumns = 2;
+		layout.makeColumnsEqualWidth = false;
+		shell.setLayout(layout);
+		
+		GridData data = new GridData();
+		data.grabExcessHorizontalSpace = false;
+		data.horizontalAlignment = SWT.LEFT;
+		Label dirLabel = new Label(shell, SWT.NONE);
+		dirLabel.setText("Examples Dir: ");
+		dirLabel.setLayoutData(data);
+		
+		data = new GridData();
+		data.grabExcessHorizontalSpace = true;
+		data.horizontalAlignment = SWT.FILL;
+		dirText = new Text(shell, SWT.SINGLE | SWT.BORDER);
+		dirText.setLayoutData(data);
+		dirText.setText(DashboardPlugin.getDefault().getPluginPreferences().getString(DashboardPreferenceConstants.P_DASHBOARD_EXAMPLES_DIR));
+		
+		data = new GridData();
+		data.grabExcessHorizontalSpace = false;
+		data.horizontalAlignment = SWT.LEFT;
+		Label scriptLabel = new Label(shell, SWT.NONE);
+		scriptLabel.setText("Script: ");
+		scriptLabel.setLayoutData(data);
+		
+		data = new GridData();
+		data.grabExcessHorizontalSpace = true;
+		data.horizontalAlignment = SWT.FILL;
+		scriptText = new Text(shell, SWT.SINGLE | SWT.BORDER);
+		scriptText.setLayoutData(data);
+		//scriptText.setText(ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.SCP_PASSWORD));
+		
+		
+		data = new GridData();
+		data.horizontalAlignment = SWT.RIGHT;
+		cancelButton = new Button(shell, SWT.PUSH);
+		cancelButton.setLayoutData(data);
+		cancelButton.setSize(50, 100);
+		cancelButton.setText("Cancel");
+		cancelButton.addSelectionListener(new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				shell.dispose();
+			}
+			public void widgetDefaultSelected(SelectionEvent e) {}
+		});
+		
+		data = new GridData();
+		data.horizontalAlignment = SWT.RIGHT;
+		OKButton = new Button(shell, SWT.PUSH);
+		OKButton.setLayoutData(data);
+		OKButton.setSize(50, 100);
+		OKButton.setText("OK");
+		OKButton.addSelectionListener(new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				// FIXME: no error handling is done, should probably be
+				// pushed down to the connection level
+				// Set the preferences to this new info.
+				DashboardPlugin.getDefault().getPreferenceStore().setValue(DashboardPreferenceConstants.P_DASHBOARD_EXAMPLES_DIR, dirText.getText());
+				DashboardPlugin.getDefault().getPreferenceStore().setValue(DashboardPreferenceConstants.P_DASHBOARD_SCRIPT, scriptText.getText());
+				canceled = false;
+				shell.close();
+			}
+			public void widgetDefaultSelected(SelectionEvent e) {}
+		});
+		
+		shell.open();
+		Display display = parent.getDisplay();
+		while (!shell.isDisposed()) {
+			if (!display.readAndDispatch()) display.sleep();
+		}
+	}
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/internal/DashboardExtensionPlugin.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/internal/DashboardExtensionPlugin.java
new file mode 100644
index 0000000..e2910d8
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/internal/DashboardExtensionPlugin.java
@@ -0,0 +1,68 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.dashboardextension.internal;
+
+import org.eclipse.ui.IStartup;
+import org.eclipse.ui.plugin.*;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The main plugin class to be used in the desktop.
+ */
+public class DashboardExtensionPlugin extends AbstractUIPlugin implements IStartup {
+
+	//The shared instance.
+	private static DashboardExtensionPlugin plugin;
+	
+	/**
+	 * The constructor.
+	 */
+	public DashboardExtensionPlugin() {
+		plugin = this;
+	}
+
+	/**
+	 * This method is called upon plug-in activation
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+	}
+
+	/**
+	 * This method is called when the plug-in is stopped
+	 */
+	public void stop(BundleContext context) throws Exception {
+		super.stop(context);
+		plugin = null;
+	}
+
+	/**
+	 * Returns the shared instance.
+	 */
+	public static DashboardExtensionPlugin getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Returns an image descriptor for the image file at the given
+	 * plug-in relative path.
+	 *
+	 * @param path the path
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.linuxtools.systemtap.ui.dashboardextension", path);
+	}
+	
+	public void earlyStartup() {}
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/internal/Localization.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/internal/Localization.java
new file mode 100644
index 0000000..a105d58
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/internal/Localization.java
@@ -0,0 +1,22 @@
+package org.eclipse.linuxtools.systemtap.ui.dashboardextension.internal;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class Localization {
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.systemtap.ui.dashboardextension.internal.localization";
+
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
+			.getBundle(BUNDLE_NAME);
+
+	private Localization() {
+	}
+
+	public static String getString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/internal/localization.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/internal/localization.properties
new file mode 100644
index 0000000..51fcc6b
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/internal/localization.properties
@@ -0,0 +1,12 @@
+ExportScriptAction.NoFileToExport=No file open to export\!
+
+ExportScriptDialog.ExportScript=Export Script
+ExportScriptDialog.Description=Description:
+ExportScriptDialog.FillFields=You must fill in all the fields\!
+ExportScriptAction.Error=Error
+ExportScriptDialog.Display=Display:
+ExportScriptDialog.Category=Category:
+ExportScriptDialog.Graphs=Graphs:
+ExportScriptDialog.Add=Add
+ExportScriptDialog.AddFilter=Add Filter
+ExportScriptDialog.Remove=Remove
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/ChangeLog
index 2044c21..699f023 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/ChangeLog
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-04  Anithra P Janakiraman  <anithra@linux.vnet.ibm.com>
+
+	* META-INF/MANIFEST.MF: removed version dependency for org.eclipse.ui bundle
+
+2010-01-29  Anithra P Janakiraman  <anithra@linux.vnet.ibm.com>
+
+	* src/org/eclipse/linuxtools/systemtap/ui/editor/actions/file/NewFileAction.java (queryFile): 
+	* src/org/eclipse/linuxtools/systemtap/ui/editor/SimpleDocumentProvider.java (doSaveDocument): 
+	(isReadOnly): 
+	(setDocumentContent): 
+	(isModifiable): 
+
 2009-11-16  Andrew Overholt  <overholt@redhat.com>
 
 	* META-INF/MANIFEST.MF: Fix Bundle-Name.
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/META-INF/MANIFEST.MF
index dc4fc1a..07f9cdb 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/META-INF/MANIFEST.MF
@@ -12,6 +12,6 @@
  org.eclipse.jface.text;visibility:=reexport,
  org.eclipse.ui.editors;visibility:=reexport,
  org.eclipse.ui.workbench.texteditor;visibility:=reexport,
- org.eclipse.ui;bundle-version="3.4.1"
+ org.eclipse.ui
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/SimpleDocumentProvider.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/SimpleDocumentProvider.java
index 23322b8..8a8f557 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/SimpleDocumentProvider.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/SimpleDocumentProvider.java
@@ -66,24 +66,12 @@
 	 */
 	private boolean setDocumentContent(IDocument document, IEditorInput input) throws CoreException {
 		Reader reader;
-		String inputClassName = input.getClass().getName();
 		try {
-			if (input instanceof IPathEditorInput){
+			if (input instanceof IPathEditorInput)
 				reader= new FileReader(((IPathEditorInput)input).getPath().toFile());
+			else {
+				return false;
 			}
-			else if ( inputClassName.equals( "org.eclipse.ui.internal.editors.text.JavaFileEditorInput" )
-	                || inputClassName.equals( "org.eclipse.ui.ide.FileStoreEditorInput" ) )
-	            // The class 'org.eclipse.ui.internal.editors.text.JavaFileEditorInput'
-	            // is used when opening a file from the menu File > Open... in Eclipse 3.2.x
-	            // The class 'org.eclipse.ui.ide.FileStoreEditorInput' is used when
-	            // opening a file from the menu File > Open... in Eclipse 3.3.x
-	            {
-	                reader = new FileReader( new File( input.getToolTipText() ) );
-	            }
-	            else
-	            {
-	                return false;
-	            }
 		} catch (FileNotFoundException e) {
 			// return empty document and save later
 			return true;
@@ -141,23 +129,11 @@
 	 * @see org.eclipse.ui.texteditor.AbstractDocumentProvider#doSaveDocument(org.eclipse.core.runtime.IProgressMonitor, java.lang.Object, org.eclipse.jface.text.IDocument, boolean)
 	 */
 	protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite) throws CoreException {
-		String elementClassName = element.getClass().getName();
-		File file = null;
 		if (element instanceof IPathEditorInput) {
 			IPathEditorInput pei= (IPathEditorInput) element;
 			IPath path= pei.getPath();
-			file= path.toFile();
-		}
-		   else if ( elementClassName.equals( "org.eclipse.ui.internal.editors.text.JavaFileEditorInput" )
-		            || elementClassName.equals( "org.eclipse.ui.ide.FileStoreEditorInput" ) )
-		        // The class 'org.eclipse.ui.internal.editors.text.JavaFileEditorInput'
-		        // is used when opening a file from the menu File > Open... in Eclipse 3.2.x
-		        // The class 'org.eclipse.ui.ide.FileStoreEditorInput' is used when
-		        // opening a file from the menu File > Open... in Eclipse 3.3.x
-		        {
-		            file = new File( ( ( IEditorInput ) element ).getToolTipText() );
-		        }
-		if (file!=null){
+			File file= path.toFile();
+			
 			try {
 				file.createNewFile();
 
@@ -202,35 +178,20 @@
 	/*
 	 * @see org.eclipse.ui.texteditor.IDocumentProviderExtension#isModifiable(java.lang.Object)
 	 */
-	public boolean isModifiable( Object element )
-    {
-        String elementClassName = element.getClass().getName();
-        if ( element instanceof IPathEditorInput )
-        {
-            IPathEditorInput pei = ( IPathEditorInput ) element;
-            File file = pei.getPath().toFile();
-            return file.canWrite() || !file.exists(); // Allow to edit new files
-        }
-        else if ( elementClassName.equals( "org.eclipse.ui.internal.editors.text.JavaFileEditorInput" )
-            || elementClassName.equals( "org.eclipse.ui.ide.FileStoreEditorInput" ) )
-        // The class 'org.eclipse.ui.internal.editors.text.JavaFileEditorInput'
-        // is used when opening a file from the menu File > Open... in Eclipse 3.2.x
-        // The class 'org.eclipse.ui.ide.FileStoreEditorInput' is used when
-        // opening a file from the menu File > Open... in Eclipse 3.3.x
-        {
-            File file = new File( ( ( IEditorInput ) element ).getToolTipText() );
-            return file.canWrite() || !file.exists(); // Allow to edit new files
-        }
-        
-        return false;
-    }
-
+	public boolean isModifiable(Object element) {
+		if (element instanceof IPathEditorInput) {
+			IPathEditorInput pei= (IPathEditorInput) element;
+			File file= pei.getPath().toFile();
+			return file.canWrite() || !file.exists(); // Allow to edit new files
+		}
+		return false;
+	}
 	
 	/*
 	 * @see org.eclipse.ui.texteditor.IDocumentProviderExtension#isReadOnly(java.lang.Object)
 	 */
 	public boolean isReadOnly(Object element) {
-		return false;
+		return !isModifiable(element);
 	}
 	
 	/*
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/actions/file/NewFileAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/actions/file/NewFileAction.java
index a02f2eb..f02338f 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/actions/file/NewFileAction.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/actions/file/NewFileAction.java
@@ -16,20 +16,12 @@
 import org.eclipse.linuxtools.systemtap.ui.editor.internal.Localization;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.ui.IWorkbenchWindow;
 
 
 
 public class NewFileAction extends OpenFileAction {
 	
-	public NewFileAction() {
-		super();
-	}
 	
-	public NewFileAction(IWorkbenchWindow window) {
-		super();
-		init(window);
-	}
 	/**
 	 * Creates a new file.
 	 * @return the new file object.
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/.classpath b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/.classpath
new file mode 100644
index 0000000..751c8f2
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/.project b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/.project
new file mode 100644
index 0000000..175ac3d
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.linuxtools.systemtap.ui.graphicalrun</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/ChangeLog
new file mode 100644
index 0000000..4e1f2d1
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/ChangeLog
@@ -0,0 +1,20 @@
+2010-01-29  Anithra P Janakiraman  <anithra@linux.vnet.ibm.com>
+
+	* META-INF/MANIFEST.MF: Changed Bundle-version
+	
+
+2010-01-29  Anithra P Janakiraman  <anithra@linux.vnet.ibm.com>
+
+	* .classpath: New file.
+	* .project: New file.
+	* bin: New file.
+	* build.properties: New file.
+	* icons/actions/regEx.gif: New file.
+	* icons/actions/run_chart.gif: New file.
+	* META-INF/MANIFEST.MF: New file.
+	* plugin.properties: New file.
+	* plugin.xml: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/graphicalrun/actions/ModifyParsingAction.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/graphicalrun/actions/RunScriptChartAction.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/graphicalrun/internal/GraphicalRunPlugin.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/graphicalrun/structures/ChartStreamDaemon2.java: 
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..fca0690
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/META-INF/MANIFEST.MF
@@ -0,0 +1,22 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: GraphicalRun Plug-in (Incubation)
+Bundle-SymbolicName: org.eclipse.linuxtools.systemtap.ui.graphicalrun; singleton:=true
+Bundle-Version: 0.3.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.systemtap.ui.graphicalrun.internal.GraphicalRunPlugin
+Bundle-Vendor: Eclipse
+Bundle-Localization: plugin
+Export-Package: org.eclipse.linuxtools.systemtap.ui.graphicalrun.structures
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.linuxtools.systemtap.ui.consolelog,
+ org.eclipse.linuxtools.systemtap.ui.editor,
+ org.eclipse.linuxtools.systemtap.ui.logging,
+ org.eclipse.linuxtools.systemtap.ui.graphing,
+ org.eclipse.linuxtools.systemtap.ui.structures,
+ org.eclipse.linuxtools.systemtap.ui.ide,
+ org.eclipse.linuxtools.systemtap.ui.systemtapgui,
+ org.eclipse.linuxtools.systemtap.ui.graphingapi.ui,
+ org.eclipse.core.resources;bundle-version="3.4.1"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/build.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/build.properties
new file mode 100644
index 0000000..c88359b
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/build.properties
@@ -0,0 +1,7 @@
+source.. = src/
+output.. = bin/
+bin.includes = plugin.xml,\
+               META-INF/,\
+               .,\
+               icons/,\
+               plugin.properties
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/icons/actions/regEx.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/icons/actions/regEx.gif
new file mode 100644
index 0000000..fc4c9fa
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/icons/actions/regEx.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/icons/actions/run_chart.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/icons/actions/run_chart.gif
new file mode 100644
index 0000000..b7f03d5
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/icons/actions/run_chart.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/plugin.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/plugin.properties
new file mode 100644
index 0000000..c044a09
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/plugin.properties
@@ -0,0 +1,15 @@
+command.runChart.name=Run w/C&hart
+command.runChart.desc=Run the Script w/Chart
+command.modifyParsing.name=Modify &Parsing Expression
+command.modifyParsing.desc=Modify Parsing Expression
+
+category.edit.name=Edit
+category.edit.desc=Edit
+
+actionset.graphicalRun.name=Graphical Run Action Set
+action.runChart.name=Run w/C&hart
+action.runChart.desc=Run the Script w/Chart
+
+actionset.parsing.name=Parsing Action Set
+action.modifyParsing.name=Modify &Parsing Expression
+action.modifyParsing.desc=Modify Parsing Expression
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/plugin.xml
new file mode 100644
index 0000000..01cd39d
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/plugin.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+	<extension
+		point="org.eclipse.ui.startup">
+	</extension>
+
+	<extension
+		point="org.eclipse.ui.commands">
+		<command
+			name="%command.runChart.name"
+			description="%command.runChart.desc"
+			categoryId="org.eclipse.linuxtools.systemtap.ui.ide.category.run"
+			id="org.eclipse.linuxtools.systemtap.ui.graphicalrun.commands.RunScriptChart"/>
+		<command
+			name="%command.modifyParsing.name"
+			description="%command.modifyParsing.desc"
+			categoryId="org.eclipse.linuxtools.systemtap.ui.graphing.category.edit"
+			id="org.eclipse.linuxtools.systemtap.ui.graphicalrun.commands.ModifyParsing"/>
+			
+		<category
+			name="%category.edit.name"
+			description="%category.edit.desc"
+			id="org.eclipse.linuxtools.systemtap.ui.graphing.category.edit"/>
+	</extension>
+	
+	<extension
+		point="org.eclipse.ui.bindings">
+		<key
+			commandId="org.eclipse.linuxtools.systemtap.ui.graphicalrun.commands.RunScriptChart"
+			contextId="org.eclipse.ui.contexts.window"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+			sequence="M1+M3+F5"/>
+		<key
+			commandId="org.eclipse.linuxtools.systemtap.ui.graphicalrun.commands.ModifyParsing"
+			contextId="org.eclipse.ui.contexts.window"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+			sequence="M1+P"/>
+	</extension>
+	
+	<extension
+		point="org.eclipse.ui.actionSets">
+		<actionSet
+			label="%actionset.graphicalRun.name"
+			visible="false"
+			id="org.eclipse.linuxtools.systemtap.ui.graphicalrun.GraphicalRunActionSet">
+			<action
+				label="%action.runChart.name"
+				tooltip="%action.runChart.desc"
+				id="org.eclipse.linuxtools.systemtap.ui.graphicalrun.actions.RunScriptChartAction"
+				icon="icons/actions/run_chart.gif"
+				toolbarPath="org.eclipse.ui.workbench.file/build.ext"
+				menubarPath="launch/build.ext"
+				class="org.eclipse.linuxtools.systemtap.ui.graphicalrun.actions.RunScriptChartAction"
+				definitionId="org.eclipse.linuxtools.systemtap.ui.graphicalrun.commands.RunScriptChart"
+				style="push"
+				state="false"/>
+		</actionSet>
+		<actionSet
+			label="%actionset.modifyParsing.name"
+			visible="false"
+			id="org.eclipse.linuxtools.systemtap.ui.graphicalrun.ParsingActionSet">
+			<action
+				label="%action.modifyParsing.name"
+				tooltip="%action.modifyParsing.name"
+				id="org.eclipse.linuxtools.systemtap.ui.graphicalrun.actions.ModifyParsingAction"
+				icon="icons/actions/regEx.gif"
+				toolbarPath="org.eclipse.ui.workbench.file/build.ext"
+				menubarPath="edit/edit.ext"
+				class="org.eclipse.linuxtools.systemtap.ui.graphicalrun.actions.ModifyParsingAction"
+				definitionId="org.eclipse.linuxtools.systemtap.ui.graphicalrun.commands.ModifyParsing"
+				style="push"
+				state="false"/>
+		</actionSet>
+	</extension>
+
+	<extension
+		point="org.eclipse.ui.perspectiveExtensions">
+		<perspectiveExtension
+			targetID="org.eclipse.linuxtools.systemtap.ui.ide.IDEPerspective">
+			<actionSet id="org.eclipse.linuxtools.systemtap.ui.graphicalrun.GraphicalRunActionSet"/>
+		</perspectiveExtension>
+		<perspectiveExtension
+			targetID="org.eclipse.linuxtools.systemtap.ui.graphing.GraphingPerspective">
+			<actionSet id="org.eclipse.linuxtools.systemtap.ui.consolelog.StopActionSet"/>
+			<actionSet id="org.eclipse.linuxtools.systemtap.ui.graphicalrun.ParsingActionSet"/>
+			<view
+				ratio="0.60f"
+				relative="org.eclipse.linuxtools.systemtap.ui.graphing.views.GraphSelectorView"
+				relationship="bottom"
+				id="org.eclipse.ui.console.ConsoleView"/>
+			<viewShortcut id="org.eclipse.ui.console.ConsoleView"/>
+		</perspectiveExtension>
+	</extension>
+</plugin>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/src/org/eclipse/linuxtools/systemtap/ui/graphicalrun/actions/ModifyParsingAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/src/org/eclipse/linuxtools/systemtap/ui/graphicalrun/actions/ModifyParsingAction.java
new file mode 100644
index 0000000..c6498e5
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/src/org/eclipse/linuxtools/systemtap/ui/graphicalrun/actions/ModifyParsingAction.java
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.graphicalrun.actions;
+
+import java.util.ArrayList;
+
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.WorkbenchException;
+
+import org.eclipse.linuxtools.systemtap.ui.consolelog.LoggedCommand2;
+import org.eclipse.linuxtools.systemtap.ui.consolelog.actions.ConsoleAction;
+import org.eclipse.linuxtools.systemtap.ui.consolelog.structures.ScriptConsole;
+import org.eclipse.linuxtools.systemtap.ui.editor.PathEditorInput;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.IDataSet;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.IDataSetParser;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.structures.ChartStreamDaemon;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.wizards.dataset.DataSetWizard;
+import org.eclipse.linuxtools.systemtap.ui.graphicalrun.structures.ChartStreamDaemon2;
+import org.eclipse.linuxtools.systemtap.ui.graphing.GraphingConstants;
+import org.eclipse.linuxtools.systemtap.ui.graphing.GraphingPerspective;
+import org.eclipse.linuxtools.systemtap.ui.graphing.views.GraphSelectorView;
+import org.eclipse.linuxtools.systemtap.ui.ide.IDEPerspective;
+
+/**
+ * The action to allow users to change the parsing expression while a script is activly running.
+ * @author Ryan Morse
+ */
+public class ModifyParsingAction extends ConsoleAction implements IWorkbenchWindowActionDelegate {
+	/**
+	 * Prompts the user for a new regular expression to use in parsing the stap output for
+	 * the <code>DataSet</code>. If the user enters a new parsing expression then it will
+	 * get the active <code>ScriptConsole</code> and from that the active <code>LoggedCommand</code>.
+	 * Finally, it will dispose of the old <code>ChartStreamDaemon2</code> and add an new
+	 * one in its place.
+	 */
+	public void run() {
+		DataSetWizard wizard = new DataSetWizard(GraphingConstants.DataSetMetaData, getFilePath());
+		IWorkbench workbench = PlatformUI.getWorkbench();
+		wizard.init(workbench, null);
+		WizardDialog dialog = new WizardDialog(workbench.getActiveWorkbenchWindow().getShell(), wizard);
+		dialog.create();
+		dialog.open();
+
+		IDataSetParser parser = wizard.getParser();
+		IDataSet dataSet = wizard.getDataSet();
+
+		if(null != parser && null != dataSet) {
+			ScriptConsole console = super.getActive();
+			LoggedCommand2 cmd = console.getCommand();
+
+			ArrayList listeners = cmd.getInputStreamListeners();
+			ChartStreamDaemon2 daemon = null;
+			if(null != listeners) {
+				for(int i=0; i<listeners.size(); i++) {
+					if(listeners.get(i) instanceof ChartStreamDaemon) {
+						daemon = (ChartStreamDaemon2)listeners.get(i);
+						break;
+					}
+				}
+			}
+			if(null == daemon) {
+				daemon = new ChartStreamDaemon2(console, dataSet, parser);
+				cmd.addInputStreamListener(daemon);
+			} else
+				daemon.setParser(dataSet, parser);
+			
+			IViewPart ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(GraphSelectorView.ID);
+			GraphSelectorView graphSelector = ((GraphSelectorView)ivp);
+			String name = console.getName();
+			graphSelector.createScriptSet(name.substring(name.lastIndexOf('/')+1), dataSet);
+		}
+		
+		wizard.dispose();
+	}
+	
+	/**
+	 * Gets the file location of the file open in the editor window.
+	 * @return The path of the file in the active editor window.
+	 */
+	private String getFilePath() {
+		try {
+			IWorkbenchPage p = PlatformUI.getWorkbench().showPerspective(IDEPerspective.ID, PlatformUI.getWorkbench().getActiveWorkbenchWindow());
+			IEditorPart ed = p.getActiveEditor();
+			PlatformUI.getWorkbench().showPerspective(GraphingPerspective.ID, PlatformUI.getWorkbench().getActiveWorkbenchWindow());
+			return ((PathEditorInput)ed.getEditorInput()).getPath().toString();
+		} catch(WorkbenchException we) {}
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/src/org/eclipse/linuxtools/systemtap/ui/graphicalrun/actions/RunScriptChartAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/src/org/eclipse/linuxtools/systemtap/ui/graphicalrun/actions/RunScriptChartAction.java
new file mode 100644
index 0000000..3900a39
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/src/org/eclipse/linuxtools/systemtap/ui/graphicalrun/actions/RunScriptChartAction.java
@@ -0,0 +1,158 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.graphicalrun.actions;
+
+import org.eclipse.jface.wizard.WizardDialog;
+
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.WorkbenchException;
+
+
+import org.eclipse.linuxtools.systemtap.ui.consolelog.ScpClient;
+import org.eclipse.linuxtools.systemtap.ui.consolelog.dialogs.SelectServerDialog;
+import org.eclipse.linuxtools.systemtap.ui.consolelog.internal.ConsoleLogPlugin;
+import org.eclipse.linuxtools.systemtap.ui.consolelog.preferences.ConsoleLogPreferenceConstants;
+import org.eclipse.linuxtools.systemtap.ui.consolelog.structures.ScriptConsole;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.IDataSet;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.IDataSetParser;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.wizards.dataset.DataSetWizard;
+import org.eclipse.linuxtools.systemtap.ui.logging.LogManager;
+import org.eclipse.linuxtools.systemtap.ui.structures.PasswordPrompt;
+import org.eclipse.linuxtools.systemtap.ui.graphicalrun.structures.ChartStreamDaemon2;
+import org.eclipse.linuxtools.systemtap.ui.graphing.GraphingConstants;
+import org.eclipse.linuxtools.systemtap.ui.graphing.GraphingPerspective;
+import org.eclipse.linuxtools.systemtap.ui.graphing.views.GraphSelectorView;
+import org.eclipse.linuxtools.systemtap.ui.ide.IDESessionSettings;
+import org.eclipse.linuxtools.systemtap.ui.ide.actions.RunScriptAction;
+import org.eclipse.linuxtools.systemtap.ui.ide.structures.StapErrorParser;
+
+/**
+ * Action used to run the systemTap script in the active editor.  This action will start stap
+ * and send the output to both the <code>ScriptConsole</code> window and a <code>DataSet</code>.
+ * @author Ryan Morse
+ */
+public class RunScriptChartAction extends RunScriptAction implements IWorkbenchWindowActionDelegate {
+	public RunScriptChartAction() {
+		super();
+		LogManager.logDebug("initialized", this);
+	}
+
+	public void dispose() {
+		LogManager.logDebug("disposed", this);
+		super.dispose();
+	}
+
+	/**
+	 * The main body of this event. Starts by making sure the current editor is valid to run,
+	 * then builds the command line arguments for stap and retrieves the environment variables.
+	 * Next, it gets an instance of <code>ScriptConsole</code> to run the script. Finally, it
+	 * Registers a new <code>ChartStreamDaemon2</code> to handle formating the script output
+	 * for a <code>DataSet</code>. Once everything is setup, it will attempt to switch to the
+	 * Graphing Perspective.
+	 */
+	public void run() {
+		LogManager.logDebug("Start run:", this);
+		continueRun = true;
+    	if(ConsoleLogPlugin.getDefault().getPluginPreferences().getBoolean(ConsoleLogPreferenceConstants.REMEMBER_SERVER)!=true)
+        	
+        {
+			new SelectServerDialog(fWindow.getShell()).open();
+		}
+	
+		if(isValid()) {
+			 try{
+				 
+					ScpClient scpclient = new ScpClient();
+					serverfileName = fileName.substring(fileName.lastIndexOf('/')+1);
+					tmpfileName="/tmp/"+ serverfileName;
+					 scpclient.transfer(fileName,tmpfileName);
+			        }catch(Exception e){e.printStackTrace();}
+			
+			String[] script = buildScript();
+			
+			String[] envVars = getEnvironmentVariables();
+			
+			
+			if(continueRun) {
+				//createClientSession();
+			    	ScriptConsole console = ScriptConsole.getInstance(serverfileName);
+	                console.run(script, envVars, new PasswordPrompt(IDESessionSettings.password), new StapErrorParser());
+	            
+			//	subscription.addInputStreamListener(new ChartStreamDaemon2(console, dataSet, parser));
+				console.getCommand().addInputStreamListener(new ChartStreamDaemon2(console, dataSet, parser));
+				
+				//Change to the graphing perspective
+				try {
+					IWorkbenchPage p = PlatformUI.getWorkbench().showPerspective(GraphingPerspective.ID, PlatformUI.getWorkbench().getActiveWorkbenchWindow());
+					IViewPart ivp = p.findView(GraphSelectorView.ID);
+					String name = console.getName();
+					((GraphSelectorView)ivp).createScriptSet(name.substring(name.lastIndexOf('/')+1), dataSet);
+				} catch(WorkbenchException we) {
+					
+				}
+			}
+		}
+		
+		LogManager.logDebug("End run:", this);
+	}
+	
+	/**
+	 * The <code>buildScript</code> method in this class replaces the one in the superclass and calls
+	 * <code>buildOptionsScript</code> or <code>buildStandardScript</code> depending on the users
+	 * selection of whether to use script options.
+	 * @return String[] representing the entire command that needs to be run.
+	 */
+	protected String[] buildScript() {
+		String[] script;
+		getChartingOptions();
+		
+	//	if(useOptions)
+		//	script = buildOptionsScript();
+		//else
+			script = buildStandardScript();
+		
+		return script;
+	}
+	
+	/**
+	 * This method is used to prompt the user for the parsing expression to be used in generating
+	 * the <code>DataSet</code> from the scripts output.
+	 */
+	protected void getChartingOptions() {
+		DataSetWizard wizard = new DataSetWizard(GraphingConstants.DataSetMetaData, getFilePath());
+		IWorkbench workbench = PlatformUI.getWorkbench();
+		wizard.init(workbench, null);
+		WizardDialog dialog = new WizardDialog(workbench.getActiveWorkbenchWindow().getShell(), wizard);
+		dialog.create();
+		dialog.open();
+		parser = wizard.getParser();
+		
+		dataSet = wizard.getDataSet();
+		
+
+		if(null == parser || null == dataSet)
+		{
+			continueRun = false;
+		}
+		wizard.dispose();
+		
+	}
+	
+	private boolean useOptions = false;
+	private IDataSet dataSet = null;
+	private IDataSetParser parser = null;
+
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/src/org/eclipse/linuxtools/systemtap/ui/graphicalrun/internal/GraphicalRunPlugin.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/src/org/eclipse/linuxtools/systemtap/ui/graphicalrun/internal/GraphicalRunPlugin.java
new file mode 100644
index 0000000..43565a6
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/src/org/eclipse/linuxtools/systemtap/ui/graphicalrun/internal/GraphicalRunPlugin.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.graphicalrun.internal;
+
+import org.eclipse.ui.IStartup;
+import org.eclipse.ui.plugin.*;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The main plugin class to be used in the desktop.
+ */
+public class GraphicalRunPlugin extends AbstractUIPlugin implements IStartup {
+	//The shared instance.
+	private static GraphicalRunPlugin plugin;
+	
+	/**
+	 * The constructor.
+	 */
+	public GraphicalRunPlugin() {
+		plugin = this;
+	}
+
+	/**
+	 * This method is called upon plug-in activation
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+	}
+
+	/**
+	 * This method is called when the plug-in is stopped
+	 */
+	public void stop(BundleContext context) throws Exception {
+		super.stop(context);
+		plugin = null;
+	}
+
+	/**
+	 * Returns the shared instance.
+	 */
+	public static GraphicalRunPlugin getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Returns an image descriptor for the image file at the given
+	 * plug-in relative path.
+	 *
+	 * @param path the path
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.linuxtools.systemtap.ui.graphicalrun", path);
+	}
+	
+	public void earlyStartup() {}
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/src/org/eclipse/linuxtools/systemtap/ui/graphicalrun/structures/ChartStreamDaemon2.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/src/org/eclipse/linuxtools/systemtap/ui/graphicalrun/structures/ChartStreamDaemon2.java
new file mode 100644
index 0000000..a2e4b11
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/src/org/eclipse/linuxtools/systemtap/ui/graphicalrun/structures/ChartStreamDaemon2.java
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse, Anithra P J
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.systemtap.ui.graphicalrun.structures;
+
+import org.eclipse.linuxtools.systemtap.ui.consolelog.structures.ScriptConsole;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.IDataSet;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.IDataSetParser;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.structures.ChartStreamDaemon;
+
+/**
+ * Listens for data events and populates the internal <code>DataSet</code> with the data
+ * that was received and matched the regExpr
+ * @author Ryan Morse
+ */
+public class ChartStreamDaemon2 extends ChartStreamDaemon {
+	public ChartStreamDaemon2(ScriptConsole console, IDataSet d, IDataSetParser p) {
+		super(d, p);
+	}
+
+	/**
+	 * Changes the internal <code>DataSet</code> and parsing expression.
+	 * @param d The new <code>DataSet</code> to store the parsed output.
+	 * @param regExpr String[] containing the RegEx patterns to match against.
+	 */
+	public void setParser(IDataSet d, IDataSetParser p) {
+		data = d;
+		parser = p;
+		if(0 != outputData.length())
+			outputData.delete(0, outputData.length()-1);
+		//outputData.append(console.);
+		outputData.append(console.getCommand().getOutput());
+	}
+	
+	/**
+	 * Disposes of all the internal data.
+	 */
+	public void dispose() {
+		if(!isDisposed()) {
+			super.dispose();
+			console = null;
+		}
+	}
+
+	private ScriptConsole console;
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/ChangeLog
index 360812d..5072869 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/ChangeLog
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-29  Anithra P Janakiraman  <anithra@linux.vnet.ibm.com>
+
+	* src/org/eclipse/linuxtools/systemtap/ui/graphing/actions/ModifyParsingAction.java: Removed.
+	* src/org/eclipse/linuxtools/systemtap/ui/graphing/actions/SaveGraphImageAction.java (getImage): 
+	(run): 
+	(getGraph): 
+	* src/org/eclipse/linuxtools/systemtap/ui/graphing/structures/GraphDisplaySet.java (builders): 
+	(.close): 
+	(ButtonClickListener.widgetSelected): 
+	(getActiveGraph): 
+	(GraphDisplaySet): 
+
 2009-11-16  Andrew Overholt  <overholt@redhat.com>
 
 	* META-INF/MANIFEST.MF: Fix Bundle-Name.
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/src/org/eclipse/linuxtools/systemtap/ui/graphing/actions/ModifyParsingAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/src/org/eclipse/linuxtools/systemtap/ui/graphing/actions/ModifyParsingAction.java
deleted file mode 100644
index 2c24674..0000000
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/src/org/eclipse/linuxtools/systemtap/ui/graphing/actions/ModifyParsingAction.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse
- *******************************************************************************/
-
-package org.eclipse.linuxtools.systemtap.ui.graphing.actions;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.linuxtools.systemtap.ui.consolelog.actions.ConsoleAction;
-import org.eclipse.linuxtools.systemtap.ui.consolelog.structures.ScriptConsole;
-import org.eclipse.linuxtools.systemtap.ui.editor.PathEditorInput;
-import org.eclipse.linuxtools.systemtap.ui.graphing.GraphingConstants;
-import org.eclipse.linuxtools.systemtap.ui.graphing.GraphingPerspective;
-import org.eclipse.linuxtools.systemtap.ui.graphing.views.GraphSelectorView;
-import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.IDataSet;
-import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.IDataSetParser;
-import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.structures.ChartStreamDaemon;
-import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.structures.ChartStreamDaemon2;
-import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.wizards.dataset.DataSetWizard;
-import org.eclipse.linuxtools.systemtap.ui.structures.runnable.LoggedCommand;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.WorkbenchException;
-
-
-
-
-/**
- * The action to allow users to change the parsing expression while a script is activly running.
- * @author Ryan Morse
- */
-public class ModifyParsingAction extends ConsoleAction implements IWorkbenchWindowActionDelegate {
-	/**
-	 * Prompts the user for a new regular expression to use in parsing the stap output for
-	 * the <code>DataSet</code>. If the user enters a new parsing expression then it will
-	 * get the active <code>ScriptConsole</code> and from that the active <code>LoggedCommand</code>.
-	 * Finally, it will dispose of the old <code>ChartStreamDaemon2</code> and add an new
-	 * one in its place.
-	 */
-	public void run() {
-		DataSetWizard wizard = new DataSetWizard(GraphingConstants.DataSetMetaData, getFilePath());
-		IWorkbench workbench = PlatformUI.getWorkbench();
-		wizard.init(workbench, null);
-		WizardDialog dialog = new WizardDialog(workbench.getActiveWorkbenchWindow().getShell(), wizard);
-		dialog.create();
-		dialog.open();
-
-		IDataSetParser parser = wizard.getParser();
-		IDataSet dataSet = wizard.getDataSet();
-
-		if(null != parser && null != dataSet) {
-			ScriptConsole console = super.getActive();
-			LoggedCommand cmd = console.getCommand();
-
-			ArrayList<?> listeners = cmd.getInputStreamListeners();
-			ChartStreamDaemon2 daemon = null;
-			if(null != listeners) {
-				for(int i=0; i<listeners.size(); i++) {
-					if(listeners.get(i) instanceof ChartStreamDaemon) {
-						daemon = (ChartStreamDaemon2)listeners.get(i);
-						break;
-					}
-				}
-			}
-			if(null == daemon) {
-				daemon = new ChartStreamDaemon2(console, dataSet, parser);
-				cmd.addInputStreamListener(daemon);
-			} else
-				daemon.setParser(dataSet, parser);
-			
-			IViewPart ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(GraphSelectorView.ID);
-			GraphSelectorView graphSelector = ((GraphSelectorView)ivp);
-			String name = console.getName();
-			graphSelector.createScriptSet(name.substring(name.lastIndexOf('/')+1), dataSet);
-		}
-		
-		wizard.dispose();
-	}
-	
-	/**
-	 * Gets the file location of the file open in the editor window.
-	 * @return The path of the file in the active editor window.
-	 */
-	private String getFilePath() {
-		try {
-			IWorkbenchPage p = PlatformUI.getWorkbench().showPerspective("org.eclipse.linuxtools.systemtap.ui.ide.IDEPerspective", PlatformUI.getWorkbench().getActiveWorkbenchWindow());
-			IEditorPart ed = p.getActiveEditor();
-			PlatformUI.getWorkbench().showPerspective(GraphingPerspective.ID, PlatformUI.getWorkbench().getActiveWorkbenchWindow());
-			return ((PathEditorInput)ed.getEditorInput()).getPath().toString();
-		} catch(WorkbenchException we) {}
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/src/org/eclipse/linuxtools/systemtap/ui/graphing/actions/SaveGraphImageAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/src/org/eclipse/linuxtools/systemtap/ui/graphing/actions/SaveGraphImageAction.java
index 1d88bce..db27d33 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/src/org/eclipse/linuxtools/systemtap/ui/graphing/actions/SaveGraphImageAction.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/src/org/eclipse/linuxtools/systemtap/ui/graphing/actions/SaveGraphImageAction.java
@@ -18,8 +18,7 @@
 import org.eclipse.linuxtools.systemtap.ui.graphing.internal.Localization;
 import org.eclipse.linuxtools.systemtap.ui.graphing.structures.GraphDisplaySet;
 import org.eclipse.linuxtools.systemtap.ui.graphing.views.GraphSelectorView;
-import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.graphs.IGraph;
-import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.widgets.GraphCanvas;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.chart.widget.ChartCanvas;
 import org.eclipse.linuxtools.systemtap.ui.logging.LogManager;
 import org.eclipse.linuxtools.systemtap.ui.structures.listeners.ITabListener;
 import org.eclipse.swt.SWT;
@@ -55,7 +54,7 @@
 	 */
 	public void run(IAction act) {
 		LogManager.logDebug("Start run", this);
-		IGraph g = getGraph();
+		ChartCanvas g = getGraph();
 		try {
 			PlatformUI.getWorkbench().getDisplay().update();
 		} catch(SWTException swte) {
@@ -85,10 +84,10 @@
 	 * graph is active it will return null.
 	 * @return The IGraph in tha active display set.
 	 */
-	public IGraph getGraph() {
+	public ChartCanvas getGraph() {
 		LogManager.logDebug("Start getGraph", this);
 		IViewPart ivp = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(GraphSelectorView.ID);
-		IGraph g = null;
+		ChartCanvas g = null;
 
 		GraphDisplaySet gds = ((GraphSelectorView)ivp).getActiveDisplaySet();
 		if(null != gds)
@@ -102,9 +101,9 @@
 	 * @param g The graph that needs to be converted to an image
 	 * @return The Image that was generated by the supplied Graph.
 	 */
-	public ImageData getImage(IGraph g) {
+	public ImageData getImage(ChartCanvas g) {
 		LogManager.logDebug("Start getImage", this);
-		GraphCanvas canvas = (GraphCanvas)g;
+		ChartCanvas canvas = (ChartCanvas)g;
 		GC gc = new GC(canvas);
 		Image image = new Image(canvas.getDisplay(), canvas.getSize().x, canvas.getSize().y);
 		gc.copyArea(image, 0, 0);
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/src/org/eclipse/linuxtools/systemtap/ui/graphing/structures/GraphDisplaySet.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/src/org/eclipse/linuxtools/systemtap/ui/graphing/structures/GraphDisplaySet.java
index 2ad6257..a3d7dfd 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/src/org/eclipse/linuxtools/systemtap/ui/graphing/structures/GraphDisplaySet.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/src/org/eclipse/linuxtools/systemtap/ui/graphing/structures/GraphDisplaySet.java
@@ -20,8 +20,9 @@
 import org.eclipse.linuxtools.systemtap.ui.graphing.preferences.GraphingPreferenceConstants;
 import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.IDataSet;
 import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.structures.GraphData;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.chart.widget.ChartCanvas;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.charts.AbstractChartBuilder;
 import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.datadisplay.DataGrid;
-import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.graphs.IGraph;
 import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.widgets.GraphComposite;
 import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.wizards.dataset.DataSetFactory;
 import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.wizards.graph.GraphFactory;
@@ -72,8 +73,9 @@
 	//	}
 		createPartControl(parent);
 		
-		graphs = new ArrayList<IGraph>();
-		tabListeners = new ArrayList<ITabListener>();
+		builders = new ArrayList();
+	//	graphs = new ArrayList();
+		tabListeners = new ArrayList();
 		LogManager.logDebug("End GraphSelectorView:", this);
 	}
 	
@@ -123,8 +125,8 @@
 			public void close(CTabFolderEvent e) {
 				int selected = folder.indexOf((CTabItem)e.item)-2;
 				if(null != updater)
-					updater.removeUpdateListener((IGraph)graphs.get(selected));
-				graphs.remove(selected);
+					updater.removeUpdateListener((AbstractChartBuilder)builders.get(selected));
+				builders.remove(selected);
 				fireTabCloseEvent();
 			}
 		});
@@ -162,10 +164,10 @@
 	 * Finds the graph that is open in the current tab
 	 * @return The graph that is currently visible on the screen
 	 */
-	public IGraph getActiveGraph() {
-		if(0 == graphs.size() || folder.getSelectionIndex() < 2)
+	public ChartCanvas getActiveGraph() {
+		if(0 == builders.size() || folder.getSelectionIndex() < 2)
 			return null;
-		return (IGraph)graphs.get(folder.getSelectionIndex()-2);
+		return (ChartCanvas)builders.get(folder.getSelectionIndex()-2);
 	}
 	
 	public void setFocus() {}
@@ -221,13 +223,13 @@
 					gc.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 					folder.setSelection(item);
 					
-					IGraph g = gc.getGraph();
+					AbstractChartBuilder g = gc.getCanvas();
 					item.setControl(gc);
 					
 					if(null != g) {
 						if(null != updater)
 							updater.addUpdateListener(g);
-						graphs.add(g);
+						builders.add(g);
 					}
 				}
 				wizard.dispose();
@@ -266,7 +268,8 @@
 	private CTabFolder folder;
 	private ButtonClickListener listener;
 	private UpdateManager updater;
-	private ArrayList<ITabListener> tabListeners;
+	private ArrayList tabListeners;
 	
-	private ArrayList<IGraph> graphs;
+//	private ArrayList graphs;
+	private ArrayList builders;
 }
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.tests/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.tests/ChangeLog
index 7329545..5e39ce3 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.tests/ChangeLog
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.tests/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-29  Anithra P Janakiraman  <anithra@linux.vnet.ibm.com>
+
+	* src/org/eclipse/linuxtools/systemtap/ui/graphingapi/nonui/tests/structures/ChartStreamDaemonTest2.java: Removed.
+	* src/org/eclipse/linuxtools/systemtap/ui/graphingapi/nonui/tests/AllTests.java (suite): 
+	* src/org/eclipse/linuxtools/systemtap/ui/graphingapi/nonui/tests/structures/UpdateManagerTest.java: 
+
 2009-08-07  Andrew Overholt  <overholt@redhat.com>
 
 	* META-INF/MANIFEST.MF: Make version 0.3.0.qualifier.
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.tests/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/nonui/tests/AllTests.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.tests/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/nonui/tests/AllTests.java
index e6a62f2..415fe76 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.tests/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/nonui/tests/AllTests.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.tests/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/nonui/tests/AllTests.java
@@ -31,7 +31,6 @@
 import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.tests.filters.SortFilterTest;
 import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.tests.filters.UniqueFilterTest;
 import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.tests.structures.ChartStreamDaemonTest;
-import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.tests.structures.ChartStreamDaemonTest2;
 import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.tests.structures.DataPointTest;
 import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.tests.structures.GraphDataTest;
 import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.tests.structures.NumberTypeTest;
@@ -77,7 +76,7 @@
 
 		//Structures
 		suite.addTestSuite(ChartStreamDaemonTest.class);
-		suite.addTestSuite(ChartStreamDaemonTest2.class);
+	//	suite.addTestSuite(ChartStreamDaemonTest2.class);
 		suite.addTestSuite(DataPointTest.class);
 		suite.addTestSuite(GraphDataTest.class);
 		suite.addTestSuite(NumberTypeTest.class);
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.tests/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/nonui/tests/structures/ChartStreamDaemonTest2.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.tests/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/nonui/tests/structures/ChartStreamDaemonTest2.java
deleted file mode 100644
index 4273854..0000000
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.tests/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/nonui/tests/structures/ChartStreamDaemonTest2.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse
- *******************************************************************************/
-
-package org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.tests.structures;
-
-import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.row.RowDataSet;
-import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.row.RowParser;
-import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.structures.ChartStreamDaemon2;
-
-import junit.framework.TestCase;
-
-public class ChartStreamDaemonTest2 extends TestCase {
-	public ChartStreamDaemonTest2(String name) {
-		super(name);
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-
-		csd = new ChartStreamDaemon2(null, null, null);
-		assertNotNull(csd);
-
-		csd1 = new ChartStreamDaemon2(null, new RowDataSet(new String[] {"a"}), new RowParser(new String[] {"\\w", "\\s"}));
-		assertNotNull(csd1);
-	}
-	
-	public void testHandleEvent() {
-		csd.handleDataEvent("a a a");
-		csd1.handleDataEvent("a a a");
-	}
-	
-	public void testIsDisposed() {
-		assertFalse(csd1.isDisposed());
-	}
-	
-	public void testSetParser() {
-		csd1.handleDataEvent("a a a");
-		csd1.setParser(new RowDataSet(new String[] {"a"}), new RowParser(new String[] {"\\w", "\\s"}));
-	}
-	
-	public void testDispose() {
-		assertFalse(csd1.isDisposed());
-		csd1.dispose();
-		assertTrue(csd1.isDisposed());
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-	
-	private ChartStreamDaemon2 csd, csd1;
-}
\ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.tests/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/nonui/tests/structures/UpdateManagerTest.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.tests/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/nonui/tests/structures/UpdateManagerTest.java
index 79e07a3..8bb878f 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.tests/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/nonui/tests/structures/UpdateManagerTest.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.tests/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/nonui/tests/structures/UpdateManagerTest.java
@@ -1,6 +1,5 @@
 package org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.tests.structures;
 
-import org.eclipse.linuxtools.systemtap.ui.structures.*;
 import org.eclipse.linuxtools.systemtap.ui.structures.listeners.IUpdateListener;
 import org.eclipse.linuxtools.systemtap.ui.structures.UpdateManager;
 
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/ChangeLog
index aa18ca9..1406fbd 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/ChangeLog
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-29  Anithra P Janakiraman  <anithra@linux.vnet.ibm.com>
+
+	* src/org/eclipse/linuxtools/systemtap/ui/graphingapi/nonui/structures/ChartStreamDaemon2.java: Removed.
+	* src/org/eclipse/linuxtools/systemtap/ui/graphingapi/nonui/IGraphColorConstants.java (COLORS): 
+
 2009-11-16  Andrew Overholt  <overholt@redhat.com>
 
 	* META-INF/MANIFEST.MF: Fix bundle name.
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/nonui/IGraphColorConstants.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/nonui/IGraphColorConstants.java
index 61d8424..90f4de0 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/nonui/IGraphColorConstants.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/nonui/IGraphColorConstants.java
@@ -15,6 +15,52 @@
 
 public interface IGraphColorConstants {
 	static final RGB[] COLORS = new RGB[] {
+		
+		
+		new RGB(0,102,204),
+		new RGB(51,153,255),
+		new RGB(102,204,255),
+		
+		new RGB(0,51,153),
+		new RGB(153,153,255),
+		new RGB(102,102,255),
+		new RGB(51,51,255),
+		new RGB(102,153,255),
+		new RGB(153,204,255),
+		new RGB(204,255,255),
+		new RGB(102,204,204),
+		new RGB(0,153,153),
+		new RGB(0,102,102),
+		new RGB(0,51,102),
+		new RGB(0,153,255),
+		
+		
+		
+		new RGB(202,204,255),
+		
+		/*new RGB(153,102,102),
+		new RGB(153,153,153),
+		new RGB(204,102,103),
+		new RGB(204,153,102),
+		new RGB(204,153,51),*/
+		
+		new RGB(204,153,153),
+		new RGB(204,204,204),
+		new RGB(255,153,153),
+		new RGB(255,204,153),
+		new RGB(255,204,102),
+		new RGB(204,204,153),
+		new RGB(255,255,153),
+		new RGB(255,255,51),
+		new RGB(255,204,153),
+		new RGB(153,204,153),
+		new RGB(102,204,204),
+		new RGB(153,204,204),
+		new RGB(153,153,204),
+		new RGB(153,102,153),
+		new RGB(204,153,204),
+		new RGB(153,153,104),
+		
 		new RGB(0, 0, 255),
 		new RGB(255, 0, 0),
 		new RGB(0, 255, 0),
@@ -242,4 +288,6 @@
 		new RGB(0, 0, 51),
 		new RGB(0, 0, 0)
 	};
+	
+	
 }
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/nonui/structures/ChartStreamDaemon2.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/nonui/structures/ChartStreamDaemon2.java
deleted file mode 100644
index e31b27f..0000000
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/nonui/structures/ChartStreamDaemon2.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse
- *******************************************************************************/
-
-package org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.structures;
-
-
-import org.eclipse.linuxtools.systemtap.ui.consolelog.structures.ScriptConsole;
-import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.IDataSet;
-import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.IDataSetParser;
-
-
-/**
- * Listens for data events and populates the internal <code>DataSet</code> with the data
- * that was received and matched the regExpr
- * @author Ryan Morse
- */
-public class ChartStreamDaemon2 extends ChartStreamDaemon {
-	public ChartStreamDaemon2(ScriptConsole console, IDataSet d, IDataSetParser p) {
-		super(d, p);
-		
-	}
-
-	/**
-	 * Changes the internal <code>DataSet</code> and parsing expression.
-	 * @param d The new <code>DataSet</code> to store the parsed output.
-	 * @param regExpr String[] containing the RegEx patterns to match against.
-	 */
-	public void setParser(IDataSet d, IDataSetParser p) {
-		data = d;
-		parser = p;
-		if(0 != outputData.length())
-			outputData.delete(0, outputData.length()-1);
-		outputData.append(console.getOutput());
-	}
-	
-	/**
-	 * Disposes of all the internal data.
-	 */
-	public void dispose() {
-		if(!isDisposed()) {
-			super.dispose();
-			console = null;
-		}
-	}
-
-	private ScriptConsole console;
-}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/ChangeLog
index 0748bb5..7fdecc1 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/ChangeLog
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/ChangeLog
@@ -1,3 +1,36 @@
+2010-01-29  Anithra P Janakiraman  <anithra@linux.vnet.ibm.com>
+
+	* src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/chart/widget/ChartCanvas.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/chart/widget/ChartWithToolTipCanvas.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/chart/widget/ICanvas.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/AbstractChartBuilder.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/AbstractChartWithAxisBuilder.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/AbstractChartWithoutAxisBuilder.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/AreaChartBuilder.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/BarChartBuilder.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/DialChartBuilder.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/LineChartBuilder.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/MeterChartBuilder.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/PieChartBuilder.java: New file.
+	* src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/ScatterChartBuilder.java: New file.
+	* META-INF/MANIFEST.MF: 
+	* src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/graphs/IGraph.java: 
+	* src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/internal/localization.properties: 
+	* src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/preferences/PreferenceInitializer.java (initializeDefaultPreferences): 
+	* src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/widgets/GraphComposite.java (GraphComposite): 
+	(configure): 
+	(getCanvas): 
+	(.widgetSelected): 
+	(dispose): 
+	* src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/wizards/dataset/ParsingWizardPage.java (createColumnSelector): 
+	* src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/wizards/graph/GraphFactory.java (graphImages): 
+	(graphIDs): 
+	(getIndex): 
+	(getAvailableGraphs): 
+	(graphNames): 
+	(createGraph): 
+	(graphDescriptions): 
+
 2009-11-16  Andrew Overholt  <overholt@redhat.com>
 
 	* META-INF/MANIFEST.MF: Fix bundle name.
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/META-INF/MANIFEST.MF
index 858540f..36e2dc0 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/META-INF/MANIFEST.MF
@@ -7,6 +7,8 @@
 Bundle-Vendor: Eclipse
 Bundle-Localization: plugin
 Export-Package: 
+ org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.chart.widget,
+ org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.charts,
  org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.datadisplay,
  org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.graphs,
  org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.preferences,
@@ -18,6 +20,8 @@
  org.eclipse.linuxtools.systemtap.ui.structures,
  org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.ui.forms
+ org.eclipse.ui.forms,
+ org.eclipse.birt.chart.engine
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Import-Package: org.eclipse.birt.chart.model.component
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/graphs/IGraph.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/graphs/IGraph.java
index 7de3c6a..c0f48d6 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/graphs/IGraph.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/graphs/IGraph.java
@@ -12,16 +12,15 @@
 package org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.graphs;
 
 import org.eclipse.linuxtools.systemtap.ui.structures.listeners.IUpdateListener;
-import org.eclipse.swt.graphics.Color;
 
 
 
 public interface IGraph extends IUpdateListener {
-	public boolean isMultiGraph();
-	public void repaint();
-	public void dispose();
-	public void setBackground(Color c);
-	public void setForeground(Color c);
-	public void setLayoutData(Object layout);
-	public void setScale(double scale);
+	//public boolean isMultiGraph();
+	//public void repaint();
+	//public void dispose();
+	//public void setBackground(Color c);
+	//public void setForeground(Color c);
+	//public void setLayoutData(Object layout);
+	//public void setScale(double scale);
 }
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/internal/localization.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/internal/localization.properties
index aef74fa..5424e20 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/internal/localization.properties
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/internal/localization.properties
@@ -3,7 +3,7 @@
 DataGrid.FormatAs=Format as...
 DataGrid.AddFilter=Add filter...
 DataGrid.RemoveFilter=Remove filter...
-DataGrid.ManualyResize=Manualy Resize
+DataGrid.ManualyResize=Manually Resize
 
 #Graphs
 AChart.Title=Title
@@ -119,11 +119,16 @@
 GraphFactory.BarGraph=Bar Graph
 GraphFactory.PieChart=Pie Chart
 GraphFactory.ScatterGraph=Scatter Graph
+GraphFactory.AreaGraph=Area Graph
 GraphFactory.LineGraph=Line Graph
-GraphFactory.LineDescription=This is a simple line graph of a single set of data. Each (x,y) pair will be pltted a a single dot and connected with a solid line on the graph.
+GraphFactory.MeterChart=Meter Graph
+GraphFactory.LineDescription=This is a simple line graph of a single set of data. Each (x,y) pair will be plotted a a single dot and connected with a solid line on the graph.
 GraphFactory.BarDescription=This is a histagram of data.  One series represents the categories and the other represents the value assigned to that category.
+GraphFactory.AreaDescription=This is an Area Graph
 GraphFactory.PieDescription=This is a pie chart
 GraphFactory.ScatterDescription=This is a simple plot of one series of data vs another set.  Each (x,y) pair will be plotted as a single dot on the graph.
+GraphFactory.MeterDescription=This is a meter chart.
+
 
 SelectGraphWizard.CreateGraph=Create Graph
 
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/preferences/PreferenceInitializer.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/preferences/PreferenceInitializer.java
index 5b3f025..5b0fc58 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/preferences/PreferenceInitializer.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/preferences/PreferenceInitializer.java
@@ -26,7 +26,7 @@
 		store.setDefault(GraphingAPIPreferenceConstants.P_JUMP_NEW_TABLE_ENTRY, false);
 		store.setDefault(GraphingAPIPreferenceConstants.P_VIEWABLE_DATA_ITEMS, 100);
 		store.setDefault(GraphingAPIPreferenceConstants.P_MAX_DATA_ITEMS, 250);
-		store.setDefault(GraphingAPIPreferenceConstants.P_X_SERIES_TICKS, 8);
+		store.setDefault(GraphingAPIPreferenceConstants.P_X_SERIES_TICKS, 10);
 		store.setDefault(GraphingAPIPreferenceConstants.P_Y_SERIES_TICKS, 4);
 	}
 }
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/widgets/GraphComposite.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/widgets/GraphComposite.java
index f4d74e1..a8fb8ee 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/widgets/GraphComposite.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/widgets/GraphComposite.java
@@ -15,12 +15,13 @@
 
 import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.IDataSet;
 import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.structures.GraphData;
-import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.graphs.IGraph;
-import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.internal.Localization;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.chart.widget.ChartCanvas;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.charts.AbstractChartBuilder;
 import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.wizards.graph.GraphFactory;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.layout.FormAttachment;
 import org.eclipse.swt.layout.FormData;
 import org.eclipse.swt.layout.FormLayout;
@@ -47,40 +48,63 @@
 		layout.marginWidth = 5;
 		layout.marginHeight = 5;
 		this.setLayout(layout);
-		checkOptions = new ArrayList<Button>();
+		checkOptions = new ArrayList();
 
-		label = new Label(this, SWT.HORIZONTAL | SWT.CENTER);
+		label = new Label(this, SWT.HORIZONTAL | SWT.BORDER | SWT.BOLD | SWT.CENTER);
 		scale = scales[7];
-		label.setText(scale + Localization.getString("GraphComposite.ScaleValue"));
+		//label.setText(scale + Localization.getString("GraphComposite.ScaleValue"));
+		label.setText("-");
 		FormData data = new FormData();
-		data.top = new FormAttachment(0,0);
-		data.right = new FormAttachment(100, 0);
-		data.width = 40;
+	//	data.top = new FormAttachment(0,0);
+		data.bottom = new FormAttachment(100,-4);
+		data.left = new FormAttachment(0, 2);
+		data.width = 15;
 		label.setLayoutData(data);
-
-		zoomScale = new Scale(this,SWT.VERTICAL | SWT.BORDER);
+		label.setFont(new Font(parent.getDisplay(), "Arial", 10, SWT.BOLD ));
+		zoomScale = new Scale(this,SWT.HORIZONTAL);
 		zoomScale.setMinimum(0);
 		zoomScale.setMaximum(14);
 		zoomScale.setIncrement(1);
 		zoomScale.setPageIncrement(1);
 		zoomScale.setSelection(7);
+		zoomScale.setToolTipText("Increase/Decrease the no of X axis ticks");
 		data = new FormData();
-		data.top = new FormAttachment(label, 10);
-		data.bottom = new FormAttachment(100, 5);
-		data.right = new FormAttachment(100,-10);
+		data.left = new FormAttachment(label,2);
+		data.bottom = new FormAttachment(100, -4);
+		data.right = new FormAttachment(100, -20);
 		zoomScale.setLayoutData(data);
+		
+		pluslabel = new Label(this, SWT.HORIZONTAL | SWT.BOLD | SWT.BORDER | SWT.CENTER);
+		pluslabel.setText("+");
+		pluslabel.setFont(new Font(parent.getDisplay(), "Arial", 10, SWT.BOLD));
+		data = new FormData();
+//		data.top = new FormAttachment(0,0);
+		data.left = new FormAttachment(zoomScale,2);
+		data.bottom = new FormAttachment(100,-4);
+		data.width = 15;
+		pluslabel.setLayoutData(data);
 
-		graph = GraphFactory.createGraph(this, gd, ds);
+	
+		//this.setLayout(new FillLayout());
+		//System.out.println("In graphcomposite style" + style);
+		//for (int i=0; i<gd.ySeries.length; i++)
+			//System.out.println("In graphcomposite, y: " + gd.ySeries[i]);
+		builder = GraphFactory.createGraph(this, style,gd, ds);
 		data = new FormData();
 		data.top = new FormAttachment(0,0);
-		data.bottom = new FormAttachment(100,0);
-		data.right = new FormAttachment(label,-10);
+		data.bottom = new FormAttachment(label,-5);
+		//data.right = new FormAttachment(label,-10);
+		data.right = new FormAttachment(100,0);
 		data.left = new FormAttachment(0,0);
-		graph.setLayoutData(data);
+		builder.build();
 
-		graph.setBackground(this.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
-		graph.setForeground(this.getDisplay().getSystemColor(SWT.COLOR_WIDGET_FOREGROUND));
-		this.setBackground(getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
+		
+		
+		builder.setLayoutData(data);
+         
+		//builder.setBackground(this.getDisplay().getSystemColor(SWT.COLOR_CYAN));
+		//builder.setForeground(this.getDisplay().getSystemColor(SWT.COLOR_CYAN));
+		//this.setBackground(getDisplay().getSystemColor(SWT.COLOR_BLUE));
 		zoomScale.addSelectionListener(scaleListener);
 	}
 
@@ -96,13 +120,16 @@
 		
 		zoomScale.setVisible(sidebarVisible);
 		label.setVisible(sidebarVisible);
+		pluslabel.setVisible(sidebarVisible);
 
 		FormData data = new FormData();
 		data.top = new FormAttachment(0,0);
-		data.bottom = new FormAttachment(100,0);
+		//data.bottom = new FormAttachment(100,0);
+		data.bottom = (withSidebar ? new FormAttachment(label,-7) : new FormAttachment(100, 0));
 		data.left = new FormAttachment(0,0);
-		data.right = (withSidebar ? new FormAttachment(label,-10) : new FormAttachment(100, 0));
-		graph.setLayoutData(data);
+		data.right = new FormAttachment(100,0);
+//		data.right = (withSidebar ? new FormAttachment(label,-10) : new FormAttachment(100, 0));
+		builder.setLayoutData(data);
 
 		layout(true, true);
 	}
@@ -148,8 +175,15 @@
 	/**
 	 * Returns the graph that is rendering to this composite.
 	 */
-	public IGraph getGraph() {
+/*	public IGraph getGraph() {
 		return graph;
+	}*/
+	
+	/**
+	 * Returns the graph that is rendering to this composite.
+	 */
+	public AbstractChartBuilder getCanvas() {
+		return builder;
 	}
 
 	/**
@@ -165,8 +199,8 @@
 	public void dispose() {
 		scaleListener = null;
 
-		if(null != graph) graph.dispose();
-		graph = null;
+		if(null != canvas) canvas.dispose();
+		canvas = null;
 		
 		if(null != zoomScale) zoomScale.dispose();
 		zoomScale = null;
@@ -187,12 +221,14 @@
 	 */
 	private SelectionListener scaleListener = new SelectionListener() {
 		public void widgetSelected(SelectionEvent e) {
+			
 			Scale scaler = (Scale) e.widget;
 			int index = scaler.getSelection();
 			if(scale != scales[index]) {
 				scale = scales[index];
-				label.setText(scale + Localization.getString("GraphComposite.ScaleValue"));
-				graph.setScale(scale);
+			//	label.setText(scale + Localization.getString("GraphComposite.ScaleValue"));
+				builder.setScale(scale);
+				//graph.setScale(scale);
 			}
 		}
 
@@ -200,11 +236,14 @@
 	};
 	
 	private boolean sidebarVisible = true;
-	private IGraph graph;
+	private ChartCanvas canvas;
+	private AbstractChartBuilder builder;
 	private Scale zoomScale;
 	public double scale;
 	private static final double[] scales = { .0625, .125, .25, .33 , .5, .66, .8, 1.0, 1.25, 1.5, 2, 3, 4, 8, 16 }; 
 	private Label label;
+	private Label pluslabel;
 	
-	private ArrayList<Button> checkOptions;
+	private ArrayList checkOptions;
+
 }
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/wizards/dataset/ParsingWizardPage.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/wizards/dataset/ParsingWizardPage.java
index 8c8a8e3..6a09b9d 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/wizards/dataset/ParsingWizardPage.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/wizards/dataset/ParsingWizardPage.java
@@ -38,10 +38,10 @@
 	protected void createColumnSelector(Composite parent) {
 		Label lblSeries = new Label(parent, SWT.NONE);
 		lblSeries.setText(Localization.getString("ParsingWizardPage.NumberOfColumns"));
-		lblSeries.setBounds(0, 5, 120, 25);
+		lblSeries.setBounds(0, 5, 130, 25);
 		
 		txtSeries = new Text(parent, SWT.BORDER);
-		txtSeries.setBounds(125, 0, 100, 25);
+		txtSeries.setBounds(135, 0, 100, 25);
 		txtSeries.setText("2"); //$NON-NLS-1$
 		txtSeries.setTextLimit(2);
 		txtSeries.addModifyListener(new ModifyListener() {
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/wizards/graph/GraphFactory.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/wizards/graph/GraphFactory.java
index a61836e..6aefb04 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/wizards/graph/GraphFactory.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/wizards/graph/GraphFactory.java
@@ -19,15 +19,18 @@
 import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.IDataSet;
 import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.IHistoricalDataSet;
 import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.structures.GraphData;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.charts.AbstractChartBuilder;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.charts.AreaChartBuilder;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.charts.BarChartBuilder;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.charts.LineChartBuilder;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.charts.MeterChartBuilder;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.charts.PieChartBuilder;
+import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.charts.ScatterChartBuilder;
 import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.graphs.BarGraph;
-import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.graphs.IGraph;
-import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.graphs.LineGraph;
 import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.graphs.PieChart;
-import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.graphs.ScatterGraph;
 import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.internal.GraphingAPIUIPlugin;
 import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.internal.Localization;
 import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.widgets.GraphComposite;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 
 
@@ -37,41 +40,52 @@
 			Localization.getString("GraphFactory.ScatterGraph"),
 			Localization.getString("GraphFactory.LineGraph"),
 			Localization.getString("GraphFactory.BarGraph"),
-			Localization.getString("GraphFactory.PieChart")
+			Localization.getString("GraphFactory.AreaGraph"),
+			Localization.getString("GraphFactory.PieChart"),
+		//	Localization.getString("GraphFactory.MeterChart")
 	};
 
 	private static final String[] graphDescriptions = new String[] {
 		Localization.getString("GraphFactory.ScatterDescription"),
 		Localization.getString("GraphFactory.LineDescription"),
 		Localization.getString("GraphFactory.BarDescription"),
-		Localization.getString("GraphFactory.PieDescription")
+		Localization.getString("GraphFactory.AreaDescription"),
+		Localization.getString("GraphFactory.PieDescription"),
+		//Localization.getString("GraphFactory.MeterDescription")
 	};
 
 	private static final Image[] graphImages = new Image[] {
 		GraphingAPIUIPlugin.getImageDescriptor("icons/graphs/ScatterGraph.gif").createImage(),
 		GraphingAPIUIPlugin.getImageDescriptor("icons/graphs/LineGraph.gif").createImage(),
 		GraphingAPIUIPlugin.getImageDescriptor("icons/graphs/BarGraph.gif").createImage(),
-		GraphingAPIUIPlugin.getImageDescriptor("icons/graphs/PieChart.gif").createImage()
+		GraphingAPIUIPlugin.getImageDescriptor("icons/graphs/AreaChart.gif").createImage(),
+		GraphingAPIUIPlugin.getImageDescriptor("icons/graphs/PieChart.gif").createImage(),
+		//GraphingAPIUIPlugin.getImageDescriptor("icons/graphs/MeterChart.gif").createImage()
 	};
 
 	private static final String[] graphIDs = new String[] {
-		ScatterGraph.ID,
-		LineGraph.ID,
-		BarGraph.ID,
-		PieChart.ID
+		ScatterChartBuilder.ID,
+		LineChartBuilder.ID,
+		BarChartBuilder.ID,
+		AreaChartBuilder.ID,
+		PieChartBuilder.ID,
+		//MeterChartBuilder.ID
 	};
 
 	public static String[] getAvailableGraphs(IDataSet data) {
-		LinkedList<String> ids = new LinkedList<String>();
+		LinkedList ids = new LinkedList();
 		if(data instanceof IHistoricalDataSet) {
-			ids.add(ScatterGraph.ID);
-			ids.add(LineGraph.ID);
-			ids.add(BarGraph.ID);
+			ids.add(ScatterChartBuilder.ID);
+			ids.add(LineChartBuilder.ID);
+			ids.add(AreaChartBuilder.ID);
+			ids.add(BarChartBuilder.ID);
+			ids.add(PieChartBuilder.ID);
+		//	ids.add(MeterChartBuilder.ID);
 		}
 		if(data instanceof IBlockDataSet) {
-			if(!ids.contains(BarGraph.ID))
-				ids.add(BarGraph.ID);
-			ids.add(PieChart.ID);
+			if(!ids.contains(BarChartBuilder.ID))
+				ids.add(BarChartBuilder.ID);
+			    ids.add(PieChartBuilder.ID);
 		}
 		
 		String[] id = new String[0];
@@ -126,29 +140,55 @@
 		}
 	}
 
-	public static final IGraph createGraph(GraphComposite comp, GraphData gd, IDataSet data) {
-		IGraph g = null;
+	public static final AbstractChartBuilder createGraph(GraphComposite comp, int style, GraphData gd, IDataSet data) {
+		AbstractChartBuilder builder = null;
+		
 		switch(getIndex(gd.graphID)) {
 			case 0:
-				g = new ScatterGraph(comp, SWT.NONE, gd.title, new ScrollAdapter((IHistoricalDataSet)data, gd.xSeries, gd.ySeries, gd.key));
+				builder = new ScatterChartBuilder(comp, style, gd.title, new ScrollAdapter((IHistoricalDataSet)data, gd.xSeries, gd.ySeries, gd.key));
 				break;
 			case 1:
-				g = new LineGraph(comp, SWT.NONE, gd.title, new ScrollAdapter((IHistoricalDataSet)data, gd.xSeries, gd.ySeries, gd.key));
+		//		g = new LineGraph(comp, SWT.NONE, gd.title, new ScrollAdapter((IHistoricalDataSet)data, gd.xSeries, gd.ySeries, gd.key));
+				builder = new LineChartBuilder(comp, style, gd.title, new ScrollAdapter((IHistoricalDataSet)data, gd.xSeries, gd.ySeries, gd.key));
 				break;
 			case 2:
+				BarGraph g;
 				if(!(data instanceof IBlockDataSet) || (null != gd.key))
-					g = new BarGraph(comp, SWT.NONE, gd.title, new ScrollAdapter((IHistoricalDataSet)data, gd.xSeries, gd.ySeries, gd.key));
+					//g = new BarGraph(comp, SWT.NONE, gd.title, new ScrollAdapter((IHistoricalDataSet)data, gd.xSeries, gd.ySeries, gd.key));
+				{
+					builder = new BarChartBuilder(comp, style, gd.title, new ScrollAdapter((IHistoricalDataSet)data, gd.xSeries, gd.ySeries, gd.key));
+				
+				}
 				else
-					g = new BarGraph(comp, SWT.NONE, gd.title, new BlockAdapter((IBlockDataSet)data, gd.xSeries, gd.ySeries));
+					//g = new BarGraph(comp, SWT.NONE, gd.title, new BlockAdapter((IBlockDataSet)data, gd.xSeries, gd.ySeries));
+				{
+				builder = new BarChartBuilder(comp, style, gd.title, new BlockAdapter((IBlockDataSet)data, gd.xSeries, gd.ySeries));
+				
+				}
 				break;
 			case 3:
-				g = new PieChart(comp, SWT.NONE, gd.title, new BlockAdapter((IBlockDataSet)data, gd.xSeries, gd.ySeries));
+				//		g = new PieChart(comp, SWT.NONE, gd.title, new BlockAdapter((IBlockDataSet)data, gd.xSeries, gd.ySeries));
+						builder = new AreaChartBuilder(comp, style, gd.title, new ScrollAdapter((IHistoricalDataSet)data, gd.xSeries, gd.ySeries, gd.key));
+						break;
+			case 4:
+		//		g = new PieChart(comp, SWT.NONE, gd.title, new BlockAdapter((IBlockDataSet)data, gd.xSeries, gd.ySeries));
+				//builder = new PieChartBuilder(comp, style, gd.title, new BlockAdapter((IBlockDataSet)data, gd.xSeries, gd.ySeries));
+				builder = new PieChartBuilder(comp, style, gd.title, new ScrollAdapter((IHistoricalDataSet)data, gd.xSeries, gd.ySeries, gd.key));
+				
 				break;
+			case 5:
+				//		g = new PieChart(comp, SWT.NONE, gd.title, new BlockAdapter((IBlockDataSet)data, gd.xSeries, gd.ySeries));
+						//builder = new PieChartBuilder(comp, style, gd.title, new BlockAdapter((IBlockDataSet)data, gd.xSeries, gd.ySeries));
+						builder = new MeterChartBuilder(comp, style, gd.title, new ScrollAdapter((IHistoricalDataSet)data, gd.xSeries, gd.ySeries, gd.key));
+						
+						break;
+			
 		}
-		return g;
+		return builder;
 	}
 
 	private static int getIndex(String id) {
+		
 		for(int i=0; i<graphIDs.length; i++)
 			if(id.equals(graphIDs[i]))
 				return i;
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog
index 409aba2..eb4385e 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog
@@ -1,3 +1,25 @@
+2010-01-29  Anithra P Janakiraman  <anithra@linux.vnet.ibm.com>
+
+	* src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptChartAction.java: Removed.
+	* src/org/eclipse/linuxtools/systemtap/ui/ide/actions/hidden/FunctionBrowserAction.java (run): 
+	* src/org/eclipse/linuxtools/systemtap/ui/ide/actions/hidden/ProbeAliasAction.java (run): 
+	* src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptAction.java (getImportedTapsets): 
+	(isValidFile): 
+	(buildStandardScript): 
+	(isValid): 
+	(run): 
+	(getFilePath): 
+	(createClientSession): 
+	(isValidDirectory): 
+	(finalizeScript): 
+	(getImportedTapsets): 
+	(isValidFile): 
+	(buildStandardScript): 
+	(isValidDirectory): 
+	(finalizeScript): 
+	* src/org/eclipse/linuxtools/systemtap/ui/ide/editors/c/CEditor.java (checkProbe): 
+	* src/org/eclipse/linuxtools/systemtap/ui/ide/editors/stp/STPDocumentProvider.java: 
+
 2009-11-16  Andrew Overholt  <overholt@redhat.com>
 
 	* META-INF/MANIFEST.MF: Fix bundle name.
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptAction.java
index d98325e..239f555 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptAction.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptAction.java
@@ -15,11 +15,9 @@
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
-import java.net.URI;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.Preferences;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
@@ -27,6 +25,7 @@
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.wizard.ProgressMonitorPart;
 import org.eclipse.linuxtools.systemtap.ui.consolelog.ClientSession;
+import org.eclipse.linuxtools.systemtap.ui.consolelog.ScpClient;
 import org.eclipse.linuxtools.systemtap.ui.consolelog.Subscription;
 import org.eclipse.linuxtools.systemtap.ui.consolelog.dialogs.SelectServerDialog;
 import org.eclipse.linuxtools.systemtap.ui.consolelog.internal.ConsoleLogPlugin;
@@ -38,18 +37,16 @@
 import org.eclipse.linuxtools.systemtap.ui.ide.internal.IDEPlugin;
 import org.eclipse.linuxtools.systemtap.ui.ide.internal.Localization;
 import org.eclipse.linuxtools.systemtap.ui.ide.preferences.IDEPreferenceConstants;
+import org.eclipse.linuxtools.systemtap.ui.ide.structures.StapErrorParser;
 import org.eclipse.linuxtools.systemtap.ui.ide.structures.TapsetLibrary;
 import org.eclipse.linuxtools.systemtap.ui.logging.LogManager;
+import org.eclipse.linuxtools.systemtap.ui.structures.PasswordPrompt;
 import org.eclipse.linuxtools.systemtap.ui.systemtapgui.preferences.EnvironmentVariablesPreferencePage;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.IWorkbenchWindowActionDelegate;
 import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.ide.FileStoreEditorInput;
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
 
 
 
@@ -70,7 +67,6 @@
 	public void init(IWorkbenchWindow window) {
 		LogManager.logInfo("Initializing fWindow: "+ window, this);
 		fWindow= window;
-		
 	}
 
 	public void run(IAction action) {
@@ -85,12 +81,28 @@
 	public void run() {
 		LogManager.logDebug("Start run:", this);
 		continueRun = true;
+		if(ConsoleLogPlugin.getDefault().getPluginPreferences().getBoolean(ConsoleLogPreferenceConstants.REMEMBER_SERVER)!=true)
+        	
+        {
+			new SelectServerDialog(fWindow.getShell()).open();
+		}
 		if(isValid()) {
-	//		String[] script = buildScript();
-	//		String[] envVars = getEnvironmentVariables();
+			 try{
+				 
+					ScpClient scpclient = new ScpClient();
+					serverfileName = fileName.substring(fileName.lastIndexOf('/')+1);
+					tmpfileName="/tmp/"+ serverfileName;
+					 scpclient.transfer(fileName,tmpfileName);
+			        }catch(Exception e){e.printStackTrace();}
+					
+			String[] script = buildScript();
+			String[] envVars = getEnvironmentVariables();
             if(continueRun)
             {
-        		createClientSession();        
+            
+    	
+            	ScriptConsole console = ScriptConsole.getInstance(serverfileName);
+                console.run(script, envVars, new PasswordPrompt(IDESessionSettings.password), new StapErrorParser());
             }
 		}
 		
@@ -103,23 +115,7 @@
 	 */
 	protected String getFilePath() {
 		IEditorPart ed = fWindow.getActivePage().getActiveEditor();
-		String filename = null;
-		if (ed.getEditorInput() instanceof FileStoreEditorInput)
-		{
-			URI uri = ((FileStoreEditorInput)ed.getEditorInput()).getURI();
-			IFileStore location = EFS.getLocalFileSystem().getStore(uri);
-			try {
-				filename = location.toLocalFile(EFS.NONE, null).getAbsolutePath();
-			} catch (CoreException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		if (ed.getEditorInput() instanceof FileEditorInput)
-			filename = ((FileEditorInput)ed.getEditorInput()).getFile().getFullPath().toString();
-		if (ed.getEditorInput() instanceof PathEditorInput)
-			filename = ((PathEditorInput)ed.getEditorInput()).getPath().toString();
-		return filename;
+		return ((PathEditorInput)ed.getEditorInput()).getPath().toString();
 	}
 	
 	/**
@@ -129,33 +125,16 @@
 	 */
 	protected boolean isValid() {
 		IEditorPart ed = fWindow.getActivePage().getActiveEditor();
+        
 		if(isValidFile(ed))
-		{ 
-			if (ed.getEditorInput() instanceof FileStoreEditorInput)
-			{
-				URI uri = ((FileStoreEditorInput)ed.getEditorInput()).getURI();
-				IFileStore location = EFS.getLocalFileSystem().getStore(uri);
-				try {
-					fileName = location.toLocalFile(EFS.NONE, null).getAbsolutePath();
-				} catch (CoreException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-			}
-			if (ed.getEditorInput() instanceof FileEditorInput)
-				fileName = ((FileEditorInput)ed.getEditorInput()).getFile().getFullPath().toString();
-			if (ed.getEditorInput() instanceof PathEditorInput)
-				fileName = ((PathEditorInput)ed.getEditorInput()).getPath().toString();
-		if(isValidDirectory(fileName))
+			if(isValidDirectory(((PathEditorInput)ed.getEditorInput()).getPath().toString()))
 				return true;
-		}	
 		return true;
 	}
 	
 	private boolean isValidFile(IEditorPart ed) {
-		
 		if(null == ed) {
-			String msg = MessageFormat.format(Localization.getString("RunScriptAction.NoScriptFile"), (Object[])null);
+			String msg = MessageFormat.format(Localization.getString("RunScriptAction.NoScriptFile"),(Object[]) null);
 			LogManager.logInfo("Initializing", MessageDialog.class);
 			MessageDialog.openWarning(fWindow.getShell(), Localization.getString("RunScriptAction.Problem"), msg);
 			LogManager.logInfo("Disposing", MessageDialog.class);
@@ -173,7 +152,7 @@
 		if(0 == IDESessionSettings.tapsetLocation.trim().length())
 			TapsetLibrary.getTapsetLocation(IDEPlugin.getDefault().getPreferenceStore());
 		if(fileName.contains(IDESessionSettings.tapsetLocation)) {
-			String msg = MessageFormat.format(Localization.getString("RunScriptAction.TapsetDirectoryRun"), (Object[])null);
+			String msg = MessageFormat.format(Localization.getString("RunScriptAction.TapsetDirectoryRun"),(Object []) null);
 			MessageDialog.openWarning(fWindow.getShell(), Localization.getString("RunScriptAction.Error"), msg);
 			return false;
 		}
@@ -200,11 +179,12 @@
 	//FixMe: Take care of this in the next release. For now only the guru mode is sent
 		ArrayList<String> cmdList = new ArrayList<String>();
 		String[] script;
-
+		
 		getImportedTapsets(cmdList);
 		
 		if(isGuru())
 			cmdList.add("-g"); //$NON-NLS-1$
+		
 
 		script = finalizeScript(cmdList);
 		
@@ -215,6 +195,7 @@
 	 * Adds the tapsets that the user has added in preferences to the input <code>ArrayList</code>
 	 * @param cmdList The list to add the user-specified tapset locations to.
 	 */
+	@SuppressWarnings("deprecation")
 	protected void getImportedTapsets(ArrayList<String> cmdList) {
 		Preferences pref = IDEPlugin.getDefault().getPluginPreferences();
 		String[] tapsets = pref.getString(IDEPreferenceConstants.P_TAPSETS).split(File.pathSeparator);
@@ -273,18 +254,19 @@
 	
 	protected boolean createClientSession()
 	{
-		if (!ClientSession.isConnected())
+		
+	if (!ClientSession.isConnected())
 		{
 				new SelectServerDialog(fWindow.getShell()).open();
 		}
 		if((ConsoleLogPlugin.getDefault().getPluginPreferences().getBoolean(ConsoleLogPreferenceConstants.CANCELLED))!=true)
 		{
 		subscription = new Subscription(fileName,isGuru());
-		if (ClientSession.isConnected())		
+	/*	if (ClientSession.isConnected())		
 		{
 		console = ScriptConsole.getInstance(fileName, subscription);
         console.run();
-		}
+		}*/
 		}		
 		return true;
 	}
@@ -298,15 +280,24 @@
 	 * @return An array suitable to pass to <code>Runtime.exec</code> to start stap on this file.
 	 */
 	protected String[] finalizeScript(ArrayList<String> cmdList) {
+		
 		String[] script;
 
-		script = new String[cmdList.size() + 2];
+		script = new String[cmdList.size() + 4];
 		script[0] = "stap"; //$NON-NLS-1$
-
-		script[script.length-1] = fileName;
+			
+		script[script.length-1] = tmpfileName;
+		
 		for(int i=0; i< cmdList.size(); i++) {
 			script[i+1] = cmdList.get(i).toString();
 		}
+		script[script.length-3]="-m";
+		
+		String modname = serverfileName.substring(0, serverfileName.indexOf('.'));
+		if (modname.indexOf('-') != -1)
+			modname = modname.substring(0, modname.indexOf('-'));
+		script[script.length-2]=modname;
+		
 		return script;
 	}
 	
@@ -335,7 +326,9 @@
 	}
 
 	protected boolean continueRun = true;
-	private String fileName = null;
+	protected String fileName = null;
+	protected String tmpfileName = null;
+	protected String serverfileName = null;
 	protected IWorkbenchWindow fWindow;
 	private IAction act;
 	protected Subscription subscription;
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptChartAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptChartAction.java
deleted file mode 100644
index 23ceb13..0000000
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptChartAction.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse
- *******************************************************************************/
-
-package org.eclipse.linuxtools.systemtap.ui.ide.actions;
-
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.linuxtools.systemtap.ui.graphing.GraphingConstants;
-import org.eclipse.linuxtools.systemtap.ui.graphing.GraphingPerspective;
-import org.eclipse.linuxtools.systemtap.ui.graphing.views.GraphSelectorView;
-import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.IDataSet;
-import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.datasets.IDataSetParser;
-import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.structures.ChartStreamDaemon2;
-import org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.wizards.dataset.DataSetWizard;
-import org.eclipse.linuxtools.systemtap.ui.logging.LogManager;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.WorkbenchException;
-
-
-
-/**
- * Action used to run the systemTap script in the active editor.  This action will start stap
- * and send the output to both the <code>ScriptConsole</code> window and a <code>DataSet</code>.
- * @author Ryan Morse
- */
-public class RunScriptChartAction extends RunScriptOptionsAction implements IWorkbenchWindowActionDelegate {
-	public RunScriptChartAction() {
-		super();
-		LogManager.logDebug("initialized", this);
-	}
-
-	public void dispose() {
-		LogManager.logDebug("disposed", this);
-		super.dispose();
-	}
-
-	/**
-	 * The main body of this event. Starts by making sure the current editor is valid to run,
-	 * then builds the command line arguments for stap and retrieves the environment variables.
-	 * Next, it gets an instance of <code>ScriptConsole</code> to run the script. Finally, it
-	 * Registers a new <code>ChartStreamDaemon2</code> to handle formating the script output
-	 * for a <code>DataSet</code>. Once everything is setup, it will attempt to switch to the
-	 * Graphing Perspective.
-	 */
-	public void run() {
-		LogManager.logDebug("Start run:", this);
-		continueRun = true;
-
-		if(isValid()) {
-			@SuppressWarnings("unused")
-			String[] script = buildScript();
-			@SuppressWarnings("unused")
-			String[] envVars = getEnvironmentVariables();
-
-			if(continueRun) {
-				createClientSession();
-				subscription.addInputStreamListener(new ChartStreamDaemon2(console, dataSet, parser));
-
-				//Change to the graphing perspective
-				try {
-					IWorkbenchPage p = PlatformUI.getWorkbench().showPerspective(GraphingPerspective.ID, PlatformUI.getWorkbench().getActiveWorkbenchWindow());
-					IViewPart ivp = p.findView(GraphSelectorView.ID);
-					String name = console.getName();
-					((GraphSelectorView)ivp).createScriptSet(name.substring(name.lastIndexOf('/')+1), dataSet);
-				} catch(WorkbenchException we) {
-					
-				}
-			}
-		}
-		
-		LogManager.logDebug("End run:", this);
-	}
-	
-	/**
-	 * The <code>buildScript</code> method in this class replaces the one in the superclass and calls
-	 * <code>buildOptionsScript</code> or <code>buildStandardScript</code> depending on the users
-	 * selection of whether to use script options.
-	 * @return String[] representing the entire command that needs to be run.
-	 */
-	protected String[] buildScript() {
-		String[] script;
-
-		getChartingOptions();
-		
-		if(useOptions)
-			script = buildOptionsScript();
-		else
-			script = buildStandardScript();
-		
-		return script;
-	}
-	
-	/**
-	 * This method is used to prompt the user for the parsing expression to be used in generating
-	 * the <code>DataSet</code> from the scripts output.
-	 */
-	protected void getChartingOptions() {
-		DataSetWizard wizard = new DataSetWizard(GraphingConstants.DataSetMetaData, getFilePath());
-		IWorkbench workbench = PlatformUI.getWorkbench();
-		wizard.init(workbench, null);
-		WizardDialog dialog = new WizardDialog(workbench.getActiveWorkbenchWindow().getShell(), wizard);
-		dialog.create();
-		dialog.open();
-
-		parser = wizard.getParser();
-		dataSet = wizard.getDataSet();
-
-		if(null == parser || null == dataSet)
-			continueRun = false;
-		
-		wizard.dispose();
-	}
-	
-	private boolean useOptions = false;
-	private IDataSet dataSet = null;
-	private IDataSetParser parser = null;
-}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/hidden/FunctionBrowserAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/hidden/FunctionBrowserAction.java
index ffdb970..7f7adbe 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/hidden/FunctionBrowserAction.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/hidden/FunctionBrowserAction.java
@@ -112,7 +112,7 @@
 				IEditorInput input;
 				IEditorPart ed = page.getActiveEditor();
 				if(ed == null) {
-					NewFileAction action = new NewFileAction(page.getWorkbenchWindow());
+					NewFileAction action = new NewFileAction();
 					//action.init(page.getWorkbenchWindow());
 					action.run();
 					ed = page.getWorkbenchWindow().getActivePage().getActiveEditor();
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/hidden/ProbeAliasAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/hidden/ProbeAliasAction.java
index 775ccf7..d896842 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/hidden/ProbeAliasAction.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/hidden/ProbeAliasAction.java
@@ -93,7 +93,7 @@
 		IWorkbenchPage page = window.getActivePage();
 		IEditorPart editor = page.getActiveEditor();
 		if(null == editor) {
-			NewFileAction action = new NewFileAction(page.getWorkbenchWindow());
+			NewFileAction action = new NewFileAction();
 			//action.init(page.getWorkbenchWindow());
 			action.run();
 			editor = page.getWorkbenchWindow().getActivePage().getActiveEditor();
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/editors/c/CEditor.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/editors/c/CEditor.java
index 2ae69b1..a0b77be 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/editors/c/CEditor.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/editors/c/CEditor.java
@@ -30,6 +30,7 @@
 import org.eclipse.linuxtools.systemtap.ui.ide.internal.Localization;
 import org.eclipse.linuxtools.systemtap.ui.ide.preferences.IDEPreferenceConstants;
 import org.eclipse.linuxtools.systemtap.ui.logging.LogManager;
+import org.eclipse.linuxtools.systemtap.ui.structures.runnable.Command;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.MouseListener;
@@ -237,7 +238,7 @@
 	 * @param probe	the systemtap probe to test for validity
 	 * @return	true when the probe is a valid probe
 	 */
-	/*private boolean checkProbe(String probe) {
+	private boolean checkProbe(String probe) {
 		LogManager.logDebug("Start checkProbe: probe-" + probe, this);
 		String[] stap = new String[4];
 		stap[0] = "stap";
@@ -259,7 +260,7 @@
 		cmd.dispose();
 		LogManager.logDebug("End checkProbe:", this);
     	return success;
-	}*/
+	}
 	
 	public void dispose() {
 		LogManager.logDebug("Start dispose:", this);
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/editors/stp/STPDocumentProvider.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/editors/stp/STPDocumentProvider.java
index 2f724a1..a8d4ec4 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/editors/stp/STPDocumentProvider.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/editors/stp/STPDocumentProvider.java
@@ -19,7 +19,6 @@
 import org.eclipse.jface.text.source.AnnotationModel;
 import org.eclipse.jface.text.source.IAnnotationModel;
 import org.eclipse.linuxtools.systemtap.ui.editor.SimpleDocumentProvider;
-import org.eclipse.linuxtools.systemtap.ui.ide.editors.stp.STPPartitioner;
 import org.eclipse.linuxtools.systemtap.ui.logging.LogManager;
 
 public class STPDocumentProvider extends SimpleDocumentProvider {
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.structures.tests/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.structures.tests/ChangeLog
index 2a4d343..42250d7 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.structures.tests/ChangeLog
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.structures.tests/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-29  Anithra P Janakiraman  <anithra@linux.vnet.ibm.com>
+
+	* src/org/eclipse/linuxtools/systemtap/ui/structures/validators/MultiValidatorTest.java: 
+
 2009-08-07  Andrew Overholt  <overholt@redhat.com>
 
 	* META-INF/MANIFEST.MF: Make version 0.3.0.qualifier.
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.structures.tests/src/org/eclipse/linuxtools/systemtap/ui/structures/validators/MultiValidatorTest.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.structures.tests/src/org/eclipse/linuxtools/systemtap/ui/structures/validators/MultiValidatorTest.java
index f3e5ac5..43d8ceb 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.structures.tests/src/org/eclipse/linuxtools/systemtap/ui/structures/validators/MultiValidatorTest.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.structures.tests/src/org/eclipse/linuxtools/systemtap/ui/structures/validators/MultiValidatorTest.java
@@ -1,7 +1,6 @@
 package org.eclipse.linuxtools.systemtap.ui.structures.validators;
 
 import junit.framework.TestCase;
-import org.eclipse.jface.dialogs.IInputValidator;
 import org.eclipse.linuxtools.systemtap.ui.structures.validators.ConditionalExpressionValidator;
 import org.eclipse.linuxtools.systemtap.ui.structures.validators.DirectoryValidator;
 import org.eclipse.linuxtools.systemtap.ui.structures.validators.IntegerValidator;
diff --git a/valgrind/about.html b/valgrind/about.html
deleted file mode 100644
index e6a2741..0000000
--- a/valgrind/about.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head><body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>October 24, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
\ No newline at end of file
diff --git a/valgrind/icons/valgrind-icon.png b/valgrind/icons/valgrind-icon.png
deleted file mode 100644
index 099bbda..0000000
--- a/valgrind/icons/valgrind-icon.png
+++ /dev/null
Binary files differ
diff --git a/valgrind/org.eclipse.linuxtools.valgrind-feature/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind-feature/ChangeLog
index b53efba..0ab6883 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind-feature/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind-feature/ChangeLog
@@ -1,22 +1,3 @@
-2010-05-18  Andrew Overholt  <overholt@redhat.com>
-
-	* feature.properties: Fix provider name.
-
-2010-04-26  Andrew Overholt  <overholt@redhat.com>
-
-	* feature.properties: Match consistent license text (bug #306627).  Update
-	copyright year.
-	* license.html: New file.  HTML version of SUA (bug #306627).
-	* build.properties: Include license.html.
-
-2010-04-13  Andrew Overholt  <overholt@redhat.com>
-
-	* feature.xml: Restrict to os=linux.
-
-2010-04-12  Andrew Overholt  <overholt@redhat.com>
-
-	* feature.properties: Match consistent license text (bug #306627).
-
 2009-08-11  Elliott Baron  <ebaron@redhat.com>
 
 	* feature.xml: Bump version to 0.3.0.
diff --git a/valgrind/org.eclipse.linuxtools.valgrind-feature/build.properties b/valgrind/org.eclipse.linuxtools.valgrind-feature/build.properties
index b74af86..0c6ef87 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind-feature/build.properties
+++ b/valgrind/org.eclipse.linuxtools.valgrind-feature/build.properties
@@ -1,4 +1,3 @@
 bin.includes = feature.xml,\
                feature.properties,\
-               epl-v10.html,\
-               license.html
+               epl-v10.html
diff --git a/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.properties b/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.properties
index bf8fff2..d08a7b1 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.properties
+++ b/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.properties
@@ -10,12 +10,12 @@
 #********************************************************************************
 featureName=Valgrind Tools Integration (Incubation)
 description=Plugins to integrate Valgrind tools into the workbench.
-featureProvider=Eclipse Linux Tools
-copyright=Copyright 2008, 2010 Red Hat, Inc.
-licenseURL=license.html
+featureProvider=Eclipse
+copyright=Copyright 2008 Red Hat, Inc.
+licenseURL=epl-v10.html
 license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
+ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
+March 17, 2005\n\
 \n\
 Usage Of Content\n\
 \n\
@@ -23,38 +23,42 @@
 OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
 USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
 AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
 AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
 AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
 TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
 OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
 BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
 \n\
 Applicable Licenses\n\
 \n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
 For purposes of the EPL, "Program" will mean the Content.\n\
 \n\
 Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
+documentation and other files maintained in the Eclipse.org CVS\n\
+repository ("Repository") in CVS modules ("Modules") and made available\n\
 as downloadable archives ("Downloads").\n\
 \n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+Features may also include other Features ("Included Features"). Files named\n\
+"feature.xml" may contain a list of the names and version numbers of\n\
+Included Features.\n\
 \n\
 The terms and conditions governing Plug-ins and Fragments should be\n\
 contained in files named "about.html" ("Abouts"). The terms and\n\
@@ -63,76 +67,46 @@
 Licenses may be located in any directory of a Download or Module\n\
 including, but not limited to the following locations:\n\
 \n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
+   - The top-level (root) directory\n\
+   - Plug-in and Fragment directories\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
+   - Feature directories\n\
 \n\
 Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
+Eclipse Update Manager, you must agree to a license ("Feature Update\n\
+License") during the installation process. If the Feature contains\n\
 Included Features, the Feature Update License should either provide you\n\
 with the terms and conditions governing the Included Features or inform\n\
 you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
+the "license" property of files named "feature.properties". Such Abouts,\n\
+Feature Licenses and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
 \n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
 TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
 SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
 \n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
+    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
 \n\
 IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
 is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
 govern that particular Content.\n\
 \n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
 Cryptography\n\
 \n\
 Content may contain encryption software. The country in which you are\n\
 currently may have restrictions on the import, possession, and use,\n\
 and/or re-export to another country, of encryption software. BEFORE\n\
 using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
 \n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
\ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.xml b/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.xml
index 29b6d1e..9fd1ae8 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.xml
@@ -3,8 +3,7 @@
       id="org.eclipse.linuxtools.valgrind"
       label="%featureName"
       version="0.4.0.qualifier"
-      provider-name="%featureProvider"
-      os="linux">
+      provider-name="%featureProvider">
 
    <description>
       %description
diff --git a/valgrind/org.eclipse.linuxtools.valgrind-feature/license.html b/valgrind/org.eclipse.linuxtools.valgrind-feature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/valgrind/org.eclipse.linuxtools.valgrind-feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/ChangeLog
index b061461..47b2638 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/ChangeLog
@@ -1,7 +1,3 @@
-2009-12-22  Roland Grunberg  <rgrunber@redhat.com>
-
-	* META-INF/MANIFEST.MF: Make necessary changes for switch from JUnit 3 to JUnit 4.
-
 2009-09-28  Elliott Baron  <ebaron@fedoraproject.org>
 
 	* valgrindFiles: Regenerated.
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/META-INF/MANIFEST.MF
index 15f3fd1..81b9462 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@
 Bundle-Vendor: %Bundle-Vendor.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.junit;bundle-version="4.7.0"
+ org.junit;bundle-version="[0.0.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/plugin.properties b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/plugin.properties
index d852c50..b4df651 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/plugin.properties
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/plugin.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.linuxtools.valgrind.cachegrind.tests
-Bundle-Vendor.0 = Eclipse Linux Tools
+Bundle-Vendor.0 = Eclipse
 Bundle-Name.0 = Cachegrind Tests Plug-in (Incubation)
\ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/about.html b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/about.html
deleted file mode 100644
index 23506a4..0000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/about.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head><body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
\ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/build.properties b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/build.properties
index c9b4de5..d24082b 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/build.properties
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/build.properties
@@ -4,5 +4,4 @@
                .,\
                plugin.properties,\
                plugin.xml,\
-	       about.html,\
                icons/
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/plugin.properties b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/plugin.properties
index ded39d7..c34c0fb 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/plugin.properties
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/plugin.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.linuxtools.valgrind.cachegrind
-Bundle-Vendor.0 = Eclipse Linux Tools
+Bundle-Vendor.0 = Eclipse
 Bundle-Name.0 = Cachegrind Plug-in (Incubation)
\ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.core/ChangeLog
index cd9f330..6564d08 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core/ChangeLog
@@ -1,10 +1,3 @@
-2010-06-06  Elliott Baron  <ebaron@fedoraproject.org>
-
-	Bug #315890
-	* src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindCommand.java (whichValgrind): Handle preference
-	for Valgrind location here.
-	* src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindPreferencePage.java: Reformatted. 
-
 2009-11-03  Elliott Baron  <ebaron@fedoraproject.org>
 
 	* plugin.properties: Externalized preference page name.
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core/plugin.properties b/valgrind/org.eclipse.linuxtools.valgrind.core/plugin.properties
index 4b50ef5..85dc5ec 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core/plugin.properties
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core/plugin.properties
@@ -1,4 +1,4 @@
 #Properties file for org.eclipse.linuxtools.valgrind.core
-Bundle-Vendor.0 = Eclipse Linux Tools
+Bundle-Vendor.0 = Eclipse
 Bundle-Name.0 = Valgrind Core Plug-in (Incubation)
 page.name = Valgrind
\ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindCommand.java b/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindCommand.java
index c755730..2b477e9 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindCommand.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindCommand.java
@@ -25,21 +25,10 @@
 	protected String[] args;
 
 	public String whichValgrind() throws IOException {
-		String ret;
-		// Valgrind binary location in preferences overrides default location
-		String valgrindPreferedPath = ValgrindPlugin.getDefault().getPreferenceStore().getString(ValgrindPreferencePage.VALGRIND_PATH);
-		if (valgrindPreferedPath.equals("")) {
-			// No preference, check Valgrind exists in the user's PATH
-			StringBuffer out = new StringBuffer();
-			Process p = Runtime.getRuntime().exec(WHICH_CMD + " " + VALGRIND_CMD); //$NON-NLS-1$
-			// Throws IOException if which command is unsuccessful
-			readIntoBuffer(out, p);
-			ret = out.toString().trim();
-		}
-		else {
-			ret = valgrindPreferedPath;
-		}
-		return ret;
+		StringBuffer out = new StringBuffer();
+		Process p = Runtime.getRuntime().exec(WHICH_CMD + " " + VALGRIND_CMD); //$NON-NLS-1$
+		readIntoBuffer(out, p);
+		return out.toString().trim();
 	}
 
 	public String whichVersion(String whichValgrind) throws IOException {
@@ -84,7 +73,7 @@
 		return ret.toString().trim();
 	}
 
-	protected void readIntoBuffer(StringBuffer out, Process p) throws IOException {
+	private void readIntoBuffer(StringBuffer out, Process p) throws IOException {
 		boolean success;
 		InputStream in;
 		try {
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindPreferencePage.java b/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindPreferencePage.java
index 2ddfe6c..420a3c2 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindPreferencePage.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindPreferencePage.java
@@ -31,13 +31,13 @@
 import org.eclipse.ui.IWorkbenchPreferencePage;
 
 /**
- * The Valgrind Preference Page can be found by going to Windows -> Preferences
- * from the Eclipse top menu bar. This can hold all non-launch specific
- * configuration settings or user preferences.
+ * The Valgrind Preference Page can be found by going to Windows ->
+ * Preferences from the Eclipse top menu bar. This can hold all
+ * non-launch specific configuration settings or user preferences.
  */
 public class ValgrindPreferencePage extends PreferencePage implements
-		IWorkbenchPreferencePage {
-
+		IWorkbenchPreferencePage{
+	
 	public static final String VALGRIND_PATH = "VALGRIND_PATH"; //$NON-NLS-1$
 	private Text binText;
 	private Button button;
@@ -57,24 +57,22 @@
 		data.grabExcessHorizontalSpace = true;
 		data.grabExcessVerticalSpace = true;
 		composite.setLayoutData(data);
-
-		// Path Label
-		Label pathLabel = new Label(composite, SWT.NONE);
-		pathLabel.setText(Messages
-				.getString("ValgrindPreferencePage.Binary_path")); //$NON-NLS-1$
-
-		// Path Text Field
+		
+		//Path Label
+		Label pathLabel = new Label(composite,SWT.NONE);
+		pathLabel.setText(Messages.getString("ValgrindPreferencePage.Binary_path")); //$NON-NLS-1$
+		
+		//Path Text Field
 		binText = new Text(composite, SWT.SINGLE | SWT.BORDER);
 		GridData binTextData = new GridData();
 		binTextData.horizontalAlignment = SWT.FILL;
 		binTextData.grabExcessHorizontalSpace = true;
 		binText.setLayoutData(binTextData);
-
-		// Button
+		
+		//Button
 		button = new Button(composite, SWT.PUSH);
-		button.setText(Messages
-				.getString("ValgrindPreferencePage.Browse_button")); //$NON-NLS-1$
-		button.addSelectionListener(new SelectionListener() {
+		button.setText(Messages.getString("ValgrindPreferencePage.Browse_button")); //$NON-NLS-1$
+		button.addSelectionListener(new SelectionListener(){
 
 			public void widgetDefaultSelected(SelectionEvent e) {
 				// TODO Auto-generated method stub
@@ -84,32 +82,31 @@
 				Shell shell = new Shell();
 				FileDialog dialog = new FileDialog(shell);
 				String path = dialog.open();
-				if (path != null) {
+				if (path != null){
 					binText.setText(path);
 				}
-			}
-		});
-
+			}});
+		
 		loadPreferences();
 		return parent;
 	}
-
-	// Loading preferences into controls
+	
+	//Loading preferences into controls
 	private void loadPreferences() {
 		binText.setText(store.getString(VALGRIND_PATH));
 	}
-
-	// Get the PreferenceStore for this Plugin
+	
+	//Get the PreferenceStore for this Plugin
 	@Override
 	protected IPreferenceStore doGetPreferenceStore() {
 		return ValgrindPlugin.getDefault().getPreferenceStore();
 	}
 
-	// Initialization (Before Creating Widgets)
+	//Initialization (Before Creating Widgets)
 	public void init(IWorkbench workbench) {
 		store = getPreferenceStore();
 	}
-
+	
 	@Override
 	protected void performDefaults() {
 		super.performDefaults();
@@ -118,32 +115,31 @@
 	}
 
 	@Override
-	public boolean performOk() {
-		if (passesValidityChecks()) {
+	public boolean performOk(){
+		if (passesValidityChecks()){
 			ValgrindPlugin.getDefault().savePluginPreferences();
 			return true;
-		} else {
+		}else{
 			return false;
 		}
 	}
 
 	private boolean passesValidityChecks() {
-		// Check the Binary Path is valid
+		
+		//Check the Binary Path is valid
 		File file = new File(binText.getText());
-		// Can be more strict if necessary
-		if (file.exists() && !file.isDirectory()) {
+		//Can be more strict if necessary
+		if (file.exists() && !file.isDirectory()){
 			store.setValue(VALGRIND_PATH, binText.getText());
-		} else {
+		}else{
 			performDefaults();
 			Shell shell = new Shell();
 			MessageDialog
-					.openError(
-							shell,
-							Messages.getString("ValgrindPreferencePage.Error_invalid_title"), //$NON-NLS-1$
+					.openError(shell, Messages.getString("ValgrindPreferencePage.Error_invalid_title"), //$NON-NLS-1$
 							Messages.getString("ValgrindPreferencePage.Error_invalid_message")); //$NON-NLS-1$
 			return false;
 		}
-
+		
 		return true;
 	}
 
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.doc/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.doc/ChangeLog
index 8a138dd..7e077f5 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.doc/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.doc/ChangeLog
@@ -1,9 +1,3 @@
-2010-04-19  Elliott Baron  <ebaron@fedoraproject.org>
-
-	* userguide/General-Usage.html: Regenerated to include Mac OSX info.
-	* userguide/Valgrind\ Reference-toc.xml: Likewise.
-	* userguide/Valgrind\ Reference.xml: Likewise.
-
 2009-08-07  Andrew Overholt  <overholt@redhat.com>
 
 	Bug #285861
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.doc/about.html b/valgrind/org.eclipse.linuxtools.valgrind.doc/about.html
index c258ef5..0c6525d 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.doc/about.html
+++ b/valgrind/org.eclipse.linuxtools.valgrind.doc/about.html
@@ -1,28 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
 <title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
 </head>
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 5, 2006</p>	
+<p>24th October, 2008</p>	
 <h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+<p>The Eclipse Software Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+<h3>Contributions</h3>
+
+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise
+made available to the Eclipse Foundation, its members and/or the host of the Eclipse Foundation web site, by you that relate to such
+Content are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
+
+<p>If this Content is licensed to you under license terms and conditions other than the EPL (&quot;Other License&quot;), any modifications, enhancements and/or
+other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to the Eclipse Foundation, its members and/or the
+host of the Eclipse Foundation web site, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
+providing the Modifications under the terms and conditions of the <a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>
+for the Eclipse Foundation web site and such Modifications can be made available to others under the terms of the licenses as set out in the
+<a href="http://www.eclipse.org/legal/termsofuse.html">Terms of Use</a>.</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.doc/plugin.properties b/valgrind/org.eclipse.linuxtools.valgrind.doc/plugin.properties
index 7992586..915e191 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.doc/plugin.properties
+++ b/valgrind/org.eclipse.linuxtools.valgrind.doc/plugin.properties
@@ -1,3 +1,3 @@
-Bundle-Vendor = Eclipse Linux Tools
+Bundle-Vendor = Eclipse
 Bundle-Name = Valgrind Documentation (Incubation)
 extension.name.0 = Valgrind
\ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.doc/userguide/General-Usage.html b/valgrind/org.eclipse.linuxtools.valgrind.doc/userguide/General-Usage.html
index 4874f8d..61c91fc 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.doc/userguide/General-Usage.html
+++ b/valgrind/org.eclipse.linuxtools.valgrind.doc/userguide/General-Usage.html
@@ -150,43 +150,7 @@
 			<b>
 				<i>Export</i>
 			</b> wizard menu.
-		</p>
-		<h2 id="Other_Operating_Systems">Other Operating Systems</h2>
-		<p>The Valgrind Eclipse plugins were designed and tested on Linux systems only. However, the Valgrind tools are also available on Mac OS X and so too are the Linux Tools Eclipse Valgrind plugins. The plugins are not officially supported on Mac OS X, but here are instructions to get it working.</p>
-		<h3 id="Mac_OS_X_10.6">Mac OS X 10.6</h3>
-		<p>As of Apr 19, 2010 the official release of the Valgrind tool does not work on 10.6. However, there are patches available to make it work.</p>
-		<p>Brief instructions to compile the Valgrind tool is here: 
-			<a href="http://code.google.com/p/data-race-test/wiki/ValgrindOnSnowLeopard">http://code.google.com/p/data-race-test/wiki/ValgrindOnSnowLeopard</a>
-		</p>
-		<p>Essentially, you need to run the following script. (Ensure you have wget installed)</p>
-		<pre> svn co -r 11104 svn://svn.valgrind.org/valgrind/trunk valgrind
- cd valgrind
- wget http://bugs.kde.org/attachment.cgi?id=40091 -O snow-leopard.patch
- wget http://bugsfiles.kde.org/attachment.cgi?id=40900 -O arc4random.patch
- wget http://bugsfiles.kde.org/attachment.cgi?id=42530 -O sidt.patch 
- wget http://bugsfiles.kde.org/attachment.cgi?id=42892 -O signal.patch
- patch -p0 &lt; snow-leopard.patch
- patch -p0 &lt; arc4random.patch
- patch -p1 &lt; signal.patch
- cd VEX; patch -p0 &lt; ../sidt.patch ; cd ..
- touch darwin10-drd.supp
- touch darwin10.supp
- ./autogen.sh || autoreconf -fvi
- ./configure --prefix=`pwd`/inst
- make -j 8 &amp;&amp; make install
-</pre>
-		<p>Once this is done, see instructions below for other Mac OS's</p>
-		<h3 id="x86_64_Mac_OS">x86_64 Mac OS</h3>
-		<p>Valgrind is only compatible with x86 binaries on Mac OS, so if you have x86_64 you'll need to ensure that x86 binaries are being built. To do this, right click on the project and select Properties. </p>
-		<p>Within the Properties window, select C/C++ Build then add '-m32' to the Command field for the MacOS X C++ Linker, GCC C++ Compiler and GCC C Compiler. This will cause x86 binaries to be created.</p>
-		<h3 id="Other_Mac_OS">Other Mac OS</h3>
-		<p>Ensure you have a release of the Valgrind command-line tool installed. See 
-			<a href="http://valgrind.org/">http://valgrind.org/</a>.
-		</p>
-		<p>After installing, you will need to create a symlink to /usr/bin/valgrind. </p>
-		<p>Use <code>which valgrind</code> to find the install location of the Valgrind binary. </p>
-		<p><code>ln -s /usr/bin/valgrind /location/of/valgrind</code> will create the symlink.</p>
-		<p>After that, the Eclipse Valgrind plugin should work as specified in other parts of this wiki page.</p><hr/>
+		</p><hr/>
 		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
 			<tr>
 				<td style="width: 20%" align="left">
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.doc/userguide/Valgrind Reference-toc.xml b/valgrind/org.eclipse.linuxtools.valgrind.doc/userguide/Valgrind Reference-toc.xml
index 66e0f6e..9b81567 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.doc/userguide/Valgrind Reference-toc.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.doc/userguide/Valgrind Reference-toc.xml
@@ -8,11 +8,6 @@
 			<topic href="userguide/General-Usage.html#Suppressions" label="Suppressions"></topic>
 		</topic>
 		<topic href="userguide/General-Usage.html#Exporting_Valgrind_Data" label="Exporting Valgrind Data"></topic>
-		<topic href="userguide/General-Usage.html#Other_Operating_Systems" label="Other Operating Systems">
-			<topic href="userguide/General-Usage.html#Mac_OS_X_10.6" label="Mac OS X 10.6"></topic>
-			<topic href="userguide/General-Usage.html#x86_64_Mac_OS" label="x86_64 Mac OS"></topic>
-			<topic href="userguide/General-Usage.html#Other_Mac_OS" label="Other Mac OS"></topic>
-		</topic>
 	</topic>
 	<topic href="userguide/Using-Memcheck.html" label="Using Memcheck">
 		<topic href="userguide/Using-Memcheck.html#Analyzing_Memcheck_Profile_Results" label="Analyzing Memcheck Profile Results"></topic>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.doc/userguide/Valgrind Reference.xml b/valgrind/org.eclipse.linuxtools.valgrind.doc/userguide/Valgrind Reference.xml
index 3cf3876..e9fbc98 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.doc/userguide/Valgrind Reference.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.doc/userguide/Valgrind Reference.xml
@@ -201,50 +201,6 @@
 				</emphasis> wizard menu.
 			</para>
 		</section>
-		<section id="Other_Operating_Systems">
-			<title>Other Operating Systems</title>
-			<para>The Valgrind Eclipse plugins were designed and tested on Linux systems only. However, the Valgrind tools are also available on Mac OS X and so too are the Linux Tools Eclipse Valgrind plugins. The plugins are not officially supported on Mac OS X, but here are instructions to get it working.</para>
-			<section id="Mac_OS_X_10.6">
-				<title>Mac OS X 10.6</title>
-				<para>As of Apr 19, 2010 the official release of the Valgrind tool does not work on 10.6. However, there are patches available to make it work.</para>
-				<para>Brief instructions to compile the Valgrind tool is here: 
-					<ulink url="http://code.google.com/p/data-race-test/wiki/ValgrindOnSnowLeopard">http://code.google.com/p/data-race-test/wiki/ValgrindOnSnowLeopard</ulink>
-				</para>
-				<para>Essentially, you need to run the following script. (Ensure you have wget installed)</para>
-				<literallayout> svn co -r 11104 svn://svn.valgrind.org/valgrind/trunk valgrind
- cd valgrind
- wget http://bugs.kde.org/attachment.cgi?id=40091 -O snow-leopard.patch
- wget http://bugsfiles.kde.org/attachment.cgi?id=40900 -O arc4random.patch
- wget http://bugsfiles.kde.org/attachment.cgi?id=42530 -O sidt.patch 
- wget http://bugsfiles.kde.org/attachment.cgi?id=42892 -O signal.patch
- patch -p0 &lt; snow-leopard.patch
- patch -p0 &lt; arc4random.patch
- patch -p1 &lt; signal.patch
- cd VEX; patch -p0 &lt; ../sidt.patch ; cd ..
- touch darwin10-drd.supp
- touch darwin10.supp
- ./autogen.sh || autoreconf -fvi
- ./configure --prefix=`pwd`/inst
- make -j 8 &amp;&amp; make install
-</literallayout>
-				<para>Once this is done, see instructions below for other Mac OS's</para>
-			</section>
-			<section id="x86_64_Mac_OS">
-				<title>x86_64 Mac OS</title>
-				<para>Valgrind is only compatible with x86 binaries on Mac OS, so if you have x86_64 you'll need to ensure that x86 binaries are being built. To do this, right click on the project and select Properties. </para>
-				<para>Within the Properties window, select C/C++ Build then add '-m32' to the Command field for the MacOS X C++ Linker, GCC C++ Compiler and GCC C Compiler. This will cause x86 binaries to be created.</para>
-			</section>
-			<section id="Other_Mac_OS">
-				<title>Other Mac OS</title>
-				<para>Ensure you have a release of the Valgrind command-line tool installed. See 
-					<ulink url="http://valgrind.org/">http://valgrind.org/</ulink>.
-				</para>
-				<para>After installing, you will need to create a symlink to /usr/bin/valgrind. </para>
-				<para>Use <code>which valgrind</code> to find the install location of the Valgrind binary. </para>
-				<para><code>ln -s /usr/bin/valgrind /location/of/valgrind</code> will create the symlink.</para>
-				<para>After that, the Eclipse Valgrind plugin should work as specified in other parts of this wiki page.</para>
-			</section>
-		</section>
 	</chapter>
 	<chapter id="Using_Memcheck">
 		<title>Using Memcheck</title>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.launch/ChangeLog
index 4506107..b8cd0d2 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/ChangeLog
@@ -1,19 +1,3 @@
-2010-06-06  Elliott Baron  <ebaron@fedoraproject.org>
-	
-	Bug #315890
-	* src/org/eclipse/linuxtools/internal/valgrind/launch/messages.properties: Mention preference page.
-	* src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchPlugin.java (start): Register as listener
-		for Valgrind preference page changes. 
-	(getValgrindLocation): Handle preference page in ValgrindCommand.
-	(propertyChange): Reset location and version, so the low-level methods will be called again.
-
-2010-05-28  Elliott Baron  <ebaron@fedoraproject.org>
-
-	Bug #314680
-	* META-INF/MANIFEST.MF: Added new dependency.
-	* src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchConfigurationDelegate.java (createMarkers): Account
-		for source lookup returning LocalFileStorage. 
-
 2009-08-11  Elliott Baron  <ebaron@redhat.com>
 
 	* META-INF/MANIFEST.MF: Bump version to 0.3.0.
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.launch/META-INF/MANIFEST.MF
index 7ceceb2..685a9ea 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/META-INF/MANIFEST.MF
@@ -16,12 +16,10 @@
  org.eclipse.cdt.launch,
  org.eclipse.cdt.utils,
  org.eclipse.core.expressions,
- org.eclipse.core.filesystem,
  org.eclipse.core.resources,
  org.eclipse.core.variables,
  org.eclipse.debug.core,
  org.eclipse.debug.core.model,
- org.eclipse.debug.core.sourcelookup.containers,
  org.eclipse.debug.ui,
  org.eclipse.debug.ui.console,
  org.eclipse.debug.ui.sourcelookup,
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/about.html b/valgrind/org.eclipse.linuxtools.valgrind.launch/about.html
index c258ef5..e6a2741 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/about.html
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/about.html
@@ -1,28 +1,26 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+
+
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>About</title>
-</head>
-<body lang="EN-US">
+</head><body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 5, 2006</p>	
+<p>October 24, 2008</p>	
 <h3>License</h3>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
 at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+being redistributed by another party ("Redistributor") and different terms and conditions may
 apply to your use of any object code in the Content.  Check the Redistributor's license that was 
 provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
 indicated below, the terms and conditions of the EPL still apply to any source code in the Content
 and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
 
-</body>
-</html>
\ No newline at end of file
+</body></html>
\ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/plugin.properties b/valgrind/org.eclipse.linuxtools.valgrind.launch/plugin.properties
index 35c71b5..60f4047 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/plugin.properties
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/plugin.properties
@@ -2,7 +2,7 @@
 launchConfigurationType.name.0 = Profile With Valgrind
 launchConfigurationTabGroup.description.0 = Profile C/C++ Application Using Valgrind
 shortcut.label.0 = Profile With Valgrind
-Bundle-Vendor.0 = Eclipse Linux Tools
+Bundle-Vendor.0 = Eclipse
 Bundle-Name.0 = Valgrind Launch Plug-in (Incubation)
 extension-point.name.0 = Valgrind Tool
 extension-point.name.1 = Valgrind Output Directory Providers
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchConfigurationDelegate.java b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchConfigurationDelegate.java
index 782b582..fcfdd19 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchConfigurationDelegate.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchConfigurationDelegate.java
@@ -13,7 +13,6 @@
 import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
-import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -21,12 +20,8 @@
 
 import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.launch.AbstractCLaunchDelegate;
-import org.eclipse.core.filesystem.URIUtil;
-import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -39,7 +34,6 @@
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.debug.core.model.IProcess;
 import org.eclipse.debug.core.model.ISourceLocator;
-import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage;
 import org.eclipse.debug.ui.DebugUITools;
 import org.eclipse.debug.ui.sourcelookup.ISourceLookupResult;
 import org.eclipse.linuxtools.internal.valgrind.core.CommandLineConstants;
@@ -217,27 +211,13 @@
 						ISourceLocator locator = frame.getLaunch().getSourceLocator();					
 						ISourceLookupResult result = DebugUITools.lookupSource(frame.getFile(), locator);
 						Object sourceElement = result.getSourceElement();
-						
-						if (sourceElement != null) {
-							// Resolve IResource in case we get a LocalFileStorage object
-							if (sourceElement instanceof LocalFileStorage) {
-								IPath filePath = ((LocalFileStorage) sourceElement).getFullPath();
-								URI fileURI = URIUtil.toURI(filePath);
-								IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-								IFile[] files = root.findFilesForLocationURI(fileURI);
-								if (files.length > 0) {
-									// Take the first match
-									sourceElement = files[0];
-								}
-							}
 
-							if (sourceElement instanceof IResource) {
-								IResource resource = (IResource) sourceElement;
-								marker = resource.createMarker(ValgrindLaunchPlugin.MARKER_TYPE);
-								marker.setAttribute(IMarker.MESSAGE, message.getText());
-								marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
-								marker.setAttribute(IMarker.LINE_NUMBER, frame.getLine());
-							}
+						if (sourceElement != null && sourceElement instanceof IResource) {
+							IResource resource = (IResource) sourceElement;
+							marker = resource.createMarker(ValgrindLaunchPlugin.MARKER_TYPE);
+							marker.setAttribute(IMarker.MESSAGE, message.getText());
+							marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
+							marker.setAttribute(IMarker.LINE_NUMBER, frame.getLine());
 						}
 					}
 				}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchPlugin.java b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchPlugin.java
index 4a664ed..ff6dd8a 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchPlugin.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchPlugin.java
@@ -28,8 +28,6 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.linuxtools.internal.valgrind.core.PluginConstants;
 import org.eclipse.linuxtools.internal.valgrind.core.ValgrindCommand;
 import org.eclipse.linuxtools.internal.valgrind.core.ValgrindPlugin;
@@ -42,7 +40,7 @@
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Version;
 
-public class ValgrindLaunchPlugin extends AbstractUIPlugin implements IPropertyChangeListener {
+public class ValgrindLaunchPlugin extends AbstractUIPlugin {
 
 	// The plug-in ID
 	public static final String PLUGIN_ID = PluginConstants.LAUNCH_PLUGIN_ID;
@@ -91,9 +89,6 @@
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
-		
-		// Register as listener for changes to the property page
-		ValgrindPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(this);
 	}
 
 	/*
@@ -119,6 +114,12 @@
 			findValgrindLocation();
 		}
 		
+		// valgrind binary location in preferences overrides default location
+		String valgrindPreferedPath = ValgrindPlugin.getDefault().getPreferenceStore().getString(ValgrindPreferencePage.VALGRIND_PATH);
+		if (! valgrindLocation.toOSString().equals(valgrindPreferedPath)){
+			valgrindLocation = Path.fromOSString(valgrindPreferedPath);
+		}
+		
 		return valgrindLocation;
 	}
 	
@@ -310,13 +311,5 @@
 		}
 		return toolMap;
 	}
-
-	public void propertyChange(PropertyChangeEvent event) {
-		if (event.getProperty().equals(ValgrindPreferencePage.VALGRIND_PATH)) {
-			// Reset Valgrind location and version
-			valgrindLocation = null;
-			valgrindVersion = null;
-		}
-	}
 	
 }
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/messages.properties b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/messages.properties
index 8cddd6e..6a4526f 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/messages.properties
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/messages.properties
@@ -24,7 +24,7 @@
 ValgrindLaunchConfigurationDelegate.Valgrind_error_title=Valgrind Error
 ValgrindLaunchPlugin.Cannot_retrieve_delegate=Cannot retrieve delegate from extension
 ValgrindLaunchPlugin.Cannot_retrieve_page=Cannot retrieve page from extension
-ValgrindLaunchPlugin.Please_ensure_Valgrind=Please ensure Valgrind is installed and in your path, or manually set a location in Preferences.
+ValgrindLaunchPlugin.Please_ensure_Valgrind=Please ensure Valgrind is installed and in your path.
 ValgrindLaunchPlugin.Couldn't_determine_version=Couldn't determine version of Valgrind located at {0}.
 ValgrindLaunchPlugin.Error_min_version=The installed Valgrind ({0}) is older than the minimum supported version ({1}).
 ValgrindOptionsTab.Basic_Options=Basic Options
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/ChangeLog
index 86f3c7e..86c3847 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/ChangeLog
@@ -1,15 +1,3 @@
-2010-05-26  Elliott Baron  <ebaron@fedoraproject.org>
-
-	Bug #314376
-	* src/org/eclipse/linuxtools/internal/valgrind/massif/tests/DoubleClickTest.java (doDoubleClick): Change access to TreeViewer.
-	* src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ExpandCollapseTest.java (testExpand): Likewise.
-	* src/org/eclipse/linuxtools/internal/valgrind/massif/tests/TreeTest.java (testTreeNodes): Likewise.
-	(testNoDetailed): Likewise.
-
-2009-12-22  Roland Grunberg  <rgrunber@redhat.com>
-
-	* META-INF/MANIFEST.MF: Make necessary changes for switch from JUnit 3 to JUnit 4.
-
 2009-09-28  Elliott Baron  <ebaron@fedoraproject.org>
 
 	* valgrindFiles: Regenerated.
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/META-INF/MANIFEST.MF
index ee3a7ec..b115e89 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@
 Bundle-Vendor: %Bundle-Vendor.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.junit;bundle-version="4.7.0"
+ org.junit;bundle-version="[0.0.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/plugin.properties b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/plugin.properties
index a893030..775f175 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/plugin.properties
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/plugin.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.linuxtools.valgrind.massif.tests
-Bundle-Vendor.0 = Eclipse Linux Tools
+Bundle-Vendor.0 = Eclipse
 Bundle-Name.0 = Massif Tests Plug-in (Incubation)
\ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/DoubleClickTest.java b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/DoubleClickTest.java
index 8ddf3b3..f0a3725 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/DoubleClickTest.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/DoubleClickTest.java
@@ -42,7 +42,7 @@
 	
 	private void doDoubleClick() {
 		MassifViewPart view = (MassifViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
-		MassifTreeViewer treeViewer = view.getTreeViewer();
+		MassifTreeViewer treeViewer = (MassifTreeViewer) view.getTreeViewer();
 		
 		MassifSnapshot[] snapshots = view.getSnapshots();
 		node = snapshots[1].getRoot(); // first detailed
@@ -52,12 +52,12 @@
 			path = path.createChildPath(node);
 		}
 		if (node.hasSourceFile()) {
-			treeViewer.getViewer().expandToLevel(node, TreeViewer.ALL_LEVELS);
+			treeViewer.expandToLevel(node, TreeViewer.ALL_LEVELS);
 			TreeSelection selection = new TreeSelection(path);
 	
 			// do double click
 			IDoubleClickListener listener = treeViewer.getDoubleClickListener();
-			listener.doubleClick(new DoubleClickEvent(treeViewer.getViewer(), selection));
+			listener.doubleClick(new DoubleClickEvent(treeViewer, selection));
 		}
 		else {
 			fail();
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ExpandCollapseTest.java b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ExpandCollapseTest.java
index 4b59ef8..0ff65d4 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ExpandCollapseTest.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ExpandCollapseTest.java
@@ -42,7 +42,7 @@
 		doLaunch(config, "testDefaults"); //$NON-NLS-1$
 		
 		MassifViewPart view = (MassifViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
-		viewer = view.getTreeViewer().getViewer();
+		viewer = view.getTreeViewer();
 		contextMenu = viewer.getTree().getMenu();
 		
 		// Select first snapshot and expand it
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/TreeTest.java b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/TreeTest.java
index 9be5f58..4dec245 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/TreeTest.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/TreeTest.java
@@ -40,7 +40,7 @@
 		doLaunch(config, "testTreeNodes"); //$NON-NLS-1$
 				
 		MassifViewPart view = (MassifViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
-		TreeViewer treeViewer = view.getTreeViewer().getViewer();
+		TreeViewer treeViewer = view.getTreeViewer();
 		
 		MassifSnapshot[] snapshots = view.getSnapshots();
 		MassifHeapTreeNode[] nodes = (MassifHeapTreeNode[]) treeViewer.getInput();
@@ -59,7 +59,7 @@
 		doLaunch(config, "testNoDetailed"); //$NON-NLS-1$
 				
 		MassifViewPart view = (MassifViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
-		TreeViewer treeViewer = view.getTreeViewer().getViewer();
+		TreeViewer treeViewer = view.getTreeViewer();
 		
 		MassifHeapTreeNode[] nodes = (MassifHeapTreeNode[]) treeViewer.getInput();
 		
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.massif/ChangeLog
index 8ed2f5c..921ce73 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/ChangeLog
@@ -1,18 +1,3 @@
-2010-05-26  Elliott Baron  <ebaron@fedoraproject.org>
-
-	Bug #314376
-	* src/org/eclipse/linuxtools/internal/valgrind/massif/birt/ChartEditorInput.java (getAdapter): Change @suppresswarnings.
-	* src/org/eclipse/linuxtools/internal/valgrind/massif/MassifTreeViewer.java (MassifTreeViewer): Do not extend TreeViewer,
-		act as a wrapper instead.
-	(.doubleClick): Change access to TreeViewer.
-	(.menuAboutToShow): Likewise.
-	(getViewer): Likewise.
-	* src/org/eclipse/linuxtools/internal/valgrind/massif/MassifViewPart.java (createPartControl): Likewise. 
-	(.doubleClick): Likewise.
-	(.run): Likewise.
-	(refreshView): Likewise.
-	(getTreeViewer): Likewise.
-
 2009-09-28  Elliott Baron  <ebaron@fedoraproject.org>
 
 	#290597
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/about.html b/valgrind/org.eclipse.linuxtools.valgrind.massif/about.html
index c258ef5..e6a2741 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/about.html
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/about.html
@@ -1,28 +1,26 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+
+
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>About</title>
-</head>
-<body lang="EN-US">
+</head><body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 5, 2006</p>	
+<p>October 24, 2008</p>	
 <h3>License</h3>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
 at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+being redistributed by another party ("Redistributor") and different terms and conditions may
 apply to your use of any object code in the Content.  Check the Redistributor's license that was 
 provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
 indicated below, the terms and conditions of the EPL still apply to any source code in the Content
 and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
 
-</body>
-</html>
\ No newline at end of file
+</body></html>
\ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/plugin.properties b/valgrind/org.eclipse.linuxtools.valgrind.massif/plugin.properties
index b0ff965..768f889 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/plugin.properties
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/plugin.properties
@@ -1,4 +1,4 @@
 #Properties file for org.eclipse.linuxtools.valgrind.massif
-Bundle-Vendor.0 = Eclipse Linux Tools
+Bundle-Vendor.0 = Eclipse
 Bundle-Name.0 = Massif Plug-in (Incubation)
 editor.name.0 = Heap Chart
\ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifTreeViewer.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifTreeViewer.java
index 0bd06bc..ed79ac5 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifTreeViewer.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifTreeViewer.java
@@ -27,17 +27,15 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Menu;
 
-public class MassifTreeViewer {
+public class MassifTreeViewer extends TreeViewer {
 
 	protected IDoubleClickListener doubleClickListener;
 	protected ITreeContentProvider contentProvider;
 	protected Action expandAction;
 	protected Action collapseAction;
 
-	private TreeViewer viewer;
-	
 	public MassifTreeViewer(Composite parent) {
-		viewer = new TreeViewer(parent, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL);
+		super(parent, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL);
 		
 		contentProvider = new ITreeContentProvider() {
 			public Object[] getChildren(Object parentElement) {
@@ -63,9 +61,9 @@
 					Object newInput) {}
 
 		};
-		viewer.setContentProvider(contentProvider);
+		setContentProvider(contentProvider);
 
-		viewer.setLabelProvider(new MassifTreeLabelProvider());
+		setLabelProvider(new MassifTreeLabelProvider());
 
 		doubleClickListener = new IDoubleClickListener() {
 			public void doubleClick(DoubleClickEvent event) {
@@ -74,19 +72,19 @@
 					MassifPlugin.getDefault().openEditorForNode(element);
 				} 
 				if (contentProvider.hasChildren(element)) {
-					viewer.expandToLevel(element, 1);
+					expandToLevel(element, 1);
 				}
 			}			
 		};
-		viewer.addDoubleClickListener(doubleClickListener);
+		addDoubleClickListener(doubleClickListener);
 		
-		expandAction = new ExpandAction(viewer);
-		collapseAction = new CollapseAction(viewer);
+		expandAction = new ExpandAction(this);
+		collapseAction = new CollapseAction(this);
 		
 		MenuManager manager = new MenuManager();
 		manager.addMenuListener(new IMenuListener() {
 			public void menuAboutToShow(IMenuManager manager) {
-				ITreeSelection selection = (ITreeSelection) viewer.getSelection();
+				ITreeSelection selection = (ITreeSelection) getSelection();
 				MassifHeapTreeNode element = (MassifHeapTreeNode) selection.getFirstElement();
 				if (contentProvider.hasChildren(element)) {
 					manager.add(expandAction);
@@ -96,15 +94,12 @@
 		});
 		
 		manager.setRemoveAllWhenShown(true);	
-		Menu contextMenu = manager.createContextMenu(viewer.getTree());
-		viewer.getControl().setMenu(contextMenu);
+		Menu contextMenu = manager.createContextMenu(getTree());
+		getControl().setMenu(contextMenu);
 	}
 
 	public IDoubleClickListener getDoubleClickListener() {
 		return doubleClickListener;
 	}
 
-	public TreeViewer getViewer() {
-		return viewer;
-	}
 }
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifViewPart.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifViewPart.java
index 490fea5..99eacb2 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifViewPart.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifViewPart.java
@@ -133,7 +133,7 @@
 		viewer.setLabelProvider(new MassifLabelProvider());
 
 		treeViewer = new MassifTreeViewer(top);
-		treeViewer.getViewer().getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+		treeViewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 
 		viewer.addDoubleClickListener(new IDoubleClickListener() {
 			public void doubleClick(DoubleClickEvent event) {
@@ -141,10 +141,10 @@
 						.getSelection()).getFirstElement();
 				if (snapshot.getType() != SnapshotType.EMPTY) {
 					treeAction.setChecked(true);
-					setTopControl(treeViewer.getViewer().getControl());
-					treeViewer.getViewer().setSelection(new StructuredSelection(snapshot
+					setTopControl(treeViewer.getControl());
+					treeViewer.setSelection(new StructuredSelection(snapshot
 							.getRoot()), true);
-					treeViewer.getViewer().expandToLevel(snapshot.getRoot(),
+					treeViewer.expandToLevel(snapshot.getRoot(),
 							TreeViewer.ALL_LEVELS);
 				}
 			}
@@ -265,7 +265,7 @@
 			@Override
 			public void run() {
 				if (isChecked()) {
-					stackLayout.topControl = treeViewer.getViewer().getControl();
+					stackLayout.topControl = treeViewer.getControl();
 					top.layout();
 				} else {
 					stackLayout.topControl = viewer.getControl();
@@ -350,7 +350,7 @@
 				for (int i = 0; i < detailed.length; i++) {
 					nodes[i] = detailed[i].getRoot();
 				}
-				treeViewer.getViewer().setInput(nodes);
+				treeViewer.setInput(nodes);
 
 				// create and display chart
 				if (snapshots.length > 0) {
@@ -410,7 +410,7 @@
 		return viewer;
 	}
 
-	public MassifTreeViewer getTreeViewer() {
+	public TreeViewer getTreeViewer() {
 		return treeViewer;
 	}
 
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/birt/ChartEditorInput.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/birt/ChartEditorInput.java
index 3a4dbfc..2c35f6d 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/birt/ChartEditorInput.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/birt/ChartEditorInput.java
@@ -52,7 +52,7 @@
 		return NLS.bind(Messages.getString("ChartEditorInput.Heap_allocation_chart_for"), name); //$NON-NLS-1$
 	}
 
-	@SuppressWarnings("rawtypes")
+	@SuppressWarnings("unchecked")
 	public Object getAdapter(Class adapter) {
 		return null;
 	}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/ChangeLog
index 9879c7c..7f36a96 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/ChangeLog
@@ -1,22 +1,3 @@
-2010-06-06  Elliott Baron  <ebaron@fedoraproject.org>
-	
-	Bug #315890
-	* src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/LocationPreferenceTest.java: New file.
-	* src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/AllTests.java (suite): Added new test.
-
-2010-05-26  Elliott Baron  <ebaron@fedoraproject.org>
-
-	Bug #314376
-	* src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/DoubleClickTest.java (doDoubleClick): Change access to TreeViewer.
-	* src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/ExpandCollapseTest.java (testExpand): Likewise.
-	(testCollapse): Likewise.
-	(checkExpanded): Likewise.
-	* src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/LinkedResourceDoubleClickTest.java (doDoubleClick): Likewise. 
-
-2009-12-22  Roland Grunberg  <rgrunber@redhat.com>
-
-	* META-INF/MANIFEST.MF: Make necessary changes for switch from JUnit 3 to JUnit 4.
-
 2009-09-28  Elliott Baron  <ebaron@fedoraproject.org>
 
 	* valgrindFiles: Regenerated.
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/META-INF/MANIFEST.MF
index 901cb1c..df2ae10 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@
 Bundle-Vendor: %Bundle-Vendor.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.junit;bundle-version="4.7.0"
+ org.junit;bundle-version="[0.0.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/plugin.properties b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/plugin.properties
index 031f4e7..8d15d8b0 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/plugin.properties
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/plugin.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.linuxtools.valgrind.memcheck.tests
-Bundle-Vendor.0 = Eclipse Linux Tools
+Bundle-Vendor.0 = Eclipse
 Bundle-Name.0 = Memcheck Tests Plug-in (Incubation)
\ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/AllTests.java b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/AllTests.java
index 244abcb..0f77b38 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/AllTests.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/AllTests.java
@@ -32,7 +32,6 @@
 		suite.addTestSuite(ShortcutTest.class);
 		suite.addTestSuite(SignalTest.class);
 		suite.addTestSuite(MinVersionTest.class);
-		suite.addTestSuite(LocationPreferenceTest.class);
 		// $JUnit-END$
 		return suite;
 	}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/DoubleClickTest.java b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/DoubleClickTest.java
index 9f15dc9..0a622a7 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/DoubleClickTest.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/DoubleClickTest.java
@@ -47,7 +47,7 @@
 		CoreMessagesViewer viewer = view.getMessagesViewer();
 
 		// get first leaf
-		IValgrindMessage[] elements = (IValgrindMessage[]) viewer.getTreeViewer().getInput();
+		IValgrindMessage[] elements = (IValgrindMessage[]) viewer.getInput();
 		IValgrindMessage element = elements[0];
 		TreePath path = new TreePath(new Object[] { element });
 		frame = null;
@@ -60,12 +60,12 @@
 		}
 		assertNotNull(frame);
 
-		viewer.getTreeViewer().expandToLevel(frame, TreeViewer.ALL_LEVELS);
+		viewer.expandToLevel(frame, TreeViewer.ALL_LEVELS);
 		TreeSelection selection = new TreeSelection(path);
 
 		// do double click
 		IDoubleClickListener listener = viewer.getDoubleClickListener();
-		listener.doubleClick(new DoubleClickEvent(viewer.getTreeViewer(), selection));
+		listener.doubleClick(new DoubleClickEvent(viewer, selection));
 	}
 
 	@Override
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/ExpandCollapseTest.java b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/ExpandCollapseTest.java
index 22ee9f4..101a047 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/ExpandCollapseTest.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/ExpandCollapseTest.java
@@ -43,13 +43,13 @@
 		
 		ValgrindViewPart view = ValgrindUIPlugin.getDefault().getView();
 		viewer = view.getMessagesViewer();
-		contextMenu = viewer.getTreeViewer().getTree().getMenu();
+		contextMenu = viewer.getTree().getMenu();
 		
 		// Select first error and expand it
-		IValgrindMessage[] messages = (IValgrindMessage[]) viewer.getTreeViewer().getInput();
+		IValgrindMessage[] messages = (IValgrindMessage[]) viewer.getInput();
 		IValgrindMessage element = messages[0];
 		TreeSelection selection = new TreeSelection(new TreePath(new Object[] { element }));
-		viewer.getTreeViewer().setSelection(selection);
+		viewer.setSelection(selection);
 		contextMenu.notifyListeners(SWT.Show, null);
 		contextMenu.getItem(0).notifyListeners(SWT.Selection, null);
 		
@@ -61,10 +61,10 @@
 		testExpand();
 		
 		// Then collapse it
-		IValgrindMessage[] messages = (IValgrindMessage[]) viewer.getTreeViewer().getInput();
+		IValgrindMessage[] messages = (IValgrindMessage[]) viewer.getInput();
 		IValgrindMessage element = messages[0];
 		TreeSelection selection = new TreeSelection(new TreePath(new Object[] { element }));
-		viewer.getTreeViewer().setSelection(selection);
+		viewer.setSelection(selection);
 		contextMenu.notifyListeners(SWT.Show, null);
 		contextMenu.getItem(1).notifyListeners(SWT.Selection, null);
 		
@@ -75,10 +75,10 @@
 		if (element.getChildren().length > 0) {
 			// only applicable to internal nodes
 			if (expanded) {
-				assertTrue(viewer.getTreeViewer().getExpandedState(element));
+				assertTrue(viewer.getExpandedState(element));
 			}
 			else {
-				assertFalse(viewer.getTreeViewer().getExpandedState(element));
+				assertFalse(viewer.getExpandedState(element));
 			}
 		}
 		for (IValgrindMessage child : element.getChildren()) {
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/LinkedResourceDoubleClickTest.java b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/LinkedResourceDoubleClickTest.java
index 9b15d74..1387567 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/LinkedResourceDoubleClickTest.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/LinkedResourceDoubleClickTest.java
@@ -89,7 +89,7 @@
 		CoreMessagesViewer viewer = view.getMessagesViewer();
 
 		// get first leaf
-		IValgrindMessage[] elements = (IValgrindMessage[]) viewer.getTreeViewer().getInput();
+		IValgrindMessage[] elements = (IValgrindMessage[]) viewer.getInput();
 		IValgrindMessage element = elements[0];
 		TreePath path = new TreePath(new Object[] { element });
 		frame = null;
@@ -102,11 +102,11 @@
 		}
 		assertNotNull(frame);
 
-		viewer.getTreeViewer().expandToLevel(frame, TreeViewer.ALL_LEVELS);
+		viewer.expandToLevel(frame, TreeViewer.ALL_LEVELS);
 		TreeSelection selection = new TreeSelection(path);
 
 		// do double click
 		IDoubleClickListener listener = viewer.getDoubleClickListener();
-		listener.doubleClick(new DoubleClickEvent(viewer.getTreeViewer(), selection));
+		listener.doubleClick(new DoubleClickEvent(viewer, selection));
 	}
 }
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/LocationPreferenceTest.java b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/LocationPreferenceTest.java
deleted file mode 100644
index 3627f73..0000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/LocationPreferenceTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.eclipse.linuxtools.internal.valgrind.memcheck.tests;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.linuxtools.internal.valgrind.core.ValgrindCommand;
-import org.eclipse.linuxtools.internal.valgrind.core.ValgrindPlugin;
-import org.eclipse.linuxtools.internal.valgrind.core.ValgrindPreferencePage;
-import org.eclipse.linuxtools.internal.valgrind.launch.ValgrindLaunchPlugin;
-
-
-public class LocationPreferenceTest extends TestCase {
-
-	private ValgrindCommand command = new ValgrindCommand() {
-		protected void readIntoBuffer(StringBuffer out, Process p) throws IOException {
-			// Simulate not finding Valgrind in the user's PATH
-			throw new IOException();
-		}
-	};
-	
-	/**
-	 * Tests Bug #315890 - Valgrind location cannot be overridden unless Valgrind is present in PATH
-	 * @throws Exception
-	 */
-	public void testManualLocationNoPATH() throws Exception {
-		// Set a preference for a manual location
-		ValgrindPlugin.getDefault().getPreferenceStore().setValue(ValgrindPreferencePage.VALGRIND_PATH, "/path/to/valgrind");
-		
-		ValgrindLaunchPlugin.getDefault().setValgrindCommand(command);
-		
-		ValgrindLaunchPlugin.getDefault().getValgrindLocation();
-	}
-}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck/about.html b/valgrind/org.eclipse.linuxtools.valgrind.memcheck/about.html
index c258ef5..e6a2741 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck/about.html
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck/about.html
@@ -1,28 +1,26 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+
+
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>About</title>
-</head>
-<body lang="EN-US">
+</head><body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 5, 2006</p>	
+<p>October 24, 2008</p>	
 <h3>License</h3>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
 at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+being redistributed by another party ("Redistributor") and different terms and conditions may
 apply to your use of any object code in the Content.  Check the Redistributor's license that was 
 provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
 indicated below, the terms and conditions of the EPL still apply to any source code in the Content
 and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
 
-</body>
-</html>
\ No newline at end of file
+</body></html>
\ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck/plugin.properties b/valgrind/org.eclipse.linuxtools.valgrind.memcheck/plugin.properties
index 8b90935..c32384b 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck/plugin.properties
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck/plugin.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.linuxtools.valgrind.memcheck
-Bundle-Vendor.0 = Eclipse Linux Tools
+Bundle-Vendor.0 = Eclipse
 Bundle-Name.0 = Memcheck Plug-in (Incubation)
\ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.test-feature/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.test-feature/ChangeLog
index 15be41c..9c99933 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.test-feature/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.test-feature/ChangeLog
@@ -1,19 +1,3 @@
-2010-05-18  Andrew Overholt  <overholt@redhat.com>
-
-	* feature.properties: Fix provider name.
-
-2010-04-26  Andrew Overholt  <overholt@redhat.com>
-
-	* feature.properties: Match consistent license text (bug #306627).  Update
-	copyright year.
-	* license.html: New file.  HTML version of SUA (bug #306627).
-	* build.properties: Include license.html.
-	* feature.xml: Use licenseURL property.
-
-2010-04-12  Andrew Overholt  <overholt@redhat.com>
-
-	* feature.properties: Match consistent license text (bug #306627).
-
 2009-08-11  Elliott Baron  <ebaron@redhat.com>
 
 	* feature.xml: Bump version to 0.3.0.
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.test-feature/build.properties b/valgrind/org.eclipse.linuxtools.valgrind.test-feature/build.properties
index 765d7ec..0dc2b5f 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.test-feature/build.properties
+++ b/valgrind/org.eclipse.linuxtools.valgrind.test-feature/build.properties
@@ -1,5 +1,4 @@
 bin.includes = feature.xml,\
                feature.properties,\
                epl-v10.html,\
-               test.xml,\
-               license.html
+               test.xml
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.test-feature/feature.properties b/valgrind/org.eclipse.linuxtools.valgrind.test-feature/feature.properties
index 9a6efd4..00f0114 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.test-feature/feature.properties
+++ b/valgrind/org.eclipse.linuxtools.valgrind.test-feature/feature.properties
@@ -10,12 +10,12 @@
 #********************************************************************************
 featureName=Valgrind Tools Integration Automated Tests (Incubation)
 description=Tests for plugins that integrate Valgrind tools with the workbench.
-featureProvider=Eclipse Linux Tools
-copyright=Copyright 2008, 2010 Red Hat, Inc.
-licenseURL=license.html
+featureProvider=Eclipse
+copyright=Copyright 2008 Red Hat, Inc.
+licenseURL=epl-v10.html
 license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
+ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
+March 17, 2005\n\
 \n\
 Usage Of Content\n\
 \n\
@@ -23,38 +23,42 @@
 OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
 USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
 AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
 AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
 AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
 TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
 OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
 BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
 \n\
 Applicable Licenses\n\
 \n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
 For purposes of the EPL, "Program" will mean the Content.\n\
 \n\
 Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
+documentation and other files maintained in the Eclipse.org CVS\n\
+repository ("Repository") in CVS modules ("Modules") and made available\n\
 as downloadable archives ("Downloads").\n\
 \n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+Features may also include other Features ("Included Features"). Files named\n\
+"feature.xml" may contain a list of the names and version numbers of\n\
+Included Features.\n\
 \n\
 The terms and conditions governing Plug-ins and Fragments should be\n\
 contained in files named "about.html" ("Abouts"). The terms and\n\
@@ -63,76 +67,46 @@
 Licenses may be located in any directory of a Download or Module\n\
 including, but not limited to the following locations:\n\
 \n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
+   - The top-level (root) directory\n\
+   - Plug-in and Fragment directories\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
+   - Feature directories\n\
 \n\
 Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
+Eclipse Update Manager, you must agree to a license ("Feature Update\n\
+License") during the installation process. If the Feature contains\n\
 Included Features, the Feature Update License should either provide you\n\
 with the terms and conditions governing the Included Features or inform\n\
 you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
+the "license" property of files named "feature.properties". Such Abouts,\n\
+Feature Licenses and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
 \n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
 TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
 SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
 \n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
+    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
 \n\
 IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
 is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
 govern that particular Content.\n\
 \n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
 Cryptography\n\
 \n\
 Content may contain encryption software. The country in which you are\n\
 currently may have restrictions on the import, possession, and use,\n\
 and/or re-export to another country, of encryption software. BEFORE\n\
 using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
 \n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
\ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.test-feature/license.html b/valgrind/org.eclipse.linuxtools.valgrind.test-feature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.test-feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.tests/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.tests/ChangeLog
index 409ed3e..afa866a 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.tests/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.tests/ChangeLog
@@ -1,7 +1,3 @@
-2009-12-22  Roland Grunberg  <rgrunber@redhat.com>
-
-	* META-INF/MANIFEST.MF: Make necessary changes for switch from JUnit 3 to JUnit 4.
-
 2009-08-11  Elliott Baron  <ebaron@redhat.com>
 
 	* src/org/eclipse/linuxtools/valgrind: Removed.
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.tests/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.tests/META-INF/MANIFEST.MF
index 51b6fbf..2a9cf31 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.tests/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@
 Bundle-Activator: org.eclipse.linuxtools.internal.valgrind.tests.ValgrindTestsPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.junit;bundle-version="4.7.0"
+ org.junit;bundle-version="[0.0.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: org.eclipse.cdt.core.model,
  org.eclipse.cdt.debug.core,
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.tests/plugin.properties b/valgrind/org.eclipse.linuxtools.valgrind.tests/plugin.properties
index ac88e79..9c61423 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.tests/plugin.properties
+++ b/valgrind/org.eclipse.linuxtools.valgrind.tests/plugin.properties
@@ -8,5 +8,5 @@
 # Contributors:
 #    Red Hat, Inc. - initial API and implementation
 #********************************************************************************
-Bundle-Vendor.0 = Eclipse Linux Tools
+Bundle-Vendor.0 = Eclipse
 Bundle-Name.0 = Valgrind Test Suite (Incubation)
\ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/about.html b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/about.html
deleted file mode 100644
index 23506a4..0000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/about.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head><body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
\ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/build.properties b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/build.properties
index eb97ee7..2e92184 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/build.properties
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/build.properties
@@ -4,5 +4,4 @@
                .,\
                OSGI-INF/l10n/bundle.properties,\
                plugin.xml,\
-	       about.html,\
                icons/
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.ui/ChangeLog
index 0805d87..1661031 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui/ChangeLog
@@ -1,11 +1,3 @@
-2010-05-26  Elliott Baron  <ebaron@fedoraproject.org>
-
-	Bug #314376
-	* src/org/eclipse/linuxtools/internal/valgrind/ui/CoreMessagesViewer.java: Do not extend TreeViewer,
-		act as wrapper instead.
-	* src/org/eclipse/linuxtools/internal/valgrind/ui/ValgrindViewPart.java (refreshView): Change access to TreeViewer.
-	(showCorePage): Likewise.
-
 2009-08-11  Elliott Baron  <ebaron@redhat.com>
 
 	* META-INF/MANIFEST.MF: Bump version to 0.3.0.
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui/about.html b/valgrind/org.eclipse.linuxtools.valgrind.ui/about.html
index c258ef5..e6a2741 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui/about.html
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui/about.html
@@ -1,28 +1,26 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+
+
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>About</title>
-</head>
-<body lang="EN-US">
+</head><body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 5, 2006</p>	
+<p>October 24, 2008</p>	
 <h3>License</h3>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
 at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+being redistributed by another party ("Redistributor") and different terms and conditions may
 apply to your use of any object code in the Content.  Check the Redistributor's license that was 
 provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
 indicated below, the terms and conditions of the EPL still apply to any source code in the Content
 and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
 
-</body>
-</html>
\ No newline at end of file
+</body></html>
\ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui/plugin.properties b/valgrind/org.eclipse.linuxtools.valgrind.ui/plugin.properties
index 2fff3b4..b3ef1b1 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui/plugin.properties
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui/plugin.properties
@@ -1,5 +1,5 @@
 #Properties file for org.eclipse.linuxtools.valgrind.ui
 view.name.0 = Valgrind
-Bundle-Vendor.0 = Eclipse Linux Tools
+Bundle-Vendor.0 = Eclipse
 Bundle-Name.0 = Valgrind UI Plug-in (Incubation)
 extension-point.name.0 = valgrindToolViews
\ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/CoreMessagesViewer.java b/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/CoreMessagesViewer.java
index 83d8bbe..ad134a7 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/CoreMessagesViewer.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/CoreMessagesViewer.java
@@ -42,23 +42,20 @@
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
 
-public class CoreMessagesViewer {
+public class CoreMessagesViewer extends TreeViewer {
 	public IDoubleClickListener doubleClickListener;
 	public ITreeContentProvider contentProvider;
 	public IAction expandAction;
 	public IAction collapseAction;
-	
-	private TreeViewer viewer;
 
 	public CoreMessagesViewer(Composite parent, int style) {
-		viewer = new TreeViewer(parent, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | style);
-		viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
+		super(parent, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | style);
+		getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 		contentProvider = new ITreeContentProvider() {
 
 			public Object[] getChildren(Object parentElement) {
@@ -86,9 +83,9 @@
 					Object newInput) {}
 
 		};
-		viewer.setContentProvider(contentProvider);
+		setContentProvider(contentProvider);
 
-		viewer.setLabelProvider(new LabelProvider() {
+		setLabelProvider(new LabelProvider() {
 			@Override
 			public String getText(Object element) {
 				return ((IValgrindMessage) element).getText();
@@ -159,24 +156,24 @@
 					}
 				}
 				else {
-					if (viewer.getExpandedState(element)) {
-						viewer.collapseToLevel(element, TreeViewer.ALL_LEVELS);
+					if (getExpandedState(element)) {
+						collapseToLevel(element, TreeViewer.ALL_LEVELS);
 					}
 					else {
-						viewer.expandToLevel(element, 1);
+						expandToLevel(element, 1);
 					}
 				}
 			}
 		};
-		viewer.addDoubleClickListener(doubleClickListener);
+		addDoubleClickListener(doubleClickListener);
 
-		expandAction = new ExpandAction(viewer);
-		collapseAction = new CollapseAction(viewer);
+		expandAction = new ExpandAction(this);
+		collapseAction = new CollapseAction(this);
 
 		MenuManager manager = new MenuManager();
 		manager.addMenuListener(new IMenuListener() {
 			public void menuAboutToShow(IMenuManager manager) {
-				ITreeSelection selection = (ITreeSelection) viewer.getSelection();
+				ITreeSelection selection = (ITreeSelection) getSelection();
 				Object element = selection.getFirstElement();
 				if (contentProvider.hasChildren(element)) {
 					manager.add(expandAction);
@@ -186,15 +183,11 @@
 		});
 
 		manager.setRemoveAllWhenShown(true);	
-		Menu contextMenu = manager.createContextMenu(viewer.getTree());
-		viewer.getControl().setMenu(contextMenu);
+		Menu contextMenu = manager.createContextMenu(getTree());
+		getControl().setMenu(contextMenu);
 	}
 
 	public IDoubleClickListener getDoubleClickListener() {
 		return doubleClickListener;
 	}
-
-	public TreeViewer getTreeViewer() {
-		return viewer;
-	}
 }
\ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/ValgrindViewPart.java b/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/ValgrindViewPart.java
index 559d504..efbc83d 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/ValgrindViewPart.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/ValgrindViewPart.java
@@ -142,7 +142,7 @@
 
 	public void refreshView() {
 		if (messages != null) {
-			messagesViewer.getTreeViewer().setInput(messages);
+			messagesViewer.setInput(messages);
 			
 			// decide which page to show
 			if (hasDynamicContent && messages.length == 0) {
@@ -177,7 +177,7 @@
 	}
 	
 	private void showCorePage() {
-		pageBook.showPage(messagesViewer.getTreeViewer().getControl());
+		pageBook.showPage(messagesViewer.getControl());
 		showCoreAction.setChecked(true);
 		showToolAction.setChecked(false);
 	}
diff --git a/valgrind/schema/org.eclipse.linuxtools.valgrind.launch.valgrindTools.exsd b/valgrind/schema/org.eclipse.linuxtools.valgrind.launch.valgrindTools.exsd
deleted file mode 100644
index 85568d5..0000000
--- a/valgrind/schema/org.eclipse.linuxtools.valgrind.launch.valgrindTools.exsd
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.linuxtools.valgrind.launch" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appinfo>
-         <meta.schema plugin="org.eclipse.linuxtools.valgrind.launch" id="valgrindTool" name="Valgrind Tool"/>
-      </appinfo>
-      <documentation>
-         This extension point provides Valgrind tools the ability to contribute options to the Valgrind &lt;code&gt;ILaunchConfigurationTab&lt;/code&gt; and to deploy UI to the Valgrind view.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appinfo>
-            <meta.element />
-         </appinfo>
-      </annotation>
-      <complexType>
-         <sequence minOccurs="1" maxOccurs="unbounded">
-            <element ref="tool"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appinfo>
-                  <meta.attribute translatable="true"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="tool">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The unique identifier for this tool
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The name of this tool as Valgrind expects it as an argument to &lt;code&gt;--tool&lt;/code&gt;
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="page" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Class to contribute controls used to add options for this tool in the &lt;code&gt;ILaunchConfigurationTab&lt;/code&gt; for Valgrind.
-Must implement &lt;code&gt;IValgrindToolPage&lt;/code&gt;
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.linuxtools.valgrind.launch.IValgrindToolPage"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-         <attribute name="delegate" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The class that will receive control from the &lt;code&gt;ValgrindLaunchConfigurationDelegate&lt;/code&gt; once Valgrind has launched.
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.linuxtools.valgrind.launch.IValgrindLaunchDelegate"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="since"/>
-      </appinfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="examples"/>
-      </appinfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="apiinfo"/>
-      </appinfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="implementation"/>
-      </appinfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-
-</schema>
diff --git a/valgrind/src/org/eclipse/linuxtools/valgrind/launch/IValgrindLaunchDelegate.java b/valgrind/src/org/eclipse/linuxtools/valgrind/launch/IValgrindLaunchDelegate.java
deleted file mode 100644
index 1dabdc6..0000000
--- a/valgrind/src/org/eclipse/linuxtools/valgrind/launch/IValgrindLaunchDelegate.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Elliott Baron <ebaron@redhat.com> - initial API and implementation
- *******************************************************************************/ 
-package org.eclipse.linuxtools.valgrind.launch;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.linuxtools.valgrind.core.ValgrindCommand;
-
-/**
- * Interface for declaring a tool-specific delegate for a Valgrind
- * <code>LaunchConfiguration</code>.
- */
-public interface IValgrindLaunchDelegate {
-
-	/**
-	 * To be called after Valgrind has been called for a given launch.
-	 * This method is responsible for parsing Valgrind's output as needed
-	 * by this tool
-	 * @param command - The Valgrind instance that just ran
-	 * @param monitor - to report progress
-	 * @throws CoreException - if this method fails
-	 */
-	public void launch(ValgrindCommand command, IProgressMonitor monitor) throws CoreException;
-	
-	/**
-	 * Parses attributes of an <code>ILaunchConfiguration</code> into an array
-	 * of arguments to be passed to Valgrind
-	 * @param config - the <code>ILaunchConfiguration</code>
-	 * @return an array of arguments that can appended to a <code>valgrind</code> command
-	 * @throws CoreException - retrieving attributes from config failed
-	 */
-	public String[] getCommandArray(ILaunchConfiguration config) throws CoreException;
-	
-}
diff --git a/valgrind/src/org/eclipse/linuxtools/valgrind/launch/IValgrindToolPage.java b/valgrind/src/org/eclipse/linuxtools/valgrind/launch/IValgrindToolPage.java
deleted file mode 100644
index 2b02a20..0000000
--- a/valgrind/src/org/eclipse/linuxtools/valgrind/launch/IValgrindToolPage.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Elliott Baron <ebaron@redhat.com> - initial API and implementation
- *******************************************************************************/ 
-package org.eclipse.linuxtools.valgrind.launch;
-
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-
-/**
- * Interface for declaring the specifics of integrating a Valgrind tool
- * into this plugin.
- */
-public interface IValgrindToolPage extends ILaunchConfigurationTab {
-	
-}
diff --git a/valgrind/src/org/eclipse/linuxtools/valgrind/launch/Messages.java b/valgrind/src/org/eclipse/linuxtools/valgrind/launch/Messages.java
deleted file mode 100644
index 399a126..0000000
--- a/valgrind/src/org/eclipse/linuxtools/valgrind/launch/Messages.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Elliott Baron <ebaron@redhat.com> - initial API and implementation
- *******************************************************************************/ 
-package org.eclipse.linuxtools.valgrind.launch;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.valgrind.launch.messages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(BUNDLE_NAME);
-
-	private Messages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/valgrind/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchConfigurationDelegate.java b/valgrind/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchConfigurationDelegate.java
deleted file mode 100644
index 1494e89..0000000
--- a/valgrind/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchConfigurationDelegate.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Elliott Baron <ebaron@redhat.com> - initial API and implementation
- *******************************************************************************/ 
-package org.eclipse.linuxtools.valgrind.launch;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
-import org.eclipse.cdt.launch.AbstractCLaunchDelegate;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.linuxtools.valgrind.core.ValgrindCommand;
-
-public class ValgrindLaunchConfigurationDelegate extends AbstractCLaunchDelegate {
-
-	protected static final String EMPTY_STRING = ""; //$NON-NLS-1$
-	protected static final String NO = "no"; //$NON-NLS-1$
-	protected static final String YES = "yes"; //$NON-NLS-1$
-	protected static final String EQUALS = "="; //$NON-NLS-1$
-
-	protected static final String LOG_PREFIX = "valgrind_"; //$NON-NLS-1$
-	protected static final String LOG_FILE = ValgrindCommand.LOG_PATH + Path.SEPARATOR + LOG_PREFIX + "%p.xml"; //$NON-NLS-1$
-	protected static final FileFilter LOG_FILTER = new FileFilter() {
-		public boolean accept(File pathname) {
-			return pathname.getName().startsWith(LOG_PREFIX);
-		}		
-	};
-	
-	protected String toolID;
-	protected ValgrindCommand command;
-	protected IValgrindLaunchDelegate dynamicDelegate;
-
-	public void launch(ILaunchConfiguration config, String mode,
-			ILaunch launch, IProgressMonitor m) throws CoreException {
-		if (m == null) {
-			m = new NullProgressMonitor();
-		}
-		SubMonitor monitor = SubMonitor.convert(m, Messages.getString("ValgrindLaunchConfigurationDelegate.Profiling_Local_CCPP_Application"), 10); //$NON-NLS-1$
-		// check for cancellation
-		if (monitor.isCanceled()) {
-			return;
-		}
-
-		try {
-			monitor.worked(1);
-			IPath exePath = verifyProgramPath(config);
-
-			String[] arguments = getProgramArgumentsArray(config);
-			
-			// tool that was launched
-			toolID = getTool(config);
-			// ask tool extension for arguments
-			dynamicDelegate = ValgrindLaunchPlugin.getDefault().getToolDelegate(toolID);
-			String[] opts = getValgrindArgumentsArray(config);
-
-			// set the default source locator if required
-			setDefaultSourceLocator(launch, config);
-
-			File wd = getWorkingDirectory(config);
-			if (wd == null) {
-				wd = new File(System.getProperty("user.home", ".")); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			
-			ArrayList<String> cmdLine = new ArrayList<String>(1 + arguments.length);
-			cmdLine.add(ValgrindCommand.VALGRIND_CMD);
-			cmdLine.addAll(Arrays.asList(opts));
-			cmdLine.add(exePath.toOSString());
-			cmdLine.addAll(Arrays.asList(arguments));
-			String[] commandArray = (String[]) cmdLine.toArray(new String[cmdLine.size()]);
-			boolean usePty = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_USE_TERMINAL, ICDTLaunchConfigurationConstants.USE_TERMINAL_DEFAULT);
-			monitor.worked(3);
-
-			command = new ValgrindCommand();
-			command.execute(commandArray, getEnvironment(config), wd, usePty);
-			monitor.worked(3);
-			DebugPlugin.newProcess(launch, command.getProcess(), renderProcessLabel(commandArray[0]));
-		
-			dynamicDelegate.launch(command, monitor.newChild(3));
-		} catch (IOException e) {
-			abort(Messages.getString("ValgrindLaunchConfigurationDelegate.Error_starting_process"), e, ICDTLaunchConfigurationConstants.ERR_INTERNAL_ERROR); //$NON-NLS-1$
-		} finally {
-			monitor.done();			
-		}
-	}
-
-	protected String[] getValgrindArgumentsArray(ILaunchConfiguration config) throws CoreException, IOException {
-		ArrayList<String> opts = new ArrayList<String>();
-		opts.add(ValgrindCommand.OPT_TOOL + EQUALS + ValgrindLaunchPlugin.getDefault().getToolName(toolID));
-
-		opts.add(ValgrindCommand.OPT_LOGFILE + EQUALS + LOG_FILE);
-
-		opts.add(ValgrindCommand.OPT_TRACECHILD + EQUALS + (config.getAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_TRACECHILD, false) ? YES : NO));
-		opts.add(ValgrindCommand.OPT_CHILDSILENT + EQUALS + YES);//(config.getAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_CHILDSILENT, false) ? YES : NO));
-		//		opts.add(ValgrindCommand.OPT_TRACKFDS + EQUALS + (config.getAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_TRACKFDS, false) ? YES : NO));
-		//		opts.add(ValgrindCommand.OPT_TIMESTAMP + EQUALS + (config.getAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_TIMESTAMP, false) ? YES : NO));
-		opts.add(ValgrindCommand.OPT_FREERES + EQUALS + (config.getAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_FREERES, true) ? YES : NO));
-
-		opts.add(ValgrindCommand.OPT_DEMANGLE + EQUALS + (config.getAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_DEMANGLE, true) ? YES : NO));
-		opts.add(ValgrindCommand.OPT_NUMCALLERS + EQUALS + config.getAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_NUMCALLERS, 12));
-		opts.add(ValgrindCommand.OPT_ERRLIMIT + EQUALS + (config.getAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_ERRLIMIT, true) ? YES : NO));
-		opts.add(ValgrindCommand.OPT_BELOWMAIN + EQUALS + (config.getAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_BELOWMAIN, false) ? YES : NO));
-		opts.add(ValgrindCommand.OPT_MAXFRAME + EQUALS + config.getAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_MAXFRAME, 2000000));
-
-		String strpath = config.getAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_SUPPFILE, EMPTY_STRING);
-		if (!strpath.equals(EMPTY_STRING)) {
-			File suppfile = ValgrindLaunchPlugin.getDefault().parseWSPath(strpath);
-			if (suppfile != null) {
-				String escapedPath = ValgrindLaunchPlugin.getDefault().escapeAndQuote(suppfile.getCanonicalPath());
-				opts.add(ValgrindCommand.OPT_SUPPFILE + EQUALS + escapedPath);
-			}
-		}
-
-		opts.addAll(Arrays.asList(dynamicDelegate.getCommandArray(config)));		
-
-		String[] ret = new String[opts.size()];
-		return opts.toArray(ret);
-	}
-
-	protected String getTool(ILaunchConfiguration config) throws CoreException {
-		return config.getAttribute(ValgrindLaunchPlugin.ATTR_TOOL, ValgrindLaunchPlugin.TOOL_EXT_DEFAULT);
-	}
-
-
-	@Override
-	protected String getPluginID() {
-		return ValgrindLaunchPlugin.PLUGIN_ID;
-	}
-	
-}
diff --git a/valgrind/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchConfigurationTabGroup.java b/valgrind/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchConfigurationTabGroup.java
deleted file mode 100644
index 8512363..0000000
--- a/valgrind/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchConfigurationTabGroup.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Elliott Baron <ebaron@redhat.com> - initial API and implementation
- *******************************************************************************/ 
-package org.eclipse.linuxtools.valgrind.launch;
-
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.linuxtools.profiling.launch.ProfileLaunchConfigurationTabGroup;
-
-public class ValgrindLaunchConfigurationTabGroup extends
-		ProfileLaunchConfigurationTabGroup {
-
-	@Override
-	public AbstractLaunchConfigurationTab[] getProfileTabs() {
-		return new AbstractLaunchConfigurationTab[] {
-			new ValgrindOptionsTab()
-		};
-	}	
-	
-}
diff --git a/valgrind/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchPlugin.java b/valgrind/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchPlugin.java
deleted file mode 100644
index a33f3be..0000000
--- a/valgrind/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchPlugin.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Elliott Baron <ebaron@redhat.com> - initial API and implementation
- *******************************************************************************/ 
-package org.eclipse.linuxtools.valgrind.launch;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Set;
-
-import org.eclipse.cdt.launch.LaunchUtils;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-public class ValgrindLaunchPlugin extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.linuxtools.valgrind.launch"; //$NON-NLS-1$
-	public static final String LAUNCH_ID = PLUGIN_ID + ".valgrindLaunch"; //$NON-NLS-1$
-	
-	// Extension point constants
-	public static final String TOOL_EXT_ID = "valgrindTools"; //$NON-NLS-1$
-	public static final String TOOL_EXT_DEFAULT = PLUGIN_ID + ".memcheck"; //$NON-NLS-1$
-	
-	protected static final String EXT_ELEMENT = "tool"; //$NON-NLS-1$
-	protected static final String EXT_ATTR_NAME = "name"; //$NON-NLS-1$
-	protected static final String EXT_ATTR_ID = "id"; //$NON-NLS-1$
-	protected static final String EXT_ATTR_PAGE = "page"; //$NON-NLS-1$
-	protected static final String EXT_ATTR_DELEGATE = "delegate"; //$NON-NLS-1$
-	
-	
-	// LaunchConfiguration constants
-	public static final String ATTR_TOOL = PLUGIN_ID + ".TOOL"; //$NON-NLS-1$
-	
-	public static final String ATTR_GENERAL_TRACECHILD = PLUGIN_ID + ".GENERAL_TRACECHILD"; //$NON-NLS-1$
-	public static final String ATTR_GENERAL_CHILDSILENT = PLUGIN_ID + ".GENERAL_CHILDSILENT"; //$NON-NLS-1$
-//	public static final String ATTR_GENERAL_TRACKFDS = PLUGIN_ID + ".GENERAL_TRACKFDS";
-//	public static final String ATTR_GENERAL_TIMESTAMP = PLUGIN_ID + ".GENERAL_TIMESTAMP";
-	public static final String ATTR_GENERAL_FREERES = PLUGIN_ID + ".GENERAL_FREERES"; //$NON-NLS-1$
-	public static final String ATTR_GENERAL_DEMANGLE = PLUGIN_ID + ".GENERAL_DEMANGLE"; //$NON-NLS-1$
-	public static final String ATTR_GENERAL_NUMCALLERS = PLUGIN_ID + ".GENERAL_NUMCALLERS"; //$NON-NLS-1$
-	public static final String ATTR_GENERAL_ERRLIMIT = PLUGIN_ID + ".GENERAL_ERRLIMIT"; //$NON-NLS-1$
-	public static final String ATTR_GENERAL_BELOWMAIN = PLUGIN_ID + ".GENERAL_BELOWMAIN"; //$NON-NLS-1$
-	public static final String ATTR_GENERAL_MAXFRAME = PLUGIN_ID + ".GENERAL_MAXFRAME"; //$NON-NLS-1$
-	public static final String ATTR_GENERAL_SUPPFILE = PLUGIN_ID + ".GENERAL_SUPPFILE"; //$NON-NLS-1$
-	
-	protected HashMap<String, IConfigurationElement> toolMap; 
-	
-	// The shared instance
-	private static ValgrindLaunchPlugin plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public ValgrindLaunchPlugin() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static ValgrindLaunchPlugin getDefault() {
-		return plugin;
-	}
-	
-	public String[] getRegisteredToolIDs() {
-		Set<String> ids = getToolMap().keySet();
-		return ids.toArray(new String[ids.size()]);
-	}
-	
-	public String getToolName(String id) {
-		String name = null;
-		IConfigurationElement config = getToolMap().get(id);
-		if (config != null) {
-			name = config.getAttribute(EXT_ATTR_NAME);
-		}
-		return name;
-	}
-	
-	public IValgrindToolPage getToolPage(String id) throws CoreException {
-		IValgrindToolPage tab = null;
-		IConfigurationElement config = getToolMap().get(id);
-		if (config != null) {
-			Object obj = config.createExecutableExtension(EXT_ATTR_PAGE);
-			if (obj instanceof IValgrindToolPage) {
-				tab = (IValgrindToolPage) obj;
-			}
-		}
-		if (tab == null) {
-			throw new CoreException(new Status(IStatus.ERROR, PLUGIN_ID, Messages.getString("ValgrindLaunchPlugin.Cannot_retrieve_page"))); //$NON-NLS-1$
-		}
-		return tab;
-	}
-	
-	public IValgrindLaunchDelegate getToolDelegate(String id) throws CoreException {
-		IValgrindLaunchDelegate delegate = null;
-		IConfigurationElement config = getToolMap().get(id);
-		if (config != null) {
-			Object obj = config.createExecutableExtension(EXT_ATTR_DELEGATE);
-			if (obj instanceof IValgrindLaunchDelegate) {
-				delegate = (IValgrindLaunchDelegate) obj;
-			}
-		}
-		if (delegate == null) {
-			throw new CoreException(new Status(IStatus.ERROR, PLUGIN_ID, Messages.getString("ValgrindLaunchPlugin.Cannot_retrieve_delegate"))); //$NON-NLS-1$
-		}
-		return delegate;
-	}
-	
-	public File parseWSPath(String strpath) throws CoreException {
-		strpath = LaunchUtils.getStringVariableManager().performStringSubstitution(strpath);
-		IPath path = new Path(strpath);
-		File suppfile = null;
-		if (path.isAbsolute()) {
-			suppfile = new File(path.toOSString());
-		}
-		else {
-			IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(path);
-			if (res != null) {
-				IPath absPath = res.getLocation();
-				if (absPath != null) {
-					suppfile = absPath.toFile();
-				}
-			}
-		}		
-		return suppfile;
-	}
-	
-	protected void initializeToolMap() {
-		toolMap = new HashMap<String, IConfigurationElement>();
-		IExtensionPoint extPoint = Platform.getExtensionRegistry().getExtensionPoint(PLUGIN_ID, TOOL_EXT_ID);
-		IConfigurationElement[] configs = extPoint.getConfigurationElements();
-		for (IConfigurationElement config : configs) {
-			if (config.getName().equals(EXT_ELEMENT)) {
-				String id = config.getAttribute(EXT_ATTR_ID);
-				if (id != null && config.getAttribute(EXT_ATTR_NAME) != null
-						&& config.getAttribute(EXT_ATTR_PAGE) != null
-						&& config.getAttribute(EXT_ATTR_DELEGATE) != null) {
-					toolMap.put(id, config);
-				}
-			}
-		}
-	}
-
-	protected HashMap<String, IConfigurationElement> getToolMap() {
-		if (toolMap == null) {
-			initializeToolMap();
-		}
-		return toolMap;
-	}
-
-	public String escapeAndQuote(String canonicalPath) {
-		String ret = canonicalPath.replaceAll(" ", "\\ "); //$NON-NLS-1$ //$NON-NLS-2$
-		return ret;
-	}
-}
diff --git a/valgrind/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchShortcut.java b/valgrind/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchShortcut.java
deleted file mode 100644
index 3d9f81a..0000000
--- a/valgrind/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchShortcut.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Elliott Baron <ebaron@redhat.com> - initial API and implementation
- *******************************************************************************/ 
-package org.eclipse.linuxtools.valgrind.launch;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.debug.ui.ILaunchShortcut;
-import org.eclipse.linuxtools.profiling.launch.ProfileLaunchShortcut;
-
-public class ValgrindLaunchShortcut extends ProfileLaunchShortcut implements ILaunchShortcut {
-
-
-	protected void setDefaultProfileAttributes(
-			ILaunchConfigurationWorkingCopy wc) throws CoreException {
-		ValgrindOptionsTab.setDefaultGeneralAttributes(wc);
-		ILaunchConfigurationTab defaultTab = ValgrindLaunchPlugin.getDefault().getToolPage(ValgrindLaunchPlugin.TOOL_EXT_DEFAULT);
-		defaultTab.setDefaults(wc);
-	}
-
-	/**
-	 * Method getValgrindLaunchConfigType.
-	 * @return ILaunchConfigurationType
-	 */
-	protected ILaunchConfigurationType getLaunchConfigType() {
-		return getLaunchManager().getLaunchConfigurationType(ValgrindLaunchPlugin.LAUNCH_ID);
-	}
-
-}
diff --git a/valgrind/src/org/eclipse/linuxtools/valgrind/launch/ValgrindOptionsTab.java b/valgrind/src/org/eclipse/linuxtools/valgrind/launch/ValgrindOptionsTab.java
deleted file mode 100644
index d6f345c..0000000
--- a/valgrind/src/org/eclipse/linuxtools/valgrind/launch/ValgrindOptionsTab.java
+++ /dev/null
@@ -1,509 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Elliott Baron <ebaron@redhat.com> - initial API and implementation
- *******************************************************************************/ 
-package org.eclipse.linuxtools.valgrind.launch;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.ui.views.navigator.ResourceComparator;
-
-public class ValgrindOptionsTab extends AbstractLaunchConfigurationTab {
-	protected static final String EMPTY_STRING = ""; //$NON-NLS-1$
-
-	// General controls
-	protected Button traceChildrenButton;
-	protected Button childSilentButton;
-	//	protected Button trackFdsButton;
-	//	protected Button timeStampButton;
-	protected Button runFreeresButton;
-
-	protected Button demangleButton;
-	protected Spinner numCallersSpinner;
-	protected Button errorLimitButton;
-	protected Button showBelowMainButton;
-	protected Spinner maxStackFrameSpinner;
-	protected Text suppFileText;
-
-	protected String tool;
-	protected String[] tools;
-	protected Combo toolsCombo;
-
-	protected ILaunchConfigurationWorkingCopy launchConfigurationWorkingCopy;
-	protected ILaunchConfiguration launchConfiguration;
-
-	protected ILaunchConfigurationTab dynamicTab;
-	protected Composite dynamicTabHolder;
-
-	protected boolean isInitializing = false;
-	protected boolean initDefaults = false;
-
-	protected SelectionListener selectListener = new SelectionAdapter() {
-		@Override
-		public void widgetSelected(SelectionEvent e) {
-			updateLaunchConfigurationDialog();
-		}
-	};
-	protected ModifyListener modifyListener = new ModifyListener() {
-		public void modifyText(ModifyEvent e) {
-			updateLaunchConfigurationDialog();	
-		}			
-	};
-
-	public void createControl(Composite parent) {
-		Composite top = new Composite(parent, SWT.NONE);
-		setControl(top);
-		top.setLayout(new GridLayout());
-
-		createVerticalSpacer(top, 1);
-
-		createToolCombo(top);
-
-		createVerticalSpacer(top, 1);
-
-		TabFolder optionsFolder = new TabFolder(top, SWT.BORDER);
-		optionsFolder.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		// "general" tab
-		TabItem generalTab = new TabItem(optionsFolder, SWT.NONE);
-		generalTab.setText(Messages.getString("ValgrindOptionsTab.General")); //$NON-NLS-1$
-
-		Composite generalTop = new Composite(optionsFolder, SWT.NONE);
-		generalTop.setLayout(new GridLayout());
-		generalTop.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		createBasicOptions(generalTop);
-
-		createVerticalSpacer(generalTop, 1);
-
-		createErrorOptions(generalTop);
-
-		generalTab.setControl(generalTop);
-
-		// "tool" tab
-		TabItem toolTab = new TabItem(optionsFolder, SWT.NONE);
-		toolTab.setText(Messages.getString("ValgrindOptionsTab.Tool")); //$NON-NLS-1$
-
-		dynamicTabHolder = new Composite(optionsFolder, SWT.NONE);
-		dynamicTabHolder.setLayout(new GridLayout());
-		dynamicTabHolder.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		toolTab.setControl(dynamicTabHolder);
-	}
-
-	private void createToolCombo(Composite top) {
-		Composite comboTop = new Composite(top, SWT.NONE);
-		comboTop.setLayout(new GridLayout(2, false));
-		Label toolLabel = new Label(comboTop, SWT.NONE);
-		toolLabel.setText(Messages.getString("ValgrindOptionsTab.Tool_to_run")); //$NON-NLS-1$
-		toolsCombo = new Combo(comboTop, SWT.READ_ONLY);
-		tools = ValgrindLaunchPlugin.getDefault().getRegisteredToolIDs();
-
-		String[] names = new String[tools.length];
-		for (int i = 0; i < names.length; i++) {
-			names[i] = ValgrindLaunchPlugin.getDefault().getToolName(tools[i]);
-		}
-		toolsCombo.setItems(names);
-
-		toolsCombo.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				// user selected change, set defaults in new tool
-				if (!isInitializing) {
-					initDefaults = true;
-					int ix = toolsCombo.getSelectionIndex();
-					tool = tools[ix];
-					handleToolChanged();
-					updateLaunchConfigurationDialog();
-				}
-			}
-		});
-	}
-
-	protected void createBasicOptions(Composite top) {
-		Group basicGroup = new Group(top, SWT.NONE);
-		basicGroup.setLayout(new GridLayout());
-		basicGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		basicGroup.setText(Messages.getString("ValgrindOptionsTab.Basic_Options")); //$NON-NLS-1$
-
-		Composite basicTop = new Composite(basicGroup, SWT.NONE);
-		basicTop.setLayout(new GridLayout(8, false));
-		basicTop.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Label traceChildrenLabel = new Label(basicTop, SWT.NONE);
-		traceChildrenLabel.setText(Messages.getString("ValgrindOptionsTab.trace_children")); //$NON-NLS-1$
-		traceChildrenButton = new Button(basicTop, SWT.CHECK);
-		traceChildrenButton.addSelectionListener(selectListener);
-
-		createHorizontalSpacer(basicTop, 1);
-
-		// Must be on to prevent mangled XML output
-		Label childSilentLabel = new Label(basicTop, SWT.NONE);
-		childSilentLabel.setText(Messages.getString("ValgrindOptionsTab.child_silent")); //$NON-NLS-1$
-		childSilentButton = new Button(basicTop, SWT.CHECK);
-		childSilentButton.setSelection(true);
-		childSilentButton.setEnabled(false);
-		//childSilentButton.addSelectionListener(selectListener);
-
-		createHorizontalSpacer(basicTop, 1);
-
-		//		Label trackFdsLabel = new Label(basicTop, SWT.NONE);
-		//		trackFdsLabel.setText("track open fds:");
-		//		trackFdsButton = new Button(basicTop, SWT.CHECK);
-		//		trackFdsButton.addSelectionListener(selectListener);
-
-		//		createVerticalSpacer(basicTop, 1);
-
-		//		Label timeStampLabel = new Label(basicTop, SWT.NONE);
-		//		timeStampLabel.setText("time stamp messages:");
-		//		timeStampButton = new Button(basicTop, SWT.CHECK);
-		//		timeStampButton.addSelectionListener(selectListener);
-
-		//		createHorizontalSpacer(basicTop, 1);
-
-		Label runFreeresLabel = new Label(basicTop, SWT.NONE);
-		runFreeresLabel.setText(Messages.getString("ValgrindOptionsTab.run_freeres")); //$NON-NLS-1$
-		runFreeresButton = new Button(basicTop, SWT.CHECK);
-		runFreeresButton.addSelectionListener(selectListener);
-	}
-
-	protected void createErrorOptions(Composite top) {
-		Group errorGroup = new Group(top, SWT.NONE);
-		errorGroup.setLayout(new GridLayout());
-		errorGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		errorGroup.setText(Messages.getString("ValgrindOptionsTab.Error_Options")); //$NON-NLS-1$
-
-		Composite errorTop = new Composite(errorGroup, SWT.NONE);
-		errorTop.setLayout(new GridLayout(8, false));
-		errorTop.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Label demangleLabel = new Label(errorTop, SWT.NONE);
-		demangleLabel.setText(Messages.getString("ValgrindOptionsTab.demangle")); //$NON-NLS-1$
-		demangleButton = new Button(errorTop, SWT.CHECK);
-		demangleButton.addSelectionListener(selectListener);
-
-		createHorizontalSpacer(errorTop, 1);
-
-		Label numCallersLabel = new Label(errorTop, SWT.NONE);
-		numCallersLabel.setText(Messages.getString("ValgrindOptionsTab.num_callers")); //$NON-NLS-1$
-		numCallersSpinner = new Spinner(errorTop, SWT.BORDER);
-		numCallersSpinner.setMaximum(50);
-		numCallersSpinner.addModifyListener(modifyListener);
-
-		createHorizontalSpacer(errorTop, 1);
-
-		Label errorLimitLabel = new Label(errorTop, SWT.NONE);
-		errorLimitLabel.setText(Messages.getString("ValgrindOptionsTab.limit_errors")); //$NON-NLS-1$
-		errorLimitButton = new Button(errorTop, SWT.CHECK);
-		errorLimitButton.addSelectionListener(selectListener);
-
-		createVerticalSpacer(errorTop, 1);
-
-		Label showBelowMainLabel = new Label(errorTop, SWT.NONE);
-		showBelowMainLabel.setText(Messages.getString("ValgrindOptionsTab.show_errors_below_main")); //$NON-NLS-1$
-		showBelowMainButton = new Button(errorTop, SWT.CHECK);
-		showBelowMainButton.addSelectionListener(selectListener);
-
-		createHorizontalSpacer(errorTop, 1);
-
-		Label maxStackFrameLabel = new Label(errorTop, SWT.NONE);
-		maxStackFrameLabel.setText(Messages.getString("ValgrindOptionsTab.max_size_of_stack_frame")); //$NON-NLS-1$
-		maxStackFrameSpinner = new Spinner(errorTop, SWT.BORDER);
-		maxStackFrameSpinner.setMaximum(Integer.MAX_VALUE);
-		maxStackFrameSpinner.addModifyListener(modifyListener);
-
-		createVerticalSpacer(errorTop, 1);
-
-		createSuppressionsOption(errorTop);		
-	}
-
-	protected void createSuppressionsOption(Composite top) {
-		Label suppFileLabel = new Label(top, SWT.NONE);
-		suppFileLabel.setText(Messages.getString("ValgrindOptionsTab.suppressions_file")); //$NON-NLS-1$
-
-		Composite browseTop = new Composite(top, SWT.NONE);
-		GridLayout browseLayout = new GridLayout(3, false);
-		browseLayout.marginHeight = 0;
-		browseLayout.marginWidth = 0;
-		browseTop.setLayout(browseLayout);
-		GridData browseData = new GridData(GridData.FILL_HORIZONTAL);
-		browseData.horizontalSpan = 7;
-		browseTop.setLayoutData(browseData);
-
-		suppFileText = new Text(browseTop, SWT.BORDER);
-		suppFileText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		suppFileText.addModifyListener(modifyListener);
-
-		Button workspaceBrowseButton = createPushButton(browseTop, Messages.getString("ValgrindOptionsTab.Workspace"), null);  //$NON-NLS-1$
-		workspaceBrowseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(), new WorkbenchLabelProvider(), new WorkbenchContentProvider());
-				dialog.setTitle(Messages.getString("ValgrindOptionsTab.Select_a_Resource"));  //$NON-NLS-1$
-				dialog.setMessage(Messages.getString("ValgrindOptionsTab.Select_a_Suppressions_File"));  //$NON-NLS-1$
-				dialog.setInput(ResourcesPlugin.getWorkspace().getRoot()); 
-				dialog.setComparator(new ResourceComparator(ResourceComparator.NAME));
-				if (dialog.open() == IDialogConstants.OK_ID) {
-					IResource resource = (IResource) dialog.getFirstResult();
-					String arg = resource.getFullPath().toString();
-					String fileLoc = VariablesPlugin.getDefault().getStringVariableManager().generateVariableExpression("workspace_loc", arg); //$NON-NLS-1$
-					suppFileText.setText(fileLoc);
-				}
-			}
-		});
-		Button fileBrowseButton = createPushButton(browseTop, Messages.getString("ValgrindOptionsTab.File_System"), null); //$NON-NLS-1$
-		fileBrowseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				String filePath = suppFileText.getText();
-				FileDialog dialog = new FileDialog(getShell(), SWT.SAVE);
-				filePath = dialog.open();
-				if (filePath != null) {
-					suppFileText.setText(filePath);
-				}
-			}
-		});
-	}
-
-	protected void handleToolChanged() {
-		try {
-			// create dynamicTab
-			loadDynamicArea();
-
-			if (launchConfigurationWorkingCopy == null) {
-				if (launchConfiguration.isWorkingCopy()) {
-					launchConfigurationWorkingCopy = (ILaunchConfigurationWorkingCopy) launchConfiguration;
-				} else {
-					launchConfigurationWorkingCopy = launchConfiguration.getWorkingCopy();
-				}
-			}
-
-			// setDefaults called on this tab so call on dynamicTab OR
-			// user changed tool, not just restoring state
-			if (initDefaults) {
-				dynamicTab.setDefaults(launchConfigurationWorkingCopy);
-			}						
-			initDefaults = false;
-			dynamicTab.initializeFrom(launchConfigurationWorkingCopy);
-		} catch (CoreException e) {
-			e.printStackTrace();
-		}
-	}
-
-	private void loadDynamicArea() throws CoreException {
-		for (Control child : dynamicTabHolder.getChildren()) {
-			child.dispose();
-		}
-
-		dynamicTab = ValgrindLaunchPlugin.getDefault().getToolPage(tool);
-		if (dynamicTab == null) {
-			throw new CoreException(new Status(IStatus.ERROR, ValgrindLaunchPlugin.PLUGIN_ID, Messages.getString("ValgrindOptionsTab.No_options_tab_found") + tool)); //$NON-NLS-1$
-		}
-		dynamicTab.setLaunchConfigurationDialog(getLaunchConfigurationDialog());
-		dynamicTab.createControl(dynamicTabHolder);
-
-		dynamicTabHolder.layout(true);
-	}
-
-	public String getName() {
-		return Messages.getString("ValgrindOptionsTab.Valgrind_Options"); //$NON-NLS-1$
-	}
-
-	@Override
-	public Image getImage() {
-		return ValgrindLaunchPlugin.imageDescriptorFromPlugin(ValgrindLaunchPlugin.PLUGIN_ID, "icons/valgrind-icon.png").createImage(); //$NON-NLS-1$
-	}
-
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		isInitializing = true;
-		getControl().setRedraw(false);
-		launchConfiguration = configuration;
-		launchConfigurationWorkingCopy = null;
-
-		try {
-			tool = configuration.getAttribute(ValgrindLaunchPlugin.ATTR_TOOL, ValgrindLaunchPlugin.TOOL_EXT_DEFAULT);
-			int select = -1;
-			for (int i = 0; i < tools.length && select < 0; i++) {
-				if (tool.equals(tools[i])) {
-					select = i;
-				}
-			}
-
-			if (select != -1) {
-				toolsCombo.select(select);
-			}
-			handleToolChanged();
-			initializeGeneral(configuration);
-		} catch (CoreException e) {
-			e.printStackTrace();
-		}
-		getControl().setRedraw(true);
-		isInitializing = false;
-	}
-
-	protected void initializeGeneral(ILaunchConfiguration configuration) throws CoreException {
-		traceChildrenButton.setSelection(configuration.getAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_TRACECHILD, false));
-		//		childSilentButton.setSelection(configuration.getAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_CHILDSILENT, false));
-		//		trackFdsButton.setSelection(configuration.getAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_TRACKFDS, false));
-		//		timeStampButton.setSelection(configuration.getAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_TIMESTAMP, false));
-		runFreeresButton.setSelection(configuration.getAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_FREERES, true));
-
-		demangleButton.setSelection(configuration.getAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_DEMANGLE, true));
-		numCallersSpinner.setSelection(configuration.getAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_NUMCALLERS, 12));
-		errorLimitButton.setSelection(configuration.getAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_ERRLIMIT, true));
-		showBelowMainButton.setSelection(configuration.getAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_BELOWMAIN, false));
-		maxStackFrameSpinner.setSelection(configuration.getAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_MAXFRAME, 2000000));
-		suppFileText.setText(configuration.getAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_SUPPFILE, EMPTY_STRING));
-	}
-
-	@Override
-	public boolean isValid(ILaunchConfiguration launchConfig) {
-		setErrorMessage(null);
-
-		boolean result = false;
-		if (result = isGeneralValid() && dynamicTab != null) {
-			result = dynamicTab.isValid(launchConfig);
-		}
-		return result;
-	}
-
-	protected boolean isGeneralValid() {
-		String strpath = suppFileText.getText();
-		boolean result = false;
-		if (strpath.equals(EMPTY_STRING)) {
-			result = true;
-		}
-		else {
-			try {
-				File suppfile = ValgrindLaunchPlugin.getDefault().parseWSPath(strpath);
-				if (suppfile != null && suppfile.exists()) {
-					result = true;
-				}
-			} catch (CoreException e) {
-				e.printStackTrace();
-			}
-		}
-		
-		if (!result) {
-			setErrorMessage(NLS.bind(Messages.getString("ValgrindOptionsTab.suppressions_file_doesnt_exist"), strpath)); //$NON-NLS-1$
-		}
-		return result;
-	}
-
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute(ValgrindLaunchPlugin.ATTR_TOOL, tool);
-		applyGeneralAttributes(configuration);
-		if (dynamicTab != null) {
-			dynamicTab.performApply(configuration);
-		}
-	}
-
-	protected void applyGeneralAttributes(
-			ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_TRACECHILD, traceChildrenButton.getSelection());
-		//		configuration.setAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_CHILDSILENT, childSilentButton.getSelection());
-		//		configuration.setAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_TRACKFDS, trackFdsButton.getSelection());
-		//		configuration.setAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_TIMESTAMP, timeStampButton.getSelection());
-		configuration.setAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_FREERES, runFreeresButton.getSelection());
-
-		configuration.setAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_DEMANGLE, demangleButton.getSelection());
-		configuration.setAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_NUMCALLERS, numCallersSpinner.getSelection());
-		configuration.setAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_ERRLIMIT, errorLimitButton.getSelection());
-		configuration.setAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_BELOWMAIN, showBelowMainButton.getSelection());
-		configuration.setAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_MAXFRAME, maxStackFrameSpinner.getSelection());
-		configuration.setAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_SUPPFILE, suppFileText.getText());
-	}
-
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-		launchConfigurationWorkingCopy = configuration;
-
-		configuration.setAttribute(ValgrindLaunchPlugin.ATTR_TOOL, ValgrindLaunchPlugin.TOOL_EXT_DEFAULT);
-		setDefaultGeneralAttributes(configuration);
-		if (dynamicTab != null) {
-			dynamicTab.setDefaults(configuration);
-			initDefaults = false;
-		}
-	}
-
-	public static void setDefaultGeneralAttributes(
-			ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_TRACECHILD, false);
-		//		configuration.setAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_CHILDSILENT, false);
-		//		configuration.setAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_TRACKFDS, false);
-		//		configuration.setAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_TIMESTAMP, false);
-		configuration.setAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_FREERES, true);
-
-		configuration.setAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_DEMANGLE, true);
-		configuration.setAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_NUMCALLERS, 12);
-		configuration.setAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_ERRLIMIT, true);
-		configuration.setAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_BELOWMAIN, false);
-		configuration.setAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_MAXFRAME, 2000000);
-		configuration.setAttribute(ValgrindLaunchPlugin.ATTR_GENERAL_SUPPFILE, EMPTY_STRING);
-	}
-
-	@Override
-	public void dispose() {
-		if (dynamicTab != null) {
-			dynamicTab.dispose();
-		}
-		super.dispose();
-	}
-
-	protected void createHorizontalSpacer(Composite comp, int numlines) {
-		Label lbl = new Label(comp, SWT.NONE);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = numlines;
-		lbl.setLayoutData(gd);
-	}
-
-	@Override
-	protected void updateLaunchConfigurationDialog() {
-		if (!isInitializing) {
-			super.updateLaunchConfigurationDialog();
-		}		
-	}
-
-}
diff --git a/valgrind/src/org/eclipse/linuxtools/valgrind/launch/messages.properties b/valgrind/src/org/eclipse/linuxtools/valgrind/launch/messages.properties
deleted file mode 100644
index 8c0ab8c..0000000
--- a/valgrind/src/org/eclipse/linuxtools/valgrind/launch/messages.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-ValgrindLaunchConfigurationDelegate.Error_starting_process=Error starting process
-ValgrindLaunchConfigurationDelegate.Profiling_Local_CCPP_Application=Profiling Local C/C++ Application
-ValgrindLaunchPlugin.Cannot_retrieve_delegate=Cannot retrieve delegate from extension
-ValgrindLaunchPlugin.Cannot_retrieve_page=Cannot retrieve page from extension
-ValgrindOptionsTab.Basic_Options=Basic Options
-ValgrindOptionsTab.child_silent=child silent after fork:
-ValgrindOptionsTab.demangle=demangle C++ names:
-ValgrindOptionsTab.Error_Options=Error Options
-ValgrindOptionsTab.File_System=File Syste&m...
-ValgrindOptionsTab.General=General
-ValgrindOptionsTab.limit_errors=limit errors reported:
-ValgrindOptionsTab.max_size_of_stack_frame=max size of stack frame:
-ValgrindOptionsTab.No_options_tab_found=No options tab found for tool 
-ValgrindOptionsTab.num_callers=num callers in stack trace:
-ValgrindOptionsTab.run_freeres=run __libc_freeres() on exit:
-ValgrindOptionsTab.Select_a_Resource=Select a Resource:
-ValgrindOptionsTab.Select_a_Suppressions_File=Select a Suppressions File:
-ValgrindOptionsTab.show_errors_below_main=show errors below main:
-ValgrindOptionsTab.suppressions_file=suppressions file:
-ValgrindOptionsTab.suppressions_file_doesnt_exist=suppressions file: {0}  doesn't exist.
-ValgrindOptionsTab.Tool=Tool
-ValgrindOptionsTab.Tool_to_run=Tool to run: 
-ValgrindOptionsTab.trace_children=trace children on exec:
-ValgrindOptionsTab.Valgrind_Options=Valgrind Options
-ValgrindOptionsTab.Workspace=&Workspace...